libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

516 files changed, 166597 insertions, 165401 deletions

diff --git a/xorg-server/hw/dmx/config/Canvas.c b/xorg-server/hw/dmx/config/Canvas.c
index c2eba876a..34a47a2bf 100644
--- a/xorg-server/hw/dmx/config/Canvas.c
+++ b/xorg-server/hw/dmx/config/Canvas.c
@@ -60,100 +60,106 @@
 #include <X11/StringDefs.h>
 #include "CanvasP.h"
 
-static void CanvasInitialize(Widget request, Widget w,
-                             ArgList args, Cardinal *num_args)
+static void
+CanvasInitialize(Widget request, Widget w, ArgList args, Cardinal * num_args)
 {
 }
 
-static void CanvasExpose(Widget w, XEvent *event, Region region)
+static void
+CanvasExpose(Widget w, XEvent * event, Region region)
 {
     CanvasExposeDataRec data;
 
-    data.w      = w;
-    data.event  = event;
+    data.w = w;
+    data.event = event;
     data.region = region;
-    
-    if (!XtIsRealized(w)) return;
-    XtCallCallbacks(w, XtNcanvasExposeCallback, (XtPointer)&data);
+
+    if (!XtIsRealized(w))
+        return;
+    XtCallCallbacks(w, XtNcanvasExposeCallback, (XtPointer) & data);
 }
 
-static void CanvasResize(Widget w)
+static void
+CanvasResize(Widget w)
 {
-    if (!XtIsRealized(w)) return;
-    XtCallCallbacks(w, XtNcanvasResizeCallback, (XtPointer)w);
+    if (!XtIsRealized(w))
+        return;
+    XtCallCallbacks(w, XtNcanvasResizeCallback, (XtPointer) w);
 }
 
-static void CanvasAction(Widget w, XEvent *event,
-                         String *params, Cardinal *num_params)
+static void
+CanvasAction(Widget w, XEvent * event, String * params, Cardinal * num_params)
 {
-    XtCallCallbacks(w, XtNcallback, (XtPointer)event);
+    XtCallCallbacks(w, XtNcallback, (XtPointer) event);
 }
 
 #define offset(field) XtOffsetOf(CanvasRec, canvas.field)
 static XtResource resources[] = {
-    { XtNcallback, XtCCallback, XtRCallback,
-      sizeof(XtCallbackList), offset(input_callback), XtRCallback, NULL },
-    { XtNcanvasExposeCallback, XtCcanvasExposeCallback, XtRCallback,
-      sizeof(XtCallbackList), offset(expose_callback), XtRCallback, NULL },
-    { XtNcanvasResizeCallback, XtCcanvasResizeCallback, XtRCallback,
-      sizeof(XtCallbackList), offset(resize_callback), XtRCallback, NULL },
+    {XtNcallback, XtCCallback, XtRCallback,
+     sizeof(XtCallbackList), offset(input_callback), XtRCallback, NULL}
+    ,
+    {XtNcanvasExposeCallback, XtCcanvasExposeCallback, XtRCallback,
+     sizeof(XtCallbackList), offset(expose_callback), XtRCallback, NULL}
+    ,
+    {XtNcanvasResizeCallback, XtCcanvasResizeCallback, XtRCallback,
+     sizeof(XtCallbackList), offset(resize_callback), XtRCallback, NULL}
+    ,
 };
+
 #undef offset
 
-static XtActionsRec actions[] =
-{
-    {"canvas",	CanvasAction},
+static XtActionsRec actions[] = {
+    {"canvas", CanvasAction},
 };
 
-static char translations[] =
-"<Key>:    canvas()\n\
+static char translations[] = "<Key>:    canvas()\n\
 <Motion>:  canvas()\n\
 <BtnDown>: canvas()\n\
 <BtnUp>: canvas()\n\
-"
-;
+";
 
 #define Superclass	(&widgetClassRec)
 CanvasClassRec canvasClassRec = {
     /* core */
     {
-        (WidgetClass)Superclass,        /* superclass */
-        "Canvas",			/* class_name */
-        sizeof(CanvasRec),		/* widget_size */
-        NULL,				/* class_initialize */
-        NULL,				/* class_part_initialize */
-        False,				/* class_inited */
-        CanvasInitialize,		/* initialize */
-        NULL,				/* initialize_hook */
-        XtInheritRealize,		/* realize */
-        actions,			/* actions */
-        XtNumber(actions),		/* num_actions */
-        resources,			/* resources */
-        XtNumber(resources),		/* num_resources */
-        NULLQUARK,			/* xrm_class */
-        True,				/* compress_motion */
-        True,				/* compress_exposure */
-        True,				/* compress_enterleave */
-        False,				/* visible_interest */
-        NULL,				/* destroy */
-        CanvasResize,			/* resize */
-        CanvasExpose,                   /* expose */
-        NULL,				/* set_values */
-        NULL,				/* set_values_hook */
-        XtInheritSetValuesAlmost,	/* set_values_almost */
-        NULL,				/* get_values_hook */
-        NULL,				/* accept_focus */
-        XtVersion,			/* version */
-        NULL,				/* callback_private */
-        translations,			/* tm_table */
-        XtInheritQueryGeometry,		/* query_geometry */
-        XtInheritDisplayAccelerator,	/* display_accelerator */
-        NULL,				/* extension */
-    },
+     (WidgetClass) Superclass,  /* superclass */
+     "Canvas",                  /* class_name */
+     sizeof(CanvasRec),         /* widget_size */
+     NULL,                      /* class_initialize */
+     NULL,                      /* class_part_initialize */
+     False,                     /* class_inited */
+     CanvasInitialize,          /* initialize */
+     NULL,                      /* initialize_hook */
+     XtInheritRealize,          /* realize */
+     actions,                   /* actions */
+     XtNumber(actions),         /* num_actions */
+     resources,                 /* resources */
+     XtNumber(resources),       /* num_resources */
+     NULLQUARK,                 /* xrm_class */
+     True,                      /* compress_motion */
+     True,                      /* compress_exposure */
+     True,                      /* compress_enterleave */
+     False,                     /* visible_interest */
+     NULL,                      /* destroy */
+     CanvasResize,              /* resize */
+     CanvasExpose,              /* expose */
+     NULL,                      /* set_values */
+     NULL,                      /* set_values_hook */
+     XtInheritSetValuesAlmost,  /* set_values_almost */
+     NULL,                      /* get_values_hook */
+     NULL,                      /* accept_focus */
+     XtVersion,                 /* version */
+     NULL,                      /* callback_private */
+     translations,              /* tm_table */
+     XtInheritQueryGeometry,    /* query_geometry */
+     XtInheritDisplayAccelerator,       /* display_accelerator */
+     NULL,                      /* extension */
+     }
+    ,
     /* canvas */
     {
-        NULL,				/* extension */
-    }
+     NULL,                      /* extension */
+     }
 };
 
-WidgetClass canvasWidgetClass = (WidgetClass)&canvasClassRec;
+WidgetClass canvasWidgetClass = (WidgetClass) & canvasClassRec;
diff --git a/xorg-server/hw/dmx/config/dmxcompat.c b/xorg-server/hw/dmx/config/dmxcompat.c
index 1c72084fa..bd9f12738 100644
--- a/xorg-server/hw/dmx/config/dmxcompat.c
+++ b/xorg-server/hw/dmx/config/dmxcompat.c
@@ -52,80 +52,84 @@
 #include <string.h>
 #include <ctype.h>
 
-static int dmxVDLReadLine(FILE *str, char *buf, int len)
+static int
+dmxVDLReadLine(FILE * str, char *buf, int len)
 {
-    if (fgets(buf, len, str)) return strlen(buf);
+    if (fgets(buf, len, str))
+        return strlen(buf);
     return 0;
 }
 
-static int dmxVDLCount(const char *buf)
+static int
+dmxVDLCount(const char *buf)
 {
     return strtol(buf, NULL, 10);
 }
 
-static void dmxVDLVirtualEntry(const char *buf,
-                               char *name, int *len,
-                               int *x, int *y)
+static void
+dmxVDLVirtualEntry(const char *buf, char *name, int *len, int *x, int *y)
 {
-    char       *end;
+    char *end;
     const char *s;
-    char       *d;
-    int        start;
-    
+    char *d;
+    int start;
+
     *x = strtol(buf, &end, 10);
     *y = strtol(end, &end, 10);
 
     for (s = end, d = name, start = 1; *s && *s != '['; ++s) {
-        if (start && isspace(*s)) continue;
-        *d++  = *s;
+        if (start && isspace(*s))
+            continue;
+        *d++ = *s;
         start = 0;
     }
     *d = '\0';
-    while (d > name && isspace(d[-1])) *--d = '\0'; /* remove trailing space */
+    while (d > name && isspace(d[-1]))
+        *--d = '\0';            /* remove trailing space */
     *len = strlen(name);
 }
 
-static void dmxVDLDisplayEntry(const char *buf,
-                               char *name, int *len,
-                               int *x, int *y,
-                               int *xoff, int *yoff,
-                               int *xorig, int *yorig)
+static void
+dmxVDLDisplayEntry(const char *buf,
+                   char *name, int *len,
+                   int *x, int *y, int *xoff, int *yoff, int *xorig, int *yorig)
 {
     const char *pt;
-    char       *end;
-
-    pt   = strchr(buf, ' ');
-    strlcpy(name, buf, 1+pt-buf);
-    *len  = strlen(name);
-    
-    *x     = strtol(pt, &end, 10);
-    *y     = strtol(end, &end, 10);
+    char *end;
+
+    pt = strchr(buf, ' ');
+    strlcpy(name, buf, 1 + pt - buf);
+    *len = strlen(name);
+
+    *x = strtol(pt, &end, 10);
+    *y = strtol(end, &end, 10);
     *xorig = strtol(end, &end, 10);
     *yorig = strtol(end, &end, 10);
-    *xoff  = strtol(end, &end, 10);
-    *yoff  = strtol(end, NULL, 10);
+    *xoff = strtol(end, &end, 10);
+    *yoff = strtol(end, NULL, 10);
 }
 
 /** Read from the VDL format \a filename and return a newly allocated \a
  * DMXConfigEntryPtr */
-DMXConfigEntryPtr dmxVDLRead(const char *filename)
+DMXConfigEntryPtr
+dmxVDLRead(const char *filename)
 {
-    FILE                *str;
-    char                buf[2048]; /* RATS: Use ok */
-    char                *pt;
-    int                 lineno  = 0;
-    DMXConfigEntryPtr   entry   = NULL;
+    FILE *str;
+    char buf[2048];             /* RATS: Use ok */
+    char *pt;
+    int lineno = 0;
+    DMXConfigEntryPtr entry = NULL;
     DMXConfigVirtualPtr virtual = NULL;
-    DMXConfigSubPtr     sub     = NULL;
+    DMXConfigSubPtr sub = NULL;
     DMXConfigDisplayPtr display = NULL;
-    DMXConfigFullDimPtr fdim    = NULL;
-    int                 vcount  = 0;
-    int                 dcount  = 0;
-    int                 icount  = 0;
-    int                 x, y, xoff, yoff, xorig, yorig;
-    char                name[2048]; /* RATS: Use ok */
-    const char          *tmp;
-    int                 len;
+    DMXConfigFullDimPtr fdim = NULL;
+    int vcount = 0;
+    int dcount = 0;
+    int icount = 0;
+    int x, y, xoff, yoff, xorig, yorig;
+    char name[2048];            /* RATS: Use ok */
+    const char *tmp;
+    int len;
     enum {
         simulateFlag,
         virtualCount,
@@ -134,15 +138,18 @@ DMXConfigEntryPtr dmxVDLRead(const char *filename)
         displayEntry,
         ignoreCount,
         ignoreEntry
-    }                 state = simulateFlag;
+    } state = simulateFlag;
 
-    if (!filename) str = stdin;
-    else           str = fopen(filename, "r");
-    if (!str) return NULL;
+    if (!filename)
+        str = stdin;
+    else
+        str = fopen(filename, "r");
+    if (!str)
+        return NULL;
 
     while (dmxVDLReadLine(str, buf, sizeof(buf))) {
         DMXConfigCommentPtr comment = NULL;
-        
+
         ++lineno;
         for (pt = buf; *pt; pt++)
             if (*pt == '\r' || *pt == '\n') {
@@ -166,7 +173,7 @@ DMXConfigEntryPtr dmxVDLRead(const char *filename)
         case virtualEntry:
             len = sizeof(name);
             dmxVDLVirtualEntry(buf, name, &len, &x, &y);
-            tmp     = dmxConfigCopyString(name, len);
+            tmp = dmxConfigCopyString(name, len);
             virtual = dmxConfigCreateVirtual(NULL,
                                              dmxConfigCreateString(T_STRING,
                                                                    lineno,
@@ -186,41 +193,29 @@ DMXConfigEntryPtr dmxVDLRead(const char *filename)
         case displayEntry:
             dmxVDLDisplayEntry(buf, name, &len, &x, &y, &xoff, &yoff,
                                &xorig, &yorig);
-            tmp     = dmxConfigCopyString(name, len);
-            fdim    = dmxConfigCreateFullDim(
-                dmxConfigCreatePartDim(
-                    dmxConfigCreatePair(T_DIMENSION,
-                                        lineno,
-                                        NULL,
-                                        x, y, 0, 0),
-                    dmxConfigCreatePair(T_OFFSET,
-                                        lineno,
-                                        NULL,
-                                        xoff, yoff,
-                                        xoff, yoff)),
-                NULL);
-            display = dmxConfigCreateDisplay(NULL,
-                                             dmxConfigCreateString(T_STRING,
-                                                                   lineno,
-                                                                   NULL,
-                                                                   tmp),
-                                             fdim,
-                                             dmxConfigCreatePair(T_ORIGIN,
-                                                                 lineno,
-                                                                 NULL,
-                                                                 xorig, yorig,
-                                                                 0, 0),
-                                             NULL);
+            tmp = dmxConfigCopyString(name, len);
+            fdim =
+                dmxConfigCreateFullDim(dmxConfigCreatePartDim
+                                       (dmxConfigCreatePair
+                                        (T_DIMENSION, lineno, NULL, x, y, 0, 0),
+                                        dmxConfigCreatePair(T_OFFSET, lineno,
+                                                            NULL, xoff, yoff,
+                                                            xoff, yoff)), NULL);
+            display =
+                dmxConfigCreateDisplay(NULL,
+                                       dmxConfigCreateString(T_STRING, lineno,
+                                                             NULL, tmp), fdim,
+                                       dmxConfigCreatePair(T_ORIGIN, lineno,
+                                                           NULL, xorig, yorig,
+                                                           0, 0), NULL);
             sub = dmxConfigAddSub(sub, dmxConfigSubDisplay(display));
             if (!--dcount) {
-                state             = ignoreCount;
+                state = ignoreCount;
                 virtual->subentry = sub;
-                entry             = dmxConfigAddEntry(entry,
-                                                      dmxConfigVirtual,
-                                                      NULL,
-                                                      virtual);
-                virtual           = NULL;
-                sub               = NULL;
+                entry = dmxConfigAddEntry(entry,
+                                          dmxConfigVirtual, NULL, virtual);
+                virtual = NULL;
+                sub = NULL;
             }
             break;
         case ignoreCount:
@@ -228,7 +223,8 @@ DMXConfigEntryPtr dmxVDLRead(const char *filename)
             state = ignoreEntry;
             break;
         case ignoreEntry:
-            if (!--icount) state = virtualEntry;
+            if (!--icount)
+                state = virtualEntry;
             break;
         }
     }
diff --git a/xorg-server/hw/dmx/config/dmxconfig.c b/xorg-server/hw/dmx/config/dmxconfig.c
index a31e5f7f7..2cc9ab396 100644
--- a/xorg-server/hw/dmx/config/dmxconfig.c
+++ b/xorg-server/hw/dmx/config/dmxconfig.c
@@ -34,7 +34,6 @@
 /** \file
  * Provides interface for reading DMX configuration files and for
  * combining that information with command-line configuration parameters. */
-    
 
 #ifdef HAVE_DMX_CONFIG_H
 #include <dmx-config.h>
@@ -49,7 +48,7 @@
 #include "dmxstat.h"
 #include "parser.h"
 
-extern int  yyparse(void);
+extern int yyparse(void);
 extern FILE *yyin;
 
 static char *dmxXkbRules;
@@ -60,35 +59,39 @@ static char *dmxXkbOptions;
 
 /** Stores lists of configuration information. */
 typedef struct DMXConfigListStruct {
-    const char                 *name;
+    const char *name;
     struct DMXConfigListStruct *next;
 } DMXConfigList, *DMXConfigListPtr;
 
 /** This stucture stores the parsed configuration information. */
 typedef struct DMXConfigCmdStruct {
-    const char    *filename;
-    const char    *config;
+    const char *filename;
+    const char *config;
     DMXConfigList *displays;
     DMXConfigList *inputs;
     DMXConfigList *xinputs;
 } DMXConfigCmd, *DMXConfigCmdPtr;
 
-DMXConfigEntryPtr    dmxConfigEntry;
-static DMXConfigCmd  dmxConfigCmd;
+DMXConfigEntryPtr dmxConfigEntry;
+static DMXConfigCmd dmxConfigCmd;
 
 static int dmxDisplaysFromCommandLine;
 
 /** Make a note that \a display is the name of an X11 display that
  * should be initialized as a backend (output) display.  Called from
  * #ddxProcessArgument. */
-void dmxConfigStoreDisplay(const char *display)
+void
+dmxConfigStoreDisplay(const char *display)
 {
     DMXConfigListPtr entry = malloc(sizeof(*entry));
+
     entry->name = strdup(display);
     entry->next = NULL;
-    if (!dmxConfigCmd.displays) dmxConfigCmd.displays = entry;
+    if (!dmxConfigCmd.displays)
+        dmxConfigCmd.displays = entry;
     else {
         DMXConfigList *pt;
+
         for (pt = dmxConfigCmd.displays; pt->next; pt = pt->next);
         if (!pt)
             dmxLog(dmxFatal, "dmxConfigStoreDisplay: end of list non-NULL\n");
@@ -99,14 +102,18 @@ void dmxConfigStoreDisplay(const char *display)
 
 /** Make a note that \a input is the name of an X11 display that should
  * be used for input (either a backend or a console input device). */
-void dmxConfigStoreInput(const char *input)
+void
+dmxConfigStoreInput(const char *input)
 {
     DMXConfigListPtr entry = malloc(sizeof(*entry));
+
     entry->name = strdup(input);
     entry->next = NULL;
-    if (!dmxConfigCmd.inputs) dmxConfigCmd.inputs = entry;
+    if (!dmxConfigCmd.inputs)
+        dmxConfigCmd.inputs = entry;
     else {
         DMXConfigList *pt;
+
         for (pt = dmxConfigCmd.inputs; pt->next; pt = pt->next);
         if (!pt)
             dmxLog(dmxFatal, "dmxConfigStoreInput: end of list non-NULL\n");
@@ -116,14 +123,18 @@ void dmxConfigStoreInput(const char *input)
 
 /** Make a note that \a input is the name of an X11 display that should
  * be used for input from XInput extension devices. */
-void dmxConfigStoreXInput(const char *input)
+void
+dmxConfigStoreXInput(const char *input)
 {
     DMXConfigListPtr entry = malloc(sizeof(*entry));
+
     entry->name = strdup(input);
     entry->next = NULL;
-    if (!dmxConfigCmd.xinputs) dmxConfigCmd.xinputs = entry;
+    if (!dmxConfigCmd.xinputs)
+        dmxConfigCmd.xinputs = entry;
     else {
         DMXConfigList *pt;
+
         for (pt = dmxConfigCmd.xinputs; pt->next; pt = pt->next);
         if (!pt)
             dmxLog(dmxFatal, "dmxConfigStoreXInput: end of list non-NULL\n");
@@ -132,7 +143,8 @@ void dmxConfigStoreXInput(const char *input)
 }
 
 /** Make a note that \a file is the configuration file. */
-void dmxConfigStoreFile(const char *file)
+void
+dmxConfigStoreFile(const char *file)
 {
     if (dmxConfigCmd.filename)
         dmxLog(dmxFatal, "Only one -configfile allowed\n");
@@ -141,79 +153,89 @@ void dmxConfigStoreFile(const char *file)
 
 /** Make a note that \a config should be used as the configuration for
  * current instantiation of the DMX server. */
-void dmxConfigStoreConfig(const char *config)
+void
+dmxConfigStoreConfig(const char *config)
 {
-    if (dmxConfigCmd.config) dmxLog(dmxFatal, "Only one -config allowed\n");
+    if (dmxConfigCmd.config)
+        dmxLog(dmxFatal, "Only one -config allowed\n");
     dmxConfigCmd.config = strdup(config);
 }
 
-static int dmxConfigReadFile(const char *filename, int debug)
+static int
+dmxConfigReadFile(const char *filename, int debug)
 {
     FILE *str;
 
-    if (!(str = fopen(filename, "r"))) return -1;
+    if (!(str = fopen(filename, "r")))
+        return -1;
     dmxLog(dmxInfo, "Reading configuration file \"%s\"\n", filename);
-    yyin    = str;
+    yyin = str;
     yydebug = debug;
     yyparse();
     fclose(str);
     return 0;
 }
 
-static const char *dmxConfigMatch(const char *target, DMXConfigEntryPtr entry)
+static const char *
+dmxConfigMatch(const char *target, DMXConfigEntryPtr entry)
 {
-    DMXConfigVirtualPtr v     = entry->virtual;
-    const char          *name = NULL;
-
-    if (v && v->name) name = v->name;
-
-    if (v && !dmxConfigCmd.config) return v->name ? v->name : "<noname>";
-    if (!name)                     return NULL;
-    if (!strcmp(name, target))     return name;
+    DMXConfigVirtualPtr v = entry->virtual;
+    const char *name = NULL;
+
+    if (v && v->name)
+        name = v->name;
+
+    if (v && !dmxConfigCmd.config)
+        return v->name ? v->name : "<noname>";
+    if (!name)
+        return NULL;
+    if (!strcmp(name, target))
+        return name;
     return NULL;
 }
 
-static DMXScreenInfo *dmxConfigAddDisplay(const char *name,
-                                          int scrnWidth,   int scrnHeight,
-                                          int scrnX,       int scrnY,
-                                          int scrnXSign,   int scrnYSign,
-                                          int rootWidth,   int rootHeight,
-                                          int rootX,       int rootY,
-                                          int rootXSign,   int rootYSign)
+static DMXScreenInfo *
+dmxConfigAddDisplay(const char *name,
+                    int scrnWidth, int scrnHeight,
+                    int scrnX, int scrnY,
+                    int scrnXSign, int scrnYSign,
+                    int rootWidth, int rootHeight,
+                    int rootX, int rootY, int rootXSign, int rootYSign)
 {
     DMXScreenInfo *dmxScreen;
-    
+
     if (!(dmxScreens = realloc(dmxScreens,
-                               (dmxNumScreens+1) * sizeof(*dmxScreens))))
+                               (dmxNumScreens + 1) * sizeof(*dmxScreens))))
         dmxLog(dmxFatal,
                "dmxConfigAddDisplay: realloc failed for screen %d (%s)\n",
                dmxNumScreens, name);
-    
+
     dmxScreen = &dmxScreens[dmxNumScreens];
     memset(dmxScreen, 0, sizeof(*dmxScreen));
-    dmxScreen->name       = name;
-    dmxScreen->index      = dmxNumScreens;
-    dmxScreen->scrnWidth  = scrnWidth;
+    dmxScreen->name = name;
+    dmxScreen->index = dmxNumScreens;
+    dmxScreen->scrnWidth = scrnWidth;
     dmxScreen->scrnHeight = scrnHeight;
-    dmxScreen->scrnX      = scrnX;
-    dmxScreen->scrnY      = scrnY;
-    dmxScreen->scrnXSign  = scrnXSign;
-    dmxScreen->scrnYSign  = scrnYSign;
-    dmxScreen->rootWidth  = rootWidth;
+    dmxScreen->scrnX = scrnX;
+    dmxScreen->scrnY = scrnY;
+    dmxScreen->scrnXSign = scrnXSign;
+    dmxScreen->scrnYSign = scrnYSign;
+    dmxScreen->rootWidth = rootWidth;
     dmxScreen->rootHeight = rootHeight;
-    dmxScreen->rootX      = rootX;
-    dmxScreen->rootY      = rootY;
-    dmxScreen->stat       = dmxStatAlloc();
+    dmxScreen->rootX = rootX;
+    dmxScreen->rootY = rootY;
+    dmxScreen->stat = dmxStatAlloc();
     ++dmxNumScreens;
     return dmxScreen;
 }
 
-DMXInputInfo *dmxConfigAddInput(const char *name, int core)
+DMXInputInfo *
+dmxConfigAddInput(const char *name, int core)
 {
     DMXInputInfo *dmxInput;
 
     if (!(dmxInputs = realloc(dmxInputs,
-                              (dmxNumInputs+1) * sizeof(*dmxInputs))))
+                              (dmxNumInputs + 1) * sizeof(*dmxInputs))))
         dmxLog(dmxFatal,
                "dmxConfigAddInput: realloc failed for input %d (%s)\n",
                dmxNumInputs, name);
@@ -221,71 +243,79 @@ DMXInputInfo *dmxConfigAddInput(const char *name, int core)
     dmxInput = &dmxInputs[dmxNumInputs];
 
     memset(dmxInput, 0, sizeof(*dmxInput));
-    dmxInput->name     = name;
+    dmxInput->name = name;
     dmxInput->inputIdx = dmxNumInputs;
-    dmxInput->scrnIdx  = -1;
-    dmxInput->core     = core;
+    dmxInput->scrnIdx = -1;
+    dmxInput->core = core;
     ++dmxNumInputs;
     return dmxInput;
 }
 
-static void dmxConfigCopyFromDisplay(DMXConfigDisplayPtr d)
+static void
+dmxConfigCopyFromDisplay(DMXConfigDisplayPtr d)
 {
     DMXScreenInfo *dmxScreen;
 
-    dmxScreen         = dmxConfigAddDisplay(d->name,
-                                            d->scrnWidth, d->scrnHeight,
-                                            d->scrnX,     d->scrnY,
-                                            d->scrnXSign, d->scrnYSign,
-                                            d->rootWidth, d->rootHeight,
-                                            d->rootX,     d->rootY,
-                                            d->rootXSign, d->rootXSign);
-    dmxScreen->where  = PosAbsolute;
+    dmxScreen = dmxConfigAddDisplay(d->name,
+                                    d->scrnWidth, d->scrnHeight,
+                                    d->scrnX, d->scrnY,
+                                    d->scrnXSign, d->scrnYSign,
+                                    d->rootWidth, d->rootHeight,
+                                    d->rootX, d->rootY,
+                                    d->rootXSign, d->rootXSign);
+    dmxScreen->where = PosAbsolute;
     dmxScreen->whereX = d->rootXOrigin;
     dmxScreen->whereY = d->rootYOrigin;
 }
 
-static void dmxConfigCopyFromWall(DMXConfigWallPtr w)
+static void
+dmxConfigCopyFromWall(DMXConfigWallPtr w)
 {
     DMXConfigStringPtr pt;
-    DMXScreenInfo      *dmxScreen;
-    int                edge = dmxNumScreens;
-    int                last = dmxNumScreens;
+    DMXScreenInfo *dmxScreen;
+    int edge = dmxNumScreens;
+    int last = dmxNumScreens;
 
-    if (!w->xwall && !w->ywall) { /* Try to make it square */
+    if (!w->xwall && !w->ywall) {       /* Try to make it square */
         int count;
-        for (pt = w->nameList, count = 0; pt; pt = pt->next) ++count;
+
+        for (pt = w->nameList, count = 0; pt; pt = pt->next)
+            ++count;
         w->xwall = sqrt(count) + .5;
     }
 
     for (pt = w->nameList; pt; pt = pt->next) {
         dmxScreen = dmxConfigAddDisplay(pt->string, w->width, w->height,
                                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-        if (pt == w->nameList) { /* Upper left */
-            dmxScreen->where  = PosAbsolute;
+        if (pt == w->nameList) {        /* Upper left */
+            dmxScreen->where = PosAbsolute;
             dmxScreen->whereX = 0;
             dmxScreen->whereY = 0;
-        } else if (w->xwall) {  /* Tile left to right, then top to bottom */
-            if (!((dmxNumScreens-1) % w->xwall)) {
-                dmxScreen->where          = PosBelow;
+        }
+        else if (w->xwall) {    /* Tile left to right, then top to bottom */
+            if (!((dmxNumScreens - 1) % w->xwall)) {
+                dmxScreen->where = PosBelow;
                 dmxScreen->whereRefScreen = edge;
-                edge                      = dmxNumScreens-1;
-            } else {
-                dmxScreen->where          = PosRightOf;
+                edge = dmxNumScreens - 1;
+            }
+            else {
+                dmxScreen->where = PosRightOf;
                 dmxScreen->whereRefScreen = last;
             }
-        } else {                /* Tile top to bottom, then left to right */
-            if (!((dmxNumScreens-1) % w->ywall)) {
-                dmxScreen->where          = PosRightOf;
+        }
+        else {                  /* Tile top to bottom, then left to right */
+            if (!((dmxNumScreens - 1) % w->ywall)) {
+                dmxScreen->where = PosRightOf;
                 dmxScreen->whereRefScreen = edge;
-                edge                      = dmxNumScreens-1;
-            } else {
-                dmxScreen->where          = PosBelow;
+                edge = dmxNumScreens - 1;
+            }
+            else {
+                dmxScreen->where = PosBelow;
                 dmxScreen->whereRefScreen = last;
             }
 
         }
-        last = dmxNumScreens-1;
+        last = dmxNumScreens - 1;
         if (dmxScreen->where == PosAbsolute)
             dmxLog(dmxInfo, "Added %s at %d %d\n",
                    pt->string, dmxScreen->whereX, dmxScreen->whereY);
@@ -297,60 +327,79 @@ static void dmxConfigCopyFromWall(DMXConfigWallPtr w)
     }
 }
 
-static void dmxConfigCopyFromOption(DMXConfigOptionPtr o)
+static void
+dmxConfigCopyFromOption(DMXConfigOptionPtr o)
 {
     DMXConfigStringPtr pt;
-    int                argc   = 0;
-    char               **argv = NULL;
+    int argc = 0;
+    char **argv = NULL;
 
-    if (serverGeneration != 1) return; /* FIXME: only do once, for now */
-    if (!o || !o->string) return;
+    if (serverGeneration != 1)
+        return;                 /* FIXME: only do once, for now */
+    if (!o || !o->string)
+        return;
     for (pt = o->option; pt; pt = pt->next) {
         if (pt->string) {
             ++argc;
-            argv = realloc(argv, (argc+1) * sizeof(*argv));
-            argv[argc] = (char *)pt->string;
+            argv = realloc(argv, (argc + 1) * sizeof(*argv));
+            argv[argc] = (char *) pt->string;
         }
     }
     argv[0] = NULL;
-    ProcessCommandLine(argc+1, argv);
+    ProcessCommandLine(argc + 1, argv);
     free(argv);
 }
 
-static void dmxConfigCopyFromParam(DMXConfigParamPtr p)
+static void
+dmxConfigCopyFromParam(DMXConfigParamPtr p)
 {
     const char **argv;
-    int        argc;
-    
+    int argc;
+
     if ((argv = dmxConfigLookupParam(p, "xkbrules", &argc)) && argc == 2) {
         dmxConfigSetXkbRules(argv[1]);
-    } else if ((argv = dmxConfigLookupParam(p, "xkbmodel", &argc))
-               && argc == 2) {
+    }
+    else if ((argv = dmxConfigLookupParam(p, "xkbmodel", &argc))
+             && argc == 2) {
         dmxConfigSetXkbModel(argv[1]);
-    } else if ((argv = dmxConfigLookupParam(p, "xkblayout", &argc))
-               && argc == 2) {
+    }
+    else if ((argv = dmxConfigLookupParam(p, "xkblayout", &argc))
+             && argc == 2) {
         dmxConfigSetXkbLayout(argv[1]);
-    } else if ((argv = dmxConfigLookupParam(p, "xkbvariant", &argc))
-               && argc == 2) {
+    }
+    else if ((argv = dmxConfigLookupParam(p, "xkbvariant", &argc))
+             && argc == 2) {
         dmxConfigSetXkbVariant(argv[1]);
-    } else if ((argv = dmxConfigLookupParam(p, "xkboptions", &argc))
-               && argc == 2) {
+    }
+    else if ((argv = dmxConfigLookupParam(p, "xkboptions", &argc))
+             && argc == 2) {
         dmxConfigSetXkbOptions(argv[1]);
     }
 }
 
-static void dmxConfigCopyData(DMXConfigVirtualPtr v)
+static void
+dmxConfigCopyData(DMXConfigVirtualPtr v)
 {
     DMXConfigSubPtr sub;
-    
-    if (v->dim) dmxSetWidthHeight(v->dim->x, v->dim->y);
-    else        dmxSetWidthHeight(0, 0);
+
+    if (v->dim)
+        dmxSetWidthHeight(v->dim->x, v->dim->y);
+    else
+        dmxSetWidthHeight(0, 0);
     for (sub = v->subentry; sub; sub = sub->next) {
         switch (sub->type) {
-        case dmxConfigDisplay: dmxConfigCopyFromDisplay(sub->display); break;
-        case dmxConfigWall:    dmxConfigCopyFromWall(sub->wall);       break;
-        case dmxConfigOption:  dmxConfigCopyFromOption(sub->option);   break;
-        case dmxConfigParam:   dmxConfigCopyFromParam(sub->param);     break;
+        case dmxConfigDisplay:
+            dmxConfigCopyFromDisplay(sub->display);
+            break;
+        case dmxConfigWall:
+            dmxConfigCopyFromWall(sub->wall);
+            break;
+        case dmxConfigOption:
+            dmxConfigCopyFromOption(sub->option);
+            break;
+        case dmxConfigParam:
+            dmxConfigCopyFromParam(sub->param);
+            break;
         default:
             dmxLog(dmxFatal,
                    "dmxConfigCopyData: not a display, wall, or value\n");
@@ -358,25 +407,29 @@ static void dmxConfigCopyData(DMXConfigVirtualPtr v)
     }
 }
 
-static void dmxConfigFromCommandLine(void)
+static void
+dmxConfigFromCommandLine(void)
 {
     DMXConfigListPtr pt;
-    
+
     dmxLog(dmxInfo, "Using configuration from command line\n");
     for (pt = dmxConfigCmd.displays; pt; pt = pt->next) {
         DMXScreenInfo *dmxScreen = dmxConfigAddDisplay(pt->name,
                                                        0, 0, 0, 0, 0, 0,
                                                        0, 0, 0, 0, 0, 0);
+
         if (dmxNumScreens == 1) {
-            dmxScreen->where  = PosAbsolute;
+            dmxScreen->where = PosAbsolute;
             dmxScreen->whereX = 0;
             dmxScreen->whereY = 0;
             dmxLog(dmxInfo, "Added %s at %d %d\n",
                    dmxScreen->name, dmxScreen->whereX, dmxScreen->whereY);
-        } else {
-            dmxScreen->where          = PosRightOf;
+        }
+        else {
+            dmxScreen->where = PosRightOf;
             dmxScreen->whereRefScreen = dmxNumScreens - 2;
-            if (dmxScreen->whereRefScreen < 0) dmxScreen->whereRefScreen = 0;
+            if (dmxScreen->whereRefScreen < 0)
+                dmxScreen->whereRefScreen = 0;
             dmxLog(dmxInfo, "Added %s %s %s\n",
                    dmxScreen->name,
                    dmxScreen->where == PosBelow ? "below" : "right of",
@@ -385,14 +438,16 @@ static void dmxConfigFromCommandLine(void)
     }
 }
 
-static void dmxConfigFromConfigFile(void)
+static void
+dmxConfigFromConfigFile(void)
 {
     DMXConfigEntryPtr pt;
-    const char        *name;
+    const char *name;
 
     for (pt = dmxConfigEntry; pt; pt = pt->next) {
-                                /* FIXME -- if an input is specified, use it */
-        if (pt->type != dmxConfigVirtual) continue;
+        /* FIXME -- if an input is specified, use it */
+        if (pt->type != dmxConfigVirtual)
+            continue;
         if ((name = dmxConfigMatch(dmxConfigCmd.config, pt))) {
             dmxLog(dmxInfo, "Using configuration \"%s\"\n", name);
             dmxConfigCopyData(pt->virtual);
@@ -403,22 +458,26 @@ static void dmxConfigFromConfigFile(void)
            dmxConfigCmd.config, dmxConfigCmd.filename);
 }
 
-static void dmxConfigConfigInputs(void)
+static void
+dmxConfigConfigInputs(void)
 {
     DMXConfigListPtr pt;
 
-    if (dmxNumInputs) return;
-    
-    if (dmxConfigCmd.inputs) {   /* Use command line */
+    if (dmxNumInputs)
+        return;
+
+    if (dmxConfigCmd.inputs) {  /* Use command line */
         for (pt = dmxConfigCmd.inputs; pt; pt = pt->next)
             dmxConfigAddInput(pt->name, TRUE);
-    } else if (dmxNumScreens) { /* Use first display */
+    }
+    else if (dmxNumScreens) {   /* Use first display */
         dmxConfigAddInput(dmxScreens[0].name, TRUE);
-    } else {                     /* Use dummy */
+    }
+    else {                      /* Use dummy */
         dmxConfigAddInput("dummy", TRUE);
     }
 
-    if (dmxConfigCmd.xinputs) {  /* Non-core devices from command line */
+    if (dmxConfigCmd.xinputs) { /* Non-core devices from command line */
         for (pt = dmxConfigCmd.xinputs; pt; pt = pt->next)
             dmxConfigAddInput(pt->name, FALSE);
     }
@@ -427,7 +486,8 @@ static void dmxConfigConfigInputs(void)
 /** Set up the appropriate global variables so that the DMX server will
  * be initialized using the configuration specified in the config file
  * and on the command line. */
-void dmxConfigConfigure(void)
+void
+dmxConfigConfigure(void)
 {
     if (dmxConfigEntry) {
         dmxConfigFreeEntry(dmxConfigEntry);
@@ -440,7 +500,8 @@ void dmxConfigConfigure(void)
                    dmxConfigCmd.filename);
         dmxConfigReadFile(dmxConfigCmd.filename, 0);
         dmxConfigFromConfigFile();
-    } else {
+    }
+    else {
         if (dmxConfigCmd.config)
             dmxLog(dmxWarning,
                    "Configuration name (%s) without configuration file\n",
@@ -454,11 +515,13 @@ void dmxConfigConfigure(void)
  * sets MAXSCREENS to that value.  This is difficult since the number
  * depends on the command line (which is easy to count) or on the config
  * file, which has to be parsed. */
-void dmxConfigSetMaxScreens(void)
+void
+dmxConfigSetMaxScreens(void)
 {
     static int processing = 0;
 
-    if (processing) return;     /* Prevent reentry via ProcessCommandLine */
+    if (processing)
+        return;                 /* Prevent reentry via ProcessCommandLine */
     processing = 1;
     if (dmxConfigCmd.filename) {
         if (!dmxNumScreens)
@@ -466,7 +529,8 @@ void dmxConfigSetMaxScreens(void)
 #ifndef MAXSCREENS
         SetMaxScreens(dmxNumScreens);
 #endif
-    } else
+    }
+    else
 #ifndef MAXSCREENS
         SetMaxScreens(dmxDisplaysFromCommandLine);
 #endif
@@ -490,8 +554,8 @@ void dmxConfigSetMaxScreens(void)
      return (char *)(dmx##glob ? dmx##glob : def);                            \
  }
 
-GEN(rules,   XkbRules,   XKB_DFLT_RULES)
-GEN(model,   XkbModel,   XKB_DFLT_MODEL)
-GEN(layout,  XkbLayout,  XKB_DFLT_LAYOUT)
-GEN(variant, XkbVariant, XKB_DFLT_VARIANT)
-GEN(options, XkbOptions, XKB_DFLT_OPTIONS)
+GEN(rules, XkbRules, XKB_DFLT_RULES)
+    GEN(model, XkbModel, XKB_DFLT_MODEL)
+    GEN(layout, XkbLayout, XKB_DFLT_LAYOUT)
+    GEN(variant, XkbVariant, XKB_DFLT_VARIANT)
+    GEN(options, XkbOptions, XKB_DFLT_OPTIONS)
diff --git a/xorg-server/hw/dmx/config/dmxparse.c b/xorg-server/hw/dmx/config/dmxparse.c
index f75151eac..cf510844d 100644
--- a/xorg-server/hw/dmx/config/dmxparse.c
+++ b/xorg-server/hw/dmx/config/dmxparse.c
@@ -1,607 +1,688 @@
-/*

- * Copyright 2002 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- *

- * This file provides support routines and helper functions to be used

- * by the DMX configuration file parser.

- *

- * Because the DMX configuration file parsing should be capable of being

- * used in a stand-alone fashion (i.e., independent from the DMX server

- * source tree), no dependencies on other DMX routines are made. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <stdarg.h>

-#include "dmxparse.h"

-

-/** A general error logging routine that does not depend on the dmxLog

- * functions. */

-void dmxConfigLog(const char *format, ...)

-{

-    va_list args;

-    

-    va_start(args, format);

-    vprintf(format, args);      /* RATS: All calls to dmxConfigLog from

-                                 * dmxparse.c and dmxprint.c use a

-                                 * trusted format. */

-    va_end(args);

-}

-

-void *dmxConfigAlloc(unsigned long bytes)

-{

-    void *area = calloc(1, bytes);

-    if (!area) {

-        dmxConfigLog("dmxConfigAlloc: out of memory\n");

-        return NULL;

-    }

-    return area;

-}

-

-void *dmxConfigRealloc(void *orig, unsigned long orig_bytes,

-                       unsigned long bytes)

-{

-    unsigned char *area = realloc(orig, bytes);

-    if (!area) {

-        dmxConfigLog("dmxConfigRealloc: out of memory\n");

-        return NULL;

-    }

-    memset(area + orig_bytes, 0, bytes - orig_bytes);

-    return area;

-}

-

-const char *dmxConfigCopyString(const char *string, int length)

-{

-    char *copy;

-    

-    if (!length) length = strlen(string);

-    copy = dmxConfigAlloc(length + 1);

-    if (length) strncpy(copy, string, length);

-    copy[length] = '\0';

-    return copy;

-}

-

-void dmxConfigFree(void *area)

-{

-    free(area);

-}

-

-DMXConfigTokenPtr dmxConfigCreateToken(int token, int line,

-                                       const char *comment)

-{

-    DMXConfigTokenPtr pToken = dmxConfigAlloc(sizeof(*pToken));

-    pToken->token   = token;

-    pToken->line    = line;

-    pToken->comment = comment;

-    return pToken;

-}

-

-void dmxConfigFreeToken(DMXConfigTokenPtr p)

-{

-    if (!p) return;

-    dmxConfigFree((void *)p->comment);

-    dmxConfigFree(p);

-}

-

-DMXConfigStringPtr dmxConfigCreateString(int token, int line,

-                                         const char *comment,

-                                         const char *string)

-{

-    DMXConfigStringPtr pString = dmxConfigAlloc(sizeof(*pString));

-

-    pString->token   = token;

-    pString->line    = line;

-    pString->comment = comment;

-    pString->string  = string;

-    return pString;

-}

-

-void dmxConfigFreeString(DMXConfigStringPtr p)

-{

-    DMXConfigStringPtr next;

-

-    if (!p) return;

-    do {

-        next = p->next;

-        dmxConfigFree((void *)p->comment);

-        dmxConfigFree((void *)p->string);

-        dmxConfigFree(p);

-    } while ((p = next));

-}

- 

-DMXConfigNumberPtr dmxConfigCreateNumber(int token, int line,

-                                         const char *comment,

-                                         int number)

-{

-    DMXConfigNumberPtr pNumber = dmxConfigAlloc(sizeof(*pNumber));

-

-    pNumber->token   = token;

-    pNumber->line    = line;

-    pNumber->comment = comment;

-    pNumber->number  = number;

-    return pNumber;

-}

-

-void dmxConfigFreeNumber(DMXConfigNumberPtr p)

-{

-    if (!p) return;

-    dmxConfigFree((void *)p->comment);

-    dmxConfigFree(p);

-}

-

-DMXConfigPairPtr dmxConfigCreatePair(int token, int line,

-                                     const char *comment,

-                                     int x, int y,

-                                     int xsign, int ysign)

-{

-    DMXConfigPairPtr pPair = dmxConfigAlloc(sizeof(*pPair));

-

-    pPair->token   = token;

-    pPair->line    = line;

-    pPair->comment = comment;

-    pPair->x       = x;

-    pPair->y       = y;

-    pPair->xsign   = (xsign < 0) ? -1 : 1;

-    pPair->ysign   = (ysign < 0) ? -1 : 1;

-    return pPair;

-}

-

-void dmxConfigFreePair(DMXConfigPairPtr p)

-{

-    if (!p) return;

-    dmxConfigFree((void *)p->comment);

-    dmxConfigFree(p);

-}

-

-DMXConfigCommentPtr dmxConfigCreateComment(int token, int line,

-                                           const char *comment)

-{

-    DMXConfigCommentPtr pComment = dmxConfigAlloc(sizeof(*pComment));

-

-    pComment->token   = token;

-    pComment->line    = line;

-    pComment->comment = comment;

-    return pComment;

-}

-

-void dmxConfigFreeComment(DMXConfigCommentPtr p)

-{

-    if (!p) return;

-    dmxConfigFree((void *)p->comment);

-    dmxConfigFree(p);

-}

-

-DMXConfigPartDimPtr dmxConfigCreatePartDim(DMXConfigPairPtr pDim,

-                                           DMXConfigPairPtr pOffset)

-{

-    DMXConfigPartDimPtr pPart = dmxConfigAlloc(sizeof(*pPart));

-    pPart->dim    = pDim;

-    pPart->offset = pOffset;

-    return pPart;

-}

-

-void dmxConfigFreePartDim(DMXConfigPartDimPtr p)

-{

-    if (!p) return;

-    dmxConfigFreePair(p->dim);

-    dmxConfigFreePair(p->offset);

-    dmxConfigFree(p);

-}

-

-DMXConfigFullDimPtr dmxConfigCreateFullDim(DMXConfigPartDimPtr pScrn,

-                                           DMXConfigPartDimPtr pRoot)

-{

-    DMXConfigFullDimPtr pFull = dmxConfigAlloc(sizeof(*pFull));

-    pFull->scrn = pScrn;

-    pFull->root = pRoot;

-    return pFull;

-}

-

-void dmxConfigFreeFullDim(DMXConfigFullDimPtr p)

-{

-    if (!p) return;

-    dmxConfigFreePartDim(p->scrn);

-    dmxConfigFreePartDim(p->root);

-    dmxConfigFree(p);

-}

-

-DMXConfigDisplayPtr dmxConfigCreateDisplay(DMXConfigTokenPtr pStart,

-                                           DMXConfigStringPtr pName,

-                                           DMXConfigFullDimPtr pDim,

-                                           DMXConfigPairPtr pOrigin,

-                                           DMXConfigTokenPtr pEnd)

-{

-    DMXConfigDisplayPtr pDisplay = dmxConfigAlloc(sizeof(*pDisplay));

-

-    pDisplay->start          = pStart;

-    pDisplay->dname          = pName;

-    pDisplay->dim            = pDim;

-    pDisplay->origin         = pOrigin;

-    pDisplay->end            = pEnd;

-

-    pDisplay->name           = pName ? pName->string : NULL;

-    pDisplay->rootXOrigin    = pOrigin ? pOrigin->x : 0;

-    pDisplay->rootYOrigin    = pOrigin ? pOrigin->y : 0;

-

-    if (pDim && pDim->scrn && pDim->scrn->dim) {

-        pDisplay->scrnWidth  = pDim->scrn->dim->x;

-        pDisplay->scrnHeight = pDim->scrn->dim->y;

-    }

-    if (pDim && pDim->scrn && pDim->scrn->offset) {

-        pDisplay->scrnX      = pDim->scrn->offset->x;

-        pDisplay->scrnY      = pDim->scrn->offset->y;

-        pDisplay->scrnXSign  = pDim->scrn->offset->xsign;

-        pDisplay->scrnYSign  = pDim->scrn->offset->ysign;

-    }

-    

-    if (pDim && pDim->root) {

-        if (pDim->root->dim) {

-            pDisplay->rootWidth  = pDim->root->dim->x;

-            pDisplay->rootHeight = pDim->root->dim->y;

-        }

-        if (pDim->root->offset) {

-            pDisplay->rootX      = pDim->root->offset->x;

-            pDisplay->rootY      = pDim->root->offset->y;

-            pDisplay->rootXSign  = pDim->root->offset->xsign;

-            pDisplay->rootYSign  = pDim->root->offset->ysign;

-        }

-    } else {                    /* If no root specification, copy width

-                                 * and height from scrn -- leave offset

-                                 * as zero, since it is relative to

-                                 * scrn. */

-        pDisplay->rootWidth  = pDisplay->scrnWidth;

-        pDisplay->rootHeight = pDisplay->scrnHeight;

-    }

-

-

-    return pDisplay;

-}

-

-void dmxConfigFreeDisplay(DMXConfigDisplayPtr p)

-{

-    if (!p) return;

-    dmxConfigFreeToken(p->start);

-    dmxConfigFreeString(p->dname);

-    dmxConfigFreeFullDim(p->dim);

-    dmxConfigFreeToken(p->end);

-    dmxConfigFree(p);

-}

-

-DMXConfigWallPtr dmxConfigCreateWall(DMXConfigTokenPtr pStart,

-                                     DMXConfigPairPtr pWallDim,

-                                     DMXConfigPairPtr pDisplayDim,

-                                     DMXConfigStringPtr pNameList,

-                                     DMXConfigTokenPtr pEnd)

-{

-    DMXConfigWallPtr pWall = dmxConfigAlloc(sizeof(*pWall));

-

-    pWall->start      = pStart;

-    pWall->wallDim    = pWallDim;

-    pWall->displayDim = pDisplayDim;

-    pWall->nameList   = pNameList;

-    pWall->end        = pEnd;

-

-    pWall->width      = pDisplayDim ? pDisplayDim->x : 0;

-    pWall->height     = pDisplayDim ? pDisplayDim->y : 0;

-    pWall->xwall      = pWallDim    ? pWallDim->x    : 0;

-    pWall->ywall      = pWallDim    ? pWallDim->y    : 0;

-

-    return pWall;

-}

-

-void dmxConfigFreeWall(DMXConfigWallPtr p)

-{

-    if (!p) return;

-    dmxConfigFreeToken(p->start);

-    dmxConfigFreePair(p->wallDim);

-    dmxConfigFreePair(p->displayDim);

-    dmxConfigFreeString(p->nameList);

-    dmxConfigFreeToken(p->end);

-    dmxConfigFree(p);

-}

-

-DMXConfigOptionPtr dmxConfigCreateOption(DMXConfigTokenPtr pStart,

-                                         DMXConfigStringPtr pOption,

-                                         DMXConfigTokenPtr pEnd)

-{

-    int                length = 0;

-    int                offset = 0;

-    DMXConfigStringPtr p;

-    DMXConfigOptionPtr option = dmxConfigAlloc(sizeof(*option));

-

-    for (p = pOption; p; p = p->next) {

-        if (p->string) length += strlen(p->string) + 1;

-    }

-

-    option->string = dmxConfigAlloc(length + 1);

-    

-    for (p = pOption; p; p = p->next) {

-        if (p->string) {

-            int len = strlen(p->string);

-            strncpy(option->string + offset, p->string, len);

-            offset += len;

-            if (p->next) option->string[offset++] = ' ';

-        }

-    }

-    option->string[offset] = '\0';

-

-    option->start  = pStart;

-    option->option = pOption;

-    option->end    = pEnd;

-

-    return option;

-}

-

-void dmxConfigFreeOption(DMXConfigOptionPtr p)

-{

-    if (!p) return;

-    free(p->string);

-    dmxConfigFreeToken(p->start);

-    dmxConfigFreeString(p->option);

-    dmxConfigFreeToken(p->end);

-    dmxConfigFree(p);

-}

-

-const char **dmxConfigLookupParam(DMXConfigParamPtr p, const char *key,

-                                  int *argc)

-{

-    DMXConfigParamPtr pt;

-

-    for (pt = p; pt; pt = pt->next) {

-        if (pt->argv && !strcasecmp(pt->argv[0], key)) {

-            *argc = pt->argc;

-            return pt->argv;

-        }

-    }

-    *argc  = 0;

-    return NULL;

-}

-

-DMXConfigParamPtr dmxConfigCreateParam(DMXConfigTokenPtr pStart,

-                                       DMXConfigTokenPtr pOpen,

-                                       DMXConfigStringPtr pParam,

-                                       DMXConfigTokenPtr pClose,

-                                       DMXConfigTokenPtr pEnd)

-{

-    DMXConfigParamPtr  param = dmxConfigAlloc(sizeof(*param));

-    DMXConfigStringPtr pt;

-

-    param->argc = 0;

-    param->argv = NULL;

-    for (pt = pParam; pt; pt = pt->next) {

-        if (pt->string) {

-            param->argv = realloc(param->argv,

-                                  (param->argc+2) * sizeof(*param->argv));

-            param->argv[param->argc] = pt->string;

-            ++param->argc;

-        }

-    }

-    if (param->argv) param->argv[param->argc] = NULL;

-

-    param->start = pStart;

-    param->open  = pOpen;

-    param->param = pParam;

-    param->close = pClose;

-    param->end   = pEnd;

-

-    return param;

-}

-

-void dmxConfigFreeParam(DMXConfigParamPtr p)

-{

-    DMXConfigParamPtr next;

-

-    if (!p) return;

-    do {

-        next = p->next;

-        dmxConfigFreeToken(p->start);

-        dmxConfigFreeToken(p->open);

-        dmxConfigFreeString(p->param);

-        dmxConfigFreeToken(p->close);

-        dmxConfigFreeToken(p->end);

-        dmxConfigFree(p->argv);

-        dmxConfigFree(p);

-    } while ((p = next));

-}

-

-DMXConfigSubPtr dmxConfigCreateSub(DMXConfigType type,

-                                   DMXConfigCommentPtr comment,

-                                   DMXConfigDisplayPtr display,

-                                   DMXConfigWallPtr wall,

-                                   DMXConfigOptionPtr option,

-                                   DMXConfigParamPtr param)

-{

-    DMXConfigSubPtr pSub = dmxConfigAlloc(sizeof(*pSub));

-    pSub->type = type;

-    switch (type) {

-    case dmxConfigComment: pSub->comment = comment;                     break;

-    case dmxConfigDisplay: pSub->display = display;                     break;

-    case dmxConfigWall:    pSub->wall    = wall;                        break;

-    case dmxConfigOption:  pSub->option  = option;                      break;

-    case dmxConfigParam:   pSub->param   = param;                       break;

-    default: dmxConfigLog("Type %d not supported in subentry\n", type); break;

-    }

-    return pSub;

-}

-

-void dmxConfigFreeSub(DMXConfigSubPtr sub)

-{

-    DMXConfigSubPtr pt;

-

-    for (pt = sub; pt; pt = pt->next) {

-        switch (pt->type) {

-        case dmxConfigComment: dmxConfigFreeComment(pt->comment); break;

-        case dmxConfigDisplay: dmxConfigFreeDisplay(pt->display); break;

-        case dmxConfigWall:    dmxConfigFreeWall(pt->wall);       break;

-        case dmxConfigOption:  dmxConfigFreeOption(pt->option);   break;

-        case dmxConfigParam:   dmxConfigFreeParam(pt->param);     break;

-        default:

-            dmxConfigLog("Type %d not supported in subentry\n", pt->type);

-            break;

-        }

-    }

-    dmxConfigFree(sub);

-}

-

-DMXConfigSubPtr dmxConfigSubComment(DMXConfigCommentPtr comment)

-{

-    return dmxConfigCreateSub(dmxConfigComment, comment, NULL, NULL, NULL,

-                              NULL);

-}

-

-DMXConfigSubPtr dmxConfigSubDisplay(DMXConfigDisplayPtr display)

-{

-    return dmxConfigCreateSub(dmxConfigDisplay, NULL, display, NULL, NULL,

-                              NULL);

-}

-

-DMXConfigSubPtr dmxConfigSubWall(DMXConfigWallPtr wall)

-{

-    return dmxConfigCreateSub(dmxConfigWall, NULL, NULL, wall, NULL, NULL);

-}

-

-DMXConfigSubPtr dmxConfigSubOption(DMXConfigOptionPtr option)

-{

-    return dmxConfigCreateSub(dmxConfigOption, NULL, NULL, NULL, option, NULL);

-}

-

-DMXConfigSubPtr dmxConfigSubParam(DMXConfigParamPtr param)

-{

-    return dmxConfigCreateSub(dmxConfigParam, NULL, NULL, NULL, NULL, param);

-}

-

-extern DMXConfigSubPtr dmxConfigAddSub(DMXConfigSubPtr head,

-                                       DMXConfigSubPtr sub)

-{

-    DMXConfigSubPtr pt;

-    

-    if (!head) return sub;

-    for (pt = head; pt->next; pt = pt->next);

-    pt->next = sub;

-    return head;

-}

-

-DMXConfigVirtualPtr dmxConfigCreateVirtual(DMXConfigTokenPtr pStart,

-                                           DMXConfigStringPtr pName,

-                                           DMXConfigPairPtr pDim,

-                                           DMXConfigTokenPtr pOpen,

-                                           DMXConfigSubPtr pSubentry,

-                                           DMXConfigTokenPtr pClose)

-{

-    DMXConfigVirtualPtr pVirtual = dmxConfigAlloc(sizeof(*pVirtual));

-

-    pVirtual->start    = pStart;

-    pVirtual->vname    = pName;

-    pVirtual->dim      = pDim;

-    pVirtual->open     = pOpen;

-    pVirtual->subentry = pSubentry;

-    pVirtual->close    = pClose;

-

-    pVirtual->name     = pName ? pName->string : NULL;

-    pVirtual->width    = pDim ? pDim->x : 0;

-    pVirtual->height   = pDim ? pDim->y : 0;

-    

-    return pVirtual;

-}

-

-void dmxConfigFreeVirtual(DMXConfigVirtualPtr virtual)

-{

-    dmxConfigFreeToken(virtual->start);

-    dmxConfigFreeString(virtual->vname);

-    dmxConfigFreePair(virtual->dim);

-    dmxConfigFreeToken(virtual->open);

-    dmxConfigFreeSub(virtual->subentry);

-    dmxConfigFreeToken(virtual->close);

-    dmxConfigFree(virtual);

-}

-

-DMXConfigEntryPtr dmxConfigCreateEntry(DMXConfigType type,

-                                       DMXConfigCommentPtr comment,

-                                       DMXConfigVirtualPtr virtual)

-{

-    DMXConfigEntryPtr pEntry = dmxConfigAlloc(sizeof(*pEntry));

-    pEntry->type = type;

-    switch (type) {

-    case dmxConfigComment: pEntry->comment = comment;                break;

-    case dmxConfigVirtual: pEntry->virtual = virtual;                break;

-    default: dmxConfigLog("Type %d not supported in entry\n", type); break;

-    }

-    return pEntry;

-}

-

-void dmxConfigFreeEntry(DMXConfigEntryPtr entry)

-{

-    DMXConfigEntryPtr pt;

-

-    for (pt = entry; pt; pt = pt->next) {

-        switch (pt->type) {

-        case dmxConfigComment: dmxConfigFreeComment(pt->comment); break;

-        case dmxConfigVirtual: dmxConfigFreeVirtual(pt->virtual); break;

-        default:

-            dmxConfigLog("Type %d not supported in entry\n", pt->type);

-            break;

-        }

-    }

-    dmxConfigFree(entry);

-}

-

-DMXConfigEntryPtr dmxConfigAddEntry(DMXConfigEntryPtr head,

-                                    DMXConfigType type,

-                                    DMXConfigCommentPtr comment,

-                                    DMXConfigVirtualPtr virtual)

-{

-    DMXConfigEntryPtr child = dmxConfigCreateEntry(type, comment, virtual);

-    DMXConfigEntryPtr pt;

-

-    if (!head) return child;

-

-    for (pt = head; pt->next; pt = pt->next);

-    pt->next = child;

-

-    return head;

-}

-

-DMXConfigEntryPtr dmxConfigEntryComment(DMXConfigCommentPtr comment)

-{

-    return dmxConfigCreateEntry(dmxConfigComment, comment, NULL);

-}

-

-DMXConfigEntryPtr dmxConfigEntryVirtual(DMXConfigVirtualPtr virtual)

-{

-    return dmxConfigCreateEntry(dmxConfigVirtual, NULL, virtual);

-}

+/*
+ * Copyright 2002 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ *
+ * This file provides support routines and helper functions to be used
+ * by the DMX configuration file parser.
+ *
+ * Because the DMX configuration file parsing should be capable of being
+ * used in a stand-alone fashion (i.e., independent from the DMX server
+ * source tree), no dependencies on other DMX routines are made. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include "dmxparse.h"
+
+/** A general error logging routine that does not depend on the dmxLog
+ * functions. */
+void
+dmxConfigLog(const char *format, ...)
+{
+    va_list args;
+
+    va_start(args, format);
+    vprintf(format, args);      /* RATS: All calls to dmxConfigLog from
+                                 * dmxparse.c and dmxprint.c use a
+                                 * trusted format. */
+    va_end(args);
+}
+
+void *
+dmxConfigAlloc(unsigned long bytes)
+{
+    void *area = calloc(1, bytes);
+
+    if (!area) {
+        dmxConfigLog("dmxConfigAlloc: out of memory\n");
+        return NULL;
+    }
+    return area;
+}
+
+void *
+dmxConfigRealloc(void *orig, unsigned long orig_bytes, unsigned long bytes)
+{
+    unsigned char *area = realloc(orig, bytes);
+
+    if (!area) {
+        dmxConfigLog("dmxConfigRealloc: out of memory\n");
+        return NULL;
+    }
+    memset(area + orig_bytes, 0, bytes - orig_bytes);
+    return area;
+}
+
+const char *
+dmxConfigCopyString(const char *string, int length)
+{
+    char *copy;
+
+    if (!length)
+        length = strlen(string);
+    copy = dmxConfigAlloc(length + 1);
+    if (length)
+        strncpy(copy, string, length);
+    copy[length] = '\0';
+    return copy;
+}
+
+void
+dmxConfigFree(void *area)
+{
+    free(area);
+}
+
+DMXConfigTokenPtr
+dmxConfigCreateToken(int token, int line, const char *comment)
+{
+    DMXConfigTokenPtr pToken = dmxConfigAlloc(sizeof(*pToken));
+
+    pToken->token = token;
+    pToken->line = line;
+    pToken->comment = comment;
+    return pToken;
+}
+
+void
+dmxConfigFreeToken(DMXConfigTokenPtr p)
+{
+    if (!p)
+        return;
+    dmxConfigFree((void *) p->comment);
+    dmxConfigFree(p);
+}
+
+DMXConfigStringPtr
+dmxConfigCreateString(int token, int line,
+                      const char *comment, const char *string)
+{
+    DMXConfigStringPtr pString = dmxConfigAlloc(sizeof(*pString));
+
+    pString->token = token;
+    pString->line = line;
+    pString->comment = comment;
+    pString->string = string;
+    return pString;
+}
+
+void
+dmxConfigFreeString(DMXConfigStringPtr p)
+{
+    DMXConfigStringPtr next;
+
+    if (!p)
+        return;
+    do {
+        next = p->next;
+        dmxConfigFree((void *) p->comment);
+        dmxConfigFree((void *) p->string);
+        dmxConfigFree(p);
+    } while ((p = next));
+}
+
+DMXConfigNumberPtr
+dmxConfigCreateNumber(int token, int line, const char *comment, int number)
+{
+    DMXConfigNumberPtr pNumber = dmxConfigAlloc(sizeof(*pNumber));
+
+    pNumber->token = token;
+    pNumber->line = line;
+    pNumber->comment = comment;
+    pNumber->number = number;
+    return pNumber;
+}
+
+void
+dmxConfigFreeNumber(DMXConfigNumberPtr p)
+{
+    if (!p)
+        return;
+    dmxConfigFree((void *) p->comment);
+    dmxConfigFree(p);
+}
+
+DMXConfigPairPtr
+dmxConfigCreatePair(int token, int line,
+                    const char *comment, int x, int y, int xsign, int ysign)
+{
+    DMXConfigPairPtr pPair = dmxConfigAlloc(sizeof(*pPair));
+
+    pPair->token = token;
+    pPair->line = line;
+    pPair->comment = comment;
+    pPair->x = x;
+    pPair->y = y;
+    pPair->xsign = (xsign < 0) ? -1 : 1;
+    pPair->ysign = (ysign < 0) ? -1 : 1;
+    return pPair;
+}
+
+void
+dmxConfigFreePair(DMXConfigPairPtr p)
+{
+    if (!p)
+        return;
+    dmxConfigFree((void *) p->comment);
+    dmxConfigFree(p);
+}
+
+DMXConfigCommentPtr
+dmxConfigCreateComment(int token, int line, const char *comment)
+{
+    DMXConfigCommentPtr pComment = dmxConfigAlloc(sizeof(*pComment));
+
+    pComment->token = token;
+    pComment->line = line;
+    pComment->comment = comment;
+    return pComment;
+}
+
+void
+dmxConfigFreeComment(DMXConfigCommentPtr p)
+{
+    if (!p)
+        return;
+    dmxConfigFree((void *) p->comment);
+    dmxConfigFree(p);
+}
+
+DMXConfigPartDimPtr
+dmxConfigCreatePartDim(DMXConfigPairPtr pDim, DMXConfigPairPtr pOffset)
+{
+    DMXConfigPartDimPtr pPart = dmxConfigAlloc(sizeof(*pPart));
+
+    pPart->dim = pDim;
+    pPart->offset = pOffset;
+    return pPart;
+}
+
+void
+dmxConfigFreePartDim(DMXConfigPartDimPtr p)
+{
+    if (!p)
+        return;
+    dmxConfigFreePair(p->dim);
+    dmxConfigFreePair(p->offset);
+    dmxConfigFree(p);
+}
+
+DMXConfigFullDimPtr
+dmxConfigCreateFullDim(DMXConfigPartDimPtr pScrn, DMXConfigPartDimPtr pRoot)
+{
+    DMXConfigFullDimPtr pFull = dmxConfigAlloc(sizeof(*pFull));
+
+    pFull->scrn = pScrn;
+    pFull->root = pRoot;
+    return pFull;
+}
+
+void
+dmxConfigFreeFullDim(DMXConfigFullDimPtr p)
+{
+    if (!p)
+        return;
+    dmxConfigFreePartDim(p->scrn);
+    dmxConfigFreePartDim(p->root);
+    dmxConfigFree(p);
+}
+
+DMXConfigDisplayPtr
+dmxConfigCreateDisplay(DMXConfigTokenPtr pStart,
+                       DMXConfigStringPtr pName,
+                       DMXConfigFullDimPtr pDim,
+                       DMXConfigPairPtr pOrigin, DMXConfigTokenPtr pEnd)
+{
+    DMXConfigDisplayPtr pDisplay = dmxConfigAlloc(sizeof(*pDisplay));
+
+    pDisplay->start = pStart;
+    pDisplay->dname = pName;
+    pDisplay->dim = pDim;
+    pDisplay->origin = pOrigin;
+    pDisplay->end = pEnd;
+
+    pDisplay->name = pName ? pName->string : NULL;
+    pDisplay->rootXOrigin = pOrigin ? pOrigin->x : 0;
+    pDisplay->rootYOrigin = pOrigin ? pOrigin->y : 0;
+
+    if (pDim && pDim->scrn && pDim->scrn->dim) {
+        pDisplay->scrnWidth = pDim->scrn->dim->x;
+        pDisplay->scrnHeight = pDim->scrn->dim->y;
+    }
+    if (pDim && pDim->scrn && pDim->scrn->offset) {
+        pDisplay->scrnX = pDim->scrn->offset->x;
+        pDisplay->scrnY = pDim->scrn->offset->y;
+        pDisplay->scrnXSign = pDim->scrn->offset->xsign;
+        pDisplay->scrnYSign = pDim->scrn->offset->ysign;
+    }
+
+    if (pDim && pDim->root) {
+        if (pDim->root->dim) {
+            pDisplay->rootWidth = pDim->root->dim->x;
+            pDisplay->rootHeight = pDim->root->dim->y;
+        }
+        if (pDim->root->offset) {
+            pDisplay->rootX = pDim->root->offset->x;
+            pDisplay->rootY = pDim->root->offset->y;
+            pDisplay->rootXSign = pDim->root->offset->xsign;
+            pDisplay->rootYSign = pDim->root->offset->ysign;
+        }
+    }
+    else {                      /* If no root specification, copy width
+                                 * and height from scrn -- leave offset
+                                 * as zero, since it is relative to
+                                 * scrn. */
+        pDisplay->rootWidth = pDisplay->scrnWidth;
+        pDisplay->rootHeight = pDisplay->scrnHeight;
+    }
+
+    return pDisplay;
+}
+
+void
+dmxConfigFreeDisplay(DMXConfigDisplayPtr p)
+{
+    if (!p)
+        return;
+    dmxConfigFreeToken(p->start);
+    dmxConfigFreeString(p->dname);
+    dmxConfigFreeFullDim(p->dim);
+    dmxConfigFreeToken(p->end);
+    dmxConfigFree(p);
+}
+
+DMXConfigWallPtr
+dmxConfigCreateWall(DMXConfigTokenPtr pStart,
+                    DMXConfigPairPtr pWallDim,
+                    DMXConfigPairPtr pDisplayDim,
+                    DMXConfigStringPtr pNameList, DMXConfigTokenPtr pEnd)
+{
+    DMXConfigWallPtr pWall = dmxConfigAlloc(sizeof(*pWall));
+
+    pWall->start = pStart;
+    pWall->wallDim = pWallDim;
+    pWall->displayDim = pDisplayDim;
+    pWall->nameList = pNameList;
+    pWall->end = pEnd;
+
+    pWall->width = pDisplayDim ? pDisplayDim->x : 0;
+    pWall->height = pDisplayDim ? pDisplayDim->y : 0;
+    pWall->xwall = pWallDim ? pWallDim->x : 0;
+    pWall->ywall = pWallDim ? pWallDim->y : 0;
+
+    return pWall;
+}
+
+void
+dmxConfigFreeWall(DMXConfigWallPtr p)
+{
+    if (!p)
+        return;
+    dmxConfigFreeToken(p->start);
+    dmxConfigFreePair(p->wallDim);
+    dmxConfigFreePair(p->displayDim);
+    dmxConfigFreeString(p->nameList);
+    dmxConfigFreeToken(p->end);
+    dmxConfigFree(p);
+}
+
+DMXConfigOptionPtr
+dmxConfigCreateOption(DMXConfigTokenPtr pStart,
+                      DMXConfigStringPtr pOption, DMXConfigTokenPtr pEnd)
+{
+    int length = 0;
+    int offset = 0;
+    DMXConfigStringPtr p;
+    DMXConfigOptionPtr option = dmxConfigAlloc(sizeof(*option));
+
+    for (p = pOption; p; p = p->next) {
+        if (p->string)
+            length += strlen(p->string) + 1;
+    }
+
+    option->string = dmxConfigAlloc(length + 1);
+
+    for (p = pOption; p; p = p->next) {
+        if (p->string) {
+            int len = strlen(p->string);
+
+            strncpy(option->string + offset, p->string, len);
+            offset += len;
+            if (p->next)
+                option->string[offset++] = ' ';
+        }
+    }
+    option->string[offset] = '\0';
+
+    option->start = pStart;
+    option->option = pOption;
+    option->end = pEnd;
+
+    return option;
+}
+
+void
+dmxConfigFreeOption(DMXConfigOptionPtr p)
+{
+    if (!p)
+        return;
+    free(p->string);
+    dmxConfigFreeToken(p->start);
+    dmxConfigFreeString(p->option);
+    dmxConfigFreeToken(p->end);
+    dmxConfigFree(p);
+}
+
+const char **
+dmxConfigLookupParam(DMXConfigParamPtr p, const char *key, int *argc)
+{
+    DMXConfigParamPtr pt;
+
+    for (pt = p; pt; pt = pt->next) {
+        if (pt->argv && !strcasecmp(pt->argv[0], key)) {
+            *argc = pt->argc;
+            return pt->argv;
+        }
+    }
+    *argc = 0;
+    return NULL;
+}
+
+DMXConfigParamPtr
+dmxConfigCreateParam(DMXConfigTokenPtr pStart,
+                     DMXConfigTokenPtr pOpen,
+                     DMXConfigStringPtr pParam,
+                     DMXConfigTokenPtr pClose, DMXConfigTokenPtr pEnd)
+{
+    DMXConfigParamPtr param = dmxConfigAlloc(sizeof(*param));
+    DMXConfigStringPtr pt;
+
+    param->argc = 0;
+    param->argv = NULL;
+    for (pt = pParam; pt; pt = pt->next) {
+        if (pt->string) {
+            param->argv = realloc(param->argv,
+                                  (param->argc + 2) * sizeof(*param->argv));
+            param->argv[param->argc] = pt->string;
+            ++param->argc;
+        }
+    }
+    if (param->argv)
+        param->argv[param->argc] = NULL;
+
+    param->start = pStart;
+    param->open = pOpen;
+    param->param = pParam;
+    param->close = pClose;
+    param->end = pEnd;
+
+    return param;
+}
+
+void
+dmxConfigFreeParam(DMXConfigParamPtr p)
+{
+    DMXConfigParamPtr next;
+
+    if (!p)
+        return;
+    do {
+        next = p->next;
+        dmxConfigFreeToken(p->start);
+        dmxConfigFreeToken(p->open);
+        dmxConfigFreeString(p->param);
+        dmxConfigFreeToken(p->close);
+        dmxConfigFreeToken(p->end);
+        dmxConfigFree(p->argv);
+        dmxConfigFree(p);
+    } while ((p = next));
+}
+
+DMXConfigSubPtr
+dmxConfigCreateSub(DMXConfigType type,
+                   DMXConfigCommentPtr comment,
+                   DMXConfigDisplayPtr display,
+                   DMXConfigWallPtr wall,
+                   DMXConfigOptionPtr option, DMXConfigParamPtr param)
+{
+    DMXConfigSubPtr pSub = dmxConfigAlloc(sizeof(*pSub));
+
+    pSub->type = type;
+    switch (type) {
+    case dmxConfigComment:
+        pSub->comment = comment;
+        break;
+    case dmxConfigDisplay:
+        pSub->display = display;
+        break;
+    case dmxConfigWall:
+        pSub->wall = wall;
+        break;
+    case dmxConfigOption:
+        pSub->option = option;
+        break;
+    case dmxConfigParam:
+        pSub->param = param;
+        break;
+    default:
+        dmxConfigLog("Type %d not supported in subentry\n", type);
+        break;
+    }
+    return pSub;
+}
+
+void
+dmxConfigFreeSub(DMXConfigSubPtr sub)
+{
+    DMXConfigSubPtr pt;
+
+    for (pt = sub; pt; pt = pt->next) {
+        switch (pt->type) {
+        case dmxConfigComment:
+            dmxConfigFreeComment(pt->comment);
+            break;
+        case dmxConfigDisplay:
+            dmxConfigFreeDisplay(pt->display);
+            break;
+        case dmxConfigWall:
+            dmxConfigFreeWall(pt->wall);
+            break;
+        case dmxConfigOption:
+            dmxConfigFreeOption(pt->option);
+            break;
+        case dmxConfigParam:
+            dmxConfigFreeParam(pt->param);
+            break;
+        default:
+            dmxConfigLog("Type %d not supported in subentry\n", pt->type);
+            break;
+        }
+    }
+    dmxConfigFree(sub);
+}
+
+DMXConfigSubPtr
+dmxConfigSubComment(DMXConfigCommentPtr comment)
+{
+    return dmxConfigCreateSub(dmxConfigComment, comment, NULL, NULL, NULL,
+                              NULL);
+}
+
+DMXConfigSubPtr
+dmxConfigSubDisplay(DMXConfigDisplayPtr display)
+{
+    return dmxConfigCreateSub(dmxConfigDisplay, NULL, display, NULL, NULL,
+                              NULL);
+}
+
+DMXConfigSubPtr
+dmxConfigSubWall(DMXConfigWallPtr wall)
+{
+    return dmxConfigCreateSub(dmxConfigWall, NULL, NULL, wall, NULL, NULL);
+}
+
+DMXConfigSubPtr
+dmxConfigSubOption(DMXConfigOptionPtr option)
+{
+    return dmxConfigCreateSub(dmxConfigOption, NULL, NULL, NULL, option, NULL);
+}
+
+DMXConfigSubPtr
+dmxConfigSubParam(DMXConfigParamPtr param)
+{
+    return dmxConfigCreateSub(dmxConfigParam, NULL, NULL, NULL, NULL, param);
+}
+
+extern DMXConfigSubPtr
+dmxConfigAddSub(DMXConfigSubPtr head, DMXConfigSubPtr sub)
+{
+    DMXConfigSubPtr pt;
+
+    if (!head)
+        return sub;
+    for (pt = head; pt->next; pt = pt->next);
+    pt->next = sub;
+    return head;
+}
+
+DMXConfigVirtualPtr
+dmxConfigCreateVirtual(DMXConfigTokenPtr pStart,
+                       DMXConfigStringPtr pName,
+                       DMXConfigPairPtr pDim,
+                       DMXConfigTokenPtr pOpen,
+                       DMXConfigSubPtr pSubentry, DMXConfigTokenPtr pClose)
+{
+    DMXConfigVirtualPtr pVirtual = dmxConfigAlloc(sizeof(*pVirtual));
+
+    pVirtual->start = pStart;
+    pVirtual->vname = pName;
+    pVirtual->dim = pDim;
+    pVirtual->open = pOpen;
+    pVirtual->subentry = pSubentry;
+    pVirtual->close = pClose;
+
+    pVirtual->name = pName ? pName->string : NULL;
+    pVirtual->width = pDim ? pDim->x : 0;
+    pVirtual->height = pDim ? pDim->y : 0;
+
+    return pVirtual;
+}
+
+void
+dmxConfigFreeVirtual(DMXConfigVirtualPtr virtual)
+{
+    dmxConfigFreeToken(virtual->start);
+    dmxConfigFreeString(virtual->vname);
+    dmxConfigFreePair(virtual->dim);
+    dmxConfigFreeToken(virtual->open);
+    dmxConfigFreeSub(virtual->subentry);
+    dmxConfigFreeToken(virtual->close);
+    dmxConfigFree(virtual);
+}
+
+DMXConfigEntryPtr
+dmxConfigCreateEntry(DMXConfigType type,
+                     DMXConfigCommentPtr comment, DMXConfigVirtualPtr virtual)
+{
+    DMXConfigEntryPtr pEntry = dmxConfigAlloc(sizeof(*pEntry));
+
+    pEntry->type = type;
+    switch (type) {
+    case dmxConfigComment:
+        pEntry->comment = comment;
+        break;
+    case dmxConfigVirtual:
+        pEntry->virtual = virtual;
+        break;
+    default:
+        dmxConfigLog("Type %d not supported in entry\n", type);
+        break;
+    }
+    return pEntry;
+}
+
+void
+dmxConfigFreeEntry(DMXConfigEntryPtr entry)
+{
+    DMXConfigEntryPtr pt;
+
+    for (pt = entry; pt; pt = pt->next) {
+        switch (pt->type) {
+        case dmxConfigComment:
+            dmxConfigFreeComment(pt->comment);
+            break;
+        case dmxConfigVirtual:
+            dmxConfigFreeVirtual(pt->virtual);
+            break;
+        default:
+            dmxConfigLog("Type %d not supported in entry\n", pt->type);
+            break;
+        }
+    }
+    dmxConfigFree(entry);
+}
+
+DMXConfigEntryPtr
+dmxConfigAddEntry(DMXConfigEntryPtr head,
+                  DMXConfigType type,
+                  DMXConfigCommentPtr comment, DMXConfigVirtualPtr virtual)
+{
+    DMXConfigEntryPtr child = dmxConfigCreateEntry(type, comment, virtual);
+    DMXConfigEntryPtr pt;
+
+    if (!head)
+        return child;
+
+    for (pt = head; pt->next; pt = pt->next);
+    pt->next = child;
+
+    return head;
+}
+
+DMXConfigEntryPtr
+dmxConfigEntryComment(DMXConfigCommentPtr comment)
+{
+    return dmxConfigCreateEntry(dmxConfigComment, comment, NULL);
+}
+
+DMXConfigEntryPtr
+dmxConfigEntryVirtual(DMXConfigVirtualPtr virtual)
+{
+    return dmxConfigCreateEntry(dmxConfigVirtual, NULL, virtual);
+}
diff --git a/xorg-server/hw/dmx/config/dmxparse.h b/xorg-server/hw/dmx/config/dmxparse.h
index de81d23b7..7d31b6309 100644
--- a/xorg-server/hw/dmx/config/dmxparse.h
+++ b/xorg-server/hw/dmx/config/dmxparse.h
@@ -41,44 +41,44 @@
 
 /** Stores tokens not stored in other structures (e.g., keywords and ;) */
 typedef struct _DMXConfigToken {
-    int                      token;
-    int                      line;
-    const char               *comment;
+    int token;
+    int line;
+    const char *comment;
 } DMXConfigToken, *DMXConfigTokenPtr;
 
 /** Stores parsed strings. */
 typedef struct _DMXConfigString {
-    int                      token;
-    int                      line;
-    const char               *comment;
-    const char               *string;
-    struct _DMXConfigString  *next;
+    int token;
+    int line;
+    const char *comment;
+    const char *string;
+    struct _DMXConfigString *next;
 } DMXConfigString, *DMXConfigStringPtr;
 
 /** Stores parsed numbers. */
 typedef struct _DMXConfigNumber {
-    int                      token;
-    int                      line;
-    const char               *comment;
-    int                      number;
+    int token;
+    int line;
+    const char *comment;
+    int number;
 } DMXConfigNumber, *DMXConfigNumberPtr;
 
 /** Stores parsed pairs (e.g., x y) */
 typedef struct _DMXConfigPair {
-    int                      token;
-    int                      line;
-    const char               *comment;
-    int                      x;
-    int                      y;
-    int                      xsign;
-    int                      ysign;
+    int token;
+    int line;
+    const char *comment;
+    int x;
+    int y;
+    int xsign;
+    int ysign;
 } DMXConfigPair, *DMXConfigPairPtr;
 
 /** Stores parsed comments not stored with a token. */
 typedef struct _DMXConfigComment {
-    int                      token;
-    int                      line;
-    const char               *comment;
+    int token;
+    int line;
+    const char *comment;
 } DMXConfigComment, *DMXConfigCommentPtr;
 
 typedef enum {
@@ -92,206 +92,201 @@ typedef enum {
 
 /** Stores a geometry specification. */
 typedef struct _DMXConfigPartDim {
-    DMXConfigPairPtr         dim;
-    DMXConfigPairPtr         offset;
+    DMXConfigPairPtr dim;
+    DMXConfigPairPtr offset;
 } DMXConfigPartDim, *DMXConfigPartDimPtr;
 
 /** Stores a pair of geometry specifications. */
 typedef struct _DMXConfigFullDim {
-    DMXConfigPartDimPtr      scrn;
-    DMXConfigPartDimPtr      root;
+    DMXConfigPartDimPtr scrn;
+    DMXConfigPartDimPtr root;
 } DMXConfigFullDim, *DMXConfigFullDimPtr;
 
 /** Stores parsed display information. */
 typedef struct _DMXConfigDisplay {
-                                /* Summary information */
-    const char               *name;
-                                /* Screen Window Geometry */
-    int                      scrnWidth, scrnHeight;
-    int                      scrnX, scrnY;
-    int                      scrnXSign, scrnYSign;
-                                /* Root Window Geometry */
-    int                      rootWidth, rootHeight;
-    int                      rootX, rootY;
-    int                      rootXSign, rootYSign;
-                                /* Origin in global space */
-    int                      rootXOrigin, rootYOrigin;
-    
-                                /* Raw configuration information */
-    DMXConfigTokenPtr        start;
-    DMXConfigStringPtr       dname;
-    DMXConfigFullDimPtr      dim;
-    DMXConfigPairPtr         origin;
-    DMXConfigTokenPtr        end;
+    /* Summary information */
+    const char *name;
+    /* Screen Window Geometry */
+    int scrnWidth, scrnHeight;
+    int scrnX, scrnY;
+    int scrnXSign, scrnYSign;
+    /* Root Window Geometry */
+    int rootWidth, rootHeight;
+    int rootX, rootY;
+    int rootXSign, rootYSign;
+    /* Origin in global space */
+    int rootXOrigin, rootYOrigin;
+
+    /* Raw configuration information */
+    DMXConfigTokenPtr start;
+    DMXConfigStringPtr dname;
+    DMXConfigFullDimPtr dim;
+    DMXConfigPairPtr origin;
+    DMXConfigTokenPtr end;
 } DMXConfigDisplay, *DMXConfigDisplayPtr;
 
 /** Stores parsed wall information. */
 typedef struct _DMXConfigWall {
-                                /* Summary information */
-    int                      width, height; /* dimensions of displays */
-    int                      xwall, ywall; /* dimensions of wall, in tiles */
+    /* Summary information */
+    int width, height;          /* dimensions of displays */
+    int xwall, ywall;           /* dimensions of wall, in tiles */
 
-    
-                                /* Raw configuration informaiton */
-    DMXConfigTokenPtr        start;
-    DMXConfigPairPtr         wallDim;
-    DMXConfigPairPtr         displayDim;
-    DMXConfigStringPtr       nameList;
-    DMXConfigTokenPtr        end;
+    /* Raw configuration informaiton */
+    DMXConfigTokenPtr start;
+    DMXConfigPairPtr wallDim;
+    DMXConfigPairPtr displayDim;
+    DMXConfigStringPtr nameList;
+    DMXConfigTokenPtr end;
 } DMXConfigWall, *DMXConfigWallPtr;
 
 /** Stores parsed option information. */
 typedef struct _DMXConfigOption {
-                                /* Summary information */
-    char                     *string;
-    
-                                /* Raw configuration informaiton */
-    DMXConfigTokenPtr        start;
-    DMXConfigStringPtr       option;
-    DMXConfigTokenPtr        end;
+    /* Summary information */
+    char *string;
+
+    /* Raw configuration informaiton */
+    DMXConfigTokenPtr start;
+    DMXConfigStringPtr option;
+    DMXConfigTokenPtr end;
 } DMXConfigOption, *DMXConfigOptionPtr;
 
 /** Stores parsed param information. */
 typedef struct _DMXConfigParam {
-    int                      argc;
-    const char               **argv;
-    
-    DMXConfigTokenPtr        start;
-    DMXConfigTokenPtr        open;
-    DMXConfigStringPtr       param;
-    DMXConfigTokenPtr        close;
-    DMXConfigTokenPtr        end; /* Either open/close OR end */
-    struct _DMXConfigParam   *next;
+    int argc;
+    const char **argv;
+
+    DMXConfigTokenPtr start;
+    DMXConfigTokenPtr open;
+    DMXConfigStringPtr param;
+    DMXConfigTokenPtr close;
+    DMXConfigTokenPtr end;      /* Either open/close OR end */
+    struct _DMXConfigParam *next;
 } DMXConfigParam, *DMXConfigParamPtr;
 
 /** Stores options under an entry (subentry). */
 typedef struct _DMXConfigSub {
-    DMXConfigType             type;
-    DMXConfigCommentPtr       comment;
-    DMXConfigDisplayPtr       display;
-    DMXConfigWallPtr          wall;
-    DMXConfigOptionPtr        option;
-    DMXConfigParamPtr         param;
-    struct _DMXConfigSub      *next;
+    DMXConfigType type;
+    DMXConfigCommentPtr comment;
+    DMXConfigDisplayPtr display;
+    DMXConfigWallPtr wall;
+    DMXConfigOptionPtr option;
+    DMXConfigParamPtr param;
+    struct _DMXConfigSub *next;
 } DMXConfigSub, *DMXConfigSubPtr;
 
 /** Stores parsed virtual information. */
 typedef struct _DMXConfigVirtual {
-                                /* Summary information */
-    const char                *name;
-    int                       width, height;
+    /* Summary information */
+    const char *name;
+    int width, height;
 
-                                /* Raw configuration information */
-    DMXConfigTokenPtr         start;
-    DMXConfigStringPtr        vname;
-    DMXConfigPairPtr          dim;
-    DMXConfigTokenPtr         open;
-    DMXConfigSubPtr           subentry;
-    DMXConfigTokenPtr         close;
+    /* Raw configuration information */
+    DMXConfigTokenPtr start;
+    DMXConfigStringPtr vname;
+    DMXConfigPairPtr dim;
+    DMXConfigTokenPtr open;
+    DMXConfigSubPtr subentry;
+    DMXConfigTokenPtr close;
 } DMXConfigVirtual, *DMXConfigVirtualPtr;
 
 /** Heads entry storage. */
 typedef struct _DMXConfigEntry {
-    DMXConfigType            type;
-    DMXConfigCommentPtr      comment;
-    DMXConfigVirtualPtr      virtual;
-    struct _DMXConfigEntry   *next;
+    DMXConfigType type;
+    DMXConfigCommentPtr comment;
+    DMXConfigVirtualPtr virtual;
+    struct _DMXConfigEntry *next;
 } DMXConfigEntry, *DMXConfigEntryPtr;
 
-extern DMXConfigEntryPtr   dmxConfigEntry;
+extern DMXConfigEntryPtr dmxConfigEntry;
 
-extern int                 yylex(void);
-extern int                 yydebug;
-extern void                yyerror(const char *message);
+extern int yylex(void);
+extern int yydebug;
+extern void yyerror(const char *message);
 
-extern void                dmxConfigLog(const char *format, ...);
-extern void                *dmxConfigAlloc(unsigned long bytes);
-extern void                *dmxConfigRealloc(void *orig,
-                                             unsigned long orig_bytes,
-                                             unsigned long bytes);
-extern const char          *dmxConfigCopyString(const char *string,
-                                                int length);
-extern void                dmxConfigFree(void *area);
-extern DMXConfigTokenPtr   dmxConfigCreateToken(int token, int line,
-                                                const char *comment);
-extern void                dmxConfigFreeToken(DMXConfigTokenPtr p);
-extern DMXConfigStringPtr  dmxConfigCreateString(int token, int line,
-                                                 const char *comment,
-                                                 const char *string);
-extern void                dmxConfigFreeString(DMXConfigStringPtr p);
-extern DMXConfigNumberPtr  dmxConfigCreateNumber(int token, int line,
-                                                 const char *comment,
-                                                 int number);
-extern void                dmxConfigFreeNumber(DMXConfigNumberPtr p);
-extern DMXConfigPairPtr    dmxConfigCreatePair(int token, int line,
-                                               const char *comment,
-                                               int x, int y,
-                                               int xsign, int ysign);
-extern void                dmxConfigFreePair(DMXConfigPairPtr p);
+extern void dmxConfigLog(const char *format, ...);
+extern void *dmxConfigAlloc(unsigned long bytes);
+extern void *dmxConfigRealloc(void *orig,
+                              unsigned long orig_bytes, unsigned long bytes);
+extern const char *dmxConfigCopyString(const char *string, int length);
+extern void dmxConfigFree(void *area);
+extern DMXConfigTokenPtr dmxConfigCreateToken(int token, int line,
+                                              const char *comment);
+extern void dmxConfigFreeToken(DMXConfigTokenPtr p);
+extern DMXConfigStringPtr dmxConfigCreateString(int token, int line,
+                                                const char *comment,
+                                                const char *string);
+extern void dmxConfigFreeString(DMXConfigStringPtr p);
+extern DMXConfigNumberPtr dmxConfigCreateNumber(int token, int line,
+                                                const char *comment,
+                                                int number);
+extern void dmxConfigFreeNumber(DMXConfigNumberPtr p);
+extern DMXConfigPairPtr dmxConfigCreatePair(int token, int line,
+                                            const char *comment,
+                                            int x, int y, int xsign, int ysign);
+extern void dmxConfigFreePair(DMXConfigPairPtr p);
 extern DMXConfigCommentPtr dmxConfigCreateComment(int token, int line,
                                                   const char *comment);
-extern void                dmxConfigFreeComment(DMXConfigCommentPtr p);
+extern void dmxConfigFreeComment(DMXConfigCommentPtr p);
 extern DMXConfigPartDimPtr dmxConfigCreatePartDim(DMXConfigPairPtr pDim,
                                                   DMXConfigPairPtr pOffset);
-extern void                dmxConfigFreePartDim(DMXConfigPartDimPtr p);
+extern void dmxConfigFreePartDim(DMXConfigPartDimPtr p);
 extern DMXConfigFullDimPtr dmxConfigCreateFullDim(DMXConfigPartDimPtr pScrn,
                                                   DMXConfigPartDimPtr pRoot);
-extern void                dmxConfigFreeFullDim(DMXConfigFullDimPtr p);
+extern void dmxConfigFreeFullDim(DMXConfigFullDimPtr p);
 extern DMXConfigDisplayPtr dmxConfigCreateDisplay(DMXConfigTokenPtr pStart,
                                                   DMXConfigStringPtr pName,
                                                   DMXConfigFullDimPtr pDim,
                                                   DMXConfigPairPtr pOrigin,
                                                   DMXConfigTokenPtr pEnd);
-extern void                dmxConfigFreeDisplay(DMXConfigDisplayPtr p);
-extern DMXConfigWallPtr    dmxConfigCreateWall(DMXConfigTokenPtr pStart,
-                                               DMXConfigPairPtr pWallDim,
-                                               DMXConfigPairPtr pDisplayDim,
-                                               DMXConfigStringPtr pNameList,
-                                               DMXConfigTokenPtr pEnd);
-extern void                dmxConfigFreeWall(DMXConfigWallPtr p);
-extern DMXConfigOptionPtr  dmxConfigCreateOption(DMXConfigTokenPtr pStart,
-                                                 DMXConfigStringPtr pOption,
-                                                 DMXConfigTokenPtr pEnd);
-extern void                dmxConfigFreeOption(DMXConfigOptionPtr p);
-extern DMXConfigParamPtr   dmxConfigCreateParam(DMXConfigTokenPtr pStart,
-                                                DMXConfigTokenPtr pOpen,
-                                                DMXConfigStringPtr pParam,
-                                                DMXConfigTokenPtr pClose,
+extern void dmxConfigFreeDisplay(DMXConfigDisplayPtr p);
+extern DMXConfigWallPtr dmxConfigCreateWall(DMXConfigTokenPtr pStart,
+                                            DMXConfigPairPtr pWallDim,
+                                            DMXConfigPairPtr pDisplayDim,
+                                            DMXConfigStringPtr pNameList,
+                                            DMXConfigTokenPtr pEnd);
+extern void dmxConfigFreeWall(DMXConfigWallPtr p);
+extern DMXConfigOptionPtr dmxConfigCreateOption(DMXConfigTokenPtr pStart,
+                                                DMXConfigStringPtr pOption,
                                                 DMXConfigTokenPtr pEnd);
-extern void                dmxConfigFreeParam(DMXConfigParamPtr p);
-extern const char          **dmxConfigLookupParam(DMXConfigParamPtr p,
-                                                  const char *key,
-                                                  int *argc);
-extern DMXConfigSubPtr     dmxConfigCreateSub(DMXConfigType type,
-                                              DMXConfigCommentPtr comment,
-                                              DMXConfigDisplayPtr display,
-                                              DMXConfigWallPtr wall,
-                                              DMXConfigOptionPtr option,
-                                              DMXConfigParamPtr param);
-extern void                dmxConfigFreeSub(DMXConfigSubPtr sub);
-extern DMXConfigSubPtr     dmxConfigSubComment(DMXConfigCommentPtr comment);
-extern DMXConfigSubPtr     dmxConfigSubDisplay(DMXConfigDisplayPtr display);
-extern DMXConfigSubPtr     dmxConfigSubWall(DMXConfigWallPtr wall);
-extern DMXConfigSubPtr     dmxConfigSubOption(DMXConfigOptionPtr option);
-extern DMXConfigSubPtr     dmxConfigSubParam(DMXConfigParamPtr param);
-extern DMXConfigSubPtr     dmxConfigAddSub(DMXConfigSubPtr head,
-                                           DMXConfigSubPtr sub);
+extern void dmxConfigFreeOption(DMXConfigOptionPtr p);
+extern DMXConfigParamPtr dmxConfigCreateParam(DMXConfigTokenPtr pStart,
+                                              DMXConfigTokenPtr pOpen,
+                                              DMXConfigStringPtr pParam,
+                                              DMXConfigTokenPtr pClose,
+                                              DMXConfigTokenPtr pEnd);
+extern void dmxConfigFreeParam(DMXConfigParamPtr p);
+extern const char **dmxConfigLookupParam(DMXConfigParamPtr p,
+                                         const char *key, int *argc);
+extern DMXConfigSubPtr dmxConfigCreateSub(DMXConfigType type,
+                                          DMXConfigCommentPtr comment,
+                                          DMXConfigDisplayPtr display,
+                                          DMXConfigWallPtr wall,
+                                          DMXConfigOptionPtr option,
+                                          DMXConfigParamPtr param);
+extern void dmxConfigFreeSub(DMXConfigSubPtr sub);
+extern DMXConfigSubPtr dmxConfigSubComment(DMXConfigCommentPtr comment);
+extern DMXConfigSubPtr dmxConfigSubDisplay(DMXConfigDisplayPtr display);
+extern DMXConfigSubPtr dmxConfigSubWall(DMXConfigWallPtr wall);
+extern DMXConfigSubPtr dmxConfigSubOption(DMXConfigOptionPtr option);
+extern DMXConfigSubPtr dmxConfigSubParam(DMXConfigParamPtr param);
+extern DMXConfigSubPtr dmxConfigAddSub(DMXConfigSubPtr head,
+                                       DMXConfigSubPtr sub);
 extern DMXConfigVirtualPtr dmxConfigCreateVirtual(DMXConfigTokenPtr pStart,
                                                   DMXConfigStringPtr pName,
                                                   DMXConfigPairPtr pDim,
                                                   DMXConfigTokenPtr pOpen,
                                                   DMXConfigSubPtr pSubentry,
                                                   DMXConfigTokenPtr pClose);
-extern void                dmxConfigFreeVirtual(DMXConfigVirtualPtr virtual);
-extern DMXConfigEntryPtr   dmxConfigCreateEntry(DMXConfigType type,
-                                                DMXConfigCommentPtr comment,
-                                                DMXConfigVirtualPtr virtual);
-extern void                dmxConfigFreeEntry(DMXConfigEntryPtr entry);
-extern DMXConfigEntryPtr   dmxConfigAddEntry(DMXConfigEntryPtr head,
-                                             DMXConfigType type,
-                                             DMXConfigCommentPtr comment,
-                                             DMXConfigVirtualPtr virtual);
-extern DMXConfigEntryPtr   dmxConfigEntryComment(DMXConfigCommentPtr comment);
-extern DMXConfigEntryPtr   dmxConfigEntryVirtual(DMXConfigVirtualPtr virtual);
+extern void dmxConfigFreeVirtual(DMXConfigVirtualPtr virtual);
+extern DMXConfigEntryPtr dmxConfigCreateEntry(DMXConfigType type,
+                                              DMXConfigCommentPtr comment,
+                                              DMXConfigVirtualPtr virtual);
+extern void dmxConfigFreeEntry(DMXConfigEntryPtr entry);
+extern DMXConfigEntryPtr dmxConfigAddEntry(DMXConfigEntryPtr head,
+                                           DMXConfigType type,
+                                           DMXConfigCommentPtr comment,
+                                           DMXConfigVirtualPtr virtual);
+extern DMXConfigEntryPtr dmxConfigEntryComment(DMXConfigCommentPtr comment);
+extern DMXConfigEntryPtr dmxConfigEntryVirtual(DMXConfigVirtualPtr virtual);
 
 #endif
diff --git a/xorg-server/hw/dmx/config/dmxprint.c b/xorg-server/hw/dmx/config/dmxprint.c
index 599ebf5df..3145fb56a 100644
--- a/xorg-server/hw/dmx/config/dmxprint.c
+++ b/xorg-server/hw/dmx/config/dmxprint.c
@@ -52,100 +52,126 @@
 #include <stdarg.h>
 #include <ctype.h>
 
-static FILE *str   = NULL;
-static int  indent = 0;
-static int  pos    = 0;
+static FILE *str = NULL;
+static int indent = 0;
+static int pos = 0;
 
 /** Stack of indentation information used for pretty-printing
  * configuration information. */
 static struct stack {
-    int          base;
-    int          comment;
-    int          step;
+    int base;
+    int comment;
+    int step;
     struct stack *next;
-} *stack, initialStack = { 0, 0, 4, NULL };
+} *stack, initialStack = {
+0, 0, 4, NULL};
 
-static void dmxConfigIndent(void)
+static void
+dmxConfigIndent(void)
 {
     int i;
-    if (indent < 0)  indent = 0;
-    if (indent > 40) indent = 40;
-    for (i = 0; i < indent; i++) fprintf(str, " ");
+
+    if (indent < 0)
+        indent = 0;
+    if (indent > 40)
+        indent = 40;
+    for (i = 0; i < indent; i++)
+        fprintf(str, " ");
 }
 
-static void dmxConfigNewline(void)
+static void
+dmxConfigNewline(void)
 {
-    if (pos) fprintf(str, "\n");
+    if (pos)
+        fprintf(str, "\n");
     pos = 0;
 }
 
-static void dmxConfigPushState(int base, int comment, int step)
+static void
+dmxConfigPushState(int base, int comment, int step)
 {
     struct stack *new = dmxConfigAlloc(sizeof(*new));
-    new->base    = base;
+
+    new->base = base;
     new->comment = comment;
-    new->step    = step;
-    new->next    = stack;
-    stack        = new;
-    indent       = base;
+    new->step = step;
+    new->next = stack;
+    stack = new;
+    indent = base;
     dmxConfigNewline();
 }
 
-static void dmxConfigPushComment(void)
+static void
+dmxConfigPushComment(void)
 {
-    if (stack) indent = stack->comment;
+    if (stack)
+        indent = stack->comment;
 }
 
-static void dmxConfigPushStep(void)
+static void
+dmxConfigPushStep(void)
 {
-    if (stack) indent = stack->step;
+    if (stack)
+        indent = stack->step;
 }
 
-static void dmxConfigPopState(void)
+static void
+dmxConfigPopState(void)
 {
     struct stack *old = stack;
 
-    if (!stack) return;
+    if (!stack)
+        return;
     indent = old->base;
-    stack  = old->next;
-    if (!stack) dmxConfigLog("Stack underflow\n");
+    stack = old->next;
+    if (!stack)
+        dmxConfigLog("Stack underflow\n");
     dmxConfigFree(old);
     dmxConfigNewline();
 }
 
-static void dmxConfigOutput(int addSpace, int doNewline, const char *comment,
-                            const char *format, ...)
+static void
+dmxConfigOutput(int addSpace, int doNewline, const char *comment,
+                const char *format, ...)
 {
     va_list args;
 
-    if (!pos) dmxConfigIndent();
-    else if (addSpace) fprintf(str, " ");
+    if (!pos)
+        dmxConfigIndent();
+    else if (addSpace)
+        fprintf(str, " ");
 
     if (format) {
         va_start(args, format);
-                                /* RATS: This hasn't been audited -- it
-                                 * could probably result in a buffer
-                                 * overflow. */
-        pos += vfprintf(str, format, args); /* assumes no newlines! */
+        /* RATS: This hasn't been audited -- it
+         * could probably result in a buffer
+         * overflow. */
+        pos += vfprintf(str, format, args);     /* assumes no newlines! */
         va_end(args);
     }
 
     if (comment) {
-        if (pos) fprintf(str, " ");
+        if (pos)
+            fprintf(str, " ");
         pos += fprintf(str, "#%s", comment);
         dmxConfigNewline();
         dmxConfigPushComment();
-    } else if (doNewline) dmxConfigNewline();
+    }
+    else if (doNewline)
+        dmxConfigNewline();
 }
 
-static void dmxConfigPrintComment(DMXConfigCommentPtr p)
+static void
+dmxConfigPrintComment(DMXConfigCommentPtr p)
 {
     dmxConfigOutput(1, 1, p->comment, NULL);
 }
 
-static void dmxConfigPrintTokenFlag(DMXConfigTokenPtr p, int flag)
+static void
+dmxConfigPrintTokenFlag(DMXConfigTokenPtr p, int flag)
 {
-    if (!p) return;
+    if (!p)
+        return;
     switch (p->token) {
     case T_VIRTUAL:
         dmxConfigPushState(0, 4, 4);
@@ -169,14 +195,16 @@ static void dmxConfigPrintTokenFlag(DMXConfigTokenPtr p, int flag)
         break;
     case ';':
         dmxConfigOutput(0, 1, p->comment, ";");
-        if (flag) dmxConfigPopState();
+        if (flag)
+            dmxConfigPopState();
         break;
     case '{':
         dmxConfigOutput(1, 1, p->comment, "{");
         dmxConfigPushStep();
         break;
     case '}':
-        if (flag) dmxConfigPopState();
+        if (flag)
+            dmxConfigPopState();
         dmxConfigOutput(0, 1, p->comment, "}");
         break;
     case '/':
@@ -187,49 +215,66 @@ static void dmxConfigPrintTokenFlag(DMXConfigTokenPtr p, int flag)
     }
 }
 
-static void dmxConfigPrintToken(DMXConfigTokenPtr p)
+static void
+dmxConfigPrintToken(DMXConfigTokenPtr p)
 {
     dmxConfigPrintTokenFlag(p, 1);
 }
 
-static void dmxConfigPrintTokenNopop(DMXConfigTokenPtr p)
+static void
+dmxConfigPrintTokenNopop(DMXConfigTokenPtr p)
 {
     dmxConfigPrintTokenFlag(p, 0);
 }
 
-static int dmxConfigPrintQuotedString(const char *s)
+static int
+dmxConfigPrintQuotedString(const char *s)
 {
     const char *pt;
 
-    if (!s || !s[0]) return 1;  /* Quote empty string */
-    for (pt = s; *pt; ++pt) if (isspace(*pt)) return 1;
+    if (!s || !s[0])
+        return 1;               /* Quote empty string */
+    for (pt = s; *pt; ++pt)
+        if (isspace(*pt))
+            return 1;
     return 0;
 }
 
-static void dmxConfigPrintString(DMXConfigStringPtr p, int quote)
+static void
+dmxConfigPrintString(DMXConfigStringPtr p, int quote)
 {
     DMXConfigStringPtr pt;
-    
-    if (!p) return;
+
+    if (!p)
+        return;
     for (pt = p; pt; pt = pt->next) {
         if (quote && dmxConfigPrintQuotedString(pt->string)) {
             dmxConfigOutput(1, 0, pt->comment, "\"%s\"",
                             pt->string ? pt->string : "");
-            } else
+        }
+        else
             dmxConfigOutput(1, 0, pt->comment, "%s",
                             pt->string ? pt->string : "");
     }
 }
 
-static int dmxConfigPrintPair(DMXConfigPairPtr p, int addSpace)
+static int
+dmxConfigPrintPair(DMXConfigPairPtr p, int addSpace)
 {
     const char *format = NULL;
-    
-    if (!p) return 0;
+
+    if (!p)
+        return 0;
     switch (p->token) {
-    case T_ORIGIN:    format = "@%dx%d";   break;
-    case T_DIMENSION: format = "%dx%d";    break;
-    case T_OFFSET:    format = "%c%d%c%d"; break;
+    case T_ORIGIN:
+        format = "@%dx%d";
+        break;
+    case T_DIMENSION:
+        format = "%dx%d";
+        break;
+    case T_OFFSET:
+        format = "%c%d%c%d";
+        break;
     }
     if (p->token == T_OFFSET) {
         if (!p->comment && !p->x && !p->y && p->xsign >= 0 && p->ysign >= 0)
@@ -237,69 +282,79 @@ static int dmxConfigPrintPair(DMXConfigPairPtr p, int addSpace)
         dmxConfigOutput(addSpace, 0, p->comment, format,
                         p->xsign < 0 ? '-' : '+', p->x,
                         p->ysign < 0 ? '-' : '+', p->y);
-    } else {
-        if (!p->comment && !p->x && !p->y) return 0;
+    }
+    else {
+        if (!p->comment && !p->x && !p->y)
+            return 0;
         dmxConfigOutput(addSpace, 0, p->comment, format, p->x, p->y);
     }
     return 1;
 }
 
-static void dmxConfigPrintDisplay(DMXConfigDisplayPtr p)
+static void
+dmxConfigPrintDisplay(DMXConfigDisplayPtr p)
 {
-    DMXConfigToken  dummyStart   = { T_DISPLAY, 0, NULL };
-    DMXConfigToken  dummyEnd     = { ';', 0, NULL };
-    DMXConfigToken  dummySep     = { '/', 0, NULL };
-    DMXConfigString dummyName    = { T_STRING, 0, NULL, NULL, NULL };
-    DMXConfigPair   dummySDim    = { T_DIMENSION, 0, NULL, 0, 0, 0, 0 };
-    DMXConfigPair   dummySOffset = { T_OFFSET, 0, NULL, 0, 0, 0, 0 };
-    DMXConfigPair   dummyRDim    = { T_DIMENSION, 0, NULL, 0, 0, 0, 0 };
-    DMXConfigPair   dummyROffset = { T_OFFSET, 0, NULL, 0, 0, 0, 0 };
-    DMXConfigPair   dummyOrigin  = { T_ORIGIN, 0, NULL, 0, 0, 0, 0 };
-    int             output;
-
-    if (p->dname) p->dname->string = p->name;
-    else          dummyName.string = p->name;
-    
+    DMXConfigToken dummyStart = { T_DISPLAY, 0, NULL };
+    DMXConfigToken dummyEnd = { ';', 0, NULL };
+    DMXConfigToken dummySep = { '/', 0, NULL };
+    DMXConfigString dummyName = { T_STRING, 0, NULL, NULL, NULL };
+    DMXConfigPair dummySDim = { T_DIMENSION, 0, NULL, 0, 0, 0, 0 };
+    DMXConfigPair dummySOffset = { T_OFFSET, 0, NULL, 0, 0, 0, 0 };
+    DMXConfigPair dummyRDim = { T_DIMENSION, 0, NULL, 0, 0, 0, 0 };
+    DMXConfigPair dummyROffset = { T_OFFSET, 0, NULL, 0, 0, 0, 0 };
+    DMXConfigPair dummyOrigin = { T_ORIGIN, 0, NULL, 0, 0, 0, 0 };
+    int output;
+
+    if (p->dname)
+        p->dname->string = p->name;
+    else
+        dummyName.string = p->name;
+
     if (p->dim && p->dim->scrn && p->dim->scrn->dim) {
-        p->dim->scrn->dim->x    = p->scrnWidth;
-        p->dim->scrn->dim->y    = p->scrnHeight;
-    } else {
-        dummySDim.x             = p->scrnWidth;
-        dummySDim.y             = p->scrnHeight;
+        p->dim->scrn->dim->x = p->scrnWidth;
+        p->dim->scrn->dim->y = p->scrnHeight;
+    }
+    else {
+        dummySDim.x = p->scrnWidth;
+        dummySDim.y = p->scrnHeight;
     }
 
     if (p->dim && p->dim->scrn && p->dim->scrn->offset) {
         p->dim->scrn->offset->x = p->scrnX;
         p->dim->scrn->offset->y = p->scrnY;
-    } else {
-        dummySOffset.x          = p->scrnX;
-        dummySOffset.y          = p->scrnY;
     }
-    
+    else {
+        dummySOffset.x = p->scrnX;
+        dummySOffset.y = p->scrnY;
+    }
+
     if (p->dim && p->dim->root && p->dim->root->dim) {
-        p->dim->root->dim->x    = p->rootWidth;
-        p->dim->root->dim->y    = p->rootHeight;
-    } else {
-        dummyRDim.x             = p->rootWidth;
-        dummyRDim.y             = p->rootHeight;
+        p->dim->root->dim->x = p->rootWidth;
+        p->dim->root->dim->y = p->rootHeight;
+    }
+    else {
+        dummyRDim.x = p->rootWidth;
+        dummyRDim.y = p->rootHeight;
     }
 
     if (p->dim && p->dim->root && p->dim->root->offset) {
         p->dim->root->offset->x = p->rootX;
         p->dim->root->offset->y = p->rootY;
-    } else {
-        dummyROffset.x          = p->rootX;
-        dummyROffset.y          = p->rootY;
+    }
+    else {
+        dummyROffset.x = p->rootX;
+        dummyROffset.y = p->rootY;
     }
 
     if (p->origin) {
-        p->origin->x     = p->rootXOrigin, p->origin->y     = p->rootYOrigin;
-        p->origin->xsign = p->rootXSign,   p->origin->ysign = p->rootYSign;
-    } else {
-        dummyOrigin.x     = p->rootXOrigin, dummyOrigin.y     = p->rootYOrigin;
-        dummyOrigin.xsign = p->rootXSign,   dummyOrigin.ysign = p->rootYSign;
+        p->origin->x = p->rootXOrigin, p->origin->y = p->rootYOrigin;
+        p->origin->xsign = p->rootXSign, p->origin->ysign = p->rootYSign;
+    }
+    else {
+        dummyOrigin.x = p->rootXOrigin, dummyOrigin.y = p->rootYOrigin;
+        dummyOrigin.xsign = p->rootXSign, dummyOrigin.ysign = p->rootYSign;
     }
-    
+
     dmxConfigPrintToken(p->start ? p->start : &dummyStart);
     dmxConfigPrintString(p->dname ? p->dname : &dummyName, 1);
 
@@ -313,9 +368,7 @@ static void dmxConfigPrintDisplay(DMXConfigDisplayPtr p)
         dmxConfigPrintPair(&dummySOffset, !output);
 
     if (p->scrnWidth != p->rootWidth
-        || p->scrnHeight != p->rootHeight
-        || p->rootX
-        || p->rootY) {
+        || p->scrnHeight != p->rootHeight || p->rootX || p->rootY) {
         dmxConfigPrintToken(&dummySep);
         if (p->dim && p->dim->root && p->dim->root->dim)
             output = dmxConfigPrintPair(p->dim->root->dim, 1);
@@ -331,7 +384,8 @@ static void dmxConfigPrintDisplay(DMXConfigDisplayPtr p)
     dmxConfigPrintToken(p->end ? p->end : &dummyEnd);
 }
 
-static void dmxConfigPrintWall(DMXConfigWallPtr p)
+static void
+dmxConfigPrintWall(DMXConfigWallPtr p)
 {
     dmxConfigPrintToken(p->start);
     dmxConfigPrintPair(p->wallDim, 1);
@@ -340,11 +394,12 @@ static void dmxConfigPrintWall(DMXConfigWallPtr p)
     dmxConfigPrintToken(p->end);
 }
 
-static void dmxConfigPrintOption(DMXConfigOptionPtr p)
+static void
+dmxConfigPrintOption(DMXConfigOptionPtr p)
 {
-    DMXConfigToken  dummyStart  = { T_OPTION, 0, NULL };
+    DMXConfigToken dummyStart = { T_OPTION, 0, NULL };
     DMXConfigString dummyOption = { T_STRING, 0, NULL, NULL, NULL };
-    DMXConfigToken  dummyEnd    = { ';', 0, NULL };
+    DMXConfigToken dummyEnd = { ';', 0, NULL };
 
     dummyOption.string = p->string;
 
@@ -353,41 +408,59 @@ static void dmxConfigPrintOption(DMXConfigOptionPtr p)
     dmxConfigPrintToken(p->end ? p->end : &dummyEnd);
 }
 
-static void dmxConfigPrintParam(DMXConfigParamPtr p)
+static void
+dmxConfigPrintParam(DMXConfigParamPtr p)
 {
-    if (!p) return;
+    if (!p)
+        return;
     if (p->start) {
         if (p->open && p->close) {
             dmxConfigPrintToken(p->start);
             dmxConfigPrintToken(p->open);
             dmxConfigPrintParam(p->next);
             dmxConfigPrintToken(p->close);
-        } else if (p->end && p->param) {
+        }
+        else if (p->end && p->param) {
             dmxConfigPrintToken(p->start);
             dmxConfigPrintString(p->param, 1);
             dmxConfigPrintToken(p->end);
-        } else
+        }
+        else
             dmxConfigLog("dmxConfigPrintParam: cannot handle format (a)\n");
-    } else if (p->end && p->param) {
+    }
+    else if (p->end && p->param) {
         dmxConfigPrintString(p->param, 1);
         dmxConfigPrintTokenNopop(p->end);
         dmxConfigPrintParam(p->next);
-    } else
+    }
+    else
         dmxConfigLog("dmxConfigPrintParam: cannot handle format (b)\n");
 }
 
-static void dmxConfigPrintSub(DMXConfigSubPtr p)
+static void
+dmxConfigPrintSub(DMXConfigSubPtr p)
 {
     DMXConfigSubPtr pt;
 
-    if (!p) return;
+    if (!p)
+        return;
     for (pt = p; pt; pt = pt->next) {
         switch (pt->type) {
-        case dmxConfigComment: dmxConfigPrintComment(pt->comment); break;
-        case dmxConfigDisplay: dmxConfigPrintDisplay(pt->display); break;
-        case dmxConfigWall:    dmxConfigPrintWall(pt->wall);       break;
-        case dmxConfigOption:  dmxConfigPrintOption(pt->option);   break;
-        case dmxConfigParam:   dmxConfigPrintParam(pt->param);     break;
+        case dmxConfigComment:
+            dmxConfigPrintComment(pt->comment);
+            break;
+        case dmxConfigDisplay:
+            dmxConfigPrintDisplay(pt->display);
+            break;
+        case dmxConfigWall:
+            dmxConfigPrintWall(pt->wall);
+            break;
+        case dmxConfigOption:
+            dmxConfigPrintOption(pt->option);
+            break;
+        case dmxConfigParam:
+            dmxConfigPrintParam(pt->param);
+            break;
         default:
             dmxConfigLog("dmxConfigPrintSub:"
                          " cannot handle type %d in subentry\n", pt->type);
@@ -395,20 +468,24 @@ static void dmxConfigPrintSub(DMXConfigSubPtr p)
     }
 }
 
-static void dmxConfigPrintVirtual(DMXConfigVirtualPtr p)
+static void
+dmxConfigPrintVirtual(DMXConfigVirtualPtr p)
 {
-    DMXConfigToken  dummyStart = { T_VIRTUAL, 0, NULL };
-    DMXConfigToken  dummyOpen  = { '{', 0, NULL };
-    DMXConfigToken  dummyClose = { '}', 0, NULL };
-    DMXConfigString dummyName  = { T_STRING, 0, NULL, NULL, NULL };
-    DMXConfigPair   dummyDim   = { T_DIMENSION, 0, NULL, 0, 0 };
-
-    if (p->vname) p->vname->string = p->name;
-    else          dummyName.string = p->name;
+    DMXConfigToken dummyStart = { T_VIRTUAL, 0, NULL };
+    DMXConfigToken dummyOpen = { '{', 0, NULL };
+    DMXConfigToken dummyClose = { '}', 0, NULL };
+    DMXConfigString dummyName = { T_STRING, 0, NULL, NULL, NULL };
+    DMXConfigPair dummyDim = { T_DIMENSION, 0, NULL, 0, 0 };
+
+    if (p->vname)
+        p->vname->string = p->name;
+    else
+        dummyName.string = p->name;
 
-    if (p->dim) p->dim->x  = p->width, p->dim->y  = p->height;
-    else        dummyDim.x = p->width, dummyDim.y = p->height;
-    
+    if (p->dim)
+        p->dim->x = p->width, p->dim->y = p->height;
+    else
+        dummyDim.x = p->width, dummyDim.y = p->height;
 
     dmxConfigPrintToken(p->start ? p->start : &dummyStart);
     dmxConfigPrintString(p->vname ? p->vname : &dummyName, 1);
@@ -420,36 +497,48 @@ static void dmxConfigPrintVirtual(DMXConfigVirtualPtr p)
 
 /** The configuration information in \a entry will be pretty-printed to
  * the \a stream.  If \a stream is NULL, then stdout will be used. */
-void dmxConfigPrint(FILE *stream, DMXConfigEntryPtr entry)
+void
+dmxConfigPrint(FILE * stream, DMXConfigEntryPtr entry)
 {
     DMXConfigEntryPtr pt;
 
-    if (!stream) str = stdout;
-    else         str = stream;
-    
+    if (!stream)
+        str = stdout;
+    else
+        str = stream;
+
     stack = &initialStack;
-    
+
     for (pt = entry; pt; pt = pt->next) {
         switch (pt->type) {
-        case dmxConfigComment: dmxConfigPrintComment(pt->comment); break;
-        case dmxConfigVirtual: dmxConfigPrintVirtual(pt->virtual); break;
+        case dmxConfigComment:
+            dmxConfigPrintComment(pt->comment);
+            break;
+        case dmxConfigVirtual:
+            dmxConfigPrintVirtual(pt->virtual);
+            break;
         default:
             dmxConfigLog("dmxConfigPrint: cannot handle type %d in entry\n",
                          pt->type);
         }
     }
-    if (pos) dmxConfigNewline();
+    if (pos)
+        dmxConfigNewline();
 }
 
 /** The configuration information in \a p will be pretty-printed to the
  * \a stream.  If \a stream is NULL, then stdout will be used. */
-void dmxConfigVirtualPrint(FILE *stream, DMXConfigVirtualPtr p)
+void
+dmxConfigVirtualPrint(FILE * stream, DMXConfigVirtualPtr p)
 {
-    if (!stream) str = stdout;
-    else         str = stream;
+    if (!stream)
+        str = stdout;
+    else
+        str = stream;
 
     stack = &initialStack;
-    
+
     dmxConfigPrintVirtual(p);
-    if (pos) dmxConfigNewline();
+    if (pos)
+        dmxConfigNewline();
 }
diff --git a/xorg-server/hw/dmx/config/dmxtodmx.c b/xorg-server/hw/dmx/config/dmxtodmx.c
index 0d4ee4c09..66342091e 100644
--- a/xorg-server/hw/dmx/config/dmxtodmx.c
+++ b/xorg-server/hw/dmx/config/dmxtodmx.c
@@ -37,10 +37,11 @@
 #include "dmxprint.h"
 #include "dmxcompat.h"
 
-extern int                 yyparse(void);
-extern FILE                *yyin;
+extern int yyparse(void);
+extern FILE *yyin;
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
     yydebug = 0;
     yyparse();
diff --git a/xorg-server/hw/dmx/config/vdltodmx.c b/xorg-server/hw/dmx/config/vdltodmx.c
index 69563f16c..007416b33 100644
--- a/xorg-server/hw/dmx/config/vdltodmx.c
+++ b/xorg-server/hw/dmx/config/vdltodmx.c
@@ -36,18 +36,20 @@
 #include "dmxprint.h"
 #include "dmxcompat.h"
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
     DMXConfigEntryPtr entry;
-    FILE              *str;
+    FILE *str;
 
-    if (argc != 2 && argc !=3) {
+    if (argc != 2 && argc != 3) {
         fprintf(stderr, "Usage: vdltodmx inFile [outFile]\n");
         return 1;
     }
     if (argc == 2) {
         str = stdout;
-    } else if (!(str = fopen(argv[2], "w"))) {
+    }
+    else if (!(str = fopen(argv[2], "w"))) {
         fprintf(stderr, "Cannot open %s for write\n", argv[2]);
         return 2;
     }
diff --git a/xorg-server/hw/dmx/config/xdmxconfig.c b/xorg-server/hw/dmx/config/xdmxconfig.c
index 3165ba000..f30841244 100644
--- a/xorg-server/hw/dmx/config/xdmxconfig.c
+++ b/xorg-server/hw/dmx/config/xdmxconfig.c
@@ -34,7 +34,7 @@
 #ifdef HAVE_DMX_CONFIG_H
 #include <dmx-config.h>
 #endif
-                                                                                
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Intrinsic.h>
@@ -55,8 +55,8 @@
 #include "dmxprint.h"
 #include "dmxlog.h"
 
-extern int                 yyparse(void);
-extern FILE                *yyin;
+extern int yyparse(void);
+extern FILE *yyin;
 
 #define DMX_INFO "xdmxconfig v0.9\nCopyright 2002 Red Hat Inc.\n"
 
@@ -67,329 +67,379 @@ extern FILE                *yyin;
 #define DMX_CANVAS_WIDTH  400
 #define DMX_CANVAS_HEIGHT 500
 
-DMXConfigEntryPtr          dmxConfigEntry;
+DMXConfigEntryPtr dmxConfigEntry;
 static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual;
 static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay;
-static int                 dmxConfigGrabbed, dmxConfigGrabbedFine;
-static int                 dmxConfigGrabbedX, dmxConfigGrabbedY;
-static char                *dmxConfigFilename;
-static GC                  dmxConfigGC, dmxConfigGCRev, dmxConfigGCHL;
-static int                 dmxConfigGCInit = 0;
-static Dimension           dmxConfigWidgetWidth, dmxConfigWidgetHeight;
-static Dimension           dmxConfigWallWidth, dmxConfigWallHeight;
-static double              dmxConfigScaleX, dmxConfigScaleY;
-static int                 dmxConfigNotSaved;
+static int dmxConfigGrabbed, dmxConfigGrabbedFine;
+static int dmxConfigGrabbedX, dmxConfigGrabbedY;
+static char *dmxConfigFilename;
+static GC dmxConfigGC, dmxConfigGCRev, dmxConfigGCHL;
+static int dmxConfigGCInit = 0;
+static Dimension dmxConfigWidgetWidth, dmxConfigWidgetHeight;
+static Dimension dmxConfigWallWidth, dmxConfigWallHeight;
+static double dmxConfigScaleX, dmxConfigScaleY;
+static int dmxConfigNotSaved;
 static enum {
     dmxConfigStateOpen,
     dmxConfigStateSave
-}                          dmxConfigState;
+} dmxConfigState;
 
 /* Global widgets */
-static Widget              canvas;
-static Widget              cnamebox, cdimbox;
-static Widget              openpopup, opendialog;
-static Widget              namebox, dimbox, rtbox, origbox;
-static Widget              okbutton, buttonpopup;
-static Widget              ecbutton, dcbutton;
-static Widget              ndbutton0, ndbutton1, edbutton, ddbutton;
-static Widget              ecpopup, ecdialog0, ecdialog1;
-static Widget              edpopup, eddialog0, eddialog1, eddialog2;
-static Widget              aboutpopup, quitpopup;
-
-static void dmxConfigCanvasGCs(void)
+static Widget canvas;
+static Widget cnamebox, cdimbox;
+static Widget openpopup, opendialog;
+static Widget namebox, dimbox, rtbox, origbox;
+static Widget okbutton, buttonpopup;
+static Widget ecbutton, dcbutton;
+static Widget ndbutton0, ndbutton1, edbutton, ddbutton;
+static Widget ecpopup, ecdialog0, ecdialog1;
+static Widget edpopup, eddialog0, eddialog1, eddialog2;
+static Widget aboutpopup, quitpopup;
+
+static void
+dmxConfigCanvasGCs(void)
 {
-    Display       *dpy = XtDisplay(canvas);
-    Window        win  = XtWindow(canvas);
-    XGCValues     gcvals;
+    Display *dpy = XtDisplay(canvas);
+    Window win = XtWindow(canvas);
+    XGCValues gcvals;
     unsigned long mask;
-    Colormap      colormap;
-    XColor        fg, bg, hl, tmp;
-    
-    if (dmxConfigGCInit++) return;
+    Colormap colormap;
+    XColor fg, bg, hl, tmp;
+
+    if (dmxConfigGCInit++)
+        return;
 
     XtVaGetValues(canvas, XtNcolormap, &colormap, NULL);
     XAllocNamedColor(XtDisplay(canvas), colormap, "black", &bg, &tmp);
     XAllocNamedColor(XtDisplay(canvas), colormap, "white", &fg, &tmp);
-    XAllocNamedColor(XtDisplay(canvas), colormap, "red",   &hl, &tmp);
+    XAllocNamedColor(XtDisplay(canvas), colormap, "red", &hl, &tmp);
 
     mask = (GCFunction | GCPlaneMask | GCClipMask | GCForeground |
             GCBackground | GCLineWidth | GCLineStyle | GCCapStyle |
             GCFillStyle);
 
-                                /* FIXME: copy this from widget */
-    gcvals.function   = GXcopy;
+    /* FIXME: copy this from widget */
+    gcvals.function = GXcopy;
     gcvals.plane_mask = AllPlanes;
-    gcvals.clip_mask  = None;
+    gcvals.clip_mask = None;
     gcvals.foreground = fg.pixel;
     gcvals.background = bg.pixel;
     gcvals.line_width = 0;
     gcvals.line_style = LineSolid;
-    gcvals.cap_style  = CapNotLast;
+    gcvals.cap_style = CapNotLast;
     gcvals.fill_style = FillSolid;
-    
-    dmxConfigGC       = XCreateGC(dpy, win, mask, &gcvals);
+
+    dmxConfigGC = XCreateGC(dpy, win, mask, &gcvals);
     gcvals.foreground = hl.pixel;
-    dmxConfigGCHL     = XCreateGC(dpy, win, mask, &gcvals);
+    dmxConfigGCHL = XCreateGC(dpy, win, mask, &gcvals);
     gcvals.foreground = bg.pixel;
     gcvals.background = fg.pixel;
-    dmxConfigGCRev    = XCreateGC(dpy, win, mask, &gcvals);
+    dmxConfigGCRev = XCreateGC(dpy, win, mask, &gcvals);
 }
 
-static void dmxConfigGetDims(int *maxWidth, int *maxHeight)
+static void
+dmxConfigGetDims(int *maxWidth, int *maxHeight)
 {
-    DMXConfigSubPtr   pt;
+    DMXConfigSubPtr pt;
     DMXConfigEntryPtr e;
-    
-    *maxWidth = dmxConfigWallWidth  = 0;
+
+    *maxWidth = dmxConfigWallWidth = 0;
     *maxHeight = dmxConfigWallHeight = 0;
-    if (!dmxConfigCurrent) return;
-    
-    dmxConfigWallWidth  = dmxConfigCurrent->width;
+    if (!dmxConfigCurrent)
+        return;
+
+    dmxConfigWallWidth = dmxConfigCurrent->width;
     dmxConfigWallHeight = dmxConfigCurrent->height;
     if (!dmxConfigWallWidth || !dmxConfigWallHeight) {
         for (pt = dmxConfigCurrent->subentry; pt; pt = pt->next) {
             if (pt->type == dmxConfigDisplay) {
-                int x = pt->display->scrnWidth  + pt->display->rootXOrigin;
+                int x = pt->display->scrnWidth + pt->display->rootXOrigin;
                 int y = pt->display->scrnHeight + pt->display->rootYOrigin;
-                if (x > dmxConfigWallWidth)  dmxConfigWallWidth  = x;
-                if (y > dmxConfigWallHeight) dmxConfigWallHeight = y;
+
+                if (x > dmxConfigWallWidth)
+                    dmxConfigWallWidth = x;
+                if (y > dmxConfigWallHeight)
+                    dmxConfigWallHeight = y;
             }
         }
     }
-                                /* Compute maximums */
+    /* Compute maximums */
     *maxWidth = *maxHeight = 0;
     for (e = dmxConfigEntry; e; e = e->next) {
-        if (e->type != dmxConfigVirtual) continue;
+        if (e->type != dmxConfigVirtual)
+            continue;
         for (pt = e->virtual->subentry; pt; pt = pt->next) {
             if (pt->type == dmxConfigDisplay) {
-                int x = pt->display->scrnWidth  + pt->display->rootXOrigin;
+                int x = pt->display->scrnWidth + pt->display->rootXOrigin;
                 int y = pt->display->scrnHeight + pt->display->rootYOrigin;
-                if (x > *maxWidth)  *maxWidth  = x;
-                if (y > *maxHeight) *maxHeight = y;
+
+                if (x > *maxWidth)
+                    *maxWidth = x;
+                if (y > *maxHeight)
+                    *maxHeight = y;
             }
         }
     }
-    if (dmxConfigWallWidth  > *maxWidth)  *maxWidth  = dmxConfigWallWidth;
-    if (dmxConfigWallHeight > *maxHeight) *maxHeight = dmxConfigWallHeight;
+    if (dmxConfigWallWidth > *maxWidth)
+        *maxWidth = dmxConfigWallWidth;
+    if (dmxConfigWallHeight > *maxHeight)
+        *maxHeight = dmxConfigWallHeight;
+}
+
+static int
+scalex(int x)
+{
+    return (int) ((x * dmxConfigScaleX) + .5);
+}
+
+static int
+scaley(int y)
+{
+    return (int) ((y * dmxConfigScaleY) + .5);
+}
+
+static int
+unscalex(int x)
+{
+    return (int) ((x / dmxConfigScaleX) + .5);
 }
 
-static int scalex(int x)   { return (int)((x * dmxConfigScaleX) + .5); }
-static int scaley(int y)   { return (int)((y * dmxConfigScaleY) + .5); }
-static int unscalex(int x) { return (int)((x / dmxConfigScaleX) + .5); }
-static int unscaley(int y) { return (int)((y / dmxConfigScaleY) + .5); }
+static int
+unscaley(int y)
+{
+    return (int) ((y / dmxConfigScaleY) + .5);
+}
 
-static void dmxConfigDataUpdate(void)
+static void
+dmxConfigDataUpdate(void)
 {
-                                /* FIXME: could result in buffer overflows */
-    char       cnambuf[512];
-    char       cdimbuf[128];
-    char       nambuf[512];
-    char       dimbuf[128];
-    char       rtbuf[128];
-    char       offbuf[128];
+    /* FIXME: could result in buffer overflows */
+    char cnambuf[512];
+    char cdimbuf[128];
+    char nambuf[512];
+    char dimbuf[128];
+    char rtbuf[128];
+    char offbuf[128];
     const char *name;
 
     if (!dmxConfigCurrent) {
-        XtVaSetValues(cnamebox,   XtNlabel, "", XtNsensitive, False, NULL);
-        XtVaSetValues(cdimbox,    XtNlabel, "", XtNsensitive, False, NULL);
-        XtVaSetValues(ecbutton,                 XtNsensitive, False, NULL);
-        XtVaSetValues(dcbutton,                 XtNsensitive, False, NULL);
-        XtVaSetValues(ndbutton0,                XtNsensitive, False, NULL);
-        XtVaSetValues(ndbutton1,                XtNsensitive, False, NULL);
-    } else {
+        XtVaSetValues(cnamebox, XtNlabel, "", XtNsensitive, False, NULL);
+        XtVaSetValues(cdimbox, XtNlabel, "", XtNsensitive, False, NULL);
+        XtVaSetValues(ecbutton, XtNsensitive, False, NULL);
+        XtVaSetValues(dcbutton, XtNsensitive, False, NULL);
+        XtVaSetValues(ndbutton0, XtNsensitive, False, NULL);
+        XtVaSetValues(ndbutton1, XtNsensitive, False, NULL);
+    }
+    else {
         name = dmxConfigCurrent->name;
         snprintf(cnambuf, sizeof(cnambuf), "%s", name ? name : "");
         snprintf(cdimbuf, sizeof(cdimbuf), "%dx%d",
-                    dmxConfigWallWidth, dmxConfigWallHeight);
-        XtVaSetValues(cnamebox,   XtNlabel, cnambuf, XtNsensitive, True, NULL);
-        XtVaSetValues(cdimbox,    XtNlabel, cdimbuf, XtNsensitive, True, NULL);
-        XtVaSetValues(ecbutton,                      XtNsensitive, True, NULL);
-        XtVaSetValues(dcbutton,                      XtNsensitive, True, NULL);
-        XtVaSetValues(ndbutton0,                     XtNsensitive, True, NULL);
-        XtVaSetValues(ndbutton1,                     XtNsensitive, True, NULL);
+                 dmxConfigWallWidth, dmxConfigWallHeight);
+        XtVaSetValues(cnamebox, XtNlabel, cnambuf, XtNsensitive, True, NULL);
+        XtVaSetValues(cdimbox, XtNlabel, cdimbuf, XtNsensitive, True, NULL);
+        XtVaSetValues(ecbutton, XtNsensitive, True, NULL);
+        XtVaSetValues(dcbutton, XtNsensitive, True, NULL);
+        XtVaSetValues(ndbutton0, XtNsensitive, True, NULL);
+        XtVaSetValues(ndbutton1, XtNsensitive, True, NULL);
     }
-    
+
     if (!dmxConfigCurrentDisplay) {
         XtVaSetValues(namebox, XtNlabel, "", XtNsensitive, False, NULL);
-        XtVaSetValues(dimbox,  XtNlabel, "", XtNsensitive, False, NULL);
-        XtVaSetValues(rtbox,   XtNlabel, "", XtNsensitive, False, NULL);
+        XtVaSetValues(dimbox, XtNlabel, "", XtNsensitive, False, NULL);
+        XtVaSetValues(rtbox, XtNlabel, "", XtNsensitive, False, NULL);
         XtVaSetValues(origbox, XtNlabel, "", XtNsensitive, False, NULL);
-        XtVaSetValues(edbutton,              XtNsensitive, False, NULL);
-        XtVaSetValues(ddbutton,              XtNsensitive, False, NULL);
-    } else {
+        XtVaSetValues(edbutton, XtNsensitive, False, NULL);
+        XtVaSetValues(ddbutton, XtNsensitive, False, NULL);
+    }
+    else {
         name = dmxConfigCurrentDisplay->name;
         snprintf(nambuf, sizeof(nambuf), "%s", name ? name : "");
         snprintf(dimbuf, sizeof(dimbuf), "%dx%d%c%d%c%d",
-                    dmxConfigCurrentDisplay->scrnWidth,
-                    dmxConfigCurrentDisplay->scrnHeight,
-                    dmxConfigCurrentDisplay->scrnXSign < 0 ? '-' : '+',
-                    dmxConfigCurrentDisplay->scrnX,
-                    dmxConfigCurrentDisplay->scrnYSign < 0 ? '-' : '+',
-                    dmxConfigCurrentDisplay->scrnY);
+                 dmxConfigCurrentDisplay->scrnWidth,
+                 dmxConfigCurrentDisplay->scrnHeight,
+                 dmxConfigCurrentDisplay->scrnXSign < 0 ? '-' : '+',
+                 dmxConfigCurrentDisplay->scrnX,
+                 dmxConfigCurrentDisplay->scrnYSign < 0 ? '-' : '+',
+                 dmxConfigCurrentDisplay->scrnY);
         snprintf(rtbuf, sizeof(dimbuf), "%dx%d%c%d%c%d",
-                    dmxConfigCurrentDisplay->rootWidth,
-                    dmxConfigCurrentDisplay->rootHeight,
-                    dmxConfigCurrentDisplay->rootXSign < 0 ? '-' : '+',
-                    dmxConfigCurrentDisplay->rootX,
-                    dmxConfigCurrentDisplay->rootYSign < 0 ? '-' : '+',
-                    dmxConfigCurrentDisplay->rootY);
+                 dmxConfigCurrentDisplay->rootWidth,
+                 dmxConfigCurrentDisplay->rootHeight,
+                 dmxConfigCurrentDisplay->rootXSign < 0 ? '-' : '+',
+                 dmxConfigCurrentDisplay->rootX,
+                 dmxConfigCurrentDisplay->rootYSign < 0 ? '-' : '+',
+                 dmxConfigCurrentDisplay->rootY);
         snprintf(offbuf, sizeof(offbuf), "@%dx%d",
-                    dmxConfigCurrentDisplay->rootXOrigin,
-                    dmxConfigCurrentDisplay->rootYOrigin);
+                 dmxConfigCurrentDisplay->rootXOrigin,
+                 dmxConfigCurrentDisplay->rootYOrigin);
         XtVaSetValues(namebox, XtNlabel, nambuf, XtNsensitive, True, NULL);
-        XtVaSetValues(dimbox,  XtNlabel, dimbuf, XtNsensitive, True, NULL);
-        XtVaSetValues(rtbox,   XtNlabel, rtbuf,  XtNsensitive, True, NULL);
+        XtVaSetValues(dimbox, XtNlabel, dimbuf, XtNsensitive, True, NULL);
+        XtVaSetValues(rtbox, XtNlabel, rtbuf, XtNsensitive, True, NULL);
         XtVaSetValues(origbox, XtNlabel, offbuf, XtNsensitive, True, NULL);
-        XtVaSetValues(edbutton,                  XtNsensitive, True, NULL);
-        XtVaSetValues(ddbutton,                  XtNsensitive, True, NULL);
+        XtVaSetValues(edbutton, XtNsensitive, True, NULL);
+        XtVaSetValues(ddbutton, XtNsensitive, True, NULL);
     }
 }
 
-static void dmxConfigCanvasUpdate(void)
+static void
+dmxConfigCanvasUpdate(void)
 {
     DMXConfigSubPtr pt;
-    Display         *dpy     = XtDisplay(canvas);
-    Window          win      = XtWindow(canvas);
-    GContext        gcontext = XGContextFromGC(dmxConfigGC);
-    XFontStruct     *fs;
-    int             w, h;
+    Display *dpy = XtDisplay(canvas);
+    Window win = XtWindow(canvas);
+    GContext gcontext = XGContextFromGC(dmxConfigGC);
+    XFontStruct *fs;
+    int w, h;
 
     XFillRectangle(dpy, win, dmxConfigGCRev,
                    0, 0, dmxConfigWidgetWidth, dmxConfigWidgetHeight);
     dmxConfigDataUpdate();
-    if (!dmxConfigCurrent) return;
+    if (!dmxConfigCurrent)
+        return;
 
     w = scalex(dmxConfigWallWidth);
     h = scaley(dmxConfigWallHeight);
-    if (w > dmxConfigWidgetWidth - 1)  w = dmxConfigWidgetWidth - 1;
-    if (h > dmxConfigWidgetHeight - 1) h = dmxConfigWidgetHeight - 1;
+    if (w > dmxConfigWidgetWidth - 1)
+        w = dmxConfigWidgetWidth - 1;
+    if (h > dmxConfigWidgetHeight - 1)
+        h = dmxConfigWidgetHeight - 1;
     XDrawRectangle(dpy, win, dmxConfigGC, 0, 0, w, h);
     fs = XQueryFont(dpy, gcontext);
     for (pt = dmxConfigCurrent->subentry; pt; pt = pt->next) {
         int x, y, len;
         int xo = 3, yo = fs->ascent + fs->descent + 2;
-        GC  gc;
-
-        if (pt->type != dmxConfigDisplay) continue;
-        gc  = (pt->display == dmxConfigCurrentDisplay
-               ? dmxConfigGCHL
-               : dmxConfigGC);
-        x   = scalex(pt->display->rootXOrigin);
-        y   = scaley(pt->display->rootYOrigin);
-        w   = scalex(pt->display->scrnWidth);
-        h   = scaley(pt->display->scrnHeight);
+        GC gc;
+
+        if (pt->type != dmxConfigDisplay)
+            continue;
+        gc = (pt->display == dmxConfigCurrentDisplay
+              ? dmxConfigGCHL : dmxConfigGC);
+        x = scalex(pt->display->rootXOrigin);
+        y = scaley(pt->display->rootYOrigin);
+        w = scalex(pt->display->scrnWidth);
+        h = scaley(pt->display->scrnHeight);
         len = pt->display->name ? strlen(pt->display->name) : 0;
-        if (x > dmxConfigWidgetWidth - 1)  x = dmxConfigWidgetWidth - 1;
-        if (y > dmxConfigWidgetHeight - 1) y = dmxConfigWidgetHeight - 1;
+        if (x > dmxConfigWidgetWidth - 1)
+            x = dmxConfigWidgetWidth - 1;
+        if (y > dmxConfigWidgetHeight - 1)
+            y = dmxConfigWidgetHeight - 1;
         XDrawRectangle(dpy, win, gc, x, y, w, h);
         if (fs && len) {
             while (len && XTextWidth(fs, pt->display->name, len) >= w - 2 * xo)
                 --len;
             if (len)
-                XDrawString(dpy, win, gc, x+xo, y+yo, pt->display->name, len);
+                XDrawString(dpy, win, gc, x + xo, y + yo, pt->display->name,
+                            len);
         }
     }
-    if (fs) XFreeFontInfo(NULL, fs, 0);
+    if (fs)
+        XFreeFontInfo(NULL, fs, 0);
 }
 
-static void dmxConfigCanvasDraw(Region region)
+static void
+dmxConfigCanvasDraw(Region region)
 {
     Display *dpy = XtDisplay(canvas);
-    int     maxWidth, maxHeight;
-    
+    int maxWidth, maxHeight;
+
     dmxConfigCanvasGCs();
     if (region) {
-        XSetRegion(dpy, dmxConfigGC,    region);
+        XSetRegion(dpy, dmxConfigGC, region);
         XSetRegion(dpy, dmxConfigGCRev, region);
-        XSetRegion(dpy, dmxConfigGCHL,  region);
+        XSetRegion(dpy, dmxConfigGCHL, region);
     }
     XtVaGetValues(canvas,
                   XtNwidth, &dmxConfigWidgetWidth,
-                  XtNheight, &dmxConfigWidgetHeight,
-                  NULL);
+                  XtNheight, &dmxConfigWidgetHeight, NULL);
     dmxConfigGetDims(&maxWidth, &maxHeight);
-    dmxConfigScaleX = (double)dmxConfigWidgetWidth  / maxWidth;
-    dmxConfigScaleY = (double)dmxConfigWidgetHeight / maxHeight;
-    if (dmxConfigScaleX > dmxConfigScaleY) dmxConfigScaleX = dmxConfigScaleY;
-    if (dmxConfigScaleY > dmxConfigScaleX) dmxConfigScaleY = dmxConfigScaleX;
+    dmxConfigScaleX = (double) dmxConfigWidgetWidth / maxWidth;
+    dmxConfigScaleY = (double) dmxConfigWidgetHeight / maxHeight;
+    if (dmxConfigScaleX > dmxConfigScaleY)
+        dmxConfigScaleX = dmxConfigScaleY;
+    if (dmxConfigScaleY > dmxConfigScaleX)
+        dmxConfigScaleY = dmxConfigScaleX;
     dmxConfigCanvasUpdate();
     if (region) {
-        XSetClipMask(dpy, dmxConfigGC,    None);
+        XSetClipMask(dpy, dmxConfigGC, None);
         XSetClipMask(dpy, dmxConfigGCRev, None);
-        XSetClipMask(dpy, dmxConfigGCHL,  None);
+        XSetClipMask(dpy, dmxConfigGCHL, None);
     }
 }
 
-static void dmxConfigSelectCallback(Widget w, XtPointer closure,
-                                    XtPointer callData)
+static void
+dmxConfigSelectCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     dmxConfigCurrent = closure;
     dmxConfigVirtualPrint(stdout, dmxConfigCurrent);
     dmxConfigCanvasDraw(NULL);
 }
 
-static void dmxConfigCopystrings(void)
+static void
+dmxConfigCopystrings(void)
 {
     DMXConfigEntryPtr pt;
-    DMXConfigSubPtr   sub;
+    DMXConfigSubPtr sub;
 
-    if (!dmxConfigCurrent) return;
+    if (!dmxConfigCurrent)
+        return;
 
-                                /* FIXME: this is all a per-config file
-                                 * memory leak */
+    /* FIXME: this is all a per-config file
+     * memory leak */
     for (pt = dmxConfigEntry; pt; pt = pt->next) {
         if (pt->type == dmxConfigVirtual) {
             pt->virtual->name = XtNewString(pt->virtual->name
-                                            ? pt->virtual->name
-                                            : "");
+                                            ? pt->virtual->name : "");
 
             for (sub = pt->virtual->subentry; sub; sub = sub->next) {
-                if (sub->type != dmxConfigDisplay) continue;
+                if (sub->type != dmxConfigDisplay)
+                    continue;
                 sub->display->name = XtNewString(sub->display->name
-                                                 ? sub->display->name
-                                                 : "");
+                                                 ? sub->display->name : "");
             }
         }
     }
 }
 
-static void dmxConfigGetValueString(char **d, Widget w)
+static void
+dmxConfigGetValueString(char **d, Widget w)
 {
     const char *tmp = XawDialogGetValueString(w);
-    if (*d) XtFree(*d);
+
+    if (*d)
+        XtFree(*d);
     *d = XtNewString(tmp);
 }
 
-static void dmxConfigSetupCnamemenu(void)
+static void
+dmxConfigSetupCnamemenu(void)
 {
-    static Widget     cnamemenu = NULL;
-    Widget            w;
+    static Widget cnamemenu = NULL;
+    Widget w;
     DMXConfigEntryPtr pt;
 
-    if (cnamemenu) XtDestroyWidget(cnamemenu);
+    if (cnamemenu)
+        XtDestroyWidget(cnamemenu);
     cnamemenu = NULL;
 
-    if (!dmxConfigCurrent) return;
+    if (!dmxConfigCurrent)
+        return;
     cnamemenu = XtVaCreatePopupShell("cnamemenu", simpleMenuWidgetClass,
-                                     cnamebox,
-                                     NULL);
-    
+                                     cnamebox, NULL);
+
     for (pt = dmxConfigEntry; pt; pt = pt->next) {
         if (pt->type == dmxConfigVirtual) {
             w = XtVaCreateManagedWidget(pt->virtual->name
                                         ? pt->virtual->name
                                         : "",
-                                        smeBSBObjectClass, cnamemenu,
-                                        NULL);
-            XtAddCallback(w, XtNcallback,
-                          dmxConfigSelectCallback, pt->virtual);
+                                        smeBSBObjectClass, cnamemenu, NULL);
+            XtAddCallback(w, XtNcallback, dmxConfigSelectCallback, pt->virtual);
         }
     }
 }
 
-static void dmxConfigReadFile(void)
+static void
+dmxConfigReadFile(void)
 {
-    FILE              *str;
+    FILE *str;
     DMXConfigEntryPtr pt;
 
     if (!(str = fopen(dmxConfigFilename, "r"))) {
@@ -397,7 +447,7 @@ static void dmxConfigReadFile(void)
                dmxConfigFilename);
         return;
     }
-    yyin    = str;
+    yyin = str;
     yydebug = 0;
     yyparse();
     fclose(str);
@@ -410,8 +460,6 @@ static void dmxConfigReadFile(void)
         }
     }
 
-    
-    
     if (XtIsRealized(canvas)) {
         dmxConfigCopystrings();
         dmxConfigSetupCnamemenu();
@@ -420,9 +468,10 @@ static void dmxConfigReadFile(void)
     dmxConfigVirtualPrint(stdout, dmxConfigCurrent);
 }
 
-static void dmxConfigWriteFile(void)
+static void
+dmxConfigWriteFile(void)
 {
-    FILE              *str;
+    FILE *str;
 
     if (!(str = fopen(dmxConfigFilename, "w"))) {
         dmxLog(dmxWarning, "Unable to write configuration file %s\n",
@@ -433,31 +482,36 @@ static void dmxConfigWriteFile(void)
     fclose(str);
 }
 
-static DMXConfigDisplayPtr dmxConfigFindDisplay(int x, int y)
+static DMXConfigDisplayPtr
+dmxConfigFindDisplay(int x, int y)
 {
     DMXConfigSubPtr pt;
 
-    if (!dmxConfigCurrent) return NULL;
+    if (!dmxConfigCurrent)
+        return NULL;
     for (pt = dmxConfigCurrent->subentry; pt; pt = pt->next) {
         DMXConfigDisplayPtr d = pt->display;
-        if (pt->type != dmxConfigDisplay) continue;
+
+        if (pt->type != dmxConfigDisplay)
+            continue;
         if (x >= scalex(d->rootXOrigin)
             && x <= scalex(d->rootXOrigin + d->scrnWidth)
             && y >= scaley(d->rootYOrigin)
-            && y <= scaley(d->rootYOrigin + d->scrnHeight)) return d;
+            && y <= scaley(d->rootYOrigin + d->scrnHeight))
+            return d;
     }
     return NULL;
 }
 
-static void dmxConfigSetPopupPosition(Widget popup)
+static void
+dmxConfigSetPopupPosition(Widget popup)
 {
-    Position     x, y;
-    Window       t1, t2;
-    int          root_x, root_y;
-    int          temp_x, temp_y;
+    Position x, y;
+    Window t1, t2;
+    int root_x, root_y;
+    int temp_x, temp_y;
     unsigned int temp;
 
-
     XtRealizeWidget(popup);
     if (!XQueryPointer(XtDisplay(popup), XtWindow(popup), &t1, &t2,
                        &root_x, &root_y, &temp_x, &temp_y, &temp))
@@ -468,13 +522,15 @@ static void dmxConfigSetPopupPosition(Widget popup)
     XtVaSetValues(popup, XtNx, x, XtNy, y, NULL);
 }
 
-static void dmxConfigPlaceMenu(Widget w, XEvent *event,
-                               String *params, Cardinal *num_params)
+static void
+dmxConfigPlaceMenu(Widget w, XEvent * event,
+                   String * params, Cardinal * num_params)
 {
     dmxConfigSetPopupPosition(buttonpopup);
 }
 
-static void dmxConfigMove(int deltaX, int deltaY)
+static void
+dmxConfigMove(int deltaX, int deltaY)
 {
     dmxConfigCurrentDisplay->rootXOrigin += deltaX;
     dmxConfigCurrentDisplay->rootYOrigin += deltaY;
@@ -492,40 +548,44 @@ static void dmxConfigMove(int deltaX, int deltaY)
     dmxConfigNotSaved = 1;
 }
 
-static void dmxConfigCanvasInput(Widget w, XtPointer closure,
-                                 XtPointer callData)
+static void
+dmxConfigCanvasInput(Widget w, XtPointer closure, XtPointer callData)
 {
-    XEvent              *e      = (XEvent *)callData;
+    XEvent *e = (XEvent *) callData;
     DMXConfigDisplayPtr display = NULL;
 
     switch (e->type) {
     case ButtonPress:
         if (e->xbutton.button == Button1) {
-            dmxConfigGrabbed     = 1;
+            dmxConfigGrabbed = 1;
             dmxConfigGrabbedFine = 0;
-            dmxConfigGrabbedX    = e->xbutton.x;
-            dmxConfigGrabbedY    = e->xbutton.y;
+            dmxConfigGrabbedX = e->xbutton.x;
+            dmxConfigGrabbedY = e->xbutton.y;
         }
         if (e->xbutton.button == Button2) {
-            dmxConfigGrabbed     = 1;
+            dmxConfigGrabbed = 1;
             dmxConfigGrabbedFine = 1;
-            dmxConfigGrabbedX    = e->xbutton.x;
-            dmxConfigGrabbedY    = e->xbutton.y;
+            dmxConfigGrabbedX = e->xbutton.x;
+            dmxConfigGrabbedY = e->xbutton.y;
         }
         break;
     case ButtonRelease:
-        if (e->xbutton.button == Button1) dmxConfigGrabbed = 0;
-        if (e->xbutton.button == Button2) dmxConfigGrabbed = 0;
+        if (e->xbutton.button == Button1)
+            dmxConfigGrabbed = 0;
+        if (e->xbutton.button == Button2)
+            dmxConfigGrabbed = 0;
         break;
     case MotionNotify:
         if (dmxConfigGrabbed && dmxConfigCurrentDisplay) {
             int deltaX = e->xmotion.x - dmxConfigGrabbedX;
             int deltaY = e->xmotion.y - dmxConfigGrabbedY;
+
             dmxConfigMove(dmxConfigGrabbedFine ? deltaX : unscalex(deltaX),
                           dmxConfigGrabbedFine ? deltaY : unscaley(deltaY));
             dmxConfigGrabbedX = e->xmotion.x;
             dmxConfigGrabbedY = e->xmotion.y;
-        } else {
+        }
+        else {
             display = dmxConfigFindDisplay(e->xmotion.x, e->xmotion.y);
             if (display != dmxConfigCurrentDisplay) {
                 dmxConfigCurrentDisplay = display;
@@ -535,31 +595,39 @@ static void dmxConfigCanvasInput(Widget w, XtPointer closure,
         break;
     case KeyPress:
         switch (XLookupKeysym(&e->xkey, 0)) {
-        case XK_Right: dmxConfigMove(1,0);  break;
-        case XK_Left:  dmxConfigMove(-1,0); break;
-        case XK_Down:  dmxConfigMove(0,1);  break;
-        case XK_Up:    dmxConfigMove(0,-1); break;
+        case XK_Right:
+            dmxConfigMove(1, 0);
+            break;
+        case XK_Left:
+            dmxConfigMove(-1, 0);
+            break;
+        case XK_Down:
+            dmxConfigMove(0, 1);
+            break;
+        case XK_Up:
+            dmxConfigMove(0, -1);
+            break;
         }
         break;
     }
 }
 
-static void dmxConfigCanvasResize(Widget w, XtPointer closure,
-                                  XtPointer callData)
+static void
+dmxConfigCanvasResize(Widget w, XtPointer closure, XtPointer callData)
 {
     dmxConfigCanvasDraw(NULL);
 }
 
-static void dmxConfigCanvasExpose(Widget w, XtPointer closure,
-                                  XtPointer callData)
+static void
+dmxConfigCanvasExpose(Widget w, XtPointer closure, XtPointer callData)
 {
-    CanvasExposeDataPtr data = (CanvasExposeDataPtr)callData;
+    CanvasExposeDataPtr data = (CanvasExposeDataPtr) callData;
 
     dmxConfigCanvasDraw(data->region);
 }
 
-static void dmxConfigOpenCallback(Widget w, XtPointer closure,
-                                  XtPointer callData)
+static void
+dmxConfigOpenCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     dmxConfigState = dmxConfigStateOpen;
     XtVaSetValues(okbutton, XtNlabel, "Open", NULL);
@@ -567,8 +635,8 @@ static void dmxConfigOpenCallback(Widget w, XtPointer closure,
     XtPopup(openpopup, XtGrabExclusive);
 }
 
-static void dmxConfigSaveCallback(Widget w, XtPointer closure,
-                                  XtPointer callData)
+static void
+dmxConfigSaveCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     dmxConfigState = dmxConfigStateSave;
     XtVaSetValues(okbutton, XtNlabel, "Save", NULL);
@@ -576,69 +644,73 @@ static void dmxConfigSaveCallback(Widget w, XtPointer closure,
     XtPopup(openpopup, XtGrabExclusive);
 }
 
-static void dmxConfigOkCallback(Widget w, XtPointer closure,
-                                XtPointer callData)
+static void
+dmxConfigOkCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     dmxConfigGetValueString(&dmxConfigFilename, opendialog);
     XtPopdown(openpopup);
-    if (dmxConfigState == dmxConfigStateOpen) dmxConfigReadFile();
-    else                                      dmxConfigWriteFile();
+    if (dmxConfigState == dmxConfigStateOpen)
+        dmxConfigReadFile();
+    else
+        dmxConfigWriteFile();
     dmxConfigNotSaved = 0;
 }
 
-static void dmxConfigCanCallback(Widget w, XtPointer closure,
-                                 XtPointer callData)
+static void
+dmxConfigCanCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     XtPopdown(openpopup);
 }
 
-static void dmxConfigECCallback(Widget w, XtPointer closure,
-                                XtPointer callData)
+static void
+dmxConfigECCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     char buf[256];              /* RATS: Only used in snprintf */
-    
-    if (!dmxConfigCurrent) return;
+
+    if (!dmxConfigCurrent)
+        return;
     dmxConfigSetPopupPosition(ecpopup);
     XtVaSetValues(ecdialog0, XtNvalue,
-                  dmxConfigCurrent->name ? dmxConfigCurrent->name : "",
-                  NULL);
+                  dmxConfigCurrent->name ? dmxConfigCurrent->name : "", NULL);
     snprintf(buf, sizeof(buf), "%dx%d",
-                dmxConfigCurrent->width, dmxConfigCurrent->height);
+             dmxConfigCurrent->width, dmxConfigCurrent->height);
     XtVaSetValues(ecdialog1, XtNvalue, buf, NULL);
     XtPopup(ecpopup, XtGrabExclusive);
 }
 
-static void dmxConfigNCCallback(Widget w, XtPointer closure,
-                                XtPointer callData)
+static void
+dmxConfigNCCallback(Widget w, XtPointer closure, XtPointer callData)
 {
-    int width = 1280*2, height = 1024*2;
+    int width = 1280 * 2, height = 1024 * 2;
 
     if (dmxConfigCurrent) {
-        width  = dmxConfigCurrent->width;
+        width = dmxConfigCurrent->width;
         height = dmxConfigCurrent->height;
     }
 
-    dmxConfigCurrent         = dmxConfigCreateVirtual(NULL, NULL, NULL,
-                                                      NULL, NULL, NULL);
-    dmxConfigNewVirtual      = dmxConfigCurrent;
-    dmxConfigCurrent->width  = width;
+    dmxConfigCurrent = dmxConfigCreateVirtual(NULL, NULL, NULL,
+                                              NULL, NULL, NULL);
+    dmxConfigNewVirtual = dmxConfigCurrent;
+    dmxConfigCurrent->width = width;
     dmxConfigCurrent->height = height;
     dmxConfigEntry = dmxConfigAddEntry(dmxConfigEntry, dmxConfigVirtual, NULL,
                                        dmxConfigCurrent);
     dmxConfigECCallback(w, closure, callData);
 }
 
-static void dmxConfigDCCallback(Widget w, XtPointer closure,
-                                XtPointer callData)
+static void
+dmxConfigDCCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     DMXConfigEntryPtr pt;
 
-    if (!dmxConfigEntry) return;
+    if (!dmxConfigEntry)
+        return;
     if (dmxConfigEntry
         && dmxConfigEntry->type == dmxConfigVirtual
         && dmxConfigEntry->virtual == dmxConfigCurrent) {
         dmxConfigEntry = dmxConfigEntry->next;
-    } else {
+    }
+    else {
         for (pt = dmxConfigEntry; pt && pt->next; pt = pt->next)
             if (pt->next->type == dmxConfigVirtual
                 && pt->next->virtual == dmxConfigCurrent) {
@@ -647,10 +719,10 @@ static void dmxConfigDCCallback(Widget w, XtPointer closure,
             }
     }
     dmxConfigFreeVirtual(dmxConfigCurrent);
-    dmxConfigCurrent        = NULL;
+    dmxConfigCurrent = NULL;
     dmxConfigCurrentDisplay = NULL;
 
-                                /* Make the first entry current */
+    /* Make the first entry current */
     for (pt = dmxConfigEntry; pt; pt = pt->next) {
         if (pt->type == dmxConfigVirtual) {
             dmxConfigCurrent = pt->virtual;
@@ -662,93 +734,96 @@ static void dmxConfigDCCallback(Widget w, XtPointer closure,
     dmxConfigCanvasDraw(NULL);
 }
 
-static void dmxConfigECOkCallback(Widget w, XtPointer closure,
-                                  XtPointer callData)
+static void
+dmxConfigECOkCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     const char *value;
-    char       *endpt;
+    char *endpt;
 
-    dmxConfigGetValueString((char **)&dmxConfigCurrent->name, ecdialog0);
-    value                    = XawDialogGetValueString(ecdialog1);
-    dmxConfigCurrent->width  = strtol(value, &endpt, 10);
-    dmxConfigCurrent->height = strtol(endpt+1, NULL, 10);
+    dmxConfigGetValueString((char **) &dmxConfigCurrent->name, ecdialog0);
+    value = XawDialogGetValueString(ecdialog1);
+    dmxConfigCurrent->width = strtol(value, &endpt, 10);
+    dmxConfigCurrent->height = strtol(endpt + 1, NULL, 10);
     XtPopdown(ecpopup);
     dmxConfigCurrentDisplay = NULL;
-    dmxConfigNewVirtual     = NULL;
+    dmxConfigNewVirtual = NULL;
     dmxConfigSetupCnamemenu();
     dmxConfigCanvasDraw(NULL);
     dmxConfigNotSaved = 1;
 }
 
-static void dmxConfigECCanCallback(Widget w, XtPointer closure,
-                                   XtPointer callData)
+static void
+dmxConfigECCanCallback(Widget w, XtPointer closure, XtPointer callData)
 {
-    if (dmxConfigNewVirtual) dmxConfigDCCallback(w, closure, callData);
-    dmxConfigNewVirtual     = NULL;
+    if (dmxConfigNewVirtual)
+        dmxConfigDCCallback(w, closure, callData);
+    dmxConfigNewVirtual = NULL;
     XtPopdown(ecpopup);
 }
 
-static void dmxConfigEDCallback(Widget w, XtPointer closure,
-                                XtPointer callData)
+static void
+dmxConfigEDCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     char buf[256];              /* RATS: Only used in snprintf */
-    
-    if (!dmxConfigCurrent || !dmxConfigCurrentDisplay) return;
+
+    if (!dmxConfigCurrent || !dmxConfigCurrentDisplay)
+        return;
     dmxConfigSetPopupPosition(edpopup);
     XtVaSetValues(eddialog0, XtNvalue,
                   dmxConfigCurrentDisplay->name
-                  ? dmxConfigCurrentDisplay->name
-                  : "",
-                  NULL);
+                  ? dmxConfigCurrentDisplay->name : "", NULL);
     snprintf(buf, sizeof(buf), "%dx%d%c%d%c%d",
-                dmxConfigCurrentDisplay->scrnWidth,
-                dmxConfigCurrentDisplay->scrnHeight,
-                dmxConfigCurrentDisplay->scrnXSign < 0 ? '-' : '+',
-                dmxConfigCurrentDisplay->scrnY,
-                dmxConfigCurrentDisplay->scrnYSign < 0 ? '-' : '+',
-                dmxConfigCurrentDisplay->scrnY);
+             dmxConfigCurrentDisplay->scrnWidth,
+             dmxConfigCurrentDisplay->scrnHeight,
+             dmxConfigCurrentDisplay->scrnXSign < 0 ? '-' : '+',
+             dmxConfigCurrentDisplay->scrnY,
+             dmxConfigCurrentDisplay->scrnYSign < 0 ? '-' : '+',
+             dmxConfigCurrentDisplay->scrnY);
     XtVaSetValues(eddialog1, XtNvalue, buf, NULL);
     snprintf(buf, sizeof(buf), "@%dx%d",
-                dmxConfigCurrentDisplay->rootXOrigin,
-                dmxConfigCurrentDisplay->rootYOrigin);
+             dmxConfigCurrentDisplay->rootXOrigin,
+             dmxConfigCurrentDisplay->rootYOrigin);
     XtVaSetValues(eddialog2, XtNvalue, buf, NULL);
     XtPopup(edpopup, XtGrabExclusive);
 }
 
-static void dmxConfigNDCallback(Widget w, XtPointer closure,
-                                XtPointer callData)
+static void
+dmxConfigNDCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     int width = 1280, height = 1024;
 
-    if (!dmxConfigCurrent) return;
+    if (!dmxConfigCurrent)
+        return;
     if (dmxConfigCurrentDisplay) {
-        width  = dmxConfigCurrentDisplay->scrnWidth;
+        width = dmxConfigCurrentDisplay->scrnWidth;
         height = dmxConfigCurrentDisplay->scrnHeight;
     }
     dmxConfigCurrentDisplay = dmxConfigCreateDisplay(NULL, NULL, NULL,
                                                      NULL, NULL);
-    dmxConfigNewDisplay     = dmxConfigCurrentDisplay;
-    dmxConfigCurrentDisplay->scrnWidth  = width;
+    dmxConfigNewDisplay = dmxConfigCurrentDisplay;
+    dmxConfigCurrentDisplay->scrnWidth = width;
     dmxConfigCurrentDisplay->scrnHeight = height;
-    
+
     dmxConfigCurrent->subentry
         = dmxConfigAddSub(dmxConfigCurrent->subentry,
                           dmxConfigSubDisplay(dmxConfigCurrentDisplay));
     dmxConfigEDCallback(w, closure, callData);
 }
 
-static void dmxConfigDDCallback(Widget w, XtPointer closure,
-                                XtPointer callData)
+static void
+dmxConfigDDCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     DMXConfigSubPtr pt;
 
-    if (!dmxConfigCurrent || !dmxConfigCurrentDisplay) return;
-                                /* First */
+    if (!dmxConfigCurrent || !dmxConfigCurrentDisplay)
+        return;
+    /* First */
     if (dmxConfigCurrent->subentry
         && dmxConfigCurrent->subentry->type == dmxConfigDisplay
         && dmxConfigCurrent->subentry->display == dmxConfigCurrentDisplay) {
         dmxConfigCurrent->subentry = dmxConfigCurrent->subentry->next;
-    } else {
+    }
+    else {
         for (pt = dmxConfigCurrent->subentry; pt && pt->next; pt = pt->next)
             if (pt->next->type == dmxConfigDisplay
                 && pt->next->display == dmxConfigCurrentDisplay) {
@@ -762,21 +837,21 @@ static void dmxConfigDDCallback(Widget w, XtPointer closure,
     dmxConfigCanvasDraw(NULL);
 }
 
-static void dmxConfigAboutCallback(Widget w, XtPointer closure,
-                                   XtPointer callData)
+static void
+dmxConfigAboutCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     dmxConfigSetPopupPosition(aboutpopup);
     XtPopup(aboutpopup, XtGrabExclusive);
 }
 
-static void dmxConfigAboutOkCallback(Widget w, XtPointer closure,
-                                     XtPointer CallData)
+static void
+dmxConfigAboutOkCallback(Widget w, XtPointer closure, XtPointer CallData)
 {
     XtPopdown(aboutpopup);
 }
 
-static void dmxConfigQuitCallback(Widget w, XtPointer closure,
-                                  XtPointer callData)
+static void
+dmxConfigQuitCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     if (dmxConfigNotSaved) {
         dmxConfigSetPopupPosition(quitpopup);
@@ -786,77 +861,82 @@ static void dmxConfigQuitCallback(Widget w, XtPointer closure,
     exit(0);
 }
 
-static void dmxConfigQuitOkCallback(Widget w, XtPointer closure,
-                                    XtPointer callData)
+static void
+dmxConfigQuitOkCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     XtPopdown(quitpopup);
     exit(0);
 }
 
-static void dmxConfigQuitCanCallback(Widget w, XtPointer closure,
-                                     XtPointer callData)
+static void
+dmxConfigQuitCanCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     XtPopdown(quitpopup);
 }
 
-static void dmxConfigEDOkCallback(Widget w, XtPointer closure,
-                                  XtPointer callData)
+static void
+dmxConfigEDOkCallback(Widget w, XtPointer closure, XtPointer callData)
 {
     char *value;
     char *endpt;
-    
+
     dmxConfigNewDisplay = NULL;
-    dmxConfigGetValueString((char **)&dmxConfigCurrentDisplay->name,
+    dmxConfigGetValueString((char **) &dmxConfigCurrentDisplay->name,
                             eddialog0);
-    value                           = XawDialogGetValueString(eddialog1);
+    value = XawDialogGetValueString(eddialog1);
     if (*value == '-' || *value == '+') {
-        dmxConfigCurrentDisplay->scrnWidth  = 0;
+        dmxConfigCurrentDisplay->scrnWidth = 0;
         dmxConfigCurrentDisplay->scrnHeight = 0;
-        endpt                               = value;
-    } else {
-        dmxConfigCurrentDisplay->scrnWidth  = strtol(value, &endpt, 10);
-        dmxConfigCurrentDisplay->scrnHeight = strtol(endpt+1, &endpt, 10);
+        endpt = value;
+    }
+    else {
+        dmxConfigCurrentDisplay->scrnWidth = strtol(value, &endpt, 10);
+        dmxConfigCurrentDisplay->scrnHeight = strtol(endpt + 1, &endpt, 10);
     }
     if (*endpt) {
-        dmxConfigCurrentDisplay->scrnXSign  = (*endpt == '-') ? -1 : 1;
-        dmxConfigCurrentDisplay->scrnX      = strtol(endpt+1, &endpt, 10);
-        dmxConfigCurrentDisplay->scrnYSign  = (*endpt == '-') ? -1 : 1;
-        dmxConfigCurrentDisplay->scrnY      = strtol(endpt+1, NULL, 10);
+        dmxConfigCurrentDisplay->scrnXSign = (*endpt == '-') ? -1 : 1;
+        dmxConfigCurrentDisplay->scrnX = strtol(endpt + 1, &endpt, 10);
+        dmxConfigCurrentDisplay->scrnYSign = (*endpt == '-') ? -1 : 1;
+        dmxConfigCurrentDisplay->scrnY = strtol(endpt + 1, NULL, 10);
     }
     if (dmxConfigCurrentDisplay->scrnX < 0)
         dmxConfigCurrentDisplay->scrnX = -dmxConfigCurrentDisplay->scrnX;
     if (dmxConfigCurrentDisplay->scrnY < 0)
         dmxConfigCurrentDisplay->scrnY = -dmxConfigCurrentDisplay->scrnY;
-    value                                 = XawDialogGetValueString(eddialog2);
-    dmxConfigCurrentDisplay->rootXOrigin  = strtol(value+1, &endpt, 10);
-    dmxConfigCurrentDisplay->rootYOrigin  = strtol(endpt+1, NULL, 10);
+    value = XawDialogGetValueString(eddialog2);
+    dmxConfigCurrentDisplay->rootXOrigin = strtol(value + 1, &endpt, 10);
+    dmxConfigCurrentDisplay->rootYOrigin = strtol(endpt + 1, NULL, 10);
     XtPopdown(edpopup);
     dmxConfigSetupCnamemenu();
     dmxConfigCanvasDraw(NULL);
     dmxConfigNotSaved = 1;
 }
 
-static void dmxConfigEDCanCallback(Widget w, XtPointer closure,
-                                   XtPointer callData)
+static void
+dmxConfigEDCanCallback(Widget w, XtPointer closure, XtPointer callData)
 {
-    if (dmxConfigNewDisplay) dmxConfigDDCallback(w, closure, callData);
+    if (dmxConfigNewDisplay)
+        dmxConfigDDCallback(w, closure, callData);
     dmxConfigNewDisplay = NULL;
     XtPopdown(edpopup);
 }
 
-static void dmxConfigOkAction(Widget w, XEvent *event,
-                              String *params, Cardinal *num_params)
+static void
+dmxConfigOkAction(Widget w, XEvent * event,
+                  String * params, Cardinal * num_params)
 {
     Widget p = XtParent(w);
     Widget t;
 
-    if (p == opendialog) dmxConfigOkCallback(w, NULL, NULL);
+    if (p == opendialog)
+        dmxConfigOkCallback(w, NULL, NULL);
 
     if (p == ecdialog0) {
         t = XtNameToWidget(ecdialog1, "value");
         XWarpPointer(XtDisplay(t), None, XtWindow(t), 0, 0, 0, 0, 0, 10);
     }
-    if (p == ecdialog1) dmxConfigECOkCallback(w, NULL, NULL);
+    if (p == ecdialog1)
+        dmxConfigECOkCallback(w, NULL, NULL);
 
     if (p == eddialog0) {
         t = XtNameToWidget(eddialog1, "value");
@@ -866,322 +946,285 @@ static void dmxConfigOkAction(Widget w, XEvent *event,
         t = XtNameToWidget(eddialog2, "value");
         XWarpPointer(XtDisplay(t), None, XtWindow(t), 0, 0, 0, 0, 0, 10);
     }
-    if (p == eddialog2) dmxConfigEDOkCallback(w, NULL, NULL);
+    if (p == eddialog2)
+        dmxConfigEDOkCallback(w, NULL, NULL);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    XtAppContext   appContext;
-    Widget         toplevel;
-    Widget         parent, menubox, bottombox, databox, canvasbox;
-    Widget         filebutton, helpbutton;
-    Widget         filemenu, openbutton, savebutton, quitbutton;
-    Widget         helpmenu, aboutbutton, aboutbox, aboutok;
-    Widget         quitbox, quitok, quitcan;
-    Widget         ncbutton;
-    Widget         canbutton;
-    Widget         ecbox, ecokbutton, eccanbutton;
-    Widget         edbox, edokbutton;
-    Widget         edcanbutton;
-                                /* FIXME: add meta-i, ctrl,meta-z,v? */
-    const char     *opentrans = "<Key>Return: openOk()\n\
+    XtAppContext appContext;
+    Widget toplevel;
+    Widget parent, menubox, bottombox, databox, canvasbox;
+    Widget filebutton, helpbutton;
+    Widget filemenu, openbutton, savebutton, quitbutton;
+    Widget helpmenu, aboutbutton, aboutbox, aboutok;
+    Widget quitbox, quitok, quitcan;
+    Widget ncbutton;
+    Widget canbutton;
+    Widget ecbox, ecokbutton, eccanbutton;
+    Widget edbox, edokbutton;
+    Widget edcanbutton;
+
+    /* FIXME: add meta-i, ctrl,meta-z,v? */
+    const char *opentrans = "<Key>Return: openOk()\n\
                                  <Key>Linefeed: openOk()\n\
                                  Ctrl<Key>M: openOk()\n\
                                  Ctrl<Key>J: openOk()\n\
                                  Ctrl<Key>O: noop()\n\
                                  Ctrl<Key>N: noop()\n\
                                  Ctrl<Key>P: noop()";
-    const char     *canvastrans =
+    const char *canvastrans =
         "<Btn3Down>: placeMenu() XtMenuPopup(buttonpopup)";
-    XtActionsRec   actiontable[] = {
-        { "openOk",        dmxConfigOkAction },
-        { "placeMenu",     dmxConfigPlaceMenu },
-        { "noop",          NULL }
+    XtActionsRec actiontable[] = {
+        {"openOk", dmxConfigOkAction},
+        {"placeMenu", dmxConfigPlaceMenu},
+        {"noop", NULL}
     };
 
     dmxConfigFilename = XtNewString((argc >= 2) ? argv[1] : "");
 
-    toplevel    = XtVaAppInitialize(&appContext, "XDmxconfig",
-                                    NULL, 0,
-                                    &argc, argv,
-                                    NULL,
-                                    NULL);
-
-                                /* Main boxes */
-    parent      = XtVaCreateManagedWidget("parent", formWidgetClass, toplevel,
-                                          XtNorientation, XtorientVertical,
-                                          XtNwidth, DMX_MAIN_WIDTH,
-                                          XtNheight, DMX_MAIN_HEIGHT,
-                                          NULL);
-    menubox     = XtVaCreateManagedWidget("menubox", boxWidgetClass, parent,
-                                          XtNborderWidth, 0,
-                                          XtNorientation, XtorientHorizontal,
-                                          XtNtop, XtChainTop,
-                                          NULL);
-    bottombox   = XtVaCreateManagedWidget("bottombox", formWidgetClass, parent,
-                                          XtNborderWidth, 0,
-                                          XtNfromVert, menubox,
-                                          XtNorientation, XtorientHorizontal,
-                                          NULL);
-    databox     = XtVaCreateManagedWidget("databox", formWidgetClass,
-                                          bottombox,
-                                          XtNborderWidth, 0,
-                                          XtNhorizDistance, 0,
-                                          XtNwidth, DMX_DATA_WIDTH,
-                                          XtNheight, DMX_DATA_HEIGHT,
-                                          XtNleft, XtChainLeft,
-                                          XtNorientation, XtorientVertical,
-                                          NULL);
-
-                                /* Data */
-    cnamebox    = XtVaCreateManagedWidget("cnamebox", menuButtonWidgetClass,
-                                          databox,
-                                          XtNtop, XtChainTop,
-                                          XtNjustify, XtJustifyLeft,
-                                          XtNwidth, DMX_DATA_WIDTH,
-                                          XtNlabel, "",
-                                          XtNmenuName, "cnamemenu",
-                                          NULL);
-    cdimbox     = XtVaCreateManagedWidget("cdimbox", labelWidgetClass,
-                                          databox,
-                                          XtNfromVert, cnamebox,
-                                          XtNjustify, XtJustifyLeft,
-                                          XtNwidth, DMX_DATA_WIDTH,
-                                          XtNlabel, "",
-                                          NULL);
-    namebox     = XtVaCreateManagedWidget("namebox", labelWidgetClass, databox,
-                                          XtNfromVert, cdimbox,
-                                          XtNjustify, XtJustifyLeft,
-                                          XtNwidth, DMX_DATA_WIDTH,
-                                          XtNlabel, "",
-                                          NULL);
-    dimbox      = XtVaCreateManagedWidget("dimbox", labelWidgetClass,
-                                          databox,
-                                          XtNfromVert, namebox,
-                                          XtNjustify, XtJustifyLeft,
-                                          XtNwidth, DMX_DATA_WIDTH,
-                                          XtNlabel, "",
-                                          NULL);
-    rtbox       = XtVaCreateManagedWidget("rtbox", labelWidgetClass,
-                                          databox,
-                                          XtNfromVert, dimbox,
-                                          XtNjustify, XtJustifyLeft,
-                                          XtNwidth, DMX_DATA_WIDTH,
-                                          XtNlabel, "",
-                                          NULL);
-    origbox     = XtVaCreateManagedWidget("origbox", labelWidgetClass,
-                                          databox,
-                                          XtNfromVert, rtbox,
-                                          XtNjustify, XtJustifyLeft,
-                                          XtNwidth, DMX_DATA_WIDTH,
-                                          XtNlabel, "",
-                                          NULL);
-
-                                /* Canvas */
-    canvasbox   = XtVaCreateManagedWidget("canvasbox", boxWidgetClass,
-                                          bottombox,
-                                          XtNborderWidth, 0,
-                                          XtNwidth, DMX_CANVAS_WIDTH,
-                                          XtNheight, DMX_CANVAS_HEIGHT,
-                                          XtNfromHoriz, databox,
-                                          NULL);
-
-    canvas      = XtVaCreateManagedWidget("canvas", canvasWidgetClass,
-                                          canvasbox,
-                                          XtNwidth, DMX_CANVAS_WIDTH,
-                                          XtNheight, DMX_CANVAS_HEIGHT,
-                                          NULL);
-
-    
-                                /* Main menu buttons */
-    filebutton  = XtVaCreateManagedWidget("File", menuButtonWidgetClass,
-                                          menubox,
-                                          XtNmenuName, "filemenu",
-                                          NULL);
-    helpbutton  = XtVaCreateManagedWidget("Help", menuButtonWidgetClass,
-                                          menubox,
-                                          XtNmenuName, "helpmenu",
-                                          NULL);
-
-    
-                                /* File submenu buttons */
-    filemenu     = XtVaCreatePopupShell("filemenu", simpleMenuWidgetClass,
-                                        filebutton, NULL);
-    openbutton   = XtVaCreateManagedWidget("Open File", smeBSBObjectClass,
-                                           filemenu, NULL);
-    savebutton   = XtVaCreateManagedWidget("Save File", smeBSBObjectClass,
-                                           filemenu,
-                                           NULL);
-    ncbutton     = XtVaCreateManagedWidget("New Global", smeBSBObjectClass,
-                                           filemenu, NULL);
-    ecbutton     = XtVaCreateManagedWidget("Edit Global", smeBSBObjectClass,
-                                           filemenu,
-                                           NULL);
-    dcbutton     = XtVaCreateManagedWidget("Delete Global", smeBSBObjectClass,
-                                           filemenu,
-                                           NULL);
-    ndbutton0    = XtVaCreateManagedWidget("New Display", smeBSBObjectClass,
-                                           filemenu,
-                                           NULL);
-    quitbutton   = XtVaCreateManagedWidget("Quit", smeBSBObjectClass,
-                                           filemenu, NULL);
-
-                                /* Help submenu button */
-    helpmenu     = XtVaCreatePopupShell("helpmenu", simpleMenuWidgetClass,
-                                        helpbutton, NULL);
-    aboutbutton  = XtVaCreateManagedWidget("About", smeBSBObjectClass,
-                                           helpmenu, NULL);
-    
-                                /* Open popup */
-    openpopup    = XtVaCreatePopupShell("openpopup", transientShellWidgetClass,
-                                        toplevel, NULL);
-    opendialog   = XtVaCreateManagedWidget("opendialog", dialogWidgetClass,
-                                           openpopup,
-                                           XtNlabel, "Filename: ",
-                                           XtNvalue, dmxConfigFilename,
-                                           NULL);
-    okbutton     = XtVaCreateManagedWidget("Open", commandWidgetClass,
-                                           opendialog, NULL);
-    canbutton    = XtVaCreateManagedWidget("Cancel", commandWidgetClass,
-                                           opendialog, NULL);
-
-                                /* EC popup */
-    ecpopup      = XtVaCreatePopupShell("ecpopup", transientShellWidgetClass,
-                                        toplevel, NULL);
-    ecbox        = XtVaCreateManagedWidget("ecbox", boxWidgetClass,
-                                           ecpopup, NULL);
-    ecdialog0    = XtVaCreateManagedWidget("ecdialog0", dialogWidgetClass,
-                                           ecbox,
-                                           XtNlabel, "Name:              ",
-                                           XtNvalue, "",
-                                           NULL);
-    ecdialog1    = XtVaCreateManagedWidget("ecdialog1", dialogWidgetClass,
-                                           ecbox,
-                                           XtNlabel, "Dimension:         ",
-                                           XtNvalue, "",
-                                           NULL);
-    ecokbutton   = XtVaCreateManagedWidget("OK", commandWidgetClass,
-                                           ecbox, NULL);
-    eccanbutton  = XtVaCreateManagedWidget("Cancel", commandWidgetClass,
-                                           ecbox, NULL);
-
-                                /* ED popup */
-    edpopup      = XtVaCreatePopupShell("edpopup", transientShellWidgetClass,
-                                        toplevel, NULL);
-    edbox        = XtVaCreateManagedWidget("edbox", boxWidgetClass,
-                                           edpopup, NULL);
-    eddialog0    = XtVaCreateManagedWidget("eddialog0", dialogWidgetClass,
-                                           edbox,
-                                           XtNlabel, "Display Name:      ",
-                                           XtNvalue, "",
-                                           NULL);
-    eddialog1    = XtVaCreateManagedWidget("eddialog1", dialogWidgetClass,
-                                           edbox,
-                                           XtNlabel, "Geometry:          ",
-                                           XtNvalue, "",
-                                           NULL);
-    eddialog2    = XtVaCreateManagedWidget("eddialog2", dialogWidgetClass,
-                                           edbox,
-                                           XtNlabel, "Offset:            ",
-                                           XtNvalue, "",
-                                           NULL);
-    edokbutton   = XtVaCreateManagedWidget("OK", commandWidgetClass,
-                                           edbox, NULL);
-    edcanbutton  = XtVaCreateManagedWidget("Cancel", commandWidgetClass,
-                                           edbox, NULL);
-
-                                /* About popup */
-    aboutpopup   = XtVaCreatePopupShell("aboutpopup",transientShellWidgetClass,
-                                        toplevel, NULL);
-    aboutbox     = XtVaCreateManagedWidget("aboutbox", boxWidgetClass,
-                                           aboutpopup, NULL);
-                   XtVaCreateManagedWidget("abouttext", labelWidgetClass,
-                                           aboutbox,
-                                           XtNlabel, DMX_INFO,
-                                           NULL);
-    aboutok      = XtVaCreateManagedWidget("OK", commandWidgetClass,
-                                           aboutbox, NULL);
-
-                                /* Quit popup */
-    quitpopup    = XtVaCreatePopupShell("quitpopup",transientShellWidgetClass,
-                                        toplevel, NULL);
-    quitbox      = XtVaCreateManagedWidget("quitbox", boxWidgetClass,
-                                           quitpopup, NULL);
-                   XtVaCreateManagedWidget("quittext", labelWidgetClass,
-                                           quitbox,
-                                           XtNlabel,
-                                           "Changes to the configuration\n"
-                                           "been made that have not yet\n"
-                                           "been saved.  Do you want to\n"
-                                           "quit without saving?",
-                                           NULL);
-    quitok       = XtVaCreateManagedWidget("Quit WITHOUT Saving",
-                                           commandWidgetClass,
-                                           quitbox, NULL);
-    quitcan      = XtVaCreateManagedWidget("Continue Editing",
-                                           commandWidgetClass,
-                                           quitbox, NULL);
-
-                                /* Button popup */
-    buttonpopup  = XtVaCreatePopupShell("buttonpopup", simpleMenuWidgetClass,
-                                        toplevel, NULL);
-    ndbutton1    = XtVaCreateManagedWidget("New Display", smeBSBObjectClass,
-                                           buttonpopup,
-                                           NULL);
-    edbutton     = XtVaCreateManagedWidget("Edit Display", smeBSBObjectClass,
-                                           buttonpopup,
-                                           NULL);
-    ddbutton     = XtVaCreateManagedWidget("Delete Display", smeBSBObjectClass,
-                                           buttonpopup,
-                                           NULL);
-
-                                /* Callbacks */
-    XtAddCallback(openbutton,  XtNcallback, dmxConfigOpenCallback,       NULL);
-    XtAddCallback(savebutton,  XtNcallback, dmxConfigSaveCallback,       NULL);
-    XtAddCallback(okbutton,    XtNcallback, dmxConfigOkCallback,         NULL);
-    XtAddCallback(canbutton,   XtNcallback, dmxConfigCanCallback,        NULL);
-    
+    toplevel = XtVaAppInitialize(&appContext, "XDmxconfig",
+                                 NULL, 0, &argc, argv, NULL, NULL);
+
+    /* Main boxes */
+    parent = XtVaCreateManagedWidget("parent", formWidgetClass, toplevel,
+                                     XtNorientation, XtorientVertical,
+                                     XtNwidth, DMX_MAIN_WIDTH,
+                                     XtNheight, DMX_MAIN_HEIGHT, NULL);
+    menubox = XtVaCreateManagedWidget("menubox", boxWidgetClass, parent,
+                                      XtNborderWidth, 0,
+                                      XtNorientation, XtorientHorizontal,
+                                      XtNtop, XtChainTop, NULL);
+    bottombox = XtVaCreateManagedWidget("bottombox", formWidgetClass, parent,
+                                        XtNborderWidth, 0,
+                                        XtNfromVert, menubox,
+                                        XtNorientation, XtorientHorizontal,
+                                        NULL);
+    databox = XtVaCreateManagedWidget("databox", formWidgetClass,
+                                      bottombox,
+                                      XtNborderWidth, 0,
+                                      XtNhorizDistance, 0,
+                                      XtNwidth, DMX_DATA_WIDTH,
+                                      XtNheight, DMX_DATA_HEIGHT,
+                                      XtNleft, XtChainLeft,
+                                      XtNorientation, XtorientVertical, NULL);
+
+    /* Data */
+    cnamebox = XtVaCreateManagedWidget("cnamebox", menuButtonWidgetClass,
+                                       databox,
+                                       XtNtop, XtChainTop,
+                                       XtNjustify, XtJustifyLeft,
+                                       XtNwidth, DMX_DATA_WIDTH,
+                                       XtNlabel, "",
+                                       XtNmenuName, "cnamemenu", NULL);
+    cdimbox = XtVaCreateManagedWidget("cdimbox", labelWidgetClass,
+                                      databox,
+                                      XtNfromVert, cnamebox,
+                                      XtNjustify, XtJustifyLeft,
+                                      XtNwidth, DMX_DATA_WIDTH,
+                                      XtNlabel, "", NULL);
+    namebox = XtVaCreateManagedWidget("namebox", labelWidgetClass, databox,
+                                      XtNfromVert, cdimbox,
+                                      XtNjustify, XtJustifyLeft,
+                                      XtNwidth, DMX_DATA_WIDTH,
+                                      XtNlabel, "", NULL);
+    dimbox = XtVaCreateManagedWidget("dimbox", labelWidgetClass,
+                                     databox,
+                                     XtNfromVert, namebox,
+                                     XtNjustify, XtJustifyLeft,
+                                     XtNwidth, DMX_DATA_WIDTH,
+                                     XtNlabel, "", NULL);
+    rtbox = XtVaCreateManagedWidget("rtbox", labelWidgetClass,
+                                    databox,
+                                    XtNfromVert, dimbox,
+                                    XtNjustify, XtJustifyLeft,
+                                    XtNwidth, DMX_DATA_WIDTH,
+                                    XtNlabel, "", NULL);
+    origbox = XtVaCreateManagedWidget("origbox", labelWidgetClass,
+                                      databox,
+                                      XtNfromVert, rtbox,
+                                      XtNjustify, XtJustifyLeft,
+                                      XtNwidth, DMX_DATA_WIDTH,
+                                      XtNlabel, "", NULL);
+
+    /* Canvas */
+    canvasbox = XtVaCreateManagedWidget("canvasbox", boxWidgetClass,
+                                        bottombox,
+                                        XtNborderWidth, 0,
+                                        XtNwidth, DMX_CANVAS_WIDTH,
+                                        XtNheight, DMX_CANVAS_HEIGHT,
+                                        XtNfromHoriz, databox, NULL);
+
+    canvas = XtVaCreateManagedWidget("canvas", canvasWidgetClass,
+                                     canvasbox,
+                                     XtNwidth, DMX_CANVAS_WIDTH,
+                                     XtNheight, DMX_CANVAS_HEIGHT, NULL);
+
+    /* Main menu buttons */
+    filebutton = XtVaCreateManagedWidget("File", menuButtonWidgetClass,
+                                         menubox,
+                                         XtNmenuName, "filemenu", NULL);
+    helpbutton = XtVaCreateManagedWidget("Help", menuButtonWidgetClass,
+                                         menubox,
+                                         XtNmenuName, "helpmenu", NULL);
+
+    /* File submenu buttons */
+    filemenu = XtVaCreatePopupShell("filemenu", simpleMenuWidgetClass,
+                                    filebutton, NULL);
+    openbutton = XtVaCreateManagedWidget("Open File", smeBSBObjectClass,
+                                         filemenu, NULL);
+    savebutton = XtVaCreateManagedWidget("Save File", smeBSBObjectClass,
+                                         filemenu, NULL);
+    ncbutton = XtVaCreateManagedWidget("New Global", smeBSBObjectClass,
+                                       filemenu, NULL);
+    ecbutton = XtVaCreateManagedWidget("Edit Global", smeBSBObjectClass,
+                                       filemenu, NULL);
+    dcbutton = XtVaCreateManagedWidget("Delete Global", smeBSBObjectClass,
+                                       filemenu, NULL);
+    ndbutton0 = XtVaCreateManagedWidget("New Display", smeBSBObjectClass,
+                                        filemenu, NULL);
+    quitbutton = XtVaCreateManagedWidget("Quit", smeBSBObjectClass,
+                                         filemenu, NULL);
+
+    /* Help submenu button */
+    helpmenu = XtVaCreatePopupShell("helpmenu", simpleMenuWidgetClass,
+                                    helpbutton, NULL);
+    aboutbutton = XtVaCreateManagedWidget("About", smeBSBObjectClass,
+                                          helpmenu, NULL);
+
+    /* Open popup */
+    openpopup = XtVaCreatePopupShell("openpopup", transientShellWidgetClass,
+                                     toplevel, NULL);
+    opendialog = XtVaCreateManagedWidget("opendialog", dialogWidgetClass,
+                                         openpopup,
+                                         XtNlabel, "Filename: ",
+                                         XtNvalue, dmxConfigFilename, NULL);
+    okbutton = XtVaCreateManagedWidget("Open", commandWidgetClass,
+                                       opendialog, NULL);
+    canbutton = XtVaCreateManagedWidget("Cancel", commandWidgetClass,
+                                        opendialog, NULL);
+
+    /* EC popup */
+    ecpopup = XtVaCreatePopupShell("ecpopup", transientShellWidgetClass,
+                                   toplevel, NULL);
+    ecbox = XtVaCreateManagedWidget("ecbox", boxWidgetClass, ecpopup, NULL);
+    ecdialog0 = XtVaCreateManagedWidget("ecdialog0", dialogWidgetClass,
+                                        ecbox,
+                                        XtNlabel, "Name:              ",
+                                        XtNvalue, "", NULL);
+    ecdialog1 = XtVaCreateManagedWidget("ecdialog1", dialogWidgetClass,
+                                        ecbox,
+                                        XtNlabel, "Dimension:         ",
+                                        XtNvalue, "", NULL);
+    ecokbutton = XtVaCreateManagedWidget("OK", commandWidgetClass, ecbox, NULL);
+    eccanbutton = XtVaCreateManagedWidget("Cancel", commandWidgetClass,
+                                          ecbox, NULL);
+
+    /* ED popup */
+    edpopup = XtVaCreatePopupShell("edpopup", transientShellWidgetClass,
+                                   toplevel, NULL);
+    edbox = XtVaCreateManagedWidget("edbox", boxWidgetClass, edpopup, NULL);
+    eddialog0 = XtVaCreateManagedWidget("eddialog0", dialogWidgetClass,
+                                        edbox,
+                                        XtNlabel, "Display Name:      ",
+                                        XtNvalue, "", NULL);
+    eddialog1 = XtVaCreateManagedWidget("eddialog1", dialogWidgetClass,
+                                        edbox,
+                                        XtNlabel, "Geometry:          ",
+                                        XtNvalue, "", NULL);
+    eddialog2 = XtVaCreateManagedWidget("eddialog2", dialogWidgetClass,
+                                        edbox,
+                                        XtNlabel, "Offset:            ",
+                                        XtNvalue, "", NULL);
+    edokbutton = XtVaCreateManagedWidget("OK", commandWidgetClass, edbox, NULL);
+    edcanbutton = XtVaCreateManagedWidget("Cancel", commandWidgetClass,
+                                          edbox, NULL);
+
+    /* About popup */
+    aboutpopup = XtVaCreatePopupShell("aboutpopup", transientShellWidgetClass,
+                                      toplevel, NULL);
+    aboutbox = XtVaCreateManagedWidget("aboutbox", boxWidgetClass,
+                                       aboutpopup, NULL);
+    XtVaCreateManagedWidget("abouttext", labelWidgetClass,
+                            aboutbox, XtNlabel, DMX_INFO, NULL);
+    aboutok = XtVaCreateManagedWidget("OK", commandWidgetClass, aboutbox, NULL);
+
+    /* Quit popup */
+    quitpopup = XtVaCreatePopupShell("quitpopup", transientShellWidgetClass,
+                                     toplevel, NULL);
+    quitbox = XtVaCreateManagedWidget("quitbox", boxWidgetClass,
+                                      quitpopup, NULL);
+    XtVaCreateManagedWidget("quittext", labelWidgetClass,
+                            quitbox,
+                            XtNlabel,
+                            "Changes to the configuration\n"
+                            "been made that have not yet\n"
+                            "been saved.  Do you want to\n"
+                            "quit without saving?", NULL);
+    quitok = XtVaCreateManagedWidget("Quit WITHOUT Saving",
+                                     commandWidgetClass, quitbox, NULL);
+    quitcan = XtVaCreateManagedWidget("Continue Editing",
+                                      commandWidgetClass, quitbox, NULL);
+
+    /* Button popup */
+    buttonpopup = XtVaCreatePopupShell("buttonpopup", simpleMenuWidgetClass,
+                                       toplevel, NULL);
+    ndbutton1 = XtVaCreateManagedWidget("New Display", smeBSBObjectClass,
+                                        buttonpopup, NULL);
+    edbutton = XtVaCreateManagedWidget("Edit Display", smeBSBObjectClass,
+                                       buttonpopup, NULL);
+    ddbutton = XtVaCreateManagedWidget("Delete Display", smeBSBObjectClass,
+                                       buttonpopup, NULL);
+
+    /* Callbacks */
+    XtAddCallback(openbutton, XtNcallback, dmxConfigOpenCallback, NULL);
+    XtAddCallback(savebutton, XtNcallback, dmxConfigSaveCallback, NULL);
+    XtAddCallback(okbutton, XtNcallback, dmxConfigOkCallback, NULL);
+    XtAddCallback(canbutton, XtNcallback, dmxConfigCanCallback, NULL);
+
     XtAppAddActions(appContext, actiontable, XtNumber(actiontable));
     XtOverrideTranslations(canvas, XtParseTranslationTable(canvastrans));
     XtOverrideTranslations(XtNameToWidget(opendialog, "value"),
-                                          XtParseTranslationTable(opentrans));
+                           XtParseTranslationTable(opentrans));
     XtOverrideTranslations(XtNameToWidget(ecdialog0, "value"),
-                                          XtParseTranslationTable(opentrans));
+                           XtParseTranslationTable(opentrans));
     XtOverrideTranslations(XtNameToWidget(ecdialog1, "value"),
-                                          XtParseTranslationTable(opentrans));
+                           XtParseTranslationTable(opentrans));
     XtOverrideTranslations(XtNameToWidget(eddialog0, "value"),
-                                          XtParseTranslationTable(opentrans));
+                           XtParseTranslationTable(opentrans));
     XtOverrideTranslations(XtNameToWidget(eddialog1, "value"),
-                                          XtParseTranslationTable(opentrans));
+                           XtParseTranslationTable(opentrans));
     XtOverrideTranslations(XtNameToWidget(eddialog2, "value"),
-                                          XtParseTranslationTable(opentrans));
-    
-    XtAddCallback(ncbutton,    XtNcallback, dmxConfigNCCallback,         NULL);
-    XtAddCallback(ecbutton,    XtNcallback, dmxConfigECCallback,         NULL);
-    XtAddCallback(ecokbutton,  XtNcallback, dmxConfigECOkCallback,       NULL);
-    XtAddCallback(eccanbutton, XtNcallback, dmxConfigECCanCallback,      NULL);
-    XtAddCallback(dcbutton,    XtNcallback, dmxConfigDCCallback,         NULL);
-
-    XtAddCallback(ndbutton0,   XtNcallback, dmxConfigNDCallback,         NULL);
-    XtAddCallback(ndbutton1,   XtNcallback, dmxConfigNDCallback,         NULL);
-    XtAddCallback(edbutton,    XtNcallback, dmxConfigEDCallback,         NULL);
-    XtAddCallback(ddbutton,    XtNcallback, dmxConfigDDCallback,         NULL);
-    XtAddCallback(edokbutton,  XtNcallback, dmxConfigEDOkCallback,       NULL);
-    XtAddCallback(edcanbutton, XtNcallback, dmxConfigEDCanCallback,      NULL);
-
-    XtAddCallback(aboutbutton, XtNcallback, dmxConfigAboutCallback,      NULL);
-    XtAddCallback(aboutok,     XtNcallback, dmxConfigAboutOkCallback,    NULL);
-    XtAddCallback(quitok,      XtNcallback, dmxConfigQuitOkCallback,     NULL);
-    XtAddCallback(quitcan,     XtNcallback, dmxConfigQuitCanCallback,    NULL);
-    
-    XtAddCallback(quitbutton,  XtNcallback, dmxConfigQuitCallback,       NULL);
-    
-    XtAddCallback(canvas, XtNcallback,             dmxConfigCanvasInput, NULL);
-    XtAddCallback(canvas, XtNcanvasExposeCallback, dmxConfigCanvasExpose,NULL);
-    XtAddCallback(canvas, XtNcanvasResizeCallback, dmxConfigCanvasResize,NULL);
-
-    if (dmxConfigFilename) dmxConfigReadFile();
-    
+                           XtParseTranslationTable(opentrans));
+
+    XtAddCallback(ncbutton, XtNcallback, dmxConfigNCCallback, NULL);
+    XtAddCallback(ecbutton, XtNcallback, dmxConfigECCallback, NULL);
+    XtAddCallback(ecokbutton, XtNcallback, dmxConfigECOkCallback, NULL);
+    XtAddCallback(eccanbutton, XtNcallback, dmxConfigECCanCallback, NULL);
+    XtAddCallback(dcbutton, XtNcallback, dmxConfigDCCallback, NULL);
+
+    XtAddCallback(ndbutton0, XtNcallback, dmxConfigNDCallback, NULL);
+    XtAddCallback(ndbutton1, XtNcallback, dmxConfigNDCallback, NULL);
+    XtAddCallback(edbutton, XtNcallback, dmxConfigEDCallback, NULL);
+    XtAddCallback(ddbutton, XtNcallback, dmxConfigDDCallback, NULL);
+    XtAddCallback(edokbutton, XtNcallback, dmxConfigEDOkCallback, NULL);
+    XtAddCallback(edcanbutton, XtNcallback, dmxConfigEDCanCallback, NULL);
+
+    XtAddCallback(aboutbutton, XtNcallback, dmxConfigAboutCallback, NULL);
+    XtAddCallback(aboutok, XtNcallback, dmxConfigAboutOkCallback, NULL);
+    XtAddCallback(quitok, XtNcallback, dmxConfigQuitOkCallback, NULL);
+    XtAddCallback(quitcan, XtNcallback, dmxConfigQuitCanCallback, NULL);
+
+    XtAddCallback(quitbutton, XtNcallback, dmxConfigQuitCallback, NULL);
+
+    XtAddCallback(canvas, XtNcallback, dmxConfigCanvasInput, NULL);
+    XtAddCallback(canvas, XtNcanvasExposeCallback, dmxConfigCanvasExpose, NULL);
+    XtAddCallback(canvas, XtNcanvasResizeCallback, dmxConfigCanvasResize, NULL);
+
+    if (dmxConfigFilename)
+        dmxConfigReadFile();
+
     XtRealizeWidget(toplevel);
     dmxConfigCopystrings();
     dmxConfigSetupCnamemenu();
diff --git a/xorg-server/hw/dmx/dmx.c b/xorg-server/hw/dmx/dmx.c
index 01a744849..add0e5390 100644
--- a/xorg-server/hw/dmx/dmx.c
+++ b/xorg-server/hw/dmx/dmx.c
@@ -62,16 +62,15 @@
 #ifdef PANORAMIX
 #include "panoramiX.h"
 extern unsigned long XRT_WINDOW;
-extern int           PanoramiXNumScreens;
+extern int PanoramiXNumScreens;
 #endif
 
 extern void DMXExtensionInit(void);
 
 static unsigned char DMXCode;
 
-
-
-static int _DMXXineramaActive(void)
+static int
+_DMXXineramaActive(void)
 {
 #ifdef PANORAMIX
     return !noPanoramiXExtension;
@@ -79,31 +78,51 @@ static int _DMXXineramaActive(void)
     return 0;
 }
 
-static void dmxSetScreenAttribute(int bit, DMXScreenAttributesPtr attr,
-                                  CARD32 value)
+static void
+dmxSetScreenAttribute(int bit, DMXScreenAttributesPtr attr, CARD32 value)
 {
     switch (1 << bit) {
-    case DMXScreenWindowWidth:   attr->screenWindowWidth   = value; break;
-    case DMXScreenWindowHeight:  attr->screenWindowHeight  = value; break;
-    case DMXScreenWindowXoffset: attr->screenWindowXoffset = value; break;
-    case DMXScreenWindowYoffset: attr->screenWindowYoffset = value; break;
-    case DMXRootWindowWidth:     attr->rootWindowWidth     = value; break;
-    case DMXRootWindowHeight:    attr->rootWindowHeight    = value; break;
-    case DMXRootWindowXoffset:   attr->rootWindowXoffset   = value; break;
-    case DMXRootWindowYoffset:   attr->rootWindowYoffset   = value; break;
-    case DMXRootWindowXorigin:   attr->rootWindowXorigin   = value; break;
-    case DMXRootWindowYorigin:   attr->rootWindowYorigin   = value; break;
+    case DMXScreenWindowWidth:
+        attr->screenWindowWidth = value;
+        break;
+    case DMXScreenWindowHeight:
+        attr->screenWindowHeight = value;
+        break;
+    case DMXScreenWindowXoffset:
+        attr->screenWindowXoffset = value;
+        break;
+    case DMXScreenWindowYoffset:
+        attr->screenWindowYoffset = value;
+        break;
+    case DMXRootWindowWidth:
+        attr->rootWindowWidth = value;
+        break;
+    case DMXRootWindowHeight:
+        attr->rootWindowHeight = value;
+        break;
+    case DMXRootWindowXoffset:
+        attr->rootWindowXoffset = value;
+        break;
+    case DMXRootWindowYoffset:
+        attr->rootWindowYoffset = value;
+        break;
+    case DMXRootWindowXorigin:
+        attr->rootWindowXorigin = value;
+        break;
+    case DMXRootWindowYorigin:
+        attr->rootWindowYorigin = value;
+        break;
     }
 }
 
-static int dmxFetchScreenAttributes(unsigned int mask,
-                                    DMXScreenAttributesPtr attr,
-                                    CARD32 *value_list)
+static int
+dmxFetchScreenAttributes(unsigned int mask,
+                         DMXScreenAttributesPtr attr, CARD32 *value_list)
 {
-    int    i;
+    int i;
     CARD32 *value = value_list;
-    int    count  = 0;
-        
+    int count = 0;
+
     for (i = 0; i < 32; i++) {
         if (mask & (1 << i)) {
             dmxSetScreenAttribute(i, attr, *value);
@@ -114,52 +133,66 @@ static int dmxFetchScreenAttributes(unsigned int mask,
     return count;
 }
 
-static void dmxSetDesktopAttribute(int bit, DMXDesktopAttributesPtr attr,
-                                   CARD32 value)
+static void
+dmxSetDesktopAttribute(int bit, DMXDesktopAttributesPtr attr, CARD32 value)
 {
     switch (1 << bit) {
-    case DMXDesktopWidth:  attr->width  = value; break;
-    case DMXDesktopHeight: attr->height = value; break;
-    case DMXDesktopShiftX: attr->shiftX = value; break;
-    case DMXDesktopShiftY: attr->shiftY = value; break;
+    case DMXDesktopWidth:
+        attr->width = value;
+        break;
+    case DMXDesktopHeight:
+        attr->height = value;
+        break;
+    case DMXDesktopShiftX:
+        attr->shiftX = value;
+        break;
+    case DMXDesktopShiftY:
+        attr->shiftY = value;
+        break;
     }
 }
 
-static int dmxFetchDesktopAttributes(unsigned int mask,
-                                     DMXDesktopAttributesPtr attr,
-                                     CARD32 *value_list)
+static int
+dmxFetchDesktopAttributes(unsigned int mask,
+                          DMXDesktopAttributesPtr attr, CARD32 *value_list)
 {
-    int    i;
+    int i;
     CARD32 *value = value_list;
-    int    count  = 0;
-        
+    int count = 0;
+
     for (i = 0; i < 32; i++) {
         if (mask & (1 << i)) {
             dmxSetDesktopAttribute(i, attr, *value);
-	    ++value;
+            ++value;
             ++count;
         }
     }
     return count;
 }
 
-static void dmxSetInputAttribute(int bit, DMXInputAttributesPtr attr,
-                                 CARD32 value)
+static void
+dmxSetInputAttribute(int bit, DMXInputAttributesPtr attr, CARD32 value)
 {
     switch (1 << bit) {
-    case DMXInputType:           attr->inputType      = value;   break;
-    case DMXInputPhysicalScreen: attr->physicalScreen = value;   break;
-    case DMXInputSendsCore:      attr->sendsCore      = !!value; break;
+    case DMXInputType:
+        attr->inputType = value;
+        break;
+    case DMXInputPhysicalScreen:
+        attr->physicalScreen = value;
+        break;
+    case DMXInputSendsCore:
+        attr->sendsCore = ! !value;
+        break;
     }
 }
 
-static int dmxFetchInputAttributes(unsigned int mask,
-                                   DMXInputAttributesPtr attr,
-                                   CARD32 *value_list)
+static int
+dmxFetchInputAttributes(unsigned int mask,
+                        DMXInputAttributesPtr attr, CARD32 *value_list)
 {
-    int    i;
+    int i;
     CARD32 *value = value_list;
-    int    count  = 0;
+    int count = 0;
 
     for (i = 0; i < 32; i++) {
         if (mask & (1 << i)) {
@@ -171,30 +204,32 @@ static int dmxFetchInputAttributes(unsigned int mask,
     return count;
 }
 
-static int ProcDMXQueryVersion(ClientPtr client)
+static int
+ProcDMXQueryVersion(ClientPtr client)
 {
     xDMXQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH(xDMXQueryVersionReq);
 
-    rep.type           = X_Reply;
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = 0;
-    rep.majorVersion   = SERVER_DMX_MAJOR_VERSION;
-    rep.minorVersion   = SERVER_DMX_MINOR_VERSION;
-    rep.patchVersion   = SERVER_DMX_PATCH_VERSION;
+    rep.length = 0;
+    rep.majorVersion = SERVER_DMX_MAJOR_VERSION;
+    rep.minorVersion = SERVER_DMX_MINOR_VERSION;
+    rep.patchVersion = SERVER_DMX_PATCH_VERSION;
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.majorVersion);
-	swapl(&rep.minorVersion);
-	swapl(&rep.patchVersion);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.majorVersion);
+        swapl(&rep.minorVersion);
+        swapl(&rep.patchVersion);
     }
-    WriteToClient(client, sizeof(xDMXQueryVersionReply), (char *)&rep);
+    WriteToClient(client, sizeof(xDMXQueryVersionReply), (char *) &rep);
     return Success;
 }
 
-static int ProcDMXSync(ClientPtr client)
+static int
+ProcDMXSync(ClientPtr client)
 {
     xDMXSyncReply rep;
 
@@ -202,41 +237,43 @@ static int ProcDMXSync(ClientPtr client)
 
     dmxFlushPendingSyncs();
 
-    rep.type           = X_Reply;
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = 0;
-    rep.status         = 0;
+    rep.length = 0;
+    rep.status = 0;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
         swapl(&rep.status);
     }
-    WriteToClient(client, sizeof(xDMXSyncReply), (char *)&rep);
+    WriteToClient(client, sizeof(xDMXSyncReply), (char *) &rep);
     return Success;
 }
 
-static int ProcDMXForceWindowCreation(ClientPtr client)
+static int
+ProcDMXForceWindowCreation(ClientPtr client)
 {
     xDMXForceWindowCreationReply rep;
+
     REQUEST(xDMXForceWindowCreationReq);
-    WindowPtr     pWin;
+    WindowPtr pWin;
 
     REQUEST_SIZE_MATCH(xDMXForceWindowCreationReq);
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
         PanoramiXRes *win;
-        int          i;
+        int i;
 
-        if (Success != dixLookupResourceByType((pointer*) &win,
-					       stuff->window, XRT_WINDOW,
-					       client, DixReadAccess))
-            return -1;           /* BadWindow */
+        if (Success != dixLookupResourceByType((pointer *) &win,
+                                               stuff->window, XRT_WINDOW,
+                                               client, DixReadAccess))
+            return -1;          /* BadWindow */
 
         FOR_NSCREENS(i) {
             if (Success != dixLookupWindow(&pWin, win->info[i].id, client,
-					   DixReadAccess))
-                return -1;       /* BadWindow */
+                                           DixReadAccess))
+                return -1;      /* BadWindow */
 
             dmxForceWindowCreation(pWin);
         }
@@ -244,80 +281,84 @@ static int ProcDMXForceWindowCreation(ClientPtr client)
     }
 #endif
 
-    if (Success != dixLookupWindow(&pWin, stuff->window, client,
-				   DixReadAccess))
-        return -1;               /* BadWindow */
+    if (Success != dixLookupWindow(&pWin, stuff->window, client, DixReadAccess))
+        return -1;              /* BadWindow */
 
     dmxForceWindowCreation(pWin);
-  doreply:
+ doreply:
     dmxFlushPendingSyncs();
-    rep.type           = X_Reply;
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = 0;
-    rep.status         = 0;
+    rep.length = 0;
+    rep.status = 0;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
         swapl(&rep.status);
     }
-    WriteToClient(client, sizeof(xDMXForceWindowCreationReply), (char *)&rep);
+    WriteToClient(client, sizeof(xDMXForceWindowCreationReply), (char *) &rep);
     return Success;
 }
 
-static int ProcDMXGetScreenCount(ClientPtr client)
+static int
+ProcDMXGetScreenCount(ClientPtr client)
 {
     xDMXGetScreenCountReply rep;
 
     REQUEST_SIZE_MATCH(xDMXGetScreenCountReq);
 
-    rep.type           = X_Reply;
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = 0;
-    rep.screenCount    = dmxGetNumScreens();
+    rep.length = 0;
+    rep.screenCount = dmxGetNumScreens();
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
         swapl(&rep.screenCount);
     }
-    WriteToClient(client, sizeof(xDMXGetScreenCountReply), (char *)&rep);
+    WriteToClient(client, sizeof(xDMXGetScreenCountReply), (char *) &rep);
     return Success;
 }
 
-static int ProcDMXGetScreenAttributes(ClientPtr client)
+static int
+ProcDMXGetScreenAttributes(ClientPtr client)
 {
     REQUEST(xDMXGetScreenAttributesReq);
     xDMXGetScreenAttributesReply rep;
-    int                          length;
-    int                          paddedLength;
-    DMXScreenAttributesRec       attr;
+    int length;
+    int paddedLength;
+    DMXScreenAttributesRec attr;
 
     REQUEST_SIZE_MATCH(xDMXGetScreenAttributesReq);
 
     if (stuff->physicalScreen < 0
-        || stuff->physicalScreen >= dmxGetNumScreens()) return BadValue;
+        || stuff->physicalScreen >= dmxGetNumScreens())
+        return BadValue;
 
     if (!dmxGetScreenAttributes(stuff->physicalScreen, &attr))
         return BadValue;
 
-    rep.logicalScreen       = attr.logicalScreen;
-    rep.screenWindowWidth   = attr.screenWindowWidth;
-    rep.screenWindowHeight  = attr.screenWindowHeight;
+    rep.logicalScreen = attr.logicalScreen;
+    rep.screenWindowWidth = attr.screenWindowWidth;
+    rep.screenWindowHeight = attr.screenWindowHeight;
     rep.screenWindowXoffset = attr.screenWindowXoffset;
     rep.screenWindowYoffset = attr.screenWindowYoffset;
-    rep.rootWindowWidth     = attr.rootWindowWidth;
-    rep.rootWindowHeight    = attr.rootWindowHeight;
-    rep.rootWindowXoffset   = attr.rootWindowXoffset;
-    rep.rootWindowYoffset   = attr.rootWindowYoffset;
-    rep.rootWindowXorigin   = attr.rootWindowXorigin;
-    rep.rootWindowYorigin   = attr.rootWindowYorigin;
-                                 
-    length                  = attr.displayName ? strlen(attr.displayName) : 0;
-    paddedLength            = pad_to_int32(length);
-    rep.type                = X_Reply;
-    rep.sequenceNumber      = client->sequence;
-    rep.length              = bytes_to_int32((sizeof(xDMXGetScreenAttributesReply) - sizeof(xGenericReply))
-                                             + paddedLength);
-    rep.displayNameLength   = length;
+    rep.rootWindowWidth = attr.rootWindowWidth;
+    rep.rootWindowHeight = attr.rootWindowHeight;
+    rep.rootWindowXoffset = attr.rootWindowXoffset;
+    rep.rootWindowYoffset = attr.rootWindowYoffset;
+    rep.rootWindowXorigin = attr.rootWindowXorigin;
+    rep.rootWindowYorigin = attr.rootWindowYorigin;
+
+    length = attr.displayName ? strlen(attr.displayName) : 0;
+    paddedLength = pad_to_int32(length);
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length =
+        bytes_to_int32((sizeof(xDMXGetScreenAttributesReply) -
+                        sizeof(xGenericReply))
+                       + paddedLength);
+    rep.displayNameLength = length;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -335,49 +376,55 @@ static int ProcDMXGetScreenAttributes(ClientPtr client)
         swaps(&rep.rootWindowXorigin);
         swaps(&rep.rootWindowYorigin);
     }
-    WriteToClient(client, sizeof(xDMXGetScreenAttributesReply), (char *)&rep);
-    if (length) WriteToClient(client, length, (char *)attr.displayName);
+    WriteToClient(client, sizeof(xDMXGetScreenAttributesReply), (char *) &rep);
+    if (length)
+        WriteToClient(client, length, (char *) attr.displayName);
     return Success;
 }
 
-static int ProcDMXChangeScreensAttributes(ClientPtr client)
+static int
+ProcDMXChangeScreensAttributes(ClientPtr client)
 {
     REQUEST(xDMXChangeScreensAttributesReq);
     xDMXChangeScreensAttributesReply rep;
-    int                              status = DMX_BAD_XINERAMA;
-    unsigned int                     mask   = 0;
-    unsigned int                     i;
-    CARD32                           *screen_list;
-    CARD32                           *mask_list;
-    CARD32                           *value_list;
-    DMXScreenAttributesPtr           attribs;
-    int                              errorScreen = 0;
-    unsigned int                     len;
-    int                              ones = 0;
-    
+    int status = DMX_BAD_XINERAMA;
+    unsigned int mask = 0;
+    unsigned int i;
+    CARD32 *screen_list;
+    CARD32 *mask_list;
+    CARD32 *value_list;
+    DMXScreenAttributesPtr attribs;
+    int errorScreen = 0;
+    unsigned int len;
+    int ones = 0;
 
     REQUEST_AT_LEAST_SIZE(xDMXChangeScreensAttributesReq);
-    len = client->req_len - bytes_to_int32(sizeof(xDMXChangeScreensAttributesReq));
+    len =
+        client->req_len -
+        bytes_to_int32(sizeof(xDMXChangeScreensAttributesReq));
     if (len < stuff->screenCount + stuff->maskCount)
         return BadLength;
 
-    screen_list = (CARD32 *)(stuff + 1);
-    mask_list   = &screen_list[stuff->screenCount];
-    value_list  = &mask_list[stuff->maskCount];
+    screen_list = (CARD32 *) (stuff + 1);
+    mask_list = &screen_list[stuff->screenCount];
+    value_list = &mask_list[stuff->maskCount];
 
-    for (i = 0; i < stuff->maskCount; i++) ones += Ones(mask_list[i]);
+    for (i = 0; i < stuff->maskCount; i++)
+        ones += Ones(mask_list[i]);
     if (len != stuff->screenCount + stuff->maskCount + ones)
         return BadLength;
-    
-    if (!_DMXXineramaActive()) goto noxinerama;
+
+    if (!_DMXXineramaActive())
+        goto noxinerama;
 
     if (!(attribs = malloc(stuff->screenCount * sizeof(*attribs))))
         return BadAlloc;
 
     for (i = 0; i < stuff->screenCount; i++) {
         int count;
-        
-        if (i < stuff->maskCount) mask = mask_list[i];
+
+        if (i < stuff->maskCount)
+            mask = mask_list[i];
         dmxGetScreenAttributes(screen_list[i], &attribs[i]);
         count = dmxFetchScreenAttributes(mask, &attribs[i], value_list);
         value_list += count;
@@ -385,21 +432,20 @@ static int ProcDMXChangeScreensAttributes(ClientPtr client)
 
 #if PANORAMIX
     status = dmxConfigureScreenWindows(stuff->screenCount,
-				       screen_list,
-				       attribs,
-				       &errorScreen);
+                                       screen_list, attribs, &errorScreen);
 #endif
 
     free(attribs);
 
-    if (status == BadValue) return status;
+    if (status == BadValue)
+        return status;
 
-  noxinerama:
-    rep.type           = X_Reply;
+ noxinerama:
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = 0;
-    rep.status         = status;
-    rep.errorScreen    = errorScreen;
+    rep.length = 0;
+    rep.status = status;
+    rep.errorScreen = errorScreen;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -407,34 +453,34 @@ static int ProcDMXChangeScreensAttributes(ClientPtr client)
         swapl(&rep.errorScreen);
     }
     WriteToClient(client,
-                  sizeof(xDMXChangeScreensAttributesReply),
-                  (char *)&rep);
+                  sizeof(xDMXChangeScreensAttributesReply), (char *) &rep);
     return Success;
 }
 
-static int ProcDMXAddScreen(ClientPtr client)
+static int
+ProcDMXAddScreen(ClientPtr client)
 {
     REQUEST(xDMXAddScreenReq);
-    xDMXAddScreenReply     rep;
-    int                    status = 0;
-    CARD32                 *value_list;
+    xDMXAddScreenReply rep;
+    int status = 0;
+    CARD32 *value_list;
     DMXScreenAttributesRec attr;
-    int                    count;
-    char                   *name;
-    int                    len;
-    int                    paddedLength;
+    int count;
+    char *name;
+    int len;
+    int paddedLength;
 
     REQUEST_AT_LEAST_SIZE(xDMXAddScreenReq);
     paddedLength = pad_to_int32(stuff->displayNameLength);
-    len          = client->req_len - bytes_to_int32(sizeof(xDMXAddScreenReq));
-    if (len != Ones(stuff->valueMask) + paddedLength/4)
+    len = client->req_len - bytes_to_int32(sizeof(xDMXAddScreenReq));
+    if (len != Ones(stuff->valueMask) + paddedLength / 4)
         return BadLength;
 
     memset(&attr, 0, sizeof(attr));
     dmxGetScreenAttributes(stuff->physicalScreen, &attr);
-    value_list = (CARD32 *)(stuff + 1);
-    count      = dmxFetchScreenAttributes(stuff->valueMask, &attr, value_list);
-    
+    value_list = (CARD32 *) (stuff + 1);
+    count = dmxFetchScreenAttributes(stuff->valueMask, &attr, value_list);
+
     if (!(name = malloc(stuff->displayNameLength + 1 + 4)))
         return BadAlloc;
     memcpy(name, &value_list[count], stuff->displayNameLength);
@@ -445,10 +491,10 @@ static int ProcDMXAddScreen(ClientPtr client)
 
     free(name);
 
-    rep.type           = X_Reply;
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = 0;
-    rep.status         = status;
+    rep.length = 0;
+    rep.status = status;
     rep.physicalScreen = stuff->physicalScreen;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -456,63 +502,60 @@ static int ProcDMXAddScreen(ClientPtr client)
         swapl(&rep.status);
         swapl(&rep.physicalScreen);
     }
-    WriteToClient(client,
-                  sizeof(xDMXAddScreenReply),
-                  (char *)&rep);
+    WriteToClient(client, sizeof(xDMXAddScreenReply), (char *) &rep);
     return Success;
 }
 
-static int ProcDMXRemoveScreen(ClientPtr client)
+static int
+ProcDMXRemoveScreen(ClientPtr client)
 {
     REQUEST(xDMXRemoveScreenReq);
     xDMXRemoveScreenReply rep;
-    int                   status = 0;
+    int status = 0;
 
     REQUEST_SIZE_MATCH(xDMXRemoveScreenReq);
 
     status = dmxDetachScreen(stuff->physicalScreen);
 
-    rep.type           = X_Reply;
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = 0;
-    rep.status         = status;
+    rep.length = 0;
+    rep.status = status;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
         swapl(&rep.status);
     }
-    WriteToClient(client,
-                  sizeof(xDMXRemoveScreenReply),
-                  (char *)&rep);
+    WriteToClient(client, sizeof(xDMXRemoveScreenReply), (char *) &rep);
     return Success;
 }
 
-
 #ifdef PANORAMIX
-static int dmxPopulatePanoramiX(ClientPtr client, Window window,
-                                CARD32 *screens, CARD32 *windows,
-                                xRectangle *pos, xRectangle *vis)
+static int
+dmxPopulatePanoramiX(ClientPtr client, Window window,
+                     CARD32 *screens, CARD32 *windows,
+                     xRectangle *pos, xRectangle *vis)
 {
-    WindowPtr              pWin;
-    PanoramiXRes           *win;
-    int                    i;
-    int                    count = 0;
+    WindowPtr pWin;
+    PanoramiXRes *win;
+    int i;
+    int count = 0;
     DMXWindowAttributesRec attr;
-    
-    if (Success != dixLookupResourceByType((pointer*) &win,
-					   window, XRT_WINDOW,
-					   client, DixReadAccess))
-        return -1;               /* BadWindow */
-    
+
+    if (Success != dixLookupResourceByType((pointer *) &win,
+                                           window, XRT_WINDOW,
+                                           client, DixReadAccess))
+        return -1;              /* BadWindow */
+
     FOR_NSCREENS(i) {
         if (Success != dixLookupWindow(&pWin, win->info[i].id, client,
-				       DixReadAccess))
+                                       DixReadAccess))
             return -1;          /* BadWindow */
         if (dmxGetWindowAttributes(pWin, &attr)) {
             screens[count] = attr.screen;
             windows[count] = attr.window;
-            pos[count]     = attr.pos;
-            vis[count]     = attr.vis;
+            pos[count] = attr.pos;
+            vis[count] = attr.vis;
             ++count;            /* Only count existing windows */
         }
     }
@@ -520,46 +563,49 @@ static int dmxPopulatePanoramiX(ClientPtr client, Window window,
 }
 #endif
 
-static int dmxPopulate(ClientPtr client, Window window, CARD32 *screens,
-                       CARD32 *windows, xRectangle *pos, xRectangle *vis)
+static int
+dmxPopulate(ClientPtr client, Window window, CARD32 *screens,
+            CARD32 *windows, xRectangle *pos, xRectangle *vis)
 {
-    WindowPtr              pWin;
+    WindowPtr pWin;
     DMXWindowAttributesRec attr;
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension)
-        return dmxPopulatePanoramiX(client, window, screens, windows,
-                                    pos, vis);
+        return dmxPopulatePanoramiX(client, window, screens, windows, pos, vis);
 #endif
-    
+
     if (Success != dixLookupWindow(&pWin, window, client, DixReadAccess))
-        return -1;               /* BadWindow */
+        return -1;              /* BadWindow */
 
     dmxGetWindowAttributes(pWin, &attr);
     *screens = attr.screen;
     *windows = attr.window;
-    *pos     = attr.pos;
-    *vis     = attr.vis;
+    *pos = attr.pos;
+    *vis = attr.vis;
     return 1;
 }
 
-static int dmxMaxNumScreens(void)
+static int
+dmxMaxNumScreens(void)
 {
 #ifdef PANORAMIX
-    if (!noPanoramiXExtension) return PanoramiXNumScreens;
+    if (!noPanoramiXExtension)
+        return PanoramiXNumScreens;
 #endif
     return 1;
 }
 
-static int ProcDMXGetWindowAttributes(ClientPtr client)
+static int
+ProcDMXGetWindowAttributes(ClientPtr client)
 {
     REQUEST(xDMXGetWindowAttributesReq);
     xDMXGetWindowAttributesReply rep;
-    int                          i;
-    CARD32                       *screens;
-    CARD32                       *windows;
-    xRectangle                   *pos, *vis;
-    int                          count = dmxMaxNumScreens();
+    int i;
+    CARD32 *screens;
+    CARD32 *windows;
+    xRectangle *pos, *vis;
+    int count = dmxMaxNumScreens();
 
     REQUEST_SIZE_MATCH(xDMXGetWindowAttributesReq);
 
@@ -590,10 +636,10 @@ static int ProcDMXGetWindowAttributes(ClientPtr client)
         return BadWindow;
     }
 
-    rep.type           = X_Reply;
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = count * 6;
-    rep.screenCount    = count;
+    rep.length = count * 6;
+    rep.screenCount = count;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -601,12 +647,12 @@ static int ProcDMXGetWindowAttributes(ClientPtr client)
         for (i = 0; i < count; i++) {
             swapl(&screens[i]);
             swapl(&windows[i]);
-            
+
             swaps(&pos[i].x);
             swaps(&pos[i].y);
             swaps(&pos[i].width);
             swaps(&pos[i].height);
-            
+
             swaps(&vis[i].x);
             swaps(&vis[i].y);
             swaps(&vis[i].width);
@@ -616,12 +662,12 @@ static int ProcDMXGetWindowAttributes(ClientPtr client)
 
     dmxFlushPendingSyncs();
 
-    WriteToClient(client, sizeof(xDMXGetWindowAttributesReply), (char *)&rep);
+    WriteToClient(client, sizeof(xDMXGetWindowAttributesReply), (char *) &rep);
     if (count) {
-        WriteToClient(client, count * sizeof(*screens), (char *)screens);
-        WriteToClient(client, count * sizeof(*windows), (char *)windows);
-        WriteToClient(client, count * sizeof(*pos),     (char *)pos);
-        WriteToClient(client, count * sizeof(*vis),     (char *)vis);
+        WriteToClient(client, count * sizeof(*screens), (char *) screens);
+        WriteToClient(client, count * sizeof(*windows), (char *) windows);
+        WriteToClient(client, count * sizeof(*pos), (char *) pos);
+        WriteToClient(client, count * sizeof(*vis), (char *) vis);
     }
 
     free(vis);
@@ -632,23 +678,24 @@ static int ProcDMXGetWindowAttributes(ClientPtr client)
     return Success;
 }
 
-static int ProcDMXGetDesktopAttributes(ClientPtr client)
+static int
+ProcDMXGetDesktopAttributes(ClientPtr client)
 {
     xDMXGetDesktopAttributesReply rep;
-    DMXDesktopAttributesRec       attr;
+    DMXDesktopAttributesRec attr;
 
     REQUEST_SIZE_MATCH(xDMXGetDesktopAttributesReq);
 
     dmxGetDesktopAttributes(&attr);
 
-    rep.width               = attr.width;
-    rep.height              = attr.height;
-    rep.shiftX              = attr.shiftX;
-    rep.shiftY              = attr.shiftY;
+    rep.width = attr.width;
+    rep.height = attr.height;
+    rep.shiftX = attr.shiftX;
+    rep.shiftY = attr.shiftY;
 
-    rep.type                = X_Reply;
-    rep.sequenceNumber      = client->sequence;
-    rep.length              = 0;
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -658,95 +705,100 @@ static int ProcDMXGetDesktopAttributes(ClientPtr client)
         swaps(&rep.shiftX);
         swaps(&rep.shiftY);
     }
-    WriteToClient(client, sizeof(xDMXGetDesktopAttributesReply), (char *)&rep);
+    WriteToClient(client, sizeof(xDMXGetDesktopAttributesReply), (char *) &rep);
     return Success;
 }
 
-static int ProcDMXChangeDesktopAttributes(ClientPtr client)
+static int
+ProcDMXChangeDesktopAttributes(ClientPtr client)
 {
     REQUEST(xDMXChangeDesktopAttributesReq);
     xDMXChangeDesktopAttributesReply rep;
-    int                              status = DMX_BAD_XINERAMA;
-    CARD32                           *value_list;
-    DMXDesktopAttributesRec          attr;
-    int                              len;
+    int status = DMX_BAD_XINERAMA;
+    CARD32 *value_list;
+    DMXDesktopAttributesRec attr;
+    int len;
 
     REQUEST_AT_LEAST_SIZE(xDMXChangeDesktopAttributesReq);
     len = client->req_len - (sizeof(xDMXChangeDesktopAttributesReq) >> 2);
     if (len != Ones(stuff->valueMask))
         return BadLength;
 
-    if (!_DMXXineramaActive()) goto noxinerama;
+    if (!_DMXXineramaActive())
+        goto noxinerama;
+
+    value_list = (CARD32 *) (stuff + 1);
 
-    value_list = (CARD32 *)(stuff + 1);
-    
     dmxGetDesktopAttributes(&attr);
     dmxFetchDesktopAttributes(stuff->valueMask, &attr, value_list);
 
 #if PANORAMIX
     status = dmxConfigureDesktop(&attr);
 #endif
-    if (status == BadValue) return status;
+    if (status == BadValue)
+        return status;
 
-  noxinerama:
-    rep.type           = X_Reply;
+ noxinerama:
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = 0;
-    rep.status         = status;
+    rep.length = 0;
+    rep.status = status;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
         swapl(&rep.status);
     }
     WriteToClient(client,
-                  sizeof(xDMXChangeDesktopAttributesReply),
-                  (char *)&rep);
+                  sizeof(xDMXChangeDesktopAttributesReply), (char *) &rep);
     return Success;
 }
 
-static int ProcDMXGetInputCount(ClientPtr client)
+static int
+ProcDMXGetInputCount(ClientPtr client)
 {
     xDMXGetInputCountReply rep;
 
     REQUEST_SIZE_MATCH(xDMXGetInputCountReq);
 
-    rep.type           = X_Reply;
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = 0;
-    rep.inputCount     = dmxGetInputCount();
+    rep.length = 0;
+    rep.inputCount = dmxGetInputCount();
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
         swapl(&rep.inputCount);
     }
-    WriteToClient(client, sizeof(xDMXGetInputCountReply), (char *)&rep);
+    WriteToClient(client, sizeof(xDMXGetInputCountReply), (char *) &rep);
     return Success;
 }
 
-static int ProcDMXGetInputAttributes(ClientPtr client)
+static int
+ProcDMXGetInputAttributes(ClientPtr client)
 {
     REQUEST(xDMXGetInputAttributesReq);
     xDMXGetInputAttributesReply rep;
-    int                          length;
-    int                          paddedLength;
-    DMXInputAttributesRec        attr;
+    int length;
+    int paddedLength;
+    DMXInputAttributesRec attr;
 
     REQUEST_SIZE_MATCH(xDMXGetInputAttributesReq);
 
-    if (dmxGetInputAttributes(stuff->deviceId, &attr)) return BadValue;
-    rep.inputType      = attr.inputType;
+    if (dmxGetInputAttributes(stuff->deviceId, &attr))
+        return BadValue;
+    rep.inputType = attr.inputType;
     rep.physicalScreen = attr.physicalScreen;
-    rep.physicalId     = attr.physicalId;
-    rep.isCore         = attr.isCore;
-    rep.sendsCore      = attr.sendsCore;
-    rep.detached       = attr.detached;
-    
-    length             = attr.name ? strlen(attr.name) : 0;
-    paddedLength       = pad_to_int32(length);
-    rep.type           = X_Reply;
+    rep.physicalId = attr.physicalId;
+    rep.isCore = attr.isCore;
+    rep.sendsCore = attr.sendsCore;
+    rep.detached = attr.detached;
+
+    length = attr.name ? strlen(attr.name) : 0;
+    paddedLength = pad_to_int32(length);
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = bytes_to_int32(paddedLength);
-    rep.nameLength     = length;
+    rep.length = bytes_to_int32(paddedLength);
+    rep.nameLength = length;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -755,34 +807,36 @@ static int ProcDMXGetInputAttributes(ClientPtr client)
         swapl(&rep.physicalId);
         swapl(&rep.nameLength);
     }
-    WriteToClient(client, sizeof(xDMXGetInputAttributesReply), (char *)&rep);
-    if (length) WriteToClient(client, length, (char *)attr.name);
+    WriteToClient(client, sizeof(xDMXGetInputAttributesReply), (char *) &rep);
+    if (length)
+        WriteToClient(client, length, (char *) attr.name);
     return Success;
 }
 
-static int ProcDMXAddInput(ClientPtr client)
+static int
+ProcDMXAddInput(ClientPtr client)
 {
     REQUEST(xDMXAddInputReq);
-    xDMXAddInputReply      rep;
-    int                    status = 0;
-    CARD32                 *value_list;
-    DMXInputAttributesRec  attr;
-    int                    count;
-    char                   *name;
-    int                    len;
-    int                    paddedLength;
-    int                    id     = -1;
+    xDMXAddInputReply rep;
+    int status = 0;
+    CARD32 *value_list;
+    DMXInputAttributesRec attr;
+    int count;
+    char *name;
+    int len;
+    int paddedLength;
+    int id = -1;
 
     REQUEST_AT_LEAST_SIZE(xDMXAddInputReq);
     paddedLength = pad_to_int32(stuff->displayNameLength);
-    len          = client->req_len - (sizeof(xDMXAddInputReq) >> 2);
-    if (len != Ones(stuff->valueMask) + paddedLength/4)
+    len = client->req_len - (sizeof(xDMXAddInputReq) >> 2);
+    if (len != Ones(stuff->valueMask) + paddedLength / 4)
         return BadLength;
 
     memset(&attr, 0, sizeof(attr));
-    value_list = (CARD32 *)(stuff + 1);
-    count      = dmxFetchInputAttributes(stuff->valueMask, &attr, value_list);
-    
+    value_list = (CARD32 *) (stuff + 1);
+    count = dmxFetchInputAttributes(stuff->valueMask, &attr, value_list);
+
     if (!(name = malloc(stuff->displayNameLength + 1 + 4)))
         return BadAlloc;
     memcpy(name, &value_list[count], stuff->displayNameLength);
@@ -793,81 +847,100 @@ static int ProcDMXAddInput(ClientPtr client)
 
     free(name);
 
-    if (status) return status;
+    if (status)
+        return status;
 
-    rep.type           = X_Reply;
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = 0;
-    rep.status         = status;
-    rep.physicalId     = id;
+    rep.length = 0;
+    rep.status = status;
+    rep.physicalId = id;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
         swapl(&rep.status);
         swapl(&rep.physicalId);
     }
-    WriteToClient(client, sizeof(xDMXAddInputReply), (char *)&rep);
+    WriteToClient(client, sizeof(xDMXAddInputReply), (char *) &rep);
     return Success;
 }
 
-static int ProcDMXRemoveInput(ClientPtr client)
+static int
+ProcDMXRemoveInput(ClientPtr client)
 {
     REQUEST(xDMXRemoveInputReq);
-    xDMXRemoveInputReply     rep;
-    int                      status = 0;
+    xDMXRemoveInputReply rep;
+    int status = 0;
 
     REQUEST_SIZE_MATCH(xDMXRemoveInputReq);
 
     status = dmxRemoveInput(stuff->physicalId);
 
-    if (status) return status;
+    if (status)
+        return status;
 
-    rep.type           = X_Reply;
+    rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length         = 0;
-    rep.status         = status;
+    rep.length = 0;
+    rep.status = status;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
         swapl(&rep.status);
     }
-    WriteToClient(client, sizeof(xDMXRemoveInputReply), (char *)&rep);
+    WriteToClient(client, sizeof(xDMXRemoveInputReply), (char *) &rep);
     return Success;
 }
 
-static int ProcDMXDispatch(ClientPtr client)
+static int
+ProcDMXDispatch(ClientPtr client)
 {
     REQUEST(xReq);
 
     switch (stuff->data) {
-    case X_DMXQueryVersion:         return ProcDMXQueryVersion(client);
-    case X_DMXSync:                 return ProcDMXSync(client);
-    case X_DMXForceWindowCreation:  return ProcDMXForceWindowCreation(client);
-    case X_DMXGetScreenCount:       return ProcDMXGetScreenCount(client);
-    case X_DMXGetScreenAttributes:  return ProcDMXGetScreenAttributes(client);
+    case X_DMXQueryVersion:
+        return ProcDMXQueryVersion(client);
+    case X_DMXSync:
+        return ProcDMXSync(client);
+    case X_DMXForceWindowCreation:
+        return ProcDMXForceWindowCreation(client);
+    case X_DMXGetScreenCount:
+        return ProcDMXGetScreenCount(client);
+    case X_DMXGetScreenAttributes:
+        return ProcDMXGetScreenAttributes(client);
     case X_DMXChangeScreensAttributes:
         return ProcDMXChangeScreensAttributes(client);
-    case X_DMXAddScreen:            return ProcDMXAddScreen(client);
-    case X_DMXRemoveScreen:         return ProcDMXRemoveScreen(client);
-    case X_DMXGetWindowAttributes:  return ProcDMXGetWindowAttributes(client);
-    case X_DMXGetDesktopAttributes: return ProcDMXGetDesktopAttributes(client);
+    case X_DMXAddScreen:
+        return ProcDMXAddScreen(client);
+    case X_DMXRemoveScreen:
+        return ProcDMXRemoveScreen(client);
+    case X_DMXGetWindowAttributes:
+        return ProcDMXGetWindowAttributes(client);
+    case X_DMXGetDesktopAttributes:
+        return ProcDMXGetDesktopAttributes(client);
     case X_DMXChangeDesktopAttributes:
         return ProcDMXChangeDesktopAttributes(client);
-    case X_DMXGetInputCount:        return ProcDMXGetInputCount(client);
-    case X_DMXGetInputAttributes:   return ProcDMXGetInputAttributes(client);
-    case X_DMXAddInput:             return ProcDMXAddInput(client);
-    case X_DMXRemoveInput:          return ProcDMXRemoveInput(client);
-        
+    case X_DMXGetInputCount:
+        return ProcDMXGetInputCount(client);
+    case X_DMXGetInputAttributes:
+        return ProcDMXGetInputAttributes(client);
+    case X_DMXAddInput:
+        return ProcDMXAddInput(client);
+    case X_DMXRemoveInput:
+        return ProcDMXRemoveInput(client);
+
     case X_DMXGetScreenInformationDEPRECATED:
     case X_DMXForceWindowCreationDEPRECATED:
     case X_DMXReconfigureScreenDEPRECATED:
         return BadImplementation;
 
-    default:                        return BadRequest;
+    default:
+        return BadRequest;
     }
 }
 
-static int SProcDMXQueryVersion(ClientPtr client)
+static int
+SProcDMXQueryVersion(ClientPtr client)
 {
     REQUEST(xDMXQueryVersionReq);
 
@@ -876,7 +949,8 @@ static int SProcDMXQueryVersion(ClientPtr client)
     return ProcDMXQueryVersion(client);
 }
 
-static int SProcDMXSync(ClientPtr client)
+static int
+SProcDMXSync(ClientPtr client)
 {
     REQUEST(xDMXSyncReq);
 
@@ -885,7 +959,8 @@ static int SProcDMXSync(ClientPtr client)
     return ProcDMXSync(client);
 }
 
-static int SProcDMXForceWindowCreation(ClientPtr client)
+static int
+SProcDMXForceWindowCreation(ClientPtr client)
 {
     REQUEST(xDMXForceWindowCreationReq);
 
@@ -895,7 +970,8 @@ static int SProcDMXForceWindowCreation(ClientPtr client)
     return ProcDMXForceWindowCreation(client);
 }
 
-static int SProcDMXGetScreenCount(ClientPtr client)
+static int
+SProcDMXGetScreenCount(ClientPtr client)
 {
     REQUEST(xDMXGetScreenCountReq);
 
@@ -904,7 +980,8 @@ static int SProcDMXGetScreenCount(ClientPtr client)
     return ProcDMXGetScreenCount(client);
 }
 
-static int SProcDMXGetScreenAttributes(ClientPtr client)
+static int
+SProcDMXGetScreenAttributes(ClientPtr client)
 {
     REQUEST(xDMXGetScreenAttributesReq);
 
@@ -914,7 +991,8 @@ static int SProcDMXGetScreenAttributes(ClientPtr client)
     return ProcDMXGetScreenAttributes(client);
 }
 
-static int SProcDMXChangeScreensAttributes(ClientPtr client)
+static int
+SProcDMXChangeScreensAttributes(ClientPtr client)
 {
     REQUEST(xDMXChangeScreensAttributesReq);
 
@@ -926,9 +1004,11 @@ static int SProcDMXChangeScreensAttributes(ClientPtr client)
     return ProcDMXGetScreenAttributes(client);
 }
 
-static int SProcDMXAddScreen(ClientPtr client)
+static int
+SProcDMXAddScreen(ClientPtr client)
 {
     int paddedLength;
+
     REQUEST(xDMXAddScreenReq);
 
     swaps(&stuff->length);
@@ -936,11 +1016,12 @@ static int SProcDMXAddScreen(ClientPtr client)
     swapl(&stuff->displayNameLength);
     swapl(&stuff->valueMask);
     paddedLength = pad_to_int32(stuff->displayNameLength);
-    SwapLongs((CARD32 *)(stuff+1), LengthRestL(stuff) - paddedLength/4);
+    SwapLongs((CARD32 *) (stuff + 1), LengthRestL(stuff) - paddedLength / 4);
     return ProcDMXAddScreen(client);
 }
 
-static int SProcDMXRemoveScreen(ClientPtr client)
+static int
+SProcDMXRemoveScreen(ClientPtr client)
 {
     REQUEST(xDMXRemoveScreenReq);
 
@@ -950,7 +1031,8 @@ static int SProcDMXRemoveScreen(ClientPtr client)
     return ProcDMXRemoveScreen(client);
 }
 
-static int SProcDMXGetWindowAttributes(ClientPtr client)
+static int
+SProcDMXGetWindowAttributes(ClientPtr client)
 {
     REQUEST(xDMXGetWindowAttributesReq);
 
@@ -960,7 +1042,8 @@ static int SProcDMXGetWindowAttributes(ClientPtr client)
     return ProcDMXGetWindowAttributes(client);
 }
 
-static int SProcDMXGetDesktopAttributes(ClientPtr client)
+static int
+SProcDMXGetDesktopAttributes(ClientPtr client)
 {
     REQUEST(xDMXGetDesktopAttributesReq);
 
@@ -969,7 +1052,8 @@ static int SProcDMXGetDesktopAttributes(ClientPtr client)
     return ProcDMXGetDesktopAttributes(client);
 }
 
-static int SProcDMXChangeDesktopAttributes(ClientPtr client)
+static int
+SProcDMXChangeDesktopAttributes(ClientPtr client)
 {
     REQUEST(xDMXChangeDesktopAttributesReq);
 
@@ -980,7 +1064,8 @@ static int SProcDMXChangeDesktopAttributes(ClientPtr client)
     return ProcDMXChangeDesktopAttributes(client);
 }
 
-static int SProcDMXGetInputCount(ClientPtr client)
+static int
+SProcDMXGetInputCount(ClientPtr client)
 {
     REQUEST(xDMXGetInputCountReq);
 
@@ -989,7 +1074,8 @@ static int SProcDMXGetInputCount(ClientPtr client)
     return ProcDMXGetInputCount(client);
 }
 
-static int SProcDMXGetInputAttributes(ClientPtr client)
+static int
+SProcDMXGetInputAttributes(ClientPtr client)
 {
     REQUEST(xDMXGetInputAttributesReq);
 
@@ -999,9 +1085,11 @@ static int SProcDMXGetInputAttributes(ClientPtr client)
     return ProcDMXGetInputAttributes(client);
 }
 
-static int SProcDMXAddInput(ClientPtr client)
+static int
+SProcDMXAddInput(ClientPtr client)
 {
     int paddedLength;
+
     REQUEST(xDMXAddInputReq);
 
     swaps(&stuff->length);
@@ -1009,11 +1097,12 @@ static int SProcDMXAddInput(ClientPtr client)
     swapl(&stuff->displayNameLength);
     swapl(&stuff->valueMask);
     paddedLength = pad_to_int32(stuff->displayNameLength);
-    SwapLongs((CARD32 *)(stuff+1), LengthRestL(stuff) - paddedLength/4);
+    SwapLongs((CARD32 *) (stuff + 1), LengthRestL(stuff) - paddedLength / 4);
     return ProcDMXAddInput(client);
 }
 
-static int SProcDMXRemoveInput(ClientPtr client)
+static int
+SProcDMXRemoveInput(ClientPtr client)
 {
     REQUEST(xDMXRemoveInputReq);
 
@@ -1023,46 +1112,61 @@ static int SProcDMXRemoveInput(ClientPtr client)
     return ProcDMXRemoveInput(client);
 }
 
-static int SProcDMXDispatch (ClientPtr client)
+static int
+SProcDMXDispatch(ClientPtr client)
 {
     REQUEST(xReq);
 
     switch (stuff->data) {
-    case X_DMXQueryVersion:         return SProcDMXQueryVersion(client);
-    case X_DMXSync:                 return SProcDMXSync(client);
-    case X_DMXForceWindowCreation:  return SProcDMXForceWindowCreation(client);
-    case X_DMXGetScreenCount:       return SProcDMXGetScreenCount(client);
-    case X_DMXGetScreenAttributes:  return SProcDMXGetScreenAttributes(client);
+    case X_DMXQueryVersion:
+        return SProcDMXQueryVersion(client);
+    case X_DMXSync:
+        return SProcDMXSync(client);
+    case X_DMXForceWindowCreation:
+        return SProcDMXForceWindowCreation(client);
+    case X_DMXGetScreenCount:
+        return SProcDMXGetScreenCount(client);
+    case X_DMXGetScreenAttributes:
+        return SProcDMXGetScreenAttributes(client);
     case X_DMXChangeScreensAttributes:
         return SProcDMXChangeScreensAttributes(client);
-    case X_DMXAddScreen:            return SProcDMXAddScreen(client);
-    case X_DMXRemoveScreen:         return SProcDMXRemoveScreen(client);
-    case X_DMXGetWindowAttributes:  return SProcDMXGetWindowAttributes(client);
+    case X_DMXAddScreen:
+        return SProcDMXAddScreen(client);
+    case X_DMXRemoveScreen:
+        return SProcDMXRemoveScreen(client);
+    case X_DMXGetWindowAttributes:
+        return SProcDMXGetWindowAttributes(client);
     case X_DMXGetDesktopAttributes:
         return SProcDMXGetDesktopAttributes(client);
     case X_DMXChangeDesktopAttributes:
         return SProcDMXChangeDesktopAttributes(client);
-    case X_DMXGetInputCount:        return SProcDMXGetInputCount(client);
-    case X_DMXGetInputAttributes:   return SProcDMXGetInputAttributes(client);
-    case X_DMXAddInput:             return SProcDMXAddInput(client);
-    case X_DMXRemoveInput:          return SProcDMXRemoveInput(client);
-        
+    case X_DMXGetInputCount:
+        return SProcDMXGetInputCount(client);
+    case X_DMXGetInputAttributes:
+        return SProcDMXGetInputAttributes(client);
+    case X_DMXAddInput:
+        return SProcDMXAddInput(client);
+    case X_DMXRemoveInput:
+        return SProcDMXRemoveInput(client);
+
     case X_DMXGetScreenInformationDEPRECATED:
     case X_DMXForceWindowCreationDEPRECATED:
     case X_DMXReconfigureScreenDEPRECATED:
         return BadImplementation;
 
-    default:                        return BadRequest;
+    default:
+        return BadRequest;
     }
 }
 
 /** Initialize the extension. */
-void DMXExtensionInit(void)
+void
+DMXExtensionInit(void)
 {
     ExtensionEntry *extEntry;
-    
+
     if ((extEntry = AddExtension(DMX_EXTENSION_NAME, 0, 0,
                                  ProcDMXDispatch, SProcDMXDispatch,
                                  NULL, StandardMinorOpcode)))
-	DMXCode = extEntry->base;
+        DMXCode = extEntry->base;
 }
diff --git a/xorg-server/hw/dmx/dmx_glxvisuals.c b/xorg-server/hw/dmx/dmx_glxvisuals.c
index dd77bd23a..9fcc0e58d 100644
--- a/xorg-server/hw/dmx/dmx_glxvisuals.c
+++ b/xorg-server/hw/dmx/dmx_glxvisuals.c
@@ -1,601 +1,601 @@
-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

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

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include <GL/glx.h>

-#include <GL/glxproto.h>

-#include <X11/extensions/Xext.h>

-#include <X11/extensions/extutil.h>

-

-#include "dmx_glxvisuals.h"

-

-__GLXvisualConfig *GetGLXVisualConfigs(Display *dpy, int screen, int *nconfigs)

-{

-    xGLXGetVisualConfigsReq *req;

-    xGLXGetVisualConfigsReply reply;

-    __GLXvisualConfig *config, *configs;

-    GLint i, j, nvisuals, nprops;

-    INT32 *props, *p;

-    int   majorOpcode, dummy;

-    int   num_good_visuals;

-

-    if (!XQueryExtension(dpy, "GLX", &majorOpcode, &dummy, &dummy)) {

-       return NULL;

-    }

-

-    /* Send the glXGetVisualConfigs request */

-    LockDisplay(dpy);

-    GetReq(GLXGetVisualConfigs,req);

-    req->reqType = majorOpcode;

-    req->glxCode = X_GLXGetVisualConfigs;

-    req->screen = screen;

-    if (!_XReply(dpy, (xReply*) &reply, 0, False)) {

-	/* Something is busted. Punt. */

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return NULL;

-    }

-

-    nvisuals = (int)reply.numVisuals;

-    if (!nvisuals) {

-	/* This screen does not support GL rendering */

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return NULL;

-    }

-

-    /* Check number of properties per visual */

-    nprops = (int)reply.numProps;

-    if (nprops < __GLX_MIN_CONFIG_PROPS)  {

-	/* Huh?  Not in protocol defined limits.  Punt */

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return NULL;

-    }

-    props = (INT32*) Xmalloc(nprops * __GLX_SIZE_CARD32);

-    if (!props) {

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return NULL;

-    }

-

-    /* Allocate memory for our config structure */

-    config = (__GLXvisualConfig*)

-	Xmalloc(nvisuals * sizeof(__GLXvisualConfig));

-    if (!config) {

-	free(props);

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return NULL;

-    }

-    memset(config, 0, nvisuals * sizeof(__GLXvisualConfig));

-    configs = config;

-    num_good_visuals = 0;

-

-    /* Convert config structure into our format */

-    for (i=0; i<nvisuals; i++) {

-

-	/* Read config structure */

-	_XRead(dpy, (char *)props, (nprops * __GLX_SIZE_CARD32));

-

-	/* fill in default values */

-	config->visualRating = GLX_NONE_EXT;

-	config->transparentPixel = GLX_NONE_EXT;

-

-	/* Copy in the first set of properties */

-	config->vid = props[0];

-	config->class = props[1];

-

-	config->rgba = (Bool) props[2];

-

-	config->redSize = props[3];

-	config->greenSize = props[4];

-	config->blueSize = props[5];

-	config->alphaSize = props[6];

-

-	config->accumRedSize = props[7];

-	config->accumGreenSize = props[8];

-	config->accumBlueSize = props[9];

-	config->accumAlphaSize = props[10];

-

-	config->doubleBuffer = (Bool) props[11];

-	config->stereo = (Bool) props[12];

-

-	config->bufferSize = props[13];

-	config->depthSize = props[14];

-	config->stencilSize = props[15];

-

-	config->auxBuffers = props[16];

-	config->level = props[17];

-

-	/* Process remaining properties */

-	p = &props[18];

-	for (j=__GLX_MIN_CONFIG_PROPS; j<nprops; j+=2) {

-	    int property = *p++;

-	    int value = *p++;

-

-	    switch (property) {

-	      case GLX_SAMPLES_SGIS:

-		config->multiSampleSize = value;

-		break;

-	      case GLX_SAMPLE_BUFFERS_SGIS:

-		config->nMultiSampleBuffers = value;

-		break;

-

-	      case GLX_TRANSPARENT_TYPE_EXT:

-		config->transparentPixel = value;

-		break;

-	      case GLX_TRANSPARENT_INDEX_VALUE_EXT:

-		config->transparentIndex = value;

-		break;

-	      case GLX_TRANSPARENT_RED_VALUE_EXT:

-		config->transparentRed = value;

-		break;

-	      case GLX_TRANSPARENT_GREEN_VALUE_EXT:

-		config->transparentGreen = value;

-		break;

-	      case GLX_TRANSPARENT_BLUE_VALUE_EXT:

-		config->transparentBlue = value;

-		break;

-	      case GLX_TRANSPARENT_ALPHA_VALUE_EXT:

-		config->transparentAlpha = value;

-		break;

-

-	      case GLX_VISUAL_CAVEAT_EXT:

-		config->visualRating = value;

-		break;

-

-	      /* visualSelectGroup is an internal used property */

-	      case GLX_VISUAL_SELECT_GROUP_SGIX:

-		config->visualSelectGroup = value;

-		break;

-

-	      default :

-		/* Ignore properties we don't recognize */

-		break;

-	    }

-	} /* for j */

-

-	/*

-	// filter out overlay visuals (dmx does not support overlays)

-	*/

-	if (config->level == 0) {

-	   config++;

-	   num_good_visuals++;

-	}

-

-    } /* for i */

-

-    UnlockDisplay(dpy);

-

-    nvisuals = num_good_visuals;

-

-    config = configs;

-    for (i=0; i<nvisuals; i++) {

-	/* XXX hack to fill-in mask info (need a better way to do this) */

-	{

-	    XVisualInfo *vis, template;

-	    int n;

-

-	    template.screen = screen;

-	    template.visualid = config->vid;

-	    vis = XGetVisualInfo(dpy, VisualScreenMask|VisualIDMask,

-				 &template, &n);

-

-	    if (vis != NULL) {

-		config->redMask = vis->red_mask;

-		config->greenMask = vis->green_mask;

-		config->blueMask = vis->blue_mask;

-		config->alphaMask = 0; 	/* XXX */

-		free(vis);

-	    }

-	}

-	config++;

-    } /* for i */

-

-    XFree(props);

-    SyncHandle();

-

-    *nconfigs = nvisuals;

-    return configs;

-}

-

-

-__GLXFBConfig *GetGLXFBConfigs(Display *dpy, int glxMajorOpcode, int *nconfigs)

-{

-    xGLXGetFBConfigsReq *req;

-    xGLXGetFBConfigsReply reply;

-    __GLXFBConfig *config, *fbconfigs;

-    GLint i, j, numFBConfigs, numAttribs;

-    INT32 *attrs, *p;

-    int screen = DefaultScreen( dpy );

-    int numValidConfigs = 0;

-

-    /* Send the glXGetFBConfigs request */

-    LockDisplay(dpy);

-    GetReq(GLXGetFBConfigs, req);

-    req->reqType = glxMajorOpcode;

-    req->glxCode = X_GLXGetFBConfigs;

-    req->screen = screen;

-

-    *nconfigs = 0;

-

-    if (!_XReply(dpy, (xReply*) &reply, 0, False)) {

-	/* Something is busted. Punt. */

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return NULL;

-    }

-

-    numFBConfigs = (int)reply.numFBConfigs;

-    if (!numFBConfigs) {

-	/* This screen does not support GL rendering */

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return NULL;		

-    }

-

-    numAttribs = (int)reply.numAttribs;

-    if (!numAttribs)  {

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return NULL;

-    }

-

-    attrs = (INT32*) Xmalloc(2*numAttribs * __GLX_SIZE_CARD32);

-    if (!attrs) {

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return NULL;

-    }

-

-    /* Allocate memory for our config structure */

-    config = (__GLXFBConfig*)

-	Xmalloc(numFBConfigs * sizeof(__GLXFBConfig));

-    if (!config) {

-	free(attrs);

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return NULL;

-    }

-    memset(config, 0, numFBConfigs * sizeof(__GLXFBConfig));

-    fbconfigs = config;

-

-    /* Convert attribute list into our format */

-    for (i=0; i<numFBConfigs; i++) {

-

-	/* Fill in default properties */

-	config->transparentType = GLX_NONE_EXT;

-	config->visualCaveat = GLX_NONE_EXT;

-	config->minRed = 0.;

-	config->maxRed = 1.;

-	config->minGreen = 0.;

-	config->maxGreen = 1.;

-	config->minBlue = 0.;

-	config->maxBlue = 1.;

-	config->minAlpha = 0.;

-	config->maxAlpha = 1.;

-

-	/* Read attribute list */

-	_XRead(dpy, (char *)attrs, (2*numAttribs * __GLX_SIZE_CARD32));

-

-	p = attrs;

-	for (j=0; j<numAttribs; j++) {

-	    int attribute = *p++;

-	    int value = *p++;

-

-	    switch (attribute) {

-	      /* core attributes */

-	      case GLX_FBCONFIG_ID:

-		config->id = value;

-		break;

-	      case GLX_BUFFER_SIZE:

-		config->indexBits = value;

-		break;

-	      case GLX_LEVEL:

-		config->level = value;

-		break;

-	      case GLX_DOUBLEBUFFER:

-		config->doubleBufferMode = value;

-		break;

-	      case GLX_STEREO:

-		config->stereoMode = value;

-		break;

-	      case GLX_AUX_BUFFERS:

-		config->maxAuxBuffers = value;

-		break;

-	      case GLX_RED_SIZE:

-		config->redBits = value;

-		break;

-	      case GLX_GREEN_SIZE:

-		config->greenBits = value;

-		break;

-	      case GLX_BLUE_SIZE:

-		config->blueBits = value;

-		break;

-	      case GLX_ALPHA_SIZE:

-		config->alphaBits = value;

-		break;

-	      case GLX_DEPTH_SIZE:

-		config->depthBits = value;

-		break;

-	      case GLX_STENCIL_SIZE:

-		config->stencilBits = value;

-		break;

-	      case GLX_ACCUM_RED_SIZE:

-		config->accumRedBits = value;

-		break;

-	      case GLX_ACCUM_GREEN_SIZE:

-		config->accumGreenBits = value;

-		break;

-	      case GLX_ACCUM_BLUE_SIZE:

-		config->accumBlueBits = value;

-		break;

-	      case GLX_ACCUM_ALPHA_SIZE:

-		config->accumAlphaBits = value;

-		break;

-	      case GLX_RENDER_TYPE:

-		config->renderType = value;

-		break;

-	      case GLX_DRAWABLE_TYPE:

-		config->drawableType = value;

-		break;

-	      case GLX_X_VISUAL_TYPE:

-		config->visualType = value;

-		break;

-	      case GLX_CONFIG_CAVEAT:

-		config->visualCaveat = value;

-		break;

-	      case GLX_TRANSPARENT_TYPE:

-		config->transparentType = value;

-		break;

-	      case GLX_TRANSPARENT_INDEX_VALUE:

-		config->transparentIndex = value;

-		break;

-	      case GLX_TRANSPARENT_RED_VALUE:

-		config->transparentRed = value;

-		break;

-	      case GLX_TRANSPARENT_GREEN_VALUE:

-		config->transparentGreen = value;

-		break;

-	      case GLX_TRANSPARENT_BLUE_VALUE:

-		config->transparentBlue = value;

-		break;

-	      case GLX_TRANSPARENT_ALPHA_VALUE:

-		config->transparentAlpha = value;

-		break;

-	      case GLX_MAX_PBUFFER_WIDTH:

-		config->maxPbufferWidth = value;

-		break;

-	      case GLX_MAX_PBUFFER_HEIGHT:

-		config->maxPbufferHeight = value;

-		break;

-	      case GLX_MAX_PBUFFER_PIXELS:

-		config->maxPbufferPixels = value;

-		break;

-	      case GLX_VISUAL_ID:	

-		config->associatedVisualId = value;

-		break;

-

-	      /* visualSelectGroup is an internal used property */

-	      case GLX_VISUAL_SELECT_GROUP_SGIX:

-		config->visualSelectGroup = value;

-		break;

-

-	      /* SGIS_multisample attributes */

-	      case GLX_SAMPLES_SGIS:

-		config->multiSampleSize = value;

-		break;

-	      case GLX_SAMPLE_BUFFERS_SGIS:

-		config->nMultiSampleBuffers = value;

-		break;

-

-	      /* SGIX_pbuffer specific attributes */

-	      case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX:

-		config->optimalPbufferWidth = value;

-		break;

-	      case GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX:

-		config->optimalPbufferHeight = value;

-		break;

-

-	      default:

-		/* Ignore attributes we don't recognize */

-		break;

-	    }

-	} /* for j */

-

-	/* Fill in derived values */

-	config->screen = screen;

-

-	config->rgbMode = config->renderType & GLX_RGBA_BIT;

-	config->colorIndexMode = !config->rgbMode;

-

-	config->haveAccumBuffer =

-	    config->accumRedBits > 0 ||

-	    config->accumGreenBits > 0 ||

-	    config->accumBlueBits > 0;

-	    /* Can't have alpha without color */

-

-	config->haveDepthBuffer = config->depthBits > 0;

-	config->haveStencilBuffer =  config->stencilBits > 0;

-

-	/* overlay visuals are not valid for now */

-	if (!config->level) {

-	   config++;

-	   numValidConfigs++;

-	}

-

-    } /* for i */

-    UnlockDisplay(dpy);

-

-    config = fbconfigs;

-    for (i=0; i<numValidConfigs; i++) {

-

-	/* XXX hack to fill-in mask info (need a better way to do this) */

-	if (config->associatedVisualId != 0) {

-	    XVisualInfo *vis, template;

-	    int n;

-

-	    template.screen = screen;

-	    template.visualid = config->associatedVisualId;

-	    vis = XGetVisualInfo(dpy, VisualScreenMask|VisualIDMask,

-				 &template, &n);

-

-	    if (vis != NULL) {

-		config->redMask = (GLuint)vis->red_mask;

-		config->greenMask = (GLuint)vis->green_mask;

-		config->blueMask = (GLuint)vis->blue_mask;

-		config->alphaMask = 0; 	/* XXX */

-		free(vis);

-	    }

-	}

-

-	config++;

-    } /* for i */

-

-    XFree(attrs);

-    SyncHandle();

-

-    *nconfigs = numValidConfigs;

-    return fbconfigs;

-}

-

-__GLXvisualConfig *

-GetGLXVisualConfigsFromFBConfigs(__GLXFBConfig *fbconfigs, int nfbconfigs, 

-                                 XVisualInfo *visuals, int nvisuals,

-				 __GLXvisualConfig *glxConfigs, int nGlxConfigs,

-                                 int *nconfigs)

-{

-    __GLXvisualConfig *configs = NULL;

-    int i;

-    

-    if (!fbconfigs || !nfbconfigs || !nconfigs) return NULL;

-    *nconfigs = 0;

-

-    /* Allocate memory for our config structure */

-    configs = (__GLXvisualConfig*)

-	Xmalloc(nfbconfigs * sizeof(__GLXvisualConfig));

-    if (!configs) {

-	return NULL;

-    }

-    memset(configs, 0, nfbconfigs * sizeof(__GLXvisualConfig));

-

-    for (i=0; i<nfbconfigs; i++) {

-       __GLXFBConfig *fbcfg = &fbconfigs[i];

-

-       if (fbcfg->associatedVisualId > 0) {

-	  __GLXvisualConfig *cfg = configs + (*nconfigs);

-	  int j;

-	  XVisualInfo *vinfo = NULL;

-

-	  for (j=0; j<nvisuals; j++) {

-	     if (visuals[j].visualid == fbcfg->associatedVisualId) {

-		vinfo = &visuals[j];

-		break;

-	     }

-	  }

-	  if (!vinfo) continue;

-

-	  /* skip 16 bit colormap visuals */

-	  if (vinfo->depth == 16 &&

-              vinfo->class != TrueColor &&

-              vinfo->class != DirectColor ) {

-	     continue;

-	  }

-

-	  (*nconfigs)++;

-

-	  /*

-           * if the same visualid exists in the glx configs,

-	   * copy the glx attributes from the glx config

-	   */

-	  for (j=0; j<nGlxConfigs; j++) {

-	     if (glxConfigs[j].vid == vinfo->visualid) 

-		break;

-	  }

-	  if (j < nGlxConfigs) {

-	     memcpy(cfg, &glxConfigs[j], sizeof(__GLXvisualConfig) );

-	     continue;

-	  }

-

-	  /*

-           * make glx attributes from the FB config attributes

-	   */

-	  cfg->vid = fbcfg->associatedVisualId;

-	  cfg->class = vinfo->class;

-	  cfg->rgba = !(fbcfg->renderType & GLX_COLOR_INDEX_BIT_SGIX);

-	  cfg->redSize = fbcfg->redBits;

-	  cfg->greenSize = fbcfg->greenBits;

-	  cfg->blueSize = fbcfg->blueBits;

-	  cfg->alphaSize = fbcfg->alphaBits;

-	  cfg->redMask = fbcfg->redMask;

-	  cfg->greenMask = fbcfg->greenMask;

-	  cfg->blueMask = fbcfg->blueMask;

-	  cfg->alphaMask = fbcfg->alphaMask;

-	  cfg->accumRedSize = fbcfg->accumRedBits;

-	  cfg->accumGreenSize = fbcfg->accumGreenBits;

-	  cfg->accumBlueSize = fbcfg->accumBlueBits;

-	  cfg->accumAlphaSize = fbcfg->accumAlphaBits;

-	  cfg->doubleBuffer = fbcfg->doubleBufferMode;

-	  cfg->stereo = fbcfg->stereoMode;

-    	  if (vinfo->class == TrueColor || vinfo->class == DirectColor) {

-	     cfg->bufferSize = (fbcfg->rgbMode ? (fbcfg->redBits +

-		                               fbcfg->greenBits +

-    		                               fbcfg->blueBits +

-		                               fbcfg->alphaBits)

-	                                    : fbcfg->indexBits );

-	  }

-	  else {

-	     cfg->bufferSize = vinfo->depth;

-	  }

-      	  cfg->depthSize = fbcfg->depthBits;

-	  cfg->stencilSize = fbcfg->stencilBits;

-	  cfg->auxBuffers = fbcfg->maxAuxBuffers;

-	  cfg->level = fbcfg->level;

-	  cfg->visualRating = fbcfg->visualCaveat;

-	  cfg->transparentPixel = fbcfg->transparentType;

-	  cfg->transparentRed = fbcfg->transparentRed;

-	  cfg->transparentGreen = fbcfg->transparentGreen;

-	  cfg->transparentBlue = fbcfg->transparentBlue;

-	  cfg->transparentAlpha = fbcfg->transparentAlpha;

-	  cfg->transparentIndex = fbcfg->transparentIndex;

-	  cfg->multiSampleSize = fbcfg->multiSampleSize;

-	  cfg->nMultiSampleBuffers = fbcfg->nMultiSampleBuffers;

-	  cfg->visualSelectGroup = fbcfg->visualSelectGroup;

-       }

-    }

-

-    return configs;

-}

-

+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include <GL/glx.h>
+#include <GL/glxproto.h>
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
+
+#include "dmx_glxvisuals.h"
+
+__GLXvisualConfig *
+GetGLXVisualConfigs(Display * dpy, int screen, int *nconfigs)
+{
+    xGLXGetVisualConfigsReq *req;
+    xGLXGetVisualConfigsReply reply;
+    __GLXvisualConfig *config, *configs;
+    GLint i, j, nvisuals, nprops;
+    INT32 *props, *p;
+    int majorOpcode, dummy;
+    int num_good_visuals;
+
+    if (!XQueryExtension(dpy, "GLX", &majorOpcode, &dummy, &dummy)) {
+        return NULL;
+    }
+
+    /* Send the glXGetVisualConfigs request */
+    LockDisplay(dpy);
+    GetReq(GLXGetVisualConfigs, req);
+    req->reqType = majorOpcode;
+    req->glxCode = X_GLXGetVisualConfigs;
+    req->screen = screen;
+    if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+        /* Something is busted. Punt. */
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return NULL;
+    }
+
+    nvisuals = (int) reply.numVisuals;
+    if (!nvisuals) {
+        /* This screen does not support GL rendering */
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return NULL;
+    }
+
+    /* Check number of properties per visual */
+    nprops = (int) reply.numProps;
+    if (nprops < __GLX_MIN_CONFIG_PROPS) {
+        /* Huh?  Not in protocol defined limits.  Punt */
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return NULL;
+    }
+    props = (INT32 *) Xmalloc(nprops * __GLX_SIZE_CARD32);
+    if (!props) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return NULL;
+    }
+
+    /* Allocate memory for our config structure */
+    config = (__GLXvisualConfig *)
+        Xmalloc(nvisuals * sizeof(__GLXvisualConfig));
+    if (!config) {
+        free(props);
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return NULL;
+    }
+    memset(config, 0, nvisuals * sizeof(__GLXvisualConfig));
+    configs = config;
+    num_good_visuals = 0;
+
+    /* Convert config structure into our format */
+    for (i = 0; i < nvisuals; i++) {
+
+        /* Read config structure */
+        _XRead(dpy, (char *) props, (nprops * __GLX_SIZE_CARD32));
+
+        /* fill in default values */
+        config->visualRating = GLX_NONE_EXT;
+        config->transparentPixel = GLX_NONE_EXT;
+
+        /* Copy in the first set of properties */
+        config->vid = props[0];
+        config->class = props[1];
+
+        config->rgba = (Bool) props[2];
+
+        config->redSize = props[3];
+        config->greenSize = props[4];
+        config->blueSize = props[5];
+        config->alphaSize = props[6];
+
+        config->accumRedSize = props[7];
+        config->accumGreenSize = props[8];
+        config->accumBlueSize = props[9];
+        config->accumAlphaSize = props[10];
+
+        config->doubleBuffer = (Bool) props[11];
+        config->stereo = (Bool) props[12];
+
+        config->bufferSize = props[13];
+        config->depthSize = props[14];
+        config->stencilSize = props[15];
+
+        config->auxBuffers = props[16];
+        config->level = props[17];
+
+        /* Process remaining properties */
+        p = &props[18];
+        for (j = __GLX_MIN_CONFIG_PROPS; j < nprops; j += 2) {
+            int property = *p++;
+            int value = *p++;
+
+            switch (property) {
+            case GLX_SAMPLES_SGIS:
+                config->multiSampleSize = value;
+                break;
+            case GLX_SAMPLE_BUFFERS_SGIS:
+                config->nMultiSampleBuffers = value;
+                break;
+
+            case GLX_TRANSPARENT_TYPE_EXT:
+                config->transparentPixel = value;
+                break;
+            case GLX_TRANSPARENT_INDEX_VALUE_EXT:
+                config->transparentIndex = value;
+                break;
+            case GLX_TRANSPARENT_RED_VALUE_EXT:
+                config->transparentRed = value;
+                break;
+            case GLX_TRANSPARENT_GREEN_VALUE_EXT:
+                config->transparentGreen = value;
+                break;
+            case GLX_TRANSPARENT_BLUE_VALUE_EXT:
+                config->transparentBlue = value;
+                break;
+            case GLX_TRANSPARENT_ALPHA_VALUE_EXT:
+                config->transparentAlpha = value;
+                break;
+
+            case GLX_VISUAL_CAVEAT_EXT:
+                config->visualRating = value;
+                break;
+
+                /* visualSelectGroup is an internal used property */
+            case GLX_VISUAL_SELECT_GROUP_SGIX:
+                config->visualSelectGroup = value;
+                break;
+
+            default:
+                /* Ignore properties we don't recognize */
+                break;
+            }
+        }                       /* for j */
+
+        /*
+           // filter out overlay visuals (dmx does not support overlays)
+         */
+        if (config->level == 0) {
+            config++;
+            num_good_visuals++;
+        }
+
+    }                           /* for i */
+
+    UnlockDisplay(dpy);
+
+    nvisuals = num_good_visuals;
+
+    config = configs;
+    for (i = 0; i < nvisuals; i++) {
+        /* XXX hack to fill-in mask info (need a better way to do this) */
+        {
+            XVisualInfo *vis, template;
+            int n;
+
+            template.screen = screen;
+            template.visualid = config->vid;
+            vis = XGetVisualInfo(dpy, VisualScreenMask | VisualIDMask,
+                                 &template, &n);
+
+            if (vis != NULL) {
+                config->redMask = vis->red_mask;
+                config->greenMask = vis->green_mask;
+                config->blueMask = vis->blue_mask;
+                config->alphaMask = 0;  /* XXX */
+                free(vis);
+            }
+        }
+        config++;
+    }                           /* for i */
+
+    XFree(props);
+    SyncHandle();
+
+    *nconfigs = nvisuals;
+    return configs;
+}
+
+__GLXFBConfig *
+GetGLXFBConfigs(Display * dpy, int glxMajorOpcode, int *nconfigs)
+{
+    xGLXGetFBConfigsReq *req;
+    xGLXGetFBConfigsReply reply;
+    __GLXFBConfig *config, *fbconfigs;
+    GLint i, j, numFBConfigs, numAttribs;
+    INT32 *attrs, *p;
+    int screen = DefaultScreen(dpy);
+    int numValidConfigs = 0;
+
+    /* Send the glXGetFBConfigs request */
+    LockDisplay(dpy);
+    GetReq(GLXGetFBConfigs, req);
+    req->reqType = glxMajorOpcode;
+    req->glxCode = X_GLXGetFBConfigs;
+    req->screen = screen;
+
+    *nconfigs = 0;
+
+    if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+        /* Something is busted. Punt. */
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return NULL;
+    }
+
+    numFBConfigs = (int) reply.numFBConfigs;
+    if (!numFBConfigs) {
+        /* This screen does not support GL rendering */
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return NULL;
+    }
+
+    numAttribs = (int) reply.numAttribs;
+    if (!numAttribs) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return NULL;
+    }
+
+    attrs = (INT32 *) Xmalloc(2 * numAttribs * __GLX_SIZE_CARD32);
+    if (!attrs) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return NULL;
+    }
+
+    /* Allocate memory for our config structure */
+    config = (__GLXFBConfig *)
+        Xmalloc(numFBConfigs * sizeof(__GLXFBConfig));
+    if (!config) {
+        free(attrs);
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return NULL;
+    }
+    memset(config, 0, numFBConfigs * sizeof(__GLXFBConfig));
+    fbconfigs = config;
+
+    /* Convert attribute list into our format */
+    for (i = 0; i < numFBConfigs; i++) {
+
+        /* Fill in default properties */
+        config->transparentType = GLX_NONE_EXT;
+        config->visualCaveat = GLX_NONE_EXT;
+        config->minRed = 0.;
+        config->maxRed = 1.;
+        config->minGreen = 0.;
+        config->maxGreen = 1.;
+        config->minBlue = 0.;
+        config->maxBlue = 1.;
+        config->minAlpha = 0.;
+        config->maxAlpha = 1.;
+
+        /* Read attribute list */
+        _XRead(dpy, (char *) attrs, (2 * numAttribs * __GLX_SIZE_CARD32));
+
+        p = attrs;
+        for (j = 0; j < numAttribs; j++) {
+            int attribute = *p++;
+            int value = *p++;
+
+            switch (attribute) {
+                /* core attributes */
+            case GLX_FBCONFIG_ID:
+                config->id = value;
+                break;
+            case GLX_BUFFER_SIZE:
+                config->indexBits = value;
+                break;
+            case GLX_LEVEL:
+                config->level = value;
+                break;
+            case GLX_DOUBLEBUFFER:
+                config->doubleBufferMode = value;
+                break;
+            case GLX_STEREO:
+                config->stereoMode = value;
+                break;
+            case GLX_AUX_BUFFERS:
+                config->maxAuxBuffers = value;
+                break;
+            case GLX_RED_SIZE:
+                config->redBits = value;
+                break;
+            case GLX_GREEN_SIZE:
+                config->greenBits = value;
+                break;
+            case GLX_BLUE_SIZE:
+                config->blueBits = value;
+                break;
+            case GLX_ALPHA_SIZE:
+                config->alphaBits = value;
+                break;
+            case GLX_DEPTH_SIZE:
+                config->depthBits = value;
+                break;
+            case GLX_STENCIL_SIZE:
+                config->stencilBits = value;
+                break;
+            case GLX_ACCUM_RED_SIZE:
+                config->accumRedBits = value;
+                break;
+            case GLX_ACCUM_GREEN_SIZE:
+                config->accumGreenBits = value;
+                break;
+            case GLX_ACCUM_BLUE_SIZE:
+                config->accumBlueBits = value;
+                break;
+            case GLX_ACCUM_ALPHA_SIZE:
+                config->accumAlphaBits = value;
+                break;
+            case GLX_RENDER_TYPE:
+                config->renderType = value;
+                break;
+            case GLX_DRAWABLE_TYPE:
+                config->drawableType = value;
+                break;
+            case GLX_X_VISUAL_TYPE:
+                config->visualType = value;
+                break;
+            case GLX_CONFIG_CAVEAT:
+                config->visualCaveat = value;
+                break;
+            case GLX_TRANSPARENT_TYPE:
+                config->transparentType = value;
+                break;
+            case GLX_TRANSPARENT_INDEX_VALUE:
+                config->transparentIndex = value;
+                break;
+            case GLX_TRANSPARENT_RED_VALUE:
+                config->transparentRed = value;
+                break;
+            case GLX_TRANSPARENT_GREEN_VALUE:
+                config->transparentGreen = value;
+                break;
+            case GLX_TRANSPARENT_BLUE_VALUE:
+                config->transparentBlue = value;
+                break;
+            case GLX_TRANSPARENT_ALPHA_VALUE:
+                config->transparentAlpha = value;
+                break;
+            case GLX_MAX_PBUFFER_WIDTH:
+                config->maxPbufferWidth = value;
+                break;
+            case GLX_MAX_PBUFFER_HEIGHT:
+                config->maxPbufferHeight = value;
+                break;
+            case GLX_MAX_PBUFFER_PIXELS:
+                config->maxPbufferPixels = value;
+                break;
+            case GLX_VISUAL_ID:
+                config->associatedVisualId = value;
+                break;
+
+                /* visualSelectGroup is an internal used property */
+            case GLX_VISUAL_SELECT_GROUP_SGIX:
+                config->visualSelectGroup = value;
+                break;
+
+                /* SGIS_multisample attributes */
+            case GLX_SAMPLES_SGIS:
+                config->multiSampleSize = value;
+                break;
+            case GLX_SAMPLE_BUFFERS_SGIS:
+                config->nMultiSampleBuffers = value;
+                break;
+
+                /* SGIX_pbuffer specific attributes */
+            case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX:
+                config->optimalPbufferWidth = value;
+                break;
+            case GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX:
+                config->optimalPbufferHeight = value;
+                break;
+
+            default:
+                /* Ignore attributes we don't recognize */
+                break;
+            }
+        }                       /* for j */
+
+        /* Fill in derived values */
+        config->screen = screen;
+
+        config->rgbMode = config->renderType & GLX_RGBA_BIT;
+        config->colorIndexMode = !config->rgbMode;
+
+        config->haveAccumBuffer =
+            config->accumRedBits > 0 ||
+            config->accumGreenBits > 0 || config->accumBlueBits > 0;
+        /* Can't have alpha without color */
+
+        config->haveDepthBuffer = config->depthBits > 0;
+        config->haveStencilBuffer = config->stencilBits > 0;
+
+        /* overlay visuals are not valid for now */
+        if (!config->level) {
+            config++;
+            numValidConfigs++;
+        }
+
+    }                           /* for i */
+    UnlockDisplay(dpy);
+
+    config = fbconfigs;
+    for (i = 0; i < numValidConfigs; i++) {
+
+        /* XXX hack to fill-in mask info (need a better way to do this) */
+        if (config->associatedVisualId != 0) {
+            XVisualInfo *vis, template;
+            int n;
+
+            template.screen = screen;
+            template.visualid = config->associatedVisualId;
+            vis = XGetVisualInfo(dpy, VisualScreenMask | VisualIDMask,
+                                 &template, &n);
+
+            if (vis != NULL) {
+                config->redMask = (GLuint) vis->red_mask;
+                config->greenMask = (GLuint) vis->green_mask;
+                config->blueMask = (GLuint) vis->blue_mask;
+                config->alphaMask = 0;  /* XXX */
+                free(vis);
+            }
+        }
+
+        config++;
+    }                           /* for i */
+
+    XFree(attrs);
+    SyncHandle();
+
+    *nconfigs = numValidConfigs;
+    return fbconfigs;
+}
+
+__GLXvisualConfig *
+GetGLXVisualConfigsFromFBConfigs(__GLXFBConfig * fbconfigs, int nfbconfigs,
+                                 XVisualInfo * visuals, int nvisuals,
+                                 __GLXvisualConfig * glxConfigs,
+                                 int nGlxConfigs, int *nconfigs)
+{
+    __GLXvisualConfig *configs = NULL;
+    int i;
+
+    if (!fbconfigs || !nfbconfigs || !nconfigs)
+        return NULL;
+    *nconfigs = 0;
+
+    /* Allocate memory for our config structure */
+    configs = (__GLXvisualConfig *)
+        Xmalloc(nfbconfigs * sizeof(__GLXvisualConfig));
+    if (!configs) {
+        return NULL;
+    }
+    memset(configs, 0, nfbconfigs * sizeof(__GLXvisualConfig));
+
+    for (i = 0; i < nfbconfigs; i++) {
+        __GLXFBConfig *fbcfg = &fbconfigs[i];
+
+        if (fbcfg->associatedVisualId > 0) {
+            __GLXvisualConfig *cfg = configs + (*nconfigs);
+            int j;
+            XVisualInfo *vinfo = NULL;
+
+            for (j = 0; j < nvisuals; j++) {
+                if (visuals[j].visualid == fbcfg->associatedVisualId) {
+                    vinfo = &visuals[j];
+                    break;
+                }
+            }
+            if (!vinfo)
+                continue;
+
+            /* skip 16 bit colormap visuals */
+            if (vinfo->depth == 16 &&
+                vinfo->class != TrueColor && vinfo->class != DirectColor) {
+                continue;
+            }
+
+            (*nconfigs)++;
+
+            /*
+             * if the same visualid exists in the glx configs,
+             * copy the glx attributes from the glx config
+             */
+            for (j = 0; j < nGlxConfigs; j++) {
+                if (glxConfigs[j].vid == vinfo->visualid)
+                    break;
+            }
+            if (j < nGlxConfigs) {
+                memcpy(cfg, &glxConfigs[j], sizeof(__GLXvisualConfig));
+                continue;
+            }
+
+            /*
+             * make glx attributes from the FB config attributes
+             */
+            cfg->vid = fbcfg->associatedVisualId;
+            cfg->class = vinfo->class;
+            cfg->rgba = !(fbcfg->renderType & GLX_COLOR_INDEX_BIT_SGIX);
+            cfg->redSize = fbcfg->redBits;
+            cfg->greenSize = fbcfg->greenBits;
+            cfg->blueSize = fbcfg->blueBits;
+            cfg->alphaSize = fbcfg->alphaBits;
+            cfg->redMask = fbcfg->redMask;
+            cfg->greenMask = fbcfg->greenMask;
+            cfg->blueMask = fbcfg->blueMask;
+            cfg->alphaMask = fbcfg->alphaMask;
+            cfg->accumRedSize = fbcfg->accumRedBits;
+            cfg->accumGreenSize = fbcfg->accumGreenBits;
+            cfg->accumBlueSize = fbcfg->accumBlueBits;
+            cfg->accumAlphaSize = fbcfg->accumAlphaBits;
+            cfg->doubleBuffer = fbcfg->doubleBufferMode;
+            cfg->stereo = fbcfg->stereoMode;
+            if (vinfo->class == TrueColor || vinfo->class == DirectColor) {
+                cfg->bufferSize = (fbcfg->rgbMode ? (fbcfg->redBits +
+                                                     fbcfg->greenBits +
+                                                     fbcfg->blueBits +
+                                                     fbcfg->alphaBits)
+                                   : fbcfg->indexBits);
+            }
+            else {
+                cfg->bufferSize = vinfo->depth;
+            }
+            cfg->depthSize = fbcfg->depthBits;
+            cfg->stencilSize = fbcfg->stencilBits;
+            cfg->auxBuffers = fbcfg->maxAuxBuffers;
+            cfg->level = fbcfg->level;
+            cfg->visualRating = fbcfg->visualCaveat;
+            cfg->transparentPixel = fbcfg->transparentType;
+            cfg->transparentRed = fbcfg->transparentRed;
+            cfg->transparentGreen = fbcfg->transparentGreen;
+            cfg->transparentBlue = fbcfg->transparentBlue;
+            cfg->transparentAlpha = fbcfg->transparentAlpha;
+            cfg->transparentIndex = fbcfg->transparentIndex;
+            cfg->multiSampleSize = fbcfg->multiSampleSize;
+            cfg->nMultiSampleBuffers = fbcfg->nMultiSampleBuffers;
+            cfg->visualSelectGroup = fbcfg->visualSelectGroup;
+        }
+    }
+
+    return configs;
+}
diff --git a/xorg-server/hw/dmx/dmx_glxvisuals.h b/xorg-server/hw/dmx/dmx_glxvisuals.h
index 477e92391..54c3b44ca 100644
--- a/xorg-server/hw/dmx/dmx_glxvisuals.h
+++ b/xorg-server/hw/dmx/dmx_glxvisuals.h
@@ -39,21 +39,19 @@ typedef struct {
     int x_visual_class;
 } dmxGlxVisualPrivate;
 
-__GLXvisualConfig *GetGLXVisualConfigs(Display *dpy,
-				       int screen,
-				       int *nconfigs);
+__GLXvisualConfig *GetGLXVisualConfigs(Display * dpy,
+                                       int screen, int *nconfigs);
 
-__GLXFBConfig *GetGLXFBConfigs(Display *dpy,
-			       int glxMajorOpcode,
-			       int *nconfigs);
+__GLXFBConfig *GetGLXFBConfigs(Display * dpy,
+                               int glxMajorOpcode, int *nconfigs);
 
-__GLXvisualConfig *GetGLXVisualConfigsFromFBConfigs(__GLXFBConfig *fbconfigs, 
-						    int nfbconfigs, 
-						    XVisualInfo *visuals,
-						    int nvisuals,
-						    __GLXvisualConfig
-						    *glxConfigs,
-						    int nGlxConfigs,
-						    int *nconfigs);
+__GLXvisualConfig *GetGLXVisualConfigsFromFBConfigs(__GLXFBConfig * fbconfigs,
+                                                    int nfbconfigs,
+                                                    XVisualInfo * visuals,
+                                                    int nvisuals,
+                                                    __GLXvisualConfig
+                                                    * glxConfigs,
+                                                    int nGlxConfigs,
+                                                    int *nconfigs);
 
 #endif
diff --git a/xorg-server/hw/dmx/dmxcb.c b/xorg-server/hw/dmx/dmxcb.c
index d0eb35117..86015f395 100644
--- a/xorg-server/hw/dmx/dmxcb.c
+++ b/xorg-server/hw/dmx/dmxcb.c
@@ -43,40 +43,42 @@
 #include "dmxinput.h"
 #include "dmxlog.h"
 
-extern int     connBlockScreenStart;
+extern int connBlockScreenStart;
 
 #ifdef PANORAMIX
 #include "panoramiXsrv.h"
-extern int     PanoramiXPixWidth;
-extern int     PanoramiXPixHeight;
-extern int     PanoramiXNumScreens;
+extern int PanoramiXPixWidth;
+extern int PanoramiXPixHeight;
+extern int PanoramiXNumScreens;
 #endif
 
-       int     dmxGlobalWidth, dmxGlobalHeight;
+int dmxGlobalWidth, dmxGlobalHeight;
 
 /** We may want the wall dimensions to be different from the bounding
  * box dimensions that Xinerama computes, so save those and update them
  * here.
  */
-void dmxSetWidthHeight(int width, int height)
+void
+dmxSetWidthHeight(int width, int height)
 {
-    dmxGlobalWidth  = width;
+    dmxGlobalWidth = width;
     dmxGlobalHeight = height;
 }
 
 /** Computes the global bounding box for DMX.  This may be larger than
  * the one computed by Xinerama because of the DMX configuration
  * file. */
-void dmxComputeWidthHeight(DMXRecomputeFlag flag)
+void
+dmxComputeWidthHeight(DMXRecomputeFlag flag)
 {
-    int           i;
+    int i;
     DMXScreenInfo *dmxScreen;
-    int           w = 0;
-    int           h = 0;
-    
+    int w = 0;
+    int h = 0;
+
     for (i = 0; i < dmxNumScreens; i++) {
-                                /* Don't use root* here because this is
-                                 * the global bounding box. */
+        /* Don't use root* here because this is
+         * the global bounding box. */
         dmxScreen = &dmxScreens[i];
         if (w < dmxScreen->scrnWidth + dmxScreen->rootXOrigin)
             w = dmxScreen->scrnWidth + dmxScreen->rootXOrigin;
@@ -85,7 +87,8 @@ void dmxComputeWidthHeight(DMXRecomputeFlag flag)
     }
     if (!dmxGlobalWidth && !dmxGlobalHeight) {
         dmxLog(dmxInfo, "Using %dx%d as global bounding box\n", w, h);
-    } else {
+    }
+    else {
         switch (flag) {
         case DMX_NO_RECOMPUTE_BOUNDING_BOX:
             dmxLog(dmxInfo,
@@ -101,20 +104,21 @@ void dmxComputeWidthHeight(DMXRecomputeFlag flag)
             break;
         }
     }
-        
-    dmxGlobalWidth  = w;
+
+    dmxGlobalWidth = w;
     dmxGlobalHeight = h;
 }
 
 /** A callback routine that hooks into Xinerama and provides a
  * convenient place to print summary log information during server
  * startup.  This routine does not modify any values. */
-void dmxConnectionBlockCallback(void)
+void
+dmxConnectionBlockCallback(void)
 {
-    xWindowRoot *root   = (xWindowRoot *)(ConnectionInfo+connBlockScreenStart);
-    int         offset  = connBlockScreenStart + sizeof(xWindowRoot);
-    int         i;
-    Bool        *found  = NULL;
+    xWindowRoot *root = (xWindowRoot *) (ConnectionInfo + connBlockScreenStart);
+    int offset = connBlockScreenStart + sizeof(xWindowRoot);
+    int i;
+    Bool *found = NULL;
 
     MAXSCREENSALLOC(found);
     if (!found)
@@ -130,22 +134,24 @@ void dmxConnectionBlockCallback(void)
                    "Changing Xinerama dimensions from %d %d to %d %d\n",
                    PanoramiXPixWidth, PanoramiXPixHeight,
                    dmxGlobalWidth, dmxGlobalHeight);
-            PanoramiXPixWidth  = root->pixWidth  = dmxGlobalWidth;
+            PanoramiXPixWidth = root->pixWidth = dmxGlobalWidth;
             PanoramiXPixHeight = root->pixHeight = dmxGlobalHeight;
-        } else {
-            dmxGlobalWidth  = PanoramiXPixWidth;
+        }
+        else {
+            dmxGlobalWidth = PanoramiXPixWidth;
             dmxGlobalHeight = PanoramiXPixHeight;
         }
         dmxLog(dmxInfo, "%d screens configured with Xinerama (%d %d)\n",
                PanoramiXNumScreens, PanoramiXPixWidth, PanoramiXPixHeight);
-	FOR_NSCREENS(i) found[i] = FALSE;
-    } else {
+        FOR_NSCREENS(i) found[i] = FALSE;
+    }
+    else {
 #endif
-                                /* This never happens because we're
-                                 * either called from a Xinerama
-                                 * callback or during reconfiguration
-                                 * (which only works with Xinerama on).
-                                 * In any case, be reasonable. */
+        /* This never happens because we're
+         * either called from a Xinerama
+         * callback or during reconfiguration
+         * (which only works with Xinerama on).
+         * In any case, be reasonable. */
         dmxLog(dmxInfo, "%d screens configured (%d %d)\n",
                screenInfo.numScreens, root->pixWidth, root->pixHeight);
 #ifdef PANORAMIX
@@ -153,46 +159,48 @@ void dmxConnectionBlockCallback(void)
 #endif
 
     for (i = 0; i < root->nDepths; i++) {
-        xDepth      *depth  = (xDepth *)(ConnectionInfo + offset);
-        int         voffset = offset + sizeof(xDepth);
-        xVisualType *visual = (xVisualType *)(ConnectionInfo + voffset);
-        int         j;
-        
+        xDepth *depth = (xDepth *) (ConnectionInfo + offset);
+        int voffset = offset + sizeof(xDepth);
+        xVisualType *visual = (xVisualType *) (ConnectionInfo + voffset);
+        int j;
+
         dmxLog(dmxInfo, "%d visuals at depth %d:\n",
                depth->nVisuals, depth->depth);
         for (j = 0; j < depth->nVisuals; j++, visual++) {
             XVisualInfo vi;
-            
-            vi.visual        = NULL;
-            vi.visualid      = visual->visualID;
-            vi.screen        = 0;
-            vi.depth         = depth->depth;
-            vi.class         = visual->class;
-            vi.red_mask      = visual->redMask;
-            vi.green_mask    = visual->greenMask;
-            vi.blue_mask     = visual->blueMask;
+
+            vi.visual = NULL;
+            vi.visualid = visual->visualID;
+            vi.screen = 0;
+            vi.depth = depth->depth;
+            vi.class = visual->class;
+            vi.red_mask = visual->redMask;
+            vi.green_mask = visual->greenMask;
+            vi.blue_mask = visual->blueMask;
             vi.colormap_size = visual->colormapEntries;
-            vi.bits_per_rgb  = visual->bitsPerRGB;
+            vi.bits_per_rgb = visual->bitsPerRGB;
             dmxLogVisual(NULL, &vi, 0);
 
 #ifdef PANORAMIX
-	    if (!noPanoramiXExtension) {
-		int  k;
-		FOR_NSCREENS(k) {
-		    DMXScreenInfo *dmxScreen = &dmxScreens[k];
-
-		    if (dmxScreen->beDisplay) {
-			XVisualInfo *pvi =
-			    &dmxScreen->beVisuals[dmxScreen->beDefVisualIndex];
-			if (pvi->depth == depth->depth &&
-			    pvi->class == visual->class)
-			    found[k] = TRUE;
-		    } else {
-			/* Screen #k is detatched, so it always succeeds */
-			found[k] = TRUE;
-		    }
-		}
-	    }
+            if (!noPanoramiXExtension) {
+                int k;
+
+                FOR_NSCREENS(k) {
+                    DMXScreenInfo *dmxScreen = &dmxScreens[k];
+
+                    if (dmxScreen->beDisplay) {
+                        XVisualInfo *pvi =
+                            &dmxScreen->beVisuals[dmxScreen->beDefVisualIndex];
+                        if (pvi->depth == depth->depth &&
+                            pvi->class == visual->class)
+                            found[k] = TRUE;
+                    }
+                    else {
+                        /* Screen #k is detatched, so it always succeeds */
+                        found[k] = TRUE;
+                    }
+                }
+            }
 #endif
         }
         offset = voffset + depth->nVisuals * sizeof(xVisualType);
@@ -203,18 +211,19 @@ void dmxConnectionBlockCallback(void)
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-	Bool fatal = FALSE;
-	FOR_NSCREENS(i) {
-	    fatal |= !found[i];
-	    if (!found[i]) {
-		dmxLog(dmxError,
-		       "The default visual for screen #%d does not match "
-		       "any of the\n", i);
-		dmxLog(dmxError,
-		       "consolidated visuals from Xinerama (listed above)\n");
-	    }
-	}
-	if (fatal)
+        Bool fatal = FALSE;
+
+        FOR_NSCREENS(i) {
+            fatal |= !found[i];
+            if (!found[i]) {
+                dmxLog(dmxError,
+                       "The default visual for screen #%d does not match "
+                       "any of the\n", i);
+                dmxLog(dmxError,
+                       "consolidated visuals from Xinerama (listed above)\n");
+            }
+        }
+        if (fatal)
             dmxLog(dmxFatal,
                    "dmxConnectionBlockCallback: invalid screen(s) found");
     }
diff --git a/xorg-server/hw/dmx/dmxcmap.c b/xorg-server/hw/dmx/dmxcmap.c
index 1cdc481f0..450627b40 100644
--- a/xorg-server/hw/dmx/dmxcmap.c
+++ b/xorg-server/hw/dmx/dmxcmap.c
@@ -1,212 +1,222 @@
-/*

- * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Kevin E. Martin <kem@redhat.com>

- *

- */

-

-/** \file

- * Colormap support. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxlog.h"

-#include "dmxsync.h"

-#include "dmxcmap.h"

-#include "dmxvisual.h"

-

-#include "micmap.h"

-

-static Bool dmxAllocateColormapPrivates(ColormapPtr pColormap)

-{

-    dmxColormapPrivPtr   pCmapPriv;

-

-    pCmapPriv = (dmxColormapPrivPtr)malloc(sizeof(*pCmapPriv));

-    if (!pCmapPriv)

-	return FALSE;

-    pCmapPriv->cmap = (Colormap)0;

-

-    DMX_SET_COLORMAP_PRIV(pColormap, pCmapPriv);

-

-    return TRUE;

-}

-

-/** Create \a pColormap on the back-end server. */

-Bool dmxBECreateColormap(ColormapPtr pColormap)

-{

-    ScreenPtr           pScreen   = pColormap->pScreen;

-    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxColormapPrivPtr  pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);

-    VisualPtr           pVisual   = pColormap->pVisual;

-    Visual             *visual    = dmxLookupVisual(pScreen, pVisual);

-

-    if (visual) {

-       pCmapPriv->cmap = XCreateColormap(dmxScreen->beDisplay,

-                                         dmxScreen->scrnWin,

-                                         visual,

-                                         (pVisual->class & DynamicClass ?

-                                          AllocAll : AllocNone));

-       return pCmapPriv->cmap != 0;

-    }

-    else {

-       dmxLog(dmxWarning, "dmxBECreateColormap: No visual found\n");

-       return 0;

-    }

-}

-

-/** Create colormap on back-end server associated with \a pColormap's

- *  screen. */

-Bool dmxCreateColormap(ColormapPtr pColormap)

-{

-    ScreenPtr           pScreen   = pColormap->pScreen;

-    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];

-    Bool                ret       = TRUE;

-

-    if (!dmxAllocateColormapPrivates(pColormap))

-	return FALSE;

-

-    if (dmxScreen->beDisplay) {

-	if (!dmxBECreateColormap(pColormap))

-	    return FALSE;

-    }

-

-    DMX_UNWRAP(CreateColormap, dmxScreen, pScreen);

-    if (pScreen->CreateColormap)

-	ret = pScreen->CreateColormap(pColormap);

-    DMX_WRAP(CreateColormap, dmxCreateColormap, dmxScreen, pScreen);

-

-    return ret;

-}

-

-/** Destroy \a pColormap on the back-end server. */

-Bool dmxBEFreeColormap(ColormapPtr pColormap)

-{

-    ScreenPtr           pScreen   = pColormap->pScreen;

-    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxColormapPrivPtr  pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);

-

-    if (pCmapPriv->cmap) {

-	XFreeColormap(dmxScreen->beDisplay, pCmapPriv->cmap);

-	pCmapPriv->cmap = (Colormap)0;

-	return TRUE;

-    }

-

-    return FALSE;

-}

-

-/** Destroy colormap on back-end server associated with \a pColormap's

- *  screen. */

-void dmxDestroyColormap(ColormapPtr pColormap)

-{

-    ScreenPtr           pScreen   = pColormap->pScreen;

-    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxColormapPrivPtr  pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);

-

-    if (dmxScreen->beDisplay)

-	dmxBEFreeColormap(pColormap);

-    free(pCmapPriv);

-    DMX_SET_COLORMAP_PRIV(pColormap, NULL);

-

-    DMX_UNWRAP(DestroyColormap, dmxScreen, pScreen);

-    if (pScreen->DestroyColormap)

-	pScreen->DestroyColormap(pColormap);

-    DMX_WRAP(DestroyColormap, dmxDestroyColormap, dmxScreen, pScreen);

-}

-

-/** Install colormap on back-end server associated with \a pColormap's

- *  screen. */

-void dmxInstallColormap(ColormapPtr pColormap)

-{

-    ScreenPtr           pScreen   = pColormap->pScreen;

-    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxColormapPrivPtr  pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);

-

-    DMX_UNWRAP(InstallColormap, dmxScreen, pScreen);

-    if (pScreen->InstallColormap)

-	pScreen->InstallColormap(pColormap);

-    DMX_WRAP(InstallColormap, dmxInstallColormap, dmxScreen, pScreen);

-

-    if (dmxScreen->beDisplay) {

-	XInstallColormap(dmxScreen->beDisplay, pCmapPriv->cmap);

-	dmxSync(dmxScreen, FALSE);

-    }

-}

-

-/** Store colors in \a pColormap on back-end server associated with \a

- *  pColormap's screen. */

-void dmxStoreColors(ColormapPtr pColormap, int ndef, xColorItem *pdef)

-{

-    ScreenPtr           pScreen   = pColormap->pScreen;

-    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxColormapPrivPtr  pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);

-

-    if (dmxScreen->beDisplay && (pColormap->pVisual->class & DynamicClass)) {

-        XColor *color = malloc(sizeof(*color) * ndef);

-        int    i;

-        

-        if (color) {

-            for (i = 0; i < ndef; i++) {

-                color[i].pixel = pdef[i].pixel;

-                color[i].red   = pdef[i].red;

-                color[i].blue  = pdef[i].blue;

-                color[i].green = pdef[i].green;

-                color[i].flags = pdef[i].flags;

-                color[i].pad   = pdef[i].pad;

-            }

-            XStoreColors(dmxScreen->beDisplay, pCmapPriv->cmap, color, ndef);

-            free(color);

-        } else {                /* xalloc failed, so fallback */

-            XColor c;

-            for (i = 0; i < ndef; i++) {

-                c.pixel = pdef[i].pixel;

-                c.red   = pdef[i].red;

-                c.blue  = pdef[i].blue;

-                c.green = pdef[i].green;

-                c.flags = pdef[i].flags;

-                c.pad   = pdef[i].pad;

-                XStoreColor(dmxScreen->beDisplay, pCmapPriv->cmap, &c);

-            }

-        }

-	dmxSync(dmxScreen, FALSE);

-    }

-

-    DMX_UNWRAP(StoreColors, dmxScreen, pScreen);

-    if (pScreen->StoreColors)

-	pScreen->StoreColors(pColormap, ndef, pdef);

-    DMX_WRAP(StoreColors, dmxStoreColors, dmxScreen, pScreen);

-}

-

-/** Create the DMX server's default colormap. */

-Bool dmxCreateDefColormap(ScreenPtr pScreen)

-{

-    return miCreateDefColormap(pScreen);

-}

+/*
+ * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+/** \file
+ * Colormap support. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxlog.h"
+#include "dmxsync.h"
+#include "dmxcmap.h"
+#include "dmxvisual.h"
+
+#include "micmap.h"
+
+static Bool
+dmxAllocateColormapPrivates(ColormapPtr pColormap)
+{
+    dmxColormapPrivPtr pCmapPriv;
+
+    pCmapPriv = (dmxColormapPrivPtr) malloc(sizeof(*pCmapPriv));
+    if (!pCmapPriv)
+        return FALSE;
+    pCmapPriv->cmap = (Colormap) 0;
+
+    DMX_SET_COLORMAP_PRIV(pColormap, pCmapPriv);
+
+    return TRUE;
+}
+
+/** Create \a pColormap on the back-end server. */
+Bool
+dmxBECreateColormap(ColormapPtr pColormap)
+{
+    ScreenPtr pScreen = pColormap->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxColormapPrivPtr pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);
+    VisualPtr pVisual = pColormap->pVisual;
+    Visual *visual = dmxLookupVisual(pScreen, pVisual);
+
+    if (visual) {
+        pCmapPriv->cmap = XCreateColormap(dmxScreen->beDisplay,
+                                          dmxScreen->scrnWin,
+                                          visual,
+                                          (pVisual->class & DynamicClass ?
+                                           AllocAll : AllocNone));
+        return pCmapPriv->cmap != 0;
+    }
+    else {
+        dmxLog(dmxWarning, "dmxBECreateColormap: No visual found\n");
+        return 0;
+    }
+}
+
+/** Create colormap on back-end server associated with \a pColormap's
+ *  screen. */
+Bool
+dmxCreateColormap(ColormapPtr pColormap)
+{
+    ScreenPtr pScreen = pColormap->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    Bool ret = TRUE;
+
+    if (!dmxAllocateColormapPrivates(pColormap))
+        return FALSE;
+
+    if (dmxScreen->beDisplay) {
+        if (!dmxBECreateColormap(pColormap))
+            return FALSE;
+    }
+
+    DMX_UNWRAP(CreateColormap, dmxScreen, pScreen);
+    if (pScreen->CreateColormap)
+        ret = pScreen->CreateColormap(pColormap);
+    DMX_WRAP(CreateColormap, dmxCreateColormap, dmxScreen, pScreen);
+
+    return ret;
+}
+
+/** Destroy \a pColormap on the back-end server. */
+Bool
+dmxBEFreeColormap(ColormapPtr pColormap)
+{
+    ScreenPtr pScreen = pColormap->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxColormapPrivPtr pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);
+
+    if (pCmapPriv->cmap) {
+        XFreeColormap(dmxScreen->beDisplay, pCmapPriv->cmap);
+        pCmapPriv->cmap = (Colormap) 0;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+/** Destroy colormap on back-end server associated with \a pColormap's
+ *  screen. */
+void
+dmxDestroyColormap(ColormapPtr pColormap)
+{
+    ScreenPtr pScreen = pColormap->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxColormapPrivPtr pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);
+
+    if (dmxScreen->beDisplay)
+        dmxBEFreeColormap(pColormap);
+    free(pCmapPriv);
+    DMX_SET_COLORMAP_PRIV(pColormap, NULL);
+
+    DMX_UNWRAP(DestroyColormap, dmxScreen, pScreen);
+    if (pScreen->DestroyColormap)
+        pScreen->DestroyColormap(pColormap);
+    DMX_WRAP(DestroyColormap, dmxDestroyColormap, dmxScreen, pScreen);
+}
+
+/** Install colormap on back-end server associated with \a pColormap's
+ *  screen. */
+void
+dmxInstallColormap(ColormapPtr pColormap)
+{
+    ScreenPtr pScreen = pColormap->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxColormapPrivPtr pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);
+
+    DMX_UNWRAP(InstallColormap, dmxScreen, pScreen);
+    if (pScreen->InstallColormap)
+        pScreen->InstallColormap(pColormap);
+    DMX_WRAP(InstallColormap, dmxInstallColormap, dmxScreen, pScreen);
+
+    if (dmxScreen->beDisplay) {
+        XInstallColormap(dmxScreen->beDisplay, pCmapPriv->cmap);
+        dmxSync(dmxScreen, FALSE);
+    }
+}
+
+/** Store colors in \a pColormap on back-end server associated with \a
+ *  pColormap's screen. */
+void
+dmxStoreColors(ColormapPtr pColormap, int ndef, xColorItem * pdef)
+{
+    ScreenPtr pScreen = pColormap->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxColormapPrivPtr pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);
+
+    if (dmxScreen->beDisplay && (pColormap->pVisual->class & DynamicClass)) {
+        XColor *color = malloc(sizeof(*color) * ndef);
+        int i;
+
+        if (color) {
+            for (i = 0; i < ndef; i++) {
+                color[i].pixel = pdef[i].pixel;
+                color[i].red = pdef[i].red;
+                color[i].blue = pdef[i].blue;
+                color[i].green = pdef[i].green;
+                color[i].flags = pdef[i].flags;
+                color[i].pad = pdef[i].pad;
+            }
+            XStoreColors(dmxScreen->beDisplay, pCmapPriv->cmap, color, ndef);
+            free(color);
+        }
+        else {                  /* xalloc failed, so fallback */
+            XColor c;
+
+            for (i = 0; i < ndef; i++) {
+                c.pixel = pdef[i].pixel;
+                c.red = pdef[i].red;
+                c.blue = pdef[i].blue;
+                c.green = pdef[i].green;
+                c.flags = pdef[i].flags;
+                c.pad = pdef[i].pad;
+                XStoreColor(dmxScreen->beDisplay, pCmapPriv->cmap, &c);
+            }
+        }
+        dmxSync(dmxScreen, FALSE);
+    }
+
+    DMX_UNWRAP(StoreColors, dmxScreen, pScreen);
+    if (pScreen->StoreColors)
+        pScreen->StoreColors(pColormap, ndef, pdef);
+    DMX_WRAP(StoreColors, dmxStoreColors, dmxScreen, pScreen);
+}
+
+/** Create the DMX server's default colormap. */
+Bool
+dmxCreateDefColormap(ScreenPtr pScreen)
+{
+    return miCreateDefColormap(pScreen);
+}
diff --git a/xorg-server/hw/dmx/dmxcursor.c b/xorg-server/hw/dmx/dmxcursor.c
index 19f5a4139..1a77c7d78 100644
--- a/xorg-server/hw/dmx/dmxcursor.c
+++ b/xorg-server/hw/dmx/dmxcursor.c
@@ -1,989 +1,1023 @@
-/*

- * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   David H. Dawes <dawes@xfree86.org>

- *   Kevin E. Martin <kem@redhat.com>

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- * This file contains code than supports cursor movement, including the

- * code that initializes and reinitializes the screen positions and

- * computes screen overlap.

- *

- * "This code is based very closely on the XFree86 equivalent

- * (xfree86/common/xf86Cursor.c)."  --David Dawes.

- *

- * "This code was then extensively re-written, as explained here."

- * --Rik Faith

- *

- * The code in xf86Cursor.c used edge lists to implement the

- * CursorOffScreen function.  The edge list computation was complex

- * (especially in the face of arbitrarily overlapping screens) compared

- * with the speed savings in the CursorOffScreen function.  The new

- * implementation has erred on the side of correctness, readability, and

- * maintainability over efficiency.  For the common (non-edge) case, the

- * dmxCursorOffScreen function does avoid a loop over all the screens.

- * When the cursor has left the screen, all the screens are searched,

- * and the first screen (in dmxScreens order) containing the cursor will

- * be returned.  If run-time profiling shows that this routing is a

- * performance bottle-neck, then an edge list may have to be

- * reimplemented.  An edge list algorithm is O(edges) whereas the new

- * algorithm is O(dmxNumScreens).  Since edges is usually 1-3 and

- * dmxNumScreens may be 30-60 for large backend walls, this trade off

- * may be compelling.

- *

- * The xf86InitOrigins routine uses bit masks during the computation and

- * is therefore limited to the length of a word (e.g., 32 or 64 bits)

- * screens.  Because Xdmx is expected to be used with a large number of

- * backend displays, this limitation was removed.  The new

- * implementation has erred on the side of readability over efficiency,

- * using the dmxSL* routines to manage a screen list instead of a

- * bitmap, and a function call to decrease the length of the main

- * routine.  Both algorithms are of the same order, and both are called

- * only at server generation time, so trading clarity and long-term

- * maintainability for efficiency does not seem justified in this case.

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#define DMX_CURSOR_DEBUG 0

-

-#include "dmx.h"

-#include "dmxsync.h"

-#include "dmxcursor.h"

-#include "dmxlog.h"

-#include "dmxprop.h"

-#include "dmxinput.h"

-

-#include "mipointer.h"

-#include "windowstr.h"

-#include "globals.h"

-#include "cursorstr.h"

-#include "dixevents.h"          /* For GetSpriteCursor() */

-#include "inputstr.h"           /* for inputInfo.pointer */

-

-#if DMX_CURSOR_DEBUG

-#define DMXDBG0(f)               dmxLog(dmxDebug,f)

-#define DMXDBG1(f,a)             dmxLog(dmxDebug,f,a)

-#define DMXDBG2(f,a,b)           dmxLog(dmxDebug,f,a,b)

-#define DMXDBG3(f,a,b,c)         dmxLog(dmxDebug,f,a,b,c)

-#define DMXDBG4(f,a,b,c,d)       dmxLog(dmxDebug,f,a,b,c,d)

-#define DMXDBG5(f,a,b,c,d,e)     dmxLog(dmxDebug,f,a,b,c,d,e)

-#define DMXDBG6(f,a,b,c,d,e,g)   dmxLog(dmxDebug,f,a,b,c,d,e,g)

-#define DMXDBG7(f,a,b,c,d,e,g,h) dmxLog(dmxDebug,f,a,b,c,d,e,g,h)

-#else

-#define DMXDBG0(f)

-#define DMXDBG1(f,a)

-#define DMXDBG2(f,a,b)

-#define DMXDBG3(f,a,b,c)

-#define DMXDBG4(f,a,b,c,d)

-#define DMXDBG5(f,a,b,c,d,e)

-#define DMXDBG6(f,a,b,c,d,e,g)

-#define DMXDBG7(f,a,b,c,d,e,g,h)

-#endif

-

-static int dmxCursorDoMultiCursors = 1;

-

-/** Turn off support for displaying multiple cursors on overlapped

-    back-end displays.  See #dmxCursorDoMultiCursors. */

-void dmxCursorNoMulti(void)

-{

-    dmxCursorDoMultiCursors = 0;

-}

-

-static Bool dmxCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)

-{

-    DMXScreenInfo *dmxScreen;

-    int           i;

-    int           localX = *x;

-    int           localY = *y;

-    int           globalX;

-    int           globalY;

-    

-    if (screenInfo.numScreens == 1)

-        return FALSE;

-

-                                /* On current screen? */

-    dmxScreen = &dmxScreens[(*ppScreen)->myNum];

-    if (localX >= 0

-        && localX < dmxScreen->rootWidth

-        && localY >= 0

-        && localY < dmxScreen->rootHeight)

-        return FALSE;

-

-                                /* Convert to global coordinate space */

-    globalX = dmxScreen->rootXOrigin + localX;

-    globalY = dmxScreen->rootYOrigin + localY;

-

-                                /* Is cursor on the current screen?

-                                 * This efficiently exits this routine

-                                 * for the most common case. */

-    if (ppScreen && *ppScreen) {

-        dmxScreen = &dmxScreens[(*ppScreen)->myNum];

-        if (globalX >= dmxScreen->rootXOrigin

-            && globalX < dmxScreen->rootXOrigin + dmxScreen->rootWidth

-            && globalY >= dmxScreen->rootYOrigin

-            && globalY < dmxScreen->rootYOrigin + dmxScreen->rootHeight)

-            return FALSE;

-    }

-

-                                /* Find first screen cursor is on */

-    for (i = 0; i < dmxNumScreens; i++) {

-        dmxScreen = &dmxScreens[i];

-        if (globalX >= dmxScreen->rootXOrigin

-            && globalX < dmxScreen->rootXOrigin + dmxScreen->rootWidth

-            && globalY >= dmxScreen->rootYOrigin

-            && globalY < dmxScreen->rootYOrigin + dmxScreen->rootHeight) {

-            if (dmxScreen->index == (*ppScreen)->myNum)

-                return FALSE;

-            *ppScreen = screenInfo.screens[dmxScreen->index];

-            *x        = globalX - dmxScreen->rootXOrigin;

-            *y        = globalY - dmxScreen->rootYOrigin;

-            return TRUE;

-        }

-    }

-    return FALSE;

-}

-

-static void dmxCrossScreen(ScreenPtr pScreen, Bool entering)

-{

-}

-

-static void dmxWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

-{

-    DMXDBG3("dmxWarpCursor(%d,%d,%d)\n", pScreen->myNum, x, y);

-#if 11 /*BP*/

-    /* This call is depracated.  Replace with???? */

-    miPointerWarpCursor(pDev, pScreen, x, y);

-#else

-    pScreen->SetCursorPosition(pDev, pScreen, x, y, FALSE);

-#endif

-}

-

-miPointerScreenFuncRec dmxPointerCursorFuncs =

-{

-    dmxCursorOffScreen,

-    dmxCrossScreen,

-    dmxWarpCursor,

-    NULL,

-    NULL,

-};

-

-

-/** Create a list of screens that we'll manipulate. */

-static int *dmxSLCreate(void)

-{

-    int *list = malloc(dmxNumScreens * sizeof(*list));

-    int i;

-    

-    for (i = 0; i < dmxNumScreens; i++)

-        list[i] = 1;

-    return list;

-}

-

-/** Free list. */

-static void dmxSLFree(int *list)

-{

-    free(list);

-}

-

-/** Find next uninitialized entry in list. */

-static int dmxSLFindNext(int *list)

-{

-    int i;

-    for (i = 0; i < dmxNumScreens; i++)

-        if (list[i])

-            return i;

-    return -1;

-}

-

-/** Make one pass over all the screens and return the number updated. */

-static int dmxTryComputeScreenOrigins(int *screensLeft)

-{

-    ScreenPtr       pScreen, refScreen;

-    DMXScreenInfo   *screen;

-    int             i, ref;

-    int             changed = 0;

-

-    for (i = 0; i < dmxNumScreens; i++) {

-        if (!screensLeft[i])

-            continue;

-        screen  = &dmxScreens[i];

-        pScreen = screenInfo.screens[i];

-        switch (screen->where) {

-        case PosAbsolute:

-            pScreen->x = screen->whereX;

-            pScreen->y = screen->whereY;

-            ++changed, screensLeft[i] = 0;

-            break;

-        case PosRelative:

-            ref = screen->whereRefScreen;

-            if (screensLeft[ref])

-                break;

-            refScreen = screenInfo.screens[ref];

-            pScreen->x = refScreen->x + screen->whereX;

-            pScreen->y = refScreen->y + screen->whereY;

-            ++changed, screensLeft[i] = 0;

-            break;

-        case PosRightOf:

-            ref = screen->whereRefScreen;

-            if (screensLeft[ref])

-                break;

-            refScreen = screenInfo.screens[ref];

-            pScreen->x = refScreen->x + refScreen->width;

-            pScreen->y = refScreen->y;

-            ++changed, screensLeft[i] = 0;

-            break;

-        case PosLeftOf:

-            ref = screen->whereRefScreen;

-            if (screensLeft[ref])

-                break;

-            refScreen = screenInfo.screens[ref];

-            pScreen->x = refScreen->x - pScreen->width;

-            pScreen->y = refScreen->y;

-            ++changed, screensLeft[i] = 0;

-            break;

-        case PosBelow:

-            ref = screen->whereRefScreen;

-            if (screensLeft[ref])

-                break;

-            refScreen = screenInfo.screens[ref];

-            pScreen->x = refScreen->x;

-            pScreen->y = refScreen->y + refScreen->height;

-            ++changed, screensLeft[i] = 0;

-            break;

-        case PosAbove:

-            ref = screen->whereRefScreen;

-            if (screensLeft[ref])

-                break;

-            refScreen = screenInfo.screens[ref];

-            pScreen->x = refScreen->x;

-            pScreen->y = refScreen->y - pScreen->height;

-            ++changed, screensLeft[i] = 0;

-            break;

-        case PosNone:

-            dmxLog(dmxFatal, "No position information for screen %d\n", i);

-        }

-    }

-    return changed;

-}

-

-static void dmxComputeScreenOrigins(void)

-{

-    ScreenPtr       pScreen;

-    int             *screensLeft;

-    int             i, ref;

-    int             minX, minY;

-

-                                /* Compute origins based on

-                                 * configuration information. */

-    screensLeft = dmxSLCreate();

-    while ((i = dmxSLFindNext(screensLeft)) >= 0) {

-        while (dmxTryComputeScreenOrigins(screensLeft));

-        if ((i = dmxSLFindNext(screensLeft)) >= 0) {

-	    /* All of the remaining screens are referencing each other.

-	     * Assign a value to one of them and go through again.  This

-	     * guarantees that we will eventually terminate.

-	     */

-	    ref                     = dmxScreens[i].whereRefScreen;

-	    pScreen                 = screenInfo.screens[ref];

-	    pScreen->x = pScreen->y = 0;

-	    screensLeft[ref]        = 0;

-	}

-    }

-    dmxSLFree(screensLeft);

-

-

-                                /* Justify the topmost and leftmost to

-                                 * (0,0). */

-    minX = screenInfo.screens[0]->x;

-    minY = screenInfo.screens[0]->y;

-    for (i = 1; i < dmxNumScreens; i++) { /* Compute minX, minY */

-	if (screenInfo.screens[i]->x < minX)

-            minX = screenInfo.screens[i]->x;

-	if (screenInfo.screens[i]->y < minY)

-            minY = screenInfo.screens[i]->y;

-    }

-    if (minX || minY) {

-	for (i = 0; i < dmxNumScreens; i++) {

-	    screenInfo.screens[i]->x -= minX;

-	    screenInfo.screens[i]->y -= minY;

-	}

-    }

-}

-

-/** Recompute origin information in the #dmxScreens list.  This is

- * called from #dmxInitOrigins. */

-void dmxReInitOrigins(void)

-{

-    int        i;

-

-    if (dmxNumScreens > MAXSCREENS)

-        dmxLog(dmxFatal, "dmxNumScreens = %d > MAXSCREENS = %d\n",

-               dmxNumScreens, MAXSCREENS);

-

-    for (i = 0; i < dmxNumScreens; i++) {

-        DMXScreenInfo    *dmxScreen  = &dmxScreens[i];

-        dmxLogOutput(dmxScreen,

-                     "s=%dx%d%+d%+d r=%dx%d%+d%+d @%d,%d"

-                     " (be=%dx%d depth=%d bpp=%d)\n",

-                     dmxScreen->scrnWidth, dmxScreen->scrnHeight,

-                     dmxScreen->scrnX, dmxScreen->scrnY,

-

-                     dmxScreen->rootWidth, dmxScreen->rootHeight,

-                     dmxScreen->rootX, dmxScreen->rootY,

-                     

-                     dmxScreen->rootXOrigin, dmxScreen->rootYOrigin,

-                     dmxScreen->beWidth, dmxScreen->beHeight,

-                     dmxScreen->beDepth, dmxScreen->beBPP);

-    }

-}

-

-/** Initialize screen origins (and relative position).  This is called

- * for each server generation.  For dynamic reconfiguration, use

- * #dmxReInitOrigins() instead. */

-void dmxInitOrigins(void)

-{

-    int  i;

-

-    if (dmxNumScreens > MAXSCREENS)

-        dmxLog(dmxFatal, "dmxNumScreens = %d > MAXSCREENS = %d\n",

-               dmxNumScreens, MAXSCREENS);

-

-    for (i = 0; i < dmxNumScreens; i++) {

-        DMXScreenInfo    *dmxScreen  = &dmxScreens[i];

-        dmxLogOutput(dmxScreen,

-                     "(request) s=%dx%d%+d%+d r=%dx%d%+d%+d @%d,%d (%d)"

-                     " (be=%dx%d depth=%d bpp=%d)\n",

-                     dmxScreen->scrnWidth, dmxScreen->scrnHeight,

-                     dmxScreen->scrnX, dmxScreen->scrnY,

-

-                     dmxScreen->rootWidth, dmxScreen->rootHeight,

-                     dmxScreen->rootX, dmxScreen->rootY,

-

-                     dmxScreen->whereX, dmxScreen->whereY,

-                     dmxScreen->where,

-

-                     dmxScreen->beWidth, dmxScreen->beHeight,

-                     dmxScreen->beDepth, dmxScreen->beBPP);

-    }

-

-    dmxComputeScreenOrigins();

-

-    for (i = 0; i < dmxNumScreens; i++) {

-        DMXScreenInfo  *dmxScreen = &dmxScreens[i];

-        dmxScreen->rootXOrigin = screenInfo.screens[i]->x;

-        dmxScreen->rootYOrigin = screenInfo.screens[i]->y;

-    }

-

-    dmxReInitOrigins();

-}

-

-/** Returns non-zero if the global \a x, \a y coordinate is on the

- * screen window of the \a dmxScreen. */

-int dmxOnScreen(int x, int y, DMXScreenInfo *dmxScreen)

-{

-#if DMX_CURSOR_DEBUG > 1

-    dmxLog(dmxDebug,

-           "dmxOnScreen %d %d,%d (r=%dx%d%+d%+d@%d,%d s=%dx%d%+d%+d)\n",

-           dmxScreen->index, x, y,

-           dmxScreen->rootWidth, dmxScreen->rootHeight,

-           dmxScreen->rootX, dmxScreen->rootY,

-           dmxScreen->rootXOrigin, dmxScreen->rootYOrigin,

-           dmxScreen->scrnWidth, dmxScreen->scrnHeight,

-           dmxScreen->scrnX, dmxScreen->scrnY);

-#endif

-    if (x >= dmxScreen->rootXOrigin

-        && x < dmxScreen->rootXOrigin + dmxScreen->rootWidth

-        && y >= dmxScreen->rootYOrigin

-        && y < dmxScreen->rootYOrigin + dmxScreen->rootHeight) return 1;

-    return 0;

-}

-

-/** Returns non-zero if \a a overlaps \a b. */

-static int dmxDoesOverlap(DMXScreenInfo *a, DMXScreenInfo *b)

-{

-    if (dmxOnScreen(a->rootXOrigin,

-                    a->rootYOrigin,                 b))

-        return 1;

-

-    if (dmxOnScreen(a->rootXOrigin,

-                    a->rootYOrigin + a->scrnWidth,  b))

-        return 1;

-

-    if (dmxOnScreen(a->rootXOrigin + a->scrnHeight,

-                    a->rootYOrigin,                 b))

-        return 1;

-

-    if (dmxOnScreen(a->rootXOrigin + a->scrnHeight,

-                    a->rootYOrigin + a->scrnWidth,  b))

-        return 1;

-

-    if (dmxOnScreen(b->rootXOrigin,

-                    b->rootYOrigin,                 a))

-        return 1;

-

-    if (dmxOnScreen(b->rootXOrigin,

-                    b->rootYOrigin + b->scrnWidth,  a))

-        return 1;

-

-    if (dmxOnScreen(b->rootXOrigin + b->scrnHeight,

-                    b->rootYOrigin,                 a))

-        return 1;

-

-    if (dmxOnScreen(b->rootXOrigin + b->scrnHeight,

-                    b->rootYOrigin + b->scrnWidth,  a))

-        return 1;

-

-    return 0;

-}

-

-/** Used with \a dmxInterateOverlap to print out a list of screens which

- * overlap each other. */

-static void *dmxPrintOverlap(DMXScreenInfo *dmxScreen, void *closure)

-{

-    DMXScreenInfo *a = closure;

-    if (dmxScreen != a) {

-        if (dmxScreen->cursorNotShared)

-            dmxLogOutputCont(a, " [%d/%s]", dmxScreen->index, dmxScreen->name);

-        else

-            dmxLogOutputCont(a, " %d/%s", dmxScreen->index, dmxScreen->name);

-    }

-    return NULL;

-}

-

-/** Iterate over the screens which overlap with the \a start screen,

- * calling \a f with the \a closure for each argument.  Often used with

- * #dmxPrintOverlap. */

-static void *dmxIterateOverlap(DMXScreenInfo *start,

-                               void *(*f)(DMXScreenInfo *dmxScreen, void *),

-                               void *closure)

-{

-    DMXScreenInfo *pt;

-

-    if (!start->over) return f(start, closure);

-

-    for (pt = start->over; /* condition at end of loop */; pt = pt->over) {

-        void *retval;

-        if ((retval = f(pt, closure))) return retval;

-        if (pt == start) break;

-    }

-    return NULL;

-}

-

-/** Used with #dmxPropertyIterate to determine if screen \a a is the

- * same as the screen \a closure. */

-static void *dmxTestSameDisplay(DMXScreenInfo *a, void *closure)

-{

-    DMXScreenInfo *b = closure;

-

-    if (a == b)

-        return a;

-    return NULL;

-}

-

-/** Detects overlapping dmxScreens and creates circular lists.  This

- * uses an O(dmxNumScreens^2) algorithm, but dmxNumScreens is < 100 and

- * the computation only needs to be performed for every server

- * generation or dynamic reconfiguration . */

-void dmxInitOverlap(void)

-{

-    int           i, j;

-    DMXScreenInfo *a, *b, *pt;

-

-    for (i = 0; i < dmxNumScreens; i++)

-        dmxScreens[i].over = NULL;

-

-    for (i = 0; i < dmxNumScreens; i++) {

-        a = &dmxScreens[i];

-        

-        for (j = i+1; j < dmxNumScreens; j++) {

-            b = &dmxScreens[j];

-            if (b->over)

-                continue;

-            

-            if (dmxDoesOverlap(a, b)) {

-                DMXDBG6("%d overlaps %d: a=%p %p b=%p %p\n",

-                        a->index, b->index, a, a->over, b, b->over);

-                b->over = (a->over ? a->over : a);

-                a->over = b;

-            }

-        }

-    }

-

-    for (i = 0; i < dmxNumScreens; i++) {

-        a = &dmxScreens[i];

-        

-        if (!a->over)

-            continue;

-        

-                                /* Flag all pairs that are on same display */

-        for (pt = a->over; pt != a; pt = pt->over) {

-            if (dmxPropertyIterate(a, dmxTestSameDisplay, pt)) {

-                /* The ->over sets contain the transitive set of screens

-                 * that overlap.  For screens that are on the same

-                 * backend display, we only want to exclude pairs of

-                 * screens that mutually overlap on the backend display,

-                 * so we call dmxDoesOverlap, which is stricter than the

-                 * ->over set. */

-                if (!dmxDoesOverlap(a, pt))

-                    continue;

-                a->cursorNotShared  = 1;

-                pt->cursorNotShared = 1;

-                dmxLog(dmxInfo,

-                       "Screen %d and %d overlap on %s\n",

-                       a->index, pt->index, a->name);

-            }

-        }

-    }

-

-    for (i = 0; i < dmxNumScreens; i++) {

-        a = &dmxScreens[i];

-        

-        if (a->over) {

-            dmxLogOutput(a, "Overlaps");

-            dmxIterateOverlap(a, dmxPrintOverlap, a);

-            dmxLogOutputCont(a, "\n");

-        }

-    }

-}

-

-/** Create \a pCursor on the back-end associated with \a pScreen. */

-void dmxBECreateCursor(ScreenPtr pScreen, CursorPtr pCursor)

-{

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxCursorPrivPtr  pCursorPriv = DMX_GET_CURSOR_PRIV(pCursor, pScreen);

-    CursorBitsPtr     pBits = pCursor->bits;

-    Pixmap            src, msk;

-    XColor            fg, bg;

-    XImage           *img;

-    XlibGC            gc = NULL;

-    XGCValues         v;

-    unsigned long     m;

-    int               i;

-

-    if (!pCursorPriv)

-	return;

-

-    m = GCFunction | GCPlaneMask | GCForeground | GCBackground | GCClipMask;

-    v.function = GXcopy;

-    v.plane_mask = AllPlanes;

-    v.foreground = 1L;

-    v.background = 0L;

-    v.clip_mask = None;

-

-    for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {

-	if (dmxScreen->bePixmapFormats[i].depth == 1) {

-	    /* Create GC in the back-end servers */

-	    gc = XCreateGC(dmxScreen->beDisplay, dmxScreen->scrnDefDrawables[i],

-			   m, &v);

-	    break;

-	}

-    }

-    if (!gc)

-        dmxLog(dmxFatal, "dmxRealizeCursor: gc not initialized\n");

-

-    src = XCreatePixmap(dmxScreen->beDisplay, dmxScreen->scrnWin,

-			pBits->width, pBits->height, 1);

-    msk = XCreatePixmap(dmxScreen->beDisplay, dmxScreen->scrnWin,

-			pBits->width, pBits->height, 1);

-

-    img = XCreateImage(dmxScreen->beDisplay,

-		       dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual,

-		       1, XYBitmap, 0, (char *)pBits->source,

-		       pBits->width, pBits->height,

-		       BitmapPad(dmxScreen->beDisplay), 0);

-

-    XPutImage(dmxScreen->beDisplay, src, gc, img, 0, 0, 0, 0,

-	      pBits->width, pBits->height);

-

-    XFree(img);

-  

-    img = XCreateImage(dmxScreen->beDisplay,

-		       dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual,

-		       1, XYBitmap, 0, (char *)pBits->mask,

-		       pBits->width, pBits->height,

-		       BitmapPad(dmxScreen->beDisplay), 0);

-

-    XPutImage(dmxScreen->beDisplay, msk, gc, img, 0, 0, 0, 0,

-	      pBits->width, pBits->height);

-

-    XFree(img);

-

-    fg.red   = pCursor->foreRed;

-    fg.green = pCursor->foreGreen;

-    fg.blue  = pCursor->foreBlue;

-

-    bg.red   = pCursor->backRed;

-    bg.green = pCursor->backGreen;

-    bg.blue  = pCursor->backBlue;

-

-    pCursorPriv->cursor = XCreatePixmapCursor(dmxScreen->beDisplay,

-					      src, msk,

-					      &fg, &bg,

-					      pBits->xhot, pBits->yhot);

-

-    XFreePixmap(dmxScreen->beDisplay, src);

-    XFreePixmap(dmxScreen->beDisplay, msk);

-    XFreeGC(dmxScreen->beDisplay, gc);

-

-    dmxSync(dmxScreen, FALSE);

-}

-

-static Bool _dmxRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)

-{

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxCursorPrivPtr  pCursorPriv;

-

-    DMXDBG2("_dmxRealizeCursor(%d,%p)\n", pScreen->myNum, pCursor);

-

-    DMX_SET_CURSOR_PRIV(pCursor, pScreen, malloc(sizeof(*pCursorPriv)));

-    if (!DMX_GET_CURSOR_PRIV(pCursor, pScreen))

-	return FALSE;

-

-    pCursorPriv = DMX_GET_CURSOR_PRIV(pCursor, pScreen);

-    pCursorPriv->cursor = (Cursor)0;

-

-    if (!dmxScreen->beDisplay)

-	return TRUE;

-

-    dmxBECreateCursor(pScreen, pCursor);

-    return TRUE;

-}

-

-/** Free \a pCursor on the back-end associated with \a pScreen. */

-Bool dmxBEFreeCursor(ScreenPtr pScreen, CursorPtr pCursor)

-{

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxCursorPrivPtr  pCursorPriv = DMX_GET_CURSOR_PRIV(pCursor, pScreen);

-

-    if (pCursorPriv) {

-	XFreeCursor(dmxScreen->beDisplay, pCursorPriv->cursor);

-	pCursorPriv->cursor = (Cursor)0;

-	return TRUE;

-    }

-

-    return FALSE;

-}

-

-static Bool _dmxUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)

-{

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-

-    DMXDBG2("_dmxUnrealizeCursor(%d,%p)\n",

-            pScreen->myNum, pCursor);

-

-    if (dmxScreen->beDisplay) {

-	if (dmxBEFreeCursor(pScreen, pCursor))

-	    free(DMX_GET_CURSOR_PRIV(pCursor, pScreen));

-    }

-    DMX_SET_CURSOR_PRIV(pCursor, pScreen, NULL);

-

-    return TRUE;

-}

-

-static void _dmxMoveCursor(ScreenPtr pScreen, int x, int y)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    int           newX       = x + dmxScreen->rootX;

-    int           newY       = y + dmxScreen->rootY;

-

-    if (newX < 0) newX = 0;

-    if (newY < 0) newY = 0;

-

-    DMXDBG5("_dmxMoveCursor(%d,%d,%d) -> %d,%d\n",

-            pScreen->myNum, x, y, newX, newY);

-    if (dmxScreen->beDisplay) {

-	XWarpPointer(dmxScreen->beDisplay, None, dmxScreen->scrnWin,

-		     0, 0, 0, 0, newX, newY);

-	dmxSync(dmxScreen, TRUE);

-    }

-}

-

-static void _dmxSetCursor(ScreenPtr pScreen, CursorPtr pCursor, int x, int y)

-{

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-

-    DMXDBG4("_dmxSetCursor(%d,%p,%d,%d)\n", pScreen->myNum, pCursor, x, y);

-

-    if (pCursor) {

-	dmxCursorPrivPtr  pCursorPriv = DMX_GET_CURSOR_PRIV(pCursor, pScreen);

-	if (pCursorPriv && dmxScreen->curCursor != pCursorPriv->cursor) {

-	    if (dmxScreen->beDisplay)

-		XDefineCursor(dmxScreen->beDisplay, dmxScreen->scrnWin,

-			      pCursorPriv->cursor);

-            dmxScreen->cursor        = pCursor;

-	    dmxScreen->curCursor     = pCursorPriv->cursor;

-            dmxScreen->cursorVisible = 1;

-	}

-	_dmxMoveCursor(pScreen, x, y);

-    } else {

-	if (dmxScreen->beDisplay)

-	    XDefineCursor(dmxScreen->beDisplay, dmxScreen->scrnWin,

-			  dmxScreen->noCursor);

-        dmxScreen->cursor        = NULL;

-	dmxScreen->curCursor     = (Cursor)0;

-        dmxScreen->cursorVisible = 0;

-    }

-    if (dmxScreen->beDisplay) dmxSync(dmxScreen, TRUE);

-}

-

-static Bool dmxRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

-{

-    DMXScreenInfo *start = &dmxScreens[pScreen->myNum];

-    DMXScreenInfo *pt;

-

-    if (!start->over || !dmxCursorDoMultiCursors || start->cursorNotShared)

-        return _dmxRealizeCursor(pScreen, pCursor);

-

-    for (pt = start->over; /* condition at end of loop */; pt = pt->over) {

-        if (pt->cursorNotShared)

-            continue;

-        _dmxRealizeCursor(screenInfo.screens[pt->index], pCursor);

-        if (pt == start)

-            break;

-    }

-    return TRUE;

-}

-

-static Bool dmxUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

-{

-    DMXScreenInfo *start = &dmxScreens[pScreen->myNum];

-    DMXScreenInfo *pt;

-

-    if (!start->over || !dmxCursorDoMultiCursors || start->cursorNotShared)

-        return _dmxUnrealizeCursor(pScreen, pCursor);

-

-    for (pt = start->over; /* condition at end of loop */; pt = pt->over) {

-        if (pt->cursorNotShared)

-            continue;

-        _dmxUnrealizeCursor(screenInfo.screens[pt->index], pCursor);

-        if (pt == start)

-            break;

-    }

-    return TRUE;

-}

-

-static CursorPtr dmxFindCursor(DMXScreenInfo *start)

-{

-    DMXScreenInfo *pt;

-

-    if (!start || !start->over)

-        return GetSpriteCursor(inputInfo.pointer);

-    for (pt = start->over; /* condition at end of loop */; pt = pt->over) {

-        if (pt->cursor)

-            return pt->cursor;

-        if (pt == start)

-            break;

-    }

-    return GetSpriteCursor(inputInfo.pointer);

-}

-

-/** Move the cursor to coordinates (\a x, \a y)on \a pScreen.  This

- * function is usually called via #dmxPointerSpriteFuncs, except during

- * reconfiguration when the cursor is repositioned to force an update on

- * newley overlapping screens and on screens that no longer overlap.

- *

- * The coords (x,y) are in global coord space.  We'll loop over the

- * back-end screens and see if they contain the global coord.  If so, call

- * _dmxMoveCursor() (XWarpPointer) to position the pointer on that screen.

- */

-void dmxMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

-{

-    DMXScreenInfo *start = &dmxScreens[pScreen->myNum];

-    DMXScreenInfo *pt;

-

-    DMXDBG3("dmxMoveCursor(%d,%d,%d)\n", pScreen->myNum, x, y);

-

-    if (!start->over || !dmxCursorDoMultiCursors || start->cursorNotShared) {

-        _dmxMoveCursor(pScreen, x, y);

-        return;

-    }

-

-    for (pt = start->over; /* condition at end of loop */; pt = pt->over) {

-        if (pt->cursorNotShared)

-            continue;

-        if (dmxOnScreen(x + start->rootXOrigin, y + start->rootYOrigin, pt)) {

-            if (/* pt != start && */ !pt->cursorVisible) {

-                if (!pt->cursor) {

-                                /* This only happens during

-                                 * reconfiguration when a new overlap

-                                 * occurs. */

-                    CursorPtr pCursor;

-                    

-                    if ((pCursor = dmxFindCursor(start)))

-                        _dmxRealizeCursor(screenInfo.screens[pt->index],

-                                          pt->cursor = pCursor);

-                    

-                }

-                _dmxSetCursor(screenInfo.screens[pt->index],

-                              pt->cursor,

-                              x + start->rootXOrigin - pt->rootXOrigin,

-                              y + start->rootYOrigin - pt->rootYOrigin);

-            }

-            _dmxMoveCursor(screenInfo.screens[pt->index],

-                           x + start->rootXOrigin - pt->rootXOrigin,

-                           y + start->rootYOrigin - pt->rootYOrigin);

-        } else if (/* pt != start && */ pt->cursorVisible) {

-            _dmxSetCursor(screenInfo.screens[pt->index],

-                          NULL,

-                          x + start->rootXOrigin - pt->rootXOrigin,

-                          y + start->rootYOrigin - pt->rootYOrigin);

-        }

-        if (pt == start)

-            break;

-    }

-}

-

-static void dmxSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)

-{

-    DMXScreenInfo *start = &dmxScreens[pScreen->myNum];

-    DMXScreenInfo *pt;

-    int           GX, GY, gx, gy;

-

-    DMXDBG5("dmxSetCursor(%d %p, %p,%d,%d)\n",

-            pScreen->myNum, start, pCursor, x, y);

-

-                                /* We do this check here because of two cases:

-                                 *

-                                 * 1) if a client calls XWarpPointer()

-                                 * and Xinerama is not running, we can

-                                 * have mi's notion of the pointer

-                                 * position out of phase with DMX's

-                                 * notion.

-                                 *

-                                 * 2) if a down button is held while the

-                                 * cursor moves outside the root window,

-                                 * mi's notion of the pointer position

-                                 * is out of phase with DMX's notion and

-                                 * the cursor can remain visible when it

-                                 * shouldn't be. */

-

-    dmxGetGlobalPosition(&GX, &GY);

-    gx = start->rootXOrigin + x;

-    gy = start->rootYOrigin + y;

-    if (x && y && (GX != gx || GY != gy))

-        dmxCoreMotion(NULL, gx, gy, 0, DMX_NO_BLOCK);

-    

-    if (!start->over || !dmxCursorDoMultiCursors || start->cursorNotShared) {

-        _dmxSetCursor(pScreen, pCursor, x, y);

-        return;

-    }

-

-    for (pt = start->over; /* condition at end of loop */; pt = pt->over) {

-        if (pt->cursorNotShared)

-            continue;

-        if (dmxOnScreen(x + start->rootXOrigin, y + start->rootYOrigin, pt)) {

-            _dmxSetCursor(screenInfo.screens[pt->index], pCursor,

-                          x + start->rootXOrigin - pt->rootXOrigin,

-                          y + start->rootYOrigin - pt->rootYOrigin);

-        } else {

-            _dmxSetCursor(screenInfo.screens[pt->index], NULL,

-                          x + start->rootXOrigin - pt->rootXOrigin,

-                          y + start->rootYOrigin - pt->rootYOrigin);

-        }

-        if (pt == start)

-            break;

-    }

-}

-

-

-/** This routine is used by the backend input routines to hide the

- * cursor on a screen that is being used for relative input.  \see

- * dmxbackend.c */

-void dmxHideCursor(DMXScreenInfo *dmxScreen)

-{

-    int       x, y;

-    ScreenPtr pScreen = screenInfo.screens[dmxScreen->index];

-

-    dmxGetGlobalPosition(&x, &y);

-    _dmxSetCursor(pScreen, NULL, x, y);

-}

-

-/** This routine is called during reconfiguration to make sure the

- * cursor is visible. */

-void dmxCheckCursor(void)

-{

-    int           i;

-    int           x, y;

-    ScreenPtr     pScreen;

-    DMXScreenInfo *firstScreen;

-

-    dmxGetGlobalPosition(&x, &y);

-    firstScreen = dmxFindFirstScreen(x, y);

-

-    DMXDBG2("dmxCheckCursor %d %d\n", x, y);

-    for (i = 0; i < dmxNumScreens; i++) {

-        DMXScreenInfo *dmxScreen = &dmxScreens[i];

-        pScreen                  = screenInfo.screens[dmxScreen->index];

-

-        if (!dmxOnScreen(x, y, dmxScreen)) {

-            if (firstScreen && i == miPointerGetScreen(inputInfo.pointer)->myNum)

-                miPointerSetScreen(inputInfo.pointer, firstScreen->index, x, y);

-            _dmxSetCursor(pScreen, NULL,

-                          x - dmxScreen->rootXOrigin,

-                          y - dmxScreen->rootYOrigin);

-        } else {

-            if (!dmxScreen->cursor) {

-                CursorPtr pCursor;

-                

-                if ((pCursor = dmxFindCursor(dmxScreen))) {

-                    _dmxRealizeCursor(pScreen, dmxScreen->cursor = pCursor);

-                }

-            }

-            _dmxSetCursor(pScreen, dmxScreen->cursor,

-                          x - dmxScreen->rootXOrigin,

-                          y - dmxScreen->rootYOrigin);

-        }

-    }

-    DMXDBG2("   leave dmxCheckCursor %d %d\n", x, y);

-}

-

-static Bool dmxDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScr)

-{

-    return TRUE;

-}

-

-static void dmxDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScr)

-{

-}

-

-miPointerSpriteFuncRec dmxPointerSpriteFuncs =

-{

-    dmxRealizeCursor,

-    dmxUnrealizeCursor,

-    dmxSetCursor,

-    dmxMoveCursor,

-    dmxDeviceCursorInitialize,

-    dmxDeviceCursorCleanup

-};

+/*
+ * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   David H. Dawes <dawes@xfree86.org>
+ *   Kevin E. Martin <kem@redhat.com>
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ * This file contains code than supports cursor movement, including the
+ * code that initializes and reinitializes the screen positions and
+ * computes screen overlap.
+ *
+ * "This code is based very closely on the XFree86 equivalent
+ * (xfree86/common/xf86Cursor.c)."  --David Dawes.
+ *
+ * "This code was then extensively re-written, as explained here."
+ * --Rik Faith
+ *
+ * The code in xf86Cursor.c used edge lists to implement the
+ * CursorOffScreen function.  The edge list computation was complex
+ * (especially in the face of arbitrarily overlapping screens) compared
+ * with the speed savings in the CursorOffScreen function.  The new
+ * implementation has erred on the side of correctness, readability, and
+ * maintainability over efficiency.  For the common (non-edge) case, the
+ * dmxCursorOffScreen function does avoid a loop over all the screens.
+ * When the cursor has left the screen, all the screens are searched,
+ * and the first screen (in dmxScreens order) containing the cursor will
+ * be returned.  If run-time profiling shows that this routing is a
+ * performance bottle-neck, then an edge list may have to be
+ * reimplemented.  An edge list algorithm is O(edges) whereas the new
+ * algorithm is O(dmxNumScreens).  Since edges is usually 1-3 and
+ * dmxNumScreens may be 30-60 for large backend walls, this trade off
+ * may be compelling.
+ *
+ * The xf86InitOrigins routine uses bit masks during the computation and
+ * is therefore limited to the length of a word (e.g., 32 or 64 bits)
+ * screens.  Because Xdmx is expected to be used with a large number of
+ * backend displays, this limitation was removed.  The new
+ * implementation has erred on the side of readability over efficiency,
+ * using the dmxSL* routines to manage a screen list instead of a
+ * bitmap, and a function call to decrease the length of the main
+ * routine.  Both algorithms are of the same order, and both are called
+ * only at server generation time, so trading clarity and long-term
+ * maintainability for efficiency does not seem justified in this case.
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#define DMX_CURSOR_DEBUG 0
+
+#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxcursor.h"
+#include "dmxlog.h"
+#include "dmxprop.h"
+#include "dmxinput.h"
+
+#include "mipointer.h"
+#include "windowstr.h"
+#include "globals.h"
+#include "cursorstr.h"
+#include "dixevents.h"          /* For GetSpriteCursor() */
+#include "inputstr.h"           /* for inputInfo.pointer */
+
+#if DMX_CURSOR_DEBUG
+#define DMXDBG0(f)               dmxLog(dmxDebug,f)
+#define DMXDBG1(f,a)             dmxLog(dmxDebug,f,a)
+#define DMXDBG2(f,a,b)           dmxLog(dmxDebug,f,a,b)
+#define DMXDBG3(f,a,b,c)         dmxLog(dmxDebug,f,a,b,c)
+#define DMXDBG4(f,a,b,c,d)       dmxLog(dmxDebug,f,a,b,c,d)
+#define DMXDBG5(f,a,b,c,d,e)     dmxLog(dmxDebug,f,a,b,c,d,e)
+#define DMXDBG6(f,a,b,c,d,e,g)   dmxLog(dmxDebug,f,a,b,c,d,e,g)
+#define DMXDBG7(f,a,b,c,d,e,g,h) dmxLog(dmxDebug,f,a,b,c,d,e,g,h)
+#else
+#define DMXDBG0(f)
+#define DMXDBG1(f,a)
+#define DMXDBG2(f,a,b)
+#define DMXDBG3(f,a,b,c)
+#define DMXDBG4(f,a,b,c,d)
+#define DMXDBG5(f,a,b,c,d,e)
+#define DMXDBG6(f,a,b,c,d,e,g)
+#define DMXDBG7(f,a,b,c,d,e,g,h)
+#endif
+
+static int dmxCursorDoMultiCursors = 1;
+
+/** Turn off support for displaying multiple cursors on overlapped
+    back-end displays.  See #dmxCursorDoMultiCursors. */
+void
+dmxCursorNoMulti(void)
+{
+    dmxCursorDoMultiCursors = 0;
+}
+
+static Bool
+dmxCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
+{
+    DMXScreenInfo *dmxScreen;
+    int i;
+    int localX = *x;
+    int localY = *y;
+    int globalX;
+    int globalY;
+
+    if (screenInfo.numScreens == 1)
+        return FALSE;
+
+    /* On current screen? */
+    dmxScreen = &dmxScreens[(*ppScreen)->myNum];
+    if (localX >= 0
+        && localX < dmxScreen->rootWidth
+        && localY >= 0 && localY < dmxScreen->rootHeight)
+        return FALSE;
+
+    /* Convert to global coordinate space */
+    globalX = dmxScreen->rootXOrigin + localX;
+    globalY = dmxScreen->rootYOrigin + localY;
+
+    /* Is cursor on the current screen?
+     * This efficiently exits this routine
+     * for the most common case. */
+    if (ppScreen && *ppScreen) {
+        dmxScreen = &dmxScreens[(*ppScreen)->myNum];
+        if (globalX >= dmxScreen->rootXOrigin
+            && globalX < dmxScreen->rootXOrigin + dmxScreen->rootWidth
+            && globalY >= dmxScreen->rootYOrigin
+            && globalY < dmxScreen->rootYOrigin + dmxScreen->rootHeight)
+            return FALSE;
+    }
+
+    /* Find first screen cursor is on */
+    for (i = 0; i < dmxNumScreens; i++) {
+        dmxScreen = &dmxScreens[i];
+        if (globalX >= dmxScreen->rootXOrigin
+            && globalX < dmxScreen->rootXOrigin + dmxScreen->rootWidth
+            && globalY >= dmxScreen->rootYOrigin
+            && globalY < dmxScreen->rootYOrigin + dmxScreen->rootHeight) {
+            if (dmxScreen->index == (*ppScreen)->myNum)
+                return FALSE;
+            *ppScreen = screenInfo.screens[dmxScreen->index];
+            *x = globalX - dmxScreen->rootXOrigin;
+            *y = globalY - dmxScreen->rootYOrigin;
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static void
+dmxCrossScreen(ScreenPtr pScreen, Bool entering)
+{
+}
+
+static void
+dmxWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+    DMXDBG3("dmxWarpCursor(%d,%d,%d)\n", pScreen->myNum, x, y);
+#if 11 /*BP*/
+        /* This call is depracated.  Replace with???? */
+        miPointerWarpCursor(pDev, pScreen, x, y);
+#else
+    pScreen->SetCursorPosition(pDev, pScreen, x, y, FALSE);
+#endif
+}
+
+miPointerScreenFuncRec dmxPointerCursorFuncs = {
+    dmxCursorOffScreen,
+    dmxCrossScreen,
+    dmxWarpCursor,
+    NULL,
+    NULL,
+};
+
+/** Create a list of screens that we'll manipulate. */
+static int *
+dmxSLCreate(void)
+{
+    int *list = malloc(dmxNumScreens * sizeof(*list));
+    int i;
+
+    for (i = 0; i < dmxNumScreens; i++)
+        list[i] = 1;
+    return list;
+}
+
+/** Free list. */
+static void
+dmxSLFree(int *list)
+{
+    free(list);
+}
+
+/** Find next uninitialized entry in list. */
+static int
+dmxSLFindNext(int *list)
+{
+    int i;
+
+    for (i = 0; i < dmxNumScreens; i++)
+        if (list[i])
+            return i;
+    return -1;
+}
+
+/** Make one pass over all the screens and return the number updated. */
+static int
+dmxTryComputeScreenOrigins(int *screensLeft)
+{
+    ScreenPtr pScreen, refScreen;
+    DMXScreenInfo *screen;
+    int i, ref;
+    int changed = 0;
+
+    for (i = 0; i < dmxNumScreens; i++) {
+        if (!screensLeft[i])
+            continue;
+        screen = &dmxScreens[i];
+        pScreen = screenInfo.screens[i];
+        switch (screen->where) {
+        case PosAbsolute:
+            pScreen->x = screen->whereX;
+            pScreen->y = screen->whereY;
+            ++changed, screensLeft[i] = 0;
+            break;
+        case PosRelative:
+            ref = screen->whereRefScreen;
+            if (screensLeft[ref])
+                break;
+            refScreen = screenInfo.screens[ref];
+            pScreen->x = refScreen->x + screen->whereX;
+            pScreen->y = refScreen->y + screen->whereY;
+            ++changed, screensLeft[i] = 0;
+            break;
+        case PosRightOf:
+            ref = screen->whereRefScreen;
+            if (screensLeft[ref])
+                break;
+            refScreen = screenInfo.screens[ref];
+            pScreen->x = refScreen->x + refScreen->width;
+            pScreen->y = refScreen->y;
+            ++changed, screensLeft[i] = 0;
+            break;
+        case PosLeftOf:
+            ref = screen->whereRefScreen;
+            if (screensLeft[ref])
+                break;
+            refScreen = screenInfo.screens[ref];
+            pScreen->x = refScreen->x - pScreen->width;
+            pScreen->y = refScreen->y;
+            ++changed, screensLeft[i] = 0;
+            break;
+        case PosBelow:
+            ref = screen->whereRefScreen;
+            if (screensLeft[ref])
+                break;
+            refScreen = screenInfo.screens[ref];
+            pScreen->x = refScreen->x;
+            pScreen->y = refScreen->y + refScreen->height;
+            ++changed, screensLeft[i] = 0;
+            break;
+        case PosAbove:
+            ref = screen->whereRefScreen;
+            if (screensLeft[ref])
+                break;
+            refScreen = screenInfo.screens[ref];
+            pScreen->x = refScreen->x;
+            pScreen->y = refScreen->y - pScreen->height;
+            ++changed, screensLeft[i] = 0;
+            break;
+        case PosNone:
+            dmxLog(dmxFatal, "No position information for screen %d\n", i);
+        }
+    }
+    return changed;
+}
+
+static void
+dmxComputeScreenOrigins(void)
+{
+    ScreenPtr pScreen;
+    int *screensLeft;
+    int i, ref;
+    int minX, minY;
+
+    /* Compute origins based on
+     * configuration information. */
+    screensLeft = dmxSLCreate();
+    while ((i = dmxSLFindNext(screensLeft)) >= 0) {
+        while (dmxTryComputeScreenOrigins(screensLeft));
+        if ((i = dmxSLFindNext(screensLeft)) >= 0) {
+            /* All of the remaining screens are referencing each other.
+             * Assign a value to one of them and go through again.  This
+             * guarantees that we will eventually terminate.
+             */
+            ref = dmxScreens[i].whereRefScreen;
+            pScreen = screenInfo.screens[ref];
+            pScreen->x = pScreen->y = 0;
+            screensLeft[ref] = 0;
+        }
+    }
+    dmxSLFree(screensLeft);
+
+    /* Justify the topmost and leftmost to
+     * (0,0). */
+    minX = screenInfo.screens[0]->x;
+    minY = screenInfo.screens[0]->y;
+    for (i = 1; i < dmxNumScreens; i++) {       /* Compute minX, minY */
+        if (screenInfo.screens[i]->x < minX)
+            minX = screenInfo.screens[i]->x;
+        if (screenInfo.screens[i]->y < minY)
+            minY = screenInfo.screens[i]->y;
+    }
+    if (minX || minY) {
+        for (i = 0; i < dmxNumScreens; i++) {
+            screenInfo.screens[i]->x -= minX;
+            screenInfo.screens[i]->y -= minY;
+        }
+    }
+}
+
+/** Recompute origin information in the #dmxScreens list.  This is
+ * called from #dmxInitOrigins. */
+void
+dmxReInitOrigins(void)
+{
+    int i;
+
+    if (dmxNumScreens > MAXSCREENS)
+        dmxLog(dmxFatal, "dmxNumScreens = %d > MAXSCREENS = %d\n",
+               dmxNumScreens, MAXSCREENS);
+
+    for (i = 0; i < dmxNumScreens; i++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
+        dmxLogOutput(dmxScreen,
+                     "s=%dx%d%+d%+d r=%dx%d%+d%+d @%d,%d"
+                     " (be=%dx%d depth=%d bpp=%d)\n",
+                     dmxScreen->scrnWidth, dmxScreen->scrnHeight,
+                     dmxScreen->scrnX, dmxScreen->scrnY,
+                     dmxScreen->rootWidth, dmxScreen->rootHeight,
+                     dmxScreen->rootX, dmxScreen->rootY,
+                     dmxScreen->rootXOrigin, dmxScreen->rootYOrigin,
+                     dmxScreen->beWidth, dmxScreen->beHeight,
+                     dmxScreen->beDepth, dmxScreen->beBPP);
+    }
+}
+
+/** Initialize screen origins (and relative position).  This is called
+ * for each server generation.  For dynamic reconfiguration, use
+ * #dmxReInitOrigins() instead. */
+void
+dmxInitOrigins(void)
+{
+    int i;
+
+    if (dmxNumScreens > MAXSCREENS)
+        dmxLog(dmxFatal, "dmxNumScreens = %d > MAXSCREENS = %d\n",
+               dmxNumScreens, MAXSCREENS);
+
+    for (i = 0; i < dmxNumScreens; i++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
+        dmxLogOutput(dmxScreen,
+                     "(request) s=%dx%d%+d%+d r=%dx%d%+d%+d @%d,%d (%d)"
+                     " (be=%dx%d depth=%d bpp=%d)\n",
+                     dmxScreen->scrnWidth, dmxScreen->scrnHeight,
+                     dmxScreen->scrnX, dmxScreen->scrnY,
+                     dmxScreen->rootWidth, dmxScreen->rootHeight,
+                     dmxScreen->rootX, dmxScreen->rootY,
+                     dmxScreen->whereX, dmxScreen->whereY,
+                     dmxScreen->where,
+                     dmxScreen->beWidth, dmxScreen->beHeight,
+                     dmxScreen->beDepth, dmxScreen->beBPP);
+    }
+
+    dmxComputeScreenOrigins();
+
+    for (i = 0; i < dmxNumScreens; i++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
+        dmxScreen->rootXOrigin = screenInfo.screens[i]->x;
+        dmxScreen->rootYOrigin = screenInfo.screens[i]->y;
+    }
+
+    dmxReInitOrigins();
+}
+
+/** Returns non-zero if the global \a x, \a y coordinate is on the
+ * screen window of the \a dmxScreen. */
+int
+dmxOnScreen(int x, int y, DMXScreenInfo * dmxScreen)
+{
+#if DMX_CURSOR_DEBUG > 1
+    dmxLog(dmxDebug,
+           "dmxOnScreen %d %d,%d (r=%dx%d%+d%+d@%d,%d s=%dx%d%+d%+d)\n",
+           dmxScreen->index, x, y,
+           dmxScreen->rootWidth, dmxScreen->rootHeight,
+           dmxScreen->rootX, dmxScreen->rootY,
+           dmxScreen->rootXOrigin, dmxScreen->rootYOrigin,
+           dmxScreen->scrnWidth, dmxScreen->scrnHeight,
+           dmxScreen->scrnX, dmxScreen->scrnY);
+#endif
+    if (x >= dmxScreen->rootXOrigin
+        && x < dmxScreen->rootXOrigin + dmxScreen->rootWidth
+        && y >= dmxScreen->rootYOrigin
+        && y < dmxScreen->rootYOrigin + dmxScreen->rootHeight)
+        return 1;
+    return 0;
+}
+
+/** Returns non-zero if \a a overlaps \a b. */
+static int
+dmxDoesOverlap(DMXScreenInfo * a, DMXScreenInfo * b)
+{
+    if (dmxOnScreen(a->rootXOrigin, a->rootYOrigin, b))
+        return 1;
+
+    if (dmxOnScreen(a->rootXOrigin, a->rootYOrigin + a->scrnWidth, b))
+        return 1;
+
+    if (dmxOnScreen(a->rootXOrigin + a->scrnHeight, a->rootYOrigin, b))
+        return 1;
+
+    if (dmxOnScreen(a->rootXOrigin + a->scrnHeight,
+                    a->rootYOrigin + a->scrnWidth, b))
+        return 1;
+
+    if (dmxOnScreen(b->rootXOrigin, b->rootYOrigin, a))
+        return 1;
+
+    if (dmxOnScreen(b->rootXOrigin, b->rootYOrigin + b->scrnWidth, a))
+        return 1;
+
+    if (dmxOnScreen(b->rootXOrigin + b->scrnHeight, b->rootYOrigin, a))
+        return 1;
+
+    if (dmxOnScreen(b->rootXOrigin + b->scrnHeight,
+                    b->rootYOrigin + b->scrnWidth, a))
+        return 1;
+
+    return 0;
+}
+
+/** Used with \a dmxInterateOverlap to print out a list of screens which
+ * overlap each other. */
+static void *
+dmxPrintOverlap(DMXScreenInfo * dmxScreen, void *closure)
+{
+    DMXScreenInfo *a = closure;
+
+    if (dmxScreen != a) {
+        if (dmxScreen->cursorNotShared)
+            dmxLogOutputCont(a, " [%d/%s]", dmxScreen->index, dmxScreen->name);
+        else
+            dmxLogOutputCont(a, " %d/%s", dmxScreen->index, dmxScreen->name);
+    }
+    return NULL;
+}
+
+/** Iterate over the screens which overlap with the \a start screen,
+ * calling \a f with the \a closure for each argument.  Often used with
+ * #dmxPrintOverlap. */
+static void *
+dmxIterateOverlap(DMXScreenInfo * start,
+                  void *(*f) (DMXScreenInfo * dmxScreen, void *), void *closure)
+{
+    DMXScreenInfo *pt;
+
+    if (!start->over)
+        return f(start, closure);
+
+    for (pt = start->over; /* condition at end of loop */ ; pt = pt->over) {
+        void *retval;
+
+        if ((retval = f(pt, closure)))
+            return retval;
+        if (pt == start)
+            break;
+    }
+    return NULL;
+}
+
+/** Used with #dmxPropertyIterate to determine if screen \a a is the
+ * same as the screen \a closure. */
+static void *
+dmxTestSameDisplay(DMXScreenInfo * a, void *closure)
+{
+    DMXScreenInfo *b = closure;
+
+    if (a == b)
+        return a;
+    return NULL;
+}
+
+/** Detects overlapping dmxScreens and creates circular lists.  This
+ * uses an O(dmxNumScreens^2) algorithm, but dmxNumScreens is < 100 and
+ * the computation only needs to be performed for every server
+ * generation or dynamic reconfiguration . */
+void
+dmxInitOverlap(void)
+{
+    int i, j;
+    DMXScreenInfo *a, *b, *pt;
+
+    for (i = 0; i < dmxNumScreens; i++)
+        dmxScreens[i].over = NULL;
+
+    for (i = 0; i < dmxNumScreens; i++) {
+        a = &dmxScreens[i];
+
+        for (j = i + 1; j < dmxNumScreens; j++) {
+            b = &dmxScreens[j];
+            if (b->over)
+                continue;
+
+            if (dmxDoesOverlap(a, b)) {
+                DMXDBG6("%d overlaps %d: a=%p %p b=%p %p\n",
+                        a->index, b->index, a, a->over, b, b->over);
+                b->over = (a->over ? a->over : a);
+                a->over = b;
+            }
+        }
+    }
+
+    for (i = 0; i < dmxNumScreens; i++) {
+        a = &dmxScreens[i];
+
+        if (!a->over)
+            continue;
+
+        /* Flag all pairs that are on same display */
+        for (pt = a->over; pt != a; pt = pt->over) {
+            if (dmxPropertyIterate(a, dmxTestSameDisplay, pt)) {
+                /* The ->over sets contain the transitive set of screens
+                 * that overlap.  For screens that are on the same
+                 * backend display, we only want to exclude pairs of
+                 * screens that mutually overlap on the backend display,
+                 * so we call dmxDoesOverlap, which is stricter than the
+                 * ->over set. */
+                if (!dmxDoesOverlap(a, pt))
+                    continue;
+                a->cursorNotShared = 1;
+                pt->cursorNotShared = 1;
+                dmxLog(dmxInfo,
+                       "Screen %d and %d overlap on %s\n",
+                       a->index, pt->index, a->name);
+            }
+        }
+    }
+
+    for (i = 0; i < dmxNumScreens; i++) {
+        a = &dmxScreens[i];
+
+        if (a->over) {
+            dmxLogOutput(a, "Overlaps");
+            dmxIterateOverlap(a, dmxPrintOverlap, a);
+            dmxLogOutputCont(a, "\n");
+        }
+    }
+}
+
+/** Create \a pCursor on the back-end associated with \a pScreen. */
+void
+dmxBECreateCursor(ScreenPtr pScreen, CursorPtr pCursor)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxCursorPrivPtr pCursorPriv = DMX_GET_CURSOR_PRIV(pCursor, pScreen);
+    CursorBitsPtr pBits = pCursor->bits;
+    Pixmap src, msk;
+    XColor fg, bg;
+    XImage *img;
+    XlibGC gc = NULL;
+    XGCValues v;
+    unsigned long m;
+    int i;
+
+    if (!pCursorPriv)
+        return;
+
+    m = GCFunction | GCPlaneMask | GCForeground | GCBackground | GCClipMask;
+    v.function = GXcopy;
+    v.plane_mask = AllPlanes;
+    v.foreground = 1L;
+    v.background = 0L;
+    v.clip_mask = None;
+
+    for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {
+        if (dmxScreen->bePixmapFormats[i].depth == 1) {
+            /* Create GC in the back-end servers */
+            gc = XCreateGC(dmxScreen->beDisplay, dmxScreen->scrnDefDrawables[i],
+                           m, &v);
+            break;
+        }
+    }
+    if (!gc)
+        dmxLog(dmxFatal, "dmxRealizeCursor: gc not initialized\n");
+
+    src = XCreatePixmap(dmxScreen->beDisplay, dmxScreen->scrnWin,
+                        pBits->width, pBits->height, 1);
+    msk = XCreatePixmap(dmxScreen->beDisplay, dmxScreen->scrnWin,
+                        pBits->width, pBits->height, 1);
+
+    img = XCreateImage(dmxScreen->beDisplay,
+                       dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual,
+                       1, XYBitmap, 0, (char *) pBits->source,
+                       pBits->width, pBits->height,
+                       BitmapPad(dmxScreen->beDisplay), 0);
+
+    XPutImage(dmxScreen->beDisplay, src, gc, img, 0, 0, 0, 0,
+              pBits->width, pBits->height);
+
+    XFree(img);
+
+    img = XCreateImage(dmxScreen->beDisplay,
+                       dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual,
+                       1, XYBitmap, 0, (char *) pBits->mask,
+                       pBits->width, pBits->height,
+                       BitmapPad(dmxScreen->beDisplay), 0);
+
+    XPutImage(dmxScreen->beDisplay, msk, gc, img, 0, 0, 0, 0,
+              pBits->width, pBits->height);
+
+    XFree(img);
+
+    fg.red = pCursor->foreRed;
+    fg.green = pCursor->foreGreen;
+    fg.blue = pCursor->foreBlue;
+
+    bg.red = pCursor->backRed;
+    bg.green = pCursor->backGreen;
+    bg.blue = pCursor->backBlue;
+
+    pCursorPriv->cursor = XCreatePixmapCursor(dmxScreen->beDisplay,
+                                              src, msk,
+                                              &fg, &bg,
+                                              pBits->xhot, pBits->yhot);
+
+    XFreePixmap(dmxScreen->beDisplay, src);
+    XFreePixmap(dmxScreen->beDisplay, msk);
+    XFreeGC(dmxScreen->beDisplay, gc);
+
+    dmxSync(dmxScreen, FALSE);
+}
+
+static Bool
+_dmxRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxCursorPrivPtr pCursorPriv;
+
+    DMXDBG2("_dmxRealizeCursor(%d,%p)\n", pScreen->myNum, pCursor);
+
+    DMX_SET_CURSOR_PRIV(pCursor, pScreen, malloc(sizeof(*pCursorPriv)));
+    if (!DMX_GET_CURSOR_PRIV(pCursor, pScreen))
+        return FALSE;
+
+    pCursorPriv = DMX_GET_CURSOR_PRIV(pCursor, pScreen);
+    pCursorPriv->cursor = (Cursor) 0;
+
+    if (!dmxScreen->beDisplay)
+        return TRUE;
+
+    dmxBECreateCursor(pScreen, pCursor);
+    return TRUE;
+}
+
+/** Free \a pCursor on the back-end associated with \a pScreen. */
+Bool
+dmxBEFreeCursor(ScreenPtr pScreen, CursorPtr pCursor)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxCursorPrivPtr pCursorPriv = DMX_GET_CURSOR_PRIV(pCursor, pScreen);
+
+    if (pCursorPriv) {
+        XFreeCursor(dmxScreen->beDisplay, pCursorPriv->cursor);
+        pCursorPriv->cursor = (Cursor) 0;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static Bool
+_dmxUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+
+    DMXDBG2("_dmxUnrealizeCursor(%d,%p)\n", pScreen->myNum, pCursor);
+
+    if (dmxScreen->beDisplay) {
+        if (dmxBEFreeCursor(pScreen, pCursor))
+            free(DMX_GET_CURSOR_PRIV(pCursor, pScreen));
+    }
+    DMX_SET_CURSOR_PRIV(pCursor, pScreen, NULL);
+
+    return TRUE;
+}
+
+static void
+_dmxMoveCursor(ScreenPtr pScreen, int x, int y)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    int newX = x + dmxScreen->rootX;
+    int newY = y + dmxScreen->rootY;
+
+    if (newX < 0)
+        newX = 0;
+    if (newY < 0)
+        newY = 0;
+
+    DMXDBG5("_dmxMoveCursor(%d,%d,%d) -> %d,%d\n",
+            pScreen->myNum, x, y, newX, newY);
+    if (dmxScreen->beDisplay) {
+        XWarpPointer(dmxScreen->beDisplay, None, dmxScreen->scrnWin,
+                     0, 0, 0, 0, newX, newY);
+        dmxSync(dmxScreen, TRUE);
+    }
+}
+
+static void
+_dmxSetCursor(ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+
+    DMXDBG4("_dmxSetCursor(%d,%p,%d,%d)\n", pScreen->myNum, pCursor, x, y);
+
+    if (pCursor) {
+        dmxCursorPrivPtr pCursorPriv = DMX_GET_CURSOR_PRIV(pCursor, pScreen);
+
+        if (pCursorPriv && dmxScreen->curCursor != pCursorPriv->cursor) {
+            if (dmxScreen->beDisplay)
+                XDefineCursor(dmxScreen->beDisplay, dmxScreen->scrnWin,
+                              pCursorPriv->cursor);
+            dmxScreen->cursor = pCursor;
+            dmxScreen->curCursor = pCursorPriv->cursor;
+            dmxScreen->cursorVisible = 1;
+        }
+        _dmxMoveCursor(pScreen, x, y);
+    }
+    else {
+        if (dmxScreen->beDisplay)
+            XDefineCursor(dmxScreen->beDisplay, dmxScreen->scrnWin,
+                          dmxScreen->noCursor);
+        dmxScreen->cursor = NULL;
+        dmxScreen->curCursor = (Cursor) 0;
+        dmxScreen->cursorVisible = 0;
+    }
+    if (dmxScreen->beDisplay)
+        dmxSync(dmxScreen, TRUE);
+}
+
+static Bool
+dmxRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
+{
+    DMXScreenInfo *start = &dmxScreens[pScreen->myNum];
+    DMXScreenInfo *pt;
+
+    if (!start->over || !dmxCursorDoMultiCursors || start->cursorNotShared)
+        return _dmxRealizeCursor(pScreen, pCursor);
+
+    for (pt = start->over; /* condition at end of loop */ ; pt = pt->over) {
+        if (pt->cursorNotShared)
+            continue;
+        _dmxRealizeCursor(screenInfo.screens[pt->index], pCursor);
+        if (pt == start)
+            break;
+    }
+    return TRUE;
+}
+
+static Bool
+dmxUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
+{
+    DMXScreenInfo *start = &dmxScreens[pScreen->myNum];
+    DMXScreenInfo *pt;
+
+    if (!start->over || !dmxCursorDoMultiCursors || start->cursorNotShared)
+        return _dmxUnrealizeCursor(pScreen, pCursor);
+
+    for (pt = start->over; /* condition at end of loop */ ; pt = pt->over) {
+        if (pt->cursorNotShared)
+            continue;
+        _dmxUnrealizeCursor(screenInfo.screens[pt->index], pCursor);
+        if (pt == start)
+            break;
+    }
+    return TRUE;
+}
+
+static CursorPtr
+dmxFindCursor(DMXScreenInfo * start)
+{
+    DMXScreenInfo *pt;
+
+    if (!start || !start->over)
+        return GetSpriteCursor(inputInfo.pointer);
+    for (pt = start->over; /* condition at end of loop */ ; pt = pt->over) {
+        if (pt->cursor)
+            return pt->cursor;
+        if (pt == start)
+            break;
+    }
+    return GetSpriteCursor(inputInfo.pointer);
+}
+
+/** Move the cursor to coordinates (\a x, \a y)on \a pScreen.  This
+ * function is usually called via #dmxPointerSpriteFuncs, except during
+ * reconfiguration when the cursor is repositioned to force an update on
+ * newley overlapping screens and on screens that no longer overlap.
+ *
+ * The coords (x,y) are in global coord space.  We'll loop over the
+ * back-end screens and see if they contain the global coord.  If so, call
+ * _dmxMoveCursor() (XWarpPointer) to position the pointer on that screen.
+ */
+void
+dmxMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+    DMXScreenInfo *start = &dmxScreens[pScreen->myNum];
+    DMXScreenInfo *pt;
+
+    DMXDBG3("dmxMoveCursor(%d,%d,%d)\n", pScreen->myNum, x, y);
+
+    if (!start->over || !dmxCursorDoMultiCursors || start->cursorNotShared) {
+        _dmxMoveCursor(pScreen, x, y);
+        return;
+    }
+
+    for (pt = start->over; /* condition at end of loop */ ; pt = pt->over) {
+        if (pt->cursorNotShared)
+            continue;
+        if (dmxOnScreen(x + start->rootXOrigin, y + start->rootYOrigin, pt)) {
+            if ( /* pt != start && */ !pt->cursorVisible) {
+                if (!pt->cursor) {
+                    /* This only happens during
+                     * reconfiguration when a new overlap
+                     * occurs. */
+                    CursorPtr pCursor;
+
+                    if ((pCursor = dmxFindCursor(start)))
+                        _dmxRealizeCursor(screenInfo.screens[pt->index],
+                                          pt->cursor = pCursor);
+
+                }
+                _dmxSetCursor(screenInfo.screens[pt->index],
+                              pt->cursor,
+                              x + start->rootXOrigin - pt->rootXOrigin,
+                              y + start->rootYOrigin - pt->rootYOrigin);
+            }
+            _dmxMoveCursor(screenInfo.screens[pt->index],
+                           x + start->rootXOrigin - pt->rootXOrigin,
+                           y + start->rootYOrigin - pt->rootYOrigin);
+        }
+        else if ( /* pt != start && */ pt->cursorVisible) {
+            _dmxSetCursor(screenInfo.screens[pt->index],
+                          NULL,
+                          x + start->rootXOrigin - pt->rootXOrigin,
+                          y + start->rootYOrigin - pt->rootYOrigin);
+        }
+        if (pt == start)
+            break;
+    }
+}
+
+static void
+dmxSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x,
+             int y)
+{
+    DMXScreenInfo *start = &dmxScreens[pScreen->myNum];
+    DMXScreenInfo *pt;
+    int GX, GY, gx, gy;
+
+    DMXDBG5("dmxSetCursor(%d %p, %p,%d,%d)\n",
+            pScreen->myNum, start, pCursor, x, y);
+
+    /* We do this check here because of two cases:
+     *
+     * 1) if a client calls XWarpPointer()
+     * and Xinerama is not running, we can
+     * have mi's notion of the pointer
+     * position out of phase with DMX's
+     * notion.
+     *
+     * 2) if a down button is held while the
+     * cursor moves outside the root window,
+     * mi's notion of the pointer position
+     * is out of phase with DMX's notion and
+     * the cursor can remain visible when it
+     * shouldn't be. */
+
+    dmxGetGlobalPosition(&GX, &GY);
+    gx = start->rootXOrigin + x;
+    gy = start->rootYOrigin + y;
+    if (x && y && (GX != gx || GY != gy))
+        dmxCoreMotion(NULL, gx, gy, 0, DMX_NO_BLOCK);
+
+    if (!start->over || !dmxCursorDoMultiCursors || start->cursorNotShared) {
+        _dmxSetCursor(pScreen, pCursor, x, y);
+        return;
+    }
+
+    for (pt = start->over; /* condition at end of loop */ ; pt = pt->over) {
+        if (pt->cursorNotShared)
+            continue;
+        if (dmxOnScreen(x + start->rootXOrigin, y + start->rootYOrigin, pt)) {
+            _dmxSetCursor(screenInfo.screens[pt->index], pCursor,
+                          x + start->rootXOrigin - pt->rootXOrigin,
+                          y + start->rootYOrigin - pt->rootYOrigin);
+        }
+        else {
+            _dmxSetCursor(screenInfo.screens[pt->index], NULL,
+                          x + start->rootXOrigin - pt->rootXOrigin,
+                          y + start->rootYOrigin - pt->rootYOrigin);
+        }
+        if (pt == start)
+            break;
+    }
+}
+
+/** This routine is used by the backend input routines to hide the
+ * cursor on a screen that is being used for relative input.  \see
+ * dmxbackend.c */
+void
+dmxHideCursor(DMXScreenInfo * dmxScreen)
+{
+    int x, y;
+    ScreenPtr pScreen = screenInfo.screens[dmxScreen->index];
+
+    dmxGetGlobalPosition(&x, &y);
+    _dmxSetCursor(pScreen, NULL, x, y);
+}
+
+/** This routine is called during reconfiguration to make sure the
+ * cursor is visible. */
+void
+dmxCheckCursor(void)
+{
+    int i;
+    int x, y;
+    ScreenPtr pScreen;
+    DMXScreenInfo *firstScreen;
+
+    dmxGetGlobalPosition(&x, &y);
+    firstScreen = dmxFindFirstScreen(x, y);
+
+    DMXDBG2("dmxCheckCursor %d %d\n", x, y);
+    for (i = 0; i < dmxNumScreens; i++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
+        pScreen = screenInfo.screens[dmxScreen->index];
+
+        if (!dmxOnScreen(x, y, dmxScreen)) {
+            if (firstScreen &&
+                i == miPointerGetScreen(inputInfo.pointer)->myNum)
+                 miPointerSetScreen(inputInfo.pointer, firstScreen->index, x,
+                                    y);
+            _dmxSetCursor(pScreen, NULL, x - dmxScreen->rootXOrigin,
+                          y - dmxScreen->rootYOrigin);
+        }
+        else {
+            if (!dmxScreen->cursor) {
+                CursorPtr pCursor;
+
+                if ((pCursor = dmxFindCursor(dmxScreen))) {
+                    _dmxRealizeCursor(pScreen, dmxScreen->cursor = pCursor);
+                }
+            }
+            _dmxSetCursor(pScreen, dmxScreen->cursor,
+                          x - dmxScreen->rootXOrigin,
+                          y - dmxScreen->rootYOrigin);
+        }
+    }
+    DMXDBG2("   leave dmxCheckCursor %d %d\n", x, y);
+}
+
+static Bool
+dmxDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScr)
+{
+    return TRUE;
+}
+
+static void
+dmxDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScr)
+{
+}
+
+miPointerSpriteFuncRec dmxPointerSpriteFuncs = {
+    dmxRealizeCursor,
+    dmxUnrealizeCursor,
+    dmxSetCursor,
+    dmxMoveCursor,
+    dmxDeviceCursorInitialize,
+    dmxDeviceCursorCleanup
+};
diff --git a/xorg-server/hw/dmx/dmxdpms.c b/xorg-server/hw/dmx/dmxdpms.c
index 2af160556..d53a3d998 100644
--- a/xorg-server/hw/dmx/dmxdpms.c
+++ b/xorg-server/hw/dmx/dmxdpms.c
@@ -54,36 +54,37 @@
 #include <X11/extensions/dpms.h>
 
 static unsigned long dpmsGeneration = 0;
-static Bool          dpmsSupported  = TRUE;
+static Bool dpmsSupported = TRUE;
 
-static void _dmxDPMSInit(DMXScreenInfo *dmxScreen)
+static void
+_dmxDPMSInit(DMXScreenInfo * dmxScreen)
 {
-    int        event_base, error_base;
-    int        major, minor;
-    CARD16     level, standby, suspend, off;
-    BOOL       state;
+    int event_base, error_base;
+    int major, minor;
+    CARD16 level, standby, suspend, off;
+    BOOL state;
     const char *monitor;
 
     if (dpmsGeneration != serverGeneration) {
-        dpmsSupported  = TRUE;  /* On unless a backend doesn't support it */
+        dpmsSupported = TRUE;   /* On unless a backend doesn't support it */
         dpmsGeneration = serverGeneration;
     }
 
 #ifdef DPMSExtension
-    if (DPMSDisabledSwitch) dpmsSupported = FALSE; /* -dpms turns off */
+    if (DPMSDisabledSwitch)
+        dpmsSupported = FALSE;  /* -dpms turns off */
 #endif
 
     dmxScreen->dpmsCapable = 0;
-    
+
     if (!dmxScreen->beDisplay) {
         dmxLogOutput(dmxScreen,
-		     "Cannot determine if DPMS supported (detached screen)\n");
+                     "Cannot determine if DPMS supported (detached screen)\n");
         dpmsSupported = FALSE;
         return;
     }
 
-    if (!DPMSQueryExtension(dmxScreen->beDisplay,
-                            &event_base, &error_base)) {
+    if (!DPMSQueryExtension(dmxScreen->beDisplay, &event_base, &error_base)) {
         dmxLogOutput(dmxScreen, "DPMS not supported\n");
         dpmsSupported = FALSE;
         return;
@@ -106,19 +107,29 @@ static void _dmxDPMSInit(DMXScreenInfo *dmxScreen)
     DPMSEnable(dmxScreen->beDisplay);
     DPMSForceLevel(dmxScreen->beDisplay, DPMSModeOn);
     dmxScreen->dpmsCapable = 1;
-    dmxScreen->dpmsEnabled = !!state;
+    dmxScreen->dpmsEnabled = ! !state;
     dmxScreen->dpmsStandby = standby;
     dmxScreen->dpmsSuspend = suspend;
-    dmxScreen->dpmsOff     = off;
+    dmxScreen->dpmsOff = off;
 
     switch (level) {
-    case DPMSModeOn:      monitor = "on";      break;
-    case DPMSModeStandby: monitor = "standby"; break;
-    case DPMSModeSuspend: monitor = "suspend"; break;
-    case DPMSModeOff:     monitor = "off";     break;
-    default:              monitor = "unknown"; break;
+    case DPMSModeOn:
+        monitor = "on";
+        break;
+    case DPMSModeStandby:
+        monitor = "standby";
+        break;
+    case DPMSModeSuspend:
+        monitor = "suspend";
+        break;
+    case DPMSModeOff:
+        monitor = "off";
+        break;
+    default:
+        monitor = "unknown";
+        break;
     }
-        
+
     dmxLogOutput(dmxScreen,
                  "DPMS %d.%d (%s, %s, %d %d %d)\n",
                  major, minor, monitor, state ? "enabled" : "disabled",
@@ -127,86 +138,98 @@ static void _dmxDPMSInit(DMXScreenInfo *dmxScreen)
 
 /** Initialize DPMS support.  We save the current settings and turn off
  * DPMS.  The settings are restored in #dmxDPMSTerm. */
-void dmxDPMSInit(DMXScreenInfo *dmxScreen)
+void
+dmxDPMSInit(DMXScreenInfo * dmxScreen)
 {
-    int    interval, preferBlanking, allowExposures;
+    int interval, preferBlanking, allowExposures;
 
-                                /* Turn off DPMS */
+    /* Turn off DPMS */
     _dmxDPMSInit(dmxScreen);
 
     if (!dmxScreen->beDisplay)
-	return;
+        return;
 
-                                /* Turn off screen saver */
+    /* Turn off screen saver */
     XGetScreenSaver(dmxScreen->beDisplay, &dmxScreen->savedTimeout, &interval,
-		    &preferBlanking, &allowExposures);
+                    &preferBlanking, &allowExposures);
     XSetScreenSaver(dmxScreen->beDisplay, 0, interval,
-		    preferBlanking, allowExposures);
+                    preferBlanking, allowExposures);
     XResetScreenSaver(dmxScreen->beDisplay);
     dmxSync(dmxScreen, FALSE);
 }
 
 /** Terminate DPMS support on \a dmxScreen.  We restore the settings
  * saved in #dmxDPMSInit. */
-void dmxDPMSTerm(DMXScreenInfo *dmxScreen)
+void
+dmxDPMSTerm(DMXScreenInfo * dmxScreen)
 {
-    int    timeout, interval, preferBlanking, allowExposures;
+    int timeout, interval, preferBlanking, allowExposures;
 
     if (!dmxScreen->beDisplay)
-	return;
+        return;
 
     XGetScreenSaver(dmxScreen->beDisplay, &timeout, &interval,
-		    &preferBlanking, &allowExposures);
+                    &preferBlanking, &allowExposures);
     XSetScreenSaver(dmxScreen->beDisplay, dmxScreen->savedTimeout, interval,
-		    preferBlanking, allowExposures);
+                    preferBlanking, allowExposures);
     if (dmxScreen->dpmsCapable) {
-                                /* Restore saved state */
+        /* Restore saved state */
         DPMSForceLevel(dmxScreen->beDisplay, DPMSModeOn);
         DPMSSetTimeouts(dmxScreen->beDisplay, dmxScreen->dpmsStandby,
                         dmxScreen->dpmsSuspend, dmxScreen->dpmsOff);
-        if (dmxScreen->dpmsEnabled) DPMSEnable(dmxScreen->beDisplay);
-        else                        DPMSDisable(dmxScreen->beDisplay);
+        if (dmxScreen->dpmsEnabled)
+            DPMSEnable(dmxScreen->beDisplay);
+        else
+            DPMSDisable(dmxScreen->beDisplay);
     }
     dmxSync(dmxScreen, FALSE);
 }
 
 /** Called when activity is detected so that DPMS power-saving mode can
  * be deactivated. */
-void dmxDPMSWakeup(void)
+void
+dmxDPMSWakeup(void)
 {
     if (screenIsSaved == SCREEN_SAVER_ON)
         dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
 #ifdef DPMSExtension
-    if (DPMSPowerLevel) DPMSSet(serverClient, 0);
+    if (DPMSPowerLevel)
+        DPMSSet(serverClient, 0);
 #endif
 }
 
 #ifdef DPMSExtension
 /** This is called on each server generation.  It should determine if
  * DPMS is supported on all of the backends and, if so, return TRUE. */
-Bool DPMSSupported(void)
+Bool
+DPMSSupported(void)
 {
     return dpmsSupported;
 }
 
 /** This is used by clients (e.g., xset) to set the DPMS level. */
-int DPMSSet(ClientPtr client, int level)
+int
+DPMSSet(ClientPtr client, int level)
 {
     int i;
 
-    if (!dpmsSupported) return Success;
+    if (!dpmsSupported)
+        return Success;
+
+    if (level < 0)
+        level = DPMSModeOn;
+    if (level > 3)
+        level = DPMSModeOff;
 
-    if (level < 0) level = DPMSModeOn;
-    if (level > 3) level = DPMSModeOff;
-    
     DPMSPowerLevel = level;
 
     for (i = 0; i < dmxNumScreens; i++) {
         DMXScreenInfo *dmxScreen = &dmxScreens[i];
-	if (dmxScreen->beDisplay) {
-	    DPMSForceLevel(dmxScreen->beDisplay, level);
-	    dmxSync(dmxScreen, FALSE);
-	}
+
+        if (dmxScreen->beDisplay) {
+            DPMSForceLevel(dmxScreen->beDisplay, level);
+            dmxSync(dmxScreen, FALSE);
+        }
     }
     return Success;
 }
diff --git a/xorg-server/hw/dmx/dmxextension.c b/xorg-server/hw/dmx/dmxextension.c
index 80d11ee89..faa28a590 100644
--- a/xorg-server/hw/dmx/dmxextension.c
+++ b/xorg-server/hw/dmx/dmxextension.c
@@ -60,86 +60,89 @@
 #include "input/dmxinputinit.h"
 
 #include "windowstr.h"
-#include "inputstr.h"                 /* For DeviceIntRec */
-#include <X11/extensions/dmxproto.h>  /* For DMX_BAD_* */
+#include "inputstr.h"           /* For DeviceIntRec */
+#include <X11/extensions/dmxproto.h>    /* For DMX_BAD_* */
 #include "cursorstr.h"
 
 /* The default font is declared in dix/globals.c, but is not included in
  * _any_ header files. */
-extern FontPtr  defaultFont;
-    
+extern FontPtr defaultFont;
+
 /** This routine provides information to the DMX protocol extension
  * about a particular screen. */
-Bool dmxGetScreenAttributes(int physical, DMXScreenAttributesPtr attr)
+Bool
+dmxGetScreenAttributes(int physical, DMXScreenAttributesPtr attr)
 {
     DMXScreenInfo *dmxScreen;
 
-    if (physical < 0 || physical >= dmxNumScreens) return FALSE;
+    if (physical < 0 || physical >= dmxNumScreens)
+        return FALSE;
 
     dmxScreen = &dmxScreens[physical];
-    attr->displayName         = dmxScreen->name;
+    attr->displayName = dmxScreen->name;
 #ifdef PANORAMIX
-    attr->logicalScreen       = noPanoramiXExtension ? dmxScreen->index : 0;
+    attr->logicalScreen = noPanoramiXExtension ? dmxScreen->index : 0;
 #else
-    attr->logicalScreen       = dmxScreen->index;
+    attr->logicalScreen = dmxScreen->index;
 #endif
 
-    attr->screenWindowWidth   = dmxScreen->scrnWidth;
-    attr->screenWindowHeight  = dmxScreen->scrnHeight;
+    attr->screenWindowWidth = dmxScreen->scrnWidth;
+    attr->screenWindowHeight = dmxScreen->scrnHeight;
     attr->screenWindowXoffset = dmxScreen->scrnX;
     attr->screenWindowYoffset = dmxScreen->scrnY;
 
-    attr->rootWindowWidth     = dmxScreen->rootWidth;
-    attr->rootWindowHeight    = dmxScreen->rootHeight;
-    attr->rootWindowXoffset   = dmxScreen->rootX;
-    attr->rootWindowYoffset   = dmxScreen->rootY;
+    attr->rootWindowWidth = dmxScreen->rootWidth;
+    attr->rootWindowHeight = dmxScreen->rootHeight;
+    attr->rootWindowXoffset = dmxScreen->rootX;
+    attr->rootWindowYoffset = dmxScreen->rootY;
 
-    attr->rootWindowXorigin   = dmxScreen->rootXOrigin;
-    attr->rootWindowYorigin   = dmxScreen->rootYOrigin;
+    attr->rootWindowXorigin = dmxScreen->rootXOrigin;
+    attr->rootWindowYorigin = dmxScreen->rootYOrigin;
 
     return TRUE;
 }
 
 /** This routine provides information to the DMX protocol extension
  * about a particular window. */
-Bool dmxGetWindowAttributes(WindowPtr pWindow, DMXWindowAttributesPtr attr)
+Bool
+dmxGetWindowAttributes(WindowPtr pWindow, DMXWindowAttributesPtr attr)
 {
     dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
 
-    attr->screen         = pWindow->drawable.pScreen->myNum;
-    attr->window         = pWinPriv->window;
+    attr->screen = pWindow->drawable.pScreen->myNum;
+    attr->window = pWinPriv->window;
 
-    attr->pos.x          = pWindow->drawable.x;
-    attr->pos.y          = pWindow->drawable.y;
-    attr->pos.width      = pWindow->drawable.width;
-    attr->pos.height     = pWindow->drawable.height;
+    attr->pos.x = pWindow->drawable.x;
+    attr->pos.y = pWindow->drawable.y;
+    attr->pos.width = pWindow->drawable.width;
+    attr->pos.height = pWindow->drawable.height;
 
     if (!pWinPriv->window || pWinPriv->offscreen) {
-        attr->vis.x      = 0;
-        attr->vis.y      = 0;
+        attr->vis.x = 0;
+        attr->vis.y = 0;
         attr->vis.height = 0;
-        attr->vis.width  = 0;
+        attr->vis.width = 0;
         return pWinPriv->window ? TRUE : FALSE;
     }
 
-                                /* Compute display-relative coordinates */
-    attr->vis.x          = pWindow->drawable.x;
-    attr->vis.y          = pWindow->drawable.y;
-    attr->vis.width      = pWindow->drawable.width;
-    attr->vis.height     = pWindow->drawable.height;
+    /* Compute display-relative coordinates */
+    attr->vis.x = pWindow->drawable.x;
+    attr->vis.y = pWindow->drawable.y;
+    attr->vis.width = pWindow->drawable.width;
+    attr->vis.height = pWindow->drawable.height;
 
     if (attr->pos.x < 0) {
-        attr->vis.x     -= attr->pos.x;
-        attr->vis.width  = attr->pos.x + attr->pos.width - attr->vis.x;
+        attr->vis.x -= attr->pos.x;
+        attr->vis.width = attr->pos.x + attr->pos.width - attr->vis.x;
     }
     if (attr->pos.x + attr->pos.width > pWindow->drawable.pScreen->width) {
         if (attr->pos.x < 0)
-            attr->vis.width  = pWindow->drawable.pScreen->width;
+            attr->vis.width = pWindow->drawable.pScreen->width;
         else
-            attr->vis.width  = pWindow->drawable.pScreen->width - attr->pos.x;
+            attr->vis.width = pWindow->drawable.pScreen->width - attr->pos.x;
     }
     if (attr->pos.y < 0) {
-        attr->vis.y     -= attr->pos.y;
+        attr->vis.y -= attr->pos.y;
         attr->vis.height = attr->pos.y + attr->pos.height - attr->vis.y;
     }
     if (attr->pos.y + attr->pos.height > pWindow->drawable.pScreen->height) {
@@ -149,29 +152,32 @@ Bool dmxGetWindowAttributes(WindowPtr pWindow, DMXWindowAttributesPtr attr)
             attr->vis.height = pWindow->drawable.pScreen->height - attr->pos.y;
     }
 
-                                /* Convert to window-relative coordinates */
+    /* Convert to window-relative coordinates */
     attr->vis.x -= attr->pos.x;
     attr->vis.y -= attr->pos.y;
 
     return TRUE;
 }
 
-void dmxGetDesktopAttributes(DMXDesktopAttributesPtr attr)
+void
+dmxGetDesktopAttributes(DMXDesktopAttributesPtr attr)
 {
-    attr->width  = dmxGlobalWidth;
+    attr->width = dmxGlobalWidth;
     attr->height = dmxGlobalHeight;
-    attr->shiftX = 0;            /* NOTE: The upper left hand corner of */
-    attr->shiftY = 0;            /*       the desktop is always <0,0>. */
+    attr->shiftX = 0;           /* NOTE: The upper left hand corner of */
+    attr->shiftY = 0;           /*       the desktop is always <0,0>. */
 }
 
 /** Return the total number of devices, not just #dmxNumInputs.  The
  * number returned should be the same as that returned by
  * XListInputDevices. */
-int dmxGetInputCount(void)
+int
+dmxGetInputCount(void)
 {
     int i, total;
-    
-    for (total = i = 0; i < dmxNumInputs; i++) total += dmxInputs[i].numDevs;
+
+    for (total = i = 0; i < dmxNumInputs; i++)
+        total += dmxInputs[i].numDevs;
     return total;
 }
 
@@ -179,38 +185,42 @@ int dmxGetInputCount(void)
  * information is primarily for the #ProcDMXGetInputAttributes()
  * function, which does not have access to the appropriate data
  * structure. */
-int dmxGetInputAttributes(int deviceId, DMXInputAttributesPtr attr)
+int
+dmxGetInputAttributes(int deviceId, DMXInputAttributesPtr attr)
 {
-    int          i, j;
+    int i, j;
     DMXInputInfo *dmxInput;
 
-    if (deviceId < 0) return -1;
+    if (deviceId < 0)
+        return -1;
     for (i = 0; i < dmxNumInputs; i++) {
         dmxInput = &dmxInputs[i];
         for (j = 0; j < dmxInput->numDevs; j++) {
             DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[j];
-            if (deviceId != dmxLocal->pDevice->id) continue;
-            attr->isCore             = !!dmxLocal->isCore;
-            attr->sendsCore          = !!dmxLocal->sendsCore;
-            attr->detached           = !!dmxInput->detached;
-            attr->physicalScreen     = -1;
-            attr->physicalId         = -1;
-            attr->name               = NULL;
+
+            if (deviceId != dmxLocal->pDevice->id)
+                continue;
+            attr->isCore = ! !dmxLocal->isCore;
+            attr->sendsCore = ! !dmxLocal->sendsCore;
+            attr->detached = ! !dmxInput->detached;
+            attr->physicalScreen = -1;
+            attr->physicalId = -1;
+            attr->name = NULL;
             switch (dmxLocal->extType) {
             case DMX_LOCAL_TYPE_LOCAL:
-                attr->inputType      = 0;
+                attr->inputType = 0;
                 break;
             case DMX_LOCAL_TYPE_CONSOLE:
-                attr->inputType      = 1;
-                attr->name           = dmxInput->name;
-                attr->physicalId     = dmxLocal->deviceId;
+                attr->inputType = 1;
+                attr->name = dmxInput->name;
+                attr->physicalId = dmxLocal->deviceId;
                 break;
             case DMX_LOCAL_TYPE_BACKEND:
             case DMX_LOCAL_TYPE_COMMON:
-                attr->inputType      = 2;
+                attr->inputType = 2;
                 attr->physicalScreen = dmxInput->scrnIdx;
-                attr->name           = dmxInput->name;
-                attr->physicalId     = dmxLocal->deviceId;
+                attr->name = dmxInput->name;
+                attr->physicalId = dmxLocal->deviceId;
                 break;
             }
             return 0;           /* Success */
@@ -220,9 +230,10 @@ int dmxGetInputAttributes(int deviceId, DMXInputAttributesPtr attr)
 }
 
 /** Reinitialized the cursor boundaries. */
-static void dmxAdjustCursorBoundaries(void)
+static void
+dmxAdjustCursorBoundaries(void)
 {
-    int           i;
+    int i;
 
     dmxReInitOrigins();
     dmxInitOverlap();
@@ -230,28 +241,33 @@ static void dmxAdjustCursorBoundaries(void)
     dmxConnectionBlockCallback();
     for (i = 0; i < dmxNumInputs; i++) {
         DMXInputInfo *dmxInput = &dmxInputs[i];
-	if (!dmxInput->detached) dmxInputReInit(dmxInput);
+
+        if (!dmxInput->detached)
+            dmxInputReInit(dmxInput);
     }
 
     dmxCheckCursor();
 
     for (i = 0; i < dmxNumInputs; i++) {
         DMXInputInfo *dmxInput = &dmxInputs[i];
-	if (!dmxInput->detached) dmxInputLateReInit(dmxInput);
+
+        if (!dmxInput->detached)
+            dmxInputLateReInit(dmxInput);
     }
 }
 
 /** Add an input with the specified attributes.  If the input is added,
  * the physical id is returned in \a deviceId. */
-int dmxAddInput(DMXInputAttributesPtr attr, int *id)
+int
+dmxAddInput(DMXInputAttributesPtr attr, int *id)
 {
     int retcode = BadValue;
 
     if (attr->inputType == 1)   /* console */
         retcode = dmxInputAttachConsole(attr->name, attr->sendsCore, id);
-    else if (attr->inputType == 2)   /* backend */
+    else if (attr->inputType == 2)      /* backend */
         retcode = dmxInputAttachBackend(attr->physicalScreen,
-                                        attr->sendsCore,id);
+                                        attr->sendsCore, id);
 
     if (retcode == Success) {
         /* Adjust the cursor boundaries */
@@ -265,7 +281,8 @@ int dmxAddInput(DMXInputAttributesPtr attr, int *id)
 }
 
 /** Remove the input with physical id \a id. */
-int dmxRemoveInput(int id)
+int
+dmxRemoveInput(int id)
 {
     return dmxInputDetachId(id);
 }
@@ -273,46 +290,52 @@ int dmxRemoveInput(int id)
 /** Return the value of #dmxNumScreens -- the total number of backend
  * screens in use (these are logical screens and may be larger than the
  * number of backend displays). */
-unsigned long dmxGetNumScreens(void)
+unsigned long
+dmxGetNumScreens(void)
 {
     return dmxNumScreens;
 }
 
 /** Make sure that #dmxCreateAndRealizeWindow has been called for \a
  * pWindow. */
-void dmxForceWindowCreation(WindowPtr pWindow)
+void
+dmxForceWindowCreation(WindowPtr pWindow)
 {
     dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    if (!pWinPriv->window) dmxCreateAndRealizeWindow(pWindow, TRUE);
+
+    if (!pWinPriv->window)
+        dmxCreateAndRealizeWindow(pWindow, TRUE);
 }
 
 /** Flush pending syncs for all screens. */
-void dmxFlushPendingSyncs(void)
+void
+dmxFlushPendingSyncs(void)
 {
     dmxSync(NULL, TRUE);
 }
 
 /** Update DMX's screen resources to match those of the newly moved
  *  and/or resized "root" window. */
-void dmxUpdateScreenResources(ScreenPtr pScreen, int x, int y, int w, int h)
+void
+dmxUpdateScreenResources(ScreenPtr pScreen, int x, int y, int w, int h)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    WindowPtr      pRoot     = pScreen->root;
-    WindowPtr      pChild;
-    Bool           anyMarked = FALSE;
+    WindowPtr pRoot = pScreen->root;
+    WindowPtr pChild;
+    Bool anyMarked = FALSE;
 
     /* Handle special case where width and/or height are zero */
     if (w == 0 || h == 0) {
-	w = 1;
-	h = 1;
+        w = 1;
+        h = 1;
     }
 
     /* Change screen size */
-    pScreen->width  = w;
+    pScreen->width = w;
     pScreen->height = h;
 
     /* Reset the root window's drawable's size */
-    pRoot->drawable.width  = w;
+    pRoot->drawable.width = w;
     pRoot->drawable.height = h;
 
     /* Set the root window's new winSize and borderSize */
@@ -328,15 +351,15 @@ void dmxUpdateScreenResources(ScreenPtr pScreen, int x, int y, int w, int h)
 
     /* Recompute this screen's mmWidth & mmHeight */
     pScreen->mmWidth =
-	(w * 254 + dmxScreen->beXDPI * 5) / (dmxScreen->beXDPI * 10);
+        (w * 254 + dmxScreen->beXDPI * 5) / (dmxScreen->beXDPI * 10);
     pScreen->mmHeight =
-	(h * 254 + dmxScreen->beYDPI * 5) / (dmxScreen->beYDPI * 10);
+        (h * 254 + dmxScreen->beYDPI * 5) / (dmxScreen->beYDPI * 10);
 
     /* Recompute this screen's window's clip rects as follows: */
     /*   1. Mark all of root's children's windows */
     for (pChild = pRoot->firstChild; pChild; pChild = pChild->nextSib)
-	anyMarked |= pScreen->MarkOverlappedWindows(pChild, pChild,
-						    (WindowPtr *)NULL);
+        anyMarked |= pScreen->MarkOverlappedWindows(pChild, pChild,
+                                                    (WindowPtr *) NULL);
 
     /*   2. Set the root window's borderClip */
     pRoot->borderClip.extents.x1 = 0;
@@ -346,27 +369,28 @@ void dmxUpdateScreenResources(ScreenPtr pScreen, int x, int y, int w, int h)
 
     /*   3. Set the root window's clipList */
     if (anyMarked) {
-	/* If any windows have been marked, set the root window's
-	 * clipList to be broken since it will be recalculated in
-	 * ValidateTree()
-	 */
-	RegionBreak(&pRoot->clipList);
-    } else {
-	/* Otherwise, we just set it directly since there are no
-	 * windows visible on this screen
-	 */
-	pRoot->clipList.extents.x1 = 0;
-	pRoot->clipList.extents.y1 = 0;
-	pRoot->clipList.extents.x2 = w;
-	pRoot->clipList.extents.y2 = h;
+        /* If any windows have been marked, set the root window's
+         * clipList to be broken since it will be recalculated in
+         * ValidateTree()
+         */
+        RegionBreak(&pRoot->clipList);
+    }
+    else {
+        /* Otherwise, we just set it directly since there are no
+         * windows visible on this screen
+         */
+        pRoot->clipList.extents.x1 = 0;
+        pRoot->clipList.extents.y1 = 0;
+        pRoot->clipList.extents.x2 = w;
+        pRoot->clipList.extents.y2 = h;
     }
 
     /*   4. Revalidate all clip rects and generate expose events */
     if (anyMarked) {
-	pScreen->ValidateTree(pRoot, NULL, VTBroken);
-	pScreen->HandleExposures(pRoot);
-	if (pScreen->PostValidateTree)
-	    pScreen->PostValidateTree(pRoot, NULL, VTBroken);
+        pScreen->ValidateTree(pRoot, NULL, VTBroken);
+        pScreen->HandleExposures(pRoot);
+        if (pScreen->PostValidateTree)
+            pScreen->PostValidateTree(pRoot, NULL, VTBroken);
     }
 }
 
@@ -375,72 +399,71 @@ void dmxUpdateScreenResources(ScreenPtr pScreen, int x, int y, int w, int h)
 
 /** Change the "screen" window attributes by resizing the actual window
  *  on the back-end display (if necessary). */
-static void dmxConfigureScreenWindow(int idx,
-				     int x, int y, int w, int h)
+static void
+dmxConfigureScreenWindow(int idx, int x, int y, int w, int h)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[idx];
-    ScreenPtr      pScreen   = screenInfo.screens[idx];
+    ScreenPtr pScreen = screenInfo.screens[idx];
 
     /* Resize "screen" window */
-    if (dmxScreen->scrnX      != x ||
-	dmxScreen->scrnY      != y ||
-	dmxScreen->scrnWidth  != w ||
-	dmxScreen->scrnHeight != h) {
-	dmxResizeScreenWindow(pScreen, x, y, w, h);
+    if (dmxScreen->scrnX != x ||
+        dmxScreen->scrnY != y ||
+        dmxScreen->scrnWidth != w || dmxScreen->scrnHeight != h) {
+        dmxResizeScreenWindow(pScreen, x, y, w, h);
     }
 
     /* Change "screen" window values */
-    dmxScreen->scrnX      = x;
-    dmxScreen->scrnY      = y;
-    dmxScreen->scrnWidth  = w;
+    dmxScreen->scrnX = x;
+    dmxScreen->scrnY = y;
+    dmxScreen->scrnWidth = w;
     dmxScreen->scrnHeight = h;
 }
-				     
+
 /** Change the "root" window position and size by resizing the actual
  *  window on the back-end display (if necessary) and updating all of
  *  DMX's resources by calling #dmxUpdateScreenResources. */
-static void dmxConfigureRootWindow(int idx, int x, int y, int w, int h)
+static void
+dmxConfigureRootWindow(int idx, int x, int y, int w, int h)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[idx];
-    WindowPtr      pRoot     = screenInfo.screens[idx]->root;
+    WindowPtr pRoot = screenInfo.screens[idx]->root;
 
     /* NOTE: Either this function or the ones that it calls must handle
      * the case where w == 0 || h == 0.  Currently, the functions that
      * this one calls handle that case. */
 
     /* 1. Resize "root" window */
-    if (dmxScreen->rootX      != x ||
-	dmxScreen->rootY      != y ||
-	dmxScreen->rootWidth  != w ||
-	dmxScreen->rootHeight != h) {
-	dmxResizeRootWindow(pRoot, x, y, w, h);
+    if (dmxScreen->rootX != x ||
+        dmxScreen->rootY != y ||
+        dmxScreen->rootWidth != w || dmxScreen->rootHeight != h) {
+        dmxResizeRootWindow(pRoot, x, y, w, h);
     }
 
     /* 2. Update all of the screen's resources associated with this root
      *    window */
-    if (dmxScreen->rootWidth  != w ||
-	dmxScreen->rootHeight != h) {
-	dmxUpdateScreenResources(screenInfo.screens[idx], x, y, w, h);
+    if (dmxScreen->rootWidth != w || dmxScreen->rootHeight != h) {
+        dmxUpdateScreenResources(screenInfo.screens[idx], x, y, w, h);
     }
 
     /* Change "root" window values */
-    dmxScreen->rootX      = x;
-    dmxScreen->rootY      = y;
-    dmxScreen->rootWidth  = w;
+    dmxScreen->rootX = x;
+    dmxScreen->rootY = y;
+    dmxScreen->rootWidth = w;
     dmxScreen->rootHeight = h;
 }
 
 /** Change the "root" window's origin by updating DMX's internal data
  *  structures (dix and Xinerama) to use the new origin and adjust the
  *  positions of windows that overlap this "root" window. */
-static void dmxSetRootWindowOrigin(int idx, int x, int y)
+static void
+dmxSetRootWindowOrigin(int idx, int x, int y)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[idx];
-    ScreenPtr      pScreen   = screenInfo.screens[idx];
-    WindowPtr      pRoot     = pScreen->root;
-    WindowPtr      pChild;
-    int            xoff;
-    int            yoff;
+    ScreenPtr pScreen = screenInfo.screens[idx];
+    WindowPtr pRoot = pScreen->root;
+    WindowPtr pChild;
+    int xoff;
+    int yoff;
 
     /* Change "root" window's origin */
     dmxScreen->rootXOrigin = x;
@@ -458,129 +481,131 @@ static void dmxSetRootWindowOrigin(int idx, int x, int y)
     XineramaReinitData();
 
     /* Adjust each of the root window's children */
-    if (!idx) ReinitializeRootWindow(screenInfo.screens[0]->root, xoff, yoff);
+    if (!idx)
+        ReinitializeRootWindow(screenInfo.screens[0]->root, xoff, yoff);
     pChild = pRoot->firstChild;
     while (pChild) {
-	/* Adjust child window's position */
-	pScreen->MoveWindow(pChild,
-			    pChild->origin.x - wBorderWidth(pChild) - xoff,
-			    pChild->origin.y - wBorderWidth(pChild) - yoff,
-			    pChild->nextSib,
-			    VTMove);
-
-	/* Note that the call to MoveWindow will eventually call
-	 * dmxPositionWindow which will automatically create a
-	 * window if it is now exposed on screen (for lazy window
-	 * creation optimization) and it will properly set the
-	 * offscreen flag.
-	 */
-
-	pChild = pChild->nextSib;
+        /* Adjust child window's position */
+        pScreen->MoveWindow(pChild,
+                            pChild->origin.x - wBorderWidth(pChild) - xoff,
+                            pChild->origin.y - wBorderWidth(pChild) - yoff,
+                            pChild->nextSib, VTMove);
+
+        /* Note that the call to MoveWindow will eventually call
+         * dmxPositionWindow which will automatically create a
+         * window if it is now exposed on screen (for lazy window
+         * creation optimization) and it will properly set the
+         * offscreen flag.
+         */
+
+        pChild = pChild->nextSib;
     }
 }
 
 /** Configure the attributes of each "screen" and "root" window. */
-int dmxConfigureScreenWindows(int nscreens,
-			      CARD32 *screens,
-			      DMXScreenAttributesPtr attribs,
-			      int *errorScreen)
+int
+dmxConfigureScreenWindows(int nscreens,
+                          CARD32 *screens,
+                          DMXScreenAttributesPtr attribs, int *errorScreen)
 {
-    int           i;
+    int i;
 
     for (i = 0; i < nscreens; i++) {
-	DMXScreenAttributesPtr  attr      = &attribs[i];
-	int                     idx       = screens[i];
-	DMXScreenInfo          *dmxScreen = &dmxScreens[idx];
-
-	if (errorScreen) *errorScreen = i;
-
-	if (!dmxScreen->beDisplay) return DMX_BAD_VALUE;
-
-	/* Check for illegal values */
-	if (idx < 0 || idx >= dmxNumScreens) return BadValue;
-
-	/* The "screen" and "root" windows must have valid sizes */
-	if (attr->screenWindowWidth <= 0 || attr->screenWindowHeight <= 0 ||
-	    attr->rootWindowWidth   <  0 || attr->rootWindowHeight   <  0)
-	    return DMX_BAD_VALUE;
-
-	/* The "screen" window must fit entirely within the BE display */
-	if (attr->screenWindowXoffset < 0 ||
-	    attr->screenWindowYoffset < 0 ||
-	    attr->screenWindowXoffset
-	    + attr->screenWindowWidth  > (unsigned)dmxScreen->beWidth ||
-	    attr->screenWindowYoffset
-	    + attr->screenWindowHeight > (unsigned)dmxScreen->beHeight)
-	    return DMX_BAD_VALUE;
-
-	/* The "root" window must fit entirely within the "screen" window */
-	if (attr->rootWindowXoffset < 0 ||
-	    attr->rootWindowYoffset < 0 ||
-	    attr->rootWindowXoffset
-	    + attr->rootWindowWidth  > attr->screenWindowWidth ||
-	    attr->rootWindowYoffset
-	    + attr->rootWindowHeight > attr->screenWindowHeight)
-	    return DMX_BAD_VALUE;
-
-	/* The "root" window must not expose unaddressable coordinates */
-	if (attr->rootWindowXorigin < 0 ||
-	    attr->rootWindowYorigin < 0 ||
-	    attr->rootWindowXorigin + attr->rootWindowWidth  > 32767 ||
-	    attr->rootWindowYorigin + attr->rootWindowHeight > 32767)
-	    return DMX_BAD_VALUE;
-
-	/* The "root" window must fit within the global bounding box */
-	if (attr->rootWindowXorigin
-	    + attr->rootWindowWidth > (unsigned)dmxGlobalWidth ||
-	    attr->rootWindowYorigin
-	    + attr->rootWindowHeight > (unsigned)dmxGlobalHeight)
-	    return DMX_BAD_VALUE;
-
-	/* FIXME: Handle the rest of the illegal value checking */
+        DMXScreenAttributesPtr attr = &attribs[i];
+        int idx = screens[i];
+        DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+
+        if (errorScreen)
+            *errorScreen = i;
+
+        if (!dmxScreen->beDisplay)
+            return DMX_BAD_VALUE;
+
+        /* Check for illegal values */
+        if (idx < 0 || idx >= dmxNumScreens)
+            return BadValue;
+
+        /* The "screen" and "root" windows must have valid sizes */
+        if (attr->screenWindowWidth <= 0 || attr->screenWindowHeight <= 0 ||
+            attr->rootWindowWidth < 0 || attr->rootWindowHeight < 0)
+            return DMX_BAD_VALUE;
+
+        /* The "screen" window must fit entirely within the BE display */
+        if (attr->screenWindowXoffset < 0 ||
+            attr->screenWindowYoffset < 0 ||
+            attr->screenWindowXoffset
+            + attr->screenWindowWidth > (unsigned) dmxScreen->beWidth ||
+            attr->screenWindowYoffset
+            + attr->screenWindowHeight > (unsigned) dmxScreen->beHeight)
+            return DMX_BAD_VALUE;
+
+        /* The "root" window must fit entirely within the "screen" window */
+        if (attr->rootWindowXoffset < 0 ||
+            attr->rootWindowYoffset < 0 ||
+            attr->rootWindowXoffset
+            + attr->rootWindowWidth > attr->screenWindowWidth ||
+            attr->rootWindowYoffset
+            + attr->rootWindowHeight > attr->screenWindowHeight)
+            return DMX_BAD_VALUE;
+
+        /* The "root" window must not expose unaddressable coordinates */
+        if (attr->rootWindowXorigin < 0 ||
+            attr->rootWindowYorigin < 0 ||
+            attr->rootWindowXorigin + attr->rootWindowWidth > 32767 ||
+            attr->rootWindowYorigin + attr->rootWindowHeight > 32767)
+            return DMX_BAD_VALUE;
+
+        /* The "root" window must fit within the global bounding box */
+        if (attr->rootWindowXorigin
+            + attr->rootWindowWidth > (unsigned) dmxGlobalWidth ||
+            attr->rootWindowYorigin
+            + attr->rootWindowHeight > (unsigned) dmxGlobalHeight)
+            return DMX_BAD_VALUE;
+
+        /* FIXME: Handle the rest of the illegal value checking */
     }
 
     /* No illegal values found */
-    if (errorScreen) *errorScreen = 0;
+    if (errorScreen)
+        *errorScreen = 0;
 
     for (i = 0; i < nscreens; i++) {
-	DMXScreenAttributesPtr  attr      = &attribs[i];
-	int                     idx       = screens[i];
-	DMXScreenInfo          *dmxScreen = &dmxScreens[idx];
-
-	dmxLog(dmxInfo, "Changing screen #%d attributes "
-	       "from %dx%d+%d+%d %dx%d+%d+%d +%d+%d "
-	       "to %dx%d+%d+%d %dx%d+%d+%d +%d+%d\n",
-	       idx,
-	       dmxScreen->scrnWidth,      dmxScreen->scrnHeight,
-	       dmxScreen->scrnX,          dmxScreen->scrnY,
-	       dmxScreen->rootWidth,      dmxScreen->rootHeight,
-	       dmxScreen->rootX,          dmxScreen->rootY,
-	       dmxScreen->rootXOrigin,    dmxScreen->rootYOrigin,
-	       attr->screenWindowWidth,   attr->screenWindowHeight,
-	       attr->screenWindowXoffset, attr->screenWindowYoffset,
-	       attr->rootWindowWidth,     attr->rootWindowHeight,
-	       attr->rootWindowXoffset,   attr->rootWindowYoffset,
-	       attr->rootWindowXorigin,   attr->rootWindowYorigin);
-
-	/* Configure "screen" window */
-	dmxConfigureScreenWindow(idx,
-				 attr->screenWindowXoffset,
-				 attr->screenWindowYoffset,
-				 attr->screenWindowWidth,
-				 attr->screenWindowHeight);
-
-	/* Configure "root" window */
-	dmxConfigureRootWindow(idx,
-			       attr->rootWindowXoffset,
-			       attr->rootWindowYoffset,
-			       attr->rootWindowWidth,
-			       attr->rootWindowHeight);
-
-
-	/* Set "root" window's origin */
-	dmxSetRootWindowOrigin(idx,
-			       attr->rootWindowXorigin,
-			       attr->rootWindowYorigin);
+        DMXScreenAttributesPtr attr = &attribs[i];
+        int idx = screens[i];
+        DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+
+        dmxLog(dmxInfo, "Changing screen #%d attributes "
+               "from %dx%d+%d+%d %dx%d+%d+%d +%d+%d "
+               "to %dx%d+%d+%d %dx%d+%d+%d +%d+%d\n",
+               idx,
+               dmxScreen->scrnWidth, dmxScreen->scrnHeight,
+               dmxScreen->scrnX, dmxScreen->scrnY,
+               dmxScreen->rootWidth, dmxScreen->rootHeight,
+               dmxScreen->rootX, dmxScreen->rootY,
+               dmxScreen->rootXOrigin, dmxScreen->rootYOrigin,
+               attr->screenWindowWidth, attr->screenWindowHeight,
+               attr->screenWindowXoffset, attr->screenWindowYoffset,
+               attr->rootWindowWidth, attr->rootWindowHeight,
+               attr->rootWindowXoffset, attr->rootWindowYoffset,
+               attr->rootWindowXorigin, attr->rootWindowYorigin);
+
+        /* Configure "screen" window */
+        dmxConfigureScreenWindow(idx,
+                                 attr->screenWindowXoffset,
+                                 attr->screenWindowYoffset,
+                                 attr->screenWindowWidth,
+                                 attr->screenWindowHeight);
+
+        /* Configure "root" window */
+        dmxConfigureRootWindow(idx,
+                               attr->rootWindowXoffset,
+                               attr->rootWindowYoffset,
+                               attr->rootWindowWidth, attr->rootWindowHeight);
+
+        /* Set "root" window's origin */
+        dmxSetRootWindowOrigin(idx,
+                               attr->rootWindowXorigin,
+                               attr->rootWindowYorigin);
     }
 
     /* Adjust the cursor boundaries */
@@ -593,37 +618,46 @@ int dmxConfigureScreenWindows(int nscreens,
 }
 
 /** Configure the attributes of the global desktop. */
-int dmxConfigureDesktop(DMXDesktopAttributesPtr attribs)
+int
+dmxConfigureDesktop(DMXDesktopAttributesPtr attribs)
 {
-    if (attribs->width  <= 0 || attribs->width  >= 32767 ||
-	attribs->height <= 0 || attribs->height >= 32767)
-	return DMX_BAD_VALUE;
+    if (attribs->width <= 0 || attribs->width >= 32767 ||
+        attribs->height <= 0 || attribs->height >= 32767)
+        return DMX_BAD_VALUE;
 
     /* If the desktop is shrinking, adjust the "root" windows on each
      * "screen" window to only show the visible desktop.  Also, handle
      * the special case where the desktop shrinks such that the it no
      * longer overlaps an portion of a "screen" window. */
     if (attribs->width < dmxGlobalWidth || attribs->height < dmxGlobalHeight) {
-	int   i;
-	for (i = 0; i < dmxNumScreens; i++) {
-	    DMXScreenInfo *dmxScreen = &dmxScreens[i];
-	    if (dmxScreen->rootXOrigin
-		+ dmxScreen->rootWidth  > attribs->width ||
-		dmxScreen->rootYOrigin
-		+ dmxScreen->rootHeight > attribs->height) {
-		int  w, h;
-		if ((w = attribs->width  - dmxScreen->rootXOrigin) < 0) w = 0;
-		if ((h = attribs->height - dmxScreen->rootYOrigin) < 0) h = 0;
-		if (w > dmxScreen->scrnWidth)  w = dmxScreen->scrnWidth;
-		if (h > dmxScreen->scrnHeight) h = dmxScreen->scrnHeight;
-		if (w > dmxScreen->rootWidth)  w = dmxScreen->rootWidth;
-		if (h > dmxScreen->rootHeight) h = dmxScreen->rootHeight;
-		dmxConfigureRootWindow(i,
-				       dmxScreen->rootX,
-				       dmxScreen->rootY,
-				       w, h);
-	    }
-	}
+        int i;
+
+        for (i = 0; i < dmxNumScreens; i++) {
+            DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
+            if (dmxScreen->rootXOrigin
+                + dmxScreen->rootWidth > attribs->width ||
+                dmxScreen->rootYOrigin
+                + dmxScreen->rootHeight > attribs->height) {
+                int w, h;
+
+                if ((w = attribs->width - dmxScreen->rootXOrigin) < 0)
+                    w = 0;
+                if ((h = attribs->height - dmxScreen->rootYOrigin) < 0)
+                    h = 0;
+                if (w > dmxScreen->scrnWidth)
+                    w = dmxScreen->scrnWidth;
+                if (h > dmxScreen->scrnHeight)
+                    h = dmxScreen->scrnHeight;
+                if (w > dmxScreen->rootWidth)
+                    w = dmxScreen->rootWidth;
+                if (h > dmxScreen->rootHeight)
+                    h = dmxScreen->rootHeight;
+                dmxConfigureRootWindow(i,
+                                       dmxScreen->rootX,
+                                       dmxScreen->rootY, w, h);
+            }
+        }
     }
 
     /* Set the global width/height */
@@ -631,30 +665,30 @@ int dmxConfigureDesktop(DMXDesktopAttributesPtr attribs)
 
     /* Handle shift[XY] changes */
     if (attribs->shiftX || attribs->shiftY) {
-	int   i;
-	for (i = 0; i < dmxNumScreens; i++) {
-	    ScreenPtr  pScreen = screenInfo.screens[i];
-	    WindowPtr  pChild  = pScreen->root->firstChild;
-	    while (pChild) {
-		/* Adjust child window's position */
-		pScreen->MoveWindow(pChild,
-				    pChild->origin.x - wBorderWidth(pChild)
-				    - attribs->shiftX,
-				    pChild->origin.y - wBorderWidth(pChild)
-				    - attribs->shiftY,
-				    pChild->nextSib,
-				    VTMove);
-
-		/* Note that the call to MoveWindow will eventually call
-		 * dmxPositionWindow which will automatically create a
-		 * window if it is now exposed on screen (for lazy
-		 * window creation optimization) and it will properly
-		 * set the offscreen flag.
-		 */
-
-		pChild = pChild->nextSib;
-	    }
-	}
+        int i;
+
+        for (i = 0; i < dmxNumScreens; i++) {
+            ScreenPtr pScreen = screenInfo.screens[i];
+            WindowPtr pChild = pScreen->root->firstChild;
+
+            while (pChild) {
+                /* Adjust child window's position */
+                pScreen->MoveWindow(pChild,
+                                    pChild->origin.x - wBorderWidth(pChild)
+                                    - attribs->shiftX,
+                                    pChild->origin.y - wBorderWidth(pChild)
+                                    - attribs->shiftY, pChild->nextSib, VTMove);
+
+                /* Note that the call to MoveWindow will eventually call
+                 * dmxPositionWindow which will automatically create a
+                 * window if it is now exposed on screen (for lazy
+                 * window creation optimization) and it will properly
+                 * set the offscreen flag.
+                 */
+
+                pChild = pChild->nextSib;
+            }
+        }
     }
 
     /* Update connection block, Xinerama, etc. -- these appears to
@@ -672,14 +706,15 @@ int dmxConfigureDesktop(DMXDesktopAttributesPtr attribs)
 #endif
 
 /** Create the scratch GCs per depth. */
-static void dmxBECreateScratchGCs(int scrnNum)
+static void
+dmxBECreateScratchGCs(int scrnNum)
 {
-    ScreenPtr  pScreen = screenInfo.screens[scrnNum];
-    GCPtr     *ppGC    = pScreen->GCperDepth;
-    int        i;
+    ScreenPtr pScreen = screenInfo.screens[scrnNum];
+    GCPtr *ppGC = pScreen->GCperDepth;
+    int i;
 
     for (i = 0; i <= pScreen->numDepths; i++)
-	dmxBECreateGC(pScreen, ppGC[i]);
+        dmxBECreateGC(pScreen, ppGC[i]);
 }
 
 #ifdef PANORAMIX
@@ -689,89 +724,92 @@ static Bool FoundPixImage;
  *  to have its image restored.  When it is found, see if there is
  *  another screen with the same image.  If so, copy the pixmap image
  *  from the existing screen to the newly created pixmap. */
-static void dmxBERestorePixmapImage(pointer value, XID id, RESTYPE type,
-				    pointer p)
+static void
+dmxBERestorePixmapImage(pointer value, XID id, RESTYPE type, pointer p)
 {
     if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) {
-	PixmapPtr      pDst     = (PixmapPtr)p;
-	int            idx      = pDst->drawable.pScreen->myNum;
-	PanoramiXRes  *pXinPix  = (PanoramiXRes *)value;
-	PixmapPtr      pPix;
-	int            i;
-
-	dixLookupResourceByType((pointer*) &pPix, pXinPix->info[idx].id,
-				RT_PIXMAP, NullClient, DixUnknownAccess);
-	if (pPix != pDst) return; /* Not a match.... Next! */
-
-	FOR_NSCREENS(i) {
-	    PixmapPtr      pSrc;
-	    dmxPixPrivPtr  pSrcPriv = NULL;
-
-	    if (i == idx) continue; /* Self replication is bad */
-
-	    dixLookupResourceByType((pointer*) &pSrc, pXinPix->info[i].id,
-				    RT_PIXMAP, NullClient, DixUnknownAccess);
-	    pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
-	    if (pSrcPriv->pixmap) {
-		DMXScreenInfo *dmxSrcScreen = &dmxScreens[i];
-		DMXScreenInfo *dmxDstScreen = &dmxScreens[idx];
-		dmxPixPrivPtr  pDstPriv = DMX_GET_PIXMAP_PRIV(pDst);
-		XImage        *img;
-		int            j;
-		XlibGC         gc = NULL;
-
-		/* This should never happen, but just in case.... */
-		if (pSrc->drawable.width  != pDst->drawable.width ||
-		    pSrc->drawable.height != pDst->drawable.height)
-		    return;
-
-		/* Copy from src pixmap to dst pixmap */
-		img = XGetImage(dmxSrcScreen->beDisplay,
-				pSrcPriv->pixmap,
-				0, 0,
-				pSrc->drawable.width, pSrc->drawable.height,
-				-1,
-				ZPixmap);
-
-		for (j = 0; j < dmxDstScreen->beNumPixmapFormats; j++) {
-		    if (dmxDstScreen->bePixmapFormats[j].depth == img->depth) {
-			unsigned long  m;
-			XGCValues      v;
-
-			m = GCFunction | GCPlaneMask | GCClipMask;
-			v.function = GXcopy;
-			v.plane_mask = AllPlanes;
-			v.clip_mask = None;
-
-			gc = XCreateGC(dmxDstScreen->beDisplay,
-				       dmxDstScreen->scrnDefDrawables[j],
-				       m, &v);
-			break;
-		    }
-		}
-
-		if (gc) {
-		    XPutImage(dmxDstScreen->beDisplay,
-			      pDstPriv->pixmap,
-			      gc, img, 0, 0, 0, 0,
-			      pDst->drawable.width, pDst->drawable.height);
-		    XFreeGC(dmxDstScreen->beDisplay, gc);
-		    FoundPixImage = True;
-		} else {
-		    dmxLog(dmxWarning, "Could not create GC\n");
-		}
-
-		XDestroyImage(img);
-		return;
-	    }
-	}
+        PixmapPtr pDst = (PixmapPtr) p;
+        int idx = pDst->drawable.pScreen->myNum;
+        PanoramiXRes *pXinPix = (PanoramiXRes *) value;
+        PixmapPtr pPix;
+        int i;
+
+        dixLookupResourceByType((pointer *) &pPix, pXinPix->info[idx].id,
+                                RT_PIXMAP, NullClient, DixUnknownAccess);
+        if (pPix != pDst)
+            return;             /* Not a match.... Next! */
+
+        FOR_NSCREENS(i) {
+            PixmapPtr pSrc;
+            dmxPixPrivPtr pSrcPriv = NULL;
+
+            if (i == idx)
+                continue;       /* Self replication is bad */
+
+            dixLookupResourceByType((pointer *) &pSrc, pXinPix->info[i].id,
+                                    RT_PIXMAP, NullClient, DixUnknownAccess);
+            pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
+            if (pSrcPriv->pixmap) {
+                DMXScreenInfo *dmxSrcScreen = &dmxScreens[i];
+                DMXScreenInfo *dmxDstScreen = &dmxScreens[idx];
+                dmxPixPrivPtr pDstPriv = DMX_GET_PIXMAP_PRIV(pDst);
+                XImage *img;
+                int j;
+                XlibGC gc = NULL;
+
+                /* This should never happen, but just in case.... */
+                if (pSrc->drawable.width != pDst->drawable.width ||
+                    pSrc->drawable.height != pDst->drawable.height)
+                    return;
+
+                /* Copy from src pixmap to dst pixmap */
+                img = XGetImage(dmxSrcScreen->beDisplay,
+                                pSrcPriv->pixmap,
+                                0, 0,
+                                pSrc->drawable.width, pSrc->drawable.height,
+                                -1, ZPixmap);
+
+                for (j = 0; j < dmxDstScreen->beNumPixmapFormats; j++) {
+                    if (dmxDstScreen->bePixmapFormats[j].depth == img->depth) {
+                        unsigned long m;
+                        XGCValues v;
+
+                        m = GCFunction | GCPlaneMask | GCClipMask;
+                        v.function = GXcopy;
+                        v.plane_mask = AllPlanes;
+                        v.clip_mask = None;
+
+                        gc = XCreateGC(dmxDstScreen->beDisplay,
+                                       dmxDstScreen->scrnDefDrawables[j],
+                                       m, &v);
+                        break;
+                    }
+                }
+
+                if (gc) {
+                    XPutImage(dmxDstScreen->beDisplay,
+                              pDstPriv->pixmap,
+                              gc, img, 0, 0, 0, 0,
+                              pDst->drawable.width, pDst->drawable.height);
+                    XFreeGC(dmxDstScreen->beDisplay, gc);
+                    FoundPixImage = True;
+                }
+                else {
+                    dmxLog(dmxWarning, "Could not create GC\n");
+                }
+
+                XDestroyImage(img);
+                return;
+            }
+        }
     }
 }
 #endif
 
 /** Restore the pixmap image either from another screen or from an image
  *  that was saved when the screen was previously detached. */
-static void dmxBERestorePixmap(PixmapPtr pPixmap)
+static void
+dmxBERestorePixmap(PixmapPtr pPixmap)
 {
 #ifdef PANORAMIX
     int i;
@@ -779,62 +817,63 @@ static void dmxBERestorePixmap(PixmapPtr pPixmap)
     /* If Xinerama is not active, there's nothing we can do (see comment
      * in #else below for more info). */
     if (noPanoramiXExtension) {
-	dmxLog(dmxWarning, "Cannot restore pixmap image\n");
-	return;
+        dmxLog(dmxWarning, "Cannot restore pixmap image\n");
+        return;
     }
 
     FoundPixImage = False;
-    for (i = currentMaxClients; --i >= 0; )
-	if (clients[i])
-	    FindAllClientResources(clients[i], dmxBERestorePixmapImage,
-				   (pointer)pPixmap);
+    for (i = currentMaxClients; --i >= 0;)
+        if (clients[i])
+            FindAllClientResources(clients[i], dmxBERestorePixmapImage,
+                                   (pointer) pPixmap);
 
     /* No corresponding pixmap image was found on other screens, so we
      * need to copy it from the saved image when the screen was detached
      * (if available). */
     if (!FoundPixImage) {
-	dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
-
-	if (pPixPriv->detachedImage) {
-	    ScreenPtr      pScreen   = pPixmap->drawable.pScreen;
-	    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-	    XlibGC         gc        = NULL;
-
-	    for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {
-		if (dmxScreen->bePixmapFormats[i].depth ==
-		    pPixPriv->detachedImage->depth) {
-		    unsigned long  m;
-		    XGCValues      v;
-
-		    m = GCFunction | GCPlaneMask | GCClipMask;
-		    v.function = GXcopy;
-		    v.plane_mask = AllPlanes;
-		    v.clip_mask = None;
-
-		    gc = XCreateGC(dmxScreen->beDisplay,
-				   dmxScreen->scrnDefDrawables[i],
-				   m, &v);
-		    break;
-		}
-	    }
-
-	    if (gc) {
-		XPutImage(dmxScreen->beDisplay,
-			  pPixPriv->pixmap,
-			  gc,
-			  pPixPriv->detachedImage,
-			  0, 0, 0, 0,
-		      pPixmap->drawable.width, pPixmap->drawable.height);
-		XFreeGC(dmxScreen->beDisplay, gc);
-	    } else {
-		dmxLog(dmxWarning, "Cannot restore pixmap image\n");
-	    }
-
-	    XDestroyImage(pPixPriv->detachedImage);
-	    pPixPriv->detachedImage = NULL;
-	} else {
-	    dmxLog(dmxWarning, "Cannot restore pixmap image\n");
-	}
+        dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+
+        if (pPixPriv->detachedImage) {
+            ScreenPtr pScreen = pPixmap->drawable.pScreen;
+            DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+            XlibGC gc = NULL;
+
+            for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {
+                if (dmxScreen->bePixmapFormats[i].depth ==
+                    pPixPriv->detachedImage->depth) {
+                    unsigned long m;
+                    XGCValues v;
+
+                    m = GCFunction | GCPlaneMask | GCClipMask;
+                    v.function = GXcopy;
+                    v.plane_mask = AllPlanes;
+                    v.clip_mask = None;
+
+                    gc = XCreateGC(dmxScreen->beDisplay,
+                                   dmxScreen->scrnDefDrawables[i], m, &v);
+                    break;
+                }
+            }
+
+            if (gc) {
+                XPutImage(dmxScreen->beDisplay,
+                          pPixPriv->pixmap,
+                          gc,
+                          pPixPriv->detachedImage,
+                          0, 0, 0, 0,
+                          pPixmap->drawable.width, pPixmap->drawable.height);
+                XFreeGC(dmxScreen->beDisplay, gc);
+            }
+            else {
+                dmxLog(dmxWarning, "Cannot restore pixmap image\n");
+            }
+
+            XDestroyImage(pPixPriv->detachedImage);
+            pPixPriv->detachedImage = NULL;
+        }
+        else {
+            dmxLog(dmxWarning, "Cannot restore pixmap image\n");
+        }
     }
 #else
     /* If Xinerama is not enabled, then there is no other copy of the
@@ -852,57 +891,68 @@ static void dmxBERestorePixmap(PixmapPtr pPixmap)
  *  function.  It walks all resources, compares them to the screen
  *  number passed in as \a n and calls the appropriate DMX function to
  *  create the associated resource on the back-end server. */
-static void dmxBECreateResources(pointer value, XID id, RESTYPE type,
-				 pointer n)
+static void
+dmxBECreateResources(pointer value, XID id, RESTYPE type, pointer n)
 {
-    int        scrnNum = (uintptr_t)n;
-    ScreenPtr  pScreen = screenInfo.screens[scrnNum];
+    int scrnNum = (uintptr_t) n;
+    ScreenPtr pScreen = screenInfo.screens[scrnNum];
 
     if ((type & TypeMask) == (RT_WINDOW & TypeMask)) {
-	/* Window resources are created below in dmxBECreateWindowTree */
-    } else if ((type & TypeMask) == (RT_PIXMAP & TypeMask)) {
-	PixmapPtr  pPix = value;
-	if (pPix->drawable.pScreen->myNum == scrnNum) {
-	    dmxBECreatePixmap(pPix);
-	    dmxBERestorePixmap(pPix);
-	}
-    } else if ((type & TypeMask) == (RT_GC & TypeMask)) {
-	GCPtr  pGC = value;
-	if (pGC->pScreen->myNum == scrnNum) {
-	    /* Create the GC on the back-end server */
-	    dmxBECreateGC(pScreen, pGC);
-	    /* Create any pixmaps associated with this GC */
-	    if (!pGC->tileIsPixel) {
-		dmxBECreatePixmap(pGC->tile.pixmap);
-		dmxBERestorePixmap(pGC->tile.pixmap);
-	    }
-	    if (pGC->stipple != pScreen->PixmapPerDepth[0]) {
-		dmxBECreatePixmap(pGC->stipple);
-		dmxBERestorePixmap(pGC->stipple);
-	    }
-	    if (pGC->font != defaultFont) {
-		(void)dmxBELoadFont(pScreen, pGC->font);
-	    }
-	    /* Update the GC on the back-end server */
-	    dmxChangeGC(pGC, -1L);
-	}
-    } else if ((type & TypeMask) == (RT_FONT & TypeMask)) {
-	(void)dmxBELoadFont(pScreen, (FontPtr)value);
-    } else if ((type & TypeMask) == (RT_CURSOR & TypeMask)) {
-	dmxBECreateCursor(pScreen, (CursorPtr)value);
-    } else if ((type & TypeMask) == (RT_COLORMAP & TypeMask)) {
-	ColormapPtr  pCmap = value;
-	if (pCmap->pScreen->myNum == scrnNum)
-	    (void)dmxBECreateColormap((ColormapPtr)value);
+        /* Window resources are created below in dmxBECreateWindowTree */
+    }
+    else if ((type & TypeMask) == (RT_PIXMAP & TypeMask)) {
+        PixmapPtr pPix = value;
+
+        if (pPix->drawable.pScreen->myNum == scrnNum) {
+            dmxBECreatePixmap(pPix);
+            dmxBERestorePixmap(pPix);
+        }
+    }
+    else if ((type & TypeMask) == (RT_GC & TypeMask)) {
+        GCPtr pGC = value;
+
+        if (pGC->pScreen->myNum == scrnNum) {
+            /* Create the GC on the back-end server */
+            dmxBECreateGC(pScreen, pGC);
+            /* Create any pixmaps associated with this GC */
+            if (!pGC->tileIsPixel) {
+                dmxBECreatePixmap(pGC->tile.pixmap);
+                dmxBERestorePixmap(pGC->tile.pixmap);
+            }
+            if (pGC->stipple != pScreen->PixmapPerDepth[0]) {
+                dmxBECreatePixmap(pGC->stipple);
+                dmxBERestorePixmap(pGC->stipple);
+            }
+            if (pGC->font != defaultFont) {
+                (void) dmxBELoadFont(pScreen, pGC->font);
+            }
+            /* Update the GC on the back-end server */
+            dmxChangeGC(pGC, -1L);
+        }
+    }
+    else if ((type & TypeMask) == (RT_FONT & TypeMask)) {
+        (void) dmxBELoadFont(pScreen, (FontPtr) value);
+    }
+    else if ((type & TypeMask) == (RT_CURSOR & TypeMask)) {
+        dmxBECreateCursor(pScreen, (CursorPtr) value);
+    }
+    else if ((type & TypeMask) == (RT_COLORMAP & TypeMask)) {
+        ColormapPtr pCmap = value;
+
+        if (pCmap->pScreen->myNum == scrnNum)
+            (void) dmxBECreateColormap((ColormapPtr) value);
 #if 0
-    /* TODO: Recreate Picture and GlyphSet resources */
-    } else if ((type & TypeMask) == (PictureType & TypeMask)) {
-	/* Picture resources are created when windows are created */
-    } else if ((type & TypeMask) == (GlyphSetType & TypeMask)) {
-	dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value);
+        /* TODO: Recreate Picture and GlyphSet resources */
+    }
+    else if ((type & TypeMask) == (PictureType & TypeMask)) {
+        /* Picture resources are created when windows are created */
+    }
+    else if ((type & TypeMask) == (GlyphSetType & TypeMask)) {
+        dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr) value);
 #endif
-    } else {
-	/* Other resource types??? */
+    }
+    else {
+        /* Other resource types??? */
     }
 }
 
@@ -912,21 +962,22 @@ static void dmxBECreateResources(pointer value, XID id, RESTYPE type,
  *  itself to create each window's parents.  This is required so that we
  *  have the opportunity to create each window's border and background
  *  pixmaps (where appropriate) before the window is created. */
-static void dmxBECreateWindowTree(int idx)
+static void
+dmxBECreateWindowTree(int idx)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[idx];
-    WindowPtr      pRoot     = screenInfo.screens[idx]->root;
-    dmxWinPrivPtr  pWinPriv  = DMX_GET_WINDOW_PRIV(pRoot);
-    WindowPtr      pWin;
+    WindowPtr pRoot = screenInfo.screens[idx]->root;
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pRoot);
+    WindowPtr pWin;
 
     /* Create the pixmaps associated with the root window */
     if (!pRoot->borderIsPixel) {
-	dmxBECreatePixmap(pRoot->border.pixmap);
-	dmxBERestorePixmap(pRoot->border.pixmap);
+        dmxBECreatePixmap(pRoot->border.pixmap);
+        dmxBERestorePixmap(pRoot->border.pixmap);
     }
     if (pRoot->backgroundState == BackgroundPixmap) {
-	dmxBECreatePixmap(pRoot->background.pixmap);
-	dmxBERestorePixmap(pRoot->background.pixmap);
+        dmxBECreatePixmap(pRoot->background.pixmap);
+        dmxBERestorePixmap(pRoot->background.pixmap);
     }
 
     /* Create root window first */
@@ -935,175 +986,188 @@ static void dmxBECreateWindowTree(int idx)
 
     pWin = pRoot->lastChild;
     while (pWin) {
-	pWinPriv = DMX_GET_WINDOW_PRIV(pWin);
-
-	/* Create the pixmaps regardless of whether or not the
-	 * window is created or not due to lazy window creation.
-	 */
-	if (!pWin->borderIsPixel) {
-	    dmxBECreatePixmap(pWin->border.pixmap);
-	    dmxBERestorePixmap(pWin->border.pixmap);
-	}
-	if (pWin->backgroundState == BackgroundPixmap) {
-	    dmxBECreatePixmap(pWin->background.pixmap);
-	    dmxBERestorePixmap(pWin->background.pixmap);
-	}
-
-	/* Reset the window attributes */
-	dmxGetDefaultWindowAttributes(pWin,
-				      &pWinPriv->cmap,
-				      &pWinPriv->visual);
-
-	/* Create the window */
-	if (pWinPriv->mapped && !pWinPriv->offscreen)
-	    dmxCreateAndRealizeWindow(pWin, TRUE);
-
-	/* Next, create the bottom-most child */
-	if (pWin->lastChild) {
-	    pWin = pWin->lastChild;
-	    continue;
-	}
-
-	/* If the window has no children, move on to the next higher window */
-	while (!pWin->prevSib && (pWin != pRoot))
-	    pWin = pWin->parent;
-
-	if (pWin->prevSib) {
-	    pWin = pWin->prevSib;
-	    continue;
-	}
-
-	/* When we reach the root window, we are finished */
-	if (pWin == pRoot)
-	    break;
+        pWinPriv = DMX_GET_WINDOW_PRIV(pWin);
+
+        /* Create the pixmaps regardless of whether or not the
+         * window is created or not due to lazy window creation.
+         */
+        if (!pWin->borderIsPixel) {
+            dmxBECreatePixmap(pWin->border.pixmap);
+            dmxBERestorePixmap(pWin->border.pixmap);
+        }
+        if (pWin->backgroundState == BackgroundPixmap) {
+            dmxBECreatePixmap(pWin->background.pixmap);
+            dmxBERestorePixmap(pWin->background.pixmap);
+        }
+
+        /* Reset the window attributes */
+        dmxGetDefaultWindowAttributes(pWin, &pWinPriv->cmap, &pWinPriv->visual);
+
+        /* Create the window */
+        if (pWinPriv->mapped && !pWinPriv->offscreen)
+            dmxCreateAndRealizeWindow(pWin, TRUE);
+
+        /* Next, create the bottom-most child */
+        if (pWin->lastChild) {
+            pWin = pWin->lastChild;
+            continue;
+        }
+
+        /* If the window has no children, move on to the next higher window */
+        while (!pWin->prevSib && (pWin != pRoot))
+            pWin = pWin->parent;
+
+        if (pWin->prevSib) {
+            pWin = pWin->prevSib;
+            continue;
+        }
+
+        /* When we reach the root window, we are finished */
+        if (pWin == pRoot)
+            break;
     }
 }
 
 /* Refresh screen by generating exposure events for all windows */
-static void dmxForceExposures(int idx)
+static void
+dmxForceExposures(int idx)
 {
-    ScreenPtr      pScreen   = screenInfo.screens[idx];
-    WindowPtr  pRoot     = pScreen->root;
-    Bool       anyMarked = FALSE;
-    WindowPtr  pChild;
+    ScreenPtr pScreen = screenInfo.screens[idx];
+    WindowPtr pRoot = pScreen->root;
+    Bool anyMarked = FALSE;
+    WindowPtr pChild;
 
     for (pChild = pRoot->firstChild; pChild; pChild = pChild->nextSib)
-	anyMarked |= pScreen->MarkOverlappedWindows(pChild, pChild,
-						    (WindowPtr *)NULL);
+        anyMarked |= pScreen->MarkOverlappedWindows(pChild, pChild,
+                                                    (WindowPtr *) NULL);
     if (anyMarked) {
-	/* If any windows have been marked, set the root window's
-	 * clipList to be broken since it will be recalculated in
-	 * ValidateTree()
-	 */
-	RegionBreak(&pRoot->clipList);
-	pScreen->ValidateTree(pRoot, NULL, VTBroken);
-	pScreen->HandleExposures(pRoot);
-	if (pScreen->PostValidateTree)
-	    pScreen->PostValidateTree(pRoot, NULL, VTBroken);
+        /* If any windows have been marked, set the root window's
+         * clipList to be broken since it will be recalculated in
+         * ValidateTree()
+         */
+        RegionBreak(&pRoot->clipList);
+        pScreen->ValidateTree(pRoot, NULL, VTBroken);
+        pScreen->HandleExposures(pRoot);
+        if (pScreen->PostValidateTree)
+            pScreen->PostValidateTree(pRoot, NULL, VTBroken);
     }
 }
 
 /** Compare the new and old screens to see if they are compatible. */
-static Bool dmxCompareScreens(DMXScreenInfo *new, DMXScreenInfo *old)
+static Bool
+dmxCompareScreens(DMXScreenInfo * new, DMXScreenInfo * old)
 {
     int i;
 
-    if (new->beWidth != old->beWidth) return FALSE;
-    if (new->beHeight != old->beHeight) return FALSE;
-    if (new->beDepth != old->beDepth) return FALSE;
-    if (new->beBPP != old->beBPP) return FALSE;
-
-    if (new->beNumDepths != old->beNumDepths) return FALSE;
+    if (new->beWidth != old->beWidth)
+        return FALSE;
+    if (new->beHeight != old->beHeight)
+        return FALSE;
+    if (new->beDepth != old->beDepth)
+        return FALSE;
+    if (new->beBPP != old->beBPP)
+        return FALSE;
+
+    if (new->beNumDepths != old->beNumDepths)
+        return FALSE;
     for (i = 0; i < old->beNumDepths; i++)
-	if (new->beDepths[i] != old->beDepths[i]) return FALSE;
+        if (new->beDepths[i] != old->beDepths[i])
+            return FALSE;
 
-    if (new->beNumPixmapFormats != old->beNumPixmapFormats) return FALSE;
+    if (new->beNumPixmapFormats != old->beNumPixmapFormats)
+        return FALSE;
     for (i = 0; i < old->beNumPixmapFormats; i++) {
-	if (new->bePixmapFormats[i].depth !=
-	    old->bePixmapFormats[i].depth) return FALSE;
-	if (new->bePixmapFormats[i].bits_per_pixel !=
-	    old->bePixmapFormats[i].bits_per_pixel) return FALSE;
-	if (new->bePixmapFormats[i].scanline_pad !=
-	    old->bePixmapFormats[i].scanline_pad) return FALSE;
+        if (new->bePixmapFormats[i].depth != old->bePixmapFormats[i].depth)
+            return FALSE;
+        if (new->bePixmapFormats[i].bits_per_pixel !=
+            old->bePixmapFormats[i].bits_per_pixel)
+            return FALSE;
+        if (new->bePixmapFormats[i].scanline_pad !=
+            old->bePixmapFormats[i].scanline_pad)
+            return FALSE;
     }
 
-    if (new->beNumVisuals != old->beNumVisuals) return FALSE;
+    if (new->beNumVisuals != old->beNumVisuals)
+        return FALSE;
     for (i = 0; i < old->beNumVisuals; i++) {
-	if (new->beVisuals[i].visualid !=
-	    old->beVisuals[i].visualid) return FALSE;
-	if (new->beVisuals[i].screen !=
-	    old->beVisuals[i].screen) return FALSE;
-	if (new->beVisuals[i].depth !=
-	    old->beVisuals[i].depth) return FALSE;
-	if (new->beVisuals[i].class !=
-	    old->beVisuals[i].class) return FALSE;
-	if (new->beVisuals[i].red_mask !=
-	    old->beVisuals[i].red_mask) return FALSE;
-	if (new->beVisuals[i].green_mask !=
-	    old->beVisuals[i].green_mask) return FALSE;
-	if (new->beVisuals[i].blue_mask !=
-	    old->beVisuals[i].blue_mask) return FALSE;
-	if (new->beVisuals[i].colormap_size !=
-	    old->beVisuals[i].colormap_size) return FALSE;
-	if (new->beVisuals[i].bits_per_rgb !=
-	    old->beVisuals[i].bits_per_rgb) return FALSE;
-    }
-
-    if (new->beDefVisualIndex != old->beDefVisualIndex) return FALSE;
+        if (new->beVisuals[i].visualid != old->beVisuals[i].visualid)
+            return FALSE;
+        if (new->beVisuals[i].screen != old->beVisuals[i].screen)
+            return FALSE;
+        if (new->beVisuals[i].depth != old->beVisuals[i].depth)
+            return FALSE;
+        if (new->beVisuals[i].class != old->beVisuals[i].class)
+            return FALSE;
+        if (new->beVisuals[i].red_mask != old->beVisuals[i].red_mask)
+            return FALSE;
+        if (new->beVisuals[i].green_mask != old->beVisuals[i].green_mask)
+            return FALSE;
+        if (new->beVisuals[i].blue_mask != old->beVisuals[i].blue_mask)
+            return FALSE;
+        if (new->beVisuals[i].colormap_size != old->beVisuals[i].colormap_size)
+            return FALSE;
+        if (new->beVisuals[i].bits_per_rgb != old->beVisuals[i].bits_per_rgb)
+            return FALSE;
+    }
+
+    if (new->beDefVisualIndex != old->beDefVisualIndex)
+        return FALSE;
 
     return TRUE;
 }
 
 /** Restore Render's picture */
-static void dmxBERestoreRenderPict(pointer value, XID id, pointer n)
+static void
+dmxBERestoreRenderPict(pointer value, XID id, pointer n)
 {
-    PicturePtr   pPicture = value;               /* The picture */
-    DrawablePtr  pDraw    = pPicture->pDrawable; /* The picture's drawable */
-    int          scrnNum  = (uintptr_t)n;
+    PicturePtr pPicture = value;        /* The picture */
+    DrawablePtr pDraw = pPicture->pDrawable;    /* The picture's drawable */
+    int scrnNum = (uintptr_t) n;
 
     if (pDraw->pScreen->myNum != scrnNum) {
-	/* Picture not on the screen we are restoring*/
-	return;
+        /* Picture not on the screen we are restoring */
+        return;
     }
 
     if (pDraw->type == DRAWABLE_PIXMAP) {
-	PixmapPtr  pPixmap = (PixmapPtr)pDraw;
-	
-	/* Create and restore the pixmap drawable */
-	dmxBECreatePixmap(pPixmap);
-	dmxBERestorePixmap(pPixmap);
+        PixmapPtr pPixmap = (PixmapPtr) pDraw;
+
+        /* Create and restore the pixmap drawable */
+        dmxBECreatePixmap(pPixmap);
+        dmxBERestorePixmap(pPixmap);
     }
 
     dmxBECreatePicture(pPicture);
 }
 
 /** Restore Render's glyphs */
-static void dmxBERestoreRenderGlyph(pointer value, XID id, pointer n)
+static void
+dmxBERestoreRenderGlyph(pointer value, XID id, pointer n)
 {
-    GlyphSetPtr      glyphSet   = value;
-    int              scrnNum    = (uintptr_t)n;
-    dmxGlyphPrivPtr  glyphPriv  = DMX_GET_GLYPH_PRIV(glyphSet);
-    DMXScreenInfo   *dmxScreen  = &dmxScreens[scrnNum];
-    GlyphRefPtr      table;
-    char            *images;
-    Glyph           *gids;
-    XGlyphInfo      *glyphs;
-    char            *pos;
-    int              beret;
-    int              len_images = 0;
-    int              i;
-    int              ctr;
+    GlyphSetPtr glyphSet = value;
+    int scrnNum = (uintptr_t) n;
+    dmxGlyphPrivPtr glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
+    DMXScreenInfo *dmxScreen = &dmxScreens[scrnNum];
+    GlyphRefPtr table;
+    char *images;
+    Glyph *gids;
+    XGlyphInfo *glyphs;
+    char *pos;
+    int beret;
+    int len_images = 0;
+    int i;
+    int ctr;
 
     if (glyphPriv->glyphSets[scrnNum]) {
-	/* Only restore glyphs on the screen we are attaching */
-	return;
+        /* Only restore glyphs on the screen we are attaching */
+        return;
     }
 
     /* First we must create the glyph set on the backend. */
     if ((beret = dmxBECreateGlyphSet(scrnNum, glyphSet)) != Success) {
-	dmxLog(dmxWarning,
-	       "\tdmxBERestoreRenderGlyph failed to create glyphset!\n");
-	return;
+        dmxLog(dmxWarning,
+               "\tdmxBERestoreRenderGlyph failed to create glyphset!\n");
+        return;
     }
 
     /* Now for the complex part, restore the glyph data */
@@ -1111,89 +1175,92 @@ static void dmxBERestoreRenderGlyph(pointer value, XID id, pointer n)
 
     /* We need to know how much memory to allocate for this part */
     for (i = 0; i < glyphSet->hash.hashSet->size; i++) {
-	GlyphRefPtr  gr = &table[i];
-	GlyphPtr     gl = gr->glyph;
+        GlyphRefPtr gr = &table[i];
+        GlyphPtr gl = gr->glyph;
 
-	if (!gl || gl == DeletedGlyph) continue;
-	len_images += gl->size - sizeof(gl->info);
+        if (!gl || gl == DeletedGlyph)
+            continue;
+        len_images += gl->size - sizeof(gl->info);
     }
 
     /* Now allocate the memory we need */
     images = calloc(len_images, sizeof(char));
-    gids   = malloc(glyphSet->hash.tableEntries*sizeof(Glyph));
-    glyphs = malloc(glyphSet->hash.tableEntries*sizeof(XGlyphInfo));
+    gids = malloc(glyphSet->hash.tableEntries * sizeof(Glyph));
+    glyphs = malloc(glyphSet->hash.tableEntries * sizeof(XGlyphInfo));
 
     pos = images;
     ctr = 0;
-    
+
     /* Fill the allocated memory with the proper data */
     for (i = 0; i < glyphSet->hash.hashSet->size; i++) {
-	GlyphRefPtr  gr = &table[i];
-	GlyphPtr     gl = gr->glyph;
-
-	if (!gl || gl == DeletedGlyph) continue;
-
-	/* First lets put the data into gids */
-	gids[ctr] = gr->signature;
-
-	/* Next do the glyphs data structures */
-	glyphs[ctr].width  = gl->info.width;
-	glyphs[ctr].height = gl->info.height;
-	glyphs[ctr].x      = gl->info.x;
-	glyphs[ctr].y      = gl->info.y;
-	glyphs[ctr].xOff   = gl->info.xOff;
-	glyphs[ctr].yOff   = gl->info.yOff;
-
-	/* Copy the images from the DIX's data into the buffer */
-	memcpy(pos, gl+1, gl->size - sizeof(gl->info));
-	pos += gl->size - sizeof(gl->info);
-	ctr++;
+        GlyphRefPtr gr = &table[i];
+        GlyphPtr gl = gr->glyph;
+
+        if (!gl || gl == DeletedGlyph)
+            continue;
+
+        /* First lets put the data into gids */
+        gids[ctr] = gr->signature;
+
+        /* Next do the glyphs data structures */
+        glyphs[ctr].width = gl->info.width;
+        glyphs[ctr].height = gl->info.height;
+        glyphs[ctr].x = gl->info.x;
+        glyphs[ctr].y = gl->info.y;
+        glyphs[ctr].xOff = gl->info.xOff;
+        glyphs[ctr].yOff = gl->info.yOff;
+
+        /* Copy the images from the DIX's data into the buffer */
+        memcpy(pos, gl + 1, gl->size - sizeof(gl->info));
+        pos += gl->size - sizeof(gl->info);
+        ctr++;
     }
-    
+
     /* Now restore the glyph data */
     XRenderAddGlyphs(dmxScreen->beDisplay, glyphPriv->glyphSets[scrnNum],
-		     gids,glyphs, glyphSet->hash.tableEntries, images,
-		     len_images);
+                     gids, glyphs, glyphSet->hash.tableEntries, images,
+                     len_images);
 
     /* Clean up */
     free(images);
     free(gids);
-    free(glyphs);    
+    free(glyphs);
 }
 
 /** Reattach previously detached back-end screen. */
-int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
+int
+dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
 {
-    ScreenPtr      pScreen;
+    ScreenPtr pScreen;
     DMXScreenInfo *dmxScreen;
-    CARD32         scrnNum   = idx;
-    DMXScreenInfo  oldDMXScreen;
-    int            i;
+    CARD32 scrnNum = idx;
+    DMXScreenInfo oldDMXScreen;
+    int i;
 
     /* Return failure if dynamic addition/removal of screens is disabled */
     if (!dmxAddRemoveScreens) {
-	dmxLog(dmxWarning,
-	       "Attempting to add a screen, but the AddRemoveScreen\n");
-	dmxLog(dmxWarning,
-	       "extension has not been enabled.  To enable this extension\n");
-	dmxLog(dmxWarning,
-	       "add the \"-addremovescreens\" option either to the command\n");
-	dmxLog(dmxWarning,
-	       "line or in the configuration file.\n");
-	return 1;
+        dmxLog(dmxWarning,
+               "Attempting to add a screen, but the AddRemoveScreen\n");
+        dmxLog(dmxWarning,
+               "extension has not been enabled.  To enable this extension\n");
+        dmxLog(dmxWarning,
+               "add the \"-addremovescreens\" option either to the command\n");
+        dmxLog(dmxWarning, "line or in the configuration file.\n");
+        return 1;
     }
 
     /* Cannot add a screen that does not exist */
-    if (idx < 0 || idx >= dmxNumScreens) return 1;
+    if (idx < 0 || idx >= dmxNumScreens)
+        return 1;
     pScreen = screenInfo.screens[idx];
     dmxScreen = &dmxScreens[idx];
 
     /* Cannot attach to a screen that is already opened */
     if (dmxScreen->beDisplay) {
-	dmxLog(dmxWarning,
-	       "Attempting to add screen #%d but a screen already exists\n",
-	       idx);
-	return 1;
+        dmxLog(dmxWarning,
+               "Attempting to add screen #%d but a screen already exists\n",
+               idx);
+        return 1;
     }
 
     dmxLogOutput(dmxScreen, "Attaching screen #%d\n", idx);
@@ -1206,13 +1273,12 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
 
     /* Open display and get all of the screen info */
     if (!dmxOpenDisplay(dmxScreen)) {
-	dmxLog(dmxWarning,
-               "dmxOpenDisplay: Unable to open display %s\n",
-               dmxScreen->name);
+        dmxLog(dmxWarning,
+               "dmxOpenDisplay: Unable to open display %s\n", dmxScreen->name);
 
-	/* Restore the old screen */
-	*dmxScreen = oldDMXScreen;
-	return 1;
+        /* Restore the old screen */
+        *dmxScreen = oldDMXScreen;
+        return 1;
     }
 
     dmxSetErrorHandler(dmxScreen);
@@ -1220,13 +1286,13 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
     dmxGetScreenAttribs(dmxScreen);
 
     if (!dmxGetVisualInfo(dmxScreen)) {
-	dmxLog(dmxWarning, "dmxGetVisualInfo: No matching visuals found\n");
-	XFree(dmxScreen->beVisuals);
-	XCloseDisplay(dmxScreen->beDisplay);
+        dmxLog(dmxWarning, "dmxGetVisualInfo: No matching visuals found\n");
+        XFree(dmxScreen->beVisuals);
+        XCloseDisplay(dmxScreen->beDisplay);
 
-	/* Restore the old screen */
-	*dmxScreen = oldDMXScreen;
-	return 1;
+        /* Restore the old screen */
+        *dmxScreen = oldDMXScreen;
+        return 1;
     }
 
     dmxGetColormaps(dmxScreen);
@@ -1235,23 +1301,20 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
     /* Verify that the screen to be added has the same info as the
      * previously added screen. */
     if (!dmxCompareScreens(dmxScreen, &oldDMXScreen)) {
-	dmxLog(dmxWarning,
-	       "New screen data (%s) does not match previously\n",
-	       dmxScreen->name);
-	dmxLog(dmxWarning,
-	       "attached screen data (%s)\n",
-	       oldDMXScreen.name);
-	dmxLog(dmxWarning,
-	       "All data must match in order to attach to screen #%d\n",
-	       idx);
-	XFree(dmxScreen->beVisuals);
-	XFree(dmxScreen->beDepths);
-	XFree(dmxScreen->bePixmapFormats);
-	XCloseDisplay(dmxScreen->beDisplay);
-
-	/* Restore the old screen */
-	*dmxScreen = oldDMXScreen;
-	return 1;
+        dmxLog(dmxWarning,
+               "New screen data (%s) does not match previously\n",
+               dmxScreen->name);
+        dmxLog(dmxWarning, "attached screen data (%s)\n", oldDMXScreen.name);
+        dmxLog(dmxWarning,
+               "All data must match in order to attach to screen #%d\n", idx);
+        XFree(dmxScreen->beVisuals);
+        XFree(dmxScreen->beDepths);
+        XFree(dmxScreen->bePixmapFormats);
+        XCloseDisplay(dmxScreen->beDisplay);
+
+        /* Restore the old screen */
+        *dmxScreen = oldDMXScreen;
+        return 1;
     }
 
     /* Initialize the BE screen resources */
@@ -1268,30 +1331,30 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
     dmxBECreateScratchGCs(idx);
 
     /* Create the default font */
-    (void)dmxBELoadFont(pScreen, defaultFont);
+    (void) dmxBELoadFont(pScreen, defaultFont);
 
     /* Create all resources that don't depend on windows */
-    for (i = currentMaxClients; --i >= 0; )
-	if (clients[i])
-	    FindAllClientResources(clients[i], dmxBECreateResources,
-				   (pointer)(uintptr_t)idx);
+    for (i = currentMaxClients; --i >= 0;)
+        if (clients[i])
+            FindAllClientResources(clients[i], dmxBECreateResources,
+                                   (pointer) (uintptr_t) idx);
 
     /* Create window hierarchy (top down) */
     dmxBECreateWindowTree(idx);
 
     /* Restore the picture state for RENDER */
-    for (i = currentMaxClients; --i >= 0; )
-	if (clients[i])
-	    FindClientResourcesByType(clients[i],PictureType, 
-				      dmxBERestoreRenderPict,
-				      (pointer)(uintptr_t)idx);
+    for (i = currentMaxClients; --i >= 0;)
+        if (clients[i])
+            FindClientResourcesByType(clients[i], PictureType,
+                                      dmxBERestoreRenderPict,
+                                      (pointer) (uintptr_t) idx);
 
     /* Restore the glyph state for RENDER */
-    for (i = currentMaxClients; --i >= 0; )
-	if (clients[i])
-	    FindClientResourcesByType(clients[i],GlyphSetType, 
-				      dmxBERestoreRenderGlyph,
-				      (pointer)(uintptr_t)idx);
+    for (i = currentMaxClients; --i >= 0;)
+        if (clients[i])
+            FindClientResourcesByType(clients[i], GlyphSetType,
+                                      dmxBERestoreRenderGlyph,
+                                      (pointer) (uintptr_t) idx);
 
     /* Refresh screen by generating exposure events for all windows */
     dmxForceExposures(idx);
@@ -1308,10 +1371,10 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension)
-	return dmxConfigureScreenWindows(1, &scrnNum, attr, NULL);
+        return dmxConfigureScreenWindows(1, &scrnNum, attr, NULL);
     else
 #endif
-	return 0; /* Success */
+        return 0;               /* Success */
 }
 
 /*
@@ -1358,34 +1421,36 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
 #ifdef PANORAMIX
 /** Search the Xinerama XRT_PIXMAP resources for the pixmap that needs
  *  to have its image saved. */
-static void dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type,
-				 pointer p)
+static void
+dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type, pointer p)
 {
     if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) {
-	PixmapPtr      pDst     = (PixmapPtr)p;
-	int            idx      = pDst->drawable.pScreen->myNum;
-	PanoramiXRes  *pXinPix  = (PanoramiXRes *)value;
-	PixmapPtr      pPix;
-	int            i;
-
-	dixLookupResourceByType((pointer*) &pPix, pXinPix->info[idx].id,
-				RT_PIXMAP, NullClient, DixUnknownAccess);
-	if (pPix != pDst) return; /* Not a match.... Next! */
-
-	FOR_NSCREENS(i) {
-	    PixmapPtr      pSrc;
-	    dmxPixPrivPtr  pSrcPriv = NULL;
-
-	    if (i == idx) continue; /* Self replication is bad */
-
-	    dixLookupResourceByType((pointer*) &pSrc, pXinPix->info[i].id,
-				    RT_PIXMAP, NullClient, DixUnknownAccess);
-	    pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
-	    if (pSrcPriv->pixmap) {
-		FoundPixImage = True;
-		return;
-	    }
-	}
+        PixmapPtr pDst = (PixmapPtr) p;
+        int idx = pDst->drawable.pScreen->myNum;
+        PanoramiXRes *pXinPix = (PanoramiXRes *) value;
+        PixmapPtr pPix;
+        int i;
+
+        dixLookupResourceByType((pointer *) &pPix, pXinPix->info[idx].id,
+                                RT_PIXMAP, NullClient, DixUnknownAccess);
+        if (pPix != pDst)
+            return;             /* Not a match.... Next! */
+
+        FOR_NSCREENS(i) {
+            PixmapPtr pSrc;
+            dmxPixPrivPtr pSrcPriv = NULL;
+
+            if (i == idx)
+                continue;       /* Self replication is bad */
+
+            dixLookupResourceByType((pointer *) &pSrc, pXinPix->info[i].id,
+                                    RT_PIXMAP, NullClient, DixUnknownAccess);
+            pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
+            if (pSrcPriv->pixmap) {
+                FoundPixImage = True;
+                return;
+            }
+        }
     }
 }
 #endif
@@ -1399,40 +1464,41 @@ static void dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type,
  *  However, if we do not find one, then we need to save the image data.
  *  The common case for these are for the default stipple and root
  *  tile. */
-static void dmxBESavePixmap(PixmapPtr pPixmap)
+static void
+dmxBESavePixmap(PixmapPtr pPixmap)
 {
 #ifdef PANORAMIX
     int i;
 
     /* If Xinerama is not active, there's nothing we can do (see comment
      * in #else below for more info). */
-    if (noPanoramiXExtension) return;
+    if (noPanoramiXExtension)
+        return;
 
     FoundPixImage = False;
-    for (i = currentMaxClients; --i >= 0; )
-	if (clients[i])
-	    FindAllClientResources(clients[i], dmxBEFindPixmapImage,
-				   (pointer)pPixmap);
+    for (i = currentMaxClients; --i >= 0;)
+        if (clients[i])
+            FindAllClientResources(clients[i], dmxBEFindPixmapImage,
+                                   (pointer) pPixmap);
 
     /* Save the image only if there is no other screens that have a
      * pixmap that corresponds to the one we are trying to save. */
     if (!FoundPixImage) {
-	dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
-
-	if (!pPixPriv->detachedImage) {
-	    ScreenPtr      pScreen   = pPixmap->drawable.pScreen;
-	    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-
-	    pPixPriv->detachedImage = XGetImage(dmxScreen->beDisplay,
-						pPixPriv->pixmap,
-						0, 0,
-						pPixmap->drawable.width,
-						pPixmap->drawable.height,
-						-1,
-						ZPixmap);
-	    if (!pPixPriv->detachedImage)
-		dmxLog(dmxWarning, "Cannot save pixmap image\n");
-	}
+        dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+
+        if (!pPixPriv->detachedImage) {
+            ScreenPtr pScreen = pPixmap->drawable.pScreen;
+            DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+
+            pPixPriv->detachedImage = XGetImage(dmxScreen->beDisplay,
+                                                pPixPriv->pixmap,
+                                                0, 0,
+                                                pPixmap->drawable.width,
+                                                pPixmap->drawable.height,
+                                                -1, ZPixmap);
+            if (!pPixPriv->detachedImage)
+                dmxLog(dmxWarning, "Cannot save pixmap image\n");
+        }
     }
 #else
     /* NOTE: The only time there is a pixmap on another screen that
@@ -1452,59 +1518,73 @@ static void dmxBESavePixmap(PixmapPtr pPixmap)
  *  function.  It walks all resources, compares them to the screen
  *  number passed in as \a n and calls the appropriate DMX function to
  *  free the associated resource on the back-end server. */
-static void dmxBEDestroyResources(pointer value, XID id, RESTYPE type,
-				  pointer n)
+static void
+dmxBEDestroyResources(pointer value, XID id, RESTYPE type, pointer n)
 {
-    int        scrnNum = (uintptr_t)n;
-    ScreenPtr  pScreen = screenInfo.screens[scrnNum];
+    int scrnNum = (uintptr_t) n;
+    ScreenPtr pScreen = screenInfo.screens[scrnNum];
 
     if ((type & TypeMask) == (RT_WINDOW & TypeMask)) {
-	/* Window resources are destroyed below in dmxBEDestroyWindowTree */
-    } else if ((type & TypeMask) == (RT_PIXMAP & TypeMask)) {
-	PixmapPtr  pPix = value;
-	if (pPix->drawable.pScreen->myNum == scrnNum) {
-	    dmxBESavePixmap(pPix);
-	    dmxBEFreePixmap(pPix);
-	}
-    } else if ((type & TypeMask) == (RT_GC & TypeMask)) {
-	GCPtr  pGC = value;
-	if (pGC->pScreen->myNum == scrnNum)
-	    dmxBEFreeGC(pGC);
-    } else if ((type & TypeMask) == (RT_FONT & TypeMask)) {
-	dmxBEFreeFont(pScreen, (FontPtr)value);
-    } else if ((type & TypeMask) == (RT_CURSOR & TypeMask)) {
-	dmxBEFreeCursor(pScreen, (CursorPtr)value);
-    } else if ((type & TypeMask) == (RT_COLORMAP & TypeMask)) {
-	ColormapPtr  pCmap = value;
-	if (pCmap->pScreen->myNum == scrnNum)
-	    dmxBEFreeColormap((ColormapPtr)value);
-    } else if ((type & TypeMask) == (PictureType & TypeMask)) {
-	PicturePtr  pPict = value;
-	if (pPict->pDrawable->pScreen->myNum == scrnNum) {
-	    /* Free the pixmaps on the backend if needed */
-	    if (pPict->pDrawable->type == DRAWABLE_PIXMAP) {
-		PixmapPtr pPixmap = (PixmapPtr)(pPict->pDrawable);
-		dmxBESavePixmap(pPixmap);
-		dmxBEFreePixmap(pPixmap);
-	    }
-	    dmxBEFreePicture((PicturePtr)value);
-	}
-    } else if ((type & TypeMask) == (GlyphSetType & TypeMask)) {
-	dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value);
-    } else {
-	/* Other resource types??? */
+        /* Window resources are destroyed below in dmxBEDestroyWindowTree */
+    }
+    else if ((type & TypeMask) == (RT_PIXMAP & TypeMask)) {
+        PixmapPtr pPix = value;
+
+        if (pPix->drawable.pScreen->myNum == scrnNum) {
+            dmxBESavePixmap(pPix);
+            dmxBEFreePixmap(pPix);
+        }
+    }
+    else if ((type & TypeMask) == (RT_GC & TypeMask)) {
+        GCPtr pGC = value;
+
+        if (pGC->pScreen->myNum == scrnNum)
+            dmxBEFreeGC(pGC);
+    }
+    else if ((type & TypeMask) == (RT_FONT & TypeMask)) {
+        dmxBEFreeFont(pScreen, (FontPtr) value);
+    }
+    else if ((type & TypeMask) == (RT_CURSOR & TypeMask)) {
+        dmxBEFreeCursor(pScreen, (CursorPtr) value);
+    }
+    else if ((type & TypeMask) == (RT_COLORMAP & TypeMask)) {
+        ColormapPtr pCmap = value;
+
+        if (pCmap->pScreen->myNum == scrnNum)
+            dmxBEFreeColormap((ColormapPtr) value);
+    }
+    else if ((type & TypeMask) == (PictureType & TypeMask)) {
+        PicturePtr pPict = value;
+
+        if (pPict->pDrawable->pScreen->myNum == scrnNum) {
+            /* Free the pixmaps on the backend if needed */
+            if (pPict->pDrawable->type == DRAWABLE_PIXMAP) {
+                PixmapPtr pPixmap = (PixmapPtr) (pPict->pDrawable);
+
+                dmxBESavePixmap(pPixmap);
+                dmxBEFreePixmap(pPixmap);
+            }
+            dmxBEFreePicture((PicturePtr) value);
+        }
+    }
+    else if ((type & TypeMask) == (GlyphSetType & TypeMask)) {
+        dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr) value);
+    }
+    else {
+        /* Other resource types??? */
     }
 }
 
 /** Destroy the scratch GCs that are created per depth. */
-static void dmxBEDestroyScratchGCs(int scrnNum)
+static void
+dmxBEDestroyScratchGCs(int scrnNum)
 {
-    ScreenPtr  pScreen = screenInfo.screens[scrnNum];
-    GCPtr     *ppGC    = pScreen->GCperDepth;
-    int        i;
+    ScreenPtr pScreen = screenInfo.screens[scrnNum];
+    GCPtr *ppGC = pScreen->GCperDepth;
+    int i;
 
     for (i = 0; i <= pScreen->numDepths; i++)
-	dmxBEFreeGC(ppGC[i]);
+        dmxBEFreeGC(ppGC[i]);
 }
 
 /** Destroy window hierachy on back-end server.  To ensure that all
@@ -1512,79 +1592,81 @@ static void dmxBEDestroyScratchGCs(int scrnNum)
  *  up order so that windows are not destroyed before their children.
  *  XDestroyWindow(), which is called from #dmxBEDestroyWindow(), will
  *  destroy a window as well as all of it's children. */
-static void dmxBEDestroyWindowTree(int idx)
+static void
+dmxBEDestroyWindowTree(int idx)
 {
-    WindowPtr  pWin   = screenInfo.screens[idx]->root;
-    WindowPtr  pChild = pWin;
+    WindowPtr pWin = screenInfo.screens[idx]->root;
+    WindowPtr pChild = pWin;
 
     while (1) {
-	if (pChild->firstChild) {
-	    pChild = pChild->firstChild;
-	    continue;
-	}
-
-	/* Destroy the window */
-	dmxBEDestroyWindow(pChild);
-
-	/* Make sure we destroy the window's border and background
-	 * pixmaps if they exist */
-	if (!pChild->borderIsPixel) {
-	    dmxBESavePixmap(pChild->border.pixmap);
-	    dmxBEFreePixmap(pChild->border.pixmap);
-	}
-	if (pChild->backgroundState == BackgroundPixmap) {
-	    dmxBESavePixmap(pChild->background.pixmap);
-	    dmxBEFreePixmap(pChild->background.pixmap);
-	}
-
-	while (!pChild->nextSib && (pChild != pWin)) {
-	    pChild = pChild->parent;
-	    dmxBEDestroyWindow(pChild);
-	    if (!pChild->borderIsPixel) {
-		dmxBESavePixmap(pChild->border.pixmap);
-		dmxBEFreePixmap(pChild->border.pixmap);
-	    }
-	    if (pChild->backgroundState == BackgroundPixmap) {
-		dmxBESavePixmap(pChild->background.pixmap);
-		dmxBEFreePixmap(pChild->background.pixmap);
-	    }
-	}
-
-	if (pChild == pWin)
-	    break;
-
-	pChild = pChild->nextSib;
+        if (pChild->firstChild) {
+            pChild = pChild->firstChild;
+            continue;
+        }
+
+        /* Destroy the window */
+        dmxBEDestroyWindow(pChild);
+
+        /* Make sure we destroy the window's border and background
+         * pixmaps if they exist */
+        if (!pChild->borderIsPixel) {
+            dmxBESavePixmap(pChild->border.pixmap);
+            dmxBEFreePixmap(pChild->border.pixmap);
+        }
+        if (pChild->backgroundState == BackgroundPixmap) {
+            dmxBESavePixmap(pChild->background.pixmap);
+            dmxBEFreePixmap(pChild->background.pixmap);
+        }
+
+        while (!pChild->nextSib && (pChild != pWin)) {
+            pChild = pChild->parent;
+            dmxBEDestroyWindow(pChild);
+            if (!pChild->borderIsPixel) {
+                dmxBESavePixmap(pChild->border.pixmap);
+                dmxBEFreePixmap(pChild->border.pixmap);
+            }
+            if (pChild->backgroundState == BackgroundPixmap) {
+                dmxBESavePixmap(pChild->background.pixmap);
+                dmxBEFreePixmap(pChild->background.pixmap);
+            }
+        }
+
+        if (pChild == pWin)
+            break;
+
+        pChild = pChild->nextSib;
     }
 }
 
 /** Detach back-end screen. */
-int dmxDetachScreen(int idx)
+int
+dmxDetachScreen(int idx)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[idx];
-    int            i;
+    int i;
 
     /* Return failure if dynamic addition/removal of screens is disabled */
     if (!dmxAddRemoveScreens) {
-	dmxLog(dmxWarning,
-	       "Attempting to remove a screen, but the AddRemoveScreen\n");
-	dmxLog(dmxWarning,
-	       "extension has not been enabled.  To enable this extension\n");
-	dmxLog(dmxWarning,
-	       "add the \"-addremovescreens\" option either to the command\n");
-	dmxLog(dmxWarning,
-	       "line or in the configuration file.\n");
-	return 1;
+        dmxLog(dmxWarning,
+               "Attempting to remove a screen, but the AddRemoveScreen\n");
+        dmxLog(dmxWarning,
+               "extension has not been enabled.  To enable this extension\n");
+        dmxLog(dmxWarning,
+               "add the \"-addremovescreens\" option either to the command\n");
+        dmxLog(dmxWarning, "line or in the configuration file.\n");
+        return 1;
     }
 
     /* Cannot remove a screen that does not exist */
-    if (idx < 0 || idx >= dmxNumScreens) return 1;
+    if (idx < 0 || idx >= dmxNumScreens)
+        return 1;
 
     /* Cannot detach from a screen that is not opened */
     if (!dmxScreen->beDisplay) {
-	dmxLog(dmxWarning,
-	       "Attempting to remove screen #%d but it has not been opened\n",
-	       idx);
-	return 1;
+        dmxLog(dmxWarning,
+               "Attempting to remove screen #%d but it has not been opened\n",
+               idx);
+        return 1;
     }
 
     dmxLogOutput(dmxScreen, "Detaching screen #%d\n", idx);
@@ -1595,10 +1677,10 @@ int dmxDetachScreen(int idx)
     /* Save all relevant state (TODO) */
 
     /* Free all non-window resources related to this screen */
-    for (i = currentMaxClients; --i >= 0; )
-	if (clients[i])
-	    FindAllClientResources(clients[i], dmxBEDestroyResources,
-				   (pointer)(uintptr_t)idx);
+    for (i = currentMaxClients; --i >= 0;)
+        if (clients[i])
+            FindAllClientResources(clients[i], dmxBEDestroyResources,
+                                   (pointer) (uintptr_t) idx);
 
     /* Free scratch GCs */
     dmxBEDestroyScratchGCs(idx);
@@ -1616,5 +1698,5 @@ int dmxDetachScreen(int idx)
     /* Adjust the cursor boundaries (paints detached console window) */
     dmxAdjustCursorBoundaries();
 
-    return 0; /* Success */
+    return 0;                   /* Success */
 }
diff --git a/xorg-server/hw/dmx/dmxextension.h b/xorg-server/hw/dmx/dmxextension.h
index 5a6fd0e9f..036417b8d 100644
--- a/xorg-server/hw/dmx/dmxextension.h
+++ b/xorg-server/hw/dmx/dmxextension.h
@@ -42,77 +42,74 @@
 /** Screen attributes.  Used by #ProcDMXGetScreenAttributes and
  * \a ProcDMXChangeScreensAttributes. */
 typedef struct {
-    const char   *displayName;
-    int          logicalScreen;
+    const char *displayName;
+    int logicalScreen;
 
-    unsigned int screenWindowWidth;    /* displayName's coordinate system */
-    unsigned int screenWindowHeight;   /* displayName's coordinate system */
-    int          screenWindowXoffset;  /* displayName's coordinate system */
-    int          screenWindowYoffset;  /* displayName's coordinate system */
+    unsigned int screenWindowWidth;     /* displayName's coordinate system */
+    unsigned int screenWindowHeight;    /* displayName's coordinate system */
+    int screenWindowXoffset;    /* displayName's coordinate system */
+    int screenWindowYoffset;    /* displayName's coordinate system */
 
-    unsigned int rootWindowWidth;      /* screenWindow's coordinate system */
-    unsigned int rootWindowHeight;     /* screenWindow's coordinate system */
-    int          rootWindowXoffset;    /* screenWindow's coordinate system */
-    int          rootWindowYoffset;    /* screenWindow's coordinate system */
+    unsigned int rootWindowWidth;       /* screenWindow's coordinate system */
+    unsigned int rootWindowHeight;      /* screenWindow's coordinate system */
+    int rootWindowXoffset;      /* screenWindow's coordinate system */
+    int rootWindowYoffset;      /* screenWindow's coordinate system */
 
-    int          rootWindowXorigin;    /* global coordinate system */
-    int          rootWindowYorigin;    /* global coordinate system */
+    int rootWindowXorigin;      /* global coordinate system */
+    int rootWindowYorigin;      /* global coordinate system */
 } DMXScreenAttributesRec, *DMXScreenAttributesPtr;
 
 /** Window attributes.  Used by #ProcDMXGetWindowAttributes. */
 typedef struct {
-    int          screen;
-    Window       window;
-    xRectangle   pos;
-    xRectangle   vis;
+    int screen;
+    Window window;
+    xRectangle pos;
+    xRectangle vis;
 } DMXWindowAttributesRec, *DMXWindowAttributesPtr;
 
 /** Desktop attributes.  Used by #ProcDMXGetDesktopAttributes and
  * #ProcDMXChangeDesktopAttributes. */
 typedef struct {
-    int          width;
-    int          height;
-    int          shiftX;
-    int          shiftY;
+    int width;
+    int height;
+    int shiftX;
+    int shiftY;
 } DMXDesktopAttributesRec, *DMXDesktopAttributesPtr;
 
 /** Input attributes.  Used by #ProcDMXGetInputAttributes. */
 typedef struct {
-    const char   *name;
-    int          inputType;
-    int          physicalScreen;
-    int          physicalId;
-    int          isCore;
-    int          sendsCore;
-    int          detached;
+    const char *name;
+    int inputType;
+    int physicalScreen;
+    int physicalId;
+    int isCore;
+    int sendsCore;
+    int detached;
 } DMXInputAttributesRec, *DMXInputAttributesPtr;
 
-
 extern unsigned long dmxGetNumScreens(void);
-extern void          dmxForceWindowCreation(WindowPtr pWindow);
-extern void          dmxFlushPendingSyncs(void);
-extern Bool          dmxGetScreenAttributes(int physical,
-                                            DMXScreenAttributesPtr attr);
-extern Bool          dmxGetWindowAttributes(WindowPtr pWindow,
-                                            DMXWindowAttributesPtr attr);
-extern void          dmxGetDesktopAttributes(DMXDesktopAttributesPtr attr);
-extern int           dmxGetInputCount(void);
-extern int           dmxGetInputAttributes(int deviceId,
-                                           DMXInputAttributesPtr attr);
-extern int           dmxAddInput(DMXInputAttributesPtr attr, int *deviceId);
-extern int           dmxRemoveInput(int deviceId);
-
-extern int           dmxConfigureScreenWindows(int nscreens,
-					       CARD32 *screens,
-					       DMXScreenAttributesPtr attribs,
-					       int *errorScreen);
-
-extern int           dmxConfigureDesktop(DMXDesktopAttributesPtr attribs);
+extern void dmxForceWindowCreation(WindowPtr pWindow);
+extern void dmxFlushPendingSyncs(void);
+extern Bool dmxGetScreenAttributes(int physical, DMXScreenAttributesPtr attr);
+extern Bool dmxGetWindowAttributes(WindowPtr pWindow,
+                                   DMXWindowAttributesPtr attr);
+extern void dmxGetDesktopAttributes(DMXDesktopAttributesPtr attr);
+extern int dmxGetInputCount(void);
+extern int dmxGetInputAttributes(int deviceId, DMXInputAttributesPtr attr);
+extern int dmxAddInput(DMXInputAttributesPtr attr, int *deviceId);
+extern int dmxRemoveInput(int deviceId);
+
+extern int dmxConfigureScreenWindows(int nscreens,
+                                     CARD32 *screens,
+                                     DMXScreenAttributesPtr attribs,
+                                     int *errorScreen);
+
+extern int dmxConfigureDesktop(DMXDesktopAttributesPtr attribs);
 
 /* dmxUpdateScreenResources exposed for dmxCreateWindow in dmxwindow.c */
-extern void          dmxUpdateScreenResources(ScreenPtr pScreen,
-                                              int x, int y, int w, int h);
+extern void dmxUpdateScreenResources(ScreenPtr pScreen,
+                                     int x, int y, int w, int h);
 
-extern int           dmxAttachScreen(int idx, DMXScreenAttributesPtr attr);
-extern int           dmxDetachScreen(int idx);
+extern int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr);
+extern int dmxDetachScreen(int idx);
 #endif
diff --git a/xorg-server/hw/dmx/dmxfont.c b/xorg-server/hw/dmx/dmxfont.c
index 8b57b6f3b..7ef7ad971 100644
--- a/xorg-server/hw/dmx/dmxfont.c
+++ b/xorg-server/hw/dmx/dmxfont.c
@@ -1,551 +1,572 @@
-/*

- * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Kevin E. Martin <kem@redhat.com>

- *

- */

-

-/** \file

- * This file provides support for fonts. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#define DMX_FONTPATH_DEBUG 0

-

-#include "dmx.h"

-#include "dmxsync.h"

-#include "dmxfont.h"

-#include "dmxlog.h"

-

-#include <X11/fonts/fontstruct.h>

-#include "dixfont.h"

-#include "dixstruct.h"

-

-static int (*dmxSaveProcVector[256])(ClientPtr);

-static int   dmxFontLastError;

-

-static int dmxFontErrorHandler(Display *dpy, XErrorEvent *ev)

-{

-    dmxFontLastError = ev->error_code;

-

-    return 0;

-}

-

-static char **dmxGetFontPath(int *npaths)

-{

-    char          **fp;

-    unsigned char  *c, *paths;

-    char           *newfp;

-    int             len, l, i;

-

-    GetFontPath(serverClient, npaths, &len, &paths);

-

-    newfp = malloc(*npaths + len);

-    c = (unsigned char *)newfp;

-    fp = malloc(*npaths * sizeof(*fp));

-

-    memmove(newfp, paths+1, *npaths + len - 1);

-    l = *paths;

-    for (i = 0; i < *npaths; i++) {

-	fp[i] = (char *)c;

-	c += l;

-	l = *c;

-	*c++ = '\0';

-    }

-

-#if DMX_FONTPATH_DEBUG

-    for (i = 0; i < *npaths; i++)

-        dmxLog(dmxDebug, "FontPath[%d] = %s\n", i, fp[i]);

-#endif

-

-    return fp;

-}

-

-static void dmxFreeFontPath(char **fp)

-{

-    free(fp[0]);

-    free(fp);

-}

-

-static Bool dmxCheckFontPathElement(DMXScreenInfo *dmxScreen, char *fp)

-{

-    int  (*oldErrorHandler)(Display *, XErrorEvent *);

-

-    if (!dmxScreen->beDisplay)

-	return TRUE;

-

-    dmxFontLastError = 0;

-    oldErrorHandler = XSetErrorHandler(dmxFontErrorHandler);

-    XSetFontPath(dmxScreen->beDisplay, &fp, 1);

-    dmxSync(dmxScreen, TRUE);   /* Must complete before removing handler */

-    XSetErrorHandler(oldErrorHandler);

-

-    return dmxFontLastError == 0;

-}

-

-static int dmxSetFontPath(DMXScreenInfo *dmxScreen)

-{

-    int  (*oldErrorHandler)(Display *, XErrorEvent *);

-    char **fp;

-    int    result = Success;

-    int    npaths;

-

-    if (!dmxScreen->beDisplay)

-	return result;

-

-    fp = dmxGetFontPath(&npaths);

-    if (!fp) return BadAlloc;

-

-    dmxFontLastError = 0;

-    oldErrorHandler = XSetErrorHandler(dmxFontErrorHandler);

-    XSetFontPath(dmxScreen->beDisplay, fp, npaths);

-    dmxSync(dmxScreen, TRUE);   /* Must complete before removing handler */

-    XSetErrorHandler(oldErrorHandler);

-

-    if (dmxFontLastError) {

-	result = dmxFontLastError;

-	/* We could set *error here to the offending path, but it is

-	 * ignored, so we don't bother figuring out which path is bad.

-	 * If we do add this support in the future, we'll need to add

-	 * error to the function's argument list.

-	 */

-    }

-

-    dmxFreeFontPath(fp);

-

-    return result;

-}

-

-static int dmxCheckFontPath(DMXScreenInfo *dmxScreen, int *error)

-{

-    char **oldFontPath;

-    int    nOldPaths;

-    int    result = Success;

-

-    if (!dmxScreen->beDisplay)

-	return result;

-

-    /* Save old font path */

-    oldFontPath = XGetFontPath(dmxScreen->beDisplay, &nOldPaths);

-

-    result = dmxSetFontPath(dmxScreen);

-

-    /* Restore old font path */

-    XSetFontPath(dmxScreen->beDisplay, oldFontPath, nOldPaths);

-    XFreeFontPath(oldFontPath);

-    dmxSync(dmxScreen, FALSE);

-

-    return result;

-}

-

-static int dmxProcSetFontPath(ClientPtr client)

-{

-    unsigned char *ptr;

-    unsigned long  nbytes, total, n;

-    long           nfonts;

-    int            i, result;

-    unsigned char *oldFontPath, *tmpFontPath;

-    int            nOldPaths;

-    int            lenOldPaths;

-    REQUEST(xSetFontPathReq);

-    

-    REQUEST_AT_LEAST_SIZE(xSetFontPathReq);

-    

-    nbytes = (client->req_len << 2) - sizeof(xSetFontPathReq);

-    total = nbytes;

-    ptr = (unsigned char *)&stuff[1];

-    nfonts = stuff->nFonts;

-

-    while (--nfonts >= 0) {

-	if ((total == 0) || (total < (n = (*ptr + 1))))

-	    return BadLength;

-	total -= n;

-	ptr += n;

-    }

-    if (total >= 4)

-        return BadLength;

-

-    GetFontPath(serverClient, &nOldPaths, &lenOldPaths, &tmpFontPath);

-    oldFontPath = malloc(nOldPaths + lenOldPaths);

-    memmove(oldFontPath, tmpFontPath, nOldPaths + lenOldPaths);

-

-    result = SetFontPath(client, stuff->nFonts, (unsigned char *)&stuff[1]);

-    if (!result) {

-	int error = 0;

-	for (i = 0; i < dmxNumScreens; i++)

-	    if ((result = dmxCheckFontPath(&dmxScreens[i], &error)))

-		break;

-

-	if (result) {

-	    /* Restore old fontpath in the DMX server */

-	    SetFontPath(client, nOldPaths, oldFontPath);

-	    client->errorValue = error;

-	}

-    }

-

-    free(oldFontPath);

-    return result;

-}

-

-/** Initialize font support.  In addition to the screen function call

- *  pointers, DMX also hooks in at the ProcVector[] level.  Here the old

- *  ProcVector function pointers are saved and the new ProcVector

- *  function pointers are initialized. */

-void dmxInitFonts(void)

-{

-    int  i;

-

-    for (i = 0; i < 256; i++)

-	dmxSaveProcVector[i] = ProcVector[i];

-

-    ProcVector[X_SetFontPath] = dmxProcSetFontPath;

-}

-

-/** Reset font support by restoring the original ProcVector function

- *  pointers. */

-void dmxResetFonts(void)

-{

-    int  i;

-

-    for (i = 0; i < 256; i++)

-	ProcVector[i] = dmxSaveProcVector[i];

-}

-

-/** Load the font, \a pFont, on the back-end server associated with \a

- *  pScreen.  When a font is loaded, the font path on back-end server is

- *  first initialized to that specified on the command line with the

- *  -fontpath options, and then the font is loaded. */

-Bool dmxBELoadFont(ScreenPtr pScreen, FontPtr pFont)

-{

-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxFontPrivPtr  pFontPriv = FontGetPrivate(pFont, dmxFontPrivateIndex);

-    const char     *name;

-    char          **oldFontPath = NULL;

-    int             nOldPaths;

-    Atom            name_atom, value_atom;

-    int             i;

-

-    /* Make sure we have a font private struct to work with */

-    if (!pFontPriv)

-	return FALSE;

-

-    /* Don't load a font over top of itself */

-    if (pFontPriv->font[pScreen->myNum]) {

-	return TRUE; /* Already loaded font */

-    }

-

-    /* Save old font path */

-    oldFontPath = XGetFontPath(dmxScreen->beDisplay, &nOldPaths);

-

-    /* Set the font path for the font about to be loaded on the back-end */

-    if (dmxSetFontPath(dmxScreen)) {

-	char **fp;

-	int    npaths;

-	Bool  *goodfps;

-

-	/* This could fail only when first starting the X server and

-	 * loading the default font.  If it fails here, then the default

-	 * font path is invalid, no default font path will be set, the

-	 * DMX server will fail to load the default font, and it will

-	 * exit with an error unless we remove the offending font paths

-	 * with the -ignorebadfontpaths command line option.

-	 */

-

-	fp = dmxGetFontPath(&npaths);

-	if (!fp) {

-	    dmxLog(dmxError,

-		   "No default font path set.\n");

-	    dmxLog(dmxError,

-		   "Please see the Xdmx man page for information on how to\n");

-	    dmxLog(dmxError,

-		   "initialize the DMX server's default font path.\n");

-	    XFreeFontPath(oldFontPath);

-	    return FALSE;

-	}

-

-	if (!dmxFontPath)

-	    dmxLog(dmxWarning, "No default font path is set.\n");

-

-	goodfps = malloc(npaths * sizeof(*goodfps));

-

-	dmxLog(dmxError,

-	       "The DMX server failed to set the following font paths on "

-	       "screen #%d:\n", pScreen->myNum);

-	

-	for (i = 0; i < npaths; i++)

-	    if (!(goodfps[i] = dmxCheckFontPathElement(dmxScreen, fp[i])))

-		dmxLog(dmxError, "    %s\n", fp[i]);

-

-	if (dmxIgnoreBadFontPaths) {

-	    char *newfp;

-	    int   newnpaths = 0;

-	    int   len = 0;

-	    int   j = 0;

-

-	    dmxLog(dmxError,

-		   "These font paths will not be used because the "

-		   "\"-ignorebadfontpaths\"\n");

-	    dmxLog(dmxError,

-		   "option is set.\n");

-

-	    for (i = 0; i < npaths; i++)

-		if (goodfps[i]) {

-		    len += strlen(fp[i]) + 1;

-		    newnpaths++;

-		}

-

-	    if (!newnpaths) {

-		/* No valid font paths were found */

-		dmxLog(dmxError,

-		       "After removing the font paths above, no valid font "

-		       "paths were\n");

-		dmxLog(dmxError,

-		       "available.  Please check that the font paths set on "

-		       "the command\n");

-		dmxLog(dmxError,

-		       "line or in the configuration file via the "

-		       "\"-fontpath\" option\n");

-		dmxLog(dmxError,

-		       "are valid on all back-end servers.  See the Xdmx man "

-		       "page for\n");

-		dmxLog(dmxError,

-		       "more information on font paths.\n");

-		dmxFreeFontPath(fp);

-		XFreeFontPath(oldFontPath);

-		free(goodfps);

-		return FALSE;

-	    }

-

-	    newfp = malloc(len * sizeof(*newfp));

-	    for (i = 0; i < npaths; i++) {

-		if (goodfps[i]) {

-		    int n = strlen(fp[i]);

-		    newfp[j++] = n;

-		    strncpy(&newfp[j], fp[i], n);

-		    j += n;

-		}

-	    }

-

-	    if (SetFontPath(serverClient, newnpaths, (unsigned char *)newfp)) {

-		/* Note that this should never happen since all of the

-		 * FPEs were previously valid. */

-		dmxLog(dmxError, "Cannot reset the default font path.\n");

-	    }

-	} else if (dmxFontPath) {

-	    dmxLog(dmxError,

-		   "Please remove these font paths from the command line "

-		   "or\n");

-	    dmxLog(dmxError,

-		   "configuration file, or set the \"-ignorebadfontpaths\" "

-		   "option to\n");

-	    dmxLog(dmxError,

-		   "ignore them.  For more information on these options, see "

-		   "the\n");

-	    dmxLog(dmxError,

-		   "Xdmx man page.\n");

-	} else {

-	    dmxLog(dmxError,

-		   "Please specify the font paths that are available on all "

-		   "back-end\n");

-	    dmxLog(dmxError,

-		   "servers with the \"-fontpath\" option, or use the "

-                   "\"-ignorebadfontpaths\"\n");

-            dmxLog(dmxError,

-                   "to ignore bad defaults.  For more information on "

-                   "these and other\n");

-	    dmxLog(dmxError,

-		   "font-path-related options, see the Xdmx man page.\n");

-	}

-

-	if (!dmxIgnoreBadFontPaths ||

-	    (dmxIgnoreBadFontPaths && dmxSetFontPath(dmxScreen))) {

-	    /* We still have errors so return with error */

-	    dmxFreeFontPath(fp);

-	    XFreeFontPath(oldFontPath);

-	    free(goodfps);

-	    return FALSE;

-	}

-    }

-

-    /* Find requested font on back-end server */

-    name_atom = MakeAtom("FONT", 4, TRUE);

-    value_atom = 0L;

-

-    for (i = 0; i < pFont->info.nprops; i++) {

-	if ((Atom)pFont->info.props[i].name == name_atom) {

-	    value_atom = pFont->info.props[i].value;

-	    break;

-	}

-    }

-    if (!value_atom) return FALSE;

-

-    name = NameForAtom(value_atom);

-    if (!name) return FALSE;

-

-    pFontPriv->font[pScreen->myNum] = 

-	XLoadQueryFont(dmxScreen->beDisplay, name);

-

-    /* Restore old font path */

-    XSetFontPath(dmxScreen->beDisplay, oldFontPath, nOldPaths);

-    XFreeFontPath(oldFontPath);

-    dmxSync(dmxScreen, FALSE);

-

-    if (!pFontPriv->font[pScreen->myNum]) return FALSE;

-

-    return TRUE;

-}

-

-/** Realize the font, \a pFont, on the back-end server associated with

- *  \a pScreen. */

-Bool dmxRealizeFont(ScreenPtr pScreen, FontPtr pFont)

-{

-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxFontPrivPtr  pFontPriv;

-

-    if (!(pFontPriv = FontGetPrivate(pFont, dmxFontPrivateIndex))) {

-	FontSetPrivate(pFont, dmxFontPrivateIndex, NULL);

-	pFontPriv = malloc(sizeof(dmxFontPrivRec));

-	if (!pFontPriv) return FALSE;

-        pFontPriv->font = NULL;

-        MAXSCREENSALLOC(pFontPriv->font);

-        if (!pFontPriv->font) {

-            free(pFontPriv);

-            return FALSE;

-        }

-	pFontPriv->refcnt = 0;

-    }

-

-    FontSetPrivate(pFont, dmxFontPrivateIndex, (pointer)pFontPriv);

-

-    if (dmxScreen->beDisplay) {

-	if (!dmxBELoadFont(pScreen, pFont))

-	    return FALSE;

-

-	pFontPriv->refcnt++;

-    } else {

-	pFontPriv->font[pScreen->myNum] = NULL;

-    }

-

-    return TRUE;

-}

-

-/** Free \a pFont on the back-end associated with \a pScreen. */

-Bool dmxBEFreeFont(ScreenPtr pScreen, FontPtr pFont)

-{

-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxFontPrivPtr  pFontPriv = FontGetPrivate(pFont, dmxFontPrivateIndex);

-

-    if (pFontPriv && pFontPriv->font[pScreen->myNum]) {

-	XFreeFont(dmxScreen->beDisplay, pFontPriv->font[pScreen->myNum]);

-	pFontPriv->font[pScreen->myNum] = NULL;

-	return TRUE;

-    }

-

-    return FALSE;

-}

-

-/** Unrealize the font, \a pFont, on the back-end server associated with

- *  \a pScreen. */

-Bool dmxUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)

-{

-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxFontPrivPtr  pFontPriv;

-

-    if ((pFontPriv = FontGetPrivate(pFont, dmxFontPrivateIndex))) {

-	/* In case the font failed to load properly */

-	if (!pFontPriv->refcnt) {

-            MAXSCREENSFREE(pFontPriv->font);

-	    free(pFontPriv);

-	    FontSetPrivate(pFont, dmxFontPrivateIndex, NULL);

-	} else if (pFontPriv->font[pScreen->myNum]) {

-	    if (dmxScreen->beDisplay)

-		dmxBEFreeFont(pScreen, pFont);

-

-	    /* The code below is non-obvious, so here's an explanation...

-	     *

-	     * When creating the default GC, the server opens up the

-	     * default font once for each screen, which in turn calls

-	     * the RealizeFont function pointer once for each screen.

-	     * During this process both dix's font refcnt and DMX's font

-	     * refcnt are incremented once for each screen.

-	     *

-	     * Later, when shutting down the X server, dix shuts down

-	     * each screen in reverse order.  During this shutdown

-	     * procedure, each screen's default GC is freed and then

-	     * that screen is closed by calling the CloseScreen function

-	     * pointer.  screenInfo.numScreens is then decremented after

-	     * closing each screen.  This procedure means that the dix's

-	     * font refcnt for the font used by the default GC's is

-	     * decremented once for each screen # greater than 0.

-	     * However, since dix's refcnt for the default font is not

-	     * yet 0 for each screen greater than 0, no call to the

-	     * UnrealizeFont function pointer is made for those screens.

-	     * Then, when screen 0 is being closed, dix's font refcnt

-	     * for the default GC's font is finally 0 and the font is

-	     * unrealized.  However, since screenInfo.numScreens has

-	     * been decremented already down to 1, only one call to

-	     * UnrealizeFont is made (for screen 0).  Thus, even though

-	     * RealizeFont was called once for each screen,

-	     * UnrealizeFont is only called for screen 0.

-	     *

-	     * This is a bug in dix.

-	     *

-	     * To avoid the memory leak of pFontPriv for each server

-	     * generation, we can also free pFontPriv if the refcnt is

-	     * not yet 0 but the # of screens is 1 -- i.e., the case

-	     * described in the dix bug above.  This is only a temporary

-	     * workaround until the bug in dix is solved.

-	     *

-	     * The other problem is that the font structure allocated by

-	     * XLoadQueryFont() above is not freed for screens > 0.

-	     * This problem cannot be worked around here since the back-

-	     * end displays for screens > 0 have already been closed by

-	     * the time this code is called from dix.

-	     *

-	     * When the bug in dix described above is fixed, then we can

-	     * remove the "|| screenInfo.numScreens == 1" code below and

-	     * the memory leaks will be eliminated.

-	     */

-	    if (--pFontPriv->refcnt == 0

-#if 1

-		/* Remove this code when the dix bug is fixed */

-		|| screenInfo.numScreens == 1

-#endif

-		) {

-                MAXSCREENSFREE(pFontPriv->font);

-		free(pFontPriv);

-		FontSetPrivate(pFont, dmxFontPrivateIndex, NULL);

-	    }

-	}

-    }

-

-    return TRUE;

-}

+/*
+ * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+/** \file
+ * This file provides support for fonts. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#define DMX_FONTPATH_DEBUG 0
+
+#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxfont.h"
+#include "dmxlog.h"
+
+#include <X11/fonts/fontstruct.h>
+#include "dixfont.h"
+#include "dixstruct.h"
+
+static int (*dmxSaveProcVector[256]) (ClientPtr);
+static int dmxFontLastError;
+
+static int
+dmxFontErrorHandler(Display * dpy, XErrorEvent * ev)
+{
+    dmxFontLastError = ev->error_code;
+
+    return 0;
+}
+
+static char **
+dmxGetFontPath(int *npaths)
+{
+    char **fp;
+    unsigned char *c, *paths;
+    char *newfp;
+    int len, l, i;
+
+    GetFontPath(serverClient, npaths, &len, &paths);
+
+    newfp = malloc(*npaths + len);
+    c = (unsigned char *) newfp;
+    fp = malloc(*npaths * sizeof(*fp));
+
+    memmove(newfp, paths + 1, *npaths + len - 1);
+    l = *paths;
+    for (i = 0; i < *npaths; i++) {
+        fp[i] = (char *) c;
+        c += l;
+        l = *c;
+        *c++ = '\0';
+    }
+
+#if DMX_FONTPATH_DEBUG
+    for (i = 0; i < *npaths; i++)
+        dmxLog(dmxDebug, "FontPath[%d] = %s\n", i, fp[i]);
+#endif
+
+    return fp;
+}
+
+static void
+dmxFreeFontPath(char **fp)
+{
+    free(fp[0]);
+    free(fp);
+}
+
+static Bool
+dmxCheckFontPathElement(DMXScreenInfo * dmxScreen, char *fp)
+{
+    int (*oldErrorHandler) (Display *, XErrorEvent *);
+
+    if (!dmxScreen->beDisplay)
+        return TRUE;
+
+    dmxFontLastError = 0;
+    oldErrorHandler = XSetErrorHandler(dmxFontErrorHandler);
+    XSetFontPath(dmxScreen->beDisplay, &fp, 1);
+    dmxSync(dmxScreen, TRUE);   /* Must complete before removing handler */
+    XSetErrorHandler(oldErrorHandler);
+
+    return dmxFontLastError == 0;
+}
+
+static int
+dmxSetFontPath(DMXScreenInfo * dmxScreen)
+{
+    int (*oldErrorHandler) (Display *, XErrorEvent *);
+    char **fp;
+    int result = Success;
+    int npaths;
+
+    if (!dmxScreen->beDisplay)
+        return result;
+
+    fp = dmxGetFontPath(&npaths);
+    if (!fp)
+        return BadAlloc;
+
+    dmxFontLastError = 0;
+    oldErrorHandler = XSetErrorHandler(dmxFontErrorHandler);
+    XSetFontPath(dmxScreen->beDisplay, fp, npaths);
+    dmxSync(dmxScreen, TRUE);   /* Must complete before removing handler */
+    XSetErrorHandler(oldErrorHandler);
+
+    if (dmxFontLastError) {
+        result = dmxFontLastError;
+        /* We could set *error here to the offending path, but it is
+         * ignored, so we don't bother figuring out which path is bad.
+         * If we do add this support in the future, we'll need to add
+         * error to the function's argument list.
+         */
+    }
+
+    dmxFreeFontPath(fp);
+
+    return result;
+}
+
+static int
+dmxCheckFontPath(DMXScreenInfo * dmxScreen, int *error)
+{
+    char **oldFontPath;
+    int nOldPaths;
+    int result = Success;
+
+    if (!dmxScreen->beDisplay)
+        return result;
+
+    /* Save old font path */
+    oldFontPath = XGetFontPath(dmxScreen->beDisplay, &nOldPaths);
+
+    result = dmxSetFontPath(dmxScreen);
+
+    /* Restore old font path */
+    XSetFontPath(dmxScreen->beDisplay, oldFontPath, nOldPaths);
+    XFreeFontPath(oldFontPath);
+    dmxSync(dmxScreen, FALSE);
+
+    return result;
+}
+
+static int
+dmxProcSetFontPath(ClientPtr client)
+{
+    unsigned char *ptr;
+    unsigned long nbytes, total, n;
+    long nfonts;
+    int i, result;
+    unsigned char *oldFontPath, *tmpFontPath;
+    int nOldPaths;
+    int lenOldPaths;
+
+    REQUEST(xSetFontPathReq);
+
+    REQUEST_AT_LEAST_SIZE(xSetFontPathReq);
+
+    nbytes = (client->req_len << 2) - sizeof(xSetFontPathReq);
+    total = nbytes;
+    ptr = (unsigned char *) &stuff[1];
+    nfonts = stuff->nFonts;
+
+    while (--nfonts >= 0) {
+        if ((total == 0) || (total < (n = (*ptr + 1))))
+            return BadLength;
+        total -= n;
+        ptr += n;
+    }
+    if (total >= 4)
+        return BadLength;
+
+    GetFontPath(serverClient, &nOldPaths, &lenOldPaths, &tmpFontPath);
+    oldFontPath = malloc(nOldPaths + lenOldPaths);
+    memmove(oldFontPath, tmpFontPath, nOldPaths + lenOldPaths);
+
+    result = SetFontPath(client, stuff->nFonts, (unsigned char *) &stuff[1]);
+    if (!result) {
+        int error = 0;
+
+        for (i = 0; i < dmxNumScreens; i++)
+            if ((result = dmxCheckFontPath(&dmxScreens[i], &error)))
+                break;
+
+        if (result) {
+            /* Restore old fontpath in the DMX server */
+            SetFontPath(client, nOldPaths, oldFontPath);
+            client->errorValue = error;
+        }
+    }
+
+    free(oldFontPath);
+    return result;
+}
+
+/** Initialize font support.  In addition to the screen function call
+ *  pointers, DMX also hooks in at the ProcVector[] level.  Here the old
+ *  ProcVector function pointers are saved and the new ProcVector
+ *  function pointers are initialized. */
+void
+dmxInitFonts(void)
+{
+    int i;
+
+    for (i = 0; i < 256; i++)
+        dmxSaveProcVector[i] = ProcVector[i];
+
+    ProcVector[X_SetFontPath] = dmxProcSetFontPath;
+}
+
+/** Reset font support by restoring the original ProcVector function
+ *  pointers. */
+void
+dmxResetFonts(void)
+{
+    int i;
+
+    for (i = 0; i < 256; i++)
+        ProcVector[i] = dmxSaveProcVector[i];
+}
+
+/** Load the font, \a pFont, on the back-end server associated with \a
+ *  pScreen.  When a font is loaded, the font path on back-end server is
+ *  first initialized to that specified on the command line with the
+ *  -fontpath options, and then the font is loaded. */
+Bool
+dmxBELoadFont(ScreenPtr pScreen, FontPtr pFont)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxFontPrivPtr pFontPriv = FontGetPrivate(pFont, dmxFontPrivateIndex);
+    const char *name;
+    char **oldFontPath = NULL;
+    int nOldPaths;
+    Atom name_atom, value_atom;
+    int i;
+
+    /* Make sure we have a font private struct to work with */
+    if (!pFontPriv)
+        return FALSE;
+
+    /* Don't load a font over top of itself */
+    if (pFontPriv->font[pScreen->myNum]) {
+        return TRUE;            /* Already loaded font */
+    }
+
+    /* Save old font path */
+    oldFontPath = XGetFontPath(dmxScreen->beDisplay, &nOldPaths);
+
+    /* Set the font path for the font about to be loaded on the back-end */
+    if (dmxSetFontPath(dmxScreen)) {
+        char **fp;
+        int npaths;
+        Bool *goodfps;
+
+        /* This could fail only when first starting the X server and
+         * loading the default font.  If it fails here, then the default
+         * font path is invalid, no default font path will be set, the
+         * DMX server will fail to load the default font, and it will
+         * exit with an error unless we remove the offending font paths
+         * with the -ignorebadfontpaths command line option.
+         */
+
+        fp = dmxGetFontPath(&npaths);
+        if (!fp) {
+            dmxLog(dmxError, "No default font path set.\n");
+            dmxLog(dmxError,
+                   "Please see the Xdmx man page for information on how to\n");
+            dmxLog(dmxError,
+                   "initialize the DMX server's default font path.\n");
+            XFreeFontPath(oldFontPath);
+            return FALSE;
+        }
+
+        if (!dmxFontPath)
+            dmxLog(dmxWarning, "No default font path is set.\n");
+
+        goodfps = malloc(npaths * sizeof(*goodfps));
+
+        dmxLog(dmxError,
+               "The DMX server failed to set the following font paths on "
+               "screen #%d:\n", pScreen->myNum);
+
+        for (i = 0; i < npaths; i++)
+            if (!(goodfps[i] = dmxCheckFontPathElement(dmxScreen, fp[i])))
+                dmxLog(dmxError, "    %s\n", fp[i]);
+
+        if (dmxIgnoreBadFontPaths) {
+            char *newfp;
+            int newnpaths = 0;
+            int len = 0;
+            int j = 0;
+
+            dmxLog(dmxError,
+                   "These font paths will not be used because the "
+                   "\"-ignorebadfontpaths\"\n");
+            dmxLog(dmxError, "option is set.\n");
+
+            for (i = 0; i < npaths; i++)
+                if (goodfps[i]) {
+                    len += strlen(fp[i]) + 1;
+                    newnpaths++;
+                }
+
+            if (!newnpaths) {
+                /* No valid font paths were found */
+                dmxLog(dmxError,
+                       "After removing the font paths above, no valid font "
+                       "paths were\n");
+                dmxLog(dmxError,
+                       "available.  Please check that the font paths set on "
+                       "the command\n");
+                dmxLog(dmxError,
+                       "line or in the configuration file via the "
+                       "\"-fontpath\" option\n");
+                dmxLog(dmxError,
+                       "are valid on all back-end servers.  See the Xdmx man "
+                       "page for\n");
+                dmxLog(dmxError, "more information on font paths.\n");
+                dmxFreeFontPath(fp);
+                XFreeFontPath(oldFontPath);
+                free(goodfps);
+                return FALSE;
+            }
+
+            newfp = malloc(len * sizeof(*newfp));
+            for (i = 0; i < npaths; i++) {
+                if (goodfps[i]) {
+                    int n = strlen(fp[i]);
+
+                    newfp[j++] = n;
+                    strncpy(&newfp[j], fp[i], n);
+                    j += n;
+                }
+            }
+
+            if (SetFontPath(serverClient, newnpaths, (unsigned char *) newfp)) {
+                /* Note that this should never happen since all of the
+                 * FPEs were previously valid. */
+                dmxLog(dmxError, "Cannot reset the default font path.\n");
+            }
+        }
+        else if (dmxFontPath) {
+            dmxLog(dmxError,
+                   "Please remove these font paths from the command line "
+                   "or\n");
+            dmxLog(dmxError,
+                   "configuration file, or set the \"-ignorebadfontpaths\" "
+                   "option to\n");
+            dmxLog(dmxError,
+                   "ignore them.  For more information on these options, see "
+                   "the\n");
+            dmxLog(dmxError, "Xdmx man page.\n");
+        }
+        else {
+            dmxLog(dmxError,
+                   "Please specify the font paths that are available on all "
+                   "back-end\n");
+            dmxLog(dmxError,
+                   "servers with the \"-fontpath\" option, or use the "
+                   "\"-ignorebadfontpaths\"\n");
+            dmxLog(dmxError,
+                   "to ignore bad defaults.  For more information on "
+                   "these and other\n");
+            dmxLog(dmxError,
+                   "font-path-related options, see the Xdmx man page.\n");
+        }
+
+        if (!dmxIgnoreBadFontPaths ||
+            (dmxIgnoreBadFontPaths && dmxSetFontPath(dmxScreen))) {
+            /* We still have errors so return with error */
+            dmxFreeFontPath(fp);
+            XFreeFontPath(oldFontPath);
+            free(goodfps);
+            return FALSE;
+        }
+    }
+
+    /* Find requested font on back-end server */
+    name_atom = MakeAtom("FONT", 4, TRUE);
+    value_atom = 0L;
+
+    for (i = 0; i < pFont->info.nprops; i++) {
+        if ((Atom) pFont->info.props[i].name == name_atom) {
+            value_atom = pFont->info.props[i].value;
+            break;
+        }
+    }
+    if (!value_atom)
+        return FALSE;
+
+    name = NameForAtom(value_atom);
+    if (!name)
+        return FALSE;
+
+    pFontPriv->font[pScreen->myNum] =
+        XLoadQueryFont(dmxScreen->beDisplay, name);
+
+    /* Restore old font path */
+    XSetFontPath(dmxScreen->beDisplay, oldFontPath, nOldPaths);
+    XFreeFontPath(oldFontPath);
+    dmxSync(dmxScreen, FALSE);
+
+    if (!pFontPriv->font[pScreen->myNum])
+        return FALSE;
+
+    return TRUE;
+}
+
+/** Realize the font, \a pFont, on the back-end server associated with
+ *  \a pScreen. */
+Bool
+dmxRealizeFont(ScreenPtr pScreen, FontPtr pFont)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxFontPrivPtr pFontPriv;
+
+    if (!(pFontPriv = FontGetPrivate(pFont, dmxFontPrivateIndex))) {
+        FontSetPrivate(pFont, dmxFontPrivateIndex, NULL);
+        pFontPriv = malloc(sizeof(dmxFontPrivRec));
+        if (!pFontPriv)
+            return FALSE;
+        pFontPriv->font = NULL;
+        MAXSCREENSALLOC(pFontPriv->font);
+        if (!pFontPriv->font) {
+            free(pFontPriv);
+            return FALSE;
+        }
+        pFontPriv->refcnt = 0;
+    }
+
+    FontSetPrivate(pFont, dmxFontPrivateIndex, (pointer) pFontPriv);
+
+    if (dmxScreen->beDisplay) {
+        if (!dmxBELoadFont(pScreen, pFont))
+            return FALSE;
+
+        pFontPriv->refcnt++;
+    }
+    else {
+        pFontPriv->font[pScreen->myNum] = NULL;
+    }
+
+    return TRUE;
+}
+
+/** Free \a pFont on the back-end associated with \a pScreen. */
+Bool
+dmxBEFreeFont(ScreenPtr pScreen, FontPtr pFont)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxFontPrivPtr pFontPriv = FontGetPrivate(pFont, dmxFontPrivateIndex);
+
+    if (pFontPriv && pFontPriv->font[pScreen->myNum]) {
+        XFreeFont(dmxScreen->beDisplay, pFontPriv->font[pScreen->myNum]);
+        pFontPriv->font[pScreen->myNum] = NULL;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+/** Unrealize the font, \a pFont, on the back-end server associated with
+ *  \a pScreen. */
+Bool
+dmxUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxFontPrivPtr pFontPriv;
+
+    if ((pFontPriv = FontGetPrivate(pFont, dmxFontPrivateIndex))) {
+        /* In case the font failed to load properly */
+        if (!pFontPriv->refcnt) {
+            MAXSCREENSFREE(pFontPriv->font);
+            free(pFontPriv);
+            FontSetPrivate(pFont, dmxFontPrivateIndex, NULL);
+        }
+        else if (pFontPriv->font[pScreen->myNum]) {
+            if (dmxScreen->beDisplay)
+                dmxBEFreeFont(pScreen, pFont);
+
+            /* The code below is non-obvious, so here's an explanation...
+             *
+             * When creating the default GC, the server opens up the
+             * default font once for each screen, which in turn calls
+             * the RealizeFont function pointer once for each screen.
+             * During this process both dix's font refcnt and DMX's font
+             * refcnt are incremented once for each screen.
+             *
+             * Later, when shutting down the X server, dix shuts down
+             * each screen in reverse order.  During this shutdown
+             * procedure, each screen's default GC is freed and then
+             * that screen is closed by calling the CloseScreen function
+             * pointer.  screenInfo.numScreens is then decremented after
+             * closing each screen.  This procedure means that the dix's
+             * font refcnt for the font used by the default GC's is
+             * decremented once for each screen # greater than 0.
+             * However, since dix's refcnt for the default font is not
+             * yet 0 for each screen greater than 0, no call to the
+             * UnrealizeFont function pointer is made for those screens.
+             * Then, when screen 0 is being closed, dix's font refcnt
+             * for the default GC's font is finally 0 and the font is
+             * unrealized.  However, since screenInfo.numScreens has
+             * been decremented already down to 1, only one call to
+             * UnrealizeFont is made (for screen 0).  Thus, even though
+             * RealizeFont was called once for each screen,
+             * UnrealizeFont is only called for screen 0.
+             *
+             * This is a bug in dix.
+             *
+             * To avoid the memory leak of pFontPriv for each server
+             * generation, we can also free pFontPriv if the refcnt is
+             * not yet 0 but the # of screens is 1 -- i.e., the case
+             * described in the dix bug above.  This is only a temporary
+             * workaround until the bug in dix is solved.
+             *
+             * The other problem is that the font structure allocated by
+             * XLoadQueryFont() above is not freed for screens > 0.
+             * This problem cannot be worked around here since the back-
+             * end displays for screens > 0 have already been closed by
+             * the time this code is called from dix.
+             *
+             * When the bug in dix described above is fixed, then we can
+             * remove the "|| screenInfo.numScreens == 1" code below and
+             * the memory leaks will be eliminated.
+             */
+            if (--pFontPriv->refcnt == 0
+#if 1
+                /* Remove this code when the dix bug is fixed */
+                || screenInfo.numScreens == 1
+#endif
+                ) {
+                MAXSCREENSFREE(pFontPriv->font);
+                free(pFontPriv);
+                FontSetPrivate(pFont, dmxFontPrivateIndex, NULL);
+            }
+        }
+    }
+
+    return TRUE;
+}
diff --git a/xorg-server/hw/dmx/dmxgc.c b/xorg-server/hw/dmx/dmxgc.c
index f10f9a074..703aeb336 100644
--- a/xorg-server/hw/dmx/dmxgc.c
+++ b/xorg-server/hw/dmx/dmxgc.c
@@ -83,65 +83,70 @@ static GCOps dmxGCOps = {
 };
 
 /** Initialize the GC on \a pScreen */
-Bool dmxInitGC(ScreenPtr pScreen)
+Bool
+dmxInitGC(ScreenPtr pScreen)
 {
-    if (!dixRegisterPrivateKey(&dmxGCPrivateKeyRec, PRIVATE_GC, sizeof(dmxGCPrivRec)))
-            return FALSE;
+    if (!dixRegisterPrivateKey
+        (&dmxGCPrivateKeyRec, PRIVATE_GC, sizeof(dmxGCPrivRec)))
+        return FALSE;
     return TRUE;
 }
 
 /** Create the GC on the back-end server. */
-void dmxBECreateGC(ScreenPtr pScreen, GCPtr pGC)
+void
+dmxBECreateGC(ScreenPtr pScreen, GCPtr pGC)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    int            i;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    int i;
 
     for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {
-	if (pGC->depth == dmxScreen->bePixmapFormats[i].depth) {
-	    unsigned long  mask;
-	    XGCValues      gcvals;
-
-	    mask = GCGraphicsExposures;
-	    gcvals.graphics_exposures = FALSE;
-
-	    /* Create GC in the back-end servers */
-	    pGCPriv->gc = XCreateGC(dmxScreen->beDisplay,
-				    dmxScreen->scrnDefDrawables[i],
-				    mask, &gcvals);
-	    break;
-	}
+        if (pGC->depth == dmxScreen->bePixmapFormats[i].depth) {
+            unsigned long mask;
+            XGCValues gcvals;
+
+            mask = GCGraphicsExposures;
+            gcvals.graphics_exposures = FALSE;
+
+            /* Create GC in the back-end servers */
+            pGCPriv->gc = XCreateGC(dmxScreen->beDisplay,
+                                    dmxScreen->scrnDefDrawables[i],
+                                    mask, &gcvals);
+            break;
+        }
     }
 }
 
 /** Create a graphics context on the back-end server associated /a pGC's
  *  screen. */
-Bool dmxCreateGC(GCPtr pGC)
+Bool
+dmxCreateGC(GCPtr pGC)
 {
-    ScreenPtr      pScreen = pGC->pScreen;
+    ScreenPtr pScreen = pGC->pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Bool           ret;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Bool ret;
 
     DMX_UNWRAP(CreateGC, dmxScreen, pScreen);
     if ((ret = pScreen->CreateGC(pGC))) {
-	/* Save the old funcs */
-	pGCPriv->funcs = pGC->funcs;
-	pGCPriv->ops   = NULL;
-
-	pGC->funcs = &dmxGCFuncs;
-
-	if (dmxScreen->beDisplay) {
-	    dmxBECreateGC(pScreen, pGC);
-	} else {
-	    pGCPriv->gc = NULL;
-	}
-
-	/* Check for "magic special case"
-	 * 1. see CreateGC in dix/gc.c for more info
-	 * 2. see dmxChangeGC for more info
-	 */
-	pGCPriv->msc = (!pGC->tileIsPixel && !pGC->tile.pixmap);
+        /* Save the old funcs */
+        pGCPriv->funcs = pGC->funcs;
+        pGCPriv->ops = NULL;
+
+        pGC->funcs = &dmxGCFuncs;
+
+        if (dmxScreen->beDisplay) {
+            dmxBECreateGC(pScreen, pGC);
+        }
+        else {
+            pGCPriv->gc = NULL;
+        }
+
+        /* Check for "magic special case"
+         * 1. see CreateGC in dix/gc.c for more info
+         * 2. see dmxChangeGC for more info
+         */
+        pGCPriv->msc = (!pGC->tileIsPixel && !pGC->tile.pixmap);
     }
     DMX_WRAP(CreateGC, dmxCreateGC, dmxScreen, pScreen);
 
@@ -150,7 +155,8 @@ Bool dmxCreateGC(GCPtr pGC)
 
 /** Validate a graphics context, \a pGC, locally in the DMX server and
  *  recompute the composite clip, if necessary. */
-void dmxValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
+void
+dmxValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
 {
     dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
 
@@ -160,13 +166,14 @@ void dmxValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
 #endif
 
     if (pDrawable->type == DRAWABLE_WINDOW ||
-	pDrawable->type == DRAWABLE_PIXMAP) {
-	/* Save the old ops, since we're about to change the ops in the
-	 * epilogue.
-	 */
-	pGCPriv->ops = pGC->ops;
-    } else {
-	pGCPriv->ops = NULL;
+        pDrawable->type == DRAWABLE_PIXMAP) {
+        /* Save the old ops, since we're about to change the ops in the
+         * epilogue.
+         */
+        pGCPriv->ops = pGC->ops;
+    }
+    else {
+        pGCPriv->ops = NULL;
     }
 
     /* If the client clip is different or moved OR the subwindowMode has
@@ -174,12 +181,12 @@ void dmxValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
      * validation, then we need to recompute the composite clip.
      */
     if ((changes & (GCClipXOrigin |
-		    GCClipYOrigin |
-		    GCClipMask |
-		    GCSubwindowMode)) ||
-	(pDrawable->serialNumber !=
-	 (pGC->serialNumber & DRAWABLE_SERIAL_BITS))) {
-	miComputeCompositeClip(pGC, pDrawable);
+                    GCClipYOrigin |
+                    GCClipMask |
+                    GCSubwindowMode)) ||
+        (pDrawable->serialNumber !=
+         (pGC->serialNumber & DRAWABLE_SERIAL_BITS))) {
+        miComputeCompositeClip(pGC, pDrawable);
     }
 
     DMX_GC_FUNC_EPILOGUE(pGC);
@@ -187,12 +194,13 @@ void dmxValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
 
 /** Set the values in the graphics context on the back-end server
  *  associated with \a pGC's screen. */
-void dmxChangeGC(GCPtr pGC, unsigned long mask)
+void
+dmxChangeGC(GCPtr pGC, unsigned long mask)
 {
-    ScreenPtr      pScreen = pGC->pScreen;
+    ScreenPtr pScreen = pGC->pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    XGCValues      v;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    XGCValues v;
 
     DMX_GC_FUNC_PROLOGUE(pGC);
 #if 0
@@ -201,89 +209,113 @@ void dmxChangeGC(GCPtr pGC, unsigned long mask)
 
     /* Handle "magic special case" from CreateGC */
     if (pGCPriv->msc) {
-	/* The "magic special case" is used to handle the case where a
-	 * foreground pixel is set when the GC is created so that a
-	 * "pseudo default-tile" can be created and used in case the
-	 * fillstyle was set to FillTiled.  This specific case is tested
-	 * in xtest (XCreateGC test #3).  What has happened in dix by
-	 * the time it reaches here is (1) the pGC->tile.pixel has been
-	 * set to pGC->fgPixel and pGC->tileIsPixel is set, (2) if a
-	 * tile has also been set, then pGC->tileIsPixel is unset and
-	 * pGC->tile.pixmap is initialized; else, the default tile is
-	 * created and pGC->tileIsPixel is unset and pGC->tile.pixmap is
-	 * initialized to the "pseudo default-tile".  In either case,
-	 * pGC->tile.pixmap is set; however, in the "magic special case"
-	 * the mask is not updated to allow us to detect that we should
-	 * initialize the GCTile in the back-end server.  Thus, we catch
-	 * this case in dmxCreateGC and add GCTile to the mask here.
-	 * Are there any cases that I've missed?
-	 */
-
-	/* Make sure that the tile.pixmap is set, just in case the user
+        /* The "magic special case" is used to handle the case where a
+         * foreground pixel is set when the GC is created so that a
+         * "pseudo default-tile" can be created and used in case the
+         * fillstyle was set to FillTiled.  This specific case is tested
+         * in xtest (XCreateGC test #3).  What has happened in dix by
+         * the time it reaches here is (1) the pGC->tile.pixel has been
+         * set to pGC->fgPixel and pGC->tileIsPixel is set, (2) if a
+         * tile has also been set, then pGC->tileIsPixel is unset and
+         * pGC->tile.pixmap is initialized; else, the default tile is
+         * created and pGC->tileIsPixel is unset and pGC->tile.pixmap is
+         * initialized to the "pseudo default-tile".  In either case,
+         * pGC->tile.pixmap is set; however, in the "magic special case"
+         * the mask is not updated to allow us to detect that we should
+         * initialize the GCTile in the back-end server.  Thus, we catch
+         * this case in dmxCreateGC and add GCTile to the mask here.
+         * Are there any cases that I've missed?
+         */
+
+        /* Make sure that the tile.pixmap is set, just in case the user
          * set GCTile in the mask but forgot to set vals.pixmap
-	 */
-	if (pGC->tile.pixmap) mask |= GCTile;
+         */
+        if (pGC->tile.pixmap)
+            mask |= GCTile;
 
-	/* This only happens once when the GC is created */
-	pGCPriv->msc = FALSE;
+        /* This only happens once when the GC is created */
+        pGCPriv->msc = FALSE;
     }
 
     /* Update back-end server's gc */
-    if (mask & GCFunction)          v.function = pGC->alu;
-    if (mask & GCPlaneMask)         v.plane_mask = pGC->planemask;
-    if (mask & GCForeground)        v.foreground = pGC->fgPixel;
-    if (mask & GCBackground)        v.background = pGC->bgPixel;
-    if (mask & GCLineWidth)         v.line_width = pGC->lineWidth;
-    if (mask & GCLineStyle)         v.line_style = pGC->lineStyle;
-    if (mask & GCCapStyle)          v.cap_style = pGC->capStyle;
-    if (mask & GCJoinStyle)         v.join_style = pGC->joinStyle;
-    if (mask & GCFillStyle)         v.fill_style = pGC->fillStyle;
-    if (mask & GCFillRule)          v.fill_rule = pGC->fillRule;
+    if (mask & GCFunction)
+        v.function = pGC->alu;
+    if (mask & GCPlaneMask)
+        v.plane_mask = pGC->planemask;
+    if (mask & GCForeground)
+        v.foreground = pGC->fgPixel;
+    if (mask & GCBackground)
+        v.background = pGC->bgPixel;
+    if (mask & GCLineWidth)
+        v.line_width = pGC->lineWidth;
+    if (mask & GCLineStyle)
+        v.line_style = pGC->lineStyle;
+    if (mask & GCCapStyle)
+        v.cap_style = pGC->capStyle;
+    if (mask & GCJoinStyle)
+        v.join_style = pGC->joinStyle;
+    if (mask & GCFillStyle)
+        v.fill_style = pGC->fillStyle;
+    if (mask & GCFillRule)
+        v.fill_rule = pGC->fillRule;
     if (mask & GCTile) {
-	if (pGC->tileIsPixel) {
-	    mask &= ~GCTile;
-	} else {
-	    dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pGC->tile.pixmap);
-	    v.tile = (Drawable)pPixPriv->pixmap;
-	}
+        if (pGC->tileIsPixel) {
+            mask &= ~GCTile;
+        }
+        else {
+            dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pGC->tile.pixmap);
+
+            v.tile = (Drawable) pPixPriv->pixmap;
+        }
     }
     if (mask & GCStipple) {
-	dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pGC->stipple);
-	v.stipple = (Drawable)pPixPriv->pixmap;
+        dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pGC->stipple);
+
+        v.stipple = (Drawable) pPixPriv->pixmap;
     }
-    if (mask & GCTileStipXOrigin)   v.ts_x_origin = pGC->patOrg.x; 
-    if (mask & GCTileStipYOrigin)   v.ts_y_origin = pGC->patOrg.y;
+    if (mask & GCTileStipXOrigin)
+        v.ts_x_origin = pGC->patOrg.x;
+    if (mask & GCTileStipYOrigin)
+        v.ts_y_origin = pGC->patOrg.y;
     if (mask & GCFont) {
-	if (dmxScreen->beDisplay) {
-	    dmxFontPrivPtr  pFontPriv;
-	    pFontPriv = FontGetPrivate(pGC->font, dmxFontPrivateIndex);
-	    v.font = pFontPriv->font[pScreen->myNum]->fid;
-	} else {
-	    mask &= ~GCFont;
-	}
+        if (dmxScreen->beDisplay) {
+            dmxFontPrivPtr pFontPriv;
+
+            pFontPriv = FontGetPrivate(pGC->font, dmxFontPrivateIndex);
+            v.font = pFontPriv->font[pScreen->myNum]->fid;
+        }
+        else {
+            mask &= ~GCFont;
+        }
     }
-    if (mask & GCSubwindowMode)     v.subwindow_mode = pGC->subWindowMode;
+    if (mask & GCSubwindowMode)
+        v.subwindow_mode = pGC->subWindowMode;
 
     /* Graphics exposures are not needed on the back-ends since they can
        be generated on the front-end thereby saving bandwidth. */
-    if (mask & GCGraphicsExposures) mask &= ~GCGraphicsExposures;
-
-    if (mask & GCClipXOrigin)       v.clip_x_origin = pGC->clipOrg.x;
-    if (mask & GCClipYOrigin)       v.clip_y_origin = pGC->clipOrg.y;
-    if (mask & GCClipMask)          mask &= ~GCClipMask; /* See ChangeClip */
-    if (mask & GCDashOffset)        v.dash_offset = pGC->dashOffset;
+    if (mask & GCGraphicsExposures)
+        mask &= ~GCGraphicsExposures;
+
+    if (mask & GCClipXOrigin)
+        v.clip_x_origin = pGC->clipOrg.x;
+    if (mask & GCClipYOrigin)
+        v.clip_y_origin = pGC->clipOrg.y;
+    if (mask & GCClipMask)
+        mask &= ~GCClipMask;    /* See ChangeClip */
+    if (mask & GCDashOffset)
+        v.dash_offset = pGC->dashOffset;
     if (mask & GCDashList) {
-	mask &= ~GCDashList;
-	if (dmxScreen->beDisplay)
-	    XSetDashes(dmxScreen->beDisplay, pGCPriv->gc,
-		       pGC->dashOffset, (char *)pGC->dash,
-		       pGC->numInDashList);
+        mask &= ~GCDashList;
+        if (dmxScreen->beDisplay)
+            XSetDashes(dmxScreen->beDisplay, pGCPriv->gc,
+                       pGC->dashOffset, (char *) pGC->dash, pGC->numInDashList);
     }
-    if (mask & GCArcMode)           v.arc_mode = pGC->arcMode;
+    if (mask & GCArcMode)
+        v.arc_mode = pGC->arcMode;
 
     if (mask && dmxScreen->beDisplay) {
-	XChangeGC(dmxScreen->beDisplay, pGCPriv->gc, mask, &v);
-	dmxSync(dmxScreen, FALSE);
+        XChangeGC(dmxScreen->beDisplay, pGCPriv->gc, mask, &v);
+        dmxSync(dmxScreen, FALSE);
     }
 
     DMX_GC_FUNC_EPILOGUE(pGC);
@@ -291,34 +323,36 @@ void dmxChangeGC(GCPtr pGC, unsigned long mask)
 
 /** Copy \a pGCSrc to \a pGCDst on the back-end server associated with
  *  \a pGCSrc's screen. */
-void dmxCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)
+void
+dmxCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)
 {
-    ScreenPtr      pScreen = pGCSrc->pScreen;
+    ScreenPtr pScreen = pGCSrc->pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxGCPrivPtr   pGCSrcPriv = DMX_GET_GC_PRIV(pGCSrc);
-    dmxGCPrivPtr   pGCDstPriv = DMX_GET_GC_PRIV(pGCDst);
+    dmxGCPrivPtr pGCSrcPriv = DMX_GET_GC_PRIV(pGCSrc);
+    dmxGCPrivPtr pGCDstPriv = DMX_GET_GC_PRIV(pGCDst);
 
     DMX_GC_FUNC_PROLOGUE(pGCDst);
     pGCDst->funcs->CopyGC(pGCSrc, changes, pGCDst);
 
     /* Copy the GC on the back-end server */
     if (dmxScreen->beDisplay)
-	XCopyGC(dmxScreen->beDisplay, pGCSrcPriv->gc, changes, pGCDstPriv->gc);
+        XCopyGC(dmxScreen->beDisplay, pGCSrcPriv->gc, changes, pGCDstPriv->gc);
 
     DMX_GC_FUNC_EPILOGUE(pGCDst);
 }
 
 /** Free the \a pGC on the back-end server. */
-Bool dmxBEFreeGC(GCPtr pGC)
+Bool
+dmxBEFreeGC(GCPtr pGC)
 {
-    ScreenPtr      pScreen   = pGC->pScreen;
+    ScreenPtr pScreen = pGC->pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv   = DMX_GET_GC_PRIV(pGC);
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
 
     if (pGCPriv->gc) {
-	XFreeGC(dmxScreen->beDisplay, pGCPriv->gc);
-	pGCPriv->gc = NULL;
-	return TRUE;
+        XFreeGC(dmxScreen->beDisplay, pGCPriv->gc);
+        pGCPriv->gc = NULL;
+        return TRUE;
     }
 
     return FALSE;
@@ -326,30 +360,32 @@ Bool dmxBEFreeGC(GCPtr pGC)
 
 /** Destroy the graphics context, \a pGC and free the corresponding GC
  *  on the back-end server. */
-void dmxDestroyGC(GCPtr pGC)
+void
+dmxDestroyGC(GCPtr pGC)
 {
-    ScreenPtr      pScreen   = pGC->pScreen;
+    ScreenPtr pScreen = pGC->pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
 
     DMX_GC_FUNC_PROLOGUE(pGC);
 
     /* Free the GC on the back-end server */
     if (dmxScreen->beDisplay)
-	dmxBEFreeGC(pGC);
+        dmxBEFreeGC(pGC);
 
     pGC->funcs->DestroyGC(pGC);
     DMX_GC_FUNC_EPILOGUE(pGC);
 }
 
 /** Change the clip rects for a GC. */
-void dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+void
+dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
 {
-    ScreenPtr      pScreen = pGC->pScreen;
+    ScreenPtr pScreen = pGC->pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    XRectangle    *pRects;
-    BoxPtr         pBox;
-    int            i, nRects;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    XRectangle *pRects;
+    BoxPtr pBox;
+    int i, nRects;
 
     DMX_GC_FUNC_PROLOGUE(pGC);
     pGC->funcs->ChangeClip(pGC, type, pvalue, nrects);
@@ -357,58 +393,60 @@ void dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
     /* Set the client clip on the back-end server */
     switch (pGC->clientClipType) {
     case CT_NONE:
-	if (dmxScreen->beDisplay)
-	    XSetClipMask(dmxScreen->beDisplay, pGCPriv->gc, None);
-	break;
+        if (dmxScreen->beDisplay)
+            XSetClipMask(dmxScreen->beDisplay, pGCPriv->gc, None);
+        break;
 
     case CT_REGION:
-	if (dmxScreen->beDisplay) {
-	    nRects = RegionNumRects((RegionPtr)pGC->clientClip);
-	    pRects = malloc(nRects * sizeof(*pRects));
-	    pBox   = RegionRects((RegionPtr)pGC->clientClip);
-
-	    for (i = 0; i < nRects; i++) {
-		pRects[i].x      = pBox[i].x1;
-		pRects[i].y      = pBox[i].y1;
-		pRects[i].width  = pBox[i].x2 - pBox[i].x1;
-		pRects[i].height = pBox[i].y2 - pBox[i].y1;
-	    }
-
-	    XSetClipRectangles(dmxScreen->beDisplay, pGCPriv->gc,
-			       pGC->clipOrg.x, pGC->clipOrg.y,
-			       pRects, nRects, Unsorted);
-
-	    free(pRects);
-	}
-	break;
+        if (dmxScreen->beDisplay) {
+            nRects = RegionNumRects((RegionPtr) pGC->clientClip);
+            pRects = malloc(nRects * sizeof(*pRects));
+            pBox = RegionRects((RegionPtr) pGC->clientClip);
+
+            for (i = 0; i < nRects; i++) {
+                pRects[i].x = pBox[i].x1;
+                pRects[i].y = pBox[i].y1;
+                pRects[i].width = pBox[i].x2 - pBox[i].x1;
+                pRects[i].height = pBox[i].y2 - pBox[i].y1;
+            }
+
+            XSetClipRectangles(dmxScreen->beDisplay, pGCPriv->gc,
+                               pGC->clipOrg.x, pGC->clipOrg.y,
+                               pRects, nRects, Unsorted);
+
+            free(pRects);
+        }
+        break;
 
     case CT_PIXMAP:
-	/* Condensed down to REGION in the mi code */
-	break;
+        /* Condensed down to REGION in the mi code */
+        break;
     }
 
     DMX_GC_FUNC_EPILOGUE(pGC);
 }
 
 /** Destroy a GC's clip rects. */
-void dmxDestroyClip(GCPtr pGC)
+void
+dmxDestroyClip(GCPtr pGC)
 {
-    ScreenPtr      pScreen = pGC->pScreen;
+    ScreenPtr pScreen = pGC->pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
 
     DMX_GC_FUNC_PROLOGUE(pGC);
     pGC->funcs->DestroyClip(pGC);
 
     /* Set the client clip on the back-end server to None */
     if (dmxScreen->beDisplay)
-	XSetClipMask(dmxScreen->beDisplay, pGCPriv->gc, None);
+        XSetClipMask(dmxScreen->beDisplay, pGCPriv->gc, None);
 
     DMX_GC_FUNC_EPILOGUE(pGC);
 }
 
 /** Copy a GC's clip rects. */
-void dmxCopyClip(GCPtr pGCDst, GCPtr pGCSrc)
+void
+dmxCopyClip(GCPtr pGCDst, GCPtr pGCSrc)
 {
     DMX_GC_FUNC_PROLOGUE(pGCDst);
     pGCDst->funcs->CopyClip(pGCDst, pGCSrc);
diff --git a/xorg-server/hw/dmx/dmxgcops.c b/xorg-server/hw/dmx/dmxgcops.c
index 500e2cdf1..19330668a 100644
--- a/xorg-server/hw/dmx/dmxgcops.c
+++ b/xorg-server/hw/dmx/dmxgcops.c
@@ -75,17 +75,17 @@ do {									\
        !DMX_GET_WINDOW_PRIV((WindowPtr)(_pDraw))->window)))
 
 /** Fill spans -- this function should never be called. */
-void dmxFillSpans(DrawablePtr pDrawable, GCPtr pGC,
-		  int nInit, DDXPointPtr pptInit, int *pwidthInit,
-		  int fSorted)
+void
+dmxFillSpans(DrawablePtr pDrawable, GCPtr pGC,
+             int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)
 {
     /* Error -- this should never happen! */
 }
 
 /** Set spans -- this function should never be called. */
-void dmxSetSpans(DrawablePtr pDrawable, GCPtr pGC,
-		 char *psrc, DDXPointPtr ppt, int *pwidth, int nspans,
-		 int fSorted)
+void
+dmxSetSpans(DrawablePtr pDrawable, GCPtr pGC,
+            char *psrc, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
 {
     /* Error -- this should never happen! */
 }
@@ -94,73 +94,74 @@ void dmxSetSpans(DrawablePtr pDrawable, GCPtr pGC,
  *  pDrawable's screen.  If primitive subdivision optimization is
  *  enabled, then only transfer the sections of \a pBits that are
  *  visible (i.e., not-clipped) to the back-end server. */
-void dmxPutImage(DrawablePtr pDrawable, GCPtr pGC,
-		 int depth, int x, int y, int w, int h,
-		 int leftPad, int format, char *pBits)
+void
+dmxPutImage(DrawablePtr pDrawable, GCPtr pGC,
+            int depth, int x, int y, int w, int h,
+            int leftPad, int format, char *pBits)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    XImage        *img;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    XImage *img;
 
-    if (DMX_GCOPS_OFFSCREEN(pDrawable)) return;
+    if (DMX_GCOPS_OFFSCREEN(pDrawable))
+        return;
 
     img = XCreateImage(dmxScreen->beDisplay,
-		       dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual,
-		       depth, format, leftPad, pBits, w, h,
-		       BitmapPad(dmxScreen->beDisplay),
-		       (format == ZPixmap) ?
-		       PixmapBytePad(w, depth) : BitmapBytePad(w+leftPad));
+                       dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual,
+                       depth, format, leftPad, pBits, w, h,
+                       BitmapPad(dmxScreen->beDisplay),
+                       (format == ZPixmap) ?
+                       PixmapBytePad(w, depth) : BitmapBytePad(w + leftPad));
 
     if (img) {
-	Drawable draw;
-
-	DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
-
-	if (dmxSubdividePrimitives && pGC->pCompositeClip) {
-	    RegionPtr  pSubImages;
-	    RegionPtr  pClip;
-	    BoxRec     box;
-	    BoxPtr     pBox;
-	    int        nBox;
-
-	    box.x1 = x;
-	    box.y1 = y;
-	    box.x2 = x + w;
-	    box.y2 = y + h;
-	    pSubImages = RegionCreate(&box, 1);
-
-	    pClip = RegionCreate(NullBox, 1);
-	    RegionCopy(pClip, pGC->pCompositeClip);
-	    RegionTranslate(pClip,
-			     -pDrawable->x, -pDrawable->y);
-	    RegionIntersect(pSubImages, pSubImages, pClip);
-
-	    nBox = RegionNumRects(pSubImages);
-	    pBox = RegionRects(pSubImages);
-
-	    while (nBox--) {
-		XPutImage(dmxScreen->beDisplay, draw, pGCPriv->gc, img,
-			  pBox->x1 - box.x1,
-			  pBox->y1 - box.y1,
-			  pBox->x1,
-			  pBox->y1,
-			  pBox->x2 - pBox->x1,
-			  pBox->y2 - pBox->y1);
-		pBox++;
-	    }
+        Drawable draw;
+
+        DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
+
+        if (dmxSubdividePrimitives && pGC->pCompositeClip) {
+            RegionPtr pSubImages;
+            RegionPtr pClip;
+            BoxRec box;
+            BoxPtr pBox;
+            int nBox;
+
+            box.x1 = x;
+            box.y1 = y;
+            box.x2 = x + w;
+            box.y2 = y + h;
+            pSubImages = RegionCreate(&box, 1);
+
+            pClip = RegionCreate(NullBox, 1);
+            RegionCopy(pClip, pGC->pCompositeClip);
+            RegionTranslate(pClip, -pDrawable->x, -pDrawable->y);
+            RegionIntersect(pSubImages, pSubImages, pClip);
+
+            nBox = RegionNumRects(pSubImages);
+            pBox = RegionRects(pSubImages);
+
+            while (nBox--) {
+                XPutImage(dmxScreen->beDisplay, draw, pGCPriv->gc, img,
+                          pBox->x1 - box.x1,
+                          pBox->y1 - box.y1,
+                          pBox->x1,
+                          pBox->y1, pBox->x2 - pBox->x1, pBox->y2 - pBox->y1);
+                pBox++;
+            }
             RegionDestroy(pClip);
             RegionDestroy(pSubImages);
-	} else {
-	    XPutImage(dmxScreen->beDisplay, draw, pGCPriv->gc,
-		      img, 0, 0, x, y, w, h);
-	}
-	XFree(img);             /* Use XFree instead of XDestroyImage
+        }
+        else {
+            XPutImage(dmxScreen->beDisplay, draw, pGCPriv->gc,
+                      img, 0, 0, x, y, w, h);
+        }
+        XFree(img);             /* Use XFree instead of XDestroyImage
                                  * because pBits is passed in from the
                                  * caller. */
 
-	dmxSync(dmxScreen, FALSE);
-    } else {
-	/* Error -- this should not happen! */
+        dmxSync(dmxScreen, FALSE);
+    }
+    else {
+        /* Error -- this should not happen! */
     }
 }
 
@@ -168,72 +169,75 @@ void dmxPutImage(DrawablePtr pDrawable, GCPtr pGC,
  *  server associated with \a pSrc drawable's screen.  If the offscreen
  *  optimization is enabled, only copy when both \a pSrc and \a pDst are
  *  at least partially visible. */
-RegionPtr dmxCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-		      int srcx, int srcy, int w, int h, int dstx, int dsty)
+RegionPtr
+dmxCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+            int srcx, int srcy, int w, int h, int dstx, int dsty)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pSrc->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       srcDraw, dstDraw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable srcDraw, dstDraw;
 
     if (DMX_GCOPS_OFFSCREEN(pSrc) || DMX_GCOPS_OFFSCREEN(pDst))
-	return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, w, h,
-				 dstx, dsty, 0L);
+        return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, w, h,
+                                 dstx, dsty, 0L);
 
     DMX_GCOPS_SET_DRAWABLE(pSrc, srcDraw);
     DMX_GCOPS_SET_DRAWABLE(pDst, dstDraw);
 
     XCopyArea(dmxScreen->beDisplay, srcDraw, dstDraw, pGCPriv->gc,
-	      srcx, srcy, w, h, dstx, dsty);
+              srcx, srcy, w, h, dstx, dsty);
     dmxSync(dmxScreen, FALSE);
 
-    return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, w, h,
-			     dstx, dsty, 0L);
+    return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty, 0L);
 }
 
 /** Copy plane number \a bitPlane from \a pSrc drawable to \a pDst
  *  drawable on the back-end server associated with \a pSrc drawable's
  *  screen.  If the offscreen optimization is enabled, only copy when
  *  both \a pSrc and \a pDst are at least partially visible. */
-RegionPtr dmxCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-		       int srcx, int srcy, int width, int height,
-		       int dstx, int dsty, unsigned long bitPlane)
+RegionPtr
+dmxCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+             int srcx, int srcy, int width, int height,
+             int dstx, int dsty, unsigned long bitPlane)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pSrc->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       srcDraw, dstDraw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable srcDraw, dstDraw;
 
     if (DMX_GCOPS_OFFSCREEN(pSrc) || DMX_GCOPS_OFFSCREEN(pDst))
-	return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, width, height,
-				 dstx, dsty, bitPlane);
+        return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, width, height,
+                                 dstx, dsty, bitPlane);
 
     DMX_GCOPS_SET_DRAWABLE(pSrc, srcDraw);
     DMX_GCOPS_SET_DRAWABLE(pDst, dstDraw);
 
     XCopyPlane(dmxScreen->beDisplay, srcDraw, dstDraw, pGCPriv->gc,
-	       srcx, srcy, width, height, dstx, dsty, bitPlane);
+               srcx, srcy, width, height, dstx, dsty, bitPlane);
     dmxSync(dmxScreen, FALSE);
 
     return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, width, height,
-			     dstx, dsty, bitPlane);
+                             dstx, dsty, bitPlane);
 }
 
 /** Render list of points, \a pptInit in \a pDrawable on the back-end
  *  server associated with \a pDrawable's screen.  If the offscreen
  *  optimization is enabled, only draw when \a pDrawable is at least
  *  partially visible. */
-void dmxPolyPoint(DrawablePtr pDrawable, GCPtr pGC,
-		  int mode, int npt, DDXPointPtr pptInit)
+void
+dmxPolyPoint(DrawablePtr pDrawable, GCPtr pGC,
+             int mode, int npt, DDXPointPtr pptInit)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable draw;
 
-    if (DMX_GCOPS_OFFSCREEN(pDrawable)) return;
+    if (DMX_GCOPS_OFFSCREEN(pDrawable))
+        return;
 
     DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
     XDrawPoints(dmxScreen->beDisplay, draw, pGCPriv->gc,
-		(XPoint *)pptInit, npt, mode);
+                (XPoint *) pptInit, npt, mode);
     dmxSync(dmxScreen, FALSE);
 }
 
@@ -241,19 +245,21 @@ void dmxPolyPoint(DrawablePtr pDrawable, GCPtr pGC,
  *  back-end server associated with \a pDrawable's screen.  If the
  *  offscreen optimization is enabled, only draw when \a pDrawable is at
  *  least partially visible. */
-void dmxPolylines(DrawablePtr pDrawable, GCPtr pGC,
-		  int mode, int npt, DDXPointPtr pptInit)
+void
+dmxPolylines(DrawablePtr pDrawable, GCPtr pGC,
+             int mode, int npt, DDXPointPtr pptInit)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable draw;
 
-    if (DMX_GCOPS_OFFSCREEN(pDrawable)) return;
+    if (DMX_GCOPS_OFFSCREEN(pDrawable))
+        return;
 
     DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
     XDrawLines(dmxScreen->beDisplay, draw, pGCPriv->gc,
-	       (XPoint *)pptInit, npt, mode);
+               (XPoint *) pptInit, npt, mode);
     dmxSync(dmxScreen, FALSE);
 }
 
@@ -261,19 +267,20 @@ void dmxPolylines(DrawablePtr pDrawable, GCPtr pGC,
  *  back-end server associated with \a pDrawable's screen.  If the
  *  offscreen optimization is enabled, only draw when \a pDrawable is at
  *  least partially visible. */
-void dmxPolySegment(DrawablePtr pDrawable, GCPtr pGC,
-		    int nseg, xSegment *pSegs)
+void
+dmxPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pSegs)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable draw;
 
-    if (DMX_GCOPS_OFFSCREEN(pDrawable)) return;
+    if (DMX_GCOPS_OFFSCREEN(pDrawable))
+        return;
 
     DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
     XDrawSegments(dmxScreen->beDisplay, draw, pGCPriv->gc,
-		  (XSegment *)pSegs, nseg);
+                  (XSegment *) pSegs, nseg);
     dmxSync(dmxScreen, FALSE);
 }
 
@@ -281,19 +288,21 @@ void dmxPolySegment(DrawablePtr pDrawable, GCPtr pGC,
  *  back-end server associated with \a pDrawable's screen.  If the
  *  offscreen optimization is enabled, only draw when \a pDrawable is at
  *  least partially visible. */
-void dmxPolyRectangle(DrawablePtr pDrawable, GCPtr pGC,
-		      int nrects, xRectangle *pRects)
+void
+dmxPolyRectangle(DrawablePtr pDrawable, GCPtr pGC,
+                 int nrects, xRectangle *pRects)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable draw;
 
-    if (DMX_GCOPS_OFFSCREEN(pDrawable)) return;
+    if (DMX_GCOPS_OFFSCREEN(pDrawable))
+        return;
 
     DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
     XDrawRectangles(dmxScreen->beDisplay, draw, pGCPriv->gc,
-		    (XRectangle *)pRects, nrects);
+                    (XRectangle *) pRects, nrects);
 
     dmxSync(dmxScreen, FALSE);
 }
@@ -302,19 +311,19 @@ void dmxPolyRectangle(DrawablePtr pDrawable, GCPtr pGC,
  *  back-end server associated with \a pDrawable's screen.  If the
  *  offscreen optimization is enabled, only draw when \a pDrawable is at
  *  least partially visible. */
-void dmxPolyArc(DrawablePtr pDrawable, GCPtr pGC,
-		int narcs, xArc *parcs)
+void
+dmxPolyArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc * parcs)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable draw;
 
-    if (DMX_GCOPS_OFFSCREEN(pDrawable)) return;
+    if (DMX_GCOPS_OFFSCREEN(pDrawable))
+        return;
 
     DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
-    XDrawArcs(dmxScreen->beDisplay, draw, pGCPriv->gc,
-	      (XArc *)parcs, narcs);
+    XDrawArcs(dmxScreen->beDisplay, draw, pGCPriv->gc, (XArc *) parcs, narcs);
     dmxSync(dmxScreen, FALSE);
 }
 
@@ -322,19 +331,21 @@ void dmxPolyArc(DrawablePtr pDrawable, GCPtr pGC,
  *  associated with \a pDrawable's screen.  If the offscreen
  *  optimization is enabled, only draw when \a pDrawable is at least
  *  partially visible. */
-void dmxFillPolygon(DrawablePtr pDrawable, GCPtr pGC,
-		    int shape, int mode, int count, DDXPointPtr pPts)
+void
+dmxFillPolygon(DrawablePtr pDrawable, GCPtr pGC,
+               int shape, int mode, int count, DDXPointPtr pPts)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable draw;
 
-    if (DMX_GCOPS_OFFSCREEN(pDrawable)) return;
+    if (DMX_GCOPS_OFFSCREEN(pDrawable))
+        return;
 
     DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
     XFillPolygon(dmxScreen->beDisplay, draw, pGCPriv->gc,
-		 (XPoint *)pPts, count, shape, mode);
+                 (XPoint *) pPts, count, shape, mode);
     dmxSync(dmxScreen, FALSE);
 }
 
@@ -342,19 +353,21 @@ void dmxFillPolygon(DrawablePtr pDrawable, GCPtr pGC,
  *  the back-end server associated with \a pDrawable's screen.  If the
  *  offscreen optimization is enabled, only draw when \a pDrawable is at
  *  least partially visible. */
-void dmxPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
-		     int nrectFill, xRectangle *prectInit)
+void
+dmxPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
+                int nrectFill, xRectangle *prectInit)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable draw;
 
-    if (DMX_GCOPS_OFFSCREEN(pDrawable)) return;
+    if (DMX_GCOPS_OFFSCREEN(pDrawable))
+        return;
 
     DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
     XFillRectangles(dmxScreen->beDisplay, draw, pGCPriv->gc,
-		    (XRectangle *)prectInit, nrectFill);
+                    (XRectangle *) prectInit, nrectFill);
     dmxSync(dmxScreen, FALSE);
 }
 
@@ -362,19 +375,19 @@ void dmxPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
  *  server associated with \a pDrawable's screen.  If the offscreen
  *  optimization is enabled, only draw when \a pDrawable is at least
  *  partially visible. */
-void dmxPolyFillArc(DrawablePtr pDrawable, GCPtr pGC,
-		    int narcs, xArc *parcs)
+void
+dmxPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc * parcs)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable draw;
 
-    if (DMX_GCOPS_OFFSCREEN(pDrawable)) return;
+    if (DMX_GCOPS_OFFSCREEN(pDrawable))
+        return;
 
     DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
-    XFillArcs(dmxScreen->beDisplay, draw, pGCPriv->gc,
-	      (XArc *)parcs, narcs);
+    XFillArcs(dmxScreen->beDisplay, draw, pGCPriv->gc, (XArc *) parcs, narcs);
     dmxSync(dmxScreen, FALSE);
 }
 
@@ -382,84 +395,90 @@ void dmxPolyFillArc(DrawablePtr pDrawable, GCPtr pGC,
  *  the back-end server associated with \a pDrawable's screen.  If the
  *  offscreen optimization is enabled, only draw when \a pDrawable is at
  *  least partially visible. */
-int dmxPolyText8(DrawablePtr pDrawable, GCPtr pGC,
-		 int x, int y, int count, char *chars)
+int
+dmxPolyText8(DrawablePtr pDrawable, GCPtr pGC,
+             int x, int y, int count, char *chars)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    unsigned long  n, i;
-    int            w;
-    CharInfoPtr    charinfo[255];
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    unsigned long n, i;
+    int w;
+    CharInfoPtr charinfo[255];
+    Drawable draw;
 
-    GetGlyphs(pGC->font, (unsigned long)count, (unsigned char *)chars,
-	      Linear8Bit, &n, charinfo);
+    GetGlyphs(pGC->font, (unsigned long) count, (unsigned char *) chars,
+              Linear8Bit, &n, charinfo);
 
     /* Calculate text width */
     w = 0;
-    for (i = 0; i < n; i++) w += charinfo[i]->metrics.characterWidth;
+    for (i = 0; i < n; i++)
+        w += charinfo[i]->metrics.characterWidth;
 
     if (n != 0 && !DMX_GCOPS_OFFSCREEN(pDrawable)) {
-	DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
+        DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
-	XDrawString(dmxScreen->beDisplay, draw, pGCPriv->gc,
-		    x, y, chars, count);
-	dmxSync(dmxScreen, FALSE);
+        XDrawString(dmxScreen->beDisplay, draw, pGCPriv->gc,
+                    x, y, chars, count);
+        dmxSync(dmxScreen, FALSE);
     }
 
-    return x+w;
+    return x + w;
 }
 
 /** Render string of 16-bit \a chars (foreground only) in \a pDrawable
  *  on the back-end server associated with \a pDrawable's screen.  If
  *  the offscreen optimization is enabled, only draw when \a pDrawable
  *  is at least partially visible. */
-int dmxPolyText16(DrawablePtr pDrawable, GCPtr pGC,
-		  int x, int y, int count, unsigned short *chars)
+int
+dmxPolyText16(DrawablePtr pDrawable, GCPtr pGC,
+              int x, int y, int count, unsigned short *chars)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    unsigned long  n, i;
-    int            w;
-    CharInfoPtr    charinfo[255];
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    unsigned long n, i;
+    int w;
+    CharInfoPtr charinfo[255];
+    Drawable draw;
 
-    GetGlyphs(pGC->font, (unsigned long)count, (unsigned char *)chars,
-	      (FONTLASTROW(pGC->font) == 0) ? Linear16Bit : TwoD16Bit,
-	      &n, charinfo);
+    GetGlyphs(pGC->font, (unsigned long) count, (unsigned char *) chars,
+              (FONTLASTROW(pGC->font) == 0) ? Linear16Bit : TwoD16Bit,
+              &n, charinfo);
 
     /* Calculate text width */
     w = 0;
-    for (i = 0; i < n; i++) w += charinfo[i]->metrics.characterWidth;
+    for (i = 0; i < n; i++)
+        w += charinfo[i]->metrics.characterWidth;
 
     if (n != 0 && !DMX_GCOPS_OFFSCREEN(pDrawable)) {
-	DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
+        DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
-	XDrawString16(dmxScreen->beDisplay, draw, pGCPriv->gc,
-		      x, y, (XChar2b *)chars, count);
-	dmxSync(dmxScreen, FALSE);
+        XDrawString16(dmxScreen->beDisplay, draw, pGCPriv->gc,
+                      x, y, (XChar2b *) chars, count);
+        dmxSync(dmxScreen, FALSE);
     }
 
-    return x+w;
+    return x + w;
 }
 
 /** Render string of 8-bit \a chars (both foreground and background) in
  *  \a pDrawable on the back-end server associated with \a pDrawable's
  *  screen.  If the offscreen optimization is enabled, only draw when \a
  *  pDrawable is at least partially visible. */
-void dmxImageText8(DrawablePtr pDrawable, GCPtr pGC,
-		   int x, int y, int count, char *chars)
+void
+dmxImageText8(DrawablePtr pDrawable, GCPtr pGC,
+              int x, int y, int count, char *chars)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable draw;
 
-    if (DMX_GCOPS_OFFSCREEN(pDrawable)) return;
+    if (DMX_GCOPS_OFFSCREEN(pDrawable))
+        return;
 
     DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
     XDrawImageString(dmxScreen->beDisplay, draw, pGCPriv->gc,
-		     x, y, chars, count);
+                     x, y, chars, count);
     dmxSync(dmxScreen, FALSE);
 }
 
@@ -467,41 +486,46 @@ void dmxImageText8(DrawablePtr pDrawable, GCPtr pGC,
  *  \a pDrawable on the back-end server associated with \a pDrawable's
  *  screen.  If the offscreen optimization is enabled, only draw when \a
  *  pDrawable is at least partially visible. */
-void dmxImageText16(DrawablePtr pDrawable, GCPtr pGC,
-		    int x, int y, int count, unsigned short *chars)
+void
+dmxImageText16(DrawablePtr pDrawable, GCPtr pGC,
+               int x, int y, int count, unsigned short *chars)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
-    Drawable       draw;
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Drawable draw;
 
-    if (DMX_GCOPS_OFFSCREEN(pDrawable)) return;
+    if (DMX_GCOPS_OFFSCREEN(pDrawable))
+        return;
 
     DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
 
     XDrawImageString16(dmxScreen->beDisplay, draw, pGCPriv->gc,
-		       x, y, (XChar2b *)chars, count);
+                       x, y, (XChar2b *) chars, count);
     dmxSync(dmxScreen, FALSE);
 }
 
 /** Image Glyph Blt -- this function should never be called. */
-void dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
-		      int x, int y, unsigned int nglyph,
-		      CharInfoPtr *ppci, pointer pglyphBase)
+void
+dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
+                 int x, int y, unsigned int nglyph,
+                 CharInfoPtr * ppci, pointer pglyphBase)
 {
     /* Error -- this should never happen! */
 }
 
 /** Poly Glyph Blt -- this function should never be called. */
-void dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
-		     int x, int y, unsigned int nglyph,
-		     CharInfoPtr *ppci, pointer pglyphBase)
+void
+dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
+                int x, int y, unsigned int nglyph,
+                CharInfoPtr * ppci, pointer pglyphBase)
 {
     /* Error -- this should never happen! */
 }
 
 /** Push Pixels -- this function should never be called. */
-void dmxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
-		   int w, int h, int x, int y)
+void
+dmxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
+              int w, int h, int x, int y)
 {
     /* Error -- this should never happen! */
 }
@@ -514,29 +538,32 @@ void dmxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
  * screen 0.  When screen 0 is detached, the pixmaps must be obtained
  * from any other screen that is not detached.  Usually, this is screen
  * 1. */
-static DMXScreenInfo *dmxFindAlternatePixmap(DrawablePtr pDrawable, XID *draw)
+static DMXScreenInfo *
+dmxFindAlternatePixmap(DrawablePtr pDrawable, XID *draw)
 {
 #ifdef PANORAMIX
-    PanoramiXRes  *pXinPix;
-    int           i;
+    PanoramiXRes *pXinPix;
+    int i;
     DMXScreenInfo *dmxScreen;
-            
-    if (noPanoramiXExtension)               return NULL;
-    if (pDrawable->type != DRAWABLE_PIXMAP) return NULL;
 
-    if (Success != dixLookupResourceByType((pointer*) &pXinPix,
-					   pDrawable->id, XRT_PIXMAP,
-					   NullClient, DixUnknownAccess))
+    if (noPanoramiXExtension)
+        return NULL;
+    if (pDrawable->type != DRAWABLE_PIXMAP)
+        return NULL;
+
+    if (Success != dixLookupResourceByType((pointer *) &pXinPix,
+                                           pDrawable->id, XRT_PIXMAP,
+                                           NullClient, DixUnknownAccess))
         return NULL;
 
     FOR_NSCREENS_FORWARD_SKIP(i) {
         dmxScreen = &dmxScreens[i];
         if (dmxScreen->beDisplay) {
-            PixmapPtr     pSrc;
+            PixmapPtr pSrc;
             dmxPixPrivPtr pSrcPriv;
-            
-            dixLookupResourceByType((pointer*) &pSrc, pXinPix->info[i].id,
-				    RT_PIXMAP, NullClient, DixUnknownAccess);
+
+            dixLookupResourceByType((pointer *) &pSrc, pXinPix->info[i].id,
+                                    RT_PIXMAP, NullClient, DixUnknownAccess);
             pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
             if (pSrcPriv->pixmap) {
                 *draw = pSrcPriv->pixmap;
@@ -553,53 +580,58 @@ static DMXScreenInfo *dmxFindAlternatePixmap(DrawablePtr pDrawable, XID *draw)
  *  image from it.  If it is not viewable, then get the image from the
  *  first ancestor of \a pDrawable that is viewable.  If no viewable
  *  ancestor is found, then simply return without getting an image.  */
-void dmxGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
-		 unsigned int format, unsigned long planeMask, char *pdstLine)
+void
+dmxGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
+            unsigned int format, unsigned long planeMask, char *pdstLine)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pDrawable->pScreen->myNum];
-    XImage        *img;
-    Drawable       draw;
+    XImage *img;
+    Drawable draw;
 
     /* Cannot get image from unviewable window */
     if (pDrawable->type == DRAWABLE_WINDOW) {
-	WindowPtr pWindow = (WindowPtr)pDrawable;
-	if (!pWindow->viewable) {
-	    while (!pWindow->viewable && pWindow->parent) {
-		sx += pWindow->origin.x - wBorderWidth(pWindow);
-		sx += pWindow->origin.y - wBorderWidth(pWindow);
-		pWindow = pWindow->parent;
-	    }
-	    if (!pWindow->viewable) {
-		return;
-	    }
-	}
-	DMX_GCOPS_SET_DRAWABLE(&pWindow->drawable, draw);
-	if (DMX_GCOPS_OFFSCREEN(&pWindow->drawable))
-	    return;
-    } else {
-	DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
-	if (DMX_GCOPS_OFFSCREEN(pDrawable)) {
+        WindowPtr pWindow = (WindowPtr) pDrawable;
+
+        if (!pWindow->viewable) {
+            while (!pWindow->viewable && pWindow->parent) {
+                sx += pWindow->origin.x - wBorderWidth(pWindow);
+                sx += pWindow->origin.y - wBorderWidth(pWindow);
+                pWindow = pWindow->parent;
+            }
+            if (!pWindow->viewable) {
+                return;
+            }
+        }
+        DMX_GCOPS_SET_DRAWABLE(&pWindow->drawable, draw);
+        if (DMX_GCOPS_OFFSCREEN(&pWindow->drawable))
+            return;
+    }
+    else {
+        DMX_GCOPS_SET_DRAWABLE(pDrawable, draw);
+        if (DMX_GCOPS_OFFSCREEN(pDrawable)) {
             /* Try to find the pixmap on a non-detached Xinerama screen */
             dmxScreen = dmxFindAlternatePixmap(pDrawable, &draw);
-            if (!dmxScreen) return;
+            if (!dmxScreen)
+                return;
         }
     }
 
     img = XGetImage(dmxScreen->beDisplay, draw,
-		    sx, sy, w, h, planeMask, format);
+                    sx, sy, w, h, planeMask, format);
     if (img) {
-	int len = img->bytes_per_line * img->height;
-	memmove(pdstLine, img->data, len);
-	XDestroyImage(img);
+        int len = img->bytes_per_line * img->height;
+
+        memmove(pdstLine, img->data, len);
+        XDestroyImage(img);
     }
 
     dmxSync(dmxScreen, FALSE);
 }
 
 /** Get Spans -- this function should never be called. */
-void dmxGetSpans(DrawablePtr pDrawable, int wMax,
-		 DDXPointPtr ppt, int *pwidth, int nspans,
-		 char *pdstStart)
+void
+dmxGetSpans(DrawablePtr pDrawable, int wMax,
+            DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)
 {
     /* Error -- this should never happen! */
 }
diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c
index 57c242598..09e3d74ea 100644
--- a/xorg-server/hw/dmx/dmxinit.c
+++ b/xorg-server/hw/dmx/dmxinit.c
@@ -55,8 +55,8 @@
 #include "dmxstat.h"
 #include "dmxpict.h"
 
-#include <X11/Xos.h>                /* For gettimeofday */
-#include <X11/Xmu/SysUtil.h>        /* For XmuGetHostname */
+#include <X11/Xos.h>            /* For gettimeofday */
+#include <X11/Xmu/SysUtil.h>    /* For XmuGetHostname */
 #include "dixstruct.h"
 #ifdef PANORAMIX
 #include "panoramiXsrv.h"
@@ -70,91 +70,94 @@
 #include "dmx_glxvisuals.h"
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
-#endif /* GLXEXT */
+#endif                          /* GLXEXT */
 
 /* Global variables available to all Xserver/hw/dmx routines. */
-int             dmxNumScreens;
-DMXScreenInfo  *dmxScreens;
+int dmxNumScreens;
+DMXScreenInfo *dmxScreens;
 
-int             dmxNumInputs;
-DMXInputInfo   *dmxInputs;
+int dmxNumInputs;
+DMXInputInfo *dmxInputs;
 
-int             dmxShadowFB = FALSE;
+int dmxShadowFB = FALSE;
 
-XErrorEvent     dmxLastErrorEvent;
-Bool            dmxErrorOccurred = FALSE;
+XErrorEvent dmxLastErrorEvent;
+Bool dmxErrorOccurred = FALSE;
 
-char           *dmxFontPath = NULL;
+char *dmxFontPath = NULL;
 
-Bool            dmxOffScreenOpt = TRUE;
+Bool dmxOffScreenOpt = TRUE;
 
-Bool            dmxSubdividePrimitives = TRUE;
+Bool dmxSubdividePrimitives = TRUE;
 
-Bool            dmxLazyWindowCreation = TRUE;
+Bool dmxLazyWindowCreation = TRUE;
 
-Bool            dmxUseXKB = TRUE;
+Bool dmxUseXKB = TRUE;
 
-int             dmxDepth = 0;
+int dmxDepth = 0;
 
 #ifndef GLXEXT
-static Bool     dmxGLXProxy = FALSE;
+static Bool dmxGLXProxy = FALSE;
 #else
-Bool            dmxGLXProxy = TRUE;
+Bool dmxGLXProxy = TRUE;
 
-Bool            dmxGLXSwapGroupSupport = TRUE;
+Bool dmxGLXSwapGroupSupport = TRUE;
 
-Bool            dmxGLXSyncSwap = FALSE;
+Bool dmxGLXSyncSwap = FALSE;
 
-Bool            dmxGLXFinishSwap = FALSE;
+Bool dmxGLXFinishSwap = FALSE;
 #endif
 
-Bool            dmxIgnoreBadFontPaths = FALSE;
+Bool dmxIgnoreBadFontPaths = FALSE;
 
-Bool            dmxAddRemoveScreens = FALSE;
+Bool dmxAddRemoveScreens = FALSE;
 
 /* dmxErrorHandler catches errors that occur when calling one of the
  * back-end servers.  Some of this code is based on _XPrintDefaultError
  * in xc/lib/X11/XlibInt.c */
-static int dmxErrorHandler(Display *dpy, XErrorEvent *ev)
+static int
+dmxErrorHandler(Display * dpy, XErrorEvent * ev)
 {
 #define DMX_ERROR_BUF_SIZE 256
-                                /* RATS: these buffers are only used in
-                                 * length-limited calls. */
-    char        buf[DMX_ERROR_BUF_SIZE];
-    char        request[DMX_ERROR_BUF_SIZE];
+    /* RATS: these buffers are only used in
+     * length-limited calls. */
+    char buf[DMX_ERROR_BUF_SIZE];
+    char request[DMX_ERROR_BUF_SIZE];
     _XExtension *ext = NULL;
 
-    dmxErrorOccurred  = TRUE;
+    dmxErrorOccurred = TRUE;
     dmxLastErrorEvent = *ev;
 
     XGetErrorText(dpy, ev->error_code, buf, sizeof(buf));
     dmxLog(dmxWarning, "dmxErrorHandler: %s\n", buf);
 
-                                /* Find major opcode name */
+    /* Find major opcode name */
     if (ev->request_code < 128) {
         snprintf(request, sizeof(request), "%d", ev->request_code);
         XGetErrorDatabaseText(dpy, "XRequest", request, "", buf, sizeof(buf));
-    } else {
+    }
+    else {
         for (ext = dpy->ext_procs;
              ext && ext->codes.major_opcode != ev->request_code;
              ext = ext->next);
-        if (ext) strlcpy(buf, ext->name, sizeof(buf));
-        else     buf[0] = '\0';
+        if (ext)
+            strlcpy(buf, ext->name, sizeof(buf));
+        else
+            buf[0] = '\0';
     }
     dmxLog(dmxWarning, "                 Major opcode: %d (%s)\n",
            ev->request_code, buf);
 
-                                /* Find minor opcode name */
+    /* Find minor opcode name */
     if (ev->request_code >= 128 && ext) {
         snprintf(request, sizeof(request), "%d", ev->request_code);
-        snprintf(request, sizeof(request), "%s.%d",
-                    ext->name, ev->minor_code);
+        snprintf(request, sizeof(request), "%s.%d", ext->name, ev->minor_code);
         XGetErrorDatabaseText(dpy, "XRequest", request, "", buf, sizeof(buf));
         dmxLog(dmxWarning, "                 Minor opcode: %d (%s)\n",
                ev->minor_code, buf);
     }
 
-                                /* Provide value information */
+    /* Provide value information */
     switch (ev->error_code) {
     case BadValue:
         dmxLog(dmxWarning, "                 Value:        0x%x\n",
@@ -170,7 +173,7 @@ static int dmxErrorHandler(Display *dpy, XErrorEvent *ev)
         break;
     }
 
-                                /* Provide serial number information */
+    /* Provide serial number information */
     dmxLog(dmxWarning, "                 Failed serial number:  %d\n",
            ev->serial);
     dmxLog(dmxWarning, "                 Current serial number: %d\n",
@@ -179,47 +182,53 @@ static int dmxErrorHandler(Display *dpy, XErrorEvent *ev)
 }
 
 #ifdef GLXEXT
-static int dmxNOPErrorHandler(Display *dpy, XErrorEvent *ev)
+static int
+dmxNOPErrorHandler(Display * dpy, XErrorEvent * ev)
 {
     return 0;
 }
 #endif
 
-Bool dmxOpenDisplay(DMXScreenInfo *dmxScreen)
+Bool
+dmxOpenDisplay(DMXScreenInfo * dmxScreen)
 {
     if (!(dmxScreen->beDisplay = XOpenDisplay(dmxScreen->name)))
-	return FALSE;
+        return FALSE;
 
     dmxPropertyDisplay(dmxScreen);
     return TRUE;
 }
 
-void dmxSetErrorHandler(DMXScreenInfo *dmxScreen)
+void
+dmxSetErrorHandler(DMXScreenInfo * dmxScreen)
 {
     XSetErrorHandler(dmxErrorHandler);
 }
 
-static void dmxPrintScreenInfo(DMXScreenInfo *dmxScreen)
+static void
+dmxPrintScreenInfo(DMXScreenInfo * dmxScreen)
 {
     XWindowAttributes attribs;
-    int               ndepths = 0, *depths = NULL;
-    int               i;
-    Display           *dpy   = dmxScreen->beDisplay;
-    Screen            *s     = DefaultScreenOfDisplay(dpy);
-    int               scr    = DefaultScreen(dpy);
+    int ndepths = 0, *depths = NULL;
+    int i;
+    Display *dpy = dmxScreen->beDisplay;
+    Screen *s = DefaultScreenOfDisplay(dpy);
+    int scr = DefaultScreen(dpy);
 
     XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &attribs);
-    if (!(depths = XListDepths(dpy, scr, &ndepths))) ndepths = 0;
-    
+    if (!(depths = XListDepths(dpy, scr, &ndepths)))
+        ndepths = 0;
+
     dmxLogOutput(dmxScreen, "Name of display: %s\n", DisplayString(dpy));
     dmxLogOutput(dmxScreen, "Version number:  %d.%d\n",
                  ProtocolVersion(dpy), ProtocolRevision(dpy));
     dmxLogOutput(dmxScreen, "Vendor string:   %s\n", ServerVendor(dpy));
     if (!strstr(ServerVendor(dpy), "XFree86")) {
         dmxLogOutput(dmxScreen, "Vendor release:  %d\n", VendorRelease(dpy));
-    } else {
-                                /* This code based on xdpyinfo.c */
-    	int v = VendorRelease(dpy);
+    }
+    else {
+        /* This code based on xdpyinfo.c */
+        int v = VendorRelease(dpy);
         int major = -1, minor = -1, patch = -1, subpatch = -1;
 
         if (v < 336)
@@ -229,27 +238,33 @@ static void dmxPrintScreenInfo(DMXScreenInfo *dmxScreen)
             minor = (v / 100) % 10;
             if (((v / 10) % 10) || (v % 10)) {
                 patch = (v / 10) % 10;
-                if (v % 10) subpatch = v % 10;
+                if (v % 10)
+                    subpatch = v % 10;
             }
-        } else if (v < 40000000) {
+        }
+        else if (v < 40000000) {
             major = v / 1000;
             minor = (v / 10) % 10;
-            if (v % 10) patch = v % 10;
-	} else {
+            if (v % 10)
+                patch = v % 10;
+        }
+        else {
             major = v / 10000000;
             minor = (v / 100000) % 100;
             patch = (v / 1000) % 100;
-            if (v % 1000) subpatch = v % 1000;
-	}
+            if (v % 1000)
+                subpatch = v % 1000;
+        }
         dmxLogOutput(dmxScreen, "Vendor release:  %d (XFree86 version: %d.%d",
                      v, major, minor);
-        if (patch > 0)    dmxLogOutputCont(dmxScreen, ".%d", patch);
-        if (subpatch > 0) dmxLogOutputCont(dmxScreen, ".%d", subpatch);
+        if (patch > 0)
+            dmxLogOutputCont(dmxScreen, ".%d", patch);
+        if (subpatch > 0)
+            dmxLogOutputCont(dmxScreen, ".%d", subpatch);
         dmxLogOutputCont(dmxScreen, ")\n");
     }
 
-    
-    dmxLogOutput(dmxScreen, "Dimensions:      %dx%d pixels\n", 
+    dmxLogOutput(dmxScreen, "Dimensions:      %dx%d pixels\n",
                  attribs.width, attribs.height);
     dmxLogOutput(dmxScreen, "%d depths on screen %d: ", ndepths, scr);
     for (i = 0; i < ndepths; i++)
@@ -261,59 +276,65 @@ static void dmxPrintScreenInfo(DMXScreenInfo *dmxScreen)
     dmxLogOutput(dmxScreen, "Number of colormaps:   %d min, %d max\n",
                  MinCmapsOfScreen(s), MaxCmapsOfScreen(s));
     dmxLogOutput(dmxScreen, "Options: backing-store %s, save-unders %s\n",
-                 (DoesBackingStore (s) == NotUseful) ? "no" :
-                 ((DoesBackingStore (s) == Always) ? "yes" : "when mapped"),
-                 DoesSaveUnders (s) ? "yes" : "no");
+                 (DoesBackingStore(s) == NotUseful) ? "no" :
+                 ((DoesBackingStore(s) == Always) ? "yes" : "when mapped"),
+                 DoesSaveUnders(s) ? "yes" : "no");
     dmxLogOutput(dmxScreen, "Window Manager running: %s\n",
-		 (dmxScreen->WMRunningOnBE) ? "yes" : "no");
+                 (dmxScreen->WMRunningOnBE) ? "yes" : "no");
 
     if (dmxScreen->WMRunningOnBE) {
-	dmxLogOutputWarning(dmxScreen,
-			    "Window manager running "
-			    "-- colormaps not supported\n");
+        dmxLogOutputWarning(dmxScreen,
+                            "Window manager running "
+                            "-- colormaps not supported\n");
     }
     XFree(depths);
 }
 
-void dmxGetScreenAttribs(DMXScreenInfo *dmxScreen)
+void
+dmxGetScreenAttribs(DMXScreenInfo * dmxScreen)
 {
     XWindowAttributes attribs;
-    Display           *dpy   = dmxScreen->beDisplay;
+    Display *dpy = dmxScreen->beDisplay;
+
 #ifdef GLXEXT
-    int               dummy;
+    int dummy;
 #endif
 
     XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &attribs);
 
-    dmxScreen->beWidth  = attribs.width;
+    dmxScreen->beWidth = attribs.width;
     dmxScreen->beHeight = attribs.height;
-    
-                                /* Fill in missing geometry information */
+
+    /* Fill in missing geometry information */
     if (dmxScreen->scrnXSign < 0) {
         if (dmxScreen->scrnWidth) {
-            dmxScreen->scrnX   = (attribs.width - dmxScreen->scrnWidth
-				  - dmxScreen->scrnX);
-        } else {
-            dmxScreen->scrnWidth  = attribs.width - dmxScreen->scrnX;
-            dmxScreen->scrnX   = 0;
+            dmxScreen->scrnX = (attribs.width - dmxScreen->scrnWidth
+                                - dmxScreen->scrnX);
+        }
+        else {
+            dmxScreen->scrnWidth = attribs.width - dmxScreen->scrnX;
+            dmxScreen->scrnX = 0;
         }
     }
     if (dmxScreen->scrnYSign < 0) {
         if (dmxScreen->scrnHeight) {
-            dmxScreen->scrnY   = (attribs.height - dmxScreen->scrnHeight
-				  - dmxScreen->scrnY);
-        } else {
+            dmxScreen->scrnY = (attribs.height - dmxScreen->scrnHeight
+                                - dmxScreen->scrnY);
+        }
+        else {
             dmxScreen->scrnHeight = attribs.height - dmxScreen->scrnY;
-            dmxScreen->scrnY   = 0;
+            dmxScreen->scrnY = 0;
         }
     }
     if (!dmxScreen->scrnWidth)
-        dmxScreen->scrnWidth  = attribs.width  - dmxScreen->scrnX;
+        dmxScreen->scrnWidth = attribs.width - dmxScreen->scrnX;
     if (!dmxScreen->scrnHeight)
         dmxScreen->scrnHeight = attribs.height - dmxScreen->scrnY;
 
-    if (!dmxScreen->rootWidth)  dmxScreen->rootWidth  = dmxScreen->scrnWidth;
-    if (!dmxScreen->rootHeight) dmxScreen->rootHeight = dmxScreen->scrnHeight;
+    if (!dmxScreen->rootWidth)
+        dmxScreen->rootWidth = dmxScreen->scrnWidth;
+    if (!dmxScreen->rootHeight)
+        dmxScreen->rootHeight = dmxScreen->scrnHeight;
     if (dmxScreen->rootWidth + dmxScreen->rootX > dmxScreen->scrnWidth)
         dmxScreen->rootWidth = dmxScreen->scrnWidth - dmxScreen->rootX;
     if (dmxScreen->rootHeight + dmxScreen->rootY > dmxScreen->scrnHeight)
@@ -323,22 +344,25 @@ void dmxGetScreenAttribs(DMXScreenInfo *dmxScreen)
     dmxScreen->beXDPI = 75;
     dmxScreen->beYDPI = 75;
 
-    dmxScreen->beDepth  = attribs.depth; /* FIXME: verify that this
-					  * works always.  In
-					  * particular, this will work
-					  * well for depth=16, will fail
-					  * because of colormap issues
-					  * at depth 8.  More work needs
-					  * to be done here. */
-
-    if (dmxScreen->beDepth <= 8)       dmxScreen->beBPP = 8;
-    else if (dmxScreen->beDepth <= 16) dmxScreen->beBPP = 16;
-    else                               dmxScreen->beBPP = 32;
+    dmxScreen->beDepth = attribs.depth; /* FIXME: verify that this
+                                         * works always.  In
+                                         * particular, this will work
+                                         * well for depth=16, will fail
+                                         * because of colormap issues
+                                         * at depth 8.  More work needs
+                                         * to be done here. */
+
+    if (dmxScreen->beDepth <= 8)
+        dmxScreen->beBPP = 8;
+    else if (dmxScreen->beDepth <= 16)
+        dmxScreen->beBPP = 16;
+    else
+        dmxScreen->beBPP = 32;
 
 #ifdef GLXEXT
     /* get the majorOpcode for the back-end GLX extension */
     XQueryExtension(dpy, "GLX", &dmxScreen->glxMajorOpcode,
-		    &dummy, &dmxScreen->glxErrorBase);
+                    &dummy, &dmxScreen->glxErrorBase);
 #endif
 
     dmxPrintScreenInfo(dmxScreen);
@@ -352,47 +376,50 @@ void dmxGetScreenAttribs(DMXScreenInfo *dmxScreen)
                             "Support for depth == 8 is not complete\n");
 }
 
-Bool dmxGetVisualInfo(DMXScreenInfo *dmxScreen)
+Bool
+dmxGetVisualInfo(DMXScreenInfo * dmxScreen)
 {
     int i;
     XVisualInfo visinfo;
 
     visinfo.screen = DefaultScreen(dmxScreen->beDisplay);
     dmxScreen->beVisuals = XGetVisualInfo(dmxScreen->beDisplay,
-					  VisualScreenMask,
-					  &visinfo,
-					  &dmxScreen->beNumVisuals);
+                                          VisualScreenMask,
+                                          &visinfo, &dmxScreen->beNumVisuals);
 
     dmxScreen->beDefVisualIndex = -1;
 
     if (defaultColorVisualClass >= 0 || dmxDepth > 0) {
-	for (i = 0; i < dmxScreen->beNumVisuals; i++)
-	    if (defaultColorVisualClass >= 0) {
-		if (dmxScreen->beVisuals[i].class == defaultColorVisualClass) {
-		    if (dmxDepth > 0) {
-			if (dmxScreen->beVisuals[i].depth == dmxDepth) {
-			    dmxScreen->beDefVisualIndex = i;
-			    break;
-			}
-		    } else {
-			dmxScreen->beDefVisualIndex = i;
-			break;
-		    }
-		}
-	    } else if (dmxScreen->beVisuals[i].depth == dmxDepth) {
-		dmxScreen->beDefVisualIndex = i;
-		break;
-	    }
-    } else {
-	visinfo.visualid =
-	    XVisualIDFromVisual(DefaultVisual(dmxScreen->beDisplay,
-					      visinfo.screen));
-
-	for (i = 0; i < dmxScreen->beNumVisuals; i++)
-	    if (visinfo.visualid == dmxScreen->beVisuals[i].visualid) {
-		dmxScreen->beDefVisualIndex = i;
-		break;
-	    }
+        for (i = 0; i < dmxScreen->beNumVisuals; i++)
+            if (defaultColorVisualClass >= 0) {
+                if (dmxScreen->beVisuals[i].class == defaultColorVisualClass) {
+                    if (dmxDepth > 0) {
+                        if (dmxScreen->beVisuals[i].depth == dmxDepth) {
+                            dmxScreen->beDefVisualIndex = i;
+                            break;
+                        }
+                    }
+                    else {
+                        dmxScreen->beDefVisualIndex = i;
+                        break;
+                    }
+                }
+            }
+            else if (dmxScreen->beVisuals[i].depth == dmxDepth) {
+                dmxScreen->beDefVisualIndex = i;
+                break;
+            }
+    }
+    else {
+        visinfo.visualid =
+            XVisualIDFromVisual(DefaultVisual(dmxScreen->beDisplay,
+                                              visinfo.screen));
+
+        for (i = 0; i < dmxScreen->beNumVisuals; i++)
+            if (visinfo.visualid == dmxScreen->beVisuals[i].visualid) {
+                dmxScreen->beDefVisualIndex = i;
+                break;
+            }
     }
 
     for (i = 0; i < dmxScreen->beNumVisuals; i++)
@@ -402,44 +429,45 @@ Bool dmxGetVisualInfo(DMXScreenInfo *dmxScreen)
     return dmxScreen->beDefVisualIndex >= 0;
 }
 
-void dmxGetColormaps(DMXScreenInfo *dmxScreen)
+void
+dmxGetColormaps(DMXScreenInfo * dmxScreen)
 {
     int i;
 
     dmxScreen->beNumDefColormaps = dmxScreen->beNumVisuals;
     dmxScreen->beDefColormaps = malloc(dmxScreen->beNumDefColormaps *
-				       sizeof(*dmxScreen->beDefColormaps));
+                                       sizeof(*dmxScreen->beDefColormaps));
 
     for (i = 0; i < dmxScreen->beNumDefColormaps; i++)
-	dmxScreen->beDefColormaps[i] =
-	    XCreateColormap(dmxScreen->beDisplay,
-			    DefaultRootWindow(dmxScreen->beDisplay),
-			    dmxScreen->beVisuals[i].visual,
-			    AllocNone);
+        dmxScreen->beDefColormaps[i] =
+            XCreateColormap(dmxScreen->beDisplay,
+                            DefaultRootWindow(dmxScreen->beDisplay),
+                            dmxScreen->beVisuals[i].visual, AllocNone);
 
     dmxScreen->beBlackPixel = BlackPixel(dmxScreen->beDisplay,
-					 DefaultScreen(dmxScreen->beDisplay));
+                                         DefaultScreen(dmxScreen->beDisplay));
     dmxScreen->beWhitePixel = WhitePixel(dmxScreen->beDisplay,
-					 DefaultScreen(dmxScreen->beDisplay));
+                                         DefaultScreen(dmxScreen->beDisplay));
 }
 
-void dmxGetPixmapFormats(DMXScreenInfo *dmxScreen)
+void
+dmxGetPixmapFormats(DMXScreenInfo * dmxScreen)
 {
     dmxScreen->beDepths =
-	XListDepths(dmxScreen->beDisplay, DefaultScreen(dmxScreen->beDisplay),
-		    &dmxScreen->beNumDepths);
+        XListDepths(dmxScreen->beDisplay, DefaultScreen(dmxScreen->beDisplay),
+                    &dmxScreen->beNumDepths);
 
     dmxScreen->bePixmapFormats =
-	XListPixmapFormats(dmxScreen->beDisplay,
-			   &dmxScreen->beNumPixmapFormats);
+        XListPixmapFormats(dmxScreen->beDisplay,
+                           &dmxScreen->beNumPixmapFormats);
 }
 
-static Bool dmxSetPixmapFormats(ScreenInfo *pScreenInfo,
-				DMXScreenInfo *dmxScreen)
+static Bool
+dmxSetPixmapFormats(ScreenInfo * pScreenInfo, DMXScreenInfo * dmxScreen)
 {
     XPixmapFormatValues *bePixmapFormat;
-    PixmapFormatRec     *format;
-    int                  i, j;
+    PixmapFormatRec *format;
+    int i, j;
 
     pScreenInfo->imageByteOrder = ImageByteOrder(dmxScreen->beDisplay);
     pScreenInfo->bitmapScanlineUnit = BitmapUnit(dmxScreen->beDisplay);
@@ -448,53 +476,54 @@ static Bool dmxSetPixmapFormats(ScreenInfo *pScreenInfo,
 
     pScreenInfo->numPixmapFormats = 0;
     for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {
-	bePixmapFormat = &dmxScreen->bePixmapFormats[i];
-	for (j = 0; j < dmxScreen->beNumDepths; j++)
-	    if ((bePixmapFormat->depth == 1) ||
-		(bePixmapFormat->depth == dmxScreen->beDepths[j])) {
-		format = &pScreenInfo->formats[pScreenInfo->numPixmapFormats];
-
-		format->depth        = bePixmapFormat->depth;
-		format->bitsPerPixel = bePixmapFormat->bits_per_pixel;
-		format->scanlinePad  = bePixmapFormat->scanline_pad;
-
-		pScreenInfo->numPixmapFormats++;
-		break;
-	    }
+        bePixmapFormat = &dmxScreen->bePixmapFormats[i];
+        for (j = 0; j < dmxScreen->beNumDepths; j++)
+            if ((bePixmapFormat->depth == 1) ||
+                (bePixmapFormat->depth == dmxScreen->beDepths[j])) {
+                format = &pScreenInfo->formats[pScreenInfo->numPixmapFormats];
+
+                format->depth = bePixmapFormat->depth;
+                format->bitsPerPixel = bePixmapFormat->bits_per_pixel;
+                format->scanlinePad = bePixmapFormat->scanline_pad;
+
+                pScreenInfo->numPixmapFormats++;
+                break;
+            }
     }
 
     return TRUE;
 }
 
-void dmxCheckForWM(DMXScreenInfo *dmxScreen)
+void
+dmxCheckForWM(DMXScreenInfo * dmxScreen)
 {
     Status status;
     XWindowAttributes xwa;
 
     status = XGetWindowAttributes(dmxScreen->beDisplay,
-				  DefaultRootWindow(dmxScreen->beDisplay),
-				  &xwa);
+                                  DefaultRootWindow(dmxScreen->beDisplay),
+                                  &xwa);
     dmxScreen->WMRunningOnBE =
-	(status &&
-	 ((xwa.all_event_masks & SubstructureRedirectMask) ||
-	  (xwa.all_event_masks & SubstructureNotifyMask)));
+        (status &&
+         ((xwa.all_event_masks & SubstructureRedirectMask) ||
+          (xwa.all_event_masks & SubstructureNotifyMask)));
 }
 
 /** Initialize the display and collect relevant information about the
  *  display properties */
-static void dmxDisplayInit(DMXScreenInfo *dmxScreen)
+static void
+dmxDisplayInit(DMXScreenInfo * dmxScreen)
 {
     if (!dmxOpenDisplay(dmxScreen))
-	dmxLog(dmxFatal,
-               "dmxOpenDisplay: Unable to open display %s\n",
-               dmxScreen->name);
+        dmxLog(dmxFatal,
+               "dmxOpenDisplay: Unable to open display %s\n", dmxScreen->name);
 
     dmxSetErrorHandler(dmxScreen);
     dmxCheckForWM(dmxScreen);
     dmxGetScreenAttribs(dmxScreen);
 
     if (!dmxGetVisualInfo(dmxScreen))
-	dmxLog(dmxFatal, "dmxGetVisualInfo: No matching visuals found\n");
+        dmxLog(dmxFatal, "dmxGetVisualInfo: No matching visuals found\n");
 
     dmxGetColormaps(dmxScreen);
     dmxGetPixmapFormats(dmxScreen);
@@ -503,45 +532,52 @@ static void dmxDisplayInit(DMXScreenInfo *dmxScreen)
 /* If this doesn't compile, just add || defined(yoursystem) to the line
  * below.  This information is to help with bug reports and is not
  * critical. */
-#if !defined(_POSIX_SOURCE) 
-static const char *dmxExecOS(void) { return ""; }
+#if !defined(_POSIX_SOURCE)
+static const char *
+dmxExecOS(void)
+{
+    return "";
+}
 #else
 #include <sys/utsname.h>
-static const char *dmxExecOS(void)
+static const char *
+dmxExecOS(void)
 {
     static char buffer[128];
-    static int  initialized = 0;
+    static int initialized = 0;
     struct utsname u;
 
     if (!initialized++) {
         memset(buffer, 0, sizeof(buffer));
         uname(&u);
-        snprintf(buffer, sizeof(buffer)-1, "%s %s %s",
-                    u.sysname, u.release, u.version);
+        snprintf(buffer, sizeof(buffer) - 1, "%s %s %s",
+                 u.sysname, u.release, u.version);
     }
     return buffer;
 }
 #endif
 
-static const char *dmxBuildCompiler(void)
+static const char *
+dmxBuildCompiler(void)
 {
     static char buffer[128];
-    static int  initialized = 0;
+    static int initialized = 0;
 
     if (!initialized++) {
         memset(buffer, 0, sizeof(buffer));
 #if defined(__GNUC__) && defined(__GNUC_MINOR__) &&defined(__GNUC_PATCHLEVEL__)
-        snprintf(buffer, sizeof(buffer)-1, "gcc %d.%d.%d",
-                    __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
+        snprintf(buffer, sizeof(buffer) - 1, "gcc %d.%d.%d",
+                 __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
 #endif
     }
     return buffer;
 }
 
-static const char *dmxExecHost(void)
+static const char *
+dmxExecHost(void)
 {
     static char buffer[128];
-    static int  initialized = 0;
+    static int initialized = 0;
 
     if (!initialized++) {
         memset(buffer, 0, sizeof(buffer));
@@ -551,32 +587,35 @@ static const char *dmxExecHost(void)
 }
 
 /** This routine is called in Xserver/dix/main.c from \a main(). */
-void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
+void
+InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
 {
-    int                  i;
+    int i;
     static unsigned long dmxGeneration = 0;
+
 #ifdef GLXEXT
-    Bool                 glxSupported  = TRUE;
+    Bool glxSupported = TRUE;
 #endif
 
     if (dmxGeneration != serverGeneration) {
-	int vendrel = VENDOR_RELEASE;
+        int vendrel = VENDOR_RELEASE;
         int major, minor, year, month, day;
-        
+
         dmxGeneration = serverGeneration;
 
-        major    = vendrel / 100000000;
-        vendrel -= major   * 100000000;
-        minor    = vendrel /   1000000;
-        vendrel -= minor   *   1000000;
-        year     = vendrel /     10000;
-        vendrel -= year    *     10000;
-        month    = vendrel /       100;
-        vendrel -= month   *       100;
-        day      = vendrel;
+        major = vendrel / 100000000;
+        vendrel -= major * 100000000;
+        minor = vendrel / 1000000;
+        vendrel -= minor * 1000000;
+        year = vendrel / 10000;
+        vendrel -= year * 10000;
+        month = vendrel / 100;
+        vendrel -= month * 100;
+        day = vendrel;
 
-                                /* Add other epoch tests here */
-        if (major > 0 && minor > 0) year += 2000;
+        /* Add other epoch tests here */
+        if (major > 0 && minor > 0)
+            year += 2000;
 
         dmxLog(dmxInfo, "Generation:         %d\n", dmxGeneration);
         dmxLog(dmxInfo, "DMX version:        %d.%d.%02d%02d%02d (%s)\n",
@@ -600,32 +639,33 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
             dmxStatFree(dmxScreens[i].stat);
             dmxScreens[i].stat = NULL;
         }
-        for (i = 0; i < dmxNumInputs; i++) dmxInputFree(&dmxInputs[i]);
+        for (i = 0; i < dmxNumInputs; i++)
+            dmxInputFree(&dmxInputs[i]);
         free(dmxScreens);
         free(dmxInputs);
-        dmxScreens    = NULL;
-        dmxInputs     = NULL;
+        dmxScreens = NULL;
+        dmxInputs = NULL;
         dmxNumScreens = 0;
-        dmxNumInputs  = 0;
+        dmxNumInputs = 0;
     }
 
     /* Make sure that the command-line arguments are sane. */
     if (dmxAddRemoveScreens && dmxGLXProxy) {
-	/* Currently it is not possible to support GLX and Render
-	 * extensions with dynamic screen addition/removal due to the
-	 * state that each extension keeps, which cannot be restored. */
+        /* Currently it is not possible to support GLX and Render
+         * extensions with dynamic screen addition/removal due to the
+         * state that each extension keeps, which cannot be restored. */
         dmxLog(dmxWarning,
-	       "GLX Proxy and Render extensions do not yet support dynamic\n");
+               "GLX Proxy and Render extensions do not yet support dynamic\n");
         dmxLog(dmxWarning,
-	       "screen addition and removal.  Please specify -noglxproxy\n");
+               "screen addition and removal.  Please specify -noglxproxy\n");
         dmxLog(dmxWarning,
-	       "and -norender on the command line or in the configuration\n");
+               "and -norender on the command line or in the configuration\n");
         dmxLog(dmxWarning,
-	       "file to disable these two extensions if you wish to use\n");
+               "file to disable these two extensions if you wish to use\n");
         dmxLog(dmxWarning,
-	       "the dynamic addition and removal of screens support.\n");
+               "the dynamic addition and removal of screens support.\n");
         dmxLog(dmxFatal,
-	       "Dynamic screen addition/removal error (see above).\n");
+               "Dynamic screen addition/removal error (see above).\n");
     }
 
     /* ddxProcessArgument has been called at this point, but any data
@@ -636,17 +676,16 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
         dmxLog(dmxFatal, "InitOutput: no back-end displays found\n");
     if (!dmxNumInputs)
         dmxLog(dmxInfo, "InitOutput: no inputs found\n");
-    
+
     /* Disable lazy window creation optimization if offscreen
      * optimization is disabled */
     if (!dmxOffScreenOpt && dmxLazyWindowCreation) {
         dmxLog(dmxInfo,
-	       "InitOutput: Disabling lazy window creation optimization\n");
+               "InitOutput: Disabling lazy window creation optimization\n");
         dmxLog(dmxInfo,
-	       "            since it requires the offscreen optimization\n");
-        dmxLog(dmxInfo,
-	       "            to function properly.\n");
-	dmxLazyWindowCreation = FALSE;
+               "            since it requires the offscreen optimization\n");
+        dmxLog(dmxInfo, "            to function properly.\n");
+        dmxLazyWindowCreation = FALSE;
     }
 
     /* Open each display and gather information about it. */
@@ -662,8 +701,9 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
 #endif
 
     /* Since we only have a single screen thus far, we only need to set
-       the pixmap formats to match that screen.  FIXME: this isn't true.*/
-    if (!dmxSetPixmapFormats(pScreenInfo, &dmxScreens[0])) return;
+       the pixmap formats to match that screen.  FIXME: this isn't true. */
+    if (!dmxSetPixmapFormats(pScreenInfo, &dmxScreens[0]))
+        return;
 
     /* Might want to install a signal handler to allow cleaning up after
      * unexpected signals.  The DIX/OS layer already handles SIGINT and
@@ -682,93 +722,95 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
 #ifdef GLXEXT
     /* Check if GLX extension exists on all back-end servers */
     for (i = 0; i < dmxNumScreens; i++)
-	glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);
+        glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);
 #endif
 
     /* Tell dix layer about the backend displays */
     for (i = 0; i < dmxNumScreens; i++) {
 
 #ifdef GLXEXT
-	if (glxSupported) {
-	    /*
-	     * Builds GLX configurations from the list of visuals
-	     * supported by the back-end server, and give that
-	     * configuration list to the glx layer - so that he will
-	     * build the visuals accordingly.
-	     */
-
-	    DMXScreenInfo       *dmxScreen    = &dmxScreens[i];
-	    __GLXvisualConfig   *configs      = NULL;
-	    dmxGlxVisualPrivate **configprivs = NULL;
-	    int                 nconfigs      = 0;
-	    int                 (*oldErrorHandler)(Display *, XErrorEvent *);
-	    int                 i;
-
-	    /* Catch errors if when using an older GLX w/o FBconfigs */
-	    oldErrorHandler = XSetErrorHandler(dmxNOPErrorHandler);
-
-	    /* Get FBConfigs of the back-end server */
-	    dmxScreen->fbconfigs = GetGLXFBConfigs(dmxScreen->beDisplay,
-						   dmxScreen->glxMajorOpcode,
-						   &dmxScreen->numFBConfigs);
-
-	    XSetErrorHandler(oldErrorHandler);
-
-	    dmxScreen->glxVisuals = 
-		GetGLXVisualConfigs(dmxScreen->beDisplay,
-				    DefaultScreen(dmxScreen->beDisplay),
-				    &dmxScreen->numGlxVisuals);
-
-	    if (dmxScreen->fbconfigs) {
-		configs =
-		    GetGLXVisualConfigsFromFBConfigs(dmxScreen->fbconfigs,
-						     dmxScreen->numFBConfigs,
-						     dmxScreen->beVisuals,
-						     dmxScreen->beNumVisuals,
-						     dmxScreen->glxVisuals,
-						     dmxScreen->numGlxVisuals,
-						     &nconfigs);
-	    } else {
-		configs = dmxScreen->glxVisuals;
-		nconfigs = dmxScreen->numGlxVisuals;
-	    }
-
-	    configprivs = malloc(nconfigs * sizeof(dmxGlxVisualPrivate*));
-
-	    if (configs != NULL && configprivs != NULL) {
-
-		/* Initialize our private info for each visual
-		 * (currently only x_visual_depth and x_visual_class)
-		 */
-		for (i = 0; i < nconfigs; i++) {
-
-		    configprivs[i] = (dmxGlxVisualPrivate *)
-			malloc(sizeof(dmxGlxVisualPrivate));
-		    configprivs[i]->x_visual_depth = 0;
-		    configprivs[i]->x_visual_class = 0;
-
-		    /* Find the visual depth */
-		    if (configs[i].vid > 0) {
-			int  j;
-			for (j = 0; j < dmxScreen->beNumVisuals; j++) {
-			    if (dmxScreen->beVisuals[j].visualid ==
-				configs[i].vid) {
-				configprivs[i]->x_visual_depth =
-				    dmxScreen->beVisuals[j].depth;
-				configprivs[i]->x_visual_class =
-				    dmxScreen->beVisuals[j].class;
-				break;
-			    }
-			}
-		    }
-		}
+        if (glxSupported) {
+            /*
+             * Builds GLX configurations from the list of visuals
+             * supported by the back-end server, and give that
+             * configuration list to the glx layer - so that he will
+             * build the visuals accordingly.
+             */
+
+            DMXScreenInfo *dmxScreen = &dmxScreens[i];
+            __GLXvisualConfig *configs = NULL;
+            dmxGlxVisualPrivate **configprivs = NULL;
+            int nconfigs = 0;
+            int (*oldErrorHandler) (Display *, XErrorEvent *);
+            int i;
+
+            /* Catch errors if when using an older GLX w/o FBconfigs */
+            oldErrorHandler = XSetErrorHandler(dmxNOPErrorHandler);
+
+            /* Get FBConfigs of the back-end server */
+            dmxScreen->fbconfigs = GetGLXFBConfigs(dmxScreen->beDisplay,
+                                                   dmxScreen->glxMajorOpcode,
+                                                   &dmxScreen->numFBConfigs);
+
+            XSetErrorHandler(oldErrorHandler);
+
+            dmxScreen->glxVisuals =
+                GetGLXVisualConfigs(dmxScreen->beDisplay,
+                                    DefaultScreen(dmxScreen->beDisplay),
+                                    &dmxScreen->numGlxVisuals);
+
+            if (dmxScreen->fbconfigs) {
+                configs =
+                    GetGLXVisualConfigsFromFBConfigs(dmxScreen->fbconfigs,
+                                                     dmxScreen->numFBConfigs,
+                                                     dmxScreen->beVisuals,
+                                                     dmxScreen->beNumVisuals,
+                                                     dmxScreen->glxVisuals,
+                                                     dmxScreen->numGlxVisuals,
+                                                     &nconfigs);
+            }
+            else {
+                configs = dmxScreen->glxVisuals;
+                nconfigs = dmxScreen->numGlxVisuals;
+            }
+
+            configprivs = malloc(nconfigs * sizeof(dmxGlxVisualPrivate *));
+
+            if (configs != NULL && configprivs != NULL) {
+
+                /* Initialize our private info for each visual
+                 * (currently only x_visual_depth and x_visual_class)
+                 */
+                for (i = 0; i < nconfigs; i++) {
+
+                    configprivs[i] = (dmxGlxVisualPrivate *)
+                        malloc(sizeof(dmxGlxVisualPrivate));
+                    configprivs[i]->x_visual_depth = 0;
+                    configprivs[i]->x_visual_class = 0;
+
+                    /* Find the visual depth */
+                    if (configs[i].vid > 0) {
+                        int j;
+
+                        for (j = 0; j < dmxScreen->beNumVisuals; j++) {
+                            if (dmxScreen->beVisuals[j].visualid ==
+                                configs[i].vid) {
+                                configprivs[i]->x_visual_depth =
+                                    dmxScreen->beVisuals[j].depth;
+                                configprivs[i]->x_visual_class =
+                                    dmxScreen->beVisuals[j].class;
+                                break;
+                            }
+                        }
+                    }
+                }
 
                 XFlush(dmxScreen->beDisplay);
-	    }
-	}
-#endif  /* GLXEXT */
+            }
+        }
+#endif                          /* GLXEXT */
 
-	AddScreen(dmxScreenInit, argc, argv);
+        AddScreen(dmxScreenInit, argc, argv);
     }
 
     /* Compute origin information. */
@@ -787,30 +829,32 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
 
     /* Initialize the render extension */
     if (!noRenderExtension)
-	dmxInitRender();
+        dmxInitRender();
 
     /* Initialized things that need timer hooks */
     dmxStatInit();
     dmxSyncInit();              /* Calls RegisterBlockAndWakeupHandlers */
 
     dmxLog(dmxInfo, "Shadow framebuffer support %s\n",
-	   dmxShadowFB ? "enabled" : "disabled");
+           dmxShadowFB ? "enabled" : "disabled");
 }
 
 /* RATS: Assuming the fp string (which comes from the command-line argv
          vector) is NULL-terminated, the buffer is large enough for the
-         strcpy. */ 
-static void dmxSetDefaultFontPath(const char *fp)
+         strcpy. */
+static void
+dmxSetDefaultFontPath(const char *fp)
 {
     if (dmxFontPath) {
-	int fplen = strlen(fp) + 1;
-	int len = strlen(dmxFontPath);
-
-	dmxFontPath = realloc(dmxFontPath, len+fplen+1);
-	dmxFontPath[len] = ',';
-	strncpy(&dmxFontPath[len+1], fp, fplen);
-    } else {
-	dmxFontPath = strdup(fp);
+        int fplen = strlen(fp) + 1;
+        int len = strlen(dmxFontPath);
+
+        dmxFontPath = realloc(dmxFontPath, len + fplen + 1);
+        dmxFontPath[len] = ',';
+        strncpy(&dmxFontPath[len + 1], fp, fplen);
+    }
+    else {
+        dmxFontPath = strdup(fp);
     }
 
     defaultFontPath = dmxFontPath;
@@ -819,20 +863,23 @@ static void dmxSetDefaultFontPath(const char *fp)
 /** This function is called in Xserver/os/utils.c from \a AbortServer().
  * We must ensure that backend and console state is restored in the
  * event the server shutdown wasn't clean. */
-void AbortDDX(enum ExitCode error)
+void
+AbortDDX(enum ExitCode error)
 {
     int i;
 
-    for (i=0; i < dmxNumScreens; i++) {
+    for (i = 0; i < dmxNumScreens; i++) {
         DMXScreenInfo *dmxScreen = &dmxScreens[i];
-        
-        if (dmxScreen->beDisplay) XCloseDisplay(dmxScreen->beDisplay);
+
+        if (dmxScreen->beDisplay)
+            XCloseDisplay(dmxScreen->beDisplay);
         dmxScreen->beDisplay = NULL;
     }
 }
 
 #ifdef DDXBEFORERESET
-void ddxBeforeReset(void)
+void
+ddxBeforeReset(void)
 {
 }
 #endif
@@ -840,13 +887,15 @@ void ddxBeforeReset(void)
 /** This function is called in Xserver/dix/main.c from \a main() when
  * dispatchException & DE_TERMINATE (which is the only way to exit the
  * main loop without an interruption. */
-void ddxGiveUp(enum ExitCode error)
+void
+ddxGiveUp(enum ExitCode error)
 {
     AbortDDX(error);
 }
 
 /** This function is called in Xserver/os/osinit.c from \a OsInit(). */
-void OsVendorInit(void)
+void
+OsVendorInit(void)
 {
 }
 
@@ -855,100 +904,134 @@ void OsVendorInit(void)
  * OsVendorVErrorFProc will cause \a VErrorF() (which is called by the
  * two routines mentioned here, as well as by others) to use the
  * referenced routine instead of \a vfprintf().) */
-void OsVendorFatalError(void)
+void
+OsVendorFatalError(void)
 {
 }
 
 /** Process our command line arguments. */
-int ddxProcessArgument(int argc, char *argv[], int i)
+int
+ddxProcessArgument(int argc, char *argv[], int i)
 {
     int retval = 0;
-    
+
     if (!strcmp(argv[i], "-display")) {
-	if (++i < argc) dmxConfigStoreDisplay(argv[i]);
+        if (++i < argc)
+            dmxConfigStoreDisplay(argv[i]);
         retval = 2;
-    } else if (!strcmp(argv[i], "-inputfrom") || !strcmp(argv[i], "-input")) {
-	if (++i < argc) dmxConfigStoreInput(argv[i]);
+    }
+    else if (!strcmp(argv[i], "-inputfrom") || !strcmp(argv[i], "-input")) {
+        if (++i < argc)
+            dmxConfigStoreInput(argv[i]);
         retval = 2;
-    } else if (!strcmp(argv[i], "-xinputfrom") || !strcmp(argv[i],"-xinput")) {
-        if (++i < argc) dmxConfigStoreXInput(argv[i]);
+    }
+    else if (!strcmp(argv[i], "-xinputfrom") || !strcmp(argv[i], "-xinput")) {
+        if (++i < argc)
+            dmxConfigStoreXInput(argv[i]);
         retval = 2;
-    } else if (!strcmp(argv[i], "-noshadowfb")) {
+    }
+    else if (!strcmp(argv[i], "-noshadowfb")) {
         dmxLog(dmxWarning,
                "-noshadowfb has been deprecated "
-	       "since it is now the default\n");
-	dmxShadowFB = FALSE;
-	retval = 1;
-    } else if (!strcmp(argv[i], "-nomulticursor")) {
+               "since it is now the default\n");
+        dmxShadowFB = FALSE;
+        retval = 1;
+    }
+    else if (!strcmp(argv[i], "-nomulticursor")) {
         dmxCursorNoMulti();
-	retval = 1;
-    } else if (!strcmp(argv[i], "-shadowfb")) {
-	dmxShadowFB = TRUE;
-	retval = 1;
-    } else if (!strcmp(argv[i], "-configfile")) {
-        if (++i < argc) dmxConfigStoreFile(argv[i]);
+        retval = 1;
+    }
+    else if (!strcmp(argv[i], "-shadowfb")) {
+        dmxShadowFB = TRUE;
+        retval = 1;
+    }
+    else if (!strcmp(argv[i], "-configfile")) {
+        if (++i < argc)
+            dmxConfigStoreFile(argv[i]);
         retval = 2;
-    } else if (!strcmp(argv[i], "-config")) {
-        if (++i < argc) dmxConfigStoreConfig(argv[i]);
+    }
+    else if (!strcmp(argv[i], "-config")) {
+        if (++i < argc)
+            dmxConfigStoreConfig(argv[i]);
         retval = 2;
-    } else if (!strcmp(argv[i], "-fontpath")) {
-        if (++i < argc) dmxSetDefaultFontPath(argv[i]);
+    }
+    else if (!strcmp(argv[i], "-fontpath")) {
+        if (++i < argc)
+            dmxSetDefaultFontPath(argv[i]);
         retval = 2;
-    } else if (!strcmp(argv[i], "-stat")) {
-        if ((i += 2) < argc) dmxStatActivate(argv[i-1], argv[i]);
+    }
+    else if (!strcmp(argv[i], "-stat")) {
+        if ((i += 2) < argc)
+            dmxStatActivate(argv[i - 1], argv[i]);
         retval = 3;
-    } else if (!strcmp(argv[i], "-syncbatch")) {
-        if (++i < argc) dmxSyncActivate(argv[i]);
+    }
+    else if (!strcmp(argv[i], "-syncbatch")) {
+        if (++i < argc)
+            dmxSyncActivate(argv[i]);
         retval = 2;
-    } else if (!strcmp(argv[i], "-nooffscreenopt")) {
-	dmxOffScreenOpt = FALSE;
+    }
+    else if (!strcmp(argv[i], "-nooffscreenopt")) {
+        dmxOffScreenOpt = FALSE;
         retval = 1;
-    } else if (!strcmp(argv[i], "-nosubdivprims")) {
-	dmxSubdividePrimitives = FALSE;
+    }
+    else if (!strcmp(argv[i], "-nosubdivprims")) {
+        dmxSubdividePrimitives = FALSE;
         retval = 1;
-    } else if (!strcmp(argv[i], "-nowindowopt")) {
-	dmxLazyWindowCreation = FALSE;
+    }
+    else if (!strcmp(argv[i], "-nowindowopt")) {
+        dmxLazyWindowCreation = FALSE;
         retval = 1;
-    } else if (!strcmp(argv[i], "-noxkb")) {
-	dmxUseXKB = FALSE;
+    }
+    else if (!strcmp(argv[i], "-noxkb")) {
+        dmxUseXKB = FALSE;
         retval = 1;
-    } else if (!strcmp(argv[i], "-depth")) {
-        if (++i < argc) dmxDepth = atoi(argv[i]);
+    }
+    else if (!strcmp(argv[i], "-depth")) {
+        if (++i < argc)
+            dmxDepth = atoi(argv[i]);
         retval = 2;
-    } else if (!strcmp(argv[i], "-norender")) {
-	noRenderExtension = TRUE;
+    }
+    else if (!strcmp(argv[i], "-norender")) {
+        noRenderExtension = TRUE;
         retval = 1;
 #ifdef GLXEXT
-    } else if (!strcmp(argv[i], "-noglxproxy")) {
-	dmxGLXProxy = FALSE;
+    }
+    else if (!strcmp(argv[i], "-noglxproxy")) {
+        dmxGLXProxy = FALSE;
         retval = 1;
-    } else if (!strcmp(argv[i], "-noglxswapgroup")) {
-	dmxGLXSwapGroupSupport = FALSE;
+    }
+    else if (!strcmp(argv[i], "-noglxswapgroup")) {
+        dmxGLXSwapGroupSupport = FALSE;
         retval = 1;
-    } else if (!strcmp(argv[i], "-glxsyncswap")) {
-	dmxGLXSyncSwap = TRUE;
+    }
+    else if (!strcmp(argv[i], "-glxsyncswap")) {
+        dmxGLXSyncSwap = TRUE;
         retval = 1;
-    } else if (!strcmp(argv[i], "-glxfinishswap")) {
-	dmxGLXFinishSwap = TRUE;
+    }
+    else if (!strcmp(argv[i], "-glxfinishswap")) {
+        dmxGLXFinishSwap = TRUE;
         retval = 1;
 #endif
-    } else if (!strcmp(argv[i], "-ignorebadfontpaths")) {
-	dmxIgnoreBadFontPaths = TRUE;
+    }
+    else if (!strcmp(argv[i], "-ignorebadfontpaths")) {
+        dmxIgnoreBadFontPaths = TRUE;
         retval = 1;
-    } else if (!strcmp(argv[i], "-addremovescreens")) {
-	dmxAddRemoveScreens = TRUE;
+    }
+    else if (!strcmp(argv[i], "-addremovescreens")) {
+        dmxAddRemoveScreens = TRUE;
         retval = 1;
-    } else if (!strcmp(argv[i], "-param")) {
+    }
+    else if (!strcmp(argv[i], "-param")) {
         if ((i += 2) < argc) {
-            if (!strcasecmp(argv[i-1], "xkbrules"))
+            if (!strcasecmp(argv[i - 1], "xkbrules"))
                 dmxConfigSetXkbRules(argv[i]);
-            else if (!strcasecmp(argv[i-1], "xkbmodel"))
+            else if (!strcasecmp(argv[i - 1], "xkbmodel"))
                 dmxConfigSetXkbModel(argv[i]);
-            else if (!strcasecmp(argv[i-1], "xkblayout"))
+            else if (!strcasecmp(argv[i - 1], "xkblayout"))
                 dmxConfigSetXkbLayout(argv[i]);
-            else if (!strcasecmp(argv[i-1], "xkbvariant"))
+            else if (!strcasecmp(argv[i - 1], "xkbvariant"))
                 dmxConfigSetXkbVariant(argv[i]);
-            else if (!strcasecmp(argv[i-1], "xkboptions"))
+            else if (!strcasecmp(argv[i - 1], "xkboptions"))
                 dmxConfigSetXkbOptions(argv[i]);
             else
                 dmxLog(dmxWarning,
@@ -957,12 +1040,14 @@ int ddxProcessArgument(int argc, char *argv[], int i)
         }
         retval = 3;
     }
-    if (!serverGeneration) dmxConfigSetMaxScreens();
+    if (!serverGeneration)
+        dmxConfigSetMaxScreens();
     return retval;
 }
 
 /** Provide succinct usage information for the DMX server. */
-void ddxUseMsg(void)
+void
+ddxUseMsg(void)
 {
     ErrorF("\n\nDevice Dependent Usage:\n");
     ErrorF("-display string      Specify the back-end display(s)\n");
@@ -990,7 +1075,8 @@ void ddxUseMsg(void)
     ErrorF("-glxsyncswap         Force XSync after swap buffers\n");
     ErrorF("-glxfinishswap       Force glFinish after swap buffers\n");
 #endif
-    ErrorF("-ignorebadfontpaths  Ignore bad font paths during initialization\n");
+    ErrorF
+        ("-ignorebadfontpaths  Ignore bad font paths during initialization\n");
     ErrorF("-addremovescreens    Enable dynamic screen addition/removal\n");
     ErrorF("-param ...           Specify configuration parameters (e.g.,\n");
     ErrorF("                     XkbRules, XkbModel, XkbLayout, etc.)\n");
@@ -1002,13 +1088,13 @@ void ddxUseMsg(void)
            "    that display in addition to the backend input.  This is\n"
            "    useful if the backend window does not cover the whole\n"
            "    physical display.\n\n");
-    
+
     ErrorF("    Otherwise, if the -input or -xinput string specifies another\n"
            "    X display, then a console window will be created on that\n"
            "    display.  Placing \",windows\" or \",nowindows\" after the\n"
            "    display name will control the display of window outlines in\n"
            "    the console.\n\n");
-    
+
     ErrorF("    -input or -xinput dummy specifies no input.\n");
     ErrorF("    -input or -xinput local specifies the use of a raw keyboard,\n"
            "    mouse, or other (extension) device:\n"
@@ -1017,7 +1103,7 @@ void ddxUseMsg(void)
            "        -input local,usb-kbd,usb-mou will use USB devices \n"
            "        -xinput local,usb-oth will use a non-mouse and\n"
            "                non-keyboard USB device with XInput\n\n");
-    
+
     ErrorF("    Special Keys:\n");
     ErrorF("        Ctrl-Alt-g    Server grab/ungrab (console only)\n");
     ErrorF("        Ctrl-Alt-f    Fine (1-pixel) mouse mode (console only)\n");
diff --git a/xorg-server/hw/dmx/dmxinput.c b/xorg-server/hw/dmx/dmxinput.c
index f006af4d2..4ccb43903 100644
--- a/xorg-server/hw/dmx/dmxinput.c
+++ b/xorg-server/hw/dmx/dmxinput.c
@@ -53,7 +53,8 @@
 /** Returns TRUE if the key is a valid modifier.  For PC-class
  * keyboards, all keys can be used as modifiers, so return TRUE
  * always. */
-Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
+Bool
+LegalModifier(unsigned int key, DeviceIntPtr pDev)
 {
     return TRUE;
 }
@@ -61,21 +62,23 @@ Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
 /** Called from dix/main.c on each server generation to initialize
  * inputs.  All the work is done in dmxInputInit.  \see
  * dmxInputInit() */
-void InitInput(int argc, char **argv)
+void
+InitInput(int argc, char **argv)
 {
-    int          i;
+    int i;
     DMXInputInfo *dmxInput;
 
     if (!dmxNumInputs)
         dmxLog(dmxFatal, "InitInput: no inputs specified\n");
-    
+
     for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++)
         dmxInputInit(dmxInput);
 
     mieqInit();
 }
 
-void CloseInput(void)
+void
+CloseInput(void)
 {
     mieqFini();
 }
@@ -83,9 +86,10 @@ void CloseInput(void)
 /** Called from dix/dispatch.c in Dispatch() whenever input events
  * require processing.  All the work is done in the lower level
  * routines. */
-void ProcessInputEvents(void)
+void
+ProcessInputEvents(void)
 {
-    int          i;
+    int i;
     DMXInputInfo *dmxInput;
 
     for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++)
@@ -97,9 +101,10 @@ void ProcessInputEvents(void)
  * windows on the display might have changed.  This information is used
  * by input drivers (currently only the console driver) that provide
  * information about window layout to the user. */
-void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr pWindow)
+void
+dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr pWindow)
 {
-    int          i;
+    int i;
     DMXInputInfo *dmxInput;
 
     for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++)
@@ -108,8 +113,8 @@ void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr pWindow)
 }
 
 int
-NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
-                       DeviceIntPtr *pdev)
+NewInputDeviceRequest(InputOption *options, InputAttributes * attrs,
+                      DeviceIntPtr *pdev)
 {
     return BadRequest;
 }
diff --git a/xorg-server/hw/dmx/dmxinput.h b/xorg-server/hw/dmx/dmxinput.h
index edfff9fa1..83c9c8b95 100644
--- a/xorg-server/hw/dmx/dmxinput.h
+++ b/xorg-server/hw/dmx/dmxinput.h
@@ -43,7 +43,7 @@
  * hw/dmx/input -- the interface defined here should be the only
  * interface exported to the hw/dmx layer.  \see input/dmxinputinit.c.
  */
- 
+
 #ifndef DMXINPUT_H
 #define DMXINPUT_H
 
@@ -62,9 +62,9 @@ typedef enum {
     DMX_UPDATE_REPARENT         /**< Window reparented      */
 } DMXUpdateType;
 
-typedef void (*ProcessInputEventsProc)(struct _DMXInputInfo *);
-typedef void (*UpdateWindowInfoProc)(struct _DMXInputInfo *,
-                                     DMXUpdateType, WindowPtr);
+typedef void (*ProcessInputEventsProc) (struct _DMXInputInfo *);
+typedef void (*UpdateWindowInfoProc) (struct _DMXInputInfo *,
+                                      DMXUpdateType, WindowPtr);
 
 /** An opaque structure that is only exposed in the dmx/input layer. */
 typedef struct _DMXLocalInputInfo *DMXLocalInputInfoPtr;
@@ -82,79 +82,79 @@ typedef enum {
  * access to the global pointers.  However, the elements are only
  * available to input-related routines. */
 struct _DMXInputInfo {
-    const char              *name; /**< Name of input display or device
+    const char *name;              /**< Name of input display or device
                                     * (from command line or config
                                     * file)  */
-    Bool                    freename; /**< If true, free name on destroy */
-    Bool                    detached; /**< If true, input screen is detached */
-    int                     inputIdx; /**< Index into #dmxInputs global */
-    int                     scrnIdx;  /**< Index into #dmxScreens global */
-    Bool                    core;  /**< If True, initialize these
+    Bool freename;                    /**< If true, free name on destroy */
+    Bool detached;                    /**< If true, input screen is detached */
+    int inputIdx;                     /**< Index into #dmxInputs global */
+    int scrnIdx;                      /**< Index into #dmxScreens global */
+    Bool core;                     /**< If True, initialize these
                                     * devices as devices that send core
                                     * events */
-    Bool                    console; /**< True if console and backend
+    Bool console;                    /**< True if console and backend
                                       * input share the same backend
                                       * display  */
 
-    Bool                    windows; /**< True if window outlines are
+    Bool windows;                    /**< True if window outlines are
                                       * draw in console */
 
-    ProcessInputEventsProc  processInputEvents;
-    UpdateWindowInfoProc    updateWindowInfo;
+    ProcessInputEventsProc processInputEvents;
+    UpdateWindowInfoProc updateWindowInfo;
 
-                                /* Local input information */
-    dmxSigioState           sigioState;    /**< Current stat */
-    int                     sigioFdCount;  /**< Number of fds in use */
-    int                     sigioFd[DMX_MAX_SIGIO_FDS];    /**< List of fds */
-    Bool                    sigioAdded[DMX_MAX_SIGIO_FDS]; /**< Active fds */
+    /* Local input information */
+    dmxSigioState sigioState;              /**< Current stat */
+    int sigioFdCount;                      /**< Number of fds in use */
+    int sigioFd[DMX_MAX_SIGIO_FDS];                        /**< List of fds */
+    Bool sigioAdded[DMX_MAX_SIGIO_FDS];                    /**< Active fds */
 
-    
     /** True if a VT switch is pending, but has not yet happened. */
-    int                     vt_switch_pending;
+    int vt_switch_pending;
 
     /** True if a VT switch has happened. */
-    int                     vt_switched;
+    int vt_switched;
 
     /** Number of devices handled in this _DMXInputInfo structure. */
-    int                     numDevs;
+    int numDevs;
 
     /** List of actual input devices.  Each _DMXInputInfo structure can
      * refer to more than one device.  For example, the keyboard and the
      * pointer of a backend display; or all of the XInput extension
      * devices on a backend display. */
-    DMXLocalInputInfoPtr    *devs;
+    DMXLocalInputInfoPtr *devs;
 
-    char                    *keycodes; /**< XKB keycodes from command line */
-    char                    *symbols;  /**< XKB symbols from command line */
-    char                    *geometry; /**< XKB geometry from command line */
+    char *keycodes;                    /**< XKB keycodes from command line */
+    char *symbols;                     /**< XKB symbols from command line */
+    char *geometry;                    /**< XKB geometry from command line */
 };
 
-extern int                  dmxNumInputs; /**< Number of #dmxInputs */
-extern DMXInputInfo         *dmxInputs;   /**< List of inputs */
+extern int dmxNumInputs;                  /**< Number of #dmxInputs */
+extern DMXInputInfo *dmxInputs;           /**< List of inputs */
 
-extern void dmxInputInit(DMXInputInfo *dmxInput);
-extern void dmxInputReInit(DMXInputInfo *dmxInput);
-extern void dmxInputLateReInit(DMXInputInfo *dmxInput);
-extern void dmxInputFree(DMXInputInfo *dmxInput);
+extern void dmxInputInit(DMXInputInfo * dmxInput);
+extern void dmxInputReInit(DMXInputInfo * dmxInput);
+extern void dmxInputLateReInit(DMXInputInfo * dmxInput);
+extern void dmxInputFree(DMXInputInfo * dmxInput);
 extern void dmxInputLogDevices(void);
 extern void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr pWindow);
 
 /* These functions are defined in input/dmxeq.c */
-extern void dmxeqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool fromDIX);
+extern void dmxeqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen,
+                              Bool fromDIX);
 
 /* This type is used in input/dmxevents.c.  Also, these functions are
  * defined in input/dmxevents.c */
 typedef enum {
     DMX_NO_BLOCK = 0,
-    DMX_BLOCK    = 1
+    DMX_BLOCK = 1
 } DMXBlockType;
 
-extern void          dmxGetGlobalPosition(int *x, int *y);
+extern void dmxGetGlobalPosition(int *x, int *y);
 extern DMXScreenInfo *dmxFindFirstScreen(int x, int y);
-extern void          dmxCoreMotion(DevicePtr pDev, int x, int y, int delta,
-                                   DMXBlockType block);
+extern void dmxCoreMotion(DevicePtr pDev, int x, int y, int delta,
+                          DMXBlockType block);
 
 /* Support for dynamic addition of inputs.  This functions is defined in
  * config/dmxconfig.c */
 extern DMXInputInfo *dmxConfigAddInput(const char *name, int core);
-#endif /* DMXINPUT_H */
+#endif                          /* DMXINPUT_H */
diff --git a/xorg-server/hw/dmx/dmxlog.c b/xorg-server/hw/dmx/dmxlog.c
index 94b803528..b56bb93ed 100644
--- a/xorg-server/hw/dmx/dmxlog.c
+++ b/xorg-server/hw/dmx/dmxlog.c
@@ -49,16 +49,20 @@ static dmxLogLevel dmxCurrentLogLevel = dmxDebug;
 
 /** Set the default level for logging to #dmxLogLevel.  Returns the
  * previous log level. */
-dmxLogLevel dmxSetLogLevel(dmxLogLevel newLevel)
+dmxLogLevel
+dmxSetLogLevel(dmxLogLevel newLevel)
 {
     dmxLogLevel oldLevel = dmxCurrentLogLevel;
-    if (newLevel > dmxFatal) newLevel = dmxFatal;
+
+    if (newLevel > dmxFatal)
+        newLevel = dmxFatal;
     dmxCurrentLogLevel = newLevel;
     return oldLevel;
 }
 
 /** Returns the log level set by #dmxLogLevel. */
-dmxLogLevel dmxGetLogLevel(void)
+dmxLogLevel
+dmxGetLogLevel(void)
 {
     return dmxCurrentLogLevel;
 }
@@ -68,37 +72,41 @@ dmxLogLevel dmxGetLogLevel(void)
  * program, then the ultimate output routines have to be defined.  */
 
 /** Provide an ErrorF function when used stand-alone. */
-void ErrorF(const char *format, ...)
+void
+ErrorF(const char *format, ...)
 {
     va_list args;
 
     va_start(args, format);
-    vfprintf(stderr, format, args); /* RATS: We assume the format string
-                                     * is trusted, since it is always
-                                     * from a log message in our code. */
+    vfprintf(stderr, format, args);     /* RATS: We assume the format string
+                                         * is trusted, since it is always
+                                         * from a log message in our code. */
     va_end(args);
 }
 
 /** Provide an VFatalError function when used stand-alone. */
-static void VFatalError(const char *format, va_list args)
+static void
+VFatalError(const char *format, va_list args)
 {
-    vfprintf(stderr, format, args); /* RATS: We assume the format string
-                                     * is trusted, since it is always
-                                     * from a log message in our code. */
+    vfprintf(stderr, format, args);     /* RATS: We assume the format string
+                                         * is trusted, since it is always
+                                         * from a log message in our code. */
     exit(1);
 }
 
 /** Provide an VErrorF function when used stand-alone. */
-void VErrorF(const char *format, va_list args)
+void
+VErrorF(const char *format, va_list args)
 {
-    vfprintf(stderr, format, args); /* RATS: We assume the format string
-                                     * is trusted, since it is always
-                                     * from a log message in our code. */
+    vfprintf(stderr, format, args);     /* RATS: We assume the format string
+                                         * is trusted, since it is always
+                                         * from a log message in our code. */
 }
 #else
 /** This function was removed between XFree86 4.3.0 and XFree86 4.4.0. */
 extern void AbortServer(void);
-static void VFatalError(const char *format, va_list args)
+static void
+VFatalError(const char *format, va_list args)
 {
     VErrorF(format, args);
     ErrorF("\n");
@@ -106,60 +114,75 @@ static void VFatalError(const char *format, va_list args)
     OsVendorFatalError();
 #endif
     AbortServer();
-    /*NOTREACHED*/
-}
+ /*NOTREACHED*/}
 #endif
 
 /* Prints a consistent header for each line. */
-static void dmxHeader(dmxLogLevel logLevel, DMXInputInfo *dmxInput,
-                      DMXScreenInfo *dmxScreen)
+static void
+dmxHeader(dmxLogLevel logLevel, DMXInputInfo * dmxInput,
+          DMXScreenInfo * dmxScreen)
 {
     const char *type = "??";
 
     switch (logLevel) {
-    case dmxDebug:   type = ".."; break;
-    case dmxInfo:    type = "II"; break;
-    case dmxWarning: type = "**"; break;
-    case dmxError:   type = "!!"; break;
-    case dmxFatal:   type = "Fatal Error"; break;
+    case dmxDebug:
+        type = "..";
+        break;
+    case dmxInfo:
+        type = "II";
+        break;
+    case dmxWarning:
+        type = "**";
+        break;
+    case dmxError:
+        type = "!!";
+        break;
+    case dmxFatal:
+        type = "Fatal Error";
+        break;
     }
 
     if (dmxInput && dmxScreen) {
         ErrorF("(%s) dmx[i%d/%s;o%d/%s]: ", type,
                dmxInput->inputIdx, dmxInput->name,
                dmxScreen->index, dmxScreen->name);
-    } else if (dmxScreen) {
-        ErrorF("(%s) dmx[o%d/%s]: ", type,
-               dmxScreen->index, dmxScreen->name);
-    } else if (dmxInput) {
+    }
+    else if (dmxScreen) {
+        ErrorF("(%s) dmx[o%d/%s]: ", type, dmxScreen->index, dmxScreen->name);
+    }
+    else if (dmxInput) {
         const char *pt = strchr(dmxInput->name, ',');
-        int        len = (pt
-                          ? (size_t)(pt-dmxInput->name)
-                          : strlen(dmxInput->name));
+        int len = (pt ? (size_t) (pt - dmxInput->name)
+                   : strlen(dmxInput->name));
 
         ErrorF("(%s) dmx[i%d/%*.*s]: ", type,
                dmxInput->inputIdx, len, len, dmxInput->name);
-    } else {
+    }
+    else {
         ErrorF("(%s) dmx: ", type);
     }
 }
 
 /* Prints the error message with the appropriate low-level X output
  * routine. */
-static void dmxMessage(dmxLogLevel logLevel, const char *format, va_list args)
+static void
+dmxMessage(dmxLogLevel logLevel, const char *format, va_list args)
 {
     if (logLevel == dmxFatal || logLevel >= dmxCurrentLogLevel) {
-        if (logLevel == dmxFatal) VFatalError(format, args);
-        else VErrorF(format, args);
+        if (logLevel == dmxFatal)
+            VFatalError(format, args);
+        else
+            VErrorF(format, args);
     }
 }
 
 /** Log the specified message at the specified \a logLevel.  \a format
  * can be a printf-like format expression. */
-void dmxLog(dmxLogLevel logLevel, const char *format, ...)
+void
+dmxLog(dmxLogLevel logLevel, const char *format, ...)
 {
     va_list args;
-    
+
     dmxHeader(logLevel, NULL, NULL);
     va_start(args, format);
     dmxMessage(logLevel, format, args);
@@ -167,7 +190,8 @@ void dmxLog(dmxLogLevel logLevel, const char *format, ...)
 }
 
 /** Continue a log message without printing the message prefix. */
-void dmxLogCont(dmxLogLevel logLevel, const char *format, ...)
+void
+dmxLogCont(dmxLogLevel logLevel, const char *format, ...)
 {
     va_list args;
 
@@ -180,7 +204,8 @@ void dmxLogCont(dmxLogLevel logLevel, const char *format, ...)
 /** Log an informational message (at level #dmxInfo) related to ouput.
  * The message prefix will contain backend information from \a
  * dmxScreen. */
-void dmxLogOutput(DMXScreenInfo *dmxScreen, const char *format, ...)
+void
+dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, ...)
 {
     va_list args;
 
@@ -192,7 +217,8 @@ void dmxLogOutput(DMXScreenInfo *dmxScreen, const char *format, ...)
 
 /** Continue a message related to output without printing the message
  * prefix. */
-void dmxLogOutputCont(DMXScreenInfo *dmxScreen, const char *format, ...)
+void
+dmxLogOutputCont(DMXScreenInfo * dmxScreen, const char *format, ...)
 {
     va_list args;
 
@@ -204,7 +230,8 @@ void dmxLogOutputCont(DMXScreenInfo *dmxScreen, const char *format, ...)
 /** Log a warning message (at level #dmxWarning) related to output.
  * The message prefix will contain backend information from \a
  * dmxScreen. */
-void dmxLogOutputWarning(DMXScreenInfo *dmxScreen, const char *format, ...)
+void
+dmxLogOutputWarning(DMXScreenInfo * dmxScreen, const char *format, ...)
 {
     va_list args;
 
@@ -216,7 +243,8 @@ void dmxLogOutputWarning(DMXScreenInfo *dmxScreen, const char *format, ...)
 
 /** Log an informational message (at level #dmxInfo) related to input.
  * The message prefix will contain information from \a dmxInput. */
-void dmxLogInput(DMXInputInfo *dmxInput, const char *format, ...)
+void
+dmxLogInput(DMXInputInfo * dmxInput, const char *format, ...)
 {
     va_list args;
 
@@ -228,7 +256,8 @@ void dmxLogInput(DMXInputInfo *dmxInput, const char *format, ...)
 
 /** Continue a message related to input without printing the message
  * prefix. */
-void dmxLogInputCont(DMXInputInfo *dmxInput, const char *format, ...)
+void
+dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, ...)
 {
     va_list args;
 
@@ -239,25 +268,40 @@ void dmxLogInputCont(DMXInputInfo *dmxInput, const char *format, ...)
 
 /** Print \a argc messages, each describing an element in \a argv.  This
  * is maingly for debugging purposes. */
-void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv)
+void
+dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv)
 {
     int i;
+
     for (i = 0; i < argc; i++)
         dmxLog(logLevel, "   Arg[%d] = \"%s\"\n", i, argv[i]);
 }
 
 /** Print messages at level #dmxInfo describing the visuals in \a vi. */
-void dmxLogVisual(DMXScreenInfo *dmxScreen, XVisualInfo *vi, int defaultVisual)
+void
+dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual)
 {
-    const char  *class = "Unknown";
+    const char *class = "Unknown";
 
     switch (vi->class) {
-    case StaticGray:  class = "StaticGray "; break;
-    case GrayScale:   class = "GrayScale  "; break;
-    case StaticColor: class = "StaticColor"; break;
-    case PseudoColor: class = "PseudoColor"; break;
-    case TrueColor:   class = "TrueColor  "; break;
-    case DirectColor: class = "DirectColor"; break;
+    case StaticGray:
+        class = "StaticGray ";
+        break;
+    case GrayScale:
+        class = "GrayScale  ";
+        break;
+    case StaticColor:
+        class = "StaticColor";
+        break;
+    case PseudoColor:
+        class = "PseudoColor";
+        break;
+    case TrueColor:
+        class = "TrueColor  ";
+        break;
+    case DirectColor:
+        class = "DirectColor";
+        break;
     }
 
     if (dmxScreen) {
@@ -267,7 +311,8 @@ void dmxLogVisual(DMXScreenInfo *dmxScreen, XVisualInfo *vi, int defaultVisual)
                      vi->colormap_size,
                      vi->red_mask, vi->green_mask, vi->blue_mask,
                      defaultVisual ? " *" : "");
-    } else {
+    }
+    else {
         dmxLog(dmxInfo,
                "  0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n",
                vi->visualid, class, vi->depth, vi->bits_per_rgb,
@@ -279,68 +324,119 @@ void dmxLogVisual(DMXScreenInfo *dmxScreen, XVisualInfo *vi, int defaultVisual)
 
 /** Translate a (normalized) XInput event \a type into a human-readable
  * string. */
-const char *dmxXInputEventName(int type)
+const char *
+dmxXInputEventName(int type)
 {
     switch (type) {
-    case XI_DeviceValuator:          return "XI_DeviceValuator";
-    case XI_DeviceKeyPress:          return "XI_DeviceKeyPress";
-    case XI_DeviceKeyRelease:        return "XI_DeviceKeyRelease";
-    case XI_DeviceButtonPress:       return "XI_DeviceButtonPress";
-    case XI_DeviceButtonRelease:     return "XI_DeviceButtonRelease";
-    case XI_DeviceMotionNotify:      return "XI_DeviceMotionNotify";
-    case XI_DeviceFocusIn:           return "XI_DeviceFocusIn";
-    case XI_DeviceFocusOut:          return "XI_DeviceFocusOut";
-    case XI_ProximityIn:             return "XI_ProximityIn";
-    case XI_ProximityOut:            return "XI_ProximityOut";
-    case XI_DeviceStateNotify:       return "XI_DeviceStateNotify";
-    case XI_DeviceMappingNotify:     return "XI_DeviceMappingNotify";
-    case XI_ChangeDeviceNotify:      return "XI_ChangeDeviceNotify";
-    case XI_DeviceKeystateNotify:    return "XI_DeviceKeystateNotify";
-    case XI_DeviceButtonstateNotify: return "XI_DeviceButtonstateNotify";
-    default:                         return "unknown";
+    case XI_DeviceValuator:
+        return "XI_DeviceValuator";
+    case XI_DeviceKeyPress:
+        return "XI_DeviceKeyPress";
+    case XI_DeviceKeyRelease:
+        return "XI_DeviceKeyRelease";
+    case XI_DeviceButtonPress:
+        return "XI_DeviceButtonPress";
+    case XI_DeviceButtonRelease:
+        return "XI_DeviceButtonRelease";
+    case XI_DeviceMotionNotify:
+        return "XI_DeviceMotionNotify";
+    case XI_DeviceFocusIn:
+        return "XI_DeviceFocusIn";
+    case XI_DeviceFocusOut:
+        return "XI_DeviceFocusOut";
+    case XI_ProximityIn:
+        return "XI_ProximityIn";
+    case XI_ProximityOut:
+        return "XI_ProximityOut";
+    case XI_DeviceStateNotify:
+        return "XI_DeviceStateNotify";
+    case XI_DeviceMappingNotify:
+        return "XI_DeviceMappingNotify";
+    case XI_ChangeDeviceNotify:
+        return "XI_ChangeDeviceNotify";
+    case XI_DeviceKeystateNotify:
+        return "XI_DeviceKeystateNotify";
+    case XI_DeviceButtonstateNotify:
+        return "XI_DeviceButtonstateNotify";
+    default:
+        return "unknown";
     }
 }
 
 #endif
 
 /** Translate an event \a type into a human-readable string. */
-const char *dmxEventName(int type)
+const char *
+dmxEventName(int type)
 {
     switch (type) {
-    case KeyPress:         return "KeyPress"; 
-    case KeyRelease:       return "KeyRelease";
-    case ButtonPress:      return "ButtonPress";
-    case ButtonRelease:    return "ButtonRelease";
-    case MotionNotify:     return "MotionNotify";
-    case EnterNotify:      return "EnterNotify";
-    case LeaveNotify:      return "LeaveNotify";
-    case FocusIn:          return "FocusIn";
-    case FocusOut:         return "FocusOut";
-    case KeymapNotify:     return "KeymapNotify";
-    case Expose:           return "Expose";
-    case GraphicsExpose:   return "GraphicsExpose";
-    case NoExpose:         return "NoExpose";
-    case VisibilityNotify: return "VisibilityNotify";
-    case CreateNotify:     return "CreateNotify";
-    case DestroyNotify:    return "DestroyNotify";
-    case UnmapNotify:      return "UnmapNotify";
-    case MapNotify:        return "MapNotify";
-    case MapRequest:       return "MapRequest";
-    case ReparentNotify:   return "ReparentNotify";
-    case ConfigureNotify:  return "ConfigureNotify";
-    case ConfigureRequest: return "ConfigureRequest";
-    case GravityNotify:    return "GravityNotify";
-    case ResizeRequest:    return "ResizeRequest";
-    case CirculateNotify:  return "CirculateNotify";
-    case CirculateRequest: return "CirculateRequest";
-    case PropertyNotify:   return "PropertyNotify";
-    case SelectionClear:   return "SelectionClear";
-    case SelectionRequest: return "SelectionRequest";
-    case SelectionNotify:  return "SelectionNotify";
-    case ColormapNotify:   return "ColormapNotify";
-    case ClientMessage:    return "ClientMessage";
-    case MappingNotify:    return "MappingNotify";
-    default:               return "<unknown>";
+    case KeyPress:
+        return "KeyPress";
+    case KeyRelease:
+        return "KeyRelease";
+    case ButtonPress:
+        return "ButtonPress";
+    case ButtonRelease:
+        return "ButtonRelease";
+    case MotionNotify:
+        return "MotionNotify";
+    case EnterNotify:
+        return "EnterNotify";
+    case LeaveNotify:
+        return "LeaveNotify";
+    case FocusIn:
+        return "FocusIn";
+    case FocusOut:
+        return "FocusOut";
+    case KeymapNotify:
+        return "KeymapNotify";
+    case Expose:
+        return "Expose";
+    case GraphicsExpose:
+        return "GraphicsExpose";
+    case NoExpose:
+        return "NoExpose";
+    case VisibilityNotify:
+        return "VisibilityNotify";
+    case CreateNotify:
+        return "CreateNotify";
+    case DestroyNotify:
+        return "DestroyNotify";
+    case UnmapNotify:
+        return "UnmapNotify";
+    case MapNotify:
+        return "MapNotify";
+    case MapRequest:
+        return "MapRequest";
+    case ReparentNotify:
+        return "ReparentNotify";
+    case ConfigureNotify:
+        return "ConfigureNotify";
+    case ConfigureRequest:
+        return "ConfigureRequest";
+    case GravityNotify:
+        return "GravityNotify";
+    case ResizeRequest:
+        return "ResizeRequest";
+    case CirculateNotify:
+        return "CirculateNotify";
+    case CirculateRequest:
+        return "CirculateRequest";
+    case PropertyNotify:
+        return "PropertyNotify";
+    case SelectionClear:
+        return "SelectionClear";
+    case SelectionRequest:
+        return "SelectionRequest";
+    case SelectionNotify:
+        return "SelectionNotify";
+    case ColormapNotify:
+        return "ColormapNotify";
+    case ClientMessage:
+        return "ClientMessage";
+    case MappingNotify:
+        return "MappingNotify";
+    default:
+        return "<unknown>";
     }
 }
-
diff --git a/xorg-server/hw/dmx/dmxpict.c b/xorg-server/hw/dmx/dmxpict.c
index 1ea6543e0..b1177cf41 100644
--- a/xorg-server/hw/dmx/dmxpict.c
+++ b/xorg-server/hw/dmx/dmxpict.c
@@ -1,1237 +1,1280 @@
-/*

- * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Kevin E. Martin <kem@redhat.com>

- *

- */

-

-/** \file

- *  Provide support for the RENDER extension (version 0.8).

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxsync.h"

-#include "dmxpict.h"

-#include "dmxwindow.h"

-#include "dmxpixmap.h"

-

-#include "fb.h"

-#include "pixmapstr.h"

-#include "dixstruct.h"

-

-#include <X11/extensions/render.h>

-#include <X11/extensions/renderproto.h>

-#include <X11/extensions/Xfixes.h>

-#include "picture.h"

-#include "picturestr.h"

-#include "mipict.h"

-#include "fbpict.h"

-

-

-extern int RenderErrBase;

-extern int (*ProcRenderVector[RenderNumberRequests])(ClientPtr);

-

-static int (*dmxSaveRenderVector[RenderNumberRequests])(ClientPtr);

-

-

-static int dmxProcRenderCreateGlyphSet(ClientPtr client);

-static int dmxProcRenderFreeGlyphSet(ClientPtr client);

-static int dmxProcRenderAddGlyphs(ClientPtr client);

-static int dmxProcRenderFreeGlyphs(ClientPtr client);

-static int dmxProcRenderCompositeGlyphs(ClientPtr client);

-static int dmxProcRenderSetPictureTransform(ClientPtr client);

-static int dmxProcRenderSetPictureFilter(ClientPtr client);

-#if 0

-/* FIXME: Not (yet) supported */

-static int dmxProcRenderCreateCursor(ClientPtr client);

-static int dmxProcRenderCreateAnimCursor(ClientPtr client);

-#endif

-

-/** Catch errors that might occur when allocating Glyph Sets.  Errors

- *  are saved in dmxGlyphLastError for later handling. */

-static int dmxGlyphLastError;

-static int dmxGlyphErrorHandler(Display *dpy, XErrorEvent *ev)

-{

-    dmxGlyphLastError = ev->error_code;

-    return 0;

-}

-

-

-/** Initialize the Proc Vector for the RENDER extension.  The functions

- *  here cannot be handled by the mi layer RENDER hooks either because

- *  the required information is no longer available when it reaches the

- *  mi layer or no mi layer hooks exist.  This function is called from

- *  InitOutput() since it should be initialized only once per server

- *  generation. */

-void dmxInitRender(void)

-{

-    int i;

-

-    for (i = 0; i < RenderNumberRequests; i++)

-        dmxSaveRenderVector[i] = ProcRenderVector[i];

-

-    ProcRenderVector[X_RenderCreateGlyphSet]

-	= dmxProcRenderCreateGlyphSet;

-    ProcRenderVector[X_RenderFreeGlyphSet]

-	= dmxProcRenderFreeGlyphSet;

-    ProcRenderVector[X_RenderAddGlyphs]

-	= dmxProcRenderAddGlyphs;

-    ProcRenderVector[X_RenderFreeGlyphs]

-	= dmxProcRenderFreeGlyphs;

-    ProcRenderVector[X_RenderCompositeGlyphs8]

-	= dmxProcRenderCompositeGlyphs;

-    ProcRenderVector[X_RenderCompositeGlyphs16]

-	= dmxProcRenderCompositeGlyphs;

-    ProcRenderVector[X_RenderCompositeGlyphs32]

-	= dmxProcRenderCompositeGlyphs;

-    ProcRenderVector[X_RenderSetPictureTransform]

-	= dmxProcRenderSetPictureTransform;

-    ProcRenderVector[X_RenderSetPictureFilter]

-	= dmxProcRenderSetPictureFilter;

-}

-

-/** Reset the Proc Vector for the RENDER extension back to the original

- *  functions.  This function is called from dmxCloseScreen() during the

- *  server reset (only for screen #0). */

-void dmxResetRender(void)

-{

-    int i;

-

-    for (i = 0; i < RenderNumberRequests; i++)

-        ProcRenderVector[i] = dmxSaveRenderVector[i];

-}

-

-/** Initialize the RENDER extension, allocate the picture privates and

- *  wrap mi function hooks.  If the shadow frame buffer is used, then

- *  call the appropriate fb initialization function. */

-Bool dmxPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)

-{

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps;

-

-    /* The shadow framebuffer only relies on FB to be initialized */

-    if (dmxShadowFB) return fbPictureInit(pScreen, formats, nformats);

-

-    if (!miPictureInit(pScreen, formats, nformats))

-	return FALSE;

-

-    if (!dixRegisterPrivateKey(&dmxPictPrivateKeyRec, PRIVATE_PICTURE, sizeof(dmxPictPrivRec)))

-	return FALSE;

-

-    ps = GetPictureScreen(pScreen);

-

-    DMX_WRAP(CreatePicture,      dmxCreatePicture,      dmxScreen, ps);

-    DMX_WRAP(DestroyPicture,     dmxDestroyPicture,     dmxScreen, ps);

-

-    DMX_WRAP(ChangePictureClip,  dmxChangePictureClip,  dmxScreen, ps);

-    DMX_WRAP(DestroyPictureClip, dmxDestroyPictureClip, dmxScreen, ps);

-

-    DMX_WRAP(ChangePicture,      dmxChangePicture,      dmxScreen, ps);

-    DMX_WRAP(ValidatePicture,    dmxValidatePicture,    dmxScreen, ps);

-

-    DMX_WRAP(Composite,          dmxComposite,          dmxScreen, ps);

-    DMX_WRAP(Glyphs,             dmxGlyphs,             dmxScreen, ps);

-    DMX_WRAP(CompositeRects,     dmxCompositeRects,     dmxScreen, ps);

-

-    DMX_WRAP(Trapezoids,         dmxTrapezoids,         dmxScreen, ps);

-    DMX_WRAP(Triangles,          dmxTriangles,          dmxScreen, ps);

-

-    return TRUE;

-}

-

-

-/** Find the appropriate format on the requested screen given the

- *  internal format requested.  The list of formats is searched

- *  sequentially as the XRenderFindFormat() function does not always

- *  find the appropriate format when a specific format is requested. */

-static XRenderPictFormat *dmxFindFormat(DMXScreenInfo *dmxScreen,

-					PictFormatPtr pFmt)

-{

-    XRenderPictFormat *pFormat = NULL;

-    int                i       = 0;

-

-    if (!pFmt || !dmxScreen->beDisplay) return pFormat;

-

-    while (1) {

-	pFormat = XRenderFindFormat(dmxScreen->beDisplay, 0, 0, i++);

-	if (!pFormat) break;

-

-	if (pFormat->type             != pFmt->type)             continue;

-	if (pFormat->depth            != pFmt->depth)            continue;

-	if (pFormat->direct.red       != pFmt->direct.red)       continue;

-	if (pFormat->direct.redMask   != pFmt->direct.redMask)   continue;

-	if (pFormat->direct.green     != pFmt->direct.green)     continue;

-	if (pFormat->direct.greenMask != pFmt->direct.greenMask) continue;

-	if (pFormat->direct.blue      != pFmt->direct.blue)      continue;

-	if (pFormat->direct.blueMask  != pFmt->direct.blueMask)  continue;

-	if (pFormat->direct.alpha     != pFmt->direct.alpha)     continue;

-	if (pFormat->direct.alphaMask != pFmt->direct.alphaMask) continue;

-

-	/* We have a match! */

-	break;

-    }

-

-    return pFormat;

-}

-

-/** Free \a glyphSet on back-end screen number \a idx. */

-Bool dmxBEFreeGlyphSet(ScreenPtr pScreen, GlyphSetPtr glyphSet)

-{

-    dmxGlyphPrivPtr  glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);

-    int              idx       = pScreen->myNum;

-    DMXScreenInfo   *dmxScreen = &dmxScreens[idx];

-

-    if (glyphPriv->glyphSets[idx]) {

-	XRenderFreeGlyphSet(dmxScreen->beDisplay, glyphPriv->glyphSets[idx]);

-	glyphPriv->glyphSets[idx] = (GlyphSet)0;

-	return TRUE;

-    }

-

-    return FALSE;

-}

-

-/** Create \a glyphSet on the backend screen number \a idx. */

-int dmxBECreateGlyphSet(int idx, GlyphSetPtr glyphSet)

-{

-    XRenderPictFormat *pFormat;

-    DMXScreenInfo     *dmxScreen = &dmxScreens[idx];

-    dmxGlyphPrivPtr    glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);

-    PictFormatPtr      pFmt      = glyphSet->format;

-    int              (*oldErrorHandler)(Display *, XErrorEvent *);

-

-    pFormat = dmxFindFormat(dmxScreen, pFmt);

-    if (!pFormat) {

-	return BadMatch;

-    }

-

-    dmxGlyphLastError = 0;

-    oldErrorHandler = XSetErrorHandler(dmxGlyphErrorHandler);

-

-    /* Catch when this fails */

-    glyphPriv->glyphSets[idx]

-	= XRenderCreateGlyphSet(dmxScreen->beDisplay, pFormat);

-

-    XSetErrorHandler(oldErrorHandler);

-

-    if (dmxGlyphLastError) {

-	return dmxGlyphLastError;

-    }

-

-    return Success;

-}

-

-/** Create a Glyph Set on each screen.  Save the glyphset ID from each

- *  screen in the Glyph Set's private structure.  Fail if the format

- *  requested is not available or if the Glyph Set cannot be created on

- *  the screen. */

-static int dmxProcRenderCreateGlyphSet(ClientPtr client)

-{

-    int  ret;

-    REQUEST(xRenderCreateGlyphSetReq);

-

-    ret = dmxSaveRenderVector[stuff->renderReqType](client);

-

-    if (ret == Success) {

-	GlyphSetPtr        glyphSet;

-	dmxGlyphPrivPtr    glyphPriv;

-	int                i;

-

-	/* Look up glyphSet that was just created ???? */

-	/* Store glyphsets from backends in glyphSet->devPrivate ????? */

-	/* Make sure we handle all errors here!! */

-

-	dixLookupResourceByType((pointer*) &glyphSet,

-				stuff->gsid, GlyphSetType,

-				client, DixDestroyAccess);

-

-	glyphPriv = malloc(sizeof(dmxGlyphPrivRec));

-	if (!glyphPriv) return BadAlloc;

-        glyphPriv->glyphSets = NULL;

-        MAXSCREENSALLOC_RETURN(glyphPriv->glyphSets, BadAlloc);

-	DMX_SET_GLYPH_PRIV(glyphSet, glyphPriv);

-

-	for (i = 0; i < dmxNumScreens; i++) {

-	    DMXScreenInfo *dmxScreen = &dmxScreens[i];

-	    int beret;

-

-	    if (!dmxScreen->beDisplay) {

-		glyphPriv->glyphSets[i] = 0;

-		continue;

-	    }

-

-	    if ((beret = dmxBECreateGlyphSet(i, glyphSet)) != Success) {

-		int  j;

-

-		/* Free the glyph sets we've allocated thus far */

-		for (j = 0; j < i; j++)

-		    dmxBEFreeGlyphSet(screenInfo.screens[j], glyphSet);

-

-		/* Free the resource created by render */

-		FreeResource(stuff->gsid, RT_NONE);

-

-		return beret;

-	    }

-	}

-    }

-

-    return ret;

-}

-

-/** Free the previously allocated Glyph Sets for each screen. */

-static int dmxProcRenderFreeGlyphSet(ClientPtr client)

-{

-    GlyphSetPtr  glyphSet;

-    REQUEST(xRenderFreeGlyphSetReq);

-

-    REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq);

-    dixLookupResourceByType((pointer*) &glyphSet,

-			    stuff->glyphset, GlyphSetType,

-			    client, DixDestroyAccess);

-

-    if (glyphSet && glyphSet->refcnt == 1) {

-	dmxGlyphPrivPtr  glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);

-	int              i;

-

-	for (i = 0; i < dmxNumScreens; i++) {

-	    DMXScreenInfo *dmxScreen = &dmxScreens[i];

-	    

-	    if (dmxScreen->beDisplay) {

-		if (dmxBEFreeGlyphSet(screenInfo.screens[i], glyphSet))

-		    dmxSync(dmxScreen, FALSE);

-	    }

-	}

-

-        MAXSCREENSFREE(glyphPriv->glyphSets);

-	free(glyphPriv);

-	DMX_SET_GLYPH_PRIV(glyphSet, NULL);

-    }

-

-    return dmxSaveRenderVector[stuff->renderReqType](client);

-}

-

-/** Add glyphs to the Glyph Set on each screen. */

-static int dmxProcRenderAddGlyphs(ClientPtr client)

-{

-    int  ret;

-    REQUEST(xRenderAddGlyphsReq);

-

-    ret = dmxSaveRenderVector[stuff->renderReqType](client);

-

-    if (ret == Success) {

-	GlyphSetPtr      glyphSet;

-	dmxGlyphPrivPtr  glyphPriv;

-	int              i;

-	int              nglyphs;

-	CARD32          *gids;

-	Glyph           *gidsCopy;

-	xGlyphInfo      *gi;

-	CARD8           *bits;

-	int              nbytes;

-

-	dixLookupResourceByType((pointer*) &glyphSet,

-				stuff->glyphset, GlyphSetType,

-				client, DixReadAccess);

-	glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);

-

-	nglyphs = stuff->nglyphs;

-	gids = (CARD32 *)(stuff + 1);

-	gi = (xGlyphInfo *)(gids + nglyphs);

-	bits = (CARD8 *)(gi + nglyphs);

-	nbytes = ((stuff->length << 2) -

-		  sizeof(xRenderAddGlyphsReq) -

-		  (sizeof(CARD32) + sizeof(xGlyphInfo)) * nglyphs);

-

-        gidsCopy = malloc(sizeof(*gidsCopy) * nglyphs);

-        for (i = 0; i < nglyphs; i++) gidsCopy[i] = gids[i];

-

-	/* FIXME: Will this ever fail? */

-	for (i = 0; i < dmxNumScreens; i++) {

-	    DMXScreenInfo *dmxScreen = &dmxScreens[i];

-

-	    if (dmxScreen->beDisplay) {

-		XRenderAddGlyphs(dmxScreen->beDisplay,

-				 glyphPriv->glyphSets[i],

-				 gidsCopy,

-				 (XGlyphInfo *)gi,

-				 nglyphs,

-				 (char *)bits,

-				 nbytes);

-		dmxSync(dmxScreen, FALSE);

-	    }

-	}

-        free(gidsCopy);

-    }

-

-    return ret;

-}

-

-/** Free glyphs from the Glyph Set for each screen. */

-static int dmxProcRenderFreeGlyphs(ClientPtr client)

-{

-    GlyphSetPtr  glyphSet;

-    REQUEST(xRenderFreeGlyphsReq);

-

-    REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);

-    dixLookupResourceByType((pointer*) &glyphSet,

-			    stuff->glyphset, GlyphSetType,

-			    client, DixWriteAccess);

-

-    if (glyphSet) {

-	dmxGlyphPrivPtr  glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);

-	int              i;

-	int              nglyphs;

-	Glyph           *gids;

-

-	nglyphs = ((client->req_len << 2) - sizeof(xRenderFreeGlyphsReq)) >> 2;

-	if (nglyphs) {

-            gids    = malloc(sizeof(*gids) * nglyphs);

-            for (i = 0; i < nglyphs; i++)

-                gids[i] = ((CARD32 *)(stuff + 1))[i];

-            

-	    for (i = 0; i < dmxNumScreens; i++) {

-		DMXScreenInfo *dmxScreen = &dmxScreens[i];

-

-		if (dmxScreen->beDisplay) {

-		    XRenderFreeGlyphs(dmxScreen->beDisplay,

-				      glyphPriv->glyphSets[i], gids, nglyphs);

-		    dmxSync(dmxScreen, FALSE);

-		}

-	    }

-            free(gids);

-	}

-    }

-

-    return dmxSaveRenderVector[stuff->renderReqType](client);

-}

-

-/** Composite glyphs on each screen into the requested picture.  If

- *  either the src or dest picture has not been allocated due to lazy

- *  window creation, this request will gracefully return. */

-static int dmxProcRenderCompositeGlyphs(ClientPtr client)

-{

-    int  ret;

-    REQUEST(xRenderCompositeGlyphsReq);

-

-    ret = dmxSaveRenderVector[stuff->renderReqType](client);

-

-    /* For the following to work with PanoramiX, it assumes that Render

-     * wraps the ProcRenderVector after dmxRenderInit has been called.

-     */

-    if (ret == Success) {

-	PicturePtr         pSrc;

-	dmxPictPrivPtr     pSrcPriv;

-	PicturePtr         pDst;

-	dmxPictPrivPtr     pDstPriv;

-	PictFormatPtr      pFmt;

-	XRenderPictFormat *pFormat;

-	int                size;

-

-	int                scrnNum;

-	DMXScreenInfo     *dmxScreen;

-

-	CARD8             *buffer;

-	CARD8             *end;

-	int                space;

-

-	int                nglyph;

-	char              *glyphs;

-	char              *curGlyph;

-

-	xGlyphElt         *elt;

-	int                nelt;

-	XGlyphElt8        *elts;

-	XGlyphElt8        *curElt;

-

-	GlyphSetPtr        glyphSet;

-	dmxGlyphPrivPtr    glyphPriv;

-

-	dixLookupResourceByType((pointer*) &pSrc,

-				stuff->src, PictureType,

-				client, DixReadAccess);

-

-	pSrcPriv = DMX_GET_PICT_PRIV(pSrc);

-	if (!pSrcPriv->pict)

-	    return ret;

-

-	dixLookupResourceByType((pointer*) &pDst,

-				stuff->dst, PictureType,

-				client, DixWriteAccess);

-

-	pDstPriv = DMX_GET_PICT_PRIV(pDst);

-	if (!pDstPriv->pict)

-	    return ret;

-

-	scrnNum = pDst->pDrawable->pScreen->myNum;

-	dmxScreen = &dmxScreens[scrnNum];

-

-	/* Note: If the back-end display has been detached, then it

-	 * should not be possible to reach here since the pSrcPriv->pict

-	 * and pDstPriv->pict will have already been set to 0.

-	 */

-	if (!dmxScreen->beDisplay)

-	    return ret;

-

-	if (stuff->maskFormat)

-	    dixLookupResourceByType((pointer*) &pFmt,

-				    stuff->maskFormat, PictFormatType,

-				    client, DixReadAccess);

-	else

-	    pFmt = NULL;

-

-	pFormat = dmxFindFormat(dmxScreen, pFmt);

-

-	switch (stuff->renderReqType) {

-	case X_RenderCompositeGlyphs8:  size = sizeof(CARD8);  break;

-	case X_RenderCompositeGlyphs16: size = sizeof(CARD16); break;

-	case X_RenderCompositeGlyphs32: size = sizeof(CARD32); break;

-        default:                        return BadPictOp; /* Can't happen */

-	}

-

-	buffer = (CARD8 *)(stuff + 1);

-	end = (CARD8 *)stuff + (stuff->length << 2);

-	nelt = 0;

-	nglyph = 0;

-	while (buffer + sizeof(xGlyphElt) < end) {

-	    elt = (xGlyphElt *)buffer;

-	    buffer += sizeof(xGlyphElt);

-

-	    if (elt->len == 0xff) {

-		buffer += 4;

-	    } else {

-		nelt++;

-		nglyph += elt->len;

-		space = size * elt->len;

-		if (space & 3) space += 4 - (space & 3);

-		buffer += space;

-	    }

-	}

-

-	/* The following only works for Render version > 0.2 */

-

-	/* All of the XGlyphElt* structure sizes are identical */

-	elts = malloc(nelt * sizeof(XGlyphElt8));

-	if (!elts)

-	    return BadAlloc;

-

-	glyphs = malloc(nglyph * size);

-	if (!glyphs) {

-	    free(elts);

-	    return BadAlloc;

-	}

-

-	buffer = (CARD8 *)(stuff + 1);

-	end = (CARD8 *)stuff + (stuff->length << 2);

-	curGlyph = glyphs;

-	curElt = elts;

-

-	dixLookupResourceByType((pointer*) &glyphSet,

-				stuff->glyphset, GlyphSetType,

-				client, DixReadAccess);

-	glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);

-

-	while (buffer + sizeof(xGlyphElt) < end) {

-	    elt = (xGlyphElt *)buffer;

-	    buffer += sizeof(xGlyphElt);

-

-	    if (elt->len == 0xff) {

-		dixLookupResourceByType((pointer*) &glyphSet,

-					*((CARD32 *)buffer),

-					GlyphSetType,

-					client,

-					DixReadAccess);

-		glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);

-		buffer += 4;

-	    } else {

-		curElt->glyphset = glyphPriv->glyphSets[scrnNum];

-		curElt->xOff = elt->deltax;

-		curElt->yOff = elt->deltay;

-		curElt->nchars = elt->len;

-		curElt->chars = curGlyph;

-

-		memcpy(curGlyph, buffer, size*elt->len);

-		curGlyph += size * elt->len;

-

-		curElt++;

-

-		space = size * elt->len;

-		if (space & 3) space += 4 - (space & 3);

-		buffer += space;

-	    }

-	}

-

-	switch (stuff->renderReqType) {

-	case X_RenderCompositeGlyphs8:

-	    XRenderCompositeText8(dmxScreen->beDisplay, stuff->op,

-				  pSrcPriv->pict, pDstPriv->pict,

-				  pFormat,

-				  stuff->xSrc, stuff->ySrc,

-				  0, 0, elts, nelt);

-	    break;

-	case X_RenderCompositeGlyphs16:

-	    XRenderCompositeText16(dmxScreen->beDisplay, stuff->op,

-				   pSrcPriv->pict, pDstPriv->pict,

-				   pFormat,

-				   stuff->xSrc, stuff->ySrc,

-				   0, 0, (XGlyphElt16 *)elts, nelt);

-	    break;

-	case X_RenderCompositeGlyphs32:

-	    XRenderCompositeText32(dmxScreen->beDisplay, stuff->op,

-				   pSrcPriv->pict, pDstPriv->pict,

-				   pFormat,

-				   stuff->xSrc, stuff->ySrc,

-				   0, 0, (XGlyphElt32 *)elts, nelt);

-	    break;

-	}

-

-	dmxSync(dmxScreen, FALSE);

-

-	free(elts);

-	free(glyphs);

-    }

-

-    return ret;

-}

-

-/** Set the picture transform on each screen. */

-static int dmxProcRenderSetPictureTransform(ClientPtr client)

-{

-    DMXScreenInfo  *dmxScreen;

-    PicturePtr      pPicture;

-    dmxPictPrivPtr  pPictPriv;

-    XTransform      xform;

-    REQUEST(xRenderSetPictureTransformReq);

-

-    REQUEST_SIZE_MATCH(xRenderSetPictureTransformReq);

-    VERIFY_PICTURE(pPicture, stuff->picture, client, DixWriteAccess);

-

-    /* For the following to work with PanoramiX, it assumes that Render

-     * wraps the ProcRenderVector after dmxRenderInit has been called.

-     */

-    dmxScreen = &dmxScreens[pPicture->pDrawable->pScreen->myNum];

-    pPictPriv = DMX_GET_PICT_PRIV(pPicture);

-

-    if (pPictPriv->pict) {

-	xform.matrix[0][0] = stuff->transform.matrix11;

-	xform.matrix[0][1] = stuff->transform.matrix12;

-	xform.matrix[0][2] = stuff->transform.matrix13;

-	xform.matrix[1][0] = stuff->transform.matrix21;

-	xform.matrix[1][1] = stuff->transform.matrix22;

-	xform.matrix[1][2] = stuff->transform.matrix23;

-	xform.matrix[2][0] = stuff->transform.matrix31;

-	xform.matrix[2][1] = stuff->transform.matrix32;

-	xform.matrix[2][2] = stuff->transform.matrix33;

-

-	XRenderSetPictureTransform(dmxScreen->beDisplay,

-				   pPictPriv->pict,

-				   &xform);

-	dmxSync(dmxScreen, FALSE);

-    }

-

-    return dmxSaveRenderVector[stuff->renderReqType](client);

-}

-

-/** Set the picture filter on each screen. */

-static int dmxProcRenderSetPictureFilter(ClientPtr client)

-{

-    DMXScreenInfo  *dmxScreen;

-    PicturePtr      pPicture;

-    dmxPictPrivPtr  pPictPriv;

-    char           *filter;

-    XFixed         *params;

-    int             nparams;

-    REQUEST(xRenderSetPictureFilterReq);

-

-    REQUEST_AT_LEAST_SIZE(xRenderSetPictureFilterReq);

-    VERIFY_PICTURE(pPicture, stuff->picture, client, DixWriteAccess);

-

-    /* For the following to work with PanoramiX, it assumes that Render

-     * wraps the ProcRenderVector after dmxRenderInit has been called.

-     */

-    dmxScreen = &dmxScreens[pPicture->pDrawable->pScreen->myNum];

-    pPictPriv = DMX_GET_PICT_PRIV(pPicture);

-

-    if (pPictPriv->pict) {

-	filter  = (char *)(stuff + 1);

-	params  = (XFixed *)(filter + ((stuff->nbytes + 3) & ~3));

-	nparams = ((XFixed *)stuff + client->req_len) - params;

-

-	XRenderSetPictureFilter(dmxScreen->beDisplay,

-				pPictPriv->pict,

-				filter,

-				params,

-				nparams);

-	dmxSync(dmxScreen, FALSE);

-    }

-

-    return dmxSaveRenderVector[stuff->renderReqType](client);

-}

-

-

-/** Create a picture on the appropriate screen.  This is the actual

- *  function that creates the picture.  However, if the associated

- *  window has not yet been created due to lazy window creation, then

- *  delay the picture creation until the window is mapped. */

-static Picture dmxDoCreatePicture(PicturePtr pPicture)

-{

-    DrawablePtr               pDraw     = pPicture->pDrawable;

-    ScreenPtr                 pScreen   = pDraw->pScreen;

-    DMXScreenInfo            *dmxScreen = &dmxScreens[pScreen->myNum];

-    XRenderPictFormat        *pFormat;

-    Drawable                  draw;

-

-    if (pPicture->pDrawable->type == DRAWABLE_WINDOW) {

-	dmxWinPrivPtr  pWinPriv = DMX_GET_WINDOW_PRIV((WindowPtr)(pDraw));

-

-	if (!(draw = pWinPriv->window)) {

-	    /* Window has not been created yet due to the window

-	     * optimization.  Delay picture creation until window is

-	     * mapped.

-	     */

-	    pWinPriv->hasPict = TRUE;

-	    return 0;

-	}

-    } else {

-	dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV((PixmapPtr)(pDraw));

-

-	if (!(draw = pPixPriv->pixmap)) {

-	    /* FIXME: Zero width/height pixmap?? */

-	    return 0;

-	}

-    }

-

-    /* This should not be reached if the back-end display has been

-     * detached because the pWinPriv->window or the pPixPriv->pixmap

-     * will be NULL; however, we add it here for completeness

-     */

-    if (!dmxScreen->beDisplay)

-	return 0;

-

-    pFormat = dmxFindFormat(dmxScreen, pPicture->pFormat);

-

-    return XRenderCreatePicture(dmxScreen->beDisplay, draw, pFormat, 0, 0);

-}

-

-/** Create a list of pictures.  This function is called by

- *  dmxCreateAndRealizeWindow() during the lazy window creation

- *  realization process.  It creates the entire list of pictures that

- *  are associated with the given window. */

-void dmxCreatePictureList(WindowPtr pWindow)

-{

-    PicturePtr  pPicture = GetPictureWindow(pWindow);

-

-    while (pPicture) {

-	dmxPictPrivPtr  pPictPriv = DMX_GET_PICT_PRIV(pPicture);

-

-	/* Create the picture for this window */

-	pPictPriv->pict = dmxDoCreatePicture(pPicture);

-

-	/* ValidatePicture takes care of the state changes */

-

-	pPicture = pPicture->pNext;

-    }

-}

-

-/** Create \a pPicture on the backend. */

-int dmxBECreatePicture(PicturePtr pPicture)

-{

-    dmxPictPrivPtr    pPictPriv = DMX_GET_PICT_PRIV(pPicture);

-

-    /* Create picutre on BE */

-    pPictPriv->pict = dmxDoCreatePicture(pPicture);

-

-    /* Flush changes to the backend server */

-    dmxValidatePicture(pPicture, (1 << (CPLastBit+1)) - 1);

-

-    return Success;

-}

-

-/** Create a picture.  This function handles the CreatePicture

- *  unwrapping/wrapping and calls dmxDoCreatePicture to actually create

- *  the picture on the appropriate screen.  */

-int dmxCreatePicture(PicturePtr pPicture)

-{

-    ScreenPtr         pScreen   = pPicture->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-    dmxPictPrivPtr    pPictPriv = DMX_GET_PICT_PRIV(pPicture);

-    int               ret       = Success;

-

-    DMX_UNWRAP(CreatePicture, dmxScreen, ps);

-#if 1

-    if (ps->CreatePicture)

-	ret = ps->CreatePicture(pPicture);

-#endif

-

-    /* Create picture on back-end server */

-    pPictPriv->pict      = dmxDoCreatePicture(pPicture);

-    pPictPriv->savedMask = 0;

-

-    DMX_WRAP(CreatePicture, dmxCreatePicture, dmxScreen, ps);

-

-    return ret;

-}

-

-/** Destroy \a pPicture on the back-end server. */

-Bool dmxBEFreePicture(PicturePtr pPicture)

-{

-    ScreenPtr      pScreen   = pPicture->pDrawable->pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxPictPrivPtr pPictPriv = DMX_GET_PICT_PRIV(pPicture);

-

-    if (pPictPriv->pict) {

-	XRenderFreePicture(dmxScreen->beDisplay, pPictPriv->pict);

-	pPictPriv->pict = (Picture)0;

-	return TRUE;

-    }

-

-    return FALSE;

-}

-

-/** Destroy a list of pictures that are associated with the window that

- *  is being destroyed.  This function is called by #dmxDestroyWindow().

- *  */

-Bool dmxDestroyPictureList(WindowPtr pWindow)

-{

-    PicturePtr  pPicture = GetPictureWindow(pWindow);

-    Bool        ret      = FALSE;

-

-    while (pPicture) {

-	ret |= dmxBEFreePicture(pPicture);

-	pPicture = pPicture->pNext;

-    }

-

-    return ret;

-}

-

-/** Destroy a picture.  This function calls the wrapped function that

- *  frees the resources in the DMX server associated with this

- *  picture. */

-void dmxDestroyPicture(PicturePtr pPicture)

-{

-    ScreenPtr         pScreen   = pPicture->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-

-    DMX_UNWRAP(DestroyPicture, dmxScreen, ps);

-

-    /* Destroy picture on back-end server */

-    if (dmxBEFreePicture(pPicture))

-	dmxSync(dmxScreen, FALSE);

-

-#if 1

-    if (ps->DestroyPicture)

-	ps->DestroyPicture(pPicture);

-#endif

-    DMX_WRAP(DestroyPicture, dmxDestroyPicture, dmxScreen, ps);

-}

-

-/** Change the picture's list of clip rectangles. */

-int dmxChangePictureClip(PicturePtr pPicture, int clipType,

-			 pointer value, int n)

-{

-    ScreenPtr         pScreen   = pPicture->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-    dmxPictPrivPtr    pPictPriv = DMX_GET_PICT_PRIV(pPicture);

-

-    DMX_UNWRAP(ChangePictureClip, dmxScreen, ps);

-#if 1

-    if (ps->ChangePictureClip)

-	ps->ChangePictureClip(pPicture, clipType, value, n);

-#endif

-

-    /* Change picture clip rects on back-end server */

-    if (pPictPriv->pict) {

-	/* The clip has already been changed into a region by the mi

-	 * routine called above.

-	 */

-	if (clipType == CT_NONE) {

-	    /* Disable clipping, show all */

-	    XFixesSetPictureClipRegion(dmxScreen->beDisplay,

-				       pPictPriv->pict, 0, 0, None);

-	} else if (pPicture->clientClip) {

-	    RegionPtr   pClip = pPicture->clientClip;

-	    BoxPtr      pBox  = RegionRects(pClip);

-	    int         nBox  = RegionNumRects(pClip);

-	    XRectangle *pRects;

-	    XRectangle *pRect;

-	    int         nRects;

-

-	    nRects = nBox;

-	    pRects = pRect = malloc(nRects * sizeof(*pRect));

-

-	    while (nBox--) {

-		pRect->x      = pBox->x1;

-		pRect->y      = pBox->y1;

-		pRect->width  = pBox->x2 - pBox->x1;

-		pRect->height = pBox->y2 - pBox->y1;

-		pBox++;

-		pRect++;

-	    }

-

-	    XRenderSetPictureClipRectangles(dmxScreen->beDisplay,

-					    pPictPriv->pict,

-					    0, 0,

-					    pRects,

-					    nRects);

-	    free(pRects);

-	} else {

-	    XRenderSetPictureClipRectangles(dmxScreen->beDisplay,

-					    pPictPriv->pict,

-					    0, 0, NULL, 0);

-	}

-	dmxSync(dmxScreen, FALSE);

-    } else {

-	/* FIXME: Handle saving clip region when offscreen */

-    }

-

-    DMX_WRAP(ChangePictureClip, dmxChangePictureClip, dmxScreen, ps);

-    

-    return Success;

-}

-

-/** Destroy the picture's list of clip rectangles. */

-void dmxDestroyPictureClip(PicturePtr pPicture)

-{

-    ScreenPtr         pScreen   = pPicture->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-    dmxPictPrivPtr    pPictPriv = DMX_GET_PICT_PRIV(pPicture);

-

-    DMX_UNWRAP(DestroyPictureClip, dmxScreen, ps);

-#if 1

-    if (ps->DestroyPictureClip)

-	ps->DestroyPictureClip(pPicture);

-#endif

-

-    /* Destroy picture clip rects on back-end server */

-    if (pPictPriv->pict) {

-	XRenderSetPictureClipRectangles(dmxScreen->beDisplay,

-					pPictPriv->pict,

-					0, 0, NULL, 0);

-	dmxSync(dmxScreen, FALSE);

-    } else {

-	/* FIXME: Handle destroying clip region when offscreen */

-    }

-

-    DMX_WRAP(DestroyPictureClip, dmxDestroyPictureClip, dmxScreen, ps);

-}

-

-/** Change the attributes of the pictures.  If the picture has not yet

- *  been created due to lazy window creation, save the mask so that it

- *  can be used to appropriately initialize the picture's attributes

- *  when it is created later. */

-void dmxChangePicture(PicturePtr pPicture, Mask mask)

-{

-    ScreenPtr         pScreen   = pPicture->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-    dmxPictPrivPtr    pPictPriv = DMX_GET_PICT_PRIV(pPicture);

-

-    DMX_UNWRAP(ChangePicture, dmxScreen, ps);

-#if 1

-    if (ps->ChangePicture)

-	ps->ChangePicture(pPicture, mask);

-#endif

-

-    /* Picture attribute changes are handled in ValidatePicture */

-    pPictPriv->savedMask |= mask;

-

-    DMX_WRAP(ChangePicture, dmxChangePicture, dmxScreen, ps);

-}

-

-/** Validate the picture's attributes before rendering to it.  Update

- *  any picture attributes that have been changed by one of the higher

- *  layers. */

-void dmxValidatePicture(PicturePtr pPicture, Mask mask)

-{

-    ScreenPtr         pScreen   = pPicture->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-    dmxPictPrivPtr    pPictPriv = DMX_GET_PICT_PRIV(pPicture);

-

-    DMX_UNWRAP(ValidatePicture, dmxScreen, ps);

-

-    /* Change picture attributes on back-end server */

-    if (pPictPriv->pict) {

-	XRenderPictureAttributes  attribs;

-

-	if (mask & CPRepeat) {

-	    attribs.repeat = pPicture->repeatType;

-	}

-	if (mask & CPAlphaMap) {

-	    if (pPicture->alphaMap) {

-		dmxPictPrivPtr  pAlphaPriv;

-		pAlphaPriv = DMX_GET_PICT_PRIV(pPicture->alphaMap);

-		if (pAlphaPriv->pict) {

-		    attribs.alpha_map = pAlphaPriv->pict;

-		} else {

-		    /* FIXME: alpha picture drawable has not been created?? */

-		    return; /* or should this be: attribs.alpha_map = None; */

-		}

-	    } else {

-		attribs.alpha_map = None;

-	    }

-	}

-	if (mask & CPAlphaXOrigin)

-	    attribs.alpha_x_origin = pPicture->alphaOrigin.x;

-	if (mask & CPAlphaYOrigin)

-	    attribs.alpha_y_origin = pPicture->alphaOrigin.y;

-	if (mask & CPClipXOrigin)

-	    attribs.clip_x_origin = pPicture->clipOrigin.x;

-	if (mask & CPClipYOrigin)

-	    attribs.clip_y_origin = pPicture->clipOrigin.y;

-	if (mask & CPClipMask)

-	    mask &= ~CPClipMask; /* Handled in ChangePictureClip */

-	if (mask & CPGraphicsExposure)

-	    attribs.graphics_exposures = pPicture->graphicsExposures;

-	if (mask & CPSubwindowMode)

-	    attribs.subwindow_mode = pPicture->subWindowMode;

-	if (mask & CPPolyEdge)

-	    attribs.poly_edge = pPicture->polyEdge;

-	if (mask & CPPolyMode)

-	    attribs.poly_mode = pPicture->polyMode;

-	if (mask & CPComponentAlpha)

-	    attribs.component_alpha = pPicture->componentAlpha;

-

-	XRenderChangePicture(dmxScreen->beDisplay, pPictPriv->pict,

-			     mask, &attribs);

-	dmxSync(dmxScreen, FALSE);

-    } else {

-	pPictPriv->savedMask |= mask;

-    }

-

-#if 1

-    if (ps->ValidatePicture)

-	ps->ValidatePicture(pPicture, mask);

-#endif

-

-    DMX_WRAP(ValidatePicture, dmxValidatePicture, dmxScreen, ps);

-}

-

-/** Composite a picture on the appropriate screen by combining the

- *  specified rectangle of the transformed src and mask operands with

- *  the specified rectangle of the dst using op as the compositing

- *  operator.  For a complete description see the protocol document of

- *  the RENDER library. */

-void dmxComposite(CARD8 op,

-		  PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,

-		  INT16 xSrc, INT16 ySrc,

-		  INT16 xMask, INT16 yMask,

-		  INT16 xDst, INT16 yDst,

-		  CARD16 width, CARD16 height)

-{

-    ScreenPtr         pScreen   = pDst->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-    dmxPictPrivPtr    pSrcPriv  = DMX_GET_PICT_PRIV(pSrc);

-    dmxPictPrivPtr    pMaskPriv = NULL;

-    dmxPictPrivPtr    pDstPriv  = DMX_GET_PICT_PRIV(pDst);

-

-    if (pMask) pMaskPriv = DMX_GET_PICT_PRIV(pMask);

-

-    DMX_UNWRAP(Composite, dmxScreen, ps);

-#if 0

-    if (ps->Composite)

-	ps->Composite(op, pSrc, pMask, pDst,

-		      xSrc, ySrc, xMask, yMask, xDst, yDst,

-		      width, height);

-#endif

-

-    /* Composite on back-end server */

-    if (pSrcPriv->pict && pDstPriv->pict &&

-	((pMaskPriv && pMaskPriv->pict) || !pMaskPriv)) {

-	XRenderComposite(dmxScreen->beDisplay,

-			 op,

-			 pSrcPriv->pict,

-			 pMaskPriv ? pMaskPriv->pict : None,

-			 pDstPriv->pict,

-			 xSrc, ySrc,

-			 xMask, yMask,

-			 xDst, yDst,

-			 width, height);

-	dmxSync(dmxScreen, FALSE);

-    }

-

-

-    DMX_WRAP(Composite, dmxComposite, dmxScreen, ps);

-}

-

-/** Null function to catch when/if RENDER calls lower level mi hooks.

- *  Compositing glyphs is handled by dmxProcRenderCompositeGlyphs().

- *  This function should never be called. */

-void dmxGlyphs(CARD8 op,

-	       PicturePtr pSrc, PicturePtr pDst,

-	       PictFormatPtr maskFormat,

-	       INT16 xSrc, INT16 ySrc,

-	       int nlists, GlyphListPtr lists, GlyphPtr *glyphs)

-{

-    /* This won't work, so we need to wrap ProcRenderCompositeGlyphs */

-}

-

-/** Fill a rectangle on the appropriate screen by combining the color

- *  with the dest picture in the area specified by the list of

- *  rectangles.  For a complete description see the protocol document of

- *  the RENDER library. */

-void dmxCompositeRects(CARD8 op,

-		       PicturePtr pDst,

-		       xRenderColor *color,

-		       int nRect, xRectangle *rects)

-{

-    ScreenPtr         pScreen   = pDst->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-    dmxPictPrivPtr    pPictPriv = DMX_GET_PICT_PRIV(pDst);

-

-    DMX_UNWRAP(CompositeRects, dmxScreen, ps);

-#if 0

-    if (ps->CompositeRects)

-	ps->CompositeRects(op, pDst, color, nRect, rects);

-#endif

-

-    /* CompositeRects on back-end server */

-    if (pPictPriv->pict) {

-	XRenderFillRectangles(dmxScreen->beDisplay,

-			      op,

-			      pPictPriv->pict,

-			      (XRenderColor *)color,

-			      (XRectangle *)rects,

-			      nRect);

-	dmxSync(dmxScreen, FALSE);

-    }

-

-    DMX_WRAP(CompositeRects, dmxCompositeRects, dmxScreen, ps);

-}

-

-/** Indexed color visuals are not yet supported. */

-Bool dmxInitIndexed(ScreenPtr pScreen, PictFormatPtr pFormat)

-{

-    return TRUE;

-}

-

-/** Indexed color visuals are not yet supported. */

-void dmxCloseIndexed(ScreenPtr pScreen, PictFormatPtr pFormat)

-{

-}

-

-/** Indexed color visuals are not yet supported. */

-void dmxUpdateIndexed(ScreenPtr pScreen, PictFormatPtr pFormat,

-		      int ndef, xColorItem *pdef)

-{

-}

-

-/** Composite a list of trapezoids on the appropriate screen.  For a

- *  complete description see the protocol document of the RENDER

- *  library. */

-void dmxTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst,

-		   PictFormatPtr maskFormat,

-		   INT16 xSrc, INT16 ySrc,

-		   int ntrap, xTrapezoid *traps)

-{

-    ScreenPtr         pScreen   = pDst->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-    dmxPictPrivPtr    pSrcPriv  = DMX_GET_PICT_PRIV(pSrc);

-    dmxPictPrivPtr    pDstPriv  = DMX_GET_PICT_PRIV(pDst);

-

-    DMX_UNWRAP(Trapezoids, dmxScreen, ps);

-#if 0

-    if (ps->Trapezoids)

-	ps->Trapezoids(op, pSrc, pDst, maskFormat, xSrc, ySrc, ntrap, *traps);

-#endif

-

-    /* Draw trapezoids on back-end server */

-    if (pDstPriv->pict) {

-	XRenderPictFormat *pFormat;

-

-	pFormat = dmxFindFormat(dmxScreen, maskFormat);

-	if (!pFormat) {

-	    /* FIXME: Error! */

-	}

-

-	XRenderCompositeTrapezoids(dmxScreen->beDisplay,

-				   op,

-				   pSrcPriv->pict,

-				   pDstPriv->pict,

-				   pFormat,

-				   xSrc, ySrc,

-				   (XTrapezoid *)traps,

-				   ntrap);

-	dmxSync(dmxScreen, FALSE);

-    }

-

-    DMX_WRAP(Trapezoids, dmxTrapezoids, dmxScreen, ps);

-}

-

-/** Composite a list of triangles on the appropriate screen.  For a

- *  complete description see the protocol document of the RENDER

- *  library. */

-void dmxTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst,

-		  PictFormatPtr maskFormat,

-		  INT16 xSrc, INT16 ySrc,

-		  int ntri, xTriangle *tris)

-{

-    ScreenPtr         pScreen   = pDst->pDrawable->pScreen;

-    DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];

-    PictureScreenPtr  ps        = GetPictureScreen(pScreen);

-    dmxPictPrivPtr    pSrcPriv  = DMX_GET_PICT_PRIV(pSrc);

-    dmxPictPrivPtr    pDstPriv  = DMX_GET_PICT_PRIV(pDst);

-

-    DMX_UNWRAP(Triangles, dmxScreen, ps);

-#if 0

-    if (ps->Triangles)

-	ps->Triangles(op, pSrc, pDst, maskFormat, xSrc, ySrc, ntri, *tris);

-#endif

-

-    /* Draw trapezoids on back-end server */

-    if (pDstPriv->pict) {

-	XRenderPictFormat *pFormat;

-

-	pFormat = dmxFindFormat(dmxScreen, maskFormat);

-	if (!pFormat) {

-	    /* FIXME: Error! */

-	}

-

-	XRenderCompositeTriangles(dmxScreen->beDisplay,

-				  op,

-				  pSrcPriv->pict,

-				  pDstPriv->pict,

-				  pFormat,

-				  xSrc, ySrc,

-				  (XTriangle *)tris,

-				  ntri);

-	dmxSync(dmxScreen, FALSE);

-    }

-

-    DMX_WRAP(Triangles, dmxTriangles, dmxScreen, ps);

-}

+/*
+ * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+/** \file
+ *  Provide support for the RENDER extension (version 0.8).
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxpict.h"
+#include "dmxwindow.h"
+#include "dmxpixmap.h"
+
+#include "fb.h"
+#include "pixmapstr.h"
+#include "dixstruct.h"
+
+#include <X11/extensions/render.h>
+#include <X11/extensions/renderproto.h>
+#include <X11/extensions/Xfixes.h>
+#include "picture.h"
+#include "picturestr.h"
+#include "mipict.h"
+#include "fbpict.h"
+
+extern int RenderErrBase;
+extern int (*ProcRenderVector[RenderNumberRequests]) (ClientPtr);
+
+static int (*dmxSaveRenderVector[RenderNumberRequests]) (ClientPtr);
+
+static int dmxProcRenderCreateGlyphSet(ClientPtr client);
+static int dmxProcRenderFreeGlyphSet(ClientPtr client);
+static int dmxProcRenderAddGlyphs(ClientPtr client);
+static int dmxProcRenderFreeGlyphs(ClientPtr client);
+static int dmxProcRenderCompositeGlyphs(ClientPtr client);
+static int dmxProcRenderSetPictureTransform(ClientPtr client);
+static int dmxProcRenderSetPictureFilter(ClientPtr client);
+
+#if 0
+/* FIXME: Not (yet) supported */
+static int dmxProcRenderCreateCursor(ClientPtr client);
+static int dmxProcRenderCreateAnimCursor(ClientPtr client);
+#endif
+
+/** Catch errors that might occur when allocating Glyph Sets.  Errors
+ *  are saved in dmxGlyphLastError for later handling. */
+static int dmxGlyphLastError;
+static int
+dmxGlyphErrorHandler(Display * dpy, XErrorEvent * ev)
+{
+    dmxGlyphLastError = ev->error_code;
+    return 0;
+}
+
+/** Initialize the Proc Vector for the RENDER extension.  The functions
+ *  here cannot be handled by the mi layer RENDER hooks either because
+ *  the required information is no longer available when it reaches the
+ *  mi layer or no mi layer hooks exist.  This function is called from
+ *  InitOutput() since it should be initialized only once per server
+ *  generation. */
+void
+dmxInitRender(void)
+{
+    int i;
+
+    for (i = 0; i < RenderNumberRequests; i++)
+        dmxSaveRenderVector[i] = ProcRenderVector[i];
+
+    ProcRenderVector[X_RenderCreateGlyphSet]
+        = dmxProcRenderCreateGlyphSet;
+    ProcRenderVector[X_RenderFreeGlyphSet]
+        = dmxProcRenderFreeGlyphSet;
+    ProcRenderVector[X_RenderAddGlyphs]
+        = dmxProcRenderAddGlyphs;
+    ProcRenderVector[X_RenderFreeGlyphs]
+        = dmxProcRenderFreeGlyphs;
+    ProcRenderVector[X_RenderCompositeGlyphs8]
+        = dmxProcRenderCompositeGlyphs;
+    ProcRenderVector[X_RenderCompositeGlyphs16]
+        = dmxProcRenderCompositeGlyphs;
+    ProcRenderVector[X_RenderCompositeGlyphs32]
+        = dmxProcRenderCompositeGlyphs;
+    ProcRenderVector[X_RenderSetPictureTransform]
+        = dmxProcRenderSetPictureTransform;
+    ProcRenderVector[X_RenderSetPictureFilter]
+        = dmxProcRenderSetPictureFilter;
+}
+
+/** Reset the Proc Vector for the RENDER extension back to the original
+ *  functions.  This function is called from dmxCloseScreen() during the
+ *  server reset (only for screen #0). */
+void
+dmxResetRender(void)
+{
+    int i;
+
+    for (i = 0; i < RenderNumberRequests; i++)
+        ProcRenderVector[i] = dmxSaveRenderVector[i];
+}
+
+/** Initialize the RENDER extension, allocate the picture privates and
+ *  wrap mi function hooks.  If the shadow frame buffer is used, then
+ *  call the appropriate fb initialization function. */
+Bool
+dmxPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PictureScreenPtr ps;
+
+    /* The shadow framebuffer only relies on FB to be initialized */
+    if (dmxShadowFB)
+        return fbPictureInit(pScreen, formats, nformats);
+
+    if (!miPictureInit(pScreen, formats, nformats))
+        return FALSE;
+
+    if (!dixRegisterPrivateKey
+        (&dmxPictPrivateKeyRec, PRIVATE_PICTURE, sizeof(dmxPictPrivRec)))
+        return FALSE;
+
+    ps = GetPictureScreen(pScreen);
+
+    DMX_WRAP(CreatePicture, dmxCreatePicture, dmxScreen, ps);
+    DMX_WRAP(DestroyPicture, dmxDestroyPicture, dmxScreen, ps);
+
+    DMX_WRAP(ChangePictureClip, dmxChangePictureClip, dmxScreen, ps);
+    DMX_WRAP(DestroyPictureClip, dmxDestroyPictureClip, dmxScreen, ps);
+
+    DMX_WRAP(ChangePicture, dmxChangePicture, dmxScreen, ps);
+    DMX_WRAP(ValidatePicture, dmxValidatePicture, dmxScreen, ps);
+
+    DMX_WRAP(Composite, dmxComposite, dmxScreen, ps);
+    DMX_WRAP(Glyphs, dmxGlyphs, dmxScreen, ps);
+    DMX_WRAP(CompositeRects, dmxCompositeRects, dmxScreen, ps);
+
+    DMX_WRAP(Trapezoids, dmxTrapezoids, dmxScreen, ps);
+    DMX_WRAP(Triangles, dmxTriangles, dmxScreen, ps);
+
+    return TRUE;
+}
+
+/** Find the appropriate format on the requested screen given the
+ *  internal format requested.  The list of formats is searched
+ *  sequentially as the XRenderFindFormat() function does not always
+ *  find the appropriate format when a specific format is requested. */
+static XRenderPictFormat *
+dmxFindFormat(DMXScreenInfo * dmxScreen, PictFormatPtr pFmt)
+{
+    XRenderPictFormat *pFormat = NULL;
+    int i = 0;
+
+    if (!pFmt || !dmxScreen->beDisplay)
+        return pFormat;
+
+    while (1) {
+        pFormat = XRenderFindFormat(dmxScreen->beDisplay, 0, 0, i++);
+        if (!pFormat)
+            break;
+
+        if (pFormat->type != pFmt->type)
+            continue;
+        if (pFormat->depth != pFmt->depth)
+            continue;
+        if (pFormat->direct.red != pFmt->direct.red)
+            continue;
+        if (pFormat->direct.redMask != pFmt->direct.redMask)
+            continue;
+        if (pFormat->direct.green != pFmt->direct.green)
+            continue;
+        if (pFormat->direct.greenMask != pFmt->direct.greenMask)
+            continue;
+        if (pFormat->direct.blue != pFmt->direct.blue)
+            continue;
+        if (pFormat->direct.blueMask != pFmt->direct.blueMask)
+            continue;
+        if (pFormat->direct.alpha != pFmt->direct.alpha)
+            continue;
+        if (pFormat->direct.alphaMask != pFmt->direct.alphaMask)
+            continue;
+
+        /* We have a match! */
+        break;
+    }
+
+    return pFormat;
+}
+
+/** Free \a glyphSet on back-end screen number \a idx. */
+Bool
+dmxBEFreeGlyphSet(ScreenPtr pScreen, GlyphSetPtr glyphSet)
+{
+    dmxGlyphPrivPtr glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
+    int idx = pScreen->myNum;
+    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+
+    if (glyphPriv->glyphSets[idx]) {
+        XRenderFreeGlyphSet(dmxScreen->beDisplay, glyphPriv->glyphSets[idx]);
+        glyphPriv->glyphSets[idx] = (GlyphSet) 0;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+/** Create \a glyphSet on the backend screen number \a idx. */
+int
+dmxBECreateGlyphSet(int idx, GlyphSetPtr glyphSet)
+{
+    XRenderPictFormat *pFormat;
+    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+    dmxGlyphPrivPtr glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
+    PictFormatPtr pFmt = glyphSet->format;
+    int (*oldErrorHandler) (Display *, XErrorEvent *);
+
+    pFormat = dmxFindFormat(dmxScreen, pFmt);
+    if (!pFormat) {
+        return BadMatch;
+    }
+
+    dmxGlyphLastError = 0;
+    oldErrorHandler = XSetErrorHandler(dmxGlyphErrorHandler);
+
+    /* Catch when this fails */
+    glyphPriv->glyphSets[idx]
+        = XRenderCreateGlyphSet(dmxScreen->beDisplay, pFormat);
+
+    XSetErrorHandler(oldErrorHandler);
+
+    if (dmxGlyphLastError) {
+        return dmxGlyphLastError;
+    }
+
+    return Success;
+}
+
+/** Create a Glyph Set on each screen.  Save the glyphset ID from each
+ *  screen in the Glyph Set's private structure.  Fail if the format
+ *  requested is not available or if the Glyph Set cannot be created on
+ *  the screen. */
+static int
+dmxProcRenderCreateGlyphSet(ClientPtr client)
+{
+    int ret;
+
+    REQUEST(xRenderCreateGlyphSetReq);
+
+    ret = dmxSaveRenderVector[stuff->renderReqType] (client);
+
+    if (ret == Success) {
+        GlyphSetPtr glyphSet;
+        dmxGlyphPrivPtr glyphPriv;
+        int i;
+
+        /* Look up glyphSet that was just created ???? */
+        /* Store glyphsets from backends in glyphSet->devPrivate ????? */
+        /* Make sure we handle all errors here!! */
+
+        dixLookupResourceByType((pointer *) &glyphSet,
+                                stuff->gsid, GlyphSetType,
+                                client, DixDestroyAccess);
+
+        glyphPriv = malloc(sizeof(dmxGlyphPrivRec));
+        if (!glyphPriv)
+            return BadAlloc;
+        glyphPriv->glyphSets = NULL;
+        MAXSCREENSALLOC_RETURN(glyphPriv->glyphSets, BadAlloc);
+        DMX_SET_GLYPH_PRIV(glyphSet, glyphPriv);
+
+        for (i = 0; i < dmxNumScreens; i++) {
+            DMXScreenInfo *dmxScreen = &dmxScreens[i];
+            int beret;
+
+            if (!dmxScreen->beDisplay) {
+                glyphPriv->glyphSets[i] = 0;
+                continue;
+            }
+
+            if ((beret = dmxBECreateGlyphSet(i, glyphSet)) != Success) {
+                int j;
+
+                /* Free the glyph sets we've allocated thus far */
+                for (j = 0; j < i; j++)
+                    dmxBEFreeGlyphSet(screenInfo.screens[j], glyphSet);
+
+                /* Free the resource created by render */
+                FreeResource(stuff->gsid, RT_NONE);
+
+                return beret;
+            }
+        }
+    }
+
+    return ret;
+}
+
+/** Free the previously allocated Glyph Sets for each screen. */
+static int
+dmxProcRenderFreeGlyphSet(ClientPtr client)
+{
+    GlyphSetPtr glyphSet;
+
+    REQUEST(xRenderFreeGlyphSetReq);
+
+    REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq);
+    dixLookupResourceByType((pointer *) &glyphSet,
+                            stuff->glyphset, GlyphSetType,
+                            client, DixDestroyAccess);
+
+    if (glyphSet && glyphSet->refcnt == 1) {
+        dmxGlyphPrivPtr glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
+        int i;
+
+        for (i = 0; i < dmxNumScreens; i++) {
+            DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
+            if (dmxScreen->beDisplay) {
+                if (dmxBEFreeGlyphSet(screenInfo.screens[i], glyphSet))
+                    dmxSync(dmxScreen, FALSE);
+            }
+        }
+
+        MAXSCREENSFREE(glyphPriv->glyphSets);
+        free(glyphPriv);
+        DMX_SET_GLYPH_PRIV(glyphSet, NULL);
+    }
+
+    return dmxSaveRenderVector[stuff->renderReqType] (client);
+}
+
+/** Add glyphs to the Glyph Set on each screen. */
+static int
+dmxProcRenderAddGlyphs(ClientPtr client)
+{
+    int ret;
+
+    REQUEST(xRenderAddGlyphsReq);
+
+    ret = dmxSaveRenderVector[stuff->renderReqType] (client);
+
+    if (ret == Success) {
+        GlyphSetPtr glyphSet;
+        dmxGlyphPrivPtr glyphPriv;
+        int i;
+        int nglyphs;
+        CARD32 *gids;
+        Glyph *gidsCopy;
+        xGlyphInfo *gi;
+        CARD8 *bits;
+        int nbytes;
+
+        dixLookupResourceByType((pointer *) &glyphSet,
+                                stuff->glyphset, GlyphSetType,
+                                client, DixReadAccess);
+        glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
+
+        nglyphs = stuff->nglyphs;
+        gids = (CARD32 *) (stuff + 1);
+        gi = (xGlyphInfo *) (gids + nglyphs);
+        bits = (CARD8 *) (gi + nglyphs);
+        nbytes = ((stuff->length << 2) -
+                  sizeof(xRenderAddGlyphsReq) -
+                  (sizeof(CARD32) + sizeof(xGlyphInfo)) * nglyphs);
+
+        gidsCopy = malloc(sizeof(*gidsCopy) * nglyphs);
+        for (i = 0; i < nglyphs; i++)
+            gidsCopy[i] = gids[i];
+
+        /* FIXME: Will this ever fail? */
+        for (i = 0; i < dmxNumScreens; i++) {
+            DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
+            if (dmxScreen->beDisplay) {
+                XRenderAddGlyphs(dmxScreen->beDisplay,
+                                 glyphPriv->glyphSets[i],
+                                 gidsCopy,
+                                 (XGlyphInfo *) gi,
+                                 nglyphs, (char *) bits, nbytes);
+                dmxSync(dmxScreen, FALSE);
+            }
+        }
+        free(gidsCopy);
+    }
+
+    return ret;
+}
+
+/** Free glyphs from the Glyph Set for each screen. */
+static int
+dmxProcRenderFreeGlyphs(ClientPtr client)
+{
+    GlyphSetPtr glyphSet;
+
+    REQUEST(xRenderFreeGlyphsReq);
+
+    REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
+    dixLookupResourceByType((pointer *) &glyphSet,
+                            stuff->glyphset, GlyphSetType,
+                            client, DixWriteAccess);
+
+    if (glyphSet) {
+        dmxGlyphPrivPtr glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
+        int i;
+        int nglyphs;
+        Glyph *gids;
+
+        nglyphs = ((client->req_len << 2) - sizeof(xRenderFreeGlyphsReq)) >> 2;
+        if (nglyphs) {
+            gids = malloc(sizeof(*gids) * nglyphs);
+            for (i = 0; i < nglyphs; i++)
+                gids[i] = ((CARD32 *) (stuff + 1))[i];
+
+            for (i = 0; i < dmxNumScreens; i++) {
+                DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
+                if (dmxScreen->beDisplay) {
+                    XRenderFreeGlyphs(dmxScreen->beDisplay,
+                                      glyphPriv->glyphSets[i], gids, nglyphs);
+                    dmxSync(dmxScreen, FALSE);
+                }
+            }
+            free(gids);
+        }
+    }
+
+    return dmxSaveRenderVector[stuff->renderReqType] (client);
+}
+
+/** Composite glyphs on each screen into the requested picture.  If
+ *  either the src or dest picture has not been allocated due to lazy
+ *  window creation, this request will gracefully return. */
+static int
+dmxProcRenderCompositeGlyphs(ClientPtr client)
+{
+    int ret;
+
+    REQUEST(xRenderCompositeGlyphsReq);
+
+    ret = dmxSaveRenderVector[stuff->renderReqType] (client);
+
+    /* For the following to work with PanoramiX, it assumes that Render
+     * wraps the ProcRenderVector after dmxRenderInit has been called.
+     */
+    if (ret == Success) {
+        PicturePtr pSrc;
+        dmxPictPrivPtr pSrcPriv;
+        PicturePtr pDst;
+        dmxPictPrivPtr pDstPriv;
+        PictFormatPtr pFmt;
+        XRenderPictFormat *pFormat;
+        int size;
+
+        int scrnNum;
+        DMXScreenInfo *dmxScreen;
+
+        CARD8 *buffer;
+        CARD8 *end;
+        int space;
+
+        int nglyph;
+        char *glyphs;
+        char *curGlyph;
+
+        xGlyphElt *elt;
+        int nelt;
+        XGlyphElt8 *elts;
+        XGlyphElt8 *curElt;
+
+        GlyphSetPtr glyphSet;
+        dmxGlyphPrivPtr glyphPriv;
+
+        dixLookupResourceByType((pointer *) &pSrc,
+                                stuff->src, PictureType, client, DixReadAccess);
+
+        pSrcPriv = DMX_GET_PICT_PRIV(pSrc);
+        if (!pSrcPriv->pict)
+            return ret;
+
+        dixLookupResourceByType((pointer *) &pDst,
+                                stuff->dst, PictureType,
+                                client, DixWriteAccess);
+
+        pDstPriv = DMX_GET_PICT_PRIV(pDst);
+        if (!pDstPriv->pict)
+            return ret;
+
+        scrnNum = pDst->pDrawable->pScreen->myNum;
+        dmxScreen = &dmxScreens[scrnNum];
+
+        /* Note: If the back-end display has been detached, then it
+         * should not be possible to reach here since the pSrcPriv->pict
+         * and pDstPriv->pict will have already been set to 0.
+         */
+        if (!dmxScreen->beDisplay)
+            return ret;
+
+        if (stuff->maskFormat)
+            dixLookupResourceByType((pointer *) &pFmt,
+                                    stuff->maskFormat, PictFormatType,
+                                    client, DixReadAccess);
+        else
+            pFmt = NULL;
+
+        pFormat = dmxFindFormat(dmxScreen, pFmt);
+
+        switch (stuff->renderReqType) {
+        case X_RenderCompositeGlyphs8:
+            size = sizeof(CARD8);
+            break;
+        case X_RenderCompositeGlyphs16:
+            size = sizeof(CARD16);
+            break;
+        case X_RenderCompositeGlyphs32:
+            size = sizeof(CARD32);
+            break;
+        default:
+            return BadPictOp;   /* Can't happen */
+        }
+
+        buffer = (CARD8 *) (stuff + 1);
+        end = (CARD8 *) stuff + (stuff->length << 2);
+        nelt = 0;
+        nglyph = 0;
+        while (buffer + sizeof(xGlyphElt) < end) {
+            elt = (xGlyphElt *) buffer;
+            buffer += sizeof(xGlyphElt);
+
+            if (elt->len == 0xff) {
+                buffer += 4;
+            }
+            else {
+                nelt++;
+                nglyph += elt->len;
+                space = size * elt->len;
+                if (space & 3)
+                    space += 4 - (space & 3);
+                buffer += space;
+            }
+        }
+
+        /* The following only works for Render version > 0.2 */
+
+        /* All of the XGlyphElt* structure sizes are identical */
+        elts = malloc(nelt * sizeof(XGlyphElt8));
+        if (!elts)
+            return BadAlloc;
+
+        glyphs = malloc(nglyph * size);
+        if (!glyphs) {
+            free(elts);
+            return BadAlloc;
+        }
+
+        buffer = (CARD8 *) (stuff + 1);
+        end = (CARD8 *) stuff + (stuff->length << 2);
+        curGlyph = glyphs;
+        curElt = elts;
+
+        dixLookupResourceByType((pointer *) &glyphSet,
+                                stuff->glyphset, GlyphSetType,
+                                client, DixReadAccess);
+        glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
+
+        while (buffer + sizeof(xGlyphElt) < end) {
+            elt = (xGlyphElt *) buffer;
+            buffer += sizeof(xGlyphElt);
+
+            if (elt->len == 0xff) {
+                dixLookupResourceByType((pointer *) &glyphSet,
+                                        *((CARD32 *) buffer),
+                                        GlyphSetType, client, DixReadAccess);
+                glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
+                buffer += 4;
+            }
+            else {
+                curElt->glyphset = glyphPriv->glyphSets[scrnNum];
+                curElt->xOff = elt->deltax;
+                curElt->yOff = elt->deltay;
+                curElt->nchars = elt->len;
+                curElt->chars = curGlyph;
+
+                memcpy(curGlyph, buffer, size * elt->len);
+                curGlyph += size * elt->len;
+
+                curElt++;
+
+                space = size * elt->len;
+                if (space & 3)
+                    space += 4 - (space & 3);
+                buffer += space;
+            }
+        }
+
+        switch (stuff->renderReqType) {
+        case X_RenderCompositeGlyphs8:
+            XRenderCompositeText8(dmxScreen->beDisplay, stuff->op,
+                                  pSrcPriv->pict, pDstPriv->pict,
+                                  pFormat,
+                                  stuff->xSrc, stuff->ySrc, 0, 0, elts, nelt);
+            break;
+        case X_RenderCompositeGlyphs16:
+            XRenderCompositeText16(dmxScreen->beDisplay, stuff->op,
+                                   pSrcPriv->pict, pDstPriv->pict,
+                                   pFormat,
+                                   stuff->xSrc, stuff->ySrc,
+                                   0, 0, (XGlyphElt16 *) elts, nelt);
+            break;
+        case X_RenderCompositeGlyphs32:
+            XRenderCompositeText32(dmxScreen->beDisplay, stuff->op,
+                                   pSrcPriv->pict, pDstPriv->pict,
+                                   pFormat,
+                                   stuff->xSrc, stuff->ySrc,
+                                   0, 0, (XGlyphElt32 *) elts, nelt);
+            break;
+        }
+
+        dmxSync(dmxScreen, FALSE);
+
+        free(elts);
+        free(glyphs);
+    }
+
+    return ret;
+}
+
+/** Set the picture transform on each screen. */
+static int
+dmxProcRenderSetPictureTransform(ClientPtr client)
+{
+    DMXScreenInfo *dmxScreen;
+    PicturePtr pPicture;
+    dmxPictPrivPtr pPictPriv;
+    XTransform xform;
+
+    REQUEST(xRenderSetPictureTransformReq);
+
+    REQUEST_SIZE_MATCH(xRenderSetPictureTransformReq);
+    VERIFY_PICTURE(pPicture, stuff->picture, client, DixWriteAccess);
+
+    /* For the following to work with PanoramiX, it assumes that Render
+     * wraps the ProcRenderVector after dmxRenderInit has been called.
+     */
+    dmxScreen = &dmxScreens[pPicture->pDrawable->pScreen->myNum];
+    pPictPriv = DMX_GET_PICT_PRIV(pPicture);
+
+    if (pPictPriv->pict) {
+        xform.matrix[0][0] = stuff->transform.matrix11;
+        xform.matrix[0][1] = stuff->transform.matrix12;
+        xform.matrix[0][2] = stuff->transform.matrix13;
+        xform.matrix[1][0] = stuff->transform.matrix21;
+        xform.matrix[1][1] = stuff->transform.matrix22;
+        xform.matrix[1][2] = stuff->transform.matrix23;
+        xform.matrix[2][0] = stuff->transform.matrix31;
+        xform.matrix[2][1] = stuff->transform.matrix32;
+        xform.matrix[2][2] = stuff->transform.matrix33;
+
+        XRenderSetPictureTransform(dmxScreen->beDisplay,
+                                   pPictPriv->pict, &xform);
+        dmxSync(dmxScreen, FALSE);
+    }
+
+    return dmxSaveRenderVector[stuff->renderReqType] (client);
+}
+
+/** Set the picture filter on each screen. */
+static int
+dmxProcRenderSetPictureFilter(ClientPtr client)
+{
+    DMXScreenInfo *dmxScreen;
+    PicturePtr pPicture;
+    dmxPictPrivPtr pPictPriv;
+    char *filter;
+    XFixed *params;
+    int nparams;
+
+    REQUEST(xRenderSetPictureFilterReq);
+
+    REQUEST_AT_LEAST_SIZE(xRenderSetPictureFilterReq);
+    VERIFY_PICTURE(pPicture, stuff->picture, client, DixWriteAccess);
+
+    /* For the following to work with PanoramiX, it assumes that Render
+     * wraps the ProcRenderVector after dmxRenderInit has been called.
+     */
+    dmxScreen = &dmxScreens[pPicture->pDrawable->pScreen->myNum];
+    pPictPriv = DMX_GET_PICT_PRIV(pPicture);
+
+    if (pPictPriv->pict) {
+        filter = (char *) (stuff + 1);
+        params = (XFixed *) (filter + ((stuff->nbytes + 3) & ~3));
+        nparams = ((XFixed *) stuff + client->req_len) - params;
+
+        XRenderSetPictureFilter(dmxScreen->beDisplay,
+                                pPictPriv->pict, filter, params, nparams);
+        dmxSync(dmxScreen, FALSE);
+    }
+
+    return dmxSaveRenderVector[stuff->renderReqType] (client);
+}
+
+/** Create a picture on the appropriate screen.  This is the actual
+ *  function that creates the picture.  However, if the associated
+ *  window has not yet been created due to lazy window creation, then
+ *  delay the picture creation until the window is mapped. */
+static Picture
+dmxDoCreatePicture(PicturePtr pPicture)
+{
+    DrawablePtr pDraw = pPicture->pDrawable;
+    ScreenPtr pScreen = pDraw->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    XRenderPictFormat *pFormat;
+    Drawable draw;
+
+    if (pPicture->pDrawable->type == DRAWABLE_WINDOW) {
+        dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV((WindowPtr) (pDraw));
+
+        if (!(draw = pWinPriv->window)) {
+            /* Window has not been created yet due to the window
+             * optimization.  Delay picture creation until window is
+             * mapped.
+             */
+            pWinPriv->hasPict = TRUE;
+            return 0;
+        }
+    }
+    else {
+        dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV((PixmapPtr) (pDraw));
+
+        if (!(draw = pPixPriv->pixmap)) {
+            /* FIXME: Zero width/height pixmap?? */
+            return 0;
+        }
+    }
+
+    /* This should not be reached if the back-end display has been
+     * detached because the pWinPriv->window or the pPixPriv->pixmap
+     * will be NULL; however, we add it here for completeness
+     */
+    if (!dmxScreen->beDisplay)
+        return 0;
+
+    pFormat = dmxFindFormat(dmxScreen, pPicture->pFormat);
+
+    return XRenderCreatePicture(dmxScreen->beDisplay, draw, pFormat, 0, 0);
+}
+
+/** Create a list of pictures.  This function is called by
+ *  dmxCreateAndRealizeWindow() during the lazy window creation
+ *  realization process.  It creates the entire list of pictures that
+ *  are associated with the given window. */
+void
+dmxCreatePictureList(WindowPtr pWindow)
+{
+    PicturePtr pPicture = GetPictureWindow(pWindow);
+
+    while (pPicture) {
+        dmxPictPrivPtr pPictPriv = DMX_GET_PICT_PRIV(pPicture);
+
+        /* Create the picture for this window */
+        pPictPriv->pict = dmxDoCreatePicture(pPicture);
+
+        /* ValidatePicture takes care of the state changes */
+
+        pPicture = pPicture->pNext;
+    }
+}
+
+/** Create \a pPicture on the backend. */
+int
+dmxBECreatePicture(PicturePtr pPicture)
+{
+    dmxPictPrivPtr pPictPriv = DMX_GET_PICT_PRIV(pPicture);
+
+    /* Create picutre on BE */
+    pPictPriv->pict = dmxDoCreatePicture(pPicture);
+
+    /* Flush changes to the backend server */
+    dmxValidatePicture(pPicture, (1 << (CPLastBit + 1)) - 1);
+
+    return Success;
+}
+
+/** Create a picture.  This function handles the CreatePicture
+ *  unwrapping/wrapping and calls dmxDoCreatePicture to actually create
+ *  the picture on the appropriate screen.  */
+int
+dmxCreatePicture(PicturePtr pPicture)
+{
+    ScreenPtr pScreen = pPicture->pDrawable->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
+    dmxPictPrivPtr pPictPriv = DMX_GET_PICT_PRIV(pPicture);
+    int ret = Success;
+
+    DMX_UNWRAP(CreatePicture, dmxScreen, ps);
+#if 1
+    if (ps->CreatePicture)
+        ret = ps->CreatePicture(pPicture);
+#endif
+
+    /* Create picture on back-end server */
+    pPictPriv->pict = dmxDoCreatePicture(pPicture);
+    pPictPriv->savedMask = 0;
+
+    DMX_WRAP(CreatePicture, dmxCreatePicture, dmxScreen, ps);
+
+    return ret;
+}
+
+/** Destroy \a pPicture on the back-end server. */
+Bool
+dmxBEFreePicture(PicturePtr pPicture)
+{
+    ScreenPtr pScreen = pPicture->pDrawable->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxPictPrivPtr pPictPriv = DMX_GET_PICT_PRIV(pPicture);
+
+    if (pPictPriv->pict) {
+        XRenderFreePicture(dmxScreen->beDisplay, pPictPriv->pict);
+        pPictPriv->pict = (Picture) 0;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+/** Destroy a list of pictures that are associated with the window that
+ *  is being destroyed.  This function is called by #dmxDestroyWindow().
+ *  */
+Bool
+dmxDestroyPictureList(WindowPtr pWindow)
+{
+    PicturePtr pPicture = GetPictureWindow(pWindow);
+    Bool ret = FALSE;
+
+    while (pPicture) {
+        ret |= dmxBEFreePicture(pPicture);
+        pPicture = pPicture->pNext;
+    }
+
+    return ret;
+}
+
+/** Destroy a picture.  This function calls the wrapped function that
+ *  frees the resources in the DMX server associated with this
+ *  picture. */
+void
+dmxDestroyPicture(PicturePtr pPicture)
+{
+    ScreenPtr pScreen = pPicture->pDrawable->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
+
+    DMX_UNWRAP(DestroyPicture, dmxScreen, ps);
+
+    /* Destroy picture on back-end server */
+    if (dmxBEFreePicture(pPicture))
+        dmxSync(dmxScreen, FALSE);
+
+#if 1
+    if (ps->DestroyPicture)
+        ps->DestroyPicture(pPicture);
+#endif
+    DMX_WRAP(DestroyPicture, dmxDestroyPicture, dmxScreen, ps);
+}
+
+/** Change the picture's list of clip rectangles. */
+int
+dmxChangePictureClip(PicturePtr pPicture, int clipType, pointer value, int n)
+{
+    ScreenPtr pScreen = pPicture->pDrawable->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
+    dmxPictPrivPtr pPictPriv = DMX_GET_PICT_PRIV(pPicture);
+
+    DMX_UNWRAP(ChangePictureClip, dmxScreen, ps);
+#if 1
+    if (ps->ChangePictureClip)
+        ps->ChangePictureClip(pPicture, clipType, value, n);
+#endif
+
+    /* Change picture clip rects on back-end server */
+    if (pPictPriv->pict) {
+        /* The clip has already been changed into a region by the mi
+         * routine called above.
+         */
+        if (clipType == CT_NONE) {
+            /* Disable clipping, show all */
+            XFixesSetPictureClipRegion(dmxScreen->beDisplay,
+                                       pPictPriv->pict, 0, 0, None);
+        }
+        else if (pPicture->clientClip) {
+            RegionPtr pClip = pPicture->clientClip;
+            BoxPtr pBox = RegionRects(pClip);
+            int nBox = RegionNumRects(pClip);
+            XRectangle *pRects;
+            XRectangle *pRect;
+            int nRects;
+
+            nRects = nBox;
+            pRects = pRect = malloc(nRects * sizeof(*pRect));
+
+            while (nBox--) {
+                pRect->x = pBox->x1;
+                pRect->y = pBox->y1;
+                pRect->width = pBox->x2 - pBox->x1;
+                pRect->height = pBox->y2 - pBox->y1;
+                pBox++;
+                pRect++;
+            }
+
+            XRenderSetPictureClipRectangles(dmxScreen->beDisplay,
+                                            pPictPriv->pict,
+                                            0, 0, pRects, nRects);
+            free(pRects);
+        }
+        else {
+            XRenderSetPictureClipRectangles(dmxScreen->beDisplay,
+                                            pPictPriv->pict, 0, 0, NULL, 0);
+        }
+        dmxSync(dmxScreen, FALSE);
+    }
+    else {
+        /* FIXME: Handle saving clip region when offscreen */
+    }
+
+    DMX_WRAP(ChangePictureClip, dmxChangePictureClip, dmxScreen, ps);
+
+    return Success;
+}
+
+/** Destroy the picture's list of clip rectangles. */
+void
+dmxDestroyPictureClip(PicturePtr pPicture)
+{
+    ScreenPtr pScreen = pPicture->pDrawable->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
+    dmxPictPrivPtr pPictPriv = DMX_GET_PICT_PRIV(pPicture);
+
+    DMX_UNWRAP(DestroyPictureClip, dmxScreen, ps);
+#if 1
+    if (ps->DestroyPictureClip)
+        ps->DestroyPictureClip(pPicture);
+#endif
+
+    /* Destroy picture clip rects on back-end server */
+    if (pPictPriv->pict) {
+        XRenderSetPictureClipRectangles(dmxScreen->beDisplay,
+                                        pPictPriv->pict, 0, 0, NULL, 0);
+        dmxSync(dmxScreen, FALSE);
+    }
+    else {
+        /* FIXME: Handle destroying clip region when offscreen */
+    }
+
+    DMX_WRAP(DestroyPictureClip, dmxDestroyPictureClip, dmxScreen, ps);
+}
+
+/** Change the attributes of the pictures.  If the picture has not yet
+ *  been created due to lazy window creation, save the mask so that it
+ *  can be used to appropriately initialize the picture's attributes
+ *  when it is created later. */
+void
+dmxChangePicture(PicturePtr pPicture, Mask mask)
+{
+    ScreenPtr pScreen = pPicture->pDrawable->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
+    dmxPictPrivPtr pPictPriv = DMX_GET_PICT_PRIV(pPicture);
+
+    DMX_UNWRAP(ChangePicture, dmxScreen, ps);
+#if 1
+    if (ps->ChangePicture)
+        ps->ChangePicture(pPicture, mask);
+#endif
+
+    /* Picture attribute changes are handled in ValidatePicture */
+    pPictPriv->savedMask |= mask;
+
+    DMX_WRAP(ChangePicture, dmxChangePicture, dmxScreen, ps);
+}
+
+/** Validate the picture's attributes before rendering to it.  Update
+ *  any picture attributes that have been changed by one of the higher
+ *  layers. */
+void
+dmxValidatePicture(PicturePtr pPicture, Mask mask)
+{
+    ScreenPtr pScreen = pPicture->pDrawable->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
+    dmxPictPrivPtr pPictPriv = DMX_GET_PICT_PRIV(pPicture);
+
+    DMX_UNWRAP(ValidatePicture, dmxScreen, ps);
+
+    /* Change picture attributes on back-end server */
+    if (pPictPriv->pict) {
+        XRenderPictureAttributes attribs;
+
+        if (mask & CPRepeat) {
+            attribs.repeat = pPicture->repeatType;
+        }
+        if (mask & CPAlphaMap) {
+            if (pPicture->alphaMap) {
+                dmxPictPrivPtr pAlphaPriv;
+
+                pAlphaPriv = DMX_GET_PICT_PRIV(pPicture->alphaMap);
+                if (pAlphaPriv->pict) {
+                    attribs.alpha_map = pAlphaPriv->pict;
+                }
+                else {
+                    /* FIXME: alpha picture drawable has not been created?? */
+                    return;     /* or should this be: attribs.alpha_map = None; */
+                }
+            }
+            else {
+                attribs.alpha_map = None;
+            }
+        }
+        if (mask & CPAlphaXOrigin)
+            attribs.alpha_x_origin = pPicture->alphaOrigin.x;
+        if (mask & CPAlphaYOrigin)
+            attribs.alpha_y_origin = pPicture->alphaOrigin.y;
+        if (mask & CPClipXOrigin)
+            attribs.clip_x_origin = pPicture->clipOrigin.x;
+        if (mask & CPClipYOrigin)
+            attribs.clip_y_origin = pPicture->clipOrigin.y;
+        if (mask & CPClipMask)
+            mask &= ~CPClipMask;        /* Handled in ChangePictureClip */
+        if (mask & CPGraphicsExposure)
+            attribs.graphics_exposures = pPicture->graphicsExposures;
+        if (mask & CPSubwindowMode)
+            attribs.subwindow_mode = pPicture->subWindowMode;
+        if (mask & CPPolyEdge)
+            attribs.poly_edge = pPicture->polyEdge;
+        if (mask & CPPolyMode)
+            attribs.poly_mode = pPicture->polyMode;
+        if (mask & CPComponentAlpha)
+            attribs.component_alpha = pPicture->componentAlpha;
+
+        XRenderChangePicture(dmxScreen->beDisplay, pPictPriv->pict,
+                             mask, &attribs);
+        dmxSync(dmxScreen, FALSE);
+    }
+    else {
+        pPictPriv->savedMask |= mask;
+    }
+
+#if 1
+    if (ps->ValidatePicture)
+        ps->ValidatePicture(pPicture, mask);
+#endif
+
+    DMX_WRAP(ValidatePicture, dmxValidatePicture, dmxScreen, ps);
+}
+
+/** Composite a picture on the appropriate screen by combining the
+ *  specified rectangle of the transformed src and mask operands with
+ *  the specified rectangle of the dst using op as the compositing
+ *  operator.  For a complete description see the protocol document of
+ *  the RENDER library. */
+void
+dmxComposite(CARD8 op,
+             PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
+             INT16 xSrc, INT16 ySrc,
+             INT16 xMask, INT16 yMask,
+             INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
+{
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
+    dmxPictPrivPtr pSrcPriv = DMX_GET_PICT_PRIV(pSrc);
+    dmxPictPrivPtr pMaskPriv = NULL;
+    dmxPictPrivPtr pDstPriv = DMX_GET_PICT_PRIV(pDst);
+
+    if (pMask)
+        pMaskPriv = DMX_GET_PICT_PRIV(pMask);
+
+    DMX_UNWRAP(Composite, dmxScreen, ps);
+#if 0
+    if (ps->Composite)
+        ps->Composite(op, pSrc, pMask, pDst,
+                      xSrc, ySrc, xMask, yMask, xDst, yDst, width, height);
+#endif
+
+    /* Composite on back-end server */
+    if (pSrcPriv->pict && pDstPriv->pict &&
+        ((pMaskPriv && pMaskPriv->pict) || !pMaskPriv)) {
+        XRenderComposite(dmxScreen->beDisplay,
+                         op,
+                         pSrcPriv->pict,
+                         pMaskPriv ? pMaskPriv->pict : None,
+                         pDstPriv->pict,
+                         xSrc, ySrc, xMask, yMask, xDst, yDst, width, height);
+        dmxSync(dmxScreen, FALSE);
+    }
+
+    DMX_WRAP(Composite, dmxComposite, dmxScreen, ps);
+}
+
+/** Null function to catch when/if RENDER calls lower level mi hooks.
+ *  Compositing glyphs is handled by dmxProcRenderCompositeGlyphs().
+ *  This function should never be called. */
+void
+dmxGlyphs(CARD8 op,
+          PicturePtr pSrc, PicturePtr pDst,
+          PictFormatPtr maskFormat,
+          INT16 xSrc, INT16 ySrc,
+          int nlists, GlyphListPtr lists, GlyphPtr * glyphs)
+{
+    /* This won't work, so we need to wrap ProcRenderCompositeGlyphs */
+}
+
+/** Fill a rectangle on the appropriate screen by combining the color
+ *  with the dest picture in the area specified by the list of
+ *  rectangles.  For a complete description see the protocol document of
+ *  the RENDER library. */
+void
+dmxCompositeRects(CARD8 op,
+                  PicturePtr pDst,
+                  xRenderColor * color, int nRect, xRectangle *rects)
+{
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
+    dmxPictPrivPtr pPictPriv = DMX_GET_PICT_PRIV(pDst);
+
+    DMX_UNWRAP(CompositeRects, dmxScreen, ps);
+#if 0
+    if (ps->CompositeRects)
+        ps->CompositeRects(op, pDst, color, nRect, rects);
+#endif
+
+    /* CompositeRects on back-end server */
+    if (pPictPriv->pict) {
+        XRenderFillRectangles(dmxScreen->beDisplay,
+                              op,
+                              pPictPriv->pict,
+                              (XRenderColor *) color,
+                              (XRectangle *) rects, nRect);
+        dmxSync(dmxScreen, FALSE);
+    }
+
+    DMX_WRAP(CompositeRects, dmxCompositeRects, dmxScreen, ps);
+}
+
+/** Indexed color visuals are not yet supported. */
+Bool
+dmxInitIndexed(ScreenPtr pScreen, PictFormatPtr pFormat)
+{
+    return TRUE;
+}
+
+/** Indexed color visuals are not yet supported. */
+void
+dmxCloseIndexed(ScreenPtr pScreen, PictFormatPtr pFormat)
+{
+}
+
+/** Indexed color visuals are not yet supported. */
+void
+dmxUpdateIndexed(ScreenPtr pScreen, PictFormatPtr pFormat,
+                 int ndef, xColorItem * pdef)
+{
+}
+
+/** Composite a list of trapezoids on the appropriate screen.  For a
+ *  complete description see the protocol document of the RENDER
+ *  library. */
+void
+dmxTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+              PictFormatPtr maskFormat,
+              INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps)
+{
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
+    dmxPictPrivPtr pSrcPriv = DMX_GET_PICT_PRIV(pSrc);
+    dmxPictPrivPtr pDstPriv = DMX_GET_PICT_PRIV(pDst);
+
+    DMX_UNWRAP(Trapezoids, dmxScreen, ps);
+#if 0
+    if (ps->Trapezoids)
+        ps->Trapezoids(op, pSrc, pDst, maskFormat, xSrc, ySrc, ntrap, *traps);
+#endif
+
+    /* Draw trapezoids on back-end server */
+    if (pDstPriv->pict) {
+        XRenderPictFormat *pFormat;
+
+        pFormat = dmxFindFormat(dmxScreen, maskFormat);
+        if (!pFormat) {
+            /* FIXME: Error! */
+        }
+
+        XRenderCompositeTrapezoids(dmxScreen->beDisplay,
+                                   op,
+                                   pSrcPriv->pict,
+                                   pDstPriv->pict,
+                                   pFormat,
+                                   xSrc, ySrc, (XTrapezoid *) traps, ntrap);
+        dmxSync(dmxScreen, FALSE);
+    }
+
+    DMX_WRAP(Trapezoids, dmxTrapezoids, dmxScreen, ps);
+}
+
+/** Composite a list of triangles on the appropriate screen.  For a
+ *  complete description see the protocol document of the RENDER
+ *  library. */
+void
+dmxTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+             PictFormatPtr maskFormat,
+             INT16 xSrc, INT16 ySrc, int ntri, xTriangle * tris)
+{
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
+    dmxPictPrivPtr pSrcPriv = DMX_GET_PICT_PRIV(pSrc);
+    dmxPictPrivPtr pDstPriv = DMX_GET_PICT_PRIV(pDst);
+
+    DMX_UNWRAP(Triangles, dmxScreen, ps);
+#if 0
+    if (ps->Triangles)
+        ps->Triangles(op, pSrc, pDst, maskFormat, xSrc, ySrc, ntri, *tris);
+#endif
+
+    /* Draw trapezoids on back-end server */
+    if (pDstPriv->pict) {
+        XRenderPictFormat *pFormat;
+
+        pFormat = dmxFindFormat(dmxScreen, maskFormat);
+        if (!pFormat) {
+            /* FIXME: Error! */
+        }
+
+        XRenderCompositeTriangles(dmxScreen->beDisplay,
+                                  op,
+                                  pSrcPriv->pict,
+                                  pDstPriv->pict,
+                                  pFormat,
+                                  xSrc, ySrc, (XTriangle *) tris, ntri);
+        dmxSync(dmxScreen, FALSE);
+    }
+
+    DMX_WRAP(Triangles, dmxTriangles, dmxScreen, ps);
+}
diff --git a/xorg-server/hw/dmx/dmxpict.h b/xorg-server/hw/dmx/dmxpict.h
index f1d8c1f52..6c37be924 100644
--- a/xorg-server/hw/dmx/dmxpict.h
+++ b/xorg-server/hw/dmx/dmxpict.h
@@ -1,120 +1,116 @@
-/*

- * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Kevin E. Martin <kem@redhat.com>

- *

- */

-

-/** \file

- *  This file provides access to the externally visible RENDER support

- *  functions, global variables and macros for DMX.

- *  

- *  FIXME: Move function definitions for non-externally visible function

- *  to .c file. */

-

-#ifndef DMXPICT_H

-#define DMXPICT_H

-

-/** Picture private structure */

-typedef struct _dmxPictPriv {

-    Picture  pict;		/**< Picture ID from back-end server */

-    Mask     savedMask;         /**< Mask of picture attributes saved for

-				 *   lazy window creation. */

-} dmxPictPrivRec, *dmxPictPrivPtr;

-

-

-/** Glyph Set private structure */

-typedef struct _dmxGlyphPriv {

-    GlyphSet  *glyphSets; /**< Glyph Set IDs from back-end server */

-} dmxGlyphPrivRec, *dmxGlyphPrivPtr;

-

-

-extern void dmxInitRender(void);

-extern void dmxResetRender(void);

-

-extern Bool dmxPictureInit(ScreenPtr pScreen,

-			   PictFormatPtr formats, int nformats);

-

-extern void dmxCreatePictureList(WindowPtr pWindow);

-extern Bool dmxDestroyPictureList(WindowPtr pWindow);

-

-extern int dmxCreatePicture(PicturePtr pPicture);

-extern void dmxDestroyPicture(PicturePtr pPicture);

-extern int dmxChangePictureClip(PicturePtr pPicture, int clipType,

-				pointer value, int n);

-extern void dmxDestroyPictureClip(PicturePtr pPicture);

-extern void dmxChangePicture(PicturePtr pPicture, Mask mask);

-extern void dmxValidatePicture(PicturePtr pPicture, Mask mask);

-extern void dmxComposite(CARD8 op,

-			 PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,

-			 INT16 xSrc, INT16 ySrc,

-			 INT16 xMask, INT16 yMask,

-			 INT16 xDst, INT16 yDst,

-			 CARD16 width, CARD16 height);

-extern void dmxGlyphs(CARD8 op,

-		      PicturePtr pSrc, PicturePtr pDst,

-		      PictFormatPtr maskFormat,

-		      INT16 xSrc, INT16 ySrc,

-		      int nlists, GlyphListPtr lists, GlyphPtr *glyphs);

-extern void dmxCompositeRects(CARD8 op,

-			      PicturePtr pDst,

-			      xRenderColor *color,

-			      int nRect, xRectangle *rects);

-extern Bool dmxInitIndexed(ScreenPtr pScreen, PictFormatPtr pFormat);

-extern void dmxCloseIndexed(ScreenPtr pScreen, PictFormatPtr pFormat);

-extern void dmxUpdateIndexed(ScreenPtr pScreen, PictFormatPtr pFormat,

-			     int ndef, xColorItem *pdef);

-extern void dmxTrapezoids(CARD8 op,

-			  PicturePtr pSrc, PicturePtr pDst,

-			  PictFormatPtr maskFormat,

-			  INT16 xSrc, INT16 ySrc,

-			  int ntrap, xTrapezoid *traps);

-extern void dmxTriangles(CARD8 op,

-			 PicturePtr pSrc, PicturePtr pDst,

-			 PictFormatPtr maskFormat,

-			 INT16 xSrc, INT16 ySrc,

-			 int ntri, xTriangle *tris);

-

-extern int dmxBECreateGlyphSet(int idx, GlyphSetPtr glyphSet);

-extern Bool dmxBEFreeGlyphSet(ScreenPtr pScreen, GlyphSetPtr glyphSet);

-extern int dmxBECreatePicture(PicturePtr pPicture);

-extern Bool dmxBEFreePicture(PicturePtr pPicture);

-

-/** Get the picture private data given a picture pointer */

-#define DMX_GET_PICT_PRIV(_pPict)					\

-    (dmxPictPrivPtr)dixLookupPrivate(&(_pPict)->devPrivates, dmxPictPrivateKey)

-

-/** Set the glyphset private data given a glyphset pointer */

-#define DMX_SET_GLYPH_PRIV(_pGlyph, _pPriv)				\

-    GlyphSetSetPrivate((_pGlyph), dmxGlyphSetPrivateKey, (_pPriv))

-/** Get the glyphset private data given a glyphset pointer */

-#define DMX_GET_GLYPH_PRIV(_pGlyph)					\

-    (dmxGlyphPrivPtr)GlyphSetGetPrivate((_pGlyph), dmxGlyphSetPrivateKey)

-

-#endif /* DMXPICT_H */

+/*
+ * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+/** \file
+ *  This file provides access to the externally visible RENDER support
+ *  functions, global variables and macros for DMX.
+ *  
+ *  FIXME: Move function definitions for non-externally visible function
+ *  to .c file. */
+
+#ifndef DMXPICT_H
+#define DMXPICT_H
+
+/** Picture private structure */
+typedef struct _dmxPictPriv {
+    Picture pict;               /**< Picture ID from back-end server */
+    Mask savedMask;             /**< Mask of picture attributes saved for
+				 *   lazy window creation. */
+} dmxPictPrivRec, *dmxPictPrivPtr;
+
+/** Glyph Set private structure */
+typedef struct _dmxGlyphPriv {
+    GlyphSet *glyphSets;  /**< Glyph Set IDs from back-end server */
+} dmxGlyphPrivRec, *dmxGlyphPrivPtr;
+
+extern void dmxInitRender(void);
+extern void dmxResetRender(void);
+
+extern Bool dmxPictureInit(ScreenPtr pScreen,
+                           PictFormatPtr formats, int nformats);
+
+extern void dmxCreatePictureList(WindowPtr pWindow);
+extern Bool dmxDestroyPictureList(WindowPtr pWindow);
+
+extern int dmxCreatePicture(PicturePtr pPicture);
+extern void dmxDestroyPicture(PicturePtr pPicture);
+extern int dmxChangePictureClip(PicturePtr pPicture, int clipType,
+                                pointer value, int n);
+extern void dmxDestroyPictureClip(PicturePtr pPicture);
+extern void dmxChangePicture(PicturePtr pPicture, Mask mask);
+extern void dmxValidatePicture(PicturePtr pPicture, Mask mask);
+extern void dmxComposite(CARD8 op,
+                         PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
+                         INT16 xSrc, INT16 ySrc,
+                         INT16 xMask, INT16 yMask,
+                         INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
+extern void dmxGlyphs(CARD8 op,
+                      PicturePtr pSrc, PicturePtr pDst,
+                      PictFormatPtr maskFormat,
+                      INT16 xSrc, INT16 ySrc,
+                      int nlists, GlyphListPtr lists, GlyphPtr * glyphs);
+extern void dmxCompositeRects(CARD8 op,
+                              PicturePtr pDst,
+                              xRenderColor * color,
+                              int nRect, xRectangle *rects);
+extern Bool dmxInitIndexed(ScreenPtr pScreen, PictFormatPtr pFormat);
+extern void dmxCloseIndexed(ScreenPtr pScreen, PictFormatPtr pFormat);
+extern void dmxUpdateIndexed(ScreenPtr pScreen, PictFormatPtr pFormat,
+                             int ndef, xColorItem * pdef);
+extern void dmxTrapezoids(CARD8 op,
+                          PicturePtr pSrc, PicturePtr pDst,
+                          PictFormatPtr maskFormat,
+                          INT16 xSrc, INT16 ySrc,
+                          int ntrap, xTrapezoid * traps);
+extern void dmxTriangles(CARD8 op,
+                         PicturePtr pSrc, PicturePtr pDst,
+                         PictFormatPtr maskFormat,
+                         INT16 xSrc, INT16 ySrc, int ntri, xTriangle * tris);
+
+extern int dmxBECreateGlyphSet(int idx, GlyphSetPtr glyphSet);
+extern Bool dmxBEFreeGlyphSet(ScreenPtr pScreen, GlyphSetPtr glyphSet);
+extern int dmxBECreatePicture(PicturePtr pPicture);
+extern Bool dmxBEFreePicture(PicturePtr pPicture);
+
+/** Get the picture private data given a picture pointer */
+#define DMX_GET_PICT_PRIV(_pPict)					\
+    (dmxPictPrivPtr)dixLookupPrivate(&(_pPict)->devPrivates, dmxPictPrivateKey)
+
+/** Set the glyphset private data given a glyphset pointer */
+#define DMX_SET_GLYPH_PRIV(_pGlyph, _pPriv)				\
+    GlyphSetSetPrivate((_pGlyph), dmxGlyphSetPrivateKey, (_pPriv))
+/** Get the glyphset private data given a glyphset pointer */
+#define DMX_GET_GLYPH_PRIV(_pGlyph)					\
+    (dmxGlyphPrivPtr)GlyphSetGetPrivate((_pGlyph), dmxGlyphSetPrivateKey)
+
+#endif                          /* DMXPICT_H */
diff --git a/xorg-server/hw/dmx/dmxpixmap.c b/xorg-server/hw/dmx/dmxpixmap.c
index 119dd1134..17aca9224 100644
--- a/xorg-server/hw/dmx/dmxpixmap.c
+++ b/xorg-server/hw/dmx/dmxpixmap.c
@@ -1,251 +1,262 @@
-/*

- * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Kevin E. Martin <kem@redhat.com>

- *

- */

-

-/** \file

- * Provides pixmap support. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxsync.h"

-#include "dmxpixmap.h"

-

-#include "pixmapstr.h"

-#include "servermd.h"

-#include "privates.h"

-

-/** Initialize a private area in \a pScreen for pixmap information. */

-Bool dmxInitPixmap(ScreenPtr pScreen)

-{

-    if (!dixRegisterPrivateKey(&dmxPixPrivateKeyRec, PRIVATE_PIXMAP, sizeof(dmxPixPrivRec)))

-	return FALSE;

-

-    return TRUE;

-}

-

-/** Create a pixmap on the back-end server. */

-void dmxBECreatePixmap(PixmapPtr pPixmap)

-{

-    ScreenPtr      pScreen   = pPixmap->drawable.pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxPixPrivPtr  pPixPriv  = DMX_GET_PIXMAP_PRIV(pPixmap);

-

-    /* Make sure we haven't already created this pixmap.  This can

-     * happen when the pixmap is used elsewhere (e.g., as a background

-     * or border for a window) and the refcnt > 1.

-     */

-    if (pPixPriv->pixmap)

-	return;

-

-    if (pPixmap->drawable.width && pPixmap->drawable.height) {

-	pPixPriv->pixmap = XCreatePixmap(dmxScreen->beDisplay,

-					 dmxScreen->scrnWin,

-					 pPixmap->drawable.width,

-					 pPixmap->drawable.height,

-					 pPixmap->drawable.depth);

-	dmxSync(dmxScreen, FALSE);

-    }

-}

-

-/** Create a pixmap for \a pScreen with the specified \a width, \a

- *  height, and \a depth. */

-PixmapPtr dmxCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,

-			  unsigned usage_hint)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    PixmapPtr      pPixmap;

-    int            bpp;

-    dmxPixPrivPtr  pPixPriv;

-

-#if 0

-    DMX_UNWRAP(CreatePixmap, dmxScreen, pScreen);

-    if (pScreen->CreatePixmap)

-	ret = pScreen->CreatePixmap(pPixmap);

-#endif

-

-    /* Create pixmap on back-end server */

-    if (depth == 24) bpp = 32;

-    else             bpp = depth;

-

-    pPixmap = AllocatePixmap(pScreen, 0);

-    if (!pPixmap)

-	return NullPixmap;

-

-    pPixmap->drawable.type = DRAWABLE_PIXMAP;

-    pPixmap->drawable.class = 0;

-    pPixmap->drawable.pScreen = pScreen;

-    pPixmap->drawable.depth = depth;

-    pPixmap->drawable.bitsPerPixel = bpp;

-    pPixmap->drawable.id = 0;

-    pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;

-    pPixmap->drawable.x = 0;

-    pPixmap->drawable.y = 0;

-    pPixmap->drawable.width = width;

-    pPixmap->drawable.height = height;

-    pPixmap->devKind = PixmapBytePad(width, bpp);

-    pPixmap->refcnt = 1;

-    pPixmap->usage_hint = usage_hint;

-

-    pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);

-    pPixPriv->pixmap = (Pixmap)0;

-    pPixPriv->detachedImage = NULL;

-

-    /* Create the pixmap on the back-end server */

-    if (dmxScreen->beDisplay) {

-	dmxBECreatePixmap(pPixmap);

-    }

-

-#if 0

-    DMX_WRAP(CreatePixmap, dmxCreatePixmap, dmxScreen, pScreen);

-#endif

-

-    return pPixmap;

-}

-

-/** Destroy the pixmap on the back-end server. */

-Bool dmxBEFreePixmap(PixmapPtr pPixmap)

-{

-    ScreenPtr      pScreen = pPixmap->drawable.pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);

-

-    if (pPixPriv->pixmap) {

-	XFreePixmap(dmxScreen->beDisplay, pPixPriv->pixmap);

-	pPixPriv->pixmap = (Pixmap)0;

-	return TRUE;

-    }

-

-    return FALSE;

-}

-

-/** Destroy the pixmap pointed to by \a pPixmap. */

-Bool dmxDestroyPixmap(PixmapPtr pPixmap)

-{

-    ScreenPtr      pScreen = pPixmap->drawable.pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    Bool           ret = TRUE;

-

-#if 0

-    DMX_UNWRAP(DestroyPixmap, dmxScreen, pScreen);

-#endif

-

-    if (--pPixmap->refcnt)

-	return TRUE;

-

-    /* Destroy pixmap on back-end server */

-    if (dmxScreen->beDisplay) {

-	if (dmxBEFreePixmap(pPixmap)) {

-	    /* Also make sure that we destroy any detached image */

-	    dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);

-	    if (pPixPriv->detachedImage)

-		XDestroyImage(pPixPriv->detachedImage);

-	    dmxSync(dmxScreen, FALSE);

-	}

-    }

-    FreePixmap(pPixmap);

-

-#if 0

-    if (pScreen->DestroyPixmap)

-	ret = pScreen->DestroyPixmap(pPixmap);

-    DMX_WRAP(DestroyPixmap, dmxDestroyPixmap, dmxScreen, pScreen);

-#endif

-

-    return ret;

-}

-

-/** Create and return a region based on the pixmap pointed to by \a

- *  pPixmap. */

-RegionPtr dmxBitmapToRegion(PixmapPtr pPixmap)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[pPixmap->drawable.pScreen->myNum];

-    dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);

-    XImage        *ximage;

-    RegionPtr      pReg, pTmpReg;

-    int            x, y;

-    unsigned long  previousPixel, currentPixel;

-    BoxRec         Box;

-    Bool           overlap;

-  

-    if (!dmxScreen->beDisplay) {

-	pReg = RegionCreate(NullBox, 1);

-	return pReg;

-    }

-

-    ximage = XGetImage(dmxScreen->beDisplay, pPixPriv->pixmap, 0, 0,

-		       pPixmap->drawable.width, pPixmap->drawable.height,

-		       1, XYPixmap);

-

-    pReg = RegionCreate(NullBox, 1);

-    pTmpReg = RegionCreate(NullBox, 1);

-    if(!pReg || !pTmpReg) {

-	XDestroyImage(ximage);

-	return NullRegion;

-    }

-

-    for (y = 0; y < pPixmap->drawable.height; y++) {

-	Box.y1 = y;

-	Box.y2 = y + 1;

-	previousPixel = 0L;

-	for (x = 0; x < pPixmap->drawable.width; x++) {

-	    currentPixel = XGetPixel(ximage, x, y);

-	    if (previousPixel != currentPixel) {

-		if (previousPixel == 0L) { 

-		    /* left edge */

-		    Box.x1 = x;

-		} else if (currentPixel == 0L) {

-		    /* right edge */

-		    Box.x2 = x;

-		    RegionReset(pTmpReg, &Box);

-		    RegionAppend(pReg, pTmpReg);

-		}

-		previousPixel = currentPixel;

-	    }

-	}

-	if (previousPixel != 0L) {

-	    /* right edge because of the end of pixmap */

-	    Box.x2 = pPixmap->drawable.width;

-	    RegionReset(pTmpReg, &Box);

-	    RegionAppend(pReg, pTmpReg);

-	}

-    }

-  

-    RegionDestroy(pTmpReg);

-    XDestroyImage(ximage);

-

-    RegionValidate(pReg, &overlap);

-

-    dmxSync(dmxScreen, FALSE);

-    return pReg;

-}

+/*
+ * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+/** \file
+ * Provides pixmap support. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxpixmap.h"
+
+#include "pixmapstr.h"
+#include "servermd.h"
+#include "privates.h"
+
+/** Initialize a private area in \a pScreen for pixmap information. */
+Bool
+dmxInitPixmap(ScreenPtr pScreen)
+{
+    if (!dixRegisterPrivateKey
+        (&dmxPixPrivateKeyRec, PRIVATE_PIXMAP, sizeof(dmxPixPrivRec)))
+        return FALSE;
+
+    return TRUE;
+}
+
+/** Create a pixmap on the back-end server. */
+void
+dmxBECreatePixmap(PixmapPtr pPixmap)
+{
+    ScreenPtr pScreen = pPixmap->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+
+    /* Make sure we haven't already created this pixmap.  This can
+     * happen when the pixmap is used elsewhere (e.g., as a background
+     * or border for a window) and the refcnt > 1.
+     */
+    if (pPixPriv->pixmap)
+        return;
+
+    if (pPixmap->drawable.width && pPixmap->drawable.height) {
+        pPixPriv->pixmap = XCreatePixmap(dmxScreen->beDisplay,
+                                         dmxScreen->scrnWin,
+                                         pPixmap->drawable.width,
+                                         pPixmap->drawable.height,
+                                         pPixmap->drawable.depth);
+        dmxSync(dmxScreen, FALSE);
+    }
+}
+
+/** Create a pixmap for \a pScreen with the specified \a width, \a
+ *  height, and \a depth. */
+PixmapPtr
+dmxCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
+                unsigned usage_hint)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PixmapPtr pPixmap;
+    int bpp;
+    dmxPixPrivPtr pPixPriv;
+
+#if 0
+    DMX_UNWRAP(CreatePixmap, dmxScreen, pScreen);
+    if (pScreen->CreatePixmap)
+        ret = pScreen->CreatePixmap(pPixmap);
+#endif
+
+    /* Create pixmap on back-end server */
+    if (depth == 24)
+        bpp = 32;
+    else
+        bpp = depth;
+
+    pPixmap = AllocatePixmap(pScreen, 0);
+    if (!pPixmap)
+        return NullPixmap;
+
+    pPixmap->drawable.type = DRAWABLE_PIXMAP;
+    pPixmap->drawable.class = 0;
+    pPixmap->drawable.pScreen = pScreen;
+    pPixmap->drawable.depth = depth;
+    pPixmap->drawable.bitsPerPixel = bpp;
+    pPixmap->drawable.id = 0;
+    pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+    pPixmap->drawable.x = 0;
+    pPixmap->drawable.y = 0;
+    pPixmap->drawable.width = width;
+    pPixmap->drawable.height = height;
+    pPixmap->devKind = PixmapBytePad(width, bpp);
+    pPixmap->refcnt = 1;
+    pPixmap->usage_hint = usage_hint;
+
+    pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+    pPixPriv->pixmap = (Pixmap) 0;
+    pPixPriv->detachedImage = NULL;
+
+    /* Create the pixmap on the back-end server */
+    if (dmxScreen->beDisplay) {
+        dmxBECreatePixmap(pPixmap);
+    }
+
+#if 0
+    DMX_WRAP(CreatePixmap, dmxCreatePixmap, dmxScreen, pScreen);
+#endif
+
+    return pPixmap;
+}
+
+/** Destroy the pixmap on the back-end server. */
+Bool
+dmxBEFreePixmap(PixmapPtr pPixmap)
+{
+    ScreenPtr pScreen = pPixmap->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+
+    if (pPixPriv->pixmap) {
+        XFreePixmap(dmxScreen->beDisplay, pPixPriv->pixmap);
+        pPixPriv->pixmap = (Pixmap) 0;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+/** Destroy the pixmap pointed to by \a pPixmap. */
+Bool
+dmxDestroyPixmap(PixmapPtr pPixmap)
+{
+    ScreenPtr pScreen = pPixmap->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    Bool ret = TRUE;
+
+#if 0
+    DMX_UNWRAP(DestroyPixmap, dmxScreen, pScreen);
+#endif
+
+    if (--pPixmap->refcnt)
+        return TRUE;
+
+    /* Destroy pixmap on back-end server */
+    if (dmxScreen->beDisplay) {
+        if (dmxBEFreePixmap(pPixmap)) {
+            /* Also make sure that we destroy any detached image */
+            dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+
+            if (pPixPriv->detachedImage)
+                XDestroyImage(pPixPriv->detachedImage);
+            dmxSync(dmxScreen, FALSE);
+        }
+    }
+    FreePixmap(pPixmap);
+
+#if 0
+    if (pScreen->DestroyPixmap)
+        ret = pScreen->DestroyPixmap(pPixmap);
+    DMX_WRAP(DestroyPixmap, dmxDestroyPixmap, dmxScreen, pScreen);
+#endif
+
+    return ret;
+}
+
+/** Create and return a region based on the pixmap pointed to by \a
+ *  pPixmap. */
+RegionPtr
+dmxBitmapToRegion(PixmapPtr pPixmap)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pPixmap->drawable.pScreen->myNum];
+    dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+    XImage *ximage;
+    RegionPtr pReg, pTmpReg;
+    int x, y;
+    unsigned long previousPixel, currentPixel;
+    BoxRec Box;
+    Bool overlap;
+
+    if (!dmxScreen->beDisplay) {
+        pReg = RegionCreate(NullBox, 1);
+        return pReg;
+    }
+
+    ximage = XGetImage(dmxScreen->beDisplay, pPixPriv->pixmap, 0, 0,
+                       pPixmap->drawable.width, pPixmap->drawable.height,
+                       1, XYPixmap);
+
+    pReg = RegionCreate(NullBox, 1);
+    pTmpReg = RegionCreate(NullBox, 1);
+    if (!pReg || !pTmpReg) {
+        XDestroyImage(ximage);
+        return NullRegion;
+    }
+
+    for (y = 0; y < pPixmap->drawable.height; y++) {
+        Box.y1 = y;
+        Box.y2 = y + 1;
+        previousPixel = 0L;
+        for (x = 0; x < pPixmap->drawable.width; x++) {
+            currentPixel = XGetPixel(ximage, x, y);
+            if (previousPixel != currentPixel) {
+                if (previousPixel == 0L) {
+                    /* left edge */
+                    Box.x1 = x;
+                }
+                else if (currentPixel == 0L) {
+                    /* right edge */
+                    Box.x2 = x;
+                    RegionReset(pTmpReg, &Box);
+                    RegionAppend(pReg, pTmpReg);
+                }
+                previousPixel = currentPixel;
+            }
+        }
+        if (previousPixel != 0L) {
+            /* right edge because of the end of pixmap */
+            Box.x2 = pPixmap->drawable.width;
+            RegionReset(pTmpReg, &Box);
+            RegionAppend(pReg, pTmpReg);
+        }
+    }
+
+    RegionDestroy(pTmpReg);
+    XDestroyImage(ximage);
+
+    RegionValidate(pReg, &overlap);
+
+    dmxSync(dmxScreen, FALSE);
+    return pReg;
+}
diff --git a/xorg-server/hw/dmx/dmxprop.c b/xorg-server/hw/dmx/dmxprop.c
index b4695dd5d..4be2dbd4c 100644
--- a/xorg-server/hw/dmx/dmxprop.c
+++ b/xorg-server/hw/dmx/dmxprop.c
@@ -62,7 +62,7 @@
 #include "dmx.h"
 #include "dmxprop.h"
 #include "dmxlog.h"
-#include <X11/Xmu/SysUtil.h>        /* For XmuGetHostname */
+#include <X11/Xmu/SysUtil.h>    /* For XmuGetHostname */
 
 /** Holds the window id of all DMX windows on the backend X server. */
 #define DMX_ATOMNAME "DMX_NAME"
@@ -72,95 +72,108 @@
 
 extern char *display;
 
-static int dmxPropertyErrorHandler(Display *dpy, XErrorEvent *ev)
+static int
+dmxPropertyErrorHandler(Display * dpy, XErrorEvent * ev)
 {
     return 0;
 }
 
-static const unsigned char *dmxPropertyIdentifier(void)
+static const unsigned char *
+dmxPropertyIdentifier(void)
 {
-                                /* RATS: These buffers are only used in
-                                 * length-limited calls. */
-    char          hostname[256];
-    static char   buf[128];
-    static int    initialized = 0;
-
-    if (initialized++) return (unsigned char *)buf;
-    
+    /* RATS: These buffers are only used in
+     * length-limited calls. */
+    char hostname[256];
+    static char buf[128];
+    static int initialized = 0;
+
+    if (initialized++)
+        return (unsigned char *) buf;
+
     XmuGetHostname(hostname, sizeof(hostname));
     snprintf(buf, sizeof(buf), "%s:%s:%s", DMX_IDENT, hostname, display);
-    return (unsigned char *)buf;
+    return (unsigned char *) buf;
 }
 
 /** Starting with the \a start screen, iterate over all of the screens
  * on the same physical X server as \a start, calling \a f with the
  * screen and the \a closure.  (The common case is that \a start is the
  * only DMX window on the backend X server.) */
-void *dmxPropertyIterate(DMXScreenInfo *start,
-                         void *(*f)(DMXScreenInfo *dmxScreen, void *),
-                         void *closure)
+void *
+dmxPropertyIterate(DMXScreenInfo * start,
+                   void *(*f) (DMXScreenInfo * dmxScreen, void *),
+                   void *closure)
 {
     DMXScreenInfo *pt;
 
     if (!start->next) {
-        if (!start->beDisplay) return NULL;
+        if (!start->beDisplay)
+            return NULL;
         return f(start, closure);
     }
 
-    for (pt = start->next; /* condition at end of loop */; pt = pt->next) {
+    for (pt = start->next; /* condition at end of loop */ ; pt = pt->next) {
         void *retval;
+
         /* beDisplay ban be NULL if a screen was detached */
         dmxLog(dmxDebug, "pt = %p\n", pt);
         dmxLog(dmxDebug, "pt->beDisplay = %p\n", pt->beDisplay);
-        if (pt->beDisplay && (retval = f(pt, closure))) return retval;
-        if (pt == start) break;
+        if (pt->beDisplay && (retval = f(pt, closure)))
+            return retval;
+        if (pt == start)
+            break;
     }
     return NULL;
 }
 
 /** Returns 0 if this is the only Xdmx session on the display; 1
  * otherwise. */
-static int dmxPropertyCheckOtherServers(DMXScreenInfo *dmxScreen, Atom atom)
+static int
+dmxPropertyCheckOtherServers(DMXScreenInfo * dmxScreen, Atom atom)
 {
-    Display       *dpy    = dmxScreen->beDisplay;
+    Display *dpy = dmxScreen->beDisplay;
     XTextProperty tp;
     XTextProperty tproot;
-    const char    *pt;
-    int           retcode = 0;
-    char          **list  = NULL;
-    int           count   = 0;
-    int           i;
-    int           (*dmxOldHandler)(Display *, XErrorEvent *);
+    const char *pt;
+    int retcode = 0;
+    char **list = NULL;
+    int count = 0;
+    int i;
+    int (*dmxOldHandler) (Display *, XErrorEvent *);
 
     if (!dpy)
-	return 0;
-
-    if (!XGetTextProperty(dpy, RootWindow(dpy,0), &tproot, atom)
-        || !tproot.nitems) return 0;
-    
-                                /* Ignore BadWindow errors for this
-                                 * routine because the window id stored
-                                 * in the property might be old */
+        return 0;
+
+    if (!XGetTextProperty(dpy, RootWindow(dpy, 0), &tproot, atom)
+        || !tproot.nitems)
+        return 0;
+
+    /* Ignore BadWindow errors for this
+     * routine because the window id stored
+     * in the property might be old */
     dmxOldHandler = XSetErrorHandler(dmxPropertyErrorHandler);
-    for (pt = (const char *)tproot.value; pt && *pt; pt = pt ? pt + 1 : NULL) {
+    for (pt = (const char *) tproot.value; pt && *pt; pt = pt ? pt + 1 : NULL) {
         if ((pt = strchr(pt, ','))) {
-            Window win = strtol(pt+1, NULL, 10);
+            Window win = strtol(pt + 1, NULL, 10);
+
             if (XGetTextProperty(dpy, win, &tp, atom) && tp.nitems) {
-                if (!strncmp((char *)tp.value, DMX_IDENT, strlen(DMX_IDENT))) {
+                if (!strncmp((char *) tp.value, DMX_IDENT, strlen(DMX_IDENT))) {
                     int flag = 0;
+
                     for (i = 0; i < count; i++)
-                        if (!strcmp(list[i], (char *)tp.value)) {
+                        if (!strcmp(list[i], (char *) tp.value)) {
                             ++flag;
                             break;
                         }
-                    if (flag) continue;
+                    if (flag)
+                        continue;
                     ++retcode;
                     dmxLogOutputWarning(dmxScreen,
                                         "%s also running on %s\n",
                                         tp.value, dmxScreen->name);
                     list = realloc(list, ++count * sizeof(*list));
-                    list[count-1] = malloc(tp.nitems + 2);
-                    strncpy(list[count-1], (char *)tp.value, tp.nitems + 1);
+                    list[count - 1] = malloc(tp.nitems + 2);
+                    strncpy(list[count - 1], (char *) tp.value, tp.nitems + 1);
                 }
                 XFree(tp.value);
             }
@@ -168,7 +181,8 @@ static int dmxPropertyCheckOtherServers(DMXScreenInfo *dmxScreen, Atom atom)
     }
     XSetErrorHandler(dmxOldHandler);
 
-    for (i = 0; i < count; i++) free(list[i]);
+    for (i = 0; i < count; i++)
+        free(list[i]);
     free(list);
     XFree(tproot.value);
     if (!retcode)
@@ -179,40 +193,45 @@ static int dmxPropertyCheckOtherServers(DMXScreenInfo *dmxScreen, Atom atom)
 /** Returns NULL if this is the only Xdmx window on the display.
  * Otherwise, returns a pointer to the dmxScreen of the other windows on
  * the display. */
-static DMXScreenInfo *dmxPropertyCheckOtherWindows(DMXScreenInfo *dmxScreen,
-                                                   Atom atom)
+static DMXScreenInfo *
+dmxPropertyCheckOtherWindows(DMXScreenInfo * dmxScreen, Atom atom)
 {
-    Display             *dpy = dmxScreen->beDisplay;
-    const unsigned char *id  = dmxPropertyIdentifier();
-    XTextProperty       tproot;
-    XTextProperty       tp;
-    const char          *pt;
-    int                 (*dmxOldHandler)(Display *, XErrorEvent *);
+    Display *dpy = dmxScreen->beDisplay;
+    const unsigned char *id = dmxPropertyIdentifier();
+    XTextProperty tproot;
+    XTextProperty tp;
+    const char *pt;
+    int (*dmxOldHandler) (Display *, XErrorEvent *);
 
     if (!dpy)
-	return NULL;
+        return NULL;
 
-    if (!XGetTextProperty(dpy, RootWindow(dpy,0), &tproot, atom)
-        || !tproot.nitems) return 0;
+    if (!XGetTextProperty(dpy, RootWindow(dpy, 0), &tproot, atom)
+        || !tproot.nitems)
+        return 0;
 
-                                /* Ignore BadWindow errors for this
-                                 * routine because the window id stored
-                                 * in the property might be old */
+    /* Ignore BadWindow errors for this
+     * routine because the window id stored
+     * in the property might be old */
     dmxOldHandler = XSetErrorHandler(dmxPropertyErrorHandler);
-    for (pt = (const char *)tproot.value; pt && *pt; pt = pt ? pt + 1 : NULL) {
+    for (pt = (const char *) tproot.value; pt && *pt; pt = pt ? pt + 1 : NULL) {
         if ((pt = strchr(pt, ','))) {
-            Window win = strtol(pt+1, NULL, 10);
+            Window win = strtol(pt + 1, NULL, 10);
+
             if (XGetTextProperty(dpy, win, &tp, atom) && tp.nitems) {
-                dmxLog(dmxDebug,"On %s/%lu: %s\n",
+                dmxLog(dmxDebug, "On %s/%lu: %s\n",
                        dmxScreen->name, win, tp.value);
-                if (!strncmp((char *)tp.value, (char *)id,
-                             strlen((char *)id))) {
+                if (!strncmp((char *) tp.value, (char *) id,
+                             strlen((char *) id))) {
                     int idx;
-                    
-                    if (!(pt = strchr((char *)tp.value, ','))) continue;
-                    idx = strtol(pt+1, NULL, 10);
-                    if (idx < 0 || idx >= dmxNumScreens) continue;
-                    if (dmxScreens[idx].scrnWin != win) continue;
+
+                    if (!(pt = strchr((char *) tp.value, ',')))
+                        continue;
+                    idx = strtol(pt + 1, NULL, 10);
+                    if (idx < 0 || idx >= dmxNumScreens)
+                        continue;
+                    if (dmxScreens[idx].scrnWin != win)
+                        continue;
                     XSetErrorHandler(dmxOldHandler);
                     return &dmxScreens[idx];
                 }
@@ -227,22 +246,23 @@ static DMXScreenInfo *dmxPropertyCheckOtherWindows(DMXScreenInfo *dmxScreen,
 
 /** Returns 0 if this is the only Xdmx session on the display; 1
  * otherwise. */
-int dmxPropertyDisplay(DMXScreenInfo *dmxScreen)
+int
+dmxPropertyDisplay(DMXScreenInfo * dmxScreen)
 {
-    Atom                atom;
-    const unsigned char *id  = dmxPropertyIdentifier();
-    Display             *dpy = dmxScreen->beDisplay;
+    Atom atom;
+    const unsigned char *id = dmxPropertyIdentifier();
+    Display *dpy = dmxScreen->beDisplay;
 
     if (!dpy)
-	return 0;
+        return 0;
 
     atom = XInternAtom(dpy, DMX_ATOMNAME, False);
     if (dmxPropertyCheckOtherServers(dmxScreen, atom)) {
         dmxScreen->shared = 1;
         return 1;
     }
-    XChangeProperty(dpy, RootWindow(dpy,0), atom, XA_STRING, 8,
-                    PropModeReplace, id, strlen((char *)id));
+    XChangeProperty(dpy, RootWindow(dpy, 0), atom, XA_STRING, 8,
+                    PropModeReplace, id, strlen((char *) id));
     return 0;
 }
 
@@ -251,18 +271,19 @@ int dmxPropertyDisplay(DMXScreenInfo *dmxScreen)
  * names because there can be multiple synonyms for the same display,
  * some of which cannot be determined without accessing the display
  * itself (e.g., domain aliases or machines with multiple NICs). */
-int dmxPropertySameDisplay(DMXScreenInfo *dmxScreen, const char *name)
+int
+dmxPropertySameDisplay(DMXScreenInfo * dmxScreen, const char *name)
 {
-    Display             *dpy0  = dmxScreen->beDisplay;
-    Atom                atom0;
-    XTextProperty       tp0;
-    Display             *dpy1  = NULL;
-    Atom                atom1;
-    XTextProperty       tp1;
-    int                 retval = 0;
+    Display *dpy0 = dmxScreen->beDisplay;
+    Atom atom0;
+    XTextProperty tp0;
+    Display *dpy1 = NULL;
+    Atom atom1;
+    XTextProperty tp1;
+    int retval = 0;
 
     if (!dpy0)
-	return 0;
+        return 0;
 
     tp0.nitems = 0;
     tp1.nitems = 0;
@@ -271,7 +292,7 @@ int dmxPropertySameDisplay(DMXScreenInfo *dmxScreen, const char *name)
         dmxLog(dmxWarning, "No atom on %s\n", dmxScreen->name);
         return 0;
     }
-    if (!XGetTextProperty(dpy0, RootWindow(dpy0,0), &tp0, atom0)
+    if (!XGetTextProperty(dpy0, RootWindow(dpy0, 0), &tp0, atom0)
         || !tp0.nitems) {
         dmxLog(dmxWarning, "No text property on %s\n", dmxScreen->name);
         return 0;
@@ -286,17 +307,21 @@ int dmxPropertySameDisplay(DMXScreenInfo *dmxScreen, const char *name)
         dmxLog(dmxDebug, "No atom on %s\n", name);
         goto cleanup;
     }
-    if (!XGetTextProperty(dpy1, RootWindow(dpy1,0), &tp1, atom1)
+    if (!XGetTextProperty(dpy1, RootWindow(dpy1, 0), &tp1, atom1)
         || !tp1.nitems) {
         dmxLog(dmxDebug, "No text property on %s\n", name);
         goto cleanup;
     }
-    if (!strcmp((char *)tp0.value, (char *)tp1.value)) retval = 1;
-
-  cleanup:
-    if (tp0.nitems) XFree(tp0.value);
-    if (tp1.nitems) XFree(tp1.value);
-    if (dpy1)       XCloseDisplay(dpy1);
+    if (!strcmp((char *) tp0.value, (char *) tp1.value))
+        retval = 1;
+
+ cleanup:
+    if (tp0.nitems)
+        XFree(tp0.value);
+    if (tp1.nitems)
+        XFree(tp1.value);
+    if (dpy1)
+        XCloseDisplay(dpy1);
     return retval;
 }
 
@@ -313,36 +338,38 @@ int dmxPropertySameDisplay(DMXScreenInfo *dmxScreen, const char *name)
  *
  * "#DMX_IDENT:<hostname running DMX>:<display name of DMX>,<screen number>"
  */
-void dmxPropertyWindow(DMXScreenInfo *dmxScreen)
+void
+dmxPropertyWindow(DMXScreenInfo * dmxScreen)
 {
-    Atom                atom;
-    const unsigned char *id  = dmxPropertyIdentifier();
-    Display             *dpy = dmxScreen->beDisplay;
-    Window              win  = dmxScreen->scrnWin;
-    DMXScreenInfo       *other;
-    char                buf[128]; /* RATS: only used with snprintf */
+    Atom atom;
+    const unsigned char *id = dmxPropertyIdentifier();
+    Display *dpy = dmxScreen->beDisplay;
+    Window win = dmxScreen->scrnWin;
+    DMXScreenInfo *other;
+    char buf[128];              /* RATS: only used with snprintf */
 
     if (!dpy)
-	return; /* FIXME: What should be done here if Xdmx is started
-		 * with this screen initially detached?
-		 */
+        return;                 /* FIXME: What should be done here if Xdmx is started
+                                 * with this screen initially detached?
+                                 */
 
     atom = XInternAtom(dpy, DMX_ATOMNAME, False);
     if ((other = dmxPropertyCheckOtherWindows(dmxScreen, atom))) {
         DMXScreenInfo *tmp = dmxScreen->next;
-        dmxScreen->next    = (other->next ? other->next : other);
-        other->next        = (tmp         ? tmp         : dmxScreen);
+
+        dmxScreen->next = (other->next ? other->next : other);
+        other->next = (tmp ? tmp : dmxScreen);
         dmxLog(dmxDebug, "%d/%s/%lu and %d/%s/%lu are on the same backend\n",
                dmxScreen->index, dmxScreen->name, dmxScreen->scrnWin,
                other->index, other->name, other->scrnWin);
     }
 
     snprintf(buf, sizeof(buf), ".%d,%lu", dmxScreen->index,
-                (long unsigned)win);
-    XChangeProperty(dpy, RootWindow(dpy,0), atom, XA_STRING, 8,
-                    PropModeAppend, (unsigned char *)buf, strlen(buf));
+             (long unsigned) win);
+    XChangeProperty(dpy, RootWindow(dpy, 0), atom, XA_STRING, 8,
+                    PropModeAppend, (unsigned char *) buf, strlen(buf));
 
     snprintf(buf, sizeof(buf), "%s,%d", id, dmxScreen->index);
     XChangeProperty(dpy, win, atom, XA_STRING, 8,
-                    PropModeAppend, (unsigned char *)buf, strlen(buf));
+                    PropModeAppend, (unsigned char *) buf, strlen(buf));
 }
diff --git a/xorg-server/hw/dmx/dmxprop.h b/xorg-server/hw/dmx/dmxprop.h
index 50135cd64..a1170520f 100644
--- a/xorg-server/hw/dmx/dmxprop.h
+++ b/xorg-server/hw/dmx/dmxprop.h
@@ -36,11 +36,10 @@
 
 #ifndef _DMXPROP_H_
 #define _DMXPROP_H_
-extern int  dmxPropertyDisplay(DMXScreenInfo *dmxScreen);
-extern void dmxPropertyWindow(DMXScreenInfo *dmxScreen);
-extern void *dmxPropertyIterate(DMXScreenInfo *start,
-                                void *(*f)(DMXScreenInfo *dmxScreen,
-                                           void *closure),
-                                void *closure);
-extern int dmxPropertySameDisplay(DMXScreenInfo *dmxScreen, const char *name);
+extern int dmxPropertyDisplay(DMXScreenInfo * dmxScreen);
+extern void dmxPropertyWindow(DMXScreenInfo * dmxScreen);
+extern void *dmxPropertyIterate(DMXScreenInfo * start,
+                                void *(*f) (DMXScreenInfo * dmxScreen,
+                                            void *closure), void *closure);
+extern int dmxPropertySameDisplay(DMXScreenInfo * dmxScreen, const char *name);
 #endif
diff --git a/xorg-server/hw/dmx/dmxscrinit.c b/xorg-server/hw/dmx/dmxscrinit.c
index 8582d2ceb..37b3f3b5a 100644
--- a/xorg-server/hw/dmx/dmxscrinit.c
+++ b/xorg-server/hw/dmx/dmxscrinit.c
@@ -1,522 +1,525 @@
-/*

- * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Kevin E. Martin <kem@redhat.com>

- *   David H. Dawes <dawes@xfree86.org>

- *

- */

-

-/** \file

- * This file provides support for screen initialization. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxsync.h"

-#include "dmxshadow.h"

-#include "dmxscrinit.h"

-#include "dmxcursor.h"

-#include "dmxgc.h"

-#include "dmxgcops.h"

-#include "dmxwindow.h"

-#include "dmxpixmap.h"

-#include "dmxfont.h"

-#include "dmxcmap.h"

-#include "dmxprop.h"

-#include "dmxdpms.h"

-

-#include "dmxpict.h"

-

-#include "fb.h"

-#include "mipointer.h"

-#include "micmap.h"

-

-extern Bool dmxCloseScreen(int idx, ScreenPtr pScreen);

-static Bool dmxSaveScreen(ScreenPtr pScreen, int what);

-

-static unsigned long dmxGeneration;

-static unsigned long *dmxCursorGeneration;

-

-DevPrivateKeyRec dmxGCPrivateKeyRec;

-DevPrivateKeyRec dmxWinPrivateKeyRec;

-DevPrivateKeyRec dmxPixPrivateKeyRec;

-int dmxFontPrivateIndex;        /**< Private index for Fonts     */

-DevPrivateKeyRec dmxScreenPrivateKeyRec;

-DevPrivateKeyRec dmxColormapPrivateKeyRec;

-DevPrivateKeyRec dmxPictPrivateKeyRec;

-DevPrivateKeyRec dmxGlyphSetPrivateKeyRec;

-

-/** Initialize the parts of screen \a idx that require access to the

- *  back-end server. */

-void dmxBEScreenInit(int idx, ScreenPtr pScreen)

-{

-    DMXScreenInfo        *dmxScreen = &dmxScreens[idx];

-    XSetWindowAttributes  attribs;

-    XGCValues             gcvals;

-    unsigned long         mask;

-    int                   i, j;

-

-    /* FIXME: The dmxScreenInit() code currently assumes that it will

-     * not be called if the Xdmx server is started with this screen

-     * detached -- i.e., it assumes that dmxScreen->beDisplay is always

-     * valid.  This is not necessarily a valid assumption when full

-     * addition/removal of screens is implemented, but when this code is

-     * broken out for screen reattachment, then we will reevaluate this

-     * assumption.

-     */

-

-    pScreen->mmWidth = DisplayWidthMM(dmxScreen->beDisplay, 

-				      DefaultScreen(dmxScreen->beDisplay));

-    pScreen->mmHeight = DisplayHeightMM(dmxScreen->beDisplay, 

-					DefaultScreen(dmxScreen->beDisplay));

-

-    pScreen->whitePixel = dmxScreen->beWhitePixel;

-    pScreen->blackPixel = dmxScreen->beBlackPixel;

-

-    /* Handle screen savers and DPMS on the backend */

-    dmxDPMSInit(dmxScreen);

-

-    /* Create root window for screen */

-    mask = CWBackPixel | CWEventMask | CWColormap | CWOverrideRedirect;

-    attribs.background_pixel = dmxScreen->beBlackPixel;

-    attribs.event_mask = (KeyPressMask

-                          | KeyReleaseMask

-                          | ButtonPressMask

-                          | ButtonReleaseMask

-                          | EnterWindowMask

-                          | LeaveWindowMask

-                          | PointerMotionMask

-                          | KeymapStateMask

-                          | FocusChangeMask);

-    attribs.colormap = dmxScreen->beDefColormaps[dmxScreen->beDefVisualIndex];

-    attribs.override_redirect = True;

-    

-    dmxScreen->scrnWin =

-	XCreateWindow(dmxScreen->beDisplay, 

-		      DefaultRootWindow(dmxScreen->beDisplay),

-		      dmxScreen->scrnX,

-		      dmxScreen->scrnY,

-		      dmxScreen->scrnWidth,

-		      dmxScreen->scrnHeight,

-		      0,

-		      pScreen->rootDepth,

-		      InputOutput,

-		      dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual,

-		      mask,

-		      &attribs);

-    dmxPropertyWindow(dmxScreen);

-

-    /*

-     * This turns off the cursor by defining a cursor with no visible

-     * components.

-     */

-    {

-	char noCursorData[] = {0, 0, 0, 0,

-			       0, 0, 0, 0};

-	Pixmap pixmap;

-	XColor color, tmp;

-

-	pixmap = XCreateBitmapFromData(dmxScreen->beDisplay, dmxScreen->scrnWin,

-				       noCursorData, 8, 8);

-	XAllocNamedColor(dmxScreen->beDisplay, dmxScreen->beDefColormaps[0],

-			 "black", &color, &tmp);

-	dmxScreen->noCursor = XCreatePixmapCursor(dmxScreen->beDisplay,

-						  pixmap, pixmap,

-						  &color, &color, 0, 0);

-	XDefineCursor(dmxScreen->beDisplay, dmxScreen->scrnWin,

-		      dmxScreen->noCursor);

-

-	XFreePixmap(dmxScreen->beDisplay, pixmap);

-    }

-

-    XMapWindow(dmxScreen->beDisplay, dmxScreen->scrnWin);

-

-    if (dmxShadowFB) {

-	mask = (GCFunction

-		| GCPlaneMask

-		| GCClipMask);

-	gcvals.function = GXcopy;

-	gcvals.plane_mask = AllPlanes;

-	gcvals.clip_mask = None;

-

-	dmxScreen->shadowGC = XCreateGC(dmxScreen->beDisplay,

-					dmxScreen->scrnWin,

-					mask, &gcvals);

-

-	dmxScreen->shadowFBImage =

-	    XCreateImage(dmxScreen->beDisplay,

-			 dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual,

-			 dmxScreen->beDepth,

-			 ZPixmap,

-			 0,

-			 (char *)dmxScreen->shadow,

-			 dmxScreen->scrnWidth, dmxScreen->scrnHeight,

-			 dmxScreen->beBPP,

-			 PixmapBytePad(dmxScreen->scrnWidth,

-				       dmxScreen->beBPP));

-    } else {

-	/* Create default drawables (used during GC creation) */

-	for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) 

-	    for (j = 0; j < dmxScreen->beNumDepths; j++)

-		if ((dmxScreen->bePixmapFormats[i].depth == 1) ||

-		    (dmxScreen->bePixmapFormats[i].depth ==

-		     dmxScreen->beDepths[j])) {

-		    dmxScreen->scrnDefDrawables[i] = (Drawable)

-			XCreatePixmap(dmxScreen->beDisplay, dmxScreen->scrnWin,

-				      1, 1, dmxScreen->bePixmapFormats[i].depth);

-		    break;

-		}

-    }

-}

-

-/** Initialize screen number \a idx. */

-Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])

-{

-    DMXScreenInfo        *dmxScreen = &dmxScreens[idx];

-    int                   i, j;

-

-    if (!dixRegisterPrivateKey(&dmxScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-    if (!dixRegisterPrivateKey(&dmxColormapPrivateKeyRec, PRIVATE_COLORMAP, 0))

-	return FALSE;

-    if (!dixRegisterPrivateKey(&dmxGlyphSetPrivateKeyRec, PRIVATE_GLYPHSET, 0))

-	return FALSE;

-

-    if (dmxGeneration != serverGeneration) {

-	/* Allocate font private index */

-	dmxFontPrivateIndex = AllocateFontPrivateIndex();

-	if (dmxFontPrivateIndex == -1)

-	    return FALSE;

-

-	dmxGeneration = serverGeneration;

-    }

-

-    if (dmxShadowFB) {

-	dmxScreen->shadow = shadowAlloc(dmxScreen->scrnWidth,

-					dmxScreen->scrnHeight,

-					dmxScreen->beBPP);

-    } else {

-	if (!dmxInitGC(pScreen)) return FALSE;

-	if (!dmxInitWindow(pScreen)) return FALSE;

-	if (!dmxInitPixmap(pScreen)) return FALSE;

-    }

-

-    /*

-     * Initalise the visual types.  miSetVisualTypesAndMasks() requires

-     * that all of the types for each depth be collected together.  It's

-     * intended for slightly different usage to what we would like here.

-     * Maybe a miAddVisualTypeAndMask() function will be added to make

-     * things easier here.

-     */

-    for (i = 0; i < dmxScreen->beNumDepths; i++) {

-	int    depth;

-	int    visuals        = 0;

-	int    bitsPerRgb     = 0;

-	int    preferredClass = -1;

-	Pixel  redMask        = 0;

-	Pixel  greenMask      = 0;

-	Pixel  blueMask       = 0;

-

-	depth = dmxScreen->beDepths[i];

-	for (j = 0; j < dmxScreen->beNumVisuals; j++) {

-	    XVisualInfo *vi;

-

-	    vi = &dmxScreen->beVisuals[j];

-	    if (vi->depth == depth) {

-		/* Assume the masks are all the same. */

-		visuals |= (1 << vi->class);

-		bitsPerRgb = vi->bits_per_rgb;

-		redMask = vi->red_mask;

-		greenMask = vi->green_mask;

-		blueMask = vi->blue_mask;

-		if (j == dmxScreen->beDefVisualIndex) {

-		    preferredClass = vi->class;

-		}

-	    }

-	}

-	miSetVisualTypesAndMasks(depth, visuals, bitsPerRgb, preferredClass,

-				 redMask, greenMask, blueMask);

-    }

-

-    fbScreenInit(pScreen,

-		 dmxShadowFB ? dmxScreen->shadow : NULL,

-		 dmxScreen->scrnWidth,

-		 dmxScreen->scrnHeight,

-		 dmxScreen->beXDPI,

-		 dmxScreen->beXDPI,

-		 dmxScreen->scrnWidth,

-		 dmxScreen->beBPP);

-    (void)dmxPictureInit(pScreen, 0, 0);

-

-    /* Not yet... */

-    pScreen->GetWindowPixmap = NULL;

-    pScreen->SetWindowPixmap = NULL;

-

-    if (dmxShadowFB && !shadowInit(pScreen, dmxShadowUpdateProc, NULL))

-	return FALSE;

-

-    if (dmxShadowFB) {

-	miDCInitialize(pScreen, &dmxPointerCursorFuncs);

-    } else {

-        MAXSCREENSALLOC(dmxCursorGeneration);

-	if (dmxCursorGeneration[idx] != serverGeneration) {

-	    if (!(miPointerInitialize(pScreen,

-				      &dmxPointerSpriteFuncs,

-				      &dmxPointerCursorFuncs,

-				      FALSE)))

-		return FALSE;

-

-	    dmxCursorGeneration[idx] = serverGeneration;

-	}

-    }

-

-    DMX_WRAP(CloseScreen, dmxCloseScreen, dmxScreen, pScreen);

-    DMX_WRAP(SaveScreen, dmxSaveScreen, dmxScreen, pScreen);

-

-    dmxBEScreenInit(idx, pScreen);

-

-    if (!dmxShadowFB) {

-	/* Wrap GC functions */

-	DMX_WRAP(CreateGC, dmxCreateGC, dmxScreen, pScreen);

-

-	/* Wrap Window functions */

-	DMX_WRAP(CreateWindow, dmxCreateWindow, dmxScreen, pScreen);

-	DMX_WRAP(DestroyWindow, dmxDestroyWindow, dmxScreen, pScreen);

-	DMX_WRAP(PositionWindow, dmxPositionWindow, dmxScreen, pScreen);

-	DMX_WRAP(ChangeWindowAttributes, dmxChangeWindowAttributes, dmxScreen,

-		 pScreen);

-	DMX_WRAP(RealizeWindow, dmxRealizeWindow, dmxScreen, pScreen);

-	DMX_WRAP(UnrealizeWindow, dmxUnrealizeWindow, dmxScreen, pScreen);

-	DMX_WRAP(RestackWindow, dmxRestackWindow, dmxScreen, pScreen);

-	DMX_WRAP(WindowExposures, dmxWindowExposures, dmxScreen, pScreen);

-	DMX_WRAP(CopyWindow, dmxCopyWindow, dmxScreen, pScreen);

-

-	DMX_WRAP(ResizeWindow, dmxResizeWindow, dmxScreen, pScreen);

-	DMX_WRAP(ReparentWindow, dmxReparentWindow, dmxScreen, pScreen);

-

-	DMX_WRAP(ChangeBorderWidth, dmxChangeBorderWidth, dmxScreen, pScreen);

-

-	/* Wrap Image functions */

-	DMX_WRAP(GetImage, dmxGetImage, dmxScreen, pScreen);

-	DMX_WRAP(GetSpans, dmxGetSpans, dmxScreen, pScreen);

-

-	/* Wrap Pixmap functions */

-	DMX_WRAP(CreatePixmap, dmxCreatePixmap, dmxScreen, pScreen);

-	DMX_WRAP(DestroyPixmap, dmxDestroyPixmap, dmxScreen, pScreen);

-	DMX_WRAP(BitmapToRegion, dmxBitmapToRegion, dmxScreen, pScreen);

-

-	/* Wrap Font functions */

-	DMX_WRAP(RealizeFont, dmxRealizeFont, dmxScreen, pScreen);

-	DMX_WRAP(UnrealizeFont, dmxUnrealizeFont, dmxScreen, pScreen);

-

-	/* Wrap Colormap functions */

-	DMX_WRAP(CreateColormap, dmxCreateColormap, dmxScreen, pScreen);

-	DMX_WRAP(DestroyColormap, dmxDestroyColormap, dmxScreen, pScreen);

-	DMX_WRAP(InstallColormap, dmxInstallColormap, dmxScreen, pScreen);

-	DMX_WRAP(StoreColors, dmxStoreColors, dmxScreen, pScreen);

-

-	/* Wrap Shape functions */

-	DMX_WRAP(SetShape, dmxSetShape, dmxScreen, pScreen);

-    }

-

-    if (!dmxCreateDefColormap(pScreen))

-	return FALSE;

-

-    return TRUE;

-}

-

-/** Close the \a pScreen resources on the back-end server. */

-void dmxBECloseScreen(ScreenPtr pScreen)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    int            i;

-

-    /* Restore the back-end screen-saver and DPMS state. */

-    dmxDPMSTerm(dmxScreen);

-

-    /* Free the screen resources */

-

-    XFreeCursor(dmxScreen->beDisplay, dmxScreen->noCursor);

-    dmxScreen->noCursor = (Cursor)0;

-

-    XUnmapWindow(dmxScreen->beDisplay, dmxScreen->scrnWin);

-    XDestroyWindow(dmxScreen->beDisplay, dmxScreen->scrnWin);

-    dmxScreen->scrnWin = (Window)0;

-

-    if (dmxShadowFB) {

-	/* Free the shadow GC and image assocated with the back-end server */

-	XFreeGC(dmxScreen->beDisplay, dmxScreen->shadowGC);

-	dmxScreen->shadowGC = NULL;

-	XFree(dmxScreen->shadowFBImage);

-	dmxScreen->shadowFBImage = NULL;

-    } else {

-	/* Free the default drawables */

-	for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {

-	    if (dmxScreen->scrnDefDrawables[i]) {

-		XFreePixmap(dmxScreen->beDisplay,

-			    dmxScreen->scrnDefDrawables[i]);

-		dmxScreen->scrnDefDrawables[i] = (Drawable)0;

-	    }

-	}

-    }

-

-    /* Free resources allocated during initialization (in dmxinit.c) */

-    for (i = 0; i < dmxScreen->beNumDefColormaps; i++)

-	XFreeColormap(dmxScreen->beDisplay, dmxScreen->beDefColormaps[i]);

-    free(dmxScreen->beDefColormaps);

-    dmxScreen->beDefColormaps = NULL;

-

-#if 0

-    /* Do not free visuals, depths and pixmap formats here.  Free them

-     * in dmxCloseScreen() instead -- see comment below. */

-    XFree(dmxScreen->beVisuals);

-    dmxScreen->beVisuals = NULL;

-

-    XFree(dmxScreen->beDepths);

-    dmxScreen->beDepths = NULL;

-

-    XFree(dmxScreen->bePixmapFormats);

-    dmxScreen->bePixmapFormats = NULL;

-#endif

-

-#ifdef GLXEXT

-    if (dmxScreen->glxVisuals) {

-	XFree(dmxScreen->glxVisuals);

-	dmxScreen->glxVisuals = NULL;

-	dmxScreen->numGlxVisuals = 0;

-    }

-#endif

-

-    /* Close display */

-    XCloseDisplay(dmxScreen->beDisplay);

-    dmxScreen->beDisplay = NULL;

-}

-

-/** Close screen number \a idx. */

-Bool dmxCloseScreen(int idx, ScreenPtr pScreen)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[idx];

-

-    /* Reset the proc vectors */

-    if (idx == 0) {

-	dmxResetRender();

-	dmxResetFonts();

-    }

-

-    if (dmxShadowFB) {

-	/* Free the shadow framebuffer */

-	free(dmxScreen->shadow);

-    } else {

-

-	/* Unwrap Shape functions */

-	DMX_UNWRAP(SetShape, dmxScreen, pScreen);

-

-	/* Unwrap the pScreen functions */

-	DMX_UNWRAP(CreateGC, dmxScreen, pScreen);

-

-	DMX_UNWRAP(CreateWindow, dmxScreen, pScreen);

-	DMX_UNWRAP(DestroyWindow, dmxScreen, pScreen);

-	DMX_UNWRAP(PositionWindow, dmxScreen, pScreen);

-	DMX_UNWRAP(ChangeWindowAttributes, dmxScreen, pScreen);

-	DMX_UNWRAP(RealizeWindow, dmxScreen, pScreen);

-	DMX_UNWRAP(UnrealizeWindow, dmxScreen, pScreen);

-	DMX_UNWRAP(RestackWindow, dmxScreen, pScreen);

-	DMX_UNWRAP(WindowExposures, dmxScreen, pScreen);

-	DMX_UNWRAP(CopyWindow, dmxScreen, pScreen);

-

-	DMX_UNWRAP(ResizeWindow, dmxScreen, pScreen);

-	DMX_UNWRAP(ReparentWindow, dmxScreen, pScreen);

-

-	DMX_UNWRAP(ChangeBorderWidth, dmxScreen, pScreen);

-

-	DMX_UNWRAP(GetImage, dmxScreen, pScreen);

-	DMX_UNWRAP(GetSpans, dmxScreen, pScreen);

-

-	DMX_UNWRAP(CreatePixmap, dmxScreen, pScreen);

-	DMX_UNWRAP(DestroyPixmap, dmxScreen, pScreen);

-	DMX_UNWRAP(BitmapToRegion, dmxScreen, pScreen);

-

-	DMX_UNWRAP(RealizeFont, dmxScreen, pScreen);

-	DMX_UNWRAP(UnrealizeFont, dmxScreen, pScreen);

-

-	DMX_UNWRAP(CreateColormap, dmxScreen, pScreen);

-	DMX_UNWRAP(DestroyColormap, dmxScreen, pScreen);

-	DMX_UNWRAP(InstallColormap, dmxScreen, pScreen);

-	DMX_UNWRAP(StoreColors, dmxScreen, pScreen);

-    }

-

-    DMX_UNWRAP(SaveScreen, dmxScreen, pScreen);

-

-    if (dmxScreen->beDisplay) {

-	dmxBECloseScreen(pScreen);

-

-#if 1

-	/* Free visuals, depths and pixmap formats here so that they

-	 * won't be freed when a screen is detached, thereby allowing

-	 * the screen to be reattached to be compared to the one

-	 * previously removed.

-	 */

-	XFree(dmxScreen->beVisuals);

-	dmxScreen->beVisuals = NULL;

-

-	XFree(dmxScreen->beDepths);

-	dmxScreen->beDepths = NULL;

-

-	XFree(dmxScreen->bePixmapFormats);

-	dmxScreen->bePixmapFormats = NULL;

-#endif

-    }

-

-    DMX_UNWRAP(CloseScreen, dmxScreen, pScreen);

-    return pScreen->CloseScreen(idx, pScreen);

-}

-

-static Bool dmxSaveScreen(ScreenPtr pScreen, int what)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-

-    if (dmxScreen->beDisplay) {

-	switch (what) {

-	case SCREEN_SAVER_OFF:

-	case SCREEN_SAVER_FORCER:

-	    XResetScreenSaver(dmxScreen->beDisplay);

-	    dmxSync(dmxScreen, FALSE);

-	    break;

-	case SCREEN_SAVER_ON:

-	case SCREEN_SAVER_CYCLE:

-	    XActivateScreenSaver(dmxScreen->beDisplay);

-	    dmxSync(dmxScreen, FALSE);

-	    break;

-	}

-    }

-

-    return TRUE;

-}

+/*
+ * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *   David H. Dawes <dawes@xfree86.org>
+ *
+ */
+
+/** \file
+ * This file provides support for screen initialization. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxshadow.h"
+#include "dmxscrinit.h"
+#include "dmxcursor.h"
+#include "dmxgc.h"
+#include "dmxgcops.h"
+#include "dmxwindow.h"
+#include "dmxpixmap.h"
+#include "dmxfont.h"
+#include "dmxcmap.h"
+#include "dmxprop.h"
+#include "dmxdpms.h"
+
+#include "dmxpict.h"
+
+#include "fb.h"
+#include "mipointer.h"
+#include "micmap.h"
+
+extern Bool dmxCloseScreen(int idx, ScreenPtr pScreen);
+static Bool dmxSaveScreen(ScreenPtr pScreen, int what);
+
+static unsigned long dmxGeneration;
+static unsigned long *dmxCursorGeneration;
+
+DevPrivateKeyRec dmxGCPrivateKeyRec;
+DevPrivateKeyRec dmxWinPrivateKeyRec;
+DevPrivateKeyRec dmxPixPrivateKeyRec;
+int dmxFontPrivateIndex;        /**< Private index for Fonts     */
+DevPrivateKeyRec dmxScreenPrivateKeyRec;
+DevPrivateKeyRec dmxColormapPrivateKeyRec;
+DevPrivateKeyRec dmxPictPrivateKeyRec;
+DevPrivateKeyRec dmxGlyphSetPrivateKeyRec;
+
+/** Initialize the parts of screen \a idx that require access to the
+ *  back-end server. */
+void
+dmxBEScreenInit(int idx, ScreenPtr pScreen)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+    XSetWindowAttributes attribs;
+    XGCValues gcvals;
+    unsigned long mask;
+    int i, j;
+
+    /* FIXME: The dmxScreenInit() code currently assumes that it will
+     * not be called if the Xdmx server is started with this screen
+     * detached -- i.e., it assumes that dmxScreen->beDisplay is always
+     * valid.  This is not necessarily a valid assumption when full
+     * addition/removal of screens is implemented, but when this code is
+     * broken out for screen reattachment, then we will reevaluate this
+     * assumption.
+     */
+
+    pScreen->mmWidth = DisplayWidthMM(dmxScreen->beDisplay,
+                                      DefaultScreen(dmxScreen->beDisplay));
+    pScreen->mmHeight = DisplayHeightMM(dmxScreen->beDisplay,
+                                        DefaultScreen(dmxScreen->beDisplay));
+
+    pScreen->whitePixel = dmxScreen->beWhitePixel;
+    pScreen->blackPixel = dmxScreen->beBlackPixel;
+
+    /* Handle screen savers and DPMS on the backend */
+    dmxDPMSInit(dmxScreen);
+
+    /* Create root window for screen */
+    mask = CWBackPixel | CWEventMask | CWColormap | CWOverrideRedirect;
+    attribs.background_pixel = dmxScreen->beBlackPixel;
+    attribs.event_mask = (KeyPressMask
+                          | KeyReleaseMask
+                          | ButtonPressMask
+                          | ButtonReleaseMask
+                          | EnterWindowMask
+                          | LeaveWindowMask
+                          | PointerMotionMask
+                          | KeymapStateMask | FocusChangeMask);
+    attribs.colormap = dmxScreen->beDefColormaps[dmxScreen->beDefVisualIndex];
+    attribs.override_redirect = True;
+
+    dmxScreen->scrnWin =
+        XCreateWindow(dmxScreen->beDisplay,
+                      DefaultRootWindow(dmxScreen->beDisplay),
+                      dmxScreen->scrnX,
+                      dmxScreen->scrnY,
+                      dmxScreen->scrnWidth,
+                      dmxScreen->scrnHeight,
+                      0,
+                      pScreen->rootDepth,
+                      InputOutput,
+                      dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual,
+                      mask, &attribs);
+    dmxPropertyWindow(dmxScreen);
+
+    /*
+     * This turns off the cursor by defining a cursor with no visible
+     * components.
+     */
+    {
+        char noCursorData[] = { 0, 0, 0, 0,
+            0, 0, 0, 0
+        };
+        Pixmap pixmap;
+        XColor color, tmp;
+
+        pixmap = XCreateBitmapFromData(dmxScreen->beDisplay, dmxScreen->scrnWin,
+                                       noCursorData, 8, 8);
+        XAllocNamedColor(dmxScreen->beDisplay, dmxScreen->beDefColormaps[0],
+                         "black", &color, &tmp);
+        dmxScreen->noCursor = XCreatePixmapCursor(dmxScreen->beDisplay,
+                                                  pixmap, pixmap,
+                                                  &color, &color, 0, 0);
+        XDefineCursor(dmxScreen->beDisplay, dmxScreen->scrnWin,
+                      dmxScreen->noCursor);
+
+        XFreePixmap(dmxScreen->beDisplay, pixmap);
+    }
+
+    XMapWindow(dmxScreen->beDisplay, dmxScreen->scrnWin);
+
+    if (dmxShadowFB) {
+        mask = (GCFunction | GCPlaneMask | GCClipMask);
+        gcvals.function = GXcopy;
+        gcvals.plane_mask = AllPlanes;
+        gcvals.clip_mask = None;
+
+        dmxScreen->shadowGC = XCreateGC(dmxScreen->beDisplay,
+                                        dmxScreen->scrnWin, mask, &gcvals);
+
+        dmxScreen->shadowFBImage =
+            XCreateImage(dmxScreen->beDisplay,
+                         dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].
+                         visual, dmxScreen->beDepth, ZPixmap, 0,
+                         (char *) dmxScreen->shadow, dmxScreen->scrnWidth,
+                         dmxScreen->scrnHeight, dmxScreen->beBPP,
+                         PixmapBytePad(dmxScreen->scrnWidth, dmxScreen->beBPP));
+    }
+    else {
+        /* Create default drawables (used during GC creation) */
+        for (i = 0; i < dmxScreen->beNumPixmapFormats; i++)
+            for (j = 0; j < dmxScreen->beNumDepths; j++)
+                if ((dmxScreen->bePixmapFormats[i].depth == 1) ||
+                    (dmxScreen->bePixmapFormats[i].depth ==
+                     dmxScreen->beDepths[j])) {
+                    dmxScreen->scrnDefDrawables[i] = (Drawable)
+                        XCreatePixmap(dmxScreen->beDisplay, dmxScreen->scrnWin,
+                                      1, 1,
+                                      dmxScreen->bePixmapFormats[i].depth);
+                    break;
+                }
+    }
+}
+
+/** Initialize screen number \a idx. */
+Bool
+dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+    int i, j;
+
+    if (!dixRegisterPrivateKey(&dmxScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
+        return FALSE;
+    if (!dixRegisterPrivateKey(&dmxColormapPrivateKeyRec, PRIVATE_COLORMAP, 0))
+        return FALSE;
+    if (!dixRegisterPrivateKey(&dmxGlyphSetPrivateKeyRec, PRIVATE_GLYPHSET, 0))
+        return FALSE;
+
+    if (dmxGeneration != serverGeneration) {
+        /* Allocate font private index */
+        dmxFontPrivateIndex = AllocateFontPrivateIndex();
+        if (dmxFontPrivateIndex == -1)
+            return FALSE;
+
+        dmxGeneration = serverGeneration;
+    }
+
+    if (dmxShadowFB) {
+        dmxScreen->shadow = shadowAlloc(dmxScreen->scrnWidth,
+                                        dmxScreen->scrnHeight,
+                                        dmxScreen->beBPP);
+    }
+    else {
+        if (!dmxInitGC(pScreen))
+            return FALSE;
+        if (!dmxInitWindow(pScreen))
+            return FALSE;
+        if (!dmxInitPixmap(pScreen))
+            return FALSE;
+    }
+
+    /*
+     * Initalise the visual types.  miSetVisualTypesAndMasks() requires
+     * that all of the types for each depth be collected together.  It's
+     * intended for slightly different usage to what we would like here.
+     * Maybe a miAddVisualTypeAndMask() function will be added to make
+     * things easier here.
+     */
+    for (i = 0; i < dmxScreen->beNumDepths; i++) {
+        int depth;
+        int visuals = 0;
+        int bitsPerRgb = 0;
+        int preferredClass = -1;
+        Pixel redMask = 0;
+        Pixel greenMask = 0;
+        Pixel blueMask = 0;
+
+        depth = dmxScreen->beDepths[i];
+        for (j = 0; j < dmxScreen->beNumVisuals; j++) {
+            XVisualInfo *vi;
+
+            vi = &dmxScreen->beVisuals[j];
+            if (vi->depth == depth) {
+                /* Assume the masks are all the same. */
+                visuals |= (1 << vi->class);
+                bitsPerRgb = vi->bits_per_rgb;
+                redMask = vi->red_mask;
+                greenMask = vi->green_mask;
+                blueMask = vi->blue_mask;
+                if (j == dmxScreen->beDefVisualIndex) {
+                    preferredClass = vi->class;
+                }
+            }
+        }
+        miSetVisualTypesAndMasks(depth, visuals, bitsPerRgb, preferredClass,
+                                 redMask, greenMask, blueMask);
+    }
+
+    fbScreenInit(pScreen,
+                 dmxShadowFB ? dmxScreen->shadow : NULL,
+                 dmxScreen->scrnWidth,
+                 dmxScreen->scrnHeight,
+                 dmxScreen->beXDPI,
+                 dmxScreen->beXDPI, dmxScreen->scrnWidth, dmxScreen->beBPP);
+    (void) dmxPictureInit(pScreen, 0, 0);
+
+    /* Not yet... */
+    pScreen->GetWindowPixmap = NULL;
+    pScreen->SetWindowPixmap = NULL;
+
+    if (dmxShadowFB && !shadowInit(pScreen, dmxShadowUpdateProc, NULL))
+        return FALSE;
+
+    if (dmxShadowFB) {
+        miDCInitialize(pScreen, &dmxPointerCursorFuncs);
+    }
+    else {
+        MAXSCREENSALLOC(dmxCursorGeneration);
+        if (dmxCursorGeneration[idx] != serverGeneration) {
+            if (!(miPointerInitialize(pScreen,
+                                      &dmxPointerSpriteFuncs,
+                                      &dmxPointerCursorFuncs, FALSE)))
+                return FALSE;
+
+            dmxCursorGeneration[idx] = serverGeneration;
+        }
+    }
+
+    DMX_WRAP(CloseScreen, dmxCloseScreen, dmxScreen, pScreen);
+    DMX_WRAP(SaveScreen, dmxSaveScreen, dmxScreen, pScreen);
+
+    dmxBEScreenInit(idx, pScreen);
+
+    if (!dmxShadowFB) {
+        /* Wrap GC functions */
+        DMX_WRAP(CreateGC, dmxCreateGC, dmxScreen, pScreen);
+
+        /* Wrap Window functions */
+        DMX_WRAP(CreateWindow, dmxCreateWindow, dmxScreen, pScreen);
+        DMX_WRAP(DestroyWindow, dmxDestroyWindow, dmxScreen, pScreen);
+        DMX_WRAP(PositionWindow, dmxPositionWindow, dmxScreen, pScreen);
+        DMX_WRAP(ChangeWindowAttributes, dmxChangeWindowAttributes, dmxScreen,
+                 pScreen);
+        DMX_WRAP(RealizeWindow, dmxRealizeWindow, dmxScreen, pScreen);
+        DMX_WRAP(UnrealizeWindow, dmxUnrealizeWindow, dmxScreen, pScreen);
+        DMX_WRAP(RestackWindow, dmxRestackWindow, dmxScreen, pScreen);
+        DMX_WRAP(WindowExposures, dmxWindowExposures, dmxScreen, pScreen);
+        DMX_WRAP(CopyWindow, dmxCopyWindow, dmxScreen, pScreen);
+
+        DMX_WRAP(ResizeWindow, dmxResizeWindow, dmxScreen, pScreen);
+        DMX_WRAP(ReparentWindow, dmxReparentWindow, dmxScreen, pScreen);
+
+        DMX_WRAP(ChangeBorderWidth, dmxChangeBorderWidth, dmxScreen, pScreen);
+
+        /* Wrap Image functions */
+        DMX_WRAP(GetImage, dmxGetImage, dmxScreen, pScreen);
+        DMX_WRAP(GetSpans, dmxGetSpans, dmxScreen, pScreen);
+
+        /* Wrap Pixmap functions */
+        DMX_WRAP(CreatePixmap, dmxCreatePixmap, dmxScreen, pScreen);
+        DMX_WRAP(DestroyPixmap, dmxDestroyPixmap, dmxScreen, pScreen);
+        DMX_WRAP(BitmapToRegion, dmxBitmapToRegion, dmxScreen, pScreen);
+
+        /* Wrap Font functions */
+        DMX_WRAP(RealizeFont, dmxRealizeFont, dmxScreen, pScreen);
+        DMX_WRAP(UnrealizeFont, dmxUnrealizeFont, dmxScreen, pScreen);
+
+        /* Wrap Colormap functions */
+        DMX_WRAP(CreateColormap, dmxCreateColormap, dmxScreen, pScreen);
+        DMX_WRAP(DestroyColormap, dmxDestroyColormap, dmxScreen, pScreen);
+        DMX_WRAP(InstallColormap, dmxInstallColormap, dmxScreen, pScreen);
+        DMX_WRAP(StoreColors, dmxStoreColors, dmxScreen, pScreen);
+
+        /* Wrap Shape functions */
+        DMX_WRAP(SetShape, dmxSetShape, dmxScreen, pScreen);
+    }
+
+    if (!dmxCreateDefColormap(pScreen))
+        return FALSE;
+
+    return TRUE;
+}
+
+/** Close the \a pScreen resources on the back-end server. */
+void
+dmxBECloseScreen(ScreenPtr pScreen)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    int i;
+
+    /* Restore the back-end screen-saver and DPMS state. */
+    dmxDPMSTerm(dmxScreen);
+
+    /* Free the screen resources */
+
+    XFreeCursor(dmxScreen->beDisplay, dmxScreen->noCursor);
+    dmxScreen->noCursor = (Cursor) 0;
+
+    XUnmapWindow(dmxScreen->beDisplay, dmxScreen->scrnWin);
+    XDestroyWindow(dmxScreen->beDisplay, dmxScreen->scrnWin);
+    dmxScreen->scrnWin = (Window) 0;
+
+    if (dmxShadowFB) {
+        /* Free the shadow GC and image assocated with the back-end server */
+        XFreeGC(dmxScreen->beDisplay, dmxScreen->shadowGC);
+        dmxScreen->shadowGC = NULL;
+        XFree(dmxScreen->shadowFBImage);
+        dmxScreen->shadowFBImage = NULL;
+    }
+    else {
+        /* Free the default drawables */
+        for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {
+            if (dmxScreen->scrnDefDrawables[i]) {
+                XFreePixmap(dmxScreen->beDisplay,
+                            dmxScreen->scrnDefDrawables[i]);
+                dmxScreen->scrnDefDrawables[i] = (Drawable) 0;
+            }
+        }
+    }
+
+    /* Free resources allocated during initialization (in dmxinit.c) */
+    for (i = 0; i < dmxScreen->beNumDefColormaps; i++)
+        XFreeColormap(dmxScreen->beDisplay, dmxScreen->beDefColormaps[i]);
+    free(dmxScreen->beDefColormaps);
+    dmxScreen->beDefColormaps = NULL;
+
+#if 0
+    /* Do not free visuals, depths and pixmap formats here.  Free them
+     * in dmxCloseScreen() instead -- see comment below. */
+    XFree(dmxScreen->beVisuals);
+    dmxScreen->beVisuals = NULL;
+
+    XFree(dmxScreen->beDepths);
+    dmxScreen->beDepths = NULL;
+
+    XFree(dmxScreen->bePixmapFormats);
+    dmxScreen->bePixmapFormats = NULL;
+#endif
+
+#ifdef GLXEXT
+    if (dmxScreen->glxVisuals) {
+        XFree(dmxScreen->glxVisuals);
+        dmxScreen->glxVisuals = NULL;
+        dmxScreen->numGlxVisuals = 0;
+    }
+#endif
+
+    /* Close display */
+    XCloseDisplay(dmxScreen->beDisplay);
+    dmxScreen->beDisplay = NULL;
+}
+
+/** Close screen number \a idx. */
+Bool
+dmxCloseScreen(int idx, ScreenPtr pScreen)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+
+    /* Reset the proc vectors */
+    if (idx == 0) {
+        dmxResetRender();
+        dmxResetFonts();
+    }
+
+    if (dmxShadowFB) {
+        /* Free the shadow framebuffer */
+        free(dmxScreen->shadow);
+    }
+    else {
+
+        /* Unwrap Shape functions */
+        DMX_UNWRAP(SetShape, dmxScreen, pScreen);
+
+        /* Unwrap the pScreen functions */
+        DMX_UNWRAP(CreateGC, dmxScreen, pScreen);
+
+        DMX_UNWRAP(CreateWindow, dmxScreen, pScreen);
+        DMX_UNWRAP(DestroyWindow, dmxScreen, pScreen);
+        DMX_UNWRAP(PositionWindow, dmxScreen, pScreen);
+        DMX_UNWRAP(ChangeWindowAttributes, dmxScreen, pScreen);
+        DMX_UNWRAP(RealizeWindow, dmxScreen, pScreen);
+        DMX_UNWRAP(UnrealizeWindow, dmxScreen, pScreen);
+        DMX_UNWRAP(RestackWindow, dmxScreen, pScreen);
+        DMX_UNWRAP(WindowExposures, dmxScreen, pScreen);
+        DMX_UNWRAP(CopyWindow, dmxScreen, pScreen);
+
+        DMX_UNWRAP(ResizeWindow, dmxScreen, pScreen);
+        DMX_UNWRAP(ReparentWindow, dmxScreen, pScreen);
+
+        DMX_UNWRAP(ChangeBorderWidth, dmxScreen, pScreen);
+
+        DMX_UNWRAP(GetImage, dmxScreen, pScreen);
+        DMX_UNWRAP(GetSpans, dmxScreen, pScreen);
+
+        DMX_UNWRAP(CreatePixmap, dmxScreen, pScreen);
+        DMX_UNWRAP(DestroyPixmap, dmxScreen, pScreen);
+        DMX_UNWRAP(BitmapToRegion, dmxScreen, pScreen);
+
+        DMX_UNWRAP(RealizeFont, dmxScreen, pScreen);
+        DMX_UNWRAP(UnrealizeFont, dmxScreen, pScreen);
+
+        DMX_UNWRAP(CreateColormap, dmxScreen, pScreen);
+        DMX_UNWRAP(DestroyColormap, dmxScreen, pScreen);
+        DMX_UNWRAP(InstallColormap, dmxScreen, pScreen);
+        DMX_UNWRAP(StoreColors, dmxScreen, pScreen);
+    }
+
+    DMX_UNWRAP(SaveScreen, dmxScreen, pScreen);
+
+    if (dmxScreen->beDisplay) {
+        dmxBECloseScreen(pScreen);
+
+#if 1
+        /* Free visuals, depths and pixmap formats here so that they
+         * won't be freed when a screen is detached, thereby allowing
+         * the screen to be reattached to be compared to the one
+         * previously removed.
+         */
+        XFree(dmxScreen->beVisuals);
+        dmxScreen->beVisuals = NULL;
+
+        XFree(dmxScreen->beDepths);
+        dmxScreen->beDepths = NULL;
+
+        XFree(dmxScreen->bePixmapFormats);
+        dmxScreen->bePixmapFormats = NULL;
+#endif
+    }
+
+    DMX_UNWRAP(CloseScreen, dmxScreen, pScreen);
+    return pScreen->CloseScreen(idx, pScreen);
+}
+
+static Bool
+dmxSaveScreen(ScreenPtr pScreen, int what)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+
+    if (dmxScreen->beDisplay) {
+        switch (what) {
+        case SCREEN_SAVER_OFF:
+        case SCREEN_SAVER_FORCER:
+            XResetScreenSaver(dmxScreen->beDisplay);
+            dmxSync(dmxScreen, FALSE);
+            break;
+        case SCREEN_SAVER_ON:
+        case SCREEN_SAVER_CYCLE:
+            XActivateScreenSaver(dmxScreen->beDisplay);
+            dmxSync(dmxScreen, FALSE);
+            break;
+        }
+    }
+
+    return TRUE;
+}
diff --git a/xorg-server/hw/dmx/dmxshadow.c b/xorg-server/hw/dmx/dmxshadow.c
index e075dec2a..9b4bafc34 100644
--- a/xorg-server/hw/dmx/dmxshadow.c
+++ b/xorg-server/hw/dmx/dmxshadow.c
@@ -1,71 +1,70 @@
-/*

- * Copyright 2001 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Kevin E. Martin <kem@redhat.com>

- *   David H. Dawes <dawes@xfree86.org>

- *

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxsync.h"

-#include "dmxshadow.h"

-

-/** \file

- * This file provides support for the shadow frame buffer. */

-

-/** Update the screen from the shadow frame buffer. */

-void dmxShadowUpdateProc(ScreenPtr pScreen, shadowBufPtr pBuf)

-{

-    RegionPtr      damage = &pBuf->damage;

-    int            nbox = RegionNumRects(damage);

-    BoxPtr         pbox = RegionRects(damage);

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-

-    if (!dmxScreen->beDisplay)

-	return;

-

-    while (nbox--) {

-	XPutImage(dmxScreen->beDisplay,

-		  dmxScreen->scrnWin,

-		  dmxScreen->shadowGC,

-		  dmxScreen->shadowFBImage,

-		  pbox->x1, pbox->y1,

-		  pbox->x1, pbox->y1,

-		  pbox->x2 - pbox->x1,

-		  pbox->y2 - pbox->y1);

-

-	pbox++;

-    }

-

-    dmxSync(dmxScreen, FALSE);

-}

+/*
+ * Copyright 2001 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *   David H. Dawes <dawes@xfree86.org>
+ *
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxshadow.h"
+
+/** \file
+ * This file provides support for the shadow frame buffer. */
+
+/** Update the screen from the shadow frame buffer. */
+void
+dmxShadowUpdateProc(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+    RegionPtr damage = &pBuf->damage;
+    int nbox = RegionNumRects(damage);
+    BoxPtr pbox = RegionRects(damage);
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+
+    if (!dmxScreen->beDisplay)
+        return;
+
+    while (nbox--) {
+        XPutImage(dmxScreen->beDisplay,
+                  dmxScreen->scrnWin,
+                  dmxScreen->shadowGC,
+                  dmxScreen->shadowFBImage,
+                  pbox->x1, pbox->y1,
+                  pbox->x1, pbox->y1, pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);
+
+        pbox++;
+    }
+
+    dmxSync(dmxScreen, FALSE);
+}
diff --git a/xorg-server/hw/dmx/dmxstat.c b/xorg-server/hw/dmx/dmxstat.c
index c08c6f4cd..0d8c22a9e 100644
--- a/xorg-server/hw/dmx/dmxstat.c
+++ b/xorg-server/hw/dmx/dmxstat.c
@@ -1,221 +1,238 @@
-/*

- * Copyright 2002, 2003 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- *

- * The DMX server code is written to call #dmxSync() whenever an XSync()

- * might be necessary.  However, since XSync() requires a two way

- * communication with the other X server, eliminating unnecessary

- * XSync() calls is a key performance optimization.  Support for this

- * optimization is provided in \a dmxsync.c.  This file provides routines

- * that evaluate this optimization by counting the number of XSync()

- * calls and monitoring their latency.  This functionality can be turned

- * on using the -stat command-line parameter. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxstat.h"

-#include "dmxlog.h"

-#include <X11/Xos.h>                /* For sys/time.h */

-

-/** Used to compute a running average of value. */

-typedef struct _DMXStatAvg {

-    int           pos;

-    int           count;

-    unsigned long value[DMX_STAT_LENGTH];

-} DMXStatAvg;

-

-/** Statistical information about XSync calls. */

-struct _DMXStatInfo {

-    unsigned long syncCount;

-    unsigned long oldSyncCount;

-

-    DMXStatAvg    usec;

-    DMXStatAvg    pending;

-

-    unsigned long bins[DMX_STAT_BINS];

-};

-

-/* Interval in mS between statistic message log entries. */

-       int        dmxStatInterval;

-static int        dmxStatDisplays;

-static OsTimerPtr dmxStatTimer;

-

-/** Return the number of microseconds as an unsigned long.

- * Unfortunately, this is only useful for intervals < about 4 sec.  */

-static unsigned long usec(struct timeval *stop, struct timeval *start)

-{

-    return (stop->tv_sec - start->tv_sec) * 1000000

-        + stop->tv_usec - start->tv_usec;

-}

-

-static unsigned long avg(DMXStatAvg *data, unsigned long *max)

-{

-    unsigned long sum;

-    int           i;

-

-    *max = 0;

-    if (!data->count) return 0;

-

-    for (i = 0, sum = 0; i < data->count; i++) {

-        if (data->value[i] > *max) *max = data->value[i];

-        sum += data->value[i];

-    }

-    return sum / data->count;

-}

-

-/** Turn on XSync statistic gathering and printing.  Print every \a

- * interval seconds, with lines for the first \a displays.  If \a

- * interval is NULL, 1 will be used.  If \a displays is NULL, 0 will be

- * used (meaning a line for every display will be printed).  Note that

- * this function takes string arguments because it will usually be

- * called from #ddxProcessArgument in \a dmxinit.c. */

-void dmxStatActivate(const char *interval, const char *displays)

-{

-    dmxStatInterval = (interval ? atoi(interval) : 1) * 1000;

-    dmxStatDisplays = (displays ? atoi(displays) : 0);

-

-    if (dmxStatInterval < 1000) dmxStatInterval = 1000;

-    if (dmxStatDisplays < 0)    dmxStatDisplays = 0;

-}

-

-/** Allocate a \a DMXStatInfo structure. */

-DMXStatInfo *dmxStatAlloc(void)

-{

-    DMXStatInfo *pt = calloc(1, sizeof(*pt));

-    return pt;

-}

-

-/** Free the memory used by a \a DMXStatInfo structure. */

-void dmxStatFree(DMXStatInfo *pt)

-{

-    free(pt);

-}

-

-static void dmxStatValue(DMXStatAvg *data, unsigned long value)

-{

-    if (data->count != DMX_STAT_LENGTH) ++data->count;

-    if (data->pos >= DMX_STAT_LENGTH-1) data->pos = 0;

-    data->value[data->pos++] = value;

-}

-

-/** Note that a XSync() was just done on \a dmxScreen with the \a start

- * and \a stop times (from gettimeofday()) and the number of

- * pending-but-not-yet-processed XSync requests.  This routine is called

- * from #dmxDoSync in \a dmxsync.c */

-void dmxStatSync(DMXScreenInfo *dmxScreen,

-                 struct timeval *stop, struct timeval *start,

-                 unsigned long pending)

-{

-    DMXStatInfo   *s      = dmxScreen->stat;

-    unsigned long elapsed = usec(stop, start);

-    unsigned long thresh;

-    int           i;

-

-    ++s->syncCount;

-    dmxStatValue(&s->usec, elapsed);

-    dmxStatValue(&s->pending, pending);

-    

-    for (i = 0, thresh = DMX_STAT_BIN0; i < DMX_STAT_BINS-1; i++) {

-        if (elapsed < thresh) {

-            ++s->bins[i];

-            break;

-        }

-        thresh *= DMX_STAT_BINMULT;

-    }

-    if (i == DMX_STAT_BINS-1) ++s->bins[i];

-}

-

-/* Actually do the work of printing out the human-readable message. */

-static CARD32 dmxStatCallback(OsTimerPtr timer, CARD32 t, pointer arg)

-{

-    int         i, j;

-    static int  header = 0;

-    int         limit = dmxNumScreens;

-

-    if (!dmxNumScreens) {

-        header = 0;

-        return DMX_STAT_INTERVAL;

-    }

-

-    if (!header++ || !(header % 10)) {

-        dmxLog(dmxDebug,

-               " S SyncCount  Sync/s avSync mxSync avPend mxPend | "

-               "<10ms   <1s   >1s\n");

-    }

-

-    if (dmxStatDisplays && dmxStatDisplays < limit) limit = dmxStatDisplays;

-    for (i = 0; i < limit; i++) {

-        DMXScreenInfo *dmxScreen = &dmxScreens[i];

-        DMXStatInfo   *s         = dmxScreen->stat;

-        unsigned long aSync, mSync;

-        unsigned long aPend, mPend;

-        

-        if (!s) continue;

-

-        aSync = avg(&s->usec,    &mSync);

-        aPend = avg(&s->pending, &mPend);

-        dmxLog(dmxDebug, "%2d %9lu %7lu %6lu %6lu %6lu %6lu |",

-               i,                                               /* S */

-               s->syncCount,                                    /* SyncCount */

-               (s->syncCount

-                - s->oldSyncCount) * 1000 / dmxStatInterval,    /* Sync/s */

-               aSync,                                           /* us/Sync */

-               mSync,                                           /* max/Sync */

-               aPend,                                           /* avgPend */

-               mPend);                                          /* maxPend */

-        for (j = 0; j < DMX_STAT_BINS; j++)

-            dmxLogCont(dmxDebug, " %5lu", s->bins[j]);

-        dmxLogCont(dmxDebug, "\n");

-

-                                /* Reset/clear */

-        s->oldSyncCount = s->syncCount;

-        for (j = 0; j < DMX_STAT_BINS; j++) s->bins[j] = 0;

-    }

-    return DMX_STAT_INTERVAL;   /* Place on queue again */

-}

-

-/** Try to initialize the statistic gathering and printing routines.

- * Initialization only takes place if #dmxStatActivate has already been

- * called.  We don't need the same generation protection that we used in

- * dmxSyncInit because our timer is always on a queue -- hence, server

- * generation will always free it. */

-void dmxStatInit(void)

-{

-    if (dmxStatInterval)

-        dmxStatTimer = TimerSet(NULL, 0,

-                                dmxStatInterval, dmxStatCallback, NULL);

-}

+/*
+ * Copyright 2002, 2003 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ *
+ * The DMX server code is written to call #dmxSync() whenever an XSync()
+ * might be necessary.  However, since XSync() requires a two way
+ * communication with the other X server, eliminating unnecessary
+ * XSync() calls is a key performance optimization.  Support for this
+ * optimization is provided in \a dmxsync.c.  This file provides routines
+ * that evaluate this optimization by counting the number of XSync()
+ * calls and monitoring their latency.  This functionality can be turned
+ * on using the -stat command-line parameter. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxstat.h"
+#include "dmxlog.h"
+#include <X11/Xos.h>            /* For sys/time.h */
+
+/** Used to compute a running average of value. */
+typedef struct _DMXStatAvg {
+    int pos;
+    int count;
+    unsigned long value[DMX_STAT_LENGTH];
+} DMXStatAvg;
+
+/** Statistical information about XSync calls. */
+struct _DMXStatInfo {
+    unsigned long syncCount;
+    unsigned long oldSyncCount;
+
+    DMXStatAvg usec;
+    DMXStatAvg pending;
+
+    unsigned long bins[DMX_STAT_BINS];
+};
+
+/* Interval in mS between statistic message log entries. */
+int dmxStatInterval;
+static int dmxStatDisplays;
+static OsTimerPtr dmxStatTimer;
+
+/** Return the number of microseconds as an unsigned long.
+ * Unfortunately, this is only useful for intervals < about 4 sec.  */
+static unsigned long
+usec(struct timeval *stop, struct timeval *start)
+{
+    return (stop->tv_sec - start->tv_sec) * 1000000
+        + stop->tv_usec - start->tv_usec;
+}
+
+static unsigned long
+avg(DMXStatAvg * data, unsigned long *max)
+{
+    unsigned long sum;
+    int i;
+
+    *max = 0;
+    if (!data->count)
+        return 0;
+
+    for (i = 0, sum = 0; i < data->count; i++) {
+        if (data->value[i] > *max)
+            *max = data->value[i];
+        sum += data->value[i];
+    }
+    return sum / data->count;
+}
+
+/** Turn on XSync statistic gathering and printing.  Print every \a
+ * interval seconds, with lines for the first \a displays.  If \a
+ * interval is NULL, 1 will be used.  If \a displays is NULL, 0 will be
+ * used (meaning a line for every display will be printed).  Note that
+ * this function takes string arguments because it will usually be
+ * called from #ddxProcessArgument in \a dmxinit.c. */
+void
+dmxStatActivate(const char *interval, const char *displays)
+{
+    dmxStatInterval = (interval ? atoi(interval) : 1) * 1000;
+    dmxStatDisplays = (displays ? atoi(displays) : 0);
+
+    if (dmxStatInterval < 1000)
+        dmxStatInterval = 1000;
+    if (dmxStatDisplays < 0)
+        dmxStatDisplays = 0;
+}
+
+/** Allocate a \a DMXStatInfo structure. */
+DMXStatInfo *
+dmxStatAlloc(void)
+{
+    DMXStatInfo *pt = calloc(1, sizeof(*pt));
+
+    return pt;
+}
+
+/** Free the memory used by a \a DMXStatInfo structure. */
+void
+dmxStatFree(DMXStatInfo * pt)
+{
+    free(pt);
+}
+
+static void
+dmxStatValue(DMXStatAvg * data, unsigned long value)
+{
+    if (data->count != DMX_STAT_LENGTH)
+        ++data->count;
+    if (data->pos >= DMX_STAT_LENGTH - 1)
+        data->pos = 0;
+    data->value[data->pos++] = value;
+}
+
+/** Note that a XSync() was just done on \a dmxScreen with the \a start
+ * and \a stop times (from gettimeofday()) and the number of
+ * pending-but-not-yet-processed XSync requests.  This routine is called
+ * from #dmxDoSync in \a dmxsync.c */
+void
+dmxStatSync(DMXScreenInfo * dmxScreen,
+            struct timeval *stop, struct timeval *start, unsigned long pending)
+{
+    DMXStatInfo *s = dmxScreen->stat;
+    unsigned long elapsed = usec(stop, start);
+    unsigned long thresh;
+    int i;
+
+    ++s->syncCount;
+    dmxStatValue(&s->usec, elapsed);
+    dmxStatValue(&s->pending, pending);
+
+    for (i = 0, thresh = DMX_STAT_BIN0; i < DMX_STAT_BINS - 1; i++) {
+        if (elapsed < thresh) {
+            ++s->bins[i];
+            break;
+        }
+        thresh *= DMX_STAT_BINMULT;
+    }
+    if (i == DMX_STAT_BINS - 1)
+        ++s->bins[i];
+}
+
+/* Actually do the work of printing out the human-readable message. */
+static CARD32
+dmxStatCallback(OsTimerPtr timer, CARD32 t, pointer arg)
+{
+    int i, j;
+    static int header = 0;
+    int limit = dmxNumScreens;
+
+    if (!dmxNumScreens) {
+        header = 0;
+        return DMX_STAT_INTERVAL;
+    }
+
+    if (!header++ || !(header % 10)) {
+        dmxLog(dmxDebug,
+               " S SyncCount  Sync/s avSync mxSync avPend mxPend | "
+               "<10ms   <1s   >1s\n");
+    }
+
+    if (dmxStatDisplays && dmxStatDisplays < limit)
+        limit = dmxStatDisplays;
+    for (i = 0; i < limit; i++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[i];
+        DMXStatInfo *s = dmxScreen->stat;
+        unsigned long aSync, mSync;
+        unsigned long aPend, mPend;
+
+        if (!s)
+            continue;
+
+        aSync = avg(&s->usec, &mSync);
+        aPend = avg(&s->pending, &mPend);
+        dmxLog(dmxDebug, "%2d %9lu %7lu %6lu %6lu %6lu %6lu |", i,      /* S */
+               s->syncCount,    /* SyncCount */
+               (s->syncCount - s->oldSyncCount) * 1000 / dmxStatInterval,       /* Sync/s */
+               aSync,           /* us/Sync */
+               mSync,           /* max/Sync */
+               aPend,           /* avgPend */
+               mPend);          /* maxPend */
+        for (j = 0; j < DMX_STAT_BINS; j++)
+            dmxLogCont(dmxDebug, " %5lu", s->bins[j]);
+        dmxLogCont(dmxDebug, "\n");
+
+        /* Reset/clear */
+        s->oldSyncCount = s->syncCount;
+        for (j = 0; j < DMX_STAT_BINS; j++)
+            s->bins[j] = 0;
+    }
+    return DMX_STAT_INTERVAL;   /* Place on queue again */
+}
+
+/** Try to initialize the statistic gathering and printing routines.
+ * Initialization only takes place if #dmxStatActivate has already been
+ * called.  We don't need the same generation protection that we used in
+ * dmxSyncInit because our timer is always on a queue -- hence, server
+ * generation will always free it. */
+void
+dmxStatInit(void)
+{
+    if (dmxStatInterval)
+        dmxStatTimer = TimerSet(NULL, 0,
+                                dmxStatInterval, dmxStatCallback, NULL);
+}
diff --git a/xorg-server/hw/dmx/dmxsync.c b/xorg-server/hw/dmx/dmxsync.c
index 8ace59470..bf28584b4 100644
--- a/xorg-server/hw/dmx/dmxsync.c
+++ b/xorg-server/hw/dmx/dmxsync.c
@@ -1,193 +1,207 @@
-/*

- * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- *

- * The DMX server code is written to call #dmxSync() whenever an XSync()

- * might be necessary.  However, since XSync() requires a two way

- * communication with the other X server, eliminating unnecessary

- * XSync() calls is a key performance optimization.  Support for this

- * optimization is provided here.  Statistics about XSync() calls and

- * latency are gathered in \a dmxstat.c.

- *

- * During the initial conversion from calling XSync() immediately to the

- * XSync() batching method implemented in this file, it was noted that,

- * out of more than 300 \a x11perf tests, 8 tests became more than 100

- * times faster, with 68 more than 50X faster, 114 more than 10X faster,

- * and 181 more than 2X faster. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxsync.h"

-#include "dmxstat.h"

-#include "dmxlog.h"

-#include <sys/time.h>

-

-static int        dmxSyncInterval = 100; /* Default interval in milliseconds */

-static OsTimerPtr dmxSyncTimer;

-static int        dmxSyncPending;

-

-static void dmxDoSync(DMXScreenInfo *dmxScreen)

-{

-    dmxScreen->needsSync = FALSE;

-

-    if (!dmxScreen->beDisplay)

-	return; /* FIXME: Is this correct behavior for sync stats? */

-

-    if (!dmxStatInterval) {

-        XSync(dmxScreen->beDisplay, False);

-    } else {

-        struct timeval start, stop;

-        

-        gettimeofday(&start, 0);

-        XSync(dmxScreen->beDisplay, False);

-        gettimeofday(&stop, 0);

-        dmxStatSync(dmxScreen, &stop, &start, dmxSyncPending);

-    }

-}

-

-static CARD32 dmxSyncCallback(OsTimerPtr timer, CARD32 time, pointer arg)

-{

-    int           i;

-

-    if (dmxSyncPending) {

-        for (i = 0; i < dmxNumScreens; i++) {

-            DMXScreenInfo *dmxScreen = &dmxScreens[i];

-            if (dmxScreen->needsSync) dmxDoSync(dmxScreen);

-        }

-    }

-    dmxSyncPending = 0;

-    return 0;                   /* Do not place on queue again */

-}

-

-static void dmxSyncBlockHandler(pointer blockData, OSTimePtr pTimeout,

-                                pointer pReadMask)

-{

-    TimerForce(dmxSyncTimer);

-}

-

-static void dmxSyncWakeupHandler(pointer blockData, int result,

-                                 pointer pReadMask)

-{

-}

-

-/** Request the XSync() batching optimization with the specified \a

- * interval (in mS).  If the \a interval is 0, 100mS is used.  If the \a

- * interval is less than 0, then the XSync() batching optimization is

- * not requested (e.g., so the -syncbatch -1 command line option can

- * turn off the default 100mS XSync() batching).

- *

- * Note that the parameter to this routine is a string, since it will

- * usually be called from #ddxProcessArgument in \a dmxinit.c */

-void dmxSyncActivate(const char *interval)

-{

-    dmxSyncInterval = (interval ? atoi(interval) : 100);

-

-    if (dmxSyncInterval < 0) dmxSyncInterval = 0;

-}

-

-/** Initialize the XSync() batching optimization, but only if

- * #dmxSyncActivate was last called with a non-negative value. */

-void dmxSyncInit(void)

-{

-    if (dmxSyncInterval) {

-        RegisterBlockAndWakeupHandlers(dmxSyncBlockHandler,

-                                       dmxSyncWakeupHandler,

-                                       NULL);

-        dmxLog(dmxInfo, "XSync batching with %d ms interval\n",

-               dmxSyncInterval);

-    } else {

-        dmxLog(dmxInfo, "XSync batching disabled\n");

-    }

-}

-

-/** Request an XSync() to the display used by \a dmxScreen.  If \a now

- * is TRUE, call XSync() immediately instead of waiting for the next

- * XSync() batching point.  Note that if XSync() batching was deselected

- * with #dmxSyncActivate() before #dmxSyncInit() was called, then no

- * XSync() batching is performed and this function always calles XSync()

- * immediately.

- *

- * (Note that this function uses TimerSet but works correctly in the

- * face of a server generation.  See the source for details.)

- *

- * If \a dmxScreen is \a NULL, then all pending syncs will be flushed

- * immediately.

- */

-void dmxSync(DMXScreenInfo *dmxScreen, Bool now)

-{

-    static unsigned long dmxGeneration = 0;

-

-    if (dmxSyncInterval) {

-        if (dmxGeneration != serverGeneration) {

-            /* Server generation does a TimerInit, which frees all

-             * timers.  So, at this point dmxSyncTimer is either:

-             * 1) NULL, iff dmxGeneration == 0,

-             * 2) freed, if it was on a queue (dmxSyncPending != 0), or

-             * 3) allocated, if it wasn't on a queue (dmxSyncPending == 0)

-             */

-            if (dmxSyncTimer && !dmxSyncPending) free(dmxSyncTimer);

-            dmxSyncTimer  = NULL;

-            now           = TRUE;

-            dmxGeneration = serverGeneration;

-        }

-                                /* Queue sync */

-        if (dmxScreen) {

-            dmxScreen->needsSync = TRUE;

-            ++dmxSyncPending;

-        }

-

-                                /* Do sync or set time for later */

-        if (now || !dmxScreen) {

-            if (!TimerForce(dmxSyncTimer)) dmxSyncCallback(NULL, 0, NULL);

-            /* At this point, dmxSyncPending == 0 because

-             * dmxSyncCallback must have been called. */

-            if (dmxSyncPending)

-                dmxLog(dmxFatal, "dmxSync(%s,%d): dmxSyncPending = %d\n",

-                       dmxScreen ? dmxScreen->name : "", now, dmxSyncPending);

-        } else {

-            dmxScreen->needsSync = TRUE;

-            if (dmxSyncPending == 1)

-                dmxSyncTimer = TimerSet(dmxSyncTimer, 0, dmxSyncInterval,

-                                        dmxSyncCallback, NULL);

-        }

-    } else {

-                                /* If dmxSyncInterval is not being used,

-                                 * then all the backends are already

-                                 * up-to-date. */

-        if (dmxScreen) dmxDoSync(dmxScreen);

-    }

-}

+/*
+ * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ *
+ * The DMX server code is written to call #dmxSync() whenever an XSync()
+ * might be necessary.  However, since XSync() requires a two way
+ * communication with the other X server, eliminating unnecessary
+ * XSync() calls is a key performance optimization.  Support for this
+ * optimization is provided here.  Statistics about XSync() calls and
+ * latency are gathered in \a dmxstat.c.
+ *
+ * During the initial conversion from calling XSync() immediately to the
+ * XSync() batching method implemented in this file, it was noted that,
+ * out of more than 300 \a x11perf tests, 8 tests became more than 100
+ * times faster, with 68 more than 50X faster, 114 more than 10X faster,
+ * and 181 more than 2X faster. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxstat.h"
+#include "dmxlog.h"
+#include <sys/time.h>
+
+static int dmxSyncInterval = 100;       /* Default interval in milliseconds */
+static OsTimerPtr dmxSyncTimer;
+static int dmxSyncPending;
+
+static void
+dmxDoSync(DMXScreenInfo * dmxScreen)
+{
+    dmxScreen->needsSync = FALSE;
+
+    if (!dmxScreen->beDisplay)
+        return;                 /* FIXME: Is this correct behavior for sync stats? */
+
+    if (!dmxStatInterval) {
+        XSync(dmxScreen->beDisplay, False);
+    }
+    else {
+        struct timeval start, stop;
+
+        gettimeofday(&start, 0);
+        XSync(dmxScreen->beDisplay, False);
+        gettimeofday(&stop, 0);
+        dmxStatSync(dmxScreen, &stop, &start, dmxSyncPending);
+    }
+}
+
+static CARD32
+dmxSyncCallback(OsTimerPtr timer, CARD32 time, pointer arg)
+{
+    int i;
+
+    if (dmxSyncPending) {
+        for (i = 0; i < dmxNumScreens; i++) {
+            DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
+            if (dmxScreen->needsSync)
+                dmxDoSync(dmxScreen);
+        }
+    }
+    dmxSyncPending = 0;
+    return 0;                   /* Do not place on queue again */
+}
+
+static void
+dmxSyncBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadMask)
+{
+    TimerForce(dmxSyncTimer);
+}
+
+static void
+dmxSyncWakeupHandler(pointer blockData, int result, pointer pReadMask)
+{
+}
+
+/** Request the XSync() batching optimization with the specified \a
+ * interval (in mS).  If the \a interval is 0, 100mS is used.  If the \a
+ * interval is less than 0, then the XSync() batching optimization is
+ * not requested (e.g., so the -syncbatch -1 command line option can
+ * turn off the default 100mS XSync() batching).
+ *
+ * Note that the parameter to this routine is a string, since it will
+ * usually be called from #ddxProcessArgument in \a dmxinit.c */
+void
+dmxSyncActivate(const char *interval)
+{
+    dmxSyncInterval = (interval ? atoi(interval) : 100);
+
+    if (dmxSyncInterval < 0)
+        dmxSyncInterval = 0;
+}
+
+/** Initialize the XSync() batching optimization, but only if
+ * #dmxSyncActivate was last called with a non-negative value. */
+void
+dmxSyncInit(void)
+{
+    if (dmxSyncInterval) {
+        RegisterBlockAndWakeupHandlers(dmxSyncBlockHandler,
+                                       dmxSyncWakeupHandler, NULL);
+        dmxLog(dmxInfo, "XSync batching with %d ms interval\n",
+               dmxSyncInterval);
+    }
+    else {
+        dmxLog(dmxInfo, "XSync batching disabled\n");
+    }
+}
+
+/** Request an XSync() to the display used by \a dmxScreen.  If \a now
+ * is TRUE, call XSync() immediately instead of waiting for the next
+ * XSync() batching point.  Note that if XSync() batching was deselected
+ * with #dmxSyncActivate() before #dmxSyncInit() was called, then no
+ * XSync() batching is performed and this function always calles XSync()
+ * immediately.
+ *
+ * (Note that this function uses TimerSet but works correctly in the
+ * face of a server generation.  See the source for details.)
+ *
+ * If \a dmxScreen is \a NULL, then all pending syncs will be flushed
+ * immediately.
+ */
+void
+dmxSync(DMXScreenInfo * dmxScreen, Bool now)
+{
+    static unsigned long dmxGeneration = 0;
+
+    if (dmxSyncInterval) {
+        if (dmxGeneration != serverGeneration) {
+            /* Server generation does a TimerInit, which frees all
+             * timers.  So, at this point dmxSyncTimer is either:
+             * 1) NULL, iff dmxGeneration == 0,
+             * 2) freed, if it was on a queue (dmxSyncPending != 0), or
+             * 3) allocated, if it wasn't on a queue (dmxSyncPending == 0)
+             */
+            if (dmxSyncTimer && !dmxSyncPending)
+                free(dmxSyncTimer);
+            dmxSyncTimer = NULL;
+            now = TRUE;
+            dmxGeneration = serverGeneration;
+        }
+        /* Queue sync */
+        if (dmxScreen) {
+            dmxScreen->needsSync = TRUE;
+            ++dmxSyncPending;
+        }
+
+        /* Do sync or set time for later */
+        if (now || !dmxScreen) {
+            if (!TimerForce(dmxSyncTimer))
+                dmxSyncCallback(NULL, 0, NULL);
+            /* At this point, dmxSyncPending == 0 because
+             * dmxSyncCallback must have been called. */
+            if (dmxSyncPending)
+                dmxLog(dmxFatal, "dmxSync(%s,%d): dmxSyncPending = %d\n",
+                       dmxScreen ? dmxScreen->name : "", now, dmxSyncPending);
+        }
+        else {
+            dmxScreen->needsSync = TRUE;
+            if (dmxSyncPending == 1)
+                dmxSyncTimer = TimerSet(dmxSyncTimer, 0, dmxSyncInterval,
+                                        dmxSyncCallback, NULL);
+        }
+    }
+    else {
+        /* If dmxSyncInterval is not being used,
+         * then all the backends are already
+         * up-to-date. */
+        if (dmxScreen)
+            dmxDoSync(dmxScreen);
+    }
+}
diff --git a/xorg-server/hw/dmx/dmxvisual.c b/xorg-server/hw/dmx/dmxvisual.c
index 7b8771f9e..23b9bddea 100644
--- a/xorg-server/hw/dmx/dmxvisual.c
+++ b/xorg-server/hw/dmx/dmxvisual.c
@@ -48,24 +48,25 @@
 #include <GL/glxint.h>
 
 extern VisualID glxMatchVisualInConfigList(ScreenPtr pScreen,
-					   VisualPtr pVisual,
-					   __GLXvisualConfig *configs,
-					   int nconfigs);
+                                           VisualPtr pVisual,
+                                           __GLXvisualConfig * configs,
+                                           int nconfigs);
 
-static Visual *dmxLookupGLXVisual(ScreenPtr pScreen, VisualPtr pVisual)
+static Visual *
+dmxLookupGLXVisual(ScreenPtr pScreen, VisualPtr pVisual)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    int            j;
-    VisualID       vid;
+    int j;
+    VisualID vid;
 
     vid = glxMatchVisualInConfigList(pScreen, pVisual,
-				     dmxScreen->glxVisuals,
-				     dmxScreen->numGlxVisuals);
+                                     dmxScreen->glxVisuals,
+                                     dmxScreen->numGlxVisuals);
     if (vid) {
-	/* Find the X visual of the matching GLX visual */
-	for (j = 0; j < dmxScreen->beNumVisuals; j++)
-	    if (vid == dmxScreen->beVisuals[j].visualid)
-		return dmxScreen->beVisuals[j].visual;
+        /* Find the X visual of the matching GLX visual */
+        for (j = 0; j < dmxScreen->beNumVisuals; j++)
+            if (vid == dmxScreen->beVisuals[j].visualid)
+                return dmxScreen->beVisuals[j].visual;
     }
 
     /* No matching visual found */
@@ -74,66 +75,71 @@ static Visual *dmxLookupGLXVisual(ScreenPtr pScreen, VisualPtr pVisual)
 #endif
 
 /** Return the visual that matched \a pVisual. */
-Visual *dmxLookupVisual(ScreenPtr pScreen, VisualPtr pVisual)
+Visual *
+dmxLookupVisual(ScreenPtr pScreen, VisualPtr pVisual)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    int            i;
+    int i;
+
 #ifdef GLXEXT
-    Visual        *retval;
+    Visual *retval;
 #endif
 
     if (!dmxScreen->beDisplay)
-	return NULL;
+        return NULL;
 
 #ifdef GLXEXT
     if ((retval = dmxLookupGLXVisual(pScreen, pVisual)))
-	return retval;
+        return retval;
 #endif
 
     for (i = 0; i < dmxScreen->beNumVisuals; i++) {
-	if (pVisual->class == dmxScreen->beVisuals[i].class &&
-	    pVisual->bitsPerRGBValue == dmxScreen->beVisuals[i].bits_per_rgb &&
-	    pVisual->ColormapEntries == dmxScreen->beVisuals[i].colormap_size &&
-	    pVisual->nplanes == dmxScreen->beVisuals[i].depth &&
-	    pVisual->redMask == dmxScreen->beVisuals[i].red_mask &&
-	    pVisual->greenMask == dmxScreen->beVisuals[i].green_mask &&
-	    pVisual->blueMask == dmxScreen->beVisuals[i].blue_mask) {
-	    return dmxScreen->beVisuals[i].visual;
-	}
+        if (pVisual->class == dmxScreen->beVisuals[i].class &&
+            pVisual->bitsPerRGBValue == dmxScreen->beVisuals[i].bits_per_rgb &&
+            pVisual->ColormapEntries == dmxScreen->beVisuals[i].colormap_size &&
+            pVisual->nplanes == dmxScreen->beVisuals[i].depth &&
+            pVisual->redMask == dmxScreen->beVisuals[i].red_mask &&
+            pVisual->greenMask == dmxScreen->beVisuals[i].green_mask &&
+            pVisual->blueMask == dmxScreen->beVisuals[i].blue_mask) {
+            return dmxScreen->beVisuals[i].visual;
+        }
     }
 
     return NULL;
 }
 
 /** Return the visual that matched the \a vid. */
-Visual *dmxLookupVisualFromID(ScreenPtr pScreen, VisualID vid)
+Visual *
+dmxLookupVisualFromID(ScreenPtr pScreen, VisualID vid)
 {
     Visual *visual;
-    int     i;
+    int i;
 
     if (!dmxScreens[pScreen->myNum].beDisplay)
-	return NULL;
+        return NULL;
 
     for (i = 0; i < pScreen->numVisuals; i++) {
-	if (pScreen->visuals[i].vid == vid) {
-	    visual = dmxLookupVisual(pScreen, &pScreen->visuals[i]);
-	    if (visual) return visual;
-	}
+        if (pScreen->visuals[i].vid == vid) {
+            visual = dmxLookupVisual(pScreen, &pScreen->visuals[i]);
+            if (visual)
+                return visual;
+        }
     }
 
     return NULL;
 }
 
 /** Return the colormap for the \a visual. */
-Colormap dmxColormapFromDefaultVisual(ScreenPtr pScreen, Visual *visual)
+Colormap
+dmxColormapFromDefaultVisual(ScreenPtr pScreen, Visual * visual)
 {
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    int            i;
+    int i;
 
     if (dmxScreen->beDisplay) {
-	for (i = 0; i < dmxScreen->beNumDefColormaps; i++)
-	    if (visual == dmxScreen->beVisuals[i].visual)
-		return dmxScreen->beDefColormaps[i];
+        for (i = 0; i < dmxScreen->beNumDefColormaps; i++)
+            if (visual == dmxScreen->beVisuals[i].visual)
+                return dmxScreen->beDefColormaps[i];
     }
 
     return None;
diff --git a/xorg-server/hw/dmx/dmxwindow.c b/xorg-server/hw/dmx/dmxwindow.c
index 704fcff54..855e56b9d 100644
--- a/xorg-server/hw/dmx/dmxwindow.c
+++ b/xorg-server/hw/dmx/dmxwindow.c
@@ -52,79 +52,78 @@
 
 static void dmxDoRestackWindow(WindowPtr pWindow);
 static void dmxDoChangeWindowAttributes(WindowPtr pWindow,
-					unsigned long *mask,
-					XSetWindowAttributes *attribs);
+                                        unsigned long *mask,
+                                        XSetWindowAttributes * attribs);
 
 static void dmxDoSetShape(WindowPtr pWindow);
 
 /** Initialize the private area for the window functions. */
-Bool dmxInitWindow(ScreenPtr pScreen)
+Bool
+dmxInitWindow(ScreenPtr pScreen)
 {
-    if (!dixRegisterPrivateKey(&dmxWinPrivateKeyRec, PRIVATE_WINDOW, sizeof(dmxWinPrivRec)))
-	return FALSE;
+    if (!dixRegisterPrivateKey
+        (&dmxWinPrivateKeyRec, PRIVATE_WINDOW, sizeof(dmxWinPrivRec)))
+        return FALSE;
 
     return TRUE;
 }
 
-
-Window dmxCreateRootWindow(WindowPtr pWindow)
+Window
+dmxCreateRootWindow(WindowPtr pWindow)
 {
-    ScreenPtr             pScreen   = pWindow->drawable.pScreen;
-    DMXScreenInfo        *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr         pWinPriv  = DMX_GET_WINDOW_PRIV(pWindow);
-    Window                parent;
-    Visual               *visual;
-    unsigned long         mask;
-    XSetWindowAttributes  attribs;
-    ColormapPtr           pCmap;
-    dmxColormapPrivPtr    pCmapPriv;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    Window parent;
+    Visual *visual;
+    unsigned long mask;
+    XSetWindowAttributes attribs;
+    ColormapPtr pCmap;
+    dmxColormapPrivPtr pCmapPriv;
 
     /* Create root window */
 
-    parent = dmxScreen->scrnWin; /* This is our "Screen" window */
+    parent = dmxScreen->scrnWin;        /* This is our "Screen" window */
     visual = dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual;
 
-    dixLookupResourceByType((pointer*) &pCmap, wColormap(pWindow),
-			    RT_COLORMAP, NullClient, DixUnknownAccess);
+    dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow),
+                            RT_COLORMAP, NullClient, DixUnknownAccess);
     pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap);
 
     mask = CWEventMask | CWBackingStore | CWColormap | CWBorderPixel;
-    attribs.event_mask    = ExposureMask;
+    attribs.event_mask = ExposureMask;
     attribs.backing_store = NotUseful;
-    attribs.colormap      = pCmapPriv->cmap;
-    attribs.border_pixel  = 0;
+    attribs.colormap = pCmapPriv->cmap;
+    attribs.border_pixel = 0;
 
     /* Incorporate new attributes, if needed */
     if (pWinPriv->attribMask) {
-	dmxDoChangeWindowAttributes(pWindow, &pWinPriv->attribMask, &attribs);
-	mask |= pWinPriv->attribMask;
+        dmxDoChangeWindowAttributes(pWindow, &pWinPriv->attribMask, &attribs);
+        mask |= pWinPriv->attribMask;
     }
 
     return XCreateWindow(dmxScreen->beDisplay,
-			 parent,
-			 pWindow->origin.x - wBorderWidth(pWindow),
-			 pWindow->origin.y - wBorderWidth(pWindow),
-			 pWindow->drawable.width,
-			 pWindow->drawable.height,
-			 pWindow->borderWidth,
-			 pWindow->drawable.depth,
-			 pWindow->drawable.class,
-			 visual,
-			 mask,
-			 &attribs);
+                         parent,
+                         pWindow->origin.x - wBorderWidth(pWindow),
+                         pWindow->origin.y - wBorderWidth(pWindow),
+                         pWindow->drawable.width,
+                         pWindow->drawable.height,
+                         pWindow->borderWidth,
+                         pWindow->drawable.depth,
+                         pWindow->drawable.class, visual, mask, &attribs);
 }
 
 /** Change the location and size of the "screen" window.  Called from
  *  dmxextension.c dmxConfigureScreenWindow(). */
-void dmxResizeScreenWindow(ScreenPtr pScreen,
-			   int x, int y, int w, int h)
+void
+dmxResizeScreenWindow(ScreenPtr pScreen, int x, int y, int w, int h)
 {
-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];
-    unsigned int    m;
-    XWindowChanges  c;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    unsigned int m;
+    XWindowChanges c;
 
     if (!dmxScreen->beDisplay)
-	return;
+        return;
 
     /* Handle resizing on back-end server */
     m = CWX | CWY | CWWidth | CWHeight;
@@ -139,81 +138,85 @@ void dmxResizeScreenWindow(ScreenPtr pScreen,
 
 /** Change the location and size of the "root" window.  Called from
  *  #dmxCreateWindow. */
-void dmxResizeRootWindow(WindowPtr pRoot,
-			 int x, int y, int w, int h)
+void
+dmxResizeRootWindow(WindowPtr pRoot, int x, int y, int w, int h)
 {
-    DMXScreenInfo  *dmxScreen = &dmxScreens[pRoot->drawable.pScreen->myNum];
-    dmxWinPrivPtr   pWinPriv = DMX_GET_WINDOW_PRIV(pRoot);
-    unsigned int    m;
-    XWindowChanges  c;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pRoot->drawable.pScreen->myNum];
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pRoot);
+    unsigned int m;
+    XWindowChanges c;
 
     /* Handle resizing on back-end server */
     if (dmxScreen->beDisplay) {
-	m = CWX | CWY | CWWidth | CWHeight;
-	c.x = x;
-	c.y = y;
-	c.width = (w > 0) ? w : 1;
-	c.height = (h > 0) ? h : 1;
+        m = CWX | CWY | CWWidth | CWHeight;
+        c.x = x;
+        c.y = y;
+        c.width = (w > 0) ? w : 1;
+        c.height = (h > 0) ? h : 1;
 
-	XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
+        XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
     }
 
     if (w == 0 || h == 0) {
-	if (pWinPriv->mapped) {
-	    if (dmxScreen->beDisplay)
-		XUnmapWindow(dmxScreen->beDisplay, pWinPriv->window);
-	    pWinPriv->mapped = FALSE;
-	}
-    } else if (!pWinPriv->mapped) {
-	if (dmxScreen->beDisplay)
-	    XMapWindow(dmxScreen->beDisplay, pWinPriv->window);
-	pWinPriv->mapped = TRUE;
+        if (pWinPriv->mapped) {
+            if (dmxScreen->beDisplay)
+                XUnmapWindow(dmxScreen->beDisplay, pWinPriv->window);
+            pWinPriv->mapped = FALSE;
+        }
+    }
+    else if (!pWinPriv->mapped) {
+        if (dmxScreen->beDisplay)
+            XMapWindow(dmxScreen->beDisplay, pWinPriv->window);
+        pWinPriv->mapped = TRUE;
     }
 
     if (dmxScreen->beDisplay)
-	dmxSync(dmxScreen, False);
+        dmxSync(dmxScreen, False);
 }
 
-void dmxGetDefaultWindowAttributes(WindowPtr pWindow,
-				   Colormap *cmap,
-				   Visual **visual)
+void
+dmxGetDefaultWindowAttributes(WindowPtr pWindow,
+                              Colormap * cmap, Visual ** visual)
 {
-    ScreenPtr  pScreen = pWindow->drawable.pScreen;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
 
     if (pWindow->drawable.class != InputOnly &&
-	pWindow->optional &&
-	pWindow->optional->visual != wVisual(pWindow->parent)) {
-
-	/* Find the matching visual */
-	*visual = dmxLookupVisualFromID(pScreen, wVisual(pWindow));
-
-	/* Handle optional colormaps */
-	if (pWindow->optional->colormap) {
-	    ColormapPtr         pCmap;
-	    dmxColormapPrivPtr  pCmapPriv;
-
-	    dixLookupResourceByType((pointer*) &pCmap, wColormap(pWindow),
-				    RT_COLORMAP, NullClient, DixUnknownAccess);
-	    pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap);
-	    *cmap = pCmapPriv->cmap;
-	} else {
-	    *cmap = dmxColormapFromDefaultVisual(pScreen, *visual);
-	}
-    } else {
-	*visual = CopyFromParent;
-	*cmap = (Colormap)0;
+        pWindow->optional &&
+        pWindow->optional->visual != wVisual(pWindow->parent)) {
+
+        /* Find the matching visual */
+        *visual = dmxLookupVisualFromID(pScreen, wVisual(pWindow));
+
+        /* Handle optional colormaps */
+        if (pWindow->optional->colormap) {
+            ColormapPtr pCmap;
+            dmxColormapPrivPtr pCmapPriv;
+
+            dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow),
+                                    RT_COLORMAP, NullClient, DixUnknownAccess);
+            pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap);
+            *cmap = pCmapPriv->cmap;
+        }
+        else {
+            *cmap = dmxColormapFromDefaultVisual(pScreen, *visual);
+        }
+    }
+    else {
+        *visual = CopyFromParent;
+        *cmap = (Colormap) 0;
     }
 }
 
-static Window dmxCreateNonRootWindow(WindowPtr pWindow)
+static Window
+dmxCreateNonRootWindow(WindowPtr pWindow)
 {
-    ScreenPtr             pScreen = pWindow->drawable.pScreen;
-    DMXScreenInfo        *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr         pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    Window                parent;
-    unsigned long         mask = 0L;
-    XSetWindowAttributes  attribs;
-    dmxWinPrivPtr         pParentPriv = DMX_GET_WINDOW_PRIV(pWindow->parent);
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    Window parent;
+    unsigned long mask = 0L;
+    XSetWindowAttributes attribs;
+    dmxWinPrivPtr pParentPriv = DMX_GET_WINDOW_PRIV(pWindow->parent);
 
     /* Create window on back-end server */
 
@@ -223,29 +226,29 @@ static Window dmxCreateNonRootWindow(WindowPtr pWindow)
        from ReparentWindow and the grandparent window has not yet been
        created */
     if (!parent) {
-	dmxCreateAndRealizeWindow(pWindow->parent, FALSE);
-	parent = pParentPriv->window;
+        dmxCreateAndRealizeWindow(pWindow->parent, FALSE);
+        parent = pParentPriv->window;
     }
 
     /* Incorporate new attributes, if needed */
     if (pWinPriv->attribMask) {
-	dmxDoChangeWindowAttributes(pWindow, &pWinPriv->attribMask, &attribs);
-	mask |= pWinPriv->attribMask;
+        dmxDoChangeWindowAttributes(pWindow, &pWinPriv->attribMask, &attribs);
+        mask |= pWinPriv->attribMask;
     }
 
     /* Add in default attributes */
     if (pWindow->drawable.class != InputOnly) {
-	mask |= CWBackingStore;
-	attribs.backing_store = NotUseful;
-
-	if (!(mask & CWColormap) && pWinPriv->cmap) {
-	    mask |= CWColormap;
-	    attribs.colormap = pWinPriv->cmap;
-	    if (!(mask & CWBorderPixel)) {
-		mask |= CWBorderPixel;
-		attribs.border_pixel = 0;
-	    }
-	}
+        mask |= CWBackingStore;
+        attribs.backing_store = NotUseful;
+
+        if (!(mask & CWColormap) && pWinPriv->cmap) {
+            mask |= CWColormap;
+            attribs.colormap = pWinPriv->cmap;
+            if (!(mask & CWBorderPixel)) {
+                mask |= CWBorderPixel;
+                attribs.border_pixel = 0;
+            }
+        }
     }
 
     /* Handle case where subwindows are being mapped, but created out of
@@ -254,17 +257,15 @@ static Window dmxCreateNonRootWindow(WindowPtr pWindow)
     pWinPriv->restacked = (pWindow->prevSib != NullWindow);
 
     return XCreateWindow(dmxScreen->beDisplay,
-			 parent,
-			 pWindow->origin.x - wBorderWidth(pWindow),
-			 pWindow->origin.y - wBorderWidth(pWindow),
-			 pWindow->drawable.width,
-			 pWindow->drawable.height,
-			 pWindow->borderWidth,
-			 pWindow->drawable.depth,
-			 pWindow->drawable.class,
-			 pWinPriv->visual,
-			 mask,
-			 &attribs);
+                         parent,
+                         pWindow->origin.x - wBorderWidth(pWindow),
+                         pWindow->origin.y - wBorderWidth(pWindow),
+                         pWindow->drawable.width,
+                         pWindow->drawable.height,
+                         pWindow->borderWidth,
+                         pWindow->drawable.depth,
+                         pWindow->drawable.class,
+                         pWinPriv->visual, mask, &attribs);
 }
 
 /** This function handles lazy window creation and realization.  Window
@@ -276,93 +277,101 @@ static Window dmxCreateNonRootWindow(WindowPtr pWindow)
  *  associated with it, those pictures are created on the back-end
  *  server by calling #dmxCreatePictureList().  If \a doSync is TRUE,
  *  then #dmxSync() is called. */
-void dmxCreateAndRealizeWindow(WindowPtr pWindow, Bool doSync)
+void
+dmxCreateAndRealizeWindow(WindowPtr pWindow, Bool doSync)
 {
-    ScreenPtr      pScreen = pWindow->drawable.pScreen;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr  pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
 
-    if (!dmxScreen->beDisplay) return;
+    if (!dmxScreen->beDisplay)
+        return;
 
     pWinPriv->window = dmxCreateNonRootWindow(pWindow);
-    if (pWinPriv->restacked) dmxDoRestackWindow(pWindow);
-    if (pWinPriv->isShaped) dmxDoSetShape(pWindow);
-    if (pWinPriv->hasPict) dmxCreatePictureList(pWindow);
-    if (pWinPriv->mapped) XMapWindow(dmxScreen->beDisplay,
-				      pWinPriv->window);
-    if (doSync) dmxSync(dmxScreen, False);
+    if (pWinPriv->restacked)
+        dmxDoRestackWindow(pWindow);
+    if (pWinPriv->isShaped)
+        dmxDoSetShape(pWindow);
+    if (pWinPriv->hasPict)
+        dmxCreatePictureList(pWindow);
+    if (pWinPriv->mapped)
+        XMapWindow(dmxScreen->beDisplay, pWinPriv->window);
+    if (doSync)
+        dmxSync(dmxScreen, False);
 }
 
 /** Create \a pWindow on the back-end server.  If the lazy window
  *  creation optimization is enabled, then the actual creation and
  *  realization of the window is handled by
  *  #dmxCreateAndRealizeWindow(). */
-Bool dmxCreateWindow(WindowPtr pWindow)
+Bool
+dmxCreateWindow(WindowPtr pWindow)
 {
-    ScreenPtr             pScreen = pWindow->drawable.pScreen;
-    DMXScreenInfo        *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr         pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    Bool                  ret = TRUE;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    Bool ret = TRUE;
 
     DMX_UNWRAP(CreateWindow, dmxScreen, pScreen);
 #if 0
     if (pScreen->CreateWindow)
-	ret = pScreen->CreateWindow(pWindow);
+        ret = pScreen->CreateWindow(pWindow);
 #endif
 
     /* Set up the defaults */
-    pWinPriv->window     = (Window)0;
-    pWinPriv->offscreen  = TRUE;
-    pWinPriv->mapped     = FALSE;
-    pWinPriv->restacked  = FALSE;
+    pWinPriv->window = (Window) 0;
+    pWinPriv->offscreen = TRUE;
+    pWinPriv->mapped = FALSE;
+    pWinPriv->restacked = FALSE;
     pWinPriv->attribMask = 0;
-    pWinPriv->isShaped   = FALSE;
-    pWinPriv->hasPict    = FALSE;
+    pWinPriv->isShaped = FALSE;
+    pWinPriv->hasPict = FALSE;
 #ifdef GLXEXT
-    pWinPriv->swapGroup  = NULL;
-    pWinPriv->barrier    = 0;
+    pWinPriv->swapGroup = NULL;
+    pWinPriv->barrier = 0;
 #endif
 
     if (dmxScreen->beDisplay) {
-	/* Only create the root window at this stage -- non-root windows are
-	   created when they are mapped and are on-screen */
-	if (!pWindow->parent) {
-	    dmxScreen->rootWin = pWinPriv->window
-		= dmxCreateRootWindow(pWindow);
-	    if (dmxScreen->scrnX         != dmxScreen->rootX
-		|| dmxScreen->scrnY      != dmxScreen->rootY
-		|| dmxScreen->scrnWidth  != dmxScreen->rootWidth
-		|| dmxScreen->scrnHeight != dmxScreen->rootHeight) {
-		dmxResizeRootWindow(pWindow,
-				    dmxScreen->rootX,
-				    dmxScreen->rootY,
-				    dmxScreen->rootWidth,
-				    dmxScreen->rootHeight);
-		dmxUpdateScreenResources(screenInfo.screens[dmxScreen->index],
-					 dmxScreen->rootX,
-					 dmxScreen->rootY,
-					 dmxScreen->rootWidth,
-					 dmxScreen->rootHeight);
-		pWindow->origin.x = dmxScreen->rootX;
-		pWindow->origin.y = dmxScreen->rootY;
-	    }
-	} else {
-	    dmxGetDefaultWindowAttributes(pWindow,
-					  &pWinPriv->cmap,
-					  &pWinPriv->visual);
-
-	    if (dmxLazyWindowCreation) {
-		/* Save parent's visual for use later */
-		if (pWinPriv->visual == CopyFromParent)
-		    pWinPriv->visual =
-			dmxLookupVisualFromID(pScreen,
-					      wVisual(pWindow->parent));
-	    } else {
-		pWinPriv->window = dmxCreateNonRootWindow(pWindow);
-	    }
-	}
-
-	dmxSync(dmxScreen, False);
+        /* Only create the root window at this stage -- non-root windows are
+           created when they are mapped and are on-screen */
+        if (!pWindow->parent) {
+            dmxScreen->rootWin = pWinPriv->window
+                = dmxCreateRootWindow(pWindow);
+            if (dmxScreen->scrnX != dmxScreen->rootX
+                || dmxScreen->scrnY != dmxScreen->rootY
+                || dmxScreen->scrnWidth != dmxScreen->rootWidth
+                || dmxScreen->scrnHeight != dmxScreen->rootHeight) {
+                dmxResizeRootWindow(pWindow,
+                                    dmxScreen->rootX,
+                                    dmxScreen->rootY,
+                                    dmxScreen->rootWidth,
+                                    dmxScreen->rootHeight);
+                dmxUpdateScreenResources(screenInfo.screens[dmxScreen->index],
+                                         dmxScreen->rootX,
+                                         dmxScreen->rootY,
+                                         dmxScreen->rootWidth,
+                                         dmxScreen->rootHeight);
+                pWindow->origin.x = dmxScreen->rootX;
+                pWindow->origin.y = dmxScreen->rootY;
+            }
+        }
+        else {
+            dmxGetDefaultWindowAttributes(pWindow,
+                                          &pWinPriv->cmap, &pWinPriv->visual);
+
+            if (dmxLazyWindowCreation) {
+                /* Save parent's visual for use later */
+                if (pWinPriv->visual == CopyFromParent)
+                    pWinPriv->visual =
+                        dmxLookupVisualFromID(pScreen,
+                                              wVisual(pWindow->parent));
+            }
+            else {
+                pWinPriv->window = dmxCreateNonRootWindow(pWindow);
+            }
+        }
+
+        dmxSync(dmxScreen, False);
     }
 
     DMX_WRAP(CreateWindow, dmxCreateWindow, dmxScreen, pScreen);
@@ -371,16 +380,17 @@ Bool dmxCreateWindow(WindowPtr pWindow)
 }
 
 /** Destroy \a pWindow on the back-end server. */
-Bool dmxBEDestroyWindow(WindowPtr pWindow)
+Bool
+dmxBEDestroyWindow(WindowPtr pWindow)
 {
-    ScreenPtr      pScreen = pWindow->drawable.pScreen;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr  pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
 
     if (pWinPriv->window) {
-	XDestroyWindow(dmxScreen->beDisplay, pWinPriv->window);
-	pWinPriv->window = (Window)0;
-	return TRUE;
+        XDestroyWindow(dmxScreen->beDisplay, pWinPriv->window);
+        pWinPriv->window = (Window) 0;
+        return TRUE;
     }
 
     return FALSE;
@@ -388,14 +398,16 @@ Bool dmxBEDestroyWindow(WindowPtr pWindow)
 
 /** Destroy \a pWindow on the back-end server.  If any RENDER pictures
     were created, destroy them as well. */
-Bool dmxDestroyWindow(WindowPtr pWindow)
+Bool
+dmxDestroyWindow(WindowPtr pWindow)
 {
-    ScreenPtr      pScreen = pWindow->drawable.pScreen;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    Bool           ret = TRUE;
-    Bool           needSync = FALSE;
+    Bool ret = TRUE;
+    Bool needSync = FALSE;
+
 #ifdef GLXEXT
-    dmxWinPrivPtr  pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
 #endif
 
     DMX_UNWRAP(DestroyWindow, dmxScreen, pScreen);
@@ -405,15 +417,16 @@ Bool dmxDestroyWindow(WindowPtr pWindow)
 
     /* Destroy window on back-end server */
     needSync |= dmxBEDestroyWindow(pWindow);
-    if (needSync) dmxSync(dmxScreen, FALSE);
+    if (needSync)
+        dmxSync(dmxScreen, FALSE);
 
 #ifdef GLXEXT
     if (pWinPriv->swapGroup && pWinPriv->windowDestroyed)
-	pWinPriv->windowDestroyed(pWindow);
+        pWinPriv->windowDestroyed(pWindow);
 #endif
 
     if (pScreen->DestroyWindow)
-	ret = pScreen->DestroyWindow(pWindow);
+        ret = pScreen->DestroyWindow(pWindow);
 
     DMX_WRAP(DestroyWindow, dmxDestroyWindow, dmxScreen, pScreen);
 
@@ -421,19 +434,20 @@ Bool dmxDestroyWindow(WindowPtr pWindow)
 }
 
 /** Change the position of \a pWindow to be \a x, \a y. */
-Bool dmxPositionWindow(WindowPtr pWindow, int x, int y)
+Bool
+dmxPositionWindow(WindowPtr pWindow, int x, int y)
 {
-    ScreenPtr       pScreen = pWindow->drawable.pScreen;
-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];
-    Bool            ret = TRUE;
-    dmxWinPrivPtr   pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    unsigned int    m;
-    XWindowChanges  c;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    Bool ret = TRUE;
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    unsigned int m;
+    XWindowChanges c;
 
     DMX_UNWRAP(PositionWindow, dmxScreen, pScreen);
 #if 0
     if (pScreen->PositionWindow)
-	ret = pScreen->PositionWindow(pWindow, x, y);
+        ret = pScreen->PositionWindow(pWindow, x, y);
 #endif
 
     /* Determine if the window is completely off the visible portion of
@@ -443,21 +457,22 @@ Bool dmxPositionWindow(WindowPtr pWindow, int x, int y)
     /* If the window is now on-screen and it is mapped and it has not
        been created yet, create it and map it */
     if (!pWinPriv->window && pWinPriv->mapped && !pWinPriv->offscreen) {
-	dmxCreateAndRealizeWindow(pWindow, TRUE);
-    } else if (pWinPriv->window) {
-	/* Position window on back-end server */
-	m = CWX | CWY | CWWidth | CWHeight;
-	c.x = pWindow->origin.x - wBorderWidth(pWindow);
-	c.y = pWindow->origin.y - wBorderWidth(pWindow);
-	c.width = pWindow->drawable.width;
-	c.height = pWindow->drawable.height;
-	if (pWindow->drawable.class != InputOnly) {
-	    m |= CWBorderWidth;
-	    c.border_width = pWindow->borderWidth;
-	}
-
-	XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
-	dmxSync(dmxScreen, False);
+        dmxCreateAndRealizeWindow(pWindow, TRUE);
+    }
+    else if (pWinPriv->window) {
+        /* Position window on back-end server */
+        m = CWX | CWY | CWWidth | CWHeight;
+        c.x = pWindow->origin.x - wBorderWidth(pWindow);
+        c.y = pWindow->origin.y - wBorderWidth(pWindow);
+        c.width = pWindow->drawable.width;
+        c.height = pWindow->drawable.height;
+        if (pWindow->drawable.class != InputOnly) {
+            m |= CWBorderWidth;
+            c.border_width = pWindow->borderWidth;
+        }
+
+        XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
+        dmxSync(dmxScreen, False);
     }
 
     DMX_WRAP(PositionWindow, dmxPositionWindow, dmxScreen, pScreen);
@@ -465,110 +480,111 @@ Bool dmxPositionWindow(WindowPtr pWindow, int x, int y)
     return ret;
 }
 
-static void dmxDoChangeWindowAttributes(WindowPtr pWindow,
-					unsigned long *mask,
-					XSetWindowAttributes *attribs)
+static void
+dmxDoChangeWindowAttributes(WindowPtr pWindow,
+                            unsigned long *mask, XSetWindowAttributes * attribs)
 {
-    dmxPixPrivPtr         pPixPriv;
+    dmxPixPrivPtr pPixPriv;
 
     if (*mask & CWBackPixmap) {
-	switch (pWindow->backgroundState) {
-	case None:
-	    attribs->background_pixmap = None;
-	    break;
-
-	case ParentRelative:
-	    attribs->background_pixmap = ParentRelative;
-	    break;
-
-	case BackgroundPixmap:
-	    pPixPriv = DMX_GET_PIXMAP_PRIV(pWindow->background.pixmap);
-	    attribs->background_pixmap = pPixPriv->pixmap;
-	    break;
-
-	case BackgroundPixel:
-	    *mask &= ~CWBackPixmap;
-	    break;
-	}
+        switch (pWindow->backgroundState) {
+        case None:
+            attribs->background_pixmap = None;
+            break;
+
+        case ParentRelative:
+            attribs->background_pixmap = ParentRelative;
+            break;
+
+        case BackgroundPixmap:
+            pPixPriv = DMX_GET_PIXMAP_PRIV(pWindow->background.pixmap);
+            attribs->background_pixmap = pPixPriv->pixmap;
+            break;
+
+        case BackgroundPixel:
+            *mask &= ~CWBackPixmap;
+            break;
+        }
     }
 
     if (*mask & CWBackPixel) {
-	if (pWindow->backgroundState == BackgroundPixel)
-	    attribs->background_pixel = pWindow->background.pixel;
-	else
-	    *mask &= ~CWBackPixel;
+        if (pWindow->backgroundState == BackgroundPixel)
+            attribs->background_pixel = pWindow->background.pixel;
+        else
+            *mask &= ~CWBackPixel;
     }
 
     if (*mask & CWBorderPixmap) {
-	if (pWindow->borderIsPixel)
-	    *mask &= ~CWBorderPixmap;
-	else {
-	    pPixPriv = DMX_GET_PIXMAP_PRIV(pWindow->border.pixmap);
-	    attribs->border_pixmap = pPixPriv->pixmap;
-	}
+        if (pWindow->borderIsPixel)
+            *mask &= ~CWBorderPixmap;
+        else {
+            pPixPriv = DMX_GET_PIXMAP_PRIV(pWindow->border.pixmap);
+            attribs->border_pixmap = pPixPriv->pixmap;
+        }
     }
 
     if (*mask & CWBorderPixel) {
-	if (pWindow->borderIsPixel)
-	    attribs->border_pixel = pWindow->border.pixel;
-	else
-	    *mask &= ~CWBorderPixel;
+        if (pWindow->borderIsPixel)
+            attribs->border_pixel = pWindow->border.pixel;
+        else
+            *mask &= ~CWBorderPixel;
     }
 
     if (*mask & CWBitGravity)
-	attribs->bit_gravity = pWindow->bitGravity;
+        attribs->bit_gravity = pWindow->bitGravity;
 
     if (*mask & CWWinGravity)
-	*mask &= ~CWWinGravity; /* Handled by dix */
+        *mask &= ~CWWinGravity; /* Handled by dix */
 
     if (*mask & CWBackingStore)
-	*mask &= ~CWBackingStore; /* Backing store not supported */
+        *mask &= ~CWBackingStore;       /* Backing store not supported */
 
     if (*mask & CWBackingPlanes)
-	*mask &= ~CWBackingPlanes; /* Backing store not supported */
+        *mask &= ~CWBackingPlanes;      /* Backing store not supported */
 
     if (*mask & CWBackingPixel)
-	*mask &= ~CWBackingPixel; /* Backing store not supported */
+        *mask &= ~CWBackingPixel;       /* Backing store not supported */
 
     if (*mask & CWOverrideRedirect)
-	attribs->override_redirect = pWindow->overrideRedirect;
+        attribs->override_redirect = pWindow->overrideRedirect;
 
     if (*mask & CWSaveUnder)
-	*mask &= ~CWSaveUnder; /* Save unders not supported */
+        *mask &= ~CWSaveUnder;  /* Save unders not supported */
 
     if (*mask & CWEventMask)
-	*mask &= ~CWEventMask; /* Events are handled by dix */
+        *mask &= ~CWEventMask;  /* Events are handled by dix */
 
     if (*mask & CWDontPropagate)
-	*mask &= ~CWDontPropagate; /* Events are handled by dix */
+        *mask &= ~CWDontPropagate;      /* Events are handled by dix */
 
     if (*mask & CWColormap) {
-	ColormapPtr         pCmap;
-	dmxColormapPrivPtr  pCmapPriv;
+        ColormapPtr pCmap;
+        dmxColormapPrivPtr pCmapPriv;
 
-	dixLookupResourceByType((pointer*) &pCmap, wColormap(pWindow),
-				RT_COLORMAP, NullClient, DixUnknownAccess);
-	pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap);
-	attribs->colormap = pCmapPriv->cmap;
+        dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow),
+                                RT_COLORMAP, NullClient, DixUnknownAccess);
+        pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap);
+        attribs->colormap = pCmapPriv->cmap;
     }
 
     if (*mask & CWCursor)
-	*mask &= ~CWCursor; /* Handled by the cursor code */
+        *mask &= ~CWCursor;     /* Handled by the cursor code */
 }
 
 /** Change the window attributes of \a pWindow. */
-Bool dmxChangeWindowAttributes(WindowPtr pWindow, unsigned long mask)
+Bool
+dmxChangeWindowAttributes(WindowPtr pWindow, unsigned long mask)
 {
-    ScreenPtr             pScreen = pWindow->drawable.pScreen;
-    DMXScreenInfo        *dmxScreen = &dmxScreens[pScreen->myNum];
-    Bool                  ret = TRUE;
-    dmxWinPrivPtr         pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    XSetWindowAttributes  attribs;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    Bool ret = TRUE;
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    XSetWindowAttributes attribs;
 
     DMX_UNWRAP(ChangeWindowAttributes, dmxScreen, pScreen);
 #if 0
     if (pScreen->ChangeWindowAttributes)
-	ret = pScreen->ChangeWindowAttributes(pWindow, mask);
+        ret = pScreen->ChangeWindowAttributes(pWindow, mask);
 #endif
 
     /* Change window attribs on back-end server */
@@ -578,13 +594,13 @@ Bool dmxChangeWindowAttributes(WindowPtr pWindow, unsigned long mask)
     pWinPriv->attribMask |= mask;
 
     if (mask && pWinPriv->window) {
-	XChangeWindowAttributes(dmxScreen->beDisplay, pWinPriv->window,
-				mask, &attribs);
-	dmxSync(dmxScreen, False);
+        XChangeWindowAttributes(dmxScreen->beDisplay, pWinPriv->window,
+                                mask, &attribs);
+        dmxSync(dmxScreen, False);
     }
 
     DMX_WRAP(ChangeWindowAttributes, dmxChangeWindowAttributes, dmxScreen,
-	     pScreen);
+             pScreen);
 
     return ret;
 }
@@ -592,17 +608,18 @@ Bool dmxChangeWindowAttributes(WindowPtr pWindow, unsigned long mask)
 /** Realize \a pWindow on the back-end server.  If the lazy window
  *  creation optimization is enabled, the window is only realized when
  *  it at least partially overlaps the screen. */
-Bool dmxRealizeWindow(WindowPtr pWindow)
+Bool
+dmxRealizeWindow(WindowPtr pWindow)
 {
-    ScreenPtr      pScreen = pWindow->drawable.pScreen;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    Bool           ret = TRUE;
-    dmxWinPrivPtr  pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    Bool ret = TRUE;
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
 
     DMX_UNWRAP(RealizeWindow, dmxScreen, pScreen);
 #if 0
     if (pScreen->RealizeWindow)
-	ret = pScreen->RealizeWindow(pWindow);
+        ret = pScreen->RealizeWindow(pWindow);
 #endif
 
     /* Determine if the window is completely off the visible portion of
@@ -612,13 +629,13 @@ Bool dmxRealizeWindow(WindowPtr pWindow)
     /* If the window hasn't been created and it's not offscreen, then
        create it */
     if (!pWinPriv->window && !pWinPriv->offscreen) {
-	dmxCreateAndRealizeWindow(pWindow, FALSE);
+        dmxCreateAndRealizeWindow(pWindow, FALSE);
     }
 
     if (pWinPriv->window) {
-	/* Realize window on back-end server */
-	XMapWindow(dmxScreen->beDisplay, pWinPriv->window);
-	dmxSync(dmxScreen, False);
+        /* Realize window on back-end server */
+        XMapWindow(dmxScreen->beDisplay, pWinPriv->window);
+        dmxSync(dmxScreen, False);
     }
 
     /* Let the other functions know that the window is now mapped */
@@ -631,23 +648,24 @@ Bool dmxRealizeWindow(WindowPtr pWindow)
 }
 
 /** Unrealize \a pWindow on the back-end server. */
-Bool dmxUnrealizeWindow(WindowPtr pWindow)
+Bool
+dmxUnrealizeWindow(WindowPtr pWindow)
 {
-    ScreenPtr      pScreen = pWindow->drawable.pScreen;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    Bool           ret = TRUE;
-    dmxWinPrivPtr  pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    Bool ret = TRUE;
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
 
     DMX_UNWRAP(UnrealizeWindow, dmxScreen, pScreen);
 #if 0
     if (pScreen->UnrealizeWindow)
-	ret = pScreen->UnrealizeWindow(pWindow);
+        ret = pScreen->UnrealizeWindow(pWindow);
 #endif
 
     if (pWinPriv->window) {
-	/* Unrealize window on back-end server */
-	XUnmapWindow(dmxScreen->beDisplay, pWinPriv->window);
-	dmxSync(dmxScreen, False);
+        /* Unrealize window on back-end server */
+        XUnmapWindow(dmxScreen->beDisplay, pWinPriv->window);
+        dmxSync(dmxScreen, False);
     }
 
     /* When unrealized (i.e., unmapped), the window is always considered
@@ -657,7 +675,7 @@ Bool dmxUnrealizeWindow(WindowPtr pWindow)
 
 #ifdef GLXEXT
     if (pWinPriv->swapGroup && pWinPriv->windowUnmapped)
-	pWinPriv->windowUnmapped(pWindow);
+        pWinPriv->windowUnmapped(pWindow);
 #endif
 
     DMX_WRAP(UnrealizeWindow, dmxUnrealizeWindow, dmxScreen, pScreen);
@@ -666,118 +684,122 @@ Bool dmxUnrealizeWindow(WindowPtr pWindow)
     return ret;
 }
 
-static void dmxDoRestackWindow(WindowPtr pWindow)
+static void
+dmxDoRestackWindow(WindowPtr pWindow)
 {
-    ScreenPtr       pScreen = pWindow->drawable.pScreen;
-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr   pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    WindowPtr       pNextSib = pWindow->nextSib;
-    unsigned int    m;
-    XWindowChanges  c;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    WindowPtr pNextSib = pWindow->nextSib;
+    unsigned int m;
+    XWindowChanges c;
 
     if (pNextSib == NullWindow) {
-	/* Window is at the bottom of the stack */
-	m = CWStackMode;
-	c.sibling = (Window)0;
-	c.stack_mode = Below;
-	XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
-    } else {
-	/* Window is not at the bottom of the stack */
-	dmxWinPrivPtr  pNextSibPriv = DMX_GET_WINDOW_PRIV(pNextSib);
-
-	/* Handle case where siblings have not yet been created due to
+        /* Window is at the bottom of the stack */
+        m = CWStackMode;
+        c.sibling = (Window) 0;
+        c.stack_mode = Below;
+        XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
+    }
+    else {
+        /* Window is not at the bottom of the stack */
+        dmxWinPrivPtr pNextSibPriv = DMX_GET_WINDOW_PRIV(pNextSib);
+
+        /* Handle case where siblings have not yet been created due to
            lazy window creation optimization by first finding the next
            sibling in the sibling list that has been created (if any)
            and then putting the current window just above that sibling,
            and if no next siblings have been created yet, then put it at
            the bottom of the stack (since it might have a previous
            sibling that should be above it). */
-	while (!pNextSibPriv->window) {
-	    pNextSib = pNextSib->nextSib;
-	    if (pNextSib == NullWindow) {
-		/* Window is at the bottom of the stack */
-		m = CWStackMode;
-		c.sibling = (Window)0;
-		c.stack_mode = Below;
-		XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
-		return;
-	    }
-	    pNextSibPriv = DMX_GET_WINDOW_PRIV(pNextSib);
-	}
-
-	m = CWStackMode | CWSibling;
-	c.sibling = pNextSibPriv->window;
-	c.stack_mode = Above;
-	XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
+        while (!pNextSibPriv->window) {
+            pNextSib = pNextSib->nextSib;
+            if (pNextSib == NullWindow) {
+                /* Window is at the bottom of the stack */
+                m = CWStackMode;
+                c.sibling = (Window) 0;
+                c.stack_mode = Below;
+                XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
+                return;
+            }
+            pNextSibPriv = DMX_GET_WINDOW_PRIV(pNextSib);
+        }
+
+        m = CWStackMode | CWSibling;
+        c.sibling = pNextSibPriv->window;
+        c.stack_mode = Above;
+        XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
     }
 }
 
 /** Handle window restacking.  The actual restacking occurs in
  *  #dmxDoRestackWindow(). */
-void dmxRestackWindow(WindowPtr pWindow, WindowPtr pOldNextSib)
+void
+dmxRestackWindow(WindowPtr pWindow, WindowPtr pOldNextSib)
 {
-    ScreenPtr       pScreen = pWindow->drawable.pScreen;
-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr   pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
 
     DMX_UNWRAP(RestackWindow, dmxScreen, pScreen);
 #if 0
     if (pScreen->RestackWindow)
-	pScreen->RestackWindow(pWindow, pOldNextSib);
+        pScreen->RestackWindow(pWindow, pOldNextSib);
 #endif
 
     if (pOldNextSib != pWindow->nextSib) {
-	/* Track restacking for lazy window creation optimization */
-	pWinPriv->restacked = TRUE;
-
-	/* Restack window on back-end server */
-	if (pWinPriv->window) {
-	    dmxDoRestackWindow(pWindow);
-	    dmxSync(dmxScreen, False);
-	}
+        /* Track restacking for lazy window creation optimization */
+        pWinPriv->restacked = TRUE;
+
+        /* Restack window on back-end server */
+        if (pWinPriv->window) {
+            dmxDoRestackWindow(pWindow);
+            dmxSync(dmxScreen, False);
+        }
     }
 
     DMX_WRAP(RestackWindow, dmxRestackWindow, dmxScreen, pScreen);
     dmxUpdateWindowInfo(DMX_UPDATE_RESTACK, pWindow);
 }
 
-static Bool dmxWindowExposurePredicate(Display *dpy, XEvent *ev, XPointer ptr)
+static Bool
+dmxWindowExposurePredicate(Display * dpy, XEvent * ev, XPointer ptr)
 {
-    return (ev->type == Expose && ev->xexpose.window == *(Window *)ptr);
+    return (ev->type == Expose && ev->xexpose.window == *(Window *) ptr);
 }
 
 /** Handle exposures on \a pWindow.  Since window exposures are handled
  *  in DMX, the events that are generated by the back-end server are
  *  redundant, so we eat them here. */
-void dmxWindowExposures(WindowPtr pWindow, RegionPtr prgn,
-			RegionPtr other_exposed)
+void
+dmxWindowExposures(WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)
 {
-    ScreenPtr      pScreen = pWindow->drawable.pScreen;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr  pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    XEvent         ev;
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    XEvent ev;
 
     DMX_UNWRAP(WindowExposures, dmxScreen, pScreen);
 
     dmxSync(dmxScreen, False);
 
     if (pWinPriv->window) {
-	while (XCheckIfEvent(dmxScreen->beDisplay, &ev,
-			     dmxWindowExposurePredicate,
-			     (XPointer)&pWinPriv->window)) {
-	    /* Handle expose events -- this should not be necessary
-	       since the base window in which the root window was
-	       created is guaranteed to be on top (override_redirect),
-	       so we should just swallow these events.  If for some
-	       reason the window is not on top, then we'd need to
-	       collect these events and send them to the client later
-	       (e.g., during the block handler as Xnest does). */
-	}
+        while (XCheckIfEvent(dmxScreen->beDisplay, &ev,
+                             dmxWindowExposurePredicate,
+                             (XPointer) & pWinPriv->window)) {
+            /* Handle expose events -- this should not be necessary
+               since the base window in which the root window was
+               created is guaranteed to be on top (override_redirect),
+               so we should just swallow these events.  If for some
+               reason the window is not on top, then we'd need to
+               collect these events and send them to the client later
+               (e.g., during the block handler as Xnest does). */
+        }
     }
 
 #if 1
     if (pScreen->WindowExposures)
-	pScreen->WindowExposures(pWindow, prgn, other_exposed);
+        pScreen->WindowExposures(pWindow, prgn, other_exposed);
 #endif
     DMX_WRAP(WindowExposures, dmxWindowExposures, dmxScreen, pScreen);
 }
@@ -785,18 +807,19 @@ void dmxWindowExposures(WindowPtr pWindow, RegionPtr prgn,
 /** Move \a pWindow on the back-end server.  Determine whether or not it
  *  is on or offscreen, and realize it if it is newly on screen and the
  *  lazy window creation optimization is enabled. */
-void dmxCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+void
+dmxCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
-    ScreenPtr       pScreen = pWindow->drawable.pScreen;
-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr   pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    unsigned int    m;
-    XWindowChanges  c;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    unsigned int m;
+    XWindowChanges c;
 
     DMX_UNWRAP(CopyWindow, dmxScreen, pScreen);
 #if 0
     if (pScreen->CopyWindow)
-	pScreen->CopyWindow(pWindow, ptOldOrg, prgnSrc);
+        pScreen->CopyWindow(pWindow, ptOldOrg, prgnSrc);
 #endif
 
     /* Determine if the window is completely off the visible portion of
@@ -806,17 +829,18 @@ void dmxCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     /* If the window is now on-screen and it is mapped and it has not
        been created yet, create it and map it */
     if (!pWinPriv->window && pWinPriv->mapped && !pWinPriv->offscreen) {
-	dmxCreateAndRealizeWindow(pWindow, TRUE);
-    } else if (pWinPriv->window) {
-	/* Move window on back-end server */
-	m = CWX | CWY | CWWidth | CWHeight;
-	c.x = pWindow->origin.x - wBorderWidth(pWindow);
-	c.y = pWindow->origin.y - wBorderWidth(pWindow);
-	c.width = pWindow->drawable.width;
-	c.height = pWindow->drawable.height;
-
-	XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
-	dmxSync(dmxScreen, False);
+        dmxCreateAndRealizeWindow(pWindow, TRUE);
+    }
+    else if (pWinPriv->window) {
+        /* Move window on back-end server */
+        m = CWX | CWY | CWWidth | CWHeight;
+        c.x = pWindow->origin.x - wBorderWidth(pWindow);
+        c.y = pWindow->origin.y - wBorderWidth(pWindow);
+        c.width = pWindow->drawable.width;
+        c.height = pWindow->drawable.height;
+
+        XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
+        dmxSync(dmxScreen, False);
     }
 
     DMX_WRAP(CopyWindow, dmxCopyWindow, dmxScreen, pScreen);
@@ -826,23 +850,24 @@ void dmxCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 /** Resize \a pWindow on the back-end server.  Determine whether or not
  *  it is on or offscreen, and realize it if it is newly on screen and
  *  the lazy window creation optimization is enabled. */
-void dmxResizeWindow(WindowPtr pWindow, int x, int y,
-		     unsigned int w, unsigned int h, WindowPtr pSib)
+void
+dmxResizeWindow(WindowPtr pWindow, int x, int y,
+                unsigned int w, unsigned int h, WindowPtr pSib)
 {
-    ScreenPtr       pScreen = pWindow->drawable.pScreen;
-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr   pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    dmxWinPrivPtr   pSibPriv;
-    unsigned int    m;
-    XWindowChanges  c;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    dmxWinPrivPtr pSibPriv;
+    unsigned int m;
+    XWindowChanges c;
 
     if (pSib)
-	pSibPriv = DMX_GET_WINDOW_PRIV(pSib);
+        pSibPriv = DMX_GET_WINDOW_PRIV(pSib);
 
     DMX_UNWRAP(ResizeWindow, dmxScreen, pScreen);
 #if 1
     if (pScreen->ResizeWindow)
-	pScreen->ResizeWindow(pWindow, x, y, w, h, pSib);
+        pScreen->ResizeWindow(pWindow, x, y, w, h, pSib);
 #endif
 
     /* Determine if the window is completely off the visible portion of
@@ -852,17 +877,18 @@ void dmxResizeWindow(WindowPtr pWindow, int x, int y,
     /* If the window is now on-screen and it is mapped and it has not
        been created yet, create it and map it */
     if (!pWinPriv->window && pWinPriv->mapped && !pWinPriv->offscreen) {
-	dmxCreateAndRealizeWindow(pWindow, TRUE);
-    } else if (pWinPriv->window) {
-	/* Handle resizing on back-end server */
-	m = CWX | CWY | CWWidth | CWHeight;
-	c.x = pWindow->origin.x - wBorderWidth(pWindow);
-	c.y = pWindow->origin.y - wBorderWidth(pWindow);
-	c.width = pWindow->drawable.width;
-	c.height = pWindow->drawable.height;
-
-	XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
-	dmxSync(dmxScreen, False);
+        dmxCreateAndRealizeWindow(pWindow, TRUE);
+    }
+    else if (pWinPriv->window) {
+        /* Handle resizing on back-end server */
+        m = CWX | CWY | CWWidth | CWHeight;
+        c.x = pWindow->origin.x - wBorderWidth(pWindow);
+        c.y = pWindow->origin.y - wBorderWidth(pWindow);
+        c.width = pWindow->drawable.width;
+        c.height = pWindow->drawable.height;
+
+        XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
+        dmxSync(dmxScreen, False);
     }
 
     DMX_WRAP(ResizeWindow, dmxResizeWindow, dmxScreen, pScreen);
@@ -870,30 +896,31 @@ void dmxResizeWindow(WindowPtr pWindow, int x, int y,
 }
 
 /** Reparent \a pWindow on the back-end server. */
-void dmxReparentWindow(WindowPtr pWindow, WindowPtr pPriorParent)
+void
+dmxReparentWindow(WindowPtr pWindow, WindowPtr pPriorParent)
 {
-    ScreenPtr      pScreen = pWindow->drawable.pScreen;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr  pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    dmxWinPrivPtr  pParentPriv = DMX_GET_WINDOW_PRIV(pWindow->parent);
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    dmxWinPrivPtr pParentPriv = DMX_GET_WINDOW_PRIV(pWindow->parent);
 
     DMX_UNWRAP(ReparentWindow, dmxScreen, pScreen);
 #if 0
     if (pScreen->ReparentWindow)
-	pScreen->ReparentWindow(pWindow, pPriorParent);
+        pScreen->ReparentWindow(pWindow, pPriorParent);
 #endif
 
     if (pWinPriv->window) {
-	if (!pParentPriv->window) {
-	    dmxCreateAndRealizeWindow(pWindow->parent, FALSE);
-	}
-
-	/* Handle reparenting on back-end server */
-	XReparentWindow(dmxScreen->beDisplay, pWinPriv->window,
-			pParentPriv->window,
-			pWindow->origin.x - wBorderWidth(pWindow),
-			pWindow->origin.x - wBorderWidth(pWindow));
-	dmxSync(dmxScreen, False);
+        if (!pParentPriv->window) {
+            dmxCreateAndRealizeWindow(pWindow->parent, FALSE);
+        }
+
+        /* Handle reparenting on back-end server */
+        XReparentWindow(dmxScreen->beDisplay, pWinPriv->window,
+                        pParentPriv->window,
+                        pWindow->origin.x - wBorderWidth(pWindow),
+                        pWindow->origin.x - wBorderWidth(pWindow));
+        dmxSync(dmxScreen, False);
     }
 
     DMX_WRAP(ReparentWindow, dmxReparentWindow, dmxScreen, pScreen);
@@ -901,116 +928,120 @@ void dmxReparentWindow(WindowPtr pWindow, WindowPtr pPriorParent)
 }
 
 /** Change border width for \a pWindow to \a width pixels. */
-void dmxChangeBorderWidth(WindowPtr pWindow, unsigned int width)
+void
+dmxChangeBorderWidth(WindowPtr pWindow, unsigned int width)
 {
-    ScreenPtr       pScreen = pWindow->drawable.pScreen;
-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr   pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    unsigned int    m;
-    XWindowChanges  c;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    unsigned int m;
+    XWindowChanges c;
 
     DMX_UNWRAP(ChangeBorderWidth, dmxScreen, pScreen);
 #if 1
     if (pScreen->ChangeBorderWidth)
-	pScreen->ChangeBorderWidth(pWindow, width);
+        pScreen->ChangeBorderWidth(pWindow, width);
 #endif
 
     /* NOTE: Do we need to check for on/off screen here? */
 
     if (pWinPriv->window) {
-	/* Handle border width change on back-end server */
-	m = CWBorderWidth;
-	c.border_width = width;
+        /* Handle border width change on back-end server */
+        m = CWBorderWidth;
+        c.border_width = width;
 
-	XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
-	dmxSync(dmxScreen, False);
+        XConfigureWindow(dmxScreen->beDisplay, pWinPriv->window, m, &c);
+        dmxSync(dmxScreen, False);
     }
 
     DMX_WRAP(ChangeBorderWidth, dmxChangeBorderWidth, dmxScreen, pScreen);
 }
 
-static void dmxDoSetShape(WindowPtr pWindow)
+static void
+dmxDoSetShape(WindowPtr pWindow)
 {
-    ScreenPtr       pScreen = pWindow->drawable.pScreen;
-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr   pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
-    int             nBox;
-    BoxPtr          pBox;
-    int             nRect;
-    XRectangle     *pRect;
-    XRectangle     *pRectFirst;
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    int nBox;
+    BoxPtr pBox;
+    int nRect;
+    XRectangle *pRect;
+    XRectangle *pRectFirst;
 
     /* First, set the bounding shape */
     if (wBoundingShape(pWindow)) {
-	pBox = RegionRects(wBoundingShape(pWindow));
-	nRect = nBox = RegionNumRects(wBoundingShape(pWindow));
-	pRectFirst = pRect = malloc(nRect * sizeof(*pRect));
-	while (nBox--) {
-	    pRect->x      = pBox->x1;
-	    pRect->y      = pBox->y1;
-	    pRect->width  = pBox->x2 - pBox->x1;
-	    pRect->height = pBox->y2 - pBox->y1;
-	    pBox++;
-	    pRect++;
-	}
-	XShapeCombineRectangles(dmxScreen->beDisplay, pWinPriv->window,
-				ShapeBounding, 0, 0,
-				pRectFirst, nRect,
-				ShapeSet, YXBanded);
-	free(pRectFirst);
-    } else {
-	XShapeCombineMask(dmxScreen->beDisplay, pWinPriv->window,
-			  ShapeBounding, 0, 0, None, ShapeSet);
+        pBox = RegionRects(wBoundingShape(pWindow));
+        nRect = nBox = RegionNumRects(wBoundingShape(pWindow));
+        pRectFirst = pRect = malloc(nRect * sizeof(*pRect));
+        while (nBox--) {
+            pRect->x = pBox->x1;
+            pRect->y = pBox->y1;
+            pRect->width = pBox->x2 - pBox->x1;
+            pRect->height = pBox->y2 - pBox->y1;
+            pBox++;
+            pRect++;
+        }
+        XShapeCombineRectangles(dmxScreen->beDisplay, pWinPriv->window,
+                                ShapeBounding, 0, 0,
+                                pRectFirst, nRect, ShapeSet, YXBanded);
+        free(pRectFirst);
+    }
+    else {
+        XShapeCombineMask(dmxScreen->beDisplay, pWinPriv->window,
+                          ShapeBounding, 0, 0, None, ShapeSet);
     }
 
     /* Next, set the clip shape */
     if (wClipShape(pWindow)) {
-	pBox = RegionRects(wClipShape(pWindow));
-	nRect = nBox = RegionNumRects(wClipShape(pWindow));
-	pRectFirst = pRect = malloc(nRect * sizeof(*pRect));
-	while (nBox--) {
-	    pRect->x      = pBox->x1;
-	    pRect->y      = pBox->y1;
-	    pRect->width  = pBox->x2 - pBox->x1;
-	    pRect->height = pBox->y2 - pBox->y1;
-	    pBox++;
-	    pRect++;
-	}
-	XShapeCombineRectangles(dmxScreen->beDisplay, pWinPriv->window,
-				ShapeClip, 0, 0,
-				pRectFirst, nRect,
-				ShapeSet, YXBanded);
-	free(pRectFirst);
-    } else {
-	XShapeCombineMask(dmxScreen->beDisplay, pWinPriv->window,
-			  ShapeClip, 0, 0, None, ShapeSet);
+        pBox = RegionRects(wClipShape(pWindow));
+        nRect = nBox = RegionNumRects(wClipShape(pWindow));
+        pRectFirst = pRect = malloc(nRect * sizeof(*pRect));
+        while (nBox--) {
+            pRect->x = pBox->x1;
+            pRect->y = pBox->y1;
+            pRect->width = pBox->x2 - pBox->x1;
+            pRect->height = pBox->y2 - pBox->y1;
+            pBox++;
+            pRect++;
+        }
+        XShapeCombineRectangles(dmxScreen->beDisplay, pWinPriv->window,
+                                ShapeClip, 0, 0,
+                                pRectFirst, nRect, ShapeSet, YXBanded);
+        free(pRectFirst);
+    }
+    else {
+        XShapeCombineMask(dmxScreen->beDisplay, pWinPriv->window,
+                          ShapeClip, 0, 0, None, ShapeSet);
     }
 
     if (XShapeInputSelected(dmxScreen->beDisplay, pWinPriv->window)) {
-	ErrorF("Input selected for window %x on Screen %d\n",
-	       (unsigned int)pWinPriv->window, pScreen->myNum);
+        ErrorF("Input selected for window %x on Screen %d\n",
+               (unsigned int) pWinPriv->window, pScreen->myNum);
     }
 }
 
 /** Set shape of \a pWindow on the back-end server. */
-void dmxSetShape(WindowPtr pWindow, int kind)
+void
+dmxSetShape(WindowPtr pWindow, int kind)
 {
-    ScreenPtr       pScreen = pWindow->drawable.pScreen;
-    DMXScreenInfo  *dmxScreen = &dmxScreens[pScreen->myNum];
-    dmxWinPrivPtr   pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
 
     DMX_UNWRAP(SetShape, dmxScreen, pScreen);
 #if 1
     if (pScreen->SetShape)
-	pScreen->SetShape(pWindow, kind);
+        pScreen->SetShape(pWindow, kind);
 #endif
 
     if (pWinPriv->window) {
-	/* Handle setting the current shape on the back-end server */
-	dmxDoSetShape(pWindow);
-	dmxSync(dmxScreen, False);
-    } else {
-	pWinPriv->isShaped = TRUE;
+        /* Handle setting the current shape on the back-end server */
+        dmxDoSetShape(pWindow);
+        dmxSync(dmxScreen, False);
+    }
+    else {
+        pWinPriv->isShaped = TRUE;
     }
 
     DMX_WRAP(SetShape, dmxSetShape, dmxScreen, pScreen);
diff --git a/xorg-server/hw/dmx/dmxwindow.h b/xorg-server/hw/dmx/dmxwindow.h
index 43316d35b..c6b2efee6 100644
--- a/xorg-server/hw/dmx/dmxwindow.h
+++ b/xorg-server/hw/dmx/dmxwindow.h
@@ -1,135 +1,132 @@
-/*

- * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Kevin E. Martin <kem@redhat.com>

- *

- */

-

-/** \file

- * Interface for window support.  \see dmxwindow.c */

-

-#ifndef DMXWINDOW_H

-#define DMXWINDOW_H

-

-#include "windowstr.h"

-

-/** Window private area. */

-typedef struct _dmxWinPriv {

-    Window         window;

-    Bool           offscreen;

-    Bool           mapped;

-    Bool           restacked;

-    unsigned long  attribMask;

-    Colormap       cmap;

-    Visual        *visual;

-    Bool           isShaped;

-    Bool           hasPict;

-#ifdef GLXEXT

-    void          *swapGroup;

-    int            barrier;

-    void         (*windowDestroyed)(WindowPtr);

-    void         (*windowUnmapped)(WindowPtr);

-#endif

-} dmxWinPrivRec, *dmxWinPrivPtr;

-

-

-extern Bool dmxInitWindow(ScreenPtr pScreen);

-

-extern Window dmxCreateRootWindow(WindowPtr pWindow);

-

-extern void dmxGetDefaultWindowAttributes(WindowPtr pWindow,

-					  Colormap *cmap,

-					  Visual **visual);

-extern void dmxCreateAndRealizeWindow(WindowPtr pWindow, Bool doSync);

-

-extern Bool dmxCreateWindow(WindowPtr pWindow);

-extern Bool dmxDestroyWindow(WindowPtr pWindow);

-extern Bool dmxPositionWindow(WindowPtr pWindow, int x, int y);

-extern Bool dmxChangeWindowAttributes(WindowPtr pWindow, unsigned long mask);

-extern Bool dmxRealizeWindow(WindowPtr pWindow);

-extern Bool dmxUnrealizeWindow(WindowPtr pWindow);

-extern void dmxRestackWindow(WindowPtr pWindow, WindowPtr pOldNextSib);

-extern void dmxWindowExposures(WindowPtr pWindow, RegionPtr prgn,

-			       RegionPtr other_exposed);

-extern void dmxCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,

-			  RegionPtr prgnSrc);

-

-extern void dmxResizeWindow(WindowPtr pWindow, int x, int y,

-			    unsigned int w, unsigned int h, WindowPtr pSib);

-extern void dmxReparentWindow(WindowPtr pWindow, WindowPtr pPriorParent);

-

-extern void dmxChangeBorderWidth(WindowPtr pWindow, unsigned int width);

-

-extern void dmxResizeScreenWindow(ScreenPtr pScreen,

-				  int x, int y, int w, int h);

-extern void dmxResizeRootWindow(WindowPtr pRoot,

-				int x, int y, int w, int h);

-

-extern Bool dmxBEDestroyWindow(WindowPtr pWindow);

-

-/* Support for shape extension */

-extern void dmxSetShape(WindowPtr pWindow, int kind);

-

-/** Get window private pointer. */

-#define DMX_GET_WINDOW_PRIV(_pWin) ((dmxWinPrivPtr) \

-    dixLookupPrivate(&(_pWin)->devPrivates, dmxWinPrivateKey))

-

-/* All of these macros are only used in dmxwindow.c */

-#define DMX_WINDOW_FUNC_PROLOGUE(_pGC)					\

-do {									\

-    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);			\

-    DMX_UNWRAP(funcs, pGCPriv, (_pGC));					\

-    if (pGCPriv->ops)							\

-	DMX_UNWRAP(ops, pGCPriv, (_pGC));				\

-} while (0)

-

-#define DMX_WINDOW_FUNC_EPILOGUE(_pGC)					\

-do {									\

-    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);			\

-    DMX_WRAP(funcs, &dmxGCFuncs, pGCPriv, (_pGC));			\

-    if (pGCPriv->ops)							\

-	DMX_WRAP(ops, &dmxGCOps, pGCPriv, (_pGC));			\

-} while (0)

-

-#define DMX_WINDOW_X1(_pWin)						\

-    ((_pWin)->drawable.x - wBorderWidth(_pWin))

-#define DMX_WINDOW_Y1(_pWin)						\

-    ((_pWin)->drawable.y - wBorderWidth(_pWin))

-#define DMX_WINDOW_X2(_pWin)						\

-    ((_pWin)->drawable.x + wBorderWidth(_pWin) + (_pWin)->drawable.width) 

-#define DMX_WINDOW_Y2(_pWin)						\

-    ((_pWin)->drawable.y + wBorderWidth(_pWin) + (_pWin)->drawable.height) 

-

-#define DMX_WINDOW_OFFSCREEN(_pWin)					\

-    (DMX_WINDOW_X1(_pWin) >= (_pWin)->drawable.pScreen->width  ||	\

-     DMX_WINDOW_Y1(_pWin) >= (_pWin)->drawable.pScreen->height ||	\

-     DMX_WINDOW_X2(_pWin) <= 0                                 ||	\

-     DMX_WINDOW_Y2(_pWin) <= 0)

-

-#endif /* DMXWINDOW_H */

+/*
+ * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+/** \file
+ * Interface for window support.  \see dmxwindow.c */
+
+#ifndef DMXWINDOW_H
+#define DMXWINDOW_H
+
+#include "windowstr.h"
+
+/** Window private area. */
+typedef struct _dmxWinPriv {
+    Window window;
+    Bool offscreen;
+    Bool mapped;
+    Bool restacked;
+    unsigned long attribMask;
+    Colormap cmap;
+    Visual *visual;
+    Bool isShaped;
+    Bool hasPict;
+#ifdef GLXEXT
+    void *swapGroup;
+    int barrier;
+    void (*windowDestroyed) (WindowPtr);
+    void (*windowUnmapped) (WindowPtr);
+#endif
+} dmxWinPrivRec, *dmxWinPrivPtr;
+
+extern Bool dmxInitWindow(ScreenPtr pScreen);
+
+extern Window dmxCreateRootWindow(WindowPtr pWindow);
+
+extern void dmxGetDefaultWindowAttributes(WindowPtr pWindow,
+                                          Colormap * cmap, Visual ** visual);
+extern void dmxCreateAndRealizeWindow(WindowPtr pWindow, Bool doSync);
+
+extern Bool dmxCreateWindow(WindowPtr pWindow);
+extern Bool dmxDestroyWindow(WindowPtr pWindow);
+extern Bool dmxPositionWindow(WindowPtr pWindow, int x, int y);
+extern Bool dmxChangeWindowAttributes(WindowPtr pWindow, unsigned long mask);
+extern Bool dmxRealizeWindow(WindowPtr pWindow);
+extern Bool dmxUnrealizeWindow(WindowPtr pWindow);
+extern void dmxRestackWindow(WindowPtr pWindow, WindowPtr pOldNextSib);
+extern void dmxWindowExposures(WindowPtr pWindow, RegionPtr prgn,
+                               RegionPtr other_exposed);
+extern void dmxCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,
+                          RegionPtr prgnSrc);
+
+extern void dmxResizeWindow(WindowPtr pWindow, int x, int y,
+                            unsigned int w, unsigned int h, WindowPtr pSib);
+extern void dmxReparentWindow(WindowPtr pWindow, WindowPtr pPriorParent);
+
+extern void dmxChangeBorderWidth(WindowPtr pWindow, unsigned int width);
+
+extern void dmxResizeScreenWindow(ScreenPtr pScreen,
+                                  int x, int y, int w, int h);
+extern void dmxResizeRootWindow(WindowPtr pRoot, int x, int y, int w, int h);
+
+extern Bool dmxBEDestroyWindow(WindowPtr pWindow);
+
+/* Support for shape extension */
+extern void dmxSetShape(WindowPtr pWindow, int kind);
+
+/** Get window private pointer. */
+#define DMX_GET_WINDOW_PRIV(_pWin) ((dmxWinPrivPtr) \
+    dixLookupPrivate(&(_pWin)->devPrivates, dmxWinPrivateKey))
+
+/* All of these macros are only used in dmxwindow.c */
+#define DMX_WINDOW_FUNC_PROLOGUE(_pGC)					\
+do {									\
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);			\
+    DMX_UNWRAP(funcs, pGCPriv, (_pGC));					\
+    if (pGCPriv->ops)							\
+	DMX_UNWRAP(ops, pGCPriv, (_pGC));				\
+} while (0)
+
+#define DMX_WINDOW_FUNC_EPILOGUE(_pGC)					\
+do {									\
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);			\
+    DMX_WRAP(funcs, &dmxGCFuncs, pGCPriv, (_pGC));			\
+    if (pGCPriv->ops)							\
+	DMX_WRAP(ops, &dmxGCOps, pGCPriv, (_pGC));			\
+} while (0)
+
+#define DMX_WINDOW_X1(_pWin)						\
+    ((_pWin)->drawable.x - wBorderWidth(_pWin))
+#define DMX_WINDOW_Y1(_pWin)						\
+    ((_pWin)->drawable.y - wBorderWidth(_pWin))
+#define DMX_WINDOW_X2(_pWin)						\
+    ((_pWin)->drawable.x + wBorderWidth(_pWin) + (_pWin)->drawable.width)
+#define DMX_WINDOW_Y2(_pWin)						\
+    ((_pWin)->drawable.y + wBorderWidth(_pWin) + (_pWin)->drawable.height)
+
+#define DMX_WINDOW_OFFSCREEN(_pWin)					\
+    (DMX_WINDOW_X1(_pWin) >= (_pWin)->drawable.pScreen->width  ||	\
+     DMX_WINDOW_Y1(_pWin) >= (_pWin)->drawable.pScreen->height ||	\
+     DMX_WINDOW_X2(_pWin) <= 0                                 ||	\
+     DMX_WINDOW_Y2(_pWin) <= 0)
+
+#endif                          /* DMXWINDOW_H */
diff --git a/xorg-server/hw/dmx/examples/dmxaddinput.c b/xorg-server/hw/dmx/examples/dmxaddinput.c
index dcfd4f5cc..fdd09b99b 100644
--- a/xorg-server/hw/dmx/examples/dmxaddinput.c
+++ b/xorg-server/hw/dmx/examples/dmxaddinput.c
@@ -36,14 +36,15 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/dmxext.h>
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    int                  event_base;
-    int                  error_base;
-    int                  major_version, minor_version, patch_version;
-    int                  id = -1;
-    int                  status;
+    Display *display = NULL;
+    int event_base;
+    int error_base;
+    int major_version, minor_version, patch_version;
+    int id = -1;
+    int status;
 
     if (argc != 5) {
         printf("Usage: %s display c|b name|screen isCore\n", argv[0]);
@@ -72,8 +73,9 @@ int main(int argc, char **argv)
 
     if (argv[2][0] == 'c') {
         status = DMXAddConsoleInput(display, argv[3], atoi(argv[4]), &id);
-    } else {
-        status = DMXAddBackendInput(display, atoi(argv[3]), atoi(argv[4]),&id);
+    }
+    else {
+        status = DMXAddBackendInput(display, atoi(argv[3]), atoi(argv[4]), &id);
     }
 
     printf("status = %d, id = %d\n", status, id);
diff --git a/xorg-server/hw/dmx/examples/dmxaddscreen.c b/xorg-server/hw/dmx/examples/dmxaddscreen.c
index 8e60872df..58129faa5 100644
--- a/xorg-server/hw/dmx/examples/dmxaddscreen.c
+++ b/xorg-server/hw/dmx/examples/dmxaddscreen.c
@@ -37,18 +37,21 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/dmxext.h>
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display             *display = NULL;
-    int                  event_base;
-    int                  error_base;
-    int                  major_version, minor_version, patch_version;
-    int                  screenNum;
-    DMXScreenAttributes  attr;
-    unsigned int         mask = 0;
+    Display *display = NULL;
+    int event_base;
+    int error_base;
+    int major_version, minor_version, patch_version;
+    int screenNum;
+    DMXScreenAttributes attr;
+    unsigned int mask = 0;
 
     if (argc != 4 && argc != 14) {
-        printf("Usage: %s display screenNum displayName [scrnx scrny scrnw scrnh rootx rooty rootw rooth originx originy]\n", argv[0]);
+        printf
+            ("Usage: %s display screenNum displayName [scrnx scrny scrnw scrnh rootx rooty rootw rooth originx originy]\n",
+             argv[0]);
         return -1;
     }
 
@@ -59,27 +62,25 @@ int main(int argc, char **argv)
 
     screenNum = strtol(argv[2], NULL, 0);
     if (argc == 14) {
-	mask |= (DMXScreenWindowXoffset |
-		 DMXScreenWindowYoffset |
-		 DMXScreenWindowWidth   |
-		 DMXScreenWindowHeight);
-	attr.screenWindowXoffset = strtol(argv[4],  NULL, 0);
-	attr.screenWindowYoffset = strtol(argv[5],  NULL, 0);
-	attr.screenWindowWidth   = strtol(argv[6],  NULL, 0);
-	attr.screenWindowHeight  = strtol(argv[7],  NULL, 0);
+        mask |= (DMXScreenWindowXoffset |
+                 DMXScreenWindowYoffset |
+                 DMXScreenWindowWidth | DMXScreenWindowHeight);
+        attr.screenWindowXoffset = strtol(argv[4], NULL, 0);
+        attr.screenWindowYoffset = strtol(argv[5], NULL, 0);
+        attr.screenWindowWidth = strtol(argv[6], NULL, 0);
+        attr.screenWindowHeight = strtol(argv[7], NULL, 0);
 
-	mask |= (DMXRootWindowXoffset |
-		 DMXRootWindowYoffset |
-		 DMXRootWindowWidth   |
-		 DMXRootWindowHeight);
-	attr.rootWindowXoffset = strtol(argv[8],  NULL, 0);
-	attr.rootWindowYoffset = strtol(argv[9],  NULL, 0);
-	attr.rootWindowWidth   = strtol(argv[10],  NULL, 0);
-	attr.rootWindowHeight  = strtol(argv[11], NULL, 0);
+        mask |= (DMXRootWindowXoffset |
+                 DMXRootWindowYoffset |
+                 DMXRootWindowWidth | DMXRootWindowHeight);
+        attr.rootWindowXoffset = strtol(argv[8], NULL, 0);
+        attr.rootWindowYoffset = strtol(argv[9], NULL, 0);
+        attr.rootWindowWidth = strtol(argv[10], NULL, 0);
+        attr.rootWindowHeight = strtol(argv[11], NULL, 0);
 
-	mask |= DMXRootWindowXorigin | DMXRootWindowYorigin;
-	attr.rootWindowXorigin = strtol(argv[12], NULL, 0);
-	attr.rootWindowYorigin = strtol(argv[13], NULL, 0);
+        mask |= DMXRootWindowXorigin | DMXRootWindowYorigin;
+        attr.rootWindowXorigin = strtol(argv[12], NULL, 0);
+        attr.rootWindowYorigin = strtol(argv[13], NULL, 0);
     }
 
     if (!DMXQueryExtension(display, &event_base, &error_base)) {
@@ -98,8 +99,8 @@ int main(int argc, char **argv)
            major_version, minor_version, patch_version);
 
     if (!DMXAddScreen(display, argv[3], mask, &attr, &screenNum))
-	printf("Failed to add %s as screen #%d\n", argv[2], screenNum);
-    
+        printf("Failed to add %s as screen #%d\n", argv[2], screenNum);
+
     XCloseDisplay(display);
     return 0;
 }
diff --git a/xorg-server/hw/dmx/examples/dmxinfo.c b/xorg-server/hw/dmx/examples/dmxinfo.c
index dedce6e8d..fea94e203 100644
--- a/xorg-server/hw/dmx/examples/dmxinfo.c
+++ b/xorg-server/hw/dmx/examples/dmxinfo.c
@@ -36,45 +36,52 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/dmxext.h>
 
-static void indent(int level)
+static void
+indent(int level)
 {
     int i;
-    for (i = 0; i < level; i++) printf("    ");
+
+    for (i = 0; i < level; i++)
+        printf("    ");
 }
 
-static void print_window_id(const char *displayName, Display *display,
-                            Window window, int level, int child)
+static void
+print_window_id(const char *displayName, Display * display,
+                Window window, int level, int child)
 {
-    char                 *name;
-    
-    if (!XFetchName(display, window, &name)) name = NULL;
+    char *name;
+
+    if (!XFetchName(display, window, &name))
+        name = NULL;
     indent(level);
-    if (child) printf("(%d) ", child);
+    if (child)
+        printf("(%d) ", child);
     printf("%s window 0x%08lx: %s%s\n",
            displayName,
-           (long unsigned)window,
-           name ? name : "",
-           (window == DefaultRootWindow(display))
+           (long unsigned) window,
+           name ? name : "", (window == DefaultRootWindow(display))
            ? " (DMX root window)" : "");
-    if (name) XFree(name);
+    if (name)
+        XFree(name);
 }
 
-static void print_info(Display *display, Window window, int level, int child)
+static void
+print_info(Display * display, Window window, int level, int child)
 {
     DMXWindowAttributes winfo[128];
-    int                 count;
-    int                 i;
-    
+    int count;
+    int i;
+
     if (!DMXGetWindowAttributes(display, window, &count, 128, winfo)) {
         printf("Could not get window information for 0x%08lx\n",
-               (long unsigned)window);
+               (long unsigned) window);
         exit(-2);
     }
     printf("\n");
     print_window_id("DMX", display, window, level, child);
     for (i = 0; i < count; i++) {
-        DMXScreenAttributes  sinfo;
-        Display              *backend;
+        DMXScreenAttributes sinfo;
+        Display *backend;
 
         /* This could also be cached -- the information doesn't change. */
         if (!DMXGetScreenAttributes(display, winfo[i].screen, &sinfo)) {
@@ -86,78 +93,86 @@ static void print_info(Display *display, Window window, int level, int child)
             exit(-2);
         }
         XCloseDisplay(backend);
-        
-        indent(level+1);
+
+        indent(level + 1);
         printf("%s window 0x%08lx: %dx%d%+d%+d",
                sinfo.displayName,
-               (long unsigned)winfo[i].window,
+               (long unsigned) winfo[i].window,
                winfo[i].pos.width, winfo[i].pos.height,
                winfo[i].pos.x, winfo[i].pos.y);
         if (!winfo[i].vis.width
-            && !winfo[i].vis.height
-            && !winfo[i].vis.x
-            && !winfo[i].vis.y) printf(" not visible\n");
+            && !winfo[i].vis.height && !winfo[i].vis.x && !winfo[i].vis.y)
+            printf(" not visible\n");
         else if (winfo[i].vis.width == winfo[i].pos.width
                  && winfo[i].vis.height == winfo[i].pos.height) {
-            printf( " %+d%+d\n", winfo[i].vis.x, winfo[i].vis.y);
-        } else {
-            printf( " %dx%d%+d%+d\n",
-                    winfo[i].vis.width, winfo[i].vis.height,
-                    winfo[i].vis.x, winfo[i].vis.y);
+            printf(" %+d%+d\n", winfo[i].vis.x, winfo[i].vis.y);
+        }
+        else {
+            printf(" %dx%d%+d%+d\n",
+                   winfo[i].vis.width, winfo[i].vis.height,
+                   winfo[i].vis.x, winfo[i].vis.y);
         }
     }
 }
 
-static void print_tree(Display *display, Window window, int level, int child)
+static void
+print_tree(Display * display, Window window, int level, int child)
 {
-    Window       root, parent;
-    Window       *list;
+    Window root, parent;
+    Window *list;
     unsigned int count;
     unsigned int i;
 
     print_info(display, window, level, child);
-    
+
     if (!XQueryTree(display, window, &root, &parent, &list, &count)) {
         printf("Cannot query window tree for 0x%08lx\n",
-               (long unsigned)window);
+               (long unsigned) window);
         exit(-3);
     }
 
     if (count) {
-        indent(level+1);
+        indent(level + 1);
         printf("%d child%s:\n", count, count > 1 ? "ren" : "");
         for (i = 0; i < count; i++) {
-            print_tree(display, list[i], level+1, i+1);
+            print_tree(display, list[i], level + 1, i + 1);
         }
     }
 }
 
-static const char *core(DMXInputAttributes *iinfo)
+static const char *
+core(DMXInputAttributes * iinfo)
 {
-    if (iinfo->isCore)         return "core";
-    else if (iinfo->sendsCore) return "extension (sends core)";
-    else                       return "extension";
+    if (iinfo->isCore)
+        return "core";
+    else if (iinfo->sendsCore)
+        return "extension (sends core)";
+    else
+        return "extension";
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    Window               window   = 0;
-    int                  event_base;
-    int                  error_base;
-    int                  major_version, minor_version, patch_version;
-    DMXScreenAttributes  sinfo;
-    DMXInputAttributes   iinfo;
-    int                  count;
-    int                  i;
+    Display *display = NULL;
+    Window window = 0;
+    int event_base;
+    int error_base;
+    int major_version, minor_version, patch_version;
+    DMXScreenAttributes sinfo;
+    DMXInputAttributes iinfo;
+    int count;
+    int i;
 
     if (argc == 2 || argc == 3) {
         if (!(display = XOpenDisplay(argv[1]))) {
             printf("Cannot open display %s\n", argv[1]);
             return -1;
         }
-        if (argc == 3) window = strtol(argv[2], NULL, 0);
-    } else {
+        if (argc == 3)
+            window = strtol(argv[2], NULL, 0);
+    }
+    else {
         printf("Usage: %s display [windowid]\n", argv[0]);
         return -1;
     }
@@ -231,9 +246,11 @@ int main(int argc, char **argv)
         }
     }
 
-    if (window) print_info(display, window, 0, 0);
-    else        print_tree(display, DefaultRootWindow(display), 0, 0);
-    
+    if (window)
+        print_info(display, window, 0, 0);
+    else
+        print_tree(display, DefaultRootWindow(display), 0, 0);
+
     XCloseDisplay(display);
     return 0;
 }
diff --git a/xorg-server/hw/dmx/examples/dmxreconfig.c b/xorg-server/hw/dmx/examples/dmxreconfig.c
index 042f8a112..9587682db 100644
--- a/xorg-server/hw/dmx/examples/dmxreconfig.c
+++ b/xorg-server/hw/dmx/examples/dmxreconfig.c
@@ -36,47 +36,47 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/dmxext.h>
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    int                  event_base;
-    int                  error_base;
-    int                  major_version, minor_version, patch_version;
-    int                  screen;
-    DMXScreenAttributes  attr;
-    unsigned int         mask = 0;
-    int                  status;
-    int                  errorScreen;
+    Display *display = NULL;
+    int event_base;
+    int error_base;
+    int major_version, minor_version, patch_version;
+    int screen;
+    DMXScreenAttributes attr;
+    unsigned int mask = 0;
+    int status;
+    int errorScreen;
 
     if (argc != 13) {
-	fprintf(stderr, "Usage: %s display screen scrnx scrny scrnw scrnh rootx rooty rootw rooth originx originy\n", argv[0]);
-	return -1;
+        fprintf(stderr,
+                "Usage: %s display screen scrnx scrny scrnw scrnh rootx rooty rootw rooth originx originy\n",
+                argv[0]);
+        return -1;
     }
 
     if (!(display = XOpenDisplay(argv[1]))) {
-	fprintf(stderr, "Cannot open display %s\n", argv[1]);
-	return -1;
+        fprintf(stderr, "Cannot open display %s\n", argv[1]);
+        return -1;
     }
 
-    screen  = strtol(argv[2],  NULL, 0);
+    screen = strtol(argv[2], NULL, 0);
 
     mask |= (DMXScreenWindowXoffset |
-	     DMXScreenWindowYoffset |
-	     DMXScreenWindowWidth   |
-	     DMXScreenWindowHeight);
-    attr.screenWindowXoffset = strtol(argv[3],  NULL, 0);
-    attr.screenWindowYoffset = strtol(argv[4],  NULL, 0);
-    attr.screenWindowWidth   = strtol(argv[5],  NULL, 0);
-    attr.screenWindowHeight  = strtol(argv[6],  NULL, 0);
+             DMXScreenWindowYoffset |
+             DMXScreenWindowWidth | DMXScreenWindowHeight);
+    attr.screenWindowXoffset = strtol(argv[3], NULL, 0);
+    attr.screenWindowYoffset = strtol(argv[4], NULL, 0);
+    attr.screenWindowWidth = strtol(argv[5], NULL, 0);
+    attr.screenWindowHeight = strtol(argv[6], NULL, 0);
 
     mask |= (DMXRootWindowXoffset |
-	     DMXRootWindowYoffset |
-	     DMXRootWindowWidth   |
-	     DMXRootWindowHeight);
-    attr.rootWindowXoffset = strtol(argv[7],  NULL, 0);
-    attr.rootWindowYoffset = strtol(argv[8],  NULL, 0);
-    attr.rootWindowWidth   = strtol(argv[9],  NULL, 0);
-    attr.rootWindowHeight  = strtol(argv[10], NULL, 0);
+             DMXRootWindowYoffset | DMXRootWindowWidth | DMXRootWindowHeight);
+    attr.rootWindowXoffset = strtol(argv[7], NULL, 0);
+    attr.rootWindowYoffset = strtol(argv[8], NULL, 0);
+    attr.rootWindowWidth = strtol(argv[9], NULL, 0);
+    attr.rootWindowHeight = strtol(argv[10], NULL, 0);
 
     mask |= DMXRootWindowXorigin | DMXRootWindowYorigin;
     attr.rootWindowXorigin = strtol(argv[11], NULL, 0);
@@ -99,62 +99,61 @@ int main(int argc, char **argv)
 
     if (major_version == 1 && minor_version < 3) {
         fprintf(stderr,
-		"ReconfigureScreen not supported in this extension version\n");
+                "ReconfigureScreen not supported in this extension version\n");
         return -1;
     }
 
     if (major_version < 2) {
         fprintf(stderr,
-		"ChangeScreensAttributes not supported in this extension "
-		"version\n");
+                "ChangeScreensAttributes not supported in this extension "
+                "version\n");
         return -1;
     }
 
     if (!(status = DMXChangeScreensAttributes(display, 1, &screen, 1, &mask,
                                               &attr, &errorScreen))) {
         printf("Reconfigured screen #%d to "
-	       "%dx%d%s%d%s%d %dx%d%s%d%s%d %s%d%s%d\n",
-	       screen,
-	       attr.screenWindowWidth,
-	       attr.screenWindowHeight,
-	       (attr.screenWindowXoffset < 0 ? "" : "+"),
-	       attr.screenWindowXoffset,
-	       (attr.screenWindowYoffset < 0 ? "" : "+"),
-	       attr.screenWindowYoffset,
-	       attr.rootWindowWidth,
-	       attr.rootWindowHeight,
-	       (attr.rootWindowXoffset < 0 ? "" : "+"),
-	       attr.rootWindowXoffset,
-	       (attr.rootWindowYoffset < 0 ? "" : "+"),
-	       attr.rootWindowYoffset,
-	       (attr.rootWindowXorigin < 0 ? "" : "+"),
-	       attr.rootWindowXorigin,
-	       (attr.rootWindowYorigin < 0 ? "" : "+"),
-	       attr.rootWindowYorigin);
-    } else {
+               "%dx%d%s%d%s%d %dx%d%s%d%s%d %s%d%s%d\n",
+               screen,
+               attr.screenWindowWidth,
+               attr.screenWindowHeight,
+               (attr.screenWindowXoffset < 0 ? "" : "+"),
+               attr.screenWindowXoffset,
+               (attr.screenWindowYoffset < 0 ? "" : "+"),
+               attr.screenWindowYoffset,
+               attr.rootWindowWidth,
+               attr.rootWindowHeight,
+               (attr.rootWindowXoffset < 0 ? "" : "+"),
+               attr.rootWindowXoffset,
+               (attr.rootWindowYoffset < 0 ? "" : "+"),
+               attr.rootWindowYoffset,
+               (attr.rootWindowXorigin < 0 ? "" : "+"),
+               attr.rootWindowXorigin,
+               (attr.rootWindowYorigin < 0 ? "" : "+"), attr.rootWindowYorigin);
+    }
+    else {
         fprintf(stderr,
                 "Could not set screen #%d to "
-		"%dx%d%s%d%s%d %dx%d%s%d%s%d %s%d%s%d\n"
+                "%dx%d%s%d%s%d %dx%d%s%d%s%d %s%d%s%d\n"
                 "[status = %d, errorScreen=%d]\n",
                 screen,
-		attr.screenWindowWidth,
-		attr.screenWindowHeight,
-		(attr.screenWindowXoffset < 0 ? "" : "+"),
-		attr.screenWindowXoffset,
-		(attr.screenWindowYoffset < 0 ? "" : "+"),
-		attr.screenWindowYoffset,
-		attr.rootWindowWidth,
-		attr.rootWindowHeight,
-		(attr.rootWindowXoffset < 0 ? "" : "+"),
-		attr.rootWindowXoffset,
-		(attr.rootWindowYoffset < 0 ? "" : "+"),
-		attr.rootWindowYoffset,
-		(attr.rootWindowXorigin < 0 ? "" : "+"),
-		attr.rootWindowXorigin,
-		(attr.rootWindowYorigin < 0 ? "" : "+"),
-		attr.rootWindowYorigin,
-		status, errorScreen);
-	return -1;
+                attr.screenWindowWidth,
+                attr.screenWindowHeight,
+                (attr.screenWindowXoffset < 0 ? "" : "+"),
+                attr.screenWindowXoffset,
+                (attr.screenWindowYoffset < 0 ? "" : "+"),
+                attr.screenWindowYoffset,
+                attr.rootWindowWidth,
+                attr.rootWindowHeight,
+                (attr.rootWindowXoffset < 0 ? "" : "+"),
+                attr.rootWindowXoffset,
+                (attr.rootWindowYoffset < 0 ? "" : "+"),
+                attr.rootWindowYoffset,
+                (attr.rootWindowXorigin < 0 ? "" : "+"),
+                attr.rootWindowXorigin,
+                (attr.rootWindowYorigin < 0 ? "" : "+"),
+                attr.rootWindowYorigin, status, errorScreen);
+        return -1;
     }
 
     XCloseDisplay(display);
diff --git a/xorg-server/hw/dmx/examples/dmxresize.c b/xorg-server/hw/dmx/examples/dmxresize.c
index caed91d8d..fed3bd08a 100644
--- a/xorg-server/hw/dmx/examples/dmxresize.c
+++ b/xorg-server/hw/dmx/examples/dmxresize.c
@@ -36,15 +36,16 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/dmxext.h>
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    int                  event_base;
-    int                  error_base;
-    int                  major_version, minor_version, patch_version;
-    int                  width, height, shiftX, shiftY, status;
+    Display *display = NULL;
+    int event_base;
+    int error_base;
+    int major_version, minor_version, patch_version;
+    int width, height, shiftX, shiftY, status;
     DMXDesktopAttributes attr;
-    unsigned int         mask;
+    unsigned int mask;
 
     if (argc != 6) {
         printf("Usage: %s display width height shiftX shiftY\n", argv[0]);
@@ -56,7 +57,7 @@ int main(int argc, char **argv)
         return -1;
     }
 
-    width  = strtol(argv[2], NULL, 0);
+    width = strtol(argv[2], NULL, 0);
     height = strtol(argv[3], NULL, 0);
     shiftX = strtol(argv[4], NULL, 0);
     shiftY = strtol(argv[5], NULL, 0);
@@ -76,11 +77,9 @@ int main(int argc, char **argv)
     printf("Extension version: %d.%d patch %d\n",
            major_version, minor_version, patch_version);
 
-    mask        = (DMXDesktopWidth  |
-		   DMXDesktopHeight |
-		   DMXDesktopShiftX |
-		   DMXDesktopShiftY);
-    attr.width  = width;
+    mask = (DMXDesktopWidth |
+            DMXDesktopHeight | DMXDesktopShiftX | DMXDesktopShiftY);
+    attr.width = width;
     attr.height = height;
     attr.shiftX = shiftX;
     attr.shiftY = shiftY;
@@ -98,7 +97,7 @@ int main(int argc, char **argv)
         printf("status = %d (UNKNOWN ERROR *****)\n", status);
         break;
     }
-    
+
     XCloseDisplay(display);
     return 0;
 }
diff --git a/xorg-server/hw/dmx/examples/dmxrminput.c b/xorg-server/hw/dmx/examples/dmxrminput.c
index ef62cab8b..0113a7f5c 100644
--- a/xorg-server/hw/dmx/examples/dmxrminput.c
+++ b/xorg-server/hw/dmx/examples/dmxrminput.c
@@ -36,13 +36,14 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/dmxext.h>
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    int                  event_base;
-    int                  error_base;
-    int                  major_version, minor_version, patch_version;
-    int                  status;
+    Display *display = NULL;
+    int event_base;
+    int error_base;
+    int major_version, minor_version, patch_version;
+    int status;
 
     if (argc != 3) {
         printf("Usage: %s display id\n", argv[0]);
diff --git a/xorg-server/hw/dmx/examples/dmxrmscreen.c b/xorg-server/hw/dmx/examples/dmxrmscreen.c
index fecf0f6c1..627875bda 100644
--- a/xorg-server/hw/dmx/examples/dmxrmscreen.c
+++ b/xorg-server/hw/dmx/examples/dmxrmscreen.c
@@ -37,13 +37,14 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/dmxext.h>
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    int                  event_base;
-    int                  error_base;
-    int                  major_version, minor_version, patch_version;
-    int                  screenNum;
+    Display *display = NULL;
+    int event_base;
+    int error_base;
+    int major_version, minor_version, patch_version;
+    int screenNum;
 
     if (argc != 3) {
         printf("Usage: %s display screenNum\n", argv[0]);
@@ -74,7 +75,7 @@ int main(int argc, char **argv)
 
     if (!DMXRemoveScreen(display, screenNum))
         printf("Failed to remove screen #%d\n", screenNum);
-    
+
     XCloseDisplay(display);
     return 0;
 }
diff --git a/xorg-server/hw/dmx/examples/dmxwininfo.c b/xorg-server/hw/dmx/examples/dmxwininfo.c
index 3d027d530..9b1ce76b6 100644
--- a/xorg-server/hw/dmx/examples/dmxwininfo.c
+++ b/xorg-server/hw/dmx/examples/dmxwininfo.c
@@ -43,183 +43,180 @@
 
 static const char *FontName = "fixed";
 
-
 static void
-EventLoop(Display *dpy, Window win, GC gc)
+EventLoop(Display * dpy, Window win, GC gc)
 {
-   XEvent ev;
-   while (1) {
-      XNextEvent( dpy, &ev );
-      switch (ev.type) {
-      case ReparentNotify:
-         break;
-      case MapNotify:
-         break;
-      case ConfigureNotify:
-      case Expose:
-         {         
+    XEvent ev;
+
+    while (1) {
+        XNextEvent(dpy, &ev);
+        switch (ev.type) {
+        case ReparentNotify:
+            break;
+        case MapNotify:
+            break;
+        case ConfigureNotify:
+        case Expose:
+        {
             int numScreens, count, i;
             DMXWindowAttributes *winInfo;
             int x, y;
             const char *msg = "DMX window info:";
 
             DMXGetScreenCount(dpy, &numScreens);
-            winInfo
-                = (DMXWindowAttributes *)
+            winInfo = (DMXWindowAttributes *)
                 malloc(numScreens * sizeof(DMXWindowAttributes));
             assert(winInfo);
-            if (!DMXGetWindowAttributes(dpy, win, &count,
-                                        numScreens, winInfo)) {
-               printf("Could not get window information for 0x%08lx\n",
-                      (long unsigned)win);
+            if (!DMXGetWindowAttributes(dpy, win, &count, numScreens, winInfo)) {
+                printf("Could not get window information for 0x%08lx\n",
+                       (long unsigned) win);
             }
             x = y = 50;
             XClearWindow(dpy, win);
             XDrawString(dpy, win, gc, x, y, msg, strlen(msg));
             y += 20;
             for (i = 0; i < count; i++) {
-               char str[500];
-               snprintf(str, sizeof(str),
-                       "screen %d:  pos: %dx%d+%d+%d  visible: %dx%d+%d+%d",
-                       winInfo[i].screen,
-                       winInfo[i].pos.width, winInfo[i].pos.height,
-                       winInfo[i].pos.x, winInfo[i].pos.y,
-                       winInfo[i].vis.width, winInfo[i].vis.height, 
-                       winInfo[i].vis.x, winInfo[i].vis.y);
-               XDrawString(dpy, win, gc, x, y, str, strlen(str));
-               y += 20;
+                char str[500];
+
+                snprintf(str, sizeof(str),
+                         "screen %d:  pos: %dx%d+%d+%d  visible: %dx%d+%d+%d",
+                         winInfo[i].screen,
+                         winInfo[i].pos.width, winInfo[i].pos.height,
+                         winInfo[i].pos.x, winInfo[i].pos.y,
+                         winInfo[i].vis.width, winInfo[i].vis.height,
+                         winInfo[i].vis.x, winInfo[i].vis.y);
+                XDrawString(dpy, win, gc, x, y, str, strlen(str));
+                y += 20;
             }
             free(winInfo);
-         }
-         break;
-      default:
-         printf("Event type 0x%x\n", ev.type);
-      }
-   }
+        }
+            break;
+        default:
+            printf("Event type 0x%x\n", ev.type);
+        }
+    }
 }
 
 int
 main(int argc, char *argv[])
 {
-   const char *displayName = NULL;
-   Display *dpy;
-   int event_base, error_base;
-   int scr, n;
-   long vinfoMask, attrMask;
-   XVisualInfo vinfoTemp, *visInfo;
-   Visual *vis;
-   Window win, root;
-   XSetWindowAttributes attr;
-   XFontStruct *fontInfo;
-   GC gc;
-
-   if (argc > 1) {
-      displayName = argv[1];
-   }
-
-   dpy = XOpenDisplay(displayName);
-   if (!dpy) {
-      fprintf(stderr, "Unable to open display %s\n", displayName);
-      return -1;
-   }
-
-   if (!DMXQueryExtension(dpy, &event_base, &error_base)) {
-      fprintf(stderr, "DMX extension not available on this display.\n");
-      return -1;
-   }
-
-   scr = DefaultScreen(dpy);
-   root = RootWindow(dpy, scr);
-   vis = DefaultVisual(dpy, scr);
-
-   vinfoMask = VisualIDMask;
-   vinfoTemp.visualid = vis->visualid;
-   visInfo = XGetVisualInfo(dpy, vinfoMask, &vinfoTemp, &n);
-   if (!visInfo || n != 1) {
-      fprintf(stderr, "Unable to get visual!\n");
-      XCloseDisplay(dpy);
-      return -1;
-   }
-
-   attr.background_pixel = 0;
-   attr.border_pixel = 0;
-   attr.colormap = XCreateColormap(dpy, root, visInfo->visual, AllocNone);
-   attr.event_mask = StructureNotifyMask | ExposureMask;
-   attrMask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
-
-   win = XCreateWindow(dpy, root,
-                       500, 500, 600, 400,  /* x, y, w, h */
-                       0, /* border_width */
-                       visInfo->depth, InputOutput,
-		       visInfo->visual, attrMask, &attr);
-
-
-   if (!win) {
-      fprintf(stderr, "Unable to create window!\n");
-      XCloseDisplay(dpy);
-      return -1;
-   }
-
-   fontInfo = XLoadQueryFont(dpy, FontName);
-   if (!fontInfo) {
-      fprintf(stderr, "Error: font %s not found\n", FontName);
-      exit(0);
-   }
-
-   gc = XCreateGC(dpy, win, 0, NULL);
-   XSetBackground(dpy, gc, BlackPixel(dpy, scr));
-   XSetForeground(dpy, gc, WhitePixel(dpy, scr));
-   XSetFont(dpy, gc, fontInfo->fid);
-
-   XMapWindow(dpy, win);
-
-   EventLoop(dpy, win, gc);
-
-   XDestroyWindow(dpy, win);
-   XCloseDisplay(dpy);
-   return 0;
+    const char *displayName = NULL;
+    Display *dpy;
+    int event_base, error_base;
+    int scr, n;
+    long vinfoMask, attrMask;
+    XVisualInfo vinfoTemp, *visInfo;
+    Visual *vis;
+    Window win, root;
+    XSetWindowAttributes attr;
+    XFontStruct *fontInfo;
+    GC gc;
+
+    if (argc > 1) {
+        displayName = argv[1];
+    }
+
+    dpy = XOpenDisplay(displayName);
+    if (!dpy) {
+        fprintf(stderr, "Unable to open display %s\n", displayName);
+        return -1;
+    }
+
+    if (!DMXQueryExtension(dpy, &event_base, &error_base)) {
+        fprintf(stderr, "DMX extension not available on this display.\n");
+        return -1;
+    }
+
+    scr = DefaultScreen(dpy);
+    root = RootWindow(dpy, scr);
+    vis = DefaultVisual(dpy, scr);
+
+    vinfoMask = VisualIDMask;
+    vinfoTemp.visualid = vis->visualid;
+    visInfo = XGetVisualInfo(dpy, vinfoMask, &vinfoTemp, &n);
+    if (!visInfo || n != 1) {
+        fprintf(stderr, "Unable to get visual!\n");
+        XCloseDisplay(dpy);
+        return -1;
+    }
+
+    attr.background_pixel = 0;
+    attr.border_pixel = 0;
+    attr.colormap = XCreateColormap(dpy, root, visInfo->visual, AllocNone);
+    attr.event_mask = StructureNotifyMask | ExposureMask;
+    attrMask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
+
+    win = XCreateWindow(dpy, root, 500, 500, 600, 400,  /* x, y, w, h */
+                        0,      /* border_width */
+                        visInfo->depth, InputOutput,
+                        visInfo->visual, attrMask, &attr);
+
+    if (!win) {
+        fprintf(stderr, "Unable to create window!\n");
+        XCloseDisplay(dpy);
+        return -1;
+    }
+
+    fontInfo = XLoadQueryFont(dpy, FontName);
+    if (!fontInfo) {
+        fprintf(stderr, "Error: font %s not found\n", FontName);
+        exit(0);
+    }
+
+    gc = XCreateGC(dpy, win, 0, NULL);
+    XSetBackground(dpy, gc, BlackPixel(dpy, scr));
+    XSetForeground(dpy, gc, WhitePixel(dpy, scr));
+    XSetFont(dpy, gc, fontInfo->fid);
+
+    XMapWindow(dpy, win);
+
+    EventLoop(dpy, win, gc);
+
+    XDestroyWindow(dpy, win);
+    XCloseDisplay(dpy);
+    return 0;
 }
 
 #if 00
 
-static void make_window( char *title, int color_flag )
+static void
+make_window(char *title, int color_flag)
 {
-   int x = 10, y = 10, width = 400, height = 300;
-   Display *dpy;
-   int scr;
-   Window root, win;
-   Colormap cmap;
-   XColor xcolor;
-   int attr_flags;
-   XVisualInfo *visinfo;
-   XSetWindowAttributes attr;
-   XTextProperty tp;
-   XSizeHints sh;
-   XEvent e;
-   XMesaContext context;
-   XMesaVisual visual;
-   XMesaBuffer buffer;
-
-
-   /*
-    * Do the usual X things to make a window.
-    */
-
-   dpy = XOpenDisplay(NULL);
-   if (!dpy) {
-      printf("Couldn't open default display!\n");
-      exit(1);
-   }
-
-   scr = DefaultScreen(dpy);
-   root = RootWindow(dpy, scr);
-
-   /* alloc visinfo struct */
-   visinfo = (XVisualInfo *) malloc( sizeof(XVisualInfo) );
-
-   /* Get a visual and colormap */
-   if (color_flag) {
-      /* Open TrueColor window */
+    int x = 10, y = 10, width = 400, height = 300;
+    Display *dpy;
+    int scr;
+    Window root, win;
+    Colormap cmap;
+    XColor xcolor;
+    int attr_flags;
+    XVisualInfo *visinfo;
+    XSetWindowAttributes attr;
+    XTextProperty tp;
+    XSizeHints sh;
+    XEvent e;
+    XMesaContext context;
+    XMesaVisual visual;
+    XMesaBuffer buffer;
+
+    /*
+     * Do the usual X things to make a window.
+     */
+
+    dpy = XOpenDisplay(NULL);
+    if (!dpy) {
+        printf("Couldn't open default display!\n");
+        exit(1);
+    }
+
+    scr = DefaultScreen(dpy);
+    root = RootWindow(dpy, scr);
+
+    /* alloc visinfo struct */
+    visinfo = (XVisualInfo *) malloc(sizeof(XVisualInfo));
+
+    /* Get a visual and colormap */
+    if (color_flag) {
+        /* Open TrueColor window */
 
 /*
       if (!XMatchVisualInfo( dpy, scr, 24, TrueColor, visinfo )) {
@@ -227,269 +224,254 @@ static void make_window( char *title, int color_flag )
 	 exit(1);
       }
 */
-      if (!XMatchVisualInfo( dpy, scr, 8, PseudoColor, visinfo )) {
-	 printf("Couldn't get 8-bit PseudoColor visual!\n");
-	 exit(1);
-      }
+        if (!XMatchVisualInfo(dpy, scr, 8, PseudoColor, visinfo)) {
+            printf("Couldn't get 8-bit PseudoColor visual!\n");
+            exit(1);
+        }
 
-      cmap = XCreateColormap( dpy, root, visinfo->visual, AllocNone );
-      Black = Red = Green = Blue = 0;
-   }
-   else {
-      /* Open color index window */
+        cmap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
+        Black = Red = Green = Blue = 0;
+    }
+    else {
+        /* Open color index window */
 
-      if (!XMatchVisualInfo( dpy, scr, 8, PseudoColor, visinfo )) {
-	 printf("Couldn't get 8-bit PseudoColor visual\n");
-	 exit(1);
-      }
+        if (!XMatchVisualInfo(dpy, scr, 8, PseudoColor, visinfo)) {
+            printf("Couldn't get 8-bit PseudoColor visual\n");
+            exit(1);
+        }
 
-      cmap = XCreateColormap( dpy, root, visinfo->visual, AllocNone );
+        cmap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
 
-      /* Allocate colors */
-      xcolor.red   = 0x0;
-      xcolor.green = 0x0;
-      xcolor.blue  = 0x0;
-      xcolor.flags = DoRed | DoGreen | DoBlue;
-      if (!XAllocColor( dpy, cmap, &xcolor )) {
-	 printf("Couldn't allocate black!\n");
-	 exit(1);
-      }
-      Black = xcolor.pixel;
-
-      xcolor.red   = 0xffff;
-      xcolor.green = 0x0;
-      xcolor.blue  = 0x0;
-      xcolor.flags = DoRed | DoGreen | DoBlue;
-      if (!XAllocColor( dpy, cmap, &xcolor )) {
-	 printf("Couldn't allocate red!\n");
-	 exit(1);
-      }
-      Red = xcolor.pixel;
-
-      xcolor.red   = 0x0;
-      xcolor.green = 0xffff;
-      xcolor.blue  = 0x0;
-      xcolor.flags = DoRed | DoGreen | DoBlue;
-      if (!XAllocColor( dpy, cmap, &xcolor )) {
-	 printf("Couldn't allocate green!\n");
-	 exit(1);
-      }
-      Green = xcolor.pixel;
-
-      xcolor.red   = 0x0;
-      xcolor.green = 0x0;
-      xcolor.blue  = 0xffff;
-      xcolor.flags = DoRed | DoGreen | DoBlue;
-      if (!XAllocColor( dpy, cmap, &xcolor )) {
-	 printf("Couldn't allocate blue!\n");
-	 exit(1);
-      }
-      Blue = xcolor.pixel;
-   }
-
-   /* set window attributes */
-   attr.colormap = cmap;
-   attr.event_mask = ExposureMask | StructureNotifyMask;
-   attr.border_pixel = BlackPixel( dpy, scr );
-   attr.background_pixel = BlackPixel( dpy, scr );
-   attr_flags = CWColormap | CWEventMask | CWBorderPixel | CWBackPixel;
-
-   /* Create the window */
-   win = XCreateWindow( dpy, root, x,y, width, height, 0,
-			    visinfo->depth, InputOutput,
-			    visinfo->visual,
-			    attr_flags, &attr);
-   if (!win) {
-      printf("Couldn't open window!\n");
-      exit(1);
-   }
-
-   XStringListToTextProperty(&title, 1, &tp);
-   sh.flags = USPosition | USSize;
-   XSetWMProperties(dpy, win, &tp, &tp, 0, 0, &sh, 0, 0);
-   XMapWindow(dpy, win);
-   while (1) {
-      XNextEvent( dpy, &e );
-      if (e.type == MapNotify && e.xmap.window == win) {
-	 break;
-      }
-   }
-
-
-   /*
-    * Now do the special Mesa/Xlib stuff!
-    */
-
-   visual = XMesaCreateVisual( dpy, visinfo,
-                              (GLboolean) color_flag,
-                               GL_FALSE,  /* alpha_flag */
-                               GL_FALSE,  /* db_flag */
-                               GL_FALSE,  /* stereo flag */
-                               GL_FALSE,  /* ximage_flag */
-                               0,         /* depth size */
-                               0,         /* stencil size */
-                               0,0,0,0,   /* accum_size */
-                               0,         /* num samples */
-                               0,         /* level */
-                               0          /* caveat */
-                              );
-   if (!visual) {
-      printf("Couldn't create Mesa/X visual!\n");
-      exit(1);
-   }
-
-   /* Create a Mesa rendering context */
-   context = XMesaCreateContext( visual,
-                                 NULL       /* share_list */
-                               );
-   if (!context) {
-      printf("Couldn't create Mesa/X context!\n");
-      exit(1);
-   }
-
-   buffer = XMesaCreateWindowBuffer( visual, win );
-   if (!buffer) {
-      printf("Couldn't create Mesa/X buffer!\n");
-      exit(1);
-   }
-
-
-   XMesaMakeCurrent( context, buffer );
-
-   /* Ready to render! */
+        /* Allocate colors */
+        xcolor.red = 0x0;
+        xcolor.green = 0x0;
+        xcolor.blue = 0x0;
+        xcolor.flags = DoRed | DoGreen | DoBlue;
+        if (!XAllocColor(dpy, cmap, &xcolor)) {
+            printf("Couldn't allocate black!\n");
+            exit(1);
+        }
+        Black = xcolor.pixel;
+
+        xcolor.red = 0xffff;
+        xcolor.green = 0x0;
+        xcolor.blue = 0x0;
+        xcolor.flags = DoRed | DoGreen | DoBlue;
+        if (!XAllocColor(dpy, cmap, &xcolor)) {
+            printf("Couldn't allocate red!\n");
+            exit(1);
+        }
+        Red = xcolor.pixel;
+
+        xcolor.red = 0x0;
+        xcolor.green = 0xffff;
+        xcolor.blue = 0x0;
+        xcolor.flags = DoRed | DoGreen | DoBlue;
+        if (!XAllocColor(dpy, cmap, &xcolor)) {
+            printf("Couldn't allocate green!\n");
+            exit(1);
+        }
+        Green = xcolor.pixel;
+
+        xcolor.red = 0x0;
+        xcolor.green = 0x0;
+        xcolor.blue = 0xffff;
+        xcolor.flags = DoRed | DoGreen | DoBlue;
+        if (!XAllocColor(dpy, cmap, &xcolor)) {
+            printf("Couldn't allocate blue!\n");
+            exit(1);
+        }
+        Blue = xcolor.pixel;
+    }
+
+    /* set window attributes */
+    attr.colormap = cmap;
+    attr.event_mask = ExposureMask | StructureNotifyMask;
+    attr.border_pixel = BlackPixel(dpy, scr);
+    attr.background_pixel = BlackPixel(dpy, scr);
+    attr_flags = CWColormap | CWEventMask | CWBorderPixel | CWBackPixel;
+
+    /* Create the window */
+    win = XCreateWindow(dpy, root, x, y, width, height, 0,
+                        visinfo->depth, InputOutput,
+                        visinfo->visual, attr_flags, &attr);
+    if (!win) {
+        printf("Couldn't open window!\n");
+        exit(1);
+    }
+
+    XStringListToTextProperty(&title, 1, &tp);
+    sh.flags = USPosition | USSize;
+    XSetWMProperties(dpy, win, &tp, &tp, 0, 0, &sh, 0, 0);
+    XMapWindow(dpy, win);
+    while (1) {
+        XNextEvent(dpy, &e);
+        if (e.type == MapNotify && e.xmap.window == win) {
+            break;
+        }
+    }
+
+    /*
+     * Now do the special Mesa/Xlib stuff!
+     */
+
+    visual = XMesaCreateVisual(dpy, visinfo, (GLboolean) color_flag, GL_FALSE,  /* alpha_flag */
+                               GL_FALSE,        /* db_flag */
+                               GL_FALSE,        /* stereo flag */
+                               GL_FALSE,        /* ximage_flag */
+                               0,       /* depth size */
+                               0,       /* stencil size */
+                               0, 0, 0, 0,      /* accum_size */
+                               0,       /* num samples */
+                               0,       /* level */
+                               0        /* caveat */
+        );
+    if (!visual) {
+        printf("Couldn't create Mesa/X visual!\n");
+        exit(1);
+    }
+
+    /* Create a Mesa rendering context */
+    context = XMesaCreateContext(visual, NULL   /* share_list */
+        );
+    if (!context) {
+        printf("Couldn't create Mesa/X context!\n");
+        exit(1);
+    }
+
+    buffer = XMesaCreateWindowBuffer(visual, win);
+    if (!buffer) {
+        printf("Couldn't create Mesa/X buffer!\n");
+        exit(1);
+    }
+
+    XMesaMakeCurrent(context, buffer);
+
+    /* Ready to render! */
 }
 
-
-
-static void draw_cube( void )
+static void
+draw_cube(void)
 {
-   /* X faces */
-   glIndexi( Red );
-   glColor3f( 1.0, 0.0, 0.0 );
-   glBegin( GL_POLYGON );
-   glVertex3f( 1.0, 1.0, 1.0 );
-   glVertex3f( 1.0, -1.0, 1.0 );
-   glVertex3f( 1.0, -1.0, -1.0 );
-   glVertex3f( 1.0, 1.0, -1.0 );
-   glEnd();
-
-   glBegin( GL_POLYGON );
-   glVertex3f( -1.0, 1.0, 1.0 );
-   glVertex3f( -1.0, 1.0, -1.0 );
-   glVertex3f( -1.0, -1.0, -1.0 );
-   glVertex3f( -1.0, -1.0, 1.0 );
-   glEnd();
-
-   /* Y faces */
-   glIndexi( Green );
-   glColor3f( 0.0, 1.0, 0.0 );
-   glBegin( GL_POLYGON );
-   glVertex3f(  1.0, 1.0,  1.0 );
-   glVertex3f(  1.0, 1.0, -1.0 );
-   glVertex3f( -1.0, 1.0, -1.0 );
-   glVertex3f( -1.0, 1.0,  1.0 );
-   glEnd();
-
-   glBegin( GL_POLYGON );
-   glVertex3f(  1.0, -1.0,  1.0 );
-   glVertex3f( -1.0, -1.0,  1.0 );
-   glVertex3f( -1.0, -1.0, -1.0 );
-   glVertex3f(  1.0, -1.0, -1.0 );
-   glEnd();
-
-   /* Z faces */
-   glIndexi( Blue );
-   glColor3f( 0.0, 0.0, 1.0 );
-   glBegin( GL_POLYGON );
-   glVertex3f(  1.0,  1.0,  1.0 );
-   glVertex3f( -1.0,  1.0,  1.0 );
-   glVertex3f( -1.0, -1.0,  1.0 );
-   glVertex3f(  1.0, -1.0,  1.0 );
-   glEnd();
-
-   glBegin( GL_POLYGON );
-   glVertex3f(  1.0, 1.0, -1.0 );
-   glVertex3f(  1.0,-1.0, -1.0 );
-   glVertex3f( -1.0,-1.0, -1.0 );
-   glVertex3f( -1.0, 1.0, -1.0 );
-   glEnd();
+    /* X faces */
+    glIndexi(Red);
+    glColor3f(1.0, 0.0, 0.0);
+    glBegin(GL_POLYGON);
+    glVertex3f(1.0, 1.0, 1.0);
+    glVertex3f(1.0, -1.0, 1.0);
+    glVertex3f(1.0, -1.0, -1.0);
+    glVertex3f(1.0, 1.0, -1.0);
+    glEnd();
+
+    glBegin(GL_POLYGON);
+    glVertex3f(-1.0, 1.0, 1.0);
+    glVertex3f(-1.0, 1.0, -1.0);
+    glVertex3f(-1.0, -1.0, -1.0);
+    glVertex3f(-1.0, -1.0, 1.0);
+    glEnd();
+
+    /* Y faces */
+    glIndexi(Green);
+    glColor3f(0.0, 1.0, 0.0);
+    glBegin(GL_POLYGON);
+    glVertex3f(1.0, 1.0, 1.0);
+    glVertex3f(1.0, 1.0, -1.0);
+    glVertex3f(-1.0, 1.0, -1.0);
+    glVertex3f(-1.0, 1.0, 1.0);
+    glEnd();
+
+    glBegin(GL_POLYGON);
+    glVertex3f(1.0, -1.0, 1.0);
+    glVertex3f(-1.0, -1.0, 1.0);
+    glVertex3f(-1.0, -1.0, -1.0);
+    glVertex3f(1.0, -1.0, -1.0);
+    glEnd();
+
+    /* Z faces */
+    glIndexi(Blue);
+    glColor3f(0.0, 0.0, 1.0);
+    glBegin(GL_POLYGON);
+    glVertex3f(1.0, 1.0, 1.0);
+    glVertex3f(-1.0, 1.0, 1.0);
+    glVertex3f(-1.0, -1.0, 1.0);
+    glVertex3f(1.0, -1.0, 1.0);
+    glEnd();
+
+    glBegin(GL_POLYGON);
+    glVertex3f(1.0, 1.0, -1.0);
+    glVertex3f(1.0, -1.0, -1.0);
+    glVertex3f(-1.0, -1.0, -1.0);
+    glVertex3f(-1.0, 1.0, -1.0);
+    glEnd();
 }
 
-
-
-
-static void display_loop( void )
+static void
+display_loop(void)
 {
-   GLfloat xrot, yrot, zrot;
+    GLfloat xrot, yrot, zrot;
 
-   xrot = yrot = zrot = 0.0;
+    xrot = yrot = zrot = 0.0;
 
-   glClearColor( 0.0, 0.0, 0.0, 0.0 );
-   glClearIndex( Black );
+    glClearColor(0.0, 0.0, 0.0, 0.0);
+    glClearIndex(Black);
 
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-   glFrustum( -1.0, 1.0,  -1.0, 1.0,  1.0, 10.0 );
-   glTranslatef( 0.0, 0.0, -5.0 );
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glFrustum(-1.0, 1.0, -1.0, 1.0, 1.0, 10.0);
+    glTranslatef(0.0, 0.0, -5.0);
 
-   glMatrixMode( GL_MODELVIEW );
-   glLoadIdentity();
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
 
-   glCullFace( GL_BACK );
-   glEnable( GL_CULL_FACE );
+    glCullFace(GL_BACK);
+    glEnable(GL_CULL_FACE);
 
-   glShadeModel( GL_FLAT );
+    glShadeModel(GL_FLAT);
 
-   while (1) {
-      glClear( GL_COLOR_BUFFER_BIT );
-      glPushMatrix();
-      glRotatef( xrot, 1.0, 0.0, 0.0 );
-      glRotatef( yrot, 0.0, 1.0, 0.0 );
-      glRotatef( zrot, 0.0, 0.0, 1.0 );
+    while (1) {
+        glClear(GL_COLOR_BUFFER_BIT);
+        glPushMatrix();
+        glRotatef(xrot, 1.0, 0.0, 0.0);
+        glRotatef(yrot, 0.0, 1.0, 0.0);
+        glRotatef(zrot, 0.0, 0.0, 1.0);
 
-      draw_cube();
+        draw_cube();
 
-      glPopMatrix();
-      glFinish();
+        glPopMatrix();
+        glFinish();
 
-      xrot += 10.0;
-      yrot += 7.0;
-      zrot -= 3.0;
-   }
+        xrot += 10.0;
+        yrot += 7.0;
+        zrot -= 3.0;
+    }
 
 }
 
-
-
-
-int main( int argc, char *argv[] )
+int
+main(int argc, char *argv[])
 {
-   int mode = 0;
-
-   if (argc >= 2)
-   {
-        if (strcmp(argv[1],"-ci")==0)
-           mode = 0;
-        else if (strcmp(argv[1],"-rgb")==0)
-           mode = 1;
-        else
-        {
-           printf("Bad flag: %s\n", argv[1]);
-           printf("Specify -ci for 8-bit color index or -rgb for RGB mode\n");
-           exit(1);
+    int mode = 0;
+
+    if (argc >= 2) {
+        if (strcmp(argv[1], "-ci") == 0)
+            mode = 0;
+        else if (strcmp(argv[1], "-rgb") == 0)
+            mode = 1;
+        else {
+            printf("Bad flag: %s\n", argv[1]);
+            printf("Specify -ci for 8-bit color index or -rgb for RGB mode\n");
+            exit(1);
         }
-   }
-   else
-   {
+    }
+    else {
         printf("Specify -ci for 8-bit color index or -rgb for RGB mode\n");
         printf("Defaulting to  8-bit color index\n");
-   }
+    }
 
-   make_window( argv[0], mode );
+    make_window(argv[0], mode);
 
-   display_loop();
-   return 0;
+    display_loop();
+    return 0;
 }
 
-
 #endif
diff --git a/xorg-server/hw/dmx/examples/ev.c b/xorg-server/hw/dmx/examples/ev.c
index ed23b8aa9..b70016a45 100644
--- a/xorg-server/hw/dmx/examples/ev.c
+++ b/xorg-server/hw/dmx/examples/ev.c
@@ -46,16 +46,17 @@
 
 struct input_event event;
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    char          name[64];           /* RATS: Use ok, but could be better */
-    char          buf[256] = { 0, };  /* RATS: Use ok */
-    unsigned char mask[EV_MAX/8 + 1]; /* RATS: Use ok */
-    int           version;
-    int           fd = 0;
-    int           rc;
-    int           i, j;
-    char          *tmp;
+    char name[64];              /* RATS: Use ok, but could be better */
+    char buf[256] = { 0, };     /* RATS: Use ok */
+    unsigned char mask[EV_MAX / 8 + 1]; /* RATS: Use ok */
+    int version;
+    int fd = 0;
+    int rc;
+    int i, j;
+    char *tmp;
 
 #define test_bit(bit) (mask[(bit)/8] & (1 << ((bit)%8)))
 
@@ -73,15 +74,32 @@ int main(int argc, char **argv)
             for (j = 0; j < EV_MAX; j++) {
                 if (test_bit(j)) {
                     const char *type = "unknown";
-                    switch(j) {
-                    case EV_KEY: type = "keys/buttons"; break;
-                    case EV_REL: type = "relative";     break;
-                    case EV_ABS: type = "absolute";     break;
-                    case EV_MSC: type = "reserved";     break;
-                    case EV_LED: type = "leds";         break;
-                    case EV_SND: type = "sound";        break;
-                    case EV_REP: type = "repeat";       break;
-                    case EV_FF:  type = "feedback";     break;
+
+                    switch (j) {
+                    case EV_KEY:
+                        type = "keys/buttons";
+                        break;
+                    case EV_REL:
+                        type = "relative";
+                        break;
+                    case EV_ABS:
+                        type = "absolute";
+                        break;
+                    case EV_MSC:
+                        type = "reserved";
+                        break;
+                    case EV_LED:
+                        type = "leds";
+                        break;
+                    case EV_SND:
+                        type = "sound";
+                        break;
+                    case EV_REP:
+                        type = "repeat";
+                        break;
+                    case EV_FF:
+                        type = "feedback";
+                        break;
                     }
                     printf(" %s", type);
                 }
@@ -96,27 +114,27 @@ int main(int argc, char **argv)
         if ((fd = open(name, O_RDWR, 0)) >= 0) {
             printf("%s: open, fd = %d\n", name, fd);
             for (i = 0; i < LED_MAX; i++) {
-                event.time.tv_sec  = time(0);
+                event.time.tv_sec = time(0);
                 event.time.tv_usec = 0;
-                event.type         = EV_LED;
-                event.code         = i;
-                event.value        = 0;
+                event.type = EV_LED;
+                event.code = i;
+                event.value = 0;
                 write(fd, &event, sizeof(event));
             }
-            
+
             while ((rc = read(fd, &event, sizeof(event))) > 0) {
                 printf("%-24.24s.%06lu type 0x%04x; code 0x%04x;"
                        " value 0x%08x; ",
                        ctime(&event.time.tv_sec),
-                       event.time.tv_usec,
-                       event.type, event.code, event.value);
+                       event.time.tv_usec, event.type, event.code, event.value);
                 switch (event.type) {
                 case EV_KEY:
                     if (event.code > BTN_MISC) {
                         printf("Button %d %s",
                                event.code & 0xff,
                                event.value ? "press" : "release");
-                    } else {
+                    }
+                    else {
                         printf("Key %d (0x%x) %s",
                                event.code & 0xff,
                                event.code & 0xff,
@@ -125,51 +143,125 @@ int main(int argc, char **argv)
                     break;
                 case EV_REL:
                     switch (event.code) {
-                    case REL_X:      tmp = "X";       break;
-                    case REL_Y:      tmp = "Y";       break;
-                    case REL_HWHEEL: tmp = "HWHEEL";  break;
-                    case REL_DIAL:   tmp = "DIAL";    break;
-                    case REL_WHEEL:  tmp = "WHEEL";   break;
-                    case REL_MISC:   tmp = "MISC";    break;
-                    default:         tmp = "UNKNOWN"; break;
+                    case REL_X:
+                        tmp = "X";
+                        break;
+                    case REL_Y:
+                        tmp = "Y";
+                        break;
+                    case REL_HWHEEL:
+                        tmp = "HWHEEL";
+                        break;
+                    case REL_DIAL:
+                        tmp = "DIAL";
+                        break;
+                    case REL_WHEEL:
+                        tmp = "WHEEL";
+                        break;
+                    case REL_MISC:
+                        tmp = "MISC";
+                        break;
+                    default:
+                        tmp = "UNKNOWN";
+                        break;
                     }
                     printf("Relative %s %d", tmp, event.value);
                     break;
                 case EV_ABS:
                     switch (event.code) {
-                    case ABS_X:        tmp = "X";        break;
-                    case ABS_Y:        tmp = "Y";        break;
-                    case ABS_Z:        tmp = "Z";        break;
-                    case ABS_RX:       tmp = "RX";       break;
-                    case ABS_RY:       tmp = "RY";       break;
-                    case ABS_RZ:       tmp = "RZ";       break;
-                    case ABS_THROTTLE: tmp = "THROTTLE"; break;
-                    case ABS_RUDDER:   tmp = "RUDDER";   break;
-                    case ABS_WHEEL:    tmp = "WHEEL";    break;
-                    case ABS_GAS:      tmp = "GAS";      break;
-                    case ABS_BRAKE:    tmp = "BRAKE";    break;
-                    case ABS_HAT0X:    tmp = "HAT0X";    break;
-                    case ABS_HAT0Y:    tmp = "HAT0Y";    break;
-                    case ABS_HAT1X:    tmp = "HAT1X";    break;
-                    case ABS_HAT1Y:    tmp = "HAT1Y";    break;
-                    case ABS_HAT2X:    tmp = "HAT2X";    break;
-                    case ABS_HAT2Y:    tmp = "HAT2Y";    break;
-                    case ABS_HAT3X:    tmp = "HAT3X";    break;
-                    case ABS_HAT3Y:    tmp = "HAT3Y";    break;
-                    case ABS_PRESSURE: tmp = "PRESSURE"; break;
-                    case ABS_DISTANCE: tmp = "DISTANCE"; break;
-                    case ABS_TILT_X:   tmp = "TILT_X";   break;
-                    case ABS_TILT_Y:   tmp = "TILT_Y";   break;
-                    case ABS_MISC:     tmp = "MISC";     break;
-                    default:           tmp = "UNKNOWN";  break;
+                    case ABS_X:
+                        tmp = "X";
+                        break;
+                    case ABS_Y:
+                        tmp = "Y";
+                        break;
+                    case ABS_Z:
+                        tmp = "Z";
+                        break;
+                    case ABS_RX:
+                        tmp = "RX";
+                        break;
+                    case ABS_RY:
+                        tmp = "RY";
+                        break;
+                    case ABS_RZ:
+                        tmp = "RZ";
+                        break;
+                    case ABS_THROTTLE:
+                        tmp = "THROTTLE";
+                        break;
+                    case ABS_RUDDER:
+                        tmp = "RUDDER";
+                        break;
+                    case ABS_WHEEL:
+                        tmp = "WHEEL";
+                        break;
+                    case ABS_GAS:
+                        tmp = "GAS";
+                        break;
+                    case ABS_BRAKE:
+                        tmp = "BRAKE";
+                        break;
+                    case ABS_HAT0X:
+                        tmp = "HAT0X";
+                        break;
+                    case ABS_HAT0Y:
+                        tmp = "HAT0Y";
+                        break;
+                    case ABS_HAT1X:
+                        tmp = "HAT1X";
+                        break;
+                    case ABS_HAT1Y:
+                        tmp = "HAT1Y";
+                        break;
+                    case ABS_HAT2X:
+                        tmp = "HAT2X";
+                        break;
+                    case ABS_HAT2Y:
+                        tmp = "HAT2Y";
+                        break;
+                    case ABS_HAT3X:
+                        tmp = "HAT3X";
+                        break;
+                    case ABS_HAT3Y:
+                        tmp = "HAT3Y";
+                        break;
+                    case ABS_PRESSURE:
+                        tmp = "PRESSURE";
+                        break;
+                    case ABS_DISTANCE:
+                        tmp = "DISTANCE";
+                        break;
+                    case ABS_TILT_X:
+                        tmp = "TILT_X";
+                        break;
+                    case ABS_TILT_Y:
+                        tmp = "TILT_Y";
+                        break;
+                    case ABS_MISC:
+                        tmp = "MISC";
+                        break;
+                    default:
+                        tmp = "UNKNOWN";
+                        break;
                     }
                     printf("Absolute %s %d", tmp, event.value);
                     break;
-                case EV_MSC: printf("Misc"); break;
-                case EV_LED: printf("Led");  break;
-                case EV_SND: printf("Snd");  break;
-                case EV_REP: printf("Rep");  break;
-                case EV_FF:  printf("FF");   break;
+                case EV_MSC:
+                    printf("Misc");
+                    break;
+                case EV_LED:
+                    printf("Led");
+                    break;
+                case EV_SND:
+                    printf("Snd");
+                    break;
+                case EV_REP:
+                    printf("Rep");
+                    break;
+                case EV_FF:
+                    printf("FF");
+                    break;
                     break;
                 }
                 printf("\n");
diff --git a/xorg-server/hw/dmx/examples/evi.c b/xorg-server/hw/dmx/examples/evi.c
index 644ea8f51..64dfb7eaa 100644
--- a/xorg-server/hw/dmx/examples/evi.c
+++ b/xorg-server/hw/dmx/examples/evi.c
@@ -36,20 +36,22 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XEVI.h>
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    int                  major_version, minor_version;
-    ExtendedVisualInfo   *evi;
-    int                  count;
-    int                  i;
+    Display *display = NULL;
+    int major_version, minor_version;
+    ExtendedVisualInfo *evi;
+    int count;
+    int i;
 
     if (argc == 2) {
         if (!(display = XOpenDisplay(argv[1]))) {
             printf("Cannot open display %s\n", argv[1]);
             return -1;
         }
-    } else {
+    }
+    else {
         printf("Usage: %s display\n", argv[0]);
         return -1;
     }
@@ -71,14 +73,13 @@ int main(int argc, char **argv)
         printf("%02d vid=0x%02lx screen=%d level=%d type=%u value=%u"
                " min=%u max=%u conflicts=%u\n",
                i,
-               (long unsigned)evi[i].core_visual_id,
+               (long unsigned) evi[i].core_visual_id,
                evi[i].screen,
                evi[i].level,
                evi[i].transparency_type,
                evi[i].transparency_value,
                evi[i].min_hw_colormaps,
-               evi[i].max_hw_colormaps,
-               evi[i].num_colormap_conflicts);
+               evi[i].max_hw_colormaps, evi[i].num_colormap_conflicts);
     }
 
     XCloseDisplay(display);
diff --git a/xorg-server/hw/dmx/examples/res.c b/xorg-server/hw/dmx/examples/res.c
index 901a1958b..138216e4c 100644
--- a/xorg-server/hw/dmx/examples/res.c
+++ b/xorg-server/hw/dmx/examples/res.c
@@ -36,21 +36,23 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XRes.h>
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    int                  major_version, minor_version;
-    int                  event, error;
-    int                  count;
-    int                  i;
-    XResClient           *clients;
+    Display *display = NULL;
+    int major_version, minor_version;
+    int event, error;
+    int count;
+    int i;
+    XResClient *clients;
 
     if (argc == 2) {
         if (!(display = XOpenDisplay(argv[1]))) {
             printf("Cannot open display %s\n", argv[1]);
             return -1;
         }
-    } else {
+    }
+    else {
         printf("Usage: %s display\n", argv[0]);
         return -1;
     }
@@ -65,7 +67,7 @@ int main(int argc, char **argv)
         return -1;
     }
     printf("X-Resource extension present: event=%d error=%d\n", event, error);
-    
+
     if (!XResQueryVersion(display, &major_version, &minor_version)) {
         printf("XResQueryVersion call failed\n");
         return -1;
@@ -77,16 +79,16 @@ int main(int argc, char **argv)
 
     printf("%d clients:\n", count);
     for (i = 0; i < count; i++) {
-        int      c, j;
+        int c, j;
         XResType *types;
-        
-        XResQueryClientResources(display, clients[i].resource_base,
-                                 &c, &types);
+
+        XResQueryClientResources(display, clients[i].resource_base, &c, &types);
         printf(" %3d: base = 0x%lx, mask = 0x%lx, %d resource types:\n",
-               i, (long unsigned)clients[i].resource_base,
-               (long unsigned)clients[i].resource_mask, c);
+               i, (long unsigned) clients[i].resource_base,
+               (long unsigned) clients[i].resource_mask, c);
         for (j = 0; j < c; j++) {
             char *name = XGetAtomName(display, types[j].resource_type);
+
             printf("      %2d: %s %d\n", j, name, types[j].count);
             XFree(name);
         }
diff --git a/xorg-server/hw/dmx/examples/xbell.c b/xorg-server/hw/dmx/examples/xbell.c
index 79419d324..543db24bf 100644
--- a/xorg-server/hw/dmx/examples/xbell.c
+++ b/xorg-server/hw/dmx/examples/xbell.c
@@ -35,27 +35,29 @@
 #include <stdlib.h>
 #include <X11/Xlib.h>
 
-static void pkc(XKeyboardControl *kc, unsigned long vm)
+static void
+pkc(XKeyboardControl * kc, unsigned long vm)
 {
-    if (vm&KBKeyClickPercent)
+    if (vm & KBKeyClickPercent)
         printf("   key_click_percent  = %d\n", kc->key_click_percent);
-    if (vm&KBBellPercent)
+    if (vm & KBBellPercent)
         printf("   bell_percent       = %d\n", kc->bell_percent);
-    if (vm&KBBellPitch)
+    if (vm & KBBellPitch)
         printf("   bell_pitch         = %d\n", kc->bell_pitch);
-    if (vm&KBBellDuration)
+    if (vm & KBBellDuration)
         printf("   bell_duration      = %d\n", kc->bell_duration);
-    if (vm&KBLed)
+    if (vm & KBLed)
         printf("   led                = 0x%x\n", kc->led);
-    if (vm&KBLedMode)
+    if (vm & KBLedMode)
         printf("   led_mode           = %d\n", kc->led_mode);
-    if (vm&KBKey)
+    if (vm & KBKey)
         printf("   key                = %d\n", kc->key);
-    if (vm&KBAutoRepeatMode)
+    if (vm & KBAutoRepeatMode)
         printf("   auto_repeat_mode   = %d\n", kc->auto_repeat_mode);
 }
 
-static void pks(XKeyboardState *ks)
+static void
+pks(XKeyboardState * ks)
 {
     printf("   key_click_percent  = %d\n", ks->key_click_percent);
     printf("   bell_percent       = %d\n", ks->bell_percent);
@@ -65,24 +67,23 @@ static void pks(XKeyboardState *ks)
     printf("   global_auto_repeat = %d\n", ks->global_auto_repeat);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display          *display = XOpenDisplay(NULL);
+    Display *display = XOpenDisplay(NULL);
     XKeyboardControl kc;
-    XKeyboardState   ks;
-    unsigned long    vm;
+    XKeyboardState ks;
+    unsigned long vm;
 
     if (argc != 5) {
         printf("Usage: xbell percent baseVolume pitch duration\n");
         return 1;
     }
-    
-    vm               = (KBBellPercent
-                        | KBBellPitch
-                        | KBBellDuration);
+
+    vm = (KBBellPercent | KBBellPitch | KBBellDuration);
     kc.key_click_percent = atoi(argv[1]);
-    kc.bell_percent  = atoi(argv[2]);
-    kc.bell_pitch    = atoi(argv[3]);
+    kc.bell_percent = atoi(argv[2]);
+    kc.bell_pitch = atoi(argv[3]);
     kc.bell_duration = atoi(argv[4]);
 
     printf("Setting:\n");
@@ -92,9 +93,9 @@ int main(int argc, char **argv)
     printf("Have:\n");
     XGetKeyboardControl(display, &ks);
     pks(&ks);
-    
+
     XBell(display, 100);
-    
+
     XCloseDisplay(display);
     return 0;
 }
diff --git a/xorg-server/hw/dmx/examples/xinput.c b/xorg-server/hw/dmx/examples/xinput.c
index b12daf201..db6601030 100644
--- a/xorg-server/hw/dmx/examples/xinput.c
+++ b/xorg-server/hw/dmx/examples/xinput.c
@@ -42,31 +42,42 @@
 #include <X11/extensions/dmxext.h>
 #include <sys/time.h>
 
-static const char *core(DMXInputAttributes *iinf)
+static const char *
+core(DMXInputAttributes * iinf)
 {
-    if (iinf->isCore)         return "core";
-    else if (iinf->sendsCore) return "extension (sends core events)";
-    else                      return "extension";
+    if (iinf->isCore)
+        return "core";
+    else if (iinf->sendsCore)
+        return "extension (sends core events)";
+    else
+        return "extension";
 }
 
-static void printdmxinfo(Display *display, int id)
+static void
+printdmxinfo(Display * display, int id)
 {
-    int                  event_base;
-    int                  error_base;
-    int                  major_version, minor_version, patch_version;
-    DMXInputAttributes   iinf;
-    Display              *backend;
-    char                 *backendname = NULL;
-
-    if (!DMXQueryExtension(display, &event_base, &error_base)) return;
+    int event_base;
+    int error_base;
+    int major_version, minor_version, patch_version;
+    DMXInputAttributes iinf;
+    Display *backend;
+    char *backendname = NULL;
+
+    if (!DMXQueryExtension(display, &event_base, &error_base))
+        return;
     if (!DMXQueryVersion(display, &major_version, &minor_version,
-                         &patch_version)) return;
-    if (major_version == 1 && minor_version == 0) return; /* too old */
-    if (!DMXGetInputAttributes(display, id, &iinf)) return;
+                         &patch_version))
+        return;
+    if (major_version == 1 && minor_version == 0)
+        return;                 /* too old */
+    if (!DMXGetInputAttributes(display, id, &iinf))
+        return;
 
     printf("   DMX Information: ");
-    if (iinf.detached) printf("detached ");
-    else               printf("active   ");
+    if (iinf.detached)
+        printf("detached ");
+    else
+        printf("active   ");
     switch (iinf.inputType) {
     case DMXLocalInputType:
         printf("local, %s", core(&iinf));
@@ -78,12 +89,14 @@ static void printdmxinfo(Display *display, int id)
         if (iinf.physicalId >= 0) {
             if ((backend = XOpenDisplay(iinf.name))) {
                 XExtensionVersion *ext = XGetExtensionVersion(backend, INAME);
-                if (ext && ext != (XExtensionVersion *)NoSuchExtension) {
+
+                if (ext && ext != (XExtensionVersion *) NoSuchExtension) {
                     int count, i;
                     XDeviceInfo *devInfo = XListInputDevices(backend, &count);
+
                     if (devInfo) {
                         for (i = 0; i < count; i++) {
-                            if ((unsigned)iinf.physicalId == devInfo[i].id
+                            if ((unsigned) iinf.physicalId == devInfo[i].id
                                 && devInfo[i].name) {
                                 backendname = strdup(devInfo[i].name);
                                 break;
@@ -95,8 +108,9 @@ static void printdmxinfo(Display *display, int id)
                 XCloseDisplay(backend);
             }
         }
-        printf("backend o%d/%s",iinf.physicalScreen,  iinf.name);
-        if (iinf.physicalId >= 0) printf("/id%d", iinf.physicalId);
+        printf("backend o%d/%s", iinf.physicalScreen, iinf.name);
+        if (iinf.physicalId >= 0)
+            printf("/id%d", iinf.physicalId);
         if (backendname) {
             printf("=%s", backendname);
             free(backendname);
@@ -107,26 +121,31 @@ static void printdmxinfo(Display *display, int id)
     printf("\n");
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    int                  device   = -1;
-    int                  newmouse = -1;
-    int                  newkbd   = -1;
-    int                  count;
-    int                  i, j;
-    XDeviceInfo          *devInfo;
-    XExtensionVersion    *ext;
+    Display *display = NULL;
+    int device = -1;
+    int newmouse = -1;
+    int newkbd = -1;
+    int count;
+    int i, j;
+    XDeviceInfo *devInfo;
+    XExtensionVersion *ext;
 
     if (argc == 2 || argc == 3 || argc == 4 || argc == 5) {
         if (!(display = XOpenDisplay(argv[1]))) {
             printf("Cannot open display %s\n", argv[1]);
             return -1;
         }
-        if (argc >= 3) device   = strtol(argv[2], NULL, 0);
-        if (argc >= 4) newmouse = strtol(argv[3], NULL, 0);
-        if (argc >= 5) newkbd   = strtol(argv[4], NULL, 0);
-    } else {
+        if (argc >= 3)
+            device = strtol(argv[2], NULL, 0);
+        if (argc >= 4)
+            newmouse = strtol(argv[3], NULL, 0);
+        if (argc >= 5)
+            newkbd = strtol(argv[4], NULL, 0);
+    }
+    else {
         printf("Usage: %s display [device] [newmouse] [newkbd]\n", argv[0]);
         return -1;
     }
@@ -137,12 +156,11 @@ int main(int argc, char **argv)
     }
 
     ext = XGetExtensionVersion(display, INAME);
-    if (!ext || ext == (XExtensionVersion *)NoSuchExtension) {
+    if (!ext || ext == (XExtensionVersion *) NoSuchExtension) {
         printf("No XInputExtension\n");
         return -1;
     }
-    printf("%s version %d.%d\n",
-           INAME, ext->major_version, ext->minor_version);
+    printf("%s version %d.%d\n", INAME, ext->major_version, ext->minor_version);
 
     if (!(devInfo = XListInputDevices(display, &count)) || !count) {
         printf("Cannot list devices\n");
@@ -151,30 +169,52 @@ int main(int argc, char **argv)
 
     for (i = 0; i < count; i++) {
         XAnyClassPtr any;
-        const char   *kind   = "Unknown";
-        int          has_key = 0;
-        
+        const char *kind = "Unknown";
+        int has_key = 0;
+
         switch (devInfo[i].use) {
-        case IsXPointer:         kind = "XPointer";         break;
-        case IsXKeyboard:        kind = "XKeyboard";        break;
-        case IsXExtensionDevice: kind = "XExtensionDevice"; break;
+        case IsXPointer:
+            kind = "XPointer";
+            break;
+        case IsXKeyboard:
+            kind = "XKeyboard";
+            break;
+        case IsXExtensionDevice:
+            kind = "XExtensionDevice";
+            break;
         }
         printf("%2lu %-20.20s %-16.16s",
-               (long unsigned)devInfo[i].id,
+               (long unsigned) devInfo[i].id,
                devInfo[i].name ? devInfo[i].name : "", kind);
 
         for (j = 0, any = devInfo[i].inputclassinfo;
              j < devInfo[i].num_classes;
-             any = (XAnyClassPtr)((char *)any + any->length), j++) {
-            const char   *class = "unk";
+             any = (XAnyClassPtr) ((char *) any + any->length), j++) {
+            const char *class = "unk";
+
             switch (any->class) {
-            case KeyClass:       class = "key"; ++has_key; break;
-            case ButtonClass:    class = "btn"; break;
-            case ValuatorClass:  class = "val"; break;
-            case FeedbackClass:  class = "fdb"; break;
-            case ProximityClass: class = "prx"; break;
-            case FocusClass:     class = "foc"; break;
-            case OtherClass:     class = "oth"; break;
+            case KeyClass:
+                class = "key";
+                ++has_key;
+                break;
+            case ButtonClass:
+                class = "btn";
+                break;
+            case ValuatorClass:
+                class = "val";
+                break;
+            case FeedbackClass:
+                class = "fdb";
+                break;
+            case ProximityClass:
+                class = "prx";
+                break;
+            case FocusClass:
+                class = "foc";
+                break;
+            case OtherClass:
+                class = "oth";
+                break;
             }
             printf(" %s", class);
         }
@@ -182,10 +222,10 @@ int main(int argc, char **argv)
         printdmxinfo(display, i);
 
         if (has_key) {
-            XkbDescPtr           xkb;
+            XkbDescPtr xkb;
+
             if ((xkb = XkbGetKeyboard(display,
-                                      XkbAllComponentsMask,
-                                      devInfo[i].id))) {
+                                      XkbAllComponentsMask, devInfo[i].id))) {
                 printf("   Xkb Information:\n");
                 printf("      Device id = %d\n", xkb->device_spec);
                 printf("      Min keycode = 0x%02x\n", xkb->min_key_code);
@@ -203,41 +243,37 @@ int main(int argc, char **argv)
     }
 
     if (newmouse >= 0) {
-        XDevice     *dev;
+        XDevice *dev;
 
         printf("Trying to make device %d core mouse\n", newmouse);
         dev = XOpenDevice(display, devInfo[newmouse].id);
-        printf("Status = %d\n",
-               XChangePointerDevice(display, dev, 0, 1));
+        printf("Status = %d\n", XChangePointerDevice(display, dev, 0, 1));
         return 0;
     }
 
     if (newkbd >= 0) {
-        XDevice     *dev;
+        XDevice *dev;
 
         printf("Trying to make device %d core keyboard\n", newkbd);
         dev = XOpenDevice(display, devInfo[newkbd].id);
-        printf("Status = %d\n",
-               XChangeKeyboardDevice(display, dev));
+        printf("Status = %d\n", XChangeKeyboardDevice(display, dev));
         return 0;
     }
-            
 
-    if (device >=0){
+    if (device >= 0) {
 #define MAX_EVENTS 100
-        int         cnt = 0;
-        XDevice     *dev;
+        int cnt = 0;
+        XDevice *dev;
         XEventClass event_list[MAX_EVENTS];
-        int         event_type[MAX_EVENTS];
-        const char  *names[MAX_EVENTS];
-        int         total = 0;
+        int event_type[MAX_EVENTS];
+        const char *names[MAX_EVENTS];
+        int total = 0;
 
 #define ADD(type)                                     \
         if (cnt >= MAX_EVENTS) abort();             \
         names[cnt] = #type;                           \
         type(dev, event_type[cnt], event_list[cnt]);  \
         if (event_type[cnt]) ++cnt
-        
 
         dev = XOpenDevice(display, devInfo[device].id);
         ADD(DeviceKeyPress);
@@ -252,54 +288,55 @@ int main(int argc, char **argv)
         ADD(DeviceStateNotify);
         ADD(DeviceMappingNotify);
         ADD(ChangeDeviceNotify);
-        
+
         for (i = 0; i < cnt; i++) {
             printf("Waiting for %s events of type %d (%lu) on 0x%08lx\n",
                    names[i],
-                   event_type[i], (unsigned long)event_list[i],
-                   (long unsigned)DefaultRootWindow(display));
+                   event_type[i], (unsigned long) event_list[i],
+                   (long unsigned) DefaultRootWindow(display));
         }
         XSelectExtensionEvent(display, DefaultRootWindow(display),
                               event_list, cnt);
-        
+
         for (;;) {
             XEvent event;
+
             XNextEvent(display, &event);
             for (i = 0; i < cnt; i++) {
-                XDeviceMotionEvent *e = (XDeviceMotionEvent *)&event;
-                XDeviceButtonEvent *b = (XDeviceButtonEvent *)&event;
+                XDeviceMotionEvent *e = (XDeviceMotionEvent *) & event;
+                XDeviceButtonEvent *b = (XDeviceButtonEvent *) & event;
+
                 if (event.type == event_type[i]) {
                     printf("%s id=%lu (%d @ %d,%d; s=0x%04x, d=%d, t=%lu)"
                            " axes_count=%d first=%d %d %d %d %d %d %d\n",
                            names[i],
-                           (long unsigned)e->deviceid,
+                           (long unsigned) e->deviceid,
                            e->type,
                            e->x, e->y,
                            e->device_state,
                            b->button,
-                           (long unsigned)b->time,
+                           (long unsigned) b->time,
                            e->axes_count,
                            e->first_axis,
                            e->axis_data[0],
                            e->axis_data[1],
                            e->axis_data[2],
-                           e->axis_data[3],
-                           e->axis_data[4],
-                           e->axis_data[5]);
+                           e->axis_data[3], e->axis_data[4], e->axis_data[5]);
                 }
             }
             ++total;
 #if 0
-                                /* Used to check motion history for
-                                 * extension devices. */
+            /* Used to check motion history for
+             * extension devices. */
             if (!(total % 10)) {
                 XDeviceTimeCoord *tc;
-                int              n, m, a;
-                struct timeval   tv;
-                unsigned long    ms;
+                int n, m, a;
+                struct timeval tv;
+                unsigned long ms;
+
                 gettimeofday(&tv, NULL);
                 ms = tv.tv_sec * 1000 + tv.tv_usec / 1000;
-                tc = XGetDeviceMotionEvents(display, dev, ms-1000, ms,
+                tc = XGetDeviceMotionEvents(display, dev, ms - 1000, ms,
                                             &n, &m, &a);
                 printf("Got %d events of mode %s with %d axes\n",
                        n, m == Absolute ? "Absolute" : "Relative", a);
@@ -309,7 +346,7 @@ int main(int argc, char **argv)
                 }
                 XFreeDeviceMotionEvents(tc);
             }
-#endif                
+#endif
         }
     }
 
diff --git a/xorg-server/hw/dmx/examples/xled.c b/xorg-server/hw/dmx/examples/xled.c
index 270f80511..32e8e3770 100644
--- a/xorg-server/hw/dmx/examples/xled.c
+++ b/xorg-server/hw/dmx/examples/xled.c
@@ -40,23 +40,26 @@
 #include <X11/extensions/XKBstr.h>
 #include <sys/time.h>
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    int                  mask     = 0;
-    unsigned             i;
-    XKeyboardState       ks;
-    XKeyboardControl     kc;
-    XkbDescPtr           xkb;
-    int                  old[32];
+    Display *display = NULL;
+    int mask = 0;
+    unsigned i;
+    XKeyboardState ks;
+    XKeyboardControl kc;
+    XkbDescPtr xkb;
+    int old[32];
 
     if (argc == 2 || argc == 3) {
         if (!(display = XOpenDisplay(argv[1]))) {
             printf("Cannot open display %s\n", argv[1]);
             return -1;
         }
-        if (argc >= 3) mask = strtol(argv[2], NULL, 0);
-    } else {
+        if (argc >= 3)
+            mask = strtol(argv[2], NULL, 0);
+    }
+    else {
         printf("Usage: %s display [mask]\n", argv[0]);
         return -1;
     }
@@ -81,14 +84,13 @@ int main(int argc, char **argv)
     for (i = 0; i < XkbNumIndicators; i++) {
         if (xkb->indicators->phys_indicators & (1 << i)) {
             printf("led %d = %d\n", i, xkb->indicators->maps[i].flags);
-            old[i]                         = xkb->indicators->maps[i].flags;
+            old[i] = xkb->indicators->maps[i].flags;
             xkb->indicators->maps[i].flags = XkbIM_NoAutomatic;
         }
     }
     printf("XkbSetIndicatorMap = %d\n", XkbSetIndicatorMap(display, ~0, xkb));
     XkbFreeKeyboard(xkb, 0, True);
 
-    
     if (!(xkb = XkbAllocKeyboard())) {
         printf("Cannot allocate\n");
         return -1;
@@ -105,7 +107,7 @@ int main(int argc, char **argv)
     printf("XGetKeyboardControl = %d\n", XGetKeyboardControl(display, &ks));
     printf("old mask = 0x%08lx\n", ks.led_mask);
     for (i = 0; i < 5; i++) {
-        kc.led      = i + 1;
+        kc.led = i + 1;
         kc.led_mode = (mask & (1 << i)) ? LedModeOn : LedModeOff;
         printf("XChangeKeyboardControl = %d\n",
                XChangeKeyboardControl(display, KBLed | KBLedMode, &kc));
diff --git a/xorg-server/hw/dmx/examples/xtest.c b/xorg-server/hw/dmx/examples/xtest.c
index 1e2d1cfff..9ce896a29 100644
--- a/xorg-server/hw/dmx/examples/xtest.c
+++ b/xorg-server/hw/dmx/examples/xtest.c
@@ -36,19 +36,21 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XTest.h>
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display              *display = NULL;
-    int                  event_base;
-    int                  error_base;
-    int                  major_version, minor_version;
+    Display *display = NULL;
+    int event_base;
+    int error_base;
+    int major_version, minor_version;
 
     if (argc == 2) {
         if (!(display = XOpenDisplay(argv[1]))) {
             printf("Cannot open display %s\n", argv[1]);
             return -1;
         }
-    } else {
+    }
+    else {
         printf("Usage: %s display\n", argv[0]);
         return -1;
     }
diff --git a/xorg-server/hw/dmx/glxProxy/compsize.c b/xorg-server/hw/dmx/glxProxy/compsize.c
index 5a5d5d0f1..c204d3ded 100644
--- a/xorg-server/hw/dmx/glxProxy/compsize.c
+++ b/xorg-server/hw/dmx/glxProxy/compsize.c
@@ -31,529 +31,611 @@
 #include <GL/gl.h>
 #include "compsize.h"
 
-GLint __glFogiv_size(GLenum pname)
+GLint
+__glFogiv_size(GLenum pname)
 {
     switch (pname) {
-      case GL_FOG_COLOR:	return 4;
-      case GL_FOG_DENSITY:	return 1;
-      case GL_FOG_END:		return 1;
-      case GL_FOG_MODE:		return 1;
-      case GL_FOG_INDEX:	return 1;
-      case GL_FOG_START:	return 1;
-      default:
-	return 0;
+    case GL_FOG_COLOR:
+        return 4;
+    case GL_FOG_DENSITY:
+        return 1;
+    case GL_FOG_END:
+        return 1;
+    case GL_FOG_MODE:
+        return 1;
+    case GL_FOG_INDEX:
+        return 1;
+    case GL_FOG_START:
+        return 1;
+    default:
+        return 0;
     }
 }
 
-GLint __glFogfv_size(GLenum pname)
+GLint
+__glFogfv_size(GLenum pname)
 {
     return __glFogiv_size(pname);
 }
 
-GLint __glCallLists_size(GLsizei n, GLenum type)
+GLint
+__glCallLists_size(GLsizei n, GLenum type)
 {
     GLint size;
 
-    if (n < 0) return 0;
+    if (n < 0)
+        return 0;
     switch (type) {
-      case GL_BYTE:		size = 1; break;
-      case GL_UNSIGNED_BYTE:	size = 1; break;
-      case GL_SHORT:		size = 2; break;
-      case GL_UNSIGNED_SHORT:	size = 2; break;
-      case GL_INT:		size = 4; break;
-      case GL_UNSIGNED_INT:	size = 4; break;
-      case GL_FLOAT:		size = 4; break;
-      case GL_2_BYTES:		size = 2; break;
-      case GL_3_BYTES:		size = 3; break;
-      case GL_4_BYTES:		size = 4; break;
-      default:
-	return 0;
+    case GL_BYTE:
+        size = 1;
+        break;
+    case GL_UNSIGNED_BYTE:
+        size = 1;
+        break;
+    case GL_SHORT:
+        size = 2;
+        break;
+    case GL_UNSIGNED_SHORT:
+        size = 2;
+        break;
+    case GL_INT:
+        size = 4;
+        break;
+    case GL_UNSIGNED_INT:
+        size = 4;
+        break;
+    case GL_FLOAT:
+        size = 4;
+        break;
+    case GL_2_BYTES:
+        size = 2;
+        break;
+    case GL_3_BYTES:
+        size = 3;
+        break;
+    case GL_4_BYTES:
+        size = 4;
+        break;
+    default:
+        return 0;
     }
     return n * size;
 }
 
-GLint __glDrawPixels_size(GLenum format, GLenum type, GLsizei w, GLsizei h)
+GLint
+__glDrawPixels_size(GLenum format, GLenum type, GLsizei w, GLsizei h)
 {
     GLint elements, esize;
-    
+
     switch (format) {
-      case GL_COLOR_INDEX:
-      case GL_STENCIL_INDEX:
-      case GL_DEPTH_COMPONENT:
-	elements = 1;
-	break;
-      case GL_RED:
-      case GL_GREEN:
-      case GL_BLUE:
-      case GL_ALPHA:
-      case GL_LUMINANCE:
-	elements = 1;
-	break;
-      case GL_LUMINANCE_ALPHA:
-	elements = 2;
-	break;
-      case GL_RGB:
-	elements = 3;
-	break;
-      case GL_RGBA:
-      case GL_ABGR_EXT:
-	elements = 4;
-	break;
-      default:
-	return 0;
+    case GL_COLOR_INDEX:
+    case GL_STENCIL_INDEX:
+    case GL_DEPTH_COMPONENT:
+        elements = 1;
+        break;
+    case GL_RED:
+    case GL_GREEN:
+    case GL_BLUE:
+    case GL_ALPHA:
+    case GL_LUMINANCE:
+        elements = 1;
+        break;
+    case GL_LUMINANCE_ALPHA:
+        elements = 2;
+        break;
+    case GL_RGB:
+        elements = 3;
+        break;
+    case GL_RGBA:
+    case GL_ABGR_EXT:
+        elements = 4;
+        break;
+    default:
+        return 0;
     }
     switch (type) {
-      case GL_BITMAP:
-	if (format == GL_COLOR_INDEX || format == GL_STENCIL_INDEX) {
-	    return (h * ((w+7)/8));
-	} else {
-	    return 0;
-	}
-      case GL_BYTE:
-      case GL_UNSIGNED_BYTE:
-	esize = 1;
-	break;
-      case GL_UNSIGNED_BYTE_3_3_2:
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-	esize = 1;
-	elements = 1;
-	break;
-      case GL_SHORT:
-      case GL_UNSIGNED_SHORT:
-	esize = 2;
-	break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-	esize = 2;
-	elements = 1;
-	break;
-      case GL_INT:
-      case GL_UNSIGNED_INT:
-      case GL_FLOAT:
-	esize = 4;
-	break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-      case GL_UNSIGNED_INT_10_10_10_2:
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-	esize = 4;
-	elements = 1;
-	break;
-      default:
-	return 0;
+    case GL_BITMAP:
+        if (format == GL_COLOR_INDEX || format == GL_STENCIL_INDEX) {
+            return (h * ((w + 7) / 8));
+        }
+        else {
+            return 0;
+        }
+    case GL_BYTE:
+    case GL_UNSIGNED_BYTE:
+        esize = 1;
+        break;
+    case GL_UNSIGNED_BYTE_3_3_2:
+    case GL_UNSIGNED_BYTE_2_3_3_REV:
+        esize = 1;
+        elements = 1;
+        break;
+    case GL_SHORT:
+    case GL_UNSIGNED_SHORT:
+        esize = 2;
+        break;
+    case GL_UNSIGNED_SHORT_5_6_5:
+    case GL_UNSIGNED_SHORT_5_6_5_REV:
+    case GL_UNSIGNED_SHORT_4_4_4_4:
+    case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+    case GL_UNSIGNED_SHORT_5_5_5_1:
+    case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+        esize = 2;
+        elements = 1;
+        break;
+    case GL_INT:
+    case GL_UNSIGNED_INT:
+    case GL_FLOAT:
+        esize = 4;
+        break;
+    case GL_UNSIGNED_INT_8_8_8_8:
+    case GL_UNSIGNED_INT_8_8_8_8_REV:
+    case GL_UNSIGNED_INT_10_10_10_2:
+    case GL_UNSIGNED_INT_2_10_10_10_REV:
+        esize = 4;
+        elements = 1;
+        break;
+    default:
+        return 0;
     }
     return elements * esize * w * h;
 }
 
-GLint __glBitmap_size(GLsizei w, GLsizei h)
+GLint
+__glBitmap_size(GLsizei w, GLsizei h)
 {
     return __glDrawPixels_size(GL_COLOR_INDEX, GL_BITMAP, w, h);
 }
 
-GLint __glTexGendv_size(GLenum e)
+GLint
+__glTexGendv_size(GLenum e)
 {
     switch (e) {
-      case GL_TEXTURE_GEN_MODE:
-	return 1;
-      case GL_OBJECT_PLANE:
-      case GL_EYE_PLANE:
-	return 4;
-      default:
-	return 0;
+    case GL_TEXTURE_GEN_MODE:
+        return 1;
+    case GL_OBJECT_PLANE:
+    case GL_EYE_PLANE:
+        return 4;
+    default:
+        return 0;
     }
 }
 
-GLint __glTexGenfv_size(GLenum e)
+GLint
+__glTexGenfv_size(GLenum e)
 {
     return __glTexGendv_size(e);
 }
 
-GLint __glTexGeniv_size(GLenum e)
+GLint
+__glTexGeniv_size(GLenum e)
 {
     return __glTexGendv_size(e);
 }
 
-GLint __glTexParameterfv_size(GLenum e)
+GLint
+__glTexParameterfv_size(GLenum e)
 {
     switch (e) {
-      case GL_TEXTURE_WRAP_S:
-      case GL_TEXTURE_WRAP_T:
-      case GL_TEXTURE_WRAP_R:
-      case GL_TEXTURE_MIN_FILTER:
-      case GL_TEXTURE_MAG_FILTER:
-	return 1;
-      case GL_TEXTURE_BORDER_COLOR:
-	return 4;
-      case GL_TEXTURE_PRIORITY:
-	return 1;
-      case GL_TEXTURE_MIN_LOD:
-      case GL_TEXTURE_MAX_LOD:
-      case GL_TEXTURE_BASE_LEVEL:
-      case GL_TEXTURE_MAX_LEVEL:
-	return 1;
-      default:
-	return 0;
+    case GL_TEXTURE_WRAP_S:
+    case GL_TEXTURE_WRAP_T:
+    case GL_TEXTURE_WRAP_R:
+    case GL_TEXTURE_MIN_FILTER:
+    case GL_TEXTURE_MAG_FILTER:
+        return 1;
+    case GL_TEXTURE_BORDER_COLOR:
+        return 4;
+    case GL_TEXTURE_PRIORITY:
+        return 1;
+    case GL_TEXTURE_MIN_LOD:
+    case GL_TEXTURE_MAX_LOD:
+    case GL_TEXTURE_BASE_LEVEL:
+    case GL_TEXTURE_MAX_LEVEL:
+        return 1;
+    default:
+        return 0;
     }
 }
 
-GLint __glTexParameteriv_size(GLenum e)
+GLint
+__glTexParameteriv_size(GLenum e)
 {
     return __glTexParameterfv_size(e);
 }
 
-GLint __glTexEnvfv_size(GLenum e)
+GLint
+__glTexEnvfv_size(GLenum e)
 {
     switch (e) {
-      case GL_TEXTURE_ENV_MODE:
-	return 1;
-      case GL_TEXTURE_ENV_COLOR:
-	return 4;
-      default:
-	return 0;
+    case GL_TEXTURE_ENV_MODE:
+        return 1;
+    case GL_TEXTURE_ENV_COLOR:
+        return 4;
+    default:
+        return 0;
     }
 }
 
-GLint __glTexEnviv_size(GLenum e)
+GLint
+__glTexEnviv_size(GLenum e)
 {
     return __glTexEnvfv_size(e);
 }
 
-GLint __glTexImage1D_size(GLenum format, GLenum type, GLsizei w)
+GLint
+__glTexImage1D_size(GLenum format, GLenum type, GLsizei w)
 {
     GLint elements, esize;
 
-    if (w < 0) return 0;
+    if (w < 0)
+        return 0;
     switch (format) {
-      case GL_COLOR_INDEX:
-	elements = 1;
-	break;
-      case GL_RED:
-      case GL_GREEN:
-      case GL_BLUE:
-      case GL_ALPHA:
-      case GL_LUMINANCE:
-	elements = 1;
-	break;
-      case GL_LUMINANCE_ALPHA:
-	elements = 2;
-	break;
-      case GL_RGB:
-	elements = 3;
-	break;
-      case GL_RGBA:
-      case GL_ABGR_EXT:
-	elements = 4;
-	break;
-      default:
-	return 0;
+    case GL_COLOR_INDEX:
+        elements = 1;
+        break;
+    case GL_RED:
+    case GL_GREEN:
+    case GL_BLUE:
+    case GL_ALPHA:
+    case GL_LUMINANCE:
+        elements = 1;
+        break;
+    case GL_LUMINANCE_ALPHA:
+        elements = 2;
+        break;
+    case GL_RGB:
+        elements = 3;
+        break;
+    case GL_RGBA:
+    case GL_ABGR_EXT:
+        elements = 4;
+        break;
+    default:
+        return 0;
     }
     switch (type) {
-      case GL_BITMAP:
-	if (format == GL_COLOR_INDEX) {
-	    return (w+7)/8;
-	} else {
-	    return 0;
-	}
-      case GL_BYTE:
-      case GL_UNSIGNED_BYTE:
-	esize = 1;
-	break;
-      case GL_UNSIGNED_BYTE_3_3_2:
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-	esize = 1;
-	elements = 1;
-	break;
-      case GL_SHORT:
-      case GL_UNSIGNED_SHORT:
-	esize = 2;
-	break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-	esize = 2;
-	elements = 1;
-	break;
-      case GL_INT:
-      case GL_UNSIGNED_INT:
-      case GL_FLOAT:
-	esize = 4;
-	break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-      case GL_UNSIGNED_INT_10_10_10_2:
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-	esize = 4;
-	elements = 1;
-	break;
-      default:
-	return 0;
+    case GL_BITMAP:
+        if (format == GL_COLOR_INDEX) {
+            return (w + 7) / 8;
+        }
+        else {
+            return 0;
+        }
+    case GL_BYTE:
+    case GL_UNSIGNED_BYTE:
+        esize = 1;
+        break;
+    case GL_UNSIGNED_BYTE_3_3_2:
+    case GL_UNSIGNED_BYTE_2_3_3_REV:
+        esize = 1;
+        elements = 1;
+        break;
+    case GL_SHORT:
+    case GL_UNSIGNED_SHORT:
+        esize = 2;
+        break;
+    case GL_UNSIGNED_SHORT_5_6_5:
+    case GL_UNSIGNED_SHORT_5_6_5_REV:
+    case GL_UNSIGNED_SHORT_4_4_4_4:
+    case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+    case GL_UNSIGNED_SHORT_5_5_5_1:
+    case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+        esize = 2;
+        elements = 1;
+        break;
+    case GL_INT:
+    case GL_UNSIGNED_INT:
+    case GL_FLOAT:
+        esize = 4;
+        break;
+    case GL_UNSIGNED_INT_8_8_8_8:
+    case GL_UNSIGNED_INT_8_8_8_8_REV:
+    case GL_UNSIGNED_INT_10_10_10_2:
+    case GL_UNSIGNED_INT_2_10_10_10_REV:
+        esize = 4;
+        elements = 1;
+        break;
+    default:
+        return 0;
     }
     return elements * esize * w;
 }
 
-GLint __glTexImage2D_size(GLenum format, GLenum type, GLsizei w, GLsizei h)
+GLint
+__glTexImage2D_size(GLenum format, GLenum type, GLsizei w, GLsizei h)
 {
     GLint elements, esize;
 
-    if (w < 0) return 0;
-    if (h < 0) return 0;
+    if (w < 0)
+        return 0;
+    if (h < 0)
+        return 0;
     switch (format) {
-      case GL_COLOR_INDEX:
-	elements = 1;
-	break;
-      case GL_RED:
-      case GL_GREEN:
-      case GL_BLUE:
-      case GL_ALPHA:
-      case GL_LUMINANCE:
-	elements = 1;
-	break;
-      case GL_LUMINANCE_ALPHA:
-	elements = 2;
-	break;
-      case GL_RGB:
-	elements = 3;
-	break;
-      case GL_RGBA:
-      case GL_ABGR_EXT:
-	elements = 4;
-	break;
-      default:
-	return 0;
+    case GL_COLOR_INDEX:
+        elements = 1;
+        break;
+    case GL_RED:
+    case GL_GREEN:
+    case GL_BLUE:
+    case GL_ALPHA:
+    case GL_LUMINANCE:
+        elements = 1;
+        break;
+    case GL_LUMINANCE_ALPHA:
+        elements = 2;
+        break;
+    case GL_RGB:
+        elements = 3;
+        break;
+    case GL_RGBA:
+    case GL_ABGR_EXT:
+        elements = 4;
+        break;
+    default:
+        return 0;
     }
     switch (type) {
-      case GL_BITMAP:
-	if (format == GL_COLOR_INDEX) {
-	    return (h * ((w+7)/8));
-	} else {
-	    return 0;
-	}
-      case GL_BYTE:
-      case GL_UNSIGNED_BYTE:
-	esize = 1;
-	break;
-      case GL_UNSIGNED_BYTE_3_3_2:
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-	esize = 1;
-	elements = 1;
-	break;
-      case GL_SHORT:
-      case GL_UNSIGNED_SHORT:
-	esize = 2;
-	break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-	esize = 2;
-	elements = 1;
-	break;
-      case GL_INT:
-      case GL_UNSIGNED_INT:
-      case GL_FLOAT:
-	esize = 4;
-	break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-      case GL_UNSIGNED_INT_10_10_10_2:
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-	esize = 4;
-	elements = 1;
-	break;
-      default:
-	return 0;
+    case GL_BITMAP:
+        if (format == GL_COLOR_INDEX) {
+            return (h * ((w + 7) / 8));
+        }
+        else {
+            return 0;
+        }
+    case GL_BYTE:
+    case GL_UNSIGNED_BYTE:
+        esize = 1;
+        break;
+    case GL_UNSIGNED_BYTE_3_3_2:
+    case GL_UNSIGNED_BYTE_2_3_3_REV:
+        esize = 1;
+        elements = 1;
+        break;
+    case GL_SHORT:
+    case GL_UNSIGNED_SHORT:
+        esize = 2;
+        break;
+    case GL_UNSIGNED_SHORT_5_6_5:
+    case GL_UNSIGNED_SHORT_5_6_5_REV:
+    case GL_UNSIGNED_SHORT_4_4_4_4:
+    case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+    case GL_UNSIGNED_SHORT_5_5_5_1:
+    case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+        esize = 2;
+        elements = 1;
+        break;
+    case GL_INT:
+    case GL_UNSIGNED_INT:
+    case GL_FLOAT:
+        esize = 4;
+        break;
+    case GL_UNSIGNED_INT_8_8_8_8:
+    case GL_UNSIGNED_INT_8_8_8_8_REV:
+    case GL_UNSIGNED_INT_10_10_10_2:
+    case GL_UNSIGNED_INT_2_10_10_10_REV:
+        esize = 4;
+        elements = 1;
+        break;
+    default:
+        return 0;
     }
     return elements * esize * w * h;
 }
 
-GLint __glTexImage3D_size(GLenum format, GLenum type, GLsizei w, GLsizei h,
-			  GLsizei d)
+GLint
+__glTexImage3D_size(GLenum format, GLenum type, GLsizei w, GLsizei h, GLsizei d)
 {
     GLint elements, esize;
 
-    if (w < 0) return 0;
-    if (h < 0) return 0;
-    if (d < 0) return 0;
+    if (w < 0)
+        return 0;
+    if (h < 0)
+        return 0;
+    if (d < 0)
+        return 0;
     switch (format) {
-      case GL_COLOR_INDEX:
-	elements = 1;
-	break;
-      case GL_RED:
-      case GL_GREEN:
-      case GL_BLUE:
-      case GL_ALPHA:
-      case GL_LUMINANCE:
-	elements = 1;
-	break;
-      case GL_LUMINANCE_ALPHA:
-	elements = 2;
-	break;
-      case GL_RGB:
-	elements = 3;
-	break;
-      case GL_RGBA:
-      case GL_ABGR_EXT:
-	elements = 4;
-	break;
-      default:
-	return 0;
+    case GL_COLOR_INDEX:
+        elements = 1;
+        break;
+    case GL_RED:
+    case GL_GREEN:
+    case GL_BLUE:
+    case GL_ALPHA:
+    case GL_LUMINANCE:
+        elements = 1;
+        break;
+    case GL_LUMINANCE_ALPHA:
+        elements = 2;
+        break;
+    case GL_RGB:
+        elements = 3;
+        break;
+    case GL_RGBA:
+    case GL_ABGR_EXT:
+        elements = 4;
+        break;
+    default:
+        return 0;
     }
     switch (type) {
-      case GL_BITMAP:
-	if (format == GL_COLOR_INDEX) {
-	    return (d * (h * ((w+7)/8)));
-	} else {
-	    return 0;
-	}
-      case GL_BYTE:
-      case GL_UNSIGNED_BYTE:
-	esize = 1;
-	break;
-      case GL_UNSIGNED_BYTE_3_3_2:
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-	esize = 1;
-	elements = 1;
-	break;
-      case GL_SHORT:
-      case GL_UNSIGNED_SHORT:
-	esize = 2;
-	break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-	esize = 2;
-	elements = 1;
-	break;
-      case GL_INT:
-      case GL_UNSIGNED_INT:
-      case GL_FLOAT:
-	esize = 4;
-	break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-      case GL_UNSIGNED_INT_10_10_10_2:
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-	esize = 4;
-	elements = 1;
-	break;
-      default:
-	return 0;
+    case GL_BITMAP:
+        if (format == GL_COLOR_INDEX) {
+            return (d * (h * ((w + 7) / 8)));
+        }
+        else {
+            return 0;
+        }
+    case GL_BYTE:
+    case GL_UNSIGNED_BYTE:
+        esize = 1;
+        break;
+    case GL_UNSIGNED_BYTE_3_3_2:
+    case GL_UNSIGNED_BYTE_2_3_3_REV:
+        esize = 1;
+        elements = 1;
+        break;
+    case GL_SHORT:
+    case GL_UNSIGNED_SHORT:
+        esize = 2;
+        break;
+    case GL_UNSIGNED_SHORT_5_6_5:
+    case GL_UNSIGNED_SHORT_5_6_5_REV:
+    case GL_UNSIGNED_SHORT_4_4_4_4:
+    case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+    case GL_UNSIGNED_SHORT_5_5_5_1:
+    case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+        esize = 2;
+        elements = 1;
+        break;
+    case GL_INT:
+    case GL_UNSIGNED_INT:
+    case GL_FLOAT:
+        esize = 4;
+        break;
+    case GL_UNSIGNED_INT_8_8_8_8:
+    case GL_UNSIGNED_INT_8_8_8_8_REV:
+    case GL_UNSIGNED_INT_10_10_10_2:
+    case GL_UNSIGNED_INT_2_10_10_10_REV:
+        esize = 4;
+        elements = 1;
+        break;
+    default:
+        return 0;
     }
     return elements * esize * w * h * d;
 }
 
-GLint __glLightfv_size(GLenum pname)
+GLint
+__glLightfv_size(GLenum pname)
 {
     switch (pname) {
-      case GL_SPOT_EXPONENT:		return 1;
-      case GL_SPOT_CUTOFF:		return 1;
-      case GL_AMBIENT:			return 4;
-      case GL_DIFFUSE:			return 4;
-      case GL_SPECULAR:			return 4;
-      case GL_POSITION:			return 4;
-      case GL_SPOT_DIRECTION:		return 3;
-      case GL_CONSTANT_ATTENUATION:	return 1;
-      case GL_LINEAR_ATTENUATION:	return 1;
-      case GL_QUADRATIC_ATTENUATION:	return 1;
-      default:
-	return 0;
+    case GL_SPOT_EXPONENT:
+        return 1;
+    case GL_SPOT_CUTOFF:
+        return 1;
+    case GL_AMBIENT:
+        return 4;
+    case GL_DIFFUSE:
+        return 4;
+    case GL_SPECULAR:
+        return 4;
+    case GL_POSITION:
+        return 4;
+    case GL_SPOT_DIRECTION:
+        return 3;
+    case GL_CONSTANT_ATTENUATION:
+        return 1;
+    case GL_LINEAR_ATTENUATION:
+        return 1;
+    case GL_QUADRATIC_ATTENUATION:
+        return 1;
+    default:
+        return 0;
     }
 }
 
-GLint __glLightiv_size(GLenum pname)
+GLint
+__glLightiv_size(GLenum pname)
 {
     return __glLightfv_size(pname);
 }
 
-GLint __glLightModelfv_size(GLenum pname)
+GLint
+__glLightModelfv_size(GLenum pname)
 {
     switch (pname) {
-      case GL_LIGHT_MODEL_AMBIENT:		return 4;
-      case GL_LIGHT_MODEL_LOCAL_VIEWER:		return 1;
-      case GL_LIGHT_MODEL_TWO_SIDE:		return 1;
-      case GL_LIGHT_MODEL_COLOR_CONTROL:	return 1;
-      default:
-	return 0;
+    case GL_LIGHT_MODEL_AMBIENT:
+        return 4;
+    case GL_LIGHT_MODEL_LOCAL_VIEWER:
+        return 1;
+    case GL_LIGHT_MODEL_TWO_SIDE:
+        return 1;
+    case GL_LIGHT_MODEL_COLOR_CONTROL:
+        return 1;
+    default:
+        return 0;
     }
 }
 
-GLint __glLightModeliv_size(GLenum pname)
+GLint
+__glLightModeliv_size(GLenum pname)
 {
     return __glLightModelfv_size(pname);
 }
 
-GLint __glMaterialfv_size(GLenum pname)
+GLint
+__glMaterialfv_size(GLenum pname)
 {
     switch (pname) {
-      case GL_SHININESS:		return 1;
-      case GL_EMISSION:			return 4;
-      case GL_AMBIENT:			return 4;
-      case GL_DIFFUSE:			return 4;
-      case GL_SPECULAR:			return 4;
-      case GL_AMBIENT_AND_DIFFUSE:	return 4;
-      case GL_COLOR_INDEXES:		return 3;
-      default:
-	return 0;
+    case GL_SHININESS:
+        return 1;
+    case GL_EMISSION:
+        return 4;
+    case GL_AMBIENT:
+        return 4;
+    case GL_DIFFUSE:
+        return 4;
+    case GL_SPECULAR:
+        return 4;
+    case GL_AMBIENT_AND_DIFFUSE:
+        return 4;
+    case GL_COLOR_INDEXES:
+        return 3;
+    default:
+        return 0;
     }
 }
 
-GLint __glMaterialiv_size(GLenum pname)
+GLint
+__glMaterialiv_size(GLenum pname)
 {
     return __glMaterialfv_size(pname);
 }
 
-GLint __glColorTableParameterfv_size(GLenum pname)
+GLint
+__glColorTableParameterfv_size(GLenum pname)
 {
     switch (pname) {
-      case GL_COLOR_TABLE_FORMAT:
-      case GL_COLOR_TABLE_WIDTH:
-      case GL_COLOR_TABLE_RED_SIZE:
-      case GL_COLOR_TABLE_GREEN_SIZE:
-      case GL_COLOR_TABLE_BLUE_SIZE:
-      case GL_COLOR_TABLE_ALPHA_SIZE:
-      case GL_COLOR_TABLE_LUMINANCE_SIZE:
-      case GL_COLOR_TABLE_INTENSITY_SIZE:
-	return 1;
-      case GL_COLOR_TABLE_SCALE:
-      case GL_COLOR_TABLE_BIAS:
-	return 4;
-      default:
-	return -1;
+    case GL_COLOR_TABLE_FORMAT:
+    case GL_COLOR_TABLE_WIDTH:
+    case GL_COLOR_TABLE_RED_SIZE:
+    case GL_COLOR_TABLE_GREEN_SIZE:
+    case GL_COLOR_TABLE_BLUE_SIZE:
+    case GL_COLOR_TABLE_ALPHA_SIZE:
+    case GL_COLOR_TABLE_LUMINANCE_SIZE:
+    case GL_COLOR_TABLE_INTENSITY_SIZE:
+        return 1;
+    case GL_COLOR_TABLE_SCALE:
+    case GL_COLOR_TABLE_BIAS:
+        return 4;
+    default:
+        return -1;
     }
 }
 
-GLint __glColorTableParameteriv_size(GLenum pname)
+GLint
+__glColorTableParameteriv_size(GLenum pname)
 {
     return __glColorTableParameterfv_size(pname);
 }
 
-GLint __glConvolutionParameterfv_size(GLenum pname)
+GLint
+__glConvolutionParameterfv_size(GLenum pname)
 {
-    switch(pname) {
-      case GL_CONVOLUTION_BORDER_MODE:
-	return 1;
-      case GL_CONVOLUTION_BORDER_COLOR:
-      case GL_CONVOLUTION_FILTER_SCALE:
-      case GL_CONVOLUTION_FILTER_BIAS:
-	return 4;
-      default: /* error: bad enum value */
-	return -1;
+    switch (pname) {
+    case GL_CONVOLUTION_BORDER_MODE:
+        return 1;
+    case GL_CONVOLUTION_BORDER_COLOR:
+    case GL_CONVOLUTION_FILTER_SCALE:
+    case GL_CONVOLUTION_FILTER_BIAS:
+        return 4;
+    default:                   /* error: bad enum value */
+        return -1;
     }
 }
 
-GLint __glConvolutionParameteriv_size(GLenum pname)
+GLint
+__glConvolutionParameteriv_size(GLenum pname)
 {
     return __glConvolutionParameterfv_size(pname);
 }
diff --git a/xorg-server/hw/dmx/glxProxy/g_disptab.c b/xorg-server/hw/dmx/glxProxy/g_disptab.c
index 3f0a6e77e..46177c4cc 100644
--- a/xorg-server/hw/dmx/glxProxy/g_disptab.c
+++ b/xorg-server/hw/dmx/glxProxy/g_disptab.c
@@ -35,578 +35,576 @@
 #include "glxsingle.h"
 
 __GLXdispatchSingleProcPtr __glXSingleTable[] = {
-	__glXNoSuchSingleOpcode,
-	__glXRender,
-	__glXRenderLarge,
-	__glXCreateContext,
-	__glXDestroyContext,
-	__glXMakeCurrent,
-	__glXIsDirect,
-	__glXQueryVersion,
-	__glXWaitGL,
-	__glXWaitX,
-	__glXCopyContext,
-	__glXSwapBuffers,
-	__glXUseXFont,
-	__glXCreateGLXPixmap,
-	__glXGetVisualConfigs,
-	__glXDestroyGLXPixmap,
-	__glXVendorPrivate,
-	__glXVendorPrivateWithReply,
-	__glXQueryExtensionsString,
-	__glXQueryServerString,
-	__glXClientInfo,
-	__glXGetFBConfigs,        /* __glXGetFBConfigs */
-	__glXCreatePixmap,  /* __glXCreatePixmap,*/
-	__glXDestroyGLXPixmap,  /* __glXDestroyPixmap,*/
-	__glXCreateNewContext,  /* __glXCreateNewContext,*/
-	__glXQueryContext,  /* __glXQueryContext,*/
-	__glXMakeContextCurrent,  /* __glXMakeContextCurrent,*/
-	__glXCreatePbuffer,  /* __glXCreatePbuffer,*/
-	__glXDestroyPbuffer,  /* __glXDestroyPbuffer,*/
-	__glXGetDrawableAttributes,  /* __glXGetDrawableAttributes,*/
-	__glXChangeDrawableAttributes,  /* __glXChangeDrawableAttributes,*/
-	__glXCreateWindow,  /* __glXCreateWindow,*/
-	__glXDestroyWindow,  /* __glXDestroyWindow,*/
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXForwardSingleReq, /* __glXDisp_NewList, */
-	__glXForwardSingleReq, /* __glXDisp_EndList, */
-	__glXForwardSingleReq, /* __glXDisp_DeleteLists, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GenLists, */
-	__glXForwardSingleReq, /* __glXDisp_FeedbackBuffer, */
-	__glXForwardSingleReq, /* __glXDisp_SelectBuffer, */
-	__glXForwardAllWithReply, /* __glXDisp_RenderMode, */
-	__glXForwardAllWithReply, /* __glXDisp_Finish, */
-	__glXForwardSingleReq, /* __glXDisp_PixelStoref, */
-	__glXForwardSingleReq, /* __glXDisp_PixelStorei, */
-	__glXDisp_ReadPixels, /* __glXDisp_ReadPixels, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetBooleanv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetClipPlane, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetDoublev, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetError, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetFloatv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetIntegerv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetLightfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetLightiv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetMapdv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetMapfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetMapiv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetMaterialfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetMaterialiv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetPixelMapfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetPixelMapuiv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetPixelMapusv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetPolygonStipple, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetString, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetTexEnvfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetTexEnviv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetTexGendv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetTexGenfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetTexGeniv, */
-	__glXForwardPipe0WithReply,    /* __glXDisp_GetTexImage, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetTexParameterfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetTexParameteriv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetTexLevelParameterfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetTexLevelParameteriv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_IsEnabled, */
-	__glXForwardPipe0WithReply, /* __glXDisp_IsList, */
-	__glXForwardSingleReq, /* __glXDisp_Flush, */
-	__glXForwardPipe0WithReply, /* __glXDisp_AreTexturesResident, */
-	__glXForwardSingleReq, /* __glXDisp_DeleteTextures, */
-	__glXForwardAllWithReply, /* __glXDisp_GenTextures, */
-	__glXForwardPipe0WithReply, /* __glXDisp_IsTexture, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetColorTable, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetColorTableParameterfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetColorTableParameteriv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetConvolutionFilter, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetConvolutionParameterfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetConvolutionParameteriv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetSeparableFilter, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetHistogram, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetHistogramParameterfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetHistogramParameteriv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetMinmax, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetMinmaxParameterfv, */
-	__glXForwardPipe0WithReply, /* __glXDisp_GetMinmaxParameteriv, */
+    __glXNoSuchSingleOpcode,
+    __glXRender,
+    __glXRenderLarge,
+    __glXCreateContext,
+    __glXDestroyContext,
+    __glXMakeCurrent,
+    __glXIsDirect,
+    __glXQueryVersion,
+    __glXWaitGL,
+    __glXWaitX,
+    __glXCopyContext,
+    __glXSwapBuffers,
+    __glXUseXFont,
+    __glXCreateGLXPixmap,
+    __glXGetVisualConfigs,
+    __glXDestroyGLXPixmap,
+    __glXVendorPrivate,
+    __glXVendorPrivateWithReply,
+    __glXQueryExtensionsString,
+    __glXQueryServerString,
+    __glXClientInfo,
+    __glXGetFBConfigs,          /* __glXGetFBConfigs */
+    __glXCreatePixmap,          /* __glXCreatePixmap, */
+    __glXDestroyGLXPixmap,      /* __glXDestroyPixmap, */
+    __glXCreateNewContext,      /* __glXCreateNewContext, */
+    __glXQueryContext,          /* __glXQueryContext, */
+    __glXMakeContextCurrent,    /* __glXMakeContextCurrent, */
+    __glXCreatePbuffer,         /* __glXCreatePbuffer, */
+    __glXDestroyPbuffer,        /* __glXDestroyPbuffer, */
+    __glXGetDrawableAttributes, /* __glXGetDrawableAttributes, */
+    __glXChangeDrawableAttributes,      /* __glXChangeDrawableAttributes, */
+    __glXCreateWindow,          /* __glXCreateWindow, */
+    __glXDestroyWindow,         /* __glXDestroyWindow, */
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXForwardSingleReq,      /* __glXDisp_NewList, */
+    __glXForwardSingleReq,      /* __glXDisp_EndList, */
+    __glXForwardSingleReq,      /* __glXDisp_DeleteLists, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GenLists, */
+    __glXForwardSingleReq,      /* __glXDisp_FeedbackBuffer, */
+    __glXForwardSingleReq,      /* __glXDisp_SelectBuffer, */
+    __glXForwardAllWithReply,   /* __glXDisp_RenderMode, */
+    __glXForwardAllWithReply,   /* __glXDisp_Finish, */
+    __glXForwardSingleReq,      /* __glXDisp_PixelStoref, */
+    __glXForwardSingleReq,      /* __glXDisp_PixelStorei, */
+    __glXDisp_ReadPixels,       /* __glXDisp_ReadPixels, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetBooleanv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetClipPlane, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetDoublev, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetError, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetFloatv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetIntegerv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetLightfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetLightiv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetMapdv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetMapfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetMapiv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetMaterialfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetMaterialiv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetPixelMapfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetPixelMapuiv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetPixelMapusv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetPolygonStipple, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetString, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetTexEnvfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetTexEnviv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetTexGendv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetTexGenfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetTexGeniv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetTexImage, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetTexParameterfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetTexParameteriv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetTexLevelParameterfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetTexLevelParameteriv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_IsEnabled, */
+    __glXForwardPipe0WithReply, /* __glXDisp_IsList, */
+    __glXForwardSingleReq,      /* __glXDisp_Flush, */
+    __glXForwardPipe0WithReply, /* __glXDisp_AreTexturesResident, */
+    __glXForwardSingleReq,      /* __glXDisp_DeleteTextures, */
+    __glXForwardAllWithReply,   /* __glXDisp_GenTextures, */
+    __glXForwardPipe0WithReply, /* __glXDisp_IsTexture, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetColorTable, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetColorTableParameterfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetColorTableParameteriv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetConvolutionFilter, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetConvolutionParameterfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetConvolutionParameteriv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetSeparableFilter, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetHistogram, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetHistogramParameterfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetHistogramParameteriv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetMinmax, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetMinmaxParameterfv, */
+    __glXForwardPipe0WithReply, /* __glXDisp_GetMinmaxParameteriv, */
 };
 
 __GLXdispatchSingleProcPtr __glXSwapSingleTable[] = {
-	__glXNoSuchSingleOpcode,
-	__glXSwapRender,
-	__glXSwapRenderLarge,
-	__glXSwapCreateContext,
-	__glXSwapDestroyContext,
-	__glXSwapMakeCurrent,
-	__glXSwapIsDirect,
-	__glXSwapQueryVersion,
-	__glXSwapWaitGL,
-	__glXSwapWaitX,
-	__glXSwapCopyContext,
-	__glXSwapSwapBuffers,
-	__glXSwapUseXFont,
-	__glXSwapCreateGLXPixmap,
-	__glXSwapGetVisualConfigs,
-	__glXSwapDestroyGLXPixmap,
-	__glXSwapVendorPrivate,
-	__glXSwapVendorPrivateWithReply,
-	__glXSwapQueryExtensionsString,
-	__glXSwapQueryServerString,
-	__glXSwapClientInfo,
-	__glXSwapGetFBConfigs,
-	__glXSwapCreatePixmap,
-	__glXSwapDestroyGLXPixmap,
-	__glXSwapCreateNewContext,
-	__glXSwapQueryContext,
-	__glXSwapMakeContextCurrent,
-	__glXSwapCreatePbuffer,
-	__glXSwapDestroyPbuffer,
-	__glXSwapGetDrawableAttributes,
-	__glXSwapChangeDrawableAttributes,
-	__glXSwapCreateWindow,
-	__glXSwapDestroyWindow,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXNoSuchSingleOpcode,
-	__glXForwardSingleReqSwap, /* __glXDisp_NewList, */
-	__glXForwardSingleReqSwap, /* __glXDisp_EndList, */
-	__glXForwardSingleReqSwap, /* __glXDisp_DeleteLists, */
-	__glXForwardPipe0WithReplySwap, /* __glXDisp_GenLists, */
-	__glXForwardSingleReqSwap, /* __glXDisp_FeedbackBuffer, */
-	__glXForwardSingleReqSwap, /* __glXDisp_SelectBuffer, */
-	__glXForwardAllWithReplySwapiv, /* __glXDisp_RenderMode, */
-	__glXForwardAllWithReplySwap, /* __glXDisp_Finish, */
-	__glXForwardSingleReqSwap, /* __glXDisp_PixelStoref, */
-	__glXForwardSingleReqSwap, /* __glXDisp_PixelStorei, */
-	__glXDisp_ReadPixels, /* __glXDisp_ReadPixels, */
-	__glXForwardPipe0WithReplySwap, /* __glXDisp_GetBooleanv, */
-	__glXForwardPipe0WithReplySwapdv, /* __glXDisp_GetClipPlane, */
-	__glXForwardPipe0WithReplySwapdv, /* __glXDisp_GetDoublev, */
-	__glXForwardPipe0WithReplySwap, /* __glXDisp_GetError, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetFloatv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetIntegerv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetLightfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetLightiv, */
-	__glXForwardPipe0WithReplySwapdv, /* __glXDisp_GetMapdv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetMapfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetMapiv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetMaterialfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetMaterialiv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetPixelMapfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetPixelMapuiv, */
-	__glXForwardPipe0WithReplySwapsv, /* __glXDisp_GetPixelMapusv, */
-	__glXForwardPipe0WithReplySwap, /* __glXDisp_GetPolygonStipple, */
-	__glXForwardPipe0WithReplySwap, /* __glXDisp_GetString, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetTexEnvfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetTexEnviv, */
-	__glXForwardPipe0WithReplySwapdv, /* __glXDisp_GetTexGendv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetTexGenfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetTexGeniv, */
-	__glXDispSwap_GetTexImage, /* __glXDisp_GetTexImage, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetTexParameterfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetTexParameteriv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetTexLevelParameterfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetTexLevelParameteriv, */
-	__glXForwardPipe0WithReplySwap, /* __glXDisp_IsEnabled, */
-	__glXForwardPipe0WithReplySwap, /* __glXDisp_IsList, */
-	__glXForwardSingleReqSwap, /* __glXDisp_Flush, */
-	__glXForwardPipe0WithReplySwap, /* __glXDisp_AreTexturesResident, */
-	__glXForwardSingleReqSwap, /* __glXDisp_DeleteTextures, */
-	__glXForwardAllWithReplySwapiv, /* __glXDisp_GenTextures, */
-	__glXForwardPipe0WithReplySwap, /* __glXDisp_IsTexture, */
-	__glXDispSwap_GetColorTable, /* __glXDisp_GetColorTable, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetColorTableParameterfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetColorTableParameteriv, */
-	__glXDispSwap_GetColorTable, /* __glXDisp_GetConvolutionFilter, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetConvolutionParameterfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetConvolutionParameteriv, */
-	__glXDispSwap_GetColorTable, /* __glXDisp_GetSeparableFilter, */
-	__glXDispSwap_GetColorTable, /* __glXDisp_GetHistogram, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetHistogramParameterfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetHistogramParameteriv, */
-	__glXDispSwap_GetColorTable, /* __glXDisp_GetMinmax, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetMinmaxParameterfv, */
-	__glXForwardPipe0WithReplySwapiv, /* __glXDisp_GetMinmaxParameteriv, */
+    __glXNoSuchSingleOpcode,
+    __glXSwapRender,
+    __glXSwapRenderLarge,
+    __glXSwapCreateContext,
+    __glXSwapDestroyContext,
+    __glXSwapMakeCurrent,
+    __glXSwapIsDirect,
+    __glXSwapQueryVersion,
+    __glXSwapWaitGL,
+    __glXSwapWaitX,
+    __glXSwapCopyContext,
+    __glXSwapSwapBuffers,
+    __glXSwapUseXFont,
+    __glXSwapCreateGLXPixmap,
+    __glXSwapGetVisualConfigs,
+    __glXSwapDestroyGLXPixmap,
+    __glXSwapVendorPrivate,
+    __glXSwapVendorPrivateWithReply,
+    __glXSwapQueryExtensionsString,
+    __glXSwapQueryServerString,
+    __glXSwapClientInfo,
+    __glXSwapGetFBConfigs,
+    __glXSwapCreatePixmap,
+    __glXSwapDestroyGLXPixmap,
+    __glXSwapCreateNewContext,
+    __glXSwapQueryContext,
+    __glXSwapMakeContextCurrent,
+    __glXSwapCreatePbuffer,
+    __glXSwapDestroyPbuffer,
+    __glXSwapGetDrawableAttributes,
+    __glXSwapChangeDrawableAttributes,
+    __glXSwapCreateWindow,
+    __glXSwapDestroyWindow,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXNoSuchSingleOpcode,
+    __glXForwardSingleReqSwap,  /* __glXDisp_NewList, */
+    __glXForwardSingleReqSwap,  /* __glXDisp_EndList, */
+    __glXForwardSingleReqSwap,  /* __glXDisp_DeleteLists, */
+    __glXForwardPipe0WithReplySwap,     /* __glXDisp_GenLists, */
+    __glXForwardSingleReqSwap,  /* __glXDisp_FeedbackBuffer, */
+    __glXForwardSingleReqSwap,  /* __glXDisp_SelectBuffer, */
+    __glXForwardAllWithReplySwapiv,     /* __glXDisp_RenderMode, */
+    __glXForwardAllWithReplySwap,       /* __glXDisp_Finish, */
+    __glXForwardSingleReqSwap,  /* __glXDisp_PixelStoref, */
+    __glXForwardSingleReqSwap,  /* __glXDisp_PixelStorei, */
+    __glXDisp_ReadPixels,       /* __glXDisp_ReadPixels, */
+    __glXForwardPipe0WithReplySwap,     /* __glXDisp_GetBooleanv, */
+    __glXForwardPipe0WithReplySwapdv,   /* __glXDisp_GetClipPlane, */
+    __glXForwardPipe0WithReplySwapdv,   /* __glXDisp_GetDoublev, */
+    __glXForwardPipe0WithReplySwap,     /* __glXDisp_GetError, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetFloatv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetIntegerv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetLightfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetLightiv, */
+    __glXForwardPipe0WithReplySwapdv,   /* __glXDisp_GetMapdv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetMapfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetMapiv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetMaterialfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetMaterialiv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetPixelMapfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetPixelMapuiv, */
+    __glXForwardPipe0WithReplySwapsv,   /* __glXDisp_GetPixelMapusv, */
+    __glXForwardPipe0WithReplySwap,     /* __glXDisp_GetPolygonStipple, */
+    __glXForwardPipe0WithReplySwap,     /* __glXDisp_GetString, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetTexEnvfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetTexEnviv, */
+    __glXForwardPipe0WithReplySwapdv,   /* __glXDisp_GetTexGendv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetTexGenfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetTexGeniv, */
+    __glXDispSwap_GetTexImage,  /* __glXDisp_GetTexImage, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetTexParameterfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetTexParameteriv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetTexLevelParameterfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetTexLevelParameteriv, */
+    __glXForwardPipe0WithReplySwap,     /* __glXDisp_IsEnabled, */
+    __glXForwardPipe0WithReplySwap,     /* __glXDisp_IsList, */
+    __glXForwardSingleReqSwap,  /* __glXDisp_Flush, */
+    __glXForwardPipe0WithReplySwap,     /* __glXDisp_AreTexturesResident, */
+    __glXForwardSingleReqSwap,  /* __glXDisp_DeleteTextures, */
+    __glXForwardAllWithReplySwapiv,     /* __glXDisp_GenTextures, */
+    __glXForwardPipe0WithReplySwap,     /* __glXDisp_IsTexture, */
+    __glXDispSwap_GetColorTable,        /* __glXDisp_GetColorTable, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetColorTableParameterfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetColorTableParameteriv, */
+    __glXDispSwap_GetColorTable,        /* __glXDisp_GetConvolutionFilter, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetConvolutionParameterfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetConvolutionParameteriv, */
+    __glXDispSwap_GetColorTable,        /* __glXDisp_GetSeparableFilter, */
+    __glXDispSwap_GetColorTable,        /* __glXDisp_GetHistogram, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetHistogramParameterfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetHistogramParameteriv, */
+    __glXDispSwap_GetColorTable,        /* __glXDisp_GetMinmax, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetMinmaxParameterfv, */
+    __glXForwardPipe0WithReplySwapiv,   /* __glXDisp_GetMinmaxParameteriv, */
 };
 
 __GLXdispatchRenderProcPtr __glXSwapRenderTable[] = {
-	__glXNoSuchRenderOpcode,
-	__glXDispSwap_CallList,
-	__glXDispSwap_CallLists,
-	__glXDispSwap_ListBase,
-	__glXDispSwap_Begin,
-	__glXDispSwap_Bitmap,
-	__glXDispSwap_Color3bv,
-	__glXDispSwap_Color3dv,
-	__glXDispSwap_Color3fv,
-	__glXDispSwap_Color3iv,
-	__glXDispSwap_Color3sv,
-	__glXDispSwap_Color3ubv,
-	__glXDispSwap_Color3uiv,
-	__glXDispSwap_Color3usv,
-	__glXDispSwap_Color4bv,
-	__glXDispSwap_Color4dv,
-	__glXDispSwap_Color4fv,
-	__glXDispSwap_Color4iv,
-	__glXDispSwap_Color4sv,
-	__glXDispSwap_Color4ubv,
-	__glXDispSwap_Color4uiv,
-	__glXDispSwap_Color4usv,
-	__glXDispSwap_EdgeFlagv,
-	__glXDispSwap_End,
-	__glXDispSwap_Indexdv,
-	__glXDispSwap_Indexfv,
-	__glXDispSwap_Indexiv,
-	__glXDispSwap_Indexsv,
-	__glXDispSwap_Normal3bv,
-	__glXDispSwap_Normal3dv,
-	__glXDispSwap_Normal3fv,
-	__glXDispSwap_Normal3iv,
-	__glXDispSwap_Normal3sv,
-	__glXDispSwap_RasterPos2dv,
-	__glXDispSwap_RasterPos2fv,
-	__glXDispSwap_RasterPos2iv,
-	__glXDispSwap_RasterPos2sv,
-	__glXDispSwap_RasterPos3dv,
-	__glXDispSwap_RasterPos3fv,
-	__glXDispSwap_RasterPos3iv,
-	__glXDispSwap_RasterPos3sv,
-	__glXDispSwap_RasterPos4dv,
-	__glXDispSwap_RasterPos4fv,
-	__glXDispSwap_RasterPos4iv,
-	__glXDispSwap_RasterPos4sv,
-	__glXDispSwap_Rectdv,
-	__glXDispSwap_Rectfv,
-	__glXDispSwap_Rectiv,
-	__glXDispSwap_Rectsv,
-	__glXDispSwap_TexCoord1dv,
-	__glXDispSwap_TexCoord1fv,
-	__glXDispSwap_TexCoord1iv,
-	__glXDispSwap_TexCoord1sv,
-	__glXDispSwap_TexCoord2dv,
-	__glXDispSwap_TexCoord2fv,
-	__glXDispSwap_TexCoord2iv,
-	__glXDispSwap_TexCoord2sv,
-	__glXDispSwap_TexCoord3dv,
-	__glXDispSwap_TexCoord3fv,
-	__glXDispSwap_TexCoord3iv,
-	__glXDispSwap_TexCoord3sv,
-	__glXDispSwap_TexCoord4dv,
-	__glXDispSwap_TexCoord4fv,
-	__glXDispSwap_TexCoord4iv,
-	__glXDispSwap_TexCoord4sv,
-	__glXDispSwap_Vertex2dv,
-	__glXDispSwap_Vertex2fv,
-	__glXDispSwap_Vertex2iv,
-	__glXDispSwap_Vertex2sv,
-	__glXDispSwap_Vertex3dv,
-	__glXDispSwap_Vertex3fv,
-	__glXDispSwap_Vertex3iv,
-	__glXDispSwap_Vertex3sv,
-	__glXDispSwap_Vertex4dv,
-	__glXDispSwap_Vertex4fv,
-	__glXDispSwap_Vertex4iv,
-	__glXDispSwap_Vertex4sv,
-	__glXDispSwap_ClipPlane,
-	__glXDispSwap_ColorMaterial,
-	__glXDispSwap_CullFace,
-	__glXDispSwap_Fogf,
-	__glXDispSwap_Fogfv,
-	__glXDispSwap_Fogi,
-	__glXDispSwap_Fogiv,
-	__glXDispSwap_FrontFace,
-	__glXDispSwap_Hint,
-	__glXDispSwap_Lightf,
-	__glXDispSwap_Lightfv,
-	__glXDispSwap_Lighti,
-	__glXDispSwap_Lightiv,
-	__glXDispSwap_LightModelf,
-	__glXDispSwap_LightModelfv,
-	__glXDispSwap_LightModeli,
-	__glXDispSwap_LightModeliv,
-	__glXDispSwap_LineStipple,
-	__glXDispSwap_LineWidth,
-	__glXDispSwap_Materialf,
-	__glXDispSwap_Materialfv,
-	__glXDispSwap_Materiali,
-	__glXDispSwap_Materialiv,
-	__glXDispSwap_PointSize,
-	__glXDispSwap_PolygonMode,
-	__glXDispSwap_PolygonStipple,
-	__glXDispSwap_Scissor,
-	__glXDispSwap_ShadeModel,
-	__glXDispSwap_TexParameterf,
-	__glXDispSwap_TexParameterfv,
-	__glXDispSwap_TexParameteri,
-	__glXDispSwap_TexParameteriv,
-	__glXDispSwap_TexImage1D,
-	__glXDispSwap_TexImage2D,
-	__glXDispSwap_TexEnvf,
-	__glXDispSwap_TexEnvfv,
-	__glXDispSwap_TexEnvi,
-	__glXDispSwap_TexEnviv,
-	__glXDispSwap_TexGend,
-	__glXDispSwap_TexGendv,
-	__glXDispSwap_TexGenf,
-	__glXDispSwap_TexGenfv,
-	__glXDispSwap_TexGeni,
-	__glXDispSwap_TexGeniv,
-	__glXDispSwap_InitNames,
-	__glXDispSwap_LoadName,
-	__glXDispSwap_PassThrough,
-	__glXDispSwap_PopName,
-	__glXDispSwap_PushName,
-	__glXDispSwap_DrawBuffer,
-	__glXDispSwap_Clear,
-	__glXDispSwap_ClearAccum,
-	__glXDispSwap_ClearIndex,
-	__glXDispSwap_ClearColor,
-	__glXDispSwap_ClearStencil,
-	__glXDispSwap_ClearDepth,
-	__glXDispSwap_StencilMask,
-	__glXDispSwap_ColorMask,
-	__glXDispSwap_DepthMask,
-	__glXDispSwap_IndexMask,
-	__glXDispSwap_Accum,
-	__glXDispSwap_Disable,
-	__glXDispSwap_Enable,
-	__glXNoSuchRenderOpcode,
-	__glXDispSwap_PopAttrib,
-	__glXDispSwap_PushAttrib,
-	__glXDispSwap_Map1d,
-	__glXDispSwap_Map1f,
-	__glXDispSwap_Map2d,
-	__glXDispSwap_Map2f,
-	__glXDispSwap_MapGrid1d,
-	__glXDispSwap_MapGrid1f,
-	__glXDispSwap_MapGrid2d,
-	__glXDispSwap_MapGrid2f,
-	__glXDispSwap_EvalCoord1dv,
-	__glXDispSwap_EvalCoord1fv,
-	__glXDispSwap_EvalCoord2dv,
-	__glXDispSwap_EvalCoord2fv,
-	__glXDispSwap_EvalMesh1,
-	__glXDispSwap_EvalPoint1,
-	__glXDispSwap_EvalMesh2,
-	__glXDispSwap_EvalPoint2,
-	__glXDispSwap_AlphaFunc,
-	__glXDispSwap_BlendFunc,
-	__glXDispSwap_LogicOp,
-	__glXDispSwap_StencilFunc,
-	__glXDispSwap_StencilOp,
-	__glXDispSwap_DepthFunc,
-	__glXDispSwap_PixelZoom,
-	__glXDispSwap_PixelTransferf,
-	__glXDispSwap_PixelTransferi,
-	__glXDispSwap_PixelMapfv,
-	__glXDispSwap_PixelMapuiv,
-	__glXDispSwap_PixelMapusv,
-	__glXDispSwap_ReadBuffer,
-	__glXDispSwap_CopyPixels,
-	__glXDispSwap_DrawPixels,
-	__glXDispSwap_DepthRange,
-	__glXDispSwap_Frustum,
-	__glXDispSwap_LoadIdentity,
-	__glXDispSwap_LoadMatrixf,
-	__glXDispSwap_LoadMatrixd,
-	__glXDispSwap_MatrixMode,
-	__glXDispSwap_MultMatrixf,
-	__glXDispSwap_MultMatrixd,
-	__glXDispSwap_Ortho,
-	__glXDispSwap_PopMatrix,
-	__glXDispSwap_PushMatrix,
-	__glXDispSwap_Rotated,
-	__glXDispSwap_Rotatef,
-	__glXDispSwap_Scaled,
-	__glXDispSwap_Scalef,
-	__glXDispSwap_Translated,
-	__glXDispSwap_Translatef,
-	__glXDispSwap_Viewport,
-	__glXDispSwap_PolygonOffset,
-	__glXDispSwap_DrawArrays,
-	__glXDispSwap_Indexubv,
-	__glXDispSwap_ColorSubTable,
-	__glXDispSwap_CopyColorSubTable,
-	__glXDispSwap_ActiveTextureARB,
-	__glXDispSwap_MultiTexCoord1dvARB,
-	__glXDispSwap_MultiTexCoord1fvARB,
-	__glXDispSwap_MultiTexCoord1ivARB,
-	__glXDispSwap_MultiTexCoord1svARB,
-	__glXDispSwap_MultiTexCoord2dvARB,
-	__glXDispSwap_MultiTexCoord2fvARB,
-	__glXDispSwap_MultiTexCoord2ivARB,
-	__glXDispSwap_MultiTexCoord2svARB,
-	__glXDispSwap_MultiTexCoord3dvARB,
-	__glXDispSwap_MultiTexCoord3fvARB,
-	__glXDispSwap_MultiTexCoord3ivARB,
-	__glXDispSwap_MultiTexCoord3svARB,
-	__glXDispSwap_MultiTexCoord4dvARB,
-	__glXDispSwap_MultiTexCoord4fvARB,
-	__glXDispSwap_MultiTexCoord4ivARB,
-	__glXDispSwap_MultiTexCoord4svARB,
+    __glXNoSuchRenderOpcode,
+    __glXDispSwap_CallList,
+    __glXDispSwap_CallLists,
+    __glXDispSwap_ListBase,
+    __glXDispSwap_Begin,
+    __glXDispSwap_Bitmap,
+    __glXDispSwap_Color3bv,
+    __glXDispSwap_Color3dv,
+    __glXDispSwap_Color3fv,
+    __glXDispSwap_Color3iv,
+    __glXDispSwap_Color3sv,
+    __glXDispSwap_Color3ubv,
+    __glXDispSwap_Color3uiv,
+    __glXDispSwap_Color3usv,
+    __glXDispSwap_Color4bv,
+    __glXDispSwap_Color4dv,
+    __glXDispSwap_Color4fv,
+    __glXDispSwap_Color4iv,
+    __glXDispSwap_Color4sv,
+    __glXDispSwap_Color4ubv,
+    __glXDispSwap_Color4uiv,
+    __glXDispSwap_Color4usv,
+    __glXDispSwap_EdgeFlagv,
+    __glXDispSwap_End,
+    __glXDispSwap_Indexdv,
+    __glXDispSwap_Indexfv,
+    __glXDispSwap_Indexiv,
+    __glXDispSwap_Indexsv,
+    __glXDispSwap_Normal3bv,
+    __glXDispSwap_Normal3dv,
+    __glXDispSwap_Normal3fv,
+    __glXDispSwap_Normal3iv,
+    __glXDispSwap_Normal3sv,
+    __glXDispSwap_RasterPos2dv,
+    __glXDispSwap_RasterPos2fv,
+    __glXDispSwap_RasterPos2iv,
+    __glXDispSwap_RasterPos2sv,
+    __glXDispSwap_RasterPos3dv,
+    __glXDispSwap_RasterPos3fv,
+    __glXDispSwap_RasterPos3iv,
+    __glXDispSwap_RasterPos3sv,
+    __glXDispSwap_RasterPos4dv,
+    __glXDispSwap_RasterPos4fv,
+    __glXDispSwap_RasterPos4iv,
+    __glXDispSwap_RasterPos4sv,
+    __glXDispSwap_Rectdv,
+    __glXDispSwap_Rectfv,
+    __glXDispSwap_Rectiv,
+    __glXDispSwap_Rectsv,
+    __glXDispSwap_TexCoord1dv,
+    __glXDispSwap_TexCoord1fv,
+    __glXDispSwap_TexCoord1iv,
+    __glXDispSwap_TexCoord1sv,
+    __glXDispSwap_TexCoord2dv,
+    __glXDispSwap_TexCoord2fv,
+    __glXDispSwap_TexCoord2iv,
+    __glXDispSwap_TexCoord2sv,
+    __glXDispSwap_TexCoord3dv,
+    __glXDispSwap_TexCoord3fv,
+    __glXDispSwap_TexCoord3iv,
+    __glXDispSwap_TexCoord3sv,
+    __glXDispSwap_TexCoord4dv,
+    __glXDispSwap_TexCoord4fv,
+    __glXDispSwap_TexCoord4iv,
+    __glXDispSwap_TexCoord4sv,
+    __glXDispSwap_Vertex2dv,
+    __glXDispSwap_Vertex2fv,
+    __glXDispSwap_Vertex2iv,
+    __glXDispSwap_Vertex2sv,
+    __glXDispSwap_Vertex3dv,
+    __glXDispSwap_Vertex3fv,
+    __glXDispSwap_Vertex3iv,
+    __glXDispSwap_Vertex3sv,
+    __glXDispSwap_Vertex4dv,
+    __glXDispSwap_Vertex4fv,
+    __glXDispSwap_Vertex4iv,
+    __glXDispSwap_Vertex4sv,
+    __glXDispSwap_ClipPlane,
+    __glXDispSwap_ColorMaterial,
+    __glXDispSwap_CullFace,
+    __glXDispSwap_Fogf,
+    __glXDispSwap_Fogfv,
+    __glXDispSwap_Fogi,
+    __glXDispSwap_Fogiv,
+    __glXDispSwap_FrontFace,
+    __glXDispSwap_Hint,
+    __glXDispSwap_Lightf,
+    __glXDispSwap_Lightfv,
+    __glXDispSwap_Lighti,
+    __glXDispSwap_Lightiv,
+    __glXDispSwap_LightModelf,
+    __glXDispSwap_LightModelfv,
+    __glXDispSwap_LightModeli,
+    __glXDispSwap_LightModeliv,
+    __glXDispSwap_LineStipple,
+    __glXDispSwap_LineWidth,
+    __glXDispSwap_Materialf,
+    __glXDispSwap_Materialfv,
+    __glXDispSwap_Materiali,
+    __glXDispSwap_Materialiv,
+    __glXDispSwap_PointSize,
+    __glXDispSwap_PolygonMode,
+    __glXDispSwap_PolygonStipple,
+    __glXDispSwap_Scissor,
+    __glXDispSwap_ShadeModel,
+    __glXDispSwap_TexParameterf,
+    __glXDispSwap_TexParameterfv,
+    __glXDispSwap_TexParameteri,
+    __glXDispSwap_TexParameteriv,
+    __glXDispSwap_TexImage1D,
+    __glXDispSwap_TexImage2D,
+    __glXDispSwap_TexEnvf,
+    __glXDispSwap_TexEnvfv,
+    __glXDispSwap_TexEnvi,
+    __glXDispSwap_TexEnviv,
+    __glXDispSwap_TexGend,
+    __glXDispSwap_TexGendv,
+    __glXDispSwap_TexGenf,
+    __glXDispSwap_TexGenfv,
+    __glXDispSwap_TexGeni,
+    __glXDispSwap_TexGeniv,
+    __glXDispSwap_InitNames,
+    __glXDispSwap_LoadName,
+    __glXDispSwap_PassThrough,
+    __glXDispSwap_PopName,
+    __glXDispSwap_PushName,
+    __glXDispSwap_DrawBuffer,
+    __glXDispSwap_Clear,
+    __glXDispSwap_ClearAccum,
+    __glXDispSwap_ClearIndex,
+    __glXDispSwap_ClearColor,
+    __glXDispSwap_ClearStencil,
+    __glXDispSwap_ClearDepth,
+    __glXDispSwap_StencilMask,
+    __glXDispSwap_ColorMask,
+    __glXDispSwap_DepthMask,
+    __glXDispSwap_IndexMask,
+    __glXDispSwap_Accum,
+    __glXDispSwap_Disable,
+    __glXDispSwap_Enable,
+    __glXNoSuchRenderOpcode,
+    __glXDispSwap_PopAttrib,
+    __glXDispSwap_PushAttrib,
+    __glXDispSwap_Map1d,
+    __glXDispSwap_Map1f,
+    __glXDispSwap_Map2d,
+    __glXDispSwap_Map2f,
+    __glXDispSwap_MapGrid1d,
+    __glXDispSwap_MapGrid1f,
+    __glXDispSwap_MapGrid2d,
+    __glXDispSwap_MapGrid2f,
+    __glXDispSwap_EvalCoord1dv,
+    __glXDispSwap_EvalCoord1fv,
+    __glXDispSwap_EvalCoord2dv,
+    __glXDispSwap_EvalCoord2fv,
+    __glXDispSwap_EvalMesh1,
+    __glXDispSwap_EvalPoint1,
+    __glXDispSwap_EvalMesh2,
+    __glXDispSwap_EvalPoint2,
+    __glXDispSwap_AlphaFunc,
+    __glXDispSwap_BlendFunc,
+    __glXDispSwap_LogicOp,
+    __glXDispSwap_StencilFunc,
+    __glXDispSwap_StencilOp,
+    __glXDispSwap_DepthFunc,
+    __glXDispSwap_PixelZoom,
+    __glXDispSwap_PixelTransferf,
+    __glXDispSwap_PixelTransferi,
+    __glXDispSwap_PixelMapfv,
+    __glXDispSwap_PixelMapuiv,
+    __glXDispSwap_PixelMapusv,
+    __glXDispSwap_ReadBuffer,
+    __glXDispSwap_CopyPixels,
+    __glXDispSwap_DrawPixels,
+    __glXDispSwap_DepthRange,
+    __glXDispSwap_Frustum,
+    __glXDispSwap_LoadIdentity,
+    __glXDispSwap_LoadMatrixf,
+    __glXDispSwap_LoadMatrixd,
+    __glXDispSwap_MatrixMode,
+    __glXDispSwap_MultMatrixf,
+    __glXDispSwap_MultMatrixd,
+    __glXDispSwap_Ortho,
+    __glXDispSwap_PopMatrix,
+    __glXDispSwap_PushMatrix,
+    __glXDispSwap_Rotated,
+    __glXDispSwap_Rotatef,
+    __glXDispSwap_Scaled,
+    __glXDispSwap_Scalef,
+    __glXDispSwap_Translated,
+    __glXDispSwap_Translatef,
+    __glXDispSwap_Viewport,
+    __glXDispSwap_PolygonOffset,
+    __glXDispSwap_DrawArrays,
+    __glXDispSwap_Indexubv,
+    __glXDispSwap_ColorSubTable,
+    __glXDispSwap_CopyColorSubTable,
+    __glXDispSwap_ActiveTextureARB,
+    __glXDispSwap_MultiTexCoord1dvARB,
+    __glXDispSwap_MultiTexCoord1fvARB,
+    __glXDispSwap_MultiTexCoord1ivARB,
+    __glXDispSwap_MultiTexCoord1svARB,
+    __glXDispSwap_MultiTexCoord2dvARB,
+    __glXDispSwap_MultiTexCoord2fvARB,
+    __glXDispSwap_MultiTexCoord2ivARB,
+    __glXDispSwap_MultiTexCoord2svARB,
+    __glXDispSwap_MultiTexCoord3dvARB,
+    __glXDispSwap_MultiTexCoord3fvARB,
+    __glXDispSwap_MultiTexCoord3ivARB,
+    __glXDispSwap_MultiTexCoord3svARB,
+    __glXDispSwap_MultiTexCoord4dvARB,
+    __glXDispSwap_MultiTexCoord4fvARB,
+    __glXDispSwap_MultiTexCoord4ivARB,
+    __glXDispSwap_MultiTexCoord4svARB,
 };
 
-__GLXRenderSwapInfo __glXSwapRenderTable_EXT[] =
-{
-   {4, 4, NULL}, /* X_GLrop_BlendColorEXT */
-   {4, 1, NULL}, /* X_GLrop_BlendEquationEXT */
-   {4, 2, NULL}, /* X_GLrop_PolygonOffsetEXT */
-   {4, 0, __glXDispSwap_TexSubImage1D}, /* X_GLrop_TexSubImage1DEXT */
-   {4, 0, __glXDispSwap_TexSubImage2D}, /* X_GLrop_TexSubImage2DEXT */
-   {4, 0, __glXDispSwap_ConvolutionFilter1D}, /* X_GLrop_ConvolutionFilter1DEXT */
-   {4, 0, __glXDispSwap_ConvolutionFilter2D}, /* X_GLrop_ConvolutionFilter2DEXT */
-   {4, 3, NULL}, /* X_GLrop_ConvolutionParameterfEXT */
-   {4, 0, __glXDispSwap_ConvolutionParameterfv}, /* X_GLrop_ConvolutionParameterfvEXT */
-   {4, 3, NULL}, /* X_GLrop_ConvolutionParameteriEXT */
-   {4, 0, __glXDispSwap_ConvolutionParameteriv}, /* X_GLrop_ConvolutionParameterivEXT */
-   {4, 0, __glXDispSwap_CopyConvolutionFilter1D}, /* X_GLrop_CopyConvolutionFilter1DEXT */
-   {4, 0, __glXDispSwap_CopyConvolutionFilter2D}, /* X_GLrop_CopyConvolutionFilter2DEXT */
-   {4, 0, __glXDispSwap_SeparableFilter2D}, /* X_GLrop_SeparableFilter2DEXT */
-   {4, 3, NULL}, /* X_GLrop_HistogramEXT */
-   {4, 2, NULL}, /* X_GLrop_MinmaxEXT */
-   {4, 1, NULL}, /* X_GLrop_ResetHistogramEXT */
-   {4, 1, NULL}, /* X_GLrop_ResetMinmaxEXT */
-   {4, 0, __glXDispSwap_TexImage3D}, /* X_GLrop_TexImage3DEXT */
-   {4, 0, __glXDispSwap_TexSubImage3D}, /* X_GLrop_TexSubImage3DEXT */
-   {4, 0, __glXDispSwap_DrawArrays}, /* X_GLrop_DrawArraysEXT */
-   {4, 2, NULL}, /* X_GLrop_BindTextureEXT */
-   {4, 0, __glXDispSwap_PrioritizeTextures}, /* X_GLrop_PrioritizeTexturesEXT */
-   {4, 0, __glXDispSwap_CopyTexImage1D}, /* X_GLrop_CopyTexImage1DEXT */
-   {4, 0, __glXDispSwap_CopyTexImage2D}, /* X_GLrop_CopyTexImage2DEXT */
-   {4, 0, __glXDispSwap_CopyTexSubImage1D}, /* X_GLrop_CopyTexSubImage1DEXT */
-   {4, 0, __glXDispSwap_CopyTexSubImage2D}, /* X_GLrop_CopyTexSubImage2DEXT */
-   {4, 0, __glXDispSwap_CopyTexSubImage3D}, /* X_GLrop_CopyTexSubImage3DEXT */
+__GLXRenderSwapInfo __glXSwapRenderTable_EXT[] = {
+    {4, 4, NULL},               /* X_GLrop_BlendColorEXT */
+    {4, 1, NULL},               /* X_GLrop_BlendEquationEXT */
+    {4, 2, NULL},               /* X_GLrop_PolygonOffsetEXT */
+    {4, 0, __glXDispSwap_TexSubImage1D},        /* X_GLrop_TexSubImage1DEXT */
+    {4, 0, __glXDispSwap_TexSubImage2D},        /* X_GLrop_TexSubImage2DEXT */
+    {4, 0, __glXDispSwap_ConvolutionFilter1D},  /* X_GLrop_ConvolutionFilter1DEXT */
+    {4, 0, __glXDispSwap_ConvolutionFilter2D},  /* X_GLrop_ConvolutionFilter2DEXT */
+    {4, 3, NULL},               /* X_GLrop_ConvolutionParameterfEXT */
+    {4, 0, __glXDispSwap_ConvolutionParameterfv},       /* X_GLrop_ConvolutionParameterfvEXT */
+    {4, 3, NULL},               /* X_GLrop_ConvolutionParameteriEXT */
+    {4, 0, __glXDispSwap_ConvolutionParameteriv},       /* X_GLrop_ConvolutionParameterivEXT */
+    {4, 0, __glXDispSwap_CopyConvolutionFilter1D},      /* X_GLrop_CopyConvolutionFilter1DEXT */
+    {4, 0, __glXDispSwap_CopyConvolutionFilter2D},      /* X_GLrop_CopyConvolutionFilter2DEXT */
+    {4, 0, __glXDispSwap_SeparableFilter2D},    /* X_GLrop_SeparableFilter2DEXT */
+    {4, 3, NULL},               /* X_GLrop_HistogramEXT */
+    {4, 2, NULL},               /* X_GLrop_MinmaxEXT */
+    {4, 1, NULL},               /* X_GLrop_ResetHistogramEXT */
+    {4, 1, NULL},               /* X_GLrop_ResetMinmaxEXT */
+    {4, 0, __glXDispSwap_TexImage3D},   /* X_GLrop_TexImage3DEXT */
+    {4, 0, __glXDispSwap_TexSubImage3D},        /* X_GLrop_TexSubImage3DEXT */
+    {4, 0, __glXDispSwap_DrawArrays},   /* X_GLrop_DrawArraysEXT */
+    {4, 2, NULL},               /* X_GLrop_BindTextureEXT */
+    {4, 0, __glXDispSwap_PrioritizeTextures},   /* X_GLrop_PrioritizeTexturesEXT */
+    {4, 0, __glXDispSwap_CopyTexImage1D},       /* X_GLrop_CopyTexImage1DEXT */
+    {4, 0, __glXDispSwap_CopyTexImage2D},       /* X_GLrop_CopyTexImage2DEXT */
+    {4, 0, __glXDispSwap_CopyTexSubImage1D},    /* X_GLrop_CopyTexSubImage1DEXT */
+    {4, 0, __glXDispSwap_CopyTexSubImage2D},    /* X_GLrop_CopyTexSubImage2DEXT */
+    {4, 0, __glXDispSwap_CopyTexSubImage3D},    /* X_GLrop_CopyTexSubImage3DEXT */
 
 };
-
diff --git a/xorg-server/hw/dmx/glxProxy/g_disptab.h b/xorg-server/hw/dmx/glxProxy/g_disptab.h
index c497c88e5..530338798 100644
--- a/xorg-server/hw/dmx/glxProxy/g_disptab.h
+++ b/xorg-server/hw/dmx/glxProxy/g_disptab.h
@@ -31,633 +31,637 @@
  * Silicon Graphics, Inc.
  */
 
-extern int __glXRender(__GLXclientState*, GLbyte*);
-extern int __glXRenderLarge(__GLXclientState*, GLbyte*);
-extern int __glXSendLargeCommand(__GLXclientState *cl, GLXContextTag contextTag);
-extern int __glXCreateContext(__GLXclientState*, GLbyte*);
-extern int __glXCreateNewContext(__GLXclientState *cl, GLbyte *pc);
-extern int __glXDestroyContext(__GLXclientState*, GLbyte*);
-extern int __glXMakeCurrent(__GLXclientState*, GLbyte*);
-extern int __glXMakeContextCurrent(__GLXclientState*, GLbyte*);
-extern int __glXCreatePbuffer(__GLXclientState *cl, GLbyte *pc);
-extern int __glXDestroyPbuffer(__GLXclientState *cl, GLbyte *pc);
-extern int __glXGetDrawableAttributes(__GLXclientState *cl, GLbyte *pc);
-extern int __glXChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc);
-extern int __glXIsDirect(__GLXclientState*, GLbyte*);
-extern int __glXQueryVersion(__GLXclientState*, GLbyte*);
-extern int __glXWaitGL(__GLXclientState*, GLbyte*);
-extern int __glXWaitX(__GLXclientState*, GLbyte*);
-extern int __glXCopyContext(__GLXclientState*, GLbyte*);
-extern int __glXSwapBuffers(__GLXclientState*, GLbyte*);
-extern int __glXUseXFont(__GLXclientState*, GLbyte*);
-extern int __glXCreateGLXPixmap(__GLXclientState*, GLbyte*);
-extern int __glXCreatePixmap(__GLXclientState *cl, GLbyte *pc);
-extern int __glXGetVisualConfigs(__GLXclientState*, GLbyte*);
-extern int __glXDestroyGLXPixmap(__GLXclientState*, GLbyte*);
-extern int __glXVendorPrivate(__GLXclientState*, GLbyte*);
-extern int __glXVendorPrivateWithReply(__GLXclientState*, GLbyte*);
-extern int __glXQueryExtensionsString(__GLXclientState*, GLbyte*);
-extern int __glXQueryServerString(__GLXclientState*, GLbyte*);
-extern int __glXClientInfo(__GLXclientState*, GLbyte*);
-extern int __glXGetFBConfigs(__GLXclientState*, GLbyte*);
-extern int __glXCreateWindow(__GLXclientState *cl, GLbyte *pc);
-extern int __glXDestroyWindow(__GLXclientState *cl, GLbyte *pc);
-extern int __glXQueryContext(__GLXclientState *cl, GLbyte *pc);
-extern int __glXDisp_NewList(__GLXclientState*, GLbyte*);
-extern int __glXDisp_EndList(__GLXclientState*, GLbyte*);
-extern int __glXDisp_DeleteLists(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GenLists(__GLXclientState*, GLbyte*);
-extern int __glXDisp_FeedbackBuffer(__GLXclientState*, GLbyte*);
-extern int __glXDisp_SelectBuffer(__GLXclientState*, GLbyte*);
-extern int __glXDisp_RenderMode(__GLXclientState*, GLbyte*);
-extern int __glXDisp_Finish(__GLXclientState*, GLbyte*);
-extern int __glXDisp_PixelStoref(__GLXclientState*, GLbyte*);
-extern int __glXDisp_PixelStorei(__GLXclientState*, GLbyte*);
-extern int __glXDisp_ReadPixels(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetBooleanv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetClipPlane(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetDoublev(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetError(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetFloatv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetIntegerv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetLightfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetLightiv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetMapdv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetMapfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetMapiv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetMaterialfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetMaterialiv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetPixelMapfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetPixelMapuiv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetPixelMapusv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetPolygonStipple(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetString(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetTexEnvfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetTexEnviv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetTexGendv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetTexGenfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetTexGeniv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetTexImage(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetTexParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetTexParameteriv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetTexLevelParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetTexLevelParameteriv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_IsEnabled(__GLXclientState*, GLbyte*);
-extern int __glXDisp_IsList(__GLXclientState*, GLbyte*);
-extern int __glXDisp_Flush(__GLXclientState*, GLbyte*);
-extern int __glXDisp_AreTexturesResident(__GLXclientState*, GLbyte*);
-extern int __glXDisp_DeleteTextures(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GenTextures(__GLXclientState*, GLbyte*);
-extern int __glXDisp_IsTexture(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetColorTable(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetColorTableParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetColorTableParameteriv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetConvolutionFilter(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetConvolutionParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetConvolutionParameteriv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetSeparableFilter(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetHistogram(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetHistogramParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetHistogramParameteriv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetMinmax(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetMinmaxParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GetMinmaxParameteriv(__GLXclientState*, GLbyte*);
+extern int __glXRender(__GLXclientState *, GLbyte *);
+extern int __glXRenderLarge(__GLXclientState *, GLbyte *);
+extern int __glXSendLargeCommand(__GLXclientState * cl,
+                                 GLXContextTag contextTag);
+extern int __glXCreateContext(__GLXclientState *, GLbyte *);
+extern int __glXCreateNewContext(__GLXclientState * cl, GLbyte * pc);
+extern int __glXDestroyContext(__GLXclientState *, GLbyte *);
+extern int __glXMakeCurrent(__GLXclientState *, GLbyte *);
+extern int __glXMakeContextCurrent(__GLXclientState *, GLbyte *);
+extern int __glXCreatePbuffer(__GLXclientState * cl, GLbyte * pc);
+extern int __glXDestroyPbuffer(__GLXclientState * cl, GLbyte * pc);
+extern int __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc);
+extern int __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc);
+extern int __glXIsDirect(__GLXclientState *, GLbyte *);
+extern int __glXQueryVersion(__GLXclientState *, GLbyte *);
+extern int __glXWaitGL(__GLXclientState *, GLbyte *);
+extern int __glXWaitX(__GLXclientState *, GLbyte *);
+extern int __glXCopyContext(__GLXclientState *, GLbyte *);
+extern int __glXSwapBuffers(__GLXclientState *, GLbyte *);
+extern int __glXUseXFont(__GLXclientState *, GLbyte *);
+extern int __glXCreateGLXPixmap(__GLXclientState *, GLbyte *);
+extern int __glXCreatePixmap(__GLXclientState * cl, GLbyte * pc);
+extern int __glXGetVisualConfigs(__GLXclientState *, GLbyte *);
+extern int __glXDestroyGLXPixmap(__GLXclientState *, GLbyte *);
+extern int __glXVendorPrivate(__GLXclientState *, GLbyte *);
+extern int __glXVendorPrivateWithReply(__GLXclientState *, GLbyte *);
+extern int __glXQueryExtensionsString(__GLXclientState *, GLbyte *);
+extern int __glXQueryServerString(__GLXclientState *, GLbyte *);
+extern int __glXClientInfo(__GLXclientState *, GLbyte *);
+extern int __glXGetFBConfigs(__GLXclientState *, GLbyte *);
+extern int __glXCreateWindow(__GLXclientState * cl, GLbyte * pc);
+extern int __glXDestroyWindow(__GLXclientState * cl, GLbyte * pc);
+extern int __glXQueryContext(__GLXclientState * cl, GLbyte * pc);
+extern int __glXDisp_NewList(__GLXclientState *, GLbyte *);
+extern int __glXDisp_EndList(__GLXclientState *, GLbyte *);
+extern int __glXDisp_DeleteLists(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GenLists(__GLXclientState *, GLbyte *);
+extern int __glXDisp_FeedbackBuffer(__GLXclientState *, GLbyte *);
+extern int __glXDisp_SelectBuffer(__GLXclientState *, GLbyte *);
+extern int __glXDisp_RenderMode(__GLXclientState *, GLbyte *);
+extern int __glXDisp_Finish(__GLXclientState *, GLbyte *);
+extern int __glXDisp_PixelStoref(__GLXclientState *, GLbyte *);
+extern int __glXDisp_PixelStorei(__GLXclientState *, GLbyte *);
+extern int __glXDisp_ReadPixels(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetBooleanv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetClipPlane(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetDoublev(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetError(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetFloatv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetIntegerv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetLightfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetLightiv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetMapdv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetMapfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetMapiv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetMaterialfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetMaterialiv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetPixelMapfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetPixelMapuiv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetPixelMapusv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetPolygonStipple(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetString(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetTexEnvfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetTexEnviv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetTexGendv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetTexGenfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetTexGeniv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetTexImage(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetTexParameterfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetTexParameteriv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetTexLevelParameterfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetTexLevelParameteriv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_IsEnabled(__GLXclientState *, GLbyte *);
+extern int __glXDisp_IsList(__GLXclientState *, GLbyte *);
+extern int __glXDisp_Flush(__GLXclientState *, GLbyte *);
+extern int __glXDisp_AreTexturesResident(__GLXclientState *, GLbyte *);
+extern int __glXDisp_DeleteTextures(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GenTextures(__GLXclientState *, GLbyte *);
+extern int __glXDisp_IsTexture(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetColorTable(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetColorTableParameterfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetColorTableParameteriv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetConvolutionFilter(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetConvolutionParameterfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetConvolutionParameteriv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetSeparableFilter(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetHistogram(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetHistogramParameterfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetHistogramParameteriv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetMinmax(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetMinmaxParameterfv(__GLXclientState *, GLbyte *);
+extern int __glXDisp_GetMinmaxParameteriv(__GLXclientState *, GLbyte *);
 
-extern void __glXDisp_CallList(GLbyte*);
-extern void __glXDisp_CallLists(GLbyte*);
-extern void __glXDisp_ListBase(GLbyte*);
-extern void __glXDisp_Begin(GLbyte*);
-extern void __glXDisp_Bitmap(GLbyte*);
-extern void __glXDisp_Color3bv(GLbyte*);
-extern void __glXDisp_Color3dv(GLbyte*);
-extern void __glXDisp_Color3fv(GLbyte*);
-extern void __glXDisp_Color3iv(GLbyte*);
-extern void __glXDisp_Color3sv(GLbyte*);
-extern void __glXDisp_Color3ubv(GLbyte*);
-extern void __glXDisp_Color3uiv(GLbyte*);
-extern void __glXDisp_Color3usv(GLbyte*);
-extern void __glXDisp_Color4bv(GLbyte*);
-extern void __glXDisp_Color4dv(GLbyte*);
-extern void __glXDisp_Color4fv(GLbyte*);
-extern void __glXDisp_Color4iv(GLbyte*);
-extern void __glXDisp_Color4sv(GLbyte*);
-extern void __glXDisp_Color4ubv(GLbyte*);
-extern void __glXDisp_Color4uiv(GLbyte*);
-extern void __glXDisp_Color4usv(GLbyte*);
-extern void __glXDisp_EdgeFlagv(GLbyte*);
-extern void __glXDisp_End(GLbyte*);
-extern void __glXDisp_Indexdv(GLbyte*);
-extern void __glXDisp_Indexfv(GLbyte*);
-extern void __glXDisp_Indexiv(GLbyte*);
-extern void __glXDisp_Indexsv(GLbyte*);
-extern void __glXDisp_Normal3bv(GLbyte*);
-extern void __glXDisp_Normal3dv(GLbyte*);
-extern void __glXDisp_Normal3fv(GLbyte*);
-extern void __glXDisp_Normal3iv(GLbyte*);
-extern void __glXDisp_Normal3sv(GLbyte*);
-extern void __glXDisp_RasterPos2dv(GLbyte*);
-extern void __glXDisp_RasterPos2fv(GLbyte*);
-extern void __glXDisp_RasterPos2iv(GLbyte*);
-extern void __glXDisp_RasterPos2sv(GLbyte*);
-extern void __glXDisp_RasterPos3dv(GLbyte*);
-extern void __glXDisp_RasterPos3fv(GLbyte*);
-extern void __glXDisp_RasterPos3iv(GLbyte*);
-extern void __glXDisp_RasterPos3sv(GLbyte*);
-extern void __glXDisp_RasterPos4dv(GLbyte*);
-extern void __glXDisp_RasterPos4fv(GLbyte*);
-extern void __glXDisp_RasterPos4iv(GLbyte*);
-extern void __glXDisp_RasterPos4sv(GLbyte*);
-extern void __glXDisp_Rectdv(GLbyte*);
-extern void __glXDisp_Rectfv(GLbyte*);
-extern void __glXDisp_Rectiv(GLbyte*);
-extern void __glXDisp_Rectsv(GLbyte*);
-extern void __glXDisp_TexCoord1dv(GLbyte*);
-extern void __glXDisp_TexCoord1fv(GLbyte*);
-extern void __glXDisp_TexCoord1iv(GLbyte*);
-extern void __glXDisp_TexCoord1sv(GLbyte*);
-extern void __glXDisp_TexCoord2dv(GLbyte*);
-extern void __glXDisp_TexCoord2fv(GLbyte*);
-extern void __glXDisp_TexCoord2iv(GLbyte*);
-extern void __glXDisp_TexCoord2sv(GLbyte*);
-extern void __glXDisp_TexCoord3dv(GLbyte*);
-extern void __glXDisp_TexCoord3fv(GLbyte*);
-extern void __glXDisp_TexCoord3iv(GLbyte*);
-extern void __glXDisp_TexCoord3sv(GLbyte*);
-extern void __glXDisp_TexCoord4dv(GLbyte*);
-extern void __glXDisp_TexCoord4fv(GLbyte*);
-extern void __glXDisp_TexCoord4iv(GLbyte*);
-extern void __glXDisp_TexCoord4sv(GLbyte*);
-extern void __glXDisp_Vertex2dv(GLbyte*);
-extern void __glXDisp_Vertex2fv(GLbyte*);
-extern void __glXDisp_Vertex2iv(GLbyte*);
-extern void __glXDisp_Vertex2sv(GLbyte*);
-extern void __glXDisp_Vertex3dv(GLbyte*);
-extern void __glXDisp_Vertex3fv(GLbyte*);
-extern void __glXDisp_Vertex3iv(GLbyte*);
-extern void __glXDisp_Vertex3sv(GLbyte*);
-extern void __glXDisp_Vertex4dv(GLbyte*);
-extern void __glXDisp_Vertex4fv(GLbyte*);
-extern void __glXDisp_Vertex4iv(GLbyte*);
-extern void __glXDisp_Vertex4sv(GLbyte*);
-extern void __glXDisp_ClipPlane(GLbyte*);
-extern void __glXDisp_ColorMaterial(GLbyte*);
-extern void __glXDisp_CullFace(GLbyte*);
-extern void __glXDisp_Fogf(GLbyte*);
-extern void __glXDisp_Fogfv(GLbyte*);
-extern void __glXDisp_Fogi(GLbyte*);
-extern void __glXDisp_Fogiv(GLbyte*);
-extern void __glXDisp_FrontFace(GLbyte*);
-extern void __glXDisp_Hint(GLbyte*);
-extern void __glXDisp_Lightf(GLbyte*);
-extern void __glXDisp_Lightfv(GLbyte*);
-extern void __glXDisp_Lighti(GLbyte*);
-extern void __glXDisp_Lightiv(GLbyte*);
-extern void __glXDisp_LightModelf(GLbyte*);
-extern void __glXDisp_LightModelfv(GLbyte*);
-extern void __glXDisp_LightModeli(GLbyte*);
-extern void __glXDisp_LightModeliv(GLbyte*);
-extern void __glXDisp_LineStipple(GLbyte*);
-extern void __glXDisp_LineWidth(GLbyte*);
-extern void __glXDisp_Materialf(GLbyte*);
-extern void __glXDisp_Materialfv(GLbyte*);
-extern void __glXDisp_Materiali(GLbyte*);
-extern void __glXDisp_Materialiv(GLbyte*);
-extern void __glXDisp_PointSize(GLbyte*);
-extern void __glXDisp_PolygonMode(GLbyte*);
-extern void __glXDisp_PolygonStipple(GLbyte*);
-extern void __glXDisp_Scissor(GLbyte*);
-extern void __glXDisp_ShadeModel(GLbyte*);
-extern void __glXDisp_TexParameterf(GLbyte*);
-extern void __glXDisp_TexParameterfv(GLbyte*);
-extern void __glXDisp_TexParameteri(GLbyte*);
-extern void __glXDisp_TexParameteriv(GLbyte*);
-extern void __glXDisp_TexImage1D(GLbyte*);
-extern void __glXDisp_TexImage2D(GLbyte*);
-extern void __glXDisp_TexEnvf(GLbyte*);
-extern void __glXDisp_TexEnvfv(GLbyte*);
-extern void __glXDisp_TexEnvi(GLbyte*);
-extern void __glXDisp_TexEnviv(GLbyte*);
-extern void __glXDisp_TexGend(GLbyte*);
-extern void __glXDisp_TexGendv(GLbyte*);
-extern void __glXDisp_TexGenf(GLbyte*);
-extern void __glXDisp_TexGenfv(GLbyte*);
-extern void __glXDisp_TexGeni(GLbyte*);
-extern void __glXDisp_TexGeniv(GLbyte*);
-extern void __glXDisp_InitNames(GLbyte*);
-extern void __glXDisp_LoadName(GLbyte*);
-extern void __glXDisp_PassThrough(GLbyte*);
-extern void __glXDisp_PopName(GLbyte*);
-extern void __glXDisp_PushName(GLbyte*);
-extern void __glXDisp_DrawBuffer(GLbyte*);
-extern void __glXDisp_Clear(GLbyte*);
-extern void __glXDisp_ClearAccum(GLbyte*);
-extern void __glXDisp_ClearIndex(GLbyte*);
-extern void __glXDisp_ClearColor(GLbyte*);
-extern void __glXDisp_ClearStencil(GLbyte*);
-extern void __glXDisp_ClearDepth(GLbyte*);
-extern void __glXDisp_StencilMask(GLbyte*);
-extern void __glXDisp_ColorMask(GLbyte*);
-extern void __glXDisp_DepthMask(GLbyte*);
-extern void __glXDisp_IndexMask(GLbyte*);
-extern void __glXDisp_Accum(GLbyte*);
-extern void __glXDisp_Disable(GLbyte*);
-extern void __glXDisp_Enable(GLbyte*);
-extern void __glXDisp_PopAttrib(GLbyte*);
-extern void __glXDisp_PushAttrib(GLbyte*);
-extern void __glXDisp_Map1d(GLbyte*);
-extern void __glXDisp_Map1f(GLbyte*);
-extern void __glXDisp_Map2d(GLbyte*);
-extern void __glXDisp_Map2f(GLbyte*);
-extern void __glXDisp_MapGrid1d(GLbyte*);
-extern void __glXDisp_MapGrid1f(GLbyte*);
-extern void __glXDisp_MapGrid2d(GLbyte*);
-extern void __glXDisp_MapGrid2f(GLbyte*);
-extern void __glXDisp_EvalCoord1dv(GLbyte*);
-extern void __glXDisp_EvalCoord1fv(GLbyte*);
-extern void __glXDisp_EvalCoord2dv(GLbyte*);
-extern void __glXDisp_EvalCoord2fv(GLbyte*);
-extern void __glXDisp_EvalMesh1(GLbyte*);
-extern void __glXDisp_EvalPoint1(GLbyte*);
-extern void __glXDisp_EvalMesh2(GLbyte*);
-extern void __glXDisp_EvalPoint2(GLbyte*);
-extern void __glXDisp_AlphaFunc(GLbyte*);
-extern void __glXDisp_BlendFunc(GLbyte*);
-extern void __glXDisp_LogicOp(GLbyte*);
-extern void __glXDisp_StencilFunc(GLbyte*);
-extern void __glXDisp_StencilOp(GLbyte*);
-extern void __glXDisp_DepthFunc(GLbyte*);
-extern void __glXDisp_PixelZoom(GLbyte*);
-extern void __glXDisp_PixelTransferf(GLbyte*);
-extern void __glXDisp_PixelTransferi(GLbyte*);
-extern void __glXDisp_PixelMapfv(GLbyte*);
-extern void __glXDisp_PixelMapuiv(GLbyte*);
-extern void __glXDisp_PixelMapusv(GLbyte*);
-extern void __glXDisp_ReadBuffer(GLbyte*);
-extern void __glXDisp_CopyPixels(GLbyte*);
-extern void __glXDisp_DrawPixels(GLbyte*);
-extern void __glXDisp_DepthRange(GLbyte*);
-extern void __glXDisp_Frustum(GLbyte*);
-extern void __glXDisp_LoadIdentity(GLbyte*);
-extern void __glXDisp_LoadMatrixf(GLbyte*);
-extern void __glXDisp_LoadMatrixd(GLbyte*);
-extern void __glXDisp_MatrixMode(GLbyte*);
-extern void __glXDisp_MultMatrixf(GLbyte*);
-extern void __glXDisp_MultMatrixd(GLbyte*);
-extern void __glXDisp_Ortho(GLbyte*);
-extern void __glXDisp_PopMatrix(GLbyte*);
-extern void __glXDisp_PushMatrix(GLbyte*);
-extern void __glXDisp_Rotated(GLbyte*);
-extern void __glXDisp_Rotatef(GLbyte*);
-extern void __glXDisp_Scaled(GLbyte*);
-extern void __glXDisp_Scalef(GLbyte*);
-extern void __glXDisp_Translated(GLbyte*);
-extern void __glXDisp_Translatef(GLbyte*);
-extern void __glXDisp_Viewport(GLbyte*);
-extern void __glXDisp_PolygonOffset(GLbyte*);
-extern void __glXDisp_DrawArrays(GLbyte*);
-extern void __glXDisp_Indexubv(GLbyte*);
-extern void __glXDisp_ColorSubTable(GLbyte*);
-extern void __glXDisp_CopyColorSubTable(GLbyte*);
-extern void __glXDisp_ActiveTextureARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord1dvARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord1fvARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord1ivARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord1svARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord2dvARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord2fvARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord2ivARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord2svARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord3dvARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord3fvARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord3ivARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord3svARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord4dvARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord4fvARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord4ivARB(GLbyte*);
-extern void __glXDisp_MultiTexCoord4svARB(GLbyte*);
+extern void __glXDisp_CallList(GLbyte *);
+extern void __glXDisp_CallLists(GLbyte *);
+extern void __glXDisp_ListBase(GLbyte *);
+extern void __glXDisp_Begin(GLbyte *);
+extern void __glXDisp_Bitmap(GLbyte *);
+extern void __glXDisp_Color3bv(GLbyte *);
+extern void __glXDisp_Color3dv(GLbyte *);
+extern void __glXDisp_Color3fv(GLbyte *);
+extern void __glXDisp_Color3iv(GLbyte *);
+extern void __glXDisp_Color3sv(GLbyte *);
+extern void __glXDisp_Color3ubv(GLbyte *);
+extern void __glXDisp_Color3uiv(GLbyte *);
+extern void __glXDisp_Color3usv(GLbyte *);
+extern void __glXDisp_Color4bv(GLbyte *);
+extern void __glXDisp_Color4dv(GLbyte *);
+extern void __glXDisp_Color4fv(GLbyte *);
+extern void __glXDisp_Color4iv(GLbyte *);
+extern void __glXDisp_Color4sv(GLbyte *);
+extern void __glXDisp_Color4ubv(GLbyte *);
+extern void __glXDisp_Color4uiv(GLbyte *);
+extern void __glXDisp_Color4usv(GLbyte *);
+extern void __glXDisp_EdgeFlagv(GLbyte *);
+extern void __glXDisp_End(GLbyte *);
+extern void __glXDisp_Indexdv(GLbyte *);
+extern void __glXDisp_Indexfv(GLbyte *);
+extern void __glXDisp_Indexiv(GLbyte *);
+extern void __glXDisp_Indexsv(GLbyte *);
+extern void __glXDisp_Normal3bv(GLbyte *);
+extern void __glXDisp_Normal3dv(GLbyte *);
+extern void __glXDisp_Normal3fv(GLbyte *);
+extern void __glXDisp_Normal3iv(GLbyte *);
+extern void __glXDisp_Normal3sv(GLbyte *);
+extern void __glXDisp_RasterPos2dv(GLbyte *);
+extern void __glXDisp_RasterPos2fv(GLbyte *);
+extern void __glXDisp_RasterPos2iv(GLbyte *);
+extern void __glXDisp_RasterPos2sv(GLbyte *);
+extern void __glXDisp_RasterPos3dv(GLbyte *);
+extern void __glXDisp_RasterPos3fv(GLbyte *);
+extern void __glXDisp_RasterPos3iv(GLbyte *);
+extern void __glXDisp_RasterPos3sv(GLbyte *);
+extern void __glXDisp_RasterPos4dv(GLbyte *);
+extern void __glXDisp_RasterPos4fv(GLbyte *);
+extern void __glXDisp_RasterPos4iv(GLbyte *);
+extern void __glXDisp_RasterPos4sv(GLbyte *);
+extern void __glXDisp_Rectdv(GLbyte *);
+extern void __glXDisp_Rectfv(GLbyte *);
+extern void __glXDisp_Rectiv(GLbyte *);
+extern void __glXDisp_Rectsv(GLbyte *);
+extern void __glXDisp_TexCoord1dv(GLbyte *);
+extern void __glXDisp_TexCoord1fv(GLbyte *);
+extern void __glXDisp_TexCoord1iv(GLbyte *);
+extern void __glXDisp_TexCoord1sv(GLbyte *);
+extern void __glXDisp_TexCoord2dv(GLbyte *);
+extern void __glXDisp_TexCoord2fv(GLbyte *);
+extern void __glXDisp_TexCoord2iv(GLbyte *);
+extern void __glXDisp_TexCoord2sv(GLbyte *);
+extern void __glXDisp_TexCoord3dv(GLbyte *);
+extern void __glXDisp_TexCoord3fv(GLbyte *);
+extern void __glXDisp_TexCoord3iv(GLbyte *);
+extern void __glXDisp_TexCoord3sv(GLbyte *);
+extern void __glXDisp_TexCoord4dv(GLbyte *);
+extern void __glXDisp_TexCoord4fv(GLbyte *);
+extern void __glXDisp_TexCoord4iv(GLbyte *);
+extern void __glXDisp_TexCoord4sv(GLbyte *);
+extern void __glXDisp_Vertex2dv(GLbyte *);
+extern void __glXDisp_Vertex2fv(GLbyte *);
+extern void __glXDisp_Vertex2iv(GLbyte *);
+extern void __glXDisp_Vertex2sv(GLbyte *);
+extern void __glXDisp_Vertex3dv(GLbyte *);
+extern void __glXDisp_Vertex3fv(GLbyte *);
+extern void __glXDisp_Vertex3iv(GLbyte *);
+extern void __glXDisp_Vertex3sv(GLbyte *);
+extern void __glXDisp_Vertex4dv(GLbyte *);
+extern void __glXDisp_Vertex4fv(GLbyte *);
+extern void __glXDisp_Vertex4iv(GLbyte *);
+extern void __glXDisp_Vertex4sv(GLbyte *);
+extern void __glXDisp_ClipPlane(GLbyte *);
+extern void __glXDisp_ColorMaterial(GLbyte *);
+extern void __glXDisp_CullFace(GLbyte *);
+extern void __glXDisp_Fogf(GLbyte *);
+extern void __glXDisp_Fogfv(GLbyte *);
+extern void __glXDisp_Fogi(GLbyte *);
+extern void __glXDisp_Fogiv(GLbyte *);
+extern void __glXDisp_FrontFace(GLbyte *);
+extern void __glXDisp_Hint(GLbyte *);
+extern void __glXDisp_Lightf(GLbyte *);
+extern void __glXDisp_Lightfv(GLbyte *);
+extern void __glXDisp_Lighti(GLbyte *);
+extern void __glXDisp_Lightiv(GLbyte *);
+extern void __glXDisp_LightModelf(GLbyte *);
+extern void __glXDisp_LightModelfv(GLbyte *);
+extern void __glXDisp_LightModeli(GLbyte *);
+extern void __glXDisp_LightModeliv(GLbyte *);
+extern void __glXDisp_LineStipple(GLbyte *);
+extern void __glXDisp_LineWidth(GLbyte *);
+extern void __glXDisp_Materialf(GLbyte *);
+extern void __glXDisp_Materialfv(GLbyte *);
+extern void __glXDisp_Materiali(GLbyte *);
+extern void __glXDisp_Materialiv(GLbyte *);
+extern void __glXDisp_PointSize(GLbyte *);
+extern void __glXDisp_PolygonMode(GLbyte *);
+extern void __glXDisp_PolygonStipple(GLbyte *);
+extern void __glXDisp_Scissor(GLbyte *);
+extern void __glXDisp_ShadeModel(GLbyte *);
+extern void __glXDisp_TexParameterf(GLbyte *);
+extern void __glXDisp_TexParameterfv(GLbyte *);
+extern void __glXDisp_TexParameteri(GLbyte *);
+extern void __glXDisp_TexParameteriv(GLbyte *);
+extern void __glXDisp_TexImage1D(GLbyte *);
+extern void __glXDisp_TexImage2D(GLbyte *);
+extern void __glXDisp_TexEnvf(GLbyte *);
+extern void __glXDisp_TexEnvfv(GLbyte *);
+extern void __glXDisp_TexEnvi(GLbyte *);
+extern void __glXDisp_TexEnviv(GLbyte *);
+extern void __glXDisp_TexGend(GLbyte *);
+extern void __glXDisp_TexGendv(GLbyte *);
+extern void __glXDisp_TexGenf(GLbyte *);
+extern void __glXDisp_TexGenfv(GLbyte *);
+extern void __glXDisp_TexGeni(GLbyte *);
+extern void __glXDisp_TexGeniv(GLbyte *);
+extern void __glXDisp_InitNames(GLbyte *);
+extern void __glXDisp_LoadName(GLbyte *);
+extern void __glXDisp_PassThrough(GLbyte *);
+extern void __glXDisp_PopName(GLbyte *);
+extern void __glXDisp_PushName(GLbyte *);
+extern void __glXDisp_DrawBuffer(GLbyte *);
+extern void __glXDisp_Clear(GLbyte *);
+extern void __glXDisp_ClearAccum(GLbyte *);
+extern void __glXDisp_ClearIndex(GLbyte *);
+extern void __glXDisp_ClearColor(GLbyte *);
+extern void __glXDisp_ClearStencil(GLbyte *);
+extern void __glXDisp_ClearDepth(GLbyte *);
+extern void __glXDisp_StencilMask(GLbyte *);
+extern void __glXDisp_ColorMask(GLbyte *);
+extern void __glXDisp_DepthMask(GLbyte *);
+extern void __glXDisp_IndexMask(GLbyte *);
+extern void __glXDisp_Accum(GLbyte *);
+extern void __glXDisp_Disable(GLbyte *);
+extern void __glXDisp_Enable(GLbyte *);
+extern void __glXDisp_PopAttrib(GLbyte *);
+extern void __glXDisp_PushAttrib(GLbyte *);
+extern void __glXDisp_Map1d(GLbyte *);
+extern void __glXDisp_Map1f(GLbyte *);
+extern void __glXDisp_Map2d(GLbyte *);
+extern void __glXDisp_Map2f(GLbyte *);
+extern void __glXDisp_MapGrid1d(GLbyte *);
+extern void __glXDisp_MapGrid1f(GLbyte *);
+extern void __glXDisp_MapGrid2d(GLbyte *);
+extern void __glXDisp_MapGrid2f(GLbyte *);
+extern void __glXDisp_EvalCoord1dv(GLbyte *);
+extern void __glXDisp_EvalCoord1fv(GLbyte *);
+extern void __glXDisp_EvalCoord2dv(GLbyte *);
+extern void __glXDisp_EvalCoord2fv(GLbyte *);
+extern void __glXDisp_EvalMesh1(GLbyte *);
+extern void __glXDisp_EvalPoint1(GLbyte *);
+extern void __glXDisp_EvalMesh2(GLbyte *);
+extern void __glXDisp_EvalPoint2(GLbyte *);
+extern void __glXDisp_AlphaFunc(GLbyte *);
+extern void __glXDisp_BlendFunc(GLbyte *);
+extern void __glXDisp_LogicOp(GLbyte *);
+extern void __glXDisp_StencilFunc(GLbyte *);
+extern void __glXDisp_StencilOp(GLbyte *);
+extern void __glXDisp_DepthFunc(GLbyte *);
+extern void __glXDisp_PixelZoom(GLbyte *);
+extern void __glXDisp_PixelTransferf(GLbyte *);
+extern void __glXDisp_PixelTransferi(GLbyte *);
+extern void __glXDisp_PixelMapfv(GLbyte *);
+extern void __glXDisp_PixelMapuiv(GLbyte *);
+extern void __glXDisp_PixelMapusv(GLbyte *);
+extern void __glXDisp_ReadBuffer(GLbyte *);
+extern void __glXDisp_CopyPixels(GLbyte *);
+extern void __glXDisp_DrawPixels(GLbyte *);
+extern void __glXDisp_DepthRange(GLbyte *);
+extern void __glXDisp_Frustum(GLbyte *);
+extern void __glXDisp_LoadIdentity(GLbyte *);
+extern void __glXDisp_LoadMatrixf(GLbyte *);
+extern void __glXDisp_LoadMatrixd(GLbyte *);
+extern void __glXDisp_MatrixMode(GLbyte *);
+extern void __glXDisp_MultMatrixf(GLbyte *);
+extern void __glXDisp_MultMatrixd(GLbyte *);
+extern void __glXDisp_Ortho(GLbyte *);
+extern void __glXDisp_PopMatrix(GLbyte *);
+extern void __glXDisp_PushMatrix(GLbyte *);
+extern void __glXDisp_Rotated(GLbyte *);
+extern void __glXDisp_Rotatef(GLbyte *);
+extern void __glXDisp_Scaled(GLbyte *);
+extern void __glXDisp_Scalef(GLbyte *);
+extern void __glXDisp_Translated(GLbyte *);
+extern void __glXDisp_Translatef(GLbyte *);
+extern void __glXDisp_Viewport(GLbyte *);
+extern void __glXDisp_PolygonOffset(GLbyte *);
+extern void __glXDisp_DrawArrays(GLbyte *);
+extern void __glXDisp_Indexubv(GLbyte *);
+extern void __glXDisp_ColorSubTable(GLbyte *);
+extern void __glXDisp_CopyColorSubTable(GLbyte *);
+extern void __glXDisp_ActiveTextureARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord1dvARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord1fvARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord1ivARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord1svARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord2dvARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord2fvARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord2ivARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord2svARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord3dvARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord3fvARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord3ivARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord3svARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord4dvARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord4fvARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord4ivARB(GLbyte *);
+extern void __glXDisp_MultiTexCoord4svARB(GLbyte *);
 
-extern int __glXSwapRender(__GLXclientState*, GLbyte*);
-extern int __glXSwapRenderLarge(__GLXclientState*, GLbyte*);
-extern int __glXSwapCreateContext(__GLXclientState*, GLbyte*);
-extern int __glXSwapCreateNewContext(__GLXclientState *cl, GLbyte *pc);
-extern int __glXSwapDestroyContext(__GLXclientState*, GLbyte*);
-extern int __glXSwapMakeCurrent(__GLXclientState*, GLbyte*);
-extern int __glXSwapMakeContextCurrent(__GLXclientState*, GLbyte*);
-extern int __glXSwapCreatePbuffer(__GLXclientState *cl, GLbyte *pc);
-extern int __glXSwapDestroyPbuffer(__GLXclientState *cl, GLbyte *pc);
-extern int __glXSwapGetDrawableAttributes(__GLXclientState *cl, GLbyte *pc);
-extern int __glXSwapChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc);
-extern int __glXSwapIsDirect(__GLXclientState*, GLbyte*);
-extern int __glXSwapQueryVersion(__GLXclientState*, GLbyte*);
-extern int __glXSwapWaitGL(__GLXclientState*, GLbyte*);
-extern int __glXSwapWaitX(__GLXclientState*, GLbyte*);
-extern int __glXSwapCopyContext(__GLXclientState*, GLbyte*);
-extern int __glXSwapSwapBuffers(__GLXclientState*, GLbyte*);
-extern int __glXSwapUseXFont(__GLXclientState*, GLbyte*);
-extern int __glXSwapCreateGLXPixmap(__GLXclientState*, GLbyte*);
-extern int __glXSwapCreatePixmap(__GLXclientState *cl, GLbyte *pc);
-extern int __glXSwapGetVisualConfigs(__GLXclientState*, GLbyte*);
-extern int __glXSwapDestroyGLXPixmap(__GLXclientState*, GLbyte*);
-extern int __glXSwapVendorPrivate(__GLXclientState*, GLbyte*);
-extern int __glXSwapVendorPrivateWithReply(__GLXclientState*, GLbyte*);
-extern int __glXSwapQueryExtensionsString(__GLXclientState*, GLbyte*);
-extern int __glXSwapQueryServerString(__GLXclientState*, GLbyte*);
-extern int __glXSwapClientInfo(__GLXclientState*, GLbyte*);
-extern int __glXSwapGetFBConfigs(__GLXclientState*, GLbyte*);
-extern int __glXSwapCreateWindow(__GLXclientState *cl, GLbyte *pc);
-extern int __glXSwapDestroyWindow(__GLXclientState *cl, GLbyte *pc);
-extern int __glXSwapQueryContext(__GLXclientState *cl, GLbyte *pc);
-extern int __glXDispSwap_NewList(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_EndList(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_DeleteLists(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GenLists(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_FeedbackBuffer(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_SelectBuffer(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_RenderMode(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_Finish(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_PixelStoref(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_PixelStorei(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_ReadPixels(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetBooleanv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetClipPlane(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetDoublev(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetError(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetFloatv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetIntegerv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetLightfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetLightiv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetMapdv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetMapfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetMapiv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetMaterialfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetMaterialiv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetPixelMapfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetPixelMapuiv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetPixelMapusv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetPolygonStipple(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetString(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetTexEnvfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetTexEnviv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetTexGendv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetTexGenfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetTexGeniv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetTexImage(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetTexParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetTexParameteriv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetTexLevelParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetTexLevelParameteriv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_IsEnabled(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_IsList(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_Flush(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_AreTexturesResident(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_DeleteTextures(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GenTextures(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_IsTexture(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetColorTable(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetColorTableParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetColorTableParameteriv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetConvolutionFilter(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetConvolutionParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetSeparableFilter(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetHistogram(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetHistogramParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetHistogramParameteriv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetMinmax(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState*, GLbyte*);
+extern int __glXSwapRender(__GLXclientState *, GLbyte *);
+extern int __glXSwapRenderLarge(__GLXclientState *, GLbyte *);
+extern int __glXSwapCreateContext(__GLXclientState *, GLbyte *);
+extern int __glXSwapCreateNewContext(__GLXclientState * cl, GLbyte * pc);
+extern int __glXSwapDestroyContext(__GLXclientState *, GLbyte *);
+extern int __glXSwapMakeCurrent(__GLXclientState *, GLbyte *);
+extern int __glXSwapMakeContextCurrent(__GLXclientState *, GLbyte *);
+extern int __glXSwapCreatePbuffer(__GLXclientState * cl, GLbyte * pc);
+extern int __glXSwapDestroyPbuffer(__GLXclientState * cl, GLbyte * pc);
+extern int __glXSwapGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc);
+extern int __glXSwapChangeDrawableAttributes(__GLXclientState * cl,
+                                             GLbyte * pc);
+extern int __glXSwapIsDirect(__GLXclientState *, GLbyte *);
+extern int __glXSwapQueryVersion(__GLXclientState *, GLbyte *);
+extern int __glXSwapWaitGL(__GLXclientState *, GLbyte *);
+extern int __glXSwapWaitX(__GLXclientState *, GLbyte *);
+extern int __glXSwapCopyContext(__GLXclientState *, GLbyte *);
+extern int __glXSwapSwapBuffers(__GLXclientState *, GLbyte *);
+extern int __glXSwapUseXFont(__GLXclientState *, GLbyte *);
+extern int __glXSwapCreateGLXPixmap(__GLXclientState *, GLbyte *);
+extern int __glXSwapCreatePixmap(__GLXclientState * cl, GLbyte * pc);
+extern int __glXSwapGetVisualConfigs(__GLXclientState *, GLbyte *);
+extern int __glXSwapDestroyGLXPixmap(__GLXclientState *, GLbyte *);
+extern int __glXSwapVendorPrivate(__GLXclientState *, GLbyte *);
+extern int __glXSwapVendorPrivateWithReply(__GLXclientState *, GLbyte *);
+extern int __glXSwapQueryExtensionsString(__GLXclientState *, GLbyte *);
+extern int __glXSwapQueryServerString(__GLXclientState *, GLbyte *);
+extern int __glXSwapClientInfo(__GLXclientState *, GLbyte *);
+extern int __glXSwapGetFBConfigs(__GLXclientState *, GLbyte *);
+extern int __glXSwapCreateWindow(__GLXclientState * cl, GLbyte * pc);
+extern int __glXSwapDestroyWindow(__GLXclientState * cl, GLbyte * pc);
+extern int __glXSwapQueryContext(__GLXclientState * cl, GLbyte * pc);
+extern int __glXDispSwap_NewList(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_EndList(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_DeleteLists(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GenLists(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_FeedbackBuffer(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_SelectBuffer(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_RenderMode(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_Finish(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_PixelStoref(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_PixelStorei(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_ReadPixels(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetBooleanv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetClipPlane(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetDoublev(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetError(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetFloatv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetIntegerv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetLightfv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetLightiv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetMapdv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetMapfv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetMapiv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetMaterialfv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetMaterialiv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetPixelMapfv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetPixelMapuiv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetPixelMapusv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetPolygonStipple(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetString(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetTexEnvfv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetTexEnviv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetTexGendv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetTexGenfv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetTexGeniv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetTexImage(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetTexParameterfv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetTexParameteriv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetTexLevelParameterfv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetTexLevelParameteriv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_IsEnabled(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_IsList(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_Flush(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_AreTexturesResident(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_DeleteTextures(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GenTextures(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_IsTexture(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetColorTable(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetColorTableParameterfv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetColorTableParameteriv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetConvolutionFilter(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetConvolutionParameterfv(__GLXclientState *,
+                                                   GLbyte *);
+extern int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState *,
+                                                   GLbyte *);
+extern int __glXDispSwap_GetSeparableFilter(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetHistogram(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetHistogramParameterfv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetHistogramParameteriv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetMinmax(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState *, GLbyte *);
+extern int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState *, GLbyte *);
 
-extern void __glXDispSwap_CallList(GLbyte*);
-extern void __glXDispSwap_CallLists(GLbyte*);
-extern void __glXDispSwap_ListBase(GLbyte*);
-extern void __glXDispSwap_Begin(GLbyte*);
-extern void __glXDispSwap_Bitmap(GLbyte*);
-extern void __glXDispSwap_Color3bv(GLbyte*);
-extern void __glXDispSwap_Color3dv(GLbyte*);
-extern void __glXDispSwap_Color3fv(GLbyte*);
-extern void __glXDispSwap_Color3iv(GLbyte*);
-extern void __glXDispSwap_Color3sv(GLbyte*);
-extern void __glXDispSwap_Color3ubv(GLbyte*);
-extern void __glXDispSwap_Color3uiv(GLbyte*);
-extern void __glXDispSwap_Color3usv(GLbyte*);
-extern void __glXDispSwap_Color4bv(GLbyte*);
-extern void __glXDispSwap_Color4dv(GLbyte*);
-extern void __glXDispSwap_Color4fv(GLbyte*);
-extern void __glXDispSwap_Color4iv(GLbyte*);
-extern void __glXDispSwap_Color4sv(GLbyte*);
-extern void __glXDispSwap_Color4ubv(GLbyte*);
-extern void __glXDispSwap_Color4uiv(GLbyte*);
-extern void __glXDispSwap_Color4usv(GLbyte*);
-extern void __glXDispSwap_EdgeFlagv(GLbyte*);
-extern void __glXDispSwap_End(GLbyte*);
-extern void __glXDispSwap_Indexdv(GLbyte*);
-extern void __glXDispSwap_Indexfv(GLbyte*);
-extern void __glXDispSwap_Indexiv(GLbyte*);
-extern void __glXDispSwap_Indexsv(GLbyte*);
-extern void __glXDispSwap_Normal3bv(GLbyte*);
-extern void __glXDispSwap_Normal3dv(GLbyte*);
-extern void __glXDispSwap_Normal3fv(GLbyte*);
-extern void __glXDispSwap_Normal3iv(GLbyte*);
-extern void __glXDispSwap_Normal3sv(GLbyte*);
-extern void __glXDispSwap_RasterPos2dv(GLbyte*);
-extern void __glXDispSwap_RasterPos2fv(GLbyte*);
-extern void __glXDispSwap_RasterPos2iv(GLbyte*);
-extern void __glXDispSwap_RasterPos2sv(GLbyte*);
-extern void __glXDispSwap_RasterPos3dv(GLbyte*);
-extern void __glXDispSwap_RasterPos3fv(GLbyte*);
-extern void __glXDispSwap_RasterPos3iv(GLbyte*);
-extern void __glXDispSwap_RasterPos3sv(GLbyte*);
-extern void __glXDispSwap_RasterPos4dv(GLbyte*);
-extern void __glXDispSwap_RasterPos4fv(GLbyte*);
-extern void __glXDispSwap_RasterPos4iv(GLbyte*);
-extern void __glXDispSwap_RasterPos4sv(GLbyte*);
-extern void __glXDispSwap_Rectdv(GLbyte*);
-extern void __glXDispSwap_Rectfv(GLbyte*);
-extern void __glXDispSwap_Rectiv(GLbyte*);
-extern void __glXDispSwap_Rectsv(GLbyte*);
-extern void __glXDispSwap_TexCoord1dv(GLbyte*);
-extern void __glXDispSwap_TexCoord1fv(GLbyte*);
-extern void __glXDispSwap_TexCoord1iv(GLbyte*);
-extern void __glXDispSwap_TexCoord1sv(GLbyte*);
-extern void __glXDispSwap_TexCoord2dv(GLbyte*);
-extern void __glXDispSwap_TexCoord2fv(GLbyte*);
-extern void __glXDispSwap_TexCoord2iv(GLbyte*);
-extern void __glXDispSwap_TexCoord2sv(GLbyte*);
-extern void __glXDispSwap_TexCoord3dv(GLbyte*);
-extern void __glXDispSwap_TexCoord3fv(GLbyte*);
-extern void __glXDispSwap_TexCoord3iv(GLbyte*);
-extern void __glXDispSwap_TexCoord3sv(GLbyte*);
-extern void __glXDispSwap_TexCoord4dv(GLbyte*);
-extern void __glXDispSwap_TexCoord4fv(GLbyte*);
-extern void __glXDispSwap_TexCoord4iv(GLbyte*);
-extern void __glXDispSwap_TexCoord4sv(GLbyte*);
-extern void __glXDispSwap_Vertex2dv(GLbyte*);
-extern void __glXDispSwap_Vertex2fv(GLbyte*);
-extern void __glXDispSwap_Vertex2iv(GLbyte*);
-extern void __glXDispSwap_Vertex2sv(GLbyte*);
-extern void __glXDispSwap_Vertex3dv(GLbyte*);
-extern void __glXDispSwap_Vertex3fv(GLbyte*);
-extern void __glXDispSwap_Vertex3iv(GLbyte*);
-extern void __glXDispSwap_Vertex3sv(GLbyte*);
-extern void __glXDispSwap_Vertex4dv(GLbyte*);
-extern void __glXDispSwap_Vertex4fv(GLbyte*);
-extern void __glXDispSwap_Vertex4iv(GLbyte*);
-extern void __glXDispSwap_Vertex4sv(GLbyte*);
-extern void __glXDispSwap_ClipPlane(GLbyte*);
-extern void __glXDispSwap_ColorMaterial(GLbyte*);
-extern void __glXDispSwap_CullFace(GLbyte*);
-extern void __glXDispSwap_Fogf(GLbyte*);
-extern void __glXDispSwap_Fogfv(GLbyte*);
-extern void __glXDispSwap_Fogi(GLbyte*);
-extern void __glXDispSwap_Fogiv(GLbyte*);
-extern void __glXDispSwap_FrontFace(GLbyte*);
-extern void __glXDispSwap_Hint(GLbyte*);
-extern void __glXDispSwap_Lightf(GLbyte*);
-extern void __glXDispSwap_Lightfv(GLbyte*);
-extern void __glXDispSwap_Lighti(GLbyte*);
-extern void __glXDispSwap_Lightiv(GLbyte*);
-extern void __glXDispSwap_LightModelf(GLbyte*);
-extern void __glXDispSwap_LightModelfv(GLbyte*);
-extern void __glXDispSwap_LightModeli(GLbyte*);
-extern void __glXDispSwap_LightModeliv(GLbyte*);
-extern void __glXDispSwap_LineStipple(GLbyte*);
-extern void __glXDispSwap_LineWidth(GLbyte*);
-extern void __glXDispSwap_Materialf(GLbyte*);
-extern void __glXDispSwap_Materialfv(GLbyte*);
-extern void __glXDispSwap_Materiali(GLbyte*);
-extern void __glXDispSwap_Materialiv(GLbyte*);
-extern void __glXDispSwap_PointSize(GLbyte*);
-extern void __glXDispSwap_PolygonMode(GLbyte*);
-extern void __glXDispSwap_PolygonStipple(GLbyte*);
-extern void __glXDispSwap_Scissor(GLbyte*);
-extern void __glXDispSwap_ShadeModel(GLbyte*);
-extern void __glXDispSwap_TexParameterf(GLbyte*);
-extern void __glXDispSwap_TexParameterfv(GLbyte*);
-extern void __glXDispSwap_TexParameteri(GLbyte*);
-extern void __glXDispSwap_TexParameteriv(GLbyte*);
-extern void __glXDispSwap_TexImage1D(GLbyte*);
-extern void __glXDispSwap_TexImage2D(GLbyte*);
-extern void __glXDispSwap_TexEnvf(GLbyte*);
-extern void __glXDispSwap_TexEnvfv(GLbyte*);
-extern void __glXDispSwap_TexEnvi(GLbyte*);
-extern void __glXDispSwap_TexEnviv(GLbyte*);
-extern void __glXDispSwap_TexGend(GLbyte*);
-extern void __glXDispSwap_TexGendv(GLbyte*);
-extern void __glXDispSwap_TexGenf(GLbyte*);
-extern void __glXDispSwap_TexGenfv(GLbyte*);
-extern void __glXDispSwap_TexGeni(GLbyte*);
-extern void __glXDispSwap_TexGeniv(GLbyte*);
-extern void __glXDispSwap_InitNames(GLbyte*);
-extern void __glXDispSwap_LoadName(GLbyte*);
-extern void __glXDispSwap_PassThrough(GLbyte*);
-extern void __glXDispSwap_PopName(GLbyte*);
-extern void __glXDispSwap_PushName(GLbyte*);
-extern void __glXDispSwap_DrawBuffer(GLbyte*);
-extern void __glXDispSwap_Clear(GLbyte*);
-extern void __glXDispSwap_ClearAccum(GLbyte*);
-extern void __glXDispSwap_ClearIndex(GLbyte*);
-extern void __glXDispSwap_ClearColor(GLbyte*);
-extern void __glXDispSwap_ClearStencil(GLbyte*);
-extern void __glXDispSwap_ClearDepth(GLbyte*);
-extern void __glXDispSwap_StencilMask(GLbyte*);
-extern void __glXDispSwap_ColorMask(GLbyte*);
-extern void __glXDispSwap_DepthMask(GLbyte*);
-extern void __glXDispSwap_IndexMask(GLbyte*);
-extern void __glXDispSwap_Accum(GLbyte*);
-extern void __glXDispSwap_Disable(GLbyte*);
-extern void __glXDispSwap_Enable(GLbyte*);
-extern void __glXDispSwap_PopAttrib(GLbyte*);
-extern void __glXDispSwap_PushAttrib(GLbyte*);
-extern void __glXDispSwap_Map1d(GLbyte*);
-extern void __glXDispSwap_Map1f(GLbyte*);
-extern void __glXDispSwap_Map2d(GLbyte*);
-extern void __glXDispSwap_Map2f(GLbyte*);
-extern void __glXDispSwap_MapGrid1d(GLbyte*);
-extern void __glXDispSwap_MapGrid1f(GLbyte*);
-extern void __glXDispSwap_MapGrid2d(GLbyte*);
-extern void __glXDispSwap_MapGrid2f(GLbyte*);
-extern void __glXDispSwap_EvalCoord1dv(GLbyte*);
-extern void __glXDispSwap_EvalCoord1fv(GLbyte*);
-extern void __glXDispSwap_EvalCoord2dv(GLbyte*);
-extern void __glXDispSwap_EvalCoord2fv(GLbyte*);
-extern void __glXDispSwap_EvalMesh1(GLbyte*);
-extern void __glXDispSwap_EvalPoint1(GLbyte*);
-extern void __glXDispSwap_EvalMesh2(GLbyte*);
-extern void __glXDispSwap_EvalPoint2(GLbyte*);
-extern void __glXDispSwap_AlphaFunc(GLbyte*);
-extern void __glXDispSwap_BlendFunc(GLbyte*);
-extern void __glXDispSwap_LogicOp(GLbyte*);
-extern void __glXDispSwap_StencilFunc(GLbyte*);
-extern void __glXDispSwap_StencilOp(GLbyte*);
-extern void __glXDispSwap_DepthFunc(GLbyte*);
-extern void __glXDispSwap_PixelZoom(GLbyte*);
-extern void __glXDispSwap_PixelTransferf(GLbyte*);
-extern void __glXDispSwap_PixelTransferi(GLbyte*);
-extern void __glXDispSwap_PixelMapfv(GLbyte*);
-extern void __glXDispSwap_PixelMapuiv(GLbyte*);
-extern void __glXDispSwap_PixelMapusv(GLbyte*);
-extern void __glXDispSwap_ReadBuffer(GLbyte*);
-extern void __glXDispSwap_CopyPixels(GLbyte*);
-extern void __glXDispSwap_DrawPixels(GLbyte*);
-extern void __glXDispSwap_DepthRange(GLbyte*);
-extern void __glXDispSwap_Frustum(GLbyte*);
-extern void __glXDispSwap_LoadIdentity(GLbyte*);
-extern void __glXDispSwap_LoadMatrixf(GLbyte*);
-extern void __glXDispSwap_LoadMatrixd(GLbyte*);
-extern void __glXDispSwap_MatrixMode(GLbyte*);
-extern void __glXDispSwap_MultMatrixf(GLbyte*);
-extern void __glXDispSwap_MultMatrixd(GLbyte*);
-extern void __glXDispSwap_Ortho(GLbyte*);
-extern void __glXDispSwap_PopMatrix(GLbyte*);
-extern void __glXDispSwap_PushMatrix(GLbyte*);
-extern void __glXDispSwap_Rotated(GLbyte*);
-extern void __glXDispSwap_Rotatef(GLbyte*);
-extern void __glXDispSwap_Scaled(GLbyte*);
-extern void __glXDispSwap_Scalef(GLbyte*);
-extern void __glXDispSwap_Translated(GLbyte*);
-extern void __glXDispSwap_Translatef(GLbyte*);
-extern void __glXDispSwap_Viewport(GLbyte*);
-extern void __glXDispSwap_PolygonOffset(GLbyte*);
-extern void __glXDispSwap_DrawArrays(GLbyte*);
-extern void __glXDispSwap_Indexubv(GLbyte*);
-extern void __glXDispSwap_ColorSubTable(GLbyte*);
-extern void __glXDispSwap_CopyColorSubTable(GLbyte*);
-extern void __glXDispSwap_ActiveTextureARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord1dvARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord1fvARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord1ivARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord1svARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord2dvARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord2fvARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord2ivARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord2svARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord3dvARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord3fvARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord3ivARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord3svARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord4dvARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord4fvARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord4ivARB(GLbyte*);
-extern void __glXDispSwap_MultiTexCoord4svARB(GLbyte*);
+extern void __glXDispSwap_CallList(GLbyte *);
+extern void __glXDispSwap_CallLists(GLbyte *);
+extern void __glXDispSwap_ListBase(GLbyte *);
+extern void __glXDispSwap_Begin(GLbyte *);
+extern void __glXDispSwap_Bitmap(GLbyte *);
+extern void __glXDispSwap_Color3bv(GLbyte *);
+extern void __glXDispSwap_Color3dv(GLbyte *);
+extern void __glXDispSwap_Color3fv(GLbyte *);
+extern void __glXDispSwap_Color3iv(GLbyte *);
+extern void __glXDispSwap_Color3sv(GLbyte *);
+extern void __glXDispSwap_Color3ubv(GLbyte *);
+extern void __glXDispSwap_Color3uiv(GLbyte *);
+extern void __glXDispSwap_Color3usv(GLbyte *);
+extern void __glXDispSwap_Color4bv(GLbyte *);
+extern void __glXDispSwap_Color4dv(GLbyte *);
+extern void __glXDispSwap_Color4fv(GLbyte *);
+extern void __glXDispSwap_Color4iv(GLbyte *);
+extern void __glXDispSwap_Color4sv(GLbyte *);
+extern void __glXDispSwap_Color4ubv(GLbyte *);
+extern void __glXDispSwap_Color4uiv(GLbyte *);
+extern void __glXDispSwap_Color4usv(GLbyte *);
+extern void __glXDispSwap_EdgeFlagv(GLbyte *);
+extern void __glXDispSwap_End(GLbyte *);
+extern void __glXDispSwap_Indexdv(GLbyte *);
+extern void __glXDispSwap_Indexfv(GLbyte *);
+extern void __glXDispSwap_Indexiv(GLbyte *);
+extern void __glXDispSwap_Indexsv(GLbyte *);
+extern void __glXDispSwap_Normal3bv(GLbyte *);
+extern void __glXDispSwap_Normal3dv(GLbyte *);
+extern void __glXDispSwap_Normal3fv(GLbyte *);
+extern void __glXDispSwap_Normal3iv(GLbyte *);
+extern void __glXDispSwap_Normal3sv(GLbyte *);
+extern void __glXDispSwap_RasterPos2dv(GLbyte *);
+extern void __glXDispSwap_RasterPos2fv(GLbyte *);
+extern void __glXDispSwap_RasterPos2iv(GLbyte *);
+extern void __glXDispSwap_RasterPos2sv(GLbyte *);
+extern void __glXDispSwap_RasterPos3dv(GLbyte *);
+extern void __glXDispSwap_RasterPos3fv(GLbyte *);
+extern void __glXDispSwap_RasterPos3iv(GLbyte *);
+extern void __glXDispSwap_RasterPos3sv(GLbyte *);
+extern void __glXDispSwap_RasterPos4dv(GLbyte *);
+extern void __glXDispSwap_RasterPos4fv(GLbyte *);
+extern void __glXDispSwap_RasterPos4iv(GLbyte *);
+extern void __glXDispSwap_RasterPos4sv(GLbyte *);
+extern void __glXDispSwap_Rectdv(GLbyte *);
+extern void __glXDispSwap_Rectfv(GLbyte *);
+extern void __glXDispSwap_Rectiv(GLbyte *);
+extern void __glXDispSwap_Rectsv(GLbyte *);
+extern void __glXDispSwap_TexCoord1dv(GLbyte *);
+extern void __glXDispSwap_TexCoord1fv(GLbyte *);
+extern void __glXDispSwap_TexCoord1iv(GLbyte *);
+extern void __glXDispSwap_TexCoord1sv(GLbyte *);
+extern void __glXDispSwap_TexCoord2dv(GLbyte *);
+extern void __glXDispSwap_TexCoord2fv(GLbyte *);
+extern void __glXDispSwap_TexCoord2iv(GLbyte *);
+extern void __glXDispSwap_TexCoord2sv(GLbyte *);
+extern void __glXDispSwap_TexCoord3dv(GLbyte *);
+extern void __glXDispSwap_TexCoord3fv(GLbyte *);
+extern void __glXDispSwap_TexCoord3iv(GLbyte *);
+extern void __glXDispSwap_TexCoord3sv(GLbyte *);
+extern void __glXDispSwap_TexCoord4dv(GLbyte *);
+extern void __glXDispSwap_TexCoord4fv(GLbyte *);
+extern void __glXDispSwap_TexCoord4iv(GLbyte *);
+extern void __glXDispSwap_TexCoord4sv(GLbyte *);
+extern void __glXDispSwap_Vertex2dv(GLbyte *);
+extern void __glXDispSwap_Vertex2fv(GLbyte *);
+extern void __glXDispSwap_Vertex2iv(GLbyte *);
+extern void __glXDispSwap_Vertex2sv(GLbyte *);
+extern void __glXDispSwap_Vertex3dv(GLbyte *);
+extern void __glXDispSwap_Vertex3fv(GLbyte *);
+extern void __glXDispSwap_Vertex3iv(GLbyte *);
+extern void __glXDispSwap_Vertex3sv(GLbyte *);
+extern void __glXDispSwap_Vertex4dv(GLbyte *);
+extern void __glXDispSwap_Vertex4fv(GLbyte *);
+extern void __glXDispSwap_Vertex4iv(GLbyte *);
+extern void __glXDispSwap_Vertex4sv(GLbyte *);
+extern void __glXDispSwap_ClipPlane(GLbyte *);
+extern void __glXDispSwap_ColorMaterial(GLbyte *);
+extern void __glXDispSwap_CullFace(GLbyte *);
+extern void __glXDispSwap_Fogf(GLbyte *);
+extern void __glXDispSwap_Fogfv(GLbyte *);
+extern void __glXDispSwap_Fogi(GLbyte *);
+extern void __glXDispSwap_Fogiv(GLbyte *);
+extern void __glXDispSwap_FrontFace(GLbyte *);
+extern void __glXDispSwap_Hint(GLbyte *);
+extern void __glXDispSwap_Lightf(GLbyte *);
+extern void __glXDispSwap_Lightfv(GLbyte *);
+extern void __glXDispSwap_Lighti(GLbyte *);
+extern void __glXDispSwap_Lightiv(GLbyte *);
+extern void __glXDispSwap_LightModelf(GLbyte *);
+extern void __glXDispSwap_LightModelfv(GLbyte *);
+extern void __glXDispSwap_LightModeli(GLbyte *);
+extern void __glXDispSwap_LightModeliv(GLbyte *);
+extern void __glXDispSwap_LineStipple(GLbyte *);
+extern void __glXDispSwap_LineWidth(GLbyte *);
+extern void __glXDispSwap_Materialf(GLbyte *);
+extern void __glXDispSwap_Materialfv(GLbyte *);
+extern void __glXDispSwap_Materiali(GLbyte *);
+extern void __glXDispSwap_Materialiv(GLbyte *);
+extern void __glXDispSwap_PointSize(GLbyte *);
+extern void __glXDispSwap_PolygonMode(GLbyte *);
+extern void __glXDispSwap_PolygonStipple(GLbyte *);
+extern void __glXDispSwap_Scissor(GLbyte *);
+extern void __glXDispSwap_ShadeModel(GLbyte *);
+extern void __glXDispSwap_TexParameterf(GLbyte *);
+extern void __glXDispSwap_TexParameterfv(GLbyte *);
+extern void __glXDispSwap_TexParameteri(GLbyte *);
+extern void __glXDispSwap_TexParameteriv(GLbyte *);
+extern void __glXDispSwap_TexImage1D(GLbyte *);
+extern void __glXDispSwap_TexImage2D(GLbyte *);
+extern void __glXDispSwap_TexEnvf(GLbyte *);
+extern void __glXDispSwap_TexEnvfv(GLbyte *);
+extern void __glXDispSwap_TexEnvi(GLbyte *);
+extern void __glXDispSwap_TexEnviv(GLbyte *);
+extern void __glXDispSwap_TexGend(GLbyte *);
+extern void __glXDispSwap_TexGendv(GLbyte *);
+extern void __glXDispSwap_TexGenf(GLbyte *);
+extern void __glXDispSwap_TexGenfv(GLbyte *);
+extern void __glXDispSwap_TexGeni(GLbyte *);
+extern void __glXDispSwap_TexGeniv(GLbyte *);
+extern void __glXDispSwap_InitNames(GLbyte *);
+extern void __glXDispSwap_LoadName(GLbyte *);
+extern void __glXDispSwap_PassThrough(GLbyte *);
+extern void __glXDispSwap_PopName(GLbyte *);
+extern void __glXDispSwap_PushName(GLbyte *);
+extern void __glXDispSwap_DrawBuffer(GLbyte *);
+extern void __glXDispSwap_Clear(GLbyte *);
+extern void __glXDispSwap_ClearAccum(GLbyte *);
+extern void __glXDispSwap_ClearIndex(GLbyte *);
+extern void __glXDispSwap_ClearColor(GLbyte *);
+extern void __glXDispSwap_ClearStencil(GLbyte *);
+extern void __glXDispSwap_ClearDepth(GLbyte *);
+extern void __glXDispSwap_StencilMask(GLbyte *);
+extern void __glXDispSwap_ColorMask(GLbyte *);
+extern void __glXDispSwap_DepthMask(GLbyte *);
+extern void __glXDispSwap_IndexMask(GLbyte *);
+extern void __glXDispSwap_Accum(GLbyte *);
+extern void __glXDispSwap_Disable(GLbyte *);
+extern void __glXDispSwap_Enable(GLbyte *);
+extern void __glXDispSwap_PopAttrib(GLbyte *);
+extern void __glXDispSwap_PushAttrib(GLbyte *);
+extern void __glXDispSwap_Map1d(GLbyte *);
+extern void __glXDispSwap_Map1f(GLbyte *);
+extern void __glXDispSwap_Map2d(GLbyte *);
+extern void __glXDispSwap_Map2f(GLbyte *);
+extern void __glXDispSwap_MapGrid1d(GLbyte *);
+extern void __glXDispSwap_MapGrid1f(GLbyte *);
+extern void __glXDispSwap_MapGrid2d(GLbyte *);
+extern void __glXDispSwap_MapGrid2f(GLbyte *);
+extern void __glXDispSwap_EvalCoord1dv(GLbyte *);
+extern void __glXDispSwap_EvalCoord1fv(GLbyte *);
+extern void __glXDispSwap_EvalCoord2dv(GLbyte *);
+extern void __glXDispSwap_EvalCoord2fv(GLbyte *);
+extern void __glXDispSwap_EvalMesh1(GLbyte *);
+extern void __glXDispSwap_EvalPoint1(GLbyte *);
+extern void __glXDispSwap_EvalMesh2(GLbyte *);
+extern void __glXDispSwap_EvalPoint2(GLbyte *);
+extern void __glXDispSwap_AlphaFunc(GLbyte *);
+extern void __glXDispSwap_BlendFunc(GLbyte *);
+extern void __glXDispSwap_LogicOp(GLbyte *);
+extern void __glXDispSwap_StencilFunc(GLbyte *);
+extern void __glXDispSwap_StencilOp(GLbyte *);
+extern void __glXDispSwap_DepthFunc(GLbyte *);
+extern void __glXDispSwap_PixelZoom(GLbyte *);
+extern void __glXDispSwap_PixelTransferf(GLbyte *);
+extern void __glXDispSwap_PixelTransferi(GLbyte *);
+extern void __glXDispSwap_PixelMapfv(GLbyte *);
+extern void __glXDispSwap_PixelMapuiv(GLbyte *);
+extern void __glXDispSwap_PixelMapusv(GLbyte *);
+extern void __glXDispSwap_ReadBuffer(GLbyte *);
+extern void __glXDispSwap_CopyPixels(GLbyte *);
+extern void __glXDispSwap_DrawPixels(GLbyte *);
+extern void __glXDispSwap_DepthRange(GLbyte *);
+extern void __glXDispSwap_Frustum(GLbyte *);
+extern void __glXDispSwap_LoadIdentity(GLbyte *);
+extern void __glXDispSwap_LoadMatrixf(GLbyte *);
+extern void __glXDispSwap_LoadMatrixd(GLbyte *);
+extern void __glXDispSwap_MatrixMode(GLbyte *);
+extern void __glXDispSwap_MultMatrixf(GLbyte *);
+extern void __glXDispSwap_MultMatrixd(GLbyte *);
+extern void __glXDispSwap_Ortho(GLbyte *);
+extern void __glXDispSwap_PopMatrix(GLbyte *);
+extern void __glXDispSwap_PushMatrix(GLbyte *);
+extern void __glXDispSwap_Rotated(GLbyte *);
+extern void __glXDispSwap_Rotatef(GLbyte *);
+extern void __glXDispSwap_Scaled(GLbyte *);
+extern void __glXDispSwap_Scalef(GLbyte *);
+extern void __glXDispSwap_Translated(GLbyte *);
+extern void __glXDispSwap_Translatef(GLbyte *);
+extern void __glXDispSwap_Viewport(GLbyte *);
+extern void __glXDispSwap_PolygonOffset(GLbyte *);
+extern void __glXDispSwap_DrawArrays(GLbyte *);
+extern void __glXDispSwap_Indexubv(GLbyte *);
+extern void __glXDispSwap_ColorSubTable(GLbyte *);
+extern void __glXDispSwap_CopyColorSubTable(GLbyte *);
+extern void __glXDispSwap_ActiveTextureARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord1dvARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord1fvARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord1ivARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord1svARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord2dvARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord2fvARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord2ivARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord2svARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord3dvARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord3fvARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord3ivARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord3svARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord4dvARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord4fvARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord4ivARB(GLbyte *);
+extern void __glXDispSwap_MultiTexCoord4svARB(GLbyte *);
 
-extern void __glXDispSwap_TexSubImage1D(GLbyte*);
-extern void __glXDispSwap_TexSubImage2D(GLbyte*);
-extern void __glXDispSwap_ConvolutionFilter1D(GLbyte*);
-extern void __glXDispSwap_ConvolutionFilter2D(GLbyte*);
-extern void __glXDispSwap_ConvolutionParameterfv(GLbyte*);
-extern void __glXDispSwap_ConvolutionParameteriv(GLbyte*);
-extern void __glXDispSwap_CopyConvolutionFilter1D(GLbyte*);
-extern void __glXDispSwap_CopyConvolutionFilter2D(GLbyte*);
-extern void __glXDispSwap_SeparableFilter2D(GLbyte*);
-extern void __glXDispSwap_TexImage3D(GLbyte*);
-extern void __glXDispSwap_TexSubImage3D(GLbyte*);
-extern void __glXDispSwap_DrawArrays(GLbyte*);
-extern void __glXDispSwap_PrioritizeTextures(GLbyte*);
-extern void __glXDispSwap_CopyTexImage1D(GLbyte*);
-extern void __glXDispSwap_CopyTexImage2D(GLbyte*);
-extern void __glXDispSwap_CopyTexSubImage1D(GLbyte*);
-extern void __glXDispSwap_CopyTexSubImage2D(GLbyte*);
-extern void __glXDispSwap_CopyTexSubImage3D(GLbyte*);
+extern void __glXDispSwap_TexSubImage1D(GLbyte *);
+extern void __glXDispSwap_TexSubImage2D(GLbyte *);
+extern void __glXDispSwap_ConvolutionFilter1D(GLbyte *);
+extern void __glXDispSwap_ConvolutionFilter2D(GLbyte *);
+extern void __glXDispSwap_ConvolutionParameterfv(GLbyte *);
+extern void __glXDispSwap_ConvolutionParameteriv(GLbyte *);
+extern void __glXDispSwap_CopyConvolutionFilter1D(GLbyte *);
+extern void __glXDispSwap_CopyConvolutionFilter2D(GLbyte *);
+extern void __glXDispSwap_SeparableFilter2D(GLbyte *);
+extern void __glXDispSwap_TexImage3D(GLbyte *);
+extern void __glXDispSwap_TexSubImage3D(GLbyte *);
+extern void __glXDispSwap_DrawArrays(GLbyte *);
+extern void __glXDispSwap_PrioritizeTextures(GLbyte *);
+extern void __glXDispSwap_CopyTexImage1D(GLbyte *);
+extern void __glXDispSwap_CopyTexImage2D(GLbyte *);
+extern void __glXDispSwap_CopyTexSubImage1D(GLbyte *);
+extern void __glXDispSwap_CopyTexSubImage2D(GLbyte *);
+extern void __glXDispSwap_CopyTexSubImage3D(GLbyte *);
 
 #define __GLX_MIN_GLXCMD_OPCODE 1
 #define __GLX_MAX_GLXCMD_OPCODE 20
@@ -673,4 +677,4 @@ extern void __glXDispSwap_CopyTexSubImage3D(GLbyte*);
 
 extern __GLXdispatchSingleProcPtr __glXSingleTable[__GLX_SINGLE_TABLE_SIZE];
 extern __GLXdispatchSingleProcPtr __glXSwapSingleTable[__GLX_SINGLE_TABLE_SIZE];
-#endif /* _GLX_g_disptab_h_ */
+#endif                          /* _GLX_g_disptab_h_ */
diff --git a/xorg-server/hw/dmx/glxProxy/g_renderswap.c b/xorg-server/hw/dmx/glxProxy/g_renderswap.c
index e434a71b6..ce1c609bd 100644
--- a/xorg-server/hw/dmx/glxProxy/g_renderswap.c
+++ b/xorg-server/hw/dmx/glxProxy/g_renderswap.c
@@ -34,2401 +34,2630 @@
 #include "unpack.h"
 #include "compsize.h"
 
-void __glXDispSwap_CallList(GLbyte *pc)
+void
+__glXDispSwap_CallList(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_ListBase(GLbyte *pc)
+void
+__glXDispSwap_ListBase(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_Begin(GLbyte *pc)
+void
+__glXDispSwap_Begin(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_Color3bv(GLbyte *pc)
+void
+__glXDispSwap_Color3bv(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_Color3dv(GLbyte *pc)
+void
+__glXDispSwap_Color3dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 24);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 24);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_Color3fv(GLbyte *pc)
+void
+__glXDispSwap_Color3fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
 }
 
-void __glXDispSwap_Color3iv(GLbyte *pc)
+void
+__glXDispSwap_Color3iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_Color3sv(GLbyte *pc)
+void
+__glXDispSwap_Color3sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_Color3ubv(GLbyte *pc)
+void
+__glXDispSwap_Color3ubv(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_Color3uiv(GLbyte *pc)
+void
+__glXDispSwap_Color3uiv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 3);
 }
 
-void __glXDispSwap_Color3usv(GLbyte *pc)
+void
+__glXDispSwap_Color3usv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
 }
 
-void __glXDispSwap_Color4bv(GLbyte *pc)
+void
+__glXDispSwap_Color4bv(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_Color4dv(GLbyte *pc)
+void
+__glXDispSwap_Color4dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 32);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 32);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
 }
 
-void __glXDispSwap_Color4fv(GLbyte *pc)
+void
+__glXDispSwap_Color4fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_Color4iv(GLbyte *pc)
+void
+__glXDispSwap_Color4iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_Color4sv(GLbyte *pc)
+void
+__glXDispSwap_Color4sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_Color4ubv(GLbyte *pc)
+void
+__glXDispSwap_Color4ubv(GLbyte * pc)
 {
 
 }
 
-void __glXDispSwap_Color4uiv(GLbyte *pc)
+void
+__glXDispSwap_Color4uiv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_Color4usv(GLbyte *pc)
+void
+__glXDispSwap_Color4usv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_EdgeFlagv(GLbyte *pc)
+void
+__glXDispSwap_EdgeFlagv(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_End(GLbyte *pc)
+void
+__glXDispSwap_End(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_Indexdv(GLbyte *pc)
+void
+__glXDispSwap_Indexdv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 8);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 8);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 1);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 1);
 
 }
 
-void __glXDispSwap_Indexfv(GLbyte *pc)
+void
+__glXDispSwap_Indexfv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
 
 }
 
-void __glXDispSwap_Indexiv(GLbyte *pc)
+void
+__glXDispSwap_Indexiv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 1);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 1);
 
 }
 
-void __glXDispSwap_Indexsv(GLbyte *pc)
+void
+__glXDispSwap_Indexsv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 1);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 1);
 
 }
 
-void __glXDispSwap_Normal3bv(GLbyte *pc)
+void
+__glXDispSwap_Normal3bv(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_Normal3dv(GLbyte *pc)
+void
+__glXDispSwap_Normal3dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 24);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 24);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_Normal3fv(GLbyte *pc)
+void
+__glXDispSwap_Normal3fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_Normal3iv(GLbyte *pc)
+void
+__glXDispSwap_Normal3iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_Normal3sv(GLbyte *pc)
+void
+__glXDispSwap_Normal3sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_RasterPos2dv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos2dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 16);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 16);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_RasterPos2fv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos2fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_RasterPos2iv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos2iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_RasterPos2sv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos2sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_RasterPos3dv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos3dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 24);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 24);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_RasterPos3fv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos3fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_RasterPos3iv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos3iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_RasterPos3sv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos3sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_RasterPos4dv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos4dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 32);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 32);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_RasterPos4fv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos4fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_RasterPos4iv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos4iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_RasterPos4sv(GLbyte *pc)
+void
+__glXDispSwap_RasterPos4sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_Rectdv(GLbyte *pc)
+void
+__glXDispSwap_Rectdv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 32);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 32);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 16, 2);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 16, 2);
 
 }
 
-void __glXDispSwap_Rectfv(GLbyte *pc)
+void
+__glXDispSwap_Rectfv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 8, 2);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 8, 2);
 
 }
 
-void __glXDispSwap_Rectiv(GLbyte *pc)
+void
+__glXDispSwap_Rectiv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 2);
-	__GLX_SWAP_INT_ARRAY(pc + 8, 2);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_INT_ARRAY(pc + 8, 2);
 
 }
 
-void __glXDispSwap_Rectsv(GLbyte *pc)
+void
+__glXDispSwap_Rectsv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
-	__GLX_SWAP_SHORT_ARRAY(pc + 4, 2);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_SHORT_ARRAY(pc + 4, 2);
 
 }
 
-void __glXDispSwap_TexCoord1dv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord1dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 8);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 8);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 1);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 1);
 
 }
 
-void __glXDispSwap_TexCoord1fv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord1fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
 
 }
 
-void __glXDispSwap_TexCoord1iv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord1iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 1);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 1);
 
 }
 
-void __glXDispSwap_TexCoord1sv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord1sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 1);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 1);
 
 }
 
-void __glXDispSwap_TexCoord2dv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord2dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 16);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 16);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_TexCoord2fv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord2fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_TexCoord2iv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord2iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_TexCoord2sv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord2sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_TexCoord3dv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord3dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 24);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 24);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_TexCoord3fv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord3fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_TexCoord3iv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord3iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_TexCoord3sv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord3sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_TexCoord4dv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord4dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 32);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 32);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_TexCoord4fv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord4fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_TexCoord4iv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord4iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_TexCoord4sv(GLbyte *pc)
+void
+__glXDispSwap_TexCoord4sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_Vertex2dv(GLbyte *pc)
+void
+__glXDispSwap_Vertex2dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 16);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 16);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_Vertex2fv(GLbyte *pc)
+void
+__glXDispSwap_Vertex2fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_Vertex2iv(GLbyte *pc)
+void
+__glXDispSwap_Vertex2iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_Vertex2sv(GLbyte *pc)
+void
+__glXDispSwap_Vertex2sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_Vertex3dv(GLbyte *pc)
+void
+__glXDispSwap_Vertex3dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 24);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 24);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_Vertex3fv(GLbyte *pc)
+void
+__glXDispSwap_Vertex3fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_Vertex3iv(GLbyte *pc)
+void
+__glXDispSwap_Vertex3iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_Vertex3sv(GLbyte *pc)
+void
+__glXDispSwap_Vertex3sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_Vertex4dv(GLbyte *pc)
+void
+__glXDispSwap_Vertex4dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 32);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 32);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_Vertex4fv(GLbyte *pc)
+void
+__glXDispSwap_Vertex4fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_Vertex4iv(GLbyte *pc)
+void
+__glXDispSwap_Vertex4iv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_INT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_Vertex4sv(GLbyte *pc)
+void
+__glXDispSwap_Vertex4sv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
+    __GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_ClipPlane(GLbyte *pc)
+void
+__glXDispSwap_ClipPlane(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 36);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 36);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_INT(pc + 32);
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
+    __GLX_SWAP_INT(pc + 32);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_ColorMaterial(GLbyte *pc)
+void
+__glXDispSwap_ColorMaterial(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
 
 }
 
-void __glXDispSwap_CullFace(GLbyte *pc)
+void
+__glXDispSwap_CullFace(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_Fogf(GLbyte *pc)
+void
+__glXDispSwap_Fogf(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
 
 }
 
-void __glXDispSwap_Fogfv(GLbyte *pc)
+void
+__glXDispSwap_Fogfv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	pname = *(GLenum *)(pc + 0);
-	compsize = __glFogfv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_FLOAT_ARRAY(pc + 4, compsize);
+    __GLX_SWAP_INT(pc + 0);
+    pname = *(GLenum *) (pc + 0);
+    compsize = __glFogfv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_FLOAT_ARRAY(pc + 4, compsize);
 
 }
 
-void __glXDispSwap_Fogi(GLbyte *pc)
+void
+__glXDispSwap_Fogi(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
 
 }
 
-void __glXDispSwap_Fogiv(GLbyte *pc)
+void
+__glXDispSwap_Fogiv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
 
-	__GLX_SWAP_INT(pc + 0);
-	pname = *(GLenum *)(pc + 0);
-	compsize = __glFogiv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT_ARRAY(pc + 4, compsize);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_INT(pc + 0);
+    pname = *(GLenum *) (pc + 0);
+    compsize = __glFogiv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT_ARRAY(pc + 4, compsize);
 
 }
 
-void __glXDispSwap_FrontFace(GLbyte *pc)
+void
+__glXDispSwap_FrontFace(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_Hint(GLbyte *pc)
+void
+__glXDispSwap_Hint(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
 
 }
 
-void __glXDispSwap_Lightf(GLbyte *pc)
+void
+__glXDispSwap_Lightf(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
 
 }
 
-void __glXDispSwap_Lightfv(GLbyte *pc)
+void
+__glXDispSwap_Lightfv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glLightfv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glLightfv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_Lighti(GLbyte *pc)
+void
+__glXDispSwap_Lighti(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
 
 }
 
-void __glXDispSwap_Lightiv(GLbyte *pc)
+void
+__glXDispSwap_Lightiv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glLightiv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 8, compsize);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glLightiv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_LightModelf(GLbyte *pc)
+void
+__glXDispSwap_LightModelf(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
 
 }
 
-void __glXDispSwap_LightModelfv(GLbyte *pc)
+void
+__glXDispSwap_LightModelfv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	pname = *(GLenum *)(pc + 0);
-	compsize = __glLightModelfv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_FLOAT_ARRAY(pc + 4, compsize);
+    __GLX_SWAP_INT(pc + 0);
+    pname = *(GLenum *) (pc + 0);
+    compsize = __glLightModelfv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_FLOAT_ARRAY(pc + 4, compsize);
 
 }
 
-void __glXDispSwap_LightModeli(GLbyte *pc)
+void
+__glXDispSwap_LightModeli(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
 
 }
 
-void __glXDispSwap_LightModeliv(GLbyte *pc)
+void
+__glXDispSwap_LightModeliv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	pname = *(GLenum *)(pc + 0);
-	compsize = __glLightModeliv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT_ARRAY(pc + 4, compsize);
+    __GLX_SWAP_INT(pc + 0);
+    pname = *(GLenum *) (pc + 0);
+    compsize = __glLightModeliv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT_ARRAY(pc + 4, compsize);
 
 }
 
-void __glXDispSwap_LineStipple(GLbyte *pc)
+void
+__glXDispSwap_LineStipple(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_SHORT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_SHORT(pc + 4);
 
 }
 
-void __glXDispSwap_LineWidth(GLbyte *pc)
+void
+__glXDispSwap_LineWidth(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 0);
 
 }
 
-void __glXDispSwap_Materialf(GLbyte *pc)
+void
+__glXDispSwap_Materialf(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
 
 }
 
-void __glXDispSwap_Materialfv(GLbyte *pc)
+void
+__glXDispSwap_Materialfv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glMaterialfv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glMaterialfv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_Materiali(GLbyte *pc)
+void
+__glXDispSwap_Materiali(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
 
 }
 
-void __glXDispSwap_Materialiv(GLbyte *pc)
+void
+__glXDispSwap_Materialiv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glMaterialiv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 8, compsize);
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glMaterialiv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_PointSize(GLbyte *pc)
+void
+__glXDispSwap_PointSize(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 0);
 
 }
 
-void __glXDispSwap_PolygonMode(GLbyte *pc)
+void
+__glXDispSwap_PolygonMode(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
 
 }
 
-void __glXDispSwap_Scissor(GLbyte *pc)
+void
+__glXDispSwap_Scissor(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
 
 }
 
-void __glXDispSwap_ShadeModel(GLbyte *pc)
+void
+__glXDispSwap_ShadeModel(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_TexParameterf(GLbyte *pc)
+void
+__glXDispSwap_TexParameterf(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
 
 }
 
-void __glXDispSwap_TexParameterfv(GLbyte *pc)
+void
+__glXDispSwap_TexParameterfv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glTexParameterfv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glTexParameterfv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_TexParameteri(GLbyte *pc)
+void
+__glXDispSwap_TexParameteri(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
 
 }
 
-void __glXDispSwap_TexParameteriv(GLbyte *pc)
+void
+__glXDispSwap_TexParameteriv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glTexParameteriv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 8, compsize);
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glTexParameteriv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_TexEnvf(GLbyte *pc)
+void
+__glXDispSwap_TexEnvf(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
 
 }
 
-void __glXDispSwap_TexEnvfv(GLbyte *pc)
+void
+__glXDispSwap_TexEnvfv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glTexEnvfv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glTexEnvfv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_TexEnvi(GLbyte *pc)
+void
+__glXDispSwap_TexEnvi(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
 
 }
 
-void __glXDispSwap_TexEnviv(GLbyte *pc)
+void
+__glXDispSwap_TexEnviv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glTexEnviv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 8, compsize);
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glTexEnviv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_TexGend(GLbyte *pc)
+void
+__glXDispSwap_TexGend(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 16);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 16);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_DOUBLE(pc + 0);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_DOUBLE(pc + 0);
 
 }
 
-void __glXDispSwap_TexGendv(GLbyte *pc)
+void
+__glXDispSwap_TexGendv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint cmdlen;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint cmdlen;
+    GLint compsize;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glTexGendv_size(pname);
-	if (compsize < 0) compsize = 0;
-	cmdlen = __GLX_PAD(8+compsize*8);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glTexGendv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    cmdlen = __GLX_PAD(8 + compsize * 8);
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, cmdlen);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, cmdlen);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 8, compsize);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_TexGenf(GLbyte *pc)
+void
+__glXDispSwap_TexGenf(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
 
 }
 
-void __glXDispSwap_TexGenfv(GLbyte *pc)
+void
+__glXDispSwap_TexGenfv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glTexGenfv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glTexGenfv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_TexGeni(GLbyte *pc)
+void
+__glXDispSwap_TexGeni(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
 
 }
 
-void __glXDispSwap_TexGeniv(GLbyte *pc)
+void
+__glXDispSwap_TexGeniv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glTexGeniv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 8, compsize);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glTexGeniv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_InitNames(GLbyte *pc)
+void
+__glXDispSwap_InitNames(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_LoadName(GLbyte *pc)
+void
+__glXDispSwap_LoadName(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_PassThrough(GLbyte *pc)
+void
+__glXDispSwap_PassThrough(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 0);
 
 }
 
-void __glXDispSwap_PopName(GLbyte *pc)
+void
+__glXDispSwap_PopName(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_PushName(GLbyte *pc)
+void
+__glXDispSwap_PushName(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_DrawBuffer(GLbyte *pc)
+void
+__glXDispSwap_DrawBuffer(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_Clear(GLbyte *pc)
+void
+__glXDispSwap_Clear(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_ClearAccum(GLbyte *pc)
+void
+__glXDispSwap_ClearAccum(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
-	__GLX_SWAP_FLOAT(pc + 12);
+    __GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_FLOAT(pc + 12);
 
 }
 
-void __glXDispSwap_ClearIndex(GLbyte *pc)
+void
+__glXDispSwap_ClearIndex(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 0);
 
 }
 
-void __glXDispSwap_ClearColor(GLbyte *pc)
+void
+__glXDispSwap_ClearColor(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
-	__GLX_SWAP_FLOAT(pc + 12);
+    __GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_FLOAT(pc + 12);
 
 }
 
-void __glXDispSwap_ClearStencil(GLbyte *pc)
+void
+__glXDispSwap_ClearStencil(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_ClearDepth(GLbyte *pc)
+void
+__glXDispSwap_ClearDepth(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 8);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 8);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE(pc + 0);
+    __GLX_SWAP_DOUBLE(pc + 0);
 
 }
 
-void __glXDispSwap_StencilMask(GLbyte *pc)
+void
+__glXDispSwap_StencilMask(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_ColorMask(GLbyte *pc)
+void
+__glXDispSwap_ColorMask(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_DepthMask(GLbyte *pc)
+void
+__glXDispSwap_DepthMask(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_IndexMask(GLbyte *pc)
+void
+__glXDispSwap_IndexMask(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_Accum(GLbyte *pc)
+void
+__glXDispSwap_Accum(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
 
 }
 
-void __glXDispSwap_Disable(GLbyte *pc)
+void
+__glXDispSwap_Disable(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_Enable(GLbyte *pc)
+void
+__glXDispSwap_Enable(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_PopAttrib(GLbyte *pc)
+void
+__glXDispSwap_PopAttrib(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_PushAttrib(GLbyte *pc)
+void
+__glXDispSwap_PushAttrib(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_MapGrid1d(GLbyte *pc)
+void
+__glXDispSwap_MapGrid1d(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 20);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 20);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_INT(pc + 16);
-	__GLX_SWAP_DOUBLE(pc + 0);
-	__GLX_SWAP_DOUBLE(pc + 8);
+    __GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_DOUBLE(pc + 0);
+    __GLX_SWAP_DOUBLE(pc + 8);
 
 }
 
-void __glXDispSwap_MapGrid1f(GLbyte *pc)
+void
+__glXDispSwap_MapGrid1f(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
 
 }
 
-void __glXDispSwap_MapGrid2d(GLbyte *pc)
+void
+__glXDispSwap_MapGrid2d(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 40);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 40);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_INT(pc + 32);
-	__GLX_SWAP_DOUBLE(pc + 0);
-	__GLX_SWAP_DOUBLE(pc + 8);
-	__GLX_SWAP_INT(pc + 36);
-	__GLX_SWAP_DOUBLE(pc + 16);
-	__GLX_SWAP_DOUBLE(pc + 24);
+    __GLX_SWAP_INT(pc + 32);
+    __GLX_SWAP_DOUBLE(pc + 0);
+    __GLX_SWAP_DOUBLE(pc + 8);
+    __GLX_SWAP_INT(pc + 36);
+    __GLX_SWAP_DOUBLE(pc + 16);
+    __GLX_SWAP_DOUBLE(pc + 24);
 
 }
 
-void __glXDispSwap_MapGrid2f(GLbyte *pc)
+void
+__glXDispSwap_MapGrid2f(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_FLOAT(pc + 16);
-	__GLX_SWAP_FLOAT(pc + 20);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_FLOAT(pc + 16);
+    __GLX_SWAP_FLOAT(pc + 20);
 
 }
 
-void __glXDispSwap_EvalCoord1dv(GLbyte *pc)
+void
+__glXDispSwap_EvalCoord1dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 8);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 8);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 1);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 1);
 
 }
 
-void __glXDispSwap_EvalCoord1fv(GLbyte *pc)
+void
+__glXDispSwap_EvalCoord1fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
 
 }
 
-void __glXDispSwap_EvalCoord2dv(GLbyte *pc)
+void
+__glXDispSwap_EvalCoord2dv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 16);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 16);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_EvalCoord2fv(GLbyte *pc)
+void
+__glXDispSwap_EvalCoord2fv(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_EvalMesh1(GLbyte *pc)
+void
+__glXDispSwap_EvalMesh1(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
 
 }
 
-void __glXDispSwap_EvalPoint1(GLbyte *pc)
+void
+__glXDispSwap_EvalPoint1(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_EvalMesh2(GLbyte *pc)
+void
+__glXDispSwap_EvalMesh2(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
 
 }
 
-void __glXDispSwap_EvalPoint2(GLbyte *pc)
+void
+__glXDispSwap_EvalPoint2(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
 
 }
 
-void __glXDispSwap_AlphaFunc(GLbyte *pc)
+void
+__glXDispSwap_AlphaFunc(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
 
 }
 
-void __glXDispSwap_BlendFunc(GLbyte *pc)
+void
+__glXDispSwap_BlendFunc(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
 
 }
 
-void __glXDispSwap_LogicOp(GLbyte *pc)
+void
+__glXDispSwap_LogicOp(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_StencilFunc(GLbyte *pc)
+void
+__glXDispSwap_StencilFunc(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
 
 }
 
-void __glXDispSwap_StencilOp(GLbyte *pc)
+void
+__glXDispSwap_StencilOp(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
 
 }
 
-void __glXDispSwap_DepthFunc(GLbyte *pc)
+void
+__glXDispSwap_DepthFunc(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_PixelZoom(GLbyte *pc)
+void
+__glXDispSwap_PixelZoom(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
 
 }
 
-void __glXDispSwap_PixelTransferf(GLbyte *pc)
+void
+__glXDispSwap_PixelTransferf(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
 
 }
 
-void __glXDispSwap_PixelTransferi(GLbyte *pc)
+void
+__glXDispSwap_PixelTransferi(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
 
 }
 
-void __glXDispSwap_PixelMapfv(GLbyte *pc)
+void
+__glXDispSwap_PixelMapfv(GLbyte * pc)
 {
-	GLint mapsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLint mapsize;
 
-	__GLX_SWAP_INT(pc + 4);
-	mapsize = *(GLint *)(pc + 4);
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 8, mapsize);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_INT(pc + 4);
+    mapsize = *(GLint *) (pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 8, mapsize);
 
 }
 
-void __glXDispSwap_PixelMapuiv(GLbyte *pc)
+void
+__glXDispSwap_PixelMapuiv(GLbyte * pc)
 {
-	GLint mapsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLint mapsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 4);
-	mapsize = *(GLint *)(pc + 4);
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 8, mapsize);
+    __GLX_SWAP_INT(pc + 4);
+    mapsize = *(GLint *) (pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 8, mapsize);
 
 }
 
-void __glXDispSwap_PixelMapusv(GLbyte *pc)
+void
+__glXDispSwap_PixelMapusv(GLbyte * pc)
 {
-	GLint mapsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLint mapsize;
 
-	__GLX_SWAP_INT(pc + 4);
-	mapsize = *(GLint *)(pc + 4);
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_SHORT_ARRAY(pc + 8, mapsize);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_INT(pc + 4);
+    mapsize = *(GLint *) (pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_SHORT_ARRAY(pc + 8, mapsize);
 
 }
 
-void __glXDispSwap_ReadBuffer(GLbyte *pc)
+void
+__glXDispSwap_ReadBuffer(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_CopyPixels(GLbyte *pc)
+void
+__glXDispSwap_CopyPixels(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
 
 }
 
-void __glXDispSwap_DepthRange(GLbyte *pc)
+void
+__glXDispSwap_DepthRange(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 16);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 16);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE(pc + 0);
-	__GLX_SWAP_DOUBLE(pc + 8);
+    __GLX_SWAP_DOUBLE(pc + 0);
+    __GLX_SWAP_DOUBLE(pc + 8);
 
 }
 
-void __glXDispSwap_Frustum(GLbyte *pc)
+void
+__glXDispSwap_Frustum(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 48);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 48);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE(pc + 0);
-	__GLX_SWAP_DOUBLE(pc + 8);
-	__GLX_SWAP_DOUBLE(pc + 16);
-	__GLX_SWAP_DOUBLE(pc + 24);
-	__GLX_SWAP_DOUBLE(pc + 32);
-	__GLX_SWAP_DOUBLE(pc + 40);
+    __GLX_SWAP_DOUBLE(pc + 0);
+    __GLX_SWAP_DOUBLE(pc + 8);
+    __GLX_SWAP_DOUBLE(pc + 16);
+    __GLX_SWAP_DOUBLE(pc + 24);
+    __GLX_SWAP_DOUBLE(pc + 32);
+    __GLX_SWAP_DOUBLE(pc + 40);
 
 }
 
-void __glXDispSwap_LoadIdentity(GLbyte *pc)
+void
+__glXDispSwap_LoadIdentity(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_LoadMatrixf(GLbyte *pc)
+void
+__glXDispSwap_LoadMatrixf(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 16);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 16);
 
 }
 
-void __glXDispSwap_LoadMatrixd(GLbyte *pc)
+void
+__glXDispSwap_LoadMatrixd(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 128);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 128);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 16);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 16);
 
 }
 
-void __glXDispSwap_MatrixMode(GLbyte *pc)
+void
+__glXDispSwap_MatrixMode(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_MultMatrixf(GLbyte *pc)
+void
+__glXDispSwap_MultMatrixf(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_FLOAT_ARRAY(pc + 0, 16);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 0, 16);
 
 }
 
-void __glXDispSwap_MultMatrixd(GLbyte *pc)
+void
+__glXDispSwap_MultMatrixd(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 128);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 128);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 16);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 16);
 
 }
 
-void __glXDispSwap_Ortho(GLbyte *pc)
+void
+__glXDispSwap_Ortho(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 48);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 48);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE(pc + 0);
-	__GLX_SWAP_DOUBLE(pc + 8);
-	__GLX_SWAP_DOUBLE(pc + 16);
-	__GLX_SWAP_DOUBLE(pc + 24);
-	__GLX_SWAP_DOUBLE(pc + 32);
-	__GLX_SWAP_DOUBLE(pc + 40);
+    __GLX_SWAP_DOUBLE(pc + 0);
+    __GLX_SWAP_DOUBLE(pc + 8);
+    __GLX_SWAP_DOUBLE(pc + 16);
+    __GLX_SWAP_DOUBLE(pc + 24);
+    __GLX_SWAP_DOUBLE(pc + 32);
+    __GLX_SWAP_DOUBLE(pc + 40);
 
 }
 
-void __glXDispSwap_PopMatrix(GLbyte *pc)
+void
+__glXDispSwap_PopMatrix(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_PushMatrix(GLbyte *pc)
+void
+__glXDispSwap_PushMatrix(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_Rotated(GLbyte *pc)
+void
+__glXDispSwap_Rotated(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 32);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 32);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE(pc + 0);
-	__GLX_SWAP_DOUBLE(pc + 8);
-	__GLX_SWAP_DOUBLE(pc + 16);
-	__GLX_SWAP_DOUBLE(pc + 24);
+    __GLX_SWAP_DOUBLE(pc + 0);
+    __GLX_SWAP_DOUBLE(pc + 8);
+    __GLX_SWAP_DOUBLE(pc + 16);
+    __GLX_SWAP_DOUBLE(pc + 24);
 
 }
 
-void __glXDispSwap_Rotatef(GLbyte *pc)
+void
+__glXDispSwap_Rotatef(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
-	__GLX_SWAP_FLOAT(pc + 12);
+    __GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_FLOAT(pc + 12);
 
 }
 
-void __glXDispSwap_Scaled(GLbyte *pc)
+void
+__glXDispSwap_Scaled(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 24);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 24);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE(pc + 0);
-	__GLX_SWAP_DOUBLE(pc + 8);
-	__GLX_SWAP_DOUBLE(pc + 16);
+    __GLX_SWAP_DOUBLE(pc + 0);
+    __GLX_SWAP_DOUBLE(pc + 8);
+    __GLX_SWAP_DOUBLE(pc + 16);
 
 }
 
-void __glXDispSwap_Scalef(GLbyte *pc)
+void
+__glXDispSwap_Scalef(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
 
 }
 
-void __glXDispSwap_Translated(GLbyte *pc)
+void
+__glXDispSwap_Translated(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 24);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 24);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_DOUBLE(pc + 0);
-	__GLX_SWAP_DOUBLE(pc + 8);
-	__GLX_SWAP_DOUBLE(pc + 16);
+    __GLX_SWAP_DOUBLE(pc + 0);
+    __GLX_SWAP_DOUBLE(pc + 8);
+    __GLX_SWAP_DOUBLE(pc + 16);
 
 }
 
-void __glXDispSwap_Translatef(GLbyte *pc)
+void
+__glXDispSwap_Translatef(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
 
 }
 
-void __glXDispSwap_Viewport(GLbyte *pc)
+void
+__glXDispSwap_Viewport(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
 
 }
 
-void __glXDispSwap_PolygonOffset(GLbyte *pc)
+void
+__glXDispSwap_PolygonOffset(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
 
 }
 
-void __glXDispSwap_CopyTexImage1D(GLbyte *pc)
+void
+__glXDispSwap_CopyTexImage1D(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_INT(pc + 16);
-	__GLX_SWAP_INT(pc + 20);
-	__GLX_SWAP_INT(pc + 24);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_INT(pc + 20);
+    __GLX_SWAP_INT(pc + 24);
 
 }
 
-void __glXDispSwap_CopyTexImage2D(GLbyte *pc)
+void
+__glXDispSwap_CopyTexImage2D(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_INT(pc + 16);
-	__GLX_SWAP_INT(pc + 20);
-	__GLX_SWAP_INT(pc + 24);
-	__GLX_SWAP_INT(pc + 28);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_INT(pc + 20);
+    __GLX_SWAP_INT(pc + 24);
+    __GLX_SWAP_INT(pc + 28);
 
 }
 
-void __glXDispSwap_CopyTexSubImage1D(GLbyte *pc)
+void
+__glXDispSwap_CopyTexSubImage1D(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_INT(pc + 16);
-	__GLX_SWAP_INT(pc + 20);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_INT(pc + 20);
 
 }
 
-void __glXDispSwap_CopyTexSubImage2D(GLbyte *pc)
+void
+__glXDispSwap_CopyTexSubImage2D(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_INT(pc + 16);
-	__GLX_SWAP_INT(pc + 20);
-	__GLX_SWAP_INT(pc + 24);
-	__GLX_SWAP_INT(pc + 28);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_INT(pc + 20);
+    __GLX_SWAP_INT(pc + 24);
+    __GLX_SWAP_INT(pc + 28);
 
 }
 
-void __glXDispSwap_BindTexture(GLbyte *pc)
+void
+__glXDispSwap_BindTexture(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
 
 }
 
-void __glXDispSwap_PrioritizeTextures(GLbyte *pc)
+void
+__glXDispSwap_PrioritizeTextures(GLbyte * pc)
 {
-	GLsizei n;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLsizei n;
 
-	__GLX_SWAP_INT(pc + 0);
-	n = *(GLsizei *)(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 4, n);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 4+n*4, n);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_INT(pc + 0);
+    n = *(GLsizei *) (pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 4, n);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 4 + n * 4, n);
 
 }
 
-void __glXDispSwap_Indexubv(GLbyte *pc)
+void
+__glXDispSwap_Indexubv(GLbyte * pc)
 {
 }
 
-void __glXDispSwap_BlendColor(GLbyte *pc)
+void
+__glXDispSwap_BlendColor(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_FLOAT(pc + 0);
-	__GLX_SWAP_FLOAT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
-	__GLX_SWAP_FLOAT(pc + 12);
+    __GLX_SWAP_FLOAT(pc + 0);
+    __GLX_SWAP_FLOAT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_FLOAT(pc + 12);
 
 }
 
-void __glXDispSwap_BlendEquation(GLbyte *pc)
+void
+__glXDispSwap_BlendEquation(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_ColorTableParameterfv(GLbyte *pc)
+void
+__glXDispSwap_ColorTableParameterfv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glColorTableParameterfv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glColorTableParameterfv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_ColorTableParameteriv(GLbyte *pc)
+void
+__glXDispSwap_ColorTableParameteriv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glColorTableParameteriv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 8, compsize);
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glColorTableParameteriv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_CopyColorTable(GLbyte *pc)
+void
+__glXDispSwap_CopyColorTable(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
 
 }
 
-void __glXDispSwap_CopyColorSubTable(GLbyte *pc)
+void
+__glXDispSwap_CopyColorSubTable(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
 
 }
 
-void __glXDispSwap_ConvolutionParameterf(GLbyte *pc)
+void
+__glXDispSwap_ConvolutionParameterf(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_FLOAT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_FLOAT(pc + 8);
 
 }
 
-void __glXDispSwap_ConvolutionParameterfv(GLbyte *pc)
+void
+__glXDispSwap_ConvolutionParameterfv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glConvolutionParameterfv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glConvolutionParameterfv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_ConvolutionParameteri(GLbyte *pc)
+void
+__glXDispSwap_ConvolutionParameteri(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
 
 }
 
-void __glXDispSwap_ConvolutionParameteriv(GLbyte *pc)
+void
+__glXDispSwap_ConvolutionParameteriv(GLbyte * pc)
 {
-	GLenum pname;
-	GLint compsize;
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    GLenum pname;
+    GLint compsize;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 4);
-	pname = *(GLenum *)(pc + 4);
-	compsize = __glConvolutionParameteriv_size(pname);
-	if (compsize < 0) compsize = 0;
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 8, compsize);
+    __GLX_SWAP_INT(pc + 4);
+    pname = *(GLenum *) (pc + 4);
+    compsize = __glConvolutionParameteriv_size(pname);
+    if (compsize < 0)
+        compsize = 0;
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 8, compsize);
 
 }
 
-void __glXDispSwap_CopyConvolutionFilter1D(GLbyte *pc)
+void
+__glXDispSwap_CopyConvolutionFilter1D(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
 
 }
 
-void __glXDispSwap_CopyConvolutionFilter2D(GLbyte *pc)
+void
+__glXDispSwap_CopyConvolutionFilter2D(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_INT(pc + 16);
-	__GLX_SWAP_INT(pc + 20);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_INT(pc + 20);
 
 }
 
-void __glXDispSwap_Histogram(GLbyte *pc)
+void
+__glXDispSwap_Histogram(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
 
 }
 
-void __glXDispSwap_Minmax(GLbyte *pc)
+void
+__glXDispSwap_Minmax(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
 
 }
 
-void __glXDispSwap_ResetHistogram(GLbyte *pc)
+void
+__glXDispSwap_ResetHistogram(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_ResetMinmax(GLbyte *pc)
+void
+__glXDispSwap_ResetMinmax(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_CopyTexSubImage3D(GLbyte *pc)
+void
+__glXDispSwap_CopyTexSubImage3D(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT(pc + 4);
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_INT(pc + 12);
-	__GLX_SWAP_INT(pc + 16);
-	__GLX_SWAP_INT(pc + 20);
-	__GLX_SWAP_INT(pc + 24);
-	__GLX_SWAP_INT(pc + 28);
-	__GLX_SWAP_INT(pc + 32);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_INT(pc + 20);
+    __GLX_SWAP_INT(pc + 24);
+    __GLX_SWAP_INT(pc + 28);
+    __GLX_SWAP_INT(pc + 32);
 
 }
 
-void __glXDispSwap_ActiveTextureARB(GLbyte *pc)
+void
+__glXDispSwap_ActiveTextureARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT(pc + 0);
 
 }
 
-void __glXDispSwap_MultiTexCoord1dvARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord1dvARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 12);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 12);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_INT(pc + 8);
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 1);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 1);
 
 }
 
-void __glXDispSwap_MultiTexCoord1fvARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord1fvARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 1);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 4, 1);
 
 }
 
-void __glXDispSwap_MultiTexCoord1ivARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord1ivARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 4, 1);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 4, 1);
 
 }
 
-void __glXDispSwap_MultiTexCoord1svARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord1svARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_SHORT_ARRAY(pc + 4, 1);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_SHORT_ARRAY(pc + 4, 1);
 
 }
 
-void __glXDispSwap_MultiTexCoord2dvARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord2dvARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 20);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 20);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_INT(pc + 16);
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
+    __GLX_SWAP_INT(pc + 16);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
 
 }
 
-void __glXDispSwap_MultiTexCoord2fvARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord2fvARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 2);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 4, 2);
 
 }
 
-void __glXDispSwap_MultiTexCoord2ivARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord2ivARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 4, 2);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 4, 2);
 
 }
 
-void __glXDispSwap_MultiTexCoord2svARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord2svARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_SHORT_ARRAY(pc + 4, 2);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_SHORT_ARRAY(pc + 4, 2);
 
 }
 
-void __glXDispSwap_MultiTexCoord3dvARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord3dvARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 28);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 28);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_INT(pc + 24);
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
+    __GLX_SWAP_INT(pc + 24);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
 
 }
 
-void __glXDispSwap_MultiTexCoord3fvARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 3);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 4, 3);
 
 }
 
-void __glXDispSwap_MultiTexCoord3ivARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord3ivARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 4, 3);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 4, 3);
 
 }
 
-void __glXDispSwap_MultiTexCoord3svARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord3svARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_SHORT_ARRAY(pc + 4, 3);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_SHORT_ARRAY(pc + 4, 3);
 
 }
 
-void __glXDispSwap_MultiTexCoord4dvARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord4dvARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 #ifdef __GLX_ALIGN64
-	if ((unsigned long)(pc) & 7) {
-	    __GLX_MEM_COPY(pc-4, pc, 36);
-	    pc -= 4;
-	}
+    if ((unsigned long) (pc) & 7) {
+        __GLX_MEM_COPY(pc - 4, pc, 36);
+        pc -= 4;
+    }
 #endif
-	__GLX_SWAP_INT(pc + 32);
-	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
+    __GLX_SWAP_INT(pc + 32);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
 
 }
 
-void __glXDispSwap_MultiTexCoord4fvARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord4fvARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_FLOAT_ARRAY(pc + 4, 4);
 
 }
 
-void __glXDispSwap_MultiTexCoord4ivARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord4ivARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_INT_ARRAY(pc + 4, 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_INT_ARRAY(pc + 4, 4);
 
 }
 
-void __glXDispSwap_MultiTexCoord4svARB(GLbyte *pc)
+void
+__glXDispSwap_MultiTexCoord4svARB(GLbyte * pc)
 {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-	__GLX_SWAP_INT(pc + 0);
-	__GLX_SWAP_SHORT_ARRAY(pc + 4, 4);
+    __GLX_SWAP_INT(pc + 0);
+    __GLX_SWAP_SHORT_ARRAY(pc + 4, 4);
 
 }
-
diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c
index fb4bce850..49c6ef1ed 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c
@@ -59,71 +59,78 @@
 #endif
 
 extern __GLXFBConfig **__glXFBConfigs;
-extern int            __glXNumFBConfigs;
+extern int __glXNumFBConfigs;
 
-extern int glxIsExtensionSupported( char *ext );
-extern int __glXGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc);
+extern int glxIsExtensionSupported(char *ext);
+extern int __glXGetFBConfigsSGIX(__GLXclientState * cl, GLbyte * pc);
 
 #define BE_TO_CLIENT_ERROR(x) \
            ( (x) >= __glXerrorBase ? \
              (x) - dmxScreen->glxErrorBase + __glXerrorBase \
 	     : (x) )
 
-static __GLXFBConfig *glxLookupFBConfig( GLXFBConfigID id )
+static __GLXFBConfig *
+glxLookupFBConfig(GLXFBConfigID id)
 {
-   int i,j;
+    int i, j;
 
-   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
-      if ( __glXFBConfigs[j]->id == id)
-	 return __glXFBConfigs[j];
-   }
+    for (i = 0, j = 0; i < __glXNumFBConfigs;
+         i++, j += (__glXNumActiveScreens + 1)) {
+        if (__glXFBConfigs[j]->id == id)
+            return __glXFBConfigs[j];
+    }
 
-   return NULL;
+    return NULL;
 }
 
-static __GLXFBConfig *glxLookupFBConfigByVID( VisualID vid )
+static __GLXFBConfig *
+glxLookupFBConfigByVID(VisualID vid)
 {
-   int i,j;
+    int i, j;
 
-   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
-      if ( __glXFBConfigs[j]->associatedVisualId == vid)
-	 return __glXFBConfigs[j];
-   }
+    for (i = 0, j = 0; i < __glXNumFBConfigs;
+         i++, j += (__glXNumActiveScreens + 1)) {
+        if (__glXFBConfigs[j]->associatedVisualId == vid)
+            return __glXFBConfigs[j];
+    }
 
-   return NULL;
+    return NULL;
 }
 
-static __GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen )
+static __GLXFBConfig *
+glxLookupBackEndFBConfig(GLXFBConfigID id, int screen)
 {
-   int i;
-   int j;
+    int i;
+    int j;
 
-   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
-      if ( __glXFBConfigs[j]->id == id)
-	 return __glXFBConfigs[j+screen+1];
-   }
+    for (i = 0, j = 0; i < __glXNumFBConfigs;
+         i++, j += (__glXNumActiveScreens + 1)) {
+        if (__glXFBConfigs[j]->id == id)
+            return __glXFBConfigs[j + screen + 1];
+    }
 
-   return NULL;
+    return NULL;
 
 }
 
-Display *GetBackEndDisplay( __GLXclientState *cl, int s )
+Display *
+GetBackEndDisplay(__GLXclientState * cl, int s)
 {
-   if (! cl->be_displays[s] ) {
-      cl->be_displays[s] = XOpenDisplay( DisplayString(dmxScreens[s].beDisplay) );
-   }
-   return cl->be_displays[s];
+    if (!cl->be_displays[s]) {
+        cl->be_displays[s] =
+            XOpenDisplay(DisplayString(dmxScreens[s].beDisplay));
+    }
+    return cl->be_displays[s];
 }
 
 /*
 ** Create a GL context with the given properties.
 */
-static int CreateContext(__GLXclientState *cl, 
-                         GLXContextID gcId,
-			 VisualID vid, GLXFBConfigID fbconfigId,
-			 int screen,
-			 GLXContextID shareList,
-			 int isDirect )
+static int
+CreateContext(__GLXclientState * cl,
+              GLXContextID gcId,
+              VisualID vid, GLXFBConfigID fbconfigId,
+              int screen, GLXContextID shareList, int isDirect)
 {
     ClientPtr client = cl->client;
     xGLXCreateContextReq *be_req;
@@ -142,20 +149,19 @@ static int CreateContext(__GLXclientState *cl,
     GLXFBConfigID be_fbconfigId = 0;
     int num_be_screens;
     Display *dpy;
-    
+
     /*
-    ** Check if screen exists.
-    */
+     ** Check if screen exists.
+     */
     if (screen >= screenInfo.numScreens) {
-	client->errorValue = screen;
-	return BadValue;
+        client->errorValue = screen;
+        return BadValue;
     }
 
-
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
@@ -164,87 +170,88 @@ static int CreateContext(__GLXclientState *cl,
      **
      */
     if (shareList == None) {
-       shareglxc = NULL;
-    } else {
-       dixLookupResourceByType((pointer*) &shareglxc, shareList,
-                               __glXContextRes, NullClient, DixUnknownAccess);
-       if (!shareglxc) {
-	  client->errorValue = shareList;
-	  return __glXBadContext;
-       }
+        shareglxc = NULL;
+    }
+    else {
+        dixLookupResourceByType((pointer *) &shareglxc, shareList,
+                                __glXContextRes, NullClient, DixUnknownAccess);
+        if (!shareglxc) {
+            client->errorValue = shareList;
+            return __glXBadContext;
+        }
     }
 
     /*
-    ** Allocate memory for the new context
-    */
+     ** Allocate memory for the new context
+     */
     glxc = calloc(1, sizeof(__GLXcontext));
     if (!glxc) {
-	return BadAlloc;
+        return BadAlloc;
     }
 
     pScreen = screenInfo.screens[screen];
     pGlxScreen = &__glXActiveScreens[screen];
 
     if (fbconfigId != None) {
-       glxc->pFBConfig = glxLookupFBConfig( fbconfigId );
-       if (!glxc->pFBConfig) {
-	  client->errorValue = fbconfigId;
-	  free( glxc );
-	  return BadValue;
-       }
-       visual = glxc->pFBConfig->associatedVisualId;
+        glxc->pFBConfig = glxLookupFBConfig(fbconfigId);
+        if (!glxc->pFBConfig) {
+            client->errorValue = fbconfigId;
+            free(glxc);
+            return BadValue;
+        }
+        visual = glxc->pFBConfig->associatedVisualId;
     }
     else {
-       glxc->pFBConfig = NULL;
+        glxc->pFBConfig = NULL;
     }
 
     if (visual != None) {
-       /*
-	** Check if the visual ID is valid for this screen.
-	*/
-       pVisual = pScreen->visuals;
-       for (i = 0; i < pScreen->numVisuals; i++, pVisual++) {
-	  if (pVisual->vid == visual) {
-	     break;
-	  }
-       }
-       if (i == pScreen->numVisuals) {
-	  client->errorValue = visual;
-	  free( glxc );
-	  return BadValue;
-       }
-
-       pGlxVisual = pGlxScreen->pGlxVisual;
-       for (i = 0; i < pGlxScreen->numVisuals; i++, pGlxVisual++) {
-	  if (pGlxVisual->vid == visual) {
-	     break;
-	  }
-       }
-       if (i == pGlxScreen->numVisuals) {
-	  /*
-	   ** Visual not support on this screen by this OpenGL implementation.
-	   */
-	  client->errorValue = visual;
-	  free( glxc );
-	  return BadValue;
-       }
-
-       if ( glxc->pFBConfig == NULL ) {
-	   glxc->pFBConfig = glxLookupFBConfigByVID( visual );
-
-	   if ( glxc->pFBConfig == NULL ) {
-	      /*
-               * visual does not have an FBConfig ???
-	      client->errorValue = visual;
-	      free( glxc );
-	      return BadValue;
-	       */
-	   }
-       }
+        /*
+         ** Check if the visual ID is valid for this screen.
+         */
+        pVisual = pScreen->visuals;
+        for (i = 0; i < pScreen->numVisuals; i++, pVisual++) {
+            if (pVisual->vid == visual) {
+                break;
+            }
+        }
+        if (i == pScreen->numVisuals) {
+            client->errorValue = visual;
+            free(glxc);
+            return BadValue;
+        }
+
+        pGlxVisual = pGlxScreen->pGlxVisual;
+        for (i = 0; i < pGlxScreen->numVisuals; i++, pGlxVisual++) {
+            if (pGlxVisual->vid == visual) {
+                break;
+            }
+        }
+        if (i == pGlxScreen->numVisuals) {
+            /*
+             ** Visual not support on this screen by this OpenGL implementation.
+             */
+            client->errorValue = visual;
+            free(glxc);
+            return BadValue;
+        }
+
+        if (glxc->pFBConfig == NULL) {
+            glxc->pFBConfig = glxLookupFBConfigByVID(visual);
+
+            if (glxc->pFBConfig == NULL) {
+                /*
+                 * visual does not have an FBConfig ???
+                 client->errorValue = visual;
+                 free( glxc );
+                 return BadValue;
+                 */
+            }
+        }
     }
     else {
-       pVisual = NULL;
-       pGlxVisual = NULL;
+        pVisual = NULL;
+        pGlxVisual = NULL;
     }
 
     glxc->pScreen = pScreen;
@@ -256,140 +263,152 @@ static int CreateContext(__GLXclientState *cl,
      * allocate memory for back-end servers info
      */
     num_be_screens = to_screen - from_screen + 1;
-    glxc->real_ids = (XID *)malloc(sizeof(XID) * num_be_screens);
+    glxc->real_ids = (XID *) malloc(sizeof(XID) * num_be_screens);
     if (!glxc->real_ids) {
-	return BadAlloc;
+        return BadAlloc;
     }
-    glxc->real_vids = (XID *)malloc(sizeof(XID) * num_be_screens);
+    glxc->real_vids = (XID *) malloc(sizeof(XID) * num_be_screens);
     if (!glxc->real_vids) {
-	return BadAlloc;
+        return BadAlloc;
     }
 
     for (screen = from_screen; screen <= to_screen; screen++) {
-       int sent = 0;
-       pScreen = screenInfo.screens[screen];
-       pGlxScreen = &__glXActiveScreens[screen];
-       dmxScreen = &dmxScreens[screen];
-
-       if (glxc->pFBConfig) {
-	  __GLXFBConfig *beFBConfig = glxLookupBackEndFBConfig( glxc->pFBConfig->id, 
-		                                                screen );
-	  be_fbconfigId = beFBConfig->id;
-       }
-
-       if (pGlxVisual) {
-
-	  be_vid = glxMatchGLXVisualInConfigList( pGlxVisual,
-	                                    dmxScreen->glxVisuals,
-					    dmxScreen->numGlxVisuals  );
-
-	  if (!be_vid) {
-	     /* visual is not supported on the back-end server */
-	     free( glxc->real_ids );
-	     free( glxc->real_vids );
-	     free( glxc );
-	     return BadValue;
-	  }
-       }
-
-       glxc->real_ids[screen-from_screen] = XAllocID(GetBackEndDisplay(cl,screen));
-
-       /* send the create context request to the back-end server */
-       dpy = GetBackEndDisplay(cl,screen);
-       if (glxc->pFBConfig) {
-	     /*Since for a certain visual both RGB and COLOR INDEX
-	      *can be on then the only parmeter to choose the renderType
-	      * should be the class of the colormap since all 4 first 
-	      * classes does not support RGB mode only COLOR INDEX ,
-	      * and so TrueColor and DirectColor does not support COLOR INDEX*/
-	     int renderType =  glxc->pFBConfig->renderType;  
-	     if ( pVisual ) {
-		 switch ( pVisual->class ){
-		     case PseudoColor:
-                     case StaticColor:
-                     case GrayScale:
-                     case StaticGray:
-                         renderType = GLX_COLOR_INDEX_TYPE;
-                         break;
-                     case TrueColor:
-                     case DirectColor:
-                     default:
-                         renderType = GLX_RGBA_TYPE;
-                     break;
-		 }
-	     }
-	  if ( __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-	     LockDisplay(dpy);
-	     GetReq(GLXCreateNewContext,be_new_req);
-	     be_new_req->reqType = dmxScreen->glxMajorOpcode;
-	     be_new_req->glxCode = X_GLXCreateNewContext;
-	     be_new_req->context = (unsigned int)glxc->real_ids[screen-from_screen];
-	     be_new_req->fbconfig = (unsigned int)be_fbconfigId;
-	     be_new_req->screen = DefaultScreen(dpy);
-	     be_new_req->renderType = renderType;  
-
-	     be_new_req->shareList = (shareglxc ? shareglxc->real_ids[screen-from_screen] : 0);
-	     be_new_req->isDirect = 0;
-	     UnlockDisplay(dpy);
-	     glxc->real_vids[screen-from_screen] = be_fbconfigId;
-	     sent = 1;
-	  }
-	  else if (glxIsExtensionSupported("GLX_SGIX_fbconfig")) {
-
-	     xGLXCreateContextWithConfigSGIXReq *ext_req;
-	     xGLXVendorPrivateReq *vpreq;
-	     LockDisplay(dpy);
-	     GetReqExtra(GLXVendorPrivate,
-		         sz_xGLXCreateContextWithConfigSGIXReq - sz_xGLXVendorPrivateReq,
-			vpreq);
-	     ext_req = (xGLXCreateContextWithConfigSGIXReq *)vpreq;
-	     ext_req->reqType = dmxScreen->glxMajorOpcode;
-	     ext_req->glxCode = X_GLXVendorPrivate;
-	     ext_req->vendorCode = X_GLXvop_CreateContextWithConfigSGIX;
-	     ext_req->context = (unsigned int)glxc->real_ids[screen-from_screen];
-	     ext_req->fbconfig = (unsigned int)be_fbconfigId;
-	     ext_req->screen = DefaultScreen(dpy);
-	     ext_req->renderType = renderType;  
-	     ext_req->shareList = (shareglxc ? shareglxc->real_ids[screen-from_screen] : 0);
-	     ext_req->isDirect = 0;
-	     UnlockDisplay(dpy);
-	     glxc->real_vids[screen-from_screen] = be_fbconfigId;
-	     sent = 1;
-	  }
-       }
-
-       if (!sent) {
-	  LockDisplay(dpy);
-	  GetReq(GLXCreateContext,be_req);
-	  be_req->reqType = dmxScreen->glxMajorOpcode;
-	  be_req->glxCode = X_GLXCreateContext;
-	  be_req->context = (unsigned int)glxc->real_ids[screen-from_screen];
-	  be_req->visual = (unsigned int)be_vid;
-	  be_req->screen = DefaultScreen(dpy);
-	  be_req->shareList = (shareglxc ? shareglxc->real_ids[screen-from_screen] : 0);
-	  be_req->isDirect = 0;
-	  UnlockDisplay(dpy);
-	  glxc->real_vids[screen-from_screen] = be_vid;
-       }
-       SyncHandle();
+        int sent = 0;
+
+        pScreen = screenInfo.screens[screen];
+        pGlxScreen = &__glXActiveScreens[screen];
+        dmxScreen = &dmxScreens[screen];
+
+        if (glxc->pFBConfig) {
+            __GLXFBConfig *beFBConfig =
+                glxLookupBackEndFBConfig(glxc->pFBConfig->id,
+                                         screen);
+
+            be_fbconfigId = beFBConfig->id;
+        }
+
+        if (pGlxVisual) {
+
+            be_vid = glxMatchGLXVisualInConfigList(pGlxVisual,
+                                                   dmxScreen->glxVisuals,
+                                                   dmxScreen->numGlxVisuals);
+
+            if (!be_vid) {
+                /* visual is not supported on the back-end server */
+                free(glxc->real_ids);
+                free(glxc->real_vids);
+                free(glxc);
+                return BadValue;
+            }
+        }
+
+        glxc->real_ids[screen - from_screen] =
+            XAllocID(GetBackEndDisplay(cl, screen));
+
+        /* send the create context request to the back-end server */
+        dpy = GetBackEndDisplay(cl, screen);
+        if (glxc->pFBConfig) {
+            /*Since for a certain visual both RGB and COLOR INDEX
+             *can be on then the only parmeter to choose the renderType
+             * should be the class of the colormap since all 4 first 
+             * classes does not support RGB mode only COLOR INDEX ,
+             * and so TrueColor and DirectColor does not support COLOR INDEX*/
+            int renderType = glxc->pFBConfig->renderType;
+
+            if (pVisual) {
+                switch (pVisual->class) {
+                case PseudoColor:
+                case StaticColor:
+                case GrayScale:
+                case StaticGray:
+                    renderType = GLX_COLOR_INDEX_TYPE;
+                    break;
+                case TrueColor:
+                case DirectColor:
+                default:
+                    renderType = GLX_RGBA_TYPE;
+                    break;
+                }
+            }
+            if (__GLX_IS_VERSION_SUPPORTED(1, 3)) {
+                LockDisplay(dpy);
+                GetReq(GLXCreateNewContext, be_new_req);
+                be_new_req->reqType = dmxScreen->glxMajorOpcode;
+                be_new_req->glxCode = X_GLXCreateNewContext;
+                be_new_req->context =
+                    (unsigned int) glxc->real_ids[screen - from_screen];
+                be_new_req->fbconfig = (unsigned int) be_fbconfigId;
+                be_new_req->screen = DefaultScreen(dpy);
+                be_new_req->renderType = renderType;
+
+                be_new_req->shareList =
+                    (shareglxc ? shareglxc->real_ids[screen - from_screen] : 0);
+                be_new_req->isDirect = 0;
+                UnlockDisplay(dpy);
+                glxc->real_vids[screen - from_screen] = be_fbconfigId;
+                sent = 1;
+            }
+            else if (glxIsExtensionSupported("GLX_SGIX_fbconfig")) {
+
+                xGLXCreateContextWithConfigSGIXReq *ext_req;
+                xGLXVendorPrivateReq *vpreq;
+
+                LockDisplay(dpy);
+                GetReqExtra(GLXVendorPrivate,
+                            sz_xGLXCreateContextWithConfigSGIXReq -
+                            sz_xGLXVendorPrivateReq, vpreq);
+                ext_req = (xGLXCreateContextWithConfigSGIXReq *) vpreq;
+                ext_req->reqType = dmxScreen->glxMajorOpcode;
+                ext_req->glxCode = X_GLXVendorPrivate;
+                ext_req->vendorCode = X_GLXvop_CreateContextWithConfigSGIX;
+                ext_req->context =
+                    (unsigned int) glxc->real_ids[screen - from_screen];
+                ext_req->fbconfig = (unsigned int) be_fbconfigId;
+                ext_req->screen = DefaultScreen(dpy);
+                ext_req->renderType = renderType;
+                ext_req->shareList =
+                    (shareglxc ? shareglxc->real_ids[screen - from_screen] : 0);
+                ext_req->isDirect = 0;
+                UnlockDisplay(dpy);
+                glxc->real_vids[screen - from_screen] = be_fbconfigId;
+                sent = 1;
+            }
+        }
+
+        if (!sent) {
+            LockDisplay(dpy);
+            GetReq(GLXCreateContext, be_req);
+            be_req->reqType = dmxScreen->glxMajorOpcode;
+            be_req->glxCode = X_GLXCreateContext;
+            be_req->context =
+                (unsigned int) glxc->real_ids[screen - from_screen];
+            be_req->visual = (unsigned int) be_vid;
+            be_req->screen = DefaultScreen(dpy);
+            be_req->shareList =
+                (shareglxc ? shareglxc->real_ids[screen - from_screen] : 0);
+            be_req->isDirect = 0;
+            UnlockDisplay(dpy);
+            glxc->real_vids[screen - from_screen] = be_vid;
+        }
+        SyncHandle();
 
     }
 
     /*
-    ** Register this context as a resource.
-    */
-    if (!AddResource(gcId, __glXContextRes, (pointer)glxc)) {
-       free( glxc->real_ids );
-       free( glxc->real_vids );
-       free( glxc );
-	client->errorValue = gcId;
-	return BadAlloc;
-    }
-    
+     ** Register this context as a resource.
+     */
+    if (!AddResource(gcId, __glXContextRes, (pointer) glxc)) {
+        free(glxc->real_ids);
+        free(glxc->real_vids);
+        free(glxc);
+        client->errorValue = gcId;
+        return BadAlloc;
+    }
+
     /*
-    ** Finally, now that everything is working, setup the rest of the
-    ** context.
-    */
+     ** Finally, now that everything is working, setup the rest of the
+     ** context.
+     */
     glxc->id = gcId;
     glxc->share_id = shareList;
     glxc->idExists = GL_TRUE;
@@ -398,38 +417,43 @@ static int CreateContext(__GLXclientState *cl,
     return Success;
 }
 
-int __glXCreateContext(__GLXclientState *cl, GLbyte *pc)
+int
+__glXCreateContext(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXCreateContextReq *req = (xGLXCreateContextReq *) pc;
 
-    return( CreateContext(cl, req->context,req->visual, None,
-	                  req->screen, req->shareList, req->isDirect) );
+    return (CreateContext(cl, req->context, req->visual, None,
+                          req->screen, req->shareList, req->isDirect));
 
 }
 
-int __glXCreateNewContext(__GLXclientState *cl, GLbyte *pc)
+int
+__glXCreateNewContext(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXCreateNewContextReq *req = (xGLXCreateNewContextReq *) pc;
 
-    return( CreateContext(cl, req->context,None, req->fbconfig,
-	                  req->screen, req->shareList, req->isDirect) );
+    return (CreateContext(cl, req->context, None, req->fbconfig,
+                          req->screen, req->shareList, req->isDirect));
 
 }
 
-int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXCreateContextWithConfigSGIX(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXCreateContextWithConfigSGIXReq *req = (xGLXCreateContextWithConfigSGIXReq *) pc;
+    xGLXCreateContextWithConfigSGIXReq *req =
+        (xGLXCreateContextWithConfigSGIXReq *) pc;
 
-    return( CreateContext(cl, req->context, None, req->fbconfig,
-	                  req->screen, req->shareList, req->isDirect) );
+    return (CreateContext(cl, req->context, None, req->fbconfig,
+                          req->screen, req->shareList, req->isDirect));
 
 }
 
-int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXQueryMaxSwapBarriersSGIX(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXQueryMaxSwapBarriersSGIXReq *req =
-	(xGLXQueryMaxSwapBarriersSGIXReq *)pc;
+        (xGLXQueryMaxSwapBarriersSGIXReq *) pc;
     xGLXQueryMaxSwapBarriersSGIXReply reply;
 
     reply.type = X_Reply;
@@ -438,19 +462,21 @@ int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc)
     reply.max = QueryMaxSwapBarriersSGIX(req->screen);
 
     if (client->swapped) {
-	__glXSwapQueryMaxSwapBarriersSGIXReply(client, &reply);
-    } else {
-	WriteToClient(client, sz_xGLXQueryMaxSwapBarriersSGIXReply,
-		      (char *)&reply);
+        __glXSwapQueryMaxSwapBarriersSGIXReply(client, &reply);
+    }
+    else {
+        WriteToClient(client, sz_xGLXQueryMaxSwapBarriersSGIXReply,
+                      (char *) &reply);
     }
 
     return Success;
 }
 
-int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXBindSwapBarrierSGIX(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
-    xGLXBindSwapBarrierSGIXReq *req = (xGLXBindSwapBarrierSGIXReq *)pc;
+    xGLXBindSwapBarrierSGIXReq *req = (xGLXBindSwapBarrierSGIXReq *) pc;
     DrawablePtr pDraw;
     __GLXpixmap *pGlxPixmap = NULL;
     __glXWindow *pGlxWindow = NULL;
@@ -458,29 +484,32 @@ int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc)
 
     rc = dixLookupDrawable(&pDraw, req->drawable, client, 0, DixGetAttrAccess);
     if (rc != Success) {
-	dixLookupResourceByType((pointer*) &pGlxPixmap, req->drawable,
-				__glXPixmapRes, NullClient, DixUnknownAccess);
-	if (pGlxPixmap) pDraw = pGlxPixmap->pDraw;
+        dixLookupResourceByType((pointer *) &pGlxPixmap, req->drawable,
+                                __glXPixmapRes, NullClient, DixUnknownAccess);
+        if (pGlxPixmap)
+            pDraw = pGlxPixmap->pDraw;
     }
 
-    if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-       dixLookupResourceByType((pointer*) &pGlxWindow, req->drawable,
-                               __glXWindowRes, NullClient, DixUnknownAccess);
-       if (pGlxWindow) pDraw = pGlxWindow->pDraw;
+    if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
+        dixLookupResourceByType((pointer *) &pGlxWindow, req->drawable,
+                                __glXWindowRes, NullClient, DixUnknownAccess);
+        if (pGlxWindow)
+            pDraw = pGlxWindow->pDraw;
     }
 
     if (!pDraw) {
-       client->errorValue = req->drawable;
-       return __glXBadDrawable;
+        client->errorValue = req->drawable;
+        return __glXBadDrawable;
     }
 
     return BindSwapBarrierSGIX(pDraw, req->barrier);
 }
 
-int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
-    xGLXJoinSwapGroupSGIXReq *req = (xGLXJoinSwapGroupSGIXReq *)pc;
+    xGLXJoinSwapGroupSGIXReq *req = (xGLXJoinSwapGroupSGIXReq *) pc;
     DrawablePtr pDraw, pMember = NULL;
     __GLXpixmap *pGlxPixmap = NULL;
     __glXWindow *pGlxWindow = NULL;
@@ -488,53 +517,57 @@ int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc)
 
     rc = dixLookupDrawable(&pDraw, req->drawable, client, 0, DixManageAccess);
     if (rc != Success) {
-	dixLookupResourceByType((pointer*) &pGlxPixmap, req->drawable,
-				__glXPixmapRes, NullClient, DixUnknownAccess);
-	if (pGlxPixmap) pDraw = pGlxPixmap->pDraw;
+        dixLookupResourceByType((pointer *) &pGlxPixmap, req->drawable,
+                                __glXPixmapRes, NullClient, DixUnknownAccess);
+        if (pGlxPixmap)
+            pDraw = pGlxPixmap->pDraw;
     }
 
-    if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-       dixLookupResourceByType((pointer*) &pGlxWindow, req->drawable,
-                               __glXWindowRes, NullClient, DixUnknownAccess);
-       if (pGlxWindow) pDraw = pGlxWindow->pDraw;
+    if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
+        dixLookupResourceByType((pointer *) &pGlxWindow, req->drawable,
+                                __glXWindowRes, NullClient, DixUnknownAccess);
+        if (pGlxWindow)
+            pDraw = pGlxWindow->pDraw;
     }
 
     if (!pDraw) {
-       client->errorValue = req->drawable;
-       return __glXBadDrawable;
+        client->errorValue = req->drawable;
+        return __glXBadDrawable;
     }
 
     if (req->member != None) {
-	rc = dixLookupDrawable(&pMember, req->member, client, 0,
-			       DixGetAttrAccess);
-	if (rc != Success) {
-	    dixLookupResourceByType((pointer*) &pGlxPixmap, req->member,
+        rc = dixLookupDrawable(&pMember, req->member, client, 0,
+                               DixGetAttrAccess);
+        if (rc != Success) {
+            dixLookupResourceByType((pointer *) &pGlxPixmap, req->member,
                                     __glXPixmapRes, NullClient,
                                     DixUnknownAccess);
-	    if (pGlxPixmap) pMember = pGlxPixmap->pDraw;
-	}
+            if (pGlxPixmap)
+                pMember = pGlxPixmap->pDraw;
+        }
 
-	if (!pMember && __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-	    dixLookupResourceByType((pointer*) &pGlxWindow, req->member,
+        if (!pMember && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
+            dixLookupResourceByType((pointer *) &pGlxWindow, req->member,
                                     __glXWindowRes, NullClient,
                                     DixUnknownAccess);
-	    if (pGlxWindow) pMember = pGlxWindow->pDraw;
-	}
+            if (pGlxWindow)
+                pMember = pGlxWindow->pDraw;
+        }
 
-	if (!pMember) {
-	    client->errorValue = req->member;
-	    return __glXBadDrawable;
-	}
+        if (!pMember) {
+            client->errorValue = req->member;
+            return __glXBadDrawable;
+        }
     }
 
     return JoinSwapGroupSGIX(pDraw, pMember);
 }
 
-
 /*
 ** Destroy a GL context as an X resource.
 */
-int __glXDestroyContext(__GLXclientState *cl, GLbyte *pc)
+int
+__glXDestroyContext(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXDestroyContextReq *req = (xGLXDestroyContextReq *) pc;
@@ -544,46 +577,47 @@ int __glXDestroyContext(__GLXclientState *cl, GLbyte *pc)
     int from_screen = 0;
     int to_screen = 0;
     int s;
-    
-    dixLookupResourceByType((pointer*) &glxc, gcId, __glXContextRes,
-			    NullClient, DixUnknownAccess);
+
+    dixLookupResourceByType((pointer *) &glxc, gcId, __glXContextRes,
+                            NullClient, DixUnknownAccess);
     if (glxc) {
-	/*
-	** Just free the resource; don't actually destroy the context,
-	** because it might be in use.  The
-	** destroy method will be called by the resource destruction routine
-	** if necessary.
-	*/
-	FreeResourceByType(gcId, __glXContextRes, FALSE);
+        /*
+         ** Just free the resource; don't actually destroy the context,
+         ** because it might be in use.  The
+         ** destroy method will be called by the resource destruction routine
+         ** if necessary.
+         */
+        FreeResourceByType(gcId, __glXContextRes, FALSE);
 
-	from_screen = to_screen = glxc->pScreen->myNum;
+        from_screen = to_screen = glxc->pScreen->myNum;
 
-    } else {
-	client->errorValue = gcId;
-	return __glXBadContext;
+    }
+    else {
+        client->errorValue = gcId;
+        return __glXBadContext;
     }
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
     /*
      * send DestroyContext request to all back-end servers
      */
-    for (s=from_screen; s<=to_screen; s++) {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
 
-       LockDisplay(dpy);
-       GetReq(GLXDestroyContext,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = X_GLXDestroyContext;
-       be_req->context = glxc->real_ids[s-from_screen];
-       UnlockDisplay(dpy);
-       SyncHandle();
+        LockDisplay(dpy);
+        GetReq(GLXDestroyContext, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = X_GLXDestroyContext;
+        be_req->context = glxc->real_ids[s - from_screen];
+        UnlockDisplay(dpy);
+        SyncHandle();
     }
 
     return Success;
@@ -600,83 +634,97 @@ int __glXDestroyContext(__GLXclientState *cl, GLbyte *pc)
 /*
 ** Add a current context, and return the tag that will be used to refer to it.
 */
-static int AddCurrentContext(__GLXclientState *cl, __GLXcontext *glxc, DrawablePtr pDraw)
+static int
+AddCurrentContext(__GLXclientState * cl, __GLXcontext * glxc, DrawablePtr pDraw)
 {
     int i;
     int num = cl->numCurrentContexts;
     __GLXcontext **table = cl->currentContexts;
 
-    if (!glxc) return -1;
-    
+    if (!glxc)
+        return -1;
+
     /*
-    ** Try to find an empty slot and use it.
-    */
-    for (i=0; i < num; i++) {
-	if (!table[i]) {
-	    table[i] = glxc;
-	    return i+1;
-	}
+     ** Try to find an empty slot and use it.
+     */
+    for (i = 0; i < num; i++) {
+        if (!table[i]) {
+            table[i] = glxc;
+            return i + 1;
+        }
     }
     /*
-    ** Didn't find a free slot, so we'll have to grow the table.
-    */
+     ** Didn't find a free slot, so we'll have to grow the table.
+     */
     if (!num) {
-	table = (__GLXcontext **) malloc(sizeof(__GLXcontext *));
-	cl->currentDrawables = (DrawablePtr *) malloc(sizeof(DrawablePtr));
-	cl->be_currentCTag = (GLXContextTag *) malloc(screenInfo.numScreens *sizeof(GLXContextTag));
-    } else {
-	table = (__GLXcontext **) realloc(table,
-					   (num+1)*sizeof(__GLXcontext *));
-	cl->currentDrawables = (DrawablePtr *) realloc(
-	                                          cl->currentDrawables ,
-						  (num+1)*sizeof(DrawablePtr));
-	cl->be_currentCTag = (GLXContextTag *) realloc(cl->be_currentCTag,
-	            (num+1)*screenInfo.numScreens*sizeof(GLXContextTag));
+        table = (__GLXcontext **) malloc(sizeof(__GLXcontext *));
+        cl->currentDrawables = (DrawablePtr *) malloc(sizeof(DrawablePtr));
+        cl->be_currentCTag =
+            (GLXContextTag *) malloc(screenInfo.numScreens *
+                                     sizeof(GLXContextTag));
+    }
+    else {
+        table = (__GLXcontext **) realloc(table,
+                                          (num + 1) * sizeof(__GLXcontext *));
+        cl->currentDrawables = (DrawablePtr *) realloc(cl->currentDrawables,
+                                                       (num +
+                                                        1) *
+                                                       sizeof(DrawablePtr));
+        cl->be_currentCTag =
+            (GLXContextTag *) realloc(cl->be_currentCTag,
+                                      (num +
+                                       1) * screenInfo.numScreens *
+                                      sizeof(GLXContextTag));
     }
     table[num] = glxc;
     cl->currentDrawables[num] = pDraw;
     cl->currentContexts = table;
     cl->numCurrentContexts++;
 
-    memset(cl->be_currentCTag + num*screenInfo.numScreens, 0, 
-	         screenInfo.numScreens * sizeof(GLXContextTag));
+    memset(cl->be_currentCTag + num * screenInfo.numScreens, 0,
+           screenInfo.numScreens * sizeof(GLXContextTag));
 
-    return num+1;
+    return num + 1;
 }
 
 /*
 ** Given a tag, change the current context for the corresponding entry.
 */
-static void ChangeCurrentContext(__GLXclientState *cl, __GLXcontext *glxc,
-				GLXContextTag tag)
+static void
+ChangeCurrentContext(__GLXclientState * cl, __GLXcontext * glxc,
+                     GLXContextTag tag)
 {
     __GLXcontext **table = cl->currentContexts;
-    table[tag-1] = glxc;
+
+    table[tag - 1] = glxc;
 }
 
 /*
 ** Given a tag, and back-end screen number, retrives the current back-end
 ** tag.
 */
-int GetCurrentBackEndTag(__GLXclientState *cl, GLXContextTag tag, int s)
+int
+GetCurrentBackEndTag(__GLXclientState * cl, GLXContextTag tag, int s)
 {
-   if (tag >0) {
-      return( cl->be_currentCTag[ (tag-1)*screenInfo.numScreens + s ] );
-   }
-   else {
-      return 0;
-   }
+    if (tag > 0) {
+        return (cl->be_currentCTag[(tag - 1) * screenInfo.numScreens + s]);
+    }
+    else {
+        return 0;
+    }
 }
 
 /*
 ** Given a tag, and back-end screen number, sets the current back-end
 ** tag.
 */
-static void SetCurrentBackEndTag(__GLXclientState *cl, GLXContextTag tag, int s, GLXContextTag be_tag)
+static void
+SetCurrentBackEndTag(__GLXclientState * cl, GLXContextTag tag, int s,
+                     GLXContextTag be_tag)
 {
-   if (tag >0) {
-      cl->be_currentCTag[ (tag-1)*screenInfo.numScreens + s ] = be_tag;
-   }
+    if (tag > 0) {
+        cl->be_currentCTag[(tag - 1) * screenInfo.numScreens + s] = be_tag;
+    }
 }
 
 /*
@@ -684,45 +732,51 @@ static void SetCurrentBackEndTag(__GLXclientState *cl, GLXContextTag tag, int s,
 ** context's entry in the table as the context tag.  A tag must be greater
 ** than 0.
 */
-__GLXcontext *__glXLookupContextByTag(__GLXclientState *cl, GLXContextTag tag)
+__GLXcontext *
+__glXLookupContextByTag(__GLXclientState * cl, GLXContextTag tag)
 {
     int num = cl->numCurrentContexts;
 
     if (tag < 1 || tag > num) {
-	return 0;
-    } else {
-	return cl->currentContexts[tag-1];
+        return 0;
+    }
+    else {
+        return cl->currentContexts[tag - 1];
     }
 }
 
-DrawablePtr __glXLookupDrawableByTag(__GLXclientState *cl, GLXContextTag tag)
+DrawablePtr
+__glXLookupDrawableByTag(__GLXclientState * cl, GLXContextTag tag)
 {
     int num = cl->numCurrentContexts;
 
     if (tag < 1 || tag > num) {
-	return 0;
-    } else {
-	return cl->currentDrawables[tag-1];
+        return 0;
+    }
+    else {
+        return cl->currentDrawables[tag - 1];
     }
 }
 
 /*****************************************************************************/
 
-static void StopUsingContext(__GLXcontext *glxc)
+static void
+StopUsingContext(__GLXcontext * glxc)
 {
     if (glxc) {
-	if (glxc == __glXLastContext) {
-	    /* Tell server GL library */
-	    __glXLastContext = 0;
-	}
-	glxc->isCurrent = GL_FALSE;
-	if (!glxc->idExists) {
-	    __glXFreeContext(glxc);
-	}
+        if (glxc == __glXLastContext) {
+            /* Tell server GL library */
+            __glXLastContext = 0;
+        }
+        glxc->isCurrent = GL_FALSE;
+        if (!glxc->idExists) {
+            __glXFreeContext(glxc);
+        }
     }
 }
 
-static void StartUsingContext(__GLXclientState *cl, __GLXcontext *glxc)
+static void
+StartUsingContext(__GLXclientState * cl, __GLXcontext * glxc)
 {
     glxc->isCurrent = GL_TRUE;
 }
@@ -731,11 +785,11 @@ static void StartUsingContext(__GLXclientState *cl, __GLXcontext *glxc)
 /*
 ** Make an OpenGL context and drawable current.
 */
-static int MakeCurrent(__GLXclientState *cl,
-                       GLXDrawable drawable,
-                       GLXDrawable readdrawable,
-		       GLXContextID context,
-		       GLXContextTag oldContextTag)
+static int
+MakeCurrent(__GLXclientState * cl,
+            GLXDrawable drawable,
+            GLXDrawable readdrawable,
+            GLXContextID context, GLXContextTag oldContextTag)
 {
     ClientPtr client = cl->client;
     DrawablePtr pDraw = NULL;
@@ -758,6 +812,7 @@ static int MakeCurrent(__GLXclientState *cl,
     __glXWindow *pGlxReadWindow = NULL;
     __glXPbuffer *pGlxPbuffer = NULL;
     __glXPbuffer *pGlxReadPbuffer = NULL;
+
 #ifdef PANORAMIX
     PanoramiXRes *pXinDraw = NULL;
     PanoramiXRes *pXinReadDraw = NULL;
@@ -767,117 +822,122 @@ static int MakeCurrent(__GLXclientState *cl,
     int s, rc;
 
     /*
-    ** If one is None and the other isn't, it's a bad match.
-    */
+     ** If one is None and the other isn't, it's a bad match.
+     */
     if ((drawId == None && contextId != None) ||
-	(drawId != None && contextId == None)) {
-	return BadMatch;
+        (drawId != None && contextId == None)) {
+        return BadMatch;
     }
-    
+
     /*
-    ** Lookup old context.  If we have one, it must be in a usable state.
-    */
+     ** Lookup old context.  If we have one, it must be in a usable state.
+     */
     if (tag != 0) {
-	prevglxc = __glXLookupContextByTag(cl, tag);
-	if (!prevglxc) {
-	    /*
-	    ** Tag for previous context is invalid.
-	    */
-	    return __glXBadContextTag;
-	}
-    } else {
-	prevglxc = 0;
+        prevglxc = __glXLookupContextByTag(cl, tag);
+        if (!prevglxc) {
+            /*
+             ** Tag for previous context is invalid.
+             */
+            return __glXBadContextTag;
+        }
+    }
+    else {
+        prevglxc = 0;
     }
 
     /*
-    ** Lookup new context.  It must not be current for someone else.
-    */
+     ** Lookup new context.  It must not be current for someone else.
+     */
     if (contextId != None) {
-	dixLookupResourceByType((pointer*) &glxc, contextId, __glXContextRes,
-				NullClient, DixUnknownAccess);
-	if (!glxc) {
-	    client->errorValue = contextId;
-	    return __glXBadContext;
-	}
-	if ((glxc != prevglxc) && glxc->isCurrent) {
-	    /* Context is current to somebody else */
-	    return BadAccess;
-	}
-    } else {
-	/* Switching to no context.  Ignore new drawable. */
-	glxc = 0;
+        dixLookupResourceByType((pointer *) &glxc, contextId, __glXContextRes,
+                                NullClient, DixUnknownAccess);
+        if (!glxc) {
+            client->errorValue = contextId;
+            return __glXBadContext;
+        }
+        if ((glxc != prevglxc) && glxc->isCurrent) {
+            /* Context is current to somebody else */
+            return BadAccess;
+        }
+    }
+    else {
+        /* Switching to no context.  Ignore new drawable. */
+        glxc = 0;
     }
 
     if (drawId != None) {
-	rc = dixLookupDrawable(&pDraw, drawId, client, 0, DixWriteAccess);
-	if (rc == Success) {
-	    if (pDraw->type == DRAWABLE_WINDOW) {
-		/*
-		** Drawable is an X Window.
-		*/
-	        VisualID vid;
-		pWin = (WindowPtr)pDraw;
-		vid = wVisual(pWin);
-
-		new_reply.writeVid = (glxc->pFBConfig ? glxc->pFBConfig->id : vid);
-		new_reply.writeType = GLX_WINDOW_TYPE;
-
-		/*
-		** Check if window and context are similar.
-		*/
-		if ((vid != glxc->pVisual->vid) ||
-		    (pWin->drawable.pScreen != glxc->pScreen)) {
-		    client->errorValue = drawId;
-		    return BadMatch;
-		}
-
-		from_screen = to_screen = pWin->drawable.pScreen->myNum;
-
-	    } else {
-		/*
-		** An X Pixmap is not allowed as a parameter (a GLX Pixmap
-		** is, but it must first be created with glxCreateGLXPixmap).
-		*/
-		client->errorValue = drawId;
-		return __glXBadDrawable;
-	    }
-	}
+        rc = dixLookupDrawable(&pDraw, drawId, client, 0, DixWriteAccess);
+        if (rc == Success) {
+            if (pDraw->type == DRAWABLE_WINDOW) {
+                /*
+                 ** Drawable is an X Window.
+                 */
+                VisualID vid;
+
+                pWin = (WindowPtr) pDraw;
+                vid = wVisual(pWin);
+
+                new_reply.writeVid =
+                    (glxc->pFBConfig ? glxc->pFBConfig->id : vid);
+                new_reply.writeType = GLX_WINDOW_TYPE;
+
+                /*
+                 ** Check if window and context are similar.
+                 */
+                if ((vid != glxc->pVisual->vid) ||
+                    (pWin->drawable.pScreen != glxc->pScreen)) {
+                    client->errorValue = drawId;
+                    return BadMatch;
+                }
+
+                from_screen = to_screen = pWin->drawable.pScreen->myNum;
+
+            }
+            else {
+                /*
+                 ** An X Pixmap is not allowed as a parameter (a GLX Pixmap
+                 ** is, but it must first be created with glxCreateGLXPixmap).
+                 */
+                client->errorValue = drawId;
+                return __glXBadDrawable;
+            }
+        }
 
         if (!pDraw) {
-	    dixLookupResourceByType((pointer*) &pGlxPixmap, drawId,
-				    __glXPixmapRes, NullClient,
-				    DixUnknownAccess);
-	    if (pGlxPixmap) {
-		/*
-		** Check if pixmap and context are similar.
-		*/
-		if (pGlxPixmap->pScreen != glxc->pScreen ||
-		    pGlxPixmap->pGlxVisual != glxc->pGlxVisual) {
-		    client->errorValue = drawId;
-		    return BadMatch;
-		}
-		pDraw = pGlxPixmap->pDraw;
-
-		new_reply.writeVid = (glxc->pFBConfig ? glxc->pFBConfig->id : 
-		                      pGlxPixmap->pGlxVisual->vid);
-
-		new_reply.writeType = GLX_PIXMAP_TYPE;
-
-		from_screen = to_screen = pGlxPixmap->pScreen->myNum;
-
-	    }
-	}
-
-	if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-	   dixLookupResourceByType((pointer*) &pGlxWindow, drawId,
-                                   __glXWindowRes, NullClient,
-                                   DixUnknownAccess);
+            dixLookupResourceByType((pointer *) &pGlxPixmap, drawId,
+                                    __glXPixmapRes, NullClient,
+                                    DixUnknownAccess);
+            if (pGlxPixmap) {
+                /*
+                 ** Check if pixmap and context are similar.
+                 */
+                if (pGlxPixmap->pScreen != glxc->pScreen ||
+                    pGlxPixmap->pGlxVisual != glxc->pGlxVisual) {
+                    client->errorValue = drawId;
+                    return BadMatch;
+                }
+                pDraw = pGlxPixmap->pDraw;
+
+                new_reply.writeVid = (glxc->pFBConfig ? glxc->pFBConfig->id :
+                                      pGlxPixmap->pGlxVisual->vid);
+
+                new_reply.writeType = GLX_PIXMAP_TYPE;
+
+                from_screen = to_screen = pGlxPixmap->pScreen->myNum;
+
+            }
+        }
+
+        if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
+            dixLookupResourceByType((pointer *) &pGlxWindow, drawId,
+                                    __glXWindowRes, NullClient,
+                                    DixUnknownAccess);
             if (pGlxWindow) {
                 /*
-                ** Drawable is a GLXWindow.
-                **
-                ** Check if GLX window and context are similar.
-                */
+                 ** Drawable is a GLXWindow.
+                 **
+                 ** Check if GLX window and context are similar.
+                 */
                 if (pGlxWindow->pScreen != glxc->pScreen ||
                     pGlxWindow->pGlxFBConfig != glxc->pFBConfig) {
                     client->errorValue = drawId;
@@ -889,103 +949,107 @@ static int MakeCurrent(__GLXclientState *cl,
                 new_reply.writeType = GLX_GLXWINDOW_TYPE;
             }
 
-	}
+        }
 
-	if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-	   dixLookupResourceByType((pointer*) &pGlxPbuffer, drawId,
-                                   __glXPbufferRes, NullClient,
-                                   DixUnknownAccess);
-	   if (pGlxPbuffer) {
+        if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
+            dixLookupResourceByType((pointer *) &pGlxPbuffer, drawId,
+                                    __glXPbufferRes, NullClient,
+                                    DixUnknownAccess);
+            if (pGlxPbuffer) {
                 if (pGlxPbuffer->pScreen != glxc->pScreen ||
                     pGlxPbuffer->pFBConfig != glxc->pFBConfig) {
                     client->errorValue = drawId;
                     return BadMatch;
                 }
 
-		pDraw = (DrawablePtr)pGlxPbuffer;
+                pDraw = (DrawablePtr) pGlxPbuffer;
                 new_reply.writeVid = pGlxPbuffer->pFBConfig->id;
                 new_reply.writeType = GLX_PBUFFER_TYPE;
-	   }
-	}
-
-	if (!pDraw) {
-	   /*
-    	    ** Drawable is not a Window , GLXWindow or a GLXPixmap.
-	    */
-	   client->errorValue = drawId;
-	   return __glXBadDrawable;
-	}
-
-    } else {
-	pDraw = 0;
-    }
-
-    if (readId != None && readId != drawId ) {
-	rc = dixLookupDrawable(&pReadDraw, readId, client, 0, DixReadAccess);
-	if (rc == Success) {
-	    if (pReadDraw->type == DRAWABLE_WINDOW) {
-		/*
-		** Drawable is an X Window.
-		*/
-	        VisualID vid;
-		pReadWin = (WindowPtr)pDraw;
-		vid = wVisual(pReadWin);
-
-		new_reply.readVid = (glxc->pFBConfig ? glxc->pFBConfig->id : vid);
-		new_reply.readType = GLX_WINDOW_TYPE;
-
-		/*
-		** Check if window and context are similar.
-		*/
-		if ((vid != glxc->pVisual->vid) ||
-		    (pReadWin->drawable.pScreen != glxc->pScreen)) {
-		    client->errorValue = readId;
-		    return BadMatch;
-		}
-
-	    } else {
-
-		/*
-		** An X Pixmap is not allowed as a parameter (a GLX Pixmap
-		** is, but it must first be created with glxCreateGLXPixmap).
-		*/
-		client->errorValue = readId;
-		return __glXBadDrawable;
-	    }
-	}
-
-	if (!pReadDraw) {
-	    dixLookupResourceByType((pointer*) &pReadGlxPixmap, readId,
-				    __glXPixmapRes, NullClient,
-				    DixUnknownAccess);
-	    if (pReadGlxPixmap) {
-		/*
-		** Check if pixmap and context are similar.
-		*/
-		if (pReadGlxPixmap->pScreen != glxc->pScreen ||
-		    pReadGlxPixmap->pGlxVisual != glxc->pGlxVisual) {
-		    client->errorValue = readId;
-		    return BadMatch;
-		}
-		pReadDraw = pReadGlxPixmap->pDraw;
-
-		new_reply.readVid = (glxc->pFBConfig ? glxc->pFBConfig->id :
-		                     pReadGlxPixmap->pGlxVisual->vid );
-		new_reply.readType = GLX_PIXMAP_TYPE;
-
-	    }
-	}
-
-	if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-	   dixLookupResourceByType((pointer*) &pGlxReadWindow, readId,
-                                   __glXWindowRes, NullClient,
-                                   DixUnknownAccess);
+            }
+        }
+
+        if (!pDraw) {
+            /*
+             ** Drawable is not a Window , GLXWindow or a GLXPixmap.
+             */
+            client->errorValue = drawId;
+            return __glXBadDrawable;
+        }
+
+    }
+    else {
+        pDraw = 0;
+    }
+
+    if (readId != None && readId != drawId) {
+        rc = dixLookupDrawable(&pReadDraw, readId, client, 0, DixReadAccess);
+        if (rc == Success) {
+            if (pReadDraw->type == DRAWABLE_WINDOW) {
+                /*
+                 ** Drawable is an X Window.
+                 */
+                VisualID vid;
+
+                pReadWin = (WindowPtr) pDraw;
+                vid = wVisual(pReadWin);
+
+                new_reply.readVid =
+                    (glxc->pFBConfig ? glxc->pFBConfig->id : vid);
+                new_reply.readType = GLX_WINDOW_TYPE;
+
+                /*
+                 ** Check if window and context are similar.
+                 */
+                if ((vid != glxc->pVisual->vid) ||
+                    (pReadWin->drawable.pScreen != glxc->pScreen)) {
+                    client->errorValue = readId;
+                    return BadMatch;
+                }
+
+            }
+            else {
+
+                /*
+                 ** An X Pixmap is not allowed as a parameter (a GLX Pixmap
+                 ** is, but it must first be created with glxCreateGLXPixmap).
+                 */
+                client->errorValue = readId;
+                return __glXBadDrawable;
+            }
+        }
+
+        if (!pReadDraw) {
+            dixLookupResourceByType((pointer *) &pReadGlxPixmap, readId,
+                                    __glXPixmapRes, NullClient,
+                                    DixUnknownAccess);
+            if (pReadGlxPixmap) {
+                /*
+                 ** Check if pixmap and context are similar.
+                 */
+                if (pReadGlxPixmap->pScreen != glxc->pScreen ||
+                    pReadGlxPixmap->pGlxVisual != glxc->pGlxVisual) {
+                    client->errorValue = readId;
+                    return BadMatch;
+                }
+                pReadDraw = pReadGlxPixmap->pDraw;
+
+                new_reply.readVid = (glxc->pFBConfig ? glxc->pFBConfig->id :
+                                     pReadGlxPixmap->pGlxVisual->vid);
+                new_reply.readType = GLX_PIXMAP_TYPE;
+
+            }
+        }
+
+        if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
+            dixLookupResourceByType((pointer *) &pGlxReadWindow, readId,
+                                    __glXWindowRes, NullClient,
+                                    DixUnknownAccess);
             if (pGlxReadWindow) {
                 /*
-                ** Drawable is a GLXWindow.
-                **
-                ** Check if GLX window and context are similar.
-                */
+                 ** Drawable is a GLXWindow.
+                 **
+                 ** Check if GLX window and context are similar.
+                 */
                 if (pGlxReadWindow->pScreen != glxc->pScreen ||
                     pGlxReadWindow->pGlxFBConfig != glxc->pFBConfig) {
                     client->errorValue = readId;
@@ -996,140 +1060,143 @@ static int MakeCurrent(__GLXclientState *cl,
                 new_reply.readVid = pGlxReadWindow->pGlxFBConfig->id;
                 new_reply.readType = GLX_GLXWINDOW_TYPE;
             }
-	}
+        }
 
-	if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-	   dixLookupResourceByType((pointer*) &pGlxReadPbuffer, readId,
-                                   __glXPbufferRes, NullClient,
-                                   DixUnknownAccess);
-	   if (pGlxReadPbuffer) {
+        if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
+            dixLookupResourceByType((pointer *) &pGlxReadPbuffer, readId,
+                                    __glXPbufferRes, NullClient,
+                                    DixUnknownAccess);
+            if (pGlxReadPbuffer) {
                 if (pGlxReadPbuffer->pScreen != glxc->pScreen ||
                     pGlxReadPbuffer->pFBConfig != glxc->pFBConfig) {
                     client->errorValue = drawId;
                     return BadMatch;
                 }
 
-		pReadDraw = (DrawablePtr)pGlxReadPbuffer;
+                pReadDraw = (DrawablePtr) pGlxReadPbuffer;
                 new_reply.readVid = pGlxReadPbuffer->pFBConfig->id;
                 new_reply.readType = GLX_PBUFFER_TYPE;
-	   }
-	}
+            }
+        }
 
-	if (!pReadDraw) {
-	   /*
-    	    ** Drawable is neither a Window nor a GLXPixmap.
-	    */
-	   client->errorValue = readId;
-	   return __glXBadDrawable;
-	}
+        if (!pReadDraw) {
+            /*
+             ** Drawable is neither a Window nor a GLXPixmap.
+             */
+            client->errorValue = readId;
+            return __glXBadDrawable;
+        }
 
-    } else {
-	pReadDraw = pDraw;
-	pReadGlxPixmap = pGlxPixmap;
-	pReadWin = pWin;
-	new_reply.readVid = new_reply.writeVid;
-	new_reply.readType = new_reply.writeType;
+    }
+    else {
+        pReadDraw = pDraw;
+        pReadGlxPixmap = pGlxPixmap;
+        pReadWin = pWin;
+        new_reply.readVid = new_reply.writeVid;
+        new_reply.readType = new_reply.writeType;
     }
 
     if (prevglxc) {
 
-	if (prevglxc->pGlxPixmap) {
-	    /*
-	    ** The previous drawable was a glx pixmap, release it.
-	    */
-	    prevglxc->pGlxPixmap->refcnt--;
-	    __glXFreeGLXPixmap( prevglxc->pGlxPixmap );
-	    prevglxc->pGlxPixmap = 0;
-	}
-
-	if (prevglxc->pGlxReadPixmap) {
-	    /*
-	    ** The previous drawable was a glx pixmap, release it.
-	    */
-	    prevglxc->pGlxReadPixmap->refcnt--;
-	    __glXFreeGLXPixmap( prevglxc->pGlxReadPixmap );
-	    prevglxc->pGlxReadPixmap = 0;
-	}
-
-	if (prevglxc->pGlxWindow) {
-	    /*
-	    ** The previous drawable was a glx window, release it.
-	    */
-	    prevglxc->pGlxWindow->refcnt--;
-	    __glXFreeGLXWindow( prevglxc->pGlxWindow );
-	    prevglxc->pGlxWindow = 0;   
-	}
-
-	if (prevglxc->pGlxReadWindow) {
-	    /*
-	    ** The previous drawable was a glx window, release it.
-	    */
-	    prevglxc->pGlxReadWindow->refcnt--;
-	    __glXFreeGLXWindow( prevglxc->pGlxReadWindow );
-	    prevglxc->pGlxReadWindow = 0;   
-	}
-
-	if (prevglxc->pGlxPbuffer) {
-	    /*
-	    ** The previous drawable was a glx Pbuffer, release it.
-	    */
-	    prevglxc->pGlxPbuffer->refcnt--;
-	    __glXFreeGLXPbuffer( prevglxc->pGlxPbuffer );
-	    prevglxc->pGlxPbuffer = 0;   
-	}
-
-	if (prevglxc->pGlxReadPbuffer) {
-	    /*
-	    ** The previous drawable was a glx Pbuffer, release it.
-	    */
-	    prevglxc->pGlxReadPbuffer->refcnt--;
-	    __glXFreeGLXPbuffer( prevglxc->pGlxReadPbuffer );
-	    prevglxc->pGlxReadPbuffer = 0;   
-	}
-
-	ChangeCurrentContext(cl, glxc, tag);
-	ChangeCurrentContext(cl, glxc, tag);
-	StopUsingContext(prevglxc);
-    } else {
-	tag = AddCurrentContext(cl, glxc, pDraw);
+        if (prevglxc->pGlxPixmap) {
+            /*
+             ** The previous drawable was a glx pixmap, release it.
+             */
+            prevglxc->pGlxPixmap->refcnt--;
+            __glXFreeGLXPixmap(prevglxc->pGlxPixmap);
+            prevglxc->pGlxPixmap = 0;
+        }
+
+        if (prevglxc->pGlxReadPixmap) {
+            /*
+             ** The previous drawable was a glx pixmap, release it.
+             */
+            prevglxc->pGlxReadPixmap->refcnt--;
+            __glXFreeGLXPixmap(prevglxc->pGlxReadPixmap);
+            prevglxc->pGlxReadPixmap = 0;
+        }
+
+        if (prevglxc->pGlxWindow) {
+            /*
+             ** The previous drawable was a glx window, release it.
+             */
+            prevglxc->pGlxWindow->refcnt--;
+            __glXFreeGLXWindow(prevglxc->pGlxWindow);
+            prevglxc->pGlxWindow = 0;
+        }
+
+        if (prevglxc->pGlxReadWindow) {
+            /*
+             ** The previous drawable was a glx window, release it.
+             */
+            prevglxc->pGlxReadWindow->refcnt--;
+            __glXFreeGLXWindow(prevglxc->pGlxReadWindow);
+            prevglxc->pGlxReadWindow = 0;
+        }
+
+        if (prevglxc->pGlxPbuffer) {
+            /*
+             ** The previous drawable was a glx Pbuffer, release it.
+             */
+            prevglxc->pGlxPbuffer->refcnt--;
+            __glXFreeGLXPbuffer(prevglxc->pGlxPbuffer);
+            prevglxc->pGlxPbuffer = 0;
+        }
+
+        if (prevglxc->pGlxReadPbuffer) {
+            /*
+             ** The previous drawable was a glx Pbuffer, release it.
+             */
+            prevglxc->pGlxReadPbuffer->refcnt--;
+            __glXFreeGLXPbuffer(prevglxc->pGlxReadPbuffer);
+            prevglxc->pGlxReadPbuffer = 0;
+        }
+
+        ChangeCurrentContext(cl, glxc, tag);
+        ChangeCurrentContext(cl, glxc, tag);
+        StopUsingContext(prevglxc);
+    }
+    else {
+        tag = AddCurrentContext(cl, glxc, pDraw);
     }
     if (glxc) {
 
-       glxc->pGlxPixmap = pGlxPixmap;
-       glxc->pGlxReadPixmap = pReadGlxPixmap;
-       glxc->pGlxWindow = pGlxWindow;
-       glxc->pGlxReadWindow = pGlxReadWindow;
-       glxc->pGlxPbuffer = pGlxPbuffer;
-       glxc->pGlxReadPbuffer = pGlxReadPbuffer;
+        glxc->pGlxPixmap = pGlxPixmap;
+        glxc->pGlxReadPixmap = pReadGlxPixmap;
+        glxc->pGlxWindow = pGlxWindow;
+        glxc->pGlxReadWindow = pGlxReadWindow;
+        glxc->pGlxPbuffer = pGlxPbuffer;
+        glxc->pGlxReadPbuffer = pGlxReadPbuffer;
 
-	if (pGlxPixmap) {
-	    pGlxPixmap->refcnt++;
-	}
+        if (pGlxPixmap) {
+            pGlxPixmap->refcnt++;
+        }
 
-	if (pReadGlxPixmap) {
-	    pReadGlxPixmap->refcnt++;
-	}
+        if (pReadGlxPixmap) {
+            pReadGlxPixmap->refcnt++;
+        }
 
-	if (pGlxWindow) {
-	   pGlxWindow->refcnt++;
-	}
+        if (pGlxWindow) {
+            pGlxWindow->refcnt++;
+        }
 
-	if (pGlxReadWindow) {
-	   pGlxReadWindow->refcnt++;
-	}
+        if (pGlxReadWindow) {
+            pGlxReadWindow->refcnt++;
+        }
 
-	if (pGlxPbuffer) {
-	   pGlxPbuffer->refcnt++;
-	}
+        if (pGlxPbuffer) {
+            pGlxPbuffer->refcnt++;
+        }
 
-	if (pGlxReadPbuffer) {
-	   pGlxReadPbuffer->refcnt++;
-	}
+        if (pGlxReadPbuffer) {
+            pGlxReadPbuffer->refcnt++;
+        }
 
-	StartUsingContext(cl, glxc);
-	new_reply.contextTag = tag;
-    } else {
-	new_reply.contextTag = 0;
+        StartUsingContext(cl, glxc);
+        new_reply.contextTag = tag;
+    }
+    else {
+        new_reply.contextTag = 0;
     }
     new_reply.length = 0;
     new_reply.type = X_Reply;
@@ -1137,216 +1204,226 @@ static int MakeCurrent(__GLXclientState *cl,
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
-
-       if (pDraw && new_reply.writeType != GLX_PBUFFER_TYPE) {
-	  dixLookupResourceByClass((pointer*) &pXinDraw,
-				   pDraw->id, XRC_DRAWABLE,
-				   client, DixReadAccess);
-       }
-
-       if (pReadDraw && pReadDraw != pDraw && 
-	     new_reply.readType != GLX_PBUFFER_TYPE) {
-	  dixLookupResourceByClass((pointer*) &pXinReadDraw,
-				   pReadDraw->id, XRC_DRAWABLE,
-				   client, DixReadAccess);
-       }
-       else {
-	  pXinReadDraw = pXinDraw;
-       }
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
+
+        if (pDraw && new_reply.writeType != GLX_PBUFFER_TYPE) {
+            dixLookupResourceByClass((pointer *) &pXinDraw,
+                                     pDraw->id, XRC_DRAWABLE,
+                                     client, DixReadAccess);
+        }
+
+        if (pReadDraw && pReadDraw != pDraw &&
+            new_reply.readType != GLX_PBUFFER_TYPE) {
+            dixLookupResourceByClass((pointer *) &pXinReadDraw,
+                                     pReadDraw->id, XRC_DRAWABLE,
+                                     client, DixReadAccess);
+        }
+        else {
+            pXinReadDraw = pXinDraw;
+        }
     }
 #endif
 
-
     /* send the MakeCurrent request to all required
      * back-end servers.
      */
-    for (s = from_screen; s<=to_screen; s++) {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
-       unsigned int be_draw = None;
-       unsigned int be_read_draw = None;
-
-       if (pGlxPixmap) {
-	   be_draw = pGlxPixmap->be_xids[s];
-       }
-       else if (pGlxPbuffer) {
-	  be_draw = pGlxPbuffer->be_xids[s];
-       }
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
+        unsigned int be_draw = None;
+        unsigned int be_read_draw = None;
+
+        if (pGlxPixmap) {
+            be_draw = pGlxPixmap->be_xids[s];
+        }
+        else if (pGlxPbuffer) {
+            be_draw = pGlxPbuffer->be_xids[s];
+        }
 #ifdef PANORAMIX
-       else if (pXinDraw) {
-	  dixLookupWindow(&pWin, pXinDraw->info[s].id, client, DixReadAccess);
-       }
+        else if (pXinDraw) {
+            dixLookupWindow(&pWin, pXinDraw->info[s].id, client, DixReadAccess);
+        }
 #endif
-       else if (pGlxWindow) {
-	  pWin = (WindowPtr)pGlxWindow->pDraw;
-       }
-
-       if (pWin && be_draw == None) {
-	   be_draw = (unsigned int)(DMX_GET_WINDOW_PRIV(pWin))->window;
-	   if (!be_draw) {
-	      /* it might be that the window did not created yet on the */
-	      /* back-end server (lazy window creation option), force   */
-	      /* creation of the window */
-	      dmxCreateAndRealizeWindow( pWin, TRUE );
-	      be_draw = (unsigned int)(DMX_GET_WINDOW_PRIV(pWin))->window;
-	   }
-       }
-
-       /*
-	* Before sending the MakeCurrent request - sync the
-	* X11 connection to the back-end servers to make sure
-	* that drawable is already created
-	*/
-       dmxSync( dmxScreen, 1 ); 
-
-       if (drawId == readId) {
-	  LockDisplay(dpy);
-	  GetReq(GLXMakeCurrent, be_req);
-	  be_req->reqType = dmxScreen->glxMajorOpcode;
-	  be_req->glxCode = X_GLXMakeCurrent;
-	  be_req->drawable = be_draw;
-	  be_req->context = (unsigned int)(glxc ? glxc->real_ids[s-from_screen] : 0);
-	  be_req->oldContextTag = GetCurrentBackEndTag(cl, tag, s);
-	  if (!_XReply(dpy, (xReply *) &be_reply, 0, False)) {
-
-	     /* The make current failed */
-	     UnlockDisplay(dpy);
-	     SyncHandle();
-	     return( BE_TO_CLIENT_ERROR(dmxLastErrorEvent.error_code) );
-	  }
-
-	  UnlockDisplay(dpy);
-       	  SyncHandle();
-
-	  SetCurrentBackEndTag( cl, tag, s, be_reply.contextTag );
-       }
-       else {
-
-	  if (pReadGlxPixmap) {
-	     be_read_draw = pReadGlxPixmap->be_xids[s];
-	  }
-	  else if (pGlxReadPbuffer) {
-	     be_read_draw = pGlxReadPbuffer->be_xids[s];
-	  }
+        else if (pGlxWindow) {
+            pWin = (WindowPtr) pGlxWindow->pDraw;
+        }
+
+        if (pWin && be_draw == None) {
+            be_draw = (unsigned int) (DMX_GET_WINDOW_PRIV(pWin))->window;
+            if (!be_draw) {
+                /* it might be that the window did not created yet on the */
+                /* back-end server (lazy window creation option), force   */
+                /* creation of the window */
+                dmxCreateAndRealizeWindow(pWin, TRUE);
+                be_draw = (unsigned int) (DMX_GET_WINDOW_PRIV(pWin))->window;
+            }
+        }
+
+        /*
+         * Before sending the MakeCurrent request - sync the
+         * X11 connection to the back-end servers to make sure
+         * that drawable is already created
+         */
+        dmxSync(dmxScreen, 1);
+
+        if (drawId == readId) {
+            LockDisplay(dpy);
+            GetReq(GLXMakeCurrent, be_req);
+            be_req->reqType = dmxScreen->glxMajorOpcode;
+            be_req->glxCode = X_GLXMakeCurrent;
+            be_req->drawable = be_draw;
+            be_req->context =
+                (unsigned int) (glxc ? glxc->real_ids[s - from_screen] : 0);
+            be_req->oldContextTag = GetCurrentBackEndTag(cl, tag, s);
+            if (!_XReply(dpy, (xReply *) & be_reply, 0, False)) {
+
+                /* The make current failed */
+                UnlockDisplay(dpy);
+                SyncHandle();
+                return (BE_TO_CLIENT_ERROR(dmxLastErrorEvent.error_code));
+            }
+
+            UnlockDisplay(dpy);
+            SyncHandle();
+
+            SetCurrentBackEndTag(cl, tag, s, be_reply.contextTag);
+        }
+        else {
+
+            if (pReadGlxPixmap) {
+                be_read_draw = pReadGlxPixmap->be_xids[s];
+            }
+            else if (pGlxReadPbuffer) {
+                be_read_draw = pGlxReadPbuffer->be_xids[s];
+            }
 #ifdef PANORAMIX
-	  else if (pXinReadDraw) {
-	     dixLookupWindow(&pReadWin, pXinReadDraw->info[s].id, client,
-			     DixReadAccess);
-   	  }
+            else if (pXinReadDraw) {
+                dixLookupWindow(&pReadWin, pXinReadDraw->info[s].id, client,
+                                DixReadAccess);
+            }
 #endif
-	  else if (pGlxReadWindow) {
-	     pReadWin = (WindowPtr)pGlxReadWindow->pDraw;
-	  }
-
-      	  if (pReadWin && be_read_draw == None) {
-  	     be_read_draw = (unsigned int)(DMX_GET_WINDOW_PRIV(pReadWin))->window;
-	   if (!be_read_draw) {
-	      /* it might be that the window did not created yet on the */
-	      /* back-end server (lazy window creation option), force   */
-	      /* creation of the window */
-	      dmxCreateAndRealizeWindow( pReadWin, TRUE );
-	      be_read_draw = (unsigned int)(DMX_GET_WINDOW_PRIV(pReadWin))->window;
-              dmxSync( dmxScreen, 1 ); 
-	   }
-     	  }
-
-	  if ( __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-	     LockDisplay(dpy);
-	     GetReq(GLXMakeContextCurrent, be_new_req);
-	     be_new_req->reqType = dmxScreen->glxMajorOpcode;
-	     be_new_req->glxCode = X_GLXMakeContextCurrent;
-	     be_new_req->drawable = be_draw;
-	     be_new_req->readdrawable = be_read_draw;
-	     be_new_req->context = (unsigned int)(glxc ? glxc->real_ids[s-from_screen] : 0);
-	     be_new_req->oldContextTag = GetCurrentBackEndTag(cl, tag, s);
-	     if (!_XReply(dpy, (xReply *) &be_new_reply, 0, False)) {
-
-		/* The make current failed */
-		UnlockDisplay(dpy);
-   		SyncHandle();
-   		return( BE_TO_CLIENT_ERROR(dmxLastErrorEvent.error_code) );
-   	     }
-
-   	     UnlockDisplay(dpy);
-      	     SyncHandle();
-
-   	     SetCurrentBackEndTag( cl, tag, s, be_new_reply.contextTag );
-	  }
-	  else if (glxIsExtensionSupported("GLX_SGI_make_current_read")) {
-	     xGLXMakeCurrentReadSGIReq *ext_req;
-	     xGLXVendorPrivateWithReplyReq *vpreq;
-             xGLXMakeCurrentReadSGIReply ext_reply;
-
-	     LockDisplay(dpy);
-	     GetReqExtra(GLXVendorPrivateWithReply, 
-		         sz_xGLXMakeCurrentReadSGIReq - sz_xGLXVendorPrivateWithReplyReq,
-		         vpreq);
-	     ext_req = (xGLXMakeCurrentReadSGIReq *)vpreq;
-	     ext_req->reqType = dmxScreen->glxMajorOpcode;
-	     ext_req->glxCode = X_GLXVendorPrivateWithReply;
-	     ext_req->vendorCode = X_GLXvop_MakeCurrentReadSGI;
-	     ext_req->drawable = be_draw;
-	     ext_req->readable = be_read_draw;
-	     ext_req->context = (unsigned int)(glxc ? glxc->real_ids[s-from_screen] : 0);
-	     ext_req->oldContextTag = GetCurrentBackEndTag(cl, tag, s);
-	     if (!_XReply(dpy, (xReply *) &ext_reply, 0, False)) {
-
-		/* The make current failed */
-		UnlockDisplay(dpy);
-   		SyncHandle();
-   		return( BE_TO_CLIENT_ERROR(dmxLastErrorEvent.error_code) );
-   	     }
-
-   	     UnlockDisplay(dpy);
-      	     SyncHandle();
-
-   	     SetCurrentBackEndTag( cl, tag, s, ext_reply.contextTag );
-
-	  }
-	  else {
-	     return BadMatch;
-	  }
-       }
-
-       XFlush( dpy );
+            else if (pGlxReadWindow) {
+                pReadWin = (WindowPtr) pGlxReadWindow->pDraw;
+            }
+
+            if (pReadWin && be_read_draw == None) {
+                be_read_draw =
+                    (unsigned int) (DMX_GET_WINDOW_PRIV(pReadWin))->window;
+                if (!be_read_draw) {
+                    /* it might be that the window did not created yet on the */
+                    /* back-end server (lazy window creation option), force   */
+                    /* creation of the window */
+                    dmxCreateAndRealizeWindow(pReadWin, TRUE);
+                    be_read_draw =
+                        (unsigned int) (DMX_GET_WINDOW_PRIV(pReadWin))->window;
+                    dmxSync(dmxScreen, 1);
+                }
+            }
+
+            if (__GLX_IS_VERSION_SUPPORTED(1, 3)) {
+                LockDisplay(dpy);
+                GetReq(GLXMakeContextCurrent, be_new_req);
+                be_new_req->reqType = dmxScreen->glxMajorOpcode;
+                be_new_req->glxCode = X_GLXMakeContextCurrent;
+                be_new_req->drawable = be_draw;
+                be_new_req->readdrawable = be_read_draw;
+                be_new_req->context =
+                    (unsigned int) (glxc ? glxc->real_ids[s - from_screen] : 0);
+                be_new_req->oldContextTag = GetCurrentBackEndTag(cl, tag, s);
+                if (!_XReply(dpy, (xReply *) & be_new_reply, 0, False)) {
+
+                    /* The make current failed */
+                    UnlockDisplay(dpy);
+                    SyncHandle();
+                    return (BE_TO_CLIENT_ERROR(dmxLastErrorEvent.error_code));
+                }
+
+                UnlockDisplay(dpy);
+                SyncHandle();
+
+                SetCurrentBackEndTag(cl, tag, s, be_new_reply.contextTag);
+            }
+            else if (glxIsExtensionSupported("GLX_SGI_make_current_read")) {
+                xGLXMakeCurrentReadSGIReq *ext_req;
+                xGLXVendorPrivateWithReplyReq *vpreq;
+                xGLXMakeCurrentReadSGIReply ext_reply;
+
+                LockDisplay(dpy);
+                GetReqExtra(GLXVendorPrivateWithReply,
+                            sz_xGLXMakeCurrentReadSGIReq -
+                            sz_xGLXVendorPrivateWithReplyReq, vpreq);
+                ext_req = (xGLXMakeCurrentReadSGIReq *) vpreq;
+                ext_req->reqType = dmxScreen->glxMajorOpcode;
+                ext_req->glxCode = X_GLXVendorPrivateWithReply;
+                ext_req->vendorCode = X_GLXvop_MakeCurrentReadSGI;
+                ext_req->drawable = be_draw;
+                ext_req->readable = be_read_draw;
+                ext_req->context =
+                    (unsigned int) (glxc ? glxc->real_ids[s - from_screen] : 0);
+                ext_req->oldContextTag = GetCurrentBackEndTag(cl, tag, s);
+                if (!_XReply(dpy, (xReply *) & ext_reply, 0, False)) {
+
+                    /* The make current failed */
+                    UnlockDisplay(dpy);
+                    SyncHandle();
+                    return (BE_TO_CLIENT_ERROR(dmxLastErrorEvent.error_code));
+                }
+
+                UnlockDisplay(dpy);
+                SyncHandle();
+
+                SetCurrentBackEndTag(cl, tag, s, ext_reply.contextTag);
+
+            }
+            else {
+                return BadMatch;
+            }
+        }
+
+        XFlush(dpy);
     }
 
     if (client->swapped) {
-	__glXSwapMakeCurrentReply(client, &new_reply);
-    } else {
-	WriteToClient(client, sz_xGLXMakeContextCurrentReply, (char *)&new_reply);
+        __glXSwapMakeCurrentReply(client, &new_reply);
+    }
+    else {
+        WriteToClient(client, sz_xGLXMakeContextCurrentReply,
+                      (char *) &new_reply);
     }
 
     return Success;
 }
 
-int __glXMakeCurrent(__GLXclientState *cl, GLbyte *pc)
+int
+__glXMakeCurrent(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXMakeCurrentReq *req = (xGLXMakeCurrentReq *) pc;
 
-    return( MakeCurrent(cl, req->drawable, req->drawable,
-	                req->context, req->oldContextTag ) );
+    return (MakeCurrent(cl, req->drawable, req->drawable,
+                        req->context, req->oldContextTag));
 }
 
-int __glXMakeContextCurrent(__GLXclientState *cl, GLbyte *pc)
+int
+__glXMakeContextCurrent(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXMakeContextCurrentReq *req = (xGLXMakeContextCurrentReq *) pc;
 
-    return( MakeCurrent(cl, req->drawable, req->readdrawable,
-	                req->context, req->oldContextTag ) );
+    return (MakeCurrent(cl, req->drawable, req->readdrawable,
+                        req->context, req->oldContextTag));
 }
 
-int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc)
+int
+__glXMakeCurrentReadSGI(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXMakeCurrentReadSGIReq *req = (xGLXMakeCurrentReadSGIReq *) pc;
 
-    return( MakeCurrent(cl, req->drawable, req->readable,
-	                req->context, req->oldContextTag ) );
+    return (MakeCurrent(cl, req->drawable, req->readable,
+                        req->context, req->oldContextTag));
 }
 
-int __glXIsDirect(__GLXclientState *cl, GLbyte *pc)
+int
+__glXIsDirect(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXIsDirectReq *req = (xGLXIsDirectReq *) pc;
@@ -1354,13 +1431,13 @@ int __glXIsDirect(__GLXclientState *cl, GLbyte *pc)
     __GLXcontext *glxc;
 
     /*
-    ** Find the GL context.
-    */
-    dixLookupResourceByType((pointer*) &glxc, req->context, __glXContextRes,
+     ** Find the GL context.
+     */
+    dixLookupResourceByType((pointer *) &glxc, req->context, __glXContextRes,
                             NullClient, DixUnknownAccess);
     if (!glxc) {
-	client->errorValue = req->context;
-	return __glXBadContext;
+        client->errorValue = req->context;
+        return __glXBadContext;
     }
 
     reply.isDirect = 0;
@@ -1369,25 +1446,28 @@ int __glXIsDirect(__GLXclientState *cl, GLbyte *pc)
     reply.sequenceNumber = client->sequence;
 
     if (client->swapped) {
-	__glXSwapIsDirectReply(client, &reply);
-    } else {
-	WriteToClient(client, sz_xGLXIsDirectReply, (char *)&reply);
+        __glXSwapIsDirectReply(client, &reply);
+    }
+    else {
+        WriteToClient(client, sz_xGLXIsDirectReply, (char *) &reply);
     }
 
     return Success;
 }
 
-int __glXQueryVersion(__GLXclientState *cl, GLbyte *pc)
+int
+__glXQueryVersion(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
+
 /*    xGLXQueryVersionReq *req = (xGLXQueryVersionReq *) pc; */
     xGLXQueryVersionReply reply;
 
     /*
-    ** Server should take into consideration the version numbers sent by the
-    ** client if it wants to work with older clients; however, in this
-    ** implementation the server just returns its version number.
-    */
+     ** Server should take into consideration the version numbers sent by the
+     ** client if it wants to work with older clients; however, in this
+     ** implementation the server just returns its version number.
+     */
     reply.majorVersion = __glXVersionMajor;
     reply.minorVersion = __glXVersionMinor;
     reply.length = 0;
@@ -1395,98 +1475,104 @@ int __glXQueryVersion(__GLXclientState *cl, GLbyte *pc)
     reply.sequenceNumber = client->sequence;
 
     if (client->swapped) {
-	__glXSwapQueryVersionReply(client, &reply);
-    } else {
-	WriteToClient(client, sz_xGLXQueryVersionReply, (char *)&reply);
+        __glXSwapQueryVersionReply(client, &reply);
+    }
+    else {
+        WriteToClient(client, sz_xGLXQueryVersionReply, (char *) &reply);
     }
     return Success;
 }
 
-int __glXWaitGL(__GLXclientState *cl, GLbyte *pc)
+int
+__glXWaitGL(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXWaitGLReq *req = (xGLXWaitGLReq *)pc;
-    xGLXWaitGLReq *be_req = (xGLXWaitGLReq *)pc;
+    xGLXWaitGLReq *req = (xGLXWaitGLReq *) pc;
+    xGLXWaitGLReq *be_req = (xGLXWaitGLReq *) pc;
     int from_screen = 0;
     int to_screen = 0;
     int s;
     __GLXcontext *glxc = NULL;
-    
+
     if (req->contextTag != 0) {
-	glxc = __glXLookupContextByTag(cl, req->contextTag);
-	if (glxc) {
-	   from_screen = to_screen = glxc->pScreen->myNum;
-	}
+        glxc = __glXLookupContextByTag(cl, req->contextTag);
+        if (glxc) {
+            from_screen = to_screen = glxc->pScreen->myNum;
+        }
     }
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
-    for (s=from_screen; s<=to_screen; s++) {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
 
-       LockDisplay(dpy);
-       GetReq(GLXWaitGL,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = X_GLXWaitGL;
-       be_req->contextTag = (glxc ? GetCurrentBackEndTag(cl,req->contextTag,s) : 0);
-       UnlockDisplay(dpy);
-       SyncHandle();
+        LockDisplay(dpy);
+        GetReq(GLXWaitGL, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = X_GLXWaitGL;
+        be_req->contextTag =
+            (glxc ? GetCurrentBackEndTag(cl, req->contextTag, s) : 0);
+        UnlockDisplay(dpy);
+        SyncHandle();
 
-       XSync(dpy, False);
+        XSync(dpy, False);
     }
-    
+
     return Success;
 }
 
-int __glXWaitX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXWaitX(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXWaitXReq *req = (xGLXWaitXReq *)pc;
+    xGLXWaitXReq *req = (xGLXWaitXReq *) pc;
     xGLXWaitXReq *be_req;
     int from_screen = 0;
     int to_screen = 0;
     int s;
     __GLXcontext *glxc = NULL;
-    
+
     if (req->contextTag != 0) {
-	glxc = __glXLookupContextByTag(cl, req->contextTag);
-	if (glxc) {
-	   from_screen = to_screen = glxc->pScreen->myNum;
-	}
+        glxc = __glXLookupContextByTag(cl, req->contextTag);
+        if (glxc) {
+            from_screen = to_screen = glxc->pScreen->myNum;
+        }
     }
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
-    for (s=from_screen; s<=to_screen; s++) {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
 
-       dmxSync( dmxScreen, 1 );
+        dmxSync(dmxScreen, 1);
 
-       LockDisplay(dpy);
-       GetReq(GLXWaitX,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = X_GLXWaitX;
-       be_req->contextTag = (glxc ? GetCurrentBackEndTag(cl,req->contextTag,s) : 0);
-       UnlockDisplay(dpy);
-       SyncHandle();
+        LockDisplay(dpy);
+        GetReq(GLXWaitX, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = X_GLXWaitX;
+        be_req->contextTag =
+            (glxc ? GetCurrentBackEndTag(cl, req->contextTag, s) : 0);
+        UnlockDisplay(dpy);
+        SyncHandle();
 
-       XFlush( dpy );
+        XFlush(dpy);
     }
 
     return Success;
 }
 
-int __glXCopyContext(__GLXclientState *cl, GLbyte *pc)
+int
+__glXCopyContext(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXCopyContextReq *be_req;
@@ -1501,81 +1587,83 @@ int __glXCopyContext(__GLXclientState *cl, GLbyte *pc)
     int to_screen = 0;
 
     /*
-    ** Check that each context exists.
-    */
-    dixLookupResourceByType((pointer*) &src, source, __glXContextRes,
+     ** Check that each context exists.
+     */
+    dixLookupResourceByType((pointer *) &src, source, __glXContextRes,
                             NullClient, DixUnknownAccess);
     if (!src) {
-	client->errorValue = source;
-	return __glXBadContext;
+        client->errorValue = source;
+        return __glXBadContext;
     }
-    dixLookupResourceByType((pointer*) &dst, dest, __glXContextRes,
+    dixLookupResourceByType((pointer *) &dst, dest, __glXContextRes,
                             NullClient, DixUnknownAccess);
     if (!dst) {
-	client->errorValue = dest;
-	return __glXBadContext;
+        client->errorValue = dest;
+        return __glXBadContext;
     }
 
     /*
-    ** They must be in the same address space, and same screen.
-    */
+     ** They must be in the same address space, and same screen.
+     */
     if (src->pGlxScreen != dst->pGlxScreen) {
-	client->errorValue = source;
-	return BadMatch;
+        client->errorValue = source;
+        return BadMatch;
     }
 
     /*
-    ** The destination context must not be current for any client.
-    */
+     ** The destination context must not be current for any client.
+     */
     if (dst->isCurrent) {
-	client->errorValue = dest;
-	return BadAccess;
+        client->errorValue = dest;
+        return BadAccess;
     }
 
     if (tag) {
-	__GLXcontext *tagcx = __glXLookupContextByTag(cl, tag);
-	
-	if (!tagcx) {
-	    return __glXBadContextTag;
-	}
-	if (tagcx != src) {
-	    /*
-	    ** This would be caused by a faulty implementation of the client
-	    ** library.
-	    */
-	    return BadMatch;
-	}
+        __GLXcontext *tagcx = __glXLookupContextByTag(cl, tag);
+
+        if (!tagcx) {
+            return __glXBadContextTag;
+        }
+        if (tagcx != src) {
+            /*
+             ** This would be caused by a faulty implementation of the client
+             ** library.
+             */
+            return BadMatch;
+        }
     }
 
     from_screen = to_screen = src->pScreen->myNum;
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
-    for (s=from_screen; s<=to_screen; s++) {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
 
-       LockDisplay(dpy);
-       GetReq(GLXCopyContext,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = X_GLXCopyContext;
-       be_req->source = (unsigned int)src->real_ids[s-from_screen];
-       be_req->dest = (unsigned int)dst->real_ids[s-from_screen];
-       be_req->mask = mask;
-       be_req->contextTag = (tag ? GetCurrentBackEndTag(cl,req->contextTag,s) : 0);
-       UnlockDisplay(dpy);
-       SyncHandle();
+        LockDisplay(dpy);
+        GetReq(GLXCopyContext, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = X_GLXCopyContext;
+        be_req->source = (unsigned int) src->real_ids[s - from_screen];
+        be_req->dest = (unsigned int) dst->real_ids[s - from_screen];
+        be_req->mask = mask;
+        be_req->contextTag =
+            (tag ? GetCurrentBackEndTag(cl, req->contextTag, s) : 0);
+        UnlockDisplay(dpy);
+        SyncHandle();
     }
 
     return Success;
 }
 
-int __glXGetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
+int
+__glXGetVisualConfigs(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXGetVisualConfigsReq *req = (xGLXGetVisualConfigsReq *) pc;
@@ -1588,75 +1676,75 @@ int __glXGetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
 
     screen = req->screen;
     if (screen >= screenInfo.numScreens) {
-	/* The client library must send a valid screen number. */
-	client->errorValue = screen;
-	return BadValue;
+        /* The client library must send a valid screen number. */
+        client->errorValue = screen;
+        return BadValue;
     }
     pGlxScreen = &__glXActiveScreens[screen];
 
     reply.numVisuals = pGlxScreen->numGLXVisuals;
     reply.numProps = __GLX_TOTAL_CONFIG;
     reply.length = (pGlxScreen->numGLXVisuals * __GLX_SIZE_CARD32 *
-		    __GLX_TOTAL_CONFIG) >> 2;
+                    __GLX_TOTAL_CONFIG) >> 2;
     reply.type = X_Reply;
     reply.sequenceNumber = client->sequence;
 
-    WriteToClient(client, sz_xGLXGetVisualConfigsReply, (char *)&reply);
-
-    for (i=0; i < pGlxScreen->numVisuals; i++) {
-	pGlxVisual = &pGlxScreen->pGlxVisual[i];
-	if (!pGlxScreen->isGLXvis[i] || pGlxVisual->vid == 0) {
-	    /* not a usable visual */
-	    continue;
-	}
-	p = 0;
-	buf[p++] = pGlxVisual->vid;
-	buf[p++] = pGlxVisual->class;
-	buf[p++] = pGlxVisual->rgba;
-
-	buf[p++] = pGlxVisual->redSize;
-	buf[p++] = pGlxVisual->greenSize;
-	buf[p++] = pGlxVisual->blueSize;
-	buf[p++] = pGlxVisual->alphaSize;
-	buf[p++] = pGlxVisual->accumRedSize;
-	buf[p++] = pGlxVisual->accumGreenSize;
-	buf[p++] = pGlxVisual->accumBlueSize;
-	buf[p++] = pGlxVisual->accumAlphaSize;
-
-	buf[p++] = pGlxVisual->doubleBuffer;
-	buf[p++] = pGlxVisual->stereo;
-
-	buf[p++] = pGlxVisual->bufferSize;
-	buf[p++] = pGlxVisual->depthSize;
-	buf[p++] = pGlxVisual->stencilSize;
-	buf[p++] = pGlxVisual->auxBuffers;
-	buf[p++] = pGlxVisual->level;
-	/* 
-	** Add token/value pairs for extensions.
-	*/
-	buf[p++] = GLX_VISUAL_CAVEAT_EXT;
-	buf[p++] = pGlxVisual->visualRating;
-	buf[p++] = GLX_TRANSPARENT_TYPE_EXT;
-	buf[p++] = pGlxVisual->transparentPixel;
-	buf[p++] = GLX_TRANSPARENT_RED_VALUE_EXT;
-	buf[p++] = pGlxVisual->transparentRed;
-	buf[p++] = GLX_TRANSPARENT_GREEN_VALUE_EXT;
-	buf[p++] = pGlxVisual->transparentGreen;
-	buf[p++] = GLX_TRANSPARENT_BLUE_VALUE_EXT;
-	buf[p++] = pGlxVisual->transparentBlue;
-	buf[p++] = GLX_TRANSPARENT_ALPHA_VALUE_EXT;
-	buf[p++] = pGlxVisual->transparentAlpha;
-	buf[p++] = GLX_TRANSPARENT_INDEX_VALUE_EXT;
-	buf[p++] = pGlxVisual->transparentIndex;
-	buf[p++] = GLX_SAMPLES_SGIS;
-	buf[p++] = pGlxVisual->multiSampleSize;
-	buf[p++] = GLX_SAMPLE_BUFFERS_SGIS;
-	buf[p++] = pGlxVisual->nMultiSampleBuffers;
-	buf[p++] = GLX_VISUAL_SELECT_GROUP_SGIX;
-	buf[p++] = pGlxVisual->visualSelectGroup;
-
-	WriteToClient(client, __GLX_SIZE_CARD32 * __GLX_TOTAL_CONFIG, 
-		(char *)buf);
+    WriteToClient(client, sz_xGLXGetVisualConfigsReply, (char *) &reply);
+
+    for (i = 0; i < pGlxScreen->numVisuals; i++) {
+        pGlxVisual = &pGlxScreen->pGlxVisual[i];
+        if (!pGlxScreen->isGLXvis[i] || pGlxVisual->vid == 0) {
+            /* not a usable visual */
+            continue;
+        }
+        p = 0;
+        buf[p++] = pGlxVisual->vid;
+        buf[p++] = pGlxVisual->class;
+        buf[p++] = pGlxVisual->rgba;
+
+        buf[p++] = pGlxVisual->redSize;
+        buf[p++] = pGlxVisual->greenSize;
+        buf[p++] = pGlxVisual->blueSize;
+        buf[p++] = pGlxVisual->alphaSize;
+        buf[p++] = pGlxVisual->accumRedSize;
+        buf[p++] = pGlxVisual->accumGreenSize;
+        buf[p++] = pGlxVisual->accumBlueSize;
+        buf[p++] = pGlxVisual->accumAlphaSize;
+
+        buf[p++] = pGlxVisual->doubleBuffer;
+        buf[p++] = pGlxVisual->stereo;
+
+        buf[p++] = pGlxVisual->bufferSize;
+        buf[p++] = pGlxVisual->depthSize;
+        buf[p++] = pGlxVisual->stencilSize;
+        buf[p++] = pGlxVisual->auxBuffers;
+        buf[p++] = pGlxVisual->level;
+        /* 
+         ** Add token/value pairs for extensions.
+         */
+        buf[p++] = GLX_VISUAL_CAVEAT_EXT;
+        buf[p++] = pGlxVisual->visualRating;
+        buf[p++] = GLX_TRANSPARENT_TYPE_EXT;
+        buf[p++] = pGlxVisual->transparentPixel;
+        buf[p++] = GLX_TRANSPARENT_RED_VALUE_EXT;
+        buf[p++] = pGlxVisual->transparentRed;
+        buf[p++] = GLX_TRANSPARENT_GREEN_VALUE_EXT;
+        buf[p++] = pGlxVisual->transparentGreen;
+        buf[p++] = GLX_TRANSPARENT_BLUE_VALUE_EXT;
+        buf[p++] = pGlxVisual->transparentBlue;
+        buf[p++] = GLX_TRANSPARENT_ALPHA_VALUE_EXT;
+        buf[p++] = pGlxVisual->transparentAlpha;
+        buf[p++] = GLX_TRANSPARENT_INDEX_VALUE_EXT;
+        buf[p++] = pGlxVisual->transparentIndex;
+        buf[p++] = GLX_SAMPLES_SGIS;
+        buf[p++] = pGlxVisual->multiSampleSize;
+        buf[p++] = GLX_SAMPLE_BUFFERS_SGIS;
+        buf[p++] = pGlxVisual->nMultiSampleBuffers;
+        buf[p++] = GLX_VISUAL_SELECT_GROUP_SGIX;
+        buf[p++] = pGlxVisual->visualSelectGroup;
+
+        WriteToClient(client, __GLX_SIZE_CARD32 * __GLX_TOTAL_CONFIG,
+                      (char *) buf);
     }
     return Success;
 }
@@ -1664,9 +1752,10 @@ int __glXGetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
 /*
 ** Create a GLX Pixmap from an X Pixmap.
 */
-static int CreateGLXPixmap(__GLXclientState *cl,
-                    VisualID visual, GLXFBConfigID fbconfigId,
-		    int screenNum, XID pixmapId, XID glxpixmapId )
+static int
+CreateGLXPixmap(__GLXclientState * cl,
+                VisualID visual, GLXFBConfigID fbconfigId,
+                int screenNum, XID pixmapId, XID glxpixmapId)
 {
     ClientPtr client = cl->client;
     xGLXCreateGLXPixmapReq *be_req;
@@ -1680,107 +1769,107 @@ static int CreateGLXPixmap(__GLXclientState *cl,
     __GLXFBConfig *pFBConfig;
     int i, s, rc;
     int from_screen, to_screen;
+
 #ifdef PANORAMIX
     PanoramiXRes *pXinDraw = NULL;
 #endif
 
     rc = dixLookupDrawable(&pDraw, pixmapId, client, M_DRAWABLE_PIXMAP,
-			   DixAddAccess);
+                           DixAddAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
     /*
-    ** Check if screen of visual matches screen of pixmap.
-    */
+     ** Check if screen of visual matches screen of pixmap.
+     */
     pScreen = pDraw->pScreen;
     if (screenNum != pScreen->myNum) {
-	return BadMatch;
+        return BadMatch;
     }
 
     if (fbconfigId == 0 && visual == 0) {
-	  return BadValue;
+        return BadValue;
     }
 
     if (fbconfigId != None) {
-       pFBConfig = glxLookupFBConfig( fbconfigId );
-       if (!pFBConfig) {
-	  client->errorValue = fbconfigId;
-	  return BadValue;
-       }
-       visual = pFBConfig->associatedVisualId;
+        pFBConfig = glxLookupFBConfig(fbconfigId);
+        if (!pFBConfig) {
+            client->errorValue = fbconfigId;
+            return BadValue;
+        }
+        visual = pFBConfig->associatedVisualId;
     }
     else {
-       pFBConfig = NULL;
+        pFBConfig = NULL;
     }
 
     if (visual != None) {
-       /*
-	** Find the VisualRec for this visual.
-	*/
-       pVisual = pScreen->visuals;
-       for (i=0; i < pScreen->numVisuals; i++, pVisual++) {
-	  if (pVisual->vid == visual) {
-	     break;
-	  }
-       }
-       if (i == pScreen->numVisuals) {
-	  client->errorValue = visual;
-	  return BadValue;
-       }
-       /*
-	** Check if depth of visual matches depth of pixmap.
-	*/
-       if (pVisual->nplanes != pDraw->depth) {
-	  client->errorValue = visual;
-	  return BadMatch;
-       }
-
-       /*
-	** Get configuration of the visual.
-	*/
-       pGlxScreen = &__glXActiveScreens[screenNum];
-       pGlxVisual = pGlxScreen->pGlxVisual;
-       for (i = 0; i < pGlxScreen->numVisuals; i++, pGlxVisual++) {
-	  if (pGlxVisual->vid == visual) {
-	     break;
-	  }
-       }
-       if (i == pGlxScreen->numVisuals) {
-	  /*
-	   ** Visual not support on this screen by this OpenGL implementation.
-	   */
-	  client->errorValue = visual;
-	  return BadValue;
-       }
-
-
-       /* find the FBConfig for that visual (if any) */
-       if ( pFBConfig == NULL ) {
-	   pFBConfig = glxLookupFBConfigByVID( visual );
-
-	   if ( pFBConfig == NULL ) {
-	      /*
-               * visual does not have an FBConfig ???
-	      client->errorValue = visual;
-	      return BadValue;
-	       */
-	   }
-       }
+        /*
+         ** Find the VisualRec for this visual.
+         */
+        pVisual = pScreen->visuals;
+        for (i = 0; i < pScreen->numVisuals; i++, pVisual++) {
+            if (pVisual->vid == visual) {
+                break;
+            }
+        }
+        if (i == pScreen->numVisuals) {
+            client->errorValue = visual;
+            return BadValue;
+        }
+        /*
+         ** Check if depth of visual matches depth of pixmap.
+         */
+        if (pVisual->nplanes != pDraw->depth) {
+            client->errorValue = visual;
+            return BadMatch;
+        }
+
+        /*
+         ** Get configuration of the visual.
+         */
+        pGlxScreen = &__glXActiveScreens[screenNum];
+        pGlxVisual = pGlxScreen->pGlxVisual;
+        for (i = 0; i < pGlxScreen->numVisuals; i++, pGlxVisual++) {
+            if (pGlxVisual->vid == visual) {
+                break;
+            }
+        }
+        if (i == pGlxScreen->numVisuals) {
+            /*
+             ** Visual not support on this screen by this OpenGL implementation.
+             */
+            client->errorValue = visual;
+            return BadValue;
+        }
+
+        /* find the FBConfig for that visual (if any) */
+        if (pFBConfig == NULL) {
+            pFBConfig = glxLookupFBConfigByVID(visual);
+
+            if (pFBConfig == NULL) {
+                /*
+                 * visual does not have an FBConfig ???
+                 client->errorValue = visual;
+                 return BadValue;
+                 */
+            }
+        }
     }
     else {
-       pVisual = NULL;
-       pGlxVisual = NULL;
-       pGlxScreen = &__glXActiveScreens[pDraw->pScreen->myNum];
+        pVisual = NULL;
+        pGlxVisual = NULL;
+        pGlxScreen = &__glXActiveScreens[pDraw->pScreen->myNum];
     }
 
     pGlxPixmap = (__GLXpixmap *) malloc(sizeof(__GLXpixmap));
     if (!pGlxPixmap) {
-	return BadAlloc;
+        return BadAlloc;
     }
     pGlxPixmap->be_xids = (XID *) malloc(sizeof(XID) * screenInfo.numScreens);
     if (!pGlxPixmap->be_xids) {
-        free( pGlxPixmap );
-	return BadAlloc;
+        free(pGlxPixmap);
+        return BadAlloc;
     }
 
     pGlxPixmap->pDraw = pDraw;
@@ -1792,8 +1881,8 @@ static int CreateGLXPixmap(__GLXclientState *cl,
     pGlxPixmap->refcnt = 0;
 
     /*
-    ** Bump the ref count on the X pixmap so it won't disappear.
-    */
+     ** Bump the ref count on the X pixmap so it won't disappear.
+     */
     ((PixmapPtr) pDraw)->refcnt++;
 
     /*
@@ -1802,121 +1891,128 @@ static int CreateGLXPixmap(__GLXclientState *cl,
     from_screen = to_screen = screenNum;
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
 
-       dixLookupResourceByClass((pointer*) &pXinDraw,
-				pDraw->id, XRC_DRAWABLE,
-				client, DixReadAccess);
+        dixLookupResourceByClass((pointer *) &pXinDraw,
+                                 pDraw->id, XRC_DRAWABLE,
+                                 client, DixReadAccess);
     }
 #endif
 
-    for (s=from_screen; s<=to_screen; s++) {
+    for (s = from_screen; s <= to_screen; s++) {
 
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
-       Pixmap  be_pixmap;
-       DrawablePtr pRealDraw = pDraw;
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
+        Pixmap be_pixmap;
+        DrawablePtr pRealDraw = pDraw;
 
 #ifdef PANORAMIX
-       if (pXinDraw) {
-	   dixLookupDrawable(&pRealDraw, pXinDraw->info[s].id, client, 0,
-			     DixAddAccess);
-       }
+        if (pXinDraw) {
+            dixLookupDrawable(&pRealDraw, pXinDraw->info[s].id, client, 0,
+                              DixAddAccess);
+        }
 #endif
 
-       be_pixmap = (DMX_GET_PIXMAP_PRIV((PixmapPtr)pRealDraw))->pixmap;
-
-       /* make sure pixmap already created on back-end */
-       dmxSync( dmxScreen, 1 );
-
-       if ( pFBConfig && __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-       	  __GLXFBConfig *be_FBConfig = glxLookupBackEndFBConfig( pFBConfig->id, s );
-	  
-	  LockDisplay(dpy);
-	  pGlxPixmap->be_xids[s] = XAllocID(dpy);
-	  GetReq(GLXCreatePixmap,be_new_req);
-	  be_new_req->reqType = dmxScreen->glxMajorOpcode;
-	  be_new_req->glxCode = X_GLXCreatePixmap;
-	  be_new_req->screen = DefaultScreen(dpy);
-	  be_new_req->fbconfig = be_FBConfig->id;
-	  be_new_req->pixmap = (unsigned int)be_pixmap;
-	  be_new_req->glxpixmap = (unsigned int)pGlxPixmap->be_xids[s];
-	  be_new_req->numAttribs = 0;
-	  UnlockDisplay(dpy);
-	  SyncHandle();
-       }
-       else if (pFBConfig && glxIsExtensionSupported("GLX_SGIX_fbconfig")) {
-	  __GLXFBConfig *be_FBConfig = glxLookupBackEndFBConfig( pFBConfig->id, s );
-	  xGLXCreateGLXPixmapWithConfigSGIXReq *ext_req;
-	  xGLXVendorPrivateReq *vpreq;
-	  
-	  LockDisplay(dpy);
-	  pGlxPixmap->be_xids[s] = XAllocID(dpy);
-	  GetReqExtra(GLXVendorPrivate,
-		      sz_xGLXCreateGLXPixmapWithConfigSGIXReq-sz_xGLXVendorPrivateReq,
-		      vpreq);
-	  ext_req = (xGLXCreateGLXPixmapWithConfigSGIXReq *)vpreq;
-	  ext_req->reqType = dmxScreen->glxMajorOpcode;
-	  ext_req->glxCode = X_GLXVendorPrivate;
-	  ext_req->vendorCode = X_GLXvop_CreateGLXPixmapWithConfigSGIX;
-	  ext_req->screen = DefaultScreen(dpy);
-	  ext_req->fbconfig = be_FBConfig->id;
-	  ext_req->pixmap = (unsigned int)be_pixmap;
-	  ext_req->glxpixmap = (unsigned int)pGlxPixmap->be_xids[s];
-	  UnlockDisplay(dpy);
-	  SyncHandle();
-       }
-       else if (pGlxVisual) {
-	  LockDisplay(dpy);
-	  pGlxPixmap->be_xids[s] = XAllocID(dpy);
-	  GetReq(GLXCreateGLXPixmap,be_req);
-	  be_req->reqType = dmxScreen->glxMajorOpcode;
-	  be_req->glxCode = X_GLXCreateGLXPixmap;
-	  be_req->screen = DefaultScreen(dpy);
-	  be_req->visual = (unsigned int)glxMatchGLXVisualInConfigList( 
-	 	pGlxVisual,
-		dmxScreen->glxVisuals,
-		dmxScreen->numGlxVisuals );
-   	  be_req->pixmap = (unsigned int)be_pixmap;
-      	  be_req->glxpixmap = (unsigned int)pGlxPixmap->be_xids[s];
-	  UnlockDisplay(dpy);
-	  SyncHandle();
-       }
-       else {
-	  client->errorValue = ( visual ? visual : fbconfigId );
-          free( pGlxPixmap );
-	  return BadValue;
-       }
-
-       XFlush( dpy );
+        be_pixmap = (DMX_GET_PIXMAP_PRIV((PixmapPtr) pRealDraw))->pixmap;
+
+        /* make sure pixmap already created on back-end */
+        dmxSync(dmxScreen, 1);
+
+        if (pFBConfig && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
+            __GLXFBConfig *be_FBConfig =
+                glxLookupBackEndFBConfig(pFBConfig->id, s);
+
+            LockDisplay(dpy);
+            pGlxPixmap->be_xids[s] = XAllocID(dpy);
+            GetReq(GLXCreatePixmap, be_new_req);
+            be_new_req->reqType = dmxScreen->glxMajorOpcode;
+            be_new_req->glxCode = X_GLXCreatePixmap;
+            be_new_req->screen = DefaultScreen(dpy);
+            be_new_req->fbconfig = be_FBConfig->id;
+            be_new_req->pixmap = (unsigned int) be_pixmap;
+            be_new_req->glxpixmap = (unsigned int) pGlxPixmap->be_xids[s];
+            be_new_req->numAttribs = 0;
+            UnlockDisplay(dpy);
+            SyncHandle();
+        }
+        else if (pFBConfig && glxIsExtensionSupported("GLX_SGIX_fbconfig")) {
+            __GLXFBConfig *be_FBConfig =
+                glxLookupBackEndFBConfig(pFBConfig->id, s);
+            xGLXCreateGLXPixmapWithConfigSGIXReq *ext_req;
+            xGLXVendorPrivateReq *vpreq;
+
+            LockDisplay(dpy);
+            pGlxPixmap->be_xids[s] = XAllocID(dpy);
+            GetReqExtra(GLXVendorPrivate,
+                        sz_xGLXCreateGLXPixmapWithConfigSGIXReq -
+                        sz_xGLXVendorPrivateReq, vpreq);
+            ext_req = (xGLXCreateGLXPixmapWithConfigSGIXReq *) vpreq;
+            ext_req->reqType = dmxScreen->glxMajorOpcode;
+            ext_req->glxCode = X_GLXVendorPrivate;
+            ext_req->vendorCode = X_GLXvop_CreateGLXPixmapWithConfigSGIX;
+            ext_req->screen = DefaultScreen(dpy);
+            ext_req->fbconfig = be_FBConfig->id;
+            ext_req->pixmap = (unsigned int) be_pixmap;
+            ext_req->glxpixmap = (unsigned int) pGlxPixmap->be_xids[s];
+            UnlockDisplay(dpy);
+            SyncHandle();
+        }
+        else if (pGlxVisual) {
+            LockDisplay(dpy);
+            pGlxPixmap->be_xids[s] = XAllocID(dpy);
+            GetReq(GLXCreateGLXPixmap, be_req);
+            be_req->reqType = dmxScreen->glxMajorOpcode;
+            be_req->glxCode = X_GLXCreateGLXPixmap;
+            be_req->screen = DefaultScreen(dpy);
+            be_req->visual =
+                (unsigned int) glxMatchGLXVisualInConfigList(pGlxVisual,
+                                                             dmxScreen->
+                                                             glxVisuals,
+                                                             dmxScreen->
+                                                             numGlxVisuals);
+            be_req->pixmap = (unsigned int) be_pixmap;
+            be_req->glxpixmap = (unsigned int) pGlxPixmap->be_xids[s];
+            UnlockDisplay(dpy);
+            SyncHandle();
+        }
+        else {
+            client->errorValue = (visual ? visual : fbconfigId);
+            free(pGlxPixmap);
+            return BadValue;
+        }
+
+        XFlush(dpy);
     }
 
     if (!(AddResource(glxpixmapId, __glXPixmapRes, pGlxPixmap))) {
-        free( pGlxPixmap );
-	return BadAlloc;
+        free(pGlxPixmap);
+        return BadAlloc;
     }
 
     return Success;
 }
 
-int __glXCreateGLXPixmap(__GLXclientState *cl, GLbyte *pc)
+int
+__glXCreateGLXPixmap(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXCreateGLXPixmapReq *req = (xGLXCreateGLXPixmapReq *) pc;
 
-    return( CreateGLXPixmap(cl, req->visual, None,
-	                    req->screen, req->pixmap, req->glxpixmap) );
+    return (CreateGLXPixmap(cl, req->visual, None,
+                            req->screen, req->pixmap, req->glxpixmap));
 }
 
-int __glXCreatePixmap(__GLXclientState *cl, GLbyte *pc)
+int
+__glXCreatePixmap(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXCreatePixmapReq *req = (xGLXCreatePixmapReq *) pc;
 
-    return( CreateGLXPixmap(cl, None, req->fbconfig,
-	                    req->screen, req->pixmap, req->glxpixmap) );
+    return (CreateGLXPixmap(cl, None, req->fbconfig,
+                            req->screen, req->pixmap, req->glxpixmap));
 }
 
-int __glXDestroyGLXPixmap(__GLXclientState *cl, GLbyte *pc)
+int
+__glXDestroyGLXPixmap(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXDestroyGLXPixmapReq *req = (xGLXDestroyGLXPixmapReq *) pc;
@@ -1926,13 +2022,13 @@ int __glXDestroyGLXPixmap(__GLXclientState *cl, GLbyte *pc)
     int from_screen, to_screen;
 
     /*
-    ** Check if it's a valid GLX pixmap.
-    */
-    dixLookupResourceByType((pointer*) &pGlxPixmap, glxpixmap,
+     ** Check if it's a valid GLX pixmap.
+     */
+    dixLookupResourceByType((pointer *) &pGlxPixmap, glxpixmap,
                             __glXPixmapRes, NullClient, DixUnknownAccess);
     if (!pGlxPixmap) {
-	client->errorValue = glxpixmap;
-	return __glXBadPixmap;
+        client->errorValue = glxpixmap;
+        return __glXBadPixmap;
     }
     FreeResource(glxpixmap, FALSE);
 
@@ -1942,28 +2038,27 @@ int __glXDestroyGLXPixmap(__GLXclientState *cl, GLbyte *pc)
     from_screen = to_screen = pGlxPixmap->pDraw->pScreen->myNum;
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
-    for (s=from_screen; s<=to_screen; s++) {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
 
-       /* make sure pixmap exist in back-end */
-       dmxSync( dmxScreen, 1 );
+        /* make sure pixmap exist in back-end */
+        dmxSync(dmxScreen, 1);
 
-       LockDisplay(dpy);
-       GetReq(GLXDestroyGLXPixmap,req);
-       req->reqType = dmxScreen->glxMajorOpcode;
-       req->glxCode = X_GLXDestroyGLXPixmap;
-       req->glxpixmap = (unsigned int)pGlxPixmap->be_xids[s];
-       UnlockDisplay(dpy);
-       SyncHandle();
+        LockDisplay(dpy);
+        GetReq(GLXDestroyGLXPixmap, req);
+        req->reqType = dmxScreen->glxMajorOpcode;
+        req->glxCode = X_GLXDestroyGLXPixmap;
+        req->glxpixmap = (unsigned int) pGlxPixmap->be_xids[s];
+        UnlockDisplay(dpy);
+        SyncHandle();
     }
 
-    
     return Success;
 }
 
@@ -1974,7 +2069,8 @@ int __glXDestroyGLXPixmap(__GLXclientState *cl, GLbyte *pc)
 ** this time that is of value.  Consequently, this code must be
 ** implemented by somebody other than SGI.
 */
-int __glXDoSwapBuffers(__GLXclientState *cl, XID drawId, GLXContextTag tag)
+int
+__glXDoSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag)
 {
     ClientPtr client = cl->client;
     DrawablePtr pDraw;
@@ -1982,6 +2078,7 @@ int __glXDoSwapBuffers(__GLXclientState *cl, XID drawId, GLXContextTag tag)
     WindowPtr pWin = NULL;
     __GLXpixmap *pGlxPixmap = NULL;
     __GLXcontext *glxc = NULL;
+
 #ifdef PANORAMIX
     PanoramiXRes *pXinDraw = NULL;
 #endif
@@ -1989,152 +2086,154 @@ int __glXDoSwapBuffers(__GLXclientState *cl, XID drawId, GLXContextTag tag)
     int from_screen = 0;
     int to_screen = 0;
     int s, rc;
-    
+
     /*
-    ** Check that the GLX drawable is valid.
-    */
+     ** Check that the GLX drawable is valid.
+     */
     rc = dixLookupDrawable(&pDraw, drawId, client, 0, DixWriteAccess);
     if (rc == Success) {
         from_screen = to_screen = pDraw->pScreen->myNum;
 
-	if (pDraw->type == DRAWABLE_WINDOW) {
-	    /*
-	    ** Drawable is an X window.
-	    */
-	   pWin = (WindowPtr)pDraw;
-	} else {
-	    /*
-	    ** Drawable is an X pixmap, which is not allowed.
-	    */
-	    client->errorValue = drawId;
-	    return __glXBadDrawable;
-	}
-    } 
+        if (pDraw->type == DRAWABLE_WINDOW) {
+            /*
+             ** Drawable is an X window.
+             */
+            pWin = (WindowPtr) pDraw;
+        }
+        else {
+            /*
+             ** Drawable is an X pixmap, which is not allowed.
+             */
+            client->errorValue = drawId;
+            return __glXBadDrawable;
+        }
+    }
 
     if (!pDraw) {
-	dixLookupResourceByType((pointer*) &pGlxPixmap, drawId,
-				__glXPixmapRes, NullClient, DixUnknownAccess);
-	if (pGlxPixmap) {
-	    /*
-	    ** Drawable is a GLX pixmap.
-	    */
-	   pDraw = pGlxPixmap->pDraw;
-	   from_screen = to_screen = pGlxPixmap->pScreen->myNum;
-	}
-    }
-
-    if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-       dixLookupResourceByType((pointer*) &pGlxWindow, drawId,
-                               __glXWindowRes, NullClient, DixUnknownAccess);
-       if (pGlxWindow) {
-	  /*
-	   ** Drawable is a GLXWindow.
-	   */
-	  pDraw = pGlxWindow->pDraw;
-	  from_screen = to_screen = pGlxWindow->pScreen->myNum;
-       }
+        dixLookupResourceByType((pointer *) &pGlxPixmap, drawId,
+                                __glXPixmapRes, NullClient, DixUnknownAccess);
+        if (pGlxPixmap) {
+            /*
+             ** Drawable is a GLX pixmap.
+             */
+            pDraw = pGlxPixmap->pDraw;
+            from_screen = to_screen = pGlxPixmap->pScreen->myNum;
+        }
+    }
+
+    if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
+        dixLookupResourceByType((pointer *) &pGlxWindow, drawId,
+                                __glXWindowRes, NullClient, DixUnknownAccess);
+        if (pGlxWindow) {
+            /*
+             ** Drawable is a GLXWindow.
+             */
+            pDraw = pGlxWindow->pDraw;
+            from_screen = to_screen = pGlxWindow->pScreen->myNum;
+        }
     }
 
     if (!pDraw) {
-       /*
-	** Drawable is neither a X window nor a GLX pixmap.
-	*/
-       client->errorValue = drawId;
-       return __glXBadDrawable;
+        /*
+         ** Drawable is neither a X window nor a GLX pixmap.
+         */
+        client->errorValue = drawId;
+        return __glXBadDrawable;
     }
 
     if (tag) {
-	glxc = __glXLookupContextByTag(cl, tag);
-	if (!glxc) {
-	    return __glXBadContextTag;
-	}
+        glxc = __glXLookupContextByTag(cl, tag);
+        if (!glxc) {
+            return __glXBadContextTag;
+        }
     }
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
-       dixLookupResourceByClass((pointer*) &pXinDraw,
-				pDraw->id, XRC_DRAWABLE,
-				client, DixReadAccess);
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
+        dixLookupResourceByClass((pointer *) &pXinDraw,
+                                 pDraw->id, XRC_DRAWABLE,
+                                 client, DixReadAccess);
     }
 #endif
 
     /* If requested, send a glFinish to all back-end servers before swapping. */
     if (dmxGLXFinishSwap) {
-	for (s=from_screen; s<=to_screen; s++) {
-	    Display *dpy = GetBackEndDisplay(cl,s);
-	    DMXScreenInfo *dmxScreen = &dmxScreens[s];
-	    xGLXSingleReq *finishReq;
-	    xGLXSingleReply reply;
-
-#define X_GLXSingle 0    /* needed by GetReq below */
-
-	    LockDisplay(dpy);
-	    GetReq(GLXSingle,finishReq);
-	    finishReq->reqType = dmxScreen->glxMajorOpcode;
-	    finishReq->glxCode = X_GLsop_Finish;
-	    finishReq->contextTag = (tag ? GetCurrentBackEndTag(cl,tag,s) : 0);
-	    (void) _XReply(dpy, (xReply*) &reply, 0, False);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	}
+        for (s = from_screen; s <= to_screen; s++) {
+            Display *dpy = GetBackEndDisplay(cl, s);
+            DMXScreenInfo *dmxScreen = &dmxScreens[s];
+            xGLXSingleReq *finishReq;
+            xGLXSingleReply reply;
+
+#define X_GLXSingle 0           /* needed by GetReq below */
+
+            LockDisplay(dpy);
+            GetReq(GLXSingle, finishReq);
+            finishReq->reqType = dmxScreen->glxMajorOpcode;
+            finishReq->glxCode = X_GLsop_Finish;
+            finishReq->contextTag =
+                (tag ? GetCurrentBackEndTag(cl, tag, s) : 0);
+            (void) _XReply(dpy, (xReply *) & reply, 0, False);
+            UnlockDisplay(dpy);
+            SyncHandle();
+        }
     }
 
     /* If requested, send an XSync to all back-end servers before swapping. */
     if (dmxGLXSyncSwap) {
-	for (s=from_screen; s<=to_screen; s++)
-	    XSync(GetBackEndDisplay(cl,s), False);
+        for (s = from_screen; s <= to_screen; s++)
+            XSync(GetBackEndDisplay(cl, s), False);
     }
 
-
     /* send the SwapBuffers request to all back-end servers */
 
-    for (s=from_screen; s<=to_screen; s++) {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
-       unsigned int be_draw = 0;
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
+        unsigned int be_draw = 0;
 
-       if (pGlxPixmap) {
-	  be_draw = (unsigned int)pGlxPixmap->be_xids[s];
-       }
+        if (pGlxPixmap) {
+            be_draw = (unsigned int) pGlxPixmap->be_xids[s];
+        }
 #ifdef PANORAMIX
-       else if (pXinDraw) {
-	  dixLookupWindow(&pWin, pXinDraw->info[s].id, client, DixReadAccess);
-       }
+        else if (pXinDraw) {
+            dixLookupWindow(&pWin, pXinDraw->info[s].id, client, DixReadAccess);
+        }
 #endif
-       else if (pGlxWindow) {
-	  pWin = (WindowPtr)pGlxWindow->pDraw;
-       }
-
-       if (pWin && !be_draw) {
-	   be_draw = (unsigned int)(DMX_GET_WINDOW_PRIV(pWin))->window;
-	   if (!be_draw) {
-	      /* it might be that the window did not created yet on the */
-	      /* back-end server (lazy window creation option), force   */
-	      /* creation of the window */
-	      dmxCreateAndRealizeWindow( pWin, TRUE );
-	      be_draw = (unsigned int)(DMX_GET_WINDOW_PRIV(pWin))->window;
-	   }
-       }
-
-       dmxSync( dmxScreen, 1 );
-
-       LockDisplay(dpy);
-       GetReq(GLXSwapBuffers,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = X_GLXSwapBuffers;
-       be_req->drawable = be_draw;
-       be_req->contextTag = ( tag ? GetCurrentBackEndTag(cl,tag,s) : 0 );
-       UnlockDisplay(dpy);
-       SyncHandle();
-       XFlush(dpy);
+        else if (pGlxWindow) {
+            pWin = (WindowPtr) pGlxWindow->pDraw;
+        }
+
+        if (pWin && !be_draw) {
+            be_draw = (unsigned int) (DMX_GET_WINDOW_PRIV(pWin))->window;
+            if (!be_draw) {
+                /* it might be that the window did not created yet on the */
+                /* back-end server (lazy window creation option), force   */
+                /* creation of the window */
+                dmxCreateAndRealizeWindow(pWin, TRUE);
+                be_draw = (unsigned int) (DMX_GET_WINDOW_PRIV(pWin))->window;
+            }
+        }
+
+        dmxSync(dmxScreen, 1);
+
+        LockDisplay(dpy);
+        GetReq(GLXSwapBuffers, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = X_GLXSwapBuffers;
+        be_req->drawable = be_draw;
+        be_req->contextTag = (tag ? GetCurrentBackEndTag(cl, tag, s) : 0);
+        UnlockDisplay(dpy);
+        SyncHandle();
+        XFlush(dpy);
     }
 
     return Success;
 }
 
-int __glXSwapBuffers(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapBuffers(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     DrawablePtr pDraw;
@@ -2145,68 +2244,67 @@ int __glXSwapBuffers(__GLXclientState *cl, GLbyte *pc)
     __GLXcontext *glxc = NULL;
     __glXWindow *pGlxWindow = NULL;
     int rc;
-    
+
     /*
-    ** Check that the GLX drawable is valid.
-    */
+     ** Check that the GLX drawable is valid.
+     */
     rc = dixLookupDrawable(&pDraw, drawId, client, 0, DixWriteAccess);
     if (rc == Success) {
-	if (pDraw->type != DRAWABLE_WINDOW) {
-	    /*
-	    ** Drawable is an X pixmap, which is not allowed.
-	    */
-	    client->errorValue = drawId;
-	    return __glXBadDrawable;
-	}
-    } 
+        if (pDraw->type != DRAWABLE_WINDOW) {
+            /*
+             ** Drawable is an X pixmap, which is not allowed.
+             */
+            client->errorValue = drawId;
+            return __glXBadDrawable;
+        }
+    }
 
     if (!pDraw) {
-	dixLookupResourceByType((pointer*) &pGlxPixmap, drawId,
-				__glXPixmapRes, NullClient, DixUnknownAccess);
-	if (pGlxPixmap) {
-	    /*
-	    ** Drawable is a GLX pixmap.
-	    */
-	   pDraw = pGlxPixmap->pDraw;
-	}
-    }
-
-    if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1,3) ) {
-       dixLookupResourceByType((pointer*) &pGlxWindow, drawId,
-                               __glXWindowRes, NullClient, DixUnknownAccess);
-       if (pGlxWindow) {
-	  /*
-	   ** Drawable is a GLXWindow.
-	   */
-	  pDraw = pGlxWindow->pDraw;
-       }
+        dixLookupResourceByType((pointer *) &pGlxPixmap, drawId,
+                                __glXPixmapRes, NullClient, DixUnknownAccess);
+        if (pGlxPixmap) {
+            /*
+             ** Drawable is a GLX pixmap.
+             */
+            pDraw = pGlxPixmap->pDraw;
+        }
+    }
+
+    if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
+        dixLookupResourceByType((pointer *) &pGlxWindow, drawId,
+                                __glXWindowRes, NullClient, DixUnknownAccess);
+        if (pGlxWindow) {
+            /*
+             ** Drawable is a GLXWindow.
+             */
+            pDraw = pGlxWindow->pDraw;
+        }
     }
 
     if (!pDraw) {
-       /*
-	** Drawable is neither a X window nor a GLX pixmap.
-	*/
-       client->errorValue = drawId;
-       return __glXBadDrawable;
+        /*
+         ** Drawable is neither a X window nor a GLX pixmap.
+         */
+        client->errorValue = drawId;
+        return __glXBadDrawable;
     }
 
     if (tag) {
-	glxc = __glXLookupContextByTag(cl, tag);
-	if (!glxc) {
-	    return __glXBadContextTag;
-	}
+        glxc = __glXLookupContextByTag(cl, tag);
+        if (!glxc) {
+            return __glXBadContextTag;
+        }
     }
 
     if (pDraw &&
-	pDraw->type == DRAWABLE_WINDOW &&
-	DMX_GET_WINDOW_PRIV((WindowPtr)pDraw)->swapGroup) {
-	return SGSwapBuffers(cl, drawId, tag, pDraw);
+        pDraw->type == DRAWABLE_WINDOW &&
+        DMX_GET_WINDOW_PRIV((WindowPtr) pDraw)->swapGroup) {
+        return SGSwapBuffers(cl, drawId, tag, pDraw);
     }
 
     return __glXDoSwapBuffers(cl, drawId, tag);
 }
 
-
 /************************************************************************/
 
 /*
@@ -2217,7 +2315,8 @@ int __glXSwapBuffers(__GLXclientState *cl, GLbyte *pc)
 /*
 ** Execute all the drawing commands in a request.
 */
-int __glXRender(__GLXclientState *cl, GLbyte *pc)
+int
+__glXRender(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXRenderReq *req;
     xGLXRenderReq *be_req;
@@ -2228,23 +2327,23 @@ int __glXRender(__GLXclientState *cl, GLbyte *pc)
     int s;
 
     /*
-    ** NOTE: much of this code also appears in the byteswapping version of this
-    ** routine, __glXSwapRender().  Any changes made here should also be
-    ** duplicated there.
-    */
-    
+     ** NOTE: much of this code also appears in the byteswapping version of this
+     ** routine, __glXSwapRender().  Any changes made here should also be
+     ** duplicated there.
+     */
+
     req = (xGLXRenderReq *) pc;
 
     glxc = __glXLookupContextByTag(cl, req->contextTag);
     if (!glxc) {
-	return 0;
+        return 0;
     }
     from_screen = to_screen = glxc->pScreen->myNum;
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
@@ -2254,19 +2353,19 @@ int __glXRender(__GLXclientState *cl, GLbyte *pc)
     /*
      * just forward the request to back-end server(s)
      */
-    for (s=from_screen; s<=to_screen; s++) {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
 
-       LockDisplay(dpy);
-       GetReq(GLXRender,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = X_GLXRender;
-       be_req->length = req->length;
-       be_req->contextTag = GetCurrentBackEndTag(cl,req->contextTag,s);
-       _XSend(dpy, (const char *)pc, size);
-       UnlockDisplay(dpy);
-       SyncHandle();
+        LockDisplay(dpy);
+        GetReq(GLXRender, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = X_GLXRender;
+        be_req->length = req->length;
+        be_req->contextTag = GetCurrentBackEndTag(cl, req->contextTag, s);
+        _XSend(dpy, (const char *) pc, size);
+        UnlockDisplay(dpy);
+        SyncHandle();
     }
 
     return Success;
@@ -2275,7 +2374,8 @@ int __glXRender(__GLXclientState *cl, GLbyte *pc)
 /*
 ** Execute a large rendering request (one that spans multiple X requests).
 */
-int __glXRenderLarge(__GLXclientState *cl, GLbyte *pc)
+int
+__glXRenderLarge(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXRenderLargeReq *req;
     xGLXRenderLargeReq *be_req;
@@ -2285,22 +2385,22 @@ int __glXRenderLarge(__GLXclientState *cl, GLbyte *pc)
     int s;
 
     /*
-    ** NOTE: much of this code also appears in the byteswapping version of this
-    ** routine, __glXSwapRenderLarge().  Any changes made here should also be
-    ** duplicated there.
-    */
-    
+     ** NOTE: much of this code also appears in the byteswapping version of this
+     ** routine, __glXSwapRenderLarge().  Any changes made here should also be
+     ** duplicated there.
+     */
+
     req = (xGLXRenderLargeReq *) pc;
     glxc = __glXLookupContextByTag(cl, req->contextTag);
     if (!glxc) {
-	return 0;
+        return 0;
     }
     from_screen = to_screen = glxc->pScreen->myNum;
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
@@ -2309,82 +2409,82 @@ int __glXRenderLarge(__GLXclientState *cl, GLbyte *pc)
     /*
      * just forward the request to back-end server(s)
      */
-    for (s=from_screen; s<=to_screen; s++) {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
 
-       GetReq(GLXRenderLarge,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = X_GLXRenderLarge;
-       be_req->contextTag = GetCurrentBackEndTag(cl,req->contextTag,s);
-       be_req->length = req->length;
-       be_req->requestNumber = req->requestNumber;
-       be_req->requestTotal = req->requestTotal;
-       be_req->dataBytes = req->dataBytes;
-       Data(dpy, (const char *)pc, req->dataBytes);
-       UnlockDisplay(dpy);
-       SyncHandle();
+        GetReq(GLXRenderLarge, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = X_GLXRenderLarge;
+        be_req->contextTag = GetCurrentBackEndTag(cl, req->contextTag, s);
+        be_req->length = req->length;
+        be_req->requestNumber = req->requestNumber;
+        be_req->requestTotal = req->requestTotal;
+        be_req->dataBytes = req->dataBytes;
+        Data(dpy, (const char *) pc, req->dataBytes);
+        UnlockDisplay(dpy);
+        SyncHandle();
 
     }
 
     return Success;
 }
 
-
 /************************************************************************/
 
-int __glXVendorPrivate(__GLXclientState *cl, GLbyte *pc)
+int
+__glXVendorPrivate(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *req;
 
     req = (xGLXVendorPrivateReq *) pc;
 
-    switch( req->vendorCode ) {
-
-       case X_GLvop_DeleteTexturesEXT:
-	  return __glXVForwardSingleReq( cl, pc );
-	  break;
-
-       case X_GLXvop_SwapIntervalSGI:
-	  if (glxIsExtensionSupported("SGI_swap_control")) {
-	     return __glXVForwardSingleReq( cl, pc );
-	  }
-	  else {
-	     return Success;
-	  }
-	  break;
-
-#if 0 /* glx 1.3 */
-       case X_GLXvop_CreateGLXVideoSourceSGIX:
-	  break;
-       case X_GLXvop_DestroyGLXVideoSourceSGIX:
-	  break;
-       case X_GLXvop_CreateGLXPixmapWithConfigSGIX:
-	  break;
-       case X_GLXvop_DestroyGLXPbufferSGIX:
-	  break;
-       case X_GLXvop_ChangeDrawableAttributesSGIX:
-	  break;
+    switch (req->vendorCode) {
+
+    case X_GLvop_DeleteTexturesEXT:
+        return __glXVForwardSingleReq(cl, pc);
+        break;
+
+    case X_GLXvop_SwapIntervalSGI:
+        if (glxIsExtensionSupported("SGI_swap_control")) {
+            return __glXVForwardSingleReq(cl, pc);
+        }
+        else {
+            return Success;
+        }
+        break;
+
+#if 0                           /* glx 1.3 */
+    case X_GLXvop_CreateGLXVideoSourceSGIX:
+        break;
+    case X_GLXvop_DestroyGLXVideoSourceSGIX:
+        break;
+    case X_GLXvop_CreateGLXPixmapWithConfigSGIX:
+        break;
+    case X_GLXvop_DestroyGLXPbufferSGIX:
+        break;
+    case X_GLXvop_ChangeDrawableAttributesSGIX:
+        break;
 #endif
 
-       case X_GLXvop_BindSwapBarrierSGIX:
-	  return __glXBindSwapBarrierSGIX( cl, pc );
-	  break;
+    case X_GLXvop_BindSwapBarrierSGIX:
+        return __glXBindSwapBarrierSGIX(cl, pc);
+        break;
 
-       case X_GLXvop_JoinSwapGroupSGIX:
-	  return __glXJoinSwapGroupSGIX( cl, pc );
-	  break;
+    case X_GLXvop_JoinSwapGroupSGIX:
+        return __glXJoinSwapGroupSGIX(cl, pc);
+        break;
 
-       case X_GLXvop_CreateContextWithConfigSGIX:
-	  return __glXCreateContextWithConfigSGIX( cl, pc );
-	  break;
+    case X_GLXvop_CreateContextWithConfigSGIX:
+        return __glXCreateContextWithConfigSGIX(cl, pc);
+        break;
 
-       default:
-	  /*
-	   ** unsupported private request
-	   */
-	  cl->client->errorValue = req->vendorCode;
-	  return __glXUnsupportedPrivateRequest;
+    default:
+        /*
+         ** unsupported private request
+         */
+        cl->client->errorValue = req->vendorCode;
+        return __glXUnsupportedPrivateRequest;
     }
 
     cl->client->errorValue = req->vendorCode;
@@ -2392,78 +2492,79 @@ int __glXVendorPrivate(__GLXclientState *cl, GLbyte *pc)
 
 }
 
-int __glXVendorPrivateWithReply(__GLXclientState *cl, GLbyte *pc)
+int
+__glXVendorPrivateWithReply(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateWithReplyReq *req;
 
     req = (xGLXVendorPrivateWithReplyReq *) pc;
 
-    switch( req->vendorCode ) {
-
-       case X_GLvop_GetConvolutionFilterEXT:
-       case X_GLvop_GetConvolutionParameterfvEXT:
-       case X_GLvop_GetConvolutionParameterivEXT:
-       case X_GLvop_GetSeparableFilterEXT:
-       case X_GLvop_GetHistogramEXT:
-       case X_GLvop_GetHistogramParameterivEXT:
-       case X_GLvop_GetMinmaxEXT:
-       case X_GLvop_GetMinmaxParameterfvEXT:
-       case X_GLvop_GetMinmaxParameterivEXT:
-       case X_GLvop_AreTexturesResidentEXT:
-       case X_GLvop_IsTextureEXT:
-	  return( __glXVForwardPipe0WithReply(cl, pc) );
-	  break;
-
-       case X_GLvop_GenTexturesEXT:
-	  return( __glXVForwardAllWithReply(cl, pc) );
-	  break;
-
-
-#if 0 /* glx1.3 */
-       case X_GLvop_GetDetailTexFuncSGIS:
-       case X_GLvop_GetSharpenTexFuncSGIS:
-       case X_GLvop_GetColorTableSGI:
-       case X_GLvop_GetColorTableParameterfvSGI:
-       case X_GLvop_GetColorTableParameterivSGI:
-       case X_GLvop_GetTexFilterFuncSGIS:
-       case X_GLvop_GetInstrumentsSGIX:
-       case X_GLvop_InstrumentsBufferSGIX:
-       case X_GLvop_PollInstrumentsSGIX:
-       case X_GLvop_FlushRasterSGIX:
-       case X_GLXvop_CreateGLXPbufferSGIX:
-       case X_GLXvop_GetDrawableAttributesSGIX:
-       case X_GLXvop_QueryHyperpipeNetworkSGIX:
-       case X_GLXvop_QueryHyperpipeConfigSGIX:
-       case X_GLXvop_HyperpipeConfigSGIX:
-       case X_GLXvop_DestroyHyperpipeConfigSGIX:
+    switch (req->vendorCode) {
+
+    case X_GLvop_GetConvolutionFilterEXT:
+    case X_GLvop_GetConvolutionParameterfvEXT:
+    case X_GLvop_GetConvolutionParameterivEXT:
+    case X_GLvop_GetSeparableFilterEXT:
+    case X_GLvop_GetHistogramEXT:
+    case X_GLvop_GetHistogramParameterivEXT:
+    case X_GLvop_GetMinmaxEXT:
+    case X_GLvop_GetMinmaxParameterfvEXT:
+    case X_GLvop_GetMinmaxParameterivEXT:
+    case X_GLvop_AreTexturesResidentEXT:
+    case X_GLvop_IsTextureEXT:
+        return (__glXVForwardPipe0WithReply(cl, pc));
+        break;
+
+    case X_GLvop_GenTexturesEXT:
+        return (__glXVForwardAllWithReply(cl, pc));
+        break;
+
+#if 0                           /* glx1.3 */
+    case X_GLvop_GetDetailTexFuncSGIS:
+    case X_GLvop_GetSharpenTexFuncSGIS:
+    case X_GLvop_GetColorTableSGI:
+    case X_GLvop_GetColorTableParameterfvSGI:
+    case X_GLvop_GetColorTableParameterivSGI:
+    case X_GLvop_GetTexFilterFuncSGIS:
+    case X_GLvop_GetInstrumentsSGIX:
+    case X_GLvop_InstrumentsBufferSGIX:
+    case X_GLvop_PollInstrumentsSGIX:
+    case X_GLvop_FlushRasterSGIX:
+    case X_GLXvop_CreateGLXPbufferSGIX:
+    case X_GLXvop_GetDrawableAttributesSGIX:
+    case X_GLXvop_QueryHyperpipeNetworkSGIX:
+    case X_GLXvop_QueryHyperpipeConfigSGIX:
+    case X_GLXvop_HyperpipeConfigSGIX:
+    case X_GLXvop_DestroyHyperpipeConfigSGIX:
 #endif
-       case X_GLXvop_QueryMaxSwapBarriersSGIX:
-	  return( __glXQueryMaxSwapBarriersSGIX(cl, pc) );
-	  break;
+    case X_GLXvop_QueryMaxSwapBarriersSGIX:
+        return (__glXQueryMaxSwapBarriersSGIX(cl, pc));
+        break;
 
-       case X_GLXvop_GetFBConfigsSGIX:
-	  return( __glXGetFBConfigsSGIX(cl, pc) );
-	  break;
+    case X_GLXvop_GetFBConfigsSGIX:
+        return (__glXGetFBConfigsSGIX(cl, pc));
+        break;
 
-       case X_GLXvop_MakeCurrentReadSGI:
-	  return( __glXMakeCurrentReadSGI(cl, pc) );
-	  break;
+    case X_GLXvop_MakeCurrentReadSGI:
+        return (__glXMakeCurrentReadSGI(cl, pc));
+        break;
 
-       case X_GLXvop_QueryContextInfoEXT:
-	  return( __glXQueryContextInfoEXT(cl,pc) );
-	  break;
+    case X_GLXvop_QueryContextInfoEXT:
+        return (__glXQueryContextInfoEXT(cl, pc));
+        break;
 
-       default:
-	  /*
-	   ** unsupported private request
-	   */
-	  cl->client->errorValue = req->vendorCode;
-	  return __glXUnsupportedPrivateRequest;
+    default:
+        /*
+         ** unsupported private request
+         */
+        cl->client->errorValue = req->vendorCode;
+        return __glXUnsupportedPrivateRequest;
     }
 
 }
 
-int __glXQueryExtensionsString(__GLXclientState *cl, GLbyte *pc)
+int
+__glXQueryExtensionsString(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXQueryExtensionsStringReq *req = (xGLXQueryExtensionsStringReq *) pc;
@@ -2484,34 +2585,36 @@ int __glXQueryExtensionsString(__GLXclientState *cl, GLbyte *pc)
     screen = req->screen;
 
     /*
-    ** Check if screen exists.
-    */
+     ** Check if screen exists.
+     */
     if ((screen < 0) || (screen >= screenInfo.numScreens)) {
-	client->errorValue = screen;
-	return BadValue;
+        client->errorValue = screen;
+        return BadValue;
     }
 
 #ifdef FWD_QUERY_REQ
     dmxScreen = &dmxScreens[screen];
 
     /* Send the glXQueryServerString request */
-    dpy = GetBackEndDisplay(cl,screen);
+    dpy = GetBackEndDisplay(cl, screen);
     LockDisplay(dpy);
-    GetReq(GLXQueryExtensionsString,be_req);
+    GetReq(GLXQueryExtensionsString, be_req);
     be_req->reqType = dmxScreen->glxMajorOpcode;
     be_req->glxCode = X_GLXQueryServerString;
     be_req->screen = DefaultScreen(dpy);
-    _XReply(dpy, (xReply*) &be_reply, 0, False);
-    len = (int)be_reply.length;
-    numbytes = (int)be_reply.n;
+    _XReply(dpy, (xReply *) & be_reply, 0, False);
+    len = (int) be_reply.length;
+    numbytes = (int) be_reply.n;
     slop = numbytes * __GLX_SIZE_INT8 & 3;
-    be_buf = (char *)malloc(numbytes);
+    be_buf = (char *) malloc(numbytes);
     if (!be_buf) {
         /* Throw data on the floor */
         _XEatData(dpy, len);
-    } else {
-        _XRead(dpy, (char *)be_buf, numbytes);
-        if (slop) _XEatData(dpy,4-slop);
+    }
+    else {
+        _XRead(dpy, (char *) be_buf, numbytes);
+        if (slop)
+            _XEatData(dpy, 4 - slop);
     }
     UnlockDisplay(dpy);
     SyncHandle();
@@ -2532,15 +2635,18 @@ int __glXQueryExtensionsString(__GLXclientState *cl, GLbyte *pc)
 
     if (client->swapped) {
         glxSwapQueryExtensionsStringReply(client, &reply, be_buf);
-    } else {
-        WriteToClient(client, sz_xGLXQueryExtensionsStringReply,(char *)&reply);
-        WriteToClient(client, (int)(length << 2), (char *)be_buf);
+    }
+    else {
+        WriteToClient(client, sz_xGLXQueryExtensionsStringReply,
+                      (char *) &reply);
+        WriteToClient(client, (int) (length << 2), (char *) be_buf);
     }
 
     return Success;
 }
 
-int __glXQueryServerString(__GLXclientState *cl, GLbyte *pc)
+int
+__glXQueryServerString(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXQueryServerStringReq *req = (xGLXQueryServerStringReq *) pc;
@@ -2550,46 +2656,49 @@ int __glXQueryServerString(__GLXclientState *cl, GLbyte *pc)
     size_t length;
     int len, numbytes;
     char *be_buf;
+
 #ifdef FWD_QUERY_REQ
     xGLXQueryServerStringReq *be_req;
     xGLXQueryServerStringReply be_reply;
     DMXScreenInfo *dmxScreen;
     Display *dpy;
-    int  slop;
+    int slop;
 #endif
 
     name = req->name;
     screen = req->screen;
     /*
-    ** Check if screen exists.
-    */
+     ** Check if screen exists.
+     */
     if ((screen < 0) || (screen >= screenInfo.numScreens)) {
-	client->errorValue = screen;
-	return BadValue;
+        client->errorValue = screen;
+        return BadValue;
     }
 
 #ifdef FWD_QUERY_REQ
     dmxScreen = &dmxScreens[screen];
 
     /* Send the glXQueryServerString request */
-    dpy = GetBackEndDisplay(cl,screen);
+    dpy = GetBackEndDisplay(cl, screen);
     LockDisplay(dpy);
-    GetReq(GLXQueryServerString,be_req);
+    GetReq(GLXQueryServerString, be_req);
     be_req->reqType = dmxScreen->glxMajorOpcode;
     be_req->glxCode = X_GLXQueryServerString;
     be_req->screen = DefaultScreen(dpy);
     be_req->name = name;
-    _XReply(dpy, (xReply*) &be_reply, 0, False);
-    len = (int)be_reply.length;
-    numbytes = (int)be_reply.n;
+    _XReply(dpy, (xReply *) & be_reply, 0, False);
+    len = (int) be_reply.length;
+    numbytes = (int) be_reply.n;
     slop = numbytes * __GLX_SIZE_INT8 & 3;
-    be_buf = (char *)malloc(numbytes);
+    be_buf = (char *) malloc(numbytes);
     if (!be_buf) {
         /* Throw data on the floor */
         _XEatData(dpy, len);
-    } else {
-        _XRead(dpy, (char *)be_buf, numbytes);
-        if (slop) _XEatData(dpy,4-slop);
+    }
+    else {
+        _XRead(dpy, (char *) be_buf, numbytes);
+        if (slop)
+            _XEatData(dpy, 4 - slop);
     }
     UnlockDisplay(dpy);
     SyncHandle();
@@ -2608,15 +2717,17 @@ int __glXQueryServerString(__GLXclientState *cl, GLbyte *pc)
 
     if (client->swapped) {
         glxSwapQueryServerStringReply(client, &reply, be_buf);
-    } else {
-        WriteToClient(client, sz_xGLXQueryServerStringReply, (char *)&reply);
-        WriteToClient(client, (int)(length << 2), be_buf);
+    }
+    else {
+        WriteToClient(client, sz_xGLXQueryServerStringReply, (char *) &reply);
+        WriteToClient(client, (int) (length << 2), be_buf);
     }
 
     return Success;
 }
 
-int __glXClientInfo(__GLXclientState *cl, GLbyte *pc)
+int
+__glXClientInfo(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXClientInfoReq *req = (xGLXClientInfoReq *) pc;
     xGLXClientInfoReq *be_req;
@@ -2624,38 +2735,38 @@ int __glXClientInfo(__GLXclientState *cl, GLbyte *pc)
     int from_screen = 0;
     int to_screen = 0;
     int s;
-   
+
     cl->GLClientmajorVersion = req->major;
     cl->GLClientminorVersion = req->minor;
     free(cl->GLClientextensions);
-    buf = (const char *)(req+1);
+    buf = (const char *) (req + 1);
     cl->GLClientextensions = strdup(buf);
 
     to_screen = screenInfo.numScreens - 1;
 
-    for (s=from_screen; s<=to_screen; s++)
-    {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
 
-       LockDisplay(dpy);
-       GetReq(GLXClientInfo,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = X_GLXClientInfo;
-       be_req->major = req->major;
-       be_req->minor = req->minor;
-       be_req->length = req->length;
-       be_req->numbytes = req->numbytes;
-       Data(dpy, buf, req->numbytes);
+        LockDisplay(dpy);
+        GetReq(GLXClientInfo, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = X_GLXClientInfo;
+        be_req->major = req->major;
+        be_req->minor = req->minor;
+        be_req->length = req->length;
+        be_req->numbytes = req->numbytes;
+        Data(dpy, buf, req->numbytes);
 
-       UnlockDisplay(dpy);
-       SyncHandle();
+        UnlockDisplay(dpy);
+        SyncHandle();
     }
 
     return Success;
 }
 
-int __glXUseXFont(__GLXclientState *cl, GLbyte *pc)
+int
+__glXUseXFont(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXUseXFontReq *req;
@@ -2665,66 +2776,66 @@ int __glXUseXFont(__GLXclientState *cl, GLbyte *pc)
     int from_screen = 0;
     int to_screen = 0;
     int s;
-    dmxFontPrivPtr  pFontPriv;
+    dmxFontPrivPtr pFontPriv;
     DMXScreenInfo *dmxScreen;
     Display *dpy;
 
     req = (xGLXUseXFontReq *) pc;
 
     if (req->contextTag != 0) {
-	glxc = __glXLookupContextByTag(cl, req->contextTag);
-	if (glxc) {
-	   from_screen = to_screen = glxc->pScreen->myNum;
-	}
+        glxc = __glXLookupContextByTag(cl, req->contextTag);
+        if (glxc) {
+            from_screen = to_screen = glxc->pScreen->myNum;
+        }
     }
 
     /*
-    ** Font can actually be either the ID of a font or the ID of a GC
-    ** containing a font.
-    */
-    dixLookupResourceByType((pointer*) &pFont, req->font, RT_FONT,
+     ** Font can actually be either the ID of a font or the ID of a GC
+     ** containing a font.
+     */
+    dixLookupResourceByType((pointer *) &pFont, req->font, RT_FONT,
                             NullClient, DixUnknownAccess);
     if (!pFont) {
         GC *pGC;
-        dixLookupResourceByType((pointer*) &pGC, req->font,
-				RT_GC, NullClient,
-				DixUnknownAccess);
+
+        dixLookupResourceByType((pointer *) &pGC, req->font,
+                                RT_GC, NullClient, DixUnknownAccess);
         if (!pGC) {
-	    client->errorValue = req->font;
+            client->errorValue = req->font;
             return BadFont;
-	}
-	pFont = pGC->font;
+        }
+        pFont = pGC->font;
     }
 
     pFontPriv = FontGetPrivate(pFont, dmxFontPrivateIndex);
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
+    for (s = from_screen; s <= to_screen; s++) {
+        dmxScreen = &dmxScreens[s];
+        dpy = GetBackEndDisplay(cl, s);
 
-    for (s=from_screen; s<=to_screen; s++) {
-       dmxScreen = &dmxScreens[s];
-       dpy = GetBackEndDisplay(cl,s);
-
-       dmxSync( dmxScreen, 1 );
+        dmxSync(dmxScreen, 1);
 
-       LockDisplay(dpy);
-       GetReq(GLXUseXFont,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = X_GLXUseXFont;
-       be_req->contextTag = (glxc ? GetCurrentBackEndTag(cl,req->contextTag,s) : 0);
-       be_req->font = pFontPriv->font[s]->fid;
-       be_req->first = req->first;
-       be_req->count = req->count;
-       be_req->listBase = req->listBase;
-       UnlockDisplay(dpy);
-       SyncHandle();
+        LockDisplay(dpy);
+        GetReq(GLXUseXFont, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = X_GLXUseXFont;
+        be_req->contextTag =
+            (glxc ? GetCurrentBackEndTag(cl, req->contextTag, s) : 0);
+        be_req->font = pFontPriv->font[s]->fid;
+        be_req->first = req->first;
+        be_req->count = req->count;
+        be_req->listBase = req->listBase;
+        UnlockDisplay(dpy);
+        SyncHandle();
 
-       XSync( dpy, False );
+        XSync(dpy, False);
     }
 
     return Success;
@@ -2734,7 +2845,8 @@ int __glXUseXFont(__GLXclientState *cl, GLbyte *pc)
  * start GLX 1.3 here
  */
 
-int __glXGetFBConfigs(__GLXclientState *cl, GLbyte *pc)
+int
+__glXGetFBConfigs(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXGetFBConfigsReq *req = (xGLXGetFBConfigsReq *) pc;
@@ -2747,9 +2859,9 @@ int __glXGetFBConfigs(__GLXclientState *cl, GLbyte *pc)
     __GLXscreenInfo *pGlxScreen;
 
     if (screen >= screenInfo.numScreens) {
-	/* The client library must send a valid screen number. */
-	client->errorValue = screen;
-	return BadValue;
+        /* The client library must send a valid screen number. */
+        client->errorValue = screen;
+        return BadValue;
     }
 
     pGlxScreen = &__glXActiveScreens[screen];
@@ -2762,169 +2874,174 @@ int __glXGetFBConfigs(__GLXclientState *cl, GLbyte *pc)
     reply.sequenceNumber = client->sequence;
 
     if (client->swapped) {
-	__GLX_DECLARE_SWAP_VARIABLES;
-	__GLX_SWAP_SHORT(&reply.sequenceNumber);
-	__GLX_SWAP_INT(&reply.length);
-	__GLX_SWAP_INT(&reply.numFBConfigs);
-	__GLX_SWAP_INT(&reply.numAttribs);
-    }
-    WriteToClient(client, sz_xGLXGetFBConfigsReply, (char *)&reply);
-
-    for (i=0; i < numFBConfigs; i++) {
-       int associatedVisualId = 0;
-       int drawableTypeIndex;
-       pFBConfig = __glXFBConfigs[ i * (screenInfo.numScreens+1) ];
-
-	p = 0;
-	/* core attributes */
-	buf[p++] = GLX_FBCONFIG_ID;
-	buf[p++] = pFBConfig->id;
-	buf[p++] = GLX_BUFFER_SIZE;
-	buf[p++] = pFBConfig->indexBits;
-	buf[p++] = GLX_LEVEL;
-	buf[p++] = pFBConfig->level;
-	buf[p++] = GLX_DOUBLEBUFFER;
-	buf[p++] = pFBConfig->doubleBufferMode;
-	buf[p++] = GLX_STEREO;
-	buf[p++] = pFBConfig->stereoMode;
-	buf[p++] = GLX_AUX_BUFFERS;
-	buf[p++] = pFBConfig->maxAuxBuffers;
-	buf[p++] = GLX_RED_SIZE;
-	buf[p++] = pFBConfig->redBits;
-	buf[p++] = GLX_GREEN_SIZE;
-	buf[p++] = pFBConfig->greenBits;
-	buf[p++] = GLX_BLUE_SIZE;
-	buf[p++] = pFBConfig->blueBits;
-	buf[p++] = GLX_ALPHA_SIZE;
-	buf[p++] = pFBConfig->alphaBits;
-	buf[p++] = GLX_DEPTH_SIZE;
-	buf[p++] = pFBConfig->depthBits;
-	buf[p++] = GLX_STENCIL_SIZE;
-	buf[p++] = pFBConfig->stencilBits;
-	buf[p++] = GLX_ACCUM_RED_SIZE;
-	buf[p++] = pFBConfig->accumRedBits;
-	buf[p++] = GLX_ACCUM_GREEN_SIZE;
-	buf[p++] = pFBConfig->accumGreenBits;
-	buf[p++] = GLX_ACCUM_BLUE_SIZE;
-	buf[p++] = pFBConfig->accumBlueBits;
-	buf[p++] = GLX_ACCUM_ALPHA_SIZE;
-	buf[p++] = pFBConfig->accumAlphaBits;
-	buf[p++] = GLX_RENDER_TYPE;
-	buf[p++] = pFBConfig->renderType;
-	buf[p++] = GLX_DRAWABLE_TYPE;
-	drawableTypeIndex = p;
-	buf[p++] = pFBConfig->drawableType;
-	buf[p++] = GLX_X_VISUAL_TYPE;
-	buf[p++] = pFBConfig->visualType;
-	buf[p++] = GLX_CONFIG_CAVEAT;
-	buf[p++] = pFBConfig->visualCaveat;
-	buf[p++] = GLX_TRANSPARENT_TYPE;
-	buf[p++] = pFBConfig->transparentType;
-	buf[p++] = GLX_TRANSPARENT_RED_VALUE;
-	buf[p++] = pFBConfig->transparentRed;
-	buf[p++] = GLX_TRANSPARENT_GREEN_VALUE;
-	buf[p++] = pFBConfig->transparentGreen;
-	buf[p++] = GLX_TRANSPARENT_BLUE_VALUE;
-	buf[p++] = pFBConfig->transparentBlue;
-	buf[p++] = GLX_TRANSPARENT_ALPHA_VALUE;
-	buf[p++] = pFBConfig->transparentAlpha;
-	buf[p++] = GLX_TRANSPARENT_INDEX_VALUE;
-	buf[p++] = pFBConfig->transparentIndex;
-	buf[p++] = GLX_MAX_PBUFFER_WIDTH;
-	buf[p++] = pFBConfig->maxPbufferWidth;
-	buf[p++] = GLX_MAX_PBUFFER_HEIGHT;
-	buf[p++] = pFBConfig->maxPbufferHeight;
-	buf[p++] = GLX_MAX_PBUFFER_PIXELS;
-	buf[p++] = pFBConfig->maxPbufferPixels;
-
-	/*
+        __GLX_DECLARE_SWAP_VARIABLES;
+        __GLX_SWAP_SHORT(&reply.sequenceNumber);
+        __GLX_SWAP_INT(&reply.length);
+        __GLX_SWAP_INT(&reply.numFBConfigs);
+        __GLX_SWAP_INT(&reply.numAttribs);
+    }
+    WriteToClient(client, sz_xGLXGetFBConfigsReply, (char *) &reply);
+
+    for (i = 0; i < numFBConfigs; i++) {
+        int associatedVisualId = 0;
+        int drawableTypeIndex;
+
+        pFBConfig = __glXFBConfigs[i * (screenInfo.numScreens + 1)];
+
+        p = 0;
+        /* core attributes */
+        buf[p++] = GLX_FBCONFIG_ID;
+        buf[p++] = pFBConfig->id;
+        buf[p++] = GLX_BUFFER_SIZE;
+        buf[p++] = pFBConfig->indexBits;
+        buf[p++] = GLX_LEVEL;
+        buf[p++] = pFBConfig->level;
+        buf[p++] = GLX_DOUBLEBUFFER;
+        buf[p++] = pFBConfig->doubleBufferMode;
+        buf[p++] = GLX_STEREO;
+        buf[p++] = pFBConfig->stereoMode;
+        buf[p++] = GLX_AUX_BUFFERS;
+        buf[p++] = pFBConfig->maxAuxBuffers;
+        buf[p++] = GLX_RED_SIZE;
+        buf[p++] = pFBConfig->redBits;
+        buf[p++] = GLX_GREEN_SIZE;
+        buf[p++] = pFBConfig->greenBits;
+        buf[p++] = GLX_BLUE_SIZE;
+        buf[p++] = pFBConfig->blueBits;
+        buf[p++] = GLX_ALPHA_SIZE;
+        buf[p++] = pFBConfig->alphaBits;
+        buf[p++] = GLX_DEPTH_SIZE;
+        buf[p++] = pFBConfig->depthBits;
+        buf[p++] = GLX_STENCIL_SIZE;
+        buf[p++] = pFBConfig->stencilBits;
+        buf[p++] = GLX_ACCUM_RED_SIZE;
+        buf[p++] = pFBConfig->accumRedBits;
+        buf[p++] = GLX_ACCUM_GREEN_SIZE;
+        buf[p++] = pFBConfig->accumGreenBits;
+        buf[p++] = GLX_ACCUM_BLUE_SIZE;
+        buf[p++] = pFBConfig->accumBlueBits;
+        buf[p++] = GLX_ACCUM_ALPHA_SIZE;
+        buf[p++] = pFBConfig->accumAlphaBits;
+        buf[p++] = GLX_RENDER_TYPE;
+        buf[p++] = pFBConfig->renderType;
+        buf[p++] = GLX_DRAWABLE_TYPE;
+        drawableTypeIndex = p;
+        buf[p++] = pFBConfig->drawableType;
+        buf[p++] = GLX_X_VISUAL_TYPE;
+        buf[p++] = pFBConfig->visualType;
+        buf[p++] = GLX_CONFIG_CAVEAT;
+        buf[p++] = pFBConfig->visualCaveat;
+        buf[p++] = GLX_TRANSPARENT_TYPE;
+        buf[p++] = pFBConfig->transparentType;
+        buf[p++] = GLX_TRANSPARENT_RED_VALUE;
+        buf[p++] = pFBConfig->transparentRed;
+        buf[p++] = GLX_TRANSPARENT_GREEN_VALUE;
+        buf[p++] = pFBConfig->transparentGreen;
+        buf[p++] = GLX_TRANSPARENT_BLUE_VALUE;
+        buf[p++] = pFBConfig->transparentBlue;
+        buf[p++] = GLX_TRANSPARENT_ALPHA_VALUE;
+        buf[p++] = pFBConfig->transparentAlpha;
+        buf[p++] = GLX_TRANSPARENT_INDEX_VALUE;
+        buf[p++] = pFBConfig->transparentIndex;
+        buf[p++] = GLX_MAX_PBUFFER_WIDTH;
+        buf[p++] = pFBConfig->maxPbufferWidth;
+        buf[p++] = GLX_MAX_PBUFFER_HEIGHT;
+        buf[p++] = pFBConfig->maxPbufferHeight;
+        buf[p++] = GLX_MAX_PBUFFER_PIXELS;
+        buf[p++] = pFBConfig->maxPbufferPixels;
+
+        /*
          * find the visual of the back-end server and match a visual
-	 * on the proxy.
-	 * do only once - if a visual is not yet associated.
-	 */
-	if (pFBConfig->associatedVisualId == (unsigned int)-1) {
-	   DMXScreenInfo *dmxScreen = &dmxScreens[screen];
-	   __GLXFBConfig *be_pFBConfig = __glXFBConfigs[ i * (screenInfo.numScreens+1)+screen+1 ];
-	   __GLXvisualConfig *pGlxVisual = NULL;
-	   int v;
-	   int found = 0;
-	   for (v=0; v<dmxScreen->numGlxVisuals; v++) {
-	      if (dmxScreen->glxVisuals[v].vid == be_pFBConfig->associatedVisualId) {
-		 pGlxVisual = &dmxScreen->glxVisuals[v];
-		 break;
-	      }
-	   }
-
-	   if (pGlxVisual) {
-	      for (v=0; v<pGlxScreen->numVisuals; v++) {
-		 if (glxVisualsMatch(&pGlxScreen->pGlxVisual[v], pGlxVisual)) {
-		    associatedVisualId = pGlxScreen->pGlxVisual[v].vid;
-		    found = 1;
-		    break;
-		 }
-	      }
-	   }
-
-	   if (!found) {
-	      associatedVisualId = 0;
-	      pFBConfig->drawableType &= ~(GLX_WINDOW_BIT);
-	      buf[drawableTypeIndex] = pFBConfig->drawableType;
-	   }
+         * on the proxy.
+         * do only once - if a visual is not yet associated.
+         */
+        if (pFBConfig->associatedVisualId == (unsigned int) -1) {
+            DMXScreenInfo *dmxScreen = &dmxScreens[screen];
+            __GLXFBConfig *be_pFBConfig =
+                __glXFBConfigs[i * (screenInfo.numScreens + 1) + screen + 1];
+            __GLXvisualConfig *pGlxVisual = NULL;
+            int v;
+            int found = 0;
+
+            for (v = 0; v < dmxScreen->numGlxVisuals; v++) {
+                if (dmxScreen->glxVisuals[v].vid ==
+                    be_pFBConfig->associatedVisualId) {
+                    pGlxVisual = &dmxScreen->glxVisuals[v];
+                    break;
+                }
+            }
+
+            if (pGlxVisual) {
+                for (v = 0; v < pGlxScreen->numVisuals; v++) {
+                    if (glxVisualsMatch(&pGlxScreen->pGlxVisual[v], pGlxVisual)) {
+                        associatedVisualId = pGlxScreen->pGlxVisual[v].vid;
+                        found = 1;
+                        break;
+                    }
+                }
+            }
+
+            if (!found) {
+                associatedVisualId = 0;
+                pFBConfig->drawableType &= ~(GLX_WINDOW_BIT);
+                buf[drawableTypeIndex] = pFBConfig->drawableType;
+            }
 #ifdef PANORAMIX
-	   else if (!noPanoramiXExtension) {
-	      /* convert the associated visualId to the panoramix one */
-	      pFBConfig->associatedVisualId =
-		  PanoramiXTranslateVisualID(screen, v);
-	   }
+            else if (!noPanoramiXExtension) {
+                /* convert the associated visualId to the panoramix one */
+                pFBConfig->associatedVisualId =
+                    PanoramiXTranslateVisualID(screen, v);
+            }
 #endif
-	}
-	else {
-	   associatedVisualId = pFBConfig->associatedVisualId;
-	}
-
-	buf[p++] = GLX_VISUAL_ID;
-	buf[p++] = associatedVisualId;
-
-	/* SGIS_multisample attributes */
-	buf[p++] = GLX_SAMPLES_SGIS;
-	buf[p++] = pFBConfig->multiSampleSize;
-	buf[p++] = GLX_SAMPLE_BUFFERS_SGIS;
-	buf[p++] = pFBConfig->nMultiSampleBuffers;
-
-	/* SGIX_pbuffer specific attributes */
-	buf[p++] = GLX_OPTIMAL_PBUFFER_WIDTH_SGIX;
-	buf[p++] = pFBConfig->optimalPbufferWidth;
-	buf[p++] = GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX;
-	buf[p++] = pFBConfig->optimalPbufferHeight;
-
-	buf[p++] = GLX_VISUAL_SELECT_GROUP_SGIX;
-	buf[p++] = pFBConfig->visualSelectGroup;
-
-	if (client->swapped) {
-	    __GLX_DECLARE_SWAP_VARIABLES;
-	    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-	    __GLX_SWAP_INT_ARRAY((int *)buf, 2*numAttribs);
-	}
-	WriteToClient(client, 2*numAttribs * __GLX_SIZE_CARD32, (char *)buf);
+        }
+        else {
+            associatedVisualId = pFBConfig->associatedVisualId;
+        }
+
+        buf[p++] = GLX_VISUAL_ID;
+        buf[p++] = associatedVisualId;
+
+        /* SGIS_multisample attributes */
+        buf[p++] = GLX_SAMPLES_SGIS;
+        buf[p++] = pFBConfig->multiSampleSize;
+        buf[p++] = GLX_SAMPLE_BUFFERS_SGIS;
+        buf[p++] = pFBConfig->nMultiSampleBuffers;
+
+        /* SGIX_pbuffer specific attributes */
+        buf[p++] = GLX_OPTIMAL_PBUFFER_WIDTH_SGIX;
+        buf[p++] = pFBConfig->optimalPbufferWidth;
+        buf[p++] = GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX;
+        buf[p++] = pFBConfig->optimalPbufferHeight;
+
+        buf[p++] = GLX_VISUAL_SELECT_GROUP_SGIX;
+        buf[p++] = pFBConfig->visualSelectGroup;
+
+        if (client->swapped) {
+            __GLX_DECLARE_SWAP_VARIABLES;
+            __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+            __GLX_SWAP_INT_ARRAY((int *) buf, 2 * numAttribs);
+        }
+        WriteToClient(client, 2 * numAttribs * __GLX_SIZE_CARD32, (char *) buf);
     }
     return Success;
 }
 
-int __glXGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXGetFBConfigsSGIX(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXGetFBConfigsSGIXReq *req = (xGLXGetFBConfigsSGIXReq *)pc;
-   xGLXGetFBConfigsReq new_req;
+    xGLXGetFBConfigsSGIXReq *req = (xGLXGetFBConfigsSGIXReq *) pc;
+    xGLXGetFBConfigsReq new_req;
 
-   new_req.reqType = req->reqType;
-   new_req.glxCode = req->glxCode;
-   new_req.length = req->length;
-   new_req.screen = req->screen;
+    new_req.reqType = req->reqType;
+    new_req.glxCode = req->glxCode;
+    new_req.length = req->length;
+    new_req.screen = req->screen;
 
-   return( __glXGetFBConfigs( cl, (GLbyte *)&new_req ) );
+    return (__glXGetFBConfigs(cl, (GLbyte *) & new_req));
 }
 
-
-int __glXCreateWindow(__GLXclientState *cl, GLbyte *pc)
+int
+__glXCreateWindow(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXCreateWindowReq *req = (xGLXCreateWindowReq *) pc;
@@ -2942,86 +3059,87 @@ int __glXCreateWindow(__GLXclientState *cl, GLbyte *pc)
     pointer val;
 
     /*
-    ** Check if windowId is valid 
-    */
+     ** Check if windowId is valid 
+     */
     rc = dixLookupDrawable(&pDraw, windowId, client, M_DRAWABLE_WINDOW,
-			   DixAddAccess);
+                           DixAddAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
     /*
-    ** Check if screen of window matches screen of fbconfig.
-    */
+     ** Check if screen of window matches screen of fbconfig.
+     */
     pScreen = pDraw->pScreen;
     if (screen != pScreen->myNum) {
-	return BadMatch;
+        return BadMatch;
     }
 
     /*
-    ** Find the FBConfigRec for this fbconfigid.
-    */
+     ** Find the FBConfigRec for this fbconfigid.
+     */
     if (!(pGlxFBConfig = glxLookupFBConfig(fbconfigId))) {
-	client->errorValue = fbconfigId;
-	return __glXBadFBConfig;
+        client->errorValue = fbconfigId;
+        return __glXBadFBConfig;
     }
     visId = pGlxFBConfig->associatedVisualId;
 
     /*
-    ** Check if the fbconfig supports rendering to windows 
-    */
-    if( !(pGlxFBConfig->drawableType & GLX_WINDOW_BIT) ) {
-	return BadMatch;	
+     ** Check if the fbconfig supports rendering to windows 
+     */
+    if (!(pGlxFBConfig->drawableType & GLX_WINDOW_BIT)) {
+        return BadMatch;
     }
 
     if (visId != None) {
-       /*
-	** Check if the visual ID is valid for this screen.
-	*/
-       pVisual = pScreen->visuals;
-       for (i = 0; i < pScreen->numVisuals; i++, pVisual++) {
-	  if (pVisual->vid == visId) {
-	     break;
-	  }
-       }
-       if (i == pScreen->numVisuals) {
-	  client->errorValue = visId;
-	  return BadValue;
-       }
-	
         /*
-        ** Check if color buffer depth of fbconfig matches depth 
-	** of window.
-        */
+         ** Check if the visual ID is valid for this screen.
+         */
+        pVisual = pScreen->visuals;
+        for (i = 0; i < pScreen->numVisuals; i++, pVisual++) {
+            if (pVisual->vid == visId) {
+                break;
+            }
+        }
+        if (i == pScreen->numVisuals) {
+            client->errorValue = visId;
+            return BadValue;
+        }
+
+        /*
+         ** Check if color buffer depth of fbconfig matches depth 
+         ** of window.
+         */
         if (pVisual->nplanes != pDraw->depth) {
-	    return BadMatch;
-	}
-    } else
-	/*
-	** The window was created with no visual that corresponds
-	** to fbconfig 
-	*/
-	return BadMatch;
+            return BadMatch;
+        }
+    }
+    else
+        /*
+         ** The window was created with no visual that corresponds
+         ** to fbconfig 
+         */
+        return BadMatch;
 
     /*
-    ** Check if there is already a fbconfig associated with this window
-    */
+     ** Check if there is already a fbconfig associated with this window
+     */
     if (Success == dixLookupResourceByType(&val,
-					   glxwindowId, __glXWindowRes,
-					   NullClient, DixUnknownAccess)) {
-	client->errorValue = glxwindowId;
-	return BadAlloc;
+                                           glxwindowId, __glXWindowRes,
+                                           NullClient, DixUnknownAccess)) {
+        client->errorValue = glxwindowId;
+        return BadAlloc;
     }
 
     pGlxWindow = (__glXWindow *) malloc(sizeof(__glXWindow));
     if (!pGlxWindow) {
-	return BadAlloc;
+        return BadAlloc;
     }
 
     /*
-    ** Register this GLX window as a resource
-    */
+     ** Register this GLX window as a resource
+     */
     if (!(AddResource(glxwindowId, __glXWindowRes, pGlxWindow))) {
-	return BadAlloc;
+        return BadAlloc;
     }
 
     pGlxWindow->pDraw = pDraw;
@@ -3034,7 +3152,8 @@ int __glXCreateWindow(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDestroyWindow(__GLXclientState *cl, GLbyte *pc)
+int
+__glXDestroyWindow(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXDestroyWindowReq *req = (xGLXDestroyWindowReq *) pc;
@@ -3042,24 +3161,25 @@ int __glXDestroyWindow(__GLXclientState *cl, GLbyte *pc)
     pointer val;
 
     /*
-    ** Check if it's a valid GLX window.
-    */
+     ** Check if it's a valid GLX window.
+     */
     if (Success != dixLookupResourceByType(&val,
-					   glxwindow, __glXWindowRes,
-					   NullClient, DixUnknownAccess)) {
-	client->errorValue = glxwindow;
-	return __glXBadDrawable;
+                                           glxwindow, __glXWindowRes,
+                                           NullClient, DixUnknownAccess)) {
+        client->errorValue = glxwindow;
+        return __glXBadDrawable;
     }
     /*
-    ** The glx window destructor will check whether it's current before
-    ** freeing anything.
-    */
-    FreeResource(glxwindow, RT_NONE);	
+     ** The glx window destructor will check whether it's current before
+     ** freeing anything.
+     */
+    FreeResource(glxwindow, RT_NONE);
 
     return Success;
 }
 
-int __glXQueryContext(__GLXclientState *cl, GLbyte *pc)
+int
+__glXQueryContext(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     __GLXcontext *ctx;
@@ -3069,8 +3189,8 @@ int __glXQueryContext(__GLXclientState *cl, GLbyte *pc)
     int *sendBuf, *pSendBuf;
     int nReplyBytes;
 
-    req = (xGLXQueryContextReq *)pc;
-    dixLookupResourceByType((pointer*) &ctx, req->context, __glXContextRes,
+    req = (xGLXQueryContextReq *) pc;
+    dixLookupResourceByType((pointer *) &ctx, req->context, __glXContextRes,
                             NullClient, DixUnknownAccess);
     if (!ctx) {
         client->errorValue = req->context;
@@ -3085,27 +3205,29 @@ int __glXQueryContext(__GLXclientState *cl, GLbyte *pc)
     reply.n = nProps;
 
     nReplyBytes = reply.length << 2;
-    sendBuf = (int *)malloc(nReplyBytes);
+    sendBuf = (int *) malloc(nReplyBytes);
     pSendBuf = sendBuf;
     *pSendBuf++ = GLX_FBCONFIG_ID;
-    *pSendBuf++ = (int)(ctx->pFBConfig->id);
+    *pSendBuf++ = (int) (ctx->pFBConfig->id);
     *pSendBuf++ = GLX_RENDER_TYPE;
-    *pSendBuf++ = (int)(ctx->pFBConfig->renderType);
+    *pSendBuf++ = (int) (ctx->pFBConfig->renderType);
     *pSendBuf++ = GLX_SCREEN;
-    *pSendBuf++ = (int)(ctx->pScreen->myNum);
+    *pSendBuf++ = (int) (ctx->pScreen->myNum);
 
     if (client->swapped) {
         __glXSwapQueryContextReply(client, &reply, sendBuf);
-    } else {
-        WriteToClient(client, sz_xGLXQueryContextReply, (char *)&reply);
-        WriteToClient(client, nReplyBytes, (char *)sendBuf);
     }
-    free((char *)sendBuf);
+    else {
+        WriteToClient(client, sz_xGLXQueryContextReply, (char *) &reply);
+        WriteToClient(client, nReplyBytes, (char *) sendBuf);
+    }
+    free((char *) sendBuf);
 
     return Success;
 }
 
-int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc)
+int
+__glXQueryContextInfoEXT(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     __GLXcontext *ctx;
@@ -3115,10 +3237,10 @@ int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc)
     int *sendBuf, *pSendBuf;
     int nReplyBytes;
 
-    req = (xGLXQueryContextInfoEXTReq *)pc;
-    dixLookupResourceByType((pointer*) &ctx,
-			    req->context, __glXContextRes,
-			    client,  DixReadAccess);
+    req = (xGLXQueryContextInfoEXTReq *) pc;
+    dixLookupResourceByType((pointer *) &ctx,
+                            req->context, __glXContextRes,
+                            client, DixReadAccess);
 
     if (!ctx) {
         client->errorValue = req->context;
@@ -3133,32 +3255,34 @@ int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc)
     reply.n = nProps;
 
     nReplyBytes = reply.length << 2;
-    sendBuf = (int *)malloc(nReplyBytes);
+    sendBuf = (int *) malloc(nReplyBytes);
     pSendBuf = sendBuf;
     *pSendBuf++ = GLX_SHARE_CONTEXT_EXT;
-    *pSendBuf++ = (int)(ctx->share_id);
+    *pSendBuf++ = (int) (ctx->share_id);
     *pSendBuf++ = GLX_VISUAL_ID_EXT;
-    *pSendBuf++ = (int)(ctx->pVisual ? ctx->pVisual->vid : 0);
+    *pSendBuf++ = (int) (ctx->pVisual ? ctx->pVisual->vid : 0);
     *pSendBuf++ = GLX_SCREEN_EXT;
-    *pSendBuf++ = (int)(ctx->pScreen->myNum);
+    *pSendBuf++ = (int) (ctx->pScreen->myNum);
     *pSendBuf++ = GLX_FBCONFIG_ID;
-    *pSendBuf++ = (int)(ctx->pFBConfig ? ctx->pFBConfig->id : 0);
+    *pSendBuf++ = (int) (ctx->pFBConfig ? ctx->pFBConfig->id : 0);
 
     if (client->swapped) {
         __glXSwapQueryContextInfoEXTReply(client, &reply, sendBuf);
-    } else {
-        WriteToClient(client, sz_xGLXQueryContextInfoEXTReply, (char *)&reply);
-        WriteToClient(client, nReplyBytes, (char *)sendBuf);
     }
-    free((char *)sendBuf);
+    else {
+        WriteToClient(client, sz_xGLXQueryContextInfoEXTReply, (char *) &reply);
+        WriteToClient(client, nReplyBytes, (char *) sendBuf);
+    }
+    free((char *) sendBuf);
 
     return Success;
 }
 
-int __glXCreatePbuffer(__GLXclientState *cl, GLbyte *pc)
+int
+__glXCreatePbuffer(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
-    xGLXCreatePbufferReq *req = (xGLXCreatePbufferReq *)pc;
+    xGLXCreatePbufferReq *req = (xGLXCreatePbufferReq *) pc;
     xGLXCreatePbufferReq *be_req;
     int screen = req->screen;
     GLXFBConfigID fbconfigId = req->fbconfig;
@@ -3175,9 +3299,9 @@ int __glXCreatePbuffer(__GLXclientState *cl, GLbyte *pc)
     int s;
     int from_screen, to_screen;
 
-   /*
-    ** Look up screen and FBConfig.
-    */
+    /*
+     ** Look up screen and FBConfig.
+     */
     if (screen >= screenInfo.numScreens) {
         /* The client library must send a valid screen number. */
         client->errorValue = screen;
@@ -3186,22 +3310,22 @@ int __glXCreatePbuffer(__GLXclientState *cl, GLbyte *pc)
     pScreen = screenInfo.screens[screen];
 
     /*
-    ** Find the FBConfigRec for this fbconfigid.
-    */
+     ** Find the FBConfigRec for this fbconfigid.
+     */
     if (!(pGlxFBConfig = glxLookupFBConfig(fbconfigId))) {
-	client->errorValue = fbconfigId;
-	return __glXBadFBConfig;
+        client->errorValue = fbconfigId;
+        return __glXBadFBConfig;
     }
 
     /*
-    ** Create the GLX part of the Pbuffer.
-    */
+     ** Create the GLX part of the Pbuffer.
+     */
     pGlxPbuffer = (__glXPbuffer *) malloc(sizeof(__glXPbuffer));
     if (!pGlxPbuffer) {
         return BadAlloc;
     }
 
-    pGlxPbuffer->be_xids = (XID *) malloc( sizeof(XID) * screenInfo.numScreens );
+    pGlxPbuffer->be_xids = (XID *) malloc(sizeof(XID) * screenInfo.numScreens);
     if (!pGlxPbuffer->be_xids) {
         free(pGlxPbuffer);
         return BadAlloc;
@@ -3213,53 +3337,53 @@ int __glXCreatePbuffer(__GLXclientState *cl, GLbyte *pc)
     from_screen = to_screen = screen;
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
-    for (s=from_screen; s<=to_screen; s++) {
-       dpy = GetBackEndDisplay(cl,s);
-       be_xid = XAllocID(dpy);
-       dmxScreen = &dmxScreens[s];
-       be_pGlxFBConfig = glxLookupBackEndFBConfig( pGlxFBConfig->id, s );
-       
-       attr = (int *)( req+1 );
-
-       LockDisplay(dpy);
-       GetReqExtra(GLXCreatePbuffer, 2 * numAttribs * __GLX_SIZE_CARD32, be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = X_GLXCreatePbuffer;
-       be_req->screen = be_pGlxFBConfig->screen;
-       be_req->fbconfig = be_pGlxFBConfig->id;
-       be_req->pbuffer = be_xid;
-       be_req->numAttribs = numAttribs;
-    
-       /* Send attributes */
-       if ( attr != NULL ) {
-	  CARD32 *pc = (CARD32 *)(be_req + 1);
-
-	  while (numAttribs-- > 0) {
-	     *pc++ = *attr++;     /* token */
-	     *pc++ = *attr++;     /* value */
-	  }
-       }
+    for (s = from_screen; s <= to_screen; s++) {
+        dpy = GetBackEndDisplay(cl, s);
+        be_xid = XAllocID(dpy);
+        dmxScreen = &dmxScreens[s];
+        be_pGlxFBConfig = glxLookupBackEndFBConfig(pGlxFBConfig->id, s);
+
+        attr = (int *) (req + 1);
+
+        LockDisplay(dpy);
+        GetReqExtra(GLXCreatePbuffer, 2 * numAttribs * __GLX_SIZE_CARD32,
+                    be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = X_GLXCreatePbuffer;
+        be_req->screen = be_pGlxFBConfig->screen;
+        be_req->fbconfig = be_pGlxFBConfig->id;
+        be_req->pbuffer = be_xid;
+        be_req->numAttribs = numAttribs;
+
+        /* Send attributes */
+        if (attr != NULL) {
+            CARD32 *pc = (CARD32 *) (be_req + 1);
+
+            while (numAttribs-- > 0) {
+                *pc++ = *attr++;        /* token */
+                *pc++ = *attr++;        /* value */
+            }
+        }
 
-       UnlockDisplay(dpy);
-       SyncHandle();
+        UnlockDisplay(dpy);
+        SyncHandle();
 
-       pGlxPbuffer->be_xids[s] = be_xid;
+        pGlxPbuffer->be_xids[s] = be_xid;
     }
 
-
     pGlxPbuffer->idExists = True;
     pGlxPbuffer->refcnt = 0;
     pGlxPbuffer->pFBConfig = pGlxFBConfig;
     pGlxPbuffer->pScreen = pScreen;
 
     /*
-    ** Register the resource.
-    */
+     ** Register the resource.
+     */
     if (!(AddResource(pbuffer, __glXPbufferRes, pGlxPbuffer))) {
         return BadAlloc;
     }
@@ -3268,7 +3392,8 @@ int __glXCreatePbuffer(__GLXclientState *cl, GLbyte *pc)
 
 }
 
-int __glXDestroyPbuffer(__GLXclientState *cl, GLbyte *pc)
+int
+__glXDestroyPbuffer(__GLXclientState * cl, GLbyte * pc)
 {
     ClientPtr client = cl->client;
     xGLXDestroyPbufferReq *req = (xGLXDestroyPbufferReq *) pc;
@@ -3282,13 +3407,13 @@ int __glXDestroyPbuffer(__GLXclientState *cl, GLbyte *pc)
     int from_screen, to_screen;
 
     /*
-    ** Check if it's a valid Pbuffer
-    */
-    dixLookupResourceByType((pointer*) &pGlxPbuffer, pbuffer,
+     ** Check if it's a valid Pbuffer
+     */
+    dixLookupResourceByType((pointer *) &pGlxPbuffer, pbuffer,
                             __glXPbufferRes, NullClient, DixUnknownAccess);
     if (!pGlxPbuffer) {
-	client->errorValue = pbuffer;
-	return __glXBadPbuffer;
+        client->errorValue = pbuffer;
+        return __glXBadPbuffer;
     }
 
     screen = pGlxPbuffer->pScreen->myNum;
@@ -3296,327 +3421,342 @@ int __glXDestroyPbuffer(__GLXclientState *cl, GLbyte *pc)
     from_screen = to_screen = screen;
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
-    for (s=from_screen; s<=to_screen; s++) {
-       dpy = GetBackEndDisplay(cl,s);
-       dmxScreen = &dmxScreens[s];
+    for (s = from_screen; s <= to_screen; s++) {
+        dpy = GetBackEndDisplay(cl, s);
+        dmxScreen = &dmxScreens[s];
 
-       /* send the destroy request to the back-end server */
-       LockDisplay(dpy);
-       GetReq(GLXDestroyPbuffer, be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = X_GLXDestroyPbuffer;
-       be_req->pbuffer = pGlxPbuffer->be_xids[s];
-       UnlockDisplay(dpy);
-       SyncHandle();
+        /* send the destroy request to the back-end server */
+        LockDisplay(dpy);
+        GetReq(GLXDestroyPbuffer, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = X_GLXDestroyPbuffer;
+        be_req->pbuffer = pGlxPbuffer->be_xids[s];
+        UnlockDisplay(dpy);
+        SyncHandle();
     }
 
-    FreeResource(pbuffer, RT_NONE);	
+    FreeResource(pbuffer, RT_NONE);
 
     return Success;
 }
 
-int __glXGetDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
+int
+__glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXGetDrawableAttributesReq *req = (xGLXGetDrawableAttributesReq *)pc;
-   xGLXGetDrawableAttributesReq *be_req;
-   xGLXGetDrawableAttributesReply reply;
-   ClientPtr client = cl->client;
-   GLXDrawable drawId = req->drawable;
-   GLXDrawable be_drawable = 0;
-   DrawablePtr pDraw = NULL;
-   Display *dpy;
-   int screen, rc;
-   DMXScreenInfo *dmxScreen;
-   CARD32 *attribs = NULL;
-   int attribs_size = 0;
+    xGLXGetDrawableAttributesReq *req = (xGLXGetDrawableAttributesReq *) pc;
+    xGLXGetDrawableAttributesReq *be_req;
+    xGLXGetDrawableAttributesReply reply;
+    ClientPtr client = cl->client;
+    GLXDrawable drawId = req->drawable;
+    GLXDrawable be_drawable = 0;
+    DrawablePtr pDraw = NULL;
+    Display *dpy;
+    int screen, rc;
+    DMXScreenInfo *dmxScreen;
+    CARD32 *attribs = NULL;
+    int attribs_size = 0;
+
 #ifdef PANORAMIX
     PanoramiXRes *pXinDraw = NULL;
 #endif
 
-   if (drawId != None) {
-      rc = dixLookupDrawable(&pDraw, drawId, client, 0, DixGetAttrAccess);
-      if (rc == Success && pDraw->type == DRAWABLE_WINDOW) {
-	 WindowPtr pWin = (WindowPtr)pDraw;
-	 be_drawable = 0;
-	 screen = pWin->drawable.pScreen->myNum;
-      } else {
-	 /*
-	  ** Drawable is not a Window , GLXWindow or a GLXPixmap.
-	  */
-	 client->errorValue = drawId;
-	 return __glXBadDrawable;
-      }
-
-      if (!pDraw) {
-	 __GLXpixmap *pGlxPixmap;
-	 dixLookupResourceByType((pointer*) &pGlxPixmap,
-				 drawId, __glXPixmapRes,
-				 NullClient, DixUnknownAccess);
-	 if (pGlxPixmap) {
-		pDraw = pGlxPixmap->pDraw;
-		screen = pGlxPixmap->pScreen->myNum;
+    if (drawId != None) {
+        rc = dixLookupDrawable(&pDraw, drawId, client, 0, DixGetAttrAccess);
+        if (rc == Success && pDraw->type == DRAWABLE_WINDOW) {
+            WindowPtr pWin = (WindowPtr) pDraw;
+
+            be_drawable = 0;
+            screen = pWin->drawable.pScreen->myNum;
+        }
+        else {
+            /*
+             ** Drawable is not a Window , GLXWindow or a GLXPixmap.
+             */
+            client->errorValue = drawId;
+            return __glXBadDrawable;
+        }
+
+        if (!pDraw) {
+            __GLXpixmap *pGlxPixmap;
+
+            dixLookupResourceByType((pointer *) &pGlxPixmap,
+                                    drawId, __glXPixmapRes,
+                                    NullClient, DixUnknownAccess);
+            if (pGlxPixmap) {
+                pDraw = pGlxPixmap->pDraw;
+                screen = pGlxPixmap->pScreen->myNum;
                 be_drawable = pGlxPixmap->be_xids[screen];
-	 }
-      }
-
-      if (!pDraw) {
-	 __glXWindow *pGlxWindow;
-	 dixLookupResourceByType((pointer*) &pGlxWindow,
-				 drawId, __glXWindowRes,
-				 NullClient, DixUnknownAccess);
-	 if (pGlxWindow) {
-	    pDraw = pGlxWindow->pDraw;
-	    screen = pGlxWindow->pScreen->myNum;
-	    be_drawable = 0;
-     	 }
-      }
-
-      if (!pDraw) {
-	 __glXPbuffer *pGlxPbuffer;
-	 dixLookupResourceByType((pointer*) &pGlxPbuffer,
-				 drawId, __glXPbufferRes,
-				 NullClient, DixUnknownAccess);
-	 if (pGlxPbuffer) {
-    	    pDraw = (DrawablePtr)pGlxPbuffer;
-	    screen = pGlxPbuffer->pScreen->myNum;
-	    be_drawable = pGlxPbuffer->be_xids[screen];
-	 }
-      }
+            }
+        }
+
+        if (!pDraw) {
+            __glXWindow *pGlxWindow;
+
+            dixLookupResourceByType((pointer *) &pGlxWindow,
+                                    drawId, __glXWindowRes,
+                                    NullClient, DixUnknownAccess);
+            if (pGlxWindow) {
+                pDraw = pGlxWindow->pDraw;
+                screen = pGlxWindow->pScreen->myNum;
+                be_drawable = 0;
+            }
+        }
+
+        if (!pDraw) {
+            __glXPbuffer *pGlxPbuffer;
+
+            dixLookupResourceByType((pointer *) &pGlxPbuffer,
+                                    drawId, __glXPbufferRes,
+                                    NullClient, DixUnknownAccess);
+            if (pGlxPbuffer) {
+                pDraw = (DrawablePtr) pGlxPbuffer;
+                screen = pGlxPbuffer->pScreen->myNum;
+                be_drawable = pGlxPbuffer->be_xids[screen];
+            }
+        }
     }
 
     if (!pDraw) {
-	/*
-	 ** Drawable is not a Window , GLXWindow or a GLXPixmap.
-	 */
-	client->errorValue = drawId;
-	return __glXBadDrawable;
-   }
-
-   /* if the drawable is a window or GLXWindow - 
-    * we need to find the base id on the back-end server
-    */
-   if (!be_drawable) {
-       WindowPtr pWin = (WindowPtr)pDraw;
+        /*
+         ** Drawable is not a Window , GLXWindow or a GLXPixmap.
+         */
+        client->errorValue = drawId;
+        return __glXBadDrawable;
+    }
+
+    /* if the drawable is a window or GLXWindow - 
+     * we need to find the base id on the back-end server
+     */
+    if (!be_drawable) {
+        WindowPtr pWin = (WindowPtr) pDraw;
 
 #ifdef PANORAMIX
-       if (!noPanoramiXExtension) {
-	  if (Success != dixLookupResourceByClass((pointer*) &pXinDraw,
-						  pDraw->id, XRC_DRAWABLE,
-						  client, DixReadAccess)) {
-	     client->errorValue = drawId;
-	     return __glXBadDrawable;
-	  }
-
-	  dixLookupWindow(&pWin, pXinDraw->info[screen].id, client,
-			  DixReadAccess);
-       }
+        if (!noPanoramiXExtension) {
+            if (Success != dixLookupResourceByClass((pointer *) &pXinDraw,
+                                                    pDraw->id, XRC_DRAWABLE,
+                                                    client, DixReadAccess)) {
+                client->errorValue = drawId;
+                return __glXBadDrawable;
+            }
+
+            dixLookupWindow(&pWin, pXinDraw->info[screen].id, client,
+                            DixReadAccess);
+        }
 #endif
 
-       if (pWin) {
-	   be_drawable = (unsigned int)(DMX_GET_WINDOW_PRIV(pWin))->window;
-	   if (!be_drawable) {
-	      /* it might be that the window did not created yet on the */
-	      /* back-end server (lazy window creation option), force   */
-	      /* creation of the window */
-	      dmxCreateAndRealizeWindow( pWin, TRUE );
-	      be_drawable = (unsigned int)(DMX_GET_WINDOW_PRIV(pWin))->window;
-	   }
-       }
-       else {
-	  client->errorValue = drawId;
-	  return __glXBadDrawable;
-       }
-   }
-
-
-   /* send the request to the back-end server */
-   dpy = GetBackEndDisplay(cl,screen);
-   dmxScreen = &dmxScreens[screen];
-
-   /* make sure drawable exists on back-end */
-   dmxSync( dmxScreen, 1 );
-
-   LockDisplay(dpy);
-   GetReq(GLXGetDrawableAttributes, be_req);
-   be_req->reqType = dmxScreen->glxMajorOpcode;
-   be_req->glxCode = X_GLXGetDrawableAttributes;
-   be_req->drawable = be_drawable;
-   be_req->length = req->length;
-   if (!_XReply(dpy, (xReply *) &reply, 0, False)) {
-      UnlockDisplay(dpy);
-      SyncHandle();
-      return( BE_TO_CLIENT_ERROR(dmxLastErrorEvent.error_code) );
-   }
-
-   if (reply.numAttribs) {
-      attribs_size = 2 * reply.numAttribs * __GLX_SIZE_CARD32;
-      attribs = (CARD32 *) malloc(attribs_size);
-      if (attribs == NULL) {
-	 UnlockDisplay(dpy);
-	 SyncHandle();
-	 return BadAlloc;
-      }
-
-      _XRead(dpy, (char *) attribs, attribs_size);
-   }
-
-   UnlockDisplay(dpy);
-   SyncHandle();
-
-
-   /* send the reply back to the client */
-   reply.sequenceNumber = client->sequence;
-   if (client->swapped) {
-      __glXSwapGetDrawableAttributesReply(client, &reply, (int *)attribs);
-   }
-   else {
-      WriteToClient(client, sz_xGLXGetDrawableAttributesReply, (char *)&reply);
-      WriteToClient(client, attribs_size, (char *)attribs);
-   }
-
-   free(attribs);
-
-   return Success;
+        if (pWin) {
+            be_drawable = (unsigned int) (DMX_GET_WINDOW_PRIV(pWin))->window;
+            if (!be_drawable) {
+                /* it might be that the window did not created yet on the */
+                /* back-end server (lazy window creation option), force   */
+                /* creation of the window */
+                dmxCreateAndRealizeWindow(pWin, TRUE);
+                be_drawable =
+                    (unsigned int) (DMX_GET_WINDOW_PRIV(pWin))->window;
+            }
+        }
+        else {
+            client->errorValue = drawId;
+            return __glXBadDrawable;
+        }
+    }
+
+    /* send the request to the back-end server */
+    dpy = GetBackEndDisplay(cl, screen);
+    dmxScreen = &dmxScreens[screen];
+
+    /* make sure drawable exists on back-end */
+    dmxSync(dmxScreen, 1);
+
+    LockDisplay(dpy);
+    GetReq(GLXGetDrawableAttributes, be_req);
+    be_req->reqType = dmxScreen->glxMajorOpcode;
+    be_req->glxCode = X_GLXGetDrawableAttributes;
+    be_req->drawable = be_drawable;
+    be_req->length = req->length;
+    if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return (BE_TO_CLIENT_ERROR(dmxLastErrorEvent.error_code));
+    }
+
+    if (reply.numAttribs) {
+        attribs_size = 2 * reply.numAttribs * __GLX_SIZE_CARD32;
+        attribs = (CARD32 *) malloc(attribs_size);
+        if (attribs == NULL) {
+            UnlockDisplay(dpy);
+            SyncHandle();
+            return BadAlloc;
+        }
+
+        _XRead(dpy, (char *) attribs, attribs_size);
+    }
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+
+    /* send the reply back to the client */
+    reply.sequenceNumber = client->sequence;
+    if (client->swapped) {
+        __glXSwapGetDrawableAttributesReply(client, &reply, (int *) attribs);
+    }
+    else {
+        WriteToClient(client, sz_xGLXGetDrawableAttributesReply,
+                      (char *) &reply);
+        WriteToClient(client, attribs_size, (char *) attribs);
+    }
+
+    free(attribs);
+
+    return Success;
 }
 
-int __glXChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
+int
+__glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXChangeDrawableAttributesReq *req = (xGLXChangeDrawableAttributesReq *)pc;
-   xGLXChangeDrawableAttributesReq *be_req;
-   ClientPtr client = cl->client;
-   GLXDrawable drawId = req->drawable;
-   GLXDrawable be_drawable = 0;
-   DrawablePtr pDraw = NULL;
-   Display *dpy;
-   int screen, rc;
-   DMXScreenInfo *dmxScreen;
-
-   if (drawId != None) {
-      rc = dixLookupDrawable(&pDraw, drawId, client, 0, DixSetAttrAccess);
-      if (rc == Success && pDraw->type == DRAWABLE_WINDOW) {
-	  be_drawable = 0;
-	  screen = pDraw->pScreen->myNum;
-      } else {
-	 /*
-	  ** Drawable is not a Window , GLXWindow or a GLXPixmap.
-	  */
-	 client->errorValue = drawId;
-	 return __glXBadDrawable;
-      }
-
-      if (!pDraw) {
-	 __GLXpixmap *pGlxPixmap;
-	 dixLookupResourceByType((pointer*) &pGlxPixmap,
-				 drawId, __glXPixmapRes,
-				 NullClient, DixUnknownAccess);
-	 if (pGlxPixmap) {
-		pDraw = pGlxPixmap->pDraw;
-		screen = pGlxPixmap->pScreen->myNum;
+    xGLXChangeDrawableAttributesReq *req =
+        (xGLXChangeDrawableAttributesReq *) pc;
+    xGLXChangeDrawableAttributesReq *be_req;
+    ClientPtr client = cl->client;
+    GLXDrawable drawId = req->drawable;
+    GLXDrawable be_drawable = 0;
+    DrawablePtr pDraw = NULL;
+    Display *dpy;
+    int screen, rc;
+    DMXScreenInfo *dmxScreen;
+
+    if (drawId != None) {
+        rc = dixLookupDrawable(&pDraw, drawId, client, 0, DixSetAttrAccess);
+        if (rc == Success && pDraw->type == DRAWABLE_WINDOW) {
+            be_drawable = 0;
+            screen = pDraw->pScreen->myNum;
+        }
+        else {
+            /*
+             ** Drawable is not a Window , GLXWindow or a GLXPixmap.
+             */
+            client->errorValue = drawId;
+            return __glXBadDrawable;
+        }
+
+        if (!pDraw) {
+            __GLXpixmap *pGlxPixmap;
+
+            dixLookupResourceByType((pointer *) &pGlxPixmap,
+                                    drawId, __glXPixmapRes,
+                                    NullClient, DixUnknownAccess);
+            if (pGlxPixmap) {
+                pDraw = pGlxPixmap->pDraw;
+                screen = pGlxPixmap->pScreen->myNum;
                 be_drawable = pGlxPixmap->be_xids[screen];
-	 }
-      }
-
-      if (!pDraw) {
-	 __glXWindow *pGlxWindow;
-	 dixLookupResourceByType((pointer*) &pGlxWindow,
-				 drawId, __glXWindowRes,
-				 NullClient, DixUnknownAccess);
-	 if (pGlxWindow) {
-	    pDraw = pGlxWindow->pDraw;
-	    screen = pGlxWindow->pScreen->myNum;
-	    be_drawable = 0;
-     	 }
-      }
-
-      if (!pDraw) {
-	 __glXPbuffer *pGlxPbuffer;
-	 dixLookupResourceByType((pointer*) &pGlxPbuffer,
-				 drawId, __glXPbufferRes,
-				 NullClient, DixUnknownAccess);
-	 if (pGlxPbuffer) {
-    	    pDraw = (DrawablePtr)pGlxPbuffer;
-	    screen = pGlxPbuffer->pScreen->myNum;
-	    be_drawable = pGlxPbuffer->be_xids[screen];
-	 }
-      }
-   }
-
-   if (!pDraw) {
-	 /*
-	  ** Drawable is not a Window , GLXWindow or a GLXPixmap.
-	  */
-	 client->errorValue = drawId;
-	 return __glXBadDrawable;
-   }
-
-   /* if the drawable is a window or GLXWindow - 
-    * we need to find the base id on the back-end server
-    */
-   if (!be_drawable) {
-       WindowPtr pWin = (WindowPtr)pDraw;
+            }
+        }
+
+        if (!pDraw) {
+            __glXWindow *pGlxWindow;
+
+            dixLookupResourceByType((pointer *) &pGlxWindow,
+                                    drawId, __glXWindowRes,
+                                    NullClient, DixUnknownAccess);
+            if (pGlxWindow) {
+                pDraw = pGlxWindow->pDraw;
+                screen = pGlxWindow->pScreen->myNum;
+                be_drawable = 0;
+            }
+        }
+
+        if (!pDraw) {
+            __glXPbuffer *pGlxPbuffer;
+
+            dixLookupResourceByType((pointer *) &pGlxPbuffer,
+                                    drawId, __glXPbufferRes,
+                                    NullClient, DixUnknownAccess);
+            if (pGlxPbuffer) {
+                pDraw = (DrawablePtr) pGlxPbuffer;
+                screen = pGlxPbuffer->pScreen->myNum;
+                be_drawable = pGlxPbuffer->be_xids[screen];
+            }
+        }
+    }
+
+    if (!pDraw) {
+        /*
+         ** Drawable is not a Window , GLXWindow or a GLXPixmap.
+         */
+        client->errorValue = drawId;
+        return __glXBadDrawable;
+    }
+
+    /* if the drawable is a window or GLXWindow - 
+     * we need to find the base id on the back-end server
+     */
+    if (!be_drawable) {
+        WindowPtr pWin = (WindowPtr) pDraw;
 
 #ifdef PANORAMIX
-       if (!noPanoramiXExtension) {
-	  PanoramiXRes *pXinDraw;
-	  if (Success != dixLookupResourceByClass((pointer*) &pXinDraw,
-						  pDraw->id, XRC_DRAWABLE,
-						  client, DixReadAccess)) {
-	     client->errorValue = drawId;
-	     return __glXBadDrawable;
-	  }
-
-	  dixLookupWindow(&pWin, pXinDraw->info[screen].id, client,
-			  DixReadAccess);
-       }
+        if (!noPanoramiXExtension) {
+            PanoramiXRes *pXinDraw;
+
+            if (Success != dixLookupResourceByClass((pointer *) &pXinDraw,
+                                                    pDraw->id, XRC_DRAWABLE,
+                                                    client, DixReadAccess)) {
+                client->errorValue = drawId;
+                return __glXBadDrawable;
+            }
+
+            dixLookupWindow(&pWin, pXinDraw->info[screen].id, client,
+                            DixReadAccess);
+        }
 #endif
 
-       if (pWin) {
-	   be_drawable = (unsigned int)(DMX_GET_WINDOW_PRIV(pWin))->window;
-	   if (!be_drawable) {
-	      /* it might be that the window did not created yet on the */
-	      /* back-end server (lazy window creation option), force   */
-	      /* creation of the window */
-	      dmxCreateAndRealizeWindow( pWin, TRUE );
-	      be_drawable = (unsigned int)(DMX_GET_WINDOW_PRIV(pWin))->window;
-	   }
-       }
-       else {
-	  client->errorValue = drawId;
-	  return __glXBadDrawable;
-       }
-   }
-
-
-   /* send the request to the back-end server */
-   dpy = GetBackEndDisplay(cl,screen);
-   dmxScreen = &dmxScreens[screen];
-
-   /* make sure drawable exists on back-end */
-   dmxSync( dmxScreen, 1 );
-
-   LockDisplay(dpy);
-   GetReqExtra(GLXChangeDrawableAttributes,
-                        2 * req->numAttribs * __GLX_SIZE_CARD32, be_req);
-   be_req->reqType = dmxScreen->glxMajorOpcode;
-   be_req->glxCode = X_GLXChangeDrawableAttributes;
-   be_req->drawable = be_drawable;
-   be_req->numAttribs = req->numAttribs;
-   be_req->length = req->length;
-
-   UnlockDisplay(dpy);
-   SyncHandle();
-
-   return Success;
+        if (pWin) {
+            be_drawable = (unsigned int) (DMX_GET_WINDOW_PRIV(pWin))->window;
+            if (!be_drawable) {
+                /* it might be that the window did not created yet on the */
+                /* back-end server (lazy window creation option), force   */
+                /* creation of the window */
+                dmxCreateAndRealizeWindow(pWin, TRUE);
+                be_drawable =
+                    (unsigned int) (DMX_GET_WINDOW_PRIV(pWin))->window;
+            }
+        }
+        else {
+            client->errorValue = drawId;
+            return __glXBadDrawable;
+        }
+    }
+
+    /* send the request to the back-end server */
+    dpy = GetBackEndDisplay(cl, screen);
+    dmxScreen = &dmxScreens[screen];
+
+    /* make sure drawable exists on back-end */
+    dmxSync(dmxScreen, 1);
+
+    LockDisplay(dpy);
+    GetReqExtra(GLXChangeDrawableAttributes,
+                2 * req->numAttribs * __GLX_SIZE_CARD32, be_req);
+    be_req->reqType = dmxScreen->glxMajorOpcode;
+    be_req->glxCode = X_GLXChangeDrawableAttributes;
+    be_req->drawable = be_drawable;
+    be_req->numAttribs = req->numAttribs;
+    be_req->length = req->length;
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+
+    return Success;
 }
 
-int __glXSendLargeCommand(__GLXclientState *cl, GLXContextTag contextTag)
+int
+__glXSendLargeCommand(__GLXclientState * cl, GLXContextTag contextTag)
 {
-   ClientPtr client = cl->client;
+    ClientPtr client = cl->client;
     xGLXRenderLargeReq *req;
     GLint maxSize, amount;
     GLint totalRequests, requestNumber;
@@ -3626,56 +3766,57 @@ int __glXSendLargeCommand(__GLXclientState *cl, GLXContextTag contextTag)
     int s;
     int from_screen, to_screen;
 
-    maxSize = cl->largeCmdMaxReqDataSize - (GLint)sizeof(xGLXRenderLargeReq);
+    maxSize = cl->largeCmdMaxReqDataSize - (GLint) sizeof(xGLXRenderLargeReq);
     dataLen = cl->largeCmdBytesTotal;
     totalRequests = (dataLen / maxSize);
-    if (dataLen % maxSize) totalRequests++;
+    if (dataLen % maxSize)
+        totalRequests++;
 
     glxc = __glXLookupContextByTag(cl, contextTag);
     if (!glxc) {
-       client->errorValue = contextTag;
-       return __glXBadContext;
+        client->errorValue = contextTag;
+        return __glXBadContext;
     }
     from_screen = to_screen = glxc->pScreen->myNum;
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
     /*
-    ** Send enough requests until the whole array is sent.
-    */
+     ** Send enough requests until the whole array is sent.
+     */
     requestNumber = 1;
     data = cl->largeCmdBuf;
     while (dataLen > 0) {
-	amount = dataLen;
-	if (amount > maxSize) {
-	    amount = maxSize;
-	}
-
-	for (s=from_screen; s<=to_screen; s++) {
-
-	   Display *dpy = GetBackEndDisplay(cl,s);
-	   DMXScreenInfo *dmxScreen = &dmxScreens[s];
-
-	   LockDisplay(dpy);
-	   GetReq(GLXRenderLarge,req); 
-	   req->reqType = dmxScreen->glxMajorOpcode;
-	   req->glxCode = X_GLXRenderLarge; 
-	   req->contextTag = GetCurrentBackEndTag(cl,contextTag,s);
-	   req->length += (amount + 3) >> 2;
-	   req->requestNumber = requestNumber++;
-	   req->requestTotal = totalRequests;
-	   req->dataBytes = amount;
-	   Data(dpy, ((const char*)data), amount);
-	   dataLen -= amount;
-	   data = ((GLbyte *) data) + amount;
-	   UnlockDisplay(dpy);
-	   SyncHandle();
-	}
+        amount = dataLen;
+        if (amount > maxSize) {
+            amount = maxSize;
+        }
+
+        for (s = from_screen; s <= to_screen; s++) {
+
+            Display *dpy = GetBackEndDisplay(cl, s);
+            DMXScreenInfo *dmxScreen = &dmxScreens[s];
+
+            LockDisplay(dpy);
+            GetReq(GLXRenderLarge, req);
+            req->reqType = dmxScreen->glxMajorOpcode;
+            req->glxCode = X_GLXRenderLarge;
+            req->contextTag = GetCurrentBackEndTag(cl, contextTag, s);
+            req->length += (amount + 3) >> 2;
+            req->requestNumber = requestNumber++;
+            req->requestTotal = totalRequests;
+            req->dataBytes = amount;
+            Data(dpy, ((const char *) data), amount);
+            dataLen -= amount;
+            data = ((GLbyte *) data) + amount;
+            UnlockDisplay(dpy);
+            SyncHandle();
+        }
     }
 
     return Success;
diff --git a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
index f28a79df6..ec0e83d09 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
@@ -39,9 +39,9 @@
 #include "glxext.h"
 #include "glxvendor.h"
 
-extern int glxIsExtensionSupported( char *ext );
+extern int glxIsExtensionSupported(char *ext);
 
-int __glXSwapGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc);
+int __glXSwapGetFBConfigsSGIX(__GLXclientState * cl, GLbyte * pc);
 
 /************************************************************************/
 
@@ -52,9 +52,11 @@ int __glXSwapGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc);
 ** it is called at the end of the unswapped routine.
 */
 
-int __glXSwapCreateContext(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapCreateContext(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXCreateContextReq *req = (xGLXCreateContextReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -66,9 +68,11 @@ int __glXSwapCreateContext(__GLXclientState *cl, GLbyte *pc)
     return __glXCreateContext(cl, pc);
 }
 
-int __glXSwapCreateNewContext(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapCreateNewContext(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXCreateNewContextReq *req = (xGLXCreateNewContextReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -80,9 +84,11 @@ int __glXSwapCreateNewContext(__GLXclientState *cl, GLbyte *pc)
     return __glXCreateNewContext(cl, pc);
 }
 
-int __glXSwapCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapCreateContextWithConfigSGIX(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXCreateContextWithConfigSGIXReq *req = (xGLXCreateContextWithConfigSGIXReq *) pc;
+    xGLXCreateContextWithConfigSGIXReq *req =
+        (xGLXCreateContextWithConfigSGIXReq *) pc;
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -94,10 +100,11 @@ int __glXSwapCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc)
     return __glXCreateContextWithConfigSGIX(cl, pc);
 }
 
-int __glXSwapQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapQueryMaxSwapBarriersSGIX(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXQueryMaxSwapBarriersSGIXReq *req =
-	(xGLXQueryMaxSwapBarriersSGIXReq *)pc;
+        (xGLXQueryMaxSwapBarriersSGIXReq *) pc;
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -106,9 +113,11 @@ int __glXSwapQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc)
     return __glXQueryMaxSwapBarriersSGIX(cl, pc);
 }
 
-int __glXSwapBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapBindSwapBarrierSGIX(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXBindSwapBarrierSGIXReq *req = (xGLXBindSwapBarrierSGIXReq *)pc;
+    xGLXBindSwapBarrierSGIXReq *req = (xGLXBindSwapBarrierSGIXReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -118,9 +127,11 @@ int __glXSwapBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc)
     return __glXBindSwapBarrierSGIX(cl, pc);
 }
 
-int __glXSwapJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXJoinSwapGroupSGIXReq *req = (xGLXJoinSwapGroupSGIXReq *)pc;
+    xGLXJoinSwapGroupSGIXReq *req = (xGLXJoinSwapGroupSGIXReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -130,9 +141,11 @@ int __glXSwapJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc)
     return __glXJoinSwapGroupSGIX(cl, pc);
 }
 
-int __glXSwapDestroyContext(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapDestroyContext(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXDestroyContextReq *req = (xGLXDestroyContextReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -141,9 +154,11 @@ int __glXSwapDestroyContext(__GLXclientState *cl, GLbyte *pc)
     return __glXDestroyContext(cl, pc);
 }
 
-int __glXSwapMakeCurrent(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapMakeCurrent(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXMakeCurrentReq *req = (xGLXMakeCurrentReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -154,9 +169,11 @@ int __glXSwapMakeCurrent(__GLXclientState *cl, GLbyte *pc)
     return __glXMakeCurrent(cl, pc);
 }
 
-int __glXSwapMakeContextCurrent(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapMakeContextCurrent(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXMakeContextCurrentReq *req = (xGLXMakeContextCurrentReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -168,9 +185,11 @@ int __glXSwapMakeContextCurrent(__GLXclientState *cl, GLbyte *pc)
     return __glXMakeContextCurrent(cl, pc);
 }
 
-int __glXSwapMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapMakeCurrentReadSGI(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXMakeCurrentReadSGIReq *req = (xGLXMakeCurrentReadSGIReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -182,9 +201,11 @@ int __glXSwapMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc)
     return __glXMakeCurrentReadSGI(cl, pc);
 }
 
-int __glXSwapIsDirect(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapIsDirect(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXIsDirectReq *req = (xGLXIsDirectReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -193,9 +214,11 @@ int __glXSwapIsDirect(__GLXclientState *cl, GLbyte *pc)
     return __glXIsDirect(cl, pc);
 }
 
-int __glXSwapQueryVersion(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapQueryVersion(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXQueryVersionReq *req = (xGLXQueryVersionReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -205,9 +228,11 @@ int __glXSwapQueryVersion(__GLXclientState *cl, GLbyte *pc)
     return __glXQueryVersion(cl, pc);
 }
 
-int __glXSwapWaitGL(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapWaitGL(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXWaitGLReq *req = (xGLXWaitGLReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -216,9 +241,11 @@ int __glXSwapWaitGL(__GLXclientState *cl, GLbyte *pc)
     return __glXWaitGL(cl, pc);
 }
 
-int __glXSwapWaitX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapWaitX(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXWaitXReq *req = (xGLXWaitXReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -227,9 +254,11 @@ int __glXSwapWaitX(__GLXclientState *cl, GLbyte *pc)
     return __glXWaitX(cl, pc);
 }
 
-int __glXSwapCopyContext(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapCopyContext(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXCopyContextReq *req = (xGLXCopyContextReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -240,9 +269,10 @@ int __glXSwapCopyContext(__GLXclientState *cl, GLbyte *pc)
     return __glXCopyContext(cl, pc);
 }
 
-int __glXSwapGetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapGetVisualConfigs(__GLXclientState * cl, GLbyte * pc)
 {
-   ClientPtr client = cl->client;
+    ClientPtr client = cl->client;
     xGLXGetVisualConfigsReq *req = (xGLXGetVisualConfigsReq *) pc;
     xGLXGetVisualConfigsReply reply;
     __GLXscreenInfo *pGlxScreen;
@@ -250,62 +280,63 @@ int __glXSwapGetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
     CARD32 buf[__GLX_TOTAL_CONFIG];
     unsigned int screen;
     int i, p;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
     __GLX_SWAP_INT(&req->screen);
     screen = req->screen;
     if (screen >= screenInfo.numScreens) {
-	/* The client library must send a valid screen number. */
-	client->errorValue = screen;
-	return BadValue;
+        /* The client library must send a valid screen number. */
+        client->errorValue = screen;
+        return BadValue;
     }
     pGlxScreen = &__glXActiveScreens[screen];
 
     reply.numVisuals = pGlxScreen->numGLXVisuals;
     reply.numProps = __GLX_TOTAL_CONFIG;
     reply.length = (pGlxScreen->numGLXVisuals * __GLX_SIZE_CARD32 *
-		    __GLX_TOTAL_CONFIG) >> 2;
+                    __GLX_TOTAL_CONFIG) >> 2;
     reply.type = X_Reply;
     reply.sequenceNumber = client->sequence;
-    
+
     __GLX_SWAP_SHORT(&reply.sequenceNumber);
     __GLX_SWAP_INT(&reply.length);
     __GLX_SWAP_INT(&reply.numVisuals);
     __GLX_SWAP_INT(&reply.numProps);
-    WriteToClient(client, sz_xGLXGetVisualConfigsReply, (char *)&reply);
-
-    for (i=0; i < pGlxScreen->numVisuals; i++) {
-	pGlxVisual = &pGlxScreen->pGlxVisual[i];
-	if (!pGlxScreen->isGLXvis[i] || pGlxVisual->vid == 0) {
-	    /* not a usable visual */
-	    continue;
-	}
-	p = 0;
-	buf[p++] = pGlxVisual->vid;
-	buf[p++] = pGlxVisual->class;
-	buf[p++] = pGlxVisual->rgba;
-
-	buf[p++] = pGlxVisual->redSize;
-	buf[p++] = pGlxVisual->greenSize;
-	buf[p++] = pGlxVisual->blueSize;
-	buf[p++] = pGlxVisual->alphaSize;
-	buf[p++] = pGlxVisual->accumRedSize;
-	buf[p++] = pGlxVisual->accumGreenSize;
-	buf[p++] = pGlxVisual->accumBlueSize;
-	buf[p++] = pGlxVisual->accumAlphaSize;
-
-	buf[p++] = pGlxVisual->doubleBuffer;
-	buf[p++] = pGlxVisual->stereo;
-
-	buf[p++] = pGlxVisual->bufferSize;
-	buf[p++] = pGlxVisual->depthSize;
-	buf[p++] = pGlxVisual->stencilSize;
-	buf[p++] = pGlxVisual->auxBuffers;
-	buf[p++] = pGlxVisual->level;
+    WriteToClient(client, sz_xGLXGetVisualConfigsReply, (char *) &reply);
+
+    for (i = 0; i < pGlxScreen->numVisuals; i++) {
+        pGlxVisual = &pGlxScreen->pGlxVisual[i];
+        if (!pGlxScreen->isGLXvis[i] || pGlxVisual->vid == 0) {
+            /* not a usable visual */
+            continue;
+        }
+        p = 0;
+        buf[p++] = pGlxVisual->vid;
+        buf[p++] = pGlxVisual->class;
+        buf[p++] = pGlxVisual->rgba;
+
+        buf[p++] = pGlxVisual->redSize;
+        buf[p++] = pGlxVisual->greenSize;
+        buf[p++] = pGlxVisual->blueSize;
+        buf[p++] = pGlxVisual->alphaSize;
+        buf[p++] = pGlxVisual->accumRedSize;
+        buf[p++] = pGlxVisual->accumGreenSize;
+        buf[p++] = pGlxVisual->accumBlueSize;
+        buf[p++] = pGlxVisual->accumAlphaSize;
+
+        buf[p++] = pGlxVisual->doubleBuffer;
+        buf[p++] = pGlxVisual->stereo;
+
+        buf[p++] = pGlxVisual->bufferSize;
+        buf[p++] = pGlxVisual->depthSize;
+        buf[p++] = pGlxVisual->stencilSize;
+        buf[p++] = pGlxVisual->auxBuffers;
+        buf[p++] = pGlxVisual->level;
         /*
-        ** Add token/value pairs for extensions.
-        */
+         ** Add token/value pairs for extensions.
+         */
         buf[p++] = GLX_VISUAL_CAVEAT_EXT;
         buf[p++] = pGlxVisual->visualRating;
         buf[p++] = GLX_TRANSPARENT_TYPE_EXT;
@@ -321,16 +352,18 @@ int __glXSwapGetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
         buf[p++] = GLX_TRANSPARENT_INDEX_VALUE_EXT;
         buf[p++] = pGlxVisual->transparentIndex;
 
-	__GLX_SWAP_INT_ARRAY(buf, __GLX_TOTAL_CONFIG);
-	WriteToClient(client, __GLX_SIZE_CARD32 * __GLX_TOTAL_CONFIG, 
-			(char *)buf);
+        __GLX_SWAP_INT_ARRAY(buf, __GLX_TOTAL_CONFIG);
+        WriteToClient(client, __GLX_SIZE_CARD32 * __GLX_TOTAL_CONFIG,
+                      (char *) buf);
     }
     return Success;
 }
 
-int __glXSwapCreateGLXPixmap(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapCreateGLXPixmap(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXCreateGLXPixmapReq *req = (xGLXCreateGLXPixmapReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -342,9 +375,11 @@ int __glXSwapCreateGLXPixmap(__GLXclientState *cl, GLbyte *pc)
     return __glXCreateGLXPixmap(cl, pc);
 }
 
-int __glXSwapCreatePixmap(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapCreatePixmap(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXCreatePixmapReq *req = (xGLXCreatePixmapReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -357,9 +392,11 @@ int __glXSwapCreatePixmap(__GLXclientState *cl, GLbyte *pc)
     return __glXCreatePixmap(cl, pc);
 }
 
-int __glXSwapDestroyGLXPixmap(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapDestroyGLXPixmap(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXDestroyGLXPixmapReq *req = (xGLXDestroyGLXPixmapReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -368,9 +405,11 @@ int __glXSwapDestroyGLXPixmap(__GLXclientState *cl, GLbyte *pc)
     return __glXDestroyGLXPixmap(cl, pc);
 }
 
-int __glXSwapSwapBuffers(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapSwapBuffers(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXSwapBuffersReq *req = (xGLXSwapBuffersReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -380,9 +419,11 @@ int __glXSwapSwapBuffers(__GLXclientState *cl, GLbyte *pc)
     return __glXSwapBuffers(cl, pc);
 }
 
-int __glXSwapUseXFont(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapUseXFont(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXUseXFontReq *req = (xGLXUseXFontReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -395,10 +436,11 @@ int __glXSwapUseXFont(__GLXclientState *cl, GLbyte *pc)
     return __glXUseXFont(cl, pc);
 }
 
-
-int __glXSwapQueryExtensionsString(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapQueryExtensionsString(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXQueryExtensionsStringReq *req = NULL;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -407,9 +449,11 @@ int __glXSwapQueryExtensionsString(__GLXclientState *cl, GLbyte *pc)
     return __glXQueryExtensionsString(cl, pc);
 }
 
-int __glXSwapQueryServerString(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapQueryServerString(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXQueryServerStringReq *req = (xGLXQueryServerStringReq *)pc;
+    xGLXQueryServerStringReq *req = (xGLXQueryServerStringReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -419,9 +463,11 @@ int __glXSwapQueryServerString(__GLXclientState *cl, GLbyte *pc)
     return __glXQueryServerString(cl, pc);
 }
 
-int __glXSwapClientInfo(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapClientInfo(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXClientInfoReq *req = (xGLXClientInfoReq *)pc;
+    xGLXClientInfoReq *req = (xGLXClientInfoReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -432,15 +478,17 @@ int __glXSwapClientInfo(__GLXclientState *cl, GLbyte *pc)
     return __glXClientInfo(cl, pc);
 }
 
-int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, char *pc)
+int
+__glXSwapQueryContextInfoEXT(__GLXclientState * cl, char *pc)
 {
     xGLXQueryContextInfoEXTReq *req = (xGLXQueryContextInfoEXTReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
     __GLX_SWAP_INT(&req->context);
 
-    return __glXQueryContextInfoEXT(cl, (GLbyte *)pc);
+    return __glXQueryContextInfoEXT(cl, (GLbyte *) pc);
 }
 
 /************************************************************************/
@@ -449,7 +497,8 @@ int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, char *pc)
 ** Swap replies.
 */
 
-void __glXSwapMakeCurrentReply(ClientPtr client,  xGLXMakeCurrentReadSGIReply *reply)
+void
+__glXSwapMakeCurrentReply(ClientPtr client, xGLXMakeCurrentReadSGIReply * reply)
 {
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_SWAP_SHORT(&reply->sequenceNumber);
@@ -459,103 +508,120 @@ void __glXSwapMakeCurrentReply(ClientPtr client,  xGLXMakeCurrentReadSGIReply *r
     __GLX_SWAP_INT(&reply->writeType);
     __GLX_SWAP_INT(&reply->readVid);
     __GLX_SWAP_INT(&reply->readType);
-    WriteToClient(client, sz_xGLXMakeCurrentReadSGIReply, (char *)reply);
+    WriteToClient(client, sz_xGLXMakeCurrentReadSGIReply, (char *) reply);
 }
 
-void __glXSwapIsDirectReply(ClientPtr client, xGLXIsDirectReply *reply)
+void
+__glXSwapIsDirectReply(ClientPtr client, xGLXIsDirectReply * reply)
 {
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_SWAP_SHORT(&reply->sequenceNumber);
     __GLX_SWAP_INT(&reply->length);
-    WriteToClient(client, sz_xGLXIsDirectReply, (char *)reply);
+    WriteToClient(client, sz_xGLXIsDirectReply, (char *) reply);
 }
 
-void __glXSwapQueryVersionReply(ClientPtr client, xGLXQueryVersionReply *reply)
+void
+__glXSwapQueryVersionReply(ClientPtr client, xGLXQueryVersionReply * reply)
 {
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_SWAP_SHORT(&reply->sequenceNumber);
     __GLX_SWAP_INT(&reply->length);
     __GLX_SWAP_INT(&reply->majorVersion);
     __GLX_SWAP_INT(&reply->minorVersion);
-    WriteToClient(client, sz_xGLXQueryVersionReply, (char *)reply);
+    WriteToClient(client, sz_xGLXQueryVersionReply, (char *) reply);
 }
 
-void glxSwapQueryExtensionsStringReply(ClientPtr client,
-				       xGLXQueryExtensionsStringReply *reply, char *buf)
+void
+glxSwapQueryExtensionsStringReply(ClientPtr client,
+                                  xGLXQueryExtensionsStringReply * reply,
+                                  char *buf)
 {
     int length = reply->length;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
     __GLX_SWAP_SHORT(&reply->sequenceNumber);
     __GLX_SWAP_INT(&reply->length);
     __GLX_SWAP_INT(&reply->n);
-    WriteToClient(client, sz_xGLXQueryExtensionsStringReply, (char *)reply);
-    __GLX_SWAP_INT_ARRAY((int *)buf, length);
+    WriteToClient(client, sz_xGLXQueryExtensionsStringReply, (char *) reply);
+    __GLX_SWAP_INT_ARRAY((int *) buf, length);
     WriteToClient(client, length << 2, buf);
 }
 
-void glxSwapQueryServerStringReply(ClientPtr client,
-				   xGLXQueryServerStringReply *reply, char *buf)
+void
+glxSwapQueryServerStringReply(ClientPtr client,
+                              xGLXQueryServerStringReply * reply, char *buf)
 {
     int length = reply->length;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_SWAP_SHORT(&reply->sequenceNumber);
     __GLX_SWAP_INT(&reply->length);
     __GLX_SWAP_INT(&reply->n);
-    WriteToClient(client, sz_xGLXQueryServerStringReply, (char *)reply);
+    WriteToClient(client, sz_xGLXQueryServerStringReply, (char *) reply);
     /** no swap is needed for an array of chars **/
     /* __GLX_SWAP_INT_ARRAY((int *)buf, length); */
     WriteToClient(client, length << 2, buf);
 }
 
-void __glXSwapQueryContextInfoEXTReply(ClientPtr client, xGLXQueryContextInfoEXTReply *reply, int *buf)
+void
+__glXSwapQueryContextInfoEXTReply(ClientPtr client,
+                                  xGLXQueryContextInfoEXTReply * reply,
+                                  int *buf)
 {
     int length = reply->length;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
     __GLX_SWAP_SHORT(&reply->sequenceNumber);
     __GLX_SWAP_INT(&reply->length);
     __GLX_SWAP_INT(&reply->n);
-    WriteToClient(client, sz_xGLXQueryContextInfoEXTReply, (char *)reply);
-    __GLX_SWAP_INT_ARRAY((int *)buf, length);
-    WriteToClient(client, length << 2, (char *)buf);
+    WriteToClient(client, sz_xGLXQueryContextInfoEXTReply, (char *) reply);
+    __GLX_SWAP_INT_ARRAY((int *) buf, length);
+    WriteToClient(client, length << 2, (char *) buf);
 }
 
-
-void __glXSwapQueryContextReply(ClientPtr client,
-                                xGLXQueryContextReply *reply, int *buf)
+void
+__glXSwapQueryContextReply(ClientPtr client,
+                           xGLXQueryContextReply * reply, int *buf)
 {
     int length = reply->length;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
     __GLX_SWAP_SHORT(&reply->sequenceNumber);
     __GLX_SWAP_INT(&reply->length);
     __GLX_SWAP_INT(&reply->n);
-    WriteToClient(client, sz_xGLXQueryContextReply, (char *)reply);
-    __GLX_SWAP_INT_ARRAY((int *)buf, length);
-    WriteToClient(client, length << 2, (char *)buf);
+    WriteToClient(client, sz_xGLXQueryContextReply, (char *) reply);
+    __GLX_SWAP_INT_ARRAY((int *) buf, length);
+    WriteToClient(client, length << 2, (char *) buf);
 }
 
-void __glXSwapGetDrawableAttributesReply(ClientPtr client,
-                                 xGLXGetDrawableAttributesReply *reply, int *buf) 
+void
+__glXSwapGetDrawableAttributesReply(ClientPtr client,
+                                    xGLXGetDrawableAttributesReply * reply,
+                                    int *buf)
 {
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
     __GLX_SWAP_SHORT(&reply->sequenceNumber);
     __GLX_SWAP_INT(&reply->length);
     __GLX_SWAP_INT(&reply->numAttribs);
-    __GLX_SWAP_INT_ARRAY( buf, reply->length );
-    WriteToClient(client, sz_xGLXGetDrawableAttributesReply, (char *)reply);
-    WriteToClient(client, reply->length << 2, (char *)buf);
+    __GLX_SWAP_INT_ARRAY(buf, reply->length);
+    WriteToClient(client, sz_xGLXGetDrawableAttributesReply, (char *) reply);
+    WriteToClient(client, reply->length << 2, (char *) buf);
 }
 
-void __glXSwapQueryMaxSwapBarriersSGIXReply(ClientPtr client, xGLXQueryMaxSwapBarriersSGIXReply *reply)
+void
+__glXSwapQueryMaxSwapBarriersSGIXReply(ClientPtr client,
+                                       xGLXQueryMaxSwapBarriersSGIXReply *
+                                       reply)
 {
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_SWAP_SHORT(&reply->sequenceNumber);
     __GLX_SWAP_INT(&reply->length);
     __GLX_SWAP_INT(&reply->max);
-    WriteToClient(client, sz_xGLXQueryMaxSwapBarriersSGIXReply, (char *)reply);
+    WriteToClient(client, sz_xGLXQueryMaxSwapBarriersSGIXReply, (char *) reply);
 }
 
 /************************************************************************/
@@ -565,21 +631,23 @@ void __glXSwapQueryMaxSwapBarriersSGIXReply(ClientPtr client, xGLXQueryMaxSwapBa
 ** client library to send batches of GL rendering commands.
 */
 
-int __glXSwapRender(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapRender(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXRenderReq *req;
     int left;
     __GLXrenderHeader *hdr;
     ClientPtr client = cl->client;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
     /*
-    ** NOTE: much of this code also appears in the nonswapping version of this
-    ** routine, __glXRender().  Any changes made here should also be
-    ** duplicated there.
-    */
-    
+     ** NOTE: much of this code also appears in the nonswapping version of this
+     ** routine, __glXRender().  Any changes made here should also be
+     ** duplicated there.
+     */
+
     req = (xGLXRenderReq *) pc;
     __GLX_SWAP_SHORT(&req->length);
     __GLX_SWAP_INT(&req->contextTag);
@@ -587,74 +655,81 @@ int __glXSwapRender(__GLXclientState *cl, GLbyte *pc)
     pc += sz_xGLXRenderReq;
     left = (req->length << 2) - sz_xGLXRenderReq;
     while (left > 0) {
-	void (* proc)(GLbyte *);
-	CARD16 opcode;
-
-	/*
-	** Verify that the header length and the overall length agree.
-	** Also, each command must be word aligned.
-	*/
-	hdr = (__GLXrenderHeader *) pc;
-	__GLX_SWAP_SHORT(&hdr->length);
-	__GLX_SWAP_SHORT(&hdr->opcode);
-
-	/*
+        void (*proc) (GLbyte *);
+        CARD16 opcode;
+
+        /*
+         ** Verify that the header length and the overall length agree.
+         ** Also, each command must be word aligned.
+         */
+        hdr = (__GLXrenderHeader *) pc;
+        __GLX_SWAP_SHORT(&hdr->length);
+        __GLX_SWAP_SHORT(&hdr->opcode);
+
+        /*
          * call the command procedure to swap any arguments
-	 */
-	opcode = hdr->opcode;
-	if ( (opcode >= __GLX_MIN_RENDER_OPCODE) && 
-	     (opcode <= __GLX_MAX_RENDER_OPCODE) ) {
-	    proc = __glXSwapRenderTable[opcode];
+         */
+        opcode = hdr->opcode;
+        if ((opcode >= __GLX_MIN_RENDER_OPCODE) &&
+            (opcode <= __GLX_MAX_RENDER_OPCODE)) {
+            proc = __glXSwapRenderTable[opcode];
 #if __GLX_MAX_RENDER_OPCODE_EXT > __GLX_MIN_RENDER_OPCODE_EXT
-	} else if ( (opcode >= __GLX_MIN_RENDER_OPCODE_EXT) && 
-	     (opcode <= __GLX_MAX_RENDER_OPCODE_EXT) ) {
-	    int index = opcode - __GLX_MIN_RENDER_OPCODE_EXT;
-	    __GLXRenderSwapInfo *info = &__glXSwapRenderTable_EXT[index];
-	    if (info->swapfunc) {
-	       proc = info->swapfunc;
-	    }
-	    else {
-	       proc = NULL;
-	       if (info->elem_size == 4 && info->nelems > 0) {
-		  __GLX_SWAP_INT_ARRAY( (int *)(pc + __GLX_RENDER_HDR_SIZE), 
-			                info->nelems );
-	       }
-	       else if (info->elem_size == 2 && info->nelems > 0) {
-		  __GLX_SWAP_SHORT_ARRAY( (short *)(pc + __GLX_RENDER_HDR_SIZE), 
-			                info->nelems );
-	       }
-	       else if (info->elem_size == 8 && info->nelems > 0) {
-		  __GLX_SWAP_DOUBLE_ARRAY( (double *)(pc + __GLX_RENDER_HDR_SIZE), 
-			                info->nelems );
-	       }
-	    }
-#endif /* __GLX_MAX_RENDER_OPCODE_EXT > __GLX_MIN_RENDER_OPCODE_EXT */
-	} else {
-	    client->errorValue = 0;
-	    return __glXBadRenderRequest;
-	}
-
-	if (proc != NULL) 
-	   (*proc)(pc + __GLX_RENDER_HDR_SIZE);
-
-	/*
-	 * proceed to the next command
-	 */ 
-	pc += hdr->length;
-	left -= hdr->length;
+        }
+        else if ((opcode >= __GLX_MIN_RENDER_OPCODE_EXT) &&
+                 (opcode <= __GLX_MAX_RENDER_OPCODE_EXT)) {
+            int index = opcode - __GLX_MIN_RENDER_OPCODE_EXT;
+            __GLXRenderSwapInfo *info = &__glXSwapRenderTable_EXT[index];
+
+            if (info->swapfunc) {
+                proc = info->swapfunc;
+            }
+            else {
+                proc = NULL;
+                if (info->elem_size == 4 && info->nelems > 0) {
+                    __GLX_SWAP_INT_ARRAY((int *) (pc + __GLX_RENDER_HDR_SIZE),
+                                         info->nelems);
+                }
+                else if (info->elem_size == 2 && info->nelems > 0) {
+                    __GLX_SWAP_SHORT_ARRAY((short *) (pc +
+                                                      __GLX_RENDER_HDR_SIZE),
+                                           info->nelems);
+                }
+                else if (info->elem_size == 8 && info->nelems > 0) {
+                    __GLX_SWAP_DOUBLE_ARRAY((double *) (pc +
+                                                        __GLX_RENDER_HDR_SIZE),
+                                            info->nelems);
+                }
+            }
+#endif                          /* __GLX_MAX_RENDER_OPCODE_EXT > __GLX_MIN_RENDER_OPCODE_EXT */
+        }
+        else {
+            client->errorValue = 0;
+            return __glXBadRenderRequest;
+        }
+
+        if (proc != NULL)
+            (*proc) (pc + __GLX_RENDER_HDR_SIZE);
+
+        /*
+         * proceed to the next command
+         */
+        pc += hdr->length;
+        left -= hdr->length;
     }
 
-    return __glXRender( cl, (GLbyte *)req );
+    return __glXRender(cl, (GLbyte *) req);
 }
 
 /*
 ** Execute a large rendering request (one that spans multiple X requests).
 */
-int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapRenderLarge(__GLXclientState * cl, GLbyte * pc)
 {
-   ClientPtr client = cl->client;
+    ClientPtr client = cl->client;
     xGLXRenderLargeReq *req;
     __GLXrenderLargeHeader *hdr;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
@@ -666,134 +741,139 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc)
     __GLX_SWAP_SHORT(&req->requestTotal);
 
     pc += sz_xGLXRenderLargeReq;
-   
+
     if (req->requestNumber == 1) {
-	void (* proc)(GLbyte *) = NULL;
-	__GLXRenderSwapInfo *info = NULL;
-	CARD16 opcode;
+        void (*proc) (GLbyte *) = NULL;
+        __GLXRenderSwapInfo *info = NULL;
+        CARD16 opcode;
 
-	hdr = (__GLXrenderLargeHeader *) pc;
-	__GLX_SWAP_INT(&hdr->length);
-	__GLX_SWAP_INT(&hdr->opcode);
+        hdr = (__GLXrenderLargeHeader *) pc;
+        __GLX_SWAP_INT(&hdr->length);
+        __GLX_SWAP_INT(&hdr->opcode);
 
-	/*
+        /*
          * call the command procedure to swap any arguments
-	 * Note that we are assuming that all arguments that needs to be
-	 * swaped are on the first req only !
-	 */
-	opcode = hdr->opcode;
-	if ( (opcode >= __GLX_MIN_RENDER_OPCODE) && 
-	     (opcode <= __GLX_MAX_RENDER_OPCODE) ) {
-	    proc = __glXSwapRenderTable[opcode];
+         * Note that we are assuming that all arguments that needs to be
+         * swaped are on the first req only !
+         */
+        opcode = hdr->opcode;
+        if ((opcode >= __GLX_MIN_RENDER_OPCODE) &&
+            (opcode <= __GLX_MAX_RENDER_OPCODE)) {
+            proc = __glXSwapRenderTable[opcode];
 #if __GLX_MAX_RENDER_OPCODE_EXT > __GLX_MIN_RENDER_OPCODE_EXT
-	} else if ( (opcode >= __GLX_MIN_RENDER_OPCODE_EXT) && 
-	     (opcode <= __GLX_MAX_RENDER_OPCODE_EXT) ) {
-	    int index = opcode - __GLX_MIN_RENDER_OPCODE_EXT;
-	    info = &__glXSwapRenderTable_EXT[index];
-	    if (info->swapfunc) {
-	       proc = info->swapfunc;
-	    }
-#endif /* __GLX_MAX_RENDER_OPCODE_EXT > __GLX_MIN_RENDER_OPCODE_EXT */
-	} else {
-	    client->errorValue = 0;
-	    cl->largeCmdRequestsTotal = 0;
-	    return __glXBadLargeRequest;
-	}
-
-	/*
-	** Make enough space in the buffer, then copy the entire request.
-	*/
-	if (cl->largeCmdBufSize < hdr->length) {
-	    if (!cl->largeCmdBuf) {
-		cl->largeCmdBuf = (GLbyte *) malloc(hdr->length);
-	    } else {
-		cl->largeCmdBuf = (GLbyte *) realloc(cl->largeCmdBuf, hdr->length);
-	    }
-	    if (!cl->largeCmdBuf) {
-	       cl->largeCmdRequestsTotal = 0;
-		return BadAlloc;
-	    }
-	    cl->largeCmdBufSize = hdr->length;
-	}
-	memcpy(cl->largeCmdBuf, pc, req->dataBytes);
-
-	cl->largeCmdBytesSoFar = req->dataBytes;
-	cl->largeCmdBytesTotal = hdr->length;
-	cl->largeCmdRequestsSoFar = 1;
-	cl->largeCmdRequestsTotal = req->requestTotal;
-	cl->largeCmdRequestsSwapProc = proc;
-	cl->largeCmdMaxReqDataSize = req->dataBytes;
-	cl->largeCmdRequestsSwap_info = info;
-
-	return Success;
-	
+        }
+        else if ((opcode >= __GLX_MIN_RENDER_OPCODE_EXT) &&
+                 (opcode <= __GLX_MAX_RENDER_OPCODE_EXT)) {
+            int index = opcode - __GLX_MIN_RENDER_OPCODE_EXT;
+
+            info = &__glXSwapRenderTable_EXT[index];
+            if (info->swapfunc) {
+                proc = info->swapfunc;
+            }
+#endif                          /* __GLX_MAX_RENDER_OPCODE_EXT > __GLX_MIN_RENDER_OPCODE_EXT */
+        }
+        else {
+            client->errorValue = 0;
+            cl->largeCmdRequestsTotal = 0;
+            return __glXBadLargeRequest;
+        }
+
+        /*
+         ** Make enough space in the buffer, then copy the entire request.
+         */
+        if (cl->largeCmdBufSize < hdr->length) {
+            if (!cl->largeCmdBuf) {
+                cl->largeCmdBuf = (GLbyte *) malloc(hdr->length);
+            }
+            else {
+                cl->largeCmdBuf =
+                    (GLbyte *) realloc(cl->largeCmdBuf, hdr->length);
+            }
+            if (!cl->largeCmdBuf) {
+                cl->largeCmdRequestsTotal = 0;
+                return BadAlloc;
+            }
+            cl->largeCmdBufSize = hdr->length;
+        }
+        memcpy(cl->largeCmdBuf, pc, req->dataBytes);
+
+        cl->largeCmdBytesSoFar = req->dataBytes;
+        cl->largeCmdBytesTotal = hdr->length;
+        cl->largeCmdRequestsSoFar = 1;
+        cl->largeCmdRequestsTotal = req->requestTotal;
+        cl->largeCmdRequestsSwapProc = proc;
+        cl->largeCmdMaxReqDataSize = req->dataBytes;
+        cl->largeCmdRequestsSwap_info = info;
+
+        return Success;
 
     }
     else if (req->requestNumber < cl->largeCmdRequestsTotal) {
-       /*
-        * This is not the first nor last request - just copy the data
-	*/
-       if (  cl->largeCmdBytesSoFar + req->dataBytes > cl->largeCmdBytesTotal) {
-	    cl->largeCmdRequestsTotal = 0;
-	    return __glXBadLargeRequest;
-       }
+        /*
+         * This is not the first nor last request - just copy the data
+         */
+        if (cl->largeCmdBytesSoFar + req->dataBytes > cl->largeCmdBytesTotal) {
+            cl->largeCmdRequestsTotal = 0;
+            return __glXBadLargeRequest;
+        }
 
-       memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, 
-	           pc, req->dataBytes);
+        memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, pc, req->dataBytes);
 
-       cl->largeCmdBytesSoFar += req->dataBytes;
+        cl->largeCmdBytesSoFar += req->dataBytes;
 
-       if (req->dataBytes > cl->largeCmdMaxReqDataSize)
-	  cl->largeCmdMaxReqDataSize = req->dataBytes;
+        if (req->dataBytes > cl->largeCmdMaxReqDataSize)
+            cl->largeCmdMaxReqDataSize = req->dataBytes;
 
-	return Success;
+        return Success;
     }
     else if (req->requestNumber == cl->largeCmdRequestsTotal) {
-       /*
-        * this is the last request
-        * copy the remainder bytes, call the procedure to swap any
-	* needed data, and then call to transfer the command to all
-	* back-end servers
-	*/
-       if (  cl->largeCmdBytesSoFar + req->dataBytes > cl->largeCmdBytesTotal) {
-	    cl->largeCmdRequestsTotal = 0;
-	    return __glXBadLargeRequest;
-       }
-
-       memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, 
-	           pc, req->dataBytes);
-
-       cl->largeCmdBytesSoFar += req->dataBytes;
-
-       if (req->dataBytes > cl->largeCmdMaxReqDataSize)
-	  cl->largeCmdMaxReqDataSize = req->dataBytes;
-
-	if (cl->largeCmdRequestsSwapProc != NULL) {
-	   (*cl->largeCmdRequestsSwapProc)(cl->largeCmdBuf + __GLX_RENDER_LARGE_HDR_SIZE);
-	}
-	else if (cl->largeCmdRequestsSwap_info &&
-	         cl->largeCmdRequestsSwap_info->nelems > 0) {
-    	   if (cl->largeCmdRequestsSwap_info->elem_size == 4) {
-	      __GLX_SWAP_INT_ARRAY( (int *)(pc + __GLX_RENDER_LARGE_HDR_SIZE), 
-		       cl->largeCmdRequestsSwap_info->nelems );
-	   }
-	   else if (cl->largeCmdRequestsSwap_info->elem_size == 2) {
-	      __GLX_SWAP_SHORT_ARRAY( (short *)(pc + __GLX_RENDER_LARGE_HDR_SIZE), 
-		       cl->largeCmdRequestsSwap_info->nelems );
-	   }
-	   else if (cl->largeCmdRequestsSwap_info->elem_size == 8) {
-	      __GLX_SWAP_DOUBLE_ARRAY( (double *)(pc + __GLX_RENDER_LARGE_HDR_SIZE), 
-		       cl->largeCmdRequestsSwap_info->nelems );
-	   }
-	}
-
-	cl->largeCmdRequestsTotal = 0;
-        return( __glXSendLargeCommand(cl, req->contextTag) );
+        /*
+         * this is the last request
+         * copy the remainder bytes, call the procedure to swap any
+         * needed data, and then call to transfer the command to all
+         * back-end servers
+         */
+        if (cl->largeCmdBytesSoFar + req->dataBytes > cl->largeCmdBytesTotal) {
+            cl->largeCmdRequestsTotal = 0;
+            return __glXBadLargeRequest;
+        }
+
+        memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, pc, req->dataBytes);
+
+        cl->largeCmdBytesSoFar += req->dataBytes;
+
+        if (req->dataBytes > cl->largeCmdMaxReqDataSize)
+            cl->largeCmdMaxReqDataSize = req->dataBytes;
+
+        if (cl->largeCmdRequestsSwapProc != NULL) {
+            (*cl->largeCmdRequestsSwapProc) (cl->largeCmdBuf +
+                                             __GLX_RENDER_LARGE_HDR_SIZE);
+        }
+        else if (cl->largeCmdRequestsSwap_info &&
+                 cl->largeCmdRequestsSwap_info->nelems > 0) {
+            if (cl->largeCmdRequestsSwap_info->elem_size == 4) {
+                __GLX_SWAP_INT_ARRAY((int *) (pc + __GLX_RENDER_LARGE_HDR_SIZE),
+                                     cl->largeCmdRequestsSwap_info->nelems);
+            }
+            else if (cl->largeCmdRequestsSwap_info->elem_size == 2) {
+                __GLX_SWAP_SHORT_ARRAY((short *) (pc +
+                                                  __GLX_RENDER_LARGE_HDR_SIZE),
+                                       cl->largeCmdRequestsSwap_info->nelems);
+            }
+            else if (cl->largeCmdRequestsSwap_info->elem_size == 8) {
+                __GLX_SWAP_DOUBLE_ARRAY((double *) (pc +
+                                                    __GLX_RENDER_LARGE_HDR_SIZE),
+                                        cl->largeCmdRequestsSwap_info->nelems);
+            }
+        }
+
+        cl->largeCmdRequestsTotal = 0;
+        return (__glXSendLargeCommand(cl, req->contextTag));
 
     }
     else {
-       cl->largeCmdRequestsTotal = 0;
-       return __glXBadLargeRequest;
+        cl->largeCmdRequestsTotal = 0;
+        return __glXBadLargeRequest;
     }
 
 }
@@ -805,7 +885,8 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc)
 ** allocating these entry points in the dispatch table.
 */
 
-int __glXSwapVendorPrivate(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapVendorPrivate(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *req;
     CARD32 vendorCode;
@@ -816,58 +897,58 @@ int __glXSwapVendorPrivate(__GLXclientState *cl, GLbyte *pc)
     vendorCode = req->vendorCode;
     __GLX_SWAP_INT(&vendorCode);
 
-
-    switch( vendorCode ) {
-
-       case X_GLvop_DeleteTexturesEXT:
-	  return __glXVForwardSingleReqSwap( cl, pc );
-	  break;
-
-       case X_GLXvop_SwapIntervalSGI:
-	  if (glxIsExtensionSupported("SGI_swap_control")) {
-	     return __glXVForwardSingleReqSwap( cl, pc );
-	  }
-	  else {
-	     return Success;
-	  }
-	  break;
-
-#if 0 /* glx 1.3 */
-       case X_GLXvop_CreateGLXVideoSourceSGIX:
-	  break;
-       case X_GLXvop_DestroyGLXVideoSourceSGIX:
-	  break;
-       case X_GLXvop_CreateGLXPixmapWithConfigSGIX:
-	  break;
-       case X_GLXvop_DestroyGLXPbufferSGIX:
-	  break;
-       case X_GLXvop_ChangeDrawableAttributesSGIX:
-	  break;
+    switch (vendorCode) {
+
+    case X_GLvop_DeleteTexturesEXT:
+        return __glXVForwardSingleReqSwap(cl, pc);
+        break;
+
+    case X_GLXvop_SwapIntervalSGI:
+        if (glxIsExtensionSupported("SGI_swap_control")) {
+            return __glXVForwardSingleReqSwap(cl, pc);
+        }
+        else {
+            return Success;
+        }
+        break;
+
+#if 0                           /* glx 1.3 */
+    case X_GLXvop_CreateGLXVideoSourceSGIX:
+        break;
+    case X_GLXvop_DestroyGLXVideoSourceSGIX:
+        break;
+    case X_GLXvop_CreateGLXPixmapWithConfigSGIX:
+        break;
+    case X_GLXvop_DestroyGLXPbufferSGIX:
+        break;
+    case X_GLXvop_ChangeDrawableAttributesSGIX:
+        break;
 #endif
 
-       case X_GLXvop_JoinSwapGroupSGIX:
-	  return __glXSwapJoinSwapGroupSGIX( cl, pc );
-	  break;
+    case X_GLXvop_JoinSwapGroupSGIX:
+        return __glXSwapJoinSwapGroupSGIX(cl, pc);
+        break;
 
-       case X_GLXvop_BindSwapBarrierSGIX:
-	  return __glXSwapBindSwapBarrierSGIX( cl, pc );
-	  break;
+    case X_GLXvop_BindSwapBarrierSGIX:
+        return __glXSwapBindSwapBarrierSGIX(cl, pc);
+        break;
 
-       case X_GLXvop_CreateContextWithConfigSGIX:
-	  return __glXSwapCreateContextWithConfigSGIX( cl, pc );
-	  break;
+    case X_GLXvop_CreateContextWithConfigSGIX:
+        return __glXSwapCreateContextWithConfigSGIX(cl, pc);
+        break;
 
-       default:
-	  /*
-	   ** unsupported private request
-	   */
-	  cl->client->errorValue = req->vendorCode;
-	  return __glXUnsupportedPrivateRequest;
+    default:
+        /*
+         ** unsupported private request
+         */
+        cl->client->errorValue = req->vendorCode;
+        return __glXUnsupportedPrivateRequest;
     }
 
 }
 
-int __glXSwapVendorPrivateWithReply(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapVendorPrivateWithReply(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateWithReplyReq *req;
     CARD32 vendorCode;
@@ -878,76 +959,78 @@ int __glXSwapVendorPrivateWithReply(__GLXclientState *cl, GLbyte *pc)
     vendorCode = req->vendorCode;
     __GLX_SWAP_INT(&vendorCode);
 
-    switch( vendorCode ) {
-
-       case X_GLvop_GetConvolutionFilterEXT:
-       case X_GLvop_GetSeparableFilterEXT:
-       case X_GLvop_GetHistogramEXT:
-       case X_GLvop_GetMinmaxEXT:
-	  return( __glXNoSuchSingleOpcode(cl, pc) );
-	  break;
-
-       case X_GLvop_GetConvolutionParameterfvEXT:
-       case X_GLvop_GetConvolutionParameterivEXT:
-       case X_GLvop_GetHistogramParameterivEXT:
-       case X_GLvop_GetMinmaxParameterfvEXT:
-       case X_GLvop_GetMinmaxParameterivEXT:
-       case X_GLvop_GenTexturesEXT:
-	  return( __glXVForwardAllWithReplySwapiv(cl, pc) );
-	  break;
-
-       case X_GLvop_AreTexturesResidentEXT:
-       case X_GLvop_IsTextureEXT:
-	  return( __glXVForwardPipe0WithReplySwap(cl, pc) );
-	  break;
-
-#if 0 /* glx1.3 */
-       case X_GLvop_GetDetailTexFuncSGIS:
-       case X_GLvop_GetSharpenTexFuncSGIS:
-       case X_GLvop_GetColorTableSGI:
-       case X_GLvop_GetColorTableParameterfvSGI:
-       case X_GLvop_GetColorTableParameterivSGI:
-       case X_GLvop_GetTexFilterFuncSGIS:
-       case X_GLvop_GetInstrumentsSGIX:
-       case X_GLvop_InstrumentsBufferSGIX:
-       case X_GLvop_PollInstrumentsSGIX:
-       case X_GLvop_FlushRasterSGIX:
-       case X_GLXvop_CreateGLXPbufferSGIX:
-       case X_GLXvop_GetDrawableAttributesSGIX:
-       case X_GLXvop_QueryHyperpipeNetworkSGIX:
-       case X_GLXvop_QueryHyperpipeConfigSGIX:
-       case X_GLXvop_HyperpipeConfigSGIX:
-       case X_GLXvop_DestroyHyperpipeConfigSGIX:
+    switch (vendorCode) {
+
+    case X_GLvop_GetConvolutionFilterEXT:
+    case X_GLvop_GetSeparableFilterEXT:
+    case X_GLvop_GetHistogramEXT:
+    case X_GLvop_GetMinmaxEXT:
+        return (__glXNoSuchSingleOpcode(cl, pc));
+        break;
+
+    case X_GLvop_GetConvolutionParameterfvEXT:
+    case X_GLvop_GetConvolutionParameterivEXT:
+    case X_GLvop_GetHistogramParameterivEXT:
+    case X_GLvop_GetMinmaxParameterfvEXT:
+    case X_GLvop_GetMinmaxParameterivEXT:
+    case X_GLvop_GenTexturesEXT:
+        return (__glXVForwardAllWithReplySwapiv(cl, pc));
+        break;
+
+    case X_GLvop_AreTexturesResidentEXT:
+    case X_GLvop_IsTextureEXT:
+        return (__glXVForwardPipe0WithReplySwap(cl, pc));
+        break;
+
+#if 0                           /* glx1.3 */
+    case X_GLvop_GetDetailTexFuncSGIS:
+    case X_GLvop_GetSharpenTexFuncSGIS:
+    case X_GLvop_GetColorTableSGI:
+    case X_GLvop_GetColorTableParameterfvSGI:
+    case X_GLvop_GetColorTableParameterivSGI:
+    case X_GLvop_GetTexFilterFuncSGIS:
+    case X_GLvop_GetInstrumentsSGIX:
+    case X_GLvop_InstrumentsBufferSGIX:
+    case X_GLvop_PollInstrumentsSGIX:
+    case X_GLvop_FlushRasterSGIX:
+    case X_GLXvop_CreateGLXPbufferSGIX:
+    case X_GLXvop_GetDrawableAttributesSGIX:
+    case X_GLXvop_QueryHyperpipeNetworkSGIX:
+    case X_GLXvop_QueryHyperpipeConfigSGIX:
+    case X_GLXvop_HyperpipeConfigSGIX:
+    case X_GLXvop_DestroyHyperpipeConfigSGIX:
 #endif
-       case X_GLXvop_QueryMaxSwapBarriersSGIX:
-	  return( __glXSwapQueryMaxSwapBarriersSGIX(cl, pc) );
-	  break;
-
-       case X_GLXvop_GetFBConfigsSGIX:
-	  return( __glXSwapGetFBConfigsSGIX(cl, pc) );
-	  break;
-
-       case X_GLXvop_MakeCurrentReadSGI:
-	  return( __glXSwapMakeCurrentReadSGI(cl, pc) );
-	  break;
-
-       case X_GLXvop_QueryContextInfoEXT:
-	  return( __glXSwapQueryContextInfoEXT(cl,(char *)pc) );
-	  break;
-
-       default:
-	  /*
-	   ** unsupported private request
-	   */
-	  cl->client->errorValue = req->vendorCode;
-	  return __glXUnsupportedPrivateRequest;
+    case X_GLXvop_QueryMaxSwapBarriersSGIX:
+        return (__glXSwapQueryMaxSwapBarriersSGIX(cl, pc));
+        break;
+
+    case X_GLXvop_GetFBConfigsSGIX:
+        return (__glXSwapGetFBConfigsSGIX(cl, pc));
+        break;
+
+    case X_GLXvop_MakeCurrentReadSGI:
+        return (__glXSwapMakeCurrentReadSGI(cl, pc));
+        break;
+
+    case X_GLXvop_QueryContextInfoEXT:
+        return (__glXSwapQueryContextInfoEXT(cl, (char *) pc));
+        break;
+
+    default:
+        /*
+         ** unsupported private request
+         */
+        cl->client->errorValue = req->vendorCode;
+        return __glXUnsupportedPrivateRequest;
     }
 
 }
 
-int __glXSwapGetFBConfigs(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapGetFBConfigs(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXGetFBConfigsReq *req = (xGLXGetFBConfigsReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -956,22 +1039,25 @@ int __glXSwapGetFBConfigs(__GLXclientState *cl, GLbyte *pc)
     return __glXGetFBConfigs(cl, pc);
 }
 
-int __glXSwapGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapGetFBConfigsSGIX(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXGetFBConfigsSGIXReq *req = (xGLXGetFBConfigsSGIXReq *)pc;
-   xGLXGetFBConfigsReq new_req;
+    xGLXGetFBConfigsSGIXReq *req = (xGLXGetFBConfigsSGIXReq *) pc;
+    xGLXGetFBConfigsReq new_req;
 
-   new_req.reqType = req->reqType;
-   new_req.glxCode = req->glxCode;
-   new_req.length = req->length;
-   new_req.screen = req->screen;
+    new_req.reqType = req->reqType;
+    new_req.glxCode = req->glxCode;
+    new_req.length = req->length;
+    new_req.screen = req->screen;
 
-   return( __glXSwapGetFBConfigs( cl, (GLbyte *)&new_req ) );
+    return (__glXSwapGetFBConfigs(cl, (GLbyte *) & new_req));
 }
 
-int __glXSwapCreateWindow(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapCreateWindow(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXCreateWindowReq *req = (xGLXCreateWindowReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
@@ -981,37 +1067,42 @@ int __glXSwapCreateWindow(__GLXclientState *cl, GLbyte *pc)
     __GLX_SWAP_INT(&req->glxwindow);
     __GLX_SWAP_INT(&req->numAttribs);
 
-    return( __glXCreateWindow( cl, (GLbyte *)pc ) );
+    return (__glXCreateWindow(cl, (GLbyte *) pc));
 }
 
-int __glXSwapDestroyWindow(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapDestroyWindow(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXDestroyWindowReq *req = (xGLXDestroyWindowReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
     __GLX_SWAP_INT(&req->glxwindow);
 
-    return( __glXDestroyWindow( cl, (GLbyte *)pc ) );
+    return (__glXDestroyWindow(cl, (GLbyte *) pc));
 }
 
-int __glXSwapQueryContext(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapQueryContext(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXQueryContextReq *req = (xGLXQueryContextReq *)pc;
+    xGLXQueryContextReq *req = (xGLXQueryContextReq *) pc;
 
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
     __GLX_SWAP_INT(&req->context);
 
-    return( __glXQueryContext(cl, (GLbyte *)pc) );
- 
+    return (__glXQueryContext(cl, (GLbyte *) pc));
+
 }
 
-int __glXSwapCreatePbuffer(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapCreatePbuffer(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXCreatePbufferReq *req = (xGLXCreatePbufferReq *)pc;
+    xGLXCreatePbufferReq *req = (xGLXCreatePbufferReq *) pc;
     int nattr = req->numAttribs;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
@@ -1020,43 +1111,49 @@ int __glXSwapCreatePbuffer(__GLXclientState *cl, GLbyte *pc)
     __GLX_SWAP_INT(&req->fbconfig);
     __GLX_SWAP_INT(&req->pbuffer);
     __GLX_SWAP_INT(&req->numAttribs);
-    __GLX_SWAP_INT_ARRAY( (int *)(req+1), nattr*2 );
+    __GLX_SWAP_INT_ARRAY((int *) (req + 1), nattr * 2);
 
-    return( __glXCreatePbuffer( cl, pc ) );
+    return (__glXCreatePbuffer(cl, pc));
 }
 
-int __glXSwapDestroyPbuffer(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapDestroyPbuffer(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXDestroyPbufferReq *req = (xGLXDestroyPbufferReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
     __GLX_SWAP_INT(&req->pbuffer);
 
-    return( __glXDestroyPbuffer( cl, (GLbyte *)pc ) );
+    return (__glXDestroyPbuffer(cl, (GLbyte *) pc));
 }
 
-int __glXSwapGetDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXGetDrawableAttributesReq *req = (xGLXGetDrawableAttributesReq *)pc;
+    xGLXGetDrawableAttributesReq *req = (xGLXGetDrawableAttributesReq *) pc;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
     __GLX_SWAP_INT(&req->drawable);
 
-    return( __glXGetDrawableAttributes(cl, pc) );
+    return (__glXGetDrawableAttributes(cl, pc));
 }
 
-int __glXSwapChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
+int
+__glXSwapChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXChangeDrawableAttributesReq *req = (xGLXChangeDrawableAttributesReq *)pc;
+    xGLXChangeDrawableAttributesReq *req =
+        (xGLXChangeDrawableAttributesReq *) pc;
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);
     __GLX_SWAP_INT(&req->drawable);
     __GLX_SWAP_INT(&req->numAttribs);
-    __GLX_SWAP_INT_ARRAY( (int *)(req+1), req->numAttribs * 2 );
+    __GLX_SWAP_INT_ARRAY((int *) (req + 1), req->numAttribs * 2);
 
-    return( __glXChangeDrawableAttributes(cl, pc) );
+    return (__glXChangeDrawableAttributes(cl, pc));
 }
diff --git a/xorg-server/hw/dmx/glxProxy/glxext.c b/xorg-server/hw/dmx/glxProxy/glxext.c
index 4da16a77d..b0710ccc6 100644
--- a/xorg-server/hw/dmx/glxProxy/glxext.c
+++ b/xorg-server/hw/dmx/glxProxy/glxext.c
@@ -1,496 +1,517 @@
-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

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

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-

-#include "glxserver.h"

-#include <windowstr.h>

-#include <propertyst.h>

-#include <os.h>

-#include "g_disptab.h"

-#include "glxutil.h"

-#include "glxext.h"

-#include "glxvisuals.h"

-#include "micmap.h"

-#include "glxswap.h"

-

-/*

-** Stubs to satisfy miinitext.c references.

-*/

-typedef int __GLXprovider;

-__GLXprovider __glXDRISWRastProvider;

-void GlxPushProvider(__GLXprovider *provider) { }

-

-/*

-** Forward declarations.

-*/

-static int __glXSwapDispatch(ClientPtr);

-static int __glXDispatch(ClientPtr);

-

-/*

-** Called when the extension is reset.

-*/

-static void ResetExtension(ExtensionEntry* extEntry)

-{

-    __glXFlushContextCache();

-    __glXScreenReset();

-    SwapBarrierReset();

-}

-

-/*

-** Initialize the per-client context storage.

-*/

-static void ResetClientState(int clientIndex)

-{

-    __GLXclientState *cl = __glXClients[clientIndex];

-    Display **keep_be_displays;

-    int i;

-

-    free(cl->returnBuf);

-    free(cl->currentContexts);

-    free(cl->currentDrawables);

-    free(cl->largeCmdBuf);

-

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

-       if (cl->be_displays[i])

-	  XCloseDisplay( cl->be_displays[i] );

-    }

-

-    keep_be_displays = cl->be_displays;

-    memset(cl, 0, sizeof(__GLXclientState));

-    cl->be_displays = keep_be_displays;

-

-    /*

-    ** By default, assume that the client supports

-    ** GLX major version 1 minor version 0 protocol.

-    */

-    cl->GLClientmajorVersion = 1;

-    cl->GLClientminorVersion = 0;

-    free(cl->GLClientextensions);

-

-    memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));

-}

-

-

-/*

-** This procedure is called when the client who created the context goes

-** away OR when glXDestroyContext is called.  In either case, all we do is

-** flag that the ID is no longer valid, and (maybe) free the context.

-** use.

-*/

-static int ContextGone(__GLXcontext* cx, XID id)

-{

-    cx->idExists = GL_FALSE;

-    if (!cx->isCurrent) {

-	__glXFreeContext(cx);

-    }

-

-    return True;

-}

-

-/*

-** Free a client's state.

-*/

-static int ClientGone(int clientIndex, XID id)

-{

-    __GLXcontext *cx;

-    __GLXclientState *cl = __glXClients[clientIndex];

-    int i;

-

-    if (cl) {

-	/*

-	** Free all the contexts that are current for this client.

-	*/

-	for (i=0; i < cl->numCurrentContexts; i++) {

-	    cx = cl->currentContexts[i];

-	    if (cx) {

-		cx->isCurrent = GL_FALSE;

-		if (!cx->idExists) {

-		    __glXFreeContext(cx);

-		}

-	    }

-	}

-	/*

-	** Re-initialize the client state structure.  Don't free it because

-	** we'll probably get another client with this index and use the struct

-	** again.  There is a maximum of MAXCLIENTS of these structures.

-	*/

-	ResetClientState(clientIndex);

-    }

-

-    return True;

-}

-

-/*

-** Free a GLX Pixmap.

-*/

-void __glXFreeGLXPixmap( __GLXpixmap *pGlxPixmap )

-{

-   if (!pGlxPixmap->idExists &&

-       !pGlxPixmap->refcnt) {

-

-       PixmapPtr pPixmap = (PixmapPtr) pGlxPixmap->pDraw;

-

-	/*

-	** The DestroyPixmap routine should decrement the refcount and free

-	** only if it's zero.

-	*/

-	(*pGlxPixmap->pScreen->DestroyPixmap)(pPixmap);

-	free(pGlxPixmap->be_xids);

-	free(pGlxPixmap);

-    }

-

-}

-

-static int PixmapGone(__GLXpixmap *pGlxPixmap, XID id)

-{

-

-    pGlxPixmap->idExists = False;

-    __glXFreeGLXPixmap( pGlxPixmap );

-

-    return True;

-}

-

-void __glXFreeGLXWindow(__glXWindow *pGlxWindow)

-{

-    if (!pGlxWindow->idExists && !pGlxWindow->refcnt) {

-	WindowPtr pWindow = (WindowPtr) pGlxWindow->pDraw;

-	WindowPtr ret;

-

-	dixLookupResourceByType((pointer) &ret,

-				pWindow->drawable.id, RT_WINDOW,

-				NullClient, DixUnknownAccess);

-        if (ret == pWindow) {

-            (*pGlxWindow->pScreen->DestroyWindow)(pWindow);

-        }

-

-	free(pGlxWindow);

-    }

-}

-

-static void WindowGone(__glXWindow *pGlxWindow, XID id)

-{

-    pGlxWindow->idExists = False;

-    __glXFreeGLXWindow(pGlxWindow);

-}

-

-void __glXFreeGLXPbuffer(__glXPbuffer *pGlxPbuffer)

-{

-    if (!pGlxPbuffer->idExists && !pGlxPbuffer->refcnt) {

-        free(pGlxPbuffer->be_xids);

-        free(pGlxPbuffer);

-    }

-}

-

-static void PbufferGone(__glXPbuffer *pGlxPbuffer, XID id)

-{

-    pGlxPbuffer->idExists = False;

-    __glXFreeGLXPbuffer(pGlxPbuffer);

-}

-

-/*

-** Free a context.

-*/

-GLboolean __glXFreeContext(__GLXcontext *cx)

-{

-    if (cx->idExists || cx->isCurrent) return GL_FALSE;

-    

-    free(cx->feedbackBuf);

-    free(cx->selectBuf);

-    free(cx->real_ids);

-    free(cx->real_vids);

-

-    if (cx->pGlxPixmap) {

-       /*

-	** The previous drawable was a glx pixmap, release it.

-	*/

-       cx->pGlxPixmap->refcnt--;

-       __glXFreeGLXPixmap( cx->pGlxPixmap );

-       cx->pGlxPixmap = 0;

-    }

-

-    if (cx->pGlxReadPixmap) {

-       /*

-	** The previous drawable was a glx pixmap, release it.

-	*/

-       cx->pGlxReadPixmap->refcnt--;

-       __glXFreeGLXPixmap( cx->pGlxReadPixmap );

-       cx->pGlxReadPixmap = 0;

-    }

-

-    if (cx->pGlxWindow) {

-       /*

-	** The previous drawable was a glx window, release it.

-	*/

-       cx->pGlxWindow->refcnt--;

-       __glXFreeGLXWindow( cx->pGlxWindow );

-       cx->pGlxWindow = 0;   

-    }

-

-    if (cx->pGlxReadWindow) {

-       /*

-	** The previous drawable was a glx window, release it.

-	*/

-       cx->pGlxReadWindow->refcnt--;

-       __glXFreeGLXWindow( cx->pGlxReadWindow );

-       cx->pGlxReadWindow = 0;   

-    }

-

-    free(cx);

-

-    if (cx == __glXLastContext) {

-	__glXFlushContextCache();

-    }

-

-    return GL_TRUE;

-}

-

-/*

-** Initialize the GLX extension.

-*/

-void GlxExtensionInit(void)

-{

-    ExtensionEntry *extEntry;

-    int i;

-    int glxSupported = 1;

-

-    /*

-    // do not initialize GLX extension if GLX is not supported

-    // by ALL back-end servers.

-    */

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

-       glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);

-    }

-

-    if (!glxSupported || !dmxGLXProxy) {

-       return;

-    }

-    

-    __glXContextRes = CreateNewResourceType((DeleteType)ContextGone,

-					    "GLXContext");

-    __glXClientRes = CreateNewResourceType((DeleteType)ClientGone,

-					   "GLXClient");

-    __glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone,

-					   "GLXPixmap");

-    __glXWindowRes = CreateNewResourceType((DeleteType)WindowGone,

-					   "GLXWindow");

-    __glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone,

-					    "GLXPbuffer");

-

-    if (!__glXContextRes || !__glXClientRes || !__glXPixmapRes ||

-	!__glXWindowRes || !__glXPbufferRes)

-	return;

-

-    /*

-    ** Add extension to server extensions.

-    */

-    extEntry = AddExtension(GLX_EXTENSION_NAME, __GLX_NUMBER_EVENTS,

-			    __GLX_NUMBER_ERRORS, __glXDispatch,

-			    __glXSwapDispatch, ResetExtension,

-			    StandardMinorOpcode);

-    if (!extEntry) {

-	FatalError("__glXExtensionInit: AddExtensions failed\n");

-	return;

-    }

-    /*

-    if (!AddExtensionAlias(GLX_EXTENSION_ALIAS, extEntry)) {

-	ErrorF("__glXExtensionInit: AddExtensionAlias failed\n");

-	return;

-    }

-    */

-

-    __glXerrorBase = extEntry->errorBase;

-    __glXBadContext = extEntry->errorBase + GLXBadContext;

-    __glXBadContextState = extEntry->errorBase + GLXBadContextState;

-    __glXBadDrawable = extEntry->errorBase + GLXBadDrawable;

-    __glXBadPixmap = extEntry->errorBase + GLXBadPixmap;

-    __glXBadContextTag = extEntry->errorBase + GLXBadContextTag;

-    __glXBadCurrentWindow = extEntry->errorBase + GLXBadCurrentWindow;

-    __glXBadRenderRequest = extEntry->errorBase + GLXBadRenderRequest;

-    __glXBadLargeRequest = extEntry->errorBase + GLXBadLargeRequest;

-    __glXUnsupportedPrivateRequest = extEntry->errorBase +

-      			GLXUnsupportedPrivateRequest;

-    __glXBadFBConfig = extEntry->errorBase + GLXBadFBConfig;

-    __glXBadPbuffer = extEntry->errorBase + GLXBadPbuffer;

-

-    /*

-    ** Initialize table of client state.  There is never a client 0.

-    */

-    for (i=1; i <= MAXCLIENTS; i++) {

-	__glXClients[i] = 0;

-    }

-

-    /*

-    ** Initialize screen specific data.

-    */

-    __glXScreenInit(screenInfo.numScreens);

-

-    /*

-    ** Initialize swap barrier support.

-    */

-    SwapBarrierInit();

-}

-

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

-

-Bool __glXCoreType(void)

-{

-    return 0;

-}

-

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

-

-void __glXFlushContextCache(void)

-{

-    __glXLastContext = 0;

-}

-

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

-

-/*

-** Top level dispatcher; all commands are executed from here down.

-*/

-static int __glXDispatch(ClientPtr client)

-{

-    REQUEST(xGLXSingleReq);

-    CARD8 opcode;

-    int (*proc)(__GLXclientState *cl, GLbyte *pc);

-    __GLXclientState *cl;

-

-    opcode = stuff->glxCode;

-    cl = __glXClients[client->index];

-    if (!cl) {

-	cl = calloc(1, sizeof(__GLXclientState));

-	 __glXClients[client->index] = cl;

-	if (!cl) {

-	    return BadAlloc;

-	}

-

-	cl->be_displays = calloc(screenInfo.numScreens, sizeof(Display *));

-	if (!cl->be_displays) {

-	    free( cl );

-	    return BadAlloc;

-	}

-    }

-    

-    if (!cl->inUse) {

-	/*

-	** This is first request from this client.  Associate a resource

-	** with the client so we will be notified when the client dies.

-	*/

-	XID xid = FakeClientID(client->index);

-	if (!AddResource( xid, __glXClientRes, (pointer)(long)client->index)) {

-	    return BadAlloc;

-	}

-	ResetClientState(client->index);

-	cl->largeCmdRequestsTotal = 0;

-	cl->inUse = GL_TRUE;

-	cl->client = client;

-    }

-

-    /*

-    ** Check for valid opcode.

-    */

-    if (opcode >= __GLX_SINGLE_TABLE_SIZE) {

-	return BadRequest;

-    }

-

-    /*

-    ** Use the opcode to index into the procedure table.

-    */

-    proc = __glXSingleTable[opcode];

-    return (*proc)(cl, (GLbyte *) stuff);

-}

-

-static int __glXSwapDispatch(ClientPtr client)

-{

-    REQUEST(xGLXSingleReq);

-    CARD8 opcode;

-    int (*proc)(__GLXclientState *cl, GLbyte *pc);

-    __GLXclientState *cl;

-

-    opcode = stuff->glxCode;

-    cl = __glXClients[client->index];

-    if (!cl) {

-	cl = calloc(1, sizeof(__GLXclientState));

-	 __glXClients[client->index] = cl;

-	if (!cl) {

-	    return BadAlloc;

-	}

-

-	cl->be_displays = calloc(screenInfo.numScreens, sizeof(Display *));

-	if (!cl->be_displays) {

-	    free( cl );

-	    return BadAlloc;

-	}

-    }

-    

-    if (!cl->inUse) {

-	/*

-	** This is first request from this client.  Associate a resource

-	** with the client so we will be notified when the client dies.

-	*/

-	XID xid = FakeClientID(client->index);

-	if (!AddResource( xid, __glXClientRes, (pointer)(long)client->index)) {

-	    return BadAlloc;

-	}

-	ResetClientState(client->index);

-	cl->inUse = GL_TRUE;

-	cl->client = client;

-    }

-

-    /*

-    ** Check for valid opcode.

-    */

-    if (opcode >= __GLX_SINGLE_TABLE_SIZE) {

-	return BadRequest;

-    }

-

-    /*

-    ** Use the opcode to index into the procedure table.

-    */

-    proc = __glXSwapSingleTable[opcode];

-    return (*proc)(cl, (GLbyte *) stuff);

-}

-

-int __glXNoSuchSingleOpcode(__GLXclientState *cl, GLbyte *pc)

-{

-    return BadRequest;

-}

-

-void __glXNoSuchRenderOpcode(GLbyte *pc)

-{

-    return;

-}

-

+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+
+#include "glxserver.h"
+#include <windowstr.h>
+#include <propertyst.h>
+#include <os.h>
+#include "g_disptab.h"
+#include "glxutil.h"
+#include "glxext.h"
+#include "glxvisuals.h"
+#include "micmap.h"
+#include "glxswap.h"
+
+/*
+** Stubs to satisfy miinitext.c references.
+*/
+typedef int __GLXprovider;
+__GLXprovider __glXDRISWRastProvider;
+void
+GlxPushProvider(__GLXprovider * provider)
+{
+}
+
+/*
+** Forward declarations.
+*/
+static int __glXSwapDispatch(ClientPtr);
+static int __glXDispatch(ClientPtr);
+
+/*
+** Called when the extension is reset.
+*/
+static void
+ResetExtension(ExtensionEntry * extEntry)
+{
+    __glXFlushContextCache();
+    __glXScreenReset();
+    SwapBarrierReset();
+}
+
+/*
+** Initialize the per-client context storage.
+*/
+static void
+ResetClientState(int clientIndex)
+{
+    __GLXclientState *cl = __glXClients[clientIndex];
+    Display **keep_be_displays;
+    int i;
+
+    free(cl->returnBuf);
+    free(cl->currentContexts);
+    free(cl->currentDrawables);
+    free(cl->largeCmdBuf);
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+        if (cl->be_displays[i])
+            XCloseDisplay(cl->be_displays[i]);
+    }
+
+    keep_be_displays = cl->be_displays;
+    memset(cl, 0, sizeof(__GLXclientState));
+    cl->be_displays = keep_be_displays;
+
+    /*
+     ** By default, assume that the client supports
+     ** GLX major version 1 minor version 0 protocol.
+     */
+    cl->GLClientmajorVersion = 1;
+    cl->GLClientminorVersion = 0;
+    free(cl->GLClientextensions);
+
+    memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
+}
+
+/*
+** This procedure is called when the client who created the context goes
+** away OR when glXDestroyContext is called.  In either case, all we do is
+** flag that the ID is no longer valid, and (maybe) free the context.
+** use.
+*/
+static int
+ContextGone(__GLXcontext * cx, XID id)
+{
+    cx->idExists = GL_FALSE;
+    if (!cx->isCurrent) {
+        __glXFreeContext(cx);
+    }
+
+    return True;
+}
+
+/*
+** Free a client's state.
+*/
+static int
+ClientGone(int clientIndex, XID id)
+{
+    __GLXcontext *cx;
+    __GLXclientState *cl = __glXClients[clientIndex];
+    int i;
+
+    if (cl) {
+        /*
+         ** Free all the contexts that are current for this client.
+         */
+        for (i = 0; i < cl->numCurrentContexts; i++) {
+            cx = cl->currentContexts[i];
+            if (cx) {
+                cx->isCurrent = GL_FALSE;
+                if (!cx->idExists) {
+                    __glXFreeContext(cx);
+                }
+            }
+        }
+        /*
+         ** Re-initialize the client state structure.  Don't free it because
+         ** we'll probably get another client with this index and use the struct
+         ** again.  There is a maximum of MAXCLIENTS of these structures.
+         */
+        ResetClientState(clientIndex);
+    }
+
+    return True;
+}
+
+/*
+** Free a GLX Pixmap.
+*/
+void
+__glXFreeGLXPixmap(__GLXpixmap * pGlxPixmap)
+{
+    if (!pGlxPixmap->idExists && !pGlxPixmap->refcnt) {
+
+        PixmapPtr pPixmap = (PixmapPtr) pGlxPixmap->pDraw;
+
+        /*
+         ** The DestroyPixmap routine should decrement the refcount and free
+         ** only if it's zero.
+         */
+        (*pGlxPixmap->pScreen->DestroyPixmap) (pPixmap);
+        free(pGlxPixmap->be_xids);
+        free(pGlxPixmap);
+    }
+
+}
+
+static int
+PixmapGone(__GLXpixmap * pGlxPixmap, XID id)
+{
+
+    pGlxPixmap->idExists = False;
+    __glXFreeGLXPixmap(pGlxPixmap);
+
+    return True;
+}
+
+void
+__glXFreeGLXWindow(__glXWindow * pGlxWindow)
+{
+    if (!pGlxWindow->idExists && !pGlxWindow->refcnt) {
+        WindowPtr pWindow = (WindowPtr) pGlxWindow->pDraw;
+        WindowPtr ret;
+
+        dixLookupResourceByType((pointer) &ret,
+                                pWindow->drawable.id, RT_WINDOW,
+                                NullClient, DixUnknownAccess);
+        if (ret == pWindow) {
+            (*pGlxWindow->pScreen->DestroyWindow) (pWindow);
+        }
+
+        free(pGlxWindow);
+    }
+}
+
+static void
+WindowGone(__glXWindow * pGlxWindow, XID id)
+{
+    pGlxWindow->idExists = False;
+    __glXFreeGLXWindow(pGlxWindow);
+}
+
+void
+__glXFreeGLXPbuffer(__glXPbuffer * pGlxPbuffer)
+{
+    if (!pGlxPbuffer->idExists && !pGlxPbuffer->refcnt) {
+        free(pGlxPbuffer->be_xids);
+        free(pGlxPbuffer);
+    }
+}
+
+static void
+PbufferGone(__glXPbuffer * pGlxPbuffer, XID id)
+{
+    pGlxPbuffer->idExists = False;
+    __glXFreeGLXPbuffer(pGlxPbuffer);
+}
+
+/*
+** Free a context.
+*/
+GLboolean
+__glXFreeContext(__GLXcontext * cx)
+{
+    if (cx->idExists || cx->isCurrent)
+        return GL_FALSE;
+
+    free(cx->feedbackBuf);
+    free(cx->selectBuf);
+    free(cx->real_ids);
+    free(cx->real_vids);
+
+    if (cx->pGlxPixmap) {
+        /*
+         ** The previous drawable was a glx pixmap, release it.
+         */
+        cx->pGlxPixmap->refcnt--;
+        __glXFreeGLXPixmap(cx->pGlxPixmap);
+        cx->pGlxPixmap = 0;
+    }
+
+    if (cx->pGlxReadPixmap) {
+        /*
+         ** The previous drawable was a glx pixmap, release it.
+         */
+        cx->pGlxReadPixmap->refcnt--;
+        __glXFreeGLXPixmap(cx->pGlxReadPixmap);
+        cx->pGlxReadPixmap = 0;
+    }
+
+    if (cx->pGlxWindow) {
+        /*
+         ** The previous drawable was a glx window, release it.
+         */
+        cx->pGlxWindow->refcnt--;
+        __glXFreeGLXWindow(cx->pGlxWindow);
+        cx->pGlxWindow = 0;
+    }
+
+    if (cx->pGlxReadWindow) {
+        /*
+         ** The previous drawable was a glx window, release it.
+         */
+        cx->pGlxReadWindow->refcnt--;
+        __glXFreeGLXWindow(cx->pGlxReadWindow);
+        cx->pGlxReadWindow = 0;
+    }
+
+    free(cx);
+
+    if (cx == __glXLastContext) {
+        __glXFlushContextCache();
+    }
+
+    return GL_TRUE;
+}
+
+/*
+** Initialize the GLX extension.
+*/
+void
+GlxExtensionInit(void)
+{
+    ExtensionEntry *extEntry;
+    int i;
+    int glxSupported = 1;
+
+    /*
+       // do not initialize GLX extension if GLX is not supported
+       // by ALL back-end servers.
+     */
+    for (i = 0; i < screenInfo.numScreens; i++) {
+        glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);
+    }
+
+    if (!glxSupported || !dmxGLXProxy) {
+        return;
+    }
+
+    __glXContextRes = CreateNewResourceType((DeleteType) ContextGone,
+                                            "GLXContext");
+    __glXClientRes = CreateNewResourceType((DeleteType) ClientGone,
+                                           "GLXClient");
+    __glXPixmapRes = CreateNewResourceType((DeleteType) PixmapGone,
+                                           "GLXPixmap");
+    __glXWindowRes = CreateNewResourceType((DeleteType) WindowGone,
+                                           "GLXWindow");
+    __glXPbufferRes = CreateNewResourceType((DeleteType) PbufferGone,
+                                            "GLXPbuffer");
+
+    if (!__glXContextRes || !__glXClientRes || !__glXPixmapRes ||
+        !__glXWindowRes || !__glXPbufferRes)
+        return;
+
+    /*
+     ** Add extension to server extensions.
+     */
+    extEntry = AddExtension(GLX_EXTENSION_NAME, __GLX_NUMBER_EVENTS,
+                            __GLX_NUMBER_ERRORS, __glXDispatch,
+                            __glXSwapDispatch, ResetExtension,
+                            StandardMinorOpcode);
+    if (!extEntry) {
+        FatalError("__glXExtensionInit: AddExtensions failed\n");
+        return;
+    }
+    /*
+       if (!AddExtensionAlias(GLX_EXTENSION_ALIAS, extEntry)) {
+       ErrorF("__glXExtensionInit: AddExtensionAlias failed\n");
+       return;
+       }
+     */
+
+    __glXerrorBase = extEntry->errorBase;
+    __glXBadContext = extEntry->errorBase + GLXBadContext;
+    __glXBadContextState = extEntry->errorBase + GLXBadContextState;
+    __glXBadDrawable = extEntry->errorBase + GLXBadDrawable;
+    __glXBadPixmap = extEntry->errorBase + GLXBadPixmap;
+    __glXBadContextTag = extEntry->errorBase + GLXBadContextTag;
+    __glXBadCurrentWindow = extEntry->errorBase + GLXBadCurrentWindow;
+    __glXBadRenderRequest = extEntry->errorBase + GLXBadRenderRequest;
+    __glXBadLargeRequest = extEntry->errorBase + GLXBadLargeRequest;
+    __glXUnsupportedPrivateRequest = extEntry->errorBase +
+        GLXUnsupportedPrivateRequest;
+    __glXBadFBConfig = extEntry->errorBase + GLXBadFBConfig;
+    __glXBadPbuffer = extEntry->errorBase + GLXBadPbuffer;
+
+    /*
+     ** Initialize table of client state.  There is never a client 0.
+     */
+    for (i = 1; i <= MAXCLIENTS; i++) {
+        __glXClients[i] = 0;
+    }
+
+    /*
+     ** Initialize screen specific data.
+     */
+    __glXScreenInit(screenInfo.numScreens);
+
+    /*
+     ** Initialize swap barrier support.
+     */
+    SwapBarrierInit();
+}
+
+/************************************************************************/
+
+Bool
+__glXCoreType(void)
+{
+    return 0;
+}
+
+/************************************************************************/
+
+void
+__glXFlushContextCache(void)
+{
+    __glXLastContext = 0;
+}
+
+/************************************************************************/
+
+/*
+** Top level dispatcher; all commands are executed from here down.
+*/
+static int
+__glXDispatch(ClientPtr client)
+{
+    REQUEST(xGLXSingleReq);
+    CARD8 opcode;
+    int (*proc) (__GLXclientState * cl, GLbyte * pc);
+    __GLXclientState *cl;
+
+    opcode = stuff->glxCode;
+    cl = __glXClients[client->index];
+    if (!cl) {
+        cl = calloc(1, sizeof(__GLXclientState));
+        __glXClients[client->index] = cl;
+        if (!cl) {
+            return BadAlloc;
+        }
+
+        cl->be_displays = calloc(screenInfo.numScreens, sizeof(Display *));
+        if (!cl->be_displays) {
+            free(cl);
+            return BadAlloc;
+        }
+    }
+
+    if (!cl->inUse) {
+        /*
+         ** This is first request from this client.  Associate a resource
+         ** with the client so we will be notified when the client dies.
+         */
+        XID xid = FakeClientID(client->index);
+
+        if (!AddResource(xid, __glXClientRes, (pointer) (long) client->index)) {
+            return BadAlloc;
+        }
+        ResetClientState(client->index);
+        cl->largeCmdRequestsTotal = 0;
+        cl->inUse = GL_TRUE;
+        cl->client = client;
+    }
+
+    /*
+     ** Check for valid opcode.
+     */
+    if (opcode >= __GLX_SINGLE_TABLE_SIZE) {
+        return BadRequest;
+    }
+
+    /*
+     ** Use the opcode to index into the procedure table.
+     */
+    proc = __glXSingleTable[opcode];
+    return (*proc) (cl, (GLbyte *) stuff);
+}
+
+static int
+__glXSwapDispatch(ClientPtr client)
+{
+    REQUEST(xGLXSingleReq);
+    CARD8 opcode;
+    int (*proc) (__GLXclientState * cl, GLbyte * pc);
+    __GLXclientState *cl;
+
+    opcode = stuff->glxCode;
+    cl = __glXClients[client->index];
+    if (!cl) {
+        cl = calloc(1, sizeof(__GLXclientState));
+        __glXClients[client->index] = cl;
+        if (!cl) {
+            return BadAlloc;
+        }
+
+        cl->be_displays = calloc(screenInfo.numScreens, sizeof(Display *));
+        if (!cl->be_displays) {
+            free(cl);
+            return BadAlloc;
+        }
+    }
+
+    if (!cl->inUse) {
+        /*
+         ** This is first request from this client.  Associate a resource
+         ** with the client so we will be notified when the client dies.
+         */
+        XID xid = FakeClientID(client->index);
+
+        if (!AddResource(xid, __glXClientRes, (pointer) (long) client->index)) {
+            return BadAlloc;
+        }
+        ResetClientState(client->index);
+        cl->inUse = GL_TRUE;
+        cl->client = client;
+    }
+
+    /*
+     ** Check for valid opcode.
+     */
+    if (opcode >= __GLX_SINGLE_TABLE_SIZE) {
+        return BadRequest;
+    }
+
+    /*
+     ** Use the opcode to index into the procedure table.
+     */
+    proc = __glXSwapSingleTable[opcode];
+    return (*proc) (cl, (GLbyte *) stuff);
+}
+
+int
+__glXNoSuchSingleOpcode(__GLXclientState * cl, GLbyte * pc)
+{
+    return BadRequest;
+}
+
+void
+__glXNoSuchRenderOpcode(GLbyte * pc)
+{
+    return;
+}
diff --git a/xorg-server/hw/dmx/glxProxy/glxext.h b/xorg-server/hw/dmx/glxProxy/glxext.h
index 3e3e5b7f3..881152d1c 100644
--- a/xorg-server/hw/dmx/glxProxy/glxext.h
+++ b/xorg-server/hw/dmx/glxProxy/glxext.h
@@ -1,78 +1,71 @@
-#ifndef _glxext_h_

-#define _glxext_h_

-

-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

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

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-/*

- * Added by VA Linux for XFree86 4.0.x

- */

-typedef struct {

-    int type;

-    void (*resetExtension)(void);

-    Bool (*initVisuals)(

-        VisualPtr *       visualp,

-        DepthPtr *        depthp,

-        int *             nvisualp,

-        int *             ndepthp,

-        int *             rootDepthp,

-        VisualID *        defaultVisp,

-        unsigned long     sizes,

-        int               bitsPerRGB

-        );

-    void (*setVisualConfigs)(

-        int                nconfigs,

-        __GLXvisualConfig *configs,

-        void              **privates

-        );

-} __GLXextensionInfo;

-

-extern GLboolean __glXFreeContext(__GLXcontext *glxc);

-extern void __glXFlushContextCache(void);

-

-extern void __glXFreeGLXWindow(__glXWindow *pGlxWindow);

-extern void __glXFreeGLXPixmap( __GLXpixmap *pGlxPixmap );

-

-extern void __glXNoSuchRenderOpcode(GLbyte*);

-extern int __glXNoSuchSingleOpcode(__GLXclientState*, GLbyte*);

-extern void __glXErrorCallBack(GLenum code);

-extern void __glXClearErrorOccured(void);

-extern GLboolean __glXErrorOccured(void);

-extern void __glXResetLargeCommandStatus(__GLXclientState*);

-

-extern int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc);

-extern int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, char *pc);

-

-extern void GlxExtensionInit(void);

-

-extern Bool __glXCoreType(void);

-

-#endif /* _glxext_h_ */

-

+#ifndef _glxext_h_
+#define _glxext_h_
+
+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+/*
+ * Added by VA Linux for XFree86 4.0.x
+ */
+typedef struct {
+    int type;
+    void (*resetExtension) (void);
+    Bool (*initVisuals) (VisualPtr * visualp,
+                         DepthPtr * depthp,
+                         int *nvisualp,
+                         int *ndepthp,
+                         int *rootDepthp,
+                         VisualID * defaultVisp,
+                         unsigned long sizes, int bitsPerRGB);
+    void (*setVisualConfigs) (int nconfigs,
+                              __GLXvisualConfig * configs, void **privates);
+} __GLXextensionInfo;
+
+extern GLboolean __glXFreeContext(__GLXcontext * glxc);
+extern void __glXFlushContextCache(void);
+
+extern void __glXFreeGLXWindow(__glXWindow * pGlxWindow);
+extern void __glXFreeGLXPixmap(__GLXpixmap * pGlxPixmap);
+
+extern void __glXNoSuchRenderOpcode(GLbyte *);
+extern int __glXNoSuchSingleOpcode(__GLXclientState *, GLbyte *);
+extern void __glXErrorCallBack(GLenum code);
+extern void __glXClearErrorOccured(void);
+extern GLboolean __glXErrorOccured(void);
+extern void __glXResetLargeCommandStatus(__GLXclientState *);
+
+extern int __glXQueryContextInfoEXT(__GLXclientState * cl, GLbyte * pc);
+extern int __glXSwapQueryContextInfoEXT(__GLXclientState * cl, char *pc);
+
+extern void GlxExtensionInit(void);
+
+extern Bool __glXCoreType(void);
+
+#endif                          /* _glxext_h_ */
diff --git a/xorg-server/hw/dmx/glxProxy/glxfbconfig.c b/xorg-server/hw/dmx/glxProxy/glxfbconfig.c
index 3611cf61e..2f46bd07a 100644
--- a/xorg-server/hw/dmx/glxProxy/glxfbconfig.c
+++ b/xorg-server/hw/dmx/glxProxy/glxfbconfig.c
@@ -1,106 +1,106 @@
-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

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

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#include "glxfbconfig.h"

-

-int AreFBConfigsMatch( __GLXFBConfig *c1, __GLXFBConfig *c2 )

-{

-   int match;

-

-   match = (

-	     (c1->visualType == c2->visualType) &&

-	     (c1->transparentType == c2->transparentType) &&

-	     (c1->transparentRed == c2->transparentRed) &&

-	     (c1->transparentGreen == c2->transparentGreen) &&

-	     (c1->transparentBlue == c2->transparentBlue) &&

-	     (c1->transparentAlpha == c2->transparentAlpha) &&

-	     (c1->transparentIndex == c2->transparentIndex) &&

-	     (c1->visualCaveat == c2->visualCaveat) &&

-	     (c1->drawableType == c2->drawableType) &&

-	     (c1->renderType == c2->renderType) &&

-#if 0	     

-	     (c1->maxPbufferWidth == c2->maxPbufferWidth) &&

-	     (c1->maxPbufferHeight == c2->maxPbufferHeight) &&

-	     (c1->maxPbufferPixels == c2->maxPbufferPixels) &&

-	     (c1->optimalPbufferWidth == c2->optimalPbufferWidth) &&

-	     (c1->optimalPbufferHeight == c2->optimalPbufferHeight) &&

-#endif

-	     (c1->visualSelectGroup == c2->visualSelectGroup) &&

-	     (c1->rgbMode == c2->rgbMode) &&

-	     (c1->colorIndexMode == c2->colorIndexMode) &&

-	     (c1->doubleBufferMode == c2->doubleBufferMode) &&

-	     (c1->stereoMode == c2->stereoMode) &&

-	     (c1->haveAccumBuffer == c2->haveAccumBuffer) &&

-	     (c1->haveDepthBuffer == c2->haveDepthBuffer) &&

-	     (c1->haveStencilBuffer == c2->haveStencilBuffer) &&

-	     (c1->accumRedBits == c2->accumRedBits) &&

-	     (c1->accumGreenBits == c2->accumGreenBits) &&

-	     (c1->accumBlueBits == c2->accumBlueBits) &&

-	     (c1->accumAlphaBits == c2->accumAlphaBits) &&

-	     (c1->depthBits == c2->depthBits) &&

-	     (c1->stencilBits == c2->stencilBits) &&

-	     (c1->indexBits == c2->indexBits) &&

-	     (c1->redBits == c2->redBits) &&

-	     (c1->greenBits == c2->greenBits) &&

-	     (c1->blueBits == c2->blueBits) &&

-	     (c1->alphaBits == c2->alphaBits) &&

-	     (c1->redMask == c2->redMask) &&

-	     (c1->greenMask == c2->greenMask) &&

-	     (c1->blueMask == c2->blueMask) &&

-	     (c1->alphaMask == c2->alphaMask) &&

-	     (c1->multiSampleSize == c2->multiSampleSize) &&

-	     (c1->nMultiSampleBuffers == c2->nMultiSampleBuffers) &&

-	     (c1->maxAuxBuffers == c2->maxAuxBuffers) &&

-	     (c1->level == c2->level) &&

-	     (c1->extendedRange == c2->extendedRange) &&

-	     (c1->minRed == c2->minRed) &&

-	     (c1->maxRed == c2->maxRed) &&

-	     (c1->minGreen == c2->minGreen) &&

-	     (c1->maxGreen == c2->maxGreen) &&

-	     (c1->minBlue == c2->minBlue) &&

-	     (c1->maxBlue == c2->maxBlue) &&

-	     (c1->minAlpha == c2->minAlpha) &&

-	     (c1->maxAlpha == c2->maxAlpha) 

-	   );

-

-   return match;

-}

-

-__GLXFBConfig *FindMatchingFBConfig( __GLXFBConfig *c, __GLXFBConfig *configs, int nconfigs )

-{

-   int i;

-

-   for (i=0; i<nconfigs; i++) {

-      if ( AreFBConfigsMatch( c, configs + i ) ) 

-	 return configs + i;

-   }

-

-   return 0;

-}

+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#include "glxfbconfig.h"
+
+int
+AreFBConfigsMatch(__GLXFBConfig * c1, __GLXFBConfig * c2)
+{
+    int match;
+
+    match = ((c1->visualType == c2->visualType) &&
+             (c1->transparentType == c2->transparentType) &&
+             (c1->transparentRed == c2->transparentRed) &&
+             (c1->transparentGreen == c2->transparentGreen) &&
+             (c1->transparentBlue == c2->transparentBlue) &&
+             (c1->transparentAlpha == c2->transparentAlpha) &&
+             (c1->transparentIndex == c2->transparentIndex) &&
+             (c1->visualCaveat == c2->visualCaveat) &&
+             (c1->drawableType == c2->drawableType) &&
+             (c1->renderType == c2->renderType) &&
+#if 0
+             (c1->maxPbufferWidth == c2->maxPbufferWidth) &&
+             (c1->maxPbufferHeight == c2->maxPbufferHeight) &&
+             (c1->maxPbufferPixels == c2->maxPbufferPixels) &&
+             (c1->optimalPbufferWidth == c2->optimalPbufferWidth) &&
+             (c1->optimalPbufferHeight == c2->optimalPbufferHeight) &&
+#endif
+             (c1->visualSelectGroup == c2->visualSelectGroup) &&
+             (c1->rgbMode == c2->rgbMode) &&
+             (c1->colorIndexMode == c2->colorIndexMode) &&
+             (c1->doubleBufferMode == c2->doubleBufferMode) &&
+             (c1->stereoMode == c2->stereoMode) &&
+             (c1->haveAccumBuffer == c2->haveAccumBuffer) &&
+             (c1->haveDepthBuffer == c2->haveDepthBuffer) &&
+             (c1->haveStencilBuffer == c2->haveStencilBuffer) &&
+             (c1->accumRedBits == c2->accumRedBits) &&
+             (c1->accumGreenBits == c2->accumGreenBits) &&
+             (c1->accumBlueBits == c2->accumBlueBits) &&
+             (c1->accumAlphaBits == c2->accumAlphaBits) &&
+             (c1->depthBits == c2->depthBits) &&
+             (c1->stencilBits == c2->stencilBits) &&
+             (c1->indexBits == c2->indexBits) &&
+             (c1->redBits == c2->redBits) &&
+             (c1->greenBits == c2->greenBits) &&
+             (c1->blueBits == c2->blueBits) &&
+             (c1->alphaBits == c2->alphaBits) &&
+             (c1->redMask == c2->redMask) &&
+             (c1->greenMask == c2->greenMask) &&
+             (c1->blueMask == c2->blueMask) &&
+             (c1->alphaMask == c2->alphaMask) &&
+             (c1->multiSampleSize == c2->multiSampleSize) &&
+             (c1->nMultiSampleBuffers == c2->nMultiSampleBuffers) &&
+             (c1->maxAuxBuffers == c2->maxAuxBuffers) &&
+             (c1->level == c2->level) &&
+             (c1->extendedRange == c2->extendedRange) &&
+             (c1->minRed == c2->minRed) &&
+             (c1->maxRed == c2->maxRed) &&
+             (c1->minGreen == c2->minGreen) &&
+             (c1->maxGreen == c2->maxGreen) &&
+             (c1->minBlue == c2->minBlue) &&
+             (c1->maxBlue == c2->maxBlue) &&
+             (c1->minAlpha == c2->minAlpha) && (c1->maxAlpha == c2->maxAlpha)
+        );
+
+    return match;
+}
+
+__GLXFBConfig *
+FindMatchingFBConfig(__GLXFBConfig * c, __GLXFBConfig * configs, int nconfigs)
+{
+    int i;
+
+    for (i = 0; i < nconfigs; i++) {
+        if (AreFBConfigsMatch(c, configs + i))
+            return configs + i;
+    }
+
+    return 0;
+}
diff --git a/xorg-server/hw/dmx/glxProxy/glxfbconfig.h b/xorg-server/hw/dmx/glxProxy/glxfbconfig.h
index c5e94043b..6626410d9 100644
--- a/xorg-server/hw/dmx/glxProxy/glxfbconfig.h
+++ b/xorg-server/hw/dmx/glxProxy/glxfbconfig.h
@@ -32,7 +32,8 @@
 
 #include <GL/glxint.h>
 
-int AreFBConfigsMatch( __GLXFBConfig *c1, __GLXFBConfig *c2 );
-__GLXFBConfig *FindMatchingFBConfig( __GLXFBConfig *c, __GLXFBConfig *configs, int nconfigs );
+int AreFBConfigsMatch(__GLXFBConfig * c1, __GLXFBConfig * c2);
+__GLXFBConfig *FindMatchingFBConfig(__GLXFBConfig * c, __GLXFBConfig * configs,
+                                    int nconfigs);
 
 #endif
diff --git a/xorg-server/hw/dmx/glxProxy/glxscreens.c b/xorg-server/hw/dmx/glxProxy/glxscreens.c
index baa4a65a7..f725bd138 100644
--- a/xorg-server/hw/dmx/glxProxy/glxscreens.c
+++ b/xorg-server/hw/dmx/glxProxy/glxscreens.c
@@ -49,285 +49,296 @@ __GLXscreenInfo *__glXActiveScreens;
 GLint __glXNumActiveScreens;
 
 __GLXFBConfig **__glXFBConfigs;
-int            __glXNumFBConfigs;
+int __glXNumFBConfigs;
 
 static char GLXServerVendorName[] = "SGI DMX/glxProxy";
 static char GLXServerVersion[64];
 static char GLXServerExtensions[] =
-            "GLX_EXT_visual_info "
-            "GLX_EXT_visual_rating "
-            "GLX_EXT_import_context "
-	    "GLX_SGIX_fbconfig "
-	    "GLX_SGI_make_current_read "
-	    "GLX_SGI_swap_control "
-            ;
+    "GLX_EXT_visual_info "
+    "GLX_EXT_visual_rating "
+    "GLX_EXT_import_context "
+    "GLX_SGIX_fbconfig " "GLX_SGI_make_current_read " "GLX_SGI_swap_control ";
 
 static char ExtensionsString[1024];
 
-static void CalcServerVersionAndExtensions( void )
+static void
+CalcServerVersionAndExtensions(void)
 {
-   int s;
-   xGLXQueryVersionReq *req;
-   xGLXQueryVersionReply reply;
-   char **be_extensions;
-   char *ext;
-   char *denied_extensions;
-
-   /*
-    * set the server glx version to be the minimum version
-    * supported by all back-end servers
-    */
-   __glXVersionMajor = 0;
-   __glXVersionMinor = 0;
-   for (s=0; s<__glXNumActiveScreens; s++) {
-      DMXScreenInfo *dmxScreen = &dmxScreens[s];
-      Display *dpy = dmxScreen->beDisplay;
-
-      /* Send the glXQueryVersion request */
-      LockDisplay(dpy);
-      GetReq(GLXQueryVersion,req);
-      req->reqType = dmxScreen->glxMajorOpcode;
-      req->glxCode = X_GLXQueryVersion;
-      req->majorVersion = GLX_SERVER_MAJOR_VERSION;
-      req->minorVersion = GLX_SERVER_MINOR_VERSION;
-      _XReply(dpy, (xReply*) &reply, 0, False);
-      UnlockDisplay(dpy);
-      SyncHandle();
-
-      if (s == 0) {
-	 __glXVersionMajor = reply.majorVersion;
-	 __glXVersionMinor = reply.minorVersion;
-      }
-      else {
-	 if (reply.majorVersion < __glXVersionMajor) {
-	    __glXVersionMajor = reply.majorVersion;
-	    __glXVersionMinor = reply.minorVersion;
-	 }
-	 else if ( (reply.majorVersion == __glXVersionMajor) &&
-	           (reply.minorVersion < __glXVersionMinor)  ) {
-	    __glXVersionMinor = reply.minorVersion;
-	 }
-      }
-
-   }
-
-   if (GLX_SERVER_MAJOR_VERSION < __glXVersionMajor) {
-      __glXVersionMajor = GLX_SERVER_MAJOR_VERSION;
-      __glXVersionMinor = GLX_SERVER_MINOR_VERSION;
-   }
-   else if ( (GLX_SERVER_MAJOR_VERSION == __glXVersionMajor) &&
-	     (GLX_SERVER_MINOR_VERSION < __glXVersionMinor)  ) {
-      __glXVersionMinor = GLX_SERVER_MINOR_VERSION;
-   }
-
-   snprintf(GLXServerVersion, sizeof(GLXServerVersion),
+    int s;
+    xGLXQueryVersionReq *req;
+    xGLXQueryVersionReply reply;
+    char **be_extensions;
+    char *ext;
+    char *denied_extensions;
+
+    /*
+     * set the server glx version to be the minimum version
+     * supported by all back-end servers
+     */
+    __glXVersionMajor = 0;
+    __glXVersionMinor = 0;
+    for (s = 0; s < __glXNumActiveScreens; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = dmxScreen->beDisplay;
+
+        /* Send the glXQueryVersion request */
+        LockDisplay(dpy);
+        GetReq(GLXQueryVersion, req);
+        req->reqType = dmxScreen->glxMajorOpcode;
+        req->glxCode = X_GLXQueryVersion;
+        req->majorVersion = GLX_SERVER_MAJOR_VERSION;
+        req->minorVersion = GLX_SERVER_MINOR_VERSION;
+        _XReply(dpy, (xReply *) & reply, 0, False);
+        UnlockDisplay(dpy);
+        SyncHandle();
+
+        if (s == 0) {
+            __glXVersionMajor = reply.majorVersion;
+            __glXVersionMinor = reply.minorVersion;
+        }
+        else {
+            if (reply.majorVersion < __glXVersionMajor) {
+                __glXVersionMajor = reply.majorVersion;
+                __glXVersionMinor = reply.minorVersion;
+            }
+            else if ((reply.majorVersion == __glXVersionMajor) &&
+                     (reply.minorVersion < __glXVersionMinor)) {
+                __glXVersionMinor = reply.minorVersion;
+            }
+        }
+
+    }
+
+    if (GLX_SERVER_MAJOR_VERSION < __glXVersionMajor) {
+        __glXVersionMajor = GLX_SERVER_MAJOR_VERSION;
+        __glXVersionMinor = GLX_SERVER_MINOR_VERSION;
+    }
+    else if ((GLX_SERVER_MAJOR_VERSION == __glXVersionMajor) &&
+             (GLX_SERVER_MINOR_VERSION < __glXVersionMinor)) {
+        __glXVersionMinor = GLX_SERVER_MINOR_VERSION;
+    }
+
+    snprintf(GLXServerVersion, sizeof(GLXServerVersion),
              "%d.%d DMX %d back-end server(s)",
-              __glXVersionMajor, __glXVersionMinor, __glXNumActiveScreens );
-   /*
-    * set the ExtensionsString to the minimum extensions string
-    */
-   ExtensionsString[0] = '\0';
-
-   /*
-    * read extensions strings of all back-end servers
-    */
-   be_extensions = (char **)malloc( __glXNumActiveScreens * sizeof(char *) );
-   if (!be_extensions)
-      return;
-
-   for (s=0; s<__glXNumActiveScreens; s++) {
-      DMXScreenInfo *dmxScreen = &dmxScreens[s];
-      Display *dpy = dmxScreen->beDisplay;
-      xGLXQueryServerStringReq *req;
-      xGLXQueryServerStringReply reply;
-      int length, numbytes, slop;
-
-      /* Send the glXQueryServerString request */
-      LockDisplay(dpy);
-      GetReq(GLXQueryServerString,req);
-      req->reqType = dmxScreen->glxMajorOpcode;
-      req->glxCode = X_GLXQueryServerString;
-      req->screen = DefaultScreen(dpy);
-      req->name = GLX_EXTENSIONS;
-      _XReply(dpy, (xReply*) &reply, 0, False);
-
-      length = (int)reply.length;
-      numbytes = (int)reply.n;
-      slop = numbytes * __GLX_SIZE_INT8 & 3;
-      be_extensions[s] = (char *)malloc(numbytes);
-      if (!be_extensions[s]) {
-	 /* Throw data on the floor */
-	 _XEatData(dpy, length);
-      } else {
-	 _XRead(dpy, (char *)be_extensions[s], numbytes);
-	 if (slop) _XEatData(dpy,4-slop);
-      }
-      UnlockDisplay(dpy);
-      SyncHandle();
-   }
-
-   /*
-    * extensions string will include only extensions that our
-    * server supports as well as all back-end servers supports.
-    * extensions that are in the DMX_DENY_EXTENSIONS string will
-    * not be supported.
-    */
-   denied_extensions = getenv("DMX_DENY_GLX_EXTENSIONS");
-   ext = strtok(GLXServerExtensions, " ");
-   while( ext ) {
-      int supported = 1;
-
-      if (denied_extensions && strstr(denied_extensions, ext)) {
-	 supported = 0;
-      }
-      else {
-	 for (s=0; s<__glXNumActiveScreens && supported; s++) {
-	    if ( !strstr(be_extensions[s], ext) ) {
-	       supported = 0;
-	    }
-	 }
-      }
-
-      if (supported) {
-	 strcat(ExtensionsString, ext);
-	 strcat(ExtensionsString, " ");
-      }
-
-      ext = strtok(NULL, " ");
-   }
-
-   /*
-    * release temporary storage
-    */
-   for (s=0; s<__glXNumActiveScreens; s++) {
-      free(be_extensions[s]);
-   }
-   free( be_extensions );
-
-   if (dmxGLXSwapGroupSupport) {
-       if (!denied_extensions ||
-	   !strstr(denied_extensions, "GLX_SGIX_swap_group")) {
-	   strcat(ExtensionsString, "GLX_SGIX_swap_group");
-	   if (!denied_extensions ||
-	       !strstr(denied_extensions, "GLX_SGIX_swap_barrier")) {
-	       strcat(ExtensionsString, " GLX_SGIX_swap_barrier");
-	   }
-       }
-   }
+             __glXVersionMajor, __glXVersionMinor, __glXNumActiveScreens);
+    /*
+     * set the ExtensionsString to the minimum extensions string
+     */
+    ExtensionsString[0] = '\0';
+
+    /*
+     * read extensions strings of all back-end servers
+     */
+    be_extensions = (char **) malloc(__glXNumActiveScreens * sizeof(char *));
+    if (!be_extensions)
+        return;
+
+    for (s = 0; s < __glXNumActiveScreens; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = dmxScreen->beDisplay;
+        xGLXQueryServerStringReq *req;
+        xGLXQueryServerStringReply reply;
+        int length, numbytes, slop;
+
+        /* Send the glXQueryServerString request */
+        LockDisplay(dpy);
+        GetReq(GLXQueryServerString, req);
+        req->reqType = dmxScreen->glxMajorOpcode;
+        req->glxCode = X_GLXQueryServerString;
+        req->screen = DefaultScreen(dpy);
+        req->name = GLX_EXTENSIONS;
+        _XReply(dpy, (xReply *) & reply, 0, False);
+
+        length = (int) reply.length;
+        numbytes = (int) reply.n;
+        slop = numbytes * __GLX_SIZE_INT8 & 3;
+        be_extensions[s] = (char *) malloc(numbytes);
+        if (!be_extensions[s]) {
+            /* Throw data on the floor */
+            _XEatData(dpy, length);
+        }
+        else {
+            _XRead(dpy, (char *) be_extensions[s], numbytes);
+            if (slop)
+                _XEatData(dpy, 4 - slop);
+        }
+        UnlockDisplay(dpy);
+        SyncHandle();
+    }
+
+    /*
+     * extensions string will include only extensions that our
+     * server supports as well as all back-end servers supports.
+     * extensions that are in the DMX_DENY_EXTENSIONS string will
+     * not be supported.
+     */
+    denied_extensions = getenv("DMX_DENY_GLX_EXTENSIONS");
+    ext = strtok(GLXServerExtensions, " ");
+    while (ext) {
+        int supported = 1;
+
+        if (denied_extensions && strstr(denied_extensions, ext)) {
+            supported = 0;
+        }
+        else {
+            for (s = 0; s < __glXNumActiveScreens && supported; s++) {
+                if (!strstr(be_extensions[s], ext)) {
+                    supported = 0;
+                }
+            }
+        }
+
+        if (supported) {
+            strcat(ExtensionsString, ext);
+            strcat(ExtensionsString, " ");
+        }
+
+        ext = strtok(NULL, " ");
+    }
+
+    /*
+     * release temporary storage
+     */
+    for (s = 0; s < __glXNumActiveScreens; s++) {
+        free(be_extensions[s]);
+    }
+    free(be_extensions);
+
+    if (dmxGLXSwapGroupSupport) {
+        if (!denied_extensions ||
+            !strstr(denied_extensions, "GLX_SGIX_swap_group")) {
+            strcat(ExtensionsString, "GLX_SGIX_swap_group");
+            if (!denied_extensions ||
+                !strstr(denied_extensions, "GLX_SGIX_swap_barrier")) {
+                strcat(ExtensionsString, " GLX_SGIX_swap_barrier");
+            }
+        }
+    }
 
 }
 
-void __glXScreenInit(GLint numscreens)
+void
+__glXScreenInit(GLint numscreens)
 {
-   int s;
-   int c;
-   DMXScreenInfo *dmxScreen0 = &dmxScreens[0];
-    __glXNumActiveScreens = numscreens;
-
+    int s;
+    int c;
+    DMXScreenInfo *dmxScreen0 = &dmxScreens[0];
 
-   CalcServerVersionAndExtensions();
+    __glXNumActiveScreens = numscreens;
 
+    CalcServerVersionAndExtensions();
 
-   __glXFBConfigs = NULL;
-   __glXNumFBConfigs = 0;
+    __glXFBConfigs = NULL;
+    __glXNumFBConfigs = 0;
 
-   if ( (__glXVersionMajor == 1 && __glXVersionMinor >= 3) ||
+    if ((__glXVersionMajor == 1 && __glXVersionMinor >= 3) ||
         (__glXVersionMajor > 1) ||
-	( strstr(ExtensionsString, "GLX_SGIX_fbconfig") )      ) {
-
-      /*
-      // Initialize FBConfig info.
-      // find the set of FBConfigs that are present on all back-end
-      // servers - only those configs will be supported
-       */
-      __glXFBConfigs = (__GLXFBConfig **)malloc( dmxScreen0->numFBConfigs *
-	                      (numscreens+1) * sizeof(__GLXFBConfig *) );
-      __glXNumFBConfigs = 0;
-   
-      for (c=0; c<dmxScreen0->numFBConfigs; c++) { 
-	 __GLXFBConfig *cfg = NULL;
-
-	 if (numscreens > 1) {
-	    for (s=1; s<numscreens; s++) {
-	       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-	  
-	       cfg = FindMatchingFBConfig( &dmxScreen0->fbconfigs[c],
-		                           dmxScreen->fbconfigs, 
-		                           dmxScreen->numFBConfigs );
-	       __glXFBConfigs[ __glXNumFBConfigs * (numscreens+1) + s + 1 ] = cfg;
-	       if (!cfg) {
-		  dmxLog(dmxInfo,"screen0 FBConfig 0x%x is missing on screen#%d\n", dmxScreen0->fbconfigs[c].id, s);
-		  break;
-	       }
-	       else {
-		  dmxLog(dmxInfo,"screen0 FBConfig 0x%x matched to  0x%x on screen#%d\n", dmxScreen0->fbconfigs[c].id, cfg->id, s);
-	       }
-	    }
-         }
-	 else {
-	    cfg = &dmxScreen0->fbconfigs[c];
-	 }
-
-	 if (cfg) {
-
-	    /* filter out overlay visuals */
-	    if (cfg->level == 0) {
-	       __GLXFBConfig *proxy_cfg;
-
-	       __glXFBConfigs[ __glXNumFBConfigs * (numscreens+1) + 1 ] = 
-	               &dmxScreen0->fbconfigs[c];
-
-	       proxy_cfg = malloc( sizeof(__GLXFBConfig) );
-	       memcpy( proxy_cfg, cfg, sizeof(__GLXFBConfig) );
-	       proxy_cfg->id =  FakeClientID(0);
-	       /* visual will be associated later in __glXGetFBConfigs */
-	       proxy_cfg->associatedVisualId =  (unsigned int)-1;
-
-	       __glXFBConfigs[ __glXNumFBConfigs * (numscreens+1) + 0 ] = proxy_cfg;
-
-	       __glXNumFBConfigs++;
-	    }
-
-	 }
-
-      }
+        (strstr(ExtensionsString, "GLX_SGIX_fbconfig"))) {
+
+        /*
+           // Initialize FBConfig info.
+           // find the set of FBConfigs that are present on all back-end
+           // servers - only those configs will be supported
+         */
+        __glXFBConfigs = (__GLXFBConfig **) malloc(dmxScreen0->numFBConfigs *
+                                                   (numscreens +
+                                                    1) *
+                                                   sizeof(__GLXFBConfig *));
+        __glXNumFBConfigs = 0;
+
+        for (c = 0; c < dmxScreen0->numFBConfigs; c++) {
+            __GLXFBConfig *cfg = NULL;
+
+            if (numscreens > 1) {
+                for (s = 1; s < numscreens; s++) {
+                    DMXScreenInfo *dmxScreen = &dmxScreens[s];
+
+                    cfg = FindMatchingFBConfig(&dmxScreen0->fbconfigs[c],
+                                               dmxScreen->fbconfigs,
+                                               dmxScreen->numFBConfigs);
+                    __glXFBConfigs[__glXNumFBConfigs * (numscreens + 1) + s +
+                                   1] = cfg;
+                    if (!cfg) {
+                        dmxLog(dmxInfo,
+                               "screen0 FBConfig 0x%x is missing on screen#%d\n",
+                               dmxScreen0->fbconfigs[c].id, s);
+                        break;
+                    }
+                    else {
+                        dmxLog(dmxInfo,
+                               "screen0 FBConfig 0x%x matched to  0x%x on screen#%d\n",
+                               dmxScreen0->fbconfigs[c].id, cfg->id, s);
+                    }
+                }
+            }
+            else {
+                cfg = &dmxScreen0->fbconfigs[c];
+            }
+
+            if (cfg) {
+
+                /* filter out overlay visuals */
+                if (cfg->level == 0) {
+                    __GLXFBConfig *proxy_cfg;
+
+                    __glXFBConfigs[__glXNumFBConfigs * (numscreens + 1) + 1] =
+                        &dmxScreen0->fbconfigs[c];
+
+                    proxy_cfg = malloc(sizeof(__GLXFBConfig));
+                    memcpy(proxy_cfg, cfg, sizeof(__GLXFBConfig));
+                    proxy_cfg->id = FakeClientID(0);
+                    /* visual will be associated later in __glXGetFBConfigs */
+                    proxy_cfg->associatedVisualId = (unsigned int) -1;
+
+                    __glXFBConfigs[__glXNumFBConfigs * (numscreens + 1) + 0] =
+                        proxy_cfg;
+
+                    __glXNumFBConfigs++;
+                }
+
+            }
+
+        }
 
     }
 
 }
 
-void __glXScreenReset(void)
+void
+__glXScreenReset(void)
 {
-  __glXNumActiveScreens = 0;
+    __glXNumActiveScreens = 0;
 }
 
-char *__glXGetServerString( unsigned int name ) 
+char *
+__glXGetServerString(unsigned int name)
 {
-   char *ret = NULL;
+    char *ret = NULL;
 
-   switch( name) {
+    switch (name) {
 
-      case GLX_VENDOR:
-	 ret = GLXServerVendorName;
-	 break;
+    case GLX_VENDOR:
+        ret = GLXServerVendorName;
+        break;
 
-      case GLX_VERSION:
-	 ret = GLXServerVersion;
-	 break;
+    case GLX_VERSION:
+        ret = GLXServerVersion;
+        break;
 
-      case GLX_EXTENSIONS:
-	 ret = ExtensionsString;
-	 break;
+    case GLX_EXTENSIONS:
+        ret = ExtensionsString;
+        break;
 
-      default:
-	 break;
-   }
+    default:
+        break;
+    }
 
-   return ret;
+    return ret;
 
 }
 
-int glxIsExtensionSupported( char *ext )
+int
+glxIsExtensionSupported(char *ext)
 {
-   return( strstr(ExtensionsString, ext) != NULL );
+    return (strstr(ExtensionsString, ext) != NULL);
 }
diff --git a/xorg-server/hw/dmx/glxProxy/glxserver.h b/xorg-server/hw/dmx/glxProxy/glxserver.h
index 03e95b865..ad9496619 100644
--- a/xorg-server/hw/dmx/glxProxy/glxserver.h
+++ b/xorg-server/hw/dmx/glxProxy/glxserver.h
@@ -41,8 +41,7 @@
 #include <resource.h>
 #include <scrnintstr.h>
 
-
-#define GL_GLEXT_PROTOTYPES /* we want prototypes */
+#define GL_GLEXT_PROTOTYPES     /* we want prototypes */
 #include <GL/gl.h>
 #include <GL/glxproto.h>
 #include <GL/glxint.h>
@@ -52,7 +51,6 @@
 #include "glxcontext.h"
 #include "glxerror.h"
 
-
 #define GLX_SERVER_MAJOR_VERSION 1
 #define GLX_SERVER_MINOR_VERSION 3
 
@@ -84,14 +82,15 @@ extern GLint __glXNumActiveScreens;
 ** The last context used (from the server's persective) is cached.
 */
 extern __GLXcontext *__glXLastContext;
-extern __GLXcontext *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*);
+extern __GLXcontext *__glXForceCurrent(__GLXclientState *, GLXContextTag,
+                                       int *);
 
 /************************************************************************/
 
 typedef struct {
-   int elem_size;  /* element size in bytes */
-   int nelems;     /* number of elements to swap */
-   void (*swapfunc)(GLbyte *pc);
+    int elem_size;              /* element size in bytes */
+    int nelems;                 /* number of elements to swap */
+    void (*swapfunc) (GLbyte * pc);
 } __GLXRenderSwapInfo;
 
 /*
@@ -99,20 +98,20 @@ typedef struct {
 */
 struct __GLXclientStateRec {
     /*
-    ** Whether this structure is currently being used to support a client.
-    */
+     ** Whether this structure is currently being used to support a client.
+     */
     Bool inUse;
 
     /*
-    ** Buffer for returned data.
-    */
+     ** Buffer for returned data.
+     */
     GLbyte *returnBuf;
     GLint returnBufSize;
 
     /*
-    ** Keep a list of all the contexts that are current for this client's
-    ** threads.
-    */
+     ** Keep a list of all the contexts that are current for this client's
+     ** threads.
+     */
     __GLXcontext **currentContexts;
     DrawablePtr *currentDrawables;
     GLint numCurrentContexts;
@@ -124,18 +123,18 @@ struct __GLXclientStateRec {
     int GLClientminorVersion;
     char *GLClientextensions;
 
-    GLXContextTag  *be_currentCTag;
+    GLXContextTag *be_currentCTag;
     Display **be_displays;
 
     /*
-    ** Keep track of large rendering commands, which span multiple requests.
-    */
-    GLint largeCmdBytesSoFar;		/* bytes received so far	*/
-    GLint largeCmdBytesTotal;		/* total bytes expected		*/
-    GLint largeCmdRequestsSoFar;	/* requests received so far	*/
-    GLint largeCmdRequestsTotal;	/* total requests expected	*/
-    void (*largeCmdRequestsSwapProc)(GLbyte *); 
-    __GLXRenderSwapInfo  *largeCmdRequestsSwap_info;
+     ** Keep track of large rendering commands, which span multiple requests.
+     */
+    GLint largeCmdBytesSoFar;   /* bytes received so far        */
+    GLint largeCmdBytesTotal;   /* total bytes expected         */
+    GLint largeCmdRequestsSoFar;        /* requests received so far     */
+    GLint largeCmdRequestsTotal;        /* total requests expected      */
+    void (*largeCmdRequestsSwapProc) (GLbyte *);
+    __GLXRenderSwapInfo *largeCmdRequestsSwap_info;
     GLbyte *largeCmdBuf;
     GLint largeCmdBufSize;
     GLint largeCmdMaxReqDataSize;
@@ -149,9 +148,9 @@ extern __GLXclientState *__glXClients[];
 /*
 ** Dispatch tables.
 */
-typedef void (*__GLXdispatchRenderProcPtr)(GLbyte *);
-typedef int (*__GLXdispatchSingleProcPtr)(__GLXclientState *, GLbyte *);
-typedef int (*__GLXdispatchVendorPrivProcPtr)(__GLXclientState *, GLbyte *);
+typedef void (*__GLXdispatchRenderProcPtr) (GLbyte *);
+typedef int (*__GLXdispatchSingleProcPtr) (__GLXclientState *, GLbyte *);
+typedef int (*__GLXdispatchVendorPrivProcPtr) (__GLXclientState *, GLbyte *);
 extern __GLXdispatchSingleProcPtr __glXSingleTable[];
 extern __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[];
 extern __GLXdispatchSingleProcPtr __glXSwapSingleTable[];
@@ -163,7 +162,7 @@ extern __GLXRenderSwapInfo __glXSwapRenderTable_EXT[];
 /*
  * Dispatch for GLX commands.
  */
-typedef int (*__GLXprocPtr)(__GLXclientState *, char *pc);
+typedef int (*__GLXprocPtr) (__GLXclientState *, char *pc);
 extern __GLXprocPtr __glXProcTable[];
 
 /*
@@ -171,7 +170,7 @@ extern __GLXprocPtr __glXProcTable[];
  */
 typedef struct {
     int bytes;
-    int (*varsize)(GLbyte *pc, Bool swap);
+    int (*varsize) (GLbyte * pc, Bool swap);
 } __GLXrenderSizeData;
 extern __GLXrenderSizeData __glXRenderSizeTable[];
 extern __GLXrenderSizeData __glXRenderSizeTable_EXT[];
@@ -194,37 +193,38 @@ extern RESTYPE __glXPbufferRes;
 ** Prototypes.
 */
 
-
 extern char *__glXcombine_strings(const char *, const char *);
 
-extern void __glXDisp_DrawArrays(GLbyte*);
-extern void __glXDispSwap_DrawArrays(GLbyte*);
-
+extern void __glXDisp_DrawArrays(GLbyte *);
+extern void __glXDispSwap_DrawArrays(GLbyte *);
 
 /*
 ** Routines for sending swapped replies.
 */
 
-extern void __glXSwapMakeCurrentReply(ClientPtr client,  
-                                      xGLXMakeCurrentReadSGIReply *reply);
+extern void __glXSwapMakeCurrentReply(ClientPtr client,
+                                      xGLXMakeCurrentReadSGIReply * reply);
 
-extern void __glXSwapIsDirectReply(ClientPtr client,
-				   xGLXIsDirectReply *reply);
+extern void __glXSwapIsDirectReply(ClientPtr client, xGLXIsDirectReply * reply);
 extern void __glXSwapQueryVersionReply(ClientPtr client,
-				       xGLXQueryVersionReply *reply);
+                                       xGLXQueryVersionReply * reply);
 extern void __glXSwapQueryContextInfoEXTReply(ClientPtr client,
-					      xGLXQueryContextInfoEXTReply *reply,
-					      int *buf);
+                                              xGLXQueryContextInfoEXTReply *
+                                              reply, int *buf);
 extern void glxSwapQueryExtensionsStringReply(ClientPtr client,
-				xGLXQueryExtensionsStringReply *reply, char *buf);
+                                              xGLXQueryExtensionsStringReply *
+                                              reply, char *buf);
 extern void glxSwapQueryServerStringReply(ClientPtr client,
-				xGLXQueryServerStringReply *reply, char *buf);
+                                          xGLXQueryServerStringReply * reply,
+                                          char *buf);
 extern void __glXSwapQueryContextReply(ClientPtr client,
-                                xGLXQueryContextReply *reply, int *buf);
+                                       xGLXQueryContextReply * reply, int *buf);
 extern void __glXSwapGetDrawableAttributesReply(ClientPtr client,
-                             xGLXGetDrawableAttributesReply *reply, int *buf);
+                                                xGLXGetDrawableAttributesReply *
+                                                reply, int *buf);
 extern void __glXSwapQueryMaxSwapBarriersSGIXReply(ClientPtr client,
-				   xGLXQueryMaxSwapBarriersSGIXReply *reply);
+                                                   xGLXQueryMaxSwapBarriersSGIXReply
+                                                   * reply);
 
 /*
  * Routines for computing the size of variably-sized rendering commands.
@@ -232,55 +232,54 @@ extern void __glXSwapQueryMaxSwapBarriersSGIXReply(ClientPtr client,
 
 extern int __glXTypeSize(GLenum enm);
 extern int __glXImageSize(GLenum format, GLenum type, GLsizei w, GLsizei h,
-			  GLint rowLength, GLint skipRows, GLint alignment);
+                          GLint rowLength, GLint skipRows, GLint alignment);
 extern int __glXImage3DSize(GLenum format, GLenum type,
-			    GLsizei w, GLsizei h, GLsizei d,
-			    GLint imageHeight, GLint rowLength,
-			    GLint skipImages, GLint skipRows,
-			    GLint alignment);
-
-extern int __glXCallListsReqSize(GLbyte *pc, Bool swap);
-extern int __glXBitmapReqSize(GLbyte *pc, Bool swap);
-extern int __glXFogfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXFogivReqSize(GLbyte *pc, Bool swap);
-extern int __glXLightfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXLightivReqSize(GLbyte *pc, Bool swap);
-extern int __glXLightModelfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXLightModelivReqSize(GLbyte *pc, Bool swap);
-extern int __glXMaterialfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXMaterialivReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexParameterfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexParameterivReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexImage1DReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexImage2DReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexEnvfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexEnvivReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexGendvReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexGenfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexGenivReqSize(GLbyte *pc, Bool swap);
-extern int __glXMap1dReqSize(GLbyte *pc, Bool swap);
-extern int __glXMap1fReqSize(GLbyte *pc, Bool swap);
-extern int __glXMap2dReqSize(GLbyte *pc, Bool swap);
-extern int __glXMap2fReqSize(GLbyte *pc, Bool swap);
-extern int __glXPixelMapfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXPixelMapuivReqSize(GLbyte *pc, Bool swap);
-extern int __glXPixelMapusvReqSize(GLbyte *pc, Bool swap);
-extern int __glXDrawPixelsReqSize(GLbyte *pc, Bool swap);
-extern int __glXDrawArraysSize(GLbyte *pc, Bool swap);
-extern int __glXPrioritizeTexturesReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexSubImage1DReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexSubImage2DReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexImage3DReqSize(GLbyte *pc, Bool swap );
-extern int __glXTexSubImage3DReqSize(GLbyte *pc, Bool swap);
-extern int __glXConvolutionFilter1DReqSize(GLbyte *pc, Bool swap);
-extern int __glXConvolutionFilter2DReqSize(GLbyte *pc, Bool swap);
-extern int __glXConvolutionParameterivReqSize(GLbyte *pc, Bool swap);
-extern int __glXConvolutionParameterfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXSeparableFilter2DReqSize(GLbyte *pc, Bool swap);
-extern int __glXColorTableReqSize(GLbyte *pc, Bool swap);
-extern int __glXColorSubTableReqSize(GLbyte *pc, Bool swap);
-extern int __glXColorTableParameterfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXColorTableParameterivReqSize(GLbyte *pc, Bool swap);
+                            GLsizei w, GLsizei h, GLsizei d,
+                            GLint imageHeight, GLint rowLength,
+                            GLint skipImages, GLint skipRows, GLint alignment);
+
+extern int __glXCallListsReqSize(GLbyte * pc, Bool swap);
+extern int __glXBitmapReqSize(GLbyte * pc, Bool swap);
+extern int __glXFogfvReqSize(GLbyte * pc, Bool swap);
+extern int __glXFogivReqSize(GLbyte * pc, Bool swap);
+extern int __glXLightfvReqSize(GLbyte * pc, Bool swap);
+extern int __glXLightivReqSize(GLbyte * pc, Bool swap);
+extern int __glXLightModelfvReqSize(GLbyte * pc, Bool swap);
+extern int __glXLightModelivReqSize(GLbyte * pc, Bool swap);
+extern int __glXMaterialfvReqSize(GLbyte * pc, Bool swap);
+extern int __glXMaterialivReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexParameterfvReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexParameterivReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexImage1DReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexImage2DReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexEnvfvReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexEnvivReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexGendvReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexGenfvReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexGenivReqSize(GLbyte * pc, Bool swap);
+extern int __glXMap1dReqSize(GLbyte * pc, Bool swap);
+extern int __glXMap1fReqSize(GLbyte * pc, Bool swap);
+extern int __glXMap2dReqSize(GLbyte * pc, Bool swap);
+extern int __glXMap2fReqSize(GLbyte * pc, Bool swap);
+extern int __glXPixelMapfvReqSize(GLbyte * pc, Bool swap);
+extern int __glXPixelMapuivReqSize(GLbyte * pc, Bool swap);
+extern int __glXPixelMapusvReqSize(GLbyte * pc, Bool swap);
+extern int __glXDrawPixelsReqSize(GLbyte * pc, Bool swap);
+extern int __glXDrawArraysSize(GLbyte * pc, Bool swap);
+extern int __glXPrioritizeTexturesReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexSubImage1DReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexSubImage2DReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexImage3DReqSize(GLbyte * pc, Bool swap);
+extern int __glXTexSubImage3DReqSize(GLbyte * pc, Bool swap);
+extern int __glXConvolutionFilter1DReqSize(GLbyte * pc, Bool swap);
+extern int __glXConvolutionFilter2DReqSize(GLbyte * pc, Bool swap);
+extern int __glXConvolutionParameterivReqSize(GLbyte * pc, Bool swap);
+extern int __glXConvolutionParameterfvReqSize(GLbyte * pc, Bool swap);
+extern int __glXSeparableFilter2DReqSize(GLbyte * pc, Bool swap);
+extern int __glXColorTableReqSize(GLbyte * pc, Bool swap);
+extern int __glXColorSubTableReqSize(GLbyte * pc, Bool swap);
+extern int __glXColorTableParameterfvReqSize(GLbyte * pc, Bool swap);
+extern int __glXColorTableParameterivReqSize(GLbyte * pc, Bool swap);
 
 /*
  * Routines for computing the size of returned data.
@@ -290,8 +289,8 @@ extern int __glXConvolutionParameterfvSize(GLenum pname);
 extern int __glXColorTableParameterfvSize(GLenum pname);
 extern int __glXColorTableParameterivSize(GLenum pname);
 
-extern void __glXFreeGLXWindow(__glXWindow *pGlxWindow);
-extern void __glXFreeGLXPbuffer(__glXPbuffer *pGlxPbuffer);
+extern void __glXFreeGLXWindow(__glXWindow * pGlxWindow);
+extern void __glXFreeGLXPbuffer(__glXPbuffer * pGlxPbuffer);
 
 extern int __glXVersionMajor;
 extern int __glXVersionMinor;
@@ -300,4 +299,4 @@ extern int __glXVersionMinor;
          ( (__glXVersionMajor > (major)) || \
            ((__glXVersionMajor == (major)) && (__glXVersionMinor >= (minor))) )
 
-#endif /* !__GLX_server_h__ */
+#endif                          /* !__GLX_server_h__ */
diff --git a/xorg-server/hw/dmx/glxProxy/glxsingle.c b/xorg-server/hw/dmx/glxProxy/glxsingle.c
index 33cc612a7..63786cf79 100644
--- a/xorg-server/hw/dmx/glxProxy/glxsingle.c
+++ b/xorg-server/hw/dmx/glxProxy/glxsingle.c
@@ -68,7 +68,7 @@
 	dpy->bufptr += SIZEOF(x##name##Req);\
 	dpy->request++
 
-#else  /* non-ANSI C uses empty comment instead of "##" for token concatenation */
+#else                           /* non-ANSI C uses empty comment instead of "##" for token concatenation */
 #define GetReqSingle(name, req) \
         WORD64ALIGN\
 	if ((dpy->bufptr + SIZEOF(x/**/name/**/Req)) > dpy->bufmax)\
@@ -79,100 +79,101 @@
 	dpy->request++
 #endif
 
-#define X_GLXSingle 0   /* needed by GetReqExtra */
+#define X_GLXSingle 0           /* needed by GetReqExtra */
 
-extern Display *GetBackEndDisplay( __GLXclientState *cl, int s );
-extern int GetCurrentBackEndTag(__GLXclientState *cl, GLXContextTag tag, int s);
+extern Display *GetBackEndDisplay(__GLXclientState * cl, int s);
+extern int GetCurrentBackEndTag(__GLXclientState * cl, GLXContextTag tag,
+                                int s);
 
 static int swap_vec_element_size = 0;
 
-static void SendSwappedReply( ClientPtr client,
-                              xGLXSingleReply *reply, 
-			      char *buf,
-			      int   buf_size )
+static void
+SendSwappedReply(ClientPtr client,
+                 xGLXSingleReply * reply, char *buf, int buf_size)
 {
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_SWAP_SHORT(&reply->sequenceNumber);
-   __GLX_SWAP_INT(&reply->length);
-   __GLX_SWAP_INT(&reply->retval);
-   __GLX_SWAP_INT(&reply->size);
-
-   if ( (buf_size == 0) && (swap_vec_element_size > 0) ) {
-      /*
-       * the reply has single component - need to swap pad3
-       */
-      if (swap_vec_element_size == 2) {
-	 __GLX_SWAP_SHORT(&reply->pad3);
-      }
-      else if (swap_vec_element_size == 4) {
-	 __GLX_SWAP_INT(&reply->pad3);
-	 __GLX_SWAP_INT(&reply->pad4);    /* some requests use also pad4
-                                          * i.e GetConvolutionFilter
-					  */
-      }
-      else if (swap_vec_element_size == 8) {
-	 __GLX_SWAP_DOUBLE(&reply->pad3);
-      }
-   }
-   else if ( (buf_size > 0) && (swap_vec_element_size > 0) ) {
-      /*
-       * the reply has vector of elements which needs to be swapped
-       */
-      int vsize = buf_size / swap_vec_element_size;
-      char *p = buf;
-      int i;
-
-      for (i=0; i<vsize; i++) {
-	 if (swap_vec_element_size == 2) {
-	    __GLX_SWAP_SHORT(p);
-	 }
-	 else if (swap_vec_element_size == 4) {
-	    __GLX_SWAP_INT(p);
-	 }
-	 else if (swap_vec_element_size == 8) {
-	    __GLX_SWAP_DOUBLE(p);
-	 }
-
-	 p += swap_vec_element_size;
-      }
-
-      /*
-       * swap pad words as well - for case that some single reply uses
-       * them as well
-       */
-      __GLX_SWAP_INT(&reply->pad3);
-      __GLX_SWAP_INT(&reply->pad4);
-      __GLX_SWAP_INT(&reply->pad5);
-      __GLX_SWAP_INT(&reply->pad6);
-
-   }
-
-    WriteToClient(client, sizeof(xGLXSingleReply),(char *)reply);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_SWAP_SHORT(&reply->sequenceNumber);
+    __GLX_SWAP_INT(&reply->length);
+    __GLX_SWAP_INT(&reply->retval);
+    __GLX_SWAP_INT(&reply->size);
+
+    if ((buf_size == 0) && (swap_vec_element_size > 0)) {
+        /*
+         * the reply has single component - need to swap pad3
+         */
+        if (swap_vec_element_size == 2) {
+            __GLX_SWAP_SHORT(&reply->pad3);
+        }
+        else if (swap_vec_element_size == 4) {
+            __GLX_SWAP_INT(&reply->pad3);
+            __GLX_SWAP_INT(&reply->pad4);       /* some requests use also pad4
+                                                 * i.e GetConvolutionFilter
+                                                 */
+        }
+        else if (swap_vec_element_size == 8) {
+            __GLX_SWAP_DOUBLE(&reply->pad3);
+        }
+    }
+    else if ((buf_size > 0) && (swap_vec_element_size > 0)) {
+        /*
+         * the reply has vector of elements which needs to be swapped
+         */
+        int vsize = buf_size / swap_vec_element_size;
+        char *p = buf;
+        int i;
+
+        for (i = 0; i < vsize; i++) {
+            if (swap_vec_element_size == 2) {
+                __GLX_SWAP_SHORT(p);
+            }
+            else if (swap_vec_element_size == 4) {
+                __GLX_SWAP_INT(p);
+            }
+            else if (swap_vec_element_size == 8) {
+                __GLX_SWAP_DOUBLE(p);
+            }
+
+            p += swap_vec_element_size;
+        }
+
+        /*
+         * swap pad words as well - for case that some single reply uses
+         * them as well
+         */
+        __GLX_SWAP_INT(&reply->pad3);
+        __GLX_SWAP_INT(&reply->pad4);
+        __GLX_SWAP_INT(&reply->pad5);
+        __GLX_SWAP_INT(&reply->pad6);
+
+    }
+
+    WriteToClient(client, sizeof(xGLXSingleReply), (char *) reply);
     if (buf_size > 0)
-       WriteToClient(client, buf_size, (char *)buf);
+        WriteToClient(client, buf_size, (char *) buf);
 
 }
 
-int __glXForwardSingleReq( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardSingleReq(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   xGLXSingleReq *be_req;
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
+    xGLXSingleReq *be_req;
     __GLXcontext *glxc;
-   int from_screen = 0;
-   int to_screen = 0;
-   int buf_size;
-   int s;
+    int from_screen = 0;
+    int to_screen = 0;
+    int buf_size;
+    int s;
 
     glxc = __glXLookupContextByTag(cl, req->contextTag);
     if (!glxc) {
-	return 0;
+        return 0;
     }
     from_screen = to_screen = glxc->pScreen->myNum;
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
@@ -182,47 +183,48 @@ int __glXForwardSingleReq( __GLXclientState *cl, GLbyte *pc )
     /*
      * just forward the request to back-end server(s)
      */
-    for (s=from_screen; s<=to_screen; s++) {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
-
-       LockDisplay(dpy);
-       GetReqSingle(GLXSingle,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = req->glxCode;
-       be_req->length = req->length;
-       be_req->contextTag = GetCurrentBackEndTag(cl,req->contextTag,s);
-       if (buf_size > 0) 
-	  _XSend(dpy, (const char *)pc, buf_size);
-       UnlockDisplay(dpy);
-       SyncHandle();
-
-       if (req->glxCode == X_GLsop_Flush) {
-	  XFlush(dpy);
-       }
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
+
+        LockDisplay(dpy);
+        GetReqSingle(GLXSingle, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = req->glxCode;
+        be_req->length = req->length;
+        be_req->contextTag = GetCurrentBackEndTag(cl, req->contextTag, s);
+        if (buf_size > 0)
+            _XSend(dpy, (const char *) pc, buf_size);
+        UnlockDisplay(dpy);
+        SyncHandle();
+
+        if (req->glxCode == X_GLsop_Flush) {
+            XFlush(dpy);
+        }
 
     }
 
     return Success;
 }
 
-int __glXForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardPipe0WithReply(__GLXclientState * cl, GLbyte * pc)
 {
-   ClientPtr client = cl->client;
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   xGLXSingleReq *be_req;
-   xGLXSingleReply reply;
-   xGLXSingleReply be_reply;
+    ClientPtr client = cl->client;
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
+    xGLXSingleReq *be_req;
+    xGLXSingleReply reply;
+    xGLXSingleReply be_reply;
     __GLXcontext *glxc;
-   int buf_size;
-   char *be_buf = NULL;
-   int   be_buf_size;
-   DMXScreenInfo *dmxScreen;
-   Display *dpy;
+    int buf_size;
+    char *be_buf = NULL;
+    int be_buf_size;
+    DMXScreenInfo *dmxScreen;
+    Display *dpy;
 
     glxc = __glXLookupContextByTag(cl, req->contextTag);
     if (!glxc) {
-	return __glXBadContext;
+        return __glXBadContext;
     }
 
     pc += sz_xGLXSingleReq;
@@ -235,29 +237,30 @@ int __glXForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc )
      * send the request to the first back-end server
      */
     LockDisplay(dpy);
-    GetReqSingle(GLXSingle,be_req);
+    GetReqSingle(GLXSingle, be_req);
     be_req->reqType = dmxScreen->glxMajorOpcode;
     be_req->glxCode = req->glxCode;
     be_req->length = req->length;
-    be_req->contextTag = GetCurrentBackEndTag(cl,req->contextTag,glxc->pScreen->myNum);
-    if (buf_size > 0) 
-       _XSend(dpy, (const char *)pc, buf_size);
+    be_req->contextTag =
+        GetCurrentBackEndTag(cl, req->contextTag, glxc->pScreen->myNum);
+    if (buf_size > 0)
+        _XSend(dpy, (const char *) pc, buf_size);
 
     /*
      * get the reply from the back-end server
      */
-    _XReply(dpy, (xReply*) &be_reply, 0, False);
+    _XReply(dpy, (xReply *) & be_reply, 0, False);
     be_buf_size = be_reply.length << 2;
     if (be_buf_size > 0) {
-       be_buf = (char *)malloc( be_buf_size );
-       if (be_buf) {
-	  _XRead(dpy, be_buf, be_buf_size);
-       }
-       else {
-	  /* Throw data on the floor */
-	  _XEatData(dpy, be_buf_size);
-	  return BadAlloc;
-       }
+        be_buf = (char *) malloc(be_buf_size);
+        if (be_buf) {
+            _XRead(dpy, be_buf, be_buf_size);
+        }
+        else {
+            /* Throw data on the floor */
+            _XEatData(dpy, be_buf_size);
+            return BadAlloc;
+        }
     }
 
     UnlockDisplay(dpy);
@@ -275,47 +278,49 @@ int __glXForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc )
     reply.pad4 = be_reply.pad4;
 
     if (client->swapped) {
-       SendSwappedReply( client, &reply, be_buf, be_buf_size );
+        SendSwappedReply(client, &reply, be_buf, be_buf_size);
     }
     else {
-       WriteToClient(client, sizeof(xGLXSingleReply),(char *)&reply);
-       if (be_buf_size > 0)
-	  WriteToClient(client, be_buf_size, (char *)be_buf);
+        WriteToClient(client, sizeof(xGLXSingleReply), (char *) &reply);
+        if (be_buf_size > 0)
+            WriteToClient(client, be_buf_size, (char *) be_buf);
     }
 
-    if (be_buf_size > 0) free(be_buf);
+    if (be_buf_size > 0)
+        free(be_buf);
 
     return Success;
 }
 
-int __glXForwardAllWithReply( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardAllWithReply(__GLXclientState * cl, GLbyte * pc)
 {
-   ClientPtr client = cl->client;
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   xGLXSingleReq *be_req;
-   xGLXSingleReply reply;
-   xGLXSingleReply be_reply;
+    ClientPtr client = cl->client;
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
+    xGLXSingleReq *be_req;
+    xGLXSingleReply reply;
+    xGLXSingleReply be_reply;
     __GLXcontext *glxc;
-   int buf_size;
-   char *be_buf = NULL;
-   int   be_buf_size = 0;
-   int from_screen = 0;
-   int to_screen = 0;
-   int s;
+    int buf_size;
+    char *be_buf = NULL;
+    int be_buf_size = 0;
+    int from_screen = 0;
+    int to_screen = 0;
+    int s;
 
-   DMXScreenInfo *dmxScreen;
-   Display *dpy;
+    DMXScreenInfo *dmxScreen;
+    Display *dpy;
 
     glxc = __glXLookupContextByTag(cl, req->contextTag);
     if (!glxc) {
-	return 0;
+        return 0;
     }
     from_screen = to_screen = glxc->pScreen->myNum;
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
@@ -325,42 +330,42 @@ int __glXForwardAllWithReply( __GLXclientState *cl, GLbyte *pc )
     /* 
      * send the request to the first back-end server(s)
      */
-    for (s=to_screen; s>=from_screen; s--) {
-       dmxScreen = &dmxScreens[s];
-       dpy = GetBackEndDisplay(cl,s);
-
-       LockDisplay(dpy);
-       GetReqSingle(GLXSingle,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = req->glxCode;
-       be_req->length = req->length;
-       be_req->contextTag = GetCurrentBackEndTag(cl,req->contextTag,s);
-       if (buf_size > 0) 
-	  _XSend(dpy, (const char *)pc, buf_size);
-
-       /*
-	* get the reply from the back-end server
-	*/
-       _XReply(dpy, (xReply*) &be_reply, 0, False);
-       be_buf_size = be_reply.length << 2;
-       if (be_buf_size > 0) {
-	  be_buf = (char *)malloc( be_buf_size );
-	  if (be_buf) {
-	     _XRead(dpy, be_buf, be_buf_size);
-	  }
-	  else {
-	     /* Throw data on the floor */
-	     _XEatData(dpy, be_buf_size);
-	     return BadAlloc;
-	  }
-       }
-
-       UnlockDisplay(dpy);
-       SyncHandle();
-
-       if (s > from_screen && be_buf_size > 0) {
-	  free(be_buf);
-       }
+    for (s = to_screen; s >= from_screen; s--) {
+        dmxScreen = &dmxScreens[s];
+        dpy = GetBackEndDisplay(cl, s);
+
+        LockDisplay(dpy);
+        GetReqSingle(GLXSingle, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = req->glxCode;
+        be_req->length = req->length;
+        be_req->contextTag = GetCurrentBackEndTag(cl, req->contextTag, s);
+        if (buf_size > 0)
+            _XSend(dpy, (const char *) pc, buf_size);
+
+        /*
+         * get the reply from the back-end server
+         */
+        _XReply(dpy, (xReply *) & be_reply, 0, False);
+        be_buf_size = be_reply.length << 2;
+        if (be_buf_size > 0) {
+            be_buf = (char *) malloc(be_buf_size);
+            if (be_buf) {
+                _XRead(dpy, be_buf, be_buf_size);
+            }
+            else {
+                /* Throw data on the floor */
+                _XEatData(dpy, be_buf_size);
+                return BadAlloc;
+            }
+        }
+
+        UnlockDisplay(dpy);
+        SyncHandle();
+
+        if (s > from_screen && be_buf_size > 0) {
+            free(be_buf);
+        }
     }
 
     /*
@@ -375,380 +380,409 @@ int __glXForwardAllWithReply( __GLXclientState *cl, GLbyte *pc )
     reply.pad4 = be_reply.pad4;
 
     if (client->swapped) {
-       SendSwappedReply( client, &reply, be_buf, be_buf_size );
+        SendSwappedReply(client, &reply, be_buf, be_buf_size);
     }
     else {
-       WriteToClient(client, sizeof(xGLXSingleReply),(char *)&reply);
-       if (be_buf_size > 0)
-	  WriteToClient(client, be_buf_size, (char *)be_buf);
+        WriteToClient(client, sizeof(xGLXSingleReply), (char *) &reply);
+        if (be_buf_size > 0)
+            WriteToClient(client, be_buf_size, (char *) be_buf);
     }
 
-    if (be_buf_size > 0) free(be_buf);
+    if (be_buf_size > 0)
+        free(be_buf);
 
     return Success;
 }
 
-int __glXForwardSingleReqSwap( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardSingleReqSwap(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->contextTag);
-
-   swap_vec_element_size = 0;
-
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXSingleReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXSingleReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
-
-   return( __glXForwardSingleReq( cl, pc ) );
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->contextTag);
+
+    swap_vec_element_size = 0;
+
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXSingleReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXSingleReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXForwardSingleReq(cl, pc));
 }
 
-int __glXForwardPipe0WithReplySwap( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardPipe0WithReplySwap(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->contextTag);
-
-   swap_vec_element_size = 0;
-
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXSingleReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXSingleReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
-
-   return( __glXForwardPipe0WithReply( cl, pc ) );
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->contextTag);
+
+    swap_vec_element_size = 0;
+
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXSingleReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXSingleReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXForwardPipe0WithReply(cl, pc));
 }
 
-int __glXForwardPipe0WithReplySwapsv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardPipe0WithReplySwapsv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
 
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->contextTag);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->contextTag);
 
-   swap_vec_element_size = 2;
+    swap_vec_element_size = 2;
 
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXSingleReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXSingleReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXSingleReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXSingleReq / 4;
 
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
 
-   return( __glXForwardPipe0WithReply( cl, pc ) );
+    return (__glXForwardPipe0WithReply(cl, pc));
 }
 
-int __glXForwardPipe0WithReplySwapiv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardPipe0WithReplySwapiv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
 
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->contextTag);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-   swap_vec_element_size = 4;
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->contextTag);
 
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXSingleReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXSingleReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
+    swap_vec_element_size = 4;
 
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXSingleReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXSingleReq / 4;
 
-   return( __glXForwardPipe0WithReply( cl, pc ) );
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXForwardPipe0WithReply(cl, pc));
 }
 
-int __glXForwardPipe0WithReplySwapdv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardPipe0WithReplySwapdv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
 
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->contextTag);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-   swap_vec_element_size = 8;
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->contextTag);
 
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXSingleReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXSingleReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
+    swap_vec_element_size = 8;
 
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXSingleReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXSingleReq / 4;
 
-   return( __glXForwardPipe0WithReply( cl, pc ) );
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXForwardPipe0WithReply(cl, pc));
 }
 
-int __glXForwardAllWithReplySwap( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardAllWithReplySwap(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->contextTag);
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->contextTag);
 
-   swap_vec_element_size = 0;
+    swap_vec_element_size = 0;
 
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXSingleReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXSingleReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXSingleReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXSingleReq / 4;
 
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
 
-   return( __glXForwardAllWithReply( cl, pc ) );
+    return (__glXForwardAllWithReply(cl, pc));
 }
 
-int __glXForwardAllWithReplySwapsv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardAllWithReplySwapsv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->contextTag);
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->contextTag);
 
-   swap_vec_element_size = 2;
+    swap_vec_element_size = 2;
 
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXSingleReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXSingleReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXSingleReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXSingleReq / 4;
 
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
 
-   return( __glXForwardAllWithReply( cl, pc ) );
+    return (__glXForwardAllWithReply(cl, pc));
 }
 
-int __glXForwardAllWithReplySwapiv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardAllWithReplySwapiv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
 
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->contextTag);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-   swap_vec_element_size = 4;
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->contextTag);
 
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXSingleReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXSingleReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
+    swap_vec_element_size = 4;
 
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXSingleReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXSingleReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
 
-   return( __glXForwardAllWithReply( cl, pc ) );
+    return (__glXForwardAllWithReply(cl, pc));
 }
 
-int __glXForwardAllWithReplySwapdv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXForwardAllWithReplySwapdv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXSingleReq *req = (xGLXSingleReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
 
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->contextTag);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
-   swap_vec_element_size = 8;
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->contextTag);
 
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXSingleReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXSingleReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
+    swap_vec_element_size = 8;
 
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXSingleReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXSingleReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
 
-   return( __glXForwardAllWithReply( cl, pc ) );
+    return (__glXForwardAllWithReply(cl, pc));
 }
 
-static GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h, 
-                          int *elementbits_return, int *rowbytes_return )
+static GLint
+__glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h,
+                    int *elementbits_return, int *rowbytes_return)
 {
     GLint elements, esize;
     GLint rowsize, padding;
 
     if (w < 0 || h < 0) {
-	return -1;
+        return -1;
     }
     switch (format) {
-      case GL_COLOR_INDEX:
-      case GL_STENCIL_INDEX:
-      case GL_DEPTH_COMPONENT:
-	elements = 1;
-	break;
-      case GL_RED:
-      case GL_GREEN:
-      case GL_BLUE:
-      case GL_ALPHA:
-      case GL_LUMINANCE:
-	elements = 1;
-	break;
-      case GL_LUMINANCE_ALPHA:
-	elements = 2;
-	break;
-      case GL_RGB:
-      case GL_BGR:
-	elements = 3;
-	break;
-      case GL_RGBA:
-      case GL_BGRA:
-      case GL_ABGR_EXT:
-	elements = 4;
-	break;
-      default:
-	return -1;
+    case GL_COLOR_INDEX:
+    case GL_STENCIL_INDEX:
+    case GL_DEPTH_COMPONENT:
+        elements = 1;
+        break;
+    case GL_RED:
+    case GL_GREEN:
+    case GL_BLUE:
+    case GL_ALPHA:
+    case GL_LUMINANCE:
+        elements = 1;
+        break;
+    case GL_LUMINANCE_ALPHA:
+        elements = 2;
+        break;
+    case GL_RGB:
+    case GL_BGR:
+        elements = 3;
+        break;
+    case GL_RGBA:
+    case GL_BGRA:
+    case GL_ABGR_EXT:
+        elements = 4;
+        break;
+    default:
+        return -1;
     }
     /*
-    ** According to the GLX protocol, each row must be padded to a multiple of
-    ** 4 bytes.  4 bytes also happens to be the default alignment in the pixel
-    ** store modes of the GL.
-    */
+     ** According to the GLX protocol, each row must be padded to a multiple of
+     ** 4 bytes.  4 bytes also happens to be the default alignment in the pixel
+     ** store modes of the GL.
+     */
     switch (type) {
-      case GL_BITMAP:
-	if (format == GL_COLOR_INDEX || format == GL_STENCIL_INDEX) {
-	   rowsize = ((w * elements)+7)/8;
-	   padding = rowsize % 4;
-	   if (padding) {
-	      rowsize += 4 - padding;
-	   }
-	   if (elementbits_return) *elementbits_return = elements;
-	   if (rowbytes_return) *rowbytes_return = rowsize;
-	   return rowsize * h;
-	} else {
-	   return -1;
-	}
-      case GL_BYTE:
-      case GL_UNSIGNED_BYTE:
-	esize = 1;
-	break;
-      case GL_UNSIGNED_BYTE_3_3_2:
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-	esize = 1;
-	elements = 1;
-	break;
-      case GL_SHORT:
-      case GL_UNSIGNED_SHORT:
-	esize = 2;
-	break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-	esize = 2;
-	elements = 1;
-	break;
-      case GL_INT:
-      case GL_UNSIGNED_INT:
-      case GL_FLOAT:
-	esize = 4;
-	break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-      case GL_UNSIGNED_INT_10_10_10_2:
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-	esize = 4;
-	elements = 1;
-	break;
-      default:
-	return -1;
+    case GL_BITMAP:
+        if (format == GL_COLOR_INDEX || format == GL_STENCIL_INDEX) {
+            rowsize = ((w * elements) + 7) / 8;
+            padding = rowsize % 4;
+            if (padding) {
+                rowsize += 4 - padding;
+            }
+            if (elementbits_return)
+                *elementbits_return = elements;
+            if (rowbytes_return)
+                *rowbytes_return = rowsize;
+            return rowsize * h;
+        }
+        else {
+            return -1;
+        }
+    case GL_BYTE:
+    case GL_UNSIGNED_BYTE:
+        esize = 1;
+        break;
+    case GL_UNSIGNED_BYTE_3_3_2:
+    case GL_UNSIGNED_BYTE_2_3_3_REV:
+        esize = 1;
+        elements = 1;
+        break;
+    case GL_SHORT:
+    case GL_UNSIGNED_SHORT:
+        esize = 2;
+        break;
+    case GL_UNSIGNED_SHORT_5_6_5:
+    case GL_UNSIGNED_SHORT_5_6_5_REV:
+    case GL_UNSIGNED_SHORT_4_4_4_4:
+    case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+    case GL_UNSIGNED_SHORT_5_5_5_1:
+    case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+        esize = 2;
+        elements = 1;
+        break;
+    case GL_INT:
+    case GL_UNSIGNED_INT:
+    case GL_FLOAT:
+        esize = 4;
+        break;
+    case GL_UNSIGNED_INT_8_8_8_8:
+    case GL_UNSIGNED_INT_8_8_8_8_REV:
+    case GL_UNSIGNED_INT_10_10_10_2:
+    case GL_UNSIGNED_INT_2_10_10_10_REV:
+        esize = 4;
+        elements = 1;
+        break;
+    default:
+        return -1;
     }
     rowsize = w * elements * esize;
     padding = rowsize % 4;
     if (padding) {
-	rowsize += 4 - padding;
+        rowsize += 4 - padding;
     }
 
-    if (elementbits_return) *elementbits_return = esize*elements*8;
-    if (rowbytes_return) *rowbytes_return = rowsize;
+    if (elementbits_return)
+        *elementbits_return = esize * elements * 8;
+    if (rowbytes_return)
+        *rowbytes_return = rowsize;
 
     return rowsize * h;
 }
 
-static int intersectRect( int x1, int x2, int y1, int y2,
-                    int X1, int X2, int Y1, int Y2,
-		    int *ix1, int *ix2, int *iy1, int *iy2 )
+static int
+intersectRect(int x1, int x2, int y1, int y2,
+              int X1, int X2, int Y1, int Y2,
+              int *ix1, int *ix2, int *iy1, int *iy2)
 {
-   int right = (x2 < X2 ? x2 : X2);
-   int bottom = (y2 < Y2 ? y2 : Y2);
-   int left = (x1 > X1 ? x1 : X1);
-   int top = (y1 > Y1 ? y1 : Y1);
-   int width = right - left + 1;
-   int height = bottom - top + 1;
-
-   if ( (width <= 0) || (height <= 0) ) {
-      *ix1 = *ix2 = *iy1 = *iy2 = 0;
-      return 0;
-   }
-   else {
-      *ix1 = left;
-      *ix2 = right;
-      *iy1 = top;
-      *iy2 = bottom;
-      return width * height;
-   }
+    int right = (x2 < X2 ? x2 : X2);
+    int bottom = (y2 < Y2 ? y2 : Y2);
+    int left = (x1 > X1 ? x1 : X1);
+    int top = (y1 > Y1 ? y1 : Y1);
+    int width = right - left + 1;
+    int height = bottom - top + 1;
+
+    if ((width <= 0) || (height <= 0)) {
+        *ix1 = *ix2 = *iy1 = *iy2 = 0;
+        return 0;
+    }
+    else {
+        *ix1 = left;
+        *ix2 = right;
+        *iy1 = top;
+        *iy2 = bottom;
+        return width * height;
+    }
 
 }
 
-int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
+int
+__glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *req = (xGLXSingleReq *)pc;
+    xGLXSingleReq *req = (xGLXSingleReq *) pc;
     xGLXSingleReq *be_req;
     xGLXReadPixelsReply reply;
     xGLXReadPixelsReply be_reply;
     GLbyte *be_pc;
-    GLint x,y;
+    GLint x, y;
     GLsizei width, height;
     GLenum format, type;
     GLboolean swapBytes, lsbFirst;
@@ -763,254 +797,262 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
     int win_x1, win_x2;
     int win_y1, win_y2;
     int ebits, rowsize;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     if (client->swapped) {
-       __GLX_SWAP_INT(&req->contextTag);
+        __GLX_SWAP_INT(&req->contextTag);
     }
 
     glxc = __glXLookupContextByTag(cl, req->contextTag);
     if (!glxc) {
-	return 0;
+        return 0;
     }
     from_screen = to_screen = glxc->pScreen->myNum;
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
     pc += sz_xGLXSingleReq;
-    x = *(GLint *)(pc + 0);
-    y = *(GLint *)(pc + 4);
-    width = *(GLsizei *)(pc + 8);
-    height = *(GLsizei *)(pc + 12);
-    format = *(GLenum *)(pc + 16);
-    type = *(GLenum *)(pc + 20);
-    swapBytes = *(GLboolean *)(pc + 24);
-    lsbFirst = *(GLboolean *)(pc + 25);
+    x = *(GLint *) (pc + 0);
+    y = *(GLint *) (pc + 4);
+    width = *(GLsizei *) (pc + 8);
+    height = *(GLsizei *) (pc + 12);
+    format = *(GLenum *) (pc + 16);
+    type = *(GLenum *) (pc + 20);
+    swapBytes = *(GLboolean *) (pc + 24);
+    lsbFirst = *(GLboolean *) (pc + 25);
 
     if (client->swapped) {
-       __GLX_SWAP_INT(&x);
-       __GLX_SWAP_INT(&y);
-       __GLX_SWAP_INT(&width);
-       __GLX_SWAP_INT(&height);
-       __GLX_SWAP_INT(&format);
-       __GLX_SWAP_INT(&type);
-       swapBytes = !swapBytes;
+        __GLX_SWAP_INT(&x);
+        __GLX_SWAP_INT(&y);
+        __GLX_SWAP_INT(&width);
+        __GLX_SWAP_INT(&height);
+        __GLX_SWAP_INT(&format);
+        __GLX_SWAP_INT(&type);
+        swapBytes = !swapBytes;
     }
 
-    buf_size = __glReadPixels_size(format,type,width,height, &ebits, &rowsize);
+    buf_size =
+        __glReadPixels_size(format, type, width, height, &ebits, &rowsize);
     if (buf_size > 0) {
-       buf = (char *) malloc( buf_size );
-       if ( !buf ) {
-	  return BadAlloc;
-       }
+        buf = (char *) malloc(buf_size);
+        if (!buf) {
+            return BadAlloc;
+        }
     }
     else {
-       buf_size = 0;
-       buf = NULL;
+        buf_size = 0;
+        buf = NULL;
     }
 
     if (buf_size > 0) {
-       /*
-	* Get the current drawable this context is bound to
-	*/
-       pDraw = __glXLookupDrawableByTag( cl, req->contextTag );
-       win_x1 = pDraw->x + x;
-       win_x2 = win_x1 + width - 1;
-       win_y1 = (dmxGlobalHeight - pDraw->y - pDraw->height) + y;
-       win_y2 = win_y1 + height - 1;
-       if (pDraw->type != DRAWABLE_WINDOW) {
-	  from_screen = to_screen = 0;
-       }
-
-       for (s=from_screen; s<=to_screen; s++) {
-	  DMXScreenInfo *dmxScreen = &dmxScreens[s];
-	  Display *dpy = GetBackEndDisplay(cl,s);
-	  int scr_x1 = dmxScreen->rootXOrigin;
-	  int scr_x2 = dmxScreen->rootXOrigin + dmxScreen->scrnWidth - 1;
-	  int scr_y1 = dmxScreen->rootYOrigin;
-	  int scr_y2 = dmxScreen->rootYOrigin + dmxScreen->scrnHeight - 1;
-	  int wx1, wx2, wy1, wy2;
-	  int sx, sy, sw, sh;
-	  int npixels;
-
-	  /*
-	   * find the window portion that is on the current screen
-	   */
-	  if (pDraw->type == DRAWABLE_WINDOW) {
-	     npixels = intersectRect( scr_x1, scr_x2, scr_y1, scr_y2,
-		   win_x1, win_x2, win_y1, win_y2,
-		   &wx1, &wx2, &wy1, &wy2 );
-	  }
-	  else {
-	     wx1 = win_x1;
-	     wx2 = win_x2;
-	     wy1 = win_y1;
-	     wy2 = win_y2;
-	     npixels = (wx2-wx1+1) * (wy2-wy1+1);
-	  }
-
-   	  if (npixels > 0) {
-
-   	     /* send the request to the back-end server */
-   	     LockDisplay(dpy);
-   	     GetReqExtra(GLXSingle,__GLX_PAD(26),be_req);
-   	     be_req->reqType = dmxScreen->glxMajorOpcode;
-   	     be_req->glxCode = X_GLsop_ReadPixels;
-   	     be_req->contextTag = GetCurrentBackEndTag(cl,req->contextTag,s);
-   	     be_pc = ((GLbyte *)(be_req) + sz_xGLXSingleReq);
-
-   	     sx = wx1 - pDraw->x;
-   	     sy = wy1 - (dmxGlobalHeight - pDraw->y - pDraw->height); 
-   	     sw = (wx2-wx1+1); 
-   	     sh = (wy2-wy1+1); 
-	     
-	     *(GLint *)(be_pc + 0) = sx;    /* x */
-	     *(GLint *)(be_pc + 4) = sy;    /* y */
-	     *(GLsizei *)(be_pc + 8) = sw;    /* width */
-	     *(GLsizei *)(be_pc + 12) = sh;   /* height */
-	     *(GLenum *)(be_pc + 16) = format; 
-	     *(GLenum *)(be_pc + 20) = type;
-	     *(GLboolean *)(be_pc + 24) = swapBytes;
-	     *(GLboolean *)(be_pc + 25) = lsbFirst;
-
-	     _XReply(dpy, (xReply*) &be_reply, 0, False);
-         
-	     if (be_reply.length > 0) {
-		char *be_buf;
-		int be_buf_size = be_reply.length << 2;
-
-		be_buf = (char *) malloc( be_buf_size );
-		if (be_buf) {
-		   _XRead(dpy, be_buf, be_buf_size);
-
-		   /* copy pixels data to the right location of the */
-		   /* reply buffer */
-		   if ( type != GL_BITMAP ) {
-		      int pbytes = ebits / 8;
-		      char *dst = buf + (sy-y)*rowsize + (sx-x)*pbytes;
-		      char *src = be_buf;
-		      int pad = (pbytes * sw) % 4;
-		      int r;
-
-		      for (r=0; r<sh; r++) {
-			 memcpy( dst, src, pbytes*sw );
-			 dst += rowsize;
-			 src += (pbytes*sw + (pad ? 4-pad : 0) );
-		      }
-		   }
-		   else {
-		      /* this is a GL_BITMAP pixel type, should copy bits */
-		      int r;
-		      int src_rowsize = bits_to_bytes(sw * ebits);
-		      int src_pad = src_rowsize % 4;
-                      if ( src_pad ) {
-			 src_rowsize += (4 - src_pad);
-		      }
-
-		      for (r=0; r<sh; r++) {
-			 unsigned char dst_mask = 0x80 >> (sx % 8);
-			 unsigned char src_mask = 0x80;
-			 char *dst = buf + (sy-y+r)*rowsize + (sx-x)/8;
-			 char *src = be_buf + r*src_rowsize;
-			 int b;
-
-			 for (b=0; b<sw*ebits; b++) {
-			    if ( *src & src_mask ) {
-			       *dst |= dst_mask;
-			    }
-			    else {
-			       *dst &= ~dst_mask;
-			    }
-
-			    if (dst_mask > 1) dst_mask >>= 1;
-			    else { 
-			       dst_mask = 0x80;
-			       dst++;
-			    }
-
-			    if (src_mask > 1) src_mask >>= 1;
-			    else {
-			       src_mask = 0x80;
-			       src++;
-			    }
-			 }
-		      }
-
-		   }
-
-		   free( be_buf );
-		}
-		else {
-		   /* Throw data on the floor */
-		   _XEatData(dpy, be_buf_size);
-		   free( buf );
-		   return BadAlloc;
-		}
-	     }
-
-	     UnlockDisplay(dpy);
-	     SyncHandle();
-
-	  } /* of npixels > 0 */ 
-
-       }  /* of for loop */
-
-    } /* of if buf_size > 0 */
+        /*
+         * Get the current drawable this context is bound to
+         */
+        pDraw = __glXLookupDrawableByTag(cl, req->contextTag);
+        win_x1 = pDraw->x + x;
+        win_x2 = win_x1 + width - 1;
+        win_y1 = (dmxGlobalHeight - pDraw->y - pDraw->height) + y;
+        win_y2 = win_y1 + height - 1;
+        if (pDraw->type != DRAWABLE_WINDOW) {
+            from_screen = to_screen = 0;
+        }
+
+        for (s = from_screen; s <= to_screen; s++) {
+            DMXScreenInfo *dmxScreen = &dmxScreens[s];
+            Display *dpy = GetBackEndDisplay(cl, s);
+            int scr_x1 = dmxScreen->rootXOrigin;
+            int scr_x2 = dmxScreen->rootXOrigin + dmxScreen->scrnWidth - 1;
+            int scr_y1 = dmxScreen->rootYOrigin;
+            int scr_y2 = dmxScreen->rootYOrigin + dmxScreen->scrnHeight - 1;
+            int wx1, wx2, wy1, wy2;
+            int sx, sy, sw, sh;
+            int npixels;
+
+            /*
+             * find the window portion that is on the current screen
+             */
+            if (pDraw->type == DRAWABLE_WINDOW) {
+                npixels = intersectRect(scr_x1, scr_x2, scr_y1, scr_y2,
+                                        win_x1, win_x2, win_y1, win_y2,
+                                        &wx1, &wx2, &wy1, &wy2);
+            }
+            else {
+                wx1 = win_x1;
+                wx2 = win_x2;
+                wy1 = win_y1;
+                wy2 = win_y2;
+                npixels = (wx2 - wx1 + 1) * (wy2 - wy1 + 1);
+            }
+
+            if (npixels > 0) {
+
+                /* send the request to the back-end server */
+                LockDisplay(dpy);
+                GetReqExtra(GLXSingle, __GLX_PAD(26), be_req);
+                be_req->reqType = dmxScreen->glxMajorOpcode;
+                be_req->glxCode = X_GLsop_ReadPixels;
+                be_req->contextTag =
+                    GetCurrentBackEndTag(cl, req->contextTag, s);
+                be_pc = ((GLbyte *) (be_req) + sz_xGLXSingleReq);
+
+                sx = wx1 - pDraw->x;
+                sy = wy1 - (dmxGlobalHeight - pDraw->y - pDraw->height);
+                sw = (wx2 - wx1 + 1);
+                sh = (wy2 - wy1 + 1);
+
+                *(GLint *) (be_pc + 0) = sx;    /* x */
+                *(GLint *) (be_pc + 4) = sy;    /* y */
+                *(GLsizei *) (be_pc + 8) = sw;  /* width */
+                *(GLsizei *) (be_pc + 12) = sh; /* height */
+                *(GLenum *) (be_pc + 16) = format;
+                *(GLenum *) (be_pc + 20) = type;
+                *(GLboolean *) (be_pc + 24) = swapBytes;
+                *(GLboolean *) (be_pc + 25) = lsbFirst;
+
+                _XReply(dpy, (xReply *) & be_reply, 0, False);
+
+                if (be_reply.length > 0) {
+                    char *be_buf;
+                    int be_buf_size = be_reply.length << 2;
+
+                    be_buf = (char *) malloc(be_buf_size);
+                    if (be_buf) {
+                        _XRead(dpy, be_buf, be_buf_size);
+
+                        /* copy pixels data to the right location of the */
+                        /* reply buffer */
+                        if (type != GL_BITMAP) {
+                            int pbytes = ebits / 8;
+                            char *dst =
+                                buf + (sy - y) * rowsize + (sx - x) * pbytes;
+                            char *src = be_buf;
+                            int pad = (pbytes * sw) % 4;
+                            int r;
+
+                            for (r = 0; r < sh; r++) {
+                                memcpy(dst, src, pbytes * sw);
+                                dst += rowsize;
+                                src += (pbytes * sw + (pad ? 4 - pad : 0));
+                            }
+                        }
+                        else {
+                            /* this is a GL_BITMAP pixel type, should copy bits */
+                            int r;
+                            int src_rowsize = bits_to_bytes(sw * ebits);
+                            int src_pad = src_rowsize % 4;
+
+                            if (src_pad) {
+                                src_rowsize += (4 - src_pad);
+                            }
+
+                            for (r = 0; r < sh; r++) {
+                                unsigned char dst_mask = 0x80 >> (sx % 8);
+                                unsigned char src_mask = 0x80;
+                                char *dst =
+                                    buf + (sy - y + r) * rowsize + (sx - x) / 8;
+                                char *src = be_buf + r * src_rowsize;
+                                int b;
+
+                                for (b = 0; b < sw * ebits; b++) {
+                                    if (*src & src_mask) {
+                                        *dst |= dst_mask;
+                                    }
+                                    else {
+                                        *dst &= ~dst_mask;
+                                    }
+
+                                    if (dst_mask > 1)
+                                        dst_mask >>= 1;
+                                    else {
+                                        dst_mask = 0x80;
+                                        dst++;
+                                    }
+
+                                    if (src_mask > 1)
+                                        src_mask >>= 1;
+                                    else {
+                                        src_mask = 0x80;
+                                        src++;
+                                    }
+                                }
+                            }
+
+                        }
+
+                        free(be_buf);
+                    }
+                    else {
+                        /* Throw data on the floor */
+                        _XEatData(dpy, be_buf_size);
+                        free(buf);
+                        return BadAlloc;
+                    }
+                }
+
+                UnlockDisplay(dpy);
+                SyncHandle();
+
+            }                   /* of npixels > 0 */
+
+        }                       /* of for loop */
+
+    }                           /* of if buf_size > 0 */
 
     reply.type = X_Reply;
     reply.sequenceNumber = client->sequence;
     reply.length = buf_size >> 2;
 
     if (client->swapped) {
-       __GLX_SWAP_SHORT(&reply.sequenceNumber);
-       __GLX_SWAP_INT(&reply.length);
+        __GLX_SWAP_SHORT(&reply.sequenceNumber);
+        __GLX_SWAP_INT(&reply.length);
     }
 
-    WriteToClient(client, sizeof(xGLXReadPixelsReply),(char *)&reply);
+    WriteToClient(client, sizeof(xGLXReadPixelsReply), (char *) &reply);
     if (buf_size > 0) {
-       WriteToClient(client, buf_size, (char *)buf);
-       free( buf );
+        WriteToClient(client, buf_size, (char *) buf);
+        free(buf);
     }
 
     return Success;
 }
 
-int __glXDispSwap_GetTexImage(__GLXclientState *cl, GLbyte *pc)
+int
+__glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc)
 {
     __GLX_DECLARE_SWAP_VARIABLES;
     GLbyte *lpc = pc;
 
     lpc += sz_xGLXSingleReq;
-    __GLX_SWAP_INT(lpc+0);
-    __GLX_SWAP_INT(lpc+4);
-    __GLX_SWAP_INT(lpc+8);
-    __GLX_SWAP_INT(lpc+12);
+    __GLX_SWAP_INT(lpc + 0);
+    __GLX_SWAP_INT(lpc + 4);
+    __GLX_SWAP_INT(lpc + 8);
+    __GLX_SWAP_INT(lpc + 12);
 
     /* reverse swapBytes */
-    *(GLboolean *)(lpc + 16) = ! *(GLboolean *)(lpc + 16);
+    *(GLboolean *) (lpc + 16) = !*(GLboolean *) (lpc + 16);
 
-    return( __glXForwardPipe0WithReplySwap( cl, pc ) );
+    return (__glXForwardPipe0WithReplySwap(cl, pc));
 }
 
-int __glXDispSwap_GetColorTable(__GLXclientState *cl, GLbyte *pc)
+int
+__glXDispSwap_GetColorTable(__GLXclientState * cl, GLbyte * pc)
 {
     __GLX_DECLARE_SWAP_VARIABLES;
     GLbyte *lpc = pc;
 
     lpc += sz_xGLXSingleReq;
-    __GLX_SWAP_INT(lpc+0);
-    __GLX_SWAP_INT(lpc+4);
-    __GLX_SWAP_INT(lpc+8);
+    __GLX_SWAP_INT(lpc + 0);
+    __GLX_SWAP_INT(lpc + 4);
+    __GLX_SWAP_INT(lpc + 8);
 
     /* reverse swapBytes */
-    *(GLboolean *)(lpc + 12) = ! *(GLboolean *)(lpc + 12);
+    *(GLboolean *) (lpc + 12) = !*(GLboolean *) (lpc + 12);
 
-    return( __glXForwardPipe0WithReplySwap( cl, pc ) );
+    return (__glXForwardPipe0WithReplySwap(cl, pc));
 }
-
-
diff --git a/xorg-server/hw/dmx/glxProxy/glxswap.c b/xorg-server/hw/dmx/glxProxy/glxswap.c
index 1471d8b5f..87a748621 100644
--- a/xorg-server/hw/dmx/glxProxy/glxswap.c
+++ b/xorg-server/hw/dmx/glxProxy/glxswap.c
@@ -1,538 +1,562 @@
-/*

- * Copyright 2003 Red Hat Inc., Raleigh, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Kevin E. Martin <kem@redhat.com>

- *

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxwindow.h"

-#include "glxserver.h"

-#include "glxswap.h"

-

-extern int __glXDoSwapBuffers(__GLXclientState *cl, XID drawId,

-			      GLXContextTag tag);

-

-typedef struct _SwapGroup *SwapGroupPtr;

-

-static Bool SwapBarrierIsReadyToSwap(GLuint barrier);

-static void SwapSwapBarrier(GLuint barrier);

-static void UpdateSwapBarrierList(GLuint barrier,

-				  SwapGroupPtr pOldSwap,

-				  SwapGroupPtr pNewSwap);

-

-

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

- *

- * Swap Groups

- *

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

-

-typedef struct _SwapGroup {

-    WindowPtr         pWin;

-    SwapGroupPtr      pNext;

-

-    Bool              swapping;

-    Bool              sleeping;

-    GLuint            barrier;

-

-    XID               drawable;

-    GLXContextTag     tag;

-    __GLXclientState *clState;

-} SwapGroupRec;

-

-

-static void SwapSwapGroup(SwapGroupPtr pSwap)

-{

-    SwapGroupPtr  pCur;

-

-    /* All drawables in swap group are ready to swap, so just swap all

-     * drawables buffers and then wake up those clients that were

-     * previously sleeping */

-

-    for (pCur = pSwap; pCur; pCur = pCur->pNext) {

-	if (pCur->swapping) {

-	    /* Swap pCur's buffers */

-	    __glXDoSwapBuffers(pCur->clState, pCur->drawable, pCur->tag);

-	    pCur->swapping = FALSE;

-	}

-

-	/* Wakeup client */

-	if (pCur->sleeping) {

-	    ClientWakeup(pCur->clState->client);

-	    pCur->sleeping = FALSE;

-	}

-    }

-}

-

-static Bool SwapGroupIsReadyToSwap(SwapGroupPtr pSwap)

-{

-    Bool  isReady = TRUE;

-

-    /* The swap group is ready to swap when all drawables are ready to

-     * swap.  NOTE: A drawable is also ready to swap if it is not

-     * currently mapped */

-    for (; pSwap; pSwap = pSwap->pNext) {

-	isReady &= (pSwap->swapping || !pSwap->pWin->mapped);

-	/* FIXME: Should we use pSwap->pWin->mapped or ...->realized ??? */

-    }

-

-    return isReady;

-}

-

-static Bool SGSwapCleanup(ClientPtr client, pointer closure)

-{

-    /* SwapGroupPtr  pSwap = (SwapGroupPtr)closure; */

-

-    /* This should not be called unless the client has died in which

-     * case we should remove the buffer from the swap list */

-

-    return TRUE;

-}

-

-int SGSwapBuffers(__GLXclientState *cl, XID drawId, GLXContextTag tag,

-		  DrawablePtr pDraw)

-{

-    WindowPtr      pWin     = (WindowPtr)pDraw;

-    dmxWinPrivPtr  pWinPriv = DMX_GET_WINDOW_PRIV(pWin);

-    SwapGroupPtr   pSwap    = pWinPriv->swapGroup;

-    SwapGroupPtr   pCur;

-

-    for (pCur = pSwap; pCur && pCur->pWin != pWin; pCur = pCur->pNext);

-    if (!pCur)

-	return BadDrawable;

-

-    pCur->clState  = cl;

-    pCur->drawable = drawId;

-    pCur->tag      = tag;

-

-    /* We are now in the process of swapping */

-    pCur->swapping = TRUE;

-

-    if (pSwap->barrier && SwapBarrierIsReadyToSwap(pSwap->barrier)) {

-	/* The swap group is bound to a barrier and the barrier is ready

-	 * to swap, so swap all the swap groups that are bound to this

-	 * group's swap barrier */

-	SwapSwapBarrier(pSwap->barrier);

-    } else if (!pSwap->barrier && SwapGroupIsReadyToSwap(pSwap)) {

-	/* Do the swap if the entire swap group is ready to swap and the

-	 * group is not bound to a swap barrier */

-	SwapSwapGroup(pSwap);

-    } else {

-	/* The swap group/barrier is not yet ready to swap, so put

-	 * client to sleep until the rest are ready to swap */

-	ClientSleep(cl->client, SGSwapCleanup, (pointer)pWin);

-	pCur->sleeping = TRUE;

-    }

-

-    return Success;

-}

-

-static void SGWindowUnmapped(WindowPtr pWin)

-{

-    dmxWinPrivPtr  pWinPriv = DMX_GET_WINDOW_PRIV(pWin);

-    SwapGroupPtr   pSwap    = pWinPriv->swapGroup;

-

-    /* Now that one of the windows in the swap group has been unmapped,

-     * see if the entire swap group/barrier is ready to swap */

-

-    if (pSwap->barrier && SwapBarrierIsReadyToSwap(pSwap->barrier)) {

-	SwapSwapBarrier(pSwap->barrier);

-    } else if (!pSwap->barrier && SwapGroupIsReadyToSwap(pSwap)) {

-	SwapSwapGroup(pSwap);

-    }

-}

-

-static void SGWindowDestroyed(WindowPtr pWin)

-{

-    JoinSwapGroupSGIX((DrawablePtr)pWin, NULL);

-}

-

-static SwapGroupPtr CreateSwapEntry(WindowPtr pWin)

-{

-    SwapGroupPtr  pEntry;

-

-    /* Allocate new swap group */

-    pEntry = malloc(sizeof(*pEntry));

-    if (!pEntry) return NULL;

-

-    /* Initialize swap group */

-    pEntry->pWin     = pWin;

-    pEntry->pNext    = NULL;

-    pEntry->swapping = FALSE;

-    pEntry->sleeping = FALSE;

-    pEntry->barrier  = 0;

-    /* The following are not initialized until SwapBuffers is called:

-     *     pEntry->drawable

-     *     pEntry->tag

-     *     pEntry->clState

-     */

-

-    return pEntry;

-}

-

-static void FreeSwapEntry(SwapGroupPtr pEntry)

-{

-    /* Since we have removed the drawable from its previous swap group

-     * and it won't be added to another swap group, the only thing that

-     * we need to do is to make sure that the drawable's client is not

-     * sleeping.  This could happen if one thread is sleeping, while

-     * another thread called glxJoinSwapGroup().  Note that all sleeping

-     * threads should also be swapping, but there is a small window in

-     * the SGSwapBuffer() logic, above, where swapping can be set but

-     * sleeping is not.  We check both independently here just to be

-     * pedantic. */

-

-    /* Handle swap buffer request */

-    if (pEntry->swapping)

-	__glXDoSwapBuffers(pEntry->clState, pEntry->drawable, pEntry->tag);

-

-    /* Wake up client */

-    if (pEntry->sleeping)

-	ClientWakeup(pEntry->clState->client);

-

-    /* We can free the pEntry entry since it has already been removed

-     * from the swap group list and it won't be needed any longer */

-    free(pEntry);

-}

-

-int JoinSwapGroupSGIX(DrawablePtr pDraw, DrawablePtr pMember)

-{

-    if (pDraw->type == DRAWABLE_WINDOW) {

-	WindowPtr      pWin     = (WindowPtr)pDraw;

-	dmxWinPrivPtr  pWinPriv = DMX_GET_WINDOW_PRIV(pWin);

-	SwapGroupPtr   pOldSwap = NULL;

-	SwapGroupPtr   pEntry;

-

-	/* If pDraw and pMember are already members of the same swap

-	 * group, just return Success since there is nothing to do */

-	for (pEntry = pWinPriv->swapGroup; pEntry; pEntry = pEntry->pNext)

-	    if (pEntry->pWin == (WindowPtr)pMember)

-		return Success;

-

-	/* Remove pDraw from its current swap group */

-	if (pWinPriv->swapGroup) {

-	    SwapGroupPtr  pSwapGroup = pWinPriv->swapGroup;

-	    SwapGroupPtr  pPrev;

-

-	    /* Find old swap entry in swap group and save in pOldSwap

-	     * for later use */

-	    for (pOldSwap = pWinPriv->swapGroup, pPrev = NULL;

-		 pOldSwap && pOldSwap->pWin != pWin;

-		 pPrev = pOldSwap, pOldSwap = pOldSwap->pNext);

-	    if (!pOldSwap)

-		return BadDrawable;

-

-	    /* Remove pDraw's swap group entry from swap group list */

-	    if (pPrev) {

-		pPrev->pNext = pOldSwap->pNext;

-	    } else {

-		/* pWin is at the head of the swap group list, so we

-		 * need to update all other members of this swap

-		 * group */

-		for (pEntry = pOldSwap->pNext; pEntry; pEntry = pEntry->pNext)

-		    DMX_GET_WINDOW_PRIV(pEntry->pWin)->swapGroup

-			= pOldSwap->pNext;

-

-		/* Update the barrier list as well */

-		if (pOldSwap->barrier)

-		    UpdateSwapBarrierList(pOldSwap->barrier,

-					  pOldSwap, pOldSwap->pNext);

-

-		/* Set pSwapGroup to point to the swap group without

-		 * pOldSwap */

-		pSwapGroup = pOldSwap->pNext;

-	    }

-

-	    /* Check to see if current swap group can now swap since we

-	     * know at this point that pDraw and pMember are guaranteed

-	     * to previously be in different swap groups */

-	    if (pSwapGroup && SwapGroupIsReadyToSwap(pSwapGroup)) {

-		SwapSwapGroup(pSwapGroup);

-	    }

-

-	    /* Make the old swap entry a standalone group */

-	    pOldSwap->pNext = NULL;

-	    pOldSwap->barrier = 0;

-

-	    /* Reset pWin's swap group */

-	    pWinPriv->swapGroup = NULL;

-	    pWinPriv->windowDestroyed = NULL;

-	    pWinPriv->windowUnmapped = NULL;

-	}

-

-	if (!pMember || pMember->type != DRAWABLE_WINDOW) {

-	    /* Free old swap group since it is no longer needed */

-	    if (pOldSwap) FreeSwapEntry(pOldSwap);

-	} else if (pDraw == pMember && pOldSwap) {

-	    /* Special case where pDraw was previously created and we

-	     * are now just putting it to its own swap group */

-	    pWinPriv->swapGroup = pOldSwap;

-	    pWinPriv->windowDestroyed = SGWindowDestroyed;

-	    pWinPriv->windowUnmapped = SGWindowUnmapped;

-

-	    /* Check to see if pDraw is ready to swap */

-	    if (SwapGroupIsReadyToSwap(pOldSwap))

-		SwapSwapGroup(pOldSwap);

-	} else if (pMember->type == DRAWABLE_WINDOW) {

-	    WindowPtr      pMemberWin       = (WindowPtr)pMember;

-	    dmxWinPrivPtr  pMemberPriv      = DMX_GET_WINDOW_PRIV(pMemberWin);

-	    SwapGroupPtr   pMemberSwapGroup = pMemberPriv->swapGroup;

-

-	    /* Finally, how we can add pDraw to pMember's swap group */

-

-	    /* If pMember is not currently in a swap group, then create

-	     * one for it since we are just about to add pDraw to it. */

-	    if (!pMemberSwapGroup) {

-		/* Create new swap group */

-		pMemberSwapGroup = CreateSwapEntry(pMemberWin);

-		if (!pMemberSwapGroup) {

-		    if (pOldSwap) FreeSwapEntry(pOldSwap);

-		    return BadAlloc;

-		}

-

-		/* Set pMember's swap group */

-		pMemberPriv->swapGroup = pMemberSwapGroup;

-		pMemberPriv->windowDestroyed = SGWindowDestroyed;

-		pMemberPriv->windowUnmapped = SGWindowUnmapped;

-	    }

-

-	    /* If pDraw == pMember, that means pDraw was not a member of

-	     * a group previously (or it would have been handled by the

-	     * special case above), so no additional work is required

-	     * since we just created a new swap group for pMember (i.e.,

-	     * pDraw). */

-

-	    if (pDraw != pMember) {

-		/* If pDraw was not previously in a swap group, then create

-		 * an entry for it */

-		if (!pOldSwap) {

-		    /* Create new swap group */

-		    pOldSwap = CreateSwapEntry(pWin);

-		    if (!pOldSwap) {

-			/* If we just created a swap group for pMember, we

-			 * need to free it here */

-			if (pMemberSwapGroup->pNext == NULL) {

-			    FreeSwapEntry(pMemberSwapGroup);

-			    pMemberPriv->swapGroup = NULL;

-			}

-			return BadAlloc;

-		    }

-		}

-

-		/* Find last entry in pMember's swap group */

-		for (pEntry = pMemberSwapGroup;

-		     pEntry->pNext;

-		     pEntry = pEntry->pNext);

-

-		/* Add pDraw's swap group entry to pMember's swap group list */

-		pEntry->pNext = pOldSwap;

-

-		/* Add pDraw to pMember's swap barrier */

-		pOldSwap->barrier = pEntry->barrier;

-

-		/* Set pDraw's swap group */

-		pWinPriv->swapGroup = pMemberSwapGroup;

-		pWinPriv->windowDestroyed = SGWindowDestroyed;

-		pWinPriv->windowUnmapped = SGWindowUnmapped;

-	    }

-	}

-    }

-

-    return Success;

-}

-

-

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

- *

- * Swap Barriers

- *

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

-

-#define GLX_MAX_SWAP_BARRIERS 10

-

-typedef struct _SwapBarrier *SwapBarrierPtr;

-typedef struct _SwapBarrier {

-    SwapGroupPtr    pSwap;

-    SwapBarrierPtr  pNext;

-} SwapBarrierRec;

-

-static SwapBarrierPtr SwapBarrierList[GLX_MAX_SWAP_BARRIERS+1];

-

-void SwapBarrierInit(void)

-{

-    int  i;

-

-    for (i = 0; i <= GLX_MAX_SWAP_BARRIERS; i++)

-	SwapBarrierList[i] = NULL;

-}

-

-void SwapBarrierReset(void)

-{

-    int  i;

-

-    for (i = 0; i <= GLX_MAX_SWAP_BARRIERS; i++) {

-	SwapBarrierPtr  pBarrier, pNextBarrier;

-	for (pBarrier = SwapBarrierList[i];

-	     pBarrier;

-	     pBarrier = pNextBarrier) {

-	    pNextBarrier = pBarrier->pNext;

-	    free(pBarrier);

-	}

-	SwapBarrierList[i] = NULL;

-    }

-}

-

-int QueryMaxSwapBarriersSGIX(int screen)

-{

-    return GLX_MAX_SWAP_BARRIERS;

-}

-

-static Bool BindSwapGroupToBarrier(GLuint barrier, SwapGroupPtr pSwapGroup)

-{

-    SwapBarrierPtr  pBarrier;

-

-    pBarrier = malloc(sizeof(*pBarrier));

-    if (!pBarrier) return FALSE;

-

-    /* Add the swap group to barrier's list */

-    pBarrier->pSwap = pSwapGroup;

-    pBarrier->pNext = SwapBarrierList[barrier];

-    SwapBarrierList[barrier] = pBarrier;

-

-    return TRUE;

-}

-

-static Bool UnbindSwapGroupFromBarrier(GLuint barrier, SwapGroupPtr pSwapGroup)

-{

-    SwapBarrierPtr  pBarrier, pPrevBarrier;

-

-    /* Find the swap group in barrier's list */

-    for (pBarrier = SwapBarrierList[barrier], pPrevBarrier = NULL;

-	 pBarrier && pBarrier->pSwap != pSwapGroup;

-	 pPrevBarrier = pBarrier, pBarrier = pBarrier->pNext);

-    if (!pBarrier) return FALSE;

-

-    /* Remove the swap group from barrier's list */

-    if (pPrevBarrier) pPrevBarrier->pNext = pBarrier->pNext;

-    else              SwapBarrierList[barrier] = pBarrier->pNext;

-

-    /* Free memory */

-    free(pBarrier);

-

-    return TRUE;

-}

-

-static void UpdateSwapBarrierList(GLuint barrier,

-				  SwapGroupPtr pOldSwap,

-				  SwapGroupPtr pNewSwap)

-{

-    SwapBarrierPtr  pBarrier;

-

-    /* If the old swap group is being destroyed, then we need to remove

-     * the swap group from the list entirely */

-    if (!pNewSwap) {

-	UnbindSwapGroupFromBarrier(barrier, pOldSwap);

-	return;

-    }

-

-    /* Otherwise, find the old swap group in the barrier list and change

-     * it to the new swap group */

-    for (pBarrier = SwapBarrierList[barrier];

-	 pBarrier;

-	 pBarrier = pBarrier->pNext) {

-	if (pBarrier->pSwap == pOldSwap) {

-	    pBarrier->pSwap = pNewSwap;

-	    return;

-	}

-    }

-}

-

-static Bool SwapBarrierIsReadyToSwap(GLuint barrier)

-{

-    SwapBarrierPtr  pBarrier;

-    Bool            isReady = TRUE;

-

-    /* The swap barier is ready to swap when swap groups that are bound

-     * to barrier are ready to swap */

-    for (pBarrier = SwapBarrierList[barrier];

-	 pBarrier;

-	 pBarrier = pBarrier->pNext)

-	isReady &= SwapGroupIsReadyToSwap(pBarrier->pSwap);

-

-    return isReady;

-}

-

-static void SwapSwapBarrier(GLuint barrier)

-{

-    SwapBarrierPtr  pBarrier;

-

-    /* Swap each group that is a member of this barrier */

-    for (pBarrier = SwapBarrierList[barrier];

-	 pBarrier;

-	 pBarrier = pBarrier->pNext)

-	SwapSwapGroup(pBarrier->pSwap);

-}

-

-int BindSwapBarrierSGIX(DrawablePtr pDraw, int barrier)

-{

-    /* FIXME: Check for errors when pDraw->type != DRAWABLE_WINDOW */

-

-    if (barrier < 0 || barrier > GLX_MAX_SWAP_BARRIERS)

-	return BadValue;

-

-    if (pDraw->type == DRAWABLE_WINDOW) {

-	WindowPtr       pWin       = (WindowPtr)pDraw;

-	dmxWinPrivPtr   pWinPriv   = DMX_GET_WINDOW_PRIV(pWin);

-	SwapGroupPtr    pSwapGroup = pWinPriv->swapGroup;

-	SwapGroupPtr    pCur;

-

-	if (!pSwapGroup) return BadDrawable;

-	if (barrier && pSwapGroup->barrier) return BadValue;

-

-	/* Update the swap barrier list */

-	if (barrier) {

-	    if (!BindSwapGroupToBarrier(barrier, pSwapGroup))

-		return BadAlloc;

-	} else {

-	    if (!UnbindSwapGroupFromBarrier(pSwapGroup->barrier, pSwapGroup))

-		return BadDrawable;

-	}

-

-	/* Set the barrier for each member of this swap group */

-	for (pCur = pSwapGroup; pCur; pCur = pCur->pNext)

-	    pCur->barrier = barrier;

-    }

-

-    return Success;

-}

+/*
+ * Copyright 2003 Red Hat Inc., Raleigh, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxwindow.h"
+#include "glxserver.h"
+#include "glxswap.h"
+
+extern int __glXDoSwapBuffers(__GLXclientState * cl, XID drawId,
+                              GLXContextTag tag);
+
+typedef struct _SwapGroup *SwapGroupPtr;
+
+static Bool SwapBarrierIsReadyToSwap(GLuint barrier);
+static void SwapSwapBarrier(GLuint barrier);
+static void UpdateSwapBarrierList(GLuint barrier,
+                                  SwapGroupPtr pOldSwap, SwapGroupPtr pNewSwap);
+
+/************************************************************************
+ *
+ * Swap Groups
+ *
+ ************************************************************************/
+
+typedef struct _SwapGroup {
+    WindowPtr pWin;
+    SwapGroupPtr pNext;
+
+    Bool swapping;
+    Bool sleeping;
+    GLuint barrier;
+
+    XID drawable;
+    GLXContextTag tag;
+    __GLXclientState *clState;
+} SwapGroupRec;
+
+static void
+SwapSwapGroup(SwapGroupPtr pSwap)
+{
+    SwapGroupPtr pCur;
+
+    /* All drawables in swap group are ready to swap, so just swap all
+     * drawables buffers and then wake up those clients that were
+     * previously sleeping */
+
+    for (pCur = pSwap; pCur; pCur = pCur->pNext) {
+        if (pCur->swapping) {
+            /* Swap pCur's buffers */
+            __glXDoSwapBuffers(pCur->clState, pCur->drawable, pCur->tag);
+            pCur->swapping = FALSE;
+        }
+
+        /* Wakeup client */
+        if (pCur->sleeping) {
+            ClientWakeup(pCur->clState->client);
+            pCur->sleeping = FALSE;
+        }
+    }
+}
+
+static Bool
+SwapGroupIsReadyToSwap(SwapGroupPtr pSwap)
+{
+    Bool isReady = TRUE;
+
+    /* The swap group is ready to swap when all drawables are ready to
+     * swap.  NOTE: A drawable is also ready to swap if it is not
+     * currently mapped */
+    for (; pSwap; pSwap = pSwap->pNext) {
+        isReady &= (pSwap->swapping || !pSwap->pWin->mapped);
+        /* FIXME: Should we use pSwap->pWin->mapped or ...->realized ??? */
+    }
+
+    return isReady;
+}
+
+static Bool
+SGSwapCleanup(ClientPtr client, pointer closure)
+{
+    /* SwapGroupPtr  pSwap = (SwapGroupPtr)closure; */
+
+    /* This should not be called unless the client has died in which
+     * case we should remove the buffer from the swap list */
+
+    return TRUE;
+}
+
+int
+SGSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag,
+              DrawablePtr pDraw)
+{
+    WindowPtr pWin = (WindowPtr) pDraw;
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWin);
+    SwapGroupPtr pSwap = pWinPriv->swapGroup;
+    SwapGroupPtr pCur;
+
+    for (pCur = pSwap; pCur && pCur->pWin != pWin; pCur = pCur->pNext);
+    if (!pCur)
+        return BadDrawable;
+
+    pCur->clState = cl;
+    pCur->drawable = drawId;
+    pCur->tag = tag;
+
+    /* We are now in the process of swapping */
+    pCur->swapping = TRUE;
+
+    if (pSwap->barrier && SwapBarrierIsReadyToSwap(pSwap->barrier)) {
+        /* The swap group is bound to a barrier and the barrier is ready
+         * to swap, so swap all the swap groups that are bound to this
+         * group's swap barrier */
+        SwapSwapBarrier(pSwap->barrier);
+    }
+    else if (!pSwap->barrier && SwapGroupIsReadyToSwap(pSwap)) {
+        /* Do the swap if the entire swap group is ready to swap and the
+         * group is not bound to a swap barrier */
+        SwapSwapGroup(pSwap);
+    }
+    else {
+        /* The swap group/barrier is not yet ready to swap, so put
+         * client to sleep until the rest are ready to swap */
+        ClientSleep(cl->client, SGSwapCleanup, (pointer) pWin);
+        pCur->sleeping = TRUE;
+    }
+
+    return Success;
+}
+
+static void
+SGWindowUnmapped(WindowPtr pWin)
+{
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWin);
+    SwapGroupPtr pSwap = pWinPriv->swapGroup;
+
+    /* Now that one of the windows in the swap group has been unmapped,
+     * see if the entire swap group/barrier is ready to swap */
+
+    if (pSwap->barrier && SwapBarrierIsReadyToSwap(pSwap->barrier)) {
+        SwapSwapBarrier(pSwap->barrier);
+    }
+    else if (!pSwap->barrier && SwapGroupIsReadyToSwap(pSwap)) {
+        SwapSwapGroup(pSwap);
+    }
+}
+
+static void
+SGWindowDestroyed(WindowPtr pWin)
+{
+    JoinSwapGroupSGIX((DrawablePtr) pWin, NULL);
+}
+
+static SwapGroupPtr
+CreateSwapEntry(WindowPtr pWin)
+{
+    SwapGroupPtr pEntry;
+
+    /* Allocate new swap group */
+    pEntry = malloc(sizeof(*pEntry));
+    if (!pEntry)
+        return NULL;
+
+    /* Initialize swap group */
+    pEntry->pWin = pWin;
+    pEntry->pNext = NULL;
+    pEntry->swapping = FALSE;
+    pEntry->sleeping = FALSE;
+    pEntry->barrier = 0;
+    /* The following are not initialized until SwapBuffers is called:
+     *     pEntry->drawable
+     *     pEntry->tag
+     *     pEntry->clState
+     */
+
+    return pEntry;
+}
+
+static void
+FreeSwapEntry(SwapGroupPtr pEntry)
+{
+    /* Since we have removed the drawable from its previous swap group
+     * and it won't be added to another swap group, the only thing that
+     * we need to do is to make sure that the drawable's client is not
+     * sleeping.  This could happen if one thread is sleeping, while
+     * another thread called glxJoinSwapGroup().  Note that all sleeping
+     * threads should also be swapping, but there is a small window in
+     * the SGSwapBuffer() logic, above, where swapping can be set but
+     * sleeping is not.  We check both independently here just to be
+     * pedantic. */
+
+    /* Handle swap buffer request */
+    if (pEntry->swapping)
+        __glXDoSwapBuffers(pEntry->clState, pEntry->drawable, pEntry->tag);
+
+    /* Wake up client */
+    if (pEntry->sleeping)
+        ClientWakeup(pEntry->clState->client);
+
+    /* We can free the pEntry entry since it has already been removed
+     * from the swap group list and it won't be needed any longer */
+    free(pEntry);
+}
+
+int
+JoinSwapGroupSGIX(DrawablePtr pDraw, DrawablePtr pMember)
+{
+    if (pDraw->type == DRAWABLE_WINDOW) {
+        WindowPtr pWin = (WindowPtr) pDraw;
+        dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWin);
+        SwapGroupPtr pOldSwap = NULL;
+        SwapGroupPtr pEntry;
+
+        /* If pDraw and pMember are already members of the same swap
+         * group, just return Success since there is nothing to do */
+        for (pEntry = pWinPriv->swapGroup; pEntry; pEntry = pEntry->pNext)
+            if (pEntry->pWin == (WindowPtr) pMember)
+                return Success;
+
+        /* Remove pDraw from its current swap group */
+        if (pWinPriv->swapGroup) {
+            SwapGroupPtr pSwapGroup = pWinPriv->swapGroup;
+            SwapGroupPtr pPrev;
+
+            /* Find old swap entry in swap group and save in pOldSwap
+             * for later use */
+            for (pOldSwap = pWinPriv->swapGroup, pPrev = NULL;
+                 pOldSwap && pOldSwap->pWin != pWin;
+                 pPrev = pOldSwap, pOldSwap = pOldSwap->pNext);
+            if (!pOldSwap)
+                return BadDrawable;
+
+            /* Remove pDraw's swap group entry from swap group list */
+            if (pPrev) {
+                pPrev->pNext = pOldSwap->pNext;
+            }
+            else {
+                /* pWin is at the head of the swap group list, so we
+                 * need to update all other members of this swap
+                 * group */
+                for (pEntry = pOldSwap->pNext; pEntry; pEntry = pEntry->pNext)
+                    DMX_GET_WINDOW_PRIV(pEntry->pWin)->swapGroup
+                        = pOldSwap->pNext;
+
+                /* Update the barrier list as well */
+                if (pOldSwap->barrier)
+                    UpdateSwapBarrierList(pOldSwap->barrier,
+                                          pOldSwap, pOldSwap->pNext);
+
+                /* Set pSwapGroup to point to the swap group without
+                 * pOldSwap */
+                pSwapGroup = pOldSwap->pNext;
+            }
+
+            /* Check to see if current swap group can now swap since we
+             * know at this point that pDraw and pMember are guaranteed
+             * to previously be in different swap groups */
+            if (pSwapGroup && SwapGroupIsReadyToSwap(pSwapGroup)) {
+                SwapSwapGroup(pSwapGroup);
+            }
+
+            /* Make the old swap entry a standalone group */
+            pOldSwap->pNext = NULL;
+            pOldSwap->barrier = 0;
+
+            /* Reset pWin's swap group */
+            pWinPriv->swapGroup = NULL;
+            pWinPriv->windowDestroyed = NULL;
+            pWinPriv->windowUnmapped = NULL;
+        }
+
+        if (!pMember || pMember->type != DRAWABLE_WINDOW) {
+            /* Free old swap group since it is no longer needed */
+            if (pOldSwap)
+                FreeSwapEntry(pOldSwap);
+        }
+        else if (pDraw == pMember && pOldSwap) {
+            /* Special case where pDraw was previously created and we
+             * are now just putting it to its own swap group */
+            pWinPriv->swapGroup = pOldSwap;
+            pWinPriv->windowDestroyed = SGWindowDestroyed;
+            pWinPriv->windowUnmapped = SGWindowUnmapped;
+
+            /* Check to see if pDraw is ready to swap */
+            if (SwapGroupIsReadyToSwap(pOldSwap))
+                SwapSwapGroup(pOldSwap);
+        }
+        else if (pMember->type == DRAWABLE_WINDOW) {
+            WindowPtr pMemberWin = (WindowPtr) pMember;
+            dmxWinPrivPtr pMemberPriv = DMX_GET_WINDOW_PRIV(pMemberWin);
+            SwapGroupPtr pMemberSwapGroup = pMemberPriv->swapGroup;
+
+            /* Finally, how we can add pDraw to pMember's swap group */
+
+            /* If pMember is not currently in a swap group, then create
+             * one for it since we are just about to add pDraw to it. */
+            if (!pMemberSwapGroup) {
+                /* Create new swap group */
+                pMemberSwapGroup = CreateSwapEntry(pMemberWin);
+                if (!pMemberSwapGroup) {
+                    if (pOldSwap)
+                        FreeSwapEntry(pOldSwap);
+                    return BadAlloc;
+                }
+
+                /* Set pMember's swap group */
+                pMemberPriv->swapGroup = pMemberSwapGroup;
+                pMemberPriv->windowDestroyed = SGWindowDestroyed;
+                pMemberPriv->windowUnmapped = SGWindowUnmapped;
+            }
+
+            /* If pDraw == pMember, that means pDraw was not a member of
+             * a group previously (or it would have been handled by the
+             * special case above), so no additional work is required
+             * since we just created a new swap group for pMember (i.e.,
+             * pDraw). */
+
+            if (pDraw != pMember) {
+                /* If pDraw was not previously in a swap group, then create
+                 * an entry for it */
+                if (!pOldSwap) {
+                    /* Create new swap group */
+                    pOldSwap = CreateSwapEntry(pWin);
+                    if (!pOldSwap) {
+                        /* If we just created a swap group for pMember, we
+                         * need to free it here */
+                        if (pMemberSwapGroup->pNext == NULL) {
+                            FreeSwapEntry(pMemberSwapGroup);
+                            pMemberPriv->swapGroup = NULL;
+                        }
+                        return BadAlloc;
+                    }
+                }
+
+                /* Find last entry in pMember's swap group */
+                for (pEntry = pMemberSwapGroup;
+                     pEntry->pNext; pEntry = pEntry->pNext);
+
+                /* Add pDraw's swap group entry to pMember's swap group list */
+                pEntry->pNext = pOldSwap;
+
+                /* Add pDraw to pMember's swap barrier */
+                pOldSwap->barrier = pEntry->barrier;
+
+                /* Set pDraw's swap group */
+                pWinPriv->swapGroup = pMemberSwapGroup;
+                pWinPriv->windowDestroyed = SGWindowDestroyed;
+                pWinPriv->windowUnmapped = SGWindowUnmapped;
+            }
+        }
+    }
+
+    return Success;
+}
+
+/************************************************************************
+ *
+ * Swap Barriers
+ *
+ ************************************************************************/
+
+#define GLX_MAX_SWAP_BARRIERS 10
+
+typedef struct _SwapBarrier *SwapBarrierPtr;
+typedef struct _SwapBarrier {
+    SwapGroupPtr pSwap;
+    SwapBarrierPtr pNext;
+} SwapBarrierRec;
+
+static SwapBarrierPtr SwapBarrierList[GLX_MAX_SWAP_BARRIERS + 1];
+
+void
+SwapBarrierInit(void)
+{
+    int i;
+
+    for (i = 0; i <= GLX_MAX_SWAP_BARRIERS; i++)
+        SwapBarrierList[i] = NULL;
+}
+
+void
+SwapBarrierReset(void)
+{
+    int i;
+
+    for (i = 0; i <= GLX_MAX_SWAP_BARRIERS; i++) {
+        SwapBarrierPtr pBarrier, pNextBarrier;
+
+        for (pBarrier = SwapBarrierList[i]; pBarrier; pBarrier = pNextBarrier) {
+            pNextBarrier = pBarrier->pNext;
+            free(pBarrier);
+        }
+        SwapBarrierList[i] = NULL;
+    }
+}
+
+int
+QueryMaxSwapBarriersSGIX(int screen)
+{
+    return GLX_MAX_SWAP_BARRIERS;
+}
+
+static Bool
+BindSwapGroupToBarrier(GLuint barrier, SwapGroupPtr pSwapGroup)
+{
+    SwapBarrierPtr pBarrier;
+
+    pBarrier = malloc(sizeof(*pBarrier));
+    if (!pBarrier)
+        return FALSE;
+
+    /* Add the swap group to barrier's list */
+    pBarrier->pSwap = pSwapGroup;
+    pBarrier->pNext = SwapBarrierList[barrier];
+    SwapBarrierList[barrier] = pBarrier;
+
+    return TRUE;
+}
+
+static Bool
+UnbindSwapGroupFromBarrier(GLuint barrier, SwapGroupPtr pSwapGroup)
+{
+    SwapBarrierPtr pBarrier, pPrevBarrier;
+
+    /* Find the swap group in barrier's list */
+    for (pBarrier = SwapBarrierList[barrier], pPrevBarrier = NULL;
+         pBarrier && pBarrier->pSwap != pSwapGroup;
+         pPrevBarrier = pBarrier, pBarrier = pBarrier->pNext);
+    if (!pBarrier)
+        return FALSE;
+
+    /* Remove the swap group from barrier's list */
+    if (pPrevBarrier)
+        pPrevBarrier->pNext = pBarrier->pNext;
+    else
+        SwapBarrierList[barrier] = pBarrier->pNext;
+
+    /* Free memory */
+    free(pBarrier);
+
+    return TRUE;
+}
+
+static void
+UpdateSwapBarrierList(GLuint barrier,
+                      SwapGroupPtr pOldSwap, SwapGroupPtr pNewSwap)
+{
+    SwapBarrierPtr pBarrier;
+
+    /* If the old swap group is being destroyed, then we need to remove
+     * the swap group from the list entirely */
+    if (!pNewSwap) {
+        UnbindSwapGroupFromBarrier(barrier, pOldSwap);
+        return;
+    }
+
+    /* Otherwise, find the old swap group in the barrier list and change
+     * it to the new swap group */
+    for (pBarrier = SwapBarrierList[barrier];
+         pBarrier; pBarrier = pBarrier->pNext) {
+        if (pBarrier->pSwap == pOldSwap) {
+            pBarrier->pSwap = pNewSwap;
+            return;
+        }
+    }
+}
+
+static Bool
+SwapBarrierIsReadyToSwap(GLuint barrier)
+{
+    SwapBarrierPtr pBarrier;
+    Bool isReady = TRUE;
+
+    /* The swap barier is ready to swap when swap groups that are bound
+     * to barrier are ready to swap */
+    for (pBarrier = SwapBarrierList[barrier];
+         pBarrier; pBarrier = pBarrier->pNext)
+        isReady &= SwapGroupIsReadyToSwap(pBarrier->pSwap);
+
+    return isReady;
+}
+
+static void
+SwapSwapBarrier(GLuint barrier)
+{
+    SwapBarrierPtr pBarrier;
+
+    /* Swap each group that is a member of this barrier */
+    for (pBarrier = SwapBarrierList[barrier];
+         pBarrier; pBarrier = pBarrier->pNext)
+        SwapSwapGroup(pBarrier->pSwap);
+}
+
+int
+BindSwapBarrierSGIX(DrawablePtr pDraw, int barrier)
+{
+    /* FIXME: Check for errors when pDraw->type != DRAWABLE_WINDOW */
+
+    if (barrier < 0 || barrier > GLX_MAX_SWAP_BARRIERS)
+        return BadValue;
+
+    if (pDraw->type == DRAWABLE_WINDOW) {
+        WindowPtr pWin = (WindowPtr) pDraw;
+        dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWin);
+        SwapGroupPtr pSwapGroup = pWinPriv->swapGroup;
+        SwapGroupPtr pCur;
+
+        if (!pSwapGroup)
+            return BadDrawable;
+        if (barrier && pSwapGroup->barrier)
+            return BadValue;
+
+        /* Update the swap barrier list */
+        if (barrier) {
+            if (!BindSwapGroupToBarrier(barrier, pSwapGroup))
+                return BadAlloc;
+        }
+        else {
+            if (!UnbindSwapGroupFromBarrier(pSwapGroup->barrier, pSwapGroup))
+                return BadDrawable;
+        }
+
+        /* Set the barrier for each member of this swap group */
+        for (pCur = pSwapGroup; pCur; pCur = pCur->pNext)
+            pCur->barrier = barrier;
+    }
+
+    return Success;
+}
diff --git a/xorg-server/hw/dmx/glxProxy/glxutil.c b/xorg-server/hw/dmx/glxProxy/glxutil.c
index 1b9ad6962..f90dbf141 100644
--- a/xorg-server/hw/dmx/glxProxy/glxutil.c
+++ b/xorg-server/hw/dmx/glxProxy/glxutil.c
@@ -1,34 +1,37 @@
-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

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

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#include "glxserver.h"

-#include "glxutil.h"

-

-void __glXNop(void) {}

+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#include "glxserver.h"
+#include "glxutil.h"
+
+void
+__glXNop(void)
+{
+}
diff --git a/xorg-server/hw/dmx/glxProxy/glxutil.h b/xorg-server/hw/dmx/glxProxy/glxutil.h
index 15237b258..d3c72862d 100644
--- a/xorg-server/hw/dmx/glxProxy/glxutil.h
+++ b/xorg-server/hw/dmx/glxProxy/glxutil.h
@@ -1,42 +1,41 @@
-#ifndef _glxcmds_h_

-#define _glxcmds_h_

-

-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

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

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-extern void __glXNop(void);

-

-/* context helper routines */

-extern __GLXcontext *__glXLookupContextByTag(__GLXclientState*, GLXContextTag);

-extern DrawablePtr __glXLookupDrawableByTag(__GLXclientState *cl, GLXContextTag tag);

-

-

-#endif /* _glxcmds_h_ */

-

+#ifndef _glxcmds_h_
+#define _glxcmds_h_
+
+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+extern void __glXNop(void);
+
+/* context helper routines */
+extern __GLXcontext *__glXLookupContextByTag(__GLXclientState *, GLXContextTag);
+extern DrawablePtr __glXLookupDrawableByTag(__GLXclientState * cl,
+                                            GLXContextTag tag);
+
+#endif                          /* _glxcmds_h_ */
diff --git a/xorg-server/hw/dmx/glxProxy/glxvendor.c b/xorg-server/hw/dmx/glxProxy/glxvendor.c
index 0b6ba4134..963c92e87 100644
--- a/xorg-server/hw/dmx/glxProxy/glxvendor.c
+++ b/xorg-server/hw/dmx/glxProxy/glxvendor.c
@@ -67,7 +67,7 @@
 	dpy->bufptr += SIZEOF(x##name##Req);\
 	dpy->request++
 
-#else  /* non-ANSI C uses empty comment instead of "##" for token concatenation */
+#else                           /* non-ANSI C uses empty comment instead of "##" for token concatenation */
 #define GetReqVendorPrivate(name, req) \
         WORD64ALIGN\
 	if ((dpy->bufptr + SIZEOF(x/**/name/**/Req)) > dpy->bufmax)\
@@ -78,92 +78,93 @@
 	dpy->request++
 #endif
 
-extern Display *GetBackEndDisplay( __GLXclientState *cl, int s );
-extern int GetCurrentBackEndTag(__GLXclientState *cl, GLXContextTag tag, int s);
+extern Display *GetBackEndDisplay(__GLXclientState * cl, int s);
+extern int GetCurrentBackEndTag(__GLXclientState * cl, GLXContextTag tag,
+                                int s);
 
 static int swap_vec_element_size = 0;
 
-static void SendSwappedReply( ClientPtr client,
-                              xGLXVendorPrivReply *reply, 
-			      char *buf,
-			      int   buf_size )
+static void
+SendSwappedReply(ClientPtr client,
+                 xGLXVendorPrivReply * reply, char *buf, int buf_size)
 {
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_SWAP_SHORT(&reply->sequenceNumber);
-   __GLX_SWAP_INT(&reply->length);
-   __GLX_SWAP_INT(&reply->retval);
-   __GLX_SWAP_INT(&reply->size);
-
-   if ( (buf_size == 0) && (swap_vec_element_size > 0) ) {
-      /*
-       * the reply has single component - need to swap pad3
-       */
-      if (swap_vec_element_size == 2) {
-	 __GLX_SWAP_SHORT(&reply->pad3);
-      }
-      else if (swap_vec_element_size == 4) {
-	 __GLX_SWAP_INT(&reply->pad3);
-	 __GLX_SWAP_INT(&reply->pad4);
-      }
-      else if (swap_vec_element_size == 8) {
-	 __GLX_SWAP_DOUBLE(&reply->pad3);
-      }
-   }
-   else if ( (buf_size > 0) && (swap_vec_element_size > 0) ) {
-      /*
-       * the reply has vector of elements which needs to be swapped
-       */
-      int vsize = buf_size / swap_vec_element_size;
-      char *p = buf;
-      int i;
-
-      for (i=0; i<vsize; i++) {
-	 if (swap_vec_element_size == 2) {
-	    __GLX_SWAP_SHORT(p);
-	 }
-	 else if (swap_vec_element_size == 4) {
-	    __GLX_SWAP_INT(p);
-	 }
-	 else if (swap_vec_element_size == 8) {
-	    __GLX_SWAP_DOUBLE(p);
-	 }
-
-	 p += swap_vec_element_size;
-      }
-
-      __GLX_SWAP_INT(&reply->pad3);
-      __GLX_SWAP_INT(&reply->pad4);
-      __GLX_SWAP_INT(&reply->pad5);
-      __GLX_SWAP_INT(&reply->pad6);
-
-   }
-
-    WriteToClient(client, sizeof(xGLXVendorPrivReply),(char *)reply);
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_SWAP_SHORT(&reply->sequenceNumber);
+    __GLX_SWAP_INT(&reply->length);
+    __GLX_SWAP_INT(&reply->retval);
+    __GLX_SWAP_INT(&reply->size);
+
+    if ((buf_size == 0) && (swap_vec_element_size > 0)) {
+        /*
+         * the reply has single component - need to swap pad3
+         */
+        if (swap_vec_element_size == 2) {
+            __GLX_SWAP_SHORT(&reply->pad3);
+        }
+        else if (swap_vec_element_size == 4) {
+            __GLX_SWAP_INT(&reply->pad3);
+            __GLX_SWAP_INT(&reply->pad4);
+        }
+        else if (swap_vec_element_size == 8) {
+            __GLX_SWAP_DOUBLE(&reply->pad3);
+        }
+    }
+    else if ((buf_size > 0) && (swap_vec_element_size > 0)) {
+        /*
+         * the reply has vector of elements which needs to be swapped
+         */
+        int vsize = buf_size / swap_vec_element_size;
+        char *p = buf;
+        int i;
+
+        for (i = 0; i < vsize; i++) {
+            if (swap_vec_element_size == 2) {
+                __GLX_SWAP_SHORT(p);
+            }
+            else if (swap_vec_element_size == 4) {
+                __GLX_SWAP_INT(p);
+            }
+            else if (swap_vec_element_size == 8) {
+                __GLX_SWAP_DOUBLE(p);
+            }
+
+            p += swap_vec_element_size;
+        }
+
+        __GLX_SWAP_INT(&reply->pad3);
+        __GLX_SWAP_INT(&reply->pad4);
+        __GLX_SWAP_INT(&reply->pad5);
+        __GLX_SWAP_INT(&reply->pad6);
+
+    }
+
+    WriteToClient(client, sizeof(xGLXVendorPrivReply), (char *) reply);
     if (buf_size > 0)
-       WriteToClient(client, buf_size, (char *)buf);
+        WriteToClient(client, buf_size, (char *) buf);
 
 }
 
-int __glXVForwardSingleReq( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardSingleReq(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   xGLXVendorPrivateReq *be_req;
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq *be_req;
     __GLXcontext *glxc;
-   int from_screen = 0;
-   int to_screen = 0;
-   int buf_size;
-   int s;
+    int from_screen = 0;
+    int to_screen = 0;
+    int buf_size;
+    int s;
 
     glxc = __glXLookupContextByTag(cl, req->contextTag);
     if (!glxc) {
-	return 0;
+        return 0;
     }
     from_screen = to_screen = glxc->pScreen->myNum;
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
@@ -173,43 +174,44 @@ int __glXVForwardSingleReq( __GLXclientState *cl, GLbyte *pc )
     /*
      * just forward the request to back-end server(s)
      */
-    for (s=from_screen; s<=to_screen; s++) {
-       DMXScreenInfo *dmxScreen = &dmxScreens[s];
-       Display *dpy = GetBackEndDisplay(cl,s);
-
-       LockDisplay(dpy);
-       GetReqVendorPrivate(GLXVendorPrivate,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = req->glxCode;
-       be_req->length = req->length;
-       be_req->vendorCode = req->vendorCode;
-       be_req->contextTag = GetCurrentBackEndTag(cl,req->contextTag,s);
-       if (buf_size > 0) 
-	  _XSend(dpy, (const char *)pc, buf_size);
-       UnlockDisplay(dpy);
-       SyncHandle();
+    for (s = from_screen; s <= to_screen; s++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[s];
+        Display *dpy = GetBackEndDisplay(cl, s);
+
+        LockDisplay(dpy);
+        GetReqVendorPrivate(GLXVendorPrivate, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = req->glxCode;
+        be_req->length = req->length;
+        be_req->vendorCode = req->vendorCode;
+        be_req->contextTag = GetCurrentBackEndTag(cl, req->contextTag, s);
+        if (buf_size > 0)
+            _XSend(dpy, (const char *) pc, buf_size);
+        UnlockDisplay(dpy);
+        SyncHandle();
     }
 
     return Success;
 }
 
-int __glXVForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardPipe0WithReply(__GLXclientState * cl, GLbyte * pc)
 {
-   ClientPtr client = cl->client;
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   xGLXVendorPrivateReq *be_req;
-   xGLXVendorPrivReply reply;
-   xGLXVendorPrivReply be_reply;
+    ClientPtr client = cl->client;
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq *be_req;
+    xGLXVendorPrivReply reply;
+    xGLXVendorPrivReply be_reply;
     __GLXcontext *glxc;
-   int buf_size;
-   char *be_buf = NULL;
-   int   be_buf_size;
-   DMXScreenInfo *dmxScreen;
-   Display *dpy;
+    int buf_size;
+    char *be_buf = NULL;
+    int be_buf_size;
+    DMXScreenInfo *dmxScreen;
+    Display *dpy;
 
     glxc = __glXLookupContextByTag(cl, req->contextTag);
     if (!glxc) {
-	return __glXBadContext;
+        return __glXBadContext;
     }
 
     pc += sz_xGLXVendorPrivateReq;
@@ -222,30 +224,31 @@ int __glXVForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc )
      * send the request to the first back-end server
      */
     LockDisplay(dpy);
-    GetReqVendorPrivate(GLXVendorPrivate,be_req);
+    GetReqVendorPrivate(GLXVendorPrivate, be_req);
     be_req->reqType = dmxScreen->glxMajorOpcode;
     be_req->glxCode = req->glxCode;
     be_req->length = req->length;
     be_req->vendorCode = req->vendorCode;
-    be_req->contextTag = GetCurrentBackEndTag(cl,req->contextTag, glxc->pScreen->myNum);
-    if (buf_size > 0) 
-       _XSend(dpy, (const char *)pc, buf_size);
+    be_req->contextTag =
+        GetCurrentBackEndTag(cl, req->contextTag, glxc->pScreen->myNum);
+    if (buf_size > 0)
+        _XSend(dpy, (const char *) pc, buf_size);
 
     /*
      * get the reply from the back-end server
      */
-    _XReply(dpy, (xReply*) &be_reply, 0, False);
+    _XReply(dpy, (xReply *) & be_reply, 0, False);
     be_buf_size = be_reply.length << 2;
     if (be_buf_size > 0) {
-       be_buf = (char *)malloc( be_buf_size );
-       if (be_buf) {
-	  _XRead(dpy, be_buf, be_buf_size);
-       }
-       else {
-	  /* Throw data on the floor */
-	  _XEatData(dpy, be_buf_size);
-	  return BadAlloc;
-       }
+        be_buf = (char *) malloc(be_buf_size);
+        if (be_buf) {
+            _XRead(dpy, be_buf, be_buf_size);
+        }
+        else {
+            /* Throw data on the floor */
+            _XEatData(dpy, be_buf_size);
+            return BadAlloc;
+        }
     }
 
     UnlockDisplay(dpy);
@@ -254,52 +257,54 @@ int __glXVForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc )
     /*
      * send the reply to the client
      */
-    memcpy( &reply, &be_reply, sz_xGLXVendorPrivReply );
+    memcpy(&reply, &be_reply, sz_xGLXVendorPrivReply);
     reply.type = X_Reply;
     reply.sequenceNumber = client->sequence;
 
     if (client->swapped) {
-       SendSwappedReply( client, &reply, be_buf, be_buf_size );
+        SendSwappedReply(client, &reply, be_buf, be_buf_size);
     }
     else {
-       WriteToClient(client, sizeof(xGLXVendorPrivReply),(char *)&reply);
-       if (be_buf_size > 0)
-	  WriteToClient(client, be_buf_size, (char *)be_buf);
+        WriteToClient(client, sizeof(xGLXVendorPrivReply), (char *) &reply);
+        if (be_buf_size > 0)
+            WriteToClient(client, be_buf_size, (char *) be_buf);
     }
 
-    if (be_buf_size > 0) free(be_buf);
+    if (be_buf_size > 0)
+        free(be_buf);
 
     return Success;
 }
 
-int __glXVForwardAllWithReply( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardAllWithReply(__GLXclientState * cl, GLbyte * pc)
 {
-   ClientPtr client = cl->client;
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   xGLXVendorPrivateReq *be_req;
-   xGLXVendorPrivReply reply;
-   xGLXVendorPrivReply be_reply;
+    ClientPtr client = cl->client;
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq *be_req;
+    xGLXVendorPrivReply reply;
+    xGLXVendorPrivReply be_reply;
     __GLXcontext *glxc;
-   int buf_size;
-   char *be_buf = NULL;
-   int   be_buf_size = 0;
-   int from_screen = 0;
-   int to_screen = 0;
-   int s;
+    int buf_size;
+    char *be_buf = NULL;
+    int be_buf_size = 0;
+    int from_screen = 0;
+    int to_screen = 0;
+    int s;
 
-   DMXScreenInfo *dmxScreen;
-   Display *dpy;
+    DMXScreenInfo *dmxScreen;
+    Display *dpy;
 
     glxc = __glXLookupContextByTag(cl, req->contextTag);
     if (!glxc) {
-	return 0;
+        return 0;
     }
     from_screen = to_screen = glxc->pScreen->myNum;
 
 #ifdef PANORAMIX
     if (!noPanoramiXExtension) {
-       from_screen = 0;
-       to_screen = screenInfo.numScreens - 1;
+        from_screen = 0;
+        to_screen = screenInfo.numScreens - 1;
     }
 #endif
 
@@ -309,277 +314,303 @@ int __glXVForwardAllWithReply( __GLXclientState *cl, GLbyte *pc )
     /* 
      * send the request to the first back-end server(s)
      */
-    for (s=to_screen; s>=from_screen; s--) {
-       dmxScreen = &dmxScreens[s];
-       dpy = GetBackEndDisplay(cl,s);
-
-       LockDisplay(dpy);
-       GetReqVendorPrivate(GLXVendorPrivate,be_req);
-       be_req->reqType = dmxScreen->glxMajorOpcode;
-       be_req->glxCode = req->glxCode;
-       be_req->length = req->length;
-       be_req->vendorCode = req->vendorCode;
-       be_req->contextTag = GetCurrentBackEndTag(cl,req->contextTag,s);
-       if (buf_size > 0) 
-	  _XSend(dpy, (const char *)pc, buf_size);
-
-       /*
-	* get the reply from the back-end server
-	*/
-       _XReply(dpy, (xReply*) &be_reply, 0, False);
-       be_buf_size = be_reply.length << 2;
-       if (be_buf_size > 0) {
-	  be_buf = (char *)malloc( be_buf_size );
-	  if (be_buf) {
-	     _XRead(dpy, be_buf, be_buf_size);
-	  }
-	  else {
-	     /* Throw data on the floor */
-	     _XEatData(dpy, be_buf_size);
-	     return BadAlloc;
-	  }
-       }
-
-       UnlockDisplay(dpy);
-       SyncHandle();
-
-       if (s > from_screen && be_buf_size > 0) {
-	  free(be_buf);
-       }
+    for (s = to_screen; s >= from_screen; s--) {
+        dmxScreen = &dmxScreens[s];
+        dpy = GetBackEndDisplay(cl, s);
+
+        LockDisplay(dpy);
+        GetReqVendorPrivate(GLXVendorPrivate, be_req);
+        be_req->reqType = dmxScreen->glxMajorOpcode;
+        be_req->glxCode = req->glxCode;
+        be_req->length = req->length;
+        be_req->vendorCode = req->vendorCode;
+        be_req->contextTag = GetCurrentBackEndTag(cl, req->contextTag, s);
+        if (buf_size > 0)
+            _XSend(dpy, (const char *) pc, buf_size);
+
+        /*
+         * get the reply from the back-end server
+         */
+        _XReply(dpy, (xReply *) & be_reply, 0, False);
+        be_buf_size = be_reply.length << 2;
+        if (be_buf_size > 0) {
+            be_buf = (char *) malloc(be_buf_size);
+            if (be_buf) {
+                _XRead(dpy, be_buf, be_buf_size);
+            }
+            else {
+                /* Throw data on the floor */
+                _XEatData(dpy, be_buf_size);
+                return BadAlloc;
+            }
+        }
+
+        UnlockDisplay(dpy);
+        SyncHandle();
+
+        if (s > from_screen && be_buf_size > 0) {
+            free(be_buf);
+        }
     }
 
     /*
      * send the reply to the client
      */
-    memcpy( &reply, &be_reply, sz_xGLXVendorPrivReply );
+    memcpy(&reply, &be_reply, sz_xGLXVendorPrivReply);
     reply.type = X_Reply;
     reply.sequenceNumber = client->sequence;
 
     if (client->swapped) {
-       SendSwappedReply( client, &reply, be_buf, be_buf_size );
+        SendSwappedReply(client, &reply, be_buf, be_buf_size);
     }
     else {
-       WriteToClient(client, sizeof(xGLXVendorPrivReply),(char *)&reply);
-       if (be_buf_size > 0)
-	  WriteToClient(client, be_buf_size, (char *)be_buf);
+        WriteToClient(client, sizeof(xGLXVendorPrivReply), (char *) &reply);
+        if (be_buf_size > 0)
+            WriteToClient(client, be_buf_size, (char *) be_buf);
     }
 
-    if (be_buf_size > 0) free(be_buf);
+    if (be_buf_size > 0)
+        free(be_buf);
 
     return Success;
 }
 
-int __glXVForwardSingleReqSwap( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardSingleReqSwap(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
 
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->vendorCode);
-   __GLX_SWAP_INT(&req->contextTag);
+    __GLX_DECLARE_SWAP_VARIABLES;
 
-   swap_vec_element_size = 0;
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->vendorCode);
+    __GLX_SWAP_INT(&req->contextTag);
 
-   return( __glXVForwardSingleReq( cl, pc ) );
+    swap_vec_element_size = 0;
+
+    return (__glXVForwardSingleReq(cl, pc));
 }
 
-int __glXVForwardPipe0WithReplySwap( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardPipe0WithReplySwap(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->vendorCode);
-   __GLX_SWAP_INT(&req->contextTag);
-
-   swap_vec_element_size = 0;
-
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXVendorPrivateReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXVendorPrivateReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
-
-   return( __glXVForwardPipe0WithReply( cl, pc ) );
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->vendorCode);
+    __GLX_SWAP_INT(&req->contextTag);
+
+    swap_vec_element_size = 0;
+
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXVendorPrivateReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXVendorPrivateReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXVForwardPipe0WithReply(cl, pc));
 }
 
-int __glXVForwardPipe0WithReplySwapsv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardPipe0WithReplySwapsv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->vendorCode);
-   __GLX_SWAP_INT(&req->contextTag);
-
-   swap_vec_element_size = 2;
-
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXVendorPrivateReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXVendorPrivateReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
-
-   return( __glXVForwardPipe0WithReply( cl, pc ) );
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->vendorCode);
+    __GLX_SWAP_INT(&req->contextTag);
+
+    swap_vec_element_size = 2;
+
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXVendorPrivateReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXVendorPrivateReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXVForwardPipe0WithReply(cl, pc));
 }
 
-int __glXVForwardPipe0WithReplySwapiv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardPipe0WithReplySwapiv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->vendorCode);
-   __GLX_SWAP_INT(&req->contextTag);
-
-   swap_vec_element_size = 4;
-
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXVendorPrivateReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXVendorPrivateReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
-
-   return( __glXVForwardPipe0WithReply( cl, pc ) );
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->vendorCode);
+    __GLX_SWAP_INT(&req->contextTag);
+
+    swap_vec_element_size = 4;
+
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXVendorPrivateReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXVendorPrivateReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXVForwardPipe0WithReply(cl, pc));
 }
 
-int __glXVForwardPipe0WithReplySwapdv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardPipe0WithReplySwapdv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->vendorCode);
-   __GLX_SWAP_INT(&req->contextTag);
-
-   swap_vec_element_size = 8;
-
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXVendorPrivateReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXVendorPrivateReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
-
-   return( __glXVForwardPipe0WithReply( cl, pc ) );
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->vendorCode);
+    __GLX_SWAP_INT(&req->contextTag);
+
+    swap_vec_element_size = 8;
+
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXVendorPrivateReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXVendorPrivateReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXVForwardPipe0WithReply(cl, pc));
 }
 
-int __glXVForwardAllWithReplySwap( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardAllWithReplySwap(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->vendorCode);
-   __GLX_SWAP_INT(&req->contextTag);
-
-   swap_vec_element_size = 0;
-
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXVendorPrivateReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXVendorPrivateReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
-
-   return( __glXVForwardAllWithReply( cl, pc ) );
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->vendorCode);
+    __GLX_SWAP_INT(&req->contextTag);
+
+    swap_vec_element_size = 0;
+
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXVendorPrivateReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXVendorPrivateReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXVForwardAllWithReply(cl, pc));
 }
 
-int __glXVForwardAllWithReplySwapsv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardAllWithReplySwapsv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->vendorCode);
-   __GLX_SWAP_INT(&req->contextTag);
-
-   swap_vec_element_size = 2;
-
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXVendorPrivateReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXVendorPrivateReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
-
-   return( __glXVForwardAllWithReply( cl, pc ) );
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->vendorCode);
+    __GLX_SWAP_INT(&req->contextTag);
+
+    swap_vec_element_size = 2;
+
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXVendorPrivateReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXVendorPrivateReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXVForwardAllWithReply(cl, pc));
 }
 
-int __glXVForwardAllWithReplySwapiv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardAllWithReplySwapiv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->vendorCode);
-   __GLX_SWAP_INT(&req->contextTag);
-
-   swap_vec_element_size = 4;
-
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXVendorPrivateReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXVendorPrivateReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
-
-   return( __glXVForwardAllWithReply( cl, pc ) );
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->vendorCode);
+    __GLX_SWAP_INT(&req->contextTag);
+
+    swap_vec_element_size = 4;
+
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXVendorPrivateReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXVendorPrivateReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXVForwardAllWithReply(cl, pc));
 }
 
-int __glXVForwardAllWithReplySwapdv( __GLXclientState *cl, GLbyte *pc )
+int
+__glXVForwardAllWithReplySwapdv(__GLXclientState * cl, GLbyte * pc)
 {
-   xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
-   __GLX_DECLARE_SWAP_VARIABLES;
-   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
-
-   __GLX_SWAP_SHORT(&req->length);
-   __GLX_SWAP_INT(&req->vendorCode);
-   __GLX_SWAP_INT(&req->contextTag);
-
-   swap_vec_element_size = 8;
-
-   /*
-    * swap extra data in request - assuming all data
-    * (if available) are arrays of 4 bytes components !
-    */
-   if (req->length > sz_xGLXVendorPrivateReq/4) {
-      int *data = (int *)(req+1);
-      int count = req->length - sz_xGLXVendorPrivateReq/4;
-      __GLX_SWAP_INT_ARRAY(data, count );
-   }
-
-   return( __glXVForwardAllWithReply( cl, pc ) );
-}
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
 
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->vendorCode);
+    __GLX_SWAP_INT(&req->contextTag);
+
+    swap_vec_element_size = 8;
+
+    /*
+     * swap extra data in request - assuming all data
+     * (if available) are arrays of 4 bytes components !
+     */
+    if (req->length > sz_xGLXVendorPrivateReq / 4) {
+        int *data = (int *) (req + 1);
+        int count = req->length - sz_xGLXVendorPrivateReq / 4;
+
+        __GLX_SWAP_INT_ARRAY(data, count);
+    }
+
+    return (__glXVForwardAllWithReply(cl, pc));
+}
diff --git a/xorg-server/hw/dmx/glxProxy/glxvendor.h b/xorg-server/hw/dmx/glxProxy/glxvendor.h
index fbc901cef..0d160ab9f 100644
--- a/xorg-server/hw/dmx/glxProxy/glxvendor.h
+++ b/xorg-server/hw/dmx/glxProxy/glxvendor.h
@@ -31,20 +31,23 @@
 #ifndef __GLXVENDOR_H
 #define __GLXVENDOR_H
 
-extern int __glXVForwardSingleReq( __GLXclientState *cl, GLbyte *pc );
-extern int __glXVForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc );
-extern int __glXVForwardAllWithReply( __GLXclientState *cl, GLbyte *pc );
+extern int __glXVForwardSingleReq(__GLXclientState * cl, GLbyte * pc);
+extern int __glXVForwardPipe0WithReply(__GLXclientState * cl, GLbyte * pc);
+extern int __glXVForwardAllWithReply(__GLXclientState * cl, GLbyte * pc);
 
-extern int __glXVForwardSingleReqSwap( __GLXclientState *cl, GLbyte *pc );
+extern int __glXVForwardSingleReqSwap(__GLXclientState * cl, GLbyte * pc);
 
-extern int __glXVForwardPipe0WithReplySwap( __GLXclientState *cl, GLbyte *pc );
-extern int __glXVForwardPipe0WithReplySwapsv( __GLXclientState *cl, GLbyte *pc );
-extern int __glXVForwardPipe0WithReplySwapiv( __GLXclientState *cl, GLbyte *pc );
-extern int __glXVForwardPipe0WithReplySwapdv( __GLXclientState *cl, GLbyte *pc );
+extern int __glXVForwardPipe0WithReplySwap(__GLXclientState * cl, GLbyte * pc);
+extern int __glXVForwardPipe0WithReplySwapsv(__GLXclientState * cl,
+                                             GLbyte * pc);
+extern int __glXVForwardPipe0WithReplySwapiv(__GLXclientState * cl,
+                                             GLbyte * pc);
+extern int __glXVForwardPipe0WithReplySwapdv(__GLXclientState * cl,
+                                             GLbyte * pc);
 
-extern int __glXVForwardAllWithReplySwap( __GLXclientState *cl, GLbyte *pc );
-extern int __glXVForwardAllWithReplySwapsv( __GLXclientState *cl, GLbyte *pc );
-extern int __glXVForwardAllWithReplySwapiv( __GLXclientState *cl, GLbyte *pc );
-extern int __glXVForwardAllWithReplySwapdv( __GLXclientState *cl, GLbyte *pc );
+extern int __glXVForwardAllWithReplySwap(__GLXclientState * cl, GLbyte * pc);
+extern int __glXVForwardAllWithReplySwapsv(__GLXclientState * cl, GLbyte * pc);
+extern int __glXVForwardAllWithReplySwapiv(__GLXclientState * cl, GLbyte * pc);
+extern int __glXVForwardAllWithReplySwapdv(__GLXclientState * cl, GLbyte * pc);
 
 #endif
diff --git a/xorg-server/hw/dmx/glxProxy/glxvisuals.c b/xorg-server/hw/dmx/glxProxy/glxvisuals.c
index ae5e86772..3fca04f0d 100644
--- a/xorg-server/hw/dmx/glxProxy/glxvisuals.c
+++ b/xorg-server/hw/dmx/glxProxy/glxvisuals.c
@@ -1,152 +1,158 @@
-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

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

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "glxserver.h"

-#include "glxvisuals.h"

-

-int glxVisualsMatch( __GLXvisualConfig *v1, __GLXvisualConfig *v2 )

-{

-      if ( (v1->class == v2->class) &&

-           (v1->rgba == v2->rgba) &&

-	   (v1->redSize == v2->redSize) &&

-	   (v1->greenSize == v2->greenSize) &&

-	   (v1->blueSize == v2->blueSize) &&

-	   (v1->alphaSize == v2->alphaSize) &&

-	   (v1->redMask == v2->redMask) &&

-	   (v1->greenMask == v2->greenMask) &&

-	   (v1->blueMask == v2->blueMask) &&

-	   (v1->alphaMask == v2->alphaMask) &&

-	   (v1->accumRedSize == v2->accumRedSize) &&

-	   (v1->accumGreenSize == v2->accumGreenSize) &&

-	   (v1->accumBlueSize == v2->accumBlueSize) &&

-	   (v1->accumAlphaSize == v2->accumAlphaSize) &&

-	   (v1->doubleBuffer == v2->doubleBuffer) &&

-	   (v1->stereo == v2->stereo) &&

-	   (v1->bufferSize == v2->bufferSize) &&

-	   (v1->depthSize == v2->depthSize) &&

-	   (v1->stencilSize == v2->stencilSize) &&

-	   (v1->auxBuffers == v2->auxBuffers) &&

-	   (v1->level == v2->level) &&

-	   (v1->visualRating == v2->visualRating) &&

-	   (v1->transparentPixel == v2->transparentPixel) &&

-	   (v1->transparentRed == v2->transparentRed) &&

-	   (v1->transparentGreen == v2->transparentGreen) &&

-	   (v1->transparentBlue == v2->transparentBlue) &&

-	   (v1->transparentAlpha == v2->transparentAlpha) &&

-	   (v1->transparentIndex == v2->transparentIndex) &&

-	   (v1->multiSampleSize == v2->multiSampleSize) &&

-	   (v1->nMultiSampleBuffers == v2->nMultiSampleBuffers) &&

-	   (v1->visualSelectGroup == v2->visualSelectGroup)         ) {

-

-	      return 1;

-

-      }

-

-      return 0;

-

-}

-

-VisualID glxMatchGLXVisualInConfigList( __GLXvisualConfig *pGlxVisual, __GLXvisualConfig *configs, int nconfigs )

-{

-    int i;

-

-    for (i=0; i<nconfigs; i++) {

-

-       if (glxVisualsMatch( pGlxVisual, &configs[i] )) {

-

-	  return configs[i].vid;

-

-       }

-    }

-

-    return 0;

-}

-

-VisualID glxMatchVisualInConfigList( ScreenPtr pScreen, VisualPtr pVisual, __GLXvisualConfig *configs, int nconfigs )

-{

-    __GLXscreenInfo *pGlxScreen;

-    __GLXvisualConfig *pGlxVisual;

-    int i;

-

-    /* check that the glx extension has been initialized */

-    if ( !__glXActiveScreens ) 

-       return 0;

-

-    pGlxScreen = &__glXActiveScreens[pScreen->myNum];

-    pGlxVisual = pGlxScreen->pGlxVisual;

-

-    /* find the glx visual info for pVisual */

-    for (i = 0; i < pGlxScreen->numVisuals; i++, pGlxVisual++) {

-	if (pGlxVisual->vid == pVisual->vid) {

-	    break;

-	}

-    }

-    if (i == pGlxScreen->numVisuals) {

-	/*

-	 * the visual is not supported by glx

-	 */

-        return 0;

-    }

-

-    return( glxMatchGLXVisualInConfigList(pGlxVisual, configs, nconfigs) );

-}

-

-VisualPtr glxMatchVisual( ScreenPtr pScreen, VisualPtr pVisual, ScreenPtr pMatchScreen )

-{

-    __GLXscreenInfo *pGlxScreen2;

-    int j;

-    VisualID vid;

-

-    /* check that the glx extension has been initialized */

-    if ( !__glXActiveScreens ) 

-       return NULL;

-

-    pGlxScreen2 = &__glXActiveScreens[pMatchScreen->myNum];

-

-    vid = glxMatchVisualInConfigList( pScreen, pVisual,

-                                      pGlxScreen2->pGlxVisual,

-				      pGlxScreen2->numVisuals );

-    if (vid) {

-       /*

-    	* find the X visual of the matching glx visual

-	*/

-       for (j=0; j<pMatchScreen->numVisuals; j++) {

-	  if (vid == pMatchScreen->visuals[j].vid) {

-	     return &pMatchScreen->visuals[j];

-	  }

-       }

-    }

-

-    return 0;

-}

+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "glxserver.h"
+#include "glxvisuals.h"
+
+int
+glxVisualsMatch(__GLXvisualConfig * v1, __GLXvisualConfig * v2)
+{
+    if ((v1->class == v2->class) &&
+        (v1->rgba == v2->rgba) &&
+        (v1->redSize == v2->redSize) &&
+        (v1->greenSize == v2->greenSize) &&
+        (v1->blueSize == v2->blueSize) &&
+        (v1->alphaSize == v2->alphaSize) &&
+        (v1->redMask == v2->redMask) &&
+        (v1->greenMask == v2->greenMask) &&
+        (v1->blueMask == v2->blueMask) &&
+        (v1->alphaMask == v2->alphaMask) &&
+        (v1->accumRedSize == v2->accumRedSize) &&
+        (v1->accumGreenSize == v2->accumGreenSize) &&
+        (v1->accumBlueSize == v2->accumBlueSize) &&
+        (v1->accumAlphaSize == v2->accumAlphaSize) &&
+        (v1->doubleBuffer == v2->doubleBuffer) &&
+        (v1->stereo == v2->stereo) &&
+        (v1->bufferSize == v2->bufferSize) &&
+        (v1->depthSize == v2->depthSize) &&
+        (v1->stencilSize == v2->stencilSize) &&
+        (v1->auxBuffers == v2->auxBuffers) &&
+        (v1->level == v2->level) &&
+        (v1->visualRating == v2->visualRating) &&
+        (v1->transparentPixel == v2->transparentPixel) &&
+        (v1->transparentRed == v2->transparentRed) &&
+        (v1->transparentGreen == v2->transparentGreen) &&
+        (v1->transparentBlue == v2->transparentBlue) &&
+        (v1->transparentAlpha == v2->transparentAlpha) &&
+        (v1->transparentIndex == v2->transparentIndex) &&
+        (v1->multiSampleSize == v2->multiSampleSize) &&
+        (v1->nMultiSampleBuffers == v2->nMultiSampleBuffers) &&
+        (v1->visualSelectGroup == v2->visualSelectGroup)) {
+
+        return 1;
+
+    }
+
+    return 0;
+
+}
+
+VisualID
+glxMatchGLXVisualInConfigList(__GLXvisualConfig * pGlxVisual,
+                              __GLXvisualConfig * configs, int nconfigs)
+{
+    int i;
+
+    for (i = 0; i < nconfigs; i++) {
+
+        if (glxVisualsMatch(pGlxVisual, &configs[i])) {
+
+            return configs[i].vid;
+
+        }
+    }
+
+    return 0;
+}
+
+VisualID
+glxMatchVisualInConfigList(ScreenPtr pScreen, VisualPtr pVisual,
+                           __GLXvisualConfig * configs, int nconfigs)
+{
+    __GLXscreenInfo *pGlxScreen;
+    __GLXvisualConfig *pGlxVisual;
+    int i;
+
+    /* check that the glx extension has been initialized */
+    if (!__glXActiveScreens)
+        return 0;
+
+    pGlxScreen = &__glXActiveScreens[pScreen->myNum];
+    pGlxVisual = pGlxScreen->pGlxVisual;
+
+    /* find the glx visual info for pVisual */
+    for (i = 0; i < pGlxScreen->numVisuals; i++, pGlxVisual++) {
+        if (pGlxVisual->vid == pVisual->vid) {
+            break;
+        }
+    }
+    if (i == pGlxScreen->numVisuals) {
+        /*
+         * the visual is not supported by glx
+         */
+        return 0;
+    }
+
+    return (glxMatchGLXVisualInConfigList(pGlxVisual, configs, nconfigs));
+}
+
+VisualPtr
+glxMatchVisual(ScreenPtr pScreen, VisualPtr pVisual, ScreenPtr pMatchScreen)
+{
+    __GLXscreenInfo *pGlxScreen2;
+    int j;
+    VisualID vid;
+
+    /* check that the glx extension has been initialized */
+    if (!__glXActiveScreens)
+        return NULL;
+
+    pGlxScreen2 = &__glXActiveScreens[pMatchScreen->myNum];
+
+    vid = glxMatchVisualInConfigList(pScreen, pVisual,
+                                     pGlxScreen2->pGlxVisual,
+                                     pGlxScreen2->numVisuals);
+    if (vid) {
+        /*
+         * find the X visual of the matching glx visual
+         */
+        for (j = 0; j < pMatchScreen->numVisuals; j++) {
+            if (vid == pMatchScreen->visuals[j].vid) {
+                return &pMatchScreen->visuals[j];
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/xorg-server/hw/dmx/glxProxy/glxvisuals.h b/xorg-server/hw/dmx/glxProxy/glxvisuals.h
index 4245313ba..e1e023878 100644
--- a/xorg-server/hw/dmx/glxProxy/glxvisuals.h
+++ b/xorg-server/hw/dmx/glxProxy/glxvisuals.h
@@ -1,42 +1,46 @@
-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

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

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#ifndef _GLX_VISUALS_H

-#define _GLX_VISUALS_H

-

-int glxVisualsMatch( __GLXvisualConfig *v1, __GLXvisualConfig *v2 );

-

-VisualID glxMatchGLXVisualInConfigList( __GLXvisualConfig *pGlxVisual, __GLXvisualConfig *configs, int nconfigs );

-

-VisualID glxMatchVisualInConfigList( ScreenPtr pScreen, VisualPtr pVisual, __GLXvisualConfig *configs, int nconfigs );

-

-VisualPtr glxMatchVisual( ScreenPtr pScreen, VisualPtr pVisual, ScreenPtr pMatchScreen );

-

-#endif

+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#ifndef _GLX_VISUALS_H
+#define _GLX_VISUALS_H
+
+int glxVisualsMatch(__GLXvisualConfig * v1, __GLXvisualConfig * v2);
+
+VisualID glxMatchGLXVisualInConfigList(__GLXvisualConfig * pGlxVisual,
+                                       __GLXvisualConfig * configs,
+                                       int nconfigs);
+
+VisualID glxMatchVisualInConfigList(ScreenPtr pScreen, VisualPtr pVisual,
+                                    __GLXvisualConfig * configs, int nconfigs);
+
+VisualPtr glxMatchVisual(ScreenPtr pScreen, VisualPtr pVisual,
+                         ScreenPtr pMatchScreen);
+
+#endif
diff --git a/xorg-server/hw/dmx/glxProxy/render2swap.c b/xorg-server/hw/dmx/glxProxy/render2swap.c
index da9b565de..166ec8882 100644
--- a/xorg-server/hw/dmx/glxProxy/render2swap.c
+++ b/xorg-server/hw/dmx/glxProxy/render2swap.c
@@ -32,7 +32,8 @@
 #include "unpack.h"
 #include "g_disptab.h"
 
-static GLint __glEvalComputeK(GLenum target)
+static GLint
+__glEvalComputeK(GLenum target)
 {
     switch (target) {
     case GL_MAP1_VERTEX_4:
@@ -41,33 +42,35 @@ static GLint __glEvalComputeK(GLenum target)
     case GL_MAP2_VERTEX_4:
     case GL_MAP2_COLOR_4:
     case GL_MAP2_TEXTURE_COORD_4:
-	return 4;
+        return 4;
     case GL_MAP1_VERTEX_3:
     case GL_MAP1_TEXTURE_COORD_3:
     case GL_MAP1_NORMAL:
     case GL_MAP2_VERTEX_3:
     case GL_MAP2_TEXTURE_COORD_3:
     case GL_MAP2_NORMAL:
-	return 3;
+        return 3;
     case GL_MAP1_TEXTURE_COORD_2:
     case GL_MAP2_TEXTURE_COORD_2:
-	return 2;
+        return 2;
     case GL_MAP1_TEXTURE_COORD_1:
     case GL_MAP2_TEXTURE_COORD_1:
     case GL_MAP1_INDEX:
     case GL_MAP2_INDEX:
-	return 1;
+        return 1;
     default:
-	return 0;
+        return 0;
     }
 }
 
-void __glXDispSwap_Map1f(GLbyte *pc)
+void
+__glXDispSwap_Map1f(GLbyte * pc)
 {
     GLint order, k;
     GLfloat u1, u2, *points;
     GLenum target;
     GLint compsize;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
@@ -75,30 +78,33 @@ void __glXDispSwap_Map1f(GLbyte *pc)
     __GLX_SWAP_INT(pc + 12);
     __GLX_SWAP_FLOAT(pc + 4);
     __GLX_SWAP_FLOAT(pc + 8);
-    
-    target = *(GLenum *)(pc + 0); 
-    order = *(GLint *)(pc + 12);
-    u1 = *(GLfloat *)(pc + 4);
-    u2 = *(GLfloat *)(pc + 8);
-    points = (GLfloat *)(pc + 16);
+
+    target = *(GLenum *) (pc + 0);
+    order = *(GLint *) (pc + 12);
+    u1 = *(GLfloat *) (pc + 4);
+    u2 = *(GLfloat *) (pc + 8);
+    points = (GLfloat *) (pc + 16);
     k = __glEvalComputeK(target);
 
     if (order <= 0 || k < 0) {
-	/* Erroneous command. */
-	compsize = 0;
-    } else {
-	compsize = order * k;
+        /* Erroneous command. */
+        compsize = 0;
+    }
+    else {
+        compsize = order * k;
     }
     __GLX_SWAP_FLOAT_ARRAY(points, compsize);
 
 }
 
-void __glXDispSwap_Map2f(GLbyte *pc)
+void
+__glXDispSwap_Map2f(GLbyte * pc)
 {
     GLint uorder, vorder, ustride, vstride, k;
     GLfloat u1, u2, v1, v2, *points;
     GLenum target;
     GLint compsize;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
@@ -109,35 +115,38 @@ void __glXDispSwap_Map2f(GLbyte *pc)
     __GLX_SWAP_FLOAT(pc + 8);
     __GLX_SWAP_FLOAT(pc + 16);
     __GLX_SWAP_FLOAT(pc + 20);
-    
-    target = *(GLenum *)(pc + 0); 
-    uorder = *(GLint *)(pc + 12);
-    vorder = *(GLint *)(pc + 24);
-    u1 = *(GLfloat *)(pc + 4);
-    u2 = *(GLfloat *)(pc + 8);
-    v1 = *(GLfloat *)(pc + 16);
-    v2 = *(GLfloat *)(pc + 20);
-    points = (GLfloat *)(pc + 28);
+
+    target = *(GLenum *) (pc + 0);
+    uorder = *(GLint *) (pc + 12);
+    vorder = *(GLint *) (pc + 24);
+    u1 = *(GLfloat *) (pc + 4);
+    u2 = *(GLfloat *) (pc + 8);
+    v1 = *(GLfloat *) (pc + 16);
+    v2 = *(GLfloat *) (pc + 20);
+    points = (GLfloat *) (pc + 28);
 
     k = __glEvalComputeK(target);
     ustride = vorder * k;
     vstride = k;
 
     if (vorder <= 0 || uorder <= 0 || k < 0) {
-	/* Erroneous command. */
-	compsize = 0;
-    } else {
-	compsize = uorder * vorder * k;
+        /* Erroneous command. */
+        compsize = 0;
+    }
+    else {
+        compsize = uorder * vorder * k;
     }
     __GLX_SWAP_FLOAT_ARRAY(points, compsize);
 
 }
 
-void __glXDispSwap_Map1d(GLbyte *pc)
+void
+__glXDispSwap_Map1d(GLbyte * pc)
 {
     GLint order, k, compsize;
     GLenum target;
     GLdouble u1, u2, *points;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
@@ -146,41 +155,45 @@ void __glXDispSwap_Map1d(GLbyte *pc)
     __GLX_SWAP_INT(pc + 16);
     __GLX_SWAP_INT(pc + 20);
 
-    target = *(GLenum*) (pc + 16);
-    order = *(GLint*) (pc + 20);
+    target = *(GLenum *) (pc + 16);
+    order = *(GLint *) (pc + 20);
     k = __glEvalComputeK(target);
     if (order <= 0 || k < 0) {
-	/* Erroneous command. */
-	compsize = 0;
-    } else {
-	compsize = order * k;
+        /* Erroneous command. */
+        compsize = 0;
     }
-    __GLX_GET_DOUBLE(u1,pc);
-    __GLX_GET_DOUBLE(u2,pc+8);
-    __GLX_SWAP_DOUBLE_ARRAY(pc+24, compsize);
+    else {
+        compsize = order * k;
+    }
+    __GLX_GET_DOUBLE(u1, pc);
+    __GLX_GET_DOUBLE(u2, pc + 8);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 24, compsize);
     pc += 24;
 
 #ifdef __GLX_ALIGN64
-    if (((unsigned long)pc) & 7) {
-	/*
-	** Copy the doubles up 4 bytes, trashing the command but aligning
-	** the data in the process
-	*/
-	__GLX_MEM_COPY(pc-4, pc, compsize*8);
-	points = (GLdouble*) (pc - 4);
-    } else {
-	points = (GLdouble*) pc;
+    if (((unsigned long) pc) & 7) {
+        /*
+         ** Copy the doubles up 4 bytes, trashing the command but aligning
+         ** the data in the process
+         */
+        __GLX_MEM_COPY(pc - 4, pc, compsize * 8);
+        points = (GLdouble *) (pc - 4);
+    }
+    else {
+        points = (GLdouble *) pc;
     }
 #else
-    points = (GLdouble*) pc;
+    points = (GLdouble *) pc;
 #endif
 }
 
-void __glXDispSwap_Map2d(GLbyte *pc)
+void
+__glXDispSwap_Map2d(GLbyte * pc)
 {
     GLdouble u1, u2, v1, v2, *points;
     GLint uorder, vorder, ustride, vstride, k, compsize;
     GLenum target;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
@@ -192,80 +205,86 @@ void __glXDispSwap_Map2d(GLbyte *pc)
     __GLX_SWAP_INT(pc + 36);
     __GLX_SWAP_INT(pc + 40);
 
-    target = *(GLenum *)(pc + 32);
-    uorder = *(GLint *)(pc + 36);
-    vorder = *(GLint *)(pc + 40);
+    target = *(GLenum *) (pc + 32);
+    uorder = *(GLint *) (pc + 36);
+    vorder = *(GLint *) (pc + 40);
     k = __glEvalComputeK(target);
     if (vorder <= 0 || uorder <= 0 || k < 0) {
-	/* Erroneous command. */
-	compsize = 0;
-    } else {
-	compsize = uorder * vorder * k;
+        /* Erroneous command. */
+        compsize = 0;
+    }
+    else {
+        compsize = uorder * vorder * k;
     }
-    __GLX_GET_DOUBLE(u1,pc);
-    __GLX_GET_DOUBLE(u2,pc+8);
-    __GLX_GET_DOUBLE(v1,pc+16);
-    __GLX_GET_DOUBLE(v2,pc+24);
-    __GLX_SWAP_DOUBLE_ARRAY(pc+44, compsize);
+    __GLX_GET_DOUBLE(u1, pc);
+    __GLX_GET_DOUBLE(u2, pc + 8);
+    __GLX_GET_DOUBLE(v1, pc + 16);
+    __GLX_GET_DOUBLE(v2, pc + 24);
+    __GLX_SWAP_DOUBLE_ARRAY(pc + 44, compsize);
     pc += 44;
     ustride = vorder * k;
     vstride = k;
 
 #ifdef __GLX_ALIGN64
-    if (((unsigned long)pc) & 7) {
-	/*
-	** Copy the doubles up 4 bytes, trashing the command but aligning
-	** the data in the process
-	*/
-	__GLX_MEM_COPY(pc-4, pc, compsize*8);
-	points = (GLdouble*) (pc - 4);
-    } else {
-	points = (GLdouble*) pc;
+    if (((unsigned long) pc) & 7) {
+        /*
+         ** Copy the doubles up 4 bytes, trashing the command but aligning
+         ** the data in the process
+         */
+        __GLX_MEM_COPY(pc - 4, pc, compsize * 8);
+        points = (GLdouble *) (pc - 4);
+    }
+    else {
+        points = (GLdouble *) pc;
     }
 #else
-    points = (GLdouble*) pc;
+    points = (GLdouble *) pc;
 #endif
 }
 
-void __glXDispSwap_CallLists(GLbyte *pc)
+void
+__glXDispSwap_CallLists(GLbyte * pc)
 {
     GLenum type;
     GLsizei n;
+
     __GLX_DECLARE_SWAP_VARIABLES;
     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
     __GLX_SWAP_INT(pc + 4);
     __GLX_SWAP_INT(pc + 0);
-    type = *(GLenum *)(pc + 4);
-    n = *(GLsizei *)(pc + 0);
+    type = *(GLenum *) (pc + 4);
+    n = *(GLsizei *) (pc + 0);
 
     switch (type) {
-      case GL_BYTE:
-      case GL_UNSIGNED_BYTE:
-      case GL_2_BYTES:
-      case GL_3_BYTES:
-      case GL_4_BYTES:
-	break;
-      case GL_SHORT:
-      case GL_UNSIGNED_SHORT:
-	__GLX_SWAP_SHORT_ARRAY(pc+8, n);
-	break;
-      case GL_INT:
-      case GL_UNSIGNED_INT:
-	__GLX_SWAP_INT_ARRAY(pc+8, n);
-	break;
-      case GL_FLOAT:
-	__GLX_SWAP_FLOAT_ARRAY(pc+8, n);
-	break;
+    case GL_BYTE:
+    case GL_UNSIGNED_BYTE:
+    case GL_2_BYTES:
+    case GL_3_BYTES:
+    case GL_4_BYTES:
+        break;
+    case GL_SHORT:
+    case GL_UNSIGNED_SHORT:
+        __GLX_SWAP_SHORT_ARRAY(pc + 8, n);
+        break;
+    case GL_INT:
+    case GL_UNSIGNED_INT:
+        __GLX_SWAP_INT_ARRAY(pc + 8, n);
+        break;
+    case GL_FLOAT:
+        __GLX_SWAP_FLOAT_ARRAY(pc + 8, n);
+        break;
     }
 
 }
 
-void __glXDispSwap_DrawArrays(GLbyte *pc)
+void
+__glXDispSwap_DrawArrays(GLbyte * pc)
 {
-    __GLXdispatchDrawArraysHeader *hdr = (__GLXdispatchDrawArraysHeader *)pc;
+    __GLXdispatchDrawArraysHeader *hdr = (__GLXdispatchDrawArraysHeader *) pc;
     __GLXdispatchDrawArraysComponentHeader *compHeader;
     int i;
+
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_INT(&hdr->numVertexes);
@@ -276,10 +295,10 @@ void __glXDispSwap_DrawArrays(GLbyte *pc)
     compHeader = (__GLXdispatchDrawArraysComponentHeader *) pc;
 
     /* compute stride (same for all component arrays) */
-    for (i=0; i<hdr->numComponents; i++) {
-	__GLX_SWAP_INT(&compHeader[i].datatype);
-	__GLX_SWAP_INT(&compHeader[i].numVals);
-	__GLX_SWAP_INT(&compHeader[i].component);
+    for (i = 0; i < hdr->numComponents; i++) {
+        __GLX_SWAP_INT(&compHeader[i].datatype);
+        __GLX_SWAP_INT(&compHeader[i].numVals);
+        __GLX_SWAP_INT(&compHeader[i].component);
 
     }
 
diff --git a/xorg-server/hw/dmx/glxProxy/renderpixswap.c b/xorg-server/hw/dmx/glxProxy/renderpixswap.c
index e0ed7e77d..3458e611c 100644
--- a/xorg-server/hw/dmx/glxProxy/renderpixswap.c
+++ b/xorg-server/hw/dmx/glxProxy/renderpixswap.c
@@ -1,383 +1,406 @@
-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

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

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#include "glxserver.h"

-#include "unpack.h"

-#include "g_disptab.h"

-

-void __glXDispSwap_PolygonStipple(GLbyte *pc)

-{

-    __GLXpixelHeader *hdr = (__GLXpixelHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_Bitmap(GLbyte *pc)

-{

-    __GLXdispatchBitmapHeader *hdr = (__GLXdispatchBitmapHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->height);

-    __GLX_SWAP_FLOAT((GLbyte *)&hdr->xorig);

-    __GLX_SWAP_FLOAT((GLbyte *)&hdr->yorig);

-    __GLX_SWAP_FLOAT((GLbyte *)&hdr->xmove);

-    __GLX_SWAP_FLOAT((GLbyte *)&hdr->ymove);

-

-    hdr->swapBytes = !hdr->swapBytes;

-

-}

-

-void __glXDispSwap_TexImage1D(GLbyte *pc)

-{

-    __GLXdispatchTexImageHeader *hdr = (__GLXdispatchTexImageHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->target);

-    __GLX_SWAP_INT((GLbyte *)&hdr->level);

-    __GLX_SWAP_INT((GLbyte *)&hdr->components);

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->height);

-    __GLX_SWAP_INT((GLbyte *)&hdr->border);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_TexImage2D(GLbyte *pc)

-{

-    __GLXdispatchTexImageHeader *hdr = (__GLXdispatchTexImageHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->target);

-    __GLX_SWAP_INT((GLbyte *)&hdr->level);

-    __GLX_SWAP_INT((GLbyte *)&hdr->components);

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->height);

-    __GLX_SWAP_INT((GLbyte *)&hdr->border);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_TexImage3D(GLbyte *pc)

-{

-    __GLXdispatchTexImage3DHeader *hdr = (__GLXdispatchTexImage3DHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->imageHeight);

-    __GLX_SWAP_INT((GLbyte *)&hdr->imageDepth);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipImages);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipVolumes);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->target);

-    __GLX_SWAP_INT((GLbyte *)&hdr->level);

-    __GLX_SWAP_INT((GLbyte *)&hdr->internalformat);

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->height);

-    __GLX_SWAP_INT((GLbyte *)&hdr->depth);

-    __GLX_SWAP_INT((GLbyte *)&hdr->size4d);

-    __GLX_SWAP_INT((GLbyte *)&hdr->border);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_DrawPixels(GLbyte *pc)

-{

-    __GLXdispatchDrawPixelsHeader *hdr = (__GLXdispatchDrawPixelsHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->height);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_TexSubImage1D(GLbyte *pc)

-{

-    __GLXdispatchTexSubImageHeader *hdr = (__GLXdispatchTexSubImageHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->target);

-    __GLX_SWAP_INT((GLbyte *)&hdr->level);

-    __GLX_SWAP_INT((GLbyte *)&hdr->xoffset);

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_TexSubImage2D(GLbyte *pc)

-{

-    __GLXdispatchTexSubImageHeader *hdr = (__GLXdispatchTexSubImageHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->target);

-    __GLX_SWAP_INT((GLbyte *)&hdr->level);

-    __GLX_SWAP_INT((GLbyte *)&hdr->xoffset);

-    __GLX_SWAP_INT((GLbyte *)&hdr->yoffset);

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->height);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_TexSubImage3D(GLbyte *pc)

-{

-    __GLXdispatchTexSubImage3DHeader *hdr =

-				(__GLXdispatchTexSubImage3DHeader *) pc;

-

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->imageHeight);

-    __GLX_SWAP_INT((GLbyte *)&hdr->imageDepth);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipImages);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipVolumes);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->target);

-    __GLX_SWAP_INT((GLbyte *)&hdr->level);

-    __GLX_SWAP_INT((GLbyte *)&hdr->xoffset);

-    __GLX_SWAP_INT((GLbyte *)&hdr->yoffset);

-    __GLX_SWAP_INT((GLbyte *)&hdr->zoffset);

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->height);

-    __GLX_SWAP_INT((GLbyte *)&hdr->depth);

-    __GLX_SWAP_INT((GLbyte *)&hdr->size4d);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_ColorTable(GLbyte *pc)

-{

-    __GLXdispatchColorTableHeader *hdr =

-				(__GLXdispatchColorTableHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->target);

-    __GLX_SWAP_INT((GLbyte *)&hdr->internalformat);

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_ColorSubTable(GLbyte *pc)

-{

-    __GLXdispatchColorSubTableHeader *hdr =

-				(__GLXdispatchColorSubTableHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->target);

-    __GLX_SWAP_INT((GLbyte *)&hdr->start);

-    __GLX_SWAP_INT((GLbyte *)&hdr->count);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_ConvolutionFilter1D(GLbyte *pc)

-{

-    __GLXdispatchConvolutionFilterHeader *hdr =

-				(__GLXdispatchConvolutionFilterHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->target);

-    __GLX_SWAP_INT((GLbyte *)&hdr->internalformat);

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_ConvolutionFilter2D(GLbyte *pc)

-{

-    __GLXdispatchConvolutionFilterHeader *hdr =

-				(__GLXdispatchConvolutionFilterHeader *) pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->target);

-    __GLX_SWAP_INT((GLbyte *)&hdr->internalformat);

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->height);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

-

-void __glXDispSwap_SeparableFilter2D(GLbyte *pc)

-{

-    __GLXdispatchConvolutionFilterHeader *hdr =

-				(__GLXdispatchConvolutionFilterHeader *) pc;

-    GLint hdrlen;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    hdrlen = __GLX_PAD(__GLX_CONV_FILT_CMD_HDR_SIZE);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);

-    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);

-    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);

-

-    __GLX_SWAP_INT((GLbyte *)&hdr->target);

-    __GLX_SWAP_INT((GLbyte *)&hdr->internalformat);

-    __GLX_SWAP_INT((GLbyte *)&hdr->width);

-    __GLX_SWAP_INT((GLbyte *)&hdr->height);

-    __GLX_SWAP_INT((GLbyte *)&hdr->format);

-    __GLX_SWAP_INT((GLbyte *)&hdr->type);

-

-    /*

-    ** Just invert swapBytes flag; the GL will figure out if it needs to swap

-    ** the pixel data.

-    */

-    hdr->swapBytes = !hdr->swapBytes;

-}

+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#include "glxserver.h"
+#include "unpack.h"
+#include "g_disptab.h"
+
+void
+__glXDispSwap_PolygonStipple(GLbyte * pc)
+{
+    __GLXpixelHeader *hdr = (__GLXpixelHeader *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_Bitmap(GLbyte * pc)
+{
+    __GLXdispatchBitmapHeader *hdr = (__GLXdispatchBitmapHeader *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->height);
+    __GLX_SWAP_FLOAT((GLbyte *) & hdr->xorig);
+    __GLX_SWAP_FLOAT((GLbyte *) & hdr->yorig);
+    __GLX_SWAP_FLOAT((GLbyte *) & hdr->xmove);
+    __GLX_SWAP_FLOAT((GLbyte *) & hdr->ymove);
+
+    hdr->swapBytes = !hdr->swapBytes;
+
+}
+
+void
+__glXDispSwap_TexImage1D(GLbyte * pc)
+{
+    __GLXdispatchTexImageHeader *hdr = (__GLXdispatchTexImageHeader *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->target);
+    __GLX_SWAP_INT((GLbyte *) & hdr->level);
+    __GLX_SWAP_INT((GLbyte *) & hdr->components);
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->height);
+    __GLX_SWAP_INT((GLbyte *) & hdr->border);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_TexImage2D(GLbyte * pc)
+{
+    __GLXdispatchTexImageHeader *hdr = (__GLXdispatchTexImageHeader *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->target);
+    __GLX_SWAP_INT((GLbyte *) & hdr->level);
+    __GLX_SWAP_INT((GLbyte *) & hdr->components);
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->height);
+    __GLX_SWAP_INT((GLbyte *) & hdr->border);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_TexImage3D(GLbyte * pc)
+{
+    __GLXdispatchTexImage3DHeader *hdr = (__GLXdispatchTexImage3DHeader *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->imageHeight);
+    __GLX_SWAP_INT((GLbyte *) & hdr->imageDepth);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipImages);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipVolumes);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->target);
+    __GLX_SWAP_INT((GLbyte *) & hdr->level);
+    __GLX_SWAP_INT((GLbyte *) & hdr->internalformat);
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->height);
+    __GLX_SWAP_INT((GLbyte *) & hdr->depth);
+    __GLX_SWAP_INT((GLbyte *) & hdr->size4d);
+    __GLX_SWAP_INT((GLbyte *) & hdr->border);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_DrawPixels(GLbyte * pc)
+{
+    __GLXdispatchDrawPixelsHeader *hdr = (__GLXdispatchDrawPixelsHeader *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->height);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_TexSubImage1D(GLbyte * pc)
+{
+    __GLXdispatchTexSubImageHeader *hdr = (__GLXdispatchTexSubImageHeader *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->target);
+    __GLX_SWAP_INT((GLbyte *) & hdr->level);
+    __GLX_SWAP_INT((GLbyte *) & hdr->xoffset);
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_TexSubImage2D(GLbyte * pc)
+{
+    __GLXdispatchTexSubImageHeader *hdr = (__GLXdispatchTexSubImageHeader *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->target);
+    __GLX_SWAP_INT((GLbyte *) & hdr->level);
+    __GLX_SWAP_INT((GLbyte *) & hdr->xoffset);
+    __GLX_SWAP_INT((GLbyte *) & hdr->yoffset);
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->height);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_TexSubImage3D(GLbyte * pc)
+{
+    __GLXdispatchTexSubImage3DHeader *hdr =
+        (__GLXdispatchTexSubImage3DHeader *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->imageHeight);
+    __GLX_SWAP_INT((GLbyte *) & hdr->imageDepth);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipImages);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipVolumes);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->target);
+    __GLX_SWAP_INT((GLbyte *) & hdr->level);
+    __GLX_SWAP_INT((GLbyte *) & hdr->xoffset);
+    __GLX_SWAP_INT((GLbyte *) & hdr->yoffset);
+    __GLX_SWAP_INT((GLbyte *) & hdr->zoffset);
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->height);
+    __GLX_SWAP_INT((GLbyte *) & hdr->depth);
+    __GLX_SWAP_INT((GLbyte *) & hdr->size4d);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_ColorTable(GLbyte * pc)
+{
+    __GLXdispatchColorTableHeader *hdr = (__GLXdispatchColorTableHeader *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->target);
+    __GLX_SWAP_INT((GLbyte *) & hdr->internalformat);
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_ColorSubTable(GLbyte * pc)
+{
+    __GLXdispatchColorSubTableHeader *hdr =
+        (__GLXdispatchColorSubTableHeader *) pc;
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->target);
+    __GLX_SWAP_INT((GLbyte *) & hdr->start);
+    __GLX_SWAP_INT((GLbyte *) & hdr->count);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_ConvolutionFilter1D(GLbyte * pc)
+{
+    __GLXdispatchConvolutionFilterHeader *hdr =
+        (__GLXdispatchConvolutionFilterHeader *) pc;
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->target);
+    __GLX_SWAP_INT((GLbyte *) & hdr->internalformat);
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_ConvolutionFilter2D(GLbyte * pc)
+{
+    __GLXdispatchConvolutionFilterHeader *hdr =
+        (__GLXdispatchConvolutionFilterHeader *) pc;
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->target);
+    __GLX_SWAP_INT((GLbyte *) & hdr->internalformat);
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->height);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
+
+void
+__glXDispSwap_SeparableFilter2D(GLbyte * pc)
+{
+    __GLXdispatchConvolutionFilterHeader *hdr =
+        (__GLXdispatchConvolutionFilterHeader *) pc;
+    GLint hdrlen;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    hdrlen = __GLX_PAD(__GLX_CONV_FILT_CMD_HDR_SIZE);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *) & hdr->target);
+    __GLX_SWAP_INT((GLbyte *) & hdr->internalformat);
+    __GLX_SWAP_INT((GLbyte *) & hdr->width);
+    __GLX_SWAP_INT((GLbyte *) & hdr->height);
+    __GLX_SWAP_INT((GLbyte *) & hdr->format);
+    __GLX_SWAP_INT((GLbyte *) & hdr->type);
+
+    /*
+     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+     ** the pixel data.
+     */
+    hdr->swapBytes = !hdr->swapBytes;
+}
diff --git a/xorg-server/hw/dmx/input/ChkNotMaskEv.c b/xorg-server/hw/dmx/input/ChkNotMaskEv.c
index 635332e63..bde04ae23 100644
--- a/xorg-server/hw/dmx/input/ChkNotMaskEv.c
+++ b/xorg-server/hw/dmx/input/ChkNotMaskEv.c
@@ -67,40 +67,40 @@ extern long const _Xevent_to_mask[];
  * If not, flush buffer and see if any more events are readable. If one
  * matches, return.  If all else fails, tell the user no events found.
  */
-Bool XCheckNotMaskEvent (Display *dpy, long mask, XEvent *event)
+Bool
+XCheckNotMaskEvent(Display * dpy, long mask, XEvent * event)
 {
-	register _XQEvent *prev, *qelt;
-	unsigned long qe_serial = 0;
-	int n;			/* time through count */
+    register _XQEvent *prev, *qelt;
+    unsigned long qe_serial = 0;
+    int n;                      /* time through count */
 
-        LockDisplay(dpy);
-	prev = NULL;
-	for (n = 3; --n >= 0;) {
-	    for (qelt = prev ? prev->next : dpy->head;
-		 qelt;
-		 prev = qelt, qelt = qelt->next) {
-		if (qelt->event.type >= LASTEvent
-                    || !(_Xevent_to_mask[qelt->event.type] & mask)) {
-		    *event = qelt->event;
-		    _XDeq(dpy, prev, qelt);
-		    UnlockDisplay(dpy);
-		    return True;
-		}
-	    }
-	    if (prev)
-		qe_serial = prev->qserial_num;
-	    switch (n) {
-	      case 2:
-		_XEventsQueued(dpy, QueuedAfterReading);
-		break;
-	      case 1:
-		_XFlush(dpy);
-		break;
-	    }
-	    if (prev && prev->qserial_num != qe_serial)
-		/* another thread has snatched this event */
-		prev = NULL;
-	}
-	UnlockDisplay(dpy);
-	return False;
+    LockDisplay(dpy);
+    prev = NULL;
+    for (n = 3; --n >= 0;) {
+        for (qelt = prev ? prev->next : dpy->head;
+             qelt; prev = qelt, qelt = qelt->next) {
+            if (qelt->event.type >= LASTEvent
+                || !(_Xevent_to_mask[qelt->event.type] & mask)) {
+                *event = qelt->event;
+                _XDeq(dpy, prev, qelt);
+                UnlockDisplay(dpy);
+                return True;
+            }
+        }
+        if (prev)
+            qe_serial = prev->qserial_num;
+        switch (n) {
+        case 2:
+            _XEventsQueued(dpy, QueuedAfterReading);
+            break;
+        case 1:
+            _XFlush(dpy);
+            break;
+        }
+        if (prev && prev->qserial_num != qe_serial)
+            /* another thread has snatched this event */
+            prev = NULL;
+    }
+    UnlockDisplay(dpy);
+    return False;
 }
diff --git a/xorg-server/hw/dmx/input/dmxarg.c b/xorg-server/hw/dmx/input/dmxarg.c
index 49a1da9af..4a74b4c9e 100644
--- a/xorg-server/hw/dmx/input/dmxarg.c
+++ b/xorg-server/hw/dmx/input/dmxarg.c
@@ -51,86 +51,99 @@
 
 /** Stores the parsed argument list. */
 struct _dmxArg {
-    int        argc;   /**< Number of arguments in argv */
-    int        argm;   /**< Maximum number of arguments store-able in argv */
+    int argc;          /**< Number of arguments in argv */
+    int argm;          /**< Maximum number of arguments store-able in argv */
     const char **argv; /**< Arguments */
 };
 
 /** Create an (externally opaque) \a dmxArg object. */
-dmxArg dmxArgCreate(void)
+dmxArg
+dmxArgCreate(void)
 {
-    dmxArg a   = malloc(sizeof(*a));
-    a->argc    = 0;
-    a->argm    = 2;
-    a->argv    = malloc(a->argm * sizeof(*a->argv));
+    dmxArg a = malloc(sizeof(*a));
+
+    a->argc = 0;
+    a->argm = 2;
+    a->argv = malloc(a->argm * sizeof(*a->argv));
     a->argv[0] = NULL;
     return a;
 }
 
 /** Free the specified \a dmxArg object. */
-void dmxArgFree(dmxArg a)
+void
+dmxArgFree(dmxArg a)
 {
     int i;
 
-    for (i = 0; i < a->argc; i++) free((char *)a->argv[i]);
+    for (i = 0; i < a->argc; i++)
+        free((char *) a->argv[i]);
     free(a->argv);
     free(a);
 }
 
 /** Add the \a string as the next argument in the \a dmxArg object. */
-void dmxArgAdd(dmxArg a, const char *string)
+void
+dmxArgAdd(dmxArg a, const char *string)
 {
     if (a->argm <= a->argc + 2)
         a->argv = realloc(a->argv, sizeof(*a->argv) * (a->argm *= 2));
     a->argv[a->argc++] = strdup(string);
-    a->argv[a->argc]   = NULL;
+    a->argv[a->argc] = NULL;
 }
 
 /** Return the argument number \a item in the \a dmxArg object.
  * Arguments are 0 based.  NULL will be returned for values less than 0
  * or equal to or greater than the number of arguments in the object. */
-const char *dmxArgV(dmxArg a, int item)
+const char *
+dmxArgV(dmxArg a, int item)
 {
-    if (item < 0 || item >= a->argc) return NULL;
+    if (item < 0 || item >= a->argc)
+        return NULL;
     return a->argv[item];
 }
 
 /** Return the number of arguments in the \a dmxArg object. */
-int dmxArgC(dmxArg a)
+int
+dmxArgC(dmxArg a)
 {
     return a->argc;
 }
 
 /** Parse a string into arguments delimited by commas.  Return a new \a
  * dmxArg object containing the arguments. */
-dmxArg dmxArgParse(const char *string)
+dmxArg
+dmxArgParse(const char *string)
 {
-    char   *tmp;
-    char   *start, *pt;
+    char *tmp;
+    char *start, *pt;
     dmxArg a = dmxArgCreate();
-    int    done;
-    int    len;
+    int done;
+    int len;
 
-    if (!string) return a;
+    if (!string)
+        return a;
 
     len = strlen(string) + 2;
     tmp = malloc(len);
     strncpy(tmp, string, len);
 
     for (start = pt = tmp, done = 0; !done && *pt; start = ++pt) {
-        for (;*pt && *pt != ','; pt++);
-        if (!*pt) done = 1;
+        for (; *pt && *pt != ','; pt++);
+        if (!*pt)
+            done = 1;
         *pt = '\0';
         dmxArgAdd(a, start);
     }
-    if (!done) dmxArgAdd(a, ""); /* Final comma */
-    
+    if (!done)
+        dmxArgAdd(a, "");       /* Final comma */
+
     free(tmp);
     return a;
 }
 
 #if DMX_ARG_TEST
-static void dmxArgPrint(dmxArg a)
+static void
+dmxArgPrint(dmxArg a)
 {
     int i;
 
@@ -139,7 +152,8 @@ static void dmxArgPrint(dmxArg a)
         printf("   argv[%d] = \"%s\"\n", i, dmxArgV(a, i));
 }
 
-static void dmxArgTest(const char *string)
+static void
+dmxArgTest(const char *string)
 {
     dmxArg a;
 
@@ -155,7 +169,8 @@ static void dmxArgTest(const char *string)
     dmxArgFree(a);
 }
 
-int main(void)
+int
+main(void)
 {
     dmxArgTest(NULL);
     dmxArgTest("");
diff --git a/xorg-server/hw/dmx/input/dmxbackend.c b/xorg-server/hw/dmx/input/dmxbackend.c
index 35e9e9616..9463c87d3 100644
--- a/xorg-server/hw/dmx/input/dmxbackend.c
+++ b/xorg-server/hw/dmx/input/dmxbackend.c
@@ -1,616 +1,665 @@
-/*

- * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   David H. Dawes <dawes@xfree86.org>

- *   Kevin E. Martin <kem@redhat.com>

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- */

-

-/** \file

- * These routines support taking input from devices on the backend

- * (output) displays.  \see dmxcommon.c. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#define DMX_BACKEND_DEBUG 0

-

-#include "dmxinputinit.h"

-#include "dmxbackend.h"

-#include "dmxcommon.h"

-#include "dmxconsole.h"

-#include "dmxcursor.h"

-#include "dmxprop.h"

-#include "dmxsync.h"

-#include "dmxcb.h"              /* For dmxGlobalWidth and dmxGlobalHeight */

-#include "dmxevents.h"          /* For dmxGetGlobalPosition */

-#include "ChkNotMaskEv.h"

-

-#include "inputstr.h"

-#include "input.h"

-#include <X11/keysym.h>

-#include "mipointer.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-

-/* Private area for backend devices. */

-typedef struct _myPrivate {

-    DMX_COMMON_PRIVATE;

-    int                     myScreen;

-    DMXScreenInfo           *grabbedScreen;

-    

-    int                     lastX, lastY;

-    int                     centerX, centerY;

-    int                     relative;

-    int                     newscreen;

-    int                     initialized;

-    DevicePtr               mou, kbd;

-    int                     entered;

-    int                     offX, offY;

-} myPrivate;

-

-#if DMX_BACKEND_DEBUG

-#define DMXDBG0(f)                   dmxLog(dmxDebug,f)

-#define DMXDBG1(f,a)                 dmxLog(dmxDebug,f,a)

-#define DMXDBG2(f,a,b)               dmxLog(dmxDebug,f,a,b)

-#define DMXDBG3(f,a,b,c)             dmxLog(dmxDebug,f,a,b,c)

-#define DMXDBG4(f,a,b,c,d)           dmxLog(dmxDebug,f,a,b,c,d)

-#define DMXDBG5(f,a,b,c,d,e)         dmxLog(dmxDebug,f,a,b,c,d,e)

-#define DMXDBG6(f,a,b,c,d,e,g)       dmxLog(dmxDebug,f,a,b,c,d,e,g)

-#define DMXDBG7(f,a,b,c,d,e,g,h)     dmxLog(dmxDebug,f,a,b,c,d,e,g,h)

-#define DMXDBG8(f,a,b,c,d,e,g,h,i)   dmxLog(dmxDebug,f,a,b,c,d,e,g,h,i)

-#define DMXDBG9(f,a,b,c,d,e,g,h,i,j) dmxLog(dmxDebug,f,a,b,c,d,e,g,h,i,j)

-#else

-#define DMXDBG0(f)

-#define DMXDBG1(f,a)

-#define DMXDBG2(f,a,b)

-#define DMXDBG3(f,a,b,c)

-#define DMXDBG4(f,a,b,c,d)

-#define DMXDBG5(f,a,b,c,d,e)

-#define DMXDBG6(f,a,b,c,d,e,g)

-#define DMXDBG7(f,a,b,c,d,e,g,h)

-#define DMXDBG8(f,a,b,c,d,e,g,h,i)

-#define DMXDBG9(f,a,b,c,d,e,g,h,i,j)

-#endif

-

-/** Create and return a private data structure. */

-pointer dmxBackendCreatePrivate(DeviceIntPtr pDevice)

-{

-    GETDMXLOCALFROMPDEVICE;

-    myPrivate *priv = calloc(1, sizeof(*priv));

-    priv->dmxLocal  = dmxLocal;

-    return priv;

-}

-

-/** Destroy the private data structure.  No checking is performed to

- * verify that the structure was actually created by

- * #dmxBackendCreatePrivate. */

-void dmxBackendDestroyPrivate(pointer private)

-{

-    free(private);

-}

-

-static void *dmxBackendTestScreen(DMXScreenInfo *dmxScreen, void *closure)

-{

-    long target = (long)closure;

-

-    if (dmxScreen->index == target) return dmxScreen;

-    return NULL;

-}

-

-/* Return non-zero if screen and priv->myScreen are on the same physical

- * backend display (1 if they are the same screen, 2 if they are

- * different screens).  Since this is a common operation, the results

- * are cached.  The cache is invalidated if \a priv is NULL (this should

- * be done with each server generation and reconfiguration). */

-static int dmxBackendSameDisplay(myPrivate *priv, long screen)

-{

-    static myPrivate *oldpriv  = NULL;

-    static int       oldscreen = -1;

-    static int       retcode   = 0;

-

-    if (priv == oldpriv && screen == oldscreen) return retcode;

-    if (!priv) {                /* Invalidate cache */

-        oldpriv   = NULL;

-        oldscreen = -1;

-        retcode   = 0;

-        return 0;

-    }

-

-    if (screen == priv->myScreen)                     retcode = 1;

-    else if (screen < 0 || screen >= dmxNumScreens)   retcode = 0;

-    else if (dmxPropertyIterate(priv->be,

-                                dmxBackendTestScreen,

-                                (void *)screen))      retcode = 2;

-    else                                              retcode = 0;

-

-    oldpriv   = priv;

-    oldscreen = screen;

-    return retcode;

-}

-

-static void *dmxBackendTestEvents(DMXScreenInfo *dmxScreen, void *closure)

-{

-    XEvent *X = (XEvent *)closure;

-    

-    if (XCheckNotMaskEvent(dmxScreen->beDisplay, ExposureMask, X))

-        return dmxScreen;

-    return NULL;

-}

-

-static void *dmxBackendTestMotionEvent(DMXScreenInfo *dmxScreen, void *closure)

-{

-    XEvent *X = (XEvent *)closure;

-

-    if (XCheckTypedEvent(dmxScreen->beDisplay, MotionNotify, X))

-        return dmxScreen;

-    return NULL;

-}

-

-static DMXScreenInfo *dmxBackendGetEvent(myPrivate *priv, XEvent *X)

-{

-    DMXScreenInfo *dmxScreen;

-

-    if ((dmxScreen = dmxPropertyIterate(priv->be, dmxBackendTestEvents, X)))

-        return dmxScreen;

-    return NULL;

-}

-

-static DMXScreenInfo *dmxBackendPendingMotionEvent(myPrivate *priv, int save)

-{

-    DMXScreenInfo *dmxScreen;

-    XEvent        N;

-

-    if ((dmxScreen = dmxPropertyIterate(priv->be,

-                                        dmxBackendTestMotionEvent, &N))) {

-        if (save) XPutBackEvent(dmxScreen->beDisplay, &N);

-        return dmxScreen;

-    }

-    return NULL;

-}

-

-static void *dmxBackendTestWindow(DMXScreenInfo *dmxScreen, void *closure)

-{

-    Window win = (Window)(long)closure;

-    if (dmxScreen->scrnWin == win) return dmxScreen;

-    return NULL;

-}

-

-static DMXScreenInfo *dmxBackendFindWindow(myPrivate *priv, Window win)

-{

-    return dmxPropertyIterate(priv->be, dmxBackendTestWindow,

-                              (void *)(long)win);

-}

-

-/* If the cursor is over a set of overlapping screens and one of those

- * screens takes backend input, then we want that particular screen to

- * be current, not one of the other ones. */

-static int dmxBackendFindOverlapping(myPrivate *priv, int screen, int x, int y)

-{

-    DMXScreenInfo *start = &dmxScreens[screen];

-    DMXScreenInfo *pt;

-

-    if (!start->over) return screen;

-    

-    for (pt = start->over; /* condition at end of loop */; pt = pt->over) {

-        if (pt->index == priv->myScreen

-            && dmxOnScreen(x, y, &dmxScreens[pt->index])) return pt->index;

-        if (pt == start) break;

-    }

-    return screen;

-}

-

-/* Return non-zero if \a x and \a y are off \a screen. */

-static int dmxBackendOffscreen(int screen, int x, int y)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[screen];

-

-    return (!dmxOnScreen(x, y, dmxScreen));

-}

-

-/** This routine is called from #dmxCoreMotion for each motion

- * event. \a x and \a y are global coordinants. */

-void dmxBackendUpdatePosition(pointer private, int x, int y)

-{

-    GETPRIVFROMPRIVATE;

-    int           screen      = miPointerGetScreen(inputInfo.pointer)->myNum;

-    DMXScreenInfo *dmxScreen  = &dmxScreens[priv->myScreen];

-    int           oldRelative = priv->relative;

-    int           topscreen   = dmxBackendFindOverlapping(priv, screen, x, y);

-    int           same        = dmxBackendSameDisplay(priv, topscreen);

-    int           offscreen   = dmxBackendOffscreen(priv->myScreen, x, y);

-    int           offthis     = dmxBackendOffscreen(screen, x, y);

-

-    DMXDBG9("dmxBackendUpdatePosition(%d,%d) my=%d mi=%d rel=%d"

-            " topscreen=%d same=%d offscreen=%d offthis=%d\n",

-            x, y, priv->myScreen, screen, priv->relative,

-            topscreen, same, offscreen, offthis);

-

-    if (offscreen) {

-        /* If the cursor is off the input screen, it should be moving

-         * relative unless it is visible on a screen of the same display

-         * (i.e., one that shares the mouse). */

-        if (same == 2 && !offthis) {

-            if (priv->relative) {

-                DMXDBG0("   Off screen, but not absolute\n");

-                priv->relative = 0;

-            }

-        } else {

-            if (!priv->relative) {

-                DMXDBG0("   Off screen, but not relative\n");

-                priv->relative = 1;

-            }

-        }

-    } else {

-        if (topscreen != screen) {

-            DMXDBG2("   Using screen %d instead of %d (from mi)\n",

-                    topscreen, screen);

-        }

-        if (same) {

-            if (priv->relative) {

-                DMXDBG0("   On screen, but not absolute\n");

-                priv->relative = 0;

-            }

-        } else {

-            if (!priv->relative) {

-                DMXDBG0("   Not on screen, but not relative\n");

-                priv->relative = 1;

-            }

-        }

-    }

-

-    if (oldRelative != priv->relative) {

-        DMXDBG2("   Do switch, relative=%d same=%d\n",

-                priv->relative, same);

-        /* Discard all pre-switch events */

-        dmxSync(dmxScreen, TRUE);

-        while (dmxBackendPendingMotionEvent(priv, FALSE));

-        

-        if (dmxInput->console && offscreen) {

-            /* Our special case is a console window and a backend window

-             * share a display.  In this case, the cursor is either on

-             * the backend window (taking absolute input), or not (in

-             * which case the cursor needs to be in the console

-             * window). */

-            if (priv->grabbedScreen) {

-                DMXDBG2("   *** force ungrab on %s, display=%p\n",

-                        priv->grabbedScreen->name,

-                        priv->grabbedScreen->beDisplay);

-                XUngrabPointer(priv->grabbedScreen->beDisplay, CurrentTime);

-                dmxSync(priv->grabbedScreen, TRUE);

-                priv->grabbedScreen = NULL;

-            }

-            DMXDBG0("   Capturing console\n");

-            dmxConsoleCapture(dmxInput);

-        } else {

-            priv->newscreen = 1;

-            if (priv->relative && !dmxInput->console) {

-                DMXDBG5("   Hide cursor; warp from %d,%d to %d,%d on %d\n",

-                        priv->lastX, priv->lastY, priv->centerX, priv->centerY,

-                        priv->myScreen);

-                dmxConsoleUncapture(dmxInput);

-                dmxHideCursor(dmxScreen);

-                priv->lastX   = priv->centerX;

-                priv->lastY   = priv->centerY;

-                XWarpPointer(priv->display, None, priv->window,

-                             0, 0, 0, 0, priv->lastX, priv->lastY);

-                dmxSync(dmxScreen, TRUE);

-            } else {

-                DMXDBG0("   Check cursor\n");

-                dmxCheckCursor();

-            }

-        }

-    }

-}

-

-/** Get events from the X queue on the backend servers and put the

- * events into the DMX event queue. */

-void dmxBackendCollectEvents(DevicePtr pDev,

-                             dmxMotionProcPtr motion,

-                             dmxEnqueueProcPtr enqueue,

-                             dmxCheckSpecialProcPtr checkspecial,

-                             DMXBlockType block)

-{

-    GETPRIVFROMPDEV;

-    GETDMXINPUTFROMPRIV;

-    XEvent               X;

-    DMXScreenInfo        *dmxScreen;

-    int                  left        = 0;

-    int                  entered     = priv->entered;

-    int                  ignoreLeave = 0;

-    int                  v[2];

-    int                  retcode;

-

-    while ((dmxScreen = dmxBackendGetEvent(priv, &X))) {

-	switch (X.type) {

-        case EnterNotify:

-            dmxCommonSaveState(priv);

-            if (entered++)

-                continue;

-            priv->entered = 1;

-            ignoreLeave   = 1;

-            DMXDBG5("dmxBackendCollectEvents: Enter %lu %d,%d; GRAB %s %p\n",

-                    X.xcrossing.root, X.xcrossing.x, X.xcrossing.y,

-                    dmxScreen->name, dmxScreen->beDisplay);

-            XRaiseWindow(dmxScreen->beDisplay, dmxScreen->scrnWin);

-            priv->grabbedScreen = dmxScreen;

-            if ((retcode = XGrabPointer(dmxScreen->beDisplay,

-					dmxScreen->scrnWin,

-                                        True, 0, GrabModeAsync,

-                                        GrabModeAsync, None, None,

-                                        CurrentTime))) {

-                dmxLog(dmxError,

-                       "XGrabPointer failed during backend enter (%d)\n",

-                       retcode);

-            }

-            break;

-        case LeaveNotify:

-            if (ignoreLeave) {

-                ignoreLeave = 0;

-                continue;

-            }

-            dmxCommonRestoreState(priv);

-            if (left++)

-                continue;

-            DMXDBG7("dmxBackendCollectEvents: Leave %lu %d,%d %d %d %s %s\n",

-                    X.xcrossing.root, X.xcrossing.x, X.xcrossing.y,

-                    X.xcrossing.detail, X.xcrossing.focus,

-                    priv->grabbedScreen ? "UNGRAB" : "",

-                    dmxScreen->name);

-            if (priv->grabbedScreen) {

-                XUngrabPointer(priv->grabbedScreen->beDisplay, CurrentTime);

-                dmxSync(priv->grabbedScreen, TRUE);

-                priv->grabbedScreen = NULL;

-            }

-            break;

-	case MotionNotify:

-            DMXDBG9("dmxBackendCollectEvents: MotionNotify %d/%d (mi %d)"

-                    " newscreen=%d: %d %d (e=%d; last=%d,%d)\n",

-                    dmxScreen->index, priv->myScreen,

-                    miPointerCurrentScreen()->myNum,

-                    priv->newscreen,

-                    X.xmotion.x, X.xmotion.y,

-                    entered, priv->lastX, priv->lastY);

-            if (dmxBackendPendingMotionEvent(priv, TRUE))

-                continue;

-            if (!(dmxScreen = dmxBackendFindWindow(priv, X.xmotion.window)))

-                dmxLog(dmxFatal,

-                       "   Event on non-existant window %lu\n",

-                       X.xmotion.window);

-            if (!priv->relative || dmxInput->console) {

-                int newX = X.xmotion.x - dmxScreen->rootX;

-                int newY = X.xmotion.y - dmxScreen->rootY;

-

-                if (!priv->newscreen) {

-                    int width  = dmxScreen->rootWidth;

-                    int height = dmxScreen->rootHeight;

-                    if (!newX)              newX = -1;

-                    if (newX == width - 1)  newX = width;

-                    if (!newY)              newY = -1;

-                    if (newY == height - 1) newY = height;

-                }

-                priv->newscreen = 0;

-                v[0] = dmxScreen->rootXOrigin + newX;

-                v[1] = dmxScreen->rootYOrigin + newY;

-                DMXDBG8("   Absolute move: %d,%d (r=%dx%d+%d+%d s=%dx%d)\n",

-                        v[0], v[1],

-                        priv->be->rootWidth, priv->be->rootHeight,

-                        priv->be->rootX, priv->be->rootY,

-                        priv->be->scrnWidth, priv->be->scrnHeight);

-                motion(priv->mou, v, 0, 2, DMX_ABSOLUTE, block);

-                priv->entered = 0;

-            } else {

-                int newX = priv->lastX - X.xmotion.x;

-                int newY = priv->lastY - X.xmotion.y;

-                priv->lastX = X.xmotion.x;

-                priv->lastY = X.xmotion.y;

-                v[0]        = newX;

-                v[1]        = newY;

-                DMXDBG2("   Relative move: %d, %d\n", v[0], v[1]);

-                motion(priv->mou, v, 0, 2, DMX_RELATIVE, block);

-            }

-            if (entered && priv->relative) {

-                DMXDBG4("   **** Relative %d %d instead of absolute %d %d\n",

-                        v[0], v[1],

-                        (dmxScreen->rootXOrigin + X.xmotion.x

-                         - dmxScreen->rootX),

-                        (dmxScreen->rootYOrigin + X.xmotion.y

-                         - dmxScreen->rootY));

-            }

-	    break;

-

-        case KeyPress:

-        case KeyRelease:

-            enqueue(priv->kbd, X.type, X.xkey.keycode, 0, NULL, block);

-            break;

-        case ButtonPress:

-        case ButtonRelease:

-            /* fall-through */

-	default:

-                                /* Pass the whole event here, because

-                                 * this may be an extension event. */

-            enqueue(priv->mou, X.type, X.xbutton.button, 0, &X, block);

-	    break;

-	}

-    }

-}

-

-/** Called after input events are processed from the DMX queue.  No

- * event processing actually takes place here, but this is a convenient

- * place to update the pointer. */

-void dmxBackendProcessInput(pointer private)

-{

-    GETPRIVFROMPRIVATE;

-

-    DMXDBG6("dmxBackendProcessInput: myScreen=%d relative=%d"

-            " last=%d,%d center=%d,%d\n",

-            priv->myScreen, priv->relative,

-            priv->lastX, priv->lastY,

-            priv->centerX, priv->centerY);

-

-    if (priv->relative

-        && !dmxInput->console

-        && (priv->lastX != priv->centerX || priv->lastY != priv->centerY)) {

-        DMXDBG4("   warping pointer from last=%d,%d to center=%d,%d\n",

-                priv->lastX, priv->lastY, priv->centerX, priv->centerY);

-	priv->lastX   = priv->centerX;

-	priv->lastY   = priv->centerY;

-        XWarpPointer(priv->display, None, priv->window,

-                     0, 0, 0, 0, priv->lastX, priv->lastY);

-        dmxSync(&dmxScreens[priv->myScreen], TRUE);

-    }

-}

-

-static void dmxBackendComputeCenter(myPrivate *priv)

-{

-    int centerX;

-    int centerY;

-    

-    centerX       = priv->be->rootWidth / 2 + priv->be->rootX;

-    centerY       = priv->be->rootHeight / 2 + priv->be->rootY;

-

-    if (centerX > priv->be->rootWidth)  centerX = priv->be->rootWidth  - 1;

-    if (centerY > priv->be->rootHeight) centerY = priv->be->rootHeight - 1;

-    if (centerX < 1)                    centerX = 1;

-    if (centerY < 1)                    centerY = 1;

-

-    priv->centerX = centerX;

-    priv->centerY = centerY;

-}

-

-static DMXScreenInfo *dmxBackendInitPrivate(DevicePtr pDev)

-{

-    GETPRIVFROMPDEV;

-    DMXInputInfo      *dmxInput = &dmxInputs[dmxLocal->inputIdx];

-    DMXScreenInfo     *dmxScreen;

-    int               i;

-

-    /* Fill in myPrivate */

-    for (i = 0,dmxScreen = &dmxScreens[0]; i<dmxNumScreens; i++,dmxScreen++) {

-        if (dmxPropertySameDisplay(dmxScreen, dmxInput->name)) {

-            priv->display  = dmxScreen->beDisplay;

-            priv->window   = dmxScreen->scrnWin;

-            priv->be       = dmxScreen;

-            break;

-        }

-    }

-

-    if (i >= dmxNumScreens)

-        dmxLog(dmxFatal,

-               "%s is not an existing backend display - cannot initialize\n",

-               dmxInput->name);

-

-    return dmxScreen;

-}

-

-/** Re-initialized the backend device described by \a pDev (after a

- * reconfig). */

-void dmxBackendLateReInit(DevicePtr pDev)

-{

-    GETPRIVFROMPDEV;

-    int               x, y;

-

-    DMXDBG1("dmxBackendLateReInit miPointerCurrentScreen() = %p\n",

-            miPointerCurrentScreen());

-

-    dmxBackendSameDisplay(NULL, 0); /* Invalidate cache */

-    dmxBackendInitPrivate(pDev);

-    dmxBackendComputeCenter(priv);

-    dmxGetGlobalPosition(&x, &y);

-    dmxInvalidateGlobalPosition(); /* To force event processing */

-    dmxBackendUpdatePosition(priv, x, y);

-}

-

-/** Initialized the backend device described by \a pDev. */

-void dmxBackendInit(DevicePtr pDev)

-{

-    GETPRIVFROMPDEV;

-    DMXScreenInfo     *dmxScreen;

-

-    dmxBackendSameDisplay(NULL, 0); /* Invalidate cache */

-

-    if (dmxLocal->type == DMX_LOCAL_MOUSE)    priv->mou = pDev;

-    if (dmxLocal->type == DMX_LOCAL_KEYBOARD) priv->kbd = pDev;

-    if (priv->initialized++) return; /* Only do once for mouse/keyboard pair */

-

-    dmxScreen = dmxBackendInitPrivate(pDev);

-

-    /* Finish initialization using computed values or constants. */

-    dmxBackendComputeCenter(priv);

-    priv->eventMask          = (EnterWindowMask|LeaveWindowMask);

-    priv->myScreen           = dmxScreen->index;

-    priv->lastX              = priv->centerX;

-    priv->lastY              = priv->centerY;

-    priv->relative           = 0;

-    priv->newscreen          = 0;

-}

-

-/** Get information about the backend pointer (for initialization). */

-void dmxBackendMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)

-{

-    const DMXScreenInfo *dmxScreen = dmxBackendInitPrivate(pDev);

-

-    info->buttonClass      = 1;

-    dmxCommonMouGetMap(pDev, info->map, &info->numButtons);

-    info->valuatorClass    = 1;

-    info->numRelAxes       = 2;

-    info->minval[0]        = 0;

-    info->minval[1]        = 0;

-    info->maxval[0]        = dmxScreen->beWidth;

-    info->maxval[1]        = dmxScreen->beHeight;

-    info->res[0]           = 1;

-    info->minres[0]        = 0;

-    info->maxres[0]        = 1;

-    info->ptrFeedbackClass = 1;

-}

-

-/** Get information about the backend keyboard (for initialization). */

-void dmxBackendKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)

-{

-    dmxCommonKbdGetInfo(pDev, info);

-    info->keyboard         = 1;

-    info->keyClass         = 1;

-    dmxCommonKbdGetMap(pDev, &info->keySyms, info->modMap);

-    info->freemap          = 1;

-    info->focusClass       = 1;

-    info->kbdFeedbackClass = 1;

-}

-

-/** Process #DMXFunctionType functions.  The only function handled here

- * is to acknowledge a pending server shutdown. */

-int dmxBackendFunctions(pointer private, DMXFunctionType function)

-{

-    switch (function) {

-    case DMX_FUNCTION_TERMINATE:

-        return 1;

-    default:

-        return 0;

-    }

-}

+/*
+ * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   David H. Dawes <dawes@xfree86.org>
+ *   Kevin E. Martin <kem@redhat.com>
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ */
+
+/** \file
+ * These routines support taking input from devices on the backend
+ * (output) displays.  \see dmxcommon.c. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#define DMX_BACKEND_DEBUG 0
+
+#include "dmxinputinit.h"
+#include "dmxbackend.h"
+#include "dmxcommon.h"
+#include "dmxconsole.h"
+#include "dmxcursor.h"
+#include "dmxprop.h"
+#include "dmxsync.h"
+#include "dmxcb.h"              /* For dmxGlobalWidth and dmxGlobalHeight */
+#include "dmxevents.h"          /* For dmxGetGlobalPosition */
+#include "ChkNotMaskEv.h"
+
+#include "inputstr.h"
+#include "input.h"
+#include <X11/keysym.h>
+#include "mipointer.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+
+/* Private area for backend devices. */
+typedef struct _myPrivate {
+    DMX_COMMON_PRIVATE;
+    int myScreen;
+    DMXScreenInfo *grabbedScreen;
+
+    int lastX, lastY;
+    int centerX, centerY;
+    int relative;
+    int newscreen;
+    int initialized;
+    DevicePtr mou, kbd;
+    int entered;
+    int offX, offY;
+} myPrivate;
+
+#if DMX_BACKEND_DEBUG
+#define DMXDBG0(f)                   dmxLog(dmxDebug,f)
+#define DMXDBG1(f,a)                 dmxLog(dmxDebug,f,a)
+#define DMXDBG2(f,a,b)               dmxLog(dmxDebug,f,a,b)
+#define DMXDBG3(f,a,b,c)             dmxLog(dmxDebug,f,a,b,c)
+#define DMXDBG4(f,a,b,c,d)           dmxLog(dmxDebug,f,a,b,c,d)
+#define DMXDBG5(f,a,b,c,d,e)         dmxLog(dmxDebug,f,a,b,c,d,e)
+#define DMXDBG6(f,a,b,c,d,e,g)       dmxLog(dmxDebug,f,a,b,c,d,e,g)
+#define DMXDBG7(f,a,b,c,d,e,g,h)     dmxLog(dmxDebug,f,a,b,c,d,e,g,h)
+#define DMXDBG8(f,a,b,c,d,e,g,h,i)   dmxLog(dmxDebug,f,a,b,c,d,e,g,h,i)
+#define DMXDBG9(f,a,b,c,d,e,g,h,i,j) dmxLog(dmxDebug,f,a,b,c,d,e,g,h,i,j)
+#else
+#define DMXDBG0(f)
+#define DMXDBG1(f,a)
+#define DMXDBG2(f,a,b)
+#define DMXDBG3(f,a,b,c)
+#define DMXDBG4(f,a,b,c,d)
+#define DMXDBG5(f,a,b,c,d,e)
+#define DMXDBG6(f,a,b,c,d,e,g)
+#define DMXDBG7(f,a,b,c,d,e,g,h)
+#define DMXDBG8(f,a,b,c,d,e,g,h,i)
+#define DMXDBG9(f,a,b,c,d,e,g,h,i,j)
+#endif
+
+/** Create and return a private data structure. */
+pointer
+dmxBackendCreatePrivate(DeviceIntPtr pDevice)
+{
+    GETDMXLOCALFROMPDEVICE;
+    myPrivate *priv = calloc(1, sizeof(*priv));
+
+    priv->dmxLocal = dmxLocal;
+    return priv;
+}
+
+/** Destroy the private data structure.  No checking is performed to
+ * verify that the structure was actually created by
+ * #dmxBackendCreatePrivate. */
+void
+dmxBackendDestroyPrivate(pointer private)
+{
+    free(private);
+}
+
+static void *
+dmxBackendTestScreen(DMXScreenInfo * dmxScreen, void *closure)
+{
+    long target = (long) closure;
+
+    if (dmxScreen->index == target)
+        return dmxScreen;
+    return NULL;
+}
+
+/* Return non-zero if screen and priv->myScreen are on the same physical
+ * backend display (1 if they are the same screen, 2 if they are
+ * different screens).  Since this is a common operation, the results
+ * are cached.  The cache is invalidated if \a priv is NULL (this should
+ * be done with each server generation and reconfiguration). */
+static int
+dmxBackendSameDisplay(myPrivate * priv, long screen)
+{
+    static myPrivate *oldpriv = NULL;
+    static int oldscreen = -1;
+    static int retcode = 0;
+
+    if (priv == oldpriv && screen == oldscreen)
+        return retcode;
+    if (!priv) {                /* Invalidate cache */
+        oldpriv = NULL;
+        oldscreen = -1;
+        retcode = 0;
+        return 0;
+    }
+
+    if (screen == priv->myScreen)
+        retcode = 1;
+    else if (screen < 0 || screen >= dmxNumScreens)
+        retcode = 0;
+    else if (dmxPropertyIterate(priv->be,
+                                dmxBackendTestScreen, (void *) screen))
+        retcode = 2;
+    else
+        retcode = 0;
+
+    oldpriv = priv;
+    oldscreen = screen;
+    return retcode;
+}
+
+static void *
+dmxBackendTestEvents(DMXScreenInfo * dmxScreen, void *closure)
+{
+    XEvent *X = (XEvent *) closure;
+
+    if (XCheckNotMaskEvent(dmxScreen->beDisplay, ExposureMask, X))
+        return dmxScreen;
+    return NULL;
+}
+
+static void *
+dmxBackendTestMotionEvent(DMXScreenInfo * dmxScreen, void *closure)
+{
+    XEvent *X = (XEvent *) closure;
+
+    if (XCheckTypedEvent(dmxScreen->beDisplay, MotionNotify, X))
+        return dmxScreen;
+    return NULL;
+}
+
+static DMXScreenInfo *
+dmxBackendGetEvent(myPrivate * priv, XEvent * X)
+{
+    DMXScreenInfo *dmxScreen;
+
+    if ((dmxScreen = dmxPropertyIterate(priv->be, dmxBackendTestEvents, X)))
+        return dmxScreen;
+    return NULL;
+}
+
+static DMXScreenInfo *
+dmxBackendPendingMotionEvent(myPrivate * priv, int save)
+{
+    DMXScreenInfo *dmxScreen;
+    XEvent N;
+
+    if ((dmxScreen = dmxPropertyIterate(priv->be,
+                                        dmxBackendTestMotionEvent, &N))) {
+        if (save)
+            XPutBackEvent(dmxScreen->beDisplay, &N);
+        return dmxScreen;
+    }
+    return NULL;
+}
+
+static void *
+dmxBackendTestWindow(DMXScreenInfo * dmxScreen, void *closure)
+{
+    Window win = (Window) (long) closure;
+
+    if (dmxScreen->scrnWin == win)
+        return dmxScreen;
+    return NULL;
+}
+
+static DMXScreenInfo *
+dmxBackendFindWindow(myPrivate * priv, Window win)
+{
+    return dmxPropertyIterate(priv->be, dmxBackendTestWindow,
+                              (void *) (long) win);
+}
+
+/* If the cursor is over a set of overlapping screens and one of those
+ * screens takes backend input, then we want that particular screen to
+ * be current, not one of the other ones. */
+static int
+dmxBackendFindOverlapping(myPrivate * priv, int screen, int x, int y)
+{
+    DMXScreenInfo *start = &dmxScreens[screen];
+    DMXScreenInfo *pt;
+
+    if (!start->over)
+        return screen;
+
+    for (pt = start->over; /* condition at end of loop */ ; pt = pt->over) {
+        if (pt->index == priv->myScreen
+            && dmxOnScreen(x, y, &dmxScreens[pt->index]))
+            return pt->index;
+        if (pt == start)
+            break;
+    }
+    return screen;
+}
+
+/* Return non-zero if \a x and \a y are off \a screen. */
+static int
+dmxBackendOffscreen(int screen, int x, int y)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[screen];
+
+    return (!dmxOnScreen(x, y, dmxScreen));
+}
+
+/** This routine is called from #dmxCoreMotion for each motion
+ * event. \a x and \a y are global coordinants. */
+void
+dmxBackendUpdatePosition(pointer private, int x, int y)
+{
+    GETPRIVFROMPRIVATE;
+    int screen = miPointerGetScreen(inputInfo.pointer)->myNum;
+    DMXScreenInfo *dmxScreen = &dmxScreens[priv->myScreen];
+    int oldRelative = priv->relative;
+    int topscreen = dmxBackendFindOverlapping(priv, screen, x, y);
+    int same = dmxBackendSameDisplay(priv, topscreen);
+    int offscreen = dmxBackendOffscreen(priv->myScreen, x, y);
+    int offthis = dmxBackendOffscreen(screen, x, y);
+
+    DMXDBG9("dmxBackendUpdatePosition(%d,%d) my=%d mi=%d rel=%d"
+            " topscreen=%d same=%d offscreen=%d offthis=%d\n",
+            x, y, priv->myScreen, screen, priv->relative,
+            topscreen, same, offscreen, offthis);
+
+    if (offscreen) {
+        /* If the cursor is off the input screen, it should be moving
+         * relative unless it is visible on a screen of the same display
+         * (i.e., one that shares the mouse). */
+        if (same == 2 && !offthis) {
+            if (priv->relative) {
+                DMXDBG0("   Off screen, but not absolute\n");
+                priv->relative = 0;
+            }
+        }
+        else {
+            if (!priv->relative) {
+                DMXDBG0("   Off screen, but not relative\n");
+                priv->relative = 1;
+            }
+        }
+    }
+    else {
+        if (topscreen != screen) {
+            DMXDBG2("   Using screen %d instead of %d (from mi)\n",
+                    topscreen, screen);
+        }
+        if (same) {
+            if (priv->relative) {
+                DMXDBG0("   On screen, but not absolute\n");
+                priv->relative = 0;
+            }
+        }
+        else {
+            if (!priv->relative) {
+                DMXDBG0("   Not on screen, but not relative\n");
+                priv->relative = 1;
+            }
+        }
+    }
+
+    if (oldRelative != priv->relative) {
+        DMXDBG2("   Do switch, relative=%d same=%d\n", priv->relative, same);
+        /* Discard all pre-switch events */
+        dmxSync(dmxScreen, TRUE);
+        while (dmxBackendPendingMotionEvent(priv, FALSE));
+
+        if (dmxInput->console && offscreen) {
+            /* Our special case is a console window and a backend window
+             * share a display.  In this case, the cursor is either on
+             * the backend window (taking absolute input), or not (in
+             * which case the cursor needs to be in the console
+             * window). */
+            if (priv->grabbedScreen) {
+                DMXDBG2("   *** force ungrab on %s, display=%p\n",
+                        priv->grabbedScreen->name,
+                        priv->grabbedScreen->beDisplay);
+                XUngrabPointer(priv->grabbedScreen->beDisplay, CurrentTime);
+                dmxSync(priv->grabbedScreen, TRUE);
+                priv->grabbedScreen = NULL;
+            }
+            DMXDBG0("   Capturing console\n");
+            dmxConsoleCapture(dmxInput);
+        }
+        else {
+            priv->newscreen = 1;
+            if (priv->relative && !dmxInput->console) {
+                DMXDBG5("   Hide cursor; warp from %d,%d to %d,%d on %d\n",
+                        priv->lastX, priv->lastY, priv->centerX, priv->centerY,
+                        priv->myScreen);
+                dmxConsoleUncapture(dmxInput);
+                dmxHideCursor(dmxScreen);
+                priv->lastX = priv->centerX;
+                priv->lastY = priv->centerY;
+                XWarpPointer(priv->display, None, priv->window,
+                             0, 0, 0, 0, priv->lastX, priv->lastY);
+                dmxSync(dmxScreen, TRUE);
+            }
+            else {
+                DMXDBG0("   Check cursor\n");
+                dmxCheckCursor();
+            }
+        }
+    }
+}
+
+/** Get events from the X queue on the backend servers and put the
+ * events into the DMX event queue. */
+void
+dmxBackendCollectEvents(DevicePtr pDev,
+                        dmxMotionProcPtr motion,
+                        dmxEnqueueProcPtr enqueue,
+                        dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
+{
+    GETPRIVFROMPDEV;
+    GETDMXINPUTFROMPRIV;
+    XEvent X;
+    DMXScreenInfo *dmxScreen;
+    int left = 0;
+    int entered = priv->entered;
+    int ignoreLeave = 0;
+    int v[2];
+    int retcode;
+
+    while ((dmxScreen = dmxBackendGetEvent(priv, &X))) {
+        switch (X.type) {
+        case EnterNotify:
+            dmxCommonSaveState(priv);
+            if (entered++)
+                continue;
+            priv->entered = 1;
+            ignoreLeave = 1;
+            DMXDBG5("dmxBackendCollectEvents: Enter %lu %d,%d; GRAB %s %p\n",
+                    X.xcrossing.root, X.xcrossing.x, X.xcrossing.y,
+                    dmxScreen->name, dmxScreen->beDisplay);
+            XRaiseWindow(dmxScreen->beDisplay, dmxScreen->scrnWin);
+            priv->grabbedScreen = dmxScreen;
+            if ((retcode = XGrabPointer(dmxScreen->beDisplay,
+                                        dmxScreen->scrnWin,
+                                        True, 0, GrabModeAsync,
+                                        GrabModeAsync, None, None,
+                                        CurrentTime))) {
+                dmxLog(dmxError,
+                       "XGrabPointer failed during backend enter (%d)\n",
+                       retcode);
+            }
+            break;
+        case LeaveNotify:
+            if (ignoreLeave) {
+                ignoreLeave = 0;
+                continue;
+            }
+            dmxCommonRestoreState(priv);
+            if (left++)
+                continue;
+            DMXDBG7("dmxBackendCollectEvents: Leave %lu %d,%d %d %d %s %s\n",
+                    X.xcrossing.root, X.xcrossing.x, X.xcrossing.y,
+                    X.xcrossing.detail, X.xcrossing.focus,
+                    priv->grabbedScreen ? "UNGRAB" : "", dmxScreen->name);
+            if (priv->grabbedScreen) {
+                XUngrabPointer(priv->grabbedScreen->beDisplay, CurrentTime);
+                dmxSync(priv->grabbedScreen, TRUE);
+                priv->grabbedScreen = NULL;
+            }
+            break;
+        case MotionNotify:
+            DMXDBG9("dmxBackendCollectEvents: MotionNotify %d/%d (mi %d)"
+                    " newscreen=%d: %d %d (e=%d; last=%d,%d)\n",
+                    dmxScreen->index, priv->myScreen,
+                    miPointerCurrentScreen()->myNum,
+                    priv->newscreen,
+                    X.xmotion.x, X.xmotion.y,
+                    entered, priv->lastX, priv->lastY);
+            if (dmxBackendPendingMotionEvent(priv, TRUE))
+                continue;
+            if (!(dmxScreen = dmxBackendFindWindow(priv, X.xmotion.window)))
+                dmxLog(dmxFatal,
+                       "   Event on non-existant window %lu\n",
+                       X.xmotion.window);
+            if (!priv->relative || dmxInput->console) {
+                int newX = X.xmotion.x - dmxScreen->rootX;
+                int newY = X.xmotion.y - dmxScreen->rootY;
+
+                if (!priv->newscreen) {
+                    int width = dmxScreen->rootWidth;
+                    int height = dmxScreen->rootHeight;
+
+                    if (!newX)
+                        newX = -1;
+                    if (newX == width - 1)
+                        newX = width;
+                    if (!newY)
+                        newY = -1;
+                    if (newY == height - 1)
+                        newY = height;
+                }
+                priv->newscreen = 0;
+                v[0] = dmxScreen->rootXOrigin + newX;
+                v[1] = dmxScreen->rootYOrigin + newY;
+                DMXDBG8("   Absolute move: %d,%d (r=%dx%d+%d+%d s=%dx%d)\n",
+                        v[0], v[1],
+                        priv->be->rootWidth, priv->be->rootHeight,
+                        priv->be->rootX, priv->be->rootY,
+                        priv->be->scrnWidth, priv->be->scrnHeight);
+                motion(priv->mou, v, 0, 2, DMX_ABSOLUTE, block);
+                priv->entered = 0;
+            }
+            else {
+                int newX = priv->lastX - X.xmotion.x;
+                int newY = priv->lastY - X.xmotion.y;
+
+                priv->lastX = X.xmotion.x;
+                priv->lastY = X.xmotion.y;
+                v[0] = newX;
+                v[1] = newY;
+                DMXDBG2("   Relative move: %d, %d\n", v[0], v[1]);
+                motion(priv->mou, v, 0, 2, DMX_RELATIVE, block);
+            }
+            if (entered && priv->relative) {
+                DMXDBG4("   **** Relative %d %d instead of absolute %d %d\n",
+                        v[0], v[1],
+                        (dmxScreen->rootXOrigin + X.xmotion.x
+                         - dmxScreen->rootX),
+                        (dmxScreen->rootYOrigin + X.xmotion.y
+                         - dmxScreen->rootY));
+            }
+            break;
+
+        case KeyPress:
+        case KeyRelease:
+            enqueue(priv->kbd, X.type, X.xkey.keycode, 0, NULL, block);
+            break;
+        case ButtonPress:
+        case ButtonRelease:
+            /* fall-through */
+        default:
+            /* Pass the whole event here, because
+             * this may be an extension event. */
+            enqueue(priv->mou, X.type, X.xbutton.button, 0, &X, block);
+            break;
+        }
+    }
+}
+
+/** Called after input events are processed from the DMX queue.  No
+ * event processing actually takes place here, but this is a convenient
+ * place to update the pointer. */
+void
+dmxBackendProcessInput(pointer private)
+{
+    GETPRIVFROMPRIVATE;
+
+    DMXDBG6("dmxBackendProcessInput: myScreen=%d relative=%d"
+            " last=%d,%d center=%d,%d\n",
+            priv->myScreen, priv->relative,
+            priv->lastX, priv->lastY, priv->centerX, priv->centerY);
+
+    if (priv->relative
+        && !dmxInput->console
+        && (priv->lastX != priv->centerX || priv->lastY != priv->centerY)) {
+        DMXDBG4("   warping pointer from last=%d,%d to center=%d,%d\n",
+                priv->lastX, priv->lastY, priv->centerX, priv->centerY);
+        priv->lastX = priv->centerX;
+        priv->lastY = priv->centerY;
+        XWarpPointer(priv->display, None, priv->window,
+                     0, 0, 0, 0, priv->lastX, priv->lastY);
+        dmxSync(&dmxScreens[priv->myScreen], TRUE);
+    }
+}
+
+static void
+dmxBackendComputeCenter(myPrivate * priv)
+{
+    int centerX;
+    int centerY;
+
+    centerX = priv->be->rootWidth / 2 + priv->be->rootX;
+    centerY = priv->be->rootHeight / 2 + priv->be->rootY;
+
+    if (centerX > priv->be->rootWidth)
+        centerX = priv->be->rootWidth - 1;
+    if (centerY > priv->be->rootHeight)
+        centerY = priv->be->rootHeight - 1;
+    if (centerX < 1)
+        centerX = 1;
+    if (centerY < 1)
+        centerY = 1;
+
+    priv->centerX = centerX;
+    priv->centerY = centerY;
+}
+
+static DMXScreenInfo *
+dmxBackendInitPrivate(DevicePtr pDev)
+{
+    GETPRIVFROMPDEV;
+    DMXInputInfo *dmxInput = &dmxInputs[dmxLocal->inputIdx];
+    DMXScreenInfo *dmxScreen;
+    int i;
+
+    /* Fill in myPrivate */
+    for (i = 0, dmxScreen = &dmxScreens[0]; i < dmxNumScreens; i++, dmxScreen++) {
+        if (dmxPropertySameDisplay(dmxScreen, dmxInput->name)) {
+            priv->display = dmxScreen->beDisplay;
+            priv->window = dmxScreen->scrnWin;
+            priv->be = dmxScreen;
+            break;
+        }
+    }
+
+    if (i >= dmxNumScreens)
+        dmxLog(dmxFatal,
+               "%s is not an existing backend display - cannot initialize\n",
+               dmxInput->name);
+
+    return dmxScreen;
+}
+
+/** Re-initialized the backend device described by \a pDev (after a
+ * reconfig). */
+void
+dmxBackendLateReInit(DevicePtr pDev)
+{
+    GETPRIVFROMPDEV;
+    int x, y;
+
+    DMXDBG1("dmxBackendLateReInit miPointerCurrentScreen() = %p\n",
+            miPointerCurrentScreen());
+
+    dmxBackendSameDisplay(NULL, 0);     /* Invalidate cache */
+    dmxBackendInitPrivate(pDev);
+    dmxBackendComputeCenter(priv);
+    dmxGetGlobalPosition(&x, &y);
+    dmxInvalidateGlobalPosition();      /* To force event processing */
+    dmxBackendUpdatePosition(priv, x, y);
+}
+
+/** Initialized the backend device described by \a pDev. */
+void
+dmxBackendInit(DevicePtr pDev)
+{
+    GETPRIVFROMPDEV;
+    DMXScreenInfo *dmxScreen;
+
+    dmxBackendSameDisplay(NULL, 0);     /* Invalidate cache */
+
+    if (dmxLocal->type == DMX_LOCAL_MOUSE)
+        priv->mou = pDev;
+    if (dmxLocal->type == DMX_LOCAL_KEYBOARD)
+        priv->kbd = pDev;
+    if (priv->initialized++)
+        return;                 /* Only do once for mouse/keyboard pair */
+
+    dmxScreen = dmxBackendInitPrivate(pDev);
+
+    /* Finish initialization using computed values or constants. */
+    dmxBackendComputeCenter(priv);
+    priv->eventMask = (EnterWindowMask | LeaveWindowMask);
+    priv->myScreen = dmxScreen->index;
+    priv->lastX = priv->centerX;
+    priv->lastY = priv->centerY;
+    priv->relative = 0;
+    priv->newscreen = 0;
+}
+
+/** Get information about the backend pointer (for initialization). */
+void
+dmxBackendMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+{
+    const DMXScreenInfo *dmxScreen = dmxBackendInitPrivate(pDev);
+
+    info->buttonClass = 1;
+    dmxCommonMouGetMap(pDev, info->map, &info->numButtons);
+    info->valuatorClass = 1;
+    info->numRelAxes = 2;
+    info->minval[0] = 0;
+    info->minval[1] = 0;
+    info->maxval[0] = dmxScreen->beWidth;
+    info->maxval[1] = dmxScreen->beHeight;
+    info->res[0] = 1;
+    info->minres[0] = 0;
+    info->maxres[0] = 1;
+    info->ptrFeedbackClass = 1;
+}
+
+/** Get information about the backend keyboard (for initialization). */
+void
+dmxBackendKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+{
+    dmxCommonKbdGetInfo(pDev, info);
+    info->keyboard = 1;
+    info->keyClass = 1;
+    dmxCommonKbdGetMap(pDev, &info->keySyms, info->modMap);
+    info->freemap = 1;
+    info->focusClass = 1;
+    info->kbdFeedbackClass = 1;
+}
+
+/** Process #DMXFunctionType functions.  The only function handled here
+ * is to acknowledge a pending server shutdown. */
+int
+dmxBackendFunctions(pointer private, DMXFunctionType function)
+{
+    switch (function) {
+    case DMX_FUNCTION_TERMINATE:
+        return 1;
+    default:
+        return 0;
+    }
+}
diff --git a/xorg-server/hw/dmx/input/dmxcommon.c b/xorg-server/hw/dmx/input/dmxcommon.c
index 29c1958ad..5f25e8832 100644
--- a/xorg-server/hw/dmx/input/dmxcommon.c
+++ b/xorg-server/hw/dmx/input/dmxcommon.c
@@ -1,669 +1,698 @@
-/*

- * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   David H. Dawes <dawes@xfree86.org>

- *   Kevin E. Martin <kem@redhat.com>

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- */

-

-/** \file

- *

- * This file implements common routines used by the backend and console

- * input devices.

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#define DMX_STATE_DEBUG 0

-

-#include "dmxinputinit.h"

-#include "dmxcommon.h"

-#include "dmxconsole.h"

-#include "dmxprop.h"

-#include "dmxsync.h"

-#include "dmxmap.h"

-

-#include "inputstr.h"

-#include "input.h"

-#include <X11/keysym.h>

-#include "mipointer.h"

-#include "scrnintstr.h"

-

-#include <unistd.h>             /* For usleep() */

-

-#if DMX_STATE_DEBUG

-#define DMXDBG0(f)               dmxLog(dmxDebug,f)

-#else

-#define DMXDBG0(f)

-#endif

-

-/** Each device has a private area that is visible only from inside the

- * driver code. */ 

-typedef struct _myPrivate {

-    DMX_COMMON_PRIVATE;

-} myPrivate;

-

-static void dmxCommonKbdSetAR(Display *display,

-                              unsigned char *old, unsigned char *new)

-{

-    XKeyboardControl kc;

-    XKeyboardState   ks;

-    unsigned long    mask = KBKey | KBAutoRepeatMode;

-    int              i, j;

-    int              minKeycode, maxKeycode;

-

-    if (!old) {

-        XGetKeyboardControl(display, &ks);

-        old = (unsigned char *)ks.auto_repeats;

-    }

-

-    XDisplayKeycodes(display, &minKeycode, &maxKeycode);

-    for (i = 1; i < 32; i++) {

-        if (!old || old[i] != new[i]) {

-            for (j = 0; j < 8; j++) {

-                if ((new[i] & (1 << j)) != (old[i] & (1 << j))) {

-                    kc.key              = i * 8 + j;

-                    kc.auto_repeat_mode = ((new[i] & (1 << j))

-                                           ? AutoRepeatModeOn

-                                           : AutoRepeatModeOff);

-                    if (kc.key >= minKeycode && kc.key <= maxKeycode)

-                        XChangeKeyboardControl(display, mask, &kc);

-                }

-            }

-        }

-    }

-}

-

-static void dmxCommonKbdSetLeds(Display *display, unsigned long new)

-{

-    int              i;

-    XKeyboardControl kc;

-

-    for (i = 0; i < 32; i++) {

-        kc.led      = i + 1;

-        kc.led_mode = (new & (1 << i)) ? LedModeOn : LedModeOff;

-        XChangeKeyboardControl(display, KBLed | KBLedMode, &kc);

-    }

-}

-

-static void dmxCommonKbdSetCtrl(Display *display,

-                                KeybdCtrl *old, KeybdCtrl *new)

-{

-    XKeyboardControl kc;

-    unsigned long    mask = KBKeyClickPercent | KBAutoRepeatMode;

-

-    if (!old

-        || old->click         != new->click

-        || old->autoRepeat    != new->autoRepeat) {

-        

-        kc.key_click_percent = new->click;

-        kc.auto_repeat_mode  = new->autoRepeat;

-

-        XChangeKeyboardControl(display, mask, &kc);

-    }

-

-    dmxCommonKbdSetLeds(display, new->leds);

-    dmxCommonKbdSetAR(display, old ? old->autoRepeats : NULL,

-                      new->autoRepeats);

-}

-

-static void dmxCommonMouSetCtrl(Display *display, PtrCtrl *old, PtrCtrl *new)

-{

-    Bool do_accel, do_threshold;

-    

-    if (!old

-        || old->num != new->num

-        || old->den != new->den

-        || old->threshold != new->threshold) {

-        do_accel     = (new->num > 0 && new->den > 0);

-        do_threshold = (new->threshold > 0);

-        if (do_accel || do_threshold) {

-            XChangePointerControl(display, do_accel, do_threshold,

-                                  new->num, new->den, new->threshold);

-        }

-    }

-}

-

-/** Update the keyboard control. */

-void dmxCommonKbdCtrl(DevicePtr pDev, KeybdCtrl *ctrl)

-{

-    GETPRIVFROMPDEV;

-

-    if (!priv->stateSaved && priv->be) dmxCommonSaveState(priv);

-    if (!priv->display || !priv->stateSaved) return;

-    dmxCommonKbdSetCtrl(priv->display,

-                        priv->kctrlset ? &priv->kctrl : NULL,

-                        ctrl);

-    priv->kctrl    = *ctrl;

-    priv->kctrlset = 1;

-}

-

-/** Update the mouse control. */

-void dmxCommonMouCtrl(DevicePtr pDev, PtrCtrl *ctrl)

-{

-    GETPRIVFROMPDEV;

-

-                                /* Don't set the acceleration for the

-                                 * console, because that should be

-                                 * controlled by the X server that the

-                                 * console is running on.  Otherwise,

-                                 * the acceleration for the console

-                                 * window would be unexpected for the

-                                 * scale of the window. */

-    if (priv->be) {

-        dmxCommonMouSetCtrl(priv->display,

-                            priv->mctrlset ? &priv->mctrl : NULL,

-                            ctrl);

-        priv->mctrl    = *ctrl;

-        priv->mctrlset = 1;

-    }

-}

-

-/** Sound they keyboard bell. */

-void dmxCommonKbdBell(DevicePtr pDev, int percent,

-                      int volume, int pitch, int duration)

-{

-    GETPRIVFROMPDEV;

-    XKeyboardControl kc;

-    XKeyboardState   ks;

-    unsigned long    mask = KBBellPercent | KBBellPitch | KBBellDuration;

-    

-    if (!priv->be) XGetKeyboardControl(priv->display, &ks);

-    kc.bell_percent  = volume;

-    kc.bell_pitch    = pitch;

-    kc.bell_duration = duration;

-    XChangeKeyboardControl(priv->display, mask, &kc);

-    XBell(priv->display, percent);

-    if (!priv->be) {

-        kc.bell_percent  = ks.bell_percent;

-        kc.bell_pitch    = ks.bell_pitch;

-        kc.bell_duration = ks.bell_duration;

-        XChangeKeyboardControl(priv->display, mask, &kc);

-    }

-}

-

-/** Get the keyboard mapping. */

-void dmxCommonKbdGetMap(DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)

-{

-    GETPRIVFROMPDEV;

-    int             min_keycode;

-    int             max_keycode;

-    int             map_width;

-    KeySym          *keyboard_mapping;

-    XModifierKeymap *modifier_mapping;

-    int             i, j;

-

-                                /* Compute pKeySyms.  Cast

-                                 * XGetKeyboardMapping because of

-                                 * compiler warning on 64-bit machines.

-                                 * We assume pointers to 32-bit and

-                                 * 64-bit ints are the same. */

-    XDisplayKeycodes(priv->display, &min_keycode, &max_keycode);

-    keyboard_mapping     = (KeySym *)XGetKeyboardMapping(priv->display,

-                                                         min_keycode,

-                                                         max_keycode

-                                                         - min_keycode + 1,

-                                                         &map_width);

-    pKeySyms->minKeyCode = min_keycode;

-    pKeySyms->maxKeyCode = max_keycode;

-    pKeySyms->mapWidth   = map_width;

-    pKeySyms->map        = keyboard_mapping;

-

-

-                                /* Compute pModMap  */

-    modifier_mapping     = XGetModifierMapping(priv->display);

-    for (i = 0; i < MAP_LENGTH; i++)

-        pModMap[i] = 0;

-    for (j = 0; j < 8; j++) {

-        int max_keypermod = modifier_mapping->max_keypermod;

-        

-        for (i = 0; i < max_keypermod; i++) {

-            CARD8 keycode = modifier_mapping->modifiermap[j*max_keypermod + i];

-            if (keycode)

-                pModMap[keycode] |= 1 << j;

-        }

-    }

-    XFreeModifiermap(modifier_mapping);

-}

-

-/** Fill in the XKEYBOARD parts of the \a info structure for the

- * specified \a pDev. */

-void dmxCommonKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)

-{

-    GETPRIVFROMPDEV;

-    GETDMXINPUTFROMPRIV;

-    char *pt;

-

-    dmxCommonSaveState(priv);

-    if (priv->xkb) {

-#define NAME(x) \

- priv->xkb->names->x ? XGetAtomName(priv->display,priv->xkb->names->x) : NULL

-        info->names.keycodes = NAME(keycodes);

-        info->names.types    = NAME(types);

-        info->names.compat   = NAME(compat);

-        info->names.symbols  = NAME(symbols);

-        info->names.geometry = NAME(geometry);

-        info->freenames      = 1;

-#undef NAME

-        dmxLogInput(dmxInput,

-                    "XKEYBOARD: keycodes = %s\n", info->names.keycodes);

-        dmxLogInput(dmxInput,

-                    "XKEYBOARD: symbols  = %s\n", info->names.symbols);

-        dmxLogInput(dmxInput,

-                    "XKEYBOARD: geometry = %s\n", info->names.geometry);

-        if ((pt = strchr(info->names.keycodes, '+'))) *pt = '\0';

-    }

-    dmxCommonRestoreState(priv);

-}

-

-/** Turn \a pDev on (i.e., take input from \a pDev). */

-int dmxCommonKbdOn(DevicePtr pDev)

-{

-    GETPRIVFROMPDEV;

-    if (priv->be) dmxCommonSaveState(priv);

-    priv->eventMask |= DMX_KEYBOARD_EVENT_MASK;

-    XSelectInput(priv->display, priv->window, priv->eventMask);

-    if (priv->be)

-        XSetInputFocus(priv->display, priv->window, RevertToPointerRoot,

-                       CurrentTime);

-    return -1;

-}

-

-/** Turn \a pDev off. */

-void dmxCommonKbdOff(DevicePtr pDev)

-{

-    GETPRIVFROMPDEV;

-    priv->eventMask &= ~DMX_KEYBOARD_EVENT_MASK;

-    XSelectInput(priv->display, priv->window, priv->eventMask);

-    dmxCommonRestoreState(priv);

-}

-

-/** Turn \a pDev on (i.e., take input from \a pDev). */

-int dmxCommonOthOn(DevicePtr pDev)

-{

-    GETPRIVFROMPDEV;

-    GETDMXINPUTFROMPRIV;

-    XEventClass event_list[DMX_MAX_XINPUT_EVENT_TYPES];

-    int         event_type[DMX_MAX_XINPUT_EVENT_TYPES];

-    int         count = 0;

-

-#define ADD(type)                                                            \

-    if (count < DMX_MAX_XINPUT_EVENT_TYPES) {                                \

-        type(priv->xi, event_type[count], event_list[count]);                \

-        if (event_type[count]) {                                             \

-            dmxMapInsert(dmxLocal, event_type[count], XI_##type);            \

-            ++count;                                                         \

-        }                                                                    \

-    } else {                                                                 \

-        dmxLog(dmxWarning, "More than %d event types for %s\n",              \

-               DMX_MAX_XINPUT_EVENT_TYPES, dmxInput->name);                  \

-    }

-

-    if (!(priv->xi = XOpenDevice(priv->display, dmxLocal->deviceId))) {

-        dmxLog(dmxWarning, "Cannot open %s device (id=%d) on %s\n",

-               dmxLocal->deviceName ? dmxLocal->deviceName : "(unknown)",

-               dmxLocal->deviceId, dmxInput->name);

-        return -1;

-    }

-    ADD(DeviceKeyPress);

-    ADD(DeviceKeyRelease);

-    ADD(DeviceButtonPress);

-    ADD(DeviceButtonRelease);

-    ADD(DeviceMotionNotify);

-    ADD(DeviceFocusIn);

-    ADD(DeviceFocusOut);

-    ADD(ProximityIn);

-    ADD(ProximityOut);

-    ADD(DeviceStateNotify);

-    ADD(DeviceMappingNotify);

-    ADD(ChangeDeviceNotify);

-    XSelectExtensionEvent(priv->display, priv->window, event_list, count);

-    

-    return -1;

-}

-

-/** Turn \a pDev off. */

-void dmxCommonOthOff(DevicePtr pDev)

-{

-    GETPRIVFROMPDEV;

-    

-    if (priv->xi) XCloseDevice(priv->display, priv->xi);

-    priv->xi = NULL;

-}

-

-/** Fill the \a info structure with information needed to initialize \a

- * pDev. */ 

-void dmxCommonOthGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)

-{

-    GETPRIVFROMPDEV;

-    GETDMXINPUTFROMPRIV;

-    XExtensionVersion    *ext;

-    XDeviceInfo          *devices;

-    Display              *display = priv->display;

-    int                  num;

-    int                  i, j, k;

-    XextErrorHandler     handler;

-

-    if (!display && !(display = XOpenDisplay(dmxInput->name)))

-        return;

-    

-    /* Print out information about the XInput Extension. */

-    handler = XSetExtensionErrorHandler(dmxInputExtensionErrorHandler);

-    ext     = XGetExtensionVersion(display, INAME);

-    XSetExtensionErrorHandler(handler);

-

-    if (ext && ext != (XExtensionVersion *)NoSuchExtension) {

-        XFree(ext);

-        devices = XListInputDevices(display, &num);

-        for (i = 0; i < num; i++) {

-            if (devices[i].id == (XID)dmxLocal->deviceId) {

-                XAnyClassPtr     any;

-                XKeyInfoPtr      ki;

-                XButtonInfoPtr   bi;

-                XValuatorInfoPtr vi;

-                for (j = 0, any = devices[i].inputclassinfo;

-                     j < devices[i].num_classes;

-                     any = (XAnyClassPtr)((char *)any + any->length), j++) {

-                    switch (any->class) {

-                    case KeyClass:

-                        ki = (XKeyInfoPtr)any;

-                        info->keyboard           = 1;

-                        info->keyClass           = 1;

-                        info->keySyms.minKeyCode = ki->min_keycode;

-                        info->keySyms.maxKeyCode = ki->max_keycode;

-                        info->kbdFeedbackClass   = 1;

-                        break;

-                    case ButtonClass:

-                        bi = (XButtonInfoPtr)any;

-                        info->buttonClass        = 1;

-                        info->numButtons         = bi->num_buttons;

-                        info->ptrFeedbackClass   = 1;

-                        break;

-                    case ValuatorClass:

-                                /* This assume all axes are either

-                                 * Absolute or Relative. */

-                        vi = (XValuatorInfoPtr)any;

-                        info->valuatorClass      = 1;

-                        if (vi->mode == Absolute)

-                            info->numAbsAxes     = vi->num_axes;

-                        else

-                            info->numRelAxes     = vi->num_axes;

-                        for (k = 0; k < vi->num_axes; k++) {

-                            info->res[k]         = vi->axes[k].resolution;

-                            info->minres[k]      = vi->axes[k].resolution;

-                            info->maxres[k]      = vi->axes[k].resolution;

-                            info->minval[k]      = vi->axes[k].min_value;

-                            info->maxval[k]      = vi->axes[k].max_value;

-                        }

-                        break;

-                    case FeedbackClass:

-                                /* Only keyboard and pointer feedback

-                                 * are handled at this time. */

-                        break;

-                    case ProximityClass:

-                        info->proximityClass     = 1;

-                        break;

-                    case FocusClass:

-                        info->focusClass         = 1;

-                        break;

-                    case OtherClass:

-                        break;

-                    }

-                }

-            }

-        }

-        XFreeDeviceList(devices);

-    }

-    if (display != priv->display) XCloseDisplay(display);

-}

-

-/** Obtain the mouse button mapping. */

-void dmxCommonMouGetMap(DevicePtr pDev, unsigned char *map, int *nButtons)

-{

-    GETPRIVFROMPDEV;

-    int i;

-    

-    *nButtons = XGetPointerMapping(priv->display, map, DMX_MAX_BUTTONS);

-    for (i = 0; i <= *nButtons; i++) map[i] = i;

-}

-

-static void *dmxCommonXSelect(DMXScreenInfo *dmxScreen, void *closure)

-{

-    myPrivate *priv = closure;

-    XSelectInput(dmxScreen->beDisplay, dmxScreen->scrnWin, priv->eventMask);

-    return NULL;

-}

-

-static void *dmxCommonAddEnabledDevice(DMXScreenInfo *dmxScreen, void *closure)

-{

-    AddEnabledDevice(XConnectionNumber(dmxScreen->beDisplay));

-    return NULL;

-}

-

-static void *dmxCommonRemoveEnabledDevice(DMXScreenInfo *dmxScreen,

-                                          void *closure)

-{

-    RemoveEnabledDevice(XConnectionNumber(dmxScreen->beDisplay));

-    return NULL;

-}

-

-/** Turn \a pDev on (i.e., take input from \a pDev). */

-int dmxCommonMouOn(DevicePtr pDev)

-{

-    GETPRIVFROMPDEV;

-    GETDMXINPUTFROMPRIV;

-

-    priv->eventMask |= DMX_POINTER_EVENT_MASK;

-    if (dmxShadowFB) {

-        XWarpPointer(priv->display, priv->window, priv->window,

-                     0, 0, 0, 0,

-                     priv->initPointerX,

-                     priv->initPointerY);

-        dmxSync(&dmxScreens[dmxInput->scrnIdx], TRUE);

-    }

-    if (!priv->be) {

-        XSelectInput(priv->display, priv->window, priv->eventMask);

-        AddEnabledDevice(XConnectionNumber(priv->display));

-    } else {

-        dmxPropertyIterate(priv->be, dmxCommonXSelect, priv);

-        dmxPropertyIterate(priv->be, dmxCommonAddEnabledDevice, dmxInput);

-    }

-    

-    return -1;

-}

-

-/** Turn \a pDev off. */

-void dmxCommonMouOff(DevicePtr pDev)

-{

-    GETPRIVFROMPDEV;

-    GETDMXINPUTFROMPRIV;

-    

-    priv->eventMask &= ~DMX_POINTER_EVENT_MASK;

-    if (!priv->be) {

-        RemoveEnabledDevice(XConnectionNumber(priv->display));

-        XSelectInput(priv->display, priv->window, priv->eventMask);

-    } else {

-        dmxPropertyIterate(priv->be, dmxCommonRemoveEnabledDevice, dmxInput);

-        dmxPropertyIterate(priv->be, dmxCommonXSelect, priv);

-    }

-}

-

-/** Given the global coordinates \a x and \a y, determine the screen

- * with the lowest number on which those coordinates lie.  If they are

- * not on any screen, return -1.  The number returned is an index into

- * \a dmxScreenInfo and is between -1 and \a dmxNumScreens - 1,

- * inclusive. */

-int dmxFindPointerScreen(int x, int y)

-{

-    int i;

-

-    for (i = 0; i < dmxNumScreens; i++) {

-	ScreenPtr pScreen = screenInfo.screens[i];

-	if (x >= pScreen->x && x < pScreen->x + pScreen->width &&

-	    y >= pScreen->y && y < pScreen->y + pScreen->height)

-	    return i;

-    }

-    return -1;

-}

-

-/** Returns a pointer to the private area for the device that comes just

- * prior to \a pDevice in the current \a dmxInput device list.  This is

- * used as the private area for the current device in some situations

- * (e.g., when a keyboard and mouse form a pair that should share the

- * same private area).  If the requested private area cannot be located,

- * then NULL is returned. */

-pointer dmxCommonCopyPrivate(DeviceIntPtr pDevice)

-{

-    GETDMXLOCALFROMPDEVICE;

-    DMXInputInfo *dmxInput = &dmxInputs[dmxLocal->inputIdx];

-    int          i;

-

-    for (i = 0; i < dmxInput->numDevs; i++)

-        if (dmxInput->devs[i] == dmxLocal && i)

-            return dmxInput->devs[i-1]->private;

-    return NULL;

-}

-

-/** This routine saves and resets some important state for the backend

- * and console device drivers:

- * - the modifier map is saved and set to 0 (so DMX controls the LEDs)

- * - the key click, bell, led, and repeat masks are saved and set to the

- * values that DMX claims to be using

- *

- * This routine and #dmxCommonRestoreState are used when the pointer

- * enters and leaves the console window, or when the backend window is

- * active or not active (for a full-screen window, this only happens at

- * server startup and server shutdown).

- */

-void dmxCommonSaveState(pointer private)

-{

-    GETPRIVFROMPRIVATE;

-    XKeyboardState   ks;

-    unsigned long    i;

-    XModifierKeymap  *modmap;

-

-    if (dmxInput->console) priv = dmxInput->devs[0]->private;

-    if (!priv->display || priv->stateSaved) return;

-    DMXDBG0("dmxCommonSaveState\n");

-    if (dmxUseXKB && (priv->xkb = XkbAllocKeyboard())) {

-        if (XkbGetIndicatorMap(priv->display, XkbAllIndicatorsMask, priv->xkb)

-            || XkbGetNames(priv->display, XkbAllNamesMask, priv->xkb)) {

-            dmxLogInput(dmxInput, "Could not get XKB information\n");

-            XkbFreeKeyboard(priv->xkb, 0, True);

-            priv->xkb = NULL;

-        } else {

-            if (priv->xkb->indicators) {

-                priv->savedIndicators = *priv->xkb->indicators;

-                for (i = 0; i < XkbNumIndicators; i++)

-                    if (priv->xkb->indicators->phys_indicators & (1 << i)) {

-                        priv->xkb->indicators->maps[i].flags

-                            = XkbIM_NoAutomatic;

-                    }

-                XkbSetIndicatorMap(priv->display, ~0, priv->xkb);

-            }

-        }

-    }

-

-    XGetKeyboardControl(priv->display, &ks);

-    priv->savedKctrl.click              = ks.key_click_percent;

-    priv->savedKctrl.bell               = ks.bell_percent;

-    priv->savedKctrl.bell_pitch         = ks.bell_pitch;

-    priv->savedKctrl.bell_duration      = ks.bell_duration;

-    priv->savedKctrl.leds               = ks.led_mask;

-    priv->savedKctrl.autoRepeat         = ks.global_auto_repeat;

-    for (i = 0; i < 32; i++)

-        priv->savedKctrl.autoRepeats[i] = ks.auto_repeats[i];

-    

-    dmxCommonKbdSetCtrl(priv->display, &priv->savedKctrl,

-                        &priv->dmxLocal->kctrl);

-

-    priv->savedModMap                   = XGetModifierMapping(priv->display);

-

-    modmap                              = XNewModifiermap(0);

-    XSetModifierMapping(priv->display, modmap);

-    if (dmxInput->scrnIdx != -1)

-        dmxSync(&dmxScreens[dmxInput->scrnIdx], TRUE);

-    XFreeModifiermap(modmap);

-

-    priv->stateSaved = 1;

-}

-

-/** This routine restores all the information saved by #dmxCommonSaveState. */

-void dmxCommonRestoreState(pointer private)

-{

-    GETPRIVFROMPRIVATE;

-    int retcode = -1;

-    CARD32 start;

-

-    if (dmxInput->console)

-        priv = dmxInput->devs[0]->private;

-    if (!priv->stateSaved)

-        return;

-    priv->stateSaved = 0;

-    

-    DMXDBG0("dmxCommonRestoreState\n");

-    if (priv->xkb) {

-        *priv->xkb->indicators = priv->savedIndicators;

-        XkbSetIndicatorMap(priv->display, ~0, priv->xkb);

-        XkbFreeKeyboard(priv->xkb, 0, True);

-        priv->xkb = 0;

-    }

-

-    for (start = GetTimeInMillis(); GetTimeInMillis() - start < 5000;) {

-        CARD32 tmp;

-        

-        retcode = XSetModifierMapping(priv->display, priv->savedModMap);

-        if (retcode == MappingSuccess)

-            break;

-        if (retcode == MappingBusy)

-            dmxLogInput(dmxInput, "Keyboard busy, waiting\n");

-        else

-            dmxLogInput(dmxInput, "Keyboard error, waiting\n");

-

-                                /* Don't generate X11 protocol for a bit */

-        for (tmp = GetTimeInMillis(); GetTimeInMillis() - tmp < 250;) {

-            usleep(250);            /* This ends up sleeping only until

-                                     * the next key press generates an

-                                     * interruption.  We make the delay

-                                     * relatively short in case the user

-                                     * pressed they keys quickly. */

-        }

-

-    }

-    if (retcode != MappingSuccess)

-        dmxLog(dmxWarning, "Unable to restore keyboard modifier state!\n");

-    

-    XFreeModifiermap(priv->savedModMap);

-    priv->savedModMap = NULL;

-

-    dmxCommonKbdSetCtrl(priv->display, NULL, &priv->savedKctrl);

-    priv->kctrlset = 0;         /* Invalidate copy */

-}

+/*
+ * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   David H. Dawes <dawes@xfree86.org>
+ *   Kevin E. Martin <kem@redhat.com>
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ */
+
+/** \file
+ *
+ * This file implements common routines used by the backend and console
+ * input devices.
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#define DMX_STATE_DEBUG 0
+
+#include "dmxinputinit.h"
+#include "dmxcommon.h"
+#include "dmxconsole.h"
+#include "dmxprop.h"
+#include "dmxsync.h"
+#include "dmxmap.h"
+
+#include "inputstr.h"
+#include "input.h"
+#include <X11/keysym.h>
+#include "mipointer.h"
+#include "scrnintstr.h"
+
+#include <unistd.h>             /* For usleep() */
+
+#if DMX_STATE_DEBUG
+#define DMXDBG0(f)               dmxLog(dmxDebug,f)
+#else
+#define DMXDBG0(f)
+#endif
+
+/** Each device has a private area that is visible only from inside the
+ * driver code. */
+typedef struct _myPrivate {
+    DMX_COMMON_PRIVATE;
+} myPrivate;
+
+static void
+dmxCommonKbdSetAR(Display * display, unsigned char *old, unsigned char *new)
+{
+    XKeyboardControl kc;
+    XKeyboardState ks;
+    unsigned long mask = KBKey | KBAutoRepeatMode;
+    int i, j;
+    int minKeycode, maxKeycode;
+
+    if (!old) {
+        XGetKeyboardControl(display, &ks);
+        old = (unsigned char *) ks.auto_repeats;
+    }
+
+    XDisplayKeycodes(display, &minKeycode, &maxKeycode);
+    for (i = 1; i < 32; i++) {
+        if (!old || old[i] != new[i]) {
+            for (j = 0; j < 8; j++) {
+                if ((new[i] & (1 << j)) != (old[i] & (1 << j))) {
+                    kc.key = i * 8 + j;
+                    kc.auto_repeat_mode = ((new[i] & (1 << j))
+                                           ? AutoRepeatModeOn
+                                           : AutoRepeatModeOff);
+                    if (kc.key >= minKeycode && kc.key <= maxKeycode)
+                        XChangeKeyboardControl(display, mask, &kc);
+                }
+            }
+        }
+    }
+}
+
+static void
+dmxCommonKbdSetLeds(Display * display, unsigned long new)
+{
+    int i;
+    XKeyboardControl kc;
+
+    for (i = 0; i < 32; i++) {
+        kc.led = i + 1;
+        kc.led_mode = (new & (1 << i)) ? LedModeOn : LedModeOff;
+        XChangeKeyboardControl(display, KBLed | KBLedMode, &kc);
+    }
+}
+
+static void
+dmxCommonKbdSetCtrl(Display * display, KeybdCtrl * old, KeybdCtrl * new)
+{
+    XKeyboardControl kc;
+    unsigned long mask = KBKeyClickPercent | KBAutoRepeatMode;
+
+    if (!old || old->click != new->click || old->autoRepeat != new->autoRepeat) {
+
+        kc.key_click_percent = new->click;
+        kc.auto_repeat_mode = new->autoRepeat;
+
+        XChangeKeyboardControl(display, mask, &kc);
+    }
+
+    dmxCommonKbdSetLeds(display, new->leds);
+    dmxCommonKbdSetAR(display, old ? old->autoRepeats : NULL, new->autoRepeats);
+}
+
+static void
+dmxCommonMouSetCtrl(Display * display, PtrCtrl * old, PtrCtrl * new)
+{
+    Bool do_accel, do_threshold;
+
+    if (!old
+        || old->num != new->num
+        || old->den != new->den || old->threshold != new->threshold) {
+        do_accel = (new->num > 0 && new->den > 0);
+        do_threshold = (new->threshold > 0);
+        if (do_accel || do_threshold) {
+            XChangePointerControl(display, do_accel, do_threshold,
+                                  new->num, new->den, new->threshold);
+        }
+    }
+}
+
+/** Update the keyboard control. */
+void
+dmxCommonKbdCtrl(DevicePtr pDev, KeybdCtrl * ctrl)
+{
+    GETPRIVFROMPDEV;
+
+    if (!priv->stateSaved && priv->be)
+        dmxCommonSaveState(priv);
+    if (!priv->display || !priv->stateSaved)
+        return;
+    dmxCommonKbdSetCtrl(priv->display,
+                        priv->kctrlset ? &priv->kctrl : NULL, ctrl);
+    priv->kctrl = *ctrl;
+    priv->kctrlset = 1;
+}
+
+/** Update the mouse control. */
+void
+dmxCommonMouCtrl(DevicePtr pDev, PtrCtrl * ctrl)
+{
+    GETPRIVFROMPDEV;
+
+    /* Don't set the acceleration for the
+     * console, because that should be
+     * controlled by the X server that the
+     * console is running on.  Otherwise,
+     * the acceleration for the console
+     * window would be unexpected for the
+     * scale of the window. */
+    if (priv->be) {
+        dmxCommonMouSetCtrl(priv->display,
+                            priv->mctrlset ? &priv->mctrl : NULL, ctrl);
+        priv->mctrl = *ctrl;
+        priv->mctrlset = 1;
+    }
+}
+
+/** Sound they keyboard bell. */
+void
+dmxCommonKbdBell(DevicePtr pDev, int percent,
+                 int volume, int pitch, int duration)
+{
+    GETPRIVFROMPDEV;
+    XKeyboardControl kc;
+    XKeyboardState ks;
+    unsigned long mask = KBBellPercent | KBBellPitch | KBBellDuration;
+
+    if (!priv->be)
+        XGetKeyboardControl(priv->display, &ks);
+    kc.bell_percent = volume;
+    kc.bell_pitch = pitch;
+    kc.bell_duration = duration;
+    XChangeKeyboardControl(priv->display, mask, &kc);
+    XBell(priv->display, percent);
+    if (!priv->be) {
+        kc.bell_percent = ks.bell_percent;
+        kc.bell_pitch = ks.bell_pitch;
+        kc.bell_duration = ks.bell_duration;
+        XChangeKeyboardControl(priv->display, mask, &kc);
+    }
+}
+
+/** Get the keyboard mapping. */
+void
+dmxCommonKbdGetMap(DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)
+{
+    GETPRIVFROMPDEV;
+    int min_keycode;
+    int max_keycode;
+    int map_width;
+    KeySym *keyboard_mapping;
+    XModifierKeymap *modifier_mapping;
+    int i, j;
+
+    /* Compute pKeySyms.  Cast
+     * XGetKeyboardMapping because of
+     * compiler warning on 64-bit machines.
+     * We assume pointers to 32-bit and
+     * 64-bit ints are the same. */
+    XDisplayKeycodes(priv->display, &min_keycode, &max_keycode);
+    keyboard_mapping = (KeySym *) XGetKeyboardMapping(priv->display,
+                                                      min_keycode,
+                                                      max_keycode
+                                                      - min_keycode + 1,
+                                                      &map_width);
+    pKeySyms->minKeyCode = min_keycode;
+    pKeySyms->maxKeyCode = max_keycode;
+    pKeySyms->mapWidth = map_width;
+    pKeySyms->map = keyboard_mapping;
+
+    /* Compute pModMap  */
+    modifier_mapping = XGetModifierMapping(priv->display);
+    for (i = 0; i < MAP_LENGTH; i++)
+        pModMap[i] = 0;
+    for (j = 0; j < 8; j++) {
+        int max_keypermod = modifier_mapping->max_keypermod;
+
+        for (i = 0; i < max_keypermod; i++) {
+            CARD8 keycode =
+                modifier_mapping->modifiermap[j * max_keypermod + i];
+            if (keycode)
+                pModMap[keycode] |= 1 << j;
+        }
+    }
+    XFreeModifiermap(modifier_mapping);
+}
+
+/** Fill in the XKEYBOARD parts of the \a info structure for the
+ * specified \a pDev. */
+void
+dmxCommonKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+{
+    GETPRIVFROMPDEV;
+    GETDMXINPUTFROMPRIV;
+    char *pt;
+
+    dmxCommonSaveState(priv);
+    if (priv->xkb) {
+#define NAME(x) \
+ priv->xkb->names->x ? XGetAtomName(priv->display,priv->xkb->names->x) : NULL
+        info->names.keycodes = NAME(keycodes);
+        info->names.types = NAME(types);
+        info->names.compat = NAME(compat);
+        info->names.symbols = NAME(symbols);
+        info->names.geometry = NAME(geometry);
+        info->freenames = 1;
+#undef NAME
+        dmxLogInput(dmxInput,
+                    "XKEYBOARD: keycodes = %s\n", info->names.keycodes);
+        dmxLogInput(dmxInput,
+                    "XKEYBOARD: symbols  = %s\n", info->names.symbols);
+        dmxLogInput(dmxInput,
+                    "XKEYBOARD: geometry = %s\n", info->names.geometry);
+        if ((pt = strchr(info->names.keycodes, '+')))
+            *pt = '\0';
+    }
+    dmxCommonRestoreState(priv);
+}
+
+/** Turn \a pDev on (i.e., take input from \a pDev). */
+int
+dmxCommonKbdOn(DevicePtr pDev)
+{
+    GETPRIVFROMPDEV;
+    if (priv->be)
+        dmxCommonSaveState(priv);
+    priv->eventMask |= DMX_KEYBOARD_EVENT_MASK;
+    XSelectInput(priv->display, priv->window, priv->eventMask);
+    if (priv->be)
+        XSetInputFocus(priv->display, priv->window, RevertToPointerRoot,
+                       CurrentTime);
+    return -1;
+}
+
+/** Turn \a pDev off. */
+void
+dmxCommonKbdOff(DevicePtr pDev)
+{
+    GETPRIVFROMPDEV;
+    priv->eventMask &= ~DMX_KEYBOARD_EVENT_MASK;
+    XSelectInput(priv->display, priv->window, priv->eventMask);
+    dmxCommonRestoreState(priv);
+}
+
+/** Turn \a pDev on (i.e., take input from \a pDev). */
+int
+dmxCommonOthOn(DevicePtr pDev)
+{
+    GETPRIVFROMPDEV;
+    GETDMXINPUTFROMPRIV;
+    XEventClass event_list[DMX_MAX_XINPUT_EVENT_TYPES];
+    int event_type[DMX_MAX_XINPUT_EVENT_TYPES];
+    int count = 0;
+
+#define ADD(type)                                                            \
+    if (count < DMX_MAX_XINPUT_EVENT_TYPES) {                                \
+        type(priv->xi, event_type[count], event_list[count]);                \
+        if (event_type[count]) {                                             \
+            dmxMapInsert(dmxLocal, event_type[count], XI_##type);            \
+            ++count;                                                         \
+        }                                                                    \
+    } else {                                                                 \
+        dmxLog(dmxWarning, "More than %d event types for %s\n",              \
+               DMX_MAX_XINPUT_EVENT_TYPES, dmxInput->name);                  \
+    }
+
+    if (!(priv->xi = XOpenDevice(priv->display, dmxLocal->deviceId))) {
+        dmxLog(dmxWarning, "Cannot open %s device (id=%d) on %s\n",
+               dmxLocal->deviceName ? dmxLocal->deviceName : "(unknown)",
+               dmxLocal->deviceId, dmxInput->name);
+        return -1;
+    }
+    ADD(DeviceKeyPress);
+    ADD(DeviceKeyRelease);
+    ADD(DeviceButtonPress);
+    ADD(DeviceButtonRelease);
+    ADD(DeviceMotionNotify);
+    ADD(DeviceFocusIn);
+    ADD(DeviceFocusOut);
+    ADD(ProximityIn);
+    ADD(ProximityOut);
+    ADD(DeviceStateNotify);
+    ADD(DeviceMappingNotify);
+    ADD(ChangeDeviceNotify);
+    XSelectExtensionEvent(priv->display, priv->window, event_list, count);
+
+    return -1;
+}
+
+/** Turn \a pDev off. */
+void
+dmxCommonOthOff(DevicePtr pDev)
+{
+    GETPRIVFROMPDEV;
+
+    if (priv->xi)
+        XCloseDevice(priv->display, priv->xi);
+    priv->xi = NULL;
+}
+
+/** Fill the \a info structure with information needed to initialize \a
+ * pDev. */
+void
+dmxCommonOthGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+{
+    GETPRIVFROMPDEV;
+    GETDMXINPUTFROMPRIV;
+    XExtensionVersion *ext;
+    XDeviceInfo *devices;
+    Display *display = priv->display;
+    int num;
+    int i, j, k;
+    XextErrorHandler handler;
+
+    if (!display && !(display = XOpenDisplay(dmxInput->name)))
+        return;
+
+    /* Print out information about the XInput Extension. */
+    handler = XSetExtensionErrorHandler(dmxInputExtensionErrorHandler);
+    ext = XGetExtensionVersion(display, INAME);
+    XSetExtensionErrorHandler(handler);
+
+    if (ext && ext != (XExtensionVersion *) NoSuchExtension) {
+        XFree(ext);
+        devices = XListInputDevices(display, &num);
+        for (i = 0; i < num; i++) {
+            if (devices[i].id == (XID) dmxLocal->deviceId) {
+                XAnyClassPtr any;
+                XKeyInfoPtr ki;
+                XButtonInfoPtr bi;
+                XValuatorInfoPtr vi;
+
+                for (j = 0, any = devices[i].inputclassinfo;
+                     j < devices[i].num_classes;
+                     any = (XAnyClassPtr) ((char *) any + any->length), j++) {
+                    switch (any->class) {
+                    case KeyClass:
+                        ki = (XKeyInfoPtr) any;
+                        info->keyboard = 1;
+                        info->keyClass = 1;
+                        info->keySyms.minKeyCode = ki->min_keycode;
+                        info->keySyms.maxKeyCode = ki->max_keycode;
+                        info->kbdFeedbackClass = 1;
+                        break;
+                    case ButtonClass:
+                        bi = (XButtonInfoPtr) any;
+                        info->buttonClass = 1;
+                        info->numButtons = bi->num_buttons;
+                        info->ptrFeedbackClass = 1;
+                        break;
+                    case ValuatorClass:
+                        /* This assume all axes are either
+                         * Absolute or Relative. */
+                        vi = (XValuatorInfoPtr) any;
+                        info->valuatorClass = 1;
+                        if (vi->mode == Absolute)
+                            info->numAbsAxes = vi->num_axes;
+                        else
+                            info->numRelAxes = vi->num_axes;
+                        for (k = 0; k < vi->num_axes; k++) {
+                            info->res[k] = vi->axes[k].resolution;
+                            info->minres[k] = vi->axes[k].resolution;
+                            info->maxres[k] = vi->axes[k].resolution;
+                            info->minval[k] = vi->axes[k].min_value;
+                            info->maxval[k] = vi->axes[k].max_value;
+                        }
+                        break;
+                    case FeedbackClass:
+                        /* Only keyboard and pointer feedback
+                         * are handled at this time. */
+                        break;
+                    case ProximityClass:
+                        info->proximityClass = 1;
+                        break;
+                    case FocusClass:
+                        info->focusClass = 1;
+                        break;
+                    case OtherClass:
+                        break;
+                    }
+                }
+            }
+        }
+        XFreeDeviceList(devices);
+    }
+    if (display != priv->display)
+        XCloseDisplay(display);
+}
+
+/** Obtain the mouse button mapping. */
+void
+dmxCommonMouGetMap(DevicePtr pDev, unsigned char *map, int *nButtons)
+{
+    GETPRIVFROMPDEV;
+    int i;
+
+    *nButtons = XGetPointerMapping(priv->display, map, DMX_MAX_BUTTONS);
+    for (i = 0; i <= *nButtons; i++)
+        map[i] = i;
+}
+
+static void *
+dmxCommonXSelect(DMXScreenInfo * dmxScreen, void *closure)
+{
+    myPrivate *priv = closure;
+
+    XSelectInput(dmxScreen->beDisplay, dmxScreen->scrnWin, priv->eventMask);
+    return NULL;
+}
+
+static void *
+dmxCommonAddEnabledDevice(DMXScreenInfo * dmxScreen, void *closure)
+{
+    AddEnabledDevice(XConnectionNumber(dmxScreen->beDisplay));
+    return NULL;
+}
+
+static void *
+dmxCommonRemoveEnabledDevice(DMXScreenInfo * dmxScreen, void *closure)
+{
+    RemoveEnabledDevice(XConnectionNumber(dmxScreen->beDisplay));
+    return NULL;
+}
+
+/** Turn \a pDev on (i.e., take input from \a pDev). */
+int
+dmxCommonMouOn(DevicePtr pDev)
+{
+    GETPRIVFROMPDEV;
+    GETDMXINPUTFROMPRIV;
+
+    priv->eventMask |= DMX_POINTER_EVENT_MASK;
+    if (dmxShadowFB) {
+        XWarpPointer(priv->display, priv->window, priv->window,
+                     0, 0, 0, 0, priv->initPointerX, priv->initPointerY);
+        dmxSync(&dmxScreens[dmxInput->scrnIdx], TRUE);
+    }
+    if (!priv->be) {
+        XSelectInput(priv->display, priv->window, priv->eventMask);
+        AddEnabledDevice(XConnectionNumber(priv->display));
+    }
+    else {
+        dmxPropertyIterate(priv->be, dmxCommonXSelect, priv);
+        dmxPropertyIterate(priv->be, dmxCommonAddEnabledDevice, dmxInput);
+    }
+
+    return -1;
+}
+
+/** Turn \a pDev off. */
+void
+dmxCommonMouOff(DevicePtr pDev)
+{
+    GETPRIVFROMPDEV;
+    GETDMXINPUTFROMPRIV;
+
+    priv->eventMask &= ~DMX_POINTER_EVENT_MASK;
+    if (!priv->be) {
+        RemoveEnabledDevice(XConnectionNumber(priv->display));
+        XSelectInput(priv->display, priv->window, priv->eventMask);
+    }
+    else {
+        dmxPropertyIterate(priv->be, dmxCommonRemoveEnabledDevice, dmxInput);
+        dmxPropertyIterate(priv->be, dmxCommonXSelect, priv);
+    }
+}
+
+/** Given the global coordinates \a x and \a y, determine the screen
+ * with the lowest number on which those coordinates lie.  If they are
+ * not on any screen, return -1.  The number returned is an index into
+ * \a dmxScreenInfo and is between -1 and \a dmxNumScreens - 1,
+ * inclusive. */
+int
+dmxFindPointerScreen(int x, int y)
+{
+    int i;
+
+    for (i = 0; i < dmxNumScreens; i++) {
+        ScreenPtr pScreen = screenInfo.screens[i];
+
+        if (x >= pScreen->x && x < pScreen->x + pScreen->width &&
+            y >= pScreen->y && y < pScreen->y + pScreen->height)
+            return i;
+    }
+    return -1;
+}
+
+/** Returns a pointer to the private area for the device that comes just
+ * prior to \a pDevice in the current \a dmxInput device list.  This is
+ * used as the private area for the current device in some situations
+ * (e.g., when a keyboard and mouse form a pair that should share the
+ * same private area).  If the requested private area cannot be located,
+ * then NULL is returned. */
+pointer
+dmxCommonCopyPrivate(DeviceIntPtr pDevice)
+{
+    GETDMXLOCALFROMPDEVICE;
+    DMXInputInfo *dmxInput = &dmxInputs[dmxLocal->inputIdx];
+    int i;
+
+    for (i = 0; i < dmxInput->numDevs; i++)
+        if (dmxInput->devs[i] == dmxLocal && i)
+            return dmxInput->devs[i - 1]->private;
+    return NULL;
+}
+
+/** This routine saves and resets some important state for the backend
+ * and console device drivers:
+ * - the modifier map is saved and set to 0 (so DMX controls the LEDs)
+ * - the key click, bell, led, and repeat masks are saved and set to the
+ * values that DMX claims to be using
+ *
+ * This routine and #dmxCommonRestoreState are used when the pointer
+ * enters and leaves the console window, or when the backend window is
+ * active or not active (for a full-screen window, this only happens at
+ * server startup and server shutdown).
+ */
+void
+dmxCommonSaveState(pointer private)
+{
+    GETPRIVFROMPRIVATE;
+    XKeyboardState ks;
+    unsigned long i;
+    XModifierKeymap *modmap;
+
+    if (dmxInput->console)
+        priv = dmxInput->devs[0]->private;
+    if (!priv->display || priv->stateSaved)
+        return;
+    DMXDBG0("dmxCommonSaveState\n");
+    if (dmxUseXKB && (priv->xkb = XkbAllocKeyboard())) {
+        if (XkbGetIndicatorMap(priv->display, XkbAllIndicatorsMask, priv->xkb)
+            || XkbGetNames(priv->display, XkbAllNamesMask, priv->xkb)) {
+            dmxLogInput(dmxInput, "Could not get XKB information\n");
+            XkbFreeKeyboard(priv->xkb, 0, True);
+            priv->xkb = NULL;
+        }
+        else {
+            if (priv->xkb->indicators) {
+                priv->savedIndicators = *priv->xkb->indicators;
+                for (i = 0; i < XkbNumIndicators; i++)
+                    if (priv->xkb->indicators->phys_indicators & (1 << i)) {
+                        priv->xkb->indicators->maps[i].flags
+                            = XkbIM_NoAutomatic;
+                    }
+                XkbSetIndicatorMap(priv->display, ~0, priv->xkb);
+            }
+        }
+    }
+
+    XGetKeyboardControl(priv->display, &ks);
+    priv->savedKctrl.click = ks.key_click_percent;
+    priv->savedKctrl.bell = ks.bell_percent;
+    priv->savedKctrl.bell_pitch = ks.bell_pitch;
+    priv->savedKctrl.bell_duration = ks.bell_duration;
+    priv->savedKctrl.leds = ks.led_mask;
+    priv->savedKctrl.autoRepeat = ks.global_auto_repeat;
+    for (i = 0; i < 32; i++)
+        priv->savedKctrl.autoRepeats[i] = ks.auto_repeats[i];
+
+    dmxCommonKbdSetCtrl(priv->display, &priv->savedKctrl,
+                        &priv->dmxLocal->kctrl);
+
+    priv->savedModMap = XGetModifierMapping(priv->display);
+
+    modmap = XNewModifiermap(0);
+    XSetModifierMapping(priv->display, modmap);
+    if (dmxInput->scrnIdx != -1)
+        dmxSync(&dmxScreens[dmxInput->scrnIdx], TRUE);
+    XFreeModifiermap(modmap);
+
+    priv->stateSaved = 1;
+}
+
+/** This routine restores all the information saved by #dmxCommonSaveState. */
+void
+dmxCommonRestoreState(pointer private)
+{
+    GETPRIVFROMPRIVATE;
+    int retcode = -1;
+    CARD32 start;
+
+    if (dmxInput->console)
+        priv = dmxInput->devs[0]->private;
+    if (!priv->stateSaved)
+        return;
+    priv->stateSaved = 0;
+
+    DMXDBG0("dmxCommonRestoreState\n");
+    if (priv->xkb) {
+        *priv->xkb->indicators = priv->savedIndicators;
+        XkbSetIndicatorMap(priv->display, ~0, priv->xkb);
+        XkbFreeKeyboard(priv->xkb, 0, True);
+        priv->xkb = 0;
+    }
+
+    for (start = GetTimeInMillis(); GetTimeInMillis() - start < 5000;) {
+        CARD32 tmp;
+
+        retcode = XSetModifierMapping(priv->display, priv->savedModMap);
+        if (retcode == MappingSuccess)
+            break;
+        if (retcode == MappingBusy)
+            dmxLogInput(dmxInput, "Keyboard busy, waiting\n");
+        else
+            dmxLogInput(dmxInput, "Keyboard error, waiting\n");
+
+        /* Don't generate X11 protocol for a bit */
+        for (tmp = GetTimeInMillis(); GetTimeInMillis() - tmp < 250;) {
+            usleep(250);        /* This ends up sleeping only until
+                                 * the next key press generates an
+                                 * interruption.  We make the delay
+                                 * relatively short in case the user
+                                 * pressed they keys quickly. */
+        }
+
+    }
+    if (retcode != MappingSuccess)
+        dmxLog(dmxWarning, "Unable to restore keyboard modifier state!\n");
+
+    XFreeModifiermap(priv->savedModMap);
+    priv->savedModMap = NULL;
+
+    dmxCommonKbdSetCtrl(priv->display, NULL, &priv->savedKctrl);
+    priv->kctrlset = 0;         /* Invalidate copy */
+}
diff --git a/xorg-server/hw/dmx/input/dmxconsole.c b/xorg-server/hw/dmx/input/dmxconsole.c
index d4d73f2e8..f63772b17 100644
--- a/xorg-server/hw/dmx/input/dmxconsole.c
+++ b/xorg-server/hw/dmx/input/dmxconsole.c
@@ -1,1029 +1,1090 @@
-/*

- * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   David H. Dawes <dawes@xfree86.org>

- *   Kevin E. Martin <kem@redhat.com>

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- *

- * This file implements the console input devices.

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#define DMX_CONSOLE_DEBUG 0

-#define DMX_WINDOW_DEBUG  0

-

-#include "dmxinputinit.h"

-#include "dmxevents.h"

-#include "dmxconsole.h"

-#include "dmxcommon.h"

-#include "dmxscrinit.h"

-#include "dmxcb.h"

-#include "dmxsync.h"

-

-#include "inputstr.h"

-#include "input.h"

-#include "mipointer.h"

-#include "windowstr.h"

-

-#define CONSOLE_NUM 3

-#define CONSOLE_DEN 4

-#define DMX_CONSOLE_NAME "DMX Console"

-#define DMX_RES_NAME     "Xdmx"

-#define DMX_RES_CLASS    "XDmx"

-#define CONSOLE_BG_COLOR "gray75"

-#define CONSOLE_FG_COLOR "black"

-#define CONSOLE_SCREEN_BG_COLOR "white"

-#define CONSOLE_SCREEN_FG_COLOR "black"

-#define CONSOLE_SCREEN_DET_COLOR "gray75"

-#define CONSOLE_SCREEN_CUR_COLOR "red"

-

-#if DMX_CONSOLE_DEBUG

-#define DMXDBG0(f)               dmxLog(dmxDebug,f)

-#define DMXDBG1(f,a)             dmxLog(dmxDebug,f,a)

-#define DMXDBG2(f,a,b)           dmxLog(dmxDebug,f,a,b)

-#define DMXDBG3(f,a,b,c)         dmxLog(dmxDebug,f,a,b,c)

-#define DMXDBG4(f,a,b,c,d)       dmxLog(dmxDebug,f,a,b,c,d)

-#define DMXDBG5(f,a,b,c,d,e)     dmxLog(dmxDebug,f,a,b,c,d,e)

-#define DMXDBG6(f,a,b,c,d,e,g)   dmxLog(dmxDebug,f,a,b,c,d,e,g)

-#define DMXDBG7(f,a,b,c,d,e,g,h) dmxLog(dmxDebug,f,a,b,c,d,e,g,h)

-#else

-#define DMXDBG0(f)

-#define DMXDBG1(f,a)

-#define DMXDBG2(f,a,b)

-#define DMXDBG3(f,a,b,c)

-#define DMXDBG4(f,a,b,c,d)

-#define DMXDBG5(f,a,b,c,d,e)

-#define DMXDBG6(f,a,b,c,d,e,g)

-#define DMXDBG7(f,a,b,c,d,e,g,h)

-#endif

-

-/* Private area for consoles. */

-typedef struct _myPrivate {

-    DMX_COMMON_PRIVATE;

-    int                     lastX;

-    int                     lastY;

-    int                     globalX;

-    int                     globalY;

-    int                     curX;

-    int                     curY;

-    int                     width;

-    int                     height;

-    int                     consWidth;

-    int                     consHeight;

-    double                  xScale;

-    double                  yScale;

-    XlibGC                  gc, gcDet, gcRev, gcCur;

-    int                     grabbed, fine, captured;

-    Cursor                  cursorNormal, cursorGrabbed, cursorEmpty;

-    Pixmap                  pixmap;

-    

-    CloseScreenProcPtr      CloseScreen;

-    struct _myPrivate       *next; /* for closing multiple consoles */

-    int                     initialized;

-    DevicePtr               mou, kbd;

-} myPrivate;

-

-static int scalex(myPrivate *priv, int x)

-{

-    return (int)((x * priv->xScale) + .5);

-}

-

-static int scaley(myPrivate *priv, int y)

-{

-    return (int)((y * priv->yScale) + .5);

-}

-

-static int unscalex(myPrivate *priv, int x)

-{

-    return (int)((x / priv->xScale) + .5);

-}

-

-static int unscaley(myPrivate *priv, int y)

-{

-    return (int)((y / priv->yScale) + .5);

-}

-

-/** Create the private area for \a pDevice. */

-pointer dmxConsoleCreatePrivate(DeviceIntPtr pDevice)

-{

-    GETDMXLOCALFROMPDEVICE;

-    myPrivate *priv = calloc(1, sizeof(*priv));

-    priv->dmxLocal  = dmxLocal;

-    return priv;

-}

-

-/** If \a private is non-NULL, free its associated memory. */

-void dmxConsoleDestroyPrivate(pointer private)

-{

-    free(private);

-}

-

-static void dmxConsoleDrawFineCursor(myPrivate *priv, XRectangle *rect)

-{

-    int size  = 6;

-    int x, y;

-    

-    XDrawLine(priv->display, priv->pixmap, priv->gcCur,

-              x = scalex(priv, priv->globalX) - size,

-              scaley(priv, priv->globalY),

-              scalex(priv, priv->globalX) + size,

-              scaley(priv, priv->globalY));

-    XDrawLine(priv->display, priv->pixmap, priv->gcCur,

-              scalex(priv, priv->globalX),

-              y = scaley(priv, priv->globalY) - size,

-              scalex(priv, priv->globalX),

-              scaley(priv, priv->globalY) + size);

-    if (priv->grabbed) {

-        XDrawLine(priv->display, priv->pixmap, priv->gcCur,

-                  scalex(priv, priv->globalX) - (int)(size / 1.4),

-                  scaley(priv, priv->globalY) - (int)(size / 1.4),

-                  scalex(priv, priv->globalX) + (int)(size / 1.4),

-                  scaley(priv, priv->globalY) + (int)(size / 1.4));

-        XDrawLine(priv->display, priv->pixmap, priv->gcCur,

-                  scalex(priv, priv->globalX) - (int)(size / 1.4),

-                  scaley(priv, priv->globalY) + (int)(size / 1.4),

-                  scalex(priv, priv->globalX) + (int)(size / 1.4),

-                  scaley(priv, priv->globalY) - (int)(size / 1.4));

-    }

-    if (rect) {

-        rect->x      = x;

-        rect->y      = y;

-        rect->width  = 2 * size;

-        rect->height = 2 * size;

-    }

-}

-

-static void dmxConsoleDrawWindows(pointer private)

-{

-    GETONLYPRIVFROMPRIVATE;

-    Display    *dpy   = priv->display;

-    int        i;

-    Region     whole, used, avail;

-    XRectangle rect;

-

-    whole       = XCreateRegion();

-    used        = XCreateRegion();

-    avail       = XCreateRegion();

-    rect.x      = 0;

-    rect.y      = 0;

-    rect.width  = priv->consWidth;

-    rect.height = priv->consHeight;

-    XUnionRectWithRegion(&rect, whole, whole);

-    

-    for (i = 0; i < dmxNumScreens; i++) {

-        ScreenPtr     pScreen     = screenInfo.screens[i];

-        WindowPtr     pRoot       = pScreen->root;

-        WindowPtr     pChild;

-

-#if DMX_WINDOW_DEBUG

-        dmxLog(dmxDebug, "%lu %p %p %p 2\n",

-               pRoot->drawable.id,

-               pRoot->parent, pRoot->firstChild, pRoot->lastChild);

-#endif

-        

-        for (pChild = pRoot->firstChild; pChild; pChild = pChild->nextSib) {

-            if (pChild->mapped

-                && pChild->realized) {

-#if DMX_WINDOW_DEBUG

-                dmxLog(dmxDebug, "  %p %d,%d %dx%d %d %d  %d RECTS\n",

-                       pChild,

-                       pChild->drawable.x,

-                       pChild->drawable.y,

-                       pChild->drawable.width,

-                       pChild->drawable.height,

-                       pChild->visibility,

-                       pChild->overrideRedirect,

-                       RegionNumRects(&pChild->clipList));

-#endif

-                rect.x      = scalex(priv, pChild->drawable.x + pScreen->x);

-                rect.y      = scaley(priv, pChild->drawable.y + pScreen->y);

-                rect.width  = scalex(priv, pChild->drawable.width);

-                rect.height = scaley(priv, pChild->drawable.height);

-                XDrawRectangle(dpy, priv->pixmap, priv->gc,

-                               rect.x, rect.y, rect.width, rect.height);

-                XUnionRectWithRegion(&rect, used, used);

-                XSubtractRegion(whole, used, avail);

-                XSetRegion(dpy, priv->gc, avail);

-            }

-        }

-#ifdef PANORAMIX

-        if (!noPanoramiXExtension) break; /* Screen 0 valid with Xinerama */

-#endif

-    }

-    XDestroyRegion(avail);

-    XDestroyRegion(used);

-    XDestroyRegion(whole);

-    XSetClipMask(dpy, priv->gc, None);

-}

-

-static void dmxConsoleDraw(myPrivate *priv, int updateCursor, int update)

-{

-    GETDMXINPUTFROMPRIV;

-    Display       *dpy     = priv->display;

-    int           i;

-

-    XFillRectangle(dpy, priv->pixmap, priv->gc, 0, 0,

-                   priv->consWidth, priv->consHeight);

-

-    for (i = 0; i < dmxNumScreens; i++) {

-        DMXScreenInfo *dmxScreen = &dmxScreens[i];

-	XFillRectangle(dpy, priv->pixmap,

-                       dmxScreen->beDisplay ? priv->gcRev : priv->gcDet,

-                       scalex(priv, screenInfo.screens[i]->x),

-                       scaley(priv, screenInfo.screens[i]->y),

-                       scalex(priv, screenInfo.screens[i]->width),

-                       scaley(priv, screenInfo.screens[i]->height));

-    }

-    for (i = 0; i < dmxNumScreens; i++) {

-        XDrawRectangle(dpy, priv->pixmap, priv->gc,

-                       scalex(priv, screenInfo.screens[i]->x),

-                       scaley(priv, screenInfo.screens[i]->y),

-                       scalex(priv, screenInfo.screens[i]->width),

-                       scaley(priv, screenInfo.screens[i]->height));

-    }

-    if (dmxInput->windows)          dmxConsoleDrawWindows(priv);

-    if (priv->fine && updateCursor) dmxConsoleDrawFineCursor(priv, 0);

-    if (update) {

-        XCopyArea(priv->display, priv->pixmap, priv->window, priv->gc,

-                  0, 0, priv->consWidth, priv->consHeight, 0, 0);

-        XSync(priv->display, False);          /* Not a backend display */

-    }

-}

-

-static void dmxConsoleClearCursor(myPrivate *priv, int x, int y,

-                                  XRectangle *rect)

-{

-    int        cw = 14, ch = 14;    /* Clear width and height */

-    

-    rect->x      = scalex(priv, x) - cw/2;

-    rect->y      = scaley(priv, y) - ch/2;

-    rect->width  = cw;

-    rect->height = ch;

-    XSetClipRectangles(priv->display, priv->gc, 0, 0, rect, 1, Unsorted);

-    XSetClipRectangles(priv->display, priv->gcDet, 0, 0, rect, 1, Unsorted);

-    XSetClipRectangles(priv->display, priv->gcRev, 0, 0, rect, 1, Unsorted);

-    dmxConsoleDraw(priv, 0, 0);

-    XSetClipMask(priv->display, priv->gc, None);

-    XSetClipMask(priv->display, priv->gcDet, None);

-    XSetClipMask(priv->display, priv->gcRev, None);

-}

-

-

-static void dmxConsoleUpdateFineCursor(myPrivate *priv)

-{

-    int        leave = 0;

-    XRectangle rects[2];

-

-    dmxConsoleClearCursor(priv, priv->globalX, priv->globalY, &rects[0]);

-    if (priv->dmxLocal->sendsCore) {

-        dmxGetGlobalPosition(&priv->globalX, &priv->globalY);

-    } else {

-        priv->globalX = priv->dmxLocal->lastX;

-        priv->globalY = priv->dmxLocal->lastY;

-    }

-    

-    priv->lastX   = scalex(priv, priv->width / 2);

-    priv->lastY   = scaley(priv, priv->height / 2);

-

-                                /* Compute new warp position, which may be

-                                   outside the window */

-    if (priv->globalX < 1 || priv->globalX >= priv->width) {

-        if (priv->globalX < 1) priv->lastX = 0;

-        else                   priv->lastX = scalex(priv, priv->width);

-        priv->lastY = scaley(priv, priv->globalY);

-        ++leave;

-    }

-    if (priv->globalY < 1 || priv->globalY >= priv->height) {

-        if (priv->globalY < 1) priv->lastY = 0;

-        else                   priv->lastY = scaley(priv, priv->height);

-        priv->lastX = scalex(priv, priv->globalX);

-        ++leave;

-    }

-

-                                /* Draw pseudo cursor in window */

-    dmxConsoleDrawFineCursor(priv, &rects[1]);

-

-    XSetClipRectangles(priv->display, priv->gc, 0, 0, rects, 2, Unsorted);

-    XCopyArea(priv->display, priv->pixmap, priv->window, priv->gc,

-              0, 0, priv->consWidth, priv->consHeight, 0, 0);

-    XSetClipMask(priv->display, priv->gc, None);

-

-    DMXDBG2("dmxConsoleUpdateFineCursor: WARP %d %d\n",

-            priv->lastX, priv->lastY);

-    XWarpPointer(priv->display, priv->window, priv->window,

-                 0, 0, 0, 0, priv->lastX, priv->lastY);

-    XSync(priv->display, False); /* Not a backend display */

-

-    if (leave) {

-        XEvent X;

-        while (XCheckMaskEvent(priv->display, PointerMotionMask, &X)) {

-            if (X.type == MotionNotify) {

-                if (X.xmotion.x != priv->lastX || X.xmotion.y != priv->lastY) {

-                    DMXDBG4("Ignoring motion to %d %d after leave frm %d %d\n",

-                            X.xmotion.x, X.xmotion.y,

-                            priv->lastX, priv->lastY);

-                }

-            } else {

-                dmxLog(dmxInfo, "Ignoring event (%d): %s ****************\n",

-                       X.type, dmxEventName(X.type));

-            }

-        }

-    }

-    DMXDBG6("dmxConsoleUpdateFineCursor: Warp %d %d on %d %d [%d %d]\n",

-            priv->lastX, priv->lastY,

-            scalex(priv, priv->width),

-            scaley(priv, priv->height),

-            priv->globalX, priv->globalY);

-}

-

-/** Whenever the window layout (size, position, stacking order) might be

- * changed, this routine is called with the \a pWindow that changed and

- * the \a type of change.  This routine is called in a conservative

- * fashion: the actual layout of the windows of the screen might not

- * have had any human-visible changes. */

-void dmxConsoleUpdateInfo(pointer private, DMXUpdateType type,

-                          WindowPtr pWindow)

-{

-    GETONLYPRIVFROMPRIVATE;

-    dmxConsoleDraw(priv, 1, 1);

-}

-

-static void dmxConsoleMoveAbsolute(myPrivate *priv, int x, int y,

-                                   DevicePtr pDev, dmxMotionProcPtr motion,

-                                   DMXBlockType block)

-{

-    int tmpX, tmpY, v[2];

-

-    tmpX = unscalex(priv, x);

-    tmpY = unscalex(priv, y);

-    DMXDBG6("dmxConsoleMoveAbsolute(,%d,%d) %d %d =? %d %d\n",

-            x, y, tmpX, tmpY, priv->curX, priv->curY);

-    if (tmpX == priv->curX && tmpY == priv->curY) return;

-    v[0] = unscalex(priv, x);

-    v[1] = unscaley(priv, y);

-    motion(pDev, v, 0, 2, DMX_ABSOLUTE_CONFINED, block);

-    /* dmxConsoleUpdatePosition gets called here by dmxCoreMotion */

-}

-

-static void dmxConsoleMoveRelative(myPrivate *priv, int x, int y,

-                                   DevicePtr pDev, dmxMotionProcPtr motion,

-                                   DMXBlockType block)

-{

-    int v[2];

-    /* Ignore the event generated from * warping back to middle */

-    if (x == priv->lastX && y == priv->lastY) return;

-    v[0] = priv->lastX - x;

-    v[1] = priv->lastY - y;

-    motion(pDev, v, 0, 2, DMX_RELATIVE, block);

-    /* dmxConsoleUpdatePosition gets called here by dmxCoreMotion */

-}

-

-/** This routine gets called from #dmxCoreMotion for each motion.  This

- * allows the console's notion of the cursor postion to change when

- * another input device actually caused the change. */

-void dmxConsoleUpdatePosition(pointer private, int x, int y)

-{

-    GETONLYPRIVFROMPRIVATE;

-    int                  tmpX, tmpY;

-    Display              *dpy          = priv->display;

-    static unsigned long dmxGeneration = 0;

-

-

-    tmpX = scalex(priv, x);

-    tmpY = scaley(priv, y);

-    DMXDBG6("dmxConsoleUpdatePosition(,%d,%d) new=%d,%d dims=%d,%d\n",

-            x, y, tmpX, tmpY, priv->consWidth, priv->consHeight);

-    

-    if (priv->fine) dmxConsoleUpdateFineCursor(priv);

-    if (tmpX != priv->curX || tmpY != priv->curY) {

-        if (tmpX < 0)                 tmpX = 0;

-        if (tmpY < 0)                 tmpY = 0;

-        if (tmpX >= priv->consWidth)  tmpX = priv->consWidth  - 1;

-        if (tmpY >= priv->consHeight) tmpY = priv->consHeight - 1;

-        priv->curX = tmpX;

-        priv->curY = tmpY;

-        if (!priv->fine) {

-            DMXDBG2("   WARP B %d %d\n", priv->curX, priv->curY);

-            XWarpPointer(dpy, priv->window,

-                         priv->window, 0, 0, 0, 0, tmpX, tmpY);

-            XSync(dpy, False); /* Not a backend display */

-        }

-    }

-    

-    if (dmxGeneration != serverGeneration) {

-        dmxGeneration = serverGeneration;

-        dmxConsoleDraw(priv, 1, 1);

-    }

-}

-

-/** Collect all pending events from the console's display.  Plase these

- * events on the server event queue using the \a motion and \a enqueue

- * routines.  The \a checkspecial routine is used to check for special

- * keys that need handling.  \a block tells if signals should be blocked

- * when updating the event queue. */

-void dmxConsoleCollectEvents(DevicePtr pDev,

-                             dmxMotionProcPtr motion,

-                             dmxEnqueueProcPtr enqueue,

-                             dmxCheckSpecialProcPtr checkspecial,

-                             DMXBlockType block)

-{

-    GETPRIVFROMPDEV;

-    GETDMXINPUTFROMPRIV;

-    Display              *dpy        = priv->display;

-    Window               win         = priv->window;

-    int                  width       = priv->width;

-    int                  height      = priv->height;

-    XEvent               X, N;

-    XSetWindowAttributes attribs;

-    static int           rInitialized = 0;

-    static Region        r;

-    XRectangle           rect;

-    static int           raising = 0, raiseX, raiseY; /* FIXME */

-

-    while (XPending(dpy)) {

-        XNextEvent(dpy, &X);

-	switch(X.type) {

-        case VisibilityNotify:

-            break;

-	case Expose:

-            DMXDBG5("dmxConsoleCollectEvents: Expose #%d %d %d %d %d\n",

-                    X.xexpose.count,

-                    X.xexpose.x, X.xexpose.y,

-                    X.xexpose.width, X.xexpose.height);

-            if (!rInitialized++) r = XCreateRegion();

-            rect.x      = X.xexpose.x;

-            rect.y      = X.xexpose.y;

-            rect.width  = X.xexpose.width;

-            rect.height = X.xexpose.height;

-            XUnionRectWithRegion(&rect, r, r);

-	    if (X.xexpose.count == 0) {

-                XSetRegion(dpy, priv->gc, r);

-                XSetRegion(dpy, priv->gcDet, r);

-                XSetRegion(dpy, priv->gcRev, r);

-                dmxConsoleDraw(priv, 1, 1);

-                XSetClipMask(dpy, priv->gc, None);

-                XSetClipMask(dpy, priv->gcDet, None);

-                XSetClipMask(dpy, priv->gcRev, None);

-                XDestroyRegion(r);

-                rInitialized = 0;

-            }

-	    break;

-	case ResizeRequest:

-            DMXDBG2("dmxConsoleCollectEvents: Resize %d %d\n",

-                    X.xresizerequest.width, X.xresizerequest.height);

-            priv->consWidth           = X.xresizerequest.width;

-            priv->consHeight          = X.xresizerequest.height;

-	    priv->xScale              = (double)priv->consWidth  / width;

-	    priv->yScale              = (double)priv->consHeight / height;

-	    attribs.override_redirect = True;

-	    XChangeWindowAttributes(dpy, win, CWOverrideRedirect, &attribs);

-	    XResizeWindow(dpy, win, priv->consWidth, priv->consHeight);

-            XFreePixmap(dpy, priv->pixmap);

-            priv->pixmap = XCreatePixmap(dpy,

-                                         RootWindow(dpy, DefaultScreen(dpy)),

-                                         priv->consWidth,

-                                         priv->consHeight,

-                                         DefaultDepth(dpy,DefaultScreen(dpy)));

-	    dmxConsoleDraw(priv, 1, 1);

-	    attribs.override_redirect = False;

-	    XChangeWindowAttributes(dpy, win, CWOverrideRedirect, &attribs);

-	    break;

-        case LeaveNotify:

-            DMXDBG4("dmxConsoleCollectEvents: Leave @ %d,%d; r=%d f=%d\n",

-                    X.xcrossing.x, X.xcrossing.y, raising, priv->fine);

-            if (!priv->captured) dmxCommonRestoreState(priv);

-            else {

-                dmxConsoleUncapture(dmxInput);

-                dmxCommonRestoreState(priv);

-            }

-            break;

-        case EnterNotify:

-            DMXDBG6("dmxConsoleCollectEvents: Enter %d,%d r=%d f=%d (%d,%d)\n",

-                    X.xcrossing.x, X.xcrossing.y, raising, priv->fine,

-                    priv->curX, priv->curY);

-            dmxCommonSaveState(priv);

-            if (raising) {

-                raising = 0;

-                dmxConsoleMoveAbsolute(priv, raiseX, raiseY,

-                                       priv->mou, motion, block);

-            } else {

-                if (priv->fine) {

-                    /* The raise will generate an event near the center,

-                     * which is not where the cursor should be.  So we

-                     * save the real position, do the raise, and move

-                     * the cursor here again after the raise generates

-                     * the event. */

-                    raising = 1;

-                    raiseX = X.xcrossing.x;

-                    raiseY = X.xcrossing.y;

-                    XRaiseWindow(dpy, priv->window);

-                }

-                XSync(dpy, False); /* Not a backend display */

-                if (!X.xcrossing.x && !X.xcrossing.y)

-                    dmxConsoleMoveAbsolute(priv, priv->curX, priv->curY,

-                                           priv->mou, motion, block);

-            }

-            break;

-	case MotionNotify:

-            if (priv->curX == X.xmotion.x && priv->curY == X.xmotion.y)

-                continue;

-            if (XPending(dpy)) { /* do motion compression */

-                XPeekEvent(dpy, &N);

-                if (N.type == MotionNotify) continue;

-            }

-            DMXDBG2("dmxConsoleCollectEvents: Motion %d %d\n",

-                    X.xmotion.x, X.xmotion.y);

-            if (raising) {

-                raising = 0;

-                dmxConsoleMoveAbsolute(priv, raiseX, raiseY,

-                                       priv->mou, motion, block);

-            } else {

-                if (priv->fine)

-                    dmxConsoleMoveRelative(priv, X.xmotion.x, X.xmotion.y,

-                                           priv->mou, motion, block);

-                else

-                    dmxConsoleMoveAbsolute(priv, X.xmotion.x, X.xmotion.y,

-                                           priv->mou, motion, block);

-            }

-	    break;

-        case KeyPress:

-        case KeyRelease:

-            enqueue(priv->kbd, X.type, X.xkey.keycode, 0, NULL, block);

-            break;

-        default:

-                                /* Pass the whole event here, because

-                                 * this may be an extension event. */

-            enqueue(priv->mou, X.type, X.xbutton.button, 0, &X, block);

-	    break;

-	}

-    }

-}

-

-static void dmxCloseConsole(myPrivate *priv)

-{

-    GETDMXINPUTFROMPRIV;

-    dmxCommonRestoreState(priv);

-    if (priv->display) {

-        XFreeGC(priv->display, priv->gc);

-        XFreeGC(priv->display, priv->gcDet);

-        XFreeGC(priv->display, priv->gcRev);

-        XFreeGC(priv->display, priv->gcCur);

-        if (!dmxInput->console) XCloseDisplay(priv->display);

-    }

-    priv->display = NULL;

-}

-

-static Bool dmxCloseConsoleScreen(int idx, ScreenPtr pScreen)

-{

-    myPrivate *priv, *last;

-

-    for (last = priv = (myPrivate *)dixLookupPrivate(&pScreen->devPrivates,

-						     dmxScreenPrivateKey);

-         priv;

-         priv = priv->next) dmxCloseConsole(last = priv);

-    

-    DMX_UNWRAP(CloseScreen, last, pScreen);

-    return pScreen->CloseScreen(idx, pScreen);

-}

-

-static Cursor dmxConsoleCreateEmptyCursor(myPrivate *priv)

-{

-    char    noCursorData[] = { 0, 0, 0, 0, 0, 0, 0, 0 };

-    Pixmap  pixmap;

-    Cursor  cursor;

-    XColor  color, tmpColor;

-    Display *dpy = priv->display;

-

-                                 /* Create empty cursor for window */

-    pixmap = XCreateBitmapFromData(priv->display, priv->window,

-                                   noCursorData, 8, 8);

-    if (!XAllocNamedColor(dpy, DefaultColormap(dpy, DefaultScreen(dpy)),

-                          "black",

-                          &color,

-                          &tmpColor))

-        dmxLog(dmxFatal, "Cannot allocate color for cursor\n");

-    cursor = XCreatePixmapCursor(dpy, pixmap, pixmap, &color, &color, 0, 0);

-    XFreePixmap(dpy, pixmap);

-    return cursor;

-}

-

-static void dmxConsoleComputeWidthHeight(myPrivate *priv,

-                                         int *width, int *height,

-                                         double *xScale, double *yScale,

-                                         int *consWidth, int *consHeight)

-{

-    int     screen;

-    Display *dpy = priv->display;

-

-    *width      = 0;

-    *height     = 0;

-    *xScale     = 1.0;

-    *yScale     = 1.0;

-

-    screen      = DefaultScreen(dpy);

-    *consWidth  = DisplayWidth(dpy, screen)  * CONSOLE_NUM / CONSOLE_DEN;

-    *consHeight = DisplayHeight(dpy, screen) * CONSOLE_NUM / CONSOLE_DEN;

-

-    if (*consWidth  < 1) *consWidth  = 1;

-    if (*consHeight < 1) *consHeight = 1;

-

-#if 1

-                                /* Always keep the console size similar

-                                 * to the global bounding box. */

-    *width  = dmxGlobalWidth;

-    *height = dmxGlobalHeight;

-#else

-                                /* Make the console window as big as

-                                 * possible by computing the visible

-                                 * bounding box. */

-    for (i = 0; i < dmxNumScreens; i++) {

-	if (screenInfo.screens[i]->x+screenInfo.screens[i]->width > *width)

-	    *width = screenInfo.screens[i]->x+screenInfo.screens[i]->width;

-        

-	if (screenInfo.screens[i]->y+screenInfo.screens[i]->height > *height)

-	    *height = screenInfo.screens[i]->y+screenInfo.screens[i]->height;

-    }

-#endif

-

-    if ((double)*consWidth / *width < (double)*consHeight / *height)

-	*xScale = *yScale = (double)*consWidth / *width;

-    else

-	*xScale = *yScale = (double)*consHeight / *height;

-

-    *consWidth  = scalex(priv, *width);

-    *consHeight = scaley(priv, *height);

-    if (*consWidth  < 1) *consWidth  = 1;

-    if (*consHeight < 1) *consHeight = 1;

-}

-

-/** Re-initialized the console device described by \a pDev (after a

- * reconfig). */

-void dmxConsoleReInit(DevicePtr pDev)

-{

-    GETPRIVFROMPDEV;

-    Display *dpy;

-

-    if (!priv || !priv->initialized) return;

-    dpy = priv->display;

-

-    dmxConsoleComputeWidthHeight(priv,

-                                 &priv->width, &priv->height,

-                                 &priv->xScale, &priv->yScale,

-                                 &priv->consWidth, &priv->consHeight);

-    XResizeWindow(dpy, priv->window, priv->consWidth, priv->consHeight);

-    XFreePixmap(dpy, priv->pixmap);

-    priv->pixmap = XCreatePixmap(dpy,

-                                 RootWindow(dpy, DefaultScreen(dpy)),

-                                 priv->consWidth,

-                                 priv->consHeight,

-                                 DefaultDepth(dpy,DefaultScreen(dpy)));

-    dmxConsoleDraw(priv, 1, 1);

-}

-

-/** Initialized the console device described by \a pDev. */

-void dmxConsoleInit(DevicePtr pDev)

-{

-    GETPRIVFROMPDEV;

-    DMXInputInfo         *dmxInput = &dmxInputs[dmxLocal->inputIdx];

-    int                  screen;

-    unsigned long        mask;

-    XSetWindowAttributes attribs;

-    Display              *dpy;

-    Window               win;

-    XGCValues            gcvals;

-    XColor               color;

-    XClassHint           class_hints;

-    unsigned long        tmp;

-

-    if (dmxLocal->type == DMX_LOCAL_MOUSE)    priv->mou = pDev;

-    if (dmxLocal->type == DMX_LOCAL_KEYBOARD) priv->kbd = pDev;

-    if (priv->initialized++) return; /* Only do once for mouse/keyboard pair */

-

-    if (!(dpy = priv->display = XOpenDisplay(dmxInput->name)))

-        dmxLog(dmxFatal,

-               "dmxOpenConsole: cannot open console display %s\n",

-               dmxInput->name);

-

-    /* Set up defaults */

-    dmxConsoleComputeWidthHeight(priv,

-                                 &priv->width, &priv->height,

-                                 &priv->xScale, &priv->yScale,

-                                 &priv->consWidth, &priv->consHeight);

-

-    /* Private initialization using computed values or constants. */

-    screen                   = DefaultScreen(dpy);

-    priv->initPointerX       = scalex(priv, priv->width / 2);

-    priv->initPointerY       = scaley(priv, priv->height / 2);

-    priv->eventMask          = (ButtonPressMask

-                                | ButtonReleaseMask

-                                | PointerMotionMask

-                                | EnterWindowMask

-                                | LeaveWindowMask

-                                | KeyPressMask

-                                | KeyReleaseMask

-                                | ExposureMask

-                                | ResizeRedirectMask);

-

-    mask = CWBackPixel | CWEventMask | CWColormap | CWOverrideRedirect;

-    attribs.colormap = DefaultColormap(dpy, screen);

-    if (XParseColor(dpy, attribs.colormap, CONSOLE_BG_COLOR, &color)

-        && XAllocColor(dpy, attribs.colormap, &color)) {

-	attribs.background_pixel = color.pixel;

-    } else 

-        attribs.background_pixel = WhitePixel(dpy, screen);

-

-    attribs.event_mask        = priv->eventMask;

-    attribs.override_redirect = False;

-    

-    win = priv->window = XCreateWindow(dpy,

-                                       RootWindow(dpy, screen),

-                                       0, 0, priv->consWidth, priv->consHeight,

-                                       0,

-                                       DefaultDepth(dpy, screen),

-                                       InputOutput,

-                                       DefaultVisual(dpy, screen),

-                                       mask, &attribs);

-    priv->pixmap = XCreatePixmap(dpy, RootWindow(dpy, screen),

-                                 priv->consWidth, priv->consHeight,

-                                 DefaultDepth(dpy, screen));

-

-                                /* Set up properties */

-    XStoreName(dpy, win, DMX_CONSOLE_NAME);

-    class_hints.res_name  = DMX_RES_NAME;

-    class_hints.res_class = DMX_RES_CLASS;

-    XSetClassHint(dpy, win, &class_hints);

-

-

-                                /* Map the window */

-    XMapWindow(dpy, win);

-

-                                /* Create cursors */

-    priv->cursorNormal  = XCreateFontCursor(dpy, XC_circle);

-    priv->cursorGrabbed = XCreateFontCursor(dpy, XC_spider);

-    priv->cursorEmpty   = dmxConsoleCreateEmptyCursor(priv);

-    XDefineCursor(dpy, priv->window, priv->cursorNormal);

-

-                                /* Create GC */

-    mask = (GCFunction | GCPlaneMask | GCClipMask | GCForeground |

-	    GCBackground | GCLineWidth | GCLineStyle | GCCapStyle |

-	    GCFillStyle | GCGraphicsExposures);

-    gcvals.function = GXcopy;

-    gcvals.plane_mask = AllPlanes;

-    gcvals.clip_mask = None;

-    if (XParseColor(dpy, attribs.colormap, CONSOLE_SCREEN_FG_COLOR, &color)

-        && XAllocColor(dpy, attribs.colormap, &color)) {

-	gcvals.foreground = color.pixel;

-    } else

-	gcvals.foreground = BlackPixel(dpy, screen);

-    if (XParseColor(dpy, attribs.colormap, CONSOLE_SCREEN_BG_COLOR, &color)

-        && XAllocColor(dpy, attribs.colormap, &color)) {

-	gcvals.background = color.pixel;

-    } else

-	gcvals.background = WhitePixel(dpy, screen);

-    gcvals.line_width         = 0;

-    gcvals.line_style         = LineSolid;

-    gcvals.cap_style          = CapNotLast;

-    gcvals.fill_style         = FillSolid;

-    gcvals.graphics_exposures = False;

-    

-    priv->gc = XCreateGC(dpy, win, mask, &gcvals);

-

-    tmp               = gcvals.foreground;

-    if (XParseColor(dpy, attribs.colormap, CONSOLE_SCREEN_DET_COLOR, &color)

-        && XAllocColor(dpy, attribs.colormap, &color)) {

-        gcvals.foreground = color.pixel;

-    } else

-        gcvals.foreground = BlackPixel(dpy, screen);

-    priv->gcDet = XCreateGC(dpy, win, mask, &gcvals);

-    gcvals.foreground = tmp;

-

-    tmp               = gcvals.background;

-    gcvals.background = gcvals.foreground;

-    gcvals.foreground = tmp;

-    priv->gcRev = XCreateGC(dpy, win, mask, &gcvals);

-    

-    gcvals.background = gcvals.foreground;

-    if (XParseColor(dpy, attribs.colormap, CONSOLE_SCREEN_CUR_COLOR, &color)

-        && XAllocColor(dpy, attribs.colormap, &color)) {

-        gcvals.foreground = color.pixel;

-    } else

-        gcvals.foreground = BlackPixel(dpy, screen);

-    priv->gcCur = XCreateGC(dpy, win, mask, &gcvals);

-

-    dmxConsoleDraw(priv, 1, 1);

-

-    if (dixLookupPrivate(&screenInfo.screens[0]->devPrivates,

-			 dmxScreenPrivateKey))

-        priv->next = dixLookupPrivate(&screenInfo.screens[0]->devPrivates,

-				      dmxScreenPrivateKey);

-    else 

-        DMX_WRAP(CloseScreen, dmxCloseConsoleScreen,

-                 priv, screenInfo.screens[0]);

-    dixSetPrivate(&screenInfo.screens[0]->devPrivates, dmxScreenPrivateKey,

-		  priv);

-}

-

-/** Fill in the \a info structure for the specified \a pDev.  Only used

- * for pointers. */

-void dmxConsoleMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)

-{

-    GETPRIVFROMPDEV;

-

-    info->buttonClass      = 1;

-    dmxCommonMouGetMap(pDev, info->map, &info->numButtons);

-    info->valuatorClass    = 1;

-    info->numRelAxes       = 2;

-    info->minval[0] = 0;

-    info->minval[1] = 0;

-    /* max possible console window size: */

-    info->maxval[0] = DisplayWidth(priv->display, DefaultScreen(priv->display));

-    info->maxval[1] = DisplayHeight(priv->display, DefaultScreen(priv->display));

-    info->res[0]           = 1;

-    info->minres[0]        = 0;

-    info->maxres[0]        = 1;

-    info->ptrFeedbackClass = 1;

-}

-

-/** Fill in the \a info structure for the specified \a pDev.  Only used

- * for keyboard. */

-void dmxConsoleKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)

-{

-    dmxCommonKbdGetInfo(pDev, info);

-    info->keyboard         = 1;

-    info->keyClass         = 1;

-    dmxCommonKbdGetMap(pDev, &info->keySyms, info->modMap);

-    info->freemap          = 1;

-    info->focusClass       = 1;

-    info->kbdFeedbackClass = 1;

-}

-

-/** Handle special console-only keys. */

-int dmxConsoleFunctions(pointer private, DMXFunctionType function)

-{

-    GETONLYPRIVFROMPRIVATE;

-    XRectangle rect;

-    Display    *dpy = priv->display;

-

-    switch (function) {

-    case DMX_FUNCTION_FINE:

-        if (priv->fine) {

-            priv->fine = 0;

-            dmxConsoleClearCursor(priv, priv->globalX, priv->globalY, &rect);

-            XSetClipRectangles(dpy, priv->gc, 0, 0, &rect, 1, Unsorted);

-            XCopyArea(dpy, priv->pixmap, priv->window, priv->gc,

-                      0, 0, priv->consWidth, priv->consHeight, 0, 0);

-            XSetClipMask(dpy, priv->gc, None);

-            

-            XDefineCursor(dpy, priv->window,

-                          priv->grabbed

-                          ? priv->cursorGrabbed

-                          : priv->cursorNormal);

-            XWarpPointer(dpy, priv->window, priv->window,

-                         0, 0, 0, 0,

-                         scalex(priv, priv->globalX),

-                         scaley(priv, priv->globalY));

-            XSync(dpy, False); /* Not a backend display */

-        } else {

-            priv->fine = 1;

-            XRaiseWindow(dpy, priv->window);

-            XDefineCursor(dpy, priv->window, priv->cursorEmpty);

-            dmxConsoleUpdateFineCursor(priv);

-        }

-        return 1;

-    case DMX_FUNCTION_GRAB:

-        if (priv->grabbed) {

-            XUngrabKeyboard(dpy, CurrentTime);

-            XUngrabPointer(dpy, CurrentTime);

-            XDefineCursor(dpy, priv->window,

-                          priv->fine

-                          ? priv->cursorEmpty

-                          : priv->cursorNormal);

-        } else {

-            if (XGrabPointer(dpy, priv->window, True,

-                             0, GrabModeAsync, GrabModeAsync, priv->window,

-                             None, CurrentTime)) {

-                dmxLog(dmxError, "XGrabPointer failed\n");

-                return 0;

-            }

-            if (XGrabKeyboard(dpy, priv->window, True,

-                              GrabModeAsync, GrabModeAsync, CurrentTime)) {

-                dmxLog(dmxError, "XGrabKeyboard failed\n");

-                XUngrabPointer(dpy, CurrentTime);

-                return 0;

-            }

-            XDefineCursor(dpy, priv->window,

-                          priv->fine

-                          ? priv->cursorEmpty

-                          : priv->cursorGrabbed);

-        }

-        priv->grabbed = !priv->grabbed;

-        if (priv->fine) dmxConsoleUpdateFineCursor(priv);

-        return 1;

-    case DMX_FUNCTION_TERMINATE:

-        return 1;

-    default:

-        return 0;

-    }

-}

-

-static void dmxDump(void)

-{

-    int          i, j;

-    DMXInputInfo *dmxInput;

-    XEvent       X;

-    

-    for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++) {

-        for (j = 0; j < dmxInput->numDevs; j++) {

-            DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[j];

-            myPrivate            *priv    = dmxLocal->private;

-            while (priv

-                   && priv->display

-                   && XCheckTypedEvent(priv->display, MotionNotify, &X)) {

-                DMXDBG4("dmxDump: %s/%d threw event away %d %s\n",

-                        dmxInput->name, j, X.type, dmxEventName(X.type));

-            }

-        }

-    }

-}

-

-/** This routine is used to warp the pointer into the console window

- * from anywhere on the screen.  It is used when backend and console

- * input are both being taken from the same X display. */

-void dmxConsoleCapture(DMXInputInfo *dmxInput)

-{

-    int     i;

-    XEvent  X;

-

-    DMXDBG0("dmxConsoleCapture\n");

-    dmxSync(NULL, TRUE);

-    for (i = 0; i < dmxInput->numDevs; i++) {

-        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];

-        myPrivate            *priv    = dmxLocal->private;

-        if (dmxLocal->extType != DMX_LOCAL_TYPE_CONSOLE) continue;

-        if (dmxLocal->type    != DMX_LOCAL_MOUSE)        continue;

-        if (priv->captured)                              continue;

-        priv->captured = 2;     /* Ungrab only after proximal events. */

-        XRaiseWindow(priv->display, priv->window);

-        XSync(priv->display, False); /* Not a backend display */

-        while (XCheckTypedEvent(priv->display, MotionNotify, &X)) {

-            DMXDBG3("   Ignoring motion to %d %d after capture on %s\n",

-                    X.xmotion.x, X.xmotion.y, dmxInput->name);

-        }

-        XWarpPointer(priv->display, None,

-                     priv->window, 0, 0, 0, 0, priv->curX, priv->curY);

-        XSync(priv->display, False); /* Not a backend display */

-        dmxDump();

-        if (priv->fine) dmxConsoleUpdateFineCursor(priv);

-    }

-}

-

-/** Undo the capture that was done by #dmxConsoleCapture. */

-void dmxConsoleUncapture(DMXInputInfo *dmxInput)

-{

-    int i;

-

-    DMXDBG0("dmxConsoleUncapture\n");

-    dmxSync(NULL, TRUE);

-    for (i = 0; i < dmxInput->numDevs; i++) {

-        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];

-        myPrivate            *priv    = dmxLocal->private;

-        if (dmxLocal->extType != DMX_LOCAL_TYPE_CONSOLE) continue;

-        if (dmxLocal->type    != DMX_LOCAL_MOUSE)        continue;

-        if (!priv->captured)                             continue;

-        priv->captured = 0;

-        XSync(priv->display, False); /* Not a backend display */

-    }

-}

+/*
+ * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   David H. Dawes <dawes@xfree86.org>
+ *   Kevin E. Martin <kem@redhat.com>
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ *
+ * This file implements the console input devices.
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#define DMX_CONSOLE_DEBUG 0
+#define DMX_WINDOW_DEBUG  0
+
+#include "dmxinputinit.h"
+#include "dmxevents.h"
+#include "dmxconsole.h"
+#include "dmxcommon.h"
+#include "dmxscrinit.h"
+#include "dmxcb.h"
+#include "dmxsync.h"
+
+#include "inputstr.h"
+#include "input.h"
+#include "mipointer.h"
+#include "windowstr.h"
+
+#define CONSOLE_NUM 3
+#define CONSOLE_DEN 4
+#define DMX_CONSOLE_NAME "DMX Console"
+#define DMX_RES_NAME     "Xdmx"
+#define DMX_RES_CLASS    "XDmx"
+#define CONSOLE_BG_COLOR "gray75"
+#define CONSOLE_FG_COLOR "black"
+#define CONSOLE_SCREEN_BG_COLOR "white"
+#define CONSOLE_SCREEN_FG_COLOR "black"
+#define CONSOLE_SCREEN_DET_COLOR "gray75"
+#define CONSOLE_SCREEN_CUR_COLOR "red"
+
+#if DMX_CONSOLE_DEBUG
+#define DMXDBG0(f)               dmxLog(dmxDebug,f)
+#define DMXDBG1(f,a)             dmxLog(dmxDebug,f,a)
+#define DMXDBG2(f,a,b)           dmxLog(dmxDebug,f,a,b)
+#define DMXDBG3(f,a,b,c)         dmxLog(dmxDebug,f,a,b,c)
+#define DMXDBG4(f,a,b,c,d)       dmxLog(dmxDebug,f,a,b,c,d)
+#define DMXDBG5(f,a,b,c,d,e)     dmxLog(dmxDebug,f,a,b,c,d,e)
+#define DMXDBG6(f,a,b,c,d,e,g)   dmxLog(dmxDebug,f,a,b,c,d,e,g)
+#define DMXDBG7(f,a,b,c,d,e,g,h) dmxLog(dmxDebug,f,a,b,c,d,e,g,h)
+#else
+#define DMXDBG0(f)
+#define DMXDBG1(f,a)
+#define DMXDBG2(f,a,b)
+#define DMXDBG3(f,a,b,c)
+#define DMXDBG4(f,a,b,c,d)
+#define DMXDBG5(f,a,b,c,d,e)
+#define DMXDBG6(f,a,b,c,d,e,g)
+#define DMXDBG7(f,a,b,c,d,e,g,h)
+#endif
+
+/* Private area for consoles. */
+typedef struct _myPrivate {
+    DMX_COMMON_PRIVATE;
+    int lastX;
+    int lastY;
+    int globalX;
+    int globalY;
+    int curX;
+    int curY;
+    int width;
+    int height;
+    int consWidth;
+    int consHeight;
+    double xScale;
+    double yScale;
+    XlibGC gc, gcDet, gcRev, gcCur;
+    int grabbed, fine, captured;
+    Cursor cursorNormal, cursorGrabbed, cursorEmpty;
+    Pixmap pixmap;
+
+    CloseScreenProcPtr CloseScreen;
+    struct _myPrivate *next;    /* for closing multiple consoles */
+    int initialized;
+    DevicePtr mou, kbd;
+} myPrivate;
+
+static int
+scalex(myPrivate * priv, int x)
+{
+    return (int) ((x * priv->xScale) + .5);
+}
+
+static int
+scaley(myPrivate * priv, int y)
+{
+    return (int) ((y * priv->yScale) + .5);
+}
+
+static int
+unscalex(myPrivate * priv, int x)
+{
+    return (int) ((x / priv->xScale) + .5);
+}
+
+static int
+unscaley(myPrivate * priv, int y)
+{
+    return (int) ((y / priv->yScale) + .5);
+}
+
+/** Create the private area for \a pDevice. */
+pointer
+dmxConsoleCreatePrivate(DeviceIntPtr pDevice)
+{
+    GETDMXLOCALFROMPDEVICE;
+    myPrivate *priv = calloc(1, sizeof(*priv));
+
+    priv->dmxLocal = dmxLocal;
+    return priv;
+}
+
+/** If \a private is non-NULL, free its associated memory. */
+void
+dmxConsoleDestroyPrivate(pointer private)
+{
+    free(private);
+}
+
+static void
+dmxConsoleDrawFineCursor(myPrivate * priv, XRectangle * rect)
+{
+    int size = 6;
+    int x, y;
+
+    XDrawLine(priv->display, priv->pixmap, priv->gcCur,
+              x = scalex(priv, priv->globalX) - size,
+              scaley(priv, priv->globalY),
+              scalex(priv, priv->globalX) + size, scaley(priv, priv->globalY));
+    XDrawLine(priv->display, priv->pixmap, priv->gcCur,
+              scalex(priv, priv->globalX),
+              y = scaley(priv, priv->globalY) - size,
+              scalex(priv, priv->globalX), scaley(priv, priv->globalY) + size);
+    if (priv->grabbed) {
+        XDrawLine(priv->display, priv->pixmap, priv->gcCur,
+                  scalex(priv, priv->globalX) - (int) (size / 1.4),
+                  scaley(priv, priv->globalY) - (int) (size / 1.4),
+                  scalex(priv, priv->globalX) + (int) (size / 1.4),
+                  scaley(priv, priv->globalY) + (int) (size / 1.4));
+        XDrawLine(priv->display, priv->pixmap, priv->gcCur,
+                  scalex(priv, priv->globalX) - (int) (size / 1.4),
+                  scaley(priv, priv->globalY) + (int) (size / 1.4),
+                  scalex(priv, priv->globalX) + (int) (size / 1.4),
+                  scaley(priv, priv->globalY) - (int) (size / 1.4));
+    }
+    if (rect) {
+        rect->x = x;
+        rect->y = y;
+        rect->width = 2 * size;
+        rect->height = 2 * size;
+    }
+}
+
+static void
+dmxConsoleDrawWindows(pointer private)
+{
+    GETONLYPRIVFROMPRIVATE;
+    Display *dpy = priv->display;
+    int i;
+    Region whole, used, avail;
+    XRectangle rect;
+
+    whole = XCreateRegion();
+    used = XCreateRegion();
+    avail = XCreateRegion();
+    rect.x = 0;
+    rect.y = 0;
+    rect.width = priv->consWidth;
+    rect.height = priv->consHeight;
+    XUnionRectWithRegion(&rect, whole, whole);
+
+    for (i = 0; i < dmxNumScreens; i++) {
+        ScreenPtr pScreen = screenInfo.screens[i];
+        WindowPtr pRoot = pScreen->root;
+        WindowPtr pChild;
+
+#if DMX_WINDOW_DEBUG
+        dmxLog(dmxDebug, "%lu %p %p %p 2\n",
+               pRoot->drawable.id,
+               pRoot->parent, pRoot->firstChild, pRoot->lastChild);
+#endif
+
+        for (pChild = pRoot->firstChild; pChild; pChild = pChild->nextSib) {
+            if (pChild->mapped && pChild->realized) {
+#if DMX_WINDOW_DEBUG
+                dmxLog(dmxDebug, "  %p %d,%d %dx%d %d %d  %d RECTS\n",
+                       pChild,
+                       pChild->drawable.x,
+                       pChild->drawable.y,
+                       pChild->drawable.width,
+                       pChild->drawable.height,
+                       pChild->visibility,
+                       pChild->overrideRedirect,
+                       RegionNumRects(&pChild->clipList));
+#endif
+                rect.x = scalex(priv, pChild->drawable.x + pScreen->x);
+                rect.y = scaley(priv, pChild->drawable.y + pScreen->y);
+                rect.width = scalex(priv, pChild->drawable.width);
+                rect.height = scaley(priv, pChild->drawable.height);
+                XDrawRectangle(dpy, priv->pixmap, priv->gc,
+                               rect.x, rect.y, rect.width, rect.height);
+                XUnionRectWithRegion(&rect, used, used);
+                XSubtractRegion(whole, used, avail);
+                XSetRegion(dpy, priv->gc, avail);
+            }
+        }
+#ifdef PANORAMIX
+        if (!noPanoramiXExtension)
+            break;              /* Screen 0 valid with Xinerama */
+#endif
+    }
+    XDestroyRegion(avail);
+    XDestroyRegion(used);
+    XDestroyRegion(whole);
+    XSetClipMask(dpy, priv->gc, None);
+}
+
+static void
+dmxConsoleDraw(myPrivate * priv, int updateCursor, int update)
+{
+    GETDMXINPUTFROMPRIV;
+    Display *dpy = priv->display;
+    int i;
+
+    XFillRectangle(dpy, priv->pixmap, priv->gc, 0, 0,
+                   priv->consWidth, priv->consHeight);
+
+    for (i = 0; i < dmxNumScreens; i++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
+        XFillRectangle(dpy, priv->pixmap,
+                       dmxScreen->beDisplay ? priv->gcRev : priv->gcDet,
+                       scalex(priv, screenInfo.screens[i]->x),
+                       scaley(priv, screenInfo.screens[i]->y),
+                       scalex(priv, screenInfo.screens[i]->width),
+                       scaley(priv, screenInfo.screens[i]->height));
+    }
+    for (i = 0; i < dmxNumScreens; i++) {
+        XDrawRectangle(dpy, priv->pixmap, priv->gc,
+                       scalex(priv, screenInfo.screens[i]->x),
+                       scaley(priv, screenInfo.screens[i]->y),
+                       scalex(priv, screenInfo.screens[i]->width),
+                       scaley(priv, screenInfo.screens[i]->height));
+    }
+    if (dmxInput->windows)
+        dmxConsoleDrawWindows(priv);
+    if (priv->fine && updateCursor)
+        dmxConsoleDrawFineCursor(priv, 0);
+    if (update) {
+        XCopyArea(priv->display, priv->pixmap, priv->window, priv->gc,
+                  0, 0, priv->consWidth, priv->consHeight, 0, 0);
+        XSync(priv->display, False);    /* Not a backend display */
+    }
+}
+
+static void
+dmxConsoleClearCursor(myPrivate * priv, int x, int y, XRectangle * rect)
+{
+    int cw = 14, ch = 14;       /* Clear width and height */
+
+    rect->x = scalex(priv, x) - cw / 2;
+    rect->y = scaley(priv, y) - ch / 2;
+    rect->width = cw;
+    rect->height = ch;
+    XSetClipRectangles(priv->display, priv->gc, 0, 0, rect, 1, Unsorted);
+    XSetClipRectangles(priv->display, priv->gcDet, 0, 0, rect, 1, Unsorted);
+    XSetClipRectangles(priv->display, priv->gcRev, 0, 0, rect, 1, Unsorted);
+    dmxConsoleDraw(priv, 0, 0);
+    XSetClipMask(priv->display, priv->gc, None);
+    XSetClipMask(priv->display, priv->gcDet, None);
+    XSetClipMask(priv->display, priv->gcRev, None);
+}
+
+static void
+dmxConsoleUpdateFineCursor(myPrivate * priv)
+{
+    int leave = 0;
+    XRectangle rects[2];
+
+    dmxConsoleClearCursor(priv, priv->globalX, priv->globalY, &rects[0]);
+    if (priv->dmxLocal->sendsCore) {
+        dmxGetGlobalPosition(&priv->globalX, &priv->globalY);
+    }
+    else {
+        priv->globalX = priv->dmxLocal->lastX;
+        priv->globalY = priv->dmxLocal->lastY;
+    }
+
+    priv->lastX = scalex(priv, priv->width / 2);
+    priv->lastY = scaley(priv, priv->height / 2);
+
+    /* Compute new warp position, which may be
+       outside the window */
+    if (priv->globalX < 1 || priv->globalX >= priv->width) {
+        if (priv->globalX < 1)
+            priv->lastX = 0;
+        else
+            priv->lastX = scalex(priv, priv->width);
+        priv->lastY = scaley(priv, priv->globalY);
+        ++leave;
+    }
+    if (priv->globalY < 1 || priv->globalY >= priv->height) {
+        if (priv->globalY < 1)
+            priv->lastY = 0;
+        else
+            priv->lastY = scaley(priv, priv->height);
+        priv->lastX = scalex(priv, priv->globalX);
+        ++leave;
+    }
+
+    /* Draw pseudo cursor in window */
+    dmxConsoleDrawFineCursor(priv, &rects[1]);
+
+    XSetClipRectangles(priv->display, priv->gc, 0, 0, rects, 2, Unsorted);
+    XCopyArea(priv->display, priv->pixmap, priv->window, priv->gc,
+              0, 0, priv->consWidth, priv->consHeight, 0, 0);
+    XSetClipMask(priv->display, priv->gc, None);
+
+    DMXDBG2("dmxConsoleUpdateFineCursor: WARP %d %d\n",
+            priv->lastX, priv->lastY);
+    XWarpPointer(priv->display, priv->window, priv->window,
+                 0, 0, 0, 0, priv->lastX, priv->lastY);
+    XSync(priv->display, False);        /* Not a backend display */
+
+    if (leave) {
+        XEvent X;
+
+        while (XCheckMaskEvent(priv->display, PointerMotionMask, &X)) {
+            if (X.type == MotionNotify) {
+                if (X.xmotion.x != priv->lastX || X.xmotion.y != priv->lastY) {
+                    DMXDBG4("Ignoring motion to %d %d after leave frm %d %d\n",
+                            X.xmotion.x, X.xmotion.y, priv->lastX, priv->lastY);
+                }
+            }
+            else {
+                dmxLog(dmxInfo, "Ignoring event (%d): %s ****************\n",
+                       X.type, dmxEventName(X.type));
+            }
+        }
+    }
+    DMXDBG6("dmxConsoleUpdateFineCursor: Warp %d %d on %d %d [%d %d]\n",
+            priv->lastX, priv->lastY,
+            scalex(priv, priv->width),
+            scaley(priv, priv->height), priv->globalX, priv->globalY);
+}
+
+/** Whenever the window layout (size, position, stacking order) might be
+ * changed, this routine is called with the \a pWindow that changed and
+ * the \a type of change.  This routine is called in a conservative
+ * fashion: the actual layout of the windows of the screen might not
+ * have had any human-visible changes. */
+void
+dmxConsoleUpdateInfo(pointer private, DMXUpdateType type, WindowPtr pWindow)
+{
+    GETONLYPRIVFROMPRIVATE;
+    dmxConsoleDraw(priv, 1, 1);
+}
+
+static void
+dmxConsoleMoveAbsolute(myPrivate * priv, int x, int y,
+                       DevicePtr pDev, dmxMotionProcPtr motion,
+                       DMXBlockType block)
+{
+    int tmpX, tmpY, v[2];
+
+    tmpX = unscalex(priv, x);
+    tmpY = unscalex(priv, y);
+    DMXDBG6("dmxConsoleMoveAbsolute(,%d,%d) %d %d =? %d %d\n",
+            x, y, tmpX, tmpY, priv->curX, priv->curY);
+    if (tmpX == priv->curX && tmpY == priv->curY)
+        return;
+    v[0] = unscalex(priv, x);
+    v[1] = unscaley(priv, y);
+    motion(pDev, v, 0, 2, DMX_ABSOLUTE_CONFINED, block);
+    /* dmxConsoleUpdatePosition gets called here by dmxCoreMotion */
+}
+
+static void
+dmxConsoleMoveRelative(myPrivate * priv, int x, int y,
+                       DevicePtr pDev, dmxMotionProcPtr motion,
+                       DMXBlockType block)
+{
+    int v[2];
+
+    /* Ignore the event generated from * warping back to middle */
+    if (x == priv->lastX && y == priv->lastY)
+        return;
+    v[0] = priv->lastX - x;
+    v[1] = priv->lastY - y;
+    motion(pDev, v, 0, 2, DMX_RELATIVE, block);
+    /* dmxConsoleUpdatePosition gets called here by dmxCoreMotion */
+}
+
+/** This routine gets called from #dmxCoreMotion for each motion.  This
+ * allows the console's notion of the cursor postion to change when
+ * another input device actually caused the change. */
+void
+dmxConsoleUpdatePosition(pointer private, int x, int y)
+{
+    GETONLYPRIVFROMPRIVATE;
+    int tmpX, tmpY;
+    Display *dpy = priv->display;
+    static unsigned long dmxGeneration = 0;
+
+    tmpX = scalex(priv, x);
+    tmpY = scaley(priv, y);
+    DMXDBG6("dmxConsoleUpdatePosition(,%d,%d) new=%d,%d dims=%d,%d\n",
+            x, y, tmpX, tmpY, priv->consWidth, priv->consHeight);
+
+    if (priv->fine)
+        dmxConsoleUpdateFineCursor(priv);
+    if (tmpX != priv->curX || tmpY != priv->curY) {
+        if (tmpX < 0)
+            tmpX = 0;
+        if (tmpY < 0)
+            tmpY = 0;
+        if (tmpX >= priv->consWidth)
+            tmpX = priv->consWidth - 1;
+        if (tmpY >= priv->consHeight)
+            tmpY = priv->consHeight - 1;
+        priv->curX = tmpX;
+        priv->curY = tmpY;
+        if (!priv->fine) {
+            DMXDBG2("   WARP B %d %d\n", priv->curX, priv->curY);
+            XWarpPointer(dpy, priv->window,
+                         priv->window, 0, 0, 0, 0, tmpX, tmpY);
+            XSync(dpy, False);  /* Not a backend display */
+        }
+    }
+
+    if (dmxGeneration != serverGeneration) {
+        dmxGeneration = serverGeneration;
+        dmxConsoleDraw(priv, 1, 1);
+    }
+}
+
+/** Collect all pending events from the console's display.  Plase these
+ * events on the server event queue using the \a motion and \a enqueue
+ * routines.  The \a checkspecial routine is used to check for special
+ * keys that need handling.  \a block tells if signals should be blocked
+ * when updating the event queue. */
+void
+dmxConsoleCollectEvents(DevicePtr pDev,
+                        dmxMotionProcPtr motion,
+                        dmxEnqueueProcPtr enqueue,
+                        dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)
+{
+    GETPRIVFROMPDEV;
+    GETDMXINPUTFROMPRIV;
+    Display *dpy = priv->display;
+    Window win = priv->window;
+    int width = priv->width;
+    int height = priv->height;
+    XEvent X, N;
+    XSetWindowAttributes attribs;
+    static int rInitialized = 0;
+    static Region r;
+    XRectangle rect;
+    static int raising = 0, raiseX, raiseY;     /* FIXME */
+
+    while (XPending(dpy)) {
+        XNextEvent(dpy, &X);
+        switch (X.type) {
+        case VisibilityNotify:
+            break;
+        case Expose:
+            DMXDBG5("dmxConsoleCollectEvents: Expose #%d %d %d %d %d\n",
+                    X.xexpose.count,
+                    X.xexpose.x, X.xexpose.y,
+                    X.xexpose.width, X.xexpose.height);
+            if (!rInitialized++)
+                r = XCreateRegion();
+            rect.x = X.xexpose.x;
+            rect.y = X.xexpose.y;
+            rect.width = X.xexpose.width;
+            rect.height = X.xexpose.height;
+            XUnionRectWithRegion(&rect, r, r);
+            if (X.xexpose.count == 0) {
+                XSetRegion(dpy, priv->gc, r);
+                XSetRegion(dpy, priv->gcDet, r);
+                XSetRegion(dpy, priv->gcRev, r);
+                dmxConsoleDraw(priv, 1, 1);
+                XSetClipMask(dpy, priv->gc, None);
+                XSetClipMask(dpy, priv->gcDet, None);
+                XSetClipMask(dpy, priv->gcRev, None);
+                XDestroyRegion(r);
+                rInitialized = 0;
+            }
+            break;
+        case ResizeRequest:
+            DMXDBG2("dmxConsoleCollectEvents: Resize %d %d\n",
+                    X.xresizerequest.width, X.xresizerequest.height);
+            priv->consWidth = X.xresizerequest.width;
+            priv->consHeight = X.xresizerequest.height;
+            priv->xScale = (double) priv->consWidth / width;
+            priv->yScale = (double) priv->consHeight / height;
+            attribs.override_redirect = True;
+            XChangeWindowAttributes(dpy, win, CWOverrideRedirect, &attribs);
+            XResizeWindow(dpy, win, priv->consWidth, priv->consHeight);
+            XFreePixmap(dpy, priv->pixmap);
+            priv->pixmap = XCreatePixmap(dpy,
+                                         RootWindow(dpy, DefaultScreen(dpy)),
+                                         priv->consWidth,
+                                         priv->consHeight,
+                                         DefaultDepth(dpy, DefaultScreen(dpy)));
+            dmxConsoleDraw(priv, 1, 1);
+            attribs.override_redirect = False;
+            XChangeWindowAttributes(dpy, win, CWOverrideRedirect, &attribs);
+            break;
+        case LeaveNotify:
+            DMXDBG4("dmxConsoleCollectEvents: Leave @ %d,%d; r=%d f=%d\n",
+                    X.xcrossing.x, X.xcrossing.y, raising, priv->fine);
+            if (!priv->captured)
+                dmxCommonRestoreState(priv);
+            else {
+                dmxConsoleUncapture(dmxInput);
+                dmxCommonRestoreState(priv);
+            }
+            break;
+        case EnterNotify:
+            DMXDBG6("dmxConsoleCollectEvents: Enter %d,%d r=%d f=%d (%d,%d)\n",
+                    X.xcrossing.x, X.xcrossing.y, raising, priv->fine,
+                    priv->curX, priv->curY);
+            dmxCommonSaveState(priv);
+            if (raising) {
+                raising = 0;
+                dmxConsoleMoveAbsolute(priv, raiseX, raiseY,
+                                       priv->mou, motion, block);
+            }
+            else {
+                if (priv->fine) {
+                    /* The raise will generate an event near the center,
+                     * which is not where the cursor should be.  So we
+                     * save the real position, do the raise, and move
+                     * the cursor here again after the raise generates
+                     * the event. */
+                    raising = 1;
+                    raiseX = X.xcrossing.x;
+                    raiseY = X.xcrossing.y;
+                    XRaiseWindow(dpy, priv->window);
+                }
+                XSync(dpy, False);      /* Not a backend display */
+                if (!X.xcrossing.x && !X.xcrossing.y)
+                    dmxConsoleMoveAbsolute(priv, priv->curX, priv->curY,
+                                           priv->mou, motion, block);
+            }
+            break;
+        case MotionNotify:
+            if (priv->curX == X.xmotion.x && priv->curY == X.xmotion.y)
+                continue;
+            if (XPending(dpy)) {        /* do motion compression */
+                XPeekEvent(dpy, &N);
+                if (N.type == MotionNotify)
+                    continue;
+            }
+            DMXDBG2("dmxConsoleCollectEvents: Motion %d %d\n",
+                    X.xmotion.x, X.xmotion.y);
+            if (raising) {
+                raising = 0;
+                dmxConsoleMoveAbsolute(priv, raiseX, raiseY,
+                                       priv->mou, motion, block);
+            }
+            else {
+                if (priv->fine)
+                    dmxConsoleMoveRelative(priv, X.xmotion.x, X.xmotion.y,
+                                           priv->mou, motion, block);
+                else
+                    dmxConsoleMoveAbsolute(priv, X.xmotion.x, X.xmotion.y,
+                                           priv->mou, motion, block);
+            }
+            break;
+        case KeyPress:
+        case KeyRelease:
+            enqueue(priv->kbd, X.type, X.xkey.keycode, 0, NULL, block);
+            break;
+        default:
+            /* Pass the whole event here, because
+             * this may be an extension event. */
+            enqueue(priv->mou, X.type, X.xbutton.button, 0, &X, block);
+            break;
+        }
+    }
+}
+
+static void
+dmxCloseConsole(myPrivate * priv)
+{
+    GETDMXINPUTFROMPRIV;
+    dmxCommonRestoreState(priv);
+    if (priv->display) {
+        XFreeGC(priv->display, priv->gc);
+        XFreeGC(priv->display, priv->gcDet);
+        XFreeGC(priv->display, priv->gcRev);
+        XFreeGC(priv->display, priv->gcCur);
+        if (!dmxInput->console)
+            XCloseDisplay(priv->display);
+    }
+    priv->display = NULL;
+}
+
+static Bool
+dmxCloseConsoleScreen(int idx, ScreenPtr pScreen)
+{
+    myPrivate *priv, *last;
+
+    for (last = priv = (myPrivate *) dixLookupPrivate(&pScreen->devPrivates,
+                                                      dmxScreenPrivateKey);
+         priv; priv = priv->next)
+        dmxCloseConsole(last = priv);
+
+    DMX_UNWRAP(CloseScreen, last, pScreen);
+    return pScreen->CloseScreen(idx, pScreen);
+}
+
+static Cursor
+dmxConsoleCreateEmptyCursor(myPrivate * priv)
+{
+    char noCursorData[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    Pixmap pixmap;
+    Cursor cursor;
+    XColor color, tmpColor;
+    Display *dpy = priv->display;
+
+    /* Create empty cursor for window */
+    pixmap = XCreateBitmapFromData(priv->display, priv->window,
+                                   noCursorData, 8, 8);
+    if (!XAllocNamedColor(dpy, DefaultColormap(dpy, DefaultScreen(dpy)),
+                          "black", &color, &tmpColor))
+        dmxLog(dmxFatal, "Cannot allocate color for cursor\n");
+    cursor = XCreatePixmapCursor(dpy, pixmap, pixmap, &color, &color, 0, 0);
+    XFreePixmap(dpy, pixmap);
+    return cursor;
+}
+
+static void
+dmxConsoleComputeWidthHeight(myPrivate * priv,
+                             int *width, int *height,
+                             double *xScale, double *yScale,
+                             int *consWidth, int *consHeight)
+{
+    int screen;
+    Display *dpy = priv->display;
+
+    *width = 0;
+    *height = 0;
+    *xScale = 1.0;
+    *yScale = 1.0;
+
+    screen = DefaultScreen(dpy);
+    *consWidth = DisplayWidth(dpy, screen) * CONSOLE_NUM / CONSOLE_DEN;
+    *consHeight = DisplayHeight(dpy, screen) * CONSOLE_NUM / CONSOLE_DEN;
+
+    if (*consWidth < 1)
+        *consWidth = 1;
+    if (*consHeight < 1)
+        *consHeight = 1;
+
+#if 1
+    /* Always keep the console size similar
+     * to the global bounding box. */
+    *width = dmxGlobalWidth;
+    *height = dmxGlobalHeight;
+#else
+    /* Make the console window as big as
+     * possible by computing the visible
+     * bounding box. */
+    for (i = 0; i < dmxNumScreens; i++) {
+        if (screenInfo.screens[i]->x + screenInfo.screens[i]->width > *width)
+            *width = screenInfo.screens[i]->x + screenInfo.screens[i]->width;
+
+        if (screenInfo.screens[i]->y + screenInfo.screens[i]->height > *height)
+            *height = screenInfo.screens[i]->y + screenInfo.screens[i]->height;
+    }
+#endif
+
+    if ((double) *consWidth / *width < (double) *consHeight / *height)
+        *xScale = *yScale = (double) *consWidth / *width;
+    else
+        *xScale = *yScale = (double) *consHeight / *height;
+
+    *consWidth = scalex(priv, *width);
+    *consHeight = scaley(priv, *height);
+    if (*consWidth < 1)
+        *consWidth = 1;
+    if (*consHeight < 1)
+        *consHeight = 1;
+}
+
+/** Re-initialized the console device described by \a pDev (after a
+ * reconfig). */
+void
+dmxConsoleReInit(DevicePtr pDev)
+{
+    GETPRIVFROMPDEV;
+    Display *dpy;
+
+    if (!priv || !priv->initialized)
+        return;
+    dpy = priv->display;
+
+    dmxConsoleComputeWidthHeight(priv,
+                                 &priv->width, &priv->height,
+                                 &priv->xScale, &priv->yScale,
+                                 &priv->consWidth, &priv->consHeight);
+    XResizeWindow(dpy, priv->window, priv->consWidth, priv->consHeight);
+    XFreePixmap(dpy, priv->pixmap);
+    priv->pixmap = XCreatePixmap(dpy,
+                                 RootWindow(dpy, DefaultScreen(dpy)),
+                                 priv->consWidth,
+                                 priv->consHeight,
+                                 DefaultDepth(dpy, DefaultScreen(dpy)));
+    dmxConsoleDraw(priv, 1, 1);
+}
+
+/** Initialized the console device described by \a pDev. */
+void
+dmxConsoleInit(DevicePtr pDev)
+{
+    GETPRIVFROMPDEV;
+    DMXInputInfo *dmxInput = &dmxInputs[dmxLocal->inputIdx];
+    int screen;
+    unsigned long mask;
+    XSetWindowAttributes attribs;
+    Display *dpy;
+    Window win;
+    XGCValues gcvals;
+    XColor color;
+    XClassHint class_hints;
+    unsigned long tmp;
+
+    if (dmxLocal->type == DMX_LOCAL_MOUSE)
+        priv->mou = pDev;
+    if (dmxLocal->type == DMX_LOCAL_KEYBOARD)
+        priv->kbd = pDev;
+    if (priv->initialized++)
+        return;                 /* Only do once for mouse/keyboard pair */
+
+    if (!(dpy = priv->display = XOpenDisplay(dmxInput->name)))
+        dmxLog(dmxFatal,
+               "dmxOpenConsole: cannot open console display %s\n",
+               dmxInput->name);
+
+    /* Set up defaults */
+    dmxConsoleComputeWidthHeight(priv,
+                                 &priv->width, &priv->height,
+                                 &priv->xScale, &priv->yScale,
+                                 &priv->consWidth, &priv->consHeight);
+
+    /* Private initialization using computed values or constants. */
+    screen = DefaultScreen(dpy);
+    priv->initPointerX = scalex(priv, priv->width / 2);
+    priv->initPointerY = scaley(priv, priv->height / 2);
+    priv->eventMask = (ButtonPressMask
+                       | ButtonReleaseMask
+                       | PointerMotionMask
+                       | EnterWindowMask
+                       | LeaveWindowMask
+                       | KeyPressMask
+                       | KeyReleaseMask | ExposureMask | ResizeRedirectMask);
+
+    mask = CWBackPixel | CWEventMask | CWColormap | CWOverrideRedirect;
+    attribs.colormap = DefaultColormap(dpy, screen);
+    if (XParseColor(dpy, attribs.colormap, CONSOLE_BG_COLOR, &color)
+        && XAllocColor(dpy, attribs.colormap, &color)) {
+        attribs.background_pixel = color.pixel;
+    }
+    else
+        attribs.background_pixel = WhitePixel(dpy, screen);
+
+    attribs.event_mask = priv->eventMask;
+    attribs.override_redirect = False;
+
+    win = priv->window = XCreateWindow(dpy,
+                                       RootWindow(dpy, screen),
+                                       0, 0, priv->consWidth, priv->consHeight,
+                                       0,
+                                       DefaultDepth(dpy, screen),
+                                       InputOutput,
+                                       DefaultVisual(dpy, screen),
+                                       mask, &attribs);
+    priv->pixmap = XCreatePixmap(dpy, RootWindow(dpy, screen),
+                                 priv->consWidth, priv->consHeight,
+                                 DefaultDepth(dpy, screen));
+
+    /* Set up properties */
+    XStoreName(dpy, win, DMX_CONSOLE_NAME);
+    class_hints.res_name = DMX_RES_NAME;
+    class_hints.res_class = DMX_RES_CLASS;
+    XSetClassHint(dpy, win, &class_hints);
+
+    /* Map the window */
+    XMapWindow(dpy, win);
+
+    /* Create cursors */
+    priv->cursorNormal = XCreateFontCursor(dpy, XC_circle);
+    priv->cursorGrabbed = XCreateFontCursor(dpy, XC_spider);
+    priv->cursorEmpty = dmxConsoleCreateEmptyCursor(priv);
+    XDefineCursor(dpy, priv->window, priv->cursorNormal);
+
+    /* Create GC */
+    mask = (GCFunction | GCPlaneMask | GCClipMask | GCForeground |
+            GCBackground | GCLineWidth | GCLineStyle | GCCapStyle |
+            GCFillStyle | GCGraphicsExposures);
+    gcvals.function = GXcopy;
+    gcvals.plane_mask = AllPlanes;
+    gcvals.clip_mask = None;
+    if (XParseColor(dpy, attribs.colormap, CONSOLE_SCREEN_FG_COLOR, &color)
+        && XAllocColor(dpy, attribs.colormap, &color)) {
+        gcvals.foreground = color.pixel;
+    }
+    else
+        gcvals.foreground = BlackPixel(dpy, screen);
+    if (XParseColor(dpy, attribs.colormap, CONSOLE_SCREEN_BG_COLOR, &color)
+        && XAllocColor(dpy, attribs.colormap, &color)) {
+        gcvals.background = color.pixel;
+    }
+    else
+        gcvals.background = WhitePixel(dpy, screen);
+    gcvals.line_width = 0;
+    gcvals.line_style = LineSolid;
+    gcvals.cap_style = CapNotLast;
+    gcvals.fill_style = FillSolid;
+    gcvals.graphics_exposures = False;
+
+    priv->gc = XCreateGC(dpy, win, mask, &gcvals);
+
+    tmp = gcvals.foreground;
+    if (XParseColor(dpy, attribs.colormap, CONSOLE_SCREEN_DET_COLOR, &color)
+        && XAllocColor(dpy, attribs.colormap, &color)) {
+        gcvals.foreground = color.pixel;
+    }
+    else
+        gcvals.foreground = BlackPixel(dpy, screen);
+    priv->gcDet = XCreateGC(dpy, win, mask, &gcvals);
+    gcvals.foreground = tmp;
+
+    tmp = gcvals.background;
+    gcvals.background = gcvals.foreground;
+    gcvals.foreground = tmp;
+    priv->gcRev = XCreateGC(dpy, win, mask, &gcvals);
+
+    gcvals.background = gcvals.foreground;
+    if (XParseColor(dpy, attribs.colormap, CONSOLE_SCREEN_CUR_COLOR, &color)
+        && XAllocColor(dpy, attribs.colormap, &color)) {
+        gcvals.foreground = color.pixel;
+    }
+    else
+        gcvals.foreground = BlackPixel(dpy, screen);
+    priv->gcCur = XCreateGC(dpy, win, mask, &gcvals);
+
+    dmxConsoleDraw(priv, 1, 1);
+
+    if (dixLookupPrivate(&screenInfo.screens[0]->devPrivates,
+                         dmxScreenPrivateKey))
+        priv->next = dixLookupPrivate(&screenInfo.screens[0]->devPrivates,
+                                      dmxScreenPrivateKey);
+    else
+        DMX_WRAP(CloseScreen, dmxCloseConsoleScreen,
+                 priv, screenInfo.screens[0]);
+    dixSetPrivate(&screenInfo.screens[0]->devPrivates, dmxScreenPrivateKey,
+                  priv);
+}
+
+/** Fill in the \a info structure for the specified \a pDev.  Only used
+ * for pointers. */
+void
+dmxConsoleMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+{
+    GETPRIVFROMPDEV;
+
+    info->buttonClass = 1;
+    dmxCommonMouGetMap(pDev, info->map, &info->numButtons);
+    info->valuatorClass = 1;
+    info->numRelAxes = 2;
+    info->minval[0] = 0;
+    info->minval[1] = 0;
+    /* max possible console window size: */
+    info->maxval[0] = DisplayWidth(priv->display, DefaultScreen(priv->display));
+    info->maxval[1] =
+        DisplayHeight(priv->display, DefaultScreen(priv->display));
+    info->res[0] = 1;
+    info->minres[0] = 0;
+    info->maxres[0] = 1;
+    info->ptrFeedbackClass = 1;
+}
+
+/** Fill in the \a info structure for the specified \a pDev.  Only used
+ * for keyboard. */
+void
+dmxConsoleKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+{
+    dmxCommonKbdGetInfo(pDev, info);
+    info->keyboard = 1;
+    info->keyClass = 1;
+    dmxCommonKbdGetMap(pDev, &info->keySyms, info->modMap);
+    info->freemap = 1;
+    info->focusClass = 1;
+    info->kbdFeedbackClass = 1;
+}
+
+/** Handle special console-only keys. */
+int
+dmxConsoleFunctions(pointer private, DMXFunctionType function)
+{
+    GETONLYPRIVFROMPRIVATE;
+    XRectangle rect;
+    Display *dpy = priv->display;
+
+    switch (function) {
+    case DMX_FUNCTION_FINE:
+        if (priv->fine) {
+            priv->fine = 0;
+            dmxConsoleClearCursor(priv, priv->globalX, priv->globalY, &rect);
+            XSetClipRectangles(dpy, priv->gc, 0, 0, &rect, 1, Unsorted);
+            XCopyArea(dpy, priv->pixmap, priv->window, priv->gc,
+                      0, 0, priv->consWidth, priv->consHeight, 0, 0);
+            XSetClipMask(dpy, priv->gc, None);
+
+            XDefineCursor(dpy, priv->window,
+                          priv->grabbed
+                          ? priv->cursorGrabbed : priv->cursorNormal);
+            XWarpPointer(dpy, priv->window, priv->window,
+                         0, 0, 0, 0,
+                         scalex(priv, priv->globalX),
+                         scaley(priv, priv->globalY));
+            XSync(dpy, False);  /* Not a backend display */
+        }
+        else {
+            priv->fine = 1;
+            XRaiseWindow(dpy, priv->window);
+            XDefineCursor(dpy, priv->window, priv->cursorEmpty);
+            dmxConsoleUpdateFineCursor(priv);
+        }
+        return 1;
+    case DMX_FUNCTION_GRAB:
+        if (priv->grabbed) {
+            XUngrabKeyboard(dpy, CurrentTime);
+            XUngrabPointer(dpy, CurrentTime);
+            XDefineCursor(dpy, priv->window,
+                          priv->fine ? priv->cursorEmpty : priv->cursorNormal);
+        }
+        else {
+            if (XGrabPointer(dpy, priv->window, True,
+                             0, GrabModeAsync, GrabModeAsync, priv->window,
+                             None, CurrentTime)) {
+                dmxLog(dmxError, "XGrabPointer failed\n");
+                return 0;
+            }
+            if (XGrabKeyboard(dpy, priv->window, True,
+                              GrabModeAsync, GrabModeAsync, CurrentTime)) {
+                dmxLog(dmxError, "XGrabKeyboard failed\n");
+                XUngrabPointer(dpy, CurrentTime);
+                return 0;
+            }
+            XDefineCursor(dpy, priv->window,
+                          priv->fine ? priv->cursorEmpty : priv->cursorGrabbed);
+        }
+        priv->grabbed = !priv->grabbed;
+        if (priv->fine)
+            dmxConsoleUpdateFineCursor(priv);
+        return 1;
+    case DMX_FUNCTION_TERMINATE:
+        return 1;
+    default:
+        return 0;
+    }
+}
+
+static void
+dmxDump(void)
+{
+    int i, j;
+    DMXInputInfo *dmxInput;
+    XEvent X;
+
+    for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++) {
+        for (j = 0; j < dmxInput->numDevs; j++) {
+            DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[j];
+            myPrivate *priv = dmxLocal->private;
+
+            while (priv
+                   && priv->display
+                   && XCheckTypedEvent(priv->display, MotionNotify, &X)) {
+                DMXDBG4("dmxDump: %s/%d threw event away %d %s\n",
+                        dmxInput->name, j, X.type, dmxEventName(X.type));
+            }
+        }
+    }
+}
+
+/** This routine is used to warp the pointer into the console window
+ * from anywhere on the screen.  It is used when backend and console
+ * input are both being taken from the same X display. */
+void
+dmxConsoleCapture(DMXInputInfo * dmxInput)
+{
+    int i;
+    XEvent X;
+
+    DMXDBG0("dmxConsoleCapture\n");
+    dmxSync(NULL, TRUE);
+    for (i = 0; i < dmxInput->numDevs; i++) {
+        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
+        myPrivate *priv = dmxLocal->private;
+
+        if (dmxLocal->extType != DMX_LOCAL_TYPE_CONSOLE)
+            continue;
+        if (dmxLocal->type != DMX_LOCAL_MOUSE)
+            continue;
+        if (priv->captured)
+            continue;
+        priv->captured = 2;     /* Ungrab only after proximal events. */
+        XRaiseWindow(priv->display, priv->window);
+        XSync(priv->display, False);    /* Not a backend display */
+        while (XCheckTypedEvent(priv->display, MotionNotify, &X)) {
+            DMXDBG3("   Ignoring motion to %d %d after capture on %s\n",
+                    X.xmotion.x, X.xmotion.y, dmxInput->name);
+        }
+        XWarpPointer(priv->display, None,
+                     priv->window, 0, 0, 0, 0, priv->curX, priv->curY);
+        XSync(priv->display, False);    /* Not a backend display */
+        dmxDump();
+        if (priv->fine)
+            dmxConsoleUpdateFineCursor(priv);
+    }
+}
+
+/** Undo the capture that was done by #dmxConsoleCapture. */
+void
+dmxConsoleUncapture(DMXInputInfo * dmxInput)
+{
+    int i;
+
+    DMXDBG0("dmxConsoleUncapture\n");
+    dmxSync(NULL, TRUE);
+    for (i = 0; i < dmxInput->numDevs; i++) {
+        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
+        myPrivate *priv = dmxLocal->private;
+
+        if (dmxLocal->extType != DMX_LOCAL_TYPE_CONSOLE)
+            continue;
+        if (dmxLocal->type != DMX_LOCAL_MOUSE)
+            continue;
+        if (!priv->captured)
+            continue;
+        priv->captured = 0;
+        XSync(priv->display, False);    /* Not a backend display */
+    }
+}
diff --git a/xorg-server/hw/dmx/input/dmxdetach.c b/xorg-server/hw/dmx/input/dmxdetach.c
index cc2250683..469f9c8d0 100644
--- a/xorg-server/hw/dmx/input/dmxdetach.c
+++ b/xorg-server/hw/dmx/input/dmxdetach.c
@@ -42,12 +42,14 @@
 #include "dmxextension.h"       /* For dmxInputCount */
 
 /** Search for input associated with \a dmxScreen, and detach. */
-void dmxInputDetach(DMXScreenInfo *dmxScreen, Bool reserveId)
+void
+dmxInputDetach(DMXScreenInfo * dmxScreen, Bool reserveId)
 {
     int i;
 
     for (i = 0; i < dmxNumInputs; i++) {
         DMXInputInfo *dmxInput = &dmxInputs[i];
+
         if (dmxInput->scrnIdx == dmxScreen->index) {
             dmxLogInput(dmxInput, "Detaching (%sreserved)\n",
                         reserveId ? "" : "not ");
diff --git a/xorg-server/hw/dmx/input/dmxdummy.c b/xorg-server/hw/dmx/input/dmxdummy.c
index 971892b9f..0690177f8 100644
--- a/xorg-server/hw/dmx/input/dmxdummy.c
+++ b/xorg-server/hw/dmx/input/dmxdummy.c
@@ -47,40 +47,42 @@
 /** Return information about the dummy keyboard device specified in \a pDev
  * into the structure pointed to by \a info.  The keyboard is set up to
  * have 1 valid key code that is \a NoSymbol */
-void dmxDummyKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+void
+dmxDummyKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
 {
     static KeySym keyboard_mapping = NoSymbol;
 
-    info->keyboard           = 1;
-    info->keyClass           = 1;
+    info->keyboard = 1;
+    info->keyClass = 1;
     info->keySyms.minKeyCode = 8;
     info->keySyms.maxKeyCode = 8;
-    info->keySyms.mapWidth   = 1;
-    info->keySyms.map        = &keyboard_mapping;
-    info->freemap            = 0;
-    info->focusClass         = 1;
-    info->kbdFeedbackClass   = 1;
-    info->force              = 1;
+    info->keySyms.mapWidth = 1;
+    info->keySyms.map = &keyboard_mapping;
+    info->freemap = 0;
+    info->focusClass = 1;
+    info->kbdFeedbackClass = 1;
+    info->force = 1;
 }
 
 /** Return information about the dummy mouse device specified in \a pDev
  * into the structure pointed to by \a info.  They mouse has 3 buttons
  * and two axes. */
-void dmxDummyMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+void
+dmxDummyMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
 {
-    info->buttonClass      = 1;
-    info->numButtons       = 3;
-    info->map[0]           = 1;
-    info->map[1]           = 2;
-    info->map[2]           = 3;
-    info->valuatorClass    = 1;
-    info->numRelAxes       = 2;
-    info->minval[0]        = 0;
-    info->minval[1]        = 0;
-    info->maxval[0]        = 0;
-    info->maxval[1]        = 0;
-    info->res[0]           = 1;
-    info->minres[0]        = 0;
-    info->maxres[0]        = 1;
+    info->buttonClass = 1;
+    info->numButtons = 3;
+    info->map[0] = 1;
+    info->map[1] = 2;
+    info->map[2] = 3;
+    info->valuatorClass = 1;
+    info->numRelAxes = 2;
+    info->minval[0] = 0;
+    info->minval[1] = 0;
+    info->maxval[0] = 0;
+    info->maxval[1] = 0;
+    info->res[0] = 1;
+    info->minres[0] = 0;
+    info->maxres[0] = 1;
     info->ptrFeedbackClass = 1;
 }
diff --git a/xorg-server/hw/dmx/input/dmxevents.c b/xorg-server/hw/dmx/input/dmxevents.c
index 41bc4bf2d..f73480824 100644
--- a/xorg-server/hw/dmx/input/dmxevents.c
+++ b/xorg-server/hw/dmx/input/dmxevents.c
@@ -61,9 +61,9 @@
 #include "xkbsrv.h"
 #include "XIstubs.h"
 
-static int  dmxGlobalX, dmxGlobalY; /* Global cursor position */
-static int  dmxGlobalInvalid;       /* Flag indicating dmxCoreMotion
-                                     * should move the mouse anyway. */
+static int dmxGlobalX, dmxGlobalY;      /* Global cursor position */
+static int dmxGlobalInvalid;    /* Flag indicating dmxCoreMotion
+                                 * should move the mouse anyway. */
 
 #if DMX_EVENTS_DEBUG
 #define DMXDBG0(f)               dmxLog(dmxDebug,f)
@@ -85,25 +85,26 @@ static int  dmxGlobalInvalid;       /* Flag indicating dmxCoreMotion
 #define DMXDBG7(f,a,b,c,d,e,g,h)
 #endif
 
-static int dmxApplyFunctions(DMXInputInfo *dmxInput, DMXFunctionType f)
+static int
+dmxApplyFunctions(DMXInputInfo * dmxInput, DMXFunctionType f)
 {
     int i;
     int rc = 0;
 
-    for (i = 0; i < dmxInput->numDevs; i+= dmxInput->devs[i]->binding)
+    for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding)
         if (dmxInput->devs[i]->functions)
             rc += dmxInput->devs[i]->functions(dmxInput->devs[i]->private, f);
     return rc;
 }
 
-static int dmxCheckFunctionKeys(DMXLocalInputInfoPtr dmxLocal,
-                                int type,
-                                KeySym keySym)
+static int
+dmxCheckFunctionKeys(DMXLocalInputInfoPtr dmxLocal, int type, KeySym keySym)
 {
-    DMXInputInfo   *dmxInput = &dmxInputs[dmxLocal->inputIdx];
+    DMXInputInfo *dmxInput = &dmxInputs[dmxLocal->inputIdx];
 
-#if 1 /* hack to detect ctrl-alt-q, etc */
+#if 1                           /* hack to detect ctrl-alt-q, etc */
     static int ctrl = 0, alt = 0;
+
     /* keep track of ctrl/alt key status */
     if (type == KeyPress && keySym == 0xffe3) {
         ctrl = 1;
@@ -126,11 +127,11 @@ static int dmxCheckFunctionKeys(DMXLocalInputInfoPtr dmxLocal,
         state = dmxLocalCoreKeyboard->pDevice->key->state;
     else if (dmxLocal->pDevice->key)
         state = dmxLocal->pDevice->key->state;
-    
+
     DMXDBG3("dmxCheckFunctionKeys: keySym=0x%04x %s state=0x%04x\n",
             keySym, type == KeyPress ? "press" : "release", state);
 
-    if ((state & (ControlMask|Mod1Mask)) != (ControlMask|Mod1Mask))
+    if ((state & (ControlMask | Mod1Mask)) != (ControlMask | Mod1Mask))
         return 0;
 #endif
 
@@ -151,34 +152,36 @@ static int dmxCheckFunctionKeys(DMXLocalInputInfoPtr dmxLocal,
             }
         return 1;
     }
-    
+
     return 0;
 }
 
-
-DMXScreenInfo *dmxFindFirstScreen(int x, int y)
+DMXScreenInfo *
+dmxFindFirstScreen(int x, int y)
 {
     int i;
 
     for (i = 0; i < dmxNumScreens; i++) {
         DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
         if (dmxOnScreen(x, y, dmxScreen))
             return dmxScreen;
     }
     return NULL;
 }
 
-
 /**
  * Enqueue a motion event.
  */
-static void enqueueMotion(DevicePtr pDev, int x, int y)
+static void
+enqueueMotion(DevicePtr pDev, int x, int y)
 {
     GETDMXLOCALFROMPDEV;
     DeviceIntPtr p = dmxLocal->pDevice;
     int valuators[3];
-    int detail = 0;  /* XXX should this be mask of pressed buttons? */
+    int detail = 0;             /* XXX should this be mask of pressed buttons? */
     ValuatorMask mask;
+
     valuators[0] = x;
     valuators[1] = y;
 
@@ -188,50 +191,50 @@ static void enqueueMotion(DevicePtr pDev, int x, int y)
     return;
 }
 
-
 void
 dmxCoreMotion(DevicePtr pDev, int x, int y, int delta, DMXBlockType block)
 {
     DMXScreenInfo *dmxScreen;
-    DMXInputInfo  *dmxInput;
-    ScreenPtr     pScreen;
-    int           localX;
-    int           localY;
-    int           i;
+    DMXInputInfo *dmxInput;
+    ScreenPtr pScreen;
+    int localX;
+    int localY;
+    int i;
 
     if (!dmxGlobalInvalid && dmxGlobalX == x && dmxGlobalY == y)
         return;
-    
+
     DMXDBG5("dmxCoreMotion(%d,%d,%d) dmxGlobalX=%d dmxGlobalY=%d\n",
             x, y, delta, dmxGlobalX, dmxGlobalY);
 
     dmxGlobalInvalid = 0;
-    dmxGlobalX       = x;
-    dmxGlobalY       = y;
+    dmxGlobalX = x;
+    dmxGlobalY = y;
 
     if (dmxGlobalX < 0)
         dmxGlobalX = 0;
     if (dmxGlobalY < 0)
         dmxGlobalY = 0;
     if (dmxGlobalX >= dmxGlobalWidth)
-        dmxGlobalX = dmxGlobalWidth  + delta -1;
+        dmxGlobalX = dmxGlobalWidth + delta - 1;
     if (dmxGlobalY >= dmxGlobalHeight)
-        dmxGlobalY = dmxGlobalHeight + delta -1;
-    
+        dmxGlobalY = dmxGlobalHeight + delta - 1;
+
     if ((dmxScreen = dmxFindFirstScreen(dmxGlobalX, dmxGlobalY))) {
         localX = dmxGlobalX - dmxScreen->rootXOrigin;
         localY = dmxGlobalY - dmxScreen->rootYOrigin;
         if ((pScreen = miPointerGetScreen(inputInfo.pointer))
             && pScreen->myNum == dmxScreen->index) {
-                                /* Screen is old screen */
+            /* Screen is old screen */
             if (block)
                 dmxSigioBlock();
             if (pDev)
-               enqueueMotion(pDev, localX, localY);
+                enqueueMotion(pDev, localX, localY);
             if (block)
                 dmxSigioUnblock();
-        } else {
-                                /* Screen is new */
+        }
+        else {
+            /* Screen is new */
             DMXDBG4("   New screen: old=%d new=%d localX=%d localY=%d\n",
                     pScreen->myNum, dmxScreen->index, localX, localY);
             if (block)
@@ -240,7 +243,7 @@ dmxCoreMotion(DevicePtr pDev, int x, int y, int delta, DMXBlockType block)
             miPointerSetScreen(inputInfo.pointer, dmxScreen->index,
                                localX, localY);
             if (pDev)
-               enqueueMotion(pDev, localX, localY);
+                enqueueMotion(pDev, localX, localY);
             if (block)
                 dmxSigioUnblock();
         }
@@ -260,10 +263,11 @@ dmxCoreMotion(DevicePtr pDev, int x, int y, int delta, DMXBlockType block)
         }
 #endif
     }
-                                /* Send updates down to all core input
-                                 * drivers */
+    /* Send updates down to all core input
+     * drivers */
     for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++) {
         int j;
+
         for (j = 0; j < dmxInput->numDevs; j += dmxInput->devs[j]->binding)
             if (!dmxInput->detached
                 && dmxInput->devs[j]->sendsCore
@@ -271,34 +275,35 @@ dmxCoreMotion(DevicePtr pDev, int x, int y, int delta, DMXBlockType block)
                 dmxInput->devs[j]->update_position(dmxInput->devs[j]->private,
                                                    dmxGlobalX, dmxGlobalY);
     }
-    if (!dmxScreen) ProcessInputEvents();
+    if (!dmxScreen)
+        ProcessInputEvents();
 }
 
-
-
 #define DMX_MAX_AXES 32         /* Max axes reported by this routine */
-static void dmxExtMotion(DMXLocalInputInfoPtr dmxLocal,
-                         int *v, int firstAxis, int axesCount,
-                         DMXMotionType type, DMXBlockType block)
+static void
+dmxExtMotion(DMXLocalInputInfoPtr dmxLocal,
+             int *v, int firstAxis, int axesCount,
+             DMXMotionType type, DMXBlockType block)
 {
-    DeviceIntPtr           pDevice = dmxLocal->pDevice;
-    xEvent                 xE[2 * DMX_MAX_AXES/6];
-    deviceKeyButtonPointer *xev    = (deviceKeyButtonPointer *)xE;
-    deviceValuator         *xv     = (deviceValuator *)xev+1;
-    int                    thisX   = 0;
-    int                    thisY   = 0;
-    int                    count;
-    ValuatorMask           mask;
+    DeviceIntPtr pDevice = dmxLocal->pDevice;
+    xEvent xE[2 * DMX_MAX_AXES / 6];
+    deviceKeyButtonPointer *xev = (deviceKeyButtonPointer *) xE;
+    deviceValuator *xv = (deviceValuator *) xev + 1;
+    int thisX = 0;
+    int thisY = 0;
+    int count;
+    ValuatorMask mask;
 
     memset(xE, 0, sizeof(xE));
 
-    if (axesCount > DMX_MAX_AXES) axesCount = DMX_MAX_AXES;
+    if (axesCount > DMX_MAX_AXES)
+        axesCount = DMX_MAX_AXES;
 
-    if ((valuator_get_mode(pDevice,0) == Relative) && axesCount == 2) {
-                                /* The dmx console is a relative mode
-                                 * device that sometimes reports
-                                 * absolute motion.  It only has two
-                                 * axes. */
+    if ((valuator_get_mode(pDevice, 0) == Relative) && axesCount == 2) {
+        /* The dmx console is a relative mode
+         * device that sometimes reports
+         * absolute motion.  It only has two
+         * axes. */
         if (type == DMX_RELATIVE) {
             thisX = -v[0];
             thisY = -v[1];
@@ -307,7 +312,8 @@ static void dmxExtMotion(DMXLocalInputInfoPtr dmxLocal,
             if (dmxLocal->update_position)
                 dmxLocal->update_position(dmxLocal->private,
                                           dmxLocal->lastX, dmxLocal->lastY);
-        } else {                    /* Convert to relative */
+        }
+        else {                  /* Convert to relative */
             if (dmxLocal->lastX || dmxLocal->lastY) {
                 thisX = v[0] - dmxLocal->lastX;
                 thisY = v[1] - dmxLocal->lastY;
@@ -320,110 +326,155 @@ static void dmxExtMotion(DMXLocalInputInfoPtr dmxLocal,
     }
 
     if (axesCount <= 6) {
-                                /* Optimize for the common case when
-                                 * only 1 or 2 axes change. */
-            xev->time          = GetTimeInMillis();
-            xev->type          = DeviceMotionNotify;
-            xev->detail        = 0;
-            xev->deviceid      = pDevice->id | MORE_EVENTS;
-            
-            xv->type           = DeviceValuator;
-            xv->deviceid       = pDevice->id;
-            xv->num_valuators  = axesCount;
-            xv->first_valuator = firstAxis;
-            switch (xv->num_valuators) {
-            case 6: xv->valuator5 = v[5];
-            case 5: xv->valuator4 = v[4];
-            case 4: xv->valuator3 = v[3];
-            case 3: xv->valuator2 = v[2];
-            case 2: xv->valuator1 = v[1];
-            case 1: xv->valuator0 = v[0];
-            }
-            count              = 2;
-    } else {
+        /* Optimize for the common case when
+         * only 1 or 2 axes change. */
+        xev->time = GetTimeInMillis();
+        xev->type = DeviceMotionNotify;
+        xev->detail = 0;
+        xev->deviceid = pDevice->id | MORE_EVENTS;
+
+        xv->type = DeviceValuator;
+        xv->deviceid = pDevice->id;
+        xv->num_valuators = axesCount;
+        xv->first_valuator = firstAxis;
+        switch (xv->num_valuators) {
+        case 6:
+            xv->valuator5 = v[5];
+        case 5:
+            xv->valuator4 = v[4];
+        case 4:
+            xv->valuator3 = v[3];
+        case 3:
+            xv->valuator2 = v[2];
+        case 2:
+            xv->valuator1 = v[1];
+        case 1:
+            xv->valuator0 = v[0];
+        }
+        count = 2;
+    }
+    else {
         int i;
+
         for (i = 0, count = 0; i < axesCount; i += 6) {
-            xev->time          = GetTimeInMillis();
-            xev->type          = DeviceMotionNotify;
-            xev->detail        = 0;
-            xev->deviceid      = pDevice->id | MORE_EVENTS;
-            xev               += 2;
-            
-            xv->type           = DeviceValuator;
-            xv->deviceid       = pDevice->id;
-            xv->num_valuators  = (i+6 >= axesCount ? axesCount - i : 6);
+            xev->time = GetTimeInMillis();
+            xev->type = DeviceMotionNotify;
+            xev->detail = 0;
+            xev->deviceid = pDevice->id | MORE_EVENTS;
+            xev += 2;
+
+            xv->type = DeviceValuator;
+            xv->deviceid = pDevice->id;
+            xv->num_valuators = (i + 6 >= axesCount ? axesCount - i : 6);
             xv->first_valuator = firstAxis + i;
             switch (xv->num_valuators) {
-            case 6: xv->valuator5 = v[i+5];
-            case 5: xv->valuator4 = v[i+4];
-            case 4: xv->valuator3 = v[i+3];
-            case 3: xv->valuator2 = v[i+2];
-            case 2: xv->valuator1 = v[i+1];
-            case 1: xv->valuator0 = v[i+0];
+            case 6:
+                xv->valuator5 = v[i + 5];
+            case 5:
+                xv->valuator4 = v[i + 4];
+            case 4:
+                xv->valuator3 = v[i + 3];
+            case 3:
+                xv->valuator2 = v[i + 2];
+            case 2:
+                xv->valuator1 = v[i + 1];
+            case 1:
+                xv->valuator0 = v[i + 0];
             }
-            xv                += 2;
-            count             += 2;
+            xv += 2;
+            count += 2;
         }
     }
 
     if (block)
         dmxSigioBlock();
     valuator_mask_set_range(&mask, firstAxis, axesCount, v);
-    QueuePointerEvents(pDevice, MotionNotify, 0,
-                       POINTER_ABSOLUTE, &mask);
+    QueuePointerEvents(pDevice, MotionNotify, 0, POINTER_ABSOLUTE, &mask);
 
     if (block)
         dmxSigioUnblock();
 }
 
-static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
-                                          XEvent *e, DMXBlockType block)
+static int
+dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
+                               XEvent * e, DMXBlockType block)
 {
-    int                    type;
-    int                    event   = -1;
-    XDeviceKeyEvent        *ke     = (XDeviceKeyEvent *)e;
-    XDeviceMotionEvent     *me     = (XDeviceMotionEvent *)e;
-    DeviceIntPtr           pDevice = dmxLocal->pDevice;
-    int                    valuators[MAX_VALUATORS];
-    ValuatorMask           mask;
+    int type;
+    int event = -1;
+    XDeviceKeyEvent *ke = (XDeviceKeyEvent *) e;
+    XDeviceMotionEvent *me = (XDeviceMotionEvent *) e;
+    DeviceIntPtr pDevice = dmxLocal->pDevice;
+    int valuators[MAX_VALUATORS];
+    ValuatorMask mask;
 
     if (!e)
-        return -1;          /* No extended event passed, cannot handle */
+        return -1;              /* No extended event passed, cannot handle */
 
-    if ((XID)dmxLocal->deviceId != ke->deviceid) {
-                                /* Search for the correct dmxLocal,
-                                 * since backend and console events are
-                                 * picked up for the first device on
-                                 * that X server. */
+    if ((XID) dmxLocal->deviceId != ke->deviceid) {
+        /* Search for the correct dmxLocal,
+         * since backend and console events are
+         * picked up for the first device on
+         * that X server. */
         int i;
         DMXInputInfo *dmxInput = &dmxInputs[dmxLocal->inputIdx];
+
         for (i = 0; i < dmxInput->numDevs; i++) {
             dmxLocal = dmxInput->devs[i];
-            if ((XID)dmxLocal->deviceId == ke->deviceid)
+            if ((XID) dmxLocal->deviceId == ke->deviceid)
                 break;
         }
     }
 
-    if ((XID)dmxLocal->deviceId != ke->deviceid
+    if ((XID) dmxLocal->deviceId != ke->deviceid
         || (type = dmxMapLookup(dmxLocal, e->type)) < 0)
-        return -1;    /* No mapping, so this event is unhandled */
+        return -1;              /* No mapping, so this event is unhandled */
 
     switch (type) {
-    case XI_DeviceValuator:          event = DeviceValuator;          break;
-    case XI_DeviceKeyPress:          event = KeyPress;                break;
-    case XI_DeviceKeyRelease:        event = KeyRelease;              break;
-    case XI_DeviceButtonPress:       event = ButtonPress;             break;
-    case XI_DeviceButtonRelease:     event = ButtonRelease;           break;
-    case XI_DeviceMotionNotify:      event = MotionNotify;            break;
-    case XI_DeviceFocusIn:           event = DeviceFocusIn;           break;
-    case XI_DeviceFocusOut:          event = DeviceFocusOut;          break;
-    case XI_ProximityIn:             event = ProximityIn;             break;
-    case XI_ProximityOut:            event = ProximityOut;            break;
-    case XI_DeviceStateNotify:       event = DeviceStateNotify;       break;
-    case XI_DeviceMappingNotify:     event = DeviceMappingNotify;     break;
-    case XI_ChangeDeviceNotify:      event = ChangeDeviceNotify;      break;
-    case XI_DeviceKeystateNotify:    event = DeviceStateNotify;       break;
-    case XI_DeviceButtonstateNotify: event = DeviceStateNotify;       break;
+    case XI_DeviceValuator:
+        event = DeviceValuator;
+        break;
+    case XI_DeviceKeyPress:
+        event = KeyPress;
+        break;
+    case XI_DeviceKeyRelease:
+        event = KeyRelease;
+        break;
+    case XI_DeviceButtonPress:
+        event = ButtonPress;
+        break;
+    case XI_DeviceButtonRelease:
+        event = ButtonRelease;
+        break;
+    case XI_DeviceMotionNotify:
+        event = MotionNotify;
+        break;
+    case XI_DeviceFocusIn:
+        event = DeviceFocusIn;
+        break;
+    case XI_DeviceFocusOut:
+        event = DeviceFocusOut;
+        break;
+    case XI_ProximityIn:
+        event = ProximityIn;
+        break;
+    case XI_ProximityOut:
+        event = ProximityOut;
+        break;
+    case XI_DeviceStateNotify:
+        event = DeviceStateNotify;
+        break;
+    case XI_DeviceMappingNotify:
+        event = DeviceMappingNotify;
+        break;
+    case XI_ChangeDeviceNotify:
+        event = ChangeDeviceNotify;
+        break;
+    case XI_DeviceKeystateNotify:
+        event = DeviceStateNotify;
+        break;
+    case XI_DeviceButtonstateNotify:
+        event = DeviceStateNotify;
+        break;
     }
 
 #define EXTRACT_VALUATORS(ke, valuators) \
@@ -438,7 +489,8 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
     case XI_DeviceKeyPress:
     case XI_DeviceKeyRelease:
         EXTRACT_VALUATORS(ke, valuators);
-        valuator_mask_set_range(&mask, ke->first_axis, ke->axes_count, valuators);
+        valuator_mask_set_range(&mask, ke->first_axis, ke->axes_count,
+                                valuators);
         if (block)
             dmxSigioBlock();
         QueueKeyboardEvents(pDevice, event, ke->keycode, &mask);
@@ -448,7 +500,8 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
     case XI_DeviceButtonPress:
     case XI_DeviceButtonRelease:
         EXTRACT_VALUATORS(ke, valuators);
-        valuator_mask_set_range(&mask, ke->first_axis, ke->axes_count, valuators);
+        valuator_mask_set_range(&mask, ke->first_axis, ke->axes_count,
+                                valuators);
         if (block)
             dmxSigioBlock();
         QueuePointerEvents(pDevice, event, ke->keycode,
@@ -459,7 +512,8 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
     case XI_ProximityIn:
     case XI_ProximityOut:
         EXTRACT_VALUATORS(ke, valuators);
-        valuator_mask_set_range(&mask, ke->first_axis, ke->axes_count, valuators);
+        valuator_mask_set_range(&mask, ke->first_axis, ke->axes_count,
+                                valuators);
         if (block)
             dmxSigioBlock();
         QueueProximityEvents(pDevice, event, &mask);
@@ -480,13 +534,13 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
     case XI_ChangeDeviceNotify:
     case XI_DeviceKeystateNotify:
     case XI_DeviceButtonstateNotify:
-                                /* These are ignored, since DMX will
-                                 * generate its own events of these
-                                 * types, as necessary.
+        /* These are ignored, since DMX will
+         * generate its own events of these
+         * types, as necessary.
 
-                                 * Perhaps ChangeDeviceNotify should
-                                 * generate an error, because it is
-                                 * unexpected? */
+         * Perhaps ChangeDeviceNotify should
+         * generate an error, because it is
+         * unexpected? */
         break;
     case XI_DeviceValuator:
     default:
@@ -498,11 +552,12 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
     return 0;
 }
 
-static int dmxGetButtonMapping(DMXLocalInputInfoPtr dmxLocal, int button)
+static int
+dmxGetButtonMapping(DMXLocalInputInfoPtr dmxLocal, int button)
 {
     ButtonClassPtr b = dmxLocal->pDevice->button;
 
-    if (button > b->numButtons) { /* This shouldn't happen. */
+    if (button > b->numButtons) {       /* This shouldn't happen. */
         dmxLog(dmxWarning, "Button %d pressed, but only %d buttons?!?\n",
                button, b->numButtons);
         return button;
@@ -512,14 +567,16 @@ static int dmxGetButtonMapping(DMXLocalInputInfoPtr dmxLocal, int button)
 
 /** Return DMX's notion of the pointer position in the global coordinate
  * space. */
-void dmxGetGlobalPosition(int *x, int *y)
+void
+dmxGetGlobalPosition(int *x, int *y)
 {
     *x = dmxGlobalX;
     *y = dmxGlobalY;
 }
 
 /** Invalidate the global position for #dmxCoreMotion. */
-void dmxInvalidateGlobalPosition(void)
+void
+dmxInvalidateGlobalPosition(void)
 {
     dmxGlobalInvalid = 1;
 }
@@ -534,8 +591,9 @@ void dmxInvalidateGlobalPosition(void)
  *
  * If \a block is set to \a DMX_BLOCK, then the SIGIO handler will be
  * blocked around calls to \a enqueueMotion(). */
-void dmxMotion(DevicePtr pDev, int *v, int firstAxes, int axesCount,
-               DMXMotionType type, DMXBlockType block)
+void
+dmxMotion(DevicePtr pDev, int *v, int firstAxes, int axesCount,
+          DMXMotionType type, DMXBlockType block)
 {
     GETDMXLOCALFROMPDEV;
 
@@ -558,8 +616,8 @@ void dmxMotion(DevicePtr pDev, int *v, int firstAxes, int axesCount,
     }
 }
 
-static KeySym dmxKeyCodeToKeySym(DMXLocalInputInfoPtr dmxLocal,
-                                 KeyCode keyCode)
+static KeySym
+dmxKeyCodeToKeySym(DMXLocalInputInfoPtr dmxLocal, KeyCode keyCode)
 {
     KeySym keysym = NoSymbol;
     int effectiveGroup;
@@ -578,21 +636,21 @@ static KeySym dmxKeyCodeToKeySym(DMXLocalInputInfoPtr dmxLocal,
     DMXDBG2("dmxKeyCodeToKeySym: Translated keyCode=%d to keySym=0x%04x\n",
             keyCode, keysym);
 
-out:
+ out:
     return keysym;
 }
 
-static KeyCode dmxKeySymToKeyCode(DMXLocalInputInfoPtr dmxLocal, KeySym keySym,
-                                  int tryFirst)
+static KeyCode
+dmxKeySymToKeyCode(DMXLocalInputInfoPtr dmxLocal, KeySym keySym, int tryFirst)
 {
     /* FIXME: this is quite ineffective, converting to a core map first and
      * then extracting the info from there. It'd be better to run the actual
      * xkb map */
     XkbSrvInfoPtr xkbi = dmxLocal->pDevice->key->xkbInfo;
     KeySymsPtr pKeySyms = XkbGetCoreMap(dmxLocal->pDevice);
-    int        i;
+    int i;
 
-                                /* Optimize for similar maps */
+    /* Optimize for similar maps */
     if (XkbKeycodeInRange(xkbi->desc, tryFirst)
         && pKeySyms->map[(tryFirst - xkbi->desc->min_key_code)
                          * pKeySyms->mapWidth] == keySym)
@@ -603,18 +661,19 @@ static KeyCode dmxKeySymToKeyCode(DMXLocalInputInfoPtr dmxLocal, KeySym keySym,
                           * pKeySyms->mapWidth] == keySym) {
             DMXDBG3("dmxKeySymToKeyCode: Translated keySym=0x%04x to"
                     " keyCode=%d (reverses to core keySym=0x%04x)\n",
-                    keySym, i, dmxKeyCodeToKeySym(dmxLocalCoreKeyboard,i));
+                    keySym, i, dmxKeyCodeToKeySym(dmxLocalCoreKeyboard, i));
             return i;
         }
     }
     return 0;
 }
 
-static int dmxFixup(DevicePtr pDev, int detail, KeySym keySym)
+static int
+dmxFixup(DevicePtr pDev, int detail, KeySym keySym)
 {
     GETDMXLOCALFROMPDEV;
     int keyCode;
-    
+
     if (!dmxLocal->pDevice->key) {
         dmxLog(dmxWarning, "dmxFixup: not a keyboard device (%s)\n",
                dmxLocal->pDevice->name);
@@ -636,9 +695,10 @@ static int dmxFixup(DevicePtr pDev, int detail, KeySym keySym)
  * FIXME: make the code do what the comment says, or remove this comment.
  * If \a block is set to \a DMX_BLOCK, then the SIGIO handler will be
  * blocked around calls to dmxeqEnqueue(). */
-    
-void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
-                XEvent *e, DMXBlockType block)
+
+void
+dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
+           XEvent * e, DMXBlockType block)
 {
     GETDMXINPUTFROMPDEV;
     xEvent xE;
@@ -658,7 +718,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
         if (dmxLocal->sendsCore && dmxLocal != dmxLocalCoreKeyboard)
             xE.u.u.detail = dmxFixup(pDev, detail, keySym);
 
-        /*ErrorF("KEY %d  sym %d\n", detail, (int) keySym);*/
+        /*ErrorF("KEY %d  sym %d\n", detail, (int) keySym); */
         QueueKeyboardEvents(p, type, detail, NULL);
         return;
 
@@ -673,7 +733,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
     case MotionNotify:
         valuators[0] = e->xmotion.x;
         valuators[1] = e->xmotion.y;
-        valuators[2] = e->xmotion.state; /* FIXME: WTF?? */
+        valuators[2] = e->xmotion.state;        /* FIXME: WTF?? */
         valuator_mask_set_range(&mask, 0, 3, valuators);
         QueuePointerEvents(p, type, detail,
                            POINTER_ABSOLUTE | POINTER_SCREEN, &mask);
@@ -682,7 +742,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
     case EnterNotify:
     case LeaveNotify:
     case KeymapNotify:
-    case MappingNotify:         /* This is sent because we change the
+    case MappingNotify:        /* This is sent because we change the
                                  * modifier map on the backend/console
                                  * input device so that we have complete
                                  * control of the input device LEDs. */
@@ -690,13 +750,14 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
     default:
         if (type == ProximityIn || type == ProximityOut) {
             if (dmxLocal->sendsCore)
-                return; /* Not a core event */
+                return;         /* Not a core event */
             break;
         }
         if (type >= LASTEvent) {
             if (dmxTranslateAndEnqueueExtEvent(dmxLocal, e, block))
                 dmxLogInput(dmxInput, "Unhandled extension event: %d\n", type);
-        } else {
+        }
+        else {
             dmxLogInput(dmxInput, "Unhandled event: %d (%s)\n",
                         type, dmxEventName(type));
         }
@@ -711,23 +772,28 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
  * requested termination of the DMX server, -1 is returned.  If the user
  * has requested a switch to a VT, then the (1-based) number of that VT
  * is returned. */
-int dmxCheckSpecialKeys(DevicePtr pDev, KeySym keySym)
+int
+dmxCheckSpecialKeys(DevicePtr pDev, KeySym keySym)
 {
     GETDMXINPUTFROMPDEV;
-    int            vt    = 0;
+    int vt = 0;
     unsigned short state = 0;
 
     if (dmxLocal->sendsCore)
-        state = XkbStateFieldFromRec(&dmxLocalCoreKeyboard->pDevice->key->xkbInfo->state);
+        state =
+            XkbStateFieldFromRec(&dmxLocalCoreKeyboard->pDevice->key->xkbInfo->
+                                 state);
     else if (dmxLocal->pDevice->key)
         state = XkbStateFieldFromRec(&dmxLocal->pDevice->key->xkbInfo->state);
 
-    if (!dmxLocal->sendsCore) return 0; /* Only for core devices */
+    if (!dmxLocal->sendsCore)
+        return 0;               /* Only for core devices */
+
+    DMXDBG2("dmxCheckSpecialKeys: keySym=0x%04x state=0x%04x\n", keySym, state);
+
+    if ((state & (ControlMask | Mod1Mask)) != (ControlMask | Mod1Mask))
+        return 0;
 
-    DMXDBG2("dmxCheckSpecialKeys: keySym=0x%04x state=0x%04x\n", keySym,state);
-    
-    if ((state & (ControlMask|Mod1Mask)) != (ControlMask|Mod1Mask)) return 0;
-    
     switch (keySym) {
     case XK_F1:
     case XK_F2:
@@ -747,7 +813,7 @@ int dmxCheckSpecialKeys(DevicePtr pDev, KeySym keySym)
         vt = keySym - XK_F11 + 11;
         break;
 
-    case XK_q:                  /* To avoid confusion  */
+    case XK_q:                 /* To avoid confusion  */
     case XK_BackSpace:
     case XK_Delete:
     case XK_KP_Delete:
diff --git a/xorg-server/hw/dmx/input/dmxinputinit.c b/xorg-server/hw/dmx/input/dmxinputinit.c
index 16ecae38d..b22a41f56 100644
--- a/xorg-server/hw/dmx/input/dmxinputinit.c
+++ b/xorg-server/hw/dmx/input/dmxinputinit.c
@@ -102,7 +102,7 @@ static DMXLocalInputInfoRec DMXBackendMou = {
 
 static DMXLocalInputInfoRec DMXBackendKbd = {
     "backend-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_BACKEND,
-    1, /* With backend-mou or console-mou */
+    1,                          /* With backend-mou or console-mou */
     dmxCommonCopyPrivate, NULL,
     dmxBackendInit, NULL, NULL, dmxBackendKbdGetInfo,
     dmxCommonKbdOn, dmxCommonKbdOff, NULL,
@@ -123,7 +123,7 @@ static DMXLocalInputInfoRec DMXConsoleMou = {
 
 static DMXLocalInputInfoRec DMXConsoleKbd = {
     "console-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_CONSOLE,
-    1, /* With backend-mou or console-mou */
+    1,                          /* With backend-mou or console-mou */
     dmxCommonCopyPrivate, NULL,
     dmxConsoleInit, dmxConsoleReInit, NULL, dmxConsoleKbdGetInfo,
     dmxCommonKbdOn, dmxCommonKbdOff, NULL,
@@ -133,87 +133,78 @@ static DMXLocalInputInfoRec DMXConsoleKbd = {
 };
 
 static DMXLocalInputInfoRec DMXLocalDevices[] = {
-                                /* Dummy drivers that can compile on any OS */
+    /* Dummy drivers that can compile on any OS */
 #ifdef __linux__
-                                /* Linux-specific drivers */
+    /* Linux-specific drivers */
     {
-        "kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,
-        kbdLinuxCreatePrivate, kbdLinuxDestroyPrivate,
-        kbdLinuxInit, NULL, NULL, kbdLinuxGetInfo,
-        kbdLinuxOn, kbdLinuxOff, NULL,
-        kbdLinuxVTPreSwitch, kbdLinuxVTPostSwitch, kbdLinuxVTSwitch,
-        kbdLinuxRead, NULL, NULL, NULL,
-        NULL, kbdLinuxCtrl, kbdLinuxBell
-    },
+     "kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,
+     kbdLinuxCreatePrivate, kbdLinuxDestroyPrivate,
+     kbdLinuxInit, NULL, NULL, kbdLinuxGetInfo,
+     kbdLinuxOn, kbdLinuxOff, NULL,
+     kbdLinuxVTPreSwitch, kbdLinuxVTPostSwitch, kbdLinuxVTSwitch,
+     kbdLinuxRead, NULL, NULL, NULL,
+     NULL, kbdLinuxCtrl, kbdLinuxBell},
     {
-        "ms", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
-        msLinuxCreatePrivate, msLinuxDestroyPrivate,
-        msLinuxInit, NULL, NULL, msLinuxGetInfo,
-        msLinuxOn, msLinuxOff, NULL,
-        msLinuxVTPreSwitch, msLinuxVTPostSwitch, NULL,
-        msLinuxRead
-    },
+     "ms", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
+     msLinuxCreatePrivate, msLinuxDestroyPrivate,
+     msLinuxInit, NULL, NULL, msLinuxGetInfo,
+     msLinuxOn, msLinuxOff, NULL,
+     msLinuxVTPreSwitch, msLinuxVTPostSwitch, NULL,
+     msLinuxRead},
     {
-        "ps2", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
-        ps2LinuxCreatePrivate, ps2LinuxDestroyPrivate,
-        ps2LinuxInit, NULL, NULL, ps2LinuxGetInfo,
-        ps2LinuxOn, ps2LinuxOff, NULL,
-        ps2LinuxVTPreSwitch, ps2LinuxVTPostSwitch, NULL,
-        ps2LinuxRead
-    },
+     "ps2", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
+     ps2LinuxCreatePrivate, ps2LinuxDestroyPrivate,
+     ps2LinuxInit, NULL, NULL, ps2LinuxGetInfo,
+     ps2LinuxOn, ps2LinuxOff, NULL,
+     ps2LinuxVTPreSwitch, ps2LinuxVTPostSwitch, NULL,
+     ps2LinuxRead},
 #endif
 #ifdef __linux__
-                                /* USB drivers, currently only for
-                                   Linux, but relatively easy to port to
-                                   other OSs */
+    /* USB drivers, currently only for
+       Linux, but relatively easy to port to
+       other OSs */
     {
-        "usb-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,
-        usbCreatePrivate, usbDestroyPrivate,
-        kbdUSBInit, NULL, NULL, kbdUSBGetInfo,
-        kbdUSBOn, usbOff, NULL,
-        NULL, NULL, NULL,
-        kbdUSBRead, NULL, NULL, NULL,
-        NULL, kbdUSBCtrl
-    },
+     "usb-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,
+     usbCreatePrivate, usbDestroyPrivate,
+     kbdUSBInit, NULL, NULL, kbdUSBGetInfo,
+     kbdUSBOn, usbOff, NULL,
+     NULL, NULL, NULL,
+     kbdUSBRead, NULL, NULL, NULL,
+     NULL, kbdUSBCtrl},
     {
-        "usb-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
-        usbCreatePrivate, usbDestroyPrivate,
-        mouUSBInit, NULL, NULL, mouUSBGetInfo,
-        mouUSBOn, usbOff, NULL,
-        NULL, NULL, NULL,
-        mouUSBRead
-    },
+     "usb-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
+     usbCreatePrivate, usbDestroyPrivate,
+     mouUSBInit, NULL, NULL, mouUSBGetInfo,
+     mouUSBOn, usbOff, NULL,
+     NULL, NULL, NULL,
+     mouUSBRead},
     {
-        "usb-oth", DMX_LOCAL_OTHER, DMX_LOCAL_TYPE_LOCAL, 1,
-        usbCreatePrivate, usbDestroyPrivate,
-        othUSBInit, NULL, NULL, othUSBGetInfo,
-        othUSBOn, usbOff, NULL,
-        NULL, NULL, NULL,
-        othUSBRead
-    },
+     "usb-oth", DMX_LOCAL_OTHER, DMX_LOCAL_TYPE_LOCAL, 1,
+     usbCreatePrivate, usbDestroyPrivate,
+     othUSBInit, NULL, NULL, othUSBGetInfo,
+     othUSBOn, usbOff, NULL,
+     NULL, NULL, NULL,
+     othUSBRead},
 #endif
     {
-        "dummy-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
-        NULL, NULL, NULL, NULL, NULL, dmxDummyMouGetInfo
-    },
+     "dummy-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
+     NULL, NULL, NULL, NULL, NULL, dmxDummyMouGetInfo},
     {
-        "dummy-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,
-        NULL, NULL, NULL, NULL, NULL, dmxDummyKbdGetInfo
-    },
-    { NULL }                    /* Must be last */
+     "dummy-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,
+     NULL, NULL, NULL, NULL, NULL, dmxDummyKbdGetInfo},
+    {NULL}                      /* Must be last */
 };
 
-
 #if 11 /*BP*/
-void
+    void
 DDXRingBell(int volume, int pitch, int duration)
 {
-   /* NO-OP */
+    /* NO-OP */
 }
 
 /* taken from kdrive/src/kinput.c: */
 static void
-dmxKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl)
+dmxKbdCtrl(DeviceIntPtr pDevice, KeybdCtrl * ctrl)
 {
 #if 0
     KdKeyboardInfo *ki;
@@ -228,7 +219,7 @@ dmxKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl)
 
     KdSetLeds(ki, ctrl->leds);
     ki->bellPitch = ctrl->bell_pitch;
-    ki->bellDuration = ctrl->bell_duration; 
+    ki->bellDuration = ctrl->bell_duration;
 #endif
 }
 
@@ -239,7 +230,7 @@ dmxBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
 #if 0
     KeybdCtrl *ctrl = arg;
     KdKeyboardInfo *ki = NULL;
-    
+
     for (ki = kdKeyboards; ki; ki = ki->next) {
         if (ki->dixdev && ki->dixdev->id == pDev->id)
             break;
@@ -247,50 +238,56 @@ dmxBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
 
     if (!ki || !ki->dixdev || ki->dixdev->id != pDev->id || !ki->driver)
         return;
-    
+
     KdRingBell(ki, volume, ctrl->bell_pitch, ctrl->bell_duration);
 #endif
 }
 
 #endif /*BP*/
-
-static void _dmxChangePointerControl(DMXLocalInputInfoPtr dmxLocal,
-                                     PtrCtrl *ctrl)
+    static void
+_dmxChangePointerControl(DMXLocalInputInfoPtr dmxLocal, PtrCtrl * ctrl)
 {
-    if (!dmxLocal) return;
+    if (!dmxLocal)
+        return;
     dmxLocal->mctrl = *ctrl;
-    if (dmxLocal->mCtrl) dmxLocal->mCtrl(&dmxLocal->pDevice->public, ctrl);
+    if (dmxLocal->mCtrl)
+        dmxLocal->mCtrl(&dmxLocal->pDevice->public, ctrl);
 }
 
 /** Change the pointer control information for the \a pDevice.  If the
  * device sends core events, then also change the control information
  * for all of the pointer devices that send core events. */
-void dmxChangePointerControl(DeviceIntPtr pDevice, PtrCtrl *ctrl)
+void
+dmxChangePointerControl(DeviceIntPtr pDevice, PtrCtrl * ctrl)
 {
     GETDMXLOCALFROMPDEVICE;
     int i, j;
 
-    if (dmxLocal->sendsCore) {       /* Do for all core devices */
+    if (dmxLocal->sendsCore) {  /* Do for all core devices */
         for (i = 0; i < dmxNumInputs; i++) {
             DMXInputInfo *dmxInput = &dmxInputs[i];
-            if (dmxInput->detached) continue;
+
+            if (dmxInput->detached)
+                continue;
             for (j = 0; j < dmxInput->numDevs; j++)
                 if (dmxInput->devs[j]->sendsCore)
                     _dmxChangePointerControl(dmxInput->devs[j], ctrl);
         }
-    } else {                    /* Do for this device only */
+    }
+    else {                      /* Do for this device only */
         _dmxChangePointerControl(dmxLocal, ctrl);
     }
 }
 
-static void _dmxKeyboardKbdCtrlProc(DMXLocalInputInfoPtr dmxLocal,
-                                    KeybdCtrl *ctrl)
+static void
+_dmxKeyboardKbdCtrlProc(DMXLocalInputInfoPtr dmxLocal, KeybdCtrl * ctrl)
 {
     dmxLocal->kctrl = *ctrl;
     if (dmxLocal->kCtrl) {
         dmxLocal->kCtrl(&dmxLocal->pDevice->public, ctrl);
         if (dmxLocal->pDevice->kbdfeed) {
             XkbEventCauseRec cause;
+
             XkbSetCauseUnknown(&cause);
             /* Generate XKB events, as necessary */
             XkbUpdateIndicators(dmxLocal->pDevice, XkbAllIndicatorsMask, False,
@@ -299,69 +296,84 @@ static void _dmxKeyboardKbdCtrlProc(DMXLocalInputInfoPtr dmxLocal,
     }
 }
 
-
 /** Change the keyboard control information for the \a pDevice.  If the
  * device sends core events, then also change the control information
  * for all of the keyboard devices that send core events. */
-void dmxKeyboardKbdCtrlProc(DeviceIntPtr pDevice, KeybdCtrl *ctrl)
+void
+dmxKeyboardKbdCtrlProc(DeviceIntPtr pDevice, KeybdCtrl * ctrl)
 {
     GETDMXLOCALFROMPDEVICE;
     int i, j;
 
-    if (dmxLocal->sendsCore) {       /* Do for all core devices */
+    if (dmxLocal->sendsCore) {  /* Do for all core devices */
         for (i = 0; i < dmxNumInputs; i++) {
             DMXInputInfo *dmxInput = &dmxInputs[i];
-            if (dmxInput->detached) continue;
+
+            if (dmxInput->detached)
+                continue;
             for (j = 0; j < dmxInput->numDevs; j++)
                 if (dmxInput->devs[j]->sendsCore)
                     _dmxKeyboardKbdCtrlProc(dmxInput->devs[j], ctrl);
         }
-    } else {                    /* Do for this device only */
+    }
+    else {                      /* Do for this device only */
         _dmxKeyboardKbdCtrlProc(dmxLocal, ctrl);
     }
 }
 
-static void _dmxKeyboardBellProc(DMXLocalInputInfoPtr dmxLocal, int percent)
+static void
+_dmxKeyboardBellProc(DMXLocalInputInfoPtr dmxLocal, int percent)
 {
-    if (dmxLocal->kBell) dmxLocal->kBell(&dmxLocal->pDevice->public,
-                                         percent,
-                                         dmxLocal->kctrl.bell,
-                                         dmxLocal->kctrl.bell_pitch,
-                                         dmxLocal->kctrl.bell_duration);
+    if (dmxLocal->kBell)
+        dmxLocal->kBell(&dmxLocal->pDevice->public,
+                        percent,
+                        dmxLocal->kctrl.bell,
+                        dmxLocal->kctrl.bell_pitch,
+                        dmxLocal->kctrl.bell_duration);
 }
 
 /** Sound the bell on the device.  If the device send core events, then
  * sound the bell on all of the devices that send core events. */
-void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,
-                         pointer ctrl, int unknown)
+void
+dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,
+                    pointer ctrl, int unknown)
 {
     GETDMXLOCALFROMPDEVICE;
     int i, j;
 
-    if (dmxLocal->sendsCore) {       /* Do for all core devices */
+    if (dmxLocal->sendsCore) {  /* Do for all core devices */
         for (i = 0; i < dmxNumInputs; i++) {
             DMXInputInfo *dmxInput = &dmxInputs[i];
-            if (dmxInput->detached) continue;
+
+            if (dmxInput->detached)
+                continue;
             for (j = 0; j < dmxInput->numDevs; j++)
                 if (dmxInput->devs[j]->sendsCore)
                     _dmxKeyboardBellProc(dmxInput->devs[j], percent);
         }
-    } else {                    /* Do for this device only */
+    }
+    else {                      /* Do for this device only */
         _dmxKeyboardBellProc(dmxLocal, percent);
     }
 }
 
-static void dmxKeyboardFreeNames(XkbComponentNamesPtr names)
+static void
+dmxKeyboardFreeNames(XkbComponentNamesPtr names)
 {
-    if (names->keycodes) XFree(names->keycodes);
-    if (names->types)    XFree(names->types);
-    if (names->compat)   XFree(names->compat);
-    if (names->symbols)  XFree(names->symbols);
-    if (names->geometry) XFree(names->geometry);
+    if (names->keycodes)
+        XFree(names->keycodes);
+    if (names->types)
+        XFree(names->types);
+    if (names->compat)
+        XFree(names->compat);
+    if (names->symbols)
+        XFree(names->symbols);
+    if (names->geometry)
+        XFree(names->geometry);
 }
 
-
-static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info)
+static int
+dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo * info)
 {
     GETDMXINPUTFROMPDEVICE;
     XkbRMLVOSet rmlvo;
@@ -374,14 +386,14 @@ static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info)
 
     XkbSetRulesDflts(&rmlvo);
     if (!info->force && (dmxInput->keycodes
-                         || dmxInput->symbols
-                         || dmxInput->geometry)) {
-        if (info->freenames) dmxKeyboardFreeNames(&info->names);
-        info->freenames      = 0;
+                         || dmxInput->symbols || dmxInput->geometry)) {
+        if (info->freenames)
+            dmxKeyboardFreeNames(&info->names);
+        info->freenames = 0;
         info->names.keycodes = dmxInput->keycodes;
-        info->names.types    = NULL;
-        info->names.compat   = NULL;
-        info->names.symbols  = dmxInput->symbols;
+        info->names.types = NULL;
+        info->names.compat = NULL;
+        info->names.symbols = dmxInput->symbols;
         info->names.geometry = dmxInput->geometry;
 
         dmxLogInput(dmxInput, "XKEYBOARD: From command line: %s",
@@ -391,7 +403,8 @@ static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info)
         if (info->names.geometry && *info->names.geometry)
             dmxLogInputCont(dmxInput, " %s", info->names.geometry);
         dmxLogInputCont(dmxInput, "\n");
-    } else if (info->names.keycodes) {
+    }
+    else if (info->names.keycodes) {
         dmxLogInput(dmxInput, "XKEYBOARD: From device: %s",
                     info->names.keycodes);
         if (info->names.symbols && *info->names.symbols)
@@ -399,36 +412,36 @@ static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info)
         if (info->names.geometry && *info->names.geometry)
             dmxLogInputCont(dmxInput, " %s", info->names.geometry);
         dmxLogInputCont(dmxInput, "\n");
-    } else {
+    }
+    else {
         dmxLogInput(dmxInput, "XKEYBOARD: Defaults: %s %s %s %s %s\n",
                     dmxConfigGetXkbRules(),
                     dmxConfigGetXkbLayout(),
-                    dmxConfigGetXkbModel(),
-                    dmxConfigGetXkbVariant()
-                    ? dmxConfigGetXkbVariant() : "",
-                    dmxConfigGetXkbOptions()
+                    dmxConfigGetXkbModel(), dmxConfigGetXkbVariant()
+                    ? dmxConfigGetXkbVariant() : "", dmxConfigGetXkbOptions()
                     ? dmxConfigGetXkbOptions() : "");
     }
     InitKeyboardDeviceStruct(pDevice, &rmlvo,
-                                dmxKeyboardBellProc,
-                                dmxKeyboardKbdCtrlProc);
+                             dmxKeyboardBellProc, dmxKeyboardKbdCtrlProc);
 
-    if (info->freenames) dmxKeyboardFreeNames(&info->names);
+    if (info->freenames)
+        dmxKeyboardFreeNames(&info->names);
 
     return Success;
 }
 
-    
-static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
+static int
+dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
 {
     GETDMXINPUTFROMPDEVICE;
-    int              fd;
+    int fd;
     DMXLocalInitInfo info;
-    int              i;
-    Atom             btn_labels[MAX_BUTTONS] = {0}; /* FIXME */
-    Atom             axis_labels[MAX_VALUATORS] = {0}; /* FIXME */
+    int i;
+    Atom btn_labels[MAX_BUTTONS] = { 0 };       /* FIXME */
+    Atom axis_labels[MAX_VALUATORS] = { 0 };    /* FIXME */
 
-    if (dmxInput->detached) return Success;
+    if (dmxInput->detached)
+        return Success;
 
     memset(&info, 0, sizeof(info));
     switch (what) {
@@ -450,9 +463,7 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
             rmlvo.variant = dmxConfigGetXkbVariant();
             rmlvo.options = dmxConfigGetXkbOptions();
 
-            InitKeyboardDeviceStruct(pDevice,
-                                     &rmlvo,
-                                     dmxBell, dmxKbdCtrl);
+            InitKeyboardDeviceStruct(pDevice, &rmlvo, dmxBell, dmxKbdCtrl);
         }
         if (info.buttonClass) {
             InitButtonClassDeviceStruct(pDevice, info.numButtons,
@@ -462,15 +473,15 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
             if (info.numRelAxes && dmxLocal->sendsCore) {
                 InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,
                                               axis_labels,
-                                              GetMaximumEventsNum(),
-                                              Relative);
+                                              GetMaximumEventsNum(), Relative);
                 for (i = 0; i < info.numRelAxes; i++)
                     InitValuatorAxisStruct(pDevice, i, axis_labels[i],
                                            info.minval[i], info.maxval[i],
                                            info.res[i],
                                            info.minres[i], info.maxres[i],
                                            Relative);
-            } else if (info.numRelAxes) {
+            }
+            else if (info.numRelAxes) {
                 InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,
                                               axis_labels,
                                               dmxPointerGetMotionBufferSize(),
@@ -481,7 +492,8 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
                                            info.maxval[i], info.res[i],
                                            info.minres[i], info.maxres[i],
                                            Relative);
-            } else if (info.numAbsAxes) {
+            }
+            else if (info.numAbsAxes) {
                 InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes,
                                               axis_labels,
                                               dmxPointerGetMotionBufferSize(),
@@ -494,8 +506,10 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
                                            info.maxres[i], Absolute);
             }
         }
-        if (info.focusClass)       InitFocusClassDeviceStruct(pDevice);
-        if (info.proximityClass)   InitProximityClassDeviceStruct(pDevice);
+        if (info.focusClass)
+            InitFocusClassDeviceStruct(pDevice);
+        if (info.proximityClass)
+            InitProximityClassDeviceStruct(pDevice);
         if (info.ptrFeedbackClass)
             InitPtrFeedbackClassDeviceStruct(pDevice, dmxChangePointerControl);
         if (info.intFeedbackClass || info.strFeedbackClass)
@@ -516,12 +530,13 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
         break;
     case DEVICE_OFF:
     case DEVICE_CLOSE:
-            /* This can get called twice consecutively: once for a
-             * detached screen (DEVICE_OFF), and then again at server
-             * generation time (DEVICE_CLOSE). */
+        /* This can get called twice consecutively: once for a
+         * detached screen (DEVICE_OFF), and then again at server
+         * generation time (DEVICE_CLOSE). */
         if (pDev->on) {
             dmxSigioUnregister(dmxInput);
-            if (dmxLocal->off) dmxLocal->off(pDev);
+            if (dmxLocal->off)
+                dmxLocal->off(pDev);
             pDev->on = FALSE;
         }
         break;
@@ -530,17 +545,19 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
         XFree(info.keySyms.map);
         info.keySyms.map = NULL;
     }
-    if (info.xkb) XkbFreeKeyboard(info.xkb, 0, True);
+    if (info.xkb)
+        XkbFreeKeyboard(info.xkb, 0, True);
     return Success;
 }
 
-static void dmxProcessInputEvents(DMXInputInfo *dmxInput)
+static void
+dmxProcessInputEvents(DMXInputInfo * dmxInput)
 {
     int i;
 
     mieqProcessInputEvents();
 #if 00 /*BP*/
-    miPointerUpdate();
+        miPointerUpdate();
 #endif
     if (dmxInput->detached)
         return;
@@ -550,30 +567,44 @@ static void dmxProcessInputEvents(DMXInputInfo *dmxInput)
         }
 
 #if 11 /*BP*/
-    mieqProcessInputEvents();
+        mieqProcessInputEvents();
 #endif
 }
 
-static void dmxUpdateWindowInformation(DMXInputInfo *dmxInput,
-                                       DMXUpdateType type,
-                                       WindowPtr pWindow)
+static void
+dmxUpdateWindowInformation(DMXInputInfo * dmxInput,
+                           DMXUpdateType type, WindowPtr pWindow)
 {
     int i;
 
 #ifdef PANORAMIX
-    if (!noPanoramiXExtension && pWindow && pWindow->parent != screenInfo.screens[0]->root)
+    if (!noPanoramiXExtension && pWindow &&
+        pWindow->parent != screenInfo.screens[0]->root)
         return;
 #endif
 #if DMX_WINDOW_DEBUG
     {
         const char *name = "Unknown";
+
         switch (type) {
-        case DMX_UPDATE_REALIZE:            name = "Realize";         break;
-        case DMX_UPDATE_UNREALIZE:          name = "Unrealize";       break;
-        case DMX_UPDATE_RESTACK:            name = "Restack";         break;
-        case DMX_UPDATE_COPY:               name = "Copy";            break;
-        case DMX_UPDATE_RESIZE:             name = "Resize";          break;
-        case DMX_UPDATE_REPARENT:           name = "Repaint";         break;
+        case DMX_UPDATE_REALIZE:
+            name = "Realize";
+            break;
+        case DMX_UPDATE_UNREALIZE:
+            name = "Unrealize";
+            break;
+        case DMX_UPDATE_RESTACK:
+            name = "Restack";
+            break;
+        case DMX_UPDATE_COPY:
+            name = "Copy";
+            break;
+        case DMX_UPDATE_RESIZE:
+            name = "Resize";
+            break;
+        case DMX_UPDATE_REPARENT:
+            name = "Repaint";
+            break;
         }
         dmxLog(dmxDebug, "Window %p changed: %s\n", pWindow, name);
     }
@@ -587,7 +618,8 @@ static void dmxUpdateWindowInformation(DMXInputInfo *dmxInput,
                                            type, pWindow);
 }
 
-static void dmxCollectAll(DMXInputInfo *dmxInput)
+static void
+dmxCollectAll(DMXInputInfo * dmxInput)
 {
     int i;
 
@@ -595,29 +627,29 @@ static void dmxCollectAll(DMXInputInfo *dmxInput)
         return;
     for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding)
         if (dmxInput->devs[i]->collect_events)
-            dmxInput->devs[i]->collect_events(&dmxInput->devs[i]->pDevice->public,
-                                              dmxMotion,
-                                              dmxEnqueue,
+            dmxInput->devs[i]->collect_events(&dmxInput->devs[i]->pDevice->
+                                              public, dmxMotion, dmxEnqueue,
                                               dmxCheckSpecialKeys, DMX_BLOCK);
 }
 
-static void dmxBlockHandler(pointer blockData, OSTimePtr pTimeout,
-                            pointer pReadMask)
+static void
+dmxBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadMask)
 {
-    DMXInputInfo    *dmxInput = &dmxInputs[(uintptr_t)blockData];
+    DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t) blockData];
     static unsigned long generation = 0;
-    
+
     if (generation != serverGeneration) {
         generation = serverGeneration;
         dmxCollectAll(dmxInput);
     }
 }
 
-static void dmxSwitchReturn(pointer p)
+static void
+dmxSwitchReturn(pointer p)
 {
     DMXInputInfo *dmxInput = p;
-    int          i;
-    
+    int i;
+
     dmxLog(dmxInfo, "Returning from VT %d\n", dmxInput->vt_switched);
 
     if (!dmxInput->vt_switched)
@@ -629,25 +661,25 @@ static void dmxSwitchReturn(pointer p)
     dmxInput->vt_switched = 0;
 }
 
-static void dmxWakeupHandler(pointer blockData, int result, pointer pReadMask)
+static void
+dmxWakeupHandler(pointer blockData, int result, pointer pReadMask)
 {
-    DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t)blockData];
-    int          i;
+    DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t) blockData];
+    int i;
 
     if (dmxInput->vt_switch_pending) {
         dmxLog(dmxInfo, "Switching to VT %d\n", dmxInput->vt_switch_pending);
         for (i = 0; i < dmxInput->numDevs; i++)
             if (dmxInput->devs[i]->vt_pre_switch)
                 dmxInput->devs[i]->vt_pre_switch(dmxInput->devs[i]->private);
-        dmxInput->vt_switched       = dmxInput->vt_switch_pending;
+        dmxInput->vt_switched = dmxInput->vt_switch_pending;
         dmxInput->vt_switch_pending = 0;
         for (i = 0; i < dmxInput->numDevs; i++) {
             if (dmxInput->devs[i]->vt_switch) {
                 dmxSigioDisableInput();
                 if (!dmxInput->devs[i]->vt_switch(dmxInput->devs[i]->private,
                                                   dmxInput->vt_switched,
-                                                  dmxSwitchReturn,
-                                                  dmxInput))
+                                                  dmxSwitchReturn, dmxInput))
                     dmxSwitchReturn(dmxInput);
                 break;          /* Only call one vt_switch routine */
             }
@@ -656,35 +688,44 @@ static void dmxWakeupHandler(pointer blockData, int result, pointer pReadMask)
     dmxCollectAll(dmxInput);
 }
 
-static char *dmxMakeUniqueDeviceName(DMXLocalInputInfoPtr dmxLocal)
+static char *
+dmxMakeUniqueDeviceName(DMXLocalInputInfoPtr dmxLocal)
 {
-    static int           k = 0;
-    static int           m = 0;
-    static int           o = 0;
+    static int k = 0;
+    static int m = 0;
+    static int o = 0;
     static unsigned long dmxGeneration = 0;
+
 #define LEN  32
-    char *               buf = malloc(LEN);
+    char *buf = malloc(LEN);
 
     if (dmxGeneration != serverGeneration) {
-        k = m = o     = 0;
+        k = m = o = 0;
         dmxGeneration = serverGeneration;
     }
 
     switch (dmxLocal->type) {
-    case DMX_LOCAL_KEYBOARD: snprintf(buf, LEN, "Keyboard%d", k++); break;
-    case DMX_LOCAL_MOUSE:    snprintf(buf, LEN, "Mouse%d", m++);    break;
-    default:                 snprintf(buf, LEN, "Other%d", o++);    break;
+    case DMX_LOCAL_KEYBOARD:
+        snprintf(buf, LEN, "Keyboard%d", k++);
+        break;
+    case DMX_LOCAL_MOUSE:
+        snprintf(buf, LEN, "Mouse%d", m++);
+        break;
+    default:
+        snprintf(buf, LEN, "Other%d", o++);
+        break;
     }
 
     return buf;
 }
 
-static DeviceIntPtr dmxAddDevice(DMXLocalInputInfoPtr dmxLocal)
+static DeviceIntPtr
+dmxAddDevice(DMXLocalInputInfoPtr dmxLocal)
 {
     DeviceIntPtr pDevice;
-    Atom         atom;
-    const char   *name = NULL;
-    char         *devname;
+    Atom atom;
+    const char *name = NULL;
+    char *devname;
     DMXInputInfo *dmxInput;
 
     if (!dmxLocal)
@@ -693,41 +734,41 @@ static DeviceIntPtr dmxAddDevice(DMXLocalInputInfoPtr dmxLocal)
 
     if (dmxLocal->sendsCore) {
         if (dmxLocal->type == DMX_LOCAL_KEYBOARD && !dmxLocalCoreKeyboard) {
-            dmxLocal->isCore     = 1;
+            dmxLocal->isCore = 1;
             dmxLocalCoreKeyboard = dmxLocal;
-            name                 = "keyboard";
+            name = "keyboard";
         }
         if (dmxLocal->type == DMX_LOCAL_MOUSE && !dmxLocalCorePointer) {
-            dmxLocal->isCore     = 1;
-            dmxLocalCorePointer  = dmxLocal;
-            name                 = "pointer";
+            dmxLocal->isCore = 1;
+            dmxLocalCorePointer = dmxLocal;
+            name = "pointer";
         }
     }
 
     if (!name) {
-        name            = "extension";
+        name = "extension";
     }
 
     if (!name)
         dmxLog(dmxFatal, "Cannot add device %s\n", dmxLocal->name);
 
-    pDevice                       = AddInputDevice(serverClient, dmxDeviceOnOff, TRUE);
+    pDevice = AddInputDevice(serverClient, dmxDeviceOnOff, TRUE);
     if (!pDevice) {
         dmxLog(dmxError, "Too many devices -- cannot add device %s\n",
                dmxLocal->name);
         return NULL;
     }
     pDevice->public.devicePrivate = dmxLocal;
-    dmxLocal->pDevice             = pDevice;
+    dmxLocal->pDevice = pDevice;
 
-    devname       = dmxMakeUniqueDeviceName(dmxLocal);
-    atom          = MakeAtom((char *)devname, strlen(devname), TRUE);
+    devname = dmxMakeUniqueDeviceName(dmxLocal);
+    atom = MakeAtom((char *) devname, strlen(devname), TRUE);
     pDevice->type = atom;
     pDevice->name = devname;
 
     if (dmxLocal->isCore && dmxLocal->type == DMX_LOCAL_MOUSE) {
-#if 00 /*BP*/
-        miRegisterPointerDevice(screenInfo.screens[0], pDevice);
+#if 00   /*BP*/
+            miRegisterPointerDevice(screenInfo.screens[0], pDevice);
 #else
         /* Nothing? dmxDeviceOnOff() should get called to init, right? */
 #endif
@@ -740,60 +781,62 @@ static DeviceIntPtr dmxAddDevice(DMXLocalInputInfoPtr dmxLocal)
                 dmxLocal->name, name, devname,
                 dmxLocal->isCore
                 ? " [core]"
-                : (dmxLocal->sendsCore
-                   ? " [sends core events]"
-                   : ""));
+                : (dmxLocal->sendsCore ? " [sends core events]" : ""));
 
     return pDevice;
 }
 
-static DMXLocalInputInfoPtr dmxLookupLocal(const char *name)
+static DMXLocalInputInfoPtr
+dmxLookupLocal(const char *name)
 {
     DMXLocalInputInfoPtr pt;
-    
+
     for (pt = &DMXLocalDevices[0]; pt->name; ++pt)
-        if (!strcmp(pt->name, name)) return pt; /* search for device name */
+        if (!strcmp(pt->name, name))
+            return pt;          /* search for device name */
     return NULL;
 }
 
 /** Copy the local input information from \a s into a new \a devs slot
  * in \a dmxInput. */
-DMXLocalInputInfoPtr dmxInputCopyLocal(DMXInputInfo *dmxInput,
-                                       DMXLocalInputInfoPtr s)
+DMXLocalInputInfoPtr
+dmxInputCopyLocal(DMXInputInfo * dmxInput, DMXLocalInputInfoPtr s)
 {
     DMXLocalInputInfoPtr dmxLocal = malloc(sizeof(*dmxLocal));
-    
+
     if (!dmxLocal)
         dmxLog(dmxFatal, "DMXLocalInputInfoPtr: out of memory\n");
 
     memcpy(dmxLocal, s, sizeof(*dmxLocal));
-    dmxLocal->inputIdx       = dmxInput->inputIdx;
-    dmxLocal->sendsCore      = dmxInput->core;
+    dmxLocal->inputIdx = dmxInput->inputIdx;
+    dmxLocal->sendsCore = dmxInput->core;
     dmxLocal->savedSendsCore = dmxInput->core;
-    dmxLocal->deviceId       = -1;
+    dmxLocal->deviceId = -1;
 
     ++dmxInput->numDevs;
     dmxInput->devs = realloc(dmxInput->devs,
-                              dmxInput->numDevs * sizeof(*dmxInput->devs));
-    dmxInput->devs[dmxInput->numDevs-1] = dmxLocal;
-    
+                             dmxInput->numDevs * sizeof(*dmxInput->devs));
+    dmxInput->devs[dmxInput->numDevs - 1] = dmxLocal;
+
     return dmxLocal;
 }
 
-static void dmxPopulateLocal(DMXInputInfo *dmxInput, dmxArg a)
+static void
+dmxPopulateLocal(DMXInputInfo * dmxInput, dmxArg a)
 {
-    int                  i;
-    int                  help = 0;
+    int i;
+    int help = 0;
     DMXLocalInputInfoRec *pt;
 
     for (i = 1; i < dmxArgC(a); i++) {
         const char *name = dmxArgV(a, i);
+
         if ((pt = dmxLookupLocal(name))) {
             dmxInputCopyLocal(dmxInput, pt);
-        } else {
+        }
+        else {
             if (strlen(name))
-                dmxLog(dmxWarning,
-                       "Could not find a driver called %s\n", name);
+                dmxLog(dmxWarning, "Could not find a driver called %s\n", name);
             ++help;
         }
     }
@@ -801,10 +844,17 @@ static void dmxPopulateLocal(DMXInputInfo *dmxInput, dmxArg a)
         dmxLog(dmxInfo, "Available local device drivers:\n");
         for (pt = &DMXLocalDevices[0]; pt->name; ++pt) {
             const char *type;
+
             switch (pt->type) {
-            case DMX_LOCAL_KEYBOARD: type = "keyboard"; break;
-            case DMX_LOCAL_MOUSE:    type = "pointer";  break;
-            default:                 type = "unknown";  break;
+            case DMX_LOCAL_KEYBOARD:
+                type = "keyboard";
+                break;
+            case DMX_LOCAL_MOUSE:
+                type = "pointer";
+                break;
+            default:
+                type = "unknown";
+                break;
             }
             dmxLog(dmxInfo, "   %s (%s)\n", pt->name, type);
         }
@@ -812,30 +862,35 @@ static void dmxPopulateLocal(DMXInputInfo *dmxInput, dmxArg a)
     }
 }
 
-int dmxInputExtensionErrorHandler(Display *dsp, _Xconst char *name, _Xconst char *reason)
+int
+dmxInputExtensionErrorHandler(Display * dsp, _Xconst char *name,
+                              _Xconst char *reason)
 {
     return 0;
 }
 
-static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
+static void
+dmxInputScanForExtensions(DMXInputInfo * dmxInput, int doXI)
 {
-    XExtensionVersion    *ext;
-    XDeviceInfo          *devices;
-    Display              *display;
-    int                  num;
-    int                  i, j;
-    XextErrorHandler     handler;
-
-    if (!(display = XOpenDisplay(dmxInput->name))) return;
-    
+    XExtensionVersion *ext;
+    XDeviceInfo *devices;
+    Display *display;
+    int num;
+    int i, j;
+    XextErrorHandler handler;
+
+    if (!(display = XOpenDisplay(dmxInput->name)))
+        return;
+
     /* Print out information about the XInput Extension. */
     handler = XSetExtensionErrorHandler(dmxInputExtensionErrorHandler);
-    ext     = XGetExtensionVersion(display, INAME);
+    ext = XGetExtensionVersion(display, INAME);
     XSetExtensionErrorHandler(handler);
-    
-    if (!ext || ext == (XExtensionVersion *)NoSuchExtension) {
+
+    if (!ext || ext == (XExtensionVersion *) NoSuchExtension) {
         dmxLogInput(dmxInput, "%s is not available\n", INAME);
-    } else {
+    }
+    else {
         dmxLogInput(dmxInput, "Locating devices on %s (%s version %d.%d)\n",
                     dmxInput->name, INAME,
                     ext->major_version, ext->minor_version);
@@ -844,31 +899,41 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
         XFree(ext);
         ext = NULL;
 
-                                /* Print a list of all devices */
+        /* Print a list of all devices */
         for (i = 0; i < num; i++) {
             const char *use = "Unknown";
+
             switch (devices[i].use) {
-            case IsXPointer:           use = "XPointer";         break;
-            case IsXKeyboard:          use = "XKeyboard";        break;
-            case IsXExtensionDevice:   use = "XExtensionDevice"; break;
-            case IsXExtensionPointer:  use = "XExtensionPointer"; break;
-            case IsXExtensionKeyboard: use = "XExtensionKeyboard"; break;
+            case IsXPointer:
+                use = "XPointer";
+                break;
+            case IsXKeyboard:
+                use = "XKeyboard";
+                break;
+            case IsXExtensionDevice:
+                use = "XExtensionDevice";
+                break;
+            case IsXExtensionPointer:
+                use = "XExtensionPointer";
+                break;
+            case IsXExtensionKeyboard:
+                use = "XExtensionKeyboard";
+                break;
             }
             dmxLogInput(dmxInput, "  %2d %-10.10s %-16.16s\n",
                         devices[i].id,
-                        devices[i].name ? devices[i].name : "",
-                        use);
+                        devices[i].name ? devices[i].name : "", use);
         }
 
-                                /* Search for extensions */
+        /* Search for extensions */
         for (i = 0; i < num; i++) {
             switch (devices[i].use) {
             case IsXKeyboard:
                 for (j = 0; j < dmxInput->numDevs; j++) {
                     DMXLocalInputInfoPtr dmxL = dmxInput->devs[j];
-                    if (dmxL->type == DMX_LOCAL_KEYBOARD
-                        && dmxL->deviceId < 0) {
-                        dmxL->deviceId   = devices[i].id;
+
+                    if (dmxL->type == DMX_LOCAL_KEYBOARD && dmxL->deviceId < 0) {
+                        dmxL->deviceId = devices[i].id;
                         dmxL->deviceName = (devices[i].name
                                             ? strdup(devices[i].name)
                                             : NULL);
@@ -878,8 +943,9 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
             case IsXPointer:
                 for (j = 0; j < dmxInput->numDevs; j++) {
                     DMXLocalInputInfoPtr dmxL = dmxInput->devs[j];
+
                     if (dmxL->type == DMX_LOCAL_MOUSE && dmxL->deviceId < 0) {
-                        dmxL->deviceId   = devices[i].id;
+                        dmxL->deviceId = devices[i].id;
                         dmxL->deviceName = (devices[i].name
                                             ? xstrdup(devices[i].name)
                                             : NULL);
@@ -895,12 +961,14 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
 
 /** Re-initialize all the devices described in \a dmxInput.  Called from
     #dmxAdjustCursorBoundaries before the cursor is redisplayed. */
-void dmxInputReInit(DMXInputInfo *dmxInput)
+void
+dmxInputReInit(DMXInputInfo * dmxInput)
 {
     int i;
 
     for (i = 0; i < dmxInput->numDevs; i++) {
         DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
+
         if (dmxLocal->reinit)
             dmxLocal->reinit(&dmxLocal->pDevice->public);
     }
@@ -908,28 +976,31 @@ void dmxInputReInit(DMXInputInfo *dmxInput)
 
 /** Re-initialize all the devices described in \a dmxInput.  Called from
     #dmxAdjustCursorBoundaries after the cursor is redisplayed. */
-void dmxInputLateReInit(DMXInputInfo *dmxInput)
+void
+dmxInputLateReInit(DMXInputInfo * dmxInput)
 {
     int i;
 
     for (i = 0; i < dmxInput->numDevs; i++) {
         DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
+
         if (dmxLocal->latereinit)
             dmxLocal->latereinit(&dmxLocal->pDevice->public);
     }
 }
 
 /** Initialize all of the devices described in \a dmxInput. */
-void dmxInputInit(DMXInputInfo *dmxInput)
+void
+dmxInputInit(DMXInputInfo * dmxInput)
 {
-    DeviceIntPtr         pPointer = NULL, pKeyboard = NULL;
-    dmxArg               a;
-    const char           *name;
-    int                  i;
-    int                  doXI               = 1; /* Include by default */
-    int                  forceConsole       = 0;
-    int                  doWindows          = 1; /* On by default */
-    int                  hasXkb             = 0;
+    DeviceIntPtr pPointer = NULL, pKeyboard = NULL;
+    dmxArg a;
+    const char *name;
+    int i;
+    int doXI = 1;               /* Include by default */
+    int forceConsole = 0;
+    int doWindows = 1;          /* On by default */
+    int hasXkb = 0;
 
     a = dmxArgParse(dmxInput->name);
 
@@ -940,7 +1011,7 @@ void dmxInputInit(DMXInputInfo *dmxInput)
             ++hasXkb;
             break;
         case 2:
-            dmxInput->symbols  = xstrdup(dmxArgV(a, i));
+            dmxInput->symbols = xstrdup(dmxArgV(a, i));
             ++hasXkb;
             break;
         case 3:
@@ -948,16 +1019,22 @@ void dmxInputInit(DMXInputInfo *dmxInput)
             hasXkb = 0;
             break;
         case 0:
-            if      (!strcmp(dmxArgV(a, i), "noxi"))      doXI         = 0;
-            else if (!strcmp(dmxArgV(a, i), "xi"))        doXI         = 1;
-            else if (!strcmp(dmxArgV(a, i), "console"))   forceConsole = 1;
-            else if (!strcmp(dmxArgV(a, i), "noconsole")) forceConsole = 0;
-            else if (!strcmp(dmxArgV(a, i), "windows"))   doWindows    = 1;
-            else if (!strcmp(dmxArgV(a, i), "nowindows")) doWindows    = 0;
-            else if (!strcmp(dmxArgV(a, i), "xkb"))       hasXkb       = 1;
+            if (!strcmp(dmxArgV(a, i), "noxi"))
+                doXI = 0;
+            else if (!strcmp(dmxArgV(a, i), "xi"))
+                doXI = 1;
+            else if (!strcmp(dmxArgV(a, i), "console"))
+                forceConsole = 1;
+            else if (!strcmp(dmxArgV(a, i), "noconsole"))
+                forceConsole = 0;
+            else if (!strcmp(dmxArgV(a, i), "windows"))
+                doWindows = 1;
+            else if (!strcmp(dmxArgV(a, i), "nowindows"))
+                doWindows = 0;
+            else if (!strcmp(dmxArgV(a, i), "xkb"))
+                hasXkb = 1;
             else {
-                dmxLog(dmxFatal,
-                       "Unknown input argument: %s\n", dmxArgV(a, i));
+                dmxLog(dmxFatal, "Unknown input argument: %s\n", dmxArgV(a, i));
             }
         }
     }
@@ -966,11 +1043,13 @@ void dmxInputInit(DMXInputInfo *dmxInput)
 
     if (!strcmp(name, "local")) {
         dmxPopulateLocal(dmxInput, a);
-    } else if (!strcmp(name, "dummy")) {
+    }
+    else if (!strcmp(name, "dummy")) {
         dmxInputCopyLocal(dmxInput, &DMXDummyMou);
         dmxInputCopyLocal(dmxInput, &DMXDummyKbd);
         dmxLogInput(dmxInput, "Using dummy input\n");
-    } else {
+    }
+    else {
         int found;
 
         for (found = 0, i = 0; i < dmxNumScreens; i++) {
@@ -983,10 +1062,13 @@ void dmxInputInit(DMXInputInfo *dmxInput)
                     dmxLog(dmxWarning,
                            "Cannot use core devices on a backend (%s)"
                            " as XInput devices\n", name);
-                } else {
+                }
+                else {
                     char *pt;
-                    for (pt = (char *)dmxInput->name; pt && *pt; pt++)
-                        if (*pt == ',') *pt = '\0';
+
+                    for (pt = (char *) dmxInput->name; pt && *pt; pt++)
+                        if (*pt == ',')
+                            *pt = '\0';
                     dmxInputCopyLocal(dmxInput, &DMXBackendMou);
                     dmxInputCopyLocal(dmxInput, &DMXBackendKbd);
                     dmxInput->scrnIdx = i;
@@ -999,13 +1081,16 @@ void dmxInputInit(DMXInputInfo *dmxInput)
         }
         if (!found || forceConsole) {
             char *pt;
-            if (found) dmxInput->console = TRUE;
-            for (pt = (char *)dmxInput->name; pt && *pt; pt++)
-                if (*pt == ',') *pt = '\0';
+
+            if (found)
+                dmxInput->console = TRUE;
+            for (pt = (char *) dmxInput->name; pt && *pt; pt++)
+                if (*pt == ',')
+                    *pt = '\0';
             dmxInputCopyLocal(dmxInput, &DMXConsoleMou);
             dmxInputCopyLocal(dmxInput, &DMXConsoleKbd);
             if (doWindows) {
-                dmxInput->windows          = TRUE;
+                dmxInput->windows = TRUE;
                 dmxInput->updateWindowInfo = dmxUpdateWindowInformation;
             }
             dmxLogInput(dmxInput,
@@ -1016,50 +1101,56 @@ void dmxInputInit(DMXInputInfo *dmxInput)
 
     dmxArgFree(a);
 
-                                /* Locate extensions we may be interested in */
+    /* Locate extensions we may be interested in */
     dmxInputScanForExtensions(dmxInput, doXI);
-    
+
     for (i = 0; i < dmxInput->numDevs; i++) {
         DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
+
         dmxLocal->pDevice = dmxAddDevice(dmxLocal);
         if (dmxLocal->isCore) {
             if (dmxLocal->type == DMX_LOCAL_MOUSE)
-                pPointer  = dmxLocal->pDevice;
+                pPointer = dmxLocal->pDevice;
             if (dmxLocal->type == DMX_LOCAL_KEYBOARD)
                 pKeyboard = dmxLocal->pDevice;
         }
     }
-    
-    dmxInput->processInputEvents    = dmxProcessInputEvents;
-    dmxInput->detached              = False;
-    
+
+    dmxInput->processInputEvents = dmxProcessInputEvents;
+    dmxInput->detached = False;
+
     RegisterBlockAndWakeupHandlers(dmxBlockHandler, dmxWakeupHandler,
-                                   (void *)(uintptr_t)dmxInput->inputIdx);
+                                   (void *) (uintptr_t) dmxInput->inputIdx);
 }
 
-static void dmxInputFreeLocal(DMXLocalInputInfoRec *local)
+static void
+dmxInputFreeLocal(DMXLocalInputInfoRec * local)
 {
-    if (!local) return;
+    if (!local)
+        return;
     if (local->isCore && local->type == DMX_LOCAL_MOUSE)
-        dmxLocalCorePointer  = NULL;
+        dmxLocalCorePointer = NULL;
     if (local->isCore && local->type == DMX_LOCAL_KEYBOARD)
         dmxLocalCoreKeyboard = NULL;
-    if (local->destroy_private) local->destroy_private(local->private);
+    if (local->destroy_private)
+        local->destroy_private(local->private);
     free(local->history);
     free(local->valuators);
     free(local->deviceName);
-    local->private    = NULL;
-    local->history    = NULL;
+    local->private = NULL;
+    local->history = NULL;
     local->deviceName = NULL;
     free(local);
 }
 
 /** Free all of the memory associated with \a dmxInput */
-void dmxInputFree(DMXInputInfo *dmxInput)
+void
+dmxInputFree(DMXInputInfo * dmxInput)
 {
     int i;
-    
-    if (!dmxInput) return;
+
+    if (!dmxInput)
+        return;
 
     free(dmxInput->keycodes);
     free(dmxInput->symbols);
@@ -1070,14 +1161,16 @@ void dmxInputFree(DMXInputInfo *dmxInput)
         dmxInput->devs[i] = NULL;
     }
     free(dmxInput->devs);
-    dmxInput->devs    = NULL;
+    dmxInput->devs = NULL;
     dmxInput->numDevs = 0;
-    if (dmxInput->freename) free(dmxInput->name);
-    dmxInput->name    = NULL;
+    if (dmxInput->freename)
+        free(dmxInput->name);
+    dmxInput->name = NULL;
 }
 
 /** Log information about all of the known devices using #dmxLog(). */
-void dmxInputLogDevices(void)
+void
+dmxInputLogDevices(void)
 {
     int i, j;
 
@@ -1085,34 +1178,43 @@ void dmxInputLogDevices(void)
     dmxLog(dmxInfo, "  Id  Name                 Classes\n");
     for (j = 0; j < dmxNumInputs; j++) {
         DMXInputInfo *dmxInput = &dmxInputs[j];
-        const char   *pt = strchr(dmxInput->name, ',');
-        int          len = (pt
-                            ? (size_t)(pt-dmxInput->name)
-                            : strlen(dmxInput->name));
+        const char *pt = strchr(dmxInput->name, ',');
+        int len = (pt ? (size_t) (pt - dmxInput->name)
+                   : strlen(dmxInput->name));
 
         for (i = 0; i < dmxInput->numDevs; i++) {
             DeviceIntPtr pDevice = dmxInput->devs[i]->pDevice;
+
             if (pDevice) {
                 dmxLog(dmxInfo, "  %2d%c %-20.20s",
                        pDevice->id,
-                       dmxInput->detached ? 'D' : ' ',
-                       pDevice->name);
-                if (pDevice->key)        dmxLogCont(dmxInfo, " key");
-                if (pDevice->valuator)   dmxLogCont(dmxInfo, " val");
-                if (pDevice->button)     dmxLogCont(dmxInfo, " btn");
-                if (pDevice->focus)      dmxLogCont(dmxInfo, " foc");
-                if (pDevice->kbdfeed)    dmxLogCont(dmxInfo, " fb/kbd");
-                if (pDevice->ptrfeed)    dmxLogCont(dmxInfo, " fb/ptr");
-                if (pDevice->intfeed)    dmxLogCont(dmxInfo, " fb/int");
-                if (pDevice->stringfeed) dmxLogCont(dmxInfo, " fb/str");
-                if (pDevice->bell)       dmxLogCont(dmxInfo, " fb/bel");
-                if (pDevice->leds)       dmxLogCont(dmxInfo, " fb/led");
+                       dmxInput->detached ? 'D' : ' ', pDevice->name);
+                if (pDevice->key)
+                    dmxLogCont(dmxInfo, " key");
+                if (pDevice->valuator)
+                    dmxLogCont(dmxInfo, " val");
+                if (pDevice->button)
+                    dmxLogCont(dmxInfo, " btn");
+                if (pDevice->focus)
+                    dmxLogCont(dmxInfo, " foc");
+                if (pDevice->kbdfeed)
+                    dmxLogCont(dmxInfo, " fb/kbd");
+                if (pDevice->ptrfeed)
+                    dmxLogCont(dmxInfo, " fb/ptr");
+                if (pDevice->intfeed)
+                    dmxLogCont(dmxInfo, " fb/int");
+                if (pDevice->stringfeed)
+                    dmxLogCont(dmxInfo, " fb/str");
+                if (pDevice->bell)
+                    dmxLogCont(dmxInfo, " fb/bel");
+                if (pDevice->leds)
+                    dmxLogCont(dmxInfo, " fb/led");
                 if (!pDevice->key && !pDevice->valuator && !pDevice->button
                     && !pDevice->focus && !pDevice->kbdfeed
                     && !pDevice->ptrfeed && !pDevice->intfeed
-                    && !pDevice->stringfeed && !pDevice->bell
-                    && !pDevice->leds)   dmxLogCont(dmxInfo, " (none)");
-                                                                 
+                    && !pDevice->stringfeed && !pDevice->bell && !pDevice->leds)
+                    dmxLogCont(dmxInfo, " (none)");
+
                 dmxLogCont(dmxInfo, "\t[i%d/%*.*s",
                            dmxInput->inputIdx, len, len, dmxInput->name);
                 if (dmxInput->devs[i]->deviceId >= 0)
@@ -1123,30 +1225,30 @@ void dmxInputLogDevices(void)
                            dmxInput->devs[i]->isCore
                            ? "core"
                            : (dmxInput->devs[i]->sendsCore
-                              ? "extension (sends core events)"
-                              : "extension"));
+                              ? "extension (sends core events)" : "extension"));
             }
         }
     }
 }
 
 /** Detach an input */
-int dmxInputDetach(DMXInputInfo *dmxInput)
+int
+dmxInputDetach(DMXInputInfo * dmxInput)
 {
     int i;
 
-    if (dmxInput->detached) return BadAccess;
-    
+    if (dmxInput->detached)
+        return BadAccess;
+
     for (i = 0; i < dmxInput->numDevs; i++) {
         DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
+
         dmxLogInput(dmxInput, "Detaching device id %d: %s%s\n",
                     dmxLocal->pDevice->id,
                     dmxLocal->pDevice->name,
                     dmxLocal->isCore
                     ? " [core]"
-                    : (dmxLocal->sendsCore
-                       ? " [sends core events]"
-                       : ""));
+                    : (dmxLocal->sendsCore ? " [sends core events]" : ""));
         DisableDevice(dmxLocal->pDevice, TRUE);
     }
     dmxInput->detached = True;
@@ -1155,116 +1257,133 @@ int dmxInputDetach(DMXInputInfo *dmxInput)
 }
 
 /** Search for input associated with \a dmxScreen, and detach. */
-void dmxInputDetachAll(DMXScreenInfo *dmxScreen)
+void
+dmxInputDetachAll(DMXScreenInfo * dmxScreen)
 {
     int i;
 
     for (i = 0; i < dmxNumInputs; i++) {
         DMXInputInfo *dmxInput = &dmxInputs[i];
-        if (dmxInput->scrnIdx == dmxScreen->index) dmxInputDetach(dmxInput);
+
+        if (dmxInput->scrnIdx == dmxScreen->index)
+            dmxInputDetach(dmxInput);
     }
 }
 
 /** Search for input associated with \a deviceId, and detach. */
-int dmxInputDetachId(int id)
+int
+dmxInputDetachId(int id)
 {
     DMXInputInfo *dmxInput = dmxInputLocateId(id);
 
-    if (!dmxInput) return BadValue;
-    
+    if (!dmxInput)
+        return BadValue;
+
     return dmxInputDetach(dmxInput);
 }
 
-DMXInputInfo *dmxInputLocateId(int id)
+DMXInputInfo *
+dmxInputLocateId(int id)
 {
     int i, j;
-    
+
     for (i = 0; i < dmxNumInputs; i++) {
         DMXInputInfo *dmxInput = &dmxInputs[i];
+
         for (j = 0; j < dmxInput->numDevs; j++) {
             DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[j];
-            if (dmxLocal->pDevice->id == id) return dmxInput;
+
+            if (dmxLocal->pDevice->id == id)
+                return dmxInput;
         }
     }
     return NULL;
 }
 
-static int dmxInputAttachNew(DMXInputInfo *dmxInput, int *id)
+static int
+dmxInputAttachNew(DMXInputInfo * dmxInput, int *id)
 {
     dmxInputInit(dmxInput);
     InitAndStartDevices();
-    if (id && dmxInput->devs) *id = dmxInput->devs[0]->pDevice->id;
+    if (id && dmxInput->devs)
+        *id = dmxInput->devs[0]->pDevice->id;
     dmxInputLogDevices();
     return 0;
 }
 
-static int dmxInputAttachOld(DMXInputInfo *dmxInput, int *id)
+static int
+dmxInputAttachOld(DMXInputInfo * dmxInput, int *id)
 {
     int i;
-    
+
     dmxInput->detached = False;
     for (i = 0; i < dmxInput->numDevs; i++) {
         DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
-        if (id) *id = dmxLocal->pDevice->id;
+
+        if (id)
+            *id = dmxLocal->pDevice->id;
         dmxLogInput(dmxInput,
                     "Attaching device id %d: %s%s\n",
                     dmxLocal->pDevice->id,
                     dmxLocal->pDevice->name,
                     dmxLocal->isCore
                     ? " [core]"
-                    : (dmxLocal->sendsCore
-                       ? " [sends core events]"
-                       : ""));
+                    : (dmxLocal->sendsCore ? " [sends core events]" : ""));
         EnableDevice(dmxLocal->pDevice, TRUE);
     }
     dmxInputLogDevices();
     return 0;
 }
 
-int dmxInputAttachConsole(const char *name, int isCore, int *id)
+int
+dmxInputAttachConsole(const char *name, int isCore, int *id)
 {
-    DMXInputInfo  *dmxInput;
-    int           i;
+    DMXInputInfo *dmxInput;
+    int i;
 
     for (i = 0; i < dmxNumInputs; i++) {
         dmxInput = &dmxInputs[i];
         if (dmxInput->scrnIdx == -1
-            && dmxInput->detached
-            && !strcmp(dmxInput->name, name)) {
-                                /* Found match */
+            && dmxInput->detached && !strcmp(dmxInput->name, name)) {
+            /* Found match */
             dmxLogInput(dmxInput, "Reattaching detached console input\n");
             return dmxInputAttachOld(dmxInput, id);
         }
     }
 
-                                /* No match found */
+    /* No match found */
     dmxInput = dmxConfigAddInput(xstrdup(name), isCore);
     dmxInput->freename = TRUE;
     dmxLogInput(dmxInput, "Attaching new console input\n");
     return dmxInputAttachNew(dmxInput, id);
 }
 
-int dmxInputAttachBackend(int physicalScreen, int isCore, int *id)
+int
+dmxInputAttachBackend(int physicalScreen, int isCore, int *id)
 {
-    DMXInputInfo  *dmxInput;
+    DMXInputInfo *dmxInput;
     DMXScreenInfo *dmxScreen;
-    int           i;
-    
-    if (physicalScreen < 0 || physicalScreen >= dmxNumScreens) return BadValue;
+    int i;
+
+    if (physicalScreen < 0 || physicalScreen >= dmxNumScreens)
+        return BadValue;
     for (i = 0; i < dmxNumInputs; i++) {
         dmxInput = &dmxInputs[i];
         if (dmxInput->scrnIdx != -1 && dmxInput->scrnIdx == physicalScreen) {
-                                /* Found match */
-            if (!dmxInput->detached) return BadAccess; /* Already attached */
+            /* Found match */
+            if (!dmxInput->detached)
+                return BadAccess;       /* Already attached */
             dmxScreen = &dmxScreens[physicalScreen];
-            if (!dmxScreen->beDisplay) return BadAccess; /* Screen detached */
+            if (!dmxScreen->beDisplay)
+                return BadAccess;       /* Screen detached */
             dmxLogInput(dmxInput, "Reattaching detached backend input\n");
             return dmxInputAttachOld(dmxInput, id);
         }
     }
-                                /* No match found */
+    /* No match found */
     dmxScreen = &dmxScreens[physicalScreen];
-    if (!dmxScreen->beDisplay) return BadAccess; /* Screen detached */
+    if (!dmxScreen->beDisplay)
+        return BadAccess;       /* Screen detached */
     dmxInput = dmxConfigAddInput(dmxScreen->name, isCore);
     dmxLogInput(dmxInput, "Attaching new backend input\n");
     return dmxInputAttachNew(dmxInput, id);
diff --git a/xorg-server/hw/dmx/input/dmxinputinit.h b/xorg-server/hw/dmx/input/dmxinputinit.h
index d23ad7a38..94ec1019b 100644
--- a/xorg-server/hw/dmx/input/dmxinputinit.h
+++ b/xorg-server/hw/dmx/input/dmxinputinit.h
@@ -1,291 +1,284 @@
-/*

- * Copyright 2002 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- * Interface for low-level input support.  \see dmxinputinit.c */

-

-#ifndef _DMXINPUTINIT_H_

-#define _DMXINPUTINIT_H_

-

-#include "dmx.h"

-#include "dmxinput.h"

-#include "dmxlog.h"

-

-

-#define DMX_LOCAL_DEFAULT_KEYBOARD "kbd"

-#define DMX_LOCAL_DEFAULT_POINTER  "ps2"

-#define DMX_MAX_BUTTONS            256

-#define DMX_MOTION_SIZE            256

-#define DMX_MAX_VALUATORS          32

-#define DMX_MAX_AXES               32

-#define DMX_MAX_XINPUT_EVENT_TYPES 100

-#define DMX_MAP_ENTRIES            16 /* Must be a power of 2 */

-#define DMX_MAP_MASK               (DMX_MAP_ENTRIES - 1)

-

-typedef enum {

-    DMX_FUNCTION_GRAB,

-    DMX_FUNCTION_TERMINATE,

-    DMX_FUNCTION_FINE

-} DMXFunctionType;

-

-typedef enum {

-    DMX_LOCAL_HIGHLEVEL,

-    DMX_LOCAL_KEYBOARD,

-    DMX_LOCAL_MOUSE,

-    DMX_LOCAL_OTHER

-} DMXLocalInputType;

-

-typedef enum {

-    DMX_LOCAL_TYPE_LOCAL,

-    DMX_LOCAL_TYPE_CONSOLE,

-    DMX_LOCAL_TYPE_BACKEND,

-    DMX_LOCAL_TYPE_COMMON

-} DMXLocalInputExtType;

-

-typedef enum {

-    DMX_RELATIVE,

-    DMX_ABSOLUTE,

-    DMX_ABSOLUTE_CONFINED

-} DMXMotionType;

-

-/** Stores information from low-level device that is used to initialize

- * the device at the dix level. */

-typedef struct _DMXLocalInitInfo {

-    int                  keyboard; /**< Non-zero if the device is a keyboard */

-    

-    int                  keyClass; /**< Non-zero if keys are present */

-    KeySymsRec           keySyms;  /**< Key symbols */

-    int                  freemap;  /**< If non-zero, free keySyms.map */

-    CARD8                modMap[MAP_LENGTH]; /**< Modifier map */

-    XkbDescPtr           xkb;       /**< XKB description */

-    XkbComponentNamesRec names;     /**< XKB component names */

-    int                  freenames; /**< Non-zero if names should be free'd */

-    int                  force;     /**< Do not allow command line override */

-

-    int                  buttonClass; /**< Non-zero if buttons are present */

-    int                  numButtons;  /**< Number of buttons */

-    unsigned char        map[DMX_MAX_BUTTONS]; /**< Button map */

-

-    int                  valuatorClass; /**< Non-zero if valuators are

-                                         * present */

-    int                  numRelAxes;    /**< Number of relative axes */

-    int                  numAbsAxes;    /**< Number of absolute axes */

-    int                  minval[DMX_MAX_AXES]; /**< Minimum values */

-    int                  maxval[DMX_MAX_AXES]; /**< Maximum values */

-    int                  res[DMX_MAX_AXES];    /**< Resolution */

-    int                  minres[DMX_MAX_AXES]; /**< Minimum resolutions */

-    int                  maxres[DMX_MAX_AXES]; /**< Maximum resolutions */

-

-    int                  focusClass;       /**< Non-zero if device can

-                                            * cause focus */

-    int                  proximityClass;   /**< Non-zero if device

-                                            * causes proximity events */

-    int                  kbdFeedbackClass; /**< Non-zero if device has

-                                            * keyboard feedback */ 

-    int                  ptrFeedbackClass; /**< Non-zero if device has

-                                            * pointer feedback */

-    int                  ledFeedbackClass; /**< Non-zero if device has

-                                            * LED indicators */

-    int                  belFeedbackClass; /**< Non-zero if device has a

-                                            * bell */ 

-    int                  intFeedbackClass; /**< Non-zero if device has

-                                            * integer feedback */

-    int                  strFeedbackClass; /**< Non-zero if device has

-                                            * string feedback */

-

-    int                  maxSymbols;          /**< Maximum symbols */

-    int                  maxSymbolsSupported; /**< Maximum symbols supported */

-    KeySym               *symbols;            /**< Key symbols */

-} DMXLocalInitInfo, *DMXLocalInitInfoPtr;

-

-typedef pointer (*dmxCreatePrivateProcPtr)(DeviceIntPtr);

-typedef void    (*dmxDestroyPrivateProcPtr)(pointer);

-                

-typedef void    (*dmxInitProcPtr)(DevicePtr);

-typedef void    (*dmxReInitProcPtr)(DevicePtr);

-typedef void    (*dmxLateReInitProcPtr)(DevicePtr);

-typedef void    (*dmxGetInfoProcPtr)(DevicePtr, DMXLocalInitInfoPtr);

-typedef int     (*dmxOnProcPtr)(DevicePtr);

-typedef void    (*dmxOffProcPtr)(DevicePtr);

-typedef void    (*dmxUpdatePositionProcPtr)(pointer, int x, int y);

-                

-typedef void    (*dmxVTPreSwitchProcPtr)(pointer);  /* Turn I/O Off */

-typedef void    (*dmxVTPostSwitchProcPtr)(pointer); /* Turn I/O On */

-typedef void    (*dmxVTSwitchReturnProcPtr)(pointer);

-typedef int     (*dmxVTSwitchProcPtr)(pointer, int vt,

-                                      dmxVTSwitchReturnProcPtr, pointer);

-                

-typedef void    (*dmxMotionProcPtr)(DevicePtr,

-                                    int *valuators,

-                                    int firstAxis,

-                                    int axesCount,

-                                    DMXMotionType type,

-                                    DMXBlockType block);

-typedef void    (*dmxEnqueueProcPtr)(DevicePtr, int type, int detail,

-                                     KeySym keySym, XEvent *e,

-                                     DMXBlockType block);

-typedef int     (*dmxCheckSpecialProcPtr)(DevicePtr, KeySym keySym);

-typedef void    (*dmxCollectEventsProcPtr)(DevicePtr,

-                                           dmxMotionProcPtr,

-                                           dmxEnqueueProcPtr,

-                                           dmxCheckSpecialProcPtr,

-                                           DMXBlockType);

-typedef void    (*dmxProcessInputProcPtr)(pointer);

-typedef void    (*dmxUpdateInfoProcPtr)(pointer, DMXUpdateType, WindowPtr);

-typedef int     (*dmxFunctionsProcPtr)(pointer, DMXFunctionType);

-                

-typedef void    (*dmxKBCtrlProcPtr)(DevicePtr, KeybdCtrl *ctrl);

-typedef void    (*dmxMCtrlProcPtr)(DevicePtr, PtrCtrl *ctrl);

-typedef void    (*dmxKBBellProcPtr)(DevicePtr, int percent,

-                                    int volume, int pitch, int duration);

-

-/** Stores a mapping between the device id on the remote X server and

- * the id on the DMX server */

-typedef struct _DMXEventMap {

-    int remote;                 /**< Event number on remote X server */

-    int server;                 /**< Event number (unbiased) on DMX server */

-} DMXEventMap;

-

-/** This is the device-independent structure used by the low-level input

- * routines.  The contents are not exposed to top-level .c files (except

- * dmxextensions.c).  \see dmxinput.h \see dmxextensions.c */

-typedef struct _DMXLocalInputInfo {

-    const char               *name;   /**< Device name */

-    DMXLocalInputType        type;    /**< Device type  */

-    DMXLocalInputExtType     extType; /**< Extended device type */

-    int                      binding; /**< Count of how many consecutive

-                                       * structs are bound to the same

-                                       * device */

-    

-                                /* Low-level (e.g., keyboard/mouse drivers) */

-

-    dmxCreatePrivateProcPtr  create_private;  /**< Create

-                                               * device-dependent

-                                               * private */

-    dmxDestroyPrivateProcPtr destroy_private; /**< Destroy

-                                               * device-dependent

-                                               * private */

-    dmxInitProcPtr           init;            /**< Initialize device  */

-    dmxReInitProcPtr         reinit;          /**< Reinitialize device

-                                               * (during a

-                                               * reconfiguration) */

-    dmxLateReInitProcPtr     latereinit;      /**< Reinitialize a device

-                                               * (called very late

-                                               * during a

-                                               * reconfiguration) */

-    dmxGetInfoProcPtr        get_info;        /**< Get device information */

-    dmxOnProcPtr             on;              /**< Turn device on */

-    dmxOffProcPtr            off;             /**< Turn device off */

-    dmxUpdatePositionProcPtr update_position; /**< Called when another

-                                               * device updates the

-                                               * cursor position */

-    dmxVTPreSwitchProcPtr    vt_pre_switch;   /**< Called before a VT switch */

-    dmxVTPostSwitchProcPtr   vt_post_switch;  /**< Called after a VT switch */

-    dmxVTSwitchProcPtr       vt_switch;       /**< Causes a VT switch */

-

-    dmxCollectEventsProcPtr  collect_events;  /**< Collect and enqueue

-                                               * events from the

-                                               * device*/

-    dmxProcessInputProcPtr   process_input;   /**< Process event (from

-                                               * queue)  */

-    dmxFunctionsProcPtr      functions;

-    dmxUpdateInfoProcPtr     update_info;     /**< Update window layout

-                                               * information */

-

-    dmxMCtrlProcPtr          mCtrl;           /**< Pointer control */

-    dmxKBCtrlProcPtr         kCtrl;           /**< Keyboard control */

-    dmxKBBellProcPtr         kBell;           /**< Bell control */

-

-    pointer                  private;         /**< Device-dependent private  */

-    int                      isCore;          /**< Is a DMX core device  */

-    int                      sendsCore;       /**< Sends DMX core events */

-    KeybdCtrl                kctrl;           /**< Keyboard control */

-    PtrCtrl                  mctrl;           /**< Pointer control */

-

-    DeviceIntPtr             pDevice;         /**< X-level device  */

-    int                      inputIdx;        /**< High-level index */

-    int                      lastX, lastY;    /**< Last known position;

-                                               * for XInput in

-                                               * dmxevents.c */ 

-

-    int                      head;            /**< XInput motion history

-                                               * head */

-    int                      tail;            /**< XInput motion history

-                                               * tail */

-    unsigned long            *history;        /**< XInput motion history */

-    int                      *valuators;      /**< Cache of previous values */

-    

-                                /* for XInput ChangePointerDevice */

-    int                      (*savedMotionProc)(DeviceIntPtr,

-                                                xTimecoord *,

-                                                unsigned long,

-                                                unsigned long,

-                                                ScreenPtr);

-    int                      savedMotionEvents; /**< Saved motion events */

-    int                      savedSendsCore;    /**< Saved sends-core flag */

-

-    DMXEventMap              map[DMX_MAP_ENTRIES]; /**< XInput device id map */

-    int                      mapOptimize;          /**< XInput device id

-                                                    * map

-                                                    * optimization */

-

-    long                     deviceId;    /**< device id on remote side,

-                                           * if any */

-    const char               *deviceName; /**< devive name on remote

-                                           * side, if any */

-} DMXLocalInputInfoRec;

-

-extern DMXLocalInputInfoPtr dmxLocalCorePointer, dmxLocalCoreKeyboard;

-

-extern void                 dmxLocalInitInput(DMXInputInfo *dmxInput);

-extern DMXLocalInputInfoPtr dmxInputCopyLocal(DMXInputInfo *dmxInput,

-                                              DMXLocalInputInfoPtr s);

-

-extern void dmxChangePointerControl(DeviceIntPtr pDevice, PtrCtrl *ctrl);

-extern void dmxKeyboardKbdCtrlProc(DeviceIntPtr pDevice, KeybdCtrl *ctrl);

-extern void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,

-                                pointer ctrl, int unknown);

-

-extern int  dmxInputExtensionErrorHandler(Display *dsp, _Xconst char *name,

-                                          _Xconst char *reason);

-

-extern int          dmxInputDetach(DMXInputInfo *dmxInput);

-extern void         dmxInputDetachAll(DMXScreenInfo *dmxScreen);

-extern int          dmxInputDetachId(int id);

-extern DMXInputInfo *dmxInputLocateId(int id);

-extern int          dmxInputAttachConsole(const char *name, int isCore,

-                                          int *id);

-extern int          dmxInputAttachBackend(int physicalScreen, int isCore,

-                                          int *id);

-

-#endif

+/*
+ * Copyright 2002 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ * Interface for low-level input support.  \see dmxinputinit.c */
+
+#ifndef _DMXINPUTINIT_H_
+#define _DMXINPUTINIT_H_
+
+#include "dmx.h"
+#include "dmxinput.h"
+#include "dmxlog.h"
+
+#define DMX_LOCAL_DEFAULT_KEYBOARD "kbd"
+#define DMX_LOCAL_DEFAULT_POINTER  "ps2"
+#define DMX_MAX_BUTTONS            256
+#define DMX_MOTION_SIZE            256
+#define DMX_MAX_VALUATORS          32
+#define DMX_MAX_AXES               32
+#define DMX_MAX_XINPUT_EVENT_TYPES 100
+#define DMX_MAP_ENTRIES            16   /* Must be a power of 2 */
+#define DMX_MAP_MASK               (DMX_MAP_ENTRIES - 1)
+
+typedef enum {
+    DMX_FUNCTION_GRAB,
+    DMX_FUNCTION_TERMINATE,
+    DMX_FUNCTION_FINE
+} DMXFunctionType;
+
+typedef enum {
+    DMX_LOCAL_HIGHLEVEL,
+    DMX_LOCAL_KEYBOARD,
+    DMX_LOCAL_MOUSE,
+    DMX_LOCAL_OTHER
+} DMXLocalInputType;
+
+typedef enum {
+    DMX_LOCAL_TYPE_LOCAL,
+    DMX_LOCAL_TYPE_CONSOLE,
+    DMX_LOCAL_TYPE_BACKEND,
+    DMX_LOCAL_TYPE_COMMON
+} DMXLocalInputExtType;
+
+typedef enum {
+    DMX_RELATIVE,
+    DMX_ABSOLUTE,
+    DMX_ABSOLUTE_CONFINED
+} DMXMotionType;
+
+/** Stores information from low-level device that is used to initialize
+ * the device at the dix level. */
+typedef struct _DMXLocalInitInfo {
+    int keyboard;                  /**< Non-zero if the device is a keyboard */
+
+    int keyClass;                  /**< Non-zero if keys are present */
+    KeySymsRec keySyms;            /**< Key symbols */
+    int freemap;                   /**< If non-zero, free keySyms.map */
+    CARD8 modMap[MAP_LENGTH];                /**< Modifier map */
+    XkbDescPtr xkb;                 /**< XKB description */
+    XkbComponentNamesRec names;     /**< XKB component names */
+    int freenames;                  /**< Non-zero if names should be free'd */
+    int force;                      /**< Do not allow command line override */
+
+    int buttonClass;                  /**< Non-zero if buttons are present */
+    int numButtons;                   /**< Number of buttons */
+    unsigned char map[DMX_MAX_BUTTONS];        /**< Button map */
+
+    int valuatorClass;                  /**< Non-zero if valuators are
+                                         * present */
+    int numRelAxes;                     /**< Number of relative axes */
+    int numAbsAxes;                     /**< Number of absolute axes */
+    int minval[DMX_MAX_AXES];                  /**< Minimum values */
+    int maxval[DMX_MAX_AXES];                  /**< Maximum values */
+    int res[DMX_MAX_AXES];                     /**< Resolution */
+    int minres[DMX_MAX_AXES];                  /**< Minimum resolutions */
+    int maxres[DMX_MAX_AXES];                  /**< Maximum resolutions */
+
+    int focusClass;                        /**< Non-zero if device can
+                                            * cause focus */
+    int proximityClass;                    /**< Non-zero if device
+                                            * causes proximity events */
+    int kbdFeedbackClass;                  /**< Non-zero if device has
+                                            * keyboard feedback */
+    int ptrFeedbackClass;                  /**< Non-zero if device has
+                                            * pointer feedback */
+    int ledFeedbackClass;                  /**< Non-zero if device has
+                                            * LED indicators */
+    int belFeedbackClass;                  /**< Non-zero if device has a
+                                            * bell */
+    int intFeedbackClass;                  /**< Non-zero if device has
+                                            * integer feedback */
+    int strFeedbackClass;                  /**< Non-zero if device has
+                                            * string feedback */
+
+    int maxSymbols;                           /**< Maximum symbols */
+    int maxSymbolsSupported;                  /**< Maximum symbols supported */
+    KeySym *symbols;                          /**< Key symbols */
+} DMXLocalInitInfo, *DMXLocalInitInfoPtr;
+
+typedef pointer (*dmxCreatePrivateProcPtr) (DeviceIntPtr);
+typedef void (*dmxDestroyPrivateProcPtr) (pointer);
+
+typedef void (*dmxInitProcPtr) (DevicePtr);
+typedef void (*dmxReInitProcPtr) (DevicePtr);
+typedef void (*dmxLateReInitProcPtr) (DevicePtr);
+typedef void (*dmxGetInfoProcPtr) (DevicePtr, DMXLocalInitInfoPtr);
+typedef int (*dmxOnProcPtr) (DevicePtr);
+typedef void (*dmxOffProcPtr) (DevicePtr);
+typedef void (*dmxUpdatePositionProcPtr) (pointer, int x, int y);
+
+typedef void (*dmxVTPreSwitchProcPtr) (pointer);        /* Turn I/O Off */
+typedef void (*dmxVTPostSwitchProcPtr) (pointer);       /* Turn I/O On */
+typedef void (*dmxVTSwitchReturnProcPtr) (pointer);
+typedef int (*dmxVTSwitchProcPtr) (pointer, int vt,
+                                   dmxVTSwitchReturnProcPtr, pointer);
+
+typedef void (*dmxMotionProcPtr) (DevicePtr,
+                                  int *valuators,
+                                  int firstAxis,
+                                  int axesCount,
+                                  DMXMotionType type, DMXBlockType block);
+typedef void (*dmxEnqueueProcPtr) (DevicePtr, int type, int detail,
+                                   KeySym keySym, XEvent * e,
+                                   DMXBlockType block);
+typedef int (*dmxCheckSpecialProcPtr) (DevicePtr, KeySym keySym);
+typedef void (*dmxCollectEventsProcPtr) (DevicePtr,
+                                         dmxMotionProcPtr,
+                                         dmxEnqueueProcPtr,
+                                         dmxCheckSpecialProcPtr, DMXBlockType);
+typedef void (*dmxProcessInputProcPtr) (pointer);
+typedef void (*dmxUpdateInfoProcPtr) (pointer, DMXUpdateType, WindowPtr);
+typedef int (*dmxFunctionsProcPtr) (pointer, DMXFunctionType);
+
+typedef void (*dmxKBCtrlProcPtr) (DevicePtr, KeybdCtrl * ctrl);
+typedef void (*dmxMCtrlProcPtr) (DevicePtr, PtrCtrl * ctrl);
+typedef void (*dmxKBBellProcPtr) (DevicePtr, int percent,
+                                  int volume, int pitch, int duration);
+
+/** Stores a mapping between the device id on the remote X server and
+ * the id on the DMX server */
+typedef struct _DMXEventMap {
+    int remote;                 /**< Event number on remote X server */
+    int server;                 /**< Event number (unbiased) on DMX server */
+} DMXEventMap;
+
+/** This is the device-independent structure used by the low-level input
+ * routines.  The contents are not exposed to top-level .c files (except
+ * dmxextensions.c).  \see dmxinput.h \see dmxextensions.c */
+typedef struct _DMXLocalInputInfo {
+    const char *name;                 /**< Device name */
+    DMXLocalInputType type;           /**< Device type  */
+    DMXLocalInputExtType extType;     /**< Extended device type */
+    int binding;                      /**< Count of how many consecutive
+                                       * structs are bound to the same
+                                       * device */
+
+    /* Low-level (e.g., keyboard/mouse drivers) */
+
+    dmxCreatePrivateProcPtr create_private;   /**< Create
+                                               * device-dependent
+                                               * private */
+    dmxDestroyPrivateProcPtr destroy_private; /**< Destroy
+                                               * device-dependent
+                                               * private */
+    dmxInitProcPtr init;                      /**< Initialize device  */
+    dmxReInitProcPtr reinit;                  /**< Reinitialize device
+                                               * (during a
+                                               * reconfiguration) */
+    dmxLateReInitProcPtr latereinit;          /**< Reinitialize a device
+                                               * (called very late
+                                               * during a
+                                               * reconfiguration) */
+    dmxGetInfoProcPtr get_info;               /**< Get device information */
+    dmxOnProcPtr on;                          /**< Turn device on */
+    dmxOffProcPtr off;                        /**< Turn device off */
+    dmxUpdatePositionProcPtr update_position; /**< Called when another
+                                               * device updates the
+                                               * cursor position */
+    dmxVTPreSwitchProcPtr vt_pre_switch;      /**< Called before a VT switch */
+    dmxVTPostSwitchProcPtr vt_post_switch;    /**< Called after a VT switch */
+    dmxVTSwitchProcPtr vt_switch;             /**< Causes a VT switch */
+
+    dmxCollectEventsProcPtr collect_events;   /**< Collect and enqueue
+                                               * events from the
+                                               * device*/
+    dmxProcessInputProcPtr process_input;     /**< Process event (from
+                                               * queue)  */
+    dmxFunctionsProcPtr functions;
+    dmxUpdateInfoProcPtr update_info;         /**< Update window layout
+                                               * information */
+
+    dmxMCtrlProcPtr mCtrl;                    /**< Pointer control */
+    dmxKBCtrlProcPtr kCtrl;                   /**< Keyboard control */
+    dmxKBBellProcPtr kBell;                   /**< Bell control */
+
+    pointer private;                          /**< Device-dependent private  */
+    int isCore;                               /**< Is a DMX core device  */
+    int sendsCore;                            /**< Sends DMX core events */
+    KeybdCtrl kctrl;                          /**< Keyboard control */
+    PtrCtrl mctrl;                            /**< Pointer control */
+
+    DeviceIntPtr pDevice;                     /**< X-level device  */
+    int inputIdx;                             /**< High-level index */
+    int lastX, lastY;                         /**< Last known position;
+                                               * for XInput in
+                                               * dmxevents.c */
+
+    int head;                                 /**< XInput motion history
+                                               * head */
+    int tail;                                 /**< XInput motion history
+                                               * tail */
+    unsigned long *history;                   /**< XInput motion history */
+    int *valuators;                           /**< Cache of previous values */
+
+    /* for XInput ChangePointerDevice */
+    int (*savedMotionProc) (DeviceIntPtr,
+                            xTimecoord *,
+                            unsigned long, unsigned long, ScreenPtr);
+    int savedMotionEvents;                      /**< Saved motion events */
+    int savedSendsCore;                         /**< Saved sends-core flag */
+
+    DMXEventMap map[DMX_MAP_ENTRIES];              /**< XInput device id map */
+    int mapOptimize;                               /**< XInput device id
+                                                    * map
+                                                    * optimization */
+
+    long deviceId;                        /**< device id on remote side,
+                                           * if any */
+    const char *deviceName;               /**< devive name on remote
+                                           * side, if any */
+} DMXLocalInputInfoRec;
+
+extern DMXLocalInputInfoPtr dmxLocalCorePointer, dmxLocalCoreKeyboard;
+
+extern void dmxLocalInitInput(DMXInputInfo * dmxInput);
+extern DMXLocalInputInfoPtr dmxInputCopyLocal(DMXInputInfo * dmxInput,
+                                              DMXLocalInputInfoPtr s);
+
+extern void dmxChangePointerControl(DeviceIntPtr pDevice, PtrCtrl * ctrl);
+extern void dmxKeyboardKbdCtrlProc(DeviceIntPtr pDevice, KeybdCtrl * ctrl);
+extern void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,
+                                pointer ctrl, int unknown);
+
+extern int dmxInputExtensionErrorHandler(Display * dsp, _Xconst char *name,
+                                         _Xconst char *reason);
+
+extern int dmxInputDetach(DMXInputInfo * dmxInput);
+extern void dmxInputDetachAll(DMXScreenInfo * dmxScreen);
+extern int dmxInputDetachId(int id);
+extern DMXInputInfo *dmxInputLocateId(int id);
+extern int dmxInputAttachConsole(const char *name, int isCore, int *id);
+extern int dmxInputAttachBackend(int physicalScreen, int isCore, int *id);
+
+#endif
diff --git a/xorg-server/hw/dmx/input/dmxmap.c b/xorg-server/hw/dmx/input/dmxmap.c
index 1eccd3d28..1a8d4c937 100644
--- a/xorg-server/hw/dmx/input/dmxmap.c
+++ b/xorg-server/hw/dmx/input/dmxmap.c
@@ -59,15 +59,16 @@
  * remoteEvent is the type returned from the remote server.  The \a
  * serverEvent is from the XI_* list of events in
  * include/extensions/XIproto.h. */
-void dmxMapInsert(DMXLocalInputInfoPtr dmxLocal,
-                  int remoteEvent, int serverEvent)
+void
+dmxMapInsert(DMXLocalInputInfoPtr dmxLocal, int remoteEvent, int serverEvent)
 {
     int hash = remoteEvent & DMX_MAP_MASK;
     int i;
 
-                                /* Return if this has already been mapped */
+    /* Return if this has already been mapped */
     if (dmxLocal->map[hash].remote == remoteEvent
-        && dmxLocal->map[hash].server == serverEvent) return;
+        && dmxLocal->map[hash].server == serverEvent)
+        return;
 
     if (dmxLocal->map[hash].remote) {
         dmxLocal->mapOptimize = 0;
@@ -81,18 +82,21 @@ void dmxMapInsert(DMXLocalInputInfoPtr dmxLocal,
         dmxLog(dmxWarning,
                "Out of map entries, cannot map remove event type %d\n",
                remoteEvent);
-    } else {
+    }
+    else {
         dmxLocal->map[hash].remote = remoteEvent;
         dmxLocal->map[hash].server = serverEvent;
     }
 }
 
 /** Remove all mappings there were inserted with #dmxMapInsert. */
-void dmxMapClear(DMXLocalInputInfoPtr dmxLocal)
+void
+dmxMapClear(DMXLocalInputInfoPtr dmxLocal)
 {
     int i;
 
-    for (i = 0; i < DMX_MAP_ENTRIES; i++) dmxLocal->map[i].remote = 0;
+    for (i = 0; i < DMX_MAP_ENTRIES; i++)
+        dmxLocal->map[i].remote = 0;
     dmxLocal->mapOptimize = 1;
 }
 
@@ -100,16 +104,18 @@ void dmxMapClear(DMXLocalInputInfoPtr dmxLocal)
  * returned from the remote server.  The return value is that which was
  * passed into #dmxMapInsert (i.e., a value from the XI_* list in
  * include/extensions/XIproto.h).  If a mapping is not available, -1 is
- * returned. */ 
-int dmxMapLookup(DMXLocalInputInfoPtr dmxLocal, int remoteEvent)
+ * returned. */
+int
+dmxMapLookup(DMXLocalInputInfoPtr dmxLocal, int remoteEvent)
 {
-    int hash        = remoteEvent & DMX_MAP_MASK;
+    int hash = remoteEvent & DMX_MAP_MASK;
     int serverEvent = -1;
     int i;
 
     if (dmxLocal->mapOptimize && dmxLocal->map[hash].remote == remoteEvent) {
         serverEvent = dmxLocal->map[hash].server;
-    } else {
+    }
+    else {
         for (i = 0; i < DMX_MAP_ENTRIES; i++)
             if (dmxLocal->map[i].remote == remoteEvent) {
                 serverEvent = dmxLocal->map[hash].server;
diff --git a/xorg-server/hw/dmx/input/dmxmotion.c b/xorg-server/hw/dmx/input/dmxmotion.c
index 7a4b8a0dc..1642894a2 100644
--- a/xorg-server/hw/dmx/input/dmxmotion.c
+++ b/xorg-server/hw/dmx/input/dmxmotion.c
@@ -1,141 +1,149 @@
-/*

- * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- * This file provides functions similar to miPointerGetMotionEvents and

- * miPointerPutMotionEvents, with the exception that devices with more

- * than two axes are fully supported.  These routines may be used only

- * for motion buffers for extension devices, and are \a not compatible

- * replacements for the mi routines.  */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "inputstr.h"

-#include "dmxinputinit.h"

-#include "dmxcommon.h"

-#include "dmxmotion.h"

-

-#define OFFSET(offset,element) ((offset) * (numAxes + 1) + (element))

-

-/** Return size of motion buffer. \see DMX_MOTION_SIZE */

-int dmxPointerGetMotionBufferSize(void)

-{

-    return DMX_MOTION_SIZE;

-}

-

-/** This routine performs the same function as \a miPointerGetMotionEvents:

- * the events in the motion history that are between the start and stop

- * times (in mS) are placed in the coords vector, and the count of the

- * number of items so placed is returned.  This routine is called from

- * dix/devices.c so that coords can hold valuator->numMotionEvents

- * events.  This routine is called from \a Xi/gtmotion.c with coords large

- * enough to hold the same number of events in a variable-length

- * extended \a xTimecoord structure.  This provides sufficient data for the

- * \a XGetDeviceMotionEvents library call, and would be identical to

- * \a miPointerGetMotionEvents for devices with only 2 axes (i.e., core

- * pointers) if \a xTimecoord used 32bit integers.

- *

- * Because DMX uses the mi* routines for all core devices, this routine

- * only has to support extension devices using the polymorphic coords.

- * Because compatibility with miPointerGetMotionEvents is not possible,

- * it is not provided. */

-int dmxPointerGetMotionEvents(DeviceIntPtr pDevice,

-                              xTimecoord *coords,

-                              unsigned long start,

-                              unsigned long stop,

-                              ScreenPtr pScreen)

-{

-    GETDMXLOCALFROMPDEVICE;

-    int           numAxes = pDevice->valuator->numAxes;

-    unsigned long *c      = (unsigned long *)coords;

-    int           count   = 0;

-    int           i, j;

-

-    if (!dmxLocal->history) return 0;

-    for (i = dmxLocal->head; i != dmxLocal->tail;) {

-        if (dmxLocal->history[OFFSET(i,0)] >= stop) break;

-        if (dmxLocal->history[OFFSET(i,0)] >= start) {

-            for (j = 0; j < numAxes + 1; j++)

-                c[OFFSET(count,j)] = dmxLocal->history[OFFSET(i,j)];

-            ++count;

-        }

-        if (++i >= DMX_MOTION_SIZE) i = 0;

-    }

-    return count;

-}

-

-/** This routine adds an event to the motion history.  A similar

- * function is performed by miPointerMove for the mi versions of these

- * routines. */

-void dmxPointerPutMotionEvent(DeviceIntPtr pDevice,

-                              int firstAxis, int axesCount, int *v,

-                              unsigned long time)

-{

-    GETDMXLOCALFROMPDEVICE;

-    int           numAxes = pDevice->valuator->numAxes;

-    int           i;

-

-    if (!dmxLocal->history) {

-        dmxLocal->history   = malloc(sizeof(*dmxLocal->history)

-                                     * (numAxes + 1)

-                                     * DMX_MOTION_SIZE);

-        dmxLocal->head      = 0;

-        dmxLocal->tail      = 0;

-        dmxLocal->valuators = calloc(sizeof(*dmxLocal->valuators), numAxes);

-    } else {

-        if (++dmxLocal->tail >= DMX_MOTION_SIZE) dmxLocal->tail = 0;

-        if (dmxLocal->head == dmxLocal->tail)

-            if (++dmxLocal->head >= DMX_MOTION_SIZE) dmxLocal->head = 0;

-    }

-

-    dmxLocal->history[OFFSET(dmxLocal->tail,0)] = time;

-

-                                /* Initialize the data from the known

-                                 * values (if Absolute) or to zero (if

-                                 * Relative) */

-    for (i = 0; i < numAxes; i++) {

-        if (pDevice->valuator->axes[i].mode == Absolute)

-            dmxLocal->history[OFFSET(dmxLocal->tail,i+1)]

-                = dmxLocal->valuators[i];

-        else

-            dmxLocal->history[OFFSET(dmxLocal->tail,i+1)] = 0;

-    }

-    

-    for (i = firstAxis; i < axesCount; i++) {

-        dmxLocal->history[OFFSET(dmxLocal->tail,i+i)]

-            = (unsigned long)v[i-firstAxis];

-        dmxLocal->valuators[i] = v[i-firstAxis];

-    }

-}

+/*
+ * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ * This file provides functions similar to miPointerGetMotionEvents and
+ * miPointerPutMotionEvents, with the exception that devices with more
+ * than two axes are fully supported.  These routines may be used only
+ * for motion buffers for extension devices, and are \a not compatible
+ * replacements for the mi routines.  */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "inputstr.h"
+#include "dmxinputinit.h"
+#include "dmxcommon.h"
+#include "dmxmotion.h"
+
+#define OFFSET(offset,element) ((offset) * (numAxes + 1) + (element))
+
+/** Return size of motion buffer. \see DMX_MOTION_SIZE */
+int
+dmxPointerGetMotionBufferSize(void)
+{
+    return DMX_MOTION_SIZE;
+}
+
+/** This routine performs the same function as \a miPointerGetMotionEvents:
+ * the events in the motion history that are between the start and stop
+ * times (in mS) are placed in the coords vector, and the count of the
+ * number of items so placed is returned.  This routine is called from
+ * dix/devices.c so that coords can hold valuator->numMotionEvents
+ * events.  This routine is called from \a Xi/gtmotion.c with coords large
+ * enough to hold the same number of events in a variable-length
+ * extended \a xTimecoord structure.  This provides sufficient data for the
+ * \a XGetDeviceMotionEvents library call, and would be identical to
+ * \a miPointerGetMotionEvents for devices with only 2 axes (i.e., core
+ * pointers) if \a xTimecoord used 32bit integers.
+ *
+ * Because DMX uses the mi* routines for all core devices, this routine
+ * only has to support extension devices using the polymorphic coords.
+ * Because compatibility with miPointerGetMotionEvents is not possible,
+ * it is not provided. */
+int
+dmxPointerGetMotionEvents(DeviceIntPtr pDevice,
+                          xTimecoord * coords,
+                          unsigned long start,
+                          unsigned long stop, ScreenPtr pScreen)
+{
+    GETDMXLOCALFROMPDEVICE;
+    int numAxes = pDevice->valuator->numAxes;
+    unsigned long *c = (unsigned long *) coords;
+    int count = 0;
+    int i, j;
+
+    if (!dmxLocal->history)
+        return 0;
+    for (i = dmxLocal->head; i != dmxLocal->tail;) {
+        if (dmxLocal->history[OFFSET(i, 0)] >= stop)
+            break;
+        if (dmxLocal->history[OFFSET(i, 0)] >= start) {
+            for (j = 0; j < numAxes + 1; j++)
+                c[OFFSET(count, j)] = dmxLocal->history[OFFSET(i, j)];
+            ++count;
+        }
+        if (++i >= DMX_MOTION_SIZE)
+            i = 0;
+    }
+    return count;
+}
+
+/** This routine adds an event to the motion history.  A similar
+ * function is performed by miPointerMove for the mi versions of these
+ * routines. */
+void
+dmxPointerPutMotionEvent(DeviceIntPtr pDevice,
+                         int firstAxis, int axesCount, int *v,
+                         unsigned long time)
+{
+    GETDMXLOCALFROMPDEVICE;
+    int numAxes = pDevice->valuator->numAxes;
+    int i;
+
+    if (!dmxLocal->history) {
+        dmxLocal->history = malloc(sizeof(*dmxLocal->history)
+                                   * (numAxes + 1)
+                                   * DMX_MOTION_SIZE);
+        dmxLocal->head = 0;
+        dmxLocal->tail = 0;
+        dmxLocal->valuators = calloc(sizeof(*dmxLocal->valuators), numAxes);
+    }
+    else {
+        if (++dmxLocal->tail >= DMX_MOTION_SIZE)
+            dmxLocal->tail = 0;
+        if (dmxLocal->head == dmxLocal->tail)
+            if (++dmxLocal->head >= DMX_MOTION_SIZE)
+                dmxLocal->head = 0;
+    }
+
+    dmxLocal->history[OFFSET(dmxLocal->tail, 0)] = time;
+
+    /* Initialize the data from the known
+     * values (if Absolute) or to zero (if
+     * Relative) */
+    for (i = 0; i < numAxes; i++) {
+        if (pDevice->valuator->axes[i].mode == Absolute)
+            dmxLocal->history[OFFSET(dmxLocal->tail, i + 1)]
+                = dmxLocal->valuators[i];
+        else
+            dmxLocal->history[OFFSET(dmxLocal->tail, i + 1)] = 0;
+    }
+
+    for (i = firstAxis; i < axesCount; i++) {
+        dmxLocal->history[OFFSET(dmxLocal->tail, i + i)]
+            = (unsigned long) v[i - firstAxis];
+        dmxLocal->valuators[i] = v[i - firstAxis];
+    }
+}
diff --git a/xorg-server/hw/dmx/input/dmxmotion.h b/xorg-server/hw/dmx/input/dmxmotion.h
index 88aeb3d09..5ccdbe4ad 100644
--- a/xorg-server/hw/dmx/input/dmxmotion.h
+++ b/xorg-server/hw/dmx/input/dmxmotion.h
@@ -37,12 +37,11 @@
 #ifndef _DMXMOTION_H_
 #define _DMXMOTION_H_
 
-extern int  dmxPointerGetMotionBufferSize(void);
-extern int  dmxPointerGetMotionEvents(DeviceIntPtr pDevice,
-                                      xTimecoord *coords,
-                                      unsigned long start,
-                                      unsigned long stop,
-                                      ScreenPtr pScreen);
+extern int dmxPointerGetMotionBufferSize(void);
+extern int dmxPointerGetMotionEvents(DeviceIntPtr pDevice,
+                                     xTimecoord * coords,
+                                     unsigned long start,
+                                     unsigned long stop, ScreenPtr pScreen);
 extern void dmxPointerPutMotionEvent(DeviceIntPtr pDevice,
                                      int firstAxis, int axesCount, int *v,
                                      unsigned long time);
diff --git a/xorg-server/hw/dmx/input/dmxsigio.c b/xorg-server/hw/dmx/input/dmxsigio.c
index 03c3070d7..9b1b493b8 100644
--- a/xorg-server/hw/dmx/input/dmxsigio.c
+++ b/xorg-server/hw/dmx/input/dmxsigio.c
@@ -47,36 +47,37 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-static int  dmxFdCount      = 0;
+static int dmxFdCount = 0;
 static Bool dmxInputEnabled = TRUE;
 
 /* Define equivalents for non-POSIX systems (e.g., SGI IRIX, Solaris) */
 #ifndef O_ASYNC
-# ifdef FASYNC
-# define O_ASYNC FASYNC
-# else
-# define O_ASYNC 0
-# endif
+#ifdef FASYNC
+#define O_ASYNC FASYNC
+#else
+#define O_ASYNC 0
+#endif
 #endif
 #ifndef O_NONBLOCK
 #define O_NONBLOCK FNONBLK
 #endif
 
-static void dmxSigioHandler(int sig)
+static void
+dmxSigioHandler(int sig)
 {
-    int          i, j;
+    int i, j;
     DMXInputInfo *dmxInput;
 
     for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++) {
         if (dmxInput->sigioState == DMX_ACTIVESIGIO) {
             for (j = 0; j < dmxInput->numDevs; j++) {
                 DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[j];
+
                 if (dmxLocal->collect_events) {
                     dmxLocal->collect_events(&dmxLocal->pDevice->public,
                                              dmxMotion,
                                              dmxEnqueue,
-                                             dmxCheckSpecialKeys,
-                                             DMX_NO_BLOCK);
+                                             dmxCheckSpecialKeys, DMX_NO_BLOCK);
                 }
             }
         }
@@ -84,7 +85,8 @@ static void dmxSigioHandler(int sig)
 }
 
 /** Block SIGIO handling. */
-void dmxSigioBlock(void)
+void
+dmxSigioBlock(void)
 {
     sigset_t s;
 
@@ -94,7 +96,8 @@ void dmxSigioBlock(void)
 }
 
 /** Unblock SIGIO handling. */
-void dmxSigioUnblock(void)
+void
+dmxSigioUnblock(void)
 {
     sigset_t s;
 
@@ -103,10 +106,11 @@ void dmxSigioUnblock(void)
     sigprocmask(SIG_UNBLOCK, &s, 0);
 }
 
-static void dmxSigioHook(void)
+static void
+dmxSigioHook(void)
 {
     struct sigaction a;
-    sigset_t         s;
+    sigset_t s;
 
     memset(&a, 0, sizeof(a));
     a.sa_handler = dmxSigioHandler;
@@ -115,81 +119,95 @@ static void dmxSigioHook(void)
     sigaddset(&a.sa_mask, SIGALRM);
     sigaddset(&a.sa_mask, SIGVTALRM);
     sigaction(SIGIO, &a, 0);
-    
+
     sigemptyset(&s);
     sigprocmask(SIG_SETMASK, &s, 0);
 }
 
-static void dmxSigioUnhook(void)
+static void
+dmxSigioUnhook(void)
 {
     struct sigaction a;
 
-    memset (&a, 0, sizeof(a));
+    memset(&a, 0, sizeof(a));
     a.sa_handler = SIG_IGN;
     sigemptyset(&a.sa_mask);
     sigaction(SIGIO, &a, 0);
 }
 
-static void dmxSigioAdd(DMXInputInfo *dmxInput)
+static void
+dmxSigioAdd(DMXInputInfo * dmxInput)
 {
     int flags;
     int i;
 
     switch (dmxInput->sigioState) {
-    case DMX_NOSIGIO:     return;
-    case DMX_USESIGIO:    dmxInput->sigioState = DMX_ACTIVESIGIO; break;
-    case DMX_ACTIVESIGIO: return;
+    case DMX_NOSIGIO:
+        return;
+    case DMX_USESIGIO:
+        dmxInput->sigioState = DMX_ACTIVESIGIO;
+        break;
+    case DMX_ACTIVESIGIO:
+        return;
     }
 
     for (i = 0; i < dmxInput->sigioFdCount; i++) {
         if (!dmxInput->sigioAdded[i]) {
             int fd = dmxInput->sigioFd[i];
-        
+
             fcntl(fd, F_SETOWN, getpid());
             flags = fcntl(fd, F_GETFL);
-            flags |= O_ASYNC|O_NONBLOCK;
+            flags |= O_ASYNC | O_NONBLOCK;
             fcntl(fd, F_SETFL, flags);
-    
+
             AddEnabledDevice(fd);
             dmxInput->sigioAdded[i] = TRUE;
 
-            if (++dmxFdCount == 1) dmxSigioHook();
+            if (++dmxFdCount == 1)
+                dmxSigioHook();
         }
     }
 }
 
-static void dmxSigioRemove(DMXInputInfo *dmxInput)
+static void
+dmxSigioRemove(DMXInputInfo * dmxInput)
 {
     int flags;
     int i;
-    
+
     switch (dmxInput->sigioState) {
-    case DMX_NOSIGIO:     return;
-    case DMX_USESIGIO:    return;
-    case DMX_ACTIVESIGIO: dmxInput->sigioState = DMX_USESIGIO; break;
+    case DMX_NOSIGIO:
+        return;
+    case DMX_USESIGIO:
+        return;
+    case DMX_ACTIVESIGIO:
+        dmxInput->sigioState = DMX_USESIGIO;
+        break;
     }
 
     for (i = 0; i < dmxInput->sigioFdCount; i++) {
         if (dmxInput->sigioAdded[i]) {
             int fd = dmxInput->sigioFd[i];
-        
+
             dmxInput->sigioAdded[i] = FALSE;
             RemoveEnabledDevice(fd);
-        
+
             flags = fcntl(fd, F_GETFL);
-            flags &= ~(O_ASYNC|O_NONBLOCK);
+            flags &= ~(O_ASYNC | O_NONBLOCK);
             fcntl(fd, F_SETFL, flags);
 
-            if (!--dmxFdCount) dmxSigioUnhook();
+            if (!--dmxFdCount)
+                dmxSigioUnhook();
         }
     }
 }
 
 /** Enable SIGIO handling.  This instantiates the handler with the OS. */
-void dmxSigioEnableInput(void)
+void
+dmxSigioEnableInput(void)
 {
-    int              i;
-    DMXInputInfo     *dmxInput;
+    int i;
+    DMXInputInfo *dmxInput;
 
     dmxInputEnabled = TRUE;
     for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++)
@@ -197,10 +215,11 @@ void dmxSigioEnableInput(void)
 }
 
 /** Disable SIGIO handling.  This removes the hanlder from the OS. */
-void dmxSigioDisableInput(void)
+void
+dmxSigioDisableInput(void)
 {
-    int              i;
-    DMXInputInfo     *dmxInput;
+    int i;
+    DMXInputInfo *dmxInput;
 
     dmxInputEnabled = FALSE;
     for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++)
@@ -211,23 +230,27 @@ void dmxSigioDisableInput(void)
  * using the file descriptor \a fd for SIGIO signals.  Calls
  * AddEnabledDevice ifi SIGIO handling has been enabled with
  * #dmxSigioEnableInput(). */
-void dmxSigioRegister(DMXInputInfo *dmxInput, int fd)
+void
+dmxSigioRegister(DMXInputInfo * dmxInput, int fd)
 {
     dmxInput->sigioState = DMX_USESIGIO;
     if (dmxInput->sigioFdCount >= DMX_MAX_SIGIO_FDS)
         dmxLog(dmxFatal, "Too many SIGIO file descriptors (%d >= %d)\n",
                dmxInput->sigioFdCount, DMX_MAX_SIGIO_FDS);
-    
+
     dmxInput->sigioFd[dmxInput->sigioFdCount++] = fd;
-    if (dmxInputEnabled) dmxSigioAdd(dmxInput);
+    if (dmxInputEnabled)
+        dmxSigioAdd(dmxInput);
 }
 
 /** Remove the notes that \a dmxInput is using any file descriptors for
  * SIGIO signals.  Calls RemoveEnabledDevice. */
-void dmxSigioUnregister(DMXInputInfo *dmxInput)
+void
+dmxSigioUnregister(DMXInputInfo * dmxInput)
 {
-    if (dmxInput->sigioState == DMX_NOSIGIO) return;
+    if (dmxInput->sigioState == DMX_NOSIGIO)
+        return;
     dmxSigioRemove(dmxInput);
-    dmxInput->sigioState   = DMX_NOSIGIO;
+    dmxInput->sigioState = DMX_NOSIGIO;
     dmxInput->sigioFdCount = 0;
 }
diff --git a/xorg-server/hw/dmx/input/dmxxinput.c b/xorg-server/hw/dmx/input/dmxxinput.c
index b28a80d4d..fccab5ff1 100644
--- a/xorg-server/hw/dmx/input/dmxxinput.c
+++ b/xorg-server/hw/dmx/input/dmxxinput.c
@@ -1,76 +1,75 @@
-/*

- * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- *

- * This file implements support required by the XINPUT extension.

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "inputstr.h"

-#include <X11/extensions/XI.h>

-#include <X11/extensions/XIproto.h>

-#include "XIstubs.h"

-

-#include "mipointer.h"

-#include "dmxinputinit.h"

-#include "exevents.h"

-

-/** Set device mode to \a mode.  This is not implemented. */

-int SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)

-{

-    return BadMatch;

-}

-

-/** Set device valuators.  This is not implemented. */

-int SetDeviceValuators (ClientPtr client,

-                        DeviceIntPtr dev,

-                        int *valuators,

-                        int first_valuator,

-                        int num_valuators)

-{

-    return BadMatch;

-}

-

-/** Change device control.  This is not implemented. */

-int ChangeDeviceControl(ClientPtr client,

-                        DeviceIntPtr dev,

-                        xDeviceCtl *control)

-{

-    return BadMatch;

-}

+/*
+ * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ *
+ * This file implements support required by the XINPUT extension.
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "inputstr.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "XIstubs.h"
+
+#include "mipointer.h"
+#include "dmxinputinit.h"
+#include "exevents.h"
+
+/** Set device mode to \a mode.  This is not implemented. */
+int
+SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)
+{
+    return BadMatch;
+}
+
+/** Set device valuators.  This is not implemented. */
+int
+SetDeviceValuators(ClientPtr client,
+                   DeviceIntPtr dev,
+                   int *valuators, int first_valuator, int num_valuators)
+{
+    return BadMatch;
+}
+
+/** Change device control.  This is not implemented. */
+int
+ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev, xDeviceCtl * control)
+{
+    return BadMatch;
+}
diff --git a/xorg-server/hw/dmx/input/lnx-keyboard.c b/xorg-server/hw/dmx/input/lnx-keyboard.c
index 06e9ec722..ecf4f591c 100644
--- a/xorg-server/hw/dmx/input/lnx-keyboard.c
+++ b/xorg-server/hw/dmx/input/lnx-keyboard.c
@@ -172,26 +172,25 @@
 #define NUM_AT2LNX (sizeof(at2lnx) / sizeof(at2lnx[0]))
 #define NUM_STATE_ENTRIES (256/32)
 
-
 /* Private area for Linux-style keyboards. */
 typedef struct _myPrivate {
-    int            fd;
-    int            vtno;
-    int            vtcurrent;
-    int            kbdtrans;
+    int fd;
+    int vtno;
+    int vtcurrent;
+    int kbdtrans;
     struct termios kbdtty;
-    int            kbdType;
-    CARD32         kbdState[NUM_STATE_ENTRIES];
-    DeviceIntPtr   pKeyboard;
-    unsigned char  prefix;
-
-    int            switched;
-    SWITCHRETPROC  switch_return;
-    void           *switch_return_data;
-
-                                /* For bell */
-    int            pitch;
-    unsigned long  duration;
+    int kbdType;
+    CARD32 kbdState[NUM_STATE_ENTRIES];
+    DeviceIntPtr pKeyboard;
+    unsigned char prefix;
+
+    int switched;
+    SWITCHRETPROC switch_return;
+    void *switch_return_data;
+
+    /* For bell */
+    int pitch;
+    unsigned long duration;
 } myPrivate;
 
 static myPrivate *PRIV = NULL;
@@ -199,174 +198,182 @@ static myPrivate *PRIV = NULL;
 #undef SYSCALL
 #define SYSCALL(call) while(((call) == -1) && (errno == EINTR))
 
-static int kbdLinuxKeyDown(myPrivate *priv, int keyCode)
+static int
+kbdLinuxKeyDown(myPrivate * priv, int keyCode)
 {
-    CARD8  byte = keyCode >> 5;
-    CARD32 bit  = 1 << (keyCode & 0x1f);
+    CARD8 byte = keyCode >> 5;
+    CARD32 bit = 1 << (keyCode & 0x1f);
 
-    if (byte > NUM_STATE_ENTRIES) return 0;
+    if (byte > NUM_STATE_ENTRIES)
+        return 0;
     return priv->kbdState[byte] & bit;
 }
 
-static void kbdLinuxKeyState(myPrivate *priv, int type, int keyCode)
+static void
+kbdLinuxKeyState(myPrivate * priv, int type, int keyCode)
 {
-    CARD8  byte = keyCode >> 5;
-    CARD32 bit  = 1 << (keyCode & 0x1f);
-
-    if (byte > NUM_STATE_ENTRIES) return;
-    if (type == KeyPress) priv->kbdState[byte] |= bit;
-    else                  priv->kbdState[byte] &= ~bit;
+    CARD8 byte = keyCode >> 5;
+    CARD32 bit = 1 << (keyCode & 0x1f);
+
+    if (byte > NUM_STATE_ENTRIES)
+        return;
+    if (type == KeyPress)
+        priv->kbdState[byte] |= bit;
+    else
+        priv->kbdState[byte] &= ~bit;
 }
 
 static KeySym linux_to_x[256] = {
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	XK_BackSpace,	XK_Tab,		XK_Linefeed,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	XK_Escape,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	XK_space,	XK_exclam,	XK_quotedbl,	XK_numbersign,
-	XK_dollar,	XK_percent,	XK_ampersand,	XK_apostrophe,
-	XK_parenleft,	XK_parenright,	XK_asterisk,	XK_plus,
-	XK_comma,	XK_minus,	XK_period,	XK_slash,
-	XK_0,		XK_1,		XK_2,		XK_3,
-	XK_4,		XK_5,		XK_6,		XK_7,
-	XK_8,		XK_9,		XK_colon,	XK_semicolon,
-	XK_less,	XK_equal,	XK_greater,	XK_question,
-	XK_at,		XK_A,		XK_B,		XK_C,
-	XK_D,		XK_E,		XK_F,		XK_G,
-	XK_H,		XK_I,		XK_J,		XK_K,
-	XK_L,		XK_M,		XK_N,		XK_O,
-	XK_P,		XK_Q,		XK_R,		XK_S,
-	XK_T,		XK_U,		XK_V,		XK_W,
-	XK_X,		XK_Y,		XK_Z,		XK_bracketleft,
-	XK_backslash,	XK_bracketright,XK_asciicircum,	XK_underscore,
-	XK_grave,	XK_a,		XK_b,		XK_c,
-	XK_d,		XK_e,		XK_f,		XK_g,
-	XK_h,		XK_i,		XK_j,		XK_k,
-	XK_l,		XK_m,		XK_n,		XK_o,
-	XK_p,		XK_q,		XK_r,		XK_s,
-	XK_t,		XK_u,		XK_v,		XK_w,
-	XK_x,		XK_y,		XK_z,		XK_braceleft,
-	XK_bar,		XK_braceright,	XK_asciitilde,	XK_BackSpace,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	XK_nobreakspace,XK_exclamdown,	XK_cent,	XK_sterling,
-	XK_currency,	XK_yen,		XK_brokenbar,	XK_section,
-	XK_diaeresis,	XK_copyright,	XK_ordfeminine,	XK_guillemotleft,
-	XK_notsign,	XK_hyphen,	XK_registered,	XK_macron,
-	XK_degree,	XK_plusminus,	XK_twosuperior,	XK_threesuperior,
-	XK_acute,	XK_mu,		XK_paragraph,	XK_periodcentered,
-	XK_cedilla,	XK_onesuperior,	XK_masculine,	XK_guillemotright,
-	XK_onequarter,	XK_onehalf,	XK_threequarters,XK_questiondown,
-	XK_Agrave,	XK_Aacute,	XK_Acircumflex,	XK_Atilde,
-	XK_Adiaeresis,	XK_Aring,	XK_AE,		XK_Ccedilla,
-	XK_Egrave,	XK_Eacute,	XK_Ecircumflex,	XK_Ediaeresis,
-	XK_Igrave,	XK_Iacute,	XK_Icircumflex,	XK_Idiaeresis,
-	XK_ETH,		XK_Ntilde,	XK_Ograve,	XK_Oacute,
-	XK_Ocircumflex,	XK_Otilde,	XK_Odiaeresis,	XK_multiply,
-	XK_Ooblique,	XK_Ugrave,	XK_Uacute,	XK_Ucircumflex,
-	XK_Udiaeresis,	XK_Yacute,	XK_THORN,	XK_ssharp,
-	XK_agrave,	XK_aacute,	XK_acircumflex,	XK_atilde,
-	XK_adiaeresis,	XK_aring,	XK_ae,		XK_ccedilla,
-	XK_egrave,	XK_eacute,	XK_ecircumflex,	XK_ediaeresis,
-	XK_igrave,	XK_iacute,	XK_icircumflex,	XK_idiaeresis,
-	XK_eth,		XK_ntilde,	XK_ograve,	XK_oacute,
-	XK_ocircumflex,	XK_otilde,	XK_odiaeresis,	XK_division,
-	XK_oslash,	XK_ugrave,	XK_uacute,	XK_ucircumflex,
-	XK_udiaeresis,	XK_yacute,	XK_thorn,	XK_ydiaeresis
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    XK_BackSpace, XK_Tab, XK_Linefeed, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, XK_Escape,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    XK_space, XK_exclam, XK_quotedbl, XK_numbersign,
+    XK_dollar, XK_percent, XK_ampersand, XK_apostrophe,
+    XK_parenleft, XK_parenright, XK_asterisk, XK_plus,
+    XK_comma, XK_minus, XK_period, XK_slash,
+    XK_0, XK_1, XK_2, XK_3,
+    XK_4, XK_5, XK_6, XK_7,
+    XK_8, XK_9, XK_colon, XK_semicolon,
+    XK_less, XK_equal, XK_greater, XK_question,
+    XK_at, XK_A, XK_B, XK_C,
+    XK_D, XK_E, XK_F, XK_G,
+    XK_H, XK_I, XK_J, XK_K,
+    XK_L, XK_M, XK_N, XK_O,
+    XK_P, XK_Q, XK_R, XK_S,
+    XK_T, XK_U, XK_V, XK_W,
+    XK_X, XK_Y, XK_Z, XK_bracketleft,
+    XK_backslash, XK_bracketright, XK_asciicircum, XK_underscore,
+    XK_grave, XK_a, XK_b, XK_c,
+    XK_d, XK_e, XK_f, XK_g,
+    XK_h, XK_i, XK_j, XK_k,
+    XK_l, XK_m, XK_n, XK_o,
+    XK_p, XK_q, XK_r, XK_s,
+    XK_t, XK_u, XK_v, XK_w,
+    XK_x, XK_y, XK_z, XK_braceleft,
+    XK_bar, XK_braceright, XK_asciitilde, XK_BackSpace,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    XK_nobreakspace, XK_exclamdown, XK_cent, XK_sterling,
+    XK_currency, XK_yen, XK_brokenbar, XK_section,
+    XK_diaeresis, XK_copyright, XK_ordfeminine, XK_guillemotleft,
+    XK_notsign, XK_hyphen, XK_registered, XK_macron,
+    XK_degree, XK_plusminus, XK_twosuperior, XK_threesuperior,
+    XK_acute, XK_mu, XK_paragraph, XK_periodcentered,
+    XK_cedilla, XK_onesuperior, XK_masculine, XK_guillemotright,
+    XK_onequarter, XK_onehalf, XK_threequarters, XK_questiondown,
+    XK_Agrave, XK_Aacute, XK_Acircumflex, XK_Atilde,
+    XK_Adiaeresis, XK_Aring, XK_AE, XK_Ccedilla,
+    XK_Egrave, XK_Eacute, XK_Ecircumflex, XK_Ediaeresis,
+    XK_Igrave, XK_Iacute, XK_Icircumflex, XK_Idiaeresis,
+    XK_ETH, XK_Ntilde, XK_Ograve, XK_Oacute,
+    XK_Ocircumflex, XK_Otilde, XK_Odiaeresis, XK_multiply,
+    XK_Ooblique, XK_Ugrave, XK_Uacute, XK_Ucircumflex,
+    XK_Udiaeresis, XK_Yacute, XK_THORN, XK_ssharp,
+    XK_agrave, XK_aacute, XK_acircumflex, XK_atilde,
+    XK_adiaeresis, XK_aring, XK_ae, XK_ccedilla,
+    XK_egrave, XK_eacute, XK_ecircumflex, XK_ediaeresis,
+    XK_igrave, XK_iacute, XK_icircumflex, XK_idiaeresis,
+    XK_eth, XK_ntilde, XK_ograve, XK_oacute,
+    XK_ocircumflex, XK_otilde, XK_odiaeresis, XK_division,
+    XK_oslash, XK_ugrave, XK_uacute, XK_ucircumflex,
+    XK_udiaeresis, XK_yacute, XK_thorn, XK_ydiaeresis
 };
 
 /*
  * Maps the AT keycodes to Linux keycodes
  */
-static unsigned char at2lnx[NUM_KEYCODES] =
-{
-	0x01,	/* KEY_Escape */	0x02,	/* KEY_1 */
-	0x03,	/* KEY_2 */		0x04,	/* KEY_3 */
-	0x05,	/* KEY_4 */		0x06,	/* KEY_5 */
-	0x07,	/* KEY_6 */		0x08,	/* KEY_7 */
-	0x09,	/* KEY_8 */		0x0a,	/* KEY_9 */
-	0x0b,	/* KEY_0 */		0x0c,	/* KEY_Minus */
-	0x0d,	/* KEY_Equal */		0x0e,	/* KEY_BackSpace */
-	0x0f,	/* KEY_Tab */		0x10,	/* KEY_Q */
-	0x11,	/* KEY_W */		0x12,	/* KEY_E */
-	0x13,	/* KEY_R */		0x14,	/* KEY_T */
-	0x15,	/* KEY_Y */		0x16,	/* KEY_U */
-	0x17,	/* KEY_I */		0x18,	/* KEY_O */
-	0x19,	/* KEY_P */		0x1a,	/* KEY_LBrace */
-	0x1b,	/* KEY_RBrace */	0x1c,	/* KEY_Enter */
-	0x1d,	/* KEY_LCtrl */		0x1e,	/* KEY_A */
-	0x1f,	/* KEY_S */		0x20,	/* KEY_D */
-	0x21,	/* KEY_F */		0x22,	/* KEY_G */
-	0x23,	/* KEY_H */		0x24,	/* KEY_J */
-	0x25,	/* KEY_K */		0x26,	/* KEY_L */
-	0x27,	/* KEY_SemiColon */	0x28,	/* KEY_Quote */
-	0x29,	/* KEY_Tilde */		0x2a,	/* KEY_ShiftL */
-	0x2b,	/* KEY_BSlash */	0x2c,	/* KEY_Z */
-	0x2d,	/* KEY_X */		0x2e,	/* KEY_C */
-	0x2f,	/* KEY_V */		0x30,	/* KEY_B */
-	0x31,	/* KEY_N */		0x32,	/* KEY_M */
-	0x33,	/* KEY_Comma */		0x34,	/* KEY_Period */
-	0x35,	/* KEY_Slash */		0x36,	/* KEY_ShiftR */
-	0x37,	/* KEY_KP_Multiply */	0x38,	/* KEY_Alt */
-	0x39,	/* KEY_Space */		0x3a,	/* KEY_CapsLock */
-	0x3b,	/* KEY_F1 */		0x3c,	/* KEY_F2 */
-	0x3d,	/* KEY_F3 */		0x3e,	/* KEY_F4 */
-	0x3f,	/* KEY_F5 */		0x40,	/* KEY_F6 */
-	0x41,	/* KEY_F7 */		0x42,	/* KEY_F8 */
-	0x43,	/* KEY_F9 */		0x44,	/* KEY_F10 */
-	0x45,	/* KEY_NumLock */	0x46,	/* KEY_ScrollLock */
-	0x47,	/* KEY_KP_7 */		0x48,	/* KEY_KP_8 */
-	0x49,	/* KEY_KP_9 */		0x4a,	/* KEY_KP_Minus */
-	0x4b,	/* KEY_KP_4 */		0x4c,	/* KEY_KP_5 */
-	0x4d,	/* KEY_KP_6 */		0x4e,	/* KEY_KP_Plus */
-	0x4f,	/* KEY_KP_1 */		0x50,	/* KEY_KP_2 */
-	0x51,	/* KEY_KP_3 */		0x52,	/* KEY_KP_0 */
-	0x53,	/* KEY_KP_Decimal */	0x54,	/* KEY_SysReqest */
-	0x00,	/* 0x55 */		0x56,	/* KEY_Less */
-	0x57,	/* KEY_F11 */		0x58,	/* KEY_F12 */
-	0x66,	/* KEY_Home */		0x67,	/* KEY_Up */
-	0x68,	/* KEY_PgUp */		0x69,	/* KEY_Left */
-	0x5d,	/* KEY_Begin */		0x6a,	/* KEY_Right */
-	0x6b,	/* KEY_End */		0x6c,	/* KEY_Down */
-	0x6d,	/* KEY_PgDown */	0x6e,	/* KEY_Insert */
-	0x6f,	/* KEY_Delete */	0x60,	/* KEY_KP_Enter */
-	0x61,	/* KEY_RCtrl */		0x77,	/* KEY_Pause */
-	0x63,	/* KEY_Print */		0x62,	/* KEY_KP_Divide */
-	0x64,	/* KEY_AltLang */	0x65,	/* KEY_Break */
-	0x00,	/* KEY_LMeta */		0x00,	/* KEY_RMeta */
-	0x7A,	/* KEY_Menu/FOCUS_PF11*/0x00,	/* 0x6e */
-	0x7B,	/* FOCUS_PF12 */	0x00,	/* 0x70 */
-	0x00,	/* 0x71 */		0x00,	/* 0x72 */
-	0x59,	/* FOCUS_PF2 */		0x78,	/* FOCUS_PF9 */
-	0x00,	/* 0x75 */		0x00,	/* 0x76 */
-	0x5A,	/* FOCUS_PF3 */		0x5B,	/* FOCUS_PF4 */
-	0x5C,	/* FOCUS_PF5 */		0x5D,	/* FOCUS_PF6 */
-	0x5E,	/* FOCUS_PF7 */		0x5F,	/* FOCUS_PF8 */
-	0x7C,	/* JAP_86 */		0x79,	/* FOCUS_PF10 */
-	0x00,	/* 0x7f */
+static unsigned char at2lnx[NUM_KEYCODES] = {
+    0x01, /* KEY_Escape */ 0x02,        /* KEY_1 */
+    0x03, /* KEY_2 */ 0x04,     /* KEY_3 */
+    0x05, /* KEY_4 */ 0x06,     /* KEY_5 */
+    0x07, /* KEY_6 */ 0x08,     /* KEY_7 */
+    0x09, /* KEY_8 */ 0x0a,     /* KEY_9 */
+    0x0b, /* KEY_0 */ 0x0c,     /* KEY_Minus */
+    0x0d, /* KEY_Equal */ 0x0e, /* KEY_BackSpace */
+    0x0f, /* KEY_Tab */ 0x10,   /* KEY_Q */
+    0x11, /* KEY_W */ 0x12,     /* KEY_E */
+    0x13, /* KEY_R */ 0x14,     /* KEY_T */
+    0x15, /* KEY_Y */ 0x16,     /* KEY_U */
+    0x17, /* KEY_I */ 0x18,     /* KEY_O */
+    0x19, /* KEY_P */ 0x1a,     /* KEY_LBrace */
+    0x1b, /* KEY_RBrace */ 0x1c,        /* KEY_Enter */
+    0x1d, /* KEY_LCtrl */ 0x1e, /* KEY_A */
+    0x1f, /* KEY_S */ 0x20,     /* KEY_D */
+    0x21, /* KEY_F */ 0x22,     /* KEY_G */
+    0x23, /* KEY_H */ 0x24,     /* KEY_J */
+    0x25, /* KEY_K */ 0x26,     /* KEY_L */
+    0x27, /* KEY_SemiColon */ 0x28,     /* KEY_Quote */
+    0x29, /* KEY_Tilde */ 0x2a, /* KEY_ShiftL */
+    0x2b, /* KEY_BSlash */ 0x2c,        /* KEY_Z */
+    0x2d, /* KEY_X */ 0x2e,     /* KEY_C */
+    0x2f, /* KEY_V */ 0x30,     /* KEY_B */
+    0x31, /* KEY_N */ 0x32,     /* KEY_M */
+    0x33, /* KEY_Comma */ 0x34, /* KEY_Period */
+    0x35, /* KEY_Slash */ 0x36, /* KEY_ShiftR */
+    0x37, /* KEY_KP_Multiply */ 0x38,   /* KEY_Alt */
+    0x39, /* KEY_Space */ 0x3a, /* KEY_CapsLock */
+    0x3b, /* KEY_F1 */ 0x3c,    /* KEY_F2 */
+    0x3d, /* KEY_F3 */ 0x3e,    /* KEY_F4 */
+    0x3f, /* KEY_F5 */ 0x40,    /* KEY_F6 */
+    0x41, /* KEY_F7 */ 0x42,    /* KEY_F8 */
+    0x43, /* KEY_F9 */ 0x44,    /* KEY_F10 */
+    0x45, /* KEY_NumLock */ 0x46,       /* KEY_ScrollLock */
+    0x47, /* KEY_KP_7 */ 0x48,  /* KEY_KP_8 */
+    0x49, /* KEY_KP_9 */ 0x4a,  /* KEY_KP_Minus */
+    0x4b, /* KEY_KP_4 */ 0x4c,  /* KEY_KP_5 */
+    0x4d, /* KEY_KP_6 */ 0x4e,  /* KEY_KP_Plus */
+    0x4f, /* KEY_KP_1 */ 0x50,  /* KEY_KP_2 */
+    0x51, /* KEY_KP_3 */ 0x52,  /* KEY_KP_0 */
+    0x53, /* KEY_KP_Decimal */ 0x54,    /* KEY_SysReqest */
+    0x00, /* 0x55 */ 0x56,      /* KEY_Less */
+    0x57, /* KEY_F11 */ 0x58,   /* KEY_F12 */
+    0x66, /* KEY_Home */ 0x67,  /* KEY_Up */
+    0x68, /* KEY_PgUp */ 0x69,  /* KEY_Left */
+    0x5d, /* KEY_Begin */ 0x6a, /* KEY_Right */
+    0x6b, /* KEY_End */ 0x6c,   /* KEY_Down */
+    0x6d, /* KEY_PgDown */ 0x6e,        /* KEY_Insert */
+    0x6f, /* KEY_Delete */ 0x60,        /* KEY_KP_Enter */
+    0x61, /* KEY_RCtrl */ 0x77, /* KEY_Pause */
+    0x63, /* KEY_Print */ 0x62, /* KEY_KP_Divide */
+    0x64, /* KEY_AltLang */ 0x65,       /* KEY_Break */
+    0x00, /* KEY_LMeta */ 0x00, /* KEY_RMeta */
+    0x7A, /* KEY_Menu/FOCUS_PF11 */ 0x00,       /* 0x6e */
+    0x7B, /* FOCUS_PF12 */ 0x00,        /* 0x70 */
+    0x00, /* 0x71 */ 0x00,      /* 0x72 */
+    0x59, /* FOCUS_PF2 */ 0x78, /* FOCUS_PF9 */
+    0x00, /* 0x75 */ 0x00,      /* 0x76 */
+    0x5A, /* FOCUS_PF3 */ 0x5B, /* FOCUS_PF4 */
+    0x5C, /* FOCUS_PF5 */ 0x5D, /* FOCUS_PF6 */
+    0x5E, /* FOCUS_PF7 */ 0x5F, /* FOCUS_PF8 */
+    0x7C, /* JAP_86 */ 0x79,    /* FOCUS_PF10 */
+    0x00,                       /* 0x7f */
 };
 
 /** Create a private structure for use within this file. */
-pointer kbdLinuxCreatePrivate(DeviceIntPtr pKeyboard)
+pointer
+kbdLinuxCreatePrivate(DeviceIntPtr pKeyboard)
 {
     myPrivate *priv = calloc(1, sizeof(*priv));
-    priv->fd        = -1;
+
+    priv->fd = -1;
     priv->pKeyboard = pKeyboard;
     return priv;
 }
 
 /** Destroy a private structure. */
-void kbdLinuxDestroyPrivate(pointer priv)
+void
+kbdLinuxDestroyPrivate(pointer priv)
 {
     free(priv);
 }
@@ -387,36 +394,37 @@ void kbdLinuxDestroyPrivate(pointer priv)
  * if we ignore the volume and set the duration correctly, then we'll
  * get one parameter "wrong" -- but if we use the volume to scale the
  * duration, then we'll get both parameters "wrong"). */
-void kbdLinuxBell(DevicePtr pDev, int percent,
-                  int volume, int pitch, int duration)
+void
+kbdLinuxBell(DevicePtr pDev, int percent, int volume, int pitch, int duration)
 {
     GETPRIV;
 
     if (duration && pitch) {
-        ioctl(priv->fd,
-              KDMKTONE,
-              ((1193190 / pitch) & 0xffff) /* Low bits specify cycle time */
-              | (duration << 16)); /* High bits are duration in msec */
+        ioctl(priv->fd, KDMKTONE, ((1193190 / pitch) & 0xffff)  /* Low bits specify cycle time */
+              |(duration << 16));       /* High bits are duration in msec */
     }
 }
 
 /** Set the LEDs. */
-void kbdLinuxCtrl(DevicePtr pDev, KeybdCtrl *ctrl)
+void
+kbdLinuxCtrl(DevicePtr pDev, KeybdCtrl * ctrl)
 {
     GETPRIV;
 
     ioctl(priv->fd, KDSETLED, ctrl->leds & 0x07);
 }
 
-static int kbdLinuxGetFreeVTNumber(void)
+static int
+kbdLinuxGetFreeVTNumber(void)
 {
-    int        fd = -1;
-    int        vtno;
-    int        i;
+    int fd = -1;
+    int vtno;
+    int i;
     const char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL };
-    
+
     for (i = 0; tty0[i]; i++)
-        if ((fd = open(tty0[i], O_WRONLY, 0)) >= 0) break;
+        if ((fd = open(tty0[i], O_WRONLY, 0)) >= 0)
+            break;
     if (fd < 0)
         FATAL1("kbdLinuxGetFreeVTNumber: Cannot open tty0 (%s)\n",
                strerror(errno));
@@ -425,16 +433,18 @@ static int kbdLinuxGetFreeVTNumber(void)
     return vtno;
 }
 
-static int kbdLinuxOpenVT(int vtno)
+static int
+kbdLinuxOpenVT(int vtno)
 {
-    int        fd = -1;
-    int        i;
+    int fd = -1;
+    int i;
     const char *vcs[] = { "/dev/vc/", "/dev/tty", NULL };
-    char       name[64];        /* RATS: Only used in snprintf */
+    char name[64];              /* RATS: Only used in snprintf */
 
     for (i = 0; vcs[i]; i++) {
         snprintf(name, sizeof(name), "%s%d", vcs[i], vtno);
-        if ((fd = open(name, O_RDWR | O_NONBLOCK, 0)) >= 0) break;
+        if ((fd = open(name, O_RDWR | O_NONBLOCK, 0)) >= 0)
+            break;
     }
     if (fd < 0)
         FATAL2("kbdLinuxOpenVT: Cannot open VT %d (%s)\n",
@@ -442,23 +452,27 @@ static int kbdLinuxOpenVT(int vtno)
     return fd;
 }
 
-static int kbdLinuxGetCurrentVTNumber(int fd)
+static int
+kbdLinuxGetCurrentVTNumber(int fd)
 {
     struct vt_stat vts;
-    
-    if (!ioctl(fd, VT_GETSTATE, &vts)) return vts.v_active;
+
+    if (!ioctl(fd, VT_GETSTATE, &vts))
+        return vts.v_active;
     return -1;
 }
 
 static int kbdLinuxActivate(int fd, int vtno, int setSig);
 
 /** Currently unused hook called prior to an VT switch. */
-void kbdLinuxVTPreSwitch(pointer p)
+void
+kbdLinuxVTPreSwitch(pointer p)
 {
 }
 
 /** Currently unused hook called after returning from a VT switch. */
-void kbdLinuxVTPostSwitch(pointer p)
+void
+kbdLinuxVTPostSwitch(pointer p)
 {
 }
 
@@ -466,28 +480,31 @@ void kbdLinuxVTPostSwitch(pointer p)
  * function is called with the \a switch_return_data when the VT is
  * switched back to the pre-switch VT (i.e., the user returns to the DMX
  * session). */
-int kbdLinuxVTSwitch(pointer p, int vt,
-                     void (*switch_return)(pointer),
-                     pointer switch_return_data)
+int
+kbdLinuxVTSwitch(pointer p, int vt,
+                 void (*switch_return) (pointer), pointer switch_return_data)
 {
     myPrivate *priv = p;
 
-    if (priv->switched) FATAL0("kbdLinuxVTSwitch: already switched...\n");
-    if (priv->vtno == vt) return 0;
+    if (priv->switched)
+        FATAL0("kbdLinuxVTSwitch: already switched...\n");
+    if (priv->vtno == vt)
+        return 0;
 
-    PRIV                     = priv;
-    priv->switched           = 0; /* Will switch to 1 in handler */
-    priv->switch_return      = switch_return;
+    PRIV = priv;
+    priv->switched = 0;         /* Will switch to 1 in handler */
+    priv->switch_return = switch_return;
     priv->switch_return_data = switch_return_data;
     kbdLinuxActivate(priv->fd, vt, 0);
     return 1;
 }
 
 /* RATS: This function is only ever used to handle SIGUSR1. */
-static void kbdLinuxVTSignalHandler(int sig)
+static void
+kbdLinuxVTSignalHandler(int sig)
 {
     myPrivate *priv = PRIV;
-    
+
     signal(sig, kbdLinuxVTSignalHandler);
     if (priv) {
         ioctl(priv->fd, VT_RELDISP, VT_ACKACQ);
@@ -499,19 +516,23 @@ static void kbdLinuxVTSignalHandler(int sig)
     }
 }
 
-static int kbdLinuxActivate(int fd, int vtno, int setSig)
+static int
+kbdLinuxActivate(int fd, int vtno, int setSig)
 {
-    int            result;
+    int result;
     struct vt_mode VT;
 
     SYSCALL(result = ioctl(fd, VT_ACTIVATE, vtno));
-    if (result) FATAL0("kbdLinuxActivate: VT_ACTIVATE failed\n");
+    if (result)
+        FATAL0("kbdLinuxActivate: VT_ACTIVATE failed\n");
     SYSCALL(result = ioctl(fd, VT_WAITACTIVE, vtno));
-    if (result) FATAL0("kbdLinuxActivate: VT_WAITACTIVE failed\n");
+    if (result)
+        FATAL0("kbdLinuxActivate: VT_WAITACTIVE failed\n");
     if (setSig) {
         SYSCALL(result = ioctl(fd, VT_GETMODE, &VT));
-        if (result < 0) FATAL0("kbdLinuxActivate: VT_GETMODE failed\n");
-        VT.mode   = VT_PROCESS;
+        if (result < 0)
+            FATAL0("kbdLinuxActivate: VT_GETMODE failed\n");
+        VT.mode = VT_PROCESS;
         VT.relsig = SIGUSR1;
         VT.acqsig = SIGUSR1;
         if (ioctl(fd, VT_SETMODE, &VT))
@@ -521,86 +542,148 @@ static int kbdLinuxActivate(int fd, int vtno, int setSig)
     return Success;
 }
 
-static void kbdLinuxOpenConsole(DevicePtr pDev)
+static void
+kbdLinuxOpenConsole(DevicePtr pDev)
 {
     GETPRIV;
     const char *msg = MESSAGE;
 
-    if (priv->fd >= 0) return;
-    priv->vtno      = kbdLinuxGetFreeVTNumber();
-    priv->fd        = kbdLinuxOpenVT(priv->vtno);
+    if (priv->fd >= 0)
+        return;
+    priv->vtno = kbdLinuxGetFreeVTNumber();
+    priv->fd = kbdLinuxOpenVT(priv->vtno);
     priv->vtcurrent = kbdLinuxGetCurrentVTNumber(priv->fd);
     LOG2("kbdLinuxOpenConsole: current VT %d; using free VT %d\n",
          priv->vtcurrent, priv->vtno);
     kbdLinuxActivate(priv->fd, priv->vtno, 1);
-    ioctl(priv->fd, KDSETMODE, KD_GRAPHICS); /* To turn off gpm */
-    if (msg) write(priv->fd, msg, strlen(msg));
+    ioctl(priv->fd, KDSETMODE, KD_GRAPHICS);    /* To turn off gpm */
+    if (msg)
+        write(priv->fd, msg, strlen(msg));
 }
 
-static void kbdLinuxCloseConsole(DevicePtr pDev)
+static void
+kbdLinuxCloseConsole(DevicePtr pDev)
 {
     GETPRIV;
     struct vt_mode VT;
-    const char     *msg = FINALMESSAGE;
+    const char *msg = FINALMESSAGE;
 
-    if (priv->fd < 0) return;
+    if (priv->fd < 0)
+        return;
 
     ioctl(priv->fd, KDSETMODE, KD_TEXT);
-    if (msg) write(priv->fd, msg, strlen(msg));
+    if (msg)
+        write(priv->fd, msg, strlen(msg));
     if (ioctl(priv->fd, VT_GETMODE, &VT) != -1) {
         VT.mode = VT_AUTO;
         ioctl(priv->fd, VT_SETMODE, &VT);
     }
 
     LOG1("kbdLinuxCloseConsole: switching to VT %d\n", priv->vtcurrent);
-    if (priv->vtcurrent >= 0) kbdLinuxActivate(priv->fd, priv->vtcurrent, 0);
-    
+    if (priv->vtcurrent >= 0)
+        kbdLinuxActivate(priv->fd, priv->vtcurrent, 0);
+
     close(priv->fd);
     priv->fd = -1;
 }
 
 /** Initialize the \a pDev as a Linux keyboard. */
-void kbdLinuxInit(DevicePtr pDev)
+void
+kbdLinuxInit(DevicePtr pDev)
 {
     GETPRIV;
 
-    if (priv->fd <= 0) kbdLinuxOpenConsole(pDev);
-    
+    if (priv->fd <= 0)
+        kbdLinuxOpenConsole(pDev);
+
     ioctl(priv->fd, KDGKBMODE, &priv->kbdtrans);
     if (tcgetattr(priv->fd, &priv->kbdtty) < 0)
         FATAL1("kbdLinuxInit: tcgetattr failed (%s)\n", strerror(errno));
 }
 
-static int kbdLinuxPrefix0Mapping(unsigned char *scanCode)
+static int
+kbdLinuxPrefix0Mapping(unsigned char *scanCode)
 {
-                                /* Table from xfree86/common/xf86Events.c */
+    /* Table from xfree86/common/xf86Events.c */
     switch (*scanCode) {
-    case KEY_KP_7:        *scanCode = KEY_Home;      break; /* curs home */
-    case KEY_KP_8:        *scanCode = KEY_Up;        break; /* curs up */
-    case KEY_KP_9:        *scanCode = KEY_PgUp;      break; /* curs pgup */
-    case KEY_KP_4:        *scanCode = KEY_Left;      break; /* curs left */
-    case KEY_KP_5:        *scanCode = KEY_Begin;     break; /* curs begin */
-    case KEY_KP_6:        *scanCode = KEY_Right;     break; /* curs right */
-    case KEY_KP_1:        *scanCode = KEY_End;       break; /* curs end */
-    case KEY_KP_2:        *scanCode = KEY_Down;      break; /* curs down */
-    case KEY_KP_3:        *scanCode = KEY_PgDown;    break; /* curs pgdown */
-    case KEY_KP_0:        *scanCode = KEY_Insert;    break; /* curs insert */
-    case KEY_KP_Decimal:  *scanCode = KEY_Delete;    break; /* curs delete */
-    case KEY_Enter:       *scanCode = KEY_KP_Enter;  break; /* keypad enter */
-    case KEY_LCtrl:       *scanCode = KEY_RCtrl;     break; /* right ctrl */
-    case KEY_KP_Multiply: *scanCode = KEY_Print;     break; /* print */
-    case KEY_Slash:       *scanCode = KEY_KP_Divide; break; /* keyp divide */
-    case KEY_Alt:         *scanCode = KEY_AltLang;   break; /* right alt */
-    case KEY_ScrollLock:  *scanCode = KEY_Break;     break; /* curs break */
-    case 0x5b:            *scanCode = KEY_LMeta;     break;
-    case 0x5c:            *scanCode = KEY_RMeta;     break;
-    case 0x5d:            *scanCode = KEY_Menu;      break;
-    case KEY_F3:          *scanCode = KEY_F13;       break;
-    case KEY_F4:          *scanCode = KEY_F14;       break;
-    case KEY_F5:          *scanCode = KEY_F15;       break;
-    case KEY_F6:          *scanCode = KEY_F16;       break;
-    case KEY_F7:          *scanCode = KEY_F17;       break;
-    case KEY_KP_Plus:     *scanCode = KEY_KP_DEC;    break;
+    case KEY_KP_7:
+        *scanCode = KEY_Home;
+        break;                  /* curs home */
+    case KEY_KP_8:
+        *scanCode = KEY_Up;
+        break;                  /* curs up */
+    case KEY_KP_9:
+        *scanCode = KEY_PgUp;
+        break;                  /* curs pgup */
+    case KEY_KP_4:
+        *scanCode = KEY_Left;
+        break;                  /* curs left */
+    case KEY_KP_5:
+        *scanCode = KEY_Begin;
+        break;                  /* curs begin */
+    case KEY_KP_6:
+        *scanCode = KEY_Right;
+        break;                  /* curs right */
+    case KEY_KP_1:
+        *scanCode = KEY_End;
+        break;                  /* curs end */
+    case KEY_KP_2:
+        *scanCode = KEY_Down;
+        break;                  /* curs down */
+    case KEY_KP_3:
+        *scanCode = KEY_PgDown;
+        break;                  /* curs pgdown */
+    case KEY_KP_0:
+        *scanCode = KEY_Insert;
+        break;                  /* curs insert */
+    case KEY_KP_Decimal:
+        *scanCode = KEY_Delete;
+        break;                  /* curs delete */
+    case KEY_Enter:
+        *scanCode = KEY_KP_Enter;
+        break;                  /* keypad enter */
+    case KEY_LCtrl:
+        *scanCode = KEY_RCtrl;
+        break;                  /* right ctrl */
+    case KEY_KP_Multiply:
+        *scanCode = KEY_Print;
+        break;                  /* print */
+    case KEY_Slash:
+        *scanCode = KEY_KP_Divide;
+        break;                  /* keyp divide */
+    case KEY_Alt:
+        *scanCode = KEY_AltLang;
+        break;                  /* right alt */
+    case KEY_ScrollLock:
+        *scanCode = KEY_Break;
+        break;                  /* curs break */
+    case 0x5b:
+        *scanCode = KEY_LMeta;
+        break;
+    case 0x5c:
+        *scanCode = KEY_RMeta;
+        break;
+    case 0x5d:
+        *scanCode = KEY_Menu;
+        break;
+    case KEY_F3:
+        *scanCode = KEY_F13;
+        break;
+    case KEY_F4:
+        *scanCode = KEY_F14;
+        break;
+    case KEY_F5:
+        *scanCode = KEY_F15;
+        break;
+    case KEY_F6:
+        *scanCode = KEY_F16;
+        break;
+    case KEY_F7:
+        *scanCode = KEY_F17;
+        break;
+    case KEY_KP_Plus:
+        *scanCode = KEY_KP_DEC;
+        break;
         /*
          * Ignore virtual shifts (E0 2A, E0 AA, E0 36, E0 B6)
          */
@@ -618,12 +701,13 @@ static int kbdLinuxPrefix0Mapping(unsigned char *scanCode)
     return 0;
 }
 
-static int kbdLinuxPrefixMapping(myPrivate *priv, unsigned char *scanCode)
+static int
+kbdLinuxPrefixMapping(myPrivate * priv, unsigned char *scanCode)
 {
-    int           pressed = *scanCode & 0x80;
-    unsigned char code    = *scanCode & 0x7f;
+    int pressed = *scanCode & 0x80;
+    unsigned char code = *scanCode & 0x7f;
 
-                                /* If we don't have a prefix, check for one */
+    /* If we don't have a prefix, check for one */
     if (!priv->prefix) {
         switch (code) {
         case KEY_Prefix0:
@@ -634,43 +718,45 @@ static int kbdLinuxPrefixMapping(myPrivate *priv, unsigned char *scanCode)
         return 0;               /* No change */
     }
 
-                                /* We have a prefix from the last scanCode */
+    /* We have a prefix from the last scanCode */
     switch (priv->prefix) {
     case KEY_Prefix0:
         priv->prefix = 0;
-        if (kbdLinuxPrefix0Mapping(&code)) return 1; /* Skip sequence */
+        if (kbdLinuxPrefix0Mapping(&code))
+            return 1;           /* Skip sequence */
         break;
     case KEY_Prefix1:
         priv->prefix = (code = KEY_LCtrl) ? KEY_LCtrl : 0;
-        return 1;                                       /* Use new prefix */
+        return 1;               /* Use new prefix */
     case KEY_LCtrl:
         priv->prefix = 0;
-        if (code != KEY_NumLock) return 1;              /* Skip sequence*/
+        if (code != KEY_NumLock)
+            return 1;           /* Skip sequence */
         code = KEY_Pause;
         break;
     }
 
     *scanCode = code | (pressed ? 0x80 : 0x00);
-    return 0;                                           /* Use old scanCode */
+    return 0;                   /* Use old scanCode */
 }
 
-static void kbdLinuxConvert(DevicePtr pDev,
-                            unsigned char scanCode,
-                            ENQUEUEPROC enqueue,
-                            CHECKPROC checkspecial,
-                            BLOCK block)
+static void
+kbdLinuxConvert(DevicePtr pDev,
+                unsigned char scanCode,
+                ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
 {
     GETPRIV;
-    XkbSrvInfoPtr  xkbi = priv->pKeyboard->key->xkbInfo;
-    int            type;
-    KeySym         keySym   = NoSymbol;
-    int            keyCode;
-    int            switching;
+    XkbSrvInfoPtr xkbi = priv->pKeyboard->key->xkbInfo;
+    int type;
+    KeySym keySym = NoSymbol;
+    int keyCode;
+    int switching;
 
     /* Do special PC/AT prefix mapping -- may change scanCode! */
-    if (kbdLinuxPrefixMapping(priv, &scanCode)) return;
+    if (kbdLinuxPrefixMapping(priv, &scanCode))
+        return;
 
-    type    = (scanCode & 0x80) ? KeyRelease : KeyPress;
+    type = (scanCode & 0x80) ? KeyRelease : KeyPress;
     keyCode = (scanCode & 0x7f) + MIN_KEYCODE;
 
     /* Handle repeats */
@@ -681,6 +767,7 @@ static void kbdLinuxConvert(DevicePtr pDev,
         int effectiveGroup = XkbGetEffectiveGroup(xkbi,
                                                   &xkbi->state,
                                                   scanCode);
+
         keySym = XkbKeySym(xkbi->desc, scanCode, effectiveGroup);
 #if 0
         switch (keySym) {
@@ -689,9 +776,12 @@ static void kbdLinuxConvert(DevicePtr pDev,
         case XK_Shift_Lock:
         case XK_Caps_Lock:
             /* Ignore releases and all but first press */
-            if (kbdLinuxModIgnore(priv, &xE, keySym)) return;
-            if (kbdLinuxKeyDown(priv, &xE)) xE.u.u.type = KeyRelease;
-            else                            xE.u.u.type = KeyPress;
+            if (kbdLinuxModIgnore(priv, &xE, keySym))
+                return;
+            if (kbdLinuxKeyDown(priv, &xE))
+                xE.u.u.type = KeyRelease;
+            else
+                xE.u.u.type = KeyPress;
             break;
         }
 #endif
@@ -703,17 +793,18 @@ static void kbdLinuxConvert(DevicePtr pDev,
             /* No auto-repeat? */
             if ((feed && !feed->ctrl.autoRepeat)
                 || priv->pKeyboard->key->xkbInfo->desc->map->modmap[keyCode]
-                || (feed
-                    && !(feed->ctrl.autoRepeats[keyCode >> 3]
-                         & (1 << (keyCode & 7))))) return; /* Ignore */
-            
+                || (feed && !(feed->ctrl.autoRepeats[keyCode >> 3]
+                              & (1 << (keyCode & 7)))))
+                return;         /* Ignore */
+
             /* Do auto-repeat */
             enqueue(pDev, KeyRelease, keyCode, keySym, NULL, block);
             type = KeyPress;
         }
-        
+
         /* If key is already up, ignore */
-        if (type == KeyRelease && !kbdLinuxKeyDown(priv, keyCode)) return;
+        if (type == KeyRelease && !kbdLinuxKeyDown(priv, keyCode))
+            return;
     }
 
     switching = 0;
@@ -722,7 +813,7 @@ static void kbdLinuxConvert(DevicePtr pDev,
     if (!switching) {
         if (enqueue)
             enqueue(pDev, type, keyCode, keySym, NULL, block);
-        kbdLinuxKeyState(priv, type, keyCode); /* Update our state bitmap */
+        kbdLinuxKeyState(priv, type, keyCode);  /* Update our state bitmap */
     }
 }
 
@@ -732,16 +823,15 @@ static void kbdLinuxConvert(DevicePtr pDev,
  * with the \a enqueue function.  The \a block type is passed to the
  * functions so that they may block SIGIO handling as appropriate to the
  * caller of this function. */
-void kbdLinuxRead(DevicePtr pDev,
-                  MOTIONPROC motion,
-                  ENQUEUEPROC enqueue,
-                  CHECKPROC checkspecial,
-                  BLOCK block)
+void
+kbdLinuxRead(DevicePtr pDev,
+             MOTIONPROC motion,
+             ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
 {
     GETPRIV;
     unsigned char buf[256];     /* RATS: Only used in length-limited call */
     unsigned char *pt;
-    int           n;
+    int n;
 
     while ((n = read(priv->fd, buf, sizeof(buf))) > 0)
         for (pt = buf; n; --n, ++pt)
@@ -749,20 +839,21 @@ void kbdLinuxRead(DevicePtr pDev,
 }
 
 /** Turn \a pDev on (i.e., take input from \a pDev). */
-int kbdLinuxOn(DevicePtr pDev)
+int
+kbdLinuxOn(DevicePtr pDev)
 {
     GETPRIV;
     struct termios nTty;
 
     ioctl(priv->fd, KDSKBMODE, K_RAW);
 
-    nTty             = priv->kbdtty;
-    nTty.c_iflag     = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP);
-    nTty.c_oflag     = 0;
-    nTty.c_cflag     = CREAD | CS8;
-    nTty.c_lflag     = 0;
+    nTty = priv->kbdtty;
+    nTty.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP);
+    nTty.c_oflag = 0;
+    nTty.c_cflag = CREAD | CS8;
+    nTty.c_lflag = 0;
     nTty.c_cc[VTIME] = 0;
-    nTty.c_cc[VMIN]  = 1;
+    nTty.c_cc[VMIN] = 1;
     cfsetispeed(&nTty, B9600);
     cfsetospeed(&nTty, B9600);
     if (tcsetattr(priv->fd, TCSANOW, &nTty) < 0)
@@ -771,7 +862,8 @@ int kbdLinuxOn(DevicePtr pDev)
 }
 
 /** Turn \a pDev off (i.e., stop taking input from \a pDev). */
-void kbdLinuxOff(DevicePtr pDev)
+void
+kbdLinuxOff(DevicePtr pDev)
 {
     GETPRIV;
 
@@ -780,165 +872,261 @@ void kbdLinuxOff(DevicePtr pDev)
     kbdLinuxCloseConsole(pDev);
 }
 
-
-static void kbdLinuxReadKernelMapping(int fd, KeySymsPtr pKeySyms)
+static void
+kbdLinuxReadKernelMapping(int fd, KeySymsPtr pKeySyms)
 {
-    KeySym        *k;
-    int           i;
-    int           maxkey;
-    static unsigned char tbl[GLYPHS_PER_KEY] = { /* RATS: Use ok */
-        0,	/* unshifted */
-        1,	/* shifted */
-        0,	/* modeswitch unshifted */
-        0	/* modeswitch shifted */
+    KeySym *k;
+    int i;
+    int maxkey;
+
+    static unsigned char tbl[GLYPHS_PER_KEY] = {        /* RATS: Use ok */
+        0,                      /* unshifted */
+        1,                      /* shifted */
+        0,                      /* modeswitch unshifted */
+        0                       /* modeswitch shifted */
     };
 
-  /*
-   * Read the mapping from the kernel.
-   * Since we're still using the XFree86 scancode->AT keycode mapping
-   * routines, we need to convert the AT keycodes to Linux keycodes,
-   * then translate the Linux keysyms into X keysyms.
-   *
-   * First, figure out which tables to use for the modeswitch columns
-   * above, from the XF86Config fields.
-   */
-  tbl[2] = 8;	/* alt */
-  tbl[3] = tbl[2] | 1;
-
-#if 00/*BP*/
-  k = map+GLYPHS_PER_KEY;
+    /*
+     * Read the mapping from the kernel.
+     * Since we're still using the XFree86 scancode->AT keycode mapping
+     * routines, we need to convert the AT keycodes to Linux keycodes,
+     * then translate the Linux keysyms into X keysyms.
+     *
+     * First, figure out which tables to use for the modeswitch columns
+     * above, from the XF86Config fields.
+     */
+    tbl[2] = 8;                 /* alt */
+    tbl[3] = tbl[2] | 1;
+
+#if 00 /*BP*/
+        k = map + GLYPHS_PER_KEY;
 #else
-  ErrorF("kbdLinuxReadKernelMapping() is broken/no-op'd\n");
-  return;
+    ErrorF("kbdLinuxReadKernelMapping() is broken/no-op'd\n");
+    return;
 #endif
-  maxkey = NUM_AT2LNX;
-
-  for (i = 0; i < maxkey; ++i) {
-      struct kbentry kbe;
-      int j;
-
-      kbe.kb_index = at2lnx[i];
-
-      for (j = 0; j < GLYPHS_PER_KEY; ++j, ++k) {
-          unsigned short kval;
-
-          *k = NoSymbol;
-
-          kbe.kb_table = tbl[j];
-          if (kbe.kb_index == 0 || ioctl(fd, KDGKBENT, &kbe)) continue;
-
-          kval = KVAL(kbe.kb_value);
-          switch (KTYP(kbe.kb_value)) {
-          case KT_LATIN:
-          case KT_LETTER: *k = linux_to_x[kval]; break;
-          case KT_FN:
-              if (kval <= 19) *k = XK_F1 + kval;
-              else switch (kbe.kb_value) {
-              case K_FIND:       *k = XK_Home; /* or XK_Find */      break;
-              case K_INSERT:     *k = XK_Insert;                     break;
-              case K_REMOVE:     *k = XK_Delete;                     break;
-              case K_SELECT:     *k = XK_End; /* or XK_Select */     break;
-              case K_PGUP:       *k = XK_Prior;                      break;
-              case K_PGDN:       *k = XK_Next;                       break;
-              case K_HELP:       *k = XK_Help;                       break;
-              case K_DO:         *k = XK_Execute;                    break;
-              case K_PAUSE:      *k = XK_Pause;                      break;
-              case K_MACRO:      *k = XK_Menu;                       break;
-              default:                                               break;
-              }
-              break;
-          case KT_SPEC:
-              switch (kbe.kb_value) {
-              case K_ENTER:      *k = XK_Return;                     break;
-              case K_BREAK:      *k = XK_Break;                      break;
-              case K_CAPS:       *k = XK_Caps_Lock;                  break;
-              case K_NUM:        *k = XK_Num_Lock;                   break;
-              case K_HOLD:       *k = XK_Scroll_Lock;                break;
-              case K_COMPOSE:    *k = XK_Multi_key;                  break;
-              default:                                               break;
-              }
-              break;
-          case KT_PAD:
-              switch (kbe.kb_value) {
-              case K_PPLUS:      *k = XK_KP_Add;                     break;
-              case K_PMINUS:     *k = XK_KP_Subtract;                break;
-              case K_PSTAR:      *k = XK_KP_Multiply;                break;
-              case K_PSLASH:     *k = XK_KP_Divide;                  break;
-              case K_PENTER:     *k = XK_KP_Enter;                   break;
-              case K_PCOMMA:     *k = XK_KP_Separator;               break;
-              case K_PDOT:       *k = XK_KP_Decimal;                 break;
-              case K_PPLUSMINUS: *k = XK_KP_Subtract;                break;
-              default:           if (kval <= 9) *k = XK_KP_0 + kval; break;
-              }
-              break;
-          case KT_DEAD:
-              /* KT_DEAD keys are for accelerated diacritical creation. */
-              switch (kbe.kb_value) {
-              case K_DGRAVE:     *k = XK_dead_grave;                 break;
-              case K_DACUTE:     *k = XK_dead_acute;                 break;
-              case K_DCIRCM:     *k = XK_dead_circumflex;            break;
-              case K_DTILDE:     *k = XK_dead_tilde;                 break;
-              case K_DDIERE:     *k = XK_dead_diaeresis;             break;
-              }
-              break;
-          case KT_CUR:
-              switch (kbe.kb_value) {
-              case K_DOWN:       *k = XK_Down;                       break;
-              case K_LEFT:       *k = XK_Left;                       break;
-              case K_RIGHT:      *k = XK_Right;                      break;
-              case K_UP:         *k = XK_Up;                         break;
-              }
-              break;
-          case KT_SHIFT:
-              switch (kbe.kb_value) {
-              case K_ALTGR:      *k = XK_Alt_R;                       break;
-              case K_ALT:
-                  *k = (kbe.kb_index == 0x64 ? XK_Alt_R : XK_Alt_L);
-                  break;
-              case K_CTRL:
-                  *k = (kbe.kb_index == 0x61 ? XK_Control_R : XK_Control_L);
-                  break;
-              case K_CTRLL:      *k = XK_Control_L;                   break;
-              case K_CTRLR:      *k = XK_Control_R;                   break;
-              case K_SHIFT:
-                  *k = (kbe.kb_index == 0x36 ? XK_Shift_R : XK_Shift_L);
-                  break;
-              case K_SHIFTL:     *k = XK_Shift_L;                     break;
-              case K_SHIFTR:     *k = XK_Shift_R;                     break;
-              default:                                                break;
-              }
-              break;
-          case KT_ASCII:
-              /* KT_ASCII keys accumulate a 3 digit decimal number that
-               * gets emitted when the shift state changes. We can't
-               * emulate that.
-               */
-              break;
-          case KT_LOCK:
-              if (kbe.kb_value == K_SHIFTLOCK) *k = XK_Shift_Lock;
-              break;
-          default:                                                    break;
-          }
-      }
-      
-      if (k[-1] == k[-2])                   k[-1] = NoSymbol;
-      if (k[-2] == k[-3])                   k[-2] = NoSymbol;
-      if (k[-3] == k[-4])                   k[-3] = NoSymbol;
-      if (k[-4] == k[-2] && k[-3] == k[-1]) k[-2] = k[-1] = NoSymbol;
-      if (k[-1] == k[-4] && k[-2] == k[-3]
-          && k[-2] == NoSymbol)             k[-1] = NoSymbol;
-  }
+    maxkey = NUM_AT2LNX;
+
+    for (i = 0; i < maxkey; ++i) {
+        struct kbentry kbe;
+        int j;
+
+        kbe.kb_index = at2lnx[i];
+
+        for (j = 0; j < GLYPHS_PER_KEY; ++j, ++k) {
+            unsigned short kval;
+
+            *k = NoSymbol;
+
+            kbe.kb_table = tbl[j];
+            if (kbe.kb_index == 0 || ioctl(fd, KDGKBENT, &kbe))
+                continue;
+
+            kval = KVAL(kbe.kb_value);
+            switch (KTYP(kbe.kb_value)) {
+            case KT_LATIN:
+            case KT_LETTER:
+                *k = linux_to_x[kval];
+                break;
+            case KT_FN:
+                if (kval <= 19)
+                    *k = XK_F1 + kval;
+                else
+                    switch (kbe.kb_value) {
+                    case K_FIND:
+                        *k = XK_Home;   /* or XK_Find */
+                        break;
+                    case K_INSERT:
+                        *k = XK_Insert;
+                        break;
+                    case K_REMOVE:
+                        *k = XK_Delete;
+                        break;
+                    case K_SELECT:
+                        *k = XK_End;    /* or XK_Select */
+                        break;
+                    case K_PGUP:
+                        *k = XK_Prior;
+                        break;
+                    case K_PGDN:
+                        *k = XK_Next;
+                        break;
+                    case K_HELP:
+                        *k = XK_Help;
+                        break;
+                    case K_DO:
+                        *k = XK_Execute;
+                        break;
+                    case K_PAUSE:
+                        *k = XK_Pause;
+                        break;
+                    case K_MACRO:
+                        *k = XK_Menu;
+                        break;
+                    default:
+                        break;
+                    }
+                break;
+            case KT_SPEC:
+                switch (kbe.kb_value) {
+                case K_ENTER:
+                    *k = XK_Return;
+                    break;
+                case K_BREAK:
+                    *k = XK_Break;
+                    break;
+                case K_CAPS:
+                    *k = XK_Caps_Lock;
+                    break;
+                case K_NUM:
+                    *k = XK_Num_Lock;
+                    break;
+                case K_HOLD:
+                    *k = XK_Scroll_Lock;
+                    break;
+                case K_COMPOSE:
+                    *k = XK_Multi_key;
+                    break;
+                default:
+                    break;
+                }
+                break;
+            case KT_PAD:
+                switch (kbe.kb_value) {
+                case K_PPLUS:
+                    *k = XK_KP_Add;
+                    break;
+                case K_PMINUS:
+                    *k = XK_KP_Subtract;
+                    break;
+                case K_PSTAR:
+                    *k = XK_KP_Multiply;
+                    break;
+                case K_PSLASH:
+                    *k = XK_KP_Divide;
+                    break;
+                case K_PENTER:
+                    *k = XK_KP_Enter;
+                    break;
+                case K_PCOMMA:
+                    *k = XK_KP_Separator;
+                    break;
+                case K_PDOT:
+                    *k = XK_KP_Decimal;
+                    break;
+                case K_PPLUSMINUS:
+                    *k = XK_KP_Subtract;
+                    break;
+                default:
+                    if (kval <= 9)
+                        *k = XK_KP_0 + kval;
+                    break;
+                }
+                break;
+            case KT_DEAD:
+                /* KT_DEAD keys are for accelerated diacritical creation. */
+                switch (kbe.kb_value) {
+                case K_DGRAVE:
+                    *k = XK_dead_grave;
+                    break;
+                case K_DACUTE:
+                    *k = XK_dead_acute;
+                    break;
+                case K_DCIRCM:
+                    *k = XK_dead_circumflex;
+                    break;
+                case K_DTILDE:
+                    *k = XK_dead_tilde;
+                    break;
+                case K_DDIERE:
+                    *k = XK_dead_diaeresis;
+                    break;
+                }
+                break;
+            case KT_CUR:
+                switch (kbe.kb_value) {
+                case K_DOWN:
+                    *k = XK_Down;
+                    break;
+                case K_LEFT:
+                    *k = XK_Left;
+                    break;
+                case K_RIGHT:
+                    *k = XK_Right;
+                    break;
+                case K_UP:
+                    *k = XK_Up;
+                    break;
+                }
+                break;
+            case KT_SHIFT:
+                switch (kbe.kb_value) {
+                case K_ALTGR:
+                    *k = XK_Alt_R;
+                    break;
+                case K_ALT:
+                    *k = (kbe.kb_index == 0x64 ? XK_Alt_R : XK_Alt_L);
+                    break;
+                case K_CTRL:
+                    *k = (kbe.kb_index == 0x61 ? XK_Control_R : XK_Control_L);
+                    break;
+                case K_CTRLL:
+                    *k = XK_Control_L;
+                    break;
+                case K_CTRLR:
+                    *k = XK_Control_R;
+                    break;
+                case K_SHIFT:
+                    *k = (kbe.kb_index == 0x36 ? XK_Shift_R : XK_Shift_L);
+                    break;
+                case K_SHIFTL:
+                    *k = XK_Shift_L;
+                    break;
+                case K_SHIFTR:
+                    *k = XK_Shift_R;
+                    break;
+                default:
+                    break;
+                }
+                break;
+            case KT_ASCII:
+                /* KT_ASCII keys accumulate a 3 digit decimal number that
+                 * gets emitted when the shift state changes. We can't
+                 * emulate that.
+                 */
+                break;
+            case KT_LOCK:
+                if (kbe.kb_value == K_SHIFTLOCK)
+                    *k = XK_Shift_Lock;
+                break;
+            default:
+                break;
+            }
+        }
+
+        if (k[-1] == k[-2])
+            k[-1] = NoSymbol;
+        if (k[-2] == k[-3])
+            k[-2] = NoSymbol;
+        if (k[-3] == k[-4])
+            k[-3] = NoSymbol;
+        if (k[-4] == k[-2] && k[-3] == k[-1])
+            k[-2] = k[-1] = NoSymbol;
+        if (k[-1] == k[-4] && k[-2] == k[-3]
+            && k[-2] == NoSymbol)
+            k[-1] = NoSymbol;
+    }
 }
 
-static void kbdLinuxGetMap(DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)
+static void
+kbdLinuxGetMap(DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)
 {
     GETPRIV;
-    KeySym        *k, *mapCopy;
-    char          type;
-    int           i;
+    KeySym *k, *mapCopy;
+    char type;
+    int i;
 
-#if 00/*BP*/
-    mapCopy = malloc(sizeof(map));
+#if 00 /*BP*/
+        mapCopy = malloc(sizeof(map));
     memcpy(mapCopy, map, sizeof(map));
 #else
     ErrorF("kbdLinuxGetMap() is broken/no-op'd\n");
@@ -950,41 +1138,57 @@ static void kbdLinuxGetMap(DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)
     /* compute the modifier map */
     for (i = 0; i < MAP_LENGTH; i++)
         pModMap[i] = NoSymbol;  /* make sure it is restored */
-  
+
     for (k = mapCopy, i = MIN_KEYCODE;
-         i < NUM_KEYCODES + MIN_KEYCODE;
-         i++, k += 4) {
-        switch(*k) {
+         i < NUM_KEYCODES + MIN_KEYCODE; i++, k += 4) {
+        switch (*k) {
         case XK_Shift_L:
-        case XK_Shift_R:     pModMap[i] = ShiftMask;      break;
+        case XK_Shift_R:
+            pModMap[i] = ShiftMask;
+            break;
         case XK_Control_L:
-        case XK_Control_R:   pModMap[i] = ControlMask;    break;
-        case XK_Caps_Lock:   pModMap[i] = LockMask;       break;
+        case XK_Control_R:
+            pModMap[i] = ControlMask;
+            break;
+        case XK_Caps_Lock:
+            pModMap[i] = LockMask;
+            break;
         case XK_Alt_L:
-        case XK_Alt_R:       pModMap[i] = AltMask;        break;
-        case XK_Num_Lock:    pModMap[i] = NumLockMask;    break;
-        case XK_Scroll_Lock: pModMap[i] = ScrollLockMask; break;
+        case XK_Alt_R:
+            pModMap[i] = AltMask;
+            break;
+        case XK_Num_Lock:
+            pModMap[i] = NumLockMask;
+            break;
+        case XK_Scroll_Lock:
+            pModMap[i] = ScrollLockMask;
+            break;
         case XK_Kana_Lock:
-        case XK_Kana_Shift:  pModMap[i] = KanaMask;       break;
-        case XK_Mode_switch: pModMap[i] = AltLangMask;    break;
+        case XK_Kana_Shift:
+            pModMap[i] = KanaMask;
+            break;
+        case XK_Mode_switch:
+            pModMap[i] = AltLangMask;
+            break;
         }
     }
 
     priv->kbdType = (ioctl(priv->fd, KDGKBTYPE, &type) < 0) ? KB_101 : type;
 
-    pKeySyms->map        = mapCopy; /* Must be XFree'able */
-    pKeySyms->mapWidth   = GLYPHS_PER_KEY;
+    pKeySyms->map = mapCopy;    /* Must be XFree'able */
+    pKeySyms->mapWidth = GLYPHS_PER_KEY;
     pKeySyms->minKeyCode = MIN_KEYCODE;
     pKeySyms->maxKeyCode = MAX_KEYCODE;
 }
 
 /** Fill the \a info structure with information needed to initialize \a
- * pDev. */ 
-void kbdLinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+ * pDev. */
+void
+kbdLinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
 {
-    info->keyboard         = 1;
-    info->keyClass         = 1;
+    info->keyboard = 1;
+    info->keyClass = 1;
     kbdLinuxGetMap(pDev, &info->keySyms, info->modMap);
-    info->focusClass       = 1;
+    info->focusClass = 1;
     info->kbdFeedbackClass = 1;
 }
diff --git a/xorg-server/hw/dmx/input/lnx-ms.c b/xorg-server/hw/dmx/input/lnx-ms.c
index e6d203c4b..7e1acf450 100644
--- a/xorg-server/hw/dmx/input/lnx-ms.c
+++ b/xorg-server/hw/dmx/input/lnx-ms.c
@@ -1,321 +1,348 @@
-/* Portions of this file were derived from the following files:

- *

- **********************************************************************

- *

- * Xserver/hw/kdrive/linux/ms.c

- *

- * Copyright (c) 2001 by Juliusz Chroboczek

- * Copyright (c) 1999 by Keith Packard

- *

- * 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 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 2001-2003 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- *

- * This code implements a low-level device driver for a serial MS mouse.

- * The code is derived from code by Juliusz Chroboczek and Keith Packard

- * (see the source code for complete references). */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "inputstr.h"

-#include <X11/Xos.h>

-#include <errno.h>

-#include <termios.h>

-

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

-/* Define some macros to make it easier to move this file to another

- * part of the Xserver tree.  All calls to the dmx* layer are #defined

- * here for the .c file.  The .h file will also have to be edited. */

-#include "dmxinputinit.h"

-#include "lnx-ms.h"

-

-#define GETPRIV       myPrivate *priv                            \

-                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private

-

-#define LOG0(f)       dmxLog(dmxDebug,f)

-#define LOG1(f,a)     dmxLog(dmxDebug,f,a)

-#define LOG2(f,a,b)   dmxLog(dmxDebug,f,a,b)

-#define LOG3(f,a,b,c) dmxLog(dmxDebug,f,a,b,c)

-#define FATAL0(f)     dmxLog(dmxFatal,f)

-#define FATAL1(f,a)   dmxLog(dmxFatal,f,a)

-#define FATAL2(f,a,b) dmxLog(dmxFatal,f,a,b)

-#define MOTIONPROC    dmxMotionProcPtr

-#define ENQUEUEPROC   dmxEnqueueProcPtr

-#define CHECKPROC     dmxCheckSpecialProcPtr

-#define BLOCK         DMXBlockType

-

-/* End of interface definitions. */

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

-

-/* Private area for MS mouse devices. */

-typedef struct _myPrivate {

-    DeviceIntPtr   pMouse;

-    int            fd;

-    struct termios tty;

-    enum {

-        button1 = 0x0001,

-        button2 = 0x0002,

-        button3 = 0x0004,

-        button4 = 0x0008,

-        button5 = 0x0010

-    }              buttons;

-} myPrivate;

-

-static int msLinuxReadBytes(int fd, unsigned char *buf, int len, int min)

-{

-    int		    n, tot;

-    fd_set	    set;

-    struct timeval  tv;

-    

-    tot = 0;

-    while (len) {

-        n = read(fd, buf, len);

-        if (n > 0) {

-            tot += n;

-	    buf += n;

-	    len -= n;

-	}

-	if (tot % min == 0) break;

-	FD_ZERO(&set);

-	FD_SET(fd, &set);

-	tv.tv_sec = 0;

-	tv.tv_usec = 100 * 1000;

-	n = select(fd + 1, &set, 0, 0, &tv);

-	if (n <= 0) break;

-    }

-    return tot;

-}

-

-static void msLinuxButton(DevicePtr pDev, ENQUEUEPROC enqueue, int buttons,

-                          BLOCK block)

-{

-    GETPRIV;

-

-#define PRESS(b)                                         \

-    do {                                                 \

-        enqueue(pDev, ButtonPress, 0, 0, NULL, block);   \

-    } while (0)

-

-#define RELEASE(b)                                       \

-    do {                                                 \

-        enqueue(pDev, ButtonRelease, 0, 0, NULL, block); \

-    } while (0)

-          

-    if ((buttons & button1) && !(priv->buttons & button1)) PRESS(1);

-    if (!(buttons & button1) && (priv->buttons & button1)) RELEASE(1);

-

-    if ((buttons & button2) && !(priv->buttons & button2)) PRESS(2);

-    if (!(buttons & button2) && (priv->buttons & button2)) RELEASE(2);

-

-    if ((buttons & button3) && !(priv->buttons & button3)) PRESS(3);

-    if (!(buttons & button3) && (priv->buttons & button3)) RELEASE(3);

-

-    if ((buttons & button4) && !(priv->buttons & button4)) PRESS(4);

-    if (!(buttons & button4) && (priv->buttons & button4)) RELEASE(4);

-    

-    if ((buttons & button5) && !(priv->buttons & button5)) PRESS(5);

-    if (!(buttons & button5) && (priv->buttons & button5)) RELEASE(5);

-

-    priv->buttons = buttons;

-}

-

-/** Read an event from the \a pDev device.  If the event is a motion

- * event, enqueue it with the \a motion function.  Otherwise, check for

- * special keys with the \a checkspecial function and enqueue the event

- * with the \a enqueue function.  The \a block type is passed to the

- * functions so that they may block SIGIO handling as appropriate to the

- * caller of this function. */

-void msLinuxRead(DevicePtr pDev,

-                 MOTIONPROC motion,

-                 ENQUEUEPROC enqueue,

-                 CHECKPROC checkspecial,

-                 BLOCK block)

-{

-    GETPRIV;

-    unsigned char   buf[3 * 200]; /* RATS: Use ok */

-    unsigned char   *b;

-    int		    n;

-    int		    dx, dy, v[2];

-

-    while ((n = msLinuxReadBytes(priv->fd, buf, sizeof(buf), 3)) > 0) {

-	b = buf;

-	while (n >= 3) {

-	    dx   = (char)(((b[0] & 0x03) << 6) | (b[1] & 0x3f));

-	    dy   = (char)(((b[0] & 0x0c) << 4) | (b[2] & 0x3f));

-            v[0] = -dx;

-            v[1] = -dy;

-            

-            motion(pDev, v, 0, 2, 1, block);

-            msLinuxButton(pDev, enqueue, (((b[0] & 0x10) ? button3 : 0)

-                                          | ((b[0] & 0x20) ? button1 : 0)),

-                          block);

-            n -= 3;

-            b += 3;

-	}

-    }

-}

-

-/** Initialize \a pDev. */

-void msLinuxInit(DevicePtr pDev)

-{

-    GETPRIV;

-    const char *names[] = { "/dev/serialmouse", "/dev/mouse", NULL };

-    int        i;

-

-    if (priv->fd >=0) return;

-

-    for (i = 0; names[i]; i++) {

-        if ((priv->fd = open(names[i], O_RDWR | O_NONBLOCK, 0)) >= 0) break;

-    }

-    if (priv->fd < 0)

-        FATAL1("msLinuxInit: Cannot open mouse port (%s)\n",

-               strerror(errno));

-    

-    if (!isatty(priv->fd))

-        FATAL1("msLinuxInit: Mouse port %s is not a tty\n", names[i]);

-

-    if (tcgetattr(priv->fd, &priv->tty) < 0)

-        FATAL1("msLinuxInit: tcgetattr failed (%s)\n", strerror(errno));

-

-    write(priv->fd, "*n", 2);   /* 1200 baud */

-    usleep(100000);

-}

-

-/** Turn \a pDev on (i.e., take input from \a pDev). */

-int msLinuxOn(DevicePtr pDev)

-{

-    GETPRIV;

-    struct termios nTty;

-

-    if (priv->fd < 0) msLinuxInit(pDev);

-    

-    nTty             = priv->tty;

-    nTty.c_iflag    &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR

-                         | IGNCR | ICRNL | IXON | IXOFF);

-    nTty.c_oflag    &= ~OPOST;

-    nTty.c_lflag    &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);

-    nTty.c_cflag    &= ~(CSIZE | PARENB);

-    nTty.c_cflag    |= CS8 | CLOCAL | CSTOPB;

-    nTty.c_cc[VTIME] = 0;

-    nTty.c_cc[VMIN]  = 1;

-    cfsetispeed (&nTty, B1200);

-    cfsetospeed (&nTty, B1200);

-    if (tcsetattr(priv->fd, TCSANOW, &nTty) < 0)

-        FATAL1("msLinuxInit: tcsetattr failed (%s)\n", strerror(errno));

-    write(priv->fd, "*V", 2);   /* 2 button 3 byte protocol */

-    return priv->fd;

-}

-

-/** Turn \a pDev off (i.e., stop taking input from \a pDev). */

-void msLinuxOff(DevicePtr pDev)

-{

-    GETPRIV;

-

-    tcsetattr(priv->fd, TCSANOW, &priv->tty);

-    close(priv->fd);

-    priv->fd = -1;

-}

-

-static void msLinuxGetMap(DevicePtr pDev, unsigned char *map, int *nButtons)

-{

-    int i;

-    

-    if (nButtons) *nButtons = 3;

-    if (map) for (i = 0; i <= *nButtons; i++) map[i] = i;

-}

-

-/** Currently unused hook called prior to an VT switch. */

-void msLinuxVTPreSwitch(pointer p)

-{

-}

-

-/** Currently unused hook called after returning from a VT switch. */

-void msLinuxVTPostSwitch(pointer p)

-{

-}

-

-/** Create a private structure for use within this file. */

-pointer msLinuxCreatePrivate(DeviceIntPtr pMouse)

-{

-    myPrivate *priv = calloc(1, sizeof(*priv));

-    priv->fd     = -1;

-    priv->pMouse = pMouse;

-    return priv;

-}

-

-/** Destroy a private structure. */

-void msLinuxDestroyPrivate(pointer priv)

-{

-    free(priv);

-}

-

-/** Fill the \a info structure with information needed to initialize \a

- * pDev. */ 

-void msLinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)

-{

-    info->buttonClass      = 1;

-    msLinuxGetMap(pDev, info->map, &info->numButtons);

-    info->valuatorClass    = 1;

-    info->numRelAxes       = 2;

-    info->minval[0]        = 0;

-    info->maxval[0]        = 0;

-    info->res[0]           = 1;

-    info->minres[0]        = 0;

-    info->maxres[0]        = 1;

-    info->ptrFeedbackClass = 1;

-}

+/* Portions of this file were derived from the following files:
+ *
+ **********************************************************************
+ *
+ * Xserver/hw/kdrive/linux/ms.c
+ *
+ * Copyright (c) 2001 by Juliusz Chroboczek
+ * Copyright (c) 1999 by Keith Packard
+ *
+ * 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 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 2001-2003 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ *
+ * This code implements a low-level device driver for a serial MS mouse.
+ * The code is derived from code by Juliusz Chroboczek and Keith Packard
+ * (see the source code for complete references). */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "inputstr.h"
+#include <X11/Xos.h>
+#include <errno.h>
+#include <termios.h>
+
+/*****************************************************************************/
+/* Define some macros to make it easier to move this file to another
+ * part of the Xserver tree.  All calls to the dmx* layer are #defined
+ * here for the .c file.  The .h file will also have to be edited. */
+#include "dmxinputinit.h"
+#include "lnx-ms.h"
+
+#define GETPRIV       myPrivate *priv                            \
+                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private
+
+#define LOG0(f)       dmxLog(dmxDebug,f)
+#define LOG1(f,a)     dmxLog(dmxDebug,f,a)
+#define LOG2(f,a,b)   dmxLog(dmxDebug,f,a,b)
+#define LOG3(f,a,b,c) dmxLog(dmxDebug,f,a,b,c)
+#define FATAL0(f)     dmxLog(dmxFatal,f)
+#define FATAL1(f,a)   dmxLog(dmxFatal,f,a)
+#define FATAL2(f,a,b) dmxLog(dmxFatal,f,a,b)
+#define MOTIONPROC    dmxMotionProcPtr
+#define ENQUEUEPROC   dmxEnqueueProcPtr
+#define CHECKPROC     dmxCheckSpecialProcPtr
+#define BLOCK         DMXBlockType
+
+/* End of interface definitions. */
+/*****************************************************************************/
+
+/* Private area for MS mouse devices. */
+typedef struct _myPrivate {
+    DeviceIntPtr pMouse;
+    int fd;
+    struct termios tty;
+    enum {
+        button1 = 0x0001,
+        button2 = 0x0002,
+        button3 = 0x0004,
+        button4 = 0x0008,
+        button5 = 0x0010
+    } buttons;
+} myPrivate;
+
+static int
+msLinuxReadBytes(int fd, unsigned char *buf, int len, int min)
+{
+    int n, tot;
+    fd_set set;
+    struct timeval tv;
+
+    tot = 0;
+    while (len) {
+        n = read(fd, buf, len);
+        if (n > 0) {
+            tot += n;
+            buf += n;
+            len -= n;
+        }
+        if (tot % min == 0)
+            break;
+        FD_ZERO(&set);
+        FD_SET(fd, &set);
+        tv.tv_sec = 0;
+        tv.tv_usec = 100 * 1000;
+        n = select(fd + 1, &set, 0, 0, &tv);
+        if (n <= 0)
+            break;
+    }
+    return tot;
+}
+
+static void
+msLinuxButton(DevicePtr pDev, ENQUEUEPROC enqueue, int buttons, BLOCK block)
+{
+    GETPRIV;
+
+#define PRESS(b)                                         \
+    do {                                                 \
+        enqueue(pDev, ButtonPress, 0, 0, NULL, block);   \
+    } while (0)
+
+#define RELEASE(b)                                       \
+    do {                                                 \
+        enqueue(pDev, ButtonRelease, 0, 0, NULL, block); \
+    } while (0)
+
+    if ((buttons & button1) && !(priv->buttons & button1))
+        PRESS(1);
+    if (!(buttons & button1) && (priv->buttons & button1))
+        RELEASE(1);
+
+    if ((buttons & button2) && !(priv->buttons & button2))
+        PRESS(2);
+    if (!(buttons & button2) && (priv->buttons & button2))
+        RELEASE(2);
+
+    if ((buttons & button3) && !(priv->buttons & button3))
+        PRESS(3);
+    if (!(buttons & button3) && (priv->buttons & button3))
+        RELEASE(3);
+
+    if ((buttons & button4) && !(priv->buttons & button4))
+        PRESS(4);
+    if (!(buttons & button4) && (priv->buttons & button4))
+        RELEASE(4);
+
+    if ((buttons & button5) && !(priv->buttons & button5))
+        PRESS(5);
+    if (!(buttons & button5) && (priv->buttons & button5))
+        RELEASE(5);
+
+    priv->buttons = buttons;
+}
+
+/** Read an event from the \a pDev device.  If the event is a motion
+ * event, enqueue it with the \a motion function.  Otherwise, check for
+ * special keys with the \a checkspecial function and enqueue the event
+ * with the \a enqueue function.  The \a block type is passed to the
+ * functions so that they may block SIGIO handling as appropriate to the
+ * caller of this function. */
+void
+msLinuxRead(DevicePtr pDev,
+            MOTIONPROC motion,
+            ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
+{
+    GETPRIV;
+    unsigned char buf[3 * 200]; /* RATS: Use ok */
+    unsigned char *b;
+    int n;
+    int dx, dy, v[2];
+
+    while ((n = msLinuxReadBytes(priv->fd, buf, sizeof(buf), 3)) > 0) {
+        b = buf;
+        while (n >= 3) {
+            dx = (char) (((b[0] & 0x03) << 6) | (b[1] & 0x3f));
+            dy = (char) (((b[0] & 0x0c) << 4) | (b[2] & 0x3f));
+            v[0] = -dx;
+            v[1] = -dy;
+
+            motion(pDev, v, 0, 2, 1, block);
+            msLinuxButton(pDev, enqueue, (((b[0] & 0x10) ? button3 : 0)
+                                          | ((b[0] & 0x20) ? button1 : 0)),
+                          block);
+            n -= 3;
+            b += 3;
+        }
+    }
+}
+
+/** Initialize \a pDev. */
+void
+msLinuxInit(DevicePtr pDev)
+{
+    GETPRIV;
+    const char *names[] = { "/dev/serialmouse", "/dev/mouse", NULL };
+    int i;
+
+    if (priv->fd >= 0)
+        return;
+
+    for (i = 0; names[i]; i++) {
+        if ((priv->fd = open(names[i], O_RDWR | O_NONBLOCK, 0)) >= 0)
+            break;
+    }
+    if (priv->fd < 0)
+        FATAL1("msLinuxInit: Cannot open mouse port (%s)\n", strerror(errno));
+
+    if (!isatty(priv->fd))
+        FATAL1("msLinuxInit: Mouse port %s is not a tty\n", names[i]);
+
+    if (tcgetattr(priv->fd, &priv->tty) < 0)
+        FATAL1("msLinuxInit: tcgetattr failed (%s)\n", strerror(errno));
+
+    write(priv->fd, "*n", 2);   /* 1200 baud */
+    usleep(100000);
+}
+
+/** Turn \a pDev on (i.e., take input from \a pDev). */
+int
+msLinuxOn(DevicePtr pDev)
+{
+    GETPRIV;
+    struct termios nTty;
+
+    if (priv->fd < 0)
+        msLinuxInit(pDev);
+
+    nTty = priv->tty;
+    nTty.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR
+                      | IGNCR | ICRNL | IXON | IXOFF);
+    nTty.c_oflag &= ~OPOST;
+    nTty.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
+    nTty.c_cflag &= ~(CSIZE | PARENB);
+    nTty.c_cflag |= CS8 | CLOCAL | CSTOPB;
+    nTty.c_cc[VTIME] = 0;
+    nTty.c_cc[VMIN] = 1;
+    cfsetispeed(&nTty, B1200);
+    cfsetospeed(&nTty, B1200);
+    if (tcsetattr(priv->fd, TCSANOW, &nTty) < 0)
+        FATAL1("msLinuxInit: tcsetattr failed (%s)\n", strerror(errno));
+    write(priv->fd, "*V", 2);   /* 2 button 3 byte protocol */
+    return priv->fd;
+}
+
+/** Turn \a pDev off (i.e., stop taking input from \a pDev). */
+void
+msLinuxOff(DevicePtr pDev)
+{
+    GETPRIV;
+
+    tcsetattr(priv->fd, TCSANOW, &priv->tty);
+    close(priv->fd);
+    priv->fd = -1;
+}
+
+static void
+msLinuxGetMap(DevicePtr pDev, unsigned char *map, int *nButtons)
+{
+    int i;
+
+    if (nButtons)
+        *nButtons = 3;
+    if (map)
+        for (i = 0; i <= *nButtons; i++)
+            map[i] = i;
+}
+
+/** Currently unused hook called prior to an VT switch. */
+void
+msLinuxVTPreSwitch(pointer p)
+{
+}
+
+/** Currently unused hook called after returning from a VT switch. */
+void
+msLinuxVTPostSwitch(pointer p)
+{
+}
+
+/** Create a private structure for use within this file. */
+pointer
+msLinuxCreatePrivate(DeviceIntPtr pMouse)
+{
+    myPrivate *priv = calloc(1, sizeof(*priv));
+
+    priv->fd = -1;
+    priv->pMouse = pMouse;
+    return priv;
+}
+
+/** Destroy a private structure. */
+void
+msLinuxDestroyPrivate(pointer priv)
+{
+    free(priv);
+}
+
+/** Fill the \a info structure with information needed to initialize \a
+ * pDev. */
+void
+msLinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+{
+    info->buttonClass = 1;
+    msLinuxGetMap(pDev, info->map, &info->numButtons);
+    info->valuatorClass = 1;
+    info->numRelAxes = 2;
+    info->minval[0] = 0;
+    info->maxval[0] = 0;
+    info->res[0] = 1;
+    info->minres[0] = 0;
+    info->maxres[0] = 1;
+    info->ptrFeedbackClass = 1;
+}
diff --git a/xorg-server/hw/dmx/input/lnx-ps2.c b/xorg-server/hw/dmx/input/lnx-ps2.c
index f40441fe7..67c73a0c5 100644
--- a/xorg-server/hw/dmx/input/lnx-ps2.c
+++ b/xorg-server/hw/dmx/input/lnx-ps2.c
@@ -1,289 +1,318 @@
-/* Portions of this file were derived from the following files:

- *

- **********************************************************************

- *

- * Xserver/hw/kdrive/linux/ps2.c

- *

- * Copyright (c) 1999 by 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.

- *

- */

-

-/*

- * Copyright 2001,2003 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- *

- * This code implements a low-level device driver for a serial MS mouse.

- * The code is derived from code by Keith Packard (see the source code

- * for complete references). */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "inputstr.h"

-#include <X11/Xos.h>

-#include <errno.h>

-#include <termios.h>

-

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

-/* Define some macros to make it easier to move this file to another

- * part of the Xserver tree.  All calls to the dmx* layer are #defined

- * here for the .c file.  The .h file will also have to be edited. */

-#include "dmxinputinit.h"

-#include "lnx-ps2.h"

-

-#define GETPRIV       myPrivate *priv                            \

-                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private

-

-#define LOG0(f)       dmxLog(dmxDebug,f)

-#define LOG1(f,a)     dmxLog(dmxDebug,f,a)

-#define LOG2(f,a,b)   dmxLog(dmxDebug,f,a,b)

-#define LOG3(f,a,b,c) dmxLog(dmxDebug,f,a,b,c)

-#define FATAL0(f)     dmxLog(dmxFatal,f)

-#define FATAL1(f,a)   dmxLog(dmxFatal,f,a)

-#define FATAL2(f,a,b) dmxLog(dmxFatal,f,a,b)

-#define MOTIONPROC    dmxMotionProcPtr

-#define ENQUEUEPROC   dmxEnqueueProcPtr

-#define CHECKPROC     dmxCheckSpecialProcPtr

-#define BLOCK         DMXBlockType

-

-/* End of interface definitions. */

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

-

-/* Private area for PS/2 devices. */

-typedef struct _myPrivate {

-    DeviceIntPtr   pMouse;

-    int            fd;

-    enum {

-        button1 = 0x0001,

-        button2 = 0x0002,

-        button3 = 0x0004,

-        button4 = 0x0008,

-        button5 = 0x0010

-    }              buttons;

-} myPrivate;

-

-static int ps2LinuxReadBytes(int fd, unsigned char *buf, int len, int min)

-{

-    int		    n, tot;

-    fd_set	    set;

-    struct timeval  tv;

-    

-    tot = 0;

-    while (len) {

-        n = read(fd, buf, len);

-        if (n > 0) {

-            tot += n;

-	    buf += n;

-	    len -= n;

-	}

-	if (tot % min == 0) break;

-	FD_ZERO(&set);

-	FD_SET(fd, &set);

-	tv.tv_sec = 0;

-	tv.tv_usec = 100 * 1000;

-	n = select(fd + 1, &set, 0, 0, &tv);

-	if (n <= 0) break;

-    }

-    return tot;

-}

-

-static void ps2LinuxButton(DevicePtr pDev, ENQUEUEPROC enqueue,

-                           int buttons, BLOCK block)

-{

-    GETPRIV;

-    

-#define PRESS(b)                                         \

-    do {                                                 \

-        enqueue(pDev, ButtonPress, 0, 0, NULL, block);   \

-    } while (0)

-

-#define RELEASE(b)                                       \

-    do {                                                 \

-        enqueue(pDev, ButtonRelease, 0, 0, NULL, block); \

-    } while (0)

-          

-    if ((buttons & button1) && !(priv->buttons & button1)) PRESS(1);

-    if (!(buttons & button1) && (priv->buttons & button1)) RELEASE(1);

-

-    if ((buttons & button2) && !(priv->buttons & button2)) PRESS(2);

-    if (!(buttons & button2) && (priv->buttons & button2)) RELEASE(2);

-

-    if ((buttons & button3) && !(priv->buttons & button3)) PRESS(3);

-    if (!(buttons & button3) && (priv->buttons & button3)) RELEASE(3);

-

-    if ((buttons & button4) && !(priv->buttons & button4)) PRESS(4);

-    if (!(buttons & button4) && (priv->buttons & button4)) RELEASE(4);

-    

-    if ((buttons & button5) && !(priv->buttons & button5)) PRESS(5);

-    if (!(buttons & button5) && (priv->buttons & button5)) RELEASE(5);

-

-    priv->buttons = buttons;

-}

-

-/** Read an event from the \a pDev device.  If the event is a motion

- * event, enqueue it with the \a motion function.  Otherwise, check for

- * special keys with the \a checkspecial function and enqueue the event

- * with the \a enqueue function.  The \a block type is passed to the

- * functions so that they may block SIGIO handling as appropriate to the

- * caller of this function. */

-void ps2LinuxRead(DevicePtr pDev, MOTIONPROC motion,

-                  ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)

-{

-    GETPRIV;

-    unsigned char   buf[3 * 200]; /* RATS: Use ok */

-    unsigned char   *b;

-    int		    n;

-    int		    dx, dy, v[2];

-

-    while ((n = ps2LinuxReadBytes(priv->fd, buf, sizeof(buf), 3)) > 0) {

-	b = buf;

-	while (n >= 3) {

-            dx   =  b[1] - ((b[0] & 0x10) ? 256 : 0);

-            dy   = -b[2] + ((b[0] & 0x20) ? 256 : 0);

-            v[0] = -dx;

-            v[1] = -dy;

-

-            motion(pDev, v, 0, 2, 1, block);

-            ps2LinuxButton(pDev, enqueue, (((b[0] & 4) ? button2 : 0)

-                                           | ((b[0] & 2) ? button3 : 0)

-                                           | ((b[0] & 1) ? button1 : 0)),

-                           block);

-            n -= 3;

-            b += 3;

-	}

-    }

-}

-

-/** Initialize \a pDev. */

-void ps2LinuxInit(DevicePtr pDev)

-{

-    GETPRIV;

-    const char *names[] = { "/dev/mouse", "/dev/psaux", NULL };

-    int        i;

-

-    if (priv->fd >=0) return;

-

-    for (i = 0; names[i]; i++) {

-        if ((priv->fd = open(names[i], O_RDWR | O_NONBLOCK, 0)) >= 0) break;

-    }

-    if (priv->fd < 0)

-        FATAL1("ps2LinuxInit: Cannot open mouse port (%s)\n",

-               strerror(errno));

-}

-

-/** Turn \a pDev on (i.e., take input from \a pDev). */

-int ps2LinuxOn(DevicePtr pDev)

-{

-    GETPRIV;

-

-    if (priv->fd < 0) ps2LinuxInit(pDev);

-    return priv->fd;

-}

-

-/** Turn \a pDev off (i.e., stop taking input from \a pDev). */

-void ps2LinuxOff(DevicePtr pDev)

-{

-    GETPRIV;

-

-    close(priv->fd);

-    priv->fd = -1;

-}

-

-static void ps2LinuxGetMap(DevicePtr pDev, unsigned char *map, int *nButtons)

-{

-    int i;

-    

-    if (nButtons) *nButtons = 3;

-    if (map) for (i = 0; i <= *nButtons; i++) map[i] = i;

-}

-

-/** Currently unused hook called prior to an VT switch. */

-void ps2LinuxVTPreSwitch(pointer p)

-{

-}

-

-/** Currently unused hook called after returning from a VT switch. */

-void ps2LinuxVTPostSwitch(pointer p)

-{

-}

-

-/** Create a private structure for use within this file. */

-pointer ps2LinuxCreatePrivate(DeviceIntPtr pMouse)

-{

-    myPrivate *priv = calloc(1, sizeof(*priv));

-    priv->fd     = -1;

-    priv->pMouse = pMouse;

-    return priv;

-}

-

-/** Destroy a private structure. */

-void ps2LinuxDestroyPrivate(pointer priv)

-{

-    free(priv);

-}

-

-/** Fill the \a info structure with information needed to initialize \a

- * pDev. */ 

-void ps2LinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)

-{

-    info->buttonClass      = 1;

-    ps2LinuxGetMap(pDev, info->map, &info->numButtons);

-    info->valuatorClass    = 1;

-    info->numRelAxes       = 2;

-    info->minval[0]        = 0;

-    info->maxval[0]        = 0;

-    info->res[0]           = 1;

-    info->minres[0]        = 0;

-    info->maxres[0]        = 1;

-    info->ptrFeedbackClass = 1;

-}

+/* Portions of this file were derived from the following files:
+ *
+ **********************************************************************
+ *
+ * Xserver/hw/kdrive/linux/ps2.c
+ *
+ * Copyright (c) 1999 by 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.
+ *
+ */
+
+/*
+ * Copyright 2001,2003 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ *
+ * This code implements a low-level device driver for a serial MS mouse.
+ * The code is derived from code by Keith Packard (see the source code
+ * for complete references). */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "inputstr.h"
+#include <X11/Xos.h>
+#include <errno.h>
+#include <termios.h>
+
+/*****************************************************************************/
+/* Define some macros to make it easier to move this file to another
+ * part of the Xserver tree.  All calls to the dmx* layer are #defined
+ * here for the .c file.  The .h file will also have to be edited. */
+#include "dmxinputinit.h"
+#include "lnx-ps2.h"
+
+#define GETPRIV       myPrivate *priv                            \
+                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private
+
+#define LOG0(f)       dmxLog(dmxDebug,f)
+#define LOG1(f,a)     dmxLog(dmxDebug,f,a)
+#define LOG2(f,a,b)   dmxLog(dmxDebug,f,a,b)
+#define LOG3(f,a,b,c) dmxLog(dmxDebug,f,a,b,c)
+#define FATAL0(f)     dmxLog(dmxFatal,f)
+#define FATAL1(f,a)   dmxLog(dmxFatal,f,a)
+#define FATAL2(f,a,b) dmxLog(dmxFatal,f,a,b)
+#define MOTIONPROC    dmxMotionProcPtr
+#define ENQUEUEPROC   dmxEnqueueProcPtr
+#define CHECKPROC     dmxCheckSpecialProcPtr
+#define BLOCK         DMXBlockType
+
+/* End of interface definitions. */
+/*****************************************************************************/
+
+/* Private area for PS/2 devices. */
+typedef struct _myPrivate {
+    DeviceIntPtr pMouse;
+    int fd;
+    enum {
+        button1 = 0x0001,
+        button2 = 0x0002,
+        button3 = 0x0004,
+        button4 = 0x0008,
+        button5 = 0x0010
+    } buttons;
+} myPrivate;
+
+static int
+ps2LinuxReadBytes(int fd, unsigned char *buf, int len, int min)
+{
+    int n, tot;
+    fd_set set;
+    struct timeval tv;
+
+    tot = 0;
+    while (len) {
+        n = read(fd, buf, len);
+        if (n > 0) {
+            tot += n;
+            buf += n;
+            len -= n;
+        }
+        if (tot % min == 0)
+            break;
+        FD_ZERO(&set);
+        FD_SET(fd, &set);
+        tv.tv_sec = 0;
+        tv.tv_usec = 100 * 1000;
+        n = select(fd + 1, &set, 0, 0, &tv);
+        if (n <= 0)
+            break;
+    }
+    return tot;
+}
+
+static void
+ps2LinuxButton(DevicePtr pDev, ENQUEUEPROC enqueue, int buttons, BLOCK block)
+{
+    GETPRIV;
+
+#define PRESS(b)                                         \
+    do {                                                 \
+        enqueue(pDev, ButtonPress, 0, 0, NULL, block);   \
+    } while (0)
+
+#define RELEASE(b)                                       \
+    do {                                                 \
+        enqueue(pDev, ButtonRelease, 0, 0, NULL, block); \
+    } while (0)
+
+    if ((buttons & button1) && !(priv->buttons & button1))
+        PRESS(1);
+    if (!(buttons & button1) && (priv->buttons & button1))
+        RELEASE(1);
+
+    if ((buttons & button2) && !(priv->buttons & button2))
+        PRESS(2);
+    if (!(buttons & button2) && (priv->buttons & button2))
+        RELEASE(2);
+
+    if ((buttons & button3) && !(priv->buttons & button3))
+        PRESS(3);
+    if (!(buttons & button3) && (priv->buttons & button3))
+        RELEASE(3);
+
+    if ((buttons & button4) && !(priv->buttons & button4))
+        PRESS(4);
+    if (!(buttons & button4) && (priv->buttons & button4))
+        RELEASE(4);
+
+    if ((buttons & button5) && !(priv->buttons & button5))
+        PRESS(5);
+    if (!(buttons & button5) && (priv->buttons & button5))
+        RELEASE(5);
+
+    priv->buttons = buttons;
+}
+
+/** Read an event from the \a pDev device.  If the event is a motion
+ * event, enqueue it with the \a motion function.  Otherwise, check for
+ * special keys with the \a checkspecial function and enqueue the event
+ * with the \a enqueue function.  The \a block type is passed to the
+ * functions so that they may block SIGIO handling as appropriate to the
+ * caller of this function. */
+void
+ps2LinuxRead(DevicePtr pDev, MOTIONPROC motion,
+             ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
+{
+    GETPRIV;
+    unsigned char buf[3 * 200]; /* RATS: Use ok */
+    unsigned char *b;
+    int n;
+    int dx, dy, v[2];
+
+    while ((n = ps2LinuxReadBytes(priv->fd, buf, sizeof(buf), 3)) > 0) {
+        b = buf;
+        while (n >= 3) {
+            dx = b[1] - ((b[0] & 0x10) ? 256 : 0);
+            dy = -b[2] + ((b[0] & 0x20) ? 256 : 0);
+            v[0] = -dx;
+            v[1] = -dy;
+
+            motion(pDev, v, 0, 2, 1, block);
+            ps2LinuxButton(pDev, enqueue, (((b[0] & 4) ? button2 : 0)
+                                           | ((b[0] & 2) ? button3 : 0)
+                                           | ((b[0] & 1) ? button1 : 0)),
+                           block);
+            n -= 3;
+            b += 3;
+        }
+    }
+}
+
+/** Initialize \a pDev. */
+void
+ps2LinuxInit(DevicePtr pDev)
+{
+    GETPRIV;
+    const char *names[] = { "/dev/mouse", "/dev/psaux", NULL };
+    int i;
+
+    if (priv->fd >= 0)
+        return;
+
+    for (i = 0; names[i]; i++) {
+        if ((priv->fd = open(names[i], O_RDWR | O_NONBLOCK, 0)) >= 0)
+            break;
+    }
+    if (priv->fd < 0)
+        FATAL1("ps2LinuxInit: Cannot open mouse port (%s)\n", strerror(errno));
+}
+
+/** Turn \a pDev on (i.e., take input from \a pDev). */
+int
+ps2LinuxOn(DevicePtr pDev)
+{
+    GETPRIV;
+
+    if (priv->fd < 0)
+        ps2LinuxInit(pDev);
+    return priv->fd;
+}
+
+/** Turn \a pDev off (i.e., stop taking input from \a pDev). */
+void
+ps2LinuxOff(DevicePtr pDev)
+{
+    GETPRIV;
+
+    close(priv->fd);
+    priv->fd = -1;
+}
+
+static void
+ps2LinuxGetMap(DevicePtr pDev, unsigned char *map, int *nButtons)
+{
+    int i;
+
+    if (nButtons)
+        *nButtons = 3;
+    if (map)
+        for (i = 0; i <= *nButtons; i++)
+            map[i] = i;
+}
+
+/** Currently unused hook called prior to an VT switch. */
+void
+ps2LinuxVTPreSwitch(pointer p)
+{
+}
+
+/** Currently unused hook called after returning from a VT switch. */
+void
+ps2LinuxVTPostSwitch(pointer p)
+{
+}
+
+/** Create a private structure for use within this file. */
+pointer
+ps2LinuxCreatePrivate(DeviceIntPtr pMouse)
+{
+    myPrivate *priv = calloc(1, sizeof(*priv));
+
+    priv->fd = -1;
+    priv->pMouse = pMouse;
+    return priv;
+}
+
+/** Destroy a private structure. */
+void
+ps2LinuxDestroyPrivate(pointer priv)
+{
+    free(priv);
+}
+
+/** Fill the \a info structure with information needed to initialize \a
+ * pDev. */
+void
+ps2LinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+{
+    info->buttonClass = 1;
+    ps2LinuxGetMap(pDev, info->map, &info->numButtons);
+    info->valuatorClass = 1;
+    info->numRelAxes = 2;
+    info->minval[0] = 0;
+    info->maxval[0] = 0;
+    info->res[0] = 1;
+    info->minres[0] = 0;
+    info->maxres[0] = 1;
+    info->ptrFeedbackClass = 1;
+}
diff --git a/xorg-server/hw/dmx/input/usb-common.c b/xorg-server/hw/dmx/input/usb-common.c
index 944033eba..c7c166cce 100644
--- a/xorg-server/hw/dmx/input/usb-common.c
+++ b/xorg-server/hw/dmx/input/usb-common.c
@@ -74,7 +74,6 @@
 /* End of interface definitions. */
 /*****************************************************************************/
 
-
 /** Read an event from the \a pDev device.  If the event is a motion
  * event, enqueue it with the \a motion function.  Otherwise, enqueue
  * the event with the \a enqueue function.  The \a block type is passed
@@ -84,16 +83,14 @@
  * Since USB devices return EV_KEY events for buttons and keys, \a
  * minButton is used to decide if a Button or Key event should be
  * queued.*/
-void usbRead(DevicePtr pDev,
-             MOTIONPROC motion,
-             ENQUEUEPROC enqueue,
-             int minButton,
-             BLOCK block)
+void
+usbRead(DevicePtr pDev,
+        MOTIONPROC motion, ENQUEUEPROC enqueue, int minButton, BLOCK block)
 {
     GETPRIV;
     struct input_event raw;
-    int                v[DMX_MAX_AXES];
-    int                axis;
+    int v[DMX_MAX_AXES];
+    int axis;
 
 #define PRESS(b)                                         \
     do {                                                 \
@@ -112,11 +109,14 @@ void usbRead(DevicePtr pDev,
 #endif
         switch (raw.type) {
         case EV_KEY:
-                                /* raw.value = 1 for first, 2 for repeat */
+            /* raw.value = 1 for first, 2 for repeat */
             if (raw.code > minButton) {
-                if (raw.value) PRESS((raw.code & 0x0f) + 1);
-                else           RELEASE((raw.code & 0x0f) + 1);
-            } else {
+                if (raw.value)
+                    PRESS((raw.code & 0x0f) + 1);
+                else
+                    RELEASE((raw.code & 0x0f) + 1);
+            }
+            else {
                 enqueue(pDev, raw.value ? KeyPress : KeyRelease,
                         0, 0, NULL, block);
             }
@@ -134,10 +134,11 @@ void usbRead(DevicePtr pDev,
                 motion(pDev, v, 0, 2, DMX_RELATIVE, block);
                 break;
             case REL_WHEEL:
-                if ((int)raw.value > 0) {
+                if ((int) raw.value > 0) {
                     PRESS(4);
                     RELEASE(4);
-                } else if ((int)raw.value < 0) {
+                }
+                else if ((int) raw.value < 0) {
                     PRESS(5);
                     RELEASE(5);
                 }
@@ -162,126 +163,228 @@ void usbRead(DevicePtr pDev,
 #define test_bit(bit)  (priv->mask[(bit)/8] & (1 << ((bit)%8)))
 #define test_bits(bit) (bits[(bit)/8] & (1 << ((bit)%8)))
 
-static void usbPrint(myPrivate *priv,
-                     const char *filename, const char *devname, int fd)
+static void
+usbPrint(myPrivate * priv, const char *filename, const char *devname, int fd)
 {
-    int           j, k;
-    DeviceIntPtr  pDevice = priv->pDevice;
-    unsigned char bits[KEY_MAX/8 + 1]; /* RATS: Use ok assuming that
-                                        * KEY_MAX is greater than
-                                        * REL_MAX, ABS_MAX, SND_MAX, and
-                                        * LED_MAX. */
+    int j, k;
+    DeviceIntPtr pDevice = priv->pDevice;
+    unsigned char bits[KEY_MAX / 8 + 1];        /* RATS: Use ok assuming that
+                                                 * KEY_MAX is greater than
+                                                 * REL_MAX, ABS_MAX, SND_MAX, and
+                                                 * LED_MAX. */
 
     LOG3INPUT(priv, "%s (%s) using %s\n", pDevice->name, GETNAME, filename);
     LOG1INPUT(priv, "    %s\n", devname);
     for (j = 0; j < EV_MAX; j++) {
         if (test_bit(j)) {
-            const char *type  = "unknown";
-            char       extra[256]; /* FIXME: may cause buffer overflow */
+            const char *type = "unknown";
+            char extra[256];    /* FIXME: may cause buffer overflow */
+
             extra[0] = '\0';
-            switch(j) {
-            case EV_KEY: type = "keys/buttons"; break;
-            case EV_REL: type = "relative";
+            switch (j) {
+            case EV_KEY:
+                type = "keys/buttons";
+                break;
+            case EV_REL:
+                type = "relative";
                 memset(bits, 0, sizeof(bits));
                 ioctl(priv->fd, EVIOCGBIT(EV_REL, sizeof(bits)), bits);
                 for (k = 0; k < REL_MAX; k++) {
-                    if (test_bits(k)) switch (k) {
-                    case REL_X:      strcat(extra, " X");      break;
-                    case REL_Y:      strcat(extra, " Y");      break;
-                    case REL_Z:      strcat(extra, " Z");      break;
-                    case REL_HWHEEL: strcat(extra, " HWheel"); break;
-                    case REL_DIAL:   strcat(extra, " Dial");   break;
-                    case REL_WHEEL:  strcat(extra, " Wheel");  break;
-                    case REL_MISC:   strcat(extra, " Misc");   break;
-                    }
+                    if (test_bits(k))
+                        switch (k) {
+                        case REL_X:
+                            strcat(extra, " X");
+                            break;
+                        case REL_Y:
+                            strcat(extra, " Y");
+                            break;
+                        case REL_Z:
+                            strcat(extra, " Z");
+                            break;
+                        case REL_HWHEEL:
+                            strcat(extra, " HWheel");
+                            break;
+                        case REL_DIAL:
+                            strcat(extra, " Dial");
+                            break;
+                        case REL_WHEEL:
+                            strcat(extra, " Wheel");
+                            break;
+                        case REL_MISC:
+                            strcat(extra, " Misc");
+                            break;
+                        }
                 }
                 break;
-            case EV_ABS: type = "absolute";
+            case EV_ABS:
+                type = "absolute";
                 memset(bits, 0, sizeof(bits));
                 ioctl(priv->fd, EVIOCGBIT(EV_ABS, sizeof(bits)), bits);
                 for (k = 0; k < ABS_MAX; k++) {
-                    if (test_bits(k)) switch (k) {
-                    case ABS_X:        strcat(extra," X");       break;
-                    case ABS_Y:        strcat(extra," Y");       break;
-                    case ABS_Z:        strcat(extra," Z");       break;
-                    case ABS_RX:       strcat(extra," RX");      break;
-                    case ABS_RY:       strcat(extra," RY");      break;
-                    case ABS_RZ:       strcat(extra," RZ");      break;
-                    case ABS_THROTTLE: strcat(extra," Throttle");break;
-                    case ABS_RUDDER:   strcat(extra," Rudder");  break;
-                    case ABS_WHEEL:    strcat(extra," Wheel");   break;
-                    case ABS_GAS:      strcat(extra," Gas");     break;
-                    case ABS_BRAKE:    strcat(extra," Break");   break;
-                    case ABS_HAT0X:    strcat(extra," Hat0X");   break;
-                    case ABS_HAT0Y:    strcat(extra," Hat0Y");   break;
-                    case ABS_HAT1X:    strcat(extra," Hat1X");   break;
-                    case ABS_HAT1Y:    strcat(extra," Hat1Y");   break;
-                    case ABS_HAT2X:    strcat(extra," Hat2X");   break;
-                    case ABS_HAT2Y:    strcat(extra," Hat2Y");   break;
-                    case ABS_HAT3X:    strcat(extra," Hat3X");   break;
-                    case ABS_HAT3Y:    strcat(extra," Hat3Y");   break;
-                    case ABS_PRESSURE: strcat(extra," Pressure");break;
-                    case ABS_DISTANCE: strcat(extra," Distance");break;
-                    case ABS_TILT_X:   strcat(extra," TiltX");   break;
-                    case ABS_TILT_Y:   strcat(extra," TiltY");   break;
-                    case ABS_MISC:     strcat(extra," Misc");    break;
-                    }
+                    if (test_bits(k))
+                        switch (k) {
+                        case ABS_X:
+                            strcat(extra, " X");
+                            break;
+                        case ABS_Y:
+                            strcat(extra, " Y");
+                            break;
+                        case ABS_Z:
+                            strcat(extra, " Z");
+                            break;
+                        case ABS_RX:
+                            strcat(extra, " RX");
+                            break;
+                        case ABS_RY:
+                            strcat(extra, " RY");
+                            break;
+                        case ABS_RZ:
+                            strcat(extra, " RZ");
+                            break;
+                        case ABS_THROTTLE:
+                            strcat(extra, " Throttle");
+                            break;
+                        case ABS_RUDDER:
+                            strcat(extra, " Rudder");
+                            break;
+                        case ABS_WHEEL:
+                            strcat(extra, " Wheel");
+                            break;
+                        case ABS_GAS:
+                            strcat(extra, " Gas");
+                            break;
+                        case ABS_BRAKE:
+                            strcat(extra, " Break");
+                            break;
+                        case ABS_HAT0X:
+                            strcat(extra, " Hat0X");
+                            break;
+                        case ABS_HAT0Y:
+                            strcat(extra, " Hat0Y");
+                            break;
+                        case ABS_HAT1X:
+                            strcat(extra, " Hat1X");
+                            break;
+                        case ABS_HAT1Y:
+                            strcat(extra, " Hat1Y");
+                            break;
+                        case ABS_HAT2X:
+                            strcat(extra, " Hat2X");
+                            break;
+                        case ABS_HAT2Y:
+                            strcat(extra, " Hat2Y");
+                            break;
+                        case ABS_HAT3X:
+                            strcat(extra, " Hat3X");
+                            break;
+                        case ABS_HAT3Y:
+                            strcat(extra, " Hat3Y");
+                            break;
+                        case ABS_PRESSURE:
+                            strcat(extra, " Pressure");
+                            break;
+                        case ABS_DISTANCE:
+                            strcat(extra, " Distance");
+                            break;
+                        case ABS_TILT_X:
+                            strcat(extra, " TiltX");
+                            break;
+                        case ABS_TILT_Y:
+                            strcat(extra, " TiltY");
+                            break;
+                        case ABS_MISC:
+                            strcat(extra, " Misc");
+                            break;
+                        }
                 }
                 break;
-            case EV_MSC: type = "reserved";     break;
-            case EV_LED: type = "leds";
+            case EV_MSC:
+                type = "reserved";
+                break;
+            case EV_LED:
+                type = "leds";
                 memset(bits, 0, sizeof(bits));
                 ioctl(priv->fd, EVIOCGBIT(EV_LED, sizeof(bits)), bits);
                 for (k = 0; k < LED_MAX; k++) {
-                    if (test_bits(k)) switch (k) {
-                    case LED_NUML:    strcat(extra," NumLock");  break;
-                    case LED_CAPSL:   strcat(extra," CapsLock"); break;
-                    case LED_SCROLLL: strcat(extra," ScrlLock"); break;
-                    case LED_COMPOSE: strcat(extra," Compose");  break;
-                    case LED_KANA:    strcat(extra," Kana");     break;
-                    case LED_SLEEP:   strcat(extra," Sleep");    break;
-                    case LED_SUSPEND: strcat(extra," Suspend");  break;
-                    case LED_MUTE:    strcat(extra," Mute");     break;
-                    case LED_MISC:    strcat(extra," Misc");     break;
-                    }
+                    if (test_bits(k))
+                        switch (k) {
+                        case LED_NUML:
+                            strcat(extra, " NumLock");
+                            break;
+                        case LED_CAPSL:
+                            strcat(extra, " CapsLock");
+                            break;
+                        case LED_SCROLLL:
+                            strcat(extra, " ScrlLock");
+                            break;
+                        case LED_COMPOSE:
+                            strcat(extra, " Compose");
+                            break;
+                        case LED_KANA:
+                            strcat(extra, " Kana");
+                            break;
+                        case LED_SLEEP:
+                            strcat(extra, " Sleep");
+                            break;
+                        case LED_SUSPEND:
+                            strcat(extra, " Suspend");
+                            break;
+                        case LED_MUTE:
+                            strcat(extra, " Mute");
+                            break;
+                        case LED_MISC:
+                            strcat(extra, " Misc");
+                            break;
+                        }
                 }
                 break;
-            case EV_SND: type = "sound";
+            case EV_SND:
+                type = "sound";
                 memset(bits, 0, sizeof(bits));
                 ioctl(priv->fd, EVIOCGBIT(EV_SND, sizeof(bits)), bits);
                 for (k = 0; k < SND_MAX; k++) {
-                    if (test_bits(k)) switch (k) {
-                    case SND_CLICK:   strcat(extra," Click");    break;
-                    case SND_BELL:    strcat(extra," Bell");     break;
-                    }
+                    if (test_bits(k))
+                        switch (k) {
+                        case SND_CLICK:
+                            strcat(extra, " Click");
+                            break;
+                        case SND_BELL:
+                            strcat(extra, " Bell");
+                            break;
+                        }
                 }
                 break;
-            case EV_REP: type = "repeat";       break;
-            case EV_FF:  type = "feedback";     break;
+            case EV_REP:
+                type = "repeat";
+                break;
+            case EV_FF:
+                type = "feedback";
+                break;
             }
             LOG5INPUT(priv, "    Feature 0x%02x = %s%s%s%s\n", j, type,
                       extra[0] ? " [" : "",
-                      extra[0] ? extra+1 : "",
-                      extra[0] ? "]" : "");
+                      extra[0] ? extra + 1 : "", extra[0] ? "]" : "");
         }
     }
 }
 
 /** Initialized \a pDev as a \a usbMouse, \a usbKeyboard, or \a usbOther
-device. */ 
-void usbInit(DevicePtr pDev, usbType type)
+device. */
+void
+usbInit(DevicePtr pDev, usbType type)
 {
     GETPRIV;
-    char          name[64];            /* RATS: Only used in snprintf */
-    int           i, j, k;
-    char          buf[256] = { 0, };   /* RATS: Use ok */
-    int           version;
-    unsigned char bits[KEY_MAX/8 + 1]; /* RATS: Use ok assuming that
-                                        * KEY_MAX is greater than
-                                        * REL_MAX, ABS_MAX, SND_MAX, and
-                                        * LED_MAX. */
+    char name[64];              /* RATS: Only used in snprintf */
+    int i, j, k;
+    char buf[256] = { 0, };     /* RATS: Use ok */
+    int version;
+    unsigned char bits[KEY_MAX / 8 + 1];        /* RATS: Use ok assuming that
+                                                 * KEY_MAX is greater than
+                                                 * REL_MAX, ABS_MAX, SND_MAX, and
+                                                 * LED_MAX. */
 
-    if (priv->fd >=0) return;
+    if (priv->fd >= 0)
+        return;
 
     for (i = 0; i < 32; i++) {
         snprintf(name, sizeof(name), "/dev/input/event%d", i);
@@ -293,15 +396,18 @@ void usbInit(DevicePtr pDev, usbType type)
 
             for (j = 0; j < EV_MAX; j++) {
                 if (test_bit(j)) {
-                    switch(j) {
+                    switch (j) {
                     case EV_REL:
                         memset(bits, 0, sizeof(bits));
                         ioctl(priv->fd, EVIOCGBIT(EV_REL, sizeof(bits)), bits);
                         for (k = 0; k < REL_MAX; k++) {
                             if (test_bits(k)) {
-                                if (k == REL_X)      priv->relmap[k] = 0;
-                                else if (k == REL_Y) priv->relmap[k] = 1;
-                                else priv->relmap[k] = 2 + priv->numAbs;
+                                if (k == REL_X)
+                                    priv->relmap[k] = 0;
+                                else if (k == REL_Y)
+                                    priv->relmap[k] = 1;
+                                else
+                                    priv->relmap[k] = 2 + priv->numAbs;
                                 ++priv->numRel;
                             }
                         }
@@ -320,7 +426,8 @@ void usbInit(DevicePtr pDev, usbType type)
                         memset(bits, 0, sizeof(bits));
                         ioctl(priv->fd, EVIOCGBIT(EV_LED, sizeof(bits)), bits);
                         for (k = 0; k < LED_MAX; k++) {
-                            if (test_bits(k)) ++priv->numLeds;
+                            if (test_bits(k))
+                                ++priv->numLeds;
                         }
                         break;
                     }
@@ -350,32 +457,36 @@ void usbInit(DevicePtr pDev, usbType type)
         FATAL1("usbInit: Cannot open /dev/input/event* port (%s)\n"
                "         If you have not done so, you may need to:\n"
                "           rmmod mousedev; rmmod keybdev\n"
-               "           modprobe evdev\n",
-               strerror(errno));
-  found:
+               "           modprobe evdev\n", strerror(errno));
+ found:
     usbPrint(priv, name, buf, priv->fd);
 }
 
 /** Turn \a pDev off (i.e., stop taking input from \a pDev). */
-void usbOff(DevicePtr pDev)
+void
+usbOff(DevicePtr pDev)
 {
     GETPRIV;
 
-    if (priv->fd >= 0) close(priv->fd);
+    if (priv->fd >= 0)
+        close(priv->fd);
     priv->fd = -1;
 }
 
 /** Create a private structure for use within this file. */
-pointer usbCreatePrivate(DeviceIntPtr pDevice)
+pointer
+usbCreatePrivate(DeviceIntPtr pDevice)
 {
     myPrivate *priv = calloc(1, sizeof(*priv));
-    priv->fd        = -1;
-    priv->pDevice   = pDevice;
+
+    priv->fd = -1;
+    priv->pDevice = pDevice;
     return priv;
 }
 
 /** Destroy a private structure. */
-void usbDestroyPrivate(pointer priv)
+void
+usbDestroyPrivate(pointer priv)
 {
     free(priv);
 }
diff --git a/xorg-server/hw/dmx/input/usb-common.h b/xorg-server/hw/dmx/input/usb-common.h
index 5ebfd1e78..eea98afbe 100644
--- a/xorg-server/hw/dmx/input/usb-common.h
+++ b/xorg-server/hw/dmx/input/usb-common.h
@@ -44,12 +44,11 @@ typedef enum {
 } usbType;
 
 extern pointer usbCreatePrivate(DeviceIntPtr pDevice);
-extern void    usbDestroyPrivate(pointer priv);
-extern void    usbRead(DevicePtr pDev,
-                       dmxMotionProcPtr motion,
-                       dmxEnqueueProcPtr enqueue,
-                       int minButton,
-                       DMXBlockType block);
-extern void    usbInit(DevicePtr pDev, usbType type);
-extern void    usbOff(DevicePtr pDev);
+extern void usbDestroyPrivate(pointer priv);
+extern void usbRead(DevicePtr pDev,
+                    dmxMotionProcPtr motion,
+                    dmxEnqueueProcPtr enqueue,
+                    int minButton, DMXBlockType block);
+extern void usbInit(DevicePtr pDev, usbType type);
+extern void usbOff(DevicePtr pDev);
 #endif
diff --git a/xorg-server/hw/dmx/input/usb-keyboard.c b/xorg-server/hw/dmx/input/usb-keyboard.c
index c2b49039f..65bfcd00d 100644
--- a/xorg-server/hw/dmx/input/usb-keyboard.c
+++ b/xorg-server/hw/dmx/input/usb-keyboard.c
@@ -1,444 +1,477 @@
-/* Portions of this file were derived from the following files:

- *

- **********************************************************************

- *

- * xfree86/common/xf86KbdLnx.c

- *

- * Linux version of keymapping setup. The kernel (since 0.99.14) has support

- * for fully remapping the keyboard, but there are some differences between

- * the Linux map and the SVR4 map (esp. in the extended keycodes). We also

- * remove the restriction on what keycodes can be remapped.

- * Orest Zborowski.

- *

- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.

- *

- * 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 Thomas Roell not be used in

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

- * specific, written prior permission.  Thomas Roell makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL THOMAS ROELL 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.

- *

- */

-

-/*

- * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

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

- */

-

-/*

- * Authors:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- *

- * This code implements a low-level device driver for a USB keyboard

- * under Linux.  The keymap description is derived from code by Thomas

- * Roell, Orest Zborowski. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "atKeynames.h"

-#include "usb-private.h"

-

-#define USB_KEYBOARD_DEBUG 0

-

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

-/* Define some macros to make it easier to move this file to another

- * part of the Xserver tree.  All calls to the dmx* layer are #defined

- * here for the .c file.  The .h file will also have to be edited. */

-#include "usb-keyboard.h"

-#include <xkbsrv.h>

-

-#define GETPRIV       myPrivate *priv                            \

-                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private

-

-#define LOG0(f)       dmxLog(dmxDebug,f)

-#define LOG1(f,a)     dmxLog(dmxDebug,f,a)

-#define LOG2(f,a,b)   dmxLog(dmxDebug,f,a,b)

-#define LOG3(f,a,b,c) dmxLog(dmxDebug,f,a,b,c)

-#define FATAL0(f)     dmxLog(dmxFatal,f)

-#define FATAL1(f,a)   dmxLog(dmxFatal,f,a)

-#define FATAL2(f,a,b) dmxLog(dmxFatal,f,a,b)

-#define MOTIONPROC    dmxMotionProcPtr

-#define ENQUEUEPROC   dmxEnqueueProcPtr

-#define CHECKPROC     dmxCheckSpecialProcPtr

-#define BLOCK         DMXBlockType

-

-/* End of interface definitions. */

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

-

-#define GLYPHS_PER_KEY	4

-#define NUM_KEYCODES	248

-#define MIN_KEYCODE     8

-#define MAX_KEYCODE     (NUM_KEYCODES + MIN_KEYCODE - 1)

-

-static KeySym map[NUM_KEYCODES * GLYPHS_PER_KEY] = {

-/* Table modified from xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h */

-    /* 0x00 */  NoSymbol,       NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x01 */  XK_Escape,      NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x02 */  XK_1,           XK_exclam,	NoSymbol,	NoSymbol,

-    /* 0x03 */  XK_2,           XK_at,		NoSymbol,	NoSymbol,

-    /* 0x04 */  XK_3,           XK_numbersign,	NoSymbol,	NoSymbol,

-    /* 0x05 */  XK_4,           XK_dollar,	NoSymbol,	NoSymbol,

-    /* 0x06 */  XK_5,           XK_percent,	NoSymbol,	NoSymbol,

-    /* 0x07 */  XK_6,           XK_asciicircum,	NoSymbol,	NoSymbol,

-    /* 0x08 */  XK_7,           XK_ampersand,	NoSymbol,	NoSymbol,

-    /* 0x09 */  XK_8,           XK_asterisk,	NoSymbol,	NoSymbol,

-    /* 0x0a */  XK_9,           XK_parenleft,	NoSymbol,	NoSymbol,

-    /* 0x0b */  XK_0,           XK_parenright,	NoSymbol,	NoSymbol,

-    /* 0x0c */  XK_minus,       XK_underscore,	NoSymbol,	NoSymbol,

-    /* 0x0d */  XK_equal,       XK_plus,	NoSymbol,	NoSymbol,

-    /* 0x0e */  XK_BackSpace,   NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x0f */  XK_Tab,         XK_ISO_Left_Tab,NoSymbol,	NoSymbol,

-    /* 0x10 */  XK_Q,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x11 */  XK_W,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x12 */  XK_E,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x13 */  XK_R,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x14 */  XK_T,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x15 */  XK_Y,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x16 */  XK_U,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x17 */  XK_I,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x18 */  XK_O,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x19 */  XK_P,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x1a */  XK_bracketleft, XK_braceleft,	NoSymbol,	NoSymbol,

-    /* 0x1b */  XK_bracketright,XK_braceright,	NoSymbol,	NoSymbol,

-    /* 0x1c */  XK_Return,      NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x1d */  XK_Control_L,   NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x1e */  XK_A,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x1f */  XK_S,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x20 */  XK_D,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x21 */  XK_F,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x22 */  XK_G,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x23 */  XK_H,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x24 */  XK_J,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x25 */  XK_K,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x26 */  XK_L,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x27 */  XK_semicolon,   XK_colon,	NoSymbol,	NoSymbol,

-    /* 0x28 */  XK_quoteright,  XK_quotedbl,	NoSymbol,	NoSymbol,

-    /* 0x29 */  XK_quoteleft,	XK_asciitilde,	NoSymbol,	NoSymbol,

-    /* 0x2a */  XK_Shift_L,     NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x2b */  XK_backslash,   XK_bar,		NoSymbol,	NoSymbol,

-    /* 0x2c */  XK_Z,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x2d */  XK_X,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x2e */  XK_C,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x2f */  XK_V,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x30 */  XK_B,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x31 */  XK_N,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x32 */  XK_M,           NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x33 */  XK_comma,       XK_less,	NoSymbol,	NoSymbol,

-    /* 0x34 */  XK_period,      XK_greater,	NoSymbol,	NoSymbol,

-    /* 0x35 */  XK_slash,       XK_question,	NoSymbol,	NoSymbol,

-    /* 0x36 */  XK_Shift_R,     NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x37 */  XK_KP_Multiply, NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x38 */  XK_Alt_L,	XK_Meta_L,	NoSymbol,	NoSymbol,

-    /* 0x39 */  XK_space,       NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x3a */  XK_Caps_Lock,   NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x3b */  XK_F1,          NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x3c */  XK_F2,          NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x3d */  XK_F3,          NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x3e */  XK_F4,          NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x3f */  XK_F5,          NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x40 */  XK_F6,          NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x41 */  XK_F7,          NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x42 */  XK_F8,          NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x43 */  XK_F9,          NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x44 */  XK_F10,         NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x45 */  XK_Num_Lock,    NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x46 */  XK_Scroll_Lock,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x47 */  XK_KP_Home,	XK_KP_7,	NoSymbol,	NoSymbol,

-    /* 0x48 */  XK_KP_Up,	XK_KP_8,	NoSymbol,	NoSymbol,

-    /* 0x49 */  XK_KP_Prior,	XK_KP_9,	NoSymbol,	NoSymbol,

-    /* 0x4a */  XK_KP_Subtract, NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x4b */  XK_KP_Left,	XK_KP_4,	NoSymbol,	NoSymbol,

-    /* 0x4c */  XK_KP_Begin,	XK_KP_5,	NoSymbol,	NoSymbol,

-    /* 0x4d */  XK_KP_Right,	XK_KP_6,	NoSymbol,	NoSymbol,

-    /* 0x4e */  XK_KP_Add,      NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x4f */  XK_KP_End,	XK_KP_1,	NoSymbol,	NoSymbol,

-    /* 0x50 */  XK_KP_Down,	XK_KP_2,	NoSymbol,	NoSymbol,

-    /* 0x51 */  XK_KP_Next,	XK_KP_3,	NoSymbol,	NoSymbol,

-    /* 0x52 */  XK_KP_Insert,	XK_KP_0,	NoSymbol,	NoSymbol,

-    /* 0x53 */  XK_KP_Delete,	XK_KP_Decimal,	NoSymbol,	NoSymbol,

-    /* 0x54 */  XK_Sys_Req,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x55 */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x56 */  XK_less,	XK_greater,	NoSymbol,	NoSymbol,

-    /* 0x57 */  XK_F11,		NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x58 */  XK_F12,		NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x59 */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x5a */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x5b */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x5c */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x5d */  XK_Begin,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x5e */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x5f */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x60 */  XK_KP_Enter,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x61 */  XK_Control_R,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x62 */  XK_KP_Divide,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x63 */  XK_Print,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x64 */  XK_Alt_R,	XK_Meta_R,	NoSymbol,	NoSymbol,

-    /* 0x65 */  XK_Break,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x66 */  XK_Home,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x67 */  XK_Up,		NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x68 */  XK_Prior,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x69 */  XK_Left,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x6a */  XK_Right,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x6b */  XK_End,		NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x6c */  XK_Down,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x6d */  XK_Next,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x6e */  XK_Insert,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x6f */  XK_Delete,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x70 */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x71 */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x72 */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x73 */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x74 */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x75 */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x76 */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x77 */  XK_Pause,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x78 */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x79 */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x7a */  XK_Menu,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x7b */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x7c */  NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x7d */  XK_Super_L,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x7e */  XK_Super_R,	NoSymbol,	NoSymbol,	NoSymbol,

-    /* 0x7f */  XK_Menu,	NoSymbol,	NoSymbol,	NoSymbol,

-};

-

-static int kbdUSBKeyDown(myPrivate *priv, int keyCode)

-{

-    CARD8  byte = keyCode >> 5;

-    CARD32 bit  = 1 << (keyCode & 0x1f);

-

-    if (byte > NUM_STATE_ENTRIES) return 0;

-    return priv->kbdState[byte] & bit;

-}

-

-static void kbdUSBKeyState(myPrivate *priv, int type, int keyCode)

-{

-    CARD8  byte = keyCode >> 5;

-    CARD32 bit  = 1 << (keyCode & 0x1f);

-

-    if (byte > NUM_STATE_ENTRIES) return;

-    if (type == KeyPress) priv->kbdState[byte] |= bit;

-    else                  priv->kbdState[byte] &= ~bit;

-}

-

-/** Set the LEDs. */

-void kbdUSBCtrl(DevicePtr pDev, KeybdCtrl *ctrl)

-{

-    GETPRIV;

-    struct timeval     tv;

-    struct input_event event;

-    int                i, led;

-

-    gettimeofday(&tv, NULL);

-    for (i = 0; i < 5; i++) {

-        event.time.tv_sec    = tv.tv_sec;

-        event.time.tv_usec   = tv.tv_usec;

-        event.type           = EV_LED;

-        if (i == 0)      led = 1; /* LED_CAPSL == 0x01 */

-        else if (i == 1) led = 0; /* LED_NUML  == 0x00 */

-        else             led = i;

-        event.code           = led;

-        event.value          = !!(ctrl->leds & (1 << led));

-        write(priv->fd, &event, sizeof(event));

-    }

-}

-

-/** Initialize \a pDev using #usbInit. */

-void kbdUSBInit(DevicePtr pDev)

-{

-    usbInit(pDev, usbKeyboard);

-}

-

-static void kbdUSBConvert(DevicePtr pDev,

-                          unsigned int scanCode,

-                          int value,

-                          ENQUEUEPROC enqueue,

-                          CHECKPROC checkspecial,

-                          BLOCK block)

-{

-    GETPRIV;

-    XkbSrvInfoPtr  xkbi = priv->pKeyboard->key->xkbInfo;

-    int            type;

-    int            keyCode;

-    KeySym         keySym   = NoSymbol;

-    int            switching;

-

-    /* Set up xEvent information */

-    type   = value ? KeyPress : KeyRelease;

-    keyCode = (scanCode & 0xff) + MIN_KEYCODE;

-

-    /* Handle repeats */

-

-    if (keyCode >= xkbi->desc->min_key_code &&

-        keyCode <= xkbi->desc->max_key_code) {

-

-        int effectiveGroup = XkbGetEffectiveGroup(xkbi,

-                                                  &xkbi->state,

-                                                  scanCode);

-        keySym = XkbKeySym(xkbi->desc, scanCode, effectiveGroup);

-#if 0

-        switch (keySym) {

-        case XK_Num_Lock:

-        case XK_Scroll_Lock:

-        case XK_Shift_Lock:

-        case XK_Caps_Lock:

-            /* Ignore releases and all but first press */

-            if (kbdLinuxModIgnore(priv, &xE, keySym)) return;

-            if (kbdLinuxKeyDown(priv, &xE)) xE.u.u.type = KeyRelease;

-            else                            xE.u.u.type = KeyPress;

-            break;

-        }

-#endif

-        

-        /* If key is already down, ignore or autorepeat */

-        if (type == KeyPress && kbdUSBKeyDown(priv, keyCode)) {

-            KbdFeedbackClassRec *feed = priv->pDevice->kbdfeed;

-

-            /* No auto-repeat? */

-            if ((feed && !feed->ctrl.autoRepeat)

-                || priv->pDevice->key->xkbInfo->desc->map->modmap[keyCode]

-                || (feed

-                    && !(feed->ctrl.autoRepeats[keyCode >> 3]

-                         & (1 << (keyCode & 7))))) return; /* Ignore */

-            

-            /* Do auto-repeat */

-            enqueue(pDev, KeyRelease, keyCode, keySym, NULL, block);

-            type = KeyPress;

-        }

-        

-        /* If key is already up, ignore */

-        if (type == KeyRelease && !kbdUSBKeyDown(priv, keyCode)) return;

-    }

-

-    switching = 0;

-    if (checkspecial && type == KeyPress)

-        switching = checkspecial(pDev, keySym);

-    if (!switching) {

-        if (enqueue)

-            enqueue(pDev, type, keyCode, keySym, NULL, block);

-        kbdUSBKeyState(priv, type, keyCode); /* Update our state bitmap */

-    }

-}

-

-/** Read an event from the \a pDev device.  If the event is a motion

- * event, enqueue it with the \a motion function.  Otherwise, check for

- * special keys with the \a checkspecial function and enqueue the event

- * with the \a enqueue function.  The \a block type is passed to the

- * functions so that they may block SIGIO handling as appropriate to the

- * caller of this function. */

-void kbdUSBRead(DevicePtr pDev,

-                MOTIONPROC motion,

-                ENQUEUEPROC enqueue,

-                CHECKPROC checkspecial,

-                BLOCK block)

-{

-    GETPRIV;

-    struct input_event raw;

-

-    while (read(priv->fd, &raw, sizeof(raw)) > 0) {

-#if USB_KEYBOARD_DEBUG

-        LOG3("KBD: type = %d, code = 0x%02x, value = %d\n",

-             raw.type, raw.code, raw.value);

-#endif

-        kbdUSBConvert(pDev, raw.code, raw.value, enqueue, checkspecial, block);

-    }

-}

-

-/** Turn \a pDev on (i.e., take input from \a pDev). */

-int kbdUSBOn(DevicePtr pDev)

-{

-    GETPRIV;

-

-    if (priv->fd < 0) kbdUSBInit(pDev);

-    return priv->fd;

-}

-

-static void kbdUSBGetMap(DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)

-{

-    KeySym        *k, *mapCopy;

-    int           i;

-

-    mapCopy = malloc(sizeof(map));

-    memcpy(mapCopy, map, sizeof(map));

-

-    /* compute the modifier map */

-    for (i = 0; i < MAP_LENGTH; i++)

-        pModMap[i] = NoSymbol;  /* make sure it is restored */

-

-    for (k = mapCopy, i = MIN_KEYCODE;

-         i < NUM_KEYCODES + MIN_KEYCODE;

-         i++, k += 4) {

-        switch(*k) {

-        case XK_Shift_L:

-        case XK_Shift_R:     pModMap[i] = ShiftMask;      break;

-        case XK_Control_L:

-        case XK_Control_R:   pModMap[i] = ControlMask;    break;

-        case XK_Caps_Lock:   pModMap[i] = LockMask;       break;

-        case XK_Alt_L:

-        case XK_Alt_R:       pModMap[i] = AltMask;        break;

-        case XK_Num_Lock:    pModMap[i] = NumLockMask;    break;

-        case XK_Scroll_Lock: pModMap[i] = ScrollLockMask; break;

-        case XK_Kana_Lock:

-        case XK_Kana_Shift:  pModMap[i] = KanaMask;       break;

-        case XK_Mode_switch: pModMap[i] = AltLangMask;    break;

-        }

-    }

-

-    pKeySyms->map        = mapCopy; /* Must be XFree'able */

-    pKeySyms->mapWidth   = GLYPHS_PER_KEY;

-    pKeySyms->minKeyCode = MIN_KEYCODE;

-    pKeySyms->maxKeyCode = MAX_KEYCODE;

-}

-

-/** Fill the \a info structure with information needed to initialize \a

- * pDev. */ 

-void kbdUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)

-{

-    info->keyboard         = 1;

-    info->keyClass         = 1;

-    kbdUSBGetMap(pDev, &info->keySyms, info->modMap);

-    info->focusClass       = 1;

-    info->kbdFeedbackClass = 1;

-    info->names.keycodes   = strdup("powerpcps2");

-    info->force            = 1;

-}

+/* Portions of this file were derived from the following files:
+ *
+ **********************************************************************
+ *
+ * xfree86/common/xf86KbdLnx.c
+ *
+ * Linux version of keymapping setup. The kernel (since 0.99.14) has support
+ * for fully remapping the keyboard, but there are some differences between
+ * the Linux map and the SVR4 map (esp. in the extended keycodes). We also
+ * remove the restriction on what keycodes can be remapped.
+ * Orest Zborowski.
+ *
+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+ *
+ * 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 Thomas Roell not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Thomas Roell makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THOMAS ROELL 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.
+ *
+ */
+
+/*
+ * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ *
+ * This code implements a low-level device driver for a USB keyboard
+ * under Linux.  The keymap description is derived from code by Thomas
+ * Roell, Orest Zborowski. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "atKeynames.h"
+#include "usb-private.h"
+
+#define USB_KEYBOARD_DEBUG 0
+
+/*****************************************************************************/
+/* Define some macros to make it easier to move this file to another
+ * part of the Xserver tree.  All calls to the dmx* layer are #defined
+ * here for the .c file.  The .h file will also have to be edited. */
+#include "usb-keyboard.h"
+#include <xkbsrv.h>
+
+#define GETPRIV       myPrivate *priv                            \
+                      = ((DMXLocalInputInfoPtr)(pDev->devicePrivate))->private
+
+#define LOG0(f)       dmxLog(dmxDebug,f)
+#define LOG1(f,a)     dmxLog(dmxDebug,f,a)
+#define LOG2(f,a,b)   dmxLog(dmxDebug,f,a,b)
+#define LOG3(f,a,b,c) dmxLog(dmxDebug,f,a,b,c)
+#define FATAL0(f)     dmxLog(dmxFatal,f)
+#define FATAL1(f,a)   dmxLog(dmxFatal,f,a)
+#define FATAL2(f,a,b) dmxLog(dmxFatal,f,a,b)
+#define MOTIONPROC    dmxMotionProcPtr
+#define ENQUEUEPROC   dmxEnqueueProcPtr
+#define CHECKPROC     dmxCheckSpecialProcPtr
+#define BLOCK         DMXBlockType
+
+/* End of interface definitions. */
+/*****************************************************************************/
+
+#define GLYPHS_PER_KEY	4
+#define NUM_KEYCODES	248
+#define MIN_KEYCODE     8
+#define MAX_KEYCODE     (NUM_KEYCODES + MIN_KEYCODE - 1)
+
+static KeySym map[NUM_KEYCODES * GLYPHS_PER_KEY] = {
+/* Table modified from xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h */
+    /* 0x00 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x01 */ XK_Escape, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x02 */ XK_1, XK_exclam, NoSymbol, NoSymbol,
+    /* 0x03 */ XK_2, XK_at, NoSymbol, NoSymbol,
+    /* 0x04 */ XK_3, XK_numbersign, NoSymbol, NoSymbol,
+    /* 0x05 */ XK_4, XK_dollar, NoSymbol, NoSymbol,
+    /* 0x06 */ XK_5, XK_percent, NoSymbol, NoSymbol,
+    /* 0x07 */ XK_6, XK_asciicircum, NoSymbol, NoSymbol,
+    /* 0x08 */ XK_7, XK_ampersand, NoSymbol, NoSymbol,
+    /* 0x09 */ XK_8, XK_asterisk, NoSymbol, NoSymbol,
+    /* 0x0a */ XK_9, XK_parenleft, NoSymbol, NoSymbol,
+    /* 0x0b */ XK_0, XK_parenright, NoSymbol, NoSymbol,
+    /* 0x0c */ XK_minus, XK_underscore, NoSymbol, NoSymbol,
+    /* 0x0d */ XK_equal, XK_plus, NoSymbol, NoSymbol,
+    /* 0x0e */ XK_BackSpace, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x0f */ XK_Tab, XK_ISO_Left_Tab, NoSymbol, NoSymbol,
+    /* 0x10 */ XK_Q, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x11 */ XK_W, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x12 */ XK_E, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x13 */ XK_R, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x14 */ XK_T, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x15 */ XK_Y, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x16 */ XK_U, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x17 */ XK_I, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x18 */ XK_O, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x19 */ XK_P, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x1a */ XK_bracketleft, XK_braceleft, NoSymbol, NoSymbol,
+    /* 0x1b */ XK_bracketright, XK_braceright, NoSymbol, NoSymbol,
+    /* 0x1c */ XK_Return, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x1d */ XK_Control_L, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x1e */ XK_A, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x1f */ XK_S, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x20 */ XK_D, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x21 */ XK_F, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x22 */ XK_G, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x23 */ XK_H, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x24 */ XK_J, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x25 */ XK_K, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x26 */ XK_L, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x27 */ XK_semicolon, XK_colon, NoSymbol, NoSymbol,
+    /* 0x28 */ XK_quoteright, XK_quotedbl, NoSymbol, NoSymbol,
+    /* 0x29 */ XK_quoteleft, XK_asciitilde, NoSymbol, NoSymbol,
+    /* 0x2a */ XK_Shift_L, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x2b */ XK_backslash, XK_bar, NoSymbol, NoSymbol,
+    /* 0x2c */ XK_Z, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x2d */ XK_X, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x2e */ XK_C, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x2f */ XK_V, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x30 */ XK_B, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x31 */ XK_N, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x32 */ XK_M, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x33 */ XK_comma, XK_less, NoSymbol, NoSymbol,
+    /* 0x34 */ XK_period, XK_greater, NoSymbol, NoSymbol,
+    /* 0x35 */ XK_slash, XK_question, NoSymbol, NoSymbol,
+    /* 0x36 */ XK_Shift_R, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x37 */ XK_KP_Multiply, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x38 */ XK_Alt_L, XK_Meta_L, NoSymbol, NoSymbol,
+    /* 0x39 */ XK_space, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x3a */ XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x3b */ XK_F1, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x3c */ XK_F2, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x3d */ XK_F3, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x3e */ XK_F4, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x3f */ XK_F5, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x40 */ XK_F6, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x41 */ XK_F7, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x42 */ XK_F8, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x43 */ XK_F9, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x44 */ XK_F10, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x45 */ XK_Num_Lock, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x46 */ XK_Scroll_Lock, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x47 */ XK_KP_Home, XK_KP_7, NoSymbol, NoSymbol,
+    /* 0x48 */ XK_KP_Up, XK_KP_8, NoSymbol, NoSymbol,
+    /* 0x49 */ XK_KP_Prior, XK_KP_9, NoSymbol, NoSymbol,
+    /* 0x4a */ XK_KP_Subtract, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x4b */ XK_KP_Left, XK_KP_4, NoSymbol, NoSymbol,
+    /* 0x4c */ XK_KP_Begin, XK_KP_5, NoSymbol, NoSymbol,
+    /* 0x4d */ XK_KP_Right, XK_KP_6, NoSymbol, NoSymbol,
+    /* 0x4e */ XK_KP_Add, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x4f */ XK_KP_End, XK_KP_1, NoSymbol, NoSymbol,
+    /* 0x50 */ XK_KP_Down, XK_KP_2, NoSymbol, NoSymbol,
+    /* 0x51 */ XK_KP_Next, XK_KP_3, NoSymbol, NoSymbol,
+    /* 0x52 */ XK_KP_Insert, XK_KP_0, NoSymbol, NoSymbol,
+    /* 0x53 */ XK_KP_Delete, XK_KP_Decimal, NoSymbol, NoSymbol,
+    /* 0x54 */ XK_Sys_Req, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x55 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x56 */ XK_less, XK_greater, NoSymbol, NoSymbol,
+    /* 0x57 */ XK_F11, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x58 */ XK_F12, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x59 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x5a */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x5b */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x5c */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x5d */ XK_Begin, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x5e */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x5f */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x60 */ XK_KP_Enter, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x61 */ XK_Control_R, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x62 */ XK_KP_Divide, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x63 */ XK_Print, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x64 */ XK_Alt_R, XK_Meta_R, NoSymbol, NoSymbol,
+    /* 0x65 */ XK_Break, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x66 */ XK_Home, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x67 */ XK_Up, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x68 */ XK_Prior, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x69 */ XK_Left, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x6a */ XK_Right, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x6b */ XK_End, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x6c */ XK_Down, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x6d */ XK_Next, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x6e */ XK_Insert, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x6f */ XK_Delete, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x70 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x71 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x72 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x73 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x74 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x75 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x76 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x77 */ XK_Pause, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x78 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x79 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x7a */ XK_Menu, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x7b */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x7c */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x7d */ XK_Super_L, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x7e */ XK_Super_R, NoSymbol, NoSymbol, NoSymbol,
+    /* 0x7f */ XK_Menu, NoSymbol, NoSymbol, NoSymbol,
+};
+
+static int
+kbdUSBKeyDown(myPrivate * priv, int keyCode)
+{
+    CARD8 byte = keyCode >> 5;
+    CARD32 bit = 1 << (keyCode & 0x1f);
+
+    if (byte > NUM_STATE_ENTRIES)
+        return 0;
+    return priv->kbdState[byte] & bit;
+}
+
+static void
+kbdUSBKeyState(myPrivate * priv, int type, int keyCode)
+{
+    CARD8 byte = keyCode >> 5;
+    CARD32 bit = 1 << (keyCode & 0x1f);
+
+    if (byte > NUM_STATE_ENTRIES)
+        return;
+    if (type == KeyPress)
+        priv->kbdState[byte] |= bit;
+    else
+        priv->kbdState[byte] &= ~bit;
+}
+
+/** Set the LEDs. */
+void
+kbdUSBCtrl(DevicePtr pDev, KeybdCtrl * ctrl)
+{
+    GETPRIV;
+    struct timeval tv;
+    struct input_event event;
+    int i, led;
+
+    gettimeofday(&tv, NULL);
+    for (i = 0; i < 5; i++) {
+        event.time.tv_sec = tv.tv_sec;
+        event.time.tv_usec = tv.tv_usec;
+        event.type = EV_LED;
+        if (i == 0)
+            led = 1;            /* LED_CAPSL == 0x01 */
+        else if (i == 1)
+            led = 0;            /* LED_NUML  == 0x00 */
+        else
+            led = i;
+        event.code = led;
+        event.value = ! !(ctrl->leds & (1 << led));
+        write(priv->fd, &event, sizeof(event));
+    }
+}
+
+/** Initialize \a pDev using #usbInit. */
+void
+kbdUSBInit(DevicePtr pDev)
+{
+    usbInit(pDev, usbKeyboard);
+}
+
+static void
+kbdUSBConvert(DevicePtr pDev,
+              unsigned int scanCode,
+              int value,
+              ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
+{
+    GETPRIV;
+    XkbSrvInfoPtr xkbi = priv->pKeyboard->key->xkbInfo;
+    int type;
+    int keyCode;
+    KeySym keySym = NoSymbol;
+    int switching;
+
+    /* Set up xEvent information */
+    type = value ? KeyPress : KeyRelease;
+    keyCode = (scanCode & 0xff) + MIN_KEYCODE;
+
+    /* Handle repeats */
+
+    if (keyCode >= xkbi->desc->min_key_code &&
+        keyCode <= xkbi->desc->max_key_code) {
+
+        int effectiveGroup = XkbGetEffectiveGroup(xkbi,
+                                                  &xkbi->state,
+                                                  scanCode);
+
+        keySym = XkbKeySym(xkbi->desc, scanCode, effectiveGroup);
+#if 0
+        switch (keySym) {
+        case XK_Num_Lock:
+        case XK_Scroll_Lock:
+        case XK_Shift_Lock:
+        case XK_Caps_Lock:
+            /* Ignore releases and all but first press */
+            if (kbdLinuxModIgnore(priv, &xE, keySym))
+                return;
+            if (kbdLinuxKeyDown(priv, &xE))
+                xE.u.u.type = KeyRelease;
+            else
+                xE.u.u.type = KeyPress;
+            break;
+        }
+#endif
+
+        /* If key is already down, ignore or autorepeat */
+        if (type == KeyPress && kbdUSBKeyDown(priv, keyCode)) {
+            KbdFeedbackClassRec *feed = priv->pDevice->kbdfeed;
+
+            /* No auto-repeat? */
+            if ((feed && !feed->ctrl.autoRepeat)
+                || priv->pDevice->key->xkbInfo->desc->map->modmap[keyCode]
+                || (feed && !(feed->ctrl.autoRepeats[keyCode >> 3]
+                              & (1 << (keyCode & 7)))))
+                return;         /* Ignore */
+
+            /* Do auto-repeat */
+            enqueue(pDev, KeyRelease, keyCode, keySym, NULL, block);
+            type = KeyPress;
+        }
+
+        /* If key is already up, ignore */
+        if (type == KeyRelease && !kbdUSBKeyDown(priv, keyCode))
+            return;
+    }
+
+    switching = 0;
+    if (checkspecial && type == KeyPress)
+        switching = checkspecial(pDev, keySym);
+    if (!switching) {
+        if (enqueue)
+            enqueue(pDev, type, keyCode, keySym, NULL, block);
+        kbdUSBKeyState(priv, type, keyCode);    /* Update our state bitmap */
+    }
+}
+
+/** Read an event from the \a pDev device.  If the event is a motion
+ * event, enqueue it with the \a motion function.  Otherwise, check for
+ * special keys with the \a checkspecial function and enqueue the event
+ * with the \a enqueue function.  The \a block type is passed to the
+ * functions so that they may block SIGIO handling as appropriate to the
+ * caller of this function. */
+void
+kbdUSBRead(DevicePtr pDev,
+           MOTIONPROC motion,
+           ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
+{
+    GETPRIV;
+    struct input_event raw;
+
+    while (read(priv->fd, &raw, sizeof(raw)) > 0) {
+#if USB_KEYBOARD_DEBUG
+        LOG3("KBD: type = %d, code = 0x%02x, value = %d\n",
+             raw.type, raw.code, raw.value);
+#endif
+        kbdUSBConvert(pDev, raw.code, raw.value, enqueue, checkspecial, block);
+    }
+}
+
+/** Turn \a pDev on (i.e., take input from \a pDev). */
+int
+kbdUSBOn(DevicePtr pDev)
+{
+    GETPRIV;
+
+    if (priv->fd < 0)
+        kbdUSBInit(pDev);
+    return priv->fd;
+}
+
+static void
+kbdUSBGetMap(DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)
+{
+    KeySym *k, *mapCopy;
+    int i;
+
+    mapCopy = malloc(sizeof(map));
+    memcpy(mapCopy, map, sizeof(map));
+
+    /* compute the modifier map */
+    for (i = 0; i < MAP_LENGTH; i++)
+        pModMap[i] = NoSymbol;  /* make sure it is restored */
+
+    for (k = mapCopy, i = MIN_KEYCODE;
+         i < NUM_KEYCODES + MIN_KEYCODE; i++, k += 4) {
+        switch (*k) {
+        case XK_Shift_L:
+        case XK_Shift_R:
+            pModMap[i] = ShiftMask;
+            break;
+        case XK_Control_L:
+        case XK_Control_R:
+            pModMap[i] = ControlMask;
+            break;
+        case XK_Caps_Lock:
+            pModMap[i] = LockMask;
+            break;
+        case XK_Alt_L:
+        case XK_Alt_R:
+            pModMap[i] = AltMask;
+            break;
+        case XK_Num_Lock:
+            pModMap[i] = NumLockMask;
+            break;
+        case XK_Scroll_Lock:
+            pModMap[i] = ScrollLockMask;
+            break;
+        case XK_Kana_Lock:
+        case XK_Kana_Shift:
+            pModMap[i] = KanaMask;
+            break;
+        case XK_Mode_switch:
+            pModMap[i] = AltLangMask;
+            break;
+        }
+    }
+
+    pKeySyms->map = mapCopy;    /* Must be XFree'able */
+    pKeySyms->mapWidth = GLYPHS_PER_KEY;
+    pKeySyms->minKeyCode = MIN_KEYCODE;
+    pKeySyms->maxKeyCode = MAX_KEYCODE;
+}
+
+/** Fill the \a info structure with information needed to initialize \a
+ * pDev. */
+void
+kbdUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+{
+    info->keyboard = 1;
+    info->keyClass = 1;
+    kbdUSBGetMap(pDev, &info->keySyms, info->modMap);
+    info->focusClass = 1;
+    info->kbdFeedbackClass = 1;
+    info->names.keycodes = strdup("powerpcps2");
+    info->force = 1;
+}
diff --git a/xorg-server/hw/dmx/input/usb-keyboard.h b/xorg-server/hw/dmx/input/usb-keyboard.h
index 1f9614eef..e14cca1c2 100644
--- a/xorg-server/hw/dmx/input/usb-keyboard.h
+++ b/xorg-server/hw/dmx/input/usb-keyboard.h
@@ -36,13 +36,12 @@
 
 #ifndef _USB_KEYBOARD_H_
 #define _USB_KEYBOARD_H_
-extern void    kbdUSBInit(DevicePtr pDev);
-extern void    kbdUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-extern int     kbdUSBOn(DevicePtr pDev);
-extern void    kbdUSBRead(DevicePtr pDev,
-                          dmxMotionProcPtr motion,
-                          dmxEnqueueProcPtr enqueue,
-                          dmxCheckSpecialProcPtr checkspecial,
-                          DMXBlockType block);
-extern void    kbdUSBCtrl(DevicePtr pDev, KeybdCtrl *ctrl);
+extern void kbdUSBInit(DevicePtr pDev);
+extern void kbdUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
+extern int kbdUSBOn(DevicePtr pDev);
+extern void kbdUSBRead(DevicePtr pDev,
+                       dmxMotionProcPtr motion,
+                       dmxEnqueueProcPtr enqueue,
+                       dmxCheckSpecialProcPtr checkspecial, DMXBlockType block);
+extern void kbdUSBCtrl(DevicePtr pDev, KeybdCtrl * ctrl);
 #endif
diff --git a/xorg-server/hw/dmx/input/usb-mouse.c b/xorg-server/hw/dmx/input/usb-mouse.c
index efa9d00ec..644342ee3 100644
--- a/xorg-server/hw/dmx/input/usb-mouse.c
+++ b/xorg-server/hw/dmx/input/usb-mouse.c
@@ -66,61 +66,68 @@
 /*****************************************************************************/
 
 /** Read the USB device using #usbRead. */
-void mouUSBRead(DevicePtr pDev,
-                MOTIONPROC motion,
-                ENQUEUEPROC enqueue,
-                CHECKPROC checkspecial,
-                BLOCK block)
+void
+mouUSBRead(DevicePtr pDev,
+           MOTIONPROC motion,
+           ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
 {
     usbRead(pDev, motion, enqueue, BTN_MISC, block);
 }
 
 /** Initialize \a pDev using #usbInit. */
-void mouUSBInit(DevicePtr pDev)
+void
+mouUSBInit(DevicePtr pDev)
 {
     usbInit(pDev, usbMouse);
 }
 
 /** Turn \a pDev on (i.e., take input from \a pDev). */
-int mouUSBOn(DevicePtr pDev)
+int
+mouUSBOn(DevicePtr pDev)
 {
     GETPRIV;
 
-    if (priv->fd < 0) mouUSBInit(pDev);
+    if (priv->fd < 0)
+        mouUSBInit(pDev);
     return priv->fd;
 }
 
-static void mouUSBGetMap(DevicePtr pDev, unsigned char *map, int *nButtons)
+static void
+mouUSBGetMap(DevicePtr pDev, unsigned char *map, int *nButtons)
 {
     int i;
-    
-    if (nButtons) *nButtons = 5;
-    if (map) for (i = 0; i <= *nButtons; i++) map[i] = i;
+
+    if (nButtons)
+        *nButtons = 5;
+    if (map)
+        for (i = 0; i <= *nButtons; i++)
+            map[i] = i;
 }
 
 /** Fill the \a info structure with information needed to initialize \a
- * pDev. */ 
-void mouUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+ * pDev. */
+void
+mouUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
 {
     static KeySym keyboard_mapping = NoSymbol;
 
-    info->buttonClass        = 1;
+    info->buttonClass = 1;
     mouUSBGetMap(pDev, info->map, &info->numButtons);
-    info->valuatorClass      = 1;
-    info->numRelAxes         = 2;
-    info->minval[0]          = 0;
-    info->maxval[0]          = 0;
-    info->res[0]             = 1;
-    info->minres[0]          = 0;
-    info->maxres[0]          = 1;
-    info->ptrFeedbackClass   = 1;
-
-                                /* Some USB mice devices return key
-                                 * events from their pair'd
-                                 * keyboard...  */
-    info->keyClass           = 1;
+    info->valuatorClass = 1;
+    info->numRelAxes = 2;
+    info->minval[0] = 0;
+    info->maxval[0] = 0;
+    info->res[0] = 1;
+    info->minres[0] = 0;
+    info->maxres[0] = 1;
+    info->ptrFeedbackClass = 1;
+
+    /* Some USB mice devices return key
+     * events from their pair'd
+     * keyboard...  */
+    info->keyClass = 1;
     info->keySyms.minKeyCode = 8;
     info->keySyms.maxKeyCode = 8;
-    info->keySyms.mapWidth   = 1;
-    info->keySyms.map        = &keyboard_mapping;
+    info->keySyms.mapWidth = 1;
+    info->keySyms.map = &keyboard_mapping;
 }
diff --git a/xorg-server/hw/dmx/input/usb-mouse.h b/xorg-server/hw/dmx/input/usb-mouse.h
index 918bf6481..91f6fcf86 100644
--- a/xorg-server/hw/dmx/input/usb-mouse.h
+++ b/xorg-server/hw/dmx/input/usb-mouse.h
@@ -36,13 +36,12 @@
 
 #ifndef _USB_MOU_H_
 #define _USB_MOU_H_
-extern void    mouUSBRead(DevicePtr pDev,
-                          dmxMotionProcPtr motion,
-                          dmxEnqueueProcPtr enqueue,
-                          dmxCheckSpecialProcPtr checkspecial,
-                          DMXBlockType block);
-extern void    mouUSBInit(DevicePtr pDev);
-extern void    mouUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-extern int     mouUSBOn(DevicePtr pDev);
-extern void    mouUSBCtrl(DevicePtr pDev, PtrCtrl *ctrl);
+extern void mouUSBRead(DevicePtr pDev,
+                       dmxMotionProcPtr motion,
+                       dmxEnqueueProcPtr enqueue,
+                       dmxCheckSpecialProcPtr checkspecial, DMXBlockType block);
+extern void mouUSBInit(DevicePtr pDev);
+extern void mouUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
+extern int mouUSBOn(DevicePtr pDev);
+extern void mouUSBCtrl(DevicePtr pDev, PtrCtrl * ctrl);
 #endif
diff --git a/xorg-server/hw/dmx/input/usb-other.c b/xorg-server/hw/dmx/input/usb-other.c
index d1074b8e1..f24f259c1 100644
--- a/xorg-server/hw/dmx/input/usb-other.c
+++ b/xorg-server/hw/dmx/input/usb-other.c
@@ -68,92 +68,97 @@
 /*****************************************************************************/
 
 /** Read the USB device using #usbRead. */
-void othUSBRead(DevicePtr pDev,
-                MOTIONPROC motion,
-                ENQUEUEPROC enqueue,
-                CHECKPROC checkspecial,
-                BLOCK block)
+void
+othUSBRead(DevicePtr pDev,
+           MOTIONPROC motion,
+           ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)
 {
     usbRead(pDev, motion, enqueue, 0xffff, block);
 }
 
 /** Initialize \a pDev using #usbInit. */
-void othUSBInit(DevicePtr pDev)
+void
+othUSBInit(DevicePtr pDev)
 {
     usbInit(pDev, usbOther);
 }
 
 /** Turn \a pDev on (i.e., take input from \a pDev). */
-int othUSBOn(DevicePtr pDev)
+int
+othUSBOn(DevicePtr pDev)
 {
     GETPRIV;
 
-    if (priv->fd < 0) othUSBInit(pDev);
+    if (priv->fd < 0)
+        othUSBInit(pDev);
     return priv->fd;
 }
 
 /** Fill the \a info structure with information needed to initialize \a
- * pDev. */ 
-void othUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
+ * pDev. */
+void
+othUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
 {
     GETPRIV;
-    int           i, j;
+    int i, j;
     static KeySym keyboard_mapping = NoSymbol;
-    int           absolute[5];
-    
+    int absolute[5];
+
 #define test_bit(bit) (priv->mask[(bit)/8] & (1 << ((bit)%8)))
 
-                                /* Some USB mice devices return key
-                                 * events from their pair'd
-                                 * keyboard...  */
-    info->keyClass           = 1;
+    /* Some USB mice devices return key
+     * events from their pair'd
+     * keyboard...  */
+    info->keyClass = 1;
     info->keySyms.minKeyCode = 8;
     info->keySyms.maxKeyCode = 8;
-    info->keySyms.mapWidth   = 1;
-    info->keySyms.map        = &keyboard_mapping;
+    info->keySyms.mapWidth = 1;
+    info->keySyms.map = &keyboard_mapping;
 
     for (i = 0; i < EV_MAX; i++) {
         if (test_bit(i)) {
             switch (i) {
             case EV_KEY:
-                                /* See above */
+                /* See above */
                 break;
             case EV_REL:
-                info->valuatorClass      = 1;
+                info->valuatorClass = 1;
                 if (info->numRelAxes + info->numAbsAxes > DMX_MAX_AXES - 1) {
-                    info->numRelAxes     = DMX_MAX_AXES - info->numAbsAxes - 1;
+                    info->numRelAxes = DMX_MAX_AXES - info->numAbsAxes - 1;
                     dmxLog(dmxWarning, "Can only use %d relative axes\n",
                            info->numRelAxes);
-                } else
-                    info->numRelAxes     = priv->numRel;
-                info->minval[0]          = 0;
-                info->maxval[0]          = 0;
-                info->res[0]             = 1;
-                info->minres[0]          = 0;
-                info->maxres[0]          = 1;
+                }
+                else
+                    info->numRelAxes = priv->numRel;
+                info->minval[0] = 0;
+                info->maxval[0] = 0;
+                info->res[0] = 1;
+                info->minres[0] = 0;
+                info->maxres[0] = 1;
                 break;
             case EV_ABS:
-                info->valuatorClass      = 1;
+                info->valuatorClass = 1;
                 if (info->numRelAxes + info->numAbsAxes > DMX_MAX_AXES - 1) {
-                    info->numAbsAxes     = DMX_MAX_AXES - info->numRelAxes - 1;
+                    info->numAbsAxes = DMX_MAX_AXES - info->numRelAxes - 1;
                     dmxLog(dmxWarning, "Can only use %d absolute axes\n",
                            info->numAbsAxes);
-                } else
-                    info->numAbsAxes     = priv->numAbs;
+                }
+                else
+                    info->numAbsAxes = priv->numAbs;
                 for (j = 0; j < info->numAbsAxes; j++) {
                     ioctl(priv->fd, EVIOCGABS(j), absolute);
-                    info->minval[1+j]    = absolute[1];
-                    info->maxval[1+j]    = absolute[2];
-                    info->res[1+j]       = absolute[3];
-                    info->minres[1+j]    = absolute[3];
-                    info->maxres[1+j]    = absolute[3];
+                    info->minval[1 + j] = absolute[1];
+                    info->maxval[1 + j] = absolute[2];
+                    info->res[1 + j] = absolute[3];
+                    info->minres[1 + j] = absolute[3];
+                    info->maxres[1 + j] = absolute[3];
                 }
                 break;
             case EV_LED:
-                info->ledFeedbackClass   = 0; /* Not supported at this time */
+                info->ledFeedbackClass = 0;     /* Not supported at this time */
                 break;
             case EV_SND:
-                info->belFeedbackClass   = 0; /* Not supported at this time */
+                info->belFeedbackClass = 0;     /* Not supported at this time */
                 break;
             }
         }
diff --git a/xorg-server/hw/dmx/input/usb-other.h b/xorg-server/hw/dmx/input/usb-other.h
index b69e65933..89939a0a2 100644
--- a/xorg-server/hw/dmx/input/usb-other.h
+++ b/xorg-server/hw/dmx/input/usb-other.h
@@ -36,13 +36,12 @@
 
 #ifndef _USB_OTHER_H_
 #define _USB_OTHER_H_
-extern void    othUSBRead(DevicePtr pDev,
-                          dmxMotionProcPtr motion,
-                          dmxEnqueueProcPtr enqueue,
-                          dmxCheckSpecialProcPtr checkspecial,
-                          DMXBlockType block);
-extern void    othUSBInit(DevicePtr pDev);
-extern void    othUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-extern int     othUSBOn(DevicePtr pDev);
-extern void    othUSBCtrl(DevicePtr pDev, PtrCtrl *ctrl);
+extern void othUSBRead(DevicePtr pDev,
+                       dmxMotionProcPtr motion,
+                       dmxEnqueueProcPtr enqueue,
+                       dmxCheckSpecialProcPtr checkspecial, DMXBlockType block);
+extern void othUSBInit(DevicePtr pDev);
+extern void othUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
+extern int othUSBOn(DevicePtr pDev);
+extern void othUSBCtrl(DevicePtr pDev, PtrCtrl * ctrl);
 #endif
diff --git a/xorg-server/hw/kdrive/ephyr/XF86dri.c b/xorg-server/hw/kdrive/ephyr/XF86dri.c
index 247580e0a..74bf67678 100644
--- a/xorg-server/hw/kdrive/ephyr/XF86dri.c
+++ b/xorg-server/hw/kdrive/ephyr/XF86dri.c
@@ -1,628 +1,647 @@
-/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.13 2002/10/30 12:51:25 alanh Exp $ */

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

-

-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

-Copyright 2000 VA Linux Systems, 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, sub license, 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 NON-INFRINGEMENT.

-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.

-

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

-

-/*

- * Authors:

- *   Kevin E. Martin <martin@valinux.com>

- *   Jens Owen <jens@tungstengraphics.com>

- *   Rickard E. (Rik) Faith <faith@valinux.com>

- *

- */

-

-/*

- * This file has been copied from the mesa source tree and a little bit

- * modified by:

- *

- * Dodji Seketeli <dodji@openedhand.com>

- */

-

-#ifdef HAVE_CONFIG_H

-#include <kdrive-config.h>

-#endif

-/*

- * including some server headers (like kdrive-config.h)

- * might define the macro _XSERVER64

- * on 64 bits machines. That macro must _NOT_ be defined for Xlib

- * client code, otherwise bad things happen.

- * So let's undef that macro if necessary.

- */

-#ifdef _XSERVER64

-#undef _XSERVER64

-#endif

-

-/* THIS IS NOT AN X CONSORTIUM STANDARD */

-

-#include <X11/Xlibint.h>

-#include <X11/extensions/Xext.h>

-#include <X11/extensions/extutil.h>

-#include <GL/glx.h>

-#include "xf86dri.h"

-#include <X11/dri/xf86driproto.h>

-

-static XExtensionInfo _xf86dri_info_data;

-static XExtensionInfo *xf86dri_info = &_xf86dri_info_data;

-static char xf86dri_extension_name[] = XF86DRINAME;

-

-#define XF86DRICheckExtension(dpy,i,val) \

-  XextCheckExtension (dpy, i, xf86dri_extension_name, val)

-

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

- *                                                                           *

- *			   private utility routines                          *

- *                                                                           *

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

-

-static int close_display(Display *dpy, XExtCodes *extCodes);

-static /* const */ XExtensionHooks xf86dri_extension_hooks = {

-    NULL,				/* create_gc */

-    NULL,				/* copy_gc */

-    NULL,				/* flush_gc */

-    NULL,				/* free_gc */

-    NULL,				/* create_font */

-    NULL,				/* free_font */

-    close_display,			/* close_display */

-    NULL,				/* wire_to_event */

-    NULL,				/* event_to_wire */

-    NULL,				/* error */

-    NULL,				/* error_string */

-};

-

-static XEXT_GENERATE_FIND_DISPLAY (find_display, xf86dri_info, 

-				   xf86dri_extension_name, 

-				   &xf86dri_extension_hooks, 

-				   0, NULL)

-

-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86dri_info)

-

-

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

- *                                                                           *

- *		    public XFree86-DRI Extension routines                    *

- *                                                                           *

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

-

-#if 0

-#include <stdio.h>

-#define TRACE(msg)  fprintf(stderr,"XF86DRI%s\n", msg);

-#else

-#define TRACE(msg)

-#endif

-

-Bool XF86DRIOpenFullScreen(Display *dpy, int screen, Drawable drawable);

-Bool XF86DRICloseFullScreen(Display *dpy, int screen, Drawable drawable);

-

-Bool XF86DRIQueryExtension (Display *dpy, int *event_basep, int *error_basep)

-{

-    XExtDisplayInfo *info = find_display (dpy);

-

-    TRACE("QueryExtension...");

-    if (XextHasExtension(info)) {

-	*event_basep = info->codes->first_event;

-	*error_basep = info->codes->first_error;

-        TRACE("QueryExtension... return True");

-	return True;

-    } else {

-        TRACE("QueryExtension... return False");

-	return False;

-    }

-}

-

-Bool XF86DRIQueryVersion(Display *dpy, int *majorVersion, int *minorVersion,

-                         int *patchVersion)

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRIQueryVersionReply rep;

-    xXF86DRIQueryVersionReq *req;

-

-    TRACE("QueryVersion...");

-    XF86DRICheckExtension (dpy, info, False);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRIQueryVersion, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRIQueryVersion;

-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {

-	UnlockDisplay(dpy);

-	SyncHandle();

-        TRACE("QueryVersion... return False");

-	return False;

-    }

-    *majorVersion = rep.majorVersion;

-    *minorVersion = rep.minorVersion;

-    *patchVersion = rep.patchVersion;

-    UnlockDisplay(dpy);

-    SyncHandle();

-    TRACE("QueryVersion... return True");

-    return True;

-}

-

-Bool

-XF86DRIQueryDirectRenderingCapable (Display *dpy, int screen, Bool *isCapable)

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRIQueryDirectRenderingCapableReply rep;

-    xXF86DRIQueryDirectRenderingCapableReq *req;

-

-    TRACE("QueryDirectRenderingCapable...");

-    XF86DRICheckExtension (dpy, info, False);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRIQueryDirectRenderingCapable, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRIQueryDirectRenderingCapable;

-    req->screen = screen;

-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {

-        UnlockDisplay(dpy);

-        SyncHandle();

-        TRACE("QueryDirectRenderingCapable... return False");

-        return False;

-    }

-    *isCapable = rep.isCapable;

-    UnlockDisplay(dpy);

-    SyncHandle();

-    TRACE("QueryDirectRenderingCapable... return True");

-    return True;

-}

-

-Bool

-XF86DRIOpenConnection (Display *dpy, int screen,

-                       drm_handle_t *hSAREA,

-                       char **busIdString)

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRIOpenConnectionReply rep;

-    xXF86DRIOpenConnectionReq *req;

-

-    TRACE("OpenConnection...");

-    XF86DRICheckExtension (dpy, info, False);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRIOpenConnection, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRIOpenConnection;

-    req->screen = screen;

-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {

-        UnlockDisplay(dpy);

-        SyncHandle();

-        TRACE("OpenConnection... return False");

-        return False;

-    }

-

-    *hSAREA = rep.hSAREALow;

-    if (sizeof(drm_handle_t) == 8) {

-        int shift = 32; /* var to prevent warning on next line */

-        *hSAREA |= ((drm_handle_t) rep.hSAREAHigh) << shift;

-    }

-

-    if (rep.length) {

-        if (!(*busIdString = (char *)calloc(rep.busIdStringLength + 1, 1))) {

-            _XEatData(dpy, ((rep.busIdStringLength+3) & ~3));

-            UnlockDisplay(dpy);

-            SyncHandle();

-            TRACE("OpenConnection... return False");

-            return False;

-        }

-        _XReadPad(dpy, *busIdString, rep.busIdStringLength);

-    } else {

-        *busIdString = NULL;

-    }

-    UnlockDisplay(dpy);

-    SyncHandle();

-    TRACE("OpenConnection... return True");

-    return True;

-}

-

-Bool XF86DRIAuthConnection(Display *dpy, int screen, drm_magic_t magic)

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRIAuthConnectionReq *req;

-    xXF86DRIAuthConnectionReply rep;

-

-    TRACE("AuthConnection...");

-    XF86DRICheckExtension (dpy, info, False);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRIAuthConnection, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRIAuthConnection;

-    req->screen = screen;

-    req->magic = magic;

-    rep.authenticated = 0;

-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse) || !rep.authenticated) {

-	UnlockDisplay(dpy);

-	SyncHandle();

-        TRACE("AuthConnection... return False");

-	return False;

-    }

-    UnlockDisplay(dpy);

-    SyncHandle();

-    TRACE("AuthConnection... return True");

-    return True;

-}

-

-Bool XF86DRICloseConnection(Display *dpy, int screen)

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRICloseConnectionReq *req;

-

-    TRACE("CloseConnection...");

-

-    XF86DRICheckExtension (dpy, info, False);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRICloseConnection, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRICloseConnection;

-    req->screen = screen;

-    UnlockDisplay(dpy);

-    SyncHandle();

-    TRACE("CloseConnection... return True");

-    return True;

-}

-

-Bool XF86DRIGetClientDriverName(Display *dpy, int screen,

-                                int *ddxDriverMajorVersion,

-	                        int *ddxDriverMinorVersion,

-                                int *ddxDriverPatchVersion,

-                                char **clientDriverName)

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRIGetClientDriverNameReply rep;

-    xXF86DRIGetClientDriverNameReq *req;

-

-    TRACE("GetClientDriverName...");

-    XF86DRICheckExtension (dpy, info, False);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRIGetClientDriverName, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRIGetClientDriverName;

-    req->screen = screen;

-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {

-	UnlockDisplay(dpy);

-	SyncHandle();

-        TRACE("GetClientDriverName... return False");

-	return False;

-    }

-

-    *ddxDriverMajorVersion = rep.ddxDriverMajorVersion;

-    *ddxDriverMinorVersion = rep.ddxDriverMinorVersion;

-    *ddxDriverPatchVersion = rep.ddxDriverPatchVersion;

-

-    if (rep.length) {

-        if (!(*clientDriverName = (char *)calloc(rep.clientDriverNameLength + 1, 1))) {

-            _XEatData(dpy, ((rep.clientDriverNameLength+3) & ~3));

-            UnlockDisplay(dpy);

-            SyncHandle();

-            TRACE("GetClientDriverName... return False");

-            return False;

-        }

-	_XReadPad(dpy, *clientDriverName, rep.clientDriverNameLength);

-    } else {

-        *clientDriverName = NULL;

-    }

-    UnlockDisplay(dpy);

-    SyncHandle();

-    TRACE("GetClientDriverName... return True");

-    return True;

-}

-

-Bool XF86DRICreateContextWithConfig(Display *dpy, int screen, int configID,

-                                    XID *context, drm_context_t *hHWContext)

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRICreateContextReply rep;

-    xXF86DRICreateContextReq *req;

-

-    TRACE("CreateContext...");

-    XF86DRICheckExtension (dpy, info, False);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRICreateContext, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRICreateContext;

-    req->visual = configID;

-    req->screen = screen;

-    *context = XAllocID(dpy);

-    req->context = *context;

-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {

-	UnlockDisplay(dpy);

-	SyncHandle();

-        TRACE("CreateContext... return False");

-	return False;

-    }

-    *hHWContext = rep.hHWContext;

-    UnlockDisplay(dpy);

-    SyncHandle();

-    TRACE("CreateContext... return True");

-    return True;

-}

-

-Bool XF86DRICreateContext(Display *dpy, int screen, Visual *visual,

-                          XID *context, drm_context_t *hHWContext)

-{

-    return XF86DRICreateContextWithConfig( dpy, screen, visual->visualid,

-					   context, hHWContext );

-}

-

-GLboolean XF86DRIDestroyContext( Display *dpy, int screen, XID context)

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRIDestroyContextReq *req;

-

-    TRACE("DestroyContext...");

-    XF86DRICheckExtension (dpy, info, False);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRIDestroyContext, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRIDestroyContext;

-    req->screen = screen;

-    req->context = context;

-    UnlockDisplay(dpy);

-    SyncHandle();

-    TRACE("DestroyContext... return True");

-    return True;

-}

-

-GLboolean

-XF86DRICreateDrawable (Display *dpy, int screen,

-                       XID drawable, drm_drawable_t * hHWDrawable)

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRICreateDrawableReply rep;

-    xXF86DRICreateDrawableReq *req;

-

-    TRACE("CreateDrawable...");

-    XF86DRICheckExtension (dpy, info, False);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRICreateDrawable, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRICreateDrawable;

-    req->screen = screen;

-    req->drawable = drawable;

-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {

-	UnlockDisplay(dpy);

-	SyncHandle();

-        TRACE("CreateDrawable... return False");

-	return False;

-    }

-    *hHWDrawable = rep.hHWDrawable;

-    UnlockDisplay(dpy);

-    SyncHandle();

-    TRACE("CreateDrawable... return True");

-    return True;

-}

-

-static int noopErrorHandler(Display *dpy, XErrorEvent *xerr)

-{

-    return 0;

-}

-

-GLboolean XF86DRIDestroyDrawable( Display *dpy, int screen,

-    XID drawable )

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRIDestroyDrawableReq *req;

-    int (*oldXErrorHandler)(Display *, XErrorEvent *);

-

-    TRACE("DestroyDrawable...");

-    XF86DRICheckExtension (dpy, info, False);

-

-    /* This is called from the DRI driver, which used call it like this

-     *

-     *   if (windowExists(drawable))

-     *     destroyDrawable(drawable);

-     *

-     * which is a textbook race condition - the window may disappear

-     * from the server between checking for its existance and

-     * destroying it.  Instead we change the semantics of

-     * __DRIinterfaceMethodsRec::destroyDrawable() to succeed even if

-     * the windows is gone, by wrapping the destroy call in an error

-     * handler. */

-

-    XSync(dpy, GL_FALSE);

-    oldXErrorHandler = XSetErrorHandler(noopErrorHandler);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRIDestroyDrawable, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRIDestroyDrawable;

-    req->screen = screen;

-    req->drawable = drawable;

-    UnlockDisplay(dpy);

-    SyncHandle();

-

-    XSetErrorHandler(oldXErrorHandler);

-

-    TRACE("DestroyDrawable... return True");

-    return True;

-}

-

-Bool XF86DRIGetDrawableInfo(Display* dpy, int screen, Drawable drawable,

-    unsigned int* index, unsigned int* stamp,

-    int* X, int* Y, int* W, int* H,

-    int* numClipRects, drm_clip_rect_t ** pClipRects,

-    int* backX, int* backY,

-    int* numBackClipRects, drm_clip_rect_t ** pBackClipRects )

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRIGetDrawableInfoReply rep;

-    xXF86DRIGetDrawableInfoReq *req=NULL;

-    int total_rects;

-

-    TRACE("GetDrawableInfo...");

-    XF86DRICheckExtension (dpy, info, False);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRIGetDrawableInfo, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRIGetDrawableInfo;

-    req->screen = screen;

-    req->drawable = drawable;

-

-    if (!_XReply(dpy, (xReply *)&rep, 1, xFalse)) 

-    {

-	UnlockDisplay(dpy);

-	SyncHandle();

-        TRACE("GetDrawableInfo... return False");

-	return False;

-    }

-    *index = rep.drawableTableIndex;

-    *stamp = rep.drawableTableStamp;

-    *X = (int)rep.drawableX;

-    *Y = (int)rep.drawableY;

-    *W = (int)rep.drawableWidth;

-    *H = (int)rep.drawableHeight;

-    *numClipRects = rep.numClipRects;

-    total_rects = *numClipRects;

-

-    *backX = rep.backX;

-    *backY = rep.backY;

-    *numBackClipRects = rep.numBackClipRects;

-    total_rects += *numBackClipRects;

-

-#if 0

-    /* Because of the fix in Xserver/GL/dri/xf86dri.c, this check breaks

-     * backwards compatibility (Because of the >> 2 shift) but the fix

-     * enables multi-threaded apps to work.

-     */

-    if (rep.length !=  ((((SIZEOF(xXF86DRIGetDrawableInfoReply) - 

-		       SIZEOF(xGenericReply) + 

-		       total_rects * sizeof(drm_clip_rect_t)) + 3) & ~3) >> 2)) {

-        _XEatData(dpy, rep.length);

-	UnlockDisplay(dpy);

-	SyncHandle();

-        TRACE("GetDrawableInfo... return False");

-        return False;

-    }

-#endif

-

-    if (*numClipRects) {

-       int len = sizeof(drm_clip_rect_t) * (*numClipRects);

-

-       *pClipRects = (drm_clip_rect_t *)calloc(len, 1);

-       if (*pClipRects)

-	  _XRead(dpy, (char*)*pClipRects, len);

-    } else {

-        *pClipRects = NULL;

-    }

-

-    if (*numBackClipRects) {

-       int len = sizeof(drm_clip_rect_t) * (*numBackClipRects);

-

-       *pBackClipRects = (drm_clip_rect_t *)calloc(len, 1);

-       if (*pBackClipRects) 

-	  _XRead(dpy, (char*)*pBackClipRects, len);

-    } else {

-        *pBackClipRects = NULL;

-    }

-

-    UnlockDisplay(dpy);

-    SyncHandle();

-    TRACE("GetDrawableInfo... return True");

-    return True;

-}

-

-Bool

-XF86DRIGetDeviceInfo (Display *dpy, int screen, drm_handle_t *hFrameBuffer,

-                      int *fbOrigin, int *fbSize, int *fbStride,

-                      int *devPrivateSize, void **pDevPrivate)

-{

-    XExtDisplayInfo *info = find_display (dpy);

-    xXF86DRIGetDeviceInfoReply rep;

-    xXF86DRIGetDeviceInfoReq *req;

-

-    TRACE("GetDeviceInfo...");

-    XF86DRICheckExtension (dpy, info, False);

-

-    LockDisplay(dpy);

-    GetReq(XF86DRIGetDeviceInfo, req);

-    req->reqType = info->codes->major_opcode;

-    req->driReqType = X_XF86DRIGetDeviceInfo;

-    req->screen = screen;

-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {

-	UnlockDisplay(dpy);

-	SyncHandle();

-        TRACE("GetDeviceInfo... return False");

-	return False;

-    }

-

-    *hFrameBuffer = rep.hFrameBufferLow;

-    if (sizeof(drm_handle_t) == 8) {

-       int shift = 32; /* var to prevent warning on next line */

-       *hFrameBuffer |= ((drm_handle_t) rep.hFrameBufferHigh) << shift;

-    }

-

-    *fbOrigin = rep.framebufferOrigin;

-    *fbSize = rep.framebufferSize;

-    *fbStride = rep.framebufferStride;

-    *devPrivateSize = rep.devPrivateSize;

-

-    if (rep.length) {

-        if (!(*pDevPrivate = (void *)calloc(rep.devPrivateSize, 1))) {

-            _XEatData(dpy, ((rep.devPrivateSize+3) & ~3));

-            UnlockDisplay(dpy);

-            SyncHandle();

-            TRACE("GetDeviceInfo... return False");

-            return False;

-        }

-	_XRead(dpy, (char*)*pDevPrivate, rep.devPrivateSize);

-    } else {

-        *pDevPrivate = NULL;

-    }

-

-    UnlockDisplay(dpy);

-    SyncHandle();

-    TRACE("GetDeviceInfo... return True");

-    return True;

-}

-

-Bool

-XF86DRIOpenFullScreen(Display *dpy, int screen, Drawable drawable)

-{

-    /* This function and the underlying X protocol are deprecated.

-     */

-    (void) dpy;

-    (void) screen;

-    (void) drawable;

-    return False;

-}

-

-Bool

-XF86DRICloseFullScreen(Display *dpy, int screen, Drawable drawable)

-{

-    /* This function and the underlying X protocol are deprecated.

-     */

-    (void) dpy;

-    (void) screen;

-    (void) drawable;

-    return True;

-}

+/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.13 2002/10/30 12:51:25 alanh Exp $ */
+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, 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, sub license, 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 NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <martin@valinux.com>
+ *   Jens Owen <jens@tungstengraphics.com>
+ *   Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+/*
+ * This file has been copied from the mesa source tree and a little bit
+ * modified by:
+ *
+ * Dodji Seketeli <dodji@openedhand.com>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+/*
+ * including some server headers (like kdrive-config.h)
+ * might define the macro _XSERVER64
+ * on 64 bits machines. That macro must _NOT_ be defined for Xlib
+ * client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD */
+
+#include <X11/Xlibint.h>
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
+#include <GL/glx.h>
+#include "xf86dri.h"
+#include <X11/dri/xf86driproto.h>
+
+static XExtensionInfo _xf86dri_info_data;
+static XExtensionInfo *xf86dri_info = &_xf86dri_info_data;
+static char xf86dri_extension_name[] = XF86DRINAME;
+
+#define XF86DRICheckExtension(dpy,i,val) \
+  XextCheckExtension (dpy, i, xf86dri_extension_name, val)
+
+/*****************************************************************************
+ *                                                                           *
+ *			   private utility routines                          *
+ *                                                                           *
+ *****************************************************************************/
+
+static int close_display(Display * dpy, XExtCodes * extCodes);
+
+static /* const */ XExtensionHooks xf86dri_extension_hooks = {
+    NULL,                       /* create_gc */
+    NULL,                       /* copy_gc */
+    NULL,                       /* flush_gc */
+    NULL,                       /* free_gc */
+    NULL,                       /* create_font */
+    NULL,                       /* free_font */
+    close_display,              /* close_display */
+    NULL,                       /* wire_to_event */
+    NULL,                       /* event_to_wire */
+    NULL,                       /* error */
+    NULL,                       /* error_string */
+};
+
+static
+XEXT_GENERATE_FIND_DISPLAY(find_display, xf86dri_info,
+                           xf86dri_extension_name,
+                           &xf86dri_extension_hooks, 0, NULL)
+
+static
+XEXT_GENERATE_CLOSE_DISPLAY(close_display, xf86dri_info)
+
+/*****************************************************************************
+ *                                                                           *
+ *		    public XFree86-DRI Extension routines                    *
+ *                                                                           *
+ *****************************************************************************/
+#if 0
+#include <stdio.h>
+#define TRACE(msg)  fprintf(stderr,"XF86DRI%s\n", msg);
+#else
+#define TRACE(msg)
+#endif
+Bool
+XF86DRIOpenFullScreen(Display * dpy, int screen, Drawable drawable);
+Bool
+XF86DRICloseFullScreen(Display * dpy, int screen, Drawable drawable);
+
+Bool
+XF86DRIQueryExtension(Display * dpy, int *event_basep, int *error_basep)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+
+    TRACE("QueryExtension...");
+    if (XextHasExtension(info)) {
+        *event_basep = info->codes->first_event;
+        *error_basep = info->codes->first_error;
+        TRACE("QueryExtension... return True");
+        return True;
+    }
+    else {
+        TRACE("QueryExtension... return False");
+        return False;
+    }
+}
+
+Bool
+XF86DRIQueryVersion(Display * dpy, int *majorVersion, int *minorVersion,
+                    int *patchVersion)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRIQueryVersionReply rep;
+    xXF86DRIQueryVersionReq *req;
+
+    TRACE("QueryVersion...");
+    XF86DRICheckExtension(dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRIQueryVersion, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRIQueryVersion;
+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        TRACE("QueryVersion... return False");
+        return False;
+    }
+    *majorVersion = rep.majorVersion;
+    *minorVersion = rep.minorVersion;
+    *patchVersion = rep.patchVersion;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("QueryVersion... return True");
+    return True;
+}
+
+Bool
+XF86DRIQueryDirectRenderingCapable(Display * dpy, int screen, Bool *isCapable)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRIQueryDirectRenderingCapableReply rep;
+    xXF86DRIQueryDirectRenderingCapableReq *req;
+
+    TRACE("QueryDirectRenderingCapable...");
+    XF86DRICheckExtension(dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRIQueryDirectRenderingCapable, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRIQueryDirectRenderingCapable;
+    req->screen = screen;
+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        TRACE("QueryDirectRenderingCapable... return False");
+        return False;
+    }
+    *isCapable = rep.isCapable;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("QueryDirectRenderingCapable... return True");
+    return True;
+}
+
+Bool
+XF86DRIOpenConnection(Display * dpy, int screen,
+                      drm_handle_t * hSAREA, char **busIdString)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRIOpenConnectionReply rep;
+    xXF86DRIOpenConnectionReq *req;
+
+    TRACE("OpenConnection...");
+    XF86DRICheckExtension(dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRIOpenConnection, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRIOpenConnection;
+    req->screen = screen;
+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        TRACE("OpenConnection... return False");
+        return False;
+    }
+
+    *hSAREA = rep.hSAREALow;
+    if (sizeof(drm_handle_t) == 8) {
+        int shift = 32;         /* var to prevent warning on next line */
+
+        *hSAREA |= ((drm_handle_t) rep.hSAREAHigh) << shift;
+    }
+
+    if (rep.length) {
+        if (!(*busIdString = (char *) calloc(rep.busIdStringLength + 1, 1))) {
+            _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3));
+            UnlockDisplay(dpy);
+            SyncHandle();
+            TRACE("OpenConnection... return False");
+            return False;
+        }
+        _XReadPad(dpy, *busIdString, rep.busIdStringLength);
+    }
+    else {
+        *busIdString = NULL;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("OpenConnection... return True");
+    return True;
+}
+
+Bool
+XF86DRIAuthConnection(Display * dpy, int screen, drm_magic_t magic)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRIAuthConnectionReq *req;
+    xXF86DRIAuthConnectionReply rep;
+
+    TRACE("AuthConnection...");
+    XF86DRICheckExtension(dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRIAuthConnection, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRIAuthConnection;
+    req->screen = screen;
+    req->magic = magic;
+    rep.authenticated = 0;
+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse) || !rep.authenticated) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        TRACE("AuthConnection... return False");
+        return False;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("AuthConnection... return True");
+    return True;
+}
+
+Bool
+XF86DRICloseConnection(Display * dpy, int screen)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRICloseConnectionReq *req;
+
+    TRACE("CloseConnection...");
+
+    XF86DRICheckExtension(dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRICloseConnection, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRICloseConnection;
+    req->screen = screen;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("CloseConnection... return True");
+    return True;
+}
+
+Bool
+XF86DRIGetClientDriverName(Display * dpy, int screen,
+                           int *ddxDriverMajorVersion,
+                           int *ddxDriverMinorVersion,
+                           int *ddxDriverPatchVersion, char **clientDriverName)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRIGetClientDriverNameReply rep;
+    xXF86DRIGetClientDriverNameReq *req;
+
+    TRACE("GetClientDriverName...");
+    XF86DRICheckExtension(dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRIGetClientDriverName, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRIGetClientDriverName;
+    req->screen = screen;
+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        TRACE("GetClientDriverName... return False");
+        return False;
+    }
+
+    *ddxDriverMajorVersion = rep.ddxDriverMajorVersion;
+    *ddxDriverMinorVersion = rep.ddxDriverMinorVersion;
+    *ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
+
+    if (rep.length) {
+        if (!
+            (*clientDriverName =
+             (char *) calloc(rep.clientDriverNameLength + 1, 1))) {
+            _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3));
+            UnlockDisplay(dpy);
+            SyncHandle();
+            TRACE("GetClientDriverName... return False");
+            return False;
+        }
+        _XReadPad(dpy, *clientDriverName, rep.clientDriverNameLength);
+    }
+    else {
+        *clientDriverName = NULL;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("GetClientDriverName... return True");
+    return True;
+}
+
+Bool
+XF86DRICreateContextWithConfig(Display * dpy, int screen, int configID,
+                               XID *context, drm_context_t * hHWContext)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRICreateContextReply rep;
+    xXF86DRICreateContextReq *req;
+
+    TRACE("CreateContext...");
+    XF86DRICheckExtension(dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRICreateContext, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRICreateContext;
+    req->visual = configID;
+    req->screen = screen;
+    *context = XAllocID(dpy);
+    req->context = *context;
+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        TRACE("CreateContext... return False");
+        return False;
+    }
+    *hHWContext = rep.hHWContext;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("CreateContext... return True");
+    return True;
+}
+
+Bool
+XF86DRICreateContext(Display * dpy, int screen, Visual * visual,
+                     XID *context, drm_context_t * hHWContext)
+{
+    return XF86DRICreateContextWithConfig(dpy, screen, visual->visualid,
+                                          context, hHWContext);
+}
+
+GLboolean
+XF86DRIDestroyContext(Display * dpy, int screen, XID context)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRIDestroyContextReq *req;
+
+    TRACE("DestroyContext...");
+    XF86DRICheckExtension(dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRIDestroyContext, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRIDestroyContext;
+    req->screen = screen;
+    req->context = context;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("DestroyContext... return True");
+    return True;
+}
+
+GLboolean
+XF86DRICreateDrawable(Display * dpy, int screen,
+                      XID drawable, drm_drawable_t * hHWDrawable)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRICreateDrawableReply rep;
+    xXF86DRICreateDrawableReq *req;
+
+    TRACE("CreateDrawable...");
+    XF86DRICheckExtension(dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRICreateDrawable, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRICreateDrawable;
+    req->screen = screen;
+    req->drawable = drawable;
+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        TRACE("CreateDrawable... return False");
+        return False;
+    }
+    *hHWDrawable = rep.hHWDrawable;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("CreateDrawable... return True");
+    return True;
+}
+
+static int
+noopErrorHandler(Display * dpy, XErrorEvent * xerr)
+{
+    return 0;
+}
+
+GLboolean
+XF86DRIDestroyDrawable(Display * dpy, int screen, XID drawable)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRIDestroyDrawableReq *req;
+    int (*oldXErrorHandler) (Display *, XErrorEvent *);
+
+    TRACE("DestroyDrawable...");
+    XF86DRICheckExtension(dpy, info, False);
+
+    /* This is called from the DRI driver, which used call it like this
+     *
+     *   if (windowExists(drawable))
+     *     destroyDrawable(drawable);
+     *
+     * which is a textbook race condition - the window may disappear
+     * from the server between checking for its existance and
+     * destroying it.  Instead we change the semantics of
+     * __DRIinterfaceMethodsRec::destroyDrawable() to succeed even if
+     * the windows is gone, by wrapping the destroy call in an error
+     * handler. */
+
+    XSync(dpy, GL_FALSE);
+    oldXErrorHandler = XSetErrorHandler(noopErrorHandler);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRIDestroyDrawable, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRIDestroyDrawable;
+    req->screen = screen;
+    req->drawable = drawable;
+    UnlockDisplay(dpy);
+    SyncHandle();
+
+    XSetErrorHandler(oldXErrorHandler);
+
+    TRACE("DestroyDrawable... return True");
+    return True;
+}
+
+Bool
+XF86DRIGetDrawableInfo(Display * dpy, int screen, Drawable drawable,
+                       unsigned int *index, unsigned int *stamp,
+                       int *X, int *Y, int *W, int *H,
+                       int *numClipRects, drm_clip_rect_t ** pClipRects,
+                       int *backX, int *backY,
+                       int *numBackClipRects, drm_clip_rect_t ** pBackClipRects)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRIGetDrawableInfoReply rep;
+    xXF86DRIGetDrawableInfoReq *req = NULL;
+    int total_rects;
+
+    TRACE("GetDrawableInfo...");
+    XF86DRICheckExtension(dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRIGetDrawableInfo, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRIGetDrawableInfo;
+    req->screen = screen;
+    req->drawable = drawable;
+
+    if (!_XReply(dpy, (xReply *) & rep, 1, xFalse)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        TRACE("GetDrawableInfo... return False");
+        return False;
+    }
+    *index = rep.drawableTableIndex;
+    *stamp = rep.drawableTableStamp;
+    *X = (int) rep.drawableX;
+    *Y = (int) rep.drawableY;
+    *W = (int) rep.drawableWidth;
+    *H = (int) rep.drawableHeight;
+    *numClipRects = rep.numClipRects;
+    total_rects = *numClipRects;
+
+    *backX = rep.backX;
+    *backY = rep.backY;
+    *numBackClipRects = rep.numBackClipRects;
+    total_rects += *numBackClipRects;
+
+#if 0
+    /* Because of the fix in Xserver/GL/dri/xf86dri.c, this check breaks
+     * backwards compatibility (Because of the >> 2 shift) but the fix
+     * enables multi-threaded apps to work.
+     */
+    if (rep.length != ((((SIZEOF(xXF86DRIGetDrawableInfoReply) -
+                          SIZEOF(xGenericReply) +
+                          total_rects * sizeof(drm_clip_rect_t)) +
+                         3) & ~3) >> 2)) {
+        _XEatData(dpy, rep.length);
+        UnlockDisplay(dpy);
+        SyncHandle();
+        TRACE("GetDrawableInfo... return False");
+        return False;
+    }
+#endif
+
+    if (*numClipRects) {
+        int len = sizeof(drm_clip_rect_t) * (*numClipRects);
+
+        *pClipRects = (drm_clip_rect_t *) calloc(len, 1);
+        if (*pClipRects)
+            _XRead(dpy, (char *) *pClipRects, len);
+    }
+    else {
+        *pClipRects = NULL;
+    }
+
+    if (*numBackClipRects) {
+        int len = sizeof(drm_clip_rect_t) * (*numBackClipRects);
+
+        *pBackClipRects = (drm_clip_rect_t *) calloc(len, 1);
+        if (*pBackClipRects)
+            _XRead(dpy, (char *) *pBackClipRects, len);
+    }
+    else {
+        *pBackClipRects = NULL;
+    }
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("GetDrawableInfo... return True");
+    return True;
+}
+
+Bool
+XF86DRIGetDeviceInfo(Display * dpy, int screen, drm_handle_t * hFrameBuffer,
+                     int *fbOrigin, int *fbSize, int *fbStride,
+                     int *devPrivateSize, void **pDevPrivate)
+{
+    XExtDisplayInfo *info = find_display(dpy);
+    xXF86DRIGetDeviceInfoReply rep;
+    xXF86DRIGetDeviceInfoReq *req;
+
+    TRACE("GetDeviceInfo...");
+    XF86DRICheckExtension(dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(XF86DRIGetDeviceInfo, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_XF86DRIGetDeviceInfo;
+    req->screen = screen;
+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        TRACE("GetDeviceInfo... return False");
+        return False;
+    }
+
+    *hFrameBuffer = rep.hFrameBufferLow;
+    if (sizeof(drm_handle_t) == 8) {
+        int shift = 32;         /* var to prevent warning on next line */
+
+        *hFrameBuffer |= ((drm_handle_t) rep.hFrameBufferHigh) << shift;
+    }
+
+    *fbOrigin = rep.framebufferOrigin;
+    *fbSize = rep.framebufferSize;
+    *fbStride = rep.framebufferStride;
+    *devPrivateSize = rep.devPrivateSize;
+
+    if (rep.length) {
+        if (!(*pDevPrivate = (void *) calloc(rep.devPrivateSize, 1))) {
+            _XEatData(dpy, ((rep.devPrivateSize + 3) & ~3));
+            UnlockDisplay(dpy);
+            SyncHandle();
+            TRACE("GetDeviceInfo... return False");
+            return False;
+        }
+        _XRead(dpy, (char *) *pDevPrivate, rep.devPrivateSize);
+    }
+    else {
+        *pDevPrivate = NULL;
+    }
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("GetDeviceInfo... return True");
+    return True;
+}
+
+Bool
+XF86DRIOpenFullScreen(Display * dpy, int screen, Drawable drawable)
+{
+    /* This function and the underlying X protocol are deprecated.
+     */
+    (void) dpy;
+    (void) screen;
+    (void) drawable;
+    return False;
+}
+
+Bool
+XF86DRICloseFullScreen(Display * dpy, int screen, Drawable drawable)
+{
+    /* This function and the underlying X protocol are deprecated.
+     */
+    (void) dpy;
+    (void) screen;
+    (void) drawable;
+    return True;
+}
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c
index 7ebf1c253..8eda539aa 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.c
@@ -36,11 +36,12 @@
 #include "ephyrdri.h"
 #include "ephyrdriext.h"
 #include "ephyrglxext.h"
-#endif /* XF86DRI */
+#endif                          /* XF86DRI */
 
 #include "xkbsrv.h"
 
 extern int KdTsPhyScreen;
+
 #ifdef GLXEXT
 extern Bool noGlxVisualInit;
 #endif
@@ -48,179 +49,162 @@ extern Bool noGlxVisualInit;
 KdKeyboardInfo *ephyrKbd;
 KdPointerInfo *ephyrMouse;
 EphyrKeySyms ephyrKeySyms;
-Bool ephyrNoDRI=FALSE ;
-Bool ephyrNoXV=FALSE ;
+Bool ephyrNoDRI = FALSE;
+Bool ephyrNoXV = FALSE;
 
 static int mouseState = 0;
 static Rotation ephyrRandr = RR_Rotate_0;
 
 typedef struct _EphyrInputPrivate {
-    Bool    enabled;
+    Bool enabled;
 } EphyrKbdPrivate, EphyrPointerPrivate;
 
-Bool   EphyrWantGrayScale = 0;
-
+Bool EphyrWantGrayScale = 0;
 
 Bool
-ephyrInitialize (KdCardInfo *card, EphyrPriv *priv)
+ephyrInitialize(KdCardInfo * card, EphyrPriv * priv)
 {
-  OsSignal(SIGUSR1, hostx_handle_signal);
-  
-  priv->base = 0;
-  priv->bytes_per_line = 0;
-  return TRUE;
+    OsSignal(SIGUSR1, hostx_handle_signal);
+
+    priv->base = 0;
+    priv->bytes_per_line = 0;
+    return TRUE;
 }
 
 Bool
-ephyrCardInit (KdCardInfo *card)
+ephyrCardInit(KdCardInfo * card)
 {
-  EphyrPriv	*priv;
-  
-  priv = (EphyrPriv *) malloc(sizeof (EphyrPriv));
-  if (!priv)
-    return FALSE;
-  
-  if (!ephyrInitialize (card, priv))
-    {
-      free(priv);
-      return FALSE;
+    EphyrPriv *priv;
+
+    priv = (EphyrPriv *) malloc(sizeof(EphyrPriv));
+    if (!priv)
+        return FALSE;
+
+    if (!ephyrInitialize(card, priv)) {
+        free(priv);
+        return FALSE;
     }
-  card->driver = priv;
-  
-  return TRUE;
+    card->driver = priv;
+
+    return TRUE;
 }
 
 Bool
-ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv)
+ephyrScreenInitialize(KdScreenInfo * screen, EphyrScrPriv * scrpriv)
 {
-  int width = 640, height = 480; 
-  CARD32 redMask, greenMask, blueMask;
-  
-  if (hostx_want_screen_size(screen, &width, &height)
-      || !screen->width || !screen->height)
-    {
-      screen->width = width;
-      screen->height = height;
+    int width = 640, height = 480;
+    CARD32 redMask, greenMask, blueMask;
+
+    if (hostx_want_screen_size(screen, &width, &height)
+        || !screen->width || !screen->height) {
+        screen->width = width;
+        screen->height = height;
     }
 
-  if (EphyrWantGrayScale)
-    screen->fb.depth = 8;
-
-  if (screen->fb.depth && screen->fb.depth != hostx_get_depth())
-    {
-      if (screen->fb.depth < hostx_get_depth()
-	  && (screen->fb.depth == 24 || screen->fb.depth == 16
-	      || screen->fb.depth == 8))
-	{
-	  hostx_set_server_depth(screen, screen->fb.depth);
-	}
-      else
-	ErrorF("\nXephyr: requested screen depth not supported, setting to match hosts.\n");
+    if (EphyrWantGrayScale)
+        screen->fb.depth = 8;
+
+    if (screen->fb.depth && screen->fb.depth != hostx_get_depth()) {
+        if (screen->fb.depth < hostx_get_depth()
+            && (screen->fb.depth == 24 || screen->fb.depth == 16
+                || screen->fb.depth == 8)) {
+            hostx_set_server_depth(screen, screen->fb.depth);
+        }
+        else
+            ErrorF
+                ("\nXephyr: requested screen depth not supported, setting to match hosts.\n");
     }
-  
-  screen->fb.depth = hostx_get_server_depth(screen);
-  screen->rate = 72;
-  
-  if (screen->fb.depth <= 8)
-    {
-      if (EphyrWantGrayScale)
-	screen->fb.visuals = ((1 << StaticGray) | (1 << GrayScale));
-      else
-	screen->fb.visuals = ((1 << StaticGray) |
-			      (1 << GrayScale) |
-			      (1 << StaticColor) |
-			      (1 << PseudoColor) |
-			      (1 << TrueColor) |
-			      (1 << DirectColor));
-      
-      screen->fb.redMask   = 0x00;
-      screen->fb.greenMask = 0x00;
-      screen->fb.blueMask  = 0x00;
-      screen->fb.depth        = 8;
-      screen->fb.bitsPerPixel = 8;
+
+    screen->fb.depth = hostx_get_server_depth(screen);
+    screen->rate = 72;
+
+    if (screen->fb.depth <= 8) {
+        if (EphyrWantGrayScale)
+            screen->fb.visuals = ((1 << StaticGray) | (1 << GrayScale));
+        else
+            screen->fb.visuals = ((1 << StaticGray) |
+                                  (1 << GrayScale) |
+                                  (1 << StaticColor) |
+                                  (1 << PseudoColor) |
+                                  (1 << TrueColor) | (1 << DirectColor));
+
+        screen->fb.redMask = 0x00;
+        screen->fb.greenMask = 0x00;
+        screen->fb.blueMask = 0x00;
+        screen->fb.depth = 8;
+        screen->fb.bitsPerPixel = 8;
     }
-  else 
-    {
-      screen->fb.visuals = (1 << TrueColor);
-      
-      if (screen->fb.depth <= 15)
-	{
-	  screen->fb.depth = 15;
-	  screen->fb.bitsPerPixel = 16;
-	}
-      else if (screen->fb.depth <= 16)
-	{
-	  screen->fb.depth = 16;
-	  screen->fb.bitsPerPixel = 16;
-	}
-      else if (screen->fb.depth <= 24)
-	{
-	  screen->fb.depth = 24;
-	  screen->fb.bitsPerPixel = 32;
-	}
-      else if (screen->fb.depth <= 30)
-	{
-	  screen->fb.depth = 30;
-	  screen->fb.bitsPerPixel = 32;
-	}
-      else
-	{
-	  ErrorF("\nXephyr: Unsupported screen depth %d\n",
-	         screen->fb.depth);
-	  return FALSE;
-	}
-
-      hostx_get_visual_masks (screen, &redMask, &greenMask, &blueMask);
-
-      screen->fb.redMask = (Pixel) redMask;
-      screen->fb.greenMask = (Pixel) greenMask;
-      screen->fb.blueMask = (Pixel) blueMask;
+    else {
+        screen->fb.visuals = (1 << TrueColor);
+
+        if (screen->fb.depth <= 15) {
+            screen->fb.depth = 15;
+            screen->fb.bitsPerPixel = 16;
+        }
+        else if (screen->fb.depth <= 16) {
+            screen->fb.depth = 16;
+            screen->fb.bitsPerPixel = 16;
+        }
+        else if (screen->fb.depth <= 24) {
+            screen->fb.depth = 24;
+            screen->fb.bitsPerPixel = 32;
+        }
+        else if (screen->fb.depth <= 30) {
+            screen->fb.depth = 30;
+            screen->fb.bitsPerPixel = 32;
+        }
+        else {
+            ErrorF("\nXephyr: Unsupported screen depth %d\n", screen->fb.depth);
+            return FALSE;
+        }
+
+        hostx_get_visual_masks(screen, &redMask, &greenMask, &blueMask);
+
+        screen->fb.redMask = (Pixel) redMask;
+        screen->fb.greenMask = (Pixel) greenMask;
+        screen->fb.blueMask = (Pixel) blueMask;
 
     }
-  
-  scrpriv->randr = screen->randr;
 
-  return ephyrMapFramebuffer (screen);
+    scrpriv->randr = screen->randr;
+
+    return ephyrMapFramebuffer(screen);
 }
 
 Bool
-ephyrScreenInit (KdScreenInfo *screen)
+ephyrScreenInit(KdScreenInfo * screen)
 {
-  EphyrScrPriv *scrpriv;
-  
-  scrpriv = calloc(1, sizeof (EphyrScrPriv));
+    EphyrScrPriv *scrpriv;
 
-  if (!scrpriv)
-    return FALSE;
+    scrpriv = calloc(1, sizeof(EphyrScrPriv));
+
+    if (!scrpriv)
+        return FALSE;
 
-  screen->driver = scrpriv;
+    screen->driver = scrpriv;
 
-  if (!ephyrScreenInitialize (screen, scrpriv))
-    {
-      screen->driver = 0;
-      free(scrpriv);
-      return FALSE;
+    if (!ephyrScreenInitialize(screen, scrpriv)) {
+        screen->driver = 0;
+        free(scrpriv);
+        return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
-    
-void*
-ephyrWindowLinear (ScreenPtr	pScreen,
-		   CARD32	row,
-		   CARD32	offset,
-		   int		mode,
-		   CARD32	*size,
-		   void		*closure)
+
+void *
+ephyrWindowLinear(ScreenPtr pScreen,
+                  CARD32 row,
+                  CARD32 offset, int mode, CARD32 *size, void *closure)
 {
-  KdScreenPriv(pScreen);
-  EphyrPriv	    *priv = pScreenPriv->card->driver;
-  
-  if (!pScreenPriv->enabled)
-    return 0;
-
-  *size = priv->bytes_per_line;
-  return priv->base + row * priv->bytes_per_line + offset;
+    KdScreenPriv(pScreen);
+    EphyrPriv *priv = pScreenPriv->card->driver;
+
+    if (!pScreenPriv->enabled)
+        return 0;
+
+    *size = priv->bytes_per_line;
+    return priv->base + row * priv->bytes_per_line + offset;
 }
 
 /**
@@ -228,529 +212,509 @@ ephyrWindowLinear (ScreenPtr	pScreen,
  * buffer so that fakexa has space to put offscreen pixmaps.
  */
 int
-ephyrBufferHeight(KdScreenInfo *screen)
+ephyrBufferHeight(KdScreenInfo * screen)
 {
     int buffer_height;
+
     if (ephyrFuncs.initAccel == NULL)
-	buffer_height = screen->height;
+        buffer_height = screen->height;
     else
-	buffer_height = 3 * screen->height;
+        buffer_height = 3 * screen->height;
     return buffer_height;
 }
 
-
 Bool
-ephyrMapFramebuffer (KdScreenInfo *screen)
+ephyrMapFramebuffer(KdScreenInfo * screen)
 {
-  EphyrScrPriv  *scrpriv = screen->driver;
-  EphyrPriv	  *priv    = screen->card->driver;
-  KdPointerMatrix m;
-  int buffer_height;
-  
-  EPHYR_LOG("screen->width: %d, screen->height: %d index=%d",
-	     screen->width, screen->height, screen->mynum);
-  
-  /*
-   * Use the rotation last applied to ourselves (in the Xephyr case the fb
-   * coordinate system moves independently of the pointer coordiante system).
-   */
-  KdComputePointerMatrix (&m, ephyrRandr, screen->width, screen->height);
-  KdSetPointerMatrix (&m);
-  
-  priv->bytes_per_line = ((screen->width * screen->fb.bitsPerPixel + 31) >> 5) << 2;
-
-  buffer_height = ephyrBufferHeight(screen);
-
-  priv->base = hostx_screen_init (screen, screen->width, screen->height, buffer_height);
-
-  if ((scrpriv->randr & RR_Rotate_0) && !(scrpriv->randr & RR_Reflect_All))
-    {
-      scrpriv->shadow = FALSE;
-      
-      screen->fb.byteStride = priv->bytes_per_line;
-      screen->fb.pixelStride = screen->width;
-      screen->fb.frameBuffer = (CARD8 *) (priv->base);
+    EphyrScrPriv *scrpriv = screen->driver;
+    EphyrPriv *priv = screen->card->driver;
+    KdPointerMatrix m;
+    int buffer_height;
+
+    EPHYR_LOG("screen->width: %d, screen->height: %d index=%d",
+              screen->width, screen->height, screen->mynum);
+
+    /*
+     * Use the rotation last applied to ourselves (in the Xephyr case the fb
+     * coordinate system moves independently of the pointer coordiante system).
+     */
+    KdComputePointerMatrix(&m, ephyrRandr, screen->width, screen->height);
+    KdSetPointerMatrix(&m);
+
+    priv->bytes_per_line =
+        ((screen->width * screen->fb.bitsPerPixel + 31) >> 5) << 2;
+
+    buffer_height = ephyrBufferHeight(screen);
+
+    priv->base =
+        hostx_screen_init(screen, screen->width, screen->height, buffer_height);
+
+    if ((scrpriv->randr & RR_Rotate_0) && !(scrpriv->randr & RR_Reflect_All)) {
+        scrpriv->shadow = FALSE;
+
+        screen->fb.byteStride = priv->bytes_per_line;
+        screen->fb.pixelStride = screen->width;
+        screen->fb.frameBuffer = (CARD8 *) (priv->base);
     }
-  else
-    {
-      /* Rotated/Reflected so we need to use shadow fb */
-      scrpriv->shadow = TRUE;
-      
-      EPHYR_LOG("allocing shadow");
-      
-      KdShadowFbAlloc (screen,
-		       scrpriv->randr & (RR_Rotate_90|RR_Rotate_270));
+    else {
+        /* Rotated/Reflected so we need to use shadow fb */
+        scrpriv->shadow = TRUE;
+
+        EPHYR_LOG("allocing shadow");
+
+        KdShadowFbAlloc(screen,
+                        scrpriv->randr & (RR_Rotate_90 | RR_Rotate_270));
     }
-  
-  return TRUE;
+
+    return TRUE;
 }
 
 void
-ephyrSetScreenSizes (ScreenPtr pScreen)
+ephyrSetScreenSizes(ScreenPtr pScreen)
 {
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv = screen->driver;
-  
-  if (scrpriv->randr & (RR_Rotate_0|RR_Rotate_180))
-    {
-      pScreen->width = screen->width;
-      pScreen->height = screen->height;
-      pScreen->mmWidth = screen->width_mm;
-      pScreen->mmHeight = screen->height_mm;
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    EphyrScrPriv *scrpriv = screen->driver;
+
+    if (scrpriv->randr & (RR_Rotate_0 | RR_Rotate_180)) {
+        pScreen->width = screen->width;
+        pScreen->height = screen->height;
+        pScreen->mmWidth = screen->width_mm;
+        pScreen->mmHeight = screen->height_mm;
     }
-  else 
-    {
-      pScreen->width = screen->height;
-      pScreen->height = screen->width;
-      pScreen->mmWidth = screen->height_mm;
-      pScreen->mmHeight = screen->width_mm;
+    else {
+        pScreen->width = screen->height;
+        pScreen->height = screen->width;
+        pScreen->mmWidth = screen->height_mm;
+        pScreen->mmHeight = screen->width_mm;
     }
 }
 
 Bool
-ephyrUnmapFramebuffer (KdScreenInfo *screen)
+ephyrUnmapFramebuffer(KdScreenInfo * screen)
 {
-  EphyrScrPriv  *scrpriv = screen->driver;
-  
-  if (scrpriv->shadow)
-    KdShadowFbFree (screen);
-  
-  /* Note, priv->base will get freed when XImage recreated */
-  
-  return TRUE;
+    EphyrScrPriv *scrpriv = screen->driver;
+
+    if (scrpriv->shadow)
+        KdShadowFbFree(screen);
+
+    /* Note, priv->base will get freed when XImage recreated */
+
+    return TRUE;
 }
 
-void 
-ephyrShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf)
+void
+ephyrShadowUpdate(ScreenPtr pScreen, shadowBufPtr pBuf)
 {
-  KdScreenPriv(pScreen);
-  KdScreenInfo *screen = pScreenPriv->screen;
-  
-  EPHYR_LOG("slow paint");
-  
-  /* FIXME: Slow Rotated/Reflected updates could be much
-   * much faster efficiently updating via tranforming 
-   * pBuf->pDamage  regions     
-  */
-  shadowUpdateRotatePacked(pScreen, pBuf);
-  hostx_paint_rect(screen, 0,0,0,0, screen->width, screen->height);
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+
+    EPHYR_LOG("slow paint");
+
+    /* FIXME: Slow Rotated/Reflected updates could be much
+     * much faster efficiently updating via tranforming 
+     * pBuf->pDamage  regions     
+     */
+    shadowUpdateRotatePacked(pScreen, pBuf);
+    hostx_paint_rect(screen, 0, 0, 0, 0, screen->width, screen->height);
 }
 
 static void
-ephyrInternalDamageRedisplay (ScreenPtr pScreen)
+ephyrInternalDamageRedisplay(ScreenPtr pScreen)
 {
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv = screen->driver;
-  RegionPtr	 pRegion;
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    EphyrScrPriv *scrpriv = screen->driver;
+    RegionPtr pRegion;
 
-  if (!scrpriv || !scrpriv->pDamage)
-    return;
+    if (!scrpriv || !scrpriv->pDamage)
+        return;
 
-  pRegion = DamageRegion (scrpriv->pDamage);
+    pRegion = DamageRegion(scrpriv->pDamage);
 
-  if (RegionNotEmpty(pRegion))
-    {
-      int           nbox;
-      BoxPtr        pbox;
+    if (RegionNotEmpty(pRegion)) {
+        int nbox;
+        BoxPtr pbox;
 
-      nbox = RegionNumRects (pRegion);
-      pbox = RegionRects (pRegion);
+        nbox = RegionNumRects(pRegion);
+        pbox = RegionRects(pRegion);
 
-      while (nbox--)
-        {
-          hostx_paint_rect(screen,
-                           pbox->x1, pbox->y1,
-                           pbox->x1, pbox->y1,
-                           pbox->x2 - pbox->x1,
-                           pbox->y2 - pbox->y1);
-          pbox++;
+        while (nbox--) {
+            hostx_paint_rect(screen,
+                             pbox->x1, pbox->y1,
+                             pbox->x1, pbox->y1,
+                             pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);
+            pbox++;
         }
-      DamageEmpty (scrpriv->pDamage);
+        DamageEmpty(scrpriv->pDamage);
     }
 }
 
 static void
-ephyrInternalDamageBlockHandler (pointer   data,
-				 OSTimePtr pTimeout,
-				 pointer   pRead)
+ephyrInternalDamageBlockHandler(pointer data, OSTimePtr pTimeout, pointer pRead)
 {
-  ScreenPtr pScreen = (ScreenPtr) data;
-  
-  ephyrInternalDamageRedisplay (pScreen);
+    ScreenPtr pScreen = (ScreenPtr) data;
+
+    ephyrInternalDamageRedisplay(pScreen);
 }
 
 static void
-ephyrInternalDamageWakeupHandler (pointer data, int i, pointer LastSelectMask)
+ephyrInternalDamageWakeupHandler(pointer data, int i, pointer LastSelectMask)
 {
-  /* FIXME: Not needed ? */
+    /* FIXME: Not needed ? */
 }
 
 Bool
-ephyrSetInternalDamage (ScreenPtr pScreen)
+ephyrSetInternalDamage(ScreenPtr pScreen)
 {
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv = screen->driver;
-  PixmapPtr      pPixmap = NULL;
-  
-  scrpriv->pDamage = DamageCreate ((DamageReportFunc) 0,
-				   (DamageDestroyFunc) 0,
-				   DamageReportNone,
-				   TRUE,
-				   pScreen,
-				   pScreen);
-  
-  if (!RegisterBlockAndWakeupHandlers (ephyrInternalDamageBlockHandler,
-				       ephyrInternalDamageWakeupHandler,
-				       (pointer) pScreen))
-    return FALSE;
-  
-  pPixmap = (*pScreen->GetScreenPixmap) (pScreen);
-  
-  DamageRegister (&pPixmap->drawable, scrpriv->pDamage);
-      
-  return TRUE;
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    EphyrScrPriv *scrpriv = screen->driver;
+    PixmapPtr pPixmap = NULL;
+
+    scrpriv->pDamage = DamageCreate((DamageReportFunc) 0,
+                                    (DamageDestroyFunc) 0,
+                                    DamageReportNone, TRUE, pScreen, pScreen);
+
+    if (!RegisterBlockAndWakeupHandlers(ephyrInternalDamageBlockHandler,
+                                        ephyrInternalDamageWakeupHandler,
+                                        (pointer) pScreen))
+        return FALSE;
+
+    pPixmap = (*pScreen->GetScreenPixmap) (pScreen);
+
+    DamageRegister(&pPixmap->drawable, scrpriv->pDamage);
+
+    return TRUE;
 }
 
 void
-ephyrUnsetInternalDamage (ScreenPtr pScreen)
+ephyrUnsetInternalDamage(ScreenPtr pScreen)
 {
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv = screen->driver;
-  PixmapPtr      pPixmap = NULL;
-  
-  pPixmap = (*pScreen->GetScreenPixmap) (pScreen);
-  DamageUnregister (&pPixmap->drawable, scrpriv->pDamage);
-  DamageDestroy (scrpriv->pDamage);
-  
-  RemoveBlockAndWakeupHandlers (ephyrInternalDamageBlockHandler,
-				ephyrInternalDamageWakeupHandler,
-				(pointer) pScreen);
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    EphyrScrPriv *scrpriv = screen->driver;
+    PixmapPtr pPixmap = NULL;
+
+    pPixmap = (*pScreen->GetScreenPixmap) (pScreen);
+    DamageUnregister(&pPixmap->drawable, scrpriv->pDamage);
+    DamageDestroy(scrpriv->pDamage);
+
+    RemoveBlockAndWakeupHandlers(ephyrInternalDamageBlockHandler,
+                                 ephyrInternalDamageWakeupHandler,
+                                 (pointer) pScreen);
 }
 
 #ifdef RANDR
 Bool
-ephyrRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
+ephyrRandRGetInfo(ScreenPtr pScreen, Rotation * rotations)
 {
-  KdScreenPriv(pScreen);
-  KdScreenInfo	    *screen = pScreenPriv->screen;
-  EphyrScrPriv	    *scrpriv = screen->driver;
-  RRScreenSizePtr	    pSize;
-  Rotation		    randr;
-  int			    n = 0;
- 
-  struct { int width, height; } sizes[] = 
-    {
-      { 1600, 1200 },
-      { 1400, 1050 },
-      { 1280, 960  },
-      { 1280, 1024 },
-      { 1152, 864 },
-      { 1024, 768 },
-      { 832, 624 },
-      { 800, 600 },
-      { 720, 400 },
-      { 480, 640 },
-      { 640, 480 },
-      { 640, 400 },
-      { 320, 240 },
-      { 240, 320 },
-      { 160, 160 }, 
-      { 0, 0 }
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    EphyrScrPriv *scrpriv = screen->driver;
+    RRScreenSizePtr pSize;
+    Rotation randr;
+    int n = 0;
+
+    struct {
+        int width, height;
+    } sizes[] = {
+        {
+        1600, 1200}, {
+        1400, 1050}, {
+        1280, 960}, {
+        1280, 1024}, {
+        1152, 864}, {
+        1024, 768}, {
+        832, 624}, {
+        800, 600}, {
+        720, 400}, {
+        480, 640}, {
+        640, 480}, {
+        640, 400}, {
+        320, 240}, {
+        240, 320}, {
+        160, 160}, {
+        0, 0}
     };
 
-  EPHYR_LOG("mark");
-
-  *rotations = RR_Rotate_All|RR_Reflect_All;
-
-  if (!hostx_want_preexisting_window (screen)
-      && !hostx_want_fullscreen ()) /* only if no -parent switch */
-    {
-      while (sizes[n].width != 0 && sizes[n].height != 0)
-	{
-	  RRRegisterSize (pScreen,
-			  sizes[n].width,
-			  sizes[n].height, 
-			  (sizes[n].width * screen->width_mm)/screen->width,
-			  (sizes[n].height *screen->height_mm)/screen->height
-			  );
-	  n++;
-	}
+    EPHYR_LOG("mark");
+
+    *rotations = RR_Rotate_All | RR_Reflect_All;
+
+    if (!hostx_want_preexisting_window(screen)
+        && !hostx_want_fullscreen()) {  /* only if no -parent switch */
+        while (sizes[n].width != 0 && sizes[n].height != 0) {
+            RRRegisterSize(pScreen,
+                           sizes[n].width,
+                           sizes[n].height,
+                           (sizes[n].width * screen->width_mm) / screen->width,
+                           (sizes[n].height * screen->height_mm) /
+                           screen->height);
+            n++;
+        }
     }
-  
-  pSize = RRRegisterSize (pScreen,
-			  screen->width,
-			  screen->height, 
-			  screen->width_mm,
-			  screen->height_mm);
-    
-  randr = KdSubRotation (scrpriv->randr, screen->randr);
-  
-  RRSetCurrentConfig (pScreen, randr, 0, pSize);
-    
-  return TRUE;
+
+    pSize = RRRegisterSize(pScreen,
+                           screen->width,
+                           screen->height, screen->width_mm, screen->height_mm);
+
+    randr = KdSubRotation(scrpriv->randr, screen->randr);
+
+    RRSetCurrentConfig(pScreen, randr, 0, pSize);
+
+    return TRUE;
 }
 
 Bool
-ephyrRandRSetConfig (ScreenPtr		pScreen,
-		     Rotation		randr,
-		     int		rate,
-		     RRScreenSizePtr	pSize)
+ephyrRandRSetConfig(ScreenPtr pScreen,
+                    Rotation randr, int rate, RRScreenSizePtr pSize)
 {
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen    = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv   = screen->driver;
-  Bool		wasEnabled = pScreenPriv->enabled;
-  EphyrScrPriv	oldscr;
-  int		oldwidth, oldheight, oldmmwidth, oldmmheight;
-  Bool          oldshadow;
-  int		newwidth, newheight;
-  
-  if (screen->randr & (RR_Rotate_0|RR_Rotate_180))
-    {
-      newwidth = pSize->width;
-      newheight = pSize->height;
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    EphyrScrPriv *scrpriv = screen->driver;
+    Bool wasEnabled = pScreenPriv->enabled;
+    EphyrScrPriv oldscr;
+    int oldwidth, oldheight, oldmmwidth, oldmmheight;
+    Bool oldshadow;
+    int newwidth, newheight;
+
+    if (screen->randr & (RR_Rotate_0 | RR_Rotate_180)) {
+        newwidth = pSize->width;
+        newheight = pSize->height;
     }
-  else
-    {
-      newwidth = pSize->height;
-      newheight = pSize->width;
+    else {
+        newwidth = pSize->height;
+        newheight = pSize->width;
     }
-  
-  if (wasEnabled)
-    KdDisableScreen (pScreen);
-
-  oldscr = *scrpriv;
-    
-  oldwidth    = screen->width;
-  oldheight   = screen->height;
-  oldmmwidth  = pScreen->mmWidth;
-  oldmmheight = pScreen->mmHeight;
-  oldshadow   = scrpriv->shadow;
-  
-  /*
-   * Set new configuration
-   */
-  
-  /*
-   * We need to store the rotation value for pointer coords transformation;
-   * though initially the pointer and fb rotation are identical, when we map
-   * the fb, the screen will be reinitialized and return into an unrotated
-   * state (presumably the HW is taking care of the rotation of the fb), but the
-   * pointer still needs to be transformed.
-   */
-  ephyrRandr = KdAddRotation (screen->randr, randr);
-  scrpriv->randr = ephyrRandr;
-  
-  ephyrUnmapFramebuffer (screen); 
-  
-  screen->width  = newwidth;
-  screen->height = newheight;
-  
-  if (!ephyrMapFramebuffer (screen))
-    goto bail4;
-  
-  /* FIXME below should go in own call */
-  
-  if (oldshadow)
-    KdShadowUnset (screen->pScreen);
-  else
-    ephyrUnsetInternalDamage(screen->pScreen);
-  
-  if (scrpriv->shadow)
-    {
-      if (!KdShadowSet (screen->pScreen, 
-			scrpriv->randr, 
-			ephyrShadowUpdate, 
-			ephyrWindowLinear))
-	goto bail4;
+
+    if (wasEnabled)
+        KdDisableScreen(pScreen);
+
+    oldscr = *scrpriv;
+
+    oldwidth = screen->width;
+    oldheight = screen->height;
+    oldmmwidth = pScreen->mmWidth;
+    oldmmheight = pScreen->mmHeight;
+    oldshadow = scrpriv->shadow;
+
+    /*
+     * Set new configuration
+     */
+
+    /*
+     * We need to store the rotation value for pointer coords transformation;
+     * though initially the pointer and fb rotation are identical, when we map
+     * the fb, the screen will be reinitialized and return into an unrotated
+     * state (presumably the HW is taking care of the rotation of the fb), but the
+     * pointer still needs to be transformed.
+     */
+    ephyrRandr = KdAddRotation(screen->randr, randr);
+    scrpriv->randr = ephyrRandr;
+
+    ephyrUnmapFramebuffer(screen);
+
+    screen->width = newwidth;
+    screen->height = newheight;
+
+    if (!ephyrMapFramebuffer(screen))
+        goto bail4;
+
+    /* FIXME below should go in own call */
+
+    if (oldshadow)
+        KdShadowUnset(screen->pScreen);
+    else
+        ephyrUnsetInternalDamage(screen->pScreen);
+
+    if (scrpriv->shadow) {
+        if (!KdShadowSet(screen->pScreen,
+                         scrpriv->randr, ephyrShadowUpdate, ephyrWindowLinear))
+            goto bail4;
     }
-  else
-    {
-      /* Without shadow fb ( non rotated ) we need 
-       * to use damage to efficiently update display
-       * via signal regions what to copy from 'fb'.
-       */
-      if (!ephyrSetInternalDamage(screen->pScreen))
-	goto bail4;
+    else {
+        /* Without shadow fb ( non rotated ) we need 
+         * to use damage to efficiently update display
+         * via signal regions what to copy from 'fb'.
+         */
+        if (!ephyrSetInternalDamage(screen->pScreen))
+            goto bail4;
     }
-  
-  ephyrSetScreenSizes (screen->pScreen);
-  
-  /*
-   * Set frame buffer mapping
-   */
-  (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap (pScreen),
-				  pScreen->width,
-				  pScreen->height,
-				  screen->fb.depth,
-				  screen->fb.bitsPerPixel,
-				  screen->fb.byteStride,
-				  screen->fb.frameBuffer);
-  
-  /* set the subpixel order */
-  
-  KdSetSubpixelOrder (pScreen, scrpriv->randr);
-  
-  if (wasEnabled)
-    KdEnableScreen (pScreen);
-  
-  return TRUE;
-  
+
+    ephyrSetScreenSizes(screen->pScreen);
+
+    /*
+     * Set frame buffer mapping
+     */
+    (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap(pScreen),
+                                    pScreen->width,
+                                    pScreen->height,
+                                    screen->fb.depth,
+                                    screen->fb.bitsPerPixel,
+                                    screen->fb.byteStride,
+                                    screen->fb.frameBuffer);
+
+    /* set the subpixel order */
+
+    KdSetSubpixelOrder(pScreen, scrpriv->randr);
+
+    if (wasEnabled)
+        KdEnableScreen(pScreen);
+
+    return TRUE;
+
  bail4:
-  EPHYR_LOG("bailed");
-  
-  ephyrUnmapFramebuffer (screen);
-  *scrpriv = oldscr;
-  (void) ephyrMapFramebuffer (screen);
-  
-  pScreen->width = oldwidth;
-  pScreen->height = oldheight;
-  pScreen->mmWidth = oldmmwidth;
-  pScreen->mmHeight = oldmmheight;
-  
-  if (wasEnabled)
-    KdEnableScreen (pScreen);
-  return FALSE;
+    EPHYR_LOG("bailed");
+
+    ephyrUnmapFramebuffer(screen);
+    *scrpriv = oldscr;
+    (void) ephyrMapFramebuffer(screen);
+
+    pScreen->width = oldwidth;
+    pScreen->height = oldheight;
+    pScreen->mmWidth = oldmmwidth;
+    pScreen->mmHeight = oldmmheight;
+
+    if (wasEnabled)
+        KdEnableScreen(pScreen);
+    return FALSE;
 }
 
 Bool
-ephyrRandRInit (ScreenPtr pScreen)
+ephyrRandRInit(ScreenPtr pScreen)
 {
-  rrScrPrivPtr    pScrPriv;
-  
-  if (!RRScreenInit (pScreen))
-    return FALSE;
-  
-  pScrPriv = rrGetScrPriv(pScreen);
-  pScrPriv->rrGetInfo = ephyrRandRGetInfo;
-  pScrPriv->rrSetConfig = ephyrRandRSetConfig;
-  return TRUE;
+    rrScrPrivPtr pScrPriv;
+
+    if (!RRScreenInit(pScreen))
+        return FALSE;
+
+    pScrPriv = rrGetScrPriv(pScreen);
+    pScrPriv->rrGetInfo = ephyrRandRGetInfo;
+    pScrPriv->rrSetConfig = ephyrRandRSetConfig;
+    return TRUE;
 }
 #endif
 
 Bool
-ephyrCreateColormap (ColormapPtr pmap)
+ephyrCreateColormap(ColormapPtr pmap)
 {
-  return fbInitializeColormap (pmap);
+    return fbInitializeColormap(pmap);
 }
 
 Bool
-ephyrInitScreen (ScreenPtr pScreen)
+ephyrInitScreen(ScreenPtr pScreen)
 {
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen    = pScreenPriv->screen;
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
 
-  EPHYR_LOG ("pScreen->myNum:%d\n", pScreen->myNum) ;
-  hostx_set_screen_number (screen, pScreen->myNum);
-  hostx_set_win_title (screen, "(ctrl+shift grabs mouse and keyboard)") ;
-  pScreen->CreateColormap = ephyrCreateColormap;
+    EPHYR_LOG("pScreen->myNum:%d\n", pScreen->myNum);
+    hostx_set_screen_number(screen, pScreen->myNum);
+    hostx_set_win_title(screen, "(ctrl+shift grabs mouse and keyboard)");
+    pScreen->CreateColormap = ephyrCreateColormap;
 
 #ifdef XV
-  if (!ephyrNoXV) {
-      if (!ephyrInitVideo (pScreen)) {
-          EPHYR_LOG_ERROR ("failed to initialize xvideo\n") ;
-      } else {
-          EPHYR_LOG ("initialized xvideo okay\n") ;
-      }
-  }
+    if (!ephyrNoXV) {
+        if (!ephyrInitVideo(pScreen)) {
+            EPHYR_LOG_ERROR("failed to initialize xvideo\n");
+        }
+        else {
+            EPHYR_LOG("initialized xvideo okay\n");
+        }
+    }
 #endif /*XV*/
-
 #ifdef XF86DRI
-  if (!ephyrNoDRI && !hostx_has_dri ()) {
-      EPHYR_LOG ("host x does not support DRI. Disabling DRI forwarding\n") ;
-      ephyrNoDRI = TRUE ;
+        if (!ephyrNoDRI && !hostx_has_dri()) {
+        EPHYR_LOG("host x does not support DRI. Disabling DRI forwarding\n");
+        ephyrNoDRI = TRUE;
 #ifdef GLXEXT
-      noGlxVisualInit = FALSE ;
+        noGlxVisualInit = FALSE;
 #endif
-  }
-  if (!ephyrNoDRI) {
-    ephyrDRIExtensionInit (pScreen) ;
-    ephyrHijackGLXExtension () ;
-  }
+    }
+    if (!ephyrNoDRI) {
+        ephyrDRIExtensionInit(pScreen);
+        ephyrHijackGLXExtension();
+    }
 #endif
 
 #ifdef GLXEXT
-  if (ephyrNoDRI) {
-      noGlxVisualInit = FALSE ;
-  }
+    if (ephyrNoDRI) {
+        noGlxVisualInit = FALSE;
+    }
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
 Bool
-ephyrFinishInitScreen (ScreenPtr pScreen)
+ephyrFinishInitScreen(ScreenPtr pScreen)
 {
-  /* FIXME: Calling this even if not using shadow.  
-   * Seems harmless enough. But may be safer elsewhere.
-   */
-  if (!shadowSetup (pScreen))
-    return FALSE;
+    /* FIXME: Calling this even if not using shadow.  
+     * Seems harmless enough. But may be safer elsewhere.
+     */
+    if (!shadowSetup(pScreen))
+        return FALSE;
 
 #ifdef RANDR
-  if (!ephyrRandRInit (pScreen))
-    return FALSE;
+    if (!ephyrRandRInit(pScreen))
+        return FALSE;
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
 Bool
-ephyrCreateResources (ScreenPtr pScreen)
+ephyrCreateResources(ScreenPtr pScreen)
 {
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen    = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv   = screen->driver;
-
-  EPHYR_LOG("mark pScreen=%p mynum=%d shadow=%d",
-            pScreen, pScreen->myNum, scrpriv->shadow);
-
-  if (scrpriv->shadow) 
-    return KdShadowSet (pScreen, 
-			scrpriv->randr, 
-			ephyrShadowUpdate, 
-			ephyrWindowLinear);
-  else
-    return ephyrSetInternalDamage(pScreen); 
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    EphyrScrPriv *scrpriv = screen->driver;
+
+    EPHYR_LOG("mark pScreen=%p mynum=%d shadow=%d",
+              pScreen, pScreen->myNum, scrpriv->shadow);
+
+    if (scrpriv->shadow)
+        return KdShadowSet(pScreen,
+                           scrpriv->randr,
+                           ephyrShadowUpdate, ephyrWindowLinear);
+    else
+        return ephyrSetInternalDamage(pScreen);
 }
 
 void
-ephyrPreserve (KdCardInfo *card)
+ephyrPreserve(KdCardInfo * card)
 {
 }
 
 Bool
-ephyrEnable (ScreenPtr pScreen)
+ephyrEnable(ScreenPtr pScreen)
 {
-  return TRUE;
+    return TRUE;
 }
 
 Bool
-ephyrDPMS (ScreenPtr pScreen, int mode)
+ephyrDPMS(ScreenPtr pScreen, int mode)
 {
-  return TRUE;
+    return TRUE;
 }
 
 void
-ephyrDisable (ScreenPtr pScreen)
+ephyrDisable(ScreenPtr pScreen)
 {
 }
 
 void
-ephyrRestore (KdCardInfo *card)
+ephyrRestore(KdCardInfo * card)
 {
 }
 
 void
-ephyrScreenFini (KdScreenInfo *screen)
+ephyrScreenFini(KdScreenInfo * screen)
 {
-    EphyrScrPriv  *scrpriv = screen->driver;
+    EphyrScrPriv *scrpriv = screen->driver;
+
     if (scrpriv->shadow) {
-        KdShadowFbFree (screen);
+        KdShadowFbFree(screen);
     }
     free(screen->driver);
     screen->driver = NULL;
@@ -764,99 +728,99 @@ void
 ephyrUpdateModifierState(unsigned int state)
 {
 
-  DeviceIntPtr pDev = inputInfo.keyboard;
-  KeyClassPtr keyc = pDev->key;
-  int i;
-  CARD8 mask;
-  int xkb_state;
-  
-  if (!pDev)
-      return;
+    DeviceIntPtr pDev = inputInfo.keyboard;
+    KeyClassPtr keyc = pDev->key;
+    int i;
+    CARD8 mask;
+    int xkb_state;
 
-  xkb_state = XkbStateFieldFromRec(&pDev->key->xkbInfo->state);
-  state = state & 0xff;
+    if (!pDev)
+        return;
 
-  if (xkb_state == state)
-    return;
-      
-  for (i = 0, mask = 1; i < 8; i++, mask <<= 1) {
-    int key;
+    xkb_state = XkbStateFieldFromRec(&pDev->key->xkbInfo->state);
+    state = state & 0xff;
 
-    /* Modifier is down, but shouldn't be
-     */
-    if ((xkb_state & mask) && !(state & mask)) {
-      int count = keyc->modifierKeyCount[i];
+    if (xkb_state == state)
+        return;
 
-      for (key = 0; key < MAP_LENGTH; key++)
-        if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
-          if (key_is_down(pDev, key, KEY_PROCESSED))
-	        KdEnqueueKeyboardEvent (ephyrKbd, key, TRUE);
+    for (i = 0, mask = 1; i < 8; i++, mask <<= 1) {
+        int key;
 
-          if (--count == 0)
-            break;
-        }
-    }
+        /* Modifier is down, but shouldn't be
+         */
+        if ((xkb_state & mask) && !(state & mask)) {
+            int count = keyc->modifierKeyCount[i];
 
-    /* Modifier shoud be down, but isn't
-     */
-    if (!(xkb_state & mask) && (state & mask))
-      for (key = 0; key < MAP_LENGTH; key++)
-        if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
-	        KdEnqueueKeyboardEvent (ephyrKbd, key, FALSE);
-          break;
+            for (key = 0; key < MAP_LENGTH; key++)
+                if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
+                    if (key_is_down(pDev, key, KEY_PROCESSED))
+                        KdEnqueueKeyboardEvent(ephyrKbd, key, TRUE);
+
+                    if (--count == 0)
+                        break;
+                }
         }
-  }
+
+        /* Modifier shoud be down, but isn't
+         */
+        if (!(xkb_state & mask) && (state & mask))
+            for (key = 0; key < MAP_LENGTH; key++)
+                if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
+                    KdEnqueueKeyboardEvent(ephyrKbd, key, FALSE);
+                    break;
+                }
+    }
 }
 
 static void
-ephyrBlockSigio (void)
+ephyrBlockSigio(void)
 {
     sigset_t set;
 
-    sigemptyset (&set);
-    sigaddset (&set, SIGIO);
-    sigprocmask (SIG_BLOCK, &set, 0);
+    sigemptyset(&set);
+    sigaddset(&set, SIGIO);
+    sigprocmask(SIG_BLOCK, &set, 0);
 }
 
 static void
-ephyrUnblockSigio (void)
+ephyrUnblockSigio(void)
 {
     sigset_t set;
 
-    sigemptyset (&set);
-    sigaddset (&set, SIGIO);
-    sigprocmask (SIG_UNBLOCK, &set, 0);
+    sigemptyset(&set);
+    sigaddset(&set, SIGIO);
+    sigprocmask(SIG_UNBLOCK, &set, 0);
 }
 
 static Bool
 ephyrCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
 {
-  return FALSE;
+    return FALSE;
 }
 
 static void
-ephyrCrossScreen (ScreenPtr pScreen, Bool entering)
+ephyrCrossScreen(ScreenPtr pScreen, Bool entering)
 {
 }
 
-int ephyrCurScreen; /*current event screen*/
+int ephyrCurScreen;             /*current event screen */
 
 static void
-ephyrWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+ephyrWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 {
-    ephyrBlockSigio ();
+    ephyrBlockSigio();
     ephyrCurScreen = pScreen->myNum;
-    miPointerWarpCursor (inputInfo.pointer, pScreen, x, y);
-    ephyrUnblockSigio ();
+    miPointerWarpCursor(inputInfo.pointer, pScreen, x, y);
+
+    ephyrUnblockSigio();
 }
 
-miPointerScreenFuncRec ephyrPointerScreenFuncs =
-{
-  ephyrCursorOffScreen,
-  ephyrCrossScreen,
-  ephyrWarpCursor,
-  NULL,
-  NULL
+miPointerScreenFuncRec ephyrPointerScreenFuncs = {
+    ephyrCursorOffScreen,
+    ephyrCrossScreen,
+    ephyrWarpCursor,
+    NULL,
+    NULL
 };
 
 #ifdef XF86DRI
@@ -875,198 +839,192 @@ miPointerScreenFuncRec ephyrPointerScreenFuncs =
  * expose events and send those events to clients.
  */
 static void
-ephyrExposePairedWindow (int a_remote)
+ephyrExposePairedWindow(int a_remote)
 {
     EphyrWindowPair *pair = NULL;
     RegionRec reg;
     ScreenPtr screen;
 
-    if (!findWindowPairFromRemote (a_remote, &pair)) {
-	EPHYR_LOG ("did not find a pair for this window\n");
-	return;
+    if (!findWindowPairFromRemote(a_remote, &pair)) {
+        EPHYR_LOG("did not find a pair for this window\n");
+        return;
     }
     screen = pair->local->drawable.pScreen;
     RegionNull(&reg);
     RegionCopy(&reg, &pair->local->clipList);
-    screen->WindowExposures (pair->local, &reg, NullRegion);
+    screen->WindowExposures(pair->local, &reg, NullRegion);
     RegionUninit(&reg);
 }
-#endif /* XF86DRI */
+#endif                          /* XF86DRI */
 
 void
 ephyrPoll(void)
 {
-  EphyrHostXEvent ev;
+    EphyrHostXEvent ev;
 
-  while (hostx_get_event(&ev))
-    {
-      switch (ev.type)
-        {
+    while (hostx_get_event(&ev)) {
+        switch (ev.type) {
         case EPHYR_EV_MOUSE_MOTION:
-          if (!ephyrMouse ||
-              !((EphyrPointerPrivate *)ephyrMouse->driverPrivate)->enabled) {
-              EPHYR_LOG ("skipping mouse motion:%d\n", ephyrCurScreen) ;
-              continue;
-          }
-          {
-            if (ev.data.mouse_motion.screen >=0
-                && (ephyrCurScreen != ev.data.mouse_motion.screen))
-              {
-                  EPHYR_LOG ("warping mouse cursor. "
-                             "cur_screen%d, motion_screen:%d\n",
-                             ephyrCurScreen, ev.data.mouse_motion.screen) ;
-                  if (ev.data.mouse_motion.screen >= 0)
-                    {
-                      ephyrWarpCursor
-                            (inputInfo.pointer, screenInfo.screens[ev.data.mouse_motion.screen],
-                             ev.data.mouse_motion.x,
-                             ev.data.mouse_motion.y );
+            if (!ephyrMouse ||
+                !((EphyrPointerPrivate *) ephyrMouse->driverPrivate)->enabled) {
+                EPHYR_LOG("skipping mouse motion:%d\n", ephyrCurScreen);
+                continue;
+            }
+            {
+                if (ev.data.mouse_motion.screen >= 0
+                    && (ephyrCurScreen != ev.data.mouse_motion.screen)) {
+                    EPHYR_LOG("warping mouse cursor. "
+                              "cur_screen%d, motion_screen:%d\n",
+                              ephyrCurScreen, ev.data.mouse_motion.screen);
+                    if (ev.data.mouse_motion.screen >= 0) {
+                        ephyrWarpCursor
+                            (inputInfo.pointer,
+                             screenInfo.screens[ev.data.mouse_motion.screen],
+                             ev.data.mouse_motion.x, ev.data.mouse_motion.y);
                     }
-              }
-            else
-              {
-                  int x=0, y=0;
+                }
+                else {
+                    int x = 0, y = 0;
+
 #ifdef XF86DRI
-                  EphyrWindowPair *pair = NULL;
+                    EphyrWindowPair *pair = NULL;
 #endif
-                  EPHYR_LOG ("enqueuing mouse motion:%d\n", ephyrCurScreen) ;
-                  x = ev.data.mouse_motion.x;
-                  y = ev.data.mouse_motion.y;
-                  EPHYR_LOG ("initial (x,y):(%d,%d)\n", x, y) ;
+                    EPHYR_LOG("enqueuing mouse motion:%d\n", ephyrCurScreen);
+                    x = ev.data.mouse_motion.x;
+                    y = ev.data.mouse_motion.y;
+                    EPHYR_LOG("initial (x,y):(%d,%d)\n", x, y);
 #ifdef XF86DRI
-                  EPHYR_LOG ("is this window peered by a gl drawable ?\n") ;
-                  if (findWindowPairFromRemote (ev.data.mouse_motion.window,
-                                                &pair))
-                    {
-                        EPHYR_LOG ("yes, it is peered\n") ;
+                    EPHYR_LOG("is this window peered by a gl drawable ?\n");
+                    if (findWindowPairFromRemote(ev.data.mouse_motion.window,
+                                                 &pair)) {
+                        EPHYR_LOG("yes, it is peered\n");
                         x += pair->local->drawable.x;
                         y += pair->local->drawable.y;
                     }
-                  else
-                    {
-                        EPHYR_LOG ("no, it is not peered\n") ;
+                    else {
+                        EPHYR_LOG("no, it is not peered\n");
                     }
-                  EPHYR_LOG ("final (x,y):(%d,%d)\n", x, y) ;
+                    EPHYR_LOG("final (x,y):(%d,%d)\n", x, y);
 #endif
-                  KdEnqueuePointerEvent(ephyrMouse, mouseState, x, y, 0);
-              }
-          }
-          break;
+                    KdEnqueuePointerEvent(ephyrMouse, mouseState, x, y, 0);
+                }
+            }
+            break;
 
         case EPHYR_EV_MOUSE_PRESS:
-          if (!ephyrMouse ||
-              !((EphyrPointerPrivate *)ephyrMouse->driverPrivate)->enabled) {
-              EPHYR_LOG ("skipping mouse press:%d\n", ephyrCurScreen) ;
-              continue;
-          }
-          EPHYR_LOG ("enqueuing mouse press:%d\n", ephyrCurScreen) ;
-	  ephyrUpdateModifierState(ev.key_state);
-	  mouseState |= ev.data.mouse_down.button_num;
-	  KdEnqueuePointerEvent(ephyrMouse, mouseState|KD_MOUSE_DELTA, 0, 0, 0);
-	  break;
-
-	case EPHYR_EV_MOUSE_RELEASE:
-          if (!ephyrMouse ||
-              !((EphyrPointerPrivate *)ephyrMouse->driverPrivate)->enabled)
-              continue;
-	  ephyrUpdateModifierState(ev.key_state);
-	  mouseState &= ~ev.data.mouse_up.button_num;
-          EPHYR_LOG ("enqueuing mouse release:%d\n", ephyrCurScreen) ;
-	  KdEnqueuePointerEvent(ephyrMouse, mouseState|KD_MOUSE_DELTA, 0, 0, 0);
-	  break;
-
-	case EPHYR_EV_KEY_PRESS:
-          if (!ephyrKbd ||
-              !((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
-              continue;
-	  ephyrUpdateModifierState(ev.key_state);
-	  KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_down.scancode, FALSE);
-	  break;
-
-	case EPHYR_EV_KEY_RELEASE:
-          if (!ephyrKbd ||
-              !((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
-              continue;
-	  ephyrUpdateModifierState(ev.key_state);
-	  KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_up.scancode, TRUE);
-	  break;
+            if (!ephyrMouse ||
+                !((EphyrPointerPrivate *) ephyrMouse->driverPrivate)->enabled) {
+                EPHYR_LOG("skipping mouse press:%d\n", ephyrCurScreen);
+                continue;
+            }
+            EPHYR_LOG("enqueuing mouse press:%d\n", ephyrCurScreen);
+            ephyrUpdateModifierState(ev.key_state);
+            mouseState |= ev.data.mouse_down.button_num;
+            KdEnqueuePointerEvent(ephyrMouse, mouseState | KD_MOUSE_DELTA, 0, 0,
+                                  0);
+            break;
+
+        case EPHYR_EV_MOUSE_RELEASE:
+            if (!ephyrMouse ||
+                !((EphyrPointerPrivate *) ephyrMouse->driverPrivate)->enabled)
+                continue;
+            ephyrUpdateModifierState(ev.key_state);
+            mouseState &= ~ev.data.mouse_up.button_num;
+            EPHYR_LOG("enqueuing mouse release:%d\n", ephyrCurScreen);
+            KdEnqueuePointerEvent(ephyrMouse, mouseState | KD_MOUSE_DELTA, 0, 0,
+                                  0);
+            break;
+
+        case EPHYR_EV_KEY_PRESS:
+            if (!ephyrKbd ||
+                !((EphyrKbdPrivate *) ephyrKbd->driverPrivate)->enabled)
+                continue;
+            ephyrUpdateModifierState(ev.key_state);
+            KdEnqueueKeyboardEvent(ephyrKbd, ev.data.key_down.scancode, FALSE);
+            break;
+
+        case EPHYR_EV_KEY_RELEASE:
+            if (!ephyrKbd ||
+                !((EphyrKbdPrivate *) ephyrKbd->driverPrivate)->enabled)
+                continue;
+            ephyrUpdateModifierState(ev.key_state);
+            KdEnqueueKeyboardEvent(ephyrKbd, ev.data.key_up.scancode, TRUE);
+            break;
 
 #ifdef XF86DRI
-	case EPHYR_EV_EXPOSE:
-	  /*
-	   * We only receive expose events when the expose event have
-	   * be generated for a drawable that is a host X window managed
-	   * by Xephyr. Host X windows managed by Xephyr exists for instance
-	   * when Xephyr is asked to create a GL drawable in a DRI environment.
-	   */
-	  ephyrExposePairedWindow (ev.data.expose.window);
-	  break;
-#endif /* XF86DRI */
-
-	default:
-	  break;
-	}
+        case EPHYR_EV_EXPOSE:
+            /*
+             * We only receive expose events when the expose event have
+             * be generated for a drawable that is a host X window managed
+             * by Xephyr. Host X windows managed by Xephyr exists for instance
+             * when Xephyr is asked to create a GL drawable in a DRI environment.
+             */
+            ephyrExposePairedWindow(ev.data.expose.window);
+            break;
+#endif                          /* XF86DRI */
+
+        default:
+            break;
+        }
     }
 }
 
 void
-ephyrCardFini (KdCardInfo *card)
+ephyrCardFini(KdCardInfo * card)
 {
-  EphyrPriv	*priv = card->driver;
-  free(priv);
+    EphyrPriv *priv = card->driver;
+
+    free(priv);
 }
 
 void
-ephyrGetColors (ScreenPtr pScreen, int n, xColorItem *pdefs)
+ephyrGetColors(ScreenPtr pScreen, int n, xColorItem * pdefs)
 {
-  /* XXX Not sure if this is right */
-  
-  EPHYR_LOG("mark");
-  
-  while (n--)
-    {
-      pdefs->red = 0;
-      pdefs->green = 0;
-      pdefs->blue = 0;
-      pdefs++;
+    /* XXX Not sure if this is right */
+
+    EPHYR_LOG("mark");
+
+    while (n--) {
+        pdefs->red = 0;
+        pdefs->green = 0;
+        pdefs->blue = 0;
+        pdefs++;
     }
 
 }
 
 void
-ephyrPutColors (ScreenPtr pScreen, int n, xColorItem *pdefs)
+ephyrPutColors(ScreenPtr pScreen, int n, xColorItem * pdefs)
 {
-  int min, max, p;
-
-  /* XXX Not sure if this is right */
-
-  min = 256;
-  max = 0;
-  
-  while (n--)
-    {
-      p = pdefs->pixel;
-      if (p < min)
-	min = p;
-      if (p > max)
-	max = p;
-
-      hostx_set_cmap_entry(p, 		
-			   pdefs->red >> 8,
-			   pdefs->green >> 8,
-			   pdefs->blue >> 8);
-      pdefs++;
+    int min, max, p;
+
+    /* XXX Not sure if this is right */
+
+    min = 256;
+    max = 0;
+
+    while (n--) {
+        p = pdefs->pixel;
+        if (p < min)
+            min = p;
+        if (p > max)
+            max = p;
+
+        hostx_set_cmap_entry(p,
+                             pdefs->red >> 8,
+                             pdefs->green >> 8, pdefs->blue >> 8);
+        pdefs++;
     }
 }
 
 /* Mouse calls */
 
 static Status
-MouseInit (KdPointerInfo *pi)
+MouseInit(KdPointerInfo * pi)
 {
     pi->driverPrivate = (EphyrPointerPrivate *)
-                         calloc(sizeof(EphyrPointerPrivate), 1);
-    ((EphyrPointerPrivate *)pi->driverPrivate)->enabled = FALSE;
+        calloc(sizeof(EphyrPointerPrivate), 1);
+    ((EphyrPointerPrivate *) pi->driverPrivate)->enabled = FALSE;
     pi->nAxes = 3;
     pi->nButtons = 32;
     free(pi->name);
@@ -1084,23 +1042,23 @@ MouseInit (KdPointerInfo *pi)
 }
 
 static Status
-MouseEnable (KdPointerInfo *pi)
+MouseEnable(KdPointerInfo * pi)
 {
-    ((EphyrPointerPrivate *)pi->driverPrivate)->enabled = TRUE;
+    ((EphyrPointerPrivate *) pi->driverPrivate)->enabled = TRUE;
     return Success;
 }
 
 static void
-MouseDisable (KdPointerInfo *pi)
+MouseDisable(KdPointerInfo * pi)
 {
-    ((EphyrPointerPrivate *)pi->driverPrivate)->enabled = FALSE;
+    ((EphyrPointerPrivate *) pi->driverPrivate)->enabled = FALSE;
     return;
 }
 
 static void
-MouseFini (KdPointerInfo *pi)
+MouseFini(KdPointerInfo * pi)
 {
-    ephyrMouse = NULL; 
+    ephyrMouse = NULL;
     return;
 }
 
@@ -1116,55 +1074,54 @@ KdPointerDriver EphyrMouseDriver = {
 /* Keyboard */
 
 static Status
-EphyrKeyboardInit (KdKeyboardInfo *ki)
+EphyrKeyboardInit(KdKeyboardInfo * ki)
 {
-  ki->driverPrivate = (EphyrKbdPrivate *)
-                       calloc(sizeof(EphyrKbdPrivate), 1);
-  hostx_load_keymap();
-  if (!ephyrKeySyms.map) {
-      ErrorF("Couldn't load keymap from host\n");
-      return BadAlloc;
-  }
-  ki->minScanCode = ephyrKeySyms.minKeyCode;
-  ki->maxScanCode = ephyrKeySyms.maxKeyCode;
-  free(ki->name);
-  ki->name = strdup("Xephyr virtual keyboard");
-  ephyrKbd = ki;
-  return Success;
+    ki->driverPrivate = (EphyrKbdPrivate *)
+        calloc(sizeof(EphyrKbdPrivate), 1);
+    hostx_load_keymap();
+    if (!ephyrKeySyms.map) {
+        ErrorF("Couldn't load keymap from host\n");
+        return BadAlloc;
+    }
+    ki->minScanCode = ephyrKeySyms.minKeyCode;
+    ki->maxScanCode = ephyrKeySyms.maxKeyCode;
+    free(ki->name);
+    ki->name = strdup("Xephyr virtual keyboard");
+    ephyrKbd = ki;
+    return Success;
 }
 
 static Status
-EphyrKeyboardEnable (KdKeyboardInfo *ki)
+EphyrKeyboardEnable(KdKeyboardInfo * ki)
 {
-    ((EphyrKbdPrivate *)ki->driverPrivate)->enabled = TRUE;
+    ((EphyrKbdPrivate *) ki->driverPrivate)->enabled = TRUE;
 
     return Success;
 }
 
 static void
-EphyrKeyboardDisable (KdKeyboardInfo *ki)
+EphyrKeyboardDisable(KdKeyboardInfo * ki)
 {
-    ((EphyrKbdPrivate *)ki->driverPrivate)->enabled = FALSE;
+    ((EphyrKbdPrivate *) ki->driverPrivate)->enabled = FALSE;
 }
 
 static void
-EphyrKeyboardFini (KdKeyboardInfo *ki)
+EphyrKeyboardFini(KdKeyboardInfo * ki)
 {
     ephyrKbd = NULL;
     return;
 }
 
 static void
-EphyrKeyboardLeds (KdKeyboardInfo *ki, int leds)
+EphyrKeyboardLeds(KdKeyboardInfo * ki, int leds)
 {
 }
 
 static void
-EphyrKeyboardBell (KdKeyboardInfo *ki, int volume, int frequency, int duration)
+EphyrKeyboardBell(KdKeyboardInfo * ki, int volume, int frequency, int duration)
 {
 }
 
-
 KdKeyboardDriver EphyrKeyboardDriver = {
     "ephyr",
     EphyrKeyboardInit,
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.h b/xorg-server/hw/kdrive/ephyr/ephyr.h
index 23848004c..be910c19e 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.h
@@ -30,7 +30,7 @@
 #include <signal.h>
 #include <libgen.h>
 
-#include "os.h"  		/* for OsSignal() */
+#include "os.h"                 /* for OsSignal() */
 #include "kdrive.h"
 #include "hostx.h"
 #include "exa.h"
@@ -42,8 +42,8 @@
 #include "damage.h"
 
 typedef struct _ephyrPriv {
-    CARD8	*base;
-    int		bytes_per_line;
+    CARD8 *base;
+    int bytes_per_line;
 } EphyrPriv;
 
 typedef struct _ephyrFakexaPriv {
@@ -61,9 +61,9 @@ typedef struct _ephyrFakexaPriv {
 } EphyrFakexaPriv;
 
 typedef struct _ephyrScrPriv {
-    Rotation	randr;
-    Bool	shadow;
-    DamagePtr   pDamage;
+    Rotation randr;
+    Bool shadow;
+    DamagePtr pDamage;
     EphyrFakexaPriv *fakexa;
 } EphyrScrPriv;
 
@@ -74,130 +74,125 @@ extern KdPointerInfo *ephyrMouse;
 extern miPointerScreenFuncRec ephyrPointerScreenFuncs;
 
 Bool
-ephyrInitialize (KdCardInfo *card, EphyrPriv *priv);
+ ephyrInitialize(KdCardInfo * card, EphyrPriv * priv);
 
 Bool
-ephyrCardInit (KdCardInfo *card);
+ ephyrCardInit(KdCardInfo * card);
 
 Bool
-ephyrScreenInit (KdScreenInfo *screen);
+ ephyrScreenInit(KdScreenInfo * screen);
 
 Bool
-ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv);
-    
+ ephyrScreenInitialize(KdScreenInfo * screen, EphyrScrPriv * scrpriv);
+
 Bool
-ephyrInitScreen (ScreenPtr pScreen);
+ ephyrInitScreen(ScreenPtr pScreen);
 
 Bool
-ephyrFinishInitScreen (ScreenPtr pScreen);
+ ephyrFinishInitScreen(ScreenPtr pScreen);
 
 Bool
-ephyrCreateResources (ScreenPtr pScreen);
+ ephyrCreateResources(ScreenPtr pScreen);
 
 void
-ephyrPreserve (KdCardInfo *card);
+ ephyrPreserve(KdCardInfo * card);
 
 Bool
-ephyrEnable (ScreenPtr pScreen);
+ ephyrEnable(ScreenPtr pScreen);
 
 Bool
-ephyrDPMS (ScreenPtr pScreen, int mode);
+ ephyrDPMS(ScreenPtr pScreen, int mode);
 
 void
-ephyrDisable (ScreenPtr pScreen);
+ ephyrDisable(ScreenPtr pScreen);
 
 void
-ephyrRestore (KdCardInfo *card);
+ ephyrRestore(KdCardInfo * card);
 
 void
-ephyrScreenFini (KdScreenInfo *screen);
+ ephyrScreenFini(KdScreenInfo * screen);
 
 void
-ephyrCardFini (KdCardInfo *card);
+ ephyrCardFini(KdCardInfo * card);
 
 void
-ephyrGetColors (ScreenPtr pScreen, int n, xColorItem *pdefs);
+ ephyrGetColors(ScreenPtr pScreen, int n, xColorItem * pdefs);
 
 void
-ephyrPutColors (ScreenPtr pScreen, int n, xColorItem *pdefs);
+ ephyrPutColors(ScreenPtr pScreen, int n, xColorItem * pdefs);
 
 Bool
-ephyrMapFramebuffer (KdScreenInfo *screen);
+ ephyrMapFramebuffer(KdScreenInfo * screen);
 
-void *
-ephyrWindowLinear (ScreenPtr	pScreen,
-		   CARD32	row,
-		   CARD32	offset,
-		   int		mode,
-		   CARD32	*size,
-		   void		*closure);
+void *ephyrWindowLinear(ScreenPtr pScreen,
+                        CARD32 row,
+                        CARD32 offset, int mode, CARD32 *size, void *closure);
 
 void
-ephyrSetScreenSizes (ScreenPtr pScreen);
+ ephyrSetScreenSizes(ScreenPtr pScreen);
 
 Bool
-ephyrUnmapFramebuffer (KdScreenInfo *screen);
+ ephyrUnmapFramebuffer(KdScreenInfo * screen);
 
 void
-ephyrUnsetInternalDamage (ScreenPtr pScreen);
+ ephyrUnsetInternalDamage(ScreenPtr pScreen);
 
 Bool
-ephyrSetInternalDamage (ScreenPtr pScreen);
+ ephyrSetInternalDamage(ScreenPtr pScreen);
 
 Bool
-ephyrCreateColormap (ColormapPtr pmap);
+ ephyrCreateColormap(ColormapPtr pmap);
 
 void
-ephyrPoll(void);
-    
+ ephyrPoll(void);
+
 #ifdef RANDR
 Bool
-ephyrRandRGetInfo (ScreenPtr pScreen, Rotation *rotations);
+ ephyrRandRGetInfo(ScreenPtr pScreen, Rotation * rotations);
 
 Bool
-ephyrRandRSetConfig (ScreenPtr		pScreen,
-		     Rotation		randr,
-		     int		rate,
-		     RRScreenSizePtr	pSize);
+
+ephyrRandRSetConfig(ScreenPtr pScreen,
+                    Rotation randr, int rate, RRScreenSizePtr pSize);
 Bool
-ephyrRandRInit (ScreenPtr pScreen);
+ ephyrRandRInit(ScreenPtr pScreen);
 
-void 
-ephyrShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf);
+void
+ ephyrShadowUpdate(ScreenPtr pScreen, shadowBufPtr pBuf);
 
 #endif
 
 void
-ephyrUpdateModifierState(unsigned int state);
+ ephyrUpdateModifierState(unsigned int state);
 
 extern KdPointerDriver EphyrMouseDriver;
 
-extern KdKeyboardDriver	EphyrKeyboardDriver;
+extern KdKeyboardDriver EphyrKeyboardDriver;
 
-extern KdOsFuncs   EphyrOsFuncs;
+extern KdOsFuncs EphyrOsFuncs;
 
 extern Bool ephyrCursorInit(ScreenPtr pScreen);
 
 extern void ephyrCursorEnable(ScreenPtr pScreen);
 
-extern int ephyrBufferHeight(KdScreenInfo *screen);
+extern int ephyrBufferHeight(KdScreenInfo * screen);
 
 /* ephyr_draw.c */
 
 Bool
-ephyrDrawInit(ScreenPtr pScreen);
+ ephyrDrawInit(ScreenPtr pScreen);
 
 void
-ephyrDrawEnable(ScreenPtr pScreen);
+ ephyrDrawEnable(ScreenPtr pScreen);
 
 void
-ephyrDrawDisable(ScreenPtr pScreen);
+ ephyrDrawDisable(ScreenPtr pScreen);
 
 void
-ephyrDrawFini(ScreenPtr pScreen);
+ ephyrDrawFini(ScreenPtr pScreen);
 
 /*ephyvideo.c*/
 
-Bool ephyrInitVideo(ScreenPtr pScreen) ;
+Bool ephyrInitVideo(ScreenPtr pScreen);
 
 #endif
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr_draw.c b/xorg-server/hw/kdrive/ephyr/ephyr_draw.c
index cf5f55394..5b8a1d504 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr_draw.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr_draw.c
@@ -64,7 +64,7 @@ ephyrPreparePipelinedAccess(PixmapPtr pPix, int index)
     fakexa->saved_ptrs[index] = pPix->devPrivate.ptr;
 
     if (pPix->devPrivate.ptr != NULL)
-	return;
+        return;
 
     pPix->devPrivate.ptr = fakexa->exa->memoryBase + exaGetPixmapOffset(pPix);
 }
@@ -93,6 +93,7 @@ static Bool
 ephyrPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
 {
     ScreenPtr pScreen = pPix->drawable.pScreen;
+
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
     EphyrScrPriv *scrpriv = screen->driver;
@@ -107,7 +108,8 @@ ephyrPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
     tmpval[0].val = alu;
     tmpval[1].val = pm;
     tmpval[2].val = fg;
-    ChangeGC(NullClient, fakexa->pGC, GCFunction | GCPlaneMask | GCForeground, tmpval);
+    ChangeGC(NullClient, fakexa->pGC, GCFunction | GCPlaneMask | GCForeground,
+             tmpval);
 
     ValidateGC(&pPix->drawable, fakexa->pGC);
 
@@ -123,6 +125,7 @@ static void
 ephyrSolid(PixmapPtr pPix, int x1, int y1, int x2, int y2)
 {
     ScreenPtr pScreen = pPix->drawable.pScreen;
+
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
     EphyrScrPriv *scrpriv = screen->driver;
@@ -138,6 +141,7 @@ static void
 ephyrDoneSolid(PixmapPtr pPix)
 {
     ScreenPtr pScreen = pPix->drawable.pScreen;
+
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
     EphyrScrPriv *scrpriv = screen->driver;
@@ -154,9 +158,10 @@ ephyrDoneSolid(PixmapPtr pPix)
  */
 static Bool
 ephyrPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy, int alu,
-		 Pixel pm)
+                 Pixel pm)
 {
     ScreenPtr pScreen = pDst->drawable.pScreen;
+
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
     EphyrScrPriv *scrpriv = screen->driver;
@@ -172,7 +177,7 @@ ephyrPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy, int alu,
 
     tmpval[0].val = alu;
     tmpval[1].val = pm;
-    ChangeGC (NullClient, fakexa->pGC, GCFunction | GCPlaneMask, tmpval);
+    ChangeGC(NullClient, fakexa->pGC, GCFunction | GCPlaneMask, tmpval);
 
     ValidateGC(&pDst->drawable, fakexa->pGC);
 
@@ -188,13 +193,14 @@ static void
 ephyrCopy(PixmapPtr pDst, int srcX, int srcY, int dstX, int dstY, int w, int h)
 {
     ScreenPtr pScreen = pDst->drawable.pScreen;
+
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
     EphyrScrPriv *scrpriv = screen->driver;
     EphyrFakexaPriv *fakexa = scrpriv->fakexa;
 
     fbCopyArea(&fakexa->pSrc->drawable, &fakexa->pDst->drawable, fakexa->pGC,
-	       srcX, srcY, w, h, dstX, dstY);
+               srcX, srcY, w, h, dstX, dstY);
 }
 
 /**
@@ -204,12 +210,13 @@ static void
 ephyrDoneCopy(PixmapPtr pDst)
 {
     ScreenPtr pScreen = pDst->drawable.pScreen;
+
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
     EphyrScrPriv *scrpriv = screen->driver;
     EphyrFakexaPriv *fakexa = scrpriv->fakexa;
 
-    FreeScratchGC (fakexa->pGC);
+    FreeScratchGC(fakexa->pGC);
 
     ephyrFinishPipelinedAccess(fakexa->pSrc, EXA_PREPARE_SRC);
     ephyrFinishPipelinedAccess(fakexa->pDst, EXA_PREPARE_DEST);
@@ -222,13 +229,13 @@ ephyrDoneCopy(PixmapPtr pDst)
  */
 static Bool
 ephyrCheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
-		    PicturePtr pDstPicture)
+                    PicturePtr pDstPicture)
 {
     /* Exercise the component alpha helper, so fail on this case like a normal
      * driver
      */
     if (pMaskPicture && pMaskPicture->componentAlpha && op == PictOpOver)
-	return FALSE;
+        return FALSE;
 
     return TRUE;
 }
@@ -238,8 +245,8 @@ ephyrCheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
  */
 static Bool
 ephyrPrepareComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
-		      PicturePtr pDstPicture, PixmapPtr pSrc, PixmapPtr pMask,
-		      PixmapPtr pDst)
+                      PicturePtr pDstPicture, PixmapPtr pSrc, PixmapPtr pMask,
+                      PixmapPtr pDst)
 {
     KdScreenPriv(pDst->drawable.pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
@@ -249,7 +256,7 @@ ephyrPrepareComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
     ephyrPreparePipelinedAccess(pDst, EXA_PREPARE_DEST);
     ephyrPreparePipelinedAccess(pSrc, EXA_PREPARE_SRC);
     if (pMask != NULL)
-	ephyrPreparePipelinedAccess(pMask, EXA_PREPARE_MASK);
+        ephyrPreparePipelinedAccess(pMask, EXA_PREPARE_MASK);
 
     fakexa->op = op;
     fakexa->pSrcPicture = pSrcPicture;
@@ -269,7 +276,7 @@ ephyrPrepareComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
  */
 static void
 ephyrComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
-	       int dstX, int dstY, int w, int h)
+               int dstX, int dstY, int w, int h)
 {
     KdScreenPriv(pDst->drawable.pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
@@ -277,8 +284,8 @@ ephyrComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
     EphyrFakexaPriv *fakexa = scrpriv->fakexa;
 
     fbComposite(fakexa->op, fakexa->pSrcPicture, fakexa->pMaskPicture,
-		fakexa->pDstPicture, srcX, srcY, maskX, maskY, dstX, dstY,
-		w, h);
+                fakexa->pDstPicture, srcX, srcY, maskX, maskY, dstX, dstY,
+                w, h);
 }
 
 static void
@@ -290,7 +297,7 @@ ephyrDoneComposite(PixmapPtr pDst)
     EphyrFakexaPriv *fakexa = scrpriv->fakexa;
 
     if (fakexa->pMask != NULL)
-	ephyrFinishPipelinedAccess(fakexa->pMask, EXA_PREPARE_MASK);
+        ephyrFinishPipelinedAccess(fakexa->pMask, EXA_PREPARE_MASK);
     ephyrFinishPipelinedAccess(fakexa->pSrc, EXA_PREPARE_SRC);
     ephyrFinishPipelinedAccess(fakexa->pDst, EXA_PREPARE_DEST);
 }
@@ -300,7 +307,7 @@ ephyrDoneComposite(PixmapPtr pDst)
  */
 static Bool
 ephyrDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst,
-			int dst_pitch)
+                        int dst_pitch)
 {
     KdScreenPriv(pSrc->drawable.pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
@@ -310,7 +317,7 @@ ephyrDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst,
     int src_pitch, cpp;
 
     if (pSrc->drawable.bitsPerPixel < 8)
-	return FALSE;
+        return FALSE;
 
     ephyrPreparePipelinedAccess(pSrc, EXA_PREPARE_SRC);
 
@@ -320,9 +327,9 @@ ephyrDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst,
     src += y * src_pitch + x * cpp;
 
     for (; h > 0; h--) {
-	memcpy(dst, src, w * cpp);
-	dst += dst_pitch;
-	src += src_pitch;
+        memcpy(dst, src, w * cpp);
+        dst += dst_pitch;
+        src += src_pitch;
     }
 
     exaMarkSync(pSrc->drawable.pScreen);
@@ -337,7 +344,7 @@ ephyrDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst,
  */
 static Bool
 ephyrUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src,
-		    int src_pitch)
+                    int src_pitch)
 {
     KdScreenPriv(pDst->drawable.pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
@@ -347,7 +354,7 @@ ephyrUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src,
     int dst_pitch, cpp;
 
     if (pDst->drawable.bitsPerPixel < 8)
-	return FALSE;
+        return FALSE;
 
     ephyrPreparePipelinedAccess(pDst, EXA_PREPARE_DEST);
 
@@ -357,9 +364,9 @@ ephyrUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src,
     dst += y * dst_pitch + x * cpp;
 
     for (; h > 0; h--) {
-	memcpy(dst, src, w * cpp);
-	dst += dst_pitch;
-	src += src_pitch;
+        memcpy(dst, src, w * cpp);
+        dst += dst_pitch;
+        src += src_pitch;
     }
 
     exaMarkSync(pDst->drawable.pScreen);
@@ -433,12 +440,12 @@ ephyrDrawInit(ScreenPtr pScreen)
 
     fakexa = calloc(1, sizeof(*fakexa));
     if (fakexa == NULL)
-	return FALSE;
+        return FALSE;
 
     fakexa->exa = exaDriverAlloc();
     if (fakexa->exa == NULL) {
-	free(fakexa);
-	return FALSE;
+        free(fakexa);
+        return FALSE;
     }
 
     fakexa->exa->memoryBase = (CARD8 *) (priv->base);
@@ -482,12 +489,13 @@ ephyrDrawInit(ScreenPtr pScreen)
 
     success = exaDriverInit(pScreen, fakexa->exa);
     if (success) {
-	ErrorF("Initialized fake EXA acceleration\n");
-	scrpriv->fakexa = fakexa;
-    } else {
-	ErrorF("Failed to initialize EXA\n");
-	free(fakexa->exa);
-	free(fakexa);
+        ErrorF("Initialized fake EXA acceleration\n");
+        scrpriv->fakexa = fakexa;
+    }
+    else {
+        ErrorF("Failed to initialize EXA\n");
+        free(fakexa->exa);
+        free(fakexa);
     }
 
     return success;
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdri.c b/xorg-server/hw/kdrive/ephyr/ephyrdri.c
index 932e46886..50554364c 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrdri.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrdri.c
@@ -43,244 +43,228 @@
 #ifndef TRUE
 #define TRUE 1
 #endif /*TRUE*/
-
 #ifndef FALSE
 #define FALSE 0
 #endif /*FALSE*/
-
-Bool
-ephyrDRIQueryDirectRenderingCapable (int a_screen, Bool *a_is_capable)
+    Bool
+ephyrDRIQueryDirectRenderingCapable(int a_screen, Bool *a_is_capable)
 {
-    Display *dpy=hostx_get_display () ;
-    Bool is_ok=FALSE ;
+    Display *dpy = hostx_get_display();
+    Bool is_ok = FALSE;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_is_capable, FALSE) ;
-    EPHYR_LOG ("enter\n") ;
-    is_ok = XF86DRIQueryDirectRenderingCapable (dpy, DefaultScreen (dpy),
-                                                a_is_capable) ;
-    EPHYR_LOG ("leave. is_capable:%d, is_ok=%d\n", *a_is_capable, is_ok) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_is_capable, FALSE);
+    EPHYR_LOG("enter\n");
+    is_ok = XF86DRIQueryDirectRenderingCapable(dpy, DefaultScreen(dpy),
+                                               a_is_capable);
+    EPHYR_LOG("leave. is_capable:%d, is_ok=%d\n", *a_is_capable, is_ok);
 
-    return is_ok ;
+    return is_ok;
 }
 
 Bool
-ephyrDRIOpenConnection (int a_screen,
-                        drm_handle_t *a_sarea,
-                        char **a_bus_id_string)
+ephyrDRIOpenConnection(int a_screen,
+                       drm_handle_t * a_sarea, char **a_bus_id_string)
 {
-    Display *dpy = hostx_get_display () ;
-    Bool is_ok=FALSE ;
+    Display *dpy = hostx_get_display();
+    Bool is_ok = FALSE;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_bus_id_string, FALSE) ;
-    EPHYR_LOG ("enter. screen:%d\n", a_screen) ;
-    is_ok = XF86DRIOpenConnection (dpy, DefaultScreen (dpy),
-                                   a_sarea,
-                                   a_bus_id_string) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_bus_id_string, FALSE);
+    EPHYR_LOG("enter. screen:%d\n", a_screen);
+    is_ok = XF86DRIOpenConnection(dpy, DefaultScreen(dpy),
+                                  a_sarea, a_bus_id_string);
     if (*a_bus_id_string) {
-        EPHYR_LOG ("leave. bus_id_string:%s, is_ok:%d\n",
-                   *a_bus_id_string, is_ok) ;
-    } else {
-        EPHYR_LOG ("leave. bus_id_string:null, is_ok:%d\n",
-                   is_ok) ;
+        EPHYR_LOG("leave. bus_id_string:%s, is_ok:%d\n",
+                  *a_bus_id_string, is_ok);
+    }
+    else {
+        EPHYR_LOG("leave. bus_id_string:null, is_ok:%d\n", is_ok);
     }
-    return is_ok ;
+    return is_ok;
 }
 
 Bool
-ephyrDRIAuthConnection (int a_screen, drm_magic_t a_magic)
+ephyrDRIAuthConnection(int a_screen, drm_magic_t a_magic)
 {
-    Display *dpy = hostx_get_display () ;
-    Bool is_ok=FALSE ;
+    Display *dpy = hostx_get_display();
+    Bool is_ok = FALSE;
 
-    EPHYR_LOG ("enter\n") ;
-    is_ok = XF86DRIAuthConnection (dpy, DefaultScreen (dpy), a_magic) ;
-    EPHYR_LOG ("leave. is_ok:%d\n", is_ok) ;
-    return is_ok ;
+    EPHYR_LOG("enter\n");
+    is_ok = XF86DRIAuthConnection(dpy, DefaultScreen(dpy), a_magic);
+    EPHYR_LOG("leave. is_ok:%d\n", is_ok);
+    return is_ok;
 }
 
 Bool
-ephyrDRICloseConnection (int a_screen)
+ephyrDRICloseConnection(int a_screen)
 {
-    Display *dpy = hostx_get_display () ;
-    Bool is_ok=FALSE ;
+    Display *dpy = hostx_get_display();
+    Bool is_ok = FALSE;
 
-    EPHYR_LOG ("enter\n") ;
-    is_ok = XF86DRICloseConnection (dpy, DefaultScreen (dpy)) ;
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+    EPHYR_LOG("enter\n");
+    is_ok = XF86DRICloseConnection(dpy, DefaultScreen(dpy));
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 Bool
-ephyrDRIGetClientDriverName (int a_screen,
-                             int *a_ddx_driver_major_version,
-                             int *a_ddx_driver_minor_version,
-                             int *a_ddx_driver_patch_version,
-                             char ** a_client_driver_name)
+ephyrDRIGetClientDriverName(int a_screen,
+                            int *a_ddx_driver_major_version,
+                            int *a_ddx_driver_minor_version,
+                            int *a_ddx_driver_patch_version,
+                            char **a_client_driver_name)
 {
-    Display *dpy = hostx_get_display () ;
-    Bool is_ok=FALSE ;
+    Display *dpy = hostx_get_display();
+    Bool is_ok = FALSE;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_ddx_driver_major_version
-                              && a_ddx_driver_minor_version
-                              && a_ddx_driver_patch_version
-                              && a_client_driver_name,
-                              FALSE);
-    EPHYR_LOG ("enter\n") ;
-    is_ok = XF86DRIGetClientDriverName (dpy, DefaultScreen (dpy),
-                                        a_ddx_driver_major_version,
-                                        a_ddx_driver_minor_version,
-                                        a_ddx_driver_patch_version,
-                                        a_client_driver_name) ;
-    EPHYR_LOG ("major:%d, minor:%d, patch:%d, name:%s\n",
-                *a_ddx_driver_major_version,
-                *a_ddx_driver_minor_version,
-                *a_ddx_driver_patch_version,
-                *a_client_driver_name) ;
-    EPHYR_LOG ("leave:%d\n", is_ok) ;
-    return is_ok ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_ddx_driver_major_version
+                             && a_ddx_driver_minor_version
+                             && a_ddx_driver_patch_version
+                             && a_client_driver_name, FALSE);
+    EPHYR_LOG("enter\n");
+    is_ok = XF86DRIGetClientDriverName(dpy, DefaultScreen(dpy),
+                                       a_ddx_driver_major_version,
+                                       a_ddx_driver_minor_version,
+                                       a_ddx_driver_patch_version,
+                                       a_client_driver_name);
+    EPHYR_LOG("major:%d, minor:%d, patch:%d, name:%s\n",
+              *a_ddx_driver_major_version,
+              *a_ddx_driver_minor_version,
+              *a_ddx_driver_patch_version, *a_client_driver_name);
+    EPHYR_LOG("leave:%d\n", is_ok);
+    return is_ok;
 }
 
 Bool
-ephyrDRICreateContext (int a_screen,
-                       int a_visual_id,
-                       XID *a_returned_ctxt_id,
-                       drm_context_t *a_hw_ctxt)
+ephyrDRICreateContext(int a_screen,
+                      int a_visual_id,
+                      XID *a_returned_ctxt_id, drm_context_t * a_hw_ctxt)
 {
-    Display *dpy = hostx_get_display () ;
-    Bool is_ok=FALSE ;
+    Display *dpy = hostx_get_display();
+    Bool is_ok = FALSE;
     Visual v;
 
-    EPHYR_LOG ("enter. screen:%d, visual:%d\n", a_screen, a_visual_id) ;
-    memset (&v, 0, sizeof (v)) ;
-    v.visualid = a_visual_id ;
-    is_ok = XF86DRICreateContext (dpy,
-                                  DefaultScreen (dpy),
-                                  &v,
-                                  a_returned_ctxt_id,
-                                  a_hw_ctxt) ;
-    EPHYR_LOG ("leave:%d\n", is_ok) ;
-    return is_ok ;
+    EPHYR_LOG("enter. screen:%d, visual:%d\n", a_screen, a_visual_id);
+    memset(&v, 0, sizeof(v));
+    v.visualid = a_visual_id;
+    is_ok = XF86DRICreateContext(dpy,
+                                 DefaultScreen(dpy),
+                                 &v, a_returned_ctxt_id, a_hw_ctxt);
+    EPHYR_LOG("leave:%d\n", is_ok);
+    return is_ok;
 }
 
 Bool
-ephyrDRIDestroyContext (int a_screen,
-                        int a_context_id)
+ephyrDRIDestroyContext(int a_screen, int a_context_id)
 {
-    Display *dpy = hostx_get_display () ;
-    Bool is_ok=FALSE ;
+    Display *dpy = hostx_get_display();
+    Bool is_ok = FALSE;
 
-    EPHYR_LOG ("enter\n") ;
-    is_ok = XF86DRIDestroyContext (dpy, DefaultScreen (dpy), a_context_id) ;
-    EPHYR_LOG ("leave:%d\n", is_ok) ;
-    return is_ok ;
+    EPHYR_LOG("enter\n");
+    is_ok = XF86DRIDestroyContext(dpy, DefaultScreen(dpy), a_context_id);
+    EPHYR_LOG("leave:%d\n", is_ok);
+    return is_ok;
 }
 
 Bool
-ephyrDRICreateDrawable (int a_screen,
-                        int a_drawable,
-                        drm_drawable_t *a_hw_drawable)
+ephyrDRICreateDrawable(int a_screen,
+                       int a_drawable, drm_drawable_t * a_hw_drawable)
 {
-    Bool is_ok=FALSE;
-    Display *dpy=hostx_get_display () ;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_LOG ("enter\n") ;
-    is_ok = XF86DRICreateDrawable (dpy, DefaultScreen (dpy),
-                                   a_drawable, a_hw_drawable) ;
-    EPHYR_LOG ("leave. is_ok:%d\n", is_ok) ;
-    return is_ok ;
+    EPHYR_LOG("enter\n");
+    is_ok = XF86DRICreateDrawable(dpy, DefaultScreen(dpy),
+                                  a_drawable, a_hw_drawable);
+    EPHYR_LOG("leave. is_ok:%d\n", is_ok);
+    return is_ok;
 }
 
 Bool
-ephyrDRIDestroyDrawable (int a_screen, int a_drawable)
+ephyrDRIDestroyDrawable(int a_screen, int a_drawable)
 {
-    EPHYR_LOG ("enter\n") ;
-    EPHYR_LOG_ERROR ("not implemented yet\n") ;
-    EPHYR_LOG ("leave\n") ;
-    return FALSE ;
+    EPHYR_LOG("enter\n");
+    EPHYR_LOG_ERROR("not implemented yet\n");
+    EPHYR_LOG("leave\n");
+    return FALSE;
 }
 
 Bool
-ephyrDRIGetDrawableInfo (int a_screen,
-                         int a_drawable,
-                         unsigned int *a_index,
-                         unsigned int *a_stamp,
-                         int *a_x,
-                         int *a_y,
-                         int *a_w,
-                         int *a_h,
-                         int *a_num_clip_rects,
-                         drm_clip_rect_t **a_clip_rects,
-                         int *a_back_x,
-                         int *a_back_y,
-                         int *a_num_back_clip_rects,
-                         drm_clip_rect_t **a_back_clip_rects)
+ephyrDRIGetDrawableInfo(int a_screen,
+                        int a_drawable,
+                        unsigned int *a_index,
+                        unsigned int *a_stamp,
+                        int *a_x,
+                        int *a_y,
+                        int *a_w,
+                        int *a_h,
+                        int *a_num_clip_rects,
+                        drm_clip_rect_t ** a_clip_rects,
+                        int *a_back_x,
+                        int *a_back_y,
+                        int *a_num_back_clip_rects,
+                        drm_clip_rect_t ** a_back_clip_rects)
 {
-    Bool is_ok=FALSE;
-    Display *dpy=hostx_get_display ()  ;
-    EphyrHostWindowAttributes attrs ;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
+    EphyrHostWindowAttributes attrs;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_x && a_y && a_w && a_h
-                              && a_num_clip_rects,
-                              FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_x && a_y && a_w && a_h
+                             && a_num_clip_rects, FALSE);
 
-    EPHYR_LOG ("enter\n") ;
-    memset (&attrs, 0, sizeof (attrs)) ;
-    if (!hostx_get_window_attributes (a_drawable, &attrs)) {
-        EPHYR_LOG_ERROR ("failed to query host window attributes\n") ;
+    EPHYR_LOG("enter\n");
+    memset(&attrs, 0, sizeof(attrs));
+    if (!hostx_get_window_attributes(a_drawable, &attrs)) {
+        EPHYR_LOG_ERROR("failed to query host window attributes\n");
         goto out;
     }
-    if (!XF86DRIGetDrawableInfo (dpy, DefaultScreen (dpy), a_drawable,
-                                 a_index, a_stamp,
-                                 a_x, a_y,
-                                 a_w, a_h,
-                                 a_num_clip_rects, a_clip_rects,
-                                 a_back_x, a_back_y,
-                                 a_num_back_clip_rects,
-                                 a_back_clip_rects)) {
-        EPHYR_LOG_ERROR ("XF86DRIGetDrawableInfo ()\n") ;
-        goto out ;
+    if (!XF86DRIGetDrawableInfo(dpy, DefaultScreen(dpy), a_drawable,
+                                a_index, a_stamp,
+                                a_x, a_y,
+                                a_w, a_h,
+                                a_num_clip_rects, a_clip_rects,
+                                a_back_x, a_back_y,
+                                a_num_back_clip_rects, a_back_clip_rects)) {
+        EPHYR_LOG_ERROR("XF86DRIGetDrawableInfo ()\n");
+        goto out;
     }
-    EPHYR_LOG ("host x,y,w,h: (%d,%d,%d,%d)\n", *a_x, *a_y, *a_w, *a_h) ;
+    EPHYR_LOG("host x,y,w,h: (%d,%d,%d,%d)\n", *a_x, *a_y, *a_w, *a_h);
     if (*a_num_clip_rects) {
-        free (*a_back_clip_rects) ;
-        *a_back_clip_rects = calloc (*a_num_clip_rects,
-                                     sizeof (drm_clip_rect_t)) ;
-        memmove (*a_back_clip_rects,
-                 *a_clip_rects,
-                 *a_num_clip_rects * sizeof (drm_clip_rect_t)) ;
+        free(*a_back_clip_rects);
+        *a_back_clip_rects = calloc(*a_num_clip_rects, sizeof(drm_clip_rect_t));
+        memmove(*a_back_clip_rects,
+                *a_clip_rects, *a_num_clip_rects * sizeof(drm_clip_rect_t));
         *a_num_back_clip_rects = *a_num_clip_rects;
     }
-    EPHYR_LOG ("num back clip rects:%d, num clip rects:%d\n",
-               *a_num_clip_rects, *a_num_back_clip_rects) ;
-    *a_back_x = *a_x ;
-    *a_back_y = *a_y ;
+    EPHYR_LOG("num back clip rects:%d, num clip rects:%d\n",
+              *a_num_clip_rects, *a_num_back_clip_rects);
+    *a_back_x = *a_x;
+    *a_back_y = *a_y;
     *a_w = attrs.width;
     *a_h = attrs.height;
 
-    is_ok = TRUE ;
-out:
-    EPHYR_LOG ("leave. index:%d, stamp:%d, x,y:(%d,%d), w,y:(%d,%d)\n",
-               *a_index, *a_stamp, *a_x, *a_y, *a_w, *a_h) ;
-    return is_ok ;
+    is_ok = TRUE;
+ out:
+    EPHYR_LOG("leave. index:%d, stamp:%d, x,y:(%d,%d), w,y:(%d,%d)\n",
+              *a_index, *a_stamp, *a_x, *a_y, *a_w, *a_h);
+    return is_ok;
 }
 
 Bool
-ephyrDRIGetDeviceInfo (int a_screen,
-                       drm_handle_t *a_frame_buffer,
-                       int *a_fb_origin,
-                       int *a_fb_size,
-                       int *a_fb_stride,
-                       int *a_dev_private_size,
-                       void **a_dev_private)
+ephyrDRIGetDeviceInfo(int a_screen,
+                      drm_handle_t * a_frame_buffer,
+                      int *a_fb_origin,
+                      int *a_fb_size,
+                      int *a_fb_stride,
+                      int *a_dev_private_size, void **a_dev_private)
 {
-    Bool is_ok = FALSE ;
-    Display *dpy = hostx_get_display () ;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
-    EPHYR_LOG ("enter\n") ;
-    is_ok = XF86DRIGetDeviceInfo (dpy, DefaultScreen (dpy), a_frame_buffer,
-                                  a_fb_origin, a_fb_size, a_fb_stride,
-                                  a_dev_private_size, a_dev_private) ;
-    EPHYR_LOG ("leave:%d\n", is_ok) ;
-    return is_ok ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
+    EPHYR_LOG("enter\n");
+    is_ok = XF86DRIGetDeviceInfo(dpy, DefaultScreen(dpy), a_frame_buffer,
+                                 a_fb_origin, a_fb_size, a_fb_stride,
+                                 a_dev_private_size, a_dev_private);
+    EPHYR_LOG("leave:%d\n", is_ok);
+    return is_ok;
 }
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdri.h b/xorg-server/hw/kdrive/ephyr/ephyrdri.h
index 28ae8eae0..d28910f29 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrdri.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyrdri.h
@@ -31,45 +31,40 @@
 
 #include <xf86drm.h>
 
-Bool ephyrDRIQueryDirectRenderingCapable (int a_screen, Bool *a_is_capable) ;
-Bool ephyrDRIOpenConnection (int screen, drm_handle_t *a_sarea, char **a_bus_id_string) ;
-Bool ephyrDRIAuthConnection (int a_screen, drm_magic_t a_magic) ;
-Bool ephyrDRICloseConnection (int a_screen) ;
-Bool ephyrDRIGetClientDriverName (int a_screen,
-                                  int *a_ddx_driver_major_version,
-                                  int *a_ddx_driver_minor_version,
-                                  int *a_ddx_driver_patch_version,
-                                  char ** a_client_driver_name) ;
-Bool ephyrDRICreateContext (int a_screen,
-                            int a_visual_id,
-                            XID *a_returned_ctx_id,
-                            drm_context_t *a_hw_ctx) ;
-Bool ephyrDRIDestroyContext (int a_screen,
-                             int a_context_id) ;
-Bool ephyrDRICreateDrawable (int a_screen,
-                             int a_drawable,
-                             drm_drawable_t *a_hw_drawable) ;
-Bool ephyrDRIDestroyDrawable (int a_screen, int a_drawable) ;
-Bool ephyrDRIGetDrawableInfo (int a_screen,
-                              int /*Drawable*/a_drawable,
-                              unsigned int *a_index,
-                              unsigned int *a_stamp,
-                              int *a_x,
-                              int *a_y,
-                              int *a_w,
-                              int *a_h,
-                              int *a_num_clip_rects,
-                              drm_clip_rect_t **a_clip_rects,
-                              int *a_back_x,
-                              int *a_back_y,
-                              int *num_back_clip_rects,
-                              drm_clip_rect_t **a_back_clip_rects) ;
-Bool ephyrDRIGetDeviceInfo (int a_screen,
-                            drm_handle_t *a_frame_buffer,
-                            int *a_fb_origin,
-                            int *a_fb_size,
-                            int *a_fb_stride,
-                            int *a_dev_private_size,
-                            void **a_dev_private) ;
+Bool ephyrDRIQueryDirectRenderingCapable(int a_screen, Bool *a_is_capable);
+Bool ephyrDRIOpenConnection(int screen, drm_handle_t * a_sarea,
+                            char **a_bus_id_string);
+Bool ephyrDRIAuthConnection(int a_screen, drm_magic_t a_magic);
+Bool ephyrDRICloseConnection(int a_screen);
+Bool ephyrDRIGetClientDriverName(int a_screen,
+                                 int *a_ddx_driver_major_version,
+                                 int *a_ddx_driver_minor_version,
+                                 int *a_ddx_driver_patch_version,
+                                 char **a_client_driver_name);
+Bool ephyrDRICreateContext(int a_screen,
+                           int a_visual_id,
+                           XID *a_returned_ctx_id, drm_context_t * a_hw_ctx);
+Bool ephyrDRIDestroyContext(int a_screen, int a_context_id);
+Bool ephyrDRICreateDrawable(int a_screen,
+                            int a_drawable, drm_drawable_t * a_hw_drawable);
+Bool ephyrDRIDestroyDrawable(int a_screen, int a_drawable);
+Bool ephyrDRIGetDrawableInfo(int a_screen, int /*Drawable */ a_drawable,
+                             unsigned int *a_index,
+                             unsigned int *a_stamp,
+                             int *a_x,
+                             int *a_y,
+                             int *a_w,
+                             int *a_h,
+                             int *a_num_clip_rects,
+                             drm_clip_rect_t ** a_clip_rects,
+                             int *a_back_x,
+                             int *a_back_y,
+                             int *num_back_clip_rects,
+                             drm_clip_rect_t ** a_back_clip_rects);
+Bool ephyrDRIGetDeviceInfo(int a_screen,
+                           drm_handle_t * a_frame_buffer,
+                           int *a_fb_origin,
+                           int *a_fb_size,
+                           int *a_fb_stride,
+                           int *a_dev_private_size, void **a_dev_private);
 #endif /*__EPHYRDRI_H__*/
-
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
index 0741a7294..28486f516 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
@@ -59,43 +59,40 @@
 typedef struct {
     int foo;
 } EphyrDRIWindowPrivRec;
-typedef EphyrDRIWindowPrivRec* EphyrDRIWindowPrivPtr;
+typedef EphyrDRIWindowPrivRec *EphyrDRIWindowPrivPtr;
 
 typedef struct {
-    CreateWindowProcPtr CreateWindow ;
-    DestroyWindowProcPtr DestroyWindow ;
-    MoveWindowProcPtr MoveWindow ;
-    PositionWindowProcPtr PositionWindow ;
-    ClipNotifyProcPtr ClipNotify ;
+    CreateWindowProcPtr CreateWindow;
+    DestroyWindowProcPtr DestroyWindow;
+    MoveWindowProcPtr MoveWindow;
+    PositionWindowProcPtr PositionWindow;
+    ClipNotifyProcPtr ClipNotify;
 } EphyrDRIScreenPrivRec;
-typedef EphyrDRIScreenPrivRec* EphyrDRIScreenPrivPtr;
+typedef EphyrDRIScreenPrivRec *EphyrDRIScreenPrivPtr;
 
 static int DRIErrorBase;
 
+static Bool ephyrDRIScreenInit(ScreenPtr a_screen);
+static Bool ephyrDRICreateWindow(WindowPtr a_win);
+static Bool ephyrDRIDestroyWindow(WindowPtr a_win);
+static void ephyrDRIMoveWindow(WindowPtr a_win,
+                               int a_x, int a_y,
+                               WindowPtr a_siblings, VTKind a_kind);
+static Bool ephyrDRIPositionWindow(WindowPtr a_win, int x, int y);
+static void ephyrDRIClipNotify(WindowPtr a_win, int a_x, int a_y);
 
-
-static Bool ephyrDRIScreenInit (ScreenPtr a_screen) ;
-static Bool ephyrDRICreateWindow (WindowPtr a_win) ;
-static Bool ephyrDRIDestroyWindow (WindowPtr a_win) ;
-static void ephyrDRIMoveWindow (WindowPtr a_win,
-                                int a_x, int a_y,
-                                WindowPtr a_siblings,
-                                VTKind a_kind);
-static Bool ephyrDRIPositionWindow (WindowPtr a_win,
-                                    int x, int y) ;
-static void ephyrDRIClipNotify (WindowPtr a_win,
-                                int a_x, int a_y) ;
-
-static Bool EphyrMirrorHostVisuals (ScreenPtr a_screen) ;
-static Bool destroyHostPeerWindow (const WindowPtr a_win) ;
-static Bool findWindowPairFromLocal (WindowPtr a_local,
-                                     EphyrWindowPair **a_pair);
+static Bool EphyrMirrorHostVisuals(ScreenPtr a_screen);
+static Bool destroyHostPeerWindow(const WindowPtr a_win);
+static Bool findWindowPairFromLocal(WindowPtr a_local,
+                                    EphyrWindowPair ** a_pair);
 
 static unsigned char DRIReqCode = 0;
 
 static DevPrivateKeyRec ephyrDRIWindowKeyRec;
+
 #define ephyrDRIWindowKey (&ephyrDRIWindowKeyRec)
 static DevPrivateKeyRec ephyrDRIScreenKeyRec;
+
 #define ephyrDRIScreenKey (&ephyrDRIScreenKeyRec)
 
 #define GET_EPHYR_DRI_WINDOW_PRIV(win) ((EphyrDRIWindowPrivPtr) \
@@ -104,251 +101,239 @@ static DevPrivateKeyRec ephyrDRIScreenKeyRec;
     dixLookupPrivate(&(screen)->devPrivates, ephyrDRIScreenKey))
 
 static Bool
-ephyrDRIScreenInit (ScreenPtr a_screen)
+ephyrDRIScreenInit(ScreenPtr a_screen)
 {
-    Bool is_ok=FALSE ;
-    EphyrDRIScreenPrivPtr screen_priv=NULL ;
+    Bool is_ok = FALSE;
+    EphyrDRIScreenPrivPtr screen_priv = NULL;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_screen, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_screen, FALSE);
 
-    screen_priv=GET_EPHYR_DRI_SCREEN_PRIV (a_screen) ;
-    EPHYR_RETURN_VAL_IF_FAIL (screen_priv, FALSE) ;
+    screen_priv = GET_EPHYR_DRI_SCREEN_PRIV(a_screen);
+    EPHYR_RETURN_VAL_IF_FAIL(screen_priv, FALSE);
 
-    screen_priv->CreateWindow = a_screen->CreateWindow ;
-    screen_priv->DestroyWindow = a_screen->DestroyWindow ;
-    screen_priv->MoveWindow = a_screen->MoveWindow ;
-    screen_priv->PositionWindow = a_screen->PositionWindow ;
-    screen_priv->ClipNotify = a_screen->ClipNotify ;
+    screen_priv->CreateWindow = a_screen->CreateWindow;
+    screen_priv->DestroyWindow = a_screen->DestroyWindow;
+    screen_priv->MoveWindow = a_screen->MoveWindow;
+    screen_priv->PositionWindow = a_screen->PositionWindow;
+    screen_priv->ClipNotify = a_screen->ClipNotify;
 
-    a_screen->CreateWindow = ephyrDRICreateWindow ;
-    a_screen->DestroyWindow = ephyrDRIDestroyWindow ;
-    a_screen->MoveWindow = ephyrDRIMoveWindow ;
-    a_screen->PositionWindow = ephyrDRIPositionWindow ;
-    a_screen->ClipNotify = ephyrDRIClipNotify ;
+    a_screen->CreateWindow = ephyrDRICreateWindow;
+    a_screen->DestroyWindow = ephyrDRIDestroyWindow;
+    a_screen->MoveWindow = ephyrDRIMoveWindow;
+    a_screen->PositionWindow = ephyrDRIPositionWindow;
+    a_screen->ClipNotify = ephyrDRIClipNotify;
 
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-    return is_ok ;
+    return is_ok;
 }
 
 static Bool
-ephyrDRICreateWindow (WindowPtr a_win)
+ephyrDRICreateWindow(WindowPtr a_win)
 {
-    Bool is_ok=FALSE ;
-    ScreenPtr screen=NULL ;
-    EphyrDRIScreenPrivPtr screen_priv =NULL;
+    Bool is_ok = FALSE;
+    ScreenPtr screen = NULL;
+    EphyrDRIScreenPrivPtr screen_priv = NULL;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_win, FALSE) ;
-    screen = a_win->drawable.pScreen ;
-    EPHYR_RETURN_VAL_IF_FAIL (screen, FALSE) ;
-    screen_priv = GET_EPHYR_DRI_SCREEN_PRIV (screen) ;
-    EPHYR_RETURN_VAL_IF_FAIL (screen_priv
-                              && screen_priv->CreateWindow,
-                              FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_win, FALSE);
+    screen = a_win->drawable.pScreen;
+    EPHYR_RETURN_VAL_IF_FAIL(screen, FALSE);
+    screen_priv = GET_EPHYR_DRI_SCREEN_PRIV(screen);
+    EPHYR_RETURN_VAL_IF_FAIL(screen_priv && screen_priv->CreateWindow, FALSE);
 
-    EPHYR_LOG ("enter. win:%p\n", a_win) ;
+    EPHYR_LOG("enter. win:%p\n", a_win);
 
-    screen->CreateWindow = screen_priv->CreateWindow ;
-    is_ok = (*screen->CreateWindow) (a_win) ;
-    screen->CreateWindow = ephyrDRICreateWindow ;
+    screen->CreateWindow = screen_priv->CreateWindow;
+    is_ok = (*screen->CreateWindow) (a_win);
+    screen->CreateWindow = ephyrDRICreateWindow;
 
     if (is_ok) {
-	dixSetPrivate(&a_win->devPrivates, ephyrDRIWindowKey, NULL);
+        dixSetPrivate(&a_win->devPrivates, ephyrDRIWindowKey, NULL);
     }
-    return is_ok ;
+    return is_ok;
 }
 
 static Bool
-ephyrDRIDestroyWindow (WindowPtr a_win)
+ephyrDRIDestroyWindow(WindowPtr a_win)
 {
-    Bool is_ok=FALSE ;
-    ScreenPtr screen=NULL ;
-    EphyrDRIScreenPrivPtr screen_priv =NULL;
-
-    EPHYR_RETURN_VAL_IF_FAIL (a_win, FALSE) ;
-    screen = a_win->drawable.pScreen ;
-    EPHYR_RETURN_VAL_IF_FAIL (screen, FALSE) ;
-    screen_priv = GET_EPHYR_DRI_SCREEN_PRIV (screen) ;
-    EPHYR_RETURN_VAL_IF_FAIL (screen_priv
-                              && screen_priv->DestroyWindow,
-                              FALSE) ;
-
-    screen->DestroyWindow = screen_priv->DestroyWindow ;
+    Bool is_ok = FALSE;
+    ScreenPtr screen = NULL;
+    EphyrDRIScreenPrivPtr screen_priv = NULL;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_win, FALSE);
+    screen = a_win->drawable.pScreen;
+    EPHYR_RETURN_VAL_IF_FAIL(screen, FALSE);
+    screen_priv = GET_EPHYR_DRI_SCREEN_PRIV(screen);
+    EPHYR_RETURN_VAL_IF_FAIL(screen_priv && screen_priv->DestroyWindow, FALSE);
+
+    screen->DestroyWindow = screen_priv->DestroyWindow;
     if (screen->DestroyWindow) {
-        is_ok = (*screen->DestroyWindow) (a_win) ;
+        is_ok = (*screen->DestroyWindow) (a_win);
     }
-    screen->DestroyWindow = ephyrDRIDestroyWindow ;
+    screen->DestroyWindow = ephyrDRIDestroyWindow;
 
     if (is_ok) {
-        EphyrDRIWindowPrivPtr win_priv=GET_EPHYR_DRI_WINDOW_PRIV (a_win) ;
+        EphyrDRIWindowPrivPtr win_priv = GET_EPHYR_DRI_WINDOW_PRIV(a_win);
+
         if (win_priv) {
-            destroyHostPeerWindow (a_win) ;
-            free(win_priv) ;
-	    dixSetPrivate(&a_win->devPrivates, ephyrDRIWindowKey, NULL);
-            EPHYR_LOG ("destroyed the remote peer window\n") ;
+            destroyHostPeerWindow(a_win);
+            free(win_priv);
+            dixSetPrivate(&a_win->devPrivates, ephyrDRIWindowKey, NULL);
+            EPHYR_LOG("destroyed the remote peer window\n");
         }
     }
-    return is_ok ;
+    return is_ok;
 }
 
 static void
-ephyrDRIMoveWindow (WindowPtr a_win,
-                    int a_x, int a_y,
-                    WindowPtr a_siblings,
-                    VTKind a_kind)
+ephyrDRIMoveWindow(WindowPtr a_win,
+                   int a_x, int a_y, WindowPtr a_siblings, VTKind a_kind)
 {
-    Bool is_ok=FALSE ;
-    ScreenPtr screen=NULL ;
-    EphyrDRIScreenPrivPtr screen_priv =NULL;
-    EphyrDRIWindowPrivPtr win_priv=NULL ;
-    EphyrWindowPair *pair=NULL ;
+    Bool is_ok = FALSE;
+    ScreenPtr screen = NULL;
+    EphyrDRIScreenPrivPtr screen_priv = NULL;
+    EphyrDRIWindowPrivPtr win_priv = NULL;
+    EphyrWindowPair *pair = NULL;
     EphyrBox geo;
-    int x=0,y=0;/*coords relative to parent window*/
+    int x = 0, y = 0;           /*coords relative to parent window */
 
-    EPHYR_RETURN_IF_FAIL (a_win) ;
+    EPHYR_RETURN_IF_FAIL(a_win);
 
-    EPHYR_LOG ("enter\n") ;
-    screen = a_win->drawable.pScreen ;
-    EPHYR_RETURN_IF_FAIL (screen) ;
-    screen_priv = GET_EPHYR_DRI_SCREEN_PRIV (screen) ;
-    EPHYR_RETURN_IF_FAIL (screen_priv
-                          && screen_priv->MoveWindow) ;
+    EPHYR_LOG("enter\n");
+    screen = a_win->drawable.pScreen;
+    EPHYR_RETURN_IF_FAIL(screen);
+    screen_priv = GET_EPHYR_DRI_SCREEN_PRIV(screen);
+    EPHYR_RETURN_IF_FAIL(screen_priv && screen_priv->MoveWindow);
 
-    screen->MoveWindow = screen_priv->MoveWindow ;
+    screen->MoveWindow = screen_priv->MoveWindow;
     if (screen->MoveWindow) {
-        (*screen->MoveWindow) (a_win, a_x, a_y, a_siblings, a_kind) ;
+        (*screen->MoveWindow) (a_win, a_x, a_y, a_siblings, a_kind);
     }
-    screen->MoveWindow = ephyrDRIMoveWindow ;
+    screen->MoveWindow = ephyrDRIMoveWindow;
 
-    EPHYR_LOG ("window: %p\n", a_win) ;
+    EPHYR_LOG("window: %p\n", a_win);
     if (!a_win->parent) {
-        EPHYR_LOG ("cannot move root window\n") ;
-        is_ok = TRUE ;
-        goto out ;
+        EPHYR_LOG("cannot move root window\n");
+        is_ok = TRUE;
+        goto out;
     }
-    win_priv = GET_EPHYR_DRI_WINDOW_PRIV (a_win) ;
+    win_priv = GET_EPHYR_DRI_WINDOW_PRIV(a_win);
     if (!win_priv) {
-        EPHYR_LOG ("not a DRI peered window\n") ;
-        is_ok = TRUE ;
-        goto out ;
-    }
-    if (!findWindowPairFromLocal (a_win, &pair) || !pair) {
-        EPHYR_LOG_ERROR ("failed to get window pair\n") ;
-        goto out ;
-    }
-    /*compute position relative to parent window*/
-    x = a_win->drawable.x - a_win->parent->drawable.x ;
-    y = a_win->drawable.y - a_win->parent->drawable.y ;
-    /*set the geometry to pass to hostx_set_window_geometry*/
-    memset (&geo, 0, sizeof (geo)) ;
-    geo.x = x ;
-    geo.y = y ;
-    geo.width = a_win->drawable.width ;
-    geo.height = a_win->drawable.height ;
-    hostx_set_window_geometry (pair->remote, &geo) ;
-    is_ok = TRUE ;
-
-out:
-    EPHYR_LOG ("leave. is_ok:%d\n", is_ok) ;
-    /*do cleanup here*/
+        EPHYR_LOG("not a DRI peered window\n");
+        is_ok = TRUE;
+        goto out;
+    }
+    if (!findWindowPairFromLocal(a_win, &pair) || !pair) {
+        EPHYR_LOG_ERROR("failed to get window pair\n");
+        goto out;
+    }
+    /*compute position relative to parent window */
+    x = a_win->drawable.x - a_win->parent->drawable.x;
+    y = a_win->drawable.y - a_win->parent->drawable.y;
+    /*set the geometry to pass to hostx_set_window_geometry */
+    memset(&geo, 0, sizeof(geo));
+    geo.x = x;
+    geo.y = y;
+    geo.width = a_win->drawable.width;
+    geo.height = a_win->drawable.height;
+    hostx_set_window_geometry(pair->remote, &geo);
+    is_ok = TRUE;
+
+ out:
+    EPHYR_LOG("leave. is_ok:%d\n", is_ok);
+    /*do cleanup here */
 }
 
 static Bool
-ephyrDRIPositionWindow (WindowPtr a_win,
-                        int a_x, int a_y)
+ephyrDRIPositionWindow(WindowPtr a_win, int a_x, int a_y)
 {
-    Bool is_ok=FALSE ;
-    ScreenPtr screen=NULL ;
-    EphyrDRIScreenPrivPtr screen_priv =NULL;
-    EphyrDRIWindowPrivPtr win_priv=NULL ;
-    EphyrWindowPair *pair=NULL ;
+    Bool is_ok = FALSE;
+    ScreenPtr screen = NULL;
+    EphyrDRIScreenPrivPtr screen_priv = NULL;
+    EphyrDRIWindowPrivPtr win_priv = NULL;
+    EphyrWindowPair *pair = NULL;
     EphyrBox geo;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_win, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_win, FALSE);
 
-    EPHYR_LOG ("enter\n") ;
-    screen = a_win->drawable.pScreen ;
-    EPHYR_RETURN_VAL_IF_FAIL (screen, FALSE) ;
-    screen_priv = GET_EPHYR_DRI_SCREEN_PRIV (screen) ;
-    EPHYR_RETURN_VAL_IF_FAIL (screen_priv
-                              && screen_priv->PositionWindow,
-                              FALSE) ;
+    EPHYR_LOG("enter\n");
+    screen = a_win->drawable.pScreen;
+    EPHYR_RETURN_VAL_IF_FAIL(screen, FALSE);
+    screen_priv = GET_EPHYR_DRI_SCREEN_PRIV(screen);
+    EPHYR_RETURN_VAL_IF_FAIL(screen_priv && screen_priv->PositionWindow, FALSE);
 
-    screen->PositionWindow = screen_priv->PositionWindow ;
+    screen->PositionWindow = screen_priv->PositionWindow;
     if (screen->PositionWindow) {
-        (*screen->PositionWindow) (a_win, a_x, a_y) ;
+        (*screen->PositionWindow) (a_win, a_x, a_y);
     }
-    screen->PositionWindow = ephyrDRIPositionWindow ;
+    screen->PositionWindow = ephyrDRIPositionWindow;
 
-    EPHYR_LOG ("window: %p\n", a_win) ;
-    win_priv = GET_EPHYR_DRI_WINDOW_PRIV (a_win) ;
+    EPHYR_LOG("window: %p\n", a_win);
+    win_priv = GET_EPHYR_DRI_WINDOW_PRIV(a_win);
     if (!win_priv) {
-        EPHYR_LOG ("not a DRI peered window\n") ;
-        is_ok = TRUE ;
-        goto out ;
-    }
-    if (!findWindowPairFromLocal (a_win, &pair) || !pair) {
-        EPHYR_LOG_ERROR ("failed to get window pair\n") ;
-        goto out ;
-    }
-    /*set the geometry to pass to hostx_set_window_geometry*/
-    memset (&geo, 0, sizeof (geo)) ;
-    geo.x = a_x ;
-    geo.y = a_y ;
-    geo.width = a_win->drawable.width ;
-    geo.height = a_win->drawable.height ;
-    hostx_set_window_geometry (pair->remote, &geo) ;
-    is_ok = TRUE ;
-
-out:
-    EPHYR_LOG ("leave. is_ok:%d\n", is_ok) ;
-    /*do cleanup here*/
-    return is_ok ;
+        EPHYR_LOG("not a DRI peered window\n");
+        is_ok = TRUE;
+        goto out;
+    }
+    if (!findWindowPairFromLocal(a_win, &pair) || !pair) {
+        EPHYR_LOG_ERROR("failed to get window pair\n");
+        goto out;
+    }
+    /*set the geometry to pass to hostx_set_window_geometry */
+    memset(&geo, 0, sizeof(geo));
+    geo.x = a_x;
+    geo.y = a_y;
+    geo.width = a_win->drawable.width;
+    geo.height = a_win->drawable.height;
+    hostx_set_window_geometry(pair->remote, &geo);
+    is_ok = TRUE;
+
+ out:
+    EPHYR_LOG("leave. is_ok:%d\n", is_ok);
+    /*do cleanup here */
+    return is_ok;
 }
 
 static void
-ephyrDRIClipNotify (WindowPtr a_win,
-                    int a_x, int a_y)
+ephyrDRIClipNotify(WindowPtr a_win, int a_x, int a_y)
 {
-    Bool is_ok=FALSE ;
-    ScreenPtr screen=NULL ;
-    EphyrDRIScreenPrivPtr screen_priv =NULL;
-    EphyrDRIWindowPrivPtr win_priv=NULL ;
-    EphyrWindowPair *pair=NULL ;
-    EphyrRect *rects=NULL;
-    int i=0 ;
-
-    EPHYR_RETURN_IF_FAIL (a_win) ;
-
-    EPHYR_LOG ("enter\n") ;
-    screen = a_win->drawable.pScreen ;
-    EPHYR_RETURN_IF_FAIL (screen) ;
-    screen_priv = GET_EPHYR_DRI_SCREEN_PRIV (screen) ;
-    EPHYR_RETURN_IF_FAIL (screen_priv && screen_priv->ClipNotify) ;
-
-    screen->ClipNotify = screen_priv->ClipNotify ;
+    Bool is_ok = FALSE;
+    ScreenPtr screen = NULL;
+    EphyrDRIScreenPrivPtr screen_priv = NULL;
+    EphyrDRIWindowPrivPtr win_priv = NULL;
+    EphyrWindowPair *pair = NULL;
+    EphyrRect *rects = NULL;
+    int i = 0;
+
+    EPHYR_RETURN_IF_FAIL(a_win);
+
+    EPHYR_LOG("enter\n");
+    screen = a_win->drawable.pScreen;
+    EPHYR_RETURN_IF_FAIL(screen);
+    screen_priv = GET_EPHYR_DRI_SCREEN_PRIV(screen);
+    EPHYR_RETURN_IF_FAIL(screen_priv && screen_priv->ClipNotify);
+
+    screen->ClipNotify = screen_priv->ClipNotify;
     if (screen->ClipNotify) {
-        (*screen->ClipNotify) (a_win, a_x, a_y) ;
+        (*screen->ClipNotify) (a_win, a_x, a_y);
     }
-    screen->ClipNotify = ephyrDRIClipNotify ;
+    screen->ClipNotify = ephyrDRIClipNotify;
 
-    EPHYR_LOG ("window: %p\n", a_win) ;
-    win_priv = GET_EPHYR_DRI_WINDOW_PRIV (a_win) ;
+    EPHYR_LOG("window: %p\n", a_win);
+    win_priv = GET_EPHYR_DRI_WINDOW_PRIV(a_win);
     if (!win_priv) {
-        EPHYR_LOG ("not a DRI peered window\n") ;
-        is_ok = TRUE ;
-        goto out ;
-    }
-    if (!findWindowPairFromLocal (a_win, &pair) || !pair) {
-        EPHYR_LOG_ERROR ("failed to get window pair\n") ;
-        goto out ;
-    }
-    rects = calloc(RegionNumRects (&a_win->clipList),
-                     sizeof (EphyrRect)) ;
-    for (i=0; i < RegionNumRects (&a_win->clipList); i++) {
-        memmove (&rects[i],
-                 &RegionRects (&a_win->clipList)[i],
-                 sizeof (EphyrRect)) ;
+        EPHYR_LOG("not a DRI peered window\n");
+        is_ok = TRUE;
+        goto out;
+    }
+    if (!findWindowPairFromLocal(a_win, &pair) || !pair) {
+        EPHYR_LOG_ERROR("failed to get window pair\n");
+        goto out;
+    }
+    rects = calloc(RegionNumRects(&a_win->clipList), sizeof(EphyrRect));
+    for (i = 0; i < RegionNumRects(&a_win->clipList); i++) {
+        memmove(&rects[i],
+                &RegionRects(&a_win->clipList)[i], sizeof(EphyrRect));
         rects[i].x1 -= a_win->drawable.x;
         rects[i].x2 -= a_win->drawable.x;
         rects[i].y1 -= a_win->drawable.y;
@@ -359,17 +344,15 @@ ephyrDRIClipNotify (WindowPtr a_win,
      * to the peer window in the host
      */
     is_ok = hostx_set_window_bounding_rectangles
-                                (pair->remote,
-                                 rects,
-                                 RegionNumRects (&a_win->clipList)) ;
-    is_ok = TRUE ;
+        (pair->remote, rects, RegionNumRects(&a_win->clipList));
+    is_ok = TRUE;
 
-out:
-    free(rects) ;
-    rects = NULL ;
+ out:
+    free(rects);
+    rects = NULL;
 
-    EPHYR_LOG ("leave. is_ok:%d\n", is_ok) ;
-    /*do cleanup here*/
+    EPHYR_LOG("leave. is_ok:%d\n", is_ok);
+    /*do cleanup here */
 }
 
 /**
@@ -382,119 +365,115 @@ out:
  * of the screen.
  */
 static Bool
-EphyrDuplicateVisual (unsigned int a_screen,
-                      short a_depth,
-                      short a_class,
-                      short a_bits_per_rgb_values,
-                      short a_colormap_entries,
-                      unsigned int a_red_mask,
-                      unsigned int a_green_mask,
-                      unsigned int a_blue_mask,
-                      unsigned int a_new_id)
+EphyrDuplicateVisual(unsigned int a_screen,
+                     short a_depth,
+                     short a_class,
+                     short a_bits_per_rgb_values,
+                     short a_colormap_entries,
+                     unsigned int a_red_mask,
+                     unsigned int a_green_mask,
+                     unsigned int a_blue_mask, unsigned int a_new_id)
 {
-    Bool is_ok = FALSE, found_visual=FALSE, found_depth=FALSE ;
-    ScreenPtr screen=NULL ;
-    VisualRec new_visual, *new_visuals=NULL ;
-    int i=0 ;
+    Bool is_ok = FALSE, found_visual = FALSE, found_depth = FALSE;
+    ScreenPtr screen = NULL;
+    VisualRec new_visual, *new_visuals = NULL;
+    int i = 0;
 
-    EPHYR_LOG ("enter\n") ; 
+    EPHYR_LOG("enter\n");
     if (a_screen >= screenInfo.numScreens) {
-        EPHYR_LOG_ERROR ("bad screen number\n") ;
+        EPHYR_LOG_ERROR("bad screen number\n");
         goto out;
     }
-    memset (&new_visual, 0, sizeof (VisualRec)) ;
+    memset(&new_visual, 0, sizeof(VisualRec));
 
-    /*get the screen pointed to by a_screen*/
-    screen = screenInfo.screens[a_screen] ;
-    EPHYR_RETURN_VAL_IF_FAIL (screen, FALSE) ;
+    /*get the screen pointed to by a_screen */
+    screen = screenInfo.screens[a_screen];
+    EPHYR_RETURN_VAL_IF_FAIL(screen, FALSE);
 
     /*
      * In that screen, first look for an existing visual that has the
      * same characteristics as those passed in parameter
      * to this function and copy it.
      */
-    for (i=0; i < screen->numVisuals; i++) {
+    for (i = 0; i < screen->numVisuals; i++) {
         if (screen->visuals[i].bitsPerRGBValue == a_bits_per_rgb_values &&
-            screen->visuals[i].ColormapEntries == a_colormap_entries ) {
-            /*copy the visual found*/
-            memcpy (&new_visual, &screen->visuals[i], sizeof (new_visual)) ;
-            new_visual.vid = a_new_id ;
-            new_visual.class = a_class ;
-            new_visual.redMask = a_red_mask ;
-            new_visual.greenMask = a_green_mask ;
-            new_visual.blueMask = a_blue_mask ;
-            found_visual = TRUE ;
-            EPHYR_LOG ("found a visual that matches visual id: %d\n",
-                       a_new_id) ;
+            screen->visuals[i].ColormapEntries == a_colormap_entries) {
+            /*copy the visual found */
+            memcpy(&new_visual, &screen->visuals[i], sizeof(new_visual));
+            new_visual.vid = a_new_id;
+            new_visual.class = a_class;
+            new_visual.redMask = a_red_mask;
+            new_visual.greenMask = a_green_mask;
+            new_visual.blueMask = a_blue_mask;
+            found_visual = TRUE;
+            EPHYR_LOG("found a visual that matches visual id: %d\n", a_new_id);
             break;
         }
     }
     if (!found_visual) {
-        EPHYR_LOG ("did not find any visual matching %d\n", a_new_id) ;
-        goto out ;
+        EPHYR_LOG("did not find any visual matching %d\n", a_new_id);
+        goto out;
     }
     /*
      * be prepare to extend screen->visuals to add new_visual to it
      */
-    new_visuals = calloc(screen->numVisuals+1, sizeof (VisualRec)) ;
-    memmove (new_visuals,
-             screen->visuals,
-             screen->numVisuals*sizeof (VisualRec)) ;
-    memmove (&new_visuals[screen->numVisuals],
-             &new_visual,
-             sizeof (VisualRec)) ;
+    new_visuals = calloc(screen->numVisuals + 1, sizeof(VisualRec));
+    memmove(new_visuals,
+            screen->visuals, screen->numVisuals * sizeof(VisualRec));
+    memmove(&new_visuals[screen->numVisuals], &new_visual, sizeof(VisualRec));
     /*
      * Now, in that same screen, update the screen->allowedDepths member.
      * In that array, each element represents the visuals applicable to
      * a given depth. So we need to add an entry matching the new visual
      * that we are going to add to screen->visuals
      */
-    for (i=0; i<screen->numDepths; i++) {
-        VisualID *vids=NULL;
-        DepthPtr cur_depth=NULL ;
-        /*find the entry matching a_depth*/
+    for (i = 0; i < screen->numDepths; i++) {
+        VisualID *vids = NULL;
+        DepthPtr cur_depth = NULL;
+
+        /*find the entry matching a_depth */
         if (screen->allowedDepths[i].depth != a_depth)
-            continue ;
+            continue;
         cur_depth = &screen->allowedDepths[i];
         /*
          * extend the list of visual IDs in that entry,
          * so to add a_new_id in there.
          */
         vids = realloc(cur_depth->vids,
-                         (cur_depth->numVids+1)*sizeof (VisualID));
+                       (cur_depth->numVids + 1) * sizeof(VisualID));
         if (!vids) {
-            EPHYR_LOG_ERROR ("failed to realloc numids\n") ;
-            goto out ;
+            EPHYR_LOG_ERROR("failed to realloc numids\n");
+            goto out;
         }
-        vids[cur_depth->numVids] = a_new_id ;
+        vids[cur_depth->numVids] = a_new_id;
         /*
          * Okay now commit our change.
          * Do really update screen->allowedDepths[i]
          */
-        cur_depth->numVids++ ;
-        cur_depth->vids = vids ;
-        found_depth=TRUE;
+        cur_depth->numVids++;
+        cur_depth->vids = vids;
+        found_depth = TRUE;
     }
     if (!found_depth) {
-        EPHYR_LOG_ERROR ("failed to update screen[%d]->allowedDepth\n",
-                         a_screen) ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to update screen[%d]->allowedDepth\n",
+                        a_screen);
+        goto out;
     }
     /*
      * Commit our change to screen->visuals
      */
-    free(screen->visuals) ;
-    screen->visuals = new_visuals ;
-    screen->numVisuals++ ;
-    new_visuals = NULL ;
-
-    is_ok = TRUE ;
-out:
-    free(new_visuals) ;
-    new_visuals = NULL ;
-
-    EPHYR_LOG ("leave\n") ; 
-    return is_ok ;
+    free(screen->visuals);
+    screen->visuals = new_visuals;
+    screen->numVisuals++;
+    new_visuals = NULL;
+
+    is_ok = TRUE;
+ out:
+    free(new_visuals);
+    new_visuals = NULL;
+
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 /**
@@ -504,46 +483,45 @@ out:
  * GLX.
  */
 static Bool
-EphyrMirrorHostVisuals (ScreenPtr a_screen)
+EphyrMirrorHostVisuals(ScreenPtr a_screen)
 {
-    Bool is_ok=FALSE;
-    EphyrHostVisualInfo  *visuals=NULL;
-    int nb_visuals=0, i=0;
-
-    EPHYR_LOG ("enter\n") ;
-    if (!hostx_get_visuals_info (&visuals, &nb_visuals)) {
-        EPHYR_LOG_ERROR ("failed to get host visuals\n") ;
-        goto out ;
-    }
-    for (i=0; i<nb_visuals; i++) {
-        if (!EphyrDuplicateVisual (a_screen->myNum,
-                                   visuals[i].depth,
-                                   visuals[i].class,
-                                   visuals[i].bits_per_rgb,
-                                   visuals[i].colormap_size,
-                                   visuals[i].red_mask,
-                                   visuals[i].green_mask,
-                                   visuals[i].blue_mask,
-                                   visuals[i].visualid)) {
-            EPHYR_LOG_ERROR ("failed to duplicate host visual %d\n",
-                             (int)visuals[i].visualid) ;
+    Bool is_ok = FALSE;
+    EphyrHostVisualInfo *visuals = NULL;
+    int nb_visuals = 0, i = 0;
+
+    EPHYR_LOG("enter\n");
+    if (!hostx_get_visuals_info(&visuals, &nb_visuals)) {
+        EPHYR_LOG_ERROR("failed to get host visuals\n");
+        goto out;
+    }
+    for (i = 0; i < nb_visuals; i++) {
+        if (!EphyrDuplicateVisual(a_screen->myNum,
+                                  visuals[i].depth,
+                                  visuals[i].class,
+                                  visuals[i].bits_per_rgb,
+                                  visuals[i].colormap_size,
+                                  visuals[i].red_mask,
+                                  visuals[i].green_mask,
+                                  visuals[i].blue_mask, visuals[i].visualid)) {
+            EPHYR_LOG_ERROR("failed to duplicate host visual %d\n",
+                            (int) visuals[i].visualid);
         }
     }
 
-    is_ok = TRUE ;
-out:
-    EPHYR_LOG ("leave\n") ;
+    is_ok = TRUE;
+ out:
+    EPHYR_LOG("leave\n");
     return is_ok;
 }
 
-
 static int
-ProcXF86DRIQueryVersion (register ClientPtr client)
+ProcXF86DRIQueryVersion(register ClientPtr client)
 {
     xXF86DRIQueryVersionReply rep;
+
     REQUEST_SIZE_MATCH(xXF86DRIQueryVersionReq);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -552,72 +530,73 @@ ProcXF86DRIQueryVersion (register ClientPtr client)
     rep.minorVersion = SERVER_XF86DRI_MINOR_VERSION;
     rep.patchVersion = SERVER_XF86DRI_PATCH_VERSION;
     if (client->swapped) {
-    swaps(&rep.sequenceNumber);
-    swapl(&rep.length);
-	swaps(&rep.majorVersion);
-	swaps(&rep.minorVersion);
-	swapl(&rep.patchVersion);
-    }
-    WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *)&rep);
-    EPHYR_LOG ("leave\n") ;
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swaps(&rep.majorVersion);
+        swaps(&rep.minorVersion);
+        swapl(&rep.patchVersion);
+    }
+    WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *) &rep);
+    EPHYR_LOG("leave\n");
     return Success;
 }
 
 static int
-ProcXF86DRIQueryDirectRenderingCapable (register ClientPtr client)
+ProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
 {
-    xXF86DRIQueryDirectRenderingCapableReply	rep;
+    xXF86DRIQueryDirectRenderingCapableReply rep;
     Bool isCapable;
+
     REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
     REQUEST_SIZE_MATCH(xXF86DRIQueryDirectRenderingCapableReq);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    if (!ephyrDRIQueryDirectRenderingCapable (stuff->screen, &isCapable)) {
+    if (!ephyrDRIQueryDirectRenderingCapable(stuff->screen, &isCapable)) {
         return BadValue;
     }
     rep.isCapable = isCapable;
 
     if (!LocalClient(client) || client->swapped)
-	rep.isCapable = 0;
+        rep.isCapable = 0;
 
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
     }
 
-    WriteToClient(client, sizeof(xXF86DRIQueryDirectRenderingCapableReply), (char *)&rep);
-    EPHYR_LOG ("leave\n") ;
+    WriteToClient(client, sizeof(xXF86DRIQueryDirectRenderingCapableReply),
+                  (char *) &rep);
+    EPHYR_LOG("leave\n");
 
     return Success;
 }
 
 static int
-ProcXF86DRIOpenConnection (register ClientPtr client)
+ProcXF86DRIOpenConnection(register ClientPtr client)
 {
     xXF86DRIOpenConnectionReply rep;
-    drm_handle_t			hSAREA;
-    char*			busIdString = NULL;
+    drm_handle_t hSAREA;
+    char *busIdString = NULL;
+
     REQUEST(xXF86DRIOpenConnectionReq);
     REQUEST_SIZE_MATCH(xXF86DRIOpenConnectionReq);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
-    if (!ephyrDRIOpenConnection(stuff->screen,
-                                &hSAREA,
-                                &busIdString)) {
+    if (!ephyrDRIOpenConnection(stuff->screen, &hSAREA, &busIdString)) {
         return BadValue;
     }
 
@@ -625,36 +604,39 @@ ProcXF86DRIOpenConnection (register ClientPtr client)
     rep.sequenceNumber = client->sequence;
     rep.busIdStringLength = 0;
     if (busIdString)
-	rep.busIdStringLength = strlen(busIdString);
-    rep.length = bytes_to_int32(SIZEOF(xXF86DRIOpenConnectionReply) - SIZEOF(xGenericReply) +
-                  pad_to_int32(rep.busIdStringLength));
+        rep.busIdStringLength = strlen(busIdString);
+    rep.length =
+        bytes_to_int32(SIZEOF(xXF86DRIOpenConnectionReply) -
+                       SIZEOF(xGenericReply) +
+                       pad_to_int32(rep.busIdStringLength));
 
-    rep.hSAREALow  = (CARD32)(hSAREA & 0xffffffff);
+    rep.hSAREALow = (CARD32) (hSAREA & 0xffffffff);
 #if defined(LONG64) && !defined(__linux__)
-    rep.hSAREAHigh = (CARD32)(hSAREA >> 32);
+    rep.hSAREAHigh = (CARD32) (hSAREA >> 32);
 #else
     rep.hSAREAHigh = 0;
 #endif
 
-    WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), (char *) &rep);
     if (rep.busIdStringLength)
         WriteToClient(client, rep.busIdStringLength, busIdString);
     free(busIdString);
-    EPHYR_LOG ("leave\n") ;
+    EPHYR_LOG("leave\n");
     return Success;
 }
 
 static int
-ProcXF86DRIAuthConnection  (register ClientPtr client)
+ProcXF86DRIAuthConnection(register ClientPtr client)
 {
     xXF86DRIAuthConnectionReply rep;
+
     REQUEST(xXF86DRIAuthConnectionReq);
     REQUEST_SIZE_MATCH(xXF86DRIAuthConnectionReq);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
     rep.type = X_Reply;
@@ -662,88 +644,88 @@ ProcXF86DRIAuthConnection  (register ClientPtr client)
     rep.sequenceNumber = client->sequence;
     rep.authenticated = 1;
 
-    if (!ephyrDRIAuthConnection (stuff->screen, stuff->magic)) {
-        ErrorF("Failed to authenticate %lu\n", (unsigned long)stuff->magic);
+    if (!ephyrDRIAuthConnection(stuff->screen, stuff->magic)) {
+        ErrorF("Failed to authenticate %lu\n", (unsigned long) stuff->magic);
         rep.authenticated = 0;
     }
-    WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *)&rep);
-    EPHYR_LOG ("leave\n") ;
+    WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *) &rep);
+    EPHYR_LOG("leave\n");
     return Success;
 }
 
 static int
-ProcXF86DRICloseConnection (register ClientPtr client)
+ProcXF86DRICloseConnection(register ClientPtr client)
 {
     REQUEST(xXF86DRICloseConnectionReq);
     REQUEST_SIZE_MATCH(xXF86DRICloseConnectionReq);
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
     if (stuff->screen >= screenInfo.numScreens) {
         client->errorValue = stuff->screen;
         return BadValue;
     }
 
     /*
-    DRICloseConnection( screenInfo.screens[stuff->screen]);
-    */
+       DRICloseConnection( screenInfo.screens[stuff->screen]);
+     */
 
-    EPHYR_LOG ("leave\n") ;
+    EPHYR_LOG("leave\n");
     return Success;
 }
 
 static int
-ProcXF86DRIGetClientDriverName (register ClientPtr client)
+ProcXF86DRIGetClientDriverName(register ClientPtr client)
 {
-    xXF86DRIGetClientDriverNameReply	rep;
-    char* clientDriverName;
+    xXF86DRIGetClientDriverNameReply rep;
+    char *clientDriverName;
+
     REQUEST(xXF86DRIGetClientDriverNameReq);
     REQUEST_SIZE_MATCH(xXF86DRIGetClientDriverNameReq);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
-    ephyrDRIGetClientDriverName (stuff->screen,
-                                 (int *)&rep.ddxDriverMajorVersion,
-                                 (int *)&rep.ddxDriverMinorVersion,
-                                 (int *)&rep.ddxDriverPatchVersion,
-                                 &clientDriverName);
+    ephyrDRIGetClientDriverName(stuff->screen,
+                                (int *) &rep.ddxDriverMajorVersion,
+                                (int *) &rep.ddxDriverMinorVersion,
+                                (int *) &rep.ddxDriverPatchVersion,
+                                &clientDriverName);
 
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
     rep.clientDriverNameLength = 0;
     if (clientDriverName)
-	rep.clientDriverNameLength = strlen(clientDriverName);
+        rep.clientDriverNameLength = strlen(clientDriverName);
     rep.length = bytes_to_int32(SIZEOF(xXF86DRIGetClientDriverNameReply) -
-			SIZEOF(xGenericReply) +
-			pad_to_int32(rep.clientDriverNameLength));
+                                SIZEOF(xGenericReply) +
+                                pad_to_int32(rep.clientDriverNameLength));
 
-    WriteToClient(client, 
-	sizeof(xXF86DRIGetClientDriverNameReply), (char *)&rep);
+    WriteToClient(client,
+                  sizeof(xXF86DRIGetClientDriverNameReply), (char *) &rep);
     if (rep.clientDriverNameLength)
-	WriteToClient(client, 
-                      rep.clientDriverNameLength, 
-                      clientDriverName);
-    EPHYR_LOG ("leave\n") ;
+        WriteToClient(client, rep.clientDriverNameLength, clientDriverName);
+    EPHYR_LOG("leave\n");
     return Success;
 }
 
 static int
-ProcXF86DRICreateContext (register ClientPtr client)
+ProcXF86DRICreateContext(register ClientPtr client)
 {
-    xXF86DRICreateContextReply	rep;
+    xXF86DRICreateContextReply rep;
     ScreenPtr pScreen;
     VisualPtr visual;
-    int i=0;
-    unsigned long context_id=0;
+    int i = 0;
+    unsigned long context_id = 0;
+
     REQUEST(xXF86DRICreateContextReq);
     REQUEST_SIZE_MATCH(xXF86DRICreateContextReq);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
     rep.type = X_Reply;
@@ -755,205 +737,196 @@ ProcXF86DRICreateContext (register ClientPtr client)
 
     /* Find the requested X visual */
     for (i = 0; i < pScreen->numVisuals; i++, visual++)
-	if (visual->vid == stuff->visual)
-	    break;
+        if (visual->vid == stuff->visual)
+            break;
     if (i == pScreen->numVisuals) {
-	/* No visual found */
-	return BadValue;
+        /* No visual found */
+        return BadValue;
     }
 
-    context_id = stuff->context ;
-    if (!ephyrDRICreateContext (stuff->screen,
-                                stuff->visual,
-                                &context_id,
-                                (drm_context_t *)&rep.hHWContext)) {
+    context_id = stuff->context;
+    if (!ephyrDRICreateContext(stuff->screen,
+                               stuff->visual,
+                               &context_id,
+                               (drm_context_t *) & rep.hHWContext)) {
         return BadValue;
     }
 
-    WriteToClient(client, sizeof(xXF86DRICreateContextReply), (char *)&rep);
-    EPHYR_LOG ("leave\n") ;
+    WriteToClient(client, sizeof(xXF86DRICreateContextReply), (char *) &rep);
+    EPHYR_LOG("leave\n");
     return Success;
 }
 
 static int
-ProcXF86DRIDestroyContext (register ClientPtr client)
+ProcXF86DRIDestroyContext(register ClientPtr client)
 {
     REQUEST(xXF86DRIDestroyContextReq);
     REQUEST_SIZE_MATCH(xXF86DRIDestroyContextReq);
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
 
     if (stuff->screen >= screenInfo.numScreens) {
         client->errorValue = stuff->screen;
         return BadValue;
     }
 
-   if (!ephyrDRIDestroyContext (stuff->screen, stuff->context)) {
-       return BadValue;
-   }
+    if (!ephyrDRIDestroyContext(stuff->screen, stuff->context)) {
+        return BadValue;
+    }
 
-    EPHYR_LOG ("leave\n") ;
+    EPHYR_LOG("leave\n");
     return Success;
 }
 
 static Bool
-getWindowVisual (const WindowPtr a_win,
-                 VisualPtr *a_visual)
+getWindowVisual(const WindowPtr a_win, VisualPtr * a_visual)
 {
-    int i=0, visual_id=0 ;
-    EPHYR_RETURN_VAL_IF_FAIL (a_win
-                              && a_win->drawable.pScreen
-                              && a_win->drawable.pScreen->visuals,
-                              FALSE) ;
-
-    visual_id = wVisual (a_win) ;
-    for (i=0; i < a_win->drawable.pScreen->numVisuals; i++) {
+    int i = 0, visual_id = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_win
+                             && a_win->drawable.pScreen
+                             && a_win->drawable.pScreen->visuals, FALSE);
+
+    visual_id = wVisual(a_win);
+    for (i = 0; i < a_win->drawable.pScreen->numVisuals; i++) {
         if (a_win->drawable.pScreen->visuals[i].vid == visual_id) {
-            *a_visual = &a_win->drawable.pScreen->visuals[i] ;
-            return TRUE ;
+            *a_visual = &a_win->drawable.pScreen->visuals[i];
+            return TRUE;
         }
     }
-    return FALSE ;
+    return FALSE;
 }
 
-
 #define NUM_WINDOW_PAIRS 256
-static EphyrWindowPair window_pairs[NUM_WINDOW_PAIRS] ;
+static EphyrWindowPair window_pairs[NUM_WINDOW_PAIRS];
 
 static Bool
-appendWindowPairToList (WindowPtr a_local,
-                        int a_remote)
+appendWindowPairToList(WindowPtr a_local, int a_remote)
 {
-    int i=0 ;
+    int i = 0;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_local, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_local, FALSE);
 
-    EPHYR_LOG ("(local,remote):(%p, %d)\n", a_local, a_remote) ;
+    EPHYR_LOG("(local,remote):(%p, %d)\n", a_local, a_remote);
 
-    for (i=0; i < NUM_WINDOW_PAIRS; i++) {
+    for (i = 0; i < NUM_WINDOW_PAIRS; i++) {
         if (window_pairs[i].local == NULL) {
-            window_pairs[i].local = a_local ;
-            window_pairs[i].remote = a_remote ;
-            return TRUE ;
+            window_pairs[i].local = a_local;
+            window_pairs[i].remote = a_remote;
+            return TRUE;
         }
     }
-    return FALSE ;
+    return FALSE;
 }
 
 static Bool
-findWindowPairFromLocal (WindowPtr a_local,
-                         EphyrWindowPair **a_pair)
+findWindowPairFromLocal(WindowPtr a_local, EphyrWindowPair ** a_pair)
 {
-    int i=0 ;
+    int i = 0;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_pair && a_local, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_pair && a_local, FALSE);
 
-    for (i=0; i < NUM_WINDOW_PAIRS; i++) {
+    for (i = 0; i < NUM_WINDOW_PAIRS; i++) {
         if (window_pairs[i].local == a_local) {
-            *a_pair = &window_pairs[i] ;
-            EPHYR_LOG ("found (%p, %d)\n",
-                       (*a_pair)->local,
-                       (*a_pair)->remote) ;
-            return TRUE ;
+            *a_pair = &window_pairs[i];
+            EPHYR_LOG("found (%p, %d)\n", (*a_pair)->local, (*a_pair)->remote);
+            return TRUE;
         }
     }
-    return FALSE ;
+    return FALSE;
 }
 
 Bool
-findWindowPairFromRemote (int a_remote,
-                          EphyrWindowPair **a_pair)
+findWindowPairFromRemote(int a_remote, EphyrWindowPair ** a_pair)
 {
-    int i=0 ;
+    int i = 0;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_pair, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_pair, FALSE);
 
-    for (i=0; i < NUM_WINDOW_PAIRS; i++) {
+    for (i = 0; i < NUM_WINDOW_PAIRS; i++) {
         if (window_pairs[i].remote == a_remote) {
-            *a_pair = &window_pairs[i] ;
-            EPHYR_LOG ("found (%p, %d)\n",
-                       (*a_pair)->local,
-                       (*a_pair)->remote) ;
-            return TRUE ;
+            *a_pair = &window_pairs[i];
+            EPHYR_LOG("found (%p, %d)\n", (*a_pair)->local, (*a_pair)->remote);
+            return TRUE;
         }
     }
-    return FALSE ;
+    return FALSE;
 }
 
 static Bool
-createHostPeerWindow (const WindowPtr a_win,
-                      int *a_peer_win)
+createHostPeerWindow(const WindowPtr a_win, int *a_peer_win)
 {
-    Bool is_ok=FALSE ;
-    VisualPtr visual=NULL;
-    EphyrBox geo ;
+    Bool is_ok = FALSE;
+    VisualPtr visual = NULL;
+    EphyrBox geo;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_win && a_peer_win, FALSE) ;
-    EPHYR_RETURN_VAL_IF_FAIL (a_win->drawable.pScreen,
-                              FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_win && a_peer_win, FALSE);
+    EPHYR_RETURN_VAL_IF_FAIL(a_win->drawable.pScreen, FALSE);
 
-    EPHYR_LOG ("enter. a_win '%p'\n", a_win) ;
-    if (!getWindowVisual (a_win, &visual)) {
-        EPHYR_LOG_ERROR ("failed to get window visual\n") ;
-        goto out ;
+    EPHYR_LOG("enter. a_win '%p'\n", a_win);
+    if (!getWindowVisual(a_win, &visual)) {
+        EPHYR_LOG_ERROR("failed to get window visual\n");
+        goto out;
     }
     if (!visual) {
-        EPHYR_LOG_ERROR ("failed to create visual\n") ;
-        goto out ;
-    }
-    memset (&geo, 0, sizeof (geo)) ;
-    geo.x = a_win->drawable.x ;
-    geo.y = a_win->drawable.y ;
-    geo.width = a_win->drawable.width ;
-    geo.height = a_win->drawable.height ;
-    if (!hostx_create_window (a_win->drawable.pScreen->myNum,
-                              &geo, visual->vid, a_peer_win)) {
-        EPHYR_LOG_ERROR ("failed to create host peer window\n") ;
-        goto out ;
-    }
-    if (!appendWindowPairToList (a_win, *a_peer_win)) {
-        EPHYR_LOG_ERROR ("failed to append window to pair list\n") ;
-        goto out ;
-    }
-    is_ok = TRUE ;
-out:
-    EPHYR_LOG ("leave:remote win%d\n", *a_peer_win) ;
-    return is_ok ;
+        EPHYR_LOG_ERROR("failed to create visual\n");
+        goto out;
+    }
+    memset(&geo, 0, sizeof(geo));
+    geo.x = a_win->drawable.x;
+    geo.y = a_win->drawable.y;
+    geo.width = a_win->drawable.width;
+    geo.height = a_win->drawable.height;
+    if (!hostx_create_window(a_win->drawable.pScreen->myNum,
+                             &geo, visual->vid, a_peer_win)) {
+        EPHYR_LOG_ERROR("failed to create host peer window\n");
+        goto out;
+    }
+    if (!appendWindowPairToList(a_win, *a_peer_win)) {
+        EPHYR_LOG_ERROR("failed to append window to pair list\n");
+        goto out;
+    }
+    is_ok = TRUE;
+ out:
+    EPHYR_LOG("leave:remote win%d\n", *a_peer_win);
+    return is_ok;
 }
 
 static Bool
-destroyHostPeerWindow (const WindowPtr a_win)
+destroyHostPeerWindow(const WindowPtr a_win)
 {
-    Bool is_ok = FALSE ;
-    EphyrWindowPair *pair=NULL ;
-    EPHYR_RETURN_VAL_IF_FAIL (a_win, FALSE) ;
+    Bool is_ok = FALSE;
+    EphyrWindowPair *pair = NULL;
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_win, FALSE);
 
-    if (!findWindowPairFromLocal (a_win, &pair) || !pair) {
-        EPHYR_LOG_ERROR ("failed to find peer to local window\n") ;
+    EPHYR_LOG("enter\n");
+
+    if (!findWindowPairFromLocal(a_win, &pair) || !pair) {
+        EPHYR_LOG_ERROR("failed to find peer to local window\n");
         goto out;
     }
-    hostx_destroy_window (pair->remote) ;
-    is_ok = TRUE ;
+    hostx_destroy_window(pair->remote);
+    is_ok = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
+ out:
+    EPHYR_LOG("leave\n");
     return is_ok;
 }
 
 static int
-ProcXF86DRICreateDrawable (ClientPtr client)
+ProcXF86DRICreateDrawable(ClientPtr client)
 {
-    xXF86DRICreateDrawableReply	rep;
-    DrawablePtr drawable=NULL;
-    WindowPtr window=NULL ;
-    EphyrWindowPair *pair=NULL ;
-    EphyrDRIWindowPrivPtr win_priv=NULL;
-    int rc=0, remote_win=0;
+    xXF86DRICreateDrawableReply rep;
+    DrawablePtr drawable = NULL;
+    WindowPtr window = NULL;
+    EphyrWindowPair *pair = NULL;
+    EphyrDRIWindowPrivPtr win_priv = NULL;
+    int rc = 0, remote_win = 0;
+
     REQUEST(xXF86DRICreateDrawableReq);
     REQUEST_SIZE_MATCH(xXF86DRICreateDrawableReq);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
     if (stuff->screen >= screenInfo.numScreens) {
         client->errorValue = stuff->screen;
         return BadValue;
@@ -963,108 +936,107 @@ ProcXF86DRICreateDrawable (ClientPtr client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    rc = dixLookupDrawable (&drawable, stuff->drawable, client, 0,
-                            DixReadAccess);
+    rc = dixLookupDrawable(&drawable, stuff->drawable, client, 0,
+                           DixReadAccess);
     if (rc != Success)
         return rc;
     if (drawable->type != DRAWABLE_WINDOW) {
-        EPHYR_LOG_ERROR ("non drawable windows are not yet supported\n") ;
-        return BadImplementation ;
-    }
-    EPHYR_LOG ("lookedup drawable %p\n", drawable) ;
-    window = (WindowPtr)drawable;
-    if (findWindowPairFromLocal (window, &pair) && pair) {
-        remote_win = pair->remote ;
-        EPHYR_LOG ("found window '%p' paire with remote '%d'\n",
-                   window, remote_win) ;
-    } else if (!createHostPeerWindow (window, &remote_win)) {
-        EPHYR_LOG_ERROR ("failed to create host peer window\n") ;
-        return BadAlloc ;
-    }
-
-    if (!ephyrDRICreateDrawable (stuff->screen,
-                                 remote_win,
-                                 (drm_drawable_t *)&rep.hHWDrawable)) {
-        EPHYR_LOG_ERROR ("failed to create dri drawable\n") ;
+        EPHYR_LOG_ERROR("non drawable windows are not yet supported\n");
+        return BadImplementation;
+    }
+    EPHYR_LOG("lookedup drawable %p\n", drawable);
+    window = (WindowPtr) drawable;
+    if (findWindowPairFromLocal(window, &pair) && pair) {
+        remote_win = pair->remote;
+        EPHYR_LOG("found window '%p' paire with remote '%d'\n",
+                  window, remote_win);
+    }
+    else if (!createHostPeerWindow(window, &remote_win)) {
+        EPHYR_LOG_ERROR("failed to create host peer window\n");
+        return BadAlloc;
+    }
+
+    if (!ephyrDRICreateDrawable(stuff->screen,
+                                remote_win,
+                                (drm_drawable_t *) & rep.hHWDrawable)) {
+        EPHYR_LOG_ERROR("failed to create dri drawable\n");
         return BadValue;
     }
 
-    win_priv = GET_EPHYR_DRI_WINDOW_PRIV (window) ;
+    win_priv = GET_EPHYR_DRI_WINDOW_PRIV(window);
     if (!win_priv) {
-        win_priv = calloc(1, sizeof (EphyrDRIWindowPrivRec)) ;
+        win_priv = calloc(1, sizeof(EphyrDRIWindowPrivRec));
         if (!win_priv) {
-            EPHYR_LOG_ERROR ("failed to allocate window private\n") ;
-            return BadAlloc ;
+            EPHYR_LOG_ERROR("failed to allocate window private\n");
+            return BadAlloc;
         }
-	dixSetPrivate(&window->devPrivates, ephyrDRIWindowKey, win_priv);
-        EPHYR_LOG ("paired window '%p' with remote '%d'\n",
-                   window, remote_win) ;
+        dixSetPrivate(&window->devPrivates, ephyrDRIWindowKey, win_priv);
+        EPHYR_LOG("paired window '%p' with remote '%d'\n", window, remote_win);
     }
 
-    WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *)&rep);
-    EPHYR_LOG ("leave\n") ;
+    WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *) &rep);
+    EPHYR_LOG("leave\n");
     return Success;
 }
 
 static int
-ProcXF86DRIDestroyDrawable (register ClientPtr client)
+ProcXF86DRIDestroyDrawable(register ClientPtr client)
 {
-    DrawablePtr drawable=NULL;
-    WindowPtr window=NULL;
-    EphyrWindowPair *pair=NULL;
-    int rc=0;
+    DrawablePtr drawable = NULL;
+    WindowPtr window = NULL;
+    EphyrWindowPair *pair = NULL;
+    int rc = 0;
+
     REQUEST(xXF86DRIDestroyDrawableReq);
     REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
     if (stuff->screen >= screenInfo.numScreens) {
         client->errorValue = stuff->screen;
         return BadValue;
     }
 
     rc = dixLookupDrawable(&drawable,
-                           stuff->drawable,
-                           client,
-                           0,
-                           DixReadAccess);
+                           stuff->drawable, client, 0, DixReadAccess);
     if (rc != Success)
         return rc;
     if (drawable->type != DRAWABLE_WINDOW) {
-        EPHYR_LOG_ERROR ("non drawable windows are not yet supported\n") ;
-        return BadImplementation ;
+        EPHYR_LOG_ERROR("non drawable windows are not yet supported\n");
+        return BadImplementation;
     }
-    window = (WindowPtr)drawable;
-    if (!findWindowPairFromLocal (window, &pair) && pair) {
-        EPHYR_LOG_ERROR ("failed to find pair window\n") ;
+    window = (WindowPtr) drawable;
+    if (!findWindowPairFromLocal(window, &pair) && pair) {
+        EPHYR_LOG_ERROR("failed to find pair window\n");
         return BadImplementation;
     }
     if (!ephyrDRIDestroyDrawable(stuff->screen,
-                                 pair->remote/*drawable in host x*/)) {
-        EPHYR_LOG_ERROR ("failed to destroy dri drawable\n") ;
+                                 pair->remote /*drawable in host x */ )) {
+        EPHYR_LOG_ERROR("failed to destroy dri drawable\n");
         return BadImplementation;
     }
-    pair->local=NULL ;
-    pair->remote=0;
+    pair->local = NULL;
+    pair->remote = 0;
 
-    EPHYR_LOG ("leave\n") ;
+    EPHYR_LOG("leave\n");
     return Success;
 }
 
 static int
-ProcXF86DRIGetDrawableInfo (register ClientPtr client)
+ProcXF86DRIGetDrawableInfo(register ClientPtr client)
 {
     xXF86DRIGetDrawableInfoReply rep;
     DrawablePtr drawable;
-    WindowPtr window=NULL;
-    EphyrWindowPair *pair=NULL;
-    int X=0, Y=0, W=0, H=0, backX=0, backY=0, rc=0, i=0;
-    drm_clip_rect_t *clipRects=NULL;
-    drm_clip_rect_t *backClipRects=NULL;
+    WindowPtr window = NULL;
+    EphyrWindowPair *pair = NULL;
+    int X = 0, Y = 0, W = 0, H = 0, backX = 0, backY = 0, rc = 0, i = 0;
+    drm_clip_rect_t *clipRects = NULL;
+    drm_clip_rect_t *backClipRects = NULL;
+
     REQUEST(xXF86DRIGetDrawableInfoReq);
     REQUEST_SIZE_MATCH(xXF86DRIGetDrawableInfoReq);
 
-    EPHYR_LOG ("enter\n") ;
-    memset (&rep, 0, sizeof (rep)) ;
+    EPHYR_LOG("enter\n");
+    memset(&rep, 0, sizeof(rep));
     if (stuff->screen >= screenInfo.numScreens) {
         client->errorValue = stuff->screen;
         return BadValue;
@@ -1077,123 +1049,125 @@ ProcXF86DRIGetDrawableInfo (register ClientPtr client)
     rc = dixLookupDrawable(&drawable, stuff->drawable, client, 0,
                            DixReadAccess);
     if (rc != Success || !drawable) {
-        EPHYR_LOG_ERROR ("could not get drawable\n") ;
+        EPHYR_LOG_ERROR("could not get drawable\n");
         return rc;
     }
 
     if (drawable->type != DRAWABLE_WINDOW) {
-        EPHYR_LOG_ERROR ("non windows type drawables are not yes supported\n") ;
-        return BadImplementation ;
-    }
-    window = (WindowPtr)drawable ;
-    memset (&pair, 0, sizeof (pair)) ;
-    if (!findWindowPairFromLocal (window, &pair) || !pair) {
-        EPHYR_LOG_ERROR ("failed to find remote peer drawable\n") ;
-        return BadMatch ;
-    }
-    EPHYR_LOG ("clip list of xephyr gl drawable:\n") ;
-    for (i=0; i < RegionNumRects (&window->clipList); i++) {
-        EPHYR_LOG ("x1:%d, y1:%d, x2:%d, y2:%d\n",
-                   RegionRects (&window->clipList)[i].x1,
-                   RegionRects (&window->clipList)[i].y1,
-                   RegionRects (&window->clipList)[i].x2,
-                   RegionRects (&window->clipList)[i].y2) ;
-    }
-
-    if (!ephyrDRIGetDrawableInfo (stuff->screen,
-                                  pair->remote/*the drawable in hostx*/,
-                                  (unsigned int*)&rep.drawableTableIndex,
-                                  (unsigned int*)&rep.drawableTableStamp,
-                                  (int*)&X,
-                                  (int*)&Y,
-                                  (int*)&W,
-                                  (int*)&H,
-                                  (int*)&rep.numClipRects,
-                                  &clipRects,
-                                  &backX,
-                                  &backY,
-                                  (int*)&rep.numBackClipRects,
-                                  &backClipRects)) {
+        EPHYR_LOG_ERROR("non windows type drawables are not yes supported\n");
+        return BadImplementation;
+    }
+    window = (WindowPtr) drawable;
+    memset(&pair, 0, sizeof(pair));
+    if (!findWindowPairFromLocal(window, &pair) || !pair) {
+        EPHYR_LOG_ERROR("failed to find remote peer drawable\n");
+        return BadMatch;
+    }
+    EPHYR_LOG("clip list of xephyr gl drawable:\n");
+    for (i = 0; i < RegionNumRects(&window->clipList); i++) {
+        EPHYR_LOG("x1:%d, y1:%d, x2:%d, y2:%d\n",
+                  RegionRects(&window->clipList)[i].x1,
+                  RegionRects(&window->clipList)[i].y1,
+                  RegionRects(&window->clipList)[i].x2,
+                  RegionRects(&window->clipList)[i].y2);
+    }
+
+    if (!ephyrDRIGetDrawableInfo(stuff->screen,
+                                 pair->remote /*the drawable in hostx */ ,
+                                 (unsigned int *) &rep.drawableTableIndex,
+                                 (unsigned int *) &rep.drawableTableStamp,
+                                 (int *) &X,
+                                 (int *) &Y,
+                                 (int *) &W,
+                                 (int *) &H,
+                                 (int *) &rep.numClipRects,
+                                 &clipRects,
+                                 &backX,
+                                 &backY,
+                                 (int *) &rep.numBackClipRects,
+                                 &backClipRects)) {
         return BadValue;
     }
-    EPHYR_LOG ("num clip rects:%d, num back clip rects:%d\n",
-               (int)rep.numClipRects, (int)rep.numBackClipRects) ;
+    EPHYR_LOG("num clip rects:%d, num back clip rects:%d\n",
+              (int) rep.numClipRects, (int) rep.numBackClipRects);
 
     rep.drawableX = X;
     rep.drawableY = Y;
     rep.drawableWidth = W;
     rep.drawableHeight = H;
-    rep.length = (SIZEOF(xXF86DRIGetDrawableInfoReply) -
-                  SIZEOF(xGenericReply));
+    rep.length = (SIZEOF(xXF86DRIGetDrawableInfoReply) - SIZEOF(xGenericReply));
 
     rep.backX = backX;
     rep.backY = backY;
 
-
     if (rep.numClipRects) {
         if (clipRects) {
             ScreenPtr pScreen = screenInfo.screens[stuff->screen];
-            int i=0;
-            EPHYR_LOG ("clip list of host gl drawable:\n") ;
+            int i = 0;
+
+            EPHYR_LOG("clip list of host gl drawable:\n");
             for (i = 0; i < rep.numClipRects; i++) {
-                clipRects[i].x1 = max (clipRects[i].x1, 0);
-                clipRects[i].y1 = max (clipRects[i].y1, 0);
-                clipRects[i].x2 = min (clipRects[i].x2,
-                                       pScreen->width + clipRects[i].x1) ;
-                clipRects[i].y2 = min (clipRects[i].y2,
-                                       pScreen->width + clipRects[i].y1) ;
-
-                EPHYR_LOG ("x1:%d, y1:%d, x2:%d, y2:%d\n",
-                           clipRects[i].x1, clipRects[i].y1,
-                           clipRects[i].x2, clipRects[i].y2) ;
+                clipRects[i].x1 = max(clipRects[i].x1, 0);
+                clipRects[i].y1 = max(clipRects[i].y1, 0);
+                clipRects[i].x2 = min(clipRects[i].x2,
+                                      pScreen->width + clipRects[i].x1);
+                clipRects[i].y2 = min(clipRects[i].y2,
+                                      pScreen->width + clipRects[i].y1);
+
+                EPHYR_LOG("x1:%d, y1:%d, x2:%d, y2:%d\n",
+                          clipRects[i].x1, clipRects[i].y1,
+                          clipRects[i].x2, clipRects[i].y2);
             }
-        } else {
+        }
+        else {
             rep.numClipRects = 0;
         }
-    } else {
-        EPHYR_LOG ("got zero host gl drawable clipping rects\n") ;
+    }
+    else {
+        EPHYR_LOG("got zero host gl drawable clipping rects\n");
     }
     rep.length += sizeof(drm_clip_rect_t) * rep.numClipRects;
-    backClipRects = clipRects ;
-    rep.numBackClipRects = rep.numClipRects ;
+    backClipRects = clipRects;
+    rep.numBackClipRects = rep.numClipRects;
     if (rep.numBackClipRects)
         rep.length += sizeof(drm_clip_rect_t) * rep.numBackClipRects;
-    EPHYR_LOG ("num host clip rects:%d\n", (int)rep.numClipRects) ;
-    EPHYR_LOG ("num host back clip rects:%d\n", (int)rep.numBackClipRects) ;
+    EPHYR_LOG("num host clip rects:%d\n", (int) rep.numClipRects);
+    EPHYR_LOG("num host back clip rects:%d\n", (int) rep.numBackClipRects);
 
     rep.length = bytes_to_int32(rep.length);
 
-    WriteToClient(client, sizeof(xXF86DRIGetDrawableInfoReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86DRIGetDrawableInfoReply), (char *) &rep);
 
     if (rep.numClipRects) {
         WriteToClient(client,
                       sizeof(drm_clip_rect_t) * rep.numClipRects,
-                      (char *)clipRects);
+                      (char *) clipRects);
     }
 
     if (rep.numBackClipRects) {
         WriteToClient(client,
                       sizeof(drm_clip_rect_t) * rep.numBackClipRects,
-                      (char *)backClipRects);
+                      (char *) backClipRects);
     }
     free(clipRects);
-    clipRects = NULL ;
+    clipRects = NULL;
 
-    EPHYR_LOG ("leave\n") ;
+    EPHYR_LOG("leave\n");
 
     return Success;
 }
 
 static int
-ProcXF86DRIGetDeviceInfo (register ClientPtr client)
+ProcXF86DRIGetDeviceInfo(register ClientPtr client)
 {
-    xXF86DRIGetDeviceInfoReply	rep;
+    xXF86DRIGetDeviceInfoReply rep;
     drm_handle_t hFrameBuffer;
     void *pDevPrivate;
+
     REQUEST(xXF86DRIGetDeviceInfoReq);
     REQUEST_SIZE_MATCH(xXF86DRIGetDeviceInfoReq);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
     if (stuff->screen >= screenInfo.numScreens) {
         client->errorValue = stuff->screen;
         return BadValue;
@@ -1203,19 +1177,18 @@ ProcXF86DRIGetDeviceInfo (register ClientPtr client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    if (!ephyrDRIGetDeviceInfo (stuff->screen,
-                &hFrameBuffer,
-                (int*)&rep.framebufferOrigin,
-                (int*)&rep.framebufferSize,
-                (int*)&rep.framebufferStride,
-                (int*)&rep.devPrivateSize,
-                &pDevPrivate)) {
+    if (!ephyrDRIGetDeviceInfo(stuff->screen,
+                               &hFrameBuffer,
+                               (int *) &rep.framebufferOrigin,
+                               (int *) &rep.framebufferSize,
+                               (int *) &rep.framebufferStride,
+                               (int *) &rep.devPrivateSize, &pDevPrivate)) {
         return BadValue;
     }
 
-    rep.hFrameBufferLow  = (CARD32)(hFrameBuffer & 0xffffffff);
+    rep.hFrameBufferLow = (CARD32) (hFrameBuffer & 0xffffffff);
 #if defined(LONG64) && !defined(__linux__)
-    rep.hFrameBufferHigh = (CARD32)(hFrameBuffer >> 32);
+    rep.hFrameBufferHigh = (CARD32) (hFrameBuffer >> 32);
 #else
     rep.hFrameBufferHigh = 0;
 #endif
@@ -1223,91 +1196,89 @@ ProcXF86DRIGetDeviceInfo (register ClientPtr client)
     rep.length = 0;
     if (rep.devPrivateSize) {
         rep.length = bytes_to_int32(SIZEOF(xXF86DRIGetDeviceInfoReply) -
-                SIZEOF(xGenericReply) +
-                pad_to_int32(rep.devPrivateSize));
+                                    SIZEOF(xGenericReply) +
+                                    pad_to_int32(rep.devPrivateSize));
     }
 
-    WriteToClient(client, sizeof(xXF86DRIGetDeviceInfoReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86DRIGetDeviceInfoReply), (char *) &rep);
     if (rep.length) {
-        WriteToClient(client, rep.devPrivateSize, (char *)pDevPrivate);
+        WriteToClient(client, rep.devPrivateSize, (char *) pDevPrivate);
     }
-    EPHYR_LOG ("leave\n") ;
+    EPHYR_LOG("leave\n");
     return Success;
 }
 
 static int
-ProcXF86DRIDispatch (register ClientPtr	client)
+ProcXF86DRIDispatch(register ClientPtr client)
 {
     REQUEST(xReq);
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
 
-    switch (stuff->data)
-    {
-        case X_XF86DRIQueryVersion: {
-                EPHYR_LOG ("leave\n") ;
-                return ProcXF86DRIQueryVersion(client);
-        }
-        case X_XF86DRIQueryDirectRenderingCapable: {
-                EPHYR_LOG ("leave\n") ;
-                return ProcXF86DRIQueryDirectRenderingCapable(client);
-        }
+    switch (stuff->data) {
+    case X_XF86DRIQueryVersion:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRIQueryVersion(client);
+    }
+    case X_XF86DRIQueryDirectRenderingCapable:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRIQueryDirectRenderingCapable(client);
+    }
     }
 
     if (!LocalClient(client))
         return DRIErrorBase + XF86DRIClientNotLocal;
 
-    switch (stuff->data)
-    {
-        case X_XF86DRIOpenConnection: {
-            EPHYR_LOG ("leave\n") ;
-            return ProcXF86DRIOpenConnection(client);
-        }
-        case X_XF86DRICloseConnection: {
-            EPHYR_LOG ("leave\n") ;
-            return ProcXF86DRICloseConnection(client);
-        }
-        case X_XF86DRIGetClientDriverName: {
-            EPHYR_LOG ("leave\n") ;
-            return ProcXF86DRIGetClientDriverName(client);
-        }
-        case X_XF86DRICreateContext: {
-            EPHYR_LOG ("leave\n") ;
-            return ProcXF86DRICreateContext(client);
-        }
-        case X_XF86DRIDestroyContext: {
-            EPHYR_LOG ("leave\n") ;
-            return ProcXF86DRIDestroyContext(client);
-        }
-        case X_XF86DRICreateDrawable: {
-            EPHYR_LOG ("leave\n") ;
-            return ProcXF86DRICreateDrawable(client);
-        }
-        case X_XF86DRIDestroyDrawable: {
-            EPHYR_LOG ("leave\n") ;
-            return ProcXF86DRIDestroyDrawable(client);
-        }
-        case X_XF86DRIGetDrawableInfo: {
-            EPHYR_LOG ("leave\n") ;
-            return ProcXF86DRIGetDrawableInfo(client);
-        }
-        case X_XF86DRIGetDeviceInfo: {
-            EPHYR_LOG ("leave\n") ;
-            return ProcXF86DRIGetDeviceInfo(client);
-        }
-        case X_XF86DRIAuthConnection: {
-            EPHYR_LOG ("leave\n") ;
-            return ProcXF86DRIAuthConnection(client);
-        }
-            /* {Open,Close}FullScreen are deprecated now */
-        default: {
-            EPHYR_LOG ("leave\n") ;
-            return BadRequest;
-        }
+    switch (stuff->data) {
+    case X_XF86DRIOpenConnection:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRIOpenConnection(client);
+    }
+    case X_XF86DRICloseConnection:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRICloseConnection(client);
+    }
+    case X_XF86DRIGetClientDriverName:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRIGetClientDriverName(client);
+    }
+    case X_XF86DRICreateContext:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRICreateContext(client);
+    }
+    case X_XF86DRIDestroyContext:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRIDestroyContext(client);
+    }
+    case X_XF86DRICreateDrawable:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRICreateDrawable(client);
+    }
+    case X_XF86DRIDestroyDrawable:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRIDestroyDrawable(client);
+    }
+    case X_XF86DRIGetDrawableInfo:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRIGetDrawableInfo(client);
+    }
+    case X_XF86DRIGetDeviceInfo:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRIGetDeviceInfo(client);
+    }
+    case X_XF86DRIAuthConnection:{
+        EPHYR_LOG("leave\n");
+        return ProcXF86DRIAuthConnection(client);
+    }
+        /* {Open,Close}FullScreen are deprecated now */
+    default:{
+        EPHYR_LOG("leave\n");
+        return BadRequest;
+    }
     }
 }
 
 static int
-SProcXF86DRIQueryVersion (register ClientPtr	client)
+SProcXF86DRIQueryVersion(register ClientPtr client)
 {
     REQUEST(xXF86DRIQueryVersionReq);
     swaps(&stuff->length);
@@ -1315,7 +1286,7 @@ SProcXF86DRIQueryVersion (register ClientPtr	client)
 }
 
 static int
-SProcXF86DRIQueryDirectRenderingCapable (register ClientPtr client)
+SProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
 {
     REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
     swaps(&stuff->length);
@@ -1324,90 +1295,89 @@ SProcXF86DRIQueryDirectRenderingCapable (register ClientPtr client)
 }
 
 static int
-SProcXF86DRIDispatch (register ClientPtr client)
+SProcXF86DRIDispatch(register ClientPtr client)
 {
     REQUEST(xReq);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
     /*
      * Only local clients are allowed DRI access, but remote clients still need
      * these requests to find out cleanly.
      */
-    switch (stuff->data)
-    {
-        case X_XF86DRIQueryVersion: {
-            EPHYR_LOG ("leave\n") ;
-            return SProcXF86DRIQueryVersion(client);
-        }
-        case X_XF86DRIQueryDirectRenderingCapable: {
-            EPHYR_LOG ("leave\n") ;
-            return SProcXF86DRIQueryDirectRenderingCapable(client);
-        }
-        default: {
-            EPHYR_LOG ("leave\n") ;
-            return DRIErrorBase + XF86DRIClientNotLocal;
-        }
+    switch (stuff->data) {
+    case X_XF86DRIQueryVersion:{
+        EPHYR_LOG("leave\n");
+        return SProcXF86DRIQueryVersion(client);
+    }
+    case X_XF86DRIQueryDirectRenderingCapable:{
+        EPHYR_LOG("leave\n");
+        return SProcXF86DRIQueryDirectRenderingCapable(client);
+    }
+    default:{
+        EPHYR_LOG("leave\n");
+        return DRIErrorBase + XF86DRIClientNotLocal;
+    }
     }
 }
 
 Bool
-ephyrDRIExtensionInit (ScreenPtr a_screen)
+ephyrDRIExtensionInit(ScreenPtr a_screen)
 {
-    Bool is_ok=FALSE ;
-    ExtensionEntry* extEntry=NULL;
-    EphyrDRIScreenPrivPtr screen_priv=NULL ;
+    Bool is_ok = FALSE;
+    ExtensionEntry *extEntry = NULL;
+    EphyrDRIScreenPrivPtr screen_priv = NULL;
 
-    EPHYR_LOG ("enter\n") ;
-    if (!hostx_has_dri ()) {
-        EPHYR_LOG ("host does not have DRI extension\n") ;
-        goto out ;
+    EPHYR_LOG("enter\n");
+    if (!hostx_has_dri()) {
+        EPHYR_LOG("host does not have DRI extension\n");
+        goto out;
     }
-    EPHYR_LOG ("host X does have DRI extension\n") ;
-    if (!hostx_has_xshape ()) {
-        EPHYR_LOG ("host does not have XShape extension\n") ;
-        goto out ;
+    EPHYR_LOG("host X does have DRI extension\n");
+    if (!hostx_has_xshape()) {
+        EPHYR_LOG("host does not have XShape extension\n");
+        goto out;
     }
-    EPHYR_LOG ("host X does have XShape extension\n") ;
+    EPHYR_LOG("host X does have XShape extension\n");
 
 #ifdef XF86DRI_EVENTS
-    EventType = CreateNewResourceType (XF86DRIFreeEvents, "DRIEvents");
+    EventType = CreateNewResourceType(XF86DRIFreeEvents, "DRIEvents");
     if (!EventType) {
-        EPHYR_LOG_ERROR ("failed to register DRI event resource type\n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to register DRI event resource type\n");
+        goto out;
     }
 #endif
 
     if ((extEntry = AddExtension(XF86DRINAME,
-				 XF86DRINumberEvents,
-				 XF86DRINumberErrors,
-				 ProcXF86DRIDispatch,
-				 SProcXF86DRIDispatch,
-				 NULL,
-				 StandardMinorOpcode))) {
-	DRIReqCode = (unsigned char)extEntry->base;
-	DRIErrorBase = extEntry->errorBase;
-    } else {
-        EPHYR_LOG_ERROR ("failed to register DRI extension\n") ;
-        goto out ;
+                                 XF86DRINumberEvents,
+                                 XF86DRINumberErrors,
+                                 ProcXF86DRIDispatch,
+                                 SProcXF86DRIDispatch,
+                                 NULL, StandardMinorOpcode))) {
+        DRIReqCode = (unsigned char) extEntry->base;
+        DRIErrorBase = extEntry->errorBase;
+    }
+    else {
+        EPHYR_LOG_ERROR("failed to register DRI extension\n");
+        goto out;
     }
     if (!dixRegisterPrivateKey(&ephyrDRIScreenKeyRec, PRIVATE_SCREEN, 0))
-        goto out ;
+        goto out;
     if (!dixRegisterPrivateKey(&ephyrDRIWindowKeyRec, PRIVATE_WINDOW, 0))
-        goto out ;
-    screen_priv = calloc(1, sizeof (EphyrDRIScreenPrivRec)) ;
+        goto out;
+    screen_priv = calloc(1, sizeof(EphyrDRIScreenPrivRec));
     if (!screen_priv) {
-        EPHYR_LOG_ERROR ("failed to allocate screen_priv\n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to allocate screen_priv\n");
+        goto out;
     }
     dixSetPrivate(&a_screen->devPrivates, ephyrDRIScreenKey, screen_priv);
 
-    if (!ephyrDRIScreenInit (a_screen)) {
-        EPHYR_LOG_ERROR ("ephyrDRIScreenInit() failed\n") ;
-        goto out ;
+    if (!ephyrDRIScreenInit(a_screen)) {
+        EPHYR_LOG_ERROR("ephyrDRIScreenInit() failed\n");
+        goto out;
     }
-    EphyrMirrorHostVisuals (a_screen) ;
-    is_ok=TRUE ;
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+    EphyrMirrorHostVisuals(a_screen);
+    is_ok = TRUE;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.h b/xorg-server/hw/kdrive/ephyr/ephyrdriext.h
index 01c9421fb..5808576fe 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.h
@@ -29,14 +29,12 @@
 #define __EPHYRDRIEXT_H__
 
 typedef struct {
-    WindowPtr local ;
-    int remote ;
+    WindowPtr local;
+    int remote;
 } EphyrWindowPair;
 
-Bool ephyrDRIExtensionInit (ScreenPtr a_screen) ;
+Bool ephyrDRIExtensionInit(ScreenPtr a_screen);
 
-Bool findWindowPairFromRemote (int a_remote,
-			       EphyrWindowPair **a_pair);
+Bool findWindowPairFromRemote(int a_remote, EphyrWindowPair ** a_pair);
 
 #endif /*__EPHYRDRIEXT_H__*/
-
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrglxext.c b/xorg-server/hw/kdrive/ephyr/ephyrglxext.c
index d6b8ca66d..dab028bf3 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrglxext.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrglxext.c
@@ -1,723 +1,711 @@
-/*

- * Xephyr - A kdrive X server thats runs in a host X window.

- *          Authored by Matthew Allum <mallum@openedhand.com>

- * 

- * Copyright © 2007 OpenedHand Ltd 

- *

- * 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 OpenedHand Ltd not be used in

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

- * specific, written prior permission. OpenedHand Ltd makes no

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

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

- *

- * OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL OpenedHand Ltd 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.

- *

- * Authors:

- *    Dodji Seketeli <dodji@openedhand.com>

- */

-#ifdef HAVE_CONFIG_H

-#include <kdrive-config.h>

-#endif

-

-#include "extnsionst.h"

-#include "ephyrglxext.h"

-#include "ephyrhostglx.h"

-#define _HAVE_XALLOC_DECLS

-#include "ephyrlog.h"

-#include <GL/glxproto.h>

-#include "glx/glxserver.h"

-#include "glx/indirect_table.h"

-#include "glx/indirect_util.h"

-#include "glx/unpack.h"

-#include "hostx.h"

-

-

-#ifndef TRUE

-#define TRUE 1

-#endif

-

-#ifndef FALSE

-#define FALSE 0

-#endif

-

-

-int ephyrGLXQueryVersion (__GLXclientState *cl, GLbyte *pc) ;

-int ephyrGLXQueryVersionSwap (__GLXclientState *cl, GLbyte *pc) ;

-int ephyrGLXGetVisualConfigs (__GLXclientState *cl, GLbyte *pc) ;

-int ephyrGLXGetVisualConfigsSwap (__GLXclientState *cl, GLbyte *pc) ;

-int ephyrGLXClientInfo(__GLXclientState *cl, GLbyte *pc) ;

-int ephyrGLXClientInfoSwap(__GLXclientState *cl, GLbyte *pc) ;

-int ephyrGLXQueryServerString(__GLXclientState *a_cl, GLbyte *a_pc) ;

-int ephyrGLXQueryServerStringSwap(__GLXclientState *a_cl, GLbyte *a_pc) ;

-int ephyrGLXGetFBConfigsSGIX (__GLXclientState *a_cl, GLbyte *a_pc);

-int ephyrGLXGetFBConfigsSGIXSwap (__GLXclientState *a_cl, GLbyte *a_pc);

-int ephyrGLXCreateContext (__GLXclientState *a_cl, GLbyte *a_pc);

-int ephyrGLXCreateContextSwap (__GLXclientState *a_cl, GLbyte *a_pc);

-int ephyrGLXDestroyContext (__GLXclientState *a_cl, GLbyte *a_pc) ;

-int ephyrGLXDestroyContextSwap (__GLXclientState *a_cl, GLbyte *a_pc) ;

-int ephyrGLXMakeCurrent (__GLXclientState *a_cl, GLbyte *a_pc) ;

-int ephyrGLXMakeCurrentSwap (__GLXclientState *a_cl, GLbyte *a_pc) ;

-int ephyrGLXGetString (__GLXclientState *a_cl, GLbyte *a_pc) ;

-int ephyrGLXGetStringSwap (__GLXclientState *a_cl, GLbyte *a_pc) ;

-int ephyrGLXGetIntegerv (__GLXclientState *a_cl, GLbyte *a_pc) ;

-int ephyrGLXGetIntegervSwap (__GLXclientState *a_cl, GLbyte *a_pc) ;

-int ephyrGLXIsDirect (__GLXclientState *a_cl, GLbyte *a_pc) ;

-int ephyrGLXIsDirectSwap (__GLXclientState *a_cl, GLbyte *a_pc) ;

-

-Bool

-ephyrHijackGLXExtension (void)

-{

-    const void *(*dispatch_functions)[2];

-

-    if (!hostx_has_glx ()) {

-        EPHYR_LOG ("host X does not have GLX\n") ;

-        return FALSE ;

-    }

-    EPHYR_LOG ("host X does have GLX\n") ;

-

-    if (!Single_dispatch_info.dispatch_functions) {

-        EPHYR_LOG_ERROR ("could not get dispatch functions table\n") ;

-        return FALSE ;

-    }

-    /*

-     * hijack some single entry point dispatch functions

-     */

-    dispatch_functions = Single_dispatch_info.dispatch_functions ;

-    EPHYR_RETURN_VAL_IF_FAIL (dispatch_functions, FALSE) ;

-

-    dispatch_functions[X_GLXQueryVersion][0] = ephyrGLXQueryVersion ;

-    dispatch_functions[X_GLXQueryVersion][1] = ephyrGLXQueryVersionSwap ;

-

-    dispatch_functions[X_GLXGetVisualConfigs][0] = ephyrGLXGetVisualConfigs ;

-    dispatch_functions[X_GLXGetVisualConfigs][1] = ephyrGLXGetVisualConfigsSwap ;

-    dispatch_functions[X_GLXClientInfo][0] = ephyrGLXClientInfo ;

-    dispatch_functions[X_GLXClientInfo][1] = ephyrGLXClientInfoSwap ;

-

-    dispatch_functions[X_GLXQueryServerString][0] = ephyrGLXQueryServerString ;

-    dispatch_functions[X_GLXQueryServerString][1] =

-                                                ephyrGLXQueryServerStringSwap ;

-

-    dispatch_functions[X_GLXCreateContext][0] = ephyrGLXCreateContext ;

-    dispatch_functions[X_GLXCreateContext][1] = ephyrGLXCreateContextSwap ;

-

-    dispatch_functions[X_GLXDestroyContext][0] = ephyrGLXDestroyContext ;

-    dispatch_functions[X_GLXDestroyContext][1] = ephyrGLXDestroyContextSwap ;

-

-    dispatch_functions[X_GLXMakeCurrent][0] = ephyrGLXMakeCurrent ;

-    dispatch_functions[X_GLXMakeCurrent][1] = ephyrGLXMakeCurrentSwap ;

-

-    dispatch_functions[X_GLXIsDirect][0] = ephyrGLXIsDirect ;

-    dispatch_functions[X_GLXIsDirect][1] = ephyrGLXIsDirectSwap ;

-

-    dispatch_functions[73][0] = ephyrGLXGetString ;

-    dispatch_functions[73][1] = ephyrGLXGetStringSwap ;

-

-    dispatch_functions[61][0] = ephyrGLXGetIntegerv ;

-    dispatch_functions[61][1] = ephyrGLXGetIntegervSwap ;

-

-    /*

-     * hijack some vendor priv entry point dispatch functions

-     */

-    dispatch_functions = VendorPriv_dispatch_info.dispatch_functions ;

-    dispatch_functions[92][0] = ephyrGLXGetFBConfigsSGIX;

-    dispatch_functions[92][1] = ephyrGLXGetFBConfigsSGIXSwap;

-    EPHYR_LOG ("hijacked glx entry points to forward requests to host X\n") ;

-

-    return TRUE ;

-}

-

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

- * implementation of

- * hijacked GLX entry

- * points

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

-

-int

-ephyrGLXQueryVersion(__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    ClientPtr client = a_cl->client;

-    xGLXQueryVersionReq *req = (xGLXQueryVersionReq *) a_pc;

-    xGLXQueryVersionReply reply;

-    int major, minor;

-    int res = BadImplementation ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    major = req->majorVersion ;

-    minor = req->minorVersion ;

-

-    if (!ephyrHostGLXQueryVersion (&major, &minor)) {

-        EPHYR_LOG_ERROR ("ephyrHostGLXQueryVersion() failed\n") ;

-        goto out ;

-    }

-    EPHYR_LOG ("major:%d, minor:%d\n",

-                major, minor);

-    reply.majorVersion = major ;

-    reply.minorVersion = minor ;

-    reply.length = 0 ;

-    reply.type = X_Reply ;

-    reply.sequenceNumber = client->sequence ;

-

-    if (client->swapped) {

-        __glXSwapQueryVersionReply(client, &reply);

-    } else {

-        WriteToClient(client, sz_xGLXQueryVersionReply, (char *)&reply);

-    }

-

-    res = Success ;

-out:

-    EPHYR_LOG ("leave\n") ;

-    return res;

-}

-

-int

-ephyrGLXQueryVersionSwap (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    xGLXQueryVersionReq *req = (xGLXQueryVersionReq *) a_pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_SHORT (&req->length);

-    __GLX_SWAP_INT (&req->majorVersion);

-    __GLX_SWAP_INT (&req->minorVersion);

-    return ephyrGLXQueryVersion (a_cl, a_pc) ;

-}

-

-static int

-ephyrGLXGetVisualConfigsReal (__GLXclientState *a_cl,

-                              GLbyte *a_pc,

-                              Bool a_do_swap)

-{

-    xGLXGetVisualConfigsReq *req = (xGLXGetVisualConfigsReq *) a_pc;

-    ClientPtr client = a_cl->client;

-    xGLXGetVisualConfigsReply reply;

-    int32_t *props_buf=NULL, num_visuals=0,

-            num_props=0, res=BadImplementation, i=0,

-            props_per_visual_size=0,

-            props_buf_size=0;

-    __GLX_DECLARE_SWAP_VARIABLES;

-    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;

-

-    EPHYR_LOG ("enter\n") ;

-

-    if (!ephyrHostGLXGetVisualConfigs (req->screen,

-                                       &num_visuals,

-                                       &num_props,

-                                       &props_buf_size,

-                                       &props_buf)) {

-        EPHYR_LOG_ERROR ("ephyrHostGLXGetVisualConfigs() failed\n") ;

-        goto out ;

-    }

-    EPHYR_LOG ("num_visuals:%d, num_props:%d\n", num_visuals, num_props) ;

-

-    reply.numVisuals = num_visuals;

-    reply.numProps = num_props;

-    reply.length = (num_visuals *__GLX_SIZE_CARD32 * num_props) >> 2;

-    reply.type = X_Reply;

-    reply.sequenceNumber = client->sequence;

-

-    if (a_do_swap) {

-        __GLX_SWAP_SHORT(&reply.sequenceNumber);

-        __GLX_SWAP_INT(&reply.length);

-        __GLX_SWAP_INT(&reply.numVisuals);

-        __GLX_SWAP_INT(&reply.numProps);

-        __GLX_SWAP_INT_ARRAY (props_buf, num_props) ;

-    }

-    WriteToClient(client, sz_xGLXGetVisualConfigsReply, (char*)&reply);

-    props_per_visual_size = props_buf_size/num_visuals ;

-    for (i=0; i < num_visuals; i++) {

-        WriteToClient (client,

-                       props_per_visual_size,

-                       (char*)props_buf +i*props_per_visual_size);

-    }

-    res = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    free(props_buf) ;

-    props_buf = NULL ;

-

-    return res ;

-}

-

-static int

-ephyrGLXGetFBConfigsSGIXReal (__GLXclientState *a_cl,

-                              GLbyte *a_pc,

-                              Bool a_do_swap)

-{

-    xGLXGetFBConfigsSGIXReq *req = (xGLXGetFBConfigsSGIXReq *)a_pc;

-    ClientPtr client = a_cl->client;

-    xGLXGetVisualConfigsReply reply;

-    int32_t *props_buf=NULL, num_visuals=0,

-            num_props=0, res=BadImplementation, i=0,

-            props_per_visual_size=0,

-            props_buf_size=0;

-    __GLX_DECLARE_SWAP_VARIABLES;

-    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;

-

-    EPHYR_LOG ("enter\n") ;

-

-    if (!ephyrHostGLXVendorPrivGetFBConfigsSGIX (req->screen,

-                                                 &num_visuals,

-                                                 &num_props,

-                                                 &props_buf_size,

-                                                 &props_buf)) {

-        EPHYR_LOG_ERROR ("ephyrHostGLXGetVisualConfigs() failed\n") ;

-        goto out ;

-    }

-    EPHYR_LOG ("num_visuals:%d, num_props:%d\n", num_visuals, num_props) ;

-

-    reply.numVisuals = num_visuals;

-    reply.numProps = num_props;

-    reply.length = props_buf_size >> 2;

-    reply.type = X_Reply;

-    reply.sequenceNumber = client->sequence;

-

-    if (a_do_swap) {

-        __GLX_SWAP_SHORT(&reply.sequenceNumber);

-        __GLX_SWAP_INT(&reply.length);

-        __GLX_SWAP_INT(&reply.numVisuals);

-        __GLX_SWAP_INT(&reply.numProps);

-        __GLX_SWAP_INT_ARRAY (props_buf, num_props) ;

-    }

-    WriteToClient(client, sz_xGLXGetVisualConfigsReply, (char*)&reply);

-    props_per_visual_size = props_buf_size/num_visuals ;

-    for (i=0; i < num_visuals; i++) {

-        WriteToClient (client,

-                       props_per_visual_size,

-                       &((char*)props_buf)[i*props_per_visual_size]);

-    }

-    res = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    free(props_buf) ;

-    props_buf = NULL ;

-

-    return res ;

-}

-

-int

-ephyrGLXGetVisualConfigs (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXGetVisualConfigsReal (a_cl, a_pc, FALSE) ;

-}

-

-int

-ephyrGLXGetVisualConfigsSwap (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXGetVisualConfigsReal (a_cl, a_pc, TRUE) ;

-}

-

-

-int

-ephyrGLXClientInfo(__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    int res=BadImplementation ;

-    xGLXClientInfoReq *req = (xGLXClientInfoReq *) a_pc;

-

-    EPHYR_LOG ("enter\n") ;

-    if (!ephyrHostGLXSendClientInfo (req->major, req->minor, (char*)req+1)) {

-        EPHYR_LOG_ERROR ("failed to send client info to host\n") ;

-        goto out ;

-    }

-    res = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return res ;

-}

-

-int

-ephyrGLXClientInfoSwap (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    xGLXClientInfoReq *req = (xGLXClientInfoReq *)a_pc;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    __GLX_SWAP_SHORT (&req->length);

-    __GLX_SWAP_INT (&req->major);

-    __GLX_SWAP_INT (&req->minor);

-    __GLX_SWAP_INT (&req->numbytes);

-

-    return ephyrGLXClientInfo (a_cl, a_pc) ;

-}

-

-int

-ephyrGLXQueryServerString(__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    int res = BadImplementation ;

-    ClientPtr client = a_cl->client;

-    xGLXQueryServerStringReq *req = (xGLXQueryServerStringReq *) a_pc;

-    xGLXQueryServerStringReply reply;

-    char *server_string=NULL, *buf=NULL;

-    int length=0 ;

-

-    EPHYR_LOG ("enter\n") ;

-    if (!ephyrHostGLXGetStringFromServer (req->screen,

-                                          req->name,

-                                          EPHYR_HOST_GLX_QueryServerString,

-                                          &server_string)) {

-        EPHYR_LOG_ERROR ("failed to query string from host\n") ;

-        goto out ;

-    }

-    EPHYR_LOG ("string: %s\n", server_string) ;

-    length= strlen (server_string) + 1;

-    reply.type = X_Reply ;

-    reply.sequenceNumber = client->sequence ;

-    reply.length = __GLX_PAD (length) >> 2 ;

-    reply.n = length ;

-    buf = calloc(reply.length << 2, 1);

-    if (!buf) {

-        EPHYR_LOG_ERROR ("failed to allocate string\n;");

-        return BadAlloc;

-    }

-    memcpy (buf, server_string, length);

-

-    WriteToClient(client, sz_xGLXQueryServerStringReply, (char*)&reply);

-    WriteToClient(client, (int)(reply.length << 2), server_string);

-

-    res = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    free(server_string) ;

-    server_string = NULL;

-

-    free(buf);

-    buf = NULL;

-

-    return res ;

-}

-

-int

-ephyrGLXQueryServerStringSwap(__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    EPHYR_LOG_ERROR ("not yet implemented\n") ;

-    return BadImplementation ;

-}

-

-

-int

-ephyrGLXGetFBConfigsSGIX (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXGetFBConfigsSGIXReal (a_cl, a_pc, FALSE) ;

-}

-

-int

-ephyrGLXGetFBConfigsSGIXSwap (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXGetFBConfigsSGIXReal (a_cl, a_pc, TRUE) ;

-}

-

-static int

-ephyrGLXCreateContextReal (xGLXCreateContextReq *a_req, Bool a_do_swap)

-{

-    int res=BadImplementation;

-    EphyrHostWindowAttributes host_w_attrs ;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_req, BadValue) ;

-    EPHYR_LOG ("enter\n") ;

-

-    if (a_do_swap) {

-        __GLX_SWAP_SHORT(&a_req->length);

-        __GLX_SWAP_INT(&a_req->context);

-        __GLX_SWAP_INT(&a_req->visual);

-        __GLX_SWAP_INT(&a_req->screen);

-        __GLX_SWAP_INT(&a_req->shareList);

-    }

-

-    EPHYR_LOG ("context creation requested. localid:%d, "

-               "screen:%d, visual:%d, direct:%d\n",

-               (int)a_req->context, (int)a_req->screen,

-               (int)a_req->visual, (int)a_req->isDirect) ;

-

-    memset (&host_w_attrs, 0, sizeof (host_w_attrs)) ;

-    if (!hostx_get_window_attributes (hostx_get_window (a_req->screen),

-                                      &host_w_attrs)) {

-        EPHYR_LOG_ERROR ("failed to get host window attrs\n") ;

-        goto out ;

-    }

-

-    EPHYR_LOG ("host window visual id: %d\n", host_w_attrs.visualid) ;

-

-    if (!ephyrHostGLXCreateContext (a_req->screen,

-                                    host_w_attrs.visualid,

-                                    a_req->context,

-                                    a_req->shareList,

-                                    a_req->isDirect)) {

-        EPHYR_LOG_ERROR ("ephyrHostGLXCreateContext() failed\n") ;

-        goto out ;

-    }

-    res = Success;

-out:

-    EPHYR_LOG ("leave\n") ;

-    return res ;

-}

-

-int

-ephyrGLXCreateContext (__GLXclientState *cl, GLbyte *pc)

-{

-    xGLXCreateContextReq *req = (xGLXCreateContextReq *) pc;

-

-    return ephyrGLXCreateContextReal (req, FALSE) ;

-}

-

-int ephyrGLXCreateContextSwap (__GLXclientState *cl, GLbyte *pc)

-{

-    xGLXCreateContextReq *req = (xGLXCreateContextReq *) pc;

-    return ephyrGLXCreateContextReal (req, TRUE) ;

-}

-

-static int

-ephyrGLXDestroyContextReal (__GLXclientState *a_cl,

-                            GLbyte *a_pc,

-                            Bool a_do_swap)

-{

-    int res=BadImplementation;

-    ClientPtr client = a_cl->client;

-    xGLXDestroyContextReq *req = (xGLXDestroyContextReq *) a_pc;

-

-    EPHYR_LOG ("enter. id:%d\n", (int)req->context) ;

-    if (!ephyrHostDestroyContext (req->context)) {

-        EPHYR_LOG_ERROR ("ephyrHostDestroyContext() failed\n") ;

-        client->errorValue = req->context ;

-        goto out ;

-    }

-    res = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return res ;

-}

-

-int

-ephyrGLXDestroyContext (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXDestroyContextReal (a_cl, a_pc, FALSE) ;

-}

-

-int

-ephyrGLXDestroyContextSwap (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXDestroyContextReal (a_cl, a_pc, TRUE) ;

-}

-

-static int

-ephyrGLXMakeCurrentReal (__GLXclientState *a_cl, GLbyte *a_pc, Bool a_do_swap)

-{

-    int res=BadImplementation;

-    xGLXMakeCurrentReq *req = (xGLXMakeCurrentReq *) a_pc;

-    xGLXMakeCurrentReply reply ;

-    DrawablePtr drawable=NULL;

-    int rc=0;

-

-    EPHYR_LOG ("enter\n") ;

-    rc = dixLookupDrawable (&drawable,

-                            req->drawable,

-                            a_cl->client,

-                            0,

-                            DixReadAccess);

-    EPHYR_RETURN_VAL_IF_FAIL (drawable, BadValue) ;

-    EPHYR_RETURN_VAL_IF_FAIL (drawable->pScreen, BadValue) ;

-    EPHYR_LOG ("screen nummber requested:%d\n",

-               drawable->pScreen->myNum) ;

-

-    memset (&reply, 0, sizeof (reply)) ;

-    if (!ephyrHostGLXMakeCurrent (hostx_get_window (drawable->pScreen->myNum),

-                                  req->context,

-                                  req->oldContextTag,

-                                  (int*)&reply.contextTag)) {

-        EPHYR_LOG_ERROR ("ephyrHostGLXMakeCurrent() failed\n") ;

-        goto out;

-    }

-    reply.length = 0;

-    reply.type = X_Reply;

-    reply.sequenceNumber = a_cl->client->sequence;

-    if (a_do_swap) {

-        __GLX_DECLARE_SWAP_VARIABLES;

-        __GLX_SWAP_SHORT(&reply.sequenceNumber);

-        __GLX_SWAP_INT(&reply.length);

-        __GLX_SWAP_INT(&reply.contextTag);

-    }

-    WriteToClient(a_cl->client, sz_xGLXMakeCurrentReply, (char *)&reply);

-

-    res = Success ;

-out:

-    EPHYR_LOG ("leave\n") ;

-    return res ;

-}

-

-int

-ephyrGLXMakeCurrent (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXMakeCurrentReal (a_cl, a_pc, FALSE) ;

-}

-

-int

-ephyrGLXMakeCurrentSwap (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXMakeCurrentReal (a_cl, a_pc, TRUE) ;

-}

-

-static int

-ephyrGLXGetStringReal (__GLXclientState *a_cl, GLbyte *a_pc, Bool a_do_swap)

-{

-    ClientPtr client=NULL ;

-    int context_tag=0, name=0, res=BadImplementation, length=0 ;

-    char *string=NULL;

-    __GLX_DECLARE_SWAP_VARIABLES;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_cl && a_pc, BadValue) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    client = a_cl->client ;

-

-    if (a_do_swap) {

-        __GLX_SWAP_INT (a_pc + 4);

-        __GLX_SWAP_INT (a_pc + __GLX_SINGLE_HDR_SIZE);

-    }

-    context_tag = __GLX_GET_SINGLE_CONTEXT_TAG (a_pc) ;

-    a_pc += __GLX_SINGLE_HDR_SIZE;

-    name = *(GLenum*)(a_pc + 0);

-    EPHYR_LOG ("context_tag:%d, name:%d\n", context_tag, name) ;

-    if (!ephyrHostGLXGetStringFromServer (context_tag,

-                                          name,

-                                          EPHYR_HOST_GLX_GetString,

-                                          &string)) {

-        EPHYR_LOG_ERROR ("failed to get string from server\n") ;

-        goto out ;

-    }

-    if (string) {

-        length = strlen (string) + 1;

-        EPHYR_LOG ("got string:'%s', size:%d\n", string, length) ;

-    } else {

-        EPHYR_LOG ("got string: string (null)\n") ;

-    }

-    __GLX_BEGIN_REPLY (length);

-    __GLX_PUT_SIZE (length);

-    __GLX_SEND_HEADER ();

-    if (a_do_swap) {

-        __GLX_SWAP_REPLY_SIZE ();

-        __GLX_SWAP_REPLY_HEADER ();

-    }

-    WriteToClient (client, length, (char *)string);

-

-    res = Success ;

-out:

-    EPHYR_LOG ("leave\n") ;

-    return res ;

-}

-

-int

-ephyrGLXGetString (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXGetStringReal (a_cl, a_pc, FALSE) ;

-}

-

-int

-ephyrGLXGetStringSwap (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXGetStringReal (a_cl, a_pc, TRUE) ;

-}

-

-static int

-ephyrGLXGetIntegervReal (__GLXclientState *a_cl, GLbyte *a_pc, Bool a_do_swap)

-{

-    int res=BadImplementation;

-    xGLXSingleReq * const req = (xGLXSingleReq *) a_pc;

-    GLenum int_name ;

-    int value=0 ;

-    GLint answer_buf_room[200];

-    GLint *buf=NULL ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    a_pc += __GLX_SINGLE_HDR_SIZE;

-

-    int_name = *(GLenum*) (a_pc+0) ;

-    if (!ephyrHostGetIntegerValue (req->contextTag, int_name, &value)) {

-        EPHYR_LOG_ERROR ("ephyrHostGetIntegerValue() failed\n") ;

-        goto out ;

-    }

-    buf = __glXGetAnswerBuffer (a_cl, sizeof (value),

-                                answer_buf_room,

-                                sizeof (answer_buf_room),

-                                4) ;

-

-    if (!buf) {

-        EPHYR_LOG_ERROR ("failed to allocate reply buffer\n") ;

-        res = BadAlloc ;

-        goto out ;

-    }

-    __glXSendReply (a_cl->client, buf, 1, sizeof (value), GL_FALSE, 0) ;

-    res = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return res ;

-}

-

-int

-ephyrGLXGetIntegerv (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXGetIntegervReal (a_cl, a_pc, FALSE) ;

-}

-

-int

-ephyrGLXGetIntegervSwap (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXGetIntegervReal (a_cl, a_pc, TRUE) ;

-}

-

-static int

-ephyrGLXIsDirectReal (__GLXclientState *a_cl, GLbyte *a_pc, Bool a_do_swap)

-{

-    int res=BadImplementation;

-    ClientPtr client = a_cl->client;

-    xGLXIsDirectReq *req = (xGLXIsDirectReq *) a_pc;

-    xGLXIsDirectReply reply;

-    int is_direct=0 ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_cl && a_pc, FALSE) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    memset (&reply, 0, sizeof (reply)) ;

-    if (!ephyrHostIsContextDirect (req->context, (int*)&is_direct)) {

-        EPHYR_LOG_ERROR ("ephyrHostIsContextDirect() failed\n") ;

-        goto out ;

-    }

-    reply.isDirect = is_direct ;

-    reply.length = 0;

-    reply.type = X_Reply;

-    reply.sequenceNumber = client->sequence;

-    WriteToClient(client, sz_xGLXIsDirectReply, (char *)&reply);

-    res = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return res ;

-}

-

-int

-ephyrGLXIsDirect (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXIsDirectReal (a_cl, a_pc, FALSE) ;

-}

-

-int

-ephyrGLXIsDirectSwap (__GLXclientState *a_cl, GLbyte *a_pc)

-{

-    return ephyrGLXIsDirectReal (a_cl, a_pc, TRUE) ;

-}

+/*
+ * Xephyr - A kdrive X server thats runs in a host X window.
+ *          Authored by Matthew Allum <mallum@openedhand.com>
+ * 
+ * Copyright © 2007 OpenedHand Ltd 
+ *
+ * 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 OpenedHand Ltd not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. OpenedHand Ltd makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL OpenedHand Ltd 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.
+ *
+ * Authors:
+ *    Dodji Seketeli <dodji@openedhand.com>
+ */
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+
+#include "extnsionst.h"
+#include "ephyrglxext.h"
+#include "ephyrhostglx.h"
+#define _HAVE_XALLOC_DECLS
+#include "ephyrlog.h"
+#include <GL/glxproto.h>
+#include "glx/glxserver.h"
+#include "glx/indirect_table.h"
+#include "glx/indirect_util.h"
+#include "glx/unpack.h"
+#include "hostx.h"
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+int ephyrGLXQueryVersion(__GLXclientState * cl, GLbyte * pc);
+int ephyrGLXQueryVersionSwap(__GLXclientState * cl, GLbyte * pc);
+int ephyrGLXGetVisualConfigs(__GLXclientState * cl, GLbyte * pc);
+int ephyrGLXGetVisualConfigsSwap(__GLXclientState * cl, GLbyte * pc);
+int ephyrGLXClientInfo(__GLXclientState * cl, GLbyte * pc);
+int ephyrGLXClientInfoSwap(__GLXclientState * cl, GLbyte * pc);
+int ephyrGLXQueryServerString(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXQueryServerStringSwap(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXGetFBConfigsSGIX(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXGetFBConfigsSGIXSwap(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXCreateContext(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXCreateContextSwap(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXDestroyContext(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXDestroyContextSwap(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXMakeCurrent(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXMakeCurrentSwap(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXGetString(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXGetStringSwap(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXGetIntegerv(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXGetIntegervSwap(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXIsDirect(__GLXclientState * a_cl, GLbyte * a_pc);
+int ephyrGLXIsDirectSwap(__GLXclientState * a_cl, GLbyte * a_pc);
+
+Bool
+ephyrHijackGLXExtension(void)
+{
+    const void *(*dispatch_functions)[2];
+
+    if (!hostx_has_glx()) {
+        EPHYR_LOG("host X does not have GLX\n");
+        return FALSE;
+    }
+    EPHYR_LOG("host X does have GLX\n");
+
+    if (!Single_dispatch_info.dispatch_functions) {
+        EPHYR_LOG_ERROR("could not get dispatch functions table\n");
+        return FALSE;
+    }
+    /*
+     * hijack some single entry point dispatch functions
+     */
+    dispatch_functions = Single_dispatch_info.dispatch_functions;
+    EPHYR_RETURN_VAL_IF_FAIL(dispatch_functions, FALSE);
+
+    dispatch_functions[X_GLXQueryVersion][0] = ephyrGLXQueryVersion;
+    dispatch_functions[X_GLXQueryVersion][1] = ephyrGLXQueryVersionSwap;
+
+    dispatch_functions[X_GLXGetVisualConfigs][0] = ephyrGLXGetVisualConfigs;
+    dispatch_functions[X_GLXGetVisualConfigs][1] = ephyrGLXGetVisualConfigsSwap;
+    dispatch_functions[X_GLXClientInfo][0] = ephyrGLXClientInfo;
+    dispatch_functions[X_GLXClientInfo][1] = ephyrGLXClientInfoSwap;
+
+    dispatch_functions[X_GLXQueryServerString][0] = ephyrGLXQueryServerString;
+    dispatch_functions[X_GLXQueryServerString][1] =
+        ephyrGLXQueryServerStringSwap;
+
+    dispatch_functions[X_GLXCreateContext][0] = ephyrGLXCreateContext;
+    dispatch_functions[X_GLXCreateContext][1] = ephyrGLXCreateContextSwap;
+
+    dispatch_functions[X_GLXDestroyContext][0] = ephyrGLXDestroyContext;
+    dispatch_functions[X_GLXDestroyContext][1] = ephyrGLXDestroyContextSwap;
+
+    dispatch_functions[X_GLXMakeCurrent][0] = ephyrGLXMakeCurrent;
+    dispatch_functions[X_GLXMakeCurrent][1] = ephyrGLXMakeCurrentSwap;
+
+    dispatch_functions[X_GLXIsDirect][0] = ephyrGLXIsDirect;
+    dispatch_functions[X_GLXIsDirect][1] = ephyrGLXIsDirectSwap;
+
+    dispatch_functions[73][0] = ephyrGLXGetString;
+    dispatch_functions[73][1] = ephyrGLXGetStringSwap;
+
+    dispatch_functions[61][0] = ephyrGLXGetIntegerv;
+    dispatch_functions[61][1] = ephyrGLXGetIntegervSwap;
+
+    /*
+     * hijack some vendor priv entry point dispatch functions
+     */
+    dispatch_functions = VendorPriv_dispatch_info.dispatch_functions;
+    dispatch_functions[92][0] = ephyrGLXGetFBConfigsSGIX;
+    dispatch_functions[92][1] = ephyrGLXGetFBConfigsSGIXSwap;
+    EPHYR_LOG("hijacked glx entry points to forward requests to host X\n");
+
+    return TRUE;
+}
+
+/*********************
+ * implementation of
+ * hijacked GLX entry
+ * points
+ ********************/
+
+int
+ephyrGLXQueryVersion(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    ClientPtr client = a_cl->client;
+    xGLXQueryVersionReq *req = (xGLXQueryVersionReq *) a_pc;
+    xGLXQueryVersionReply reply;
+    int major, minor;
+    int res = BadImplementation;
+
+    EPHYR_LOG("enter\n");
+
+    major = req->majorVersion;
+    minor = req->minorVersion;
+
+    if (!ephyrHostGLXQueryVersion(&major, &minor)) {
+        EPHYR_LOG_ERROR("ephyrHostGLXQueryVersion() failed\n");
+        goto out;
+    }
+    EPHYR_LOG("major:%d, minor:%d\n", major, minor);
+    reply.majorVersion = major;
+    reply.minorVersion = minor;
+    reply.length = 0;
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+
+    if (client->swapped) {
+        __glXSwapQueryVersionReply(client, &reply);
+    }
+    else {
+        WriteToClient(client, sz_xGLXQueryVersionReply, (char *) &reply);
+    }
+
+    res = Success;
+ out:
+    EPHYR_LOG("leave\n");
+    return res;
+}
+
+int
+ephyrGLXQueryVersionSwap(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    xGLXQueryVersionReq *req = (xGLXQueryVersionReq *) a_pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->majorVersion);
+    __GLX_SWAP_INT(&req->minorVersion);
+    return ephyrGLXQueryVersion(a_cl, a_pc);
+}
+
+static int
+ephyrGLXGetVisualConfigsReal(__GLXclientState * a_cl,
+                             GLbyte * a_pc, Bool a_do_swap)
+{
+    xGLXGetVisualConfigsReq *req = (xGLXGetVisualConfigsReq *) a_pc;
+    ClientPtr client = a_cl->client;
+    xGLXGetVisualConfigsReply reply;
+    int32_t *props_buf = NULL, num_visuals = 0,
+        num_props = 0, res = BadImplementation, i = 0,
+        props_per_visual_size = 0, props_buf_size = 0;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    EPHYR_LOG("enter\n");
+
+    if (!ephyrHostGLXGetVisualConfigs(req->screen,
+                                      &num_visuals,
+                                      &num_props,
+                                      &props_buf_size, &props_buf)) {
+        EPHYR_LOG_ERROR("ephyrHostGLXGetVisualConfigs() failed\n");
+        goto out;
+    }
+    EPHYR_LOG("num_visuals:%d, num_props:%d\n", num_visuals, num_props);
+
+    reply.numVisuals = num_visuals;
+    reply.numProps = num_props;
+    reply.length = (num_visuals * __GLX_SIZE_CARD32 * num_props) >> 2;
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+
+    if (a_do_swap) {
+        __GLX_SWAP_SHORT(&reply.sequenceNumber);
+        __GLX_SWAP_INT(&reply.length);
+        __GLX_SWAP_INT(&reply.numVisuals);
+        __GLX_SWAP_INT(&reply.numProps);
+        __GLX_SWAP_INT_ARRAY(props_buf, num_props);
+    }
+    WriteToClient(client, sz_xGLXGetVisualConfigsReply, (char *) &reply);
+    props_per_visual_size = props_buf_size / num_visuals;
+    for (i = 0; i < num_visuals; i++) {
+        WriteToClient(client,
+                      props_per_visual_size,
+                      (char *) props_buf + i * props_per_visual_size);
+    }
+    res = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    free(props_buf);
+    props_buf = NULL;
+
+    return res;
+}
+
+static int
+ephyrGLXGetFBConfigsSGIXReal(__GLXclientState * a_cl,
+                             GLbyte * a_pc, Bool a_do_swap)
+{
+    xGLXGetFBConfigsSGIXReq *req = (xGLXGetFBConfigsSGIXReq *) a_pc;
+    ClientPtr client = a_cl->client;
+    xGLXGetVisualConfigsReply reply;
+    int32_t *props_buf = NULL, num_visuals = 0,
+        num_props = 0, res = BadImplementation, i = 0,
+        props_per_visual_size = 0, props_buf_size = 0;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+
+    EPHYR_LOG("enter\n");
+
+    if (!ephyrHostGLXVendorPrivGetFBConfigsSGIX(req->screen,
+                                                &num_visuals,
+                                                &num_props,
+                                                &props_buf_size, &props_buf)) {
+        EPHYR_LOG_ERROR("ephyrHostGLXGetVisualConfigs() failed\n");
+        goto out;
+    }
+    EPHYR_LOG("num_visuals:%d, num_props:%d\n", num_visuals, num_props);
+
+    reply.numVisuals = num_visuals;
+    reply.numProps = num_props;
+    reply.length = props_buf_size >> 2;
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+
+    if (a_do_swap) {
+        __GLX_SWAP_SHORT(&reply.sequenceNumber);
+        __GLX_SWAP_INT(&reply.length);
+        __GLX_SWAP_INT(&reply.numVisuals);
+        __GLX_SWAP_INT(&reply.numProps);
+        __GLX_SWAP_INT_ARRAY(props_buf, num_props);
+    }
+    WriteToClient(client, sz_xGLXGetVisualConfigsReply, (char *) &reply);
+    props_per_visual_size = props_buf_size / num_visuals;
+    for (i = 0; i < num_visuals; i++) {
+        WriteToClient(client,
+                      props_per_visual_size,
+                      &((char *) props_buf)[i * props_per_visual_size]);
+    }
+    res = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    free(props_buf);
+    props_buf = NULL;
+
+    return res;
+}
+
+int
+ephyrGLXGetVisualConfigs(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXGetVisualConfigsReal(a_cl, a_pc, FALSE);
+}
+
+int
+ephyrGLXGetVisualConfigsSwap(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXGetVisualConfigsReal(a_cl, a_pc, TRUE);
+}
+
+int
+ephyrGLXClientInfo(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    int res = BadImplementation;
+    xGLXClientInfoReq *req = (xGLXClientInfoReq *) a_pc;
+
+    EPHYR_LOG("enter\n");
+    if (!ephyrHostGLXSendClientInfo(req->major, req->minor, (char *) req + 1)) {
+        EPHYR_LOG_ERROR("failed to send client info to host\n");
+        goto out;
+    }
+    res = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return res;
+}
+
+int
+ephyrGLXClientInfoSwap(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    xGLXClientInfoReq *req = (xGLXClientInfoReq *) a_pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->major);
+    __GLX_SWAP_INT(&req->minor);
+    __GLX_SWAP_INT(&req->numbytes);
+
+    return ephyrGLXClientInfo(a_cl, a_pc);
+}
+
+int
+ephyrGLXQueryServerString(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    int res = BadImplementation;
+    ClientPtr client = a_cl->client;
+    xGLXQueryServerStringReq *req = (xGLXQueryServerStringReq *) a_pc;
+    xGLXQueryServerStringReply reply;
+    char *server_string = NULL, *buf = NULL;
+    int length = 0;
+
+    EPHYR_LOG("enter\n");
+    if (!ephyrHostGLXGetStringFromServer(req->screen,
+                                         req->name,
+                                         EPHYR_HOST_GLX_QueryServerString,
+                                         &server_string)) {
+        EPHYR_LOG_ERROR("failed to query string from host\n");
+        goto out;
+    }
+    EPHYR_LOG("string: %s\n", server_string);
+    length = strlen(server_string) + 1;
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = __GLX_PAD(length) >> 2;
+    reply.n = length;
+    buf = calloc(reply.length << 2, 1);
+    if (!buf) {
+        EPHYR_LOG_ERROR("failed to allocate string\n;");
+        return BadAlloc;
+    }
+    memcpy(buf, server_string, length);
+
+    WriteToClient(client, sz_xGLXQueryServerStringReply, (char *) &reply);
+    WriteToClient(client, (int) (reply.length << 2), server_string);
+
+    res = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    free(server_string);
+    server_string = NULL;
+
+    free(buf);
+    buf = NULL;
+
+    return res;
+}
+
+int
+ephyrGLXQueryServerStringSwap(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    EPHYR_LOG_ERROR("not yet implemented\n");
+    return BadImplementation;
+}
+
+int
+ephyrGLXGetFBConfigsSGIX(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXGetFBConfigsSGIXReal(a_cl, a_pc, FALSE);
+}
+
+int
+ephyrGLXGetFBConfigsSGIXSwap(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXGetFBConfigsSGIXReal(a_cl, a_pc, TRUE);
+}
+
+static int
+ephyrGLXCreateContextReal(xGLXCreateContextReq * a_req, Bool a_do_swap)
+{
+    int res = BadImplementation;
+    EphyrHostWindowAttributes host_w_attrs;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_req, BadValue);
+    EPHYR_LOG("enter\n");
+
+    if (a_do_swap) {
+        __GLX_SWAP_SHORT(&a_req->length);
+        __GLX_SWAP_INT(&a_req->context);
+        __GLX_SWAP_INT(&a_req->visual);
+        __GLX_SWAP_INT(&a_req->screen);
+        __GLX_SWAP_INT(&a_req->shareList);
+    }
+
+    EPHYR_LOG("context creation requested. localid:%d, "
+              "screen:%d, visual:%d, direct:%d\n",
+              (int) a_req->context, (int) a_req->screen,
+              (int) a_req->visual, (int) a_req->isDirect);
+
+    memset(&host_w_attrs, 0, sizeof(host_w_attrs));
+    if (!hostx_get_window_attributes(hostx_get_window(a_req->screen),
+                                     &host_w_attrs)) {
+        EPHYR_LOG_ERROR("failed to get host window attrs\n");
+        goto out;
+    }
+
+    EPHYR_LOG("host window visual id: %d\n", host_w_attrs.visualid);
+
+    if (!ephyrHostGLXCreateContext(a_req->screen,
+                                   host_w_attrs.visualid,
+                                   a_req->context,
+                                   a_req->shareList, a_req->isDirect)) {
+        EPHYR_LOG_ERROR("ephyrHostGLXCreateContext() failed\n");
+        goto out;
+    }
+    res = Success;
+ out:
+    EPHYR_LOG("leave\n");
+    return res;
+}
+
+int
+ephyrGLXCreateContext(__GLXclientState * cl, GLbyte * pc)
+{
+    xGLXCreateContextReq *req = (xGLXCreateContextReq *) pc;
+
+    return ephyrGLXCreateContextReal(req, FALSE);
+}
+
+int
+ephyrGLXCreateContextSwap(__GLXclientState * cl, GLbyte * pc)
+{
+    xGLXCreateContextReq *req = (xGLXCreateContextReq *) pc;
+
+    return ephyrGLXCreateContextReal(req, TRUE);
+}
+
+static int
+ephyrGLXDestroyContextReal(__GLXclientState * a_cl,
+                           GLbyte * a_pc, Bool a_do_swap)
+{
+    int res = BadImplementation;
+    ClientPtr client = a_cl->client;
+    xGLXDestroyContextReq *req = (xGLXDestroyContextReq *) a_pc;
+
+    EPHYR_LOG("enter. id:%d\n", (int) req->context);
+    if (!ephyrHostDestroyContext(req->context)) {
+        EPHYR_LOG_ERROR("ephyrHostDestroyContext() failed\n");
+        client->errorValue = req->context;
+        goto out;
+    }
+    res = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return res;
+}
+
+int
+ephyrGLXDestroyContext(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXDestroyContextReal(a_cl, a_pc, FALSE);
+}
+
+int
+ephyrGLXDestroyContextSwap(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXDestroyContextReal(a_cl, a_pc, TRUE);
+}
+
+static int
+ephyrGLXMakeCurrentReal(__GLXclientState * a_cl, GLbyte * a_pc, Bool a_do_swap)
+{
+    int res = BadImplementation;
+    xGLXMakeCurrentReq *req = (xGLXMakeCurrentReq *) a_pc;
+    xGLXMakeCurrentReply reply;
+    DrawablePtr drawable = NULL;
+    int rc = 0;
+
+    EPHYR_LOG("enter\n");
+    rc = dixLookupDrawable(&drawable,
+                           req->drawable, a_cl->client, 0, DixReadAccess);
+    EPHYR_RETURN_VAL_IF_FAIL(drawable, BadValue);
+    EPHYR_RETURN_VAL_IF_FAIL(drawable->pScreen, BadValue);
+    EPHYR_LOG("screen nummber requested:%d\n", drawable->pScreen->myNum);
+
+    memset(&reply, 0, sizeof(reply));
+    if (!ephyrHostGLXMakeCurrent(hostx_get_window(drawable->pScreen->myNum),
+                                 req->context,
+                                 req->oldContextTag,
+                                 (int *) &reply.contextTag)) {
+        EPHYR_LOG_ERROR("ephyrHostGLXMakeCurrent() failed\n");
+        goto out;
+    }
+    reply.length = 0;
+    reply.type = X_Reply;
+    reply.sequenceNumber = a_cl->client->sequence;
+    if (a_do_swap) {
+        __GLX_DECLARE_SWAP_VARIABLES;
+        __GLX_SWAP_SHORT(&reply.sequenceNumber);
+        __GLX_SWAP_INT(&reply.length);
+        __GLX_SWAP_INT(&reply.contextTag);
+    }
+    WriteToClient(a_cl->client, sz_xGLXMakeCurrentReply, (char *) &reply);
+
+    res = Success;
+ out:
+    EPHYR_LOG("leave\n");
+    return res;
+}
+
+int
+ephyrGLXMakeCurrent(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXMakeCurrentReal(a_cl, a_pc, FALSE);
+}
+
+int
+ephyrGLXMakeCurrentSwap(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXMakeCurrentReal(a_cl, a_pc, TRUE);
+}
+
+static int
+ephyrGLXGetStringReal(__GLXclientState * a_cl, GLbyte * a_pc, Bool a_do_swap)
+{
+    ClientPtr client = NULL;
+    int context_tag = 0, name = 0, res = BadImplementation, length = 0;
+    char *string = NULL;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_cl && a_pc, BadValue);
+
+    EPHYR_LOG("enter\n");
+
+    client = a_cl->client;
+
+    if (a_do_swap) {
+        __GLX_SWAP_INT(a_pc + 4);
+        __GLX_SWAP_INT(a_pc + __GLX_SINGLE_HDR_SIZE);
+    }
+    context_tag = __GLX_GET_SINGLE_CONTEXT_TAG(a_pc);
+    a_pc += __GLX_SINGLE_HDR_SIZE;
+    name = *(GLenum *) (a_pc + 0);
+    EPHYR_LOG("context_tag:%d, name:%d\n", context_tag, name);
+    if (!ephyrHostGLXGetStringFromServer(context_tag,
+                                         name,
+                                         EPHYR_HOST_GLX_GetString, &string)) {
+        EPHYR_LOG_ERROR("failed to get string from server\n");
+        goto out;
+    }
+    if (string) {
+        length = strlen(string) + 1;
+        EPHYR_LOG("got string:'%s', size:%d\n", string, length);
+    }
+    else {
+        EPHYR_LOG("got string: string (null)\n");
+    }
+    __GLX_BEGIN_REPLY(length);
+    __GLX_PUT_SIZE(length);
+    __GLX_SEND_HEADER();
+    if (a_do_swap) {
+        __GLX_SWAP_REPLY_SIZE();
+        __GLX_SWAP_REPLY_HEADER();
+    }
+    WriteToClient(client, length, (char *) string);
+
+    res = Success;
+ out:
+    EPHYR_LOG("leave\n");
+    return res;
+}
+
+int
+ephyrGLXGetString(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXGetStringReal(a_cl, a_pc, FALSE);
+}
+
+int
+ephyrGLXGetStringSwap(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXGetStringReal(a_cl, a_pc, TRUE);
+}
+
+static int
+ephyrGLXGetIntegervReal(__GLXclientState * a_cl, GLbyte * a_pc, Bool a_do_swap)
+{
+    int res = BadImplementation;
+    xGLXSingleReq *const req = (xGLXSingleReq *) a_pc;
+    GLenum int_name;
+    int value = 0;
+    GLint answer_buf_room[200];
+    GLint *buf = NULL;
+
+    EPHYR_LOG("enter\n");
+
+    a_pc += __GLX_SINGLE_HDR_SIZE;
+
+    int_name = *(GLenum *) (a_pc + 0);
+    if (!ephyrHostGetIntegerValue(req->contextTag, int_name, &value)) {
+        EPHYR_LOG_ERROR("ephyrHostGetIntegerValue() failed\n");
+        goto out;
+    }
+    buf = __glXGetAnswerBuffer(a_cl, sizeof(value),
+                               answer_buf_room, sizeof(answer_buf_room), 4);
+
+    if (!buf) {
+        EPHYR_LOG_ERROR("failed to allocate reply buffer\n");
+        res = BadAlloc;
+        goto out;
+    }
+    __glXSendReply(a_cl->client, buf, 1, sizeof(value), GL_FALSE, 0);
+    res = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return res;
+}
+
+int
+ephyrGLXGetIntegerv(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXGetIntegervReal(a_cl, a_pc, FALSE);
+}
+
+int
+ephyrGLXGetIntegervSwap(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXGetIntegervReal(a_cl, a_pc, TRUE);
+}
+
+static int
+ephyrGLXIsDirectReal(__GLXclientState * a_cl, GLbyte * a_pc, Bool a_do_swap)
+{
+    int res = BadImplementation;
+    ClientPtr client = a_cl->client;
+    xGLXIsDirectReq *req = (xGLXIsDirectReq *) a_pc;
+    xGLXIsDirectReply reply;
+    int is_direct = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_cl && a_pc, FALSE);
+
+    EPHYR_LOG("enter\n");
+
+    memset(&reply, 0, sizeof(reply));
+    if (!ephyrHostIsContextDirect(req->context, (int *) &is_direct)) {
+        EPHYR_LOG_ERROR("ephyrHostIsContextDirect() failed\n");
+        goto out;
+    }
+    reply.isDirect = is_direct;
+    reply.length = 0;
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    WriteToClient(client, sz_xGLXIsDirectReply, (char *) &reply);
+    res = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return res;
+}
+
+int
+ephyrGLXIsDirect(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXIsDirectReal(a_cl, a_pc, FALSE);
+}
+
+int
+ephyrGLXIsDirectSwap(__GLXclientState * a_cl, GLbyte * a_pc)
+{
+    return ephyrGLXIsDirectReal(a_cl, a_pc, TRUE);
+}
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c b/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c
index 728687b46..6b9da6fb1 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c
@@ -56,79 +56,76 @@ enum VisualConfRequestType {
     EPHYR_GET_FB_CONFIG,
     EPHYR_VENDOR_PRIV_GET_FB_CONFIG_SGIX,
     EPHYR_GET_VISUAL_CONFIGS
-
 };
 
 static Bool ephyrHostGLXGetVisualConfigsInternal
-                                        (enum VisualConfRequestType a_type,
-                                         int32_t a_screen,
-                                         int32_t *a_num_visuals,
-                                         int32_t *a_num_props,
-                                         int32_t *a_props_buf_size,
-                                         int32_t **a_props_buf);
+    (enum VisualConfRequestType a_type,
+     int32_t a_screen,
+     int32_t * a_num_visuals,
+     int32_t * a_num_props, int32_t * a_props_buf_size, int32_t ** a_props_buf);
 Bool
-ephyrHostGLXGetMajorOpcode (int *a_opcode)
+ephyrHostGLXGetMajorOpcode(int *a_opcode)
 {
-    Bool is_ok=FALSE ;
-    Display *dpy=hostx_get_display () ;
-    static int opcode ;
-    int first_event_return=0, first_error_return=0;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
+    static int opcode;
+    int first_event_return = 0, first_error_return = 0;
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
+    EPHYR_LOG("enter\n");
     if (!opcode) {
-        if (!XQueryExtension (dpy, GLX_EXTENSION_NAME, &opcode,
-                              &first_event_return, &first_error_return)) {
-            EPHYR_LOG_ERROR ("XQueryExtension() failed\n") ;
-            goto out ;
+        if (!XQueryExtension(dpy, GLX_EXTENSION_NAME, &opcode,
+                             &first_event_return, &first_error_return)) {
+            EPHYR_LOG_ERROR("XQueryExtension() failed\n");
+            goto out;
         }
     }
-    *a_opcode = opcode ;
-    is_ok = TRUE ;
-out:
-    EPHYR_LOG ("release\n") ;
-    return is_ok ;
+    *a_opcode = opcode;
+    is_ok = TRUE;
+ out:
+    EPHYR_LOG("release\n");
+    return is_ok;
 }
 
 Bool
-ephyrHostGLXQueryVersion (int *a_major, int *a_minor)
+ephyrHostGLXQueryVersion(int *a_major, int *a_minor)
 {
-    Bool is_ok = FALSE ;
-    Display *dpy = hostx_get_display () ;
-    int major_opcode=0;
-    xGLXQueryVersionReq *req=NULL;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
+    int major_opcode = 0;
+    xGLXQueryVersionReq *req = NULL;
     xGLXQueryVersionReply reply;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_major && a_minor, FALSE) ;
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_major && a_minor, FALSE);
+    EPHYR_LOG("enter\n");
 
-    if (!ephyrHostGLXGetMajorOpcode (&major_opcode)) {
-        EPHYR_LOG_ERROR ("failed to get major opcode\n") ;
-        goto out ;
+    if (!ephyrHostGLXGetMajorOpcode(&major_opcode)) {
+        EPHYR_LOG_ERROR("failed to get major opcode\n");
+        goto out;
     }
-    EPHYR_LOG ("major opcode: %d\n", major_opcode) ;
+    EPHYR_LOG("major opcode: %d\n", major_opcode);
 
     /* Send the glXQueryVersion request */
-    memset (&reply, 0, sizeof (reply)) ;
-    LockDisplay (dpy);
-    GetReq (GLXQueryVersion, req);
+    memset(&reply, 0, sizeof(reply));
+    LockDisplay(dpy);
+    GetReq(GLXQueryVersion, req);
     req->reqType = major_opcode;
     req->glxCode = X_GLXQueryVersion;
     req->majorVersion = 2;
     req->minorVersion = 1;
-    _XReply(dpy, (xReply*) &reply, 0, False);
-    UnlockDisplay (dpy);
-    SyncHandle ();
+    _XReply(dpy, (xReply *) & reply, 0, False);
+    UnlockDisplay(dpy);
+    SyncHandle();
 
-    *a_major = reply.majorVersion ;
-    *a_minor = reply.minorVersion ;
+    *a_major = reply.majorVersion;
+    *a_minor = reply.minorVersion;
 
-    EPHYR_LOG ("major:%d, minor:%d\n", *a_major, *a_minor) ;
+    EPHYR_LOG("major:%d, minor:%d\n", *a_major, *a_minor);
 
-    is_ok = TRUE ;
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+    is_ok = TRUE;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 /**
@@ -154,165 +151,161 @@ typedef struct GLXGenericGetString {
 #define X_GLXGenericGetString 0
 
 Bool
-ephyrHostGLXGetStringFromServer (int a_screen_number,
-                                 int a_string_name,
-                                 enum EphyrHostGLXGetStringOps a_op,
-                                 char **a_string)
+ephyrHostGLXGetStringFromServer(int a_screen_number,
+                                int a_string_name,
+                                enum EphyrHostGLXGetStringOps a_op,
+                                char **a_string)
 {
-    Bool is_ok=FALSE ;
-    Display *dpy = hostx_get_display () ;
-    int default_screen = DefaultScreen (dpy);
-    xGLXGenericGetStringReq *req=NULL;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
+    int default_screen = DefaultScreen(dpy);
+    xGLXGenericGetStringReq *req = NULL;
     xGLXSingleReply reply;
-    int length=0, numbytes=0, major_opcode=0, get_string_op=0;
+    int length = 0, numbytes = 0, major_opcode = 0, get_string_op = 0;
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_string, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy && a_string, FALSE);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
     switch (a_op) {
-        case EPHYR_HOST_GLX_QueryServerString:
-            get_string_op = X_GLXQueryServerString;
-            break ;
-        case EPHYR_HOST_GLX_GetString:
-            get_string_op = X_GLsop_GetString;
-            EPHYR_LOG ("Going to glXGetString. strname:%#x, ctxttag:%d\n",
-                       a_string_name, a_screen_number) ;
-            break ;
-        default:
-            EPHYR_LOG_ERROR ("unknown EphyrHostGLXGetStringOp:%d\n", a_op) ;
-            goto out ;
+    case EPHYR_HOST_GLX_QueryServerString:
+        get_string_op = X_GLXQueryServerString;
+        break;
+    case EPHYR_HOST_GLX_GetString:
+        get_string_op = X_GLsop_GetString;
+        EPHYR_LOG("Going to glXGetString. strname:%#x, ctxttag:%d\n",
+                  a_string_name, a_screen_number);
+        break;
+    default:
+        EPHYR_LOG_ERROR("unknown EphyrHostGLXGetStringOp:%d\n", a_op);
+        goto out;
     }
 
-    if (!ephyrHostGLXGetMajorOpcode (&major_opcode)) {
-        EPHYR_LOG_ERROR ("failed to get major opcode\n") ;
-        goto out ;
+    if (!ephyrHostGLXGetMajorOpcode(&major_opcode)) {
+        EPHYR_LOG_ERROR("failed to get major opcode\n");
+        goto out;
     }
-    EPHYR_LOG ("major opcode: %d\n", major_opcode) ;
+    EPHYR_LOG("major opcode: %d\n", major_opcode);
 
-    LockDisplay (dpy);
+    LockDisplay(dpy);
 
     /* All of the GLX protocol requests for getting a string from the server
      * look the same.  The exact meaning of the a_for_whom field is usually
      * either the screen number (for glXQueryServerString) or the context tag
      * (for GLXSingle).
      */
-    GetReq (GLXGenericGetString, req);
+    GetReq(GLXGenericGetString, req);
     req->reqType = major_opcode;
     req->glxCode = get_string_op;
     req->for_whom = default_screen;
     req->name = a_string_name;
 
-    _XReply (dpy, (xReply *)&reply, 0, False);
+    _XReply(dpy, (xReply *) & reply, 0, False);
 
     length = reply.length * 4;
     if (!length) {
         numbytes = 0;
-    } else {
+    }
+    else {
         numbytes = reply.size;
     }
-    EPHYR_LOG ("going to get a string of size:%d\n", numbytes) ;
+    EPHYR_LOG("going to get a string of size:%d\n", numbytes);
 
-    *a_string = (char *) Xmalloc (numbytes +1);
+    *a_string = (char *) Xmalloc(numbytes + 1);
     if (!a_string) {
-        EPHYR_LOG_ERROR ("allocation failed\n") ;
+        EPHYR_LOG_ERROR("allocation failed\n");
         goto out;
     }
 
-    memset (*a_string, 0, numbytes+1) ;
-    if (_XRead (dpy, *a_string, numbytes)) {
-        UnlockDisplay (dpy);
-        SyncHandle ();
-        EPHYR_LOG_ERROR ("read failed\n") ;
-        goto out ;
+    memset(*a_string, 0, numbytes + 1);
+    if (_XRead(dpy, *a_string, numbytes)) {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        EPHYR_LOG_ERROR("read failed\n");
+        goto out;
     }
     length -= numbytes;
-    _XEatData (dpy, length) ;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    EPHYR_LOG ("strname:%#x, strvalue:'%s', strlen:%d\n",
-               a_string_name, *a_string, numbytes) ;
-
-    is_ok = TRUE ;
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+    _XEatData(dpy, length);
+    UnlockDisplay(dpy);
+    SyncHandle();
+    EPHYR_LOG("strname:%#x, strvalue:'%s', strlen:%d\n",
+              a_string_name, *a_string, numbytes);
+
+    is_ok = TRUE;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 static Bool
-ephyrHostGLXGetVisualConfigsInternal (enum VisualConfRequestType a_type,
-                                      int32_t a_screen,
-                                      int32_t *a_num_visuals,
-                                      int32_t *a_num_props,
-                                      int32_t *a_props_buf_size,
-                                      int32_t **a_props_buf)
+ephyrHostGLXGetVisualConfigsInternal(enum VisualConfRequestType a_type,
+                                     int32_t a_screen,
+                                     int32_t * a_num_visuals,
+                                     int32_t * a_num_props,
+                                     int32_t * a_props_buf_size,
+                                     int32_t ** a_props_buf)
 {
-    Bool is_ok = FALSE ;
-    Display *dpy = hostx_get_display () ;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
     xGLXGetVisualConfigsReq *req;
     xGLXGetFBConfigsReq *fb_req;
     xGLXVendorPrivateWithReplyReq *vpreq;
     xGLXGetFBConfigsSGIXReq *sgi_req;
     xGLXGetVisualConfigsReply reply;
-    char *server_glx_version=NULL,
-         *server_glx_extensions=NULL ;
-    int j=0,
-        screens=0,
-        major_opcode=0,
-        num_props=0,
-        num_visuals=0,
-        props_buf_size=0,
-        props_per_visual_size=0;
-    int32_t *props_buf=NULL;
-
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
-
-    screens = ScreenCount (dpy);
-    if (!ephyrHostGLXGetMajorOpcode (&major_opcode)) {
-        EPHYR_LOG_ERROR ("failed to get opcode\n") ;
-        goto out ;
+    char *server_glx_version = NULL, *server_glx_extensions = NULL;
+    int j = 0,
+        screens = 0,
+        major_opcode = 0,
+        num_props = 0,
+        num_visuals = 0, props_buf_size = 0, props_per_visual_size = 0;
+    int32_t *props_buf = NULL;
+
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
+
+    screens = ScreenCount(dpy);
+    if (!ephyrHostGLXGetMajorOpcode(&major_opcode)) {
+        EPHYR_LOG_ERROR("failed to get opcode\n");
+        goto out;
     }
 
     LockDisplay(dpy);
     switch (a_type) {
-        case EPHYR_GET_FB_CONFIG:
-        GetReq(GLXGetFBConfigs,fb_req);
+    case EPHYR_GET_FB_CONFIG:
+        GetReq(GLXGetFBConfigs, fb_req);
         fb_req->reqType = major_opcode;
         fb_req->glxCode = X_GLXGetFBConfigs;
-        fb_req->screen = DefaultScreen (dpy);
+        fb_req->screen = DefaultScreen(dpy);
         break;
 
-        case EPHYR_VENDOR_PRIV_GET_FB_CONFIG_SGIX:
+    case EPHYR_VENDOR_PRIV_GET_FB_CONFIG_SGIX:
         GetReqExtra(GLXVendorPrivateWithReply,
                     sz_xGLXGetFBConfigsSGIXReq
-                         -
-                    sz_xGLXVendorPrivateWithReplyReq,
-                    vpreq);
+                    - sz_xGLXVendorPrivateWithReplyReq, vpreq);
         sgi_req = (xGLXGetFBConfigsSGIXReq *) vpreq;
         sgi_req->reqType = major_opcode;
         sgi_req->glxCode = X_GLXVendorPrivateWithReply;
         sgi_req->vendorCode = X_GLXvop_GetFBConfigsSGIX;
-        sgi_req->screen = DefaultScreen (dpy);
+        sgi_req->screen = DefaultScreen(dpy);
         break;
 
-        case EPHYR_GET_VISUAL_CONFIGS:
-        GetReq(GLXGetVisualConfigs,req);
+    case EPHYR_GET_VISUAL_CONFIGS:
+        GetReq(GLXGetVisualConfigs, req);
         req->reqType = major_opcode;
         req->glxCode = X_GLXGetVisualConfigs;
-        req->screen = DefaultScreen (dpy);
+        req->screen = DefaultScreen(dpy);
         break;
     }
 
-    if (!_XReply(dpy, (xReply*) &reply, 0, False)) {
-        EPHYR_LOG_ERROR ("unknown error\n") ;
+    if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+        EPHYR_LOG_ERROR("unknown error\n");
         UnlockDisplay(dpy);
-        goto out ;
+        goto out;
     }
-   if (!reply.numVisuals) {
-        EPHYR_LOG_ERROR ("screen does not support GL rendering\n") ;
+    if (!reply.numVisuals) {
+        EPHYR_LOG_ERROR("screen does not support GL rendering\n");
         UnlockDisplay(dpy);
-        goto out ;
+        goto out;
     }
-   num_visuals = reply.numVisuals ;
+    num_visuals = reply.numVisuals;
 
     /* FIXME: Is the __GLX_MIN_CONFIG_PROPS test correct for
      * FIXME: FBconfigs? 
@@ -322,9 +315,9 @@ ephyrHostGLXGetVisualConfigsInternal (enum VisualConfRequestType a_type,
     if ((num_props < __GLX_MIN_CONFIG_PROPS) ||
         (num_props > __GLX_MAX_CONFIG_PROPS)) {
         /* Huh?  Not in protocol defined limits.  Punt */
-        EPHYR_LOG_ERROR ("got a bad reply to request\n") ;
+        EPHYR_LOG_ERROR("got a bad reply to request\n");
         UnlockDisplay(dpy);
-        goto out ;
+        goto out;
     }
 
     if (a_type != EPHYR_GET_VISUAL_CONFIGS) {
@@ -332,250 +325,242 @@ ephyrHostGLXGetVisualConfigsInternal (enum VisualConfRequestType a_type,
     }
     props_per_visual_size = num_props * __GLX_SIZE_INT32;
     props_buf_size = props_per_visual_size * reply.numVisuals;
-    props_buf = malloc (props_buf_size) ;
+    props_buf = malloc(props_buf_size);
     for (j = 0; j < reply.numVisuals; j++) {
-        if (_XRead (dpy,
-                    &((char*)props_buf)[j*props_per_visual_size],
-                    props_per_visual_size) != Success) {
-            EPHYR_LOG_ERROR ("read failed\n") ;
+        if (_XRead(dpy,
+                   &((char *) props_buf)[j * props_per_visual_size],
+                   props_per_visual_size) != Success) {
+            EPHYR_LOG_ERROR("read failed\n");
         }
     }
     UnlockDisplay(dpy);
 
-    *a_num_visuals = num_visuals ;
-    *a_num_props = reply.numProps ;
-    *a_props_buf_size = props_buf_size ;
-    *a_props_buf = props_buf ;
-    is_ok = TRUE ;
+    *a_num_visuals = num_visuals;
+    *a_num_props = reply.numProps;
+    *a_props_buf_size = props_buf_size;
+    *a_props_buf = props_buf;
+    is_ok = TRUE;
 
-out:
+ out:
     if (server_glx_version) {
-        XFree (server_glx_version) ;
-        server_glx_version = NULL ;
+        XFree(server_glx_version);
+        server_glx_version = NULL;
     }
     if (server_glx_extensions) {
-        XFree (server_glx_extensions) ;
-        server_glx_extensions = NULL ;
+        XFree(server_glx_extensions);
+        server_glx_extensions = NULL;
     }
-    SyncHandle () ;
+    SyncHandle();
     return is_ok;
 }
 
 Bool
-ephyrHostGLXGetVisualConfigs (int32_t a_screen,
-                              int32_t *a_num_visuals,
-                              int32_t *a_num_props,
-                              int32_t *a_props_buf_size,
-                              int32_t **a_props_buf)
+ephyrHostGLXGetVisualConfigs(int32_t a_screen,
+                             int32_t * a_num_visuals,
+                             int32_t * a_num_props,
+                             int32_t * a_props_buf_size, int32_t ** a_props_buf)
 {
     Bool is_ok = FALSE;
 
-    EPHYR_LOG ("enter\n") ;
-    is_ok = ephyrHostGLXGetVisualConfigsInternal (EPHYR_GET_VISUAL_CONFIGS,
-                                                  a_screen,
-                                                  a_num_visuals,
-                                                  a_num_props,
-                                                  a_props_buf_size,
-                                                  a_props_buf) ;
+    EPHYR_LOG("enter\n");
+    is_ok = ephyrHostGLXGetVisualConfigsInternal(EPHYR_GET_VISUAL_CONFIGS,
+                                                 a_screen,
+                                                 a_num_visuals,
+                                                 a_num_props,
+                                                 a_props_buf_size, a_props_buf);
 
-    EPHYR_LOG ("leave:%d\n", is_ok) ;
+    EPHYR_LOG("leave:%d\n", is_ok);
     return is_ok;
 }
 
 Bool
-ephyrHostGLXVendorPrivGetFBConfigsSGIX (int a_screen,
-                                        int32_t *a_num_visuals,
-                                        int32_t *a_num_props,
-                                        int32_t *a_props_buf_size,
-                                        int32_t **a_props_buf)
+ephyrHostGLXVendorPrivGetFBConfigsSGIX(int a_screen,
+                                       int32_t * a_num_visuals,
+                                       int32_t * a_num_props,
+                                       int32_t * a_props_buf_size,
+                                       int32_t ** a_props_buf)
 {
-    Bool is_ok=FALSE ;
-    EPHYR_LOG ("enter\n") ;
+    Bool is_ok = FALSE;
+
+    EPHYR_LOG("enter\n");
     is_ok = ephyrHostGLXGetVisualConfigsInternal
-                                        (EPHYR_VENDOR_PRIV_GET_FB_CONFIG_SGIX,
-                                         a_screen,
-                                         a_num_visuals,
-                                         a_num_props,
-                                         a_props_buf_size,
-                                         a_props_buf) ;
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+        (EPHYR_VENDOR_PRIV_GET_FB_CONFIG_SGIX,
+         a_screen, a_num_visuals, a_num_props, a_props_buf_size, a_props_buf);
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 Bool
-ephyrHostGLXSendClientInfo (int32_t a_major, int32_t a_minor,
-                            const char* a_extension_list)
+ephyrHostGLXSendClientInfo(int32_t a_major, int32_t a_minor,
+                           const char *a_extension_list)
 {
-    Bool is_ok = FALSE ;
-    Display *dpy = hostx_get_display () ;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
     xGLXClientInfoReq *req;
     int size;
-    int32_t major_opcode=0 ;
+    int32_t major_opcode = 0;
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_extension_list, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy && a_extension_list, FALSE);
 
-    if (!ephyrHostGLXGetMajorOpcode (&major_opcode)) {
-        EPHYR_LOG_ERROR ("failed to get major opcode\n") ;
-        goto out ;
+    if (!ephyrHostGLXGetMajorOpcode(&major_opcode)) {
+        EPHYR_LOG_ERROR("failed to get major opcode\n");
+        goto out;
     }
 
-    LockDisplay (dpy);
+    LockDisplay(dpy);
 
-    GetReq (GLXClientInfo,req);
+    GetReq(GLXClientInfo, req);
     req->reqType = major_opcode;
     req->glxCode = X_GLXClientInfo;
     req->major = a_major;
     req->minor = a_minor;
 
-    size = strlen (a_extension_list) + 1;
+    size = strlen(a_extension_list) + 1;
     req->length += bytes_to_int32(size);
     req->numbytes = size;
-    Data (dpy, a_extension_list, size);
+    Data(dpy, a_extension_list, size);
 
     UnlockDisplay(dpy);
     SyncHandle();
 
-    is_ok=TRUE ;
+    is_ok = TRUE;
 
-out:
-    return is_ok ;
+ out:
+    return is_ok;
 }
 
 Bool
-ephyrHostGLXCreateContext (int a_screen,
-                           int a_visual_id,
-                           int a_context_id,
-                           int a_share_list_ctxt_id,
-                           Bool a_direct)
+ephyrHostGLXCreateContext(int a_screen,
+                          int a_visual_id,
+                          int a_context_id,
+                          int a_share_list_ctxt_id, Bool a_direct)
 {
     Bool is_ok = FALSE;
-    Display *dpy = hostx_get_display ();
-    int major_opcode=0, remote_context_id=0;
+    Display *dpy = hostx_get_display();
+    int major_opcode = 0, remote_context_id = 0;
     xGLXCreateContextReq *req;
 
-    EPHYR_LOG ("enter. screen:%d, visual:%d, contextid:%d, direct:%d\n",
-               a_screen, a_visual_id, a_context_id, a_direct) ;
+    EPHYR_LOG("enter. screen:%d, visual:%d, contextid:%d, direct:%d\n",
+              a_screen, a_visual_id, a_context_id, a_direct);
 
-    if (!hostx_allocate_resource_id_peer (a_context_id, &remote_context_id)) {
-        EPHYR_LOG_ERROR ("failed to peer the context id %d host X",
-                         remote_context_id) ;
-        goto out ;
+    if (!hostx_allocate_resource_id_peer(a_context_id, &remote_context_id)) {
+        EPHYR_LOG_ERROR("failed to peer the context id %d host X",
+                        remote_context_id);
+        goto out;
     }
 
-    if (!ephyrHostGLXGetMajorOpcode (&major_opcode)) {
-        EPHYR_LOG_ERROR ("failed to get major opcode\n") ;
-        goto out ;
+    if (!ephyrHostGLXGetMajorOpcode(&major_opcode)) {
+        EPHYR_LOG_ERROR("failed to get major opcode\n");
+        goto out;
     }
 
-    LockDisplay (dpy) ;
+    LockDisplay(dpy);
 
     /* Send the glXCreateContext request */
-    GetReq(GLXCreateContext,req);
+    GetReq(GLXCreateContext, req);
     req->reqType = major_opcode;
     req->glxCode = X_GLXCreateContext;
     req->context = remote_context_id;
     req->visual = a_visual_id;
-    req->screen = DefaultScreen (dpy);
+    req->screen = DefaultScreen(dpy);
     req->shareList = a_share_list_ctxt_id;
     req->isDirect = a_direct;
 
-    UnlockDisplay (dpy);
-    SyncHandle ();
+    UnlockDisplay(dpy);
+    SyncHandle();
 
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 Bool
-ephyrHostDestroyContext (int a_ctxt_id)
+ephyrHostDestroyContext(int a_ctxt_id)
 {
-    Bool is_ok=FALSE;
-    Display *dpy=hostx_get_display ();
-    int major_opcode=0, remote_ctxt_id=0 ;
-    xGLXDestroyContextReq *req=NULL;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
+    int major_opcode = 0, remote_ctxt_id = 0;
+    xGLXDestroyContextReq *req = NULL;
 
-    EPHYR_LOG ("enter:%d\n", a_ctxt_id) ;
+    EPHYR_LOG("enter:%d\n", a_ctxt_id);
 
-    if (!ephyrHostGLXGetMajorOpcode (&major_opcode)) {
-        EPHYR_LOG_ERROR ("failed to get major opcode\n") ;
-        goto out ;
+    if (!ephyrHostGLXGetMajorOpcode(&major_opcode)) {
+        EPHYR_LOG_ERROR("failed to get major opcode\n");
+        goto out;
     }
-    if (!hostx_get_resource_id_peer (a_ctxt_id, &remote_ctxt_id)) {
-        EPHYR_LOG_ERROR ("failed to get remote glx ctxt id\n") ;
-        goto out ;
+    if (!hostx_get_resource_id_peer(a_ctxt_id, &remote_ctxt_id)) {
+        EPHYR_LOG_ERROR("failed to get remote glx ctxt id\n");
+        goto out;
     }
-    EPHYR_LOG ("host context id:%d\n", remote_ctxt_id) ;
+    EPHYR_LOG("host context id:%d\n", remote_ctxt_id);
 
-    LockDisplay (dpy);
-    GetReq (GLXDestroyContext,req);
+    LockDisplay(dpy);
+    GetReq(GLXDestroyContext, req);
     req->reqType = major_opcode;
     req->glxCode = X_GLXDestroyContext;
     req->context = remote_ctxt_id;
-    UnlockDisplay (dpy);
-    SyncHandle ();
+    UnlockDisplay(dpy);
+    SyncHandle();
 
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 Bool
-ephyrHostGLXMakeCurrent (int a_drawable,
-                         int a_glx_ctxt_id,
-                         int a_old_ctxt_tag,
-                         int *a_ctxt_tag)
+ephyrHostGLXMakeCurrent(int a_drawable,
+                        int a_glx_ctxt_id, int a_old_ctxt_tag, int *a_ctxt_tag)
 {
-    Bool is_ok=FALSE ;
-    Display *dpy = hostx_get_display () ;
-    int32_t major_opcode=0 ;
-    int remote_glx_ctxt_id=0 ;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
+    int32_t major_opcode = 0;
+    int remote_glx_ctxt_id = 0;
     xGLXMakeCurrentReq *req;
     xGLXMakeCurrentReply reply;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_ctxt_tag, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_ctxt_tag, FALSE);
 
-    EPHYR_LOG ("enter. drawable:%d, context:%d, oldtag:%d\n",
-               a_drawable, a_glx_ctxt_id, a_old_ctxt_tag) ;
+    EPHYR_LOG("enter. drawable:%d, context:%d, oldtag:%d\n",
+              a_drawable, a_glx_ctxt_id, a_old_ctxt_tag);
 
-    if (!ephyrHostGLXGetMajorOpcode (&major_opcode)) {
-        EPHYR_LOG_ERROR ("failed to get major opcode\n") ;
-        goto out ;
+    if (!ephyrHostGLXGetMajorOpcode(&major_opcode)) {
+        EPHYR_LOG_ERROR("failed to get major opcode\n");
+        goto out;
     }
-    if (!hostx_get_resource_id_peer (a_glx_ctxt_id, &remote_glx_ctxt_id)) {
-        EPHYR_LOG_ERROR ("failed to get remote glx ctxt id\n") ;
-        goto out ;
+    if (!hostx_get_resource_id_peer(a_glx_ctxt_id, &remote_glx_ctxt_id)) {
+        EPHYR_LOG_ERROR("failed to get remote glx ctxt id\n");
+        goto out;
     }
 
-    LockDisplay (dpy);
+    LockDisplay(dpy);
 
-    GetReq (GLXMakeCurrent,req);
+    GetReq(GLXMakeCurrent, req);
     req->reqType = major_opcode;
     req->glxCode = X_GLXMakeCurrent;
     req->drawable = a_drawable;
     req->context = remote_glx_ctxt_id;
     req->oldContextTag = a_old_ctxt_tag;
 
-    memset (&reply, 0, sizeof (reply)) ;
-    if (!_XReply (dpy, (xReply*)&reply, 0, False)) {
-        EPHYR_LOG_ERROR ("failed to get reply from host\n") ;
-        UnlockDisplay (dpy);
-        SyncHandle ();
-        goto out ;
+    memset(&reply, 0, sizeof(reply));
+    if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+        EPHYR_LOG_ERROR("failed to get reply from host\n");
+        UnlockDisplay(dpy);
+        SyncHandle();
+        goto out;
     }
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    *a_ctxt_tag = reply.contextTag ;
-    EPHYR_LOG ("context tag:%d\n", *a_ctxt_tag) ;
-    is_ok = TRUE ;
-
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    *a_ctxt_tag = reply.contextTag;
+    EPHYR_LOG("context tag:%d\n", *a_ctxt_tag);
+    is_ok = TRUE;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 #define X_GLXSingle 0
@@ -614,86 +599,85 @@ out:
     *p = *(GLfloat *)&reply.pad3;
 
 Bool
-ephyrHostGetIntegerValue (int a_current_context_tag, int a_int, int *a_val)
+ephyrHostGetIntegerValue(int a_current_context_tag, int a_int, int *a_val)
 {
-    Bool is_ok=FALSE;
-    Display *dpy = hostx_get_display () ;
-    int major_opcode=0, size=0;
-    xGLXSingleReq *req=NULL;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
+    int major_opcode = 0, size = 0;
+    xGLXSingleReq *req = NULL;
     xGLXSingleReply reply;
-    unsigned char* pc=NULL ;
+    unsigned char *pc = NULL;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_val, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_val, FALSE);
 
-    EPHYR_LOG ("enter\n") ;
-    if (!ephyrHostGLXGetMajorOpcode (&major_opcode)) {
-        EPHYR_LOG_ERROR ("failed to get major opcode\n") ;
-        goto out ;
+    EPHYR_LOG("enter\n");
+    if (!ephyrHostGLXGetMajorOpcode(&major_opcode)) {
+        EPHYR_LOG_ERROR("failed to get major opcode\n");
+        goto out;
     }
-    LockDisplay (dpy) ;
-    GetReqExtra (GLXSingle, 4, req) ;
-    req->reqType = major_opcode ;
-    req->glxCode = X_GLsop_GetIntegerv ;
+    LockDisplay(dpy);
+    GetReqExtra(GLXSingle, 4, req);
+    req->reqType = major_opcode;
+    req->glxCode = X_GLsop_GetIntegerv;
     req->contextTag = a_current_context_tag;
-    pc = ((unsigned char *)(req) + sz_xGLXSingleReq) ;
-    EPHYR_GLX_SINGLE_PUT_LONG (0, a_int) ;
-    EPHYR_GLX_SINGLE_READ_XREPLY () ;
-    EPHYR_GLX_SINGLE_GET_SIZE (size) ;
+    pc = ((unsigned char *) (req) + sz_xGLXSingleReq);
+    EPHYR_GLX_SINGLE_PUT_LONG(0, a_int);
+    EPHYR_GLX_SINGLE_READ_XREPLY();
+    EPHYR_GLX_SINGLE_GET_SIZE(size);
     if (!size) {
-        UnlockDisplay (dpy) ;
-        SyncHandle () ;
-        EPHYR_LOG_ERROR ("X_GLsop_GetIngerv failed\n") ;
-        goto out ;
+        UnlockDisplay(dpy);
+        SyncHandle();
+        EPHYR_LOG_ERROR("X_GLsop_GetIngerv failed\n");
+        goto out;
     }
-    EPHYR_GLX_SINGLE_GET_LONG (a_val) ;
-    UnlockDisplay (dpy) ;
-    SyncHandle () ;
-    is_ok = TRUE ;
-
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+    EPHYR_GLX_SINGLE_GET_LONG(a_val);
+    UnlockDisplay(dpy);
+    SyncHandle();
+    is_ok = TRUE;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 Bool
-ephyrHostIsContextDirect (int a_ctxt_id,
-                          int *a_is_direct)
+ephyrHostIsContextDirect(int a_ctxt_id, int *a_is_direct)
 {
-    Bool is_ok=FALSE;
-    Display *dpy = hostx_get_display () ;
-    xGLXIsDirectReq *req=NULL;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
+    xGLXIsDirectReq *req = NULL;
     xGLXIsDirectReply reply;
-    int major_opcode=0, remote_glx_ctxt_id=0;
+    int major_opcode = 0, remote_glx_ctxt_id = 0;
 
-    EPHYR_LOG ("enter\n") ;
-    if (!ephyrHostGLXGetMajorOpcode (&major_opcode)) {
-        EPHYR_LOG_ERROR ("failed to get major opcode\n") ;
-        goto out ;
+    EPHYR_LOG("enter\n");
+    if (!ephyrHostGLXGetMajorOpcode(&major_opcode)) {
+        EPHYR_LOG_ERROR("failed to get major opcode\n");
+        goto out;
     }
-    if (!hostx_get_resource_id_peer (a_ctxt_id, &remote_glx_ctxt_id)) {
-        EPHYR_LOG_ERROR ("failed to get remote glx ctxt id\n") ;
-        goto out ;
+    if (!hostx_get_resource_id_peer(a_ctxt_id, &remote_glx_ctxt_id)) {
+        EPHYR_LOG_ERROR("failed to get remote glx ctxt id\n");
+        goto out;
     }
-    memset (&reply, 0, sizeof (reply)) ;
+    memset(&reply, 0, sizeof(reply));
 
     /* Send the glXIsDirect request */
-    LockDisplay (dpy);
-    GetReq (GLXIsDirect,req);
+    LockDisplay(dpy);
+    GetReq(GLXIsDirect, req);
     req->reqType = major_opcode;
     req->glxCode = X_GLXIsDirect;
     req->context = remote_glx_ctxt_id;
-    if (!_XReply (dpy, (xReply*) &reply, 0, False)) {
-        EPHYR_LOG_ERROR ("fail in reading reply from host\n") ;
-        UnlockDisplay (dpy);
-        SyncHandle ();
-        goto out ;
+    if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+        EPHYR_LOG_ERROR("fail in reading reply from host\n");
+        UnlockDisplay(dpy);
+        SyncHandle();
+        goto out;
     }
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    *a_is_direct = reply.isDirect ;
-    is_ok = TRUE ;
-
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    *a_is_direct = reply.isDirect;
+    is_ok = TRUE;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostglx.h b/xorg-server/hw/kdrive/ephyr/ephyrhostglx.h
index 6db362f30..9c6012070 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostglx.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostglx.h
@@ -34,43 +34,38 @@ enum EphyrHostGLXGetStringOps {
     EPHYR_HOST_GLX_GetString,
 };
 
-Bool ephyrHostGLXQueryVersion (int *a_maj, int *a_min) ;
-Bool ephyrHostGLXGetStringFromServer (int a_screen_number,
-                                      int a_string_name,
-                                      enum EphyrHostGLXGetStringOps a_op,
-                                      char **a_string) ;
-Bool ephyrHostGLXGetVisualConfigs (int a_screen,
-                                   int32_t *a_num_visuals,
-                                   int32_t *a_num_props,
-                                   int32_t *a_props_buf_size,
-                                   int32_t **a_props_buf) ;
+Bool ephyrHostGLXQueryVersion(int *a_maj, int *a_min);
+Bool ephyrHostGLXGetStringFromServer(int a_screen_number,
+                                     int a_string_name,
+                                     enum EphyrHostGLXGetStringOps a_op,
+                                     char **a_string);
+Bool ephyrHostGLXGetVisualConfigs(int a_screen,
+                                  int32_t * a_num_visuals,
+                                  int32_t * a_num_props,
+                                  int32_t * a_props_buf_size,
+                                  int32_t ** a_props_buf);
 Bool
-ephyrHostGLXVendorPrivGetFBConfigsSGIX (int a_screen,
-                                        int32_t *a_num_visuals,
-                                        int32_t *a_num_props,
-                                        int32_t *a_props_buf_size,
-                                        int32_t **a_props_buf);
-Bool ephyrHostGLXGetMajorOpcode (int32_t *a_opcode) ;
-Bool ephyrHostGLXSendClientInfo (int32_t a_major, int32_t a_minor,
-                                 const char* a_extension_list) ;
-Bool ephyrHostGLXCreateContext (int a_screen,
-                                int a_visual_id,
-                                int a_context_id,
-                                int a_shared_list_ctx_id,
-                                Bool a_direct) ;
 
-Bool ephyrHostDestroyContext (int a_ctxt_id) ;
+ephyrHostGLXVendorPrivGetFBConfigsSGIX(int a_screen,
+                                       int32_t * a_num_visuals,
+                                       int32_t * a_num_props,
+                                       int32_t * a_props_buf_size,
+                                       int32_t ** a_props_buf);
+Bool ephyrHostGLXGetMajorOpcode(int32_t * a_opcode);
+Bool ephyrHostGLXSendClientInfo(int32_t a_major, int32_t a_minor,
+                                const char *a_extension_list);
+Bool ephyrHostGLXCreateContext(int a_screen,
+                               int a_visual_id,
+                               int a_context_id,
+                               int a_shared_list_ctx_id, Bool a_direct);
 
-Bool ephyrHostGLXMakeCurrent (int a_drawable, int a_glx_ctxt_id,
-                              int a_olg_ctxt_tag, int *a_ctxt_tag) ;
+Bool ephyrHostDestroyContext(int a_ctxt_id);
 
-Bool ephyrHostGetIntegerValue (int a_current_context_tag,
-                               int a_int,
-                               int *a_val) ;
+Bool ephyrHostGLXMakeCurrent(int a_drawable, int a_glx_ctxt_id,
+                             int a_olg_ctxt_tag, int *a_ctxt_tag);
 
-Bool ephyrHostIsContextDirect (int a_ctxt_id,
-                               int *a_is_direct) ;
+Bool ephyrHostGetIntegerValue(int a_current_context_tag, int a_int, int *a_val);
 
+Bool ephyrHostIsContextDirect(int a_ctxt_id, int *a_is_direct);
 
 #endif /*__EPHYRHOSTGLX_H__*/
-
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c b/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c
index 3137055ca..410e6b6e4 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c
@@ -50,45 +50,42 @@
     dpy->bufptr += SIZEOF(xReq);\
     dpy->request++
 
-
 Bool
-ephyrHostProxyDoForward (pointer a_request_buffer,
-                         struct XReply *a_reply,
-                         Bool a_do_swap)
+ephyrHostProxyDoForward(pointer a_request_buffer,
+                        struct XReply *a_reply, Bool a_do_swap)
 {
-    Bool is_ok = FALSE ;
-    int n=0 ;
-    Display *dpy=hostx_get_display () ;
-    xReq *in_req = (xReq*) a_request_buffer ;
-    xReq *forward_req=NULL ;
-    struct XReply reply ;
+    Bool is_ok = FALSE;
+    int n = 0;
+    Display *dpy = hostx_get_display();
+    xReq *in_req = (xReq *) a_request_buffer;
+    xReq *forward_req = NULL;
+    struct XReply reply;
 
-    EPHYR_RETURN_VAL_IF_FAIL (in_req && dpy, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(in_req && dpy, FALSE);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
 
     if (a_do_swap) {
-        swaps(&in_req->length) ;
+        swaps(&in_req->length);
     }
-    EPHYR_LOG ("Req {type:%d, data:%d, length:%d}\n",
-               in_req->reqType, in_req->data, in_req->length) ;
-    GetXReq (forward_req) ;
-    memmove (forward_req, in_req, 4) ;
+    EPHYR_LOG("Req {type:%d, data:%d, length:%d}\n",
+              in_req->reqType, in_req->data, in_req->length);
+    GetXReq(forward_req);
+    memmove(forward_req, in_req, 4);
 
-    if (!_XReply (dpy, (xReply*) &reply, 0, FALSE)) {
-        EPHYR_LOG_ERROR ("failed to get reply\n") ;
+    if (!_XReply(dpy, (xReply *) & reply, 0, FALSE)) {
+        EPHYR_LOG_ERROR("failed to get reply\n");
         goto out;
     }
-    EPHYR_LOG ("XReply{type:%d, foo:%d, seqnum:%d, length:%d}\n",
-               reply.type, reply.foo, reply.sequence_number, reply.length) ;
+    EPHYR_LOG("XReply{type:%d, foo:%d, seqnum:%d, length:%d}\n",
+              reply.type, reply.foo, reply.sequence_number, reply.length);
 
     if (a_reply) {
-        memmove (a_reply, &reply, sizeof (reply)) ;
+        memmove(a_reply, &reply, sizeof(reply));
     }
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
-
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.h b/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.h
index 720c986ff..13721606a 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.h
@@ -30,22 +30,22 @@
 #define __EPHYRHOSTPROXY_H__
 
 struct XReply {
-    int8_t type ;/*X_Reply*/
+    int8_t type;                /*X_Reply */
     int8_t foo;
-    int16_t sequence_number ;
-    int32_t length ;
-    /*following is some data up to 32 bytes lenght*/
-    int32_t pad0 ;
-    int32_t pad1 ;
-    int32_t pad2 ;
-    int32_t pad3 ;
-    int32_t pad4 ;
-    int32_t pad5 ;
+    int16_t sequence_number;
+    int32_t length;
+    /*following is some data up to 32 bytes lenght */
+    int32_t pad0;
+    int32_t pad1;
+    int32_t pad2;
+    int32_t pad3;
+    int32_t pad4;
+    int32_t pad5;
 };
 
 Bool
-ephyrHostProxyDoForward (pointer a_request_buffer,
-                         struct XReply *a_reply,
-                         Bool a_do_swap) ;
+
+ephyrHostProxyDoForward(pointer a_request_buffer,
+                        struct XReply *a_reply, Bool a_do_swap);
 
 #endif /*__EPHYRHOSTPROXY_H__*/
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
index 69ad8a517..05a821b39 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
@@ -53,42 +53,37 @@
 #ifndef TRUE
 #define TRUE 1
 #endif /*TRUE*/
-
 #ifndef FALSE
 #define FALSE 0
 #endif /*FALSE*/
-
 static XExtensionInfo _xv_info_data;
 static XExtensionInfo *xv_info = &_xv_info_data;
 static char *xv_extension_name = XvName;
-static char *xv_error_string(Display *dpy, int code, XExtCodes *codes,
-                             char * buf, int n);
-static int xv_close_display(Display *dpy, XExtCodes *codes);
-static Bool xv_wire_to_event(Display *dpy, XEvent *host, xEvent *wire);
+static char *xv_error_string(Display * dpy, int code, XExtCodes * codes,
+                             char *buf, int n);
+static int xv_close_display(Display * dpy, XExtCodes * codes);
+static Bool xv_wire_to_event(Display * dpy, XEvent * host, xEvent *wire);
 
 static XExtensionHooks xv_extension_hooks = {
-    NULL,                               /* create_gc */
-    NULL,                               /* copy_gc */
-    NULL,                               /* flush_gc */
-    NULL,                               /* free_gc */
-    NULL,                               /* create_font */
-    NULL,                               /* free_font */
-    xv_close_display,                   /* close_display */
-    xv_wire_to_event,                   /* wire_to_event */
-    NULL,                               /* event_to_wire */
-    NULL,                               /* error */
-    xv_error_string                     /* error_string */
+    NULL,                       /* create_gc */
+    NULL,                       /* copy_gc */
+    NULL,                       /* flush_gc */
+    NULL,                       /* free_gc */
+    NULL,                       /* create_font */
+    NULL,                       /* free_font */
+    xv_close_display,           /* close_display */
+    xv_wire_to_event,           /* wire_to_event */
+    NULL,                       /* event_to_wire */
+    NULL,                       /* error */
+    xv_error_string             /* error_string */
 };
 
-
-static char *xv_error_list[] =
-{
-   "BadPort",       /* XvBadPort     */
-   "BadEncoding",   /* XvBadEncoding */
-   "BadControl"     /* XvBadControl  */
+static char *xv_error_list[] = {
+    "BadPort",                  /* XvBadPort     */
+    "BadEncoding",              /* XvBadEncoding */
+    "BadControl"                /* XvBadControl  */
 };
 
-
 #define XvCheckExtension(dpy, i, val) \
   XextCheckExtension(dpy, i, xv_extension_name, val)
 #define XvGetReq(name, req) \
@@ -102,51 +97,51 @@ static char *xv_error_list[] =
         dpy->bufptr += SIZEOF(xv##name##Req);\
         dpy->request++
 
-static XEXT_GENERATE_CLOSE_DISPLAY (xv_close_display, xv_info)
-
+static
+XEXT_GENERATE_CLOSE_DISPLAY(xv_close_display, xv_info)
 
-static XEXT_GENERATE_FIND_DISPLAY (xv_find_display, xv_info,
-                                   xv_extension_name,
-                                   &xv_extension_hooks,
-                                   XvNumEvents, NULL)
+static
+XEXT_GENERATE_FIND_DISPLAY(xv_find_display, xv_info,
+                           xv_extension_name,
+                           &xv_extension_hooks, XvNumEvents, NULL)
 
-static XEXT_GENERATE_ERROR_STRING (xv_error_string, xv_extension_name,
-                                   XvNumErrors, xv_error_list)
+static
+XEXT_GENERATE_ERROR_STRING(xv_error_string, xv_extension_name,
+                           XvNumErrors, xv_error_list)
 
 struct _EphyrHostXVAdaptorArray {
-    XvAdaptorInfo *adaptors ;
-    unsigned int nb_adaptors ;
+    XvAdaptorInfo *adaptors;
+    unsigned int nb_adaptors;
 };
 
 /*heavily copied from libx11*/
 #define BUFSIZE 2048
 static void
-ephyrHostXVLogXErrorEvent (Display *a_display,
-                           XErrorEvent *a_err_event,
-                           FILE *a_fp)
+ephyrHostXVLogXErrorEvent(Display * a_display,
+                          XErrorEvent * a_err_event, FILE * a_fp)
 {
     char buffer[BUFSIZ];
     char mesg[BUFSIZ];
     char number[32];
     const char *mtype = "XlibMessage";
-    register _XExtension *ext = (_XExtension *)NULL;
-    _XExtension *bext = (_XExtension *)NULL;
-    Display *dpy = a_display ;
+    register _XExtension *ext = (_XExtension *) NULL;
+    _XExtension *bext = (_XExtension *) NULL;
+    Display *dpy = a_display;
 
     XGetErrorText(dpy, a_err_event->error_code, buffer, BUFSIZ);
     XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
     (void) fprintf(a_fp, "%s:  %s\n  ", mesg, buffer);
     XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d",
-            mesg, BUFSIZ);
+                          mesg, BUFSIZ);
     (void) fprintf(a_fp, mesg, a_err_event->request_code);
     if (a_err_event->request_code < 128) {
         snprintf(number, sizeof(number), "%d", a_err_event->request_code);
         XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
-    } else {
+    }
+    else {
         for (ext = dpy->ext_procs;
-                ext && (ext->codes.major_opcode != a_err_event->request_code);
-                ext = ext->next)
-            ; 
+             ext && (ext->codes.major_opcode != a_err_event->request_code);
+             ext = ext->next);
         if (ext)
             strcpy(buffer, ext->name);
         else
@@ -155,7 +150,7 @@ ephyrHostXVLogXErrorEvent (Display *a_display,
     (void) fprintf(a_fp, " (%s)\n", buffer);
     if (a_err_event->request_code >= 128) {
         XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
-                mesg, BUFSIZ);
+                              mesg, BUFSIZ);
         fputs("  ", a_fp);
         (void) fprintf(a_fp, mesg, a_err_event->minor_code);
         if (ext) {
@@ -166,20 +161,20 @@ ephyrHostXVLogXErrorEvent (Display *a_display,
         }
         fputs("\n", a_fp);
     }
-    if (a_err_event->error_code >= 128) { 
+    if (a_err_event->error_code >= 128) {
         /* kludge, try to find the extension that caused it */
         buffer[0] = '\0';
         for (ext = dpy->ext_procs; ext; ext = ext->next) {
             if (ext->error_string)
-                (*ext->error_string)(dpy, a_err_event->error_code, &ext->codes,
-                        buffer, BUFSIZ);
+                (*ext->error_string) (dpy, a_err_event->error_code, &ext->codes,
+                                      buffer, BUFSIZ);
             if (buffer[0]) {
                 bext = ext;
                 break;
             }
             if (ext->codes.first_error &&
-                    ext->codes.first_error < (int)a_err_event->error_code &&
-                    (!bext || ext->codes.first_error > bext->codes.first_error))
+                ext->codes.first_error < (int) a_err_event->error_code &&
+                (!bext || ext->codes.first_error > bext->codes.first_error))
                 bext = ext;
         }
         if (bext)
@@ -196,505 +191,476 @@ ephyrHostXVLogXErrorEvent (Display *a_display,
         /* let extensions try to print the values */
         for (ext = dpy->ext_procs; ext; ext = ext->next) {
             if (ext->error_values)
-                (*ext->error_values)(dpy, a_err_event, a_fp);
+                (*ext->error_values) (dpy, a_err_event, a_fp);
         }
-    } else if ((a_err_event->error_code == BadWindow) ||
-            (a_err_event->error_code == BadPixmap) ||
-            (a_err_event->error_code == BadCursor) ||
-            (a_err_event->error_code == BadFont) ||
-            (a_err_event->error_code == BadDrawable) ||
-            (a_err_event->error_code == BadColor) ||
-            (a_err_event->error_code == BadGC) ||
-            (a_err_event->error_code == BadIDChoice) ||
-            (a_err_event->error_code == BadValue) ||
-            (a_err_event->error_code == BadAtom)) {
+    }
+    else if ((a_err_event->error_code == BadWindow) ||
+             (a_err_event->error_code == BadPixmap) ||
+             (a_err_event->error_code == BadCursor) ||
+             (a_err_event->error_code == BadFont) ||
+             (a_err_event->error_code == BadDrawable) ||
+             (a_err_event->error_code == BadColor) ||
+             (a_err_event->error_code == BadGC) ||
+             (a_err_event->error_code == BadIDChoice) ||
+             (a_err_event->error_code == BadValue) ||
+             (a_err_event->error_code == BadAtom)) {
         if (a_err_event->error_code == BadValue)
             XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
-                    mesg, BUFSIZ);
+                                  mesg, BUFSIZ);
         else if (a_err_event->error_code == BadAtom)
             XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
-                    mesg, BUFSIZ);
+                                  mesg, BUFSIZ);
         else
             XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
-                    mesg, BUFSIZ);
+                                  mesg, BUFSIZ);
         fputs("  ", a_fp);
         (void) fprintf(a_fp, mesg, a_err_event->resourceid);
         fputs("\n", a_fp);
     }
     XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
-            mesg, BUFSIZ);
+                          mesg, BUFSIZ);
     fputs("  ", a_fp);
     (void) fprintf(a_fp, mesg, a_err_event->serial);
     XGetErrorDatabaseText(dpy, mtype, "CurrentSerial", "Current Serial #%d",
-            mesg, BUFSIZ);
+                          mesg, BUFSIZ);
     fputs("\n  ", a_fp);
     (void) fprintf(a_fp, mesg, dpy->request);
     fputs("\n", a_fp);
 }
 
 static int
-ephyrHostXVErrorHandler (Display *a_display,
-                         XErrorEvent *a_error_event)
+ephyrHostXVErrorHandler(Display * a_display, XErrorEvent * a_error_event)
 {
-    EPHYR_LOG_ERROR ("got an error from the host xserver:\n") ;
-    ephyrHostXVLogXErrorEvent (a_display, a_error_event, stderr) ;
-    return Success ;
+    EPHYR_LOG_ERROR("got an error from the host xserver:\n");
+    ephyrHostXVLogXErrorEvent(a_display, a_error_event, stderr);
+    return Success;
 }
 
 void
-ephyrHostXVInit (void)
+ephyrHostXVInit(void)
 {
-    static Bool s_initialized ;
+    static Bool s_initialized;
 
     if (s_initialized)
-        return ;
-    XSetErrorHandler (ephyrHostXVErrorHandler) ;
-    s_initialized = TRUE ;
+        return;
+    XSetErrorHandler(ephyrHostXVErrorHandler);
+    s_initialized = TRUE;
 }
 
 Bool
-ephyrHostXVQueryAdaptors (EphyrHostXVAdaptorArray **a_adaptors)
+ephyrHostXVQueryAdaptors(EphyrHostXVAdaptorArray ** a_adaptors)
 {
-    EphyrHostXVAdaptorArray *result=NULL ;
-    int ret=0 ;
-    Bool is_ok=FALSE ;
+    EphyrHostXVAdaptorArray *result = NULL;
+    int ret = 0;
+    Bool is_ok = FALSE;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_adaptors, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_adaptors, FALSE);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
 
-    result = calloc (1, sizeof (EphyrHostXVAdaptorArray)) ;
+    result = calloc(1, sizeof(EphyrHostXVAdaptorArray));
     if (!result)
-        goto out ;
+        goto out;
 
-    ret = XvQueryAdaptors (hostx_get_display (),
-                           DefaultRootWindow (hostx_get_display ()),
-                           &result->nb_adaptors,
-                           &result->adaptors) ;
+    ret = XvQueryAdaptors(hostx_get_display(),
+                          DefaultRootWindow(hostx_get_display()),
+                          &result->nb_adaptors, &result->adaptors);
     if (ret != Success) {
-        EPHYR_LOG_ERROR ("failed to query host adaptors: %d\n", ret) ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to query host adaptors: %d\n", ret);
+        goto out;
     }
-    *a_adaptors = result ;
-    is_ok = TRUE ;
+    *a_adaptors = result;
+    is_ok = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 void
-ephyrHostXVAdaptorArrayDelete (EphyrHostXVAdaptorArray *a_adaptors)
+ephyrHostXVAdaptorArrayDelete(EphyrHostXVAdaptorArray * a_adaptors)
 {
     if (!a_adaptors)
-        return ;
+        return;
     if (a_adaptors->adaptors) {
-        XvFreeAdaptorInfo (a_adaptors->adaptors) ;
-        a_adaptors->adaptors = NULL ;
-        a_adaptors->nb_adaptors = 0 ;
+        XvFreeAdaptorInfo(a_adaptors->adaptors);
+        a_adaptors->adaptors = NULL;
+        a_adaptors->nb_adaptors = 0;
     }
-    XFree (a_adaptors) ;
+    XFree(a_adaptors);
 }
 
 int
-ephyrHostXVAdaptorArrayGetSize (const EphyrHostXVAdaptorArray *a_this)
+ephyrHostXVAdaptorArrayGetSize(const EphyrHostXVAdaptorArray * a_this)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, -1) ;
-    return a_this->nb_adaptors ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, -1);
+    return a_this->nb_adaptors;
 }
 
-EphyrHostXVAdaptor*
-ephyrHostXVAdaptorArrayAt (const EphyrHostXVAdaptorArray *a_this,
-                           int a_index)
+EphyrHostXVAdaptor *
+ephyrHostXVAdaptorArrayAt(const EphyrHostXVAdaptorArray * a_this, int a_index)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, NULL) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, NULL);
 
     if (a_index >= a_this->nb_adaptors)
-        return NULL ;
-    return (EphyrHostXVAdaptor*)&a_this->adaptors[a_index] ;
+        return NULL;
+    return (EphyrHostXVAdaptor *) & a_this->adaptors[a_index];
 }
 
 char
-ephyrHostXVAdaptorGetType (const EphyrHostXVAdaptor *a_this)
+ephyrHostXVAdaptorGetType(const EphyrHostXVAdaptor * a_this)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, -1) ;
-    return ((XvAdaptorInfo*)a_this)->type ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, -1);
+    return ((XvAdaptorInfo *) a_this)->type;
 }
 
-const char*
-ephyrHostXVAdaptorGetName (const EphyrHostXVAdaptor *a_this)
+const char *
+ephyrHostXVAdaptorGetName(const EphyrHostXVAdaptor * a_this)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, NULL) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, NULL);
 
-    return ((XvAdaptorInfo*)a_this)->name ;
+    return ((XvAdaptorInfo *) a_this)->name;
 }
 
-EphyrHostVideoFormat*
-ephyrHostXVAdaptorGetVideoFormats (const EphyrHostXVAdaptor *a_this,
-                                   int *a_nb_formats)
+EphyrHostVideoFormat *
+ephyrHostXVAdaptorGetVideoFormats(const EphyrHostXVAdaptor * a_this,
+                                  int *a_nb_formats)
 {
-    EphyrHostVideoFormat *formats=NULL ;
-    int nb_formats=0, i=0 ;
-    XVisualInfo *visual_info, visual_info_template ;
-    int nb_visual_info ;
+    EphyrHostVideoFormat *formats = NULL;
+    int nb_formats = 0, i = 0;
+    XVisualInfo *visual_info, visual_info_template;
+    int nb_visual_info;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, NULL) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, NULL);
 
-    nb_formats = ((XvAdaptorInfo*)a_this)->num_formats ;
-    formats = calloc (nb_formats, sizeof (EphyrHostVideoFormat)) ;
-    for (i=0; i < nb_formats; i++) {
-        memset (&visual_info_template, 0, sizeof (visual_info_template)) ;
+    nb_formats = ((XvAdaptorInfo *) a_this)->num_formats;
+    formats = calloc(nb_formats, sizeof(EphyrHostVideoFormat));
+    for (i = 0; i < nb_formats; i++) {
+        memset(&visual_info_template, 0, sizeof(visual_info_template));
         visual_info_template.visualid =
-                            ((XvAdaptorInfo*)a_this)->formats[i].visual_id;
-        visual_info = XGetVisualInfo (hostx_get_display (),
-                                      VisualIDMask,
-                                      &visual_info_template,
-                                      &nb_visual_info) ;
-        formats[i].depth = ((XvAdaptorInfo*)a_this)->formats[i].depth ;
-        formats[i].visual_class = visual_info->class ;
-        XFree (visual_info) ;
+            ((XvAdaptorInfo *) a_this)->formats[i].visual_id;
+        visual_info = XGetVisualInfo(hostx_get_display(),
+                                     VisualIDMask,
+                                     &visual_info_template, &nb_visual_info);
+        formats[i].depth = ((XvAdaptorInfo *) a_this)->formats[i].depth;
+        formats[i].visual_class = visual_info->class;
+        XFree(visual_info);
     }
     if (a_nb_formats)
-        *a_nb_formats = nb_formats ;
-    return formats ;
+        *a_nb_formats = nb_formats;
+    return formats;
 }
 
 int
-ephyrHostXVAdaptorGetNbPorts (const EphyrHostXVAdaptor *a_this)
+ephyrHostXVAdaptorGetNbPorts(const EphyrHostXVAdaptor * a_this)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, -1) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, -1);
 
-    return ((XvAdaptorInfo*)a_this)->num_ports ;
+    return ((XvAdaptorInfo *) a_this)->num_ports;
 }
 
 int
-ephyrHostXVAdaptorGetFirstPortID (const EphyrHostXVAdaptor *a_this)
+ephyrHostXVAdaptorGetFirstPortID(const EphyrHostXVAdaptor * a_this)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, -1) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, -1);
 
-    return ((XvAdaptorInfo*)a_this)->base_id ;
+    return ((XvAdaptorInfo *) a_this)->base_id;
 }
 
 Bool
-ephyrHostXVAdaptorHasPutVideo (const EphyrHostXVAdaptor *a_this,
-                               Bool *a_result)
+ephyrHostXVAdaptorHasPutVideo(const EphyrHostXVAdaptor * a_this, Bool *a_result)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this && a_result, FALSE);
 
-    if ((((XvAdaptorInfo*)a_this)->type & (XvVideoMask | XvInputMask)) ==
-		    (XvVideoMask | XvInputMask))
-        *a_result = TRUE ;
+    if ((((XvAdaptorInfo *) a_this)->type & (XvVideoMask | XvInputMask)) ==
+        (XvVideoMask | XvInputMask))
+        *a_result = TRUE;
     else
-        *a_result = FALSE ;
-    return TRUE ;
+        *a_result = FALSE;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVAdaptorHasGetVideo (const EphyrHostXVAdaptor *a_this,
-                               Bool *a_result)
+ephyrHostXVAdaptorHasGetVideo(const EphyrHostXVAdaptor * a_this, Bool *a_result)
 {
-    if ((((XvAdaptorInfo*)a_this)->type & (XvVideoMask | XvOutputMask)) ==
-		    (XvVideoMask | XvOutputMask))
-        *a_result = TRUE ;
+    if ((((XvAdaptorInfo *) a_this)->type & (XvVideoMask | XvOutputMask)) ==
+        (XvVideoMask | XvOutputMask))
+        *a_result = TRUE;
     else
-        *a_result = FALSE ;
-    return TRUE ;
+        *a_result = FALSE;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVAdaptorHasPutStill (const EphyrHostXVAdaptor *a_this,
-                               Bool *a_result)
+ephyrHostXVAdaptorHasPutStill(const EphyrHostXVAdaptor * a_this, Bool *a_result)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this && a_result, FALSE);
 
-    if ((((XvAdaptorInfo*)a_this)->type & (XvStillMask | XvInputMask)) ==
-		    (XvStillMask | XvInputMask))
-        *a_result = TRUE ;
+    if ((((XvAdaptorInfo *) a_this)->type & (XvStillMask | XvInputMask)) ==
+        (XvStillMask | XvInputMask))
+        *a_result = TRUE;
     else
-        *a_result = FALSE ;
-    return TRUE ;
+        *a_result = FALSE;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVAdaptorHasGetStill (const EphyrHostXVAdaptor *a_this,
-                               Bool *a_result)
+ephyrHostXVAdaptorHasGetStill(const EphyrHostXVAdaptor * a_this, Bool *a_result)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this && a_result, FALSE);
 
-    if ((((XvAdaptorInfo*)a_this)->type & (XvStillMask | XvOutputMask)) ==
-		    (XvStillMask | XvOutputMask))
-        *a_result = TRUE ;
+    if ((((XvAdaptorInfo *) a_this)->type & (XvStillMask | XvOutputMask)) ==
+        (XvStillMask | XvOutputMask))
+        *a_result = TRUE;
     else
-        *a_result = FALSE ;
-    return TRUE ;
+        *a_result = FALSE;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVAdaptorHasPutImage (const EphyrHostXVAdaptor *a_this,
-                               Bool *a_result)
+ephyrHostXVAdaptorHasPutImage(const EphyrHostXVAdaptor * a_this, Bool *a_result)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this && a_result, FALSE);
 
-    if ((((XvAdaptorInfo*)a_this)->type & (XvImageMask | XvInputMask)) ==
-		    (XvImageMask | XvInputMask))
-        *a_result = TRUE ;
+    if ((((XvAdaptorInfo *) a_this)->type & (XvImageMask | XvInputMask)) ==
+        (XvImageMask | XvInputMask))
+        *a_result = TRUE;
     else
-        *a_result = FALSE ;
-    return TRUE ;
+        *a_result = FALSE;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVQueryEncodings (int a_port_id,
-                           EphyrHostEncoding **a_encodings,
-                           unsigned int *a_num_encodings)
+ephyrHostXVQueryEncodings(int a_port_id,
+                          EphyrHostEncoding ** a_encodings,
+                          unsigned int *a_num_encodings)
 {
-    EphyrHostEncoding *encodings=NULL ;
-    XvEncodingInfo *encoding_info=NULL ;
-    unsigned int num_encodings=0, i;
-    int ret=0 ;
+    EphyrHostEncoding *encodings = NULL;
+    XvEncodingInfo *encoding_info = NULL;
+    unsigned int num_encodings = 0, i;
+    int ret = 0;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_encodings && a_num_encodings, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_encodings && a_num_encodings, FALSE);
 
-    ret = XvQueryEncodings (hostx_get_display (),
-                            a_port_id,
-                            &num_encodings,
-                            &encoding_info) ;
+    ret = XvQueryEncodings(hostx_get_display(),
+                           a_port_id, &num_encodings, &encoding_info);
     if (num_encodings && encoding_info) {
-        encodings = calloc (num_encodings, sizeof (EphyrHostEncoding)) ;
-        for (i=0; i<num_encodings; i++) {
-            encodings[i].id = encoding_info[i].encoding_id ;
-            encodings[i].name = strdup (encoding_info[i].name) ;
-            encodings[i].width = encoding_info[i].width ;
-            encodings[i].height = encoding_info[i].height ;
-            encodings[i].rate.numerator = encoding_info[i].rate.numerator ;
-            encodings[i].rate.denominator = encoding_info[i].rate.denominator ;
+        encodings = calloc(num_encodings, sizeof(EphyrHostEncoding));
+        for (i = 0; i < num_encodings; i++) {
+            encodings[i].id = encoding_info[i].encoding_id;
+            encodings[i].name = strdup(encoding_info[i].name);
+            encodings[i].width = encoding_info[i].width;
+            encodings[i].height = encoding_info[i].height;
+            encodings[i].rate.numerator = encoding_info[i].rate.numerator;
+            encodings[i].rate.denominator = encoding_info[i].rate.denominator;
         }
     }
     if (encoding_info) {
-        XvFreeEncodingInfo (encoding_info) ;
-        encoding_info = NULL ;
+        XvFreeEncodingInfo(encoding_info);
+        encoding_info = NULL;
     }
-    *a_encodings = encodings ;
-    *a_num_encodings = num_encodings ;
+    *a_encodings = encodings;
+    *a_num_encodings = num_encodings;
 
     if (ret != Success)
-        return FALSE ;
-    return TRUE ;
+        return FALSE;
+    return TRUE;
 }
 
 void
-ephyrHostEncodingsDelete (EphyrHostEncoding *a_encodings,
-                          int a_num_encodings)
+ephyrHostEncodingsDelete(EphyrHostEncoding * a_encodings, int a_num_encodings)
 {
-    int i=0 ;
+    int i = 0;
 
     if (!a_encodings)
-        return ;
-    for (i=0; i < a_num_encodings; i++) {
-        free(a_encodings[i].name) ;
-        a_encodings[i].name = NULL ;
+        return;
+    for (i = 0; i < a_num_encodings; i++) {
+        free(a_encodings[i].name);
+        a_encodings[i].name = NULL;
     }
-    free(a_encodings) ;
+    free(a_encodings);
 }
 
 void
-ephyrHostAttributesDelete (EphyrHostAttribute *a_attributes)
+ephyrHostAttributesDelete(EphyrHostAttribute * a_attributes)
 {
     if (!a_attributes)
-        return ;
-    XFree (a_attributes) ;
+        return;
+    XFree(a_attributes);
 }
 
 Bool
-ephyrHostXVQueryPortAttributes (int a_port_id,
-                                EphyrHostAttribute **a_attributes,
-                                int *a_num_attributes)
+ephyrHostXVQueryPortAttributes(int a_port_id,
+                               EphyrHostAttribute ** a_attributes,
+                               int *a_num_attributes)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_attributes && a_num_attributes, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_attributes && a_num_attributes, FALSE);
 
     *a_attributes =
-        (EphyrHostAttribute*)XvQueryPortAttributes (hostx_get_display (),
-                                                    a_port_id,
-                                                    a_num_attributes);
+        (EphyrHostAttribute *) XvQueryPortAttributes(hostx_get_display(),
+                                                     a_port_id,
+                                                     a_num_attributes);
 
-    return TRUE ;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVQueryImageFormats (int a_port_id,
-                              EphyrHostImageFormat **a_formats,
-                              int *a_num_format)
+ephyrHostXVQueryImageFormats(int a_port_id,
+                             EphyrHostImageFormat ** a_formats,
+                             int *a_num_format)
 {
-    XvImageFormatValues *result=NULL ;
+    XvImageFormatValues *result = NULL;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_formats && a_num_format, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_formats && a_num_format, FALSE);
 
-    result = XvListImageFormats (hostx_get_display (),
-                                 a_port_id,
-                                 a_num_format) ;
-    *a_formats = (EphyrHostImageFormat*) result ;
-    return TRUE ;
+    result = XvListImageFormats(hostx_get_display(), a_port_id, a_num_format);
+    *a_formats = (EphyrHostImageFormat *) result;
+    return TRUE;
 
 }
 
 Bool
-ephyrHostXVSetPortAttribute (int a_port_id,
-                             int a_atom,
-                             int a_attr_value)
+ephyrHostXVSetPortAttribute(int a_port_id, int a_atom, int a_attr_value)
 {
-    int res=Success ;
+    int res = Success;
 
-    EPHYR_LOG ("atom,name,value: (%d,%s,%d)\n",
-               a_atom,
-               XGetAtomName (hostx_get_display (), a_atom),
-               a_attr_value) ;
+    EPHYR_LOG("atom,name,value: (%d,%s,%d)\n",
+              a_atom, XGetAtomName(hostx_get_display(), a_atom), a_attr_value);
 
-    res = XvSetPortAttribute (hostx_get_display (),
-                              a_port_id,
-                              a_atom,
-                              a_attr_value) ;
+    res = XvSetPortAttribute(hostx_get_display(),
+                             a_port_id, a_atom, a_attr_value);
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvSetPortAttribute() failed: %d\n", res) ;
-        return FALSE ;
+        EPHYR_LOG_ERROR("XvSetPortAttribute() failed: %d\n", res);
+        return FALSE;
     }
-    XFlush (hostx_get_display ()) ;
-    EPHYR_LOG ("leave\n") ;
+    XFlush(hostx_get_display());
+    EPHYR_LOG("leave\n");
 
-    return TRUE ;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVGetPortAttribute (int a_port_id,
-                             int a_atom,
-                             int *a_attr_value)
+ephyrHostXVGetPortAttribute(int a_port_id, int a_atom, int *a_attr_value)
 {
-    int res=Success ;
-    Bool ret=FALSE ;
+    int res = Success;
+    Bool ret = FALSE;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_attr_value, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_attr_value, FALSE);
 
-    EPHYR_LOG ("enter, a_port_id: %d, a_atomid: %d, attr_name: %s\n",
-               a_port_id, a_atom, XGetAtomName (hostx_get_display (), a_atom)) ;
+    EPHYR_LOG("enter, a_port_id: %d, a_atomid: %d, attr_name: %s\n",
+              a_port_id, a_atom, XGetAtomName(hostx_get_display(), a_atom));
 
-    res = XvGetPortAttribute (hostx_get_display (),
-                              a_port_id,
-                              a_atom,
-                              a_attr_value) ;
+    res = XvGetPortAttribute(hostx_get_display(),
+                             a_port_id, a_atom, a_attr_value);
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvGetPortAttribute() failed: %d \n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvGetPortAttribute() failed: %d \n", res);
+        goto out;
     }
-    EPHYR_LOG ("atom,value: (%d, %d)\n", a_atom, *a_attr_value) ;
+    EPHYR_LOG("atom,value: (%d, %d)\n", a_atom, *a_attr_value);
 
-    ret = TRUE ;
+    ret = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return ret ;
+ out:
+    EPHYR_LOG("leave\n");
+    return ret;
 }
 
 Bool
-ephyrHostXVQueryBestSize (int a_port_id,
-                          Bool a_motion,
-                          unsigned int a_frame_w,
-                          unsigned int a_frame_h,
-                          unsigned int a_drw_w,
-                          unsigned int a_drw_h,
-                          unsigned int *a_actual_w,
-                          unsigned int *a_actual_h)
-{
-    int res=0 ;
-    Bool is_ok=FALSE ;
-
-    EPHYR_RETURN_VAL_IF_FAIL (a_actual_w && a_actual_h, FALSE) ;
-
-    EPHYR_LOG ("enter: frame (%dx%d), drw (%dx%d)\n",
-               a_frame_w, a_frame_h,
-               a_drw_w, a_drw_h) ;
-
-    res = XvQueryBestSize (hostx_get_display (),
-                           a_port_id,
-                           a_motion,
-                           a_frame_w, a_frame_h,
-                           a_drw_w, a_drw_h,
-                           a_actual_w, a_actual_h) ;
+ephyrHostXVQueryBestSize(int a_port_id,
+                         Bool a_motion,
+                         unsigned int a_frame_w,
+                         unsigned int a_frame_h,
+                         unsigned int a_drw_w,
+                         unsigned int a_drw_h,
+                         unsigned int *a_actual_w, unsigned int *a_actual_h)
+{
+    int res = 0;
+    Bool is_ok = FALSE;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_actual_w && a_actual_h, FALSE);
+
+    EPHYR_LOG("enter: frame (%dx%d), drw (%dx%d)\n",
+              a_frame_w, a_frame_h, a_drw_w, a_drw_h);
+
+    res = XvQueryBestSize(hostx_get_display(),
+                          a_port_id,
+                          a_motion,
+                          a_frame_w, a_frame_h,
+                          a_drw_w, a_drw_h, a_actual_w, a_actual_h);
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvQueryBestSize() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvQueryBestSize() failed: %d\n", res);
+        goto out;
     }
-    XSync (hostx_get_display (), FALSE) ;
+    XSync(hostx_get_display(), FALSE);
 
-    EPHYR_LOG ("actual (%dx%d)\n", *a_actual_w, *a_actual_h) ;
-    is_ok = TRUE ;
+    EPHYR_LOG("actual (%dx%d)\n", *a_actual_w, *a_actual_h);
+    is_ok = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 static Bool
-xv_wire_to_event(Display *dpy, XEvent *host, xEvent *wire)
+xv_wire_to_event(Display * dpy, XEvent * host, xEvent *wire)
 {
-    XExtDisplayInfo *info = xv_find_display (dpy);
-    XvEvent *re    = (XvEvent *)host;
-    xvEvent *event = (xvEvent *)wire;
+    XExtDisplayInfo *info = xv_find_display(dpy);
+    XvEvent *re = (XvEvent *) host;
+    xvEvent *event = (xvEvent *) wire;
 
     XvCheckExtension(dpy, info, False);
 
     switch ((event->u.u.type & 0x7F) - info->codes->first_event) {
-        case XvVideoNotify:
-            re->xvvideo.type = event->u.u.type & 0x7f;
-            re->xvvideo.serial =
-            _XSetLastRequestRead(dpy, (xGenericReply *)event);
-            re->xvvideo.send_event = ((event->u.u.type & 0x80) != 0);
-            re->xvvideo.display = dpy;
-            re->xvvideo.time = event->u.videoNotify.time;
-            re->xvvideo.reason = event->u.videoNotify.reason;
-            re->xvvideo.drawable = event->u.videoNotify.drawable;
-            re->xvvideo.port_id = event->u.videoNotify.port;
-            break;
-        case XvPortNotify:
-            re->xvport.type = event->u.u.type & 0x7f;
-            re->xvport.serial =
-            _XSetLastRequestRead(dpy, (xGenericReply *)event);
-            re->xvport.send_event = ((event->u.u.type & 0x80) != 0);
-            re->xvport.display = dpy;
-            re->xvport.time = event->u.portNotify.time;
-            re->xvport.port_id = event->u.portNotify.port;
-            re->xvport.attribute = event->u.portNotify.attribute;
-            re->xvport.value = event->u.portNotify.value;
-            break;
-        default:
-            return False;
-    }
-
-    return True ;
+    case XvVideoNotify:
+        re->xvvideo.type = event->u.u.type & 0x7f;
+        re->xvvideo.serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
+        re->xvvideo.send_event = ((event->u.u.type & 0x80) != 0);
+        re->xvvideo.display = dpy;
+        re->xvvideo.time = event->u.videoNotify.time;
+        re->xvvideo.reason = event->u.videoNotify.reason;
+        re->xvvideo.drawable = event->u.videoNotify.drawable;
+        re->xvvideo.port_id = event->u.videoNotify.port;
+        break;
+    case XvPortNotify:
+        re->xvport.type = event->u.u.type & 0x7f;
+        re->xvport.serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
+        re->xvport.send_event = ((event->u.u.type & 0x80) != 0);
+        re->xvport.display = dpy;
+        re->xvport.time = event->u.portNotify.time;
+        re->xvport.port_id = event->u.portNotify.port;
+        re->xvport.attribute = event->u.portNotify.attribute;
+        re->xvport.value = event->u.portNotify.value;
+        break;
+    default:
+        return False;
+    }
+
+    return True;
 }
 
 Bool
-ephyrHostXVQueryImageAttributes (int a_port_id,
-                                 int a_image_id /*image fourcc code*/,
-                                 unsigned short *a_width,
-                                 unsigned short *a_height,
-                                 int *a_image_size,
-                                 int *a_pitches,
-                                 int *a_offsets)
-{
-    Display *dpy = hostx_get_display () ;
-    Bool ret=FALSE ;
-    XExtDisplayInfo *info = xv_find_display (dpy);
-    xvQueryImageAttributesReq *req=NULL;
+ephyrHostXVQueryImageAttributes(int a_port_id,
+                                int a_image_id /*image fourcc code */ ,
+                                unsigned short *a_width,
+                                unsigned short *a_height,
+                                int *a_image_size,
+                                int *a_pitches, int *a_offsets)
+{
+    Display *dpy = hostx_get_display();
+    Bool ret = FALSE;
+    XExtDisplayInfo *info = xv_find_display(dpy);
+    xvQueryImageAttributesReq *req = NULL;
     xvQueryImageAttributesReply rep;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_width, FALSE) ;
-    EPHYR_RETURN_VAL_IF_FAIL (a_height, FALSE) ;
-    EPHYR_RETURN_VAL_IF_FAIL (a_image_size, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_width, FALSE);
+    EPHYR_RETURN_VAL_IF_FAIL(a_height, FALSE);
+    EPHYR_RETURN_VAL_IF_FAIL(a_image_size, FALSE);
 
-    XvCheckExtension (dpy, info, FALSE);
+    XvCheckExtension(dpy, info, FALSE);
 
-    LockDisplay (dpy);
+    LockDisplay(dpy);
 
-    XvGetReq (QueryImageAttributes, req);
+    XvGetReq(QueryImageAttributes, req);
     req->id = a_image_id;
     req->port = a_port_id;
     req->width = *a_width;
@@ -702,315 +668,308 @@ ephyrHostXVQueryImageAttributes (int a_port_id,
     /*
      * read the reply
      */
-    if (!_XReply (dpy, (xReply *)&rep, 0, xFalse)) {
-        EPHYR_LOG_ERROR ("QeryImageAttribute req failed\n") ;
-        goto out ;
+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+        EPHYR_LOG_ERROR("QeryImageAttribute req failed\n");
+        goto out;
     }
     if (a_pitches && a_offsets) {
-        _XRead (dpy,
-                (char*)a_pitches,
-                rep.num_planes << 2);
-        _XRead (dpy,
-                (char*)a_offsets,
-                rep.num_planes << 2);
-    } else {
+        _XRead(dpy, (char *) a_pitches, rep.num_planes << 2);
+        _XRead(dpy, (char *) a_offsets, rep.num_planes << 2);
+    }
+    else {
         _XEatData(dpy, rep.length << 2);
     }
-    *a_width = rep.width ;
-    *a_height = rep.height ;
-    *a_image_size = rep.data_size ;
+    *a_width = rep.width;
+    *a_height = rep.height;
+    *a_image_size = rep.data_size;
 
-    ret = TRUE ;
+    ret = TRUE;
 
-out:
-    UnlockDisplay (dpy) ;
-    SyncHandle ();
-    return ret ;
+ out:
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return ret;
 }
 
 Bool
-ephyrHostGetAtom (const char* a_name,
-                  Bool a_create_if_not_exists,
-                  int *a_atom)
+ephyrHostGetAtom(const char *a_name, Bool a_create_if_not_exists, int *a_atom)
 {
-    int atom=None ;
+    int atom = None;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_atom, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_atom, FALSE);
 
-    atom = XInternAtom (hostx_get_display (), a_name, a_create_if_not_exists);
+    atom = XInternAtom(hostx_get_display(), a_name, a_create_if_not_exists);
     if (atom == None) {
-        return FALSE ;
+        return FALSE;
     }
-    *a_atom = atom ;
-    return TRUE ;
+    *a_atom = atom;
+    return TRUE;
 }
 
-char*
-ephyrHostGetAtomName (int a_atom)
+char *
+ephyrHostGetAtomName(int a_atom)
 {
-    return XGetAtomName (hostx_get_display (), a_atom) ;
+    return XGetAtomName(hostx_get_display(), a_atom);
 }
 
 void
-ephyrHostFree (void *a_pointer)
+ephyrHostFree(void *a_pointer)
 {
     if (a_pointer)
-        XFree (a_pointer) ;
+        XFree(a_pointer);
 }
 
 Bool
-ephyrHostXVPutImage (int a_screen_num,
-                     int a_port_id,
-                     int a_image_id,
-                     int a_drw_x,
-                     int a_drw_y,
-                     int a_drw_w,
-                     int a_drw_h,
-                     int a_src_x,
-                     int a_src_y,
-                     int a_src_w,
-                     int a_src_h,
-                     int a_image_width,
-                     int a_image_height,
-                     unsigned char *a_buf,
-                     EphyrHostBox *a_clip_rects,
-                     int a_clip_rect_nums )
-{
-    Bool is_ok=TRUE ;
-    XvImage *xv_image=NULL ;
-    GC gc=0 ;
+ephyrHostXVPutImage(int a_screen_num,
+                    int a_port_id,
+                    int a_image_id,
+                    int a_drw_x,
+                    int a_drw_y,
+                    int a_drw_w,
+                    int a_drw_h,
+                    int a_src_x,
+                    int a_src_y,
+                    int a_src_w,
+                    int a_src_h,
+                    int a_image_width,
+                    int a_image_height,
+                    unsigned char *a_buf,
+                    EphyrHostBox * a_clip_rects, int a_clip_rect_nums)
+{
+    Bool is_ok = TRUE;
+    XvImage *xv_image = NULL;
+    GC gc = 0;
     XGCValues gc_values;
-    Display *dpy = hostx_get_display () ;
-    XRectangle *rects=NULL ;
-    int res = 0 ;
+    Display *dpy = hostx_get_display();
+    XRectangle *rects = NULL;
+    int res = 0;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_buf, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_buf, FALSE);
 
-    EPHYR_LOG ("enter, num_clip_rects: %d\n", a_clip_rect_nums) ;
+    EPHYR_LOG("enter, num_clip_rects: %d\n", a_clip_rect_nums);
 
-    memset (&gc_values, 0, sizeof (gc_values)) ;
-    gc = XCreateGC (dpy, hostx_get_window (a_screen_num), 0L, &gc_values);
+    memset(&gc_values, 0, sizeof(gc_values));
+    gc = XCreateGC(dpy, hostx_get_window(a_screen_num), 0L, &gc_values);
     if (!gc) {
-        EPHYR_LOG_ERROR ("failed to create gc \n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create gc \n");
+        goto out;
     }
-    xv_image = (XvImage*) XvCreateImage (hostx_get_display (),
+    xv_image = (XvImage *) XvCreateImage(hostx_get_display(),
                                          a_port_id, a_image_id,
-                                         NULL, a_image_width, a_image_height) ;
+                                         NULL, a_image_width, a_image_height);
     if (!xv_image) {
-        EPHYR_LOG_ERROR ("failed to create image\n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create image\n");
+        goto out;
     }
-    xv_image->data = (char*)a_buf ;
+    xv_image->data = (char *) a_buf;
     if (a_clip_rect_nums) {
-        int i=0 ;
-        rects = calloc (a_clip_rect_nums, sizeof (XRectangle)) ;
-        for (i=0; i < a_clip_rect_nums; i++) {
-            rects[i].x = a_clip_rects[i].x1 ;
-            rects[i].y = a_clip_rects[i].y1 ;
+        int i = 0;
+
+        rects = calloc(a_clip_rect_nums, sizeof(XRectangle));
+        for (i = 0; i < a_clip_rect_nums; i++) {
+            rects[i].x = a_clip_rects[i].x1;
+            rects[i].y = a_clip_rects[i].y1;
             rects[i].width = a_clip_rects[i].x2 - a_clip_rects[i].x1;
             rects[i].height = a_clip_rects[i].y2 - a_clip_rects[i].y1;
-            EPHYR_LOG ("(x,y,w,h): (%d,%d,%d,%d)\n",
-                       rects[i].x, rects[i].y,
-                       rects[i].width, rects[i].height) ;
+            EPHYR_LOG("(x,y,w,h): (%d,%d,%d,%d)\n",
+                      rects[i].x, rects[i].y, rects[i].width, rects[i].height);
         }
-        XSetClipRectangles (dpy, gc, 0, 0, rects, a_clip_rect_nums, YXBanded) ;
-        /*this always returns 1*/
-    }
-    res = XvPutImage (dpy, a_port_id,
-                      hostx_get_window (a_screen_num),
-                      gc, xv_image,
-                      a_src_x, a_src_y, a_src_w, a_src_h,
-                      a_drw_x, a_drw_y, a_drw_w, a_drw_h) ;
+        XSetClipRectangles(dpy, gc, 0, 0, rects, a_clip_rect_nums, YXBanded);
+        /*this always returns 1 */
+    }
+    res = XvPutImage(dpy, a_port_id,
+                     hostx_get_window(a_screen_num),
+                     gc, xv_image,
+                     a_src_x, a_src_y, a_src_w, a_src_h,
+                     a_drw_x, a_drw_y, a_drw_w, a_drw_h);
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvPutImage() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvPutImage() failed: %d\n", res);
+        goto out;
     }
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
+ out:
     if (xv_image) {
-        XFree (xv_image) ;
-        xv_image = NULL ;
+        XFree(xv_image);
+        xv_image = NULL;
     }
     if (gc) {
-        XFreeGC (dpy, gc) ;
-        gc = NULL ;
+        XFreeGC(dpy, gc);
+        gc = NULL;
     }
     free(rects);
     rects = NULL;
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 Bool
-ephyrHostXVPutVideo (int a_screen_num, int a_port_id,
-                     int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                     int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
+ephyrHostXVPutVideo(int a_screen_num, int a_port_id,
+                    int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                    int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
 {
-    Bool is_ok=FALSE ;
-    int res=FALSE ;
-    GC gc=0 ;
+    Bool is_ok = FALSE;
+    int res = FALSE;
+    GC gc = 0;
     XGCValues gc_values;
-    Display *dpy=hostx_get_display () ;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
 
-    gc = XCreateGC (dpy, hostx_get_window (a_screen_num), 0L, &gc_values);
+    gc = XCreateGC(dpy, hostx_get_window(a_screen_num), 0L, &gc_values);
     if (!gc) {
-        EPHYR_LOG_ERROR ("failed to create gc \n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create gc \n");
+        goto out;
     }
-    res = XvPutVideo (dpy, a_port_id, hostx_get_window (a_screen_num), gc,
-                      a_vid_x, a_vid_y, a_vid_w, a_vid_h,
-                      a_drw_x, a_drw_y, a_drw_w, a_drw_h) ;
+    res = XvPutVideo(dpy, a_port_id, hostx_get_window(a_screen_num), gc,
+                     a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                     a_drw_x, a_drw_y, a_drw_w, a_drw_h);
 
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvPutVideo() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvPutVideo() failed: %d\n", res);
+        goto out;
     }
 
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
+ out:
     if (gc) {
-        XFreeGC (dpy, gc) ;
-        gc = NULL ;
+        XFreeGC(dpy, gc);
+        gc = NULL;
     }
-    return is_ok ;
+    return is_ok;
 }
 
 Bool
-ephyrHostXVGetVideo (int a_screen_num, int a_port_id,
-                     int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                     int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
+ephyrHostXVGetVideo(int a_screen_num, int a_port_id,
+                    int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                    int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
 {
-    Bool is_ok=FALSE ;
-    int res=FALSE ;
-    GC gc=0 ;
+    Bool is_ok = FALSE;
+    int res = FALSE;
+    GC gc = 0;
     XGCValues gc_values;
-    Display *dpy=hostx_get_display () ;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
 
-    gc = XCreateGC (dpy, hostx_get_window (a_screen_num), 0L, &gc_values);
+    gc = XCreateGC(dpy, hostx_get_window(a_screen_num), 0L, &gc_values);
     if (!gc) {
-        EPHYR_LOG_ERROR ("failed to create gc \n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create gc \n");
+        goto out;
     }
-    res = XvGetVideo (dpy, a_port_id, hostx_get_window (a_screen_num), gc,
-                      a_vid_x, a_vid_y, a_vid_w, a_vid_h,
-                      a_drw_x, a_drw_y, a_drw_w, a_drw_h) ;
+    res = XvGetVideo(dpy, a_port_id, hostx_get_window(a_screen_num), gc,
+                     a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                     a_drw_x, a_drw_y, a_drw_w, a_drw_h);
 
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvGetVideo() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvGetVideo() failed: %d\n", res);
+        goto out;
     }
 
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
+ out:
     if (gc) {
-        XFreeGC (dpy, gc) ;
-        gc = NULL ;
+        XFreeGC(dpy, gc);
+        gc = NULL;
     }
-    return is_ok ;
+    return is_ok;
 }
 
 Bool
-ephyrHostXVPutStill (int a_screen_num, int a_port_id,
-                     int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                     int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
+ephyrHostXVPutStill(int a_screen_num, int a_port_id,
+                    int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                    int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
 {
-    Bool is_ok=FALSE ;
-    int res=FALSE ;
-    GC gc=0 ;
+    Bool is_ok = FALSE;
+    int res = FALSE;
+    GC gc = 0;
     XGCValues gc_values;
-    Display *dpy=hostx_get_display () ;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
 
-    gc = XCreateGC (dpy, hostx_get_window (a_screen_num), 0L, &gc_values);
+    gc = XCreateGC(dpy, hostx_get_window(a_screen_num), 0L, &gc_values);
     if (!gc) {
-        EPHYR_LOG_ERROR ("failed to create gc \n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create gc \n");
+        goto out;
     }
-    res = XvPutStill (dpy, a_port_id, hostx_get_window (a_screen_num), gc,
-                      a_vid_x, a_vid_y, a_vid_w, a_vid_h,
-                      a_drw_x, a_drw_y, a_drw_w, a_drw_h) ;
+    res = XvPutStill(dpy, a_port_id, hostx_get_window(a_screen_num), gc,
+                     a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                     a_drw_x, a_drw_y, a_drw_w, a_drw_h);
 
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvPutStill() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvPutStill() failed: %d\n", res);
+        goto out;
     }
 
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
+ out:
     if (gc) {
-        XFreeGC (dpy, gc) ;
-        gc = NULL ;
+        XFreeGC(dpy, gc);
+        gc = NULL;
     }
-    return is_ok ;
+    return is_ok;
 }
 
 Bool
-ephyrHostXVGetStill (int a_screen_num, int a_port_id,
-                     int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                     int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
+ephyrHostXVGetStill(int a_screen_num, int a_port_id,
+                    int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                    int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
 {
-    Bool is_ok=FALSE ;
-    int res=FALSE ;
-    GC gc=0 ;
+    Bool is_ok = FALSE;
+    int res = FALSE;
+    GC gc = 0;
     XGCValues gc_values;
-    Display *dpy=hostx_get_display () ;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
 
-    gc = XCreateGC (dpy, hostx_get_window (a_screen_num), 0L, &gc_values);
+    gc = XCreateGC(dpy, hostx_get_window(a_screen_num), 0L, &gc_values);
     if (!gc) {
-        EPHYR_LOG_ERROR ("failed to create gc \n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create gc \n");
+        goto out;
     }
-    res = XvGetStill (dpy, a_port_id, hostx_get_window (a_screen_num), gc,
-                      a_vid_x, a_vid_y, a_vid_w, a_vid_h,
-                      a_drw_x, a_drw_y, a_drw_w, a_drw_h) ;
+    res = XvGetStill(dpy, a_port_id, hostx_get_window(a_screen_num), gc,
+                     a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                     a_drw_x, a_drw_y, a_drw_w, a_drw_h);
 
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvGetStill() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvGetStill() failed: %d\n", res);
+        goto out;
     }
 
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
+ out:
     if (gc) {
-        XFreeGC (dpy, gc) ;
-        gc = NULL ;
+        XFreeGC(dpy, gc);
+        gc = NULL;
     }
-    return is_ok ;
+    return is_ok;
 }
 
 Bool
-ephyrHostXVStopVideo (int a_screen_num, int a_port_id)
+ephyrHostXVStopVideo(int a_screen_num, int a_port_id)
 {
-    int ret=0 ;
-    Bool is_ok=FALSE ;
-    Display *dpy = hostx_get_display () ;
+    int ret = 0;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
 
-    ret = XvStopVideo (dpy, a_port_id, hostx_get_window (a_screen_num)) ;
+    ret = XvStopVideo(dpy, a_port_id, hostx_get_window(a_screen_num));
     if (ret != Success) {
-        EPHYR_LOG_ERROR ("XvStopVideo() failed: %d \n", ret) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvStopVideo() failed: %d \n", ret);
+        goto out;
     }
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
-
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.h b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.h
index 05ee38a03..0d3177277 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.h
@@ -28,40 +28,40 @@
 #ifndef __EPHYRHOSTVIDEO_H__
 #define __EPHYRHOSTVIDEO_H__
 
-typedef void* EphyrHostXVAdaptor ;
-typedef struct _EphyrHostXVAdaptorArray EphyrHostXVAdaptorArray ;
+typedef void *EphyrHostXVAdaptor;
+typedef struct _EphyrHostXVAdaptorArray EphyrHostXVAdaptorArray;
 
 typedef struct _EphyrHostVideoFormat {
-    char depth ;
+    char depth;
     short visual_class;
-} EphyrHostVideoFormat ;
+} EphyrHostVideoFormat;
 
 typedef struct _EphyrHostRational {
-    int numerator ;
-    int denominator ;
+    int numerator;
+    int denominator;
 } EphyrHostRational;
 
 typedef struct _EphyrHostEncoding {
-    int id ;
-    char *name ;
-    unsigned short width, height ;
-    EphyrHostRational rate ;
-} EphyrHostEncoding ;
+    int id;
+    char *name;
+    unsigned short width, height;
+    EphyrHostRational rate;
+} EphyrHostEncoding;
 
 typedef struct _EphyrHostAttribute {
     int flags;
     int min_value;
     int max_value;
     char *name;
-} EphyrHostAttribute ;
+} EphyrHostAttribute;
 
 typedef struct _EphyrHostImageFormat {
-    int id;                      /* Unique descriptor for the format */
-    int type;                    /* XvRGB, XvYUV */
-    int byte_order;              /* LSBFirst, MSBFirst */
-    char guid[16];               /* Globally Unique IDentifier */
+    int id;                     /* Unique descriptor for the format */
+    int type;                   /* XvRGB, XvYUV */
+    int byte_order;             /* LSBFirst, MSBFirst */
+    char guid[16];              /* Globally Unique IDentifier */
     int bits_per_pixel;
-    int format;                  /* XvPacked, XvPlanar */
+    int format;                 /* XvPacked, XvPlanar */
     int num_planes;
 
     /* for RGB formats only */
@@ -80,159 +80,152 @@ typedef struct _EphyrHostImageFormat {
     unsigned int vert_y_period;
     unsigned int vert_u_period;
     unsigned int vert_v_period;
-    char component_order[32];    /* eg. UYVY */
-    int scanline_order;          /* XvTopToBottom, XvBottomToTop */
-} EphyrHostImageFormat ;
+    char component_order[32];   /* eg. UYVY */
+    int scanline_order;         /* XvTopToBottom, XvBottomToTop */
+} EphyrHostImageFormat;
 
 typedef struct {
-    unsigned short x1, y1, x2, y2 ;
-} EphyrHostBox ;
+    unsigned short x1, y1, x2, y2;
+} EphyrHostBox;
 
-void ephyrHostXVInit (void) ;
+void ephyrHostXVInit(void);
 
-void ephyrHostFree (void *a_pointer) ;
+void ephyrHostFree(void *a_pointer);
 
 /*
  * host adaptor array
  */
-Bool ephyrHostXVQueryAdaptors (EphyrHostXVAdaptorArray **a_adaptors) ;
-void ephyrHostXVAdaptorArrayDelete (EphyrHostXVAdaptorArray *a_adaptors) ;
-int ephyrHostXVAdaptorArrayGetSize (const EphyrHostXVAdaptorArray *a_this) ;
-EphyrHostXVAdaptor* ephyrHostXVAdaptorArrayAt (const EphyrHostXVAdaptorArray *a_this,
-                                               int a_index) ;
+Bool ephyrHostXVQueryAdaptors(EphyrHostXVAdaptorArray ** a_adaptors);
+void ephyrHostXVAdaptorArrayDelete(EphyrHostXVAdaptorArray * a_adaptors);
+int ephyrHostXVAdaptorArrayGetSize(const EphyrHostXVAdaptorArray * a_this);
+EphyrHostXVAdaptor *ephyrHostXVAdaptorArrayAt(const EphyrHostXVAdaptorArray *
+                                              a_this, int a_index);
 
 /*
  * host adaptor
  */
 
-char ephyrHostXVAdaptorGetType (const EphyrHostXVAdaptor *a_this) ;
-const char* ephyrHostXVAdaptorGetName (const EphyrHostXVAdaptor *a_this) ;
-EphyrHostVideoFormat* ephyrHostXVAdaptorGetVideoFormats
-                                                (const EphyrHostXVAdaptor *a_this,
-                                                 int *a_nb_formats) ;
-int ephyrHostXVAdaptorGetNbPorts (const EphyrHostXVAdaptor *a_this) ;
-int ephyrHostXVAdaptorGetFirstPortID (const EphyrHostXVAdaptor *a_this) ;
-
-Bool ephyrHostXVAdaptorHasPutVideo (const EphyrHostXVAdaptor *a_this,
-                                    Bool *a_result) ;
-Bool ephyrHostXVAdaptorHasGetVideo (const EphyrHostXVAdaptor *a_this,
-                                    Bool *a_result) ;
-Bool ephyrHostXVAdaptorHasPutStill (const EphyrHostXVAdaptor *a_this,
-                                    Bool *a_result) ;
-Bool ephyrHostXVAdaptorHasGetStill (const EphyrHostXVAdaptor *a_this,
-                                    Bool *a_result) ;
-Bool ephyrHostXVAdaptorHasPutImage (const EphyrHostXVAdaptor *a_this,
-                                    Bool *a_result) ;
+char ephyrHostXVAdaptorGetType(const EphyrHostXVAdaptor * a_this);
+const char *ephyrHostXVAdaptorGetName(const EphyrHostXVAdaptor * a_this);
+EphyrHostVideoFormat *ephyrHostXVAdaptorGetVideoFormats
+    (const EphyrHostXVAdaptor * a_this, int *a_nb_formats);
+int ephyrHostXVAdaptorGetNbPorts(const EphyrHostXVAdaptor * a_this);
+int ephyrHostXVAdaptorGetFirstPortID(const EphyrHostXVAdaptor * a_this);
+
+Bool ephyrHostXVAdaptorHasPutVideo(const EphyrHostXVAdaptor * a_this,
+                                   Bool *a_result);
+Bool ephyrHostXVAdaptorHasGetVideo(const EphyrHostXVAdaptor * a_this,
+                                   Bool *a_result);
+Bool ephyrHostXVAdaptorHasPutStill(const EphyrHostXVAdaptor * a_this,
+                                   Bool *a_result);
+Bool ephyrHostXVAdaptorHasGetStill(const EphyrHostXVAdaptor * a_this,
+                                   Bool *a_result);
+Bool ephyrHostXVAdaptorHasPutImage(const EphyrHostXVAdaptor * a_this,
+                                   Bool *a_result);
 
 /*
  * encoding
  */
-Bool ephyrHostXVQueryEncodings (int a_port_id,
-                                EphyrHostEncoding **a_encodings,
-                                unsigned int *a_num_encodings) ;
+Bool ephyrHostXVQueryEncodings(int a_port_id,
+                               EphyrHostEncoding ** a_encodings,
+                               unsigned int *a_num_encodings);
 
-void ephyrHostEncodingsDelete (EphyrHostEncoding *a_encodings,
-                               int a_num_encodings) ;
+void ephyrHostEncodingsDelete(EphyrHostEncoding * a_encodings,
+                              int a_num_encodings);
 
 /*
  * attribute
  */
-Bool ephyrHostXVQueryPortAttributes (int a_port_id,
-                                     EphyrHostAttribute **a_attributes,
-                                     int *a_num_attributes) ;
+Bool ephyrHostXVQueryPortAttributes(int a_port_id,
+                                    EphyrHostAttribute ** a_attributes,
+                                    int *a_num_attributes);
+
+void ephyrHostAttributesDelete(EphyrHostAttribute * a_attributes);
 
-void ephyrHostAttributesDelete (EphyrHostAttribute *a_attributes) ;
 /*
  * image format
  */
 
-Bool ephyrHostXVQueryImageFormats (int a_port_id,
-                                   EphyrHostImageFormat **a_formats,
-                                   int *a_num_format) ;
+Bool ephyrHostXVQueryImageFormats(int a_port_id,
+                                  EphyrHostImageFormat ** a_formats,
+                                  int *a_num_format);
 /*
  * Port Attribute Get/Set
  */
-Bool ephyrHostXVSetPortAttribute (int a_port_id,
-                                  int a_atom,
-                                  int a_attr_value) ;
-Bool ephyrHostXVGetPortAttribute (int a_port_id,
-                                  int a_atom,
-                                  int *a_attr_value) ;
+Bool ephyrHostXVSetPortAttribute(int a_port_id, int a_atom, int a_attr_value);
+Bool ephyrHostXVGetPortAttribute(int a_port_id, int a_atom, int *a_attr_value);
+
 /*
  *size query
  */
-Bool ephyrHostXVQueryBestSize (int a_port_id,
-                               Bool a_motion,
-                               unsigned int a_frame_w,
-                               unsigned int a_frame_h,
-                               unsigned int a_drw_w,
-                               unsigned int a_drw_h,
-                               unsigned int *a_actual_w,
-                               unsigned int *a_actual_h) ;
-
-Bool ephyrHostXVQueryImageAttributes (int a_port_id,
-                                      int a_image_id /*image fourcc code*/,
-                                      unsigned short *a_width,
-                                      unsigned short *a_height,
-                                      int *a_image_size,
-                                      int *a_pitches,
-                                      int *a_offsets) ;
+Bool ephyrHostXVQueryBestSize(int a_port_id,
+                              Bool a_motion,
+                              unsigned int a_frame_w,
+                              unsigned int a_frame_h,
+                              unsigned int a_drw_w,
+                              unsigned int a_drw_h,
+                              unsigned int *a_actual_w,
+                              unsigned int *a_actual_h);
+
+Bool ephyrHostXVQueryImageAttributes(int a_port_id,
+                                     int a_image_id /*image fourcc code */ ,
+                                     unsigned short *a_width,
+                                     unsigned short *a_height,
+                                     int *a_image_size,
+                                     int *a_pitches, int *a_offsets);
 /*
  * atom
  */
-Bool ephyrHostGetAtom (const char* a_name,
-                       Bool a_create_if_not_exists,
-                       int *a_atom) ;
-char* ephyrHostGetAtomName (int a_atom) ;
+Bool ephyrHostGetAtom(const char *a_name,
+                      Bool a_create_if_not_exists, int *a_atom);
+char *ephyrHostGetAtomName(int a_atom);
 
 /*
  *PutImage
  * (ignore clipping for now)
  */
-Bool ephyrHostXVPutImage (int a_screen_num,
-                          int a_port_id,
-                          int a_image_id,
-                          int a_drw_x,
-                          int a_drw_y,
-                          int a_drw_w,
-                          int a_drw_h,
-                          int a_src_x,
-                          int a_src_y,
-                          int a_src_w,
-                          int a_src_h,
-                          int a_image_width,
-                          int a_image_height,
-                          unsigned char *a_buf,
-                          EphyrHostBox *a_clip_rects,
-                          int a_clip_rect_nums) ;
+Bool ephyrHostXVPutImage(int a_screen_num,
+                         int a_port_id,
+                         int a_image_id,
+                         int a_drw_x,
+                         int a_drw_y,
+                         int a_drw_w,
+                         int a_drw_h,
+                         int a_src_x,
+                         int a_src_y,
+                         int a_src_w,
+                         int a_src_h,
+                         int a_image_width,
+                         int a_image_height,
+                         unsigned char *a_buf,
+                         EphyrHostBox * a_clip_rects, int a_clip_rect_nums);
 
 /*
  * Putvideo/PutStill/GetVideo
  */
-Bool ephyrHostXVPutVideo (int a_screen_num,
-                          int a_port_id,
-                          int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                          int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h) ;
-
-Bool ephyrHostXVGetVideo (int a_screen_num,
-                          int a_port_id,
-                          int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                          int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h) ;
-
-Bool ephyrHostXVPutStill (int a_screen_num,
-                          int a_port_id,
-                          int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                          int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h) ;
-
-Bool ephyrHostXVGetStill (int a_screen_num,
-                          int a_port_id,
-                          int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                          int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h) ;
+Bool ephyrHostXVPutVideo(int a_screen_num,
+                         int a_port_id,
+                         int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                         int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h);
+
+Bool ephyrHostXVGetVideo(int a_screen_num,
+                         int a_port_id,
+                         int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                         int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h);
+
+Bool ephyrHostXVPutStill(int a_screen_num,
+                         int a_port_id,
+                         int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                         int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h);
+
+Bool ephyrHostXVGetStill(int a_screen_num,
+                         int a_port_id,
+                         int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                         int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h);
 
 /*
  * StopVideo
  */
-Bool ephyrHostXVStopVideo (int a_screen_num, int a_port_id) ;
+Bool ephyrHostXVStopVideo(int a_screen_num, int a_port_id);
 
 #endif /*__EPHYRHOSTVIDEO_H__*/
-
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
index b674bb8d0..a62b49d4b 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
@@ -30,301 +30,274 @@
 #include "ephyrlog.h"
 
 extern Window EphyrPreExistingHostWin;
-extern Bool   EphyrWantGrayScale;
-extern Bool   kdHasPointer;
-extern Bool   kdHasKbd;
+extern Bool EphyrWantGrayScale;
+extern Bool kdHasPointer;
+extern Bool kdHasKbd;
 
 #ifdef GLXEXT
-extern Bool   ephyrNoDRI;
+extern Bool ephyrNoDRI;
 extern Bool noGlxVisualInit;
 #endif
-extern Bool   ephyrNoXV;
+extern Bool ephyrNoXV;
 
 #ifdef KDRIVE_EVDEV
-extern KdPointerDriver	LinuxEvdevMouseDriver;
+extern KdPointerDriver LinuxEvdevMouseDriver;
 extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
 #endif
 
-void processScreenArg (char *screen_size, char *parent_id) ;
+void processScreenArg(char *screen_size, char *parent_id);
 
 void
-InitCard (char *name)
+InitCard(char *name)
 {
     EPHYR_DBG("mark");
-    KdCardInfoAdd (&ephyrFuncs, 0);
+    KdCardInfoAdd(&ephyrFuncs, 0);
 }
 
 void
-InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv)
+InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
 {
-  KdInitOutput (pScreenInfo, argc, argv);
+    KdInitOutput(pScreenInfo, argc, argv);
 }
 
 void
-InitInput (int argc, char **argv)
+InitInput(int argc, char **argv)
 {
-  KdKeyboardInfo *ki;
-  KdPointerInfo *pi;
+    KdKeyboardInfo *ki;
+    KdPointerInfo *pi;
 
-  KdAddKeyboardDriver(&EphyrKeyboardDriver);
+    KdAddKeyboardDriver(&EphyrKeyboardDriver);
 #ifdef KDRIVE_EVDEV
-  KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver);
+    KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver);
 #endif
-  KdAddPointerDriver(&EphyrMouseDriver);
+    KdAddPointerDriver(&EphyrMouseDriver);
 #ifdef KDRIVE_EVDEV
-  KdAddPointerDriver(&LinuxEvdevMouseDriver);
+    KdAddPointerDriver(&LinuxEvdevMouseDriver);
 #endif
 
-  if (!kdHasKbd) {
-    ki = KdNewKeyboard();
-    if (!ki)
-      FatalError("Couldn't create Xephyr keyboard\n");
-    ki->driver = &EphyrKeyboardDriver;
-    KdAddKeyboard(ki);
-  }
-
-  if (!kdHasPointer) {
-    pi = KdNewPointer();
-    if (!pi)
-      FatalError("Couldn't create Xephyr pointer\n");
-    pi->driver = &EphyrMouseDriver;
-    KdAddPointer(pi);
-  }
-
-  KdInitInput();
+    if (!kdHasKbd) {
+        ki = KdNewKeyboard();
+        if (!ki)
+            FatalError("Couldn't create Xephyr keyboard\n");
+        ki->driver = &EphyrKeyboardDriver;
+        KdAddKeyboard(ki);
+    }
+
+    if (!kdHasPointer) {
+        pi = KdNewPointer();
+        if (!pi)
+            FatalError("Couldn't create Xephyr pointer\n");
+        pi->driver = &EphyrMouseDriver;
+        KdAddPointer(pi);
+    }
+
+    KdInitInput();
 }
 
 void
-CloseInput (void)
+CloseInput(void)
 {
-  KdCloseInput();
+    KdCloseInput();
 }
 
 #ifdef DDXBEFORERESET
 void
-ddxBeforeReset (void)
+ddxBeforeReset(void)
 {
 }
 #endif
 
 void
-ddxUseMsg (void)
+ddxUseMsg(void)
 {
-  KdUseMsg();
-
-  ErrorF("\nXephyr Option Usage:\n");
-  ErrorF("-parent <XID>        Use existing window as Xephyr root win\n");
-  ErrorF("-host-cursor         Re-use exisiting X host server cursor\n");
-  ErrorF("-fullscreen          Attempt to run Xephyr fullscreen\n");
-  ErrorF("-grayscale           Simulate 8bit grayscale\n");
-  ErrorF("-fakexa              Simulate acceleration using software rendering\n");
-  ErrorF("-verbosity <level>   Set log verbosity level\n");
+    KdUseMsg();
+
+    ErrorF("\nXephyr Option Usage:\n");
+    ErrorF("-parent <XID>        Use existing window as Xephyr root win\n");
+    ErrorF("-host-cursor         Re-use exisiting X host server cursor\n");
+    ErrorF("-fullscreen          Attempt to run Xephyr fullscreen\n");
+    ErrorF("-grayscale           Simulate 8bit grayscale\n");
+    ErrorF
+        ("-fakexa              Simulate acceleration using software rendering\n");
+    ErrorF("-verbosity <level>   Set log verbosity level\n");
 #ifdef GLXEXT
-  ErrorF("-nodri               do not use DRI\n");
+    ErrorF("-nodri               do not use DRI\n");
 #endif
-  ErrorF("-noxv                do not use XV\n");
-  ErrorF("-name [name]         define the name in the WM_CLASS property\n");
-  ErrorF("-title [title]       set the window title in the WM_NAME property\n");
-  ErrorF("\n");
+    ErrorF("-noxv                do not use XV\n");
+    ErrorF("-name [name]         define the name in the WM_CLASS property\n");
+    ErrorF
+        ("-title [title]       set the window title in the WM_NAME property\n");
+    ErrorF("\n");
 
-  exit(1);
+    exit(1);
 }
 
 void
-processScreenArg (char *screen_size, char *parent_id)
+processScreenArg(char *screen_size, char *parent_id)
 {
-  KdCardInfo   *card;
+    KdCardInfo *card;
 
-  InitCard (0);  /*Put each screen on a separate card*/
-  card = KdCardInfoLast ();
+    InitCard(0);                /*Put each screen on a separate card */
+    card = KdCardInfoLast();
 
-  if (card)
-    {
-      KdScreenInfo *screen;
-      unsigned long p_id = 0;
+    if (card) {
+        KdScreenInfo *screen;
+        unsigned long p_id = 0;
 
-      screen = KdScreenInfoAdd (card);
-      KdParseScreen (screen, screen_size);
+        screen = KdScreenInfoAdd(card);
+        KdParseScreen(screen, screen_size);
 
-      if (parent_id)
-        {
-          p_id = strtol (parent_id, NULL, 0);
+        if (parent_id) {
+            p_id = strtol(parent_id, NULL, 0);
         }
-      EPHYR_DBG ("screen number:%d\n", screen->mynum) ;
-      hostx_add_screen (screen, p_id, screen->mynum);
+        EPHYR_DBG("screen number:%d\n", screen->mynum);
+        hostx_add_screen(screen, p_id, screen->mynum);
     }
-  else
-    {
-      ErrorF("No matching card found!\n");
+    else {
+        ErrorF("No matching card found!\n");
     }
 }
 
 int
-ddxProcessArgument (int argc, char **argv, int i)
+ddxProcessArgument(int argc, char **argv, int i)
 {
-  static char* parent = NULL;
-  EPHYR_DBG("mark argv[%d]='%s'", i, argv[i] );
+    static char *parent = NULL;
 
-  if (i == 1)
-    {
-      hostx_use_resname(basename(argv[0]), 0);
+    EPHYR_DBG("mark argv[%d]='%s'", i, argv[i]);
+
+    if (i == 1) {
+        hostx_use_resname(basename(argv[0]), 0);
     }
 
-  if (!strcmp (argv[i], "-parent"))
-    {
-      if(i+1 < argc)
-	{
-	  int j;
-	  /* If parent is specified and a screen argument follows, don't do
-           * anything, let the -screen handling init the rest */
-	  for (j = i; j < argc; j++)
-	    {
-	      if (!strcmp(argv[j], "-screen"))
-		{
-		  parent = argv[i + 1];
-		  return 2;
-		}
-	    }
-
-	  processScreenArg ("100x100", argv[i+1]);
-	  return 2;
-	}
-
-      UseMsg();
-      exit(1);
+    if (!strcmp(argv[i], "-parent")) {
+        if (i + 1 < argc) {
+            int j;
+
+            /* If parent is specified and a screen argument follows, don't do
+             * anything, let the -screen handling init the rest */
+            for (j = i; j < argc; j++) {
+                if (!strcmp(argv[j], "-screen")) {
+                    parent = argv[i + 1];
+                    return 2;
+                }
+            }
+
+            processScreenArg("100x100", argv[i + 1]);
+            return 2;
+        }
+
+        UseMsg();
+        exit(1);
     }
-  else if (!strcmp (argv[i], "-screen"))
-    {
-      if ((i+1) < argc)
-	{
-	  processScreenArg (argv[i+1], parent);
-	  parent = NULL;
-	  return 2;
-	}
-
-      UseMsg();
-      exit(1);
+    else if (!strcmp(argv[i], "-screen")) {
+        if ((i + 1) < argc) {
+            processScreenArg(argv[i + 1], parent);
+            parent = NULL;
+            return 2;
+        }
+
+        UseMsg();
+        exit(1);
     }
-  else if (!strcmp (argv[i], "-host-cursor"))
-    {
-      hostx_use_host_cursor();
-      return 1;
+    else if (!strcmp(argv[i], "-host-cursor")) {
+        hostx_use_host_cursor();
+        return 1;
     }
-  else if (!strcmp (argv[i], "-fullscreen"))
-    {
-      hostx_use_fullscreen();
-      return 1;
+    else if (!strcmp(argv[i], "-fullscreen")) {
+        hostx_use_fullscreen();
+        return 1;
     }
-  else if (!strcmp (argv[i], "-grayscale"))
-    {
-      EphyrWantGrayScale = 1;      
-      return 1;
+    else if (!strcmp(argv[i], "-grayscale")) {
+        EphyrWantGrayScale = 1;
+        return 1;
     }
-  else if (!strcmp (argv[i], "-fakexa"))
-    {
-      ephyrFuncs.initAccel = ephyrDrawInit;
-      ephyrFuncs.enableAccel = ephyrDrawEnable;
-      ephyrFuncs.disableAccel = ephyrDrawDisable;
-      ephyrFuncs.finiAccel = ephyrDrawFini;
-      return 1;
+    else if (!strcmp(argv[i], "-fakexa")) {
+        ephyrFuncs.initAccel = ephyrDrawInit;
+        ephyrFuncs.enableAccel = ephyrDrawEnable;
+        ephyrFuncs.disableAccel = ephyrDrawDisable;
+        ephyrFuncs.finiAccel = ephyrDrawFini;
+        return 1;
     }
-  else if (!strcmp (argv[i], "-verbosity"))
-    {
-      if(i+1 < argc && argv[i+1][0] != '-')
-	{
-	  int verbosity=atoi (argv[i+1]) ;
-	  LogSetParameter (XLOG_VERBOSITY, verbosity) ;
-	  EPHYR_LOG ("set verbosiry to %d\n", verbosity) ;
-	  return 2 ;
-	}
-      else
-	{
-	  UseMsg() ;
-	  exit(1) ;
-	}
+    else if (!strcmp(argv[i], "-verbosity")) {
+        if (i + 1 < argc && argv[i + 1][0] != '-') {
+            int verbosity = atoi(argv[i + 1]);
+
+            LogSetParameter(XLOG_VERBOSITY, verbosity);
+            EPHYR_LOG("set verbosiry to %d\n", verbosity);
+            return 2;
+        }
+        else {
+            UseMsg();
+            exit(1);
+        }
     }
 #ifdef GLXEXT
-  else if (!strcmp (argv[i], "-nodri"))
-   {
-       noGlxVisualInit = FALSE ;
-       ephyrNoDRI = TRUE ;
-       EPHYR_LOG ("no direct rendering enabled\n") ;
-       return 1 ;
-   }
+    else if (!strcmp(argv[i], "-nodri")) {
+        noGlxVisualInit = FALSE;
+        ephyrNoDRI = TRUE;
+        EPHYR_LOG("no direct rendering enabled\n");
+        return 1;
+    }
 #endif
-  else if (!strcmp (argv[i], "-noxv"))
-   {
-       ephyrNoXV = TRUE ;
-       EPHYR_LOG ("no XVideo enabled\n") ;
-       return 1 ;
-   }
-  else if (!strcmp (argv[i], "-name"))
-   {
-       if (i+1 < argc && argv[i+1][0] != '-')
-         {
-           hostx_use_resname(argv[i+1], 1);
-           return 2;
-         }
-       else
-         {
-           UseMsg();
-           return 0;
-         }
-   }
-  else if (!strcmp (argv[i], "-title"))
-   {
-       if (i+1 < argc && argv[i+1][0] != '-')
-         {
-           hostx_set_title(argv[i+1]);
-           return 2;
-         }
-       else
-         {
-           UseMsg();
-           return 0;
-         }
-   }
-  else if (argv[i][0] == ':')
-    {
-      hostx_set_display_name(argv[i]);
+    else if (!strcmp(argv[i], "-noxv")) {
+        ephyrNoXV = TRUE;
+        EPHYR_LOG("no XVideo enabled\n");
+        return 1;
     }
-  /* Xnest compatibility */
-  else if (!strcmp(argv[i], "-display"))
-  {
-      hostx_set_display_name(argv[i+1]);
-      return 2;
-  }
-  else if (!strcmp(argv[i], "-sync") ||
-	   !strcmp(argv[i], "-full") ||
-	   !strcmp(argv[i], "-sss") ||
-	   !strcmp(argv[i], "-install"))
-  {
-      return 1;
-  }
-  else if (!strcmp(argv[i], "-bw") ||
-	   !strcmp(argv[i], "-class") ||
-	   !strcmp(argv[i], "-geometry") ||
-	   !strcmp(argv[i], "-scrns"))
-  {
-      return 2;
-  }
-  /* end Xnest compat */
-
-  return KdProcessArgument (argc, argv, i);
+    else if (!strcmp(argv[i], "-name")) {
+        if (i + 1 < argc && argv[i + 1][0] != '-') {
+            hostx_use_resname(argv[i + 1], 1);
+            return 2;
+        }
+        else {
+            UseMsg();
+            return 0;
+        }
+    }
+    else if (!strcmp(argv[i], "-title")) {
+        if (i + 1 < argc && argv[i + 1][0] != '-') {
+            hostx_set_title(argv[i + 1]);
+            return 2;
+        }
+        else {
+            UseMsg();
+            return 0;
+        }
+    }
+    else if (argv[i][0] == ':') {
+        hostx_set_display_name(argv[i]);
+    }
+    /* Xnest compatibility */
+    else if (!strcmp(argv[i], "-display")) {
+        hostx_set_display_name(argv[i + 1]);
+        return 2;
+    }
+    else if (!strcmp(argv[i], "-sync") ||
+             !strcmp(argv[i], "-full") ||
+             !strcmp(argv[i], "-sss") || !strcmp(argv[i], "-install")) {
+        return 1;
+    }
+    else if (!strcmp(argv[i], "-bw") ||
+             !strcmp(argv[i], "-class") ||
+             !strcmp(argv[i], "-geometry") || !strcmp(argv[i], "-scrns")) {
+        return 2;
+    }
+    /* end Xnest compat */
+
+    return KdProcessArgument(argc, argv, i);
 }
 
 void
-OsVendorInit (void)
+OsVendorInit(void)
 {
-  EPHYR_DBG("mark");
+    EPHYR_DBG("mark");
 
-  if (hostx_want_host_cursor())
-    {
-      ephyrFuncs.initCursor   = &ephyrCursorInit;
-      ephyrFuncs.enableCursor = &ephyrCursorEnable;
+    if (hostx_want_host_cursor()) {
+        ephyrFuncs.initCursor = &ephyrCursorInit;
+        ephyrFuncs.enableCursor = &ephyrCursorEnable;
     }
 
-  KdOsInit (&EphyrOsFuncs);
+    KdOsInit(&EphyrOsFuncs);
 }
 
 /* 'Fake' cursor stuff, could be improved */
@@ -332,31 +305,32 @@ OsVendorInit (void)
 static Bool
 ephyrRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
 {
-  return TRUE;
+    return TRUE;
 }
 
 static Bool
 ephyrUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
 {
-  return TRUE;
+    return TRUE;
 }
 
 static void
-ephyrSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
+ephyrSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x,
+               int y)
 {
-  ;
+    ;
 }
 
 static void
 ephyrMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 {
-  ;
+    ;
 }
 
 static Bool
 ephyrDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
 {
-  return TRUE;
+    return TRUE;
 }
 
 static void
@@ -365,57 +339,55 @@ ephyrDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
 }
 
 miPointerSpriteFuncRec EphyrPointerSpriteFuncs = {
-	ephyrRealizeCursor,
-	ephyrUnrealizeCursor,
-	ephyrSetCursor,
-	ephyrMoveCursor,
-	ephyrDeviceCursorInitialize,
-	ephyrDeviceCursorCleanup
+    ephyrRealizeCursor,
+    ephyrUnrealizeCursor,
+    ephyrSetCursor,
+    ephyrMoveCursor,
+    ephyrDeviceCursorInitialize,
+    ephyrDeviceCursorCleanup
 };
 
-
 Bool
 ephyrCursorInit(ScreenPtr pScreen)
 {
-  miPointerInitialize(pScreen,
-		      &EphyrPointerSpriteFuncs,
-		      &ephyrPointerScreenFuncs,
-		      FALSE);
+    miPointerInitialize(pScreen,
+                        &EphyrPointerSpriteFuncs,
+                        &ephyrPointerScreenFuncs, FALSE);
 
-  return TRUE;
+    return TRUE;
 }
 
 void
 ephyrCursorEnable(ScreenPtr pScreen)
 {
-  ;
+    ;
 }
 
 KdCardFuncs ephyrFuncs = {
-    ephyrCardInit,	    /* cardinit */
-    ephyrScreenInit,	    /* scrinit */
-    ephyrInitScreen,	    /* initScreen */
-    ephyrFinishInitScreen,  /* finishInitScreen */
-    ephyrCreateResources,   /* createRes */
-    ephyrPreserve,	    /* preserve */
-    ephyrEnable,	    /* enable */
-    ephyrDPMS,		    /* dpms */
-    ephyrDisable,	    /* disable */
-    ephyrRestore,	    /* restore */
-    ephyrScreenFini,	    /* scrfini */
-    ephyrCardFini,	    /* cardfini */
-
-    0,			    /* initCursor */
-    0,			    /* enableCursor */
-    0,			    /* disableCursor */
-    0,			    /* finiCursor */
-    0,			    /* recolorCursor */
-
-    0,			    /* initAccel */
-    0,			    /* enableAccel */
-    0,			    /* disableAccel */
-    0,			    /* finiAccel */
-
-    ephyrGetColors,/* getColors */
-    ephyrPutColors,	    /* putColors */
+    ephyrCardInit,              /* cardinit */
+    ephyrScreenInit,            /* scrinit */
+    ephyrInitScreen,            /* initScreen */
+    ephyrFinishInitScreen,      /* finishInitScreen */
+    ephyrCreateResources,       /* createRes */
+    ephyrPreserve,              /* preserve */
+    ephyrEnable,                /* enable */
+    ephyrDPMS,                  /* dpms */
+    ephyrDisable,               /* disable */
+    ephyrRestore,               /* restore */
+    ephyrScreenFini,            /* scrfini */
+    ephyrCardFini,              /* cardfini */
+
+    0,                          /* initCursor */
+    0,                          /* enableCursor */
+    0,                          /* disableCursor */
+    0,                          /* finiCursor */
+    0,                          /* recolorCursor */
+
+    0,                          /* initAccel */
+    0,                          /* enableAccel */
+    0,                          /* disableAccel */
+    0,                          /* finiAccel */
+
+    ephyrGetColors,             /* getColors */
+    ephyrPutColors,             /* putColors */
 };
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrproxyext.c b/xorg-server/hw/kdrive/ephyr/ephyrproxyext.c
index 0c070f4c7..3d86d2db1 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrproxyext.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrproxyext.c
@@ -46,74 +46,70 @@
 #include "ephyrhostproxy.h"
 #include "hostx.h"
 
-static Bool ephyrProxyGetHostExtensionInfo (const char *a_ext_name,
-                                            int *a_major_opcode,
-                                            int *a_first_event,
-                                            int *a_first_error) ;
+static Bool ephyrProxyGetHostExtensionInfo(const char *a_ext_name,
+                                           int *a_major_opcode,
+                                           int *a_first_event,
+                                           int *a_first_error);
 
-static int ephyrProxyProcDispatch (ClientPtr client) ;
+static int ephyrProxyProcDispatch(ClientPtr client);
 
 static Bool
-ephyrProxyGetHostExtensionInfo (const char *a_ext_name,
-                                int *a_major_opcode,
-                                int *a_first_event,
-                                int *a_first_error)
+ephyrProxyGetHostExtensionInfo(const char *a_ext_name,
+                               int *a_major_opcode,
+                               int *a_first_event, int *a_first_error)
 {
-    return hostx_get_extension_info (a_ext_name, a_major_opcode,
-                                     a_first_event, a_first_error) ;
+    return hostx_get_extension_info(a_ext_name, a_major_opcode,
+                                    a_first_event, a_first_error);
 }
 
 static int
-ephyrProxyProcDispatch (ClientPtr a_client)
+ephyrProxyProcDispatch(ClientPtr a_client)
 {
-    int res=BadImplementation ;
-    struct XReply reply ;
+    int res = BadImplementation;
+    struct XReply reply;
 
-    if (!ephyrHostProxyDoForward (a_client->requestBuffer, &reply, FALSE)) {
-        EPHYR_LOG_ERROR ("forwarding failed\n") ;
-        goto out ;
+    if (!ephyrHostProxyDoForward(a_client->requestBuffer, &reply, FALSE)) {
+        EPHYR_LOG_ERROR("forwarding failed\n");
+        goto out;
     }
     reply.sequence_number = a_client->sequence;
-    res = Success ;
+    res = Success;
 
-    WriteToClient(a_client, 32, (char *)&reply);
+    WriteToClient(a_client, 32, (char *) &reply);
 
-out:
-    return res ;
+ out:
+    return res;
 }
 
 static void
-ephyrProxyProcReset (ExtensionEntry *a_entry)
+ephyrProxyProcReset(ExtensionEntry * a_entry)
 {
 }
 
 Bool
-ephyrProxyExtensionInit (const char *a_extension_name)
+ephyrProxyExtensionInit(const char *a_extension_name)
 {
-    Bool is_ok = FALSE ;
-    int major_opcode=0, first_event=0, first_error=0;
-    ExtensionEntry *ext=NULL ;
+    Bool is_ok = FALSE;
+    int major_opcode = 0, first_event = 0, first_error = 0;
+    ExtensionEntry *ext = NULL;
 
-    if (!ephyrProxyGetHostExtensionInfo (a_extension_name,
-                                         &major_opcode,
-                                         &first_event,
-                                         &first_error)) {
-        EPHYR_LOG ("failed to query extension %s from host\n", a_extension_name) ;
+    if (!ephyrProxyGetHostExtensionInfo(a_extension_name,
+                                        &major_opcode,
+                                        &first_event, &first_error)) {
+        EPHYR_LOG("failed to query extension %s from host\n", a_extension_name);
         goto out;
     }
-    ext = AddExtension ((char*)a_extension_name, 0, 0,
-                        ephyrProxyProcDispatch,
-                        ephyrProxyProcDispatch,
-                        ephyrProxyProcReset,
-                        StandardMinorOpcode) ;
+    ext = AddExtension((char *) a_extension_name, 0, 0,
+                       ephyrProxyProcDispatch,
+                       ephyrProxyProcDispatch,
+                       ephyrProxyProcReset, StandardMinorOpcode);
     if (!ext) {
-        EPHYR_LOG_ERROR ("failed to add the extension\n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to add the extension\n");
+        goto out;
     }
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
-
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrvideo.c b/xorg-server/hw/kdrive/ephyr/ephyrvideo.c
index 0fd1a63d4..67eadd121 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrvideo.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrvideo.c
@@ -1,1273 +1,1218 @@
-/*

- * Xephyr - A kdrive X server thats runs in a host X window.

- *          Authored by Matthew Allum <mallum@openedhand.com>

- * 

- * Copyright © 2007 OpenedHand Ltd 

- *

- * 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 OpenedHand Ltd not be used in

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

- * specific, written prior permission. OpenedHand Ltd makes no

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

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

- *

- * OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL OpenedHand Ltd 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.

- *

- * Authors:

- *    Dodji Seketeli <dodji@openedhand.com>

- */

-

-#ifdef HAVE_CONFIG_H

-#include <kdrive-config.h>

-#endif

-#include <string.h>

-#include <X11/extensions/Xv.h>

-#include "ephyrlog.h"

-#include "kdrive.h"

-#include "kxv.h"

-#include "ephyr.h"

-#include "hostx.h"

-#include "ephyrhostvideo.h"

-

-struct _EphyrXVPriv {

-    EphyrHostXVAdaptorArray *host_adaptors ;

-    KdVideoAdaptorPtr adaptors ;

-    int num_adaptors ;

-};

-typedef struct _EphyrXVPriv EphyrXVPriv ;

-

-struct _EphyrPortPriv {

-    int port_number ;

-    KdVideoAdaptorPtr current_adaptor ;

-    EphyrXVPriv *xv_priv;

-    unsigned char *image_buf ;

-    int image_buf_size ;

-    int image_id ;

-    int drw_x, drw_y, drw_w, drw_h ;

-    int src_x, src_y, src_w, src_h ;

-    int image_width, image_height ;

-};

-typedef struct _EphyrPortPriv EphyrPortPriv ;

-

-static Bool DoSimpleClip (BoxPtr a_dst_drw,

-                          BoxPtr a_clipper,

-                          BoxPtr a_result) ;

-

-static Bool ephyrLocalAtomToHost (int a_local_atom, int *a_host_atom) ;

-

-/*

-static Bool ephyrHostAtomToLocal (int a_host_atom, int *a_local_atom) ;

-*/

-

-static EphyrXVPriv* ephyrXVPrivNew (void) ;

-static void ephyrXVPrivDelete (EphyrXVPriv *a_this) ;

-static Bool ephyrXVPrivQueryHostAdaptors (EphyrXVPriv *a_this) ;

-static Bool ephyrXVPrivSetAdaptorsHooks (EphyrXVPriv *a_this) ;

-static Bool ephyrXVPrivRegisterAdaptors (EphyrXVPriv *a_this,

-                                         ScreenPtr a_screen) ;

-

-static Bool ephyrXVPrivIsAttrValueValid (KdAttributePtr a_attrs,

-                                         int a_attrs_len,

-                                         const char *a_attr_name,

-                                         int a_attr_value,

-                                         Bool *a_is_valid) ;

-

-static Bool ephyrXVPrivGetImageBufSize (int a_port_id,

-                                        int a_image_id,

-                                        unsigned short a_width,

-                                        unsigned short a_height,

-                                        int *a_size) ;

-

-static Bool ephyrXVPrivSaveImageToPortPriv (EphyrPortPriv *a_port_priv,

-                                            const unsigned char *a_image,

-                                            int a_image_len) ;

-

-static void ephyrStopVideo (KdScreenInfo *a_info,

-                            pointer a_xv_priv,

-                            Bool a_exit);

-

-static int ephyrSetPortAttribute (KdScreenInfo *a_info,

-                                  Atom a_attr_name,

-                                  int a_attr_value,

-                                  pointer a_port_priv);

-

-static int ephyrGetPortAttribute (KdScreenInfo *a_screen_info,

-                                  Atom a_attr_name,

-                                  int *a_attr_value,

-                                  pointer a_port_priv);

-

-static void ephyrQueryBestSize (KdScreenInfo *a_info,

-                                Bool a_motion,

-                                short a_src_w,

-                                short a_src_h,

-                                short a_drw_w,

-                                short a_drw_h,

-                                unsigned int *a_prefered_w,

-                                unsigned int *a_prefered_h,

-                                pointer a_port_priv);

-

-static int ephyrPutImage (KdScreenInfo *a_info,

-                          DrawablePtr a_drawable,

-                          short a_src_x,

-                          short a_src_y,

-                          short a_drw_x,

-                          short a_drw_y,

-                          short a_src_w,

-                          short a_src_h,

-                          short a_drw_w,

-                          short a_drw_h,

-                          int a_id,

-                          unsigned char *a_buf,

-                          short a_width,

-                          short a_height,

-                          Bool a_sync,

-                          RegionPtr a_clipping_region,

-                          pointer a_port_priv);

-

-static int ephyrReputImage (KdScreenInfo *a_info,

-                            DrawablePtr a_drawable,

-                            short a_drw_x,

-                            short a_drw_y,

-                            RegionPtr a_clipping_region,

-                            pointer a_port_priv) ;

-

-static int ephyrPutVideo (KdScreenInfo *a_info,

-                          DrawablePtr a_drawable,

-                          short a_vid_x, short a_vid_y,

-                          short a_drw_x, short a_drw_y,

-                          short a_vid_w, short a_vid_h,

-                          short a_drw_w, short a_drw_h,

-                          RegionPtr a_clip_region,

-                          pointer a_port_priv) ;

-

-static int ephyrGetVideo (KdScreenInfo *a_info,

-                          DrawablePtr a_drawable,

-                          short a_vid_x, short a_vid_y,

-                          short a_drw_x, short a_drw_y,

-                          short a_vid_w, short a_vid_h,

-                          short a_drw_w, short a_drw_h,

-                          RegionPtr a_clip_region,

-                          pointer a_port_priv) ;

-

-static int ephyrPutStill (KdScreenInfo *a_info,

-                          DrawablePtr a_drawable,

-                          short a_vid_x, short a_vid_y,

-                          short a_drw_x, short a_drw_y,

-                          short a_vid_w, short a_vid_h,

-                          short a_drw_w, short a_drw_h,

-                          RegionPtr a_clip_region,

-                          pointer a_port_priv) ;

-

-static int ephyrGetStill (KdScreenInfo *a_info,

-                          DrawablePtr a_drawable,

-                          short a_vid_x, short a_vid_y,

-                          short a_drw_x, short a_drw_y,

-                          short a_vid_w, short a_vid_h,

-                          short a_drw_w, short a_drw_h,

-                          RegionPtr a_clip_region,

-                          pointer a_port_priv) ;

-

-static int ephyrQueryImageAttributes (KdScreenInfo *a_info,

-                                      int a_id,

-                                      unsigned short *a_w,

-                                      unsigned short *a_h,

-                                      int *a_pitches,

-                                      int *a_offsets);

-static int s_base_port_id ;

-

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

- * <helpers>

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

-

-static Bool

-DoSimpleClip (BoxPtr a_dst_box,

-              BoxPtr a_clipper,

-              BoxPtr a_result)

-{

-    BoxRec dstClippedBox ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_dst_box && a_clipper && a_result, FALSE) ;

-

-    /*

-     * setup the clipbox inside the destination.

-     */

-    dstClippedBox.x1 = a_dst_box->x1 ;

-    dstClippedBox.x2 = a_dst_box->x2 ;

-    dstClippedBox.y1 = a_dst_box->y1 ;

-    dstClippedBox.y2 = a_dst_box->y2 ;

-

-    /*

-     * if the cliper leftmost edge is inside

-     * the destination area then the leftmost edge of the resulting

-     * clipped box is the leftmost edge of the cliper.

-     */

-    if (a_clipper->x1 > dstClippedBox.x1)

-        dstClippedBox.x1 = a_clipper->x1 ;

-

-    /*

-     * if the cliper top edge is inside the destination area

-     * then the bottom horizontal edge of the resulting clipped box

-     * is the bottom edge of the cliper

-     */

-    if (a_clipper->y1 > dstClippedBox.y1)

-        dstClippedBox.y1 = a_clipper->y1 ;

-

-    /*ditto for right edge*/

-    if (a_clipper->x2 < dstClippedBox.x2)

-        dstClippedBox.x2 = a_clipper->x2 ;

-

-    /*ditto for bottom edge*/

-    if (a_clipper->y2 < dstClippedBox.y2)

-        dstClippedBox.y2 = a_clipper->y2 ;

-

-    memcpy (a_result, &dstClippedBox, sizeof (dstClippedBox)) ;

-    return TRUE ;

-}

-

-static Bool

-ephyrLocalAtomToHost (int a_local_atom, int *a_host_atom)

-{

-    const char *atom_name=NULL;

-    int host_atom=None ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_host_atom, FALSE) ;

-

-    if (!ValidAtom (a_local_atom))

-        return FALSE ;

-

-    atom_name = NameForAtom (a_local_atom) ;

-

-    if (!atom_name)

-        return FALSE ;

-

-    if (!ephyrHostGetAtom (atom_name, FALSE, &host_atom) || host_atom == None) {

-        EPHYR_LOG_ERROR ("no atom for string %s defined in host X\n",

-                         atom_name) ;

-        return FALSE ;

-    }

-    *a_host_atom = host_atom ;

-    return TRUE ;

-}

-

-/*

- Not used yed.

-static Bool

-ephyrHostAtomToLocal (int a_host_atom, int *a_local_atom)

-{

-    Bool is_ok=FALSE ;

-    char *atom_name=NULL ;

-    int atom=None ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_local_atom, FALSE) ;

-

-    atom_name = ephyrHostGetAtomName (a_host_atom) ;

-    if (!atom_name)

-        goto out ;

-

-    atom = MakeAtom (atom_name, strlen (atom_name), TRUE) ;

-    if (atom == None)

-        goto out ;

-

-    *a_local_atom = atom ;

-    is_ok = TRUE ;

-

-out:

-    if (atom_name) {

-        ephyrHostFree (atom_name) ;

-    }

-    return is_ok ;

-}

-*/

-

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

- *</helpers>

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

-

-Bool

-ephyrInitVideo (ScreenPtr pScreen)

-{

-    Bool is_ok = FALSE ;

-    KdScreenPriv(pScreen);

-    KdScreenInfo *screen = pScreenPriv->screen;

-    static EphyrXVPriv *xv_priv;

-

-    EPHYR_LOG ("enter\n") ;

-

-    if (screen->fb.bitsPerPixel == 8) {

-        EPHYR_LOG_ERROR ("8 bits depth not supported\n") ;

-        return FALSE ;

-    }

-

-    if (!xv_priv) {

-        xv_priv = ephyrXVPrivNew () ;

-    }

-    if (!xv_priv) {

-        EPHYR_LOG_ERROR ("failed to create xv_priv\n") ;

-        goto out ;

-    }

-

-    if (!ephyrXVPrivRegisterAdaptors (xv_priv, pScreen)) {

-        EPHYR_LOG_ERROR ("failed to register adaptors\n") ;

-        goto out ;

-    }

-    is_ok = TRUE ;

-

-out:

-    return is_ok ;

-}

-

-static EphyrXVPriv*

-ephyrXVPrivNew (void)

-{

-    EphyrXVPriv *xv_priv=NULL ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    xv_priv = calloc(1, sizeof (EphyrXVPriv)) ;

-    if (!xv_priv) {

-        EPHYR_LOG_ERROR ("failed to create EphyrXVPriv\n") ;

-        goto error ;

-    }

-

-    ephyrHostXVInit () ;

-

-    if (!ephyrXVPrivQueryHostAdaptors (xv_priv)) {

-        EPHYR_LOG_ERROR ("failed to query the host x for xv properties\n") ;

-        goto error ;

-    }

-    if (!ephyrXVPrivSetAdaptorsHooks (xv_priv)) {

-        EPHYR_LOG_ERROR ("failed to set xv_priv hooks\n") ;

-        goto error ;

-    }

-

-    EPHYR_LOG ("leave\n") ;

-    return xv_priv ;

-

-error:

-    if (xv_priv) {

-        ephyrXVPrivDelete (xv_priv) ;

-        xv_priv = NULL ;

-    }

-    return NULL ;

-}

-

-static void

-ephyrXVPrivDelete (EphyrXVPriv *a_this)

-{

-    EPHYR_LOG ("enter\n") ;

-

-    if (!a_this)

-        return ;

-    if (a_this->host_adaptors) {

-        ephyrHostXVAdaptorArrayDelete (a_this->host_adaptors) ;

-        a_this->host_adaptors = NULL ;

-    }

-    free(a_this->adaptors) ;

-    a_this->adaptors = NULL ;

-    free(a_this) ;

-    EPHYR_LOG ("leave\n") ;

-}

-

-static KdVideoEncodingPtr

-videoEncodingDup (EphyrHostEncoding *a_encodings,

-                   int a_num_encodings)

-{

-    KdVideoEncodingPtr result = NULL ;

-    int i=0 ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_encodings && a_num_encodings, NULL) ;

-

-    result = calloc(a_num_encodings, sizeof (KdVideoEncodingRec)) ;

-    for (i=0 ; i < a_num_encodings; i++) {

-        result[i].id = a_encodings[i].id ;

-        result[i].name = strdup (a_encodings[i].name) ;

-        result[i].width = a_encodings[i].width ;

-        result[i].height = a_encodings[i].height ;

-        result[i].rate.numerator = a_encodings[i].rate.numerator ;

-        result[i].rate.denominator = a_encodings[i].rate.denominator ;

-    }

-    return result ;

-}

-

-static KdAttributePtr

-portAttributesDup (EphyrHostAttribute *a_encodings,

-                   int a_num_encodings)

-{

-    int i=0 ;

-    KdAttributePtr result=NULL ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_encodings && a_num_encodings, NULL) ;

-

-    result = calloc(a_num_encodings, sizeof (KdAttributeRec)) ;

-    if (!result) {

-        EPHYR_LOG_ERROR ("failed to allocate attributes\n") ;

-        return NULL ;

-    }

-    for (i=0; i < a_num_encodings; i++) {

-        result[i].flags = a_encodings[i].flags ;

-        result[i].min_value = a_encodings[i].min_value ;

-        result[i].max_value = a_encodings[i].max_value ;

-        result[i].name = strdup (a_encodings[i].name) ;

-    }

-    return result ;

-}

-

-static Bool

-ephyrXVPrivQueryHostAdaptors (EphyrXVPriv *a_this)

-{

-    EphyrHostXVAdaptor *cur_host_adaptor=NULL ;

-    EphyrHostVideoFormat *video_formats=NULL ;

-    EphyrHostEncoding *encodings=NULL ;

-    EphyrHostAttribute *attributes=NULL ;

-    EphyrHostImageFormat *image_formats=NULL ;

-    int num_video_formats=0, base_port_id=0,

-        num_attributes=0, num_formats=0, i=0,

-        port_priv_offset=0;

-    unsigned num_encodings=0 ;

-    Bool is_ok = FALSE ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_this, FALSE) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    if (!ephyrHostXVQueryAdaptors (&a_this->host_adaptors)) {

-        EPHYR_LOG_ERROR ("failed to query host adaptors\n") ;

-        goto out ;

-    }

-    if (a_this->host_adaptors)

-        a_this->num_adaptors =

-                    ephyrHostXVAdaptorArrayGetSize (a_this->host_adaptors) ;

-    if (a_this->num_adaptors < 0) {

-        EPHYR_LOG_ERROR ("failed to get number of host adaptors\n") ;

-        goto out ;

-    }

-    EPHYR_LOG ("host has %d adaptors\n", a_this->num_adaptors) ;

-    /*

-     * copy what we can from adaptors into a_this->adaptors

-     */

-    if (a_this->num_adaptors) {

-        a_this->adaptors = calloc(a_this->num_adaptors,

-                                    sizeof (KdVideoAdaptorRec)) ;

-        if (!a_this->adaptors) {

-            EPHYR_LOG_ERROR ("failed to create internal adaptors\n") ;

-            goto out ;

-        }

-    }

-    for (i=0; i < a_this->num_adaptors; i++) {

-        int j=0 ;

-        cur_host_adaptor =

-                   ephyrHostXVAdaptorArrayAt (a_this->host_adaptors, i) ;

-        if (!cur_host_adaptor)

-            continue ;

-        a_this->adaptors[i].nPorts =

-                            ephyrHostXVAdaptorGetNbPorts (cur_host_adaptor) ;

-        if (a_this->adaptors[i].nPorts <=0) {

-            EPHYR_LOG_ERROR ("Could not find any port of adaptor %d\n", i) ;

-            continue ;

-        }

-        a_this->adaptors[i].type =

-                        ephyrHostXVAdaptorGetType (cur_host_adaptor) ;

-        a_this->adaptors[i].type |= XvWindowMask ;

-        a_this->adaptors[i].flags =

-                        VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;

-        if (ephyrHostXVAdaptorGetName (cur_host_adaptor))

-            a_this->adaptors[i].name =

-                    strdup (ephyrHostXVAdaptorGetName (cur_host_adaptor)) ;

-        else

-            a_this->adaptors[i].name = strdup ("Xephyr Video Overlay");

-        base_port_id = ephyrHostXVAdaptorGetFirstPortID (cur_host_adaptor) ;

-        if (base_port_id < 0) {

-            EPHYR_LOG_ERROR ("failed to get port id for adaptor %d\n", i) ;

-            continue ;

-        }

-        if (!s_base_port_id)

-            s_base_port_id = base_port_id ;

-

-        if (!ephyrHostXVQueryEncodings (base_port_id,

-                                        &encodings,

-                                        &num_encodings)) {

-            EPHYR_LOG_ERROR ("failed to get encodings for port port id %d,"

-                             " adaptors %d\n",

-                             base_port_id, i) ;

-            continue ;

-        }

-        a_this->adaptors[i].nEncodings = num_encodings ;

-        a_this->adaptors[i].pEncodings =

-                            videoEncodingDup (encodings, num_encodings) ;

-        video_formats = (EphyrHostVideoFormat*)

-            ephyrHostXVAdaptorGetVideoFormats (cur_host_adaptor,

-                                               &num_video_formats);

-        a_this->adaptors[i].pFormats = (KdVideoFormatPtr) video_formats ;

-        a_this->adaptors[i].nFormats = num_video_formats ;

-        /* got a_this->adaptors[i].nPorts already

-        a_this->adaptors[i].nPorts =

-                            ephyrHostXVAdaptorGetNbPorts (cur_host_adaptor) ;

-        */

-        a_this->adaptors[i].pPortPrivates =

-                calloc(a_this->adaptors[i].nPorts,

-                         sizeof (DevUnion) + sizeof (EphyrPortPriv)) ;

-        port_priv_offset = a_this->adaptors[i].nPorts;

-        for (j=0; j < a_this->adaptors[i].nPorts; j++) {

-            EphyrPortPriv *port_privs_base =

-                    (EphyrPortPriv*)&a_this->adaptors[i].pPortPrivates[port_priv_offset];

-            EphyrPortPriv *port_priv = &port_privs_base[j] ;

-            port_priv->port_number = base_port_id + j;

-            port_priv->current_adaptor = &a_this->adaptors[i] ;

-            port_priv->xv_priv = a_this ;

-            a_this->adaptors[i].pPortPrivates[j].ptr = port_priv;

-        }

-        if (!ephyrHostXVQueryPortAttributes (base_port_id,

-                                             &attributes,

-                                             &num_attributes)) {

-            EPHYR_LOG_ERROR ("failed to get port attribute "

-                             "for adaptor %d\n", i) ;

-            continue ;

-        }

-        a_this->adaptors[i].pAttributes =

-                    portAttributesDup (attributes, num_attributes);

-        a_this->adaptors[i].nAttributes = num_attributes ;

-        /*make sure atoms of attrs names are created in xephyr*/

-        for (j=0; j < a_this->adaptors[i].nAttributes; j++) {

-            if (a_this->adaptors[i].pAttributes[j].name)

-                MakeAtom (a_this->adaptors[i].pAttributes[j].name,

-                          strlen (a_this->adaptors[i].pAttributes[j].name),

-                          TRUE) ;

-        }

-        if (!ephyrHostXVQueryImageFormats (base_port_id,

-                                           &image_formats,

-                                           &num_formats)) {

-            EPHYR_LOG_ERROR ("failed to get image formats "

-                             "for adaptor %d\n", i) ;

-            continue ;

-        }

-        a_this->adaptors[i].pImages = (KdImagePtr) image_formats ;

-        a_this->adaptors[i].nImages = num_formats ;

-    }

-    is_ok = TRUE ;

-

-out:

-    if (encodings) {

-        ephyrHostEncodingsDelete (encodings, num_encodings) ;

-        encodings = NULL ;

-    }

-    if (attributes) {

-        ephyrHostAttributesDelete (attributes) ;

-        attributes = NULL ;

-    }

-    EPHYR_LOG ("leave\n") ;

-    return is_ok ;

-}

-

-static Bool

-ephyrXVPrivSetAdaptorsHooks (EphyrXVPriv *a_this)

-{

-    int i=0 ;

-    Bool has_it=FALSE ;

-    EphyrHostXVAdaptor *cur_host_adaptor=NULL ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_this, FALSE) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    for (i=0; i < a_this->num_adaptors; i++) {

-        a_this->adaptors[i].ReputImage = ephyrReputImage ;

-        a_this->adaptors[i].StopVideo = ephyrStopVideo ;

-        a_this->adaptors[i].SetPortAttribute = ephyrSetPortAttribute ;

-        a_this->adaptors[i].GetPortAttribute = ephyrGetPortAttribute ;

-        a_this->adaptors[i].QueryBestSize = ephyrQueryBestSize ;

-        a_this->adaptors[i].QueryImageAttributes = ephyrQueryImageAttributes ;

-

-        cur_host_adaptor =

-                   ephyrHostXVAdaptorArrayAt (a_this->host_adaptors, i) ;

-        if (!cur_host_adaptor) {

-            EPHYR_LOG_ERROR ("failed to get host adaptor at index %d\n", i) ;

-            continue ;

-        }

-        has_it = FALSE ;

-        if (!ephyrHostXVAdaptorHasPutImage (cur_host_adaptor, &has_it)) {

-            EPHYR_LOG_ERROR ("error\n") ;

-        }

-        if (has_it) {

-            a_this->adaptors[i].PutImage = ephyrPutImage;

-        }

-

-        has_it = FALSE ;

-        if (!ephyrHostXVAdaptorHasPutVideo (cur_host_adaptor, &has_it)) {

-            EPHYR_LOG_ERROR ("error\n") ;

-        }

-        if (has_it) {

-            a_this->adaptors[i].PutVideo = ephyrPutVideo;

-        }

-

-        has_it = FALSE ;

-        if (!ephyrHostXVAdaptorHasGetVideo (cur_host_adaptor, &has_it)) {

-            EPHYR_LOG_ERROR ("error\n") ;

-        }

-        if (has_it) {

-            a_this->adaptors[i].GetVideo = ephyrGetVideo;

-        }

-

-        has_it = FALSE ;

-        if (!ephyrHostXVAdaptorHasPutStill (cur_host_adaptor, &has_it)) {

-            EPHYR_LOG_ERROR ("error\n") ;

-        }

-        if (has_it) {

-            a_this->adaptors[i].PutStill = ephyrPutStill;

-        }

-

-        has_it = FALSE ;

-        if (!ephyrHostXVAdaptorHasGetStill (cur_host_adaptor, &has_it)) {

-            EPHYR_LOG_ERROR ("error\n") ;

-        }

-        if (has_it) {

-            a_this->adaptors[i].GetStill = ephyrGetStill;

-        }

-    }

-    EPHYR_LOG ("leave\n") ;

-    return TRUE ;

-}

-

-static Bool

-ephyrXVPrivRegisterAdaptors (EphyrXVPriv *a_this,

-                             ScreenPtr a_screen)

-{

-    KdScreenPriv(a_screen);

-    KdScreenInfo *screen = pScreenPriv->screen;

-    Bool is_ok = FALSE ;

-    KdVideoAdaptorPtr *adaptors=NULL, *registered_adaptors=NULL ;

-    int num_registered_adaptors=0, i=0, num_adaptors=0 ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_this && a_screen, FALSE) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    if (!a_this->num_adaptors)

-        goto out ;

-    num_registered_adaptors =

-                KdXVListGenericAdaptors (screen, &registered_adaptors);

-

-    num_adaptors = num_registered_adaptors + a_this->num_adaptors ;

-    adaptors = calloc(num_adaptors, sizeof (KdVideoAdaptorPtr)) ;

-    if (!adaptors) {

-        EPHYR_LOG_ERROR ("failed to allocate adaptors tab\n") ;

-        goto out ;

-    }

-    memmove (adaptors, registered_adaptors, num_registered_adaptors) ;

-    for (i=0 ; i < a_this->num_adaptors; i++) {

-        *(adaptors + num_registered_adaptors + i) = &a_this->adaptors[i] ;

-    }

-    if (!KdXVScreenInit (a_screen, adaptors, num_adaptors)) {

-        EPHYR_LOG_ERROR ("failed to register adaptors\n");

-        goto out ;

-    }

-    EPHYR_LOG ("there are  %d registered adaptors\n", num_adaptors) ;

-    is_ok = TRUE ;

-

-out:

-    free(registered_adaptors) ;

-    registered_adaptors = NULL ;

-    free(adaptors) ;

-    adaptors = NULL ;

-

-    EPHYR_LOG ("leave\n") ;

-    return is_ok ;

-}

-

-static Bool

-ephyrXVPrivIsAttrValueValid (KdAttributePtr a_attrs,

-                             int a_attrs_len,

-                             const char *a_attr_name,

-                             int a_attr_value,

-                             Bool *a_is_valid)

-{

-    int i=0 ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_attrs && a_attr_name && a_is_valid,

-                              FALSE) ;

-

-    for (i=0; i < a_attrs_len; i++) {

-        if (a_attrs[i].name && strcmp (a_attrs[i].name, a_attr_name))

-            continue ;

-        if (a_attrs[i].min_value > a_attr_value ||

-            a_attrs[i].max_value < a_attr_value) {

-            *a_is_valid = FALSE ;

-            EPHYR_LOG_ERROR ("attribute was not valid\n"

-                             "value:%d. min:%d. max:%d\n",

-                             a_attr_value,

-                             a_attrs[i].min_value,

-                             a_attrs[i].max_value) ;

-        } else {

-            *a_is_valid = TRUE ;

-        }

-        return TRUE ;

-    }

-    return FALSE ;

-}

-

-static Bool

-ephyrXVPrivGetImageBufSize (int a_port_id,

-                            int a_image_id,

-                            unsigned short a_width,

-                            unsigned short a_height,

-                            int *a_size)

-{

-    Bool is_ok=FALSE ;

-    unsigned short width=a_width, height=a_height ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_size, FALSE) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    if (!ephyrHostXVQueryImageAttributes (a_port_id, a_image_id,

-                                          &width, &height, a_size, NULL, NULL)) {

-        EPHYR_LOG_ERROR ("failed to get image attributes\n") ;

-        goto out ;

-    }

-    is_ok = TRUE ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return is_ok ;

-}

-

-static Bool

-ephyrXVPrivSaveImageToPortPriv (EphyrPortPriv *a_port_priv,

-                                const unsigned char *a_image_buf,

-                                int a_image_len)

-{

-    Bool is_ok=FALSE ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    if (a_port_priv->image_buf_size < a_image_len) {

-        unsigned char *buf=NULL ;

-        buf = realloc (a_port_priv->image_buf, a_image_len) ;

-        if (!buf) {

-            EPHYR_LOG_ERROR ("failed to realloc image buffer\n") ;

-            goto out ;

-        }

-        a_port_priv->image_buf = buf ;

-        a_port_priv->image_buf_size = a_image_len;

-    }

-    memmove (a_port_priv->image_buf, a_image_buf, a_image_len) ;

-    is_ok = TRUE ;

-

-out:

-    return is_ok ;

-    EPHYR_LOG ("leave\n") ;

-}

-

-static void

-ephyrStopVideo (KdScreenInfo *a_info, pointer a_port_priv, Bool a_exit)

-{

-    EphyrPortPriv *port_priv = a_port_priv ;

-

-    EPHYR_RETURN_IF_FAIL (a_info && a_info->pScreen) ;

-    EPHYR_RETURN_IF_FAIL (port_priv) ;

-

-    EPHYR_LOG ("enter\n") ;

-    if (!ephyrHostXVStopVideo (a_info->pScreen->myNum,

-                               port_priv->port_number)) {

-        EPHYR_LOG_ERROR ("XvStopVideo() failed\n") ;

-    }

-    EPHYR_LOG ("leave\n") ;

-}

-

-static int

-ephyrSetPortAttribute (KdScreenInfo *a_info,

-                       Atom a_attr_name,

-                       int a_attr_value,

-                       pointer a_port_priv)

-{

-    int res=Success, host_atom=0 ;

-    EphyrPortPriv *port_priv = a_port_priv ;

-    Bool is_attr_valid=FALSE ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (port_priv, BadMatch) ;

-    EPHYR_RETURN_VAL_IF_FAIL (port_priv->current_adaptor, BadMatch) ;

-    EPHYR_RETURN_VAL_IF_FAIL (port_priv->current_adaptor->pAttributes,

-                              BadMatch) ;

-    EPHYR_RETURN_VAL_IF_FAIL (port_priv->current_adaptor->nAttributes,

-                              BadMatch) ;

-    EPHYR_RETURN_VAL_IF_FAIL (ValidAtom (a_attr_name), BadMatch) ;

-

-    EPHYR_LOG ("enter, portnum:%d, atomid:%d, attr_name:%s, attr_val:%d\n",

-               port_priv->port_number,

-               (int)a_attr_name,

-               NameForAtom (a_attr_name),

-               a_attr_value) ;

-

-    if (!ephyrLocalAtomToHost (a_attr_name, &host_atom)) {

-        EPHYR_LOG_ERROR ("failed to convert local atom to host atom\n") ;

-        res = BadMatch ;

-        goto out ;

-    }

-

-    if (!ephyrXVPrivIsAttrValueValid (port_priv->current_adaptor->pAttributes,

-                                      port_priv->current_adaptor->nAttributes,

-                                      NameForAtom (a_attr_name),

-                                      a_attr_value,

-                                      &is_attr_valid)) {

-        EPHYR_LOG_ERROR ("failed to validate attribute %s\n",

-                         NameForAtom (a_attr_name)) ;

-        /*

-         res = BadMatch ;

-         goto out ;

-         */

-    }

-    if (!is_attr_valid) {

-        EPHYR_LOG_ERROR ("attribute %s is not valid\n",

-                         NameForAtom (a_attr_name)) ;

-        /*

-        res = BadMatch ;

-        goto out ;

-        */

-    }

-

-    if (!ephyrHostXVSetPortAttribute (port_priv->port_number,

-                                      host_atom,

-                                      a_attr_value)) {

-        EPHYR_LOG_ERROR ("failed to set port attribute\n") ;

-        res = BadMatch ;

-        goto out ;

-    }

-

-    res = Success ;

-out:

-    EPHYR_LOG ("leave\n") ;

-    return res ;

-}

-

-static int

-ephyrGetPortAttribute (KdScreenInfo *a_screen_info,

-                       Atom a_attr_name,

-                       int *a_attr_value,

-                       pointer a_port_priv)

-{

-    int res=Success, host_atom=0 ;

-    EphyrPortPriv *port_priv = a_port_priv ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (port_priv, BadMatch) ;

-    EPHYR_RETURN_VAL_IF_FAIL (ValidAtom (a_attr_name), BadMatch) ;

-

-    EPHYR_LOG ("enter, portnum:%d, atomid:%d, attr_name:%s\n",

-               port_priv->port_number,

-               (int)a_attr_name,

-               NameForAtom (a_attr_name)) ;

-

-    if (!ephyrLocalAtomToHost (a_attr_name, &host_atom)) {

-        EPHYR_LOG_ERROR ("failed to convert local atom to host atom\n") ;

-        res = BadMatch ;

-        goto out ;

-    }

-

-    if (!ephyrHostXVGetPortAttribute (port_priv->port_number,

-                                      host_atom,

-                                      a_attr_value)) {

-        EPHYR_LOG_ERROR ("failed to get port attribute\n") ;

-        res = BadMatch ;

-        goto out ;

-    }

-

-    res = Success ;

-out:

-    EPHYR_LOG ("leave\n") ;

-    return res ;

-}

-

-static void

-ephyrQueryBestSize (KdScreenInfo *a_info,

-                    Bool a_motion,

-                    short a_src_w,

-                    short a_src_h,

-                    short a_drw_w,

-                    short a_drw_h,

-                    unsigned int *a_prefered_w,

-                    unsigned int *a_prefered_h,

-                    pointer a_port_priv)

-{

-    int res=0 ;

-    EphyrPortPriv *port_priv = a_port_priv ;

-

-    EPHYR_RETURN_IF_FAIL (port_priv) ;

-

-    EPHYR_LOG ("enter\n") ;

-    res = ephyrHostXVQueryBestSize (port_priv->port_number,

-                                    a_motion,

-                                    a_src_w, a_src_h,

-                                    a_drw_w, a_drw_h,

-                                    a_prefered_w, a_prefered_h) ;

-    if (!res) {

-        EPHYR_LOG_ERROR ("Failed to query best size\n") ;

-    }

-    EPHYR_LOG ("leave\n") ;

-}

-

-static int

-ephyrPutImage (KdScreenInfo *a_info,

-               DrawablePtr a_drawable,

-               short a_src_x,

-               short a_src_y,

-               short a_drw_x,

-               short a_drw_y,

-               short a_src_w,

-               short a_src_h,

-               short a_drw_w,

-               short a_drw_h,

-               int a_id,

-               unsigned char *a_buf,

-               short a_width,

-               short a_height,

-               Bool a_sync,

-               RegionPtr a_clipping_region,

-               pointer a_port_priv)

-{

-    EphyrPortPriv *port_priv = a_port_priv ;

-    Bool is_ok=FALSE ;

-    int result=BadImplementation, image_size=0 ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_info && a_info->pScreen, BadValue) ;

-    EPHYR_RETURN_VAL_IF_FAIL (a_drawable, BadValue) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    if (!ephyrHostXVPutImage (a_info->pScreen->myNum,

-                              port_priv->port_number,

-                              a_id,

-                              a_drw_x, a_drw_y, a_drw_w, a_drw_h,

-                              a_src_x, a_src_y, a_src_w, a_src_h,

-                              a_width, a_height, a_buf,

-                              (EphyrHostBox*)RegionRects (a_clipping_region),

-                              RegionNumRects (a_clipping_region))) {

-        EPHYR_LOG_ERROR ("EphyrHostXVPutImage() failed\n") ;

-        goto out ;

-    }

-

-    /*

-     * Now save the image so that we can resend it to host it

-     * later, in ReputImage.

-     */

-    if (!ephyrXVPrivGetImageBufSize (port_priv->port_number,

-                                     a_id, a_width, a_height, &image_size)) {

-        EPHYR_LOG_ERROR ("failed to get image size\n") ;

-        /*this is a minor error so we won't get bail out abruptly*/

-        is_ok = FALSE ;

-    } else {

-        is_ok = TRUE ;

-    }

-    if (is_ok) {

-        if (!ephyrXVPrivSaveImageToPortPriv (port_priv, a_buf, image_size)) {

-            is_ok=FALSE ;

-        } else {

-            port_priv->image_id = a_id;

-            port_priv->drw_x = a_drw_x;

-            port_priv->drw_y = a_drw_y;

-            port_priv->drw_w = a_drw_w ;

-            port_priv->drw_h = a_drw_h ;

-            port_priv->src_x = a_src_x;

-            port_priv->src_y = a_src_y ;

-            port_priv->src_w = a_src_w ;

-            port_priv->src_h = a_src_h ;

-            port_priv->image_width = a_width ;

-            port_priv->image_height = a_height ;

-        }

-    }

-    if (!is_ok) {

-        if (port_priv->image_buf) {

-            free (port_priv->image_buf) ;

-            port_priv->image_buf = NULL ;

-            port_priv->image_buf_size = 0 ;

-        }

-    }

-

-    result = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return result ;

-}

-

-static int

-ephyrReputImage (KdScreenInfo *a_info,

-                 DrawablePtr a_drawable,

-                 short a_drw_x,

-                 short a_drw_y,

-                 RegionPtr a_clipping_region,

-                 pointer a_port_priv)

-{

-    EphyrPortPriv *port_priv = a_port_priv ;

-    int result=BadImplementation ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_info->pScreen, FALSE) ;

-    EPHYR_RETURN_VAL_IF_FAIL (a_drawable && port_priv, BadValue) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    if (!port_priv->image_buf_size || !port_priv->image_buf) {

-        EPHYR_LOG_ERROR ("has null image buf in cache\n") ;

-        goto out ;

-    }

-    if (!ephyrHostXVPutImage (a_info->pScreen->myNum,

-                              port_priv->port_number,

-                              port_priv->image_id,

-                              a_drw_x, a_drw_y,

-                              port_priv->drw_w, port_priv->drw_h,

-                              port_priv->src_x, port_priv->src_y,

-                              port_priv->src_w, port_priv->src_h,

-                              port_priv->image_width, port_priv->image_height,

-                              port_priv->image_buf,

-                              (EphyrHostBox*)RegionRects (a_clipping_region),

-                              RegionNumRects (a_clipping_region))) {

-        EPHYR_LOG_ERROR ("ephyrHostXVPutImage() failed\n") ;

-        goto out ;

-    }

-

-    result = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return result ;

-}

-

-static int

-ephyrPutVideo (KdScreenInfo *a_info,

-               DrawablePtr a_drawable,

-               short a_vid_x, short a_vid_y,

-               short a_drw_x, short a_drw_y,

-               short a_vid_w, short a_vid_h,

-               short a_drw_w, short a_drw_h,

-               RegionPtr a_clipping_region,

-               pointer a_port_priv)

-{

-    EphyrPortPriv *port_priv = a_port_priv ;

-    BoxRec clipped_area, dst_box ;

-    int result=BadImplementation ;

-    int drw_x=0, drw_y=0, drw_w=0, drw_h=0 ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_info->pScreen, BadValue) ;

-    EPHYR_RETURN_VAL_IF_FAIL (a_drawable && port_priv, BadValue) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    dst_box.x1 = a_drw_x ;

-    dst_box.x2 = a_drw_x + a_drw_w;

-    dst_box.y1 = a_drw_y ;

-    dst_box.y2 = a_drw_y + a_drw_h;

-

-    if (!DoSimpleClip (&dst_box,

-                       RegionExtents(a_clipping_region),

-                       &clipped_area)) {

-        EPHYR_LOG_ERROR ("failed to simple clip\n") ;

-        goto out ;

-    }

-

-    drw_x = clipped_area.x1 ;

-    drw_y = clipped_area.y1 ;

-    drw_w = clipped_area.x2 - clipped_area.x1 ;

-    drw_h = clipped_area.y2 - clipped_area.y1 ;

-

-    if (!ephyrHostXVPutVideo (a_info->pScreen->myNum,

-                              port_priv->port_number,

-                              a_vid_x, a_vid_y, a_vid_w, a_vid_h,

-                              a_drw_x, a_drw_y, a_drw_w, a_drw_h)) {

-        EPHYR_LOG_ERROR ("ephyrHostXVPutVideo() failed\n") ;

-        goto out ;

-    }

-    result = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return result ;

-}

-

-static int

-ephyrGetVideo (KdScreenInfo *a_info,

-               DrawablePtr a_drawable,

-               short a_vid_x, short a_vid_y,

-               short a_drw_x, short a_drw_y,

-               short a_vid_w, short a_vid_h,

-               short a_drw_w, short a_drw_h,

-               RegionPtr a_clipping_region,

-               pointer a_port_priv)

-{

-    EphyrPortPriv *port_priv = a_port_priv ;

-    BoxRec clipped_area, dst_box ;

-    int result=BadImplementation ;

-    int drw_x=0, drw_y=0, drw_w=0, drw_h=0 ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_info && a_info->pScreen, BadValue) ;

-    EPHYR_RETURN_VAL_IF_FAIL (a_drawable && port_priv, BadValue) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    dst_box.x1 = a_drw_x ;

-    dst_box.x2 = a_drw_x + a_drw_w;

-    dst_box.y1 = a_drw_y ;

-    dst_box.y2 = a_drw_y + a_drw_h;

-

-    if (!DoSimpleClip (&dst_box,

-                       RegionExtents(a_clipping_region),

-                       &clipped_area)) {

-        EPHYR_LOG_ERROR ("failed to simple clip\n") ;

-        goto out ;

-    }

-

-    drw_x = clipped_area.x1 ;

-    drw_y = clipped_area.y1 ;

-    drw_w = clipped_area.x2 - clipped_area.x1 ;

-    drw_h = clipped_area.y2 - clipped_area.y1 ;

-

-    if (!ephyrHostXVGetVideo (a_info->pScreen->myNum,

-                              port_priv->port_number,

-                              a_vid_x, a_vid_y, a_vid_w, a_vid_h,

-                              a_drw_x, a_drw_y, a_drw_w, a_drw_h)) {

-        EPHYR_LOG_ERROR ("ephyrHostXVGetVideo() failed\n") ;

-        goto out ;

-    }

-    result = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return result ;

-}

-

-static int

-ephyrPutStill (KdScreenInfo *a_info,

-               DrawablePtr a_drawable,

-               short a_vid_x, short a_vid_y,

-               short a_drw_x, short a_drw_y,

-               short a_vid_w, short a_vid_h,

-               short a_drw_w, short a_drw_h,

-               RegionPtr a_clipping_region,

-               pointer a_port_priv)

-{

-    EphyrPortPriv *port_priv = a_port_priv ;

-    BoxRec clipped_area, dst_box ;

-    int result=BadImplementation ;

-    int drw_x=0, drw_y=0, drw_w=0, drw_h=0 ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_info && a_info->pScreen, BadValue) ;

-    EPHYR_RETURN_VAL_IF_FAIL (a_drawable && port_priv, BadValue) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    dst_box.x1 = a_drw_x ;

-    dst_box.x2 = a_drw_x + a_drw_w;

-    dst_box.y1 = a_drw_y ;

-    dst_box.y2 = a_drw_y + a_drw_h;

-

-    if (!DoSimpleClip (&dst_box,

-                       RegionExtents(a_clipping_region),

-                       &clipped_area)) {

-        EPHYR_LOG_ERROR ("failed to simple clip\n") ;

-        goto out ;

-    }

-

-    drw_x = clipped_area.x1 ;

-    drw_y = clipped_area.y1 ;

-    drw_w = clipped_area.x2 - clipped_area.x1 ;

-    drw_h = clipped_area.y2 - clipped_area.y1 ;

-

-    if (!ephyrHostXVPutStill (a_info->pScreen->myNum,

-                              port_priv->port_number,

-                              a_vid_x, a_vid_y, a_vid_w, a_vid_h,

-                              a_drw_x, a_drw_y, a_drw_w, a_drw_h)) {

-        EPHYR_LOG_ERROR ("ephyrHostXVPutStill() failed\n") ;

-        goto out ;

-    }

-    result = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return result ;

-}

-

-static int

-ephyrGetStill (KdScreenInfo *a_info,

-               DrawablePtr a_drawable,

-               short a_vid_x, short a_vid_y,

-               short a_drw_x, short a_drw_y,

-               short a_vid_w, short a_vid_h,

-               short a_drw_w, short a_drw_h,

-               RegionPtr a_clipping_region,

-               pointer a_port_priv)

-{

-    EphyrPortPriv *port_priv = a_port_priv ;

-    BoxRec clipped_area, dst_box ;

-    int result=BadImplementation ;

-    int drw_x=0, drw_y=0, drw_w=0, drw_h=0 ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_info && a_info->pScreen, BadValue) ;

-    EPHYR_RETURN_VAL_IF_FAIL (a_drawable && port_priv, BadValue) ;

-

-    EPHYR_LOG ("enter\n") ;

-

-    dst_box.x1 = a_drw_x ;

-    dst_box.x2 = a_drw_x + a_drw_w;

-    dst_box.y1 = a_drw_y ;

-    dst_box.y2 = a_drw_y + a_drw_h;

-

-    if (!DoSimpleClip (&dst_box,

-                       RegionExtents(a_clipping_region),

-                       &clipped_area)) {

-        EPHYR_LOG_ERROR ("failed to simple clip\n") ;

-        goto out ;

-    }

-

-    drw_x = clipped_area.x1 ;

-    drw_y = clipped_area.y1 ;

-    drw_w = clipped_area.x2 - clipped_area.x1 ;

-    drw_h = clipped_area.y2 - clipped_area.y1 ;

-

-    if (!ephyrHostXVGetStill (a_info->pScreen->myNum,

-                              port_priv->port_number,

-                              a_vid_x, a_vid_y, a_vid_w, a_vid_h,

-                              a_drw_x, a_drw_y, a_drw_w, a_drw_h)) {

-        EPHYR_LOG_ERROR ("ephyrHostXVGetStill() failed\n") ;

-        goto out ;

-    }

-    result = Success ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return result ;

-}

-

-static int

-ephyrQueryImageAttributes (KdScreenInfo *a_info,

-                           int a_id,

-                           unsigned short *a_w,

-                           unsigned short *a_h,

-                           int *a_pitches,

-                           int *a_offsets)

-{

-    int image_size=0 ;

-

-    EPHYR_RETURN_VAL_IF_FAIL (a_w && a_h, FALSE) ;

-

-    EPHYR_LOG ("enter: dim (%dx%d), pitches: %p, offsets: %p\n",

-               *a_w, *a_h, a_pitches, a_offsets) ;

-

-   if (!ephyrHostXVQueryImageAttributes (s_base_port_id,

-                                         a_id,

-                                         a_w, a_h,

-                                         &image_size,

-                                         a_pitches, a_offsets)) {

-       EPHYR_LOG_ERROR ("EphyrHostXVQueryImageAttributes() failed\n") ;

-       goto out ;

-   }

-   EPHYR_LOG ("image size: %d, dim (%dx%d)\n", image_size, *a_w, *a_h) ;

-

-out:

-    EPHYR_LOG ("leave\n") ;

-    return image_size ;

-}

+/*
+ * Xephyr - A kdrive X server thats runs in a host X window.
+ *          Authored by Matthew Allum <mallum@openedhand.com>
+ * 
+ * Copyright © 2007 OpenedHand Ltd 
+ *
+ * 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 OpenedHand Ltd not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. OpenedHand Ltd makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL OpenedHand Ltd 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.
+ *
+ * Authors:
+ *    Dodji Seketeli <dodji@openedhand.com>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include <string.h>
+#include <X11/extensions/Xv.h>
+#include "ephyrlog.h"
+#include "kdrive.h"
+#include "kxv.h"
+#include "ephyr.h"
+#include "hostx.h"
+#include "ephyrhostvideo.h"
+
+struct _EphyrXVPriv {
+    EphyrHostXVAdaptorArray *host_adaptors;
+    KdVideoAdaptorPtr adaptors;
+    int num_adaptors;
+};
+typedef struct _EphyrXVPriv EphyrXVPriv;
+
+struct _EphyrPortPriv {
+    int port_number;
+    KdVideoAdaptorPtr current_adaptor;
+    EphyrXVPriv *xv_priv;
+    unsigned char *image_buf;
+    int image_buf_size;
+    int image_id;
+    int drw_x, drw_y, drw_w, drw_h;
+    int src_x, src_y, src_w, src_h;
+    int image_width, image_height;
+};
+typedef struct _EphyrPortPriv EphyrPortPriv;
+
+static Bool DoSimpleClip(BoxPtr a_dst_drw, BoxPtr a_clipper, BoxPtr a_result);
+
+static Bool ephyrLocalAtomToHost(int a_local_atom, int *a_host_atom);
+
+/*
+static Bool ephyrHostAtomToLocal (int a_host_atom, int *a_local_atom) ;
+*/
+
+static EphyrXVPriv *ephyrXVPrivNew(void);
+static void ephyrXVPrivDelete(EphyrXVPriv * a_this);
+static Bool ephyrXVPrivQueryHostAdaptors(EphyrXVPriv * a_this);
+static Bool ephyrXVPrivSetAdaptorsHooks(EphyrXVPriv * a_this);
+static Bool ephyrXVPrivRegisterAdaptors(EphyrXVPriv * a_this,
+                                        ScreenPtr a_screen);
+
+static Bool ephyrXVPrivIsAttrValueValid(KdAttributePtr a_attrs,
+                                        int a_attrs_len,
+                                        const char *a_attr_name,
+                                        int a_attr_value, Bool *a_is_valid);
+
+static Bool ephyrXVPrivGetImageBufSize(int a_port_id,
+                                       int a_image_id,
+                                       unsigned short a_width,
+                                       unsigned short a_height, int *a_size);
+
+static Bool ephyrXVPrivSaveImageToPortPriv(EphyrPortPriv * a_port_priv,
+                                           const unsigned char *a_image,
+                                           int a_image_len);
+
+static void ephyrStopVideo(KdScreenInfo * a_info,
+                           pointer a_xv_priv, Bool a_exit);
+
+static int ephyrSetPortAttribute(KdScreenInfo * a_info,
+                                 Atom a_attr_name,
+                                 int a_attr_value, pointer a_port_priv);
+
+static int ephyrGetPortAttribute(KdScreenInfo * a_screen_info,
+                                 Atom a_attr_name,
+                                 int *a_attr_value, pointer a_port_priv);
+
+static void ephyrQueryBestSize(KdScreenInfo * a_info,
+                               Bool a_motion,
+                               short a_src_w,
+                               short a_src_h,
+                               short a_drw_w,
+                               short a_drw_h,
+                               unsigned int *a_prefered_w,
+                               unsigned int *a_prefered_h, pointer a_port_priv);
+
+static int ephyrPutImage(KdScreenInfo * a_info,
+                         DrawablePtr a_drawable,
+                         short a_src_x,
+                         short a_src_y,
+                         short a_drw_x,
+                         short a_drw_y,
+                         short a_src_w,
+                         short a_src_h,
+                         short a_drw_w,
+                         short a_drw_h,
+                         int a_id,
+                         unsigned char *a_buf,
+                         short a_width,
+                         short a_height,
+                         Bool a_sync,
+                         RegionPtr a_clipping_region, pointer a_port_priv);
+
+static int ephyrReputImage(KdScreenInfo * a_info,
+                           DrawablePtr a_drawable,
+                           short a_drw_x,
+                           short a_drw_y,
+                           RegionPtr a_clipping_region, pointer a_port_priv);
+
+static int ephyrPutVideo(KdScreenInfo * a_info,
+                         DrawablePtr a_drawable,
+                         short a_vid_x, short a_vid_y,
+                         short a_drw_x, short a_drw_y,
+                         short a_vid_w, short a_vid_h,
+                         short a_drw_w, short a_drw_h,
+                         RegionPtr a_clip_region, pointer a_port_priv);
+
+static int ephyrGetVideo(KdScreenInfo * a_info,
+                         DrawablePtr a_drawable,
+                         short a_vid_x, short a_vid_y,
+                         short a_drw_x, short a_drw_y,
+                         short a_vid_w, short a_vid_h,
+                         short a_drw_w, short a_drw_h,
+                         RegionPtr a_clip_region, pointer a_port_priv);
+
+static int ephyrPutStill(KdScreenInfo * a_info,
+                         DrawablePtr a_drawable,
+                         short a_vid_x, short a_vid_y,
+                         short a_drw_x, short a_drw_y,
+                         short a_vid_w, short a_vid_h,
+                         short a_drw_w, short a_drw_h,
+                         RegionPtr a_clip_region, pointer a_port_priv);
+
+static int ephyrGetStill(KdScreenInfo * a_info,
+                         DrawablePtr a_drawable,
+                         short a_vid_x, short a_vid_y,
+                         short a_drw_x, short a_drw_y,
+                         short a_vid_w, short a_vid_h,
+                         short a_drw_w, short a_drw_h,
+                         RegionPtr a_clip_region, pointer a_port_priv);
+
+static int ephyrQueryImageAttributes(KdScreenInfo * a_info,
+                                     int a_id,
+                                     unsigned short *a_w,
+                                     unsigned short *a_h,
+                                     int *a_pitches, int *a_offsets);
+static int s_base_port_id;
+
+/**************
+ * <helpers>
+ * ************/
+
+static Bool
+DoSimpleClip(BoxPtr a_dst_box, BoxPtr a_clipper, BoxPtr a_result)
+{
+    BoxRec dstClippedBox;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_dst_box && a_clipper && a_result, FALSE);
+
+    /*
+     * setup the clipbox inside the destination.
+     */
+    dstClippedBox.x1 = a_dst_box->x1;
+    dstClippedBox.x2 = a_dst_box->x2;
+    dstClippedBox.y1 = a_dst_box->y1;
+    dstClippedBox.y2 = a_dst_box->y2;
+
+    /*
+     * if the cliper leftmost edge is inside
+     * the destination area then the leftmost edge of the resulting
+     * clipped box is the leftmost edge of the cliper.
+     */
+    if (a_clipper->x1 > dstClippedBox.x1)
+        dstClippedBox.x1 = a_clipper->x1;
+
+    /*
+     * if the cliper top edge is inside the destination area
+     * then the bottom horizontal edge of the resulting clipped box
+     * is the bottom edge of the cliper
+     */
+    if (a_clipper->y1 > dstClippedBox.y1)
+        dstClippedBox.y1 = a_clipper->y1;
+
+    /*ditto for right edge */
+    if (a_clipper->x2 < dstClippedBox.x2)
+        dstClippedBox.x2 = a_clipper->x2;
+
+    /*ditto for bottom edge */
+    if (a_clipper->y2 < dstClippedBox.y2)
+        dstClippedBox.y2 = a_clipper->y2;
+
+    memcpy(a_result, &dstClippedBox, sizeof(dstClippedBox));
+    return TRUE;
+}
+
+static Bool
+ephyrLocalAtomToHost(int a_local_atom, int *a_host_atom)
+{
+    const char *atom_name = NULL;
+    int host_atom = None;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_host_atom, FALSE);
+
+    if (!ValidAtom(a_local_atom))
+        return FALSE;
+
+    atom_name = NameForAtom(a_local_atom);
+
+    if (!atom_name)
+        return FALSE;
+
+    if (!ephyrHostGetAtom(atom_name, FALSE, &host_atom) || host_atom == None) {
+        EPHYR_LOG_ERROR("no atom for string %s defined in host X\n", atom_name);
+        return FALSE;
+    }
+    *a_host_atom = host_atom;
+    return TRUE;
+}
+
+/*
+ Not used yed.
+static Bool
+ephyrHostAtomToLocal (int a_host_atom, int *a_local_atom)
+{
+    Bool is_ok=FALSE ;
+    char *atom_name=NULL ;
+    int atom=None ;
+
+    EPHYR_RETURN_VAL_IF_FAIL (a_local_atom, FALSE) ;
+
+    atom_name = ephyrHostGetAtomName (a_host_atom) ;
+    if (!atom_name)
+        goto out ;
+
+    atom = MakeAtom (atom_name, strlen (atom_name), TRUE) ;
+    if (atom == None)
+        goto out ;
+
+    *a_local_atom = atom ;
+    is_ok = TRUE ;
+
+out:
+    if (atom_name) {
+        ephyrHostFree (atom_name) ;
+    }
+    return is_ok ;
+}
+*/
+
+/**************
+ *</helpers>
+ * ************/
+
+Bool
+ephyrInitVideo(ScreenPtr pScreen)
+{
+    Bool is_ok = FALSE;
+
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    static EphyrXVPriv *xv_priv;
+
+    EPHYR_LOG("enter\n");
+
+    if (screen->fb.bitsPerPixel == 8) {
+        EPHYR_LOG_ERROR("8 bits depth not supported\n");
+        return FALSE;
+    }
+
+    if (!xv_priv) {
+        xv_priv = ephyrXVPrivNew();
+    }
+    if (!xv_priv) {
+        EPHYR_LOG_ERROR("failed to create xv_priv\n");
+        goto out;
+    }
+
+    if (!ephyrXVPrivRegisterAdaptors(xv_priv, pScreen)) {
+        EPHYR_LOG_ERROR("failed to register adaptors\n");
+        goto out;
+    }
+    is_ok = TRUE;
+
+ out:
+    return is_ok;
+}
+
+static EphyrXVPriv *
+ephyrXVPrivNew(void)
+{
+    EphyrXVPriv *xv_priv = NULL;
+
+    EPHYR_LOG("enter\n");
+
+    xv_priv = calloc(1, sizeof(EphyrXVPriv));
+    if (!xv_priv) {
+        EPHYR_LOG_ERROR("failed to create EphyrXVPriv\n");
+        goto error;
+    }
+
+    ephyrHostXVInit();
+
+    if (!ephyrXVPrivQueryHostAdaptors(xv_priv)) {
+        EPHYR_LOG_ERROR("failed to query the host x for xv properties\n");
+        goto error;
+    }
+    if (!ephyrXVPrivSetAdaptorsHooks(xv_priv)) {
+        EPHYR_LOG_ERROR("failed to set xv_priv hooks\n");
+        goto error;
+    }
+
+    EPHYR_LOG("leave\n");
+    return xv_priv;
+
+ error:
+    if (xv_priv) {
+        ephyrXVPrivDelete(xv_priv);
+        xv_priv = NULL;
+    }
+    return NULL;
+}
+
+static void
+ephyrXVPrivDelete(EphyrXVPriv * a_this)
+{
+    EPHYR_LOG("enter\n");
+
+    if (!a_this)
+        return;
+    if (a_this->host_adaptors) {
+        ephyrHostXVAdaptorArrayDelete(a_this->host_adaptors);
+        a_this->host_adaptors = NULL;
+    }
+    free(a_this->adaptors);
+    a_this->adaptors = NULL;
+    free(a_this);
+    EPHYR_LOG("leave\n");
+}
+
+static KdVideoEncodingPtr
+videoEncodingDup(EphyrHostEncoding * a_encodings, int a_num_encodings)
+{
+    KdVideoEncodingPtr result = NULL;
+    int i = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_encodings && a_num_encodings, NULL);
+
+    result = calloc(a_num_encodings, sizeof(KdVideoEncodingRec));
+    for (i = 0; i < a_num_encodings; i++) {
+        result[i].id = a_encodings[i].id;
+        result[i].name = strdup(a_encodings[i].name);
+        result[i].width = a_encodings[i].width;
+        result[i].height = a_encodings[i].height;
+        result[i].rate.numerator = a_encodings[i].rate.numerator;
+        result[i].rate.denominator = a_encodings[i].rate.denominator;
+    }
+    return result;
+}
+
+static KdAttributePtr
+portAttributesDup(EphyrHostAttribute * a_encodings, int a_num_encodings)
+{
+    int i = 0;
+    KdAttributePtr result = NULL;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_encodings && a_num_encodings, NULL);
+
+    result = calloc(a_num_encodings, sizeof(KdAttributeRec));
+    if (!result) {
+        EPHYR_LOG_ERROR("failed to allocate attributes\n");
+        return NULL;
+    }
+    for (i = 0; i < a_num_encodings; i++) {
+        result[i].flags = a_encodings[i].flags;
+        result[i].min_value = a_encodings[i].min_value;
+        result[i].max_value = a_encodings[i].max_value;
+        result[i].name = strdup(a_encodings[i].name);
+    }
+    return result;
+}
+
+static Bool
+ephyrXVPrivQueryHostAdaptors(EphyrXVPriv * a_this)
+{
+    EphyrHostXVAdaptor *cur_host_adaptor = NULL;
+    EphyrHostVideoFormat *video_formats = NULL;
+    EphyrHostEncoding *encodings = NULL;
+    EphyrHostAttribute *attributes = NULL;
+    EphyrHostImageFormat *image_formats = NULL;
+    int num_video_formats = 0, base_port_id = 0,
+        num_attributes = 0, num_formats = 0, i = 0, port_priv_offset = 0;
+    unsigned num_encodings = 0;
+    Bool is_ok = FALSE;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, FALSE);
+
+    EPHYR_LOG("enter\n");
+
+    if (!ephyrHostXVQueryAdaptors(&a_this->host_adaptors)) {
+        EPHYR_LOG_ERROR("failed to query host adaptors\n");
+        goto out;
+    }
+    if (a_this->host_adaptors)
+        a_this->num_adaptors =
+            ephyrHostXVAdaptorArrayGetSize(a_this->host_adaptors);
+    if (a_this->num_adaptors < 0) {
+        EPHYR_LOG_ERROR("failed to get number of host adaptors\n");
+        goto out;
+    }
+    EPHYR_LOG("host has %d adaptors\n", a_this->num_adaptors);
+    /*
+     * copy what we can from adaptors into a_this->adaptors
+     */
+    if (a_this->num_adaptors) {
+        a_this->adaptors = calloc(a_this->num_adaptors,
+                                  sizeof(KdVideoAdaptorRec));
+        if (!a_this->adaptors) {
+            EPHYR_LOG_ERROR("failed to create internal adaptors\n");
+            goto out;
+        }
+    }
+    for (i = 0; i < a_this->num_adaptors; i++) {
+        int j = 0;
+
+        cur_host_adaptor = ephyrHostXVAdaptorArrayAt(a_this->host_adaptors, i);
+        if (!cur_host_adaptor)
+            continue;
+        a_this->adaptors[i].nPorts =
+            ephyrHostXVAdaptorGetNbPorts(cur_host_adaptor);
+        if (a_this->adaptors[i].nPorts <= 0) {
+            EPHYR_LOG_ERROR("Could not find any port of adaptor %d\n", i);
+            continue;
+        }
+        a_this->adaptors[i].type = ephyrHostXVAdaptorGetType(cur_host_adaptor);
+        a_this->adaptors[i].type |= XvWindowMask;
+        a_this->adaptors[i].flags =
+            VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
+        if (ephyrHostXVAdaptorGetName(cur_host_adaptor))
+            a_this->adaptors[i].name =
+                strdup(ephyrHostXVAdaptorGetName(cur_host_adaptor));
+        else
+            a_this->adaptors[i].name = strdup("Xephyr Video Overlay");
+        base_port_id = ephyrHostXVAdaptorGetFirstPortID(cur_host_adaptor);
+        if (base_port_id < 0) {
+            EPHYR_LOG_ERROR("failed to get port id for adaptor %d\n", i);
+            continue;
+        }
+        if (!s_base_port_id)
+            s_base_port_id = base_port_id;
+
+        if (!ephyrHostXVQueryEncodings(base_port_id,
+                                       &encodings, &num_encodings)) {
+            EPHYR_LOG_ERROR("failed to get encodings for port port id %d,"
+                            " adaptors %d\n", base_port_id, i);
+            continue;
+        }
+        a_this->adaptors[i].nEncodings = num_encodings;
+        a_this->adaptors[i].pEncodings =
+            videoEncodingDup(encodings, num_encodings);
+        video_formats = (EphyrHostVideoFormat *)
+            ephyrHostXVAdaptorGetVideoFormats(cur_host_adaptor,
+                                              &num_video_formats);
+        a_this->adaptors[i].pFormats = (KdVideoFormatPtr) video_formats;
+        a_this->adaptors[i].nFormats = num_video_formats;
+        /* got a_this->adaptors[i].nPorts already
+           a_this->adaptors[i].nPorts =
+           ephyrHostXVAdaptorGetNbPorts (cur_host_adaptor) ;
+         */
+        a_this->adaptors[i].pPortPrivates =
+            calloc(a_this->adaptors[i].nPorts,
+                   sizeof(DevUnion) + sizeof(EphyrPortPriv));
+        port_priv_offset = a_this->adaptors[i].nPorts;
+        for (j = 0; j < a_this->adaptors[i].nPorts; j++) {
+            EphyrPortPriv *port_privs_base =
+                (EphyrPortPriv *) & a_this->adaptors[i].
+                pPortPrivates[port_priv_offset];
+            EphyrPortPriv *port_priv = &port_privs_base[j];
+
+            port_priv->port_number = base_port_id + j;
+            port_priv->current_adaptor = &a_this->adaptors[i];
+            port_priv->xv_priv = a_this;
+            a_this->adaptors[i].pPortPrivates[j].ptr = port_priv;
+        }
+        if (!ephyrHostXVQueryPortAttributes(base_port_id,
+                                            &attributes, &num_attributes)) {
+            EPHYR_LOG_ERROR("failed to get port attribute "
+                            "for adaptor %d\n", i);
+            continue;
+        }
+        a_this->adaptors[i].pAttributes =
+            portAttributesDup(attributes, num_attributes);
+        a_this->adaptors[i].nAttributes = num_attributes;
+        /*make sure atoms of attrs names are created in xephyr */
+        for (j = 0; j < a_this->adaptors[i].nAttributes; j++) {
+            if (a_this->adaptors[i].pAttributes[j].name)
+                MakeAtom(a_this->adaptors[i].pAttributes[j].name,
+                         strlen(a_this->adaptors[i].pAttributes[j].name), TRUE);
+        }
+        if (!ephyrHostXVQueryImageFormats(base_port_id,
+                                          &image_formats, &num_formats)) {
+            EPHYR_LOG_ERROR("failed to get image formats "
+                            "for adaptor %d\n", i);
+            continue;
+        }
+        a_this->adaptors[i].pImages = (KdImagePtr) image_formats;
+        a_this->adaptors[i].nImages = num_formats;
+    }
+    is_ok = TRUE;
+
+ out:
+    if (encodings) {
+        ephyrHostEncodingsDelete(encodings, num_encodings);
+        encodings = NULL;
+    }
+    if (attributes) {
+        ephyrHostAttributesDelete(attributes);
+        attributes = NULL;
+    }
+    EPHYR_LOG("leave\n");
+    return is_ok;
+}
+
+static Bool
+ephyrXVPrivSetAdaptorsHooks(EphyrXVPriv * a_this)
+{
+    int i = 0;
+    Bool has_it = FALSE;
+    EphyrHostXVAdaptor *cur_host_adaptor = NULL;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, FALSE);
+
+    EPHYR_LOG("enter\n");
+
+    for (i = 0; i < a_this->num_adaptors; i++) {
+        a_this->adaptors[i].ReputImage = ephyrReputImage;
+        a_this->adaptors[i].StopVideo = ephyrStopVideo;
+        a_this->adaptors[i].SetPortAttribute = ephyrSetPortAttribute;
+        a_this->adaptors[i].GetPortAttribute = ephyrGetPortAttribute;
+        a_this->adaptors[i].QueryBestSize = ephyrQueryBestSize;
+        a_this->adaptors[i].QueryImageAttributes = ephyrQueryImageAttributes;
+
+        cur_host_adaptor = ephyrHostXVAdaptorArrayAt(a_this->host_adaptors, i);
+        if (!cur_host_adaptor) {
+            EPHYR_LOG_ERROR("failed to get host adaptor at index %d\n", i);
+            continue;
+        }
+        has_it = FALSE;
+        if (!ephyrHostXVAdaptorHasPutImage(cur_host_adaptor, &has_it)) {
+            EPHYR_LOG_ERROR("error\n");
+        }
+        if (has_it) {
+            a_this->adaptors[i].PutImage = ephyrPutImage;
+        }
+
+        has_it = FALSE;
+        if (!ephyrHostXVAdaptorHasPutVideo(cur_host_adaptor, &has_it)) {
+            EPHYR_LOG_ERROR("error\n");
+        }
+        if (has_it) {
+            a_this->adaptors[i].PutVideo = ephyrPutVideo;
+        }
+
+        has_it = FALSE;
+        if (!ephyrHostXVAdaptorHasGetVideo(cur_host_adaptor, &has_it)) {
+            EPHYR_LOG_ERROR("error\n");
+        }
+        if (has_it) {
+            a_this->adaptors[i].GetVideo = ephyrGetVideo;
+        }
+
+        has_it = FALSE;
+        if (!ephyrHostXVAdaptorHasPutStill(cur_host_adaptor, &has_it)) {
+            EPHYR_LOG_ERROR("error\n");
+        }
+        if (has_it) {
+            a_this->adaptors[i].PutStill = ephyrPutStill;
+        }
+
+        has_it = FALSE;
+        if (!ephyrHostXVAdaptorHasGetStill(cur_host_adaptor, &has_it)) {
+            EPHYR_LOG_ERROR("error\n");
+        }
+        if (has_it) {
+            a_this->adaptors[i].GetStill = ephyrGetStill;
+        }
+    }
+    EPHYR_LOG("leave\n");
+    return TRUE;
+}
+
+static Bool
+ephyrXVPrivRegisterAdaptors(EphyrXVPriv * a_this, ScreenPtr a_screen)
+{
+    KdScreenPriv(a_screen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    Bool is_ok = FALSE;
+    KdVideoAdaptorPtr *adaptors = NULL, *registered_adaptors = NULL;
+    int num_registered_adaptors = 0, i = 0, num_adaptors = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_this && a_screen, FALSE);
+
+    EPHYR_LOG("enter\n");
+
+    if (!a_this->num_adaptors)
+        goto out;
+    num_registered_adaptors =
+        KdXVListGenericAdaptors(screen, &registered_adaptors);
+
+    num_adaptors = num_registered_adaptors + a_this->num_adaptors;
+    adaptors = calloc(num_adaptors, sizeof(KdVideoAdaptorPtr));
+    if (!adaptors) {
+        EPHYR_LOG_ERROR("failed to allocate adaptors tab\n");
+        goto out;
+    }
+    memmove(adaptors, registered_adaptors, num_registered_adaptors);
+    for (i = 0; i < a_this->num_adaptors; i++) {
+        *(adaptors + num_registered_adaptors + i) = &a_this->adaptors[i];
+    }
+    if (!KdXVScreenInit(a_screen, adaptors, num_adaptors)) {
+        EPHYR_LOG_ERROR("failed to register adaptors\n");
+        goto out;
+    }
+    EPHYR_LOG("there are  %d registered adaptors\n", num_adaptors);
+    is_ok = TRUE;
+
+ out:
+    free(registered_adaptors);
+    registered_adaptors = NULL;
+    free(adaptors);
+    adaptors = NULL;
+
+    EPHYR_LOG("leave\n");
+    return is_ok;
+}
+
+static Bool
+ephyrXVPrivIsAttrValueValid(KdAttributePtr a_attrs,
+                            int a_attrs_len,
+                            const char *a_attr_name,
+                            int a_attr_value, Bool *a_is_valid)
+{
+    int i = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_attrs && a_attr_name && a_is_valid, FALSE);
+
+    for (i = 0; i < a_attrs_len; i++) {
+        if (a_attrs[i].name && strcmp(a_attrs[i].name, a_attr_name))
+            continue;
+        if (a_attrs[i].min_value > a_attr_value ||
+            a_attrs[i].max_value < a_attr_value) {
+            *a_is_valid = FALSE;
+            EPHYR_LOG_ERROR("attribute was not valid\n"
+                            "value:%d. min:%d. max:%d\n",
+                            a_attr_value,
+                            a_attrs[i].min_value, a_attrs[i].max_value);
+        }
+        else {
+            *a_is_valid = TRUE;
+        }
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static Bool
+ephyrXVPrivGetImageBufSize(int a_port_id,
+                           int a_image_id,
+                           unsigned short a_width,
+                           unsigned short a_height, int *a_size)
+{
+    Bool is_ok = FALSE;
+    unsigned short width = a_width, height = a_height;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_size, FALSE);
+
+    EPHYR_LOG("enter\n");
+
+    if (!ephyrHostXVQueryImageAttributes(a_port_id, a_image_id,
+                                         &width, &height, a_size, NULL, NULL)) {
+        EPHYR_LOG_ERROR("failed to get image attributes\n");
+        goto out;
+    }
+    is_ok = TRUE;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
+}
+
+static Bool
+ephyrXVPrivSaveImageToPortPriv(EphyrPortPriv * a_port_priv,
+                               const unsigned char *a_image_buf,
+                               int a_image_len)
+{
+    Bool is_ok = FALSE;
+
+    EPHYR_LOG("enter\n");
+
+    if (a_port_priv->image_buf_size < a_image_len) {
+        unsigned char *buf = NULL;
+
+        buf = realloc(a_port_priv->image_buf, a_image_len);
+        if (!buf) {
+            EPHYR_LOG_ERROR("failed to realloc image buffer\n");
+            goto out;
+        }
+        a_port_priv->image_buf = buf;
+        a_port_priv->image_buf_size = a_image_len;
+    }
+    memmove(a_port_priv->image_buf, a_image_buf, a_image_len);
+    is_ok = TRUE;
+
+ out:
+    return is_ok;
+    EPHYR_LOG("leave\n");
+}
+
+static void
+ephyrStopVideo(KdScreenInfo * a_info, pointer a_port_priv, Bool a_exit)
+{
+    EphyrPortPriv *port_priv = a_port_priv;
+
+    EPHYR_RETURN_IF_FAIL(a_info && a_info->pScreen);
+    EPHYR_RETURN_IF_FAIL(port_priv);
+
+    EPHYR_LOG("enter\n");
+    if (!ephyrHostXVStopVideo(a_info->pScreen->myNum, port_priv->port_number)) {
+        EPHYR_LOG_ERROR("XvStopVideo() failed\n");
+    }
+    EPHYR_LOG("leave\n");
+}
+
+static int
+ephyrSetPortAttribute(KdScreenInfo * a_info,
+                      Atom a_attr_name, int a_attr_value, pointer a_port_priv)
+{
+    int res = Success, host_atom = 0;
+    EphyrPortPriv *port_priv = a_port_priv;
+    Bool is_attr_valid = FALSE;
+
+    EPHYR_RETURN_VAL_IF_FAIL(port_priv, BadMatch);
+    EPHYR_RETURN_VAL_IF_FAIL(port_priv->current_adaptor, BadMatch);
+    EPHYR_RETURN_VAL_IF_FAIL(port_priv->current_adaptor->pAttributes, BadMatch);
+    EPHYR_RETURN_VAL_IF_FAIL(port_priv->current_adaptor->nAttributes, BadMatch);
+    EPHYR_RETURN_VAL_IF_FAIL(ValidAtom(a_attr_name), BadMatch);
+
+    EPHYR_LOG("enter, portnum:%d, atomid:%d, attr_name:%s, attr_val:%d\n",
+              port_priv->port_number,
+              (int) a_attr_name, NameForAtom(a_attr_name), a_attr_value);
+
+    if (!ephyrLocalAtomToHost(a_attr_name, &host_atom)) {
+        EPHYR_LOG_ERROR("failed to convert local atom to host atom\n");
+        res = BadMatch;
+        goto out;
+    }
+
+    if (!ephyrXVPrivIsAttrValueValid(port_priv->current_adaptor->pAttributes,
+                                     port_priv->current_adaptor->nAttributes,
+                                     NameForAtom(a_attr_name),
+                                     a_attr_value, &is_attr_valid)) {
+        EPHYR_LOG_ERROR("failed to validate attribute %s\n",
+                        NameForAtom(a_attr_name));
+        /*
+           res = BadMatch ;
+           goto out ;
+         */
+    }
+    if (!is_attr_valid) {
+        EPHYR_LOG_ERROR("attribute %s is not valid\n",
+                        NameForAtom(a_attr_name));
+        /*
+           res = BadMatch ;
+           goto out ;
+         */
+    }
+
+    if (!ephyrHostXVSetPortAttribute(port_priv->port_number,
+                                     host_atom, a_attr_value)) {
+        EPHYR_LOG_ERROR("failed to set port attribute\n");
+        res = BadMatch;
+        goto out;
+    }
+
+    res = Success;
+ out:
+    EPHYR_LOG("leave\n");
+    return res;
+}
+
+static int
+ephyrGetPortAttribute(KdScreenInfo * a_screen_info,
+                      Atom a_attr_name, int *a_attr_value, pointer a_port_priv)
+{
+    int res = Success, host_atom = 0;
+    EphyrPortPriv *port_priv = a_port_priv;
+
+    EPHYR_RETURN_VAL_IF_FAIL(port_priv, BadMatch);
+    EPHYR_RETURN_VAL_IF_FAIL(ValidAtom(a_attr_name), BadMatch);
+
+    EPHYR_LOG("enter, portnum:%d, atomid:%d, attr_name:%s\n",
+              port_priv->port_number,
+              (int) a_attr_name, NameForAtom(a_attr_name));
+
+    if (!ephyrLocalAtomToHost(a_attr_name, &host_atom)) {
+        EPHYR_LOG_ERROR("failed to convert local atom to host atom\n");
+        res = BadMatch;
+        goto out;
+    }
+
+    if (!ephyrHostXVGetPortAttribute(port_priv->port_number,
+                                     host_atom, a_attr_value)) {
+        EPHYR_LOG_ERROR("failed to get port attribute\n");
+        res = BadMatch;
+        goto out;
+    }
+
+    res = Success;
+ out:
+    EPHYR_LOG("leave\n");
+    return res;
+}
+
+static void
+ephyrQueryBestSize(KdScreenInfo * a_info,
+                   Bool a_motion,
+                   short a_src_w,
+                   short a_src_h,
+                   short a_drw_w,
+                   short a_drw_h,
+                   unsigned int *a_prefered_w,
+                   unsigned int *a_prefered_h, pointer a_port_priv)
+{
+    int res = 0;
+    EphyrPortPriv *port_priv = a_port_priv;
+
+    EPHYR_RETURN_IF_FAIL(port_priv);
+
+    EPHYR_LOG("enter\n");
+    res = ephyrHostXVQueryBestSize(port_priv->port_number,
+                                   a_motion,
+                                   a_src_w, a_src_h,
+                                   a_drw_w, a_drw_h,
+                                   a_prefered_w, a_prefered_h);
+    if (!res) {
+        EPHYR_LOG_ERROR("Failed to query best size\n");
+    }
+    EPHYR_LOG("leave\n");
+}
+
+static int
+ephyrPutImage(KdScreenInfo * a_info,
+              DrawablePtr a_drawable,
+              short a_src_x,
+              short a_src_y,
+              short a_drw_x,
+              short a_drw_y,
+              short a_src_w,
+              short a_src_h,
+              short a_drw_w,
+              short a_drw_h,
+              int a_id,
+              unsigned char *a_buf,
+              short a_width,
+              short a_height,
+              Bool a_sync, RegionPtr a_clipping_region, pointer a_port_priv)
+{
+    EphyrPortPriv *port_priv = a_port_priv;
+    Bool is_ok = FALSE;
+    int result = BadImplementation, image_size = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_info && a_info->pScreen, BadValue);
+    EPHYR_RETURN_VAL_IF_FAIL(a_drawable, BadValue);
+
+    EPHYR_LOG("enter\n");
+
+    if (!ephyrHostXVPutImage(a_info->pScreen->myNum,
+                             port_priv->port_number,
+                             a_id,
+                             a_drw_x, a_drw_y, a_drw_w, a_drw_h,
+                             a_src_x, a_src_y, a_src_w, a_src_h,
+                             a_width, a_height, a_buf,
+                             (EphyrHostBox *) RegionRects(a_clipping_region),
+                             RegionNumRects(a_clipping_region))) {
+        EPHYR_LOG_ERROR("EphyrHostXVPutImage() failed\n");
+        goto out;
+    }
+
+    /*
+     * Now save the image so that we can resend it to host it
+     * later, in ReputImage.
+     */
+    if (!ephyrXVPrivGetImageBufSize(port_priv->port_number,
+                                    a_id, a_width, a_height, &image_size)) {
+        EPHYR_LOG_ERROR("failed to get image size\n");
+        /*this is a minor error so we won't get bail out abruptly */
+        is_ok = FALSE;
+    }
+    else {
+        is_ok = TRUE;
+    }
+    if (is_ok) {
+        if (!ephyrXVPrivSaveImageToPortPriv(port_priv, a_buf, image_size)) {
+            is_ok = FALSE;
+        }
+        else {
+            port_priv->image_id = a_id;
+            port_priv->drw_x = a_drw_x;
+            port_priv->drw_y = a_drw_y;
+            port_priv->drw_w = a_drw_w;
+            port_priv->drw_h = a_drw_h;
+            port_priv->src_x = a_src_x;
+            port_priv->src_y = a_src_y;
+            port_priv->src_w = a_src_w;
+            port_priv->src_h = a_src_h;
+            port_priv->image_width = a_width;
+            port_priv->image_height = a_height;
+        }
+    }
+    if (!is_ok) {
+        if (port_priv->image_buf) {
+            free(port_priv->image_buf);
+            port_priv->image_buf = NULL;
+            port_priv->image_buf_size = 0;
+        }
+    }
+
+    result = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return result;
+}
+
+static int
+ephyrReputImage(KdScreenInfo * a_info,
+                DrawablePtr a_drawable,
+                short a_drw_x,
+                short a_drw_y, RegionPtr a_clipping_region, pointer a_port_priv)
+{
+    EphyrPortPriv *port_priv = a_port_priv;
+    int result = BadImplementation;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_info->pScreen, FALSE);
+    EPHYR_RETURN_VAL_IF_FAIL(a_drawable && port_priv, BadValue);
+
+    EPHYR_LOG("enter\n");
+
+    if (!port_priv->image_buf_size || !port_priv->image_buf) {
+        EPHYR_LOG_ERROR("has null image buf in cache\n");
+        goto out;
+    }
+    if (!ephyrHostXVPutImage(a_info->pScreen->myNum,
+                             port_priv->port_number,
+                             port_priv->image_id,
+                             a_drw_x, a_drw_y,
+                             port_priv->drw_w, port_priv->drw_h,
+                             port_priv->src_x, port_priv->src_y,
+                             port_priv->src_w, port_priv->src_h,
+                             port_priv->image_width, port_priv->image_height,
+                             port_priv->image_buf,
+                             (EphyrHostBox *) RegionRects(a_clipping_region),
+                             RegionNumRects(a_clipping_region))) {
+        EPHYR_LOG_ERROR("ephyrHostXVPutImage() failed\n");
+        goto out;
+    }
+
+    result = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return result;
+}
+
+static int
+ephyrPutVideo(KdScreenInfo * a_info,
+              DrawablePtr a_drawable,
+              short a_vid_x, short a_vid_y,
+              short a_drw_x, short a_drw_y,
+              short a_vid_w, short a_vid_h,
+              short a_drw_w, short a_drw_h,
+              RegionPtr a_clipping_region, pointer a_port_priv)
+{
+    EphyrPortPriv *port_priv = a_port_priv;
+    BoxRec clipped_area, dst_box;
+    int result = BadImplementation;
+    int drw_x = 0, drw_y = 0, drw_w = 0, drw_h = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_info->pScreen, BadValue);
+    EPHYR_RETURN_VAL_IF_FAIL(a_drawable && port_priv, BadValue);
+
+    EPHYR_LOG("enter\n");
+
+    dst_box.x1 = a_drw_x;
+    dst_box.x2 = a_drw_x + a_drw_w;
+    dst_box.y1 = a_drw_y;
+    dst_box.y2 = a_drw_y + a_drw_h;
+
+    if (!DoSimpleClip(&dst_box,
+                      RegionExtents(a_clipping_region), &clipped_area)) {
+        EPHYR_LOG_ERROR("failed to simple clip\n");
+        goto out;
+    }
+
+    drw_x = clipped_area.x1;
+    drw_y = clipped_area.y1;
+    drw_w = clipped_area.x2 - clipped_area.x1;
+    drw_h = clipped_area.y2 - clipped_area.y1;
+
+    if (!ephyrHostXVPutVideo(a_info->pScreen->myNum,
+                             port_priv->port_number,
+                             a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                             a_drw_x, a_drw_y, a_drw_w, a_drw_h)) {
+        EPHYR_LOG_ERROR("ephyrHostXVPutVideo() failed\n");
+        goto out;
+    }
+    result = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return result;
+}
+
+static int
+ephyrGetVideo(KdScreenInfo * a_info,
+              DrawablePtr a_drawable,
+              short a_vid_x, short a_vid_y,
+              short a_drw_x, short a_drw_y,
+              short a_vid_w, short a_vid_h,
+              short a_drw_w, short a_drw_h,
+              RegionPtr a_clipping_region, pointer a_port_priv)
+{
+    EphyrPortPriv *port_priv = a_port_priv;
+    BoxRec clipped_area, dst_box;
+    int result = BadImplementation;
+    int drw_x = 0, drw_y = 0, drw_w = 0, drw_h = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_info && a_info->pScreen, BadValue);
+    EPHYR_RETURN_VAL_IF_FAIL(a_drawable && port_priv, BadValue);
+
+    EPHYR_LOG("enter\n");
+
+    dst_box.x1 = a_drw_x;
+    dst_box.x2 = a_drw_x + a_drw_w;
+    dst_box.y1 = a_drw_y;
+    dst_box.y2 = a_drw_y + a_drw_h;
+
+    if (!DoSimpleClip(&dst_box,
+                      RegionExtents(a_clipping_region), &clipped_area)) {
+        EPHYR_LOG_ERROR("failed to simple clip\n");
+        goto out;
+    }
+
+    drw_x = clipped_area.x1;
+    drw_y = clipped_area.y1;
+    drw_w = clipped_area.x2 - clipped_area.x1;
+    drw_h = clipped_area.y2 - clipped_area.y1;
+
+    if (!ephyrHostXVGetVideo(a_info->pScreen->myNum,
+                             port_priv->port_number,
+                             a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                             a_drw_x, a_drw_y, a_drw_w, a_drw_h)) {
+        EPHYR_LOG_ERROR("ephyrHostXVGetVideo() failed\n");
+        goto out;
+    }
+    result = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return result;
+}
+
+static int
+ephyrPutStill(KdScreenInfo * a_info,
+              DrawablePtr a_drawable,
+              short a_vid_x, short a_vid_y,
+              short a_drw_x, short a_drw_y,
+              short a_vid_w, short a_vid_h,
+              short a_drw_w, short a_drw_h,
+              RegionPtr a_clipping_region, pointer a_port_priv)
+{
+    EphyrPortPriv *port_priv = a_port_priv;
+    BoxRec clipped_area, dst_box;
+    int result = BadImplementation;
+    int drw_x = 0, drw_y = 0, drw_w = 0, drw_h = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_info && a_info->pScreen, BadValue);
+    EPHYR_RETURN_VAL_IF_FAIL(a_drawable && port_priv, BadValue);
+
+    EPHYR_LOG("enter\n");
+
+    dst_box.x1 = a_drw_x;
+    dst_box.x2 = a_drw_x + a_drw_w;
+    dst_box.y1 = a_drw_y;
+    dst_box.y2 = a_drw_y + a_drw_h;
+
+    if (!DoSimpleClip(&dst_box,
+                      RegionExtents(a_clipping_region), &clipped_area)) {
+        EPHYR_LOG_ERROR("failed to simple clip\n");
+        goto out;
+    }
+
+    drw_x = clipped_area.x1;
+    drw_y = clipped_area.y1;
+    drw_w = clipped_area.x2 - clipped_area.x1;
+    drw_h = clipped_area.y2 - clipped_area.y1;
+
+    if (!ephyrHostXVPutStill(a_info->pScreen->myNum,
+                             port_priv->port_number,
+                             a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                             a_drw_x, a_drw_y, a_drw_w, a_drw_h)) {
+        EPHYR_LOG_ERROR("ephyrHostXVPutStill() failed\n");
+        goto out;
+    }
+    result = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return result;
+}
+
+static int
+ephyrGetStill(KdScreenInfo * a_info,
+              DrawablePtr a_drawable,
+              short a_vid_x, short a_vid_y,
+              short a_drw_x, short a_drw_y,
+              short a_vid_w, short a_vid_h,
+              short a_drw_w, short a_drw_h,
+              RegionPtr a_clipping_region, pointer a_port_priv)
+{
+    EphyrPortPriv *port_priv = a_port_priv;
+    BoxRec clipped_area, dst_box;
+    int result = BadImplementation;
+    int drw_x = 0, drw_y = 0, drw_w = 0, drw_h = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_info && a_info->pScreen, BadValue);
+    EPHYR_RETURN_VAL_IF_FAIL(a_drawable && port_priv, BadValue);
+
+    EPHYR_LOG("enter\n");
+
+    dst_box.x1 = a_drw_x;
+    dst_box.x2 = a_drw_x + a_drw_w;
+    dst_box.y1 = a_drw_y;
+    dst_box.y2 = a_drw_y + a_drw_h;
+
+    if (!DoSimpleClip(&dst_box,
+                      RegionExtents(a_clipping_region), &clipped_area)) {
+        EPHYR_LOG_ERROR("failed to simple clip\n");
+        goto out;
+    }
+
+    drw_x = clipped_area.x1;
+    drw_y = clipped_area.y1;
+    drw_w = clipped_area.x2 - clipped_area.x1;
+    drw_h = clipped_area.y2 - clipped_area.y1;
+
+    if (!ephyrHostXVGetStill(a_info->pScreen->myNum,
+                             port_priv->port_number,
+                             a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                             a_drw_x, a_drw_y, a_drw_w, a_drw_h)) {
+        EPHYR_LOG_ERROR("ephyrHostXVGetStill() failed\n");
+        goto out;
+    }
+    result = Success;
+
+ out:
+    EPHYR_LOG("leave\n");
+    return result;
+}
+
+static int
+ephyrQueryImageAttributes(KdScreenInfo * a_info,
+                          int a_id,
+                          unsigned short *a_w,
+                          unsigned short *a_h, int *a_pitches, int *a_offsets)
+{
+    int image_size = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_w && a_h, FALSE);
+
+    EPHYR_LOG("enter: dim (%dx%d), pitches: %p, offsets: %p\n",
+              *a_w, *a_h, a_pitches, a_offsets);
+
+    if (!ephyrHostXVQueryImageAttributes(s_base_port_id,
+                                         a_id,
+                                         a_w, a_h,
+                                         &image_size, a_pitches, a_offsets)) {
+        EPHYR_LOG_ERROR("EphyrHostXVQueryImageAttributes() failed\n");
+        goto out;
+    }
+    EPHYR_LOG("image size: %d, dim (%dx%d)\n", image_size, *a_w, *a_h);
+
+ out:
+    EPHYR_LOG("leave\n");
+    return image_size;
+}
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c
index ebe4e52ed..6988f1625 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.c
+++ b/xorg-server/hw/kdrive/ephyr/hostx.c
@@ -38,13 +38,12 @@
 #undef _XSERVER64
 #endif
 
-
 #include "hostx.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <string.h> 		/* for memset */
+#include <string.h>             /* for memset */
 #include <errno.h>
 #include <time.h>
 
@@ -60,13 +59,12 @@
 #include <X11/extensions/shape.h>
 #ifdef XF86DRI
 #include <GL/glx.h>
-#endif /* XF86DRI */
+#endif                          /* XF86DRI */
 #include "ephyrlog.h"
 
 #ifdef XF86DRI
-extern Bool XF86DRIQueryExtension (Display *dpy,
-                                   int *event_basep,
-                                   int *error_basep);
+extern Bool XF86DRIQueryExtension(Display * dpy,
+                                  int *event_basep, int *error_basep);
 #endif
 
 /*  
@@ -75,261 +73,248 @@ extern Bool XF86DRIQueryExtension (Display *dpy,
  * to get clobbered. 
  */
 
-struct EphyrHostScreen
-{
-  Window          win;
-  Window          win_pre_existing; 	/* Set via -parent option like xnest */
-  Window          peer_win;          /* Used for GL; should be at most one */
-  XImage         *ximg;
-  int             win_width, win_height;
-  int             server_depth;
-  unsigned char  *fb_data;   	/* only used when host bpp != server bpp */
-  XShmSegmentInfo shminfo;
-
-  void           *info;   /* Pointer to the screen this is associated with */
-  int             mynum;  /* Screen number */
+struct EphyrHostScreen {
+    Window win;
+    Window win_pre_existing;    /* Set via -parent option like xnest */
+    Window peer_win;            /* Used for GL; should be at most one */
+    XImage *ximg;
+    int win_width, win_height;
+    int server_depth;
+    unsigned char *fb_data;     /* only used when host bpp != server bpp */
+    XShmSegmentInfo shminfo;
+
+    void *info;                 /* Pointer to the screen this is associated with */
+    int mynum;                  /* Screen number */
 };
 
-struct EphyrHostXVars
-{
-  char           *server_dpy_name;
-  Display        *dpy;
-  int             screen;
-  Visual         *visual;
-  Window          winroot;
-  GC              gc;
-  int             depth;
-  Bool            use_host_cursor;
-  Bool            use_fullscreen;
-  Bool            have_shm;
-
-  int             n_screens;
-  struct EphyrHostScreen *screens;
-
-  long            damage_debug_msec;
-
-  unsigned long   cmap[256];
+struct EphyrHostXVars {
+    char *server_dpy_name;
+    Display *dpy;
+    int screen;
+    Visual *visual;
+    Window winroot;
+    GC gc;
+    int depth;
+    Bool use_host_cursor;
+    Bool use_fullscreen;
+    Bool have_shm;
+
+    int n_screens;
+    struct EphyrHostScreen *screens;
+
+    long damage_debug_msec;
+
+    unsigned long cmap[256];
 };
 
 /* memset ( missing> ) instead of below  */
 /*static EphyrHostXVars HostX = { "?", 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};*/
 static EphyrHostXVars HostX;
 
-static int            HostXWantDamageDebug = 0;
+static int HostXWantDamageDebug = 0;
 
-extern EphyrKeySyms   ephyrKeySyms;
+extern EphyrKeySyms ephyrKeySyms;
 
-extern int            monitorResolution;
+extern int monitorResolution;
 
-char           *ephyrResName = NULL;
-int             ephyrResNameFromCmd = 0;
-char	       *ephyrTitle = NULL;
+char *ephyrResName = NULL;
+int ephyrResNameFromCmd = 0;
+char *ephyrTitle = NULL;
 
 static void
-hostx_set_fullscreen_hint(void);
+ hostx_set_fullscreen_hint(void);
 
 /* X Error traps */
 
 static int trapped_error_code = 0;
-static int (*old_error_handler) (Display *d, XErrorEvent *e);
+static int (*old_error_handler) (Display * d, XErrorEvent * e);
 
 #define host_depth_matches_server(_vars) (HostX.depth == (_vars)->server_depth)
 
 static struct EphyrHostScreen *
-host_screen_from_screen_info (EphyrScreenInfo *screen)
+host_screen_from_screen_info(EphyrScreenInfo * screen)
 {
-  int i;
+    int i;
 
-  for (i = 0 ; i < HostX.n_screens ; i++)
-    {
-      if ( HostX.screens[i].info == screen)
-        {
-          return &HostX.screens[i];
+    for (i = 0; i < HostX.n_screens; i++) {
+        if (HostX.screens[i].info == screen) {
+            return &HostX.screens[i];
         }
     }
-  return NULL;
+    return NULL;
 }
 
 static int
-error_handler(Display     *display,
-              XErrorEvent *error)
+error_handler(Display * display, XErrorEvent * error)
 {
-  trapped_error_code = error->error_code;
-  return 0;
+    trapped_error_code = error->error_code;
+    return 0;
 }
 
 static void
 hostx_errors_trap(void)
 {
-  trapped_error_code = 0;
-  old_error_handler = XSetErrorHandler(error_handler);
+    trapped_error_code = 0;
+    old_error_handler = XSetErrorHandler(error_handler);
 }
 
 static int
 hostx_errors_untrap(void)
 {
-  XSetErrorHandler(old_error_handler);
-  return trapped_error_code;
+    XSetErrorHandler(old_error_handler);
+    return trapped_error_code;
 }
 
 int
-hostx_want_screen_size (EphyrScreenInfo screen, int *width, int *height )
+hostx_want_screen_size(EphyrScreenInfo screen, int *width, int *height)
 {
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-
-  if (host_screen &&
-       (host_screen->win_pre_existing != None ||
-         HostX.use_fullscreen == True))
-    {
-      *width  = host_screen->win_width;
-      *height = host_screen->win_height;
-      return 1;
+    struct EphyrHostScreen *host_screen = host_screen_from_screen_info(screen);
+
+    if (host_screen &&
+        (host_screen->win_pre_existing != None ||
+         HostX.use_fullscreen == True)) {
+        *width = host_screen->win_width;
+        *height = host_screen->win_height;
+        return 1;
     }
 
- return 0;
+    return 0;
 }
 
 void
-hostx_add_screen (EphyrScreenInfo screen,
-                  unsigned long win_id,
-                  int screen_num)
+hostx_add_screen(EphyrScreenInfo screen, unsigned long win_id, int screen_num)
 {
-  int index = HostX.n_screens;
+    int index = HostX.n_screens;
 
-  HostX.n_screens += 1;
-  HostX.screens = realloc (HostX.screens,
-                           HostX.n_screens * sizeof(struct EphyrHostScreen));
-  memset (&HostX.screens[index], 0, sizeof (struct EphyrHostScreen));
+    HostX.n_screens += 1;
+    HostX.screens = realloc(HostX.screens,
+                            HostX.n_screens * sizeof(struct EphyrHostScreen));
+    memset(&HostX.screens[index], 0, sizeof(struct EphyrHostScreen));
 
-  HostX.screens[index].info       = screen;
-  HostX.screens[index].win_pre_existing = win_id;
+    HostX.screens[index].info = screen;
+    HostX.screens[index].win_pre_existing = win_id;
 }
 
-
 void
-hostx_set_display_name (char *name)
+hostx_set_display_name(char *name)
 {
-  HostX.server_dpy_name = strdup (name);
+    HostX.server_dpy_name = strdup(name);
 }
 
 void
 hostx_set_screen_number(EphyrScreenInfo screen, int number)
 {
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-  if (host_screen) {
-    host_screen->mynum = number;
-    hostx_set_win_title (host_screen->info, "") ;
-  }}
+    struct EphyrHostScreen *host_screen = host_screen_from_screen_info(screen);
+
+    if (host_screen) {
+        host_screen->mynum = number;
+        hostx_set_win_title(host_screen->info, "");
+    }
+}
 
 void
-hostx_set_win_title (EphyrScreenInfo screen, char *extra_text)
+hostx_set_win_title(EphyrScreenInfo screen, char *extra_text)
 {
-    struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
+    struct EphyrHostScreen *host_screen = host_screen_from_screen_info(screen);
 
     if (!host_screen)
-    return;
+        return;
 
     if (ephyrTitle) {
-      XStoreName(HostX.dpy, host_screen->win, ephyrTitle);
-    } else {
+        XStoreName(HostX.dpy, host_screen->win, ephyrTitle);
+    }
+    else {
 #define BUF_LEN 256
-      char buf[BUF_LEN+1];
+        char buf[BUF_LEN + 1];
 
-      memset (buf, 0, BUF_LEN+1) ;
-      snprintf (buf, BUF_LEN, "Xephyr on %s.%d %s", 
-		HostX.server_dpy_name, 
-		host_screen->mynum,
-		(extra_text != NULL) ? extra_text : "");
+        memset(buf, 0, BUF_LEN + 1);
+        snprintf(buf, BUF_LEN, "Xephyr on %s.%d %s",
+                 HostX.server_dpy_name,
+                 host_screen->mynum, (extra_text != NULL) ? extra_text : "");
 
-      XStoreName (HostX.dpy, host_screen->win, buf);
+        XStoreName(HostX.dpy, host_screen->win, buf);
     }
 }
 
 int
-hostx_want_host_cursor (void)
+hostx_want_host_cursor(void)
 {
-  return HostX.use_host_cursor;
+    return HostX.use_host_cursor;
 }
 
 void
-hostx_use_host_cursor (void)
+hostx_use_host_cursor(void)
 {
-  HostX.use_host_cursor = True;
+    HostX.use_host_cursor = True;
 }
 
 int
-hostx_want_preexisting_window (EphyrScreenInfo screen)
+hostx_want_preexisting_window(EphyrScreenInfo screen)
 {
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
+    struct EphyrHostScreen *host_screen = host_screen_from_screen_info(screen);
 
-  if (host_screen && host_screen->win_pre_existing)
-    {
-      return 1;
+    if (host_screen && host_screen->win_pre_existing) {
+        return 1;
     }
-  else
-    {
-    return 0;
+    else {
+        return 0;
     }
 }
 
 void
-hostx_use_fullscreen (void)
+hostx_use_fullscreen(void)
 {
-  HostX.use_fullscreen = True;
+    HostX.use_fullscreen = True;
 }
 
 int
-hostx_want_fullscreen (void)
+hostx_want_fullscreen(void)
 {
-  return HostX.use_fullscreen;
+    return HostX.use_fullscreen;
 }
 
 static void
-hostx_set_fullscreen_hint (void)
+hostx_set_fullscreen_hint(void)
 {
-  Atom atom_WINDOW_STATE, atom_WINDOW_STATE_FULLSCREEN;
-  int index;
-
-  atom_WINDOW_STATE 
-    = XInternAtom(HostX.dpy, "_NET_WM_STATE", False);
-  atom_WINDOW_STATE_FULLSCREEN 
-    = XInternAtom(HostX.dpy, "_NET_WM_STATE_FULLSCREEN",False);
-
-  for (index = 0 ; index < HostX.n_screens ; index++)
-    {
-      XChangeProperty (HostX.dpy, HostX.screens[index].win,
-                       atom_WINDOW_STATE, XA_ATOM, 32,
-                       PropModeReplace,
-                       (unsigned char *)&atom_WINDOW_STATE_FULLSCREEN, 1);
+    Atom atom_WINDOW_STATE, atom_WINDOW_STATE_FULLSCREEN;
+    int index;
+
+    atom_WINDOW_STATE = XInternAtom(HostX.dpy, "_NET_WM_STATE", False);
+    atom_WINDOW_STATE_FULLSCREEN
+        = XInternAtom(HostX.dpy, "_NET_WM_STATE_FULLSCREEN", False);
+
+    for (index = 0; index < HostX.n_screens; index++) {
+        XChangeProperty(HostX.dpy, HostX.screens[index].win,
+                        atom_WINDOW_STATE, XA_ATOM, 32,
+                        PropModeReplace,
+                        (unsigned char *) &atom_WINDOW_STATE_FULLSCREEN, 1);
     }
 }
 
-
 static void
-hostx_toggle_damage_debug (void)
+hostx_toggle_damage_debug(void)
 {
-  HostXWantDamageDebug ^= 1;
+    HostXWantDamageDebug ^= 1;
 }
 
 void
-hostx_handle_signal (int signum)
+hostx_handle_signal(int signum)
 {
-  hostx_toggle_damage_debug();
-  EPHYR_DBG ("Signal caught. Damage Debug:%i\n",
-              HostXWantDamageDebug);
+    hostx_toggle_damage_debug();
+    EPHYR_DBG("Signal caught. Damage Debug:%i\n", HostXWantDamageDebug);
 }
 
 void
-hostx_use_resname (char *name, int fromcmd)
+hostx_use_resname(char *name, int fromcmd)
 {
-  ephyrResName = name;
-  ephyrResNameFromCmd = fromcmd;
+    ephyrResName = name;
+    ephyrResNameFromCmd = fromcmd;
 }
 
 void
-hostx_set_title (char *title)
+hostx_set_title(char *title)
 {
-  ephyrTitle = title;
+    ephyrTitle = title;
 }
 
 #ifdef __SUNPRO_C
@@ -338,7 +323,8 @@ hostx_set_title (char *title)
 #endif
 
 static int _X_NORETURN
-x_io_error_handler (Display *dpy) {
+x_io_error_handler(Display * dpy)
+{
     ErrorF("Lost connection to X server: %s\n", strerror(errno));
     CloseWellKnownConnections();
     OsCleanup(1);
@@ -346,297 +332,271 @@ x_io_error_handler (Display *dpy) {
 }
 
 int
-hostx_init (void)
+hostx_init(void)
 {
-  XSetWindowAttributes  attr;
-  Cursor                empty_cursor;
-  Pixmap                cursor_pxm;
-  XColor                col;
-  int                   index;
-  char                  *tmpstr;
-  XClassHint            *class_hint;
-
-  attr.event_mask =
-    ButtonPressMask
-    |ButtonReleaseMask
-    |PointerMotionMask
-    |KeyPressMask
-    |KeyReleaseMask
-    |ExposureMask;
-
-  EPHYR_DBG("mark");
-
-  if ((HostX.dpy = XOpenDisplay(getenv("DISPLAY"))) == NULL)
-    {
-      fprintf(stderr, "\nXephyr cannot open host display. Is DISPLAY set?\n");
-      exit(1);
+    XSetWindowAttributes attr;
+    Cursor empty_cursor;
+    Pixmap cursor_pxm;
+    XColor col;
+    int index;
+    char *tmpstr;
+    XClassHint *class_hint;
+
+    attr.event_mask =
+        ButtonPressMask
+        | ButtonReleaseMask
+        | PointerMotionMask | KeyPressMask | KeyReleaseMask | ExposureMask;
+
+    EPHYR_DBG("mark");
+
+    if ((HostX.dpy = XOpenDisplay(getenv("DISPLAY"))) == NULL) {
+        fprintf(stderr, "\nXephyr cannot open host display. Is DISPLAY set?\n");
+        exit(1);
     }
 
-  XSetIOErrorHandler(x_io_error_handler);
+    XSetIOErrorHandler(x_io_error_handler);
 
-  HostX.screen  = DefaultScreen(HostX.dpy);
-  HostX.winroot = RootWindow(HostX.dpy, HostX.screen);
-  HostX.gc      = XCreateGC(HostX.dpy, HostX.winroot, 0, NULL);
-  HostX.depth   = DefaultDepth(HostX.dpy, HostX.screen);
-  HostX.visual  = DefaultVisual(HostX.dpy, HostX.screen);
+    HostX.screen = DefaultScreen(HostX.dpy);
+    HostX.winroot = RootWindow(HostX.dpy, HostX.screen);
+    HostX.gc = XCreateGC(HostX.dpy, HostX.winroot, 0, NULL);
+    HostX.depth = DefaultDepth(HostX.dpy, HostX.screen);
+    HostX.visual = DefaultVisual(HostX.dpy, HostX.screen);
 
-  class_hint = XAllocClassHint();
+    class_hint = XAllocClassHint();
 
-  for (index = 0 ; index < HostX.n_screens ; index++)
-    {
-      struct EphyrHostScreen *host_screen = &HostX.screens[index];
+    for (index = 0; index < HostX.n_screens; index++) {
+        struct EphyrHostScreen *host_screen = &HostX.screens[index];
 
-      host_screen->server_depth = HostX.depth;
-      if (host_screen->win_pre_existing != None)
-        {
-          Status            result;
-          XWindowAttributes prewin_attr;
-
-          /* Get screen size from existing window */
-
-          hostx_errors_trap();
-
-          result = XGetWindowAttributes (HostX.dpy,
-                                         host_screen->win_pre_existing,
-                                         &prewin_attr);
-
-
-          if (hostx_errors_untrap() || !result)
-          {
-              fprintf (stderr, "\nXephyr -parent window' does not exist!\n");
-              exit (1);
-          }
-
-          host_screen->win_width  = prewin_attr.width;
-          host_screen->win_height = prewin_attr.height;
-
-          host_screen->win = XCreateWindow (HostX.dpy,
-                                            host_screen->win_pre_existing,
-                                            0,0,
-                                            host_screen->win_width,
-                                            host_screen->win_height,
-                                            0,
-                                            CopyFromParent,
-                                            CopyFromParent,
-                                            CopyFromParent,
-                                            CWEventMask,
-                                            &attr);
-        }
-      else
-        {
-          host_screen->win = XCreateWindow (HostX.dpy,
-                                            HostX.winroot,
-                                            0,0,100,100, /* will resize */
-                                            0,
-                                            CopyFromParent,
-                                            CopyFromParent,
-                                            CopyFromParent,
-                                            CWEventMask,
-                                            &attr);
-
-          hostx_set_win_title (host_screen->info,
-                               "(ctrl+shift grabs mouse and keyboard)");
-
-          if (HostX.use_fullscreen)
-            {
-              host_screen->win_width  = DisplayWidth(HostX.dpy, HostX.screen);
-              host_screen->win_height = DisplayHeight(HostX.dpy, HostX.screen);
+        host_screen->server_depth = HostX.depth;
+        if (host_screen->win_pre_existing != None) {
+            Status result;
+            XWindowAttributes prewin_attr;
+
+            /* Get screen size from existing window */
+
+            hostx_errors_trap();
 
-              hostx_set_fullscreen_hint();
+            result = XGetWindowAttributes(HostX.dpy,
+                                          host_screen->win_pre_existing,
+                                          &prewin_attr);
+
+            if (hostx_errors_untrap() || !result) {
+                fprintf(stderr, "\nXephyr -parent window' does not exist!\n");
+                exit(1);
             }
 
-          if (class_hint) 
-            {
-              tmpstr = getenv("RESOURCE_NAME");
-              if (tmpstr && (!ephyrResNameFromCmd))
-                ephyrResName = tmpstr;
-              class_hint->res_name = ephyrResName;
-              class_hint->res_class = "Xephyr";
-              XSetClassHint(hostx_get_display(), host_screen->win, class_hint);
+            host_screen->win_width = prewin_attr.width;
+            host_screen->win_height = prewin_attr.height;
+
+            host_screen->win = XCreateWindow(HostX.dpy,
+                                             host_screen->win_pre_existing,
+                                             0, 0,
+                                             host_screen->win_width,
+                                             host_screen->win_height,
+                                             0,
+                                             CopyFromParent,
+                                             CopyFromParent,
+                                             CopyFromParent,
+                                             CWEventMask, &attr);
+        }
+        else {
+            host_screen->win = XCreateWindow(HostX.dpy, HostX.winroot, 0, 0, 100, 100,  /* will resize */
+                                             0,
+                                             CopyFromParent,
+                                             CopyFromParent,
+                                             CopyFromParent,
+                                             CWEventMask, &attr);
+
+            hostx_set_win_title(host_screen->info,
+                                "(ctrl+shift grabs mouse and keyboard)");
+
+            if (HostX.use_fullscreen) {
+                host_screen->win_width = DisplayWidth(HostX.dpy, HostX.screen);
+                host_screen->win_height =
+                    DisplayHeight(HostX.dpy, HostX.screen);
+
+                hostx_set_fullscreen_hint();
+            }
+
+            if (class_hint) {
+                tmpstr = getenv("RESOURCE_NAME");
+                if (tmpstr && (!ephyrResNameFromCmd))
+                    ephyrResName = tmpstr;
+                class_hint->res_name = ephyrResName;
+                class_hint->res_class = "Xephyr";
+                XSetClassHint(hostx_get_display(), host_screen->win,
+                              class_hint);
 
             }
 
         }
     }
 
-  if (class_hint)
-      XFree(class_hint);
-
-  XParseColor (HostX.dpy, DefaultColormap (HostX.dpy,HostX.screen),
-               "red", &col);
-  XAllocColor (HostX.dpy, DefaultColormap (HostX.dpy, HostX.screen),
-               &col);
-  XSetForeground (HostX.dpy, HostX.gc, col.pixel);
-
-  if (!hostx_want_host_cursor ())
-    {
-      /* Ditch the cursor, we provide our 'own' */
-      cursor_pxm = XCreatePixmap (HostX.dpy, HostX.winroot, 1, 1, 1);
-      memset (&col, 0, sizeof (col));
-      empty_cursor = XCreatePixmapCursor (HostX.dpy,
-                                          cursor_pxm, cursor_pxm, 
-                                          &col, &col, 1, 1);
-      for ( index = 0 ; index < HostX.n_screens ; index++ )
-        {
-          XDefineCursor (HostX.dpy,
-                         HostX.screens[index].win,
-                         empty_cursor);
+    if (class_hint)
+        XFree(class_hint);
+
+    XParseColor(HostX.dpy, DefaultColormap(HostX.dpy, HostX.screen),
+                "red", &col);
+    XAllocColor(HostX.dpy, DefaultColormap(HostX.dpy, HostX.screen), &col);
+    XSetForeground(HostX.dpy, HostX.gc, col.pixel);
+
+    if (!hostx_want_host_cursor()) {
+        /* Ditch the cursor, we provide our 'own' */
+        cursor_pxm = XCreatePixmap(HostX.dpy, HostX.winroot, 1, 1, 1);
+        memset(&col, 0, sizeof(col));
+        empty_cursor = XCreatePixmapCursor(HostX.dpy,
+                                           cursor_pxm, cursor_pxm,
+                                           &col, &col, 1, 1);
+        for (index = 0; index < HostX.n_screens; index++) {
+            XDefineCursor(HostX.dpy, HostX.screens[index].win, empty_cursor);
         }
-      XFreePixmap (HostX.dpy, cursor_pxm);
+        XFreePixmap(HostX.dpy, cursor_pxm);
     }
 
-  for (index = 0 ; index < HostX.n_screens ; index++)
-    {
-      HostX.screens[index].ximg   = NULL;
+    for (index = 0; index < HostX.n_screens; index++) {
+        HostX.screens[index].ximg = NULL;
     }
-  /* Try to get share memory ximages for a little bit more speed */
+    /* Try to get share memory ximages for a little bit more speed */
 
-  if (!XShmQueryExtension(HostX.dpy) || getenv("XEPHYR_NO_SHM"))
-    {
-      fprintf(stderr, "\nXephyr unable to use SHM XImages\n");
-      HostX.have_shm = False;
+    if (!XShmQueryExtension(HostX.dpy) || getenv("XEPHYR_NO_SHM")) {
+        fprintf(stderr, "\nXephyr unable to use SHM XImages\n");
+        HostX.have_shm = False;
     }
-  else
-    {
-      /* Really really check we have shm - better way ?*/
-      XShmSegmentInfo shminfo;
+    else {
+        /* Really really check we have shm - better way ? */
+        XShmSegmentInfo shminfo;
 
         HostX.have_shm = True;
 
-        shminfo.shmid=shmget(IPC_PRIVATE, 1, IPC_CREAT|0777);
-        shminfo.shmaddr=shmat(shminfo.shmid,0,0);
-        shminfo.readOnly=True;
+        shminfo.shmid = shmget(IPC_PRIVATE, 1, IPC_CREAT | 0777);
+        shminfo.shmaddr = shmat(shminfo.shmid, 0, 0);
+        shminfo.readOnly = True;
 
         hostx_errors_trap();
 
         XShmAttach(HostX.dpy, &shminfo);
         XSync(HostX.dpy, False);
 
-        if (hostx_errors_untrap())
-          {
+        if (hostx_errors_untrap()) {
             fprintf(stderr, "\nXephyr unable to use SHM XImages\n");
             HostX.have_shm = False;
-          }
+        }
 
         shmdt(shminfo.shmaddr);
         shmctl(shminfo.shmid, IPC_RMID, 0);
-}
+    }
 
-  XFlush(HostX.dpy);
+    XFlush(HostX.dpy);
 
-  /* Setup the pause time between paints when debugging updates */
+    /* Setup the pause time between paints when debugging updates */
 
-  HostX.damage_debug_msec = 20000; /* 1/50 th of a second */
+    HostX.damage_debug_msec = 20000;    /* 1/50 th of a second */
 
-  if (getenv ("XEPHYR_PAUSE"))
-    {
-      HostX.damage_debug_msec = strtol (getenv ("XEPHYR_PAUSE"), NULL, 0);
-      EPHYR_DBG ("pause is %li\n", HostX.damage_debug_msec);
+    if (getenv("XEPHYR_PAUSE")) {
+        HostX.damage_debug_msec = strtol(getenv("XEPHYR_PAUSE"), NULL, 0);
+        EPHYR_DBG("pause is %li\n", HostX.damage_debug_msec);
     }
 
-  return 1;
+    return 1;
 }
 
 int
-hostx_get_depth (void)
+hostx_get_depth(void)
 {
-  return HostX.depth;
+    return HostX.depth;
 }
 
 int
-hostx_get_server_depth (EphyrScreenInfo screen)
+hostx_get_server_depth(EphyrScreenInfo screen)
 {
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
+    struct EphyrHostScreen *host_screen = host_screen_from_screen_info(screen);
 
-  return host_screen ? host_screen->server_depth : 0;
+    return host_screen ? host_screen->server_depth : 0;
 }
 
 void
-hostx_set_server_depth (EphyrScreenInfo screen, int depth)
+hostx_set_server_depth(EphyrScreenInfo screen, int depth)
 {
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
+    struct EphyrHostScreen *host_screen = host_screen_from_screen_info(screen);
 
-  if (host_screen)
-    host_screen->server_depth = depth;
+    if (host_screen)
+        host_screen->server_depth = depth;
 }
 
 int
-hostx_get_bpp (EphyrScreenInfo screen)
+hostx_get_bpp(EphyrScreenInfo screen)
 {
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
+    struct EphyrHostScreen *host_screen = host_screen_from_screen_info(screen);
 
-  if (!host_screen)
-    return 0;
+    if (!host_screen)
+        return 0;
 
-  if (host_depth_matches_server (host_screen))
-    return HostX.visual->bits_per_rgb;
-  else
-    return host_screen->server_depth; /*XXX correct ?*/
+    if (host_depth_matches_server(host_screen))
+        return HostX.visual->bits_per_rgb;
+    else
+        return host_screen->server_depth;       /*XXX correct ? */
 }
 
 void
-hostx_get_visual_masks (EphyrScreenInfo screen,
-			CARD32 *rmsk,
-			CARD32 *gmsk,
-			CARD32 *bmsk)
+hostx_get_visual_masks(EphyrScreenInfo screen,
+                       CARD32 *rmsk, CARD32 *gmsk, CARD32 *bmsk)
 {
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
+    struct EphyrHostScreen *host_screen = host_screen_from_screen_info(screen);
 
-  if (!host_screen)
-    return;
+    if (!host_screen)
+        return;
 
-  if (host_depth_matches_server(host_screen))
-    {
-      *rmsk = HostX.visual->red_mask;
-      *gmsk = HostX.visual->green_mask;
-      *bmsk = HostX.visual->blue_mask;
+    if (host_depth_matches_server(host_screen)) {
+        *rmsk = HostX.visual->red_mask;
+        *gmsk = HostX.visual->green_mask;
+        *bmsk = HostX.visual->blue_mask;
     }
-  else if (host_screen->server_depth == 16)
-    {
-      /* Assume 16bpp 565 */
-      *rmsk = 0xf800;
-      *gmsk = 0x07e0;
-      *bmsk = 0x001f;
+    else if (host_screen->server_depth == 16) {
+        /* Assume 16bpp 565 */
+        *rmsk = 0xf800;
+        *gmsk = 0x07e0;
+        *bmsk = 0x001f;
     }
-  else
-    {
-      *rmsk = 0x0;
-      *gmsk = 0x0;
-      *bmsk = 0x0;
+    else {
+        *rmsk = 0x0;
+        *gmsk = 0x0;
+        *bmsk = 0x0;
     }
 }
 
-static int 
+static int
 hostx_calculate_color_shift(unsigned long mask)
 {
     int shift = 1;
+
     /* count # of bits in mask */
-    while ((mask = (mask >> 1))) shift++;
+    while ((mask = (mask >> 1)))
+        shift++;
     /* cmap entry is an unsigned char so adjust it by size of that */
     shift = shift - sizeof(unsigned char) * 8;
-    if (shift < 0) shift = 0;
+    if (shift < 0)
+        shift = 0;
     return shift;
 }
 
 void
 hostx_set_cmap_entry(unsigned char idx,
-		     unsigned char r,
-		     unsigned char g,
-		     unsigned char b)
+                     unsigned char r, unsigned char g, unsigned char b)
 {
 /* need to calculate the shifts for RGB because server could be BGR. */
 /* XXX Not sure if this is correct for 8 on 16, but this works for 8 on 24.*/
     static int rshift, bshift, gshift = 0;
     static int first_time = 1;
+
     if (first_time) {
-	first_time = 0;
-	rshift = hostx_calculate_color_shift(HostX.visual->red_mask);
-	gshift = hostx_calculate_color_shift(HostX.visual->green_mask);
-	bshift = hostx_calculate_color_shift(HostX.visual->blue_mask);
+        first_time = 0;
+        rshift = hostx_calculate_color_shift(HostX.visual->red_mask);
+        gshift = hostx_calculate_color_shift(HostX.visual->green_mask);
+        bshift = hostx_calculate_color_shift(HostX.visual->blue_mask);
     }
     HostX.cmap[idx] = ((r << rshift) & HostX.visual->red_mask) |
-		      ((g << gshift) & HostX.visual->green_mask) |
-		      ((b << bshift) & HostX.visual->blue_mask);
+        ((g << gshift) & HostX.visual->green_mask) |
+        ((b << bshift) & HostX.visual->blue_mask);
 }
 
 /**
@@ -651,813 +611,765 @@ hostx_set_cmap_entry(unsigned char idx,
  * buffer_height can be used to create a larger offscreen buffer, which is used
  * by fakexa for storing offscreen pixmap data.
  */
-void*
-hostx_screen_init (EphyrScreenInfo screen,
-                   int width, int height,
-                   int buffer_height)
+void *
+hostx_screen_init(EphyrScreenInfo screen,
+                  int width, int height, int buffer_height)
 {
-  int         bitmap_pad;
-  Bool        shm_success = False;
-  XSizeHints *size_hints;
-
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-  if (!host_screen)
-    {
-      fprintf (stderr, "%s: Error in accessing hostx data\n", __func__ );
-      exit(1);
+    int bitmap_pad;
+    Bool shm_success = False;
+    XSizeHints *size_hints;
+
+    struct EphyrHostScreen *host_screen = host_screen_from_screen_info(screen);
+
+    if (!host_screen) {
+        fprintf(stderr, "%s: Error in accessing hostx data\n", __func__);
+        exit(1);
     }
 
-  EPHYR_DBG ("host_screen=%p wxh=%dx%d, buffer_height=%d",
-             host_screen, width, height, buffer_height);
-
-  if (host_screen->ximg != NULL)
-    {
-      /* Free up the image data if previously used
-       * i.ie called by server reset
-       */
-
-      if (HostX.have_shm)
-	{
-	  XShmDetach(HostX.dpy, &host_screen->shminfo);
-	  XDestroyImage (host_screen->ximg);
-	  shmdt(host_screen->shminfo.shmaddr);
-	  shmctl(host_screen->shminfo.shmid, IPC_RMID, 0);
-	}
-      else
-	{
-	  free(host_screen->ximg->data);
-	  host_screen->ximg->data = NULL;
-
-	  XDestroyImage(host_screen->ximg);
-	}
+    EPHYR_DBG("host_screen=%p wxh=%dx%d, buffer_height=%d",
+              host_screen, width, height, buffer_height);
+
+    if (host_screen->ximg != NULL) {
+        /* Free up the image data if previously used
+         * i.ie called by server reset
+         */
+
+        if (HostX.have_shm) {
+            XShmDetach(HostX.dpy, &host_screen->shminfo);
+            XDestroyImage(host_screen->ximg);
+            shmdt(host_screen->shminfo.shmaddr);
+            shmctl(host_screen->shminfo.shmid, IPC_RMID, 0);
+        }
+        else {
+            free(host_screen->ximg->data);
+            host_screen->ximg->data = NULL;
+
+            XDestroyImage(host_screen->ximg);
+        }
     }
 
-  if (HostX.have_shm)
-    {
-      host_screen->ximg = XShmCreateImage (HostX.dpy, HostX.visual, HostX.depth,
-                                           ZPixmap, NULL, &host_screen->shminfo,
-                                           width, buffer_height );
-
-      host_screen->shminfo.shmid =
-                      shmget(IPC_PRIVATE,
-                             host_screen->ximg->bytes_per_line * buffer_height,
-                             IPC_CREAT|0777);
-      host_screen->ximg->data = shmat(host_screen->shminfo.shmid, 0, 0);
-      host_screen->shminfo.shmaddr = host_screen->ximg->data;
-
-      if (host_screen->ximg->data == (char *)-1)
-	{
-	  EPHYR_DBG("Can't attach SHM Segment, falling back to plain XImages");
-	  HostX.have_shm = False;
-	  XDestroyImage(host_screen->ximg);
-	  shmctl(host_screen->shminfo.shmid, IPC_RMID, 0);
-	}
-      else
-	{
-	  EPHYR_DBG("SHM segment attached %p", host_screen->shminfo.shmaddr);
-	  host_screen->shminfo.readOnly = False;
-	  XShmAttach(HostX.dpy, &host_screen->shminfo);
-	  shm_success = True;
-	}
+    if (HostX.have_shm) {
+        host_screen->ximg =
+            XShmCreateImage(HostX.dpy, HostX.visual, HostX.depth, ZPixmap, NULL,
+                            &host_screen->shminfo, width, buffer_height);
+
+        host_screen->shminfo.shmid =
+            shmget(IPC_PRIVATE,
+                   host_screen->ximg->bytes_per_line * buffer_height,
+                   IPC_CREAT | 0777);
+        host_screen->ximg->data = shmat(host_screen->shminfo.shmid, 0, 0);
+        host_screen->shminfo.shmaddr = host_screen->ximg->data;
+
+        if (host_screen->ximg->data == (char *) -1) {
+            EPHYR_DBG
+                ("Can't attach SHM Segment, falling back to plain XImages");
+            HostX.have_shm = False;
+            XDestroyImage(host_screen->ximg);
+            shmctl(host_screen->shminfo.shmid, IPC_RMID, 0);
+        }
+        else {
+            EPHYR_DBG("SHM segment attached %p", host_screen->shminfo.shmaddr);
+            host_screen->shminfo.readOnly = False;
+            XShmAttach(HostX.dpy, &host_screen->shminfo);
+            shm_success = True;
+        }
     }
 
-  if (!shm_success)
-    {
-      bitmap_pad = ( HostX.depth > 16 )? 32 : (( HostX.depth > 8 )? 16 : 8 );
-
-      EPHYR_DBG("Creating image %dx%d for screen host_screen=%p\n",
-                width, buffer_height, host_screen );
-      host_screen->ximg = XCreateImage (HostX.dpy,
-                                        HostX.visual,
-                                        HostX.depth,
-                                        ZPixmap, 0, 0,
-                                        width,
-                                        buffer_height,
-                                        bitmap_pad,
-                                        0);
-
-      host_screen->ximg->data =
-              malloc (host_screen->ximg->bytes_per_line * buffer_height);
+    if (!shm_success) {
+        bitmap_pad = (HostX.depth > 16) ? 32 : ((HostX.depth > 8) ? 16 : 8);
+
+        EPHYR_DBG("Creating image %dx%d for screen host_screen=%p\n",
+                  width, buffer_height, host_screen);
+        host_screen->ximg = XCreateImage(HostX.dpy,
+                                         HostX.visual,
+                                         HostX.depth,
+                                         ZPixmap, 0, 0,
+                                         width, buffer_height, bitmap_pad, 0);
+
+        host_screen->ximg->data =
+            malloc(host_screen->ximg->bytes_per_line * buffer_height);
     }
 
-  XResizeWindow (HostX.dpy, host_screen->win, width, height);
+    XResizeWindow(HostX.dpy, host_screen->win, width, height);
 
-  /* Ask the WM to keep our size static */
-  size_hints = XAllocSizeHints();
-  size_hints->max_width = size_hints->min_width = width;
-  size_hints->max_height = size_hints->min_height = height;
-  size_hints->flags = PMinSize|PMaxSize;
-  XSetWMNormalHints(HostX.dpy, host_screen->win, size_hints);
-  XFree(size_hints);
+    /* Ask the WM to keep our size static */
+    size_hints = XAllocSizeHints();
+    size_hints->max_width = size_hints->min_width = width;
+    size_hints->max_height = size_hints->min_height = height;
+    size_hints->flags = PMinSize | PMaxSize;
+    XSetWMNormalHints(HostX.dpy, host_screen->win, size_hints);
+    XFree(size_hints);
 
-  XMapWindow(HostX.dpy, host_screen->win);
+    XMapWindow(HostX.dpy, host_screen->win);
 
-  XSync(HostX.dpy, False);
+    XSync(HostX.dpy, False);
 
-  host_screen->win_width  = width;
-  host_screen->win_height = height;
+    host_screen->win_width = width;
+    host_screen->win_height = height;
 
-  if (host_depth_matches_server(host_screen))
-    {
-      EPHYR_DBG("Host matches server");
-      return host_screen->ximg->data;
+    if (host_depth_matches_server(host_screen)) {
+        EPHYR_DBG("Host matches server");
+        return host_screen->ximg->data;
     }
-  else
-    {
-      EPHYR_DBG("server bpp %i", host_screen->server_depth>>3);
-      host_screen->fb_data = malloc(width*buffer_height*(host_screen->server_depth>>3));
-      return host_screen->fb_data;
+    else {
+        EPHYR_DBG("server bpp %i", host_screen->server_depth >> 3);
+        host_screen->fb_data =
+            malloc(width * buffer_height * (host_screen->server_depth >> 3));
+        return host_screen->fb_data;
     }
 }
 
-static void hostx_paint_debug_rect (struct EphyrHostScreen *host_screen,
-                                    int x,     int y,
-                                    int width, int height);
+static void hostx_paint_debug_rect(struct EphyrHostScreen *host_screen,
+                                   int x, int y, int width, int height);
 
 void
-hostx_paint_rect (EphyrScreenInfo screen,
-                  int sx,    int sy,
-                  int dx,    int dy,
-                  int width, int height)
+hostx_paint_rect(EphyrScreenInfo screen,
+                 int sx, int sy, int dx, int dy, int width, int height)
 {
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
+    struct EphyrHostScreen *host_screen = host_screen_from_screen_info(screen);
 
-  EPHYR_DBG ("painting in screen %d\n", host_screen->mynum) ;
+    EPHYR_DBG("painting in screen %d\n", host_screen->mynum);
 
-  /*
-   *  Copy the image data updated by the shadow layer
-   *  on to the window
-   */
+    /*
+     *  Copy the image data updated by the shadow layer
+     *  on to the window
+     */
 
-  if (HostXWantDamageDebug)
-    {
-      hostx_paint_debug_rect(host_screen, dx, dy, width, height);
+    if (HostXWantDamageDebug) {
+        hostx_paint_debug_rect(host_screen, dx, dy, width, height);
     }
 
-  /* 
-   * If the depth of the ephyr server is less than that of the host,
-   * the kdrive fb does not point to the ximage data but to a buffer
-   * ( fb_data ), we shift the various bits from this onto the XImage
-   * so they match the host.
-   *
-   * Note, This code is pretty new ( and simple ) so may break on 
-   *       endian issues, 32 bpp host etc. 
-   *       Not sure if 8bpp case is right either. 
-   *       ... and it will be slower than the matching depth case.
-   */
-
-  if (!host_depth_matches_server(host_screen))
-    {
-      int            x,y,idx, bytes_per_pixel = (host_screen->server_depth>>3);
-      unsigned char  r,g,b;
-      unsigned long  host_pixel;
-
-      EPHYR_DBG("Unmatched host depth host_screen=%p\n", host_screen);
-      for (y=sy; y<sy+height; y++)
-	for (x=sx; x<sx+width; x++)
-	  {
-	    idx = (host_screen->win_width*y*bytes_per_pixel)+(x*bytes_per_pixel);
-
-	    switch (host_screen->server_depth)
-	      {
-	      case 16:
-		{
-		  unsigned short pixel = *(unsigned short*)(host_screen->fb_data+idx);
-
-		  r = ((pixel & 0xf800) >> 8);
-		  g = ((pixel & 0x07e0) >> 3);
-		  b = ((pixel & 0x001f) << 3);
-
-		  host_pixel = (r << 16) | (g << 8) | (b);
-		  
-		  XPutPixel(host_screen->ximg, x, y, host_pixel);
-		  break;
-		}
-	      case 8:
-		{
-		  unsigned char pixel = *(unsigned char*)(host_screen->fb_data+idx);
-		  XPutPixel(host_screen->ximg, x, y, HostX.cmap[pixel]);
-		  break;
-		}
-	      default:
-		break;
-	      }
-	  }
+    /* 
+     * If the depth of the ephyr server is less than that of the host,
+     * the kdrive fb does not point to the ximage data but to a buffer
+     * ( fb_data ), we shift the various bits from this onto the XImage
+     * so they match the host.
+     *
+     * Note, This code is pretty new ( and simple ) so may break on 
+     *       endian issues, 32 bpp host etc. 
+     *       Not sure if 8bpp case is right either. 
+     *       ... and it will be slower than the matching depth case.
+     */
+
+    if (!host_depth_matches_server(host_screen)) {
+        int x, y, idx, bytes_per_pixel = (host_screen->server_depth >> 3);
+        unsigned char r, g, b;
+        unsigned long host_pixel;
+
+        EPHYR_DBG("Unmatched host depth host_screen=%p\n", host_screen);
+        for (y = sy; y < sy + height; y++)
+            for (x = sx; x < sx + width; x++) {
+                idx =
+                    (host_screen->win_width * y * bytes_per_pixel) +
+                    (x * bytes_per_pixel);
+
+                switch (host_screen->server_depth) {
+                case 16:
+                {
+                    unsigned short pixel =
+                        *(unsigned short *) (host_screen->fb_data + idx);
+
+                    r = ((pixel & 0xf800) >> 8);
+                    g = ((pixel & 0x07e0) >> 3);
+                    b = ((pixel & 0x001f) << 3);
+
+                    host_pixel = (r << 16) | (g << 8) | (b);
+
+                    XPutPixel(host_screen->ximg, x, y, host_pixel);
+                    break;
+                }
+                case 8:
+                {
+                    unsigned char pixel =
+                        *(unsigned char *) (host_screen->fb_data + idx);
+                    XPutPixel(host_screen->ximg, x, y, HostX.cmap[pixel]);
+                    break;
+                }
+                default:
+                    break;
+                }
+            }
     }
 
-  if (HostX.have_shm)
-    {
-      XShmPutImage (HostX.dpy, host_screen->win,
-                    HostX.gc, host_screen->ximg,
-                    sx, sy, dx, dy, width, height, False);
+    if (HostX.have_shm) {
+        XShmPutImage(HostX.dpy, host_screen->win,
+                     HostX.gc, host_screen->ximg,
+                     sx, sy, dx, dy, width, height, False);
     }
-  else
-    {
-      XPutImage (HostX.dpy, host_screen->win, HostX.gc, host_screen->ximg, 
-                 sx, sy, dx, dy, width, height);
+    else {
+        XPutImage(HostX.dpy, host_screen->win, HostX.gc, host_screen->ximg,
+                  sx, sy, dx, dy, width, height);
     }
 
-  XSync (HostX.dpy, False);
+    XSync(HostX.dpy, False);
 }
 
 static void
-hostx_paint_debug_rect (struct EphyrHostScreen *host_screen,
-                        int x,     int y,
-                        int width, int height)
+hostx_paint_debug_rect(struct EphyrHostScreen *host_screen,
+                       int x, int y, int width, int height)
 {
-  struct timespec tspec;
+    struct timespec tspec;
 
-  tspec.tv_sec  = HostX.damage_debug_msec / (1000000);
-  tspec.tv_nsec = (HostX.damage_debug_msec % 1000000) * 1000;
+    tspec.tv_sec = HostX.damage_debug_msec / (1000000);
+    tspec.tv_nsec = (HostX.damage_debug_msec % 1000000) * 1000;
 
-  EPHYR_DBG("msec: %li tv_sec %li, tv_msec %li", 
-	    HostX.damage_debug_msec, tspec.tv_sec, tspec.tv_nsec);
+    EPHYR_DBG("msec: %li tv_sec %li, tv_msec %li",
+              HostX.damage_debug_msec, tspec.tv_sec, tspec.tv_nsec);
 
-  /* fprintf(stderr, "Xephyr updating: %i+%i %ix%i\n", x, y, width, height); */
+    /* fprintf(stderr, "Xephyr updating: %i+%i %ix%i\n", x, y, width, height); */
 
-  XFillRectangle (HostX.dpy, host_screen->win, HostX.gc, x, y, width,height);
-  XSync (HostX.dpy, False);
+    XFillRectangle(HostX.dpy, host_screen->win, HostX.gc, x, y, width, height);
+    XSync(HostX.dpy, False);
 
-  /* nanosleep seems to work better than usleep for me... */
-  nanosleep(&tspec, NULL);
+    /* nanosleep seems to work better than usleep for me... */
+    nanosleep(&tspec, NULL);
 }
 
 void
 hostx_load_keymap(void)
 {
-  XID             *keymap;
-  int              host_width, min_keycode, max_keycode, width;
-  int              i,j;
-
-  XDisplayKeycodes (HostX.dpy, &min_keycode, &max_keycode);
-
-  EPHYR_DBG ("min: %d, max: %d", min_keycode, max_keycode);
-
-  keymap = XGetKeyboardMapping (HostX.dpy,
-			        min_keycode,
-			        max_keycode - min_keycode + 1,
-			        &host_width);
-
-  /* Try and copy the hosts keymap into our keymap to avoid loads
-   * of messing around.
-   *
-   * kdrive cannot can have more than 4 keysyms per keycode
-   * so we only copy at most the first 4 ( xorg has 6 per keycode, XVNC 2 )
-   */
-  width = (host_width > 4) ? 4 : host_width;
-
-  ephyrKeySyms.map = (CARD32 *)calloc(sizeof(CARD32),
-                                      (max_keycode - min_keycode + 1) *
-                                      width);
-  if (!ephyrKeySyms.map)
+    XID *keymap;
+    int host_width, min_keycode, max_keycode, width;
+    int i, j;
+
+    XDisplayKeycodes(HostX.dpy, &min_keycode, &max_keycode);
+
+    EPHYR_DBG("min: %d, max: %d", min_keycode, max_keycode);
+
+    keymap = XGetKeyboardMapping(HostX.dpy,
+                                 min_keycode,
+                                 max_keycode - min_keycode + 1, &host_width);
+
+    /* Try and copy the hosts keymap into our keymap to avoid loads
+     * of messing around.
+     *
+     * kdrive cannot can have more than 4 keysyms per keycode
+     * so we only copy at most the first 4 ( xorg has 6 per keycode, XVNC 2 )
+     */
+    width = (host_width > 4) ? 4 : host_width;
+
+    ephyrKeySyms.map = (CARD32 *) calloc(sizeof(CARD32),
+                                         (max_keycode - min_keycode + 1) *
+                                         width);
+    if (!ephyrKeySyms.map)
         return;
 
-  for (i=0; i<(max_keycode - min_keycode+1); i++)
-    for (j=0; j<width; j++)
-      ephyrKeySyms.map[(i*width)+j] = (CARD32) keymap[(i*host_width) + j];
+    for (i = 0; i < (max_keycode - min_keycode + 1); i++)
+        for (j = 0; j < width; j++)
+            ephyrKeySyms.map[(i * width) + j] =
+                (CARD32) keymap[(i * host_width) + j];
 
-  EPHYR_DBG("keymap width, host:%d kdrive:%d", host_width, width);
+    EPHYR_DBG("keymap width, host:%d kdrive:%d", host_width, width);
 
-  ephyrKeySyms.minKeyCode  = min_keycode;
-  ephyrKeySyms.maxKeyCode  = max_keycode;
-  ephyrKeySyms.mapWidth    = width;
+    ephyrKeySyms.minKeyCode = min_keycode;
+    ephyrKeySyms.maxKeyCode = max_keycode;
+    ephyrKeySyms.mapWidth = width;
 
-  XFree(keymap);
+    XFree(keymap);
 }
 
 static struct EphyrHostScreen *
-host_screen_from_window (Window w)
+host_screen_from_window(Window w)
 {
-  int index = 0;
-  struct EphyrHostScreen *result  = NULL;
+    int index = 0;
+    struct EphyrHostScreen *result = NULL;
 
-  for (index = 0 ; index < HostX.n_screens ; index++)
-    {
-      if (HostX.screens[index].win == w || HostX.screens[index].peer_win == w)
-        {
-          result = &HostX.screens[index];
-          goto out;
+    for (index = 0; index < HostX.n_screens; index++) {
+        if (HostX.screens[index].win == w || HostX.screens[index].peer_win == w) {
+            result = &HostX.screens[index];
+            goto out;
         }
     }
 
-out:
-  return result;
+ out:
+    return result;
 }
 
 int
-hostx_get_event(EphyrHostXEvent *ev)
+hostx_get_event(EphyrHostXEvent * ev)
 {
-  XEvent      xev;
-  static int  grabbed_screen = -1;
-
-  if (XPending(HostX.dpy))
-    {
-      XNextEvent(HostX.dpy, &xev);
-
-      switch (xev.type) 
-	{
-	case Expose:
-	  /* Not so great event compression, but works ok */
-	  while (XCheckTypedWindowEvent(HostX.dpy, xev.xexpose.window,
-					Expose, &xev));
-	  {
-	    struct EphyrHostScreen *host_screen =
-                host_screen_from_window (xev.xexpose.window);
-            if (host_screen)
-              {
-                hostx_paint_rect (host_screen->info, 0, 0, 0, 0,
-                                  host_screen->win_width,
-                                  host_screen->win_height);
-              }
-            else
-              {
-                EPHYR_LOG_ERROR ("failed to get host screen\n");
-                ev->type = EPHYR_EV_EXPOSE;
-                ev->data.expose.window = xev.xexpose.window;
-                return 1;
-              }
-	  }
-	  return 0;
-
-	case MotionNotify:
-	  {
-	    struct EphyrHostScreen *host_screen =
-                host_screen_from_window (xev.xmotion.window);
-
-	    ev->type = EPHYR_EV_MOUSE_MOTION;
-	    ev->data.mouse_motion.x = xev.xmotion.x;
-	    ev->data.mouse_motion.y = xev.xmotion.y;
-	    ev->data.mouse_motion.window = xev.xmotion.window;
-	    ev->data.mouse_motion.screen = (host_screen ? host_screen->mynum : -1);
-	  }
-	  return 1;
-
-	case ButtonPress:
-	  ev->type = EPHYR_EV_MOUSE_PRESS;
-	  ev->key_state = xev.xkey.state;
-	  /* 
-	   * This is a bit hacky. will break for button 5 ( defined as 0x10 )
-           * Check KD_BUTTON defines in kdrive.h 
-	   */
-	  ev->data.mouse_down.button_num = 1<<(xev.xbutton.button-1);
-	  return 1;
-
-	case ButtonRelease:
-	  ev->type = EPHYR_EV_MOUSE_RELEASE;
-	  ev->key_state = xev.xkey.state;
-	  ev->data.mouse_up.button_num = 1<<(xev.xbutton.button-1);
-	  return 1;
-
-	case KeyPress:
-	  {
-	    ev->type = EPHYR_EV_KEY_PRESS;
-	    ev->key_state = xev.xkey.state;
-	    ev->data.key_down.scancode = xev.xkey.keycode;  
-	    return 1;
-	  }
-	case KeyRelease:
-
-	  if ((XKeycodeToKeysym(HostX.dpy,xev.xkey.keycode,0) == XK_Shift_L
-	       || XKeycodeToKeysym(HostX.dpy,xev.xkey.keycode,0) == XK_Shift_R)
-	      && (xev.xkey.state & ControlMask))
-	    {
-	      struct EphyrHostScreen *host_screen =
-                  host_screen_from_window (xev.xexpose.window);
-
-	      if (grabbed_screen != -1)
-		{
-		  XUngrabKeyboard (HostX.dpy, CurrentTime);
-		  XUngrabPointer (HostX.dpy, CurrentTime);
-		  grabbed_screen = -1;
-		  hostx_set_win_title (host_screen->info,
-                                       "(ctrl+shift grabs mouse and keyboard)");
-		}
-	      else
-		{
-		  /* Attempt grab */
-		  if (XGrabKeyboard (HostX.dpy, host_screen->win, True, 
-				     GrabModeAsync, 
-				     GrabModeAsync, 
-				     CurrentTime) == 0)
-		    {
-		      if (XGrabPointer (HostX.dpy, host_screen->win, True, 
-					NoEventMask, 
-					GrabModeAsync, 
-					GrabModeAsync, 
-					host_screen->win, None, CurrentTime) == 0)
-			{
-			  grabbed_screen = host_screen->mynum;
-			  hostx_set_win_title
-                                  (host_screen->info,
-                                   "(ctrl+shift releases mouse and keyboard)");
-			}
-		      else 	/* Failed pointer grabm  ungrab keyboard */
-			XUngrabKeyboard (HostX.dpy, CurrentTime);
-		    }
-		}
-	    }
-
-	  /* Still send the release event even if above has happened
-           * server will get confused with just an up event. 
-           * Maybe it would be better to just block shift+ctrls getting to
-           * kdrive all togeather. 
- 	   */
-	  ev->type = EPHYR_EV_KEY_RELEASE;
-	  ev->key_state = xev.xkey.state;
-	  ev->data.key_up.scancode = xev.xkey.keycode;
-	  return 1;
-
-	default:
-	  break;
-
-	}
+    XEvent xev;
+    static int grabbed_screen = -1;
+
+    if (XPending(HostX.dpy)) {
+        XNextEvent(HostX.dpy, &xev);
+
+        switch (xev.type) {
+        case Expose:
+            /* Not so great event compression, but works ok */
+            while (XCheckTypedWindowEvent(HostX.dpy, xev.xexpose.window,
+                                          Expose, &xev));
+            {
+                struct EphyrHostScreen *host_screen =
+                    host_screen_from_window(xev.xexpose.window);
+                if (host_screen) {
+                    hostx_paint_rect(host_screen->info, 0, 0, 0, 0,
+                                     host_screen->win_width,
+                                     host_screen->win_height);
+                }
+                else {
+                    EPHYR_LOG_ERROR("failed to get host screen\n");
+                    ev->type = EPHYR_EV_EXPOSE;
+                    ev->data.expose.window = xev.xexpose.window;
+                    return 1;
+                }
+            }
+            return 0;
+
+        case MotionNotify:
+        {
+            struct EphyrHostScreen *host_screen =
+                host_screen_from_window(xev.xmotion.window);
+
+            ev->type = EPHYR_EV_MOUSE_MOTION;
+            ev->data.mouse_motion.x = xev.xmotion.x;
+            ev->data.mouse_motion.y = xev.xmotion.y;
+            ev->data.mouse_motion.window = xev.xmotion.window;
+            ev->data.mouse_motion.screen =
+                (host_screen ? host_screen->mynum : -1);
+        }
+            return 1;
+
+        case ButtonPress:
+            ev->type = EPHYR_EV_MOUSE_PRESS;
+            ev->key_state = xev.xkey.state;
+            /* 
+             * This is a bit hacky. will break for button 5 ( defined as 0x10 )
+             * Check KD_BUTTON defines in kdrive.h 
+             */
+            ev->data.mouse_down.button_num = 1 << (xev.xbutton.button - 1);
+            return 1;
+
+        case ButtonRelease:
+            ev->type = EPHYR_EV_MOUSE_RELEASE;
+            ev->key_state = xev.xkey.state;
+            ev->data.mouse_up.button_num = 1 << (xev.xbutton.button - 1);
+            return 1;
+
+        case KeyPress:
+        {
+            ev->type = EPHYR_EV_KEY_PRESS;
+            ev->key_state = xev.xkey.state;
+            ev->data.key_down.scancode = xev.xkey.keycode;
+            return 1;
+        }
+        case KeyRelease:
+
+            if ((XKeycodeToKeysym(HostX.dpy, xev.xkey.keycode, 0) == XK_Shift_L
+                 || XKeycodeToKeysym(HostX.dpy, xev.xkey.keycode,
+                                     0) == XK_Shift_R)
+                && (xev.xkey.state & ControlMask)) {
+                struct EphyrHostScreen *host_screen =
+                    host_screen_from_window(xev.xexpose.window);
+
+                if (grabbed_screen != -1) {
+                    XUngrabKeyboard(HostX.dpy, CurrentTime);
+                    XUngrabPointer(HostX.dpy, CurrentTime);
+                    grabbed_screen = -1;
+                    hostx_set_win_title(host_screen->info,
+                                        "(ctrl+shift grabs mouse and keyboard)");
+                }
+                else {
+                    /* Attempt grab */
+                    if (XGrabKeyboard(HostX.dpy, host_screen->win, True,
+                                      GrabModeAsync,
+                                      GrabModeAsync, CurrentTime) == 0) {
+                        if (XGrabPointer(HostX.dpy, host_screen->win, True,
+                                         NoEventMask,
+                                         GrabModeAsync,
+                                         GrabModeAsync,
+                                         host_screen->win, None,
+                                         CurrentTime) == 0) {
+                            grabbed_screen = host_screen->mynum;
+                            hostx_set_win_title
+                                (host_screen->info,
+                                 "(ctrl+shift releases mouse and keyboard)");
+                        }
+                        else    /* Failed pointer grabm  ungrab keyboard */
+                            XUngrabKeyboard(HostX.dpy, CurrentTime);
+                    }
+                }
+            }
+
+            /* Still send the release event even if above has happened
+             * server will get confused with just an up event. 
+             * Maybe it would be better to just block shift+ctrls getting to
+             * kdrive all togeather. 
+             */
+            ev->type = EPHYR_EV_KEY_RELEASE;
+            ev->key_state = xev.xkey.state;
+            ev->data.key_up.scancode = xev.xkey.keycode;
+            return 1;
+
+        default:
+            break;
+
+        }
     }
-  return 0;
+    return 0;
 }
 
-void*
+void *
 hostx_get_display(void)
 {
-    return HostX.dpy ;
+    return HostX.dpy;
 }
 
 int
-hostx_get_window (int a_screen_number)
+hostx_get_window(int a_screen_number)
 {
     if (a_screen_number < 0 || a_screen_number >= HostX.n_screens) {
-        EPHYR_LOG_ERROR ("bad screen number:%d\n", a_screen_number) ;
+        EPHYR_LOG_ERROR("bad screen number:%d\n", a_screen_number);
         return 0;
     }
-    return HostX.screens[a_screen_number].win ;
+    return HostX.screens[a_screen_number].win;
 }
 
 int
-hostx_get_window_attributes (int a_window, EphyrHostWindowAttributes *a_attrs)
+hostx_get_window_attributes(int a_window, EphyrHostWindowAttributes * a_attrs)
 {
-    XWindowAttributes attrs ;
+    XWindowAttributes attrs;
 
-    memset (&attrs, 0, sizeof (attrs)) ;
+    memset(&attrs, 0, sizeof(attrs));
 
-    if (!XGetWindowAttributes (hostx_get_display (),
-                               a_window,
-                               &attrs)) {
-        return FALSE ;
+    if (!XGetWindowAttributes(hostx_get_display(), a_window, &attrs)) {
+        return FALSE;
     }
-    a_attrs->x = attrs.x ;
-    a_attrs->y = attrs.y ;
-    a_attrs->width = attrs.width ;
-    a_attrs->height = attrs.height ;
+    a_attrs->x = attrs.x;
+    a_attrs->y = attrs.y;
+    a_attrs->width = attrs.width;
+    a_attrs->height = attrs.height;
     if (attrs.visual)
-        a_attrs->visualid = attrs.visual->visualid ;
-    return TRUE ;
+        a_attrs->visualid = attrs.visual->visualid;
+    return TRUE;
 }
 
 int
-hostx_get_extension_info (const char *a_ext_name,
-                          int *a_major_opcode,
-                          int *a_first_event,
-                          int *a_first_error)
+hostx_get_extension_info(const char *a_ext_name,
+                         int *a_major_opcode,
+                         int *a_first_event, int *a_first_error)
 {
     if (!a_ext_name || !a_major_opcode || !a_first_event || !a_first_error)
-      return 0 ;
-   if (!XQueryExtension (HostX.dpy,
+        return 0;
+    if (!XQueryExtension(HostX.dpy,
                          a_ext_name,
-                         a_major_opcode,
-                         a_first_event,
-                         a_first_error))
-     {
-       return 0 ;
-     }
-   return 1 ;
+                         a_major_opcode, a_first_event, a_first_error)) {
+        return 0;
+    }
+    return 1;
 }
 
 int
-hostx_get_visuals_info (EphyrHostVisualInfo **a_visuals,
-                        int *a_num_entries)
+hostx_get_visuals_info(EphyrHostVisualInfo ** a_visuals, int *a_num_entries)
 {
-    Display *dpy=hostx_get_display () ;
-    Bool is_ok=False ;
-    XVisualInfo templ, *visuals=NULL;
-    EphyrHostVisualInfo *host_visuals=NULL ;
-    int nb_items=0, i=0;
-
-    EPHYR_RETURN_VAL_IF_FAIL (a_visuals && a_num_entries && dpy,
-                              False) ;
-    EPHYR_LOG ("enter\n") ;
-    memset (&templ, 0, sizeof (templ)) ;
-    visuals = XGetVisualInfo (dpy, VisualNoMask, &templ, &nb_items) ;
+    Display *dpy = hostx_get_display();
+    Bool is_ok = False;
+    XVisualInfo templ, *visuals = NULL;
+    EphyrHostVisualInfo *host_visuals = NULL;
+    int nb_items = 0, i = 0;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_visuals && a_num_entries && dpy, False);
+    EPHYR_LOG("enter\n");
+    memset(&templ, 0, sizeof(templ));
+    visuals = XGetVisualInfo(dpy, VisualNoMask, &templ, &nb_items);
     if (!visuals) {
-        EPHYR_LOG_ERROR ("host does not advertise any visual\n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("host does not advertise any visual\n");
+        goto out;
     }
-    EPHYR_LOG ("host advertises %d visuals\n", nb_items) ;
-    host_visuals = calloc (nb_items, sizeof (EphyrHostVisualInfo)) ;
-    for (i=0; i<nb_items; i++) {
-        host_visuals[i].visualid = visuals[i].visualid ;
-        host_visuals[i].screen = visuals[i].screen ;
-        host_visuals[i].depth = visuals[i].depth ;
-        host_visuals[i].class = visuals[i].class ;
-        host_visuals[i].red_mask = visuals[i].red_mask ;
-        host_visuals[i].green_mask = visuals[i].green_mask ;
-        host_visuals[i].blue_mask = visuals[i].blue_mask ;
-        host_visuals[i].colormap_size = visuals[i].colormap_size ;
-        host_visuals[i].bits_per_rgb = visuals[i].bits_per_rgb ;
+    EPHYR_LOG("host advertises %d visuals\n", nb_items);
+    host_visuals = calloc(nb_items, sizeof(EphyrHostVisualInfo));
+    for (i = 0; i < nb_items; i++) {
+        host_visuals[i].visualid = visuals[i].visualid;
+        host_visuals[i].screen = visuals[i].screen;
+        host_visuals[i].depth = visuals[i].depth;
+        host_visuals[i].class = visuals[i].class;
+        host_visuals[i].red_mask = visuals[i].red_mask;
+        host_visuals[i].green_mask = visuals[i].green_mask;
+        host_visuals[i].blue_mask = visuals[i].blue_mask;
+        host_visuals[i].colormap_size = visuals[i].colormap_size;
+        host_visuals[i].bits_per_rgb = visuals[i].bits_per_rgb;
     }
-    *a_visuals = host_visuals ;
+    *a_visuals = host_visuals;
     *a_num_entries = nb_items;
-    host_visuals=NULL;
+    host_visuals = NULL;
 
     is_ok = TRUE;
-out:
+ out:
     if (visuals) {
-        XFree (visuals) ;
+        XFree(visuals);
         visuals = NULL;
     }
     free(host_visuals);
     host_visuals = NULL;
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+    EPHYR_LOG("leave\n");
+    return is_ok;
 
 }
 
 int
-hostx_create_window (int a_screen_number,
-                     EphyrBox *a_geometry,
-                     int a_visual_id,
-                     int *a_host_peer /*out parameter*/)
+hostx_create_window(int a_screen_number,
+                    EphyrBox * a_geometry,
+                    int a_visual_id, int *a_host_peer /*out parameter */ )
 {
-    Bool is_ok=FALSE ;
-    Display *dpy=hostx_get_display () ;
-    XVisualInfo *visual_info=NULL, visual_info_templ;
-    int visual_mask=VisualIDMask ;
-    Window win=None ;
-    int nb_visuals=0, winmask=0;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
+    XVisualInfo *visual_info = NULL, visual_info_templ;
+    int visual_mask = VisualIDMask;
+    Window win = None;
+    int nb_visuals = 0, winmask = 0;
     XSetWindowAttributes attrs;
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_geometry, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy && a_geometry, FALSE);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
 
-     /*get visual*/
-    memset (&visual_info, 0, sizeof (visual_info)) ;
-    visual_info_templ.visualid = a_visual_id ;
-    visual_info = XGetVisualInfo (dpy, visual_mask,
-                                  &visual_info_templ,
-                                  &nb_visuals) ;
+    /*get visual */
+    memset(&visual_info, 0, sizeof(visual_info));
+    visual_info_templ.visualid = a_visual_id;
+    visual_info = XGetVisualInfo(dpy, visual_mask,
+                                 &visual_info_templ, &nb_visuals);
     if (!visual_info) {
-        EPHYR_LOG_ERROR ("argh, could not find a remote visual with id:%d\n",
-                         a_visual_id) ;
-        goto out ;
+        EPHYR_LOG_ERROR("argh, could not find a remote visual with id:%d\n",
+                        a_visual_id);
+        goto out;
     }
-    memset (&attrs, 0, sizeof (attrs)) ;
-    attrs.colormap = XCreateColormap (dpy,
-                                      RootWindow (dpy,
-                                                  visual_info->screen),
-                                      visual_info->visual,
-                                      AllocNone) ;
+    memset(&attrs, 0, sizeof(attrs));
+    attrs.colormap = XCreateColormap(dpy,
+                                     RootWindow(dpy,
+                                                visual_info->screen),
+                                     visual_info->visual, AllocNone);
     attrs.event_mask = ButtonPressMask
-                       |ButtonReleaseMask
-                       |PointerMotionMask
-                       |KeyPressMask
-                       |KeyReleaseMask
-                       |ExposureMask;
-    winmask = CWColormap|CWEventMask;
-
-    win = XCreateWindow (dpy, hostx_get_window (a_screen_number),
-                         a_geometry->x, a_geometry->y,
-                         a_geometry->width, a_geometry->height, 0,
-                         visual_info->depth, CopyFromParent,
-                         visual_info->visual, winmask, &attrs) ;
+        | ButtonReleaseMask
+        | PointerMotionMask | KeyPressMask | KeyReleaseMask | ExposureMask;
+    winmask = CWColormap | CWEventMask;
+
+    win = XCreateWindow(dpy, hostx_get_window(a_screen_number),
+                        a_geometry->x, a_geometry->y,
+                        a_geometry->width, a_geometry->height, 0,
+                        visual_info->depth, CopyFromParent,
+                        visual_info->visual, winmask, &attrs);
     if (win == None) {
-        EPHYR_LOG_ERROR ("failed to create peer window\n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create peer window\n");
+        goto out;
     }
     if (HostX.screens[a_screen_number].peer_win == None) {
-	HostX.screens[a_screen_number].peer_win = win;
-    } else {
-        EPHYR_LOG_ERROR ("multiple peer windows created for same screen\n") ;
+        HostX.screens[a_screen_number].peer_win = win;
+    }
+    else {
+        EPHYR_LOG_ERROR("multiple peer windows created for same screen\n");
     }
-    XFlush (dpy) ;
-    XMapWindow (dpy, win) ;
-    *a_host_peer = win ;
-    is_ok = TRUE ;
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+    XFlush(dpy);
+    XMapWindow(dpy, win);
+    *a_host_peer = win;
+    is_ok = TRUE;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 int
-hostx_destroy_window (int a_win)
+hostx_destroy_window(int a_win)
 {
-    Display *dpy=hostx_get_display () ;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
-    XDestroyWindow (dpy, a_win) ;
-    XFlush (dpy) ;
-    return TRUE ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
+    XDestroyWindow(dpy, a_win);
+    XFlush(dpy);
+    return TRUE;
 }
 
 int
-hostx_set_window_geometry (int a_win, EphyrBox *a_geo)
+hostx_set_window_geometry(int a_win, EphyrBox * a_geo)
 {
-    Display *dpy=hostx_get_display ();
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_geo, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy && a_geo, FALSE);
 
-    EPHYR_LOG ("enter. x,y,w,h:(%d,%d,%d,%d)\n",
-               a_geo->x, a_geo->y,
-               a_geo->width, a_geo->height) ;
+    EPHYR_LOG("enter. x,y,w,h:(%d,%d,%d,%d)\n",
+              a_geo->x, a_geo->y, a_geo->width, a_geo->height);
 
-    XMoveWindow (dpy, a_win, a_geo->x, a_geo->y) ;
-    XResizeWindow (dpy, a_win, a_geo->width, a_geo->height) ;
-    EPHYR_LOG ("leave\n") ;
+    XMoveWindow(dpy, a_win, a_geo->x, a_geo->y);
+    XResizeWindow(dpy, a_win, a_geo->width, a_geo->height);
+    EPHYR_LOG("leave\n");
     return TRUE;
 }
 
 int
-hostx_set_window_bounding_rectangles (int a_window,
-                                      EphyrRect *a_rects,
-                                      int a_num_rects)
+hostx_set_window_bounding_rectangles(int a_window,
+                                     EphyrRect * a_rects, int a_num_rects)
 {
-    Bool is_ok=FALSE;
-    Display *dpy=hostx_get_display () ;
-    int i=0 ;
-    XRectangle *rects=NULL ;
-
-    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_rects, FALSE) ;
-
-    EPHYR_LOG ("enter. num rects:%d\n", a_num_rects) ;
-
-    rects = calloc (a_num_rects, sizeof (XRectangle)) ;
-    for (i=0; i<a_num_rects; i++) {
-        rects[i].x = a_rects[i].x1 ;
-        rects[i].y = a_rects[i].y1 ;
-        rects[i].width = abs (a_rects[i].x2 - a_rects[i].x1);
-        rects[i].height = abs (a_rects[i].y2 - a_rects[i].y1) ;
-        EPHYR_LOG ("borders clipped to rect[x:%d,y:%d,w:%d,h:%d]\n",
-                   rects[i].x, rects[i].y,
-                   rects[i].width, rects[i].height) ;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
+    int i = 0;
+    XRectangle *rects = NULL;
+
+    EPHYR_RETURN_VAL_IF_FAIL(dpy && a_rects, FALSE);
+
+    EPHYR_LOG("enter. num rects:%d\n", a_num_rects);
+
+    rects = calloc(a_num_rects, sizeof(XRectangle));
+    for (i = 0; i < a_num_rects; i++) {
+        rects[i].x = a_rects[i].x1;
+        rects[i].y = a_rects[i].y1;
+        rects[i].width = abs(a_rects[i].x2 - a_rects[i].x1);
+        rects[i].height = abs(a_rects[i].y2 - a_rects[i].y1);
+        EPHYR_LOG("borders clipped to rect[x:%d,y:%d,w:%d,h:%d]\n",
+                  rects[i].x, rects[i].y, rects[i].width, rects[i].height);
     }
-    /*this aways returns 1*/
-    XShapeCombineRectangles (dpy, a_window, ShapeBounding, 0, 0,
-                             rects, a_num_rects, ShapeSet, YXBanded) ;
-    is_ok = TRUE ;
+    /*this aways returns 1 */
+    XShapeCombineRectangles(dpy, a_window, ShapeBounding, 0, 0,
+                            rects, a_num_rects, ShapeSet, YXBanded);
+    is_ok = TRUE;
 
     free(rects);
     rects = NULL;
-    EPHYR_LOG ("leave\n") ;
+    EPHYR_LOG("leave\n");
     return is_ok;
 }
 
 int
-hostx_set_window_clipping_rectangles (int a_window,
-                                      EphyrRect *a_rects,
-                                      int a_num_rects)
+hostx_set_window_clipping_rectangles(int a_window,
+                                     EphyrRect * a_rects, int a_num_rects)
 {
-    Bool is_ok=FALSE;
-    Display *dpy=hostx_get_display () ;
-    int i=0 ;
-    XRectangle *rects=NULL ;
-
-    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_rects, FALSE) ;
-
-    EPHYR_LOG ("enter. num rects:%d\n", a_num_rects) ;
-
-    rects = calloc (a_num_rects, sizeof (XRectangle)) ;
-    for (i=0; i<a_num_rects; i++) {
-        rects[i].x = a_rects[i].x1 ;
-        rects[i].y = a_rects[i].y1 ;
-        rects[i].width = abs (a_rects[i].x2 - a_rects[i].x1);
-        rects[i].height = abs (a_rects[i].y2 - a_rects[i].y1) ;
-        EPHYR_LOG ("clipped to rect[x:%d,y:%d,w:%d,h:%d]\n",
-                   rects[i].x, rects[i].y,
-                   rects[i].width, rects[i].height) ;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
+    int i = 0;
+    XRectangle *rects = NULL;
+
+    EPHYR_RETURN_VAL_IF_FAIL(dpy && a_rects, FALSE);
+
+    EPHYR_LOG("enter. num rects:%d\n", a_num_rects);
+
+    rects = calloc(a_num_rects, sizeof(XRectangle));
+    for (i = 0; i < a_num_rects; i++) {
+        rects[i].x = a_rects[i].x1;
+        rects[i].y = a_rects[i].y1;
+        rects[i].width = abs(a_rects[i].x2 - a_rects[i].x1);
+        rects[i].height = abs(a_rects[i].y2 - a_rects[i].y1);
+        EPHYR_LOG("clipped to rect[x:%d,y:%d,w:%d,h:%d]\n",
+                  rects[i].x, rects[i].y, rects[i].width, rects[i].height);
     }
-    /*this aways returns 1*/
-    XShapeCombineRectangles (dpy, a_window, ShapeClip, 0, 0,
-                             rects, a_num_rects, ShapeSet, YXBanded) ;
-    is_ok = TRUE ;
+    /*this aways returns 1 */
+    XShapeCombineRectangles(dpy, a_window, ShapeClip, 0, 0,
+                            rects, a_num_rects, ShapeSet, YXBanded);
+    is_ok = TRUE;
 
     free(rects);
     rects = NULL;
-    EPHYR_LOG ("leave\n") ;
+    EPHYR_LOG("leave\n");
     return is_ok;
 }
 
 int
-hostx_has_xshape (void)
+hostx_has_xshape(void)
 {
-    int event_base=0, error_base=0 ;
-    Display *dpy=hostx_get_display () ;
-    if (!XShapeQueryExtension (dpy,
-                               &event_base,
-                               &error_base)) {
-        return FALSE ;
+    int event_base = 0, error_base = 0;
+    Display *dpy = hostx_get_display();
+
+    if (!XShapeQueryExtension(dpy, &event_base, &error_base)) {
+        return FALSE;
     }
     return TRUE;
 }
 
 #ifdef XF86DRI
 typedef struct {
-    int is_valid ;
-    int local_id ;
-    int remote_id ;
-} ResourcePair ;
+    int is_valid;
+    int local_id;
+    int remote_id;
+} ResourcePair;
 
 #define RESOURCE_PEERS_SIZE 1024*10
-static ResourcePair resource_peers[RESOURCE_PEERS_SIZE] ;
-
+static ResourcePair resource_peers[RESOURCE_PEERS_SIZE];
 
 int
-hostx_allocate_resource_id_peer (int a_local_resource_id,
-                                 int *a_remote_resource_id)
+hostx_allocate_resource_id_peer(int a_local_resource_id,
+                                int *a_remote_resource_id)
 {
-    int i=0 ;
-    ResourcePair *peer=NULL ;
-    Display *dpy=hostx_get_display ();
+    int i = 0;
+    ResourcePair *peer = NULL;
+    Display *dpy = hostx_get_display();
 
     /*
      * first make sure a resource peer
      * does not exist already for
      * a_local_resource_id
      */
-    for (i=0; i<RESOURCE_PEERS_SIZE; i++) {
+    for (i = 0; i < RESOURCE_PEERS_SIZE; i++) {
         if (resource_peers[i].is_valid
             && resource_peers[i].local_id == a_local_resource_id) {
-            peer = &resource_peers[i] ;
-            break ;
+            peer = &resource_peers[i];
+            break;
         }
     }
     /*
      * find one free peer entry, an feed it with
      */
     if (!peer) {
-        for (i=0; i<RESOURCE_PEERS_SIZE; i++) {
+        for (i = 0; i < RESOURCE_PEERS_SIZE; i++) {
             if (!resource_peers[i].is_valid) {
-                peer = &resource_peers[i] ;
-                break ;
+                peer = &resource_peers[i];
+                break;
             }
         }
         if (peer) {
-            peer->remote_id = XAllocID (dpy);
-            peer->local_id = a_local_resource_id ;
-            peer->is_valid = TRUE ;
+            peer->remote_id = XAllocID(dpy);
+            peer->local_id = a_local_resource_id;
+            peer->is_valid = TRUE;
         }
     }
     if (peer) {
-        *a_remote_resource_id = peer->remote_id ;
-        return TRUE ;
+        *a_remote_resource_id = peer->remote_id;
+        return TRUE;
     }
-    return FALSE ;
+    return FALSE;
 }
 
 int
-hostx_get_resource_id_peer (int a_local_resource_id,
-                            int *a_remote_resource_id)
+hostx_get_resource_id_peer(int a_local_resource_id, int *a_remote_resource_id)
 {
-    int i=0 ;
-    ResourcePair *peer=NULL ;
-    for (i=0; i<RESOURCE_PEERS_SIZE; i++) {
+    int i = 0;
+    ResourcePair *peer = NULL;
+
+    for (i = 0; i < RESOURCE_PEERS_SIZE; i++) {
         if (resource_peers[i].is_valid
             && resource_peers[i].local_id == a_local_resource_id) {
-            peer = &resource_peers[i] ;
-            break ;
+            peer = &resource_peers[i];
+            break;
         }
     }
     if (peer) {
-        *a_remote_resource_id = peer->remote_id ;
-        return TRUE ;
+        *a_remote_resource_id = peer->remote_id;
+        return TRUE;
     }
-    return FALSE ;
+    return FALSE;
 }
 
 int
-hostx_has_dri (void)
+hostx_has_dri(void)
 {
-    int event_base=0, error_base=0 ;
-    Display *dpy=hostx_get_display () ;
+    int event_base = 0, error_base = 0;
+    Display *dpy = hostx_get_display();
 
     if (!dpy)
-        return FALSE ;
+        return FALSE;
 
-    if (!XF86DRIQueryExtension (dpy,
-                                &event_base,
-                                &error_base)) {
-        return FALSE ;
+    if (!XF86DRIQueryExtension(dpy, &event_base, &error_base)) {
+        return FALSE;
     }
-    return TRUE ;
+    return TRUE;
 }
 
 int
-hostx_has_glx (void)
+hostx_has_glx(void)
 {
-    Display *dpy=hostx_get_display () ;
-    int event_base=0, error_base=0 ;
+    Display *dpy = hostx_get_display();
+    int event_base = 0, error_base = 0;
 
-    if (!glXQueryExtension (dpy, &event_base, &error_base)) {
-        return FALSE ;
+    if (!glXQueryExtension(dpy, &event_base, &error_base)) {
+        return FALSE;
     }
-    return TRUE ;
+    return TRUE;
 }
 
-#endif /* XF86DRI */
+#endif                          /* XF86DRI */
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.h b/xorg-server/hw/kdrive/ephyr/hostx.h
index 42578576a..d6217119a 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.h
+++ b/xorg-server/hw/kdrive/ephyr/hostx.h
@@ -35,230 +35,212 @@
 #define EPHYR_DBG(x, a...) \
  fprintf(stderr, __FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a)
 #else
-#define EPHYR_DBG(x, a...) do {} while (0) 
+#define EPHYR_DBG(x, a...) do {} while (0)
 #endif
 
-typedef struct EphyrHostXVars  EphyrHostXVars;
+typedef struct EphyrHostXVars EphyrHostXVars;
 typedef struct EphyrHostXEvent EphyrHostXEvent;
-typedef void* EphyrScreenInfo ;
-typedef enum EphyrHostXEventType
-{
-  EPHYR_EV_MOUSE_MOTION,
-  EPHYR_EV_MOUSE_PRESS,
-  EPHYR_EV_MOUSE_RELEASE,
-  EPHYR_EV_KEY_PRESS,
-  EPHYR_EV_KEY_RELEASE,
-  EPHYR_EV_EXPOSE
-} 
-EphyrHostXEventType;
+typedef void *EphyrScreenInfo;
+typedef enum EphyrHostXEventType {
+    EPHYR_EV_MOUSE_MOTION,
+    EPHYR_EV_MOUSE_PRESS,
+    EPHYR_EV_MOUSE_RELEASE,
+    EPHYR_EV_KEY_PRESS,
+    EPHYR_EV_KEY_RELEASE,
+    EPHYR_EV_EXPOSE
+} EphyrHostXEventType;
 
 /* I can't believe it's not a KeySymsRec. */
 typedef struct {
-  int             minKeyCode;
-  int             maxKeyCode;
-  int             mapWidth;
-  CARD32         *map;
+    int minKeyCode;
+    int maxKeyCode;
+    int mapWidth;
+    CARD32 *map;
 } EphyrKeySyms;
 
-struct EphyrHostXEvent
-{
-  EphyrHostXEventType type;
+struct EphyrHostXEvent {
+    EphyrHostXEventType type;
 
-  union 
-  {
-    struct mouse_motion { 	
-      int x;
-      int y;
-      int screen;
-      int window;
-    } mouse_motion;
+    union {
+        struct mouse_motion {
+            int x;
+            int y;
+            int screen;
+            int window;
+        } mouse_motion;
 
-    struct mouse_down { 	
-      int button_num;
-    } mouse_down;
+        struct mouse_down {
+            int button_num;
+        } mouse_down;
 
-    struct mouse_up {
-      int button_num;
-    } mouse_up;
+        struct mouse_up {
+            int button_num;
+        } mouse_up;
 
-    struct key_up {
-      int scancode;
-    } key_up;
+        struct key_up {
+            int scancode;
+        } key_up;
 
-    struct key_down {
-      int scancode;
-    } key_down;
+        struct key_down {
+            int scancode;
+        } key_down;
 
-    struct expose {
-      int window;
-    } expose;
+        struct expose {
+            int window;
+        } expose;
 
-  } data;
+    } data;
 
-  int key_state;
+    int key_state;
 };
 
 typedef struct {
-  VisualID visualid;
-  int screen;
-  int depth;
-  int class;
-  unsigned long red_mask;
-  unsigned long green_mask;
-  unsigned long blue_mask;
-  int colormap_size;
-  int bits_per_rgb;
+    VisualID visualid;
+    int screen;
+    int depth;
+    int class;
+    unsigned long red_mask;
+    unsigned long green_mask;
+    unsigned long blue_mask;
+    int colormap_size;
+    int bits_per_rgb;
 } EphyrHostVisualInfo;
 
 typedef struct {
     int x, y;
-    int width, height ;
-    int visualid ;
+    int width, height;
+    int visualid;
 } EphyrHostWindowAttributes;
 
 typedef struct {
-    int x,y,width,height;
+    int x, y, width, height;
 } EphyrBox;
 
 typedef struct {
-    short x1,y1,x2,y2;
+    short x1, y1, x2, y2;
 } EphyrRect;
 
 int
-hostx_want_screen_size(EphyrScreenInfo screen, int *width, int *height);
+ hostx_want_screen_size(EphyrScreenInfo screen, int *width, int *height);
 
 int
-hostx_want_host_cursor(void);
+ hostx_want_host_cursor(void);
 
 void
-hostx_use_host_cursor(void);
+ hostx_use_host_cursor(void);
 
 void
-hostx_use_fullscreen(void);
+ hostx_use_fullscreen(void);
 
 int
-hostx_want_fullscreen(void);
+ hostx_want_fullscreen(void);
 
 int
-hostx_want_preexisting_window(EphyrScreenInfo screen);
+ hostx_want_preexisting_window(EphyrScreenInfo screen);
 
 void
-hostx_use_preexisting_window(unsigned long win_id);
+ hostx_use_preexisting_window(unsigned long win_id);
 
 void
-hostx_use_resname (char *name, int fromcmd);
+ hostx_use_resname(char *name, int fromcmd);
 
 void
-hostx_set_title(char *name);
+ hostx_set_title(char *name);
 
-void 
-hostx_handle_signal(int signum);
+void
+ hostx_handle_signal(int signum);
 
 int
-hostx_init(void);
+ hostx_init(void);
 
 void
-hostx_add_screen(EphyrScreenInfo screen, unsigned long win_id, int screen_num);
+ hostx_add_screen(EphyrScreenInfo screen, unsigned long win_id, int screen_num);
 
 void
-hostx_set_display_name(char *name);
+ hostx_set_display_name(char *name);
 
 void
-hostx_set_screen_number(EphyrScreenInfo screen, int number);
+ hostx_set_screen_number(EphyrScreenInfo screen, int number);
 
 void
-hostx_set_win_title(EphyrScreenInfo screen, char *extra_text);
+ hostx_set_win_title(EphyrScreenInfo screen, char *extra_text);
 
 int
-hostx_get_depth (void);
+ hostx_get_depth(void);
 
 int
-hostx_get_server_depth (EphyrScreenInfo screen);
+ hostx_get_server_depth(EphyrScreenInfo screen);
 
 void
-hostx_set_server_depth(EphyrScreenInfo screen, int depth);
+ hostx_set_server_depth(EphyrScreenInfo screen, int depth);
 
 int
-hostx_get_bpp(void *info);
+ hostx_get_bpp(void *info);
 
 void
-hostx_get_visual_masks (void   *info,
-			CARD32 *rmsk, 
-			CARD32 *gmsk, 
-			CARD32 *bmsk);
+ hostx_get_visual_masks(void *info, CARD32 *rmsk, CARD32 *gmsk, CARD32 *bmsk);
 void
-hostx_set_cmap_entry(unsigned char idx, 
-		     unsigned char r, 
-		     unsigned char g, 
-		     unsigned char b);
 
-void*
-hostx_screen_init (EphyrScreenInfo screen,
-                   int width, int height,
-                   int buffer_height);
+hostx_set_cmap_entry(unsigned char idx,
+                     unsigned char r, unsigned char g, unsigned char b);
+
+void *hostx_screen_init(EphyrScreenInfo screen,
+                        int width, int height, int buffer_height);
 
 void
-hostx_paint_rect(EphyrScreenInfo screen,
-		 int sx,    int sy,
-		 int dx,    int dy,
-		 int width, int height);
 
+hostx_paint_rect(EphyrScreenInfo screen,
+                 int sx, int sy, int dx, int dy, int width, int height);
 
 void
-hostx_load_keymap (void);
+ hostx_load_keymap(void);
 
 int
-hostx_get_event (EphyrHostXEvent *ev);
+ hostx_get_event(EphyrHostXEvent * ev);
 
-void*
-hostx_get_display (void) ;
+void *hostx_get_display(void);
 
 int
-hostx_get_window (int a_screen_number) ;
+ hostx_get_window(int a_screen_number);
 
 int
-hostx_get_window_attributes (int a_window, EphyrHostWindowAttributes *a_attr)  ;
+ hostx_get_window_attributes(int a_window, EphyrHostWindowAttributes * a_attr);
 
 int
-hostx_get_extension_info (const char *a_ext_name,
-                          int *a_major_opcode,
-                          int *a_first_even,
-                          int *a_first_error) ;
-int
-hostx_get_visuals_info (EphyrHostVisualInfo **a_visuals,
-                        int *a_num_entries) ;
 
-int hostx_create_window (int a_screen_number,
-                         EphyrBox *a_geometry,
-                         int a_visual_id,
-                         int *a_host_win /*out parameter*/) ;
+hostx_get_extension_info(const char *a_ext_name,
+                         int *a_major_opcode,
+                         int *a_first_even, int *a_first_error);
+int
+ hostx_get_visuals_info(EphyrHostVisualInfo ** a_visuals, int *a_num_entries);
 
-int hostx_destroy_window (int a_win) ;
+int hostx_create_window(int a_screen_number,
+                        EphyrBox * a_geometry,
+                        int a_visual_id, int *a_host_win /*out parameter */ );
 
-int hostx_set_window_geometry (int a_win, EphyrBox *a_geo) ;
+int hostx_destroy_window(int a_win);
 
+int hostx_set_window_geometry(int a_win, EphyrBox * a_geo);
 
-int hostx_set_window_bounding_rectangles (int a_window,
-                                          EphyrRect *a_rects,
-                                          int a_num_rects) ;
+int hostx_set_window_bounding_rectangles(int a_window,
+                                         EphyrRect * a_rects, int a_num_rects);
 
-int hostx_set_window_clipping_rectangles (int a_window,
-                                          EphyrRect *a_rects,
-                                          int a_num_rects) ;
-int hostx_has_xshape (void) ;
+int hostx_set_window_clipping_rectangles(int a_window,
+                                         EphyrRect * a_rects, int a_num_rects);
+int hostx_has_xshape(void);
 
 #ifdef XF86DRI
-int hostx_lookup_peer_window (void *a_local_window,
-                              int *a_host_peer /*out parameter*/) ;
+int hostx_lookup_peer_window(void *a_local_window,
+                             int *a_host_peer /*out parameter */ );
 int
-hostx_allocate_resource_id_peer (int a_local_resource_id,
-                                 int *a_remote_resource_id) ;
+
+hostx_allocate_resource_id_peer(int a_local_resource_id,
+                                int *a_remote_resource_id);
 int
-hostx_get_resource_id_peer (int a_local_resource_id,
-                            int *a_remote_resource_id) ;
-int hostx_has_dri (void) ;
+ hostx_get_resource_id_peer(int a_local_resource_id, int *a_remote_resource_id);
+int hostx_has_dri(void);
 
-int hostx_has_glx (void) ;
-#endif /* XF86DRI */
+int hostx_has_glx(void);
+#endif                          /* XF86DRI */
 
 #endif /*_XLIBS_STUFF_H_*/
diff --git a/xorg-server/hw/kdrive/ephyr/os.c b/xorg-server/hw/kdrive/ephyr/os.c
index e4dc6787d..a2a705dd9 100644
--- a/xorg-server/hw/kdrive/ephyr/os.c
+++ b/xorg-server/hw/kdrive/ephyr/os.c
@@ -28,24 +28,22 @@
 #endif
 #include "ephyr.h"
 
-extern void processScreenArg (char *screen_size, char *parent_id) ;
+extern void processScreenArg(char *screen_size, char *parent_id);
 
 static int
-EphyrInit (void)
+EphyrInit(void)
 {
-  /*
-   * make sure at least one screen
-   * has been added to the system.
-   */
-  if (!KdCardInfoLast ())
-    {
-        processScreenArg ("640x480", NULL) ;
+    /*
+     * make sure at least one screen
+     * has been added to the system.
+     */
+    if (!KdCardInfoLast()) {
+        processScreenArg("640x480", NULL);
     }
-  return hostx_init();
+    return hostx_init();
 }
 
-KdOsFuncs   EphyrOsFuncs = {
+KdOsFuncs EphyrOsFuncs = {
     .Init = EphyrInit,
     .pollEvents = ephyrPoll,
 };
-
diff --git a/xorg-server/hw/kdrive/ephyr/xf86dri.h b/xorg-server/hw/kdrive/ephyr/xf86dri.h
index cd650b582..88d3f3bf1 100644
--- a/xorg-server/hw/kdrive/ephyr/xf86dri.h
+++ b/xorg-server/hw/kdrive/ephyr/xf86dri.h
@@ -54,8 +54,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define X_XF86DRIGetDrawableInfo		9
 #define X_XF86DRIGetDeviceInfo			10
 #define X_XF86DRIAuthConnection                 11
-#define X_XF86DRIOpenFullScreen                 12   /* Deprecated */
-#define X_XF86DRICloseFullScreen                13   /* Deprecated */
+#define X_XF86DRIOpenFullScreen                 12      /* Deprecated */
+#define X_XF86DRICloseFullScreen                13      /* Deprecated */
 
 #define XF86DRINumberEvents		0
 
@@ -67,54 +67,58 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 _XFUNCPROTOBEGIN
 
-Bool XF86DRIQueryExtension( Display *dpy, int *event_base, int *error_base );
+Bool XF86DRIQueryExtension(Display * dpy, int *event_base, int *error_base);
 
-Bool XF86DRIQueryVersion( Display *dpy, int *majorVersion, int *minorVersion,
-    int *patchVersion );
+Bool XF86DRIQueryVersion(Display * dpy, int *majorVersion, int *minorVersion,
+                         int *patchVersion);
 
-Bool XF86DRIQueryDirectRenderingCapable( Display *dpy, int screen,
-    Bool *isCapable );
+Bool XF86DRIQueryDirectRenderingCapable(Display * dpy, int screen,
+                                        Bool *isCapable);
 
-Bool XF86DRIOpenConnection( Display *dpy, int screen, drm_handle_t *hSAREA,
-    char **busIDString );
+Bool XF86DRIOpenConnection(Display * dpy, int screen, drm_handle_t * hSAREA,
+                           char **busIDString);
 
-Bool XF86DRIAuthConnection( Display *dpy, int screen, drm_magic_t magic );
+Bool XF86DRIAuthConnection(Display * dpy, int screen, drm_magic_t magic);
 
-Bool XF86DRICloseConnection( Display *dpy, int screen );
+Bool XF86DRICloseConnection(Display * dpy, int screen);
 
-Bool XF86DRIGetClientDriverName( Display *dpy, int screen,
-    int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
-    int *ddxDriverPatchVersion, char **clientDriverName );
+Bool XF86DRIGetClientDriverName(Display * dpy, int screen,
+                                int *ddxDriverMajorVersion,
+                                int *ddxDriverMinorVersion,
+                                int *ddxDriverPatchVersion,
+                                char **clientDriverName);
 
-Bool XF86DRICreateContext( Display *dpy, int screen, Visual *visual,
-    XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
+Bool XF86DRICreateContext(Display * dpy, int screen, Visual * visual,
+                          XID *ptr_to_returned_context_id,
+                          drm_context_t * hHWContext);
 
-Bool XF86DRICreateContextWithConfig( Display *dpy, int screen, int configID,
-    XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
+Bool XF86DRICreateContextWithConfig(Display * dpy, int screen, int configID,
+                                    XID *ptr_to_returned_context_id,
+                                    drm_context_t * hHWContext);
 
-extern GLboolean XF86DRIDestroyContext( Display *dpy, int screen,
-    XID context_id );
+extern GLboolean XF86DRIDestroyContext(Display * dpy, int screen,
+                                       XID context_id);
 
-extern GLboolean XF86DRICreateDrawable( Display *dpy, int screen,
-    XID drawable, drm_drawable_t *hHWDrawable );
+extern GLboolean XF86DRICreateDrawable(Display * dpy, int screen,
+                                       XID drawable,
+                                       drm_drawable_t * hHWDrawable);
 
-extern GLboolean XF86DRIDestroyDrawable( Display *dpy, int screen, 
-    XID drawable);
+extern GLboolean XF86DRIDestroyDrawable(Display * dpy, int screen,
+                                        XID drawable);
 
-Bool XF86DRIGetDrawableInfo( Display *dpy, int screen, Drawable drawable,
-    unsigned int *index, unsigned int *stamp, 
-    int *X, int *Y, int *W, int *H,
-    int *numClipRects, drm_clip_rect_t ** pClipRects,
-    int *backX, int *backY,
-    int *numBackClipRects, drm_clip_rect_t **pBackClipRects );
+Bool XF86DRIGetDrawableInfo(Display * dpy, int screen, Drawable drawable,
+                            unsigned int *index, unsigned int *stamp,
+                            int *X, int *Y, int *W, int *H,
+                            int *numClipRects, drm_clip_rect_t ** pClipRects,
+                            int *backX, int *backY,
+                            int *numBackClipRects,
+                            drm_clip_rect_t ** pBackClipRects);
 
-Bool XF86DRIGetDeviceInfo( Display *dpy, int screen,
-    drm_handle_t *hFrameBuffer, int *fbOrigin, int *fbSize,
-    int *fbStride, int *devPrivateSize, void **pDevPrivate );
+Bool XF86DRIGetDeviceInfo(Display * dpy, int screen,
+                          drm_handle_t * hFrameBuffer, int *fbOrigin,
+                          int *fbSize, int *fbStride, int *devPrivateSize,
+                          void **pDevPrivate);
 
 _XFUNCPROTOEND
-
-#endif /* _XF86DRI_SERVER_ */
-
-#endif /* _XF86DRI_H_ */
-
+#endif                          /* _XF86DRI_SERVER_ */
+#endif                          /* _XF86DRI_H_ */
diff --git a/xorg-server/hw/kdrive/fake/fake.c b/xorg-server/hw/kdrive/fake/fake.c
index 21360b16d..90e3ec9a6 100644
--- a/xorg-server/hw/kdrive/fake/fake.c
+++ b/xorg-server/hw/kdrive/fake/fake.c
@@ -1,472 +1,450 @@
-/*

- * Copyright © 2004 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_CONFIG_H

-#include <kdrive-config.h>

-#endif

-#include "fake.h"

-

-extern int KdTsPhyScreen;

-

-Bool

-fakeInitialize (KdCardInfo *card, FakePriv *priv)

-{

-    priv->base = 0;

-    priv->bytes_per_line = 0;

-    return TRUE;

-}

-

-Bool

-fakeCardInit (KdCardInfo *card)

-{

-    FakePriv	*priv;

-

-    priv = (FakePriv *) malloc(sizeof (FakePriv));

-    if (!priv)

-	return FALSE;

-    

-    if (!fakeInitialize (card, priv))

-    {

-	free(priv);

-	return FALSE;

-    }

-    card->driver = priv;

-    

-    return TRUE;

-}

-

-Bool

-fakeScreenInitialize (KdScreenInfo *screen, FakeScrPriv *scrpriv)

-{

-    if (!screen->width || !screen->height)

-    {

-	screen->width = 1024;

-	screen->height = 768;

-	screen->rate = 72;

-    }

-

-    if (screen->width <= 0)

-	screen->width = 1;

-    if (screen->height <= 0)

-	screen->height = 1;

-    

-    if (!screen->fb.depth)

-	screen->fb.depth = 16;

-

-    if (screen->fb.depth <= 8)

-    {

-	screen->fb.visuals = ((1 << StaticGray) |

-			      (1 << GrayScale) |

-			      (1 << StaticColor) |

-			      (1 << PseudoColor) |

-			      (1 << TrueColor) |

-			      (1 << DirectColor));

-    }

-    else 

-    {

-	screen->fb.visuals = (1 << TrueColor);

-#define Mask(o,l)   (((1 << l) - 1) << o)

-	if (screen->fb.depth <= 15)

-	{

-	    screen->fb.depth = 15;

-	    screen->fb.bitsPerPixel = 16;

-	    screen->fb.redMask = Mask (10, 5);

-	    screen->fb.greenMask = Mask (5, 5);

-	    screen->fb.blueMask = Mask (0, 5);

-	}

-	else if (screen->fb.depth <= 16)

-	{

-	    screen->fb.depth = 16;

-	    screen->fb.bitsPerPixel = 16;

-	    screen->fb.redMask = Mask (11, 5);

-	    screen->fb.greenMask = Mask (5, 6);

-	    screen->fb.blueMask = Mask (0, 5);

-	}

-	else

-	{

-	    screen->fb.depth = 24;

-	    screen->fb.bitsPerPixel = 32;

-	    screen->fb.redMask = Mask (16, 8);

-	    screen->fb.greenMask = Mask (8, 8);

-	    screen->fb.blueMask = Mask (0, 8);

-	}

-    }

-

-    scrpriv->randr = screen->randr;

-

-    return fakeMapFramebuffer (screen);

-}

-

-Bool

-fakeScreenInit (KdScreenInfo *screen)

-{

-    FakeScrPriv *scrpriv;

-

-    scrpriv = calloc(1, sizeof (FakeScrPriv));

-    if (!scrpriv)

-	return FALSE;

-    screen->driver = scrpriv;

-    if (!fakeScreenInitialize (screen, scrpriv))

-    {

-	screen->driver = 0;

-	free(scrpriv);

-	return FALSE;

-    }

-    return TRUE;

-}

-    

-void *

-fakeWindowLinear (ScreenPtr	pScreen,

-		   CARD32	row,

-		   CARD32	offset,

-		   int		mode,

-		   CARD32	*size,

-		   void		*closure)

-{

-    KdScreenPriv(pScreen);

-    FakePriv	    *priv = pScreenPriv->card->driver;

-

-    if (!pScreenPriv->enabled)

-	return 0;

-    *size = priv->bytes_per_line;

-    return priv->base + row * priv->bytes_per_line;

-}

-

-Bool

-fakeMapFramebuffer (KdScreenInfo *screen)

-{

-    FakeScrPriv	*scrpriv = screen->driver;

-    KdPointerMatrix	m;

-    FakePriv		*priv = screen->card->driver;

-

-    if (scrpriv->randr != RR_Rotate_0)

-	scrpriv->shadow = TRUE;

-    else

-	scrpriv->shadow = FALSE;

-    

-    KdComputePointerMatrix (&m, scrpriv->randr, screen->width, screen->height);

-    

-    KdSetPointerMatrix (&m);

-    

-    priv->bytes_per_line = ((screen->width * screen->fb.bitsPerPixel + 31) >> 5) << 2;

-    free(priv->base);

-    priv->base = malloc (priv->bytes_per_line * screen->height);

-    

-    if (scrpriv->shadow)

-    {

-	if (!KdShadowFbAlloc (screen, scrpriv->randr & (RR_Rotate_90|RR_Rotate_270)))

-	    return FALSE;

-    }

-    else

-    {

-        screen->fb.byteStride = priv->bytes_per_line;

-        screen->fb.pixelStride = (priv->bytes_per_line * 8/

-				     screen->fb.bitsPerPixel);

-        screen->fb.frameBuffer = (CARD8 *) (priv->base);

-    }

-    

-    return TRUE;

-}

-

-void

-fakeSetScreenSizes (ScreenPtr pScreen)

-{

-    KdScreenPriv(pScreen);

-    KdScreenInfo	*screen = pScreenPriv->screen;

-    FakeScrPriv	*scrpriv = screen->driver;

-

-    if (scrpriv->randr & (RR_Rotate_0|RR_Rotate_180))

-    {

-	pScreen->width = screen->width;

-	pScreen->height = screen->height;

-	pScreen->mmWidth = screen->width_mm;

-	pScreen->mmHeight = screen->height_mm;

-    }

-    else

-    {

-	pScreen->width = screen->width;

-	pScreen->height = screen->height;

-	pScreen->mmWidth = screen->height_mm;

-	pScreen->mmHeight = screen->width_mm;

-    }

-}

-

-Bool

-fakeUnmapFramebuffer (KdScreenInfo *screen)

-{

-    FakePriv		*priv = screen->card->driver;

-    KdShadowFbFree (screen);

-    free(priv->base);

-    priv->base = NULL;

-    return TRUE;

-}

-

-Bool

-fakeSetShadow (ScreenPtr pScreen)

-{

-    KdScreenPriv(pScreen);

-    KdScreenInfo	*screen = pScreenPriv->screen;

-    FakeScrPriv	*scrpriv = screen->driver;

-    ShadowUpdateProc	update;

-    ShadowWindowProc	window;

-

-    window = fakeWindowLinear;

-    update = 0;

-    if (scrpriv->randr)

-	update = shadowUpdateRotatePacked;

-    else

-	update = shadowUpdatePacked;

-    return KdShadowSet (pScreen, scrpriv->randr, update, window);

-}

-

-

-#ifdef RANDR

-Bool

-fakeRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)

-{

-    KdScreenPriv(pScreen);

-    KdScreenInfo	    *screen = pScreenPriv->screen;

-    FakeScrPriv	    *scrpriv = screen->driver;

-    RRScreenSizePtr	    pSize;

-    Rotation		    randr;

-    int			    n;

-    

-    *rotations = RR_Rotate_All|RR_Reflect_All;

-    

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

-	if (pScreen->allowedDepths[n].numVids)

-	    break;

-    if (n == pScreen->numDepths)

-	return FALSE;

-    

-    pSize = RRRegisterSize (pScreen,

-			    screen->width,

-			    screen->height,

-			    screen->width_mm,

-			    screen->height_mm);

-    

-    randr = KdSubRotation (scrpriv->randr, screen->randr);

-    

-    RRSetCurrentConfig (pScreen, randr, 0, pSize);

-    

-    return TRUE;

-}

-

-Bool

-fakeRandRSetConfig (ScreenPtr		pScreen,

-		     Rotation		randr,

-		     int		rate,

-		     RRScreenSizePtr	pSize)

-{

-    KdScreenPriv(pScreen);

-    KdScreenInfo	*screen = pScreenPriv->screen;

-    FakeScrPriv	*scrpriv = screen->driver;

-    Bool		wasEnabled = pScreenPriv->enabled;

-    FakeScrPriv	oldscr;

-    int			oldwidth;

-    int			oldheight;

-    int			oldmmwidth;

-    int			oldmmheight;

-    int			newwidth, newheight;

-

-    if (screen->randr & (RR_Rotate_0|RR_Rotate_180))

-    {

-	newwidth = pSize->width;

-	newheight = pSize->height;

-    }

-    else

-    {

-	newwidth = pSize->height;

-	newheight = pSize->width;

-    }

-

-    if (wasEnabled)

-	KdDisableScreen (pScreen);

-

-    oldscr = *scrpriv;

-    

-    oldwidth = screen->width;

-    oldheight = screen->height;

-    oldmmwidth = pScreen->mmWidth;

-    oldmmheight = pScreen->mmHeight;

-    

-    /*

-     * Set new configuration

-     */

-    

-    scrpriv->randr = KdAddRotation (screen->randr, randr);

-

-    fakeUnmapFramebuffer (screen);

-    

-    if (!fakeMapFramebuffer (screen))

-	goto bail4;

-

-    KdShadowUnset (screen->pScreen);

-

-    if (!fakeSetShadow (screen->pScreen))

-	goto bail4;

-

-    fakeSetScreenSizes (screen->pScreen);

-

-    /*

-     * Set frame buffer mapping

-     */

-    (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap (pScreen),

-				    pScreen->width,

-				    pScreen->height,

-				    screen->fb.depth,

-				    screen->fb.bitsPerPixel,

-				    screen->fb.byteStride,

-				    screen->fb.frameBuffer);

-    

-    /* set the subpixel order */

-    

-    KdSetSubpixelOrder (pScreen, scrpriv->randr);

-    if (wasEnabled)

-	KdEnableScreen (pScreen);

-

-    return TRUE;

-

-bail4:

-    fakeUnmapFramebuffer (screen);

-    *scrpriv = oldscr;

-    (void) fakeMapFramebuffer (screen);

-    pScreen->width = oldwidth;

-    pScreen->height = oldheight;

-    pScreen->mmWidth = oldmmwidth;

-    pScreen->mmHeight = oldmmheight;

-    

-    if (wasEnabled)

-	KdEnableScreen (pScreen);

-    return FALSE;

-}

-

-Bool

-fakeRandRInit (ScreenPtr pScreen)

-{

-    rrScrPrivPtr    pScrPriv;

-    

-    if (!RRScreenInit (pScreen))

-	return FALSE;

-

-    pScrPriv = rrGetScrPriv(pScreen);

-    pScrPriv->rrGetInfo = fakeRandRGetInfo;

-    pScrPriv->rrSetConfig = fakeRandRSetConfig;

-    return TRUE;

-}

-#endif

-

-Bool

-fakeCreateColormap (ColormapPtr pmap)

-{

-    return fbInitializeColormap (pmap);

-}

-

-Bool

-fakeInitScreen (ScreenPtr pScreen)

-{

-#ifdef TOUCHSCREEN

-    KdTsPhyScreen = pScreen->myNum;

-#endif

-

-    pScreen->CreateColormap = fakeCreateColormap;

-    return TRUE;

-}

-

-Bool

-fakeFinishInitScreen (ScreenPtr pScreen)

-{

-    if (!shadowSetup (pScreen))

-	return FALSE;

-

-#ifdef RANDR

-    if (!fakeRandRInit (pScreen))

-	return FALSE;

-#endif

-    

-    return TRUE;

-}

-

-

-Bool

-fakeCreateResources (ScreenPtr pScreen)

-{

-    return fakeSetShadow (pScreen);

-}

-

-void

-fakePreserve (KdCardInfo *card)

-{

-}

-

-Bool

-fakeEnable (ScreenPtr pScreen)

-{

-    return TRUE;

-}

-

-Bool

-fakeDPMS (ScreenPtr pScreen, int mode)

-{

-    return TRUE;

-}

-

-void

-fakeDisable (ScreenPtr pScreen)

-{

-}

-

-void

-fakeRestore (KdCardInfo *card)

-{

-}

-

-void

-fakeScreenFini (KdScreenInfo *screen)

-{

-}

-

-void

-fakeCardFini (KdCardInfo *card)

-{

-    FakePriv	*priv = card->driver;

-

-    free (priv->base);

-    free(priv);

-}

-

-void

-fakeGetColors (ScreenPtr pScreen, int n, xColorItem *pdefs)

-{

-    while (n--)

-    {

-	pdefs->red = 0;

-	pdefs->green = 0;

-	pdefs->blue = 0;

-	pdefs++;

-    }

-}

-

-void

-fakePutColors (ScreenPtr pScreen, int n, xColorItem *pdefs)

-{

-}

+/*
+ * Copyright © 2004 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_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "fake.h"
+
+extern int KdTsPhyScreen;
+
+Bool
+fakeInitialize(KdCardInfo * card, FakePriv * priv)
+{
+    priv->base = 0;
+    priv->bytes_per_line = 0;
+    return TRUE;
+}
+
+Bool
+fakeCardInit(KdCardInfo * card)
+{
+    FakePriv *priv;
+
+    priv = (FakePriv *) malloc(sizeof(FakePriv));
+    if (!priv)
+        return FALSE;
+
+    if (!fakeInitialize(card, priv)) {
+        free(priv);
+        return FALSE;
+    }
+    card->driver = priv;
+
+    return TRUE;
+}
+
+Bool
+fakeScreenInitialize(KdScreenInfo * screen, FakeScrPriv * scrpriv)
+{
+    if (!screen->width || !screen->height) {
+        screen->width = 1024;
+        screen->height = 768;
+        screen->rate = 72;
+    }
+
+    if (screen->width <= 0)
+        screen->width = 1;
+    if (screen->height <= 0)
+        screen->height = 1;
+
+    if (!screen->fb.depth)
+        screen->fb.depth = 16;
+
+    if (screen->fb.depth <= 8) {
+        screen->fb.visuals = ((1 << StaticGray) |
+                              (1 << GrayScale) |
+                              (1 << StaticColor) |
+                              (1 << PseudoColor) |
+                              (1 << TrueColor) | (1 << DirectColor));
+    }
+    else {
+        screen->fb.visuals = (1 << TrueColor);
+#define Mask(o,l)   (((1 << l) - 1) << o)
+        if (screen->fb.depth <= 15) {
+            screen->fb.depth = 15;
+            screen->fb.bitsPerPixel = 16;
+            screen->fb.redMask = Mask (10, 5);
+            screen->fb.greenMask = Mask (5, 5);
+            screen->fb.blueMask = Mask (0, 5);
+        }
+        else if (screen->fb.depth <= 16) {
+            screen->fb.depth = 16;
+            screen->fb.bitsPerPixel = 16;
+            screen->fb.redMask = Mask (11, 5);
+            screen->fb.greenMask = Mask (5, 6);
+            screen->fb.blueMask = Mask (0, 5);
+        }
+        else {
+            screen->fb.depth = 24;
+            screen->fb.bitsPerPixel = 32;
+            screen->fb.redMask = Mask (16, 8);
+            screen->fb.greenMask = Mask (8, 8);
+            screen->fb.blueMask = Mask (0, 8);
+        }
+    }
+
+    scrpriv->randr = screen->randr;
+
+    return fakeMapFramebuffer(screen);
+}
+
+Bool
+fakeScreenInit(KdScreenInfo * screen)
+{
+    FakeScrPriv *scrpriv;
+
+    scrpriv = calloc(1, sizeof(FakeScrPriv));
+    if (!scrpriv)
+        return FALSE;
+    screen->driver = scrpriv;
+    if (!fakeScreenInitialize(screen, scrpriv)) {
+        screen->driver = 0;
+        free(scrpriv);
+        return FALSE;
+    }
+    return TRUE;
+}
+
+void *
+fakeWindowLinear(ScreenPtr pScreen,
+                 CARD32 row,
+                 CARD32 offset, int mode, CARD32 *size, void *closure)
+{
+    KdScreenPriv(pScreen);
+    FakePriv *priv = pScreenPriv->card->driver;
+
+    if (!pScreenPriv->enabled)
+        return 0;
+    *size = priv->bytes_per_line;
+    return priv->base + row * priv->bytes_per_line;
+}
+
+Bool
+fakeMapFramebuffer(KdScreenInfo * screen)
+{
+    FakeScrPriv *scrpriv = screen->driver;
+    KdPointerMatrix m;
+    FakePriv *priv = screen->card->driver;
+
+    if (scrpriv->randr != RR_Rotate_0)
+        scrpriv->shadow = TRUE;
+    else
+        scrpriv->shadow = FALSE;
+
+    KdComputePointerMatrix(&m, scrpriv->randr, screen->width, screen->height);
+
+    KdSetPointerMatrix(&m);
+
+    priv->bytes_per_line =
+        ((screen->width * screen->fb.bitsPerPixel + 31) >> 5) << 2;
+    free(priv->base);
+    priv->base = malloc(priv->bytes_per_line * screen->height);
+
+    if (scrpriv->shadow) {
+        if (!KdShadowFbAlloc
+            (screen, scrpriv->randr & (RR_Rotate_90 | RR_Rotate_270)))
+            return FALSE;
+    }
+    else {
+        screen->fb.byteStride = priv->bytes_per_line;
+        screen->fb.pixelStride = (priv->bytes_per_line * 8 /
+                                  screen->fb.bitsPerPixel);
+        screen->fb.frameBuffer = (CARD8 *) (priv->base);
+    }
+
+    return TRUE;
+}
+
+void
+fakeSetScreenSizes(ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    FakeScrPriv *scrpriv = screen->driver;
+
+    if (scrpriv->randr & (RR_Rotate_0 | RR_Rotate_180)) {
+        pScreen->width = screen->width;
+        pScreen->height = screen->height;
+        pScreen->mmWidth = screen->width_mm;
+        pScreen->mmHeight = screen->height_mm;
+    }
+    else {
+        pScreen->width = screen->width;
+        pScreen->height = screen->height;
+        pScreen->mmWidth = screen->height_mm;
+        pScreen->mmHeight = screen->width_mm;
+    }
+}
+
+Bool
+fakeUnmapFramebuffer(KdScreenInfo * screen)
+{
+    FakePriv *priv = screen->card->driver;
+
+    KdShadowFbFree(screen);
+    free(priv->base);
+    priv->base = NULL;
+    return TRUE;
+}
+
+Bool
+fakeSetShadow(ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    FakeScrPriv *scrpriv = screen->driver;
+    ShadowUpdateProc update;
+    ShadowWindowProc window;
+
+    window = fakeWindowLinear;
+    update = 0;
+    if (scrpriv->randr)
+        update = shadowUpdateRotatePacked;
+    else
+        update = shadowUpdatePacked;
+    return KdShadowSet(pScreen, scrpriv->randr, update, window);
+}
+
+#ifdef RANDR
+Bool
+fakeRandRGetInfo(ScreenPtr pScreen, Rotation * rotations)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    FakeScrPriv *scrpriv = screen->driver;
+    RRScreenSizePtr pSize;
+    Rotation randr;
+    int n;
+
+    *rotations = RR_Rotate_All | RR_Reflect_All;
+
+    for (n = 0; n < pScreen->numDepths; n++)
+        if (pScreen->allowedDepths[n].numVids)
+            break;
+    if (n == pScreen->numDepths)
+        return FALSE;
+
+    pSize = RRRegisterSize(pScreen,
+                           screen->width,
+                           screen->height, screen->width_mm, screen->height_mm);
+
+    randr = KdSubRotation(scrpriv->randr, screen->randr);
+
+    RRSetCurrentConfig(pScreen, randr, 0, pSize);
+
+    return TRUE;
+}
+
+Bool
+fakeRandRSetConfig(ScreenPtr pScreen,
+                   Rotation randr, int rate, RRScreenSizePtr pSize)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    FakeScrPriv *scrpriv = screen->driver;
+    Bool wasEnabled = pScreenPriv->enabled;
+    FakeScrPriv oldscr;
+    int oldwidth;
+    int oldheight;
+    int oldmmwidth;
+    int oldmmheight;
+    int newwidth, newheight;
+
+    if (screen->randr & (RR_Rotate_0 | RR_Rotate_180)) {
+        newwidth = pSize->width;
+        newheight = pSize->height;
+    }
+    else {
+        newwidth = pSize->height;
+        newheight = pSize->width;
+    }
+
+    if (wasEnabled)
+        KdDisableScreen(pScreen);
+
+    oldscr = *scrpriv;
+
+    oldwidth = screen->width;
+    oldheight = screen->height;
+    oldmmwidth = pScreen->mmWidth;
+    oldmmheight = pScreen->mmHeight;
+
+    /*
+     * Set new configuration
+     */
+
+    scrpriv->randr = KdAddRotation(screen->randr, randr);
+
+    fakeUnmapFramebuffer(screen);
+
+    if (!fakeMapFramebuffer(screen))
+        goto bail4;
+
+    KdShadowUnset(screen->pScreen);
+
+    if (!fakeSetShadow(screen->pScreen))
+        goto bail4;
+
+    fakeSetScreenSizes(screen->pScreen);
+
+    /*
+     * Set frame buffer mapping
+     */
+    (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap(pScreen),
+                                    pScreen->width,
+                                    pScreen->height,
+                                    screen->fb.depth,
+                                    screen->fb.bitsPerPixel,
+                                    screen->fb.byteStride,
+                                    screen->fb.frameBuffer);
+
+    /* set the subpixel order */
+
+    KdSetSubpixelOrder(pScreen, scrpriv->randr);
+    if (wasEnabled)
+        KdEnableScreen(pScreen);
+
+    return TRUE;
+
+ bail4:
+    fakeUnmapFramebuffer(screen);
+    *scrpriv = oldscr;
+    (void) fakeMapFramebuffer(screen);
+    pScreen->width = oldwidth;
+    pScreen->height = oldheight;
+    pScreen->mmWidth = oldmmwidth;
+    pScreen->mmHeight = oldmmheight;
+
+    if (wasEnabled)
+        KdEnableScreen(pScreen);
+    return FALSE;
+}
+
+Bool
+fakeRandRInit(ScreenPtr pScreen)
+{
+    rrScrPrivPtr pScrPriv;
+
+    if (!RRScreenInit(pScreen))
+        return FALSE;
+
+    pScrPriv = rrGetScrPriv(pScreen);
+    pScrPriv->rrGetInfo = fakeRandRGetInfo;
+    pScrPriv->rrSetConfig = fakeRandRSetConfig;
+    return TRUE;
+}
+#endif
+
+Bool
+fakeCreateColormap(ColormapPtr pmap)
+{
+    return fbInitializeColormap(pmap);
+}
+
+Bool
+fakeInitScreen(ScreenPtr pScreen)
+{
+#ifdef TOUCHSCREEN
+    KdTsPhyScreen = pScreen->myNum;
+#endif
+
+    pScreen->CreateColormap = fakeCreateColormap;
+    return TRUE;
+}
+
+Bool
+fakeFinishInitScreen(ScreenPtr pScreen)
+{
+    if (!shadowSetup(pScreen))
+        return FALSE;
+
+#ifdef RANDR
+    if (!fakeRandRInit(pScreen))
+        return FALSE;
+#endif
+
+    return TRUE;
+}
+
+Bool
+fakeCreateResources(ScreenPtr pScreen)
+{
+    return fakeSetShadow(pScreen);
+}
+
+void
+fakePreserve(KdCardInfo * card)
+{
+}
+
+Bool
+fakeEnable(ScreenPtr pScreen)
+{
+    return TRUE;
+}
+
+Bool
+fakeDPMS(ScreenPtr pScreen, int mode)
+{
+    return TRUE;
+}
+
+void
+fakeDisable(ScreenPtr pScreen)
+{
+}
+
+void
+fakeRestore(KdCardInfo * card)
+{
+}
+
+void
+fakeScreenFini(KdScreenInfo * screen)
+{
+}
+
+void
+fakeCardFini(KdCardInfo * card)
+{
+    FakePriv *priv = card->driver;
+
+    free(priv->base);
+    free(priv);
+}
+
+void
+fakeGetColors(ScreenPtr pScreen, int n, xColorItem * pdefs)
+{
+    while (n--) {
+        pdefs->red = 0;
+        pdefs->green = 0;
+        pdefs->blue = 0;
+        pdefs++;
+    }
+}
+
+void
+fakePutColors(ScreenPtr pScreen, int n, xColorItem * pdefs)
+{
+}
diff --git a/xorg-server/hw/kdrive/fake/fake.h b/xorg-server/hw/kdrive/fake/fake.h
index d5058606a..ae33fc6d0 100644
--- a/xorg-server/hw/kdrive/fake/fake.h
+++ b/xorg-server/hw/kdrive/fake/fake.h
@@ -31,106 +31,101 @@
 #endif
 
 typedef struct _fakePriv {
-    CARD8	*base;
-    int		bytes_per_line;
+    CARD8 *base;
+    int bytes_per_line;
 } FakePriv;
-    
+
 typedef struct _fakeScrPriv {
-    Rotation	randr;
-    Bool	shadow;
+    Rotation randr;
+    Bool shadow;
 } FakeScrPriv;
 
-extern KdCardFuncs  fakeFuncs;
+extern KdCardFuncs fakeFuncs;
 
 Bool
-fakeInitialize (KdCardInfo *card, FakePriv *priv);
+ fakeInitialize(KdCardInfo * card, FakePriv * priv);
 
 Bool
-fakeCardInit (KdCardInfo *card);
+ fakeCardInit(KdCardInfo * card);
 
 Bool
-fakeScreenInit (KdScreenInfo *screen);
+ fakeScreenInit(KdScreenInfo * screen);
 
 Bool
-fakeScreenInitialize (KdScreenInfo *screen, FakeScrPriv *scrpriv);
-    
+ fakeScreenInitialize(KdScreenInfo * screen, FakeScrPriv * scrpriv);
+
 Bool
-fakeInitScreen (ScreenPtr pScreen);
+ fakeInitScreen(ScreenPtr pScreen);
 
 Bool
-fakeFinishInitScreen (ScreenPtr pScreen);
+ fakeFinishInitScreen(ScreenPtr pScreen);
 
 Bool
-fakeCreateResources (ScreenPtr pScreen);
+ fakeCreateResources(ScreenPtr pScreen);
 
 void
-fakePreserve (KdCardInfo *card);
+ fakePreserve(KdCardInfo * card);
 
 Bool
-fakeEnable (ScreenPtr pScreen);
+ fakeEnable(ScreenPtr pScreen);
 
 Bool
-fakeDPMS (ScreenPtr pScreen, int mode);
+ fakeDPMS(ScreenPtr pScreen, int mode);
 
 void
-fakeDisable (ScreenPtr pScreen);
+ fakeDisable(ScreenPtr pScreen);
 
 void
-fakeRestore (KdCardInfo *card);
+ fakeRestore(KdCardInfo * card);
 
 void
-fakeScreenFini (KdScreenInfo *screen);
+ fakeScreenFini(KdScreenInfo * screen);
 
 void
-fakeCardFini (KdCardInfo *card);
+ fakeCardFini(KdCardInfo * card);
 
 void
-fakeGetColors (ScreenPtr pScreen, int n, xColorItem *pdefs);
+ fakeGetColors(ScreenPtr pScreen, int n, xColorItem * pdefs);
 
 void
-fakePutColors (ScreenPtr pScreen, int n, xColorItem *pdefs);
+ fakePutColors(ScreenPtr pScreen, int n, xColorItem * pdefs);
 
 Bool
-fakeMapFramebuffer (KdScreenInfo *screen);
+ fakeMapFramebuffer(KdScreenInfo * screen);
 
-void *
-fakeWindowLinear (ScreenPtr	pScreen,
-		   CARD32	row,
-		   CARD32	offset,
-		   int		mode,
-		   CARD32	*size,
-		   void		*closure);
+void *fakeWindowLinear(ScreenPtr pScreen,
+                       CARD32 row,
+                       CARD32 offset, int mode, CARD32 *size, void *closure);
 
 void
-fakeSetScreenSizes (ScreenPtr pScreen);
+ fakeSetScreenSizes(ScreenPtr pScreen);
 
 Bool
-fakeUnmapFramebuffer (KdScreenInfo *screen);
+ fakeUnmapFramebuffer(KdScreenInfo * screen);
 
 Bool
-fakeSetShadow (ScreenPtr pScreen);
+ fakeSetShadow(ScreenPtr pScreen);
 
 Bool
-fakeCreateColormap (ColormapPtr pmap);
-    
+ fakeCreateColormap(ColormapPtr pmap);
+
 #ifdef RANDR
 Bool
-fakeRandRGetInfo (ScreenPtr pScreen, Rotation *rotations);
+ fakeRandRGetInfo(ScreenPtr pScreen, Rotation * rotations);
 
 Bool
-fakeRandRSetConfig (ScreenPtr		pScreen,
-		     Rotation		randr,
-		     int		rate,
-		     RRScreenSizePtr	pSize);
+
+fakeRandRSetConfig(ScreenPtr pScreen,
+                   Rotation randr, int rate, RRScreenSizePtr pSize);
 Bool
-fakeRandRInit (ScreenPtr pScreen);
+ fakeRandRInit(ScreenPtr pScreen);
 
 #endif
 
 extern KdPointerDriver FakePointerDriver;
 
-extern KdKeyboardDriver	FakeKeyboardDriver;
+extern KdKeyboardDriver FakeKeyboardDriver;
 
-extern KdOsFuncs   FakeOsFuncs;
+extern KdOsFuncs FakeOsFuncs;
 
-#endif /* _FBDEV_H_ */
+#endif                          /* _FBDEV_H_ */
diff --git a/xorg-server/hw/kdrive/fbdev/fbdev.c b/xorg-server/hw/kdrive/fbdev/fbdev.c
index 661e5b491..fd14afa92 100644
--- a/xorg-server/hw/kdrive/fbdev/fbdev.c
+++ b/xorg-server/hw/kdrive/fbdev/fbdev.c
@@ -33,46 +33,43 @@ extern int KdTsPhyScreen;
 char *fbdevDevicePath = NULL;
 
 static Bool
-fbdevInitialize (KdCardInfo *card, FbdevPriv *priv)
+fbdevInitialize(KdCardInfo * card, FbdevPriv * priv)
 {
-    unsigned long   off;
+    unsigned long off;
 
     if (fbdevDevicePath == NULL)
-      fbdevDevicePath = "/dev/fb0";
+        fbdevDevicePath = "/dev/fb0";
 
-    if ((priv->fd = open(fbdevDevicePath, O_RDWR)) < 0)
-      {
-	ErrorF("Error opening framebuffer %s: %s\n",
-	       fbdevDevicePath, strerror(errno));
+    if ((priv->fd = open(fbdevDevicePath, O_RDWR)) < 0) {
+        ErrorF("Error opening framebuffer %s: %s\n",
+               fbdevDevicePath, strerror(errno));
         return FALSE;
-      }
+    }
 
     /* quiet valgrind */
-    memset (&priv->fix, '\0', sizeof (priv->fix));
+    memset(&priv->fix, '\0', sizeof(priv->fix));
     if (ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix) < 0) {
-	perror("Error with /dev/fb ioctl FIOGET_FSCREENINFO");
-	close (priv->fd);
-	return FALSE;
+        perror("Error with /dev/fb ioctl FIOGET_FSCREENINFO");
+        close(priv->fd);
+        return FALSE;
     }
     /* quiet valgrind */
-    memset (&priv->var, '\0', sizeof (priv->var));
+    memset(&priv->var, '\0', sizeof(priv->var));
     if (ioctl(priv->fd, FBIOGET_VSCREENINFO, &priv->var) < 0) {
-	perror("Error with /dev/fb ioctl FIOGET_VSCREENINFO");
-	close (priv->fd);
-	return FALSE;
+        perror("Error with /dev/fb ioctl FIOGET_VSCREENINFO");
+        close(priv->fd);
+        return FALSE;
     }
 
-    priv->fb_base = (char *) mmap ((caddr_t) NULL,
-				   priv->fix.smem_len,
-				   PROT_READ|PROT_WRITE,
-				   MAP_SHARED,
-				   priv->fd, 0);
+    priv->fb_base = (char *) mmap((caddr_t) NULL,
+                                  priv->fix.smem_len,
+                                  PROT_READ | PROT_WRITE,
+                                  MAP_SHARED, priv->fd, 0);
 
-    if (priv->fb_base == (char *)-1)
-    {
+    if (priv->fb_base == (char *) -1) {
         perror("ERROR: mmap framebuffer fails!");
-	close (priv->fd);
-	return FALSE;
+        close(priv->fd);
+        return FALSE;
     }
     off = (unsigned long) priv->fix.smem_start % (unsigned long) getpagesize();
     priv->fb = priv->fb_base + off;
@@ -80,18 +77,17 @@ fbdevInitialize (KdCardInfo *card, FbdevPriv *priv)
 }
 
 Bool
-fbdevCardInit (KdCardInfo *card)
+fbdevCardInit(KdCardInfo * card)
 {
-    FbdevPriv	*priv;
+    FbdevPriv *priv;
 
-    priv = (FbdevPriv *) malloc(sizeof (FbdevPriv));
+    priv = (FbdevPriv *) malloc(sizeof(FbdevPriv));
     if (!priv)
-	return FALSE;
+        return FALSE;
 
-    if (!fbdevInitialize (card, priv))
-    {
-	free(priv);
-	return FALSE;
+    if (!fbdevInitialize(card, priv)) {
+        free(priv);
+        return FALSE;
     }
     card->driver = priv;
 
@@ -99,30 +95,29 @@ fbdevCardInit (KdCardInfo *card)
 }
 
 static Pixel
-fbdevMakeContig (Pixel orig, Pixel others)
+fbdevMakeContig(Pixel orig, Pixel others)
 {
-    Pixel   low;
+    Pixel low;
 
-    low = lowbit (orig) >> 1;
-    while (low && (others & low) == 0)
-    {
-	orig |= low;
-	low >>= 1;
+    low = lowbit(orig) >> 1;
+    while (low && (others & low) == 0) {
+        orig |= low;
+        low >>= 1;
     }
     return orig;
 }
 
 static Bool
-fbdevModeSupported (KdScreenInfo		*screen,
-		    const KdMonitorTiming	*t)
+fbdevModeSupported(KdScreenInfo * screen, const KdMonitorTiming * t)
 {
     return TRUE;
 }
 
 static void
-fbdevConvertMonitorTiming (const KdMonitorTiming *t, struct fb_var_screeninfo *var)
+fbdevConvertMonitorTiming(const KdMonitorTiming * t,
+                          struct fb_var_screeninfo *var)
 {
-    memset (var, 0, sizeof (struct fb_var_screeninfo));
+    memset(var, 0, sizeof(struct fb_var_screeninfo));
 
     var->xres = t->horizontal;
     var->yres = t->vertical;
@@ -142,56 +137,51 @@ fbdevConvertMonitorTiming (const KdMonitorTiming *t, struct fb_var_screeninfo *v
     var->vmode = 0;
 
     if (t->hpol == KdSyncPositive)
-      var->sync |= FB_SYNC_HOR_HIGH_ACT;
+        var->sync |= FB_SYNC_HOR_HIGH_ACT;
     if (t->vpol == KdSyncPositive)
-      var->sync |= FB_SYNC_VERT_HIGH_ACT;
+        var->sync |= FB_SYNC_VERT_HIGH_ACT;
 }
 
 static Bool
-fbdevScreenInitialize (KdScreenInfo *screen, FbdevScrPriv *scrpriv)
+fbdevScreenInitialize(KdScreenInfo * screen, FbdevScrPriv * scrpriv)
 {
-    FbdevPriv	*priv = screen->card->driver;
-    Pixel	allbits;
-    int		depth;
-    Bool	gray;
+    FbdevPriv *priv = screen->card->driver;
+    Pixel allbits;
+    int depth;
+    Bool gray;
     struct fb_var_screeninfo var;
     const KdMonitorTiming *t;
     int k;
 
-    k = ioctl (priv->fd, FBIOGET_VSCREENINFO, &var);
-
-    if (!screen->width || !screen->height)
-    {
-	if (k >= 0)
-	{
-	    screen->width = var.xres;
-	    screen->height = var.yres;
-	}
-	else
-	{
-	    screen->width = 1024;
-	    screen->height = 768;
-	}
-	screen->rate = 103; /* FIXME: should get proper value from fb driver */
+    k = ioctl(priv->fd, FBIOGET_VSCREENINFO, &var);
+
+    if (!screen->width || !screen->height) {
+        if (k >= 0) {
+            screen->width = var.xres;
+            screen->height = var.yres;
+        }
+        else {
+            screen->width = 1024;
+            screen->height = 768;
+        }
+        screen->rate = 103;     /* FIXME: should get proper value from fb driver */
     }
-    if (!screen->fb.depth)
-    {
-	if (k >= 0)
-	    screen->fb.depth = var.bits_per_pixel;
-	else
-	    screen->fb.depth = 16;
+    if (!screen->fb.depth) {
+        if (k >= 0)
+            screen->fb.depth = var.bits_per_pixel;
+        else
+            screen->fb.depth = 16;
     }
 
-    if ((screen->width != var.xres) || (screen->height != var.yres))
-    {
-      t = KdFindMode (screen, fbdevModeSupported);
-      screen->rate = t->rate;
-      screen->width = t->horizontal;
-      screen->height = t->vertical;
+    if ((screen->width != var.xres) || (screen->height != var.yres)) {
+        t = KdFindMode(screen, fbdevModeSupported);
+        screen->rate = t->rate;
+        screen->width = t->horizontal;
+        screen->height = t->vertical;
 
-      /* Now try setting the mode */
-      if (k < 0 || (t->horizontal != var.xres || t->vertical != var.yres))
-          fbdevConvertMonitorTiming (t, &var);
+        /* Now try setting the mode */
+        if (k < 0 || (t->horizontal != var.xres || t->vertical != var.yres))
+            fbdevConvertMonitorTiming(t, &var);
     }
 
     var.activate = FB_ACTIVATE_NOW;
@@ -199,163 +189,154 @@ fbdevScreenInitialize (KdScreenInfo *screen, FbdevScrPriv *scrpriv)
     var.nonstd = 0;
     var.grayscale = 0;
 
-    k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
+    k = ioctl(priv->fd, FBIOPUT_VSCREENINFO, &var);
 
-    if (k < 0)
-    {
-	fprintf (stderr, "error: %s\n", strerror (errno));
-	return FALSE;
+    if (k < 0) {
+        fprintf(stderr, "error: %s\n", strerror(errno));
+        return FALSE;
     }
 
     /* Re-get the "fixed" parameters since they might have changed */
-    k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
+    k = ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
     if (k < 0)
-        perror ("FBIOGET_FSCREENINFO");
+        perror("FBIOGET_FSCREENINFO");
 
     /* Now get the new screeninfo */
-    ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
+    ioctl(priv->fd, FBIOGET_VSCREENINFO, &priv->var);
     depth = priv->var.bits_per_pixel;
     gray = priv->var.grayscale;
 
     switch (priv->fix.visual) {
     case FB_VISUAL_PSEUDOCOLOR:
-	if (gray)
-	{
-	    screen->fb.visuals = (1 << StaticGray);
-	    /* could also support GrayScale, but what's the point? */
-	}
-	else
-	{
-	    screen->fb.visuals = ((1 << StaticGray) |
-			       (1 << GrayScale) |
-			       (1 << StaticColor) |
-			       (1 << PseudoColor) |
-			       (1 << TrueColor) |
-			       (1 << DirectColor));
-	}
-	screen->fb.blueMask  = 0x00;
-	screen->fb.greenMask = 0x00;
-	screen->fb.redMask   = 0x00;
-	break;
+        if (gray) {
+            screen->fb.visuals = (1 << StaticGray);
+            /* could also support GrayScale, but what's the point? */
+        }
+        else {
+            screen->fb.visuals = ((1 << StaticGray) |
+                                  (1 << GrayScale) |
+                                  (1 << StaticColor) |
+                                  (1 << PseudoColor) |
+                                  (1 << TrueColor) | (1 << DirectColor));
+        }
+        screen->fb.blueMask = 0x00;
+        screen->fb.greenMask = 0x00;
+        screen->fb.redMask = 0x00;
+        break;
     case FB_VISUAL_STATIC_PSEUDOCOLOR:
-	if (gray)
-	{
-	    screen->fb.visuals = (1 << StaticGray);
-	}
-	else
-	{
-	    screen->fb.visuals = (1 << StaticColor);
-	}
-	screen->fb.blueMask  = 0x00;
-	screen->fb.greenMask = 0x00;
-	screen->fb.redMask   = 0x00;
-	break;
+        if (gray) {
+            screen->fb.visuals = (1 << StaticGray);
+        }
+        else {
+            screen->fb.visuals = (1 << StaticColor);
+        }
+        screen->fb.blueMask = 0x00;
+        screen->fb.greenMask = 0x00;
+        screen->fb.redMask = 0x00;
+        break;
     case FB_VISUAL_TRUECOLOR:
     case FB_VISUAL_DIRECTCOLOR:
-	screen->fb.visuals = (1 << TrueColor);
+        screen->fb.visuals = (1 << TrueColor);
 #define Mask(o,l)   (((1 << l) - 1) << o)
-	screen->fb.redMask = Mask (priv->var.red.offset, priv->var.red.length);
-	screen->fb.greenMask = Mask (priv->var.green.offset, priv->var.green.length);
-	screen->fb.blueMask = Mask (priv->var.blue.offset, priv->var.blue.length);
-
-	/*
-	 * This is a kludge so that Render will work -- fill in the gaps
-	 * in the pixel
-	 */
-	screen->fb.redMask = fbdevMakeContig (screen->fb.redMask,
-						 screen->fb.greenMask|
-						 screen->fb.blueMask);
-
-	screen->fb.greenMask = fbdevMakeContig (screen->fb.greenMask,
-						   screen->fb.redMask|
-						   screen->fb.blueMask);
-
-	screen->fb.blueMask = fbdevMakeContig (screen->fb.blueMask,
-						  screen->fb.redMask|
-						  screen->fb.greenMask);
-
-	allbits = screen->fb.redMask | screen->fb.greenMask | screen->fb.blueMask;
-	depth = 32;
-	while (depth && !(allbits & (1 << (depth - 1))))
-	    depth--;
-	break;
+        screen->fb.redMask = Mask (priv->var.red.offset, priv->var.red.length);
+        screen->fb.greenMask =
+            Mask (priv->var.green.offset, priv->var.green.length);
+        screen->fb.blueMask =
+            Mask (priv->var.blue.offset, priv->var.blue.length);
+
+        /*
+         * This is a kludge so that Render will work -- fill in the gaps
+         * in the pixel
+         */
+        screen->fb.redMask = fbdevMakeContig(screen->fb.redMask,
+                                             screen->fb.greenMask |
+                                             screen->fb.blueMask);
+
+        screen->fb.greenMask = fbdevMakeContig(screen->fb.greenMask,
+                                               screen->fb.redMask |
+                                               screen->fb.blueMask);
+
+        screen->fb.blueMask = fbdevMakeContig(screen->fb.blueMask,
+                                              screen->fb.redMask |
+                                              screen->fb.greenMask);
+
+        allbits =
+            screen->fb.redMask | screen->fb.greenMask | screen->fb.blueMask;
+        depth = 32;
+        while (depth && !(allbits & (1 << (depth - 1))))
+            depth--;
+        break;
     default:
-	return FALSE;
-	break;
+        return FALSE;
+        break;
     }
     screen->fb.depth = depth;
     screen->fb.bitsPerPixel = priv->var.bits_per_pixel;
 
     scrpriv->randr = screen->randr;
 
-    return fbdevMapFramebuffer (screen);
+    return fbdevMapFramebuffer(screen);
 }
 
 Bool
-fbdevScreenInit (KdScreenInfo *screen)
+fbdevScreenInit(KdScreenInfo * screen)
 {
     FbdevScrPriv *scrpriv;
 
-    scrpriv = calloc(1, sizeof (FbdevScrPriv));
+    scrpriv = calloc(1, sizeof(FbdevScrPriv));
     if (!scrpriv)
-	return FALSE;
+        return FALSE;
     screen->driver = scrpriv;
-    if (!fbdevScreenInitialize (screen, scrpriv))
-    {
-	screen->driver = 0;
-	free(scrpriv);
-	return FALSE;
+    if (!fbdevScreenInitialize(screen, scrpriv)) {
+        screen->driver = 0;
+        free(scrpriv);
+        return FALSE;
     }
     return TRUE;
 }
 
 static void *
-fbdevWindowLinear (ScreenPtr	pScreen,
-		   CARD32	row,
-		   CARD32	offset,
-		   int		mode,
-		   CARD32	*size,
-		   void		*closure)
+fbdevWindowLinear(ScreenPtr pScreen,
+                  CARD32 row,
+                  CARD32 offset, int mode, CARD32 *size, void *closure)
 {
     KdScreenPriv(pScreen);
-    FbdevPriv	    *priv = pScreenPriv->card->driver;
+    FbdevPriv *priv = pScreenPriv->card->driver;
 
     if (!pScreenPriv->enabled)
-	return 0;
+        return 0;
     *size = priv->fix.line_length;
     return (CARD8 *) priv->fb + row * priv->fix.line_length + offset;
 }
 
 Bool
-fbdevMapFramebuffer (KdScreenInfo *screen)
+fbdevMapFramebuffer(KdScreenInfo * screen)
 {
-    FbdevScrPriv	*scrpriv = screen->driver;
-    KdPointerMatrix	m;
-    FbdevPriv		*priv = screen->card->driver;
+    FbdevScrPriv *scrpriv = screen->driver;
+    KdPointerMatrix m;
+    FbdevPriv *priv = screen->card->driver;
 
     if (scrpriv->randr != RR_Rotate_0)
-	scrpriv->shadow = TRUE;
+        scrpriv->shadow = TRUE;
     else
-	scrpriv->shadow = FALSE;
+        scrpriv->shadow = FALSE;
 
-    KdComputePointerMatrix (&m, scrpriv->randr, screen->width, screen->height);
+    KdComputePointerMatrix(&m, scrpriv->randr, screen->width, screen->height);
 
-    KdSetPointerMatrix (&m);
+    KdSetPointerMatrix(&m);
 
     screen->width = priv->var.xres;
     screen->height = priv->var.yres;
 
-    if (scrpriv->shadow)
-    {
-	if (!KdShadowFbAlloc (screen,
-			      scrpriv->randr & (RR_Rotate_90|RR_Rotate_270)))
-	    return FALSE;
+    if (scrpriv->shadow) {
+        if (!KdShadowFbAlloc(screen,
+                             scrpriv->randr & (RR_Rotate_90 | RR_Rotate_270)))
+            return FALSE;
     }
-    else
-    {
+    else {
         screen->fb.byteStride = priv->fix.line_length;
         screen->fb.pixelStride = (priv->fix.line_length * 8 /
-    				 priv->var.bits_per_pixel);
+                                  priv->var.bits_per_pixel);
         screen->fb.frameBuffer = (CARD8 *) (priv->fb);
     }
 
@@ -363,46 +344,44 @@ fbdevMapFramebuffer (KdScreenInfo *screen)
 }
 
 static void
-fbdevSetScreenSizes (ScreenPtr pScreen)
+fbdevSetScreenSizes(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
-    KdScreenInfo	*screen = pScreenPriv->screen;
-    FbdevScrPriv	*scrpriv = screen->driver;
-    FbdevPriv		*priv = screen->card->driver;
-
-    if (scrpriv->randr & (RR_Rotate_0|RR_Rotate_180))
-    {
-	pScreen->width = priv->var.xres;
-	pScreen->height = priv->var.yres;
-	pScreen->mmWidth = screen->width_mm;
-	pScreen->mmHeight = screen->height_mm;
+    KdScreenInfo *screen = pScreenPriv->screen;
+    FbdevScrPriv *scrpriv = screen->driver;
+    FbdevPriv *priv = screen->card->driver;
+
+    if (scrpriv->randr & (RR_Rotate_0 | RR_Rotate_180)) {
+        pScreen->width = priv->var.xres;
+        pScreen->height = priv->var.yres;
+        pScreen->mmWidth = screen->width_mm;
+        pScreen->mmHeight = screen->height_mm;
     }
-    else
-    {
-	pScreen->width = priv->var.yres;
-	pScreen->height = priv->var.xres;
-	pScreen->mmWidth = screen->height_mm;
-	pScreen->mmHeight = screen->width_mm;
+    else {
+        pScreen->width = priv->var.yres;
+        pScreen->height = priv->var.xres;
+        pScreen->mmWidth = screen->height_mm;
+        pScreen->mmHeight = screen->width_mm;
     }
 }
 
 static Bool
-fbdevUnmapFramebuffer (KdScreenInfo *screen)
+fbdevUnmapFramebuffer(KdScreenInfo * screen)
 {
-    KdShadowFbFree (screen);
+    KdShadowFbFree(screen);
     return TRUE;
 }
 
 static Bool
-fbdevSetShadow (ScreenPtr pScreen)
+fbdevSetShadow(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
-    KdScreenInfo	*screen = pScreenPriv->screen;
-    FbdevScrPriv	*scrpriv = screen->driver;
-    FbdevPriv		*priv = screen->card->driver;
-    ShadowUpdateProc	update;
-    ShadowWindowProc	window;
-    int			useYX = 0;
+    KdScreenInfo *screen = pScreenPriv->screen;
+    FbdevScrPriv *scrpriv = screen->driver;
+    FbdevPriv *priv = screen->card->driver;
+    ShadowUpdateProc update;
+    ShadowWindowProc window;
+    int useYX = 0;
 
 #ifdef __arm__
     /* Use variant copy routines that always read left to right in the
@@ -414,97 +393,91 @@ fbdevSetShadow (ScreenPtr pScreen)
     window = fbdevWindowLinear;
     update = 0;
     if (scrpriv->randr)
-	if (priv->var.bits_per_pixel == 16) {
-	    switch (scrpriv->randr) {
-	    case RR_Rotate_90:
-		if (useYX)
-		    update = shadowUpdateRotate16_90YX;
-		else
-		    update =  shadowUpdateRotate16_90;
-		break;
-	    case RR_Rotate_180:
-		update = shadowUpdateRotate16_180;
-		break;
-	    case RR_Rotate_270:
-		if (useYX)
-		    update = shadowUpdateRotate16_270YX;
-		else
-		    update =  shadowUpdateRotate16_270;
-		break;
-	    default:
-		update = shadowUpdateRotate16;
-		break;
-	    }
-	} else
-	    update = shadowUpdateRotatePacked;
+        if (priv->var.bits_per_pixel == 16) {
+            switch (scrpriv->randr) {
+            case RR_Rotate_90:
+                if (useYX)
+                    update = shadowUpdateRotate16_90YX;
+                else
+                    update = shadowUpdateRotate16_90;
+                break;
+            case RR_Rotate_180:
+                update = shadowUpdateRotate16_180;
+                break;
+            case RR_Rotate_270:
+                if (useYX)
+                    update = shadowUpdateRotate16_270YX;
+                else
+                    update = shadowUpdateRotate16_270;
+                break;
+            default:
+                update = shadowUpdateRotate16;
+                break;
+            }
+        }
+        else
+            update = shadowUpdateRotatePacked;
     else
-	update = shadowUpdatePacked;
-    return KdShadowSet (pScreen, scrpriv->randr, update, window);
+        update = shadowUpdatePacked;
+    return KdShadowSet(pScreen, scrpriv->randr, update, window);
 }
 
-
 #ifdef RANDR
 static Bool
-fbdevRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
+fbdevRandRGetInfo(ScreenPtr pScreen, Rotation * rotations)
 {
     KdScreenPriv(pScreen);
-    KdScreenInfo	    *screen = pScreenPriv->screen;
-    FbdevScrPriv	    *scrpriv = screen->driver;
-    RRScreenSizePtr	    pSize;
-    Rotation		    randr;
-    int			    n;
+    KdScreenInfo *screen = pScreenPriv->screen;
+    FbdevScrPriv *scrpriv = screen->driver;
+    RRScreenSizePtr pSize;
+    Rotation randr;
+    int n;
 
-    *rotations = RR_Rotate_All|RR_Reflect_All;
+    *rotations = RR_Rotate_All | RR_Reflect_All;
 
     for (n = 0; n < pScreen->numDepths; n++)
-	if (pScreen->allowedDepths[n].numVids)
-	    break;
+        if (pScreen->allowedDepths[n].numVids)
+            break;
     if (n == pScreen->numDepths)
-	return FALSE;
+        return FALSE;
 
-    pSize = RRRegisterSize (pScreen,
-			    screen->width,
-			    screen->height,
-			    screen->width_mm,
-			    screen->height_mm);
+    pSize = RRRegisterSize(pScreen,
+                           screen->width,
+                           screen->height, screen->width_mm, screen->height_mm);
 
-    randr = KdSubRotation (scrpriv->randr, screen->randr);
+    randr = KdSubRotation(scrpriv->randr, screen->randr);
 
-    RRSetCurrentConfig (pScreen, randr, 0, pSize);
+    RRSetCurrentConfig(pScreen, randr, 0, pSize);
 
     return TRUE;
 }
 
 static Bool
-fbdevRandRSetConfig (ScreenPtr		pScreen,
-		     Rotation		randr,
-		     int		rate,
-		     RRScreenSizePtr	pSize)
+fbdevRandRSetConfig(ScreenPtr pScreen,
+                    Rotation randr, int rate, RRScreenSizePtr pSize)
 {
     KdScreenPriv(pScreen);
-    KdScreenInfo	*screen = pScreenPriv->screen;
-    FbdevScrPriv	*scrpriv = screen->driver;
-    Bool		wasEnabled = pScreenPriv->enabled;
-    FbdevScrPriv	oldscr;
-    int			oldwidth;
-    int			oldheight;
-    int			oldmmwidth;
-    int			oldmmheight;
-    int			newwidth, newheight;
-
-    if (screen->randr & (RR_Rotate_0|RR_Rotate_180))
-    {
-	newwidth = pSize->width;
-	newheight = pSize->height;
+    KdScreenInfo *screen = pScreenPriv->screen;
+    FbdevScrPriv *scrpriv = screen->driver;
+    Bool wasEnabled = pScreenPriv->enabled;
+    FbdevScrPriv oldscr;
+    int oldwidth;
+    int oldheight;
+    int oldmmwidth;
+    int oldmmheight;
+    int newwidth, newheight;
+
+    if (screen->randr & (RR_Rotate_0 | RR_Rotate_180)) {
+        newwidth = pSize->width;
+        newheight = pSize->height;
     }
-    else
-    {
-	newwidth = pSize->height;
-	newheight = pSize->width;
+    else {
+        newwidth = pSize->height;
+        newheight = pSize->width;
     }
 
     if (wasEnabled)
-	KdDisableScreen (pScreen);
+        KdDisableScreen(pScreen);
 
     oldscr = *scrpriv;
 
@@ -517,60 +490,60 @@ fbdevRandRSetConfig (ScreenPtr		pScreen,
      * Set new configuration
      */
 
-    scrpriv->randr = KdAddRotation (screen->randr, randr);
+    scrpriv->randr = KdAddRotation(screen->randr, randr);
 
-    fbdevUnmapFramebuffer (screen);
+    fbdevUnmapFramebuffer(screen);
 
-    if (!fbdevMapFramebuffer (screen))
-	goto bail4;
+    if (!fbdevMapFramebuffer(screen))
+        goto bail4;
 
-    KdShadowUnset (screen->pScreen);
+    KdShadowUnset(screen->pScreen);
 
-    if (!fbdevSetShadow (screen->pScreen))
-	goto bail4;
+    if (!fbdevSetShadow(screen->pScreen))
+        goto bail4;
 
-    fbdevSetScreenSizes (screen->pScreen);
+    fbdevSetScreenSizes(screen->pScreen);
 
     /*
      * Set frame buffer mapping
      */
-    (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap (pScreen),
-				    pScreen->width,
-				    pScreen->height,
-				    screen->fb.depth,
-				    screen->fb.bitsPerPixel,
-				    screen->fb.byteStride,
-				    screen->fb.frameBuffer);
+    (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap(pScreen),
+                                    pScreen->width,
+                                    pScreen->height,
+                                    screen->fb.depth,
+                                    screen->fb.bitsPerPixel,
+                                    screen->fb.byteStride,
+                                    screen->fb.frameBuffer);
 
     /* set the subpixel order */
 
-    KdSetSubpixelOrder (pScreen, scrpriv->randr);
+    KdSetSubpixelOrder(pScreen, scrpriv->randr);
     if (wasEnabled)
-	KdEnableScreen (pScreen);
+        KdEnableScreen(pScreen);
 
     return TRUE;
 
-bail4:
-    fbdevUnmapFramebuffer (screen);
+ bail4:
+    fbdevUnmapFramebuffer(screen);
     *scrpriv = oldscr;
-    (void) fbdevMapFramebuffer (screen);
+    (void) fbdevMapFramebuffer(screen);
     pScreen->width = oldwidth;
     pScreen->height = oldheight;
     pScreen->mmWidth = oldmmwidth;
     pScreen->mmHeight = oldmmheight;
 
     if (wasEnabled)
-	KdEnableScreen (pScreen);
+        KdEnableScreen(pScreen);
     return FALSE;
 }
 
 static Bool
-fbdevRandRInit (ScreenPtr pScreen)
+fbdevRandRInit(ScreenPtr pScreen)
 {
-    rrScrPrivPtr    pScrPriv;
+    rrScrPrivPtr pScrPriv;
 
-    if (!RRScreenInit (pScreen))
-	return FALSE;
+    if (!RRScreenInit(pScreen))
+        return FALSE;
 
     pScrPriv = rrGetScrPriv(pScreen);
     pScrPriv->rrGetInfo = fbdevRandRGetInfo;
@@ -580,41 +553,41 @@ fbdevRandRInit (ScreenPtr pScreen)
 #endif
 
 static Bool
-fbdevCreateColormap (ColormapPtr pmap)
+fbdevCreateColormap(ColormapPtr pmap)
 {
-    ScreenPtr		pScreen = pmap->pScreen;
+    ScreenPtr pScreen = pmap->pScreen;
+
     KdScreenPriv(pScreen);
-    FbdevPriv		*priv = pScreenPriv->card->driver;
-    VisualPtr		pVisual;
-    int			i;
-    int			nent;
-    xColorItem		*pdefs;
+    FbdevPriv *priv = pScreenPriv->card->driver;
+    VisualPtr pVisual;
+    int i;
+    int nent;
+    xColorItem *pdefs;
 
     switch (priv->fix.visual) {
     case FB_VISUAL_STATIC_PSEUDOCOLOR:
-	pVisual = pmap->pVisual;
-	nent = pVisual->ColormapEntries;
-	pdefs = malloc(nent * sizeof (xColorItem));
-	if (!pdefs)
-	    return FALSE;
-	for (i = 0; i < nent; i++)
-	    pdefs[i].pixel = i;
-	fbdevGetColors (pScreen, nent, pdefs);
-	for (i = 0; i < nent; i++)
-	{
-	    pmap->red[i].co.local.red = pdefs[i].red;
-	    pmap->red[i].co.local.green = pdefs[i].green;
-	    pmap->red[i].co.local.blue = pdefs[i].blue;
-	}
-	free(pdefs);
-	return TRUE;
+        pVisual = pmap->pVisual;
+        nent = pVisual->ColormapEntries;
+        pdefs = malloc(nent * sizeof(xColorItem));
+        if (!pdefs)
+            return FALSE;
+        for (i = 0; i < nent; i++)
+            pdefs[i].pixel = i;
+        fbdevGetColors(pScreen, nent, pdefs);
+        for (i = 0; i < nent; i++) {
+            pmap->red[i].co.local.red = pdefs[i].red;
+            pmap->red[i].co.local.green = pdefs[i].green;
+            pmap->red[i].co.local.blue = pdefs[i].blue;
+        }
+        free(pdefs);
+        return TRUE;
     default:
-	return fbInitializeColormap (pmap);
+        return fbInitializeColormap(pmap);
     }
 }
 
 Bool
-fbdevInitScreen (ScreenPtr pScreen)
+fbdevInitScreen(ScreenPtr pScreen)
 {
 #ifdef TOUCHSCREEN
     KdTsPhyScreen = pScreen->myNum;
@@ -625,33 +598,32 @@ fbdevInitScreen (ScreenPtr pScreen)
 }
 
 Bool
-fbdevFinishInitScreen (ScreenPtr pScreen)
+fbdevFinishInitScreen(ScreenPtr pScreen)
 {
-    if (!shadowSetup (pScreen))
-	return FALSE;
+    if (!shadowSetup(pScreen))
+        return FALSE;
 
 #ifdef RANDR
-    if (!fbdevRandRInit (pScreen))
-	return FALSE;
+    if (!fbdevRandRInit(pScreen))
+        return FALSE;
 #endif
 
     return TRUE;
 }
 
-
 Bool
-fbdevCreateResources (ScreenPtr pScreen)
+fbdevCreateResources(ScreenPtr pScreen)
 {
-    return fbdevSetShadow (pScreen);
+    return fbdevSetShadow(pScreen);
 }
 
 void
-fbdevPreserve (KdCardInfo *card)
+fbdevPreserve(KdCardInfo * card)
 {
 }
 
 static int
-fbdevUpdateFbColormap(FbdevPriv *priv, int minidx, int maxidx)
+fbdevUpdateFbColormap(FbdevPriv * priv, int minidx, int maxidx)
 {
     struct fb_cmap cmap;
 
@@ -666,89 +638,84 @@ fbdevUpdateFbColormap(FbdevPriv *priv, int minidx, int maxidx)
 }
 
 Bool
-fbdevEnable (ScreenPtr pScreen)
+fbdevEnable(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
-    FbdevPriv		*priv = pScreenPriv->card->driver;
-    int			k;
+    FbdevPriv *priv = pScreenPriv->card->driver;
+    int k;
 
-    priv->var.activate = FB_ACTIVATE_NOW|FB_CHANGE_CMAP_VBL;
+    priv->var.activate = FB_ACTIVATE_NOW | FB_CHANGE_CMAP_VBL;
 
     /* display it on the LCD */
-    k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &priv->var);
-    if (k < 0)
-    {
-	perror ("FBIOPUT_VSCREENINFO");
-	return FALSE;
+    k = ioctl(priv->fd, FBIOPUT_VSCREENINFO, &priv->var);
+    if (k < 0) {
+        perror("FBIOPUT_VSCREENINFO");
+        return FALSE;
     }
 
-    if (priv->fix.visual == FB_VISUAL_DIRECTCOLOR)
-    {
-	int		i;
-
-	for (i = 0;
-	     i < (1 << priv->var.red.length) ||
-	     i < (1 << priv->var.green.length) ||
-	     i < (1 << priv->var.blue.length); i++)
-	{
-	    priv->red[i] = i * 65535 / ((1 << priv->var.red.length) - 1);
-	    priv->green[i] = i * 65535 / ((1 << priv->var.green.length) - 1);
-	    priv->blue[i] = i * 65535 / ((1 << priv->var.blue.length) - 1);
-	}
-
-	fbdevUpdateFbColormap(priv, 0, i);
+    if (priv->fix.visual == FB_VISUAL_DIRECTCOLOR) {
+        int i;
+
+        for (i = 0;
+             i < (1 << priv->var.red.length) ||
+             i < (1 << priv->var.green.length) ||
+             i < (1 << priv->var.blue.length); i++) {
+            priv->red[i] = i * 65535 / ((1 << priv->var.red.length) - 1);
+            priv->green[i] = i * 65535 / ((1 << priv->var.green.length) - 1);
+            priv->blue[i] = i * 65535 / ((1 << priv->var.blue.length) - 1);
+        }
+
+        fbdevUpdateFbColormap(priv, 0, i);
     }
     return TRUE;
 }
 
 Bool
-fbdevDPMS (ScreenPtr pScreen, int mode)
+fbdevDPMS(ScreenPtr pScreen, int mode)
 {
     KdScreenPriv(pScreen);
-    FbdevPriv	*priv = pScreenPriv->card->driver;
+    FbdevPriv *priv = pScreenPriv->card->driver;
     static int oldmode = -1;
 
     if (mode == oldmode)
-	return TRUE;
+        return TRUE;
 #ifdef FBIOPUT_POWERMODE
-    if (ioctl (priv->fd, FBIOPUT_POWERMODE, &mode) >= 0)
-    {
-	oldmode = mode;
-	return TRUE;
+    if (ioctl(priv->fd, FBIOPUT_POWERMODE, &mode) >= 0) {
+        oldmode = mode;
+        return TRUE;
     }
 #endif
 #ifdef FBIOBLANK
-    if (ioctl (priv->fd, FBIOBLANK, mode ? mode + 1 : 0) >= 0)
-    {
-	oldmode = mode;
-	return TRUE;
+    if (ioctl(priv->fd, FBIOBLANK, mode ? mode + 1 : 0) >= 0) {
+        oldmode = mode;
+        return TRUE;
     }
 #endif
     return FALSE;
 }
 
 void
-fbdevDisable (ScreenPtr pScreen)
+fbdevDisable(ScreenPtr pScreen)
 {
 }
 
 void
-fbdevRestore (KdCardInfo *card)
+fbdevRestore(KdCardInfo * card)
 {
 }
 
 void
-fbdevScreenFini (KdScreenInfo *screen)
+fbdevScreenFini(KdScreenInfo * screen)
 {
 }
 
 void
-fbdevCardFini (KdCardInfo *card)
+fbdevCardFini(KdCardInfo * card)
 {
-    FbdevPriv	*priv = card->driver;
+    FbdevPriv *priv = card->driver;
 
-    munmap (priv->fb_base, priv->fix.smem_len);
-    close (priv->fd);
+    munmap(priv->fb_base, priv->fix.smem_len);
+    close(priv->fd);
     free(priv);
 }
 
@@ -756,23 +723,22 @@ fbdevCardFini (KdCardInfo *card)
  * Retrieve actual colormap and return selected n entries in pdefs.
  */
 void
-fbdevGetColors (ScreenPtr pScreen, int n, xColorItem *pdefs)
+fbdevGetColors(ScreenPtr pScreen, int n, xColorItem * pdefs)
 {
     KdScreenPriv(pScreen);
-    FbdevPriv	    *priv = pScreenPriv->card->driver;
-    struct fb_cmap  cmap;
-    int		    p;
-    int		    k;
-    int		    min, max;
+    FbdevPriv *priv = pScreenPriv->card->driver;
+    struct fb_cmap cmap;
+    int p;
+    int k;
+    int min, max;
 
     min = 256;
     max = 0;
-    for (k = 0; k < n; k++)
-    {
-	if (pdefs[k].pixel < min)
-	    min = pdefs[k].pixel;
-	if (pdefs[k].pixel > max)
-	    max = pdefs[k].pixel;
+    for (k = 0; k < n; k++) {
+        if (pdefs[k].pixel < min)
+            min = pdefs[k].pixel;
+        if (pdefs[k].pixel > max)
+            max = pdefs[k].pixel;
     }
     cmap.start = min;
     cmap.len = max - min + 1;
@@ -780,19 +746,17 @@ fbdevGetColors (ScreenPtr pScreen, int n, xColorItem *pdefs)
     cmap.green = &priv->green[min];
     cmap.blue = &priv->blue[min];
     cmap.transp = 0;
-    k = ioctl (priv->fd, FBIOGETCMAP, &cmap);
-    if (k < 0)
-    {
-	perror ("can't get colormap");
-	return;
+    k = ioctl(priv->fd, FBIOGETCMAP, &cmap);
+    if (k < 0) {
+        perror("can't get colormap");
+        return;
     }
-    while (n--)
-    {
-	p = pdefs->pixel;
-	pdefs->red = priv->red[p];
-	pdefs->green = priv->green[p];
-	pdefs->blue = priv->blue[p];
-	pdefs++;
+    while (n--) {
+        p = pdefs->pixel;
+        pdefs->red = priv->red[p];
+        pdefs->green = priv->green[p];
+        pdefs->blue = priv->blue[p];
+        pdefs++;
     }
 }
 
@@ -800,26 +764,25 @@ fbdevGetColors (ScreenPtr pScreen, int n, xColorItem *pdefs)
  * Change colormap by updating n entries described in pdefs.
  */
 void
-fbdevPutColors (ScreenPtr pScreen, int n, xColorItem *pdefs)
+fbdevPutColors(ScreenPtr pScreen, int n, xColorItem * pdefs)
 {
     KdScreenPriv(pScreen);
-    FbdevPriv	*priv = pScreenPriv->card->driver;
-    int		    p;
-    int		    min, max;
+    FbdevPriv *priv = pScreenPriv->card->driver;
+    int p;
+    int min, max;
 
     min = 256;
     max = 0;
-    while (n--)
-    {
-	p = pdefs->pixel;
-	priv->red[p] = pdefs->red;
-	priv->green[p] = pdefs->green;
-	priv->blue[p] = pdefs->blue;
-	if (p < min)
-	    min = p;
-	if (p > max)
-	    max = p;
-	pdefs++;
+    while (n--) {
+        p = pdefs->pixel;
+        priv->red[p] = pdefs->red;
+        priv->green[p] = pdefs->green;
+        priv->blue[p] = pdefs->blue;
+        if (p < min)
+            min = p;
+        if (p > max)
+            max = p;
+        pdefs++;
     }
 
     fbdevUpdateFbColormap(priv, min, max);
diff --git a/xorg-server/hw/kdrive/fbdev/fbinit.c b/xorg-server/hw/kdrive/fbdev/fbinit.c
index 1d66fce32..d2a14019d 100644
--- a/xorg-server/hw/kdrive/fbdev/fbinit.c
+++ b/xorg-server/hw/kdrive/fbdev/fbinit.c
@@ -26,82 +26,80 @@
 #include <fbdev.h>
 
 void
-InitCard (char *name)
+InitCard(char *name)
 {
-    KdCardInfoAdd (&fbdevFuncs, 0);
+    KdCardInfoAdd(&fbdevFuncs, 0);
 }
 
 void
-InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv)
+InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
 {
-    KdInitOutput (pScreenInfo, argc, argv);
+    KdInitOutput(pScreenInfo, argc, argv);
 }
 
 void
-InitInput (int argc, char **argv)
+InitInput(int argc, char **argv)
 {
-    KdOsAddInputDrivers ();
-    KdInitInput ();
+    KdOsAddInputDrivers();
+    KdInitInput();
 }
 
 void
-CloseInput (void)
+CloseInput(void)
 {
-    KdCloseInput ();
+    KdCloseInput();
 }
 
 void
-ddxUseMsg (void)
+ddxUseMsg(void)
 {
-  KdUseMsg();
-  ErrorF("\nXfbdev Device Usage:\n");
-  ErrorF("-fb path         Framebuffer device to use. Defaults to /dev/fb0\n");
-  ErrorF("\n");
+    KdUseMsg();
+    ErrorF("\nXfbdev Device Usage:\n");
+    ErrorF
+        ("-fb path         Framebuffer device to use. Defaults to /dev/fb0\n");
+    ErrorF("\n");
 }
 
 int
-ddxProcessArgument (int argc, char **argv, int i)
+ddxProcessArgument(int argc, char **argv, int i)
 {
-  if (!strcmp (argv[i], "-fb"))
-    {
-      if (i+1 < argc)
-	{
-	  fbdevDevicePath = argv[i+1];
-	  return 2;
-	}
-      UseMsg();
-      exit(1);
+    if (!strcmp(argv[i], "-fb")) {
+        if (i + 1 < argc) {
+            fbdevDevicePath = argv[i + 1];
+            return 2;
+        }
+        UseMsg();
+        exit(1);
     }
 
-  return KdProcessArgument (argc, argv, i);
+    return KdProcessArgument(argc, argv, i);
 }
 
+KdCardFuncs fbdevFuncs = {
+    fbdevCardInit,              /* cardinit */
+    fbdevScreenInit,            /* scrinit */
+    fbdevInitScreen,            /* initScreen */
+    fbdevFinishInitScreen,      /* finishInitScreen */
+    fbdevCreateResources,       /* createRes */
+    fbdevPreserve,              /* preserve */
+    fbdevEnable,                /* enable */
+    fbdevDPMS,                  /* dpms */
+    fbdevDisable,               /* disable */
+    fbdevRestore,               /* restore */
+    fbdevScreenFini,            /* scrfini */
+    fbdevCardFini,              /* cardfini */
 
-KdCardFuncs	fbdevFuncs = {
-    fbdevCardInit,	    /* cardinit */
-    fbdevScreenInit,	    /* scrinit */
-    fbdevInitScreen,	    /* initScreen */
-    fbdevFinishInitScreen,  /* finishInitScreen */
-    fbdevCreateResources,   /* createRes */
-    fbdevPreserve,	    /* preserve */
-    fbdevEnable,	    /* enable */
-    fbdevDPMS,		    /* dpms */
-    fbdevDisable,	    /* disable */
-    fbdevRestore,	    /* restore */
-    fbdevScreenFini,	    /* scrfini */
-    fbdevCardFini,	    /* cardfini */
+    0,                          /* initCursor */
+    0,                          /* enableCursor */
+    0,                          /* disableCursor */
+    0,                          /* finiCursor */
+    0,                          /* recolorCursor */
 
-    0,			    /* initCursor */
-    0,			    /* enableCursor */
-    0,			    /* disableCursor */
-    0,			    /* finiCursor */
-    0,			    /* recolorCursor */
+    0,                          /* initAccel */
+    0,                          /* enableAccel */
+    0,                          /* disableAccel */
+    0,                          /* finiAccel */
 
-    0,			    /* initAccel */
-    0,			    /* enableAccel */
-    0,			    /* disableAccel */
-    0,			    /* finiAccel */
-
-    fbdevGetColors,    	    /* getColors */
-    fbdevPutColors,	    /* putColors */
+    fbdevGetColors,             /* getColors */
+    fbdevPutColors,             /* putColors */
 };
diff --git a/xorg-server/hw/kdrive/linux/evdev.c b/xorg-server/hw/kdrive/linux/evdev.c
index 20df77b99..9982fad36 100644
--- a/xorg-server/hw/kdrive/linux/evdev.c
+++ b/xorg-server/hw/kdrive/linux/evdev.c
@@ -1,539 +1,519 @@
-/*

- * Copyright © 2004 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_CONFIG_H

-#include <kdrive-config.h>

-#endif

-#include <errno.h>

-#include <linux/input.h>

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include <X11/Xpoll.h>

-#include "inputstr.h"

-#include "scrnintstr.h"

-#include "kdrive.h"

-

-#define NUM_EVENTS  128

-#define ABS_UNSET   -65535

-

-#define BITS_PER_LONG (sizeof(long) * 8)

-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)

-#define ISBITSET(x,y) ((x)[LONG(y)] & BIT(y))

-#define OFF(x)   ((x)%BITS_PER_LONG)

-#define LONG(x)  ((x)/BITS_PER_LONG)

-#define BIT(x)         (1 << OFF(x))

-

-typedef struct _kevdev {

-    /* current device state */

-    int                            rel[REL_MAX + 1];

-    int                            abs[ABS_MAX + 1];

-    int                            prevabs[ABS_MAX + 1];

-    long                    key[NBITS(KEY_MAX + 1)];

-

-    /* supported device info */

-    long                    relbits[NBITS(REL_MAX + 1)];

-    long                    absbits[NBITS(ABS_MAX + 1)];

-    long                    keybits[NBITS(KEY_MAX + 1)];

-    struct input_absinfo    absinfo[ABS_MAX + 1];

-    int                            max_rel;

-    int                            max_abs;

-

-    int                     fd;

-} Kevdev;

-

-static void

-EvdevPtrBtn (KdPointerInfo    *pi, struct input_event *ev)

-{

-    int flags = KD_MOUSE_DELTA | pi->buttonState;

-

-    if (ev->code >= BTN_MOUSE && ev->code < BTN_JOYSTICK) {

-        switch (ev->code) {

-        case BTN_LEFT:

-            if (ev->value == 1)

-                flags |= KD_BUTTON_1;

-	    else

-                flags &= ~KD_BUTTON_1;

-             break;

-        case BTN_MIDDLE:

-            if (ev->value == 1)

-                flags |= KD_BUTTON_2;

-	    else

-		flags &= ~KD_BUTTON_2;

-            break;

-        case BTN_RIGHT:

-            if (ev->value == 1)

-                flags |= KD_BUTTON_3;

-	    else

-		flags &= ~KD_BUTTON_3;

-            break;

-        default:

-            /* Unknow button */

-            break;

-        }

-

-        KdEnqueuePointerEvent (pi, flags, 0, 0, 0);

-    }

-}

-static void

-EvdevPtrMotion (KdPointerInfo    *pi, struct input_event *ev)

-{

-    Kevdev                *ke = pi->driverPrivate;

-    int i;

-    int flags = KD_MOUSE_DELTA | pi->buttonState;

-

-    for (i = 0; i <= ke->max_rel; i++)

-        if (ke->rel[i])

-        {

-            int a;

-            for (a = 0; a <= ke->max_rel; a++)

-            {

-                if (ISBITSET (ke->relbits, a))

-		{

-                    if (a == 0)

-                        KdEnqueuePointerEvent(pi, flags, ke->rel[a], 0, 0);

-                    else if (a == 1)

-                        KdEnqueuePointerEvent(pi, flags, 0, ke->rel[a], 0);

-                }

-		ke->rel[a] = 0;

-            }

-            break;

-        }

-    for (i = 0; i < ke->max_abs; i++)

-        if (ke->abs[i] != ke->prevabs[i])

-        {

-            int a;

-            ErrorF ("abs");

-            for (a = 0; a <= ke->max_abs; a++)

-            {

-                if (ISBITSET (ke->absbits, a))

-                    ErrorF (" %d=%d", a, ke->abs[a]);

-                ke->prevabs[a] = ke->abs[a];

-            }

-            ErrorF ("\n");

-            break;

-        }

-

-    if (ev->code == REL_WHEEL) {

-      for (i = 0; i < abs (ev->value); i++)

-      {

-        if (ev->value > 0)

-          flags |= KD_BUTTON_4;

-        else

-          flags |= KD_BUTTON_5;

-

-        KdEnqueuePointerEvent (pi, flags, 0, 0, 0);

-

-        if (ev->value > 0)

-          flags &= ~KD_BUTTON_4;

-        else

-          flags &= ~KD_BUTTON_5;

-

-        KdEnqueuePointerEvent (pi, flags, 0, 0, 0);

-      }

-    }

-

-}

-

-static void

-EvdevPtrRead (int evdevPort, void *closure)

-{

-    KdPointerInfo                *pi = closure;

-    Kevdev                       *ke = pi->driverPrivate;

-    int                        i;

-    struct input_event        events[NUM_EVENTS];

-    int                        n;

-

-    n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));

-    if (n <= 0) {

-        if (errno == ENODEV)

-            DeleteInputDeviceRequest(pi->dixdev);

-        return;

-    }

-

-    n /= sizeof (struct input_event);

-    for (i = 0; i < n; i++)

-    {

-        switch (events[i].type) {

-        case EV_SYN:

-            break;

-        case EV_KEY:

-            EvdevPtrBtn (pi, &events[i]);

-            break;

-        case EV_REL:

-            ke->rel[events[i].code] += events[i].value;

-            EvdevPtrMotion (pi, &events[i]);

-            break;

-        case EV_ABS:

-            ke->abs[events[i].code] = events[i].value;

-            EvdevPtrMotion (pi, &events[i]);

-            break;

-        }

-    }

-}

-

-char *kdefaultEvdev[] =  {

-    "/dev/input/event0",

-    "/dev/input/event1",

-    "/dev/input/event2",

-    "/dev/input/event3",

-};

-

-#define NUM_DEFAULT_EVDEV    (sizeof (kdefaultEvdev) / sizeof (kdefaultEvdev[0]))

-

-static Status

-EvdevPtrInit (KdPointerInfo *pi)

-{

-    int                i;

-    int                fd;

-

-    if (!pi->path) {

-        for (i = 0; i < NUM_DEFAULT_EVDEV; i++) {

-            fd = open (kdefaultEvdev[i], 2);

-            if (fd >= 0) {

-                pi->path = strdup (kdefaultEvdev[i]);

-                break;

-            }

-        }

-    }

-    else {

-        fd = open (pi->path, O_RDWR);

-        if (fd < 0) {

-            ErrorF("Failed to open evdev device %s\n", pi->path);

-            return BadMatch;

-        }

-    }

-

-    close(fd);

-

-    pi->name = strdup("Evdev mouse");

-

-    return Success;

-}

-

-static Status

-EvdevPtrEnable (KdPointerInfo *pi)

-{

-    int fd;

-    unsigned long   ev[NBITS(EV_MAX)];

-    Kevdev            *ke;

-

-    if (!pi || !pi->path)

-        return BadImplementation;

-

-    fd = open(pi->path, 2);

-    if (fd < 0)

-        return BadMatch;

-

-    if (ioctl (fd, EVIOCGRAB, 1) < 0)

-        perror ("Grabbing evdev mouse device failed");

-

-    if (ioctl (fd, EVIOCGBIT(0 /*EV*/, sizeof (ev)), ev) < 0)

-    {

-        perror ("EVIOCGBIT 0");

-        close (fd);

-        return BadMatch;

-    }

-    ke = calloc(1, sizeof (Kevdev));

-    if (!ke)

-    {

-        close (fd);

-        return BadAlloc;

-    }

-    if (ISBITSET (ev, EV_KEY))

-    {

-        if (ioctl (fd, EVIOCGBIT (EV_KEY, sizeof (ke->keybits)),

-                   ke->keybits) < 0)

-        {

-            perror ("EVIOCGBIT EV_KEY");

-            free(ke);

-            close (fd);

-            return BadMatch;

-        }

-    }

-    if (ISBITSET (ev, EV_REL))

-    {

-        if (ioctl (fd, EVIOCGBIT (EV_REL, sizeof (ke->relbits)),

-                       ke->relbits) < 0)

-        {

-            perror ("EVIOCGBIT EV_REL");

-            free(ke);

-            close (fd);

-            return BadMatch;

-        }

-        for (ke->max_rel = REL_MAX; ke->max_rel >= 0; ke->max_rel--)

-            if (ISBITSET(ke->relbits, ke->max_rel))

-                break;

-    }

-    if (ISBITSET (ev, EV_ABS))

-    {

-        int i;

-

-        if (ioctl (fd, EVIOCGBIT (EV_ABS, sizeof (ke->absbits)),

-                   ke->absbits) < 0)

-            {

-            perror ("EVIOCGBIT EV_ABS");

-            free(ke);

-            close (fd);

-            return BadMatch;

-        }

-        for (ke->max_abs = ABS_MAX; ke->max_abs >= 0; ke->max_abs--)

-            if (ISBITSET(ke->absbits, ke->max_abs))

-                break;

-        for (i = 0; i <= ke->max_abs; i++)

-        {

-            if (ISBITSET (ke->absbits, i))

-                if (ioctl (fd, EVIOCGABS(i), &ke->absinfo[i]) < 0)

-                {

-                    perror ("EVIOCGABS");

-                    break;

-                }

-            ke->prevabs[i] = ABS_UNSET;

-        }

-        if (i <= ke->max_abs)

-        {

-            free(ke);

-            close (fd);

-            return BadValue;

-        }

-    }

-    if (!KdRegisterFd (fd, EvdevPtrRead, pi)) {

-        free(ke);

-        close (fd);

-        return BadAlloc;

-    }

-    pi->driverPrivate = ke;

-    ke->fd = fd;

-

-    return Success;

-}

-

-static void

-EvdevPtrDisable (KdPointerInfo *pi)

-{

-    Kevdev              *ke;

-

-    ke = pi->driverPrivate;

-

-    if (!pi || !pi->driverPrivate)

-        return;

-

-    KdUnregisterFd (pi, ke->fd, TRUE);

-

-    if (ioctl (ke->fd, EVIOCGRAB, 0) < 0)

-        perror ("Ungrabbing evdev mouse device failed");

-

-    free(ke);

-    pi->driverPrivate = 0;

-}

-

-static void

-EvdevPtrFini (KdPointerInfo *pi)

-{

-}

-

-

-/*

- * Evdev keyboard functions

- */

-

-static void

-readMapping (KdKeyboardInfo *ki)

-{

-    if (!ki)

-        return;

-

-    ki->minScanCode = 0;

-    ki->maxScanCode = 247;

-}

-

-static void

-EvdevKbdRead (int evdevPort, void *closure)

-{

-    KdKeyboardInfo	 *ki = closure;

-    struct input_event	 events[NUM_EVENTS];

-    int			 i, n;

-

-    n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));

-    if (n <= 0) {

-        if (errno == ENODEV)

-            DeleteInputDeviceRequest(ki->dixdev);

-        return;

-    }

-

-    n /= sizeof (struct input_event);

-    for (i = 0; i < n; i++)

-    {

-        if (events[i].type == EV_KEY)

-	    KdEnqueueKeyboardEvent (ki, events[i].code, !events[i].value);

-/* FIXME: must implement other types of events

-        else

-            ErrorF("Event type (%d) not delivered\n", events[i].type);

-*/

-    }

-}

-

-static Status

-EvdevKbdInit (KdKeyboardInfo *ki)

-{

-    int fd;

-

-    if (!ki->path) {

-        ErrorF("Couldn't find evdev device path\n");

-        return BadValue;

-    }

-    else {

-        fd = open (ki->path, O_RDWR);

-        if (fd < 0) {

-            ErrorF("Failed to open evdev device %s\n", ki->path);

-            return BadMatch;

-        }

-    }

-

-    close (fd);

-

-    ki->name = strdup("Evdev keyboard");

-

-    readMapping(ki);

-

-    return Success;

-}

-

-static Status

-EvdevKbdEnable (KdKeyboardInfo *ki)

-{

-    unsigned long       ev[NBITS(EV_MAX)];

-    Kevdev              *ke;

-    int                 fd;

-

-    if (!ki || !ki->path)

-        return BadImplementation;

-

-    fd = open(ki->path, O_RDWR);

-    if (fd < 0)

-        return BadMatch;

-

-    if (ioctl (fd, EVIOCGRAB, 1) < 0)

-        perror ("Grabbing evdev keyboard device failed");

-

-    if (ioctl (fd, EVIOCGBIT(0 /*EV*/, sizeof (ev)), ev) < 0) {

-        perror ("EVIOCGBIT 0");

-        close (fd);

-        return BadMatch;

-    }

-

-    ke = calloc(1, sizeof (Kevdev));

-    if (!ke) {

-        close (fd);

-        return BadAlloc;

-    }

-

-    if (!KdRegisterFd (fd, EvdevKbdRead, ki)) {

-        free(ke);

-        close (fd);

-        return BadAlloc;

-    }

-    ki->driverPrivate = ke;

-    ke->fd = fd;

-

-    return Success;

-}

-

-static void

-EvdevKbdLeds (KdKeyboardInfo *ki, int leds)

-{

-/*    struct input_event event;

-    Kevdev             *ke;

-

-    ki->driverPrivate = ke;

-

-    memset(&event, 0, sizeof(event));

-

-    event.type = EV_LED;

-    event.code = LED_CAPSL;

-    event.value = leds & (1 << 0) ? 1 : 0;

-    write(ke->fd, (char *) &event, sizeof(event));

-

-    event.type = EV_LED;

-    event.code = LED_NUML;

-    event.value = leds & (1 << 1) ? 1 : 0;

-    write(ke->fd, (char *) &event, sizeof(event));

-

-    event.type = EV_LED;

-    event.code = LED_SCROLLL;

-    event.value = leds & (1 << 2) ? 1 : 0;

-    write(ke->fd, (char *) &event, sizeof(event));

-

-    event.type = EV_LED;

-    event.code = LED_COMPOSE;

-    event.value = leds & (1 << 3) ? 1 : 0;

-    write(ke->fd, (char *) &event, sizeof(event));

-*/

-}

-

-static void

-EvdevKbdBell (KdKeyboardInfo *ki, int volume, int frequency, int duration)

-{

-}

-

-static void

-EvdevKbdDisable (KdKeyboardInfo *ki)

-{

-    Kevdev              *ke;

-

-    ke = ki->driverPrivate;

-

-    if (!ki || !ki->driverPrivate)

-        return;

-

-    KdUnregisterFd (ki, ke->fd, TRUE);

-

-    if (ioctl (ke->fd, EVIOCGRAB, 0) < 0)

-        perror ("Ungrabbing evdev keyboard device failed");

-

-    free(ke);

-    ki->driverPrivate = 0;

-}

-

-static void

-EvdevKbdFini (KdKeyboardInfo *ki)

-{

-}

-

-KdPointerDriver LinuxEvdevMouseDriver = {

-    "evdev",

-    EvdevPtrInit,

-    EvdevPtrEnable,

-    EvdevPtrDisable,

-    EvdevPtrFini,

-    NULL,

-};

-

-KdKeyboardDriver LinuxEvdevKeyboardDriver = {

-    "evdev",

-    EvdevKbdInit,

-    EvdevKbdEnable,

-    EvdevKbdLeds,

-    EvdevKbdBell,

-    EvdevKbdDisable,

-    EvdevKbdFini,

-    NULL,

-};

+/*
+ * Copyright © 2004 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_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include <errno.h>
+#include <linux/input.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xpoll.h>
+#include "inputstr.h"
+#include "scrnintstr.h"
+#include "kdrive.h"
+
+#define NUM_EVENTS  128
+#define ABS_UNSET   -65535
+
+#define BITS_PER_LONG (sizeof(long) * 8)
+#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
+#define ISBITSET(x,y) ((x)[LONG(y)] & BIT(y))
+#define OFF(x)   ((x)%BITS_PER_LONG)
+#define LONG(x)  ((x)/BITS_PER_LONG)
+#define BIT(x)         (1 << OFF(x))
+
+typedef struct _kevdev {
+    /* current device state */
+    int rel[REL_MAX + 1];
+    int abs[ABS_MAX + 1];
+    int prevabs[ABS_MAX + 1];
+    long key[NBITS(KEY_MAX + 1)];
+
+    /* supported device info */
+    long relbits[NBITS(REL_MAX + 1)];
+    long absbits[NBITS(ABS_MAX + 1)];
+    long keybits[NBITS(KEY_MAX + 1)];
+    struct input_absinfo absinfo[ABS_MAX + 1];
+    int max_rel;
+    int max_abs;
+
+    int fd;
+} Kevdev;
+
+static void
+EvdevPtrBtn(KdPointerInfo * pi, struct input_event *ev)
+{
+    int flags = KD_MOUSE_DELTA | pi->buttonState;
+
+    if (ev->code >= BTN_MOUSE && ev->code < BTN_JOYSTICK) {
+        switch (ev->code) {
+        case BTN_LEFT:
+            if (ev->value == 1)
+                flags |= KD_BUTTON_1;
+            else
+                flags &= ~KD_BUTTON_1;
+            break;
+        case BTN_MIDDLE:
+            if (ev->value == 1)
+                flags |= KD_BUTTON_2;
+            else
+                flags &= ~KD_BUTTON_2;
+            break;
+        case BTN_RIGHT:
+            if (ev->value == 1)
+                flags |= KD_BUTTON_3;
+            else
+                flags &= ~KD_BUTTON_3;
+            break;
+        default:
+            /* Unknow button */
+            break;
+        }
+
+        KdEnqueuePointerEvent(pi, flags, 0, 0, 0);
+    }
+}
+
+static void
+EvdevPtrMotion(KdPointerInfo * pi, struct input_event *ev)
+{
+    Kevdev *ke = pi->driverPrivate;
+    int i;
+    int flags = KD_MOUSE_DELTA | pi->buttonState;
+
+    for (i = 0; i <= ke->max_rel; i++)
+        if (ke->rel[i]) {
+            int a;
+
+            for (a = 0; a <= ke->max_rel; a++) {
+                if (ISBITSET(ke->relbits, a)) {
+                    if (a == 0)
+                        KdEnqueuePointerEvent(pi, flags, ke->rel[a], 0, 0);
+                    else if (a == 1)
+                        KdEnqueuePointerEvent(pi, flags, 0, ke->rel[a], 0);
+                }
+                ke->rel[a] = 0;
+            }
+            break;
+        }
+    for (i = 0; i < ke->max_abs; i++)
+        if (ke->abs[i] != ke->prevabs[i]) {
+            int a;
+
+            ErrorF("abs");
+            for (a = 0; a <= ke->max_abs; a++) {
+                if (ISBITSET(ke->absbits, a))
+                    ErrorF(" %d=%d", a, ke->abs[a]);
+                ke->prevabs[a] = ke->abs[a];
+            }
+            ErrorF("\n");
+            break;
+        }
+
+    if (ev->code == REL_WHEEL) {
+        for (i = 0; i < abs(ev->value); i++) {
+            if (ev->value > 0)
+                flags |= KD_BUTTON_4;
+            else
+                flags |= KD_BUTTON_5;
+
+            KdEnqueuePointerEvent(pi, flags, 0, 0, 0);
+
+            if (ev->value > 0)
+                flags &= ~KD_BUTTON_4;
+            else
+                flags &= ~KD_BUTTON_5;
+
+            KdEnqueuePointerEvent(pi, flags, 0, 0, 0);
+        }
+    }
+
+}
+
+static void
+EvdevPtrRead(int evdevPort, void *closure)
+{
+    KdPointerInfo *pi = closure;
+    Kevdev *ke = pi->driverPrivate;
+    int i;
+    struct input_event events[NUM_EVENTS];
+    int n;
+
+    n = read(evdevPort, &events, NUM_EVENTS * sizeof(struct input_event));
+    if (n <= 0) {
+        if (errno == ENODEV)
+            DeleteInputDeviceRequest(pi->dixdev);
+        return;
+    }
+
+    n /= sizeof(struct input_event);
+    for (i = 0; i < n; i++) {
+        switch (events[i].type) {
+        case EV_SYN:
+            break;
+        case EV_KEY:
+            EvdevPtrBtn(pi, &events[i]);
+            break;
+        case EV_REL:
+            ke->rel[events[i].code] += events[i].value;
+            EvdevPtrMotion(pi, &events[i]);
+            break;
+        case EV_ABS:
+            ke->abs[events[i].code] = events[i].value;
+            EvdevPtrMotion(pi, &events[i]);
+            break;
+        }
+    }
+}
+
+char *kdefaultEvdev[] = {
+    "/dev/input/event0",
+    "/dev/input/event1",
+    "/dev/input/event2",
+    "/dev/input/event3",
+};
+
+#define NUM_DEFAULT_EVDEV    (sizeof (kdefaultEvdev) / sizeof (kdefaultEvdev[0]))
+
+static Status
+EvdevPtrInit(KdPointerInfo * pi)
+{
+    int i;
+    int fd;
+
+    if (!pi->path) {
+        for (i = 0; i < NUM_DEFAULT_EVDEV; i++) {
+            fd = open(kdefaultEvdev[i], 2);
+            if (fd >= 0) {
+                pi->path = strdup(kdefaultEvdev[i]);
+                break;
+            }
+        }
+    }
+    else {
+        fd = open(pi->path, O_RDWR);
+        if (fd < 0) {
+            ErrorF("Failed to open evdev device %s\n", pi->path);
+            return BadMatch;
+        }
+    }
+
+    close(fd);
+
+    pi->name = strdup("Evdev mouse");
+
+    return Success;
+}
+
+static Status
+EvdevPtrEnable(KdPointerInfo * pi)
+{
+    int fd;
+    unsigned long ev[NBITS(EV_MAX)];
+    Kevdev *ke;
+
+    if (!pi || !pi->path)
+        return BadImplementation;
+
+    fd = open(pi->path, 2);
+    if (fd < 0)
+        return BadMatch;
+
+    if (ioctl(fd, EVIOCGRAB, 1) < 0)
+        perror("Grabbing evdev mouse device failed");
+
+    if (ioctl(fd, EVIOCGBIT(0 /*EV*/, sizeof(ev)), ev) < 0) {
+        perror("EVIOCGBIT 0");
+        close(fd);
+        return BadMatch;
+    }
+    ke = calloc(1, sizeof(Kevdev));
+    if (!ke) {
+        close(fd);
+        return BadAlloc;
+    }
+    if (ISBITSET(ev, EV_KEY)) {
+        if (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(ke->keybits)), ke->keybits) < 0) {
+            perror("EVIOCGBIT EV_KEY");
+            free(ke);
+            close(fd);
+            return BadMatch;
+        }
+    }
+    if (ISBITSET(ev, EV_REL)) {
+        if (ioctl(fd, EVIOCGBIT(EV_REL, sizeof(ke->relbits)), ke->relbits) < 0) {
+            perror("EVIOCGBIT EV_REL");
+            free(ke);
+            close(fd);
+            return BadMatch;
+        }
+        for (ke->max_rel = REL_MAX; ke->max_rel >= 0; ke->max_rel--)
+            if (ISBITSET(ke->relbits, ke->max_rel))
+                break;
+    }
+    if (ISBITSET(ev, EV_ABS)) {
+        int i;
+
+        if (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(ke->absbits)), ke->absbits) < 0) {
+            perror("EVIOCGBIT EV_ABS");
+            free(ke);
+            close(fd);
+            return BadMatch;
+        }
+        for (ke->max_abs = ABS_MAX; ke->max_abs >= 0; ke->max_abs--)
+            if (ISBITSET(ke->absbits, ke->max_abs))
+                break;
+        for (i = 0; i <= ke->max_abs; i++) {
+            if (ISBITSET(ke->absbits, i))
+                if (ioctl(fd, EVIOCGABS(i), &ke->absinfo[i]) < 0) {
+                    perror("EVIOCGABS");
+                    break;
+                }
+            ke->prevabs[i] = ABS_UNSET;
+        }
+        if (i <= ke->max_abs) {
+            free(ke);
+            close(fd);
+            return BadValue;
+        }
+    }
+    if (!KdRegisterFd(fd, EvdevPtrRead, pi)) {
+        free(ke);
+        close(fd);
+        return BadAlloc;
+    }
+    pi->driverPrivate = ke;
+    ke->fd = fd;
+
+    return Success;
+}
+
+static void
+EvdevPtrDisable(KdPointerInfo * pi)
+{
+    Kevdev *ke;
+
+    ke = pi->driverPrivate;
+
+    if (!pi || !pi->driverPrivate)
+        return;
+
+    KdUnregisterFd(pi, ke->fd, TRUE);
+
+    if (ioctl(ke->fd, EVIOCGRAB, 0) < 0)
+        perror("Ungrabbing evdev mouse device failed");
+
+    free(ke);
+    pi->driverPrivate = 0;
+}
+
+static void
+EvdevPtrFini(KdPointerInfo * pi)
+{
+}
+
+/*
+ * Evdev keyboard functions
+ */
+
+static void
+readMapping(KdKeyboardInfo * ki)
+{
+    if (!ki)
+        return;
+
+    ki->minScanCode = 0;
+    ki->maxScanCode = 247;
+}
+
+static void
+EvdevKbdRead(int evdevPort, void *closure)
+{
+    KdKeyboardInfo *ki = closure;
+    struct input_event events[NUM_EVENTS];
+    int i, n;
+
+    n = read(evdevPort, &events, NUM_EVENTS * sizeof(struct input_event));
+    if (n <= 0) {
+        if (errno == ENODEV)
+            DeleteInputDeviceRequest(ki->dixdev);
+        return;
+    }
+
+    n /= sizeof(struct input_event);
+    for (i = 0; i < n; i++) {
+        if (events[i].type == EV_KEY)
+            KdEnqueueKeyboardEvent(ki, events[i].code, !events[i].value);
+/* FIXME: must implement other types of events
+        else
+            ErrorF("Event type (%d) not delivered\n", events[i].type);
+*/
+    }
+}
+
+static Status
+EvdevKbdInit(KdKeyboardInfo * ki)
+{
+    int fd;
+
+    if (!ki->path) {
+        ErrorF("Couldn't find evdev device path\n");
+        return BadValue;
+    }
+    else {
+        fd = open(ki->path, O_RDWR);
+        if (fd < 0) {
+            ErrorF("Failed to open evdev device %s\n", ki->path);
+            return BadMatch;
+        }
+    }
+
+    close(fd);
+
+    ki->name = strdup("Evdev keyboard");
+
+    readMapping(ki);
+
+    return Success;
+}
+
+static Status
+EvdevKbdEnable(KdKeyboardInfo * ki)
+{
+    unsigned long ev[NBITS(EV_MAX)];
+    Kevdev *ke;
+    int fd;
+
+    if (!ki || !ki->path)
+        return BadImplementation;
+
+    fd = open(ki->path, O_RDWR);
+    if (fd < 0)
+        return BadMatch;
+
+    if (ioctl(fd, EVIOCGRAB, 1) < 0)
+        perror("Grabbing evdev keyboard device failed");
+
+    if (ioctl(fd, EVIOCGBIT(0 /*EV*/, sizeof(ev)), ev) < 0) {
+        perror("EVIOCGBIT 0");
+        close(fd);
+        return BadMatch;
+    }
+
+    ke = calloc(1, sizeof(Kevdev));
+    if (!ke) {
+        close(fd);
+        return BadAlloc;
+    }
+
+    if (!KdRegisterFd(fd, EvdevKbdRead, ki)) {
+        free(ke);
+        close(fd);
+        return BadAlloc;
+    }
+    ki->driverPrivate = ke;
+    ke->fd = fd;
+
+    return Success;
+}
+
+static void
+EvdevKbdLeds(KdKeyboardInfo * ki, int leds)
+{
+/*    struct input_event event;
+    Kevdev             *ke;
+
+    ki->driverPrivate = ke;
+
+    memset(&event, 0, sizeof(event));
+
+    event.type = EV_LED;
+    event.code = LED_CAPSL;
+    event.value = leds & (1 << 0) ? 1 : 0;
+    write(ke->fd, (char *) &event, sizeof(event));
+
+    event.type = EV_LED;
+    event.code = LED_NUML;
+    event.value = leds & (1 << 1) ? 1 : 0;
+    write(ke->fd, (char *) &event, sizeof(event));
+
+    event.type = EV_LED;
+    event.code = LED_SCROLLL;
+    event.value = leds & (1 << 2) ? 1 : 0;
+    write(ke->fd, (char *) &event, sizeof(event));
+
+    event.type = EV_LED;
+    event.code = LED_COMPOSE;
+    event.value = leds & (1 << 3) ? 1 : 0;
+    write(ke->fd, (char *) &event, sizeof(event));
+*/
+}
+
+static void
+EvdevKbdBell(KdKeyboardInfo * ki, int volume, int frequency, int duration)
+{
+}
+
+static void
+EvdevKbdDisable(KdKeyboardInfo * ki)
+{
+    Kevdev *ke;
+
+    ke = ki->driverPrivate;
+
+    if (!ki || !ki->driverPrivate)
+        return;
+
+    KdUnregisterFd(ki, ke->fd, TRUE);
+
+    if (ioctl(ke->fd, EVIOCGRAB, 0) < 0)
+        perror("Ungrabbing evdev keyboard device failed");
+
+    free(ke);
+    ki->driverPrivate = 0;
+}
+
+static void
+EvdevKbdFini(KdKeyboardInfo * ki)
+{
+}
+
+KdPointerDriver LinuxEvdevMouseDriver = {
+    "evdev",
+    EvdevPtrInit,
+    EvdevPtrEnable,
+    EvdevPtrDisable,
+    EvdevPtrFini,
+    NULL,
+};
+
+KdKeyboardDriver LinuxEvdevKeyboardDriver = {
+    "evdev",
+    EvdevKbdInit,
+    EvdevKbdEnable,
+    EvdevKbdLeds,
+    EvdevKbdBell,
+    EvdevKbdDisable,
+    EvdevKbdFini,
+    NULL,
+};
diff --git a/xorg-server/hw/kdrive/linux/keyboard.c b/xorg-server/hw/kdrive/linux/keyboard.c
index ba2637b58..9a6ee2d93 100644
--- a/xorg-server/hw/kdrive/linux/keyboard.c
+++ b/xorg-server/hw/kdrive/linux/keyboard.c
@@ -44,70 +44,70 @@
 extern int LinuxConsoleFd;
 
 static const KeySym linux_to_x[256] = {
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	XK_BackSpace,	XK_Tab,		XK_Linefeed,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	XK_Escape,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	XK_space,	XK_exclam,	XK_quotedbl,	XK_numbersign,
-	XK_dollar,	XK_percent,	XK_ampersand,	XK_apostrophe,
-	XK_parenleft,	XK_parenright,	XK_asterisk,	XK_plus,
-	XK_comma,	XK_minus,	XK_period,	XK_slash,
-	XK_0,		XK_1,		XK_2,		XK_3,
-	XK_4,		XK_5,		XK_6,		XK_7,
-	XK_8,		XK_9,		XK_colon,	XK_semicolon,
-	XK_less,	XK_equal,	XK_greater,	XK_question,
-	XK_at,		XK_A,		XK_B,		XK_C,
-	XK_D,		XK_E,		XK_F,		XK_G,
-	XK_H,		XK_I,		XK_J,		XK_K,
-	XK_L,		XK_M,		XK_N,		XK_O,
-	XK_P,		XK_Q,		XK_R,		XK_S,
-	XK_T,		XK_U,		XK_V,		XK_W,
-	XK_X,		XK_Y,		XK_Z,		XK_bracketleft,
-	XK_backslash,	XK_bracketright,XK_asciicircum,	XK_underscore,
-	XK_grave,	XK_a,		XK_b,		XK_c,
-	XK_d,		XK_e,		XK_f,		XK_g,
-	XK_h,		XK_i,		XK_j,		XK_k,
-	XK_l,		XK_m,		XK_n,		XK_o,
-	XK_p,		XK_q,		XK_r,		XK_s,
-	XK_t,		XK_u,		XK_v,		XK_w,
-	XK_x,		XK_y,		XK_z,		XK_braceleft,
-	XK_bar,		XK_braceright,	XK_asciitilde,	XK_BackSpace,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	XK_nobreakspace,XK_exclamdown,	XK_cent,	XK_sterling,
-	XK_currency,	XK_yen,		XK_brokenbar,	XK_section,
-	XK_diaeresis,	XK_copyright,	XK_ordfeminine,	XK_guillemotleft,
-	XK_notsign,	XK_hyphen,	XK_registered,	XK_macron,
-	XK_degree,	XK_plusminus,	XK_twosuperior,	XK_threesuperior,
-	XK_acute,	XK_mu,		XK_paragraph,	XK_periodcentered,
-	XK_cedilla,	XK_onesuperior,	XK_masculine,	XK_guillemotright,
-	XK_onequarter,	XK_onehalf,	XK_threequarters,XK_questiondown,
-	XK_Agrave,	XK_Aacute,	XK_Acircumflex,	XK_Atilde,
-	XK_Adiaeresis,	XK_Aring,	XK_AE,		XK_Ccedilla,
-	XK_Egrave,	XK_Eacute,	XK_Ecircumflex,	XK_Ediaeresis,
-	XK_Igrave,	XK_Iacute,	XK_Icircumflex,	XK_Idiaeresis,
-	XK_ETH,		XK_Ntilde,	XK_Ograve,	XK_Oacute,
-	XK_Ocircumflex,	XK_Otilde,	XK_Odiaeresis,	XK_multiply,
-	XK_Ooblique,	XK_Ugrave,	XK_Uacute,	XK_Ucircumflex,
-	XK_Udiaeresis,	XK_Yacute,	XK_THORN,	XK_ssharp,
-	XK_agrave,	XK_aacute,	XK_acircumflex,	XK_atilde,
-	XK_adiaeresis,	XK_aring,	XK_ae,		XK_ccedilla,
-	XK_egrave,	XK_eacute,	XK_ecircumflex,	XK_ediaeresis,
-	XK_igrave,	XK_iacute,	XK_icircumflex,	XK_idiaeresis,
-	XK_eth,		XK_ntilde,	XK_ograve,	XK_oacute,
-	XK_ocircumflex,	XK_otilde,	XK_odiaeresis,	XK_division,
-	XK_oslash,	XK_ugrave,	XK_uacute,	XK_ucircumflex,
-	XK_udiaeresis,	XK_yacute,	XK_thorn,	XK_ydiaeresis
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    XK_BackSpace, XK_Tab, XK_Linefeed, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, XK_Escape,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    XK_space, XK_exclam, XK_quotedbl, XK_numbersign,
+    XK_dollar, XK_percent, XK_ampersand, XK_apostrophe,
+    XK_parenleft, XK_parenright, XK_asterisk, XK_plus,
+    XK_comma, XK_minus, XK_period, XK_slash,
+    XK_0, XK_1, XK_2, XK_3,
+    XK_4, XK_5, XK_6, XK_7,
+    XK_8, XK_9, XK_colon, XK_semicolon,
+    XK_less, XK_equal, XK_greater, XK_question,
+    XK_at, XK_A, XK_B, XK_C,
+    XK_D, XK_E, XK_F, XK_G,
+    XK_H, XK_I, XK_J, XK_K,
+    XK_L, XK_M, XK_N, XK_O,
+    XK_P, XK_Q, XK_R, XK_S,
+    XK_T, XK_U, XK_V, XK_W,
+    XK_X, XK_Y, XK_Z, XK_bracketleft,
+    XK_backslash, XK_bracketright, XK_asciicircum, XK_underscore,
+    XK_grave, XK_a, XK_b, XK_c,
+    XK_d, XK_e, XK_f, XK_g,
+    XK_h, XK_i, XK_j, XK_k,
+    XK_l, XK_m, XK_n, XK_o,
+    XK_p, XK_q, XK_r, XK_s,
+    XK_t, XK_u, XK_v, XK_w,
+    XK_x, XK_y, XK_z, XK_braceleft,
+    XK_bar, XK_braceright, XK_asciitilde, XK_BackSpace,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    XK_nobreakspace, XK_exclamdown, XK_cent, XK_sterling,
+    XK_currency, XK_yen, XK_brokenbar, XK_section,
+    XK_diaeresis, XK_copyright, XK_ordfeminine, XK_guillemotleft,
+    XK_notsign, XK_hyphen, XK_registered, XK_macron,
+    XK_degree, XK_plusminus, XK_twosuperior, XK_threesuperior,
+    XK_acute, XK_mu, XK_paragraph, XK_periodcentered,
+    XK_cedilla, XK_onesuperior, XK_masculine, XK_guillemotright,
+    XK_onequarter, XK_onehalf, XK_threequarters, XK_questiondown,
+    XK_Agrave, XK_Aacute, XK_Acircumflex, XK_Atilde,
+    XK_Adiaeresis, XK_Aring, XK_AE, XK_Ccedilla,
+    XK_Egrave, XK_Eacute, XK_Ecircumflex, XK_Ediaeresis,
+    XK_Igrave, XK_Iacute, XK_Icircumflex, XK_Idiaeresis,
+    XK_ETH, XK_Ntilde, XK_Ograve, XK_Oacute,
+    XK_Ocircumflex, XK_Otilde, XK_Odiaeresis, XK_multiply,
+    XK_Ooblique, XK_Ugrave, XK_Uacute, XK_Ucircumflex,
+    XK_Udiaeresis, XK_Yacute, XK_THORN, XK_ssharp,
+    XK_agrave, XK_aacute, XK_acircumflex, XK_atilde,
+    XK_adiaeresis, XK_aring, XK_ae, XK_ccedilla,
+    XK_egrave, XK_eacute, XK_ecircumflex, XK_ediaeresis,
+    XK_igrave, XK_iacute, XK_icircumflex, XK_idiaeresis,
+    XK_eth, XK_ntilde, XK_ograve, XK_oacute,
+    XK_ocircumflex, XK_otilde, XK_odiaeresis, XK_division,
+    XK_oslash, XK_ugrave, XK_uacute, XK_ucircumflex,
+    XK_udiaeresis, XK_yacute, XK_thorn, XK_ydiaeresis
 };
 
 /*
@@ -135,80 +135,78 @@ static const KeySym linux_to_x[256] = {
    corresponds to the Xkb keymap.
 */
 #if 0
-static unsigned char at2lnx[] =
-{
-	0x0,    /* no valid scancode */
-	0x01,	/* KEY_Escape */	0x02,	/* KEY_1 */
-	0x03,	/* KEY_2 */		0x04,	/* KEY_3 */
-	0x05,	/* KEY_4 */		0x06,	/* KEY_5 */
-	0x07,	/* KEY_6 */		0x08,	/* KEY_7 */
-	0x09,	/* KEY_8 */		0x0a,	/* KEY_9 */
-	0x0b,	/* KEY_0 */		0x0c,	/* KEY_Minus */
-	0x0d,	/* KEY_Equal */		0x0e,	/* KEY_BackSpace */
-	0x0f,	/* KEY_Tab */		0x10,	/* KEY_Q */
-	0x11,	/* KEY_W */		0x12,	/* KEY_E */
-	0x13,	/* KEY_R */		0x14,	/* KEY_T */
-	0x15,	/* KEY_Y */		0x16,	/* KEY_U */
-	0x17,	/* KEY_I */		0x18,	/* KEY_O */
-	0x19,	/* KEY_P */		0x1a,	/* KEY_LBrace */
-	0x1b,	/* KEY_RBrace */	0x1c,	/* KEY_Enter */
-	0x1d,	/* KEY_LCtrl */		0x1e,	/* KEY_A */
-	0x1f,	/* KEY_S */		0x20,	/* KEY_D */
-	0x21,	/* KEY_F */		0x22,	/* KEY_G */
-	0x23,	/* KEY_H */		0x24,	/* KEY_J */
-	0x25,	/* KEY_K */		0x26,	/* KEY_L */
-	0x27,	/* KEY_SemiColon */	0x28,	/* KEY_Quote */
-	0x29,	/* KEY_Tilde */		0x2a,	/* KEY_ShiftL */
-	0x2b,	/* KEY_BSlash */	0x2c,	/* KEY_Z */
-	0x2d,	/* KEY_X */		0x2e,	/* KEY_C */
-	0x2f,	/* KEY_V */		0x30,	/* KEY_B */
-	0x31,	/* KEY_N */		0x32,	/* KEY_M */
-	0x33,	/* KEY_Comma */		0x34,	/* KEY_Period */
-	0x35,	/* KEY_Slash */		0x36,	/* KEY_ShiftR */
-	0x37,	/* KEY_KP_Multiply */	0x38,	/* KEY_Alt */
-	0x39,	/* KEY_Space */		0x3a,	/* KEY_CapsLock */
-	0x3b,	/* KEY_F1 */		0x3c,	/* KEY_F2 */
-	0x3d,	/* KEY_F3 */		0x3e,	/* KEY_F4 */
-	0x3f,	/* KEY_F5 */		0x40,	/* KEY_F6 */
-	0x41,	/* KEY_F7 */		0x42,	/* KEY_F8 */
-	0x43,	/* KEY_F9 */		0x44,	/* KEY_F10 */
-	0x45,	/* KEY_NumLock */	0x46,	/* KEY_ScrollLock */
-	0x47,	/* KEY_KP_7 */		0x48,	/* KEY_KP_8 */
-	0x49,	/* KEY_KP_9 */		0x4a,	/* KEY_KP_Minus */
-	0x4b,	/* KEY_KP_4 */		0x4c,	/* KEY_KP_5 */
-	0x4d,	/* KEY_KP_6 */		0x4e,	/* KEY_KP_Plus */
-	0x4f,	/* KEY_KP_1 */		0x50,	/* KEY_KP_2 */
-	0x51,	/* KEY_KP_3 */		0x52,	/* KEY_KP_0 */
-	0x53,	/* KEY_KP_Decimal */	0x54,	/* KEY_SysReqest */
-	0x00,	/* 0x55 */		0x56,	/* KEY_Less */
-	0x57,	/* KEY_F11 */		0x58,	/* KEY_F12 */
-	0x66,	/* KEY_Home */		0x67,	/* KEY_Up */
-	0x68,	/* KEY_PgUp */		0x69,	/* KEY_Left */
-	0x5d,	/* KEY_Begin */		0x6a,	/* KEY_Right */
-	0x6b,	/* KEY_End */		0x6c,	/* KEY_Down */
-	0x6d,	/* KEY_PgDown */	0x6e,	/* KEY_Insert */
-	0x6f,	/* KEY_Delete */	0x60,	/* KEY_KP_Enter */
-	0x61,	/* KEY_RCtrl */		0x77,	/* KEY_Pause */
-	0x63,	/* KEY_Print */		0x62,	/* KEY_KP_Divide */
-	0x64,	/* KEY_AltLang */	0x65,	/* KEY_Break */
-	0x00,	/* KEY_LMeta */		0x00,	/* KEY_RMeta */
-	0x7A,	/* KEY_Menu/FOCUS_PF11*/0x00,	/* 0x6e */
-	0x7B,	/* FOCUS_PF12 */	0x00,	/* 0x70 */
-	0x00,	/* 0x71 */		0x00,	/* 0x72 */
-	0x59,	/* FOCUS_PF2 */		0x78,	/* FOCUS_PF9 */
-	0x00,	/* 0x75 */		0x00,	/* 0x76 */
-	0x5A,	/* FOCUS_PF3 */		0x5B,	/* FOCUS_PF4 */
-	0x5C,	/* FOCUS_PF5 */		0x5D,	/* FOCUS_PF6 */
-	0x5E,	/* FOCUS_PF7 */		0x5F,	/* FOCUS_PF8 */
-	0x7C,	/* JAP_86 */		0x79,	/* FOCUS_PF10 */
-	0x00,	/* 0x7f */
+static unsigned char at2lnx[] = {
+    0x0,                        /* no valid scancode */
+    0x01, /* KEY_Escape */ 0x02,        /* KEY_1 */
+    0x03, /* KEY_2 */ 0x04,     /* KEY_3 */
+    0x05, /* KEY_4 */ 0x06,     /* KEY_5 */
+    0x07, /* KEY_6 */ 0x08,     /* KEY_7 */
+    0x09, /* KEY_8 */ 0x0a,     /* KEY_9 */
+    0x0b, /* KEY_0 */ 0x0c,     /* KEY_Minus */
+    0x0d, /* KEY_Equal */ 0x0e, /* KEY_BackSpace */
+    0x0f, /* KEY_Tab */ 0x10,   /* KEY_Q */
+    0x11, /* KEY_W */ 0x12,     /* KEY_E */
+    0x13, /* KEY_R */ 0x14,     /* KEY_T */
+    0x15, /* KEY_Y */ 0x16,     /* KEY_U */
+    0x17, /* KEY_I */ 0x18,     /* KEY_O */
+    0x19, /* KEY_P */ 0x1a,     /* KEY_LBrace */
+    0x1b, /* KEY_RBrace */ 0x1c,        /* KEY_Enter */
+    0x1d, /* KEY_LCtrl */ 0x1e, /* KEY_A */
+    0x1f, /* KEY_S */ 0x20,     /* KEY_D */
+    0x21, /* KEY_F */ 0x22,     /* KEY_G */
+    0x23, /* KEY_H */ 0x24,     /* KEY_J */
+    0x25, /* KEY_K */ 0x26,     /* KEY_L */
+    0x27, /* KEY_SemiColon */ 0x28,     /* KEY_Quote */
+    0x29, /* KEY_Tilde */ 0x2a, /* KEY_ShiftL */
+    0x2b, /* KEY_BSlash */ 0x2c,        /* KEY_Z */
+    0x2d, /* KEY_X */ 0x2e,     /* KEY_C */
+    0x2f, /* KEY_V */ 0x30,     /* KEY_B */
+    0x31, /* KEY_N */ 0x32,     /* KEY_M */
+    0x33, /* KEY_Comma */ 0x34, /* KEY_Period */
+    0x35, /* KEY_Slash */ 0x36, /* KEY_ShiftR */
+    0x37, /* KEY_KP_Multiply */ 0x38,   /* KEY_Alt */
+    0x39, /* KEY_Space */ 0x3a, /* KEY_CapsLock */
+    0x3b, /* KEY_F1 */ 0x3c,    /* KEY_F2 */
+    0x3d, /* KEY_F3 */ 0x3e,    /* KEY_F4 */
+    0x3f, /* KEY_F5 */ 0x40,    /* KEY_F6 */
+    0x41, /* KEY_F7 */ 0x42,    /* KEY_F8 */
+    0x43, /* KEY_F9 */ 0x44,    /* KEY_F10 */
+    0x45, /* KEY_NumLock */ 0x46,       /* KEY_ScrollLock */
+    0x47, /* KEY_KP_7 */ 0x48,  /* KEY_KP_8 */
+    0x49, /* KEY_KP_9 */ 0x4a,  /* KEY_KP_Minus */
+    0x4b, /* KEY_KP_4 */ 0x4c,  /* KEY_KP_5 */
+    0x4d, /* KEY_KP_6 */ 0x4e,  /* KEY_KP_Plus */
+    0x4f, /* KEY_KP_1 */ 0x50,  /* KEY_KP_2 */
+    0x51, /* KEY_KP_3 */ 0x52,  /* KEY_KP_0 */
+    0x53, /* KEY_KP_Decimal */ 0x54,    /* KEY_SysReqest */
+    0x00, /* 0x55 */ 0x56,      /* KEY_Less */
+    0x57, /* KEY_F11 */ 0x58,   /* KEY_F12 */
+    0x66, /* KEY_Home */ 0x67,  /* KEY_Up */
+    0x68, /* KEY_PgUp */ 0x69,  /* KEY_Left */
+    0x5d, /* KEY_Begin */ 0x6a, /* KEY_Right */
+    0x6b, /* KEY_End */ 0x6c,   /* KEY_Down */
+    0x6d, /* KEY_PgDown */ 0x6e,        /* KEY_Insert */
+    0x6f, /* KEY_Delete */ 0x60,        /* KEY_KP_Enter */
+    0x61, /* KEY_RCtrl */ 0x77, /* KEY_Pause */
+    0x63, /* KEY_Print */ 0x62, /* KEY_KP_Divide */
+    0x64, /* KEY_AltLang */ 0x65,       /* KEY_Break */
+    0x00, /* KEY_LMeta */ 0x00, /* KEY_RMeta */
+    0x7A, /* KEY_Menu/FOCUS_PF11 */ 0x00,       /* 0x6e */
+    0x7B, /* FOCUS_PF12 */ 0x00,        /* 0x70 */
+    0x00, /* 0x71 */ 0x00,      /* 0x72 */
+    0x59, /* FOCUS_PF2 */ 0x78, /* FOCUS_PF9 */
+    0x00, /* 0x75 */ 0x00,      /* 0x76 */
+    0x5A, /* FOCUS_PF3 */ 0x5B, /* FOCUS_PF4 */
+    0x5C, /* FOCUS_PF5 */ 0x5D, /* FOCUS_PF6 */
+    0x5E, /* FOCUS_PF7 */ 0x5F, /* FOCUS_PF8 */
+    0x7C, /* JAP_86 */ 0x79,    /* FOCUS_PF10 */
+    0x00,                       /* 0x7f */
 };
 
 #define NUM_AT_KEYS (sizeof(at2lnx)/sizeof(at2lnx[0]))
 #define LNX_KEY_INDEX(n) n < NUM_AT_KEYS ? at2lnx[n] : 0
 
-static unsigned char tbl[KD_MAX_WIDTH] =
-{
+static unsigned char tbl[KD_MAX_WIDTH] = {
     0,
     1 << KG_SHIFT,
     (1 << KG_ALTGR),
@@ -217,15 +215,15 @@ static unsigned char tbl[KD_MAX_WIDTH] =
 #endif
 
 static void
-readKernelMapping(KdKeyboardInfo *ki)
+readKernelMapping(KdKeyboardInfo * ki)
 {
 #if 0
-    KeySym	    *k;
-    int		    i, j;
-    struct kbentry  kbe;
-    int		    minKeyCode, maxKeyCode;
-    int		    row;
-    int             fd;
+    KeySym *k;
+    int i, j;
+    struct kbentry kbe;
+    int minKeyCode, maxKeyCode;
+    int row;
+    int fd;
 
     if (!ki)
         return;
@@ -236,252 +234,248 @@ readKernelMapping(KdKeyboardInfo *ki)
     maxKeyCode = 0;
     row = 0;
     ki->keySyms.mapWidth = KD_MAX_WIDTH;
-    for (i = 0; i < NR_KEYS && row < KD_MAX_LENGTH; ++i)
-    {
+    for (i = 0; i < NR_KEYS && row < KD_MAX_LENGTH; ++i) {
         kbe.kb_index = LNX_KEY_INDEX(i);
 
         k = ki->keySyms.map + row * ki->keySyms.mapWidth;
 
-	for (j = 0; j < ki->keySyms.mapWidth; ++j)
-	{
-	    unsigned short kval;
-
-	    k[j] = NoSymbol;
-
-	    kbe.kb_table = tbl[j];
-	    kbe.kb_value = 0;
-	    if (ioctl(fd, KDGKBENT, &kbe))
-		continue;
-
-	    kval = KVAL(kbe.kb_value);
-	    switch (KTYP(kbe.kb_value))
-	    {
-	    case KT_LATIN:
-	    case KT_LETTER:
-		k[j] = linux_to_x[kval];
-		break;
-
-	    case KT_FN:
-		if (kval <= 19)
-		    k[j] = XK_F1 + kval;
-		else switch (kbe.kb_value)
-		{
-		case K_FIND:
-		    k[j] = XK_Home; /* or XK_Find */
-		    break;
-		case K_INSERT:
-		    k[j] = XK_Insert;
-		    break;
-		case K_REMOVE:
-		    k[j] = XK_Delete;
-		    break;
-		case K_SELECT:
-		    k[j] = XK_End; /* or XK_Select */
-		    break;
-		case K_PGUP:
-		    k[j] = XK_Prior;
-		    break;
-		case K_PGDN:
-		    k[j] = XK_Next;
-		    break;
-		case K_HELP:
-		    k[j] = XK_Help;
-		    break;
-		case K_DO:
-		    k[j] = XK_Execute;
-		    break;
-		case K_PAUSE:
-		    k[j] = XK_Pause;
-		    break;
-		case K_MACRO:
-		    k[j] = XK_Menu;
-		    break;
-		default:
-		    break;
-		}
-		break;
-
-	    case KT_SPEC:
-		switch (kbe.kb_value)
-		{
-		case K_ENTER:
-		    k[j] = XK_Return;
-		    break;
-		case K_BREAK:
-		    k[j] = XK_Break;
-		    break;
-		case K_CAPS:
-		    k[j] = XK_Caps_Lock;
-		    break;
-		case K_NUM:
-		    k[j] = XK_Num_Lock;
-		    break;
-		case K_HOLD:
-		    k[j] = XK_Scroll_Lock;
-		    break;
-		case K_COMPOSE:
-		    k[j] = XK_Multi_key;
-		    break;
-		default:
-		    break;
-		}
-		break;
-
-	    case KT_PAD:
-		switch (kbe.kb_value)
-		{
-		case K_PPLUS:
-		    k[j] = XK_KP_Add;
-		    break;
-		case K_PMINUS:
-		    k[j] = XK_KP_Subtract;
-		    break;
-		case K_PSTAR:
-		    k[j] = XK_KP_Multiply;
-		    break;
-		case K_PSLASH:
-		    k[j] = XK_KP_Divide;
-		    break;
-		case K_PENTER:
-		    k[j] = XK_KP_Enter;
-		    break;
-		case K_PCOMMA:
-		    k[j] = XK_KP_Separator;
-		    break;
-		case K_PDOT:
-		    k[j] = XK_KP_Decimal;
-		    break;
-		case K_PPLUSMINUS:
-		    k[j] = XK_KP_Subtract;
-		    break;
-		default:
-		    if (kval <= 9)
-			k[j] = XK_KP_0 + kval;
-		    break;
-		}
-		break;
-
-		/*
-		 * KT_DEAD keys are for accelerated diacritical creation.
-		 */
-	    case KT_DEAD:
-		switch (kbe.kb_value)
-		{
-		case K_DGRAVE:
-		    k[j] = XK_dead_grave;
-		    break;
-		case K_DACUTE:
-		    k[j] = XK_dead_acute;
-		    break;
-		case K_DCIRCM:
-		    k[j] = XK_dead_circumflex;
-		    break;
-		case K_DTILDE:
-		    k[j] = XK_dead_tilde;
-		    break;
-		case K_DDIERE:
-		    k[j] = XK_dead_diaeresis;
-		    break;
-		}
-		break;
-
-	    case KT_CUR:
-		switch (kbe.kb_value)
-		{
-		case K_DOWN:
-		    k[j] = XK_Down;
-		    break;
-		case K_LEFT:
-		    k[j] = XK_Left;
-		    break;
-		case K_RIGHT:
-		    k[j] = XK_Right;
-		    break;
-		case K_UP:
-		    k[j] = XK_Up;
-		    break;
-		}
-		break;
-
-	    case KT_SHIFT:
-		switch (kbe.kb_value)
-		{
-		case K_ALTGR:
-		    k[j] = XK_Mode_switch;
-		    break;
-		case K_ALT:
-		    k[j] = (kbe.kb_index == 0x64 ?
-			  XK_Alt_R : XK_Alt_L);
-		    break;
-		case K_CTRL:
-		    k[j] = (kbe.kb_index == 0x61 ?
-			  XK_Control_R : XK_Control_L);
-		    break;
-		case K_CTRLL:
-		    k[j] = XK_Control_L;
-		    break;
-		case K_CTRLR:
-		    k[j] = XK_Control_R;
-		    break;
-		case K_SHIFT:
-		    k[j] = (kbe.kb_index == 0x36 ?
-			  XK_Shift_R : XK_Shift_L);
-		    break;
-		case K_SHIFTL:
-		    k[j] = XK_Shift_L;
-		    break;
-		case K_SHIFTR:
-		    k[j] = XK_Shift_R;
-		    break;
-		default:
-		    break;
-		}
-		break;
-
-		/*
-		 * KT_ASCII keys accumulate a 3 digit decimal number that gets
-		 * emitted when the shift state changes. We can't emulate that.
-		 */
-	    case KT_ASCII:
-		break;
-
-	    case KT_LOCK:
-		if (kbe.kb_value == K_SHIFTLOCK)
-		    k[j] = XK_Shift_Lock;
-		break;
+        for (j = 0; j < ki->keySyms.mapWidth; ++j) {
+            unsigned short kval;
+
+            k[j] = NoSymbol;
+
+            kbe.kb_table = tbl[j];
+            kbe.kb_value = 0;
+            if (ioctl(fd, KDGKBENT, &kbe))
+                continue;
+
+            kval = KVAL(kbe.kb_value);
+            switch (KTYP(kbe.kb_value)) {
+            case KT_LATIN:
+            case KT_LETTER:
+                k[j] = linux_to_x[kval];
+                break;
+
+            case KT_FN:
+                if (kval <= 19)
+                    k[j] = XK_F1 + kval;
+                else
+                    switch (kbe.kb_value) {
+                    case K_FIND:
+                        k[j] = XK_Home; /* or XK_Find */
+                        break;
+                    case K_INSERT:
+                        k[j] = XK_Insert;
+                        break;
+                    case K_REMOVE:
+                        k[j] = XK_Delete;
+                        break;
+                    case K_SELECT:
+                        k[j] = XK_End;  /* or XK_Select */
+                        break;
+                    case K_PGUP:
+                        k[j] = XK_Prior;
+                        break;
+                    case K_PGDN:
+                        k[j] = XK_Next;
+                        break;
+                    case K_HELP:
+                        k[j] = XK_Help;
+                        break;
+                    case K_DO:
+                        k[j] = XK_Execute;
+                        break;
+                    case K_PAUSE:
+                        k[j] = XK_Pause;
+                        break;
+                    case K_MACRO:
+                        k[j] = XK_Menu;
+                        break;
+                    default:
+                        break;
+                    }
+                break;
+
+            case KT_SPEC:
+                switch (kbe.kb_value) {
+                case K_ENTER:
+                    k[j] = XK_Return;
+                    break;
+                case K_BREAK:
+                    k[j] = XK_Break;
+                    break;
+                case K_CAPS:
+                    k[j] = XK_Caps_Lock;
+                    break;
+                case K_NUM:
+                    k[j] = XK_Num_Lock;
+                    break;
+                case K_HOLD:
+                    k[j] = XK_Scroll_Lock;
+                    break;
+                case K_COMPOSE:
+                    k[j] = XK_Multi_key;
+                    break;
+                default:
+                    break;
+                }
+                break;
+
+            case KT_PAD:
+                switch (kbe.kb_value) {
+                case K_PPLUS:
+                    k[j] = XK_KP_Add;
+                    break;
+                case K_PMINUS:
+                    k[j] = XK_KP_Subtract;
+                    break;
+                case K_PSTAR:
+                    k[j] = XK_KP_Multiply;
+                    break;
+                case K_PSLASH:
+                    k[j] = XK_KP_Divide;
+                    break;
+                case K_PENTER:
+                    k[j] = XK_KP_Enter;
+                    break;
+                case K_PCOMMA:
+                    k[j] = XK_KP_Separator;
+                    break;
+                case K_PDOT:
+                    k[j] = XK_KP_Decimal;
+                    break;
+                case K_PPLUSMINUS:
+                    k[j] = XK_KP_Subtract;
+                    break;
+                default:
+                    if (kval <= 9)
+                        k[j] = XK_KP_0 + kval;
+                    break;
+                }
+                break;
+
+                /*
+                 * KT_DEAD keys are for accelerated diacritical creation.
+                 */
+            case KT_DEAD:
+                switch (kbe.kb_value) {
+                case K_DGRAVE:
+                    k[j] = XK_dead_grave;
+                    break;
+                case K_DACUTE:
+                    k[j] = XK_dead_acute;
+                    break;
+                case K_DCIRCM:
+                    k[j] = XK_dead_circumflex;
+                    break;
+                case K_DTILDE:
+                    k[j] = XK_dead_tilde;
+                    break;
+                case K_DDIERE:
+                    k[j] = XK_dead_diaeresis;
+                    break;
+                }
+                break;
+
+            case KT_CUR:
+                switch (kbe.kb_value) {
+                case K_DOWN:
+                    k[j] = XK_Down;
+                    break;
+                case K_LEFT:
+                    k[j] = XK_Left;
+                    break;
+                case K_RIGHT:
+                    k[j] = XK_Right;
+                    break;
+                case K_UP:
+                    k[j] = XK_Up;
+                    break;
+                }
+                break;
+
+            case KT_SHIFT:
+                switch (kbe.kb_value) {
+                case K_ALTGR:
+                    k[j] = XK_Mode_switch;
+                    break;
+                case K_ALT:
+                    k[j] = (kbe.kb_index == 0x64 ? XK_Alt_R : XK_Alt_L);
+                    break;
+                case K_CTRL:
+                    k[j] = (kbe.kb_index == 0x61 ? XK_Control_R : XK_Control_L);
+                    break;
+                case K_CTRLL:
+                    k[j] = XK_Control_L;
+                    break;
+                case K_CTRLR:
+                    k[j] = XK_Control_R;
+                    break;
+                case K_SHIFT:
+                    k[j] = (kbe.kb_index == 0x36 ? XK_Shift_R : XK_Shift_L);
+                    break;
+                case K_SHIFTL:
+                    k[j] = XK_Shift_L;
+                    break;
+                case K_SHIFTR:
+                    k[j] = XK_Shift_R;
+                    break;
+                default:
+                    break;
+                }
+                break;
+
+                /*
+                 * KT_ASCII keys accumulate a 3 digit decimal number that gets
+                 * emitted when the shift state changes. We can't emulate that.
+                 */
+            case KT_ASCII:
+                break;
+
+            case KT_LOCK:
+                if (kbe.kb_value == K_SHIFTLOCK)
+                    k[j] = XK_Shift_Lock;
+                break;
 
 #ifdef KT_X
-	    case KT_X:
-		/* depends on new keyboard symbols in file linux/keyboard.h */
-		if(kbe.kb_value == K_XMENU) k[j] = XK_Menu;
-		if(kbe.kb_value == K_XTELEPHONE) k[j] = XK_telephone;
-		break;
+            case KT_X:
+                /* depends on new keyboard symbols in file linux/keyboard.h */
+                if (kbe.kb_value == K_XMENU)
+                    k[j] = XK_Menu;
+                if (kbe.kb_value == K_XTELEPHONE)
+                    k[j] = XK_telephone;
+                break;
 #endif
 #ifdef KT_XF
-	    case KT_XF:
-		/* special linux keysyms which map directly to XF86 keysyms */
-		k[j] = (kbe.kb_value & 0xFF) + 0x1008FF00;
-		break;
+            case KT_XF:
+                /* special linux keysyms which map directly to XF86 keysyms */
+                k[j] = (kbe.kb_value & 0xFF) + 0x1008FF00;
+                break;
 #endif
 
-	    default:
-		break;
-	    }
-	    if (i < minKeyCode)
-		minKeyCode = i;
-	    if (i > maxKeyCode)
-		maxKeyCode = i;
-	}
-
-	if (minKeyCode == NR_KEYS)
-	    continue;
-
-	if (k[3] == k[2]) k[3] = NoSymbol;
-	if (k[2] == k[1]) k[2] = NoSymbol;
-	if (k[1] == k[0]) k[1] = NoSymbol;
-	if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
-	if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] =NoSymbol;
-	row++;
+            default:
+                break;
+            }
+            if (i < minKeyCode)
+                minKeyCode = i;
+            if (i > maxKeyCode)
+                maxKeyCode = i;
+        }
+
+        if (minKeyCode == NR_KEYS)
+            continue;
+
+        if (k[3] == k[2])
+            k[3] = NoSymbol;
+        if (k[2] == k[1])
+            k[2] = NoSymbol;
+        if (k[1] == k[0])
+            k[1] = NoSymbol;
+        if (k[0] == k[2] && k[1] == k[3])
+            k[2] = k[3] = NoSymbol;
+        if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol)
+            k[3] = NoSymbol;
+        row++;
     }
     ki->minScanCode = minKeyCode;
     ki->maxScanCode = maxKeyCode;
@@ -551,142 +545,166 @@ readKernelMapping(KdKeyboardInfo *ki)
 #define KEY_KP_DEC       /* KP_DEC                0x73  */  115
 
 static void
-LinuxKeyboardRead (int fd, void *closure)
+LinuxKeyboardRead(int fd, void *closure)
 {
-    unsigned char   buf[256], *b;
-    int		    n;
-    unsigned char   prefix = 0, scancode = 0;
+    unsigned char buf[256], *b;
+    int n;
+    unsigned char prefix = 0, scancode = 0;
 
-    while ((n = read (fd, buf, sizeof (buf))) > 0) {
-	b = buf;
-	while (n--) {
+    while ((n = read(fd, buf, sizeof(buf))) > 0) {
+        b = buf;
+        while (n--) {
             /*
              * With xkb we use RAW mode for reading the console, which allows us
              * process extended scancodes.
              *
              * See if this is a prefix extending the following keycode
              */
-            if (!prefix && ((b[0] & 0x7f) == KEY_Prefix0))
-            {
-                    prefix = KEY_Prefix0;
-                    /* swallow this up */
-                    b++;
-                    continue;
+            if (!prefix && ((b[0] & 0x7f) == KEY_Prefix0)) {
+                prefix = KEY_Prefix0;
+                /* swallow this up */
+                b++;
+                continue;
             }
-            else if (!prefix && ((b[0] & 0x7f) == KEY_Prefix1))
-            {
-                    prefix = KEY_Prefix1;
-                    /* swallow this up */
-                    b++;
-                    continue;
+            else if (!prefix && ((b[0] & 0x7f) == KEY_Prefix1)) {
+                prefix = KEY_Prefix1;
+                /* swallow this up */
+                b++;
+                continue;
             }
             scancode = b[0] & 0x7f;
 
             switch (prefix) {
-                    /* from xf86Events.c */
-                    case KEY_Prefix0:
-                    {
-                        switch (scancode) {
-                            case KEY_KP_7:
-                                scancode = KEY_Home;      break;  /* curs home */
-                            case KEY_KP_8:
-                                scancode = KEY_Up;        break;  /* curs up */
-                            case KEY_KP_9:
-                                scancode = KEY_PgUp;      break;  /* curs pgup */
-                            case KEY_KP_4:
-                                scancode = KEY_Left;      break;  /* curs left */
-                            case KEY_KP_5:
-                                scancode = KEY_Begin;     break;  /* curs begin */
-                            case KEY_KP_6:
-                                scancode = KEY_Right;     break;  /* curs right */
-                            case KEY_KP_1:
-                                scancode = KEY_End;       break;  /* curs end */
-                            case KEY_KP_2:
-                                scancode = KEY_Down;      break;  /* curs down */
-                            case KEY_KP_3:
-                                scancode = KEY_PgDown;    break;  /* curs pgdown */
-                            case KEY_KP_0:
-                                scancode = KEY_Insert;    break;  /* curs insert */
-                            case KEY_KP_Decimal:
-                                scancode = KEY_Delete;    break;  /* curs delete */
-                            case KEY_Enter:
-                                scancode = KEY_KP_Enter;  break;  /* keypad enter */
-                            case KEY_LCtrl:
-                                scancode = KEY_RCtrl;     break;  /* right ctrl */
-                            case KEY_KP_Multiply:
-                                scancode = KEY_Print;     break;  /* print */
-                            case KEY_Slash:
-                                scancode = KEY_KP_Divide; break;  /* keyp divide */
-                            case KEY_Alt:
-                                scancode = KEY_AltLang;   break;  /* right alt */
-                            case KEY_ScrollLock:
-                                scancode = KEY_Break;     break;  /* curs break */
-                            case 0x5b:
-                                scancode = KEY_LMeta;     break;
-                            case 0x5c:
-                                scancode = KEY_RMeta;     break;
-                            case 0x5d:
-                                scancode = KEY_Menu;      break;
-                            case KEY_F3:
-                                scancode = KEY_F13;       break;
-                            case KEY_F4:
-                                scancode = KEY_F14;       break;
-                            case KEY_F5:
-                                scancode = KEY_F15;       break;
-                            case KEY_F6:
-                                scancode = KEY_F16;       break;
-                            case KEY_F7:
-                                scancode = KEY_F17;       break;
-                            case KEY_KP_Plus:
-                                scancode = KEY_KP_DEC;    break;
-                            /* Ignore virtual shifts (E0 2A, E0 AA, E0 36, E0 B6) */
-                            case 0x2A:
-                            case 0x36:
-                                b++;
-                                prefix = 0;
-                                continue;
-                            default:
-                                 /*
-                                  * "Internet" keyboards are generating lots of new
-                                  * codes.  Let them pass.  There is little consistency
-                                  * between them, so don't bother with symbolic names at
-                                  * this level.
-                                  */
-                                scancode += 0x78;
-                        }
-                        break;
-                    }
+                /* from xf86Events.c */
+            case KEY_Prefix0:
+            {
+                switch (scancode) {
+                case KEY_KP_7:
+                    scancode = KEY_Home;
+                    break;      /* curs home */
+                case KEY_KP_8:
+                    scancode = KEY_Up;
+                    break;      /* curs up */
+                case KEY_KP_9:
+                    scancode = KEY_PgUp;
+                    break;      /* curs pgup */
+                case KEY_KP_4:
+                    scancode = KEY_Left;
+                    break;      /* curs left */
+                case KEY_KP_5:
+                    scancode = KEY_Begin;
+                    break;      /* curs begin */
+                case KEY_KP_6:
+                    scancode = KEY_Right;
+                    break;      /* curs right */
+                case KEY_KP_1:
+                    scancode = KEY_End;
+                    break;      /* curs end */
+                case KEY_KP_2:
+                    scancode = KEY_Down;
+                    break;      /* curs down */
+                case KEY_KP_3:
+                    scancode = KEY_PgDown;
+                    break;      /* curs pgdown */
+                case KEY_KP_0:
+                    scancode = KEY_Insert;
+                    break;      /* curs insert */
+                case KEY_KP_Decimal:
+                    scancode = KEY_Delete;
+                    break;      /* curs delete */
+                case KEY_Enter:
+                    scancode = KEY_KP_Enter;
+                    break;      /* keypad enter */
+                case KEY_LCtrl:
+                    scancode = KEY_RCtrl;
+                    break;      /* right ctrl */
+                case KEY_KP_Multiply:
+                    scancode = KEY_Print;
+                    break;      /* print */
+                case KEY_Slash:
+                    scancode = KEY_KP_Divide;
+                    break;      /* keyp divide */
+                case KEY_Alt:
+                    scancode = KEY_AltLang;
+                    break;      /* right alt */
+                case KEY_ScrollLock:
+                    scancode = KEY_Break;
+                    break;      /* curs break */
+                case 0x5b:
+                    scancode = KEY_LMeta;
+                    break;
+                case 0x5c:
+                    scancode = KEY_RMeta;
+                    break;
+                case 0x5d:
+                    scancode = KEY_Menu;
+                    break;
+                case KEY_F3:
+                    scancode = KEY_F13;
+                    break;
+                case KEY_F4:
+                    scancode = KEY_F14;
+                    break;
+                case KEY_F5:
+                    scancode = KEY_F15;
+                    break;
+                case KEY_F6:
+                    scancode = KEY_F16;
+                    break;
+                case KEY_F7:
+                    scancode = KEY_F17;
+                    break;
+                case KEY_KP_Plus:
+                    scancode = KEY_KP_DEC;
+                    break;
+                    /* Ignore virtual shifts (E0 2A, E0 AA, E0 36, E0 B6) */
+                case 0x2A:
+                case 0x36:
+                    b++;
+                    prefix = 0;
+                    continue;
+                default:
+                    /*
+                     * "Internet" keyboards are generating lots of new
+                     * codes.  Let them pass.  There is little consistency
+                     * between them, so don't bother with symbolic names at
+                     * this level.
+                     */
+                    scancode += 0x78;
+                }
+                break;
+            }
 
-                    case KEY_Prefix1:
-                    {
-                        /* we do no handle these */
-                        b++;
-                        prefix = 0;
-                        continue;
-                    }
+            case KEY_Prefix1:
+            {
+                /* we do no handle these */
+                b++;
+                prefix = 0;
+                continue;
+            }
 
-                    default: /* should not happen*/
-                    case 0: /* do nothing */
-                        ;
+            default:           /* should not happen */
+            case 0:            /* do nothing */
+                ;
             }
 
             prefix = 0;
-	    KdEnqueueKeyboardEvent (closure, scancode, b[0] & 0x80);
-	    b++;
-	}
+            KdEnqueueKeyboardEvent(closure, scancode, b[0] & 0x80);
+            b++;
+        }
     }
 }
 
-static int		LinuxKbdTrans;
-static struct termios	LinuxTermios;
+static int LinuxKbdTrans;
+static struct termios LinuxTermios;
 
 static Status
-LinuxKeyboardEnable (KdKeyboardInfo *ki)
+LinuxKeyboardEnable(KdKeyboardInfo * ki)
 {
     struct termios nTty;
-    unsigned char   buf[256];
-    int		    n;
-    int             fd;
+    unsigned char buf[256];
+    int n;
+    int fd;
 
     if (!ki)
         return !Success;
@@ -694,30 +712,29 @@ LinuxKeyboardEnable (KdKeyboardInfo *ki)
     fd = LinuxConsoleFd;
     ki->driverPrivate = (void *) (intptr_t) fd;
 
-    ioctl (fd, KDGKBMODE, &LinuxKbdTrans);
-    tcgetattr (fd, &LinuxTermios);
+    ioctl(fd, KDGKBMODE, &LinuxKbdTrans);
+    tcgetattr(fd, &LinuxTermios);
     ioctl(fd, KDSKBMODE, K_RAW);
     nTty = LinuxTermios;
     nTty.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP);
     nTty.c_oflag = 0;
     nTty.c_cflag = CREAD | CS8;
     nTty.c_lflag = 0;
-    nTty.c_cc[VTIME]=0;
-    nTty.c_cc[VMIN]=1;
+    nTty.c_cc[VTIME] = 0;
+    nTty.c_cc[VMIN] = 1;
     cfsetispeed(&nTty, 9600);
     cfsetospeed(&nTty, 9600);
     tcsetattr(fd, TCSANOW, &nTty);
     /*
      * Flush any pending keystrokes
      */
-    while ((n = read (fd, buf, sizeof (buf))) > 0)
-	;
-    KdRegisterFd (fd, LinuxKeyboardRead, ki);
+    while ((n = read(fd, buf, sizeof(buf))) > 0);
+    KdRegisterFd(fd, LinuxKeyboardRead, ki);
     return Success;
 }
 
 static void
-LinuxKeyboardDisable (KdKeyboardInfo *ki)
+LinuxKeyboardDisable(KdKeyboardInfo * ki)
 {
     int fd;
 
@@ -732,7 +749,7 @@ LinuxKeyboardDisable (KdKeyboardInfo *ki)
 }
 
 static Status
-LinuxKeyboardInit (KdKeyboardInfo *ki)
+LinuxKeyboardInit(KdKeyboardInfo * ki)
 {
     if (!ki)
         return !Success;
@@ -742,18 +759,18 @@ LinuxKeyboardInit (KdKeyboardInfo *ki)
     free(ki->name);
     ki->name = strdup("Linux console keyboard");
 
-    readKernelMapping (ki);
+    readKernelMapping(ki);
 
     return Success;
 }
 
 static void
-LinuxKeyboardLeds (KdKeyboardInfo *ki, int leds)
+LinuxKeyboardLeds(KdKeyboardInfo * ki, int leds)
 {
     if (!ki)
         return;
 
-    ioctl ((int)(intptr_t)ki->driverPrivate, KDSETLED, leds & 7);
+    ioctl((int) (intptr_t) ki->driverPrivate, KDSETLED, leds & 7);
 }
 
 KdKeyboardDriver LinuxKeyboardDriver = {
diff --git a/xorg-server/hw/kdrive/linux/linux.c b/xorg-server/hw/kdrive/linux/linux.c
index 194e7cd59..498c2398d 100644
--- a/xorg-server/hw/kdrive/linux/linux.c
+++ b/xorg-server/hw/kdrive/linux/linux.c
@@ -34,51 +34,51 @@
 #include <linux/apm_bios.h>
 
 #ifdef KDRIVE_MOUSE
-extern KdPointerDriver	LinuxMouseDriver;
-extern KdPointerDriver	Ps2MouseDriver;
-extern KdPointerDriver	MsMouseDriver;
+extern KdPointerDriver LinuxMouseDriver;
+extern KdPointerDriver Ps2MouseDriver;
+extern KdPointerDriver MsMouseDriver;
 #endif
 #ifdef TSLIB
-extern KdPointerDriver	TsDriver;
+extern KdPointerDriver TsDriver;
 #endif
 #ifdef KDRIVE_EVDEV
-extern KdPointerDriver	LinuxEvdevMouseDriver;
+extern KdPointerDriver LinuxEvdevMouseDriver;
 extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
 #endif
 #ifdef KDRIVE_KBD
-extern KdKeyboardDriver	LinuxKeyboardDriver;
+extern KdKeyboardDriver LinuxKeyboardDriver;
 #endif
 
-static int  vtno;
-int  LinuxConsoleFd;
-int  LinuxApmFd = -1;
-static int  activeVT;
+static int vtno;
+int LinuxConsoleFd;
+int LinuxApmFd = -1;
+static int activeVT;
 static Bool enabled;
 
 static void
-LinuxVTRequest (int sig)
+LinuxVTRequest(int sig)
 {
     kdSwitchPending = TRUE;
 }
 
 /* Check before chowning -- this avoids touching the file system */
 static void
-LinuxCheckChown (char *file)
+LinuxCheckChown(char *file)
 {
-    struct stat	    st;
-    __uid_t	    u;
-    __gid_t	    g;
-
-    if (stat (file, &st) < 0)
-	return;
-    u = getuid ();
-    g = getgid ();
+    struct stat st;
+    __uid_t u;
+    __gid_t g;
+
+    if (stat(file, &st) < 0)
+        return;
+    u = getuid();
+    g = getgid();
     if (st.st_uid != u || st.st_gid != g)
-	chown (file, u, g);
+        chown(file, u, g);
 }
 
 static int
-LinuxInit (void)
+LinuxInit(void)
 {
     int fd = -1;
     char vtname[11];
@@ -86,39 +86,31 @@ LinuxInit (void)
 
     LinuxConsoleFd = -1;
     /* check if we're run with euid==0 */
-    if (geteuid() != 0)
-    {
-	FatalError("LinuxInit: Server must be suid root\n");
+    if (geteuid() != 0) {
+        FatalError("LinuxInit: Server must be suid root\n");
     }
 
     if (kdVirtualTerminal >= 0)
-	vtno = kdVirtualTerminal;
-    else
-    {
-	if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0)
-	{
-	    FatalError(
-		       "LinuxInit: Cannot open /dev/tty0 (%s)\n",
-		       strerror(errno));
-	}
-	if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) ||
-	    (vtno == -1))
-	{
-	    FatalError("xf86OpenConsole: Cannot find a free VT\n");
-	}
-	close(fd);
+        vtno = kdVirtualTerminal;
+    else {
+        if ((fd = open("/dev/tty0", O_WRONLY, 0)) < 0) {
+            FatalError("LinuxInit: Cannot open /dev/tty0 (%s)\n",
+                       strerror(errno));
+        }
+        if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) {
+            FatalError("xf86OpenConsole: Cannot find a free VT\n");
+        }
+        close(fd);
     }
 
-    snprintf(vtname,sizeof(vtname),"/dev/tty%d",vtno); /* /dev/tty1-64 */
+    snprintf(vtname, sizeof(vtname), "/dev/tty%d", vtno);       /* /dev/tty1-64 */
 
-    if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0)
-    {
-	FatalError("LinuxInit: Cannot open %s (%s)\n",
-		   vtname, strerror(errno));
+    if ((LinuxConsoleFd = open(vtname, O_RDWR | O_NDELAY, 0)) < 0) {
+        FatalError("LinuxInit: Cannot open %s (%s)\n", vtname, strerror(errno));
     }
 
     /* change ownership of the vt */
-    LinuxCheckChown (vtname);
+    LinuxCheckChown(vtname);
 
     /*
      * the current VT device we're running on is not "console", we want
@@ -126,109 +118,100 @@ LinuxInit (void)
      *
      * Why is this needed?
      */
-    LinuxCheckChown ("/dev/tty0");
+    LinuxCheckChown("/dev/tty0");
     /*
      * Linux doesn't switch to an active vt after the last close of a vt,
      * so we do this ourselves by remembering which is active now.
      */
-    memset (&vts, '\0', sizeof (vts));	/* valgrind */
-    if (ioctl(LinuxConsoleFd, VT_GETSTATE, &vts) == 0)
-    {
-	activeVT = vts.v_active;
+    memset(&vts, '\0', sizeof(vts));    /* valgrind */
+    if (ioctl(LinuxConsoleFd, VT_GETSTATE, &vts) == 0) {
+        activeVT = vts.v_active;
     }
 
     return 1;
 }
 
 static void
-LinuxSetSwitchMode (int mode)
+LinuxSetSwitchMode(int mode)
 {
-    struct sigaction	act;
-    struct vt_mode	VT;
+    struct sigaction act;
+    struct vt_mode VT;
 
-    if (ioctl(LinuxConsoleFd, VT_GETMODE, &VT) < 0)
-    {
-	FatalError ("LinuxInit: VT_GETMODE failed\n");
+    if (ioctl(LinuxConsoleFd, VT_GETMODE, &VT) < 0) {
+        FatalError("LinuxInit: VT_GETMODE failed\n");
     }
 
-    if (mode == VT_PROCESS)
-    {
-	act.sa_handler = LinuxVTRequest;
-	sigemptyset (&act.sa_mask);
-	act.sa_flags = 0;
-	sigaction (SIGUSR1, &act, 0);
+    if (mode == VT_PROCESS) {
+        act.sa_handler = LinuxVTRequest;
+        sigemptyset(&act.sa_mask);
+        act.sa_flags = 0;
+        sigaction(SIGUSR1, &act, 0);
 
-	VT.mode = mode;
-	VT.relsig = SIGUSR1;
-	VT.acqsig = SIGUSR1;
+        VT.mode = mode;
+        VT.relsig = SIGUSR1;
+        VT.acqsig = SIGUSR1;
     }
-    else
-    {
-	act.sa_handler = SIG_IGN;
-	sigemptyset (&act.sa_mask);
-	act.sa_flags = 0;
-	sigaction (SIGUSR1, &act, 0);
-
-	VT.mode = mode;
-	VT.relsig = 0;
-	VT.acqsig = 0;
+    else {
+        act.sa_handler = SIG_IGN;
+        sigemptyset(&act.sa_mask);
+        act.sa_flags = 0;
+        sigaction(SIGUSR1, &act, 0);
+
+        VT.mode = mode;
+        VT.relsig = 0;
+        VT.acqsig = 0;
     }
-    if (ioctl(LinuxConsoleFd, VT_SETMODE, &VT) < 0)
-    {
-	FatalError("LinuxInit: VT_SETMODE failed\n");
+    if (ioctl(LinuxConsoleFd, VT_SETMODE, &VT) < 0) {
+        FatalError("LinuxInit: VT_SETMODE failed\n");
     }
 }
 
 static void
-LinuxApmBlock (pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
+LinuxApmBlock(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
 {
 }
 
 static Bool LinuxApmRunning;
 
 static void
-LinuxApmWakeup (pointer blockData, int result, pointer pReadmask)
+LinuxApmWakeup(pointer blockData, int result, pointer pReadmask)
 {
-    fd_set  *readmask = (fd_set *) pReadmask;
-
-    if (result > 0 && LinuxApmFd >= 0 && FD_ISSET (LinuxApmFd, readmask))
-    {
-	apm_event_t event;
-	Bool	    running = LinuxApmRunning;
-	int	    cmd = APM_IOC_SUSPEND;
-
-	while (read (LinuxApmFd, &event, sizeof (event)) == sizeof (event))
-	{
-	    switch (event) {
-	    case APM_SYS_STANDBY:
-	    case APM_USER_STANDBY:
-		running = FALSE;
-		cmd = APM_IOC_STANDBY;
-		break;
-	    case APM_SYS_SUSPEND:
-	    case APM_USER_SUSPEND:
-	    case APM_CRITICAL_SUSPEND:
-		running = FALSE;
-		cmd = APM_IOC_SUSPEND;
-		break;
-	    case APM_NORMAL_RESUME:
-	    case APM_CRITICAL_RESUME:
-	    case APM_STANDBY_RESUME:
-		running = TRUE;
-		break;
-	    }
-	}
-	if (running && !LinuxApmRunning)
-	{
-	    KdResume ();
-	    LinuxApmRunning = TRUE;
-	}
-	else if (!running && LinuxApmRunning)
-	{
-	    KdSuspend ();
-	    LinuxApmRunning = FALSE;
-	    ioctl (LinuxApmFd, cmd, 0);
-	}
+    fd_set *readmask = (fd_set *) pReadmask;
+
+    if (result > 0 && LinuxApmFd >= 0 && FD_ISSET(LinuxApmFd, readmask)) {
+        apm_event_t event;
+        Bool running = LinuxApmRunning;
+        int cmd = APM_IOC_SUSPEND;
+
+        while (read(LinuxApmFd, &event, sizeof(event)) == sizeof(event)) {
+            switch (event) {
+            case APM_SYS_STANDBY:
+            case APM_USER_STANDBY:
+                running = FALSE;
+                cmd = APM_IOC_STANDBY;
+                break;
+            case APM_SYS_SUSPEND:
+            case APM_USER_SUSPEND:
+            case APM_CRITICAL_SUSPEND:
+                running = FALSE;
+                cmd = APM_IOC_SUSPEND;
+                break;
+            case APM_NORMAL_RESUME:
+            case APM_CRITICAL_RESUME:
+            case APM_STANDBY_RESUME:
+                running = TRUE;
+                break;
+            }
+        }
+        if (running && !LinuxApmRunning) {
+            KdResume();
+            LinuxApmRunning = TRUE;
+        }
+        else if (!running && LinuxApmRunning) {
+            KdSuspend();
+            LinuxApmRunning = FALSE;
+            ioctl(LinuxApmFd, cmd, 0);
+        }
     }
 }
 
@@ -239,127 +222,115 @@ LinuxApmWakeup (pointer blockData, int result, pointer pReadmask)
 #endif
 
 static void
-LinuxEnable (void)
+LinuxEnable(void)
 {
     if (enabled)
-	return;
-    if (kdSwitchPending)
-    {
-	kdSwitchPending = FALSE;
-	ioctl (LinuxConsoleFd, VT_RELDISP, VT_ACKACQ);
+        return;
+    if (kdSwitchPending) {
+        kdSwitchPending = FALSE;
+        ioctl(LinuxConsoleFd, VT_RELDISP, VT_ACKACQ);
     }
     /*
      * Open the APM driver
      */
-    LinuxApmFd = open ("/dev/apm_bios", 2);
+    LinuxApmFd = open("/dev/apm_bios", 2);
     if (LinuxApmFd < 0 && errno == ENOENT)
-	LinuxApmFd = open ("/dev/misc/apm_bios", 2);
-    if (LinuxApmFd >= 0)
-    {
-	LinuxApmRunning = TRUE;
-	fcntl (LinuxApmFd, F_SETFL, fcntl (LinuxApmFd, F_GETFL) | NOBLOCK);
-	RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
-	AddEnabledDevice (LinuxApmFd);
+        LinuxApmFd = open("/dev/misc/apm_bios", 2);
+    if (LinuxApmFd >= 0) {
+        LinuxApmRunning = TRUE;
+        fcntl(LinuxApmFd, F_SETFL, fcntl(LinuxApmFd, F_GETFL) | NOBLOCK);
+        RegisterBlockAndWakeupHandlers(LinuxApmBlock, LinuxApmWakeup, 0);
+        AddEnabledDevice(LinuxApmFd);
     }
 
     /*
      * now get the VT
      */
-    LinuxSetSwitchMode (VT_AUTO);
-    if (ioctl(LinuxConsoleFd, VT_ACTIVATE, vtno) != 0)
-    {
-	FatalError("LinuxInit: VT_ACTIVATE failed\n");
+    LinuxSetSwitchMode(VT_AUTO);
+    if (ioctl(LinuxConsoleFd, VT_ACTIVATE, vtno) != 0) {
+        FatalError("LinuxInit: VT_ACTIVATE failed\n");
     }
-    if (ioctl(LinuxConsoleFd, VT_WAITACTIVE, vtno) != 0)
-    {
-	FatalError("LinuxInit: VT_WAITACTIVE failed\n");
+    if (ioctl(LinuxConsoleFd, VT_WAITACTIVE, vtno) != 0) {
+        FatalError("LinuxInit: VT_WAITACTIVE failed\n");
     }
-    LinuxSetSwitchMode (VT_PROCESS);
-    if (ioctl(LinuxConsoleFd, KDSETMODE, KD_GRAPHICS) < 0)
-    {
-	FatalError("LinuxInit: KDSETMODE KD_GRAPHICS failed\n");
+    LinuxSetSwitchMode(VT_PROCESS);
+    if (ioctl(LinuxConsoleFd, KDSETMODE, KD_GRAPHICS) < 0) {
+        FatalError("LinuxInit: KDSETMODE KD_GRAPHICS failed\n");
     }
     enabled = TRUE;
 }
 
 static void
-LinuxDisable (void)
+LinuxDisable(void)
 {
     ioctl(LinuxConsoleFd, KDSETMODE, KD_TEXT);  /* Back to text mode ... */
-    if (kdSwitchPending)
-    {
-	kdSwitchPending = FALSE;
-	ioctl (LinuxConsoleFd, VT_RELDISP, 1);
+    if (kdSwitchPending) {
+        kdSwitchPending = FALSE;
+        ioctl(LinuxConsoleFd, VT_RELDISP, 1);
     }
     enabled = FALSE;
-    if (LinuxApmFd >= 0)
-    {
-	RemoveBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
-	RemoveEnabledDevice (LinuxApmFd);
-	close (LinuxApmFd);
-	LinuxApmFd = -1;
+    if (LinuxApmFd >= 0) {
+        RemoveBlockAndWakeupHandlers(LinuxApmBlock, LinuxApmWakeup, 0);
+        RemoveEnabledDevice(LinuxApmFd);
+        close(LinuxApmFd);
+        LinuxApmFd = -1;
     }
 }
 
 static void
-LinuxFini (void)
+LinuxFini(void)
 {
-    struct vt_mode   VT;
-    struct vt_stat  vts;
-    int		    fd;
+    struct vt_mode VT;
+    struct vt_stat vts;
+    int fd;
 
     if (LinuxConsoleFd < 0)
-	return;
+        return;
 
-    if (ioctl(LinuxConsoleFd, VT_GETMODE, &VT) != -1)
-    {
-	VT.mode = VT_AUTO;
-	ioctl(LinuxConsoleFd, VT_SETMODE, &VT); /* set dflt vt handling */
+    if (ioctl(LinuxConsoleFd, VT_GETMODE, &VT) != -1) {
+        VT.mode = VT_AUTO;
+        ioctl(LinuxConsoleFd, VT_SETMODE, &VT); /* set dflt vt handling */
     }
-    memset (&vts, '\0', sizeof (vts));	/* valgrind */
-    ioctl (LinuxConsoleFd, VT_GETSTATE, &vts);
-    if (vtno == vts.v_active)
-    {
-	/*
-	 * Find a legal VT to switch to, either the one we started from
-	 * or the lowest active one that isn't ours
-	 */
-	if (activeVT < 0 ||
-	    activeVT == vts.v_active ||
-	    !(vts.v_state & (1 << activeVT)))
-	{
-	    for (activeVT = 1; activeVT < 16; activeVT++)
-		if (activeVT != vtno && (vts.v_state & (1 << activeVT)))
-		    break;
-	    if (activeVT == 16)
-		activeVT = -1;
-	}
-	/*
-	 * Perform a switch back to the active VT when we were started
-	 */
-	if (activeVT >= -1)
-	{
-	    ioctl (LinuxConsoleFd, VT_ACTIVATE, activeVT);
-	    ioctl (LinuxConsoleFd, VT_WAITACTIVE, activeVT);
-	    activeVT = -1;
-	}
+    memset(&vts, '\0', sizeof(vts));    /* valgrind */
+    ioctl(LinuxConsoleFd, VT_GETSTATE, &vts);
+    if (vtno == vts.v_active) {
+        /*
+         * Find a legal VT to switch to, either the one we started from
+         * or the lowest active one that isn't ours
+         */
+        if (activeVT < 0 ||
+            activeVT == vts.v_active || !(vts.v_state & (1 << activeVT))) {
+            for (activeVT = 1; activeVT < 16; activeVT++)
+                if (activeVT != vtno && (vts.v_state & (1 << activeVT)))
+                    break;
+            if (activeVT == 16)
+                activeVT = -1;
+        }
+        /*
+         * Perform a switch back to the active VT when we were started
+         */
+        if (activeVT >= -1) {
+            ioctl(LinuxConsoleFd, VT_ACTIVATE, activeVT);
+            ioctl(LinuxConsoleFd, VT_WAITACTIVE, activeVT);
+            activeVT = -1;
+        }
     }
-    close(LinuxConsoleFd);                /* make the vt-manager happy */
+    close(LinuxConsoleFd);      /* make the vt-manager happy */
     LinuxConsoleFd = -1;
-    fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0);
-    if (fd >= 0)
-    {
-	memset (&vts, '\0', sizeof (vts));	/* valgrind */
-	ioctl (fd, VT_GETSTATE, &vts);
-	if (ioctl (fd, VT_DISALLOCATE, vtno) < 0)
-	    fprintf (stderr, "Can't deallocate console %d %s\n", vtno, strerror(errno));
-	close (fd);
+    fd = open("/dev/tty0", O_RDWR | O_NDELAY, 0);
+    if (fd >= 0) {
+        memset(&vts, '\0', sizeof(vts));        /* valgrind */
+        ioctl(fd, VT_GETSTATE, &vts);
+        if (ioctl(fd, VT_DISALLOCATE, vtno) < 0)
+            fprintf(stderr, "Can't deallocate console %d %s\n", vtno,
+                    strerror(errno));
+        close(fd);
     }
     return;
 }
 
 void
-KdOsAddInputDrivers (void)
+KdOsAddInputDrivers(void)
 {
 #ifdef KDRIVE_MOUSE
     KdAddPointerDriver(&LinuxMouseDriver);
@@ -383,10 +354,10 @@ LinuxBell(int volume, int pitch, int duration)
 {
     if (volume && pitch)
         ioctl(LinuxConsoleFd, KDMKTONE, ((1193190 / pitch) & 0xffff) |
-              (((unsigned long)duration * volume / 50) << 16));
+              (((unsigned long) duration * volume / 50) << 16));
 }
 
-KdOsFuncs   LinuxFuncs = {
+KdOsFuncs LinuxFuncs = {
     .Init = LinuxInit,
     .Enable = LinuxEnable,
     .Disable = LinuxDisable,
@@ -395,7 +366,7 @@ KdOsFuncs   LinuxFuncs = {
 };
 
 void
-OsVendorInit (void)
+OsVendorInit(void)
 {
-    KdOsInit (&LinuxFuncs);
+    KdOsInit(&LinuxFuncs);
 }
diff --git a/xorg-server/hw/kdrive/linux/mouse.c b/xorg-server/hw/kdrive/linux/mouse.c
index 93c207817..c87507790 100644
--- a/xorg-server/hw/kdrive/linux/mouse.c
+++ b/xorg-server/hw/kdrive/linux/mouse.c
@@ -38,185 +38,176 @@
 #define MOUSE_TIMEOUT	100
 
 typedef struct _kbufio {
-    int		    fd;
-    unsigned char   buf[KBUFIO_SIZE];
-    int		    avail;
-    int		    used;
+    int fd;
+    unsigned char buf[KBUFIO_SIZE];
+    int avail;
+    int used;
 } Kbufio;
 
 static Bool
-MouseWaitForReadable (int fd, int timeout)
+MouseWaitForReadable(int fd, int timeout)
 {
-    fd_set	    set;
-    struct timeval  tv, *tp;
-    int		    n;
-    CARD32	    done;
-
-    done = GetTimeInMillis () + timeout;
-    for (;;)
-    {
-	FD_ZERO (&set);
-	FD_SET (fd, &set);
-	if (timeout == -1)
-	    tp = 0;
-	else
-	{
-	    tv.tv_sec = timeout / 1000;
-	    tv.tv_usec = (timeout % 1000) * 1000;
-	    tp = &tv;
-	}
-	n = select (fd + 1, &set, 0, 0, tp);
-	if (n > 0)
-	    return TRUE;
-	if (n < 0 && (errno == EAGAIN || errno == EINTR))
-	{
-	    timeout = (int) (done - GetTimeInMillis ());
-	    if (timeout > 0)
-		continue;
-	}
-	break;
+    fd_set set;
+    struct timeval tv, *tp;
+    int n;
+    CARD32 done;
+
+    done = GetTimeInMillis() + timeout;
+    for (;;) {
+        FD_ZERO(&set);
+        FD_SET(fd, &set);
+        if (timeout == -1)
+            tp = 0;
+        else {
+            tv.tv_sec = timeout / 1000;
+            tv.tv_usec = (timeout % 1000) * 1000;
+            tp = &tv;
+        }
+        n = select(fd + 1, &set, 0, 0, tp);
+        if (n > 0)
+            return TRUE;
+        if (n < 0 && (errno == EAGAIN || errno == EINTR)) {
+            timeout = (int) (done - GetTimeInMillis());
+            if (timeout > 0)
+                continue;
+        }
+        break;
     }
     return FALSE;
 }
 
 static int
-MouseReadByte (Kbufio *b, int timeout)
+MouseReadByte(Kbufio * b, int timeout)
 {
-    int	n;
-    if (b->avail <= b->used)
-    {
-	if (timeout && !MouseWaitForReadable (b->fd, timeout))
-	{
+    int n;
+
+    if (b->avail <= b->used) {
+        if (timeout && !MouseWaitForReadable(b->fd, timeout)) {
 #ifdef DEBUG_BYTES
-	    ErrorF ("\tTimeout %d\n", timeout);
+            ErrorF("\tTimeout %d\n", timeout);
 #endif
-	    return -1;
-	}
-	n = read (b->fd, b->buf, KBUFIO_SIZE);
-	if (n <= 0)
-	    return -1;
+            return -1;
+        }
+        n = read(b->fd, b->buf, KBUFIO_SIZE);
+        if (n <= 0)
+            return -1;
         b->avail = n;
         b->used = 0;
     }
 #ifdef DEBUG_BYTES
-    ErrorF ("\tget %02x\n", b->buf[b->used]);
+    ErrorF("\tget %02x\n", b->buf[b->used]);
 #endif
     return b->buf[b->used++];
 }
 
 #if NOTUSED
 static int
-MouseFlush (Kbufio *b, char *buf, int size)
+MouseFlush(Kbufio * b, char *buf, int size)
 {
-    CARD32  now = GetTimeInMillis ();
-    CARD32  done = now + 100;
-    int	    c;
-    int	    n = 0;
-
-    while ((c = MouseReadByte (b, done - now)) != -1)
-    {
-	if (buf)
-	{
-	    if (n == size)
-	    {
-		memmove (buf, buf + 1, size - 1);
-		n--;
-	    }
-	    buf[n++] = c;
-	}
-	now = GetTimeInMillis ();
-	if ((INT32) (now - done) >= 0)
-	    break;
+    CARD32 now = GetTimeInMillis();
+    CARD32 done = now + 100;
+    int c;
+    int n = 0;
+
+    while ((c = MouseReadByte(b, done - now)) != -1) {
+        if (buf) {
+            if (n == size) {
+                memmove(buf, buf + 1, size - 1);
+                n--;
+            }
+            buf[n++] = c;
+        }
+        now = GetTimeInMillis();
+        if ((INT32) (now - done) >= 0)
+            break;
     }
     return n;
 }
 
 static int
-MousePeekByte (Kbufio *b, int timeout)
+MousePeekByte(Kbufio * b, int timeout)
 {
-    int	    c;
+    int c;
 
-    c = MouseReadByte (b, timeout);
+    c = MouseReadByte(b, timeout);
     if (c != -1)
-	--b->used;
+        --b->used;
     return c;
 }
-#endif /* NOTUSED */
+#endif                          /* NOTUSED */
 
 static Bool
-MouseWaitForWritable (int fd, int timeout)
+MouseWaitForWritable(int fd, int timeout)
 {
-    fd_set	    set;
-    struct timeval  tv, *tp;
-    int		    n;
+    fd_set set;
+    struct timeval tv, *tp;
+    int n;
 
-    FD_ZERO (&set);
-    FD_SET (fd, &set);
+    FD_ZERO(&set);
+    FD_SET(fd, &set);
     if (timeout == -1)
-	tp = 0;
-    else
-    {
-	tv.tv_sec = timeout / 1000;
-	tv.tv_usec = (timeout % 1000) * 1000;
-	tp = &tv;
+        tp = 0;
+    else {
+        tv.tv_sec = timeout / 1000;
+        tv.tv_usec = (timeout % 1000) * 1000;
+        tp = &tv;
     }
-    n = select (fd + 1, 0, &set, 0, tp);
+    n = select(fd + 1, 0, &set, 0, tp);
     if (n > 0)
-	return TRUE;
+        return TRUE;
     return FALSE;
 }
 
 static Bool
-MouseWriteByte (int fd, unsigned char c, int timeout)
+MouseWriteByte(int fd, unsigned char c, int timeout)
 {
-    int	ret;
+    int ret;
 
 #ifdef DEBUG_BYTES
-    ErrorF ("\tput %02x\n", c);
+    ErrorF("\tput %02x\n", c);
 #endif
-    for (;;)
-    {
-	ret = write (fd, &c, 1);
-	if (ret == 1)
-	    return TRUE;
-	if (ret == 0)
-	    return FALSE;
-	if (errno != EWOULDBLOCK)
-	    return FALSE;
-	if (!MouseWaitForWritable (fd, timeout))
-	    return FALSE;
+    for (;;) {
+        ret = write(fd, &c, 1);
+        if (ret == 1)
+            return TRUE;
+        if (ret == 0)
+            return FALSE;
+        if (errno != EWOULDBLOCK)
+            return FALSE;
+        if (!MouseWaitForWritable(fd, timeout))
+            return FALSE;
     }
 }
 
 static Bool
-MouseWriteBytes (int fd, unsigned char *c, int n, int timeout)
+MouseWriteBytes(int fd, unsigned char *c, int n, int timeout)
 {
     while (n--)
-	if (!MouseWriteByte (fd, *c++, timeout))
-	    return FALSE;
+        if (!MouseWriteByte(fd, *c++, timeout))
+            return FALSE;
     return TRUE;
 }
 
-#define MAX_MOUSE   10	    /* maximum length of mouse protocol */
-#define MAX_SKIP    16	    /* number of error bytes before switching */
-#define MAX_VALID   4	    /* number of valid packets before accepting */
+#define MAX_MOUSE   10          /* maximum length of mouse protocol */
+#define MAX_SKIP    16          /* number of error bytes before switching */
+#define MAX_VALID   4           /* number of valid packets before accepting */
 
 typedef struct _kmouseProt {
-    char	    *name;
-    Bool	    (*Complete) (KdPointerInfo *pi, unsigned char *ev, int ne);
-    int		    (*Valid) (KdPointerInfo *pi, unsigned char *ev, int ne);
-    Bool	    (*Parse) (KdPointerInfo *pi, unsigned char *ev, int ne);
-    Bool	    (*Init) (KdPointerInfo *pi);
-    unsigned char   headerMask, headerValid;
-    unsigned char   dataMask, dataValid;
-    Bool	    tty;
-    unsigned int    c_iflag;
-    unsigned int    c_oflag;
-    unsigned int    c_lflag;
-    unsigned int    c_cflag;
-    unsigned int    speed;
-    unsigned char   *init;
-    unsigned long   state;
+    char *name;
+    Bool (*Complete) (KdPointerInfo * pi, unsigned char *ev, int ne);
+    int (*Valid) (KdPointerInfo * pi, unsigned char *ev, int ne);
+    Bool (*Parse) (KdPointerInfo * pi, unsigned char *ev, int ne);
+    Bool (*Init) (KdPointerInfo * pi);
+    unsigned char headerMask, headerValid;
+    unsigned char dataMask, dataValid;
+    Bool tty;
+    unsigned int c_iflag;
+    unsigned int c_oflag;
+    unsigned int c_lflag;
+    unsigned int c_cflag;
+    unsigned int speed;
+    unsigned char *init;
+    unsigned long state;
 } KmouseProt;
 
 typedef enum _kmouseStage {
@@ -224,68 +215,71 @@ typedef enum _kmouseStage {
 } KmouseStage;
 
 typedef struct _kmouse {
-    Kbufio		iob;
-    const KmouseProt	*prot;
-    int			i_prot;
-    KmouseStage		stage;	/* protocol verification stage */
-    Bool		tty;	/* mouse device is a tty */
-    int			valid;	/* sequential valid events */
-    int			tested;	/* bytes scanned during Testing phase */
-    int			invalid;/* total invalid bytes for this protocol */
-    unsigned long	state;	/* private per protocol, init to prot->state */
+    Kbufio iob;
+    const KmouseProt *prot;
+    int i_prot;
+    KmouseStage stage;          /* protocol verification stage */
+    Bool tty;                   /* mouse device is a tty */
+    int valid;                  /* sequential valid events */
+    int tested;                 /* bytes scanned during Testing phase */
+    int invalid;                /* total invalid bytes for this protocol */
+    unsigned long state;        /* private per protocol, init to prot->state */
 } Kmouse;
 
-static int mouseValid (KdPointerInfo *pi, unsigned char *ev, int ne)
+static int
+mouseValid(KdPointerInfo * pi, unsigned char *ev, int ne)
 {
-    Kmouse		*km = pi->driverPrivate;
-    const KmouseProt	*prot = km->prot;
-    int	    i;
+    Kmouse *km = pi->driverPrivate;
+    const KmouseProt *prot = km->prot;
+    int i;
 
     for (i = 0; i < ne; i++)
-	if ((ev[i] & prot->headerMask) == prot->headerValid)
-	    break;
+        if ((ev[i] & prot->headerMask) == prot->headerValid)
+            break;
     if (i != 0)
-	return i;
+        return i;
     for (i = 1; i < ne; i++)
-	if ((ev[i] & prot->dataMask) != prot->dataValid)
-	    return -1;
+        if ((ev[i] & prot->dataMask) != prot->dataValid)
+            return -1;
     return 0;
 }
 
-static Bool threeComplete (KdPointerInfo *pi, unsigned char *ev, int ne)
+static Bool
+threeComplete(KdPointerInfo * pi, unsigned char *ev, int ne)
 {
     return ne == 3;
 }
 
-static Bool fourComplete (KdPointerInfo *pi, unsigned char *ev, int ne)
+static Bool
+fourComplete(KdPointerInfo * pi, unsigned char *ev, int ne)
 {
     return ne == 4;
 }
 
-static Bool fiveComplete (KdPointerInfo *pi, unsigned char *ev, int ne)
+static Bool
+fiveComplete(KdPointerInfo * pi, unsigned char *ev, int ne)
 {
     return ne == 5;
 }
 
-static Bool MouseReasonable (KdPointerInfo *pi, unsigned long flags, int dx, int dy)
+static Bool
+MouseReasonable(KdPointerInfo * pi, unsigned long flags, int dx, int dy)
 {
-    Kmouse		*km = pi->driverPrivate;
+    Kmouse *km = pi->driverPrivate;
 
     if (km->stage == MouseWorking)
-	return TRUE;
-    if (dx < -50 || dx > 50)
-    {
+        return TRUE;
+    if (dx < -50 || dx > 50) {
 #ifdef DEBUG
-	ErrorF ("Large X %d\n", dx);
+        ErrorF("Large X %d\n", dx);
 #endif
-	return FALSE;
+        return FALSE;
     }
-    if (dy < -50 || dy > 50)
-    {
+    if (dy < -50 || dy > 50) {
 #ifdef DEBUG
-	ErrorF ("Large Y %d\n", dy);
+        ErrorF("Large Y %d\n", dy);
 #endif
-	return FALSE;
+        return FALSE;
     }
     return TRUE;
 }
@@ -293,58 +287,54 @@ static Bool MouseReasonable (KdPointerInfo *pi, unsigned long flags, int dx, int
 /*
  * Standard PS/2 mouse protocol
  */
-static Bool ps2Parse (KdPointerInfo *pi, unsigned char *ev, int ne)
+static Bool
+ps2Parse(KdPointerInfo * pi, unsigned char *ev, int ne)
 {
-    Kmouse	    *km = pi->driverPrivate;
-    int		    dx, dy, dz;
-    unsigned long   flags;
-    unsigned long   flagsrelease = 0;
+    Kmouse *km = pi->driverPrivate;
+    int dx, dy, dz;
+    unsigned long flags;
+    unsigned long flagsrelease = 0;
 
     flags = KD_MOUSE_DELTA;
     if (ev[0] & 4)
-	flags |= KD_BUTTON_2;
+        flags |= KD_BUTTON_2;
     if (ev[0] & 2)
-	flags |= KD_BUTTON_3;
+        flags |= KD_BUTTON_3;
     if (ev[0] & 1)
-	flags |= KD_BUTTON_1;
-
-    if (ne > 3)
-    {
-	dz = (int) (signed char) ev[3];
-	if (dz < 0)
-	{
-	    flags |= KD_BUTTON_4;
-	    flagsrelease = KD_BUTTON_4;
-	}
-	else if (dz > 0)
-	{
-	    flags |= KD_BUTTON_5;
-	    flagsrelease = KD_BUTTON_5;
-	}
+        flags |= KD_BUTTON_1;
+
+    if (ne > 3) {
+        dz = (int) (signed char) ev[3];
+        if (dz < 0) {
+            flags |= KD_BUTTON_4;
+            flagsrelease = KD_BUTTON_4;
+        }
+        else if (dz > 0) {
+            flags |= KD_BUTTON_5;
+            flagsrelease = KD_BUTTON_5;
+        }
     }
 
     dx = ev[1];
     if (ev[0] & 0x10)
-	dx -= 256;
+        dx -= 256;
     dy = ev[2];
     if (ev[0] & 0x20)
-	dy -= 256;
+        dy -= 256;
     dy = -dy;
-    if (!MouseReasonable (pi, flags, dx, dy))
-	return FALSE;
-    if (km->stage == MouseWorking)
-    {
-	KdEnqueuePointerEvent (pi, flags, dx, dy, 0);
-	if (flagsrelease)
-	{
-	    flags &= ~flagsrelease;
-	    KdEnqueuePointerEvent (pi, flags, dx, dy, 0);
-	}
+    if (!MouseReasonable(pi, flags, dx, dy))
+        return FALSE;
+    if (km->stage == MouseWorking) {
+        KdEnqueuePointerEvent(pi, flags, dx, dy, 0);
+        if (flagsrelease) {
+            flags &= ~flagsrelease;
+            KdEnqueuePointerEvent(pi, flags, dx, dy, 0);
+        }
     }
     return TRUE;
 }
 
-static Bool ps2Init (KdPointerInfo *pi);
+static Bool ps2Init(KdPointerInfo * pi);
 
 static const KmouseProt ps2Prot = {
     "ps/2",
@@ -407,143 +397,143 @@ static const KmouseProt exps2Prot = {
 #define PSM_4DMOUSE_ID          6
 #define PSM_4DPLUS_ID           8
 
-static unsigned char	ps2_init[] = {
+static unsigned char ps2_init[] = {
     PSMC_ENABLE_DEV,
     0,
 };
 
 #define NINIT_PS2   1
 
-static unsigned char    wheel_3button_init[] = {
+static unsigned char wheel_3button_init[] = {
     PSMC_SET_SAMPLING_RATE, 200,
     PSMC_SET_SAMPLING_RATE, 100,
-    PSMC_SET_SAMPLING_RATE,  80,
+    PSMC_SET_SAMPLING_RATE, 80,
     PSMC_SEND_DEV_ID,
     0,
 };
 
 #define NINIT_IMPS2 4
 
-static unsigned char    wheel_5button_init[] = {
+static unsigned char wheel_5button_init[] = {
     PSMC_SET_SAMPLING_RATE, 200,
     PSMC_SET_SAMPLING_RATE, 100,
-    PSMC_SET_SAMPLING_RATE,  80,
+    PSMC_SET_SAMPLING_RATE, 80,
     PSMC_SET_SAMPLING_RATE, 200,
     PSMC_SET_SAMPLING_RATE, 200,
-    PSMC_SET_SAMPLING_RATE,  80,
+    PSMC_SET_SAMPLING_RATE, 80,
     PSMC_SEND_DEV_ID,
     0
 };
 
 #define NINIT_EXPS2 7
 
-static unsigned char	intelli_init[] = {
+static unsigned char intelli_init[] = {
     PSMC_SET_SAMPLING_RATE, 200,
     PSMC_SET_SAMPLING_RATE, 100,
-    PSMC_SET_SAMPLING_RATE,  80,
+    PSMC_SET_SAMPLING_RATE, 80,
     0
 };
 
 #define NINIT_INTELLI	3
 
 static int
-ps2SkipInit (KdPointerInfo *pi, int ninit, Bool ret_next)
+ps2SkipInit(KdPointerInfo * pi, int ninit, Bool ret_next)
 {
-    Kmouse  *km = pi->driverPrivate;
-    int	    c = -1;
-    int	    skipping;
-    Bool    waiting;
+    Kmouse *km = pi->driverPrivate;
+    int c = -1;
+    int skipping;
+    Bool waiting;
 
     skipping = 0;
     waiting = FALSE;
-    while (ninit || ret_next)
-    {
-	c = MouseReadByte (&km->iob, MOUSE_TIMEOUT);
-	if (c == -1)
-	    break;
-	/* look for ACK */
-	if (c == 0xfa)
-	{
-	    ninit--;
-	    if (ret_next)
-		waiting = TRUE;
-	}
-	/* look for packet start -- not the response */
-	else if ((c & 0x08) == 0x08)
-	    waiting = FALSE;
-	else if (waiting)
-	    break;
+    while (ninit || ret_next) {
+        c = MouseReadByte(&km->iob, MOUSE_TIMEOUT);
+        if (c == -1)
+            break;
+        /* look for ACK */
+        if (c == 0xfa) {
+            ninit--;
+            if (ret_next)
+                waiting = TRUE;
+        }
+        /* look for packet start -- not the response */
+        else if ((c & 0x08) == 0x08)
+            waiting = FALSE;
+        else if (waiting)
+            break;
     }
     return c;
 }
 
 static Bool
-ps2Init (KdPointerInfo *pi)
+ps2Init(KdPointerInfo * pi)
 {
-    Kmouse	    *km = pi->driverPrivate;
-    int		    skipping;
-    Bool	    waiting;
-    int		    id;
-    unsigned char   *init;
-    int		    ninit;
+    Kmouse *km = pi->driverPrivate;
+    int skipping;
+    Bool waiting;
+    int id;
+    unsigned char *init;
+    int ninit;
 
     /* Send Intellimouse initialization sequence */
-    MouseWriteBytes (km->iob.fd, intelli_init, strlen ((char *) intelli_init), 100);
+    MouseWriteBytes(km->iob.fd, intelli_init, strlen((char *) intelli_init),
+                    100);
     /*
      * Send ID command
      */
-    if (!MouseWriteByte (km->iob.fd, PSMC_SEND_DEV_ID, 100))
-	return FALSE;
+    if (!MouseWriteByte(km->iob.fd, PSMC_SEND_DEV_ID, 100))
+        return FALSE;
     skipping = 0;
     waiting = FALSE;
-    id = ps2SkipInit (pi, 0, TRUE);
+    id = ps2SkipInit(pi, 0, TRUE);
     switch (id) {
     case 3:
-	init = wheel_3button_init;
-	ninit = NINIT_IMPS2;
-	km->prot = &imps2Prot;
-	break;
+        init = wheel_3button_init;
+        ninit = NINIT_IMPS2;
+        km->prot = &imps2Prot;
+        break;
     case 4:
-	init = wheel_5button_init;
-	ninit = NINIT_EXPS2;
-	km->prot = &exps2Prot;
-	break;
+        init = wheel_5button_init;
+        ninit = NINIT_EXPS2;
+        km->prot = &exps2Prot;
+        break;
     default:
-	init = ps2_init;
-	ninit = NINIT_PS2;
-	km->prot = &ps2Prot;
-	break;
+        init = ps2_init;
+        ninit = NINIT_PS2;
+        km->prot = &ps2Prot;
+        break;
     }
     if (init)
-	MouseWriteBytes (km->iob.fd, init, strlen ((char *) init), 100);
+        MouseWriteBytes(km->iob.fd, init, strlen((char *) init), 100);
     /*
      * Flush out the available data to eliminate responses to the
      * initialization string.  Make sure any partial event is
      * skipped
      */
-    (void) ps2SkipInit (pi, ninit, FALSE);
+    (void) ps2SkipInit(pi, ninit, FALSE);
     return TRUE;
 }
 
-static Bool busParse (KdPointerInfo *pi, unsigned char *ev, int ne)
+static Bool
+busParse(KdPointerInfo * pi, unsigned char *ev, int ne)
 {
-    Kmouse	    *km = pi->driverPrivate;
-    int		    dx, dy;
-    unsigned long   flags;
+    Kmouse *km = pi->driverPrivate;
+    int dx, dy;
+    unsigned long flags;
 
     flags = KD_MOUSE_DELTA;
     dx = (signed char) ev[1];
     dy = -(signed char) ev[2];
     if ((ev[0] & 4) == 0)
-	flags |= KD_BUTTON_1;
+        flags |= KD_BUTTON_1;
     if ((ev[0] & 2) == 0)
-	flags |= KD_BUTTON_2;
+        flags |= KD_BUTTON_2;
     if ((ev[0] & 1) == 0)
-	flags |= KD_BUTTON_3;
-    if (!MouseReasonable (pi, flags, dx, dy))
-	return FALSE;
+        flags |= KD_BUTTON_3;
+    if (!MouseReasonable(pi, flags, dx, dy))
+        return FALSE;
     if (km->stage == MouseWorking)
-	KdEnqueuePointerEvent (pi, flags, dx, dy, 0);
+        KdEnqueuePointerEvent(pi, flags, dx, dy, 0);
     return TRUE;
 }
 
@@ -558,25 +548,26 @@ static const KmouseProt busProt = {
  * Standard MS serial protocol, three bytes
  */
 
-static Bool msParse (KdPointerInfo *pi, unsigned char *ev, int ne)
+static Bool
+msParse(KdPointerInfo * pi, unsigned char *ev, int ne)
 {
-    Kmouse	    *km = pi->driverPrivate;
-    int		    dx, dy;
-    unsigned long   flags;
+    Kmouse *km = pi->driverPrivate;
+    int dx, dy;
+    unsigned long flags;
 
     flags = KD_MOUSE_DELTA;
 
     if (ev[0] & 0x20)
-	flags |= KD_BUTTON_1;
+        flags |= KD_BUTTON_1;
     if (ev[0] & 0x10)
-	flags |= KD_BUTTON_3;
+        flags |= KD_BUTTON_3;
 
-    dx = (signed char)(((ev[0] & 0x03) << 6) | (ev[1] & 0x3F));
-    dy = (signed char)(((ev[0] & 0x0C) << 4) | (ev[2] & 0x3F));
-    if (!MouseReasonable (pi, flags, dx, dy))
-	return FALSE;
+    dx = (signed char) (((ev[0] & 0x03) << 6) | (ev[1] & 0x3F));
+    dy = (signed char) (((ev[0] & 0x0C) << 4) | (ev[2] & 0x3F));
+    if (!MouseReasonable(pi, flags, dx, dy))
+        return FALSE;
     if (km->stage == MouseWorking)
-	KdEnqueuePointerEvent (pi, flags, dx, dy, 0);
+        KdEnqueuePointerEvent(pi, flags, dx, dy, 0);
     return TRUE;
 }
 
@@ -597,70 +588,70 @@ static const KmouseProt msProt = {
  * first byte of a synchronized protocol stream and see if it's got
  * any bits turned on that can't occur in that fourth byte
  */
-static Bool logiComplete (KdPointerInfo *pi, unsigned char *ev, int ne)
+static Bool
+logiComplete(KdPointerInfo * pi, unsigned char *ev, int ne)
 {
-    Kmouse		*km = pi->driverPrivate;
+    Kmouse *km = pi->driverPrivate;
 
     if ((ev[0] & 0x40) == 0x40)
-	return ne == 3;
+        return ne == 3;
     if (km->stage != MouseBroken && (ev[0] & ~0x23) == 0)
-	return ne == 1;
+        return ne == 1;
     return FALSE;
 }
 
-static int logiValid (KdPointerInfo *pi, unsigned char *ev, int ne)
+static int
+logiValid(KdPointerInfo * pi, unsigned char *ev, int ne)
 {
-    Kmouse		*km = pi->driverPrivate;
-    const KmouseProt	*prot = km->prot;
-    int	    i;
-
-    for (i = 0; i < ne; i++)
-    {
-	if ((ev[i] & 0x40) == 0x40)
-	    break;
-	if (km->stage != MouseBroken && (ev[i] & ~0x23) == 0)
-	    break;
+    Kmouse *km = pi->driverPrivate;
+    const KmouseProt *prot = km->prot;
+    int i;
+
+    for (i = 0; i < ne; i++) {
+        if ((ev[i] & 0x40) == 0x40)
+            break;
+        if (km->stage != MouseBroken && (ev[i] & ~0x23) == 0)
+            break;
     }
     if (i != 0)
-	return i;
+        return i;
     for (i = 1; i < ne; i++)
-	if ((ev[i] & prot->dataMask) != prot->dataValid)
-	    return -1;
+        if ((ev[i] & prot->dataMask) != prot->dataValid)
+            return -1;
     return 0;
 }
 
-static Bool logiParse (KdPointerInfo *pi, unsigned char *ev, int ne)
+static Bool
+logiParse(KdPointerInfo * pi, unsigned char *ev, int ne)
 {
-    Kmouse	    *km = pi->driverPrivate;
-    int		    dx, dy;
-    unsigned long   flags;
+    Kmouse *km = pi->driverPrivate;
+    int dx, dy;
+    unsigned long flags;
 
     flags = KD_MOUSE_DELTA;
 
-    if (ne == 3)
-    {
-	if (ev[0] & 0x20)
-	    flags |= KD_BUTTON_1;
-	if (ev[0] & 0x10)
-	    flags |= KD_BUTTON_3;
+    if (ne == 3) {
+        if (ev[0] & 0x20)
+            flags |= KD_BUTTON_1;
+        if (ev[0] & 0x10)
+            flags |= KD_BUTTON_3;
 
-	dx = (signed char)(((ev[0] & 0x03) << 6) | (ev[1] & 0x3F));
-	dy = (signed char)(((ev[0] & 0x0C) << 4) | (ev[2] & 0x3F));
-	flags |= km->state & KD_BUTTON_2;
+        dx = (signed char) (((ev[0] & 0x03) << 6) | (ev[1] & 0x3F));
+        dy = (signed char) (((ev[0] & 0x0C) << 4) | (ev[2] & 0x3F));
+        flags |= km->state & KD_BUTTON_2;
     }
-    else
-    {
-	if (ev[0] & 0x20)
-	    flags |= KD_BUTTON_2;
-	dx = 0;
-	dy = 0;
-	flags |= km->state & (KD_BUTTON_1|KD_BUTTON_3);
+    else {
+        if (ev[0] & 0x20)
+            flags |= KD_BUTTON_2;
+        dx = 0;
+        dy = 0;
+        flags |= km->state & (KD_BUTTON_1 | KD_BUTTON_3);
     }
 
-    if (!MouseReasonable (pi, flags, dx, dy))
-	return FALSE;
+    if (!MouseReasonable(pi, flags, dx, dy))
+        return FALSE;
     if (km->stage == MouseWorking)
-	KdEnqueuePointerEvent (pi, flags, dx, dy, 0);
+        KdEnqueuePointerEvent(pi, flags, dx, dy, 0);
     return TRUE;
 }
 
@@ -679,27 +670,28 @@ static const KmouseProt logiProt = {
 /*
  * Mouse systems protocol, 5 bytes
  */
-static Bool mscParse (KdPointerInfo *pi, unsigned char *ev, int ne)
+static Bool
+mscParse(KdPointerInfo * pi, unsigned char *ev, int ne)
 {
-    Kmouse	    *km = pi->driverPrivate;
-    int		    dx, dy;
-    unsigned long   flags;
+    Kmouse *km = pi->driverPrivate;
+    int dx, dy;
+    unsigned long flags;
 
     flags = KD_MOUSE_DELTA;
 
     if (!(ev[0] & 0x4))
-	flags |= KD_BUTTON_1;
+        flags |= KD_BUTTON_1;
     if (!(ev[0] & 0x2))
-	flags |= KD_BUTTON_2;
+        flags |= KD_BUTTON_2;
     if (!(ev[0] & 0x1))
-	flags |= KD_BUTTON_3;
-    dx =    (signed char)(ev[1]) + (signed char)(ev[3]);
-    dy = - ((signed char)(ev[2]) + (signed char)(ev[4]));
+        flags |= KD_BUTTON_3;
+    dx = (signed char) (ev[1]) + (signed char) (ev[3]);
+    dy = -((signed char) (ev[2]) + (signed char) (ev[4]));
 
-    if (!MouseReasonable (pi, flags, dx, dy))
-	return FALSE;
+    if (!MouseReasonable(pi, flags, dx, dy))
+        return FALSE;
     if (km->stage == MouseWorking)
-	KdEnqueuePointerEvent (pi, flags, dx, dy, 0);
+        KdEnqueuePointerEvent(pi, flags, dx, dy, 0);
     return TRUE;
 }
 
@@ -726,25 +718,23 @@ static const KmouseProt *kmouseProts[] = {
 #define NUM_PROT    (sizeof (kmouseProts) / sizeof (kmouseProts[0]))
 
 static void
-MouseInitProtocol (Kmouse *km)
+MouseInitProtocol(Kmouse * km)
 {
-    int		    ret;
-    struct termios  t;
-
-    if (km->prot->tty)
-    {
-	ret = tcgetattr (km->iob.fd, &t);
-
-	if (ret >= 0)
-	{
-	    t.c_iflag = km->prot->c_iflag;
-	    t.c_oflag = km->prot->c_oflag;
-	    t.c_lflag = km->prot->c_lflag;
-	    t.c_cflag = km->prot->c_cflag;
-	    cfsetispeed (&t, km->prot->speed);
-	    cfsetospeed (&t, km->prot->speed);
-	    ret = tcsetattr (km->iob.fd, TCSANOW, &t);
-	}
+    int ret;
+    struct termios t;
+
+    if (km->prot->tty) {
+        ret = tcgetattr(km->iob.fd, &t);
+
+        if (ret >= 0) {
+            t.c_iflag = km->prot->c_iflag;
+            t.c_oflag = km->prot->c_oflag;
+            t.c_lflag = km->prot->c_lflag;
+            t.c_cflag = km->prot->c_cflag;
+            cfsetispeed(&t, km->prot->speed);
+            cfsetospeed(&t, km->prot->speed);
+            ret = tcsetattr(km->iob.fd, TCSANOW, &t);
+        }
     }
     km->stage = MouseBroken;
     km->valid = 0;
@@ -754,172 +744,156 @@ MouseInitProtocol (Kmouse *km)
 }
 
 static void
-MouseFirstProtocol (Kmouse *km, char *prot)
+MouseFirstProtocol(Kmouse * km, char *prot)
 {
-    if (prot)
-    {
-	for (km->i_prot = 0; km->i_prot < NUM_PROT; km->i_prot++)
-	    if (!strcmp (prot, kmouseProts[km->i_prot]->name))
-		break;
-	if (km->i_prot == NUM_PROT)
-	{
-	    int	i;
-	    ErrorF ("Unknown mouse protocol \"%s\". Pick one of:", prot);
-	    for (i = 0; i < NUM_PROT; i++)
-		ErrorF (" %s", kmouseProts[i]->name);
-	    ErrorF ("\n");
-	}
-	else
-	{
-	    km->prot = kmouseProts[km->i_prot];
-	    if (km->tty && !km->prot->tty)
-		ErrorF ("Mouse device is serial port, protocol %s is not serial protocol\n",
-			prot);
-	    else if (!km->tty && km->prot->tty)
-		ErrorF ("Mouse device is not serial port, protocol %s is serial protocol\n",
-			prot);
-	}
+    if (prot) {
+        for (km->i_prot = 0; km->i_prot < NUM_PROT; km->i_prot++)
+            if (!strcmp(prot, kmouseProts[km->i_prot]->name))
+                break;
+        if (km->i_prot == NUM_PROT) {
+            int i;
+
+            ErrorF("Unknown mouse protocol \"%s\". Pick one of:", prot);
+            for (i = 0; i < NUM_PROT; i++)
+                ErrorF(" %s", kmouseProts[i]->name);
+            ErrorF("\n");
+        }
+        else {
+            km->prot = kmouseProts[km->i_prot];
+            if (km->tty && !km->prot->tty)
+                ErrorF
+                    ("Mouse device is serial port, protocol %s is not serial protocol\n",
+                     prot);
+            else if (!km->tty && km->prot->tty)
+                ErrorF
+                    ("Mouse device is not serial port, protocol %s is serial protocol\n",
+                     prot);
+        }
     }
-    if (!km->prot)
-    {
-	for (km->i_prot = 0; kmouseProts[km->i_prot]->tty != km->tty; km->i_prot++)
-	    ;
-	km->prot = kmouseProts[km->i_prot];
+    if (!km->prot) {
+        for (km->i_prot = 0; kmouseProts[km->i_prot]->tty != km->tty;
+             km->i_prot++);
+        km->prot = kmouseProts[km->i_prot];
     }
-    MouseInitProtocol (km);
+    MouseInitProtocol(km);
 }
 
 static void
-MouseNextProtocol (Kmouse *km)
+MouseNextProtocol(Kmouse * km)
 {
-    do
-    {
-	if (!km->prot)
-	    km->i_prot = 0;
-	else
-	    if (++km->i_prot == NUM_PROT) km->i_prot = 0;
-	km->prot = kmouseProts[km->i_prot];
+    do {
+        if (!km->prot)
+            km->i_prot = 0;
+        else if (++km->i_prot == NUM_PROT)
+            km->i_prot = 0;
+        km->prot = kmouseProts[km->i_prot];
     } while (km->prot->tty != km->tty);
-    MouseInitProtocol (km);
-    ErrorF ("Switching to mouse protocol \"%s\"\n", km->prot->name);
+    MouseInitProtocol(km);
+    ErrorF("Switching to mouse protocol \"%s\"\n", km->prot->name);
 }
 
 static void
-MouseRead (int mousePort, void *closure)
+MouseRead(int mousePort, void *closure)
 {
-    KdPointerInfo   *pi = closure;
-    Kmouse	    *km = pi->driverPrivate;
-    unsigned char   event[MAX_MOUSE];
-    int		    ne;
-    int		    c;
-    int		    i;
-    int		    timeout;
+    KdPointerInfo *pi = closure;
+    Kmouse *km = pi->driverPrivate;
+    unsigned char event[MAX_MOUSE];
+    int ne;
+    int c;
+    int i;
+    int timeout;
 
     timeout = 0;
     ne = 0;
-    for(;;)
-    {
-	c = MouseReadByte (&km->iob, timeout);
-	if (c == -1)
-	{
-	    if (ne)
-	    {
-		km->invalid += ne + km->tested;
-		km->valid = 0;
-		km->tested = 0;
-		km->stage = MouseBroken;
-	    }
-	    break;
-	}
-	event[ne++] = c;
-	i = (*km->prot->Valid) (pi, event, ne);
-	if (i != 0)
-	{
+    for (;;) {
+        c = MouseReadByte(&km->iob, timeout);
+        if (c == -1) {
+            if (ne) {
+                km->invalid += ne + km->tested;
+                km->valid = 0;
+                km->tested = 0;
+                km->stage = MouseBroken;
+            }
+            break;
+        }
+        event[ne++] = c;
+        i = (*km->prot->Valid) (pi, event, ne);
+        if (i != 0) {
 #ifdef DEBUG
-	    ErrorF ("Mouse protocol %s broken %d of %d bytes bad\n",
-		    km->prot->name, i > 0 ? i : ne, ne);
+            ErrorF("Mouse protocol %s broken %d of %d bytes bad\n",
+                   km->prot->name, i > 0 ? i : ne, ne);
 #endif
-	    if (i > 0 && i < ne)
-	    {
-		ne -= i;
-		memmove (event, event + i, ne);
-	    }
-	    else
-	    {
-		i = ne;
-		ne = 0;
-	    }
-	    km->invalid += i + km->tested;
-	    km->valid = 0;
-	    km->tested = 0;
-	    if (km->stage == MouseWorking)
-		km->i_prot--;
-	    km->stage = MouseBroken;
-	    if (km->invalid > MAX_SKIP)
-	    {
-		MouseNextProtocol (km);
-		ne = 0;
-	    }
-	    timeout = 0;
-	}
-	else
-	{
-	    if ((*km->prot->Complete) (pi, event, ne))
-	    {
-		if ((*km->prot->Parse) (pi, event, ne))
-		{
-		    switch (km->stage)
-		    {
-		    case MouseBroken:
+            if (i > 0 && i < ne) {
+                ne -= i;
+                memmove(event, event + i, ne);
+            }
+            else {
+                i = ne;
+                ne = 0;
+            }
+            km->invalid += i + km->tested;
+            km->valid = 0;
+            km->tested = 0;
+            if (km->stage == MouseWorking)
+                km->i_prot--;
+            km->stage = MouseBroken;
+            if (km->invalid > MAX_SKIP) {
+                MouseNextProtocol(km);
+                ne = 0;
+            }
+            timeout = 0;
+        }
+        else {
+            if ((*km->prot->Complete) (pi, event, ne)) {
+                if ((*km->prot->Parse) (pi, event, ne)) {
+                    switch (km->stage) {
+                    case MouseBroken:
 #ifdef DEBUG
-			ErrorF ("Mouse protocol %s seems OK\n",
-				km->prot->name);
+                        ErrorF("Mouse protocol %s seems OK\n", km->prot->name);
 #endif
-			/* do not zero invalid to accumulate invalid bytes */
-			km->valid = 0;
-			km->tested = 0;
-			km->stage = MouseTesting;
-			/* fall through ... */
-		    case MouseTesting:
-			km->valid++;
-			km->tested += ne;
-			if (km->valid > MAX_VALID)
-			{
+                        /* do not zero invalid to accumulate invalid bytes */
+                        km->valid = 0;
+                        km->tested = 0;
+                        km->stage = MouseTesting;
+                        /* fall through ... */
+                    case MouseTesting:
+                        km->valid++;
+                        km->tested += ne;
+                        if (km->valid > MAX_VALID) {
 #ifdef DEBUG
-			    ErrorF ("Mouse protocol %s working\n",
-				    km->prot->name);
+                            ErrorF("Mouse protocol %s working\n",
+                                   km->prot->name);
 #endif
-			    km->stage = MouseWorking;
-			    km->invalid = 0;
-			    km->tested = 0;
-			    km->valid = 0;
-			    if (km->prot->Init && !(*km->prot->Init) (pi))
-				km->stage = MouseBroken;
-			}
-			break;
-		    case MouseWorking:
-			break;
-		    }
-		}
-		else
-		{
-		    km->invalid += ne + km->tested;
-		    km->valid = 0;
-		    km->tested = 0;
-		    km->stage = MouseBroken;
-		}
-		ne = 0;
-		timeout = 0;
-	    }
-	    else
-		timeout = MOUSE_TIMEOUT;
-	}
+                            km->stage = MouseWorking;
+                            km->invalid = 0;
+                            km->tested = 0;
+                            km->valid = 0;
+                            if (km->prot->Init && !(*km->prot->Init) (pi))
+                                km->stage = MouseBroken;
+                        }
+                        break;
+                    case MouseWorking:
+                        break;
+                    }
+                }
+                else {
+                    km->invalid += ne + km->tested;
+                    km->valid = 0;
+                    km->tested = 0;
+                    km->stage = MouseBroken;
+                }
+                ne = 0;
+                timeout = 0;
+            }
+            else
+                timeout = MOUSE_TIMEOUT;
+        }
     }
 }
 
 int MouseInputType;
 
-char *kdefaultMouse[] =  {
+char *kdefaultMouse[] = {
     "/dev/input/mice",
     "/dev/mouse",
     "/dev/psaux",
@@ -931,26 +905,26 @@ char *kdefaultMouse[] =  {
 #define NUM_DEFAULT_MOUSE    (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))
 
 static Status
-MouseInit (KdPointerInfo *pi)
+MouseInit(KdPointerInfo * pi)
 {
-    int		i;
-    int		fd;
-    Kmouse	*km;
+    int i;
+    int fd;
+    Kmouse *km;
 
     if (!pi)
         return BadImplementation;
 
     if (!pi->path || strcmp(pi->path, "auto") == 0) {
         for (i = 0; i < NUM_DEFAULT_MOUSE; i++) {
-            fd = open (kdefaultMouse[i], 2);
+            fd = open(kdefaultMouse[i], 2);
             if (fd >= 0) {
-                pi->path = strdup (kdefaultMouse[i]);
+                pi->path = strdup(kdefaultMouse[i]);
                 break;
             }
         }
     }
     else {
-        fd = open (pi->path, 2);
+        fd = open(pi->path, 2);
     }
 
     if (fd < 0)
@@ -958,21 +932,21 @@ MouseInit (KdPointerInfo *pi)
 
     close(fd);
 
-    km = (Kmouse *) malloc(sizeof (Kmouse));
+    km = (Kmouse *) malloc(sizeof(Kmouse));
     if (km) {
         km->iob.avail = km->iob.used = 0;
         MouseFirstProtocol(km, pi->protocol ? pi->protocol : "exps/2");
         /* MouseFirstProtocol sets state to MouseBroken for later protocol
          * checks. Skip these checks if a protocol was supplied */
         if (pi->protocol)
-                km->state = MouseWorking;
+            km->state = MouseWorking;
         km->i_prot = 0;
-        km->tty = isatty (fd);
+        km->tty = isatty(fd);
         km->iob.fd = -1;
         pi->driverPrivate = km;
     }
     else {
-        close (fd);
+        close(fd);
         return BadAlloc;
     }
 
@@ -980,7 +954,7 @@ MouseInit (KdPointerInfo *pi)
 }
 
 static Status
-MouseEnable (KdPointerInfo *pi)
+MouseEnable(KdPointerInfo * pi)
 {
     Kmouse *km;
 
@@ -993,8 +967,7 @@ MouseEnable (KdPointerInfo *pi)
     if (km->iob.fd < 0)
         return BadMatch;
 
-    if (!KdRegisterFd (km->iob.fd, MouseRead, pi))
-    {
+    if (!KdRegisterFd(km->iob.fd, MouseRead, pi)) {
         close(km->iob.fd);
         return BadAlloc;
     }
@@ -1003,18 +976,19 @@ MouseEnable (KdPointerInfo *pi)
 }
 
 static void
-MouseDisable (KdPointerInfo *pi)
+MouseDisable(KdPointerInfo * pi)
 {
     Kmouse *km;
+
     if (!pi || !pi->driverPrivate)
         return;
 
     km = pi->driverPrivate;
-    KdUnregisterFd (pi, km->iob.fd, TRUE);
+    KdUnregisterFd(pi, km->iob.fd, TRUE);
 }
 
 static void
-MouseFini (KdPointerInfo *pi)
+MouseFini(KdPointerInfo * pi)
 {
     free(pi->driverPrivate);
     pi->driverPrivate = NULL;
diff --git a/xorg-server/hw/kdrive/linux/ms.c b/xorg-server/hw/kdrive/linux/ms.c
index 176e12550..e82350ac5 100644
--- a/xorg-server/hw/kdrive/linux/ms.c
+++ b/xorg-server/hw/kdrive/linux/ms.c
@@ -34,67 +34,63 @@ THE SOFTWARE.
 #include "kdrive.h"
 
 static int
-MsReadBytes (int fd, char *buf, int len, int min)
+MsReadBytes(int fd, char *buf, int len, int min)
 {
-    int		    n, tot;
-    fd_set	    set;
-    struct timeval  tv;
+    int n, tot;
+    fd_set set;
+    struct timeval tv;
 
     tot = 0;
-    while (len)
-    {
-	n = read (fd, buf, len);
-	if (n > 0)
-	{
-	    tot += n;
-	    buf += n;
-	    len -= n;
-	}
-	if (tot % min == 0)
-	    break;
-	FD_ZERO (&set);
-	FD_SET (fd, &set);
-	tv.tv_sec = 0;
-	tv.tv_usec = 100 * 1000;
-	n = select (fd + 1, &set, 0, 0, &tv);
-	if (n <= 0)
-	    break;
+    while (len) {
+        n = read(fd, buf, len);
+        if (n > 0) {
+            tot += n;
+            buf += n;
+            len -= n;
+        }
+        if (tot % min == 0)
+            break;
+        FD_ZERO(&set);
+        FD_SET(fd, &set);
+        tv.tv_sec = 0;
+        tv.tv_usec = 100 * 1000;
+        n = select(fd + 1, &set, 0, 0, &tv);
+        if (n <= 0)
+            break;
     }
     return tot;
 }
 
 static void
-MsRead (int port, void *closure)
+MsRead(int port, void *closure)
 {
-    unsigned char   buf[3 * 200];
-    unsigned char   *b;
-    int		    n;
-    int		    dx, dy;
-    unsigned long   flags;
-
-    while ((n = MsReadBytes (port, (char *) buf, sizeof (buf), 3)) > 0)
-    {
-	b = buf;
-	while (n >= 3)
-	{
-	    flags = KD_MOUSE_DELTA;
-
-	    if (b[0] & 0x20)
-		flags |= KD_BUTTON_1;
-	    if (b[0] & 0x10)
-		flags |= KD_BUTTON_3;
-
-	    dx = (char)(((b[0] & 0x03) << 6) | (b[1] & 0x3F));
-	    dy = (char)(((b[0] & 0x0C) << 4) | (b[2] & 0x3F));
+    unsigned char buf[3 * 200];
+    unsigned char *b;
+    int n;
+    int dx, dy;
+    unsigned long flags;
+
+    while ((n = MsReadBytes(port, (char *) buf, sizeof(buf), 3)) > 0) {
+        b = buf;
+        while (n >= 3) {
+            flags = KD_MOUSE_DELTA;
+
+            if (b[0] & 0x20)
+                flags |= KD_BUTTON_1;
+            if (b[0] & 0x10)
+                flags |= KD_BUTTON_3;
+
+            dx = (char) (((b[0] & 0x03) << 6) | (b[1] & 0x3F));
+            dy = (char) (((b[0] & 0x0C) << 4) | (b[2] & 0x3F));
             n -= 3;
             b += 3;
-	    KdEnqueuePointerEvent (closure, flags, dx, dy, 0);
-	}
+            KdEnqueuePointerEvent(closure, flags, dx, dy, 0);
+        }
     }
 }
 
 static Status
-MsInit (KdPointerInfo *pi)
+MsInit(KdPointerInfo * pi)
 {
     if (!pi)
         return BadImplementation;
@@ -108,51 +104,51 @@ MsInit (KdPointerInfo *pi)
 }
 
 static Status
-MsEnable (KdPointerInfo *pi)
+MsEnable(KdPointerInfo * pi)
 {
     int port;
     struct termios t;
     int ret;
 
-    port = open (pi->path, O_RDWR | O_NONBLOCK);
-    if(port < 0) {
-        ErrorF("Couldn't open %s (%d)\n", pi->path, (int)errno);
+    port = open(pi->path, O_RDWR | O_NONBLOCK);
+    if (port < 0) {
+        ErrorF("Couldn't open %s (%d)\n", pi->path, (int) errno);
         return 0;
-    } else if (port == 0) {
-        ErrorF("Opening %s returned 0!  Please complain to Keith.\n",
-               pi->path);
-	goto bail;
+    }
+    else if (port == 0) {
+        ErrorF("Opening %s returned 0!  Please complain to Keith.\n", pi->path);
+        goto bail;
     }
 
-    if(!isatty(port)) {
+    if (!isatty(port)) {
         ErrorF("%s is not a tty\n", pi->path);
         goto bail;
     }
 
     ret = tcgetattr(port, &t);
-    if(ret < 0) {
+    if (ret < 0) {
         ErrorF("Couldn't tcgetattr(%s): %d\n", pi->path, errno);
         goto bail;
     }
-    t.c_iflag &= ~ (IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR |
+    t.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR |
                    IGNCR | ICRNL | IXON | IXOFF);
-    t.c_oflag &= ~ OPOST;
-    t.c_lflag &= ~ (ECHO | ECHONL | ICANON | ISIG | IEXTEN);
-    t.c_cflag &= ~ (CSIZE | PARENB);
+    t.c_oflag &= ~OPOST;
+    t.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
+    t.c_cflag &= ~(CSIZE | PARENB);
     t.c_cflag |= CS8 | CLOCAL | CSTOPB;
 
-    cfsetispeed (&t, B1200);
-    cfsetospeed (&t, B1200);
+    cfsetispeed(&t, B1200);
+    cfsetospeed(&t, B1200);
     t.c_cc[VMIN] = 1;
     t.c_cc[VTIME] = 0;
     ret = tcsetattr(port, TCSANOW, &t);
-    if(ret < 0) {
+    if (ret < 0) {
         ErrorF("Couldn't tcsetattr(%s): %d\n", pi->path, errno);
         goto bail;
     }
-    if (KdRegisterFd (port, MsRead, pi))
-	return TRUE;
-    pi->driverPrivate = (void *)(intptr_t)port;
+    if (KdRegisterFd(port, MsRead, pi))
+        return TRUE;
+    pi->driverPrivate = (void *) (intptr_t) port;
 
     return Success;
 
@@ -162,13 +158,13 @@ MsEnable (KdPointerInfo *pi)
 }
 
 static void
-MsDisable (KdPointerInfo *pi)
+MsDisable(KdPointerInfo * pi)
 {
-    KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
+    KdUnregisterFd(pi, (int) (intptr_t) pi->driverPrivate, TRUE);
 }
 
 static void
-MsFini (KdPointerInfo *pi)
+MsFini(KdPointerInfo * pi)
 {
 }
 
diff --git a/xorg-server/hw/kdrive/linux/ps2.c b/xorg-server/hw/kdrive/linux/ps2.c
index b62d769f2..d1522a2d0 100644
--- a/xorg-server/hw/kdrive/linux/ps2.c
+++ b/xorg-server/hw/kdrive/linux/ps2.c
@@ -31,36 +31,34 @@
 #include "kdrive.h"
 
 static int
-Ps2ReadBytes (int fd, char *buf, int len, int min)
+Ps2ReadBytes(int fd, char *buf, int len, int min)
 {
-    int		    n, tot;
-    fd_set	    set;
-    struct timeval  tv;
+    int n, tot;
+    fd_set set;
+    struct timeval tv;
 
     tot = 0;
-    while (len)
-    {
-	n = read (fd, buf, len);
-	if (n > 0)
-	{
-	    tot += n;
-	    buf += n;
-	    len -= n;
-	}
-	if (tot % min == 0)
-	    break;
-	FD_ZERO (&set);
-	FD_SET (fd, &set);
-	tv.tv_sec = 0;
-	tv.tv_usec = 100 * 1000;
-	n = select (fd + 1, &set, 0, 0, &tv);
-	if (n <= 0)
-	    break;
+    while (len) {
+        n = read(fd, buf, len);
+        if (n > 0) {
+            tot += n;
+            buf += n;
+            len -= n;
+        }
+        if (tot % min == 0)
+            break;
+        FD_ZERO(&set);
+        FD_SET(fd, &set);
+        tv.tv_sec = 0;
+        tv.tv_usec = 100 * 1000;
+        n = select(fd + 1, &set, 0, 0, &tv);
+        if (n <= 0)
+            break;
     }
     return tot;
 }
 
-char	*Ps2Names[] = {
+char *Ps2Names[] = {
     "/dev/psaux",
 /*    "/dev/mouse", */
     "/dev/input/mice",
@@ -69,67 +67,64 @@ char	*Ps2Names[] = {
 #define NUM_PS2_NAMES	(sizeof (Ps2Names) / sizeof (Ps2Names[0]))
 
 static void
-Ps2Read (int ps2Port, void *closure)
+Ps2Read(int ps2Port, void *closure)
 {
-    unsigned char   buf[3 * 200];
-    unsigned char   *b;
-    int		    n;
-    int		    dx, dy;
-    unsigned long   flags;
-    unsigned long   left_button = KD_BUTTON_1;
-    unsigned long   right_button = KD_BUTTON_3;
+    unsigned char buf[3 * 200];
+    unsigned char *b;
+    int n;
+    int dx, dy;
+    unsigned long flags;
+    unsigned long left_button = KD_BUTTON_1;
+    unsigned long right_button = KD_BUTTON_3;
 
 #undef SWAP_USB
 #ifdef SWAP_USB
-    if (id == 2)
-    {
-	left_button = KD_BUTTON_3;
-	right_button = KD_BUTTON_1;
+    if (id == 2) {
+        left_button = KD_BUTTON_3;
+        right_button = KD_BUTTON_1;
     }
 #endif
-    while ((n = Ps2ReadBytes (ps2Port, (char *) buf, sizeof (buf), 3)) > 0)
-    {
-	b = buf;
-	while (n >= 3)
-	{
-	    flags = KD_MOUSE_DELTA;
-	    if (b[0] & 4)
-		flags |= KD_BUTTON_2;
-	    if (b[0] & 2)
-		flags |= right_button;
-	    if (b[0] & 1)
-		flags |= left_button;
-
-	    dx = b[1];
-	    if (b[0] & 0x10)
-		dx -= 256;
-	    dy = b[2];
-	    if (b[0] & 0x20)
-		dy -= 256;
-	    dy = -dy;
-	    n -= 3;
-	    b += 3;
-	    KdEnqueuePointerEvent (closure, flags, dx, dy, 0);
-	}
+    while ((n = Ps2ReadBytes(ps2Port, (char *) buf, sizeof(buf), 3)) > 0) {
+        b = buf;
+        while (n >= 3) {
+            flags = KD_MOUSE_DELTA;
+            if (b[0] & 4)
+                flags |= KD_BUTTON_2;
+            if (b[0] & 2)
+                flags |= right_button;
+            if (b[0] & 1)
+                flags |= left_button;
+
+            dx = b[1];
+            if (b[0] & 0x10)
+                dx -= 256;
+            dy = b[2];
+            if (b[0] & 0x20)
+                dy -= 256;
+            dy = -dy;
+            n -= 3;
+            b += 3;
+            KdEnqueuePointerEvent(closure, flags, dx, dy, 0);
+        }
     }
 }
 
 static Status
-Ps2Init (KdPointerInfo *pi)
+Ps2Init(KdPointerInfo * pi)
 {
-    int	ps2Port, i;
+    int ps2Port, i;
 
     if (!pi->path) {
         for (i = 0; i < NUM_PS2_NAMES; i++) {
-            ps2Port = open (Ps2Names[i], 0);
+            ps2Port = open(Ps2Names[i], 0);
             if (ps2Port >= 0) {
-                pi->path = strdup (Ps2Names[i]);
+                pi->path = strdup(Ps2Names[i]);
                 break;
             }
-	}
+        }
     }
     else {
-        ps2Port = open (pi->path, 0);
+        ps2Port = open(pi->path, 0);
     }
 
     if (ps2Port < 0)
@@ -137,42 +132,41 @@ Ps2Init (KdPointerInfo *pi)
 
     close(ps2Port);
     if (!pi->name)
-        pi->name = strdup ("PS/2 Mouse");
+        pi->name = strdup("PS/2 Mouse");
 
     return Success;
 }
 
 static Status
-Ps2Enable (KdPointerInfo *pi)
+Ps2Enable(KdPointerInfo * pi)
 {
     int fd;
 
     if (!pi)
         return BadImplementation;
 
-    fd = open (pi->path, 0);
+    fd = open(pi->path, 0);
     if (fd < 0)
         return BadMatch;
 
-    if (!KdRegisterFd (fd, Ps2Read, pi)) {
+    if (!KdRegisterFd(fd, Ps2Read, pi)) {
         close(fd);
         return BadAlloc;
     }
 
-    pi->driverPrivate = (void *)(intptr_t)fd;
+    pi->driverPrivate = (void *) (intptr_t) fd;
 
     return Success;
 }
 
-
 static void
-Ps2Disable (KdPointerInfo *pi)
+Ps2Disable(KdPointerInfo * pi)
 {
-    KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
+    KdUnregisterFd(pi, (int) (intptr_t) pi->driverPrivate, TRUE);
 }
 
 static void
-Ps2Fini (KdPointerInfo *pi)
+Ps2Fini(KdPointerInfo * pi)
 {
 }
 
diff --git a/xorg-server/hw/kdrive/linux/tslib.c b/xorg-server/hw/kdrive/linux/tslib.c
index 1f30ccae7..1403c7968 100644
--- a/xorg-server/hw/kdrive/linux/tslib.c
+++ b/xorg-server/hw/kdrive/linux/tslib.c
@@ -30,7 +30,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-
 #ifdef HAVE_KDRIVE_CONFIG_H
 #include <kdrive-config.h>
 #endif
@@ -50,25 +49,24 @@ struct TslibPrivate {
     int fd;
     int lastx, lasty;
     struct tsdev *tsDev;
-    void (*raw_event_hook)(int x, int y, int pressure, void *closure);
+    void (*raw_event_hook) (int x, int y, int pressure, void *closure);
     void *raw_event_closure;
     int phys_screen;
 };
 
-
 static void
-TsRead (int fd, void *closure)
+TsRead(int fd, void *closure)
 {
-    KdPointerInfo       *pi = closure;
+    KdPointerInfo *pi = closure;
     struct TslibPrivate *private = pi->driverPrivate;
-    struct ts_sample    event;
-    long                x = 0, y = 0;
-    unsigned long       flags;
+    struct ts_sample event;
+    long x = 0, y = 0;
+    unsigned long flags;
 
     if (private->raw_event_hook) {
         while (ts_read_raw(private->tsDev, &event, 1) == 1)
-            private->raw_event_hook (event.x, event.y, event.pressure,
-                                     private->raw_event_closure);
+            private->raw_event_hook(event.x, event.y, event.pressure,
+                                    private->raw_event_closure);
         return;
     }
 
@@ -84,30 +82,33 @@ TsRead (int fd, void *closure)
             if (KdCurScreen == private->phys_screen) {
                 x = event.x;
                 y = event.y;
-            } else {
+            }
+            else {
                 flags |= KD_MOUSE_DELTA;
                 if ((private->lastx == 0) || (private->lasty == 0)) {
                     x = event.x;
                     y = event.y;
-                } else {
+                }
+                else {
                     x = event.x - private->lastx;
                     y = event.y - private->lasty;
-	    	}
+                }
             }
             private->lastx = event.x;
             private->lasty = event.y;
-        } else {
+        }
+        else {
             flags = 0;
             x = private->lastx;
             y = private->lasty;
         }
 
-        KdEnqueuePointerEvent (pi, flags, x, y, event.pressure);
+        KdEnqueuePointerEvent(pi, flags, x, y, event.pressure);
     }
 }
 
 static Status
-TslibEnable (KdPointerInfo *pi)
+TslibEnable(KdPointerInfo * pi)
 {
     struct TslibPrivate *private = pi->driverPrivate;
 
@@ -115,7 +116,8 @@ TslibEnable (KdPointerInfo *pi)
     private->raw_event_closure = NULL;
     if (!pi->path) {
         pi->path = strdup("/dev/input/touchscreen0");
-        ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", pi->path);
+        ErrorF("[tslib/TslibEnable] no device path given, trying %s\n",
+               pi->path);
     }
 
     private->tsDev = ts_open(pi->path, 0);
@@ -138,9 +140,8 @@ TslibEnable (KdPointerInfo *pi)
     return Success;
 }
 
-
 static void
-TslibDisable (KdPointerInfo *pi)
+TslibDisable(KdPointerInfo * pi)
 {
     struct TslibPrivate *private = pi->driverPrivate;
 
@@ -154,9 +155,8 @@ TslibDisable (KdPointerInfo *pi)
     private->tsDev = NULL;
 }
 
-
 static Status
-TslibInit (KdPointerInfo *pi)
+TslibInit(KdPointerInfo * pi)
 {
     struct TslibPrivate *private = NULL;
 
@@ -164,7 +164,7 @@ TslibInit (KdPointerInfo *pi)
         return !Success;
 
     pi->driverPrivate = (struct TslibPrivate *)
-                        calloc(sizeof(struct TslibPrivate), 1);
+        calloc(sizeof(struct TslibPrivate), 1);
     if (!pi->driverPrivate)
         return !Success;
 
@@ -178,15 +178,13 @@ TslibInit (KdPointerInfo *pi)
     return Success;
 }
 
-
 static void
-TslibFini (KdPointerInfo *pi)
+TslibFini(KdPointerInfo * pi)
 {
     free(pi->driverPrivate);
     pi->driverPrivate = NULL;
 }
 
-
 KdPointerDriver TsDriver = {
     "tslib",
     TslibInit,
diff --git a/xorg-server/hw/kdrive/src/kcmap.c b/xorg-server/hw/kdrive/src/kcmap.c
index 6e0fc1417..c93c2f4d3 100644
--- a/xorg-server/hw/kdrive/src/kcmap.c
+++ b/xorg-server/hw/kdrive/src/kcmap.c
@@ -30,25 +30,25 @@
  */
 
 void
-KdSetColormap (ScreenPtr pScreen)
+KdSetColormap(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
-    ColormapPtr	pCmap = pScreenPriv->pInstalledmap;
-    Pixel	pixels[KD_MAX_PSEUDO_SIZE];
-    xrgb	colors[KD_MAX_PSEUDO_SIZE];
-    xColorItem	defs[KD_MAX_PSEUDO_SIZE];
-    int		i;
+    ColormapPtr pCmap = pScreenPriv->pInstalledmap;
+    Pixel pixels[KD_MAX_PSEUDO_SIZE];
+    xrgb colors[KD_MAX_PSEUDO_SIZE];
+    xColorItem defs[KD_MAX_PSEUDO_SIZE];
+    int i;
 
     if (!pScreenPriv->card->cfuncs->putColors)
-	return;
+        return;
     if (pScreenPriv->screen->fb.depth > KD_MAX_PSEUDO_DEPTH)
-	return;
+        return;
 
     if (!pScreenPriv->enabled)
-	return;
+        return;
 
     if (!pCmap)
-	return;
+        return;
 
     /*
      * Make DIX convert pixels into RGB values -- this handles
@@ -56,26 +56,26 @@ KdSetColormap (ScreenPtr pScreen)
      */
 
     for (i = 0; i < (1 << pScreenPriv->screen->fb.depth); i++)
-	pixels[i] = i;
+        pixels[i] = i;
 
-    QueryColors (pCmap, (1 << pScreenPriv->screen->fb.depth), pixels, colors, serverClient);
+    QueryColors(pCmap, (1 << pScreenPriv->screen->fb.depth), pixels, colors,
+                serverClient);
 
-    for (i = 0; i < (1 << pScreenPriv->screen->fb.depth); i++)
-    {
-	defs[i].pixel = i;
-	defs[i].red = colors[i].red;
-	defs[i].green = colors[i].green;
-	defs[i].blue = colors[i].blue;
-	defs[i].flags = DoRed|DoGreen|DoBlue;
+    for (i = 0; i < (1 << pScreenPriv->screen->fb.depth); i++) {
+        defs[i].pixel = i;
+        defs[i].red = colors[i].red;
+        defs[i].green = colors[i].green;
+        defs[i].blue = colors[i].blue;
+        defs[i].flags = DoRed | DoGreen | DoBlue;
     }
 
     (*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen,
-					     (1 << pScreenPriv->screen->fb.depth),
-					     defs);
+                                             (1 << pScreenPriv->screen->fb.
+                                              depth), defs);
 
     /* recolor hardware cursor */
     if (pScreenPriv->card->cfuncs->recolorCursor)
-	(*pScreenPriv->card->cfuncs->recolorCursor) (pCmap->pScreen, 0, 0);
+        (*pScreenPriv->card->cfuncs->recolorCursor) (pCmap->pScreen, 0, 0);
 }
 
 /*
@@ -83,38 +83,38 @@ KdSetColormap (ScreenPtr pScreen)
  * the current colormap
  */
 void
-KdEnableColormap (ScreenPtr pScreen)
+KdEnableColormap(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
-    int	    i;
+    int i;
 
     if (!pScreenPriv->card->cfuncs->putColors)
-	return;
-
-    if (pScreenPriv->screen->fb.depth <= KD_MAX_PSEUDO_DEPTH)
-    {
-	for (i = 0; i < (1 << pScreenPriv->screen->fb.depth); i++)
-	    pScreenPriv->systemPalette[i].pixel = i;
-	(*pScreenPriv->card->cfuncs->getColors) (pScreen,
-						 (1 << pScreenPriv->screen->fb.depth),
-						 pScreenPriv->systemPalette);
+        return;
+
+    if (pScreenPriv->screen->fb.depth <= KD_MAX_PSEUDO_DEPTH) {
+        for (i = 0; i < (1 << pScreenPriv->screen->fb.depth); i++)
+            pScreenPriv->systemPalette[i].pixel = i;
+        (*pScreenPriv->card->cfuncs->getColors) (pScreen,
+                                                 (1 << pScreenPriv->screen->fb.
+                                                  depth),
+                                                 pScreenPriv->systemPalette);
     }
-    KdSetColormap (pScreen);
+    KdSetColormap(pScreen);
 }
 
 void
-KdDisableColormap (ScreenPtr pScreen)
+KdDisableColormap(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
 
     if (!pScreenPriv->card->cfuncs->putColors)
-	return;
+        return;
 
-    if (pScreenPriv->screen->fb.depth <= KD_MAX_PSEUDO_DEPTH)
-    {
-	(*pScreenPriv->card->cfuncs->putColors) (pScreen,
-						 (1 << pScreenPriv->screen->fb.depth),
-						 pScreenPriv->systemPalette);
+    if (pScreenPriv->screen->fb.depth <= KD_MAX_PSEUDO_DEPTH) {
+        (*pScreenPriv->card->cfuncs->putColors) (pScreen,
+                                                 (1 << pScreenPriv->screen->fb.
+                                                  depth),
+                                                 pScreenPriv->systemPalette);
     }
 }
 
@@ -128,22 +128,22 @@ KdDisableColormap (ScreenPtr pScreen)
  * colormap and realize it into the Windows system palette.
  */
 void
-KdInstallColormap (ColormapPtr pCmap)
+KdInstallColormap(ColormapPtr pCmap)
 {
     KdScreenPriv(pCmap->pScreen);
 
     if (pCmap == pScreenPriv->pInstalledmap)
-	return;
+        return;
 
     /* Tell X clients that the installed colormap is going away. */
     if (pScreenPriv->pInstalledmap)
-	WalkTree(pScreenPriv->pInstalledmap->pScreen, TellLostMap,
-		 (pointer) &(pScreenPriv->pInstalledmap->mid));
+        WalkTree(pScreenPriv->pInstalledmap->pScreen, TellLostMap,
+                 (pointer) &(pScreenPriv->pInstalledmap->mid));
 
     /* Take note of the new installed colorscreen-> */
     pScreenPriv->pInstalledmap = pCmap;
 
-    KdSetColormap (pCmap->pScreen);
+    KdSetColormap(pCmap->pScreen);
 
     /* Tell X clients of the new colormap */
     WalkTree(pCmap->pScreen, TellGainedMap, (pointer) &(pCmap->mid));
@@ -157,45 +157,42 @@ KdInstallColormap (ColormapPtr pCmap)
  * The default X colormap itself cannot be uninstalled.
  */
 void
-KdUninstallColormap (ColormapPtr pCmap)
+KdUninstallColormap(ColormapPtr pCmap)
 {
     KdScreenPriv(pCmap->pScreen);
-    Colormap	defMapID;
+    Colormap defMapID;
     ColormapPtr defMap;
 
     /* ignore if not installed */
     if (pCmap != pScreenPriv->pInstalledmap)
-	return;
+        return;
 
     /* ignore attempts to uninstall default colormap */
     defMapID = pCmap->pScreen->defColormap;
     if ((Colormap) pCmap->mid == defMapID)
-	return;
+        return;
 
     /* install default */
-    dixLookupResourceByType((pointer *)&defMap, defMapID, RT_COLORMAP,
-			    serverClient, DixInstallAccess);
+    dixLookupResourceByType((pointer *) &defMap, defMapID, RT_COLORMAP,
+                            serverClient, DixInstallAccess);
     if (defMap)
-	(*pCmap->pScreen->InstallColormap)(defMap);
-    else
-    {
-	/* uninstall and clear colormap pointer */
-	WalkTree(pCmap->pScreen, TellLostMap,
-		 (pointer) &(pCmap->mid));
-	pScreenPriv->pInstalledmap = 0;
+        (*pCmap->pScreen->InstallColormap) (defMap);
+    else {
+        /* uninstall and clear colormap pointer */
+        WalkTree(pCmap->pScreen, TellLostMap, (pointer) &(pCmap->mid));
+        pScreenPriv->pInstalledmap = 0;
     }
 }
 
 int
-KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps)
+KdListInstalledColormaps(ScreenPtr pScreen, Colormap * pCmaps)
 {
     KdScreenPriv(pScreen);
-    int		n = 0;
+    int n = 0;
 
-    if (pScreenPriv->pInstalledmap)
-    {
-	*pCmaps++ = pScreenPriv->pInstalledmap->mid;
-	n++;
+    if (pScreenPriv->pInstalledmap) {
+        *pCmaps++ = pScreenPriv->pInstalledmap->mid;
+        n++;
     }
     return n;
 }
@@ -208,39 +205,39 @@ KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps)
  * colormap; it can be either the default colormap or a private colorscreen->
  */
 void
-KdStoreColors (ColormapPtr pCmap, int ndef, xColorItem *pdefs)
+KdStoreColors(ColormapPtr pCmap, int ndef, xColorItem * pdefs)
 {
     KdScreenPriv(pCmap->pScreen);
-    VisualPtr           pVisual;
-    xColorItem          expanddefs[KD_MAX_PSEUDO_SIZE];
+    VisualPtr pVisual;
+    xColorItem expanddefs[KD_MAX_PSEUDO_SIZE];
 
     if (pCmap != pScreenPriv->pInstalledmap)
-	return;
+        return;
 
     if (!pScreenPriv->card->cfuncs->putColors)
-	return;
+        return;
 
     if (pScreenPriv->screen->fb.depth > KD_MAX_PSEUDO_DEPTH)
-	return;
+        return;
 
     if (!pScreenPriv->enabled)
-	return;
+        return;
 
     /* Check for DirectColor or TrueColor being simulated on a PseudoColor device. */
     pVisual = pCmap->pVisual;
-    if ((pVisual->class | DynamicClass) == DirectColor)
-    {
-	/*
-	 * Expand DirectColor or TrueColor color values into a PseudoColor
-	 * format.  Defer to the Color Framebuffer (CFB) code to do that.
-	 */
-	ndef = fbExpandDirectColors(pCmap, ndef, pdefs, expanddefs);
-	pdefs = expanddefs;
+    if ((pVisual->class | DynamicClass) == DirectColor) {
+        /*
+         * Expand DirectColor or TrueColor color values into a PseudoColor
+         * format.  Defer to the Color Framebuffer (CFB) code to do that.
+         */
+        ndef = fbExpandDirectColors(pCmap, ndef, pdefs, expanddefs);
+        pdefs = expanddefs;
     }
 
     (*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen, ndef, pdefs);
 
     /* recolor hardware cursor */
     if (pScreenPriv->card->cfuncs->recolorCursor)
-	(*pScreenPriv->card->cfuncs->recolorCursor) (pCmap->pScreen, ndef, pdefs);
+        (*pScreenPriv->card->cfuncs->recolorCursor) (pCmap->pScreen, ndef,
+                                                     pdefs);
 }
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index f6cc351cd..f65ab96bc 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -46,197 +46,191 @@
 #include <signal.h>
 
 typedef struct _kdDepths {
-    CARD8   depth;
-    CARD8   bpp;
+    CARD8 depth;
+    CARD8 bpp;
 } KdDepths;
 
-KdDepths    kdDepths[] = {
-    { 1, 1 },
-    { 4, 4 },
-    { 8, 8 },
-    { 15, 16 },
-    { 16, 16 },
-    { 24, 32 },
-    { 32, 32 }
+KdDepths kdDepths[] = {
+    {1, 1},
+    {4, 4},
+    {8, 8},
+    {15, 16},
+    {16, 16},
+    {24, 32},
+    {32, 32}
 };
 
 #define NUM_KD_DEPTHS (sizeof (kdDepths) / sizeof (kdDepths[0]))
 
 #define KD_DEFAULT_BUTTONS 5
 
-DevPrivateKeyRec    kdScreenPrivateKeyRec;
-unsigned long	    kdGeneration;
-
-Bool                kdVideoTest;
-unsigned long       kdVideoTestTime;
-Bool		    kdEmulateMiddleButton;
-Bool		    kdRawPointerCoordinates;
-Bool		    kdDisableZaphod;
-Bool                kdAllowZap;
-Bool		    kdEnabled;
-int		    kdSubpixelOrder;
-int		    kdVirtualTerminal = -1;
-Bool		    kdSwitchPending;
-char		    *kdSwitchCmd;
-DDXPointRec	    kdOrigin;
-Bool		    kdHasPointer = FALSE;
-Bool		    kdHasKbd = FALSE;
-
-static Bool         kdCaughtSignal = FALSE;
+DevPrivateKeyRec kdScreenPrivateKeyRec;
+unsigned long kdGeneration;
+
+Bool kdVideoTest;
+unsigned long kdVideoTestTime;
+Bool kdEmulateMiddleButton;
+Bool kdRawPointerCoordinates;
+Bool kdDisableZaphod;
+Bool kdAllowZap;
+Bool kdEnabled;
+int kdSubpixelOrder;
+int kdVirtualTerminal = -1;
+Bool kdSwitchPending;
+char *kdSwitchCmd;
+DDXPointRec kdOrigin;
+Bool kdHasPointer = FALSE;
+Bool kdHasKbd = FALSE;
+
+static Bool kdCaughtSignal = FALSE;
 
 /*
  * Carry arguments from InitOutput through driver initialization
  * to KdScreenInit
  */
 
-KdOsFuncs	*kdOsFuncs;
+KdOsFuncs *kdOsFuncs;
 
 void
-KdDisableScreen (ScreenPtr pScreen)
+KdDisableScreen(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
 
     if (!pScreenPriv->enabled)
-	return;
+        return;
     if (!pScreenPriv->closed)
-	SetRootClip (pScreen, FALSE);
-    KdDisableColormap (pScreen);
+        SetRootClip(pScreen, FALSE);
+    KdDisableColormap(pScreen);
     if (!pScreenPriv->screen->dumb && pScreenPriv->card->cfuncs->disableAccel)
-	(*pScreenPriv->card->cfuncs->disableAccel) (pScreen);
-    if (!pScreenPriv->screen->softCursor && pScreenPriv->card->cfuncs->disableCursor)
-	(*pScreenPriv->card->cfuncs->disableCursor) (pScreen);
+        (*pScreenPriv->card->cfuncs->disableAccel) (pScreen);
+    if (!pScreenPriv->screen->softCursor &&
+        pScreenPriv->card->cfuncs->disableCursor)
+        (*pScreenPriv->card->cfuncs->disableCursor) (pScreen);
     if (pScreenPriv->card->cfuncs->dpms)
-	(*pScreenPriv->card->cfuncs->dpms) (pScreen, KD_DPMS_NORMAL);
+        (*pScreenPriv->card->cfuncs->dpms) (pScreen, KD_DPMS_NORMAL);
     pScreenPriv->enabled = FALSE;
-    if(pScreenPriv->card->cfuncs->disable)
+    if (pScreenPriv->card->cfuncs->disable)
         (*pScreenPriv->card->cfuncs->disable) (pScreen);
 }
 
 static void
-KdDoSwitchCmd (const char *reason)
+KdDoSwitchCmd(const char *reason)
 {
-    if (kdSwitchCmd)
-    {
-	char    *command;
-
-	if (asprintf(&command, "%s %s", kdSwitchCmd, reason) == -1)
-	    return;
-	system (command);
-	free(command);
+    if (kdSwitchCmd) {
+        char *command;
+
+        if (asprintf(&command, "%s %s", kdSwitchCmd, reason) == -1)
+            return;
+        system(command);
+        free(command);
     }
 }
 
 void
-KdSuspend (void)
+KdSuspend(void)
 {
-    KdCardInfo	    *card;
-    KdScreenInfo    *screen;
-
-    if (kdEnabled)
-    {
-	for (card = kdCardInfo; card; card = card->next)
-	{
-	    for (screen = card->screenList; screen; screen = screen->next)
-		if (screen->mynum == card->selected && screen->pScreen)
-		    KdDisableScreen (screen->pScreen);
-	    if (card->driver && card->cfuncs->restore)
-		(*card->cfuncs->restore) (card);
-	}
-	KdDisableInput ();
-	KdDoSwitchCmd ("suspend");
+    KdCardInfo *card;
+    KdScreenInfo *screen;
+
+    if (kdEnabled) {
+        for (card = kdCardInfo; card; card = card->next) {
+            for (screen = card->screenList; screen; screen = screen->next)
+                if (screen->mynum == card->selected && screen->pScreen)
+                    KdDisableScreen(screen->pScreen);
+            if (card->driver && card->cfuncs->restore)
+                (*card->cfuncs->restore) (card);
+        }
+        KdDisableInput();
+        KdDoSwitchCmd("suspend");
     }
 }
 
 void
-KdDisableScreens (void)
+KdDisableScreens(void)
 {
-    KdSuspend ();
-    if (kdEnabled)
-    {
+    KdSuspend();
+    if (kdEnabled) {
         if (kdOsFuncs->Disable)
             (*kdOsFuncs->Disable) ();
-	kdEnabled = FALSE;
+        kdEnabled = FALSE;
     }
 }
 
 Bool
-KdEnableScreen (ScreenPtr pScreen)
+KdEnableScreen(ScreenPtr pScreen)
 {
-    KdScreenPriv (pScreen);
+    KdScreenPriv(pScreen);
 
     if (pScreenPriv->enabled)
-	return TRUE;
-    if(pScreenPriv->card->cfuncs->enable)
-	if (!(*pScreenPriv->card->cfuncs->enable) (pScreen))
-	    return FALSE;
+        return TRUE;
+    if (pScreenPriv->card->cfuncs->enable)
+        if (!(*pScreenPriv->card->cfuncs->enable) (pScreen))
+            return FALSE;
     pScreenPriv->enabled = TRUE;
     pScreenPriv->dpmsState = KD_DPMS_NORMAL;
     pScreenPriv->card->selected = pScreenPriv->screen->mynum;
-    if (!pScreenPriv->screen->softCursor && pScreenPriv->card->cfuncs->enableCursor)
-	(*pScreenPriv->card->cfuncs->enableCursor) (pScreen);
+    if (!pScreenPriv->screen->softCursor &&
+        pScreenPriv->card->cfuncs->enableCursor)
+        (*pScreenPriv->card->cfuncs->enableCursor) (pScreen);
     if (!pScreenPriv->screen->dumb && pScreenPriv->card->cfuncs->enableAccel)
-	(*pScreenPriv->card->cfuncs->enableAccel) (pScreen);
-    KdEnableColormap (pScreen);
-    SetRootClip (pScreen, TRUE);
+        (*pScreenPriv->card->cfuncs->enableAccel) (pScreen);
+    KdEnableColormap(pScreen);
+    SetRootClip(pScreen, TRUE);
     if (pScreenPriv->card->cfuncs->dpms)
-	(*pScreenPriv->card->cfuncs->dpms) (pScreen, pScreenPriv->dpmsState);
+        (*pScreenPriv->card->cfuncs->dpms) (pScreen, pScreenPriv->dpmsState);
     return TRUE;
 }
 
 void
-KdResume (void)
+KdResume(void)
 {
-    KdCardInfo	    *card;
-    KdScreenInfo    *screen;
-
-    if (kdEnabled)
-    {
-	KdDoSwitchCmd ("resume");
-	for (card = kdCardInfo; card; card = card->next)
-	{
-	    if(card->cfuncs->preserve)
-		(*card->cfuncs->preserve) (card);
-	    for (screen = card->screenList; screen; screen = screen->next)
-		if (screen->mynum == card->selected && screen->pScreen)
-		    KdEnableScreen (screen->pScreen);
-	}
-	KdEnableInput ();
-	KdReleaseAllKeys ();
+    KdCardInfo *card;
+    KdScreenInfo *screen;
+
+    if (kdEnabled) {
+        KdDoSwitchCmd("resume");
+        for (card = kdCardInfo; card; card = card->next) {
+            if (card->cfuncs->preserve)
+                (*card->cfuncs->preserve) (card);
+            for (screen = card->screenList; screen; screen = screen->next)
+                if (screen->mynum == card->selected && screen->pScreen)
+                    KdEnableScreen(screen->pScreen);
+        }
+        KdEnableInput();
+        KdReleaseAllKeys();
     }
 }
 
 void
-KdEnableScreens (void)
+KdEnableScreens(void)
 {
-    if (!kdEnabled)
-    {
-	kdEnabled = TRUE;
+    if (!kdEnabled) {
+        kdEnabled = TRUE;
         if (kdOsFuncs->Enable)
             (*kdOsFuncs->Enable) ();
     }
-    KdResume ();
+    KdResume();
 }
 
 void
-KdProcessSwitch (void)
+KdProcessSwitch(void)
 {
     if (kdEnabled)
-	KdDisableScreens ();
+        KdDisableScreens();
     else
-	KdEnableScreens ();
+        KdEnableScreens();
 }
 
 void
 AbortDDX(enum ExitCode error)
 {
-    KdDisableScreens ();
-    if (kdOsFuncs)
-    {
-	if (kdEnabled && kdOsFuncs->Disable)
-	    (*kdOsFuncs->Disable) ();
+    KdDisableScreens();
+    if (kdOsFuncs) {
+        if (kdEnabled && kdOsFuncs->Disable)
+            (*kdOsFuncs->Disable) ();
         if (kdOsFuncs->Fini)
             (*kdOsFuncs->Fini) ();
-	KdDoSwitchCmd ("stop");
+        KdDoSwitchCmd("stop");
     }
 
     if (kdCaughtSignal)
@@ -244,58 +238,56 @@ AbortDDX(enum ExitCode error)
 }
 
 void
-ddxGiveUp (enum ExitCode error)
+ddxGiveUp(enum ExitCode error)
 {
-    AbortDDX (error);
+    AbortDDX(error);
 }
 
-Bool	kdDumbDriver;
-Bool	kdSoftCursor;
+Bool kdDumbDriver;
+Bool kdSoftCursor;
 
 char *
-KdParseFindNext (char *cur, const char *delim, char *save, char *last)
+KdParseFindNext(char *cur, const char *delim, char *save, char *last)
 {
-    while (*cur && !strchr (delim, *cur))
-    {
-	*save++ = *cur++;
+    while (*cur && !strchr(delim, *cur)) {
+        *save++ = *cur++;
     }
     *save = 0;
     *last = *cur;
     if (*cur)
-	cur++;
+        cur++;
     return cur;
 }
 
 Rotation
-KdAddRotation (Rotation a, Rotation b)
+KdAddRotation(Rotation a, Rotation b)
 {
-    Rotation	rotate = (a & RR_Rotate_All) * (b & RR_Rotate_All);
-    Rotation	reflect = (a & RR_Reflect_All) ^ (b & RR_Reflect_All);
+    Rotation rotate = (a & RR_Rotate_All) * (b & RR_Rotate_All);
+    Rotation reflect = (a & RR_Reflect_All) ^ (b & RR_Reflect_All);
 
     if (rotate > RR_Rotate_270)
-	rotate /= (RR_Rotate_270 * RR_Rotate_90);
+        rotate /= (RR_Rotate_270 * RR_Rotate_90);
     return reflect | rotate;
 }
 
 Rotation
-KdSubRotation (Rotation a, Rotation b)
+KdSubRotation(Rotation a, Rotation b)
 {
-    Rotation	rotate = (a & RR_Rotate_All) * 16 / (b & RR_Rotate_All);
-    Rotation	reflect = (a & RR_Reflect_All) ^ (b & RR_Reflect_All);
+    Rotation rotate = (a & RR_Rotate_All) * 16 / (b & RR_Rotate_All);
+    Rotation reflect = (a & RR_Reflect_All) ^ (b & RR_Reflect_All);
 
     if (rotate > RR_Rotate_270)
-	rotate /= (RR_Rotate_270 * RR_Rotate_90);
+        rotate /= (RR_Rotate_270 * RR_Rotate_90);
     return reflect | rotate;
 }
 
 void
-KdParseScreen (KdScreenInfo *screen,
-	       char	    *arg)
+KdParseScreen(KdScreenInfo * screen, char *arg)
 {
-    char    delim;
-    char    save[1024];
-    int	    i;
-    int	    pixels, mm;
+    char delim;
+    char save[1024];
+    int i;
+    int pixels, mm;
 
     screen->dumb = kdDumbDriver;
     screen->softCursor = kdSoftCursor;
@@ -309,39 +301,35 @@ KdParseScreen (KdScreenInfo *screen,
     screen->rate = 0;
     screen->fb.depth = 0;
     if (!arg)
-	return;
-    if (strlen (arg) >= sizeof (save))
-	return;
-
-    for (i = 0; i < 2; i++)
-    {
-	arg = KdParseFindNext (arg, "x/@XY", save, &delim);
-	if (!save[0])
-	    return;
-
-	pixels = atoi(save);
-	mm = 0;
-
-	if (delim == '/')
-	{
-	    arg = KdParseFindNext (arg, "x@XY", save, &delim);
-	    if (!save[0])
-		return;
-	    mm = atoi(save);
-	}
-
-	if (i == 0)
-	{
-	    screen->width = pixels;
-	    screen->width_mm = mm;
-	}
-	else
-	{
-	    screen->height = pixels;
-	    screen->height_mm = mm;
-	}
-	if (delim != 'x' && delim != '@' && delim != 'X' && delim != 'Y')
-	    return;
+        return;
+    if (strlen(arg) >= sizeof(save))
+        return;
+
+    for (i = 0; i < 2; i++) {
+        arg = KdParseFindNext(arg, "x/@XY", save, &delim);
+        if (!save[0])
+            return;
+
+        pixels = atoi(save);
+        mm = 0;
+
+        if (delim == '/') {
+            arg = KdParseFindNext(arg, "x@XY", save, &delim);
+            if (!save[0])
+                return;
+            mm = atoi(save);
+        }
+
+        if (i == 0) {
+            screen->width = pixels;
+            screen->width_mm = mm;
+        }
+        else {
+            screen->height = pixels;
+            screen->height_mm = mm;
+        }
+        if (delim != 'x' && delim != '@' && delim != 'X' && delim != 'Y')
+            return;
     }
 
     kdOrigin.x += screen->width;
@@ -350,55 +338,49 @@ KdParseScreen (KdScreenInfo *screen,
     kdSoftCursor = FALSE;
     kdSubpixelOrder = SubPixelUnknown;
 
-    if (delim == '@')
-    {
-	arg = KdParseFindNext (arg, "xXY", save, &delim);
-	if (save[0])
-	{
-	    int	    rotate = atoi (save);
-	    if (rotate < 45)
-		screen->randr = RR_Rotate_0;
-	    else if (rotate < 135)
-		screen->randr = RR_Rotate_90;
-	    else if (rotate < 225)
-		screen->randr = RR_Rotate_180;
-	    else if (rotate < 315)
-		screen->randr = RR_Rotate_270;
-	    else
-		screen->randr = RR_Rotate_0;
-	}
+    if (delim == '@') {
+        arg = KdParseFindNext(arg, "xXY", save, &delim);
+        if (save[0]) {
+            int rotate = atoi(save);
+
+            if (rotate < 45)
+                screen->randr = RR_Rotate_0;
+            else if (rotate < 135)
+                screen->randr = RR_Rotate_90;
+            else if (rotate < 225)
+                screen->randr = RR_Rotate_180;
+            else if (rotate < 315)
+                screen->randr = RR_Rotate_270;
+            else
+                screen->randr = RR_Rotate_0;
+        }
     }
-    if (delim == 'X')
-    {
-	arg = KdParseFindNext (arg, "xY", save, &delim);
-	screen->randr |= RR_Reflect_X;
+    if (delim == 'X') {
+        arg = KdParseFindNext(arg, "xY", save, &delim);
+        screen->randr |= RR_Reflect_X;
     }
 
-    if (delim == 'Y')
-    {
-	arg = KdParseFindNext (arg, "xY", save, &delim);
-	screen->randr |= RR_Reflect_Y;
+    if (delim == 'Y') {
+        arg = KdParseFindNext(arg, "xY", save, &delim);
+        screen->randr |= RR_Reflect_Y;
     }
 
-    arg = KdParseFindNext (arg, "x/,", save, &delim);
-    if (save[0])
-    {
-	screen->fb.depth = atoi(save);
-	if (delim == '/')
-	{
-	    arg = KdParseFindNext (arg, "x,", save, &delim);
-	    if (save[0])
-		screen->fb.bitsPerPixel = atoi (save);
-	}
-	else
-	    screen->fb.bitsPerPixel = 0;
+    arg = KdParseFindNext(arg, "x/,", save, &delim);
+    if (save[0]) {
+        screen->fb.depth = atoi(save);
+        if (delim == '/') {
+            arg = KdParseFindNext(arg, "x,", save, &delim);
+            if (save[0])
+                screen->fb.bitsPerPixel = atoi(save);
+        }
+        else
+            screen->fb.bitsPerPixel = 0;
     }
 
-    if (delim == 'x')
-    {
-	arg = KdParseFindNext (arg, "x", save, &delim);
-	if (save[0])
-	    screen->rate = atoi(save);
+    if (delim == 'x') {
+        arg = KdParseFindNext(arg, "x", save, &delim);
+        if (save[0])
+            screen->rate = atoi(save);
     }
 }
 
@@ -414,162 +396,154 @@ KdParseScreen (KdScreenInfo *screen,
  */
 
 void
-KdParseRgba (char *rgba)
+KdParseRgba(char *rgba)
 {
-    if (!strcmp (rgba, "rgb"))
-	kdSubpixelOrder = SubPixelHorizontalRGB;
-    else if (!strcmp (rgba, "bgr"))
-	kdSubpixelOrder = SubPixelHorizontalBGR;
-    else if (!strcmp (rgba, "vrgb"))
-	kdSubpixelOrder = SubPixelVerticalRGB;
-    else if (!strcmp (rgba, "vbgr"))
-	kdSubpixelOrder = SubPixelVerticalBGR;
-    else if (!strcmp (rgba, "none"))
-	kdSubpixelOrder = SubPixelNone;
+    if (!strcmp(rgba, "rgb"))
+        kdSubpixelOrder = SubPixelHorizontalRGB;
+    else if (!strcmp(rgba, "bgr"))
+        kdSubpixelOrder = SubPixelHorizontalBGR;
+    else if (!strcmp(rgba, "vrgb"))
+        kdSubpixelOrder = SubPixelVerticalRGB;
+    else if (!strcmp(rgba, "vbgr"))
+        kdSubpixelOrder = SubPixelVerticalBGR;
+    else if (!strcmp(rgba, "none"))
+        kdSubpixelOrder = SubPixelNone;
     else
-	kdSubpixelOrder = SubPixelUnknown;
+        kdSubpixelOrder = SubPixelUnknown;
 }
 
 void
-KdUseMsg (void)
+KdUseMsg(void)
 {
     ErrorF("\nTinyX Device Dependent Usage:\n");
-    ErrorF("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM][@ROTATION][X][Y][xDEPTH/BPP[xFREQ]]  Specify screen characteristics\n");
-    ErrorF("-rgba rgb/bgr/vrgb/vbgr/none   Specify subpixel ordering for LCD panels\n");
-    ErrorF("-mouse driver [,n,,options]    Specify the pointer driver and its options (n is the number of buttons)\n");
-    ErrorF("-keybd driver [,,options]      Specify the keyboard driver and its options\n");
+    ErrorF
+        ("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM][@ROTATION][X][Y][xDEPTH/BPP[xFREQ]]  Specify screen characteristics\n");
+    ErrorF
+        ("-rgba rgb/bgr/vrgb/vbgr/none   Specify subpixel ordering for LCD panels\n");
+    ErrorF
+        ("-mouse driver [,n,,options]    Specify the pointer driver and its options (n is the number of buttons)\n");
+    ErrorF
+        ("-keybd driver [,,options]      Specify the keyboard driver and its options\n");
     ErrorF("-zaphod          Disable cursor screen switching\n");
     ErrorF("-2button         Emulate 3 button mouse\n");
     ErrorF("-3button         Disable 3 button mouse emulation\n");
-    ErrorF("-rawcoord        Don't transform pointer coordinates on rotation\n");
+    ErrorF
+        ("-rawcoord        Don't transform pointer coordinates on rotation\n");
     ErrorF("-dumb            Disable hardware acceleration\n");
     ErrorF("-softCursor      Force software cursor\n");
     ErrorF("-videoTest       Start the server, pause momentarily and exit\n");
-    ErrorF("-origin X,Y      Locates the next screen in the the virtual screen (Xinerama)\n");
+    ErrorF
+        ("-origin X,Y      Locates the next screen in the the virtual screen (Xinerama)\n");
     ErrorF("-switchCmd       Command to execute on vt switch\n");
     ErrorF("-zap             Terminate server on Ctrl+Alt+Backspace\n");
-    ErrorF("vtxx             Use virtual terminal xx instead of the next available\n");
+    ErrorF
+        ("vtxx             Use virtual terminal xx instead of the next available\n");
 }
 
 int
-KdProcessArgument (int argc, char **argv, int i)
+KdProcessArgument(int argc, char **argv, int i)
 {
-    KdCardInfo	    *card;
-    KdScreenInfo    *screen;
-
-    if (!strcmp (argv[i], "-screen"))
-    {
-	if ((i+1) < argc)
-	{
-	    card = KdCardInfoLast ();
-	    if (!card)
-	    {
-		InitCard (0);
-		card = KdCardInfoLast ();
-	    }
-	    if (card) {
-		screen = KdScreenInfoAdd (card);
-		KdParseScreen (screen, argv[i+1]);
-	    } else
-		ErrorF("No matching card found!\n");
-	}
-	else
-	    UseMsg ();
-	return 2;
+    KdCardInfo *card;
+    KdScreenInfo *screen;
+
+    if (!strcmp(argv[i], "-screen")) {
+        if ((i + 1) < argc) {
+            card = KdCardInfoLast();
+            if (!card) {
+                InitCard(0);
+                card = KdCardInfoLast();
+            }
+            if (card) {
+                screen = KdScreenInfoAdd(card);
+                KdParseScreen(screen, argv[i + 1]);
+            }
+            else
+                ErrorF("No matching card found!\n");
+        }
+        else
+            UseMsg();
+        return 2;
     }
-    if (!strcmp (argv[i], "-zaphod"))
-    {
-	kdDisableZaphod = TRUE;
-	return 1;
+    if (!strcmp(argv[i], "-zaphod")) {
+        kdDisableZaphod = TRUE;
+        return 1;
     }
-    if (!strcmp (argv[i], "-zap"))
-    {
-	kdAllowZap = TRUE;
-	return 1;
+    if (!strcmp(argv[i], "-zap")) {
+        kdAllowZap = TRUE;
+        return 1;
     }
-    if (!strcmp (argv[i], "-3button"))
-    {
-	kdEmulateMiddleButton = FALSE;
-	return 1;
+    if (!strcmp(argv[i], "-3button")) {
+        kdEmulateMiddleButton = FALSE;
+        return 1;
     }
-    if (!strcmp (argv[i], "-2button"))
-    {
-	kdEmulateMiddleButton = TRUE;
-	return 1;
+    if (!strcmp(argv[i], "-2button")) {
+        kdEmulateMiddleButton = TRUE;
+        return 1;
     }
-    if (!strcmp (argv[i], "-rawcoord"))
-    {
-	kdRawPointerCoordinates = 1;
-	return 1;
+    if (!strcmp(argv[i], "-rawcoord")) {
+        kdRawPointerCoordinates = 1;
+        return 1;
     }
-    if (!strcmp (argv[i], "-dumb"))
-    {
-	kdDumbDriver = TRUE;
-	return 1;
+    if (!strcmp(argv[i], "-dumb")) {
+        kdDumbDriver = TRUE;
+        return 1;
     }
-    if (!strcmp (argv[i], "-softCursor"))
-    {
-	kdSoftCursor = TRUE;
-	return 1;
+    if (!strcmp(argv[i], "-softCursor")) {
+        kdSoftCursor = TRUE;
+        return 1;
     }
-    if (!strcmp (argv[i], "-videoTest"))
-    {
-	kdVideoTest = TRUE;
-	return 1;
+    if (!strcmp(argv[i], "-videoTest")) {
+        kdVideoTest = TRUE;
+        return 1;
     }
-    if (!strcmp (argv[i], "-origin"))
-    {
-	if ((i+1) < argc)
-	{
-	    char    *x = argv[i+1];
-	    char    *y = strchr (x, ',');
-	    if (x)
-		kdOrigin.x = atoi (x);
-	    else
-		kdOrigin.x = 0;
-	    if (y)
-		kdOrigin.y = atoi(y+1);
-	    else
-		kdOrigin.y = 0;
-	}
-	else
-	    UseMsg ();
-	return 2;
+    if (!strcmp(argv[i], "-origin")) {
+        if ((i + 1) < argc) {
+            char *x = argv[i + 1];
+            char *y = strchr(x, ',');
+
+            if (x)
+                kdOrigin.x = atoi(x);
+            else
+                kdOrigin.x = 0;
+            if (y)
+                kdOrigin.y = atoi(y + 1);
+            else
+                kdOrigin.y = 0;
+        }
+        else
+            UseMsg();
+        return 2;
     }
-    if (!strcmp (argv[i], "-rgba"))
-    {
-	if ((i+1) < argc)
-	    KdParseRgba (argv[i+1]);
-	else
-	    UseMsg ();
-	return 2;
+    if (!strcmp(argv[i], "-rgba")) {
+        if ((i + 1) < argc)
+            KdParseRgba(argv[i + 1]);
+        else
+            UseMsg();
+        return 2;
     }
-    if (!strcmp (argv[i], "-switchCmd"))
-    {
-	if ((i+1) < argc)
-	    kdSwitchCmd = argv[i+1];
-	else
-	    UseMsg ();
-	return 2;
+    if (!strcmp(argv[i], "-switchCmd")) {
+        if ((i + 1) < argc)
+            kdSwitchCmd = argv[i + 1];
+        else
+            UseMsg();
+        return 2;
     }
-    if (!strncmp (argv[i], "vt", 2) &&
-	sscanf (argv[i], "vt%2d", &kdVirtualTerminal) == 1)
-    {
-	return 1;
+    if (!strncmp(argv[i], "vt", 2) &&
+        sscanf(argv[i], "vt%2d", &kdVirtualTerminal) == 1) {
+        return 1;
     }
-    if (!strcmp (argv[i], "-mouse") ||
-        !strcmp (argv[i], "-pointer")) {
+    if (!strcmp(argv[i], "-mouse") || !strcmp(argv[i], "-pointer")) {
         if (i + 1 >= argc)
             UseMsg();
         KdAddConfigPointer(argv[i + 1]);
-	kdHasPointer = TRUE;
+        kdHasPointer = TRUE;
         return 2;
     }
-    if (!strcmp (argv[i], "-keybd")) {
+    if (!strcmp(argv[i], "-keybd")) {
         if (i + 1 >= argc)
             UseMsg();
         KdAddConfigKeyboard(argv[i + 1]);
-	kdHasKbd = TRUE;
+        kdHasKbd = TRUE;
         return 2;
     }
 
@@ -582,116 +556,110 @@ KdProcessArgument (int argc, char **argv, int i)
  */
 
 void
-KdOsInit (KdOsFuncs *pOsFuncs)
+KdOsInit(KdOsFuncs * pOsFuncs)
 {
     kdOsFuncs = pOsFuncs;
-    if (pOsFuncs)
-    {
-	if (serverGeneration == 1)
-	{
-	    KdDoSwitchCmd ("start");
+    if (pOsFuncs) {
+        if (serverGeneration == 1) {
+            KdDoSwitchCmd("start");
             if (pOsFuncs->Init)
                 (*pOsFuncs->Init) ();
-	}
+        }
     }
 }
 
 Bool
-KdAllocatePrivates (ScreenPtr pScreen)
+KdAllocatePrivates(ScreenPtr pScreen)
 {
-    KdPrivScreenPtr	pScreenPriv;
+    KdPrivScreenPtr pScreenPriv;
 
     if (kdGeneration != serverGeneration)
-	kdGeneration = serverGeneration;
+        kdGeneration = serverGeneration;
 
     if (!dixRegisterPrivateKey(&kdScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
 
-    pScreenPriv = calloc(1, sizeof (*pScreenPriv));
+    pScreenPriv = calloc(1, sizeof(*pScreenPriv));
     if (!pScreenPriv)
-	return FALSE;
-    KdSetScreenPriv (pScreen, pScreenPriv);
+        return FALSE;
+    KdSetScreenPriv(pScreen, pScreenPriv);
     return TRUE;
 }
 
 Bool
-KdCreateScreenResources (ScreenPtr pScreen)
+KdCreateScreenResources(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
-    KdCardInfo	    *card = pScreenPriv->card;
+    KdCardInfo *card = pScreenPriv->card;
     Bool ret;
 
     pScreen->CreateScreenResources = pScreenPriv->CreateScreenResources;
-    if(pScreen->CreateScreenResources)
-	ret = (*pScreen->CreateScreenResources) (pScreen);
+    if (pScreen->CreateScreenResources)
+        ret = (*pScreen->CreateScreenResources) (pScreen);
     else
-	ret= -1;
+        ret = -1;
     pScreenPriv->CreateScreenResources = pScreen->CreateScreenResources;
     pScreen->CreateScreenResources = KdCreateScreenResources;
     if (ret && card->cfuncs->createRes)
-	ret = (*card->cfuncs->createRes) (pScreen);
+        ret = (*card->cfuncs->createRes) (pScreen);
     return ret;
 }
 
 Bool
-KdCloseScreen (int index, ScreenPtr pScreen)
+KdCloseScreen(int index, ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
-    KdScreenInfo    *screen = pScreenPriv->screen;
-    KdCardInfo	    *card = pScreenPriv->card;
-    Bool	    ret;
+    KdScreenInfo *screen = pScreenPriv->screen;
+    KdCardInfo *card = pScreenPriv->card;
+    Bool ret;
 
     pScreenPriv->closed = TRUE;
     pScreen->CloseScreen = pScreenPriv->CloseScreen;
-    if(pScreen->CloseScreen)
+    if (pScreen->CloseScreen)
         ret = (*pScreen->CloseScreen) (index, pScreen);
     else
-	ret = TRUE;
+        ret = TRUE;
 
     if (pScreenPriv->dpmsState != KD_DPMS_NORMAL)
-	(*card->cfuncs->dpms) (pScreen, KD_DPMS_NORMAL);
+        (*card->cfuncs->dpms) (pScreen, KD_DPMS_NORMAL);
 
     if (screen->mynum == card->selected)
-	KdDisableScreen (pScreen);
+        KdDisableScreen(pScreen);
 
     /*
      * Restore video hardware when last screen is closed
      */
-    if (screen == card->screenList)
-    {
-	if (kdEnabled && card->cfuncs->restore)
-	    (*card->cfuncs->restore) (card);
+    if (screen == card->screenList) {
+        if (kdEnabled && card->cfuncs->restore)
+            (*card->cfuncs->restore) (card);
     }
 
     if (!pScreenPriv->screen->dumb && card->cfuncs->finiAccel)
-	(*card->cfuncs->finiAccel) (pScreen);
+        (*card->cfuncs->finiAccel) (pScreen);
 
     if (!pScreenPriv->screen->softCursor && card->cfuncs->finiCursor)
-	(*card->cfuncs->finiCursor) (pScreen);
+        (*card->cfuncs->finiCursor) (pScreen);
 
-    if(card->cfuncs->scrfini)
+    if (card->cfuncs->scrfini)
         (*card->cfuncs->scrfini) (screen);
 
     /*
      * Clean up card when last screen is closed, DIX closes them in
      * reverse order, thus we check for when the first in the list is closed
      */
-    if (screen == card->screenList)
-    {
-	if(card->cfuncs->cardfini)
-	    (*card->cfuncs->cardfini) (card);
-	/*
-	 * Clean up OS when last card is closed
-	 */
-	if (card == kdCardInfo)
-	{
-	    if (kdEnabled)
-	    {
-		kdEnabled = FALSE;
-		if(kdOsFuncs->Disable)
-		    (*kdOsFuncs->Disable) ();
-	    }
-	}
+    if (screen == card->screenList) {
+        if (card->cfuncs->cardfini)
+            (*card->cfuncs->cardfini) (card);
+        /*
+         * Clean up OS when last card is closed
+         */
+        if (card == kdCardInfo) {
+            if (kdEnabled) {
+                kdEnabled = FALSE;
+                if (kdOsFuncs->Disable)
+                    (*kdOsFuncs->Disable) ();
+            }
+        }
     }
 
     pScreenPriv->screen->pScreen = 0;
@@ -701,112 +669,107 @@ KdCloseScreen (int index, ScreenPtr pScreen)
 }
 
 Bool
-KdSaveScreen (ScreenPtr pScreen, int on)
+KdSaveScreen(ScreenPtr pScreen, int on)
 {
     KdScreenPriv(pScreen);
-    int	    dpmsState;
+    int dpmsState;
 
     if (!pScreenPriv->card->cfuncs->dpms)
-	return FALSE;
+        return FALSE;
 
     dpmsState = pScreenPriv->dpmsState;
     switch (on) {
     case SCREEN_SAVER_OFF:
-	dpmsState = KD_DPMS_NORMAL;
-	break;
+        dpmsState = KD_DPMS_NORMAL;
+        break;
     case SCREEN_SAVER_ON:
-	if (dpmsState == KD_DPMS_NORMAL)
-	    dpmsState = KD_DPMS_NORMAL+1;
-	break;
+        if (dpmsState == KD_DPMS_NORMAL)
+            dpmsState = KD_DPMS_NORMAL + 1;
+        break;
     case SCREEN_SAVER_CYCLE:
-	if (dpmsState < KD_DPMS_MAX)
-	    dpmsState++;
-	break;
+        if (dpmsState < KD_DPMS_MAX)
+            dpmsState++;
+        break;
     case SCREEN_SAVER_FORCER:
-	break;
+        break;
     }
-    if (dpmsState != pScreenPriv->dpmsState)
-    {
-	if (pScreenPriv->enabled)
-	    (*pScreenPriv->card->cfuncs->dpms) (pScreen, dpmsState);
-	pScreenPriv->dpmsState = dpmsState;
+    if (dpmsState != pScreenPriv->dpmsState) {
+        if (pScreenPriv->enabled)
+            (*pScreenPriv->card->cfuncs->dpms) (pScreen, dpmsState);
+        pScreenPriv->dpmsState = dpmsState;
     }
     return TRUE;
 }
 
 static Bool
-KdCreateWindow (WindowPtr pWin)
+KdCreateWindow(WindowPtr pWin)
 {
 #ifndef PHOENIX
-    if (!pWin->parent)
-    {
-	KdScreenPriv(pWin->drawable.pScreen);
-
-	if (!pScreenPriv->enabled)
-	{
-	    RegionEmpty(&pWin->borderClip);
-	    RegionBreak(&pWin->clipList);
-	}
+    if (!pWin->parent) {
+        KdScreenPriv(pWin->drawable.pScreen);
+
+        if (!pScreenPriv->enabled) {
+            RegionEmpty(&pWin->borderClip);
+            RegionBreak(&pWin->clipList);
+        }
     }
 #endif
-    return fbCreateWindow (pWin);
+    return fbCreateWindow(pWin);
 }
 
 void
-KdSetSubpixelOrder (ScreenPtr pScreen, Rotation randr)
+KdSetSubpixelOrder(ScreenPtr pScreen, Rotation randr)
 {
     KdScreenPriv(pScreen);
-    KdScreenInfo	*screen = pScreenPriv->screen;
-    int			subpixel_order = screen->subpixel_order;
-    Rotation		subpixel_dir;
-    int			i;
+    KdScreenInfo *screen = pScreenPriv->screen;
+    int subpixel_order = screen->subpixel_order;
+    Rotation subpixel_dir;
+    int i;
 
     static struct {
-	int	    subpixel_order;
-	Rotation    direction;
+        int subpixel_order;
+        Rotation direction;
     } orders[] = {
-	{ SubPixelHorizontalRGB, 	RR_Rotate_0 },
-	{ SubPixelHorizontalBGR,	RR_Rotate_180 },
-	{ SubPixelVerticalRGB,		RR_Rotate_270 },
-	{ SubPixelVerticalBGR,		RR_Rotate_90 },
-    };
+        {
+        SubPixelHorizontalRGB, RR_Rotate_0}, {
+        SubPixelHorizontalBGR, RR_Rotate_180}, {
+        SubPixelVerticalRGB, RR_Rotate_270}, {
+    SubPixelVerticalBGR, RR_Rotate_90},};
 
     static struct {
-	int	bit;
-	int	normal;
-	int	reflect;
+        int bit;
+        int normal;
+        int reflect;
     } reflects[] = {
-	{ RR_Reflect_X, SubPixelHorizontalRGB,	SubPixelHorizontalBGR },
-	{ RR_Reflect_X, SubPixelHorizontalBGR,	SubPixelHorizontalRGB },
-	{ RR_Reflect_Y, SubPixelVerticalRGB,	SubPixelVerticalBGR },
-	{ RR_Reflect_Y, SubPixelVerticalRGB,	SubPixelVerticalRGB },
-    };
+        {
+        RR_Reflect_X, SubPixelHorizontalRGB, SubPixelHorizontalBGR}, {
+        RR_Reflect_X, SubPixelHorizontalBGR, SubPixelHorizontalRGB}, {
+        RR_Reflect_Y, SubPixelVerticalRGB, SubPixelVerticalBGR}, {
+    RR_Reflect_Y, SubPixelVerticalRGB, SubPixelVerticalRGB},};
 
     /* map subpixel to direction */
     for (i = 0; i < 4; i++)
-	if (orders[i].subpixel_order == subpixel_order)
-	    break;
-    if (i < 4)
-    {
-	subpixel_dir = KdAddRotation (randr & RR_Rotate_All, orders[i].direction);
-
-	/* map back to subpixel order */
-	for (i = 0; i < 4; i++)
-	    if (orders[i].direction & subpixel_dir)
-	    {
-		subpixel_order = orders[i].subpixel_order;
-		break;
-	    }
-	/* reflect */
-	for (i = 0; i < 4; i++)
-	    if ((randr & reflects[i].bit) &&
-		reflects[i].normal == subpixel_order)
-	    {
-		subpixel_order = reflects[i].reflect;
-		break;
-	    }
+        if (orders[i].subpixel_order == subpixel_order)
+            break;
+    if (i < 4) {
+        subpixel_dir =
+            KdAddRotation(randr & RR_Rotate_All, orders[i].direction);
+
+        /* map back to subpixel order */
+        for (i = 0; i < 4; i++)
+            if (orders[i].direction & subpixel_dir) {
+                subpixel_order = orders[i].subpixel_order;
+                break;
+            }
+        /* reflect */
+        for (i = 0; i < 4; i++)
+            if ((randr & reflects[i].bit) &&
+                reflects[i].normal == subpixel_order) {
+                subpixel_order = reflects[i].reflect;
+                break;
+            }
     }
-    PictureSetSubpixelOrder (pScreen, subpixel_order);
+    PictureSetSubpixelOrder(pScreen, subpixel_order);
 }
 
 /* Pass through AddScreen, which doesn't take any closure */
@@ -815,34 +778,33 @@ static KdScreenInfo *kdCurrentScreen;
 Bool
 KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
 {
-    KdScreenInfo	*screen = kdCurrentScreen;
-    KdCardInfo		*card = screen->card;
-    KdPrivScreenPtr	pScreenPriv;
+    KdScreenInfo *screen = kdCurrentScreen;
+    KdCardInfo *card = screen->card;
+    KdPrivScreenPtr pScreenPriv;
+
     /*
      * note that screen->fb is set up for the nominal orientation
      * of the screen; that means if randr is rotated, the values
      * there should reflect a rotated frame buffer (or shadow).
      */
-    Bool		rotated = (screen->randr & (RR_Rotate_90|RR_Rotate_270)) != 0;
-    int			width, height, *width_mmp, *height_mmp;
+    Bool rotated = (screen->randr & (RR_Rotate_90 | RR_Rotate_270)) != 0;
+    int width, height, *width_mmp, *height_mmp;
 
-    KdAllocatePrivates (pScreen);
+    KdAllocatePrivates(pScreen);
 
     pScreenPriv = KdGetScreenPriv(pScreen);
 
-    if (!rotated)
-    {
-	width = screen->width;
-	height = screen->height;
-	width_mmp = &screen->width_mm;
-	height_mmp = &screen->height_mm;
+    if (!rotated) {
+        width = screen->width;
+        height = screen->height;
+        width_mmp = &screen->width_mm;
+        height_mmp = &screen->height_mm;
     }
-    else
-    {
-	width = screen->height;
-	height = screen->width;
-	width_mmp = &screen->height_mm;
-	height_mmp = &screen->width_mm;
+    else {
+        width = screen->height;
+        height = screen->width;
+        width_mmp = &screen->height_mm;
+        height_mmp = &screen->width_mm;
     }
     screen->pScreen = pScreen;
     pScreenPriv->screen = screen;
@@ -853,41 +815,37 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
     pScreen->y = screen->origin.y;
 
     if (!monitorResolution)
-	monitorResolution = 75;
+        monitorResolution = 75;
     /*
      * This is done in this order so that backing store wraps
      * our GC functions; fbFinishScreenInit initializes MI
      * backing store
      */
-    if (!fbSetupScreen (pScreen,
-			screen->fb.frameBuffer,
-			width, height,
-			monitorResolution, monitorResolution,
-			screen->fb.pixelStride,
-			screen->fb.bitsPerPixel))
-    {
-	return FALSE;
+    if (!fbSetupScreen(pScreen,
+                       screen->fb.frameBuffer,
+                       width, height,
+                       monitorResolution, monitorResolution,
+                       screen->fb.pixelStride, screen->fb.bitsPerPixel)) {
+        return FALSE;
     }
 
     /*
      * Set colormap functions
      */
-    pScreen->InstallColormap	= KdInstallColormap;
-    pScreen->UninstallColormap	= KdUninstallColormap;
+    pScreen->InstallColormap = KdInstallColormap;
+    pScreen->UninstallColormap = KdUninstallColormap;
     pScreen->ListInstalledColormaps = KdListInstalledColormaps;
-    pScreen->StoreColors	= KdStoreColors;
-
-    pScreen->SaveScreen		= KdSaveScreen;
-    pScreen->CreateWindow	= KdCreateWindow;
-
-    if (!fbFinishScreenInit (pScreen,
-			     screen->fb.frameBuffer,
-			     width, height,
-			     monitorResolution, monitorResolution,
-			     screen->fb.pixelStride,
-			     screen->fb.bitsPerPixel))
-    {
-	return FALSE;
+    pScreen->StoreColors = KdStoreColors;
+
+    pScreen->SaveScreen = KdSaveScreen;
+    pScreen->CreateWindow = KdCreateWindow;
+
+    if (!fbFinishScreenInit(pScreen,
+                            screen->fb.frameBuffer,
+                            width, height,
+                            monitorResolution, monitorResolution,
+                            screen->fb.pixelStride, screen->fb.bitsPerPixel)) {
+        return FALSE;
     }
 
     /*
@@ -895,44 +853,44 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
      * Rounding errors are annoying
      */
     if (*width_mmp)
-	pScreen->mmWidth = *width_mmp;
+        pScreen->mmWidth = *width_mmp;
     else
-	*width_mmp = pScreen->mmWidth;
+        *width_mmp = pScreen->mmWidth;
     if (*height_mmp)
-	pScreen->mmHeight = *height_mmp;
+        pScreen->mmHeight = *height_mmp;
     else
-	*height_mmp = pScreen->mmHeight;
+        *height_mmp = pScreen->mmHeight;
 
     /*
      * Plug in our own block/wakeup handlers.
      * miScreenInit installs NoopDDA in both places
      */
-    pScreen->BlockHandler	= KdBlockHandler;
-    pScreen->WakeupHandler	= KdWakeupHandler;
+    pScreen->BlockHandler = KdBlockHandler;
+    pScreen->WakeupHandler = KdWakeupHandler;
 
-    if (!fbPictureInit (pScreen, 0, 0))
-	return FALSE;
+    if (!fbPictureInit(pScreen, 0, 0))
+        return FALSE;
     if (card->cfuncs->initScreen)
-	if (!(*card->cfuncs->initScreen) (pScreen))
-	    return FALSE;
+        if (!(*card->cfuncs->initScreen) (pScreen))
+            return FALSE;
 
     if (!screen->dumb && card->cfuncs->initAccel)
-	if (!(*card->cfuncs->initAccel) (pScreen))
-	    screen->dumb = TRUE;
+        if (!(*card->cfuncs->initAccel) (pScreen))
+            screen->dumb = TRUE;
 
     if (card->cfuncs->finishInitScreen)
-	if (!(*card->cfuncs->finishInitScreen) (pScreen))
-	    return FALSE;
+        if (!(*card->cfuncs->finishInitScreen) (pScreen))
+            return FALSE;
 
 #if 0
-    fbInitValidateTree (pScreen);
+    fbInitValidateTree(pScreen);
 #endif
 
     /*
      * Wrap CloseScreen, the order now is:
-     *	KdCloseScreen
-     *	miBSCloseScreen
-     *	fbCloseScreen
+     *  KdCloseScreen
+     *  miBSCloseScreen
+     *  fbCloseScreen
      */
     pScreenPriv->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = KdCloseScreen;
@@ -941,78 +899,70 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
     pScreen->CreateScreenResources = KdCreateScreenResources;
 
     if (screen->softCursor ||
-	!card->cfuncs->initCursor ||
-	!(*card->cfuncs->initCursor) (pScreen))
-    {
-	/* Use MI for cursor display and event queueing. */
-	screen->softCursor = TRUE;
-	miDCInitialize(pScreen, &kdPointerScreenFuncs);
+        !card->cfuncs->initCursor || !(*card->cfuncs->initCursor) (pScreen)) {
+        /* Use MI for cursor display and event queueing. */
+        screen->softCursor = TRUE;
+        miDCInitialize(pScreen, &kdPointerScreenFuncs);
     }
 
-
-    if (!fbCreateDefColormap (pScreen))
-    {
-	return FALSE;
+    if (!fbCreateDefColormap(pScreen)) {
+        return FALSE;
     }
 
-    KdSetSubpixelOrder (pScreen, screen->randr);
+    KdSetSubpixelOrder(pScreen, screen->randr);
 
     /*
      * Enable the hardware
      */
-    if (!kdEnabled)
-    {
-	kdEnabled = TRUE;
-	if(kdOsFuncs->Enable)
-	    (*kdOsFuncs->Enable) ();
+    if (!kdEnabled) {
+        kdEnabled = TRUE;
+        if (kdOsFuncs->Enable)
+            (*kdOsFuncs->Enable) ();
     }
 
-    if (screen->mynum == card->selected)
-    {
-	if(card->cfuncs->preserve)
-	    (*card->cfuncs->preserve) (card);
-	if(card->cfuncs->enable)
-	    if (!(*card->cfuncs->enable) (pScreen))
-		return FALSE;
-	pScreenPriv->enabled = TRUE;
-	if (!screen->softCursor && card->cfuncs->enableCursor)
-	    (*card->cfuncs->enableCursor) (pScreen);
-	KdEnableColormap (pScreen);
-	if (!screen->dumb && card->cfuncs->enableAccel)
-	    (*card->cfuncs->enableAccel) (pScreen);
+    if (screen->mynum == card->selected) {
+        if (card->cfuncs->preserve)
+            (*card->cfuncs->preserve) (card);
+        if (card->cfuncs->enable)
+            if (!(*card->cfuncs->enable) (pScreen))
+                return FALSE;
+        pScreenPriv->enabled = TRUE;
+        if (!screen->softCursor && card->cfuncs->enableCursor)
+            (*card->cfuncs->enableCursor) (pScreen);
+        KdEnableColormap(pScreen);
+        if (!screen->dumb && card->cfuncs->enableAccel)
+            (*card->cfuncs->enableAccel) (pScreen);
     }
 
     return TRUE;
 }
 
 void
-KdInitScreen (ScreenInfo    *pScreenInfo,
-	      KdScreenInfo  *screen,
-	      int	    argc,
-	      char	    **argv)
+KdInitScreen(ScreenInfo * pScreenInfo,
+             KdScreenInfo * screen, int argc, char **argv)
 {
-    KdCardInfo	*card = screen->card;
+    KdCardInfo *card = screen->card;
 
     (*card->cfuncs->scrinit) (screen);
 
     if (!card->cfuncs->initAccel)
-	screen->dumb = TRUE;
+        screen->dumb = TRUE;
     if (!card->cfuncs->initCursor)
-	screen->softCursor = TRUE;
+        screen->softCursor = TRUE;
 }
 
 static Bool
-KdSetPixmapFormats (ScreenInfo	*pScreenInfo)
+KdSetPixmapFormats(ScreenInfo * pScreenInfo)
 {
-    CARD8	    depthToBpp[33];	/* depth -> bpp map */
-    KdCardInfo	    *card;
-    KdScreenInfo    *screen;
-    int		    i;
-    int		    bpp;
+    CARD8 depthToBpp[33];       /* depth -> bpp map */
+    KdCardInfo *card;
+    KdScreenInfo *screen;
+    int i;
+    int bpp;
     PixmapFormatRec *format;
 
     for (i = 1; i <= 32; i++)
-	depthToBpp[i] = 0;
+        depthToBpp[i] = 0;
 
     /*
      * Generate mappings between bitsPerPixel and depth,
@@ -1020,148 +970,135 @@ KdSetPixmapFormats (ScreenInfo	*pScreenInfo)
      * restrictions on equivalent formats for the same
      * depth on different screens
      */
-    for (card = kdCardInfo; card; card = card->next)
-    {
-	for (screen = card->screenList; screen; screen = screen->next)
-	{
-	    bpp = screen->fb.bitsPerPixel;
-	    if (bpp == 24)
-		bpp = 32;
-	    if (!depthToBpp[screen->fb.depth])
-		depthToBpp[screen->fb.depth] = bpp;
-	    else if (depthToBpp[screen->fb.depth] != bpp)
-		return FALSE;
-	}
+    for (card = kdCardInfo; card; card = card->next) {
+        for (screen = card->screenList; screen; screen = screen->next) {
+            bpp = screen->fb.bitsPerPixel;
+            if (bpp == 24)
+                bpp = 32;
+            if (!depthToBpp[screen->fb.depth])
+                depthToBpp[screen->fb.depth] = bpp;
+            else if (depthToBpp[screen->fb.depth] != bpp)
+                return FALSE;
+        }
     }
 
     /*
      * Fill in additional formats
      */
     for (i = 0; i < NUM_KD_DEPTHS; i++)
-	if (!depthToBpp[kdDepths[i].depth])
-	    depthToBpp[kdDepths[i].depth] = kdDepths[i].bpp;
+        if (!depthToBpp[kdDepths[i].depth])
+            depthToBpp[kdDepths[i].depth] = kdDepths[i].bpp;
 
-    pScreenInfo->imageByteOrder     = IMAGE_BYTE_ORDER;
+    pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
     pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
-    pScreenInfo->bitmapScanlinePad  = BITMAP_SCANLINE_PAD;
-    pScreenInfo->bitmapBitOrder     = BITMAP_BIT_ORDER;
+    pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
+    pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
 
     pScreenInfo->numPixmapFormats = 0;
 
-    for (i = 1; i <= 32; i++)
-    {
-	if (depthToBpp[i])
-	{
-	    format = &pScreenInfo->formats[pScreenInfo->numPixmapFormats++];
-	    format->depth = i;
-	    format->bitsPerPixel = depthToBpp[i];
-	    format->scanlinePad = BITMAP_SCANLINE_PAD;
-	}
+    for (i = 1; i <= 32; i++) {
+        if (depthToBpp[i]) {
+            format = &pScreenInfo->formats[pScreenInfo->numPixmapFormats++];
+            format->depth = i;
+            format->bitsPerPixel = depthToBpp[i];
+            format->scanlinePad = BITMAP_SCANLINE_PAD;
+        }
     }
 
     return TRUE;
 }
 
 static void
-KdAddScreen (ScreenInfo	    *pScreenInfo,
-	     KdScreenInfo   *screen,
-	     int	    argc,
-	     char	    **argv)
+KdAddScreen(ScreenInfo * pScreenInfo,
+            KdScreenInfo * screen, int argc, char **argv)
 {
-    int	    i;
+    int i;
+
     /*
      * Fill in fb visual type masks for this screen
      */
-    for (i = 0; i < pScreenInfo->numPixmapFormats; i++)
-    {
-	unsigned long	visuals;
-	Pixel		rm, gm, bm;
-
-	visuals = 0;
-	rm = gm = bm = 0;
-	if (pScreenInfo->formats[i].depth == screen->fb.depth)
-	{
-	    visuals = screen->fb.visuals;
-	    rm = screen->fb.redMask;
-	    gm = screen->fb.greenMask;
-	    bm = screen->fb.blueMask;
-	}
-	fbSetVisualTypesAndMasks (pScreenInfo->formats[i].depth,
-				  visuals,
-				  8,
-				  rm, gm, bm);
+    for (i = 0; i < pScreenInfo->numPixmapFormats; i++) {
+        unsigned long visuals;
+        Pixel rm, gm, bm;
+
+        visuals = 0;
+        rm = gm = bm = 0;
+        if (pScreenInfo->formats[i].depth == screen->fb.depth) {
+            visuals = screen->fb.visuals;
+            rm = screen->fb.redMask;
+            gm = screen->fb.greenMask;
+            bm = screen->fb.blueMask;
+        }
+        fbSetVisualTypesAndMasks(pScreenInfo->formats[i].depth,
+                                 visuals, 8, rm, gm, bm);
     }
 
     kdCurrentScreen = screen;
 
-    AddScreen (KdScreenInit, argc, argv);
+    AddScreen(KdScreenInit, argc, argv);
 }
 
-#if 0 /* This function is not used currently */
+#if 0                           /* This function is not used currently */
 
 int
-KdDepthToFb (ScreenPtr	pScreen, int depth)
+KdDepthToFb(ScreenPtr pScreen, int depth)
 {
     KdScreenPriv(pScreen);
 
     for (fb = 0; fb <= KD_MAX_FB && pScreenPriv->screen->fb.frameBuffer; fb++)
-	if (pScreenPriv->screen->fb.depth == depth)
-	    return fb;
+        if (pScreenPriv->screen->fb.depth == depth)
+            return fb;
 }
 
 #endif
 
 static int
-KdSignalWrapper (int signum)
+KdSignalWrapper(int signum)
 {
     kdCaughtSignal = TRUE;
-    return 1; /* use generic OS layer cleanup & abort */
+    return 1;                   /* use generic OS layer cleanup & abort */
 }
 
 void
-KdInitOutput (ScreenInfo    *pScreenInfo,
-	      int	    argc,
-	      char	    **argv)
+KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
 {
-    KdCardInfo	    *card;
-    KdScreenInfo    *screen;
-
-    if (!kdCardInfo)
-    {
-	InitCard (0);
-	if (!(card = KdCardInfoLast ()))
-	    FatalError("No matching cards found!\n");
-	screen = KdScreenInfoAdd (card);
-	KdParseScreen (screen, 0);
+    KdCardInfo *card;
+    KdScreenInfo *screen;
+
+    if (!kdCardInfo) {
+        InitCard(0);
+        if (!(card = KdCardInfoLast()))
+            FatalError("No matching cards found!\n");
+        screen = KdScreenInfoAdd(card);
+        KdParseScreen(screen, 0);
     }
     /*
      * Initialize all of the screens for all of the cards
      */
-    for (card = kdCardInfo; card; card = card->next)
-    {
-	int ret=1;
-	if(card->cfuncs->cardinit)
-		ret=(*card->cfuncs->cardinit) (card);
-	if (ret)
-	{
-	    for (screen = card->screenList; screen; screen = screen->next)
-		KdInitScreen (pScreenInfo, screen, argc, argv);
-	}
+    for (card = kdCardInfo; card; card = card->next) {
+        int ret = 1;
+
+        if (card->cfuncs->cardinit)
+            ret = (*card->cfuncs->cardinit) (card);
+        if (ret) {
+            for (screen = card->screenList; screen; screen = screen->next)
+                KdInitScreen(pScreenInfo, screen, argc, argv);
+        }
     }
 
     /*
      * Merge the various pixmap formats together, this can fail
      * when two screens share depth but not bitsPerPixel
      */
-    if (!KdSetPixmapFormats (pScreenInfo))
-	return;
+    if (!KdSetPixmapFormats(pScreenInfo))
+        return;
 
     /*
      * Add all of the screens
      */
     for (card = kdCardInfo; card; card = card->next)
-	for (screen = card->screenList; screen; screen = screen->next)
-	    KdAddScreen (pScreenInfo, screen, argc, argv);
+        for (screen = card->screenList; screen; screen = screen->next)
+            KdAddScreen(pScreenInfo, screen, argc, argv);
 
     OsRegisterSigWrapper(KdSignalWrapper);
 }
@@ -1178,7 +1115,7 @@ DPMSSet(ClientPtr client, int level)
 }
 
 Bool
-DPMSSupported (void)
+DPMSSupported(void)
 {
     return FALSE;
 }
diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h
index cda965d84..6c2f29309 100644
--- a/xorg-server/hw/kdrive/src/kdrive.h
+++ b/xorg-server/hw/kdrive/src/kdrive.h
@@ -56,80 +56,80 @@
 #define Status int
 
 typedef struct _KdCardInfo {
-    struct _KdCardFuncs	    *cfuncs;
-    void		    *closure;
-    void		    *driver;
-    struct _KdScreenInfo    *screenList;
-    int			    selected;
-    struct _KdCardInfo	    *next;
+    struct _KdCardFuncs *cfuncs;
+    void *closure;
+    void *driver;
+    struct _KdScreenInfo *screenList;
+    int selected;
+    struct _KdCardInfo *next;
 } KdCardInfo;
 
-extern KdCardInfo	*kdCardInfo;
+extern KdCardInfo *kdCardInfo;
 
 /*
  * Configuration information per X screen
  */
 typedef struct _KdFrameBuffer {
-    CARD8	*frameBuffer;
-    int		depth;
-    int		bitsPerPixel;
-    int		pixelStride;
-    int		byteStride;
-    Bool	shadow;
-    unsigned long   visuals;
-    Pixel       redMask, greenMask, blueMask;
-    void	*closure;
+    CARD8 *frameBuffer;
+    int depth;
+    int bitsPerPixel;
+    int pixelStride;
+    int byteStride;
+    Bool shadow;
+    unsigned long visuals;
+    Pixel redMask, greenMask, blueMask;
+    void *closure;
 } KdFrameBuffer;
 
 #define RR_Rotate_All	(RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
 #define RR_Reflect_All	(RR_Reflect_X|RR_Reflect_Y)
 
 typedef struct _KdScreenInfo {
-    struct _KdScreenInfo    *next;
-    KdCardInfo	*card;
-    ScreenPtr	pScreen;
-    void	*driver;
-    Rotation	randr;	/* rotation and reflection */
-    int		width;
-    int		height;
-    int		rate;
-    int		width_mm;
-    int		height_mm;
-    int		subpixel_order;
-    Bool        dumb;
-    Bool        softCursor;
-    int		mynum;
-    DDXPointRec	origin;
-    KdFrameBuffer   fb;
+    struct _KdScreenInfo *next;
+    KdCardInfo *card;
+    ScreenPtr pScreen;
+    void *driver;
+    Rotation randr;             /* rotation and reflection */
+    int width;
+    int height;
+    int rate;
+    int width_mm;
+    int height_mm;
+    int subpixel_order;
+    Bool dumb;
+    Bool softCursor;
+    int mynum;
+    DDXPointRec origin;
+    KdFrameBuffer fb;
 } KdScreenInfo;
 
 typedef struct _KdCardFuncs {
-    Bool	(*cardinit) (KdCardInfo *); /* detect and map device */
-    Bool	(*scrinit) (KdScreenInfo *);/* initialize screen information */
-    Bool	(*initScreen) (ScreenPtr);  /* initialize ScreenRec */
-    Bool	(*finishInitScreen) (ScreenPtr pScreen);
-    Bool	(*createRes) (ScreenPtr);   /* create screen resources */
-    void	(*preserve) (KdCardInfo *); /* save graphics card state */
-    Bool        (*enable) (ScreenPtr);      /* set up for rendering */
-    Bool	(*dpms) (ScreenPtr, int);   /* set DPMS screen saver */
-    void        (*disable) (ScreenPtr);     /* turn off rendering */
-    void	(*restore) (KdCardInfo *);  /* restore graphics card state */
-    void	(*scrfini) (KdScreenInfo *);/* close down screen */
-    void        (*cardfini) (KdCardInfo *); /* close down */
-
-    Bool        (*initCursor) (ScreenPtr);      /* detect and map cursor */
-    void        (*enableCursor) (ScreenPtr);    /* enable cursor */
-    void        (*disableCursor) (ScreenPtr);   /* disable cursor */
-    void        (*finiCursor) (ScreenPtr);      /* close down */
-    void        (*recolorCursor) (ScreenPtr, int, xColorItem *);
-
-    Bool        (*initAccel) (ScreenPtr);
-    void        (*enableAccel) (ScreenPtr);
-    void        (*disableAccel) (ScreenPtr);
-    void        (*finiAccel) (ScreenPtr);
-
-    void        (*getColors) (ScreenPtr, int, xColorItem *);
-    void        (*putColors) (ScreenPtr, int, xColorItem *);
+    Bool (*cardinit) (KdCardInfo *);    /* detect and map device */
+    Bool (*scrinit) (KdScreenInfo *);   /* initialize screen information */
+    Bool (*initScreen) (ScreenPtr);     /* initialize ScreenRec */
+    Bool (*finishInitScreen) (ScreenPtr pScreen);
+    Bool (*createRes) (ScreenPtr);      /* create screen resources */
+    void (*preserve) (KdCardInfo *);    /* save graphics card state */
+    Bool (*enable) (ScreenPtr); /* set up for rendering */
+    Bool (*dpms) (ScreenPtr, int);      /* set DPMS screen saver */
+    void (*disable) (ScreenPtr);        /* turn off rendering */
+    void (*restore) (KdCardInfo *);     /* restore graphics card state */
+    void (*scrfini) (KdScreenInfo *);   /* close down screen */
+    void (*cardfini) (KdCardInfo *);    /* close down */
+
+    Bool (*initCursor) (ScreenPtr);     /* detect and map cursor */
+    void (*enableCursor) (ScreenPtr);   /* enable cursor */
+    void (*disableCursor) (ScreenPtr);  /* disable cursor */
+    void (*finiCursor) (ScreenPtr);     /* close down */
+    void (*recolorCursor) (ScreenPtr, int, xColorItem *);
+
+    Bool (*initAccel) (ScreenPtr);
+    void (*enableAccel) (ScreenPtr);
+    void (*disableAccel) (ScreenPtr);
+    void (*finiAccel) (ScreenPtr);
+
+    void (*getColors) (ScreenPtr, int, xColorItem *);
+    void (*putColors) (ScreenPtr, int, xColorItem *);
 
 } KdCardFuncs;
 
@@ -137,20 +137,20 @@ typedef struct _KdCardFuncs {
 #define KD_MAX_PSEUDO_SIZE	    (1 << KD_MAX_PSEUDO_DEPTH)
 
 typedef struct {
-    KdScreenInfo    *screen;
-    KdCardInfo	    *card;
+    KdScreenInfo *screen;
+    KdCardInfo *card;
 
-    Bool	    enabled;
-    Bool	    closed;
-    int		    bytesPerPixel;
+    Bool enabled;
+    Bool closed;
+    int bytesPerPixel;
 
-    int		    dpmsState;
+    int dpmsState;
 
-    ColormapPtr     pInstalledmap;                    /* current colormap */
-    xColorItem      systemPalette[KD_MAX_PSEUDO_SIZE];/* saved windows colors */
+    ColormapPtr pInstalledmap;  /* current colormap */
+    xColorItem systemPalette[KD_MAX_PSEUDO_SIZE];       /* saved windows colors */
 
-    CreateScreenResourcesProcPtr    CreateScreenResources;
-    CloseScreenProcPtr  CloseScreen;
+    CreateScreenResourcesProcPtr CreateScreenResources;
+    CloseScreenProcPtr CloseScreen;
 } KdPrivScreenRec, *KdPrivScreenPtr;
 
 typedef enum _kdPointerState {
@@ -175,33 +175,33 @@ typedef enum _kdPointerState {
 typedef struct _KdPointerInfo KdPointerInfo;
 
 typedef struct _KdPointerDriver {
-    char                    *name;
-    Status                  (*Init)    (KdPointerInfo *);
-    Status                  (*Enable)  (KdPointerInfo *);
-    void                    (*Disable) (KdPointerInfo *);
-    void                    (*Fini)    (KdPointerInfo *);
+    char *name;
+     Status(*Init) (KdPointerInfo *);
+     Status(*Enable) (KdPointerInfo *);
+    void (*Disable) (KdPointerInfo *);
+    void (*Fini) (KdPointerInfo *);
     struct _KdPointerDriver *next;
 } KdPointerDriver;
 
 struct _KdPointerInfo {
-    DeviceIntPtr          dixdev;
-    char                  *name;
-    char                  *path;
-    char                  *protocol;
-    InputOption           *options;
-    int                   inputClass;
-
-    CARD8                 map[KD_MAX_BUTTON + 1];
-    int                   nButtons;
-    int                   nAxes;
-
-    Bool                  emulateMiddleButton;
-    unsigned long         emulationTimeout;
-    int                   emulationDx, emulationDy;
-
-    Bool                  timeoutPending;
-    KdPointerState        mouseState;
-    Bool                  eventHeld;
+    DeviceIntPtr dixdev;
+    char *name;
+    char *path;
+    char *protocol;
+    InputOption *options;
+    int inputClass;
+
+    CARD8 map[KD_MAX_BUTTON + 1];
+    int nButtons;
+    int nAxes;
+
+    Bool emulateMiddleButton;
+    unsigned long emulationTimeout;
+    int emulationDx, emulationDy;
+
+    Bool timeoutPending;
+    KdPointerState mouseState;
+    Bool eventHeld;
     struct {
         int type;
         int x;
@@ -210,26 +210,25 @@ struct _KdPointerInfo {
         int flags;
         int absrel;
     } heldEvent;
-    unsigned char         buttonState;
-    Bool                  transformCoordinates;
-    int                   pressureThreshold;
+    unsigned char buttonState;
+    Bool transformCoordinates;
+    int pressureThreshold;
 
-    KdPointerDriver       *driver;
-    void                  *driverPrivate;
+    KdPointerDriver *driver;
+    void *driverPrivate;
 
     struct _KdPointerInfo *next;
 };
 
 extern int KdCurScreen;
 
-void KdAddPointerDriver (KdPointerDriver *driver);
-void KdRemovePointerDriver (KdPointerDriver *driver);
-KdPointerInfo *KdNewPointer (void);
-void KdFreePointer (KdPointerInfo *);
-int KdAddPointer (KdPointerInfo *ki);
-int KdAddConfigPointer (char *pointer);
-void KdRemovePointer (KdPointerInfo *ki);
-
+void KdAddPointerDriver(KdPointerDriver * driver);
+void KdRemovePointerDriver(KdPointerDriver * driver);
+KdPointerInfo *KdNewPointer(void);
+void KdFreePointer(KdPointerInfo *);
+int KdAddPointer(KdPointerInfo * ki);
+int KdAddConfigPointer(char *pointer);
+void KdRemovePointer(KdPointerInfo * ki);
 
 #define KD_KEY_COUNT 248
 #define KD_MIN_KEYCODE  8
@@ -239,64 +238,64 @@ void KdRemovePointer (KdPointerInfo *ki);
 
 typedef struct {
     KeySym modsym;
-    int    modbit;
+    int modbit;
 } KdKeySymModsRec;
 
 typedef struct _KdKeyboardInfo KdKeyboardInfo;
 
 typedef struct _KdKeyboardDriver {
-    char                  *name;
-    Bool                  (*Init)    (KdKeyboardInfo *);
-    Bool                  (*Enable)  (KdKeyboardInfo *);
-    void                  (*Leds)    (KdKeyboardInfo *, int);
-    void                  (*Bell)    (KdKeyboardInfo *, int, int, int);
-    void                  (*Disable) (KdKeyboardInfo *);
-    void                  (*Fini)    (KdKeyboardInfo *);
+    char *name;
+    Bool (*Init) (KdKeyboardInfo *);
+    Bool (*Enable) (KdKeyboardInfo *);
+    void (*Leds) (KdKeyboardInfo *, int);
+    void (*Bell) (KdKeyboardInfo *, int, int, int);
+    void (*Disable) (KdKeyboardInfo *);
+    void (*Fini) (KdKeyboardInfo *);
     struct _KdKeyboardDriver *next;
 } KdKeyboardDriver;
 
 struct _KdKeyboardInfo {
     struct _KdKeyboardInfo *next;
-    DeviceIntPtr        dixdev;
-    void                *closure;
-    char                *name;
-    char                *path;
-    int                 inputClass;
-    char                *xkbRules;
-    char                *xkbModel;
-    char                *xkbLayout;
-    char                *xkbVariant;
-    char                *xkbOptions;
-    int                 LockLed;
-
-    int                 minScanCode;
-    int                 maxScanCode;
-
-    int                 leds;
-    int                 bellPitch;
-    int                 bellDuration;
-    InputOption         *options;
-
-    KdKeyboardDriver    *driver;
-    void                *driverPrivate;
+    DeviceIntPtr dixdev;
+    void *closure;
+    char *name;
+    char *path;
+    int inputClass;
+    char *xkbRules;
+    char *xkbModel;
+    char *xkbLayout;
+    char *xkbVariant;
+    char *xkbOptions;
+    int LockLed;
+
+    int minScanCode;
+    int maxScanCode;
+
+    int leds;
+    int bellPitch;
+    int bellDuration;
+    InputOption *options;
+
+    KdKeyboardDriver *driver;
+    void *driverPrivate;
 };
 
-void KdAddKeyboardDriver (KdKeyboardDriver *driver);
-void KdRemoveKeyboardDriver (KdKeyboardDriver *driver);
-KdKeyboardInfo *KdNewKeyboard (void);
-void KdFreeKeyboard (KdKeyboardInfo *ki);
-int KdAddConfigKeyboard (char *pointer);
-int KdAddKeyboard (KdKeyboardInfo *ki);
-void KdRemoveKeyboard (KdKeyboardInfo *ki);
+void KdAddKeyboardDriver(KdKeyboardDriver * driver);
+void KdRemoveKeyboardDriver(KdKeyboardDriver * driver);
+KdKeyboardInfo *KdNewKeyboard(void);
+void KdFreeKeyboard(KdKeyboardInfo * ki);
+int KdAddConfigKeyboard(char *pointer);
+int KdAddKeyboard(KdKeyboardInfo * ki);
+void KdRemoveKeyboard(KdKeyboardInfo * ki);
 
 typedef struct _KdOsFuncs {
-    int		    (*Init) (void);
-    void	    (*Enable) (void);
-    Bool	    (*SpecialKey) (KeySym);
-    void	    (*Disable) (void);
-    void	    (*Fini) (void);
-    void	    (*pollEvents) (void);
-    void            (*Bell) (int, int, int);
+    int (*Init) (void);
+    void (*Enable) (void);
+    Bool (*SpecialKey) (KeySym);
+    void (*Disable) (void);
+    void (*Fini) (void);
+    void (*pollEvents) (void);
+    void (*Bell) (int, int, int);
 } KdOsFuncs;
 
 typedef enum _KdSyncPolarity {
@@ -305,28 +304,28 @@ typedef enum _KdSyncPolarity {
 
 typedef struct _KdMonitorTiming {
     /* label */
-    int		    horizontal;
-    int		    vertical;
-    int		    rate;
+    int horizontal;
+    int vertical;
+    int rate;
     /* pixel clock */
-    int		    clock;  /* in KHz */
+    int clock;                  /* in KHz */
     /* horizontal timing */
-    int		    hfp;    /* front porch */
-    int		    hbp;    /* back porch */
-    int		    hblank; /* blanking */
-    KdSyncPolarity  hpol;   /* polarity */
+    int hfp;                    /* front porch */
+    int hbp;                    /* back porch */
+    int hblank;                 /* blanking */
+    KdSyncPolarity hpol;        /* polarity */
     /* vertical timing */
-    int		    vfp;    /* front porch */
-    int		    vbp;    /* back porch */
-    int		    vblank; /* blanking */
-    KdSyncPolarity  vpol;   /* polarity */
+    int vfp;                    /* front porch */
+    int vbp;                    /* back porch */
+    int vblank;                 /* blanking */
+    KdSyncPolarity vpol;        /* polarity */
 } KdMonitorTiming;
 
-extern const KdMonitorTiming	kdMonitorTimings[];
-extern const int		kdNumMonitorTimings;
+extern const KdMonitorTiming kdMonitorTimings[];
+extern const int kdNumMonitorTimings;
 
 typedef struct _KdPointerMatrix {
-    int	    matrix[2][3];
+    int matrix[2][3];
 } KdPointerMatrix;
 
 /*
@@ -342,18 +341,19 @@ typedef struct _KdPointerMatrix {
     (PixmapWidthPaddingInfo[d].padRoundUp+1)))
 #endif
 
-extern DevPrivateKeyRec	kdScreenPrivateKeyRec;
+extern DevPrivateKeyRec kdScreenPrivateKeyRec;
+
 #define kdScreenPrivateKey (&kdScreenPrivateKeyRec)
 
-extern unsigned long	kdGeneration;
-extern Bool		kdEnabled;
-extern Bool		kdSwitchPending;
-extern Bool		kdEmulateMiddleButton;
-extern Bool		kdDisableZaphod;
-extern Bool		kdAllowZap;
-extern int		kdVirtualTerminal;
-extern char		*kdSwitchCmd;
-extern KdOsFuncs	*kdOsFuncs;
+extern unsigned long kdGeneration;
+extern Bool kdEnabled;
+extern Bool kdSwitchPending;
+extern Bool kdEmulateMiddleButton;
+extern Bool kdDisableZaphod;
+extern Bool kdAllowZap;
+extern int kdVirtualTerminal;
+extern char *kdSwitchCmd;
+extern KdOsFuncs *kdOsFuncs;
 
 #define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \
     dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))
@@ -363,158 +363,142 @@ extern KdOsFuncs	*kdOsFuncs;
 
 /* kcmap.c */
 void
-KdSetColormap (ScreenPtr pScreen);
+ KdSetColormap(ScreenPtr pScreen);
 
 void
-KdEnableColormap (ScreenPtr pScreen);
+ KdEnableColormap(ScreenPtr pScreen);
 
 void
-KdDisableColormap (ScreenPtr pScreen);
+ KdDisableColormap(ScreenPtr pScreen);
 
 void
-KdInstallColormap (ColormapPtr pCmap);
+ KdInstallColormap(ColormapPtr pCmap);
 
 void
-KdUninstallColormap (ColormapPtr pCmap);
+ KdUninstallColormap(ColormapPtr pCmap);
 
 int
-KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps);
+ KdListInstalledColormaps(ScreenPtr pScreen, Colormap * pCmaps);
 
 void
-KdStoreColors (ColormapPtr pCmap, int ndef, xColorItem *pdefs);
+ KdStoreColors(ColormapPtr pCmap, int ndef, xColorItem * pdefs);
 
 /* kdrive.c */
 extern miPointerScreenFuncRec kdPointerScreenFuncs;
 
 void
-KdDisableScreen (ScreenPtr pScreen);
+ KdDisableScreen(ScreenPtr pScreen);
 
 void
-KdDisableScreens (void);
+ KdDisableScreens(void);
 
 Bool
-KdEnableScreen (ScreenPtr pScreen);
+ KdEnableScreen(ScreenPtr pScreen);
 
 void
-KdEnableScreens (void);
+ KdEnableScreens(void);
 
 void
-KdSuspend (void);
+ KdSuspend(void);
 
 void
-KdResume (void);
+ KdResume(void);
 
 void
-KdProcessSwitch (void);
+ KdProcessSwitch(void);
 
-Rotation
-KdAddRotation (Rotation a, Rotation b);
+Rotation KdAddRotation(Rotation a, Rotation b);
 
-Rotation
-KdSubRotation (Rotation a, Rotation b);
+Rotation KdSubRotation(Rotation a, Rotation b);
 
 void
-KdParseScreen (KdScreenInfo *screen,
-	       char	    *arg);
+ KdParseScreen(KdScreenInfo * screen, char *arg);
 
-KdPointerInfo *
-KdParsePointer (char *arg);
+KdPointerInfo *KdParsePointer(char *arg);
 
-KdKeyboardInfo *
-KdParseKeyboard (char *arg);
+KdKeyboardInfo *KdParseKeyboard(char *arg);
 
-char *
-KdParseFindNext (char *cur, const char *delim, char *save, char *last);
+char *KdParseFindNext(char *cur, const char *delim, char *save, char *last);
 
 void
-KdParseRgba (char *rgba);
+ KdParseRgba(char *rgba);
 
 void
-KdUseMsg (void);
+ KdUseMsg(void);
 
 int
-KdProcessArgument (int argc, char **argv, int i);
+ KdProcessArgument(int argc, char **argv, int i);
 
 void
-KdOsInit (KdOsFuncs *pOsFuncs);
+ KdOsInit(KdOsFuncs * pOsFuncs);
 
 void
-KdOsAddInputDrivers (void);
+ KdOsAddInputDrivers(void);
 
 Bool
-KdAllocatePrivates (ScreenPtr pScreen);
+ KdAllocatePrivates(ScreenPtr pScreen);
 
 Bool
-KdCreateScreenResources (ScreenPtr pScreen);
+ KdCreateScreenResources(ScreenPtr pScreen);
 
 Bool
-KdCloseScreen (int index, ScreenPtr pScreen);
+ KdCloseScreen(int index, ScreenPtr pScreen);
 
 Bool
-KdSaveScreen (ScreenPtr pScreen, int on);
+ KdSaveScreen(ScreenPtr pScreen, int on);
 
 Bool
-KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv);
+ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv);
 
 void
-KdInitScreen (ScreenInfo    *pScreenInfo,
-	      KdScreenInfo  *screen,
-	      int	    argc,
-	      char	    **argv);
+
+KdInitScreen(ScreenInfo * pScreenInfo,
+             KdScreenInfo * screen, int argc, char **argv);
 
 void
-KdInitCard (ScreenInfo	    *pScreenInfo,
-	    KdCardInfo	    *card,
-	    int		    argc,
-	    char	    **argv);
+ KdInitCard(ScreenInfo * pScreenInfo, KdCardInfo * card, int argc, char **argv);
 
 void
-KdInitOutput (ScreenInfo    *pScreenInfo,
-	      int	    argc,
-	      char	    **argv);
+ KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv);
 
 void
-KdSetSubpixelOrder (ScreenPtr pScreen, Rotation randr);
+ KdSetSubpixelOrder(ScreenPtr pScreen, Rotation randr);
 
 void
-KdBacktrace (int signum);
+ KdBacktrace(int signum);
 
 /* kinfo.c */
-KdCardInfo *
-KdCardInfoAdd (KdCardFuncs  *funcs,
-	       void	    *closure);
+KdCardInfo *KdCardInfoAdd(KdCardFuncs * funcs, void *closure);
 
-KdCardInfo *
-KdCardInfoLast (void);
+KdCardInfo *KdCardInfoLast(void);
 
 void
-KdCardInfoDispose (KdCardInfo *ci);
+ KdCardInfoDispose(KdCardInfo * ci);
 
-KdScreenInfo *
-KdScreenInfoAdd (KdCardInfo *ci);
+KdScreenInfo *KdScreenInfoAdd(KdCardInfo * ci);
 
 void
-KdScreenInfoDispose (KdScreenInfo *si);
-
+ KdScreenInfoDispose(KdScreenInfo * si);
 
 /* kinput.c */
 void
-KdInitInput(void);
+ KdInitInput(void);
 void
-KdCloseInput(void);
+ KdCloseInput(void);
 
 Bool
-KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure);
+ KdRegisterFd(int fd, void (*read) (int fd, void *closure), void *closure);
 
 void
-KdUnregisterFds (void *closure, Bool do_close);
+ KdUnregisterFds(void *closure, Bool do_close);
 
 void
-KdUnregisterFd (void *closure, int fd, Bool do_close);
+ KdUnregisterFd(void *closure, int fd, Bool do_close);
 
 void
-KdEnqueueKeyboardEvent(KdKeyboardInfo *ki, unsigned char scan_code,
-                    unsigned char is_up);
+
+KdEnqueueKeyboardEvent(KdKeyboardInfo * ki, unsigned char scan_code,
+                       unsigned char is_up);
 
 #define KD_BUTTON_1	0x01
 #define KD_BUTTON_2	0x02
@@ -525,97 +509,96 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo *ki, unsigned char scan_code,
 #define KD_MOUSE_DELTA	0x80000000
 
 void
-KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
+
+KdEnqueuePointerEvent(KdPointerInfo * pi, unsigned long flags, int rx, int ry,
                       int rz);
 
 void
-_KdEnqueuePointerEvent(KdPointerInfo *pi, int type, int x, int y, int z,
+
+_KdEnqueuePointerEvent(KdPointerInfo * pi, int type, int x, int y, int z,
                        int b, int absrel, Bool force);
 
 void
-KdReleaseAllKeys (void);
+ KdReleaseAllKeys(void);
 
 void
-KdSetLed (KdKeyboardInfo *ki, int led, Bool on);
+ KdSetLed(KdKeyboardInfo * ki, int led, Bool on);
 
 void
-KdSetPointerMatrix (KdPointerMatrix *pointer);
+ KdSetPointerMatrix(KdPointerMatrix * pointer);
 
 void
-KdComputePointerMatrix (KdPointerMatrix *pointer, Rotation randr, int width, int height);
+
+KdComputePointerMatrix(KdPointerMatrix * pointer, Rotation randr, int width,
+                       int height);
 
 void
-KdScreenToPointerCoords (int *x, int *y);
+ KdScreenToPointerCoords(int *x, int *y);
 
 void
-KdBlockHandler (int		screen,
-		pointer		blockData,
-		pointer		timeout,
-		pointer		readmask);
+
+KdBlockHandler(int screen,
+               pointer blockData, pointer timeout, pointer readmask);
 
 void
-KdWakeupHandler (int		screen,
-		 pointer    	data,
-		 unsigned long	result,
-		 pointer	readmask);
+
+KdWakeupHandler(int screen,
+                pointer data, unsigned long result, pointer readmask);
 
 void
-KdDisableInput (void);
+ KdDisableInput(void);
 
 void
-KdEnableInput (void);
+ KdEnableInput(void);
 
 void
-ProcessInputEvents (void);
+ ProcessInputEvents(void);
 
 void
-KdRingBell (KdKeyboardInfo      *ki,
-            int                 volume,
-            int                 pitch,
-            int                 duration);
+ KdRingBell(KdKeyboardInfo * ki, int volume, int pitch, int duration);
 
 /* kmode.c */
-const KdMonitorTiming *
-KdFindMode (KdScreenInfo    *screen,
-	    Bool	    (*supported) (KdScreenInfo *,
-					  const KdMonitorTiming *));
+const KdMonitorTiming *KdFindMode(KdScreenInfo * screen,
+                                  Bool (*supported) (KdScreenInfo *,
+                                                     const KdMonitorTiming *));
 
 Bool
-KdTuneMode (KdScreenInfo    *screen,
-	    Bool	    (*usable) (KdScreenInfo *),
-	    Bool	    (*supported) (KdScreenInfo *,
-					  const KdMonitorTiming *));
+
+KdTuneMode(KdScreenInfo * screen,
+           Bool (*usable) (KdScreenInfo *),
+           Bool (*supported) (KdScreenInfo *, const KdMonitorTiming *));
 
 #ifdef RANDR
 Bool
-KdRandRGetInfo (ScreenPtr pScreen,
-		int randr,
-		Bool (*supported) (ScreenPtr pScreen,
-				   const KdMonitorTiming *));
-
-const KdMonitorTiming *
-KdRandRGetTiming (ScreenPtr	    pScreen,
-		  Bool		    (*supported) (ScreenPtr pScreen,
-						  const KdMonitorTiming *),
-		  int		    rate,
-		  RRScreenSizePtr   pSize);
+
+KdRandRGetInfo(ScreenPtr pScreen,
+               int randr,
+               Bool (*supported) (ScreenPtr pScreen, const KdMonitorTiming *));
+
+const KdMonitorTiming *KdRandRGetTiming(ScreenPtr pScreen,
+                                        Bool (*supported) (ScreenPtr pScreen,
+                                                           const KdMonitorTiming
+                                                           *), int rate,
+                                        RRScreenSizePtr pSize);
 #endif
 
 /* kshadow.c */
 Bool
-KdShadowFbAlloc (KdScreenInfo *screen, Bool rotate);
+ KdShadowFbAlloc(KdScreenInfo * screen, Bool rotate);
 
 void
-KdShadowFbFree (KdScreenInfo *screen);
+ KdShadowFbFree(KdScreenInfo * screen);
 
 Bool
-KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindowProc window);
+
+KdShadowSet(ScreenPtr pScreen, int randr, ShadowUpdateProc update,
+            ShadowWindowProc window);
 
 void
-KdShadowUnset (ScreenPtr pScreen);
+ KdShadowUnset(ScreenPtr pScreen);
 
 /* function prototypes to be implemented by the drivers */
 void
-InitCard (char *name);
+ InitCard(char *name);
 
-#endif /* _KDRIVE_H_ */
+#endif                          /* _KDRIVE_H_ */
diff --git a/xorg-server/hw/kdrive/src/kinfo.c b/xorg-server/hw/kdrive/src/kinfo.c
index 0055b16db..01ae1e491 100644
--- a/xorg-server/hw/kdrive/src/kinfo.c
+++ b/xorg-server/hw/kdrive/src/kinfo.c
@@ -25,17 +25,16 @@
 #endif
 #include "kdrive.h"
 
-KdCardInfo  *kdCardInfo;
+KdCardInfo *kdCardInfo;
 
 KdCardInfo *
-KdCardInfoAdd (KdCardFuncs  *funcs,
-	       void	    *closure)
+KdCardInfoAdd(KdCardFuncs * funcs, void *closure)
 {
-    KdCardInfo	*ci, **prev;
+    KdCardInfo *ci, **prev;
 
-    ci = calloc(1, sizeof (KdCardInfo));
+    ci = calloc(1, sizeof(KdCardInfo));
     if (!ci)
-	return 0;
+        return 0;
     for (prev = &kdCardInfo; *prev; prev = &(*prev)->next);
     *prev = ci;
     ci->cfuncs = funcs;
@@ -47,39 +46,38 @@ KdCardInfoAdd (KdCardFuncs  *funcs,
 }
 
 KdCardInfo *
-KdCardInfoLast (void)
+KdCardInfoLast(void)
 {
-    KdCardInfo	*ci;
+    KdCardInfo *ci;
 
     if (!kdCardInfo)
-	return 0;
+        return 0;
     for (ci = kdCardInfo; ci->next; ci = ci->next);
     return ci;
 }
 
 void
-KdCardInfoDispose (KdCardInfo *ci)
+KdCardInfoDispose(KdCardInfo * ci)
 {
-    KdCardInfo	**prev;
+    KdCardInfo **prev;
 
     for (prev = &kdCardInfo; *prev; prev = &(*prev)->next)
-	if (*prev == ci)
-	{
-	    *prev = ci->next;
-	    free(ci);
-	    break;
-	}
+        if (*prev == ci) {
+            *prev = ci->next;
+            free(ci);
+            break;
+        }
 }
 
 KdScreenInfo *
-KdScreenInfoAdd (KdCardInfo *ci)
+KdScreenInfoAdd(KdCardInfo * ci)
 {
-    KdScreenInfo    *si, **prev;
-    int		    n;
+    KdScreenInfo *si, **prev;
+    int n;
 
-    si = calloc(1, sizeof (KdScreenInfo));
+    si = calloc(1, sizeof(KdScreenInfo));
     if (!si)
-	return 0;
+        return 0;
     for (prev = &ci->screenList, n = 0; *prev; prev = &(*prev)->next, n++);
     *prev = si;
     si->next = 0;
@@ -89,30 +87,29 @@ KdScreenInfoAdd (KdCardInfo *ci)
 }
 
 void
-KdScreenInfoDispose (KdScreenInfo *si)
+KdScreenInfoDispose(KdScreenInfo * si)
 {
-    KdCardInfo	    *ci = si->card;
-    KdScreenInfo    **prev;
+    KdCardInfo *ci = si->card;
+    KdScreenInfo **prev;
 
     for (prev = &ci->screenList; *prev; prev = &(*prev)->next) {
-	if (*prev == si)
-	{
-	    *prev = si->next;
-	    free(si);
-	    if (!ci->screenList)
-		KdCardInfoDispose (ci);
-	    break;
-	}
+        if (*prev == si) {
+            *prev = si->next;
+            free(si);
+            if (!ci->screenList)
+                KdCardInfoDispose(ci);
+            break;
+        }
     }
 }
 
 KdPointerInfo *
-KdNewPointer (void)
+KdNewPointer(void)
 {
     KdPointerInfo *pi;
     int i;
 
-    pi = (KdPointerInfo *)calloc(1, sizeof(KdPointerInfo));
+    pi = (KdPointerInfo *) calloc(1, sizeof(KdPointerInfo));
     if (!pi)
         return NULL;
 
@@ -132,7 +129,7 @@ KdNewPointer (void)
 }
 
 void
-KdFreePointer(KdPointerInfo *pi)
+KdFreePointer(KdPointerInfo * pi)
 {
     free(pi->name);
     free(pi->path);
@@ -141,7 +138,7 @@ KdFreePointer(KdPointerInfo *pi)
 }
 
 void
-KdFreeKeyboard(KdKeyboardInfo *ki)
+KdFreeKeyboard(KdKeyboardInfo * ki)
 {
     free(ki->name);
     free(ki->path);
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index 968ebb159..e16fe78f2 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -35,14 +35,14 @@
 #include <signal.h>
 #include <stdio.h>
 #ifdef sun
-#include <sys/file.h> /* needed for FNONBLOCK & FASYNC */
+#include <sys/file.h>           /* needed for FNONBLOCK & FASYNC */
 #endif
 
 #include "xkbsrv.h"
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "XIstubs.h" /* even though we don't use stubs.  cute, no? */
+#include "XIstubs.h"            /* even though we don't use stubs.  cute, no? */
 #include "exevents.h"
 #include "extinit.h"
 #include "exglobals.h"
@@ -59,79 +59,80 @@ struct KdConfigDevice {
 };
 
 /* kdKeyboards and kdPointers hold all the real devices. */
-static KdKeyboardInfo *kdKeyboards         = NULL;
-static KdPointerInfo  *kdPointers          = NULL;
-static struct KdConfigDevice *kdConfigKeyboards   = NULL;
-static struct KdConfigDevice *kdConfigPointers    = NULL;
+static KdKeyboardInfo *kdKeyboards = NULL;
+static KdPointerInfo *kdPointers = NULL;
+static struct KdConfigDevice *kdConfigKeyboards = NULL;
+static struct KdConfigDevice *kdConfigPointers = NULL;
 
 static KdKeyboardDriver *kdKeyboardDrivers = NULL;
-static KdPointerDriver  *kdPointerDrivers  = NULL;
-
-static Bool		kdInputEnabled;
-static Bool		kdOffScreen;
-static unsigned long	kdOffScreenTime;
-static KdPointerMatrix	kdPointerMatrix = {
-   { { 1, 0, 0 },
-     { 0, 1, 0 } }
+static KdPointerDriver *kdPointerDrivers = NULL;
+
+static Bool kdInputEnabled;
+static Bool kdOffScreen;
+static unsigned long kdOffScreenTime;
+
+static KdPointerMatrix kdPointerMatrix = {
+    {{1, 0, 0},
+     {0, 1, 0}}
 };
 
-void KdResetInputMachine (void);
+void KdResetInputMachine(void);
 
 #define KD_MAX_INPUT_FDS    8
 
 typedef struct _kdInputFd {
-    int	        fd;
-    void        (*read) (int fd, void *closure);
-    int	        (*enable) (int fd, void *closure);
-    void        (*disable) (int fd, void *closure);
-    void        *closure;
+    int fd;
+    void (*read) (int fd, void *closure);
+    int (*enable) (int fd, void *closure);
+    void (*disable) (int fd, void *closure);
+    void *closure;
 } KdInputFd;
 
 static KdInputFd kdInputFds[KD_MAX_INPUT_FDS];
-static int	 kdNumInputFds;
+static int kdNumInputFds;
 
-extern Bool      kdRawPointerCoordinates;
+extern Bool kdRawPointerCoordinates;
 
 static void
-KdSigio (int sig)
+KdSigio(int sig)
 {
-    int	i;
+    int i;
 
     for (i = 0; i < kdNumInputFds; i++)
-	(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
+        (*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
 }
 
 static void
-KdBlockSigio (void)
+KdBlockSigio(void)
 {
-    sigset_t	set;
+    sigset_t set;
 
-    sigemptyset (&set);
-    sigaddset (&set, SIGIO);
-    sigprocmask (SIG_BLOCK, &set, 0);
+    sigemptyset(&set);
+    sigaddset(&set, SIGIO);
+    sigprocmask(SIG_BLOCK, &set, 0);
 }
 
 static void
-KdUnblockSigio (void)
+KdUnblockSigio(void)
 {
-    sigset_t	set;
+    sigset_t set;
 
-    sigemptyset (&set);
-    sigaddset (&set, SIGIO);
-    sigprocmask (SIG_UNBLOCK, &set, 0);
+    sigemptyset(&set);
+    sigaddset(&set, SIGIO);
+    sigprocmask(SIG_UNBLOCK, &set, 0);
 }
 
 #ifdef DEBUG_SIGIO
 
 void
-KdAssertSigioBlocked (char *where)
+KdAssertSigioBlocked(char *where)
 {
-    sigset_t	set, old;
+    sigset_t set, old;
 
-    sigemptyset (&set);
-    sigprocmask (SIG_BLOCK, &set, &old);
-    if (!sigismember (&old, SIGIO)) {
-	ErrorF ("SIGIO not blocked at %s\n", where);
+    sigemptyset(&set);
+    sigprocmask(SIG_BLOCK, &set, &old);
+    if (!sigismember(&old, SIGIO)) {
+        ErrorF("SIGIO not blocked at %s\n", where);
         KdBacktrace(0);
     }
 }
@@ -142,7 +143,7 @@ KdAssertSigioBlocked (char *where)
 
 #endif
 
-static int  kdnFds;
+static int kdnFds;
 
 #ifdef FNONBLOCK
 #define NOBLOCK FNONBLOCK
@@ -151,7 +152,7 @@ static int  kdnFds;
 #endif
 
 void
-KdResetInputMachine (void)
+KdResetInputMachine(void)
 {
     KdPointerInfo *pi;
 
@@ -162,60 +163,60 @@ KdResetInputMachine (void)
 }
 
 static void
-KdNonBlockFd (int fd)
+KdNonBlockFd(int fd)
 {
-    int	flags;
-    flags = fcntl (fd, F_GETFL);
-    flags |= FASYNC|NOBLOCK;
-    fcntl (fd, F_SETFL, flags);
+    int flags;
+
+    flags = fcntl(fd, F_GETFL);
+    flags |= FASYNC | NOBLOCK;
+    fcntl(fd, F_SETFL, flags);
 }
 
 static void
-KdAddFd (int fd)
+KdAddFd(int fd)
 {
-    struct sigaction	act;
-    sigset_t		set;
+    struct sigaction act;
+    sigset_t set;
 
     kdnFds++;
-    fcntl (fd, F_SETOWN, getpid());
-    KdNonBlockFd (fd);
-    AddEnabledDevice (fd);
-    memset (&act, '\0', sizeof act);
+    fcntl(fd, F_SETOWN, getpid());
+    KdNonBlockFd(fd);
+    AddEnabledDevice(fd);
+    memset(&act, '\0', sizeof act);
     act.sa_handler = KdSigio;
-    sigemptyset (&act.sa_mask);
-    sigaddset (&act.sa_mask, SIGIO);
-    sigaddset (&act.sa_mask, SIGALRM);
-    sigaddset (&act.sa_mask, SIGVTALRM);
-    sigaction (SIGIO, &act, 0);
-    sigemptyset (&set);
-    sigprocmask (SIG_SETMASK, &set, 0);
+    sigemptyset(&act.sa_mask);
+    sigaddset(&act.sa_mask, SIGIO);
+    sigaddset(&act.sa_mask, SIGALRM);
+    sigaddset(&act.sa_mask, SIGVTALRM);
+    sigaction(SIGIO, &act, 0);
+    sigemptyset(&set);
+    sigprocmask(SIG_SETMASK, &set, 0);
 }
 
 static void
-KdRemoveFd (int fd)
+KdRemoveFd(int fd)
 {
-    struct sigaction	act;
-    int			flags;
+    struct sigaction act;
+    int flags;
 
     kdnFds--;
-    RemoveEnabledDevice (fd);
-    flags = fcntl (fd, F_GETFL);
-    flags &= ~(FASYNC|NOBLOCK);
-    fcntl (fd, F_SETFL, flags);
-    if (kdnFds == 0)
-    {
-	memset (&act, '\0', sizeof act);
-	act.sa_handler = SIG_IGN;
-	sigemptyset (&act.sa_mask);
-	sigaction (SIGIO, &act, 0);
+    RemoveEnabledDevice(fd);
+    flags = fcntl(fd, F_GETFL);
+    flags &= ~(FASYNC | NOBLOCK);
+    fcntl(fd, F_SETFL, flags);
+    if (kdnFds == 0) {
+        memset(&act, '\0', sizeof act);
+        act.sa_handler = SIG_IGN;
+        sigemptyset(&act.sa_mask);
+        sigaction(SIGIO, &act, 0);
     }
 }
 
 Bool
-KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure)
+KdRegisterFd(int fd, void (*read) (int fd, void *closure), void *closure)
 {
     if (kdNumInputFds == KD_MAX_INPUT_FDS)
-	return FALSE;
+        return FALSE;
     kdInputFds[kdNumInputFds].fd = fd;
     kdInputFds[kdNumInputFds].read = read;
     kdInputFds[kdNumInputFds].enable = 0;
@@ -223,38 +224,38 @@ KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure)
     kdInputFds[kdNumInputFds].closure = closure;
     kdNumInputFds++;
     if (kdInputEnabled)
-	KdAddFd (fd);
+        KdAddFd(fd);
     return TRUE;
 }
 
 void
-KdUnregisterFd (void *closure, int fd, Bool do_close)
+KdUnregisterFd(void *closure, int fd, Bool do_close)
 {
-    int	i, j;
+    int i, j;
 
     for (i = 0; i < kdNumInputFds; i++) {
-	if (kdInputFds[i].closure == closure &&
+        if (kdInputFds[i].closure == closure &&
             (fd == -1 || kdInputFds[i].fd == fd)) {
-	    if (kdInputEnabled)
-		KdRemoveFd (kdInputFds[i].fd);
-	    if (do_close)
-		close (kdInputFds[i].fd);
-	    kdNumInputFds--;
-	    for (j = i; j < kdNumInputFds; j++)
-		kdInputFds[j] = kdInputFds[j+1];
+            if (kdInputEnabled)
+                KdRemoveFd(kdInputFds[i].fd);
+            if (do_close)
+                close(kdInputFds[i].fd);
+            kdNumInputFds--;
+            for (j = i; j < kdNumInputFds; j++)
+                kdInputFds[j] = kdInputFds[j + 1];
             break;
-	}
+        }
     }
 }
 
 void
-KdUnregisterFds (void *closure, Bool do_close)
+KdUnregisterFds(void *closure, Bool do_close)
 {
     KdUnregisterFd(closure, -1, do_close);
 }
 
 void
-KdDisableInput (void)
+KdDisableInput(void)
 {
     KdKeyboardInfo *ki;
     KdPointerInfo *pi;
@@ -283,7 +284,7 @@ KdDisableInput (void)
                     ErrorF("    fd %d belongs to keybd driver %s\n",
                            kdInputFds[i].fd,
                            ki->driver && ki->driver->name ?
-                             ki->driver->name : "(unnamed!)");
+                           ki->driver->name : "(unnamed!)");
                     found = 1;
                     break;
                 }
@@ -299,7 +300,7 @@ KdDisableInput (void)
                     ErrorF("    fd %d belongs to pointer driver %s\n",
                            kdInputFds[i].fd,
                            pi->driver && pi->driver->name ?
-                             pi->driver->name : "(unnamed!)");
+                           pi->driver->name : "(unnamed!)");
                     break;
                 }
             }
@@ -319,7 +320,7 @@ KdDisableInput (void)
 }
 
 void
-KdEnableInput (void)
+KdEnableInput(void)
 {
     InternalEvent ev;
     KdKeyboardInfo *ki;
@@ -338,14 +339,15 @@ KdEnableInput (void)
     }
 
     /* reset screen saver */
-    ev.any.time = GetTimeInMillis ();
-    NoticeEventTime (&ev);
+    ev.any.time = GetTimeInMillis();
+    NoticeEventTime(&ev, pi->dixdev);
+    NoticeEventTime(&ev, ki->dixdev);
 
-    KdUnblockSigio ();
+    KdUnblockSigio();
 }
 
 static KdKeyboardDriver *
-KdFindKeyboardDriver (const char *name)
+KdFindKeyboardDriver(const char *name)
 {
     KdKeyboardDriver *ret;
 
@@ -362,7 +364,7 @@ KdFindKeyboardDriver (const char *name)
 }
 
 static KdPointerDriver *
-KdFindPointerDriver (const char *name)
+KdFindPointerDriver(const char *name)
 {
     KdPointerDriver *ret;
 
@@ -381,14 +383,14 @@ KdFindPointerDriver (const char *name)
 static int
 KdPointerProc(DeviceIntPtr pDevice, int onoff)
 {
-    DevicePtr       pDev = (DevicePtr)pDevice;
-    KdPointerInfo   *pi;
-    Atom            xiclass;
-    Atom            *btn_labels;
-    Atom            *axes_labels;
+    DevicePtr pDev = (DevicePtr) pDevice;
+    KdPointerInfo *pi;
+    Atom xiclass;
+    Atom *btn_labels;
+    Atom *axes_labels;
 
     if (!pDev)
-	return BadImplementation;
+        return BadImplementation;
 
     for (pi = kdPointers; pi; pi = pi->next) {
         if (pi->dixdev && pi->dixdev->id == pDevice->id)
@@ -401,8 +403,7 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
         return BadImplementation;
     }
 
-    switch (onoff)
-    {
+    switch (onoff) {
     case DEVICE_INIT:
 #ifdef DEBUG
         ErrorF("initialising pointer %s ...\n", pi->name);
@@ -433,44 +434,43 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
             return !Success;
         }
 
-	btn_labels = calloc(pi->nButtons, sizeof(Atom));
-	if (!btn_labels)
-	    return BadAlloc;
-	axes_labels = calloc(pi->nAxes, sizeof(Atom));
-	if (!axes_labels) {
-	    free(btn_labels);
-	    return BadAlloc;
-	}
-
-	switch(pi->nAxes)
-	{
-	    default:
-	    case 7:
-		btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
-	    case 6:
-		btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
-	    case 5:
-		btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
-	    case 4:
-		btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
-	    case 3:
-		btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
-	    case 2:
-		btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
-	    case 1:
-		btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
-	    case 0:
-		break;
-	}
-
-	if (pi->nAxes >= 2) {
-	    axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
-	    axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
-	}
-
-	InitPointerDeviceStruct(pDev, pi->map, pi->nButtons, btn_labels,
-	    (PtrCtrlProcPtr)NoopDDA,
-	    GetMotionHistorySize(), pi->nAxes, axes_labels);
+        btn_labels = calloc(pi->nButtons, sizeof(Atom));
+        if (!btn_labels)
+            return BadAlloc;
+        axes_labels = calloc(pi->nAxes, sizeof(Atom));
+        if (!axes_labels) {
+            free(btn_labels);
+            return BadAlloc;
+        }
+
+        switch (pi->nAxes) {
+        default:
+        case 7:
+            btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
+        case 6:
+            btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+        case 5:
+            btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+        case 4:
+            btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+        case 3:
+            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+        case 2:
+            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+        case 1:
+            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+        case 0:
+            break;
+        }
+
+        if (pi->nAxes >= 2) {
+            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+        }
+
+        InitPointerDeviceStruct(pDev, pi->map, pi->nButtons, btn_labels,
+                                (PtrCtrlProcPtr) NoopDDA,
+                                GetMotionHistorySize(), pi->nAxes, axes_labels);
 
         free(btn_labels);
         free(axes_labels);
@@ -485,7 +485,7 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
         AssignTypeAndName(pi->dixdev, xiclass,
                           pi->name ? pi->name : "Generic KDrive Pointer");
 
-	return Success;
+        return Success;
 
     case DEVICE_ON:
         if (pDev->on == TRUE)
@@ -504,7 +504,7 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
             return BadImplementation;
         }
 
-	return Success;
+        return Success;
 
     case DEVICE_OFF:
         if (pDev->on == FALSE) {
@@ -523,7 +523,7 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
         return Success;
 
     case DEVICE_CLOSE:
-	if (pDev->on) {
+        if (pDev->on) {
             if (!pi->driver->Disable) {
                 return BadImplementation;
             }
@@ -552,7 +552,7 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev)
 }
 
 static void
-KdBell (int volume, DeviceIntPtr pDev, pointer arg, int something)
+KdBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
 {
     KeybdCtrl *ctrl = arg;
     KdKeyboardInfo *ki = NULL;
@@ -574,7 +574,7 @@ DDXRingBell(int volume, int pitch, int duration)
     KdKeyboardInfo *ki = NULL;
 
     if (kdOsFuncs->Bell) {
-        (*kdOsFuncs->Bell)(volume, pitch, duration);
+        (*kdOsFuncs->Bell) (volume, pitch, duration);
     }
     else {
         for (ki = kdKeyboards; ki; ki = ki->next) {
@@ -585,7 +585,7 @@ DDXRingBell(int volume, int pitch, int duration)
 }
 
 void
-KdRingBell(KdKeyboardInfo *ki, int volume, int pitch, int duration)
+KdRingBell(KdKeyboardInfo * ki, int volume, int pitch, int duration)
 {
     if (!ki || !ki->driver || !ki->driver->Bell)
         return;
@@ -594,9 +594,8 @@ KdRingBell(KdKeyboardInfo *ki, int volume, int pitch, int duration)
         (*ki->driver->Bell) (ki, volume, pitch, duration);
 }
 
-
 static void
-KdSetLeds (KdKeyboardInfo *ki, int leds)
+KdSetLeds(KdKeyboardInfo * ki, int leds)
 {
     if (!ki || !ki->driver)
         return;
@@ -608,75 +607,85 @@ KdSetLeds (KdKeyboardInfo *ki, int leds)
 }
 
 void
-KdSetLed (KdKeyboardInfo *ki, int led, Bool on)
+KdSetLed(KdKeyboardInfo * ki, int led, Bool on)
 {
     if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed)
         return;
 
-    NoteLedState (ki->dixdev, led, on);
-    KdSetLeds (ki, ki->dixdev->kbdfeed->ctrl.leds);
+    NoteLedState(ki->dixdev, led, on);
+    KdSetLeds(ki, ki->dixdev->kbdfeed->ctrl.leds);
 }
 
 void
-KdSetPointerMatrix (KdPointerMatrix *matrix)
+KdSetPointerMatrix(KdPointerMatrix * matrix)
 {
     kdPointerMatrix = *matrix;
 }
 
 void
-KdComputePointerMatrix (KdPointerMatrix *m, Rotation randr, int width,
-                        int height)
+KdComputePointerMatrix(KdPointerMatrix * m, Rotation randr, int width,
+                       int height)
 {
-    int		    x_dir = 1, y_dir = 1;
-    int		    i, j;
-    int		    size[2];
+    int x_dir = 1, y_dir = 1;
+    int i, j;
+    int size[2];
 
-    size[0] = width; size[1] = height;
+    size[0] = width;
+    size[1] = height;
     if (randr & RR_Reflect_X)
-	x_dir = -1;
+        x_dir = -1;
     if (randr & RR_Reflect_Y)
-	y_dir = -1;
+        y_dir = -1;
     switch (randr & (RR_Rotate_All)) {
     case RR_Rotate_0:
-	m->matrix[0][0] = x_dir; m->matrix[0][1] = 0;
-	m->matrix[1][0] = 0; m->matrix[1][1] = y_dir;
-	break;
+        m->matrix[0][0] = x_dir;
+        m->matrix[0][1] = 0;
+        m->matrix[1][0] = 0;
+        m->matrix[1][1] = y_dir;
+        break;
     case RR_Rotate_90:
-	m->matrix[0][0] = 0; m->matrix[0][1] = -x_dir;
-	m->matrix[1][0] = y_dir; m->matrix[1][1] = 0;
-	break;
+        m->matrix[0][0] = 0;
+        m->matrix[0][1] = -x_dir;
+        m->matrix[1][0] = y_dir;
+        m->matrix[1][1] = 0;
+        break;
     case RR_Rotate_180:
-	m->matrix[0][0] = -x_dir; m->matrix[0][1] = 0;
-	m->matrix[1][0] = 0; m->matrix[1][1] = -y_dir;
-	break;
+        m->matrix[0][0] = -x_dir;
+        m->matrix[0][1] = 0;
+        m->matrix[1][0] = 0;
+        m->matrix[1][1] = -y_dir;
+        break;
     case RR_Rotate_270:
-	m->matrix[0][0] = 0; m->matrix[0][1] = x_dir;
-	m->matrix[1][0] = -y_dir; m->matrix[1][1] = 0;
-	break;
+        m->matrix[0][0] = 0;
+        m->matrix[0][1] = x_dir;
+        m->matrix[1][0] = -y_dir;
+        m->matrix[1][1] = 0;
+        break;
     }
-    for (i = 0; i < 2; i++)
-    {
-	m->matrix[i][2] = 0;
-	for (j = 0 ; j < 2; j++)
-	    if (m->matrix[i][j] < 0)
-		m->matrix[i][2] = size[j] - 1;
+    for (i = 0; i < 2; i++) {
+        m->matrix[i][2] = 0;
+        for (j = 0; j < 2; j++)
+            if (m->matrix[i][j] < 0)
+                m->matrix[i][2] = size[j] - 1;
     }
 }
 
 void
-KdScreenToPointerCoords (int *x, int *y)
+KdScreenToPointerCoords(int *x, int *y)
 {
-    int	(*m)[3] = kdPointerMatrix.matrix;
+    int (*m)[3] = kdPointerMatrix.matrix;
     int div = m[0][1] * m[1][0] - m[1][1] * m[0][0];
     int sx = *x;
     int sy = *y;
 
-    *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div;
-    *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div;
+    *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] -
+          m[1][1] * sx) / div;
+    *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] -
+          m[0][0] * sy) / div;
 }
 
 static void
-KdKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl)
+KdKbdCtrl(DeviceIntPtr pDevice, KeybdCtrl * ctrl)
 {
     KdKeyboardInfo *ki;
 
@@ -698,14 +707,14 @@ extern KeybdCtrl defaultKeyboardControl;
 static int
 KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
 {
-    Bool        ret;
-    DevicePtr   pDev = (DevicePtr)pDevice;
+    Bool ret;
+    DevicePtr pDev = (DevicePtr) pDevice;
     KdKeyboardInfo *ki;
     Atom xiclass;
     XkbRMLVOSet rmlvo;
 
     if (!pDev)
-	return BadImplementation;
+        return BadImplementation;
 
     for (ki = kdKeyboards; ki; ki = ki->next) {
         if (ki->dixdev && ki->dixdev->id == pDevice->id)
@@ -716,8 +725,7 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
         return BadImplementation;
     }
 
-    switch (onoff)
-    {
+    switch (onoff) {
     case DEVICE_INIT:
 #ifdef DEBUG
         ErrorF("initialising keyboard %s\n", ki->name);
@@ -754,10 +762,10 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
         rmlvo.layout = ki->xkbLayout;
         rmlvo.variant = ki->xkbVariant;
         rmlvo.options = ki->xkbOptions;
-        ret = InitKeyboardDeviceStruct (pDevice, &rmlvo, KdBell, KdKbdCtrl);
-	if (!ret) {
+        ret = InitKeyboardDeviceStruct(pDevice, &rmlvo, KdBell, KdKbdCtrl);
+        if (!ret) {
             ErrorF("Couldn't initialise keyboard %s\n", ki->name);
-	    return BadImplementation;
+            return BadImplementation;
         }
 
         xiclass = AtomFromName(XI_KEYBOARD);
@@ -797,13 +805,13 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
         break;
 
     case DEVICE_CLOSE:
-	if (pDev->on) {
+        if (pDev->on) {
             if (!ki->driver->Disable)
                 return BadImplementation;
 
             (*ki->driver->Disable) (ki);
             pDev->on = FALSE;
-	}
+        }
 
         if (!ki->driver->Fini)
             return BadImplementation;
@@ -820,7 +828,7 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
 }
 
 void
-KdAddPointerDriver (KdPointerDriver *driver)
+KdAddPointerDriver(KdPointerDriver * driver)
 {
     KdPointerDriver **prev;
 
@@ -835,7 +843,7 @@ KdAddPointerDriver (KdPointerDriver *driver)
 }
 
 void
-KdRemovePointerDriver (KdPointerDriver *driver)
+KdRemovePointerDriver(KdPointerDriver * driver)
 {
     KdPointerDriver *tmp;
 
@@ -852,7 +860,7 @@ KdRemovePointerDriver (KdPointerDriver *driver)
 }
 
 void
-KdAddKeyboardDriver (KdKeyboardDriver *driver)
+KdAddKeyboardDriver(KdKeyboardDriver * driver)
 {
     KdKeyboardDriver **prev;
 
@@ -867,7 +875,7 @@ KdAddKeyboardDriver (KdKeyboardDriver *driver)
 }
 
 void
-KdRemoveKeyboardDriver (KdKeyboardDriver *driver)
+KdRemoveKeyboardDriver(KdKeyboardDriver * driver)
 {
     KdKeyboardDriver *tmp;
 
@@ -884,9 +892,10 @@ KdRemoveKeyboardDriver (KdKeyboardDriver *driver)
 }
 
 KdKeyboardInfo *
-KdNewKeyboard (void)
+KdNewKeyboard(void)
 {
     KdKeyboardInfo *ki = calloc(sizeof(KdKeyboardInfo), 1);
+
     if (!ki)
         return NULL;
 
@@ -907,7 +916,7 @@ KdNewKeyboard (void)
 }
 
 int
-KdAddConfigKeyboard (char *keyboard)
+KdAddConfigKeyboard(char *keyboard)
 {
     struct KdConfigDevice **prev, *new;
 
@@ -928,7 +937,7 @@ KdAddConfigKeyboard (char *keyboard)
 }
 
 int
-KdAddKeyboard (KdKeyboardInfo *ki)
+KdAddKeyboard(KdKeyboardInfo * ki)
 {
     KdKeyboardInfo **prev;
 
@@ -953,7 +962,7 @@ KdAddKeyboard (KdKeyboardInfo *ki)
 }
 
 void
-KdRemoveKeyboard (KdKeyboardInfo *ki)
+KdRemoveKeyboard(KdKeyboardInfo * ki)
 {
     KdKeyboardInfo **prev;
 
@@ -971,7 +980,7 @@ KdRemoveKeyboard (KdKeyboardInfo *ki)
 }
 
 int
-KdAddConfigPointer (char *pointer)
+KdAddConfigPointer(char *pointer)
 {
     struct KdConfigDevice **prev, *new;
 
@@ -992,7 +1001,7 @@ KdAddConfigPointer (char *pointer)
 }
 
 int
-KdAddPointer (KdPointerInfo *pi)
+KdAddPointer(KdPointerInfo * pi)
 {
     KdPointerInfo **prev;
 
@@ -1016,7 +1025,7 @@ KdAddPointer (KdPointerInfo *pi)
 }
 
 void
-KdRemovePointer (KdPointerInfo *pi)
+KdRemovePointer(KdPointerInfo * pi)
 {
     KdPointerInfo **prev;
 
@@ -1039,15 +1048,13 @@ KdRemovePointer (KdPointerInfo *pi)
  * evdev,,device=/dev/input/event1,xkbmodel=abnt2,xkblayout=br
  */
 static Bool
-KdGetOptions (InputOption **options, char *string)
+KdGetOptions(InputOption **options, char *string)
 {
-    InputOption     *newopt = NULL;
-    char            *key = NULL,
-                    *value = NULL;
-    int             tam_key = 0;
+    InputOption *newopt = NULL;
+    char *key = NULL, *value = NULL;
+    int tam_key = 0;
 
-    if (strchr(string, '='))
-    {
+    if (strchr(string, '=')) {
         tam_key = (strchr(string, '=') - string);
         key = strndup(string, tam_key);
         if (!key)
@@ -1057,8 +1064,7 @@ KdGetOptions (InputOption **options, char *string)
         if (!value)
             goto out;
     }
-    else
-    {
+    else {
         key = strdup(string);
         value = NULL;
     }
@@ -1067,7 +1073,7 @@ KdGetOptions (InputOption **options, char *string)
     if (newopt)
         *options = newopt;
 
-out:
+ out:
     free(key);
     free(value);
 
@@ -1075,12 +1081,11 @@ out:
 }
 
 static void
-KdParseKbdOptions (KdKeyboardInfo *ki)
+KdParseKbdOptions(KdKeyboardInfo * ki)
 {
     InputOption *option = NULL;
 
-    nt_list_for_each_entry(option, ki->options, list.next)
-    {
+    nt_list_for_each_entry(option, ki->options, list.next) {
         const char *key = input_option_get_key(option);
         const char *value = input_option_get_value(option);
 
@@ -1094,21 +1099,21 @@ KdParseKbdOptions (KdKeyboardInfo *ki)
             ki->xkbVariant = strdup(value);
         else if (strcasecmp(key, "XkbOptions") == 0)
             ki->xkbOptions = strdup(value);
-        else if (!strcasecmp (key, "device"))
+        else if (!strcasecmp(key, "device"))
             ki->path = strdup(value);
         else
-           ErrorF("Kbd option key (%s) of value (%s) not assigned!\n",
-                    key, value);
+            ErrorF("Kbd option key (%s) of value (%s) not assigned!\n",
+                   key, value);
     }
 }
 
 KdKeyboardInfo *
-KdParseKeyboard (char *arg)
+KdParseKeyboard(char *arg)
 {
-    char            save[1024];
-    char            delim;
-    InputOption     *options = NULL;
-    KdKeyboardInfo     *ki = NULL;
+    char save[1024];
+    char delim;
+    InputOption *options = NULL;
+    KdKeyboardInfo *ki = NULL;
 
     ki = KdNewKeyboard();
     if (!ki)
@@ -1120,53 +1125,46 @@ KdParseKeyboard (char *arg)
     ki->driverPrivate = NULL;
     ki->next = NULL;
 
-    if (!arg)
-    {
+    if (!arg) {
         ErrorF("keybd: no arg\n");
-        KdFreeKeyboard (ki);
+        KdFreeKeyboard(ki);
         return NULL;
     }
 
-    if (strlen (arg) >= sizeof (save))
-    {
+    if (strlen(arg) >= sizeof(save)) {
         ErrorF("keybd: arg too long\n");
-        KdFreeKeyboard (ki);
+        KdFreeKeyboard(ki);
         return NULL;
     }
 
-    arg = KdParseFindNext (arg, ",", save, &delim);
-    if (!save[0])
-    {
+    arg = KdParseFindNext(arg, ",", save, &delim);
+    if (!save[0]) {
         ErrorF("keybd: failed on save[0]\n");
-        KdFreeKeyboard (ki);
+        KdFreeKeyboard(ki);
         return NULL;
     }
 
-    if (strcmp (save, "auto") == 0)
+    if (strcmp(save, "auto") == 0)
         ki->driverPrivate = NULL;
     else
         ki->driverPrivate = strdup(save);
 
-    if (delim != ',')
-    {
+    if (delim != ',') {
         return ki;
     }
 
-    arg = KdParseFindNext (arg, ",", save, &delim);
+    arg = KdParseFindNext(arg, ",", save, &delim);
 
-    while (delim == ',')
-    {
-        arg = KdParseFindNext (arg, ",", save, &delim);
+    while (delim == ',') {
+        arg = KdParseFindNext(arg, ",", save, &delim);
 
-	if (!KdGetOptions(&options, save))
-	{
-	    KdFreeKeyboard(ki);
-	    return NULL;
+        if (!KdGetOptions(&options, save)) {
+            KdFreeKeyboard(ki);
+            return NULL;
         }
     }
 
-    if (options)
-    {
+    if (options) {
         ki->options = options;
         KdParseKbdOptions(ki);
     }
@@ -1175,41 +1173,40 @@ KdParseKeyboard (char *arg)
 }
 
 static void
-KdParsePointerOptions (KdPointerInfo *pi)
+KdParsePointerOptions(KdPointerInfo * pi)
 {
     InputOption *option = NULL;
 
-    nt_list_for_each_entry(option, pi->options, list.next)
-    {
+    nt_list_for_each_entry(option, pi->options, list.next) {
         const char *key = input_option_get_key(option);
         const char *value = input_option_get_value(option);
 
-        if (!strcmp (key, "emulatemiddle"))
+        if (!strcmp(key, "emulatemiddle"))
             pi->emulateMiddleButton = TRUE;
-        else if (!strcmp (key, "noemulatemiddle"))
+        else if (!strcmp(key, "noemulatemiddle"))
             pi->emulateMiddleButton = FALSE;
-        else if (!strcmp (key, "transformcoord"))
+        else if (!strcmp(key, "transformcoord"))
             pi->transformCoordinates = TRUE;
-        else if (!strcmp (key, "rawcoord"))
+        else if (!strcmp(key, "rawcoord"))
             pi->transformCoordinates = FALSE;
-        else if (!strcasecmp (key, "device"))
+        else if (!strcasecmp(key, "device"))
             pi->path = strdup(value);
-        else if (!strcasecmp (key, "protocol"))
+        else if (!strcasecmp(key, "protocol"))
             pi->protocol = strdup(value);
         else
             ErrorF("Pointer option key (%s) of value (%s) not assigned!\n",
-                    key, value);
+                   key, value);
     }
 }
 
 KdPointerInfo *
-KdParsePointer (char *arg)
+KdParsePointer(char *arg)
 {
-    char            save[1024];
-    char            delim;
-    KdPointerInfo   *pi = NULL;
-    InputOption     *options = NULL;
-    int             i = 0;
+    char save[1024];
+    char delim;
+    KdPointerInfo *pi = NULL;
+    InputOption *options = NULL;
+    int i = 0;
 
     pi = KdNewPointer();
     if (!pi)
@@ -1217,27 +1214,24 @@ KdParsePointer (char *arg)
     pi->emulateMiddleButton = kdEmulateMiddleButton;
     pi->transformCoordinates = !kdRawPointerCoordinates;
     pi->protocol = NULL;
-    pi->nButtons = 5; /* XXX should not be hardcoded */
+    pi->nButtons = 5;           /* XXX should not be hardcoded */
     pi->inputClass = KD_MOUSE;
 
-    if (!arg)
-    {
+    if (!arg) {
         ErrorF("mouse: no arg\n");
-        KdFreePointer (pi);
+        KdFreePointer(pi);
         return NULL;
     }
 
-    if (strlen (arg) >= sizeof (save))
-    {
+    if (strlen(arg) >= sizeof(save)) {
         ErrorF("mouse: arg too long\n");
-        KdFreePointer (pi);
+        KdFreePointer(pi);
         return NULL;
     }
-    arg = KdParseFindNext (arg, ",", save, &delim);
-    if (!save[0])
-    {
+    arg = KdParseFindNext(arg, ",", save, &delim);
+    if (!save[0]) {
         ErrorF("failed on save[0]\n");
-        KdFreePointer (pi);
+        KdFreePointer(pi);
         return NULL;
     }
 
@@ -1246,41 +1240,35 @@ KdParsePointer (char *arg)
     else
         pi->driverPrivate = strdup(save);
 
-    if (delim != ',')
-    {
+    if (delim != ',') {
         return pi;
     }
 
-    arg = KdParseFindNext (arg, ",", save, &delim);
+    arg = KdParseFindNext(arg, ",", save, &delim);
 
-    while (delim == ',')
-    {
-        arg = KdParseFindNext (arg, ",", save, &delim);
-        if (save[0] == '{')
-        {
+    while (delim == ',') {
+        arg = KdParseFindNext(arg, ",", save, &delim);
+        if (save[0] == '{') {
             char *s = save + 1;
-             i = 0;
-             while (*s && *s != '}')
-             {
+
+            i = 0;
+            while (*s && *s != '}') {
                 if ('1' <= *s && *s <= '0' + pi->nButtons)
                     pi->map[i] = *s - '0';
                 else
-                    UseMsg ();
+                    UseMsg();
                 s++;
-             }
+            }
         }
-        else
-        {
-            if (!KdGetOptions(&options, save))
-            {
+        else {
+            if (!KdGetOptions(&options, save)) {
                 KdFreePointer(pi);
                 return NULL;
             }
         }
     }
 
-    if (options)
-    {
+    if (options) {
         pi->options = options;
         KdParsePointerOptions(pi);
     }
@@ -1288,9 +1276,8 @@ KdParsePointer (char *arg)
     return pi;
 }
 
-
 void
-KdInitInput (void)
+KdInitInput(void)
 {
     KdPointerInfo *pi;
     KdKeyboardInfo *ki;
@@ -1317,7 +1304,7 @@ KdInitInput (void)
 }
 
 void
-KdCloseInput (void)
+KdCloseInput(void)
 {
     mieqFini();
 }
@@ -1480,195 +1467,203 @@ typedef enum _inputAction {
 #define MAX_ACTIONS 2
 
 typedef struct _inputTransition {
-    KdInputAction  actions[MAX_ACTIONS];
+    KdInputAction actions[MAX_ACTIONS];
     KdPointerState nextState;
 } KdInputTransition;
 
 static const
-KdInputTransition  kdInputMachine[num_input_states][num_input_class] = {
+KdInputTransition kdInputMachine[num_input_states][num_input_class] = {
     /* start */
     {
-	{ { hold, setto },	    button_1_pend },	/* v1 */
-	{ { deliver, noop },	    start },		/* ^1 */
-	{ { deliver, noop },	    button_2_down },	/* v2 */
-	{ { deliver, noop },	    start },		/* ^2 */
-	{ { hold, setto },	    button_3_pend },	/* v3 */
-	{ { deliver, noop },	    start },		/* ^3 */
-	{ { deliver, noop },	    start },		/* vo */
-	{ { deliver, noop },	    start },		/* ^o */
-	{ { deliver, noop },	    start },		/* <> */
-	{ { deliver, noop },	    start },		/* <-> */
-	{ { noop, noop },	    start },		/* k */
-	{ { noop, noop },	    start },		/* ... */
-    },
+     {{hold, setto}, button_1_pend},    /* v1 */
+     {{deliver, noop}, start},  /* ^1 */
+     {{deliver, noop}, button_2_down},  /* v2 */
+     {{deliver, noop}, start},  /* ^2 */
+     {{hold, setto}, button_3_pend},    /* v3 */
+     {{deliver, noop}, start},  /* ^3 */
+     {{deliver, noop}, start},  /* vo */
+     {{deliver, noop}, start},  /* ^o */
+     {{deliver, noop}, start},  /* <> */
+     {{deliver, noop}, start},  /* <-> */
+     {{noop, noop}, start},     /* k */
+     {{noop, noop}, start},     /* ... */
+     },
     /* button_1_pend */
     {
-	{ { noop, noop },	    button_1_pend },	/* v1 */
-	{ { release, deliver },	    start },		/* ^1 */
-	{ { release, deliver },	    button_1_down },	/* v2 */
-	{ { release, deliver },	    button_1_down },	/* ^2 */
-	{ { clearto, gen_down_2 },  synth_2_down_13 },	/* v3 */
-	{ { release, deliver },	    button_1_down },	/* ^3 */
-	{ { release, deliver },	    button_1_down },	/* vo */
-	{ { release, deliver },	    button_1_down },	/* ^o */
-	{ { deliver, noop },	    button_1_pend },	/* <> */
-	{ { release, deliver },	    button_1_down },	/* <-> */
-	{ { noop, noop },	    button_1_down },	/* k */
-	{ { release, noop },	    button_1_down },	/* ... */
-    },
+     {{noop, noop}, button_1_pend},     /* v1 */
+     {{release, deliver}, start},       /* ^1 */
+     {{release, deliver}, button_1_down},       /* v2 */
+     {{release, deliver}, button_1_down},       /* ^2 */
+     {{clearto, gen_down_2}, synth_2_down_13},  /* v3 */
+     {{release, deliver}, button_1_down},       /* ^3 */
+     {{release, deliver}, button_1_down},       /* vo */
+     {{release, deliver}, button_1_down},       /* ^o */
+     {{deliver, noop}, button_1_pend},  /* <> */
+     {{release, deliver}, button_1_down},       /* <-> */
+     {{noop, noop}, button_1_down},     /* k */
+     {{release, noop}, button_1_down},  /* ... */
+     },
     /* button_1_down */
     {
-	{ { noop, noop },	    button_1_down },	/* v1 */
-	{ { deliver, noop },	    start },		/* ^1 */
-	{ { deliver, noop },	    button_1_down },	/* v2 */
-	{ { deliver, noop },	    button_1_down },	/* ^2 */
-	{ { deliver, noop },	    button_1_down },	/* v3 */
-	{ { deliver, noop },	    button_1_down },	/* ^3 */
-	{ { deliver, noop },	    button_1_down },	/* vo */
-	{ { deliver, noop },	    button_1_down },	/* ^o */
-	{ { deliver, noop },	    button_1_down },	/* <> */
-	{ { deliver, noop },	    button_1_down },	/* <-> */
-	{ { noop, noop },	    button_1_down },	/* k */
-	{ { noop, noop },	    button_1_down },	/* ... */
-    },
+     {{noop, noop}, button_1_down},     /* v1 */
+     {{deliver, noop}, start},  /* ^1 */
+     {{deliver, noop}, button_1_down},  /* v2 */
+     {{deliver, noop}, button_1_down},  /* ^2 */
+     {{deliver, noop}, button_1_down},  /* v3 */
+     {{deliver, noop}, button_1_down},  /* ^3 */
+     {{deliver, noop}, button_1_down},  /* vo */
+     {{deliver, noop}, button_1_down},  /* ^o */
+     {{deliver, noop}, button_1_down},  /* <> */
+     {{deliver, noop}, button_1_down},  /* <-> */
+     {{noop, noop}, button_1_down},     /* k */
+     {{noop, noop}, button_1_down},     /* ... */
+     },
     /* button_2_down */
     {
-	{ { deliver, noop },	    button_2_down },	/* v1 */
-	{ { deliver, noop },	    button_2_down },	/* ^1 */
-	{ { noop, noop },	    button_2_down },	/* v2 */
-	{ { deliver, noop },	    start },		/* ^2 */
-	{ { deliver, noop },	    button_2_down },	/* v3 */
-	{ { deliver, noop },	    button_2_down },	/* ^3 */
-	{ { deliver, noop },	    button_2_down },	/* vo */
-	{ { deliver, noop },	    button_2_down },	/* ^o */
-	{ { deliver, noop },	    button_2_down },	/* <> */
-	{ { deliver, noop },	    button_2_down },	/* <-> */
-	{ { noop, noop },	    button_2_down },	/* k */
-	{ { noop, noop },	    button_2_down },	/* ... */
-    },
+     {{deliver, noop}, button_2_down},  /* v1 */
+     {{deliver, noop}, button_2_down},  /* ^1 */
+     {{noop, noop}, button_2_down},     /* v2 */
+     {{deliver, noop}, start},  /* ^2 */
+     {{deliver, noop}, button_2_down},  /* v3 */
+     {{deliver, noop}, button_2_down},  /* ^3 */
+     {{deliver, noop}, button_2_down},  /* vo */
+     {{deliver, noop}, button_2_down},  /* ^o */
+     {{deliver, noop}, button_2_down},  /* <> */
+     {{deliver, noop}, button_2_down},  /* <-> */
+     {{noop, noop}, button_2_down},     /* k */
+     {{noop, noop}, button_2_down},     /* ... */
+     },
     /* button_3_pend */
     {
-	{ { clearto, gen_down_2 },  synth_2_down_13 },	/* v1 */
-	{ { release, deliver },	    button_3_down },	/* ^1 */
-	{ { release, deliver },	    button_3_down },	/* v2 */
-	{ { release, deliver },	    button_3_down },	/* ^2 */
-	{ { release, deliver },	    button_3_down },	/* v3 */
-	{ { release, deliver },	    start },		/* ^3 */
-	{ { release, deliver },	    button_3_down },	/* vo */
-	{ { release, deliver },	    button_3_down },	/* ^o */
-	{ { deliver, noop },	    button_3_pend },	/* <> */
-	{ { release, deliver },	    button_3_down },	/* <-> */
-	{ { release, noop },	    button_3_down },	/* k */
-	{ { release, noop },	    button_3_down },	/* ... */
-    },
+     {{clearto, gen_down_2}, synth_2_down_13},  /* v1 */
+     {{release, deliver}, button_3_down},       /* ^1 */
+     {{release, deliver}, button_3_down},       /* v2 */
+     {{release, deliver}, button_3_down},       /* ^2 */
+     {{release, deliver}, button_3_down},       /* v3 */
+     {{release, deliver}, start},       /* ^3 */
+     {{release, deliver}, button_3_down},       /* vo */
+     {{release, deliver}, button_3_down},       /* ^o */
+     {{deliver, noop}, button_3_pend},  /* <> */
+     {{release, deliver}, button_3_down},       /* <-> */
+     {{release, noop}, button_3_down},  /* k */
+     {{release, noop}, button_3_down},  /* ... */
+     },
     /* button_3_down */
     {
-	{ { deliver, noop },	    button_3_down },	/* v1 */
-	{ { deliver, noop },	    button_3_down },	/* ^1 */
-	{ { deliver, noop },	    button_3_down },	/* v2 */
-	{ { deliver, noop },	    button_3_down },	/* ^2 */
-	{ { noop, noop },	    button_3_down },	/* v3 */
-	{ { deliver, noop },	    start },		/* ^3 */
-	{ { deliver, noop },	    button_3_down },	/* vo */
-	{ { deliver, noop },	    button_3_down },	/* ^o */
-	{ { deliver, noop },	    button_3_down },	/* <> */
-	{ { deliver, noop },	    button_3_down },	/* <-> */
-	{ { noop, noop },	    button_3_down },	/* k */
-	{ { noop, noop },	    button_3_down },	/* ... */
-    },
+     {{deliver, noop}, button_3_down},  /* v1 */
+     {{deliver, noop}, button_3_down},  /* ^1 */
+     {{deliver, noop}, button_3_down},  /* v2 */
+     {{deliver, noop}, button_3_down},  /* ^2 */
+     {{noop, noop}, button_3_down},     /* v3 */
+     {{deliver, noop}, start},  /* ^3 */
+     {{deliver, noop}, button_3_down},  /* vo */
+     {{deliver, noop}, button_3_down},  /* ^o */
+     {{deliver, noop}, button_3_down},  /* <> */
+     {{deliver, noop}, button_3_down},  /* <-> */
+     {{noop, noop}, button_3_down},     /* k */
+     {{noop, noop}, button_3_down},     /* ... */
+     },
     /* synthetic_2_down_13 */
     {
-	{ { noop, noop },	    synth_2_down_13 },	/* v1 */
-	{ { gen_up_2, noop },	    synth_2_down_3 },	/* ^1 */
-	{ { noop, noop },	    synth_2_down_13 },	/* v2 */
-	{ { noop, noop },	    synth_2_down_13 },	/* ^2 */
-	{ { noop, noop },	    synth_2_down_13 },	/* v3 */
-	{ { gen_up_2, noop },	    synth_2_down_1 },	/* ^3 */
-	{ { deliver, noop },	    synth_2_down_13 },	/* vo */
-	{ { deliver, noop },	    synth_2_down_13 },	/* ^o */
-	{ { deliver, noop },	    synth_2_down_13 },	/* <> */
-	{ { deliver, noop },	    synth_2_down_13 },	/* <-> */
-	{ { noop, noop },	    synth_2_down_13 },	/* k */
-	{ { noop, noop },	    synth_2_down_13 },	/* ... */
-    },
+     {{noop, noop}, synth_2_down_13},   /* v1 */
+     {{gen_up_2, noop}, synth_2_down_3},        /* ^1 */
+     {{noop, noop}, synth_2_down_13},   /* v2 */
+     {{noop, noop}, synth_2_down_13},   /* ^2 */
+     {{noop, noop}, synth_2_down_13},   /* v3 */
+     {{gen_up_2, noop}, synth_2_down_1},        /* ^3 */
+     {{deliver, noop}, synth_2_down_13},        /* vo */
+     {{deliver, noop}, synth_2_down_13},        /* ^o */
+     {{deliver, noop}, synth_2_down_13},        /* <> */
+     {{deliver, noop}, synth_2_down_13},        /* <-> */
+     {{noop, noop}, synth_2_down_13},   /* k */
+     {{noop, noop}, synth_2_down_13},   /* ... */
+     },
     /* synthetic_2_down_3 */
     {
-	{ { deliver, noop },	    synth_2_down_3 },	/* v1 */
-	{ { deliver, noop },	    synth_2_down_3 },	/* ^1 */
-	{ { deliver, noop },	    synth_2_down_3 },	/* v2 */
-	{ { deliver, noop },	    synth_2_down_3 },	/* ^2 */
-	{ { noop, noop },	    synth_2_down_3 },	/* v3 */
-	{ { noop, noop },	    start },		/* ^3 */
-	{ { deliver, noop },	    synth_2_down_3 },	/* vo */
-	{ { deliver, noop },	    synth_2_down_3 },	/* ^o */
-	{ { deliver, noop },	    synth_2_down_3 },	/* <> */
-	{ { deliver, noop },	    synth_2_down_3 },	/* <-> */
-	{ { noop, noop },	    synth_2_down_3 },	/* k */
-	{ { noop, noop },	    synth_2_down_3 },	/* ... */
-    },
+     {{deliver, noop}, synth_2_down_3}, /* v1 */
+     {{deliver, noop}, synth_2_down_3}, /* ^1 */
+     {{deliver, noop}, synth_2_down_3}, /* v2 */
+     {{deliver, noop}, synth_2_down_3}, /* ^2 */
+     {{noop, noop}, synth_2_down_3},    /* v3 */
+     {{noop, noop}, start},     /* ^3 */
+     {{deliver, noop}, synth_2_down_3}, /* vo */
+     {{deliver, noop}, synth_2_down_3}, /* ^o */
+     {{deliver, noop}, synth_2_down_3}, /* <> */
+     {{deliver, noop}, synth_2_down_3}, /* <-> */
+     {{noop, noop}, synth_2_down_3},    /* k */
+     {{noop, noop}, synth_2_down_3},    /* ... */
+     },
     /* synthetic_2_down_1 */
     {
-	{ { noop, noop },	    synth_2_down_1 },	/* v1 */
-	{ { noop, noop },	    start },		/* ^1 */
-	{ { deliver, noop },	    synth_2_down_1 },	/* v2 */
-	{ { deliver, noop },	    synth_2_down_1 },	/* ^2 */
-	{ { deliver, noop },	    synth_2_down_1 },	/* v3 */
-	{ { deliver, noop },	    synth_2_down_1 },	/* ^3 */
-	{ { deliver, noop },	    synth_2_down_1 },	/* vo */
-	{ { deliver, noop },	    synth_2_down_1 },	/* ^o */
-	{ { deliver, noop },	    synth_2_down_1 },	/* <> */
-	{ { deliver, noop },	    synth_2_down_1 },	/* <-> */
-	{ { noop, noop },	    synth_2_down_1 },	/* k */
-	{ { noop, noop },	    synth_2_down_1 },	/* ... */
-    },
+     {{noop, noop}, synth_2_down_1},    /* v1 */
+     {{noop, noop}, start},     /* ^1 */
+     {{deliver, noop}, synth_2_down_1}, /* v2 */
+     {{deliver, noop}, synth_2_down_1}, /* ^2 */
+     {{deliver, noop}, synth_2_down_1}, /* v3 */
+     {{deliver, noop}, synth_2_down_1}, /* ^3 */
+     {{deliver, noop}, synth_2_down_1}, /* vo */
+     {{deliver, noop}, synth_2_down_1}, /* ^o */
+     {{deliver, noop}, synth_2_down_1}, /* <> */
+     {{deliver, noop}, synth_2_down_1}, /* <-> */
+     {{noop, noop}, synth_2_down_1},    /* k */
+     {{noop, noop}, synth_2_down_1},    /* ... */
+     },
 };
 
 #define EMULATION_WINDOW    10
 #define EMULATION_TIMEOUT   100
 
 static int
-KdInsideEmulationWindow (KdPointerInfo *pi, int x, int y, int z)
+KdInsideEmulationWindow(KdPointerInfo * pi, int x, int y, int z)
 {
     pi->emulationDx = pi->heldEvent.x - x;
     pi->emulationDy = pi->heldEvent.y - y;
 
-    return (abs (pi->emulationDx) < EMULATION_WINDOW &&
-	    abs (pi->emulationDy) < EMULATION_WINDOW);
+    return (abs(pi->emulationDx) < EMULATION_WINDOW &&
+            abs(pi->emulationDy) < EMULATION_WINDOW);
 }
 
 static KdInputClass
-KdClassifyInput (KdPointerInfo *pi, int type, int x, int y, int z, int b)
+KdClassifyInput(KdPointerInfo * pi, int type, int x, int y, int z, int b)
 {
     switch (type) {
     case ButtonPress:
-	switch (b) {
-	case 1: return down_1;
-	case 2: return down_2;
-	case 3: return down_3;
-	default: return down_o;
-	}
-	break;
+        switch (b) {
+        case 1:
+            return down_1;
+        case 2:
+            return down_2;
+        case 3:
+            return down_3;
+        default:
+            return down_o;
+        }
+        break;
     case ButtonRelease:
-	switch (b) {
-	case 1: return up_1;
-	case 2: return up_2;
-	case 3: return up_3;
-	default: return up_o;
-	}
-	break;
+        switch (b) {
+        case 1:
+            return up_1;
+        case 2:
+            return up_2;
+        case 3:
+            return up_3;
+        default:
+            return up_o;
+        }
+        break;
     case MotionNotify:
-	if (pi->eventHeld && !KdInsideEmulationWindow(pi, x, y, z))
-	    return outside_box;
-	else
-	    return motion;
+        if (pi->eventHeld && !KdInsideEmulationWindow(pi, x, y, z))
+            return outside_box;
+        else
+            return motion;
     default:
-	return keyboard;
+        return keyboard;
     }
     return keyboard;
 }
 
 #ifdef DEBUG
-char	*kdStateNames[] = {
+char *kdStateNames[] = {
     "start",
     "button_1_pend",
     "button_1_down",
@@ -1681,7 +1676,7 @@ char	*kdStateNames[] = {
     "num_input_states"
 };
 
-char	*kdClassNames[] = {
+char *kdClassNames[] = {
     "down_1", "up_1",
     "down_2", "up_2",
     "down_3", "up_3",
@@ -1700,95 +1695,92 @@ char *kdActionNames[] = {
     "gen_down_2",
     "gen_up_2",
 };
-#endif /* DEBUG */
+#endif                          /* DEBUG */
 
 static void
-KdQueueEvent (DeviceIntPtr pDev, InternalEvent *ev)
+KdQueueEvent(DeviceIntPtr pDev, InternalEvent *ev)
 {
-    KdAssertSigioBlocked ("KdQueueEvent");
-    mieqEnqueue (pDev, ev);
+    KdAssertSigioBlocked("KdQueueEvent");
+    mieqEnqueue(pDev, ev);
 }
 
 /* We return true if we're stealing the event. */
 static Bool
-KdRunMouseMachine (KdPointerInfo *pi, KdInputClass c, int type, int x, int y,
-                   int z, int b, int absrel)
+KdRunMouseMachine(KdPointerInfo * pi, KdInputClass c, int type, int x, int y,
+                  int z, int b, int absrel)
 {
     const KdInputTransition *t;
-    int	a;
+    int a;
 
     c = KdClassifyInput(pi, type, x, y, z, b);
     t = &kdInputMachine[pi->mouseState][c];
-    for (a = 0; a < MAX_ACTIONS; a++)
-    {
-	switch (t->actions[a]) {
-	case noop:
-	    break;
-	case hold:
-	    pi->eventHeld = TRUE;
-	    pi->emulationDx = 0;
-	    pi->emulationDy = 0;
-	    pi->heldEvent.type = type;
+    for (a = 0; a < MAX_ACTIONS; a++) {
+        switch (t->actions[a]) {
+        case noop:
+            break;
+        case hold:
+            pi->eventHeld = TRUE;
+            pi->emulationDx = 0;
+            pi->emulationDy = 0;
+            pi->heldEvent.type = type;
             pi->heldEvent.x = x;
             pi->heldEvent.y = y;
             pi->heldEvent.z = z;
             pi->heldEvent.flags = b;
             pi->heldEvent.absrel = absrel;
             return TRUE;
-	    break;
-	case setto:
-	    pi->emulationTimeout = GetTimeInMillis () + EMULATION_TIMEOUT;
-	    pi->timeoutPending = TRUE;
-	    break;
-	case deliver:
-            _KdEnqueuePointerEvent (pi, pi->heldEvent.type, pi->heldEvent.x,
-                                    pi->heldEvent.y, pi->heldEvent.z,
-                                    pi->heldEvent.flags, pi->heldEvent.absrel,
-                                    TRUE);
-	    break;
-	case release:
-	    pi->eventHeld = FALSE;
-	    pi->timeoutPending = FALSE;
-            _KdEnqueuePointerEvent (pi, pi->heldEvent.type, pi->heldEvent.x,
-                                    pi->heldEvent.y, pi->heldEvent.z,
-                                    pi->heldEvent.flags, pi->heldEvent.absrel,
-                                    TRUE);
+            break;
+        case setto:
+            pi->emulationTimeout = GetTimeInMillis() + EMULATION_TIMEOUT;
+            pi->timeoutPending = TRUE;
+            break;
+        case deliver:
+            _KdEnqueuePointerEvent(pi, pi->heldEvent.type, pi->heldEvent.x,
+                                   pi->heldEvent.y, pi->heldEvent.z,
+                                   pi->heldEvent.flags, pi->heldEvent.absrel,
+                                   TRUE);
+            break;
+        case release:
+            pi->eventHeld = FALSE;
+            pi->timeoutPending = FALSE;
+            _KdEnqueuePointerEvent(pi, pi->heldEvent.type, pi->heldEvent.x,
+                                   pi->heldEvent.y, pi->heldEvent.z,
+                                   pi->heldEvent.flags, pi->heldEvent.absrel,
+                                   TRUE);
             return TRUE;
-	    break;
-	case clearto:
-	    pi->timeoutPending = FALSE;
-	    break;
-	case gen_down_2:
-            _KdEnqueuePointerEvent (pi, ButtonPress, x, y, z, 2, absrel,
-                                    TRUE);
-	    pi->eventHeld = FALSE;
+            break;
+        case clearto:
+            pi->timeoutPending = FALSE;
+            break;
+        case gen_down_2:
+            _KdEnqueuePointerEvent(pi, ButtonPress, x, y, z, 2, absrel, TRUE);
+            pi->eventHeld = FALSE;
             return TRUE;
-	    break;
-	case gen_up_2:
-            _KdEnqueuePointerEvent (pi, ButtonRelease, x, y, z, 2, absrel,
-                                    TRUE);
+            break;
+        case gen_up_2:
+            _KdEnqueuePointerEvent(pi, ButtonRelease, x, y, z, 2, absrel, TRUE);
             return TRUE;
-	    break;
-	}
+            break;
+        }
     }
     pi->mouseState = t->nextState;
     return FALSE;
 }
 
 static int
-KdHandlePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z, int b,
-                      int absrel)
+KdHandlePointerEvent(KdPointerInfo * pi, int type, int x, int y, int z, int b,
+                     int absrel)
 {
     if (pi->emulateMiddleButton)
-        return KdRunMouseMachine (pi, KdClassifyInput(pi, type, x, y, z, b),
-                                  type, x, y, z, b, absrel);
+        return KdRunMouseMachine(pi, KdClassifyInput(pi, type, x, y, z, b),
+                                 type, x, y, z, b, absrel);
     return FALSE;
 }
 
 static void
-KdReceiveTimeout (KdPointerInfo *pi)
+KdReceiveTimeout(KdPointerInfo * pi)
 {
-    KdRunMouseMachine (pi, timeout, 0, 0, 0, 0, 0, 0);
+    KdRunMouseMachine(pi, timeout, 0, 0, 0, 0, 0, 0);
 }
 
 /*
@@ -1805,17 +1797,16 @@ KdReceiveTimeout (KdPointerInfo *pi)
 extern int nClients;
 
 void
-KdReleaseAllKeys (void)
+KdReleaseAllKeys(void)
 {
 #if 0
-    int	key;
+    int key;
     KdKeyboardInfo *ki;
 
-    KdBlockSigio ();
+    KdBlockSigio();
 
     for (ki = kdKeyboards; ki; ki = ki->next) {
-        for (key = ki->keySyms.minKeyCode; key < ki->keySyms.maxKeyCode;
-             key++) {
+        for (key = ki->keySyms.minKeyCode; key < ki->keySyms.maxKeyCode; key++) {
             if (key_is_down(ki->dixdev, key, KEY_POSTED | KEY_PROCESSED)) {
                 KdHandleKeyboardEvent(ki, KeyRelease, key);
                 QueueGetKeyboardEvents(ki->dixdev, KeyRelease, key, NULL);
@@ -1823,56 +1814,55 @@ KdReleaseAllKeys (void)
         }
     }
 
-    KdUnblockSigio ();
+    KdUnblockSigio();
 #endif
 }
 
 static void
-KdCheckLock (void)
+KdCheckLock(void)
 {
-    KeyClassPtr	    keyc = NULL;
-    Bool	    isSet = FALSE, shouldBeSet = FALSE;
-    KdKeyboardInfo     *tmp = NULL;
+    KeyClassPtr keyc = NULL;
+    Bool isSet = FALSE, shouldBeSet = FALSE;
+    KdKeyboardInfo *tmp = NULL;
 
     for (tmp = kdKeyboards; tmp; tmp = tmp->next) {
         if (tmp->LockLed && tmp->dixdev && tmp->dixdev->key) {
             keyc = tmp->dixdev->key;
-            isSet = (tmp->leds & (1 << (tmp->LockLed-1))) != 0;
+            isSet = (tmp->leds & (1 << (tmp->LockLed - 1))) != 0;
             /* FIXME: Just use XKB indicators! */
-            shouldBeSet = !!(XkbStateFieldFromRec(&keyc->xkbInfo->state) & LockMask);
+            shouldBeSet =
+                ! !(XkbStateFieldFromRec(&keyc->xkbInfo->state) & LockMask);
             if (isSet != shouldBeSet)
-                KdSetLed (tmp, tmp->LockLed, shouldBeSet);
+                KdSetLed(tmp, tmp->LockLed, shouldBeSet);
         }
     }
 }
 
 void
-KdEnqueueKeyboardEvent(KdKeyboardInfo   *ki,
-                       unsigned char scan_code,
-		       unsigned char is_up)
+KdEnqueueKeyboardEvent(KdKeyboardInfo * ki,
+                       unsigned char scan_code, unsigned char is_up)
 {
     unsigned char key_code;
-    KeyClassPtr	keyc = NULL;
+    KeyClassPtr keyc = NULL;
     KeybdCtrl *ctrl = NULL;
     int type;
 
     if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed || !ki->dixdev->key)
-	return;
+        return;
 
     keyc = ki->dixdev->key;
     ctrl = &ki->dixdev->kbdfeed->ctrl;
 
-    if (scan_code >= ki->minScanCode && scan_code <= ki->maxScanCode)
-    {
-	key_code = scan_code + KD_MIN_KEYCODE - ki->minScanCode;
+    if (scan_code >= ki->minScanCode && scan_code <= ki->maxScanCode) {
+        key_code = scan_code + KD_MIN_KEYCODE - ki->minScanCode;
 
-	/*
-	 * Set up this event -- the type may be modified below
-	 */
-	if (is_up)
-	    type = KeyRelease;
-	else
-	    type = KeyPress;
+        /*
+         * Set up this event -- the type may be modified below
+         */
+        if (is_up)
+            type = KeyRelease;
+        else
+            type = KeyPress;
 
         QueueKeyboardEvents(ki->dixdev, type, key_code, NULL);
     }
@@ -1893,74 +1883,72 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo   *ki,
 
 /* FIXME do something a little more clever to deal with multiple axes here */
 void
-KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
+KdEnqueuePointerEvent(KdPointerInfo * pi, unsigned long flags, int rx, int ry,
                       int rz)
 {
-    CARD32        ms;
+    CARD32 ms;
     unsigned char buttons;
-    int           x, y, z;
-    int           (*matrix)[3] = kdPointerMatrix.matrix;
+    int x, y, z;
+    int (*matrix)[3] = kdPointerMatrix.matrix;
     unsigned long button;
-    int           n;
-    int           dixflags = 0;
+    int n;
+    int dixflags = 0;
 
     if (!pi)
-	return;
+        return;
 
     ms = GetTimeInMillis();
 
     /* we don't need to transform z, so we don't. */
     if (flags & KD_MOUSE_DELTA) {
-	if (pi->transformCoordinates) {
-	    x = matrix[0][0] * rx + matrix[0][1] * ry;
-	    y = matrix[1][0] * rx + matrix[1][1] * ry;
-	}
-	else {
-	    x = rx;
-	    y = ry;
-	}
+        if (pi->transformCoordinates) {
+            x = matrix[0][0] * rx + matrix[0][1] * ry;
+            y = matrix[1][0] * rx + matrix[1][1] * ry;
+        }
+        else {
+            x = rx;
+            y = ry;
+        }
     }
     else {
-	if (pi->transformCoordinates) {
-	    x = matrix[0][0] * rx + matrix[0][1] * ry + matrix[0][2];
-	    y = matrix[1][0] * rx + matrix[1][1] * ry + matrix[1][2];
-	}
-	else {
-	    x = rx;
-	    y = ry;
-	}
+        if (pi->transformCoordinates) {
+            x = matrix[0][0] * rx + matrix[0][1] * ry + matrix[0][2];
+            y = matrix[1][0] * rx + matrix[1][1] * ry + matrix[1][2];
+        }
+        else {
+            x = rx;
+            y = ry;
+        }
     }
     z = rz;
 
-    if (flags & KD_MOUSE_DELTA)
-    {
-        if (x || y || z)
-        {
+    if (flags & KD_MOUSE_DELTA) {
+        if (x || y || z) {
             dixflags = POINTER_RELATIVE | POINTER_ACCELERATE;
-            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);
+            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags,
+                                   FALSE);
         }
-    } else
-    {
+    }
+    else {
         dixflags = POINTER_ABSOLUTE;
         if (x != pi->dixdev->last.valuators[0] ||
             y != pi->dixdev->last.valuators[1])
-            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);
+            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags,
+                                   FALSE);
     }
 
     buttons = flags;
 
-    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;
-         button <<= 1, n++) {
+    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons; button <<= 1, n++) {
         if (((pi->buttonState & button) ^ (buttons & button)) &&
-           !(buttons & button)) {
+            !(buttons & button)) {
             _KdEnqueuePointerEvent(pi, ButtonRelease, x, y, z, n,
                                    dixflags, FALSE);
-	}
+        }
     }
-    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;
-         button <<= 1, n++) {
-	if (((pi->buttonState & button) ^ (buttons & button)) &&
-	    (buttons & button)) {
+    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons; button <<= 1, n++) {
+        if (((pi->buttonState & button) ^ (buttons & button)) &&
+            (buttons & button)) {
             _KdEnqueuePointerEvent(pi, ButtonPress, x, y, z, n,
                                    dixflags, FALSE);
         }
@@ -1970,8 +1958,8 @@ KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
 }
 
 void
-_KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,
-                        int b, int absrel, Bool force)
+_KdEnqueuePointerEvent(KdPointerInfo * pi, int type, int x, int y, int z,
+                       int b, int absrel, Bool force)
 {
     int valuators[3] = { x, y, z };
     ValuatorMask mask;
@@ -1986,73 +1974,60 @@ _KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,
 }
 
 void
-KdBlockHandler (int		screen,
-		pointer		blockData,
-		pointer		timeout,
-		pointer		readmask)
+KdBlockHandler(int screen, pointer blockData, pointer timeout, pointer readmask)
 {
-    KdPointerInfo		    *pi;
-    int myTimeout=0;
-
-    for (pi = kdPointers; pi; pi = pi->next)
-    {
-	if (pi->timeoutPending)
-	{
-	    int	ms;
+    KdPointerInfo *pi;
+    int myTimeout = 0;
 
-	    ms = pi->emulationTimeout - GetTimeInMillis ();
-	    if (ms < 1)
-		ms = 1;
-	    if(ms<myTimeout || myTimeout==0)
-		    myTimeout=ms;
-	}
+    for (pi = kdPointers; pi; pi = pi->next) {
+        if (pi->timeoutPending) {
+            int ms;
+
+            ms = pi->emulationTimeout - GetTimeInMillis();
+            if (ms < 1)
+                ms = 1;
+            if (ms < myTimeout || myTimeout == 0)
+                myTimeout = ms;
+        }
     }
     /* if we need to poll for events, do that */
-    if(kdOsFuncs->pollEvents)
-    {
-	    (*kdOsFuncs->pollEvents)();
-	    myTimeout=20;
+    if (kdOsFuncs->pollEvents) {
+        (*kdOsFuncs->pollEvents) ();
+        myTimeout = 20;
     }
-    if(myTimeout>0)
-    	AdjustWaitForDelay (timeout, myTimeout);
+    if (myTimeout > 0)
+        AdjustWaitForDelay(timeout, myTimeout);
 }
 
 void
-KdWakeupHandler (int		screen,
-		 pointer    	data,
-		 unsigned long	lresult,
-		 pointer	readmask)
+KdWakeupHandler(int screen,
+                pointer data, unsigned long lresult, pointer readmask)
 {
-    int		result = (int) lresult;
-    fd_set	*pReadmask = (fd_set *) readmask;
-    int		i;
-    KdPointerInfo	*pi;
+    int result = (int) lresult;
+    fd_set *pReadmask = (fd_set *) readmask;
+    int i;
+    KdPointerInfo *pi;
 
-    if (kdInputEnabled && result > 0)
-    {
-	for (i = 0; i < kdNumInputFds; i++)
-	    if (FD_ISSET (kdInputFds[i].fd, pReadmask))
-	    {
-		KdBlockSigio ();
-		(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
-		KdUnblockSigio ();
-	    }
-    }
-    for (pi = kdPointers; pi; pi = pi->next)
-    {
-	if (pi->timeoutPending)
-	{
-	    if ((long) (GetTimeInMillis () - pi->emulationTimeout) >= 0)
-	    {
-		pi->timeoutPending = FALSE;
-		KdBlockSigio ();
-		KdReceiveTimeout (pi);
-		KdUnblockSigio ();
-	    }
-	}
+    if (kdInputEnabled && result > 0) {
+        for (i = 0; i < kdNumInputFds; i++)
+            if (FD_ISSET(kdInputFds[i].fd, pReadmask)) {
+                KdBlockSigio();
+                (*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
+                KdUnblockSigio();
+            }
+    }
+    for (pi = kdPointers; pi; pi = pi->next) {
+        if (pi->timeoutPending) {
+            if ((long) (GetTimeInMillis() - pi->emulationTimeout) >= 0) {
+                pi->timeoutPending = FALSE;
+                KdBlockSigio();
+                KdReceiveTimeout(pi);
+                KdUnblockSigio();
+            }
+        }
     }
     if (kdSwitchPending)
-	KdProcessSwitch ();
+        KdProcessSwitch();
 }
 
 #define KdScreenOrigin(pScreen) (&(KdGetScreenPriv(pScreen)->screen->origin))
@@ -2060,84 +2035,75 @@ KdWakeupHandler (int		screen,
 static Bool
 KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
 {
-    ScreenPtr	pScreen  = *ppScreen;
-    ScreenPtr	pNewScreen;
-    int		n;
-    int		dx, dy;
-    int		best_x, best_y;
-    int		n_best_x, n_best_y;
-    CARD32	ms;
+    ScreenPtr pScreen = *ppScreen;
+    ScreenPtr pNewScreen;
+    int n;
+    int dx, dy;
+    int best_x, best_y;
+    int n_best_x, n_best_y;
+    CARD32 ms;
 
     if (kdDisableZaphod || screenInfo.numScreens <= 1)
-	return FALSE;
+        return FALSE;
 
     if (0 <= *x && *x < pScreen->width && 0 <= *y && *y < pScreen->height)
-	return FALSE;
+        return FALSE;
 
-    ms = GetTimeInMillis ();
+    ms = GetTimeInMillis();
     if (kdOffScreen && (int) (ms - kdOffScreenTime) < 1000)
-	return FALSE;
+        return FALSE;
     kdOffScreen = TRUE;
     kdOffScreenTime = ms;
     n_best_x = -1;
     best_x = 32767;
     n_best_y = -1;
     best_y = 32767;
-    for (n = 0; n < screenInfo.numScreens; n++)
-    {
-	pNewScreen = screenInfo.screens[n];
-	if (pNewScreen == pScreen)
-	    continue;
-	dx = KdScreenOrigin(pNewScreen)->x - KdScreenOrigin(pScreen)->x;
-	dy = KdScreenOrigin(pNewScreen)->y - KdScreenOrigin(pScreen)->y;
-	if (*x < 0)
-	{
-	    if (dx <= 0 && -dx < best_x)
-	    {
-		best_x = -dx;
-		n_best_x = n;
-	    }
-	}
-	else if (*x >= pScreen->width)
-	{
-	    if (dx >= 0 && dx < best_x)
-	    {
-		best_x = dx;
-		n_best_x = n;
-	    }
-	}
-	if (*y < 0)
-	{
-	    if (dy <= 0 && -dy < best_y)
-	    {
-		best_y = -dy;
-		n_best_y = n;
-	    }
-	}
-	else if (*y >= pScreen->height)
-	{
-	    if (dy >= 0 && dy < best_y)
-	    {
-		best_y = dy;
-		n_best_y = n;
-	    }
-	}
+    for (n = 0; n < screenInfo.numScreens; n++) {
+        pNewScreen = screenInfo.screens[n];
+        if (pNewScreen == pScreen)
+            continue;
+        dx = KdScreenOrigin(pNewScreen)->x - KdScreenOrigin(pScreen)->x;
+        dy = KdScreenOrigin(pNewScreen)->y - KdScreenOrigin(pScreen)->y;
+        if (*x < 0) {
+            if (dx <= 0 && -dx < best_x) {
+                best_x = -dx;
+                n_best_x = n;
+            }
+        }
+        else if (*x >= pScreen->width) {
+            if (dx >= 0 && dx < best_x) {
+                best_x = dx;
+                n_best_x = n;
+            }
+        }
+        if (*y < 0) {
+            if (dy <= 0 && -dy < best_y) {
+                best_y = -dy;
+                n_best_y = n;
+            }
+        }
+        else if (*y >= pScreen->height) {
+            if (dy >= 0 && dy < best_y) {
+                best_y = dy;
+                n_best_y = n;
+            }
+        }
     }
     if (best_y < best_x)
-	n_best_x = n_best_y;
+        n_best_x = n_best_y;
     if (n_best_x == -1)
-	return FALSE;
+        return FALSE;
     pNewScreen = screenInfo.screens[n_best_x];
 
     if (*x < 0)
-	*x += pNewScreen->width;
+        *x += pNewScreen->width;
     if (*y < 0)
-	*y += pNewScreen->height;
+        *y += pNewScreen->height;
 
     if (*x >= pScreen->width)
-	*x -= pScreen->width;
+        *x -= pScreen->width;
     if (*y >= pScreen->height)
-	*y -= pScreen->height;
+        *y -= pScreen->height;
 
     *ppScreen = pNewScreen;
     return TRUE;
@@ -2148,31 +2114,30 @@ KdCrossScreen(ScreenPtr pScreen, Bool entering)
 {
 }
 
-int KdCurScreen;	/* current event screen */
+int KdCurScreen;                /* current event screen */
 
 static void
-KdWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+KdWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 {
-    KdBlockSigio ();
+    KdBlockSigio();
     KdCurScreen = pScreen->myNum;
     miPointerWarpCursor(pDev, pScreen, x, y);
-    KdUnblockSigio ();
+    KdUnblockSigio();
 }
 
-miPointerScreenFuncRec kdPointerScreenFuncs =
-{
+miPointerScreenFuncRec kdPointerScreenFuncs = {
     KdCursorOffScreen,
     KdCrossScreen,
     KdWarpCursor
 };
 
 void
-ProcessInputEvents (void)
+ProcessInputEvents(void)
 {
     mieqProcessInputEvents();
     if (kdSwitchPending)
-	KdProcessSwitch ();
-    KdCheckLock ();
+        KdProcessSwitch();
+    KdCheckLock();
 }
 
 /* At the moment, absolute/relative is up to the client. */
@@ -2191,7 +2156,7 @@ SetDeviceValuators(register ClientPtr client, DeviceIntPtr pDev,
 
 int
 ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev,
-                        xDeviceCtl *control)
+                    xDeviceCtl * control)
 {
     switch (control->control) {
     case DEVICE_RESOLUTION:
@@ -2214,7 +2179,7 @@ ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev,
 }
 
 int
-NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
+NewInputDeviceRequest(InputOption *options, InputAttributes * attrs,
                       DeviceIntPtr *pdev)
 {
     InputOption *option = NULL;
@@ -2243,16 +2208,14 @@ NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
         }
 #ifdef CONFIG_HAL
         else if (strcmp(key, "_source") == 0 &&
-                 strcmp(value, "server/hal") == 0)
-        {
+                 strcmp(value, "server/hal") == 0) {
             ErrorF("Ignoring device from HAL.\n");
             return BadValue;
         }
 #endif
 #ifdef CONFIG_UDEV
         else if (strcmp(key, "_source") == 0 &&
-                 strcmp(value, "server/udev") == 0)
-        {
+                 strcmp(value, "server/udev") == 0) {
             ErrorF("Ignoring device from udev.\n");
             return BadValue;
         }
@@ -2317,7 +2280,8 @@ NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
 
     if (pi) {
         *pdev = pi->dixdev;
-    } else if(ki) {
+    }
+    else if (ki) {
         *pdev = ki->dixdev;
     }
 
diff --git a/xorg-server/hw/kdrive/src/kmode.c b/xorg-server/hw/kdrive/src/kmode.c
index 38b7bc881..ef1b6b4fa 100644
--- a/xorg-server/hw/kdrive/src/kmode.c
+++ b/xorg-server/hw/kdrive/src/kmode.c
@@ -26,223 +26,222 @@
 #endif
 #include "kdrive.h"
 
-const KdMonitorTiming  kdMonitorTimings[] = {
-    /*	H	V	Hz	KHz */
-		/*  FP	    BP	    BLANK   POLARITY */
+const KdMonitorTiming kdMonitorTimings[] = {
+    /*  H       V       Hz      KHz */
+    /*  FP      BP      BLANK   POLARITY */
 
     /* IPAQ modeline:
      *
      * Modeline "320x240"      5.7222 320 337 340 352   240 241 244 254"
      */
-    {   320,	240,	64,	16256,
-	            17,	    12,	    32,     KdSyncNegative,
-	            1,      11,     14,     KdSyncNegative,
-    },
+    {320, 240, 64, 16256,
+     17, 12, 32, KdSyncNegative,
+     1, 11, 14, KdSyncNegative,
+     },
 
     /* Other VESA modes */
-    {	640,	350,	85,	31500,			    /* VESA */
-		    32,	    96,	    192,    KdSyncPositive, /* 26.413 */
-		    32,	    60,	    95,	    KdSyncNegative, /* 59.354 */
-    },
-    {	640,	400,	60,	31500,			    /* VESA */
-		    32,	    96,	    192,    KdSyncNegative, /* 26.413 */
-		    1,	    41,	    45,	    KdSyncPositive, /* 59.354 */
-    },
-    {	720,	400,	85,	35500,			    /* VESA */
-		    36,	    108,    216,    KdSyncNegative, /* 37.927 */
-		    1,	    42,	    46,	    KdSyncPositive, /* 85.039 */
-    },
-
+    {640, 350, 85, 31500,       /* VESA */
+     32, 96, 192, KdSyncPositive,       /* 26.413 */
+     32, 60, 95, KdSyncNegative,        /* 59.354 */
+     },
+    {640, 400, 60, 31500,       /* VESA */
+     32, 96, 192, KdSyncNegative,       /* 26.413 */
+     1, 41, 45, KdSyncPositive, /* 59.354 */
+     },
+    {720, 400, 85, 35500,       /* VESA */
+     36, 108, 216, KdSyncNegative,      /* 37.927 */
+     1, 42, 46, KdSyncPositive, /* 85.039 */
+     },
 
     /* Modeline "720x576"     29.000 720  736  800  880   576  577  580  625 */
     {
-        720,    576,    52,     32954,                      /* PAL Video */
-        16,     80,  160, KdSyncPositive, /* 32.954 */
-        1,      45,   49, KdSyncPositive, /* 52.727 */
-    },
+     720, 576, 52, 32954,       /* PAL Video */
+     16, 80, 160, KdSyncPositive,       /* 32.954 */
+     1, 45, 49, KdSyncPositive, /* 52.727 */
+     },
 
     /* 640x480 modes */
-    {	640,	480,	85,	36000,			    /* VESA */
-		    56,	    80,	    192,    KdSyncNegative, /* 43.269 */
-		    1,	    25,	    29,	    KdSyncNegative, /* 85.008 */
-    },
-    {	640,	480,	75,	31500,			    /* VESA */
-		    16,	    120,    200,    KdSyncNegative, /* 37.500 */
-		    1,	    16,	    20,	    KdSyncNegative, /* 75.000 */
-    },
-    {	640,	480,	72,	31500,			    /* VESA */
-		    16,	    120,    176,    KdSyncNegative, /* 37.861 */
-		    1,	    20,	    24,	    KdSyncNegative, /* 72.809 */
-    },
-    {	640,	480,	60,	25175,			    /* VESA */
-		   16,	    48,	    160,    KdSyncNegative, /* 31.469 */
-		   10,	    33,	    45,	    KdSyncNegative, /* 59.940 */
-    },
+    {640, 480, 85, 36000,       /* VESA */
+     56, 80, 192, KdSyncNegative,       /* 43.269 */
+     1, 25, 29, KdSyncNegative, /* 85.008 */
+     },
+    {640, 480, 75, 31500,       /* VESA */
+     16, 120, 200, KdSyncNegative,      /* 37.500 */
+     1, 16, 20, KdSyncNegative, /* 75.000 */
+     },
+    {640, 480, 72, 31500,       /* VESA */
+     16, 120, 176, KdSyncNegative,      /* 37.861 */
+     1, 20, 24, KdSyncNegative, /* 72.809 */
+     },
+    {640, 480, 60, 25175,       /* VESA */
+     16, 48, 160, KdSyncNegative,       /* 31.469 */
+     10, 33, 45, KdSyncNegative,        /* 59.940 */
+     },
 
     /* 800x600 modes */
-    {	800,	600,	85,	56250,			    /* VESA */
-		    32,	    152,    248,    KdSyncPositive, /* 53.674 */
-		    1,	    27,	    31,	    KdSyncPositive, /* 85.061 */
-    },
-    {	800,	600,	75,	49500,			    /* VESA */
-		    16,	    160,    256,    KdSyncPositive, /* 46.875 */
-		    1,	    21,	    25,	    KdSyncPositive, /* 75.000 */
-    },
+    {800, 600, 85, 56250,       /* VESA */
+     32, 152, 248, KdSyncPositive,      /* 53.674 */
+     1, 27, 31, KdSyncPositive, /* 85.061 */
+     },
+    {800, 600, 75, 49500,       /* VESA */
+     16, 160, 256, KdSyncPositive,      /* 46.875 */
+     1, 21, 25, KdSyncPositive, /* 75.000 */
+     },
     /* DEFAULT */
 #define MONITOR_TIMING_DEFAULT	9
-    {	800,	600,	72,	50000,			    /* VESA */
-		    56,	    64,	    240,    KdSyncPositive, /* 48.077 */
-		    37,	    23,	    66,	    KdSyncPositive, /* 72.188 */
-    },
-    {	800,	600,	60,	40000,			    /* VESA */
-		    40,	    88,	    256,    KdSyncPositive, /* 37.879 */
-		    1,	    23,	    28,	    KdSyncPositive, /* 60.317 */
-    },
-    {	800,	600,	56,	36000,			    /* VESA */
-		    24,	    128,    224,    KdSyncPositive, /* 35.156 */
-		    1,	    22,	    25,	    KdSyncPositive, /* 56.250 */
-    },
+    {800, 600, 72, 50000,       /* VESA */
+     56, 64, 240, KdSyncPositive,       /* 48.077 */
+     37, 23, 66, KdSyncPositive,        /* 72.188 */
+     },
+    {800, 600, 60, 40000,       /* VESA */
+     40, 88, 256, KdSyncPositive,       /* 37.879 */
+     1, 23, 28, KdSyncPositive, /* 60.317 */
+     },
+    {800, 600, 56, 36000,       /* VESA */
+     24, 128, 224, KdSyncPositive,      /* 35.156 */
+     1, 22, 25, KdSyncPositive, /* 56.250 */
+     },
 
     /* 1024x768 modes */
-    {	1024,	768,	85,	94500,			    /* VESA */
-		    48,	    208,    352,    KdSyncPositive, /* 68.677 */
-		    1,	    36,	    40,	    KdSyncPositive, /* 84.997 */
-    },
-    {	1024,	768,	75,	78750,			    /* VESA */
-		    16,	    176,    288,    KdSyncPositive, /* 60.023 */
-		    1,	    28,	    32,	    KdSyncPositive, /* 75.029 */
-    },
-    {	1024,	768,	70,	75000,			    /* VESA */
-		    24,	    144,    304,    KdSyncNegative, /* 56.476 */
-		    3,	    29,	    38,	    KdSyncNegative, /* 70.069 */
-    },
-    {	1024,	768,	60,	65000,			    /* VESA */
-		    24,	    160,    320,    KdSyncNegative, /* 48.363 */
-		    3,	    29,	    38,	    KdSyncNegative, /* 60.004 */
-    },
+    {1024, 768, 85, 94500,      /* VESA */
+     48, 208, 352, KdSyncPositive,      /* 68.677 */
+     1, 36, 40, KdSyncPositive, /* 84.997 */
+     },
+    {1024, 768, 75, 78750,      /* VESA */
+     16, 176, 288, KdSyncPositive,      /* 60.023 */
+     1, 28, 32, KdSyncPositive, /* 75.029 */
+     },
+    {1024, 768, 70, 75000,      /* VESA */
+     24, 144, 304, KdSyncNegative,      /* 56.476 */
+     3, 29, 38, KdSyncNegative, /* 70.069 */
+     },
+    {1024, 768, 60, 65000,      /* VESA */
+     24, 160, 320, KdSyncNegative,      /* 48.363 */
+     3, 29, 38, KdSyncNegative, /* 60.004 */
+     },
 
     /* 1152x864 mode */
-    {	1152,	864,	75,	108000,			    /* VESA */
-		    64,	    256,    448,    KdSyncPositive, /* 67.500 */
-		    1,	    32,	    36,	    KdSyncPositive, /* 75.000 */
-    },
+    {1152, 864, 75, 108000,     /* VESA */
+     64, 256, 448, KdSyncPositive,      /* 67.500 */
+     1, 32, 36, KdSyncPositive, /* 75.000 */
+     },
 
     /* 1152x900 modes */
-    {	1152,	900,	85,	122500,			    /* ADDED */
-		    48,	    208,    384,    KdSyncPositive, /* 79.753 */
-		    1,	    32,	    38,	    KdSyncPositive, /* 85.024 */
-    },
-    {	1152,	900,	75,	108250,			    /* ADDED */
-		    32,	    208,    384,    KdSyncPositive, /* 70.475 */
-		    1,	    32,	    38,	    KdSyncPositive, /* 75.133 */
-    },
-    {	1152,	900,	70,	100250,			    /* ADDED */
-		    32,	    208,    384,    KdSyncPositive, /* 65.267 */
-		    2,	    32,	    38,	    KdSyncPositive, /* 69.581 */
-    },
-    {	1152,	900,	66,	95000,			    /* ADDED */
-		    32,	    208,    384,    KdSyncPositive, /* 61.849 */
-		    1,	    32,	    38,	    KdSyncPositive, /* 65.937 */
-    },
+    {1152, 900, 85, 122500,     /* ADDED */
+     48, 208, 384, KdSyncPositive,      /* 79.753 */
+     1, 32, 38, KdSyncPositive, /* 85.024 */
+     },
+    {1152, 900, 75, 108250,     /* ADDED */
+     32, 208, 384, KdSyncPositive,      /* 70.475 */
+     1, 32, 38, KdSyncPositive, /* 75.133 */
+     },
+    {1152, 900, 70, 100250,     /* ADDED */
+     32, 208, 384, KdSyncPositive,      /* 65.267 */
+     2, 32, 38, KdSyncPositive, /* 69.581 */
+     },
+    {1152, 900, 66, 95000,      /* ADDED */
+     32, 208, 384, KdSyncPositive,      /* 61.849 */
+     1, 32, 38, KdSyncPositive, /* 65.937 */
+     },
 
     /* 1280x854 modes */
-    {   1280,   854,   103,     12500,			    /* ADDED */
-	            56,     16,     128,    KdSyncPositive, /* 102.554 */
-	            1,     216,     12,     KdSyncPositive,
-    },
+    {1280, 854, 103, 12500,     /* ADDED */
+     56, 16, 128, KdSyncPositive,       /* 102.554 */
+     1, 216, 12, KdSyncPositive,
+     },
 
     /* 1280x960 modes */
-    {	1280,	960,	85,	148500,			    /* VESA */
-		    64,	    224,    448,    KdSyncPositive, /* 85.938 */
-		    1,	    47,	    51,	    KdSyncPositive, /* 85.002 */
-    },
-    {	1280,	960,	60,	108000,			    /* VESA */
-		    96,	    312,    520,    KdSyncPositive, /* 60.000 */
-		    1,	    36,	    40,	    KdSyncPositive, /* 60.000 */
-    },
+    {1280, 960, 85, 148500,     /* VESA */
+     64, 224, 448, KdSyncPositive,      /* 85.938 */
+     1, 47, 51, KdSyncPositive, /* 85.002 */
+     },
+    {1280, 960, 60, 108000,     /* VESA */
+     96, 312, 520, KdSyncPositive,      /* 60.000 */
+     1, 36, 40, KdSyncPositive, /* 60.000 */
+     },
 
     /* 1280x1024 modes */
-    {	1280,	1024,	85,	157500,			    /* VESA */
-		    64,	    224,    448,    KdSyncPositive, /* 91.146 */
-		    1,	    44,	    48,	    KdSyncPositive, /* 85.024 */
-    },
-    {	1280,	1024,	75,	135000,			    /* VESA */
-		    16,	    248,    408,    KdSyncPositive, /* 79.976 */
-		    1,	    38,	    42,	    KdSyncPositive, /* 75.025 */
-    },
-    {	1280,	1024,	60,	108000,			    /* VESA */
-		    48,	    248,    408,    KdSyncPositive, /* 63.981 */
-		    1,	    38,	    42,	    KdSyncPositive, /* 60.020 */
-    },
+    {1280, 1024, 85, 157500,    /* VESA */
+     64, 224, 448, KdSyncPositive,      /* 91.146 */
+     1, 44, 48, KdSyncPositive, /* 85.024 */
+     },
+    {1280, 1024, 75, 135000,    /* VESA */
+     16, 248, 408, KdSyncPositive,      /* 79.976 */
+     1, 38, 42, KdSyncPositive, /* 75.025 */
+     },
+    {1280, 1024, 60, 108000,    /* VESA */
+     48, 248, 408, KdSyncPositive,      /* 63.981 */
+     1, 38, 42, KdSyncPositive, /* 60.020 */
+     },
 
     /* 1600x1200 modes */
-    {	1600,	1200,	85,	229500,			    /* VESA */
-		    64,	    304,    560,    KdSyncPositive, /* 106.250 */
-		    1,	    46,	    50,	    KdSyncPositive, /* 85.000 */
-    },
-    {	1600,	1200,	75,	202500,			    /* VESA */
-		    64,	    304,    560,    KdSyncPositive, /* 93.750 */
-		    1,	    46,	    50,	    KdSyncPositive, /* 75.000 */
-    },
-    {	1600,	1200,	70,	189000,			    /* VESA */
-		    64,	    304,    560,    KdSyncPositive, /* 87.500 */
-		    1,	    46,	    50,	    KdSyncPositive, /* 70.000 */
-    },
-    {	1600,	1200,	65,	175500,			    /* VESA */
-		    64,	    304,    560,    KdSyncPositive, /* 81.250 */
-		    1,	    46,	    50,	    KdSyncPositive, /* 65.000 */
-    },
-    {	1600,	1200,	60,	162000,			    /* VESA */
-		    64,	    304,    560,    KdSyncPositive, /* 75.000 */
-		    1,	    46,	    50,	    KdSyncPositive, /* 60.000 */
-    },
+    {1600, 1200, 85, 229500,    /* VESA */
+     64, 304, 560, KdSyncPositive,      /* 106.250 */
+     1, 46, 50, KdSyncPositive, /* 85.000 */
+     },
+    {1600, 1200, 75, 202500,    /* VESA */
+     64, 304, 560, KdSyncPositive,      /* 93.750 */
+     1, 46, 50, KdSyncPositive, /* 75.000 */
+     },
+    {1600, 1200, 70, 189000,    /* VESA */
+     64, 304, 560, KdSyncPositive,      /* 87.500 */
+     1, 46, 50, KdSyncPositive, /* 70.000 */
+     },
+    {1600, 1200, 65, 175500,    /* VESA */
+     64, 304, 560, KdSyncPositive,      /* 81.250 */
+     1, 46, 50, KdSyncPositive, /* 65.000 */
+     },
+    {1600, 1200, 60, 162000,    /* VESA */
+     64, 304, 560, KdSyncPositive,      /* 75.000 */
+     1, 46, 50, KdSyncPositive, /* 60.000 */
+     },
 
     /* 1792x1344 modes */
-    {	1792,	1344,	85,	301500,			    /* ADDED */
-		    96,	    352,    672,    KdSyncNegative, /* 122.362 */
-		    1,	    92,	    96,	    KdSyncPositive, /* 84.974 */
-    },
-    {	1792,	1344,	75,	261000,			    /* VESA */
-		    96,	    352,    664,    KdSyncNegative, /* 106.270 */
-		    1,	    69,	    73,	    KdSyncPositive, /* 74.997 */
-    },
-    {	1792,	1344,	60,	204750,			    /* VESA */
-		    128,    328,    656,    KdSyncNegative, /* 83.640 */
-		    1,	    46,	    50,	    KdSyncPositive, /* 60.000 */
-    },
+    {1792, 1344, 85, 301500,    /* ADDED */
+     96, 352, 672, KdSyncNegative,      /* 122.362 */
+     1, 92, 96, KdSyncPositive, /* 84.974 */
+     },
+    {1792, 1344, 75, 261000,    /* VESA */
+     96, 352, 664, KdSyncNegative,      /* 106.270 */
+     1, 69, 73, KdSyncPositive, /* 74.997 */
+     },
+    {1792, 1344, 60, 204750,    /* VESA */
+     128, 328, 656, KdSyncNegative,     /* 83.640 */
+     1, 46, 50, KdSyncPositive, /* 60.000 */
+     },
 
 #if 0
-    { 1800, 1012, 75 },
-    { 1906, 1072, 68 },
+    {1800, 1012, 75},
+    {1906, 1072, 68},
 #endif
 
     /* 1856x1392 modes */
-    {	1856,	1392,	85,	330500,			    /* ADDED */
-		    160,    352,    736,    KdSyncNegative, /* 127.508 */
-		    1,	    104,    108,    KdSyncPositive, /* 85.001 */
-    },
-    {	1856,	1392,	75,	288000,			    /* VESA */
-		    128,    352,    704,    KdSyncNegative, /* 112.500 */
-		    1,	    104,    108,    KdSyncPositive, /* 75.000 */
-    },
-    {	1856,	1392,	60,	218250,			    /* VESA */
-		    96,	    352,    672,    KdSyncNegative, /* 86.333 */
-		    1,	    43,	    47,	    KdSyncPositive, /* 59.995 */
-    },
+    {1856, 1392, 85, 330500,    /* ADDED */
+     160, 352, 736, KdSyncNegative,     /* 127.508 */
+     1, 104, 108, KdSyncPositive,       /* 85.001 */
+     },
+    {1856, 1392, 75, 288000,    /* VESA */
+     128, 352, 704, KdSyncNegative,     /* 112.500 */
+     1, 104, 108, KdSyncPositive,       /* 75.000 */
+     },
+    {1856, 1392, 60, 218250,    /* VESA */
+     96, 352, 672, KdSyncNegative,      /* 86.333 */
+     1, 43, 47, KdSyncPositive, /* 59.995 */
+     },
 
     /* 1920x1440 modes */
-    {	1920,	1440,	85,	341750,			    /* ADDED */
-		    160,    352,    760,    KdSyncNegative, /* 127.512 */
-		    1,	    56,	    60,	    KdSyncPositive, /* 85.012 */
-    },
-    {	1920,	1440,	75,	297000,			    /* VESA */
-		    144,    352,    720,    KdSyncNegative, /* 112.500 */
-		    1,	    56,	    60,	    KdSyncPositive, /* 75.000 */
-    },
-    {	1920,	1440,	60,	234000,			    /* VESA */
-		    128,    244,    680,    KdSyncNegative, /* 90.000 */
-		    1,	    56,	    60,	    KdSyncPositive, /* 60.000 */
-    },
+    {1920, 1440, 85, 341750,    /* ADDED */
+     160, 352, 760, KdSyncNegative,     /* 127.512 */
+     1, 56, 60, KdSyncPositive, /* 85.012 */
+     },
+    {1920, 1440, 75, 297000,    /* VESA */
+     144, 352, 720, KdSyncNegative,     /* 112.500 */
+     1, 56, 60, KdSyncPositive, /* 75.000 */
+     },
+    {1920, 1440, 60, 234000,    /* VESA */
+     128, 244, 680, KdSyncNegative,     /* 90.000 */
+     1, 56, 60, KdSyncPositive, /* 60.000 */
+     },
 };
 
 #define NUM_MONITOR_TIMINGS (sizeof kdMonitorTimings/sizeof kdMonitorTimings[0])
@@ -250,148 +249,129 @@ const KdMonitorTiming  kdMonitorTimings[] = {
 const int kdNumMonitorTimings = NUM_MONITOR_TIMINGS;
 
 const KdMonitorTiming *
-KdFindMode (KdScreenInfo    *screen,
-	    Bool	    (*supported) (KdScreenInfo *,
-					  const KdMonitorTiming *))
+KdFindMode(KdScreenInfo * screen,
+           Bool (*supported) (KdScreenInfo *, const KdMonitorTiming *))
 {
-    int			    i;
-    const KdMonitorTiming   *t;
-
-    for (i = 0, t = kdMonitorTimings; i < NUM_MONITOR_TIMINGS; i++, t++)
-    {
-	if ((*supported) (screen, t) &&
-	    t->horizontal == screen->width &&
-	    t->vertical == screen->height &&
-	    (!screen->rate || t->rate <= screen->rate))
-	{
-	    return t;
-	}
+    int i;
+    const KdMonitorTiming *t;
+
+    for (i = 0, t = kdMonitorTimings; i < NUM_MONITOR_TIMINGS; i++, t++) {
+        if ((*supported) (screen, t) &&
+            t->horizontal == screen->width &&
+            t->vertical == screen->height &&
+            (!screen->rate || t->rate <= screen->rate)) {
+            return t;
+        }
     }
     ErrorF("Warning: mode not found, using default\n");
     return &kdMonitorTimings[MONITOR_TIMING_DEFAULT];
 }
 
 static const KdMonitorTiming *
-kdFindPrevSize (const KdMonitorTiming *old)
+kdFindPrevSize(const KdMonitorTiming * old)
 {
-    const KdMonitorTiming   *new, *prev;
+    const KdMonitorTiming *new, *prev;
 
     if (old == kdMonitorTimings)
-	return 0;
+        return 0;
     new = old;
     /*
      * Search for the previous size
      */
-    while (new != kdMonitorTimings)
-    {
-	new--;
-	if (new->horizontal != old->horizontal &&
-	    new->vertical != old->vertical)
-	{
-	    break;
-	}
+    while (new != kdMonitorTimings) {
+        new--;
+        if (new->horizontal != old->horizontal &&
+            new->vertical != old->vertical) {
+            break;
+        }
     }
     /*
      * Match the refresh rate (<=)
      */
-    while (new != kdMonitorTimings)
-    {
-	prev = new - 1;
-	if (prev->horizontal == new->horizontal &&
-	    prev->vertical == new->vertical &&
-	    prev->rate > old->rate)
-	{
-	    break;
-	}
-	new--;
+    while (new != kdMonitorTimings) {
+        prev = new - 1;
+        if (prev->horizontal == new->horizontal &&
+            prev->vertical == new->vertical && prev->rate > old->rate) {
+            break;
+        }
+        new--;
     }
     return new;
 }
 
 Bool
-KdTuneMode (KdScreenInfo    *screen,
-	    Bool	    (*usable) (KdScreenInfo *),
-	    Bool	    (*supported) (KdScreenInfo *,
-					  const KdMonitorTiming *))
+KdTuneMode(KdScreenInfo * screen,
+           Bool (*usable) (KdScreenInfo *),
+           Bool (*supported) (KdScreenInfo *, const KdMonitorTiming *))
 {
-    const KdMonitorTiming   *t;
-
-    while (!(*usable) (screen))
-    {
-	/*
-	 * Fix requested depth and geometry until it works
-	 */
-	if (screen->fb.depth > 16)
-	    screen->fb.depth = 16;
-	else if (screen->fb.depth > 8)
-	    screen->fb.depth = 8;
-	else
-	{
-	    t = kdFindPrevSize (KdFindMode (screen, supported));
-	    if (!t)
-		return FALSE;
-	    screen->width = t->horizontal;
-	    screen->height = t->vertical;
-	    screen->rate = t->rate;
-	}
+    const KdMonitorTiming *t;
+
+    while (!(*usable) (screen)) {
+        /*
+         * Fix requested depth and geometry until it works
+         */
+        if (screen->fb.depth > 16)
+            screen->fb.depth = 16;
+        else if (screen->fb.depth > 8)
+            screen->fb.depth = 8;
+        else {
+            t = kdFindPrevSize(KdFindMode(screen, supported));
+            if (!t)
+                return FALSE;
+            screen->width = t->horizontal;
+            screen->height = t->vertical;
+            screen->rate = t->rate;
+        }
     }
     return TRUE;
 }
 
 #ifdef RANDR
 Bool
-KdRandRGetInfo (ScreenPtr pScreen,
-		int randr,
-		Bool (*supported) (ScreenPtr pScreen,
-				   const KdMonitorTiming *))
+KdRandRGetInfo(ScreenPtr pScreen,
+               int randr,
+               Bool (*supported) (ScreenPtr pScreen, const KdMonitorTiming *))
 {
     KdScreenPriv(pScreen);
-    KdScreenInfo	    *screen = pScreenPriv->screen;
-    int			    i;
-    const KdMonitorTiming   *t;
-
-    for (i = 0, t = kdMonitorTimings; i < NUM_MONITOR_TIMINGS; i++, t++)
-    {
-	if ((*supported) (pScreen, t))
-	{
-	    RRScreenSizePtr pSize;
-
-	    pSize = RRRegisterSize (pScreen,
-				    t->horizontal,
-				    t->vertical,
-				    screen->width_mm,
-				    screen->height_mm);
-	    if (!pSize)
-		return FALSE;
-	    if (!RRRegisterRate (pScreen, pSize, t->rate))
-		return FALSE;
-	    if (t->horizontal == screen->width &&
-		t->vertical == screen->height &&
-		t->rate == screen->rate)
-		RRSetCurrentConfig (pScreen, randr, t->rate, pSize);
-	}
+    KdScreenInfo *screen = pScreenPriv->screen;
+    int i;
+    const KdMonitorTiming *t;
+
+    for (i = 0, t = kdMonitorTimings; i < NUM_MONITOR_TIMINGS; i++, t++) {
+        if ((*supported) (pScreen, t)) {
+            RRScreenSizePtr pSize;
+
+            pSize = RRRegisterSize(pScreen,
+                                   t->horizontal,
+                                   t->vertical,
+                                   screen->width_mm, screen->height_mm);
+            if (!pSize)
+                return FALSE;
+            if (!RRRegisterRate(pScreen, pSize, t->rate))
+                return FALSE;
+            if (t->horizontal == screen->width &&
+                t->vertical == screen->height && t->rate == screen->rate)
+                RRSetCurrentConfig(pScreen, randr, t->rate, pSize);
+        }
     }
 
     return TRUE;
 }
 
 const KdMonitorTiming *
-KdRandRGetTiming (ScreenPtr	    pScreen,
-		  Bool		    (*supported) (ScreenPtr pScreen,
-						  const KdMonitorTiming *),
-		  int		    rate,
-		  RRScreenSizePtr   pSize)
+KdRandRGetTiming(ScreenPtr pScreen,
+                 Bool (*supported) (ScreenPtr pScreen,
+                                    const KdMonitorTiming *),
+                 int rate, RRScreenSizePtr pSize)
 {
-    int			    i;
-    const KdMonitorTiming   *t;
-
-    for (i = 0, t = kdMonitorTimings; i < NUM_MONITOR_TIMINGS; i++, t++)
-    {
-	if (t->horizontal == pSize->width &&
-	    t->vertical == pSize->height &&
-	    t->rate == rate &&
-	    (*supported) (pScreen, t))
-	    return t;
+    int i;
+    const KdMonitorTiming *t;
+
+    for (i = 0, t = kdMonitorTimings; i < NUM_MONITOR_TIMINGS; i++, t++) {
+        if (t->horizontal == pSize->width &&
+            t->vertical == pSize->height &&
+            t->rate == rate && (*supported) (pScreen, t))
+            return t;
     }
     return 0;
 }
diff --git a/xorg-server/hw/kdrive/src/kshadow.c b/xorg-server/hw/kdrive/src/kshadow.c
index 63bb87bc6..828ea19a6 100644
--- a/xorg-server/hw/kdrive/src/kshadow.c
+++ b/xorg-server/hw/kdrive/src/kshadow.c
@@ -26,21 +26,21 @@
 #include "kdrive.h"
 
 Bool
-KdShadowFbAlloc (KdScreenInfo *screen, Bool rotate)
+KdShadowFbAlloc(KdScreenInfo * screen, Bool rotate)
 {
-    int	    paddedWidth;
-    void    *buf;
-    int	    width = rotate ? screen->height : screen->width;
-    int	    height = rotate ? screen->width : screen->height;
-    int	    bpp = screen->fb.bitsPerPixel;
+    int paddedWidth;
+    void *buf;
+    int width = rotate ? screen->height : screen->width;
+    int height = rotate ? screen->width : screen->height;
+    int bpp = screen->fb.bitsPerPixel;
 
     /* use fb computation for width */
-    paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits);
+    paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof(FbBits);
     buf = malloc(paddedWidth * height);
     if (!buf)
-	return FALSE;
+        return FALSE;
     if (screen->fb.shadow)
-	free(screen->fb.frameBuffer);
+        free(screen->fb.frameBuffer);
     screen->fb.shadow = TRUE;
     screen->fb.frameBuffer = buf;
     screen->fb.byteStride = paddedWidth;
@@ -49,33 +49,32 @@ KdShadowFbAlloc (KdScreenInfo *screen, Bool rotate)
 }
 
 void
-KdShadowFbFree (KdScreenInfo *screen)
+KdShadowFbFree(KdScreenInfo * screen)
 {
-    if (screen->fb.shadow)
-    {
-	free(screen->fb.frameBuffer);
-	screen->fb.frameBuffer = 0;
-	screen->fb.shadow = FALSE;
+    if (screen->fb.shadow) {
+        free(screen->fb.frameBuffer);
+        screen->fb.frameBuffer = 0;
+        screen->fb.shadow = FALSE;
     }
 }
 
 Bool
-KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindowProc window)
+KdShadowSet(ScreenPtr pScreen, int randr, ShadowUpdateProc update,
+            ShadowWindowProc window)
 {
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
 
-    shadowRemove (pScreen, pScreen->GetScreenPixmap(pScreen));
-    if(screen->fb.shadow)
-    {
-	return shadowAdd (pScreen, pScreen->GetScreenPixmap(pScreen),
-			  update, window, randr, 0);
+    shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
+    if (screen->fb.shadow) {
+        return shadowAdd(pScreen, pScreen->GetScreenPixmap(pScreen),
+                         update, window, randr, 0);
     }
     return TRUE;
 }
 
 void
-KdShadowUnset (ScreenPtr pScreen)
+KdShadowUnset(ScreenPtr pScreen)
 {
     shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
 }
diff --git a/xorg-server/hw/kdrive/src/kxv.c b/xorg-server/hw/kdrive/src/kxv.c
index e76a2c419..7097aee5c 100644
--- a/xorg-server/hw/kdrive/src/kxv.c
+++ b/xorg-server/hw/kdrive/src/kxv.c
@@ -1,1906 +1,1891 @@
-/*

-

-   XFree86 Xv DDX written by Mark Vojkovich (markv@valinux.com)

-   Adapted for KDrive by Pontus Lidman <pontus.lidman@nokia.com>

-

-   Copyright (C) 2000, 2001 - Nokia Home Communications

-   Copyright (C) 1998, 1999 - The XFree86 Project 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, and/or sell copies of the Software, and to permit persons

-to whom the Software is furnished to do so, provided that the above

-copyright notice(s) and this permission notice appear in all copies of

-the Software and that both the above copyright notice(s) and this

-permission notice appear in supporting documentation.

-

-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

-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.

-

-Except as contained in this notice, the name of a copyright holder

-shall not be used in advertising or otherwise to promote the sale, use

-or other dealings in this Software without prior written authorization

-of the copyright holder.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <kdrive-config.h>

-#endif

-#include "kdrive.h"

-

-#include "scrnintstr.h"

-#include "regionstr.h"

-#include "windowstr.h"

-#include "pixmapstr.h"

-#include "mivalidate.h"

-#include "validate.h"

-#include "resource.h"

-#include "gcstruct.h"

-#include "dixstruct.h"

-

-#include <X11/extensions/Xv.h>

-#include <X11/extensions/Xvproto.h>

-

-#include "kxv.h"

-#include "fourcc.h"

-

-

-/* XvScreenRec fields */

-

-static Bool KdXVCloseScreen(int, ScreenPtr);

-static int KdXVQueryAdaptors(ScreenPtr, XvAdaptorPtr *, int *);

-

-/* XvAdaptorRec fields */

-

-static int KdXVAllocatePort(unsigned long, XvPortPtr, XvPortPtr*);

-static int KdXVFreePort(XvPortPtr);

-static int KdXVPutVideo(ClientPtr, DrawablePtr,XvPortPtr, GCPtr,

-   				INT16, INT16, CARD16, CARD16,

-				INT16, INT16, CARD16, CARD16);

-static int KdXVPutStill(ClientPtr, DrawablePtr,XvPortPtr, GCPtr,

-   				INT16, INT16, CARD16, CARD16,

-				INT16, INT16, CARD16, CARD16);

-static int KdXVGetVideo(ClientPtr, DrawablePtr,XvPortPtr, GCPtr,

-   				INT16, INT16, CARD16, CARD16,

-				INT16, INT16, CARD16, CARD16);

-static int KdXVGetStill(ClientPtr, DrawablePtr,XvPortPtr, GCPtr,

-   				INT16, INT16, CARD16, CARD16,

-				INT16, INT16, CARD16, CARD16);

-static int KdXVStopVideo(ClientPtr, XvPortPtr, DrawablePtr);

-static int KdXVSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);

-static int KdXVGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32 *);

-static int KdXVQueryBestSize(ClientPtr, XvPortPtr, CARD8,

-   				CARD16, CARD16,CARD16, CARD16,

-				unsigned int*, unsigned int*);

-static int KdXVPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,

-   				INT16, INT16, CARD16, CARD16,

-				INT16, INT16, CARD16, CARD16,

-				XvImagePtr, unsigned char*, Bool,

-				CARD16, CARD16);

-static int KdXVQueryImageAttributes(ClientPtr, XvPortPtr, XvImagePtr,

-				CARD16*, CARD16*, int*, int*);

-

-

-/* ScreenRec fields */

-

-static Bool KdXVCreateWindow(WindowPtr pWin);

-static Bool KdXVDestroyWindow(WindowPtr pWin);

-static void KdXVWindowExposures(WindowPtr pWin, RegionPtr r1, RegionPtr r2);

-static void KdXVClipNotify(WindowPtr pWin, int dx, int dy);

-

-/* misc */

-static Bool KdXVInitAdaptors(ScreenPtr, KdVideoAdaptorPtr*, int);

-

-static DevPrivateKeyRec KdXVWindowKeyRec;

-#define KdXVWindowKey (&KdXVWindowKeyRec)

-static DevPrivateKey KdXvScreenKey;

-static unsigned long KdXVGeneration = 0;

-static unsigned long PortResource = 0;

-

-DevPrivateKey (*XvGetScreenKeyProc)(void) = XvGetScreenKey;

-unsigned long (*XvGetRTPortProc)(void) = XvGetRTPort;

-int (*XvScreenInitProc)(ScreenPtr) = XvScreenInit;

-

-#define GET_XV_SCREEN(pScreen) ((XvScreenPtr) \

-    dixLookupPrivate(&(pScreen)->devPrivates, KdXvScreenKey))

-

-#define GET_KDXV_SCREEN(pScreen) \

-  	((KdXVScreenPtr)(GET_XV_SCREEN(pScreen)->devPriv.ptr))

-

-#define GET_KDXV_WINDOW(pWin) ((KdXVWindowPtr) \

-    dixLookupPrivate(&(pWin)->devPrivates, KdXVWindowKey))

-

-static KdXVInitGenericAdaptorPtr *GenDrivers = NULL;

-static int NumGenDrivers = 0;

-

-int

-KdXVRegisterGenericAdaptorDriver(

-    KdXVInitGenericAdaptorPtr InitFunc

-){

-  KdXVInitGenericAdaptorPtr *newdrivers;

-

-/*   fprintf(stderr,"KdXVRegisterGenericAdaptorDriver\n"); */

-

-  newdrivers = realloc(GenDrivers, sizeof(KdXVInitGenericAdaptorPtr) *

-			(1 + NumGenDrivers));

-  if (!newdrivers)

-    return 0;

-  GenDrivers = newdrivers;

-

-  GenDrivers[NumGenDrivers++] = InitFunc;

-

-  return 1;

-}

-

-int

-KdXVListGenericAdaptors(

-    KdScreenInfo *          screen,

-    KdVideoAdaptorPtr **adaptors

-){

-    int i,j,n,num;

-    KdVideoAdaptorPtr *DrivAdap,*new;

-

-    num = 0;

-    *adaptors = NULL;

-    for (i = 0; i < NumGenDrivers; i++) {

-	n = GenDrivers[i](screen,&DrivAdap);

-	if (0 == n)

-	    continue;

-	new = realloc(*adaptors, sizeof(KdVideoAdaptorPtr) * (num+n));

-	if (NULL == new)

-	    continue;

-	*adaptors = new;

-	for (j = 0; j < n; j++, num++)

-	    (*adaptors)[num] = DrivAdap[j];

-    }

-    return num;

-}

-

-KdVideoAdaptorPtr

-KdXVAllocateVideoAdaptorRec(KdScreenInfo * screen)

-{

-    return calloc(1, sizeof(KdVideoAdaptorRec));

-}

-

-void

-KdXVFreeVideoAdaptorRec(KdVideoAdaptorPtr ptr)

-{

-    free(ptr);

-}

-

-

-Bool

-KdXVScreenInit(

-   ScreenPtr pScreen,

-   KdVideoAdaptorPtr *adaptors,

-   int num

-){

-  KdXVScreenPtr ScreenPriv;

-  XvScreenPtr pxvs;

-

-/*   fprintf(stderr,"KdXVScreenInit initializing %d adaptors\n",num); */

-

-  if (KdXVGeneration != serverGeneration)

-      KdXVGeneration = serverGeneration;

-

-  if(!XvGetScreenKeyProc || !XvGetRTPortProc || !XvScreenInitProc)

-	return FALSE;

-

-  if (!dixRegisterPrivateKey(&KdXVWindowKeyRec, PRIVATE_WINDOW, 0))

-      return FALSE;

-

-  if(Success != (*XvScreenInitProc)(pScreen)) return FALSE;

-

-  KdXvScreenKey = (*XvGetScreenKeyProc)();

-  PortResource = (*XvGetRTPortProc)();

-

-  pxvs = GET_XV_SCREEN(pScreen);

-

-

-  /* Anyone initializing the Xv layer must provide these two.

-     The Xv di layer calls them without even checking if they exist! */

-

-  pxvs->ddCloseScreen = KdXVCloseScreen;

-  pxvs->ddQueryAdaptors = KdXVQueryAdaptors;

-

-  /* The Xv di layer provides us with a private hook so that we don't

-     have to allocate our own screen private.  They also provide

-     a CloseScreen hook so that we don't have to wrap it.  I'm not

-     sure that I appreciate that.  */

-

-  ScreenPriv = malloc(sizeof(KdXVScreenRec));

-  pxvs->devPriv.ptr = (pointer)ScreenPriv;

-

-  if(!ScreenPriv) return FALSE;

-

-

-  ScreenPriv->CreateWindow = pScreen->CreateWindow;

-  ScreenPriv->DestroyWindow = pScreen->DestroyWindow;

-  ScreenPriv->WindowExposures = pScreen->WindowExposures;

-  ScreenPriv->ClipNotify = pScreen->ClipNotify;

-

-/*   fprintf(stderr,"XV: Wrapping screen funcs\n"); */

-

-  pScreen->CreateWindow = KdXVCreateWindow;

-  pScreen->DestroyWindow = KdXVDestroyWindow;

-  pScreen->WindowExposures = KdXVWindowExposures;

-  pScreen->ClipNotify = KdXVClipNotify;

-

-  if(!KdXVInitAdaptors(pScreen, adaptors, num))

-	return FALSE;

-

-  return TRUE;

-}

-

-static void

-KdXVFreeAdaptor(XvAdaptorPtr pAdaptor)

-{

-   int i;

-

-   free(pAdaptor->name);

-

-   if(pAdaptor->pEncodings) {

-      XvEncodingPtr pEncode = pAdaptor->pEncodings;

-

-      for(i = 0; i < pAdaptor->nEncodings; i++, pEncode++) {

-          free(pEncode->name);

-      }

-      free(pAdaptor->pEncodings);

-   }

-

-   free(pAdaptor->pFormats);

-

-   if(pAdaptor->pPorts) {

-      XvPortPtr pPort = pAdaptor->pPorts;

-      XvPortRecPrivatePtr pPriv;

-

-      for(i = 0; i < pAdaptor->nPorts; i++, pPort++) {

-          pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;

-	  if(pPriv) {

-	     if(pPriv->clientClip)

-		RegionDestroy(pPriv->clientClip);

-             if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

-		RegionDestroy(pPriv->pCompositeClip);

-	     free(pPriv);

-	  }

-      }

-      free(pAdaptor->pPorts);

-   }

-

-   if(pAdaptor->nAttributes) {

-      XvAttributePtr pAttribute = pAdaptor->pAttributes;

-

-      for(i = 0; i < pAdaptor->nAttributes; i++, pAttribute++) {

-          free(pAttribute->name);

-      }

-

-      free(pAdaptor->pAttributes);

-   }

-

-   free(pAdaptor->pImages);

-

-   free(pAdaptor->devPriv.ptr);

-}

-

-static Bool

-KdXVInitAdaptors(

-   ScreenPtr pScreen,

-   KdVideoAdaptorPtr *infoPtr,

-   int number

-) {

-    KdScreenPriv(pScreen);

-    KdScreenInfo * screen = pScreenPriv->screen;

-

-  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);

-  KdVideoAdaptorPtr adaptorPtr;

-  XvAdaptorPtr pAdaptor, pa;

-  XvAdaptorRecPrivatePtr adaptorPriv;

-  int na, numAdaptor;

-  XvPortRecPrivatePtr portPriv;

-  XvPortPtr pPort, pp;

-  int numPort;

-  KdAttributePtr attributePtr;

-  XvAttributePtr pAttribute, pat;

-  KdVideoFormatPtr formatPtr;

-  XvFormatPtr pFormat, pf;

-  int numFormat, totFormat;

-  KdVideoEncodingPtr encodingPtr;

-  XvEncodingPtr pEncode, pe;

-  KdImagePtr imagePtr;

-  XvImagePtr pImage, pi;

-  int numVisuals;

-  VisualPtr pVisual;

-  int i;

-

-  pxvs->nAdaptors = 0;

-  pxvs->pAdaptors = NULL;

-

-  if(!(pAdaptor = calloc(number, sizeof(XvAdaptorRec))))

-      return FALSE;

-

-  for(pa = pAdaptor, na = 0, numAdaptor = 0; na < number; na++, adaptorPtr++) {

-      adaptorPtr = infoPtr[na];

-

-      if(!adaptorPtr->StopVideo || !adaptorPtr->SetPortAttribute ||

-	 !adaptorPtr->GetPortAttribute || !adaptorPtr->QueryBestSize)

-	   continue;

-

-      /* client libs expect at least one encoding */

-      if(!adaptorPtr->nEncodings || !adaptorPtr->pEncodings)

-	   continue;

-

-      pa->type = adaptorPtr->type;

-

-      if(!adaptorPtr->PutVideo && !adaptorPtr->GetVideo)

-	 pa->type &= ~XvVideoMask;

-

-      if(!adaptorPtr->PutStill && !adaptorPtr->GetStill)

-	 pa->type &= ~XvStillMask;

-

-      if(!adaptorPtr->PutImage || !adaptorPtr->QueryImageAttributes)

-	 pa->type &= ~XvImageMask;

-

-      if(!adaptorPtr->PutVideo && !adaptorPtr->PutImage &&

-							  !adaptorPtr->PutStill)

-	 pa->type &= ~XvInputMask;

-

-      if(!adaptorPtr->GetVideo && !adaptorPtr->GetStill)

-	 pa->type &= ~XvOutputMask;

-

-      if(!(adaptorPtr->type & (XvPixmapMask | XvWindowMask)))

-	  continue;

-      if(!(adaptorPtr->type & (XvImageMask | XvVideoMask | XvStillMask)))

-	  continue;

-

-      pa->pScreen = pScreen;

-      pa->ddAllocatePort = KdXVAllocatePort;

-      pa->ddFreePort = KdXVFreePort;

-      pa->ddPutVideo = KdXVPutVideo;

-      pa->ddPutStill = KdXVPutStill;

-      pa->ddGetVideo = KdXVGetVideo;

-      pa->ddGetStill = KdXVGetStill;

-      pa->ddStopVideo = KdXVStopVideo;

-      pa->ddPutImage = KdXVPutImage;

-      pa->ddSetPortAttribute = KdXVSetPortAttribute;

-      pa->ddGetPortAttribute = KdXVGetPortAttribute;

-      pa->ddQueryBestSize = KdXVQueryBestSize;

-      pa->ddQueryImageAttributes = KdXVQueryImageAttributes;

-      pa->name = strdup(adaptorPtr->name);

-

-      if(adaptorPtr->nEncodings &&

-	(pEncode = calloc(adaptorPtr->nEncodings, sizeof(XvEncodingRec)))) {

-

-	for(pe = pEncode, encodingPtr = adaptorPtr->pEncodings, i = 0;

-	    i < adaptorPtr->nEncodings; pe++, i++, encodingPtr++)

-        {

-	    pe->id = encodingPtr->id;

-	    pe->pScreen = pScreen;

-	    pe->name = strdup(encodingPtr->name);

-	    pe->width = encodingPtr->width;

-	    pe->height = encodingPtr->height;

-	    pe->rate.numerator = encodingPtr->rate.numerator;

-	    pe->rate.denominator = encodingPtr->rate.denominator;

-	}

-	pa->nEncodings = adaptorPtr->nEncodings;

-	pa->pEncodings = pEncode;

-      }

-

-      if(adaptorPtr->nImages &&

-         (pImage = calloc(adaptorPtr->nImages, sizeof(XvImageRec)))) {

-

-          for(i = 0, pi = pImage, imagePtr = adaptorPtr->pImages;

-	      i < adaptorPtr->nImages; i++, pi++, imagePtr++)

-  	  {

-	     pi->id = imagePtr->id;

-	     pi->type = imagePtr->type;

-	     pi->byte_order = imagePtr->byte_order;

-	     memcpy(pi->guid, imagePtr->guid, 16);

-	     pi->bits_per_pixel = imagePtr->bits_per_pixel;

-	     pi->format = imagePtr->format;

-	     pi->num_planes = imagePtr->num_planes;

-	     pi->depth = imagePtr->depth;

-	     pi->red_mask = imagePtr->red_mask;

-	     pi->green_mask = imagePtr->green_mask;

-	     pi->blue_mask = imagePtr->blue_mask;

-	     pi->y_sample_bits = imagePtr->y_sample_bits;

-	     pi->u_sample_bits = imagePtr->u_sample_bits;

-	     pi->v_sample_bits = imagePtr->v_sample_bits;

-	     pi->horz_y_period = imagePtr->horz_y_period;

-	     pi->horz_u_period = imagePtr->horz_u_period;

-	     pi->horz_v_period = imagePtr->horz_v_period;

-	     pi->vert_y_period = imagePtr->vert_y_period;

-	     pi->vert_u_period = imagePtr->vert_u_period;

-	     pi->vert_v_period = imagePtr->vert_v_period;

-	     memcpy(pi->component_order, imagePtr->component_order, 32);

-	     pi->scanline_order = imagePtr->scanline_order;

-          }

-	  pa->nImages = adaptorPtr->nImages;

-	  pa->pImages = pImage;

-      }

-

-      if(adaptorPtr->nAttributes &&

-	(pAttribute = calloc(adaptorPtr->nAttributes, sizeof(XvAttributeRec))))

-      {

-	for(pat = pAttribute, attributePtr = adaptorPtr->pAttributes, i = 0;

-	    i < adaptorPtr->nAttributes; pat++, i++, attributePtr++)

-        {

-	    pat->flags = attributePtr->flags;

-	    pat->min_value = attributePtr->min_value;

-	    pat->max_value = attributePtr->max_value;

-	    pat->name = strdup(attributePtr->name);

-	}

-	pa->nAttributes = adaptorPtr->nAttributes;

-	pa->pAttributes = pAttribute;

-      }

-

-

-      totFormat = adaptorPtr->nFormats;

-

-      if(!(pFormat = calloc(totFormat, sizeof(XvFormatRec)))) {

-          KdXVFreeAdaptor(pa);

-          continue;

-      }

-      for(pf = pFormat, i = 0, numFormat = 0, formatPtr = adaptorPtr->pFormats;

-	  i < adaptorPtr->nFormats; i++, formatPtr++)

-      {

-	  numVisuals = pScreen->numVisuals;

-          pVisual = pScreen->visuals;

-

-          while(numVisuals--) {

-              if((pVisual->class == formatPtr->class) &&

-                 (pVisual->nplanes == formatPtr->depth)) {

-

-		   if(numFormat >= totFormat) {

-			void *moreSpace;

-			totFormat *= 2;

-			moreSpace = realloc(pFormat,

-					     totFormat * sizeof(XvFormatRec));

-			if(!moreSpace) break;

-			pFormat = moreSpace;

-			pf = pFormat + numFormat;

-		   }

-

-                   pf->visual = pVisual->vid;

-		   pf->depth = formatPtr->depth;

-

-		   pf++;

-		   numFormat++;

-              }

-              pVisual++;

-          }

-      }

-      pa->nFormats = numFormat;

-      pa->pFormats = pFormat;

-      if(!numFormat) {

-          KdXVFreeAdaptor(pa);

-          continue;

-      }

-

-      if(!(adaptorPriv = calloc(1, sizeof(XvAdaptorRecPrivate)))) {

-          KdXVFreeAdaptor(pa);

-          continue;

-      }

-

-      adaptorPriv->flags = adaptorPtr->flags;

-      adaptorPriv->PutVideo = adaptorPtr->PutVideo;

-      adaptorPriv->PutStill = adaptorPtr->PutStill;

-      adaptorPriv->GetVideo = adaptorPtr->GetVideo;

-      adaptorPriv->GetStill = adaptorPtr->GetStill;

-      adaptorPriv->StopVideo = adaptorPtr->StopVideo;

-      adaptorPriv->SetPortAttribute = adaptorPtr->SetPortAttribute;

-      adaptorPriv->GetPortAttribute = adaptorPtr->GetPortAttribute;

-      adaptorPriv->QueryBestSize = adaptorPtr->QueryBestSize;

-      adaptorPriv->QueryImageAttributes = adaptorPtr->QueryImageAttributes;

-      adaptorPriv->PutImage = adaptorPtr->PutImage;

-      adaptorPriv->ReputImage = adaptorPtr->ReputImage;

-

-      pa->devPriv.ptr = (pointer)adaptorPriv;

-

-      if(!(pPort = calloc(adaptorPtr->nPorts, sizeof(XvPortRec)))) {

-          KdXVFreeAdaptor(pa);

-          continue;

-      }

-      for(pp = pPort, i = 0, numPort = 0;

-	  i < adaptorPtr->nPorts; i++) {

-

-          if(!(pp->id = FakeClientID(0)))

-		continue;

-

-	  if(!(portPriv = calloc(1, sizeof(XvPortRecPrivate))))

-		continue;

-

-	  if(!AddResource(pp->id, PortResource, pp)) {

-		free(portPriv);

-		continue;

-	  }

-

-          pp->pAdaptor = pa;

-          pp->pNotify = (XvPortNotifyPtr)NULL;

-          pp->pDraw = (DrawablePtr)NULL;

-          pp->client = (ClientPtr)NULL;

-          pp->grab.client = (ClientPtr)NULL;

-          pp->time = currentTime;

-          pp->devPriv.ptr = portPriv;

-

-	  portPriv->screen = screen;

-	  portPriv->AdaptorRec = adaptorPriv;

-          portPriv->DevPriv.ptr = adaptorPtr->pPortPrivates[i].ptr;

-

-          pp++;

-          numPort++;

-      }

-      pa->nPorts = numPort;

-      pa->pPorts = pPort;

-      if(!numPort) {

-          KdXVFreeAdaptor(pa);

-          continue;

-      }

-

-      pa->base_id = pPort->id;

-

-      pa++;

-      numAdaptor++;

-  }

-

-  if(numAdaptor) {

-      pxvs->nAdaptors = numAdaptor;

-      pxvs->pAdaptors = pAdaptor;

-  } else {

-     free(pAdaptor);

-     return FALSE;

-  }

-

-  return TRUE;

-}

-

-/* Video should be clipped to the intersection of the window cliplist

-   and the client cliplist specified in the GC for which the video was

-   initialized.  When we need to reclip a window, the GC that started

-   the video may not even be around anymore.  That's why we save the

-   client clip from the GC when the video is initialized.  We then

-   use KdXVUpdateCompositeClip to calculate the new composite clip

-   when we need it.  This is different from what DEC did.  They saved

-   the GC and used it's clip list when they needed to reclip the window,

-   even if the client clip was different from the one the video was

-   initialized with.  If the original GC was destroyed, they had to stop

-   the video.  I like the new method better (MArk).

-

-   This function only works for windows.  Will need to rewrite when

-   (if) we support pixmap rendering.

-*/

-

-static void

-KdXVUpdateCompositeClip(XvPortRecPrivatePtr portPriv)

-{

-   RegionPtr	pregWin, pCompositeClip;

-   WindowPtr	pWin;

-   Bool 	freeCompClip = FALSE;

-

-   if(portPriv->pCompositeClip)

-	return;

-

-   pWin = (WindowPtr)portPriv->pDraw;

-

-   /* get window clip list */

-   if(portPriv->subWindowMode == IncludeInferiors) {

-	pregWin = NotClippedByChildren(pWin);

-	freeCompClip = TRUE;

-   } else

-	pregWin = &pWin->clipList;

-

-   if(!portPriv->clientClip) {

-	portPriv->pCompositeClip = pregWin;

-	portPriv->FreeCompositeClip = freeCompClip;

-	return;

-   }

-

-   pCompositeClip = RegionCreate(NullBox, 1);

-   RegionCopy(pCompositeClip, portPriv->clientClip);

-   RegionTranslate(pCompositeClip,

-			portPriv->pDraw->x + portPriv->clipOrg.x,

-			portPriv->pDraw->y + portPriv->clipOrg.y);

-   RegionIntersect(pCompositeClip, pregWin, pCompositeClip);

-

-   portPriv->pCompositeClip = pCompositeClip;

-   portPriv->FreeCompositeClip = TRUE;

-

-   if(freeCompClip) {

-	RegionDestroy(pregWin);

-   }

-}

-

-/* Save the current clientClip and update the CompositeClip whenever

-   we have a fresh GC */

-

-static void

-KdXVCopyClip(

-   XvPortRecPrivatePtr portPriv,

-   GCPtr pGC

-){

-    /* copy the new clip if it exists */

-    if((pGC->clientClipType == CT_REGION) && pGC->clientClip) {

-	if(!portPriv->clientClip)

-	    portPriv->clientClip = RegionCreate(NullBox, 1);

-	/* Note: this is in window coordinates */

-	RegionCopy(portPriv->clientClip, pGC->clientClip);

-    } else if(portPriv->clientClip) { /* free the old clientClip */

-	RegionDestroy(portPriv->clientClip);

-	portPriv->clientClip = NULL;

-    }

-

-    /* get rid of the old clip list */

-    if(portPriv->pCompositeClip && portPriv->FreeCompositeClip) {

-	RegionDestroy(portPriv->pCompositeClip);

-    }

-

-    portPriv->clipOrg = pGC->clipOrg;

-    portPriv->pCompositeClip = pGC->pCompositeClip;

-    portPriv->FreeCompositeClip = FALSE;

-    portPriv->subWindowMode = pGC->subWindowMode;

-}

-

-static int

-KdXVRegetVideo(XvPortRecPrivatePtr portPriv)

-{

-  RegionRec WinRegion;

-  RegionRec ClipRegion;

-  BoxRec WinBox;

-  int ret = Success;

-  Bool clippedAway = FALSE;

-

-  KdXVUpdateCompositeClip(portPriv);

-

-  /* translate the video region to the screen */

-  WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;

-  WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;

-  WinBox.x2 = WinBox.x1 + portPriv->drw_w;

-  WinBox.y2 = WinBox.y1 + portPriv->drw_h;

-

-  /* clip to the window composite clip */

-  RegionInit(&WinRegion, &WinBox, 1);

-  RegionInit(&ClipRegion, NullBox, 1);

-  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);

-

-  /* that's all if it's totally obscured */

-  if(!RegionNotEmpty(&ClipRegion)) {

-	clippedAway = TRUE;

-	goto CLIP_VIDEO_BAILOUT;

-  }

-

-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

-  }

-

-  ret = (*portPriv->AdaptorRec->GetVideo)(portPriv->screen, portPriv->pDraw,

-			portPriv->vid_x, portPriv->vid_y,

-			WinBox.x1, WinBox.y1,

-			portPriv->vid_w, portPriv->vid_h,

-			portPriv->drw_w, portPriv->drw_h,

-			&ClipRegion, portPriv->DevPriv.ptr);

-

-  if(ret == Success)

-	portPriv->isOn = XV_ON;

-

-CLIP_VIDEO_BAILOUT:

-

-  if((clippedAway || (ret != Success)) && portPriv->isOn == XV_ON) {

-	(*portPriv->AdaptorRec->StopVideo)(

-		portPriv->screen, portPriv->DevPriv.ptr, FALSE);

-	portPriv->isOn = XV_PENDING;

-  }

-

-  /* This clip was copied and only good for one shot */

-  if(!portPriv->FreeCompositeClip)

-     portPriv->pCompositeClip = NULL;

-

-  RegionUninit(&WinRegion);

-  RegionUninit(&ClipRegion);

-

-  return ret;

-}

-

-

-static int

-KdXVReputVideo(XvPortRecPrivatePtr portPriv)

-{

-  RegionRec WinRegion;

-  RegionRec ClipRegion;

-  BoxRec WinBox;

-  ScreenPtr pScreen = portPriv->pDraw->pScreen;

-  KdScreenPriv(pScreen);

-  KdScreenInfo *screen=pScreenPriv->screen;

-  int ret = Success;

-  Bool clippedAway = FALSE;

-

-  KdXVUpdateCompositeClip(portPriv);

-

-  /* translate the video region to the screen */

-  WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;

-  WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;

-  WinBox.x2 = WinBox.x1 + portPriv->drw_w;

-  WinBox.y2 = WinBox.y1 + portPriv->drw_h;

-

-  /* clip to the window composite clip */

-  RegionInit(&WinRegion, &WinBox, 1);

-  RegionInit(&ClipRegion, NullBox, 1);

-  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);

-

-  /* clip and translate to the viewport */

-  if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

-     RegionRec VPReg;

-     BoxRec VPBox;

-

-     VPBox.x1 = 0;

-     VPBox.y1 = 0;

-     VPBox.x2 = screen->width;

-     VPBox.y2 = screen->height;

-

-     RegionInit(&VPReg, &VPBox, 1);

-     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

-     RegionUninit(&VPReg);

-  }

-

-  /* that's all if it's totally obscured */

-  if(!RegionNotEmpty(&ClipRegion)) {

-	clippedAway = TRUE;

-	goto CLIP_VIDEO_BAILOUT;

-  }

-

-  /* bailout if we have to clip but the hardware doesn't support it */

-  if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = RegionRects(&ClipRegion);

-     if(  (RegionNumRects(&ClipRegion) != 1) ||

-	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

-	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

-     {

-	    clippedAway = TRUE;

-	    goto CLIP_VIDEO_BAILOUT;

-     }

-  }

-

-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

-  }

-

-  ret = (*portPriv->AdaptorRec->PutVideo)(portPriv->screen, portPriv->pDraw,

-			portPriv->vid_x, portPriv->vid_y,

-			WinBox.x1, WinBox.y1,

-			portPriv->vid_w, portPriv->vid_h,

-			portPriv->drw_w, portPriv->drw_h,

-			&ClipRegion, portPriv->DevPriv.ptr);

-

-  if(ret == Success) portPriv->isOn = XV_ON;

-

-CLIP_VIDEO_BAILOUT:

-

-  if((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {

-	(*portPriv->AdaptorRec->StopVideo)(

-		portPriv->screen, portPriv->DevPriv.ptr, FALSE);

-	portPriv->isOn = XV_PENDING;

-  }

-

-  /* This clip was copied and only good for one shot */

-  if(!portPriv->FreeCompositeClip)

-     portPriv->pCompositeClip = NULL;

-

-  RegionUninit(&WinRegion);

-  RegionUninit(&ClipRegion);

-

-  return ret;

-}

-

-static int

-KdXVReputImage(XvPortRecPrivatePtr portPriv)

-{

-  RegionRec WinRegion;

-  RegionRec ClipRegion;

-  BoxRec WinBox;

-  ScreenPtr pScreen = portPriv->pDraw->pScreen;

-  KdScreenPriv(pScreen);

-  KdScreenInfo *screen=pScreenPriv->screen;

-  int ret = Success;

-  Bool clippedAway = FALSE;

-

-  KdXVUpdateCompositeClip(portPriv);

-

-  /* translate the video region to the screen */

-  WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;

-  WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;

-  WinBox.x2 = WinBox.x1 + portPriv->drw_w;

-  WinBox.y2 = WinBox.y1 + portPriv->drw_h;

-

-  /* clip to the window composite clip */

-  RegionInit(&WinRegion, &WinBox, 1);

-  RegionInit(&ClipRegion, NullBox, 1);

-  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);

-

-  /* clip and translate to the viewport */

-  if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

-     RegionRec VPReg;

-     BoxRec VPBox;

-

-     VPBox.x1 = 0;

-     VPBox.y1 = 0;

-     VPBox.x2 = screen->width;

-     VPBox.y2 = screen->height;

-

-     RegionInit(&VPReg, &VPBox, 1);

-     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

-     RegionUninit(&VPReg);

-  }

-

-  /* that's all if it's totally obscured */

-  if(!RegionNotEmpty(&ClipRegion)) {

-	clippedAway = TRUE;

-	goto CLIP_VIDEO_BAILOUT;

-  }

-

-  /* bailout if we have to clip but the hardware doesn't support it */

-  if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = RegionRects(&ClipRegion);

-     if(  (RegionNumRects(&ClipRegion) != 1) ||

-	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

-	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

-     {

-	    clippedAway = TRUE;

-	    goto CLIP_VIDEO_BAILOUT;

-     }

-  }

-

-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

-  }

-

-  ret = (*portPriv->AdaptorRec->ReputImage)(portPriv->screen, portPriv->pDraw,

-			WinBox.x1, WinBox.y1,

-			&ClipRegion, portPriv->DevPriv.ptr);

-

-  portPriv->isOn = (ret == Success) ? XV_ON : XV_OFF;

-

-CLIP_VIDEO_BAILOUT:

-

-  if((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {

-	(*portPriv->AdaptorRec->StopVideo)(

-		portPriv->screen, portPriv->DevPriv.ptr, FALSE);

-	portPriv->isOn = XV_PENDING;

-  }

-

-  /* This clip was copied and only good for one shot */

-  if(!portPriv->FreeCompositeClip)

-     portPriv->pCompositeClip = NULL;

-

-  RegionUninit(&WinRegion);

-  RegionUninit(&ClipRegion);

-

-  return ret;

-}

-

-

-static int

-KdXVReputAllVideo(WindowPtr pWin, pointer data)

-{

-    KdXVWindowPtr WinPriv;

-

-    if (pWin->drawable.type != DRAWABLE_WINDOW)

-	return WT_DONTWALKCHILDREN;

-

-    WinPriv = GET_KDXV_WINDOW(pWin);

-

-    while(WinPriv) {

-	if(WinPriv->PortRec->type == XvInputMask)

-	    KdXVReputVideo(WinPriv->PortRec);

-	else

-	    KdXVRegetVideo(WinPriv->PortRec);

-	WinPriv = WinPriv->next;

-    }

-

-    return WT_WALKCHILDREN;

-}

-

-static int

-KdXVEnlistPortInWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)

-{

-   KdXVWindowPtr winPriv, PrivRoot;

-

-   winPriv = PrivRoot = GET_KDXV_WINDOW(pWin);

-

-  /* Enlist our port in the window private */

-   while(winPriv) {

-	if(winPriv->PortRec == portPriv) /* we're already listed */

-	    break;

-	winPriv = winPriv->next;

-   }

-

-   if(!winPriv) {

-	winPriv = malloc(sizeof(KdXVWindowRec));

-	if(!winPriv) return BadAlloc;

-	winPriv->PortRec = portPriv;

-	winPriv->next = PrivRoot;

-	dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, winPriv);

-   }

-   return Success;

-}

-

-

-static void

-KdXVRemovePortFromWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)

-{

-     KdXVWindowPtr winPriv, prevPriv = NULL;

-

-     winPriv = GET_KDXV_WINDOW(pWin);

-

-     while(winPriv) {

-	if(winPriv->PortRec == portPriv) {

-	    if(prevPriv)

-		prevPriv->next = winPriv->next;

-	    else

-		dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, winPriv->next);

-	    free(winPriv);

-	    break;

-	}

-	prevPriv = winPriv;

-	winPriv = winPriv->next;

-     }

-     portPriv->pDraw = NULL;

-}

-

-/****  ScreenRec fields ****/

-

-

-static Bool

-KdXVCreateWindow(WindowPtr pWin)

-{

-  ScreenPtr pScreen = pWin->drawable.pScreen;

-  KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen);

-  int ret;

-

-  pScreen->CreateWindow = ScreenPriv->CreateWindow;

-  ret = (*pScreen->CreateWindow)(pWin);

-  pScreen->CreateWindow = KdXVCreateWindow;

-

-  if (ret)

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

-

-  return ret;

-}

-

-

-static Bool

-KdXVDestroyWindow(WindowPtr pWin)

-{

-  ScreenPtr pScreen = pWin->drawable.pScreen;

-  KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen);

-  KdXVWindowPtr tmp, WinPriv = GET_KDXV_WINDOW(pWin);

-  int ret;

-

-  while(WinPriv) {

-     XvPortRecPrivatePtr pPriv = WinPriv->PortRec;

-

-     if(pPriv->isOn > XV_OFF) {

-	(*pPriv->AdaptorRec->StopVideo)(

-			pPriv->screen, pPriv->DevPriv.ptr, TRUE);

-	pPriv->isOn = XV_OFF;

-     }

-

-     pPriv->pDraw = NULL;

-     tmp = WinPriv;

-     WinPriv = WinPriv->next;

-     free(tmp);

-  }

-

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

-

-  pScreen->DestroyWindow = ScreenPriv->DestroyWindow;

-  ret = (*pScreen->DestroyWindow)(pWin);

-  pScreen->DestroyWindow = KdXVDestroyWindow;

-

-  return ret;

-}

-

-

-static void

-KdXVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)

-{

-  ScreenPtr pScreen = pWin->drawable.pScreen;

-  KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen);

-  KdXVWindowPtr WinPriv = GET_KDXV_WINDOW(pWin);

-  KdXVWindowPtr pPrev;

-  XvPortRecPrivatePtr pPriv;

-  Bool AreasExposed;

-

-  AreasExposed = (WinPriv && reg1 && RegionNotEmpty(reg1));

-

-  pScreen->WindowExposures = ScreenPriv->WindowExposures;

-  (*pScreen->WindowExposures)(pWin, reg1, reg2);

-  pScreen->WindowExposures = KdXVWindowExposures;

-

-  /* filter out XClearWindow/Area */

-  if (!pWin->valdata) return;

-

-  pPrev = NULL;

-

-  while(WinPriv) {

-     pPriv = WinPriv->PortRec;

-

-     /* Reput anyone with a reput function */

-

-     switch(pPriv->type) {

-     case XvInputMask:

-	KdXVReputVideo(pPriv);

-	break;

-     case XvOutputMask:

-	KdXVRegetVideo(pPriv);

-	break;

-     default:  /* overlaid still/image*/

-	if (pPriv->AdaptorRec->ReputImage)

-	   KdXVReputImage(pPriv);

-	else if(AreasExposed) {

-	    KdXVWindowPtr tmp;

-

-	    if (pPriv->isOn == XV_ON) {

-		(*pPriv->AdaptorRec->StopVideo)(

-		    pPriv->screen, pPriv->DevPriv.ptr, FALSE);

-		pPriv->isOn = XV_PENDING;

-	    }

-	    pPriv->pDraw = NULL;

-

-	    if(!pPrev)

-		dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, WinPriv->next);

-	    else

-	       pPrev->next = WinPriv->next;

-	    tmp = WinPriv;

-	    WinPriv = WinPriv->next;

-	    free(tmp);

-	    continue;

-	}

-	break;

-     }

-     pPrev = WinPriv;

-     WinPriv = WinPriv->next;

-  }

-}

-

-

-static void

-KdXVClipNotify(WindowPtr pWin, int dx, int dy)

-{

-  ScreenPtr pScreen = pWin->drawable.pScreen;

-  KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen);

-  KdXVWindowPtr WinPriv = GET_KDXV_WINDOW(pWin);

-  KdXVWindowPtr tmp, pPrev = NULL;

-  XvPortRecPrivatePtr pPriv;

-  Bool visible = (pWin->visibility == VisibilityUnobscured) ||

-		 (pWin->visibility == VisibilityPartiallyObscured);

-

-  while(WinPriv) {

-     pPriv = WinPriv->PortRec;

-

-     if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

-	RegionDestroy(pPriv->pCompositeClip);

-

-     pPriv->pCompositeClip = NULL;

-

-     /* Stop everything except images, but stop them too if the

-	window isn't visible.  But we only remove the images. */

-

-     if(pPriv->type || !visible) {

-	if(pPriv->isOn == XV_ON) {

-	    (*pPriv->AdaptorRec->StopVideo)(

-			pPriv->screen, pPriv->DevPriv.ptr, FALSE);

-	    pPriv->isOn = XV_PENDING;

-	}

-

-	if(!pPriv->type) {  /* overlaid still/image */

-	    pPriv->pDraw = NULL;

-

-	    if(!pPrev)

-		dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, WinPriv->next);

-	    else

-	       pPrev->next = WinPriv->next;

-	    tmp = WinPriv;

-	    WinPriv = WinPriv->next;

-	    free(tmp);

-	    continue;

-	}

-     }

-

-     pPrev = WinPriv;

-     WinPriv = WinPriv->next;

-  }

-

-  if(ScreenPriv->ClipNotify) {

-      pScreen->ClipNotify = ScreenPriv->ClipNotify;

-      (*pScreen->ClipNotify)(pWin, dx, dy);

-      pScreen->ClipNotify = KdXVClipNotify;

-  }

-}

-

-

-

-/**** Required XvScreenRec fields ****/

-

-static Bool

-KdXVCloseScreen(int i, ScreenPtr pScreen)

-{

-  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);

-  KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen);

-  XvAdaptorPtr pa;

-  int c;

-

-  if(!ScreenPriv) return TRUE;

-

-  pScreen->CreateWindow = ScreenPriv->CreateWindow;

-  pScreen->DestroyWindow = ScreenPriv->DestroyWindow;

-  pScreen->WindowExposures = ScreenPriv->WindowExposures;

-  pScreen->ClipNotify = ScreenPriv->ClipNotify;

-

-/*   fprintf(stderr,"XV: Unwrapping screen funcs\n"); */

-

-  for(c = 0, pa = pxvs->pAdaptors; c < pxvs->nAdaptors; c++, pa++) {

-       KdXVFreeAdaptor(pa);

-  }

-

-  free(pxvs->pAdaptors);

-  free(ScreenPriv);

-

-  return TRUE;

-}

-

-

-static int

-KdXVQueryAdaptors(

-   ScreenPtr pScreen,

-   XvAdaptorPtr *p_pAdaptors,

-   int *p_nAdaptors

-){

-  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);

-

-  *p_nAdaptors = pxvs->nAdaptors;

-  *p_pAdaptors = pxvs->pAdaptors;

-

-  return Success;

-}

-

-static Bool

-KdXVRunning (ScreenPtr pScreen)

-{

-    return (KdXVGeneration == serverGeneration &&

-	    GET_XV_SCREEN(pScreen) != 0);

-}

-

-Bool

-KdXVEnable(ScreenPtr pScreen)

-{

-    if (!KdXVRunning (pScreen))

-	return TRUE;

-

-    WalkTree(pScreen, KdXVReputAllVideo, 0);

-

-    return TRUE;

-}

-

-void

-KdXVDisable(ScreenPtr pScreen)

-{

-    XvScreenPtr pxvs;

-    KdXVScreenPtr ScreenPriv;

-    XvAdaptorPtr pAdaptor;

-    XvPortPtr pPort;

-    XvPortRecPrivatePtr pPriv;

-    int i, j;

-

-    if (!KdXVRunning (pScreen))

-	return;

-

-    pxvs = GET_XV_SCREEN(pScreen);

-    ScreenPriv = GET_KDXV_SCREEN(pScreen);

-

-    for(i = 0; i < pxvs->nAdaptors; i++) {

-	pAdaptor = &pxvs->pAdaptors[i];

-	for(j = 0; j < pAdaptor->nPorts; j++) {

-	    pPort = &pAdaptor->pPorts[j];

-	    pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;

-	    if(pPriv->isOn > XV_OFF) {

-

-		(*pPriv->AdaptorRec->StopVideo)(

-			pPriv->screen, pPriv->DevPriv.ptr, TRUE);

-		pPriv->isOn = XV_OFF;

-

-		if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

-		    RegionDestroy(pPriv->pCompositeClip);

-

-		pPriv->pCompositeClip = NULL;

-

-		if(!pPriv->type && pPriv->pDraw) { /* still */

-		    KdXVRemovePortFromWindow((WindowPtr)pPriv->pDraw, pPriv);

-		}

-	    }

-	}

-    }

-}

-

-/**** XvAdaptorRec fields ****/

-

-static int

-KdXVAllocatePort(

-   unsigned long port,

-   XvPortPtr pPort,

-   XvPortPtr *ppPort

-){

-  *ppPort = pPort;

-  return Success;

-}

-

-static int

-KdXVFreePort(XvPortPtr pPort)

-{

-  return Success;

-}

-

-static int

-KdXVPutVideo(

-   ClientPtr client,

-   DrawablePtr pDraw,

-   XvPortPtr pPort,

-   GCPtr pGC,

-   INT16 vid_x, INT16 vid_y,

-   CARD16 vid_w, CARD16 vid_h,

-   INT16 drw_x, INT16 drw_y,

-   CARD16 drw_w, CARD16 drw_h

-){

-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);

-  KdScreenPriv(portPriv->screen->pScreen);

-  int result;

-

-  /* No dumping video to pixmaps... For now anyhow */

-  if(pDraw->type != DRAWABLE_WINDOW) {

-      pPort->pDraw = (DrawablePtr)NULL;

-      return BadAlloc;

-  }

-

-  /* If we are changing windows, unregister our port in the old window */

-  if(portPriv->pDraw && (portPriv->pDraw != pDraw))

-     KdXVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);

-

-  /* Register our port with the new window */

-  result =  KdXVEnlistPortInWindow((WindowPtr)pDraw, portPriv);

-  if(result != Success) return result;

-

-  portPriv->pDraw = pDraw;

-  portPriv->type = XvInputMask;

-

-  /* save a copy of these parameters */

-  portPriv->vid_x = vid_x;  portPriv->vid_y = vid_y;

-  portPriv->vid_w = vid_w;  portPriv->vid_h = vid_h;

-  portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;

-  portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;

-

-  /* make sure we have the most recent copy of the clientClip */

-  KdXVCopyClip(portPriv, pGC);

-

-  /* To indicate to the DI layer that we were successful */

-  pPort->pDraw = pDraw;

-

-  if (!pScreenPriv->enabled) return Success;

-

-  return(KdXVReputVideo(portPriv));

-}

-

-static int

-KdXVPutStill(

-   ClientPtr client,

-   DrawablePtr pDraw,

-   XvPortPtr pPort,

-   GCPtr pGC,

-   INT16 vid_x, INT16 vid_y,

-   CARD16 vid_w, CARD16 vid_h,

-   INT16 drw_x, INT16 drw_y,

-   CARD16 drw_w, CARD16 drw_h

-){

-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);

-  ScreenPtr pScreen = pDraw->pScreen;

-  KdScreenPriv(pScreen);

-  KdScreenInfo *screen=pScreenPriv->screen;

-  RegionRec WinRegion;

-  RegionRec ClipRegion;

-  BoxRec WinBox;

-  int ret = Success;

-  Bool clippedAway = FALSE;

-

-  if (pDraw->type != DRAWABLE_WINDOW)

-      return BadAlloc;

-

-  if (!pScreenPriv->enabled) return Success;

-

-  WinBox.x1 = pDraw->x + drw_x;

-  WinBox.y1 = pDraw->y + drw_y;

-  WinBox.x2 = WinBox.x1 + drw_w;

-  WinBox.y2 = WinBox.y1 + drw_h;

-

-  RegionInit(&WinRegion, &WinBox, 1);

-  RegionInit(&ClipRegion, NullBox, 1);

-  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);

-

-  if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

-     RegionRec VPReg;

-     BoxRec VPBox;

-

-     VPBox.x1 = 0;

-     VPBox.y1 = 0;

-     VPBox.x2 = screen->width;

-     VPBox.y2 = screen->height;

-

-     RegionInit(&VPReg, &VPBox, 1);

-     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

-     RegionUninit(&VPReg);

-  }

-

-  if(portPriv->pDraw) {

-     KdXVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);

-  }

-

-  if(!RegionNotEmpty(&ClipRegion)) {

-     clippedAway = TRUE;

-     goto PUT_STILL_BAILOUT;

-  }

-

-  if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = RegionRects(&ClipRegion);

-     if(  (RegionNumRects(&ClipRegion) != 1) ||

-	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

-	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

-     {

-	  clippedAway = TRUE;

-          goto PUT_STILL_BAILOUT;

-     }

-  }

-

-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

-  }

-

-  ret = (*portPriv->AdaptorRec->PutStill)(portPriv->screen, pDraw,

-		vid_x, vid_y, WinBox.x1, WinBox.y1,

-		vid_w, vid_h, drw_w, drw_h,

-		&ClipRegion, portPriv->DevPriv.ptr);

-

-  if((ret == Success) &&

-	(portPriv->AdaptorRec->flags & VIDEO_OVERLAID_STILLS)) {

-

-     KdXVEnlistPortInWindow((WindowPtr)pDraw, portPriv);

-     portPriv->isOn = XV_ON;

-     portPriv->pDraw = pDraw;

-     portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;

-     portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;

-     portPriv->type = 0;  /* no mask means it's transient and should

-			     not be reput once it's removed */

-     pPort->pDraw = pDraw;  /* make sure we can get stop requests */

-  }

-

-PUT_STILL_BAILOUT:

-

-  if((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {

-        (*portPriv->AdaptorRec->StopVideo)(

-                portPriv->screen, portPriv->DevPriv.ptr, FALSE);

-        portPriv->isOn = XV_PENDING;

-  }

-

-  RegionUninit(&WinRegion);

-  RegionUninit(&ClipRegion);

-

-  return ret;

-}

-

-static int

-KdXVGetVideo(

-   ClientPtr client,

-   DrawablePtr pDraw,

-   XvPortPtr pPort,

-   GCPtr pGC,

-   INT16 vid_x, INT16 vid_y,

-   CARD16 vid_w, CARD16 vid_h,

-   INT16 drw_x, INT16 drw_y,

-   CARD16 drw_w, CARD16 drw_h

-){

-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);

-  int result;

-  KdScreenPriv(portPriv->screen->pScreen);

-

-  /* No pixmaps... For now anyhow */

-  if(pDraw->type != DRAWABLE_WINDOW) {

-      pPort->pDraw = (DrawablePtr)NULL;

-      return BadAlloc;

-  }

-

-  /* If we are changing windows, unregister our port in the old window */

-  if(portPriv->pDraw && (portPriv->pDraw != pDraw))

-     KdXVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);

-

-  /* Register our port with the new window */

-  result =  KdXVEnlistPortInWindow((WindowPtr)pDraw, portPriv);

-  if(result != Success) return result;

-

-  portPriv->pDraw = pDraw;

-  portPriv->type = XvOutputMask;

-

-  /* save a copy of these parameters */

-  portPriv->vid_x = vid_x;  portPriv->vid_y = vid_y;

-  portPriv->vid_w = vid_w;  portPriv->vid_h = vid_h;

-  portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;

-  portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;

-

-  /* make sure we have the most recent copy of the clientClip */

-  KdXVCopyClip(portPriv, pGC);

-

-  /* To indicate to the DI layer that we were successful */

-  pPort->pDraw = pDraw;

-

-  if(!pScreenPriv->enabled) return Success;

-

-  return(KdXVRegetVideo(portPriv));

-}

-

-static int

-KdXVGetStill(

-   ClientPtr client,

-   DrawablePtr pDraw,

-   XvPortPtr pPort,

-   GCPtr pGC,

-   INT16 vid_x, INT16 vid_y,

-   CARD16 vid_w, CARD16 vid_h,

-   INT16 drw_x, INT16 drw_y,

-   CARD16 drw_w, CARD16 drw_h

-){

-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);

-  ScreenPtr pScreen = pDraw->pScreen;

-  KdScreenPriv(pScreen);

-  RegionRec WinRegion;

-  RegionRec ClipRegion;

-  BoxRec WinBox;

-  int ret = Success;

-  Bool clippedAway = FALSE;

-

-  if (pDraw->type != DRAWABLE_WINDOW)

-      return BadAlloc;

-

-  if(!pScreenPriv->enabled) return Success;

-

-  WinBox.x1 = pDraw->x + drw_x;

-  WinBox.y1 = pDraw->y + drw_y;

-  WinBox.x2 = WinBox.x1 + drw_w;

-  WinBox.y2 = WinBox.y1 + drw_h;

-

-  RegionInit(&WinRegion, &WinBox, 1);

-  RegionInit(&ClipRegion, NullBox, 1);

-  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);

-

-  if(portPriv->pDraw) {

-     KdXVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);

-  }

-

-  if(!RegionNotEmpty(&ClipRegion)) {

-     clippedAway = TRUE;

-     goto GET_STILL_BAILOUT;

-  }

-

-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

-  }

-

-  ret = (*portPriv->AdaptorRec->GetStill)(portPriv->screen, pDraw,

-		vid_x, vid_y, WinBox.x1, WinBox.y1,

-		vid_w, vid_h, drw_w, drw_h,

-		&ClipRegion, portPriv->DevPriv.ptr);

-

-GET_STILL_BAILOUT:

-

-  if((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {

-        (*portPriv->AdaptorRec->StopVideo)(

-                portPriv->screen, portPriv->DevPriv.ptr, FALSE);

-        portPriv->isOn = XV_PENDING;

-  }

-

-  RegionUninit(&WinRegion);

-  RegionUninit(&ClipRegion);

-

-  return ret;

-}

-

-

-

-static int

-KdXVStopVideo(

-   ClientPtr client,

-   XvPortPtr pPort,

-   DrawablePtr pDraw

-){

-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);

-  KdScreenPriv(portPriv->screen->pScreen);

-

-  if(pDraw->type != DRAWABLE_WINDOW)

-      return BadAlloc;

-

-  KdXVRemovePortFromWindow((WindowPtr)pDraw, portPriv);

-

-  if(!pScreenPriv->enabled) return Success;

-

-  /* Must free resources. */

-

-  if(portPriv->isOn > XV_OFF) {

-	(*portPriv->AdaptorRec->StopVideo)(

-		portPriv->screen, portPriv->DevPriv.ptr, TRUE);

-	portPriv->isOn = XV_OFF;

-  }

-

-  return Success;

-}

-

-static int

-KdXVSetPortAttribute(

-   ClientPtr client,

-   XvPortPtr pPort,

-   Atom attribute,

-   INT32 value

-){

-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);

-

-  return((*portPriv->AdaptorRec->SetPortAttribute)(portPriv->screen,

-		attribute, value, portPriv->DevPriv.ptr));

-}

-

-

-static int

-KdXVGetPortAttribute(

-   ClientPtr client,

-   XvPortPtr pPort,

-   Atom attribute,

-   INT32 *p_value

-){

-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);

-

-  return((*portPriv->AdaptorRec->GetPortAttribute)(portPriv->screen,

-		attribute, (int *) p_value, portPriv->DevPriv.ptr));

-}

-

-

-

-static int

-KdXVQueryBestSize(

-   ClientPtr client,

-   XvPortPtr pPort,

-   CARD8 motion,

-   CARD16 vid_w, CARD16 vid_h,

-   CARD16 drw_w, CARD16 drw_h,

-   unsigned int *p_w, unsigned int *p_h

-){

-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);

-

-  (*portPriv->AdaptorRec->QueryBestSize)(portPriv->screen,

-		(Bool)motion, vid_w, vid_h, drw_w, drw_h,

-		p_w, p_h, portPriv->DevPriv.ptr);

-

-  return Success;

-}

-

-

-static int

-KdXVPutImage(

-   ClientPtr client,

-   DrawablePtr pDraw,

-   XvPortPtr pPort,

-   GCPtr pGC,

-   INT16 src_x, INT16 src_y,

-   CARD16 src_w, CARD16 src_h,

-   INT16 drw_x, INT16 drw_y,

-   CARD16 drw_w, CARD16 drw_h,

-   XvImagePtr format,

-   unsigned char* data,

-   Bool sync,

-   CARD16 width, CARD16 height

-){

-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);

-  ScreenPtr pScreen = pDraw->pScreen;

-  KdScreenPriv(pScreen);

-  RegionRec WinRegion;

-  RegionRec ClipRegion;

-  BoxRec WinBox;

-  int ret = Success;

-  Bool clippedAway = FALSE;

-

-  if (pDraw->type != DRAWABLE_WINDOW)

-      return BadAlloc;

-

-  if(!pScreenPriv->enabled) return Success;

-

-  WinBox.x1 = pDraw->x + drw_x;

-  WinBox.y1 = pDraw->y + drw_y;

-  WinBox.x2 = WinBox.x1 + drw_w;

-  WinBox.y2 = WinBox.y1 + drw_h;

-

-  RegionInit(&WinRegion, &WinBox, 1);

-  RegionInit(&ClipRegion, NullBox, 1);

-  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);

-

-  if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

-     RegionRec VPReg;

-     BoxRec VPBox;

-

-     VPBox.x1 = 0;

-     VPBox.y1 = 0;

-     VPBox.x2 = pScreen->width;

-     VPBox.y2 = pScreen->height;

-

-     RegionInit(&VPReg, &VPBox, 1);

-     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

-     RegionUninit(&VPReg);

-  }

-

-  if(portPriv->pDraw) {

-     KdXVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);

-  }

-

-  if(!RegionNotEmpty(&ClipRegion)) {

-     clippedAway = TRUE;

-     goto PUT_IMAGE_BAILOUT;

-  }

-

-  if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = RegionRects(&ClipRegion);

-     if(  (RegionNumRects(&ClipRegion) != 1) ||

-	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

-	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

-     {

-	  clippedAway = TRUE;

-          goto PUT_IMAGE_BAILOUT;

-     }

-  }

-

-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

-  }

-

-  ret = (*portPriv->AdaptorRec->PutImage)(portPriv->screen, pDraw,

-		src_x, src_y, WinBox.x1, WinBox.y1,

-		src_w, src_h, drw_w, drw_h, format->id, data, width, height,

-		sync, &ClipRegion, portPriv->DevPriv.ptr);

-

-  if((ret == Success) &&

-	(portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {

-

-     KdXVEnlistPortInWindow((WindowPtr)pDraw, portPriv);

-     portPriv->isOn = XV_ON;

-     portPriv->pDraw = pDraw;

-     portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;

-     portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;

-     portPriv->type = 0;  /* no mask means it's transient and should

-			     not be reput once it's removed */

-     pPort->pDraw = pDraw;  /* make sure we can get stop requests */

-  }

-

-PUT_IMAGE_BAILOUT:

-

-  if((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {

-        (*portPriv->AdaptorRec->StopVideo)(

-                portPriv->screen, portPriv->DevPriv.ptr, FALSE);

-        portPriv->isOn = XV_PENDING;

-  }

-

-  RegionUninit(&WinRegion);

-  RegionUninit(&ClipRegion);

-

-  return ret;

-}

-

-

-static  int

-KdXVQueryImageAttributes(

-   ClientPtr client,

-   XvPortPtr pPort,

-   XvImagePtr format,

-   CARD16 *width,

-   CARD16 *height,

-   int *pitches,

-   int *offsets

-){

-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);

-

-  return (*portPriv->AdaptorRec->QueryImageAttributes)(portPriv->screen,

-			format->id, width, height, pitches, offsets);

-}

-

-

-/****************  Common video manipulation functions *******************/

-

-void

-KdXVCopyPackedData(KdScreenInfo *screen, CARD8 *src, CARD8 *dst, int randr,

-    int srcPitch, int dstPitch, int srcW, int srcH, int top, int left,

-    int h, int w)

-{

-    int srcDown = srcPitch, srcRight = 2, srcNext;

-    int p;

-

-    switch (randr & RR_Rotate_All) {

-    case RR_Rotate_0:

-	srcDown = srcPitch;

-	srcRight = 2;

-	break;

-    case RR_Rotate_90:

-	src += (srcH - 1) * 2;

-	srcDown = -2;

-	srcRight = srcPitch;

-	break;

-    case RR_Rotate_180:

-	src += srcPitch * (srcH - 1) + (srcW - 1) * 2;

-	srcDown = -srcPitch;

-	srcRight = -2;

-	break;

-    case RR_Rotate_270:

-	src += srcPitch * (srcW - 1);

-	srcDown = 2;

-	srcRight = -srcPitch;

-	break;

-    }

-

-    src = src + top * srcDown + left * srcRight;

-

-    w >>= 1;

-    /* srcRight >>= 1; */

-    srcNext = srcRight >> 1;

-    while (h--) {

-	CARD16 *s = (CARD16 *)src;

-	CARD32 *d = (CARD32 *)dst;

-	p = w;

-	while (p--) {

-	    *d++ = s[0] | (s[srcNext] << 16);

-	    s += srcRight;

-	}

-	src += srcPitch;

-	dst += dstPitch;

-    }

-}

-

-void

-KdXVCopyPlanarData(KdScreenInfo *screen, CARD8 *src, CARD8 *dst, int randr,

-    int srcPitch, int srcPitch2, int dstPitch, int srcW, int srcH, int height,

-    int top, int left, int h, int w, int id)

-{

-    int i, j;

-    CARD8 *src1, *src2, *src3, *dst1;

-    int srcDown = srcPitch, srcDown2 = srcPitch2;

-    int srcRight = 2, srcRight2 = 1, srcNext = 1;

-

-    /* compute source data pointers */

-    src1 = src;

-    src2 = src1 + height * srcPitch;

-    src3 = src2 + (height >> 1) * srcPitch2;

-    switch (randr & RR_Rotate_All) {

-    case RR_Rotate_0:

-	srcDown = srcPitch;

-	srcDown2 = srcPitch2;

-	srcRight = 2;

-	srcRight2 = 1;

-	srcNext = 1;

-	break;

-    case RR_Rotate_90:

-	src1 = src1 + srcH - 1;

-	src2 = src2 + (srcH >> 1) - 1;

-	src3 = src3 + (srcH >> 1) - 1;

-	srcDown = -1;

-	srcDown2 = -1;

-	srcRight = srcPitch * 2;

-	srcRight2 = srcPitch2;

-	srcNext = srcPitch;

-	break;

-    case RR_Rotate_180:

-	src1 = src1 + srcPitch * (srcH - 1) + (srcW - 1);

-	src2 = src2 + srcPitch2 * ((srcH >> 1) - 1) + ((srcW >> 1) - 1);

-	src3 = src3 + srcPitch2 * ((srcH >> 1) - 1) + ((srcW >> 1) - 1);

-	srcDown = -srcPitch;

-	srcDown2 = -srcPitch2;

-	srcRight = -2;

-	srcRight2 = -1;

-	srcNext = -1;

-	break;

-    case RR_Rotate_270:

-	src1 = src1 + srcPitch * (srcW - 1);

-	src2 = src2 + srcPitch2 * ((srcW >> 1) - 1);

-	src3 = src3 + srcPitch2 * ((srcW >> 1) - 1);

-	srcDown = 1;

-	srcDown2 = 1;

-	srcRight = -srcPitch * 2;

-	srcRight2 = -srcPitch2;

-	srcNext = -srcPitch;

-	break;

-    }

-

-    /* adjust for origin */

-    src1 += top * srcDown + left * srcNext;

-    src2 += (top >> 1) * srcDown2 + (left >> 1) * srcRight2;

-    src3 += (top >> 1) * srcDown2 + (left >> 1) * srcRight2;

-

-    if (id == FOURCC_I420) {

-	CARD8 *srct = src2;

-	src2 = src3;

-	src3 = srct;

-    }

-

-    dst1 = dst;

-

-    w >>= 1;

-    for (j = 0; j < h; j++) {

-	CARD32 *dst = (CARD32 *)dst1;

-	CARD8 *s1l = src1;

-	CARD8 *s1r = src1 + srcNext;

-	CARD8 *s2 = src2;

-	CARD8 *s3 = src3;

-

-	for (i = 0; i < w; i++) {

-	    *dst++ = *s1l | (*s1r << 16) | (*s3 << 8) | (*s2 << 24);

-	    s1l += srcRight;

-	    s1r += srcRight;

-	    s2 += srcRight2;

-	    s3 += srcRight2;

-	}

-	src1 += srcDown;

-	dst1 += dstPitch;

-	if (j & 1) {

-	    src2 += srcDown2;

-	    src3 += srcDown2;

-	}

-    }

-}

-

-void

-KXVPaintRegion (DrawablePtr pDraw, RegionPtr pRgn, Pixel fg)

-{

-    GCPtr	pGC;

-    ChangeGCVal	val[2];

-    xRectangle	*rects, *r;

-    BoxPtr	pBox = RegionRects (pRgn);

-    int		nBox = RegionNumRects (pRgn);

-

-    rects = malloc(nBox * sizeof (xRectangle));

-    if (!rects)

-	goto bail0;

-    r = rects;

-    while (nBox--)

-    {

-	r->x = pBox->x1 - pDraw->x;

-	r->y = pBox->y1 - pDraw->y;

-	r->width = pBox->x2 - pBox->x1;

-	r->height = pBox->y2 - pBox->y1;

-	r++;

-	pBox++;

-    }

-

-    pGC = GetScratchGC (pDraw->depth, pDraw->pScreen);

-    if (!pGC)

-	goto bail1;

-

-    val[0].val = fg;

-    val[1].val = IncludeInferiors;

-    ChangeGC (NullClient, pGC, GCForeground|GCSubwindowMode, val);

-

-    ValidateGC (pDraw, pGC);

-

-    (*pGC->ops->PolyFillRect) (pDraw, pGC,

-			       RegionNumRects (pRgn), rects);

-

-    FreeScratchGC (pGC);

-bail1:

-    free(rects);

-bail0:

-    ;

-}

+/*
+
+   XFree86 Xv DDX written by Mark Vojkovich (markv@valinux.com)
+   Adapted for KDrive by Pontus Lidman <pontus.lidman@nokia.com>
+
+   Copyright (C) 2000, 2001 - Nokia Home Communications
+   Copyright (C) 1998, 1999 - The XFree86 Project 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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "kdrive.h"
+
+#include "scrnintstr.h"
+#include "regionstr.h"
+#include "windowstr.h"
+#include "pixmapstr.h"
+#include "mivalidate.h"
+#include "validate.h"
+#include "resource.h"
+#include "gcstruct.h"
+#include "dixstruct.h"
+
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
+
+#include "kxv.h"
+#include "fourcc.h"
+
+/* XvScreenRec fields */
+
+static Bool KdXVCloseScreen(int, ScreenPtr);
+static int KdXVQueryAdaptors(ScreenPtr, XvAdaptorPtr *, int *);
+
+/* XvAdaptorRec fields */
+
+static int KdXVAllocatePort(unsigned long, XvPortPtr, XvPortPtr *);
+static int KdXVFreePort(XvPortPtr);
+static int KdXVPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+                        INT16, INT16, CARD16, CARD16,
+                        INT16, INT16, CARD16, CARD16);
+static int KdXVPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+                        INT16, INT16, CARD16, CARD16,
+                        INT16, INT16, CARD16, CARD16);
+static int KdXVGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+                        INT16, INT16, CARD16, CARD16,
+                        INT16, INT16, CARD16, CARD16);
+static int KdXVGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+                        INT16, INT16, CARD16, CARD16,
+                        INT16, INT16, CARD16, CARD16);
+static int KdXVStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
+static int KdXVSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
+static int KdXVGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32 *);
+static int KdXVQueryBestSize(ClientPtr, XvPortPtr, CARD8,
+                             CARD16, CARD16, CARD16, CARD16,
+                             unsigned int *, unsigned int *);
+static int KdXVPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+                        INT16, INT16, CARD16, CARD16,
+                        INT16, INT16, CARD16, CARD16,
+                        XvImagePtr, unsigned char *, Bool, CARD16, CARD16);
+static int KdXVQueryImageAttributes(ClientPtr, XvPortPtr, XvImagePtr,
+                                    CARD16 *, CARD16 *, int *, int *);
+
+/* ScreenRec fields */
+
+static Bool KdXVCreateWindow(WindowPtr pWin);
+static Bool KdXVDestroyWindow(WindowPtr pWin);
+static void KdXVWindowExposures(WindowPtr pWin, RegionPtr r1, RegionPtr r2);
+static void KdXVClipNotify(WindowPtr pWin, int dx, int dy);
+
+/* misc */
+static Bool KdXVInitAdaptors(ScreenPtr, KdVideoAdaptorPtr *, int);
+
+static DevPrivateKeyRec KdXVWindowKeyRec;
+
+#define KdXVWindowKey (&KdXVWindowKeyRec)
+static DevPrivateKey KdXvScreenKey;
+static unsigned long KdXVGeneration = 0;
+static unsigned long PortResource = 0;
+
+DevPrivateKey (*XvGetScreenKeyProc) (void) = XvGetScreenKey;
+unsigned long (*XvGetRTPortProc) (void) = XvGetRTPort;
+int (*XvScreenInitProc) (ScreenPtr) = XvScreenInit;
+
+#define GET_XV_SCREEN(pScreen) ((XvScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, KdXvScreenKey))
+
+#define GET_KDXV_SCREEN(pScreen) \
+  	((KdXVScreenPtr)(GET_XV_SCREEN(pScreen)->devPriv.ptr))
+
+#define GET_KDXV_WINDOW(pWin) ((KdXVWindowPtr) \
+    dixLookupPrivate(&(pWin)->devPrivates, KdXVWindowKey))
+
+static KdXVInitGenericAdaptorPtr *GenDrivers = NULL;
+static int NumGenDrivers = 0;
+
+int
+KdXVRegisterGenericAdaptorDriver(KdXVInitGenericAdaptorPtr InitFunc)
+{
+    KdXVInitGenericAdaptorPtr *newdrivers;
+
+/*   fprintf(stderr,"KdXVRegisterGenericAdaptorDriver\n"); */
+
+    newdrivers = realloc(GenDrivers, sizeof(KdXVInitGenericAdaptorPtr) *
+                         (1 + NumGenDrivers));
+    if (!newdrivers)
+        return 0;
+    GenDrivers = newdrivers;
+
+    GenDrivers[NumGenDrivers++] = InitFunc;
+
+    return 1;
+}
+
+int
+KdXVListGenericAdaptors(KdScreenInfo * screen, KdVideoAdaptorPtr ** adaptors)
+{
+    int i, j, n, num;
+    KdVideoAdaptorPtr *DrivAdap, *new;
+
+    num = 0;
+    *adaptors = NULL;
+    for (i = 0; i < NumGenDrivers; i++) {
+        n = GenDrivers[i] (screen, &DrivAdap);
+        if (0 == n)
+            continue;
+        new = realloc(*adaptors, sizeof(KdVideoAdaptorPtr) * (num + n));
+        if (NULL == new)
+            continue;
+        *adaptors = new;
+        for (j = 0; j < n; j++, num++)
+            (*adaptors)[num] = DrivAdap[j];
+    }
+    return num;
+}
+
+KdVideoAdaptorPtr
+KdXVAllocateVideoAdaptorRec(KdScreenInfo * screen)
+{
+    return calloc(1, sizeof(KdVideoAdaptorRec));
+}
+
+void
+KdXVFreeVideoAdaptorRec(KdVideoAdaptorPtr ptr)
+{
+    free(ptr);
+}
+
+Bool
+KdXVScreenInit(ScreenPtr pScreen, KdVideoAdaptorPtr * adaptors, int num)
+{
+    KdXVScreenPtr ScreenPriv;
+    XvScreenPtr pxvs;
+
+/*   fprintf(stderr,"KdXVScreenInit initializing %d adaptors\n",num); */
+
+    if (KdXVGeneration != serverGeneration)
+        KdXVGeneration = serverGeneration;
+
+    if (!XvGetScreenKeyProc || !XvGetRTPortProc || !XvScreenInitProc)
+        return FALSE;
+
+    if (!dixRegisterPrivateKey(&KdXVWindowKeyRec, PRIVATE_WINDOW, 0))
+        return FALSE;
+
+    if (Success != (*XvScreenInitProc) (pScreen))
+        return FALSE;
+
+    KdXvScreenKey = (*XvGetScreenKeyProc) ();
+    PortResource = (*XvGetRTPortProc) ();
+
+    pxvs = GET_XV_SCREEN(pScreen);
+
+    /* Anyone initializing the Xv layer must provide these two.
+       The Xv di layer calls them without even checking if they exist! */
+
+    pxvs->ddCloseScreen = KdXVCloseScreen;
+    pxvs->ddQueryAdaptors = KdXVQueryAdaptors;
+
+    /* The Xv di layer provides us with a private hook so that we don't
+       have to allocate our own screen private.  They also provide
+       a CloseScreen hook so that we don't have to wrap it.  I'm not
+       sure that I appreciate that.  */
+
+    ScreenPriv = malloc(sizeof(KdXVScreenRec));
+    pxvs->devPriv.ptr = (pointer) ScreenPriv;
+
+    if (!ScreenPriv)
+        return FALSE;
+
+    ScreenPriv->CreateWindow = pScreen->CreateWindow;
+    ScreenPriv->DestroyWindow = pScreen->DestroyWindow;
+    ScreenPriv->WindowExposures = pScreen->WindowExposures;
+    ScreenPriv->ClipNotify = pScreen->ClipNotify;
+
+/*   fprintf(stderr,"XV: Wrapping screen funcs\n"); */
+
+    pScreen->CreateWindow = KdXVCreateWindow;
+    pScreen->DestroyWindow = KdXVDestroyWindow;
+    pScreen->WindowExposures = KdXVWindowExposures;
+    pScreen->ClipNotify = KdXVClipNotify;
+
+    if (!KdXVInitAdaptors(pScreen, adaptors, num))
+        return FALSE;
+
+    return TRUE;
+}
+
+static void
+KdXVFreeAdaptor(XvAdaptorPtr pAdaptor)
+{
+    int i;
+
+    free(pAdaptor->name);
+
+    if (pAdaptor->pEncodings) {
+        XvEncodingPtr pEncode = pAdaptor->pEncodings;
+
+        for (i = 0; i < pAdaptor->nEncodings; i++, pEncode++) {
+            free(pEncode->name);
+        }
+        free(pAdaptor->pEncodings);
+    }
+
+    free(pAdaptor->pFormats);
+
+    if (pAdaptor->pPorts) {
+        XvPortPtr pPort = pAdaptor->pPorts;
+        XvPortRecPrivatePtr pPriv;
+
+        for (i = 0; i < pAdaptor->nPorts; i++, pPort++) {
+            pPriv = (XvPortRecPrivatePtr) pPort->devPriv.ptr;
+            if (pPriv) {
+                if (pPriv->clientClip)
+                    RegionDestroy(pPriv->clientClip);
+                if (pPriv->pCompositeClip && pPriv->FreeCompositeClip)
+                    RegionDestroy(pPriv->pCompositeClip);
+                free(pPriv);
+            }
+        }
+        free(pAdaptor->pPorts);
+    }
+
+    if (pAdaptor->nAttributes) {
+        XvAttributePtr pAttribute = pAdaptor->pAttributes;
+
+        for (i = 0; i < pAdaptor->nAttributes; i++, pAttribute++) {
+            free(pAttribute->name);
+        }
+
+        free(pAdaptor->pAttributes);
+    }
+
+    free(pAdaptor->pImages);
+
+    free(pAdaptor->devPriv.ptr);
+}
+
+static Bool
+KdXVInitAdaptors(ScreenPtr pScreen, KdVideoAdaptorPtr * infoPtr, int number)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+
+    XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
+    KdVideoAdaptorPtr adaptorPtr;
+    XvAdaptorPtr pAdaptor, pa;
+    XvAdaptorRecPrivatePtr adaptorPriv;
+    int na, numAdaptor;
+    XvPortRecPrivatePtr portPriv;
+    XvPortPtr pPort, pp;
+    int numPort;
+    KdAttributePtr attributePtr;
+    XvAttributePtr pAttribute, pat;
+    KdVideoFormatPtr formatPtr;
+    XvFormatPtr pFormat, pf;
+    int numFormat, totFormat;
+    KdVideoEncodingPtr encodingPtr;
+    XvEncodingPtr pEncode, pe;
+    KdImagePtr imagePtr;
+    XvImagePtr pImage, pi;
+    int numVisuals;
+    VisualPtr pVisual;
+    int i;
+
+    pxvs->nAdaptors = 0;
+    pxvs->pAdaptors = NULL;
+
+    if (!(pAdaptor = calloc(number, sizeof(XvAdaptorRec))))
+        return FALSE;
+
+    for (pa = pAdaptor, na = 0, numAdaptor = 0; na < number; na++, adaptorPtr++) {
+        adaptorPtr = infoPtr[na];
+
+        if (!adaptorPtr->StopVideo || !adaptorPtr->SetPortAttribute ||
+            !adaptorPtr->GetPortAttribute || !adaptorPtr->QueryBestSize)
+            continue;
+
+        /* client libs expect at least one encoding */
+        if (!adaptorPtr->nEncodings || !adaptorPtr->pEncodings)
+            continue;
+
+        pa->type = adaptorPtr->type;
+
+        if (!adaptorPtr->PutVideo && !adaptorPtr->GetVideo)
+            pa->type &= ~XvVideoMask;
+
+        if (!adaptorPtr->PutStill && !adaptorPtr->GetStill)
+            pa->type &= ~XvStillMask;
+
+        if (!adaptorPtr->PutImage || !adaptorPtr->QueryImageAttributes)
+            pa->type &= ~XvImageMask;
+
+        if (!adaptorPtr->PutVideo && !adaptorPtr->PutImage &&
+            !adaptorPtr->PutStill)
+            pa->type &= ~XvInputMask;
+
+        if (!adaptorPtr->GetVideo && !adaptorPtr->GetStill)
+            pa->type &= ~XvOutputMask;
+
+        if (!(adaptorPtr->type & (XvPixmapMask | XvWindowMask)))
+            continue;
+        if (!(adaptorPtr->type & (XvImageMask | XvVideoMask | XvStillMask)))
+            continue;
+
+        pa->pScreen = pScreen;
+        pa->ddAllocatePort = KdXVAllocatePort;
+        pa->ddFreePort = KdXVFreePort;
+        pa->ddPutVideo = KdXVPutVideo;
+        pa->ddPutStill = KdXVPutStill;
+        pa->ddGetVideo = KdXVGetVideo;
+        pa->ddGetStill = KdXVGetStill;
+        pa->ddStopVideo = KdXVStopVideo;
+        pa->ddPutImage = KdXVPutImage;
+        pa->ddSetPortAttribute = KdXVSetPortAttribute;
+        pa->ddGetPortAttribute = KdXVGetPortAttribute;
+        pa->ddQueryBestSize = KdXVQueryBestSize;
+        pa->ddQueryImageAttributes = KdXVQueryImageAttributes;
+        pa->name = strdup(adaptorPtr->name);
+
+        if (adaptorPtr->nEncodings &&
+            (pEncode = calloc(adaptorPtr->nEncodings, sizeof(XvEncodingRec)))) {
+
+            for (pe = pEncode, encodingPtr = adaptorPtr->pEncodings, i = 0;
+                 i < adaptorPtr->nEncodings; pe++, i++, encodingPtr++) {
+                pe->id = encodingPtr->id;
+                pe->pScreen = pScreen;
+                pe->name = strdup(encodingPtr->name);
+                pe->width = encodingPtr->width;
+                pe->height = encodingPtr->height;
+                pe->rate.numerator = encodingPtr->rate.numerator;
+                pe->rate.denominator = encodingPtr->rate.denominator;
+            }
+            pa->nEncodings = adaptorPtr->nEncodings;
+            pa->pEncodings = pEncode;
+        }
+
+        if (adaptorPtr->nImages &&
+            (pImage = calloc(adaptorPtr->nImages, sizeof(XvImageRec)))) {
+
+            for (i = 0, pi = pImage, imagePtr = adaptorPtr->pImages;
+                 i < adaptorPtr->nImages; i++, pi++, imagePtr++) {
+                pi->id = imagePtr->id;
+                pi->type = imagePtr->type;
+                pi->byte_order = imagePtr->byte_order;
+                memcpy(pi->guid, imagePtr->guid, 16);
+                pi->bits_per_pixel = imagePtr->bits_per_pixel;
+                pi->format = imagePtr->format;
+                pi->num_planes = imagePtr->num_planes;
+                pi->depth = imagePtr->depth;
+                pi->red_mask = imagePtr->red_mask;
+                pi->green_mask = imagePtr->green_mask;
+                pi->blue_mask = imagePtr->blue_mask;
+                pi->y_sample_bits = imagePtr->y_sample_bits;
+                pi->u_sample_bits = imagePtr->u_sample_bits;
+                pi->v_sample_bits = imagePtr->v_sample_bits;
+                pi->horz_y_period = imagePtr->horz_y_period;
+                pi->horz_u_period = imagePtr->horz_u_period;
+                pi->horz_v_period = imagePtr->horz_v_period;
+                pi->vert_y_period = imagePtr->vert_y_period;
+                pi->vert_u_period = imagePtr->vert_u_period;
+                pi->vert_v_period = imagePtr->vert_v_period;
+                memcpy(pi->component_order, imagePtr->component_order, 32);
+                pi->scanline_order = imagePtr->scanline_order;
+            }
+            pa->nImages = adaptorPtr->nImages;
+            pa->pImages = pImage;
+        }
+
+        if (adaptorPtr->nAttributes &&
+            (pAttribute =
+             calloc(adaptorPtr->nAttributes, sizeof(XvAttributeRec)))) {
+            for (pat = pAttribute, attributePtr = adaptorPtr->pAttributes, i =
+                 0; i < adaptorPtr->nAttributes; pat++, i++, attributePtr++) {
+                pat->flags = attributePtr->flags;
+                pat->min_value = attributePtr->min_value;
+                pat->max_value = attributePtr->max_value;
+                pat->name = strdup(attributePtr->name);
+            }
+            pa->nAttributes = adaptorPtr->nAttributes;
+            pa->pAttributes = pAttribute;
+        }
+
+        totFormat = adaptorPtr->nFormats;
+
+        if (!(pFormat = calloc(totFormat, sizeof(XvFormatRec)))) {
+            KdXVFreeAdaptor(pa);
+            continue;
+        }
+        for (pf = pFormat, i = 0, numFormat = 0, formatPtr =
+             adaptorPtr->pFormats; i < adaptorPtr->nFormats; i++, formatPtr++) {
+            numVisuals = pScreen->numVisuals;
+            pVisual = pScreen->visuals;
+
+            while (numVisuals--) {
+                if ((pVisual->class == formatPtr->class) &&
+                    (pVisual->nplanes == formatPtr->depth)) {
+
+                    if (numFormat >= totFormat) {
+                        void *moreSpace;
+
+                        totFormat *= 2;
+                        moreSpace = realloc(pFormat,
+                                            totFormat * sizeof(XvFormatRec));
+                        if (!moreSpace)
+                            break;
+                        pFormat = moreSpace;
+                        pf = pFormat + numFormat;
+                    }
+
+                    pf->visual = pVisual->vid;
+                    pf->depth = formatPtr->depth;
+
+                    pf++;
+                    numFormat++;
+                }
+                pVisual++;
+            }
+        }
+        pa->nFormats = numFormat;
+        pa->pFormats = pFormat;
+        if (!numFormat) {
+            KdXVFreeAdaptor(pa);
+            continue;
+        }
+
+        if (!(adaptorPriv = calloc(1, sizeof(XvAdaptorRecPrivate)))) {
+            KdXVFreeAdaptor(pa);
+            continue;
+        }
+
+        adaptorPriv->flags = adaptorPtr->flags;
+        adaptorPriv->PutVideo = adaptorPtr->PutVideo;
+        adaptorPriv->PutStill = adaptorPtr->PutStill;
+        adaptorPriv->GetVideo = adaptorPtr->GetVideo;
+        adaptorPriv->GetStill = adaptorPtr->GetStill;
+        adaptorPriv->StopVideo = adaptorPtr->StopVideo;
+        adaptorPriv->SetPortAttribute = adaptorPtr->SetPortAttribute;
+        adaptorPriv->GetPortAttribute = adaptorPtr->GetPortAttribute;
+        adaptorPriv->QueryBestSize = adaptorPtr->QueryBestSize;
+        adaptorPriv->QueryImageAttributes = adaptorPtr->QueryImageAttributes;
+        adaptorPriv->PutImage = adaptorPtr->PutImage;
+        adaptorPriv->ReputImage = adaptorPtr->ReputImage;
+
+        pa->devPriv.ptr = (pointer) adaptorPriv;
+
+        if (!(pPort = calloc(adaptorPtr->nPorts, sizeof(XvPortRec)))) {
+            KdXVFreeAdaptor(pa);
+            continue;
+        }
+        for (pp = pPort, i = 0, numPort = 0; i < adaptorPtr->nPorts; i++) {
+
+            if (!(pp->id = FakeClientID(0)))
+                continue;
+
+            if (!(portPriv = calloc(1, sizeof(XvPortRecPrivate))))
+                continue;
+
+            if (!AddResource(pp->id, PortResource, pp)) {
+                free(portPriv);
+                continue;
+            }
+
+            pp->pAdaptor = pa;
+            pp->pNotify = (XvPortNotifyPtr) NULL;
+            pp->pDraw = (DrawablePtr) NULL;
+            pp->client = (ClientPtr) NULL;
+            pp->grab.client = (ClientPtr) NULL;
+            pp->time = currentTime;
+            pp->devPriv.ptr = portPriv;
+
+            portPriv->screen = screen;
+            portPriv->AdaptorRec = adaptorPriv;
+            portPriv->DevPriv.ptr = adaptorPtr->pPortPrivates[i].ptr;
+
+            pp++;
+            numPort++;
+        }
+        pa->nPorts = numPort;
+        pa->pPorts = pPort;
+        if (!numPort) {
+            KdXVFreeAdaptor(pa);
+            continue;
+        }
+
+        pa->base_id = pPort->id;
+
+        pa++;
+        numAdaptor++;
+    }
+
+    if (numAdaptor) {
+        pxvs->nAdaptors = numAdaptor;
+        pxvs->pAdaptors = pAdaptor;
+    }
+    else {
+        free(pAdaptor);
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/* Video should be clipped to the intersection of the window cliplist
+   and the client cliplist specified in the GC for which the video was
+   initialized.  When we need to reclip a window, the GC that started
+   the video may not even be around anymore.  That's why we save the
+   client clip from the GC when the video is initialized.  We then
+   use KdXVUpdateCompositeClip to calculate the new composite clip
+   when we need it.  This is different from what DEC did.  They saved
+   the GC and used it's clip list when they needed to reclip the window,
+   even if the client clip was different from the one the video was
+   initialized with.  If the original GC was destroyed, they had to stop
+   the video.  I like the new method better (MArk).
+
+   This function only works for windows.  Will need to rewrite when
+   (if) we support pixmap rendering.
+*/
+
+static void
+KdXVUpdateCompositeClip(XvPortRecPrivatePtr portPriv)
+{
+    RegionPtr pregWin, pCompositeClip;
+    WindowPtr pWin;
+    Bool freeCompClip = FALSE;
+
+    if (portPriv->pCompositeClip)
+        return;
+
+    pWin = (WindowPtr) portPriv->pDraw;
+
+    /* get window clip list */
+    if (portPriv->subWindowMode == IncludeInferiors) {
+        pregWin = NotClippedByChildren(pWin);
+        freeCompClip = TRUE;
+    }
+    else
+        pregWin = &pWin->clipList;
+
+    if (!portPriv->clientClip) {
+        portPriv->pCompositeClip = pregWin;
+        portPriv->FreeCompositeClip = freeCompClip;
+        return;
+    }
+
+    pCompositeClip = RegionCreate(NullBox, 1);
+    RegionCopy(pCompositeClip, portPriv->clientClip);
+    RegionTranslate(pCompositeClip,
+                    portPriv->pDraw->x + portPriv->clipOrg.x,
+                    portPriv->pDraw->y + portPriv->clipOrg.y);
+    RegionIntersect(pCompositeClip, pregWin, pCompositeClip);
+
+    portPriv->pCompositeClip = pCompositeClip;
+    portPriv->FreeCompositeClip = TRUE;
+
+    if (freeCompClip) {
+        RegionDestroy(pregWin);
+    }
+}
+
+/* Save the current clientClip and update the CompositeClip whenever
+   we have a fresh GC */
+
+static void
+KdXVCopyClip(XvPortRecPrivatePtr portPriv, GCPtr pGC)
+{
+    /* copy the new clip if it exists */
+    if ((pGC->clientClipType == CT_REGION) && pGC->clientClip) {
+        if (!portPriv->clientClip)
+            portPriv->clientClip = RegionCreate(NullBox, 1);
+        /* Note: this is in window coordinates */
+        RegionCopy(portPriv->clientClip, pGC->clientClip);
+    }
+    else if (portPriv->clientClip) {    /* free the old clientClip */
+        RegionDestroy(portPriv->clientClip);
+        portPriv->clientClip = NULL;
+    }
+
+    /* get rid of the old clip list */
+    if (portPriv->pCompositeClip && portPriv->FreeCompositeClip) {
+        RegionDestroy(portPriv->pCompositeClip);
+    }
+
+    portPriv->clipOrg = pGC->clipOrg;
+    portPriv->pCompositeClip = pGC->pCompositeClip;
+    portPriv->FreeCompositeClip = FALSE;
+    portPriv->subWindowMode = pGC->subWindowMode;
+}
+
+static int
+KdXVRegetVideo(XvPortRecPrivatePtr portPriv)
+{
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    KdXVUpdateCompositeClip(portPriv);
+
+    /* translate the video region to the screen */
+    WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;
+    WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;
+    WinBox.x2 = WinBox.x1 + portPriv->drw_w;
+    WinBox.y2 = WinBox.y1 + portPriv->drw_h;
+
+    /* clip to the window composite clip */
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionInit(&ClipRegion, NullBox, 1);
+    RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);
+
+    /* that's all if it's totally obscured */
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto CLIP_VIDEO_BAILOUT;
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret = (*portPriv->AdaptorRec->GetVideo) (portPriv->screen, portPriv->pDraw,
+                                             portPriv->vid_x, portPriv->vid_y,
+                                             WinBox.x1, WinBox.y1,
+                                             portPriv->vid_w, portPriv->vid_h,
+                                             portPriv->drw_w, portPriv->drw_h,
+                                             &ClipRegion,
+                                             portPriv->DevPriv.ptr);
+
+    if (ret == Success)
+        portPriv->isOn = XV_ON;
+
+ CLIP_VIDEO_BAILOUT:
+
+    if ((clippedAway || (ret != Success)) && portPriv->isOn == XV_ON) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->screen,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
+
+    /* This clip was copied and only good for one shot */
+    if (!portPriv->FreeCompositeClip)
+        portPriv->pCompositeClip = NULL;
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
+}
+
+static int
+KdXVReputVideo(XvPortRecPrivatePtr portPriv)
+{
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    ScreenPtr pScreen = portPriv->pDraw->pScreen;
+
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    KdXVUpdateCompositeClip(portPriv);
+
+    /* translate the video region to the screen */
+    WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;
+    WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;
+    WinBox.x2 = WinBox.x1 + portPriv->drw_w;
+    WinBox.y2 = WinBox.y1 + portPriv->drw_h;
+
+    /* clip to the window composite clip */
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionInit(&ClipRegion, NullBox, 1);
+    RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);
+
+    /* clip and translate to the viewport */
+    if (portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
+        RegionRec VPReg;
+        BoxRec VPBox;
+
+        VPBox.x1 = 0;
+        VPBox.y1 = 0;
+        VPBox.x2 = screen->width;
+        VPBox.y2 = screen->height;
+
+        RegionInit(&VPReg, &VPBox, 1);
+        RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
+        RegionUninit(&VPReg);
+    }
+
+    /* that's all if it's totally obscured */
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto CLIP_VIDEO_BAILOUT;
+    }
+
+    /* bailout if we have to clip but the hardware doesn't support it */
+    if (portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
+        BoxPtr clipBox = RegionRects(&ClipRegion);
+
+        if ((RegionNumRects(&ClipRegion) != 1) ||
+            (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
+            (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2)) {
+            clippedAway = TRUE;
+            goto CLIP_VIDEO_BAILOUT;
+        }
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret = (*portPriv->AdaptorRec->PutVideo) (portPriv->screen, portPriv->pDraw,
+                                             portPriv->vid_x, portPriv->vid_y,
+                                             WinBox.x1, WinBox.y1,
+                                             portPriv->vid_w, portPriv->vid_h,
+                                             portPriv->drw_w, portPriv->drw_h,
+                                             &ClipRegion,
+                                             portPriv->DevPriv.ptr);
+
+    if (ret == Success)
+        portPriv->isOn = XV_ON;
+
+ CLIP_VIDEO_BAILOUT:
+
+    if ((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->screen,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
+
+    /* This clip was copied and only good for one shot */
+    if (!portPriv->FreeCompositeClip)
+        portPriv->pCompositeClip = NULL;
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
+}
+
+static int
+KdXVReputImage(XvPortRecPrivatePtr portPriv)
+{
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    ScreenPtr pScreen = portPriv->pDraw->pScreen;
+
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    KdXVUpdateCompositeClip(portPriv);
+
+    /* translate the video region to the screen */
+    WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;
+    WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;
+    WinBox.x2 = WinBox.x1 + portPriv->drw_w;
+    WinBox.y2 = WinBox.y1 + portPriv->drw_h;
+
+    /* clip to the window composite clip */
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionInit(&ClipRegion, NullBox, 1);
+    RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);
+
+    /* clip and translate to the viewport */
+    if (portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
+        RegionRec VPReg;
+        BoxRec VPBox;
+
+        VPBox.x1 = 0;
+        VPBox.y1 = 0;
+        VPBox.x2 = screen->width;
+        VPBox.y2 = screen->height;
+
+        RegionInit(&VPReg, &VPBox, 1);
+        RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
+        RegionUninit(&VPReg);
+    }
+
+    /* that's all if it's totally obscured */
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto CLIP_VIDEO_BAILOUT;
+    }
+
+    /* bailout if we have to clip but the hardware doesn't support it */
+    if (portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
+        BoxPtr clipBox = RegionRects(&ClipRegion);
+
+        if ((RegionNumRects(&ClipRegion) != 1) ||
+            (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
+            (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2)) {
+            clippedAway = TRUE;
+            goto CLIP_VIDEO_BAILOUT;
+        }
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret =
+        (*portPriv->AdaptorRec->ReputImage) (portPriv->screen, portPriv->pDraw,
+                                             WinBox.x1, WinBox.y1, &ClipRegion,
+                                             portPriv->DevPriv.ptr);
+
+    portPriv->isOn = (ret == Success) ? XV_ON : XV_OFF;
+
+ CLIP_VIDEO_BAILOUT:
+
+    if ((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->screen,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
+
+    /* This clip was copied and only good for one shot */
+    if (!portPriv->FreeCompositeClip)
+        portPriv->pCompositeClip = NULL;
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
+}
+
+static int
+KdXVReputAllVideo(WindowPtr pWin, pointer data)
+{
+    KdXVWindowPtr WinPriv;
+
+    if (pWin->drawable.type != DRAWABLE_WINDOW)
+        return WT_DONTWALKCHILDREN;
+
+    WinPriv = GET_KDXV_WINDOW(pWin);
+
+    while (WinPriv) {
+        if (WinPriv->PortRec->type == XvInputMask)
+            KdXVReputVideo(WinPriv->PortRec);
+        else
+            KdXVRegetVideo(WinPriv->PortRec);
+        WinPriv = WinPriv->next;
+    }
+
+    return WT_WALKCHILDREN;
+}
+
+static int
+KdXVEnlistPortInWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
+{
+    KdXVWindowPtr winPriv, PrivRoot;
+
+    winPriv = PrivRoot = GET_KDXV_WINDOW(pWin);
+
+    /* Enlist our port in the window private */
+    while (winPriv) {
+        if (winPriv->PortRec == portPriv)       /* we're already listed */
+            break;
+        winPriv = winPriv->next;
+    }
+
+    if (!winPriv) {
+        winPriv = malloc(sizeof(KdXVWindowRec));
+        if (!winPriv)
+            return BadAlloc;
+        winPriv->PortRec = portPriv;
+        winPriv->next = PrivRoot;
+        dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, winPriv);
+    }
+    return Success;
+}
+
+static void
+KdXVRemovePortFromWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
+{
+    KdXVWindowPtr winPriv, prevPriv = NULL;
+
+    winPriv = GET_KDXV_WINDOW(pWin);
+
+    while (winPriv) {
+        if (winPriv->PortRec == portPriv) {
+            if (prevPriv)
+                prevPriv->next = winPriv->next;
+            else
+                dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, winPriv->next);
+            free(winPriv);
+            break;
+        }
+        prevPriv = winPriv;
+        winPriv = winPriv->next;
+    }
+    portPriv->pDraw = NULL;
+}
+
+/****  ScreenRec fields ****/
+
+static Bool
+KdXVCreateWindow(WindowPtr pWin)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen);
+    int ret;
+
+    pScreen->CreateWindow = ScreenPriv->CreateWindow;
+    ret = (*pScreen->CreateWindow) (pWin);
+    pScreen->CreateWindow = KdXVCreateWindow;
+
+    if (ret)
+        dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, NULL);
+
+    return ret;
+}
+
+static Bool
+KdXVDestroyWindow(WindowPtr pWin)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen);
+    KdXVWindowPtr tmp, WinPriv = GET_KDXV_WINDOW(pWin);
+    int ret;
+
+    while (WinPriv) {
+        XvPortRecPrivatePtr pPriv = WinPriv->PortRec;
+
+        if (pPriv->isOn > XV_OFF) {
+            (*pPriv->AdaptorRec->StopVideo) (pPriv->screen, pPriv->DevPriv.ptr,
+                                             TRUE);
+            pPriv->isOn = XV_OFF;
+        }
+
+        pPriv->pDraw = NULL;
+        tmp = WinPriv;
+        WinPriv = WinPriv->next;
+        free(tmp);
+    }
+
+    dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, NULL);
+
+    pScreen->DestroyWindow = ScreenPriv->DestroyWindow;
+    ret = (*pScreen->DestroyWindow) (pWin);
+    pScreen->DestroyWindow = KdXVDestroyWindow;
+
+    return ret;
+}
+
+static void
+KdXVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen);
+    KdXVWindowPtr WinPriv = GET_KDXV_WINDOW(pWin);
+    KdXVWindowPtr pPrev;
+    XvPortRecPrivatePtr pPriv;
+    Bool AreasExposed;
+
+    AreasExposed = (WinPriv && reg1 && RegionNotEmpty(reg1));
+
+    pScreen->WindowExposures = ScreenPriv->WindowExposures;
+    (*pScreen->WindowExposures) (pWin, reg1, reg2);
+    pScreen->WindowExposures = KdXVWindowExposures;
+
+    /* filter out XClearWindow/Area */
+    if (!pWin->valdata)
+        return;
+
+    pPrev = NULL;
+
+    while (WinPriv) {
+        pPriv = WinPriv->PortRec;
+
+        /* Reput anyone with a reput function */
+
+        switch (pPriv->type) {
+        case XvInputMask:
+            KdXVReputVideo(pPriv);
+            break;
+        case XvOutputMask:
+            KdXVRegetVideo(pPriv);
+            break;
+        default:               /* overlaid still/image */
+            if (pPriv->AdaptorRec->ReputImage)
+                KdXVReputImage(pPriv);
+            else if (AreasExposed) {
+                KdXVWindowPtr tmp;
+
+                if (pPriv->isOn == XV_ON) {
+                    (*pPriv->AdaptorRec->StopVideo) (pPriv->screen,
+                                                     pPriv->DevPriv.ptr, FALSE);
+                    pPriv->isOn = XV_PENDING;
+                }
+                pPriv->pDraw = NULL;
+
+                if (!pPrev)
+                    dixSetPrivate(&pWin->devPrivates, KdXVWindowKey,
+                                  WinPriv->next);
+                else
+                    pPrev->next = WinPriv->next;
+                tmp = WinPriv;
+                WinPriv = WinPriv->next;
+                free(tmp);
+                continue;
+            }
+            break;
+        }
+        pPrev = WinPriv;
+        WinPriv = WinPriv->next;
+    }
+}
+
+static void
+KdXVClipNotify(WindowPtr pWin, int dx, int dy)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen);
+    KdXVWindowPtr WinPriv = GET_KDXV_WINDOW(pWin);
+    KdXVWindowPtr tmp, pPrev = NULL;
+    XvPortRecPrivatePtr pPriv;
+    Bool visible = (pWin->visibility == VisibilityUnobscured) ||
+        (pWin->visibility == VisibilityPartiallyObscured);
+
+    while (WinPriv) {
+        pPriv = WinPriv->PortRec;
+
+        if (pPriv->pCompositeClip && pPriv->FreeCompositeClip)
+            RegionDestroy(pPriv->pCompositeClip);
+
+        pPriv->pCompositeClip = NULL;
+
+        /* Stop everything except images, but stop them too if the
+           window isn't visible.  But we only remove the images. */
+
+        if (pPriv->type || !visible) {
+            if (pPriv->isOn == XV_ON) {
+                (*pPriv->AdaptorRec->StopVideo) (pPriv->screen,
+                                                 pPriv->DevPriv.ptr, FALSE);
+                pPriv->isOn = XV_PENDING;
+            }
+
+            if (!pPriv->type) { /* overlaid still/image */
+                pPriv->pDraw = NULL;
+
+                if (!pPrev)
+                    dixSetPrivate(&pWin->devPrivates, KdXVWindowKey,
+                                  WinPriv->next);
+                else
+                    pPrev->next = WinPriv->next;
+                tmp = WinPriv;
+                WinPriv = WinPriv->next;
+                free(tmp);
+                continue;
+            }
+        }
+
+        pPrev = WinPriv;
+        WinPriv = WinPriv->next;
+    }
+
+    if (ScreenPriv->ClipNotify) {
+        pScreen->ClipNotify = ScreenPriv->ClipNotify;
+        (*pScreen->ClipNotify) (pWin, dx, dy);
+        pScreen->ClipNotify = KdXVClipNotify;
+    }
+}
+
+/**** Required XvScreenRec fields ****/
+
+static Bool
+KdXVCloseScreen(int i, ScreenPtr pScreen)
+{
+    XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
+    KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen);
+    XvAdaptorPtr pa;
+    int c;
+
+    if (!ScreenPriv)
+        return TRUE;
+
+    pScreen->CreateWindow = ScreenPriv->CreateWindow;
+    pScreen->DestroyWindow = ScreenPriv->DestroyWindow;
+    pScreen->WindowExposures = ScreenPriv->WindowExposures;
+    pScreen->ClipNotify = ScreenPriv->ClipNotify;
+
+/*   fprintf(stderr,"XV: Unwrapping screen funcs\n"); */
+
+    for (c = 0, pa = pxvs->pAdaptors; c < pxvs->nAdaptors; c++, pa++) {
+        KdXVFreeAdaptor(pa);
+    }
+
+    free(pxvs->pAdaptors);
+    free(ScreenPriv);
+
+    return TRUE;
+}
+
+static int
+KdXVQueryAdaptors(ScreenPtr pScreen,
+                  XvAdaptorPtr * p_pAdaptors, int *p_nAdaptors)
+{
+    XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
+
+    *p_nAdaptors = pxvs->nAdaptors;
+    *p_pAdaptors = pxvs->pAdaptors;
+
+    return Success;
+}
+
+static Bool
+KdXVRunning(ScreenPtr pScreen)
+{
+    return (KdXVGeneration == serverGeneration && GET_XV_SCREEN(pScreen) != 0);
+}
+
+Bool
+KdXVEnable(ScreenPtr pScreen)
+{
+    if (!KdXVRunning(pScreen))
+        return TRUE;
+
+    WalkTree(pScreen, KdXVReputAllVideo, 0);
+
+    return TRUE;
+}
+
+void
+KdXVDisable(ScreenPtr pScreen)
+{
+    XvScreenPtr pxvs;
+    KdXVScreenPtr ScreenPriv;
+    XvAdaptorPtr pAdaptor;
+    XvPortPtr pPort;
+    XvPortRecPrivatePtr pPriv;
+    int i, j;
+
+    if (!KdXVRunning(pScreen))
+        return;
+
+    pxvs = GET_XV_SCREEN(pScreen);
+    ScreenPriv = GET_KDXV_SCREEN(pScreen);
+
+    for (i = 0; i < pxvs->nAdaptors; i++) {
+        pAdaptor = &pxvs->pAdaptors[i];
+        for (j = 0; j < pAdaptor->nPorts; j++) {
+            pPort = &pAdaptor->pPorts[j];
+            pPriv = (XvPortRecPrivatePtr) pPort->devPriv.ptr;
+            if (pPriv->isOn > XV_OFF) {
+
+                (*pPriv->AdaptorRec->StopVideo) (pPriv->screen,
+                                                 pPriv->DevPriv.ptr, TRUE);
+                pPriv->isOn = XV_OFF;
+
+                if (pPriv->pCompositeClip && pPriv->FreeCompositeClip)
+                    RegionDestroy(pPriv->pCompositeClip);
+
+                pPriv->pCompositeClip = NULL;
+
+                if (!pPriv->type && pPriv->pDraw) {     /* still */
+                    KdXVRemovePortFromWindow((WindowPtr) pPriv->pDraw, pPriv);
+                }
+            }
+        }
+    }
+}
+
+/**** XvAdaptorRec fields ****/
+
+static int
+KdXVAllocatePort(unsigned long port, XvPortPtr pPort, XvPortPtr * ppPort)
+{
+    *ppPort = pPort;
+    return Success;
+}
+
+static int
+KdXVFreePort(XvPortPtr pPort)
+{
+    return Success;
+}
+
+static int
+KdXVPutVideo(ClientPtr client,
+             DrawablePtr pDraw,
+             XvPortPtr pPort,
+             GCPtr pGC,
+             INT16 vid_x, INT16 vid_y,
+             CARD16 vid_w, CARD16 vid_h,
+             INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+
+    KdScreenPriv(portPriv->screen->pScreen);
+    int result;
+
+    /* No dumping video to pixmaps... For now anyhow */
+    if (pDraw->type != DRAWABLE_WINDOW) {
+        pPort->pDraw = (DrawablePtr) NULL;
+        return BadAlloc;
+    }
+
+    /* If we are changing windows, unregister our port in the old window */
+    if (portPriv->pDraw && (portPriv->pDraw != pDraw))
+        KdXVRemovePortFromWindow((WindowPtr) (portPriv->pDraw), portPriv);
+
+    /* Register our port with the new window */
+    result = KdXVEnlistPortInWindow((WindowPtr) pDraw, portPriv);
+    if (result != Success)
+        return result;
+
+    portPriv->pDraw = pDraw;
+    portPriv->type = XvInputMask;
+
+    /* save a copy of these parameters */
+    portPriv->vid_x = vid_x;
+    portPriv->vid_y = vid_y;
+    portPriv->vid_w = vid_w;
+    portPriv->vid_h = vid_h;
+    portPriv->drw_x = drw_x;
+    portPriv->drw_y = drw_y;
+    portPriv->drw_w = drw_w;
+    portPriv->drw_h = drw_h;
+
+    /* make sure we have the most recent copy of the clientClip */
+    KdXVCopyClip(portPriv, pGC);
+
+    /* To indicate to the DI layer that we were successful */
+    pPort->pDraw = pDraw;
+
+    if (!pScreenPriv->enabled)
+        return Success;
+
+    return (KdXVReputVideo(portPriv));
+}
+
+static int
+KdXVPutStill(ClientPtr client,
+             DrawablePtr pDraw,
+             XvPortPtr pPort,
+             GCPtr pGC,
+             INT16 vid_x, INT16 vid_y,
+             CARD16 vid_w, CARD16 vid_h,
+             INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+    ScreenPtr pScreen = pDraw->pScreen;
+
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    if (pDraw->type != DRAWABLE_WINDOW)
+        return BadAlloc;
+
+    if (!pScreenPriv->enabled)
+        return Success;
+
+    WinBox.x1 = pDraw->x + drw_x;
+    WinBox.y1 = pDraw->y + drw_y;
+    WinBox.x2 = WinBox.x1 + drw_w;
+    WinBox.y2 = WinBox.y1 + drw_h;
+
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionInit(&ClipRegion, NullBox, 1);
+    RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);
+
+    if (portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
+        RegionRec VPReg;
+        BoxRec VPBox;
+
+        VPBox.x1 = 0;
+        VPBox.y1 = 0;
+        VPBox.x2 = screen->width;
+        VPBox.y2 = screen->height;
+
+        RegionInit(&VPReg, &VPBox, 1);
+        RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
+        RegionUninit(&VPReg);
+    }
+
+    if (portPriv->pDraw) {
+        KdXVRemovePortFromWindow((WindowPtr) (portPriv->pDraw), portPriv);
+    }
+
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto PUT_STILL_BAILOUT;
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
+        BoxPtr clipBox = RegionRects(&ClipRegion);
+
+        if ((RegionNumRects(&ClipRegion) != 1) ||
+            (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
+            (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2)) {
+            clippedAway = TRUE;
+            goto PUT_STILL_BAILOUT;
+        }
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret = (*portPriv->AdaptorRec->PutStill) (portPriv->screen, pDraw,
+                                             vid_x, vid_y, WinBox.x1, WinBox.y1,
+                                             vid_w, vid_h, drw_w, drw_h,
+                                             &ClipRegion,
+                                             portPriv->DevPriv.ptr);
+
+    if ((ret == Success) &&
+        (portPriv->AdaptorRec->flags & VIDEO_OVERLAID_STILLS)) {
+
+        KdXVEnlistPortInWindow((WindowPtr) pDraw, portPriv);
+        portPriv->isOn = XV_ON;
+        portPriv->pDraw = pDraw;
+        portPriv->drw_x = drw_x;
+        portPriv->drw_y = drw_y;
+        portPriv->drw_w = drw_w;
+        portPriv->drw_h = drw_h;
+        portPriv->type = 0;     /* no mask means it's transient and should
+                                   not be reput once it's removed */
+        pPort->pDraw = pDraw;   /* make sure we can get stop requests */
+    }
+
+ PUT_STILL_BAILOUT:
+
+    if ((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->screen,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
+}
+
+static int
+KdXVGetVideo(ClientPtr client,
+             DrawablePtr pDraw,
+             XvPortPtr pPort,
+             GCPtr pGC,
+             INT16 vid_x, INT16 vid_y,
+             CARD16 vid_w, CARD16 vid_h,
+             INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+    int result;
+
+    KdScreenPriv(portPriv->screen->pScreen);
+
+    /* No pixmaps... For now anyhow */
+    if (pDraw->type != DRAWABLE_WINDOW) {
+        pPort->pDraw = (DrawablePtr) NULL;
+        return BadAlloc;
+    }
+
+    /* If we are changing windows, unregister our port in the old window */
+    if (portPriv->pDraw && (portPriv->pDraw != pDraw))
+        KdXVRemovePortFromWindow((WindowPtr) (portPriv->pDraw), portPriv);
+
+    /* Register our port with the new window */
+    result = KdXVEnlistPortInWindow((WindowPtr) pDraw, portPriv);
+    if (result != Success)
+        return result;
+
+    portPriv->pDraw = pDraw;
+    portPriv->type = XvOutputMask;
+
+    /* save a copy of these parameters */
+    portPriv->vid_x = vid_x;
+    portPriv->vid_y = vid_y;
+    portPriv->vid_w = vid_w;
+    portPriv->vid_h = vid_h;
+    portPriv->drw_x = drw_x;
+    portPriv->drw_y = drw_y;
+    portPriv->drw_w = drw_w;
+    portPriv->drw_h = drw_h;
+
+    /* make sure we have the most recent copy of the clientClip */
+    KdXVCopyClip(portPriv, pGC);
+
+    /* To indicate to the DI layer that we were successful */
+    pPort->pDraw = pDraw;
+
+    if (!pScreenPriv->enabled)
+        return Success;
+
+    return (KdXVRegetVideo(portPriv));
+}
+
+static int
+KdXVGetStill(ClientPtr client,
+             DrawablePtr pDraw,
+             XvPortPtr pPort,
+             GCPtr pGC,
+             INT16 vid_x, INT16 vid_y,
+             CARD16 vid_w, CARD16 vid_h,
+             INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+    ScreenPtr pScreen = pDraw->pScreen;
+
+    KdScreenPriv(pScreen);
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    if (pDraw->type != DRAWABLE_WINDOW)
+        return BadAlloc;
+
+    if (!pScreenPriv->enabled)
+        return Success;
+
+    WinBox.x1 = pDraw->x + drw_x;
+    WinBox.y1 = pDraw->y + drw_y;
+    WinBox.x2 = WinBox.x1 + drw_w;
+    WinBox.y2 = WinBox.y1 + drw_h;
+
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionInit(&ClipRegion, NullBox, 1);
+    RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);
+
+    if (portPriv->pDraw) {
+        KdXVRemovePortFromWindow((WindowPtr) (portPriv->pDraw), portPriv);
+    }
+
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto GET_STILL_BAILOUT;
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret = (*portPriv->AdaptorRec->GetStill) (portPriv->screen, pDraw,
+                                             vid_x, vid_y, WinBox.x1, WinBox.y1,
+                                             vid_w, vid_h, drw_w, drw_h,
+                                             &ClipRegion,
+                                             portPriv->DevPriv.ptr);
+
+ GET_STILL_BAILOUT:
+
+    if ((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->screen,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
+}
+
+static int
+KdXVStopVideo(ClientPtr client, XvPortPtr pPort, DrawablePtr pDraw)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+
+    KdScreenPriv(portPriv->screen->pScreen);
+
+    if (pDraw->type != DRAWABLE_WINDOW)
+        return BadAlloc;
+
+    KdXVRemovePortFromWindow((WindowPtr) pDraw, portPriv);
+
+    if (!pScreenPriv->enabled)
+        return Success;
+
+    /* Must free resources. */
+
+    if (portPriv->isOn > XV_OFF) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->screen,
+                                            portPriv->DevPriv.ptr, TRUE);
+        portPriv->isOn = XV_OFF;
+    }
+
+    return Success;
+}
+
+static int
+KdXVSetPortAttribute(ClientPtr client,
+                     XvPortPtr pPort, Atom attribute, INT32 value)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+
+    return ((*portPriv->AdaptorRec->SetPortAttribute) (portPriv->screen,
+                                                       attribute, value,
+                                                       portPriv->DevPriv.ptr));
+}
+
+static int
+KdXVGetPortAttribute(ClientPtr client,
+                     XvPortPtr pPort, Atom attribute, INT32 *p_value)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+
+    return ((*portPriv->AdaptorRec->GetPortAttribute) (portPriv->screen,
+                                                       attribute,
+                                                       (int *) p_value,
+                                                       portPriv->DevPriv.ptr));
+}
+
+static int
+KdXVQueryBestSize(ClientPtr client,
+                  XvPortPtr pPort,
+                  CARD8 motion,
+                  CARD16 vid_w, CARD16 vid_h,
+                  CARD16 drw_w, CARD16 drw_h,
+                  unsigned int *p_w, unsigned int *p_h)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+
+    (*portPriv->AdaptorRec->QueryBestSize) (portPriv->screen,
+                                            (Bool) motion, vid_w, vid_h, drw_w,
+                                            drw_h, p_w, p_h,
+                                            portPriv->DevPriv.ptr);
+
+    return Success;
+}
+
+static int
+KdXVPutImage(ClientPtr client,
+             DrawablePtr pDraw,
+             XvPortPtr pPort,
+             GCPtr pGC,
+             INT16 src_x, INT16 src_y,
+             CARD16 src_w, CARD16 src_h,
+             INT16 drw_x, INT16 drw_y,
+             CARD16 drw_w, CARD16 drw_h,
+             XvImagePtr format,
+             unsigned char *data, Bool sync, CARD16 width, CARD16 height)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+    ScreenPtr pScreen = pDraw->pScreen;
+
+    KdScreenPriv(pScreen);
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    if (pDraw->type != DRAWABLE_WINDOW)
+        return BadAlloc;
+
+    if (!pScreenPriv->enabled)
+        return Success;
+
+    WinBox.x1 = pDraw->x + drw_x;
+    WinBox.y1 = pDraw->y + drw_y;
+    WinBox.x2 = WinBox.x1 + drw_w;
+    WinBox.y2 = WinBox.y1 + drw_h;
+
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionInit(&ClipRegion, NullBox, 1);
+    RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);
+
+    if (portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
+        RegionRec VPReg;
+        BoxRec VPBox;
+
+        VPBox.x1 = 0;
+        VPBox.y1 = 0;
+        VPBox.x2 = pScreen->width;
+        VPBox.y2 = pScreen->height;
+
+        RegionInit(&VPReg, &VPBox, 1);
+        RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
+        RegionUninit(&VPReg);
+    }
+
+    if (portPriv->pDraw) {
+        KdXVRemovePortFromWindow((WindowPtr) (portPriv->pDraw), portPriv);
+    }
+
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto PUT_IMAGE_BAILOUT;
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
+        BoxPtr clipBox = RegionRects(&ClipRegion);
+
+        if ((RegionNumRects(&ClipRegion) != 1) ||
+            (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
+            (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2)) {
+            clippedAway = TRUE;
+            goto PUT_IMAGE_BAILOUT;
+        }
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret = (*portPriv->AdaptorRec->PutImage) (portPriv->screen, pDraw,
+                                             src_x, src_y, WinBox.x1, WinBox.y1,
+                                             src_w, src_h, drw_w, drw_h,
+                                             format->id, data, width, height,
+                                             sync, &ClipRegion,
+                                             portPriv->DevPriv.ptr);
+
+    if ((ret == Success) &&
+        (portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {
+
+        KdXVEnlistPortInWindow((WindowPtr) pDraw, portPriv);
+        portPriv->isOn = XV_ON;
+        portPriv->pDraw = pDraw;
+        portPriv->drw_x = drw_x;
+        portPriv->drw_y = drw_y;
+        portPriv->drw_w = drw_w;
+        portPriv->drw_h = drw_h;
+        portPriv->type = 0;     /* no mask means it's transient and should
+                                   not be reput once it's removed */
+        pPort->pDraw = pDraw;   /* make sure we can get stop requests */
+    }
+
+ PUT_IMAGE_BAILOUT:
+
+    if ((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->screen,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
+}
+
+static int
+KdXVQueryImageAttributes(ClientPtr client,
+                         XvPortPtr pPort,
+                         XvImagePtr format,
+                         CARD16 *width,
+                         CARD16 *height, int *pitches, int *offsets)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+
+    return (*portPriv->AdaptorRec->QueryImageAttributes) (portPriv->screen,
+                                                          format->id, width,
+                                                          height, pitches,
+                                                          offsets);
+}
+
+/****************  Common video manipulation functions *******************/
+
+void
+KdXVCopyPackedData(KdScreenInfo * screen, CARD8 *src, CARD8 *dst, int randr,
+                   int srcPitch, int dstPitch, int srcW, int srcH, int top,
+                   int left, int h, int w)
+{
+    int srcDown = srcPitch, srcRight = 2, srcNext;
+    int p;
+
+    switch (randr & RR_Rotate_All) {
+    case RR_Rotate_0:
+        srcDown = srcPitch;
+        srcRight = 2;
+        break;
+    case RR_Rotate_90:
+        src += (srcH - 1) * 2;
+        srcDown = -2;
+        srcRight = srcPitch;
+        break;
+    case RR_Rotate_180:
+        src += srcPitch * (srcH - 1) + (srcW - 1) * 2;
+        srcDown = -srcPitch;
+        srcRight = -2;
+        break;
+    case RR_Rotate_270:
+        src += srcPitch * (srcW - 1);
+        srcDown = 2;
+        srcRight = -srcPitch;
+        break;
+    }
+
+    src = src + top * srcDown + left * srcRight;
+
+    w >>= 1;
+    /* srcRight >>= 1; */
+    srcNext = srcRight >> 1;
+    while (h--) {
+        CARD16 *s = (CARD16 *) src;
+        CARD32 *d = (CARD32 *) dst;
+
+        p = w;
+        while (p--) {
+            *d++ = s[0] | (s[srcNext] << 16);
+            s += srcRight;
+        }
+        src += srcPitch;
+        dst += dstPitch;
+    }
+}
+
+void
+KdXVCopyPlanarData(KdScreenInfo * screen, CARD8 *src, CARD8 *dst, int randr,
+                   int srcPitch, int srcPitch2, int dstPitch, int srcW,
+                   int srcH, int height, int top, int left, int h, int w,
+                   int id)
+{
+    int i, j;
+    CARD8 *src1, *src2, *src3, *dst1;
+    int srcDown = srcPitch, srcDown2 = srcPitch2;
+    int srcRight = 2, srcRight2 = 1, srcNext = 1;
+
+    /* compute source data pointers */
+    src1 = src;
+    src2 = src1 + height * srcPitch;
+    src3 = src2 + (height >> 1) * srcPitch2;
+    switch (randr & RR_Rotate_All) {
+    case RR_Rotate_0:
+        srcDown = srcPitch;
+        srcDown2 = srcPitch2;
+        srcRight = 2;
+        srcRight2 = 1;
+        srcNext = 1;
+        break;
+    case RR_Rotate_90:
+        src1 = src1 + srcH - 1;
+        src2 = src2 + (srcH >> 1) - 1;
+        src3 = src3 + (srcH >> 1) - 1;
+        srcDown = -1;
+        srcDown2 = -1;
+        srcRight = srcPitch * 2;
+        srcRight2 = srcPitch2;
+        srcNext = srcPitch;
+        break;
+    case RR_Rotate_180:
+        src1 = src1 + srcPitch * (srcH - 1) + (srcW - 1);
+        src2 = src2 + srcPitch2 * ((srcH >> 1) - 1) + ((srcW >> 1) - 1);
+        src3 = src3 + srcPitch2 * ((srcH >> 1) - 1) + ((srcW >> 1) - 1);
+        srcDown = -srcPitch;
+        srcDown2 = -srcPitch2;
+        srcRight = -2;
+        srcRight2 = -1;
+        srcNext = -1;
+        break;
+    case RR_Rotate_270:
+        src1 = src1 + srcPitch * (srcW - 1);
+        src2 = src2 + srcPitch2 * ((srcW >> 1) - 1);
+        src3 = src3 + srcPitch2 * ((srcW >> 1) - 1);
+        srcDown = 1;
+        srcDown2 = 1;
+        srcRight = -srcPitch * 2;
+        srcRight2 = -srcPitch2;
+        srcNext = -srcPitch;
+        break;
+    }
+
+    /* adjust for origin */
+    src1 += top * srcDown + left * srcNext;
+    src2 += (top >> 1) * srcDown2 + (left >> 1) * srcRight2;
+    src3 += (top >> 1) * srcDown2 + (left >> 1) * srcRight2;
+
+    if (id == FOURCC_I420) {
+        CARD8 *srct = src2;
+
+        src2 = src3;
+        src3 = srct;
+    }
+
+    dst1 = dst;
+
+    w >>= 1;
+    for (j = 0; j < h; j++) {
+        CARD32 *dst = (CARD32 *) dst1;
+        CARD8 *s1l = src1;
+        CARD8 *s1r = src1 + srcNext;
+        CARD8 *s2 = src2;
+        CARD8 *s3 = src3;
+
+        for (i = 0; i < w; i++) {
+            *dst++ = *s1l | (*s1r << 16) | (*s3 << 8) | (*s2 << 24);
+            s1l += srcRight;
+            s1r += srcRight;
+            s2 += srcRight2;
+            s3 += srcRight2;
+        }
+        src1 += srcDown;
+        dst1 += dstPitch;
+        if (j & 1) {
+            src2 += srcDown2;
+            src3 += srcDown2;
+        }
+    }
+}
+
+void
+KXVPaintRegion(DrawablePtr pDraw, RegionPtr pRgn, Pixel fg)
+{
+    GCPtr pGC;
+    ChangeGCVal val[2];
+    xRectangle *rects, *r;
+    BoxPtr pBox = RegionRects(pRgn);
+    int nBox = RegionNumRects(pRgn);
+
+    rects = malloc(nBox * sizeof(xRectangle));
+    if (!rects)
+        goto bail0;
+    r = rects;
+    while (nBox--) {
+        r->x = pBox->x1 - pDraw->x;
+        r->y = pBox->y1 - pDraw->y;
+        r->width = pBox->x2 - pBox->x1;
+        r->height = pBox->y2 - pBox->y1;
+        r++;
+        pBox++;
+    }
+
+    pGC = GetScratchGC(pDraw->depth, pDraw->pScreen);
+    if (!pGC)
+        goto bail1;
+
+    val[0].val = fg;
+    val[1].val = IncludeInferiors;
+    ChangeGC(NullClient, pGC, GCForeground | GCSubwindowMode, val);
+
+    ValidateGC(pDraw, pGC);
+
+    (*pGC->ops->PolyFillRect) (pDraw, pGC, RegionNumRects(pRgn), rects);
+
+    FreeScratchGC(pGC);
+ bail1:
+    free(rects);
+ bail0:
+    ;
+}
diff --git a/xorg-server/hw/kdrive/src/kxv.h b/xorg-server/hw/kdrive/src/kxv.h
index 21a295be3..29118bc96 100644
--- a/xorg-server/hw/kdrive/src/kxv.h
+++ b/xorg-server/hw/kdrive/src/kxv.h
@@ -57,80 +57,86 @@ of the copyright holder.
 #define VIDEO_CLIP_TO_VIEWPORT			0x00000010
 
 typedef struct {
-  int id;
-  int type;
-  int byte_order;
-  unsigned char guid[16];
-  int bits_per_pixel;
-  int format;
-  int num_planes;
-
-  /* for RGB formats only */
-  int depth;
-  unsigned int red_mask;
-  unsigned int green_mask;
-  unsigned int blue_mask;
-
-  /* for YUV formats only */
-  unsigned int y_sample_bits;
-  unsigned int u_sample_bits;
-  unsigned int v_sample_bits;
-  unsigned int horz_y_period;
-  unsigned int horz_u_period;
-  unsigned int horz_v_period;
-  unsigned int vert_y_period;
-  unsigned int vert_u_period;
-  unsigned int vert_v_period;
-  char component_order[32];
-  int scanline_order;
+    int id;
+    int type;
+    int byte_order;
+    unsigned char guid[16];
+    int bits_per_pixel;
+    int format;
+    int num_planes;
+
+    /* for RGB formats only */
+    int depth;
+    unsigned int red_mask;
+    unsigned int green_mask;
+    unsigned int blue_mask;
+
+    /* for YUV formats only */
+    unsigned int y_sample_bits;
+    unsigned int u_sample_bits;
+    unsigned int v_sample_bits;
+    unsigned int horz_y_period;
+    unsigned int horz_u_period;
+    unsigned int horz_v_period;
+    unsigned int vert_y_period;
+    unsigned int vert_u_period;
+    unsigned int vert_v_period;
+    char component_order[32];
+    int scanline_order;
 } KdImageRec, *KdImagePtr;
 
-
 typedef struct {
-  KdScreenInfo * screen;
-  int id;
-  unsigned short width, height;
-  int *pitches; /* bytes */
-  int *offsets; /* in bytes from start of framebuffer */
-  DevUnion devPrivate;
+    KdScreenInfo *screen;
+    int id;
+    unsigned short width, height;
+    int *pitches;               /* bytes */
+    int *offsets;               /* in bytes from start of framebuffer */
+    DevUnion devPrivate;
 } KdSurfaceRec, *KdSurfacePtr;
 
-
-typedef int (* PutVideoFuncPtr)( KdScreenInfo * screen, DrawablePtr pDraw,
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data );
-typedef int (* PutStillFuncPtr)( KdScreenInfo * screen,  DrawablePtr pDraw,
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data );
-typedef int (* GetVideoFuncPtr)( KdScreenInfo * screen,  DrawablePtr pDraw,
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data );
-typedef int (* GetStillFuncPtr)( KdScreenInfo * screen,  DrawablePtr pDraw,
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data );
-typedef void (* StopVideoFuncPtr)(KdScreenInfo * screen, pointer data, Bool Exit);
-typedef int (* SetPortAttributeFuncPtr)(KdScreenInfo * screen, Atom attribute,
-	int value, pointer data);
-typedef int (* GetPortAttributeFuncPtr)(KdScreenInfo * screen, Atom attribute,
-	int *value, pointer data);
-typedef void (* QueryBestSizeFuncPtr)(KdScreenInfo * screen, Bool motion,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	unsigned int *p_w, unsigned int *p_h, pointer data);
-typedef int (* PutImageFuncPtr)( KdScreenInfo * screen,  DrawablePtr pDraw,
-	short src_x, short src_y, short drw_x, short drw_y,
-	short src_w, short src_h, short drw_w, short drw_h,
-	int image, unsigned char* buf, short width, short height, Bool Sync,
-	RegionPtr clipBoxes, pointer data );
-typedef int (* ReputImageFuncPtr)( KdScreenInfo * screen, DrawablePtr pDraw,
-				  short drw_x, short drw_y,
-				  RegionPtr clipBoxes, pointer data );
-typedef int (*QueryImageAttributesFuncPtr)(KdScreenInfo * screen,
-	int image, unsigned short *width, unsigned short *height,
-	int *pitches, int *offsets);
+typedef int (*PutVideoFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
+                                short vid_x, short vid_y, short drw_x,
+                                short drw_y, short vid_w, short vid_h,
+                                short drw_w, short drw_h, RegionPtr clipBoxes,
+                                pointer data);
+typedef int (*PutStillFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
+                                short vid_x, short vid_y, short drw_x,
+                                short drw_y, short vid_w, short vid_h,
+                                short drw_w, short drw_h, RegionPtr clipBoxes,
+                                pointer data);
+typedef int (*GetVideoFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
+                                short vid_x, short vid_y, short drw_x,
+                                short drw_y, short vid_w, short vid_h,
+                                short drw_w, short drw_h, RegionPtr clipBoxes,
+                                pointer data);
+typedef int (*GetStillFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
+                                short vid_x, short vid_y, short drw_x,
+                                short drw_y, short vid_w, short vid_h,
+                                short drw_w, short drw_h, RegionPtr clipBoxes,
+                                pointer data);
+typedef void (*StopVideoFuncPtr) (KdScreenInfo * screen, pointer data,
+                                  Bool Exit);
+typedef int (*SetPortAttributeFuncPtr) (KdScreenInfo * screen, Atom attribute,
+                                        int value, pointer data);
+typedef int (*GetPortAttributeFuncPtr) (KdScreenInfo * screen, Atom attribute,
+                                        int *value, pointer data);
+typedef void (*QueryBestSizeFuncPtr) (KdScreenInfo * screen, Bool motion,
+                                      short vid_w, short vid_h, short drw_w,
+                                      short drw_h, unsigned int *p_w,
+                                      unsigned int *p_h, pointer data);
+typedef int (*PutImageFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
+                                short src_x, short src_y, short drw_x,
+                                short drw_y, short src_w, short src_h,
+                                short drw_w, short drw_h, int image,
+                                unsigned char *buf, short width, short height,
+                                Bool Sync, RegionPtr clipBoxes, pointer data);
+typedef int (*ReputImageFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
+                                  short drw_x, short drw_y, RegionPtr clipBoxes,
+                                  pointer data);
+typedef int (*QueryImageAttributesFuncPtr) (KdScreenInfo * screen, int image,
+                                            unsigned short *width,
+                                            unsigned short *height,
+                                            int *pitches, int *offsets);
 
 typedef enum {
     XV_OFF,
@@ -141,84 +147,78 @@ typedef enum {
 /*** this is what the driver needs to fill out ***/
 
 typedef struct {
-  int id;
-  char *name;
-  unsigned short width, height;
-  XvRationalRec rate;
+    int id;
+    char *name;
+    unsigned short width, height;
+    XvRationalRec rate;
 } KdVideoEncodingRec, *KdVideoEncodingPtr;
 
 typedef struct {
-  char 	depth;
-  short class;
+    char depth;
+    short class;
 } KdVideoFormatRec, *KdVideoFormatPtr;
 
 typedef struct {
-  int   flags;
-  int   min_value;
-  int   max_value;
-  char  *name;
+    int flags;
+    int min_value;
+    int max_value;
+    char *name;
 } KdAttributeRec, *KdAttributePtr;
 
 typedef struct {
-  unsigned int type;
-  int flags;
-  char *name;
-  int nEncodings;
-  KdVideoEncodingPtr pEncodings;
-  int nFormats;
-  KdVideoFormatPtr pFormats;
-  int nPorts;
-  DevUnion *pPortPrivates;
-  int nAttributes;
-  KdAttributePtr pAttributes;
-  int nImages;
-  KdImagePtr pImages;
-  PutVideoFuncPtr PutVideo;
-  PutStillFuncPtr PutStill;
-  GetVideoFuncPtr GetVideo;
-  GetStillFuncPtr GetStill;
-  StopVideoFuncPtr StopVideo;
-  SetPortAttributeFuncPtr SetPortAttribute;
-  GetPortAttributeFuncPtr GetPortAttribute;
-  QueryBestSizeFuncPtr QueryBestSize;
-  PutImageFuncPtr PutImage;
-  ReputImageFuncPtr ReputImage;
-  QueryImageAttributesFuncPtr QueryImageAttributes;
+    unsigned int type;
+    int flags;
+    char *name;
+    int nEncodings;
+    KdVideoEncodingPtr pEncodings;
+    int nFormats;
+    KdVideoFormatPtr pFormats;
+    int nPorts;
+    DevUnion *pPortPrivates;
+    int nAttributes;
+    KdAttributePtr pAttributes;
+    int nImages;
+    KdImagePtr pImages;
+    PutVideoFuncPtr PutVideo;
+    PutStillFuncPtr PutStill;
+    GetVideoFuncPtr GetVideo;
+    GetStillFuncPtr GetStill;
+    StopVideoFuncPtr StopVideo;
+    SetPortAttributeFuncPtr SetPortAttribute;
+    GetPortAttributeFuncPtr GetPortAttribute;
+    QueryBestSizeFuncPtr QueryBestSize;
+    PutImageFuncPtr PutImage;
+    ReputImageFuncPtr ReputImage;
+    QueryImageAttributesFuncPtr QueryImageAttributes;
 } KdVideoAdaptorRec, *KdVideoAdaptorPtr;
 
 Bool
-KdXVScreenInit(
-   ScreenPtr pScreen,
-   KdVideoAdaptorPtr 	*Adaptors,
-   int num
-);
+ KdXVScreenInit(ScreenPtr pScreen, KdVideoAdaptorPtr * Adaptors, int num);
 
-typedef int (* KdXVInitGenericAdaptorPtr)(KdScreenInfo * screen,
-	KdVideoAdaptorPtr **Adaptors);
+typedef int (*KdXVInitGenericAdaptorPtr) (KdScreenInfo * screen,
+                                          KdVideoAdaptorPtr ** Adaptors);
 
 int
-KdXVRegisterGenericAdaptorDriver(
-    KdXVInitGenericAdaptorPtr InitFunc
-);
+ KdXVRegisterGenericAdaptorDriver(KdXVInitGenericAdaptorPtr InitFunc);
 
 int
-KdXVListGenericAdaptors(
-    KdScreenInfo *          screen,
-    KdVideoAdaptorPtr  **Adaptors
-);
+ KdXVListGenericAdaptors(KdScreenInfo * screen, KdVideoAdaptorPtr ** Adaptors);
 
 void
-KdXVCopyPackedData(KdScreenInfo *screen, CARD8 *src, CARD8 *dst, int randr,
-   int srcPitch, int dstPitch, int srcW, int srcH, int top, int left,
-   int h, int w);
+
+KdXVCopyPackedData(KdScreenInfo * screen, CARD8 *src, CARD8 *dst, int randr,
+                   int srcPitch, int dstPitch, int srcW, int srcH, int top,
+                   int left, int h, int w);
 
 void
-KdXVCopyPlanarData(KdScreenInfo *screen, CARD8 *src, CARD8 *dst, int randr,
-   int srcPitch, int srcPitch2, int dstPitch, int srcW, int srcH, int height,
-   int top, int left, int h, int w, int id);
+
+KdXVCopyPlanarData(KdScreenInfo * screen, CARD8 *src, CARD8 *dst, int randr,
+                   int srcPitch, int srcPitch2, int dstPitch, int srcW,
+                   int srcH, int height, int top, int left, int h, int w,
+                   int id);
 
 void
-KXVPaintRegion (DrawablePtr pDraw, RegionPtr pRgn, Pixel fg);
+ KXVPaintRegion(DrawablePtr pDraw, RegionPtr pRgn, Pixel fg);
 
 KdVideoAdaptorPtr KdXVAllocateVideoAdaptorRec(KdScreenInfo * screen);
 
@@ -230,50 +230,48 @@ void KdXVDisable(ScreenPtr);
 
 /*** These are DDX layer privates ***/
 
-
 typedef struct {
-   CreateWindowProcPtr		CreateWindow;
-   DestroyWindowProcPtr		DestroyWindow;
-   ClipNotifyProcPtr		ClipNotify;
-   WindowExposuresProcPtr	WindowExposures;
+    CreateWindowProcPtr CreateWindow;
+    DestroyWindowProcPtr DestroyWindow;
+    ClipNotifyProcPtr ClipNotify;
+    WindowExposuresProcPtr WindowExposures;
 } KdXVScreenRec, *KdXVScreenPtr;
 
 typedef struct {
-  int flags;
-  PutVideoFuncPtr PutVideo;
-  PutStillFuncPtr PutStill;
-  GetVideoFuncPtr GetVideo;
-  GetStillFuncPtr GetStill;
-  StopVideoFuncPtr StopVideo;
-  SetPortAttributeFuncPtr SetPortAttribute;
-  GetPortAttributeFuncPtr GetPortAttribute;
-  QueryBestSizeFuncPtr QueryBestSize;
-  PutImageFuncPtr PutImage;
-  ReputImageFuncPtr ReputImage;
-  QueryImageAttributesFuncPtr QueryImageAttributes;
+    int flags;
+    PutVideoFuncPtr PutVideo;
+    PutStillFuncPtr PutStill;
+    GetVideoFuncPtr GetVideo;
+    GetStillFuncPtr GetStill;
+    StopVideoFuncPtr StopVideo;
+    SetPortAttributeFuncPtr SetPortAttribute;
+    GetPortAttributeFuncPtr GetPortAttribute;
+    QueryBestSizeFuncPtr QueryBestSize;
+    PutImageFuncPtr PutImage;
+    ReputImageFuncPtr ReputImage;
+    QueryImageAttributesFuncPtr QueryImageAttributes;
 } XvAdaptorRecPrivate, *XvAdaptorRecPrivatePtr;
 
 typedef struct {
-   KdScreenInfo * screen;
-   DrawablePtr pDraw;
-   unsigned char type;
-   unsigned int subWindowMode;
-   DDXPointRec clipOrg;
-   RegionPtr clientClip;
-   RegionPtr pCompositeClip;
-   Bool FreeCompositeClip;
-   XvAdaptorRecPrivatePtr AdaptorRec;
-   XvStatus isOn;
-   Bool moved;
-   int vid_x, vid_y, vid_w, vid_h;
-   int drw_x, drw_y, drw_w, drw_h;
-   DevUnion DevPriv;
+    KdScreenInfo *screen;
+    DrawablePtr pDraw;
+    unsigned char type;
+    unsigned int subWindowMode;
+    DDXPointRec clipOrg;
+    RegionPtr clientClip;
+    RegionPtr pCompositeClip;
+    Bool FreeCompositeClip;
+    XvAdaptorRecPrivatePtr AdaptorRec;
+    XvStatus isOn;
+    Bool moved;
+    int vid_x, vid_y, vid_w, vid_h;
+    int drw_x, drw_y, drw_w, drw_h;
+    DevUnion DevPriv;
 } XvPortRecPrivate, *XvPortRecPrivatePtr;
 
-typedef struct _KdXVWindowRec{
-   XvPortRecPrivatePtr PortRec;
-   struct _KdXVWindowRec *next;
+typedef struct _KdXVWindowRec {
+    XvPortRecPrivatePtr PortRec;
+    struct _KdXVWindowRec *next;
 } KdXVWindowRec, *KdXVWindowPtr;
 
-#endif  /* _XVDIX_H_ */
-
+#endif                          /* _XVDIX_H_ */
diff --git a/xorg-server/hw/vfb/InitInput.c b/xorg-server/hw/vfb/InitInput.c
index 8836bbd7f..9d0fd9866 100644
--- a/xorg-server/hw/vfb/InitInput.c
+++ b/xorg-server/hw/vfb/InitInput.c
@@ -56,7 +56,8 @@ ProcessInputEvents(void)
     mieqProcessInputEvents();
 }
 
-void DDXRingBell(int volume, int pitch, int duration)
+void
+DDXRingBell(int volume, int pitch, int duration)
 {
 }
 
@@ -66,21 +67,20 @@ void DDXRingBell(int volume, int pitch, int duration)
 static int
 vfbKeybdProc(DeviceIntPtr pDevice, int onoff)
 {
-    DevicePtr pDev = (DevicePtr)pDevice;
+    DevicePtr pDev = (DevicePtr) pDevice;
 
-    switch (onoff)
-    {
+    switch (onoff) {
     case DEVICE_INIT:
-	InitKeyboardDeviceStruct(pDevice, NULL, NULL, NULL);
+        InitKeyboardDeviceStruct(pDevice, NULL, NULL, NULL);
         break;
     case DEVICE_ON:
-	pDev->on = TRUE;
-	break;
+        pDev->on = TRUE;
+        break;
     case DEVICE_OFF:
-	pDev->on = FALSE;
-	break;
+        pDev->on = FALSE;
+        break;
     case DEVICE_CLOSE:
-	break;
+        break;
     }
     return Success;
 }
@@ -92,38 +92,38 @@ vfbMouseProc(DeviceIntPtr pDevice, int onoff)
 #define NAXES 2
 
     BYTE map[NBUTTONS + 1];
-    DevicePtr pDev = (DevicePtr)pDevice;
-    Atom btn_labels[NBUTTONS] = {0};
-    Atom axes_labels[NAXES] = {0};
+    DevicePtr pDev = (DevicePtr) pDevice;
+    Atom btn_labels[NBUTTONS] = { 0 };
+    Atom axes_labels[NAXES] = { 0 };
 
-    switch (onoff)
-    {
+    switch (onoff) {
     case DEVICE_INIT:
-	    map[1] = 1;
-	    map[2] = 2;
-	    map[3] = 3;
+        map[1] = 1;
+        map[2] = 2;
+        map[3] = 3;
 
-            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
-            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
-            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+        btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+        btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+        btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
 
-            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
-            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+        axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+        axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
 
-	    InitPointerDeviceStruct(pDev, map, NBUTTONS, btn_labels,
-		(PtrCtrlProcPtr)NoopDDA, GetMotionHistorySize(), NAXES, axes_labels);
-	    break;
+        InitPointerDeviceStruct(pDev, map, NBUTTONS, btn_labels,
+                                (PtrCtrlProcPtr) NoopDDA,
+                                GetMotionHistorySize(), NAXES, axes_labels);
+        break;
 
     case DEVICE_ON:
-	pDev->on = TRUE;
+        pDev->on = TRUE;
         break;
 
     case DEVICE_OFF:
-	pDev->on = FALSE;
-	break;
+        pDev->on = FALSE;
+        break;
 
     case DEVICE_CLOSE:
-	break;
+        break;
     }
     return Success;
 
@@ -136,17 +136,18 @@ InitInput(int argc, char *argv[])
 {
     DeviceIntPtr p, k;
     Atom xiclass;
+
     p = AddInputDevice(serverClient, vfbMouseProc, TRUE);
     k = AddInputDevice(serverClient, vfbKeybdProc, TRUE);
     xiclass = MakeAtom(XI_MOUSE, sizeof(XI_MOUSE) - 1, TRUE);
     AssignTypeAndName(p, xiclass, "Xvfb mouse");
     xiclass = MakeAtom(XI_KEYBOARD, sizeof(XI_KEYBOARD) - 1, TRUE);
     AssignTypeAndName(k, xiclass, "Xvfb keyboard");
-    (void)mieqInit();
+    (void) mieqInit();
 }
 
 void
-CloseInput (void)
+CloseInput(void)
 {
     mieqFini();
 }
diff --git a/xorg-server/hw/vfb/InitOutput.c b/xorg-server/hw/vfb/InitOutput.c
index e1af5a471..2d679a559 100644
--- a/xorg-server/hw/vfb/InitOutput.c
+++ b/xorg-server/hw/vfb/InitOutput.c
@@ -53,7 +53,7 @@ from The Open Group.
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
-#endif /* HAVE_MMAP */
+#endif                          /* HAVE_MMAP */
 #include <sys/stat.h>
 #include <errno.h>
 #ifndef WIN32
@@ -63,7 +63,7 @@ from The Open Group.
 #ifdef HAS_SHM
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#endif /* HAS_SHM */
+#endif                          /* HAS_SHM */
 #include "dix.h"
 #include "miline.h"
 
@@ -75,8 +75,7 @@ from The Open Group.
 #define VFB_DEFAULT_LINEBIAS      0
 #define XWD_WINDOW_NAME_LEN      60
 
-typedef struct
-{
+typedef struct {
     int width;
     int paddedBytesWidth;
     int paddedWidth;
@@ -105,15 +104,18 @@ typedef struct
 
 static int vfbNumScreens;
 static vfbScreenInfo *vfbScreens;
+
 static vfbScreenInfo defaultScreenInfo = {
-    .width  = VFB_DEFAULT_WIDTH,
+    .width = VFB_DEFAULT_WIDTH,
     .height = VFB_DEFAULT_HEIGHT,
-    .depth  = VFB_DEFAULT_DEPTH,
+    .depth = VFB_DEFAULT_DEPTH,
     .blackPixel = VFB_DEFAULT_BLACKPIXEL,
     .whitePixel = VFB_DEFAULT_WHITEPIXEL,
     .lineBias = VFB_DEFAULT_LINEBIAS,
 };
+
 static Bool vfbPixmapDepths[33];
+
 #ifdef HAVE_MMAP
 static char *pfbdir = NULL;
 #endif
@@ -130,23 +132,27 @@ static Bool Render = TRUE;
     if (needswap) { CARD32 _s = _src; cpswapl(_s, _dst); } \
     else _dst = _src;
 
-
 static void
 vfbInitializePixmapDepths(void)
 {
     int i;
-    vfbPixmapDepths[1] = TRUE; /* always need bitmaps */
+
+    vfbPixmapDepths[1] = TRUE;  /* always need bitmaps */
     for (i = 2; i <= 32; i++)
-	vfbPixmapDepths[i] = FALSE;
+        vfbPixmapDepths[i] = FALSE;
 }
 
 static int
 vfbBitsPerPixel(int depth)
 {
-    if (depth == 1) return 1;
-    else if (depth <= 8) return 8;
-    else if (depth <= 16) return 16;
-    else return 32;
+    if (depth == 1)
+        return 1;
+    else if (depth <= 8)
+        return 8;
+    else if (depth <= 16)
+        return 16;
+    else
+        return 32;
 }
 
 void
@@ -156,47 +162,41 @@ ddxGiveUp(enum ExitCode error)
 
     /* clean up the framebuffers */
 
-    switch (fbmemtype)
-    {
+    switch (fbmemtype) {
 #ifdef HAVE_MMAP
-    case MMAPPED_FILE_FB: 
-	for (i = 0; i < vfbNumScreens; i++)
-	{
-	    if (-1 == unlink(vfbScreens[i].mmap_file))
-	    {
-		perror("unlink");
-		ErrorF("unlink %s failed, %s",
-		       vfbScreens[i].mmap_file, strerror(errno));
-	    }
-	}
-	break;
-#else /* HAVE_MMAP */
+    case MMAPPED_FILE_FB:
+        for (i = 0; i < vfbNumScreens; i++) {
+            if (-1 == unlink(vfbScreens[i].mmap_file)) {
+                perror("unlink");
+                ErrorF("unlink %s failed, %s",
+                       vfbScreens[i].mmap_file, strerror(errno));
+            }
+        }
+        break;
+#else                           /* HAVE_MMAP */
     case MMAPPED_FILE_FB:
         break;
-#endif /* HAVE_MMAP */
-	
+#endif                          /* HAVE_MMAP */
+
 #ifdef HAS_SHM
     case SHARED_MEMORY_FB:
-	for (i = 0; i < vfbNumScreens; i++)
-	{
-	    if (-1 == shmdt((char *)vfbScreens[i].pXWDHeader))
-	    {
-		perror("shmdt");
-		ErrorF("shmdt failed, %s", strerror(errno));
-	    }
-	}
-	break;
-#else /* HAS_SHM */
+        for (i = 0; i < vfbNumScreens; i++) {
+            if (-1 == shmdt((char *) vfbScreens[i].pXWDHeader)) {
+                perror("shmdt");
+                ErrorF("shmdt failed, %s", strerror(errno));
+            }
+        }
+        break;
+#else                           /* HAS_SHM */
     case SHARED_MEMORY_FB:
         break;
-#endif /* HAS_SHM */
-	
+#endif                          /* HAS_SHM */
+
     case NORMAL_MEMORY_FB:
-	for (i = 0; i < vfbNumScreens; i++)
-	{
-	    free(vfbScreens[i].pXWDHeader);
-	}
-	break;
+        for (i = 0; i < vfbNumScreens; i++) {
+            free(vfbScreens[i].pXWDHeader);
+        }
+        break;
     }
 }
 
@@ -224,7 +224,8 @@ OsVendorFatalError(void)
 }
 
 #if defined(DDXBEFORERESET)
-void ddxBeforeReset(void)
+void
+ddxBeforeReset(void)
 {
     return;
 }
@@ -236,13 +237,14 @@ ddxUseMsg(void)
     ErrorF("-screen scrn WxHxD     set screen's width, height, depth\n");
     ErrorF("-pixdepths list-of-int support given pixmap depths\n");
     ErrorF("+/-render		   turn on/off RENDER extension support"
-	   "(default on)\n");
+           "(default on)\n");
     ErrorF("-linebias n            adjust thin line pixelization\n");
     ErrorF("-blackpixel n          pixel value for black\n");
     ErrorF("-whitepixel n          pixel value for white\n");
 
 #ifdef HAVE_MMAP
-    ErrorF("-fbdir directory       put framebuffers in mmap'ed files in directory\n");
+    ErrorF
+        ("-fbdir directory       put framebuffers in mmap'ed files in directory\n");
 #endif
 
 #ifdef HAS_SHM
@@ -257,16 +259,15 @@ ddxProcessArgument(int argc, char *argv[], int i)
     static int lastScreen = -1;
     vfbScreenInfo *currentScreen;
 
-    if (firstTime)
-    {
-	vfbInitializePixmapDepths();
+    if (firstTime) {
+        vfbInitializePixmapDepths();
         firstTime = FALSE;
     }
 
     if (lastScreen == -1)
-	currentScreen = &defaultScreenInfo;
+        currentScreen = &defaultScreenInfo;
     else
-	currentScreen = &vfbScreens[lastScreen];
+        currentScreen = &vfbScreens[lastScreen];
 
 #define CHECK_FOR_REQUIRED_ARGUMENTS(num) \
     if (((i + num) >= argc) || (!argv[i + num])) {                      \
@@ -274,117 +275,105 @@ ddxProcessArgument(int argc, char *argv[], int i)
       UseMsg();                                                         \
       FatalError("Required argument to %s not specified\n", argv[i]);   \
     }
-    
-    if (strcmp (argv[i], "-screen") == 0)	/* -screen n WxHxD */
-    {
-	int screenNum;
-	CHECK_FOR_REQUIRED_ARGUMENTS(2);
-	screenNum = atoi(argv[i+1]);
-	/* The protocol only has a CARD8 for number of screens in the
-	   connection setup block, so don't allow more than that. */
-	if ((screenNum < 0) || (screenNum >= 255))
-	{
-	    ErrorF("Invalid screen number %d\n", screenNum);
-	    UseMsg();
-	    FatalError("Invalid screen number %d passed to -screen\n",
-		       screenNum);
-	}
-
-	if (vfbNumScreens <= screenNum)
-	{
-	    vfbScreens = realloc(vfbScreens, sizeof(*vfbScreens) * (screenNum + 1));
-	    if (!vfbScreens)
-		FatalError("Not enough memory for screen %d\n", screenNum);
-	    for (; vfbNumScreens <= screenNum; ++vfbNumScreens)
-		vfbScreens[vfbNumScreens] = defaultScreenInfo;
-	}
-
-	if (3 != sscanf(argv[i+2], "%dx%dx%d",
-			&vfbScreens[screenNum].width,
-			&vfbScreens[screenNum].height,
-			&vfbScreens[screenNum].depth))
-	{
-	    ErrorF("Invalid screen configuration %s\n", argv[i+2]);
-	    UseMsg();
-	    FatalError("Invalid screen configuration %s for -screen %d\n",
-		   argv[i+2], screenNum);
-	}
-
-	lastScreen = screenNum;
-	return 3;
-    }
-
-    if (strcmp (argv[i], "-pixdepths") == 0)	/* -pixdepths list-of-depth */
-    {
-	int depth, ret = 1;
-
-	CHECK_FOR_REQUIRED_ARGUMENTS(1);
-	while ((++i < argc) && (depth = atoi(argv[i])) != 0)
-	{
-	    if (depth < 0 || depth > 32)
-	    {
-		ErrorF("Invalid pixmap depth %d\n", depth);
-		UseMsg();
-		FatalError("Invalid pixmap depth %d passed to -pixdepths\n",
-			   depth);
-	    }
-	    vfbPixmapDepths[depth] = TRUE;
-	    ret++;
-	}
-	return ret;
-    }
-
-    if (strcmp (argv[i], "+render") == 0)	/* +render */
-    {
-	Render = TRUE;
-	return 1;
-    }
-
-    if (strcmp (argv[i], "-render") == 0)	/* -render */
-    {
-	Render = FALSE;
+
+    if (strcmp(argv[i], "-screen") == 0) {      /* -screen n WxHxD */
+        int screenNum;
+
+        CHECK_FOR_REQUIRED_ARGUMENTS(2);
+        screenNum = atoi(argv[i + 1]);
+        /* The protocol only has a CARD8 for number of screens in the
+           connection setup block, so don't allow more than that. */
+        if ((screenNum < 0) || (screenNum >= 255)) {
+            ErrorF("Invalid screen number %d\n", screenNum);
+            UseMsg();
+            FatalError("Invalid screen number %d passed to -screen\n",
+                       screenNum);
+        }
+
+        if (vfbNumScreens <= screenNum) {
+            vfbScreens =
+                realloc(vfbScreens, sizeof(*vfbScreens) * (screenNum + 1));
+            if (!vfbScreens)
+                FatalError("Not enough memory for screen %d\n", screenNum);
+            for (; vfbNumScreens <= screenNum; ++vfbNumScreens)
+                vfbScreens[vfbNumScreens] = defaultScreenInfo;
+        }
+
+        if (3 != sscanf(argv[i + 2], "%dx%dx%d",
+                        &vfbScreens[screenNum].width,
+                        &vfbScreens[screenNum].height,
+                        &vfbScreens[screenNum].depth)) {
+            ErrorF("Invalid screen configuration %s\n", argv[i + 2]);
+            UseMsg();
+            FatalError("Invalid screen configuration %s for -screen %d\n",
+                       argv[i + 2], screenNum);
+        }
+
+        lastScreen = screenNum;
+        return 3;
+    }
+
+    if (strcmp(argv[i], "-pixdepths") == 0) {   /* -pixdepths list-of-depth */
+        int depth, ret = 1;
+
+        CHECK_FOR_REQUIRED_ARGUMENTS(1);
+        while ((++i < argc) && (depth = atoi(argv[i])) != 0) {
+            if (depth < 0 || depth > 32) {
+                ErrorF("Invalid pixmap depth %d\n", depth);
+                UseMsg();
+                FatalError("Invalid pixmap depth %d passed to -pixdepths\n",
+                           depth);
+            }
+            vfbPixmapDepths[depth] = TRUE;
+            ret++;
+        }
+        return ret;
+    }
+
+    if (strcmp(argv[i], "+render") == 0) {      /* +render */
+        Render = TRUE;
+        return 1;
+    }
+
+    if (strcmp(argv[i], "-render") == 0) {      /* -render */
+        Render = FALSE;
 #ifdef COMPOSITE
-	noCompositeExtension = TRUE;
+        noCompositeExtension = TRUE;
 #endif
-	return 1;
+        return 1;
     }
 
-    if (strcmp (argv[i], "-blackpixel") == 0)	/* -blackpixel n */
-    {
-	CHECK_FOR_REQUIRED_ARGUMENTS(1);
-	currentScreen->blackPixel = atoi(argv[++i]);
-	return 2;
+    if (strcmp(argv[i], "-blackpixel") == 0) {  /* -blackpixel n */
+        CHECK_FOR_REQUIRED_ARGUMENTS(1);
+        currentScreen->blackPixel = atoi(argv[++i]);
+        return 2;
     }
 
-    if (strcmp (argv[i], "-whitepixel") == 0)	/* -whitepixel n */
-    {
-	CHECK_FOR_REQUIRED_ARGUMENTS(1);
-	currentScreen->whitePixel = atoi(argv[++i]);
-	return 2;
+    if (strcmp(argv[i], "-whitepixel") == 0) {  /* -whitepixel n */
+        CHECK_FOR_REQUIRED_ARGUMENTS(1);
+        currentScreen->whitePixel = atoi(argv[++i]);
+        return 2;
     }
 
-    if (strcmp (argv[i], "-linebias") == 0)	/* -linebias n */
-    {
-	CHECK_FOR_REQUIRED_ARGUMENTS(1);
-	currentScreen->lineBias = atoi(argv[++i]);
-	return 2;
+    if (strcmp(argv[i], "-linebias") == 0) {    /* -linebias n */
+        CHECK_FOR_REQUIRED_ARGUMENTS(1);
+        currentScreen->lineBias = atoi(argv[++i]);
+        return 2;
     }
 
 #ifdef HAVE_MMAP
-    if (strcmp (argv[i], "-fbdir") == 0)	/* -fbdir directory */
-    {
-	CHECK_FOR_REQUIRED_ARGUMENTS(1);
-	pfbdir = argv[++i];
-	fbmemtype = MMAPPED_FILE_FB;
-	return 2;
+    if (strcmp(argv[i], "-fbdir") == 0) {       /* -fbdir directory */
+        CHECK_FOR_REQUIRED_ARGUMENTS(1);
+        pfbdir = argv[++i];
+        fbmemtype = MMAPPED_FILE_FB;
+        return 2;
     }
-#endif /* HAVE_MMAP */
+#endif                          /* HAVE_MMAP */
 
 #ifdef HAS_SHM
-    if (strcmp (argv[i], "-shmem") == 0)	/* -shmem */
-    {
-	fbmemtype = SHARED_MEMORY_FB;
-	return 1;
+    if (strcmp(argv[i], "-shmem") == 0) {       /* -shmem */
+        fbmemtype = SHARED_MEMORY_FB;
+        return 1;
     }
 #endif
 
@@ -392,13 +381,14 @@ ddxProcessArgument(int argc, char *argv[], int i)
 }
 
 static DevPrivateKeyRec cmapScrPrivateKeyRec;
+
 #define cmapScrPrivateKey (&cmapScrPrivateKeyRec)
 
 #define GetInstalledColormap(s) ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, cmapScrPrivateKey))
 #define SetInstalledColormap(s,c) (dixSetPrivate(&(s)->devPrivates, cmapScrPrivateKey, c))
 
 static int
-vfbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
+vfbListInstalledColormaps(ScreenPtr pScreen, Colormap * pmaps)
 {
     /* By the time we are processing requests, we can guarantee that there
      * is always a colormap installed */
@@ -406,61 +396,60 @@ vfbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
     return 1;
 }
 
-
 static void
 vfbInstallColormap(ColormapPtr pmap)
 {
     ColormapPtr oldpmap = GetInstalledColormap(pmap->pScreen);
 
-    if (pmap != oldpmap)
-    {
-	int entries;
-	XWDFileHeader *pXWDHeader;
-	XWDColor *pXWDCmap;
-	VisualPtr pVisual;
-	Pixel *     ppix;
-	xrgb *      prgb;
-	xColorItem *defs;
-	int i;
-
-	if(oldpmap != (ColormapPtr)None)
-	    WalkTree(pmap->pScreen, TellLostMap, (char *)&oldpmap->mid);
-	/* Install pmap */
-	SetInstalledColormap(pmap->pScreen, pmap);
-	WalkTree(pmap->pScreen, TellGainedMap, (char *)&pmap->mid);
-
-	entries = pmap->pVisual->ColormapEntries;
-	pXWDHeader = vfbScreens[pmap->pScreen->myNum].pXWDHeader;
-	pXWDCmap = vfbScreens[pmap->pScreen->myNum].pXWDCmap;
-	pVisual = pmap->pVisual;
-
-	swapcopy32(pXWDHeader->visual_class, pVisual->class);
-	swapcopy32(pXWDHeader->red_mask, pVisual->redMask);
-	swapcopy32(pXWDHeader->green_mask, pVisual->greenMask);
-	swapcopy32(pXWDHeader->blue_mask, pVisual->blueMask);
-	swapcopy32(pXWDHeader->bits_per_rgb, pVisual->bitsPerRGBValue);
-	swapcopy32(pXWDHeader->colormap_entries, pVisual->ColormapEntries);
-
-	ppix = (Pixel *)malloc(entries * sizeof(Pixel));
-	prgb = (xrgb *)malloc(entries * sizeof(xrgb));
-	defs = (xColorItem *)malloc(entries * sizeof(xColorItem));
-
-	for (i = 0; i < entries; i++)  ppix[i] = i;
-	/* XXX truecolor */
-	QueryColors(pmap, entries, ppix, prgb, serverClient);
-
-	for (i = 0; i < entries; i++) { /* convert xrgbs to xColorItems */
-	    defs[i].pixel = ppix[i] & 0xff; /* change pixel to index */
-	    defs[i].red = prgb[i].red;
-	    defs[i].green = prgb[i].green;
-	    defs[i].blue = prgb[i].blue;
-	    defs[i].flags =  DoRed|DoGreen|DoBlue;
-	}
-	(*pmap->pScreen->StoreColors)(pmap, entries, defs);
-
-	free(ppix);
-	free(prgb);
-	free(defs);
+    if (pmap != oldpmap) {
+        int entries;
+        XWDFileHeader *pXWDHeader;
+        XWDColor *pXWDCmap;
+        VisualPtr pVisual;
+        Pixel *ppix;
+        xrgb *prgb;
+        xColorItem *defs;
+        int i;
+
+        if (oldpmap != (ColormapPtr) None)
+            WalkTree(pmap->pScreen, TellLostMap, (char *) &oldpmap->mid);
+        /* Install pmap */
+        SetInstalledColormap(pmap->pScreen, pmap);
+        WalkTree(pmap->pScreen, TellGainedMap, (char *) &pmap->mid);
+
+        entries = pmap->pVisual->ColormapEntries;
+        pXWDHeader = vfbScreens[pmap->pScreen->myNum].pXWDHeader;
+        pXWDCmap = vfbScreens[pmap->pScreen->myNum].pXWDCmap;
+        pVisual = pmap->pVisual;
+
+        swapcopy32(pXWDHeader->visual_class, pVisual->class);
+        swapcopy32(pXWDHeader->red_mask, pVisual->redMask);
+        swapcopy32(pXWDHeader->green_mask, pVisual->greenMask);
+        swapcopy32(pXWDHeader->blue_mask, pVisual->blueMask);
+        swapcopy32(pXWDHeader->bits_per_rgb, pVisual->bitsPerRGBValue);
+        swapcopy32(pXWDHeader->colormap_entries, pVisual->ColormapEntries);
+
+        ppix = (Pixel *) malloc(entries * sizeof(Pixel));
+        prgb = (xrgb *) malloc(entries * sizeof(xrgb));
+        defs = (xColorItem *) malloc(entries * sizeof(xColorItem));
+
+        for (i = 0; i < entries; i++)
+            ppix[i] = i;
+        /* XXX truecolor */
+        QueryColors(pmap, entries, ppix, prgb, serverClient);
+
+        for (i = 0; i < entries; i++) { /* convert xrgbs to xColorItems */
+            defs[i].pixel = ppix[i] & 0xff;     /* change pixel to index */
+            defs[i].red = prgb[i].red;
+            defs[i].green = prgb[i].green;
+            defs[i].blue = prgb[i].blue;
+            defs[i].flags = DoRed | DoGreen | DoBlue;
+        }
+        (*pmap->pScreen->StoreColors) (pmap, entries, defs);
+
+        free(ppix);
+        free(prgb);
+        free(defs);
     }
 }
 
@@ -469,51 +458,43 @@ vfbUninstallColormap(ColormapPtr pmap)
 {
     ColormapPtr curpmap = GetInstalledColormap(pmap->pScreen);
 
-    if(pmap == curpmap)
-    {
-	if (pmap->mid != pmap->pScreen->defColormap)
-	{
-	    dixLookupResourceByType((pointer *)&curpmap,
-				    pmap->pScreen->defColormap,
-				    RT_COLORMAP, serverClient,
-				    DixInstallAccess);
-	    (*pmap->pScreen->InstallColormap)(curpmap);
-	}
+    if (pmap == curpmap) {
+        if (pmap->mid != pmap->pScreen->defColormap) {
+            dixLookupResourceByType((pointer *) &curpmap,
+                                    pmap->pScreen->defColormap,
+                                    RT_COLORMAP, serverClient,
+                                    DixInstallAccess);
+            (*pmap->pScreen->InstallColormap) (curpmap);
+        }
     }
 }
 
 static void
-vfbStoreColors(ColormapPtr pmap, int ndef, xColorItem *pdefs)
+vfbStoreColors(ColormapPtr pmap, int ndef, xColorItem * pdefs)
 {
     XWDColor *pXWDCmap;
     int i;
 
-    if (pmap != GetInstalledColormap(pmap->pScreen))
-    {
-	return;
+    if (pmap != GetInstalledColormap(pmap->pScreen)) {
+        return;
     }
 
     pXWDCmap = vfbScreens[pmap->pScreen->myNum].pXWDCmap;
 
-    if ((pmap->pVisual->class | DynamicClass) == DirectColor)
-    {
-	return;
-    }
-
-    for (i = 0; i < ndef; i++)
-    {
-	if (pdefs[i].flags & DoRed)
-	{
-	    swapcopy16(pXWDCmap[pdefs[i].pixel].red, pdefs[i].red);
-	}
-	if (pdefs[i].flags & DoGreen)
-	{
-	    swapcopy16(pXWDCmap[pdefs[i].pixel].green, pdefs[i].green);
-	}
-	if (pdefs[i].flags & DoBlue)
-	{
-	    swapcopy16(pXWDCmap[pdefs[i].pixel].blue, pdefs[i].blue);
-	}
+    if ((pmap->pVisual->class | DynamicClass) == DirectColor) {
+        return;
+    }
+
+    for (i = 0; i < ndef; i++) {
+        if (pdefs[i].flags & DoRed) {
+            swapcopy16(pXWDCmap[pdefs[i].pixel].red, pdefs[i].red);
+        }
+        if (pdefs[i].flags & DoGreen) {
+            swapcopy16(pXWDCmap[pdefs[i].pixel].green, pdefs[i].green);
+        }
+        if (pdefs[i].flags & DoBlue) {
+            swapcopy16(pXWDCmap[pdefs[i].pixel].blue, pdefs[i].blue);
+        }
     }
 }
 
@@ -531,30 +512,27 @@ vfbBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
 {
     int i;
 
-    for (i = 0; i < vfbNumScreens; i++)
-    {
+    for (i = 0; i < vfbNumScreens; i++) {
 #ifdef MS_ASYNC
-	if (-1 == msync((caddr_t)vfbScreens[i].pXWDHeader,
-			(size_t)vfbScreens[i].sizeInBytes, MS_ASYNC))
+        if (-1 == msync((caddr_t) vfbScreens[i].pXWDHeader,
+                        (size_t) vfbScreens[i].sizeInBytes, MS_ASYNC))
 #else
-	/* silly NetBSD and who else? */
-	if (-1 == msync((caddr_t)vfbScreens[i].pXWDHeader,
-			(size_t)vfbScreens[i].sizeInBytes))
+        /* silly NetBSD and who else? */
+        if (-1 == msync((caddr_t) vfbScreens[i].pXWDHeader,
+                        (size_t) vfbScreens[i].sizeInBytes))
 #endif
-	{
-	    perror("msync");
-	    ErrorF("msync failed, %s", strerror(errno));
-	}
+        {
+            perror("msync");
+            ErrorF("msync failed, %s", strerror(errno));
+        }
     }
 }
 
-
 static void
 vfbWakeupHandler(pointer blockData, int result, pointer pReadmask)
 {
 }
 
-
 static void
 vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb)
 {
@@ -563,53 +541,47 @@ vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb)
     int currentFileSize, writeThisTime;
 
     snprintf(pvfb->mmap_file, sizeof(pvfb->mmap_file), "%s/Xvfb_screen%d",
-	     pfbdir, (int) (pvfb - vfbScreens));
-    if (-1 == (pvfb->mmap_fd = open(pvfb->mmap_file, O_CREAT|O_RDWR, 0666)))
-    {
-	perror("open");
-	ErrorF("open %s failed, %s", pvfb->mmap_file, strerror(errno));
-	return;
+             pfbdir, (int) (pvfb - vfbScreens));
+    if (-1 == (pvfb->mmap_fd = open(pvfb->mmap_file, O_CREAT | O_RDWR, 0666))) {
+        perror("open");
+        ErrorF("open %s failed, %s", pvfb->mmap_file, strerror(errno));
+        return;
     }
 
     /* Extend the file to be the proper size */
 
     memset(dummyBuffer, 0, DUMMY_BUFFER_SIZE);
     for (currentFileSize = 0;
-	 currentFileSize < pvfb->sizeInBytes;
-	 currentFileSize += writeThisTime)
-    {
-	writeThisTime = min(DUMMY_BUFFER_SIZE,
-			    pvfb->sizeInBytes - currentFileSize);
-	if (-1 == write(pvfb->mmap_fd, dummyBuffer, writeThisTime))
-	{
-	    perror("write");
-	    ErrorF("write %s failed, %s", pvfb->mmap_file, strerror(errno));
-	    return;
-	}
+         currentFileSize < pvfb->sizeInBytes;
+         currentFileSize += writeThisTime) {
+        writeThisTime = min(DUMMY_BUFFER_SIZE,
+                            pvfb->sizeInBytes - currentFileSize);
+        if (-1 == write(pvfb->mmap_fd, dummyBuffer, writeThisTime)) {
+            perror("write");
+            ErrorF("write %s failed, %s", pvfb->mmap_file, strerror(errno));
+            return;
+        }
     }
 
     /* try to mmap the file */
 
-    pvfb->pXWDHeader = (XWDFileHeader *)mmap((caddr_t)NULL, pvfb->sizeInBytes,
-				    PROT_READ|PROT_WRITE,
-				    MAP_FILE|MAP_SHARED,
-				    pvfb->mmap_fd, 0);
-    if (-1 == (long)pvfb->pXWDHeader)
-    {
-	perror("mmap");
-	ErrorF("mmap %s failed, %s", pvfb->mmap_file, strerror(errno));
-	pvfb->pXWDHeader = NULL;
-	return;
+    pvfb->pXWDHeader = (XWDFileHeader *) mmap((caddr_t) NULL, pvfb->sizeInBytes,
+                                              PROT_READ | PROT_WRITE,
+                                              MAP_FILE | MAP_SHARED,
+                                              pvfb->mmap_fd, 0);
+    if (-1 == (long) pvfb->pXWDHeader) {
+        perror("mmap");
+        ErrorF("mmap %s failed, %s", pvfb->mmap_file, strerror(errno));
+        pvfb->pXWDHeader = NULL;
+        return;
     }
 
     if (!RegisterBlockAndWakeupHandlers(vfbBlockHandler, vfbWakeupHandler,
-					NULL))
-    {
-	pvfb->pXWDHeader = NULL;
+                                        NULL)) {
+        pvfb->pXWDHeader = NULL;
     }
 }
-#endif /* HAVE_MMAP */
-
+#endif                          /* HAVE_MMAP */
 
 #ifdef HAS_SHM
 static void
@@ -617,33 +589,33 @@ vfbAllocateSharedMemoryFramebuffer(vfbScreenInfoPtr pvfb)
 {
     /* create the shared memory segment */
 
-    pvfb->shmid = shmget(IPC_PRIVATE, pvfb->sizeInBytes, IPC_CREAT|0777);
-    if (pvfb->shmid < 0)
-    {
-	perror("shmget");
-	ErrorF("shmget %d bytes failed, %s", pvfb->sizeInBytes, strerror(errno));
-	return;
+    pvfb->shmid = shmget(IPC_PRIVATE, pvfb->sizeInBytes, IPC_CREAT | 0777);
+    if (pvfb->shmid < 0) {
+        perror("shmget");
+        ErrorF("shmget %d bytes failed, %s", pvfb->sizeInBytes,
+               strerror(errno));
+        return;
     }
 
     /* try to attach it */
 
-    pvfb->pXWDHeader = (XWDFileHeader *)shmat(pvfb->shmid, 0, 0);
-    if (-1 == (long)pvfb->pXWDHeader)
-    {
-	perror("shmat");
-	ErrorF("shmat failed, %s", strerror(errno));
-	pvfb->pXWDHeader = NULL; 
-	return;
+    pvfb->pXWDHeader = (XWDFileHeader *) shmat(pvfb->shmid, 0, 0);
+    if (-1 == (long) pvfb->pXWDHeader) {
+        perror("shmat");
+        ErrorF("shmat failed, %s", strerror(errno));
+        pvfb->pXWDHeader = NULL;
+        return;
     }
 
     ErrorF("screen %d shmid %d\n", (int) (pvfb - vfbScreens), pvfb->shmid);
 }
-#endif /* HAS_SHM */
+#endif                          /* HAS_SHM */
 
 static char *
 vfbAllocateFramebufferMemory(vfbScreenInfoPtr pvfb)
 {
-    if (pvfb->pfbMemory) return pvfb->pfbMemory; /* already done */
+    if (pvfb->pfbMemory)
+        return pvfb->pfbMemory; /* already done */
 
     pvfb->sizeInBytes = pvfb->paddedBytesWidth * pvfb->height;
 
@@ -653,55 +625,59 @@ vfbAllocateFramebufferMemory(vfbScreenInfoPtr pvfb)
      * below comes from the MAX_PSEUDO_DEPTH define in cfbcmap.c.
      */
 
-    if (pvfb->depth <= 10)
-    { /* single index colormaps */
-	pvfb->ncolors = 1 << pvfb->depth;
+    if (pvfb->depth <= 10) {    /* single index colormaps */
+        pvfb->ncolors = 1 << pvfb->depth;
     }
-    else
-    { /* decomposed colormaps */
-	int nplanes_per_color_component = pvfb->depth / 3;
-	if (pvfb->depth % 3) nplanes_per_color_component++;
-	pvfb->ncolors = 1 << nplanes_per_color_component;
+    else {                      /* decomposed colormaps */
+        int nplanes_per_color_component = pvfb->depth / 3;
+
+        if (pvfb->depth % 3)
+            nplanes_per_color_component++;
+        pvfb->ncolors = 1 << nplanes_per_color_component;
     }
 
     /* add extra bytes for XWDFileHeader, window name, and colormap */
 
     pvfb->sizeInBytes += SIZEOF(XWDheader) + XWD_WINDOW_NAME_LEN +
-		    pvfb->ncolors * SIZEOF(XWDColor);
+        pvfb->ncolors * SIZEOF(XWDColor);
 
-    pvfb->pXWDHeader = NULL; 
-    switch (fbmemtype)
-    {
+    pvfb->pXWDHeader = NULL;
+    switch (fbmemtype) {
 #ifdef HAVE_MMAP
-    case MMAPPED_FILE_FB:  vfbAllocateMmappedFramebuffer(pvfb); break;
+    case MMAPPED_FILE_FB:
+        vfbAllocateMmappedFramebuffer(pvfb);
+        break;
 #else
-    case MMAPPED_FILE_FB: break;
+    case MMAPPED_FILE_FB:
+        break;
 #endif
 
 #ifdef HAS_SHM
-    case SHARED_MEMORY_FB: vfbAllocateSharedMemoryFramebuffer(pvfb); break;
+    case SHARED_MEMORY_FB:
+        vfbAllocateSharedMemoryFramebuffer(pvfb);
+        break;
 #else
-    case SHARED_MEMORY_FB: break;
+    case SHARED_MEMORY_FB:
+        break;
 #endif
 
     case NORMAL_MEMORY_FB:
-	pvfb->pXWDHeader = (XWDFileHeader *)malloc(pvfb->sizeInBytes);
-	break;
+        pvfb->pXWDHeader = (XWDFileHeader *) malloc(pvfb->sizeInBytes);
+        break;
     }
 
-    if (pvfb->pXWDHeader)
-    {
-	pvfb->pXWDCmap = (XWDColor *)((char *)pvfb->pXWDHeader
-				+ SIZEOF(XWDheader) + XWD_WINDOW_NAME_LEN);
-	pvfb->pfbMemory = (char *)(pvfb->pXWDCmap + pvfb->ncolors);
+    if (pvfb->pXWDHeader) {
+        pvfb->pXWDCmap = (XWDColor *) ((char *) pvfb->pXWDHeader
+                                       + SIZEOF(XWDheader) +
+                                       XWD_WINDOW_NAME_LEN);
+        pvfb->pfbMemory = (char *) (pvfb->pXWDCmap + pvfb->ncolors);
 
-	return pvfb->pfbMemory;
+        return pvfb->pfbMemory;
     }
     else
-	return NULL;
+        return NULL;
 }
 
-
 static void
 vfbWriteXWDFileHeader(ScreenPtr pScreen)
 {
@@ -713,7 +689,8 @@ vfbWriteXWDFileHeader(ScreenPtr pScreen)
 
     needswap = *(char *) &swaptest;
 
-    pXWDHeader->header_size = (char *)pvfb->pXWDCmap - (char *)pvfb->pXWDHeader;
+    pXWDHeader->header_size =
+        (char *) pvfb->pXWDCmap - (char *) pvfb->pXWDHeader;
     pXWDHeader->file_version = XWD_FILE_VERSION;
 
     pXWDHeader->pixmap_format = ZPixmap;
@@ -743,45 +720,40 @@ vfbWriteXWDFileHeader(ScreenPtr pScreen)
     /* write xwd "window" name: Xvfb hostname:server.screen */
 
     if (-1 == gethostname(hostname, sizeof(hostname)))
-	hostname[0] = 0;
+        hostname[0] = 0;
     else
-	hostname[XWD_WINDOW_NAME_LEN-1] = 0;
-    sprintf((char *)(pXWDHeader+1), "Xvfb %s:%s.%d", hostname, display,
-	    pScreen->myNum);
+        hostname[XWD_WINDOW_NAME_LEN - 1] = 0;
+    sprintf((char *) (pXWDHeader + 1), "Xvfb %s:%s.%d", hostname, display,
+            pScreen->myNum);
 
     /* write colormap pixel slot values */
 
-    for (i = 0; i < pvfb->ncolors; i++)
-    {
-	pvfb->pXWDCmap[i].pixel = i;
+    for (i = 0; i < pvfb->ncolors; i++) {
+        pvfb->pXWDCmap[i].pixel = i;
     }
 
     /* byte swap to most significant byte first */
 
-    if (needswap)
-    {
-	SwapLongs((CARD32 *)pXWDHeader, SIZEOF(XWDheader)/4);
-	for (i = 0; i < pvfb->ncolors; i++)
-	{
-	    swapl(&pvfb->pXWDCmap[i].pixel);
-	}
+    if (needswap) {
+        SwapLongs((CARD32 *) pXWDHeader, SIZEOF(XWDheader) / 4);
+        for (i = 0; i < pvfb->ncolors; i++) {
+            swapl(&pvfb->pXWDCmap[i].pixel);
+        }
     }
 }
 
-
 static Bool
-vfbCursorOffScreen (ScreenPtr *ppScreen, int *x, int *y)
+vfbCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
 {
     return FALSE;
 }
 
 static void
-vfbCrossScreen (ScreenPtr pScreen, Bool entering)
+vfbCrossScreen(ScreenPtr pScreen, Bool entering)
 {
 }
 
-static miPointerScreenFuncRec vfbPointerCursorFuncs =
-{
+static miPointerScreenFuncRec vfbPointerCursorFuncs = {
     vfbCursorOffScreen,
     vfbCrossScreen,
     miPointerWarpCursor
@@ -792,7 +764,7 @@ vfbCloseScreen(int index, ScreenPtr pScreen)
 {
     vfbScreenInfoPtr pvfb = &vfbScreens[index];
     int i;
- 
+
     pScreen->CloseScreen = pvfb->closeScreen;
 
     /*
@@ -800,7 +772,7 @@ vfbCloseScreen(int index, ScreenPtr pScreen)
      * clear installed colormaps so that server reset works correctly.
      */
     for (i = 0; i < screenInfo.numScreens; i++)
-	SetInstalledColormap(screenInfo.screens[i], NULL);
+        SetInstalledColormap(screenInfo.screens[i], NULL);
 
     return pScreen->CloseScreen(index, pScreen);
 }
@@ -812,72 +784,74 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
     int dpix = monitorResolution, dpiy = monitorResolution;
     int ret;
     char *pbits;
-    
+
     if (!dixRegisterPrivateKey(&cmapScrPrivateKeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
 
     if (dpix == 0)
-      dpix = 100;
+        dpix = 100;
 
     if (dpiy == 0)
-      dpiy = 100;
+        dpiy = 100;
 
     pvfb->paddedBytesWidth = PixmapBytePad(pvfb->width, pvfb->depth);
     pvfb->bitsPerPixel = vfbBitsPerPixel(pvfb->depth);
-    if (pvfb->bitsPerPixel >= 8 )
-	pvfb->paddedWidth = pvfb->paddedBytesWidth / (pvfb->bitsPerPixel / 8);
+    if (pvfb->bitsPerPixel >= 8)
+        pvfb->paddedWidth = pvfb->paddedBytesWidth / (pvfb->bitsPerPixel / 8);
     else
-	pvfb->paddedWidth = pvfb->paddedBytesWidth * 8;
+        pvfb->paddedWidth = pvfb->paddedBytesWidth * 8;
     pbits = vfbAllocateFramebufferMemory(pvfb);
-    if (!pbits) return FALSE;
+    if (!pbits)
+        return FALSE;
 
     switch (pvfb->depth) {
     case 8:
-	miSetVisualTypesAndMasks (8,
-				  ((1 << StaticGray) |
-				   (1 << GrayScale) |
-				   (1 << StaticColor) |
-				   (1 << PseudoColor) |
-				   (1 << TrueColor) |
-				   (1 << DirectColor)),
-				  8, PseudoColor, 0, 0, 0);
-	break;
+        miSetVisualTypesAndMasks(8,
+                                 ((1 << StaticGray) |
+                                  (1 << GrayScale) |
+                                  (1 << StaticColor) |
+                                  (1 << PseudoColor) |
+                                  (1 << TrueColor) |
+                                  (1 << DirectColor)), 8, PseudoColor, 0, 0, 0);
+        break;
     case 15:
-	miSetVisualTypesAndMasks (15,
-				  ((1 << TrueColor) |
-				   (1 << DirectColor)),
-				  8, TrueColor, 0x7c00, 0x03e0, 0x001f);
-	break;
+        miSetVisualTypesAndMasks(15,
+                                 ((1 << TrueColor) |
+                                  (1 << DirectColor)),
+                                 8, TrueColor, 0x7c00, 0x03e0, 0x001f);
+        break;
     case 16:
-	miSetVisualTypesAndMasks (16,
-				  ((1 << TrueColor) |
-				   (1 << DirectColor)),
-				  8, TrueColor, 0xf800, 0x07e0, 0x001f);
-	break;
+        miSetVisualTypesAndMasks(16,
+                                 ((1 << TrueColor) |
+                                  (1 << DirectColor)),
+                                 8, TrueColor, 0xf800, 0x07e0, 0x001f);
+        break;
     case 24:
-	miSetVisualTypesAndMasks (24,
-				  ((1 << TrueColor) |
-				   (1 << DirectColor)),
-				  8, TrueColor, 0xff0000, 0x00ff00, 0x0000ff);
-	break;
+        miSetVisualTypesAndMasks(24,
+                                 ((1 << TrueColor) |
+                                  (1 << DirectColor)),
+                                 8, TrueColor, 0xff0000, 0x00ff00, 0x0000ff);
+        break;
     case 30:
-	miSetVisualTypesAndMasks (30,
-				  ((1 << TrueColor) |
-				   (1 << DirectColor)),
-				  10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff);
-	break;
+        miSetVisualTypesAndMasks(30,
+                                 ((1 << TrueColor) |
+                                  (1 << DirectColor)),
+                                 10, TrueColor, 0x3ff00000, 0x000ffc00,
+                                 0x000003ff);
+        break;
     default:
-	return FALSE;
+        return FALSE;
     }
 
-    miSetPixmapDepths ();
+    miSetPixmapDepths();
 
     ret = fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
-		       dpix, dpiy, pvfb->paddedWidth,pvfb->bitsPerPixel);
-    if (ret && Render) 
-	fbPictureInit (pScreen, 0, 0);
+                       dpix, dpiy, pvfb->paddedWidth, pvfb->bitsPerPixel);
+    if (ret && Render)
+        fbPictureInit(pScreen, 0, 0);
 
-    if (!ret) return FALSE;
+    if (!ret)
+        return FALSE;
 
     pScreen->InstallColormap = vfbInstallColormap;
     pScreen->UninstallColormap = vfbUninstallColormap;
@@ -902,11 +876,10 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
 
     return ret;
 
-} /* end vfbScreenInit */
-
+}                               /* end vfbScreenInit */
 
 void
-InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
+InitOutput(ScreenInfo * screenInfo, int argc, char **argv)
 {
     int i;
     int NumFormats = 0;
@@ -914,39 +887,36 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
     /* initialize pixmap formats */
 
     /* must have a pixmap depth to match every screen depth */
-    for (i = 0; i < vfbNumScreens; i++)
-    {
-	vfbPixmapDepths[vfbScreens[i].depth] = TRUE;
+    for (i = 0; i < vfbNumScreens; i++) {
+        vfbPixmapDepths[vfbScreens[i].depth] = TRUE;
     }
 
     /* RENDER needs a good set of pixmaps. */
     if (Render) {
-	vfbPixmapDepths[1] = TRUE;
-	vfbPixmapDepths[4] = TRUE;
-	vfbPixmapDepths[8] = TRUE;
+        vfbPixmapDepths[1] = TRUE;
+        vfbPixmapDepths[4] = TRUE;
+        vfbPixmapDepths[8] = TRUE;
 #if 0
-	vfbPixmapDepths[12] = TRUE;
+        vfbPixmapDepths[12] = TRUE;
 #endif
 /*	vfbPixmapDepths[15] = TRUE; */
-	vfbPixmapDepths[16] = TRUE;
-	vfbPixmapDepths[24] = TRUE;
+        vfbPixmapDepths[16] = TRUE;
+        vfbPixmapDepths[24] = TRUE;
 #if 0
-	vfbPixmapDepths[30] = TRUE;
+        vfbPixmapDepths[30] = TRUE;
 #endif
-	vfbPixmapDepths[32] = TRUE;
+        vfbPixmapDepths[32] = TRUE;
     }
 
-    for (i = 1; i <= 32; i++)
-    {
-	if (vfbPixmapDepths[i])
-	{
-	    if (NumFormats >= MAXFORMATS)
-		FatalError ("MAXFORMATS is too small for this server\n");
-	    screenInfo->formats[NumFormats].depth = i;
-	    screenInfo->formats[NumFormats].bitsPerPixel = vfbBitsPerPixel(i);
-	    screenInfo->formats[NumFormats].scanlinePad = BITMAP_SCANLINE_PAD;
-	    NumFormats++;
-	}
+    for (i = 1; i <= 32; i++) {
+        if (vfbPixmapDepths[i]) {
+            if (NumFormats >= MAXFORMATS)
+                FatalError("MAXFORMATS is too small for this server\n");
+            screenInfo->formats[NumFormats].depth = i;
+            screenInfo->formats[NumFormats].bitsPerPixel = vfbBitsPerPixel(i);
+            screenInfo->formats[NumFormats].scanlinePad = BITMAP_SCANLINE_PAD;
+            NumFormats++;
+        }
     }
 
     screenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
@@ -957,17 +927,14 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
 
     /* initialize screens */
 
-    if (vfbNumScreens < 1)
-    {
-	vfbScreens = &defaultScreenInfo;
-	vfbNumScreens = 1;
+    if (vfbNumScreens < 1) {
+        vfbScreens = &defaultScreenInfo;
+        vfbNumScreens = 1;
     }
-    for (i = 0; i < vfbNumScreens; i++)
-    {
-	if (-1 == AddScreen(vfbScreenInit, argc, argv))
-	{
-	    FatalError("Couldn't add screen %d", i);
-	}
+    for (i = 0; i < vfbNumScreens; i++) {
+        if (-1 == AddScreen(vfbScreenInit, argc, argv)) {
+            FatalError("Couldn't add screen %d", i);
+        }
     }
 
-} /* end InitOutput */
+}                               /* end InitOutput */
diff --git a/xorg-server/hw/xfree86/common/compiler.h b/xorg-server/hw/xfree86/common/compiler.h
index 34e60c52a..0abdfb6c3 100644
--- a/xorg-server/hw/xfree86/common/compiler.h
+++ b/xorg-server/hw/xfree86/common/compiler.h
@@ -49,61 +49,58 @@
 
 #ifndef _COMPILER_H
 
-# define _COMPILER_H
+#define _COMPILER_H
 
 #if defined(__SUNPRO_C)
-# define DO_PROTOTYPES
+#define DO_PROTOTYPES
 #endif
 
 /* Map Sun compiler platform defines to gcc-style used in the code */
 #if defined(__amd64) && !defined(__amd64__)
-# define __amd64__
+#define __amd64__
 #endif
 #if defined(__i386) && !defined(__i386__)
-# define __i386__
+#define __i386__
 #endif
 #if defined(__sparc) && !defined(__sparc__)
-# define __sparc__
+#define __sparc__
 #endif
 #if defined(__sparcv9) && !defined(__sparc64__)
-# define __sparc64__
+#define __sparc64__
 #endif
 
 #ifndef _X_EXPORT
-# include <X11/Xfuncproto.h>
+#include <X11/Xfuncproto.h>
 #endif
 
-# include <pixman.h> /* for uint*_t types */
+#include <pixman.h>             /* for uint*_t types */
 
 /* Allow drivers to use the GCC-supported __inline__ and/or __inline. */
-# ifndef __inline__
-#  if defined(__GNUC__)
+#ifndef __inline__
+#if defined(__GNUC__)
     /* gcc has __inline__ */
-#  elif defined(__HIGHC__)
-#   define __inline__ _Inline
-#  else
-#   define __inline__ /**/
-#  endif
-# endif /* __inline__ */
-# ifndef __inline
-#  if defined(__GNUC__)
+#elif defined(__HIGHC__)
+#define __inline__ _Inline
+#else
+#define __inline__ /**/
+#endif
+#endif                          /* __inline__ */
+#ifndef __inline
+#if defined(__GNUC__)
     /* gcc has __inline */
-#  elif defined(__HIGHC__)
-#   define __inline _Inline
-#  else
-#   define __inline /**/
-#  endif
-# endif /* __inline */
-
+#elif defined(__HIGHC__)
+#define __inline _Inline
+#else
+#define __inline /**/
+#endif
+#endif                          /* __inline */
 /* Support gcc's __FUNCTION__ for people using other compilers */
 #if !defined(__GNUC__) && !defined(__FUNCTION__)
-# define __FUNCTION__ __func__ /* C99 */
+#define __FUNCTION__ __func__   /* C99 */
 #endif
-
-# if defined(NO_INLINE) || defined(DO_PROTOTYPES)
-
-#  if !defined(__arm__)
-#   if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
+#if defined(NO_INLINE) || defined(DO_PROTOTYPES)
+#if !defined(__arm__)
+#if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
       && !(defined(__alpha__) && defined(linux)) \
       && !(defined(__ia64__) && defined(linux)) \
 
@@ -114,8 +111,7 @@ extern _X_EXPORT unsigned int inb(unsigned short);
 extern _X_EXPORT unsigned int inw(unsigned short);
 extern _X_EXPORT unsigned int inl(unsigned short);
 
-#   else /* __sparc__,  __arm32__, __alpha__, __nds32__ */
-
+#else                           /* __sparc__,  __arm32__, __alpha__, __nds32__ */
 extern _X_EXPORT void outb(unsigned long, unsigned char);
 extern _X_EXPORT void outw(unsigned long, unsigned short);
 extern _X_EXPORT void outl(unsigned long, unsigned int);
@@ -123,10 +119,10 @@ extern _X_EXPORT unsigned int inb(unsigned long);
 extern _X_EXPORT unsigned int inw(unsigned long);
 extern _X_EXPORT unsigned int inl(unsigned long);
 
-#   endif /* __sparc__,  __arm32__, __alpha__, __nds32__ */
-#  endif /* __arm__ */
+#endif                          /* __sparc__,  __arm32__, __alpha__, __nds32__ */
+#endif                          /* __arm__ */
 
-#  if defined(__powerpc__) && !defined(__OpenBSD__)
+#if defined(__powerpc__) && !defined(__OpenBSD__)
 extern unsigned long ldq_u(unsigned long *);
 extern unsigned long ldl_u(unsigned int *);
 extern unsigned long ldw_u(unsigned short *);
@@ -139,50 +135,50 @@ extern void stl_brx(unsigned long, volatile unsigned char *, int);
 extern void stw_brx(unsigned short, volatile unsigned char *, int);
 extern unsigned long ldl_brx(volatile unsigned char *, int);
 extern unsigned short ldw_brx(volatile unsigned char *, int);
-#  endif /* __powerpc__ && !__OpenBSD */
+#endif                          /* __powerpc__ && !__OpenBSD */
 
-# endif /* NO_INLINE || DO_PROTOTYPES */
+#endif                          /* NO_INLINE || DO_PROTOTYPES */
 
-# ifndef NO_INLINE
-#  ifdef __GNUC__
-#   ifdef __i386__
+#ifndef NO_INLINE
+#ifdef __GNUC__
+#ifdef __i386__
 
-#    ifdef __SSE__
-#     define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")
-#    else
-#     define write_mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")
-#    endif
+#ifdef __SSE__
+#define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")
+#else
+#define write_mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")
+#endif
 
-#    ifdef __SSE2__
-#     define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")
-#    else
-#     define mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")
-#    endif
+#ifdef __SSE2__
+#define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")
+#else
+#define mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")
+#endif
 
-#   elif defined __alpha__
+#elif defined __alpha__
 
-#    define mem_barrier() __asm__ __volatile__ ("mb" : : : "memory")
-#    define write_mem_barrier() __asm__ __volatile__ ("wmb" : : : "memory")
+#define mem_barrier() __asm__ __volatile__ ("mb" : : : "memory")
+#define write_mem_barrier() __asm__ __volatile__ ("wmb" : : : "memory")
 
-#   elif defined __amd64__
+#elif defined __amd64__
 
-#    define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")
-#    define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")
+#define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")
+#define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")
 
-#   elif defined __ia64__
+#elif defined __ia64__
 
-#    ifndef __INTEL_COMPILER
-#     define mem_barrier()        __asm__ __volatile__ ("mf" : : : "memory")
-#     define write_mem_barrier()  __asm__ __volatile__ ("mf" : : : "memory")
-#    else
-#     include "ia64intrin.h"
-#     define mem_barrier() __mf()
-#     define write_mem_barrier() __mf()
-#    endif
+#ifndef __INTEL_COMPILER
+#define mem_barrier()        __asm__ __volatile__ ("mf" : : : "memory")
+#define write_mem_barrier()  __asm__ __volatile__ ("mf" : : : "memory")
+#else
+#include "ia64intrin.h"
+#define mem_barrier() __mf()
+#define write_mem_barrier() __mf()
+#endif
 
-#   elif defined __mips__
+#elif defined __mips__
      /* Note: sync instruction requires MIPS II instruction set */
-#    define mem_barrier()		\
+#define mem_barrier()		\
 	__asm__ __volatile__(		\
 		".set   push\n\t"	\
 		".set   noreorder\n\t"	\
@@ -192,140 +188,169 @@ extern unsigned short ldw_brx(volatile unsigned char *, int);
 		: /* no output */	\
 		: /* no input */	\
 		: "memory")
-#    define write_mem_barrier() mem_barrier()
-
-#   elif defined __powerpc__
+#define write_mem_barrier() mem_barrier()
 
-#    if defined(linux) && defined(__powerpc64__)
-#     include <linux/version.h>
-#     if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
-#      include <asm/memory.h>
-#     endif
-#    endif /* defined(linux) && defined(__powerpc64__) */
+#elif defined __powerpc__
 
-#    ifndef eieio /* We deal with arch-specific eieio() routines above... */
-#     define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
-#    endif /* eieio */
-#    define mem_barrier()	eieio()
-#    define write_mem_barrier()	eieio()
+#if defined(linux) && defined(__powerpc64__)
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+#include <asm/memory.h>
+#endif
+#endif                          /* defined(linux) && defined(__powerpc64__) */
 
-#   elif defined __sparc__
+#ifndef eieio                   /* We deal with arch-specific eieio() routines above... */
+#define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
+#endif                          /* eieio */
+#define mem_barrier()	eieio()
+#define write_mem_barrier()	eieio()
 
-#    define barrier() __asm__ __volatile__ (".word 0x8143e00a" : : : "memory")
-#    define mem_barrier()         /* XXX: nop for now */
-#    define write_mem_barrier()   /* XXX: nop for now */
-#   endif
-#  endif /* __GNUC__ */
-# endif /* NO_INLINE */
+#elif defined __sparc__
 
-# ifndef mem_barrier
-#  define mem_barrier() /* NOP */
-# endif
+#define barrier() __asm__ __volatile__ (".word 0x8143e00a" : : : "memory")
+#define mem_barrier()           /* XXX: nop for now */
+#define write_mem_barrier()     /* XXX: nop for now */
+#endif
+#endif                          /* __GNUC__ */
+#endif                          /* NO_INLINE */
 
-# ifndef write_mem_barrier
-#  define write_mem_barrier() /* NOP */
-# endif
+#ifndef mem_barrier
+#define mem_barrier()           /* NOP */
+#endif
 
+#ifndef write_mem_barrier
+#define write_mem_barrier()     /* NOP */
+#endif
 
-# ifndef NO_INLINE
-#  ifdef __GNUC__
+#ifndef NO_INLINE
+#ifdef __GNUC__
 
 /* Define some packed structures to use with unaligned accesses */
 
-struct __una_u64 { uint64_t x __attribute__((packed)); };
-struct __una_u32 { uint32_t x __attribute__((packed)); };
-struct __una_u16 { uint16_t x __attribute__((packed)); };
+struct __una_u64 {
+    uint64_t x __attribute__ ((packed));
+};
+struct __una_u32 {
+    uint32_t x __attribute__ ((packed));
+};
+struct __una_u16 {
+    uint16_t x __attribute__ ((packed));
+};
 
 /* Elemental unaligned loads */
 
-static __inline__ uint64_t ldq_u(uint64_t *p)
+static __inline__ uint64_t
+ldq_u(uint64_t * p)
 {
-	const struct __una_u64 *ptr = (const struct __una_u64 *) p;
-	return ptr->x;
+    const struct __una_u64 *ptr = (const struct __una_u64 *) p;
+
+    return ptr->x;
 }
 
-static __inline__ uint32_t ldl_u(uint32_t *p)
+static __inline__ uint32_t
+ldl_u(uint32_t * p)
 {
-	const struct __una_u32 *ptr = (const struct __una_u32 *) p;
-	return ptr->x;
+    const struct __una_u32 *ptr = (const struct __una_u32 *) p;
+
+    return ptr->x;
 }
 
-static __inline__ uint16_t ldw_u(uint16_t *p)
+static __inline__ uint16_t
+ldw_u(uint16_t * p)
 {
-	const struct __una_u16 *ptr = (const struct __una_u16 *) p;
-	return ptr->x;
+    const struct __una_u16 *ptr = (const struct __una_u16 *) p;
+
+    return ptr->x;
 }
 
 /* Elemental unaligned stores */
 
-static __inline__ void stq_u(uint64_t val, uint64_t *p)
+static __inline__ void
+stq_u(uint64_t val, uint64_t * p)
 {
-	struct __una_u64 *ptr = (struct __una_u64 *) p;
-	ptr->x = val;
+    struct __una_u64 *ptr = (struct __una_u64 *) p;
+
+    ptr->x = val;
 }
 
-static __inline__ void stl_u(uint32_t val, uint32_t *p)
+static __inline__ void
+stl_u(uint32_t val, uint32_t * p)
 {
-	struct __una_u32 *ptr = (struct __una_u32 *) p;
-	ptr->x = val;
+    struct __una_u32 *ptr = (struct __una_u32 *) p;
+
+    ptr->x = val;
 }
 
-static __inline__ void stw_u(uint16_t val, uint16_t *p)
+static __inline__ void
+stw_u(uint16_t val, uint16_t * p)
 {
-	struct __una_u16 *ptr = (struct __una_u16 *) p;
-	ptr->x = val;
+    struct __una_u16 *ptr = (struct __una_u16 *) p;
+
+    ptr->x = val;
 }
-#  else /* !__GNUC__ */
+#else                           /* !__GNUC__ */
 
-#include <string.h> /* needed for memmove */
+#include <string.h>             /* needed for memmove */
 
-static __inline__ uint64_t ldq_u(uint64_t *p)
+static __inline__ uint64_t
+ldq_u(uint64_t * p)
 {
-	uint64_t ret;
-	memmove(&ret, p, sizeof(*p));
-	return ret;
+    uint64_t ret;
+
+    memmove(&ret, p, sizeof(*p));
+    return ret;
 }
 
-static __inline__ uint32_t ldl_u(uint32_t *p)
+static __inline__ uint32_t
+ldl_u(uint32_t * p)
 {
-	uint32_t ret;
-	memmove(&ret, p, sizeof(*p));
-	return ret;
+    uint32_t ret;
+
+    memmove(&ret, p, sizeof(*p));
+    return ret;
 }
 
-static __inline__ uint16_t ldw_u(uint16_t *p)
+static __inline__ uint16_t
+ldw_u(uint16_t * p)
 {
-	uint16_t ret;
-	memmove(&ret, p, sizeof(*p));
-	return ret;
+    uint16_t ret;
+
+    memmove(&ret, p, sizeof(*p));
+    return ret;
 }
 
-static __inline__ void stq_u(uint64_t val, uint64_t *p)
+static __inline__ void
+stq_u(uint64_t val, uint64_t * p)
 {
-	uint64_t tmp = val;
-	memmove(p, &tmp, sizeof(*p));
+    uint64_t tmp = val;
+
+    memmove(p, &tmp, sizeof(*p));
 }
 
-static __inline__ void stl_u(uint32_t val, uint32_t *p)
+static __inline__ void
+stl_u(uint32_t val, uint32_t * p)
 {
-	uint32_t tmp = val;
-	memmove(p, &tmp, sizeof(*p));
+    uint32_t tmp = val;
+
+    memmove(p, &tmp, sizeof(*p));
 }
 
-static __inline__ void stw_u(uint16_t val, uint16_t *p)
+static __inline__ void
+stw_u(uint16_t val, uint16_t * p)
 {
-	uint16_t tmp = val;
-	memmove(p, &tmp, sizeof(*p));
+    uint16_t tmp = val;
+
+    memmove(p, &tmp, sizeof(*p));
 }
 
-#  endif /* __GNUC__ */
-# endif /* NO_INLINE */
+#endif                          /* __GNUC__ */
+#endif                          /* NO_INLINE */
 
-# ifndef NO_INLINE
-#  ifdef __GNUC__
-#   if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__alpha__))
+#ifndef NO_INLINE
+#ifdef __GNUC__
+#if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__alpha__))
 
-#    ifdef linux
+#ifdef linux
 /* for Linux on Alpha, we use the LIBC _inx/_outx routines */
 /* note that the appropriate setup via "ioperm" needs to be done */
 /*  *before* any inx/outx is done. */
@@ -358,24 +383,24 @@ outl(unsigned long port, unsigned int val)
 static __inline__ unsigned int
 inb(unsigned long port)
 {
-  return _inb(port);
+    return _inb(port);
 }
 
 static __inline__ unsigned int
 inw(unsigned long port)
 {
-  return _inw(port);
+    return _inw(port);
 }
 
 static __inline__ unsigned int
 inl(unsigned long port)
 {
-  return _inl(port);
+    return _inl(port);
 }
 
-#    endif /* linux */
+#endif                          /* linux */
 
-#    if (defined(__FreeBSD__) || defined(__OpenBSD__)) \
+#if (defined(__FreeBSD__) || defined(__OpenBSD__)) \
       && !defined(DO_PROTOTYPES)
 
 /* for FreeBSD and OpenBSD on Alpha, we use the libio (resp. libalpha) */
@@ -390,583 +415,567 @@ extern _X_EXPORT unsigned char inb(unsigned int port);
 extern _X_EXPORT unsigned short inw(unsigned int port);
 extern _X_EXPORT unsigned int inl(unsigned int port);
 
-#    endif /* (__FreeBSD__ || __OpenBSD__ ) && !DO_PROTOTYPES */
-
+#endif                          /* (__FreeBSD__ || __OpenBSD__ ) && !DO_PROTOTYPES */
 
 #if defined(__NetBSD__)
 #include <machine/pio.h>
-#endif /* __NetBSD__ */
+#endif                          /* __NetBSD__ */
+
+#elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
 
-#   elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
- 
-#    include <inttypes.h>
+#include <inttypes.h>
 
 static __inline__ void
 outb(unsigned short port, unsigned char val)
 {
-   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
+    __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port));
 }
 
-
 static __inline__ void
 outw(unsigned short port, unsigned short val)
 {
-   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));
+    __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port));
 }
 
 static __inline__ void
 outl(unsigned short port, unsigned int val)
 {
-   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));
+    __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port));
 }
 
 static __inline__ unsigned int
 inb(unsigned short port)
 {
-   unsigned char ret;
-   __asm__ __volatile__("inb %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
+    unsigned char ret;
+    __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
 }
 
 static __inline__ unsigned int
 inw(unsigned short port)
 {
-   unsigned short ret;
-   __asm__ __volatile__("inw %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
+    unsigned short ret;
+    __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
 }
 
 static __inline__ unsigned int
 inl(unsigned short port)
 {
-   unsigned int ret;
-   __asm__ __volatile__("inl %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
+    unsigned int ret;
+    __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
 }
 
-#   elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)
+#elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)
 
-#     ifndef ASI_PL
-#      define ASI_PL 0x88
-#     endif
+#ifndef ASI_PL
+#define ASI_PL 0x88
+#endif
 
 static __inline__ void
 outb(unsigned long port, unsigned char val)
 {
-	__asm__ __volatile__("stba %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (port), "i" (ASI_PL));
-	barrier();
+    __asm__ __volatile__("stba %0, [%1] %2":    /* No outputs */
+                         :"r"(val), "r"(port), "i"(ASI_PL));
+
+    barrier();
 }
 
 static __inline__ void
 outw(unsigned long port, unsigned short val)
 {
-	__asm__ __volatile__("stha %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (port), "i" (ASI_PL));
-	barrier();
+    __asm__ __volatile__("stha %0, [%1] %2":    /* No outputs */
+                         :"r"(val), "r"(port), "i"(ASI_PL));
+
+    barrier();
 }
 
 static __inline__ void
 outl(unsigned long port, unsigned int val)
 {
-	__asm__ __volatile__("sta %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (port), "i" (ASI_PL));
-	barrier();
+    __asm__ __volatile__("sta %0, [%1] %2":     /* No outputs */
+                         :"r"(val), "r"(port), "i"(ASI_PL));
+
+    barrier();
 }
 
 static __inline__ unsigned int
 inb(unsigned long port)
 {
-	unsigned int ret;
-	__asm__ __volatile__("lduba [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (port), "i" (ASI_PL));
-	return ret;
+    unsigned int ret;
+    __asm__ __volatile__("lduba [%1] %2, %0":"=r"(ret)
+                         :"r"(port), "i"(ASI_PL));
+
+    return ret;
 }
 
 static __inline__ unsigned int
 inw(unsigned long port)
 {
-	unsigned int ret;
-	__asm__ __volatile__("lduha [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (port), "i" (ASI_PL));
-	return ret;
+    unsigned int ret;
+    __asm__ __volatile__("lduha [%1] %2, %0":"=r"(ret)
+                         :"r"(port), "i"(ASI_PL));
+
+    return ret;
 }
 
 static __inline__ unsigned int
 inl(unsigned long port)
 {
-	unsigned int ret;
-	__asm__ __volatile__("lda [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (port), "i" (ASI_PL));
-	return ret;
+    unsigned int ret;
+    __asm__ __volatile__("lda [%1] %2, %0":"=r"(ret)
+                         :"r"(port), "i"(ASI_PL));
+
+    return ret;
 }
 
 static __inline__ unsigned char
 xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned char ret;
+    unsigned long addr = ((unsigned long) base) + offset;
+    unsigned char ret;
+
+    __asm__ __volatile__("lduba [%1] %2, %0":"=r"(ret)
+                         :"r"(addr), "i"(ASI_PL));
 
-	__asm__ __volatile__("lduba [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (addr), "i" (ASI_PL));
-	return ret;
+    return ret;
 }
 
 static __inline__ unsigned short
 xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned short ret;
+    unsigned long addr = ((unsigned long) base) + offset;
+    unsigned short ret;
 
-	__asm__ __volatile__("lduh [%1], %0"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
+    __asm__ __volatile__("lduh [%1], %0":"=r"(ret)
+                         :"r"(addr));
+
+    return ret;
 }
 
 static __inline__ unsigned short
 xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned short ret;
+    unsigned long addr = ((unsigned long) base) + offset;
+    unsigned short ret;
+
+    __asm__ __volatile__("lduha [%1] %2, %0":"=r"(ret)
+                         :"r"(addr), "i"(ASI_PL));
 
-	__asm__ __volatile__("lduha [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (addr), "i" (ASI_PL));
-	return ret;
+    return ret;
 }
 
 static __inline__ unsigned int
 xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned int ret;
+    unsigned long addr = ((unsigned long) base) + offset;
+    unsigned int ret;
 
-	__asm__ __volatile__("ld [%1], %0"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
+    __asm__ __volatile__("ld [%1], %0":"=r"(ret)
+                         :"r"(addr));
+
+    return ret;
 }
 
 static __inline__ unsigned int
 xf86ReadMmio32Le(__volatile__ void *base, const unsigned long offset)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned int ret;
+    unsigned long addr = ((unsigned long) base) + offset;
+    unsigned int ret;
+
+    __asm__ __volatile__("lda [%1] %2, %0":"=r"(ret)
+                         :"r"(addr), "i"(ASI_PL));
 
-	__asm__ __volatile__("lda [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (addr), "i" (ASI_PL));
-	return ret;
+    return ret;
 }
 
 static __inline__ void
 xf86WriteMmio8(__volatile__ void *base, const unsigned long offset,
-	       const unsigned int val)
+               const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
 
-	__asm__ __volatile__("stba %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
-	barrier();
+    __asm__ __volatile__("stba %0, [%1] %2":    /* No outputs */
+                         :"r"(val), "r"(addr), "i"(ASI_PL));
+
+    barrier();
 }
 
 static __inline__ void
 xf86WriteMmio16Be(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
+                  const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
+
+    __asm__ __volatile__("sth %0, [%1]":        /* No outputs */
+                         :"r"(val), "r"(addr));
 
-	__asm__ __volatile__("sth %0, [%1]"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
-	barrier();
+    barrier();
 }
 
 static __inline__ void
 xf86WriteMmio16Le(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
+                  const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
+
+    __asm__ __volatile__("stha %0, [%1] %2":    /* No outputs */
+                         :"r"(val), "r"(addr), "i"(ASI_PL));
 
-	__asm__ __volatile__("stha %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
-	barrier();
+    barrier();
 }
 
 static __inline__ void
 xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
+                  const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
+
+    __asm__ __volatile__("st %0, [%1]": /* No outputs */
+                         :"r"(val), "r"(addr));
 
-	__asm__ __volatile__("st %0, [%1]"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
-	barrier();
+    barrier();
 }
 
 static __inline__ void
 xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
+                  const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
+
+    __asm__ __volatile__("sta %0, [%1] %2":     /* No outputs */
+                         :"r"(val), "r"(addr), "i"(ASI_PL));
 
-	__asm__ __volatile__("sta %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
-	barrier();
+    barrier();
 }
 
 static __inline__ void
 xf86WriteMmio8NB(__volatile__ void *base, const unsigned long offset,
-		 const unsigned int val)
+                 const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
 
-	__asm__ __volatile__("stba %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
+    __asm__ __volatile__("stba %0, [%1] %2":    /* No outputs */
+                         :"r"(val), "r"(addr), "i"(ASI_PL));
 }
 
 static __inline__ void
 xf86WriteMmio16BeNB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
+                    const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
 
-	__asm__ __volatile__("sth %0, [%1]"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
+    __asm__ __volatile__("sth %0, [%1]":        /* No outputs */
+                         :"r"(val), "r"(addr));
 }
 
 static __inline__ void
 xf86WriteMmio16LeNB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
+                    const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
 
-	__asm__ __volatile__("stha %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
+    __asm__ __volatile__("stha %0, [%1] %2":    /* No outputs */
+                         :"r"(val), "r"(addr), "i"(ASI_PL));
 }
 
 static __inline__ void
 xf86WriteMmio32BeNB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
+                    const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
 
-	__asm__ __volatile__("st %0, [%1]"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
+    __asm__ __volatile__("st %0, [%1]": /* No outputs */
+                         :"r"(val), "r"(addr));
 }
 
 static __inline__ void
 xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
+                    const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
 
-	__asm__ __volatile__("sta %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
+    __asm__ __volatile__("sta %0, [%1] %2":     /* No outputs */
+                         :"r"(val), "r"(addr), "i"(ASI_PL));
 }
 
-#   elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
-#    ifdef __arm32__
-#     define PORT_SIZE long
-#    else
-#     define PORT_SIZE short
-#    endif
+#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
+#ifdef __arm32__
+#define PORT_SIZE long
+#else
+#define PORT_SIZE short
+#endif
 
-_X_EXPORT unsigned int IOPortBase;  /* Memory mapped I/O port area */
+_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
 
 static __inline__ void
 outb(unsigned PORT_SIZE port, unsigned char val)
 {
-	*(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
+    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
+        val;
 }
 
 static __inline__ void
 outw(unsigned PORT_SIZE port, unsigned short val)
 {
-	*(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
+    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
+        val;
 }
 
 static __inline__ void
 outl(unsigned PORT_SIZE port, unsigned int val)
 {
-	*(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
+    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
+        val;
 }
 
 static __inline__ unsigned int
 inb(unsigned PORT_SIZE port)
 {
-	return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase);
+    return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
+                                        IOPortBase);
 }
 
 static __inline__ unsigned int
 inw(unsigned PORT_SIZE port)
 {
-	return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase);
+    return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
+                                         IOPortBase);
 }
 
 static __inline__ unsigned int
 inl(unsigned PORT_SIZE port)
 {
-	return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase);
+    return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
+                                       IOPortBase);
 }
 
-
-#    if defined(__mips__)
-#     ifdef linux	/* don't mess with other OSs */
-#       if X_BYTE_ORDER == X_BIG_ENDIAN
+#if defined(__mips__)
+#ifdef linux                    /* don't mess with other OSs */
+#if X_BYTE_ORDER == X_BIG_ENDIAN
 static __inline__ unsigned int
 xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned int ret;
+    unsigned long addr = ((unsigned long) base) + offset;
+    unsigned int ret;
 
-	__asm__ __volatile__("lw %0, 0(%1)"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
+    __asm__ __volatile__("lw %0, 0(%1)":"=r"(ret)
+                         :"r"(addr));
+
+    return ret;
 }
 
 static __inline__ void
 xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
+                  const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
 
-	__asm__ __volatile__("sw %0, 0(%1)"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
+    __asm__ __volatile__("sw %0, 0(%1)":        /* No outputs */
+                         :"r"(val), "r"(addr));
 }
-#      endif
-#     endif /* !linux */
-#    endif /* __mips__ */
+#endif
+#endif                          /* !linux */
+#endif                          /* __mips__ */
 
-#   elif (defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)
+#elif (defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)
 
-#    ifndef MAP_FAILED
-#     define MAP_FAILED ((void *)-1)
-#    endif
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
 
 extern _X_EXPORT volatile unsigned char *ioBase;
 
 static __inline__ unsigned char
 xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
 {
-        register unsigned char val;
-        __asm__ __volatile__(
-                        "lbzx %0,%1,%2\n\t"
-                        "eieio"
-                        : "=r" (val)
-                        : "b" (base), "r" (offset),
-                        "m" (*((volatile unsigned char *)base+offset)));
-        return val;
+    register unsigned char val;
+    __asm__ __volatile__("lbzx %0,%1,%2\n\t" "eieio":"=r"(val)
+                         :"b"(base), "r"(offset),
+                         "m"(*((volatile unsigned char *) base + offset)));
+    return val;
 }
 
 static __inline__ unsigned short
 xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)
 {
-        register unsigned short val;
-        __asm__ __volatile__(
-                        "lhzx %0,%1,%2\n\t"
-                        "eieio"
-                        : "=r" (val)
-                        : "b" (base), "r" (offset),
-                        "m" (*((volatile unsigned char *)base+offset)));
-        return val;
+    register unsigned short val;
+    __asm__ __volatile__("lhzx %0,%1,%2\n\t" "eieio":"=r"(val)
+                         :"b"(base), "r"(offset),
+                         "m"(*((volatile unsigned char *) base + offset)));
+    return val;
 }
 
 static __inline__ unsigned short
 xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)
 {
-        register unsigned short val;
-        __asm__ __volatile__(
-                        "lhbrx %0,%1,%2\n\t"
-                        "eieio"
-                        : "=r" (val)
-                        : "b" (base), "r" (offset),
-                        "m" (*((volatile unsigned char *)base+offset)));
-        return val;
+    register unsigned short val;
+    __asm__ __volatile__("lhbrx %0,%1,%2\n\t" "eieio":"=r"(val)
+                         :"b"(base), "r"(offset),
+                         "m"(*((volatile unsigned char *) base + offset)));
+    return val;
 }
 
 static __inline__ unsigned int
 xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
 {
-        register unsigned int val;
-        __asm__ __volatile__(
-                        "lwzx %0,%1,%2\n\t"
-                        "eieio"
-                        : "=r" (val)
-                        : "b" (base), "r" (offset),
-                        "m" (*((volatile unsigned char *)base+offset)));
-        return val;
+    register unsigned int val;
+    __asm__ __volatile__("lwzx %0,%1,%2\n\t" "eieio":"=r"(val)
+                         :"b"(base), "r"(offset),
+                         "m"(*((volatile unsigned char *) base + offset)));
+    return val;
 }
 
 static __inline__ unsigned int
 xf86ReadMmio32Le(__volatile__ void *base, const unsigned long offset)
 {
-        register unsigned int val;
-        __asm__ __volatile__(
-                        "lwbrx %0,%1,%2\n\t"
-                        "eieio"
-                        : "=r" (val)
-                        : "b" (base), "r" (offset),
-                        "m" (*((volatile unsigned char *)base+offset)));
-        return val;
+    register unsigned int val;
+    __asm__ __volatile__("lwbrx %0,%1,%2\n\t" "eieio":"=r"(val)
+                         :"b"(base), "r"(offset),
+                         "m"(*((volatile unsigned char *) base + offset)));
+    return val;
 }
 
 static __inline__ void
 xf86WriteMmioNB8(__volatile__ void *base, const unsigned long offset,
-		 const unsigned char val)
+                 const unsigned char val)
 {
-        __asm__ __volatile__(
-                        "stbx %1,%2,%3\n\t"
-                        : "=m" (*((volatile unsigned char *)base+offset))
-                        : "r" (val), "b" (base), "r" (offset));
+    __asm__
+        __volatile__("stbx %1,%2,%3\n\t":"=m"
+                     (*((volatile unsigned char *) base + offset))
+                     :"r"(val), "b"(base), "r"(offset));
 }
 
 static __inline__ void
 xf86WriteMmioNB16Le(__volatile__ void *base, const unsigned long offset,
-		    const unsigned short val)
+                    const unsigned short val)
 {
-        __asm__ __volatile__(
-                        "sthbrx %1,%2,%3\n\t"
-                        : "=m" (*((volatile unsigned char *)base+offset))
-                        : "r" (val), "b" (base), "r" (offset));
+    __asm__
+        __volatile__("sthbrx %1,%2,%3\n\t":"=m"
+                     (*((volatile unsigned char *) base + offset))
+                     :"r"(val), "b"(base), "r"(offset));
 }
 
 static __inline__ void
 xf86WriteMmioNB16Be(__volatile__ void *base, const unsigned long offset,
-		    const unsigned short val)
+                    const unsigned short val)
 {
-        __asm__ __volatile__(
-                        "sthx %1,%2,%3\n\t"
-                        : "=m" (*((volatile unsigned char *)base+offset))
-                        : "r" (val), "b" (base), "r" (offset));
+    __asm__
+        __volatile__("sthx %1,%2,%3\n\t":"=m"
+                     (*((volatile unsigned char *) base + offset))
+                     :"r"(val), "b"(base), "r"(offset));
 }
 
 static __inline__ void
 xf86WriteMmioNB32Le(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
+                    const unsigned int val)
 {
-        __asm__ __volatile__(
-                        "stwbrx %1,%2,%3\n\t"
-                        : "=m" (*((volatile unsigned char *)base+offset))
-                        : "r" (val), "b" (base), "r" (offset));
+    __asm__
+        __volatile__("stwbrx %1,%2,%3\n\t":"=m"
+                     (*((volatile unsigned char *) base + offset))
+                     :"r"(val), "b"(base), "r"(offset));
 }
 
 static __inline__ void
 xf86WriteMmioNB32Be(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
+                    const unsigned int val)
 {
-        __asm__ __volatile__(
-                        "stwx %1,%2,%3\n\t"
-                        : "=m" (*((volatile unsigned char *)base+offset))
-                        : "r" (val), "b" (base), "r" (offset));
+    __asm__
+        __volatile__("stwx %1,%2,%3\n\t":"=m"
+                     (*((volatile unsigned char *) base + offset))
+                     :"r"(val), "b"(base), "r"(offset));
 }
 
 static __inline__ void
 xf86WriteMmio8(__volatile__ void *base, const unsigned long offset,
                const unsigned char val)
 {
-        xf86WriteMmioNB8(base, offset, val);
-        eieio();
+    xf86WriteMmioNB8(base, offset, val);
+    eieio();
 }
 
 static __inline__ void
 xf86WriteMmio16Le(__volatile__ void *base, const unsigned long offset,
                   const unsigned short val)
 {
-        xf86WriteMmioNB16Le(base, offset, val);
-        eieio();
+    xf86WriteMmioNB16Le(base, offset, val);
+    eieio();
 }
 
 static __inline__ void
 xf86WriteMmio16Be(__volatile__ void *base, const unsigned long offset,
                   const unsigned short val)
 {
-        xf86WriteMmioNB16Be(base, offset, val);
-        eieio();
+    xf86WriteMmioNB16Be(base, offset, val);
+    eieio();
 }
 
 static __inline__ void
 xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
                   const unsigned int val)
 {
-        xf86WriteMmioNB32Le(base, offset, val);
-        eieio();
+    xf86WriteMmioNB32Le(base, offset, val);
+    eieio();
 }
 
 static __inline__ void
 xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
                   const unsigned int val)
 {
-        xf86WriteMmioNB32Be(base, offset, val);
-        eieio();
+    xf86WriteMmioNB32Be(base, offset, val);
+    eieio();
 }
 
-
 static __inline__ void
 outb(unsigned short port, unsigned char value)
 {
-        if(ioBase == MAP_FAILED) return;
-        xf86WriteMmio8((void *)ioBase, port, value);
+    if (ioBase == MAP_FAILED)
+        return;
+    xf86WriteMmio8((void *) ioBase, port, value);
 }
 
 static __inline__ void
 outw(unsigned short port, unsigned short value)
 {
-        if(ioBase == MAP_FAILED) return;
-        xf86WriteMmio16Le((void *)ioBase, port, value);
+    if (ioBase == MAP_FAILED)
+        return;
+    xf86WriteMmio16Le((void *) ioBase, port, value);
 }
 
 static __inline__ void
 outl(unsigned short port, unsigned int value)
 {
-        if(ioBase == MAP_FAILED) return;
-        xf86WriteMmio32Le((void *)ioBase, port, value);
+    if (ioBase == MAP_FAILED)
+        return;
+    xf86WriteMmio32Le((void *) ioBase, port, value);
 }
 
 static __inline__ unsigned int
 inb(unsigned short port)
 {
-        if(ioBase == MAP_FAILED) return 0;
-        return xf86ReadMmio8((void *)ioBase, port);
+    if (ioBase == MAP_FAILED)
+        return 0;
+    return xf86ReadMmio8((void *) ioBase, port);
 }
 
 static __inline__ unsigned int
 inw(unsigned short port)
 {
-        if(ioBase == MAP_FAILED) return 0;
-        return xf86ReadMmio16Le((void *)ioBase, port);
+    if (ioBase == MAP_FAILED)
+        return 0;
+    return xf86ReadMmio16Le((void *) ioBase, port);
 }
 
 static __inline__ unsigned int
 inl(unsigned short port)
 {
-        if(ioBase == MAP_FAILED) return 0;
-        return xf86ReadMmio32Le((void *)ioBase, port);
+    if (ioBase == MAP_FAILED)
+        return 0;
+    return xf86ReadMmio32Le((void *) ioBase, port);
 }
 
 #elif defined(__arm__) && defined(__linux__)
@@ -999,7 +1008,7 @@ xf_outl(unsigned short port, unsigned int val)
 #define outw xf_outw
 #define outl xf_outl
 
-#   elif defined(__nds32__)
+#elif defined(__nds32__)
 
 /*
  * Assume all port access are aligned.  We need to revise this implementation
@@ -1007,352 +1016,326 @@ xf_outl(unsigned short port, unsigned int val)
  * stw_u, they are assumed unaligned.
  */
 
-#define barrier()		/* no barrier */
+#define barrier()               /* no barrier */
 
 #define PORT_SIZE long
 
 static __inline__ unsigned char
 xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
 {
-	return *(volatile unsigned char *)((unsigned char *)base + offset) ;
+    return *(volatile unsigned char *) ((unsigned char *) base + offset);
 }
 
 static __inline__ void
 xf86WriteMmio8(__volatile__ void *base, const unsigned long offset,
-	       const unsigned int val)
+               const unsigned int val)
 {
-	*(volatile unsigned char *)((unsigned char *)base + offset) = val ;
-	barrier();
+    *(volatile unsigned char *) ((unsigned char *) base + offset) = val;
+    barrier();
 }
 
 static __inline__ void
 xf86WriteMmio8NB(__volatile__ void *base, const unsigned long offset,
-		 const unsigned int val)
+                 const unsigned int val)
 {
-	*(volatile unsigned char *)((unsigned char *)base + offset) = val ;
+    *(volatile unsigned char *) ((unsigned char *) base + offset) = val;
 }
 
 static __inline__ unsigned short
 xf86ReadMmio16Swap(__volatile__ void *base, const unsigned long offset)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned short ret;
+    unsigned long addr = ((unsigned long) base) + offset;
+    unsigned short ret;
 
-	__asm__ __volatile__(
-	           "lhi %0, [%1];\n\t"
-	           "wsbh %0, %0;\n\t"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
+    __asm__ __volatile__("lhi %0, [%1];\n\t" "wsbh %0, %0;\n\t":"=r"(ret)
+                         :"r"(addr));
+
+    return ret;
 }
 
 static __inline__ unsigned short
 xf86ReadMmio16(__volatile__ void *base, const unsigned long offset)
 {
-	return *(volatile unsigned short *)((char *)base + offset) ;
+    return *(volatile unsigned short *) ((char *) base + offset);
 }
 
 static __inline__ void
 xf86WriteMmio16Swap(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
+                    const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
+
+    __asm__ __volatile__("wsbh %0, %0;\n\t" "shi %0, [%1];\n\t":        /* No outputs */
+                         :"r"(val), "r"(addr));
 
-	__asm__ __volatile__(
-	           "wsbh %0, %0;\n\t"
-	           "shi %0, [%1];\n\t"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
-	barrier();
+    barrier();
 }
 
 static __inline__ void
 xf86WriteMmio16(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
+                const unsigned int val)
 {
-	*(volatile unsigned short *)((unsigned char *)base + offset) = val ;
-	barrier();
+    *(volatile unsigned short *) ((unsigned char *) base + offset) = val;
+    barrier();
 }
 
 static __inline__ void
 xf86WriteMmio16SwapNB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
+                      const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
 
-	__asm__ __volatile__(
-	           "wsbh %0, %0;\n\t"
-	           "shi %0, [%1];\n\t"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
+    __asm__ __volatile__("wsbh %0, %0;\n\t" "shi %0, [%1];\n\t":        /* No outputs */
+                         :"r"(val), "r"(addr));
 }
 
 static __inline__ void
 xf86WriteMmio16NB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
+                  const unsigned int val)
 {
-	*(volatile unsigned short *)((unsigned char *)base + offset) = val ;
+    *(volatile unsigned short *) ((unsigned char *) base + offset) = val;
 }
 
 static __inline__ unsigned int
 xf86ReadMmio32Swap(__volatile__ void *base, const unsigned long offset)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned int ret;
+    unsigned long addr = ((unsigned long) base) + offset;
+    unsigned int ret;
+
+    __asm__ __volatile__("lwi %0, [%1];\n\t"
+                         "wsbh %0, %0;\n\t" "rotri %0, %0, 16;\n\t":"=r"(ret)
+                         :"r"(addr));
 
-	__asm__ __volatile__(
-	           "lwi %0, [%1];\n\t"
-	           "wsbh %0, %0;\n\t"
-				  "rotri %0, %0, 16;\n\t"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
+    return ret;
 }
 
 static __inline__ unsigned int
 xf86ReadMmio32(__volatile__ void *base, const unsigned long offset)
 {
-	return *(volatile unsigned int *)((unsigned char *)base + offset) ;
+    return *(volatile unsigned int *) ((unsigned char *) base + offset);
 }
 
 static __inline__ void
 xf86WriteMmio32Swap(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
+                    const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
 
-	__asm__ __volatile__(
-	           "wsbh %0, %0;\n\t"
-	           "rotri %0, %0, 16;\n\t"
-				  "swi %0, [%1];\n\t"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
-	barrier();
+    __asm__ __volatile__("wsbh %0, %0;\n\t" "rotri %0, %0, 16;\n\t" "swi %0, [%1];\n\t":        /* No outputs */
+                         :"r"(val), "r"(addr));
+
+    barrier();
 }
 
 static __inline__ void
 xf86WriteMmio32(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
+                const unsigned int val)
 {
-	*(volatile unsigned int *)((unsigned char *)base + offset) = val ;
-	barrier();
+    *(volatile unsigned int *) ((unsigned char *) base + offset) = val;
+    barrier();
 }
 
 static __inline__ void
 xf86WriteMmio32SwapNB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
+                      const unsigned int val)
 {
-	unsigned long addr = ((unsigned long)base) + offset;
+    unsigned long addr = ((unsigned long) base) + offset;
 
-	__asm__ __volatile__(
-	           "wsbh %0, %0;\n\t"
-				  "rotri %0, %0, 16;\n\t"
-				  "swi %0, [%1];\n\t"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
+    __asm__ __volatile__("wsbh %0, %0;\n\t" "rotri %0, %0, 16;\n\t" "swi %0, [%1];\n\t":        /* No outputs */
+                         :"r"(val), "r"(addr));
 }
 
 static __inline__ void
 xf86WriteMmio32NB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
+                  const unsigned int val)
 {
-	*(volatile unsigned int *)((unsigned char *)base + offset) = val ;
+    *(volatile unsigned int *) ((unsigned char *) base + offset) = val;
 }
 
-#    if defined(NDS32_MMIO_SWAP)
+#if defined(NDS32_MMIO_SWAP)
 static __inline__ void
 outb(unsigned PORT_SIZE port, unsigned char val)
 {
-   xf86WriteMmio8(IOPortBase, port, val);
+    xf86WriteMmio8(IOPortBase, port, val);
 }
 
 static __inline__ void
 outw(unsigned PORT_SIZE port, unsigned short val)
 {
-   xf86WriteMmio16Swap(IOPortBase, port, val);
+    xf86WriteMmio16Swap(IOPortBase, port, val);
 }
 
 static __inline__ void
 outl(unsigned PORT_SIZE port, unsigned int val)
 {
-   xf86WriteMmio32Swap(IOPortBase, port, val);
+    xf86WriteMmio32Swap(IOPortBase, port, val);
 }
 
 static __inline__ unsigned int
 inb(unsigned PORT_SIZE port)
 {
-   return xf86ReadMmio8(IOPortBase, port);
+    return xf86ReadMmio8(IOPortBase, port);
 }
 
 static __inline__ unsigned int
 inw(unsigned PORT_SIZE port)
 {
-   return xf86ReadMmio16Swap(IOPortBase, port);
+    return xf86ReadMmio16Swap(IOPortBase, port);
 }
 
 static __inline__ unsigned int
 inl(unsigned PORT_SIZE port)
 {
-   return xf86ReadMmio32Swap(IOPortBase, port);
+    return xf86ReadMmio32Swap(IOPortBase, port);
 }
 
-static __inline__ unsigned long ldq_u(unsigned long *p)
+static __inline__ unsigned long
+ldq_u(unsigned long *p)
 {
-	unsigned long addr = (unsigned long)p;
-	unsigned int ret;
+    unsigned long addr = (unsigned long) p;
+    unsigned int ret;
+
+    __asm__ __volatile__("lmw.bi %0, [%1], %0, 0;\n\t"
+                         "wsbh %0, %0;\n\t" "rotri %0, %0, 16;\n\t":"=r"(ret)
+                         :"r"(addr));
 
-	__asm__ __volatile__(
-				  "lmw.bi %0, [%1], %0, 0;\n\t"
-	           "wsbh %0, %0;\n\t"
-				  "rotri %0, %0, 16;\n\t"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
+    return ret;
 }
 
-static __inline__ unsigned long ldl_u(unsigned int *p)
+static __inline__ unsigned long
+ldl_u(unsigned int *p)
 {
-	unsigned long addr = (unsigned long)p;
-	unsigned int ret;
+    unsigned long addr = (unsigned long) p;
+    unsigned int ret;
 
-	__asm__ __volatile__(
-				  "lmw.bi %0, [%1], %0, 0;\n\t"
-	           "wsbh %0, %0;\n\t"
-				  "rotri %0, %0, 16;\n\t"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
+    __asm__ __volatile__("lmw.bi %0, [%1], %0, 0;\n\t"
+                         "wsbh %0, %0;\n\t" "rotri %0, %0, 16;\n\t":"=r"(ret)
+                         :"r"(addr));
+
+    return ret;
 }
 
-static __inline__ void stq_u(unsigned long val, unsigned long *p)
+static __inline__ void
+stq_u(unsigned long val, unsigned long *p)
 {
-	unsigned long addr = (unsigned long)p;
+    unsigned long addr = (unsigned long) p;
 
-	__asm__ __volatile__(
-	           "wsbh %0, %0;\n\t"
-				  "rotri %0, %0, 16;\n\t"
-				  "smw.bi %0, [%1], %0, 0;\n\t"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
+    __asm__ __volatile__("wsbh %0, %0;\n\t" "rotri %0, %0, 16;\n\t" "smw.bi %0, [%1], %0, 0;\n\t":      /* No outputs */
+                         :"r"(val), "r"(addr));
 }
 
-static __inline__ void stl_u(unsigned long val, unsigned int *p)
+static __inline__ void
+stl_u(unsigned long val, unsigned int *p)
 {
-	unsigned long addr = (unsigned long)p;
+    unsigned long addr = (unsigned long) p;
 
-	__asm__ __volatile__(
-	           "wsbh %0, %0;\n\t"
-				  "rotri %0, %0, 16;\n\t"
-				  "smw.bi %0, [%1], %0, 0;\n\t"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
+    __asm__ __volatile__("wsbh %0, %0;\n\t" "rotri %0, %0, 16;\n\t" "smw.bi %0, [%1], %0, 0;\n\t":      /* No outputs */
+                         :"r"(val), "r"(addr));
 }
 
-#    else /* !NDS32_MMIO_SWAP */
+#else                           /* !NDS32_MMIO_SWAP */
 static __inline__ void
 outb(unsigned PORT_SIZE port, unsigned char val)
 {
-	*(volatile unsigned char*)(((unsigned PORT_SIZE)(port))) = val;
-	barrier();
+    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port))) = val;
+    barrier();
 }
 
 static __inline__ void
 outw(unsigned PORT_SIZE port, unsigned short val)
 {
-	*(volatile unsigned short*)(((unsigned PORT_SIZE)(port))) = val;
-	barrier();
+    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port))) = val;
+    barrier();
 }
 
 static __inline__ void
 outl(unsigned PORT_SIZE port, unsigned int val)
 {
-	*(volatile unsigned int*)(((unsigned PORT_SIZE)(port))) = val;
-	barrier();
+    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port))) = val;
+    barrier();
 }
+
 static __inline__ unsigned int
 inb(unsigned PORT_SIZE port)
 {
-	return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port)));
+    return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)));
 }
 
 static __inline__ unsigned int
 inw(unsigned PORT_SIZE port)
 {
-	return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port)));
+    return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)));
 }
 
 static __inline__ unsigned int
 inl(unsigned PORT_SIZE port)
 {
-	return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port)));
+    return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)));
 }
 
-static __inline__ unsigned long ldq_u(unsigned long *p)
+static __inline__ unsigned long
+ldq_u(unsigned long *p)
 {
-	unsigned long addr = (unsigned long)p;
-	unsigned int ret;
+    unsigned long addr = (unsigned long) p;
+    unsigned int ret;
 
-	__asm__ __volatile__(
-				  "lmw.bi %0, [%1], %0, 0;\n\t"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
+    __asm__ __volatile__("lmw.bi %0, [%1], %0, 0;\n\t":"=r"(ret)
+                         :"r"(addr));
+
+    return ret;
 }
 
-static __inline__ unsigned long ldl_u(unsigned int *p)
+static __inline__ unsigned long
+ldl_u(unsigned int *p)
 {
-	unsigned long addr = (unsigned long)p;
-	unsigned int ret;
+    unsigned long addr = (unsigned long) p;
+    unsigned int ret;
 
-	__asm__ __volatile__(
-				  "lmw.bi %0, [%1], %0, 0;\n\t"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
-}
+    __asm__ __volatile__("lmw.bi %0, [%1], %0, 0;\n\t":"=r"(ret)
+                         :"r"(addr));
 
+    return ret;
+}
 
-static __inline__ void stq_u(unsigned long val, unsigned long *p)
+static __inline__ void
+stq_u(unsigned long val, unsigned long *p)
 {
-	unsigned long addr = (unsigned long)p;
+    unsigned long addr = (unsigned long) p;
 
-	__asm__ __volatile__(
-				  "smw.bi %0, [%1], %0, 0;\n\t"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
+    __asm__ __volatile__("smw.bi %0, [%1], %0, 0;\n\t": /* No outputs */
+                         :"r"(val), "r"(addr));
 }
 
-static __inline__ void stl_u(unsigned long val, unsigned int *p)
+static __inline__ void
+stl_u(unsigned long val, unsigned int *p)
 {
-	unsigned long addr = (unsigned long)p;
+    unsigned long addr = (unsigned long) p;
 
-	__asm__ __volatile__(
-				  "smw.bi %0, [%1], %0, 0;\n\t"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
+    __asm__ __volatile__("smw.bi %0, [%1], %0, 0;\n\t": /* No outputs */
+                         :"r"(val), "r"(addr));
 }
-#    endif /* NDS32_MMIO_SWAP */
+#endif                          /* NDS32_MMIO_SWAP */
 
-#    if (((X_BYTE_ORDER == X_BIG_ENDIAN) && !defined(NDS32_MMIO_SWAP)) || ((X_BYTE_ORDER != X_BIG_ENDIAN) && defined(NDS32_MMIO_SWAP)))
-#    define ldw_u(p)	((*(unsigned char *)(p)) << 8 | \
+#if (((X_BYTE_ORDER == X_BIG_ENDIAN) && !defined(NDS32_MMIO_SWAP)) || ((X_BYTE_ORDER != X_BIG_ENDIAN) && defined(NDS32_MMIO_SWAP)))
+#define ldw_u(p)	((*(unsigned char *)(p)) << 8 | \
 			(*((unsigned char *)(p)+1)))
-#    define stw_u(v,p)	(*(unsigned char *)(p)) = ((v) >> 8); \
+#define stw_u(v,p)	(*(unsigned char *)(p)) = ((v) >> 8); \
 				(*((unsigned char *)(p)+1)) = (v)
-#    else
-#    define ldw_u(p)	((*(unsigned char *)(p)) | \
+#else
+#define ldw_u(p)	((*(unsigned char *)(p)) | \
 			(*((unsigned char *)(p)+1)<<8))
-#    define stw_u(v,p)	(*(unsigned char *)(p)) = (v); \
+#define stw_u(v,p)	(*(unsigned char *)(p)) = (v); \
 				(*((unsigned char *)(p)+1)) = ((v) >> 8)
-#    endif
+#endif
 
-#    define mem_barrier()         /* XXX: nop for now */
-#    define write_mem_barrier()   /* XXX: nop for now */
+#define mem_barrier()           /* XXX: nop for now */
+#define write_mem_barrier()     /* XXX: nop for now */
 
-#   else /* ix86 */
+#else                           /* ix86 */
 
-#    if !defined(__SUNPRO_C)
-#    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
-#     ifdef GCCUSESGAS
+#if !defined(__SUNPRO_C)
+#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
+#ifdef GCCUSESGAS
 
 /*
  * If gcc uses gas rather than the native assembler, the syntax of these
@@ -1362,105 +1345,98 @@ static __inline__ void stl_u(unsigned long val, unsigned int *p)
 static __inline__ void
 outb(unsigned short port, unsigned char val)
 {
-   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
+    __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port));
 }
 
-
 static __inline__ void
 outw(unsigned short port, unsigned short val)
 {
-   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));
+    __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port));
 }
 
 static __inline__ void
 outl(unsigned short port, unsigned int val)
 {
-   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));
+    __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port));
 }
 
 static __inline__ unsigned int
 inb(unsigned short port)
 {
-   unsigned char ret;
-   __asm__ __volatile__("inb %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
+    unsigned char ret;
+    __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
 }
 
 static __inline__ unsigned int
 inw(unsigned short port)
 {
-   unsigned short ret;
-   __asm__ __volatile__("inw %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
+    unsigned short ret;
+    __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
 }
 
 static __inline__ unsigned int
 inl(unsigned short port)
 {
-   unsigned int ret;
-   __asm__ __volatile__("inl %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
+    unsigned int ret;
+    __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
 }
 
-#     else	/* GCCUSESGAS */
+#else                           /* GCCUSESGAS */
 
 static __inline__ void
 outb(unsigned short port, unsigned char val)
 {
-  __asm__ __volatile__("out%B0 (%1)" : :"a" (val), "d" (port));
+    __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port));
 }
 
 static __inline__ void
 outw(unsigned short port, unsigned short val)
 {
-  __asm__ __volatile__("out%W0 (%1)" : :"a" (val), "d" (port));
+    __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port));
 }
 
 static __inline__ void
 outl(unsigned short port, unsigned int val)
 {
-  __asm__ __volatile__("out%L0 (%1)" : :"a" (val), "d" (port));
+    __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port));
 }
 
 static __inline__ unsigned int
 inb(unsigned short port)
 {
-  unsigned char ret;
-  __asm__ __volatile__("in%B0 (%1)" :
-		   "=a" (ret) :
-		   "d" (port));
-  return ret;
+    unsigned char ret;
+    __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port));
+
+    return ret;
 }
 
 static __inline__ unsigned int
 inw(unsigned short port)
 {
-  unsigned short ret;
-  __asm__ __volatile__("in%W0 (%1)" :
-		   "=a" (ret) :
-		   "d" (port));
-  return ret;
+    unsigned short ret;
+    __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port));
+
+    return ret;
 }
 
 static __inline__ unsigned int
 inl(unsigned short port)
 {
-  unsigned int ret;
-  __asm__ __volatile__("in%L0 (%1)" :
-                   "=a" (ret) :
-                   "d" (port));
-  return ret;
+    unsigned int ret;
+    __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port));
+
+    return ret;
 }
 
-#     endif /* GCCUSESGAS */
+#endif                          /* GCCUSESGAS */
 
-#    else /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */
+#else                           /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */
 
 static __inline__ void
 outb(unsigned short port, unsigned char val)
@@ -1480,141 +1456,143 @@ outl(unsigned short port, unsigned int val)
 static __inline__ unsigned int
 inb(unsigned short port)
 {
-  return 0;
+    return 0;
 }
 
 static __inline__ unsigned int
 inw(unsigned short port)
 {
-  return 0;
+    return 0;
 }
 
 static __inline__ unsigned int
 inl(unsigned short port)
 {
-  return 0;
+    return 0;
 }
 
-#    endif /* FAKEIT */
-#    endif /* __SUNPRO_C */
+#endif                          /* FAKEIT */
+#endif                          /* __SUNPRO_C */
 
-#   endif /* ix86 */
+#endif                          /* ix86 */
 
-#  else /* !GNUC */
-#    if defined(__STDC__) && (__STDC__ == 1)
-#     ifndef asm
-#      define asm __asm
-#     endif
-#    endif
-#     if !defined(__SUNPRO_C)
-#      include <sys/inline.h>
-#     endif
-#    if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \
+#else                           /* !GNUC */
+#if defined(__STDC__) && (__STDC__ == 1)
+#ifndef asm
+#define asm __asm
+#endif
+#endif
+#if !defined(__SUNPRO_C)
+#include <sys/inline.h>
+#endif
+#if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \
 	defined(__USLC__)
-#     pragma asm partial_optimization outl
-#     pragma asm partial_optimization outw
-#     pragma asm partial_optimization outb
-#     pragma asm partial_optimization inl
-#     pragma asm partial_optimization inw
-#     pragma asm partial_optimization inb
-#    endif
-#  endif /* __GNUC__ */
-
-# endif /* NO_INLINE */
-
-# ifdef __alpha__
+#pragma asm partial_optimization outl
+#pragma asm partial_optimization outw
+#pragma asm partial_optimization outb
+#pragma asm partial_optimization inl
+#pragma asm partial_optimization inw
+#pragma asm partial_optimization inb
+#endif
+#endif                          /* __GNUC__ */
+
+#endif                          /* NO_INLINE */
+
+#ifdef __alpha__
 /* entry points for Mmio memory access routines */
-extern _X_EXPORT int (*xf86ReadMmio8)(void *, unsigned long);
-extern _X_EXPORT int (*xf86ReadMmio16)(void *, unsigned long);
-#  ifndef STANDALONE_MMIO
-extern _X_EXPORT int (*xf86ReadMmio32)(void *, unsigned long);
-#  else
+extern _X_EXPORT int (*xf86ReadMmio8) (void *, unsigned long);
+extern _X_EXPORT int (*xf86ReadMmio16) (void *, unsigned long);
+
+#ifndef STANDALONE_MMIO
+extern _X_EXPORT int (*xf86ReadMmio32) (void *, unsigned long);
+#else
 /* Some DRI 3D drivers need MMIO_IN32. */
 static __inline__ int
 xf86ReadMmio32(void *Base, unsigned long Offset)
 {
-	mem_barrier();
-	return *(volatile unsigned int*)((unsigned long)Base+(Offset));
-}
-#  endif
-extern _X_EXPORT void (*xf86WriteMmio8)(int, void *, unsigned long);
-extern _X_EXPORT void (*xf86WriteMmio16)(int, void *, unsigned long);
-extern _X_EXPORT void (*xf86WriteMmio32)(int, void *, unsigned long);
-extern _X_EXPORT void (*xf86WriteMmioNB8)(int, void *, unsigned long);
-extern _X_EXPORT void (*xf86WriteMmioNB16)(int, void *, unsigned long);
-extern _X_EXPORT void (*xf86WriteMmioNB32)(int, void *, unsigned long);
-extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, int);
+    mem_barrier();
+    return *(volatile unsigned int *) ((unsigned long) Base + (Offset));
+}
+#endif
+extern _X_EXPORT void (*xf86WriteMmio8) (int, void *, unsigned long);
+extern _X_EXPORT void (*xf86WriteMmio16) (int, void *, unsigned long);
+extern _X_EXPORT void (*xf86WriteMmio32) (int, void *, unsigned long);
+extern _X_EXPORT void (*xf86WriteMmioNB8) (int, void *, unsigned long);
+extern _X_EXPORT void (*xf86WriteMmioNB16) (int, void *, unsigned long);
+extern _X_EXPORT void (*xf86WriteMmioNB32) (int, void *, unsigned long);
+extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *,
+                                           int);
 extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
 
 /* Some macros to hide the system dependencies for MMIO accesses */
 /* Changed to kill noise generated by gcc's -Wcast-align */
-#  define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)
-#  define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)
-#  ifndef STANDALONE_MMIO
-#   define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)
-#  else
-#   define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
-#  endif
-
-#  define MMIO_OUT32(base, offset, val) \
+#define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)
+#define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)
+#ifndef STANDALONE_MMIO
+#define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)
+#else
+#define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
+#endif
+
+#define MMIO_OUT32(base, offset, val) \
     do { \
 	write_mem_barrier(); \
 	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val); \
     } while (0)
-#  define MMIO_ONB32(base, offset, val) \
+#define MMIO_ONB32(base, offset, val) \
 	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val)
 
-#  define MMIO_OUT8(base, offset, val) \
+#define MMIO_OUT8(base, offset, val) \
     (*xf86WriteMmio8)((CARD8)(val), base, offset)
-#  define MMIO_OUT16(base, offset, val) \
+#define MMIO_OUT16(base, offset, val) \
     (*xf86WriteMmio16)((CARD16)(val), base, offset)
-#  define MMIO_ONB8(base, offset, val) \
+#define MMIO_ONB8(base, offset, val) \
     (*xf86WriteMmioNB8)((CARD8)(val), base, offset)
-#  define MMIO_ONB16(base, offset, val) \
+#define MMIO_ONB16(base, offset, val) \
     (*xf86WriteMmioNB16)((CARD16)(val), base, offset)
-#  define MMIO_MOVE32(base, offset, val) \
+#define MMIO_MOVE32(base, offset, val) \
     MMIO_OUT32(base, offset, val)
 
-# elif defined(__powerpc__)  
+#elif defined(__powerpc__)
  /* 
   * we provide byteswapping and no byteswapping functions here
   * with byteswapping as default, 
   * drivers that don't need byteswapping should define PPC_MMIO_IS_BE 
   */
-#  define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
-#  define MMIO_OUT8(base, offset, val) \
+#define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
+#define MMIO_OUT8(base, offset, val) \
     xf86WriteMmio8(base, offset, (CARD8)(val))
-#  define MMIO_ONB8(base, offset, val) \
+#define MMIO_ONB8(base, offset, val) \
     xf86WriteMmioNB8(base, offset, (CARD8)(val))
 
-#  if defined(PPC_MMIO_IS_BE) /* No byteswapping */
-#   define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)
-#   define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)
-#   define MMIO_OUT16(base, offset, val) \
+#if defined(PPC_MMIO_IS_BE)     /* No byteswapping */
+#define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)
+#define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)
+#define MMIO_OUT16(base, offset, val) \
     xf86WriteMmio16Be(base, offset, (CARD16)(val))
-#   define MMIO_OUT32(base, offset, val) \
+#define MMIO_OUT32(base, offset, val) \
     xf86WriteMmio32Be(base, offset, (CARD32)(val))
-#   define MMIO_ONB16(base, offset, val) \
+#define MMIO_ONB16(base, offset, val) \
     xf86WriteMmioNB16Be(base, offset, (CARD16)(val))
-#   define MMIO_ONB32(base, offset, val) \
+#define MMIO_ONB32(base, offset, val) \
     xf86WriteMmioNB32Be(base, offset, (CARD32)(val))
-#  else /* byteswapping is the default */
-#   define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)
-#   define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)
-#   define MMIO_OUT16(base, offset, val) \
+#else                           /* byteswapping is the default */
+#define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)
+#define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)
+#define MMIO_OUT16(base, offset, val) \
      xf86WriteMmio16Le(base, offset, (CARD16)(val))
-#   define MMIO_OUT32(base, offset, val) \
+#define MMIO_OUT32(base, offset, val) \
      xf86WriteMmio32Le(base, offset, (CARD32)(val))
-#   define MMIO_ONB16(base, offset, val) \
+#define MMIO_ONB16(base, offset, val) \
      xf86WriteMmioNB16Le(base, offset, (CARD16)(val))
-#   define MMIO_ONB32(base, offset, val) \
+#define MMIO_ONB32(base, offset, val) \
      xf86WriteMmioNB32Le(base, offset, (CARD32)(val))
-#  endif
+#endif
 
-#  define MMIO_MOVE32(base, offset, val) \
+#define MMIO_MOVE32(base, offset, val) \
        xf86WriteMmio32Be(base, offset, (CARD32)(val))
 
-# elif defined(__sparc__) || defined(sparc) || defined(__sparc)
+#elif defined(__sparc__) || defined(sparc) || defined(__sparc)
  /*
   * Like powerpc, we provide byteswapping and no byteswapping functions
   * here with byteswapping as default, drivers that don't need byteswapping
@@ -1622,133 +1600,129 @@ extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
   * do not need to use PPC_MMIO_IS_BE and the sparc one in all the same places
   * of drivers?).
   */
-#  define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
-#  define MMIO_OUT8(base, offset, val) \
+#define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
+#define MMIO_OUT8(base, offset, val) \
     xf86WriteMmio8(base, offset, (CARD8)(val))
-#  define MMIO_ONB8(base, offset, val) \
+#define MMIO_ONB8(base, offset, val) \
     xf86WriteMmio8NB(base, offset, (CARD8)(val))
 
-#  if defined(SPARC_MMIO_IS_BE) /* No byteswapping */
-#   define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)
-#   define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)
-#   define MMIO_OUT16(base, offset, val) \
+#if defined(SPARC_MMIO_IS_BE)   /* No byteswapping */
+#define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)
+#define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)
+#define MMIO_OUT16(base, offset, val) \
      xf86WriteMmio16Be(base, offset, (CARD16)(val))
-#   define MMIO_OUT32(base, offset, val) \
+#define MMIO_OUT32(base, offset, val) \
      xf86WriteMmio32Be(base, offset, (CARD32)(val))
-#   define MMIO_ONB16(base, offset, val) \
+#define MMIO_ONB16(base, offset, val) \
      xf86WriteMmio16BeNB(base, offset, (CARD16)(val))
-#   define MMIO_ONB32(base, offset, val) \
+#define MMIO_ONB32(base, offset, val) \
      xf86WriteMmio32BeNB(base, offset, (CARD32)(val))
-#  else /* byteswapping is the default */
-#   define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)
-#   define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)
-#   define MMIO_OUT16(base, offset, val) \
+#else                           /* byteswapping is the default */
+#define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)
+#define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)
+#define MMIO_OUT16(base, offset, val) \
      xf86WriteMmio16Le(base, offset, (CARD16)(val))
-#   define MMIO_OUT32(base, offset, val) \
+#define MMIO_OUT32(base, offset, val) \
      xf86WriteMmio32Le(base, offset, (CARD32)(val))
-#   define MMIO_ONB16(base, offset, val) \
+#define MMIO_ONB16(base, offset, val) \
      xf86WriteMmio16LeNB(base, offset, (CARD16)(val))
-#   define MMIO_ONB32(base, offset, val) \
+#define MMIO_ONB32(base, offset, val) \
      xf86WriteMmio32LeNB(base, offset, (CARD32)(val))
-#  endif
+#endif
 
-#  define MMIO_MOVE32(base, offset, val) \
+#define MMIO_MOVE32(base, offset, val) \
        xf86WriteMmio32Be(base, offset, (CARD32)(val))
 
-# elif defined(__nds32__)
+#elif defined(__nds32__)
  /*
   * we provide byteswapping and no byteswapping functions here
   * with no byteswapping as default; when endianness of CPU core
   * and I/O devices don't match, byte swapping is necessary
   * drivers that need byteswapping should define NDS32_MMIO_SWAP
   */
-#  define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
-#  define MMIO_OUT8(base, offset, val) \
+#define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
+#define MMIO_OUT8(base, offset, val) \
     xf86WriteMmio8(base, offset, (CARD8)(val))
-#  define MMIO_ONB8(base, offset, val) \
+#define MMIO_ONB8(base, offset, val) \
     xf86WriteMmioNB8(base, offset, (CARD8)(val))
 
-#  if defined(NDS32_MMIO_SWAP) /* byteswapping */
-#   define MMIO_IN16(base, offset) xf86ReadMmio16Swap(base, offset)
-#   define MMIO_IN32(base, offset) xf86ReadMmio32Swap(base, offset)
-#   define MMIO_OUT16(base, offset, val) \
+#if defined(NDS32_MMIO_SWAP)    /* byteswapping */
+#define MMIO_IN16(base, offset) xf86ReadMmio16Swap(base, offset)
+#define MMIO_IN32(base, offset) xf86ReadMmio32Swap(base, offset)
+#define MMIO_OUT16(base, offset, val) \
     xf86WriteMmio16Swap(base, offset, (CARD16)(val))
-#   define MMIO_OUT32(base, offset, val) \
+#define MMIO_OUT32(base, offset, val) \
     xf86WriteMmio32Swap(base, offset, (CARD32)(val))
-#   define MMIO_ONB16(base, offset, val) \
+#define MMIO_ONB16(base, offset, val) \
     xf86WriteMmioNB16Swap(base, offset, (CARD16)(val))
-#   define MMIO_ONB32(base, offset, val) \
+#define MMIO_ONB32(base, offset, val) \
     xf86WriteMmioNB32Swap(base, offset, (CARD32)(val))
-#  else /* no byteswapping is the default */
-#   define MMIO_IN16(base, offset) xf86ReadMmio16(base, offset)
-#   define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
-#   define MMIO_OUT16(base, offset, val) \
+#else                           /* no byteswapping is the default */
+#define MMIO_IN16(base, offset) xf86ReadMmio16(base, offset)
+#define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
+#define MMIO_OUT16(base, offset, val) \
      xf86WriteMmio16(base, offset, (CARD16)(val))
-#   define MMIO_OUT32(base, offset, val) \
+#define MMIO_OUT32(base, offset, val) \
      xf86WriteMmio32(base, offset, (CARD32)(val))
-#   define MMIO_ONB16(base, offset, val) \
+#define MMIO_ONB16(base, offset, val) \
      xf86WriteMmioNB16(base, offset, (CARD16)(val))
-#   define MMIO_ONB32(base, offset, val) \
+#define MMIO_ONB32(base, offset, val) \
      xf86WriteMmioNB32(base, offset, (CARD32)(val))
-#  endif
+#endif
 
-#  define MMIO_MOVE32(base, offset, val) \
+#define MMIO_MOVE32(base, offset, val) \
        xf86WriteMmio32(base, offset, (CARD32)(val))
 
-#ifdef N1213_HC /* for NDS32 N1213 hardcore */
-static __inline__ void nds32_flush_icache(char *addr)
+#ifdef N1213_HC                 /* for NDS32 N1213 hardcore */
+static __inline__ void
+nds32_flush_icache(char *addr)
 {
-	__asm__ volatile (
-		"isync %0;"
-		"msync;"
-		"isb;"
-		"cctl %0,L1I_VA_INVAL;"
-		"isb;"
-		: : "r"(addr) : "memory");
+    __asm__ volatile ("isync %0;"
+                      "msync;"
+                      "isb;"
+                      "cctl %0,L1I_VA_INVAL;" "isb;"::"r" (addr):"memory");
 }
 #else
-static __inline__ void nds32_flush_icache(char *addr)
+static __inline__ void
+nds32_flush_icache(char *addr)
 {
-	__asm__ volatile (
-		"isync %0;"
-		"isb;"
-		: : "r"(addr) : "memory");
+    __asm__ volatile ("isync %0;" "isb;"::"r" (addr):"memory");
 }
 #endif
 
-# else /* !__alpha__ && !__powerpc__ && !__sparc__ */
+#else                           /* !__alpha__ && !__powerpc__ && !__sparc__ */
 
-#  define MMIO_IN8(base, offset) \
+#define MMIO_IN8(base, offset) \
 	*(volatile CARD8 *)(((CARD8*)(base)) + (offset))
-#  define MMIO_IN16(base, offset) \
+#define MMIO_IN16(base, offset) \
 	*(volatile CARD16 *)(void *)(((CARD8*)(base)) + (offset))
-#  define MMIO_IN32(base, offset) \
+#define MMIO_IN32(base, offset) \
 	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset))
-#  define MMIO_OUT8(base, offset, val) \
+#define MMIO_OUT8(base, offset, val) \
 	*(volatile CARD8 *)(((CARD8*)(base)) + (offset)) = (val)
-#  define MMIO_OUT16(base, offset, val) \
+#define MMIO_OUT16(base, offset, val) \
 	*(volatile CARD16 *)(void *)(((CARD8*)(base)) + (offset)) = (val)
-#  define MMIO_OUT32(base, offset, val) \
+#define MMIO_OUT32(base, offset, val) \
 	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val)
-#  define MMIO_ONB8(base, offset, val) MMIO_OUT8(base, offset, val) 
-#  define MMIO_ONB16(base, offset, val) MMIO_OUT16(base, offset, val) 
-#  define MMIO_ONB32(base, offset, val) MMIO_OUT32(base, offset, val) 
+#define MMIO_ONB8(base, offset, val) MMIO_OUT8(base, offset, val)
+#define MMIO_ONB16(base, offset, val) MMIO_OUT16(base, offset, val)
+#define MMIO_ONB32(base, offset, val) MMIO_OUT32(base, offset, val)
 
-#  define MMIO_MOVE32(base, offset, val) MMIO_OUT32(base, offset, val)
+#define MMIO_MOVE32(base, offset, val) MMIO_OUT32(base, offset, val)
 
-# endif /* __alpha__ */
+#endif                          /* __alpha__ */
 
 /*
  * With Intel, the version in os-support/misc/SlowBcopy.s is used.
  * This avoids port I/O during the copy (which causes problems with
  * some hardware).
  */
-# ifdef __alpha__
-#  define slowbcopy_tobus(src,dst,count) xf86SlowBCopyToBus(src,dst,count)
-#  define slowbcopy_frombus(src,dst,count) xf86SlowBCopyFromBus(src,dst,count)
-# else /* __alpha__ */
-#  define slowbcopy_tobus(src,dst,count) xf86SlowBcopy(src,dst,count)
-#  define slowbcopy_frombus(src,dst,count) xf86SlowBcopy(src,dst,count)
-# endif /* __alpha__ */
-
-#endif /* _COMPILER_H */
+#ifdef __alpha__
+#define slowbcopy_tobus(src,dst,count) xf86SlowBCopyToBus(src,dst,count)
+#define slowbcopy_frombus(src,dst,count) xf86SlowBCopyFromBus(src,dst,count)
+#else                           /* __alpha__ */
+#define slowbcopy_tobus(src,dst,count) xf86SlowBcopy(src,dst,count)
+#define slowbcopy_frombus(src,dst,count) xf86SlowBcopy(src,dst,count)
+#endif                          /* __alpha__ */
+
+#endif                          /* _COMPILER_H */
diff --git a/xorg-server/hw/xfree86/common/vidmodeproc.h b/xorg-server/hw/xfree86/common/vidmodeproc.h
index da4d05e1c..aa43237d4 100644
--- a/xorg-server/hw/xfree86/common/vidmodeproc.h
+++ b/xorg-server/hw/xfree86/common/vidmodeproc.h
@@ -8,7 +8,6 @@
 #ifndef _VIDMODEPROC_H_
 #define _VIDMODEPROC_H_
 
-
 typedef enum {
     VIDMODE_H_DISPLAY,
     VIDMODE_H_SYNCSTART,
@@ -35,17 +34,20 @@ typedef enum {
 } VidModeSelectMonitor;
 
 typedef union {
-  pointer ptr;
-  int i;
-  float f;
+    pointer ptr;
+    int i;
+    float f;
 } vidMonitorValue;
 
 extern _X_EXPORT void XFree86VidModeExtensionInit(void);
 
 extern _X_EXPORT Bool VidModeAvailable(int scrnIndex);
-extern _X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock);
-extern _X_EXPORT Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock);
-extern _X_EXPORT Bool VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock);
+extern _X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode,
+                                                int *dotClock);
+extern _X_EXPORT Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode,
+                                              int *dotClock);
+extern _X_EXPORT Bool VidModeGetNextModeline(int scrnIndex, pointer *mode,
+                                             int *dotClock);
 extern _X_EXPORT Bool VidModeDeleteModeline(int scrnIndex, pointer mode);
 extern _X_EXPORT Bool VidModeZoomViewport(int scrnIndex, int zoom);
 extern _X_EXPORT Bool VidModeGetViewPort(int scrnIndex, int *x, int *y);
@@ -55,23 +57,28 @@ extern _X_EXPORT Bool VidModeLockZoom(int scrnIndex, Bool lock);
 extern _X_EXPORT Bool VidModeGetMonitor(int scrnIndex, pointer *monitor);
 extern _X_EXPORT int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock);
 extern _X_EXPORT Bool VidModeGetClocks(int scrnIndex, int *Clocks);
-extern _X_EXPORT ModeStatus VidModeCheckModeForMonitor(int scrnIndex, pointer mode);
-extern _X_EXPORT ModeStatus VidModeCheckModeForDriver(int scrnIndex, pointer mode);
+extern _X_EXPORT ModeStatus VidModeCheckModeForMonitor(int scrnIndex,
+                                                       pointer mode);
+extern _X_EXPORT ModeStatus VidModeCheckModeForDriver(int scrnIndex,
+                                                      pointer mode);
 extern _X_EXPORT void VidModeSetCrtcForMode(int scrnIndex, pointer mode);
 extern _X_EXPORT Bool VidModeAddModeline(int scrnIndex, pointer mode);
 extern _X_EXPORT int VidModeGetDotClock(int scrnIndex, int Clock);
 extern _X_EXPORT int VidModeGetNumOfModes(int scrnIndex);
-extern _X_EXPORT Bool VidModeSetGamma(int scrnIndex, float red, float green, float blue);
-extern _X_EXPORT Bool VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue);
+extern _X_EXPORT Bool VidModeSetGamma(int scrnIndex, float red, float green,
+                                      float blue);
+extern _X_EXPORT Bool VidModeGetGamma(int scrnIndex, float *red, float *green,
+                                      float *blue);
 extern _X_EXPORT pointer VidModeCreateMode(void);
 extern _X_EXPORT void VidModeCopyMode(pointer modefrom, pointer modeto);
 extern _X_EXPORT int VidModeGetModeValue(pointer mode, int valtyp);
 extern _X_EXPORT void VidModeSetModeValue(pointer mode, int valtyp, int val);
-extern _X_EXPORT vidMonitorValue VidModeGetMonitorValue(pointer monitor, int valtyp, int indx);
-extern _X_EXPORT Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *);
-extern _X_EXPORT Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *);
+extern _X_EXPORT vidMonitorValue VidModeGetMonitorValue(pointer monitor,
+                                                        int valtyp, int indx);
+extern _X_EXPORT Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *,
+                                          CARD16 *);
+extern _X_EXPORT Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *,
+                                          CARD16 *);
 extern _X_EXPORT int VidModeGetGammaRampSize(int scrnIndex);
 
 #endif
-
-
diff --git a/xorg-server/hw/xfree86/common/xf86.h b/xorg-server/hw/xfree86/common/xf86.h
index b711f0555..fc4c34e92 100644
--- a/xorg-server/hw/xfree86/common/xf86.h
+++ b/xorg-server/hw/xfree86/common/xf86.h
@@ -57,21 +57,24 @@ extern _X_EXPORT int xf86DoShowOptions;
 extern _X_EXPORT Bool xf86DoConfigurePass1;
 
 extern _X_EXPORT DevPrivateKeyRec xf86ScreenKeyRec;
+
 #define xf86ScreenKey (&xf86ScreenKeyRec)
 
 extern _X_EXPORT DevPrivateKeyRec xf86CreateRootWindowKeyRec;
+
 #define xf86CreateRootWindowKey (&xf86CreateRootWindowKeyRec)
 
-extern _X_EXPORT ScrnInfoPtr *xf86Screens;	/* List of pointers to ScrnInfoRecs */
+extern _X_EXPORT ScrnInfoPtr *xf86Screens;      /* List of pointers to ScrnInfoRecs */
 extern _X_EXPORT const unsigned char byte_reversed[256];
 extern _X_EXPORT Bool fbSlotClaimed;
+
 #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
 extern _X_EXPORT Bool sbusSlotClaimed;
 #endif
 extern _X_EXPORT confDRIRec xf86ConfigDRI;
 extern _X_EXPORT Bool xf86DRI2Enabled(void);
 
-extern _X_EXPORT Bool VTSwitchEnabled;	/* kbd driver */
+extern _X_EXPORT Bool VTSwitchEnabled;  /* kbd driver */
 
 #define XF86SCRNINFO(p) ((ScrnInfoPtr)dixLookupPrivate(&(p)->devPrivates, \
 						       xf86ScreenKey))
@@ -104,20 +107,30 @@ extern _X_EXPORT Bool xf86ParsePciBusString(const char *busID, int *bus,
                                             int *device, int *func);
 extern _X_EXPORT Bool xf86ComparePciBusString(const char *busID, int bus,
                                               int device, int func);
-extern _X_EXPORT Bool xf86IsPrimaryPci(struct pci_device * pPci);
-extern _X_EXPORT Bool xf86CheckPciMemBase(struct pci_device * pPci,
+extern _X_EXPORT Bool xf86IsPrimaryPci(struct pci_device *pPci);
+extern _X_EXPORT Bool xf86CheckPciMemBase(struct pci_device *pPci,
                                           memType base);
-extern _X_EXPORT struct pci_device * xf86GetPciInfoForEntity(int entityIndex);
+extern _X_EXPORT struct pci_device *xf86GetPciInfoForEntity(int entityIndex);
 extern _X_EXPORT int xf86MatchPciInstances(const char *driverName,
-        int vendorID, SymTabPtr chipsets, PciChipsets *PCIchipsets,
-        GDevPtr *devList, int numDevs, DriverPtr drvp, int **foundEntities);
+                                           int vendorID, SymTabPtr chipsets,
+                                           PciChipsets * PCIchipsets,
+                                           GDevPtr * devList, int numDevs,
+                                           DriverPtr drvp, int **foundEntities);
 extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn,
-        int scrnFlag, int entityIndex,PciChipsets *p_chip, void *dummy,
-        EntityProc init, EntityProc enter, EntityProc leave, pointer private);
+                                                 int scrnFlag, int entityIndex,
+                                                 PciChipsets * p_chip,
+                                                 void *dummy, EntityProc init,
+                                                 EntityProc enter,
+                                                 EntityProc leave,
+                                                 pointer private);
 /* Obsolete! don't use */
 extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,
-        int entityIndex,PciChipsets *p_chip, void *dummy, EntityProc init,
-        EntityProc enter, EntityProc leave, pointer private);
+                                                int entityIndex,
+                                                PciChipsets * p_chip,
+                                                void *dummy, EntityProc init,
+                                                EntityProc enter,
+                                                EntityProc leave,
+                                                pointer private);
 #else
 #define xf86VGAarbiterInit() do {} while (0)
 #define xf86VGAarbiterFini() do {} while (0)
@@ -130,19 +143,24 @@ extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,
 
 /* xf86Bus.c */
 
-extern _X_EXPORT int  xf86GetFbInfoForScreen(int scrnIndex);
-extern _X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
-extern _X_EXPORT int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
+extern _X_EXPORT int xf86GetFbInfoForScreen(int scrnIndex);
+extern _X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev,
+                                     Bool active);
+extern _X_EXPORT int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev,
+                                     Bool active);
 extern _X_EXPORT Bool xf86DriverHasEntities(DriverPtr drvp);
 extern _X_EXPORT void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex);
-extern _X_EXPORT void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex,
-				    int instance);
+extern _X_EXPORT void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn,
+                                                     int entityIndex,
+                                                     int instance);
 extern _X_EXPORT int xf86GetNumEntityInstances(int entityIndex);
 extern _X_EXPORT GDevPtr xf86GetDevFromEntity(int entityIndex, int instance);
-extern _X_EXPORT void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex);
+extern _X_EXPORT void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn,
+                                                 int entityIndex);
 extern _X_EXPORT EntityInfoPtr xf86GetEntityInfo(int entityIndex);
 extern _X_EXPORT Bool xf86SetEntityFuncs(int entityIndex, EntityProc init,
-			EntityProc enter, EntityProc leave, pointer);
+                                         EntityProc enter, EntityProc leave,
+                                         pointer);
 extern _X_EXPORT Bool xf86IsEntityPrimary(int entityIndex);
 extern _X_EXPORT ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
 
@@ -159,8 +177,9 @@ extern _X_EXPORT int xf86AllocateEntityPrivateIndex(void);
 extern _X_EXPORT DevUnion *xf86GetEntityPrivate(int entityIndex, int privIndex);
 
 /* xf86Configure.c */
-extern _X_EXPORT GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus,
-				    void *busData, int chipset);
+extern _X_EXPORT GDevPtr xf86AddBusDeviceToConfigure(const char *driver,
+                                                     BusType bus, void *busData,
+                                                     int chipset);
 
 /* xf86Cursor.c */
 
@@ -174,56 +193,63 @@ extern _X_EXPORT void xf86InitOrigins(void);
 extern _X_EXPORT void xf86ReconfigureLayout(void);
 
 /* xf86cvt.c */
-extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh,
-                           Bool Reduced, Bool Interlaced);
+extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay,
+                                            float VRefresh, Bool Reduced,
+                                            Bool Interlaced);
 
 /* xf86DPMS.c */
 
-extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags);
+extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set,
+                                   int flags);
 
 #ifdef DPMSExtension
 extern _X_EXPORT int DPMSSet(ClientPtr client, int level);
 extern _X_EXPORT Bool DPMSSupported(void);
 #endif
 
-
 /* xf86DGA.c */
 
 #ifdef XFreeXDGA
-extern _X_EXPORT Bool DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes,
-			int num);
-extern _X_EXPORT Bool DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes, int num);
+extern _X_EXPORT Bool DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs,
+                              DGAModePtr modes, int num);
+extern _X_EXPORT Bool DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes,
+                                     int num);
 extern _X_EXPORT xf86SetDGAModeProc xf86SetDGAMode;
 #endif
 
 /* xf86Events.c */
 
 extern _X_EXPORT void SetTimeSinceLastInputEvent(void);
-extern _X_EXPORT pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data);
+extern _X_EXPORT pointer xf86AddInputHandler(int fd, InputHandlerProc proc,
+                                             pointer data);
 extern _X_EXPORT int xf86RemoveInputHandler(pointer handler);
 extern _X_EXPORT void xf86DisableInputHandler(pointer handler);
 extern _X_EXPORT void xf86EnableInputHandler(pointer handler);
-extern _X_EXPORT pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data);
+extern _X_EXPORT pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc,
+                                               pointer data);
 extern _X_EXPORT int xf86RemoveGeneralHandler(pointer handler);
 extern _X_EXPORT void xf86DisableGeneralHandler(pointer handler);
 extern _X_EXPORT void xf86EnableGeneralHandler(pointer handler);
-extern _X_EXPORT InputHandlerProc xf86SetConsoleHandler(InputHandlerProc handler, pointer data);
+extern _X_EXPORT InputHandlerProc xf86SetConsoleHandler(InputHandlerProc
+                                                        handler, pointer data);
 extern _X_EXPORT void xf86InterceptSignals(int *signo);
-extern _X_EXPORT void xf86InterceptSigIll(void (*sigillhandler)(void));
+extern _X_EXPORT void xf86InterceptSigIll(void (*sigillhandler) (void));
 extern _X_EXPORT Bool xf86EnableVTSwitch(Bool new);
 extern _X_EXPORT void xf86ProcessActionEvent(ActionEvent action, void *arg);
 extern _X_EXPORT void xf86PrintBacktrace(void);
 
 /* xf86Helper.c */
 
-extern _X_EXPORT void xf86AddDriver(DriverPtr driver, pointer module, int flags);
+extern _X_EXPORT void xf86AddDriver(DriverPtr driver, pointer module,
+                                    int flags);
 extern _X_EXPORT void xf86DeleteDriver(int drvIndex);
 extern _X_EXPORT ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags);
 extern _X_EXPORT void xf86DeleteScreen(int scrnIndex, int flags);
 extern _X_EXPORT int xf86AllocateScrnInfoPrivateIndex(void);
-extern _X_EXPORT Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad);
-extern _X_EXPORT Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int bpp, int fbbpp,
-		     int depth24flags);
+extern _X_EXPORT Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp,
+                                       int pad);
+extern _X_EXPORT Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int bpp,
+                                      int fbbpp, int depth24flags);
 extern _X_EXPORT void xf86PrintDepthBpp(ScrnInfoPtr scrp);
 extern _X_EXPORT Bool xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask);
 extern _X_EXPORT Bool xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual);
@@ -231,125 +257,198 @@ extern _X_EXPORT Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma newGamma);
 extern _X_EXPORT void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y);
 extern _X_EXPORT void xf86SetBlackWhitePixels(ScreenPtr pScreen);
 extern _X_EXPORT void xf86EnableDisableFBAccess(int scrnIndex, Bool enable);
-extern _X_EXPORT void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb,
-		     const char *format, va_list args) _X_ATTRIBUTE_PRINTF(4,0);
-extern _X_EXPORT void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb,
-		    const char *format, ...) _X_ATTRIBUTE_PRINTF(4,5);
-extern _X_EXPORT void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
-		_X_ATTRIBUTE_PRINTF(3,4);
-extern _X_EXPORT void xf86MsgVerb(MessageType type, int verb, const char *format, ...)
-		_X_ATTRIBUTE_PRINTF(3,4);
-extern _X_EXPORT void xf86Msg(MessageType type, const char *format, ...) _X_ATTRIBUTE_PRINTF(2,3);
-extern _X_EXPORT void xf86ErrorFVerb(int verb, const char *format, ...) _X_ATTRIBUTE_PRINTF(2,3);
-extern _X_EXPORT void xf86ErrorF(const char *format, ...) _X_ATTRIBUTE_PRINTF(1,2);
-extern _X_EXPORT const char *xf86TokenToString(SymTabPtr table, int token);
-extern _X_EXPORT int xf86StringToToken(SymTabPtr table, const char *string);
-extern _X_EXPORT void xf86ShowClocks(ScrnInfoPtr scrp, MessageType from);
-extern _X_EXPORT void xf86PrintChipsets(const char *drvname, const char *drvmsg,
-		       SymTabPtr chips);
-extern _X_EXPORT int xf86MatchDevice(const char *drivername, GDevPtr **driversectlist);
-extern _X_EXPORT const char *xf86GetVisualName(int visual);
-extern _X_EXPORT int xf86GetVerbosity(void);
-extern _X_EXPORT Pix24Flags xf86GetPix24(void);
-extern _X_EXPORT int xf86GetDepth(void);
-extern _X_EXPORT rgb xf86GetWeight(void);
-extern _X_EXPORT Gamma xf86GetGamma(void);
-extern _X_EXPORT Bool xf86GetFlipPixels(void);
-extern _X_EXPORT const char *xf86GetServerName(void);
-extern _X_EXPORT Bool xf86ServerIsExiting(void);
-extern _X_EXPORT Bool xf86ServerIsResetting(void);
-extern _X_EXPORT Bool xf86ServerIsInitialising(void);
-extern _X_EXPORT Bool xf86ServerIsOnlyDetecting(void);
-extern _X_EXPORT Bool xf86CaughtSignal(void);
-extern _X_EXPORT Bool xf86GetVidModeAllowNonLocal(void);
-extern _X_EXPORT Bool xf86GetVidModeEnabled(void);
-extern _X_EXPORT Bool xf86GetModInDevAllowNonLocal(void);
-extern _X_EXPORT Bool xf86GetModInDevEnabled(void);
-extern _X_EXPORT Bool xf86GetAllowMouseOpenFail(void);
-extern _X_EXPORT void xf86DisableRandR(void);
-extern _X_EXPORT CARD32 xorgGetVersion(void);
-extern _X_EXPORT CARD32 xf86GetModuleVersion(pointer module);
-extern _X_EXPORT pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name);
-extern _X_EXPORT pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name);
-extern _X_EXPORT pointer xf86LoadOneModule(char *name, pointer optlist);
-extern _X_EXPORT void xf86UnloadSubModule(pointer mod);
-extern _X_EXPORT Bool xf86LoaderCheckSymbol(const char *name);
-extern _X_EXPORT void xf86SetBackingStore(ScreenPtr pScreen);
-extern _X_EXPORT void xf86SetSilkenMouse(ScreenPtr pScreen);
-extern _X_EXPORT pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name,
-			  char **adaptor_name, pointer *adaptor_options);
-extern _X_EXPORT void xf86GetOS(const char **name, int *major, int *minor, int *teeny);
-extern _X_EXPORT ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag,
-			       int entityIndex, EntityProc init,
-			       EntityProc enter, EntityProc leave,
-			       pointer private);
-
-extern _X_EXPORT Bool xf86IsScreenPrimary(int scrnIndex);
-extern _X_EXPORT int  xf86RegisterRootWindowProperty(int ScrnIndex, Atom	property, Atom type,
-				    int format, unsigned long len,
-				    pointer value);
-extern _X_EXPORT Bool xf86IsUnblank(int mode);
+extern _X_EXPORT void
+xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb,
+                const char *format, va_list args)
+_X_ATTRIBUTE_PRINTF(4, 0);
+extern _X_EXPORT void
+xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb,
+               const char *format, ...)
+_X_ATTRIBUTE_PRINTF(4, 5);
+extern _X_EXPORT void
+xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
+_X_ATTRIBUTE_PRINTF(3, 4);
+extern _X_EXPORT void
+xf86MsgVerb(MessageType type, int verb, const char *format, ...)
+_X_ATTRIBUTE_PRINTF(3, 4);
+extern _X_EXPORT void
+xf86Msg(MessageType type, const char *format, ...)
+_X_ATTRIBUTE_PRINTF(2, 3);
+extern _X_EXPORT void
+xf86ErrorFVerb(int verb, const char *format, ...)
+_X_ATTRIBUTE_PRINTF(2, 3);
+extern _X_EXPORT void
+xf86ErrorF(const char *format, ...)
+_X_ATTRIBUTE_PRINTF(1, 2);
+extern _X_EXPORT const char *
+xf86TokenToString(SymTabPtr table, int token);
+extern _X_EXPORT int
+xf86StringToToken(SymTabPtr table, const char *string);
+extern _X_EXPORT void
+xf86ShowClocks(ScrnInfoPtr scrp, MessageType from);
+extern _X_EXPORT void
+xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips);
+extern _X_EXPORT int
+xf86MatchDevice(const char *drivername, GDevPtr ** driversectlist);
+extern _X_EXPORT const char *
+xf86GetVisualName(int visual);
+extern _X_EXPORT int
+xf86GetVerbosity(void);
+extern _X_EXPORT Pix24Flags
+xf86GetPix24(void);
+extern _X_EXPORT int
+xf86GetDepth(void);
+extern _X_EXPORT rgb
+xf86GetWeight(void);
+extern _X_EXPORT Gamma
+xf86GetGamma(void);
+extern _X_EXPORT Bool
+xf86GetFlipPixels(void);
+extern _X_EXPORT const char *
+xf86GetServerName(void);
+extern _X_EXPORT Bool
+xf86ServerIsExiting(void);
+extern _X_EXPORT Bool
+xf86ServerIsResetting(void);
+extern _X_EXPORT Bool
+xf86ServerIsInitialising(void);
+extern _X_EXPORT Bool
+xf86ServerIsOnlyDetecting(void);
+extern _X_EXPORT Bool
+xf86CaughtSignal(void);
+extern _X_EXPORT Bool
+xf86GetVidModeAllowNonLocal(void);
+extern _X_EXPORT Bool
+xf86GetVidModeEnabled(void);
+extern _X_EXPORT Bool
+xf86GetModInDevAllowNonLocal(void);
+extern _X_EXPORT Bool
+xf86GetModInDevEnabled(void);
+extern _X_EXPORT Bool
+xf86GetAllowMouseOpenFail(void);
+extern _X_EXPORT void
+xf86DisableRandR(void);
+extern _X_EXPORT CARD32
+xorgGetVersion(void);
+extern _X_EXPORT CARD32
+xf86GetModuleVersion(pointer module);
+extern _X_EXPORT pointer
+xf86LoadDrvSubModule(DriverPtr drv, const char *name);
+extern _X_EXPORT pointer
+xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name);
+extern _X_EXPORT pointer
+xf86LoadOneModule(char *name, pointer optlist);
+extern _X_EXPORT void
+xf86UnloadSubModule(pointer mod);
+extern _X_EXPORT Bool
+xf86LoaderCheckSymbol(const char *name);
+extern _X_EXPORT void
+xf86SetBackingStore(ScreenPtr pScreen);
+extern _X_EXPORT void
+xf86SetSilkenMouse(ScreenPtr pScreen);
+extern _X_EXPORT pointer
+xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name,
+                  char **adaptor_name, pointer *adaptor_options);
+extern _X_EXPORT void
+xf86GetOS(const char **name, int *major, int *minor, int *teeny);
+extern _X_EXPORT ScrnInfoPtr
+xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag,
+                   int entityIndex, EntityProc init,
+                   EntityProc enter, EntityProc leave, pointer private);
+
+extern _X_EXPORT Bool
+xf86IsScreenPrimary(int scrnIndex);
+extern _X_EXPORT int
+xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
+                               int format, unsigned long len, pointer value);
+extern _X_EXPORT Bool
+xf86IsUnblank(int mode);
 
 /* xf86Init.c */
 
-extern _X_EXPORT PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth);
-extern _X_EXPORT int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth);
+extern _X_EXPORT PixmapFormatPtr
+xf86GetPixFormat(ScrnInfoPtr pScrn, int depth);
+extern _X_EXPORT int
+xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth);
 
 /* xf86Mode.c */
 
-extern _X_EXPORT int xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2,
-			int DivFactor, int MulFactor, int *divider);
-extern _X_EXPORT const char *xf86ModeStatusToString(ModeStatus status);
-extern _X_EXPORT ModeStatus xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep,
-			  ClockRangePtr clockRanges, LookupModeFlags strategy);
-extern _X_EXPORT ModeStatus xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor);
-extern _X_EXPORT ModeStatus xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
-					 ClockRangePtr clockRanges,
-					 LookupModeFlags strategy,
-					 int maxPitch, int virtualX,
-					 int virtualY);
-extern _X_EXPORT ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
-				  int flags);
-extern _X_EXPORT int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
-		      char **modeNames, ClockRangePtr clockRanges,
-		      int *linePitches, int minPitch, int maxPitch,
-		      int minHeight, int maxHeight, int pitchInc,
-		      int virtualX, int virtualY, int apertureSize,
-		      LookupModeFlags strategy);
-extern _X_EXPORT void xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode);
-extern _X_EXPORT void xf86PruneDriverModes(ScrnInfoPtr scrp);
-extern _X_EXPORT void xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags);
-extern _X_EXPORT void xf86PrintModes(ScrnInfoPtr scrp);
-extern _X_EXPORT void xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges);
-extern _X_EXPORT double xf86ModeHSync(const DisplayModeRec *mode);
-extern _X_EXPORT double xf86ModeVRefresh(const DisplayModeRec *mode);
-extern _X_EXPORT void xf86SetModeDefaultName(DisplayModePtr mode);
-extern _X_EXPORT void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags);
-extern _X_EXPORT DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode);
-extern _X_EXPORT DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList);
-extern _X_EXPORT Bool xf86ModesEqual(const DisplayModeRec *pMode1,
-		    const DisplayModeRec *pMode2);
-extern _X_EXPORT void xf86PrintModeline(int scrnIndex,DisplayModePtr mode);
-extern _X_EXPORT DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new);
+extern _X_EXPORT int
+xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2,
+                    int DivFactor, int MulFactor, int *divider);
+extern _X_EXPORT const char *
+xf86ModeStatusToString(ModeStatus status);
+extern _X_EXPORT ModeStatus
+xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep,
+               ClockRangePtr clockRanges, LookupModeFlags strategy);
+extern _X_EXPORT ModeStatus
+xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor);
+extern _X_EXPORT ModeStatus
+xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
+                              ClockRangePtr clockRanges,
+                              LookupModeFlags strategy,
+                              int maxPitch, int virtualX, int virtualY);
+extern _X_EXPORT ModeStatus
+xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags);
+extern _X_EXPORT int
+xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
+                  char **modeNames, ClockRangePtr clockRanges,
+                  int *linePitches, int minPitch, int maxPitch,
+                  int minHeight, int maxHeight, int pitchInc,
+                  int virtualX, int virtualY, int apertureSize,
+                  LookupModeFlags strategy);
+extern _X_EXPORT void
+xf86DeleteMode(DisplayModePtr * modeList, DisplayModePtr mode);
+extern _X_EXPORT void
+xf86PruneDriverModes(ScrnInfoPtr scrp);
+extern _X_EXPORT void
+xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags);
+extern _X_EXPORT void
+xf86PrintModes(ScrnInfoPtr scrp);
+extern _X_EXPORT void
+xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges);
+extern _X_EXPORT double
+xf86ModeHSync(const DisplayModeRec * mode);
+extern _X_EXPORT double
+xf86ModeVRefresh(const DisplayModeRec * mode);
+extern _X_EXPORT void
+xf86SetModeDefaultName(DisplayModePtr mode);
+extern _X_EXPORT void
+xf86SetModeCrtc(DisplayModePtr p, int adjustFlags);
+extern _X_EXPORT DisplayModePtr
+xf86DuplicateMode(const DisplayModeRec * pMode);
+extern _X_EXPORT DisplayModePtr
+xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList);
+extern _X_EXPORT Bool
+xf86ModesEqual(const DisplayModeRec * pMode1, const DisplayModeRec * pMode2);
+extern _X_EXPORT void
+xf86PrintModeline(int scrnIndex, DisplayModePtr mode);
+extern _X_EXPORT DisplayModePtr
+xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new);
 
 /* xf86Option.c */
 
-extern _X_EXPORT void xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraOpts);
-
+extern _X_EXPORT void
+xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraOpts);
 
 /* xf86RandR.c */
 #ifdef RANDR
-extern _X_EXPORT Bool xf86RandRInit (ScreenPtr    pScreen);
-extern _X_EXPORT Rotation xf86GetRotation(ScreenPtr pScreen);
-extern _X_EXPORT Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
-			int newvirtX, int newvirtY,
-			int newmmWidth, int newmmHeight, Bool resetMode);
+extern _X_EXPORT Bool
+xf86RandRInit(ScreenPtr pScreen);
+extern _X_EXPORT Rotation
+xf86GetRotation(ScreenPtr pScreen);
+extern _X_EXPORT Bool
+xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
+                                    int newvirtX, int newvirtY,
+                                    int newmmWidth, int newmmHeight,
+                                    Bool resetMode);
 #endif
 
 /* xf86VidModeExtentionInit.c */
 
-extern _X_EXPORT Bool VidModeExtensionInit(ScreenPtr pScreen);
+extern _X_EXPORT Bool
+VidModeExtensionInit(ScreenPtr pScreen);
 
-#endif /* _NO_XF86_PROTOTYPES */
+#endif                          /* _NO_XF86_PROTOTYPES */
 
-#endif /* _XF86_H */
+#endif                          /* _XF86_H */
diff --git a/xorg-server/hw/xfree86/common/xf86AutoConfig.c b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
index 0c465682a..43c746b7f 100644
--- a/xorg-server/hw/xfree86/common/xf86AutoConfig.c
+++ b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
@@ -41,12 +41,12 @@
 #include "xf86_OSlib.h"
 #include "xf86pciBus.h"
 #ifdef __sparc__
-# include "xf86sbusBus.h"
+#include "xf86sbusBus.h"
 #endif
 
 #ifdef sun
-# include <sys/visual_io.h>
-# include <ctype.h>
+#include <sys/visual_io.h>
+#include <ctype.h>
 #endif
 
 /* Sections for the default built-in configuration. */
@@ -103,13 +103,13 @@ AppendToList(const char *s, const char ***list, int *lines)
 
     str = xnfstrdup(s);
     for (p = strtok(str, "\n"); p; p = strtok(NULL, "\n")) {
-	(*lines)++;
-	*list = xnfrealloc(*list, (*lines + 1) * sizeof(**list));
-	newstr = xnfalloc(strlen(p) + 2);
-	strcpy(newstr, p);
-	strcat(newstr, "\n");
-	(*list)[*lines - 1] = newstr;
-	(*list)[*lines] = NULL;
+        (*lines)++;
+        *list = xnfrealloc(*list, (*lines + 1) * sizeof(**list));
+        newstr = xnfalloc(strlen(p) + 2);
+        strcpy(newstr, p);
+        strcat(newstr, "\n");
+        (*list)[*lines - 1] = newstr;
+        (*list)[*lines] = NULL;
     }
     free(str);
 }
@@ -120,7 +120,7 @@ FreeList(const char ***list, int *lines)
     int i;
 
     for (i = 0; i < *lines; i++) {
-	free((char *)((*list)[i]));
+        free((char *) ((*list)[i]));
     }
     free(*list);
     *list = NULL;
@@ -151,30 +151,30 @@ xf86AutoConfig(void)
     listPossibleVideoDrivers(deviceList, 20);
 
     for (p = deviceList; *p; p++) {
-	snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
-	AppendToConfig(buf);
-	snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
-	AppendToConfig(buf);
+        snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
+        AppendToConfig(buf);
+        snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
+        AppendToConfig(buf);
     }
 
     AppendToConfig(BUILTIN_LAYOUT_SECTION_PRE);
     for (p = deviceList; *p; p++) {
-	snprintf(buf, sizeof(buf), BUILTIN_LAYOUT_SCREEN_LINE, *p, 0);
-	AppendToConfig(buf);
+        snprintf(buf, sizeof(buf), BUILTIN_LAYOUT_SCREEN_LINE, *p, 0);
+        AppendToConfig(buf);
     }
     AppendToConfig(BUILTIN_LAYOUT_SECTION_POST);
 
     for (p = deviceList; *p; p++) {
-	free(*p);
+        free(*p);
     }
 
     xf86MsgVerb(X_DEFAULT, 0,
-		"Using default built-in configuration (%d lines)\n",
-		builtinLines);
+                "Using default built-in configuration (%d lines)\n",
+                builtinLines);
 
     xf86MsgVerb(X_DEFAULT, 3, "--- Start of built-in configuration ---\n");
     for (cp = builtinConfig; *cp; cp++)
-	xf86ErrorFVerb(3, "\t%s", *cp);
+        xf86ErrorFVerb(3, "\t%s", *cp);
     xf86MsgVerb(X_DEFAULT, 3, "--- End of built-in configuration ---\n");
 
     xf86initConfigFiles();
@@ -183,7 +183,7 @@ xf86AutoConfig(void)
     FreeConfig();
 
     if (ret != CONFIG_OK)
-	xf86Msg(X_ERROR, "Error parsing the built-in default configuration.\n");
+        xf86Msg(X_ERROR, "Error parsing the built-in default configuration.\n");
 
     return ret == CONFIG_OK;
 }
@@ -192,8 +192,8 @@ static void
 listPossibleVideoDrivers(char *matches[], int nmatches)
 {
     int i;
-    
-    for (i = 0 ; i < nmatches ; i++) {
+
+    for (i = 0; i < nmatches; i++) {
         matches[i] = NULL;
     }
     i = 0;
@@ -202,57 +202,60 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
     /* Check for driver type based on /dev/fb type and if valid, use
        it instead of PCI bus probe results */
     if (xf86Info.consoleFd >= 0) {
-	struct vis_identifier   visid;
-	const char *cp;
-	extern char xf86SolarisFbDev[PATH_MAX];
-	int iret;
-
-	SYSCALL(iret = ioctl(xf86Info.consoleFd, VIS_GETIDENTIFIER, &visid));
-	if (iret < 0) {
-	    int fbfd;
-
-	    fbfd = open(xf86SolarisFbDev, O_RDONLY);
-	    if (fbfd >= 0) {
-		SYSCALL(iret = ioctl(fbfd, VIS_GETIDENTIFIER, &visid));
-		close(fbfd);
-	    }
-	}
-
-	if (iret < 0) {
-	    xf86Msg(X_WARNING,
-		    "could not get frame buffer identifier from %s\n",
-		    xf86SolarisFbDev);
-	} else {
-	    xf86Msg(X_PROBED, "console driver: %s\n", visid.name);
-
-	    /* Special case from before the general case was set */
-	    if (strcmp(visid.name, "NVDAnvda") == 0) {
-		matches[i++] = xnfstrdup("nvidia");
-	    }
-
-	    /* General case - split into vendor name (initial all-caps
-	       prefix) & driver name (rest of the string). */
-	    if (strcmp(visid.name, "SUNWtext") != 0) {
-		for (cp = visid.name; (*cp != '\0') && isupper(*cp); cp++) {
-		    /* find end of all uppercase vendor section */
-		}
-		if ((cp != visid.name) && (*cp != '\0')) {
-		    char *driverName = xnfstrdup(cp);
-		    char *vendorName = xnfstrdup(visid.name);
-		    vendorName[cp - visid.name] = '\0';
-
-		    matches[i++] = vendorName;
-		    matches[i++] = driverName;
-		}
-	    }
-	}
+        struct vis_identifier visid;
+        const char *cp;
+        extern char xf86SolarisFbDev[PATH_MAX];
+        int iret;
+
+        SYSCALL(iret = ioctl(xf86Info.consoleFd, VIS_GETIDENTIFIER, &visid));
+        if (iret < 0) {
+            int fbfd;
+
+            fbfd = open(xf86SolarisFbDev, O_RDONLY);
+            if (fbfd >= 0) {
+                SYSCALL(iret = ioctl(fbfd, VIS_GETIDENTIFIER, &visid));
+                close(fbfd);
+            }
+        }
+
+        if (iret < 0) {
+            xf86Msg(X_WARNING,
+                    "could not get frame buffer identifier from %s\n",
+                    xf86SolarisFbDev);
+        }
+        else {
+            xf86Msg(X_PROBED, "console driver: %s\n", visid.name);
+
+            /* Special case from before the general case was set */
+            if (strcmp(visid.name, "NVDAnvda") == 0) {
+                matches[i++] = xnfstrdup("nvidia");
+            }
+
+            /* General case - split into vendor name (initial all-caps
+               prefix) & driver name (rest of the string). */
+            if (strcmp(visid.name, "SUNWtext") != 0) {
+                for (cp = visid.name; (*cp != '\0') && isupper(*cp); cp++) {
+                    /* find end of all uppercase vendor section */
+                }
+                if ((cp != visid.name) && (*cp != '\0')) {
+                    char *driverName = xnfstrdup(cp);
+                    char *vendorName = xnfstrdup(visid.name);
+
+                    vendorName[cp - visid.name] = '\0';
+
+                    matches[i++] = vendorName;
+                    matches[i++] = driverName;
+                }
+            }
+        }
     }
 #endif
 #ifdef __sparc__
     {
-	char *sbusDriver = sparcDriverName();
-	if (sbusDriver)
-	    matches[i++] = xnfstrdup(sbusDriver);
+        char *sbusDriver = sparcDriverName();
+
+        if (sbusDriver)
+            matches[i++] = xnfstrdup(sbusDriver);
     }
 #endif
 #ifdef XSERVER_LIBPCIACCESS
@@ -261,9 +264,9 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
     /* Fallback to platform default hardware */
     if (i < (nmatches - 1)) {
 #if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
-	matches[i++] = xnfstrdup("vesa");
+        matches[i++] = xnfstrdup("vesa");
 #elif defined(__sparc__) && !defined(sun)
-	matches[i++] = xnfstrdup("sunffb");
+        matches[i++] = xnfstrdup("sunffb");
 #endif
     }
 
@@ -271,12 +274,12 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
     /* Fallback to platform default frame buffer driver */
     if (i < (nmatches - 1)) {
 #if !defined(__linux__) && defined(__sparc__)
-	matches[i++] = xnfstrdup("wsfb");
+        matches[i++] = xnfstrdup("wsfb");
 #else
-	matches[i++] = xnfstrdup("fbdev");
+        matches[i++] = xnfstrdup("fbdev");
 #endif
     }
-#endif /* !sun */
+#endif                          /* !sun */
 }
 
 /* copy a screen section and enter the desired driver
@@ -320,7 +323,7 @@ GDevPtr
 autoConfigDevice(GDevPtr preconf_device)
 {
     GDevPtr ptr = NULL;
-    char *matches[20]; /* If we have more than 20 drivers we're in trouble */
+    char *matches[20];          /* If we have more than 20 drivers we're in trouble */
     int num_matches = 0, num_screens = 0, i;
     screenLayoutPtr slp;
 
@@ -331,7 +334,8 @@ autoConfigDevice(GDevPtr preconf_device)
     /* If there's a configured section with no driver chosen, use it */
     if (preconf_device) {
         ptr = preconf_device;
-    } else {
+    }
+    else {
         ptr = calloc(1, sizeof(GDevRec));
         if (!ptr) {
             return NULL;
@@ -361,7 +365,7 @@ autoConfigDevice(GDevPtr preconf_device)
              * plus one for the terminating NULL */
             for (; slp[num_screens].screen; num_screens++);
             xf86ConfigLayout.screens = xnfcalloc(num_screens + num_matches,
-                                                sizeof(screenLayoutRec));
+                                                 sizeof(screenLayoutRec));
             xf86ConfigLayout.screens[0] = slp[0];
 
             /* do the first match and set that for the original first screen */
@@ -384,14 +388,16 @@ autoConfigDevice(GDevPtr preconf_device)
              *
              * TODO Handle rest of multiple screen sections */
             for (i = 1; i < num_screens; i++) {
-                xf86ConfigLayout.screens[i+num_matches] = slp[i];
+                xf86ConfigLayout.screens[i + num_matches] = slp[i];
             }
-            xf86ConfigLayout.screens[num_screens+num_matches-1].screen = NULL;
+            xf86ConfigLayout.screens[num_screens + num_matches - 1].screen =
+                NULL;
             free(slp);
-        } else {
+        }
+        else {
             /* layout does not have any screens, not much to do */
             ptr->driver = matches[0];
-            for (i = 1; matches[i] ; i++) {
+            for (i = 1; matches[i]; i++) {
                 if (matches[i] != matches[0]) {
                     free(matches[i]);
                 }
diff --git a/xorg-server/hw/xfree86/common/xf86Bus.c b/xorg-server/hw/xfree86/common/xf86Bus.c
index c665a2019..b176e8cc4 100644
--- a/xorg-server/hw/xfree86/common/xf86Bus.c
+++ b/xorg-server/hw/xfree86/common/xf86Bus.c
@@ -51,11 +51,11 @@
 #include "xf86VGAarbiter.h"
 #endif
 /* Entity data */
-EntityPtr *xf86Entities = NULL;	/* Bus slots claimed by drivers */
+EntityPtr *xf86Entities = NULL; /* Bus slots claimed by drivers */
 int xf86NumEntities = 0;
 static int xf86EntityPrivateCount = 0;
 
-BusRec primaryBus = { BUS_NONE, { 0 } };
+BusRec primaryBus = { BUS_NONE, {0} };
 
 /**
  * Call the driver's correct probe function.
@@ -73,9 +73,10 @@ BusRec primaryBus = { BUS_NONE, { 0 } };
  * returned.  Otherwise, \c FALSE is returned.
  */
 Bool
-xf86CallDriverProbe( DriverPtr drv, Bool detect_only )
+xf86CallDriverProbe(DriverPtr drv, Bool detect_only)
 {
-    Bool     foundScreen = FALSE;
+    Bool foundScreen = FALSE;
+
 #ifdef XSERVER_LIBPCIACCESS
     if (drv->PciProbe != NULL) {
         if (xf86DoConfigure && xf86DoConfigurePass1) {
@@ -83,16 +84,16 @@ xf86CallDriverProbe( DriverPtr drv, Bool detect_only )
             foundScreen = xf86PciAddMatchingDev(drv);
         }
         else {
-            assert(! detect_only);
+            assert(!detect_only);
             foundScreen = xf86PciProbeDev(drv);
         }
     }
 #endif
     if (!foundScreen && (drv->Probe != NULL)) {
-        xf86Msg( X_WARNING, "Falling back to old probe method for %s\n",
-                             drv->driverName);
-        foundScreen = (*drv->Probe)(drv, (detect_only) ? PROBE_DETECT
-                                    : PROBE_DEFAULT);
+        xf86Msg(X_WARNING, "Falling back to old probe method for %s\n",
+                drv->driverName);
+        foundScreen = (*drv->Probe) (drv, (detect_only) ? PROBE_DETECT
+                                     : PROBE_DEFAULT);
     }
 
     return foundScreen;
@@ -119,13 +120,14 @@ xf86BusConfig(void)
      */
     for (i = 0; i < xf86NumDrivers; i++) {
         xorgHWFlags flags;
+
         if (!xorgHWAccess) {
             if (!xf86DriverList[i]->driverFunc
-            || !xf86DriverList[i]->driverFunc(NULL,
-                             GET_REQUIRED_HW_INTERFACES,
-                              &flags)
-            || NEED_IO_ENABLED(flags))
-            continue;
+                || !xf86DriverList[i]->driverFunc(NULL,
+                                                  GET_REQUIRED_HW_INTERFACES,
+                                                  &flags)
+                || NEED_IO_ENABLED(flags))
+                continue;
         }
 
         xf86CallDriverProbe(xf86DriverList[i], FALSE);
@@ -155,11 +157,13 @@ xf86BusConfig(void)
         for (layout = xf86ConfigLayout.screens; layout->screen != NULL;
              layout++) {
             Bool found = FALSE;
+
             for (j = 0; j < xf86Screens[i]->numEntities; j++) {
 
-                GDevPtr dev = xf86GetDevFromEntity(
-                                xf86Screens[i]->entityList[j],
-                                xf86Screens[i]->entityInstanceList[j]);
+                GDevPtr dev =
+                    xf86GetDevFromEntity(xf86Screens[i]->entityList[j],
+                                         xf86Screens[i]->entityInstanceList[j]);
+
                 if (dev == layout->screen->device) {
                     /* A match has been found */
                     xf86Screens[i]->confScreen = layout->screen;
@@ -167,12 +171,14 @@ xf86BusConfig(void)
                     break;
                 }
             }
-            if (found) break;
+            if (found)
+                break;
         }
         if (layout->screen == NULL) {
             /* No match found */
             xf86Msg(X_ERROR,
-            "Screen %d deleted because of no matching config section.\n", i);
+                    "Screen %d deleted because of no matching config section.\n",
+                    i);
             xf86DeleteScreen(i--, 0);
         }
     }
@@ -180,7 +186,7 @@ xf86BusConfig(void)
     /* If no screens left, return now.  */
     if (xf86NumScreens == 0) {
         xf86Msg(X_ERROR,
-        "Device(s) detected, but none match those in the config file.\n");
+                "Device(s) detected, but none match those in the config file.\n");
         return FALSE;
     }
 
@@ -210,31 +216,31 @@ xf86BusProbe(void)
  */
 
 BusType
-StringToBusType(const char* busID, const char **retID)
+StringToBusType(const char *busID, const char **retID)
 {
     char *p, *s;
     BusType ret = BUS_NONE;
 
     /* If no type field, Default to PCI */
     if (isdigit(busID[0])) {
-	if (retID)
-	    *retID = busID;
-	return BUS_PCI;
+        if (retID)
+            *retID = busID;
+        return BUS_PCI;
     }
 
     s = xstrdup(busID);
     p = strtok(s, ":");
     if (p == NULL || *p == 0) {
-	free(s);
-	return BUS_NONE;
+        free(s);
+        return BUS_NONE;
     }
     if (!xf86NameCmp(p, "pci") || !xf86NameCmp(p, "agp"))
-	ret = BUS_PCI; 
+        ret = BUS_PCI;
     if (!xf86NameCmp(p, "sbus"))
-	ret = BUS_SBUS;
+        ret = BUS_SBUS;
     if (ret != BUS_NONE)
-	if (retID)
-	    *retID = busID + strlen(p) + 1;
+        if (retID)
+            *retID = busID + strlen(p) + 1;
     free(s);
     return ret;
 }
@@ -244,10 +250,10 @@ xf86AllocateEntity(void)
 {
     xf86NumEntities++;
     xf86Entities = xnfrealloc(xf86Entities,
-			      sizeof(EntityPtr) * xf86NumEntities);
-    xf86Entities[xf86NumEntities - 1] = xnfcalloc(1,sizeof(EntityRec));
+                              sizeof(EntityPtr) * xf86NumEntities);
+    xf86Entities[xf86NumEntities - 1] = xnfcalloc(1, sizeof(EntityRec));
     xf86Entities[xf86NumEntities - 1]->entityPrivates =
-               xnfcalloc(sizeof(DevUnion) * xf86EntityPrivateCount, 1);
+        xnfcalloc(sizeof(DevUnion) * xf86EntityPrivateCount, 1);
     return xf86NumEntities - 1;
 }
 
@@ -255,25 +261,26 @@ Bool
 xf86IsEntityPrimary(int entityIndex)
 {
     EntityPtr pEnt = xf86Entities[entityIndex];
-    
-    if (primaryBus.type != pEnt->bus.type) return FALSE;
+
+    if (primaryBus.type != pEnt->bus.type)
+        return FALSE;
 
     switch (pEnt->bus.type) {
     case BUS_PCI:
-	return pEnt->bus.id.pci == primaryBus.id.pci;
+        return pEnt->bus.id.pci == primaryBus.id.pci;
     case BUS_SBUS:
-	return pEnt->bus.id.sbus.fbNum == primaryBus.id.sbus.fbNum;
+        return pEnt->bus.id.sbus.fbNum == primaryBus.id.sbus.fbNum;
     default:
-	return FALSE;
+        return FALSE;
     }
 }
-	
+
 Bool
 xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter,
-		   EntityProc leave, pointer private)
+                   EntityProc leave, pointer private)
 {
     if (entityIndex >= xf86NumEntities)
-	return FALSE;
+        return FALSE;
     xf86Entities[entityIndex]->entityInit = init;
     xf86Entities[entityIndex]->entityEnter = enter;
     xf86Entities[entityIndex]->entityLeave = leave;
@@ -285,9 +292,10 @@ Bool
 xf86DriverHasEntities(DriverPtr drvp)
 {
     int i;
+
     for (i = 0; i < xf86NumEntities; i++) {
-	if (xf86Entities[i]->driver == drvp) 
-	    return TRUE;
+        if (xf86Entities[i]->driver == drvp)
+            return TRUE;
     }
     return FALSE;
 }
@@ -296,20 +304,20 @@ void
 xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex)
 {
     if (entityIndex == -1)
-	return;
+        return;
     if (xf86Entities[entityIndex]->inUse &&
-	!(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL)) {
-	ErrorF("Requested Entity already in use!\n");
-	return;
+        !(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL)) {
+        ErrorF("Requested Entity already in use!\n");
+        return;
     }
 
     pScrn->numEntities++;
     pScrn->entityList = xnfrealloc(pScrn->entityList,
-				    pScrn->numEntities * sizeof(int));
+                                   pScrn->numEntities * sizeof(int));
     pScrn->entityList[pScrn->numEntities - 1] = entityIndex;
     xf86Entities[entityIndex]->inUse = TRUE;
     pScrn->entityInstanceList = xnfrealloc(pScrn->entityInstanceList,
-				    pScrn->numEntities * sizeof(int));
+                                           pScrn->numEntities * sizeof(int));
     pScrn->entityInstanceList[pScrn->numEntities - 1] = 0;
 }
 
@@ -319,13 +327,13 @@ xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance)
     int i;
 
     if (entityIndex == -1 || entityIndex >= xf86NumEntities)
-	return;
+        return;
 
     for (i = 0; i < pScrn->numEntities; i++) {
-	if (pScrn->entityList[i] == entityIndex) {
-	    pScrn->entityInstanceList[i] = instance;
-	    break;
-	}
+        if (pScrn->entityList[i] == entityIndex) {
+            pScrn->entityInstanceList[i] = instance;
+            break;
+        }
     }
 }
 
@@ -336,17 +344,18 @@ xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance)
 ScrnInfoPtr
 xf86FindScreenForEntity(int entityIndex)
 {
-    int i,j;
+    int i, j;
+
+    if (entityIndex == -1)
+        return NULL;
 
-    if (entityIndex == -1) return NULL;
-    
     if (xf86Screens) {
-	for (i = 0; i < xf86NumScreens; i++) {
-	    for (j = 0; j < xf86Screens[i]->numEntities; j++) {
-		if ( xf86Screens[i]->entityList[j] == entityIndex )
-		    return xf86Screens[i];
-	    }
-	}
+        for (i = 0; i < xf86NumScreens; i++) {
+            for (j = 0; j < xf86Screens[i]->numEntities; j++) {
+                if (xf86Screens[i]->entityList[j] == entityIndex)
+                    return xf86Screens[i];
+            }
+        }
     }
     return NULL;
 }
@@ -355,15 +364,15 @@ void
 xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex)
 {
     int i;
-    
+
     for (i = 0; i < pScrn->numEntities; i++) {
-	if (pScrn->entityList[i] == entityIndex) {
-	    for (i++; i < pScrn->numEntities; i++)
-		pScrn->entityList[i-1] = pScrn->entityList[i];
-	    pScrn->numEntities--;
-	    xf86Entities[entityIndex]->inUse = FALSE;
-	    break;
-	}
+        if (pScrn->entityList[i] == entityIndex) {
+            for (i++; i < pScrn->numEntities; i++)
+                pScrn->entityList[i - 1] = pScrn->entityList[i];
+            pScrn->numEntities--;
+            xf86Entities[entityIndex]->inUse = FALSE;
+            break;
+        }
     }
 }
 
@@ -376,13 +385,14 @@ xf86ClearEntityListForScreen(int scrnIndex)
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     int i, entityIndex;
-    
-    if (pScrn->entityList == NULL || pScrn->numEntities == 0) return;
-	
+
+    if (pScrn->entityList == NULL || pScrn->numEntities == 0)
+        return;
+
     for (i = 0; i < pScrn->numEntities; i++) {
-	entityIndex = pScrn->entityList[i];
-	xf86Entities[entityIndex]->inUse = FALSE;
-	/* disable resource: call the disable function */
+        entityIndex = pScrn->entityList[i];
+        xf86Entities[entityIndex]->inUse = FALSE;
+        /* disable resource: call the disable function */
     }
     free(pScrn->entityList);
     free(pScrn->entityInstanceList);
@@ -398,14 +408,14 @@ void
 xf86AddDevToEntity(int entityIndex, GDevPtr dev)
 {
     EntityPtr pEnt;
-    
+
     if (entityIndex >= xf86NumEntities)
-	return;
-    
+        return;
+
     pEnt = xf86Entities[entityIndex];
     pEnt->numInstances++;
     pEnt->devices = xnfrealloc(pEnt->devices,
-				pEnt->numInstances * sizeof(GDevPtr));
+                               pEnt->numInstances * sizeof(GDevPtr));
     pEnt->devices[pEnt->numInstances - 1] = dev;
     dev->claimed = TRUE;
 }
@@ -420,28 +430,29 @@ xf86GetEntityInfo(int entityIndex)
 {
     EntityInfoPtr pEnt;
     int i;
-    
+
     if (entityIndex == -1)
-	return NULL;
+        return NULL;
 
     if (entityIndex >= xf86NumEntities)
-	return NULL;
-    
-    pEnt = xnfcalloc(1,sizeof(EntityInfoRec));
+        return NULL;
+
+    pEnt = xnfcalloc(1, sizeof(EntityInfoRec));
     pEnt->index = entityIndex;
     pEnt->location = xf86Entities[entityIndex]->bus;
     pEnt->active = xf86Entities[entityIndex]->active;
     pEnt->chipset = xf86Entities[entityIndex]->chipset;
     pEnt->driver = xf86Entities[entityIndex]->driver;
-    if ( (xf86Entities[entityIndex]->devices) &&
-         (xf86Entities[entityIndex]->devices[0]) ) {
-	for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++)
-	    if (xf86Entities[entityIndex]->devices[i]->screen == 0)
-	        break;
-	pEnt->device = xf86Entities[entityIndex]->devices[i];
-    } else
-	pEnt->device = NULL;
-    
+    if ((xf86Entities[entityIndex]->devices) &&
+        (xf86Entities[entityIndex]->devices[0])) {
+        for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++)
+            if (xf86Entities[entityIndex]->devices[i]->screen == 0)
+                break;
+        pEnt->device = xf86Entities[entityIndex]->devices[i];
+    }
+    else
+        pEnt->device = NULL;
+
     return pEnt;
 }
 
@@ -449,8 +460,8 @@ int
 xf86GetNumEntityInstances(int entityIndex)
 {
     if (entityIndex >= xf86NumEntities)
-	return -1;
-    
+        return -1;
+
     return xf86Entities[entityIndex]->numInstances;
 }
 
@@ -458,19 +469,19 @@ GDevPtr
 xf86GetDevFromEntity(int entityIndex, int instance)
 {
     int i;
-  
+
     /* We might not use AddDevtoEntity */
-    if ( (!xf86Entities[entityIndex]->devices) ||
-         (!xf86Entities[entityIndex]->devices[0]) ) 
-	return NULL;
+    if ((!xf86Entities[entityIndex]->devices) ||
+        (!xf86Entities[entityIndex]->devices[0]))
+        return NULL;
 
     if (entityIndex >= xf86NumEntities ||
-	instance >= xf86Entities[entityIndex]->numInstances)
-	return NULL;
-    
+        instance >= xf86Entities[entityIndex]->numInstances)
+        return NULL;
+
     for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++)
-	if (xf86Entities[entityIndex]->devices[i]->screen == instance)
-	    break;
+        if (xf86Entities[entityIndex]->devices[i]->screen == instance)
+            break;
     return xf86Entities[entityIndex]->devices[i];
 }
 
@@ -485,7 +496,7 @@ xf86AccessEnter(void)
 
     for (i = 0; i < xf86NumEntities; i++)
         if (xf86Entities[i]->entityEnter)
-		xf86Entities[i]->entityEnter(i,xf86Entities[i]->private);
+            xf86Entities[i]->entityEnter(i, xf86Entities[i]->private);
 }
 
 void
@@ -495,7 +506,7 @@ xf86AccessLeave(void)
 
     for (i = 0; i < xf86NumEntities; i++)
         if (xf86Entities[i]->entityLeave)
-		xf86Entities[i]->entityLeave(i,xf86Entities[i]->private);
+            xf86Entities[i]->entityLeave(i, xf86Entities[i]->private);
 }
 
 /*
@@ -509,28 +520,29 @@ xf86PostProbe(void)
 
     if (fbSlotClaimed && (
 #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
-	    sbusSlotClaimed ||
+                             sbusSlotClaimed ||
 #endif
 #ifdef XSERVER_LIBPCIACCESS
-	    pciSlotClaimed
+                             pciSlotClaimed
 #else
-        TRUE
+                             TRUE
 #endif
-	    ))
-	    FatalError("Cannot run in framebuffer mode. Please specify busIDs "
-		       "       for all framebuffer devices\n");
+        ))
+        FatalError("Cannot run in framebuffer mode. Please specify busIDs "
+                   "       for all framebuffer devices\n");
 
     for (i = 0; i < xf86NumEntities; i++)
         if (xf86Entities[i]->entityInit)
-	    xf86Entities[i]->entityInit(i,xf86Entities[i]->private);
+            xf86Entities[i]->entityInit(i, xf86Entities[i]->private);
 }
 
 int
 xf86GetLastScrnFlag(int entityIndex)
 {
-    if(entityIndex < xf86NumEntities) {
+    if (entityIndex < xf86NumEntities) {
         return xf86Entities[entityIndex]->lastScrnFlag;
-    } else {
+    }
+    else {
         return -1;
     }
 }
@@ -538,7 +550,7 @@ xf86GetLastScrnFlag(int entityIndex)
 void
 xf86SetLastScrnFlag(int entityIndex, int scrnIndex)
 {
-    if(entityIndex < xf86NumEntities) {
+    if (entityIndex < xf86NumEntities) {
         xf86Entities[entityIndex]->lastScrnFlag = scrnIndex;
     }
 }
@@ -546,10 +558,10 @@ xf86SetLastScrnFlag(int entityIndex, int scrnIndex)
 Bool
 xf86IsEntityShared(int entityIndex)
 {
-    if(entityIndex < xf86NumEntities) {
-        if(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL) {
-	    return TRUE;
-	}
+    if (entityIndex < xf86NumEntities) {
+        if (xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL) {
+            return TRUE;
+        }
     }
     return FALSE;
 }
@@ -557,7 +569,7 @@ xf86IsEntityShared(int entityIndex)
 void
 xf86SetEntityShared(int entityIndex)
 {
-    if(entityIndex < xf86NumEntities) {
+    if (entityIndex < xf86NumEntities) {
         xf86Entities[entityIndex]->entityProp |= IS_SHARED_ACCEL;
     }
 }
@@ -565,10 +577,10 @@ xf86SetEntityShared(int entityIndex)
 Bool
 xf86IsEntitySharable(int entityIndex)
 {
-    if(entityIndex < xf86NumEntities) {
-        if(xf86Entities[entityIndex]->entityProp & ACCEL_IS_SHARABLE) {
-	    return TRUE;
-	}
+    if (entityIndex < xf86NumEntities) {
+        if (xf86Entities[entityIndex]->entityProp & ACCEL_IS_SHARABLE) {
+            return TRUE;
+        }
     }
     return FALSE;
 }
@@ -576,7 +588,7 @@ xf86IsEntitySharable(int entityIndex)
 void
 xf86SetEntitySharable(int entityIndex)
 {
-    if(entityIndex < xf86NumEntities) {
+    if (entityIndex < xf86NumEntities) {
         xf86Entities[entityIndex]->entityProp |= ACCEL_IS_SHARABLE;
     }
 }
@@ -584,10 +596,10 @@ xf86SetEntitySharable(int entityIndex)
 Bool
 xf86IsPrimInitDone(int entityIndex)
 {
-    if(entityIndex < xf86NumEntities) {
-        if(xf86Entities[entityIndex]->entityProp & SA_PRIM_INIT_DONE) {
-	    return TRUE;
-	}
+    if (entityIndex < xf86NumEntities) {
+        if (xf86Entities[entityIndex]->entityProp & SA_PRIM_INIT_DONE) {
+            return TRUE;
+        }
     }
     return FALSE;
 }
@@ -595,7 +607,7 @@ xf86IsPrimInitDone(int entityIndex)
 void
 xf86SetPrimInitDone(int entityIndex)
 {
-    if(entityIndex < xf86NumEntities) {
+    if (entityIndex < xf86NumEntities) {
         xf86Entities[entityIndex]->entityProp |= SA_PRIM_INIT_DONE;
     }
 }
@@ -603,12 +615,11 @@ xf86SetPrimInitDone(int entityIndex)
 void
 xf86ClearPrimInitDone(int entityIndex)
 {
-    if(entityIndex < xf86NumEntities) {
+    if (entityIndex < xf86NumEntities) {
         xf86Entities[entityIndex]->entityProp &= ~SA_PRIM_INIT_DONE;
     }
 }
 
-
 /*
  * Allocate a private in the entities.
  */
@@ -622,12 +633,12 @@ xf86AllocateEntityPrivateIndex(void)
 
     idx = xf86EntityPrivateCount++;
     for (i = 0; i < xf86NumEntities; i++) {
-	pEnt = xf86Entities[i];
-	nprivs = xnfrealloc(pEnt->entityPrivates,
-			    xf86EntityPrivateCount * sizeof(DevUnion));
-	/* Zero the new private */
-	memset(&nprivs[idx], 0, sizeof(DevUnion));
-	pEnt->entityPrivates = nprivs;
+        pEnt = xf86Entities[i];
+        nprivs = xnfrealloc(pEnt->entityPrivates,
+                            xf86EntityPrivateCount * sizeof(DevUnion));
+        /* Zero the new private */
+        memset(&nprivs[idx], 0, sizeof(DevUnion));
+        pEnt->entityPrivates = nprivs;
     }
     return idx;
 }
@@ -636,8 +647,7 @@ DevUnion *
 xf86GetEntityPrivate(int entityIndex, int privIndex)
 {
     if (entityIndex >= xf86NumEntities || privIndex >= xf86EntityPrivateCount)
-	return NULL;
+        return NULL;
 
     return &(xf86Entities[entityIndex]->entityPrivates[privIndex]);
 }
-
diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index f51be7e9c..ec679df16 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -109,36 +109,36 @@
 #endif
 
 static ModuleDefault ModuleDefaults[] = {
-    {.name = "extmod",   .toLoad = TRUE,    .load_opt=NULL},
+    {.name = "extmod",.toLoad = TRUE,.load_opt = NULL},
 #ifdef DBE
-    {.name = "dbe",      .toLoad = TRUE,    .load_opt=NULL},
+    {.name = "dbe",.toLoad = TRUE,.load_opt = NULL},
 #endif
 #ifdef GLXEXT
-    {.name = "glx",      .toLoad = TRUE,    .load_opt=NULL},
+    {.name = "glx",.toLoad = TRUE,.load_opt = NULL},
 #endif
 #ifdef XRECORD
-    {.name = "record",   .toLoad = TRUE,    .load_opt=NULL},
+    {.name = "record",.toLoad = TRUE,.load_opt = NULL},
 #endif
 #ifdef XF86DRI
-    {.name = "dri",      .toLoad = TRUE,    .load_opt=NULL},
+    {.name = "dri",.toLoad = TRUE,.load_opt = NULL},
 #endif
 #ifdef DRI2
-    {.name = "dri2",     .toLoad = TRUE,    .load_opt=NULL},
+    {.name = "dri2",.toLoad = TRUE,.load_opt = NULL},
 #endif
-    {.name = NULL,       .toLoad = FALSE,   .load_opt=NULL}
+    {.name = NULL,.toLoad = FALSE,.load_opt = NULL}
 };
 
-
 /* Forward declarations */
 static Bool configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen,
-			 int scrnum, MessageType from);
+                         int scrnum, MessageType from);
 static Bool configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor);
 static Bool configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device,
-			 Bool active);
+                         Bool active);
 static Bool configInput(InputInfoPtr pInfo, XF86ConfInputPtr conf_input,
-			MessageType from);
+                        MessageType from);
 static Bool configDisplay(DispPtr displayp, XF86ConfDisplayPtr conf_display);
 static Bool addDefaultModes(MonPtr monitorp);
+
 #ifdef XF86DRI
 static void configDRI(XF86ConfDRIPtr drip);
 #endif
@@ -154,15 +154,15 @@ static void configExtensions(XF86ConfExtensionsPtr conf_ext);
 static char *
 xf86GetPathElem(char **pnt)
 {
-  char *p1;
-
-  p1 = *pnt;
-  *pnt = index(*pnt, ',');
-  if (*pnt != NULL) {
-    **pnt = '\0';
-    *pnt += 1;
-  }
-  return p1;
+    char *p1;
+
+    p1 = *pnt;
+    *pnt = index(*pnt, ',');
+    if (*pnt != NULL) {
+        **pnt = '\0';
+        *pnt += 1;
+    }
+    return p1;
 }
 
 /*
@@ -178,67 +178,67 @@ xf86GetPathElem(char **pnt)
 static char *
 xf86ValidateFontPath(char *path)
 {
-  char *tmp_path, *out_pnt, *path_elem, *next, *p1, *dir_elem;
-  struct stat stat_buf;
-  int flag;
-  int dirlen;
-
-  tmp_path = calloc(1,strlen(path)+1);
-  out_pnt = tmp_path;
-  path_elem = NULL;
-  next = path;
-  while (next != NULL) {
-    path_elem = xf86GetPathElem(&next);
-    if (*path_elem == '/') {
-      dir_elem = xnfcalloc(1, strlen(path_elem) + 1);
-      if ((p1 = strchr(path_elem, ':')) != 0)
-	dirlen = p1 - path_elem;
-      else
-	dirlen = strlen(path_elem);
-      strlcpy(dir_elem, path_elem, dirlen + 1);
-      flag = stat(dir_elem, &stat_buf);
-      if (flag == 0)
-	if (!S_ISDIR(stat_buf.st_mode))
-	  flag = -1;
-      if (flag != 0) {
-        xf86Msg(X_WARNING, "The directory \"%s\" does not exist.\n", dir_elem);
-	xf86ErrorF("\tEntry deleted from font path.\n");
-	free(dir_elem);
-	continue;
-      }
-      else {
-	XNFasprintf(&p1, "%s%s", dir_elem, DIR_FILE);
-	flag = stat(p1, &stat_buf);
-	if (flag == 0)
-	  if (!S_ISREG(stat_buf.st_mode))
-	    flag = -1;
-	free(p1);
-	if (flag != 0) {
-	  xf86Msg(X_WARNING,
-		  "`fonts.dir' not found (or not valid) in \"%s\".\n", 
-		  dir_elem);
-	  xf86ErrorF("\tEntry deleted from font path.\n");
-	  xf86ErrorF("\t(Run 'mkfontdir' on \"%s\").\n", dir_elem);
-	  free(dir_elem);
-	  continue;
-	}
-      }
-      free(dir_elem);
-    }
+    char *tmp_path, *out_pnt, *path_elem, *next, *p1, *dir_elem;
+    struct stat stat_buf;
+    int flag;
+    int dirlen;
+
+    tmp_path = calloc(1, strlen(path) + 1);
+    out_pnt = tmp_path;
+    path_elem = NULL;
+    next = path;
+    while (next != NULL) {
+        path_elem = xf86GetPathElem(&next);
+        if (*path_elem == '/') {
+            dir_elem = xnfcalloc(1, strlen(path_elem) + 1);
+            if ((p1 = strchr(path_elem, ':')) != 0)
+                dirlen = p1 - path_elem;
+            else
+                dirlen = strlen(path_elem);
+            strlcpy(dir_elem, path_elem, dirlen + 1);
+            flag = stat(dir_elem, &stat_buf);
+            if (flag == 0)
+                if (!S_ISDIR(stat_buf.st_mode))
+                    flag = -1;
+            if (flag != 0) {
+                xf86Msg(X_WARNING, "The directory \"%s\" does not exist.\n",
+                        dir_elem);
+                xf86ErrorF("\tEntry deleted from font path.\n");
+                free(dir_elem);
+                continue;
+            }
+            else {
+                XNFasprintf(&p1, "%s%s", dir_elem, DIR_FILE);
+                flag = stat(p1, &stat_buf);
+                if (flag == 0)
+                    if (!S_ISREG(stat_buf.st_mode))
+                        flag = -1;
+                free(p1);
+                if (flag != 0) {
+                    xf86Msg(X_WARNING,
+                            "`fonts.dir' not found (or not valid) in \"%s\".\n",
+                            dir_elem);
+                    xf86ErrorF("\tEntry deleted from font path.\n");
+                    xf86ErrorF("\t(Run 'mkfontdir' on \"%s\").\n", dir_elem);
+                    free(dir_elem);
+                    continue;
+                }
+            }
+            free(dir_elem);
+        }
 
-    /*
-     * Either an OK directory, or a font server name.  So add it to
-     * the path.
-     */
-    if (out_pnt != tmp_path)
-      *out_pnt++ = ',';
-    strcat(out_pnt, path_elem);
-    out_pnt += strlen(path_elem);
-  }
-  return tmp_path;
+        /*
+         * Either an OK directory, or a font server name.  So add it to
+         * the path.
+         */
+        if (out_pnt != tmp_path)
+            *out_pnt++ = ',';
+        strcat(out_pnt, path_elem);
+        out_pnt += strlen(path_elem);
+    }
+    return tmp_path;
 }
 
-
 /*
  * use the datastructure that the parser provides and pick out the parts
  * that we need at this point
@@ -248,13 +248,15 @@ xf86ModulelistFromConfig(pointer **optlist)
 {
     int count = 0, i = 0;
     char **modulearray;
+
     const char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
-                             "freetype", "type1",
-                             NULL };
+        "freetype", "type1",
+        NULL
+    };
     pointer *optarray;
     XF86LoadPtr modp;
     Bool found;
-    
+
     /*
      * make sure the config file has been parsed and that we have a
      * ModulePath set; if no ModulePath was given, use the default
@@ -264,15 +266,17 @@ xf86ModulelistFromConfig(pointer **optlist)
         xf86Msg(X_ERROR, "Cannot access global config data structure\n");
         return NULL;
     }
-    
+
     if (xf86configptr->conf_modules) {
         /* Walk the disable list and let people know what we've parsed to
          * not be loaded 
          */
         modp = xf86configptr->conf_modules->mod_disable_lst;
         while (modp) {
-            xf86Msg(X_WARNING, "\"%s\" will not be loaded unless you've specified it to be loaded elsewhere.\n", modp->load_name);
-	        modp = (XF86LoadPtr) modp->list.next;
+            xf86Msg(X_WARNING,
+                    "\"%s\" will not be loaded unless you've specified it to be loaded elsewhere.\n",
+                    modp->load_name);
+            modp = (XF86LoadPtr) modp->list.next;
         }
         /*
          * Walk the default settings table. For each module listed to be
@@ -280,90 +284,103 @@ xf86ModulelistFromConfig(pointer **optlist)
          * sure it's not in the mod_no_load_lst. If it's not disabled,
          * append it to mod_load_lst
          */
-         for (i=0 ; ModuleDefaults[i].name != NULL ; i++) {
+        for (i = 0; ModuleDefaults[i].name != NULL; i++) {
             if (ModuleDefaults[i].toLoad == FALSE) {
-                xf86Msg(X_WARNING, "\"%s\" is not to be loaded by default. Skipping.\n", ModuleDefaults[i].name);
+                xf86Msg(X_WARNING,
+                        "\"%s\" is not to be loaded by default. Skipping.\n",
+                        ModuleDefaults[i].name);
                 continue;
             }
             found = FALSE;
             modp = xf86configptr->conf_modules->mod_load_lst;
             while (modp) {
                 if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) {
-                    xf86Msg(X_INFO, "\"%s\" will be loaded. This was enabled by default and also specified in the config file.\n", ModuleDefaults[i].name);
+                    xf86Msg(X_INFO,
+                            "\"%s\" will be loaded. This was enabled by default and also specified in the config file.\n",
+                            ModuleDefaults[i].name);
                     found = TRUE;
                     break;
                 }
-	        modp = (XF86LoadPtr) modp->list.next;
+                modp = (XF86LoadPtr) modp->list.next;
             }
             if (found == FALSE) {
                 modp = xf86configptr->conf_modules->mod_disable_lst;
                 while (modp) {
                     if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) {
-                        xf86Msg(X_INFO, "\"%s\" will be loaded even though the default is to disable it.\n", ModuleDefaults[i].name);
+                        xf86Msg(X_INFO,
+                                "\"%s\" will be loaded even though the default is to disable it.\n",
+                                ModuleDefaults[i].name);
                         found = TRUE;
                         break;
                     }
-	                modp = (XF86LoadPtr) modp->list.next;
+                    modp = (XF86LoadPtr) modp->list.next;
                 }
             }
             if (found == FALSE) {
-		XF86LoadPtr ptr = (XF86LoadPtr)xf86configptr->conf_modules;
-                xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, XF86_LOAD_MODULE, ModuleDefaults[i].load_opt);
-                xf86Msg(X_INFO, "\"%s\" will be loaded by default.\n", ModuleDefaults[i].name);
+                XF86LoadPtr ptr = (XF86LoadPtr) xf86configptr->conf_modules;
+
+                xf86addNewLoadDirective(ptr, ModuleDefaults[i].name,
+                                        XF86_LOAD_MODULE,
+                                        ModuleDefaults[i].load_opt);
+                xf86Msg(X_INFO, "\"%s\" will be loaded by default.\n",
+                        ModuleDefaults[i].name);
             }
-         }
-    } else {
-	xf86configptr->conf_modules = xnfcalloc(1, sizeof(XF86ConfModuleRec));
-	for (i=0 ; ModuleDefaults[i].name != NULL ; i++) {
-	    if (ModuleDefaults[i].toLoad == TRUE) {
-		XF86LoadPtr ptr = (XF86LoadPtr)xf86configptr->conf_modules;
-		xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, XF86_LOAD_MODULE, ModuleDefaults[i].load_opt);
-	    }
-	}
-    }
-
-	    /*
-	     * Walk the list of modules in the "Module" section to determine how
-	     * many we have.
-	    */
-	    modp = xf86configptr->conf_modules->mod_load_lst;
-	    while (modp) {
-                for (i = 0; ignore[i]; i++) {
-                    if (strcmp(modp->load_name, ignore[i]) == 0)
-                        modp->ignore = 1;
-                }
-                if (!modp->ignore)
-	            count++;
-	        modp = (XF86LoadPtr) modp->list.next;
-	    }
+        }
+    }
+    else {
+        xf86configptr->conf_modules = xnfcalloc(1, sizeof(XF86ConfModuleRec));
+        for (i = 0; ModuleDefaults[i].name != NULL; i++) {
+            if (ModuleDefaults[i].toLoad == TRUE) {
+                XF86LoadPtr ptr = (XF86LoadPtr) xf86configptr->conf_modules;
+
+                xf86addNewLoadDirective(ptr, ModuleDefaults[i].name,
+                                        XF86_LOAD_MODULE,
+                                        ModuleDefaults[i].load_opt);
+            }
+        }
+    }
+
+    /*
+     * Walk the list of modules in the "Module" section to determine how
+     * many we have.
+     */
+    modp = xf86configptr->conf_modules->mod_load_lst;
+    while (modp) {
+        for (i = 0; ignore[i]; i++) {
+            if (strcmp(modp->load_name, ignore[i]) == 0)
+                modp->ignore = 1;
+        }
+        if (!modp->ignore)
+            count++;
+        modp = (XF86LoadPtr) modp->list.next;
+    }
 
     /*
      * allocate the memory and walk the list again to fill in the pointers
      */
-    modulearray = xnfalloc((count + 1) * sizeof(char*));
+    modulearray = xnfalloc((count + 1) * sizeof(char *));
     optarray = xnfalloc((count + 1) * sizeof(pointer));
     count = 0;
     if (xf86configptr->conf_modules) {
-	    modp = xf86configptr->conf_modules->mod_load_lst;
-	    while (modp) {
+        modp = xf86configptr->conf_modules->mod_load_lst;
+        while (modp) {
             if (!modp->ignore) {
-	            modulearray[count] = modp->load_name;
-	            optarray[count] = modp->load_opt;
-	            count++;
+                modulearray[count] = modp->load_name;
+                optarray[count] = modp->load_opt;
+                count++;
             }
-	        modp = (XF86LoadPtr) modp->list.next;
-	    }
+            modp = (XF86LoadPtr) modp->list.next;
+        }
     }
     modulearray[count] = NULL;
     optarray[count] = NULL;
     if (optlist)
-	    *optlist = optarray;
+        *optlist = optarray;
     else
-	    free(optarray);
+        free(optarray);
     return modulearray;
 }
 
-
 char **
 xf86DriverlistFromConfig(void)
 {
@@ -371,7 +388,7 @@ xf86DriverlistFromConfig(void)
     int j;
     char **modulearray;
     screenLayoutPtr slp;
-    
+
     /*
      * make sure the config file has been parsed and that we have a
      * ModulePath set; if no ModulePath was given, use the default
@@ -381,7 +398,7 @@ xf86DriverlistFromConfig(void)
         xf86Msg(X_ERROR, "Cannot access global config data structure\n");
         return NULL;
     }
-    
+
     /*
      * Walk the list of driver lines in active "Device" sections to
      * determine now many implicitly loaded modules there are.
@@ -390,7 +407,7 @@ xf86DriverlistFromConfig(void)
     if (xf86ConfigLayout.screens) {
         slp = xf86ConfigLayout.screens;
         while ((slp++)->screen) {
-	    count++;
+            count++;
         }
     }
 
@@ -399,39 +416,39 @@ xf86DriverlistFromConfig(void)
      */
     j = 0;
     while (xf86ConfigLayout.inactives[j++].identifier)
-	count++;
+        count++;
 
     if (count == 0)
-	return NULL;
+        return NULL;
 
     /*
      * allocate the memory and walk the list again to fill in the pointers
      */
-    modulearray = xnfalloc((count + 1) * sizeof(char*));
+    modulearray = xnfalloc((count + 1) * sizeof(char *));
     count = 0;
     slp = xf86ConfigLayout.screens;
     while (slp->screen) {
-	modulearray[count] = slp->screen->device->driver;
-	count++;
-	slp++;
+        modulearray[count] = slp->screen->device->driver;
+        count++;
+        slp++;
     }
 
     j = 0;
 
-    while (xf86ConfigLayout.inactives[j].identifier) 
-	modulearray[count++] = xf86ConfigLayout.inactives[j++].driver;
+    while (xf86ConfigLayout.inactives[j].identifier)
+        modulearray[count++] = xf86ConfigLayout.inactives[j++].driver;
 
     modulearray[count] = NULL;
 
     /* Remove duplicates */
     for (count = 0; modulearray[count] != NULL; count++) {
-	int i;
+        int i;
 
-	for (i = 0; i < count; i++)
-	    if (xf86NameCmp(modulearray[i], modulearray[count]) == 0) {
-		modulearray[count] = "";
-		break;
-	    }
+        for (i = 0; i < count; i++)
+            if (xf86NameCmp(modulearray[i], modulearray[count]) == 0) {
+                modulearray[count] = "";
+                break;
+            }
     }
     return modulearray;
 }
@@ -452,7 +469,7 @@ xf86InputDriverlistFromConfig(void)
         xf86Msg(X_ERROR, "Cannot access global config data structure\n");
         return NULL;
     }
-    
+
     /*
      * Walk the list of driver lines in active "InputDevice" sections to
      * determine now many implicitly loaded modules there are.
@@ -460,36 +477,36 @@ xf86InputDriverlistFromConfig(void)
     if (xf86ConfigLayout.inputs) {
         idp = xf86ConfigLayout.inputs;
         while (*idp) {
-	    count++;
-	    idp++;
+            count++;
+            idp++;
         }
     }
 
     if (count == 0)
-	return NULL;
+        return NULL;
 
     /*
      * allocate the memory and walk the list again to fill in the pointers
      */
-    modulearray = xnfalloc((count + 1) * sizeof(char*));
+    modulearray = xnfalloc((count + 1) * sizeof(char *));
     count = 0;
     idp = xf86ConfigLayout.inputs;
     while (idp && *idp) {
         modulearray[count] = (*idp)->driver;
-	count++;
-	idp++;
+        count++;
+        idp++;
     }
     modulearray[count] = NULL;
 
     /* Remove duplicates */
     for (count = 0; modulearray[count] != NULL; count++) {
-	int i;
+        int i;
 
-	for (i = 0; i < count; i++)
-	    if (xf86NameCmp(modulearray[i], modulearray[count]) == 0) {
-		modulearray[count] = "";
-		break;
-	    }
+        for (i = 0; i < count; i++)
+            if (xf86NameCmp(modulearray[i], modulearray[count]) == 0) {
+                modulearray[count] = "";
+                break;
+            }
     }
     return modulearray;
 }
@@ -503,7 +520,7 @@ fixup_video_driver_list(char **drivers)
     int i;
 
     /* walk to the end of the list */
-    for (end = drivers; *end && **end; end++) ;
+    for (end = drivers; *end && **end; end++);
     end--;
 
     /*
@@ -513,7 +530,9 @@ fixup_video_driver_list(char **drivers)
     for (i = 0; fallback[i]; i++) {
         for (drv = drivers; drv != end; drv++) {
             if (strstr(*drv, fallback[i])) {
-                x = *drv; *drv = *end; *end = x;
+                x = *drv;
+                *drv = *end;
+                *end = x;
                 end--;
                 break;
             }
@@ -522,13 +541,13 @@ fixup_video_driver_list(char **drivers)
 }
 
 static char **
-GenerateDriverlist(const char * dirname)
+GenerateDriverlist(const char *dirname)
 {
     char **ret;
     const char *subdirs[] = { dirname, NULL };
-    static const char *patlist[] = {"(.*)_drv\\.so", NULL};
+    static const char *patlist[] = { "(.*)_drv\\.so", NULL };
     ret = LoaderListDirs(subdirs, patlist);
-    
+
     /* fix up the probe order for video drivers */
     if (strstr(dirname, "drivers") && ret != NULL)
         fixup_video_driver_list(ret);
@@ -552,7 +571,8 @@ xf86DriverlistFromCompile(void)
  *      Print a READABLE ErrorMessage!!!  All information that is 
  *      available is printed.
  */
-static void _X_ATTRIBUTE_PRINTF(1,2)
+static void
+_X_ATTRIBUTE_PRINTF(1, 2)
 xf86ConfigError(const char *msg, ...)
 {
     va_list ap;
@@ -568,31 +588,31 @@ xf86ConfigError(const char *msg, ...)
 static void
 configFiles(XF86ConfFilesPtr fileconf)
 {
-    MessageType	 pathFrom;
-    Bool	 must_copy;
-    int		 size, countDirs;
-    char	*temp_path, *log_buf, *start, *end;
+    MessageType pathFrom;
+    Bool must_copy;
+    int size, countDirs;
+    char *temp_path, *log_buf, *start, *end;
 
     /* FontPath */
     must_copy = TRUE;
 
     temp_path = defaultFontPath ? defaultFontPath : "";
     if (xf86fpFlag)
-	pathFrom = X_CMDLINE;
+        pathFrom = X_CMDLINE;
     else if (fileconf && fileconf->file_fontpath) {
-	pathFrom = X_CONFIG;
-	if (xf86Info.useDefaultFontPath) {
-	    if (asprintf(&defaultFontPath, "%s%s%s", fileconf->file_fontpath,
-			 *temp_path ? "," : "", temp_path) == -1)
-		defaultFontPath = NULL;
-	    else
-		must_copy = FALSE;
-	}
-	else
-	    defaultFontPath = fileconf->file_fontpath;
+        pathFrom = X_CONFIG;
+        if (xf86Info.useDefaultFontPath) {
+            if (asprintf(&defaultFontPath, "%s%s%s", fileconf->file_fontpath,
+                         *temp_path ? "," : "", temp_path) == -1)
+                defaultFontPath = NULL;
+            else
+                must_copy = FALSE;
+        }
+        else
+            defaultFontPath = fileconf->file_fontpath;
     }
     else
-	pathFrom = X_DEFAULT;
+        pathFrom = X_DEFAULT;
     temp_path = defaultFontPath ? defaultFontPath : "";
 
     /* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
@@ -604,61 +624,61 @@ configFiles(XF86ConfFilesPtr fileconf)
     countDirs = 1;
     temp_path = defaultFontPath;
     while ((temp_path = index(temp_path, ',')) != NULL) {
-	countDirs++;
-	temp_path++;
+        countDirs++;
+        temp_path++;
     }
 
     log_buf = xnfalloc(strlen(defaultFontPath) + (2 * countDirs) + 1);
     temp_path = log_buf;
     start = defaultFontPath;
-    while((end = index(start, ',')) != NULL) {
-      size = (end - start) + 1;
-      *(temp_path++) = '\t';
-      strncpy(temp_path, start, size);
-      temp_path += size;
-      *(temp_path++) = '\n';
-      start += size;
+    while ((end = index(start, ',')) != NULL) {
+        size = (end - start) + 1;
+        *(temp_path++) = '\t';
+        strncpy(temp_path, start, size);
+        temp_path += size;
+        *(temp_path++) = '\n';
+        start += size;
     }
     /* copy last entry */
     *(temp_path++) = '\t';
     strcpy(temp_path, start);
     xf86Msg(pathFrom, "FontPath set to:\n%s\n", log_buf);
     free(log_buf);
-  
-  /* ModulePath */
 
-  if (fileconf) {
-    if (xf86ModPathFrom != X_CMDLINE && fileconf->file_modulepath) {
-      xf86ModulePath = fileconf->file_modulepath;
-      xf86ModPathFrom = X_CONFIG;
+    /* ModulePath */
+
+    if (fileconf) {
+        if (xf86ModPathFrom != X_CMDLINE && fileconf->file_modulepath) {
+            xf86ModulePath = fileconf->file_modulepath;
+            xf86ModPathFrom = X_CONFIG;
+        }
     }
-  }
 
-  xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath);
+    xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath);
 
-  if (!xf86xkbdirFlag && fileconf && fileconf->file_xkbdir) {
-    XkbBaseDirectory = fileconf->file_xkbdir;
-    xf86Msg(X_CONFIG, "XKB base directory set to \"%s\"\n",
-	    XkbBaseDirectory);
-  }
+    if (!xf86xkbdirFlag && fileconf && fileconf->file_xkbdir) {
+        XkbBaseDirectory = fileconf->file_xkbdir;
+        xf86Msg(X_CONFIG, "XKB base directory set to \"%s\"\n",
+                XkbBaseDirectory);
+    }
 #if 0
-  /* LogFile */
-  /*
-   * XXX The problem with this is that the log file is already open.
-   * One option might be to copy the exiting contents to the new location.
-   * and re-open it.  The down side is that the default location would
-   * already have been overwritten.  Another option would be to start with
-   * unique temporary location, then copy it once the correct name is known.
-   * A problem with this is what happens if the server exits before that
-   * happens.
-   */
-  if (xf86LogFileFrom == X_DEFAULT && fileconf->file_logfile) {
-    xf86LogFile = fileconf->file_logfile;
-    xf86LogFileFrom = X_CONFIG;
-  }
+    /* LogFile */
+    /*
+     * XXX The problem with this is that the log file is already open.
+     * One option might be to copy the exiting contents to the new location.
+     * and re-open it.  The down side is that the default location would
+     * already have been overwritten.  Another option would be to start with
+     * unique temporary location, then copy it once the correct name is known.
+     * A problem with this is what happens if the server exits before that
+     * happens.
+     */
+    if (xf86LogFileFrom == X_DEFAULT && fileconf->file_logfile) {
+        xf86LogFile = fileconf->file_logfile;
+        xf86LogFileFrom = X_CONFIG;
+    }
 #endif
 
-  return;
+    return;
 }
 
 typedef enum {
@@ -695,58 +715,58 @@ typedef enum {
  * if the parser found the option in the config file.
  */
 static OptionInfoRec FlagOptions[] = {
-  { FLAG_NOTRAPSIGNALS,		"NoTrapSignals",		OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_DONTVTSWITCH,		"DontVTSwitch",			OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_DONTZAP,		"DontZap",			OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_DONTZOOM,		"DontZoom",			OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_DISABLEVIDMODE,	"DisableVidModeExtension",	OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_ALLOWNONLOCAL,		"AllowNonLocalXvidtune",	OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_ALLOWMOUSEOPENFAIL,	"AllowMouseOpenFail",		OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_SAVER_BLANKTIME,	"BlankTime"		,	OPTV_INTEGER,
-	{0}, FALSE },
-  { FLAG_DPMS_STANDBYTIME,	"StandbyTime",			OPTV_INTEGER,
-	{0}, FALSE },
-  { FLAG_DPMS_SUSPENDTIME,	"SuspendTime",			OPTV_INTEGER,
-	{0}, FALSE },
-  { FLAG_DPMS_OFFTIME,		"OffTime",			OPTV_INTEGER,
-	{0}, FALSE },
-  { FLAG_PIXMAP,		"Pixmap",			OPTV_INTEGER,
-	{0}, FALSE },
-  { FLAG_NOPM,			"NoPM",				OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_XINERAMA,		"Xinerama",			OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_LOG,			"Log",				OPTV_STRING,
-	{0}, FALSE },
-  { FLAG_RENDER_COLORMAP_MODE,	"RenderColormapMode",		OPTV_STRING,
-        {0}, FALSE },
-  { FLAG_RANDR,			"RandR",			OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_AIGLX,			"AIGLX",			OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_IGNORE_ABI,		"IgnoreABI",			OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_USE_DEFAULT_FONT_PATH,  "UseDefaultFontPath",		OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_AUTO_ADD_DEVICES,       "AutoAddDevices",		OPTV_BOOLEAN,
-        {0}, FALSE },
-  { FLAG_AUTO_ENABLE_DEVICES,    "AutoEnableDevices",		OPTV_BOOLEAN,
-        {0}, FALSE },
-  { FLAG_GLX_VISUALS,		"GlxVisuals",			OPTV_STRING,
-        {0}, FALSE },
-  { FLAG_DRI2,			"DRI2",				OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_USE_SIGIO,		"UseSIGIO",			OPTV_BOOLEAN,
-	{0}, FALSE },
-  { -1,				NULL,				OPTV_NONE,
-	{0}, FALSE },
+    {FLAG_NOTRAPSIGNALS, "NoTrapSignals", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_ALLOWNONLOCAL, "AllowNonLocalXvidtune", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_ALLOWMOUSEOPENFAIL, "AllowMouseOpenFail", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_SAVER_BLANKTIME, "BlankTime", OPTV_INTEGER,
+     {0}, FALSE},
+    {FLAG_DPMS_STANDBYTIME, "StandbyTime", OPTV_INTEGER,
+     {0}, FALSE},
+    {FLAG_DPMS_SUSPENDTIME, "SuspendTime", OPTV_INTEGER,
+     {0}, FALSE},
+    {FLAG_DPMS_OFFTIME, "OffTime", OPTV_INTEGER,
+     {0}, FALSE},
+    {FLAG_PIXMAP, "Pixmap", OPTV_INTEGER,
+     {0}, FALSE},
+    {FLAG_NOPM, "NoPM", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_XINERAMA, "Xinerama", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_LOG, "Log", OPTV_STRING,
+     {0}, FALSE},
+    {FLAG_RENDER_COLORMAP_MODE, "RenderColormapMode", OPTV_STRING,
+     {0}, FALSE},
+    {FLAG_RANDR, "RandR", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_IGNORE_ABI, "IgnoreABI", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_USE_DEFAULT_FONT_PATH, "UseDefaultFontPath", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_AUTO_ADD_DEVICES, "AutoAddDevices", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_AUTO_ENABLE_DEVICES, "AutoEnableDevices", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_GLX_VISUALS, "GlxVisuals", OPTV_STRING,
+     {0}, FALSE},
+    {FLAG_DRI2, "DRI2", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {FLAG_USE_SIGIO, "UseSIGIO", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {-1, NULL, OPTV_NONE,
+     {0}, FALSE},
 };
 
 static Bool
@@ -759,6 +779,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
     MessageType from;
     const char *s;
     XkbRMLVOSet set;
+
     /* Default options. */
     set.rules = "base";
     set.model = "pc105";
@@ -772,13 +793,13 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
      */
     optp = NULL;
     if (flagsconf && flagsconf->flg_option_lst)
-	optp = xf86optionListDup(flagsconf->flg_option_lst);
+        optp = xf86optionListDup(flagsconf->flg_option_lst);
     if (layoutopts) {
-	tmp = xf86optionListDup(layoutopts);
-	if (optp)
-	    optp = xf86optionListMerge(optp, tmp);
-	else
-	    optp = tmp;
+        tmp = xf86optionListDup(layoutopts);
+        if (optp)
+            optp = xf86optionListMerge(optp, tmp);
+        else
+            optp = tmp;
     }
 
     xf86ProcessOptions(-1, optp, FlagOptions);
@@ -790,23 +811,28 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
 
     xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
     if (xf86Info.ignoreABI) {
-	    xf86Msg(X_CONFIG, "Ignoring ABI Version\n");
+        xf86Msg(X_CONFIG, "Ignoring ABI Version\n");
     }
 
     if (xf86SIGIOSupported()) {
-	xf86Info.useSIGIO = xf86ReturnOptValBool(FlagOptions, FLAG_USE_SIGIO, USE_SIGIO_BY_DEFAULT);
-	if (xf86IsOptionSet(FlagOptions, FLAG_USE_SIGIO)) {
-	    from = X_CONFIG;
-	} else {
-	    from = X_DEFAULT;
-	}
-	if (!xf86Info.useSIGIO) {
-	    xf86Msg(from, "Disabling SIGIO handlers for input devices\n");
-	} else if (from == X_CONFIG) {
-	    xf86Msg(from, "Enabling SIGIO handlers for input devices\n");
-	}
-    } else {
-	xf86Info.useSIGIO = FALSE;
+        xf86Info.useSIGIO =
+            xf86ReturnOptValBool(FlagOptions, FLAG_USE_SIGIO,
+                                 USE_SIGIO_BY_DEFAULT);
+        if (xf86IsOptionSet(FlagOptions, FLAG_USE_SIGIO)) {
+            from = X_CONFIG;
+        }
+        else {
+            from = X_DEFAULT;
+        }
+        if (!xf86Info.useSIGIO) {
+            xf86Msg(from, "Disabling SIGIO handlers for input devices\n");
+        }
+        else if (from == X_CONFIG) {
+            xf86Msg(from, "Enabling SIGIO handlers for input devices\n");
+        }
+    }
+    else {
+        xf86Info.useSIGIO = FALSE;
     }
 
     if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ADD_DEVICES)) {
@@ -838,86 +864,92 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
      */
 #ifdef XF86VIDMODE
     if (xf86GetOptValBool(FlagOptions, FLAG_DISABLEVIDMODE, &value))
-	xf86Info.vidModeEnabled = !value;
+        xf86Info.vidModeEnabled = !value;
     if (xf86GetOptValBool(FlagOptions, FLAG_ALLOWNONLOCAL, &value))
-	xf86Info.vidModeAllowNonLocal = value;
+        xf86Info.vidModeAllowNonLocal = value;
 #endif
 
     if (xf86GetOptValBool(FlagOptions, FLAG_ALLOWMOUSEOPENFAIL, &value))
-	xf86Info.allowMouseOpenFail = value;
+        xf86Info.allowMouseOpenFail = value;
 
     xf86Info.pmFlag = TRUE;
-    if (xf86GetOptValBool(FlagOptions, FLAG_NOPM, &value)) 
-	xf86Info.pmFlag = !value;
+    if (xf86GetOptValBool(FlagOptions, FLAG_NOPM, &value))
+        xf86Info.pmFlag = !value;
     {
-	if ((s = xf86GetOptValString(FlagOptions, FLAG_LOG))) {
-	    if (!xf86NameCmp(s,"flush")) {
-		xf86Msg(X_CONFIG, "Flushing logfile enabled\n");
-		xf86Info.log = LogFlush;
-		LogSetParameter(XLOG_FLUSH, TRUE);
-	    } else if (!xf86NameCmp(s,"sync")) {
-		xf86Msg(X_CONFIG, "Syncing logfile enabled\n");
-		xf86Info.log = LogSync;
-		LogSetParameter(XLOG_FLUSH, TRUE);
-		LogSetParameter(XLOG_SYNC, TRUE);
-	    } else {
-		xf86Msg(X_WARNING,"Unknown Log option\n");
-	    }
-        }
-    }
-    
+        if ((s = xf86GetOptValString(FlagOptions, FLAG_LOG))) {
+            if (!xf86NameCmp(s, "flush")) {
+                xf86Msg(X_CONFIG, "Flushing logfile enabled\n");
+                xf86Info.log = LogFlush;
+                LogSetParameter(XLOG_FLUSH, TRUE);
+            }
+            else if (!xf86NameCmp(s, "sync")) {
+                xf86Msg(X_CONFIG, "Syncing logfile enabled\n");
+                xf86Info.log = LogSync;
+                LogSetParameter(XLOG_FLUSH, TRUE);
+                LogSetParameter(XLOG_SYNC, TRUE);
+            }
+            else {
+                xf86Msg(X_WARNING, "Unknown Log option\n");
+            }
+        }
+    }
+
     {
-	if ((s = xf86GetOptValString(FlagOptions, FLAG_RENDER_COLORMAP_MODE))){
-	    int policy = PictureParseCmapPolicy (s);
-	    if (policy == PictureCmapPolicyInvalid)
-		xf86Msg(X_WARNING, "Unknown colormap policy \"%s\"\n", s);
-	    else
-	    {
-		xf86Msg(X_CONFIG, "Render colormap policy set to %s\n", s);
-		PictureCmapPolicy = policy;
-	    }
-	}
+        if ((s = xf86GetOptValString(FlagOptions, FLAG_RENDER_COLORMAP_MODE))) {
+            int policy = PictureParseCmapPolicy(s);
+
+            if (policy == PictureCmapPolicyInvalid)
+                xf86Msg(X_WARNING, "Unknown colormap policy \"%s\"\n", s);
+            else {
+                xf86Msg(X_CONFIG, "Render colormap policy set to %s\n", s);
+                PictureCmapPolicy = policy;
+            }
+        }
     }
 
 #ifdef RANDR
     xf86Info.disableRandR = FALSE;
     xf86Info.randRFrom = X_DEFAULT;
     if (xf86GetOptValBool(FlagOptions, FLAG_RANDR, &value)) {
-	xf86Info.disableRandR = !value;
-	xf86Info.randRFrom = X_CONFIG;
+        xf86Info.disableRandR = !value;
+        xf86Info.randRFrom = X_CONFIG;
     }
 #endif
 
     xf86Info.aiglx = TRUE;
     xf86Info.aiglxFrom = X_DEFAULT;
     if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
-	xf86Info.aiglx = value;
-	xf86Info.aiglxFrom = X_CONFIG;
+        xf86Info.aiglx = value;
+        xf86Info.aiglxFrom = X_CONFIG;
     }
 
 #ifdef GLXEXT
     xf86Info.glxVisuals = XF86_GlxVisualsTypical;
     xf86Info.glxVisualsFrom = X_DEFAULT;
     if ((s = xf86GetOptValString(FlagOptions, FLAG_GLX_VISUALS))) {
-	if (!xf86NameCmp(s, "minimal")) {
-	    xf86Info.glxVisuals = XF86_GlxVisualsMinimal;
-	} else if (!xf86NameCmp(s, "typical")) {
-	    xf86Info.glxVisuals = XF86_GlxVisualsTypical;
-	} else if (!xf86NameCmp(s, "all")) {
-	    xf86Info.glxVisuals = XF86_GlxVisualsAll;
-	} else {
-	    xf86Msg(X_WARNING,"Unknown GlxVisuals option\n");
-	}
+        if (!xf86NameCmp(s, "minimal")) {
+            xf86Info.glxVisuals = XF86_GlxVisualsMinimal;
+        }
+        else if (!xf86NameCmp(s, "typical")) {
+            xf86Info.glxVisuals = XF86_GlxVisualsTypical;
+        }
+        else if (!xf86NameCmp(s, "all")) {
+            xf86Info.glxVisuals = XF86_GlxVisualsAll;
+        }
+        else {
+            xf86Msg(X_WARNING, "Unknown GlxVisuals option\n");
+        }
     }
 
     if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
-	xf86Info.aiglx = value;
-	xf86Info.aiglxFrom = X_CONFIG;
+        xf86Info.aiglx = value;
+        xf86Info.aiglxFrom = X_CONFIG;
     }
 #endif
 
     /* if we're not hotplugging, force some input devices to exist */
-    xf86Info.forceInputDevices = !(xf86Info.autoAddDevices && xf86Info.autoEnableDevices);
+    xf86Info.forceInputDevices = !(xf86Info.autoAddDevices &&
+                                   xf86Info.autoEnableDevices);
 
     /* when forcing input devices, we use kbd. otherwise evdev, so use the
      * evdev rules set. */
@@ -930,8 +962,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
     xf86Info.useDefaultFontPath = TRUE;
     xf86Info.useDefaultFontPathFrom = X_DEFAULT;
     if (xf86GetOptValBool(FlagOptions, FLAG_USE_DEFAULT_FONT_PATH, &value)) {
-	xf86Info.useDefaultFontPath = value;
-	xf86Info.useDefaultFontPathFrom = X_CONFIG;
+        xf86Info.useDefaultFontPath = value;
+        xf86Info.useDefaultFontPathFrom = X_CONFIG;
     }
 
 /* Make sure that timers don't overflow CARD32's after multiplying */
@@ -940,86 +972,93 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
     i = -1;
     xf86GetOptValInteger(FlagOptions, FLAG_SAVER_BLANKTIME, &i);
     if ((i >= 0) && (i < MAX_TIME_IN_MIN))
-	ScreenSaverTime = defaultScreenSaverTime = i * MILLI_PER_MIN;
+        ScreenSaverTime = defaultScreenSaverTime = i * MILLI_PER_MIN;
     else if (i != -1)
-	xf86ConfigError("BlankTime value %d outside legal range of 0 - %d minutes",
-			i, MAX_TIME_IN_MIN);
+        xf86ConfigError
+            ("BlankTime value %d outside legal range of 0 - %d minutes", i,
+             MAX_TIME_IN_MIN);
 
 #ifdef DPMSExtension
     i = -1;
     xf86GetOptValInteger(FlagOptions, FLAG_DPMS_STANDBYTIME, &i);
     if ((i >= 0) && (i < MAX_TIME_IN_MIN))
-	DPMSStandbyTime = i * MILLI_PER_MIN;
+        DPMSStandbyTime = i * MILLI_PER_MIN;
     else if (i != -1)
-	xf86ConfigError("StandbyTime value %d outside legal range of 0 - %d minutes",
-			i, MAX_TIME_IN_MIN);
+        xf86ConfigError
+            ("StandbyTime value %d outside legal range of 0 - %d minutes", i,
+             MAX_TIME_IN_MIN);
     i = -1;
     xf86GetOptValInteger(FlagOptions, FLAG_DPMS_SUSPENDTIME, &i);
     if ((i >= 0) && (i < MAX_TIME_IN_MIN))
-	DPMSSuspendTime = i * MILLI_PER_MIN;
+        DPMSSuspendTime = i * MILLI_PER_MIN;
     else if (i != -1)
-	xf86ConfigError("SuspendTime value %d outside legal range of 0 - %d minutes",
-			i, MAX_TIME_IN_MIN);
+        xf86ConfigError
+            ("SuspendTime value %d outside legal range of 0 - %d minutes", i,
+             MAX_TIME_IN_MIN);
     i = -1;
     xf86GetOptValInteger(FlagOptions, FLAG_DPMS_OFFTIME, &i);
     if ((i >= 0) && (i < MAX_TIME_IN_MIN))
-	DPMSOffTime = i * MILLI_PER_MIN;
+        DPMSOffTime = i * MILLI_PER_MIN;
     else if (i != -1)
-	xf86ConfigError("OffTime value %d outside legal range of 0 - %d minutes",
-			i, MAX_TIME_IN_MIN);
+        xf86ConfigError
+            ("OffTime value %d outside legal range of 0 - %d minutes", i,
+             MAX_TIME_IN_MIN);
 #endif
 
     i = -1;
     xf86GetOptValInteger(FlagOptions, FLAG_PIXMAP, &i);
     switch (i) {
     case 24:
-	pix24 = Pix24Use24;
-	break;
+        pix24 = Pix24Use24;
+        break;
     case 32:
-	pix24 = Pix24Use32;
-	break;
+        pix24 = Pix24Use32;
+        break;
     case -1:
-	break;
+        break;
     default:
-	xf86ConfigError("Pixmap option's value (%d) must be 24 or 32\n", i);
-	return FALSE;
+        xf86ConfigError("Pixmap option's value (%d) must be 24 or 32\n", i);
+        return FALSE;
     }
     if (xf86Pix24 != Pix24DontCare) {
-	xf86Info.pixmap24 = xf86Pix24;
-	xf86Info.pix24From = X_CMDLINE;
-    } else if (pix24 != Pix24DontCare) {
-	xf86Info.pixmap24 = pix24;
-	xf86Info.pix24From = X_CONFIG;
-    } else {
-	xf86Info.pixmap24 = Pix24DontCare;
-	xf86Info.pix24From = X_DEFAULT;
+        xf86Info.pixmap24 = xf86Pix24;
+        xf86Info.pix24From = X_CMDLINE;
+    }
+    else if (pix24 != Pix24DontCare) {
+        xf86Info.pixmap24 = pix24;
+        xf86Info.pix24From = X_CONFIG;
+    }
+    else {
+        xf86Info.pixmap24 = Pix24DontCare;
+        xf86Info.pix24From = X_DEFAULT;
     }
 
 #ifdef PANORAMIX
     from = X_DEFAULT;
     if (!noPanoramiXExtension)
-      from = X_CMDLINE;
+        from = X_CMDLINE;
     else if (xf86GetOptValBool(FlagOptions, FLAG_XINERAMA, &value)) {
-      noPanoramiXExtension = !value;
-      from = X_CONFIG;
+        noPanoramiXExtension = !value;
+        from = X_CONFIG;
     }
     if (!noPanoramiXExtension)
-      xf86Msg(from, "Xinerama: enabled\n");
+        xf86Msg(from, "Xinerama: enabled\n");
 #endif
 
 #ifdef DRI2
     xf86Info.dri2 = FALSE;
     xf86Info.dri2From = X_DEFAULT;
     if (xf86GetOptValBool(FlagOptions, FLAG_DRI2, &value)) {
-	xf86Info.dri2 = value;
-	xf86Info.dri2From = X_CONFIG;
+        xf86Info.dri2 = value;
+        xf86Info.dri2From = X_CONFIG;
     }
 #endif
 
     return TRUE;
 }
 
-Bool xf86DRI2Enabled(void)
+Bool
+xf86DRI2Enabled(void)
 {
     return xf86Info.dri2;
 }
@@ -1029,17 +1068,17 @@ Bool xf86DRI2Enabled(void)
  * free) it if present. All other devices are moved forward.
  */
 static void
-freeDevice(InputInfoPtr *list, InputInfoPtr pInfo)
+freeDevice(InputInfoPtr * list, InputInfoPtr pInfo)
 {
     InputInfoPtr *devs;
 
     for (devs = list; devs && *devs; devs++) {
-	if (*devs == pInfo) {
-	    free(*devs);
-	    for (; devs && *devs; devs++)
-		devs[0] = devs[1];
-	    break;
-	}
+        if (*devs == pInfo) {
+            free(*devs);
+            for (; devs && *devs; devs++)
+                devs[0] = devs[1];
+            break;
+        }
     }
 }
 
@@ -1047,14 +1086,14 @@ freeDevice(InputInfoPtr *list, InputInfoPtr pInfo)
  * Append pInfo to the null-terminated list, allocating space as necessary.
  * pInfo is used as the last element.
  */
-static InputInfoPtr*
-addDevice(InputInfoPtr *list, InputInfoPtr pInfo)
+static InputInfoPtr *
+addDevice(InputInfoPtr * list, InputInfoPtr pInfo)
 {
     InputInfoPtr *devs;
     int count = 1;
 
     for (devs = list; devs && *devs; devs++)
-	count++;
+        count++;
 
     list = xnfrealloc(list, (count + 1) * sizeof(InputInfoPtr));
     list[count] = NULL;
@@ -1084,14 +1123,16 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
     InputInfoPtr corePointer = NULL, coreKeyboard = NULL;
     Bool foundPointer = FALSE, foundKeyboard = FALSE;
     const char *pointerMsg = NULL, *keyboardMsg = NULL;
-    InputInfoPtr *devs, /* iterator */
-            indp;
+    InputInfoPtr *devs,         /* iterator */
+     indp;
     InputInfoPtr Pointer, Keyboard;
     XF86ConfInputPtr confInput;
     XF86ConfInputRec defPtr, defKbd;
     MessageType from = X_DEFAULT;
+
     const char *mousedrivers[] = { "mouse", "synaptics", "evdev", "vmmouse",
-				   "void", NULL };
+        "void", NULL
+    };
 
     /*
      * First check if a core pointer or core keyboard have been specified
@@ -1100,249 +1141,255 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
      */
     for (devs = servlayoutp->inputs; devs && *devs; devs++) {
         indp = *devs;
-	if (indp->options &&
-	    xf86CheckBoolOption(indp->options, "CorePointer", FALSE)) {
-	    if (!corePointer) {
-		corePointer = indp;
-	    }
-	}
-	if (indp->options &&
-	    xf86CheckBoolOption(indp->options, "CoreKeyboard", FALSE)) {
-	    if (!coreKeyboard) {
-		coreKeyboard = indp;
-	    }
-	}
+        if (indp->options &&
+            xf86CheckBoolOption(indp->options, "CorePointer", FALSE)) {
+            if (!corePointer) {
+                corePointer = indp;
+            }
+        }
+        if (indp->options &&
+            xf86CheckBoolOption(indp->options, "CoreKeyboard", FALSE)) {
+            if (!coreKeyboard) {
+                coreKeyboard = indp;
+            }
+        }
     }
 
     confInput = NULL;
 
     /* 1. Check for the -pointer command line option. */
     if (xf86PointerName) {
-	confInput = xf86findInput(xf86PointerName,
-				  xf86configptr->conf_input_lst);
-	if (!confInput) {
-	    xf86Msg(X_ERROR, "No InputDevice section called \"%s\"\n",
-		    xf86PointerName);
-	    return FALSE;
-	}
-	from = X_CMDLINE;
-	/*
-	 * If one was already specified in the ServerLayout, it needs to be
-	 * removed.
-	 */
-	if (corePointer) {
-	    freeDevice(servlayoutp->inputs, corePointer);
-	    corePointer = NULL;
-	}
-	foundPointer = TRUE;
+        confInput = xf86findInput(xf86PointerName,
+                                  xf86configptr->conf_input_lst);
+        if (!confInput) {
+            xf86Msg(X_ERROR, "No InputDevice section called \"%s\"\n",
+                    xf86PointerName);
+            return FALSE;
+        }
+        from = X_CMDLINE;
+        /*
+         * If one was already specified in the ServerLayout, it needs to be
+         * removed.
+         */
+        if (corePointer) {
+            freeDevice(servlayoutp->inputs, corePointer);
+            corePointer = NULL;
+        }
+        foundPointer = TRUE;
     }
 
     /* 2. ServerLayout-specified core pointer. */
     if (corePointer) {
-	foundPointer = TRUE;
-	from = X_CONFIG;
+        foundPointer = TRUE;
+        from = X_CONFIG;
     }
 
     /* 3. First core pointer device. */
     if (!foundPointer && (xf86Info.forceInputDevices || implicitLayout)) {
-	XF86ConfInputPtr p;
-
-	for (p = xf86configptr->conf_input_lst; p; p = p->list.next) {
-	    if (p->inp_option_lst &&
-		xf86CheckBoolOption(p->inp_option_lst, "CorePointer", FALSE)) {
-		confInput = p;
-		foundPointer = TRUE;
-		from = X_DEFAULT;
-		pointerMsg = "first core pointer device";
-		break;
-	    }
-	}
+        XF86ConfInputPtr p;
+
+        for (p = xf86configptr->conf_input_lst; p; p = p->list.next) {
+            if (p->inp_option_lst &&
+                xf86CheckBoolOption(p->inp_option_lst, "CorePointer", FALSE)) {
+                confInput = p;
+                foundPointer = TRUE;
+                from = X_DEFAULT;
+                pointerMsg = "first core pointer device";
+                break;
+            }
+        }
     }
 
     /* 4. First pointer with an allowed mouse driver. */
     if (!foundPointer && xf86Info.forceInputDevices) {
-	const char **driver = mousedrivers;
-	confInput = xf86findInput(CONF_IMPLICIT_POINTER,
-				  xf86configptr->conf_input_lst);
-	while (*driver && !confInput) {
-	    confInput = xf86findInputByDriver(*driver,
-					      xf86configptr->conf_input_lst);
-	    driver++;
-	}
-	if (confInput) {
-	    foundPointer = TRUE;
-	    from = X_DEFAULT;
-	    pointerMsg = "first mouse device";
-	}
+        const char **driver = mousedrivers;
+
+        confInput = xf86findInput(CONF_IMPLICIT_POINTER,
+                                  xf86configptr->conf_input_lst);
+        while (*driver && !confInput) {
+            confInput = xf86findInputByDriver(*driver,
+                                              xf86configptr->conf_input_lst);
+            driver++;
+        }
+        if (confInput) {
+            foundPointer = TRUE;
+            from = X_DEFAULT;
+            pointerMsg = "first mouse device";
+        }
     }
 
     /* 5. Built-in default. */
     if (!foundPointer && xf86Info.forceInputDevices) {
-	memset(&defPtr, 0, sizeof(defPtr));
-	defPtr.inp_identifier = strdup("<default pointer>");
-	defPtr.inp_driver = strdup("mouse");
-	confInput = &defPtr;
-	foundPointer = TRUE;
-	from = X_DEFAULT;
-	pointerMsg = "default mouse configuration";
+        memset(&defPtr, 0, sizeof(defPtr));
+        defPtr.inp_identifier = strdup("<default pointer>");
+        defPtr.inp_driver = strdup("mouse");
+        confInput = &defPtr;
+        foundPointer = TRUE;
+        from = X_DEFAULT;
+        pointerMsg = "default mouse configuration";
     }
 
     /* Add the core pointer device to the layout, and set it to Core. */
     if (foundPointer && confInput) {
-	Pointer = xf86AllocateInput();
-	if (Pointer)
-	    foundPointer = configInput(Pointer, confInput, from);
-	if (foundPointer) {
-	    Pointer->options = xf86AddNewOption(Pointer->options,
-					        "CorePointer", "on");
-	    Pointer->options = xf86AddNewOption(Pointer->options,
-						"driver", confInput->inp_driver);
-	    Pointer->options = xf86AddNewOption(Pointer->options,
-						"identifier", confInput->inp_identifier);
-	    servlayoutp->inputs = addDevice(servlayoutp->inputs, Pointer);
-	}
+        Pointer = xf86AllocateInput();
+        if (Pointer)
+            foundPointer = configInput(Pointer, confInput, from);
+        if (foundPointer) {
+            Pointer->options = xf86AddNewOption(Pointer->options,
+                                                "CorePointer", "on");
+            Pointer->options = xf86AddNewOption(Pointer->options,
+                                                "driver",
+                                                confInput->inp_driver);
+            Pointer->options =
+                xf86AddNewOption(Pointer->options, "identifier",
+                                 confInput->inp_identifier);
+            servlayoutp->inputs = addDevice(servlayoutp->inputs, Pointer);
+        }
     }
 
     if (!foundPointer && xf86Info.forceInputDevices) {
-	/* This shouldn't happen. */
-	xf86Msg(X_ERROR, "Cannot locate a core pointer device.\n");
-	xf86DeleteInput(Pointer, 0);
-	return FALSE;
+        /* This shouldn't happen. */
+        xf86Msg(X_ERROR, "Cannot locate a core pointer device.\n");
+        xf86DeleteInput(Pointer, 0);
+        return FALSE;
     }
 
     confInput = NULL;
 
     /* 1. Check for the -keyboard command line option. */
     if (xf86KeyboardName) {
-	confInput = xf86findInput(xf86KeyboardName,
-				  xf86configptr->conf_input_lst);
-	if (!confInput) {
-	    xf86Msg(X_ERROR, "No InputDevice section called \"%s\"\n",
-		    xf86KeyboardName);
-	    return FALSE;
-	}
-	from = X_CMDLINE;
-	/*
-	 * If one was already specified in the ServerLayout, it needs to be
-	 * removed.
-	 */
-	if (coreKeyboard) {
-	    freeDevice(servlayoutp->inputs, coreKeyboard);
-	    coreKeyboard = NULL;
-	}
-	foundKeyboard = TRUE;
+        confInput = xf86findInput(xf86KeyboardName,
+                                  xf86configptr->conf_input_lst);
+        if (!confInput) {
+            xf86Msg(X_ERROR, "No InputDevice section called \"%s\"\n",
+                    xf86KeyboardName);
+            return FALSE;
+        }
+        from = X_CMDLINE;
+        /*
+         * If one was already specified in the ServerLayout, it needs to be
+         * removed.
+         */
+        if (coreKeyboard) {
+            freeDevice(servlayoutp->inputs, coreKeyboard);
+            coreKeyboard = NULL;
+        }
+        foundKeyboard = TRUE;
     }
 
     /* 2. ServerLayout-specified core keyboard. */
     if (coreKeyboard) {
-	foundKeyboard = TRUE;
-	from = X_CONFIG;
+        foundKeyboard = TRUE;
+        from = X_CONFIG;
     }
 
     /* 3. First core keyboard device. */
     if (!foundKeyboard && (xf86Info.forceInputDevices || implicitLayout)) {
-	XF86ConfInputPtr p;
-
-	for (p = xf86configptr->conf_input_lst; p; p = p->list.next) {
-	    if (p->inp_option_lst &&
-		xf86CheckBoolOption(p->inp_option_lst, "CoreKeyboard", FALSE)) {
-		confInput = p;
-		foundKeyboard = TRUE;
-		from = X_DEFAULT;
-		keyboardMsg = "first core keyboard device";
-		break;
-	    }
-	}
+        XF86ConfInputPtr p;
+
+        for (p = xf86configptr->conf_input_lst; p; p = p->list.next) {
+            if (p->inp_option_lst &&
+                xf86CheckBoolOption(p->inp_option_lst, "CoreKeyboard", FALSE)) {
+                confInput = p;
+                foundKeyboard = TRUE;
+                from = X_DEFAULT;
+                keyboardMsg = "first core keyboard device";
+                break;
+            }
+        }
     }
 
     /* 4. First keyboard with 'keyboard' or 'kbd' as the driver. */
     if (!foundKeyboard && xf86Info.forceInputDevices) {
-	confInput = xf86findInput(CONF_IMPLICIT_KEYBOARD,
-				  xf86configptr->conf_input_lst);
-	if (!confInput) {
-	    confInput = xf86findInputByDriver("kbd",
-					      xf86configptr->conf_input_lst);
-	}
-	if (confInput) {
-	    foundKeyboard = TRUE;
-	    from = X_DEFAULT;
-	    keyboardMsg = "first keyboard device";
-	}
+        confInput = xf86findInput(CONF_IMPLICIT_KEYBOARD,
+                                  xf86configptr->conf_input_lst);
+        if (!confInput) {
+            confInput = xf86findInputByDriver("kbd",
+                                              xf86configptr->conf_input_lst);
+        }
+        if (confInput) {
+            foundKeyboard = TRUE;
+            from = X_DEFAULT;
+            keyboardMsg = "first keyboard device";
+        }
     }
 
     /* 5. Built-in default. */
     if (!foundKeyboard && xf86Info.forceInputDevices) {
-	memset(&defKbd, 0, sizeof(defKbd));
-	defKbd.inp_identifier = strdup("<default keyboard>");
-	defKbd.inp_driver = strdup("kbd");
-	confInput = &defKbd;
-	foundKeyboard = TRUE;
-	keyboardMsg = "default keyboard configuration";
-	from = X_DEFAULT;
+        memset(&defKbd, 0, sizeof(defKbd));
+        defKbd.inp_identifier = strdup("<default keyboard>");
+        defKbd.inp_driver = strdup("kbd");
+        confInput = &defKbd;
+        foundKeyboard = TRUE;
+        keyboardMsg = "default keyboard configuration";
+        from = X_DEFAULT;
     }
 
     /* Add the core keyboard device to the layout, and set it to Core. */
     if (foundKeyboard && confInput) {
-	Keyboard = xf86AllocateInput();
-	if (Keyboard)
-	    foundKeyboard = configInput(Keyboard, confInput, from);
-	if (foundKeyboard) {
-	    Keyboard->options = xf86AddNewOption(Keyboard->options,
-						 "CoreKeyboard", "on");
-	    Keyboard->options = xf86AddNewOption(Keyboard->options,
-						 "driver", confInput->inp_driver);
-	    Keyboard->options = xf86AddNewOption(Keyboard->options,
-						 "identifier", confInput->inp_identifier);
-	    servlayoutp->inputs = addDevice(servlayoutp->inputs, Keyboard);
-	}
+        Keyboard = xf86AllocateInput();
+        if (Keyboard)
+            foundKeyboard = configInput(Keyboard, confInput, from);
+        if (foundKeyboard) {
+            Keyboard->options = xf86AddNewOption(Keyboard->options,
+                                                 "CoreKeyboard", "on");
+            Keyboard->options = xf86AddNewOption(Keyboard->options,
+                                                 "driver",
+                                                 confInput->inp_driver);
+            Keyboard->options =
+                xf86AddNewOption(Keyboard->options, "identifier",
+                                 confInput->inp_identifier);
+            servlayoutp->inputs = addDevice(servlayoutp->inputs, Keyboard);
+        }
     }
 
     if (!foundKeyboard && xf86Info.forceInputDevices) {
-	/* This shouldn't happen. */
-	xf86Msg(X_ERROR, "Cannot locate a core keyboard device.\n");
-	xf86DeleteInput(Keyboard, 0);
-	return FALSE;
+        /* This shouldn't happen. */
+        xf86Msg(X_ERROR, "Cannot locate a core keyboard device.\n");
+        xf86DeleteInput(Keyboard, 0);
+        return FALSE;
     }
 
     if (pointerMsg) {
-	if (implicitLayout)
-	    xf86Msg(X_DEFAULT, "No Layout section. Using the %s.\n",
-	            pointerMsg);
-	else
-	    xf86Msg(X_DEFAULT, "The core pointer device wasn't specified "
-	            "explicitly in the layout.\n"
-	            "\tUsing the %s.\n", pointerMsg);
+        if (implicitLayout)
+            xf86Msg(X_DEFAULT, "No Layout section. Using the %s.\n",
+                    pointerMsg);
+        else
+            xf86Msg(X_DEFAULT, "The core pointer device wasn't specified "
+                    "explicitly in the layout.\n"
+                    "\tUsing the %s.\n", pointerMsg);
     }
 
     if (keyboardMsg) {
-	if (implicitLayout)
-	    xf86Msg(X_DEFAULT, "No Layout section. Using the %s.\n",
-	            keyboardMsg);
-	else
-	    xf86Msg(X_DEFAULT, "The core keyboard device wasn't specified "
-	            "explicitly in the layout.\n"
-	            "\tUsing the %s.\n", keyboardMsg);
+        if (implicitLayout)
+            xf86Msg(X_DEFAULT, "No Layout section. Using the %s.\n",
+                    keyboardMsg);
+        else
+            xf86Msg(X_DEFAULT, "The core keyboard device wasn't specified "
+                    "explicitly in the layout.\n"
+                    "\tUsing the %s.\n", keyboardMsg);
     }
 
     if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) {
 #if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS)
-	const char *config_backend;
+        const char *config_backend;
+
 #if defined(CONFIG_HAL)
-	config_backend = "HAL";
+        config_backend = "HAL";
 #elif defined(CONFIG_UDEV)
-	config_backend = "udev";
+        config_backend = "udev";
 #else
-	config_backend = "wscons";
+        config_backend = "wscons";
 #endif
-	xf86Msg(X_INFO, "The server relies on %s to provide the list of "
-	                "input devices.\n\tIf no devices become available, "
-	                "reconfigure %s or disable AutoAddDevices.\n",
-			config_backend, config_backend);
+        xf86Msg(X_INFO, "The server relies on %s to provide the list of "
+                "input devices.\n\tIf no devices become available, "
+                "reconfigure %s or disable AutoAddDevices.\n",
+                config_backend, config_backend);
 #else
-	xf86Msg(X_WARNING, "Hotplugging requested but the server was "
-			   "compiled without a config backend. "
-			   "No input devices were configured, the server "
-			   "will start without any input devices.\n");
+        xf86Msg(X_WARNING, "Hotplugging requested but the server was "
+                "compiled without a config backend. "
+                "No input devices were configured, the server "
+                "will start without any input devices.\n");
 #endif
     }
 
@@ -1355,12 +1402,12 @@ typedef enum {
 } LayoutValues;
 
 static OptionInfoRec LayoutOptions[] = {
-  { LAYOUT_ISOLATEDEVICE,      "IsolateDevice",        OPTV_STRING,
-       {0}, FALSE },
-  { LAYOUT_SINGLECARD,         "SingleCard",           OPTV_BOOLEAN,
-       {0}, FALSE },
-  { -1,                                NULL,                   OPTV_NONE,
-       {0}, FALSE },
+    {LAYOUT_ISOLATEDEVICE, "IsolateDevice", OPTV_STRING,
+     {0}, FALSE},
+    {LAYOUT_SINGLECARD, "SingleCard", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {-1, NULL, OPTV_NONE,
+     {0}, FALSE},
 };
 
 static Bool
@@ -1375,42 +1422,41 @@ configInputDevices(XF86ConfLayoutPtr layout, serverLayoutPtr servlayoutp)
      */
     irp = layout->lay_input_lst;
     while (irp) {
-	count++;
-	irp = (XF86ConfInputrefPtr)irp->list.next;
+        count++;
+        irp = (XF86ConfInputrefPtr) irp->list.next;
     }
     DebugF("Found %d input devices in the layout section %s\n",
-	    count, layout->lay_identifier);
+           count, layout->lay_identifier);
     indp = xnfcalloc((count + 1), sizeof(InputInfoPtr));
     indp[count] = NULL;
     irp = layout->lay_input_lst;
     count = 0;
     while (irp) {
-	indp[count] = xf86AllocateInput();
-	if (!configInput(indp[count], irp->iref_inputdev, X_CONFIG)) {
-	    do {
-		free(indp[count]);
-	    } while(count--);
-	    free(indp);
-	    return FALSE;
-	}
-	indp[count]->options = xf86OptionListMerge(indp[count]->options,
-						   irp->iref_option_lst);
-	count++;
-	irp = (XF86ConfInputrefPtr)irp->list.next;
+        indp[count] = xf86AllocateInput();
+        if (!configInput(indp[count], irp->iref_inputdev, X_CONFIG)) {
+            do {
+                free(indp[count]);
+            } while (count--);
+            free(indp);
+            return FALSE;
+        }
+        indp[count]->options = xf86OptionListMerge(indp[count]->options,
+                                                   irp->iref_option_lst);
+        count++;
+        irp = (XF86ConfInputrefPtr) irp->list.next;
     }
     servlayoutp->inputs = indp;
 
     return TRUE;
 }
 
-
 /*
  * figure out which layout is active, which screens are used in that layout,
  * which drivers and monitors are used in these screens
  */
 static Bool
 configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
-	     char *default_layout)
+             char *default_layout)
 {
     XF86ConfAdjacencyPtr adjp;
     XF86ConfInactivePtr idp;
@@ -1423,7 +1469,7 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
     int i = 0, j;
 
     if (!servlayoutp)
-	return FALSE;
+        return FALSE;
 
     /*
      * which layout section is the active one?
@@ -1433,18 +1479,18 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
      */
     from = X_DEFAULT;
     if (xf86LayoutName != NULL)
-	from = X_CMDLINE;
+        from = X_CMDLINE;
     else if (default_layout) {
-	xf86LayoutName = default_layout;
-	from = X_CONFIG;
+        xf86LayoutName = default_layout;
+        from = X_CONFIG;
     }
     if (xf86LayoutName != NULL) {
-	if ((l = xf86findLayout(xf86LayoutName, conf_layout)) == NULL) {
-	    xf86Msg(X_ERROR, "No ServerLayout section called \"%s\"\n",
-		    xf86LayoutName);
-	    return FALSE;
-	}
-	conf_layout = l;
+        if ((l = xf86findLayout(xf86LayoutName, conf_layout)) == NULL) {
+            xf86Msg(X_ERROR, "No ServerLayout section called \"%s\"\n",
+                    xf86LayoutName);
+            return FALSE;
+        }
+        conf_layout = l;
     }
     xf86Msg(from, "ServerLayout \"%s\"\n", conf_layout->lay_identifier);
     adjp = conf_layout->lay_adjacency_lst;
@@ -1457,12 +1503,12 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
      */
     while (adjp) {
         count++;
-        adjp = (XF86ConfAdjacencyPtr)adjp->list.next;
+        adjp = (XF86ConfAdjacencyPtr) adjp->list.next;
     }
 
     DebugF("Found %d screens in the layout section %s",
            count, conf_layout->lay_identifier);
-    if (!count) /* alloc enough storage even if no screen is specified */
+    if (!count)                 /* alloc enough storage even if no screen is specified */
         count = 1;
 
     slp = xnfcalloc(1, (count + 1) * sizeof(screenLayoutRec));
@@ -1476,107 +1522,105 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
     count = 0;
     while (adjp) {
         slp[count].screen = xnfcalloc(1, sizeof(confScreenRec));
-	if (adjp->adj_scrnum < 0)
-	    scrnum = count;
-	else
-	    scrnum = adjp->adj_scrnum;
-	if (!configScreen(slp[count].screen, adjp->adj_screen, scrnum,
-			  X_CONFIG)) {
-	    do {
-		free(slp[count].screen);
-	    } while(count--);
-	    free(slp);
-	    return FALSE;
-	}
-	slp[count].x = adjp->adj_x;
-	slp[count].y = adjp->adj_y;
-	slp[count].refname = adjp->adj_refscreen;
-	switch (adjp->adj_where) {
-	case CONF_ADJ_OBSOLETE:
-	    slp[count].where = PosObsolete;
-	    slp[count].topname = adjp->adj_top_str;
-	    slp[count].bottomname = adjp->adj_bottom_str;
-	    slp[count].leftname = adjp->adj_left_str;
-	    slp[count].rightname = adjp->adj_right_str;
-	    break;
-	case CONF_ADJ_ABSOLUTE:
-	    slp[count].where = PosAbsolute;
-	    break;
-	case CONF_ADJ_RIGHTOF:
-	    slp[count].where = PosRightOf;
-	    break;
-	case CONF_ADJ_LEFTOF:
-	    slp[count].where = PosLeftOf;
-	    break;
-	case CONF_ADJ_ABOVE:
-	    slp[count].where = PosAbove;
-	    break;
-	case CONF_ADJ_BELOW:
-	    slp[count].where = PosBelow;
-	    break;
-	case CONF_ADJ_RELATIVE:
-	    slp[count].where = PosRelative;
-	    break;
-	}
+        if (adjp->adj_scrnum < 0)
+            scrnum = count;
+        else
+            scrnum = adjp->adj_scrnum;
+        if (!configScreen(slp[count].screen, adjp->adj_screen, scrnum,
+                          X_CONFIG)) {
+            do {
+                free(slp[count].screen);
+            } while (count--);
+            free(slp);
+            return FALSE;
+        }
+        slp[count].x = adjp->adj_x;
+        slp[count].y = adjp->adj_y;
+        slp[count].refname = adjp->adj_refscreen;
+        switch (adjp->adj_where) {
+        case CONF_ADJ_OBSOLETE:
+            slp[count].where = PosObsolete;
+            slp[count].topname = adjp->adj_top_str;
+            slp[count].bottomname = adjp->adj_bottom_str;
+            slp[count].leftname = adjp->adj_left_str;
+            slp[count].rightname = adjp->adj_right_str;
+            break;
+        case CONF_ADJ_ABSOLUTE:
+            slp[count].where = PosAbsolute;
+            break;
+        case CONF_ADJ_RIGHTOF:
+            slp[count].where = PosRightOf;
+            break;
+        case CONF_ADJ_LEFTOF:
+            slp[count].where = PosLeftOf;
+            break;
+        case CONF_ADJ_ABOVE:
+            slp[count].where = PosAbove;
+            break;
+        case CONF_ADJ_BELOW:
+            slp[count].where = PosBelow;
+            break;
+        case CONF_ADJ_RELATIVE:
+            slp[count].where = PosRelative;
+            break;
+        }
         count++;
-        adjp = (XF86ConfAdjacencyPtr)adjp->list.next;
+        adjp = (XF86ConfAdjacencyPtr) adjp->list.next;
     }
 
     /* No screen was specified in the layout. take the first one from the
      * config file, or - if it is NULL - configScreen autogenerates one for
      * us */
-    if (!count)
-    {
+    if (!count) {
         slp[0].screen = xnfcalloc(1, sizeof(confScreenRec));
-	if (!configScreen(slp[0].screen, xf86configptr->conf_screen_lst,
+        if (!configScreen(slp[0].screen, xf86configptr->conf_screen_lst,
                           0, X_CONFIG)) {
-	    free(slp[0].screen);
-	    free(slp);
-	    return FALSE;
-	}
+            free(slp[0].screen);
+            free(slp);
+            return FALSE;
+        }
     }
 
     /* XXX Need to tie down the upper left screen. */
 
     /* Fill in the refscreen and top/bottom/left/right values */
     for (i = 0; i < count; i++) {
-	for (j = 0; j < count; j++) {
-	    if (slp[i].refname &&
-		strcmp(slp[i].refname, slp[j].screen->id) == 0) {
-		slp[i].refscreen = slp[j].screen;
-	    }
-	    if (slp[i].topname &&
-		strcmp(slp[i].topname, slp[j].screen->id) == 0) {
-		slp[i].top = slp[j].screen;
-	    }
-	    if (slp[i].bottomname &&
-		strcmp(slp[i].bottomname, slp[j].screen->id) == 0) {
-		slp[i].bottom = slp[j].screen;
-	    }
-	    if (slp[i].leftname &&
-		strcmp(slp[i].leftname, slp[j].screen->id) == 0) {
-		slp[i].left = slp[j].screen;
-	    }
-	    if (slp[i].rightname &&
-		strcmp(slp[i].rightname, slp[j].screen->id) == 0) {
-		slp[i].right = slp[j].screen;
-	    }
-	}
-	if (slp[i].where != PosObsolete
-	    && slp[i].where != PosAbsolute
-	    && !slp[i].refscreen) {
-	    xf86Msg(X_ERROR,"Screen %s doesn't exist: deleting placement\n",
-		     slp[i].refname);
-	    slp[i].where = PosAbsolute;
-	    slp[i].x = 0;
-	    slp[i].y = 0;
-	}
+        for (j = 0; j < count; j++) {
+            if (slp[i].refname &&
+                strcmp(slp[i].refname, slp[j].screen->id) == 0) {
+                slp[i].refscreen = slp[j].screen;
+            }
+            if (slp[i].topname &&
+                strcmp(slp[i].topname, slp[j].screen->id) == 0) {
+                slp[i].top = slp[j].screen;
+            }
+            if (slp[i].bottomname &&
+                strcmp(slp[i].bottomname, slp[j].screen->id) == 0) {
+                slp[i].bottom = slp[j].screen;
+            }
+            if (slp[i].leftname &&
+                strcmp(slp[i].leftname, slp[j].screen->id) == 0) {
+                slp[i].left = slp[j].screen;
+            }
+            if (slp[i].rightname &&
+                strcmp(slp[i].rightname, slp[j].screen->id) == 0) {
+                slp[i].right = slp[j].screen;
+            }
+        }
+        if (slp[i].where != PosObsolete
+            && slp[i].where != PosAbsolute && !slp[i].refscreen) {
+            xf86Msg(X_ERROR, "Screen %s doesn't exist: deleting placement\n",
+                    slp[i].refname);
+            slp[i].where = PosAbsolute;
+            slp[i].x = 0;
+            slp[i].y = 0;
+        }
     }
 
     if (!count)
-	saved_count = 1;
+        saved_count = 1;
     else
-	saved_count = count;
+        saved_count = count;
     /*
      * Count the number of inactive devices.
      */
@@ -1584,7 +1628,7 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
     idp = conf_layout->lay_inactive_lst;
     while (idp) {
         count++;
-        idp = (XF86ConfInactivePtr)idp->list.next;
+        idp = (XF86ConfInactivePtr) idp->list.next;
     }
     DebugF("Found %d inactive devices in the layout section %s\n",
            count, conf_layout->lay_identifier);
@@ -1593,14 +1637,14 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
     idp = conf_layout->lay_inactive_lst;
     count = 0;
     while (idp) {
-	if (!configDevice(&gdp[count], idp->inactive_device, FALSE))
-	    goto bail;
+        if (!configDevice(&gdp[count], idp->inactive_device, FALSE))
+            goto bail;
         count++;
-        idp = (XF86ConfInactivePtr)idp->list.next;
+        idp = (XF86ConfInactivePtr) idp->list.next;
     }
 
     if (!configInputDevices(conf_layout, servlayoutp))
-	goto bail;
+        goto bail;
 
     servlayoutp->id = conf_layout->lay_identifier;
     servlayoutp->screens = slp;
@@ -1610,10 +1654,10 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
 
     return TRUE;
 
-bail:
+ bail:
     do {
-	free(slp[saved_count].screen);
-    } while(saved_count--);
+        free(slp[saved_count].screen);
+    } while (saved_count--);
     free(slp);
     free(gdp);
     return FALSE;
@@ -1634,7 +1678,7 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen,
     XF86ConfLayoutRec layout;
 
     if (!servlayoutp)
-	return FALSE;
+        return FALSE;
 
     /*
      * which screen section is the active one?
@@ -1645,13 +1689,13 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen,
 
     from = X_CONFIG;
     if (xf86ScreenName != NULL) {
-	if ((s = xf86findScreen(xf86ScreenName, conf_screen)) == NULL) {
-	    xf86Msg(X_ERROR, "No Screen section called \"%s\"\n",
-		    xf86ScreenName);
-	    return FALSE;
-	}
-	conf_screen = s;
-	from = X_CMDLINE;
+        if ((s = xf86findScreen(xf86ScreenName, conf_screen)) == NULL) {
+            xf86Msg(X_ERROR, "No Screen section called \"%s\"\n",
+                    xf86ScreenName);
+            return FALSE;
+        }
+        conf_screen = s;
+        from = X_CMDLINE;
     }
 
     /* We have exactly one screen */
@@ -1660,8 +1704,8 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen,
     slp[0].screen = xnfcalloc(1, sizeof(confScreenRec));
     slp[1].screen = NULL;
     if (!configScreen(slp[0].screen, conf_screen, 0, from)) {
-	free(slp);
-	return FALSE;
+        free(slp);
+        return FALSE;
     }
     servlayoutp->id = "(implicit)";
     servlayoutp->screens = slp;
@@ -1671,14 +1715,15 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen,
     memset(&layout, 0, sizeof(layout));
     layout.lay_identifier = servlayoutp->id;
     if (xf86layoutAddInputDevices(xf86configptr, &layout) > 0) {
-	if (!configInputDevices(&layout, servlayoutp))
-	    return FALSE;
-	from = X_DEFAULT;
-    } else {
-	/* Set up an empty input device list, then look for some core devices. */
-	indp = xnfalloc(sizeof(InputInfoPtr));
-	*indp = NULL;
-	servlayoutp->inputs = indp;
+        if (!configInputDevices(&layout, servlayoutp))
+            return FALSE;
+        from = X_DEFAULT;
+    }
+    else {
+        /* Set up an empty input device list, then look for some core devices. */
+        indp = xnfalloc(sizeof(InputInfoPtr));
+        *indp = NULL;
+        servlayoutp->inputs = indp;
     }
 
     return TRUE;
@@ -1691,31 +1736,31 @@ configXvAdaptor(confXvAdaptorPtr adaptor, XF86ConfVideoAdaptorPtr conf_adaptor)
     XF86ConfVideoPortPtr conf_port;
 
     xf86Msg(X_CONFIG, "|   |-->VideoAdaptor \"%s\"\n",
-	    conf_adaptor->va_identifier);
+            conf_adaptor->va_identifier);
     adaptor->identifier = conf_adaptor->va_identifier;
     adaptor->options = conf_adaptor->va_option_lst;
     if (conf_adaptor->va_busid || conf_adaptor->va_driver) {
-	xf86Msg(X_CONFIG, "|   | Unsupported device type, skipping entry\n");
-	return FALSE;
+        xf86Msg(X_CONFIG, "|   | Unsupported device type, skipping entry\n");
+        return FALSE;
     }
 
     /*
      * figure out how many videoport subsections there are and fill them in
      */
     conf_port = conf_adaptor->va_port_lst;
-    while(conf_port) {
+    while (conf_port) {
         count++;
-        conf_port = (XF86ConfVideoPortPtr)conf_port->list.next;
+        conf_port = (XF86ConfVideoPortPtr) conf_port->list.next;
     }
     adaptor->ports = xnfalloc((count) * sizeof(confXvPortRec));
     adaptor->numports = count;
     count = 0;
     conf_port = conf_adaptor->va_port_lst;
-    while(conf_port) {
-	adaptor->ports[count].identifier = conf_port->vp_identifier;
-	adaptor->ports[count].options = conf_port->vp_option_lst;
+    while (conf_port) {
+        adaptor->ports[count].identifier = conf_port->vp_identifier;
+        adaptor->ports[count].options = conf_port->vp_option_lst;
         count++;
-        conf_port = (XF86ConfVideoPortPtr)conf_port->list.next;
+        conf_port = (XF86ConfVideoPortPtr) conf_port->list.next;
     }
 
     return TRUE;
@@ -1723,7 +1768,7 @@ configXvAdaptor(confXvAdaptorPtr adaptor, XF86ConfVideoAdaptorPtr conf_adaptor)
 
 static Bool
 configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
-	     MessageType from)
+             MessageType from)
 {
     int count = 0;
     XF86ConfDisplayPtr dispptr;
@@ -1739,96 +1784,98 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
     }
 
     xf86Msg(from, "|-->Screen \"%s\" (%d)\n", conf_screen->scrn_identifier,
-	    scrnum);
+            scrnum);
     /*
      * now we fill in the elements of the screen
      */
-    screenp->id         = conf_screen->scrn_identifier;
-    screenp->screennum  = scrnum;
+    screenp->id = conf_screen->scrn_identifier;
+    screenp->screennum = scrnum;
     screenp->defaultdepth = conf_screen->scrn_defaultdepth;
     screenp->defaultbpp = conf_screen->scrn_defaultbpp;
     screenp->defaultfbbpp = conf_screen->scrn_defaultfbbpp;
-    screenp->monitor    = xnfcalloc(1, sizeof(MonRec));
+    screenp->monitor = xnfcalloc(1, sizeof(MonRec));
     /* If no monitor is specified, create a default one. */
     if (!conf_screen->scrn_monitor) {
-	XF86ConfMonitorRec defMon;
+        XF86ConfMonitorRec defMon;
 
-	memset(&defMon, 0, sizeof(defMon));
-	defMon.mon_identifier = "<default monitor>";
-	if (!configMonitor(screenp->monitor, &defMon))
-	    return FALSE;
-	defaultMonitor = TRUE;
-    } else {
-	if (!configMonitor(screenp->monitor,conf_screen->scrn_monitor))
-	    return FALSE;
+        memset(&defMon, 0, sizeof(defMon));
+        defMon.mon_identifier = "<default monitor>";
+        if (!configMonitor(screenp->monitor, &defMon))
+            return FALSE;
+        defaultMonitor = TRUE;
+    }
+    else {
+        if (!configMonitor(screenp->monitor, conf_screen->scrn_monitor))
+            return FALSE;
     }
     /* Configure the device. If there isn't one configured, attach to the
      * first inactive one that we can configure. If there's none that work,
      * set it to NULL so that the section can be autoconfigured later */
-    screenp->device     = xnfcalloc(1, sizeof(GDevRec));
+    screenp->device = xnfcalloc(1, sizeof(GDevRec));
     if ((!conf_screen->scrn_device) && (xf86configptr->conf_device_lst)) {
         conf_screen->scrn_device = xf86configptr->conf_device_lst;
-	xf86Msg(X_DEFAULT, "No device specified for screen \"%s\".\n"
-		"\tUsing the first device section listed.\n", screenp->id);
+        xf86Msg(X_DEFAULT, "No device specified for screen \"%s\".\n"
+                "\tUsing the first device section listed.\n", screenp->id);
     }
-    if (configDevice(screenp->device,conf_screen->scrn_device, TRUE)) {
+    if (configDevice(screenp->device, conf_screen->scrn_device, TRUE)) {
         screenp->device->myScreenSection = screenp;
-    } else {
+    }
+    else {
         screenp->device = NULL;
     }
     screenp->options = conf_screen->scrn_option_lst;
-    
+
     /*
      * figure out how many display subsections there are and fill them in
      */
     dispptr = conf_screen->scrn_display_lst;
-    while(dispptr) {
+    while (dispptr) {
         count++;
-        dispptr = (XF86ConfDisplayPtr)dispptr->list.next;
+        dispptr = (XF86ConfDisplayPtr) dispptr->list.next;
     }
-    screenp->displays   = xnfalloc((count) * sizeof(DispRec));
+    screenp->displays = xnfalloc((count) * sizeof(DispRec));
     screenp->numdisplays = count;
-    
+
     /* Fill in the default Virtual size, if any */
     if (conf_screen->scrn_virtualX && conf_screen->scrn_virtualY) {
-	for (count = 0, dispptr = conf_screen->scrn_display_lst;
-	     dispptr;
-	     dispptr = (XF86ConfDisplayPtr)dispptr->list.next, count++) {
-	    screenp->displays[count].virtualX = conf_screen->scrn_virtualX;
-	    screenp->displays[count].virtualY = conf_screen->scrn_virtualY;
-	}
+        for (count = 0, dispptr = conf_screen->scrn_display_lst;
+             dispptr;
+             dispptr = (XF86ConfDisplayPtr) dispptr->list.next, count++) {
+            screenp->displays[count].virtualX = conf_screen->scrn_virtualX;
+            screenp->displays[count].virtualY = conf_screen->scrn_virtualY;
+        }
     }
 
     /* Now do the per-Display Virtual sizes */
     count = 0;
     dispptr = conf_screen->scrn_display_lst;
-    while(dispptr) {
-        configDisplay(&(screenp->displays[count]),dispptr);
+    while (dispptr) {
+        configDisplay(&(screenp->displays[count]), dispptr);
         count++;
-        dispptr = (XF86ConfDisplayPtr)dispptr->list.next;
+        dispptr = (XF86ConfDisplayPtr) dispptr->list.next;
     }
 
     /*
      * figure out how many videoadaptor references there are and fill them in
      */
     conf_adaptor = conf_screen->scrn_adaptor_lst;
-    while(conf_adaptor) {
+    while (conf_adaptor) {
         count++;
-        conf_adaptor = (XF86ConfAdaptorLinkPtr)conf_adaptor->list.next;
+        conf_adaptor = (XF86ConfAdaptorLinkPtr) conf_adaptor->list.next;
     }
     screenp->xvadaptors = xnfalloc((count) * sizeof(confXvAdaptorRec));
     screenp->numxvadaptors = 0;
     conf_adaptor = conf_screen->scrn_adaptor_lst;
-    while(conf_adaptor) {
+    while (conf_adaptor) {
         if (configXvAdaptor(&(screenp->xvadaptors[screenp->numxvadaptors]),
-			    conf_adaptor->al_adaptor))
-    	    screenp->numxvadaptors++;
-        conf_adaptor = (XF86ConfAdaptorLinkPtr)conf_adaptor->list.next;
+                            conf_adaptor->al_adaptor))
+            screenp->numxvadaptors++;
+        conf_adaptor = (XF86ConfAdaptorLinkPtr) conf_adaptor->list.next;
     }
 
     if (defaultMonitor) {
-	xf86Msg(X_DEFAULT, "No monitor specified for screen \"%s\".\n"
-		"\tUsing a default monitor configuration.\n", screenp->id);
+        xf86Msg(X_DEFAULT, "No monitor specified for screen \"%s\".\n"
+                "\tUsing a default monitor configuration.\n", screenp->id);
     }
     return TRUE;
 }
@@ -1839,28 +1886,27 @@ typedef enum {
 } MonitorValues;
 
 static OptionInfoRec MonitorOptions[] = {
-  { MON_REDUCEDBLANKING,      "ReducedBlanking",        OPTV_BOOLEAN,
-       {0}, FALSE },
-  { MON_MAX_PIX_CLOCK,	      "MaxPixClock",		OPTV_FREQ,
-       {0}, FALSE },
-  { -1,                                NULL,                   OPTV_NONE,
-       {0}, FALSE },
+    {MON_REDUCEDBLANKING, "ReducedBlanking", OPTV_BOOLEAN,
+     {0}, FALSE},
+    {MON_MAX_PIX_CLOCK, "MaxPixClock", OPTV_FREQ,
+     {0}, FALSE},
+    {-1, NULL, OPTV_NONE,
+     {0}, FALSE},
 };
 
 static Bool
 configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
 {
     int count;
-    DisplayModePtr mode,last = NULL;
+    DisplayModePtr mode, last = NULL;
     XF86ConfModeLinePtr cmodep;
     XF86ConfModesPtr modes;
     XF86ConfModesLinkPtr modeslnk = conf_monitor->mon_modes_sect_lst;
-    Gamma zeros = {0.0, 0.0, 0.0};
+    Gamma zeros = { 0.0, 0.0, 0.0 };
     float badgamma = 0.0;
     double maxPixClock;
-    
-    xf86Msg(X_CONFIG, "|   |-->Monitor \"%s\"\n",
-	    conf_monitor->mon_identifier);
+
+    xf86Msg(X_CONFIG, "|   |-->Monitor \"%s\"\n", conf_monitor->mon_identifier);
     monitorp->id = conf_monitor->mon_identifier;
     monitorp->vendor = conf_monitor->mon_vendor;
     monitorp->model = conf_monitor->mon_modelname;
@@ -1875,17 +1921,16 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
 
     /*
      * fill in the monitor structure
-     */    
-    for( count = 0 ;
-	 count < conf_monitor->mon_n_hsync && count < MAX_HSYNC;
-	 count++) {
+     */
+    for (count = 0;
+         count < conf_monitor->mon_n_hsync && count < MAX_HSYNC; count++) {
         monitorp->hsync[count].hi = conf_monitor->mon_hsync[count].hi;
         monitorp->hsync[count].lo = conf_monitor->mon_hsync[count].lo;
     }
     monitorp->nHsync = count;
-    for( count = 0 ;
-	 count < conf_monitor->mon_n_vrefresh && count < MAX_VREFRESH;
-	 count++) {
+    for (count = 0;
+         count < conf_monitor->mon_n_vrefresh && count < MAX_VREFRESH;
+         count++) {
         monitorp->vrefresh[count].hi = conf_monitor->mon_vrefresh[count].hi;
         monitorp->vrefresh[count].lo = conf_monitor->mon_vrefresh[count].lo;
     }
@@ -1894,27 +1939,23 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
     /*
      * first we collect the mode lines from the UseModes directive
      */
-    while(modeslnk)
-    {
-        modes = xf86findModes (modeslnk->ml_modes_str, 
-			       xf86configptr->conf_modes_lst);
-	modeslnk->ml_modes = modes;
-	
-	    
-	/* now add the modes found in the modes
-	   section to the list of modes for this
-	   monitor unless it has been added before
-	   because we are reusing the same section 
-	   for another screen */
-	if (xf86itemNotSublist(
-			       (GenericListPtr)conf_monitor->mon_modeline_lst,
-			       (GenericListPtr)modes->mon_modeline_lst)) {
-	    conf_monitor->mon_modeline_lst = (XF86ConfModeLinePtr)
-	        xf86addListItem(
-				(GenericListPtr)conf_monitor->mon_modeline_lst,
-				(GenericListPtr)modes->mon_modeline_lst);
-	}
-	modeslnk = modeslnk->list.next;
+    while (modeslnk) {
+        modes = xf86findModes(modeslnk->ml_modes_str,
+                              xf86configptr->conf_modes_lst);
+        modeslnk->ml_modes = modes;
+
+        /* now add the modes found in the modes
+           section to the list of modes for this
+           monitor unless it has been added before
+           because we are reusing the same section 
+           for another screen */
+        if (xf86itemNotSublist((GenericListPtr) conf_monitor->mon_modeline_lst,
+                               (GenericListPtr) modes->mon_modeline_lst)) {
+            conf_monitor->mon_modeline_lst = (XF86ConfModeLinePtr)
+                xf86addListItem((GenericListPtr) conf_monitor->mon_modeline_lst,
+                                (GenericListPtr) modes->mon_modeline_lst);
+        }
+        modeslnk = modeslnk->list.next;
     }
 
     /*
@@ -1923,23 +1964,23 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
      * is double linked
      */
     cmodep = conf_monitor->mon_modeline_lst;
-    while( cmodep ) {
+    while (cmodep) {
         mode = xnfcalloc(1, sizeof(DisplayModeRec));
-	mode->type       = 0;
-        mode->Clock      = cmodep->ml_clock;
-        mode->HDisplay   = cmodep->ml_hdisplay;
+        mode->type = 0;
+        mode->Clock = cmodep->ml_clock;
+        mode->HDisplay = cmodep->ml_hdisplay;
         mode->HSyncStart = cmodep->ml_hsyncstart;
-        mode->HSyncEnd   = cmodep->ml_hsyncend;
-        mode->HTotal     = cmodep->ml_htotal;
-        mode->VDisplay   = cmodep->ml_vdisplay;
+        mode->HSyncEnd = cmodep->ml_hsyncend;
+        mode->HTotal = cmodep->ml_htotal;
+        mode->VDisplay = cmodep->ml_vdisplay;
         mode->VSyncStart = cmodep->ml_vsyncstart;
-        mode->VSyncEnd   = cmodep->ml_vsyncend;
-        mode->VTotal     = cmodep->ml_vtotal;
-        mode->Flags      = cmodep->ml_flags;
-        mode->HSkew      = cmodep->ml_hskew;
-        mode->VScan      = cmodep->ml_vscan;
-        mode->name       = xnfstrdup(cmodep->ml_identifier);
-        if( last ) {
+        mode->VSyncEnd = cmodep->ml_vsyncend;
+        mode->VTotal = cmodep->ml_vtotal;
+        mode->Flags = cmodep->ml_flags;
+        mode->HSkew = cmodep->ml_hskew;
+        mode->VScan = cmodep->ml_vscan;
+        mode->name = xnfstrdup(cmodep->ml_identifier);
+        if (last) {
             mode->prev = last;
             last->next = mode;
         }
@@ -1951,52 +1992,53 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
             mode->prev = NULL;
         }
         last = mode;
-        cmodep = (XF86ConfModeLinePtr)cmodep->list.next;
+        cmodep = (XF86ConfModeLinePtr) cmodep->list.next;
     }
-    if(last){
-      last->next = NULL;
+    if (last) {
+        last->next = NULL;
     }
     monitorp->Last = last;
 
     /* add the (VESA) default modes */
-    if (! addDefaultModes(monitorp) )
-	return FALSE;
+    if (!addDefaultModes(monitorp))
+        return FALSE;
 
     if (conf_monitor->mon_gamma_red > GAMMA_ZERO)
-	monitorp->gamma.red = conf_monitor->mon_gamma_red;
+        monitorp->gamma.red = conf_monitor->mon_gamma_red;
     if (conf_monitor->mon_gamma_green > GAMMA_ZERO)
-	monitorp->gamma.green = conf_monitor->mon_gamma_green;
+        monitorp->gamma.green = conf_monitor->mon_gamma_green;
     if (conf_monitor->mon_gamma_blue > GAMMA_ZERO)
-	monitorp->gamma.blue = conf_monitor->mon_gamma_blue;
-    
+        monitorp->gamma.blue = conf_monitor->mon_gamma_blue;
+
     /* Check that the gamma values are within range */
     if (monitorp->gamma.red > GAMMA_ZERO &&
-	(monitorp->gamma.red < GAMMA_MIN ||
-	 monitorp->gamma.red > GAMMA_MAX)) {
-	badgamma = monitorp->gamma.red;
-    } else if (monitorp->gamma.green > GAMMA_ZERO &&
-	(monitorp->gamma.green < GAMMA_MIN ||
-	 monitorp->gamma.green > GAMMA_MAX)) {
-	badgamma = monitorp->gamma.green;
-    } else if (monitorp->gamma.blue > GAMMA_ZERO &&
-	(monitorp->gamma.blue < GAMMA_MIN ||
-	 monitorp->gamma.blue > GAMMA_MAX)) {
-	badgamma = monitorp->gamma.blue;
+        (monitorp->gamma.red < GAMMA_MIN || monitorp->gamma.red > GAMMA_MAX)) {
+        badgamma = monitorp->gamma.red;
+    }
+    else if (monitorp->gamma.green > GAMMA_ZERO &&
+             (monitorp->gamma.green < GAMMA_MIN ||
+              monitorp->gamma.green > GAMMA_MAX)) {
+        badgamma = monitorp->gamma.green;
+    }
+    else if (monitorp->gamma.blue > GAMMA_ZERO &&
+             (monitorp->gamma.blue < GAMMA_MIN ||
+              monitorp->gamma.blue > GAMMA_MAX)) {
+        badgamma = monitorp->gamma.blue;
     }
     if (badgamma > GAMMA_ZERO) {
-	xf86ConfigError("Gamma value %.f is out of range (%.2f - %.1f)\n",
-			badgamma, GAMMA_MIN, GAMMA_MAX);
-	    return FALSE;
+        xf86ConfigError("Gamma value %.f is out of range (%.2f - %.1f)\n",
+                        badgamma, GAMMA_MIN, GAMMA_MAX);
+        return FALSE;
     }
 
     xf86ProcessOptions(-1, monitorp->options, MonitorOptions);
     xf86GetOptValBool(MonitorOptions, MON_REDUCEDBLANKING,
                       &monitorp->reducedblanking);
     if (xf86GetOptValFreq(MonitorOptions, MON_MAX_PIX_CLOCK, OPTUNITS_KHZ,
-			  &maxPixClock) == TRUE) {
-	monitorp->maxPixClock = (int) maxPixClock;
+                          &maxPixClock) == TRUE) {
+        monitorp->maxPixClock = (int) maxPixClock;
     }
-	
+
     return TRUE;
 }
 
@@ -2006,71 +2048,71 @@ lookupVisual(const char *visname)
     int i;
 
     if (!visname || !*visname)
-	return -1;
+        return -1;
 
     for (i = 0; i <= DirectColor; i++) {
-	if (!xf86nameCompare(visname, xf86VisualNames[i]))
-	    break;
+        if (!xf86nameCompare(visname, xf86VisualNames[i]))
+            break;
     }
 
     if (i <= DirectColor)
-	return i;
+        return i;
 
     return -1;
 }
 
-
 static Bool
 configDisplay(DispPtr displayp, XF86ConfDisplayPtr conf_display)
 {
     int count = 0;
     XF86ModePtr modep;
-    
-    displayp->frameX0           = conf_display->disp_frameX0;
-    displayp->frameY0           = conf_display->disp_frameY0;
-    displayp->virtualX          = conf_display->disp_virtualX;
-    displayp->virtualY          = conf_display->disp_virtualY;
-    displayp->depth             = conf_display->disp_depth;
-    displayp->fbbpp             = conf_display->disp_bpp;
-    displayp->weight.red        = conf_display->disp_weight.red;
-    displayp->weight.green      = conf_display->disp_weight.green;
-    displayp->weight.blue       = conf_display->disp_weight.blue;
-    displayp->blackColour.red   = conf_display->disp_black.red;
+
+    displayp->frameX0 = conf_display->disp_frameX0;
+    displayp->frameY0 = conf_display->disp_frameY0;
+    displayp->virtualX = conf_display->disp_virtualX;
+    displayp->virtualY = conf_display->disp_virtualY;
+    displayp->depth = conf_display->disp_depth;
+    displayp->fbbpp = conf_display->disp_bpp;
+    displayp->weight.red = conf_display->disp_weight.red;
+    displayp->weight.green = conf_display->disp_weight.green;
+    displayp->weight.blue = conf_display->disp_weight.blue;
+    displayp->blackColour.red = conf_display->disp_black.red;
     displayp->blackColour.green = conf_display->disp_black.green;
-    displayp->blackColour.blue  = conf_display->disp_black.blue;
-    displayp->whiteColour.red   = conf_display->disp_white.red;
+    displayp->blackColour.blue = conf_display->disp_black.blue;
+    displayp->whiteColour.red = conf_display->disp_white.red;
     displayp->whiteColour.green = conf_display->disp_white.green;
-    displayp->whiteColour.blue  = conf_display->disp_white.blue;
-    displayp->options           = conf_display->disp_option_lst;
+    displayp->whiteColour.blue = conf_display->disp_white.blue;
+    displayp->options = conf_display->disp_option_lst;
     if (conf_display->disp_visual) {
-	displayp->defaultVisual = lookupVisual(conf_display->disp_visual);
-	if (displayp->defaultVisual == -1) {
-	    xf86ConfigError("Invalid visual name: \"%s\"",
-			    conf_display->disp_visual);
-	    return FALSE;
-	}
-    } else {
-	displayp->defaultVisual = -1;
-    }
-	
+        displayp->defaultVisual = lookupVisual(conf_display->disp_visual);
+        if (displayp->defaultVisual == -1) {
+            xf86ConfigError("Invalid visual name: \"%s\"",
+                            conf_display->disp_visual);
+            return FALSE;
+        }
+    }
+    else {
+        displayp->defaultVisual = -1;
+    }
+
     /*
      * now hook in the modes
      */
     modep = conf_display->disp_mode_lst;
-    while(modep) {
+    while (modep) {
         count++;
-        modep = (XF86ModePtr)modep->list.next;
+        modep = (XF86ModePtr) modep->list.next;
     }
-    displayp->modes = xnfalloc((count+1) * sizeof(char*));
+    displayp->modes = xnfalloc((count + 1) * sizeof(char *));
     modep = conf_display->disp_mode_lst;
     count = 0;
-    while(modep) {
+    while (modep) {
         displayp->modes[count] = modep->mode_name;
         count++;
-        modep = (XF86ModePtr)modep->list.next;
+        modep = (XF86ModePtr) modep->list.next;
     }
     displayp->modes[count] = NULL;
-    
+
     return TRUE;
 }
 
@@ -2084,11 +2126,11 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active)
     }
 
     if (active)
-	xf86Msg(X_CONFIG, "|   |-->Device \"%s\"\n",
-		conf_device->dev_identifier);
+        xf86Msg(X_CONFIG, "|   |-->Device \"%s\"\n",
+                conf_device->dev_identifier);
     else
-	xf86Msg(X_CONFIG, "|-->Inactive Device \"%s\"\n",
-		conf_device->dev_identifier);
+        xf86Msg(X_CONFIG, "|-->Inactive Device \"%s\"\n",
+                conf_device->dev_identifier);
 
     devicep->identifier = conf_device->dev_identifier;
     devicep->vendor = conf_device->dev_vendor;
@@ -2111,16 +2153,16 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active)
     devicep->screen = conf_device->dev_screen;
 
     for (i = 0; i < MAXDACSPEEDS; i++) {
-	if (i < CONF_MAXDACSPEEDS)
+        if (i < CONF_MAXDACSPEEDS)
             devicep->dacSpeeds[i] = conf_device->dev_dacSpeeds[i];
-	else
-	    devicep->dacSpeeds[i] = 0;
+        else
+            devicep->dacSpeeds[i] = 0;
     }
     devicep->numclocks = conf_device->dev_clocks;
     if (devicep->numclocks > MAXCLOCKS)
-	devicep->numclocks = MAXCLOCKS;
+        devicep->numclocks = MAXCLOCKS;
     for (i = 0; i < devicep->numclocks; i++) {
-	devicep->clock[i] = conf_device->dev_clock[i];
+        devicep->clock[i] = conf_device->dev_clock[i];
     }
     devicep->claimed = FALSE;
 
@@ -2131,20 +2173,21 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active)
 static void
 configDRI(XF86ConfDRIPtr drip)
 {
-    struct group       *grp;
+    struct group *grp;
 
-    xf86ConfigDRI.group      = -1;
-    xf86ConfigDRI.mode       = 0;
+    xf86ConfigDRI.group = -1;
+    xf86ConfigDRI.mode = 0;
 
     if (drip) {
-	if (drip->dri_group_name) {
-	    if ((grp = getgrnam(drip->dri_group_name)))
-		xf86ConfigDRI.group = grp->gr_gid;
-	} else {
-	    if (drip->dri_group >= 0)
-		xf86ConfigDRI.group = drip->dri_group;
-	}
-	xf86ConfigDRI.mode = drip->dri_mode;
+        if (drip->dri_group_name) {
+            if ((grp = getgrnam(drip->dri_group_name)))
+                xf86ConfigDRI.group = grp->gr_gid;
+        }
+        else {
+            if (drip->dri_group >= 0)
+                xf86ConfigDRI.group = drip->dri_group;
+        }
+        xf86ConfigDRI.mode = drip->dri_mode;
     }
 }
 #endif
@@ -2155,49 +2198,51 @@ configExtensions(XF86ConfExtensionsPtr conf_ext)
     XF86OptionPtr o;
 
     if (conf_ext && conf_ext->ext_option_lst) {
-	for (o = conf_ext->ext_option_lst; o; o = xf86NextOption(o)) {
-	    char *name   = xf86OptionName(o);
-	    char *val    = xf86OptionValue(o);
-	    char *n;
-	    Bool  enable = TRUE;
-
-	    /* Handle "No<ExtensionName>" */
-	    n = xf86NormalizeName(name);
-	    if (strncmp(n, "no", 2) == 0) {
-		name += 2;
-		enable = FALSE;
-	    }
-
-	    if (!val ||
-		xf86NameCmp(val, "enable") == 0 ||
-		xf86NameCmp(val, "enabled") == 0 ||
-		xf86NameCmp(val, "on") == 0 ||
-		xf86NameCmp(val, "1") == 0 ||
-		xf86NameCmp(val, "yes") == 0 ||
-		xf86NameCmp(val, "true") == 0) {
-		/* NOTHING NEEDED -- enabling is handled below */
-	    } else if (xf86NameCmp(val, "disable") == 0 ||
-                       xf86NameCmp(val, "disabled") == 0 ||
-		       xf86NameCmp(val, "off") == 0 ||
-		       xf86NameCmp(val, "0") == 0 ||
-		       xf86NameCmp(val, "no") == 0 ||
-		       xf86NameCmp(val, "false") == 0) {
-		enable = !enable;
-	    } else {
-		xf86Msg(X_WARNING, "Ignoring unrecognized value \"%s\"\n", val);
-		free(n);
-		continue;
-	    }
-
-	    if (EnableDisableExtension(name, enable)) {
-		xf86Msg(X_CONFIG, "Extension \"%s\" is %s\n",
-			name, enable ? "enabled" : "disabled");
-	    } else {
-		xf86Msg(X_WARNING, "Ignoring unrecognized extension \"%s\"\n",
+        for (o = conf_ext->ext_option_lst; o; o = xf86NextOption(o)) {
+            char *name = xf86OptionName(o);
+            char *val = xf86OptionValue(o);
+            char *n;
+            Bool enable = TRUE;
+
+            /* Handle "No<ExtensionName>" */
+            n = xf86NormalizeName(name);
+            if (strncmp(n, "no", 2) == 0) {
+                name += 2;
+                enable = FALSE;
+            }
+
+            if (!val ||
+                xf86NameCmp(val, "enable") == 0 ||
+                xf86NameCmp(val, "enabled") == 0 ||
+                xf86NameCmp(val, "on") == 0 ||
+                xf86NameCmp(val, "1") == 0 ||
+                xf86NameCmp(val, "yes") == 0 || xf86NameCmp(val, "true") == 0) {
+                /* NOTHING NEEDED -- enabling is handled below */
+            }
+            else if (xf86NameCmp(val, "disable") == 0 ||
+                     xf86NameCmp(val, "disabled") == 0 ||
+                     xf86NameCmp(val, "off") == 0 ||
+                     xf86NameCmp(val, "0") == 0 ||
+                     xf86NameCmp(val, "no") == 0 ||
+                     xf86NameCmp(val, "false") == 0) {
+                enable = !enable;
+            }
+            else {
+                xf86Msg(X_WARNING, "Ignoring unrecognized value \"%s\"\n", val);
+                free(n);
+                continue;
+            }
+
+            if (EnableDisableExtension(name, enable)) {
+                xf86Msg(X_CONFIG, "Extension \"%s\" is %s\n",
+                        name, enable ? "enabled" : "disabled");
+            }
+            else {
+                xf86Msg(X_WARNING, "Ignoring unrecognized extension \"%s\"\n",
                         name);
-	    }
-	    free(n);
-	}
+            }
+            free(n);
+        }
     }
 }
 
@@ -2219,12 +2264,11 @@ modeIsPresent(DisplayModePtr mode, MonPtr monitorp)
     DisplayModePtr knownmodes = monitorp->Modes;
 
     /* all I can think of is a linear search... */
-    while(knownmodes != NULL)
-    {
-	if(!strcmp(mode->name, knownmodes->name) &&
-	   !(knownmodes->type & M_T_DEFAULT))
-	    return TRUE;
-	knownmodes = knownmodes->next;
+    while (knownmodes != NULL) {
+        if (!strcmp(mode->name, knownmodes->name) &&
+            !(knownmodes->type & M_T_DEFAULT))
+            return TRUE;
+        knownmodes = knownmodes->next;
     }
     return FALSE;
 }
@@ -2236,16 +2280,15 @@ addDefaultModes(MonPtr monitorp)
     DisplayModePtr last = monitorp->Last;
     int i = 0;
 
-    for (i = 0; i < xf86NumDefaultModes; i++)
-    {
-	mode = xf86DuplicateMode(&xf86DefaultModes[i]);
-	if (!modeIsPresent(mode, monitorp))
-	{
-	    monitorp->Modes = xf86ModesAdd(monitorp->Modes, mode);
-	    last = mode;
-	} else {
-	    free(mode);
-	}
+    for (i = 0; i < xf86NumDefaultModes; i++) {
+        mode = xf86DuplicateMode(&xf86DefaultModes[i]);
+        if (!modeIsPresent(mode, monitorp)) {
+            monitorp->Modes = xf86ModesAdd(monitorp->Modes, mode);
+            last = mode;
+        }
+        else {
+            free(mode);
+        }
     }
     monitorp->Last = last;
 
@@ -2253,27 +2296,25 @@ addDefaultModes(MonPtr monitorp)
 }
 
 static void
-checkInput(serverLayoutPtr layout, Bool implicit_layout) {
+checkInput(serverLayoutPtr layout, Bool implicit_layout)
+{
     checkCoreInputDevices(layout, implicit_layout);
 
     /* Unless we're forcing input devices, disable mouse/kbd devices in the
      * config. Otherwise the same physical device is added multiple times,
      * leading to duplicate events.
      */
-    if (!xf86Info.forceInputDevices && layout->inputs)
-    {
+    if (!xf86Info.forceInputDevices && layout->inputs) {
         InputInfoPtr *dev = layout->inputs;
         BOOL warned = FALSE;
 
-        while(*dev)
-        {
+        while (*dev) {
             if (strcmp((*dev)->driver, "kbd") == 0 ||
                 strcmp((*dev)->driver, "mouse") == 0 ||
-                strcmp((*dev)->driver, "vmmouse") == 0)
-            {
+                strcmp((*dev)->driver, "vmmouse") == 0) {
                 InputInfoPtr *current;
-                if (!warned)
-                {
+
+                if (!warned) {
                     xf86Msg(X_WARNING, "Hotplugging is on, devices using "
                             "drivers 'kbd', 'mouse' or 'vmmouse' will be disabled.\n");
                     warned = TRUE;
@@ -2287,8 +2328,9 @@ checkInput(serverLayoutPtr layout, Bool implicit_layout) {
                 do {
                     *current = *(current + 1);
                     current++;
-                } while(*current);
-            } else
+                } while (*current);
+            }
+            else
                 dev++;
         }
     }
@@ -2305,63 +2347,66 @@ xf86HandleConfigFile(Bool autoconfig)
     Bool implicit_layout = FALSE;
 
     if (!autoconfig) {
-	char *filename, *dirname, *sysdirname;
-	const char *filesearch, *dirsearch;
-	MessageType filefrom = X_DEFAULT;
-	MessageType dirfrom = X_DEFAULT;
-
-	if (!xf86PrivsElevated()) {
-	    filesearch = ALL_CONFIGPATH;
-	    dirsearch = ALL_CONFIGDIRPATH;
-	} else {
-	    filesearch = RESTRICTED_CONFIGPATH;
-	    dirsearch = RESTRICTED_CONFIGDIRPATH;
-	}
-
-	if (xf86ConfigFile)
-	    filefrom = X_CMDLINE;
-	if (xf86ConfigDir)
-	    dirfrom = X_CMDLINE;
-
-	xf86initConfigFiles();
-	sysdirname = xf86openConfigDirFiles(SYS_CONFIGDIRPATH, NULL,
-					    PROJECTROOT);
-	dirname = xf86openConfigDirFiles(dirsearch, xf86ConfigDir, PROJECTROOT);
-	filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT);
-	if (filename) {
-	    xf86MsgVerb(filefrom, 0, "Using config file: \"%s\"\n", filename);
-	    xf86ConfigFile = xnfstrdup(filename);
-	} else {
-	    if (xf86ConfigFile)
-		xf86Msg(X_ERROR, "Unable to locate/open config file: \"%s\"\n",
-			xf86ConfigFile);
-	}
-	if (dirname) {
-	    xf86MsgVerb(dirfrom, 0, "Using config directory: \"%s\"\n",
-			dirname);
-	    xf86ConfigDir = xnfstrdup(dirname);
-	} else {
-	    if (xf86ConfigDir)
-		xf86Msg(X_ERROR,
-			"Unable to locate/open config directory: \"%s\"\n",
-			xf86ConfigDir);
-	}
-	if (sysdirname)
-	    xf86MsgVerb(X_DEFAULT, 0, "Using system config directory \"%s\"\n",
-			sysdirname);
-	if (!filename && !dirname && !sysdirname)
-	    return CONFIG_NOFILE;
-
-	free(filename);
-	free(dirname);
-	free(sysdirname);
-    }
-
-    if ((xf86configptr = xf86readConfigFile ()) == NULL) {
-	xf86Msg(X_ERROR, "Problem parsing the config file\n");
-	return CONFIG_PARSE_ERROR;
-    }
-    xf86closeConfigFile ();
+        char *filename, *dirname, *sysdirname;
+        const char *filesearch, *dirsearch;
+        MessageType filefrom = X_DEFAULT;
+        MessageType dirfrom = X_DEFAULT;
+
+        if (!xf86PrivsElevated()) {
+            filesearch = ALL_CONFIGPATH;
+            dirsearch = ALL_CONFIGDIRPATH;
+        }
+        else {
+            filesearch = RESTRICTED_CONFIGPATH;
+            dirsearch = RESTRICTED_CONFIGDIRPATH;
+        }
+
+        if (xf86ConfigFile)
+            filefrom = X_CMDLINE;
+        if (xf86ConfigDir)
+            dirfrom = X_CMDLINE;
+
+        xf86initConfigFiles();
+        sysdirname = xf86openConfigDirFiles(SYS_CONFIGDIRPATH, NULL,
+                                            PROJECTROOT);
+        dirname = xf86openConfigDirFiles(dirsearch, xf86ConfigDir, PROJECTROOT);
+        filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT);
+        if (filename) {
+            xf86MsgVerb(filefrom, 0, "Using config file: \"%s\"\n", filename);
+            xf86ConfigFile = xnfstrdup(filename);
+        }
+        else {
+            if (xf86ConfigFile)
+                xf86Msg(X_ERROR, "Unable to locate/open config file: \"%s\"\n",
+                        xf86ConfigFile);
+        }
+        if (dirname) {
+            xf86MsgVerb(dirfrom, 0, "Using config directory: \"%s\"\n",
+                        dirname);
+            xf86ConfigDir = xnfstrdup(dirname);
+        }
+        else {
+            if (xf86ConfigDir)
+                xf86Msg(X_ERROR,
+                        "Unable to locate/open config directory: \"%s\"\n",
+                        xf86ConfigDir);
+        }
+        if (sysdirname)
+            xf86MsgVerb(X_DEFAULT, 0, "Using system config directory \"%s\"\n",
+                        sysdirname);
+        if (!filename && !dirname && !sysdirname)
+            return CONFIG_NOFILE;
+
+        free(filename);
+        free(dirname);
+        free(sysdirname);
+    }
+
+    if ((xf86configptr = xf86readConfigFile()) == NULL) {
+        xf86Msg(X_ERROR, "Problem parsing the config file\n");
+        return CONFIG_PARSE_ERROR;
+    }
+    xf86closeConfigFile();
 
     /* Initialise a few things. */
 
@@ -2377,59 +2422,65 @@ xf86HandleConfigFile(Bool autoconfig)
     /* First check if a layout section is present, and if it is valid. */
 
     if (xf86configptr->conf_layout_lst == NULL || xf86ScreenName != NULL) {
-	if (xf86ScreenName == NULL) {
-	    xf86Msg(X_DEFAULT,
-		    "No Layout section.  Using the first Screen section.\n");
-	}
-	if (!configImpliedLayout(&xf86ConfigLayout,
-				 xf86configptr->conf_screen_lst,
-				 xf86configptr)) {
+        if (xf86ScreenName == NULL) {
+            xf86Msg(X_DEFAULT,
+                    "No Layout section.  Using the first Screen section.\n");
+        }
+        if (!configImpliedLayout(&xf86ConfigLayout,
+                                 xf86configptr->conf_screen_lst,
+                                 xf86configptr)) {
             xf86Msg(X_ERROR, "Unable to determine the screen layout\n");
-	    return CONFIG_PARSE_ERROR;
-	}
-	implicit_layout = TRUE;
-    } else {
-	if (xf86configptr->conf_flags != NULL) {
-	  char *dfltlayout = NULL;
- 	  pointer optlist = xf86configptr->conf_flags->flg_option_lst;
-	
-	  if (optlist && xf86FindOption(optlist, "defaultserverlayout"))
-	    dfltlayout = xf86SetStrOption(optlist, "defaultserverlayout", NULL);
-	  if (!configLayout(&xf86ConfigLayout, xf86configptr->conf_layout_lst,
-			  dfltlayout)) {
-	    xf86Msg(X_ERROR, "Unable to determine the screen layout\n");
-	    return CONFIG_PARSE_ERROR;
-	  }
-	} else {
-	  if (!configLayout(&xf86ConfigLayout, xf86configptr->conf_layout_lst,
-			  NULL)) {
-	    xf86Msg(X_ERROR, "Unable to determine the screen layout\n");
-	    return CONFIG_PARSE_ERROR;
-	  }
-	}
+            return CONFIG_PARSE_ERROR;
+        }
+        implicit_layout = TRUE;
+    }
+    else {
+        if (xf86configptr->conf_flags != NULL) {
+            char *dfltlayout = NULL;
+            pointer optlist = xf86configptr->conf_flags->flg_option_lst;
+
+            if (optlist && xf86FindOption(optlist, "defaultserverlayout"))
+                dfltlayout =
+                    xf86SetStrOption(optlist, "defaultserverlayout", NULL);
+            if (!configLayout
+                (&xf86ConfigLayout, xf86configptr->conf_layout_lst,
+                 dfltlayout)) {
+                xf86Msg(X_ERROR, "Unable to determine the screen layout\n");
+                return CONFIG_PARSE_ERROR;
+            }
+        }
+        else {
+            if (!configLayout(&xf86ConfigLayout, xf86configptr->conf_layout_lst,
+                              NULL)) {
+                xf86Msg(X_ERROR, "Unable to determine the screen layout\n");
+                return CONFIG_PARSE_ERROR;
+            }
+        }
     }
 
     xf86ProcessOptions(-1, xf86ConfigLayout.options, LayoutOptions);
 #ifdef XSERVER_LIBPCIACCESS
     if ((scanptr = xf86GetOptValString(LayoutOptions, LAYOUT_ISOLATEDEVICE))) {
-       ; /* IsolateDevice specified; overrides SingleCard */
-    } else {
-       xf86GetOptValBool(LayoutOptions, LAYOUT_SINGLECARD, &singlecard);
-       if (singlecard)
-           scanptr = xf86ConfigLayout.screens->screen->device->busID;
+        ;                       /* IsolateDevice specified; overrides SingleCard */
+    }
+    else {
+        xf86GetOptValBool(LayoutOptions, LAYOUT_SINGLECARD, &singlecard);
+        if (singlecard)
+            scanptr = xf86ConfigLayout.screens->screen->device->busID;
     }
     if (scanptr) {
-       if (strncmp(scanptr, "PCI:", 4) != 0) {
-           xf86Msg(X_WARNING, "Bus types other than PCI not yet isolable.\n"
-                              "\tIgnoring IsolateDevice option.\n");
-       } else
-           xf86PciIsolateDevice(scanptr);
+        if (strncmp(scanptr, "PCI:", 4) != 0) {
+            xf86Msg(X_WARNING, "Bus types other than PCI not yet isolable.\n"
+                    "\tIgnoring IsolateDevice option.\n");
+        }
+        else
+            xf86PciIsolateDevice(scanptr);
     }
 #endif
     /* Now process everything else */
-    if (!configServerFlags(xf86configptr->conf_flags,xf86ConfigLayout.options)){
-             ErrorF ("Problem when converting the config data structures\n");
-             return CONFIG_PARSE_ERROR;
+    if (!configServerFlags(xf86configptr->conf_flags, xf86ConfigLayout.options)) {
+        ErrorF("Problem when converting the config data structures\n");
+        return CONFIG_PARSE_ERROR;
     }
 
     configFiles(xf86configptr->conf_files);
@@ -2446,13 +2497,13 @@ xf86HandleConfigFile(Bool autoconfig)
      */
 #ifdef XF86VIDMODE
     if (xf86VidModeDisabled)
-	xf86Info.vidModeEnabled = FALSE;
+        xf86Info.vidModeEnabled = FALSE;
     if (xf86VidModeAllowNonLocal)
-	xf86Info.vidModeAllowNonLocal = TRUE;
+        xf86Info.vidModeAllowNonLocal = TRUE;
 #endif
 
     if (xf86AllowMouseOpenFail)
-	xf86Info.allowMouseOpenFail = TRUE;
+        xf86Info.allowMouseOpenFail = TRUE;
 
     return CONFIG_OK;
 }
diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c
index 994d46fc2..6f69117d3 100644
--- a/xorg-server/hw/xfree86/common/xf86Configure.c
+++ b/xorg-server/hw/xfree86/common/xf86Configure.c
@@ -43,7 +43,7 @@
 
 typedef struct _DevToConfig {
     GDevRec GDev;
-    struct pci_device * pVideo;
+    struct pci_device *pVideo;
 #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
     sbusDevicePtr sVideo;
 #endif
@@ -77,28 +77,29 @@ static const char *DFLT_MOUSE_PROTO = "auto";
  * the caller fill in the rest and/or change it as it sees fit.
  */
 GDevPtr
-xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int chipset)
+xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData,
+                            int chipset)
 {
     int ret, i, j;
 
     if (!xf86DoConfigure || !xf86DoConfigurePass1)
-	return NULL;
+        return NULL;
 
     /* Check for duplicates */
-    for (i = 0;  i < nDevToConfig;  i++) {
+    for (i = 0; i < nDevToConfig; i++) {
         switch (bus) {
 #ifdef XSERVER_LIBPCIACCESS
-            case BUS_PCI:
-                ret = xf86PciConfigure(busData, DevToConfig[i].pVideo);
-	            break;
+        case BUS_PCI:
+            ret = xf86PciConfigure(busData, DevToConfig[i].pVideo);
+            break;
 #endif
 #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
-            case BUS_SBUS:
-                ret = xf86SbusConfigure(busData, DevToConfig[i].sVideo);
-                break;
+        case BUS_SBUS:
+            ret = xf86SbusConfigure(busData, DevToConfig[i].sVideo);
+            break;
 #endif
-            default:
-                return NULL;
+        default:
+            return NULL;
         }
         if (ret == 0)
             goto out;
@@ -107,112 +108,113 @@ xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int
     /* Allocate new structure occurrence */
     i = nDevToConfig++;
     DevToConfig =
-	xnfrealloc(DevToConfig, nDevToConfig * sizeof(DevToConfigRec));
+        xnfrealloc(DevToConfig, nDevToConfig * sizeof(DevToConfigRec));
     memset(DevToConfig + i, 0, sizeof(DevToConfigRec));
 
     DevToConfig[i].GDev.chipID =
-            DevToConfig[i].GDev.chipRev = DevToConfig[i].GDev.irq = -1;
+        DevToConfig[i].GDev.chipRev = DevToConfig[i].GDev.irq = -1;
 
     DevToConfig[i].iDriver = CurrentDriver;
 
     /* Fill in what we know, converting the driver name to lower case */
     DevToConfig[i].GDev.driver = xnfalloc(strlen(driver) + 1);
-    for (j = 0;  (DevToConfig[i].GDev.driver[j] = tolower(driver[j]));  j++);
+    for (j = 0; (DevToConfig[i].GDev.driver[j] = tolower(driver[j])); j++);
 
     switch (bus) {
 #ifdef XSERVER_LIBPCIACCESS
-        case BUS_PCI:
-            xf86PciConfigureNewDev(busData, DevToConfig[i].pVideo,
-                                   &DevToConfig[i].GDev, &chipset);
-	        break;
+    case BUS_PCI:
+        xf86PciConfigureNewDev(busData, DevToConfig[i].pVideo,
+                               &DevToConfig[i].GDev, &chipset);
+        break;
 #endif
 #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
-        case BUS_SBUS:
-            xf86SbusConfigureNewDev(busData, DevToConfig[i].sVideo,
-                                    &DevToConfig[i].GDev);
-	        break;
+    case BUS_SBUS:
+        xf86SbusConfigureNewDev(busData, DevToConfig[i].sVideo,
+                                &DevToConfig[i].GDev);
+        break;
 #endif
-        default:
-	        break;
+    default:
+        break;
     }
 
     /* Get driver's available options */
     if (xf86DriverList[CurrentDriver]->AvailableOptions)
-	DevToConfig[i].GDev.options = (OptionInfoPtr)
-	    (*xf86DriverList[CurrentDriver]->AvailableOptions)(chipset,
-							       bus);
+        DevToConfig[i].GDev.options = (OptionInfoPtr)
+            (*xf86DriverList[CurrentDriver]->AvailableOptions) (chipset, bus);
 
     return &DevToConfig[i].GDev;
 
-out:
+ out:
     return NULL;
 }
 
 static XF86ConfInputPtr
-configureInputSection (void)
+configureInputSection(void)
 {
     XF86ConfInputPtr mouse = NULL;
-    parsePrologue (XF86ConfInputPtr, XF86ConfInputRec)
 
-    ptr->inp_identifier = "Keyboard0";
+    parsePrologue(XF86ConfInputPtr, XF86ConfInputRec)
+
+        ptr->inp_identifier = "Keyboard0";
     ptr->inp_driver = "kbd";
     ptr->list.next = NULL;
 
     /* Crude mechanism to auto-detect mouse (os dependent) */
-    { 
-	int fd;
+    {
+        int fd;
 
-	fd = open(DFLT_MOUSE_DEV, 0);
-	if (fd != -1) {
-	    foundMouse = TRUE;
-	    close(fd);
-	}
+        fd = open(DFLT_MOUSE_DEV, 0);
+        if (fd != -1) {
+            foundMouse = TRUE;
+            close(fd);
+        }
     }
 
     mouse = calloc(1, sizeof(XF86ConfInputRec));
     mouse->inp_identifier = "Mouse0";
     mouse->inp_driver = "mouse";
-    mouse->inp_option_lst = 
-		xf86addNewOption(mouse->inp_option_lst, strdup("Protocol"),
-				strdup(DFLT_MOUSE_PROTO));
-    mouse->inp_option_lst = 
-		xf86addNewOption(mouse->inp_option_lst, strdup("Device"),
-				strdup(DFLT_MOUSE_DEV));
-    mouse->inp_option_lst = 
-		xf86addNewOption(mouse->inp_option_lst, strdup("ZAxisMapping"),
-				strdup("4 5 6 7"));
-    ptr = (XF86ConfInputPtr)xf86addListItem((glp)ptr, (glp)mouse);
+    mouse->inp_option_lst =
+        xf86addNewOption(mouse->inp_option_lst, strdup("Protocol"),
+                         strdup(DFLT_MOUSE_PROTO));
+    mouse->inp_option_lst =
+        xf86addNewOption(mouse->inp_option_lst, strdup("Device"),
+                         strdup(DFLT_MOUSE_DEV));
+    mouse->inp_option_lst =
+        xf86addNewOption(mouse->inp_option_lst, strdup("ZAxisMapping"),
+                         strdup("4 5 6 7"));
+    ptr = (XF86ConfInputPtr) xf86addListItem((glp) ptr, (glp) mouse);
     return ptr;
 }
 
 static XF86ConfScreenPtr
-configureScreenSection (int screennum)
+configureScreenSection(int screennum)
 {
     int i;
-    int depths[] = { 1, 4, 8, 15, 16, 24/*, 32*/ };
-    parsePrologue (XF86ConfScreenPtr, XF86ConfScreenRec)
+    int depths[] = { 1, 4, 8, 15, 16, 24 /*, 32 */  };
+    parsePrologue(XF86ConfScreenPtr, XF86ConfScreenRec)
 
-    XNFasprintf(&ptr->scrn_identifier, "Screen%d", screennum);
+        XNFasprintf(&ptr->scrn_identifier, "Screen%d", screennum);
     XNFasprintf(&ptr->scrn_monitor_str, "Monitor%d", screennum);
     XNFasprintf(&ptr->scrn_device_str, "Card%d", screennum);
 
-    for (i=0; i<sizeof(depths)/sizeof(depths[0]); i++)
-    {
-	XF86ConfDisplayPtr display;
-
-	display = calloc(1, sizeof(XF86ConfDisplayRec));
-	display->disp_depth = depths[i];
-	display->disp_black.red = display->disp_white.red = -1;
-	display->disp_black.green = display->disp_white.green = -1;
-	display->disp_black.blue = display->disp_white.blue = -1;
-	ptr->scrn_display_lst = (XF86ConfDisplayPtr)xf86addListItem(
-				     (glp)ptr->scrn_display_lst, (glp)display);
+    for (i = 0; i < sizeof(depths) / sizeof(depths[0]); i++) {
+        XF86ConfDisplayPtr display;
+
+        display = calloc(1, sizeof(XF86ConfDisplayRec));
+        display->disp_depth = depths[i];
+        display->disp_black.red = display->disp_white.red = -1;
+        display->disp_black.green = display->disp_white.green = -1;
+        display->disp_black.blue = display->disp_white.blue = -1;
+        ptr->scrn_display_lst = (XF86ConfDisplayPtr) xf86addListItem((glp) ptr->
+                                                                     scrn_display_lst,
+                                                                     (glp)
+                                                                     display);
     }
 
     return ptr;
 }
 
-static const char* 
+static const char *
 optionTypeToString(OptionValueType type)
 {
     switch (type) {
@@ -223,7 +225,7 @@ optionTypeToString(OptionValueType type)
     case OPTV_STRING:
         return "<str>";
     case OPTV_ANYSTR:
-       return "[<str>]";
+        return "[<str>]";
     case OPTV_REAL:
         return "<f>";
     case OPTV_BOOLEAN:
@@ -238,20 +240,21 @@ optionTypeToString(OptionValueType type)
 }
 
 static XF86ConfDevicePtr
-configureDeviceSection (int screennum)
+configureDeviceSection(int screennum)
 {
     OptionInfoPtr p;
     int i = 0;
-    parsePrologue (XF86ConfDevicePtr, XF86ConfDeviceRec)
 
-    /* Move device info to parser structure */
-    if (asprintf(&ptr->dev_identifier, "Card%d", screennum) == -1)
+    parsePrologue(XF86ConfDevicePtr, XF86ConfDeviceRec)
+
+        /* Move device info to parser structure */
+        if (asprintf(&ptr->dev_identifier, "Card%d", screennum) == -1)
         ptr->dev_identifier = NULL;
     ptr->dev_chipset = DevToConfig[screennum].GDev.chipset;
     ptr->dev_busid = DevToConfig[screennum].GDev.busID;
     ptr->dev_driver = DevToConfig[screennum].GDev.driver;
     ptr->dev_ramdac = DevToConfig[screennum].GDev.ramdac;
-    for (i = 0;  (i < MAXDACSPEEDS) && (i < CONF_MAXDACSPEEDS);  i++)
+    for (i = 0; (i < MAXDACSPEEDS) && (i < CONF_MAXDACSPEEDS); i++)
         ptr->dev_dacSpeeds[i] = DevToConfig[screennum].GDev.dacSpeeds[i];
     ptr->dev_videoram = DevToConfig[screennum].GDev.videoRam;
     ptr->dev_textclockfreq = DevToConfig[screennum].GDev.textClockFreq;
@@ -259,7 +262,8 @@ configureDeviceSection (int screennum)
     ptr->dev_mem_base = DevToConfig[screennum].GDev.MemBase;
     ptr->dev_io_base = DevToConfig[screennum].GDev.IOBase;
     ptr->dev_clockchip = DevToConfig[screennum].GDev.clockchip;
-    for (i = 0;  (i < MAXCLOCKS) && (i < DevToConfig[screennum].GDev.numclocks);  i++)
+    for (i = 0; (i < MAXCLOCKS) && (i < DevToConfig[screennum].GDev.numclocks);
+         i++)
         ptr->dev_clock[i] = DevToConfig[screennum].GDev.clock[i];
     ptr->dev_clocks = i;
     ptr->dev_chipid = DevToConfig[screennum].GDev.chipID;
@@ -268,161 +272,165 @@ configureDeviceSection (int screennum)
 
     /* Make sure older drivers don't segv */
     if (DevToConfig[screennum].GDev.options) {
-    	/* Fill in the available driver options for people to use */
-	const char *descrip =
-	    "        ### Available Driver options are:-\n"
-	    "        ### Values: <i>: integer, <f>: float, "
-			"<bool>: \"True\"/\"False\",\n"
-	    "        ### <string>: \"String\", <freq>: \"<f> Hz/kHz/MHz\",\n"
-	    "        ### <percent>: \"<f>%\"\n"
-	    "        ### [arg]: arg optional\n";
-	ptr->dev_comment = strdup(descrip);
-	if (ptr->dev_comment) {
-    	    for (p = DevToConfig[screennum].GDev.options;
-		 p->name != NULL; p++) {
-		char *p_e;
-		const char *prefix = "        #Option     ";
-		const char *middle = " \t# ";
-		const char *suffix = "\n";
-		const char *opttype = optionTypeToString(p->type);
-		char *optname;
-		int len = strlen(ptr->dev_comment) + strlen(prefix) +
-			  strlen(middle) + strlen(suffix) + 1;
-		
-		if (asprintf(&optname, "\"%s\"", p->name) == -1)
-		    break;
-
-		len += max(20, strlen(optname));
-		len += strlen(opttype);
-
-		ptr->dev_comment = realloc(ptr->dev_comment, len);
-		if (!ptr->dev_comment)
-		    break;
-		p_e = ptr->dev_comment + strlen(ptr->dev_comment);
-		sprintf(p_e, "%s%-20s%s%s%s", prefix, optname, middle,
-			opttype, suffix);
-		free(optname);
-	    }
-    	}
+        /* Fill in the available driver options for people to use */
+        const char *descrip =
+            "        ### Available Driver options are:-\n"
+            "        ### Values: <i>: integer, <f>: float, "
+            "<bool>: \"True\"/\"False\",\n"
+            "        ### <string>: \"String\", <freq>: \"<f> Hz/kHz/MHz\",\n"
+            "        ### <percent>: \"<f>%\"\n"
+            "        ### [arg]: arg optional\n";
+        ptr->dev_comment = strdup(descrip);
+        if (ptr->dev_comment) {
+            for (p = DevToConfig[screennum].GDev.options; p->name != NULL; p++) {
+                char *p_e;
+                const char *prefix = "        #Option     ";
+                const char *middle = " \t# ";
+                const char *suffix = "\n";
+                const char *opttype = optionTypeToString(p->type);
+                char *optname;
+                int len = strlen(ptr->dev_comment) + strlen(prefix) +
+                    strlen(middle) + strlen(suffix) + 1;
+
+                if (asprintf(&optname, "\"%s\"", p->name) == -1)
+                    break;
+
+                len += max(20, strlen(optname));
+                len += strlen(opttype);
+
+                ptr->dev_comment = realloc(ptr->dev_comment, len);
+                if (!ptr->dev_comment)
+                    break;
+                p_e = ptr->dev_comment + strlen(ptr->dev_comment);
+                sprintf(p_e, "%s%-20s%s%s%s", prefix, optname, middle,
+                        opttype, suffix);
+                free(optname);
+            }
+        }
     }
 
     return ptr;
 }
 
 static XF86ConfLayoutPtr
-configureLayoutSection (void)
+configureLayoutSection(void)
 {
     int scrnum = 0;
-    parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec)
 
-    ptr->lay_identifier = "X.org Configured";
+    parsePrologue(XF86ConfLayoutPtr, XF86ConfLayoutRec)
 
-    {
-	XF86ConfInputrefPtr iptr;
+        ptr->lay_identifier = "X.org Configured";
 
-	iptr = malloc (sizeof (XF86ConfInputrefRec));
-	iptr->list.next = NULL;
-	iptr->iref_option_lst = NULL;
-	iptr->iref_inputdev_str = "Mouse0";
-	iptr->iref_option_lst =
-		xf86addNewOption (iptr->iref_option_lst, strdup("CorePointer"), NULL);
-	ptr->lay_input_lst = (XF86ConfInputrefPtr)
-		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);
+    {
+        XF86ConfInputrefPtr iptr;
+
+        iptr = malloc(sizeof(XF86ConfInputrefRec));
+        iptr->list.next = NULL;
+        iptr->iref_option_lst = NULL;
+        iptr->iref_inputdev_str = "Mouse0";
+        iptr->iref_option_lst =
+            xf86addNewOption(iptr->iref_option_lst, strdup("CorePointer"),
+                             NULL);
+        ptr->lay_input_lst = (XF86ConfInputrefPtr)
+            xf86addListItem((glp) ptr->lay_input_lst, (glp) iptr);
     }
 
     {
-	XF86ConfInputrefPtr iptr;
-
-	iptr = malloc (sizeof (XF86ConfInputrefRec));
-	iptr->list.next = NULL;
-	iptr->iref_option_lst = NULL;
-	iptr->iref_inputdev_str = "Keyboard0";
-	iptr->iref_option_lst =
-		xf86addNewOption (iptr->iref_option_lst, strdup("CoreKeyboard"), NULL);
-	ptr->lay_input_lst = (XF86ConfInputrefPtr)
-		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);
-    }
-
-    for (scrnum = 0;  scrnum < nDevToConfig;  scrnum++) {
-	XF86ConfAdjacencyPtr aptr;
-
-	aptr = malloc (sizeof (XF86ConfAdjacencyRec));
-	aptr->list.next = NULL;
-	aptr->adj_x = 0;
-	aptr->adj_y = 0;
-	aptr->adj_scrnum = scrnum;
-	XNFasprintf(&aptr->adj_screen_str, "Screen%d", scrnum);
-	if (scrnum == 0) {
-	    aptr->adj_where = CONF_ADJ_ABSOLUTE;
-	    aptr->adj_refscreen = NULL;
-	}
-	else {
-	    aptr->adj_where = CONF_ADJ_RIGHTOF;
-	    XNFasprintf(&aptr->adj_refscreen, "Screen%d", scrnum - 1);
-	}
-    	ptr->lay_adjacency_lst =
-	    (XF86ConfAdjacencyPtr)xf86addListItem((glp)ptr->lay_adjacency_lst,
-					      (glp)aptr);
+        XF86ConfInputrefPtr iptr;
+
+        iptr = malloc(sizeof(XF86ConfInputrefRec));
+        iptr->list.next = NULL;
+        iptr->iref_option_lst = NULL;
+        iptr->iref_inputdev_str = "Keyboard0";
+        iptr->iref_option_lst =
+            xf86addNewOption(iptr->iref_option_lst, strdup("CoreKeyboard"),
+                             NULL);
+        ptr->lay_input_lst = (XF86ConfInputrefPtr)
+            xf86addListItem((glp) ptr->lay_input_lst, (glp) iptr);
+    }
+
+    for (scrnum = 0; scrnum < nDevToConfig; scrnum++) {
+        XF86ConfAdjacencyPtr aptr;
+
+        aptr = malloc(sizeof(XF86ConfAdjacencyRec));
+        aptr->list.next = NULL;
+        aptr->adj_x = 0;
+        aptr->adj_y = 0;
+        aptr->adj_scrnum = scrnum;
+        XNFasprintf(&aptr->adj_screen_str, "Screen%d", scrnum);
+        if (scrnum == 0) {
+            aptr->adj_where = CONF_ADJ_ABSOLUTE;
+            aptr->adj_refscreen = NULL;
+        }
+        else {
+            aptr->adj_where = CONF_ADJ_RIGHTOF;
+            XNFasprintf(&aptr->adj_refscreen, "Screen%d", scrnum - 1);
+        }
+        ptr->lay_adjacency_lst =
+            (XF86ConfAdjacencyPtr) xf86addListItem((glp) ptr->lay_adjacency_lst,
+                                                   (glp) aptr);
     }
 
     return ptr;
 }
 
 static XF86ConfFlagsPtr
-configureFlagsSection (void)
+configureFlagsSection(void)
 {
-    parsePrologue (XF86ConfFlagsPtr, XF86ConfFlagsRec)
+    parsePrologue(XF86ConfFlagsPtr, XF86ConfFlagsRec)
 
-    return ptr;
+        return ptr;
 }
 
 static XF86ConfModulePtr
-configureModuleSection (void)
+configureModuleSection(void)
 {
     char **elist, **el;
+
     /* Find the list of extension & font modules. */
     const char *esubdirs[] = {
-	"extensions",
-	"fonts",
-	NULL
+        "extensions",
+        "fonts",
+        NULL
     };
-    parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec)
+    parsePrologue(XF86ConfModulePtr, XF86ConfModuleRec)
 
-    elist = LoaderListDirs(esubdirs, NULL);
+        elist = LoaderListDirs(esubdirs, NULL);
     if (elist) {
-	for (el = elist; *el; el++) {
-	    XF86LoadPtr module;
-
-    	    module = calloc(1, sizeof(XF86LoadRec));
-    	    module->load_name = *el;
-            ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(
-                                (glp)ptr->mod_load_lst, (glp)module);
-    	}
-	free(elist);
+        for (el = elist; *el; el++) {
+            XF86LoadPtr module;
+
+            module = calloc(1, sizeof(XF86LoadRec));
+            module->load_name = *el;
+            ptr->mod_load_lst = (XF86LoadPtr) xf86addListItem((glp) ptr->
+                                                              mod_load_lst,
+                                                              (glp) module);
+        }
+        free(elist);
     }
 
     return ptr;
 }
 
 static XF86ConfFilesPtr
-configureFilesSection (void)
+configureFilesSection(void)
 {
-    parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec)
+    parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec)
+
+        if (xf86ModulePath)
+        ptr->file_modulepath = strdup(xf86ModulePath);
+    if (defaultFontPath)
+        ptr->file_fontpath = strdup(defaultFontPath);
 
-   if (xf86ModulePath)
-       ptr->file_modulepath = strdup(xf86ModulePath);
-   if (defaultFontPath)
-       ptr->file_fontpath = strdup(defaultFontPath);
-   
     return ptr;
 }
 
 static XF86ConfMonitorPtr
-configureMonitorSection (int screennum)
+configureMonitorSection(int screennum)
 {
-    parsePrologue (XF86ConfMonitorPtr, XF86ConfMonitorRec)
+    parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec)
 
-    XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);
+        XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);
     ptr->mon_vendor = strdup("Monitor Vendor");
     ptr->mon_modelname = strdup("Monitor Model");
 
@@ -430,29 +438,24 @@ configureMonitorSection (int screennum)
 }
 
 /* Initialize Configure Monitor from Detailed Timing Block */
-static void handle_detailed_input(struct detailed_monitor_section *det_mon,
-                                  void *data)
+static void
+handle_detailed_input(struct detailed_monitor_section *det_mon, void *data)
 {
     XF86ConfMonitorPtr ptr = (XF86ConfMonitorPtr) data;
 
     switch (det_mon->type) {
     case DS_NAME:
         ptr->mon_modelname = realloc(ptr->mon_modelname,
-                                     strlen((char*)(det_mon->section.name)) +
+                                     strlen((char *) (det_mon->section.name)) +
                                      1);
-        strcpy(ptr->mon_modelname,
-	      (char*)(det_mon->section.name));
+        strcpy(ptr->mon_modelname, (char *) (det_mon->section.name));
         break;
     case DS_RANGES:
-        ptr->mon_hsync[ptr->mon_n_hsync].lo =
-            det_mon->section.ranges.min_h;
-        ptr->mon_hsync[ptr->mon_n_hsync].hi =
-            det_mon->section.ranges.max_h;
+        ptr->mon_hsync[ptr->mon_n_hsync].lo = det_mon->section.ranges.min_h;
+        ptr->mon_hsync[ptr->mon_n_hsync].hi = det_mon->section.ranges.max_h;
         ptr->mon_n_vrefresh = 1;
-        ptr->mon_vrefresh[ptr->mon_n_hsync].lo =
-            det_mon->section.ranges.min_v;
-        ptr->mon_vrefresh[ptr->mon_n_hsync].hi =
-            det_mon->section.ranges.max_v;
+        ptr->mon_vrefresh[ptr->mon_n_hsync].lo = det_mon->section.ranges.min_v;
+        ptr->mon_vrefresh[ptr->mon_n_hsync].hi = det_mon->section.ranges.max_v;
         ptr->mon_n_hsync++;
     default:
         break;
@@ -460,53 +463,56 @@ static void handle_detailed_input(struct detailed_monitor_section *det_mon,
 }
 
 static XF86ConfMonitorPtr
-configureDDCMonitorSection (int screennum)
+configureDDCMonitorSection(int screennum)
 {
     int len, mon_width, mon_height;
+
 #define displaySizeMaxLen 80
     char displaySize_string[displaySizeMaxLen];
     int displaySizeLen;
 
-    parsePrologue (XF86ConfMonitorPtr, XF86ConfMonitorRec)
+    parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec)
 
-    XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);
+        XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);
     ptr->mon_vendor = strdup(ConfiguredMonitor->vendor.name);
     XNFasprintf(&ptr->mon_modelname, "%x", ConfiguredMonitor->vendor.prod_id);
 
     /* features in centimetres, we want millimetres */
-    mon_width  = 10 * ConfiguredMonitor->features.hsize ;
-    mon_height = 10 * ConfiguredMonitor->features.vsize ;
+    mon_width = 10 * ConfiguredMonitor->features.hsize;
+    mon_height = 10 * ConfiguredMonitor->features.vsize;
 
 #ifdef CONFIGURE_DISPLAYSIZE
-    ptr->mon_width  = mon_width;
+    ptr->mon_width = mon_width;
     ptr->mon_height = mon_height;
 #else
     if (mon_width && mon_height) {
-      /* when values available add DisplaySize option AS A COMMENT */
-
-      displaySizeLen = snprintf(displaySize_string, displaySizeMaxLen,
-				"\t#DisplaySize\t%5d %5d\t# mm\n",
-				mon_width, mon_height);
-
-      if (displaySizeLen>0 && displaySizeLen<displaySizeMaxLen) {
-	if (ptr->mon_comment) {
-	  len = strlen(ptr->mon_comment);
-	} else {
-	  len = 0;
-	}
-	if ((ptr->mon_comment =
-	     realloc(ptr->mon_comment, len + strlen(displaySize_string) + 1))) {
-	  strcpy(ptr->mon_comment + len, displaySize_string);
-	}
-      }
+        /* when values available add DisplaySize option AS A COMMENT */
+
+        displaySizeLen = snprintf(displaySize_string, displaySizeMaxLen,
+                                  "\t#DisplaySize\t%5d %5d\t# mm\n",
+                                  mon_width, mon_height);
+
+        if (displaySizeLen > 0 && displaySizeLen < displaySizeMaxLen) {
+            if (ptr->mon_comment) {
+                len = strlen(ptr->mon_comment);
+            }
+            else {
+                len = 0;
+            }
+            if ((ptr->mon_comment =
+                 realloc(ptr->mon_comment,
+                         len + strlen(displaySize_string) + 1))) {
+                strcpy(ptr->mon_comment + len, displaySize_string);
+            }
+        }
     }
-#endif /* def CONFIGURE_DISPLAYSIZE */
+#endif                          /* def CONFIGURE_DISPLAYSIZE */
 
-    xf86ForEachDetailedBlock(ConfiguredMonitor, handle_detailed_input,
-                             ptr);
+    xf86ForEachDetailedBlock(ConfiguredMonitor, handle_detailed_input, ptr);
 
     if (ConfiguredMonitor->features.dpms) {
-      ptr->mon_option_lst = xf86addNewOption(ptr->mon_option_lst, strdup("DPMS"), NULL);
+        ptr->mon_option_lst =
+            xf86addNewOption(ptr->mon_option_lst, strdup("DPMS"), NULL);
     }
 
     return ptr;
@@ -515,7 +521,7 @@ configureDDCMonitorSection (int screennum)
 void
 DoConfigure(void)
 {
-    int i,j, screennum = -1;
+    int i, j, screennum = -1;
     const char *home = NULL;
     char filename[PATH_MAX];
     const char *addslash = "";
@@ -526,13 +532,13 @@ DoConfigure(void)
     vlist = xf86DriverlistFromCompile();
 
     if (!vlist) {
-	ErrorF("Missing output drivers.  Configuration failed.\n");
-	goto bail;
+        ErrorF("Missing output drivers.  Configuration failed.\n");
+        goto bail;
     }
 
     ErrorF("List of video drivers:\n");
     for (vl = vlist; *vl; vl++)
-	ErrorF("\t%s\n", *vl);
+        ErrorF("\t%s\n", *vl);
 
     /* Load all the drivers that were found. */
     xf86LoadModules(vlist, NULL);
@@ -540,65 +546,71 @@ DoConfigure(void)
     free(vlist);
 
     for (i = 0; i < xf86NumDrivers; i++) {
-	xorgHWFlags flags;
-	if (!xf86DriverList[i]->driverFunc
-	    || !xf86DriverList[i]->driverFunc(NULL,
-					      GET_REQUIRED_HW_INTERFACES,
-					      &flags)
-	    || NEED_IO_ENABLED(flags)) {
-	    xorgHWAccess = TRUE;
-	    break;
-	}
+        xorgHWFlags flags;
+
+        if (!xf86DriverList[i]->driverFunc
+            || !xf86DriverList[i]->driverFunc(NULL,
+                                              GET_REQUIRED_HW_INTERFACES,
+                                              &flags)
+            || NEED_IO_ENABLED(flags)) {
+            xorgHWAccess = TRUE;
+            break;
+        }
     }
     /* Enable full I/O access */
     if (xorgHWAccess) {
-	if(!xf86EnableIO())
-	    /* oops, we have failed */
-	    xorgHWAccess = FALSE;
+        if (!xf86EnableIO())
+            /* oops, we have failed */
+            xorgHWAccess = FALSE;
     }
 
     /* Create XF86Config file structure */
     xf86config = calloc(1, sizeof(XF86ConfigRec));
 
     /* Call all of the probe functions, reporting the results. */
-    for (CurrentDriver = 0;  CurrentDriver < xf86NumDrivers;  CurrentDriver++) {
-	xorgHWFlags flags;
-	Bool found_screen;
-	DriverRec * const drv = xf86DriverList[CurrentDriver];
-
-	if (!xorgHWAccess) {
-	    if (!drv->driverFunc
-		|| !drv->driverFunc( NULL, GET_REQUIRED_HW_INTERFACES, &flags )
-		|| NEED_IO_ENABLED(flags)) 
-		continue;
-	}
-	
-	found_screen = xf86CallDriverProbe( drv, TRUE );
-	if ( found_screen && drv->Identify ) {
-	    (*drv->Identify)(0);
-	}
+    for (CurrentDriver = 0; CurrentDriver < xf86NumDrivers; CurrentDriver++) {
+        xorgHWFlags flags;
+        Bool found_screen;
+        DriverRec *const drv = xf86DriverList[CurrentDriver];
+
+        if (!xorgHWAccess) {
+            if (!drv->driverFunc
+                || !drv->driverFunc(NULL, GET_REQUIRED_HW_INTERFACES, &flags)
+                || NEED_IO_ENABLED(flags))
+                continue;
+        }
+
+        found_screen = xf86CallDriverProbe(drv, TRUE);
+        if (found_screen && drv->Identify) {
+            (*drv->Identify) (0);
+        }
     }
 
     if (nDevToConfig <= 0) {
-	ErrorF("No devices to configure.  Configuration failed.\n");
-	goto bail;
+        ErrorF("No devices to configure.  Configuration failed.\n");
+        goto bail;
     }
 
     /* Add device, monitor and screen sections for detected devices */
-    for (screennum = 0;  screennum < nDevToConfig;  screennum++) {
-    	XF86ConfDevicePtr DevicePtr;
-	XF86ConfMonitorPtr MonitorPtr;
-	XF86ConfScreenPtr ScreenPtr;
-
-	DevicePtr = configureDeviceSection(screennum);
-    	xf86config->conf_device_lst = (XF86ConfDevicePtr)xf86addListItem(
-			    (glp)xf86config->conf_device_lst, (glp)DevicePtr);
-	MonitorPtr = configureMonitorSection(screennum);
-    	xf86config->conf_monitor_lst = (XF86ConfMonitorPtr)xf86addListItem(
-			    (glp)xf86config->conf_monitor_lst, (glp)MonitorPtr);
-	ScreenPtr = configureScreenSection(screennum);
-    	xf86config->conf_screen_lst = (XF86ConfScreenPtr)xf86addListItem(
-			    (glp)xf86config->conf_screen_lst, (glp)ScreenPtr);
+    for (screennum = 0; screennum < nDevToConfig; screennum++) {
+        XF86ConfDevicePtr DevicePtr;
+        XF86ConfMonitorPtr MonitorPtr;
+        XF86ConfScreenPtr ScreenPtr;
+
+        DevicePtr = configureDeviceSection(screennum);
+        xf86config->conf_device_lst = (XF86ConfDevicePtr) xf86addListItem((glp)
+                                                                          xf86config->
+                                                                          conf_device_lst,
+                                                                          (glp)
+                                                                          DevicePtr);
+        MonitorPtr = configureMonitorSection(screennum);
+        xf86config->conf_monitor_lst = (XF86ConfMonitorPtr) xf86addListItem((glp) xf86config->conf_monitor_lst, (glp) MonitorPtr);
+        ScreenPtr = configureScreenSection(screennum);
+        xf86config->conf_screen_lst = (XF86ConfScreenPtr) xf86addListItem((glp)
+                                                                          xf86config->
+                                                                          conf_screen_lst,
+                                                                          (glp)
+                                                                          ScreenPtr);
     }
 
     xf86config->conf_files = configureFilesSection();
@@ -613,91 +625,95 @@ DoConfigure(void)
 
     home = getenv("HOME");
     if ((home == NULL) || (home[0] == '\0')) {
-    	home = "/";
-    } else {
-	/* Determine if trailing slash is present or needed */
-	int l = strlen(home);
+        home = "/";
+    }
+    else {
+        /* Determine if trailing slash is present or needed */
+        int l = strlen(home);
 
-	if (home[l-1] != '/') {
-	    addslash = "/";
-	}
+        if (home[l - 1] != '/') {
+            addslash = "/";
+        }
     }
 
     snprintf(filename, sizeof(filename), "%s%s" XF86CONFIGFILE ".new",
-	     home, addslash);
+             home, addslash);
 
     if (xf86writeConfigFile(filename, xf86config) == 0) {
-	xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",
-		filename, strerror(errno));
-	goto bail;
+        xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",
+                filename, strerror(errno));
+        goto bail;
     }
 
     xf86DoConfigurePass1 = FALSE;
     /* Try to get DDC information filled in */
     xf86ConfigFile = filename;
     if (xf86HandleConfigFile(FALSE) != CONFIG_OK) {
-	goto bail;
+        goto bail;
     }
 
     xf86DoConfigurePass1 = FALSE;
-    
-    dev2screen = xnfcalloc(1,xf86NumDrivers*sizeof(int));
+
+    dev2screen = xnfcalloc(1, xf86NumDrivers * sizeof(int));
 
     {
-	Bool *driverProbed = xnfcalloc(1,xf86NumDrivers*sizeof(Bool));
-	for (screennum = 0;  screennum < nDevToConfig;  screennum++) {
-	    int k,l,n,oldNumScreens;
-
-	    i = DevToConfig[screennum].iDriver;
-
-	    if (driverProbed[i]) continue;
-	    driverProbed[i] = TRUE;
-	    
-	    oldNumScreens = xf86NumScreens;
-
-	    xf86CallDriverProbe( xf86DriverList[i], FALSE );
-
-	    /* reorder */
-	    k = screennum > 0 ? screennum : 1;
-	    for (l = oldNumScreens; l < xf86NumScreens; l++) {
-	        /* is screen primary? */
-	        Bool primary = FALSE;
-		for (n = 0; n<xf86Screens[l]->numEntities; n++) {
-	            if (xf86IsEntityPrimary(xf86Screens[l]->entityList[n])) {
-		        dev2screen[0] = l;
-			primary = TRUE;
-			break;
-		    }
-		}
-		if (primary) continue;
-		/* not primary: assign it to next device of same driver */
-		/* 
-		 * NOTE: we assume that devices in DevToConfig 
-		 * and xf86Screens[] have the same order except
-		 * for the primary device which always comes first.
-		 */
-		for (; k < nDevToConfig; k++) {
-		    if (DevToConfig[k].iDriver == i) {
-		        dev2screen[k++] = l;
-			break;
-		    }
-		}
-	    }
-	}
-	free(driverProbed);
-    }
-    
+        Bool *driverProbed = xnfcalloc(1, xf86NumDrivers * sizeof(Bool));
+
+        for (screennum = 0; screennum < nDevToConfig; screennum++) {
+            int k, l, n, oldNumScreens;
+
+            i = DevToConfig[screennum].iDriver;
+
+            if (driverProbed[i])
+                continue;
+            driverProbed[i] = TRUE;
+
+            oldNumScreens = xf86NumScreens;
+
+            xf86CallDriverProbe(xf86DriverList[i], FALSE);
+
+            /* reorder */
+            k = screennum > 0 ? screennum : 1;
+            for (l = oldNumScreens; l < xf86NumScreens; l++) {
+                /* is screen primary? */
+                Bool primary = FALSE;
+
+                for (n = 0; n < xf86Screens[l]->numEntities; n++) {
+                    if (xf86IsEntityPrimary(xf86Screens[l]->entityList[n])) {
+                        dev2screen[0] = l;
+                        primary = TRUE;
+                        break;
+                    }
+                }
+                if (primary)
+                    continue;
+                /* not primary: assign it to next device of same driver */
+                /* 
+                 * NOTE: we assume that devices in DevToConfig 
+                 * and xf86Screens[] have the same order except
+                 * for the primary device which always comes first.
+                 */
+                for (; k < nDevToConfig; k++) {
+                    if (DevToConfig[k].iDriver == i) {
+                        dev2screen[k++] = l;
+                        break;
+                    }
+                }
+            }
+        }
+        free(driverProbed);
+    }
 
     if (nDevToConfig != xf86NumScreens) {
-	ErrorF("Number of created screens does not match number of detected"
-	       " devices.\n  Configuration failed.\n");
-	goto bail;
+        ErrorF("Number of created screens does not match number of detected"
+               " devices.\n  Configuration failed.\n");
+        goto bail;
     }
 
     xf86PostProbe();
 
     for (j = 0; j < xf86NumScreens; j++) {
-	xf86Screens[j]->scrnIndex = j;
+        xf86Screens[j]->scrnIndex = j;
     }
 
     xf86freeMonitorList(xf86config->conf_monitor_lst);
@@ -705,53 +721,57 @@ DoConfigure(void)
     xf86freeScreenList(xf86config->conf_screen_lst);
     xf86config->conf_screen_lst = NULL;
     for (j = 0; j < xf86NumScreens; j++) {
-	XF86ConfMonitorPtr MonitorPtr;
-	XF86ConfScreenPtr ScreenPtr;
+        XF86ConfMonitorPtr MonitorPtr;
+        XF86ConfScreenPtr ScreenPtr;
 
-	ConfiguredMonitor = NULL;
+        ConfiguredMonitor = NULL;
 
-	if ((*xf86Screens[dev2screen[j]]->PreInit)(xf86Screens[dev2screen[j]], 
-						   PROBE_DETECT) &&
-	    ConfiguredMonitor) {
-	    MonitorPtr = configureDDCMonitorSection(j);
-	} else {
-	    MonitorPtr = configureMonitorSection(j);
-	}
-	ScreenPtr = configureScreenSection(j);
-	xf86config->conf_monitor_lst = (XF86ConfMonitorPtr)xf86addListItem(
-		(glp)xf86config->conf_monitor_lst, (glp)MonitorPtr);
-	xf86config->conf_screen_lst = (XF86ConfScreenPtr)xf86addListItem(
-		(glp)xf86config->conf_screen_lst, (glp)ScreenPtr);
+        if ((*xf86Screens[dev2screen[j]]->PreInit) (xf86Screens[dev2screen[j]],
+                                                    PROBE_DETECT) &&
+            ConfiguredMonitor) {
+            MonitorPtr = configureDDCMonitorSection(j);
+        }
+        else {
+            MonitorPtr = configureMonitorSection(j);
+        }
+        ScreenPtr = configureScreenSection(j);
+
+        xf86config->conf_monitor_lst = (XF86ConfMonitorPtr) xf86addListItem((glp) xf86config->conf_monitor_lst, (glp) MonitorPtr);
+        xf86config->conf_screen_lst = (XF86ConfScreenPtr) xf86addListItem((glp)
+                                                                          xf86config->
+                                                                          conf_screen_lst,
+                                                                          (glp)
+                                                                          ScreenPtr);
     }
 
     if (xf86writeConfigFile(filename, xf86config) == 0) {
-	xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",
-		filename, strerror(errno));
-	goto bail;
+        xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",
+                filename, strerror(errno));
+        goto bail;
     }
 
     ErrorF("\n");
 
     if (!foundMouse) {
-	ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n"
-		"Edit the file and correct the Device.\n");
-    } else {
-	ErrorF("\n"__XSERVERNAME__" detected your mouse at device %s.\n"
-		"Please check your config if the mouse is still not\n"
-		"operational, as by default "__XSERVERNAME__
-	       " tries to autodetect\n"
-		"the protocol.\n",DFLT_MOUSE_DEV);
+        ErrorF("\n" __XSERVERNAME__ " is not able to detect your mouse.\n"
+               "Edit the file and correct the Device.\n");
+    }
+    else {
+        ErrorF("\n" __XSERVERNAME__ " detected your mouse at device %s.\n"
+               "Please check your config if the mouse is still not\n"
+               "operational, as by default " __XSERVERNAME__
+               " tries to autodetect\n" "the protocol.\n", DFLT_MOUSE_DEV);
     }
 
     if (xf86NumScreens > 1) {
-	ErrorF("\n"__XSERVERNAME__
-	       " has configured a multihead system, please check your config.\n");
+        ErrorF("\n" __XSERVERNAME__
+               " has configured a multihead system, please check your config.\n");
     }
 
-    ErrorF("\nYour %s file is %s\n\n", XF86CONFIGFILE ,filename);
+    ErrorF("\nYour %s file is %s\n\n", XF86CONFIGFILE, filename);
     ErrorF("To test the server, run 'X -config %s'\n\n", filename);
 
-bail:
+ bail:
     OsCleanup(TRUE);
     AbortDDX(EXIT_ERR_CONFIGURE);
     fflush(stderr);
@@ -765,47 +785,48 @@ bail:
  * Author:  Marcus Schaefer, ms@suse.de
  */
 
-void DoShowOptions (void) {
-	int  i = 0;
-	char **vlist  = 0;
-	char *pSymbol = 0;
-	XF86ModuleData *initData = 0;
-	if (! (vlist = xf86DriverlistFromCompile())) {
-		ErrorF("Missing output drivers\n");
-		goto bail;
-	}
-	xf86LoadModules (vlist,0);
-	free(vlist);
-	for (i = 0; i < xf86NumDrivers; i++) {
-		if (xf86DriverList[i]->AvailableOptions) {
-			const OptionInfoRec *pOption =
-			    (*xf86DriverList[i]->AvailableOptions)(0,0);
-			if (! pOption) {
-				ErrorF ("(EE) Couldn't read option table for %s driver\n",
-					xf86DriverList[i]->driverName
-				);
-				continue;
-			}
-			XNFasprintf(&pSymbol, "%sModuleData",
-				    xf86DriverList[i]->driverName);
-			initData = LoaderSymbol (pSymbol);
-			if (initData) {
-				XF86ModuleVersionInfo *vers = initData->vers;
-				const OptionInfoRec *p;
-				ErrorF ("Driver[%d]:%s[%s] {\n",
-					i,xf86DriverList[i]->driverName,vers->vendor
-				);
-				for (p = pOption; p->name != NULL; p++) {
-					ErrorF ("\t%s:%s\n", p->name,
-						optionTypeToString(p->type));
-				}
-				ErrorF ("}\n");
-			}
-		}
-	}
-	bail:
-	OsCleanup (TRUE);
-	AbortDDX (EXIT_ERR_DRIVERS);
-	fflush (stderr);
-	exit (0);
+void
+DoShowOptions(void)
+{
+    int i = 0;
+    char **vlist = 0;
+    char *pSymbol = 0;
+    XF86ModuleData *initData = 0;
+
+    if (!(vlist = xf86DriverlistFromCompile())) {
+        ErrorF("Missing output drivers\n");
+        goto bail;
+    }
+    xf86LoadModules(vlist, 0);
+    free(vlist);
+    for (i = 0; i < xf86NumDrivers; i++) {
+        if (xf86DriverList[i]->AvailableOptions) {
+            const OptionInfoRec *pOption =
+                (*xf86DriverList[i]->AvailableOptions) (0, 0);
+            if (!pOption) {
+                ErrorF("(EE) Couldn't read option table for %s driver\n",
+                       xf86DriverList[i]->driverName);
+                continue;
+            }
+            XNFasprintf(&pSymbol, "%sModuleData",
+                        xf86DriverList[i]->driverName);
+            initData = LoaderSymbol(pSymbol);
+            if (initData) {
+                XF86ModuleVersionInfo *vers = initData->vers;
+                const OptionInfoRec *p;
+
+                ErrorF("Driver[%d]:%s[%s] {\n",
+                       i, xf86DriverList[i]->driverName, vers->vendor);
+                for (p = pOption; p->name != NULL; p++) {
+                    ErrorF("\t%s:%s\n", p->name, optionTypeToString(p->type));
+                }
+                ErrorF("}\n");
+            }
+        }
+    }
+ bail:
+    OsCleanup(TRUE);
+    AbortDDX(EXIT_ERR_DRIVERS);
+    fflush(stderr);
+    exit(0);
 }
diff --git a/xorg-server/hw/xfree86/common/xf86Cursor.c b/xorg-server/hw/xfree86/common/xf86Cursor.c
index 6f5d726f0..3716434f0 100644
--- a/xorg-server/hw/xfree86/common/xf86Cursor.c
+++ b/xorg-server/hw/xfree86/common/xf86Cursor.c
@@ -51,15 +51,15 @@
 #endif
 
 typedef struct _xf86EdgeRec {
-   short screen;
-   short start;
-   short end;
-   DDXPointRec offset;
-   struct _xf86EdgeRec *next;
+    short screen;
+    short start;
+    short end;
+    DDXPointRec offset;
+    struct _xf86EdgeRec *next;
 } xf86EdgeRec, *xf86EdgePtr;
 
 typedef struct {
-    xf86EdgePtr	left, right, up, down;
+    xf86EdgePtr left, right, up, down;
 } xf86ScreenLayoutRec, *xf86ScreenLayoutPtr;
 
 static Bool xf86CursorOffScreen(ScreenPtr *pScreen, int *x, int *y);
@@ -69,12 +69,12 @@ static void xf86WarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
 static void xf86PointerMoved(int scrnIndex, int x, int y);
 
 static miPointerScreenFuncRec xf86PointerScreenFuncs = {
-  xf86CursorOffScreen,
-  xf86CrossScreen,
-  xf86WarpCursor,
-  /* let miPointerInitialize take care of these */
-  NULL,
-  NULL
+    xf86CursorOffScreen,
+    xf86CrossScreen,
+    xf86WarpCursor,
+    /* let miPointerInitialize take care of these */
+    NULL,
+    NULL
 };
 
 static xf86ScreenLayoutRec xf86ScreenLayout[MAXSCREENS];
@@ -92,41 +92,39 @@ void
 xf86InitViewport(ScrnInfoPtr pScr)
 {
 
-  pScr->PointerMoved = xf86PointerMoved;
-
-  /*
-   * Compute the initial Viewport if necessary
-   */
-  if (pScr->display) {
-    if (pScr->display->frameX0 < 0) {
-      pScr->frameX0 = (pScr->virtualX - pScr->modes->HDisplay) / 2;
-      pScr->frameY0 = (pScr->virtualY - pScr->modes->VDisplay) / 2;
-    } else {
-      pScr->frameX0 = pScr->display->frameX0;
-      pScr->frameY0 = pScr->display->frameY0;
+    pScr->PointerMoved = xf86PointerMoved;
+
+    /*
+     * Compute the initial Viewport if necessary
+     */
+    if (pScr->display) {
+        if (pScr->display->frameX0 < 0) {
+            pScr->frameX0 = (pScr->virtualX - pScr->modes->HDisplay) / 2;
+            pScr->frameY0 = (pScr->virtualY - pScr->modes->VDisplay) / 2;
+        }
+        else {
+            pScr->frameX0 = pScr->display->frameX0;
+            pScr->frameY0 = pScr->display->frameY0;
+        }
     }
-  }
-
-  pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;
-  pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;
-
-  /*
-   * Now adjust the initial Viewport, so it lies within the virtual area
-   */
-  if (pScr->frameX1 >= pScr->virtualX)
-    {
-	pScr->frameX0 = pScr->virtualX - pScr->modes->HDisplay;
-	pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;
+
+    pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;
+    pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;
+
+    /*
+     * Now adjust the initial Viewport, so it lies within the virtual area
+     */
+    if (pScr->frameX1 >= pScr->virtualX) {
+        pScr->frameX0 = pScr->virtualX - pScr->modes->HDisplay;
+        pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;
     }
 
-  if (pScr->frameY1 >= pScr->virtualY)
-    {
-	pScr->frameY0 = pScr->virtualY - pScr->modes->VDisplay;
-	pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;
+    if (pScr->frameY1 >= pScr->virtualY) {
+        pScr->frameY0 = pScr->virtualY - pScr->modes->VDisplay;
+        pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;
     }
 }
 
-
 /*
  * xf86SetViewport --
  *      Scroll the visual part of the screen so the pointer is visible.
@@ -135,48 +133,47 @@ xf86InitViewport(ScrnInfoPtr pScr)
 void
 xf86SetViewport(ScreenPtr pScreen, int x, int y)
 {
-  ScrnInfoPtr   pScr = XF86SCRNINFO(pScreen);
+    ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
 
-  (*pScr->PointerMoved)(pScreen->myNum, x, y);
+    (*pScr->PointerMoved) (pScreen->myNum, x, y);
 }
 
-
-static void 
+static void
 xf86PointerMoved(int scrnIndex, int x, int y)
 {
-  Bool          frameChanged = FALSE;
-  ScrnInfoPtr   pScr = xf86Screens[scrnIndex];
-
-  /*
-   * check wether (x,y) belongs to the visual part of the screen
-   * if not, change the base of the displayed frame accoring
-   */
-  if ( pScr->frameX0 > x) { 
-    pScr->frameX0 = x;
-    pScr->frameX1 = x + pScr->currentMode->HDisplay - 1;
-    frameChanged = TRUE ;
-  }
-  
-  if ( pScr->frameX1 < x) { 
-    pScr->frameX1 = x + 1;
-    pScr->frameX0 = x - pScr->currentMode->HDisplay + 1;
-    frameChanged = TRUE ;
-  }
-  
-  if ( pScr->frameY0 > y) { 
-    pScr->frameY0 = y;
-    pScr->frameY1 = y + pScr->currentMode->VDisplay - 1;
-    frameChanged = TRUE;
-  }
-  
-  if ( pScr->frameY1 < y) { 
-    pScr->frameY1 = y;
-    pScr->frameY0 = y - pScr->currentMode->VDisplay + 1;
-    frameChanged = TRUE; 
-  }
-  
-  if (frameChanged && pScr->AdjustFrame != NULL)
-    pScr->AdjustFrame(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
+    Bool frameChanged = FALSE;
+    ScrnInfoPtr pScr = xf86Screens[scrnIndex];
+
+    /*
+     * check wether (x,y) belongs to the visual part of the screen
+     * if not, change the base of the displayed frame accoring
+     */
+    if (pScr->frameX0 > x) {
+        pScr->frameX0 = x;
+        pScr->frameX1 = x + pScr->currentMode->HDisplay - 1;
+        frameChanged = TRUE;
+    }
+
+    if (pScr->frameX1 < x) {
+        pScr->frameX1 = x + 1;
+        pScr->frameX0 = x - pScr->currentMode->HDisplay + 1;
+        frameChanged = TRUE;
+    }
+
+    if (pScr->frameY0 > y) {
+        pScr->frameY0 = y;
+        pScr->frameY1 = y + pScr->currentMode->VDisplay - 1;
+        frameChanged = TRUE;
+    }
+
+    if (pScr->frameY1 < y) {
+        pScr->frameY1 = y;
+        pScr->frameY0 = y - pScr->currentMode->VDisplay + 1;
+        frameChanged = TRUE;
+    }
+
+    if (frameChanged && pScr->AdjustFrame != NULL)
+        pScr->AdjustFrame(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
 }
 
 /*
@@ -187,7 +184,7 @@ xf86PointerMoved(int scrnIndex, int x, int y)
 void
 xf86LockZoom(ScreenPtr pScreen, Bool lock)
 {
-  XF86SCRNINFO(pScreen)->zoomLocked = lock;
+    XF86SCRNINFO(pScreen)->zoomLocked = lock;
 }
 
 /*
@@ -199,121 +196,118 @@ xf86LockZoom(ScreenPtr pScreen, Bool lock)
 Bool
 xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
 {
-  ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
-  ScreenPtr   pCursorScreen;
-  Bool        Switched;
-  int         px, py, was_blocked;
-  DeviceIntPtr dev, it;
+    ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
+    ScreenPtr pCursorScreen;
+    Bool Switched;
+    int px, py, was_blocked;
+    DeviceIntPtr dev, it;
 
-  if (!pScr->vtSema || !mode || !pScr->SwitchMode)
-    return FALSE;
+    if (!pScr->vtSema || !mode || !pScr->SwitchMode)
+        return FALSE;
 
 #ifdef XFreeXDGA
-  if (DGAActive(pScr->scrnIndex))
-    return FALSE;
+    if (DGAActive(pScr->scrnIndex))
+        return FALSE;
 #endif
 
-  if (mode == pScr->currentMode)
-    return TRUE;
-
-  if (mode->HDisplay > pScr->virtualX || mode->VDisplay > pScr->virtualY)
-    return FALSE;
-
-  /* Let's take an educated guess for which pointer to take here. And about as
-     educated as it gets is to take the first pointer we find.
-   */
-  for (dev = inputInfo.devices; dev; dev = dev->next)
-  {
-      if (IsPointerDevice(dev) && dev->spriteInfo->spriteOwner)
-          break;
-  }
-
-  pCursorScreen = miPointerGetScreen(dev);
-  if (pScreen == pCursorScreen)
-    miPointerGetPosition(dev, &px, &py);
+    if (mode == pScr->currentMode)
+        return TRUE;
 
-  was_blocked = xf86BlockSIGIO();
-  Switched = (*pScr->SwitchMode)(pScr->scrnIndex, mode, 0);
-  if (Switched) {
-    pScr->currentMode = mode;
+    if (mode->HDisplay > pScr->virtualX || mode->VDisplay > pScr->virtualY)
+        return FALSE;
 
-    /*
-     * Adjust frame for new display size.
-     * Frame is centered around cursor position if cursor is on same screen.
+    /* Let's take an educated guess for which pointer to take here. And about as
+       educated as it gets is to take the first pointer we find.
      */
-    if (pScreen == pCursorScreen)
-      pScr->frameX0 = px - (mode->HDisplay / 2) + 1;
-    else
-      pScr->frameX0 = (pScr->frameX0 + pScr->frameX1 + 1 - mode->HDisplay) / 2;
-
-    if (pScr->frameX0 < 0)
-      pScr->frameX0 = 0;
-
-    pScr->frameX1 = pScr->frameX0 + mode->HDisplay - 1;
-    if (pScr->frameX1 >= pScr->virtualX) {
-      pScr->frameX0 = pScr->virtualX - mode->HDisplay;
-      pScr->frameX1 = pScr->virtualX - 1;
+    for (dev = inputInfo.devices; dev; dev = dev->next) {
+        if (IsPointerDevice(dev) && dev->spriteInfo->spriteOwner)
+            break;
     }
 
+    pCursorScreen = miPointerGetScreen(dev);
     if (pScreen == pCursorScreen)
-      pScr->frameY0 = py - (mode->VDisplay / 2) + 1;
-    else
-      pScr->frameY0 = (pScr->frameY0 + pScr->frameY1 + 1 - mode->VDisplay) / 2;
+        miPointerGetPosition(dev, &px, &py);
+
+    was_blocked = xf86BlockSIGIO();
+    Switched = (*pScr->SwitchMode) (pScr->scrnIndex, mode, 0);
+    if (Switched) {
+        pScr->currentMode = mode;
+
+        /*
+         * Adjust frame for new display size.
+         * Frame is centered around cursor position if cursor is on same screen.
+         */
+        if (pScreen == pCursorScreen)
+            pScr->frameX0 = px - (mode->HDisplay / 2) + 1;
+        else
+            pScr->frameX0 =
+                (pScr->frameX0 + pScr->frameX1 + 1 - mode->HDisplay) / 2;
+
+        if (pScr->frameX0 < 0)
+            pScr->frameX0 = 0;
+
+        pScr->frameX1 = pScr->frameX0 + mode->HDisplay - 1;
+        if (pScr->frameX1 >= pScr->virtualX) {
+            pScr->frameX0 = pScr->virtualX - mode->HDisplay;
+            pScr->frameX1 = pScr->virtualX - 1;
+        }
+
+        if (pScreen == pCursorScreen)
+            pScr->frameY0 = py - (mode->VDisplay / 2) + 1;
+        else
+            pScr->frameY0 =
+                (pScr->frameY0 + pScr->frameY1 + 1 - mode->VDisplay) / 2;
+
+        if (pScr->frameY0 < 0)
+            pScr->frameY0 = 0;
+
+        pScr->frameY1 = pScr->frameY0 + mode->VDisplay - 1;
+        if (pScr->frameY1 >= pScr->virtualY) {
+            pScr->frameY0 = pScr->virtualY - mode->VDisplay;
+            pScr->frameY1 = pScr->virtualY - 1;
+        }
+    }
+    xf86UnblockSIGIO(was_blocked);
 
-    if (pScr->frameY0 < 0)
-      pScr->frameY0 = 0;
+    if (pScr->AdjustFrame)
+        (*pScr->AdjustFrame) (pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
 
-    pScr->frameY1 = pScr->frameY0 + mode->VDisplay - 1;
-    if (pScr->frameY1 >= pScr->virtualY) {
-      pScr->frameY0 = pScr->virtualY - mode->VDisplay;
-      pScr->frameY1 = pScr->virtualY - 1;
+    /* The original code centered the frame around the cursor if possible.
+     * Since this is hard to achieve with multiple cursors, we do the following:
+     *   - center around the first pointer
+     *   - move all other pointers to the nearest edge on the screen (or leave
+     *   them unmodified if they are within the boundaries).
+     */
+    if (pScreen == pCursorScreen) {
+        xf86WarpCursor(dev, pScreen, px, py);
+    }
+
+    for (it = inputInfo.devices; it; it = it->next) {
+        if (it == dev)
+            continue;
+
+        if (IsPointerDevice(it) && it->spriteInfo->spriteOwner) {
+            pCursorScreen = miPointerGetScreen(it);
+            if (pScreen == pCursorScreen) {
+                miPointerGetPosition(it, &px, &py);
+                if (px < pScr->frameX0)
+                    px = pScr->frameX0;
+                else if (px > pScr->frameX1)
+                    px = pScr->frameX1;
+
+                if (py < pScr->frameY0)
+                    py = pScr->frameY0;
+                else if (py > pScr->frameY1)
+                    py = pScr->frameY1;
+
+                xf86WarpCursor(it, pScreen, px, py);
+            }
+        }
     }
-  }
-  xf86UnblockSIGIO(was_blocked);
-
-  if (pScr->AdjustFrame)
-    (*pScr->AdjustFrame)(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
-
-  /* The original code centered the frame around the cursor if possible.
-   * Since this is hard to achieve with multiple cursors, we do the following:
-   *   - center around the first pointer
-   *   - move all other pointers to the nearest edge on the screen (or leave
-   *   them unmodified if they are within the boundaries).
-   */
-  if (pScreen == pCursorScreen)
-  {
-      xf86WarpCursor(dev, pScreen, px, py);
-  }
-
-  for (it = inputInfo.devices; it; it = it->next)
-  {
-      if (it == dev)
-          continue;
-
-      if (IsPointerDevice(it) && it->spriteInfo->spriteOwner)
-      {
-          pCursorScreen = miPointerGetScreen(it);
-          if (pScreen == pCursorScreen)
-          {
-              miPointerGetPosition(it, &px, &py);
-              if (px < pScr->frameX0)
-                  px = pScr->frameX0;
-              else if (px > pScr->frameX1)
-                  px = pScr->frameX1;
-
-              if(py < pScr->frameY0)
-                  py = pScr->frameY0;
-              else if(py > pScr->frameY1)
-                  py = pScr->frameY1;
-
-              xf86WarpCursor(it, pScreen, px, py);
-          }
-      }
-  }
-
-  return Switched;
+
+    return Switched;
 }
-    
+
 /*
  * xf86ZoomViewport --
  *      Reinitialize the visual part of the screen for another mode.
@@ -322,31 +316,30 @@ xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
 void
 xf86ZoomViewport(ScreenPtr pScreen, int zoom)
 {
-  ScrnInfoPtr    pScr = XF86SCRNINFO(pScreen);
-  DisplayModePtr mode;
+    ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
+    DisplayModePtr mode;
 
-  if (pScr->zoomLocked || !(mode = pScr->currentMode))
-    return;
+    if (pScr->zoomLocked || !(mode = pScr->currentMode))
+        return;
 
-  do {
-    if (zoom > 0)
-      mode = mode->next;
-    else
-      mode = mode->prev;
-  } while (mode != pScr->currentMode && !(mode->type & M_T_USERDEF));
+    do {
+        if (zoom > 0)
+            mode = mode->next;
+        else
+            mode = mode->prev;
+    } while (mode != pScr->currentMode && !(mode->type & M_T_USERDEF));
 
-  (void)xf86SwitchMode(pScreen, mode);
+    (void) xf86SwitchMode(pScreen, mode);
 }
 
-
 static xf86EdgePtr
 FindEdge(xf86EdgePtr edge, int val)
 {
-    while(edge && (edge->end <= val))
-	edge = edge->next;
+    while (edge && (edge->end <= val))
+        edge = edge->next;
 
-    if(edge && (edge->start <= val))
-	return edge;
+    if (edge && (edge->start <= val))
+        return edge;
 
     return NULL;
 }
@@ -362,89 +355,98 @@ xf86CursorOffScreen(ScreenPtr *pScreen, int *x, int *y)
     xf86EdgePtr edge;
     int tmp;
 
-    if(screenInfo.numScreens == 1)
-	return FALSE;
+    if (screenInfo.numScreens == 1)
+        return FALSE;
 
-    if(*x < 0) {
+    if (*x < 0) {
         tmp = *y;
-	if(tmp < 0) tmp = 0;
-	if(tmp >= (*pScreen)->height) tmp = (*pScreen)->height - 1;
-
-	if((edge = xf86ScreenLayout[(*pScreen)->myNum].left))
-	   edge = FindEdge(edge, tmp);
-
-	if(!edge) *x = 0;
-	else {
-	    *x += edge->offset.x;
-	    *y += edge->offset.y;
-	    *pScreen = xf86Screens[edge->screen]->pScreen;
-	}
+        if (tmp < 0)
+            tmp = 0;
+        if (tmp >= (*pScreen)->height)
+            tmp = (*pScreen)->height - 1;
+
+        if ((edge = xf86ScreenLayout[(*pScreen)->myNum].left))
+            edge = FindEdge(edge, tmp);
+
+        if (!edge)
+            *x = 0;
+        else {
+            *x += edge->offset.x;
+            *y += edge->offset.y;
+            *pScreen = xf86Screens[edge->screen]->pScreen;
+        }
     }
 
-    if(*x >= (*pScreen)->width) {
+    if (*x >= (*pScreen)->width) {
         tmp = *y;
-	if(tmp < 0) tmp = 0;
-	if(tmp >= (*pScreen)->height) tmp = (*pScreen)->height - 1;
-
-	if((edge = xf86ScreenLayout[(*pScreen)->myNum].right))
-	   edge = FindEdge(edge, tmp);
-
-	if(!edge) *x = (*pScreen)->width - 1;
-	else {
-	    *x += edge->offset.x;
-	    *y += edge->offset.y;
-	    *pScreen = xf86Screens[edge->screen]->pScreen;
-	}
+        if (tmp < 0)
+            tmp = 0;
+        if (tmp >= (*pScreen)->height)
+            tmp = (*pScreen)->height - 1;
+
+        if ((edge = xf86ScreenLayout[(*pScreen)->myNum].right))
+            edge = FindEdge(edge, tmp);
+
+        if (!edge)
+            *x = (*pScreen)->width - 1;
+        else {
+            *x += edge->offset.x;
+            *y += edge->offset.y;
+            *pScreen = xf86Screens[edge->screen]->pScreen;
+        }
     }
 
-    if(*y < 0) {
+    if (*y < 0) {
         tmp = *x;
-	if(tmp < 0) tmp = 0;
-	if(tmp >= (*pScreen)->width) tmp = (*pScreen)->width - 1;
-
-	if((edge = xf86ScreenLayout[(*pScreen)->myNum].up))
-	   edge = FindEdge(edge, tmp);
-
-	if(!edge) *y = 0;
-	else {
-	    *x += edge->offset.x;
-	    *y += edge->offset.y;
-	    *pScreen = xf86Screens[edge->screen]->pScreen;
-	}
+        if (tmp < 0)
+            tmp = 0;
+        if (tmp >= (*pScreen)->width)
+            tmp = (*pScreen)->width - 1;
+
+        if ((edge = xf86ScreenLayout[(*pScreen)->myNum].up))
+            edge = FindEdge(edge, tmp);
+
+        if (!edge)
+            *y = 0;
+        else {
+            *x += edge->offset.x;
+            *y += edge->offset.y;
+            *pScreen = xf86Screens[edge->screen]->pScreen;
+        }
     }
 
-    if(*y >= (*pScreen)->height) {
+    if (*y >= (*pScreen)->height) {
         tmp = *x;
-	if(tmp < 0) tmp = 0;
-	if(tmp >= (*pScreen)->width) tmp = (*pScreen)->width - 1;
-
-	if((edge = xf86ScreenLayout[(*pScreen)->myNum].down))
-	   edge = FindEdge(edge, tmp);
-
-	if(!edge) *y = (*pScreen)->height - 1;
-	else {
-	    *x += edge->offset.x;
-	    *y += edge->offset.y;
-	    (*pScreen) = xf86Screens[edge->screen]->pScreen;
-	}
+        if (tmp < 0)
+            tmp = 0;
+        if (tmp >= (*pScreen)->width)
+            tmp = (*pScreen)->width - 1;
+
+        if ((edge = xf86ScreenLayout[(*pScreen)->myNum].down))
+            edge = FindEdge(edge, tmp);
+
+        if (!edge)
+            *y = (*pScreen)->height - 1;
+        else {
+            *x += edge->offset.x;
+            *y += edge->offset.y;
+            (*pScreen) = xf86Screens[edge->screen]->pScreen;
+        }
     }
 
-
 #if 0
     /* This presents problems for overlapping screens when
- 	HardEdges is used.  Have to think about the logic more */
-    if((*x < 0) || (*x >= (*pScreen)->width) || 
-       (*y < 0) || (*y >= (*pScreen)->height)) {
-	/* We may have crossed more than one screen */
-	xf86CursorOffScreen(pScreen, x, y);
+       HardEdges is used.  Have to think about the logic more */
+    if ((*x < 0) || (*x >= (*pScreen)->width) ||
+        (*y < 0) || (*y >= (*pScreen)->height)) {
+        /* We may have crossed more than one screen */
+        xf86CursorOffScreen(pScreen, x, y);
     }
 #endif
 
     return TRUE;
 }
 
-
-
 /*
  * xf86CrossScreen --
  *      Switch to another screen
@@ -454,11 +456,10 @@ xf86CursorOffScreen(ScreenPtr *pScreen, int *x, int *y)
  */
 
 static void
-xf86CrossScreen (ScreenPtr pScreen, Bool entering)
+xf86CrossScreen(ScreenPtr pScreen, Bool entering)
 {
 }
 
-
 /*
  * xf86WarpCursor --
  *      Warp possible to another screen
@@ -466,88 +467,88 @@ xf86CrossScreen (ScreenPtr pScreen, Bool entering)
 
 /* ARGSUSED */
 static void
-xf86WarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+xf86WarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 {
-    int    sigstate;
-    sigstate = xf86BlockSIGIO ();
+    int sigstate;
+
+    sigstate = xf86BlockSIGIO();
     miPointerWarpCursor(pDev, pScreen, x, y);
 
     xf86Info.currentScreen = pScreen;
-    xf86UnblockSIGIO (sigstate);
+    xf86UnblockSIGIO(sigstate);
 }
 
-
 void *
 xf86GetPointerScreenFuncs(void)
 {
-    return (void *)&xf86PointerScreenFuncs;
+    return (void *) &xf86PointerScreenFuncs;
 }
 
-
 static xf86EdgePtr
-AddEdge(
-   xf86EdgePtr edge, 
-   short min, 
-   short max,
-   short dx,
-   short dy,
-   short screen
-){
-   xf86EdgePtr pEdge = edge, pPrev = NULL, pNew;
-
-   while(1) {
-	while(pEdge && (min >= pEdge->end)) {
-	    pPrev = pEdge;
-	    pEdge = pEdge->next;
-	}  
-
-	if(!pEdge) {
-	    if(!(pNew = malloc(sizeof(xf86EdgeRec))))
-		break;
-
-	    pNew->screen = screen;
-	    pNew->start = min;  
-	    pNew->end = max;   
-	    pNew->offset.x = dx;
-	    pNew->offset.y = dy;
-	    pNew->next = NULL;
-
-	    if(pPrev)
-		pPrev->next = pNew;
-	    else
-		edge = pNew;
-	    
-	    break;
-	} else if (min < pEdge->start) {
-	    if(!(pNew = malloc(sizeof(xf86EdgeRec))))
-		break;
-
-	    pNew->screen = screen;
-	    pNew->start = min;  
-	    pNew->offset.x = dx;
-	    pNew->offset.y = dy;
-	    pNew->next = pEdge;
-
-	    if(pPrev) pPrev->next = pNew;
-	    else edge = pNew;
-
-	    if(max <= pEdge->start) {
-		pNew->end = max;   
-		break;
-	    } else {
-		pNew->end = pEdge->start;
-		min = pEdge->end;
-	    }
-	} else
-	    min = pEdge->end;
-
-	pPrev = pEdge;
-	pEdge = pEdge->next;
-
-	if(max <= min) break;
-   }
-	
-   return edge;
+AddEdge(xf86EdgePtr edge,
+        short min, short max, short dx, short dy, short screen)
+{
+    xf86EdgePtr pEdge = edge, pPrev = NULL, pNew;
+
+    while (1) {
+        while (pEdge && (min >= pEdge->end)) {
+            pPrev = pEdge;
+            pEdge = pEdge->next;
+        }
+
+        if (!pEdge) {
+            if (!(pNew = malloc(sizeof(xf86EdgeRec))))
+                break;
+
+            pNew->screen = screen;
+            pNew->start = min;
+            pNew->end = max;
+            pNew->offset.x = dx;
+            pNew->offset.y = dy;
+            pNew->next = NULL;
+
+            if (pPrev)
+                pPrev->next = pNew;
+            else
+                edge = pNew;
+
+            break;
+        }
+        else if (min < pEdge->start) {
+            if (!(pNew = malloc(sizeof(xf86EdgeRec))))
+                break;
+
+            pNew->screen = screen;
+            pNew->start = min;
+            pNew->offset.x = dx;
+            pNew->offset.y = dy;
+            pNew->next = pEdge;
+
+            if (pPrev)
+                pPrev->next = pNew;
+            else
+                edge = pNew;
+
+            if (max <= pEdge->start) {
+                pNew->end = max;
+                break;
+            }
+            else {
+                pNew->end = pEdge->start;
+                min = pEdge->end;
+            }
+        }
+        else
+            min = pEdge->end;
+
+        pPrev = pEdge;
+        pEdge = pEdge->next;
+
+        if (max <= min)
+            break;
+    }
+
+    return edge;
 }
 
 static void
@@ -556,19 +557,20 @@ FillOutEdge(xf86EdgePtr pEdge, int limit)
     xf86EdgePtr pNext;
     int diff;
 
-    if(pEdge->start > 0) pEdge->start = 0;
+    if (pEdge->start > 0)
+        pEdge->start = 0;
 
-    while((pNext = pEdge->next)) {
-	diff = pNext->start - pEdge->end;
-	if(diff > 0) {	
-	    pEdge->end += diff >> 1;
-	    pNext->start -= diff - (diff >> 1);
-	}
-	pEdge = pNext;
+    while ((pNext = pEdge->next)) {
+        diff = pNext->start - pEdge->end;
+        if (diff > 0) {
+            pEdge->end += diff >> 1;
+            pNext->start -= diff - (diff >> 1);
+        }
+        pEdge = pNext;
     }
 
-    if(pEdge->end < limit)
-	pEdge->end = limit;    
+    if (pEdge->end < limit)
+        pEdge->end = limit;
 }
 
 /*
@@ -591,252 +593,269 @@ xf86InitOrigins(void)
     HardEdges = FALSE;
 
     memset(xf86ScreenLayout, 0, MAXSCREENS * sizeof(xf86ScreenLayoutRec));
-	
+
     screensLeft = prevScreensLeft = (1 << xf86NumScreens) - 1;
 
-    while(1) {
-	for(mask = screensLeft, i = 0; mask; mask >>= 1, i++) {
-	    if(!(mask & 1L)) continue;
-
-	    screen = &xf86ConfigLayout.screens[i];
-
-	    if (screen->refscreen != NULL &&
-		screen->refscreen->screennum >= xf86NumScreens) {
-		screensLeft &= ~(1 << i);
-	        xf86Msg(X_WARNING, "Not including screen \"%s\" in origins calculation.\n",
-			screen->screen->id);
-	        continue;
-	    }
-
-	    pScreen = xf86Screens[i]->pScreen;
-	    switch(screen->where) {
-	    case PosObsolete:
-		OldStyleConfig = TRUE;
-		pLayout = &xf86ScreenLayout[i];
-		/* force edge lists */
-		if(screen->left) {
-		    ref = screen->left->screennum;
-		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
-			ErrorF("Referenced uninitialized screen in Layout!\n");
-			break;
-		    }
-		    pLayout->left = AddEdge(pLayout->left, 
-			0, pScreen->height,
-			xf86Screens[ref]->pScreen->width, 0, ref);
-		}
-		if(screen->right) {
-		    ref = screen->right->screennum;
-		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
-			ErrorF("Referenced uninitialized screen in Layout!\n");
-			break;
-		    }
-		    pLayout->right = AddEdge(pLayout->right, 
-			0, pScreen->height, -pScreen->width, 0, ref);
-		}
-		if(screen->top) {
-		    ref = screen->top->screennum;
-		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
-			ErrorF("Referenced uninitialized screen in Layout!\n");
-			break;
-		    }
-		    pLayout->up = AddEdge(pLayout->up, 
-			0, pScreen->width,
-			0, xf86Screens[ref]->pScreen->height, ref);
-		}
-		if(screen->bottom) {
-		    ref = screen->bottom->screennum;
-		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
-			ErrorF("Referenced uninitialized screen in Layout!\n");
-			break;
-		    }
-		    pLayout->down = AddEdge(pLayout->down, 
-			0, pScreen->width, 0, -pScreen->height, ref);
-		}
-	        /* we could also try to place it based on those
-		   relative locations if we wanted to */
-		screen->x = screen->y = 0;
-		/* FALLTHROUGH */
-	    case PosAbsolute:
-		pScreen->x = screen->x;
-		pScreen->y = screen->y;
-		screensLeft &= ~(1 << i);
-		break;
-	    case PosRelative:
-		ref = screen->refscreen->screennum;
-		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
-		    ErrorF("Referenced uninitialized screen in Layout!\n");
-		    break;
-		}
-		if(screensLeft & (1 << ref)) break;
-		refScreen = xf86Screens[ref]->pScreen;
-		pScreen->x = refScreen->x + screen->x;
-		pScreen->y = refScreen->y + screen->y;
-		screensLeft &= ~(1 << i);
-		break;
-	    case PosRightOf:
-		ref = screen->refscreen->screennum;
-		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
-		    ErrorF("Referenced uninitialized screen in Layout!\n");
-		    break;
-		}
-		if(screensLeft & (1 << ref)) break;
-		refScreen = xf86Screens[ref]->pScreen;
-		pScreen->x = refScreen->x + refScreen->width;
-		pScreen->y = refScreen->y;
-		screensLeft &= ~(1 << i);
-		break;
-	    case PosLeftOf:
-		ref = screen->refscreen->screennum;
-		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
-		    ErrorF("Referenced uninitialized screen in Layout!\n");
-		    break;
-		}
-		if(screensLeft & (1 << ref)) break;
-		refScreen = xf86Screens[ref]->pScreen;
-		pScreen->x = refScreen->x - pScreen->width;
-		pScreen->y = refScreen->y;
-		screensLeft &= ~(1 << i);
-		break;
-	    case PosBelow:
-		ref = screen->refscreen->screennum;
-		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
-		    ErrorF("Referenced uninitialized screen in Layout!\n");
-		    break;
-		}
-		if(screensLeft & (1 << ref)) break;
-		refScreen = xf86Screens[ref]->pScreen;
-		pScreen->x = refScreen->x;
-		pScreen->y = refScreen->y + refScreen->height;
-		screensLeft &= ~(1 << i);
-		break;
-	    case PosAbove:
-		ref = screen->refscreen->screennum;
-		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
-		    ErrorF("Referenced uninitialized screen in Layout!\n");
-		    break;
-		}
-		if(screensLeft & (1 << ref)) break;
-		refScreen = xf86Screens[ref]->pScreen;
-		pScreen->x = refScreen->x;
-		pScreen->y = refScreen->y - pScreen->height;
-		screensLeft &= ~(1 << i);
-		break;
-	    default:
-		ErrorF("Illegal placement keyword in Layout!\n");
-		break;
-	    }
-
-	}
-
-	if(!screensLeft) break;
-
-	if(screensLeft == prevScreensLeft) {
-	/* All the remaining screens are referencing each other.
-	   Assign a value to one of them and go through again */
-	    i = 0;
-	    while(!((1 << i) & screensLeft)){ i++; }
-
-	    ref = xf86ConfigLayout.screens[i].refscreen->screennum;
-	    xf86Screens[ref]->pScreen->x = xf86Screens[ref]->pScreen->y = 0;
-	    screensLeft &= ~(1 << ref);
-	}
-
-	prevScreensLeft = screensLeft;
+    while (1) {
+        for (mask = screensLeft, i = 0; mask; mask >>= 1, i++) {
+            if (!(mask & 1L))
+                continue;
+
+            screen = &xf86ConfigLayout.screens[i];
+
+            if (screen->refscreen != NULL &&
+                screen->refscreen->screennum >= xf86NumScreens) {
+                screensLeft &= ~(1 << i);
+                xf86Msg(X_WARNING,
+                        "Not including screen \"%s\" in origins calculation.\n",
+                        screen->screen->id);
+                continue;
+            }
+
+            pScreen = xf86Screens[i]->pScreen;
+            switch (screen->where) {
+            case PosObsolete:
+                OldStyleConfig = TRUE;
+                pLayout = &xf86ScreenLayout[i];
+                /* force edge lists */
+                if (screen->left) {
+                    ref = screen->left->screennum;
+                    if (!xf86Screens[ref] || !xf86Screens[ref]->pScreen) {
+                        ErrorF("Referenced uninitialized screen in Layout!\n");
+                        break;
+                    }
+                    pLayout->left = AddEdge(pLayout->left,
+                                            0, pScreen->height,
+                                            xf86Screens[ref]->pScreen->width, 0,
+                                            ref);
+                }
+                if (screen->right) {
+                    ref = screen->right->screennum;
+                    if (!xf86Screens[ref] || !xf86Screens[ref]->pScreen) {
+                        ErrorF("Referenced uninitialized screen in Layout!\n");
+                        break;
+                    }
+                    pLayout->right = AddEdge(pLayout->right,
+                                             0, pScreen->height,
+                                             -pScreen->width, 0, ref);
+                }
+                if (screen->top) {
+                    ref = screen->top->screennum;
+                    if (!xf86Screens[ref] || !xf86Screens[ref]->pScreen) {
+                        ErrorF("Referenced uninitialized screen in Layout!\n");
+                        break;
+                    }
+                    pLayout->up = AddEdge(pLayout->up,
+                                          0, pScreen->width,
+                                          0, xf86Screens[ref]->pScreen->height,
+                                          ref);
+                }
+                if (screen->bottom) {
+                    ref = screen->bottom->screennum;
+                    if (!xf86Screens[ref] || !xf86Screens[ref]->pScreen) {
+                        ErrorF("Referenced uninitialized screen in Layout!\n");
+                        break;
+                    }
+                    pLayout->down = AddEdge(pLayout->down,
+                                            0, pScreen->width, 0,
+                                            -pScreen->height, ref);
+                }
+                /* we could also try to place it based on those
+                   relative locations if we wanted to */
+                screen->x = screen->y = 0;
+                /* FALLTHROUGH */
+            case PosAbsolute:
+                pScreen->x = screen->x;
+                pScreen->y = screen->y;
+                screensLeft &= ~(1 << i);
+                break;
+            case PosRelative:
+                ref = screen->refscreen->screennum;
+                if (!xf86Screens[ref] || !xf86Screens[ref]->pScreen) {
+                    ErrorF("Referenced uninitialized screen in Layout!\n");
+                    break;
+                }
+                if (screensLeft & (1 << ref))
+                    break;
+                refScreen = xf86Screens[ref]->pScreen;
+                pScreen->x = refScreen->x + screen->x;
+                pScreen->y = refScreen->y + screen->y;
+                screensLeft &= ~(1 << i);
+                break;
+            case PosRightOf:
+                ref = screen->refscreen->screennum;
+                if (!xf86Screens[ref] || !xf86Screens[ref]->pScreen) {
+                    ErrorF("Referenced uninitialized screen in Layout!\n");
+                    break;
+                }
+                if (screensLeft & (1 << ref))
+                    break;
+                refScreen = xf86Screens[ref]->pScreen;
+                pScreen->x = refScreen->x + refScreen->width;
+                pScreen->y = refScreen->y;
+                screensLeft &= ~(1 << i);
+                break;
+            case PosLeftOf:
+                ref = screen->refscreen->screennum;
+                if (!xf86Screens[ref] || !xf86Screens[ref]->pScreen) {
+                    ErrorF("Referenced uninitialized screen in Layout!\n");
+                    break;
+                }
+                if (screensLeft & (1 << ref))
+                    break;
+                refScreen = xf86Screens[ref]->pScreen;
+                pScreen->x = refScreen->x - pScreen->width;
+                pScreen->y = refScreen->y;
+                screensLeft &= ~(1 << i);
+                break;
+            case PosBelow:
+                ref = screen->refscreen->screennum;
+                if (!xf86Screens[ref] || !xf86Screens[ref]->pScreen) {
+                    ErrorF("Referenced uninitialized screen in Layout!\n");
+                    break;
+                }
+                if (screensLeft & (1 << ref))
+                    break;
+                refScreen = xf86Screens[ref]->pScreen;
+                pScreen->x = refScreen->x;
+                pScreen->y = refScreen->y + refScreen->height;
+                screensLeft &= ~(1 << i);
+                break;
+            case PosAbove:
+                ref = screen->refscreen->screennum;
+                if (!xf86Screens[ref] || !xf86Screens[ref]->pScreen) {
+                    ErrorF("Referenced uninitialized screen in Layout!\n");
+                    break;
+                }
+                if (screensLeft & (1 << ref))
+                    break;
+                refScreen = xf86Screens[ref]->pScreen;
+                pScreen->x = refScreen->x;
+                pScreen->y = refScreen->y - pScreen->height;
+                screensLeft &= ~(1 << i);
+                break;
+            default:
+                ErrorF("Illegal placement keyword in Layout!\n");
+                break;
+            }
+
+        }
+
+        if (!screensLeft)
+            break;
+
+        if (screensLeft == prevScreensLeft) {
+            /* All the remaining screens are referencing each other.
+               Assign a value to one of them and go through again */
+            i = 0;
+            while (!((1 << i) & screensLeft)) {
+                i++;
+            }
+
+            ref = xf86ConfigLayout.screens[i].refscreen->screennum;
+            xf86Screens[ref]->pScreen->x = xf86Screens[ref]->pScreen->y = 0;
+            screensLeft &= ~(1 << ref);
+        }
+
+        prevScreensLeft = screensLeft;
     }
 
     /* justify the topmost and leftmost to (0,0) */
     minX = xf86Screens[0]->pScreen->x;
     minY = xf86Screens[0]->pScreen->y;
 
-    for(i = 1; i < xf86NumScreens; i++) {
-	if(xf86Screens[i]->pScreen->x < minX)
-	  minX = xf86Screens[i]->pScreen->x;
-	if(xf86Screens[i]->pScreen->y < minY)
-	  minY = xf86Screens[i]->pScreen->y;
+    for (i = 1; i < xf86NumScreens; i++) {
+        if (xf86Screens[i]->pScreen->x < minX)
+            minX = xf86Screens[i]->pScreen->x;
+        if (xf86Screens[i]->pScreen->y < minY)
+            minY = xf86Screens[i]->pScreen->y;
     }
 
     if (minX || minY) {
-	for(i = 0; i < xf86NumScreens; i++) {
-	   xf86Screens[i]->pScreen->x -= minX;
-	   xf86Screens[i]->pScreen->y -= minY;
-	}
+        for (i = 0; i < xf86NumScreens; i++) {
+            xf86Screens[i]->pScreen->x -= minX;
+            xf86Screens[i]->pScreen->y -= minY;
+        }
     }
 
-
     /* Create the edge lists */
 
-    if(!OldStyleConfig) {
-      for(i = 0; i < xf86NumScreens; i++) {
-	pLayout = &xf86ScreenLayout[i];
-
-	pScreen = xf86Screens[i]->pScreen;
-
-	left = pScreen->x;
-	right = left + pScreen->width;
-	top = pScreen->y;
-	bottom = top + pScreen->height;
-
-	for(j = 0; j < xf86NumScreens; j++) {
-	    if(i == j) continue;
-
-	    refScreen = xf86Screens[j]->pScreen;
-
-	    x1 = refScreen->x;
-	    x2 = x1 + refScreen->width;
-	    y1 = refScreen->y;
-	    y2 = y1 + refScreen->height;
-
-	    if((bottom > y1) && (top < y2)) {
-		min = y1 - top;
-		if(min < 0) min = 0;
-		max = pScreen->height - (bottom - y2);
-		if(max > pScreen->height) max = pScreen->height;
-
-		if(((left - 1) >= x1) && ((left - 1) < x2))
-		    pLayout->left = AddEdge(pLayout->left, min, max,
-			pScreen->x - refScreen->x,
-			pScreen->y - refScreen->y, j);
-
-		if((right >= x1) && (right < x2))	
-		    pLayout->right = AddEdge(pLayout->right, min, max,
-			pScreen->x - refScreen->x,
-			pScreen->y - refScreen->y, j);
-	    }
-
-
-	    if((left < x2) && (right > x1)) {
-		min = x1 - left;
-		if(min < 0) min = 0;
-		max = pScreen->width - (right - x2);
-		if(max > pScreen->width) max = pScreen->width;
-
-		if(((top - 1) >= y1) && ((top - 1) < y2))
-		    pLayout->up = AddEdge(pLayout->up, min, max,
-			pScreen->x - refScreen->x,
-			pScreen->y - refScreen->y, j);
-
-		if((bottom >= y1) && (bottom < y2))
-		    pLayout->down = AddEdge(pLayout->down, min, max,
-			pScreen->x - refScreen->x,
-			pScreen->y - refScreen->y, j);
-	    }
-	}
-      }
+    if (!OldStyleConfig) {
+        for (i = 0; i < xf86NumScreens; i++) {
+            pLayout = &xf86ScreenLayout[i];
+
+            pScreen = xf86Screens[i]->pScreen;
+
+            left = pScreen->x;
+            right = left + pScreen->width;
+            top = pScreen->y;
+            bottom = top + pScreen->height;
+
+            for (j = 0; j < xf86NumScreens; j++) {
+                if (i == j)
+                    continue;
+
+                refScreen = xf86Screens[j]->pScreen;
+
+                x1 = refScreen->x;
+                x2 = x1 + refScreen->width;
+                y1 = refScreen->y;
+                y2 = y1 + refScreen->height;
+
+                if ((bottom > y1) && (top < y2)) {
+                    min = y1 - top;
+                    if (min < 0)
+                        min = 0;
+                    max = pScreen->height - (bottom - y2);
+                    if (max > pScreen->height)
+                        max = pScreen->height;
+
+                    if (((left - 1) >= x1) && ((left - 1) < x2))
+                        pLayout->left = AddEdge(pLayout->left, min, max,
+                                                pScreen->x - refScreen->x,
+                                                pScreen->y - refScreen->y, j);
+
+                    if ((right >= x1) && (right < x2))
+                        pLayout->right = AddEdge(pLayout->right, min, max,
+                                                 pScreen->x - refScreen->x,
+                                                 pScreen->y - refScreen->y, j);
+                }
+
+                if ((left < x2) && (right > x1)) {
+                    min = x1 - left;
+                    if (min < 0)
+                        min = 0;
+                    max = pScreen->width - (right - x2);
+                    if (max > pScreen->width)
+                        max = pScreen->width;
+
+                    if (((top - 1) >= y1) && ((top - 1) < y2))
+                        pLayout->up = AddEdge(pLayout->up, min, max,
+                                              pScreen->x - refScreen->x,
+                                              pScreen->y - refScreen->y, j);
+
+                    if ((bottom >= y1) && (bottom < y2))
+                        pLayout->down = AddEdge(pLayout->down, min, max,
+                                                pScreen->x - refScreen->x,
+                                                pScreen->y - refScreen->y, j);
+                }
+            }
+        }
     }
 
-    if(!HardEdges && !OldStyleConfig) {
-	for(i = 0; i < xf86NumScreens; i++) {
-	    pLayout = &xf86ScreenLayout[i];
-	    pScreen = xf86Screens[i]->pScreen;
-	    if(pLayout->left) 
-		FillOutEdge(pLayout->left, pScreen->height);
-	    if(pLayout->right) 
-		FillOutEdge(pLayout->right, pScreen->height);
-	    if(pLayout->up) 
-		FillOutEdge(pLayout->up, pScreen->width);
-	    if(pLayout->down) 
-		FillOutEdge(pLayout->down, pScreen->width);
-	}
+    if (!HardEdges && !OldStyleConfig) {
+        for (i = 0; i < xf86NumScreens; i++) {
+            pLayout = &xf86ScreenLayout[i];
+            pScreen = xf86Screens[i]->pScreen;
+            if (pLayout->left)
+                FillOutEdge(pLayout->left, pScreen->height);
+            if (pLayout->right)
+                FillOutEdge(pLayout->right, pScreen->height);
+            if (pLayout->up)
+                FillOutEdge(pLayout->up, pScreen->width);
+            if (pLayout->down)
+                FillOutEdge(pLayout->down, pScreen->width);
+        }
     }
 
     update_desktop_dimensions();
@@ -848,15 +867,14 @@ xf86ReconfigureLayout(void)
     int i;
 
     for (i = 0; i < MAXSCREENS; i++) {
-	xf86ScreenLayoutPtr sl = &xf86ScreenLayout[i];
-	/* we don't have to zero these, xf86InitOrigins() takes care of that */
-	free(sl->left);
-	free(sl->right);
-	free(sl->up);
-	free(sl->down);
+        xf86ScreenLayoutPtr sl = &xf86ScreenLayout[i];
+
+        /* we don't have to zero these, xf86InitOrigins() takes care of that */
+        free(sl->left);
+        free(sl->right);
+        free(sl->up);
+        free(sl->down);
     }
 
     xf86InitOrigins();
 }
-
-	
diff --git a/xorg-server/hw/xfree86/common/xf86DGA.c b/xorg-server/hw/xfree86/common/xf86DGA.c
index 0c958cdf3..316978cfa 100644
--- a/xorg-server/hw/xfree86/common/xf86DGA.c
+++ b/xorg-server/hw/xfree86/common/xf86DGA.c
@@ -52,6 +52,7 @@
 #include "mi.h"
 
 static DevPrivateKeyRec DGAScreenKeyRec;
+
 #define DGAScreenKeyRegistered dixPrivateKeyRegistered(&DGAScreenKeyRec)
 static Bool mieq_installed;
 
@@ -63,86 +64,76 @@ static void DGAHandleEvent(int screen_num, InternalEvent *event,
                            DeviceIntPtr device);
 
 static void
-DGACopyModeInfo(
-   DGAModePtr mode,
-   XDGAModePtr xmode
-);
+ DGACopyModeInfo(DGAModePtr mode, XDGAModePtr xmode);
 
 int *XDGAEventBase = NULL;
 
 #define DGA_GET_SCREEN_PRIV(pScreen) ((DGAScreenPtr) \
     dixLookupPrivate(&(pScreen)->devPrivates, &DGAScreenKeyRec))
 
-
-typedef struct _FakedVisualList{
-   Bool free;
-   VisualPtr pVisual;
-   struct _FakedVisualList *next;
+typedef struct _FakedVisualList {
+    Bool free;
+    VisualPtr pVisual;
+    struct _FakedVisualList *next;
 } FakedVisualList;
 
-
 typedef struct {
-   ScrnInfoPtr 		pScrn;
-   int			numModes;
-   DGAModePtr		modes;
-   CloseScreenProcPtr	CloseScreen;
-   DestroyColormapProcPtr DestroyColormap;
-   InstallColormapProcPtr InstallColormap;
-   UninstallColormapProcPtr UninstallColormap;
-   DGADevicePtr		current;
-   DGAFunctionPtr	funcs;
-   int			input;
-   ClientPtr		client;
-   int			pixmapMode;
-   FakedVisualList	*fakedVisuals;
-   ColormapPtr 		dgaColormap;
-   ColormapPtr		savedColormap;
-   Bool			grabMouse;
-   Bool			grabKeyboard;
+    ScrnInfoPtr pScrn;
+    int numModes;
+    DGAModePtr modes;
+    CloseScreenProcPtr CloseScreen;
+    DestroyColormapProcPtr DestroyColormap;
+    InstallColormapProcPtr InstallColormap;
+    UninstallColormapProcPtr UninstallColormap;
+    DGADevicePtr current;
+    DGAFunctionPtr funcs;
+    int input;
+    ClientPtr client;
+    int pixmapMode;
+    FakedVisualList *fakedVisuals;
+    ColormapPtr dgaColormap;
+    ColormapPtr savedColormap;
+    Bool grabMouse;
+    Bool grabKeyboard;
 } DGAScreenRec, *DGAScreenPtr;
 
 Bool
-DGAInit(
-   ScreenPtr pScreen,
-   DGAFunctionPtr funcs, 
-   DGAModePtr modes,
-   int num
-){
+DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes, int num)
+{
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     DGAScreenPtr pScreenPriv;
     int i;
 
-    if(!funcs || !funcs->SetMode || !funcs->OpenFramebuffer)
-	return FALSE;
+    if (!funcs || !funcs->SetMode || !funcs->OpenFramebuffer)
+        return FALSE;
 
-    if(!modes || num <= 0)
-	return FALSE;
+    if (!modes || num <= 0)
+        return FALSE;
 
     if (!dixRegisterPrivateKey(&DGAScreenKeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
 
     pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
 
-    if (!pScreenPriv)
-    {
-	if(!(pScreenPriv = (DGAScreenPtr)malloc(sizeof(DGAScreenRec))))
-	    return FALSE;
-	dixSetPrivate(&pScreen->devPrivates, &DGAScreenKeyRec, pScreenPriv);
-	pScreenPriv->CloseScreen = pScreen->CloseScreen;
-	pScreen->CloseScreen = DGACloseScreen;
-	pScreenPriv->DestroyColormap = pScreen->DestroyColormap;
-	pScreen->DestroyColormap = DGADestroyColormap;
-	pScreenPriv->InstallColormap = pScreen->InstallColormap;
-	pScreen->InstallColormap = DGAInstallColormap;
-	pScreenPriv->UninstallColormap = pScreen->UninstallColormap;
-	pScreen->UninstallColormap = DGAUninstallColormap;
+    if (!pScreenPriv) {
+        if (!(pScreenPriv = (DGAScreenPtr) malloc(sizeof(DGAScreenRec))))
+            return FALSE;
+        dixSetPrivate(&pScreen->devPrivates, &DGAScreenKeyRec, pScreenPriv);
+        pScreenPriv->CloseScreen = pScreen->CloseScreen;
+        pScreen->CloseScreen = DGACloseScreen;
+        pScreenPriv->DestroyColormap = pScreen->DestroyColormap;
+        pScreen->DestroyColormap = DGADestroyColormap;
+        pScreenPriv->InstallColormap = pScreen->InstallColormap;
+        pScreen->InstallColormap = DGAInstallColormap;
+        pScreenPriv->UninstallColormap = pScreen->UninstallColormap;
+        pScreen->UninstallColormap = DGAUninstallColormap;
     }
 
     pScreenPriv->pScrn = pScrn;
     pScreenPriv->numModes = num;
     pScreenPriv->modes = modes;
-    pScreenPriv->current = NULL;    
-    
+    pScreenPriv->current = NULL;
+
     pScreenPriv->funcs = funcs;
     pScreenPriv->input = 0;
     pScreenPriv->client = NULL;
@@ -151,14 +142,14 @@ DGAInit(
     pScreenPriv->savedColormap = NULL;
     pScreenPriv->grabMouse = FALSE;
     pScreenPriv->grabKeyboard = FALSE;
-    
-    for(i = 0; i < num; i++)
-	modes[i].num = i + 1;
+
+    for (i = 0; i < num; i++)
+        modes[i].num = i + 1;
 
 #ifdef PANORAMIX
-     if(!noPanoramiXExtension)
-	for(i = 0; i < num; i++)
-	    modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
+    if (!noPanoramiXExtension)
+        for (i = 0; i < num; i++)
+            modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
 #endif
 
     return TRUE;
@@ -169,51 +160,48 @@ DGAInit(
  */
 
 Bool
-DGAReInitModes(
-   ScreenPtr pScreen,
-   DGAModePtr modes,
-   int num
-){
+DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes, int num)
+{
     DGAScreenPtr pScreenPriv;
     int i;
 
     /* No DGA? Ignore call (but don't make it look like it failed) */
-    if(!DGAScreenKeyRegistered)
-	return TRUE;
-	
+    if (!DGAScreenKeyRegistered)
+        return TRUE;
+
     pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
 
     /* Same as above */
-    if(!pScreenPriv)
-	return TRUE;
+    if (!pScreenPriv)
+        return TRUE;
 
     /* Can't do this while DGA is active */
-    if(pScreenPriv->current)
-	return FALSE;
+    if (pScreenPriv->current)
+        return FALSE;
 
     /* Quick sanity check */
-    if(!num) 
-	modes = NULL;
-    else if(!modes) 
-	num = 0;
+    if (!num)
+        modes = NULL;
+    else if (!modes)
+        num = 0;
 
     pScreenPriv->numModes = num;
     pScreenPriv->modes = modes;
 
     /* This practically disables DGA. So be it. */
-    if(!num)
-	return TRUE;
+    if (!num)
+        return TRUE;
 
-    for(i = 0; i < num; i++)
-	modes[i].num = i + 1;
+    for (i = 0; i < num; i++)
+        modes[i].num = i + 1;
 
 #ifdef PANORAMIX
-     if(!noPanoramiXExtension)
-	for(i = 0; i < num; i++)
-	    modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
+    if (!noPanoramiXExtension)
+        for (i = 0; i < num; i++)
+            modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
 #endif
 
-     return TRUE;
+    return TRUE;
 }
 
 static void
@@ -222,346 +210,346 @@ FreeMarkedVisuals(ScreenPtr pScreen)
     DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
     FakedVisualList *prev, *curr, *tmp;
 
-    if(!pScreenPriv->fakedVisuals)
-	return;
+    if (!pScreenPriv->fakedVisuals)
+        return;
 
     prev = NULL;
     curr = pScreenPriv->fakedVisuals;
 
-    while(curr) {
-	if(curr->free) {
-	    tmp = curr;
-	    curr = curr->next;
-	    if(prev)
-		prev->next = curr;
-	    else 
-		pScreenPriv->fakedVisuals = curr;
-	    free(tmp->pVisual);
-	    free(tmp);
-	} else {
-	    prev = curr;
-	    curr = curr->next;
-	}
+    while (curr) {
+        if (curr->free) {
+            tmp = curr;
+            curr = curr->next;
+            if (prev)
+                prev->next = curr;
+            else
+                pScreenPriv->fakedVisuals = curr;
+            free(tmp->pVisual);
+            free(tmp);
+        }
+        else {
+            prev = curr;
+            curr = curr->next;
+        }
     }
 }
 
-static Bool 
+static Bool
 DGACloseScreen(int i, ScreenPtr pScreen)
 {
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
 
-   if (mieq_installed) {
-       mieqSetHandler(ET_DGAEvent, NULL);
-       mieq_installed = FALSE;
-   }
+    if (mieq_installed) {
+        mieqSetHandler(ET_DGAEvent, NULL);
+        mieq_installed = FALSE;
+    }
 
-   FreeMarkedVisuals(pScreen);
+    FreeMarkedVisuals(pScreen);
 
-   pScreen->CloseScreen = pScreenPriv->CloseScreen;
-   pScreen->DestroyColormap = pScreenPriv->DestroyColormap;
-   pScreen->InstallColormap = pScreenPriv->InstallColormap;
-   pScreen->UninstallColormap = pScreenPriv->UninstallColormap;
+    pScreen->CloseScreen = pScreenPriv->CloseScreen;
+    pScreen->DestroyColormap = pScreenPriv->DestroyColormap;
+    pScreen->InstallColormap = pScreenPriv->InstallColormap;
+    pScreen->UninstallColormap = pScreenPriv->UninstallColormap;
 
-   /* DGAShutdown() should have ensured that no DGA
-	screen were active by here */
+    /* DGAShutdown() should have ensured that no DGA
+       screen were active by here */
 
-   free(pScreenPriv);
+    free(pScreenPriv);
 
-   return((*pScreen->CloseScreen)(i, pScreen));
+    return ((*pScreen->CloseScreen) (i, pScreen));
 }
 
-
-static void 
+static void
 DGADestroyColormap(ColormapPtr pmap)
 {
-   ScreenPtr pScreen = pmap->pScreen;
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
-   VisualPtr pVisual = pmap->pVisual;
-
-   if(pScreenPriv->fakedVisuals) {
-	FakedVisualList *curr = pScreenPriv->fakedVisuals;
-	
-	while(curr) {
-	    if(curr->pVisual == pVisual) {
-		/* We can't get rid of them yet since FreeColormap
-		   still needs the pVisual during the cleanup */
-		curr->free = TRUE;
-		break;
-	    }
-	    curr = curr->next;
-	}
-   }  
-
-   if(pScreenPriv->DestroyColormap) {
+    ScreenPtr pScreen = pmap->pScreen;
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+    VisualPtr pVisual = pmap->pVisual;
+
+    if (pScreenPriv->fakedVisuals) {
+        FakedVisualList *curr = pScreenPriv->fakedVisuals;
+
+        while (curr) {
+            if (curr->pVisual == pVisual) {
+                /* We can't get rid of them yet since FreeColormap
+                   still needs the pVisual during the cleanup */
+                curr->free = TRUE;
+                break;
+            }
+            curr = curr->next;
+        }
+    }
+
+    if (pScreenPriv->DestroyColormap) {
         pScreen->DestroyColormap = pScreenPriv->DestroyColormap;
-        (*pScreen->DestroyColormap)(pmap);
+        (*pScreen->DestroyColormap) (pmap);
         pScreen->DestroyColormap = DGADestroyColormap;
-   }
+    }
 }
 
-
-static void 
+static void
 DGAInstallColormap(ColormapPtr pmap)
 {
     ScreenPtr pScreen = pmap->pScreen;
     DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
 
-    if(pScreenPriv->current && pScreenPriv->dgaColormap) {
-	if (pmap != pScreenPriv->dgaColormap) {
-	    pScreenPriv->savedColormap = pmap;
-	    pmap = pScreenPriv->dgaColormap;
-	}
+    if (pScreenPriv->current && pScreenPriv->dgaColormap) {
+        if (pmap != pScreenPriv->dgaColormap) {
+            pScreenPriv->savedColormap = pmap;
+            pmap = pScreenPriv->dgaColormap;
+        }
     }
 
     pScreen->InstallColormap = pScreenPriv->InstallColormap;
-    (*pScreen->InstallColormap)(pmap);
+    (*pScreen->InstallColormap) (pmap);
     pScreen->InstallColormap = DGAInstallColormap;
 }
 
-static void 
+static void
 DGAUninstallColormap(ColormapPtr pmap)
 {
     ScreenPtr pScreen = pmap->pScreen;
     DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
 
-    if(pScreenPriv->current && pScreenPriv->dgaColormap) {
-	if (pmap == pScreenPriv->dgaColormap) {
-	    pScreenPriv->dgaColormap = NULL;
-	}
+    if (pScreenPriv->current && pScreenPriv->dgaColormap) {
+        if (pmap == pScreenPriv->dgaColormap) {
+            pScreenPriv->dgaColormap = NULL;
+        }
     }
 
     pScreen->UninstallColormap = pScreenPriv->UninstallColormap;
-    (*pScreen->UninstallColormap)(pmap);
+    (*pScreen->UninstallColormap) (pmap);
     pScreen->UninstallColormap = DGAUninstallColormap;
 }
 
 int
-xf86SetDGAMode(
-   int index,
-   int num,
-   DGADevicePtr devRet
-){
-   ScreenPtr pScreen = screenInfo.screens[index];
-   DGAScreenPtr pScreenPriv;
-   ScrnInfoPtr pScrn;
-   DGADevicePtr device;
-   PixmapPtr pPix = NULL;
-   DGAModePtr pMode = NULL;
-
-   /* First check if DGAInit was successful on this screen */
-   if (!DGAScreenKeyRegistered)
-	return BadValue;
-   pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
-   if (!pScreenPriv)
-	return BadValue;
-   pScrn = pScreenPriv->pScrn;
-
-   if(!num) {
-	if(pScreenPriv->current) {
-	    PixmapPtr oldPix = pScreenPriv->current->pPix;
-	    if(oldPix) {
-		if(oldPix->drawable.id)
-		    FreeResource(oldPix->drawable.id, RT_NONE);
-		else
-		    (*pScreen->DestroyPixmap)(oldPix);
-	    }
-	    free(pScreenPriv->current);
-	    pScreenPriv->current = NULL;
-	    pScrn->vtSema = TRUE;
-	    (*pScreenPriv->funcs->SetMode)(pScrn, NULL);
-	    if(pScreenPriv->savedColormap) {
-	        (*pScreen->InstallColormap)(pScreenPriv->savedColormap);
-		pScreenPriv->savedColormap = NULL;
-	    }
-	    pScreenPriv->dgaColormap = NULL;
-	    (*pScrn->EnableDisableFBAccess)(index, TRUE);
-
-	    FreeMarkedVisuals(pScreen);
-	}
-      
+xf86SetDGAMode(int index, int num, DGADevicePtr devRet)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    DGAScreenPtr pScreenPriv;
+    ScrnInfoPtr pScrn;
+    DGADevicePtr device;
+    PixmapPtr pPix = NULL;
+    DGAModePtr pMode = NULL;
+
+    /* First check if DGAInit was successful on this screen */
+    if (!DGAScreenKeyRegistered)
+        return BadValue;
+    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+    if (!pScreenPriv)
+        return BadValue;
+    pScrn = pScreenPriv->pScrn;
+
+    if (!num) {
+        if (pScreenPriv->current) {
+            PixmapPtr oldPix = pScreenPriv->current->pPix;
+
+            if (oldPix) {
+                if (oldPix->drawable.id)
+                    FreeResource(oldPix->drawable.id, RT_NONE);
+                else
+                    (*pScreen->DestroyPixmap) (oldPix);
+            }
+            free(pScreenPriv->current);
+            pScreenPriv->current = NULL;
+            pScrn->vtSema = TRUE;
+            (*pScreenPriv->funcs->SetMode) (pScrn, NULL);
+            if (pScreenPriv->savedColormap) {
+                (*pScreen->InstallColormap) (pScreenPriv->savedColormap);
+                pScreenPriv->savedColormap = NULL;
+            }
+            pScreenPriv->dgaColormap = NULL;
+            (*pScrn->EnableDisableFBAccess) (index, TRUE);
+
+            FreeMarkedVisuals(pScreen);
+        }
+
         pScreenPriv->grabMouse = FALSE;
         pScreenPriv->grabKeyboard = FALSE;
 
-	return Success;
-   }
-
-   if(!pScrn->vtSema && !pScreenPriv->current) /* Really switched away */
-	return BadAlloc;
-      
-   if((num > 0) && (num <= pScreenPriv->numModes))
-	pMode = &(pScreenPriv->modes[num - 1]);
-   else
-	return BadValue;
-
-   if(!(device = (DGADevicePtr)malloc(sizeof(DGADeviceRec))))
-	return BadAlloc;
-
-   if(!pScreenPriv->current) {
-	Bool oldVTSema = pScrn->vtSema;
-
-	pScrn->vtSema = FALSE;  /* kludge until we rewrite VT switching */
-	(*pScrn->EnableDisableFBAccess)(index, FALSE);
-	pScrn->vtSema = oldVTSema;
-   } 
-
-   if(!(*pScreenPriv->funcs->SetMode)(pScrn, pMode)) {
-	free(device);
-	return BadAlloc;
-   }
-
-   pScrn->currentMode = pMode->mode;
-
-   if(!pScreenPriv->current && !pScreenPriv->input) {
-	/* if it's multihead we need to warp the cursor off of
-	   our screen so it doesn't get trapped  */
-   } 
-
-   pScrn->vtSema = FALSE;
-
-   if(pScreenPriv->current) {
-	PixmapPtr oldPix = pScreenPriv->current->pPix;
-	if(oldPix) {
-	    if(oldPix->drawable.id)
-		FreeResource(oldPix->drawable.id, RT_NONE);
-	    else
-		(*pScreen->DestroyPixmap)(oldPix);
-	}
-	free(pScreenPriv->current);
-	pScreenPriv->current = NULL;
-   } 
-
-   if(pMode->flags & DGA_PIXMAP_AVAILABLE) {
-	if((pPix = (*pScreen->CreatePixmap)(pScreen, 0, 0, pMode->depth, 0))) {
-	    (*pScreen->ModifyPixmapHeader)(pPix, 
-			pMode->pixmapWidth, pMode->pixmapHeight,
-			pMode->depth, pMode->bitsPerPixel, 
-			pMode->bytesPerScanline,
- 			(pointer)(pMode->address));
-        }
-   }
+        return Success;
+    }
 
-   devRet->mode = device->mode = pMode;
-   devRet->pPix = device->pPix = pPix;
-   pScreenPriv->current = device;
-   pScreenPriv->pixmapMode = FALSE;
-   pScreenPriv->grabMouse = TRUE;
-   pScreenPriv->grabKeyboard = TRUE;
+    if (!pScrn->vtSema && !pScreenPriv->current)        /* Really switched away */
+        return BadAlloc;
 
-   if (!mieq_installed) {
-      mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
-      mieq_installed = TRUE;
-   }
+    if ((num > 0) && (num <= pScreenPriv->numModes))
+        pMode = &(pScreenPriv->modes[num - 1]);
+    else
+        return BadValue;
 
-   return Success;
-}
+    if (!(device = (DGADevicePtr) malloc(sizeof(DGADeviceRec))))
+        return BadAlloc;
+
+    if (!pScreenPriv->current) {
+        Bool oldVTSema = pScrn->vtSema;
+
+        pScrn->vtSema = FALSE;  /* kludge until we rewrite VT switching */
+        (*pScrn->EnableDisableFBAccess) (index, FALSE);
+        pScrn->vtSema = oldVTSema;
+    }
+
+    if (!(*pScreenPriv->funcs->SetMode) (pScrn, pMode)) {
+        free(device);
+        return BadAlloc;
+    }
+
+    pScrn->currentMode = pMode->mode;
 
+    if (!pScreenPriv->current && !pScreenPriv->input) {
+        /* if it's multihead we need to warp the cursor off of
+           our screen so it doesn't get trapped  */
+    }
+
+    pScrn->vtSema = FALSE;
+
+    if (pScreenPriv->current) {
+        PixmapPtr oldPix = pScreenPriv->current->pPix;
+
+        if (oldPix) {
+            if (oldPix->drawable.id)
+                FreeResource(oldPix->drawable.id, RT_NONE);
+            else
+                (*pScreen->DestroyPixmap) (oldPix);
+        }
+        free(pScreenPriv->current);
+        pScreenPriv->current = NULL;
+    }
 
+    if (pMode->flags & DGA_PIXMAP_AVAILABLE) {
+        if ((pPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, pMode->depth, 0))) {
+            (*pScreen->ModifyPixmapHeader) (pPix,
+                                            pMode->pixmapWidth,
+                                            pMode->pixmapHeight, pMode->depth,
+                                            pMode->bitsPerPixel,
+                                            pMode->bytesPerScanline,
+                                            (pointer) (pMode->address));
+        }
+    }
+
+    devRet->mode = device->mode = pMode;
+    devRet->pPix = device->pPix = pPix;
+    pScreenPriv->current = device;
+    pScreenPriv->pixmapMode = FALSE;
+    pScreenPriv->grabMouse = TRUE;
+    pScreenPriv->grabKeyboard = TRUE;
+
+    if (!mieq_installed) {
+        mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
+        mieq_installed = TRUE;
+    }
+
+    return Success;
+}
 
 /*********** exported ones ***************/
 
 void
 DGASetInputMode(int index, Bool keyboard, Bool mouse)
 {
-   ScreenPtr pScreen = screenInfo.screens[index];
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
-
-   if (pScreenPriv)
-   {
-      pScreenPriv->grabMouse = mouse;
-      pScreenPriv->grabKeyboard = keyboard;
-
-      if (!mieq_installed) {
-          mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
-          mieq_installed = TRUE;
-      }
-   }
+    ScreenPtr pScreen = screenInfo.screens[index];
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+    if (pScreenPriv) {
+        pScreenPriv->grabMouse = mouse;
+        pScreenPriv->grabKeyboard = keyboard;
+
+        if (!mieq_installed) {
+            mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
+            mieq_installed = TRUE;
+        }
+    }
 }
 
 Bool
 DGAChangePixmapMode(int index, int *x, int *y, int mode)
 {
-   DGAScreenPtr pScreenPriv;
-   DGADevicePtr pDev;
-   DGAModePtr   pMode;
-   PixmapPtr    pPix;
-
-   if(!DGAScreenKeyRegistered)
-	return FALSE;
-
-   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
-
-   if(!pScreenPriv || !pScreenPriv->current || !pScreenPriv->current->pPix)
-	return FALSE;
-
-   pDev = pScreenPriv->current;
-   pPix = pDev->pPix;
-   pMode = pDev->mode;
-
-   if(mode) {
-	int shift = 2;
-
-	if(*x > (pMode->pixmapWidth - pMode->viewportWidth))
-	    *x = pMode->pixmapWidth - pMode->viewportWidth;
-	if(*y > (pMode->pixmapHeight - pMode->viewportHeight))
-	    *y = pMode->pixmapHeight - pMode->viewportHeight;
-
-	switch(xf86Screens[index]->bitsPerPixel) {
-	case 16: shift = 1;  break;
-	case 32: shift = 0;  break;
-	default: break;
-	}
-
-	if(BITMAP_SCANLINE_PAD == 64)
-	    shift++;
-
-	*x = (*x >> shift) << shift;
-
-	pPix->drawable.x = *x; 
-	pPix->drawable.y = *y; 
-	pPix->drawable.width = pMode->viewportWidth; 
-	pPix->drawable.height = pMode->viewportHeight; 
-   } else {
-	pPix->drawable.x = 0; 
-	pPix->drawable.y = 0; 
-	pPix->drawable.width = pMode->pixmapWidth; 
-	pPix->drawable.height = pMode->pixmapHeight; 
-   }
-   pPix->drawable.serialNumber = NEXT_SERIAL_NUMBER;
-   pScreenPriv->pixmapMode = mode;
-
-   return TRUE;
+    DGAScreenPtr pScreenPriv;
+    DGADevicePtr pDev;
+    DGAModePtr pMode;
+    PixmapPtr pPix;
+
+    if (!DGAScreenKeyRegistered)
+        return FALSE;
+
+    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+    if (!pScreenPriv || !pScreenPriv->current || !pScreenPriv->current->pPix)
+        return FALSE;
+
+    pDev = pScreenPriv->current;
+    pPix = pDev->pPix;
+    pMode = pDev->mode;
+
+    if (mode) {
+        int shift = 2;
+
+        if (*x > (pMode->pixmapWidth - pMode->viewportWidth))
+            *x = pMode->pixmapWidth - pMode->viewportWidth;
+        if (*y > (pMode->pixmapHeight - pMode->viewportHeight))
+            *y = pMode->pixmapHeight - pMode->viewportHeight;
+
+        switch (xf86Screens[index]->bitsPerPixel) {
+        case 16:
+            shift = 1;
+            break;
+        case 32:
+            shift = 0;
+            break;
+        default:
+            break;
+        }
+
+        if (BITMAP_SCANLINE_PAD == 64)
+            shift++;
+
+        *x = (*x >> shift) << shift;
+
+        pPix->drawable.x = *x;
+        pPix->drawable.y = *y;
+        pPix->drawable.width = pMode->viewportWidth;
+        pPix->drawable.height = pMode->viewportHeight;
+    }
+    else {
+        pPix->drawable.x = 0;
+        pPix->drawable.y = 0;
+        pPix->drawable.width = pMode->pixmapWidth;
+        pPix->drawable.height = pMode->pixmapHeight;
+    }
+    pPix->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+    pScreenPriv->pixmapMode = mode;
+
+    return TRUE;
 }
 
 Bool
-DGAAvailable(int index) 
+DGAAvailable(int index)
 {
-   if(!DGAScreenKeyRegistered)
-	return FALSE;
-   
-   if(DGA_GET_SCREEN_PRIV(screenInfo.screens[index]))
-	return TRUE;
+    if (!DGAScreenKeyRegistered)
+        return FALSE;
 
-   return FALSE;
+    if (DGA_GET_SCREEN_PRIV(screenInfo.screens[index]))
+        return TRUE;
+
+    return FALSE;
 }
 
 Bool
-DGAActive(int index) 
+DGAActive(int index)
 {
-   DGAScreenPtr pScreenPriv;
+    DGAScreenPtr pScreenPriv;
 
-   if(!DGAScreenKeyRegistered)
-	return FALSE;
+    if (!DGAScreenKeyRegistered)
+        return FALSE;
 
-   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
-   if(pScreenPriv && pScreenPriv->current)
-	return TRUE;
+    if (pScreenPriv && pScreenPriv->current)
+        return TRUE;
 
-   return FALSE;
+    return FALSE;
 }
 
-
-
 /* Called by the event code in case the server is abruptly terminated */
 
 void
@@ -570,35 +558,31 @@ DGAShutdown(void)
     ScrnInfoPtr pScrn;
     int i;
 
-    if(!DGAScreenKeyRegistered)
-	return;
+    if (!DGAScreenKeyRegistered)
+        return;
 
-    for(i = 0; i < screenInfo.numScreens; i++) {
-	pScrn = xf86Screens[i];
+    for (i = 0; i < screenInfo.numScreens; i++) {
+        pScrn = xf86Screens[i];
 
-	(void)(*pScrn->SetDGAMode)(pScrn->scrnIndex, 0, NULL);
+        (void) (*pScrn->SetDGAMode) (pScrn->scrnIndex, 0, NULL);
     }
 }
 
 /* Called by the extension to initialize a mode */
 
 int
-DGASetMode(
-   int index,
-   int num,
-   XDGAModePtr mode,
-   PixmapPtr *pPix
-){
+DGASetMode(int index, int num, XDGAModePtr mode, PixmapPtr *pPix)
+{
     ScrnInfoPtr pScrn = xf86Screens[index];
     DGADeviceRec device;
     int ret;
 
-    /* We rely on the extension to check that DGA is available */ 
+    /* We rely on the extension to check that DGA is available */
 
-    ret = (*pScrn->SetDGAMode)(index, num, &device);
-    if((ret == Success) && num) {
-	DGACopyModeInfo(device.mode, mode);
-	*pPix = device.pPix;
+    ret = (*pScrn->SetDGAMode) (index, num, &device);
+    if ((ret == Success) && num) {
+        DGACopyModeInfo(device.mode, mode);
+        *pPix = device.pPix;
     }
 
     return ret;
@@ -607,124 +591,119 @@ DGASetMode(
 /* Called from the extension to let the DDX know which events are requested */
 
 void
-DGASelectInput(
-   int index,
-   ClientPtr client,
-   long mask
-){
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
-
-   /* We rely on the extension to check that DGA is available */
-   pScreenPriv->client = client;
-   pScreenPriv->input = mask;
+DGASelectInput(int index, ClientPtr client, long mask)
+{
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+    /* We rely on the extension to check that DGA is available */
+    pScreenPriv->client = client;
+    pScreenPriv->input = mask;
 }
 
 int
-DGAGetViewportStatus(int index) 
+DGAGetViewportStatus(int index)
 {
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
-   /* We rely on the extension to check that DGA is active */ 
+    /* We rely on the extension to check that DGA is active */
 
-   if (!pScreenPriv->funcs->GetViewport)
-      return 0;
+    if (!pScreenPriv->funcs->GetViewport)
+        return 0;
 
-   return (*pScreenPriv->funcs->GetViewport)(pScreenPriv->pScrn);
+    return (*pScreenPriv->funcs->GetViewport) (pScreenPriv->pScrn);
 }
 
 int
-DGASetViewport(
-   int index,
-   int x, int y,
-   int mode
-){
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
-
-   if (pScreenPriv->funcs->SetViewport)
-      (*pScreenPriv->funcs->SetViewport)(pScreenPriv->pScrn, x, y, mode);
-   return Success;
-}
+DGASetViewport(int index, int x, int y, int mode)
+{
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
+    if (pScreenPriv->funcs->SetViewport)
+        (*pScreenPriv->funcs->SetViewport) (pScreenPriv->pScrn, x, y, mode);
+    return Success;
+}
 
 static int
 BitsClear(CARD32 data)
 {
-   int bits = 0;
-   CARD32 mask;
-
-   for(mask = 1; mask; mask <<= 1) {
-	if(!(data & mask)) bits++;
-	else break;
-   }
+    int bits = 0;
+    CARD32 mask;
+
+    for (mask = 1; mask; mask <<= 1) {
+        if (!(data & mask))
+            bits++;
+        else
+            break;
+    }
 
-   return bits;
+    return bits;
 }
 
 int
 DGACreateColormap(int index, ClientPtr client, int id, int mode, int alloc)
 {
-   ScreenPtr pScreen = screenInfo.screens[index];
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
-   FakedVisualList *fvlp;
-   VisualPtr pVisual;
-   DGAModePtr pMode;
-   ColormapPtr pmap;
-
-   if(!mode || (mode > pScreenPriv->numModes))
-	return BadValue;
-
-   if((alloc != AllocNone) && (alloc != AllocAll))
-	return BadValue;
-
-   pMode = &(pScreenPriv->modes[mode - 1]);
-
-   if(!(pVisual = malloc(sizeof(VisualRec))))
-	return BadAlloc;
-
-   pVisual->vid = FakeClientID(0);
-   pVisual->class = pMode->visualClass;
-   pVisual->nplanes = pMode->depth;
-   pVisual->ColormapEntries = 1 << pMode->depth;
-   pVisual->bitsPerRGBValue = (pMode->depth + 2) / 3;
-
-   switch (pVisual->class) {
-   case PseudoColor:
-   case GrayScale:
-   case StaticGray:
-	pVisual->bitsPerRGBValue = 8; /* not quite */
-	pVisual->redMask     = 0;
-	pVisual->greenMask   = 0;
-	pVisual->blueMask    = 0;
-	pVisual->offsetRed   = 0;
-	pVisual->offsetGreen = 0;
-	pVisual->offsetBlue  = 0;
-	break;
-   case DirectColor:
-   case TrueColor:
-	pVisual->ColormapEntries = 1 << pVisual->bitsPerRGBValue;
-                /* fall through */
-   case StaticColor:
-	pVisual->redMask = pMode->red_mask;
-	pVisual->greenMask = pMode->green_mask;
-	pVisual->blueMask = pMode->blue_mask;
-	pVisual->offsetRed   = BitsClear(pVisual->redMask);
-	pVisual->offsetGreen = BitsClear(pVisual->greenMask);
-	pVisual->offsetBlue  = BitsClear(pVisual->blueMask);
-   }
-
-   if(!(fvlp = malloc(sizeof(FakedVisualList)))) {
-	free(pVisual);
-	return BadAlloc;
-   }
-
-   fvlp->free = FALSE;
-   fvlp->pVisual = pVisual;
-   fvlp->next = pScreenPriv->fakedVisuals;
-   pScreenPriv->fakedVisuals = fvlp;
-
-   LEGAL_NEW_RESOURCE(id, client);
-
-   return CreateColormap(id, pScreen, pVisual, &pmap, alloc, client->index);
+    ScreenPtr pScreen = screenInfo.screens[index];
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+    FakedVisualList *fvlp;
+    VisualPtr pVisual;
+    DGAModePtr pMode;
+    ColormapPtr pmap;
+
+    if (!mode || (mode > pScreenPriv->numModes))
+        return BadValue;
+
+    if ((alloc != AllocNone) && (alloc != AllocAll))
+        return BadValue;
+
+    pMode = &(pScreenPriv->modes[mode - 1]);
+
+    if (!(pVisual = malloc(sizeof(VisualRec))))
+        return BadAlloc;
+
+    pVisual->vid = FakeClientID(0);
+    pVisual->class = pMode->visualClass;
+    pVisual->nplanes = pMode->depth;
+    pVisual->ColormapEntries = 1 << pMode->depth;
+    pVisual->bitsPerRGBValue = (pMode->depth + 2) / 3;
+
+    switch (pVisual->class) {
+    case PseudoColor:
+    case GrayScale:
+    case StaticGray:
+        pVisual->bitsPerRGBValue = 8;   /* not quite */
+        pVisual->redMask = 0;
+        pVisual->greenMask = 0;
+        pVisual->blueMask = 0;
+        pVisual->offsetRed = 0;
+        pVisual->offsetGreen = 0;
+        pVisual->offsetBlue = 0;
+        break;
+    case DirectColor:
+    case TrueColor:
+        pVisual->ColormapEntries = 1 << pVisual->bitsPerRGBValue;
+        /* fall through */
+    case StaticColor:
+        pVisual->redMask = pMode->red_mask;
+        pVisual->greenMask = pMode->green_mask;
+        pVisual->blueMask = pMode->blue_mask;
+        pVisual->offsetRed = BitsClear(pVisual->redMask);
+        pVisual->offsetGreen = BitsClear(pVisual->greenMask);
+        pVisual->offsetBlue = BitsClear(pVisual->blueMask);
+    }
+
+    if (!(fvlp = malloc(sizeof(FakedVisualList)))) {
+        free(pVisual);
+        return BadAlloc;
+    }
+
+    fvlp->free = FALSE;
+    fvlp->pVisual = pVisual;
+    fvlp->next = pScreenPriv->fakedVisuals;
+    pScreenPriv->fakedVisuals = fvlp;
+
+    LEGAL_NEW_RESOURCE(id, client);
+
+    return CreateColormap(id, pScreen, pVisual, &pmap, alloc, client->index);
 }
 
 /*  Called by the extension to install a colormap on DGA active screens */
@@ -735,198 +714,184 @@ DGAInstallCmap(ColormapPtr cmap)
     ScreenPtr pScreen = cmap->pScreen;
     DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
 
-    /* We rely on the extension to check that DGA is active */ 
+    /* We rely on the extension to check that DGA is active */
 
-    if(!pScreenPriv->dgaColormap) 
-	pScreenPriv->savedColormap = GetInstalledmiColormap(pScreen);
+    if (!pScreenPriv->dgaColormap)
+        pScreenPriv->savedColormap = GetInstalledmiColormap(pScreen);
 
-    pScreenPriv->dgaColormap = cmap;    
+    pScreenPriv->dgaColormap = cmap;
 
-    (*pScreen->InstallColormap)(cmap);
+    (*pScreen->InstallColormap) (cmap);
 }
 
 int
 DGASync(int index)
 {
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
-   
-   /* We rely on the extension to check that DGA is active */
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
-   if (pScreenPriv->funcs->Sync)
-      (*pScreenPriv->funcs->Sync)(pScreenPriv->pScrn);
+    /* We rely on the extension to check that DGA is active */
 
-   return Success;
+    if (pScreenPriv->funcs->Sync)
+        (*pScreenPriv->funcs->Sync) (pScreenPriv->pScrn);
+
+    return Success;
 }
 
 int
-DGAFillRect(
-   int index,
-   int x, int y, int w, int h,
-   unsigned long color
-){
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
-   
-   /* We rely on the extension to check that DGA is active */
-
-   if(pScreenPriv->funcs->FillRect && 
-	(pScreenPriv->current->mode->flags & DGA_FILL_RECT)) {
-
-	(*pScreenPriv->funcs->FillRect)(pScreenPriv->pScrn, x, y, w, h, color);
-	return Success;
-   }
-   return BadMatch;
+DGAFillRect(int index, int x, int y, int w, int h, unsigned long color)
+{
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+    /* We rely on the extension to check that DGA is active */
+
+    if (pScreenPriv->funcs->FillRect &&
+        (pScreenPriv->current->mode->flags & DGA_FILL_RECT)) {
+
+        (*pScreenPriv->funcs->FillRect) (pScreenPriv->pScrn, x, y, w, h, color);
+        return Success;
+    }
+    return BadMatch;
 }
 
 int
-DGABlitRect(
-   int index,
-   int srcx, int srcy, 
-   int w, int h, 
-   int dstx, int dsty
-){
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
-   
-   /* We rely on the extension to check that DGA is active */
-
-   if(pScreenPriv->funcs->BlitRect &&
-	(pScreenPriv->current->mode->flags & DGA_BLIT_RECT)) {
-
-	(*pScreenPriv->funcs->BlitRect)(pScreenPriv->pScrn, 	
-		srcx, srcy, w, h, dstx, dsty);
-	return Success;
-   }
-   return BadMatch;
+DGABlitRect(int index, int srcx, int srcy, int w, int h, int dstx, int dsty)
+{
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+    /* We rely on the extension to check that DGA is active */
+
+    if (pScreenPriv->funcs->BlitRect &&
+        (pScreenPriv->current->mode->flags & DGA_BLIT_RECT)) {
+
+        (*pScreenPriv->funcs->BlitRect) (pScreenPriv->pScrn,
+                                         srcx, srcy, w, h, dstx, dsty);
+        return Success;
+    }
+    return BadMatch;
 }
 
 int
-DGABlitTransRect(
-   int index,
-   int srcx, int srcy, 
-   int w, int h, 
-   int dstx, int dsty,
-   unsigned long color
-){
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
-   
-   /* We rely on the extension to check that DGA is active */
-
-   if(pScreenPriv->funcs->BlitTransRect && 
-	(pScreenPriv->current->mode->flags & DGA_BLIT_RECT_TRANS)) {
-
-	(*pScreenPriv->funcs->BlitTransRect)(pScreenPriv->pScrn, 	
-		srcx, srcy, w, h, dstx, dsty, color);
-	return Success;
-   }
-   return BadMatch;
-}
+DGABlitTransRect(int index,
+                 int srcx, int srcy,
+                 int w, int h, int dstx, int dsty, unsigned long color)
+{
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
+    /* We rely on the extension to check that DGA is active */
+
+    if (pScreenPriv->funcs->BlitTransRect &&
+        (pScreenPriv->current->mode->flags & DGA_BLIT_RECT_TRANS)) {
+
+        (*pScreenPriv->funcs->BlitTransRect) (pScreenPriv->pScrn,
+                                              srcx, srcy, w, h, dstx, dsty,
+                                              color);
+        return Success;
+    }
+    return BadMatch;
+}
 
 int
 DGAGetModes(int index)
 {
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
-   /* We rely on the extension to check that DGA is available */
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
-   return pScreenPriv->numModes;
-}
+    /* We rely on the extension to check that DGA is available */
 
+    return pScreenPriv->numModes;
+}
 
 int
-DGAGetModeInfo(
-  int index,
-  XDGAModePtr mode,
-  int num
-){
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
-   /* We rely on the extension to check that DGA is available */
+DGAGetModeInfo(int index, XDGAModePtr mode, int num)
+{
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
-   if((num <= 0) || (num > pScreenPriv->numModes))
-	return BadValue;
+    /* We rely on the extension to check that DGA is available */
 
-   DGACopyModeInfo(&(pScreenPriv->modes[num - 1]), mode);
+    if ((num <= 0) || (num > pScreenPriv->numModes))
+        return BadValue;
 
-   return Success;
-}
+    DGACopyModeInfo(&(pScreenPriv->modes[num - 1]), mode);
 
+    return Success;
+}
 
 static void
-DGACopyModeInfo(
-   DGAModePtr mode,
-   XDGAModePtr xmode
-){
-   DisplayModePtr dmode = mode->mode;
-
-   xmode->num = mode->num;
-   xmode->name = dmode->name;
-   xmode->VSync_num = (int)(dmode->VRefresh * 1000.0); 
-   xmode->VSync_den = 1000;
-   xmode->flags = mode->flags;
-   xmode->imageWidth = mode->imageWidth;
-   xmode->imageHeight = mode->imageHeight;
-   xmode->pixmapWidth = mode->pixmapWidth;
-   xmode->pixmapHeight = mode->pixmapHeight;
-   xmode->bytesPerScanline = mode->bytesPerScanline;
-   xmode->byteOrder = mode->byteOrder;
-   xmode->depth = mode->depth;
-   xmode->bitsPerPixel = mode->bitsPerPixel;
-   xmode->red_mask = mode->red_mask;
-   xmode->green_mask = mode->green_mask;
-   xmode->blue_mask = mode->blue_mask;
-   xmode->visualClass = mode->visualClass;
-   xmode->viewportWidth = mode->viewportWidth;
-   xmode->viewportHeight = mode->viewportHeight;
-   xmode->xViewportStep = mode->xViewportStep;
-   xmode->yViewportStep = mode->yViewportStep;
-   xmode->maxViewportX = mode->maxViewportX;
-   xmode->maxViewportY = mode->maxViewportY;
-   xmode->viewportFlags = mode->viewportFlags;
-   xmode->reserved1 = mode->reserved1;
-   xmode->reserved2 = mode->reserved2;
-   xmode->offset = mode->offset;
-
-   if(dmode->Flags & V_INTERLACE) xmode->flags |= DGA_INTERLACED;
-   if(dmode->Flags & V_DBLSCAN) xmode->flags |= DGA_DOUBLESCAN;
+DGACopyModeInfo(DGAModePtr mode, XDGAModePtr xmode)
+{
+    DisplayModePtr dmode = mode->mode;
+
+    xmode->num = mode->num;
+    xmode->name = dmode->name;
+    xmode->VSync_num = (int) (dmode->VRefresh * 1000.0);
+    xmode->VSync_den = 1000;
+    xmode->flags = mode->flags;
+    xmode->imageWidth = mode->imageWidth;
+    xmode->imageHeight = mode->imageHeight;
+    xmode->pixmapWidth = mode->pixmapWidth;
+    xmode->pixmapHeight = mode->pixmapHeight;
+    xmode->bytesPerScanline = mode->bytesPerScanline;
+    xmode->byteOrder = mode->byteOrder;
+    xmode->depth = mode->depth;
+    xmode->bitsPerPixel = mode->bitsPerPixel;
+    xmode->red_mask = mode->red_mask;
+    xmode->green_mask = mode->green_mask;
+    xmode->blue_mask = mode->blue_mask;
+    xmode->visualClass = mode->visualClass;
+    xmode->viewportWidth = mode->viewportWidth;
+    xmode->viewportHeight = mode->viewportHeight;
+    xmode->xViewportStep = mode->xViewportStep;
+    xmode->yViewportStep = mode->yViewportStep;
+    xmode->maxViewportX = mode->maxViewportX;
+    xmode->maxViewportY = mode->maxViewportY;
+    xmode->viewportFlags = mode->viewportFlags;
+    xmode->reserved1 = mode->reserved1;
+    xmode->reserved2 = mode->reserved2;
+    xmode->offset = mode->offset;
+
+    if (dmode->Flags & V_INTERLACE)
+        xmode->flags |= DGA_INTERLACED;
+    if (dmode->Flags & V_DBLSCAN)
+        xmode->flags |= DGA_DOUBLESCAN;
 }
 
-
 Bool
 DGAVTSwitch(void)
 {
     ScreenPtr pScreen;
     int i;
 
-    for(i = 0; i < screenInfo.numScreens; i++) {
-       pScreen = screenInfo.screens[i];	
+    for (i = 0; i < screenInfo.numScreens; i++) {
+        pScreen = screenInfo.screens[i];
 
-       /* Alternatively, this could send events to DGA clients */
+        /* Alternatively, this could send events to DGA clients */
 
-       if(DGAScreenKeyRegistered) {
-	   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+        if (DGAScreenKeyRegistered) {
+            DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
 
-	   if(pScreenPriv && pScreenPriv->current)
-		return FALSE;
-       }
+            if (pScreenPriv && pScreenPriv->current)
+                return FALSE;
+        }
     }
 
-   return TRUE;
+    return TRUE;
 }
 
 Bool
 DGAStealKeyEvent(DeviceIntPtr dev, int index, int key_code, int is_down)
 {
-   DGAScreenPtr pScreenPriv;
-   DGAEvent     event;
+    DGAScreenPtr pScreenPriv;
+    DGAEvent event;
 
-   if(!DGAScreenKeyRegistered) /* no DGA */
+    if (!DGAScreenKeyRegistered)        /* no DGA */
         return FALSE;
 
-   if (key_code < 8 || key_code > 255)
-       return FALSE;
+    if (key_code < 8 || key_code > 255)
+        return FALSE;
 
-   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
-   if(!pScreenPriv || !pScreenPriv->grabKeyboard) /* no direct mode */
-        return FALSE; 
+    if (!pScreenPriv || !pScreenPriv->grabKeyboard)     /* no direct mode */
+        return FALSE;
 
     memset(&event, 0, sizeof(event));
     event.header = ET_Internal;
@@ -937,23 +902,23 @@ DGAStealKeyEvent(DeviceIntPtr dev, int index, int key_code, int is_down)
     event.detail = key_code;
     event.dx = 0;
     event.dy = 0;
-    mieqEnqueue (dev, (InternalEvent*)&event);
+    mieqEnqueue(dev, (InternalEvent *) &event);
 
-   return TRUE;
-}  
+    return TRUE;
+}
 
 Bool
 DGAStealMotionEvent(DeviceIntPtr dev, int index, int dx, int dy)
 {
-   DGAScreenPtr pScreenPriv;
-   DGAEvent event;
+    DGAScreenPtr pScreenPriv;
+    DGAEvent event;
 
-   if(!DGAScreenKeyRegistered) /* no DGA */
+    if (!DGAScreenKeyRegistered)        /* no DGA */
         return FALSE;
-    
-   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
-   if(!pScreenPriv || !pScreenPriv->grabMouse) /* no direct mode */
+    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+    if (!pScreenPriv || !pScreenPriv->grabMouse)        /* no direct mode */
         return FALSE;
 
     memset(&event, 0, sizeof(event));
@@ -965,7 +930,7 @@ DGAStealMotionEvent(DeviceIntPtr dev, int index, int dx, int dy)
     event.detail = 0;
     event.dx = dx;
     event.dy = dy;
-    mieqEnqueue (dev, (InternalEvent*)&event);
+    mieqEnqueue(dev, (InternalEvent *) &event);
     return TRUE;
 }
 
@@ -975,9 +940,9 @@ DGAStealButtonEvent(DeviceIntPtr dev, int index, int button, int is_down)
     DGAScreenPtr pScreenPriv;
     DGAEvent event;
 
-    if(!DGAScreenKeyRegistered) /* no DGA */
+    if (!DGAScreenKeyRegistered)        /* no DGA */
         return FALSE;
-    
+
     pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
     if (!pScreenPriv || !pScreenPriv->grabMouse)
@@ -992,32 +957,31 @@ DGAStealButtonEvent(DeviceIntPtr dev, int index, int button, int is_down)
     event.detail = button;
     event.dx = 0;
     event.dy = 0;
-    mieqEnqueue (dev, (InternalEvent*)&event);
+    mieqEnqueue(dev, (InternalEvent *) &event);
 
     return TRUE;
 }
 
 /* We have the power to steal or modify events that are about to get queued */
 
-#define NoSuchEvent 0x80000000	/* so doesn't match NoEventMask */
-static Mask filters[] =
-{
-	NoSuchEvent,		       /* 0 */
-	NoSuchEvent,		       /* 1 */
-	KeyPressMask,		       /* KeyPress */
-	KeyReleaseMask,		       /* KeyRelease */
-	ButtonPressMask,	       /* ButtonPress */
-	ButtonReleaseMask,	       /* ButtonRelease */
-	PointerMotionMask,	       /* MotionNotify (initial state) */
+#define NoSuchEvent 0x80000000  /* so doesn't match NoEventMask */
+static Mask filters[] = {
+    NoSuchEvent,                /* 0 */
+    NoSuchEvent,                /* 1 */
+    KeyPressMask,               /* KeyPress */
+    KeyReleaseMask,             /* KeyRelease */
+    ButtonPressMask,            /* ButtonPress */
+    ButtonReleaseMask,          /* ButtonRelease */
+    PointerMotionMask,          /* MotionNotify (initial state) */
 };
 
 static void
-DGAProcessKeyboardEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr keybd)
+DGAProcessKeyboardEvent(ScreenPtr pScreen, DGAEvent * event, DeviceIntPtr keybd)
 {
-    KeyClassPtr	    keyc = keybd->key;
-    DGAScreenPtr    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
-    DeviceIntPtr    pointer = GetMaster(keybd, POINTER_OR_FLOAT);
-    DeviceEvent     ev;
+    KeyClassPtr keyc = keybd->key;
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+    DeviceIntPtr pointer = GetMaster(keybd, POINTER_OR_FLOAT);
+    DeviceEvent ev;
 
     memset(&ev, 0, sizeof(ev));
     ev.header = ET_Internal;
@@ -1034,9 +998,9 @@ DGAProcessKeyboardEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr keybd)
     /*
      * Deliver the DGA event
      */
-    if (pScreenPriv->client)
-    {
+    if (pScreenPriv->client) {
         dgaEvent de;
+
         de.u.u.type = *XDGAEventBase + GetCoreType(ev.type);
         de.u.u.detail = event->detail;
         de.u.event.time = event->time;
@@ -1045,39 +1009,37 @@ DGAProcessKeyboardEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr keybd)
         de.u.event.screen = pScreen->myNum;
         de.u.event.state = ev.corestate;
 
-	/* If the DGA client has selected input, then deliver based on the usual filter */
-	TryClientEvents (pScreenPriv->client, keybd, (xEvent *)&de, 1,
-			 filters[ev.type], pScreenPriv->input, 0);
+        /* If the DGA client has selected input, then deliver based on the usual filter */
+        TryClientEvents(pScreenPriv->client, keybd, (xEvent *) &de, 1,
+                        filters[ev.type], pScreenPriv->input, 0);
     }
-    else
-    {
-	/* If the keyboard is actively grabbed, deliver a grabbed core event */
-	if (keybd->deviceGrab.grab && !keybd->deviceGrab.fromPassiveGrab)
-	{
+    else {
+        /* If the keyboard is actively grabbed, deliver a grabbed core event */
+        if (keybd->deviceGrab.grab && !keybd->deviceGrab.fromPassiveGrab) {
             ev.detail.key = event->detail;
-            ev.time       = event->time;
-            ev.root_x     = event->dx;
-            ev.root_y     = event->dy;
-            ev.corestate  = event->state;
-            ev.deviceid   = keybd->id;
-	    DeliverGrabbedEvent ((InternalEvent*)&ev, keybd, FALSE);
-	}
+            ev.time = event->time;
+            ev.root_x = event->dx;
+            ev.root_y = event->dy;
+            ev.corestate = event->state;
+            ev.deviceid = keybd->id;
+            DeliverGrabbedEvent((InternalEvent *) &ev, keybd, FALSE);
+        }
     }
 }
 
 static void
-DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse)
+DGAProcessPointerEvent(ScreenPtr pScreen, DGAEvent * event, DeviceIntPtr mouse)
 {
-    ButtonClassPtr  butc = mouse->button;
-    DGAScreenPtr    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
-    DeviceEvent     ev;
-    DeviceIntPtr    master = GetMaster(mouse, MASTER_KEYBOARD);
+    ButtonClassPtr butc = mouse->button;
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+    DeviceEvent ev;
+    DeviceIntPtr master = GetMaster(mouse, MASTER_KEYBOARD);
 
     memset(&ev, 0, sizeof(ev));
     ev.header = ET_Internal;
     ev.length = sizeof(ev);
     ev.type = event->subtype;
-    ev.corestate  = butc ? butc->state : 0;
+    ev.corestate = butc ? butc->state : 0;
     if (master && master->key)
         ev.corestate |= XkbStateFieldFromRec(&master->key->xkbInfo->state);
 
@@ -1086,10 +1048,9 @@ DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse)
     /*
      * Deliver the DGA event
      */
-    if (pScreenPriv->client)
-    {
-        dgaEvent        de;
-        int		coreEquiv;
+    if (pScreenPriv->client) {
+        dgaEvent de;
+        int coreEquiv;
 
         coreEquiv = GetCoreType(ev.type);
 
@@ -1101,54 +1062,49 @@ DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse)
         de.u.event.screen = pScreen->myNum;
         de.u.event.state = ev.corestate;
 
-	/* If the DGA client has selected input, then deliver based on the usual filter */
-	TryClientEvents (pScreenPriv->client, mouse, (xEvent *)&de, 1,
-			 filters[coreEquiv], pScreenPriv->input, 0);
+        /* If the DGA client has selected input, then deliver based on the usual filter */
+        TryClientEvents(pScreenPriv->client, mouse, (xEvent *) &de, 1,
+                        filters[coreEquiv], pScreenPriv->input, 0);
     }
-    else
-    {
-	/* If the pointer is actively grabbed, deliver a grabbed core event */
-	if (mouse->deviceGrab.grab && !mouse->deviceGrab.fromPassiveGrab)
-	{
-            ev.detail.button    = event->detail;
-            ev.time             = event->time;
-            ev.root_x           = event->dx;
-            ev.root_y           = event->dy;
-            ev.corestate        = event->state;
+    else {
+        /* If the pointer is actively grabbed, deliver a grabbed core event */
+        if (mouse->deviceGrab.grab && !mouse->deviceGrab.fromPassiveGrab) {
+            ev.detail.button = event->detail;
+            ev.time = event->time;
+            ev.root_x = event->dx;
+            ev.root_y = event->dy;
+            ev.corestate = event->state;
             /* DGA is core only, so valuators.data doesn't actually matter.
              * Mask must be set for EventToCore to create motion events. */
             SetBit(ev.valuators.mask, 0);
             SetBit(ev.valuators.mask, 1);
-	    DeliverGrabbedEvent ((InternalEvent*)&ev, mouse, FALSE);
-	}
+            DeliverGrabbedEvent((InternalEvent *) &ev, mouse, FALSE);
+        }
     }
 }
 
 Bool
-DGAOpenFramebuffer(
-   int index,
-   char **name,
-   unsigned char **mem,
-   int *size,
-   int *offset,
-   int *flags
-){
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
-
-   /* We rely on the extension to check that DGA is available */
-
-   return (*pScreenPriv->funcs->OpenFramebuffer)(pScreenPriv->pScrn, 
-				name, mem, size, offset, flags);
+DGAOpenFramebuffer(int index,
+                   char **name,
+                   unsigned char **mem, int *size, int *offset, int *flags)
+{
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+    /* We rely on the extension to check that DGA is available */
+
+    return (*pScreenPriv->funcs->OpenFramebuffer) (pScreenPriv->pScrn,
+                                                   name, mem, size, offset,
+                                                   flags);
 }
 
 void
 DGACloseFramebuffer(int index)
 {
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
-   /* We rely on the extension to check that DGA is available */
-   if(pScreenPriv->funcs->CloseFramebuffer)
-	(*pScreenPriv->funcs->CloseFramebuffer)(pScreenPriv->pScrn);
+    /* We rely on the extension to check that DGA is available */
+    if (pScreenPriv->funcs->CloseFramebuffer)
+        (*pScreenPriv->funcs->CloseFramebuffer) (pScreenPriv->pScrn);
 }
 
 /*  For DGA 1.0 backwards compatibility only */
@@ -1156,62 +1112,62 @@ DGACloseFramebuffer(int index)
 int
 DGAGetOldDGAMode(int index)
 {
-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
-   ScrnInfoPtr pScrn = pScreenPriv->pScrn;
-   DGAModePtr mode;
-   int i, w, h, p;
-
-   /* We rely on the extension to check that DGA is available */
-
-   w = pScrn->currentMode->HDisplay;
-   h = pScrn->currentMode->VDisplay;
-   p = pad_to_int32(pScrn->displayWidth * bits_to_bytes(pScrn->bitsPerPixel));
-
-   for(i = 0; i < pScreenPriv->numModes; i++) {
-	mode = &(pScreenPriv->modes[i]);
-  	      
-	if((mode->viewportWidth == w) && (mode->viewportHeight == h) &&
-		(mode->bytesPerScanline == p) && 
-		(mode->bitsPerPixel == pScrn->bitsPerPixel) &&
-		(mode->depth == pScrn->depth)) {
-
-		return mode->num;
-	}
-   }
-
-   return 0;
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+    ScrnInfoPtr pScrn = pScreenPriv->pScrn;
+    DGAModePtr mode;
+    int i, w, h, p;
+
+    /* We rely on the extension to check that DGA is available */
+
+    w = pScrn->currentMode->HDisplay;
+    h = pScrn->currentMode->VDisplay;
+    p = pad_to_int32(pScrn->displayWidth * bits_to_bytes(pScrn->bitsPerPixel));
+
+    for (i = 0; i < pScreenPriv->numModes; i++) {
+        mode = &(pScreenPriv->modes[i]);
+
+        if ((mode->viewportWidth == w) && (mode->viewportHeight == h) &&
+            (mode->bytesPerScanline == p) &&
+            (mode->bitsPerPixel == pScrn->bitsPerPixel) &&
+            (mode->depth == pScrn->depth)) {
+
+            return mode->num;
+        }
+    }
+
+    return 0;
 }
 
 static void
 DGAHandleEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
 {
-    DGAEvent	    *event= &ev->dga_event;
-    ScreenPtr       pScreen = screenInfo.screens[screen_num];
-    DGAScreenPtr    pScreenPriv;
+    DGAEvent *event = &ev->dga_event;
+    ScreenPtr pScreen = screenInfo.screens[screen_num];
+    DGAScreenPtr pScreenPriv;
 
     /* no DGA */
     if (!DGAScreenKeyRegistered || XDGAEventBase == 0)
-	return;
+        return;
     pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
 
     /* DGA not initialized on this screen */
     if (!pScreenPriv)
-	return;
+        return;
 
     if (!IsMaster(device))
-	return;
+        return;
 
     switch (event->subtype) {
     case KeyPress:
     case KeyRelease:
-	DGAProcessKeyboardEvent (pScreen, event, device);
-	break;
+        DGAProcessKeyboardEvent(pScreen, event, device);
+        break;
     case MotionNotify:
     case ButtonPress:
     case ButtonRelease:
-	DGAProcessPointerEvent (pScreen, event, device);
+        DGAProcessPointerEvent(pScreen, event, device);
         break;
     default:
-	break;
+        break;
     }
 }
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c
index 41ffabde3..058057e92 100644
--- a/xorg-server/hw/xfree86/common/xf86Events.c
+++ b/xorg-server/hw/xfree86/common/xf86Events.c
@@ -93,15 +93,15 @@
  * This has been generalised to work with Linux and *BSD+syscons (DHD)
  */
 
-Bool VTSwitchEnabled = TRUE;		/* Allows run-time disabling for
-                                         *BSD and for avoiding VT
-                                         switches when using the DRI
-                                         automatic full screen mode.*/
+Bool VTSwitchEnabled = TRUE;    /* Allows run-time disabling for
+                                 *BSD and for avoiding VT
+                                 switches when using the DRI
+                                 automatic full screen mode.*/
 
 extern fd_set EnabledDevices;
 
 #ifdef XF86PM
-extern void (*xf86OSPMClose)(void);
+extern void (*xf86OSPMClose) (void);
 #endif
 
 static void xf86VTSwitch(void);
@@ -111,16 +111,15 @@ static void xf86VTSwitch(void);
  * Wakeup handler.
  */
 typedef struct x_IHRec {
-    int			fd;
-    InputHandlerProc	ihproc;
-    pointer		data;
-    Bool		enabled;
-    struct x_IHRec *	next;
+    int fd;
+    InputHandlerProc ihproc;
+    pointer data;
+    Bool enabled;
+    struct x_IHRec *next;
 } IHRec, *IHPtr;
 
 static IHPtr InputHandlers = NULL;
 
-
 Bool
 LegalModifier(unsigned int key, DeviceIntPtr pDev)
 {
@@ -135,10 +134,10 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev)
 int
 TimeSinceLastInputEvent(void)
 {
-  if (xf86Info.lastEventTime == 0) {
-    xf86Info.lastEventTime = GetTimeInMillis();
-  }
-  return GetTimeInMillis() - xf86Info.lastEventTime;
+    if (xf86Info.lastEventTime == 0) {
+        xf86Info.lastEventTime = GetTimeInMillis();
+    }
+    return GetTimeInMillis() - xf86Info.lastEventTime;
 }
 
 /*
@@ -148,7 +147,7 @@ TimeSinceLastInputEvent(void)
 void
 SetTimeSinceLastInputEvent(void)
 {
-  xf86Info.lastEventTime = GetTimeInMillis();
+    xf86Info.lastEventTime = GetTimeInMillis();
 }
 
 /*
@@ -158,15 +157,16 @@ SetTimeSinceLastInputEvent(void)
  *      and keyboard.
  */
 void
-ProcessInputEvents (void)
+ProcessInputEvents(void)
 {
-  int x, y;
+    int x, y;
+
+    mieqProcessInputEvents();
 
-  mieqProcessInputEvents();
+    /* FIXME: This is a problem if we have multiple pointers */
+    miPointerGetPosition(inputInfo.pointer, &x, &y);
 
-  /* FIXME: This is a problem if we have multiple pointers */
-  miPointerGetPosition(inputInfo.pointer, &x, &y);
-  xf86SetViewport(xf86Info.currentScreen, x, y);
+    xf86SetViewport(xf86Info.currentScreen, x, y);
 }
 
 /*
@@ -179,57 +179,57 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
     DebugF("ProcessActionEvent(%d,%x)\n", (int) action, arg);
     switch (action) {
     case ACTION_TERMINATE:
-	if (!xf86Info.dontZap) {
+        if (!xf86Info.dontZap) {
 #ifdef XFreeXDGA
-	    DGAShutdown();
+            DGAShutdown();
 #endif
-	    GiveUp(0);
-	}
-	break;
+            GiveUp(0);
+        }
+        break;
     case ACTION_NEXT_MODE:
-	if (!xf86Info.dontZoom)
-	    xf86ZoomViewport(xf86Info.currentScreen,  1);
-	break;
+        if (!xf86Info.dontZoom)
+            xf86ZoomViewport(xf86Info.currentScreen, 1);
+        break;
     case ACTION_PREV_MODE:
-	if (!xf86Info.dontZoom)
-	    xf86ZoomViewport(xf86Info.currentScreen, -1);
-	break;
+        if (!xf86Info.dontZoom)
+            xf86ZoomViewport(xf86Info.currentScreen, -1);
+        break;
     case ACTION_SWITCHSCREEN:
-	if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) {
-	    int vtno = *((int *) arg);
-
-	    if (vtno != xf86Info.vtno) {
-		if (!xf86VTActivate(vtno)) {
-		    ErrorF("Failed to switch from vt%02d to vt%02d: %s\n",
-			   xf86Info.vtno, vtno, strerror(errno));
-		}
-	    }
-	}
-	break;
+        if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) {
+            int vtno = *((int *) arg);
+
+            if (vtno != xf86Info.vtno) {
+                if (!xf86VTActivate(vtno)) {
+                    ErrorF("Failed to switch from vt%02d to vt%02d: %s\n",
+                           xf86Info.vtno, vtno, strerror(errno));
+                }
+            }
+        }
+        break;
     case ACTION_SWITCHSCREEN_NEXT:
-	if (VTSwitchEnabled && !xf86Info.dontVTSwitch) {
-	    if (!xf86VTActivate(xf86Info.vtno + 1)) {
-		/* If first try failed, assume this is the last VT and
-		 * try wrapping around to the first vt.
-		 */
-		if (!xf86VTActivate(1)) {
-		    ErrorF("Failed to switch from vt%02d to next vt: %s\n",
-			   xf86Info.vtno, strerror(errno));
-		}
-	    }
-	}
-	break;
+        if (VTSwitchEnabled && !xf86Info.dontVTSwitch) {
+            if (!xf86VTActivate(xf86Info.vtno + 1)) {
+                /* If first try failed, assume this is the last VT and
+                 * try wrapping around to the first vt.
+                 */
+                if (!xf86VTActivate(1)) {
+                    ErrorF("Failed to switch from vt%02d to next vt: %s\n",
+                           xf86Info.vtno, strerror(errno));
+                }
+            }
+        }
+        break;
     case ACTION_SWITCHSCREEN_PREV:
-	if (VTSwitchEnabled && !xf86Info.dontVTSwitch && xf86Info.vtno > 0) {
-	    if (!xf86VTActivate(xf86Info.vtno - 1)) {
-		/* Don't know what the maximum VT is, so can't wrap around */
-		ErrorF("Failed to switch from vt%02d to previous vt: %s\n",
-		       xf86Info.vtno, strerror(errno));
-	    }
-	}
-	break;
+        if (VTSwitchEnabled && !xf86Info.dontVTSwitch && xf86Info.vtno > 0) {
+            if (!xf86VTActivate(xf86Info.vtno - 1)) {
+                /* Don't know what the maximum VT is, so can't wrap around */
+                ErrorF("Failed to switch from vt%02d to previous vt: %s\n",
+                       xf86Info.vtno, strerror(errno));
+            }
+        }
+        break;
     default:
-	break;
+        break;
     }
 }
 
@@ -242,49 +242,49 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
 void
 xf86Wakeup(pointer blockData, int err, pointer pReadmask)
 {
-    fd_set* LastSelectMask = (fd_set*)pReadmask;
+    fd_set *LastSelectMask = (fd_set *) pReadmask;
     fd_set devicesWithInput;
     InputInfoPtr pInfo;
 
     if (err >= 0) {
 
-	XFD_ANDSET(&devicesWithInput, LastSelectMask, &EnabledDevices);
-	if (XFD_ANYSET(&devicesWithInput)) {
-	    pInfo = xf86InputDevs;
-	    while (pInfo) {
-		if (pInfo->read_input && pInfo->fd >= 0 &&
-		    (FD_ISSET(pInfo->fd, &devicesWithInput) != 0)) {
-		    int sigstate = xf86BlockSIGIO();
-
-		    /*
-		     * Remove the descriptior from the set because more than one
-		     * device may share the same file descriptor.
-		     */
-		    FD_CLR(pInfo->fd, &devicesWithInput);
-
-		    pInfo->read_input(pInfo);
-		    xf86UnblockSIGIO(sigstate);
-		}
-		pInfo = pInfo->next;
-	    }
-	}
+        XFD_ANDSET(&devicesWithInput, LastSelectMask, &EnabledDevices);
+        if (XFD_ANYSET(&devicesWithInput)) {
+            pInfo = xf86InputDevs;
+            while (pInfo) {
+                if (pInfo->read_input && pInfo->fd >= 0 &&
+                    (FD_ISSET(pInfo->fd, &devicesWithInput) != 0)) {
+                    int sigstate = xf86BlockSIGIO();
+
+                    /*
+                     * Remove the descriptior from the set because more than one
+                     * device may share the same file descriptor.
+                     */
+                    FD_CLR(pInfo->fd, &devicesWithInput);
+
+                    pInfo->read_input(pInfo);
+                    xf86UnblockSIGIO(sigstate);
+                }
+                pInfo = pInfo->next;
+            }
+        }
     }
 
-    if (err >= 0) { /* we don't want the handlers called if select() */
-	IHPtr ih;   /* returned with an error condition, do we?      */
-	
-	for (ih = InputHandlers; ih; ih = ih->next) {
-	    if (ih->enabled && ih->fd >= 0 && ih->ihproc &&
-		(FD_ISSET(ih->fd, ((fd_set *)pReadmask)) != 0)) {
-		ih->ihproc(ih->fd, ih->data);
-	    }
-	}
+    if (err >= 0) {             /* we don't want the handlers called if select() */
+        IHPtr ih;               /* returned with an error condition, do we?      */
+
+        for (ih = InputHandlers; ih; ih = ih->next) {
+            if (ih->enabled && ih->fd >= 0 && ih->ihproc &&
+                (FD_ISSET(ih->fd, ((fd_set *) pReadmask)) != 0)) {
+                ih->ihproc(ih->fd, ih->data);
+            }
+        }
     }
 
-    if (xf86VTSwitchPending()) xf86VTSwitch();
+    if (xf86VTSwitchPending())
+        xf86VTSwitch();
 }
 
-
 /*
  * xf86SigioReadInput --
  *    signal handler for the SIGIO signal.
@@ -307,8 +307,8 @@ xf86SigioReadInput(int fd, void *closure)
 void
 xf86AddEnabledDevice(InputInfoPtr pInfo)
 {
-    if (!xf86InstallSIGIOHandler (pInfo->fd, xf86SigioReadInput, pInfo)) {
-	AddEnabledDevice(pInfo->fd);
+    if (!xf86InstallSIGIOHandler(pInfo->fd, xf86SigioReadInput, pInfo)) {
+        AddEnabledDevice(pInfo->fd);
     }
 }
 
@@ -319,8 +319,8 @@ xf86AddEnabledDevice(InputInfoPtr pInfo)
 void
 xf86RemoveEnabledDevice(InputInfoPtr pInfo)
 {
-    if (!xf86RemoveSIGIOHandler (pInfo->fd)) {
-	RemoveEnabledDevice(pInfo->fd);
+    if (!xf86RemoveSIGIOHandler(pInfo->fd)) {
+        RemoveEnabledDevice(pInfo->fd);
     }
 }
 
@@ -330,13 +330,13 @@ void
 xf86InterceptSignals(int *signo)
 {
     if ((xf86SignalIntercept = signo))
-	*signo = -1;
+        *signo = -1;
 }
 
-static void (*xf86SigIllHandler)(void) = NULL;
+static void (*xf86SigIllHandler) (void) = NULL;
 
 void
-xf86InterceptSigIll(void (*sigillhandler)(void))
+xf86InterceptSigIll(void (*sigillhandler) (void))
 {
     xf86SigIllHandler = sigillhandler;
 }
@@ -348,18 +348,18 @@ xf86InterceptSigIll(void (*sigillhandler)(void))
 int
 xf86SigWrapper(int signo)
 {
-  if ((signo == SIGILL) && xf86SigIllHandler) {
-    (*xf86SigIllHandler)();
-    return 0; /* continue */
-  }
-
-  if (xf86SignalIntercept && (*xf86SignalIntercept < 0)) {
-    *xf86SignalIntercept = signo;
-    return 0; /* continue */
-  }
-
-  xf86Info.caughtSignal = TRUE;
-  return 1; /* abort */
+    if ((signo == SIGILL) && xf86SigIllHandler) {
+        (*xf86SigIllHandler) ();
+        return 0;               /* continue */
+    }
+
+    if (xf86SignalIntercept && (*xf86SignalIntercept < 0)) {
+        *xf86SignalIntercept = signo;
+        return 0;               /* continue */
+    }
+
+    xf86Info.caughtSignal = TRUE;
+    return 1;                   /* abort */
 }
 
 /*
@@ -395,10 +395,9 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
      */
 
     for (i = keyc->xkbInfo->desc->min_key_code;
-         i < keyc->xkbInfo->desc->max_key_code;
-         i++) {
+         i < keyc->xkbInfo->desc->max_key_code; i++) {
         if (key_is_down(pDev, i, KEY_POSTED)) {
-            sigstate = xf86BlockSIGIO ();
+            sigstate = xf86BlockSIGIO();
             QueueKeyboardEvents(pDev, KeyRelease, i, NULL);
             xf86UnblockSIGIO(sigstate);
         }
@@ -412,142 +411,144 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
 static void
 xf86VTSwitch(void)
 {
-  int i;
-  static int prevSIGIO;
-  InputInfoPtr pInfo;
-  IHPtr ih;
+    int i;
+    static int prevSIGIO;
+    InputInfoPtr pInfo;
+    IHPtr ih;
 
-  DebugF("xf86VTSwitch()\n");
+    DebugF("xf86VTSwitch()\n");
 
 #ifdef XFreeXDGA
-  if(!DGAVTSwitch())
-	return;
+    if (!DGAVTSwitch())
+        return;
 #endif
 
-  /*
-   * Since all screens are currently all in the same state it is sufficient
-   * check the first.  This might change in future.
-   */
-  if (xf86Screens[0]->vtSema) {
+    /*
+     * Since all screens are currently all in the same state it is sufficient
+     * check the first.  This might change in future.
+     */
+    if (xf86Screens[0]->vtSema) {
 
-    DebugF("xf86VTSwitch: Leaving, xf86Exiting is %s\n",
-	   BOOLTOSTRING((dispatchException & DE_TERMINATE) ? TRUE : FALSE));
+        DebugF("xf86VTSwitch: Leaving, xf86Exiting is %s\n",
+               BOOLTOSTRING((dispatchException & DE_TERMINATE) ? TRUE : FALSE));
 #ifdef DPMSExtension
-    if (DPMSPowerLevel != DPMSModeOn)
-	DPMSSet(serverClient, DPMSModeOn);
+        if (DPMSPowerLevel != DPMSModeOn)
+            DPMSSet(serverClient, DPMSModeOn);
 #endif
-    for (i = 0; i < xf86NumScreens; i++) {
-      if (!(dispatchException & DE_TERMINATE))
-	if (xf86Screens[i]->EnableDisableFBAccess)
-	  (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
-    }
+        for (i = 0; i < xf86NumScreens; i++) {
+            if (!(dispatchException & DE_TERMINATE))
+                if (xf86Screens[i]->EnableDisableFBAccess)
+                    (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
+        }
 
-    /*
-     * Keep the order: Disable Device > LeaveVT
-     *                        EnterVT > EnableDevice
-     */
-    for (ih = InputHandlers; ih; ih = ih->next)
-      xf86DisableInputHandler(ih);
-    for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) {
-      if (pInfo->dev) {
-          xf86ReleaseKeys(pInfo->dev);
-          ProcessInputEvents();
-          DisableDevice(pInfo->dev, TRUE);
-      }
-    }
+        /*
+         * Keep the order: Disable Device > LeaveVT
+         *                        EnterVT > EnableDevice
+         */
+        for (ih = InputHandlers; ih; ih = ih->next)
+            xf86DisableInputHandler(ih);
+        for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) {
+            if (pInfo->dev) {
+                xf86ReleaseKeys(pInfo->dev);
+                ProcessInputEvents();
+                DisableDevice(pInfo->dev, TRUE);
+            }
+        }
+
+        prevSIGIO = xf86BlockSIGIO();
+        for (i = 0; i < xf86NumScreens; i++)
+            xf86Screens[i]->LeaveVT(i, 0);
+
+        xf86AccessLeave();      /* We need this here, otherwise */
+
+        if (!xf86VTSwitchAway()) {
+            /*
+             * switch failed
+             */
+
+            DebugF("xf86VTSwitch: Leave failed\n");
+            xf86AccessEnter();
+            for (i = 0; i < xf86NumScreens; i++) {
+                if (!xf86Screens[i]->EnterVT(i, 0))
+                    FatalError("EnterVT failed for screen %d\n", i);
+            }
+            if (!(dispatchException & DE_TERMINATE)) {
+                for (i = 0; i < xf86NumScreens; i++) {
+                    if (xf86Screens[i]->EnableDisableFBAccess)
+                        (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
+                }
+            }
+            dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
+
+            pInfo = xf86InputDevs;
+            while (pInfo) {
+                if (pInfo->dev)
+                    EnableDevice(pInfo->dev, TRUE);
+                pInfo = pInfo->next;
+            }
+            for (ih = InputHandlers; ih; ih = ih->next)
+                xf86EnableInputHandler(ih);
+
+            xf86UnblockSIGIO(prevSIGIO);
 
-    prevSIGIO = xf86BlockSIGIO();
-    for (i = 0; i < xf86NumScreens; i++)
-	xf86Screens[i]->LeaveVT(i, 0);
-
-    xf86AccessLeave();      /* We need this here, otherwise */
-
-    if (!xf86VTSwitchAway()) {
-      /*
-       * switch failed
-       */
-
-      DebugF("xf86VTSwitch: Leave failed\n");
-      xf86AccessEnter();
-      for (i = 0; i < xf86NumScreens; i++) {
-	if (!xf86Screens[i]->EnterVT(i, 0))
-	  FatalError("EnterVT failed for screen %d\n", i);
-      }
-      if (!(dispatchException & DE_TERMINATE)) {
-	for (i = 0; i < xf86NumScreens; i++) {
-	  if (xf86Screens[i]->EnableDisableFBAccess)
-	    (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
-	}
-      }
-      dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
-
-      pInfo = xf86InputDevs;
-      while (pInfo) {
-        if (pInfo->dev)
-            EnableDevice(pInfo->dev, TRUE);
-	pInfo = pInfo->next;
-      }
-      for (ih = InputHandlers; ih; ih = ih->next)
-        xf86EnableInputHandler(ih);
-
-      xf86UnblockSIGIO(prevSIGIO);
-
-    } else {
+        }
+        else {
 #ifdef XF86PM
-	  if (xf86OSPMClose)
-	      xf86OSPMClose();
-	  xf86OSPMClose = NULL;
+            if (xf86OSPMClose)
+                xf86OSPMClose();
+            xf86OSPMClose = NULL;
 #endif
 
-	for (i = 0; i < xf86NumScreens; i++) {
- 	    /*
- 	     * zero all access functions to
- 	     * trap calls when switched away.
- 	     */
-	    xf86Screens[i]->vtSema = FALSE;
-	}
-	if (xorgHWAccess)
-	    xf86DisableIO();
+            for (i = 0; i < xf86NumScreens; i++) {
+                /*
+                 * zero all access functions to
+                 * trap calls when switched away.
+                 */
+                xf86Screens[i]->vtSema = FALSE;
+            }
+            if (xorgHWAccess)
+                xf86DisableIO();
+        }
     }
-  } else {
-    DebugF("xf86VTSwitch: Entering\n");
-    if (!xf86VTSwitchTo()) return;
+    else {
+        DebugF("xf86VTSwitch: Entering\n");
+        if (!xf86VTSwitchTo())
+            return;
 
 #ifdef XF86PM
-    xf86OSPMClose = xf86OSPMOpen();
+        xf86OSPMClose = xf86OSPMOpen();
 #endif
 
-    if (xorgHWAccess)
-	xf86EnableIO();
-    xf86AccessEnter();
-    for (i = 0; i < xf86NumScreens; i++) {
-      xf86Screens[i]->vtSema = TRUE;
-      if (!xf86Screens[i]->EnterVT(i, 0))
-	  FatalError("EnterVT failed for screen %d\n", i);
-    }
-    for (i = 0; i < xf86NumScreens; i++) {
-      if (xf86Screens[i]->EnableDisableFBAccess)
-	(*xf86Screens[i]->EnableDisableFBAccess)(i, TRUE);
-    }
+        if (xorgHWAccess)
+            xf86EnableIO();
+        xf86AccessEnter();
+        for (i = 0; i < xf86NumScreens; i++) {
+            xf86Screens[i]->vtSema = TRUE;
+            if (!xf86Screens[i]->EnterVT(i, 0))
+                FatalError("EnterVT failed for screen %d\n", i);
+        }
+        for (i = 0; i < xf86NumScreens; i++) {
+            if (xf86Screens[i]->EnableDisableFBAccess)
+                (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
+        }
 
-    /* Turn screen saver off when switching back */
-    dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
+        /* Turn screen saver off when switching back */
+        dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
-    pInfo = xf86InputDevs;
-    while (pInfo) {
-      if (pInfo->dev)
-          EnableDevice(pInfo->dev, TRUE);
-      pInfo = pInfo->next;
-    }
+        pInfo = xf86InputDevs;
+        while (pInfo) {
+            if (pInfo->dev)
+                EnableDevice(pInfo->dev, TRUE);
+            pInfo = pInfo->next;
+        }
 
-    for (ih = InputHandlers; ih; ih = ih->next)
-      xf86EnableInputHandler(ih);
+        for (ih = InputHandlers; ih; ih = ih->next)
+            xf86EnableInputHandler(ih);
 
-    xf86UnblockSIGIO(prevSIGIO);
-  }
+        xf86UnblockSIGIO(prevSIGIO);
+    }
 }
 
-
 /* Input handler registration */
 
 static pointer
@@ -556,11 +557,11 @@ addInputHandler(int fd, InputHandlerProc proc, pointer data)
     IHPtr ih;
 
     if (fd < 0 || !proc)
-	return NULL;
+        return NULL;
 
     ih = calloc(sizeof(*ih), 1);
     if (!ih)
-	return NULL;
+        return NULL;
 
     ih->fd = fd;
     ih->ihproc = proc;
@@ -618,13 +619,13 @@ removeInputHandler(IHPtr ih)
     IHPtr p;
 
     if (ih == InputHandlers)
-	InputHandlers = ih->next;
+        InputHandlers = ih->next;
     else {
-	p = InputHandlers;
-	while (p && p->next != ih)
-	    p = p->next;
-	if (ih)
-	    p->next = ih->next;
+        p = InputHandlers;
+        while (p && p->next != ih)
+            p = p->next;
+        if (ih)
+            p->next = ih->next;
     }
     free(ih);
 }
@@ -636,13 +637,13 @@ xf86RemoveInputHandler(pointer handler)
     int fd;
 
     if (!handler)
-	return -1;
+        return -1;
 
     ih = handler;
     fd = ih->fd;
 
     if (ih->fd >= 0)
-	RemoveEnabledDevice(ih->fd);
+        RemoveEnabledDevice(ih->fd);
     removeInputHandler(ih);
 
     return fd;
@@ -655,13 +656,13 @@ xf86RemoveGeneralHandler(pointer handler)
     int fd;
 
     if (!handler)
-	return -1;
+        return -1;
 
     ih = handler;
     fd = ih->fd;
 
     if (ih->fd >= 0)
-	RemoveGeneralSocket(ih->fd);
+        RemoveGeneralSocket(ih->fd);
     removeInputHandler(ih);
 
     return fd;
@@ -673,12 +674,12 @@ xf86DisableInputHandler(pointer handler)
     IHPtr ih;
 
     if (!handler)
-	return;
+        return;
 
     ih = handler;
     ih->enabled = FALSE;
     if (ih->fd >= 0)
-	RemoveEnabledDevice(ih->fd);
+        RemoveEnabledDevice(ih->fd);
 }
 
 void
@@ -687,12 +688,12 @@ xf86DisableGeneralHandler(pointer handler)
     IHPtr ih;
 
     if (!handler)
-	return;
+        return;
 
     ih = handler;
     ih->enabled = FALSE;
     if (ih->fd >= 0)
-	RemoveGeneralSocket(ih->fd);
+        RemoveGeneralSocket(ih->fd);
 }
 
 void
@@ -701,12 +702,12 @@ xf86EnableInputHandler(pointer handler)
     IHPtr ih;
 
     if (!handler)
-	return;
+        return;
 
     ih = handler;
     ih->enabled = TRUE;
     if (ih->fd >= 0)
-	AddEnabledDevice(ih->fd);
+        AddEnabledDevice(ih->fd);
 }
 
 void
@@ -715,12 +716,12 @@ xf86EnableGeneralHandler(pointer handler)
     IHPtr ih;
 
     if (!handler)
-	return;
+        return;
 
     ih = handler;
     ih->enabled = TRUE;
     if (ih->fd >= 0)
-	AddGeneralSocket(ih->fd);
+        AddGeneralSocket(ih->fd);
 }
 
 /*
@@ -734,17 +735,19 @@ xf86EnableVTSwitch(Bool new)
 
     old = VTSwitchEnabled;
     if (!new) {
-	/* Disable VT switching */
-	def = VTSwitchEnabled;
-	VTSwitchEnabled = FALSE;
-    } else {
-	/* Restore VT switching to default */
-	VTSwitchEnabled = def;
+        /* Disable VT switching */
+        def = VTSwitchEnabled;
+        VTSwitchEnabled = FALSE;
+    }
+    else {
+        /* Restore VT switching to default */
+        VTSwitchEnabled = def;
     }
     return old;
 }
 
 void
-DDXRingBell(int volume, int pitch, int duration) {
+DDXRingBell(int volume, int pitch, int duration)
+{
     xf86OSRingBell(volume, pitch, duration);
 }
diff --git a/xorg-server/hw/xfree86/common/xf86Globals.c b/xorg-server/hw/xfree86/common/xf86Globals.c
index d576fb915..0071004eb 100644
--- a/xorg-server/hw/xfree86/common/xf86Globals.c
+++ b/xorg-server/hw/xfree86/common/xf86Globals.c
@@ -50,9 +50,9 @@
 DevPrivateKeyRec xf86CreateRootWindowKeyRec;
 DevPrivateKeyRec xf86ScreenKeyRec;
 
-ScrnInfoPtr *xf86Screens = NULL;	/* List of ScrnInfos */
-const unsigned char byte_reversed[256] =
-{
+ScrnInfoPtr *xf86Screens = NULL;        /* List of ScrnInfos */
+
+const unsigned char byte_reversed[256] = {
     0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
     0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
     0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
@@ -90,49 +90,49 @@ const unsigned char byte_reversed[256] =
 /* Globals that input drivers may access */
 InputInfoPtr xf86InputDevs = NULL;
 
-
 /* Globals that video drivers may not access */
 
 xf86InfoRec xf86Info = {
-    .consoleFd                  = -1,
-    .vtno                       = -1,
-    .lastEventTime              = -1,
-    .vtRequestsPending          = FALSE,
+    .consoleFd = -1,
+    .vtno = -1,
+    .lastEventTime = -1,
+    .vtRequestsPending = FALSE,
 #ifdef sun
-    .vtPendingNum               = -1,
+    .vtPendingNum = -1,
 #endif
-    .dontVTSwitch               = FALSE,
-    .autoVTSwitch               = TRUE,
-    .ShareVTs                   = FALSE,
-    .dontZap                    = FALSE,
-    .dontZoom                   = FALSE,
-    .notrapSignals              = FALSE,
-    .caughtSignal               = FALSE,
-    .currentScreen              = NULL,
+    .dontVTSwitch = FALSE,
+    .autoVTSwitch = TRUE,
+    .ShareVTs = FALSE,
+    .dontZap = FALSE,
+    .dontZoom = FALSE,
+    .notrapSignals = FALSE,
+    .caughtSignal = FALSE,
+    .currentScreen = NULL,
 #ifdef CSRG_BASED
-    .consType                   = -1,
+    .consType = -1,
 #endif
-    .allowMouseOpenFail         = FALSE,
-    .vidModeEnabled             = TRUE,
-    .vidModeAllowNonLocal       = FALSE,
-    .miscModInDevEnabled        = TRUE,
-    .miscModInDevAllowNonLocal  = FALSE,
-    .pixmap24                   = Pix24DontCare,
-    .pix24From                  = X_DEFAULT,
-    .pmFlag                     = TRUE,
-    .log                        = LogNone,
-    .disableRandR               = FALSE,
-    .randRFrom                  = X_DEFAULT,
+    .allowMouseOpenFail = FALSE,
+    .vidModeEnabled = TRUE,
+    .vidModeAllowNonLocal = FALSE,
+    .miscModInDevEnabled = TRUE,
+    .miscModInDevAllowNonLocal = FALSE,
+    .pixmap24 = Pix24DontCare,
+    .pix24From = X_DEFAULT,
+    .pmFlag = TRUE,
+    .log = LogNone,
+    .disableRandR = FALSE,
+    .randRFrom = X_DEFAULT,
 #if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS)
-    .forceInputDevices          = FALSE,
-    .autoAddDevices             = TRUE,
-    .autoEnableDevices          = TRUE
+    .forceInputDevices = FALSE,
+    .autoAddDevices = TRUE,
+    .autoEnableDevices = TRUE
 #else
-    .forceInputDevices          = TRUE,
-    .autoAddDevices             = FALSE,
-    .autoEnableDevices          = FALSE
+    .forceInputDevices = TRUE,
+    .autoAddDevices = FALSE,
+    .autoEnableDevices = FALSE
 #endif
 };
+
 const char *xf86ConfigFile = NULL;
 const char *xf86ConfigDir = NULL;
 const char *xf86ModulePath = DEFAULT_MODULE_PATH;
@@ -140,8 +140,9 @@ MessageType xf86ModPathFrom = X_DEFAULT;
 const char *xf86LogFile = DEFAULT_LOGPREFIX;
 MessageType xf86LogFileFrom = X_DEFAULT;
 Bool xf86LogFileWasOpened = FALSE;
-serverLayoutRec xf86ConfigLayout = {NULL, };
-confDRIRec xf86ConfigDRI = {0, };
+serverLayoutRec xf86ConfigLayout = { NULL, };
+confDRIRec xf86ConfigDRI = { 0, };
+
 XF86ConfigPtr xf86configptr = NULL;
 Bool xf86Resetting = FALSE;
 Bool xf86Initialising = FALSE;
@@ -154,12 +155,12 @@ int xf86NumInputDrivers = 0;
 int xf86NumScreens = 0;
 
 const char *xf86VisualNames[] = {
-	"StaticGray",
-	"GrayScale",
-	"StaticColor",
-	"PseudoColor",
-	"TrueColor",
-	"DirectColor"
+    "StaticGray",
+    "GrayScale",
+    "StaticColor",
+    "PseudoColor",
+    "TrueColor",
+    "DirectColor"
 };
 
 /* Parameters set only from the command line */
@@ -170,6 +171,7 @@ Bool xf86bsEnableFlag = FALSE;
 Bool xf86bsDisableFlag = FALSE;
 Bool xf86silkenMouseDisableFlag = FALSE;
 Bool xf86xkbdirFlag = FALSE;
+
 #ifdef HAVE_ACPI
 Bool xf86acpiDisableFlag = FALSE;
 #endif
@@ -182,10 +184,13 @@ int xf86LogVerbose = DEFAULT_LOG_VERBOSE;
 int xf86FbBpp = -1;
 Pix24Flags xf86Pix24 = Pix24DontCare;
 int xf86Depth = -1;
-rgb xf86Weight = {0, 0, 0};
+rgb xf86Weight = { 0, 0, 0 };
+
 Bool xf86FlipPixels = FALSE;
-Gamma xf86Gamma = {0.0, 0.0, 0.0};
+Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
+
 Bool xf86AllowMouseOpenFail = FALSE;
+
 #ifdef XF86VIDMODE
 Bool xf86VidModeDisabled = FALSE;
 Bool xf86VidModeAllowNonLocal = FALSE;
diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index 248ccf47e..8c948cf6f 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -64,7 +64,6 @@
 
 static int xf86ScrnInfoPrivateCount = 0;
 
-
 /* Add a pointer to a new DriverRec to xf86DriverList */
 
 void
@@ -72,22 +71,21 @@ xf86AddDriver(DriverPtr driver, pointer module, int flags)
 {
     /* Don't add null entries */
     if (!driver)
-	return;
+        return;
 
     if (xf86DriverList == NULL)
-	xf86NumDrivers = 0;
+        xf86NumDrivers = 0;
 
     xf86NumDrivers++;
     xf86DriverList = xnfrealloc(xf86DriverList,
-				xf86NumDrivers * sizeof(DriverPtr));
+                                xf86NumDrivers * sizeof(DriverPtr));
     xf86DriverList[xf86NumDrivers - 1] = xnfalloc(sizeof(DriverRec));
     if (flags & HaveDriverFuncs)
-	*xf86DriverList[xf86NumDrivers - 1] = *driver;
+        *xf86DriverList[xf86NumDrivers - 1] = *driver;
     else {
-	(void) memset( xf86DriverList[xf86NumDrivers - 1], 0,
-		       sizeof( DriverRec ) );
-	(void) memcpy( xf86DriverList[xf86NumDrivers - 1], driver,
-		       sizeof(DriverRec1));
+        (void) memset(xf86DriverList[xf86NumDrivers - 1], 0, sizeof(DriverRec));
+        (void) memcpy(xf86DriverList[xf86NumDrivers - 1], driver,
+                      sizeof(DriverRec1));
 
     }
     xf86DriverList[xf86NumDrivers - 1]->module = module;
@@ -98,11 +96,11 @@ void
 xf86DeleteDriver(int drvIndex)
 {
     if (xf86DriverList[drvIndex]
-	&& (!xf86DriverHasEntities(xf86DriverList[drvIndex]))) {
-	if (xf86DriverList[drvIndex]->module)
-	    UnloadModule(xf86DriverList[drvIndex]->module);
-	free(xf86DriverList[drvIndex]);
-	xf86DriverList[drvIndex] = NULL;
+        && (!xf86DriverHasEntities(xf86DriverList[drvIndex]))) {
+        if (xf86DriverList[drvIndex]->module)
+            UnloadModule(xf86DriverList[drvIndex]->module);
+        free(xf86DriverList[drvIndex]);
+        xf86DriverList[drvIndex] = NULL;
     }
 }
 
@@ -113,16 +111,17 @@ xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags)
 {
     /* Don't add null entries */
     if (!driver)
-	return;
+        return;
 
     if (xf86InputDriverList == NULL)
-	xf86NumInputDrivers = 0;
+        xf86NumInputDrivers = 0;
 
     xf86NumInputDrivers++;
     xf86InputDriverList = xnfrealloc(xf86InputDriverList,
-				xf86NumInputDrivers * sizeof(InputDriverPtr));
+                                     xf86NumInputDrivers *
+                                     sizeof(InputDriverPtr));
     xf86InputDriverList[xf86NumInputDrivers - 1] =
-				xnfalloc(sizeof(InputDriverRec));
+        xnfalloc(sizeof(InputDriverRec));
     *xf86InputDriverList[xf86NumInputDrivers - 1] = *driver;
     xf86InputDriverList[xf86NumInputDrivers - 1]->module = module;
 }
@@ -131,7 +130,7 @@ void
 xf86DeleteInputDriver(int drvIndex)
 {
     if (xf86InputDriverList[drvIndex] && xf86InputDriverList[drvIndex]->module)
-	UnloadModule(xf86InputDriverList[drvIndex]->module);
+        UnloadModule(xf86InputDriverList[drvIndex]->module);
     free(xf86InputDriverList[drvIndex]);
     xf86InputDriverList[drvIndex] = NULL;
 }
@@ -142,9 +141,9 @@ xf86LookupInputDriver(const char *name)
     int i;
 
     for (i = 0; i < xf86NumInputDrivers; i++) {
-       if (xf86InputDriverList[i] && xf86InputDriverList[i]->driverName &&
-           xf86NameCmp(name, xf86InputDriverList[i]->driverName) == 0)
-           return xf86InputDriverList[i];
+        if (xf86InputDriverList[i] && xf86InputDriverList[i]->driverName &&
+            xf86NameCmp(name, xf86InputDriverList[i]->driverName) == 0)
+            return xf86InputDriverList[i];
     }
     return NULL;
 }
@@ -170,15 +169,15 @@ xf86AllocateScreen(DriverPtr drv, int flags)
     int i;
 
     if (xf86Screens == NULL)
-	xf86NumScreens = 0;
+        xf86NumScreens = 0;
 
     i = xf86NumScreens++;
     xf86Screens = xnfrealloc(xf86Screens, xf86NumScreens * sizeof(ScrnInfoPtr));
     xf86Screens[i] = xnfcalloc(sizeof(ScrnInfoRec), 1);
-    xf86Screens[i]->scrnIndex = i;	/* Changes when a screen is removed */
-    xf86Screens[i]->origIndex = i;	/* This never changes */
+    xf86Screens[i]->scrnIndex = i;      /* Changes when a screen is removed */
+    xf86Screens[i]->origIndex = i;      /* This never changes */
     xf86Screens[i]->privates = xnfcalloc(sizeof(DevUnion),
-					 xf86ScrnInfoPrivateCount);
+                                         xf86ScrnInfoPrivateCount);
     /*
      * EnableDisableFBAccess now gets initialized in InitOutput()
      * xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess;
@@ -193,7 +192,6 @@ xf86AllocateScreen(DriverPtr drv, int flags)
     return xf86Screens[i];
 }
 
-
 /*
  * Remove an entry from xf86Screens.  Ideally it should free all allocated
  * data.  To do this properly may require a driver hook.
@@ -207,31 +205,31 @@ xf86DeleteScreen(int scrnIndex, int flags)
 
     /* First check if the screen is valid */
     if (xf86NumScreens == 0 || xf86Screens == NULL)
-	return;
+        return;
 
     if (scrnIndex > xf86NumScreens - 1)
-	return;
+        return;
 
     if (!(pScrn = xf86Screens[scrnIndex]))
-	return;
+        return;
 
     /* If a FreeScreen function is defined, call it here */
     if (pScrn->FreeScreen != NULL)
-	pScrn->FreeScreen(scrnIndex, 0);
+        pScrn->FreeScreen(scrnIndex, 0);
 
     while (pScrn->modes)
-	xf86DeleteMode(&pScrn->modes, pScrn->modes);
+        xf86DeleteMode(&pScrn->modes, pScrn->modes);
 
     while (pScrn->modePool)
-	xf86DeleteMode(&pScrn->modePool, pScrn->modePool);
+        xf86DeleteMode(&pScrn->modePool, pScrn->modePool);
 
     xf86OptionListFree(pScrn->options);
 
     if (pScrn->module)
-	UnloadModule(pScrn->module);
+        UnloadModule(pScrn->module);
 
     if (pScrn->drv)
-	pScrn->drv->refCount--;
+        pScrn->drv->refCount--;
 
     free(pScrn->privates);
 
@@ -244,9 +242,9 @@ xf86DeleteScreen(int scrnIndex, int flags)
     xf86NumScreens--;
 
     for (i = scrnIndex; i < xf86NumScreens; i++) {
-	xf86Screens[i] = xf86Screens[i + 1];
-	xf86Screens[i]->scrnIndex = i;
-	/* Also need to take care of the screen layout settings */
+        xf86Screens[i] = xf86Screens[i + 1];
+        xf86Screens[i]->scrnIndex = i;
+        /* Also need to take care of the screen layout settings */
     }
 }
 
@@ -263,12 +261,12 @@ xf86AllocateScrnInfoPrivateIndex(void)
 
     idx = xf86ScrnInfoPrivateCount++;
     for (i = 0; i < xf86NumScreens; i++) {
-	pScr = xf86Screens[i];
-	nprivs = xnfrealloc(pScr->privates,
-			    xf86ScrnInfoPrivateCount * sizeof(DevUnion));
-	/* Zero the new private */
-	memset(&nprivs[idx], 0, sizeof(DevUnion));
-	pScr->privates = nprivs;
+        pScr = xf86Screens[i];
+        nprivs = xnfrealloc(pScr->privates,
+                            xf86ScrnInfoPrivateCount * sizeof(DevUnion));
+        /* Zero the new private */
+        memset(&nprivs[idx], 0, sizeof(DevUnion));
+        pScr->privates = nprivs;
     }
     return idx;
 }
@@ -279,22 +277,22 @@ xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad)
     int i;
 
     if (pScrn->numFormats >= MAXFORMATS)
-	return FALSE;
+        return FALSE;
 
     if (bpp <= 0) {
-	if (depth == 1)
-	    bpp = 1;
-	else if (depth <= 8)
-	    bpp = 8;
-	else if (depth <= 16)
-	    bpp = 16;
-	else if (depth <= 32)
-	    bpp = 32;
-	else
-	    return FALSE;
+        if (depth == 1)
+            bpp = 1;
+        else if (depth <= 8)
+            bpp = 8;
+        else if (depth <= 16)
+            bpp = 16;
+        else if (depth <= 32)
+            bpp = 32;
+        else
+            return FALSE;
     }
     if (pad <= 0)
-	pad = BITMAP_SCANLINE_PAD;
+        pad = BITMAP_SCANLINE_PAD;
 
     i = pScrn->numFormats++;
     pScrn->formats[i].depth = depth;
@@ -346,7 +344,7 @@ xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad)
 
 Bool
 xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
-		int depth24flags)
+                int depth24flags)
 {
     int i;
     DispPtr disp;
@@ -360,174 +358,182 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
     scrp->depthFrom = X_DEFAULT;
 
     if (xf86FbBpp > 0) {
-	scrp->bitsPerPixel = xf86FbBpp;
-	scrp->bitsPerPixelFrom = X_CMDLINE;
+        scrp->bitsPerPixel = xf86FbBpp;
+        scrp->bitsPerPixelFrom = X_CMDLINE;
     }
 
     if (xf86Depth > 0) {
-	scrp->depth = xf86Depth;
-	scrp->depthFrom = X_CMDLINE;
+        scrp->depth = xf86Depth;
+        scrp->depthFrom = X_CMDLINE;
     }
 
     if (xf86FbBpp < 0 && xf86Depth < 0) {
-	if (scrp->confScreen->defaultfbbpp > 0) {
-	    scrp->bitsPerPixel = scrp->confScreen->defaultfbbpp;
-	    scrp->bitsPerPixelFrom = X_CONFIG;
-	}
-	if (scrp->confScreen->defaultdepth > 0) {
-	    scrp->depth = scrp->confScreen->defaultdepth;
-	    scrp->depthFrom = X_CONFIG;
-	}
-
-	if (scrp->confScreen->defaultfbbpp <= 0 &&
-	    scrp->confScreen->defaultdepth <= 0) {
-	    /*
-	     * Check for DefaultDepth and DefaultFbBpp options in the
-	     * Device sections.
-	     */
-	    int i;
-	    GDevPtr device;
-	    Bool found = FALSE;
-
-	    for (i = 0; i < scrp->numEntities; i++) {
-		device = xf86GetDevFromEntity(scrp->entityList[i],
-					      scrp->entityInstanceList[i]);
-		if (device && device->options) {
-		    if (xf86FindOption(device->options, "DefaultDepth")) {
-			scrp->depth = xf86SetIntOption(device->options,
-						       "DefaultDepth", -1);
-			scrp->depthFrom = X_CONFIG;
-			found = TRUE;
-		    }
-		    if (xf86FindOption(device->options, "DefaultFbBpp")) {
-			scrp->bitsPerPixel = xf86SetIntOption(device->options,
-							      "DefaultFbBpp",
-							      -1);
-			scrp->bitsPerPixelFrom = X_CONFIG;
-			found = TRUE;
-		    }
-		}
-		if (found)
-		    break;
-	    }
-	}
+        if (scrp->confScreen->defaultfbbpp > 0) {
+            scrp->bitsPerPixel = scrp->confScreen->defaultfbbpp;
+            scrp->bitsPerPixelFrom = X_CONFIG;
+        }
+        if (scrp->confScreen->defaultdepth > 0) {
+            scrp->depth = scrp->confScreen->defaultdepth;
+            scrp->depthFrom = X_CONFIG;
+        }
+
+        if (scrp->confScreen->defaultfbbpp <= 0 &&
+            scrp->confScreen->defaultdepth <= 0) {
+            /*
+             * Check for DefaultDepth and DefaultFbBpp options in the
+             * Device sections.
+             */
+            int i;
+            GDevPtr device;
+            Bool found = FALSE;
+
+            for (i = 0; i < scrp->numEntities; i++) {
+                device = xf86GetDevFromEntity(scrp->entityList[i],
+                                              scrp->entityInstanceList[i]);
+                if (device && device->options) {
+                    if (xf86FindOption(device->options, "DefaultDepth")) {
+                        scrp->depth = xf86SetIntOption(device->options,
+                                                       "DefaultDepth", -1);
+                        scrp->depthFrom = X_CONFIG;
+                        found = TRUE;
+                    }
+                    if (xf86FindOption(device->options, "DefaultFbBpp")) {
+                        scrp->bitsPerPixel = xf86SetIntOption(device->options,
+                                                              "DefaultFbBpp",
+                                                              -1);
+                        scrp->bitsPerPixelFrom = X_CONFIG;
+                        found = TRUE;
+                    }
+                }
+                if (found)
+                    break;
+            }
+        }
     }
 
     /* If none of these is set, pick a default */
     if (scrp->bitsPerPixel < 0 && scrp->depth < 0) {
         if (fbbpp > 0 || depth > 0) {
-	    if (fbbpp > 0)
-		scrp->bitsPerPixel = fbbpp;
-	    if (depth > 0)
-		scrp->depth = depth;
-	} else {
-	    scrp->depth = GLOBAL_DEFAULT_DEPTH;
-	}
+            if (fbbpp > 0)
+                scrp->bitsPerPixel = fbbpp;
+            if (depth > 0)
+                scrp->depth = depth;
+        }
+        else {
+            scrp->depth = GLOBAL_DEFAULT_DEPTH;
+        }
     }
 
     /* If any are not given, determine a default for the others */
 
     if (scrp->bitsPerPixel < 0) {
-	/* The depth must be set */
-	if (scrp->depth > -1) {
-	    if (scrp->depth == 1)
-		scrp->bitsPerPixel = 1;
-	    else if (scrp->depth <= 4)
-		scrp->bitsPerPixel = 4;
-	    else if (scrp->depth <= 8)
-		scrp->bitsPerPixel = 8;
-	    else if (scrp->depth <= 16)
-		scrp->bitsPerPixel = 16;
-	    else if (scrp->depth <= 24) {
-		/*
-		 * Figure out if a choice is possible based on the depth24
-		 * and pix24 flags.
-		 */
-		/* Check pix24 first */
-		if (pix24 != Pix24DontCare) {
-		    if (pix24 == Pix24Use32) {
-			if (DO_PIX32(depth24flags)) {
-			    if (CHOOSE24FOR32(depth24flags))
-				scrp->bitsPerPixel = 24;
-			    else
-				scrp->bitsPerPixel = 32;
-			} else {
-			    nomatch = TRUE;
-			}
-		    } else if (pix24 == Pix24Use24) {
-			if (DO_PIX24(depth24flags)) {
-			    if (CHOOSE32FOR24(depth24flags))
-				scrp->bitsPerPixel = 32;
-			    else
-				scrp->bitsPerPixel = 24;
-			} else {
-			    nomatch = TRUE;
-			}
-		    }
-		} else {
-		    if (DO_PIX32(depth24flags)) {
-			if (CHOOSE24FOR32(depth24flags))
-			    scrp->bitsPerPixel = 24;
-			else
-			    scrp->bitsPerPixel = 32;
-		    } else if (DO_PIX24(depth24flags)) {
-			if (CHOOSE32FOR24(depth24flags))
-			    scrp->bitsPerPixel = 32;
-			else
-			    scrp->bitsPerPixel = 24;
-		    }
-		}
-	    } else if (scrp->depth <= 32)
-		scrp->bitsPerPixel = 32;
-	    else {
-		xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-			   "Specified depth (%d) is greater than 32\n",
-			   scrp->depth);
-		return FALSE;
-	    }
-	} else {
-	    xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-			"xf86SetDepthBpp: internal error: depth and fbbpp"
-			" are both not set\n");
-	    return FALSE;
-	}
-	if (scrp->bitsPerPixel < 0) {
-	    if (nomatch)
-		xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-			"Driver can't support depth 24 pixmap format (%d)\n",
-			PIX24TOBPP(pix24));
-	    else if ((depth24flags & (Support24bppFb | Support32bppFb)) ==
-		     NoDepth24Support)
-		xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-			"Driver can't support depth 24\n");
-	    else
-		xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-			"Can't find fbbpp for depth 24\n");
-	    return FALSE;
-	}
-	scrp->bitsPerPixelFrom = X_PROBED;
+        /* The depth must be set */
+        if (scrp->depth > -1) {
+            if (scrp->depth == 1)
+                scrp->bitsPerPixel = 1;
+            else if (scrp->depth <= 4)
+                scrp->bitsPerPixel = 4;
+            else if (scrp->depth <= 8)
+                scrp->bitsPerPixel = 8;
+            else if (scrp->depth <= 16)
+                scrp->bitsPerPixel = 16;
+            else if (scrp->depth <= 24) {
+                /*
+                 * Figure out if a choice is possible based on the depth24
+                 * and pix24 flags.
+                 */
+                /* Check pix24 first */
+                if (pix24 != Pix24DontCare) {
+                    if (pix24 == Pix24Use32) {
+                        if (DO_PIX32(depth24flags)) {
+                            if (CHOOSE24FOR32(depth24flags))
+                                scrp->bitsPerPixel = 24;
+                            else
+                                scrp->bitsPerPixel = 32;
+                        }
+                        else {
+                            nomatch = TRUE;
+                        }
+                    }
+                    else if (pix24 == Pix24Use24) {
+                        if (DO_PIX24(depth24flags)) {
+                            if (CHOOSE32FOR24(depth24flags))
+                                scrp->bitsPerPixel = 32;
+                            else
+                                scrp->bitsPerPixel = 24;
+                        }
+                        else {
+                            nomatch = TRUE;
+                        }
+                    }
+                }
+                else {
+                    if (DO_PIX32(depth24flags)) {
+                        if (CHOOSE24FOR32(depth24flags))
+                            scrp->bitsPerPixel = 24;
+                        else
+                            scrp->bitsPerPixel = 32;
+                    }
+                    else if (DO_PIX24(depth24flags)) {
+                        if (CHOOSE32FOR24(depth24flags))
+                            scrp->bitsPerPixel = 32;
+                        else
+                            scrp->bitsPerPixel = 24;
+                    }
+                }
+            }
+            else if (scrp->depth <= 32)
+                scrp->bitsPerPixel = 32;
+            else {
+                xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                           "Specified depth (%d) is greater than 32\n",
+                           scrp->depth);
+                return FALSE;
+            }
+        }
+        else {
+            xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                       "xf86SetDepthBpp: internal error: depth and fbbpp"
+                       " are both not set\n");
+            return FALSE;
+        }
+        if (scrp->bitsPerPixel < 0) {
+            if (nomatch)
+                xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                           "Driver can't support depth 24 pixmap format (%d)\n",
+                           PIX24TOBPP(pix24));
+            else if ((depth24flags & (Support24bppFb | Support32bppFb)) ==
+                     NoDepth24Support)
+                xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                           "Driver can't support depth 24\n");
+            else
+                xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                           "Can't find fbbpp for depth 24\n");
+            return FALSE;
+        }
+        scrp->bitsPerPixelFrom = X_PROBED;
     }
 
     if (scrp->depth <= 0) {
-	/* bitsPerPixel is already set */
-	switch (scrp->bitsPerPixel) {
-	case 32:
-	    scrp->depth = 24;
-	    break;
-	default:
-	    /* 1, 4, 8, 16 and 24 */
-	    scrp->depth = scrp->bitsPerPixel;
-	    break;
-	}
-	scrp->depthFrom = X_PROBED;
+        /* bitsPerPixel is already set */
+        switch (scrp->bitsPerPixel) {
+        case 32:
+            scrp->depth = 24;
+            break;
+        default:
+            /* 1, 4, 8, 16 and 24 */
+            scrp->depth = scrp->bitsPerPixel;
+            break;
+        }
+        scrp->depthFrom = X_PROBED;
     }
 
     /* Sanity checks */
     if (scrp->depth < 1 || scrp->depth > 32) {
-	xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-		   "Specified depth (%d) is not in the range 1-32\n",
-		    scrp->depth);
-	return FALSE;
+        xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                   "Specified depth (%d) is not in the range 1-32\n",
+                   scrp->depth);
+        return FALSE;
     }
     switch (scrp->bitsPerPixel) {
     case 1:
@@ -536,26 +542,26 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
     case 16:
     case 24:
     case 32:
-	break;
+        break;
     default:
-	xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-		   "Specified fbbpp (%d) is not a permitted value\n",
-		   scrp->bitsPerPixel);
-	return FALSE;
+        xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                   "Specified fbbpp (%d) is not a permitted value\n",
+                   scrp->bitsPerPixel);
+        return FALSE;
     }
     if (scrp->depth > scrp->bitsPerPixel) {
-	xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-		   "Specified depth (%d) is greater than the fbbpp (%d)\n",
-		   scrp->depth, scrp->bitsPerPixel);
-	return FALSE;
+        xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                   "Specified depth (%d) is greater than the fbbpp (%d)\n",
+                   scrp->depth, scrp->bitsPerPixel);
+        return FALSE;
     }
 
     /* set scrp->pixmap24 if the driver isn't flexible */
     if (scrp->bitsPerPixel == 24 && !DO_PIX32FOR24(depth24flags)) {
-	scrp->pixmap24 = Pix24Use24;
+        scrp->pixmap24 = Pix24Use24;
     }
     if (scrp->bitsPerPixel == 32 && !DO_PIX24FOR32(depth24flags)) {
-	scrp->pixmap24 = Pix24Use32;
+        scrp->pixmap24 = Pix24Use32;
     }
 
     /*
@@ -563,13 +569,13 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
      * scrp->display with it.
      */
     for (i = 0, disp = scrp->confScreen->displays;
-	 i < scrp->confScreen->numdisplays; i++, disp++) {
-	if ((disp->depth == scrp->depth && disp->fbbpp == scrp->bitsPerPixel)
-	    || (disp->depth == scrp->depth && disp->fbbpp <= 0)
-	    || (disp->fbbpp == scrp->bitsPerPixel && disp->depth <= 0)) {
-	    scrp->display = disp;
-	    break;
-	}
+         i < scrp->confScreen->numdisplays; i++, disp++) {
+        if ((disp->depth == scrp->depth && disp->fbbpp == scrp->bitsPerPixel)
+            || (disp->depth == scrp->depth && disp->fbbpp <= 0)
+            || (disp->fbbpp == scrp->bitsPerPixel && disp->depth <= 0)) {
+            scrp->display = disp;
+            break;
+        }
     }
 
     /*
@@ -577,40 +583,40 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
      * depth or fbbpp specified.
      */
     if (i == scrp->confScreen->numdisplays) {
-	for (i = 0, disp = scrp->confScreen->displays;
-	     i < scrp->confScreen->numdisplays; i++, disp++) {
-	    if (disp->depth <= 0 && disp->fbbpp <= 0) {
-		scrp->display = disp;
-		break;
-	    }
-	}
+        for (i = 0, disp = scrp->confScreen->displays;
+             i < scrp->confScreen->numdisplays; i++, disp++) {
+            if (disp->depth <= 0 && disp->fbbpp <= 0) {
+                scrp->display = disp;
+                break;
+            }
+        }
     }
 
     /*
      * If all else fails, create a default one.
      */
     if (i == scrp->confScreen->numdisplays) {
-	scrp->confScreen->numdisplays++;
-	scrp->confScreen->displays =
-		xnfrealloc(scrp->confScreen->displays,
-			   scrp->confScreen->numdisplays * sizeof(DispRec));
-	xf86DrvMsg(scrp->scrnIndex, X_INFO,
-		   "Creating default Display subsection in Screen section\n"
-		   "\t\"%s\" for depth/fbbpp %d/%d\n",
-		   scrp->confScreen->id, scrp->depth, scrp->bitsPerPixel);
-	memset(&scrp->confScreen->displays[i], 0, sizeof(DispRec));
-	scrp->confScreen->displays[i].blackColour.red = -1;
-	scrp->confScreen->displays[i].blackColour.green = -1;
-	scrp->confScreen->displays[i].blackColour.blue = -1;
-	scrp->confScreen->displays[i].whiteColour.red = -1;
-	scrp->confScreen->displays[i].whiteColour.green = -1;
-	scrp->confScreen->displays[i].whiteColour.blue = -1;
-	scrp->confScreen->displays[i].defaultVisual = -1;
-	scrp->confScreen->displays[i].modes = xnfalloc(sizeof(char *));
-	scrp->confScreen->displays[i].modes[0] = NULL;
-	scrp->confScreen->displays[i].depth = depth;
-	scrp->confScreen->displays[i].fbbpp = fbbpp;
-	scrp->display = &scrp->confScreen->displays[i];
+        scrp->confScreen->numdisplays++;
+        scrp->confScreen->displays =
+            xnfrealloc(scrp->confScreen->displays,
+                       scrp->confScreen->numdisplays * sizeof(DispRec));
+        xf86DrvMsg(scrp->scrnIndex, X_INFO,
+                   "Creating default Display subsection in Screen section\n"
+                   "\t\"%s\" for depth/fbbpp %d/%d\n",
+                   scrp->confScreen->id, scrp->depth, scrp->bitsPerPixel);
+        memset(&scrp->confScreen->displays[i], 0, sizeof(DispRec));
+        scrp->confScreen->displays[i].blackColour.red = -1;
+        scrp->confScreen->displays[i].blackColour.green = -1;
+        scrp->confScreen->displays[i].blackColour.blue = -1;
+        scrp->confScreen->displays[i].whiteColour.red = -1;
+        scrp->confScreen->displays[i].whiteColour.green = -1;
+        scrp->confScreen->displays[i].whiteColour.blue = -1;
+        scrp->confScreen->displays[i].defaultVisual = -1;
+        scrp->confScreen->displays[i].modes = xnfalloc(sizeof(char *));
+        scrp->confScreen->displays[i].modes[0] = NULL;
+        scrp->confScreen->displays[i].depth = depth;
+        scrp->confScreen->displays[i].fbbpp = fbbpp;
+        scrp->display = &scrp->confScreen->displays[i];
     }
 
     /*
@@ -621,12 +627,13 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
     scrp->imageByteOrder = IMAGE_BYTE_ORDER;
     scrp->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
     if (scrp->depth < 8) {
-	/* Planar modes need these settings */
-	scrp->bitmapScanlineUnit = 8;
-	scrp->bitmapBitOrder = MSBFirst;
-    } else {
-	scrp->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
-	scrp->bitmapBitOrder = BITMAP_BIT_ORDER;
+        /* Planar modes need these settings */
+        scrp->bitmapScanlineUnit = 8;
+        scrp->bitmapBitOrder = MSBFirst;
+    }
+    else {
+        scrp->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+        scrp->bitmapBitOrder = BITMAP_BIT_ORDER;
     }
 
     /*
@@ -640,14 +647,14 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
     case 15:
     case 16:
     case 24:
-	/* Common depths.  Nothing to do for them */
-	break;
+        /* Common depths.  Nothing to do for them */
+        break;
     default:
-	if (!xf86AddPixFormat(scrp, scrp->depth, 0, 0)) {
-	    xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-		       "Can't add pixmap format for depth %d\n", scrp->depth);
-	    return FALSE;
-	}
+        if (!xf86AddPixFormat(scrp, scrp->depth, 0, 0)) {
+            xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                       "Can't add pixmap format for depth %d\n", scrp->depth);
+            return FALSE;
+        }
     }
 
     /* Initialise the framebuffer format for this screen */
@@ -682,87 +689,91 @@ xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask)
     scrp->weight.blue = 0;
 
     if (xf86Weight.red > 0 && xf86Weight.green > 0 && xf86Weight.blue > 0) {
-	scrp->weight = xf86Weight;
-	weightFrom = X_CMDLINE;
-    } else if (scrp->display->weight.red > 0 && scrp->display->weight.green > 0
-	       && scrp->display->weight.blue > 0) {
-	scrp->weight = scrp->display->weight;
-	weightFrom = X_CONFIG;
-    } else if (weight.red > 0 && weight.green > 0 && weight.blue > 0) {
-	scrp->weight = weight;
-    } else {
-	switch (scrp->depth) {
-	case 1:
-	case 4:
-	case 8:
-	    scrp->weight.red = scrp->weight.green =
-		scrp->weight.blue = scrp->rgbBits;
-	    break;
-	case 15:
-	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 5;
-	    break;
-	case 16:
-	    scrp->weight.red = scrp->weight.blue = 5;
-	    scrp->weight.green = 6;
-	    break;
-	case 18:
-	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 6;
-	    break;
-	case 24:
-	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 8;
-	    break;
-	case 30:
-	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 10;
-	    break;
-	}
+        scrp->weight = xf86Weight;
+        weightFrom = X_CMDLINE;
+    }
+    else if (scrp->display->weight.red > 0 && scrp->display->weight.green > 0
+             && scrp->display->weight.blue > 0) {
+        scrp->weight = scrp->display->weight;
+        weightFrom = X_CONFIG;
+    }
+    else if (weight.red > 0 && weight.green > 0 && weight.blue > 0) {
+        scrp->weight = weight;
+    }
+    else {
+        switch (scrp->depth) {
+        case 1:
+        case 4:
+        case 8:
+            scrp->weight.red = scrp->weight.green =
+                scrp->weight.blue = scrp->rgbBits;
+            break;
+        case 15:
+            scrp->weight.red = scrp->weight.green = scrp->weight.blue = 5;
+            break;
+        case 16:
+            scrp->weight.red = scrp->weight.blue = 5;
+            scrp->weight.green = 6;
+            break;
+        case 18:
+            scrp->weight.red = scrp->weight.green = scrp->weight.blue = 6;
+            break;
+        case 24:
+            scrp->weight.red = scrp->weight.green = scrp->weight.blue = 8;
+            break;
+        case 30:
+            scrp->weight.red = scrp->weight.green = scrp->weight.blue = 10;
+            break;
+        }
     }
 
     if (scrp->weight.red)
-	xf86DrvMsg(scrp->scrnIndex, weightFrom, "RGB weight %d%d%d\n",
-		   (int)scrp->weight.red, (int)scrp->weight.green,
-		   (int)scrp->weight.blue);
+        xf86DrvMsg(scrp->scrnIndex, weightFrom, "RGB weight %d%d%d\n",
+                   (int) scrp->weight.red, (int) scrp->weight.green,
+                   (int) scrp->weight.blue);
 
     if (scrp->depth > MAX_PSEUDO_DEPTH &&
-	(scrp->depth != scrp->weight.red + scrp->weight.green +
-			scrp->weight.blue)) {
-	xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-		   "Weight given (%d%d%d) is inconsistent with the "
-		   "depth (%d)\n",
-		   (int)scrp->weight.red, (int)scrp->weight.green,
-		   (int)scrp->weight.blue, scrp->depth);
-	return FALSE;
+        (scrp->depth != scrp->weight.red + scrp->weight.green +
+         scrp->weight.blue)) {
+        xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                   "Weight given (%d%d%d) is inconsistent with the "
+                   "depth (%d)\n",
+                   (int) scrp->weight.red, (int) scrp->weight.green,
+                   (int) scrp->weight.blue, scrp->depth);
+        return FALSE;
     }
     if (scrp->depth > MAX_PSEUDO_DEPTH && scrp->weight.red) {
-	/*
-	 * XXX Does this even mean anything for TrueColor visuals?
-	 * If not, we shouldn't even be setting it here.  However, this
-	 * matches the behaviour of 3.x versions of XFree86.
-	 */
-	scrp->rgbBits = scrp->weight.red;
-	if (scrp->weight.green > scrp->rgbBits)
-	    scrp->rgbBits = scrp->weight.green;
-	if (scrp->weight.blue > scrp->rgbBits)
-	    scrp->rgbBits = scrp->weight.blue;
+        /*
+         * XXX Does this even mean anything for TrueColor visuals?
+         * If not, we shouldn't even be setting it here.  However, this
+         * matches the behaviour of 3.x versions of XFree86.
+         */
+        scrp->rgbBits = scrp->weight.red;
+        if (scrp->weight.green > scrp->rgbBits)
+            scrp->rgbBits = scrp->weight.green;
+        if (scrp->weight.blue > scrp->rgbBits)
+            scrp->rgbBits = scrp->weight.blue;
     }
 
     /* Set the mask and offsets */
     if (mask.red == 0 || mask.green == 0 || mask.blue == 0) {
-	/* Default to a setting common to PC hardware */
-	scrp->offset.red = scrp->weight.green + scrp->weight.blue;
-	scrp->offset.green = scrp->weight.blue;
-	scrp->offset.blue = 0;
-	scrp->mask.red = ((1 << scrp->weight.red) - 1) << scrp->offset.red;
-	scrp->mask.green = ((1 << scrp->weight.green) - 1)
-				<< scrp->offset.green;
-	scrp->mask.blue = (1 << scrp->weight.blue) - 1;
-    } else {
-	/* Initialise to the values passed */
-	scrp->mask.red = mask.red;
-	scrp->mask.green = mask.green;
-	scrp->mask.blue = mask.blue;
-	scrp->offset.red = ffs(mask.red);
-	scrp->offset.green = ffs(mask.green);
-	scrp->offset.blue = ffs(mask.blue);
+        /* Default to a setting common to PC hardware */
+        scrp->offset.red = scrp->weight.green + scrp->weight.blue;
+        scrp->offset.green = scrp->weight.blue;
+        scrp->offset.blue = 0;
+        scrp->mask.red = ((1 << scrp->weight.red) - 1) << scrp->offset.red;
+        scrp->mask.green = ((1 << scrp->weight.green) - 1)
+            << scrp->offset.green;
+        scrp->mask.blue = (1 << scrp->weight.blue) - 1;
+    }
+    else {
+        /* Initialise to the values passed */
+        scrp->mask.red = mask.red;
+        scrp->mask.green = mask.green;
+        scrp->mask.blue = mask.blue;
+        scrp->offset.red = ffs(mask.red);
+        scrp->offset.green = ffs(mask.green);
+        scrp->offset.blue = ffs(mask.blue);
     }
     return TRUE;
 }
@@ -773,22 +784,25 @@ xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual)
     MessageType visualFrom = X_DEFAULT;
 
     if (defaultColorVisualClass >= 0) {
-	scrp->defaultVisual = defaultColorVisualClass;
-	visualFrom = X_CMDLINE;
-    } else if (scrp->display->defaultVisual >= 0) {
-	scrp->defaultVisual = scrp->display->defaultVisual;
-	visualFrom = X_CONFIG;
-    } else if (visual >= 0) {
-	scrp->defaultVisual = visual;
-    } else {
-	if (scrp->depth == 1)
-	    scrp->defaultVisual = StaticGray;
-	else if (scrp->depth == 4)
-	    scrp->defaultVisual = StaticColor;
-	else if (scrp->depth <= MAX_PSEUDO_DEPTH)
-	    scrp->defaultVisual = PseudoColor;
-	else
-	    scrp->defaultVisual = TrueColor;
+        scrp->defaultVisual = defaultColorVisualClass;
+        visualFrom = X_CMDLINE;
+    }
+    else if (scrp->display->defaultVisual >= 0) {
+        scrp->defaultVisual = scrp->display->defaultVisual;
+        visualFrom = X_CONFIG;
+    }
+    else if (visual >= 0) {
+        scrp->defaultVisual = visual;
+    }
+    else {
+        if (scrp->depth == 1)
+            scrp->defaultVisual = StaticGray;
+        else if (scrp->depth == 4)
+            scrp->defaultVisual = StaticColor;
+        else if (scrp->depth <= MAX_PSEUDO_DEPTH)
+            scrp->defaultVisual = PseudoColor;
+        else
+            scrp->defaultVisual = TrueColor;
     }
     switch (scrp->defaultVisual) {
     case StaticGray:
@@ -797,14 +811,14 @@ xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual)
     case PseudoColor:
     case TrueColor:
     case DirectColor:
-	xf86DrvMsg(scrp->scrnIndex, visualFrom, "Default visual is %s\n",
-		   xf86VisualNames[scrp->defaultVisual]);
-	    return TRUE;
+        xf86DrvMsg(scrp->scrnIndex, visualFrom, "Default visual is %s\n",
+                   xf86VisualNames[scrp->defaultVisual]);
+        return TRUE;
     default:
 
-	xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-		   "Invalid default visual class (%d)\n", scrp->defaultVisual);
-	return FALSE;
+        xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                   "Invalid default visual class (%d)\n", scrp->defaultVisual);
+        return FALSE;
     }
 }
 
@@ -818,45 +832,50 @@ Bool
 xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma)
 {
     MessageType from = X_DEFAULT;
+
 #if 0
-    xf86MonPtr DDC = (xf86MonPtr)(scrp->monitor->DDC);
+    xf86MonPtr DDC = (xf86MonPtr) (scrp->monitor->DDC);
 #endif
     if (TEST_GAMMA(xf86Gamma)) {
-	from = X_CMDLINE;
-	scrp->gamma.red = SET_GAMMA(xf86Gamma.red);
-	scrp->gamma.green = SET_GAMMA(xf86Gamma.green);
-	scrp->gamma.blue = SET_GAMMA(xf86Gamma.blue);
-    } else if (TEST_GAMMA(scrp->monitor->gamma)) {
-	from = X_CONFIG;
-	scrp->gamma.red = SET_GAMMA(scrp->monitor->gamma.red);
-	scrp->gamma.green = SET_GAMMA(scrp->monitor->gamma.green);
-	scrp->gamma.blue = SET_GAMMA(scrp->monitor->gamma.blue);
+        from = X_CMDLINE;
+        scrp->gamma.red = SET_GAMMA(xf86Gamma.red);
+        scrp->gamma.green = SET_GAMMA(xf86Gamma.green);
+        scrp->gamma.blue = SET_GAMMA(xf86Gamma.blue);
+    }
+    else if (TEST_GAMMA(scrp->monitor->gamma)) {
+        from = X_CONFIG;
+        scrp->gamma.red = SET_GAMMA(scrp->monitor->gamma.red);
+        scrp->gamma.green = SET_GAMMA(scrp->monitor->gamma.green);
+        scrp->gamma.blue = SET_GAMMA(scrp->monitor->gamma.blue);
 #if 0
-    } else if ( DDC && DDC->features.gamma > GAMMA_ZERO ) {
+    }
+    else if (DDC && DDC->features.gamma > GAMMA_ZERO) {
         from = X_PROBED;
-	scrp->gamma.red = SET_GAMMA(DDC->features.gamma);
-	scrp->gamma.green = SET_GAMMA(DDC->features.gamma);
-	scrp->gamma.blue = SET_GAMMA(DDC->features.gamma);
-	/* EDID structure version 2 gives optional seperate red, green & blue gamma values
-	 * in bytes 0x57-0x59 */
+        scrp->gamma.red = SET_GAMMA(DDC->features.gamma);
+        scrp->gamma.green = SET_GAMMA(DDC->features.gamma);
+        scrp->gamma.blue = SET_GAMMA(DDC->features.gamma);
+        /* EDID structure version 2 gives optional seperate red, green & blue gamma values
+         * in bytes 0x57-0x59 */
 #endif
-    } else if (TEST_GAMMA(gamma)) {
-	scrp->gamma.red = SET_GAMMA(gamma.red);
-	scrp->gamma.green = SET_GAMMA(gamma.green);
-	scrp->gamma.blue = SET_GAMMA(gamma.blue);
-    } else {
-	scrp->gamma.red = 1.0;
-	scrp->gamma.green = 1.0;
-	scrp->gamma.blue = 1.0;
+    }
+    else if (TEST_GAMMA(gamma)) {
+        scrp->gamma.red = SET_GAMMA(gamma.red);
+        scrp->gamma.green = SET_GAMMA(gamma.green);
+        scrp->gamma.blue = SET_GAMMA(gamma.blue);
+    }
+    else {
+        scrp->gamma.red = 1.0;
+        scrp->gamma.green = 1.0;
+        scrp->gamma.blue = 1.0;
     }
     /* Pretend we succeeded if we support better a gamma system.
      * This avoids a confusing message.
      */
     if (xf86_crtc_supports_gamma(scrp))
-	return TRUE;
+        return TRUE;
     xf86DrvMsg(scrp->scrnIndex, from,
-	       "Using gamma correction (%.1f, %.1f, %.1f)\n",
-	       scrp->gamma.red, scrp->gamma.green, scrp->gamma.blue);
+               "Using gamma correction (%.1f, %.1f, %.1f)\n",
+               scrp->gamma.red, scrp->gamma.green, scrp->gamma.blue);
 
     return TRUE;
 }
@@ -864,7 +883,6 @@ xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma)
 #undef TEST_GAMMA
 #undef SET_GAMMA
 
-
 /*
  * Set the DPI from the command line option.  XXX should allow it to be
  * calculated from the widthmm/heightmm values.
@@ -877,7 +895,7 @@ void
 xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
 {
     MessageType from = X_DEFAULT;
-    xf86MonPtr DDC = (xf86MonPtr)(pScrn->monitor->DDC);
+    xf86MonPtr DDC = (xf86MonPtr) (pScrn->monitor->DDC);
     int ddcWidthmm, ddcHeightmm;
     int widthErr, heightErr;
 
@@ -885,100 +903,107 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
     pScrn->widthmm = pScrn->monitor->widthmm;
     pScrn->heightmm = pScrn->monitor->heightmm;
 
-    if (DDC && (DDC->features.hsize > 0 && DDC->features.vsize > 0) ) {
-      /* DDC gives display size in mm for individual modes,
-       * but cm for monitor
-       */
-      ddcWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */
-      ddcHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */
-    } else {
-      ddcWidthmm = ddcHeightmm = 0;
+    if (DDC && (DDC->features.hsize > 0 && DDC->features.vsize > 0)) {
+        /* DDC gives display size in mm for individual modes,
+         * but cm for monitor
+         */
+        ddcWidthmm = DDC->features.hsize * 10;  /* 10mm in 1cm */
+        ddcHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */
+    }
+    else {
+        ddcWidthmm = ddcHeightmm = 0;
     }
 
     if (monitorResolution > 0) {
-	pScrn->xDpi = monitorResolution;
-	pScrn->yDpi = monitorResolution;
-	from = X_CMDLINE;
-    } else if (pScrn->widthmm > 0 || pScrn->heightmm > 0) {
-	from = X_CONFIG;
-	if (pScrn->widthmm > 0) {
-	   pScrn->xDpi =
-		(int)((double)pScrn->virtualX * MMPERINCH / pScrn->widthmm);
-	}
-	if (pScrn->heightmm > 0) {
-	   pScrn->yDpi =
-		(int)((double)pScrn->virtualY * MMPERINCH / pScrn->heightmm);
-	}
-	if (pScrn->xDpi > 0 && pScrn->yDpi <= 0)
-	    pScrn->yDpi = pScrn->xDpi;
-	if (pScrn->yDpi > 0 && pScrn->xDpi <= 0)
-	    pScrn->xDpi = pScrn->yDpi;
-	xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",
-		   pScrn->widthmm, pScrn->heightmm);
-
-	/* Warn if config and probe disagree about display size */
-	if ( ddcWidthmm && ddcHeightmm ) {
-	  if (pScrn->widthmm > 0) {
-	    widthErr  = abs(ddcWidthmm  - pScrn->widthmm);
-	  } else {
-	    widthErr  = 0;
-	  }
-	  if (pScrn->heightmm > 0) {
-	    heightErr = abs(ddcHeightmm - pScrn->heightmm);
-	  } else {
-	    heightErr = 0;
-	  }
-	  if (widthErr>10 || heightErr>10) {
-	    /* Should include config file name for monitor here */
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		       "Probed monitor is %dx%d mm, using Displaysize %dx%d mm\n",
-		       ddcWidthmm,ddcHeightmm, pScrn->widthmm,pScrn->heightmm);
-	  }
-	}
-    } else if ( ddcWidthmm && ddcHeightmm ) {
-	from = X_PROBED;
-	xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",
-		   ddcWidthmm, ddcHeightmm );
-	pScrn->widthmm = ddcWidthmm;
-	pScrn->heightmm = ddcHeightmm;
-	if (pScrn->widthmm > 0) {
-	   pScrn->xDpi =
-		(int)((double)pScrn->virtualX * MMPERINCH / pScrn->widthmm);
-	}
-	if (pScrn->heightmm > 0) {
-	   pScrn->yDpi =
-		(int)((double)pScrn->virtualY * MMPERINCH / pScrn->heightmm);
-	}
-	if (pScrn->xDpi > 0 && pScrn->yDpi <= 0)
-	    pScrn->yDpi = pScrn->xDpi;
-	if (pScrn->yDpi > 0 && pScrn->xDpi <= 0)
-	    pScrn->xDpi = pScrn->yDpi;
-    } else {
-	if (x > 0)
-	    pScrn->xDpi = x;
-	else
-	    pScrn->xDpi = DEFAULT_DPI;
-	if (y > 0)
-	    pScrn->yDpi = y;
-	else
-	    pScrn->yDpi = DEFAULT_DPI;
+        pScrn->xDpi = monitorResolution;
+        pScrn->yDpi = monitorResolution;
+        from = X_CMDLINE;
+    }
+    else if (pScrn->widthmm > 0 || pScrn->heightmm > 0) {
+        from = X_CONFIG;
+        if (pScrn->widthmm > 0) {
+            pScrn->xDpi =
+                (int) ((double) pScrn->virtualX * MMPERINCH / pScrn->widthmm);
+        }
+        if (pScrn->heightmm > 0) {
+            pScrn->yDpi =
+                (int) ((double) pScrn->virtualY * MMPERINCH / pScrn->heightmm);
+        }
+        if (pScrn->xDpi > 0 && pScrn->yDpi <= 0)
+            pScrn->yDpi = pScrn->xDpi;
+        if (pScrn->yDpi > 0 && pScrn->xDpi <= 0)
+            pScrn->xDpi = pScrn->yDpi;
+        xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",
+                   pScrn->widthmm, pScrn->heightmm);
+
+        /* Warn if config and probe disagree about display size */
+        if (ddcWidthmm && ddcHeightmm) {
+            if (pScrn->widthmm > 0) {
+                widthErr = abs(ddcWidthmm - pScrn->widthmm);
+            }
+            else {
+                widthErr = 0;
+            }
+            if (pScrn->heightmm > 0) {
+                heightErr = abs(ddcHeightmm - pScrn->heightmm);
+            }
+            else {
+                heightErr = 0;
+            }
+            if (widthErr > 10 || heightErr > 10) {
+                /* Should include config file name for monitor here */
+                xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+                           "Probed monitor is %dx%d mm, using Displaysize %dx%d mm\n",
+                           ddcWidthmm, ddcHeightmm, pScrn->widthmm,
+                           pScrn->heightmm);
+            }
+        }
+    }
+    else if (ddcWidthmm && ddcHeightmm) {
+        from = X_PROBED;
+        xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",
+                   ddcWidthmm, ddcHeightmm);
+        pScrn->widthmm = ddcWidthmm;
+        pScrn->heightmm = ddcHeightmm;
+        if (pScrn->widthmm > 0) {
+            pScrn->xDpi =
+                (int) ((double) pScrn->virtualX * MMPERINCH / pScrn->widthmm);
+        }
+        if (pScrn->heightmm > 0) {
+            pScrn->yDpi =
+                (int) ((double) pScrn->virtualY * MMPERINCH / pScrn->heightmm);
+        }
+        if (pScrn->xDpi > 0 && pScrn->yDpi <= 0)
+            pScrn->yDpi = pScrn->xDpi;
+        if (pScrn->yDpi > 0 && pScrn->xDpi <= 0)
+            pScrn->xDpi = pScrn->yDpi;
+    }
+    else {
+        if (x > 0)
+            pScrn->xDpi = x;
+        else
+            pScrn->xDpi = DEFAULT_DPI;
+        if (y > 0)
+            pScrn->yDpi = y;
+        else
+            pScrn->yDpi = DEFAULT_DPI;
     }
     xf86DrvMsg(pScrn->scrnIndex, from, "DPI set to (%d, %d)\n",
-	       pScrn->xDpi, pScrn->yDpi);
+               pScrn->xDpi, pScrn->yDpi);
 }
 
 #undef MMPERINCH
 
-
 void
 xf86SetBlackWhitePixels(ScreenPtr pScreen)
 {
     if (xf86FlipPixels) {
-	pScreen->whitePixel = 0;
-	pScreen->blackPixel = 1;
-    } else {
-	pScreen->whitePixel = 1;
-	pScreen->blackPixel = 0;
+        pScreen->whitePixel = 0;
+        pScreen->blackPixel = 1;
+    }
+    else {
+        pScreen->whitePixel = 1;
+        pScreen->blackPixel = 0;
     }
 }
 
@@ -1009,21 +1034,19 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
     PixmapPtr pspix;
 
     pspix = (*pScreen->GetScreenPixmap) (pScreen);
-    if (enable)
-    {
-	/*
-	 * Restore all of the clip lists on the screen
-	 */
-	if (!xf86Resetting)
-	    SetRootClip (pScreen, TRUE);
+    if (enable) {
+        /*
+         * Restore all of the clip lists on the screen
+         */
+        if (!xf86Resetting)
+            SetRootClip(pScreen, TRUE);
 
     }
-    else
-    {
-	/*
-	 * Empty all of the clip lists on the screen
-	 */
-	SetRootClip (pScreen, FALSE);
+    else {
+        /*
+         * Empty all of the clip lists on the screen
+         */
+        SetRootClip(pScreen, FALSE);
     }
 }
 
@@ -1031,21 +1054,21 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
    (<type>) <screen name>(<screen index>): <message> */
 void
 xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,
-		va_list args)
+                va_list args)
 {
     /* Prefix the scrnIndex name to the format string. */
     if (scrnIndex >= 0 && scrnIndex < xf86NumScreens &&
-	xf86Screens[scrnIndex]->name)
-	LogHdrMessageVerb(type, verb, format, args, "%s(%d): ",
-	    xf86Screens[scrnIndex]->name, scrnIndex);
+        xf86Screens[scrnIndex]->name)
+        LogHdrMessageVerb(type, verb, format, args, "%s(%d): ",
+                          xf86Screens[scrnIndex]->name, scrnIndex);
     else
-	LogVMessageVerb(type, verb, format, args);
+        LogVMessageVerb(type, verb, format, args);
 }
 
 /* Print driver messages, with verbose level specified directly */
 void
 xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,
-	       ...)
+               ...)
 {
     va_list ap;
 
@@ -1069,26 +1092,26 @@ xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
    (<type>) <driver>: <device name>: <message> */
 void
 xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb,
-		 const char *format, va_list args)
+                 const char *format, va_list args)
 {
     const char *driverName = NULL;
     const char *deviceName = NULL;
 
     /* Prefix driver and device names to formatted message. */
     if (dev) {
-	deviceName = dev->name;
-	if (dev->drv)
-	    driverName = dev->drv->driverName;
+        deviceName = dev->name;
+        if (dev->drv)
+            driverName = dev->drv->driverName;
     }
 
     LogHdrMessageVerb(type, verb, format, args, "%s: %s: ", driverName,
-	deviceName);
+                      deviceName);
 }
 
 /* Print input driver message, with verbose level specified directly */
 void
-xf86IDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *format,
-	       ...)
+xf86IDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb,
+                const char *format, ...)
 {
     va_list ap;
 
@@ -1108,7 +1131,6 @@ xf86IDrvMsg(InputInfoPtr dev, MessageType type, const char *format, ...)
     va_end(ap);
 }
 
-
 /* Print non-driver messages with verbose level specified directly */
 void
 xf86MsgVerb(MessageType type, int verb, const char *format, ...)
@@ -1139,7 +1161,7 @@ xf86ErrorFVerb(int verb, const char *format, ...)
 
     va_start(ap, format);
     if (xf86Verbose >= verb || xf86LogVerbose >= verb)
-	LogVWrite(verb, format, ap);
+        LogVWrite(verb, format, ap);
     va_end(ap);
 }
 
@@ -1151,11 +1173,10 @@ xf86ErrorF(const char *format, ...)
 
     va_start(ap, format);
     if (xf86Verbose >= 1 || xf86LogVerbose >= 1)
-	LogVWrite(1, format, ap);
+        LogVWrite(1, format, ap);
     va_end(ap);
 }
 
-
 void
 xf86LogInit(void)
 {
@@ -1166,10 +1187,10 @@ xf86LogInit(void)
 
     /* Get the log file name */
     if (xf86LogFileFrom == X_DEFAULT) {
-	/* Append the display number and ".log" */
-	if (asprintf(&lf, "%s%%s" LOGSUFFIX, xf86LogFile) == -1)
-	    FatalError("Cannot allocate space for the log file name\n");
-	xf86LogFile = lf;
+        /* Append the display number and ".log" */
+        if (asprintf(&lf, "%s%%s" LOGSUFFIX, xf86LogFile) == -1)
+            FatalError("Cannot allocate space for the log file name\n");
+        xf86LogFile = lf;
     }
 
     xf86LogFile = LogInit(xf86LogFile, LOGOLDSUFFIX);
@@ -1190,7 +1211,6 @@ xf86CloseLog(enum ExitCode error)
     LogClose(error);
 }
 
-
 /*
  * Drivers can use these for using their own SymTabRecs.
  */
@@ -1200,13 +1220,12 @@ xf86TokenToString(SymTabPtr table, int token)
 {
     int i;
 
-    for (i = 0; table[i].token >= 0 && table[i].token != token; i++)
-	;
+    for (i = 0; table[i].token >= 0 && table[i].token != token; i++);
 
     if (table[i].token < 0)
-	return NULL;
+        return NULL;
     else
-	return table[i].name;
+        return table[i].name;
 }
 
 int
@@ -1215,10 +1234,9 @@ xf86StringToToken(SymTabPtr table, const char *string)
     int i;
 
     if (string == NULL)
-	return -1;
+        return -1;
 
-    for (i = 0; table[i].token >= 0 && xf86NameCmp(string, table[i].name); i++)
-	;
+    for (i = 0; table[i].token >= 0 && xf86NameCmp(string, table[i].name); i++);
 
     return table[i].token;
 }
@@ -1232,17 +1250,16 @@ xf86ShowClocks(ScrnInfoPtr scrp, MessageType from)
     int j;
 
     xf86DrvMsg(scrp->scrnIndex, from, "Pixel clocks available:");
-    for (j=0; j < scrp->numClocks; j++) {
-	if ((j % 4) == 0) {
-	    xf86ErrorF("\n");
-	    xf86DrvMsg(scrp->scrnIndex, from, "pixel clocks:");
-	}
-	xf86ErrorF(" %7.3f", (double)scrp->clock[j] / 1000.0);
+    for (j = 0; j < scrp->numClocks; j++) {
+        if ((j % 4) == 0) {
+            xf86ErrorF("\n");
+            xf86DrvMsg(scrp->scrnIndex, from, "pixel clocks:");
+        }
+        xf86ErrorF(" %7.3f", (double) scrp->clock[j] / 1000.0);
     }
     xf86ErrorF("\n");
 }
 
-
 /*
  * This prints out the driver identify message, including the names of
  * the supported chipsets.
@@ -1258,40 +1275,40 @@ xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips)
     len = 6 + strlen(drvname) + 2 + strlen(drvmsg) + 2;
     xf86Msg(X_INFO, "%s: %s:", drvname, drvmsg);
     for (i = 0; chips[i].name != NULL; i++) {
-	if (i != 0) {
-	    xf86ErrorF(",");
-	    len++;
-	}
-	if (len + 2 + strlen(chips[i].name) < 78) {
-	    xf86ErrorF(" ");
-	    len++;
-	} else {
-	    xf86ErrorF("\n\t");
-	    len = 8;
-	}
-	xf86ErrorF("%s", chips[i].name);
-	len += strlen(chips[i].name);
+        if (i != 0) {
+            xf86ErrorF(",");
+            len++;
+        }
+        if (len + 2 + strlen(chips[i].name) < 78) {
+            xf86ErrorF(" ");
+            len++;
+        }
+        else {
+            xf86ErrorF("\n\t");
+            len = 8;
+        }
+        xf86ErrorF("%s", chips[i].name);
+        len += strlen(chips[i].name);
     }
     xf86ErrorF("\n");
 }
 
-
 int
-xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
+xf86MatchDevice(const char *drivername, GDevPtr ** sectlist)
 {
-    GDevPtr       gdp, *pgdp = NULL;
+    GDevPtr gdp, *pgdp = NULL;
     confScreenPtr screensecptr;
-    int i,j;
+    int i, j;
 
     if (sectlist)
-	*sectlist = NULL;
+        *sectlist = NULL;
 
     /*
      * This can happen when running Xorg -showopts and a module like ati
      * or vmware tries to load its submodules when xf86ConfigLayout is empty
      */
     if (!xf86ConfigLayout.screens)
-	return 0;
+        return 0;
 
     /*
      * This is a very important function that matches the device sections
@@ -1314,11 +1331,11 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
      * first we need to loop over all the Screens sections to get to all
      * 'active' device sections
      */
-    for (j=0; xf86ConfigLayout.screens[j].screen != NULL; j++) {
+    for (j = 0; xf86ConfigLayout.screens[j].screen != NULL; j++) {
         screensecptr = xf86ConfigLayout.screens[j].screen;
         if ((screensecptr->device->driver != NULL)
-            && (xf86NameCmp( screensecptr->device->driver,drivername) == 0)
-            && (! screensecptr->device->claimed)) {
+            && (xf86NameCmp(screensecptr->device->driver, drivername) == 0)
+            && (!screensecptr->device->claimed)) {
             /*
              * we have a matching driver that wasn't claimed, yet
              */
@@ -1330,14 +1347,14 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
     /* Then handle the inactive devices */
     j = 0;
     while (xf86ConfigLayout.inactives[j].identifier) {
-	gdp = &xf86ConfigLayout.inactives[j];
-	if (gdp->driver && !gdp->claimed &&
-	    !xf86NameCmp(gdp->driver,drivername)) {
-	    /* we have a matching driver that wasn't claimed yet */
-	    pgdp = xnfrealloc(pgdp, (i + 2) * sizeof(GDevPtr));
-	    pgdp[i++] = gdp;
-	}
-	j++;
+        gdp = &xf86ConfigLayout.inactives[j];
+        if (gdp->driver && !gdp->claimed &&
+            !xf86NameCmp(gdp->driver, drivername)) {
+            /* we have a matching driver that wasn't claimed yet */
+            pgdp = xnfrealloc(pgdp, (i + 2) * sizeof(GDevPtr));
+            pgdp[i++] = gdp;
+        }
+        j++;
     }
 
     /*
@@ -1347,9 +1364,9 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
         pgdp[i] = NULL;
 
     if (sectlist)
-	*sectlist = pgdp;
+        *sectlist = pgdp;
     else
-	free(pgdp);
+        free(pgdp);
     return i;
 }
 
@@ -1357,12 +1374,11 @@ const char *
 xf86GetVisualName(int visual)
 {
     if (visual < 0 || visual > DirectColor)
-	return NULL;
+        return NULL;
 
     return xf86VisualNames[visual];
 }
 
-
 int
 xf86GetVerbosity(void)
 {
@@ -1375,84 +1391,72 @@ xf86GetPix24(void)
     return xf86Info.pixmap24;
 }
 
-
 int
 xf86GetDepth(void)
 {
     return xf86Depth;
 }
 
-
 rgb
 xf86GetWeight(void)
 {
     return xf86Weight;
 }
 
-
 Gamma
 xf86GetGamma(void)
 {
     return xf86Gamma;
 }
 
-
 Bool
 xf86GetFlipPixels(void)
 {
     return xf86FlipPixels;
 }
 
-
 const char *
 xf86GetServerName(void)
 {
     return xf86ServerName;
 }
 
-
 Bool
 xf86ServerIsExiting(void)
 {
     return (dispatchException & DE_TERMINATE) == DE_TERMINATE;
 }
 
-
 Bool
 xf86ServerIsResetting(void)
 {
     return xf86Resetting;
 }
 
-
 Bool
 xf86ServerIsInitialising(void)
 {
     return xf86Initialising;
 }
 
-
 Bool
 xf86ServerIsOnlyDetecting(void)
 {
     return xf86DoConfigure;
 }
 
-
 Bool
 xf86CaughtSignal(void)
 {
     return xf86Info.caughtSignal;
 }
 
-
 Bool
 xf86GetVidModeAllowNonLocal(void)
 {
     return xf86Info.vidModeAllowNonLocal;
 }
 
-
 Bool
 xf86GetVidModeEnabled(void)
 {
@@ -1465,21 +1469,18 @@ xf86GetModInDevAllowNonLocal(void)
     return xf86Info.miscModInDevAllowNonLocal;
 }
 
-
 Bool
 xf86GetModInDevEnabled(void)
 {
     return xf86Info.miscModInDevEnabled;
 }
 
-
 Bool
 xf86GetAllowMouseOpenFail(void)
 {
     return xf86Info.allowMouseOpenFail;
 }
 
-
 void
 xf86DisableRandR(void)
 {
@@ -1490,7 +1491,7 @@ xf86DisableRandR(void)
 CARD32
 xf86GetModuleVersion(pointer module)
 {
-    return (CARD32)LoaderGetModuleVersion(module);
+    return (CARD32) LoaderGetModuleVersion(module);
 }
 
 pointer
@@ -1500,9 +1501,9 @@ xf86LoadDrvSubModule(DriverPtr drv, const char *name)
     int errmaj = 0, errmin = 0;
 
     ret = LoadSubModule(drv->module, name, NULL, NULL, NULL, NULL,
-			&errmaj, &errmin);
+                        &errmaj, &errmin);
     if (!ret)
-	LoaderErrorMsg(NULL, name, errmaj, errmin);
+        LoaderErrorMsg(NULL, name, errmaj, errmin);
     return ret;
 }
 
@@ -1513,9 +1514,9 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
     int errmaj = 0, errmin = 0;
 
     ret = LoadSubModule(pScrn->module, name, NULL, NULL, NULL, NULL,
-			&errmaj, &errmin);
+                        &errmaj, &errmin);
     if (!ret)
-	LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
+        LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
     return ret;
 }
 
@@ -1530,22 +1531,22 @@ xf86LoadOneModule(char *name, pointer opt)
     pointer mod;
 
     if (!name)
-	return NULL;
+        return NULL;
 
     /* Normalise the module name */
     Name = xf86NormalizeName(name);
 
     /* Skip empty names */
     if (Name == NULL)
-	return NULL;
+        return NULL;
     if (*Name == '\0') {
-	free(Name);
-	return NULL;
+        free(Name);
+        return NULL;
     }
 
     mod = LoadModule(Name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin);
     if (!mod)
-	LoaderErrorMsg(NULL, Name, errmaj, errmin);
+        LoaderErrorMsg(NULL, Name, errmaj, errmin);
     free(Name);
     return mod;
 }
@@ -1563,12 +1564,12 @@ xf86LoaderCheckSymbol(const char *name)
 }
 
 typedef enum {
-   OPTION_BACKING_STORE
+    OPTION_BACKING_STORE
 } BSOpts;
 
 static const OptionInfoRec BSOptions[] = {
-   { OPTION_BACKING_STORE, "BackingStore", OPTV_BOOLEAN, {0}, FALSE },
-   { -1,                   NULL,           OPTV_NONE,    {0}, FALSE }
+    {OPTION_BACKING_STORE, "BackingStore", OPTV_BOOLEAN, {0}, FALSE},
+    {-1, NULL, OPTV_NONE, {0}, FALSE}
 };
 
 void
@@ -1580,39 +1581,40 @@ xf86SetBackingStore(ScreenPtr pScreen)
     OptionInfoPtr options;
 
     options = xnfalloc(sizeof(BSOptions));
-    (void)memcpy(options, BSOptions, sizeof(BSOptions));
+    (void) memcpy(options, BSOptions, sizeof(BSOptions));
     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
 
     /* check for commandline option here */
     if (xf86bsEnableFlag) {
-	from = X_CMDLINE;
-	useBS = TRUE;
-    } else if (xf86bsDisableFlag) {
-	from = X_CMDLINE;
-	useBS = FALSE;
-    } else {
-	if (xf86GetOptValBool(options, OPTION_BACKING_STORE, &useBS))
-	    from = X_CONFIG;
+        from = X_CMDLINE;
+        useBS = TRUE;
+    }
+    else if (xf86bsDisableFlag) {
+        from = X_CMDLINE;
+        useBS = FALSE;
+    }
+    else {
+        if (xf86GetOptValBool(options, OPTION_BACKING_STORE, &useBS))
+            from = X_CONFIG;
     }
     free(options);
     pScreen->backingStoreSupport = useBS ? Always : NotUseful;
     if (serverGeneration == 1)
-	xf86DrvMsg(pScreen->myNum, from, "Backing store %s\n",
-		   useBS ? "enabled" : "disabled");
+        xf86DrvMsg(pScreen->myNum, from, "Backing store %s\n",
+                   useBS ? "enabled" : "disabled");
 }
 
-
 typedef enum {
-   OPTION_SILKEN_MOUSE
+    OPTION_SILKEN_MOUSE
 } SMOpts;
 
 static const OptionInfoRec SMOptions[] = {
-   { OPTION_SILKEN_MOUSE, "SilkenMouse",   OPTV_BOOLEAN, {0}, FALSE },
-   { -1,                   NULL,           OPTV_NONE,    {0}, FALSE }
+    {OPTION_SILKEN_MOUSE, "SilkenMouse", OPTV_BOOLEAN, {0}, FALSE},
+    {-1, NULL, OPTV_NONE, {0}, FALSE}
 };
 
 void
-xf86SetSilkenMouse (ScreenPtr pScreen)
+xf86SetSilkenMouse(ScreenPtr pScreen)
 {
     Bool useSM = TRUE;
     MessageType from = X_DEFAULT;
@@ -1620,18 +1622,19 @@ xf86SetSilkenMouse (ScreenPtr pScreen)
     OptionInfoPtr options;
 
     options = xnfalloc(sizeof(SMOptions));
-    (void)memcpy(options, SMOptions, sizeof(SMOptions));
+    (void) memcpy(options, SMOptions, sizeof(SMOptions));
     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
 
     /* check for commandline option here */
     /* disable if screen shares resources */
-	/* TODO VGA arb disable silken mouse */
+    /* TODO VGA arb disable silken mouse */
     if (xf86silkenMouseDisableFlag) {
         from = X_CMDLINE;
-	useSM = FALSE;
-    } else {
-	if (xf86GetOptValBool(options, OPTION_SILKEN_MOUSE, &useSM))
-	    from = X_CONFIG;
+        useSM = FALSE;
+    }
+    else {
+        if (xf86GetOptValBool(options, OPTION_SILKEN_MOUSE, &useSM))
+            from = X_CONFIG;
     }
     free(options);
     /*
@@ -1641,33 +1644,37 @@ xf86SetSilkenMouse (ScreenPtr pScreen)
      */
     pScrn->silkenMouse = useSM && xf86Info.useSIGIO && xf86SIGIOSupported();
     if (serverGeneration == 1)
-	xf86DrvMsg(pScreen->myNum, from, "Silken mouse %s\n",
-		   pScrn->silkenMouse ? "enabled" : "disabled");
+        xf86DrvMsg(pScreen->myNum, from, "Silken mouse %s\n",
+                   pScrn->silkenMouse ? "enabled" : "disabled");
 }
 
 /* Wrote this function for the PM2 Xv driver, preliminary. */
 
 pointer
 xf86FindXvOptions(int scrnIndex, int adaptor_index, char *port_name,
-		  char **adaptor_name, pointer *adaptor_options)
+                  char **adaptor_name, pointer *adaptor_options)
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     confXvAdaptorPtr adaptor;
     int i;
 
     if (adaptor_index >= pScrn->confScreen->numxvadaptors) {
-	if (adaptor_name) *adaptor_name = NULL;
-	if (adaptor_options) *adaptor_options = NULL;
-	return NULL;
+        if (adaptor_name)
+            *adaptor_name = NULL;
+        if (adaptor_options)
+            *adaptor_options = NULL;
+        return NULL;
     }
 
     adaptor = &pScrn->confScreen->xvadaptors[adaptor_index];
-    if (adaptor_name) *adaptor_name = adaptor->identifier;
-    if (adaptor_options) *adaptor_options = adaptor->options;
+    if (adaptor_name)
+        *adaptor_name = adaptor->identifier;
+    if (adaptor_options)
+        *adaptor_options = adaptor->options;
 
     for (i = 0; i < adaptor->numports; i++)
-	if (!xf86NameCmp(adaptor->ports[i].identifier, port_name))
-	    return adaptor->ports[i].options;
+        if (!xf86NameCmp(adaptor->ports[i].identifier, port_name))
+            return adaptor->ports[i].options;
 
     return NULL;
 }
@@ -1678,39 +1685,41 @@ xf86FindXvOptions(int scrnIndex, int adaptor_index, char *port_name,
 
 static void
 xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,
-			   EntityProc enter, EntityProc leave, pointer private)
+                           EntityProc enter, EntityProc leave, pointer private)
 {
     ScrnInfoPtr pScrn;
 
     if ((pScrn = xf86FindScreenForEntity(pEnt->index)))
-	xf86RemoveEntityFromScreen(pScrn,pEnt->index);
-    xf86SetEntityFuncs(pEnt->index,init,enter,leave,private);
+        xf86RemoveEntityFromScreen(pScrn, pEnt->index);
+    xf86SetEntityFuncs(pEnt->index, init, enter, leave, private);
 }
 
 ScrnInfoPtr
 xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
-		   EntityProc init, EntityProc enter, EntityProc leave,
-		   pointer private)
+                   EntityProc init, EntityProc enter, EntityProc leave,
+                   pointer private)
 {
     EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
-    if (!pEnt) return pScrn;
+
+    if (!pEnt)
+        return pScrn;
 
     if (!(pEnt->location.type == BUS_NONE)) {
-	free(pEnt);
-	return pScrn;
+        free(pEnt);
+        return pScrn;
     }
 
     if (!pEnt->active) {
-	xf86ConfigFbEntityInactive(pEnt, init,  enter, leave,  private);
-	free(pEnt);
-	return pScrn;
+        xf86ConfigFbEntityInactive(pEnt, init, enter, leave, private);
+        free(pEnt);
+        return pScrn;
     }
 
     if (!pScrn)
-	pScrn = xf86AllocateScreen(pEnt->driver,scrnFlag);
-    xf86AddEntityToScreen(pScrn,entityIndex);
+        pScrn = xf86AllocateScreen(pEnt->driver, scrnFlag);
+    xf86AddEntityToScreen(pScrn, entityIndex);
 
-    xf86SetEntityFuncs(entityIndex,init,enter,leave,private);
+    xf86SetEntityFuncs(entityIndex, init, enter, leave, private);
 
     free(pEnt);
     return pScrn;
@@ -1722,48 +1731,49 @@ xf86IsScreenPrimary(int scrnIndex)
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     int i;
 
-    for (i=0 ; i < pScrn->numEntities; i++) {
-	if (xf86IsEntityPrimary(i))
-	    return TRUE;
+    for (i = 0; i < pScrn->numEntities; i++) {
+        if (xf86IsEntityPrimary(i))
+            return TRUE;
     }
     return FALSE;
 }
 
 int
 xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
-			       int format, unsigned long len, pointer value )
+                               int format, unsigned long len, pointer value)
 {
     RootWinPropPtr pNewProp = NULL, pRegProp;
     Bool existing = FALSE;
 
     DebugF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n",
-	   ScrnIndex, property, type, format, len, value);
+           ScrnIndex, property, type, format, len, value);
 
-    if (ScrnIndex<0 || ScrnIndex>=xf86NumScreens) {
-      return BadMatch;
+    if (ScrnIndex < 0 || ScrnIndex >= xf86NumScreens) {
+        return BadMatch;
     }
 
     if (xf86RegisteredPropertiesTable &&
-	xf86RegisteredPropertiesTable[ScrnIndex]) {
-      for (pNewProp = xf86RegisteredPropertiesTable[ScrnIndex];
-	   pNewProp; pNewProp = pNewProp->next) {
-	if (strcmp(pNewProp->name, NameForAtom(property)) == 0)
-	  break;
-      }
+        xf86RegisteredPropertiesTable[ScrnIndex]) {
+        for (pNewProp = xf86RegisteredPropertiesTable[ScrnIndex];
+             pNewProp; pNewProp = pNewProp->next) {
+            if (strcmp(pNewProp->name, NameForAtom(property)) == 0)
+                break;
+        }
     }
 
     if (!pNewProp) {
-      if ((pNewProp = (RootWinPropPtr)malloc(sizeof(RootWinProp))) == NULL) {
-	return BadAlloc;
-      }
-      /*
-       * We will put this property at the end of the list so that
-       * the changes are made in the order they were requested.
-       */
-      pNewProp->next = NULL;
-    } else {
-      free(pNewProp->name);
-      existing = TRUE;
+        if ((pNewProp = (RootWinPropPtr) malloc(sizeof(RootWinProp))) == NULL) {
+            return BadAlloc;
+        }
+        /*
+         * We will put this property at the end of the list so that
+         * the changes are made in the order they were requested.
+         */
+        pNewProp->next = NULL;
+    }
+    else {
+        free(pNewProp->name);
+        existing = TRUE;
     }
 
     pNewProp->name = xnfstrdup(NameForAtom(property));
@@ -1775,28 +1785,29 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
     DebugF("new property filled\n");
 
     if (xf86RegisteredPropertiesTable == NULL) {
-      DebugF("creating xf86RegisteredPropertiesTable[] size %d\n",
-	     xf86NumScreens);
-      xf86RegisteredPropertiesTable =
-	  xnfcalloc(sizeof(RootWinProp), xf86NumScreens);
+        DebugF("creating xf86RegisteredPropertiesTable[] size %d\n",
+               xf86NumScreens);
+        xf86RegisteredPropertiesTable =
+            xnfcalloc(sizeof(RootWinProp), xf86NumScreens);
     }
 
     DebugF("xf86RegisteredPropertiesTable %p\n",
-	   (void *)xf86RegisteredPropertiesTable);
+           (void *) xf86RegisteredPropertiesTable);
     DebugF("xf86RegisteredPropertiesTable[%d] %p\n",
-	   ScrnIndex, (void *)xf86RegisteredPropertiesTable[ScrnIndex]);
+           ScrnIndex, (void *) xf86RegisteredPropertiesTable[ScrnIndex]);
 
     if (!existing) {
-      if ( xf86RegisteredPropertiesTable[ScrnIndex] == NULL) {
-	xf86RegisteredPropertiesTable[ScrnIndex] = pNewProp;
-      } else {
-	pRegProp = xf86RegisteredPropertiesTable[ScrnIndex];
-	while (pRegProp->next != NULL) {
-	  DebugF("- next %p\n", (void *)pRegProp);
-	  pRegProp = pRegProp->next;
+        if (xf86RegisteredPropertiesTable[ScrnIndex] == NULL) {
+            xf86RegisteredPropertiesTable[ScrnIndex] = pNewProp;
+        }
+        else {
+            pRegProp = xf86RegisteredPropertiesTable[ScrnIndex];
+            while (pRegProp->next != NULL) {
+                DebugF("- next %p\n", (void *) pRegProp);
+                pRegProp = pRegProp->next;
+            }
+            pRegProp->next = pNewProp;
         }
-	pRegProp->next = pNewProp;
-      }
     }
     DebugF("xf86RegisterRootWindowProperty succeeded\n");
     return Success;
@@ -1805,16 +1816,16 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
 Bool
 xf86IsUnblank(int mode)
 {
-    switch(mode) {
+    switch (mode) {
     case SCREEN_SAVER_OFF:
     case SCREEN_SAVER_FORCER:
-	return TRUE;
+        return TRUE;
     case SCREEN_SAVER_ON:
     case SCREEN_SAVER_CYCLE:
-	return FALSE;
+        return FALSE;
     default:
-	xf86MsgVerb(X_WARNING, 0, "Unexpected save screen mode: %d\n", mode);
-	return TRUE;
+        xf86MsgVerb(X_WARNING, 0, "Unexpected save screen mode: %d\n", mode);
+        return TRUE;
     }
 }
 
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c
index 5263b5f73..0974893d3 100644
--- a/xorg-server/hw/xfree86/common/xf86Init.c
+++ b/xorg-server/hw/xfree86/common/xf86Init.c
@@ -91,21 +91,22 @@
 #include <hotplug.h>
 
 #ifdef XF86PM
-void (*xf86OSPMClose)(void) = NULL;
+void (*xf86OSPMClose) (void) = NULL;
 #endif
 static Bool xorgHWOpenConsole = FALSE;
 
 /* Common pixmap formats */
 
 static PixmapFormatRec formats[MAXFORMATS] = {
-	{ 1,	1,	BITMAP_SCANLINE_PAD },
-	{ 4,	8,	BITMAP_SCANLINE_PAD },
-	{ 8,	8,	BITMAP_SCANLINE_PAD },
-	{ 15,	16,	BITMAP_SCANLINE_PAD },
-	{ 16,	16,	BITMAP_SCANLINE_PAD },
-	{ 24,	32,	BITMAP_SCANLINE_PAD },
-	{ 32,	32,	BITMAP_SCANLINE_PAD },
+    {1, 1, BITMAP_SCANLINE_PAD},
+    {4, 8, BITMAP_SCANLINE_PAD},
+    {8, 8, BITMAP_SCANLINE_PAD},
+    {15, 16, BITMAP_SCANLINE_PAD},
+    {16, 16, BITMAP_SCANLINE_PAD},
+    {24, 32, BITMAP_SCANLINE_PAD},
+    {32, 32, BITMAP_SCANLINE_PAD},
 };
+
 static int numFormats = 7;
 static Bool formatsDone = FALSE;
 
@@ -123,241 +124,242 @@ static void
 xf86PrintBanner(void)
 {
 #if PRE_RELEASE
-  xf86ErrorFVerb(0, "\n"
-    "This is a pre-release version of the X server from " XVENDORNAME ".\n"
-    "It is not supported in any way.\n"
-    "Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"
-    "Select the \"xorg\" product for bugs you find in this release.\n"
-    "Before reporting bugs in pre-release versions please check the\n"
-    "latest version in the X.Org Foundation git repository.\n"
-    "See http://wiki.x.org/wiki/GitPage for git access instructions.\n");
+    xf86ErrorFVerb(0, "\n"
+                   "This is a pre-release version of the X server from "
+                   XVENDORNAME ".\n" "It is not supported in any way.\n"
+                   "Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"
+                   "Select the \"xorg\" product for bugs you find in this release.\n"
+                   "Before reporting bugs in pre-release versions please check the\n"
+                   "latest version in the X.Org Foundation git repository.\n"
+                   "See http://wiki.x.org/wiki/GitPage for git access instructions.\n");
 #endif
-  xf86ErrorFVerb(0, "\nX.Org X Server %d.%d.%d",
-	 XORG_VERSION_MAJOR,
-	 XORG_VERSION_MINOR,
-	 XORG_VERSION_PATCH);
+    xf86ErrorFVerb(0, "\nX.Org X Server %d.%d.%d",
+                   XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH);
 #if XORG_VERSION_SNAP > 0
-  xf86ErrorFVerb(0, ".%d", XORG_VERSION_SNAP);
+    xf86ErrorFVerb(0, ".%d", XORG_VERSION_SNAP);
 #endif
 
 #if XORG_VERSION_SNAP >= 900
-  /* When the minor number is 99, that signifies that the we are making
-   * a release candidate for a major version.  (X.0.0)
-   * When the patch number is 99, that signifies that the we are making
-   * a release candidate for a minor version.  (X.Y.0)
-   * When the patch number is < 99, then we are making a release
-   * candidate for the next point release.  (X.Y.Z)
-   */
+    /* When the minor number is 99, that signifies that the we are making
+     * a release candidate for a major version.  (X.0.0)
+     * When the patch number is 99, that signifies that the we are making
+     * a release candidate for a minor version.  (X.Y.0)
+     * When the patch number is < 99, then we are making a release
+     * candidate for the next point release.  (X.Y.Z)
+     */
 #if XORG_VERSION_MINOR >= 99
-  xf86ErrorFVerb(0, " (%d.0.0 RC %d)", XORG_VERSION_MAJOR+1,
-                 XORG_VERSION_SNAP - 900);
+    xf86ErrorFVerb(0, " (%d.0.0 RC %d)", XORG_VERSION_MAJOR + 1,
+                   XORG_VERSION_SNAP - 900);
 #elif XORG_VERSION_PATCH == 99
-  xf86ErrorFVerb(0, " (%d.%d.0 RC %d)", XORG_VERSION_MAJOR,
-                 XORG_VERSION_MINOR + 1, XORG_VERSION_SNAP - 900);
+    xf86ErrorFVerb(0, " (%d.%d.0 RC %d)", XORG_VERSION_MAJOR,
+                   XORG_VERSION_MINOR + 1, XORG_VERSION_SNAP - 900);
 #else
-  xf86ErrorFVerb(0, " (%d.%d.%d RC %d)", XORG_VERSION_MAJOR,
-                 XORG_VERSION_MINOR, XORG_VERSION_PATCH + 1,
-                 XORG_VERSION_SNAP - 900);
+    xf86ErrorFVerb(0, " (%d.%d.%d RC %d)", XORG_VERSION_MAJOR,
+                   XORG_VERSION_MINOR, XORG_VERSION_PATCH + 1,
+                   XORG_VERSION_SNAP - 900);
 #endif
 #endif
 
 #ifdef XORG_CUSTOM_VERSION
-  xf86ErrorFVerb(0, " (%s)", XORG_CUSTOM_VERSION);
+    xf86ErrorFVerb(0, " (%s)", XORG_CUSTOM_VERSION);
 #endif
 #ifndef XORG_DATE
-# define XORG_DATE "Unknown"
+#define XORG_DATE "Unknown"
 #endif
-  xf86ErrorFVerb(0, "\nRelease Date: %s\n", XORG_DATE);
-  xf86ErrorFVerb(0, "X Protocol Version %d, Revision %d\n",
-         X_PROTOCOL, X_PROTOCOL_REVISION);
-  xf86ErrorFVerb(0, "Build Operating System: %s %s\n", OSNAME, OSVENDOR);
+    xf86ErrorFVerb(0, "\nRelease Date: %s\n", XORG_DATE);
+    xf86ErrorFVerb(0, "X Protocol Version %d, Revision %d\n",
+                   X_PROTOCOL, X_PROTOCOL_REVISION);
+    xf86ErrorFVerb(0, "Build Operating System: %s %s\n", OSNAME, OSVENDOR);
 #ifdef HAS_UTSNAME
-  {
-    struct utsname name;
+    {
+        struct utsname name;
 
-    /* Linux & BSD state that 0 is success, SysV (including Solaris, HP-UX,
-       and Irix) and Single Unix Spec 3 just say that non-negative is success.
-       All agree that failure is represented by a negative number.
-     */
-    if (uname(&name) >= 0) {
-      xf86ErrorFVerb(0, "Current Operating System: %s %s %s %s %s\n",
-	name.sysname, name.nodename, name.release, name.version, name.machine);
+        /* Linux & BSD state that 0 is success, SysV (including Solaris, HP-UX,
+           and Irix) and Single Unix Spec 3 just say that non-negative is success.
+           All agree that failure is represented by a negative number.
+         */
+        if (uname(&name) >= 0) {
+            xf86ErrorFVerb(0, "Current Operating System: %s %s %s %s %s\n",
+                           name.sysname, name.nodename, name.release,
+                           name.version, name.machine);
 #ifdef linux
-      do {
-	  char buf[80];
-	  int fd = open("/proc/cmdline", O_RDONLY);
-	  if (fd != -1) {
-	    xf86ErrorFVerb(0, "Kernel command line: ");
-	    memset(buf, 0, 80);
-	    while (read(fd, buf, 80) > 0) {
-		xf86ErrorFVerb(0, "%.80s", buf);
-		memset(buf, 0, 80);
-	    }
-	    close(fd);
-	  } 
-      } while (0);
+            do {
+                char buf[80];
+                int fd = open("/proc/cmdline", O_RDONLY);
+
+                if (fd != -1) {
+                    xf86ErrorFVerb(0, "Kernel command line: ");
+                    memset(buf, 0, 80);
+                    while (read(fd, buf, 80) > 0) {
+                        xf86ErrorFVerb(0, "%.80s", buf);
+                        memset(buf, 0, 80);
+                    }
+                    close(fd);
+                }
+            } while (0);
 #endif
+        }
     }
-  }
 #endif
 #if defined(BUILD_DATE) && (BUILD_DATE > 19000000)
-  {
-    struct tm t;
-    char buf[100];
-
-    memset(&t, 0, sizeof(t));
-    memset(buf, 0, sizeof(buf));
-    t.tm_mday = BUILD_DATE % 100;
-    t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
-    t.tm_year = BUILD_DATE / 10000 - 1900;
+    {
+        struct tm t;
+        char buf[100];
+
+        memset(&t, 0, sizeof(t));
+        memset(buf, 0, sizeof(buf));
+        t.tm_mday = BUILD_DATE % 100;
+        t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
+        t.tm_year = BUILD_DATE / 10000 - 1900;
 #if defined(BUILD_TIME)
-    t.tm_sec = BUILD_TIME % 100;
-    t.tm_min = (BUILD_TIME / 100) % 100;
-    t.tm_hour = (BUILD_TIME / 10000) % 100;
-    if (strftime(buf, sizeof(buf), "%d %B %Y  %I:%M:%S%p", &t))
-       xf86ErrorFVerb(0, "Build Date: %s\n", buf);
+        t.tm_sec = BUILD_TIME % 100;
+        t.tm_min = (BUILD_TIME / 100) % 100;
+        t.tm_hour = (BUILD_TIME / 10000) % 100;
+        if (strftime(buf, sizeof(buf), "%d %B %Y  %I:%M:%S%p", &t))
+            xf86ErrorFVerb(0, "Build Date: %s\n", buf);
 #else
-    if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
-       xf86ErrorFVerb(0, "Build Date: %s\n", buf);
+        if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
+            xf86ErrorFVerb(0, "Build Date: %s\n", buf);
 #endif
-  }
+    }
 #endif
 #if defined(BUILDERSTRING)
-  xf86ErrorFVerb(0, "%s \n", BUILDERSTRING);
+    xf86ErrorFVerb(0, "%s \n", BUILDERSTRING);
 #endif
-  xf86ErrorFVerb(0, "Current version of pixman: %s\n",
-                 pixman_version_string());
-  xf86ErrorFVerb(0, "\tBefore reporting problems, check "
-                 ""__VENDORDWEBSUPPORT__"\n"
-                 "\tto make sure that you have the latest version.\n");
+    xf86ErrorFVerb(0, "Current version of pixman: %s\n",
+                   pixman_version_string());
+    xf86ErrorFVerb(0, "\tBefore reporting problems, check "
+                   "" __VENDORDWEBSUPPORT__ "\n"
+                   "\tto make sure that you have the latest version.\n");
 }
 
 static void
 xf86PrintMarkers(void)
 {
-  LogPrintMarkers();
+    LogPrintMarkers();
 }
 
-Bool xf86PrivsElevated(void)
+Bool
+xf86PrivsElevated(void)
 {
-  static Bool privsTested = FALSE;
-  static Bool privsElevated = TRUE;
+    static Bool privsTested = FALSE;
+    static Bool privsElevated = TRUE;
 
-  if (!privsTested) {
+    if (!privsTested) {
 #if defined(WIN32)
-    privsElevated = FALSE;
+        privsElevated = FALSE;
 #else
-    if ((getuid() != geteuid()) || (getgid() != getegid())) {
-      privsElevated = TRUE;
-    } else {
+        if ((getuid() != geteuid()) || (getgid() != getegid())) {
+            privsElevated = TRUE;
+        }
+        else {
 #if defined(HAVE_ISSETUGID)
-      privsElevated = issetugid();
+            privsElevated = issetugid();
 #elif defined(HAVE_GETRESUID)
-      uid_t ruid, euid, suid;
-      gid_t rgid, egid, sgid;
-
-      if ((getresuid(&ruid, &euid, &suid) == 0) &&
-          (getresgid(&rgid, &egid, &sgid) == 0)) {
-        privsElevated = (euid != suid) || (egid != sgid);
-      }
-      else {
-        printf("Failed getresuid or getresgid");
-        /* Something went wrong, make defensive assumption */
-        privsElevated = TRUE;
-      }
+            uid_t ruid, euid, suid;
+            gid_t rgid, egid, sgid;
+
+            if ((getresuid(&ruid, &euid, &suid) == 0) &&
+                (getresgid(&rgid, &egid, &sgid) == 0)) {
+                privsElevated = (euid != suid) || (egid != sgid);
+            }
+            else {
+                printf("Failed getresuid or getresgid");
+                /* Something went wrong, make defensive assumption */
+                privsElevated = TRUE;
+            }
 #else
-      if (getuid()==0) {
-        /* running as root: uid==euid==0 */
-        privsElevated = FALSE;
-      }
-      else {
-        /*
-         * If there are saved ID's the process might still be privileged
-         * even though the above test succeeded. If issetugid() and
-         * getresgid() aren't available, test this by trying to set
-         * euid to 0.
-         */
-        unsigned int oldeuid;
-        oldeuid = geteuid();
-
-        if (seteuid(0) != 0) {
-          privsElevated = FALSE;
-        } else {
-          if (seteuid(oldeuid) != 0) {
-            FatalError("Failed to drop privileges.  Exiting\n");
-          }
-          privsElevated = TRUE;
+            if (getuid() == 0) {
+                /* running as root: uid==euid==0 */
+                privsElevated = FALSE;
+            }
+            else {
+                /*
+                 * If there are saved ID's the process might still be privileged
+                 * even though the above test succeeded. If issetugid() and
+                 * getresgid() aren't available, test this by trying to set
+                 * euid to 0.
+                 */
+                unsigned int oldeuid;
+
+                oldeuid = geteuid();
+
+                if (seteuid(0) != 0) {
+                    privsElevated = FALSE;
+                }
+                else {
+                    if (seteuid(oldeuid) != 0) {
+                        FatalError("Failed to drop privileges.  Exiting\n");
+                    }
+                    privsElevated = TRUE;
+                }
+            }
+#endif
         }
-      }
 #endif
+        privsTested = TRUE;
     }
-#endif
-    privsTested = TRUE;
-  }
-  return privsElevated;
+    return privsElevated;
 }
 
 static Bool
 xf86CreateRootWindow(WindowPtr pWin)
 {
-  int ret = TRUE;
-  int err = Success;
-  ScreenPtr pScreen = pWin->drawable.pScreen;
-  RootWinPropPtr pProp;
-  CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
-      dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
-
-  DebugF("xf86CreateRootWindow(%p)\n", pWin);
-
-  if ( pScreen->CreateWindow != xf86CreateRootWindow ) {
-    /* Can't find hook we are hung on */
-	xf86DrvMsg(pScreen->myNum, X_WARNING /* X_ERROR */,
-		  "xf86CreateRootWindow %p called when not in pScreen->CreateWindow %p n",
-		   (void *)xf86CreateRootWindow,
-		   (void *)pScreen->CreateWindow );
-  }
-
-  /* Unhook this function ... */
-  pScreen->CreateWindow = CreateWindow;
-  dixSetPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey, NULL);
-
-  /* ... and call the previous CreateWindow fuction, if any */
-  if (NULL!=pScreen->CreateWindow) {
-    ret = (*pScreen->CreateWindow)(pWin);
-  }
-
-  /* Now do our stuff */
-  if (xf86RegisteredPropertiesTable != NULL) {
-    if (pWin->parent == NULL && xf86RegisteredPropertiesTable != NULL) {
-      for (pProp = xf86RegisteredPropertiesTable[pScreen->myNum];
-	   pProp != NULL && err==Success;
-	   pProp = pProp->next )
-	{
-	  Atom prop;
-
-	  prop = MakeAtom(pProp->name, strlen(pProp->name), TRUE);
-	  err = dixChangeWindowProperty(serverClient, pWin,
-					prop, pProp->type,
-					pProp->format, PropModeReplace,
-					pProp->size, pProp->data,
-					FALSE);
-	}
-
-      /* Look at err */
-      ret &= (err==Success);
-
-    } else {
-      xf86Msg(X_ERROR, "xf86CreateRootWindow unexpectedly called with "
-	      "non-root window %p (parent %p)\n",
-	      (void *)pWin, (void *)pWin->parent);
-      ret = FALSE;
+    int ret = TRUE;
+    int err = Success;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    RootWinPropPtr pProp;
+    CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
+        dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
+
+    DebugF("xf86CreateRootWindow(%p)\n", pWin);
+
+    if (pScreen->CreateWindow != xf86CreateRootWindow) {
+        /* Can't find hook we are hung on */
+        xf86DrvMsg(pScreen->myNum, X_WARNING /* X_ERROR */ ,
+                   "xf86CreateRootWindow %p called when not in pScreen->CreateWindow %p n",
+                   (void *) xf86CreateRootWindow,
+                   (void *) pScreen->CreateWindow);
     }
-  }
 
-  DebugF("xf86CreateRootWindow() returns %d\n", ret);
-  return ret;
-}
+    /* Unhook this function ... */
+    pScreen->CreateWindow = CreateWindow;
+    dixSetPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey, NULL);
+
+    /* ... and call the previous CreateWindow fuction, if any */
+    if (NULL != pScreen->CreateWindow) {
+        ret = (*pScreen->CreateWindow) (pWin);
+    }
+
+    /* Now do our stuff */
+    if (xf86RegisteredPropertiesTable != NULL) {
+        if (pWin->parent == NULL && xf86RegisteredPropertiesTable != NULL) {
+            for (pProp = xf86RegisteredPropertiesTable[pScreen->myNum];
+                 pProp != NULL && err == Success; pProp = pProp->next) {
+                Atom prop;
+
+                prop = MakeAtom(pProp->name, strlen(pProp->name), TRUE);
+                err = dixChangeWindowProperty(serverClient, pWin,
+                                              prop, pProp->type,
+                                              pProp->format, PropModeReplace,
+                                              pProp->size, pProp->data, FALSE);
+            }
+
+            /* Look at err */
+            ret &= (err == Success);
+
+        }
+        else {
+            xf86Msg(X_ERROR, "xf86CreateRootWindow unexpectedly called with "
+                    "non-root window %p (parent %p)\n",
+                    (void *) pWin, (void *) pWin->parent);
+            ret = FALSE;
+        }
+    }
 
+    DebugF("xf86CreateRootWindow() returns %d\n", ret);
+    return ret;
+}
 
 static void
 InstallSignalHandlers(void)
@@ -365,20 +367,21 @@ InstallSignalHandlers(void)
     /*
      * Install signal handler for unexpected signals
      */
-    xf86Info.caughtSignal=FALSE;
+    xf86Info.caughtSignal = FALSE;
     if (!xf86Info.notrapSignals) {
-	OsRegisterSigWrapper(xf86SigWrapper);
-    } else {
-	signal(SIGSEGV, SIG_DFL);
-	signal(SIGILL, SIG_DFL);
+        OsRegisterSigWrapper(xf86SigWrapper);
+    }
+    else {
+        signal(SIGSEGV, SIG_DFL);
+        signal(SIGILL, SIG_DFL);
 #ifdef SIGEMT
-	signal(SIGEMT, SIG_DFL);
+        signal(SIGEMT, SIG_DFL);
 #endif
-	signal(SIGFPE, SIG_DFL);
-	signal(SIGBUS, SIG_DFL);
-	signal(SIGSYS, SIG_DFL);
-	signal(SIGXCPU, SIG_DFL);
-	signal(SIGXFSZ, SIG_DFL);
+        signal(SIGFPE, SIG_DFL);
+        signal(SIGBUS, SIG_DFL);
+        signal(SIGSYS, SIG_DFL);
+        signal(SIGXCPU, SIG_DFL);
+        signal(SIGXFSZ, SIG_DFL);
     }
 }
 
@@ -389,485 +392,500 @@ InstallSignalHandlers(void)
  *      collecting the pixmap formats.
  */
 void
-InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
+InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
 {
-  int                    i, j, k, scr_index, was_blocked = 0;
-  char                   **modulelist;
-  pointer                *optionlist;
-  Pix24Flags		 screenpix24, pix24;
-  MessageType		 pix24From = X_DEFAULT;
-  Bool			 pix24Fail = FALSE;
-  Bool			 autoconfig = FALSE;
-  GDevPtr		 configured_device;
-
-  xf86Initialising = TRUE;
-
-  if (serverGeneration == 1) {
-    if ((xf86ServerName = strrchr(argv[0], '/')) != 0)
-      xf86ServerName++;
-    else
-      xf86ServerName = argv[0];
-
-	xf86PrintBanner();
-	xf86PrintMarkers();
-	if (xf86LogFile)  {
-	    time_t t;
-	    const char *ct;
-	    t = time(NULL);
-	    ct = ctime(&t);
-	    xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s",
-			xf86LogFile, ct);
-	}
-
-    /* Read and parse the config file */
-    if (!xf86DoConfigure && !xf86DoShowOptions) {
-      switch (xf86HandleConfigFile(FALSE)) {
-      case CONFIG_OK:
-	break;
-      case CONFIG_PARSE_ERROR:
-	xf86Msg(X_ERROR, "Error parsing the config file\n");
-	return;
-      case CONFIG_NOFILE:
-	autoconfig = TRUE;
-	break;
-      }
-    }
+    int i, j, k, scr_index, was_blocked = 0;
+    char **modulelist;
+    pointer *optionlist;
+    Pix24Flags screenpix24, pix24;
+    MessageType pix24From = X_DEFAULT;
+    Bool pix24Fail = FALSE;
+    Bool autoconfig = FALSE;
+    GDevPtr configured_device;
+
+    xf86Initialising = TRUE;
+
+    if (serverGeneration == 1) {
+        if ((xf86ServerName = strrchr(argv[0], '/')) != 0)
+            xf86ServerName++;
+        else
+            xf86ServerName = argv[0];
+
+        xf86PrintBanner();
+        xf86PrintMarkers();
+        if (xf86LogFile) {
+            time_t t;
+            const char *ct;
+
+            t = time(NULL);
+            ct = ctime(&t);
+            xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s",
+                        xf86LogFile, ct);
+        }
 
-    InstallSignalHandlers();
+        /* Read and parse the config file */
+        if (!xf86DoConfigure && !xf86DoShowOptions) {
+            switch (xf86HandleConfigFile(FALSE)) {
+            case CONFIG_OK:
+                break;
+            case CONFIG_PARSE_ERROR:
+                xf86Msg(X_ERROR, "Error parsing the config file\n");
+                return;
+            case CONFIG_NOFILE:
+                autoconfig = TRUE;
+                break;
+            }
+        }
 
-    /* Initialise the loader */
-    LoaderInit();
+        InstallSignalHandlers();
 
-    /* Tell the loader the default module search path */
-    LoaderSetPath(xf86ModulePath);
+        /* Initialise the loader */
+        LoaderInit();
 
-    if (xf86Info.ignoreABI) {
-        LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
-    }
+        /* Tell the loader the default module search path */
+        LoaderSetPath(xf86ModulePath);
 
-    if (xf86DoShowOptions)
-        DoShowOptions();
+        if (xf86Info.ignoreABI) {
+            LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
+        }
 
-    /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
-    xf86BusProbe();
+        if (xf86DoShowOptions)
+            DoShowOptions();
 
-    if (xf86DoConfigure)
-	DoConfigure();
+        /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
+        xf86BusProbe();
 
-    if (autoconfig) {
-	if (!xf86AutoConfig()) {
-	    xf86Msg(X_ERROR, "Auto configuration failed\n");
-	    return;
-	}
-    }
+        if (xf86DoConfigure)
+            DoConfigure();
+
+        if (autoconfig) {
+            if (!xf86AutoConfig()) {
+                xf86Msg(X_ERROR, "Auto configuration failed\n");
+                return;
+            }
+        }
 
 #ifdef XF86PM
-    xf86OSPMClose = xf86OSPMOpen();
+        xf86OSPMClose = xf86OSPMOpen();
 #endif
 
-    /* Load all modules specified explicitly in the config file */
-    if ((modulelist = xf86ModulelistFromConfig(&optionlist))) {
-      xf86LoadModules(modulelist, optionlist);
-      free(modulelist);
-      free(optionlist);
-    }
+        /* Load all modules specified explicitly in the config file */
+        if ((modulelist = xf86ModulelistFromConfig(&optionlist))) {
+            xf86LoadModules(modulelist, optionlist);
+            free(modulelist);
+            free(optionlist);
+        }
 
-    /* Load all driver modules specified in the config file */
-    /* If there aren't any specified in the config file, autoconfig them */
-    /* FIXME: Does not handle multiple active screen sections, but I'm not
-     * sure if we really want to handle that case*/
-    configured_device = xf86ConfigLayout.screens->screen->device;
-    if ((!configured_device) || (!configured_device->driver)) {
-        if (!autoConfigDevice(configured_device)) {
-            xf86Msg(X_ERROR, "Automatic driver configuration failed\n");
-            return ;
+        /* Load all driver modules specified in the config file */
+        /* If there aren't any specified in the config file, autoconfig them */
+        /* FIXME: Does not handle multiple active screen sections, but I'm not
+         * sure if we really want to handle that case*/
+        configured_device = xf86ConfigLayout.screens->screen->device;
+        if ((!configured_device) || (!configured_device->driver)) {
+            if (!autoConfigDevice(configured_device)) {
+                xf86Msg(X_ERROR, "Automatic driver configuration failed\n");
+                return;
+            }
+        }
+        if ((modulelist = xf86DriverlistFromConfig())) {
+            xf86LoadModules(modulelist, NULL);
+            free(modulelist);
         }
-    }
-    if ((modulelist = xf86DriverlistFromConfig())) {
-      xf86LoadModules(modulelist, NULL);
-      free(modulelist);
-    }
 
-    /* Load all input driver modules specified in the config file. */
-    if ((modulelist = xf86InputDriverlistFromConfig())) {
-      xf86LoadModules(modulelist, NULL);
-      free(modulelist);
-    }
+        /* Load all input driver modules specified in the config file. */
+        if ((modulelist = xf86InputDriverlistFromConfig())) {
+            xf86LoadModules(modulelist, NULL);
+            free(modulelist);
+        }
 
-    /*
-     * It is expected that xf86AddDriver()/xf86AddInputDriver will be
-     * called for each driver as it is loaded.  Those functions save the
-     * module pointers for drivers.
-     * XXX Nothing keeps track of them for other modules.
-     */
-    /* XXX What do we do if not all of these could be loaded? */
+        /*
+         * It is expected that xf86AddDriver()/xf86AddInputDriver will be
+         * called for each driver as it is loaded.  Those functions save the
+         * module pointers for drivers.
+         * XXX Nothing keeps track of them for other modules.
+         */
+        /* XXX What do we do if not all of these could be loaded? */
 
-    /*
-     * At this point, xf86DriverList[] is all filled in with entries for
-     * each of the drivers to try and xf86NumDrivers has the number of
-     * drivers.  If there are none, return now.
-     */
+        /*
+         * At this point, xf86DriverList[] is all filled in with entries for
+         * each of the drivers to try and xf86NumDrivers has the number of
+         * drivers.  If there are none, return now.
+         */
 
-    if (xf86NumDrivers == 0) {
-      xf86Msg(X_ERROR, "No drivers available.\n");
-      return;
-    }
+        if (xf86NumDrivers == 0) {
+            xf86Msg(X_ERROR, "No drivers available.\n");
+            return;
+        }
 
-    /*
-     * Call each of the Identify functions and call the driverFunc to check
-     * if HW access is required.  The Identify functions print out some
-     * identifying information, and anything else that might be
-     * needed at this early stage.
-     */
+        /*
+         * Call each of the Identify functions and call the driverFunc to check
+         * if HW access is required.  The Identify functions print out some
+         * identifying information, and anything else that might be
+         * needed at this early stage.
+         */
 
-    for (i = 0; i < xf86NumDrivers; i++) {
-	if (xf86DriverList[i]->Identify != NULL)
-	    xf86DriverList[i]->Identify(0);
-
-	if (!xorgHWAccess || !xorgHWOpenConsole) {
-	    xorgHWFlags flags;
-	    if(!xf86DriverList[i]->driverFunc
-		|| !xf86DriverList[i]->driverFunc(NULL,
-						  GET_REQUIRED_HW_INTERFACES,
-						  &flags))
-		flags = HW_IO;
-
-	    if(NEED_IO_ENABLED(flags))
-		xorgHWAccess = TRUE;
-	    if(!(flags & HW_SKIP_CONSOLE))
-		xorgHWOpenConsole = TRUE;
-	}
-    }
+        for (i = 0; i < xf86NumDrivers; i++) {
+            if (xf86DriverList[i]->Identify != NULL)
+                xf86DriverList[i]->Identify(0);
 
-    if (xorgHWOpenConsole)
-	xf86OpenConsole();
-    else
-	xf86Info.dontVTSwitch = TRUE;
+            if (!xorgHWAccess || !xorgHWOpenConsole) {
+                xorgHWFlags flags;
 
-    if (xf86BusConfig() == FALSE)
-        return;
+                if (!xf86DriverList[i]->driverFunc
+                    || !xf86DriverList[i]->driverFunc(NULL,
+                                                      GET_REQUIRED_HW_INTERFACES,
+                                                      &flags))
+                    flags = HW_IO;
 
-    xf86PostProbe();
+                if (NEED_IO_ENABLED(flags))
+                    xorgHWAccess = TRUE;
+                if (!(flags & HW_SKIP_CONSOLE))
+                    xorgHWOpenConsole = TRUE;
+            }
+        }
 
-    /*
-     * Sort the drivers to match the requested ording.  Using a slow
-     * bubble sort.
-     */
-    for (j = 0; j < xf86NumScreens - 1; j++) {
-	for (i = 0; i < xf86NumScreens - j - 1; i++) {
-	    if (xf86Screens[i + 1]->confScreen->screennum <
-		xf86Screens[i]->confScreen->screennum) {
-		ScrnInfoPtr tmpScrn = xf86Screens[i + 1];
-		xf86Screens[i + 1] = xf86Screens[i];
-		xf86Screens[i] = tmpScrn;
-	    }
-	}
-    }
-    /* Fix up the indexes */
-    for (i = 0; i < xf86NumScreens; i++) {
-	xf86Screens[i]->scrnIndex = i;
-    }
+        if (xorgHWOpenConsole)
+            xf86OpenConsole();
+        else
+            xf86Info.dontVTSwitch = TRUE;
 
-    /*
-     * Call the driver's PreInit()'s to complete initialisation for the first
-     * generation.
-     */
+        if (xf86BusConfig() == FALSE)
+            return;
 
-    for (i = 0; i < xf86NumScreens; i++) {
-	xf86VGAarbiterScrnInit(xf86Screens[i]);
-	xf86VGAarbiterLock(xf86Screens[i]);
-	if (xf86Screens[i]->PreInit &&
-	    xf86Screens[i]->PreInit(xf86Screens[i], 0))
-	    xf86Screens[i]->configured = TRUE;
-	xf86VGAarbiterUnlock(xf86Screens[i]);
-    }
-    for (i = 0; i < xf86NumScreens; i++)
-	if (!xf86Screens[i]->configured)
-	    xf86DeleteScreen(i--, 0);
+        xf86PostProbe();
 
-    /*
-     * If no screens left, return now.
-     */
+        /*
+         * Sort the drivers to match the requested ording.  Using a slow
+         * bubble sort.
+         */
+        for (j = 0; j < xf86NumScreens - 1; j++) {
+            for (i = 0; i < xf86NumScreens - j - 1; i++) {
+                if (xf86Screens[i + 1]->confScreen->screennum <
+                    xf86Screens[i]->confScreen->screennum) {
+                    ScrnInfoPtr tmpScrn = xf86Screens[i + 1];
+
+                    xf86Screens[i + 1] = xf86Screens[i];
+                    xf86Screens[i] = tmpScrn;
+                }
+            }
+        }
+        /* Fix up the indexes */
+        for (i = 0; i < xf86NumScreens; i++) {
+            xf86Screens[i]->scrnIndex = i;
+        }
 
-    if (xf86NumScreens == 0) {
-      xf86Msg(X_ERROR,
-	      "Screen(s) found, but none have a usable configuration.\n");
-      return;
-    }
+        /*
+         * Call the driver's PreInit()'s to complete initialisation for the first
+         * generation.
+         */
 
-    for (i = 0; i < xf86NumScreens; i++) {
-      if (xf86Screens[i]->name == NULL) {
-	XNFasprintf(&xf86Screens[i]->name, "screen%d", i);
-	xf86MsgVerb(X_WARNING, 0,
-		    "Screen driver %d has no name set, using `%s'.\n",
-		    i, xf86Screens[i]->name);
-      }
-    }
+        for (i = 0; i < xf86NumScreens; i++) {
+            xf86VGAarbiterScrnInit(xf86Screens[i]);
+            xf86VGAarbiterLock(xf86Screens[i]);
+            if (xf86Screens[i]->PreInit &&
+                xf86Screens[i]->PreInit(xf86Screens[i], 0))
+                xf86Screens[i]->configured = TRUE;
+            xf86VGAarbiterUnlock(xf86Screens[i]);
+        }
+        for (i = 0; i < xf86NumScreens; i++)
+            if (!xf86Screens[i]->configured)
+                xf86DeleteScreen(i--, 0);
 
-    /* Remove (unload) drivers that are not required */
-    for (i = 0; i < xf86NumDrivers; i++)
-	if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0)
-	    xf86DeleteDriver(i);
+        /*
+         * If no screens left, return now.
+         */
 
-    /*
-     * At this stage we know how many screens there are.
-     */
+        if (xf86NumScreens == 0) {
+            xf86Msg(X_ERROR,
+                    "Screen(s) found, but none have a usable configuration.\n");
+            return;
+        }
 
-    for (i = 0; i < xf86NumScreens; i++)
-      xf86InitViewport(xf86Screens[i]);
+        for (i = 0; i < xf86NumScreens; i++) {
+            if (xf86Screens[i]->name == NULL) {
+                XNFasprintf(&xf86Screens[i]->name, "screen%d", i);
+                xf86MsgVerb(X_WARNING, 0,
+                            "Screen driver %d has no name set, using `%s'.\n",
+                            i, xf86Screens[i]->name);
+            }
+        }
 
-    /*
-     * Collect all pixmap formats and check for conflicts at the display
-     * level.  Should we die here?  Or just delete the offending screens?
-     */
-    screenpix24 = Pix24DontCare;
-    for (i = 0; i < xf86NumScreens; i++) {
-	if (xf86Screens[i]->imageByteOrder !=
-	    xf86Screens[0]->imageByteOrder)
-	    FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");
-	if (xf86Screens[i]->bitmapScanlinePad !=
-	    xf86Screens[0]->bitmapScanlinePad)
-	    FatalError("Inconsistent display bitmapScanlinePad.  Exiting\n");
-	if (xf86Screens[i]->bitmapScanlineUnit !=
-	    xf86Screens[0]->bitmapScanlineUnit)
-	    FatalError("Inconsistent display bitmapScanlineUnit.  Exiting\n");
-	if (xf86Screens[i]->bitmapBitOrder !=
-	    xf86Screens[0]->bitmapBitOrder)
-	    FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");
-
-	/* Determine the depth 24 pixmap format the screens would like */
-	if (xf86Screens[i]->pixmap24 != Pix24DontCare) {
-	    if (screenpix24 == Pix24DontCare)
-		screenpix24 = xf86Screens[i]->pixmap24;
-	    else if (screenpix24 != xf86Screens[i]->pixmap24)
-		FatalError("Inconsistent depth 24 pixmap format.  Exiting\n");
-	}
-    }
-    /* check if screenpix24 is consistent with the config/cmdline */
-    if (xf86Info.pixmap24 != Pix24DontCare) {
-	pix24 = xf86Info.pixmap24;
-	pix24From = xf86Info.pix24From;
-	if (screenpix24 != Pix24DontCare && screenpix24 != xf86Info.pixmap24)
-	    pix24Fail = TRUE;
-    } else if (screenpix24 != Pix24DontCare) {
-	pix24 = screenpix24;
-	pix24From = X_PROBED;
-    } else
-	pix24 = Pix24Use32;
-
-    if (pix24Fail)
-	FatalError("Screen(s) can't use the required depth 24 pixmap format"
-		   " (%d).  Exiting\n", PIX24TOBPP(pix24));
-
-    /* Initialise the depth 24 format */
-    for (j = 0; j < numFormats && formats[j].depth != 24; j++)
-	;
-    formats[j].bitsPerPixel = PIX24TOBPP(pix24);
-
-    /* Collect additional formats */
-    for (i = 0; i < xf86NumScreens; i++) {
-	for (j = 0; j < xf86Screens[i]->numFormats; j++) {
-	    for (k = 0; ; k++) {
-		if (k >= numFormats) {
-		    if (k >= MAXFORMATS)
-			FatalError("Too many pixmap formats!  Exiting\n");
-		    formats[k] = xf86Screens[i]->formats[j];
-		    numFormats++;
-		    break;
-		}
-		if (formats[k].depth == xf86Screens[i]->formats[j].depth) {
-		    if ((formats[k].bitsPerPixel ==
-			 xf86Screens[i]->formats[j].bitsPerPixel) &&
-		        (formats[k].scanlinePad ==
-			 xf86Screens[i]->formats[j].scanlinePad))
-			break;
-		    FatalError("Inconsistent pixmap format for depth %d."
-			       "  Exiting\n", formats[k].depth);
-		}
-	    }
-	}
-    }
-    formatsDone = TRUE;
+        /* Remove (unload) drivers that are not required */
+        for (i = 0; i < xf86NumDrivers; i++)
+            if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0)
+                xf86DeleteDriver(i);
 
-    if (xf86Info.vtno >= 0 ) {
-#define VT_ATOM_NAME         "XFree86_VT"
-      Atom VTAtom=-1;
-      CARD32  *VT = NULL;
-      int  ret;
-
-      /* This memory needs to stay available until the screen has been
-	 initialized, and we can create the property for real.
-      */
-      if ( (VT = malloc(sizeof(CARD32)))==NULL ) {
-	FatalError("Unable to make VT property - out of memory. Exiting...\n");
-      }
-      *VT = xf86Info.vtno;
-
-      VTAtom = MakeAtom(VT_ATOM_NAME, sizeof(VT_ATOM_NAME) - 1, TRUE);
-
-      for (i = 0, ret = Success; i < xf86NumScreens && ret == Success; i++) {
-	ret = xf86RegisterRootWindowProperty(xf86Screens[i]->scrnIndex,
-					     VTAtom, XA_INTEGER, 32,
-					     1, VT );
-	if (ret != Success)
-	  xf86DrvMsg(xf86Screens[i]->scrnIndex, X_WARNING,
-		     "Failed to register VT property\n");
-      }
-    }
+        /*
+         * At this stage we know how many screens there are.
+         */
+
+        for (i = 0; i < xf86NumScreens; i++)
+            xf86InitViewport(xf86Screens[i]);
+
+        /*
+         * Collect all pixmap formats and check for conflicts at the display
+         * level.  Should we die here?  Or just delete the offending screens?
+         */
+        screenpix24 = Pix24DontCare;
+        for (i = 0; i < xf86NumScreens; i++) {
+            if (xf86Screens[i]->imageByteOrder !=
+                xf86Screens[0]->imageByteOrder)
+                FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");
+            if (xf86Screens[i]->bitmapScanlinePad !=
+                xf86Screens[0]->bitmapScanlinePad)
+                FatalError
+                    ("Inconsistent display bitmapScanlinePad.  Exiting\n");
+            if (xf86Screens[i]->bitmapScanlineUnit !=
+                xf86Screens[0]->bitmapScanlineUnit)
+                FatalError
+                    ("Inconsistent display bitmapScanlineUnit.  Exiting\n");
+            if (xf86Screens[i]->bitmapBitOrder !=
+                xf86Screens[0]->bitmapBitOrder)
+                FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");
+
+            /* Determine the depth 24 pixmap format the screens would like */
+            if (xf86Screens[i]->pixmap24 != Pix24DontCare) {
+                if (screenpix24 == Pix24DontCare)
+                    screenpix24 = xf86Screens[i]->pixmap24;
+                else if (screenpix24 != xf86Screens[i]->pixmap24)
+                    FatalError
+                        ("Inconsistent depth 24 pixmap format.  Exiting\n");
+            }
+        }
+        /* check if screenpix24 is consistent with the config/cmdline */
+        if (xf86Info.pixmap24 != Pix24DontCare) {
+            pix24 = xf86Info.pixmap24;
+            pix24From = xf86Info.pix24From;
+            if (screenpix24 != Pix24DontCare &&
+                screenpix24 != xf86Info.pixmap24)
+                pix24Fail = TRUE;
+        }
+        else if (screenpix24 != Pix24DontCare) {
+            pix24 = screenpix24;
+            pix24From = X_PROBED;
+        }
+        else
+            pix24 = Pix24Use32;
 
-    if (SeatId) {
-        Atom SeatAtom;
+        if (pix24Fail)
+            FatalError("Screen(s) can't use the required depth 24 pixmap format"
+                       " (%d).  Exiting\n", PIX24TOBPP(pix24));
 
-        SeatAtom = MakeAtom(SEAT_ATOM_NAME, sizeof(SEAT_ATOM_NAME) - 1, TRUE);
+        /* Initialise the depth 24 format */
+        for (j = 0; j < numFormats && formats[j].depth != 24; j++);
+        formats[j].bitsPerPixel = PIX24TOBPP(pix24);
 
+        /* Collect additional formats */
         for (i = 0; i < xf86NumScreens; i++) {
+            for (j = 0; j < xf86Screens[i]->numFormats; j++) {
+                for (k = 0;; k++) {
+                    if (k >= numFormats) {
+                        if (k >= MAXFORMATS)
+                            FatalError("Too many pixmap formats!  Exiting\n");
+                        formats[k] = xf86Screens[i]->formats[j];
+                        numFormats++;
+                        break;
+                    }
+                    if (formats[k].depth == xf86Screens[i]->formats[j].depth) {
+                        if ((formats[k].bitsPerPixel ==
+                             xf86Screens[i]->formats[j].bitsPerPixel) &&
+                            (formats[k].scanlinePad ==
+                             xf86Screens[i]->formats[j].scanlinePad))
+                            break;
+                        FatalError("Inconsistent pixmap format for depth %d."
+                                   "  Exiting\n", formats[k].depth);
+                    }
+                }
+            }
+        }
+        formatsDone = TRUE;
+
+        if (xf86Info.vtno >= 0) {
+#define VT_ATOM_NAME         "XFree86_VT"
+            Atom VTAtom = -1;
+            CARD32 *VT = NULL;
             int ret;
 
-            ret = xf86RegisterRootWindowProperty(xf86Screens[i]->scrnIndex,
-                                                 SeatAtom, XA_STRING, 8,
-                                                 strlen(SeatId)+1, SeatId );
-            if (ret != Success) {
-                xf86DrvMsg(xf86Screens[i]->scrnIndex, X_WARNING,
-                           "Failed to register seat property\n");
+            /* This memory needs to stay available until the screen has been
+               initialized, and we can create the property for real.
+             */
+            if ((VT = malloc(sizeof(CARD32))) == NULL) {
+                FatalError
+                    ("Unable to make VT property - out of memory. Exiting...\n");
+            }
+            *VT = xf86Info.vtno;
+
+            VTAtom = MakeAtom(VT_ATOM_NAME, sizeof(VT_ATOM_NAME) - 1, TRUE);
+
+            for (i = 0, ret = Success; i < xf86NumScreens && ret == Success;
+                 i++) {
+                ret =
+                    xf86RegisterRootWindowProperty(xf86Screens[i]->scrnIndex,
+                                                   VTAtom, XA_INTEGER, 32, 1,
+                                                   VT);
+                if (ret != Success)
+                    xf86DrvMsg(xf86Screens[i]->scrnIndex, X_WARNING,
+                               "Failed to register VT property\n");
+            }
+        }
+
+        if (SeatId) {
+            Atom SeatAtom;
+
+            SeatAtom =
+                MakeAtom(SEAT_ATOM_NAME, sizeof(SEAT_ATOM_NAME) - 1, TRUE);
+
+            for (i = 0; i < xf86NumScreens; i++) {
+                int ret;
+
+                ret = xf86RegisterRootWindowProperty(xf86Screens[i]->scrnIndex,
+                                                     SeatAtom, XA_STRING, 8,
+                                                     strlen(SeatId) + 1,
+                                                     SeatId);
+                if (ret != Success) {
+                    xf86DrvMsg(xf86Screens[i]->scrnIndex, X_WARNING,
+                               "Failed to register seat property\n");
+                }
+            }
+        }
+
+        /* If a screen uses depth 24, show what the pixmap format is */
+        for (i = 0; i < xf86NumScreens; i++) {
+            if (xf86Screens[i]->depth == 24) {
+                xf86Msg(pix24From, "Depth 24 pixmap format is %d bpp\n",
+                        PIX24TOBPP(pix24));
+                break;
             }
         }
     }
+    else {
+        /*
+         * serverGeneration != 1; some OSs have to do things here, too.
+         */
+        if (xorgHWOpenConsole)
+            xf86OpenConsole();
 
-    /* If a screen uses depth 24, show what the pixmap format is */
-    for (i = 0; i < xf86NumScreens; i++) {
-	if (xf86Screens[i]->depth == 24) {
-	    xf86Msg(pix24From, "Depth 24 pixmap format is %d bpp\n",
-		    PIX24TOBPP(pix24));
-	    break;
-	}
+#ifdef XF86PM
+        /*
+           should we reopen it here? We need to deal with an already opened
+           device. We could leave this to the OS layer. For now we simply
+           close it here
+         */
+        if (xf86OSPMClose)
+            xf86OSPMClose();
+        if ((xf86OSPMClose = xf86OSPMOpen()) != NULL)
+            xf86MsgVerb(X_INFO, 3, "APM registered successfully\n");
+#endif
+
+        /* Make sure full I/O access is enabled */
+        if (xorgHWAccess)
+            xf86EnableIO();
     }
-  } else {
+
     /*
-     * serverGeneration != 1; some OSs have to do things here, too.
+     * Use the previously collected parts to setup pScreenInfo
      */
-    if (xorgHWOpenConsole)
-	xf86OpenConsole();
 
-#ifdef XF86PM
-    /*
-      should we reopen it here? We need to deal with an already opened
-      device. We could leave this to the OS layer. For now we simply
-      close it here
-    */
-    if (xf86OSPMClose)
-        xf86OSPMClose();
-    if ((xf86OSPMClose = xf86OSPMOpen()) != NULL)
-	xf86MsgVerb(X_INFO, 3, "APM registered successfully\n");
-#endif
+    pScreenInfo->imageByteOrder = xf86Screens[0]->imageByteOrder;
+    pScreenInfo->bitmapScanlinePad = xf86Screens[0]->bitmapScanlinePad;
+    pScreenInfo->bitmapScanlineUnit = xf86Screens[0]->bitmapScanlineUnit;
+    pScreenInfo->bitmapBitOrder = xf86Screens[0]->bitmapBitOrder;
+    pScreenInfo->numPixmapFormats = numFormats;
+    for (i = 0; i < numFormats; i++)
+        pScreenInfo->formats[i] = formats[i];
 
-    /* Make sure full I/O access is enabled */
-    if (xorgHWAccess)
-	xf86EnableIO();
-  }
-
-  /*
-   * Use the previously collected parts to setup pScreenInfo
-   */
-
-  pScreenInfo->imageByteOrder = xf86Screens[0]->imageByteOrder;
-  pScreenInfo->bitmapScanlinePad = xf86Screens[0]->bitmapScanlinePad;
-  pScreenInfo->bitmapScanlineUnit = xf86Screens[0]->bitmapScanlineUnit;
-  pScreenInfo->bitmapBitOrder = xf86Screens[0]->bitmapBitOrder;
-  pScreenInfo->numPixmapFormats = numFormats;
-  for (i = 0; i < numFormats; i++)
-    pScreenInfo->formats[i] = formats[i];
-
-  /* Make sure the server's VT is active */
-
-  if (serverGeneration != 1) {
-    xf86Resetting = TRUE;
-    /* All screens are in the same state, so just check the first */
-    if (!xf86Screens[0]->vtSema) {
+    /* Make sure the server's VT is active */
+
+    if (serverGeneration != 1) {
+        xf86Resetting = TRUE;
+        /* All screens are in the same state, so just check the first */
+        if (!xf86Screens[0]->vtSema) {
 #ifdef HAS_USL_VTS
-      ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ);
+            ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ);
 #endif
-      xf86AccessEnter();
-      was_blocked = xf86BlockSIGIO();
+            xf86AccessEnter();
+            was_blocked = xf86BlockSIGIO();
+        }
     }
-  }
-
-  for (i = 0; i < xf86NumScreens; i++)
-      if (!xf86ColormapAllocatePrivates(xf86Screens[i]))
-	  FatalError("Cannot register DDX private keys");
-
-  if (!dixRegisterPrivateKey(&xf86ScreenKeyRec, PRIVATE_SCREEN, 0) ||
-      !dixRegisterPrivateKey(&xf86CreateRootWindowKeyRec, PRIVATE_SCREEN, 0))
-      FatalError("Cannot register DDX private keys");
-
-  for (i = 0; i < xf86NumScreens; i++) {
-	xf86VGAarbiterLock(xf86Screens[i]);
-	/*
-	 * Almost everything uses these defaults, and many of those that
-	 * don't, will wrap them.
-	 */
-	xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess;
+
+    for (i = 0; i < xf86NumScreens; i++)
+        if (!xf86ColormapAllocatePrivates(xf86Screens[i]))
+            FatalError("Cannot register DDX private keys");
+
+    if (!dixRegisterPrivateKey(&xf86ScreenKeyRec, PRIVATE_SCREEN, 0) ||
+        !dixRegisterPrivateKey(&xf86CreateRootWindowKeyRec, PRIVATE_SCREEN, 0))
+        FatalError("Cannot register DDX private keys");
+
+    for (i = 0; i < xf86NumScreens; i++) {
+        xf86VGAarbiterLock(xf86Screens[i]);
+        /*
+         * Almost everything uses these defaults, and many of those that
+         * don't, will wrap them.
+         */
+        xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess;
 #ifdef XFreeXDGA
-	xf86Screens[i]->SetDGAMode = xf86SetDGAMode;
+        xf86Screens[i]->SetDGAMode = xf86SetDGAMode;
 #endif
-	xf86Screens[i]->DPMSSet = NULL;
-	xf86Screens[i]->LoadPalette = NULL;
-	xf86Screens[i]->SetOverscan = NULL;
-	xf86Screens[i]->DriverFunc = NULL;
-	xf86Screens[i]->pScreen = NULL;
-	scr_index = AddScreen(xf86Screens[i]->ScreenInit, argc, argv);
-	xf86VGAarbiterUnlock(xf86Screens[i]);
-      if (scr_index == i) {
-	/*
-	 * Hook in our ScrnInfoRec, and initialise some other pScreen
-	 * fields.
-	 */
-	dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,
-		      xf86ScreenKey, xf86Screens[i]);
-	xf86Screens[i]->pScreen = screenInfo.screens[scr_index];
-	/* The driver should set this, but make sure it is set anyway */
-	xf86Screens[i]->vtSema = TRUE;
-      } else {
-	/* This shouldn't normally happen */
-	FatalError("AddScreen/ScreenInit failed for driver %d\n", i);
-      }
-
-      DebugF("InitOutput - xf86Screens[%d]->pScreen = %p\n",
-	     i, xf86Screens[i]->pScreen );
-      DebugF("xf86Screens[%d]->pScreen->CreateWindow = %p\n",
-	     i, xf86Screens[i]->pScreen->CreateWindow );
-
-      dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,
-		    xf86CreateRootWindowKey,
-		    xf86Screens[i]->pScreen->CreateWindow);
-      xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow;
-
-    if (PictureGetSubpixelOrder (xf86Screens[i]->pScreen) == SubPixelUnknown)
-    {
-	xf86MonPtr DDC = (xf86MonPtr)(xf86Screens[i]->monitor->DDC);
-	PictureSetSubpixelOrder (xf86Screens[i]->pScreen,
-				 DDC ?
-				 (DDC->features.input_type ?
-				  SubPixelHorizontalRGB : SubPixelNone) :
-				 SubPixelUnknown);
-    }
+        xf86Screens[i]->DPMSSet = NULL;
+        xf86Screens[i]->LoadPalette = NULL;
+        xf86Screens[i]->SetOverscan = NULL;
+        xf86Screens[i]->DriverFunc = NULL;
+        xf86Screens[i]->pScreen = NULL;
+        scr_index = AddScreen(xf86Screens[i]->ScreenInit, argc, argv);
+        xf86VGAarbiterUnlock(xf86Screens[i]);
+        if (scr_index == i) {
+            /*
+             * Hook in our ScrnInfoRec, and initialise some other pScreen
+             * fields.
+             */
+            dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,
+                          xf86ScreenKey, xf86Screens[i]);
+            xf86Screens[i]->pScreen = screenInfo.screens[scr_index];
+            /* The driver should set this, but make sure it is set anyway */
+            xf86Screens[i]->vtSema = TRUE;
+        }
+        else {
+            /* This shouldn't normally happen */
+            FatalError("AddScreen/ScreenInit failed for driver %d\n", i);
+        }
+
+        DebugF("InitOutput - xf86Screens[%d]->pScreen = %p\n",
+               i, xf86Screens[i]->pScreen);
+        DebugF("xf86Screens[%d]->pScreen->CreateWindow = %p\n",
+               i, xf86Screens[i]->pScreen->CreateWindow);
+
+        dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,
+                      xf86CreateRootWindowKey,
+                      xf86Screens[i]->pScreen->CreateWindow);
+        xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow;
+
+        if (PictureGetSubpixelOrder(xf86Screens[i]->pScreen) == SubPixelUnknown) {
+            xf86MonPtr DDC = (xf86MonPtr) (xf86Screens[i]->monitor->DDC);
+
+            PictureSetSubpixelOrder(xf86Screens[i]->pScreen,
+                                    DDC ?
+                                    (DDC->features.input_type ?
+                                     SubPixelHorizontalRGB : SubPixelNone) :
+                                    SubPixelUnknown);
+        }
 #ifdef RANDR
-    if (!xf86Info.disableRandR)
-	xf86RandRInit (screenInfo.screens[scr_index]);
-    xf86Msg(xf86Info.randRFrom, "RandR %s\n",
-	    xf86Info.disableRandR ? "disabled" : "enabled");
+        if (!xf86Info.disableRandR)
+            xf86RandRInit(screenInfo.screens[scr_index]);
+        xf86Msg(xf86Info.randRFrom, "RandR %s\n",
+                xf86Info.disableRandR ? "disabled" : "enabled");
 #endif
-  }
+    }
 
-  xf86VGAarbiterWrapFunctions();
-  xf86UnblockSIGIO(was_blocked);
+    xf86VGAarbiterWrapFunctions();
+    xf86UnblockSIGIO(was_blocked);
 
-  xf86InitOrigins();
+    xf86InitOrigins();
 
-  xf86Resetting = FALSE;
-  xf86Initialising = FALSE;
+    xf86Resetting = FALSE;
+    xf86Initialising = FALSE;
 
-  RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, xf86Wakeup,
-				 NULL);
+    RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr) NoopDDA, xf86Wakeup,
+                                   NULL);
 }
 
 /**
@@ -877,7 +895,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 void
 InitInput(int argc, char **argv)
 {
-    InputInfoPtr* pInfo;
+    InputInfoPtr *pInfo;
     DeviceIntPtr dev;
 
     xf86Info.vtRequestsPending = FALSE;
@@ -886,8 +904,10 @@ InitInput(int argc, char **argv)
 
     /* Initialize all configured input devices */
     for (pInfo = xf86ConfigLayout.inputs; pInfo && *pInfo; pInfo++) {
-        (*pInfo)->options = xf86AddNewOption((*pInfo)->options, "driver", (*pInfo)->driver);
-        (*pInfo)->options = xf86AddNewOption((*pInfo)->options, "identifier", (*pInfo)->name);
+        (*pInfo)->options =
+            xf86AddNewOption((*pInfo)->options, "driver", (*pInfo)->driver);
+        (*pInfo)->options =
+            xf86AddNewOption((*pInfo)->options, "identifier", (*pInfo)->name);
         /* If one fails, the others will too */
         if (NewInputDeviceRequest((*pInfo)->options, NULL, &dev) == BadAlloc)
             break;
@@ -897,7 +917,7 @@ InitInput(int argc, char **argv)
 }
 
 void
-CloseInput (void)
+CloseInput(void)
 {
     config_fini();
     mieqFini();
@@ -912,16 +932,16 @@ CloseInput (void)
 void
 OsVendorInit(void)
 {
-  static Bool beenHere = FALSE;
+    static Bool beenHere = FALSE;
 
-  signal(SIGCHLD, SIG_DFL);	/* Need to wait for child processes */
+    signal(SIGCHLD, SIG_DFL);   /* Need to wait for child processes */
 
-  if (!beenHere) {
-    umask(022);
-    xf86LogInit();
-  }
+    if (!beenHere) {
+        umask(022);
+        xf86LogInit();
+    }
 
-        /* Set stderr to non-blocking. */
+    /* Set stderr to non-blocking. */
 #ifndef O_NONBLOCK
 #if defined(FNDELAY)
 #define O_NONBLOCK FNDELAY
@@ -930,21 +950,20 @@ OsVendorInit(void)
 #endif
 
 #ifdef O_NONBLOCK
-  if (!beenHere) {
-    if (xf86PrivsElevated())
-    {
-      int status;
+    if (!beenHere) {
+        if (xf86PrivsElevated()) {
+            int status;
 
-      status = fcntl(fileno(stderr), F_GETFL, 0);
-      if (status != -1) {
-	fcntl(fileno(stderr), F_SETFL, status | O_NONBLOCK);
-      }
+            status = fcntl(fileno(stderr), F_GETFL, 0);
+            if (status != -1) {
+                fcntl(fileno(stderr), F_SETFL, status | O_NONBLOCK);
+            }
+        }
     }
-  }
 #endif
 #endif
 
-  beenHere = TRUE;
+    beenHere = TRUE;
 }
 
 /*
@@ -963,16 +982,16 @@ ddxGiveUp(enum ExitCode error)
 
 #ifdef XF86PM
     if (xf86OSPMClose)
-	xf86OSPMClose();
+        xf86OSPMClose();
     xf86OSPMClose = NULL;
 #endif
 
     for (i = 0; i < xf86NumScreens; i++) {
-	/*
-	 * zero all access functions to
-	 * trap calls when switched away.
-	 */
-	xf86Screens[i]->vtSema = FALSE;
+        /*
+         * zero all access functions to
+         * trap calls when switched away.
+         */
+        xf86Screens[i]->vtSema = FALSE;
     }
 
 #ifdef XFreeXDGA
@@ -980,17 +999,15 @@ ddxGiveUp(enum ExitCode error)
 #endif
 
     if (xorgHWOpenConsole)
-	xf86CloseConsole();
+        xf86CloseConsole();
 
     xf86CloseLog(error);
 
     /* If an unexpected signal was caught, dump a core for debugging */
     if (xf86Info.caughtSignal)
-	OsAbort();
+        OsAbort();
 }
 
-
-
 /*
  * AbortDDX --
  *      DDX - specific abort routine.  Called by AbortServer(). The attempt is
@@ -1001,38 +1018,38 @@ ddxGiveUp(enum ExitCode error)
 void
 AbortDDX(enum ExitCode error)
 {
-  int i;
+    int i;
 
-  xf86BlockSIGIO();
+    xf86BlockSIGIO();
 
-  /*
-   * try to restore the original video state
-   */
-#ifdef DPMSExtension /* Turn screens back on */
-  if (DPMSPowerLevel != DPMSModeOn)
-      DPMSSet(serverClient, DPMSModeOn);
+    /*
+     * try to restore the original video state
+     */
+#ifdef DPMSExtension            /* Turn screens back on */
+    if (DPMSPowerLevel != DPMSModeOn)
+        DPMSSet(serverClient, DPMSModeOn);
 #endif
-  if (xf86Screens) {
-      for (i = 0; i < xf86NumScreens; i++)
-	  if (xf86Screens[i]->vtSema) {
-	      /*
-	       * if we are aborting before ScreenInit() has finished
-	       * we might not have been wrapped yet. Therefore enable
-	       * screen explicitely.
-	       */
-	      xf86VGAarbiterLock(xf86Screens[i]);
-	      (xf86Screens[i]->LeaveVT)(i, 0);
-	      xf86VGAarbiterUnlock(xf86Screens[i]);
-	  }
-  }
-
-  xf86AccessLeave();
-
-  /*
-   * This is needed for an abnormal server exit, since the normal exit stuff
-   * MUST also be performed (i.e. the vt must be left in a defined state)
-   */
-  ddxGiveUp(error);
+    if (xf86Screens) {
+        for (i = 0; i < xf86NumScreens; i++)
+            if (xf86Screens[i]->vtSema) {
+                /*
+                 * if we are aborting before ScreenInit() has finished
+                 * we might not have been wrapped yet. Therefore enable
+                 * screen explicitely.
+                 */
+                xf86VGAarbiterLock(xf86Screens[i]);
+                (xf86Screens[i]->LeaveVT) (i, 0);
+                xf86VGAarbiterUnlock(xf86Screens[i]);
+            }
+    }
+
+    xf86AccessLeave();
+
+    /*
+     * This is needed for an abnormal server exit, since the normal exit stuff
+     * MUST also be performed (i.e. the vt must be left in a defined state)
+     */
+    ddxGiveUp(error);
 }
 
 void
@@ -1040,14 +1057,14 @@ OsVendorFatalError(void)
 {
 #ifdef VENDORSUPPORT
     ErrorF("\nPlease refer to your Operating System Vendor support pages\n"
-	   "at %s for support on this crash.\n",VENDORSUPPORT);
+           "at %s for support on this crash.\n", VENDORSUPPORT);
 #else
-    ErrorF("\nPlease consult the "XVENDORNAME" support \n"
-	   "\t at "__VENDORDWEBSUPPORT__"\n for help. \n");
+    ErrorF("\nPlease consult the " XVENDORNAME " support \n"
+           "\t at " __VENDORDWEBSUPPORT__ "\n for help. \n");
 #endif
     if (xf86LogFile && xf86LogFileWasOpened)
-	ErrorF("Please also check the log file at \"%s\" for additional "
-              "information.\n", xf86LogFile);
+        ErrorF("Please also check the log file at \"%s\" for additional "
+               "information.\n", xf86LogFile);
     ErrorF("\n");
 }
 
@@ -1074,13 +1091,13 @@ xf86SetLogVerbosity(int verb)
 static void
 xf86PrintDefaultModulePath(void)
 {
-  ErrorF("%s\n", DEFAULT_MODULE_PATH);
+    ErrorF("%s\n", DEFAULT_MODULE_PATH);
 }
 
 static void
 xf86PrintDefaultLibraryPath(void)
 {
-  ErrorF("%s\n", DEFAULT_LIBRARY_PATH);
+    ErrorF("%s\n", DEFAULT_LIBRARY_PATH);
 }
 
 /*
@@ -1102,325 +1119,289 @@ ddxProcessArgument(int argc, char **argv, int i)
       FatalError("Required argument to %s not specified\n", argv[i]);	\
     }
 
-  /* First the options that are not allowed with elevated privileges */
-  if (!strcmp(argv[i], "-modulepath") || !strcmp(argv[i], "-logfile")) {
-    if (xf86PrivsElevated()) {
-      FatalError("The '%s' option cannot be used with "
-                 "elevated privileges.\n", argv[i]);
-    }
-    else if (!strcmp(argv[i], "-modulepath"))
-    {
-      char *mp;
-      CHECK_FOR_REQUIRED_ARGUMENT();
-      mp = strdup(argv[i + 1]);
-      if (!mp)
-	FatalError("Can't allocate memory for ModulePath\n");
-      xf86ModulePath = mp;
-      xf86ModPathFrom = X_CMDLINE;
-      return 2;
+    /* First the options that are not allowed with elevated privileges */
+    if (!strcmp(argv[i], "-modulepath") || !strcmp(argv[i], "-logfile")) {
+        if (xf86PrivsElevated()) {
+            FatalError("The '%s' option cannot be used with "
+                       "elevated privileges.\n", argv[i]);
+        }
+        else if (!strcmp(argv[i], "-modulepath")) {
+            char *mp;
+
+            CHECK_FOR_REQUIRED_ARGUMENT();
+            mp = strdup(argv[i + 1]);
+            if (!mp)
+                FatalError("Can't allocate memory for ModulePath\n");
+            xf86ModulePath = mp;
+            xf86ModPathFrom = X_CMDLINE;
+            return 2;
+        }
+        else if (!strcmp(argv[i], "-logfile")) {
+            char *lf;
+
+            CHECK_FOR_REQUIRED_ARGUMENT();
+            lf = strdup(argv[i + 1]);
+            if (!lf)
+                FatalError("Can't allocate memory for LogFile\n");
+            xf86LogFile = lf;
+            xf86LogFileFrom = X_CMDLINE;
+            return 2;
+        }
     }
-    else if (!strcmp(argv[i], "-logfile"))
-    {
-      char *lf;
-      CHECK_FOR_REQUIRED_ARGUMENT();
-      lf = strdup(argv[i + 1]);
-      if (!lf)
-	FatalError("Can't allocate memory for LogFile\n");
-      xf86LogFile = lf;
-      xf86LogFileFrom = X_CMDLINE;
-      return 2;
+    if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) {
+        CHECK_FOR_REQUIRED_ARGUMENT();
+        if (xf86PrivsElevated() && !xf86PathIsSafe(argv[i + 1])) {
+            FatalError("\nInvalid argument for %s\n"
+                       "\tWith elevated privileges, the file specified with %s must be\n"
+                       "\ta relative path and must not contain any \"..\" elements.\n"
+                       "\tUsing default " __XCONFIGFILE__ " search path.\n\n",
+                       argv[i], argv[i]);
+        }
+        xf86ConfigFile = argv[i + 1];
+        return 2;
     }
-  }
-  if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config"))
-  {
-    CHECK_FOR_REQUIRED_ARGUMENT();
-    if (xf86PrivsElevated() && !xf86PathIsSafe(argv[i + 1])) {
-      FatalError("\nInvalid argument for %s\n"
-	  "\tWith elevated privileges, the file specified with %s must be\n"
-	  "\ta relative path and must not contain any \"..\" elements.\n"
-	  "\tUsing default "__XCONFIGFILE__" search path.\n\n",
-	  argv[i], argv[i]);
+    if (!strcmp(argv[i], "-configdir")) {
+        CHECK_FOR_REQUIRED_ARGUMENT();
+        if (xf86PrivsElevated() && !xf86PathIsSafe(argv[i + 1])) {
+            FatalError("\nInvalid argument for %s\n"
+                       "\tWith elevated privileges, the file specified with %s must be\n"
+                       "\ta relative path and must not contain any \"..\" elements.\n"
+                       "\tUsing default " __XCONFIGDIR__ " search path.\n\n",
+                       argv[i], argv[i]);
+        }
+        xf86ConfigDir = argv[i + 1];
+        return 2;
     }
-    xf86ConfigFile = argv[i + 1];
-    return 2;
-  }
-  if (!strcmp(argv[i], "-configdir"))
-  {
-    CHECK_FOR_REQUIRED_ARGUMENT();
-    if (xf86PrivsElevated() && !xf86PathIsSafe(argv[i + 1])) {
-      FatalError("\nInvalid argument for %s\n"
-	  "\tWith elevated privileges, the file specified with %s must be\n"
-	  "\ta relative path and must not contain any \"..\" elements.\n"
-	  "\tUsing default "__XCONFIGDIR__" search path.\n\n",
-	  argv[i], argv[i]);
+    if (!strcmp(argv[i], "-flipPixels")) {
+        xf86FlipPixels = TRUE;
+        return 1;
     }
-    xf86ConfigDir = argv[i + 1];
-    return 2;
-  }
-  if (!strcmp(argv[i],"-flipPixels"))
-  {
-    xf86FlipPixels = TRUE;
-    return 1;
-  }
 #ifdef XF86VIDMODE
-  if (!strcmp(argv[i],"-disableVidMode"))
-  {
-    xf86VidModeDisabled = TRUE;
-    return 1;
-  }
-  if (!strcmp(argv[i],"-allowNonLocalXvidtune"))
-  {
-    xf86VidModeAllowNonLocal = TRUE;
-    return 1;
-  }
+    if (!strcmp(argv[i], "-disableVidMode")) {
+        xf86VidModeDisabled = TRUE;
+        return 1;
+    }
+    if (!strcmp(argv[i], "-allowNonLocalXvidtune")) {
+        xf86VidModeAllowNonLocal = TRUE;
+        return 1;
+    }
 #endif
-  if (!strcmp(argv[i],"-allowMouseOpenFail"))
-  {
-    xf86AllowMouseOpenFail = TRUE;
-    return 1;
-  }
-  if (!strcmp(argv[i],"-ignoreABI"))
-  {
-    LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
-    return 1;
-  }
-  if (!strcmp(argv[i],"-verbose"))
-  {
-    if (++i < argc && argv[i])
-    {
-      char *end;
-      long val;
-      val = strtol(argv[i], &end, 0);
-      if (*end == '\0')
-      {
-	xf86SetVerbosity(val);
-	return 2;
-      }
+    if (!strcmp(argv[i], "-allowMouseOpenFail")) {
+        xf86AllowMouseOpenFail = TRUE;
+        return 1;
     }
-    xf86SetVerbosity(++xf86Verbose);
-    return 1;
-  }
-  if (!strcmp(argv[i],"-logverbose"))
-  {
-    if (++i < argc && argv[i])
-    {
-      char *end;
-      long val;
-      val = strtol(argv[i], &end, 0);
-      if (*end == '\0')
-      {
-	xf86SetLogVerbosity(val);
-	return 2;
-      }
+    if (!strcmp(argv[i], "-ignoreABI")) {
+        LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
+        return 1;
     }
-    xf86SetLogVerbosity(++xf86LogVerbose);
-    return 1;
-  }
-  if (!strcmp(argv[i],"-quiet"))
-  {
-    xf86SetVerbosity(-1);
-    return 1;
-  }
-  if (!strcmp(argv[i],"-showconfig") || !strcmp(argv[i],"-version"))
-  {
-    xf86PrintBanner();
-    exit(0);
-  }
-  if (!strcmp(argv[i],"-showDefaultModulePath"))
-  {
-    xf86PrintDefaultModulePath();
-    exit(0);
-  }
-  if (!strcmp(argv[i],"-showDefaultLibPath"))
-  {
-    xf86PrintDefaultLibraryPath();
-    exit(0);
-  }
-  /* Notice the -fp flag, but allow it to pass to the dix layer */
-  if (!strcmp(argv[i], "-fp"))
-  {
-    xf86fpFlag = TRUE;
-    return 0;
-  }
-  /* Notice the -bs flag, but allow it to pass to the dix layer */
-  if (!strcmp(argv[i], "-bs"))
-  {
-    xf86bsDisableFlag = TRUE;
-    return 0;
-  }
-  /* Notice the +bs flag, but allow it to pass to the dix layer */
-  if (!strcmp(argv[i], "+bs"))
-  {
-    xf86bsEnableFlag = TRUE;
-    return 0;
-  }
-  /* Notice the -s flag, but allow it to pass to the dix layer */
-  if (!strcmp(argv[i], "-s"))
-  {
-    xf86sFlag = TRUE;
-    return 0;
-  }
-  if (!strcmp(argv[i], "-pixmap24"))
-  {
-    xf86Pix24 = Pix24Use24;
-    return 1;
-  }
-  if (!strcmp(argv[i], "-pixmap32"))
-  {
-    xf86Pix24 = Pix24Use32;
-    return 1;
-  }
-  if (!strcmp(argv[i], "-fbbpp"))
-  {
-    int bpp;
-    CHECK_FOR_REQUIRED_ARGUMENT();
-    if (sscanf(argv[++i], "%d", &bpp) == 1)
-    {
-      xf86FbBpp = bpp;
-      return 2;
+    if (!strcmp(argv[i], "-verbose")) {
+        if (++i < argc && argv[i]) {
+            char *end;
+            long val;
+
+            val = strtol(argv[i], &end, 0);
+            if (*end == '\0') {
+                xf86SetVerbosity(val);
+                return 2;
+            }
+        }
+        xf86SetVerbosity(++xf86Verbose);
+        return 1;
     }
-    else
-    {
-      ErrorF("Invalid fbbpp\n");
-      return 0;
+    if (!strcmp(argv[i], "-logverbose")) {
+        if (++i < argc && argv[i]) {
+            char *end;
+            long val;
+
+            val = strtol(argv[i], &end, 0);
+            if (*end == '\0') {
+                xf86SetLogVerbosity(val);
+                return 2;
+            }
+        }
+        xf86SetLogVerbosity(++xf86LogVerbose);
+        return 1;
     }
-  }
-  if (!strcmp(argv[i], "-depth"))
-  {
-    int depth;
-    CHECK_FOR_REQUIRED_ARGUMENT();
-    if (sscanf(argv[++i], "%d", &depth) == 1)
-    {
-      xf86Depth = depth;
-      return 2;
+    if (!strcmp(argv[i], "-quiet")) {
+        xf86SetVerbosity(-1);
+        return 1;
     }
-    else
-    {
-      ErrorF("Invalid depth\n");
-      return 0;
+    if (!strcmp(argv[i], "-showconfig") || !strcmp(argv[i], "-version")) {
+        xf86PrintBanner();
+        exit(0);
     }
-  }
-  if (!strcmp(argv[i], "-weight"))
-  {
-    int red, green, blue;
-    CHECK_FOR_REQUIRED_ARGUMENT();
-    if (sscanf(argv[++i], "%1d%1d%1d", &red, &green, &blue) == 3)
-    {
-      xf86Weight.red = red;
-      xf86Weight.green = green;
-      xf86Weight.blue = blue;
-      return 2;
+    if (!strcmp(argv[i], "-showDefaultModulePath")) {
+        xf86PrintDefaultModulePath();
+        exit(0);
     }
-    else
-    {
-      ErrorF("Invalid weighting\n");
-      return 0;
+    if (!strcmp(argv[i], "-showDefaultLibPath")) {
+        xf86PrintDefaultLibraryPath();
+        exit(0);
+    }
+    /* Notice the -fp flag, but allow it to pass to the dix layer */
+    if (!strcmp(argv[i], "-fp")) {
+        xf86fpFlag = TRUE;
+        return 0;
+    }
+    /* Notice the -bs flag, but allow it to pass to the dix layer */
+    if (!strcmp(argv[i], "-bs")) {
+        xf86bsDisableFlag = TRUE;
+        return 0;
+    }
+    /* Notice the +bs flag, but allow it to pass to the dix layer */
+    if (!strcmp(argv[i], "+bs")) {
+        xf86bsEnableFlag = TRUE;
+        return 0;
     }
-  }
-  if (!strcmp(argv[i], "-gamma")  || !strcmp(argv[i], "-rgamma") ||
-      !strcmp(argv[i], "-ggamma") || !strcmp(argv[i], "-bgamma"))
-  {
-    double gamma;
-    CHECK_FOR_REQUIRED_ARGUMENT();
-    if (sscanf(argv[++i], "%lf", &gamma) == 1) {
-       if (gamma < GAMMA_MIN || gamma > GAMMA_MAX) {
-	  ErrorF("gamma out of range, only  %.2f <= gamma_value <= %.1f"
-		 " is valid\n", GAMMA_MIN, GAMMA_MAX);
-	  return 0;
-       }
-       if (!strcmp(argv[i-1], "-gamma"))
-	  xf86Gamma.red = xf86Gamma.green = xf86Gamma.blue = gamma;
-       else if (!strcmp(argv[i-1], "-rgamma")) xf86Gamma.red = gamma;
-       else if (!strcmp(argv[i-1], "-ggamma")) xf86Gamma.green = gamma;
-       else if (!strcmp(argv[i-1], "-bgamma")) xf86Gamma.blue = gamma;
-       return 2;
+    /* Notice the -s flag, but allow it to pass to the dix layer */
+    if (!strcmp(argv[i], "-s")) {
+        xf86sFlag = TRUE;
+        return 0;
+    }
+    if (!strcmp(argv[i], "-pixmap24")) {
+        xf86Pix24 = Pix24Use24;
+        return 1;
+    }
+    if (!strcmp(argv[i], "-pixmap32")) {
+        xf86Pix24 = Pix24Use32;
+        return 1;
+    }
+    if (!strcmp(argv[i], "-fbbpp")) {
+        int bpp;
+
+        CHECK_FOR_REQUIRED_ARGUMENT();
+        if (sscanf(argv[++i], "%d", &bpp) == 1) {
+            xf86FbBpp = bpp;
+            return 2;
+        }
+        else {
+            ErrorF("Invalid fbbpp\n");
+            return 0;
+        }
+    }
+    if (!strcmp(argv[i], "-depth")) {
+        int depth;
+
+        CHECK_FOR_REQUIRED_ARGUMENT();
+        if (sscanf(argv[++i], "%d", &depth) == 1) {
+            xf86Depth = depth;
+            return 2;
+        }
+        else {
+            ErrorF("Invalid depth\n");
+            return 0;
+        }
+    }
+    if (!strcmp(argv[i], "-weight")) {
+        int red, green, blue;
+
+        CHECK_FOR_REQUIRED_ARGUMENT();
+        if (sscanf(argv[++i], "%1d%1d%1d", &red, &green, &blue) == 3) {
+            xf86Weight.red = red;
+            xf86Weight.green = green;
+            xf86Weight.blue = blue;
+            return 2;
+        }
+        else {
+            ErrorF("Invalid weighting\n");
+            return 0;
+        }
+    }
+    if (!strcmp(argv[i], "-gamma") || !strcmp(argv[i], "-rgamma") ||
+        !strcmp(argv[i], "-ggamma") || !strcmp(argv[i], "-bgamma")) {
+        double gamma;
+
+        CHECK_FOR_REQUIRED_ARGUMENT();
+        if (sscanf(argv[++i], "%lf", &gamma) == 1) {
+            if (gamma < GAMMA_MIN || gamma > GAMMA_MAX) {
+                ErrorF("gamma out of range, only  %.2f <= gamma_value <= %.1f"
+                       " is valid\n", GAMMA_MIN, GAMMA_MAX);
+                return 0;
+            }
+            if (!strcmp(argv[i - 1], "-gamma"))
+                xf86Gamma.red = xf86Gamma.green = xf86Gamma.blue = gamma;
+            else if (!strcmp(argv[i - 1], "-rgamma"))
+                xf86Gamma.red = gamma;
+            else if (!strcmp(argv[i - 1], "-ggamma"))
+                xf86Gamma.green = gamma;
+            else if (!strcmp(argv[i - 1], "-bgamma"))
+                xf86Gamma.blue = gamma;
+            return 2;
+        }
+    }
+    if (!strcmp(argv[i], "-layout")) {
+        CHECK_FOR_REQUIRED_ARGUMENT();
+        xf86LayoutName = argv[++i];
+        return 2;
+    }
+    if (!strcmp(argv[i], "-screen")) {
+        CHECK_FOR_REQUIRED_ARGUMENT();
+        xf86ScreenName = argv[++i];
+        return 2;
+    }
+    if (!strcmp(argv[i], "-pointer")) {
+        CHECK_FOR_REQUIRED_ARGUMENT();
+        xf86PointerName = argv[++i];
+        return 2;
+    }
+    if (!strcmp(argv[i], "-keyboard")) {
+        CHECK_FOR_REQUIRED_ARGUMENT();
+        xf86KeyboardName = argv[++i];
+        return 2;
+    }
+    if (!strcmp(argv[i], "-nosilk")) {
+        xf86silkenMouseDisableFlag = TRUE;
+        return 1;
     }
-  }
-  if (!strcmp(argv[i], "-layout"))
-  {
-    CHECK_FOR_REQUIRED_ARGUMENT();
-    xf86LayoutName = argv[++i];
-    return 2;
-  }
-  if (!strcmp(argv[i], "-screen"))
-  {
-    CHECK_FOR_REQUIRED_ARGUMENT();
-    xf86ScreenName = argv[++i];
-    return 2;
-  }
-  if (!strcmp(argv[i], "-pointer"))
-  {
-    CHECK_FOR_REQUIRED_ARGUMENT();
-    xf86PointerName = argv[++i];
-    return 2;
-  }
-  if (!strcmp(argv[i], "-keyboard"))
-  {
-    CHECK_FOR_REQUIRED_ARGUMENT();
-    xf86KeyboardName = argv[++i];
-    return 2;
-  }
-  if (!strcmp(argv[i], "-nosilk"))
-  {
-    xf86silkenMouseDisableFlag = TRUE;
-    return 1;
-  }
 #ifdef HAVE_ACPI
-  if (!strcmp(argv[i], "-noacpi"))
-  {
-    xf86acpiDisableFlag = TRUE;
-    return 1;
-  }
+    if (!strcmp(argv[i], "-noacpi")) {
+        xf86acpiDisableFlag = TRUE;
+        return 1;
+    }
 #endif
-  if (!strcmp(argv[i], "-configure"))
-  {
-    if (getuid() != 0 && geteuid() == 0) {
-	ErrorF("The '-configure' option can only be used by root.\n");
-	exit(1);
+    if (!strcmp(argv[i], "-configure")) {
+        if (getuid() != 0 && geteuid() == 0) {
+            ErrorF("The '-configure' option can only be used by root.\n");
+            exit(1);
+        }
+        xf86DoConfigure = TRUE;
+        xf86AllowMouseOpenFail = TRUE;
+        return 1;
     }
-    xf86DoConfigure = TRUE;
-    xf86AllowMouseOpenFail = TRUE;
-    return 1;
-  }
-  if (!strcmp(argv[i], "-showopts"))
-  {
-    if (getuid() != 0 && geteuid() == 0) {
-    ErrorF("The '-showopts' option can only be used by root.\n");
-    exit(1);
+    if (!strcmp(argv[i], "-showopts")) {
+        if (getuid() != 0 && geteuid() == 0) {
+            ErrorF("The '-showopts' option can only be used by root.\n");
+            exit(1);
+        }
+        xf86DoShowOptions = TRUE;
+        return 1;
     }
-    xf86DoShowOptions = TRUE;
-    return 1;
-  }
 #ifdef XSERVER_LIBPCIACCESS
-  if (!strcmp(argv[i], "-isolateDevice"))
-  {
-    CHECK_FOR_REQUIRED_ARGUMENT();
-    if (strncmp(argv[++i], "PCI:", 4)) {
-       FatalError("Bus types other than PCI not yet isolable\n");
+    if (!strcmp(argv[i], "-isolateDevice")) {
+        CHECK_FOR_REQUIRED_ARGUMENT();
+        if (strncmp(argv[++i], "PCI:", 4)) {
+            FatalError("Bus types other than PCI not yet isolable\n");
+        }
+        xf86PciIsolateDevice(argv[i]);
+        return 2;
     }
-    xf86PciIsolateDevice(argv[i]);
-    return 2;
-  }
 #endif
-  /* Notice cmdline xkbdir, but pass to dix as well */
-  if (!strcmp(argv[i], "-xkbdir"))
-  {
-    xf86xkbdirFlag = TRUE;
-    return 0;
-  }
-  if (!strcmp(argv[i], "-novtswitch"))
-  {
-    xf86Info.autoVTSwitch = FALSE;
-    return 1;
-  }
-  if (!strcmp(argv[i], "-sharevts"))
-  {
-    xf86Info.ShareVTs = TRUE;
-    return 1;
-  }
-
-  /* OS-specific processing */
-  return xf86ProcessArgument(argc, argv, i);
+    /* Notice cmdline xkbdir, but pass to dix as well */
+    if (!strcmp(argv[i], "-xkbdir")) {
+        xf86xkbdirFlag = TRUE;
+        return 0;
+    }
+    if (!strcmp(argv[i], "-novtswitch")) {
+        xf86Info.autoVTSwitch = FALSE;
+        return 1;
+    }
+    if (!strcmp(argv[i], "-sharevts")) {
+        xf86Info.ShareVTs = TRUE;
+        return 1;
+    }
+
+    /* OS-specific processing */
+    return xf86ProcessArgument(argc, argv, i);
 }
 
 /*
@@ -1432,58 +1413,70 @@ ddxProcessArgument(int argc, char **argv, int i)
 void
 ddxUseMsg(void)
 {
-  ErrorF("\n");
-  ErrorF("\n");
-  ErrorF("Device Dependent Usage\n");
-  if (!xf86PrivsElevated())
-  {
-    ErrorF("-modulepath paths      specify the module search path\n");
-    ErrorF("-logfile file          specify a log file name\n");
-    ErrorF("-configure             probe for devices and write an "__XCONFIGFILE__"\n");
-    ErrorF("-showopts              print available options for all installed drivers\n");
-  }
-  ErrorF("-config file           specify a configuration file, relative to the\n");
-  ErrorF("                       "__XCONFIGFILE__" search path, only root can use absolute\n");
-  ErrorF("-configdir dir         specify a configuration directory, relative to the\n");
-  ErrorF("                       "__XCONFIGDIR__" search path, only root can use absolute\n");
-  ErrorF("-verbose [n]           verbose startup messages\n");
-  ErrorF("-logverbose [n]        verbose log messages\n");
-  ErrorF("-quiet                 minimal startup messages\n");
-  ErrorF("-pixmap24              use 24bpp pixmaps for depth 24\n");
-  ErrorF("-pixmap32              use 32bpp pixmaps for depth 24\n");
-  ErrorF("-fbbpp n               set bpp for the framebuffer. Default: 8\n");
-  ErrorF("-depth n               set colour depth. Default: 8\n");
-  ErrorF("-gamma f               set gamma value (0.1 < f < 10.0) Default: 1.0\n");
-  ErrorF("-rgamma f              set gamma value for red phase\n");
-  ErrorF("-ggamma f              set gamma value for green phase\n");
-  ErrorF("-bgamma f              set gamma value for blue phase\n");
-  ErrorF("-weight nnn            set RGB weighting at 16 bpp.  Default: 565\n");
-  ErrorF("-layout name           specify the ServerLayout section name\n");
-  ErrorF("-screen name           specify the Screen section name\n");
-  ErrorF("-keyboard name         specify the core keyboard InputDevice name\n");
-  ErrorF("-pointer name          specify the core pointer InputDevice name\n");
-  ErrorF("-nosilk                disable Silken Mouse\n");
-  ErrorF("-flipPixels            swap default black/white Pixel values\n");
+    ErrorF("\n");
+    ErrorF("\n");
+    ErrorF("Device Dependent Usage\n");
+    if (!xf86PrivsElevated()) {
+        ErrorF("-modulepath paths      specify the module search path\n");
+        ErrorF("-logfile file          specify a log file name\n");
+        ErrorF("-configure             probe for devices and write an "
+               __XCONFIGFILE__ "\n");
+        ErrorF
+            ("-showopts              print available options for all installed drivers\n");
+    }
+    ErrorF
+        ("-config file           specify a configuration file, relative to the\n");
+    ErrorF("                       " __XCONFIGFILE__
+           " search path, only root can use absolute\n");
+    ErrorF
+        ("-configdir dir         specify a configuration directory, relative to the\n");
+    ErrorF("                       " __XCONFIGDIR__
+           " search path, only root can use absolute\n");
+    ErrorF("-verbose [n]           verbose startup messages\n");
+    ErrorF("-logverbose [n]        verbose log messages\n");
+    ErrorF("-quiet                 minimal startup messages\n");
+    ErrorF("-pixmap24              use 24bpp pixmaps for depth 24\n");
+    ErrorF("-pixmap32              use 32bpp pixmaps for depth 24\n");
+    ErrorF("-fbbpp n               set bpp for the framebuffer. Default: 8\n");
+    ErrorF("-depth n               set colour depth. Default: 8\n");
+    ErrorF
+        ("-gamma f               set gamma value (0.1 < f < 10.0) Default: 1.0\n");
+    ErrorF("-rgamma f              set gamma value for red phase\n");
+    ErrorF("-ggamma f              set gamma value for green phase\n");
+    ErrorF("-bgamma f              set gamma value for blue phase\n");
+    ErrorF
+        ("-weight nnn            set RGB weighting at 16 bpp.  Default: 565\n");
+    ErrorF("-layout name           specify the ServerLayout section name\n");
+    ErrorF("-screen name           specify the Screen section name\n");
+    ErrorF
+        ("-keyboard name         specify the core keyboard InputDevice name\n");
+    ErrorF
+        ("-pointer name          specify the core pointer InputDevice name\n");
+    ErrorF("-nosilk                disable Silken Mouse\n");
+    ErrorF("-flipPixels            swap default black/white Pixel values\n");
 #ifdef XF86VIDMODE
-  ErrorF("-disableVidMode        disable mode adjustments with xvidtune\n");
-  ErrorF("-allowNonLocalXvidtune allow xvidtune to be run as a non-local client\n");
+    ErrorF("-disableVidMode        disable mode adjustments with xvidtune\n");
+    ErrorF
+        ("-allowNonLocalXvidtune allow xvidtune to be run as a non-local client\n");
 #endif
-  ErrorF("-allowMouseOpenFail    start server even if the mouse can't be initialized\n");
-  ErrorF("-ignoreABI             make module ABI mismatches non-fatal\n");
+    ErrorF
+        ("-allowMouseOpenFail    start server even if the mouse can't be initialized\n");
+    ErrorF("-ignoreABI             make module ABI mismatches non-fatal\n");
 #ifdef XSERVER_LIBPCIACCESS
-  ErrorF("-isolateDevice bus_id  restrict device resets to bus_id (PCI only)\n");
+    ErrorF
+        ("-isolateDevice bus_id  restrict device resets to bus_id (PCI only)\n");
 #endif
-  ErrorF("-version               show the server version\n");
-  ErrorF("-showDefaultModulePath show the server default module path\n");
-  ErrorF("-showDefaultLibPath    show the server default library path\n");
-  ErrorF("-novtswitch            don't automatically switch VT at reset & exit\n");
-  ErrorF("-sharevts              share VTs with another X server\n");
-  /* OS-specific usage */
-  xf86UseMsg();
-  ErrorF("\n");
+    ErrorF("-version               show the server version\n");
+    ErrorF("-showDefaultModulePath show the server default module path\n");
+    ErrorF("-showDefaultLibPath    show the server default library path\n");
+    ErrorF
+        ("-novtswitch            don't automatically switch VT at reset & exit\n");
+    ErrorF("-sharevts              share VTs with another X server\n");
+    /* OS-specific usage */
+    xf86UseMsg();
+    ErrorF("\n");
 }
 
-
 /*
  * xf86LoadModules iterates over a list that is being passed in.
  */
@@ -1497,34 +1490,34 @@ xf86LoadModules(char **list, pointer *optlist)
     Bool failed = FALSE;
 
     if (!list)
-	return TRUE;
+        return TRUE;
 
     for (i = 0; list[i] != NULL; i++) {
 
-	/* Normalise the module name */
-	name = xf86NormalizeName(list[i]);
+        /* Normalise the module name */
+        name = xf86NormalizeName(list[i]);
 
-	/* Skip empty names */
-	if (name == NULL || *name == '\0') {
-	    free(name);
-	    continue;
-	}
+        /* Skip empty names */
+        if (name == NULL || *name == '\0') {
+            free(name);
+            continue;
+        }
 
-	/* Replace obsolete keyboard driver with kbd */
-	if (!xf86NameCmp(name, "keyboard")) {
-	    strcpy(name, "kbd");
-	}
+        /* Replace obsolete keyboard driver with kbd */
+        if (!xf86NameCmp(name, "keyboard")) {
+            strcpy(name, "kbd");
+        }
 
-	if (optlist)
-	    opt = optlist[i];
-	else
-	    opt = NULL;
+        if (optlist)
+            opt = optlist[i];
+        else
+            opt = NULL;
 
         if (!LoadModule(name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin)) {
-	    LoaderErrorMsg(NULL, name, errmaj, errmin);
-	    failed = TRUE;
-	}
-	free(name);
+            LoaderErrorMsg(NULL, name, errmaj, errmin);
+            failed = TRUE;
+        }
+        free(name);
     }
     return !failed;
 }
@@ -1535,7 +1528,7 @@ PixmapFormatPtr
 xf86GetPixFormat(ScrnInfoPtr pScrn, int depth)
 {
     int i;
-    static PixmapFormatRec format;	/* XXX not reentrant */
+    static PixmapFormatRec format;      /* XXX not reentrant */
 
     /*
      * When the formats[] list initialisation isn't complete, check the
@@ -1543,35 +1536,35 @@ xf86GetPixFormat(ScrnInfoPtr pScrn, int depth)
      */
 
     if (!formatsDone) {
-	if (depth == 24) {
-	    Pix24Flags pix24 = Pix24DontCare;
-
-	    format.depth = 24;
-	    format.scanlinePad = BITMAP_SCANLINE_PAD;
-	    if (xf86Info.pixmap24 != Pix24DontCare)
-		pix24 = xf86Info.pixmap24;
-	    else if (pScrn->pixmap24 != Pix24DontCare)
-		pix24 = pScrn->pixmap24;
-	    if (pix24 == Pix24Use24)
-		format.bitsPerPixel = 24;
-	    else
-		format.bitsPerPixel = 32;
-	    return &format;
-	}
+        if (depth == 24) {
+            Pix24Flags pix24 = Pix24DontCare;
+
+            format.depth = 24;
+            format.scanlinePad = BITMAP_SCANLINE_PAD;
+            if (xf86Info.pixmap24 != Pix24DontCare)
+                pix24 = xf86Info.pixmap24;
+            else if (pScrn->pixmap24 != Pix24DontCare)
+                pix24 = pScrn->pixmap24;
+            if (pix24 == Pix24Use24)
+                format.bitsPerPixel = 24;
+            else
+                format.bitsPerPixel = 32;
+            return &format;
+        }
     }
 
     for (i = 0; i < numFormats; i++)
-	if (formats[i].depth == depth)
-	   break;
+        if (formats[i].depth == depth)
+            break;
     if (i != numFormats)
-	return &formats[i];
+        return &formats[i];
     else if (!formatsDone) {
-	/* Check for screen-specified formats */
-	for (i = 0; i < pScrn->numFormats; i++)
-	    if (pScrn->formats[i].depth == depth)
-		break;
-	if (i != pScrn->numFormats)
-	    return &pScrn->formats[i];
+        /* Check for screen-specified formats */
+        for (i = 0; i < pScrn->numFormats; i++)
+            if (pScrn->formats[i].depth == depth)
+                break;
+        if (i != pScrn->numFormats)
+            return &pScrn->formats[i];
     }
     return NULL;
 }
@@ -1581,10 +1574,9 @@ xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth)
 {
     PixmapFormatPtr format;
 
-
     format = xf86GetPixFormat(pScrn, depth);
     if (format)
-	return format->bitsPerPixel;
+        return format->bitsPerPixel;
     else
-	return 0;
+        return 0;
 }
diff --git a/xorg-server/hw/xfree86/common/xf86Mode.c b/xorg-server/hw/xfree86/common/xf86Mode.c
index d202d4079..ab4d595c7 100644
--- a/xorg-server/hw/xfree86/common/xf86Mode.c
+++ b/xorg-server/hw/xfree86/common/xf86Mode.c
@@ -99,16 +99,16 @@ printModeRejectMessage(int index, DisplayModePtr p, int status)
     const char *type;
 
     if (p->type & M_T_BUILTIN)
-	type = "built-in ";
+        type = "built-in ";
     else if (p->type & M_T_DEFAULT)
-	type = "default ";
+        type = "default ";
     else if (p->type & M_T_DRIVER)
-	type = "driver ";
+        type = "driver ";
     else
-	type = "";
+        type = "";
 
     xf86DrvMsg(index, X_INFO, "Not using %smode \"%s\" (%s)\n", type, p->name,
-	       xf86ModeStatusToString(status));
+               xf86ModeStatusToString(status));
 }
 
 /*
@@ -118,33 +118,32 @@ printModeRejectMessage(int index, DisplayModePtr p, int status)
  */
 int
 xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2,
-    int DivFactor, int MulFactor, int *divider)
+                    int DivFactor, int MulFactor, int *divider)
 {
     int nearestClock = 0, nearestDiv = 1;
     int minimumGap = abs(freq - scrp->clock[0]);
     int i, j, k, gap;
 
     if (allowDiv2)
-	k = 2;
+        k = 2;
     else
-	k = 1;
+        k = 1;
 
     /* Must set this here in case the best match is scrp->clock[0] */
     if (divider != NULL)
-	*divider = 0;
-    
-    for (i = 0;  i < scrp->numClocks;  i++) {
-	for (j = 1; j <= k; j++) {
-	    gap = abs((freq * j) - ((scrp->clock[i] * DivFactor) / MulFactor));
-	    if ((gap < minimumGap) ||
-		((gap == minimumGap) && (j < nearestDiv))) {
-		minimumGap = gap;
-		nearestClock = i;
-		nearestDiv = j;
-		if (divider != NULL)
-		    *divider = (j - 1) * V_CLKDIV2;
-	    }
-	}
+        *divider = 0;
+
+    for (i = 0; i < scrp->numClocks; i++) {
+        for (j = 1; j <= k; j++) {
+            gap = abs((freq * j) - ((scrp->clock[i] * DivFactor) / MulFactor));
+            if ((gap < minimumGap) || ((gap == minimumGap) && (j < nearestDiv))) {
+                minimumGap = gap;
+                nearestClock = i;
+                nearestDiv = j;
+                if (divider != NULL)
+                    *divider = (j - 1) * V_CLKDIV2;
+            }
+        }
     }
     return nearestClock;
 }
@@ -160,67 +159,67 @@ xf86ModeStatusToString(ModeStatus status)
 {
     switch (status) {
     case MODE_OK:
-	return "Mode OK";
+        return "Mode OK";
     case MODE_HSYNC:
-	return "hsync out of range";
+        return "hsync out of range";
     case MODE_VSYNC:
-	return "vrefresh out of range";
+        return "vrefresh out of range";
     case MODE_H_ILLEGAL:
-	return "illegal horizontal timings";
+        return "illegal horizontal timings";
     case MODE_V_ILLEGAL:
-	return "illegal vertical timings";
+        return "illegal vertical timings";
     case MODE_BAD_WIDTH:
-	return "width requires unsupported line pitch";
+        return "width requires unsupported line pitch";
     case MODE_NOMODE:
-	return "no mode of this name";
+        return "no mode of this name";
     case MODE_NO_INTERLACE:
-	return "interlace mode not supported";
+        return "interlace mode not supported";
     case MODE_NO_DBLESCAN:
-	return "doublescan mode not supported";
+        return "doublescan mode not supported";
     case MODE_NO_VSCAN:
-	return "multiscan mode not supported";
+        return "multiscan mode not supported";
     case MODE_MEM:
-	return "insufficient memory for mode";
+        return "insufficient memory for mode";
     case MODE_VIRTUAL_X:
-	return "width too large for virtual size";
+        return "width too large for virtual size";
     case MODE_VIRTUAL_Y:
-	return "height too large for virtual size";
+        return "height too large for virtual size";
     case MODE_MEM_VIRT:
-	return "insufficient memory given virtual size";
+        return "insufficient memory given virtual size";
     case MODE_NOCLOCK:
-	return "no clock available for mode";
+        return "no clock available for mode";
     case MODE_CLOCK_HIGH:
-	return "mode clock too high";
+        return "mode clock too high";
     case MODE_CLOCK_LOW:
-	return "mode clock too low";
+        return "mode clock too low";
     case MODE_CLOCK_RANGE:
-	return "bad mode clock/interlace/doublescan";
+        return "bad mode clock/interlace/doublescan";
     case MODE_BAD_HVALUE:
-	return "horizontal timing out of range";
+        return "horizontal timing out of range";
     case MODE_BAD_VVALUE:
-	return "vertical timing out of range";
+        return "vertical timing out of range";
     case MODE_BAD_VSCAN:
-	return "VScan value out of range";
+        return "VScan value out of range";
     case MODE_HSYNC_NARROW:
-	return "horizontal sync too narrow";
+        return "horizontal sync too narrow";
     case MODE_HSYNC_WIDE:
-	return "horizontal sync too wide";
+        return "horizontal sync too wide";
     case MODE_HBLANK_NARROW:
-	return "horizontal blanking too narrow";
+        return "horizontal blanking too narrow";
     case MODE_HBLANK_WIDE:
-	return "horizontal blanking too wide";
+        return "horizontal blanking too wide";
     case MODE_VSYNC_NARROW:
-	return "vertical sync too narrow";
+        return "vertical sync too narrow";
     case MODE_VSYNC_WIDE:
-	return "vertical sync too wide";
+        return "vertical sync too wide";
     case MODE_VBLANK_NARROW:
-	return "vertical blanking too narrow";
+        return "vertical blanking too narrow";
     case MODE_VBLANK_WIDE:
-	return "vertical blanking too wide";
+        return "vertical blanking too wide";
     case MODE_PANEL:
-	return "exceeds panel dimensions";
+        return "exceeds panel dimensions";
     case MODE_INTERLACE_WIDTH:
-	return "width too large for interlaced mode";
+        return "width too large for interlaced mode";
     case MODE_ONE_WIDTH:
         return "all modes must have the same width";
     case MODE_ONE_HEIGHT:
@@ -230,13 +229,13 @@ xf86ModeStatusToString(ModeStatus status)
     case MODE_NO_REDUCED:
         return "monitor doesn't support reduced blanking";
     case MODE_BANDWIDTH:
-	return "mode requires too much memory bandwidth";
+        return "mode requires too much memory bandwidth";
     case MODE_BAD:
-	return "unknown reason";
+        return "unknown reason";
     case MODE_ERROR:
-	return "internal error";
+        return "internal error";
     default:
-	return "unknown";
+        return "unknown";
     }
 }
 
@@ -254,43 +253,46 @@ xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges)
     int scaledClock;
 
     for (cp = clockRanges; cp != NULL; cp = cp->next) {
-	DivFactor = max(1, cp->ClockDivFactor);
-	MulFactor = max(1, cp->ClockMulFactor);
-	if (scrp->progClock) {
-	    if (cp->minClock) {
-		if (cp->maxClock) {
-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
-			"Clock range: %6.2f to %6.2f MHz\n",
-			(double)cp->minClock / 1000.0,
-			(double)cp->maxClock / 1000.0);
-		} else {
-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
-			"Minimum clock: %6.2f MHz\n",
-			(double)cp->minClock / 1000.0);
-		}
-	    } else {
-		if (cp->maxClock) {
-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
-			"Maximum clock: %6.2f MHz\n",
-			(double)cp->maxClock / 1000.0);
-		}
-	    }
-	} else if (DivFactor > 1 || MulFactor > 1) {
-	    j = 0;
-	    for (i = 0; i < scrp->numClocks; i++) {
-		scaledClock = (scrp->clock[i] * DivFactor) / MulFactor;
-		if (scaledClock >= cp->minClock && scaledClock <= cp->maxClock) {
-		    if ((j % 8) == 0) {
-			if (j > 0)
-			    xf86ErrorF("\n");
-			xf86DrvMsg(scrp->scrnIndex, X_INFO, "scaled clocks:");
-		    }
-		    xf86ErrorF(" %6.2f", (double)scaledClock / 1000.0);
-		    j++;
-		}
-	    }
-	    xf86ErrorF("\n");
-	}
+        DivFactor = max(1, cp->ClockDivFactor);
+        MulFactor = max(1, cp->ClockMulFactor);
+        if (scrp->progClock) {
+            if (cp->minClock) {
+                if (cp->maxClock) {
+                    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+                               "Clock range: %6.2f to %6.2f MHz\n",
+                               (double) cp->minClock / 1000.0,
+                               (double) cp->maxClock / 1000.0);
+                }
+                else {
+                    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+                               "Minimum clock: %6.2f MHz\n",
+                               (double) cp->minClock / 1000.0);
+                }
+            }
+            else {
+                if (cp->maxClock) {
+                    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+                               "Maximum clock: %6.2f MHz\n",
+                               (double) cp->maxClock / 1000.0);
+                }
+            }
+        }
+        else if (DivFactor > 1 || MulFactor > 1) {
+            j = 0;
+            for (i = 0; i < scrp->numClocks; i++) {
+                scaledClock = (scrp->clock[i] * DivFactor) / MulFactor;
+                if (scaledClock >= cp->minClock && scaledClock <= cp->maxClock) {
+                    if ((j % 8) == 0) {
+                        if (j > 0)
+                            xf86ErrorF("\n");
+                        xf86DrvMsg(scrp->scrnIndex, X_INFO, "scaled clocks:");
+                    }
+                    xf86ErrorF(" %6.2f", (double) scaledClock / 1000.0);
+                    j++;
+                }
+            }
+            xf86ErrorF("\n");
+        }
     }
 }
 
@@ -298,10 +300,10 @@ static Bool
 modeInClockRange(ClockRangePtr cp, DisplayModePtr p)
 {
     return ((p->Clock >= cp->minClock) &&
-	    (p->Clock <= cp->maxClock) &&
-	    (cp->interlaceAllowed || !(p->Flags & V_INTERLACE)) &&
-	    (cp->doubleScanAllowed ||
-	     ((p->VScan <= 1) && !(p->Flags & V_DBLSCAN))));
+            (p->Clock <= cp->maxClock) &&
+            (cp->interlaceAllowed || !(p->Flags & V_INTERLACE)) &&
+            (cp->doubleScanAllowed ||
+             ((p->VScan <= 1) && !(p->Flags & V_DBLSCAN))));
 }
 
 /*
@@ -312,111 +314,112 @@ xf86FindClockRangeForMode(ClockRangePtr clockRanges, DisplayModePtr p)
 {
     ClockRangePtr cp;
 
-    for (cp = clockRanges; ; cp = cp->next)
-	if (!cp || modeInClockRange(cp, p))
-	    return cp;
+    for (cp = clockRanges;; cp = cp->next)
+        if (!cp || modeInClockRange(cp, p))
+            return cp;
 }
 
-
 /*
  * xf86HandleBuiltinMode() - handles built-in modes
  */
 static ModeStatus
 xf86HandleBuiltinMode(ScrnInfoPtr scrp,
-		      DisplayModePtr p,
-		      DisplayModePtr modep,
-		      ClockRangePtr clockRanges,
-		      Bool allowDiv2)
+                      DisplayModePtr p,
+                      DisplayModePtr modep,
+                      ClockRangePtr clockRanges, Bool allowDiv2)
 {
     ClockRangePtr cp;
     int extraFlags = 0;
     int MulFactor = 1;
     int DivFactor = 1;
     int clockIndex;
-    
+
     /* Reject previously rejected modes */
     if (p->status != MODE_OK)
-	return p->status;
+        return p->status;
 
     /* Reject previously considered modes */
     if (p->prev)
         return MODE_NOMODE;
 
     if ((p->type & M_T_CLOCK_C) == M_T_CLOCK_C) {
-	/* Check clock is in range */
-	cp = xf86FindClockRangeForMode(clockRanges, p);
-	if (cp == NULL){
-	    modep->type = p->type;
-	    p->status = MODE_CLOCK_RANGE;
-	    return MODE_CLOCK_RANGE;
-	}
-	DivFactor = cp->ClockDivFactor;
-	MulFactor = cp->ClockMulFactor;
-	if (!scrp->progClock) {
-	    clockIndex = xf86GetNearestClock(scrp, p->Clock, allowDiv2,
-					     cp->ClockDivFactor,
-					     cp->ClockMulFactor, &extraFlags);
-	    modep->Clock = (scrp->clock[clockIndex] * DivFactor)
-		/ MulFactor;
-	    modep->ClockIndex	= clockIndex;
-	    modep->SynthClock	= scrp->clock[clockIndex];
-	    if (extraFlags & V_CLKDIV2) {
-		modep->Clock /= 2;
-		modep->SynthClock /= 2;
-	    }
-	} else {
-	    modep->Clock = p->Clock;
-	    modep->ClockIndex = -1;
-	    modep->SynthClock = (modep->Clock * MulFactor)
-		/ DivFactor;
-	}
-	modep->PrivFlags = cp->PrivFlags;
-    } else {
-	if(!scrp->progClock) {
+        /* Check clock is in range */
+        cp = xf86FindClockRangeForMode(clockRanges, p);
+        if (cp == NULL) {
+            modep->type = p->type;
+            p->status = MODE_CLOCK_RANGE;
+            return MODE_CLOCK_RANGE;
+        }
+        DivFactor = cp->ClockDivFactor;
+        MulFactor = cp->ClockMulFactor;
+        if (!scrp->progClock) {
+            clockIndex = xf86GetNearestClock(scrp, p->Clock, allowDiv2,
+                                             cp->ClockDivFactor,
+                                             cp->ClockMulFactor, &extraFlags);
+            modep->Clock = (scrp->clock[clockIndex] * DivFactor)
+                / MulFactor;
+            modep->ClockIndex = clockIndex;
+            modep->SynthClock = scrp->clock[clockIndex];
+            if (extraFlags & V_CLKDIV2) {
+                modep->Clock /= 2;
+                modep->SynthClock /= 2;
+            }
+        }
+        else {
             modep->Clock = p->Clock;
-	    modep->ClockIndex = p->ClockIndex;
-	    modep->SynthClock = p->SynthClock;
-	} else {
-	    modep->Clock = p->Clock;
-	    modep->ClockIndex = -1;
-	    modep->SynthClock = p->SynthClock;
-	}
-	modep->PrivFlags = p->PrivFlags;
+            modep->ClockIndex = -1;
+            modep->SynthClock = (modep->Clock * MulFactor)
+                / DivFactor;
+        }
+        modep->PrivFlags = cp->PrivFlags;
     }
-    modep->type            = p->type;
-    modep->HDisplay        = p->HDisplay;
-    modep->HSyncStart      = p->HSyncStart;
-    modep->HSyncEnd        = p->HSyncEnd;
-    modep->HTotal          = p->HTotal;
-    modep->HSkew           = p->HSkew;
-    modep->VDisplay        = p->VDisplay;
-    modep->VSyncStart      = p->VSyncStart;
-    modep->VSyncEnd        = p->VSyncEnd;
-    modep->VTotal          = p->VTotal;
-    modep->VScan           = p->VScan;
-    modep->Flags           = p->Flags | extraFlags;
-    modep->CrtcHDisplay    = p->CrtcHDisplay;
+    else {
+        if (!scrp->progClock) {
+            modep->Clock = p->Clock;
+            modep->ClockIndex = p->ClockIndex;
+            modep->SynthClock = p->SynthClock;
+        }
+        else {
+            modep->Clock = p->Clock;
+            modep->ClockIndex = -1;
+            modep->SynthClock = p->SynthClock;
+        }
+        modep->PrivFlags = p->PrivFlags;
+    }
+    modep->type = p->type;
+    modep->HDisplay = p->HDisplay;
+    modep->HSyncStart = p->HSyncStart;
+    modep->HSyncEnd = p->HSyncEnd;
+    modep->HTotal = p->HTotal;
+    modep->HSkew = p->HSkew;
+    modep->VDisplay = p->VDisplay;
+    modep->VSyncStart = p->VSyncStart;
+    modep->VSyncEnd = p->VSyncEnd;
+    modep->VTotal = p->VTotal;
+    modep->VScan = p->VScan;
+    modep->Flags = p->Flags | extraFlags;
+    modep->CrtcHDisplay = p->CrtcHDisplay;
     modep->CrtcHBlankStart = p->CrtcHBlankStart;
-    modep->CrtcHSyncStart  = p->CrtcHSyncStart;
-    modep->CrtcHSyncEnd    = p->CrtcHSyncEnd;
-    modep->CrtcHBlankEnd   = p->CrtcHBlankEnd;
-    modep->CrtcHTotal      = p->CrtcHTotal;
-    modep->CrtcHSkew       = p->CrtcHSkew;
-    modep->CrtcVDisplay    = p->CrtcVDisplay;
+    modep->CrtcHSyncStart = p->CrtcHSyncStart;
+    modep->CrtcHSyncEnd = p->CrtcHSyncEnd;
+    modep->CrtcHBlankEnd = p->CrtcHBlankEnd;
+    modep->CrtcHTotal = p->CrtcHTotal;
+    modep->CrtcHSkew = p->CrtcHSkew;
+    modep->CrtcVDisplay = p->CrtcVDisplay;
     modep->CrtcVBlankStart = p->CrtcVBlankStart;
-    modep->CrtcVSyncStart  = p->CrtcVSyncStart;
-    modep->CrtcVSyncEnd    = p->CrtcVSyncEnd;
-    modep->CrtcVBlankEnd   = p->CrtcVBlankEnd;
-    modep->CrtcVTotal      = p->CrtcVTotal;
-    modep->CrtcHAdjusted   = p->CrtcHAdjusted;
-    modep->CrtcVAdjusted   = p->CrtcVAdjusted;
-    modep->HSync           = p->HSync;
-    modep->VRefresh        = p->VRefresh;
-    modep->Private         = p->Private;
-    modep->PrivSize        = p->PrivSize;
+    modep->CrtcVSyncStart = p->CrtcVSyncStart;
+    modep->CrtcVSyncEnd = p->CrtcVSyncEnd;
+    modep->CrtcVBlankEnd = p->CrtcVBlankEnd;
+    modep->CrtcVTotal = p->CrtcVTotal;
+    modep->CrtcHAdjusted = p->CrtcHAdjusted;
+    modep->CrtcVAdjusted = p->CrtcVAdjusted;
+    modep->HSync = p->HSync;
+    modep->VRefresh = p->VRefresh;
+    modep->Private = p->Private;
+    modep->PrivSize = p->PrivSize;
 
     p->prev = modep;
-    
+
     return MODE_OK;
 }
 
@@ -450,7 +453,7 @@ xf86HandleBuiltinMode(ScrnInfoPtr scrp,
 
 ModeStatus
 xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep,
-	       ClockRangePtr clockRanges, LookupModeFlags strategy)
+               ClockRangePtr clockRanges, LookupModeFlags strategy)
 {
     DisplayModePtr p, bestMode = NULL;
     ClockRangePtr cp;
@@ -465,14 +468,15 @@ xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep,
     ModeStatus status = MODE_NOMODE;
     Bool allowDiv2 = (strategy & LOOKUP_CLKDIV2) != 0;
     int n;
+
     const int types[] = {
-	M_T_BUILTIN | M_T_PREFERRED,
-	M_T_BUILTIN,
-	M_T_USERDEF | M_T_PREFERRED,
-	M_T_USERDEF,
-	M_T_DRIVER | M_T_PREFERRED,
-	M_T_DRIVER,
-	0
+        M_T_BUILTIN | M_T_PREFERRED,
+        M_T_BUILTIN,
+        M_T_USERDEF | M_T_PREFERRED,
+        M_T_USERDEF,
+        M_T_DRIVER | M_T_PREFERRED,
+        M_T_DRIVER,
+        0
     };
     const int ntypes = sizeof(types) / sizeof(int);
 
@@ -480,206 +484,209 @@ xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep,
 
     /* Some sanity checking */
     if (scrp == NULL || scrp->modePool == NULL ||
-	(!scrp->progClock && scrp->numClocks == 0)) {
-	ErrorF("xf86LookupMode: called with invalid scrnInfoRec\n");
-	return MODE_ERROR;
+        (!scrp->progClock && scrp->numClocks == 0)) {
+        ErrorF("xf86LookupMode: called with invalid scrnInfoRec\n");
+        return MODE_ERROR;
     }
     if (modep == NULL || modep->name == NULL) {
-	ErrorF("xf86LookupMode: called with invalid modep\n");
-	return MODE_ERROR;
+        ErrorF("xf86LookupMode: called with invalid modep\n");
+        return MODE_ERROR;
     }
     for (cp = clockRanges; cp != NULL; cp = cp->next) {
-	/* DivFactor and MulFactor must be > 0 */
-	cp->ClockDivFactor = max(1, cp->ClockDivFactor);
-	cp->ClockMulFactor = max(1, cp->ClockMulFactor);
+        /* DivFactor and MulFactor must be > 0 */
+        cp->ClockDivFactor = max(1, cp->ClockDivFactor);
+        cp->ClockMulFactor = max(1, cp->ClockMulFactor);
     }
 
     /* Scan the mode pool for matching names */
     for (n = 0; n < ntypes; n++) {
-	int type = types[n];
-	for (p = scrp->modePool; p != NULL; p = p->next) {
-
-	    /* scan through the modes in the sort order above */
-	    if ((p->type & type) != type)
-		continue;
-
-	    if (strcmp(p->name, modep->name) == 0) {
-
-		/* Skip over previously rejected modes */
-		if (p->status != MODE_OK) {
-		    if (!found)
-			status = p->status;
-		    continue;
-		}
-
-		/* Skip over previously considered modes */
-		if (p->prev)
-		    continue;
-
-		if (p->type & M_T_BUILTIN) {
-		    return xf86HandleBuiltinMode(scrp, p,modep, clockRanges,
-			    allowDiv2);
-		}
-
-		/* Check clock is in range */
-		cp = xf86FindClockRangeForMode(clockRanges, p);
-		if (cp == NULL) {
-		    /*
-		     * XXX Could do more here to provide a more detailed
-		     * reason for not finding a mode.
-		     */
-		    p->status = MODE_CLOCK_RANGE;
-		    if (!found)
-			status = MODE_CLOCK_RANGE;
-		    continue;
-		}
-
-		/*
-		 * If programmable clock and strategy is not
-		 * LOOKUP_BEST_REFRESH, the required mode has been found,
-		 * otherwise record the refresh and continue looking.
-		 */
-		if (scrp->progClock) {
-		    found = TRUE;
-		    if (strategy != LOOKUP_BEST_REFRESH) {
-			bestMode = p;
-			DivFactor = cp->ClockDivFactor;
-			MulFactor = cp->ClockMulFactor;
-			ModePrivFlags = cp->PrivFlags;
-			break;
-		    }
-		    refresh = xf86ModeVRefresh(p);
-		    if (p->Flags & V_INTERLACE)
-			refresh /= INTERLACE_REFRESH_WEIGHT;
-		    if (refresh > bestRefresh) {
-			bestMode = p;
-			DivFactor = cp->ClockDivFactor;
-			MulFactor = cp->ClockMulFactor;
-			ModePrivFlags = cp->PrivFlags;
-			bestRefresh = refresh;
-		    }
-		    continue;
-		}
-
-		/*
-		 * Clock is in range, so if it is not a programmable clock, find
-		 * a matching clock.
-		 */
-
-		i = xf86GetNearestClock(scrp, p->Clock, allowDiv2,
-			cp->ClockDivFactor, cp->ClockMulFactor, &k);
-		/*
-		 * If the clock is too far from the requested clock, this
-		 * mode is no good.
-		 */
-		if (k & V_CLKDIV2)
-		    gap = abs((p->Clock * 2) -
-			    ((scrp->clock[i] * cp->ClockDivFactor) /
-				cp->ClockMulFactor));
-		else
-		    gap = abs(p->Clock -
-			    ((scrp->clock[i] * cp->ClockDivFactor) /
-				cp->ClockMulFactor));
-		if (gap > minimumGap) {
-		    p->status = MODE_NOCLOCK;
-		    if (!found)
-			status = MODE_NOCLOCK;
-		    continue;
-		}
-		found = TRUE;
-
-		if (strategy == LOOKUP_BEST_REFRESH) {
-		    refresh = xf86ModeVRefresh(p);
-		    if (p->Flags & V_INTERLACE)
-			refresh /= INTERLACE_REFRESH_WEIGHT;
-		    if (refresh > bestRefresh) {
-			bestMode = p;
-			DivFactor = cp->ClockDivFactor;
-			MulFactor = cp->ClockMulFactor;
-			ModePrivFlags = cp->PrivFlags;
-			extraFlags = k;
-			clockIndex = i;
-			bestRefresh = refresh;
-		    }
-		    continue;
-		}
-		if (strategy == LOOKUP_CLOSEST_CLOCK) {
-		    if (gap < minimumGap) {
-			bestMode = p;
-			DivFactor = cp->ClockDivFactor;
-			MulFactor = cp->ClockMulFactor;
-			ModePrivFlags = cp->PrivFlags;
-			extraFlags = k;
-			clockIndex = i;
-			minimumGap = gap;
-		    }
-		    continue;
-		}
-		/*
-		 * If strategy is neither LOOKUP_BEST_REFRESH or
-		 * LOOKUP_CLOSEST_CLOCK the required mode has been found.
-		 */
-		bestMode = p;
-		DivFactor = cp->ClockDivFactor;
-		MulFactor = cp->ClockMulFactor;
-		ModePrivFlags = cp->PrivFlags;
-		extraFlags = k;
-		clockIndex = i;
-		break;
-	    }
-	}
-	if (found) break;
+        int type = types[n];
+
+        for (p = scrp->modePool; p != NULL; p = p->next) {
+
+            /* scan through the modes in the sort order above */
+            if ((p->type & type) != type)
+                continue;
+
+            if (strcmp(p->name, modep->name) == 0) {
+
+                /* Skip over previously rejected modes */
+                if (p->status != MODE_OK) {
+                    if (!found)
+                        status = p->status;
+                    continue;
+                }
+
+                /* Skip over previously considered modes */
+                if (p->prev)
+                    continue;
+
+                if (p->type & M_T_BUILTIN) {
+                    return xf86HandleBuiltinMode(scrp, p, modep, clockRanges,
+                                                 allowDiv2);
+                }
+
+                /* Check clock is in range */
+                cp = xf86FindClockRangeForMode(clockRanges, p);
+                if (cp == NULL) {
+                    /*
+                     * XXX Could do more here to provide a more detailed
+                     * reason for not finding a mode.
+                     */
+                    p->status = MODE_CLOCK_RANGE;
+                    if (!found)
+                        status = MODE_CLOCK_RANGE;
+                    continue;
+                }
+
+                /*
+                 * If programmable clock and strategy is not
+                 * LOOKUP_BEST_REFRESH, the required mode has been found,
+                 * otherwise record the refresh and continue looking.
+                 */
+                if (scrp->progClock) {
+                    found = TRUE;
+                    if (strategy != LOOKUP_BEST_REFRESH) {
+                        bestMode = p;
+                        DivFactor = cp->ClockDivFactor;
+                        MulFactor = cp->ClockMulFactor;
+                        ModePrivFlags = cp->PrivFlags;
+                        break;
+                    }
+                    refresh = xf86ModeVRefresh(p);
+                    if (p->Flags & V_INTERLACE)
+                        refresh /= INTERLACE_REFRESH_WEIGHT;
+                    if (refresh > bestRefresh) {
+                        bestMode = p;
+                        DivFactor = cp->ClockDivFactor;
+                        MulFactor = cp->ClockMulFactor;
+                        ModePrivFlags = cp->PrivFlags;
+                        bestRefresh = refresh;
+                    }
+                    continue;
+                }
+
+                /*
+                 * Clock is in range, so if it is not a programmable clock, find
+                 * a matching clock.
+                 */
+
+                i = xf86GetNearestClock(scrp, p->Clock, allowDiv2,
+                                        cp->ClockDivFactor, cp->ClockMulFactor,
+                                        &k);
+                /*
+                 * If the clock is too far from the requested clock, this
+                 * mode is no good.
+                 */
+                if (k & V_CLKDIV2)
+                    gap = abs((p->Clock * 2) -
+                              ((scrp->clock[i] * cp->ClockDivFactor) /
+                               cp->ClockMulFactor));
+                else
+                    gap = abs(p->Clock -
+                              ((scrp->clock[i] * cp->ClockDivFactor) /
+                               cp->ClockMulFactor));
+                if (gap > minimumGap) {
+                    p->status = MODE_NOCLOCK;
+                    if (!found)
+                        status = MODE_NOCLOCK;
+                    continue;
+                }
+                found = TRUE;
+
+                if (strategy == LOOKUP_BEST_REFRESH) {
+                    refresh = xf86ModeVRefresh(p);
+                    if (p->Flags & V_INTERLACE)
+                        refresh /= INTERLACE_REFRESH_WEIGHT;
+                    if (refresh > bestRefresh) {
+                        bestMode = p;
+                        DivFactor = cp->ClockDivFactor;
+                        MulFactor = cp->ClockMulFactor;
+                        ModePrivFlags = cp->PrivFlags;
+                        extraFlags = k;
+                        clockIndex = i;
+                        bestRefresh = refresh;
+                    }
+                    continue;
+                }
+                if (strategy == LOOKUP_CLOSEST_CLOCK) {
+                    if (gap < minimumGap) {
+                        bestMode = p;
+                        DivFactor = cp->ClockDivFactor;
+                        MulFactor = cp->ClockMulFactor;
+                        ModePrivFlags = cp->PrivFlags;
+                        extraFlags = k;
+                        clockIndex = i;
+                        minimumGap = gap;
+                    }
+                    continue;
+                }
+                /*
+                 * If strategy is neither LOOKUP_BEST_REFRESH or
+                 * LOOKUP_CLOSEST_CLOCK the required mode has been found.
+                 */
+                bestMode = p;
+                DivFactor = cp->ClockDivFactor;
+                MulFactor = cp->ClockMulFactor;
+                ModePrivFlags = cp->PrivFlags;
+                extraFlags = k;
+                clockIndex = i;
+                break;
+            }
+        }
+        if (found)
+            break;
     }
     if (!found || bestMode == NULL)
-	return status;
+        return status;
 
     /* Fill in the mode parameters */
     if (scrp->progClock) {
-        modep->Clock		= bestMode->Clock;
-	modep->ClockIndex	= -1;
-	modep->SynthClock	= (modep->Clock * MulFactor) / DivFactor;
-    } else {
-	modep->Clock		= (scrp->clock[clockIndex] * DivFactor) /
-				    MulFactor;
-	modep->ClockIndex	= clockIndex;
-	modep->SynthClock	= scrp->clock[clockIndex];
-	if (extraFlags & V_CLKDIV2) {
-	    modep->Clock /= 2;
-	    modep->SynthClock /= 2;
-	}
+        modep->Clock = bestMode->Clock;
+        modep->ClockIndex = -1;
+        modep->SynthClock = (modep->Clock * MulFactor) / DivFactor;
+    }
+    else {
+        modep->Clock = (scrp->clock[clockIndex] * DivFactor) / MulFactor;
+        modep->ClockIndex = clockIndex;
+        modep->SynthClock = scrp->clock[clockIndex];
+        if (extraFlags & V_CLKDIV2) {
+            modep->Clock /= 2;
+            modep->SynthClock /= 2;
+        }
     }
-    modep->type                 = bestMode->type;
-    modep->PrivFlags		= ModePrivFlags;
-    modep->HDisplay		= bestMode->HDisplay;
-    modep->HSyncStart		= bestMode->HSyncStart;
-    modep->HSyncEnd		= bestMode->HSyncEnd;
-    modep->HTotal		= bestMode->HTotal;
-    modep->HSkew		= bestMode->HSkew;
-    modep->VDisplay		= bestMode->VDisplay;
-    modep->VSyncStart		= bestMode->VSyncStart;
-    modep->VSyncEnd		= bestMode->VSyncEnd;
-    modep->VTotal		= bestMode->VTotal;
-    modep->VScan		= bestMode->VScan;
-    modep->Flags		= bestMode->Flags | extraFlags;
-    modep->CrtcHDisplay		= bestMode->CrtcHDisplay;
-    modep->CrtcHBlankStart	= bestMode->CrtcHBlankStart;
-    modep->CrtcHSyncStart	= bestMode->CrtcHSyncStart;
-    modep->CrtcHSyncEnd		= bestMode->CrtcHSyncEnd;
-    modep->CrtcHBlankEnd	= bestMode->CrtcHBlankEnd;
-    modep->CrtcHTotal		= bestMode->CrtcHTotal;
-    modep->CrtcHSkew		= bestMode->CrtcHSkew;
-    modep->CrtcVDisplay		= bestMode->CrtcVDisplay;
-    modep->CrtcVBlankStart	= bestMode->CrtcVBlankStart;
-    modep->CrtcVSyncStart	= bestMode->CrtcVSyncStart;
-    modep->CrtcVSyncEnd		= bestMode->CrtcVSyncEnd;
-    modep->CrtcVBlankEnd	= bestMode->CrtcVBlankEnd;
-    modep->CrtcVTotal		= bestMode->CrtcVTotal;
-    modep->CrtcHAdjusted	= bestMode->CrtcHAdjusted;
-    modep->CrtcVAdjusted	= bestMode->CrtcVAdjusted;
-    modep->HSync		= bestMode->HSync;
-    modep->VRefresh		= bestMode->VRefresh;
-    modep->Private		= bestMode->Private;
-    modep->PrivSize		= bestMode->PrivSize;
+    modep->type = bestMode->type;
+    modep->PrivFlags = ModePrivFlags;
+    modep->HDisplay = bestMode->HDisplay;
+    modep->HSyncStart = bestMode->HSyncStart;
+    modep->HSyncEnd = bestMode->HSyncEnd;
+    modep->HTotal = bestMode->HTotal;
+    modep->HSkew = bestMode->HSkew;
+    modep->VDisplay = bestMode->VDisplay;
+    modep->VSyncStart = bestMode->VSyncStart;
+    modep->VSyncEnd = bestMode->VSyncEnd;
+    modep->VTotal = bestMode->VTotal;
+    modep->VScan = bestMode->VScan;
+    modep->Flags = bestMode->Flags | extraFlags;
+    modep->CrtcHDisplay = bestMode->CrtcHDisplay;
+    modep->CrtcHBlankStart = bestMode->CrtcHBlankStart;
+    modep->CrtcHSyncStart = bestMode->CrtcHSyncStart;
+    modep->CrtcHSyncEnd = bestMode->CrtcHSyncEnd;
+    modep->CrtcHBlankEnd = bestMode->CrtcHBlankEnd;
+    modep->CrtcHTotal = bestMode->CrtcHTotal;
+    modep->CrtcHSkew = bestMode->CrtcHSkew;
+    modep->CrtcVDisplay = bestMode->CrtcVDisplay;
+    modep->CrtcVBlankStart = bestMode->CrtcVBlankStart;
+    modep->CrtcVSyncStart = bestMode->CrtcVSyncStart;
+    modep->CrtcVSyncEnd = bestMode->CrtcVSyncEnd;
+    modep->CrtcVBlankEnd = bestMode->CrtcVBlankEnd;
+    modep->CrtcVTotal = bestMode->CrtcVTotal;
+    modep->CrtcHAdjusted = bestMode->CrtcHAdjusted;
+    modep->CrtcVAdjusted = bestMode->CrtcVAdjusted;
+    modep->HSync = bestMode->HSync;
+    modep->VRefresh = bestMode->VRefresh;
+    modep->Private = bestMode->Private;
+    modep->PrivSize = bestMode->PrivSize;
 
     bestMode->prev = modep;
 
@@ -699,51 +706,53 @@ xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor)
 
     /* Sanity checks */
     if (mode == NULL || monitor == NULL) {
-	ErrorF("xf86CheckModeForMonitor: called with invalid parameters\n");
-	return MODE_ERROR;
+        ErrorF("xf86CheckModeForMonitor: called with invalid parameters\n");
+        return MODE_ERROR;
     }
 
     DebugF("xf86CheckModeForMonitor(%p %s, %p %s)\n",
-	   mode, mode->name, monitor, monitor->id);
+           mode, mode->name, monitor, monitor->id);
 
     /* Some basic mode validity checks */
     if (0 >= mode->HDisplay || mode->HDisplay > mode->HSyncStart ||
-	mode->HSyncStart >= mode->HSyncEnd || mode->HSyncEnd >= mode->HTotal)
-	return MODE_H_ILLEGAL;
+        mode->HSyncStart >= mode->HSyncEnd || mode->HSyncEnd >= mode->HTotal)
+        return MODE_H_ILLEGAL;
 
     if (0 >= mode->VDisplay || mode->VDisplay > mode->VSyncStart ||
-	mode->VSyncStart >= mode->VSyncEnd || mode->VSyncEnd >= mode->VTotal)
-	return MODE_V_ILLEGAL;
+        mode->VSyncStart >= mode->VSyncEnd || mode->VSyncEnd >= mode->VTotal)
+        return MODE_V_ILLEGAL;
 
     if (monitor->nHsync > 0) {
-	/* Check hsync against the allowed ranges */
-	float hsync = xf86ModeHSync(mode);
-	for (i = 0; i < monitor->nHsync; i++) 
-	    if ((hsync > monitor->hsync[i].lo * (1.0 - SYNC_TOLERANCE)) &&
-		(hsync < monitor->hsync[i].hi * (1.0 + SYNC_TOLERANCE)))
-		break;
-	
-	/* Now see whether we ran out of sync ranges without finding a match */
-	if (i == monitor->nHsync) 
-	    return MODE_HSYNC;
+        /* Check hsync against the allowed ranges */
+        float hsync = xf86ModeHSync(mode);
+
+        for (i = 0; i < monitor->nHsync; i++)
+            if ((hsync > monitor->hsync[i].lo * (1.0 - SYNC_TOLERANCE)) &&
+                (hsync < monitor->hsync[i].hi * (1.0 + SYNC_TOLERANCE)))
+                break;
+
+        /* Now see whether we ran out of sync ranges without finding a match */
+        if (i == monitor->nHsync)
+            return MODE_HSYNC;
     }
 
     if (monitor->nVrefresh > 0) {
-	/* Check vrefresh against the allowed ranges */
-	float vrefrsh = xf86ModeVRefresh(mode);
-	for (i = 0; i < monitor->nVrefresh; i++)
-	    if ((vrefrsh > monitor->vrefresh[i].lo * (1.0 - SYNC_TOLERANCE)) &&
-		(vrefrsh < monitor->vrefresh[i].hi * (1.0 + SYNC_TOLERANCE)))
-		break;
-
-	/* Now see whether we ran out of refresh ranges without finding a match */
-	if (i == monitor->nVrefresh)
-	    return MODE_VSYNC;
+        /* Check vrefresh against the allowed ranges */
+        float vrefrsh = xf86ModeVRefresh(mode);
+
+        for (i = 0; i < monitor->nVrefresh; i++)
+            if ((vrefrsh > monitor->vrefresh[i].lo * (1.0 - SYNC_TOLERANCE)) &&
+                (vrefrsh < monitor->vrefresh[i].hi * (1.0 + SYNC_TOLERANCE)))
+                break;
+
+        /* Now see whether we ran out of refresh ranges without finding a match */
+        if (i == monitor->nVrefresh)
+            return MODE_VSYNC;
     }
 
     /* Force interlaced modes to have an odd VTotal */
     if (mode->Flags & V_INTERLACE)
-	mode->CrtcVTotal = mode->VTotal |= 1;
+        mode->CrtcVTotal = mode->VTotal |= 1;
 
     /*
      * This code stops cvt -r modes, and only cvt -r modes, from hitting 15y+
@@ -759,7 +768,7 @@ xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor)
     }
 
     if ((monitor->maxPixClock) && (mode->Clock > monitor->maxPixClock))
-	return MODE_CLOCK_HIGH;
+        return MODE_CLOCK_HIGH;
 
     return MODE_OK;
 }
@@ -774,16 +783,15 @@ xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor)
 static Bool
 xf86CheckModeSize(ScrnInfoPtr scrp, int w, int x, int y)
 {
-    int bpp = scrp->fbFormat.bitsPerPixel,
-	pad = scrp->fbFormat.scanlinePad;
+    int bpp = scrp->fbFormat.bitsPerPixel, pad = scrp->fbFormat.scanlinePad;
     int lineWidth, lastWidth;
 
     if (scrp->depth == 4)
-	pad *= 4;		/* 4 planes */
+        pad *= 4;               /* 4 planes */
 
     /* Sanity check */
     if ((w < 0) || (x < 0) || (y <= 0))
-	return FALSE;
+        return FALSE;
 
     lineWidth = (((w * bpp) + pad - 1) / pad) * pad;
     lastWidth = x * bpp;
@@ -791,11 +799,11 @@ xf86CheckModeSize(ScrnInfoPtr scrp, int w, int x, int y)
     /*
      * At this point, we need to compare
      *
-     *	(lineWidth * (y - 1)) + lastWidth
+     *  (lineWidth * (y - 1)) + lastWidth
      *
      * against
      *
-     *	scrp->videoRam * (1024 * 8)
+     *  scrp->videoRam * (1024 * 8)
      *
      * These are bit quantities.  To avoid overflows, do the comparison in
      * terms of BITMAP_SCANLINE_PAD units.  This assumes BITMAP_SCANLINE_PAD
@@ -807,8 +815,8 @@ xf86CheckModeSize(ScrnInfoPtr scrp, int w, int x, int y)
     lastWidth = (lastWidth + (BITMAP_SCANLINE_PAD - 1)) / BITMAP_SCANLINE_PAD;
 
     if ((lineWidth * (y - 1) + lastWidth) >
-	(scrp->videoRam * ((1024 * 8) / BITMAP_SCANLINE_PAD)))
-	return FALSE;
+        (scrp->videoRam * ((1024 * 8) / BITMAP_SCANLINE_PAD)))
+        return FALSE;
 
     return TRUE;
 }
@@ -839,52 +847,53 @@ xf86CheckModeSize(ScrnInfoPtr scrp, int w, int x, int y)
 
 ModeStatus
 xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
-			      ClockRangePtr clockRanges,
-			      LookupModeFlags strategy,
-			      int maxPitch, int virtualX, int virtualY)
+                              ClockRangePtr clockRanges,
+                              LookupModeFlags strategy,
+                              int maxPitch, int virtualX, int virtualY)
 {
     ClockRangePtr cp;
     ModeStatus status;
     Bool allowDiv2 = (strategy & LOOKUP_CLKDIV2) != 0;
     int i, needDiv2;
-    
+
     /* Sanity checks */
     if (!scrp || !mode || !clockRanges) {
-	ErrorF("xf86InitialCheckModeForDriver: "
-		"called with invalid parameters\n");
-	return MODE_ERROR;
+        ErrorF("xf86InitialCheckModeForDriver: "
+               "called with invalid parameters\n");
+        return MODE_ERROR;
     }
 
     DebugF("xf86InitialCheckModeForDriver(%p, %p %s, %p, 0x%x, %d, %d, %d)\n",
-	   scrp, mode, mode->name , clockRanges, strategy, maxPitch,  virtualX, virtualY);
+           scrp, mode, mode->name, clockRanges, strategy, maxPitch, virtualX,
+           virtualY);
 
     /* Some basic mode validity checks */
     if (0 >= mode->HDisplay || mode->HDisplay > mode->HSyncStart ||
-	mode->HSyncStart >= mode->HSyncEnd || mode->HSyncEnd >= mode->HTotal)
-	return MODE_H_ILLEGAL;
+        mode->HSyncStart >= mode->HSyncEnd || mode->HSyncEnd >= mode->HTotal)
+        return MODE_H_ILLEGAL;
 
     if (0 >= mode->VDisplay || mode->VDisplay > mode->VSyncStart ||
-	mode->VSyncStart >= mode->VSyncEnd || mode->VSyncEnd >= mode->VTotal)
-	return MODE_V_ILLEGAL;
+        mode->VSyncStart >= mode->VSyncEnd || mode->VSyncEnd >= mode->VTotal)
+        return MODE_V_ILLEGAL;
 
     if (!xf86CheckModeSize(scrp, mode->HDisplay, mode->HDisplay,
-				 mode->VDisplay))
+                           mode->VDisplay))
         return MODE_MEM;
 
     if (maxPitch > 0 && mode->HDisplay > maxPitch)
-	return MODE_BAD_WIDTH;
+        return MODE_BAD_WIDTH;
 
     if (virtualX > 0 && mode->HDisplay > virtualX)
-	return MODE_VIRTUAL_X;
+        return MODE_VIRTUAL_X;
 
     if (virtualY > 0 && mode->VDisplay > virtualY)
-	return MODE_VIRTUAL_Y;
+        return MODE_VIRTUAL_Y;
 
     if (scrp->maxHValue > 0 && mode->HTotal > scrp->maxHValue)
-	return MODE_BAD_HVALUE;
+        return MODE_BAD_HVALUE;
 
     if (scrp->maxVValue > 0 && mode->VTotal > scrp->maxVValue)
-	return MODE_BAD_VVALUE;
+        return MODE_BAD_VVALUE;
 
     /*
      * The use of the DisplayModeRec's Crtc* and SynthClock elements below is
@@ -910,48 +919,49 @@ xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
      * confusion and is bad software design. However since it's part of
      * the driver API it's hard to change.
      */
-     
+
     if (scrp->ValidMode) {
-	
-	xf86SetModeCrtc(mode, INTERLACE_HALVE_V);
-
-	cp = xf86FindClockRangeForMode(clockRanges, mode);
-	if (!cp)
-	    return MODE_CLOCK_RANGE;
-
-	if (cp->ClockMulFactor < 1)
-	    cp->ClockMulFactor = 1;
-	if (cp->ClockDivFactor < 1)
-	    cp->ClockDivFactor = 1;
-	
-	/*
-	 * XXX  The effect of clock dividers and multipliers on the monitor's
-	 *      pixel clock needs to be verified.
-	 */
-	if (scrp->progClock) {
-	    mode->SynthClock = mode->Clock;
-	} else {
-	    i = xf86GetNearestClock(scrp, mode->Clock, allowDiv2,
-				    cp->ClockDivFactor, cp->ClockMulFactor,
-				    &needDiv2);
-	    mode->SynthClock = (scrp->clock[i] * cp->ClockDivFactor) /
-		cp->ClockMulFactor;
-	    if (needDiv2 & V_CLKDIV2)
-		mode->SynthClock /= 2;
-	}
-
-	status = (*scrp->ValidMode)(scrp->scrnIndex, mode, FALSE,
-				    MODECHECK_INITIAL);
-	if (status != MODE_OK)
-	    return status;
-
-	if (mode->HSync <= 0.0)
-	    mode->HSync = (float)mode->SynthClock / (float)mode->CrtcHTotal;
-	if (mode->VRefresh <= 0.0)
-	    mode->VRefresh = (mode->SynthClock * 1000.0)
-		/ (mode->CrtcHTotal * mode->CrtcVTotal);
+
+        xf86SetModeCrtc(mode, INTERLACE_HALVE_V);
+
+        cp = xf86FindClockRangeForMode(clockRanges, mode);
+        if (!cp)
+            return MODE_CLOCK_RANGE;
+
+        if (cp->ClockMulFactor < 1)
+            cp->ClockMulFactor = 1;
+        if (cp->ClockDivFactor < 1)
+            cp->ClockDivFactor = 1;
+
+        /*
+         * XXX  The effect of clock dividers and multipliers on the monitor's
+         *      pixel clock needs to be verified.
+         */
+        if (scrp->progClock) {
+            mode->SynthClock = mode->Clock;
+        }
+        else {
+            i = xf86GetNearestClock(scrp, mode->Clock, allowDiv2,
+                                    cp->ClockDivFactor, cp->ClockMulFactor,
+                                    &needDiv2);
+            mode->SynthClock = (scrp->clock[i] * cp->ClockDivFactor) /
+                cp->ClockMulFactor;
+            if (needDiv2 & V_CLKDIV2)
+                mode->SynthClock /= 2;
+        }
+
+        status = (*scrp->ValidMode) (scrp->scrnIndex, mode, FALSE,
+                                     MODECHECK_INITIAL);
+        if (status != MODE_OK)
+            return status;
+
+        if (mode->HSync <= 0.0)
+            mode->HSync = (float) mode->SynthClock / (float) mode->CrtcHTotal;
+        if (mode->VRefresh <= 0.0)
+            mode->VRefresh = (mode->SynthClock * 1000.0)
+                / (mode->CrtcHTotal * mode->CrtcVTotal);
     }
-    
+
     mode->HSync = xf86ModeHSync(mode);
     mode->VRefresh = xf86ModeVRefresh(mode);
 
@@ -996,109 +1006,112 @@ xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags)
     ModeStatus status = MODE_NOMODE;
 
     /* Some sanity checking */
-    if (scrp == NULL ||	(!scrp->progClock && scrp->numClocks == 0)) {
-	ErrorF("xf86CheckModeForDriver: called with invalid scrnInfoRec\n");
-	return MODE_ERROR;
+    if (scrp == NULL || (!scrp->progClock && scrp->numClocks == 0)) {
+        ErrorF("xf86CheckModeForDriver: called with invalid scrnInfoRec\n");
+        return MODE_ERROR;
     }
     if (mode == NULL) {
-	ErrorF("xf86CheckModeForDriver: called with invalid modep\n");
-	return MODE_ERROR;
+        ErrorF("xf86CheckModeForDriver: called with invalid modep\n");
+        return MODE_ERROR;
     }
 
     /* Check the mode size */
     if (mode->HDisplay > scrp->virtualX)
-	return MODE_VIRTUAL_X;
+        return MODE_VIRTUAL_X;
 
     if (mode->VDisplay > scrp->virtualY)
-	return MODE_VIRTUAL_Y;
+        return MODE_VIRTUAL_Y;
 
     if (scrp->maxHValue > 0 && mode->HTotal > scrp->maxHValue)
-	return MODE_BAD_HVALUE;
+        return MODE_BAD_HVALUE;
 
     if (scrp->maxVValue > 0 && mode->VTotal > scrp->maxVValue)
-	return MODE_BAD_VVALUE;
+        return MODE_BAD_VVALUE;
 
     for (cp = scrp->clockRanges; cp != NULL; cp = cp->next) {
-	/* DivFactor and MulFactor must be > 0 */
-	cp->ClockDivFactor = max(1, cp->ClockDivFactor);
-	cp->ClockMulFactor = max(1, cp->ClockMulFactor);
+        /* DivFactor and MulFactor must be > 0 */
+        cp->ClockDivFactor = max(1, cp->ClockDivFactor);
+        cp->ClockMulFactor = max(1, cp->ClockMulFactor);
     }
 
     if (scrp->progClock) {
-	/* Check clock is in range */
-	for (cp = scrp->clockRanges; cp != NULL; cp = cp->next) {
-	    if (modeInClockRange(cp, mode))
-	        break;
-	}
-	if (cp == NULL) {
-	    return MODE_CLOCK_RANGE;
-	}
-	/*
-	 * If programmable clock the required mode has been found
-	 */
-    	DivFactor = cp->ClockDivFactor;
-	MulFactor = cp->ClockMulFactor;
-	ModePrivFlags = cp->PrivFlags;
-    } else {
-	 status = MODE_CLOCK_RANGE;
-	/* Check clock is in range */
-	for (cp = scrp->clockRanges; cp != NULL; cp = cp->next) {
-	    if (modeInClockRange(cp, mode)) {
-		/*
-	 	 * Clock is in range, so if it is not a programmable clock,
-		 * find a matching clock.
-		 */
-    
-		i = xf86GetNearestClock(scrp, mode->Clock, 0,
-			   cp->ClockDivFactor, cp->ClockMulFactor, &k);
-		/*
-		 * If the clock is too far from the requested clock, this
-		 * mode is no good.
-		 */
-		if (k & V_CLKDIV2)
-		    gap = abs((mode->Clock * 2) -
-			      ((scrp->clock[i] * cp->ClockDivFactor) /
-			       cp->ClockMulFactor));
-		else
-		    gap = abs(mode->Clock -
-			      ((scrp->clock[i] * cp->ClockDivFactor) /
-			       cp->ClockMulFactor));
-		if (gap > minimumGap) {
-		    status = MODE_NOCLOCK;
-		    continue;
-		}
-		
-		DivFactor = cp->ClockDivFactor;
-		MulFactor = cp->ClockMulFactor;
-		ModePrivFlags = cp->PrivFlags;
-		extraFlags = k;
-		clockIndex = i;
-		break;
-	    }
-	}
-	if (cp == NULL)
-	    return status;
+        /* Check clock is in range */
+        for (cp = scrp->clockRanges; cp != NULL; cp = cp->next) {
+            if (modeInClockRange(cp, mode))
+                break;
+        }
+        if (cp == NULL) {
+            return MODE_CLOCK_RANGE;
+        }
+        /*
+         * If programmable clock the required mode has been found
+         */
+        DivFactor = cp->ClockDivFactor;
+        MulFactor = cp->ClockMulFactor;
+        ModePrivFlags = cp->PrivFlags;
+    }
+    else {
+        status = MODE_CLOCK_RANGE;
+        /* Check clock is in range */
+        for (cp = scrp->clockRanges; cp != NULL; cp = cp->next) {
+            if (modeInClockRange(cp, mode)) {
+                /*
+                 * Clock is in range, so if it is not a programmable clock,
+                 * find a matching clock.
+                 */
+
+                i = xf86GetNearestClock(scrp, mode->Clock, 0,
+                                        cp->ClockDivFactor, cp->ClockMulFactor,
+                                        &k);
+                /*
+                 * If the clock is too far from the requested clock, this
+                 * mode is no good.
+                 */
+                if (k & V_CLKDIV2)
+                    gap = abs((mode->Clock * 2) -
+                              ((scrp->clock[i] * cp->ClockDivFactor) /
+                               cp->ClockMulFactor));
+                else
+                    gap = abs(mode->Clock -
+                              ((scrp->clock[i] * cp->ClockDivFactor) /
+                               cp->ClockMulFactor));
+                if (gap > minimumGap) {
+                    status = MODE_NOCLOCK;
+                    continue;
+                }
+
+                DivFactor = cp->ClockDivFactor;
+                MulFactor = cp->ClockMulFactor;
+                ModePrivFlags = cp->PrivFlags;
+                extraFlags = k;
+                clockIndex = i;
+                break;
+            }
+        }
+        if (cp == NULL)
+            return status;
     }
 
     /* Fill in the mode parameters */
     if (scrp->progClock) {
-	mode->ClockIndex	= -1;
-	mode->SynthClock	= (mode->Clock * MulFactor) / DivFactor;
-    } else {
-	mode->Clock		= (scrp->clock[clockIndex] * DivFactor) / MulFactor;
-	mode->ClockIndex	= clockIndex;
-	mode->SynthClock	= scrp->clock[clockIndex];
-	if (extraFlags & V_CLKDIV2) {
-	    mode->Clock /= 2;
-	    mode->SynthClock /= 2;
-	}
+        mode->ClockIndex = -1;
+        mode->SynthClock = (mode->Clock * MulFactor) / DivFactor;
     }
-    mode->PrivFlags		= ModePrivFlags;
+    else {
+        mode->Clock = (scrp->clock[clockIndex] * DivFactor) / MulFactor;
+        mode->ClockIndex = clockIndex;
+        mode->SynthClock = scrp->clock[clockIndex];
+        if (extraFlags & V_CLKDIV2) {
+            mode->Clock /= 2;
+            mode->SynthClock /= 2;
+        }
+    }
+    mode->PrivFlags = ModePrivFlags;
 
     return MODE_OK;
 }
 
-static int 
+static int
 inferVirtualSize(ScrnInfoPtr scrp, DisplayModePtr modes, int *vx, int *vy)
 {
     float aspect = 0.0;
@@ -1107,24 +1120,25 @@ inferVirtualSize(ScrnInfoPtr scrp, DisplayModePtr modes, int *vx, int *vy)
     int x = 0, y = 0;
     DisplayModePtr mode;
 
-    if (!mon) return 0;
+    if (!mon)
+        return 0;
     DDC = mon->DDC;
 
     if (DDC && DDC->ver.revision >= 4) {
-	/* For 1.4, we might actually get native pixel format.  How novel. */
-	if (PREFERRED_TIMING_MODE(DDC->features.msc)) {
-		for (mode = modes; mode; mode = mode->next) {
-		    if (mode->type & (M_T_DRIVER | M_T_PREFERRED)) {
-			x = mode->HDisplay;
-			y = mode->VDisplay;
-			goto found;
-		    }
-		}
-	}
-	/*
-	 * Even if we don't, we might get aspect ratio from extra CVT info
-	 * or from the monitor size fields.  TODO.
-	 */
+        /* For 1.4, we might actually get native pixel format.  How novel. */
+        if (PREFERRED_TIMING_MODE(DDC->features.msc)) {
+            for (mode = modes; mode; mode = mode->next) {
+                if (mode->type & (M_T_DRIVER | M_T_PREFERRED)) {
+                    x = mode->HDisplay;
+                    y = mode->VDisplay;
+                    goto found;
+                }
+            }
+        }
+        /*
+         * Even if we don't, we might get aspect ratio from extra CVT info
+         * or from the monitor size fields.  TODO.
+         */
     }
 
     /*
@@ -1132,41 +1146,42 @@ inferVirtualSize(ScrnInfoPtr scrp, DisplayModePtr modes, int *vx, int *vy)
      * before EDID 1.4, but right now we'll get that wrong. TODO.
      */
     if (!aspect) {
-	if (!mon->widthmm || !mon->heightmm)
-	    aspect = 4.0/3.0;
-	else
-	    aspect = (float)mon->widthmm / (float)mon->heightmm;
+        if (!mon->widthmm || !mon->heightmm)
+            aspect = 4.0 / 3.0;
+        else
+            aspect = (float) mon->widthmm / (float) mon->heightmm;
     }
 
     /* find the largest M_T_DRIVER mode with that aspect ratio */
     for (mode = modes; mode; mode = mode->next) {
-	float mode_aspect, metaspect;
-	if (!(mode->type & (M_T_DRIVER|M_T_USERDEF)))
-	    continue;
-	mode_aspect = (float)mode->HDisplay / (float)mode->VDisplay;
-	metaspect = aspect / mode_aspect;
-	/* 5% slop or so, since we only get size in centimeters */
-	if (fabs(1.0 - metaspect) < 0.05) {
-	    if ((mode->HDisplay > x) && (mode->VDisplay > y)) {
-		x = mode->HDisplay;
-		y = mode->VDisplay;
-	    }
-	}
+        float mode_aspect, metaspect;
+
+        if (!(mode->type & (M_T_DRIVER | M_T_USERDEF)))
+            continue;
+        mode_aspect = (float) mode->HDisplay / (float) mode->VDisplay;
+        metaspect = aspect / mode_aspect;
+        /* 5% slop or so, since we only get size in centimeters */
+        if (fabs(1.0 - metaspect) < 0.05) {
+            if ((mode->HDisplay > x) && (mode->VDisplay > y)) {
+                x = mode->HDisplay;
+                y = mode->VDisplay;
+            }
+        }
     }
 
     if (!x || !y) {
-	xf86DrvMsg(scrp->scrnIndex, X_WARNING,
-		   "Unable to estimate virtual size\n");
-	return 0;
+        xf86DrvMsg(scrp->scrnIndex, X_WARNING,
+                   "Unable to estimate virtual size\n");
+        return 0;
     }
 
-found:
+ found:
     *vx = x;
     *vy = y;
 
     xf86DrvMsg(scrp->scrnIndex, X_INFO,
-	       "Estimated virtual size for aspect ratio %.4f is %dx%d\n",
-	       aspect, *vx, *vy);
+               "Estimated virtual size for aspect ratio %.4f is %dx%d\n",
+               aspect, *vx, *vy);
 
     return 1;
 }
@@ -1177,8 +1192,7 @@ LCM(unsigned int x, unsigned int y)
 {
     unsigned int m = x, n = y, o;
 
-    while ((o = m % n))
-    {
+    while ((o = m % n)) {
         m = n;
         n = o;
     }
@@ -1193,14 +1207,12 @@ LCM(unsigned int x, unsigned int y)
  * cannot exist.
  */
 static int
-scanLineWidth(
-    unsigned int     xsize,         /* pixels */
-    unsigned int     ysize,         /* pixels */
-    unsigned int     width,         /* pixels */
-    unsigned long    BankSize,      /* char's */
-    PixmapFormatRec *pBankFormat,
-    unsigned int     nWidthUnit     /* bits */
-)
+scanLineWidth(unsigned int xsize,       /* pixels */
+              unsigned int ysize,       /* pixels */
+              unsigned int width,       /* pixels */
+              unsigned long BankSize,   /* char's */
+              PixmapFormatRec * pBankFormat, unsigned int nWidthUnit    /* bits */
+    )
 {
     unsigned long nBitsPerBank, nBitsPerScanline, nBitsPerScanlinePadUnit;
     unsigned long minBitsPerScanline, maxBitsPerScanline;
@@ -1223,7 +1235,7 @@ scanLineWidth(
     width = nBitsPerScanline / pBankFormat->bitsPerPixel;
 
     if (!xsize || !(nBitsPerBank % pBankFormat->bitsPerPixel))
-        return (int)width;
+        return (int) width;
 
     /*
      * Scanlines will be server-pad aligned at this point.  They will also be
@@ -1244,40 +1256,36 @@ scanLineWidth(
         return -1;
 
     if (ysize == 1)
-        return (int)width;
+        return (int) width;
 
     maxBitsPerScanline =
-        (((unsigned long)(-1) >> 1) - minBitsPerScanline) / (ysize - 1);
-    while (nBitsPerScanline <= maxBitsPerScanline)
-    {
+        (((unsigned long) (-1) >> 1) - minBitsPerScanline) / (ysize - 1);
+    while (nBitsPerScanline <= maxBitsPerScanline) {
         unsigned long BankBase, BankUnit;
 
         BankUnit = ((nBitsPerBank + nBitsPerScanline - 1) / nBitsPerBank) *
             nBitsPerBank;
         if (!(BankUnit % nBitsPerScanline))
-            return (int)width;
+            return (int) width;
 
-        for (BankBase = BankUnit;  ;  BankBase += nBitsPerBank)
-        {
+        for (BankBase = BankUnit;; BankBase += nBitsPerBank) {
             unsigned long x, y;
 
             y = BankBase / nBitsPerScanline;
             if (y >= ysize)
-                return (int)width;
+                return (int) width;
 
             x = BankBase % nBitsPerScanline;
             if (!(x % pBankFormat->bitsPerPixel))
                 continue;
 
-            if (x < minBitsPerScanline)
-            {
+            if (x < minBitsPerScanline) {
                 /*
                  * Skip ahead certain widths by dividing the excess scanline
                  * amongst the y's.
                  */
                 y *= nBitsPerScanlinePadUnit;
-                nBitsPerScanline +=
-                    ((x + y - 1) / y) * nBitsPerScanlinePadUnit;
+                nBitsPerScanline += ((x + y - 1) / y) * nBitsPerScanlinePadUnit;
                 width = nBitsPerScanline / pBankFormat->bitsPerPixel;
                 break;
             }
@@ -1286,10 +1294,10 @@ scanLineWidth(
                 continue;
 
             if (!(nBitsPerScanline % x))
-                return (int)width;
+                return (int) width;
 
             BankBase = ((nBitsPerScanline - minBitsPerScanline) /
-                (nBitsPerScanline - x)) * BankUnit;
+                        (nBitsPerScanline - x)) * BankUnit;
         }
     }
 
@@ -1346,17 +1354,17 @@ scanLineWidth(
 
 int
 xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
-		  char **modeNames, ClockRangePtr clockRanges,
-		  int *linePitches, int minPitch, int maxPitch, int pitchInc,
-		  int minHeight, int maxHeight, int virtualX, int virtualY,
-		  int apertureSize, LookupModeFlags strategy)
+                  char **modeNames, ClockRangePtr clockRanges,
+                  int *linePitches, int minPitch, int maxPitch, int pitchInc,
+                  int minHeight, int maxHeight, int virtualX, int virtualY,
+                  int apertureSize, LookupModeFlags strategy)
 {
     DisplayModePtr p, q, r, new, last, *endp;
     int i, numModes = 0;
     ModeStatus status;
     int linePitch = -1, virtX = 0, virtY = 0;
     int newLinePitch, newVirtX, newVirtY;
-    int modeSize;					/* in pixels */
+    int modeSize;               /* in pixels */
     Bool validateAllDefaultModes = FALSE;
     Bool userModes = FALSE;
     int saveType;
@@ -1368,30 +1376,29 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
     range vrefresh[MAX_VREFRESH];
     Bool inferred_virtual = FALSE;
 
-    DebugF("xf86ValidateModes(%p, %p, %p, %p,\n\t\t  %p, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x)\n",
-	   scrp, availModes, modeNames, clockRanges,
-	   linePitches, minPitch, maxPitch, pitchInc,
-	   minHeight, maxHeight, virtualX, virtualY,
-	   apertureSize, strategy
-	   );
+    DebugF
+        ("xf86ValidateModes(%p, %p, %p, %p,\n\t\t  %p, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x)\n",
+         scrp, availModes, modeNames, clockRanges, linePitches, minPitch,
+         maxPitch, pitchInc, minHeight, maxHeight, virtualX, virtualY,
+         apertureSize, strategy);
 
     /* Some sanity checking */
     if (scrp == NULL || scrp->name == NULL || !scrp->monitor ||
-	(!scrp->progClock && scrp->numClocks == 0)) {
-	ErrorF("xf86ValidateModes: called with invalid scrnInfoRec\n");
-	return -1;
+        (!scrp->progClock && scrp->numClocks == 0)) {
+        ErrorF("xf86ValidateModes: called with invalid scrnInfoRec\n");
+        return -1;
     }
     if (linePitches != NULL && linePitches[0] <= 0) {
-	ErrorF("xf86ValidateModes: called with invalid linePitches\n");
-	return -1;
+        ErrorF("xf86ValidateModes: called with invalid linePitches\n");
+        return -1;
     }
     if (pitchInc <= 0) {
-	ErrorF("xf86ValidateModes: called with invalid pitchInc\n");
-	return -1;
+        ErrorF("xf86ValidateModes: called with invalid pitchInc\n");
+        return -1;
     }
     if ((virtualX > 0) != (virtualY > 0)) {
-	ErrorF("xf86ValidateModes: called with invalid virtual resolution\n");
-	return -1;
+        ErrorF("xf86ValidateModes: called with invalid virtual resolution\n");
+        return -1;
     }
 
     /*
@@ -1399,83 +1406,87 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
      * in the monitor section.
      */
     if (strategy & LOOKUP_OPTIONAL_TOLERANCES) {
-	strategy &= ~LOOKUP_OPTIONAL_TOLERANCES;
-    } else {
-	const char *type = "";
+        strategy &= ~LOOKUP_OPTIONAL_TOLERANCES;
+    }
+    else {
+        const char *type = "";
         Bool specified = FALSE;
 
-	if (scrp->monitor->nHsync <= 0) {
-	    if (numTimings > 0) {
-		scrp->monitor->nHsync = numTimings;
-		for (i = 0; i < numTimings; i++) {
-		    scrp->monitor->hsync[i].lo = hsync[i].lo;
-		    scrp->monitor->hsync[i].hi = hsync[i].hi;
-		}
-	    } else {
-		scrp->monitor->hsync[0].lo = 31.5;
-		scrp->monitor->hsync[0].hi = 48.0;
-		scrp->monitor->nHsync = 1;
-	    }
-	    type = "default ";
-	} else {
+        if (scrp->monitor->nHsync <= 0) {
+            if (numTimings > 0) {
+                scrp->monitor->nHsync = numTimings;
+                for (i = 0; i < numTimings; i++) {
+                    scrp->monitor->hsync[i].lo = hsync[i].lo;
+                    scrp->monitor->hsync[i].hi = hsync[i].hi;
+                }
+            }
+            else {
+                scrp->monitor->hsync[0].lo = 31.5;
+                scrp->monitor->hsync[0].hi = 48.0;
+                scrp->monitor->nHsync = 1;
+            }
+            type = "default ";
+        }
+        else {
             specified = TRUE;
         }
-	for (i = 0; i < scrp->monitor->nHsync; i++) {
-	    if (scrp->monitor->hsync[i].lo == scrp->monitor->hsync[i].hi)
-	      xf86DrvMsg(scrp->scrnIndex, X_INFO,
-			 "%s: Using %shsync value of %.2f kHz\n",
-			 scrp->monitor->id, type,
-			 scrp->monitor->hsync[i].lo);
-	    else
-	      xf86DrvMsg(scrp->scrnIndex, X_INFO,
-			 "%s: Using %shsync range of %.2f-%.2f kHz\n",
-			 scrp->monitor->id, type,
-			 scrp->monitor->hsync[i].lo,
-			 scrp->monitor->hsync[i].hi);
-	}
-
-	type = "";
-	if (scrp->monitor->nVrefresh <= 0) {
-	    if (numTimings > 0) {
-		scrp->monitor->nVrefresh = numTimings;
-		for (i = 0; i < numTimings; i++) {
-		    scrp->monitor->vrefresh[i].lo = vrefresh[i].lo;
-		    scrp->monitor->vrefresh[i].hi = vrefresh[i].hi;
-		}
-	    } else {
-		scrp->monitor->vrefresh[0].lo = 50;
-		scrp->monitor->vrefresh[0].hi = 70;
-		scrp->monitor->nVrefresh = 1;
-	    }
-	    type = "default ";
-	} else {
+        for (i = 0; i < scrp->monitor->nHsync; i++) {
+            if (scrp->monitor->hsync[i].lo == scrp->monitor->hsync[i].hi)
+                xf86DrvMsg(scrp->scrnIndex, X_INFO,
+                           "%s: Using %shsync value of %.2f kHz\n",
+                           scrp->monitor->id, type, scrp->monitor->hsync[i].lo);
+            else
+                xf86DrvMsg(scrp->scrnIndex, X_INFO,
+                           "%s: Using %shsync range of %.2f-%.2f kHz\n",
+                           scrp->monitor->id, type,
+                           scrp->monitor->hsync[i].lo,
+                           scrp->monitor->hsync[i].hi);
+        }
+
+        type = "";
+        if (scrp->monitor->nVrefresh <= 0) {
+            if (numTimings > 0) {
+                scrp->monitor->nVrefresh = numTimings;
+                for (i = 0; i < numTimings; i++) {
+                    scrp->monitor->vrefresh[i].lo = vrefresh[i].lo;
+                    scrp->monitor->vrefresh[i].hi = vrefresh[i].hi;
+                }
+            }
+            else {
+                scrp->monitor->vrefresh[0].lo = 50;
+                scrp->monitor->vrefresh[0].hi = 70;
+                scrp->monitor->nVrefresh = 1;
+            }
+            type = "default ";
+        }
+        else {
             specified = TRUE;
         }
-	for (i = 0; i < scrp->monitor->nVrefresh; i++) {
-	    if (scrp->monitor->vrefresh[i].lo == scrp->monitor->vrefresh[i].hi)
-	      xf86DrvMsg(scrp->scrnIndex, X_INFO,
-			 "%s: Using %svrefresh value of %.2f Hz\n",
-			 scrp->monitor->id, type,
-			 scrp->monitor->vrefresh[i].lo);
-	    else
-	      xf86DrvMsg(scrp->scrnIndex, X_INFO,
-			 "%s: Using %svrefresh range of %.2f-%.2f Hz\n",
-			 scrp->monitor->id, type,
-			 scrp->monitor->vrefresh[i].lo,
-			 scrp->monitor->vrefresh[i].hi);
-	}
+        for (i = 0; i < scrp->monitor->nVrefresh; i++) {
+            if (scrp->monitor->vrefresh[i].lo == scrp->monitor->vrefresh[i].hi)
+                xf86DrvMsg(scrp->scrnIndex, X_INFO,
+                           "%s: Using %svrefresh value of %.2f Hz\n",
+                           scrp->monitor->id, type,
+                           scrp->monitor->vrefresh[i].lo);
+            else
+                xf86DrvMsg(scrp->scrnIndex, X_INFO,
+                           "%s: Using %svrefresh range of %.2f-%.2f Hz\n",
+                           scrp->monitor->id, type,
+                           scrp->monitor->vrefresh[i].lo,
+                           scrp->monitor->vrefresh[i].hi);
+        }
 
         type = "";
-	if (!scrp->monitor->maxPixClock && !specified) {
+        if (!scrp->monitor->maxPixClock && !specified) {
             type = "default ";
             scrp->monitor->maxPixClock = 65000.0;
         }
-	if (scrp->monitor->maxPixClock) {
-	    xf86DrvMsg(scrp->scrnIndex, X_INFO,
-		       "%s: Using %smaximum pixel clock of %.2f MHz\n",
-		       scrp->monitor->id, type,
-		       (float)scrp->monitor->maxPixClock / 1000.0);
-	}
+        if (scrp->monitor->maxPixClock) {
+            xf86DrvMsg(scrp->scrnIndex, X_INFO,
+                       "%s: Using %smaximum pixel clock of %.2f MHz\n",
+                       scrp->monitor->id, type,
+                       (float) scrp->monitor->maxPixClock / 1000.0);
+        }
     }
 
     /*
@@ -1483,24 +1494,24 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
      */
     storeClockRanges = scrp->clockRanges;
     while (storeClockRanges != NULL) {
-	storeClockRanges = storeClockRanges->next;
+        storeClockRanges = storeClockRanges->next;
     }
     for (cp = clockRanges; cp != NULL; cp = cp->next,
-	   	storeClockRanges = storeClockRanges->next) {
-	storeClockRanges = xnfalloc(sizeof(ClockRange));
-	if (scrp->clockRanges == NULL)
-	    scrp->clockRanges = storeClockRanges;
-	memcpy(storeClockRanges, cp, sizeof(ClockRange));
+         storeClockRanges = storeClockRanges->next) {
+        storeClockRanges = xnfalloc(sizeof(ClockRange));
+        if (scrp->clockRanges == NULL)
+            scrp->clockRanges = storeClockRanges;
+        memcpy(storeClockRanges, cp, sizeof(ClockRange));
     }
 
     /* Determine which pixmap format to pass to scanLineWidth() */
     if (scrp->depth > 4)
-	BankFormat = &scrp->fbFormat;
+        BankFormat = &scrp->fbFormat;
     else
-	BankFormat = xf86GetPixFormat(scrp, 1);	/* >not< scrp->depth! */
+        BankFormat = xf86GetPixFormat(scrp, 1); /* >not< scrp->depth! */
 
     if (scrp->xInc <= 0)
-        scrp->xInc = 8;		/* Suitable for VGA and others */
+        scrp->xInc = 8;         /* Suitable for VGA and others */
 
 #define _VIRTUALX(x) ((((x) + scrp->xInc - 1) / scrp->xInc) * scrp->xInc)
 
@@ -1510,13 +1521,13 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
      * maxPitch values passed are ignored.
      */
     if (linePitches) {
-	minPitch = maxPitch = linePitches[0];
-	for (i = 1; linePitches[i] > 0; i++) {
-	    if (linePitches[i] > maxPitch)
-		maxPitch = linePitches[i];
-	    if (linePitches[i] < minPitch)
-		minPitch = linePitches[i];
-	}
+        minPitch = maxPitch = linePitches[0];
+        for (i = 1; linePitches[i] > 0; i++) {
+            if (linePitches[i] > maxPitch)
+                maxPitch = linePitches[i];
+            if (linePitches[i] < minPitch)
+                minPitch = linePitches[i];
+        }
     }
 
     /* Initial check of virtual size against other constraints */
@@ -1525,60 +1536,62 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
      * Initialise virtX and virtY if the values are fixed.
      */
     if (virtualY > 0) {
-	if (maxHeight > 0 && virtualY > maxHeight) {
-	    xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-		       "Virtual height (%d) is too large for the hardware "
-		       "(max %d)\n", virtualY, maxHeight);
-	    return -1;
-	}
-
-	if (minHeight > 0 && virtualY < minHeight) {
-	    xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-		       "Virtual height (%d) is too small for the hardware "
-		       "(min %d)\n", virtualY, minHeight);
-	    return -1;
-	}
-
-	virtualX = _VIRTUALX(virtualX);
-	if (linePitches != NULL) {
-	    for (i = 0; linePitches[i] != 0; i++) {
-		if ((linePitches[i] >= virtualX) &&
-		    (linePitches[i] ==
-		     scanLineWidth(virtualX, virtualY, linePitches[i],
-				   apertureSize, BankFormat, pitchInc))) {
-		    linePitch = linePitches[i];
-		    break;
-		}
-	    }
-	} else {
-	    linePitch = scanLineWidth(virtualX, virtualY, minPitch,
-				      apertureSize, BankFormat, pitchInc);
-	}
-
-	if ((linePitch < minPitch) || (linePitch > maxPitch)) {
-	    xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-		       "Virtual width (%d) is too large for the hardware "
-		       "(max %d)\n", virtualX, maxPitch);
-	    return -1;
-	}
-
-	if (!xf86CheckModeSize(scrp, linePitch, virtualX, virtualY)) {
-	    xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-		      "Virtual size (%dx%d) (pitch %d) exceeds video memory\n",
-		      virtualX, virtualY, linePitch);
-	    return -1;
-	}
-
-	virtX = virtualX;
-	virtY = virtualY;
-	scrp->virtualFrom = X_CONFIG;
-    } else if (!modeNames || !*modeNames) {
-	/* No virtual size given in the config, try to infer */
-	/* XXX this doesn't take m{in,ax}Pitch into account; oh well */
-	inferred_virtual = inferVirtualSize(scrp, availModes, &virtX, &virtY);
-	if (inferred_virtual)
-	    linePitch = scanLineWidth(virtX, virtY, minPitch, apertureSize,
-				      BankFormat, pitchInc);
+        if (maxHeight > 0 && virtualY > maxHeight) {
+            xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                       "Virtual height (%d) is too large for the hardware "
+                       "(max %d)\n", virtualY, maxHeight);
+            return -1;
+        }
+
+        if (minHeight > 0 && virtualY < minHeight) {
+            xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                       "Virtual height (%d) is too small for the hardware "
+                       "(min %d)\n", virtualY, minHeight);
+            return -1;
+        }
+
+        virtualX = _VIRTUALX(virtualX);
+        if (linePitches != NULL) {
+            for (i = 0; linePitches[i] != 0; i++) {
+                if ((linePitches[i] >= virtualX) &&
+                    (linePitches[i] ==
+                     scanLineWidth(virtualX, virtualY, linePitches[i],
+                                   apertureSize, BankFormat, pitchInc))) {
+                    linePitch = linePitches[i];
+                    break;
+                }
+            }
+        }
+        else {
+            linePitch = scanLineWidth(virtualX, virtualY, minPitch,
+                                      apertureSize, BankFormat, pitchInc);
+        }
+
+        if ((linePitch < minPitch) || (linePitch > maxPitch)) {
+            xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                       "Virtual width (%d) is too large for the hardware "
+                       "(max %d)\n", virtualX, maxPitch);
+            return -1;
+        }
+
+        if (!xf86CheckModeSize(scrp, linePitch, virtualX, virtualY)) {
+            xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                       "Virtual size (%dx%d) (pitch %d) exceeds video memory\n",
+                       virtualX, virtualY, linePitch);
+            return -1;
+        }
+
+        virtX = virtualX;
+        virtY = virtualY;
+        scrp->virtualFrom = X_CONFIG;
+    }
+    else if (!modeNames || !*modeNames) {
+        /* No virtual size given in the config, try to infer */
+        /* XXX this doesn't take m{in,ax}Pitch into account; oh well */
+        inferred_virtual = inferVirtualSize(scrp, availModes, &virtX, &virtY);
+        if (inferred_virtual)
+            linePitch = scanLineWidth(virtX, virtY, minPitch, apertureSize,
+                                      BankFormat, pitchInc);
     }
 
     /* Print clock ranges and scaled clocks */
@@ -1591,253 +1604,256 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
      * member of the scrp->modes list for which a match was considered.
      */
     if (scrp->modePool == NULL) {
-	q = NULL;
-	for (p = availModes; p != NULL; p = p->next) {
-	    status = xf86InitialCheckModeForDriver(scrp, p, clockRanges,
-						   strategy, maxPitch,
-						   virtX, virtY);
-
-	    if (status == MODE_OK) {
-		status = xf86CheckModeForMonitor(p, scrp->monitor);
-	    }
-	    
-	    if (status == MODE_OK) {
-		new = xnfalloc(sizeof(DisplayModeRec));
-		*new = *p;
-		new->next = NULL;
-		if (!q) {
-		    scrp->modePool = new;
-		} else {
-		    q->next = new;
-		}
-		new->prev = NULL;
-		q = new;
-		q->name = xnfstrdup(p->name);
-	        q->status = MODE_OK;
-	    } else {
-		printModeRejectMessage(scrp->scrnIndex, p, status);
-	    }
-	}
-
-	if (scrp->modePool == NULL) {
-	    xf86DrvMsg(scrp->scrnIndex, X_WARNING, "Mode pool is empty\n");
-	    return 0;
-	}
-    } else {
-	for (p = scrp->modePool; p != NULL; p = p->next) {
-	    p->prev = NULL;
-	    p->status = MODE_OK;
-	}
+        q = NULL;
+        for (p = availModes; p != NULL; p = p->next) {
+            status = xf86InitialCheckModeForDriver(scrp, p, clockRanges,
+                                                   strategy, maxPitch,
+                                                   virtX, virtY);
+
+            if (status == MODE_OK) {
+                status = xf86CheckModeForMonitor(p, scrp->monitor);
+            }
+
+            if (status == MODE_OK) {
+                new = xnfalloc(sizeof(DisplayModeRec));
+                *new = *p;
+                new->next = NULL;
+                if (!q) {
+                    scrp->modePool = new;
+                }
+                else {
+                    q->next = new;
+                }
+                new->prev = NULL;
+                q = new;
+                q->name = xnfstrdup(p->name);
+                q->status = MODE_OK;
+            }
+            else {
+                printModeRejectMessage(scrp->scrnIndex, p, status);
+            }
+        }
+
+        if (scrp->modePool == NULL) {
+            xf86DrvMsg(scrp->scrnIndex, X_WARNING, "Mode pool is empty\n");
+            return 0;
+        }
+    }
+    else {
+        for (p = scrp->modePool; p != NULL; p = p->next) {
+            p->prev = NULL;
+            p->status = MODE_OK;
+        }
     }
 
     /*
      * Allocate one entry in scrp->modes for each named mode.
      */
     while (scrp->modes)
-	xf86DeleteMode(&scrp->modes, scrp->modes);
+        xf86DeleteMode(&scrp->modes, scrp->modes);
     endp = &scrp->modes;
     last = NULL;
     if (modeNames != NULL) {
-	for (i = 0; modeNames[i] != NULL; i++) {
-	    userModes = TRUE;
-	    new = xnfcalloc(1, sizeof(DisplayModeRec));
-	    new->prev = last;
-	    new->type = M_T_USERDEF;
-	    new->name = xnfstrdup(modeNames[i]);
-	    if (new->prev)
-		new->prev->next = new;
-	    *endp = last = new;
-	    endp = &new->next;
-	}
+        for (i = 0; modeNames[i] != NULL; i++) {
+            userModes = TRUE;
+            new = xnfcalloc(1, sizeof(DisplayModeRec));
+            new->prev = last;
+            new->type = M_T_USERDEF;
+            new->name = xnfstrdup(modeNames[i]);
+            if (new->prev)
+                new->prev->next = new;
+            *endp = last = new;
+            endp = &new->next;
+        }
     }
 
     /* Lookup each mode */
 #ifdef RANDR
-    if (!xf86Info.disableRandR	
+    if (!xf86Info.disableRandR
 #ifdef PANORAMIX
-	&& noPanoramiXExtension
+        && noPanoramiXExtension
 #endif
-	)
-	validateAllDefaultModes = TRUE;
+        )
+        validateAllDefaultModes = TRUE;
 #endif
 
-    for (p = scrp->modes; ; p = p->next) {
-	Bool repeat;
-
-	/*
-	 * If the supplied mode names don't produce a valid mode, scan through
-	 * unconsidered modePool members until one survives validation.  This
-	 * is done in decreasing order by mode pixel area.
-	 */
-
-	if (p == NULL) {
-	    if ((numModes > 0) && !validateAllDefaultModes)
-		break;
-
-	    validateAllDefaultModes = TRUE;
-	    r = NULL;
-	    modeSize = 0;
-	    for (q = scrp->modePool;  q != NULL;  q = q->next) {
-		if ((q->prev == NULL) && (q->status == MODE_OK)) {
-		    /*
-		     * Deal with the case where this mode wasn't considered
-		     * because of a builtin mode of the same name.
-		     */
-		    for (p = scrp->modes; p != NULL; p = p->next) {
-			if ((p->status != MODE_OK) &&
-			    !strcmp(p->name, q->name))
-			    break;
-		    }
-
-		    if (p != NULL)
-			q->prev = p;
-		    else {
-			/*
-			 * A quick check to not allow default modes with
-			 * horizontal timing parameters that CRTs may have
-			 * problems with.
-			 */
-			if (!scrp->monitor->reducedblanking &&
-			    (q->type & M_T_DEFAULT) &&
-			    ((double)q->HTotal / (double)q->HDisplay) < 1.15)
-			    continue;
-
-			if (modeSize < (q->HDisplay * q->VDisplay)) {
-			    r = q;
-			    modeSize = q->HDisplay * q->VDisplay;
-			}
-		    }
-		}
-	    }
-
-	    if (r == NULL)
-		break;
-
-	    p = xnfcalloc(1, sizeof(DisplayModeRec));
-	    p->prev = last;
-	    p->name = xnfstrdup(r->name);
-	    if (!userModes)
-		p->type = M_T_USERDEF;
-	    if (p->prev)
-		p->prev->next = p;
-	    *endp = last = p;
-	    endp = &p->next;
-	}
-
-	repeat = FALSE;
-    lookupNext:
-	if (repeat && ((status = p->status) != MODE_OK))
-	    printModeRejectMessage(scrp->scrnIndex, p, status);
-	saveType = p->type;
-	status = xf86LookupMode(scrp, p, clockRanges, strategy);
-	if (repeat && status == MODE_NOMODE)
-	    continue;
-	if (status != MODE_OK)
-	    printModeRejectMessage(scrp->scrnIndex, p, status);
-	if (status == MODE_ERROR) {
-	    ErrorF("xf86ValidateModes: "
-		   "unexpected result from xf86LookupMode()\n");
-	    return -1;
-	}
-	if (status != MODE_OK) {
-	    if (p->status == MODE_OK)
-		p->status = status;
-	    continue;
-	}
-	p->type |= saveType;
-	repeat = TRUE;
-
-	newLinePitch = linePitch;
-	newVirtX = virtX;
-	newVirtY = virtY;
-
-	/*
-	 * Don't let non-user defined modes increase the virtual size
-	 */
-	if (!(p->type & M_T_USERDEF) && (numModes > 0)) {
-	    if (p->HDisplay > virtX) {
-		p->status = MODE_VIRTUAL_X;
-		goto lookupNext;
-	    }
-	    if (p->VDisplay > virtY) {
-		p->status = MODE_VIRTUAL_Y;
-		goto lookupNext;
-	    }
-	}
-	/*
-	 * Adjust virtual width and height if the mode is too large for the
-	 * current values and if they are not fixed.
-	 */
-	if (virtualX <= 0 && p->HDisplay > newVirtX)
-	    newVirtX = _VIRTUALX(p->HDisplay);
-	if (virtualY <= 0 && p->VDisplay > newVirtY) {
-	    if (maxHeight > 0 && p->VDisplay > maxHeight) {
-		p->status = MODE_VIRTUAL_Y;	/* ? */
-		goto lookupNext;
-	    }
-	    newVirtY = p->VDisplay;
-	}
-
-	/*
-	 * If virtual resolution is to be increased, revalidate it.
-	 */
-	if ((virtX != newVirtX) || (virtY != newVirtY)) {
-	    if (linePitches != NULL) {
-		newLinePitch = -1;
-		for (i = 0; linePitches[i] != 0; i++) {
-		    if ((linePitches[i] >= newVirtX) &&
-			(linePitches[i] >= linePitch) &&
-			(linePitches[i] ==
-			 scanLineWidth(newVirtX, newVirtY, linePitches[i],
-				       apertureSize, BankFormat, pitchInc))) {
-			newLinePitch = linePitches[i];
-			break;
-		    }
-		}
-	    } else {
-		if (linePitch < minPitch)
-		    linePitch = minPitch;
-		newLinePitch = scanLineWidth(newVirtX, newVirtY, linePitch,
-					     apertureSize, BankFormat,
-					     pitchInc);
-	    }
-	    if ((newLinePitch < minPitch) || (newLinePitch > maxPitch)) {
-		p->status = MODE_BAD_WIDTH;
-		goto lookupNext;
-	    }
-
-	    /*
-	     * Check that the pixel area required by the new virtual height
-	     * and line pitch isn't too large.
-	     */
-	    if (!xf86CheckModeSize(scrp, newLinePitch, newVirtX, newVirtY)) {
-		p->status = MODE_MEM_VIRT;
-		goto lookupNext;
-	    }
-	}
-
-	if (scrp->ValidMode) {
-	    /*
-	     * Give the driver a final say, passing it the proposed virtual
-	     * geometry.
-	     */
-	    scrp->virtualX = newVirtX;
-	    scrp->virtualY = newVirtY;
-	    scrp->displayWidth = newLinePitch;
-	    p->status = (scrp->ValidMode)(scrp->scrnIndex, p, FALSE,
-					  MODECHECK_FINAL);
-
-	    if (p->status != MODE_OK) {
-	        goto lookupNext;
-	    }
-	}
-
-	/* Mode has passed all the tests */
-	virtX = newVirtX;
-	virtY = newVirtY;
-	linePitch = newLinePitch;
-	p->status = MODE_OK;
-	numModes++;
+    for (p = scrp->modes;; p = p->next) {
+        Bool repeat;
+
+        /*
+         * If the supplied mode names don't produce a valid mode, scan through
+         * unconsidered modePool members until one survives validation.  This
+         * is done in decreasing order by mode pixel area.
+         */
+
+        if (p == NULL) {
+            if ((numModes > 0) && !validateAllDefaultModes)
+                break;
+
+            validateAllDefaultModes = TRUE;
+            r = NULL;
+            modeSize = 0;
+            for (q = scrp->modePool; q != NULL; q = q->next) {
+                if ((q->prev == NULL) && (q->status == MODE_OK)) {
+                    /*
+                     * Deal with the case where this mode wasn't considered
+                     * because of a builtin mode of the same name.
+                     */
+                    for (p = scrp->modes; p != NULL; p = p->next) {
+                        if ((p->status != MODE_OK) && !strcmp(p->name, q->name))
+                            break;
+                    }
+
+                    if (p != NULL)
+                        q->prev = p;
+                    else {
+                        /*
+                         * A quick check to not allow default modes with
+                         * horizontal timing parameters that CRTs may have
+                         * problems with.
+                         */
+                        if (!scrp->monitor->reducedblanking &&
+                            (q->type & M_T_DEFAULT) &&
+                            ((double) q->HTotal / (double) q->HDisplay) < 1.15)
+                            continue;
+
+                        if (modeSize < (q->HDisplay * q->VDisplay)) {
+                            r = q;
+                            modeSize = q->HDisplay * q->VDisplay;
+                        }
+                    }
+                }
+            }
+
+            if (r == NULL)
+                break;
+
+            p = xnfcalloc(1, sizeof(DisplayModeRec));
+            p->prev = last;
+            p->name = xnfstrdup(r->name);
+            if (!userModes)
+                p->type = M_T_USERDEF;
+            if (p->prev)
+                p->prev->next = p;
+            *endp = last = p;
+            endp = &p->next;
+        }
+
+        repeat = FALSE;
+ lookupNext:
+        if (repeat && ((status = p->status) != MODE_OK))
+            printModeRejectMessage(scrp->scrnIndex, p, status);
+        saveType = p->type;
+        status = xf86LookupMode(scrp, p, clockRanges, strategy);
+        if (repeat && status == MODE_NOMODE)
+            continue;
+        if (status != MODE_OK)
+            printModeRejectMessage(scrp->scrnIndex, p, status);
+        if (status == MODE_ERROR) {
+            ErrorF("xf86ValidateModes: "
+                   "unexpected result from xf86LookupMode()\n");
+            return -1;
+        }
+        if (status != MODE_OK) {
+            if (p->status == MODE_OK)
+                p->status = status;
+            continue;
+        }
+        p->type |= saveType;
+        repeat = TRUE;
+
+        newLinePitch = linePitch;
+        newVirtX = virtX;
+        newVirtY = virtY;
+
+        /*
+         * Don't let non-user defined modes increase the virtual size
+         */
+        if (!(p->type & M_T_USERDEF) && (numModes > 0)) {
+            if (p->HDisplay > virtX) {
+                p->status = MODE_VIRTUAL_X;
+                goto lookupNext;
+            }
+            if (p->VDisplay > virtY) {
+                p->status = MODE_VIRTUAL_Y;
+                goto lookupNext;
+            }
+        }
+        /*
+         * Adjust virtual width and height if the mode is too large for the
+         * current values and if they are not fixed.
+         */
+        if (virtualX <= 0 && p->HDisplay > newVirtX)
+            newVirtX = _VIRTUALX(p->HDisplay);
+        if (virtualY <= 0 && p->VDisplay > newVirtY) {
+            if (maxHeight > 0 && p->VDisplay > maxHeight) {
+                p->status = MODE_VIRTUAL_Y;     /* ? */
+                goto lookupNext;
+            }
+            newVirtY = p->VDisplay;
+        }
+
+        /*
+         * If virtual resolution is to be increased, revalidate it.
+         */
+        if ((virtX != newVirtX) || (virtY != newVirtY)) {
+            if (linePitches != NULL) {
+                newLinePitch = -1;
+                for (i = 0; linePitches[i] != 0; i++) {
+                    if ((linePitches[i] >= newVirtX) &&
+                        (linePitches[i] >= linePitch) &&
+                        (linePitches[i] ==
+                         scanLineWidth(newVirtX, newVirtY, linePitches[i],
+                                       apertureSize, BankFormat, pitchInc))) {
+                        newLinePitch = linePitches[i];
+                        break;
+                    }
+                }
+            }
+            else {
+                if (linePitch < minPitch)
+                    linePitch = minPitch;
+                newLinePitch = scanLineWidth(newVirtX, newVirtY, linePitch,
+                                             apertureSize, BankFormat,
+                                             pitchInc);
+            }
+            if ((newLinePitch < minPitch) || (newLinePitch > maxPitch)) {
+                p->status = MODE_BAD_WIDTH;
+                goto lookupNext;
+            }
+
+            /*
+             * Check that the pixel area required by the new virtual height
+             * and line pitch isn't too large.
+             */
+            if (!xf86CheckModeSize(scrp, newLinePitch, newVirtX, newVirtY)) {
+                p->status = MODE_MEM_VIRT;
+                goto lookupNext;
+            }
+        }
+
+        if (scrp->ValidMode) {
+            /*
+             * Give the driver a final say, passing it the proposed virtual
+             * geometry.
+             */
+            scrp->virtualX = newVirtX;
+            scrp->virtualY = newVirtY;
+            scrp->displayWidth = newLinePitch;
+            p->status = (scrp->ValidMode) (scrp->scrnIndex, p, FALSE,
+                                           MODECHECK_FINAL);
+
+            if (p->status != MODE_OK) {
+                goto lookupNext;
+            }
+        }
+
+        /* Mode has passed all the tests */
+        virtX = newVirtX;
+        virtY = newVirtY;
+        linePitch = newLinePitch;
+        p->status = MODE_OK;
+        numModes++;
     }
 
     /*
@@ -1846,102 +1862,105 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
      * fix up if so.
      */
     if (inferred_virtual) {
-	int vx = 0, vy = 0;
-	for (p = scrp->modes; p; p = p->next) {
-	    if (p->HDisplay > vx && p->VDisplay > vy) {
-		vx = p->HDisplay;
-		vy = p->VDisplay;
-	    }
-	}
-	if (vx < virtX || vy < virtY) {
-	    const int types[] = {
-		M_T_BUILTIN | M_T_PREFERRED,
-		M_T_BUILTIN,
-		M_T_DRIVER | M_T_PREFERRED,
-		M_T_DRIVER,
-		0
-	    };
-	    const int ntypes = sizeof(types) / sizeof(int);
-	    int n;
-
-	    /* 
-	     * We did not find the estimated virtual size. So now we want to 
-	     * find the largest mode available, but we want to search in the
-	     * modes in the order of "types" listed above.
-	     */
-	    for (n = 0; n < ntypes; n++) {
-		int type = types[n];
-
-		vx = 0; vy = 0;
-		for (p = scrp->modes; p; p = p->next) {
-		    /* scan through the modes in the sort order above */
-		    if ((p->type & type) != type)
-			continue;
-		    if (p->HDisplay > vx && p->VDisplay > vy) {
-			vx = p->HDisplay;
-			vy = p->VDisplay;
-		    }
-		}
-		if (vx && vy)
-		    /* Found one */
-		    break;
-	    }
-	    xf86DrvMsg(scrp->scrnIndex, X_WARNING,
-		       "Shrinking virtual size estimate from %dx%d to %dx%d\n",
-		       virtX, virtY, vx, vy);
-	    virtX = _VIRTUALX(vx);
-	    virtY = vy;
-	    for (p = scrp->modes; p; p = p->next) {
-		if (numModes > 0) {
-		    if (p->HDisplay > virtX)
-			p->status = MODE_VIRTUAL_X;
-		    if (p->VDisplay > virtY)
-			p->status = MODE_VIRTUAL_Y;
-		    if (p->status != MODE_OK) {
-			numModes--;
-			printModeRejectMessage(scrp->scrnIndex, p, p->status);
-		    }
-		}
-	    }
-	    if (linePitches != NULL) {
-		for (i = 0; linePitches[i] != 0; i++) {
-		    if ((linePitches[i] >= virtX) &&
-			(linePitches[i] ==
-			scanLineWidth(virtX, virtY, linePitches[i],
-				      apertureSize, BankFormat, pitchInc))) {
-			linePitch = linePitches[i];
-			break;
-		    }
-		}
-	    } else {
-		linePitch = scanLineWidth(virtX, virtY, minPitch,
-					  apertureSize, BankFormat, pitchInc);
-	    }
-	}
+        int vx = 0, vy = 0;
+
+        for (p = scrp->modes; p; p = p->next) {
+            if (p->HDisplay > vx && p->VDisplay > vy) {
+                vx = p->HDisplay;
+                vy = p->VDisplay;
+            }
+        }
+        if (vx < virtX || vy < virtY) {
+            const int types[] = {
+                M_T_BUILTIN | M_T_PREFERRED,
+                M_T_BUILTIN,
+                M_T_DRIVER | M_T_PREFERRED,
+                M_T_DRIVER,
+                0
+            };
+            const int ntypes = sizeof(types) / sizeof(int);
+            int n;
+
+            /* 
+             * We did not find the estimated virtual size. So now we want to 
+             * find the largest mode available, but we want to search in the
+             * modes in the order of "types" listed above.
+             */
+            for (n = 0; n < ntypes; n++) {
+                int type = types[n];
+
+                vx = 0;
+                vy = 0;
+                for (p = scrp->modes; p; p = p->next) {
+                    /* scan through the modes in the sort order above */
+                    if ((p->type & type) != type)
+                        continue;
+                    if (p->HDisplay > vx && p->VDisplay > vy) {
+                        vx = p->HDisplay;
+                        vy = p->VDisplay;
+                    }
+                }
+                if (vx && vy)
+                    /* Found one */
+                    break;
+            }
+            xf86DrvMsg(scrp->scrnIndex, X_WARNING,
+                       "Shrinking virtual size estimate from %dx%d to %dx%d\n",
+                       virtX, virtY, vx, vy);
+            virtX = _VIRTUALX(vx);
+            virtY = vy;
+            for (p = scrp->modes; p; p = p->next) {
+                if (numModes > 0) {
+                    if (p->HDisplay > virtX)
+                        p->status = MODE_VIRTUAL_X;
+                    if (p->VDisplay > virtY)
+                        p->status = MODE_VIRTUAL_Y;
+                    if (p->status != MODE_OK) {
+                        numModes--;
+                        printModeRejectMessage(scrp->scrnIndex, p, p->status);
+                    }
+                }
+            }
+            if (linePitches != NULL) {
+                for (i = 0; linePitches[i] != 0; i++) {
+                    if ((linePitches[i] >= virtX) &&
+                        (linePitches[i] ==
+                         scanLineWidth(virtX, virtY, linePitches[i],
+                                       apertureSize, BankFormat, pitchInc))) {
+                        linePitch = linePitches[i];
+                        break;
+                    }
+                }
+            }
+            else {
+                linePitch = scanLineWidth(virtX, virtY, minPitch,
+                                          apertureSize, BankFormat, pitchInc);
+            }
+        }
     }
 
     /* Update the ScrnInfoRec parameters */
-    
+
     scrp->virtualX = virtX;
     scrp->virtualY = virtY;
     scrp->displayWidth = linePitch;
 
     if (numModes <= 0)
-	return 0;
-    
+        return 0;
+
     /* Make the mode list into a circular list by joining up the ends */
     p = scrp->modes;
     while (p->next != NULL)
-	p = p->next;
+        p = p->next;
     /* p is now the last mode on the list */
     p->next = scrp->modes;
     scrp->modes->prev = p;
 
     if (minHeight > 0 && virtY < minHeight) {
-	xf86DrvMsg(scrp->scrnIndex, X_ERROR,
-		   "Virtual height (%d) is too small for the hardware "
-		   "(min %d)\n", virtY, minHeight);
-	return -1;
+        xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+                   "Virtual height (%d) is too small for the hardware "
+                   "(min %d)\n", virtY, minHeight);
+        return -1;
     }
 
     return numModes;
@@ -1959,26 +1978,27 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
  *  - doubly linked circular lists
  *
  */
- 
+
 void
-xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode)
+xf86DeleteMode(DisplayModePtr * modeList, DisplayModePtr mode)
 {
     /* Catch the easy/insane cases */
     if (modeList == NULL || *modeList == NULL || mode == NULL)
-	return;
+        return;
 
     /* If the mode is at the start of the list, move the start of the list */
     if (*modeList == mode)
-	*modeList = mode->next;
+        *modeList = mode->next;
 
     /* If mode is the only one on the list, set the list to NULL */
     if ((mode == mode->prev) && (mode == mode->next)) {
-	*modeList = NULL;
-    } else {
-	if ((mode->prev != NULL) && (mode->prev->next == mode))
-	    mode->prev->next = mode->next;
-	if ((mode->next != NULL) && (mode->next->prev == mode))
-	    mode->next->prev = mode->prev;
+        *modeList = NULL;
+    }
+    else {
+        if ((mode->prev != NULL) && (mode->prev->next == mode))
+            mode->prev->next = mode->next;
+        if ((mode->next != NULL) && (mode->next->prev == mode))
+            mode->next->prev = mode->prev;
     }
 
     free(mode->name);
@@ -1999,32 +2019,31 @@ xf86PruneDriverModes(ScrnInfoPtr scrp)
 
     p = scrp->modes;
     if (p == NULL)
-	return;
+        return;
 
     do {
-	if (!(first = scrp->modes))
-	    return;
-	n = p->next;
-	if (p->status != MODE_OK) {
-	    xf86DeleteMode(&(scrp->modes), p);
-	}
-	p = n;
+        if (!(first = scrp->modes))
+            return;
+        n = p->next;
+        if (p->status != MODE_OK) {
+            xf86DeleteMode(&(scrp->modes), p);
+        }
+        p = n;
     } while (p != NULL && p != first);
 
     /* modePool is no longer needed, turf it */
     while (scrp->modePool) {
-	/*
-	 * A modePool mode's prev field is used to hold a pointer to the
-	 * member of the scrp->modes list for which a match was considered.
-	 * Clear that pointer first, otherwise xf86DeleteMode might get 
-	 * confused 
-	 */
-	scrp->modePool->prev = NULL;
-	xf86DeleteMode(&scrp->modePool, scrp->modePool);
+        /*
+         * A modePool mode's prev field is used to hold a pointer to the
+         * member of the scrp->modes list for which a match was considered.
+         * Clear that pointer first, otherwise xf86DeleteMode might get 
+         * confused 
+         */
+        scrp->modePool->prev = NULL;
+        xf86DeleteMode(&scrp->modePool, scrp->modePool);
     }
 }
 
-
 /*
  * xf86SetCrtcForModes
  *
@@ -2045,18 +2064,18 @@ xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags)
 
     p = scrp->modes;
     if (p == NULL)
-	return;
+        return;
 
     do {
-	xf86SetModeCrtc(p, adjustFlags);
-	DebugF("%sMode %s: %d (%d) %d %d (%d) %d %d (%d) %d %d (%d) %d\n",
-	       (p->type & M_T_DEFAULT) ? "Default " : "",
-	       p->name, p->CrtcHDisplay, p->CrtcHBlankStart,
-	       p->CrtcHSyncStart, p->CrtcHSyncEnd, p->CrtcHBlankEnd,
-	       p->CrtcHTotal, p->CrtcVDisplay, p->CrtcVBlankStart,
-	       p->CrtcVSyncStart, p->CrtcVSyncEnd, p->CrtcVBlankEnd,
-	       p->CrtcVTotal);
-	p = p->next;
+        xf86SetModeCrtc(p, adjustFlags);
+        DebugF("%sMode %s: %d (%d) %d %d (%d) %d %d (%d) %d %d (%d) %d\n",
+               (p->type & M_T_DEFAULT) ? "Default " : "",
+               p->name, p->CrtcHDisplay, p->CrtcHBlankStart,
+               p->CrtcHSyncStart, p->CrtcHSyncEnd, p->CrtcHBlankEnd,
+               p->CrtcHTotal, p->CrtcVDisplay, p->CrtcVBlankStart,
+               p->CrtcVSyncStart, p->CrtcVSyncEnd, p->CrtcVBlankEnd,
+               p->CrtcVTotal);
+        p = p->next;
     } while (p != NULL && p != scrp->modes);
 }
 
@@ -2068,63 +2087,65 @@ xf86PrintModes(ScrnInfoPtr scrp)
     const char *desc, *desc2, *prefix, *uprefix;
 
     if (scrp == NULL)
-	return;
+        return;
 
     xf86DrvMsg(scrp->scrnIndex, scrp->virtualFrom, "Virtual size is %dx%d "
-	       "(pitch %d)\n", scrp->virtualX, scrp->virtualY,
-	       scrp->displayWidth);
-    
+               "(pitch %d)\n", scrp->virtualX, scrp->virtualY,
+               scrp->displayWidth);
+
     p = scrp->modes;
     if (p == NULL)
-	return;
+        return;
 
     do {
-	desc = desc2 = "";
-	hsync = xf86ModeHSync(p);
-	refresh = xf86ModeVRefresh(p);
-	if (p->Flags & V_INTERLACE) {
-	    desc = " (I)";
-	}
-	if (p->Flags & V_DBLSCAN) {
-	    desc = " (D)";
-	}
-	if (p->VScan > 1) {
-	    desc2 = " (VScan)";
-	}
-	if (p->type & M_T_BUILTIN)
-	    prefix = "Built-in mode";
-	else if (p->type & M_T_DEFAULT)
-	    prefix = "Default mode";
-	else if (p->type & M_T_DRIVER)
-	    prefix = "Driver mode";
-	else
-	    prefix = "Mode";
-	if (p->type & M_T_USERDEF)
-	    uprefix = "*";
-	else
-	    uprefix = " ";
-	if (hsync == 0 || refresh == 0) {
-	    if (p->name)
-		xf86DrvMsg(scrp->scrnIndex, X_CONFIG,
-			   "%s%s \"%s\"\n", uprefix, prefix, p->name);
-	    else
-		xf86DrvMsg(scrp->scrnIndex, X_PROBED,
-			   "%s%s %dx%d (unnamed)\n",
-			   uprefix, prefix, p->HDisplay, p->VDisplay);
-	} else if (p->Clock == p->SynthClock) {
-	    xf86DrvMsg(scrp->scrnIndex, X_CONFIG,
-			"%s%s \"%s\": %.1f MHz, %.1f kHz, %.1f Hz%s%s\n",
-			uprefix, prefix, p->name, p->Clock / 1000.0,
-			hsync, refresh, desc, desc2);
-	} else {
-	    xf86DrvMsg(scrp->scrnIndex, X_CONFIG,
-			"%s%s \"%s\": %.1f MHz (scaled from %.1f MHz), "
-			"%.1f kHz, %.1f Hz%s%s\n",
-			uprefix, prefix, p->name, p->Clock / 1000.0,
-			p->SynthClock / 1000.0, hsync, refresh, desc, desc2);
-	}
-	if (hsync != 0 && refresh != 0)
-	    xf86PrintModeline(scrp->scrnIndex,p);
-	p = p->next;
+        desc = desc2 = "";
+        hsync = xf86ModeHSync(p);
+        refresh = xf86ModeVRefresh(p);
+        if (p->Flags & V_INTERLACE) {
+            desc = " (I)";
+        }
+        if (p->Flags & V_DBLSCAN) {
+            desc = " (D)";
+        }
+        if (p->VScan > 1) {
+            desc2 = " (VScan)";
+        }
+        if (p->type & M_T_BUILTIN)
+            prefix = "Built-in mode";
+        else if (p->type & M_T_DEFAULT)
+            prefix = "Default mode";
+        else if (p->type & M_T_DRIVER)
+            prefix = "Driver mode";
+        else
+            prefix = "Mode";
+        if (p->type & M_T_USERDEF)
+            uprefix = "*";
+        else
+            uprefix = " ";
+        if (hsync == 0 || refresh == 0) {
+            if (p->name)
+                xf86DrvMsg(scrp->scrnIndex, X_CONFIG,
+                           "%s%s \"%s\"\n", uprefix, prefix, p->name);
+            else
+                xf86DrvMsg(scrp->scrnIndex, X_PROBED,
+                           "%s%s %dx%d (unnamed)\n",
+                           uprefix, prefix, p->HDisplay, p->VDisplay);
+        }
+        else if (p->Clock == p->SynthClock) {
+            xf86DrvMsg(scrp->scrnIndex, X_CONFIG,
+                       "%s%s \"%s\": %.1f MHz, %.1f kHz, %.1f Hz%s%s\n",
+                       uprefix, prefix, p->name, p->Clock / 1000.0,
+                       hsync, refresh, desc, desc2);
+        }
+        else {
+            xf86DrvMsg(scrp->scrnIndex, X_CONFIG,
+                       "%s%s \"%s\": %.1f MHz (scaled from %.1f MHz), "
+                       "%.1f kHz, %.1f Hz%s%s\n",
+                       uprefix, prefix, p->name, p->Clock / 1000.0,
+                       p->SynthClock / 1000.0, hsync, refresh, desc, desc2);
+        }
+        if (hsync != 0 && refresh != 0)
+            xf86PrintModeline(scrp->scrnIndex, p);
+        p = p->next;
     } while (p != NULL && p != scrp->modes);
 }
diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index 1de87dbbe..894b93f59 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -47,10 +47,10 @@
 #endif
 
 typedef enum {
-    LD_RESOLV_IFDONE		= 0,	/* only check if no more
-					   delays pending */
-    LD_RESOLV_NOW		= 1,	/* finish one delay step */
-    LD_RESOLV_FORCE		= 2	/* force checking... */
+    LD_RESOLV_IFDONE = 0,       /* only check if no more
+                                   delays pending */
+    LD_RESOLV_NOW = 1,          /* finish one delay step */
+    LD_RESOLV_FORCE = 2         /* force checking... */
 } LoaderResolveOptions;
 
 #define DEFAULT_LIST ((char *)-1)
@@ -97,21 +97,21 @@ typedef enum {
 /* Error return codes for errmaj.  New codes must only be added at the end. */
 typedef enum {
     LDR_NOERROR = 0,
-    LDR_NOMEM,		/* memory allocation failed */
-    LDR_NOENT,		/* Module file does not exist */
-    LDR_NOSUBENT,	/* pre-requsite file to be sub-loaded does not exist */
-    LDR_NOSPACE,	/* internal module array full */
-    LDR_NOMODOPEN,	/* module file could not be opened (check errmin) */
-    LDR_UNKTYPE,	/* file is not a recognized module type */
-    LDR_NOLOAD,		/* type specific loader failed */
-    LDR_ONCEONLY,	/* Module should only be loaded once (not an error) */
-    LDR_NOPORTOPEN,	/* could not open port (check errmin) */
-    LDR_NOHARDWARE,	/* could not query/initialize the hardware device */
-    LDR_MISMATCH,	/* the module didn't match the spec'd requirments */
-    LDR_BADUSAGE,	/* LoadModule is called with bad arguments */
-    LDR_INVALID,	/* The module doesn't have a valid ModuleData object */
-    LDR_BADOS,		/* The module doesn't support the OS */
-    LDR_MODSPECIFIC	/* A module-specific error in the SetupProc */
+    LDR_NOMEM,                  /* memory allocation failed */
+    LDR_NOENT,                  /* Module file does not exist */
+    LDR_NOSUBENT,               /* pre-requsite file to be sub-loaded does not exist */
+    LDR_NOSPACE,                /* internal module array full */
+    LDR_NOMODOPEN,              /* module file could not be opened (check errmin) */
+    LDR_UNKTYPE,                /* file is not a recognized module type */
+    LDR_NOLOAD,                 /* type specific loader failed */
+    LDR_ONCEONLY,               /* Module should only be loaded once (not an error) */
+    LDR_NOPORTOPEN,             /* could not open port (check errmin) */
+    LDR_NOHARDWARE,             /* could not query/initialize the hardware device */
+    LDR_MISMATCH,               /* the module didn't match the spec'd requirments */
+    LDR_BADUSAGE,               /* LoadModule is called with bad arguments */
+    LDR_INVALID,                /* The module doesn't have a valid ModuleData object */
+    LDR_BADOS,                  /* The module doesn't support the OS */
+    LDR_MODSPECIFIC             /* A module-specific error in the SetupProc */
 } LoaderErrorCode;
 
 /*
@@ -129,19 +129,19 @@ typedef enum {
 
 /* This structure is expected to be returned by the initfunc */
 typedef struct {
-    const char * modname;	/* name of module, e.g. "foo" */
-    const char * vendor;	/* vendor specific string */
-    CARD32	 _modinfo1_;	/* constant MODINFOSTRING1/2 to find */
-    CARD32	 _modinfo2_;	/* infoarea with a binary editor or sign tool */
-    CARD32	 xf86version;	/* contains XF86_VERSION_CURRENT */
-    CARD8	 majorversion;	/* module-specific major version */
-    CARD8	 minorversion;	/* module-specific minor version */
-    CARD16	 patchlevel;	/* module-specific patch level */
-    const char * abiclass;	/* ABI class that the module uses */
-    CARD32	 abiversion;	/* ABI version */
-    const char * moduleclass;	/* module class description */
-    CARD32	 checksum[4];	/* contains a digital signature of the */
-				/* version info structure */
+    const char *modname;        /* name of module, e.g. "foo" */
+    const char *vendor;         /* vendor specific string */
+    CARD32 _modinfo1_;          /* constant MODINFOSTRING1/2 to find */
+    CARD32 _modinfo2_;          /* infoarea with a binary editor or sign tool */
+    CARD32 xf86version;         /* contains XF86_VERSION_CURRENT */
+    CARD8 majorversion;         /* module-specific major version */
+    CARD8 minorversion;         /* module-specific minor version */
+    CARD16 patchlevel;          /* module-specific patch level */
+    const char *abiclass;       /* ABI class that the module uses */
+    CARD32 abiversion;          /* ABI version */
+    const char *moduleclass;    /* module class description */
+    CARD32 checksum[4];         /* contains a digital signature of the */
+    /* version info structure */
 } XF86ModuleVersionInfo;
 
 /*
@@ -149,12 +149,12 @@ typedef struct {
  * specify version and/or ABI requirements.
  */
 typedef struct {
-    CARD8	 majorversion;	/* module-specific major version */
-    CARD8	 minorversion;	/* moudle-specific minor version */
-    CARD16	 patchlevel;	/* module-specific patch level */
-    const char * abiclass;	/* ABI class that the module uses */
-    CARD32	 abiversion;	/* ABI version */
-    const char * moduleclass;	/* module class */
+    CARD8 majorversion;         /* module-specific major version */
+    CARD8 minorversion;         /* moudle-specific minor version */
+    CARD16 patchlevel;          /* module-specific patch level */
+    const char *abiclass;       /* ABI class that the module uses */
+    CARD32 abiversion;          /* ABI version */
+    const char *moduleclass;    /* module class */
 } XF86ModReqInfo;
 
 /* values to indicate unspecified fields in XF86ModReqInfo. */
@@ -171,42 +171,44 @@ typedef struct {
 
 #define INITARGS void
 
-typedef void (*InitExtension)(INITARGS);
+typedef void (*InitExtension) (INITARGS);
 
 typedef struct {
-    InitExtension	initFunc;
-    const char *	name;
-    Bool		*disablePtr;
-    InitExtension	setupFunc;	
-    const char **	initDependencies;
+    InitExtension initFunc;
+    const char *name;
+    Bool *disablePtr;
+    InitExtension setupFunc;
+    const char **initDependencies;
 } ExtensionModule;
 
 extern _X_EXPORT ExtensionModule *ExtensionModuleList;
 
 /* Prototypes for Loader functions that are exported to modules */
 extern _X_EXPORT pointer LoadSubModule(pointer, const char *, const char **,
-		      const char **, pointer, const XF86ModReqInfo *,
-		      int *, int *);
+                                       const char **, pointer,
+                                       const XF86ModReqInfo *, int *, int *);
 extern _X_EXPORT void UnloadSubModule(pointer);
-extern _X_EXPORT void UnloadModule (pointer);
+extern _X_EXPORT void UnloadModule(pointer);
 extern _X_EXPORT pointer LoaderSymbol(const char *);
 extern _X_EXPORT char **LoaderListDirs(const char **, const char **);
 extern _X_EXPORT void LoaderFreeDirList(char **);
 extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int);
 extern _X_EXPORT void LoadExtension(ExtensionModule *, Bool);
-extern _X_EXPORT void LoaderGetOS(const char **name, int *major, int *minor, int *teeny);
+extern _X_EXPORT void LoaderGetOS(const char **name, int *major, int *minor,
+                                  int *teeny);
 extern _X_EXPORT Bool LoaderShouldIgnoreABI(void);
 extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass);
 
-typedef pointer (*ModuleSetupProc)(pointer, pointer, int *, int *);
-typedef void (*ModuleTearDownProc)(pointer);
+typedef pointer (*ModuleSetupProc) (pointer, pointer, int *, int *);
+typedef void (*ModuleTearDownProc) (pointer);
+
 #define MODULESETUPPROTO(func) pointer func(pointer, pointer, int*, int*)
 #define MODULETEARDOWNPROTO(func) void func(pointer)
 
 typedef struct {
-    XF86ModuleVersionInfo *	vers;
-    ModuleSetupProc		setup;
-    ModuleTearDownProc		teardown;
+    XF86ModuleVersionInfo *vers;
+    ModuleSetupProc setup;
+    ModuleTearDownProc teardown;
 } XF86ModuleData;
 
-#endif /* _XF86STR_H */
+#endif                          /* _XF86STR_H */
diff --git a/xorg-server/hw/xfree86/common/xf86Opt.h b/xorg-server/hw/xfree86/common/xf86Opt.h
index b0fdaa6b6..0d808de14 100644
--- a/xorg-server/hw/xfree86/common/xf86Opt.h
+++ b/xorg-server/hw/xfree86/common/xf86Opt.h
@@ -38,13 +38,13 @@ typedef struct {
 } OptFrequency;
 
 typedef union {
-    unsigned long       num;
-    char *              str;
-    double              realnum;
-    Bool		bool;
-    OptFrequency	freq;
+    unsigned long num;
+    char *str;
+    double realnum;
+    Bool bool;
+    OptFrequency freq;
 } ValueUnion;
-    
+
 typedef enum {
     OPTV_NONE = 0,
     OPTV_INTEGER,
@@ -63,57 +63,96 @@ typedef enum {
 } OptFreqUnits;
 
 typedef struct {
-    int                 token;
-    const char*         name;
-    OptionValueType     type;
-    ValueUnion          value;
-    Bool                found;
+    int token;
+    const char *name;
+    OptionValueType type;
+    ValueUnion value;
+    Bool found;
 } OptionInfoRec, *OptionInfoPtr;
 
-extern _X_EXPORT int xf86SetIntOption(XF86OptionPtr optlist, const char *name, int deflt);
-extern _X_EXPORT double xf86SetRealOption(XF86OptionPtr optlist, const char *name, double deflt);
-extern _X_EXPORT char *xf86SetStrOption(XF86OptionPtr optlist, const char *name, const char *deflt);
-extern _X_EXPORT int xf86SetBoolOption(XF86OptionPtr list, const char *name, int deflt );
-extern _X_EXPORT double xf86SetPercentOption(XF86OptionPtr list, const char *name, double deflt );
-extern _X_EXPORT int xf86CheckIntOption(XF86OptionPtr optlist, const char *name, int deflt);
-extern _X_EXPORT double xf86CheckRealOption(XF86OptionPtr optlist, const char *name, double deflt);
-extern _X_EXPORT char *xf86CheckStrOption(XF86OptionPtr optlist, const char *name, char *deflt);
-extern _X_EXPORT int xf86CheckBoolOption(XF86OptionPtr list, const char *name, int deflt );
-extern _X_EXPORT double xf86CheckPercentOption(XF86OptionPtr list, const char *name, double deflt );
-extern _X_EXPORT XF86OptionPtr xf86AddNewOption(XF86OptionPtr head, const char *name, const char *val );
-extern _X_EXPORT XF86OptionPtr xf86NewOption(char *name, char *value );
-extern _X_EXPORT XF86OptionPtr xf86NextOption(XF86OptionPtr list );
-extern _X_EXPORT XF86OptionPtr xf86OptionListCreate(const char **options, int count, int used);
-extern _X_EXPORT XF86OptionPtr xf86OptionListMerge(XF86OptionPtr head, XF86OptionPtr tail);
+extern _X_EXPORT int xf86SetIntOption(XF86OptionPtr optlist, const char *name,
+                                      int deflt);
+extern _X_EXPORT double xf86SetRealOption(XF86OptionPtr optlist,
+                                          const char *name, double deflt);
+extern _X_EXPORT char *xf86SetStrOption(XF86OptionPtr optlist, const char *name,
+                                        const char *deflt);
+extern _X_EXPORT int xf86SetBoolOption(XF86OptionPtr list, const char *name,
+                                       int deflt);
+extern _X_EXPORT double xf86SetPercentOption(XF86OptionPtr list,
+                                             const char *name, double deflt);
+extern _X_EXPORT int xf86CheckIntOption(XF86OptionPtr optlist, const char *name,
+                                        int deflt);
+extern _X_EXPORT double xf86CheckRealOption(XF86OptionPtr optlist,
+                                            const char *name, double deflt);
+extern _X_EXPORT char *xf86CheckStrOption(XF86OptionPtr optlist,
+                                          const char *name, char *deflt);
+extern _X_EXPORT int xf86CheckBoolOption(XF86OptionPtr list, const char *name,
+                                         int deflt);
+extern _X_EXPORT double xf86CheckPercentOption(XF86OptionPtr list,
+                                               const char *name, double deflt);
+extern _X_EXPORT XF86OptionPtr xf86AddNewOption(XF86OptionPtr head,
+                                                const char *name,
+                                                const char *val);
+extern _X_EXPORT XF86OptionPtr xf86NewOption(char *name, char *value);
+extern _X_EXPORT XF86OptionPtr xf86NextOption(XF86OptionPtr list);
+extern _X_EXPORT XF86OptionPtr xf86OptionListCreate(const char **options,
+                                                    int count, int used);
+extern _X_EXPORT XF86OptionPtr xf86OptionListMerge(XF86OptionPtr head,
+                                                   XF86OptionPtr tail);
 extern _X_EXPORT XF86OptionPtr xf86OptionListDuplicate(XF86OptionPtr list);
 extern _X_EXPORT void xf86OptionListFree(XF86OptionPtr opt);
 extern _X_EXPORT char *xf86OptionName(XF86OptionPtr opt);
 extern _X_EXPORT char *xf86OptionValue(XF86OptionPtr opt);
 extern _X_EXPORT void xf86OptionListReport(XF86OptionPtr parm);
-extern _X_EXPORT XF86OptionPtr xf86FindOption(XF86OptionPtr options, const char *name);
-extern _X_EXPORT const char *xf86FindOptionValue(XF86OptionPtr options, const char *name);
+extern _X_EXPORT XF86OptionPtr xf86FindOption(XF86OptionPtr options,
+                                              const char *name);
+extern _X_EXPORT const char *xf86FindOptionValue(XF86OptionPtr options,
+                                                 const char *name);
 extern _X_EXPORT void xf86MarkOptionUsed(XF86OptionPtr option);
-extern _X_EXPORT void xf86MarkOptionUsedByName(XF86OptionPtr options, const char *name);
+extern _X_EXPORT void xf86MarkOptionUsedByName(XF86OptionPtr options,
+                                               const char *name);
 extern _X_EXPORT Bool xf86CheckIfOptionUsed(XF86OptionPtr option);
-extern _X_EXPORT Bool xf86CheckIfOptionUsedByName(XF86OptionPtr options, const char *name);
-extern _X_EXPORT void xf86ShowUnusedOptions(int scrnIndex, XF86OptionPtr options);
-extern _X_EXPORT void xf86ProcessOptions(int scrnIndex, XF86OptionPtr options, OptionInfoPtr optinfo);
-extern _X_EXPORT OptionInfoPtr xf86TokenToOptinfo(const OptionInfoRec *table, int token);
-extern _X_EXPORT const char *xf86TokenToOptName(const OptionInfoRec *table, int token);
-extern _X_EXPORT Bool xf86IsOptionSet(const OptionInfoRec *table, int token);
-extern _X_EXPORT char *xf86GetOptValString(const OptionInfoRec *table, int token);
-extern _X_EXPORT Bool xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value);
-extern _X_EXPORT Bool xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value);
-extern _X_EXPORT Bool xf86GetOptValReal(const OptionInfoRec *table, int token, double *value);
-extern _X_EXPORT Bool xf86GetOptValFreq(const OptionInfoRec *table, int token,
-			OptFreqUnits expectedUnits, double *value);
-extern _X_EXPORT Bool xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value);
-extern _X_EXPORT Bool xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def);
+extern _X_EXPORT Bool xf86CheckIfOptionUsedByName(XF86OptionPtr options,
+                                                  const char *name);
+extern _X_EXPORT void xf86ShowUnusedOptions(int scrnIndex,
+                                            XF86OptionPtr options);
+extern _X_EXPORT void xf86ProcessOptions(int scrnIndex, XF86OptionPtr options,
+                                         OptionInfoPtr optinfo);
+extern _X_EXPORT OptionInfoPtr xf86TokenToOptinfo(const OptionInfoRec * table,
+                                                  int token);
+extern _X_EXPORT const char *xf86TokenToOptName(const OptionInfoRec * table,
+                                                int token);
+extern _X_EXPORT Bool xf86IsOptionSet(const OptionInfoRec * table, int token);
+extern _X_EXPORT char *xf86GetOptValString(const OptionInfoRec * table,
+                                           int token);
+extern _X_EXPORT Bool xf86GetOptValInteger(const OptionInfoRec * table,
+                                           int token, int *value);
+extern _X_EXPORT Bool xf86GetOptValULong(const OptionInfoRec * table, int token,
+                                         unsigned long *value);
+extern _X_EXPORT Bool xf86GetOptValReal(const OptionInfoRec * table, int token,
+                                        double *value);
+extern _X_EXPORT Bool xf86GetOptValFreq(const OptionInfoRec * table, int token,
+                                        OptFreqUnits expectedUnits,
+                                        double *value);
+extern _X_EXPORT Bool xf86GetOptValBool(const OptionInfoRec * table, int token,
+                                        Bool *value);
+extern _X_EXPORT Bool xf86ReturnOptValBool(const OptionInfoRec * table,
+                                           int token, Bool def);
 extern _X_EXPORT int xf86NameCmp(const char *s1, const char *s2);
 extern _X_EXPORT char *xf86NormalizeName(const char *s);
-extern _X_EXPORT XF86OptionPtr xf86ReplaceIntOption(XF86OptionPtr optlist,  const char *name, const int val);
-extern _X_EXPORT XF86OptionPtr xf86ReplaceRealOption(XF86OptionPtr optlist,  const char *name, const double val);
-extern _X_EXPORT XF86OptionPtr xf86ReplaceBoolOption(XF86OptionPtr optlist, const char *name, const Bool val);
-extern _X_EXPORT XF86OptionPtr xf86ReplacePercentOption(XF86OptionPtr optlist, const char *name, const double val);
-extern _X_EXPORT XF86OptionPtr xf86ReplaceStrOption(XF86OptionPtr optlist,  const char *name, const char* val);
+extern _X_EXPORT XF86OptionPtr xf86ReplaceIntOption(XF86OptionPtr optlist,
+                                                    const char *name,
+                                                    const int val);
+extern _X_EXPORT XF86OptionPtr xf86ReplaceRealOption(XF86OptionPtr optlist,
+                                                     const char *name,
+                                                     const double val);
+extern _X_EXPORT XF86OptionPtr xf86ReplaceBoolOption(XF86OptionPtr optlist,
+                                                     const char *name,
+                                                     const Bool val);
+extern _X_EXPORT XF86OptionPtr xf86ReplacePercentOption(XF86OptionPtr optlist,
+                                                        const char *name,
+                                                        const double val);
+extern _X_EXPORT XF86OptionPtr xf86ReplaceStrOption(XF86OptionPtr optlist,
+                                                    const char *name,
+                                                    const char *val);
 #endif
diff --git a/xorg-server/hw/xfree86/common/xf86Option.c b/xorg-server/hw/xfree86/common/xf86Option.c
index dc0a01899..7cc744029 100644
--- a/xorg-server/hw/xfree86/common/xf86Option.c
+++ b/xorg-server/hw/xfree86/common/xf86Option.c
@@ -46,8 +46,8 @@
 #include "xf86Parser.h"
 #include "optionstr.h"
 
-static Bool ParseOptionValue(int scrnIndex, XF86OptionPtr options, OptionInfoPtr p,
-			     Bool markUsed);
+static Bool ParseOptionValue(int scrnIndex, XF86OptionPtr options,
+                             OptionInfoPtr p, Bool markUsed);
 
 /*
  * xf86CollectOptions collects the options from each of the config file
@@ -71,51 +71,51 @@ void
 xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraOpts)
 {
     XF86OptionPtr tmp;
-    XF86OptionPtr extras = (XF86OptionPtr)extraOpts;
+    XF86OptionPtr extras = (XF86OptionPtr) extraOpts;
     GDevPtr device;
-    
+
     int i;
 
     pScrn->options = NULL;
 
-    for (i=pScrn->numEntities - 1; i >= 0; i--) {
-	device = xf86GetDevFromEntity(pScrn->entityList[i],
-					pScrn->entityInstanceList[i]);
-	if (device && device->options) {
-	    tmp = xf86optionListDup(device->options);
-	    if (pScrn->options)
-		xf86optionListMerge(pScrn->options,tmp);
-	    else
-		pScrn->options = tmp;
-	}
+    for (i = pScrn->numEntities - 1; i >= 0; i--) {
+        device = xf86GetDevFromEntity(pScrn->entityList[i],
+                                      pScrn->entityInstanceList[i]);
+        if (device && device->options) {
+            tmp = xf86optionListDup(device->options);
+            if (pScrn->options)
+                xf86optionListMerge(pScrn->options, tmp);
+            else
+                pScrn->options = tmp;
+        }
     }
     if (pScrn->monitor->options) {
-	tmp = xf86optionListDup(pScrn->monitor->options);
-	if (pScrn->options)
-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
-	else
-	    pScrn->options = tmp;
+        tmp = xf86optionListDup(pScrn->monitor->options);
+        if (pScrn->options)
+            pScrn->options = xf86optionListMerge(pScrn->options, tmp);
+        else
+            pScrn->options = tmp;
     }
     if (pScrn->confScreen->options) {
-	tmp = xf86optionListDup(pScrn->confScreen->options);
-	if (pScrn->options)
-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
-	else
-	    pScrn->options = tmp;
+        tmp = xf86optionListDup(pScrn->confScreen->options);
+        if (pScrn->options)
+            pScrn->options = xf86optionListMerge(pScrn->options, tmp);
+        else
+            pScrn->options = tmp;
     }
     if (pScrn->display->options) {
-	tmp = xf86optionListDup(pScrn->display->options);
-	if (pScrn->options)
-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
-	else
-	    pScrn->options = tmp;
+        tmp = xf86optionListDup(pScrn->display->options);
+        if (pScrn->options)
+            pScrn->options = xf86optionListMerge(pScrn->options, tmp);
+        else
+            pScrn->options = tmp;
     }
     if (extras) {
-	tmp = xf86optionListDup(extras);
-	if (pScrn->options)
-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
-	else
-	    pScrn->options = tmp;
+        tmp = xf86optionListDup(extras);
+        if (pScrn->options)
+            pScrn->options = xf86optionListMerge(pScrn->options, tmp);
+        else
+            pScrn->options = tmp;
     }
 }
 
@@ -130,11 +130,12 @@ void
 xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts)
 {
     if (defaultOpts) {
-	XF86OptionPtr tmp =xf86optionListCreate(defaultOpts, -1, 0);
-	if (pInfo->options)
-	    pInfo->options = xf86optionListMerge(tmp, pInfo->options);
-	else
-	    pInfo->options = tmp;
+        XF86OptionPtr tmp = xf86optionListCreate(defaultOpts, -1, 0);
+
+        if (pInfo->options)
+            pInfo->options = xf86optionListMerge(tmp, pInfo->options);
+        else
+            pInfo->options = tmp;
     }
 }
 
@@ -147,47 +148,46 @@ xf86OptionListDuplicate(XF86OptionPtr options)
 {
     XF86OptionPtr o = NULL;
 
-    while (options)
-    {
-        o = xf86AddNewOption(o, xf86OptionName(options), xf86OptionValue(options));
+    while (options) {
+        o = xf86AddNewOption(o, xf86OptionName(options),
+                             xf86OptionValue(options));
         options = xf86nextOption(options);
     }
 
     return o;
 }
 
-
 /* Created for new XInput stuff -- essentially extensions to the parser	*/
 
 static int
-LookupIntOption(XF86OptionPtr optlist, const char *name, int deflt, Bool markUsed)
+LookupIntOption(XF86OptionPtr optlist, const char *name, int deflt,
+                Bool markUsed)
 {
     OptionInfoRec o;
 
     o.name = name;
     o.type = OPTV_INTEGER;
     if (ParseOptionValue(-1, optlist, &o, markUsed))
-	deflt = o.value.num;
+        deflt = o.value.num;
     return deflt;
 }
 
-
 static double
 LookupRealOption(XF86OptionPtr optlist, const char *name, double deflt,
-		 Bool markUsed)
+                 Bool markUsed)
 {
     OptionInfoRec o;
 
     o.name = name;
     o.type = OPTV_REAL;
     if (ParseOptionValue(-1, optlist, &o, markUsed))
-	deflt = o.value.realnum;
+        deflt = o.value.realnum;
     return deflt;
 }
 
-
 static char *
-LookupStrOption(XF86OptionPtr optlist, const char *name, const char *deflt, Bool markUsed)
+LookupStrOption(XF86OptionPtr optlist, const char *name, const char *deflt,
+                Bool markUsed)
 {
     OptionInfoRec o;
 
@@ -196,33 +196,34 @@ LookupStrOption(XF86OptionPtr optlist, const char *name, const char *deflt, Bool
     if (ParseOptionValue(-1, optlist, &o, markUsed))
         deflt = o.value.str;
     if (deflt)
-	return strdup(deflt);
+        return strdup(deflt);
     else
-	return NULL;
+        return NULL;
 }
 
-
 static int
-LookupBoolOption(XF86OptionPtr optlist, const char *name, int deflt, Bool markUsed)
+LookupBoolOption(XF86OptionPtr optlist, const char *name, int deflt,
+                 Bool markUsed)
 {
     OptionInfoRec o;
 
     o.name = name;
     o.type = OPTV_BOOLEAN;
     if (ParseOptionValue(-1, optlist, &o, markUsed))
-	deflt = o.value.bool;
+        deflt = o.value.bool;
     return deflt;
 }
 
 static double
-LookupPercentOption(XF86OptionPtr optlist, const char *name, double deflt, Bool markUsed)
+LookupPercentOption(XF86OptionPtr optlist, const char *name, double deflt,
+                    Bool markUsed)
 {
     OptionInfoRec o;
 
     o.name = name;
     o.type = OPTV_PERCENT;
     if (ParseOptionValue(-1, optlist, &o, markUsed))
-	deflt = o.value.realnum;
+        deflt = o.value.realnum;
     return deflt;
 }
 
@@ -234,21 +235,18 @@ xf86SetIntOption(XF86OptionPtr optlist, const char *name, int deflt)
     return LookupIntOption(optlist, name, deflt, TRUE);
 }
 
-
 double
 xf86SetRealOption(XF86OptionPtr optlist, const char *name, double deflt)
 {
     return LookupRealOption(optlist, name, deflt, TRUE);
 }
 
-
 char *
 xf86SetStrOption(XF86OptionPtr optlist, const char *name, const char *deflt)
 {
     return LookupStrOption(optlist, name, deflt, TRUE);
 }
 
-
 int
 xf86SetBoolOption(XF86OptionPtr optlist, const char *name, int deflt)
 {
@@ -271,33 +269,30 @@ xf86CheckIntOption(XF86OptionPtr optlist, const char *name, int deflt)
     return LookupIntOption(optlist, name, deflt, FALSE);
 }
 
-
 double
 xf86CheckRealOption(XF86OptionPtr optlist, const char *name, double deflt)
 {
     return LookupRealOption(optlist, name, deflt, FALSE);
 }
 
-
 char *
 xf86CheckStrOption(XF86OptionPtr optlist, const char *name, char *deflt)
 {
     return LookupStrOption(optlist, name, deflt, FALSE);
 }
 
-
 int
 xf86CheckBoolOption(XF86OptionPtr optlist, const char *name, int deflt)
 {
     return LookupBoolOption(optlist, name, deflt, FALSE);
 }
 
-
 double
 xf86CheckPercentOption(XF86OptionPtr optlist, const char *name, double deflt)
 {
     return LookupPercentOption(optlist, name, deflt, FALSE);
 }
+
 /*
  * xf86AddNewOption() has the required property of replacing the option value
  * if the option is already present.
@@ -306,36 +301,40 @@ XF86OptionPtr
 xf86ReplaceIntOption(XF86OptionPtr optlist, const char *name, const int val)
 {
     char tmp[16];
-    snprintf(tmp,sizeof(tmp),"%i",val);
-    return xf86AddNewOption(optlist,name,tmp);
+
+    snprintf(tmp, sizeof(tmp), "%i", val);
+    return xf86AddNewOption(optlist, name, tmp);
 }
 
 XF86OptionPtr
 xf86ReplaceRealOption(XF86OptionPtr optlist, const char *name, const double val)
 {
     char tmp[32];
-    snprintf(tmp,sizeof(tmp),"%f",val);
-    return xf86AddNewOption(optlist,name,tmp);
+
+    snprintf(tmp, sizeof(tmp), "%f", val);
+    return xf86AddNewOption(optlist, name, tmp);
 }
 
 XF86OptionPtr
 xf86ReplaceBoolOption(XF86OptionPtr optlist, const char *name, const Bool val)
 {
-    return xf86AddNewOption(optlist,name,val?"True":"False");
+    return xf86AddNewOption(optlist, name, val ? "True" : "False");
 }
 
 XF86OptionPtr
-xf86ReplacePercentOption(XF86OptionPtr optlist, const char *name, const double val)
+xf86ReplacePercentOption(XF86OptionPtr optlist, const char *name,
+                         const double val)
 {
     char tmp[16];
+
     snprintf(tmp, sizeof(tmp), "%lf%%", val);
-    return xf86AddNewOption(optlist,name,tmp);
+    return xf86AddNewOption(optlist, name, tmp);
 }
 
 XF86OptionPtr
-xf86ReplaceStrOption(XF86OptionPtr optlist, const char *name, const char* val)
+xf86ReplaceStrOption(XF86OptionPtr optlist, const char *name, const char *val)
 {
-      return xf86AddNewOption(optlist,name,val);
+    return xf86AddNewOption(optlist, name, val);
 }
 
 XF86OptionPtr
@@ -348,14 +347,12 @@ xf86AddNewOption(XF86OptionPtr head, const char *name, const char *val)
     return xf86addNewOption(head, tmp_name, tmp);
 }
 
-
 XF86OptionPtr
 xf86NewOption(char *name, char *value)
 {
     return xf86newOption(name, value);
 }
 
-
 XF86OptionPtr
 xf86NextOption(XF86OptionPtr list)
 {
@@ -365,31 +362,31 @@ xf86NextOption(XF86OptionPtr list)
 XF86OptionPtr
 xf86OptionListCreate(const char **options, int count, int used)
 {
-	return xf86optionListCreate(options, count, used);
+    return xf86optionListCreate(options, count, used);
 }
 
 XF86OptionPtr
 xf86OptionListMerge(XF86OptionPtr head, XF86OptionPtr tail)
 {
-	return xf86optionListMerge(head, tail);
+    return xf86optionListMerge(head, tail);
 }
 
 void
 xf86OptionListFree(XF86OptionPtr opt)
 {
-	xf86optionListFree(opt);
+    xf86optionListFree(opt);
 }
 
 char *
 xf86OptionName(XF86OptionPtr opt)
 {
-	return xf86optionName(opt);
+    return xf86optionName(opt);
 }
 
 char *
 xf86OptionValue(XF86OptionPtr opt)
 {
-	return xf86optionValue(opt);
+    return xf86optionValue(opt);
 }
 
 void
@@ -397,13 +394,13 @@ xf86OptionListReport(XF86OptionPtr parm)
 {
     XF86OptionPtr opts = parm;
 
-    while(opts) {
-	if (xf86optionValue(opts))
-	    xf86ErrorFVerb(5, "\tOption \"%s\" \"%s\"\n",
-			    xf86optionName(opts), xf86optionValue(opts));
-	else
-	    xf86ErrorFVerb( 5, "\tOption \"%s\"\n", xf86optionName(opts));
-	opts = xf86nextOption(opts);
+    while (opts) {
+        if (xf86optionValue(opts))
+            xf86ErrorFVerb(5, "\tOption \"%s\" \"%s\"\n",
+                           xf86optionName(opts), xf86optionValue(opts));
+        else
+            xf86ErrorFVerb(5, "\tOption \"%s\"\n", xf86optionName(opts));
+        opts = xf86nextOption(opts);
     }
 }
 
@@ -415,22 +412,19 @@ xf86FindOption(XF86OptionPtr options, const char *name)
     return xf86findOption(options, name);
 }
 
-
 const char *
 xf86FindOptionValue(XF86OptionPtr options, const char *name)
 {
     return xf86findOptionValue(options, name);
 }
 
-
 void
 xf86MarkOptionUsed(XF86OptionPtr option)
 {
     if (option != NULL)
-	option->opt_used = TRUE;
+        option->opt_used = TRUE;
 }
 
-
 void
 xf86MarkOptionUsedByName(XF86OptionPtr options, const char *name)
 {
@@ -438,16 +432,16 @@ xf86MarkOptionUsedByName(XF86OptionPtr options, const char *name)
 
     opt = xf86findOption(options, name);
     if (opt != NULL)
-	opt->opt_used = TRUE;
+        opt->opt_used = TRUE;
 }
 
 Bool
 xf86CheckIfOptionUsed(XF86OptionPtr option)
 {
     if (option != NULL)
-	return option->opt_used;
+        return option->opt_used;
     else
-	return FALSE;
+        return FALSE;
 }
 
 Bool
@@ -457,24 +451,23 @@ xf86CheckIfOptionUsedByName(XF86OptionPtr options, const char *name)
 
     opt = xf86findOption(options, name);
     if (opt != NULL)
-	return opt->opt_used;
+        return opt->opt_used;
     else
-	return FALSE;
+        return FALSE;
 }
 
 void
 xf86ShowUnusedOptions(int scrnIndex, XF86OptionPtr opt)
 {
     while (opt) {
-	if (opt->opt_name && !opt->opt_used) {
-	    xf86DrvMsg(scrnIndex, X_WARNING, "Option \"%s\" is not used\n",
-			opt->opt_name);
-	}
-	opt = opt->list.next;
+        if (opt->opt_name && !opt->opt_used) {
+            xf86DrvMsg(scrnIndex, X_WARNING, "Option \"%s\" is not used\n",
+                       opt->opt_name);
+        }
+        opt = opt->list.next;
     }
 }
 
-
 static Bool
 GetBoolValue(OptionInfoPtr p, const char *s)
 {
@@ -483,257 +476,269 @@ GetBoolValue(OptionInfoPtr p, const char *s)
 
 static Bool
 ParseOptionValue(int scrnIndex, XF86OptionPtr options, OptionInfoPtr p,
-		 Bool markUsed)
+                 Bool markUsed)
 {
     char *s, *end;
     Bool wasUsed = FALSE;
 
     if ((s = xf86findOptionValue(options, p->name)) != NULL) {
-	if (markUsed) {
-	    wasUsed = xf86CheckIfOptionUsedByName(options, p->name);
-	    xf86MarkOptionUsedByName(options, p->name);
-	}
-	switch (p->type) {
-	case OPTV_INTEGER:
-	    if (*s == '\0') {
-		if (markUsed) {
-		    xf86DrvMsg(scrnIndex, X_WARNING,
-			       "Option \"%s\" requires an integer value\n",
-			       p->name);
-		}
-		p->found = FALSE;
-	    } else {
-		p->value.num = strtoul(s, &end, 0);
-		if (*end == '\0') {
-		    p->found = TRUE;
-		} else {
-		    if (markUsed) {
-			xf86DrvMsg(scrnIndex, X_WARNING,
-				   "Option \"%s\" requires an integer value\n",
-				    p->name);
-		    }
-		    p->found = FALSE;
-		}
-	    }
-	    break;
-	case OPTV_STRING:
-	    if (*s == '\0') {
-		if (markUsed) {
-		    xf86DrvMsg(scrnIndex, X_WARNING,
-			       "Option \"%s\" requires an string value\n",
-			       p->name);
-		}
-		p->found = FALSE;
-	    } else {
-		p->value.str = s;
-		p->found = TRUE;
-	    }
-	    break;
-	case OPTV_ANYSTR:
-	    p->value.str = s;
-	    p->found = TRUE;
-	    break;
-	case OPTV_REAL:	
-	    if (*s == '\0') {
-		if (markUsed) {
-		    xf86DrvMsg(scrnIndex, X_WARNING,
-			       "Option \"%s\" requires a floating point "
-			       "value\n", p->name);
-		}
-		p->found = FALSE;
-	    } else {
-		p->value.realnum = strtod(s, &end);
-		if (*end == '\0') {
-		    p->found = TRUE;
-		} else {
-		    if (markUsed) {
-			xf86DrvMsg(scrnIndex, X_WARNING,
-				"Option \"%s\" requires a floating point "
-				"value\n", p->name);
-		    }
-		    p->found = FALSE;
-		}
-	    }
-	    break;
-	case OPTV_BOOLEAN:
-	    if (GetBoolValue(p, s)) {
-		p->found = TRUE;
-	    } else {
-		if (markUsed) {
-		    xf86DrvMsg(scrnIndex, X_WARNING,
-			       "Option \"%s\" requires a boolean value\n",
-			       p->name);
-		}
-		p->found = FALSE;
-	    }
-	    break;
-	case OPTV_PERCENT:
-	    {
-		char tmp = 0;
-		/* awkward match, but %% doesn't increase the match counter,
-		 * hence 100 looks the same as 100% to the caller of sccanf
-		 */
-		if (sscanf(s, "%lf%c", &p->value.realnum, &tmp) != 2 || tmp != '%') {
-		    if (markUsed) {
-			xf86DrvMsg(scrnIndex, X_WARNING,
-			       "Option \"%s\" requires a percent value\n", p->name);
-		    }
-		    p->found = FALSE;
-		} else {
-		    p->found = TRUE;
-		}
-	    }
-	    break;
-	case OPTV_FREQ:	
-	    if (*s == '\0') {
-		if (markUsed) {
-		    xf86DrvMsg(scrnIndex, X_WARNING,
-			       "Option \"%s\" requires a frequency value\n",
-			       p->name);
-		}
-		p->found = FALSE;
-	    } else {
-		double freq = strtod(s, &end);
-		int    units = 0;
-
-		if (end != s) {
-		    p->found = TRUE;
-		    if (!xf86NameCmp(end, "Hz"))
-			units = 1;
-		    else if (!xf86NameCmp(end, "kHz") ||
-			     !xf86NameCmp(end, "k"))
-			units = 1000;
-		    else if (!xf86NameCmp(end, "MHz") ||
-			     !xf86NameCmp(end, "M"))
-			units = 1000000;
-		    else {
-			if (markUsed) {
-			    xf86DrvMsg(scrnIndex, X_WARNING,
-				"Option \"%s\" requires a frequency value\n",
-				p->name);
-			}
-			p->found = FALSE;
-		    }
-		    if (p->found)
-			freq *= (double)units;
-		} else {
-		    if (markUsed) {
-			xf86DrvMsg(scrnIndex, X_WARNING,
-				"Option \"%s\" requires a frequency value\n",
-				p->name);
-		    }
-		    p->found = FALSE;
-		}
-		if (p->found) {
-		    p->value.freq.freq = freq;
-		    p->value.freq.units = units;
-		}
-	    }
-	    break;
-	case OPTV_NONE:
-	    /* Should never get here */
-	    p->found = FALSE;
-	    break;
-	}
-	if (p->found && markUsed) {
-	    int verb = 2;
-	    if (wasUsed)
-		verb = 4;
-	    xf86DrvMsgVerb(scrnIndex, X_CONFIG, verb, "Option \"%s\"", p->name);
-	    if (!(p->type == OPTV_BOOLEAN && *s == 0)) {
-		xf86ErrorFVerb(verb, " \"%s\"", s);
-	    }
-	    xf86ErrorFVerb(verb, "\n");
-	}
-    } else if (p->type == OPTV_BOOLEAN) {
-	/* Look for matches with options with or without a "No" prefix. */
-	char *n, *newn;
-	OptionInfoRec opt;
-
-	n = xf86NormalizeName(p->name);
-	if (!n) {
-	    p->found = FALSE;
-	    return FALSE;
-	}
-	if (strncmp(n, "no", 2) == 0) {
-	    newn = n + 2;
-	} else {
-	    free(n);
-	    if (asprintf(&n, "No%s", p->name) == -1) {
-		p->found = FALSE;
-		return FALSE;
-	    }
-	    newn = n;
-	}
-	if ((s = xf86findOptionValue(options, newn)) != NULL) {
-	    if (markUsed)
-		xf86MarkOptionUsedByName(options, newn);
-	    if (GetBoolValue(&opt, s)) {
-		p->value.bool = !opt.value.bool;
-		p->found = TRUE;
-	    } else {
-		xf86DrvMsg(scrnIndex, X_WARNING,
-			   "Option \"%s\" requires a boolean value\n", newn);
-		p->found = FALSE;
-	    }
-	} else {
-	    p->found = FALSE;
-	}
-	if (p->found && markUsed) {
-	    xf86DrvMsgVerb(scrnIndex, X_CONFIG, 2, "Option \"%s\"", newn);
-	    if (*s != 0) {
-		xf86ErrorFVerb(2, " \"%s\"", s);
-	    }
-	    xf86ErrorFVerb(2, "\n");
-	}
-	free(n);
-    } else {
-	p->found = FALSE;
+        if (markUsed) {
+            wasUsed = xf86CheckIfOptionUsedByName(options, p->name);
+            xf86MarkOptionUsedByName(options, p->name);
+        }
+        switch (p->type) {
+        case OPTV_INTEGER:
+            if (*s == '\0') {
+                if (markUsed) {
+                    xf86DrvMsg(scrnIndex, X_WARNING,
+                               "Option \"%s\" requires an integer value\n",
+                               p->name);
+                }
+                p->found = FALSE;
+            }
+            else {
+                p->value.num = strtoul(s, &end, 0);
+                if (*end == '\0') {
+                    p->found = TRUE;
+                }
+                else {
+                    if (markUsed) {
+                        xf86DrvMsg(scrnIndex, X_WARNING,
+                                   "Option \"%s\" requires an integer value\n",
+                                   p->name);
+                    }
+                    p->found = FALSE;
+                }
+            }
+            break;
+        case OPTV_STRING:
+            if (*s == '\0') {
+                if (markUsed) {
+                    xf86DrvMsg(scrnIndex, X_WARNING,
+                               "Option \"%s\" requires an string value\n",
+                               p->name);
+                }
+                p->found = FALSE;
+            }
+            else {
+                p->value.str = s;
+                p->found = TRUE;
+            }
+            break;
+        case OPTV_ANYSTR:
+            p->value.str = s;
+            p->found = TRUE;
+            break;
+        case OPTV_REAL:
+            if (*s == '\0') {
+                if (markUsed) {
+                    xf86DrvMsg(scrnIndex, X_WARNING,
+                               "Option \"%s\" requires a floating point "
+                               "value\n", p->name);
+                }
+                p->found = FALSE;
+            }
+            else {
+                p->value.realnum = strtod(s, &end);
+                if (*end == '\0') {
+                    p->found = TRUE;
+                }
+                else {
+                    if (markUsed) {
+                        xf86DrvMsg(scrnIndex, X_WARNING,
+                                   "Option \"%s\" requires a floating point "
+                                   "value\n", p->name);
+                    }
+                    p->found = FALSE;
+                }
+            }
+            break;
+        case OPTV_BOOLEAN:
+            if (GetBoolValue(p, s)) {
+                p->found = TRUE;
+            }
+            else {
+                if (markUsed) {
+                    xf86DrvMsg(scrnIndex, X_WARNING,
+                               "Option \"%s\" requires a boolean value\n",
+                               p->name);
+                }
+                p->found = FALSE;
+            }
+            break;
+        case OPTV_PERCENT:
+        {
+            char tmp = 0;
+
+            /* awkward match, but %% doesn't increase the match counter,
+             * hence 100 looks the same as 100% to the caller of sccanf
+             */
+            if (sscanf(s, "%lf%c", &p->value.realnum, &tmp) != 2 || tmp != '%') {
+                if (markUsed) {
+                    xf86DrvMsg(scrnIndex, X_WARNING,
+                               "Option \"%s\" requires a percent value\n",
+                               p->name);
+                }
+                p->found = FALSE;
+            }
+            else {
+                p->found = TRUE;
+            }
+        }
+            break;
+        case OPTV_FREQ:
+            if (*s == '\0') {
+                if (markUsed) {
+                    xf86DrvMsg(scrnIndex, X_WARNING,
+                               "Option \"%s\" requires a frequency value\n",
+                               p->name);
+                }
+                p->found = FALSE;
+            }
+            else {
+                double freq = strtod(s, &end);
+                int units = 0;
+
+                if (end != s) {
+                    p->found = TRUE;
+                    if (!xf86NameCmp(end, "Hz"))
+                        units = 1;
+                    else if (!xf86NameCmp(end, "kHz") || !xf86NameCmp(end, "k"))
+                        units = 1000;
+                    else if (!xf86NameCmp(end, "MHz") || !xf86NameCmp(end, "M"))
+                        units = 1000000;
+                    else {
+                        if (markUsed) {
+                            xf86DrvMsg(scrnIndex, X_WARNING,
+                                       "Option \"%s\" requires a frequency value\n",
+                                       p->name);
+                        }
+                        p->found = FALSE;
+                    }
+                    if (p->found)
+                        freq *= (double) units;
+                }
+                else {
+                    if (markUsed) {
+                        xf86DrvMsg(scrnIndex, X_WARNING,
+                                   "Option \"%s\" requires a frequency value\n",
+                                   p->name);
+                    }
+                    p->found = FALSE;
+                }
+                if (p->found) {
+                    p->value.freq.freq = freq;
+                    p->value.freq.units = units;
+                }
+            }
+            break;
+        case OPTV_NONE:
+            /* Should never get here */
+            p->found = FALSE;
+            break;
+        }
+        if (p->found && markUsed) {
+            int verb = 2;
+
+            if (wasUsed)
+                verb = 4;
+            xf86DrvMsgVerb(scrnIndex, X_CONFIG, verb, "Option \"%s\"", p->name);
+            if (!(p->type == OPTV_BOOLEAN && *s == 0)) {
+                xf86ErrorFVerb(verb, " \"%s\"", s);
+            }
+            xf86ErrorFVerb(verb, "\n");
+        }
+    }
+    else if (p->type == OPTV_BOOLEAN) {
+        /* Look for matches with options with or without a "No" prefix. */
+        char *n, *newn;
+        OptionInfoRec opt;
+
+        n = xf86NormalizeName(p->name);
+        if (!n) {
+            p->found = FALSE;
+            return FALSE;
+        }
+        if (strncmp(n, "no", 2) == 0) {
+            newn = n + 2;
+        }
+        else {
+            free(n);
+            if (asprintf(&n, "No%s", p->name) == -1) {
+                p->found = FALSE;
+                return FALSE;
+            }
+            newn = n;
+        }
+        if ((s = xf86findOptionValue(options, newn)) != NULL) {
+            if (markUsed)
+                xf86MarkOptionUsedByName(options, newn);
+            if (GetBoolValue(&opt, s)) {
+                p->value.bool = !opt.value.bool;
+                p->found = TRUE;
+            }
+            else {
+                xf86DrvMsg(scrnIndex, X_WARNING,
+                           "Option \"%s\" requires a boolean value\n", newn);
+                p->found = FALSE;
+            }
+        }
+        else {
+            p->found = FALSE;
+        }
+        if (p->found && markUsed) {
+            xf86DrvMsgVerb(scrnIndex, X_CONFIG, 2, "Option \"%s\"", newn);
+            if (*s != 0) {
+                xf86ErrorFVerb(2, " \"%s\"", s);
+            }
+            xf86ErrorFVerb(2, "\n");
+        }
+        free(n);
+    }
+    else {
+        p->found = FALSE;
     }
     return p->found;
 }
 
-
 void
 xf86ProcessOptions(int scrnIndex, XF86OptionPtr options, OptionInfoPtr optinfo)
 {
     OptionInfoPtr p;
 
     for (p = optinfo; p->name != NULL; p++) {
-	ParseOptionValue(scrnIndex, options, p, TRUE);
+        ParseOptionValue(scrnIndex, options, p, TRUE);
     }
 }
 
-
 OptionInfoPtr
-xf86TokenToOptinfo(const OptionInfoRec *table, int token)
+xf86TokenToOptinfo(const OptionInfoRec * table, int token)
 {
     const OptionInfoRec *p, *match = NULL, *set = NULL;
 
     if (!table) {
-	ErrorF("xf86TokenToOptinfo: table is NULL\n");
-	return NULL;
+        ErrorF("xf86TokenToOptinfo: table is NULL\n");
+        return NULL;
     }
 
     for (p = table; p->token >= 0; p++) {
-	if (p->token == token) {
-	    match = p;
-	    if (p->found)
-		set = p;
-	}
+        if (p->token == token) {
+            match = p;
+            if (p->found)
+                set = p;
+        }
     }
 
     if (set)
-	return (OptionInfoPtr)set;
+        return (OptionInfoPtr) set;
     else if (match)
-	return (OptionInfoPtr)match;
+        return (OptionInfoPtr) match;
     else
-	return NULL;
+        return NULL;
 }
 
-
 const char *
-xf86TokenToOptName(const OptionInfoRec *table, int token)
+xf86TokenToOptName(const OptionInfoRec * table, int token)
 {
     const OptionInfoRec *p;
 
@@ -741,9 +746,8 @@ xf86TokenToOptName(const OptionInfoRec *table, int token)
     return p->name;
 }
 
-
 Bool
-xf86IsOptionSet(const OptionInfoRec *table, int token)
+xf86IsOptionSet(const OptionInfoRec * table, int token)
 {
     OptionInfoPtr p;
 
@@ -751,137 +755,136 @@ xf86IsOptionSet(const OptionInfoRec *table, int token)
     return p && p->found;
 }
 
-
 char *
-xf86GetOptValString(const OptionInfoRec *table, int token)
+xf86GetOptValString(const OptionInfoRec * table, int token)
 {
     OptionInfoPtr p;
 
     p = xf86TokenToOptinfo(table, token);
     if (p && p->found)
-	return p->value.str;
+        return p->value.str;
     else
-	return NULL;
+        return NULL;
 }
 
-
 Bool
-xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value)
+xf86GetOptValInteger(const OptionInfoRec * table, int token, int *value)
 {
     OptionInfoPtr p;
 
     p = xf86TokenToOptinfo(table, token);
     if (p && p->found) {
-	*value = p->value.num;
-	return TRUE;
-    } else
-	return FALSE;
+        *value = p->value.num;
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
-
 Bool
-xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value)
+xf86GetOptValULong(const OptionInfoRec * table, int token, unsigned long *value)
 {
     OptionInfoPtr p;
 
     p = xf86TokenToOptinfo(table, token);
     if (p && p->found) {
-	*value = p->value.num;
-	return TRUE;
-    } else
-	return FALSE;
+        *value = p->value.num;
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
-
 Bool
-xf86GetOptValReal(const OptionInfoRec *table, int token, double *value)
+xf86GetOptValReal(const OptionInfoRec * table, int token, double *value)
 {
     OptionInfoPtr p;
 
     p = xf86TokenToOptinfo(table, token);
     if (p && p->found) {
-	*value = p->value.realnum;
-	return TRUE;
-    } else
-	return FALSE;
+        *value = p->value.realnum;
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
-
 Bool
-xf86GetOptValFreq(const OptionInfoRec *table, int token,
-		  OptFreqUnits expectedUnits, double *value)
+xf86GetOptValFreq(const OptionInfoRec * table, int token,
+                  OptFreqUnits expectedUnits, double *value)
 {
     OptionInfoPtr p;
 
     p = xf86TokenToOptinfo(table, token);
     if (p && p->found) {
-	if (p->value.freq.units > 0) {
-	    /* Units give, so the scaling is known. */
-	    switch (expectedUnits) {
-	    case OPTUNITS_HZ:
-		*value = p->value.freq.freq;
-		break;
-	    case OPTUNITS_KHZ:
-		*value = p->value.freq.freq / 1000.0;
-		break;
-	    case OPTUNITS_MHZ:
-		*value = p->value.freq.freq / 1000000.0;
-		break;
-	    }
-	} else {
-	    /* No units given, so try to guess the scaling. */
-	    switch (expectedUnits) {
-	    case OPTUNITS_HZ:
-		*value = p->value.freq.freq;
-		break;
-	    case OPTUNITS_KHZ:
-		if (p->value.freq.freq > 1000.0)
-		    *value = p->value.freq.freq / 1000.0;
-		else
-		    *value = p->value.freq.freq;
-		break;
-	    case OPTUNITS_MHZ:
-		if (p->value.freq.freq > 1000000.0)
-		    *value = p->value.freq.freq / 1000000.0;
-		else if (p->value.freq.freq > 1000.0)
-		    *value = p->value.freq.freq / 1000.0;
-		else
-		    *value = p->value.freq.freq;
-	    }
-	}
-	return TRUE;
-    } else
-	return FALSE;
+        if (p->value.freq.units > 0) {
+            /* Units give, so the scaling is known. */
+            switch (expectedUnits) {
+            case OPTUNITS_HZ:
+                *value = p->value.freq.freq;
+                break;
+            case OPTUNITS_KHZ:
+                *value = p->value.freq.freq / 1000.0;
+                break;
+            case OPTUNITS_MHZ:
+                *value = p->value.freq.freq / 1000000.0;
+                break;
+            }
+        }
+        else {
+            /* No units given, so try to guess the scaling. */
+            switch (expectedUnits) {
+            case OPTUNITS_HZ:
+                *value = p->value.freq.freq;
+                break;
+            case OPTUNITS_KHZ:
+                if (p->value.freq.freq > 1000.0)
+                    *value = p->value.freq.freq / 1000.0;
+                else
+                    *value = p->value.freq.freq;
+                break;
+            case OPTUNITS_MHZ:
+                if (p->value.freq.freq > 1000000.0)
+                    *value = p->value.freq.freq / 1000000.0;
+                else if (p->value.freq.freq > 1000.0)
+                    *value = p->value.freq.freq / 1000.0;
+                else
+                    *value = p->value.freq.freq;
+            }
+        }
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
-
 Bool
-xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value)
+xf86GetOptValBool(const OptionInfoRec * table, int token, Bool *value)
 {
     OptionInfoPtr p;
 
     p = xf86TokenToOptinfo(table, token);
     if (p && p->found) {
-	*value = p->value.bool;
-	return TRUE;
-    } else
-	return FALSE;
+        *value = p->value.bool;
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
-
 Bool
-xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def)
+xf86ReturnOptValBool(const OptionInfoRec * table, int token, Bool def)
 {
     OptionInfoPtr p;
 
     p = xf86TokenToOptinfo(table, token);
     if (p && p->found) {
-	return p->value.bool;
-    } else
-	return def;
+        return p->value.bool;
+    }
+    else
+        return def;
 }
 
-
 int
 xf86NameCmp(const char *s1, const char *s2)
 {
@@ -895,21 +898,21 @@ xf86NormalizeName(const char *s)
     const char *p;
 
     if (s == NULL)
-	return NULL;
+        return NULL;
 
     ret = malloc(strlen(s) + 1);
     for (p = s, q = ret; *p != 0; p++) {
-	switch (*p) {
-	case '_':
-	case ' ':
-	case '\t':
-	    continue;
-	default:
-	    if (isupper(*p))
-		*q++ = tolower(*p);
-	    else
-		*q++ = *p;
-	}
+        switch (*p) {
+        case '_':
+        case ' ':
+        case '\t':
+            continue;
+        default:
+            if (isupper(*p))
+                *q++ = tolower(*p);
+            else
+                *q++ = *p;
+        }
     }
     *q = '\0';
     return ret;
diff --git a/xorg-server/hw/xfree86/common/xf86Optionstr.h b/xorg-server/hw/xfree86/common/xf86Optionstr.h
index fc9385617..c38499cb5 100644
--- a/xorg-server/hw/xfree86/common/xf86Optionstr.h
+++ b/xorg-server/hw/xfree86/common/xf86Optionstr.h
@@ -29,15 +29,13 @@
 /*
  * All options are stored using this data type.
  */
-typedef struct _XF86OptionRec
-{
-	GenericListRec list;
-	char *opt_name;
-	char *opt_val;
-	int opt_used;
-	char *opt_comment;
-}
-XF86OptionRec;
+typedef struct _XF86OptionRec {
+    GenericListRec list;
+    char *opt_name;
+    char *opt_val;
+    int opt_used;
+    char *opt_comment;
+} XF86OptionRec;
 
 typedef struct _InputOption *XF86OptionPtr;
 
diff --git a/xorg-server/hw/xfree86/common/xf86PM.c b/xorg-server/hw/xfree86/common/xf86PM.c
index 47e0297d6..f69fffa0e 100644
--- a/xorg-server/hw/xfree86/common/xf86PM.c
+++ b/xorg-server/hw/xfree86/common/xf86PM.c
@@ -35,60 +35,90 @@
 #include "xf86Xinput.h"
 #include "xf86_OSproc.h"
 
-int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num) = NULL;
-pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event) = NULL;
+int (*xf86PMGetEventFromOs) (int fd, pmEvent * events, int num) = NULL;
+pmWait (*xf86PMConfirmEventToOs) (int fd, pmEvent event) = NULL;
 
 static Bool suspended = FALSE;
 
 static int
 eventName(pmEvent event, const char **str)
 {
-    switch(event) {
-    case XF86_APM_SYS_STANDBY: *str="System Standby Request"; return 0;
-    case XF86_APM_SYS_SUSPEND: *str="System Suspend Request"; return 0;
-    case XF86_APM_CRITICAL_SUSPEND: *str="Critical Suspend"; return 0;
-    case XF86_APM_USER_STANDBY: *str="User System Standby Request"; return 0;
-    case XF86_APM_USER_SUSPEND: *str="User System Suspend Request"; return 0;
-    case XF86_APM_STANDBY_RESUME: *str="System Standby Resume"; return 0;
-    case XF86_APM_NORMAL_RESUME: *str="Normal Resume System"; return 0;
-    case XF86_APM_CRITICAL_RESUME: *str="Critical Resume System"; return 0;
-    case XF86_APM_LOW_BATTERY: *str="Battery Low"; return 3;
-    case XF86_APM_POWER_STATUS_CHANGE: *str="Power Status Change";return 3;
-    case XF86_APM_UPDATE_TIME: *str="Update Time";return 3;
-    case XF86_APM_CAPABILITY_CHANGED: *str="Capability Changed"; return 3;
-    case XF86_APM_STANDBY_FAILED: *str="Standby Request Failed"; return 0;
-    case XF86_APM_SUSPEND_FAILED: *str="Suspend Request Failed"; return 0;
-    default: *str="Unknown Event"; return 0;
+    switch (event) {
+    case XF86_APM_SYS_STANDBY:
+        *str = "System Standby Request";
+        return 0;
+    case XF86_APM_SYS_SUSPEND:
+        *str = "System Suspend Request";
+        return 0;
+    case XF86_APM_CRITICAL_SUSPEND:
+        *str = "Critical Suspend";
+        return 0;
+    case XF86_APM_USER_STANDBY:
+        *str = "User System Standby Request";
+        return 0;
+    case XF86_APM_USER_SUSPEND:
+        *str = "User System Suspend Request";
+        return 0;
+    case XF86_APM_STANDBY_RESUME:
+        *str = "System Standby Resume";
+        return 0;
+    case XF86_APM_NORMAL_RESUME:
+        *str = "Normal Resume System";
+        return 0;
+    case XF86_APM_CRITICAL_RESUME:
+        *str = "Critical Resume System";
+        return 0;
+    case XF86_APM_LOW_BATTERY:
+        *str = "Battery Low";
+        return 3;
+    case XF86_APM_POWER_STATUS_CHANGE:
+        *str = "Power Status Change";
+        return 3;
+    case XF86_APM_UPDATE_TIME:
+        *str = "Update Time";
+        return 3;
+    case XF86_APM_CAPABILITY_CHANGED:
+        *str = "Capability Changed";
+        return 3;
+    case XF86_APM_STANDBY_FAILED:
+        *str = "Standby Request Failed";
+        return 0;
+    case XF86_APM_SUSPEND_FAILED:
+        *str = "Suspend Request Failed";
+        return 0;
+    default:
+        *str = "Unknown Event";
+        return 0;
     }
 }
 
 static int sigio_blocked_for_suspend;
 
 static void
-suspend (pmEvent event, Bool undo)
+suspend(pmEvent event, Bool undo)
 {
     int i;
     InputInfoPtr pInfo;
 
     for (i = 0; i < xf86NumScreens; i++) {
-	if (xf86Screens[i]->EnableDisableFBAccess)
-	    (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
+        if (xf86Screens[i]->EnableDisableFBAccess)
+            (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
     }
     pInfo = xf86InputDevs;
     while (pInfo) {
-	DisableDevice(pInfo->dev, TRUE);
-	pInfo = pInfo->next;
+        DisableDevice(pInfo->dev, TRUE);
+        pInfo = pInfo->next;
     }
     sigio_blocked_for_suspend = xf86BlockSIGIO();
     for (i = 0; i < xf86NumScreens; i++) {
-	if (xf86Screens[i]->PMEvent)
-	    xf86Screens[i]->PMEvent(i,event,undo);
-	else {
-	    xf86Screens[i]->LeaveVT(i, 0);
-	    xf86Screens[i]->vtSema = FALSE;
-	}
+        if (xf86Screens[i]->PMEvent)
+            xf86Screens[i]->PMEvent(i, event, undo);
+        else {
+            xf86Screens[i]->LeaveVT(i, 0);
+            xf86Screens[i]->vtSema = FALSE;
+        }
     }
-    xf86AccessLeave();      
+    xf86AccessLeave();
 
 }
 
@@ -100,23 +130,23 @@ resume(pmEvent event, Bool undo)
 
     xf86AccessEnter();
     for (i = 0; i < xf86NumScreens; i++) {
-	if (xf86Screens[i]->PMEvent)
-	    xf86Screens[i]->PMEvent(i,event,undo);
-	else {
-	    xf86Screens[i]->vtSema = TRUE;
-	    xf86Screens[i]->EnterVT(i, 0);
-	}
+        if (xf86Screens[i]->PMEvent)
+            xf86Screens[i]->PMEvent(i, event, undo);
+        else {
+            xf86Screens[i]->vtSema = TRUE;
+            xf86Screens[i]->EnterVT(i, 0);
+        }
     }
     xf86UnblockSIGIO(sigio_blocked_for_suspend);
     for (i = 0; i < xf86NumScreens; i++) {
-	if (xf86Screens[i]->EnableDisableFBAccess)
-	    (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
+        if (xf86Screens[i]->EnableDisableFBAccess)
+            (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
     }
     dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
     pInfo = xf86InputDevs;
     while (pInfo) {
-	EnableDevice(pInfo->dev, TRUE);
-	pInfo = pInfo->next;
+        EnableDevice(pInfo->dev, TRUE);
+        pInfo = pInfo->next;
     }
 }
 
@@ -124,43 +154,44 @@ static void
 DoApmEvent(pmEvent event, Bool undo)
 {
     int i, was_blocked;
-    
-    switch(event) {
+
+    switch (event) {
 #if 0
     case XF86_APM_SYS_STANDBY:
     case XF86_APM_USER_STANDBY:
 #endif
     case XF86_APM_SYS_SUSPEND:
-    case XF86_APM_CRITICAL_SUSPEND: /*do we want to delay a critical suspend?*/
+    case XF86_APM_CRITICAL_SUSPEND:    /*do we want to delay a critical suspend? */
     case XF86_APM_USER_SUSPEND:
-	/* should we do this ? */
-	if (!undo && !suspended) {
-	    suspend(event,undo);
-	    suspended = TRUE;
-	} else if (undo && suspended) {
-	    resume(event,undo);
-	    suspended = FALSE;
-	}
-	break;
+        /* should we do this ? */
+        if (!undo && !suspended) {
+            suspend(event, undo);
+            suspended = TRUE;
+        }
+        else if (undo && suspended) {
+            resume(event, undo);
+            suspended = FALSE;
+        }
+        break;
 #if 0
     case XF86_APM_STANDBY_RESUME:
 #endif
     case XF86_APM_NORMAL_RESUME:
     case XF86_APM_CRITICAL_RESUME:
-	if (suspended) {
-	    resume(event,undo);
-	    suspended = FALSE;
-	}
-	break;
+        if (suspended) {
+            resume(event, undo);
+            suspended = FALSE;
+        }
+        break;
     default:
-	was_blocked = xf86BlockSIGIO();
-	for (i = 0; i < xf86NumScreens; i++) {
-	    if (xf86Screens[i]->PMEvent) {
-		xf86Screens[i]->PMEvent(i,event,undo);
-	    }
-	}
-	xf86UnblockSIGIO(was_blocked);
-	break;
+        was_blocked = xf86BlockSIGIO();
+        for (i = 0; i < xf86NumScreens; i++) {
+            if (xf86Screens[i]->PMEvent) {
+                xf86Screens[i]->PMEvent(i, event, undo);
+            }
+        }
+        xf86UnblockSIGIO(was_blocked);
+        break;
     }
 }
 
@@ -170,39 +201,39 @@ void
 xf86HandlePMEvents(int fd, pointer data)
 {
     pmEvent events[MAX_NO_EVENTS];
-    int i,n;
+    int i, n;
     Bool wait = FALSE;
 
     if (!xf86PMGetEventFromOs)
-	return;
-
-    if ((n = xf86PMGetEventFromOs(fd,events,MAX_NO_EVENTS))) {
-	do {
-	    for (i = 0; i < n; i++) {
-		const char *str = NULL;
-		int verb = eventName(events[i],&str);
-
-		xf86MsgVerb(X_INFO,verb,"PM Event received: %s\n",str);
-		DoApmEvent(events[i],FALSE);
-		switch (xf86PMConfirmEventToOs(fd,events[i])) {
-		case PM_WAIT:
-		    wait = TRUE;
-		    break;
-		case PM_CONTINUE:
-		    wait = FALSE;
-		    break;
-		case PM_FAILED:
-		    DoApmEvent(events[i],TRUE);
-		    wait = FALSE;
-		    break;
-		default:
-		    break;
-		}
-	    }
-	    if (wait)
-		n = xf86PMGetEventFromOs(fd,events,MAX_NO_EVENTS);
-	    else
-		break;
-	} while (1);
+        return;
+
+    if ((n = xf86PMGetEventFromOs(fd, events, MAX_NO_EVENTS))) {
+        do {
+            for (i = 0; i < n; i++) {
+                const char *str = NULL;
+                int verb = eventName(events[i], &str);
+
+                xf86MsgVerb(X_INFO, verb, "PM Event received: %s\n", str);
+                DoApmEvent(events[i], FALSE);
+                switch (xf86PMConfirmEventToOs(fd, events[i])) {
+                case PM_WAIT:
+                    wait = TRUE;
+                    break;
+                case PM_CONTINUE:
+                    wait = FALSE;
+                    break;
+                case PM_FAILED:
+                    DoApmEvent(events[i], TRUE);
+                    wait = FALSE;
+                    break;
+                default:
+                    break;
+                }
+            }
+            if (wait)
+                n = xf86PMGetEventFromOs(fd, events, MAX_NO_EVENTS);
+            else
+                break;
+        } while (1);
     }
 }
diff --git a/xorg-server/hw/xfree86/common/xf86Priv.h b/xorg-server/hw/xfree86/common/xf86Priv.h
index 255407b48..8d9cb5539 100644
--- a/xorg-server/hw/xfree86/common/xf86Priv.h
+++ b/xorg-server/hw/xfree86/common/xf86Priv.h
@@ -45,53 +45,55 @@
  */
 extern _X_EXPORT const char *xf86ConfigFile;
 extern _X_EXPORT const char *xf86ConfigDir;
-extern _X_EXPORT  Bool xf86AllowMouseOpenFail;
+extern _X_EXPORT Bool xf86AllowMouseOpenFail;
+
 #ifdef XF86VIDMODE
-extern _X_EXPORT  Bool xf86VidModeDisabled;
-extern _X_EXPORT  Bool xf86VidModeAllowNonLocal;
-#endif 
-extern _X_EXPORT  Bool xf86fpFlag;
-extern _X_EXPORT  Bool xf86sFlag;
-extern _X_EXPORT  Bool xf86bsEnableFlag;
-extern _X_EXPORT  Bool xf86bsDisableFlag;
-extern _X_EXPORT  Bool xf86silkenMouseDisableFlag;
-extern _X_EXPORT  Bool xf86xkbdirFlag;
+extern _X_EXPORT Bool xf86VidModeDisabled;
+extern _X_EXPORT Bool xf86VidModeAllowNonLocal;
+#endif
+extern _X_EXPORT Bool xf86fpFlag;
+extern _X_EXPORT Bool xf86sFlag;
+extern _X_EXPORT Bool xf86bsEnableFlag;
+extern _X_EXPORT Bool xf86bsDisableFlag;
+extern _X_EXPORT Bool xf86silkenMouseDisableFlag;
+extern _X_EXPORT Bool xf86xkbdirFlag;
+
 #ifdef HAVE_ACPI
-extern _X_EXPORT  Bool xf86acpiDisableFlag;
+extern _X_EXPORT Bool xf86acpiDisableFlag;
 #endif
-extern _X_EXPORT  char *xf86LayoutName;
-extern _X_EXPORT  char *xf86ScreenName;
-extern _X_EXPORT  char *xf86PointerName;
-extern _X_EXPORT  char *xf86KeyboardName;
-extern _X_EXPORT  int xf86FbBpp;
-extern _X_EXPORT  int xf86Depth;
-extern _X_EXPORT  Pix24Flags xf86Pix24;
-extern _X_EXPORT  rgb xf86Weight;
-extern _X_EXPORT  Bool xf86FlipPixels;
-extern _X_EXPORT  Gamma xf86Gamma;
-extern _X_EXPORT  const char *xf86ServerName;
+extern _X_EXPORT char *xf86LayoutName;
+extern _X_EXPORT char *xf86ScreenName;
+extern _X_EXPORT char *xf86PointerName;
+extern _X_EXPORT char *xf86KeyboardName;
+extern _X_EXPORT int xf86FbBpp;
+extern _X_EXPORT int xf86Depth;
+extern _X_EXPORT Pix24Flags xf86Pix24;
+extern _X_EXPORT rgb xf86Weight;
+extern _X_EXPORT Bool xf86FlipPixels;
+extern _X_EXPORT Gamma xf86Gamma;
+extern _X_EXPORT const char *xf86ServerName;
 
 /* Other parameters */
 
-extern _X_EXPORT  xf86InfoRec xf86Info;
-extern _X_EXPORT  const char *xf86ModulePath;
-extern _X_EXPORT  MessageType xf86ModPathFrom;
-extern _X_EXPORT  const char *xf86LogFile;
-extern _X_EXPORT  MessageType xf86LogFileFrom;
-extern _X_EXPORT  Bool xf86LogFileWasOpened;
-extern _X_EXPORT  serverLayoutRec xf86ConfigLayout;
-
-extern _X_EXPORT  DriverPtr *xf86DriverList;
-extern _X_EXPORT  int xf86NumDrivers;
-extern _X_EXPORT  Bool xf86Resetting;
-extern _X_EXPORT  Bool xf86Initialising;
-extern _X_EXPORT  int xf86NumScreens;
-extern _X_EXPORT  const char *xf86VisualNames[];
-extern _X_EXPORT  int xf86Verbose;                 /* verbosity level */
-extern _X_EXPORT  int xf86LogVerbose;		/* log file verbosity level */
-extern _X_EXPORT  Bool xorgHWAccess;
-
-extern _X_EXPORT  RootWinPropPtr *xf86RegisteredPropertiesTable;
+extern _X_EXPORT xf86InfoRec xf86Info;
+extern _X_EXPORT const char *xf86ModulePath;
+extern _X_EXPORT MessageType xf86ModPathFrom;
+extern _X_EXPORT const char *xf86LogFile;
+extern _X_EXPORT MessageType xf86LogFileFrom;
+extern _X_EXPORT Bool xf86LogFileWasOpened;
+extern _X_EXPORT serverLayoutRec xf86ConfigLayout;
+
+extern _X_EXPORT DriverPtr *xf86DriverList;
+extern _X_EXPORT int xf86NumDrivers;
+extern _X_EXPORT Bool xf86Resetting;
+extern _X_EXPORT Bool xf86Initialising;
+extern _X_EXPORT int xf86NumScreens;
+extern _X_EXPORT const char *xf86VisualNames[];
+extern _X_EXPORT int xf86Verbose;       /* verbosity level */
+extern _X_EXPORT int xf86LogVerbose;    /* log file verbosity level */
+extern _X_EXPORT Bool xorgHWAccess;
+
+extern _X_EXPORT RootWinPropPtr *xf86RegisteredPropertiesTable;
 
 #ifndef DEFAULT_VERBOSE
 #define DEFAULT_VERBOSE		0
@@ -125,29 +127,43 @@ extern _X_EXPORT const DisplayModeRec xf86DefaultModes[];
 extern _X_EXPORT const int xf86NumDefaultModes;
 
 /* xf86Configure.c */
-extern _X_EXPORT void DoConfigure(void) _X_NORETURN;
-extern _X_EXPORT void DoShowOptions(void) _X_NORETURN;
+extern _X_EXPORT void
+DoConfigure(void)
+    _X_NORETURN;
+extern _X_EXPORT void
+DoShowOptions(void)
+    _X_NORETURN;
 
 /* xf86Events.c */
 
-extern _X_EXPORT void xf86Wakeup(pointer blockData, int err, pointer pReadmask);
-extern _X_HIDDEN int xf86SigWrapper(int signo);
-extern _X_EXPORT void xf86HandlePMEvents(int fd, pointer data);
-extern _X_EXPORT int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num);
-extern _X_EXPORT pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event);
+extern _X_EXPORT void
+xf86Wakeup(pointer blockData, int err, pointer pReadmask);
+extern _X_HIDDEN int
+xf86SigWrapper(int signo);
+extern _X_EXPORT void
+xf86HandlePMEvents(int fd, pointer data);
+extern _X_EXPORT int (*xf86PMGetEventFromOs) (int fd, pmEvent * events,
+                                              int num);
+extern _X_EXPORT pmWait (*xf86PMConfirmEventToOs) (int fd, pmEvent event);
 
 /* xf86Helper.c */
-extern _X_EXPORT void xf86LogInit(void);
-extern _X_EXPORT void xf86CloseLog(enum ExitCode error);
+extern _X_EXPORT void
+xf86LogInit(void);
+extern _X_EXPORT void
+xf86CloseLog(enum ExitCode error);
 
 /* xf86Init.c */
-extern _X_EXPORT Bool xf86LoadModules(char **list, pointer *optlist);
-extern _X_EXPORT int xf86SetVerbosity(int verb);
-extern _X_EXPORT int xf86SetLogVerbosity(int verb);
-extern _X_EXPORT Bool xf86CallDriverProbe( struct _DriverRec * drv, Bool detect_only );
-extern _X_EXPORT Bool xf86PrivsElevated(void);
-
-#endif /* _NO_XF86_PROTOTYPES */
-
-
-#endif /* _XF86PRIV_H */
+extern _X_EXPORT Bool
+xf86LoadModules(char **list, pointer *optlist);
+extern _X_EXPORT int
+xf86SetVerbosity(int verb);
+extern _X_EXPORT int
+xf86SetLogVerbosity(int verb);
+extern _X_EXPORT Bool
+xf86CallDriverProbe(struct _DriverRec *drv, Bool detect_only);
+extern _X_EXPORT Bool
+xf86PrivsElevated(void);
+
+#endif                          /* _NO_XF86_PROTOTYPES */
+
+#endif                          /* _XF86PRIV_H */
diff --git a/xorg-server/hw/xfree86/common/xf86RandR.c b/xorg-server/hw/xfree86/common/xf86RandR.c
index d0e47841e..abd894dff 100644
--- a/xorg-server/hw/xfree86/common/xf86RandR.c
+++ b/xorg-server/hw/xfree86/common/xf86RandR.c
@@ -37,13 +37,13 @@
 #include "inputstr.h"
 
 typedef struct _xf86RandRInfo {
-    CreateScreenResourcesProcPtr    CreateScreenResources;
-    CloseScreenProcPtr		    CloseScreen;
-    int				    virtualX;
-    int				    virtualY;
-    int				    mmWidth;
-    int				    mmHeight;
-    Rotation			    rotation;
+    CreateScreenResourcesProcPtr CreateScreenResources;
+    CloseScreenProcPtr CloseScreen;
+    int virtualX;
+    int virtualY;
+    int mmWidth;
+    int mmHeight;
+    Rotation rotation;
 } XF86RandRInfoRec, *XF86RandRInfoPtr;
 
 static DevPrivateKeyRec xf86RandRKeyRec;
@@ -52,171 +52,162 @@ static DevPrivateKey xf86RandRKey;
 #define XF86RANDRINFO(p) ((XF86RandRInfoPtr)dixLookupPrivate(&(p)->devPrivates, xf86RandRKey))
 
 static int
-xf86RandRModeRefresh (DisplayModePtr mode)
+xf86RandRModeRefresh(DisplayModePtr mode)
 {
     if (mode->VRefresh)
-	return (int) (mode->VRefresh + 0.5);
+        return (int) (mode->VRefresh + 0.5);
     else if (mode->Clock == 0)
-	return 0;
+        return 0;
     else
-	return (int) (mode->Clock * 1000.0 / mode->HTotal / mode->VTotal + 0.5);
+        return (int) (mode->Clock * 1000.0 / mode->HTotal / mode->VTotal + 0.5);
 }
 
 static Bool
-xf86RandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
+xf86RandRGetInfo(ScreenPtr pScreen, Rotation * rotations)
 {
-    RRScreenSizePtr	    pSize;
-    ScrnInfoPtr		    scrp = XF86SCRNINFO(pScreen);
-    XF86RandRInfoPtr	    randrp = XF86RANDRINFO(pScreen);
-    DisplayModePtr	    mode;
-    int			    refresh0 = 60;
-    xorgRRModeMM	    RRModeMM;
+    RRScreenSizePtr pSize;
+    ScrnInfoPtr scrp = XF86SCRNINFO(pScreen);
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+    DisplayModePtr mode;
+    int refresh0 = 60;
+    xorgRRModeMM RRModeMM;
 
     *rotations = RR_Rotate_0;
 
-    for (mode = scrp->modes; mode != NULL ; mode = mode->next)
-    {
-	int refresh = xf86RandRModeRefresh (mode);
-
-	if (mode == scrp->modes)
-	    refresh0 = refresh;
-
-	RRModeMM.mode = mode;
-	RRModeMM.virtX = randrp->virtualX;
-	RRModeMM.virtY = randrp->virtualY;
-	RRModeMM.mmWidth = randrp->mmWidth;
-	RRModeMM.mmHeight = randrp->mmHeight;
-
-	if(scrp->DriverFunc) {
-	   (*scrp->DriverFunc)(scrp, RR_GET_MODE_MM, &RRModeMM);
-	}
-
-	pSize = RRRegisterSize (pScreen,
-				mode->HDisplay, mode->VDisplay,
-				RRModeMM.mmWidth, RRModeMM.mmHeight);
-	if (!pSize)
-	    return FALSE;
-	RRRegisterRate (pScreen, pSize, refresh);
-	if (mode == scrp->currentMode &&
-	    mode->HDisplay == scrp->virtualX && mode->VDisplay == scrp->virtualY)
-	    RRSetCurrentConfig (pScreen, randrp->rotation, refresh, pSize);
-	if (mode->next == scrp->modes)
-	    break;
+    for (mode = scrp->modes; mode != NULL; mode = mode->next) {
+        int refresh = xf86RandRModeRefresh(mode);
+
+        if (mode == scrp->modes)
+            refresh0 = refresh;
+
+        RRModeMM.mode = mode;
+        RRModeMM.virtX = randrp->virtualX;
+        RRModeMM.virtY = randrp->virtualY;
+        RRModeMM.mmWidth = randrp->mmWidth;
+        RRModeMM.mmHeight = randrp->mmHeight;
+
+        if (scrp->DriverFunc) {
+            (*scrp->DriverFunc) (scrp, RR_GET_MODE_MM, &RRModeMM);
+        }
+
+        pSize = RRRegisterSize(pScreen,
+                               mode->HDisplay, mode->VDisplay,
+                               RRModeMM.mmWidth, RRModeMM.mmHeight);
+        if (!pSize)
+            return FALSE;
+        RRRegisterRate(pScreen, pSize, refresh);
+        if (mode == scrp->currentMode &&
+            mode->HDisplay == scrp->virtualX &&
+            mode->VDisplay == scrp->virtualY)
+            RRSetCurrentConfig(pScreen, randrp->rotation, refresh, pSize);
+        if (mode->next == scrp->modes)
+            break;
     }
     if (scrp->currentMode->HDisplay != randrp->virtualX ||
-	scrp->currentMode->VDisplay != randrp->virtualY)
-    {
-	mode = scrp->modes;
-
-	RRModeMM.mode = NULL;
-	RRModeMM.virtX = randrp->virtualX;
-	RRModeMM.virtY = randrp->virtualY;
-	RRModeMM.mmWidth = randrp->mmWidth;
-	RRModeMM.mmHeight = randrp->mmHeight;
-
-	if(scrp->DriverFunc) {
-	   (*scrp->DriverFunc)(scrp, RR_GET_MODE_MM, &RRModeMM);
-	}
-
-	pSize = RRRegisterSize (pScreen,
-				randrp->virtualX, randrp->virtualY,
-				RRModeMM.mmWidth, RRModeMM.mmHeight);
-	if (!pSize)
-	    return FALSE;
-	RRRegisterRate (pScreen, pSize, refresh0);
-	if (scrp->virtualX == randrp->virtualX &&
-	    scrp->virtualY == randrp->virtualY)
-	{
-	    RRSetCurrentConfig (pScreen, randrp->rotation, refresh0, pSize);
-	}
+        scrp->currentMode->VDisplay != randrp->virtualY) {
+        mode = scrp->modes;
+
+        RRModeMM.mode = NULL;
+        RRModeMM.virtX = randrp->virtualX;
+        RRModeMM.virtY = randrp->virtualY;
+        RRModeMM.mmWidth = randrp->mmWidth;
+        RRModeMM.mmHeight = randrp->mmHeight;
+
+        if (scrp->DriverFunc) {
+            (*scrp->DriverFunc) (scrp, RR_GET_MODE_MM, &RRModeMM);
+        }
+
+        pSize = RRRegisterSize(pScreen,
+                               randrp->virtualX, randrp->virtualY,
+                               RRModeMM.mmWidth, RRModeMM.mmHeight);
+        if (!pSize)
+            return FALSE;
+        RRRegisterRate(pScreen, pSize, refresh0);
+        if (scrp->virtualX == randrp->virtualX &&
+            scrp->virtualY == randrp->virtualY) {
+            RRSetCurrentConfig(pScreen, randrp->rotation, refresh0, pSize);
+        }
     }
 
     /* If there is driver support for randr, let it set our supported rotations */
-    if(scrp->DriverFunc) {
-	xorgRRRotation RRRotation;
+    if (scrp->DriverFunc) {
+        xorgRRRotation RRRotation;
 
-	RRRotation.RRRotations = *rotations;
-	if (!(*scrp->DriverFunc)(scrp, RR_GET_INFO, &RRRotation))
-	    return TRUE;
-	*rotations = RRRotation.RRRotations;
+        RRRotation.RRRotations = *rotations;
+        if (!(*scrp->DriverFunc) (scrp, RR_GET_INFO, &RRRotation))
+            return TRUE;
+        *rotations = RRRotation.RRRotations;
     }
 
     return TRUE;
 }
 
 static Bool
-xf86RandRSetMode (ScreenPtr	    pScreen,
-		  DisplayModePtr    mode,
-		  Bool		    useVirtual,
-		  int		    mmWidth,
-		  int		    mmHeight)
+xf86RandRSetMode(ScreenPtr pScreen,
+                 DisplayModePtr mode,
+                 Bool useVirtual, int mmWidth, int mmHeight)
 {
-    ScrnInfoPtr		scrp = XF86SCRNINFO(pScreen);
-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
-    int			oldWidth = pScreen->width;
-    int			oldHeight = pScreen->height;
-    int			oldmmWidth = pScreen->mmWidth;
-    int			oldmmHeight = pScreen->mmHeight;
-    int			oldVirtualX = scrp->virtualX;
-    int			oldVirtualY = scrp->virtualY;
-    WindowPtr		pRoot = pScreen->root;
-    Bool		ret = TRUE;
+    ScrnInfoPtr scrp = XF86SCRNINFO(pScreen);
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+    int oldWidth = pScreen->width;
+    int oldHeight = pScreen->height;
+    int oldmmWidth = pScreen->mmWidth;
+    int oldmmHeight = pScreen->mmHeight;
+    int oldVirtualX = scrp->virtualX;
+    int oldVirtualY = scrp->virtualY;
+    WindowPtr pRoot = pScreen->root;
+    Bool ret = TRUE;
 
     if (pRoot && scrp->vtSema)
-	(*scrp->EnableDisableFBAccess) (pScreen->myNum, FALSE);
-    if (useVirtual)
-    {
-	scrp->virtualX = randrp->virtualX;
-	scrp->virtualY = randrp->virtualY;
+        (*scrp->EnableDisableFBAccess) (pScreen->myNum, FALSE);
+    if (useVirtual) {
+        scrp->virtualX = randrp->virtualX;
+        scrp->virtualY = randrp->virtualY;
     }
-    else
-    {
-	scrp->virtualX = mode->HDisplay;
-	scrp->virtualY = mode->VDisplay;
+    else {
+        scrp->virtualX = mode->HDisplay;
+        scrp->virtualY = mode->VDisplay;
     }
 
     /*
      * The DIX forgets the physical dimensions we passed into RRRegisterSize, so
      * reconstruct them if possible.
      */
-    if(scrp->DriverFunc) {
-	xorgRRModeMM RRModeMM;
+    if (scrp->DriverFunc) {
+        xorgRRModeMM RRModeMM;
 
-	RRModeMM.mode = mode;
-	RRModeMM.virtX = scrp->virtualX;
-	RRModeMM.virtY = scrp->virtualY;
-	RRModeMM.mmWidth = mmWidth;
-	RRModeMM.mmHeight = mmHeight;
+        RRModeMM.mode = mode;
+        RRModeMM.virtX = scrp->virtualX;
+        RRModeMM.virtY = scrp->virtualY;
+        RRModeMM.mmWidth = mmWidth;
+        RRModeMM.mmHeight = mmHeight;
 
-	(*scrp->DriverFunc)(scrp, RR_GET_MODE_MM, &RRModeMM);
+        (*scrp->DriverFunc) (scrp, RR_GET_MODE_MM, &RRModeMM);
 
-	mmWidth = RRModeMM.mmWidth;
-	mmHeight = RRModeMM.mmHeight;
+        mmWidth = RRModeMM.mmWidth;
+        mmHeight = RRModeMM.mmHeight;
     }
-    if(randrp->rotation & (RR_Rotate_90 | RR_Rotate_270))
-    {
-	/* If the screen is rotated 90 or 270 degrees, swap the sizes. */
-	pScreen->width = scrp->virtualY;
-	pScreen->height = scrp->virtualX;
-	pScreen->mmWidth = mmHeight;
-	pScreen->mmHeight = mmWidth;
+    if (randrp->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
+        /* If the screen is rotated 90 or 270 degrees, swap the sizes. */
+        pScreen->width = scrp->virtualY;
+        pScreen->height = scrp->virtualX;
+        pScreen->mmWidth = mmHeight;
+        pScreen->mmHeight = mmWidth;
     }
-    else
-    {
-	pScreen->width = scrp->virtualX;
-	pScreen->height = scrp->virtualY;
-	pScreen->mmWidth = mmWidth;
-	pScreen->mmHeight = mmHeight;
+    else {
+        pScreen->width = scrp->virtualX;
+        pScreen->height = scrp->virtualY;
+        pScreen->mmWidth = mmWidth;
+        pScreen->mmHeight = mmHeight;
     }
-    if (!xf86SwitchMode (pScreen, mode))
-    {
-	pScreen->width = oldWidth;
-	pScreen->height = oldHeight;
-	pScreen->mmWidth = oldmmWidth;
-	pScreen->mmHeight = oldmmHeight;
-	scrp->virtualX = oldVirtualX;
-	scrp->virtualY = oldVirtualY;
-	ret = FALSE;
+    if (!xf86SwitchMode(pScreen, mode)) {
+        pScreen->width = oldWidth;
+        pScreen->height = oldHeight;
+        pScreen->mmWidth = oldmmWidth;
+        pScreen->mmHeight = oldmmHeight;
+        scrp->virtualX = oldVirtualX;
+        scrp->virtualY = oldVirtualY;
+        ret = FALSE;
     }
     /*
      * Make sure the layout is correct
@@ -226,120 +217,117 @@ xf86RandRSetMode (ScreenPtr	    pScreen,
     /*
      * Make sure the whole screen is visible
      */
-    xf86SetViewport (pScreen, pScreen->width, pScreen->height);
-    xf86SetViewport (pScreen, 0, 0);
+    xf86SetViewport(pScreen, pScreen->width, pScreen->height);
+    xf86SetViewport(pScreen, 0, 0);
     if (pRoot && scrp->vtSema)
-	(*scrp->EnableDisableFBAccess) (pScreen->myNum, TRUE);
+        (*scrp->EnableDisableFBAccess) (pScreen->myNum, TRUE);
     return ret;
 }
 
 static Bool
-xf86RandRSetConfig (ScreenPtr		pScreen,
-		    Rotation		rotation,
-		    int			rate,
-		    RRScreenSizePtr	pSize)
+xf86RandRSetConfig(ScreenPtr pScreen,
+                   Rotation rotation, int rate, RRScreenSizePtr pSize)
 {
-    ScrnInfoPtr		    scrp = XF86SCRNINFO(pScreen);
-    XF86RandRInfoPtr	    randrp = XF86RANDRINFO(pScreen);
-    DisplayModePtr	    mode;
-    int			    pos[MAXDEVICES][2];
-    Bool		    useVirtual = FALSE;
-    Rotation		    oldRotation = randrp->rotation;
-    DeviceIntPtr	    dev;
-    Bool		    view_adjusted = FALSE;
-
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-    {
-	if (!IsMaster(dev) && !IsFloating(dev))
-		continue;
-
-	miPointerGetPosition(dev, &pos[dev->id][0], &pos[dev->id][1]);
+    ScrnInfoPtr scrp = XF86SCRNINFO(pScreen);
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+    DisplayModePtr mode;
+    int pos[MAXDEVICES][2];
+    Bool useVirtual = FALSE;
+    Rotation oldRotation = randrp->rotation;
+    DeviceIntPtr dev;
+    Bool view_adjusted = FALSE;
+
+    for (dev = inputInfo.devices; dev; dev = dev->next) {
+        if (!IsMaster(dev) && !IsFloating(dev))
+            continue;
+
+        miPointerGetPosition(dev, &pos[dev->id][0], &pos[dev->id][1]);
     }
 
-    for (mode = scrp->modes; ; mode = mode->next)
-    {
-	if (mode->HDisplay == pSize->width &&
-	    mode->VDisplay == pSize->height &&
-	    (rate == 0 || xf86RandRModeRefresh (mode) == rate))
-	    break;
-	if (mode->next == scrp->modes)
-	{
-	    if (pSize->width == randrp->virtualX &&
-		pSize->height == randrp->virtualY)
-	    {
-		mode = scrp->modes;
-		useVirtual = TRUE;
-		break;
-	    }
-	    return FALSE;
-	}
+    for (mode = scrp->modes;; mode = mode->next) {
+        if (mode->HDisplay == pSize->width &&
+            mode->VDisplay == pSize->height &&
+            (rate == 0 || xf86RandRModeRefresh(mode) == rate))
+            break;
+        if (mode->next == scrp->modes) {
+            if (pSize->width == randrp->virtualX &&
+                pSize->height == randrp->virtualY) {
+                mode = scrp->modes;
+                useVirtual = TRUE;
+                break;
+            }
+            return FALSE;
+        }
     }
 
     if (randrp->rotation != rotation) {
 
         /* Have the driver do its thing. */
-	if (scrp->DriverFunc) {
-	    xorgRRRotation RRRotation;
-	    RRRotation.RRConfig.rotation = rotation;
-	    RRRotation.RRConfig.rate = rate;
-	    RRRotation.RRConfig.width = pSize->width;
-	    RRRotation.RRConfig.height = pSize->height;
-
-	    /*
-	     * Currently we need to rely on HW support for rotation.
-	     */
-	    if (!(*scrp->DriverFunc)(scrp, RR_SET_CONFIG, &RRRotation))
-		return FALSE;
-	} else
-	    return FALSE;
-
-	randrp->rotation = rotation;
+        if (scrp->DriverFunc) {
+            xorgRRRotation RRRotation;
+
+            RRRotation.RRConfig.rotation = rotation;
+            RRRotation.RRConfig.rate = rate;
+            RRRotation.RRConfig.width = pSize->width;
+            RRRotation.RRConfig.height = pSize->height;
+
+            /*
+             * Currently we need to rely on HW support for rotation.
+             */
+            if (!(*scrp->DriverFunc) (scrp, RR_SET_CONFIG, &RRRotation))
+                return FALSE;
+        }
+        else
+            return FALSE;
+
+        randrp->rotation = rotation;
     }
 
-    if (!xf86RandRSetMode (pScreen, mode, useVirtual, pSize->mmWidth, pSize->mmHeight)) {
-	if(randrp->rotation != oldRotation) {
-	   /* Have the driver undo its thing. */
-	   if (scrp->DriverFunc) {
-	       xorgRRRotation RRRotation;
-	       RRRotation.RRConfig.rotation = oldRotation;
-	       RRRotation.RRConfig.rate = xf86RandRModeRefresh (scrp->currentMode);
-	       RRRotation.RRConfig.width = scrp->virtualX;
-	       RRRotation.RRConfig.height = scrp->virtualY;
-	       (*scrp->DriverFunc)(scrp, RR_SET_CONFIG, &RRRotation);
-	   }
-
-	   randrp->rotation = oldRotation;
-	}
-	return FALSE;
+    if (!xf86RandRSetMode
+        (pScreen, mode, useVirtual, pSize->mmWidth, pSize->mmHeight)) {
+        if (randrp->rotation != oldRotation) {
+            /* Have the driver undo its thing. */
+            if (scrp->DriverFunc) {
+                xorgRRRotation RRRotation;
+
+                RRRotation.RRConfig.rotation = oldRotation;
+                RRRotation.RRConfig.rate =
+                    xf86RandRModeRefresh(scrp->currentMode);
+                RRRotation.RRConfig.width = scrp->virtualX;
+                RRRotation.RRConfig.height = scrp->virtualY;
+                (*scrp->DriverFunc) (scrp, RR_SET_CONFIG, &RRRotation);
+            }
+
+            randrp->rotation = oldRotation;
+        }
+        return FALSE;
     }
 
-
     update_desktop_dimensions();
 
     /*
      * Move the cursor back where it belongs; SwitchMode repositions it
      * FIXME: duplicated code, see modes/xf86RandR12.c
      */
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-    {
-	if (!IsMaster(dev) && !IsFloating(dev))
-		continue;
-
-	if (pScreen == miPointerGetScreen(dev)) {
-	    int px = pos[dev->id][0];
-	    int py = pos[dev->id][1];
-
-	    px = (px >= pScreen->width ? (pScreen->width - 1) : px);
-	    py = (py >= pScreen->height ? (pScreen->height - 1) : py);
-
-	    /* Setting the viewpoint makes only sense on one device */
-	    if (!view_adjusted && IsMaster(dev)) {
-		xf86SetViewport(pScreen, px, py);
-		view_adjusted = TRUE;
-	    }
-
-	    (*pScreen->SetCursorPosition) (dev, pScreen, px, py, FALSE);
-	}
+    for (dev = inputInfo.devices; dev; dev = dev->next) {
+        if (!IsMaster(dev) && !IsFloating(dev))
+            continue;
+
+        if (pScreen == miPointerGetScreen(dev)) {
+            int px = pos[dev->id][0];
+            int py = pos[dev->id][1];
+
+            px = (px >= pScreen->width ? (pScreen->width - 1) : px);
+            py = (py >= pScreen->height ? (pScreen->height - 1) : py);
+
+            /* Setting the viewpoint makes only sense on one device */
+            if (!view_adjusted && IsMaster(dev)) {
+                xf86SetViewport(pScreen, px, py);
+                view_adjusted = TRUE;
+            }
+
+            (*pScreen->SetCursorPosition) (dev, pScreen, px, py, FALSE);
+        }
     }
 
     return TRUE;
@@ -351,22 +339,23 @@ xf86RandRSetConfig (ScreenPtr		pScreen,
  * at the current mode size rather than the maximum size
  */
 static Bool
-xf86RandRCreateScreenResources (ScreenPtr pScreen)
+xf86RandRCreateScreenResources(ScreenPtr pScreen)
 {
-    XF86RandRInfoPtr	    randrp = XF86RANDRINFO(pScreen);
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+
 #if 0
-    ScrnInfoPtr		    scrp = XF86SCRNINFO(pScreen);
-    DisplayModePtr	    mode;
+    ScrnInfoPtr scrp = XF86SCRNINFO(pScreen);
+    DisplayModePtr mode;
 #endif
 
     pScreen->CreateScreenResources = randrp->CreateScreenResources;
     if (!(*pScreen->CreateScreenResources) (pScreen))
-	return FALSE;
+        return FALSE;
 
 #if 0
     mode = scrp->currentMode;
     if (mode)
-	xf86RandRSetMode (pScreen, mode, TRUE);
+        xf86RandRSetMode(pScreen, mode, TRUE);
 #endif
 
     return TRUE;
@@ -376,10 +365,10 @@ xf86RandRCreateScreenResources (ScreenPtr pScreen)
  * Reset size back to original
  */
 static Bool
-xf86RandRCloseScreen (int index, ScreenPtr pScreen)
+xf86RandRCloseScreen(int index, ScreenPtr pScreen)
 {
-    ScrnInfoPtr		    scrp = XF86SCRNINFO(pScreen);
-    XF86RandRInfoPtr	    randrp = XF86RANDRINFO(pScreen);
+    ScrnInfoPtr scrp = XF86SCRNINFO(pScreen);
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
 
     scrp->virtualX = pScreen->width = randrp->virtualX;
     scrp->virtualY = pScreen->height = randrp->virtualY;
@@ -394,7 +383,7 @@ Rotation
 xf86GetRotation(ScreenPtr pScreen)
 {
     if (xf86RandRKey == NULL)
-       return RR_Rotate_0;
+        return RR_Rotate_0;
 
     return XF86RANDRINFO(pScreen)->rotation;
 }
@@ -402,67 +391,65 @@ xf86GetRotation(ScreenPtr pScreen)
 /* Function to change RandR's idea of the virtual screen size */
 Bool
 xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
-	int newvirtX, int newvirtY, int newmmWidth, int newmmHeight,
-	Bool resetMode)
+                                    int newvirtX, int newvirtY, int newmmWidth,
+                                    int newmmHeight, Bool resetMode)
 {
     XF86RandRInfoPtr randrp;
 
     if (xf86RandRKey == NULL)
-	return FALSE;
+        return FALSE;
 
     randrp = XF86RANDRINFO(pScreen);
     if (randrp == NULL)
-	return FALSE;
+        return FALSE;
 
     if (newvirtX > 0)
-	randrp->virtualX = newvirtX;
+        randrp->virtualX = newvirtX;
 
     if (newvirtY > 0)
-	randrp->virtualY = newvirtY;
+        randrp->virtualY = newvirtY;
 
     if (newmmWidth > 0)
-	randrp->mmWidth = newmmWidth;
+        randrp->mmWidth = newmmWidth;
 
     if (newmmHeight > 0)
-	randrp->mmHeight = newmmHeight;
+        randrp->mmHeight = newmmHeight;
 
     /* This is only for during server start */
     if (resetMode) {
-	return (xf86RandRSetMode(pScreen,
-		  XF86SCRNINFO(pScreen)->currentMode,
-		  TRUE,
-		  pScreen->mmWidth, pScreen->mmHeight));
+        return (xf86RandRSetMode(pScreen,
+                                 XF86SCRNINFO(pScreen)->currentMode,
+                                 TRUE, pScreen->mmWidth, pScreen->mmHeight));
     }
 
     return TRUE;
 }
 
 Bool
-xf86RandRInit (ScreenPtr    pScreen)
+xf86RandRInit(ScreenPtr pScreen)
 {
-    rrScrPrivPtr	rp;
-    XF86RandRInfoPtr	randrp;
-    ScrnInfoPtr		scrp = XF86SCRNINFO(pScreen);
+    rrScrPrivPtr rp;
+    XF86RandRInfoPtr randrp;
+    ScrnInfoPtr scrp = XF86SCRNINFO(pScreen);
 
 #ifdef PANORAMIX
     /* XXX disable RandR when using Xinerama */
     if (!noPanoramiXExtension)
-	return TRUE;
+        return TRUE;
 #endif
 
     xf86RandRKey = &xf86RandRKeyRec;
 
     if (!dixRegisterPrivateKey(&xf86RandRKeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
 
-    randrp = malloc(sizeof (XF86RandRInfoRec));
+    randrp = malloc(sizeof(XF86RandRInfoRec));
     if (!randrp)
-	return FALSE;
+        return FALSE;
 
-    if (!RRScreenInit (pScreen))
-    {
-	free(randrp);
-	return FALSE;
+    if (!RRScreenInit(pScreen)) {
+        free(randrp);
+        return FALSE;
     }
     rp = rrGetScrPriv(pScreen);
     rp->rrGetInfo = xf86RandRGetInfo;
@@ -484,5 +471,3 @@ xf86RandRInit (ScreenPtr    pScreen)
     dixSetPrivate(&pScreen->devPrivates, xf86RandRKey, randrp);
     return TRUE;
 }
-
-
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
index 819ad6e7c..7c9e6ba02 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
@@ -36,7 +36,6 @@
 #include "xf86Priv.h"
 #include "pciaccess.h"
 
-
 static GCFuncs VGAarbiterGCFuncs = {
     VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC,
     VGAarbiterDestroyGC, VGAarbiterChangeClip, VGAarbiterDestroyClip,
@@ -60,8 +59,10 @@ static miPointerSpriteFuncRec VGAarbiterSpriteFuncs = {
 };
 
 static DevPrivateKeyRec VGAarbiterScreenKeyRec;
+
 #define VGAarbiterScreenKey (&VGAarbiterScreenKeyRec)
 static DevPrivateKeyRec VGAarbiterGCKeyRec;
+
 #define VGAarbiterGCKey (&VGAarbiterGCKeyRec)
 
 static int vga_no_arb = 0;
@@ -69,8 +70,9 @@ void
 xf86VGAarbiterInit(void)
 {
     if (pci_device_vgaarb_init() != 0) {
-	vga_no_arb = 1;
-        xf86Msg(X_WARNING, "VGA arbiter: cannot open kernel arbiter, no multi-card support\n");
+        vga_no_arb = 1;
+        xf86Msg(X_WARNING,
+                "VGA arbiter: cannot open kernel arbiter, no multi-card support\n");
     }
 }
 
@@ -78,7 +80,7 @@ void
 xf86VGAarbiterFini(void)
 {
     if (vga_no_arb)
-	return;
+        return;
     pci_device_vgaarb_fini();
 }
 
@@ -86,7 +88,7 @@ void
 xf86VGAarbiterLock(ScrnInfoPtr pScrn)
 {
     if (vga_no_arb)
-	return;
+        return;
     pci_device_vgaarb_set_target(pScrn->vgaDev);
     pci_device_vgaarb_lock();
 }
@@ -95,18 +97,19 @@ void
 xf86VGAarbiterUnlock(ScrnInfoPtr pScrn)
 {
     if (vga_no_arb)
-	return;
+        return;
     pci_device_vgaarb_unlock();
 }
 
-Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen)
+Bool
+xf86VGAarbiterAllowDRI(ScreenPtr pScreen)
 {
     int vga_count;
     int rsrc_decodes;
-    ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 
     if (vga_no_arb)
-	return TRUE;
+        return TRUE;
 
     pci_device_vgaarb_get_info(pScrn->vgaDev, &vga_count, &rsrc_decodes);
     if (vga_count > 1) {
@@ -124,11 +127,11 @@ xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn)
     EntityPtr pEnt;
 
     if (vga_no_arb)
-	return;
+        return;
 
     pEnt = xf86Entities[pScrn->entityList[0]];
     if (pEnt->bus.type != BUS_PCI)
-	return;
+        return;
 
     dev = pEnt->bus.id.pci;
     pScrn->vgaDev = dev;
@@ -138,7 +141,7 @@ void
 xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn, int rsrc)
 {
     if (vga_no_arb)
-	return;
+        return;
     pci_device_vgaarb_set_target(pScrn->vgaDev);
     pci_device_vgaarb_decodes(rsrc);
 }
@@ -149,7 +152,7 @@ xf86VGAarbiterWrapFunctions(void)
     ScrnInfoPtr pScrn;
     VGAarbiterScreenPtr pScreenPriv;
     miPointerScreenPtr PointPriv;
-    PictureScreenPtr    ps;
+    PictureScreenPtr ps;
     ScreenPtr pScreen;
     int vga_count, i;
 
@@ -164,7 +167,7 @@ xf86VGAarbiterWrapFunctions(void)
     if (vga_count < 2 || !xf86Screens)
         return FALSE;
 
-    xf86Msg(X_INFO,"Found %d VGA devices: arbiter wrapping enabled\n",
+    xf86Msg(X_INFO, "Found %d VGA devices: arbiter wrapping enabled\n",
             vga_count);
 
     for (i = 0; i < xf86NumScreens; i++) {
@@ -173,11 +176,12 @@ xf86VGAarbiterWrapFunctions(void)
         pScrn = xf86Screens[pScreen->myNum];
         PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
 
-        if (!dixRegisterPrivateKey(&VGAarbiterGCKeyRec, PRIVATE_GC, sizeof(VGAarbiterGCRec)))
+        if (!dixRegisterPrivateKey
+            (&VGAarbiterGCKeyRec, PRIVATE_GC, sizeof(VGAarbiterGCRec)))
             return FALSE;
 
-	if (!dixRegisterPrivateKey(&VGAarbiterScreenKeyRec, PRIVATE_SCREEN, 0))
-	    return FALSE;
+        if (!dixRegisterPrivateKey(&VGAarbiterScreenKeyRec, PRIVATE_SCREEN, 0))
+            return FALSE;
 
         if (!(pScreenPriv = malloc(sizeof(VGAarbiterScreenRec))))
             return FALSE;
@@ -201,9 +205,9 @@ xf86VGAarbiterWrapFunctions(void)
         WRAP_SCREEN(UnrealizeCursor, VGAarbiterUnrealizeCursor);
         WRAP_SCREEN(RecolorCursor, VGAarbiterRecolorCursor);
         WRAP_SCREEN(SetCursorPosition, VGAarbiterSetCursorPosition);
-        WRAP_PICT(Composite,VGAarbiterComposite);
-        WRAP_PICT(Glyphs,VGAarbiterGlyphs);
-        WRAP_PICT(CompositeRects,VGAarbiterCompositeRects);
+        WRAP_PICT(Composite, VGAarbiterComposite);
+        WRAP_PICT(Glyphs, VGAarbiterGlyphs);
+        WRAP_PICT(CompositeRects, VGAarbiterCompositeRects);
         WRAP_SCREEN_INFO(AdjustFrame, VGAarbiterAdjustFrame);
         WRAP_SCREEN_INFO(SwitchMode, VGAarbiterSwitchMode);
         WRAP_SCREEN_INFO(EnterVT, VGAarbiterEnterVT);
@@ -217,15 +221,17 @@ xf86VGAarbiterWrapFunctions(void)
 
 /* Screen funcs */
 static Bool
-VGAarbiterCloseScreen (int i, ScreenPtr pScreen)
+VGAarbiterCloseScreen(int i, ScreenPtr pScreen)
 {
     Bool val;
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
-        &pScreen->devPrivates, VGAarbiterScreenKey);
-    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(
-        &pScreen->devPrivates, miPointerScreenKey);
-    PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);
+    VGAarbiterScreenPtr pScreenPriv =
+        (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               VGAarbiterScreenKey);
+    miPointerScreenPtr PointPriv =
+        (miPointerScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                              miPointerScreenKey);
+    PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
 
     UNWRAP_SCREEN(CreateGC);
     UNWRAP_SCREEN(CloseScreen);
@@ -263,6 +269,7 @@ VGAarbiterBlockHandler(int i,
                        pointer blockData, pointer pTimeout, pointer pReadmask)
 {
     ScreenPtr pScreen = screenInfo.screens[i];
+
     SCREEN_PROLOG(BlockHandler);
     VGAGet(pScreen);
     pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);
@@ -271,9 +278,11 @@ VGAarbiterBlockHandler(int i,
 }
 
 static void
-VGAarbiterWakeupHandler(int i, pointer blockData, unsigned long result, pointer pReadmask)
+VGAarbiterWakeupHandler(int i, pointer blockData, unsigned long result,
+                        pointer pReadmask)
 {
     ScreenPtr pScreen = screenInfo.screens[i];
+
     SCREEN_PROLOG(WakeupHandler);
     VGAGet(pScreen);
     pScreen->WakeupHandler(i, blockData, result, pReadmask);
@@ -282,100 +291,87 @@ VGAarbiterWakeupHandler(int i, pointer blockData, unsigned long result, pointer
 }
 
 static void
-VGAarbiterGetImage (
-    DrawablePtr pDrawable,
-    int sx, int sy, int w, int h,
-    unsigned int    format,
-    unsigned long   planemask,
-    char        *pdstLine
-    )
+VGAarbiterGetImage(DrawablePtr pDrawable,
+                   int sx, int sy, int w, int h,
+                   unsigned int format, unsigned long planemask, char *pdstLine)
 {
     ScreenPtr pScreen = pDrawable->pScreen;
+
     SCREEN_PROLOG(GetImage);
 //    if (xf86Screens[pScreen->myNum]->vtSema) {
     VGAGet(pScreen);
 //    }
-    (*pScreen->GetImage) (pDrawable, sx, sy, w, h,
-              format, planemask, pdstLine);
+    (*pScreen->GetImage) (pDrawable, sx, sy, w, h, format, planemask, pdstLine);
     VGAPut();
-    SCREEN_EPILOG (GetImage, VGAarbiterGetImage);
+    SCREEN_EPILOG(GetImage, VGAarbiterGetImage);
 }
 
 static void
-VGAarbiterGetSpans (
-    DrawablePtr pDrawable,
-    int     wMax,
-    DDXPointPtr ppt,
-    int     *pwidth,
-    int     nspans,
-    char    *pdstStart
-    )
-{
-    ScreenPtr       pScreen = pDrawable->pScreen;
-
-    SCREEN_PROLOG (GetSpans);
+VGAarbiterGetSpans(DrawablePtr pDrawable,
+                   int wMax,
+                   DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)
+{
+    ScreenPtr pScreen = pDrawable->pScreen;
+
+    SCREEN_PROLOG(GetSpans);
     VGAGet(pScreen);
     (*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
     VGAPut();
-    SCREEN_EPILOG (GetSpans, VGAarbiterGetSpans);
+    SCREEN_EPILOG(GetSpans, VGAarbiterGetSpans);
 }
 
 static void
-VGAarbiterSourceValidate (
-    DrawablePtr pDrawable,
-    int x, int y, int width, int height,
-    unsigned int subWindowMode )
+VGAarbiterSourceValidate(DrawablePtr pDrawable,
+                         int x, int y, int width, int height,
+                         unsigned int subWindowMode)
 {
-    ScreenPtr   pScreen = pDrawable->pScreen;
-    SCREEN_PROLOG (SourceValidate);
+    ScreenPtr pScreen = pDrawable->pScreen;
+
+    SCREEN_PROLOG(SourceValidate);
     VGAGet(pScreen);
     if (pScreen->SourceValidate)
-    (*pScreen->SourceValidate) (pDrawable, x, y, width, height, subWindowMode);
+        (*pScreen->SourceValidate) (pDrawable, x, y, width, height,
+                                    subWindowMode);
     VGAPut();
-    SCREEN_EPILOG (SourceValidate, VGAarbiterSourceValidate);
+    SCREEN_EPILOG(SourceValidate, VGAarbiterSourceValidate);
 }
 
 static void
-VGAarbiterCopyWindow(
-    WindowPtr pWin,
-    DDXPointRec ptOldOrg,
-    RegionPtr prgnSrc )
+VGAarbiterCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
 
-    SCREEN_PROLOG (CopyWindow);
+    SCREEN_PROLOG(CopyWindow);
     VGAGet(pScreen);
     (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);
     VGAPut();
-    SCREEN_EPILOG (CopyWindow, VGAarbiterCopyWindow);
+    SCREEN_EPILOG(CopyWindow, VGAarbiterCopyWindow);
 }
 
 static void
-VGAarbiterClearToBackground (
-    WindowPtr pWin,
-    int x, int y,
-    int w, int h,
-    Bool generateExposures )
+VGAarbiterClearToBackground(WindowPtr pWin,
+                            int x, int y, int w, int h, Bool generateExposures)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
 
-    SCREEN_PROLOG ( ClearToBackground);
+    SCREEN_PROLOG(ClearToBackground);
     VGAGet(pScreen);
     (*pScreen->ClearToBackground) (pWin, x, y, w, h, generateExposures);
     VGAPut();
-    SCREEN_EPILOG (ClearToBackground, VGAarbiterClearToBackground);
+    SCREEN_EPILOG(ClearToBackground, VGAarbiterClearToBackground);
 }
 
 static PixmapPtr
-VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)
+VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
+                       unsigned usage_hint)
 {
     PixmapPtr pPix;
 
-    SCREEN_PROLOG ( CreatePixmap);
+    SCREEN_PROLOG(CreatePixmap);
     VGAGet(pScreen);
     pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);
     VGAPut();
-    SCREEN_EPILOG (CreatePixmap, VGAarbiterCreatePixmap);
+    SCREEN_EPILOG(CreatePixmap, VGAarbiterCreatePixmap);
 
     return pPix;
 }
@@ -385,110 +381,89 @@ VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank)
 {
     Bool val;
 
-    SCREEN_PROLOG (SaveScreen);
+    SCREEN_PROLOG(SaveScreen);
     VGAGet(pScreen);
     val = (*pScreen->SaveScreen) (pScreen, unblank);
     VGAPut();
-    SCREEN_EPILOG (SaveScreen, VGAarbiterSaveScreen);
+    SCREEN_EPILOG(SaveScreen, VGAarbiterSaveScreen);
 
     return val;
 }
 
 static void
-VGAarbiterStoreColors (
-    ColormapPtr        pmap,
-    int                ndef,
-    xColorItem         *pdefs)
+VGAarbiterStoreColors(ColormapPtr pmap, int ndef, xColorItem * pdefs)
 {
     ScreenPtr pScreen = pmap->pScreen;
 
-    SCREEN_PROLOG (StoreColors);
+    SCREEN_PROLOG(StoreColors);
     VGAGet(pScreen);
-    (*pScreen->StoreColors) (pmap,ndef,pdefs);
+    (*pScreen->StoreColors) (pmap, ndef, pdefs);
     VGAPut();
-    SCREEN_EPILOG ( StoreColors, VGAarbiterStoreColors);
+    SCREEN_EPILOG(StoreColors, VGAarbiterStoreColors);
 }
 
 static void
-VGAarbiterRecolorCursor (
-    DeviceIntPtr pDev,
-    ScreenPtr pScreen,
-    CursorPtr pCurs,
-    Bool displayed
-    )
-{
-    SCREEN_PROLOG (RecolorCursor);
+VGAarbiterRecolorCursor(DeviceIntPtr pDev,
+                        ScreenPtr pScreen, CursorPtr pCurs, Bool displayed)
+{
+    SCREEN_PROLOG(RecolorCursor);
     VGAGet(pScreen);
     (*pScreen->RecolorCursor) (pDev, pScreen, pCurs, displayed);
     VGAPut();
-    SCREEN_EPILOG ( RecolorCursor, VGAarbiterRecolorCursor);
+    SCREEN_EPILOG(RecolorCursor, VGAarbiterRecolorCursor);
 }
 
 static Bool
-VGAarbiterRealizeCursor (
-    DeviceIntPtr pDev,
-    ScreenPtr   pScreen,
-    CursorPtr   pCursor
-    )
+VGAarbiterRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
 {
     Bool val;
 
-    SCREEN_PROLOG (RealizeCursor);
+    SCREEN_PROLOG(RealizeCursor);
     VGAGet(pScreen);
-    val = (*pScreen->RealizeCursor) (pDev, pScreen,pCursor);
+    val = (*pScreen->RealizeCursor) (pDev, pScreen, pCursor);
     VGAPut();
-    SCREEN_EPILOG ( RealizeCursor, VGAarbiterRealizeCursor);
+    SCREEN_EPILOG(RealizeCursor, VGAarbiterRealizeCursor);
     return val;
 }
 
 static Bool
-VGAarbiterUnrealizeCursor (
-    DeviceIntPtr pDev,
-    ScreenPtr   pScreen,
-    CursorPtr   pCursor
-    )
+VGAarbiterUnrealizeCursor(DeviceIntPtr pDev,
+                          ScreenPtr pScreen, CursorPtr pCursor)
 {
     Bool val;
 
-    SCREEN_PROLOG (UnrealizeCursor);
+    SCREEN_PROLOG(UnrealizeCursor);
     VGAGet(pScreen);
     val = (*pScreen->UnrealizeCursor) (pDev, pScreen, pCursor);
     VGAPut();
-    SCREEN_EPILOG ( UnrealizeCursor, VGAarbiterUnrealizeCursor);
+    SCREEN_EPILOG(UnrealizeCursor, VGAarbiterUnrealizeCursor);
     return val;
 }
 
 static Bool
-VGAarbiterDisplayCursor (
-    DeviceIntPtr pDev,
-    ScreenPtr   pScreen,
-    CursorPtr   pCursor
-    )
+VGAarbiterDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
 {
     Bool val;
 
-    SCREEN_PROLOG (DisplayCursor);
+    SCREEN_PROLOG(DisplayCursor);
     VGAGet(pScreen);
     val = (*pScreen->DisplayCursor) (pDev, pScreen, pCursor);
     VGAPut();
-    SCREEN_EPILOG ( DisplayCursor, VGAarbiterDisplayCursor);
+    SCREEN_EPILOG(DisplayCursor, VGAarbiterDisplayCursor);
     return val;
 }
 
 static Bool
-VGAarbiterSetCursorPosition (
-    DeviceIntPtr pDev,
-    ScreenPtr   pScreen,
-    int x, int y,
-    Bool generateEvent)
+VGAarbiterSetCursorPosition(DeviceIntPtr pDev,
+                            ScreenPtr pScreen, int x, int y, Bool generateEvent)
 {
     Bool val;
 
-    SCREEN_PROLOG (SetCursorPosition);
+    SCREEN_PROLOG(SetCursorPosition);
     VGAGet(pScreen);
     val = (*pScreen->SetCursorPosition) (pDev, pScreen, x, y, generateEvent);
     VGAPut();
-    SCREEN_EPILOG ( SetCursorPosition, VGAarbiterSetCursorPosition);
+    SCREEN_EPILOG(SetCursorPosition, VGAarbiterSetCursorPosition);
     return val;
 }
 
@@ -496,11 +471,12 @@ static void
 VGAarbiterAdjustFrame(int index, int x, int y, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
-        &pScreen->devPrivates, VGAarbiterScreenKey);
+    VGAarbiterScreenPtr pScreenPriv =
+        (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               VGAarbiterScreenKey);
 
     VGAGet(pScreen);
-    (*pScreenPriv->AdjustFrame)(index, x, y, flags);
+    (*pScreenPriv->AdjustFrame) (index, x, y, flags);
     VGAPut();
 }
 
@@ -509,11 +485,12 @@ VGAarbiterSwitchMode(int index, DisplayModePtr mode, int flags)
 {
     Bool val;
     ScreenPtr pScreen = screenInfo.screens[index];
-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
-        &pScreen->devPrivates, VGAarbiterScreenKey);
+    VGAarbiterScreenPtr pScreenPriv =
+        (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               VGAarbiterScreenKey);
 
     VGAGet(pScreen);
-    val = (*pScreenPriv->SwitchMode)(index, mode, flags);
+    val = (*pScreenPriv->SwitchMode) (index, mode, flags);
     VGAPut();
     return val;
 }
@@ -524,12 +501,13 @@ VGAarbiterEnterVT(int index, int flags)
     Bool val;
     ScrnInfoPtr pScrn = xf86Screens[index];
     ScreenPtr pScreen = screenInfo.screens[index];
-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
-        &pScreen->devPrivates, VGAarbiterScreenKey);
+    VGAarbiterScreenPtr pScreenPriv =
+        (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               VGAarbiterScreenKey);
 
     VGAGet(pScreen);
     pScrn->EnterVT = pScreenPriv->EnterVT;
-    val = (*pScrn->EnterVT)(index, flags);
+    val = (*pScrn->EnterVT) (index, flags);
     pScreenPriv->EnterVT = pScrn->EnterVT;
     pScrn->EnterVT = VGAarbiterEnterVT;
     VGAPut();
@@ -541,12 +519,13 @@ VGAarbiterLeaveVT(int index, int flags)
 {
     ScrnInfoPtr pScrn = xf86Screens[index];
     ScreenPtr pScreen = screenInfo.screens[index];
-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
-        &pScreen->devPrivates, VGAarbiterScreenKey);
+    VGAarbiterScreenPtr pScreenPriv =
+        (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               VGAarbiterScreenKey);
 
     VGAGet(pScreen);
     pScrn->LeaveVT = pScreenPriv->LeaveVT;
-    (*pScreenPriv->LeaveVT)(index, flags);
+    (*pScreenPriv->LeaveVT) (index, flags);
     pScreenPriv->LeaveVT = pScrn->LeaveVT;
     pScrn->LeaveVT = VGAarbiterLeaveVT;
     VGAPut();
@@ -556,450 +535,389 @@ static void
 VGAarbiterFreeScreen(int index, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
-        &pScreen->devPrivates, VGAarbiterScreenKey);
+    VGAarbiterScreenPtr pScreenPriv =
+        (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               VGAarbiterScreenKey);
 
     VGAGet(pScreen);
-    (*pScreenPriv->FreeScreen)(index, flags);
+    (*pScreenPriv->FreeScreen) (index, flags);
     VGAPut();
 }
 
 static Bool
 VGAarbiterCreateGC(GCPtr pGC)
 {
-    ScreenPtr    pScreen = pGC->pScreen;
-    VGAarbiterGCPtr pGCPriv = (VGAarbiterGCPtr)dixLookupPrivate(&pGC->devPrivates, VGAarbiterGCKey);
-    Bool         ret;
+    ScreenPtr pScreen = pGC->pScreen;
+    VGAarbiterGCPtr pGCPriv =
+        (VGAarbiterGCPtr) dixLookupPrivate(&pGC->devPrivates, VGAarbiterGCKey);
+    Bool ret;
 
     SCREEN_PROLOG(CreateGC);
-    ret = (*pScreen->CreateGC)(pGC);
+    ret = (*pScreen->CreateGC) (pGC);
     GC_WRAP(pGC);
-    SCREEN_EPILOG(CreateGC,VGAarbiterCreateGC);
+    SCREEN_EPILOG(CreateGC, VGAarbiterCreateGC);
 
     return ret;
 }
 
 /* GC funcs */
 static void
-VGAarbiterValidateGC(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw )
+VGAarbiterValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
 {
     GC_UNWRAP(pGC);
-    (*pGC->funcs->ValidateGC)(pGC, changes, pDraw);
+    (*pGC->funcs->ValidateGC) (pGC, changes, pDraw);
     GC_WRAP(pGC);
 }
 
-
 static void
 VGAarbiterDestroyGC(GCPtr pGC)
 {
-    GC_UNWRAP (pGC);
-    (*pGC->funcs->DestroyGC)(pGC);
-    GC_WRAP (pGC);
+    GC_UNWRAP(pGC);
+    (*pGC->funcs->DestroyGC) (pGC);
+    GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterChangeGC (
-    GCPtr       pGC,
-    unsigned long   mask)
+VGAarbiterChangeGC(GCPtr pGC, unsigned long mask)
 {
-    GC_UNWRAP (pGC);
+    GC_UNWRAP(pGC);
     (*pGC->funcs->ChangeGC) (pGC, mask);
-    GC_WRAP (pGC);
+    GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterCopyGC (
-    GCPtr       pGCSrc,
-    unsigned long   mask,
-    GCPtr       pGCDst)
+VGAarbiterCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
 {
-    GC_UNWRAP (pGCDst);
+    GC_UNWRAP(pGCDst);
     (*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst);
-    GC_WRAP (pGCDst);
+    GC_WRAP(pGCDst);
 }
 
 static void
-VGAarbiterChangeClip (
-    GCPtr   pGC,
-    int     type,
-    pointer pvalue,
-    int     nrects )
+VGAarbiterChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
 {
-    GC_UNWRAP (pGC);
+    GC_UNWRAP(pGC);
     (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
-    GC_WRAP (pGC);
+    GC_WRAP(pGC);
 }
 
 static void
 VGAarbiterCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
 {
-    GC_UNWRAP (pgcDst);
-    (* pgcDst->funcs->CopyClip)(pgcDst, pgcSrc);
-    GC_WRAP (pgcDst);
+    GC_UNWRAP(pgcDst);
+    (*pgcDst->funcs->CopyClip) (pgcDst, pgcSrc);
+    GC_WRAP(pgcDst);
 }
 
 static void
 VGAarbiterDestroyClip(GCPtr pGC)
 {
-    GC_UNWRAP (pGC);
-    (* pGC->funcs->DestroyClip)(pGC);
-    GC_WRAP (pGC);
+    GC_UNWRAP(pGC);
+    (*pGC->funcs->DestroyClip) (pGC);
+    GC_WRAP(pGC);
 }
 
 /* GC Ops */
 static void
-VGAarbiterFillSpans(
-    DrawablePtr pDraw,
-    GC      *pGC,
-    int     nInit,
-    DDXPointPtr pptInit,
-    int *pwidthInit,
-    int fSorted )
+VGAarbiterFillSpans(DrawablePtr pDraw,
+                    GC * pGC,
+                    int nInit,
+                    DDXPointPtr pptInit, int *pwidthInit, int fSorted)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);
+    (*pGC->ops->FillSpans) (pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterSetSpans(
-    DrawablePtr     pDraw,
-    GCPtr       pGC,
-    char        *pcharsrc,
-    register DDXPointPtr ppt,
-    int         *pwidth,
-    int         nspans,
-    int         fSorted )
+VGAarbiterSetSpans(DrawablePtr pDraw,
+                   GCPtr pGC,
+                   char *pcharsrc,
+                   register DDXPointPtr ppt,
+                   int *pwidth, int nspans, int fSorted)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);
+    (*pGC->ops->SetSpans) (pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterPutImage(
-    DrawablePtr pDraw,
-    GCPtr   pGC,
-    int     depth,
-    int x, int y, int w, int h,
-    int     leftPad,
-    int     format,
-    char    *pImage )
+VGAarbiterPutImage(DrawablePtr pDraw,
+                   GCPtr pGC,
+                   int depth,
+                   int x, int y, int w, int h,
+                   int leftPad, int format, char *pImage)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h,
-              leftPad, format, pImage);
+    (*pGC->ops->PutImage) (pDraw, pGC, depth, x, y, w, h,
+                           leftPad, format, pImage);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static RegionPtr
-VGAarbiterCopyArea(
-    DrawablePtr pSrc,
-    DrawablePtr pDst,
-    GC *pGC,
-    int srcx, int srcy,
-    int width, int height,
-    int dstx, int dsty )
+VGAarbiterCopyArea(DrawablePtr pSrc,
+                   DrawablePtr pDst,
+                   GC * pGC,
+                   int srcx, int srcy,
+                   int width, int height, int dstx, int dsty)
 {
     RegionPtr ret;
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    ret = (*pGC->ops->CopyArea)(pSrc, pDst,
-                pGC, srcx, srcy, width, height, dstx, dsty);
+    ret = (*pGC->ops->CopyArea) (pSrc, pDst,
+                                 pGC, srcx, srcy, width, height, dstx, dsty);
     VGAPut();
     GC_WRAP(pGC);
     return ret;
 }
 
 static RegionPtr
-VGAarbiterCopyPlane(
-    DrawablePtr pSrc,
-    DrawablePtr pDst,
-    GCPtr pGC,
-    int srcx, int srcy,
-    int width, int height,
-    int dstx, int dsty,
-    unsigned long bitPlane )
+VGAarbiterCopyPlane(DrawablePtr pSrc,
+                    DrawablePtr pDst,
+                    GCPtr pGC,
+                    int srcx, int srcy,
+                    int width, int height,
+                    int dstx, int dsty, unsigned long bitPlane)
 {
     RegionPtr ret;
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    ret = (*pGC->ops->CopyPlane)(pSrc, pDst, pGC, srcx, srcy,
-                 width, height, dstx, dsty, bitPlane);
+    ret = (*pGC->ops->CopyPlane) (pSrc, pDst, pGC, srcx, srcy,
+                                  width, height, dstx, dsty, bitPlane);
     VGAPut();
     GC_WRAP(pGC);
     return ret;
 }
 
 static void
-VGAarbiterPolyPoint(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int mode,
-    int npt,
-    xPoint *pptInit )
+VGAarbiterPolyPoint(DrawablePtr pDraw,
+                    GCPtr pGC, int mode, int npt, xPoint * pptInit)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, npt, pptInit);
+    (*pGC->ops->PolyPoint) (pDraw, pGC, mode, npt, pptInit);
     VGAPut();
     GC_WRAP(pGC);
 }
 
-
 static void
-VGAarbiterPolylines(
-    DrawablePtr pDraw,
-    GCPtr   pGC,
-    int     mode,
-    int     npt,
-    DDXPointPtr pptInit )
+VGAarbiterPolylines(DrawablePtr pDraw,
+                    GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->Polylines)(pDraw, pGC, mode, npt, pptInit);
+    (*pGC->ops->Polylines) (pDraw, pGC, mode, npt, pptInit);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterPolySegment(
-    DrawablePtr pDraw,
-    GCPtr   pGC,
-    int     nseg,
-    xSegment    *pSeg )
+VGAarbiterPolySegment(DrawablePtr pDraw, GCPtr pGC, int nseg, xSegment * pSeg)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->PolySegment)(pDraw, pGC, nseg, pSeg);
+    (*pGC->ops->PolySegment) (pDraw, pGC, nseg, pSeg);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterPolyRectangle(
-    DrawablePtr  pDraw,
-    GCPtr        pGC,
-    int          nRectsInit,
-    xRectangle  *pRectsInit )
+VGAarbiterPolyRectangle(DrawablePtr pDraw,
+                        GCPtr pGC, int nRectsInit, xRectangle *pRectsInit)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRectsInit, pRectsInit);
+    (*pGC->ops->PolyRectangle) (pDraw, pGC, nRectsInit, pRectsInit);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterPolyArc(
-    DrawablePtr pDraw,
-    GCPtr   pGC,
-    int     narcs,
-    xArc    *parcs )
+VGAarbiterPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->PolyArc)(pDraw, pGC, narcs, parcs);
+    (*pGC->ops->PolyArc) (pDraw, pGC, narcs, parcs);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterFillPolygon(
-    DrawablePtr pDraw,
-    GCPtr   pGC,
-    int     shape,
-    int     mode,
-    int     count,
-    DDXPointPtr ptsIn )
+VGAarbiterFillPolygon(DrawablePtr pDraw,
+                      GCPtr pGC,
+                      int shape, int mode, int count, DDXPointPtr ptsIn)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);
+    (*pGC->ops->FillPolygon) (pDraw, pGC, shape, mode, count, ptsIn);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterPolyFillRect(
-    DrawablePtr pDraw,
-    GCPtr   pGC,
-    int     nrectFill,
-    xRectangle  *prectInit)
+VGAarbiterPolyFillRect(DrawablePtr pDraw,
+                       GCPtr pGC, int nrectFill, xRectangle *prectInit)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->PolyFillRect)(pDraw, pGC, nrectFill, prectInit);
+    (*pGC->ops->PolyFillRect) (pDraw, pGC, nrectFill, prectInit);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterPolyFillArc(
-    DrawablePtr pDraw,
-    GCPtr   pGC,
-    int     narcs,
-    xArc    *parcs )
+VGAarbiterPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcs, parcs);
+    (*pGC->ops->PolyFillArc) (pDraw, pGC, narcs, parcs);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static int
-VGAarbiterPolyText8(
-    DrawablePtr pDraw,
-    GCPtr   pGC,
-    int     x,
-    int     y,
-    int     count,
-    char    *chars )
+VGAarbiterPolyText8(DrawablePtr pDraw,
+                    GCPtr pGC, int x, int y, int count, char *chars)
 {
     int ret;
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    ret = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);
+    ret = (*pGC->ops->PolyText8) (pDraw, pGC, x, y, count, chars);
     VGAPut();
     GC_WRAP(pGC);
     return ret;
 }
 
 static int
-VGAarbiterPolyText16(
-    DrawablePtr pDraw,
-    GCPtr   pGC,
-    int     x,
-    int     y,
-    int     count,
-    unsigned short *chars )
+VGAarbiterPolyText16(DrawablePtr pDraw,
+                     GCPtr pGC, int x, int y, int count, unsigned short *chars)
 {
     int ret;
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    ret = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);
+    ret = (*pGC->ops->PolyText16) (pDraw, pGC, x, y, count, chars);
     VGAPut();
     GC_WRAP(pGC);
     return ret;
 }
 
 static void
-VGAarbiterImageText8(
-    DrawablePtr pDraw,
-    GCPtr   pGC,
-    int     x,
-    int     y,
-    int     count,
-    char    *chars )
+VGAarbiterImageText8(DrawablePtr pDraw,
+                     GCPtr pGC, int x, int y, int count, char *chars)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);
+    (*pGC->ops->ImageText8) (pDraw, pGC, x, y, count, chars);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterImageText16(
-    DrawablePtr pDraw,
-    GCPtr   pGC,
-    int     x,
-    int     y,
-    int     count,
-    unsigned short *chars )
+VGAarbiterImageText16(DrawablePtr pDraw,
+                      GCPtr pGC, int x, int y, int count, unsigned short *chars)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);
+    (*pGC->ops->ImageText16) (pDraw, pGC, x, y, count, chars);
     VGAPut();
     GC_WRAP(pGC);
 }
 
-
 static void
-VGAarbiterImageGlyphBlt(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int xInit, int yInit,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase )
+VGAarbiterImageGlyphBlt(DrawablePtr pDraw,
+                        GCPtr pGC,
+                        int xInit, int yInit,
+                        unsigned int nglyph,
+                        CharInfoPtr * ppci, pointer pglyphBase)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, xInit, yInit,
-                   nglyph, ppci, pglyphBase);
+    (*pGC->ops->ImageGlyphBlt) (pDraw, pGC, xInit, yInit,
+                                nglyph, ppci, pglyphBase);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterPolyGlyphBlt(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int xInit, int yInit,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase )
+VGAarbiterPolyGlyphBlt(DrawablePtr pDraw,
+                       GCPtr pGC,
+                       int xInit, int yInit,
+                       unsigned int nglyph,
+                       CharInfoPtr * ppci, pointer pglyphBase)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, xInit, yInit,
-                  nglyph, ppci, pglyphBase);
+    (*pGC->ops->PolyGlyphBlt) (pDraw, pGC, xInit, yInit,
+                               nglyph, ppci, pglyphBase);
     VGAPut();
     GC_WRAP(pGC);
 }
 
 static void
-VGAarbiterPushPixels(
-    GCPtr   pGC,
-    PixmapPtr   pBitMap,
-    DrawablePtr pDraw,
-    int dx, int dy, int xOrg, int yOrg )
+VGAarbiterPushPixels(GCPtr pGC,
+                     PixmapPtr pBitMap,
+                     DrawablePtr pDraw, int dx, int dy, int xOrg, int yOrg)
 {
     ScreenPtr pScreen = pGC->pScreen;
+
     GC_UNWRAP(pGC);
     VGAGet(pScreen);
-    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
+    (*pGC->ops->PushPixels) (pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
     VGAPut();
     GC_WRAP(pGC);
 }
 
-
 /* miSpriteFuncs */
 static Bool
-VGAarbiterSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)
+VGAarbiterSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
+                              CursorPtr pCur)
 {
     Bool val;
+
     SPRITE_PROLOG;
     VGAGet(pScreen);
     val = PointPriv->spriteFuncs->RealizeCursor(pDev, pScreen, pCur);
@@ -1009,9 +927,11 @@ VGAarbiterSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pC
 }
 
 static Bool
-VGAarbiterSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)
+VGAarbiterSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
+                                CursorPtr pCur)
 {
     Bool val;
+
     SPRITE_PROLOG;
     VGAGet(pScreen);
     val = PointPriv->spriteFuncs->UnrealizeCursor(pDev, pScreen, pCur);
@@ -1021,7 +941,8 @@ VGAarbiterSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr
 }
 
 static void
-VGAarbiterSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur, int x, int y)
+VGAarbiterSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur,
+                          int x, int y)
 {
     SPRITE_PROLOG;
     VGAGet(pScreen);
@@ -1044,6 +965,7 @@ static Bool
 VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
 {
     Bool val;
+
     SPRITE_PROLOG;
     VGAGet(pScreen);
     val = PointPriv->spriteFuncs->DeviceCursorInitialize(pDev, pScreen);
@@ -1064,49 +986,49 @@ VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
 
 static void
 VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
-         PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask,
-         INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width,
-         CARD16 height)
+                    PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask,
+                    INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width,
+                    CARD16 height)
 {
-    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
-    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
 
     PICTURE_PROLOGUE(Composite);
 
     VGAGet(pScreen);
     (*ps->Composite) (op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, xDst,
-              yDst, width, height);
+                      yDst, width, height);
     VGAPut();
     PICTURE_EPILOGUE(Composite, VGAarbiterComposite);
 }
 
 static void
 VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
-      PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist,
-      GlyphListPtr list, GlyphPtr *glyphs)
+                 PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist,
+                 GlyphListPtr list, GlyphPtr * glyphs)
 {
-    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
-    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
 
     PICTURE_PROLOGUE(Glyphs);
 
     VGAGet(pScreen);
-    (*ps->Glyphs)(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
+    (*ps->Glyphs) (op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
     VGAPut();
-    PICTURE_EPILOGUE (Glyphs, VGAarbiterGlyphs);
+    PICTURE_EPILOGUE(Glyphs, VGAarbiterGlyphs);
 }
 
 static void
-VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect,
-          xRectangle *rects)
+VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor * color,
+                         int nRect, xRectangle *rects)
 {
-    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
-    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
 
     PICTURE_PROLOGUE(CompositeRects);
 
     VGAGet(pScreen);
-    (*ps->CompositeRects)(op, pDst, color, nRect, rects);
+    (*ps->CompositeRects) (op, pDst, color, nRect, rects);
     VGAPut();
-    PICTURE_EPILOGUE (CompositeRects, VGAarbiterCompositeRects);
+    PICTURE_EPILOGUE(CompositeRects, VGAarbiterCompositeRects);
 }
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
index 13fde5e79..2513ce65d 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -1,253 +1,268 @@
-/*

- * Copyright (c) 2009 Tiago Vignatti

- *

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

- *

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-#include <X11/X.h>

-#include "colormapst.h"

-#include "scrnintstr.h"

-#include "screenint.h"

-#include "gcstruct.h"

-#include "pixmapstr.h"

-#include "pixmap.h"

-#include "windowstr.h"

-#include "window.h"

-#include "xf86str.h"

-#include "mipointer.h"

-#include "mipointrst.h"

-# include "picturestr.h"

-

-

-#define WRAP_SCREEN(x,y) {pScreenPriv->x = pScreen->x; pScreen->x = y;}

-

-#define UNWRAP_SCREEN(x) pScreen->x = pScreenPriv->x

-

-#define SCREEN_PROLOG(x) pScreen->x = ((VGAarbiterScreenPtr) \

-    dixLookupPrivate(&(pScreen)->devPrivates, VGAarbiterScreenKey))->x

-

-#define SCREEN_EPILOG(x,y) pScreen->x = y;

-

-#define WRAP_PICT(x,y) if (ps) {pScreenPriv->x = ps->x;\

-    ps->x = y;}

-

-#define UNWRAP_PICT(x) if (ps) {ps->x = pScreenPriv->x;}

-

-#define PICTURE_PROLOGUE(field) ps->field = \

-    ((VGAarbiterScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, \

-    VGAarbiterScreenKey))->field

-

-#define PICTURE_EPILOGUE(field, wrap) ps->field = wrap

-

-#define WRAP_SCREEN_INFO(x,y) do {pScreenPriv->x = pScrn->x; pScrn->x = y;} while(0)

-

-#define UNWRAP_SCREEN_INFO(x) pScrn->x = pScreenPriv->x

-

-#define SPRITE_PROLOG miPointerScreenPtr PointPriv = \

-    (miPointerScreenPtr)dixLookupPrivate(&pScreen->devPrivates, \

-    miPointerScreenKey); VGAarbiterScreenPtr pScreenPriv = \

-    ((VGAarbiterScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, \

-    VGAarbiterScreenKey)); PointPriv->spriteFuncs = pScreenPriv->miSprite;

-

-#define SPRITE_EPILOG pScreenPriv->miSprite = PointPriv->spriteFuncs;\

-    PointPriv->spriteFuncs  = &VGAarbiterSpriteFuncs;

-

-#define WRAP_SPRITE do { pScreenPriv->miSprite = PointPriv->spriteFuncs;\

-    	PointPriv->spriteFuncs  = &VGAarbiterSpriteFuncs; 		\

-	} while (0)

-

-#define UNWRAP_SPRITE PointPriv->spriteFuncs = pScreenPriv->miSprite

-

-#define GC_WRAP(x) pGCPriv->wrapOps = (x)->ops;\

-    pGCPriv->wrapFuncs = (x)->funcs; (x)->ops = &VGAarbiterGCOps;\

-    (x)->funcs = &VGAarbiterGCFuncs;

-

-#define GC_UNWRAP(x) VGAarbiterGCPtr  pGCPriv = \

-    (VGAarbiterGCPtr)dixLookupPrivate(&(x)->devPrivates, VGAarbiterGCKey);\

-    (x)->ops = pGCPriv->wrapOps; (x)->funcs = pGCPriv->wrapFuncs;

-

-static inline void

-VGAGet(ScreenPtr pScreen) {

-    pci_device_vgaarb_set_target(xf86Screens[pScreen->myNum]->vgaDev);

-    pci_device_vgaarb_lock();

-}

-

-static inline void

-VGAPut(void) {

-    pci_device_vgaarb_unlock();

-}

-

-typedef struct _VGAarbiterScreen {

-    CreateGCProcPtr             CreateGC;

-    CloseScreenProcPtr          CloseScreen;

-    ScreenBlockHandlerProcPtr   BlockHandler;

-    ScreenWakeupHandlerProcPtr  WakeupHandler;

-    GetImageProcPtr             GetImage;

-    GetSpansProcPtr             GetSpans;

-    SourceValidateProcPtr       SourceValidate;

-    CopyWindowProcPtr           CopyWindow;

-    ClearToBackgroundProcPtr    ClearToBackground;

-    CreatePixmapProcPtr         CreatePixmap;

-    SaveScreenProcPtr           SaveScreen;

-    /* Colormap */

-    StoreColorsProcPtr          StoreColors;

-    /* Cursor */

-    DisplayCursorProcPtr        DisplayCursor;

-    RealizeCursorProcPtr        RealizeCursor;

-    UnrealizeCursorProcPtr      UnrealizeCursor;

-    RecolorCursorProcPtr        RecolorCursor;

-    SetCursorPositionProcPtr    SetCursorPosition;

-    void                        (*AdjustFrame)(int,int,int,int);

-    Bool                        (*SwitchMode)(int, DisplayModePtr,int);

-    Bool                        (*EnterVT)(int, int);

-    void                        (*LeaveVT)(int, int);

-    void                        (*FreeScreen)(int, int);

-    miPointerSpriteFuncPtr      miSprite;

-    CompositeProcPtr            Composite;

-    GlyphsProcPtr               Glyphs;

-    CompositeRectsProcPtr       CompositeRects;

-} VGAarbiterScreenRec, *VGAarbiterScreenPtr;

-

-typedef struct _VGAarbiterGC {

-    GCOps                       *wrapOps;

-    GCFuncs                     *wrapFuncs;

-} VGAarbiterGCRec, *VGAarbiterGCPtr;

-

-/* Screen funcs */

-static void VGAarbiterBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask);

-static void VGAarbiterWakeupHandler(int i, pointer blockData, unsigned long result, pointer pReadmask);

-static Bool VGAarbiterCloseScreen (int i, ScreenPtr pScreen);

-static void VGAarbiterGetImage (DrawablePtr pDrawable, int sx, int sy, int w,

-    int h, unsigned int format, unsigned long planemask, char *pdstLine);

-static void VGAarbiterGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr

-    ppt, int *pwidth, int nspans, char  *pdstStart);

-static void VGAarbiterSourceValidate (DrawablePtr pDrawable, int x, int y,

-    int width, int height, unsigned int subWindowMode);

-static void VGAarbiterCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,

-    RegionPtr prgnSrc);

-static void VGAarbiterClearToBackground (WindowPtr pWin, int x, int y, int w,

-    int h, Bool generateExposures);

-static PixmapPtr VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h,

-    int depth, unsigned int usage_hint);

-static Bool  VGAarbiterCreateGC(GCPtr pGC);

-static Bool VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank);

-static void VGAarbiterStoreColors (ColormapPtr pmap, int ndef, xColorItem

-    *pdefs);

-static void VGAarbiterRecolorCursor (DeviceIntPtr pDev, ScreenPtr pScreen,

-    CursorPtr pCurs, Bool displayed);

-static Bool VGAarbiterRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen,

-    CursorPtr pCursor);

-static Bool VGAarbiterUnrealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen,

-    CursorPtr pCursor);

-static Bool VGAarbiterDisplayCursor (DeviceIntPtr pDev, ScreenPtr pScreen,

-    CursorPtr pCursor);

-static Bool VGAarbiterSetCursorPosition (DeviceIntPtr pDev, ScreenPtr

-    pScreen, int x, int y, Bool generateEvent);

-static void VGAarbiterAdjustFrame(int index, int x, int y, int flags);

-static Bool VGAarbiterSwitchMode(int index, DisplayModePtr mode, int flags);

-static Bool VGAarbiterEnterVT(int index, int flags);

-static void VGAarbiterLeaveVT(int index, int flags);

-static void VGAarbiterFreeScreen(int index, int flags);

-

-/* GC funcs */

-static void VGAarbiterValidateGC(GCPtr pGC, unsigned long changes,

-    DrawablePtr pDraw);

-static void VGAarbiterChangeGC(GCPtr pGC, unsigned long mask);

-static void VGAarbiterCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);

-static void VGAarbiterDestroyGC(GCPtr pGC);

-static void VGAarbiterChangeClip(GCPtr pGC, int type, pointer pvalue,

-    int nrects);

-static void VGAarbiterDestroyClip(GCPtr pGC);

-static void VGAarbiterCopyClip(GCPtr pgcDst, GCPtr pgcSrc);

-

-/* GC ops */

-static void VGAarbiterFillSpans( DrawablePtr pDraw, GC *pGC, int nInit,

-    DDXPointPtr pptInit, int *pwidthInit, int fSorted);

-static void VGAarbiterSetSpans(DrawablePtr pDraw, GCPtr pGC, char *pcharsrc,

-    register DDXPointPtr ppt, int *pwidth, int nspans, int fSorted);

-static void VGAarbiterPutImage(DrawablePtr pDraw, GCPtr pGC, int depth,

-    int x, int y, int w, int h, int leftPad, int format, char *pImage);

-static RegionPtr VGAarbiterCopyArea(DrawablePtr pSrc, DrawablePtr pDst,

-    GC *pGC, int srcx, int srcy, int width, int height, int dstx, int dsty);

-static RegionPtr VGAarbiterCopyPlane(DrawablePtr pSrc, DrawablePtr pDst,

-    GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty,

-    unsigned long bitPlane);

-static void VGAarbiterPolyPoint(DrawablePtr pDraw, GCPtr pGC, int mode,

-    int npt, xPoint *pptInit);

-static void VGAarbiterPolylines(DrawablePtr pDraw, GCPtr pGC, int mode,

-    int npt, DDXPointPtr pptInit);

-static void VGAarbiterPolySegment(DrawablePtr pDraw, GCPtr pGC, int nseg,

-    xSegment *pSeg);

-static void VGAarbiterPolyRectangle(DrawablePtr pDraw, GCPtr pGC,

-    int nRectsInit, xRectangle *pRectsInit);

-static void VGAarbiterPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs,

-    xArc *parcs);

-static void VGAarbiterFillPolygon(DrawablePtr pDraw, GCPtr pGC, int shape,

-    int mode, int count, DDXPointPtr ptsIn);

-static void VGAarbiterPolyFillRect( DrawablePtr pDraw, GCPtr pGC,

-    int nrectFill, xRectangle *prectInit);

-static void VGAarbiterPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs,

-    xArc *parcs);

-static int VGAarbiterPolyText8(DrawablePtr pDraw, GCPtr pGC, int x, int y,

-    int count, char *chars);

-static int VGAarbiterPolyText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,

-    int count, unsigned short *chars);

-static void VGAarbiterImageText8(DrawablePtr pDraw, GCPtr pGC, int x, int y,

-    int count, char *chars);

-static void VGAarbiterImageText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,

-    int count, unsigned short *chars);

-static void VGAarbiterImageGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int xInit,

-    int yInit, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase);

-static void VGAarbiterPolyGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int xInit,

-    int yInit, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase);

-static void VGAarbiterPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr

-    pDraw, int dx, int dy, int xOrg, int yOrg);

-

-/* miSpriteFuncs */

-static Bool VGAarbiterSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr

-    pScreen, CursorPtr pCur);

-static Bool VGAarbiterSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr

-    pScreen, CursorPtr pCur);

-static void VGAarbiterSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen,

-    CursorPtr pCur, int x, int y);

-static void VGAarbiterSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen,

-    int x, int y);

-static Bool VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);

-static void VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);

-

-

-static void VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,

-    PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,

-    INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);

-static void VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,

-    PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist, GlyphListPtr

-    list, GlyphPtr *glyphs);

-static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor

-    *color, int nRect, xRectangle *rects);

+/*
+ * Copyright (c) 2009 Tiago Vignatti
+ *
+ * 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 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.
+ *
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include <X11/X.h>
+#include "colormapst.h"
+#include "scrnintstr.h"
+#include "screenint.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+#include "pixmap.h"
+#include "windowstr.h"
+#include "window.h"
+#include "xf86str.h"
+#include "mipointer.h"
+#include "mipointrst.h"
+#include "picturestr.h"
+
+#define WRAP_SCREEN(x,y) {pScreenPriv->x = pScreen->x; pScreen->x = y;}
+
+#define UNWRAP_SCREEN(x) pScreen->x = pScreenPriv->x
+
+#define SCREEN_PROLOG(x) pScreen->x = ((VGAarbiterScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, VGAarbiterScreenKey))->x
+
+#define SCREEN_EPILOG(x,y) pScreen->x = y;
+
+#define WRAP_PICT(x,y) if (ps) {pScreenPriv->x = ps->x;\
+    ps->x = y;}
+
+#define UNWRAP_PICT(x) if (ps) {ps->x = pScreenPriv->x;}
+
+#define PICTURE_PROLOGUE(field) ps->field = \
+    ((VGAarbiterScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, \
+    VGAarbiterScreenKey))->field
+
+#define PICTURE_EPILOGUE(field, wrap) ps->field = wrap
+
+#define WRAP_SCREEN_INFO(x,y) do {pScreenPriv->x = pScrn->x; pScrn->x = y;} while(0)
+
+#define UNWRAP_SCREEN_INFO(x) pScrn->x = pScreenPriv->x
+
+#define SPRITE_PROLOG miPointerScreenPtr PointPriv = \
+    (miPointerScreenPtr)dixLookupPrivate(&pScreen->devPrivates, \
+    miPointerScreenKey); VGAarbiterScreenPtr pScreenPriv = \
+    ((VGAarbiterScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, \
+    VGAarbiterScreenKey)); PointPriv->spriteFuncs = pScreenPriv->miSprite;
+
+#define SPRITE_EPILOG pScreenPriv->miSprite = PointPriv->spriteFuncs;\
+    PointPriv->spriteFuncs  = &VGAarbiterSpriteFuncs;
+
+#define WRAP_SPRITE do { pScreenPriv->miSprite = PointPriv->spriteFuncs;\
+    	PointPriv->spriteFuncs  = &VGAarbiterSpriteFuncs; 		\
+	} while (0)
+
+#define UNWRAP_SPRITE PointPriv->spriteFuncs = pScreenPriv->miSprite
+
+#define GC_WRAP(x) pGCPriv->wrapOps = (x)->ops;\
+    pGCPriv->wrapFuncs = (x)->funcs; (x)->ops = &VGAarbiterGCOps;\
+    (x)->funcs = &VGAarbiterGCFuncs;
+
+#define GC_UNWRAP(x) VGAarbiterGCPtr  pGCPriv = \
+    (VGAarbiterGCPtr)dixLookupPrivate(&(x)->devPrivates, VGAarbiterGCKey);\
+    (x)->ops = pGCPriv->wrapOps; (x)->funcs = pGCPriv->wrapFuncs;
+
+static inline void
+VGAGet(ScreenPtr pScreen)
+{
+    pci_device_vgaarb_set_target(xf86Screens[pScreen->myNum]->vgaDev);
+    pci_device_vgaarb_lock();
+}
+
+static inline void
+VGAPut(void)
+{
+    pci_device_vgaarb_unlock();
+}
+
+typedef struct _VGAarbiterScreen {
+    CreateGCProcPtr CreateGC;
+    CloseScreenProcPtr CloseScreen;
+    ScreenBlockHandlerProcPtr BlockHandler;
+    ScreenWakeupHandlerProcPtr WakeupHandler;
+    GetImageProcPtr GetImage;
+    GetSpansProcPtr GetSpans;
+    SourceValidateProcPtr SourceValidate;
+    CopyWindowProcPtr CopyWindow;
+    ClearToBackgroundProcPtr ClearToBackground;
+    CreatePixmapProcPtr CreatePixmap;
+    SaveScreenProcPtr SaveScreen;
+    /* Colormap */
+    StoreColorsProcPtr StoreColors;
+    /* Cursor */
+    DisplayCursorProcPtr DisplayCursor;
+    RealizeCursorProcPtr RealizeCursor;
+    UnrealizeCursorProcPtr UnrealizeCursor;
+    RecolorCursorProcPtr RecolorCursor;
+    SetCursorPositionProcPtr SetCursorPosition;
+    void (*AdjustFrame) (int, int, int, int);
+    Bool (*SwitchMode) (int, DisplayModePtr, int);
+    Bool (*EnterVT) (int, int);
+    void (*LeaveVT) (int, int);
+    void (*FreeScreen) (int, int);
+    miPointerSpriteFuncPtr miSprite;
+    CompositeProcPtr Composite;
+    GlyphsProcPtr Glyphs;
+    CompositeRectsProcPtr CompositeRects;
+} VGAarbiterScreenRec, *VGAarbiterScreenPtr;
+
+typedef struct _VGAarbiterGC {
+    GCOps *wrapOps;
+    GCFuncs *wrapFuncs;
+} VGAarbiterGCRec, *VGAarbiterGCPtr;
+
+/* Screen funcs */
+static void VGAarbiterBlockHandler(int i, pointer blockData, pointer pTimeout,
+                                   pointer pReadmask);
+static void VGAarbiterWakeupHandler(int i, pointer blockData,
+                                    unsigned long result, pointer pReadmask);
+static Bool VGAarbiterCloseScreen(int i, ScreenPtr pScreen);
+static void VGAarbiterGetImage(DrawablePtr pDrawable, int sx, int sy, int w,
+                               int h, unsigned int format,
+                               unsigned long planemask, char *pdstLine);
+static void VGAarbiterGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
+                               int *pwidth, int nspans, char *pdstStart);
+static void VGAarbiterSourceValidate(DrawablePtr pDrawable, int x, int y,
+                                     int width, int height,
+                                     unsigned int subWindowMode);
+static void VGAarbiterCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
+                                 RegionPtr prgnSrc);
+static void VGAarbiterClearToBackground(WindowPtr pWin, int x, int y, int w,
+                                        int h, Bool generateExposures);
+static PixmapPtr VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h,
+                                        int depth, unsigned int usage_hint);
+static Bool VGAarbiterCreateGC(GCPtr pGC);
+static Bool VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank);
+static void VGAarbiterStoreColors(ColormapPtr pmap, int ndef, xColorItem
+                                  * pdefs);
+static void VGAarbiterRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
+                                    CursorPtr pCurs, Bool displayed);
+static Bool VGAarbiterRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
+                                    CursorPtr pCursor);
+static Bool VGAarbiterUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
+                                      CursorPtr pCursor);
+static Bool VGAarbiterDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
+                                    CursorPtr pCursor);
+static Bool VGAarbiterSetCursorPosition(DeviceIntPtr pDev, ScreenPtr
+                                        pScreen, int x, int y,
+                                        Bool generateEvent);
+static void VGAarbiterAdjustFrame(int index, int x, int y, int flags);
+static Bool VGAarbiterSwitchMode(int index, DisplayModePtr mode, int flags);
+static Bool VGAarbiterEnterVT(int index, int flags);
+static void VGAarbiterLeaveVT(int index, int flags);
+static void VGAarbiterFreeScreen(int index, int flags);
+
+/* GC funcs */
+static void VGAarbiterValidateGC(GCPtr pGC, unsigned long changes,
+                                 DrawablePtr pDraw);
+static void VGAarbiterChangeGC(GCPtr pGC, unsigned long mask);
+static void VGAarbiterCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
+static void VGAarbiterDestroyGC(GCPtr pGC);
+static void VGAarbiterChangeClip(GCPtr pGC, int type, pointer pvalue,
+                                 int nrects);
+static void VGAarbiterDestroyClip(GCPtr pGC);
+static void VGAarbiterCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
+
+/* GC ops */
+static void VGAarbiterFillSpans(DrawablePtr pDraw, GC * pGC, int nInit,
+                                DDXPointPtr pptInit, int *pwidthInit,
+                                int fSorted);
+static void VGAarbiterSetSpans(DrawablePtr pDraw, GCPtr pGC, char *pcharsrc,
+                               register DDXPointPtr ppt, int *pwidth,
+                               int nspans, int fSorted);
+static void VGAarbiterPutImage(DrawablePtr pDraw, GCPtr pGC, int depth, int x,
+                               int y, int w, int h, int leftPad, int format,
+                               char *pImage);
+static RegionPtr VGAarbiterCopyArea(DrawablePtr pSrc, DrawablePtr pDst,
+                                    GC * pGC, int srcx, int srcy, int width,
+                                    int height, int dstx, int dsty);
+static RegionPtr VGAarbiterCopyPlane(DrawablePtr pSrc, DrawablePtr pDst,
+                                     GCPtr pGC, int srcx, int srcy, int width,
+                                     int height, int dstx, int dsty,
+                                     unsigned long bitPlane);
+static void VGAarbiterPolyPoint(DrawablePtr pDraw, GCPtr pGC, int mode, int npt,
+                                xPoint * pptInit);
+static void VGAarbiterPolylines(DrawablePtr pDraw, GCPtr pGC, int mode, int npt,
+                                DDXPointPtr pptInit);
+static void VGAarbiterPolySegment(DrawablePtr pDraw, GCPtr pGC, int nseg,
+                                  xSegment * pSeg);
+static void VGAarbiterPolyRectangle(DrawablePtr pDraw, GCPtr pGC,
+                                    int nRectsInit, xRectangle *pRectsInit);
+static void VGAarbiterPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs,
+                              xArc * parcs);
+static void VGAarbiterFillPolygon(DrawablePtr pDraw, GCPtr pGC, int shape,
+                                  int mode, int count, DDXPointPtr ptsIn);
+static void VGAarbiterPolyFillRect(DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+                                   xRectangle *prectInit);
+static void VGAarbiterPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs,
+                                  xArc * parcs);
+static int VGAarbiterPolyText8(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                               int count, char *chars);
+static int VGAarbiterPolyText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                                int count, unsigned short *chars);
+static void VGAarbiterImageText8(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                                 int count, char *chars);
+static void VGAarbiterImageText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                                  int count, unsigned short *chars);
+static void VGAarbiterImageGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int xInit,
+                                    int yInit, unsigned int nglyph,
+                                    CharInfoPtr * ppci, pointer pglyphBase);
+static void VGAarbiterPolyGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int xInit,
+                                   int yInit, unsigned int nglyph,
+                                   CharInfoPtr * ppci, pointer pglyphBase);
+static void VGAarbiterPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr
+                                 pDraw, int dx, int dy, int xOrg, int yOrg);
+
+/* miSpriteFuncs */
+static Bool VGAarbiterSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr
+                                          pScreen, CursorPtr pCur);
+static Bool VGAarbiterSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr
+                                            pScreen, CursorPtr pCur);
+static void VGAarbiterSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
+                                      CursorPtr pCur, int x, int y);
+static void VGAarbiterSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
+                                       int x, int y);
+static Bool VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev,
+                                             ScreenPtr pScreen);
+static void VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);
+
+static void VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
+                                PicturePtr pDst, INT16 xSrc, INT16 ySrc,
+                                INT16 xMask, INT16 yMask, INT16 xDst,
+                                INT16 yDst, CARD16 width, CARD16 height);
+static void VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+                             PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc,
+                             int nlist, GlyphListPtr list, GlyphPtr * glyphs);
+static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst,
+                                     xRenderColor * color, int nRect,
+                                     xRectangle *rects);
diff --git a/xorg-server/hw/xfree86/common/xf86VidMode.c b/xorg-server/hw/xfree86/common/xf86VidMode.c
index 2ae5484e3..13ffe061c 100644
--- a/xorg-server/hw/xfree86/common/xf86VidMode.c
+++ b/xorg-server/hw/xfree86/common/xf86VidMode.c
@@ -61,20 +61,20 @@ VidModeExtensionInit(ScreenPtr pScreen)
 {
 #ifdef XF86VIDMODE
     VidModePtr pVidMode;
-    
+
     if (!xf86GetVidModeEnabled()) {
-	DebugF("!xf86GetVidModeEnabled()\n");
-	return FALSE;
+        DebugF("!xf86GetVidModeEnabled()\n");
+        return FALSE;
     }
 
     VidModeKey = &VidModeKeyRec;
 
     if (!dixRegisterPrivateKey(&VidModeKeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
 
     pVidMode = calloc(sizeof(VidModeRec), 1);
     if (!pVidMode)
-	return FALSE;
+        return FALSE;
 
     dixSetPrivate(&pScreen->devPrivates, VidModeKey, pVidMode);
 
@@ -90,7 +90,6 @@ VidModeExtensionInit(ScreenPtr pScreen)
 #endif
 }
 
-
 #ifdef XF86VIDMODE
 
 static Bool
@@ -100,14 +99,14 @@ VidModeClose(int i, ScreenPtr pScreen)
 
     /* This shouldn't happen */
     if (!pVidMode)
-	return FALSE;
+        return FALSE;
 
     pScreen->CloseScreen = pVidMode->CloseScreen;
 
     if (--VidModeCount == 0) {
-	free(dixLookupPrivate(&pScreen->devPrivates, VidModeKey));
-	dixSetPrivate(&pScreen->devPrivates, VidModeKey, NULL);
-	VidModeKey = NULL;
+        free(dixLookupPrivate(&pScreen->devPrivates, VidModeKey));
+        dixSetPrivate(&pScreen->devPrivates, VidModeKey, NULL);
+        VidModeKey = NULL;
     }
     return pScreen->CloseScreen(i, pScreen);
 }
@@ -119,22 +118,22 @@ VidModeAvailable(int scrnIndex)
     VidModePtr pVidMode;
 
     if (VidModeKey == NULL) {
-	DebugF("VidModeKey == NULL\n");
-	return FALSE;
+        DebugF("VidModeKey == NULL\n");
+        return FALSE;
     }
- 
+
     pScrn = xf86Screens[scrnIndex];
     if (pScrn == NULL) {
-	DebugF("pScrn == NULL\n");
-	return FALSE;
+        DebugF("pScrn == NULL\n");
+        return FALSE;
     }
-    
+
     pVidMode = VMPTR(pScrn->pScreen);
     if (pVidMode)
-	return TRUE;
+        return TRUE;
     else {
-	DebugF("pVidMode == NULL\n");
-	return FALSE;
+        DebugF("pVidMode == NULL\n");
+        return FALSE;
     }
 }
 
@@ -144,15 +143,15 @@ VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock)
     ScrnInfoPtr pScrn;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
 
     if (pScrn->currentMode) {
-	*mode = (pointer)(pScrn->currentMode);
-	*dotClock = pScrn->currentMode->Clock;
+        *mode = (pointer) (pScrn->currentMode);
+        *dotClock = pScrn->currentMode->Clock;
 
-	return TRUE;
+        return TRUE;
     }
     return FALSE;
 }
@@ -163,13 +162,13 @@ VidModeGetDotClock(int scrnIndex, int Clock)
     ScrnInfoPtr pScrn;
 
     if (!VidModeAvailable(scrnIndex))
-	return 0;
+        return 0;
 
     pScrn = xf86Screens[scrnIndex];
     if ((pScrn->progClock) || (Clock >= MAXCLOCKS))
-	return Clock;
-    else  
-	return pScrn->clock[Clock];
+        return Clock;
+    else
+        return pScrn->clock[Clock];
 }
 
 int
@@ -178,15 +177,16 @@ VidModeGetNumOfClocks(int scrnIndex, Bool *progClock)
     ScrnInfoPtr pScrn;
 
     if (!VidModeAvailable(scrnIndex))
-	return 0;
+        return 0;
 
     pScrn = xf86Screens[scrnIndex];
-    if (pScrn->progClock){
-	*progClock = TRUE;
-	return 0;
-    } else {
-	*progClock = FALSE;
-	return pScrn->numClocks;
+    if (pScrn->progClock) {
+        *progClock = TRUE;
+        return 0;
+    }
+    else {
+        *progClock = FALSE;
+        return pScrn->numClocks;
     }
 }
 
@@ -197,20 +197,19 @@ VidModeGetClocks(int scrnIndex, int *Clocks)
     int i;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
 
     if (pScrn->progClock)
-	return FALSE;
+        return FALSE;
 
-    for (i = 0;  i < pScrn->numClocks;  i++)
-	*Clocks++ = pScrn->clock[i];
+    for (i = 0; i < pScrn->numClocks; i++)
+        *Clocks++ = pScrn->clock[i];
 
     return TRUE;
 }
 
-
 Bool
 VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock)
 {
@@ -218,20 +217,20 @@ VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock)
     VidModePtr pVidMode;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
     if (pScrn->modes == NULL)
-	    return FALSE;
+        return FALSE;
 
     pVidMode = VMPTR(pScrn->pScreen);
     pVidMode->First = pScrn->modes;
-    pVidMode->Next =  pVidMode->First->next;
+    pVidMode->Next = pVidMode->First->next;
 
     if (pVidMode->First->status == MODE_OK) {
-      *mode = (pointer)(pVidMode->First);
-      *dotClock = VidModeGetDotClock(scrnIndex, pVidMode->First->Clock);
-      return TRUE;
+        *mode = (pointer) (pVidMode->First);
+        *dotClock = VidModeGetDotClock(scrnIndex, pVidMode->First->Clock);
+        return TRUE;
     }
 
     return VidModeGetNextModeline(scrnIndex, mode, dotClock);
@@ -245,20 +244,20 @@ VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock)
     DisplayModePtr p;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
     pVidMode = VMPTR(pScrn->pScreen);
 
     for (p = pVidMode->Next; p != NULL && p != pVidMode->First; p = p->next) {
-	if (p->status == MODE_OK) {
-	    pVidMode->Next = p->next;
-	    *mode = (pointer)p;
-	    *dotClock = VidModeGetDotClock(scrnIndex, p->Clock);
-	    return TRUE;
-	}
+        if (p->status == MODE_OK) {
+            pVidMode->Next = p->next;
+            *mode = (pointer) p;
+            *dotClock = VidModeGetDotClock(scrnIndex, p->Clock);
+            return TRUE;
+        }
     }
-    
+
     return FALSE;
 }
 
@@ -268,10 +267,10 @@ VidModeDeleteModeline(int scrnIndex, pointer mode)
     ScrnInfoPtr pScrn;
 
     if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
-    xf86DeleteMode(&(pScrn->modes), (DisplayModePtr)mode);
+    xf86DeleteMode(&(pScrn->modes), (DisplayModePtr) mode);
     return TRUE;
 }
 
@@ -281,7 +280,7 @@ VidModeZoomViewport(int scrnIndex, int zoom)
     ScrnInfoPtr pScrn;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
     xf86ZoomViewport(pScrn->pScreen, zoom);
@@ -294,17 +293,17 @@ VidModeSetViewPort(int scrnIndex, int x, int y)
     ScrnInfoPtr pScrn;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
-    pScrn->frameX0 = min( max(x, 0),
-	                 pScrn->virtualX - pScrn->currentMode->HDisplay );
+    pScrn->frameX0 = min(max(x, 0),
+                         pScrn->virtualX - pScrn->currentMode->HDisplay);
     pScrn->frameX1 = pScrn->frameX0 + pScrn->currentMode->HDisplay - 1;
-    pScrn->frameY0 = min( max(y, 0),
-	                 pScrn->virtualY - pScrn->currentMode->VDisplay );
+    pScrn->frameY0 = min(max(y, 0),
+                         pScrn->virtualY - pScrn->currentMode->VDisplay);
     pScrn->frameY1 = pScrn->frameY0 + pScrn->currentMode->VDisplay - 1;
     if (pScrn->AdjustFrame != NULL)
-	(pScrn->AdjustFrame)(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+        (pScrn->AdjustFrame) (scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
 
     return TRUE;
 }
@@ -315,7 +314,7 @@ VidModeGetViewPort(int scrnIndex, int *x, int *y)
     ScrnInfoPtr pScrn;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
     *x = pScrn->frameX0;
@@ -331,7 +330,7 @@ VidModeSwitchMode(int scrnIndex, pointer mode)
     Bool retval;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
     /* save in case we fail */
@@ -341,7 +340,7 @@ VidModeSwitchMode(int scrnIndex, pointer mode)
     retval = xf86SwitchMode(pScrn->pScreen, mode);
     /* we failed: restore it */
     if (retval == FALSE)
-	pScrn->currentMode = pTmpMode;
+        pScrn->currentMode = pTmpMode;
     return retval;
 }
 
@@ -351,12 +350,12 @@ VidModeLockZoom(int scrnIndex, Bool lock)
     ScrnInfoPtr pScrn;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
 
     if (xf86Info.dontZoom)
-	return FALSE;
+        return FALSE;
 
     xf86LockZoom(pScrn->pScreen, lock);
     return TRUE;
@@ -368,10 +367,10 @@ VidModeGetMonitor(int scrnIndex, pointer *monitor)
     ScrnInfoPtr pScrn;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
-    *monitor = (pointer)(pScrn->monitor);
+    *monitor = (pointer) (pScrn->monitor);
 
     return TRUE;
 }
@@ -382,11 +381,11 @@ VidModeCheckModeForMonitor(int scrnIndex, pointer mode)
     ScrnInfoPtr pScrn;
 
     if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
-	return MODE_ERROR;
+        return MODE_ERROR;
 
     pScrn = xf86Screens[scrnIndex];
 
-    return xf86CheckModeForMonitor((DisplayModePtr)mode, pScrn->monitor);
+    return xf86CheckModeForMonitor((DisplayModePtr) mode, pScrn->monitor);
 }
 
 ModeStatus
@@ -395,11 +394,11 @@ VidModeCheckModeForDriver(int scrnIndex, pointer mode)
     ScrnInfoPtr pScrn;
 
     if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
-	return MODE_ERROR;
+        return MODE_ERROR;
 
     pScrn = xf86Screens[scrnIndex];
 
-    return xf86CheckModeForDriver(pScrn, (DisplayModePtr)mode, 0);
+    return xf86CheckModeForDriver(pScrn, (DisplayModePtr) mode, 0);
 }
 
 void
@@ -407,15 +406,15 @@ VidModeSetCrtcForMode(int scrnIndex, pointer mode)
 {
     ScrnInfoPtr pScrn;
     DisplayModePtr ScreenModes;
-    
+
     if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
-	return;
+        return;
 
     /* Ugly hack so that the xf86Mode.c function can be used without change */
     pScrn = xf86Screens[scrnIndex];
     ScreenModes = pScrn->modes;
-    pScrn->modes = (DisplayModePtr)mode;
-    
+    pScrn->modes = (DisplayModePtr) mode;
+
     xf86SetCrtcForModes(pScrn, pScrn->adjustFlags);
     pScrn->modes = ScreenModes;
     return;
@@ -425,19 +424,19 @@ Bool
 VidModeAddModeline(int scrnIndex, pointer mode)
 {
     ScrnInfoPtr pScrn;
-    
+
     if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
 
-    ((DisplayModePtr)mode)->name         = strdup(""); /* freed by deletemode */
-    ((DisplayModePtr)mode)->status       = MODE_OK;
-    ((DisplayModePtr)mode)->next         = pScrn->modes->next;
-    ((DisplayModePtr)mode)->prev         = pScrn->modes;
-    pScrn->modes->next                   = (DisplayModePtr)mode;
-    if( ((DisplayModePtr)mode)->next != NULL )
-      ((DisplayModePtr)mode)->next->prev   = (DisplayModePtr)mode;
+    ((DisplayModePtr) mode)->name = strdup(""); /* freed by deletemode */
+    ((DisplayModePtr) mode)->status = MODE_OK;
+    ((DisplayModePtr) mode)->next = pScrn->modes->next;
+    ((DisplayModePtr) mode)->prev = pScrn->modes;
+    pScrn->modes->next = (DisplayModePtr) mode;
+    if (((DisplayModePtr) mode)->next != NULL)
+        ((DisplayModePtr) mode)->next->prev = (DisplayModePtr) mode;
 
     return TRUE;
 }
@@ -446,15 +445,15 @@ int
 VidModeGetNumOfModes(int scrnIndex)
 {
     pointer mode = NULL;
-    int dotClock= 0, nummodes = 0;
-  
+    int dotClock = 0, nummodes = 0;
+
     if (!VidModeGetFirstModeline(scrnIndex, &mode, &dotClock))
-	return nummodes;
+        return nummodes;
 
     do {
-	nummodes++;
-	if (!VidModeGetNextModeline(scrnIndex, &mode, &dotClock))
-	    return nummodes;
+        nummodes++;
+        if (!VidModeGetNextModeline(scrnIndex, &mode, &dotClock))
+            return nummodes;
     } while (TRUE);
 }
 
@@ -465,16 +464,16 @@ VidModeSetGamma(int scrnIndex, float red, float green, float blue)
     Gamma gamma;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
     gamma.red = red;
     gamma.green = green;
     gamma.blue = blue;
     if (xf86ChangeGamma(pScrn->pScreen, gamma) != Success)
-	return FALSE;
+        return FALSE;
     else
-	return TRUE;
+        return TRUE;
 }
 
 Bool
@@ -483,7 +482,7 @@ VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue)
     ScrnInfoPtr pScrn;
 
     if (!VidModeAvailable(scrnIndex))
-	return FALSE;
+        return FALSE;
 
     pScrn = xf86Screens[scrnIndex];
     *red = pScrn->gamma.red;
@@ -499,7 +498,7 @@ VidModeSetGammaRamp(int scrnIndex, int size, CARD16 *r, CARD16 *g, CARD16 *b)
 
     if (!VidModeAvailable(scrnIndex))
         return FALSE;
- 
+
     pScrn = xf86Screens[scrnIndex];
     xf86ChangeGammaRamp(pScrn->pScreen, size, r, g, b);
     return TRUE;
@@ -531,14 +530,14 @@ pointer
 VidModeCreateMode(void)
 {
     DisplayModePtr mode;
-  
+
     mode = malloc(sizeof(DisplayModeRec));
     if (mode != NULL) {
-	mode->name          = "";
-	mode->VScan         = 1;    /* divides refresh rate. default = 1 */
-	mode->Private       = NULL;
-	mode->next          = mode;
-	mode->prev          = mode;
+        mode->name = "";
+        mode->VScan = 1;        /* divides refresh rate. default = 1 */
+        mode->Private = NULL;
+        mode->next = mode;
+        mode->prev = mode;
     }
     return mode;
 }
@@ -546,127 +545,125 @@ VidModeCreateMode(void)
 void
 VidModeCopyMode(pointer modefrom, pointer modeto)
 {
-  memcpy(modeto, modefrom, sizeof(DisplayModeRec));
+    memcpy(modeto, modefrom, sizeof(DisplayModeRec));
 }
 
-
 int
 VidModeGetModeValue(pointer mode, int valtyp)
 {
-  int ret = 0;
-  
-  switch (valtyp) {
+    int ret = 0;
+
+    switch (valtyp) {
     case VIDMODE_H_DISPLAY:
-	ret = ((DisplayModePtr) mode)->HDisplay;
-	break;
+        ret = ((DisplayModePtr) mode)->HDisplay;
+        break;
     case VIDMODE_H_SYNCSTART:
-	ret = ((DisplayModePtr)mode)->HSyncStart;
-	break;
+        ret = ((DisplayModePtr) mode)->HSyncStart;
+        break;
     case VIDMODE_H_SYNCEND:
-	ret = ((DisplayModePtr)mode)->HSyncEnd;
-	break;
+        ret = ((DisplayModePtr) mode)->HSyncEnd;
+        break;
     case VIDMODE_H_TOTAL:
-	ret = ((DisplayModePtr)mode)->HTotal;
-	break;
+        ret = ((DisplayModePtr) mode)->HTotal;
+        break;
     case VIDMODE_H_SKEW:
-	ret = ((DisplayModePtr)mode)->HSkew;
-	break;
+        ret = ((DisplayModePtr) mode)->HSkew;
+        break;
     case VIDMODE_V_DISPLAY:
-	ret = ((DisplayModePtr)mode)->VDisplay;
-	break;
+        ret = ((DisplayModePtr) mode)->VDisplay;
+        break;
     case VIDMODE_V_SYNCSTART:
-	ret = ((DisplayModePtr)mode)->VSyncStart;
-	break;
+        ret = ((DisplayModePtr) mode)->VSyncStart;
+        break;
     case VIDMODE_V_SYNCEND:
-	ret = ((DisplayModePtr)mode)->VSyncEnd;
-	break;
+        ret = ((DisplayModePtr) mode)->VSyncEnd;
+        break;
     case VIDMODE_V_TOTAL:
-	ret = ((DisplayModePtr)mode)->VTotal;
-	break;
+        ret = ((DisplayModePtr) mode)->VTotal;
+        break;
     case VIDMODE_FLAGS:
-	ret = ((DisplayModePtr)mode)->Flags;
-	break;
+        ret = ((DisplayModePtr) mode)->Flags;
+        break;
     case VIDMODE_CLOCK:
-	ret = ((DisplayModePtr)mode)->Clock;
-	break;
-  }
-  return ret;
+        ret = ((DisplayModePtr) mode)->Clock;
+        break;
+    }
+    return ret;
 }
 
 void
 VidModeSetModeValue(pointer mode, int valtyp, int val)
 {
-  switch (valtyp) {
+    switch (valtyp) {
     case VIDMODE_H_DISPLAY:
-	((DisplayModePtr)mode)->HDisplay = val;
-	break;
+        ((DisplayModePtr) mode)->HDisplay = val;
+        break;
     case VIDMODE_H_SYNCSTART:
-	((DisplayModePtr)mode)->HSyncStart = val;
-	break;
+        ((DisplayModePtr) mode)->HSyncStart = val;
+        break;
     case VIDMODE_H_SYNCEND:
-	((DisplayModePtr)mode)->HSyncEnd = val;
-	break;
+        ((DisplayModePtr) mode)->HSyncEnd = val;
+        break;
     case VIDMODE_H_TOTAL:
-	((DisplayModePtr)mode)->HTotal = val;
-	break;
+        ((DisplayModePtr) mode)->HTotal = val;
+        break;
     case VIDMODE_H_SKEW:
-	((DisplayModePtr)mode)->HSkew = val;
-	break;
+        ((DisplayModePtr) mode)->HSkew = val;
+        break;
     case VIDMODE_V_DISPLAY:
-	((DisplayModePtr)mode)->VDisplay = val;
-	break;
+        ((DisplayModePtr) mode)->VDisplay = val;
+        break;
     case VIDMODE_V_SYNCSTART:
-	((DisplayModePtr)mode)->VSyncStart = val;
-	break;
+        ((DisplayModePtr) mode)->VSyncStart = val;
+        break;
     case VIDMODE_V_SYNCEND:
-	((DisplayModePtr)mode)->VSyncEnd = val;
-	break;
+        ((DisplayModePtr) mode)->VSyncEnd = val;
+        break;
     case VIDMODE_V_TOTAL:
-	((DisplayModePtr)mode)->VTotal = val;
-	break;
+        ((DisplayModePtr) mode)->VTotal = val;
+        break;
     case VIDMODE_FLAGS:
-	((DisplayModePtr)mode)->Flags = val;
-	break;
+        ((DisplayModePtr) mode)->Flags = val;
+        break;
     case VIDMODE_CLOCK:
-	((DisplayModePtr)mode)->Clock = val;
-	break;
-  }
-  return;
+        ((DisplayModePtr) mode)->Clock = val;
+        break;
+    }
+    return;
 }
 
 vidMonitorValue
 VidModeGetMonitorValue(pointer monitor, int valtyp, int indx)
 {
-  vidMonitorValue ret = { NULL, };
-  
-  switch (valtyp) {
+    vidMonitorValue ret = { NULL, };
+
+    switch (valtyp) {
     case VIDMODE_MON_VENDOR:
-	ret.ptr = (((MonPtr)monitor)->vendor);
-	break;
+        ret.ptr = (((MonPtr) monitor)->vendor);
+        break;
     case VIDMODE_MON_MODEL:
-	ret.ptr = (((MonPtr)monitor)->model);
-	break;
+        ret.ptr = (((MonPtr) monitor)->model);
+        break;
     case VIDMODE_MON_NHSYNC:
-	ret.i = ((MonPtr)monitor)->nHsync;
-	break;
+        ret.i = ((MonPtr) monitor)->nHsync;
+        break;
     case VIDMODE_MON_NVREFRESH:
-	ret.i = ((MonPtr)monitor)->nVrefresh;
-	break;
+        ret.i = ((MonPtr) monitor)->nVrefresh;
+        break;
     case VIDMODE_MON_HSYNC_LO:
-	ret.f = (100.0 * ((MonPtr)monitor)->hsync[indx].lo);
-	break;
+        ret.f = (100.0 * ((MonPtr) monitor)->hsync[indx].lo);
+        break;
     case VIDMODE_MON_HSYNC_HI:
-	ret.f = (100.0 * ((MonPtr)monitor)->hsync[indx].hi);
-	break;
+        ret.f = (100.0 * ((MonPtr) monitor)->hsync[indx].hi);
+        break;
     case VIDMODE_MON_VREFRESH_LO:
-	ret.f = (100.0 * ((MonPtr)monitor)->vrefresh[indx].lo);
-	break;
+        ret.f = (100.0 * ((MonPtr) monitor)->vrefresh[indx].lo);
+        break;
     case VIDMODE_MON_VREFRESH_HI:
-	ret.f = (100.0 * ((MonPtr)monitor)->vrefresh[indx].hi);
-	break;
-  }
-  return ret;
+        ret.f = (100.0 * ((MonPtr) monitor)->vrefresh[indx].hi);
+        break;
+    }
+    return ret;
 }
 
-
-#endif /* XF86VIDMODE */
+#endif                          /* XF86VIDMODE */
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index f6be99910..77b800000 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -64,13 +64,13 @@
 #include "extinit.h"
 #include "loaderProcs.h"
 
-#include "exevents.h"	/* AddInputDevice */
+#include "exevents.h"           /* AddInputDevice */
 #include "exglobals.h"
 #include "eventstr.h"
 #include "inpututils.h"
 #include "optionstr.h"
 
-#include <string.h>     /* InputClassMatches */
+#include <string.h>             /* InputClassMatches */
 #ifdef HAVE_FNMATCH_H
 #include <fnmatch.h>
 #endif
@@ -79,11 +79,11 @@
 #endif
 
 #include <stdarg.h>
-#include <stdint.h>          /* for int64_t */
+#include <stdint.h>             /* for int64_t */
 
 #include "mi.h"
 
-#include <ptrveloc.h>          /* dix pointer acceleration */
+#include <ptrveloc.h>           /* dix pointer acceleration */
 #include <xserver-properties.h>
 
 #ifdef XFreeXDGA
@@ -101,13 +101,13 @@
 	}
 
 static int
-xf86InputDevicePostInit(DeviceIntPtr dev);
+ xf86InputDevicePostInit(DeviceIntPtr dev);
 
 /**
  * Eval config and modify DeviceVelocityRec accordingly
  */
 static void
-ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,
+ProcessVelocityConfiguration(DeviceIntPtr pDev, char *devname, pointer list,
                              DeviceVelocityPtr s)
 {
     int tempi;
@@ -115,7 +115,7 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,
     Atom float_prop = XIGetKnownProperty(XATOM_FLOAT);
     Atom prop;
 
-    if(!s)
+    if (!s)
         return;
 
     /* common settings (available via device properties) */
@@ -139,14 +139,15 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,
 
     /* select profile by number */
     tempi = xf86SetIntOption(list, "AccelerationProfile",
-            s->statistics.profile_number);
+                             s->statistics.profile_number);
 
     prop = XIGetKnownProperty(ACCEL_PROP_PROFILE_NUMBER);
     if (XIChangeDeviceProperty(pDev, prop, XA_INTEGER, 32,
                                PropModeReplace, 1, &tempi, FALSE) == Success) {
         xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i\n", devname,
                 tempi);
-    } else {
+    }
+    else {
         xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i is unknown\n",
                 devname, tempi);
     }
@@ -158,7 +159,8 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,
         tempf = 1000.0 / tempf;
         XIChangeDeviceProperty(pDev, prop, float_prop, 32,
                                PropModeReplace, 1, &tempf, FALSE);
-    } else {
+    }
+    else {
         tempf = xf86SetRealOption(list, "VelocityScale", s->corr_mul);
         XIChangeDeviceProperty(pDev, prop, float_prop, 32,
                                PropModeReplace, 1, &tempf, FALSE);
@@ -166,7 +168,7 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,
 
     tempi = xf86SetIntOption(list, "VelocityTrackerCount", -1);
     if (tempi > 1)
-	InitTrackers(s, tempi);
+        InitTrackers(s, tempi);
 
     s->initial_range = xf86SetIntOption(list, "VelocityInitialRange",
                                         s->initial_range);
@@ -175,9 +177,9 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,
 
     tempf = xf86SetRealOption(list, "VelocityRelDiff", -1);
     if (tempf >= 0) {
-	xf86Msg(X_CONFIG, "%s: (accel) max rel. velocity difference: %.1f%%\n",
-	        devname, tempf*100.0);
-	s->max_rel_diff = tempf;
+        xf86Msg(X_CONFIG, "%s: (accel) max rel. velocity difference: %.1f%%\n",
+                devname, tempf * 100.0);
+        s->max_rel_diff = tempf;
     }
 
     /*  Configure softening. If const deceleration is used, this is expected
@@ -194,25 +196,26 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,
 }
 
 static void
-ApplyAccelerationSettings(DeviceIntPtr dev){
+ApplyAccelerationSettings(DeviceIntPtr dev)
+{
     int scheme, i;
     DeviceVelocityPtr pVel;
-    InputInfoPtr pInfo = (InputInfoPtr)dev->public.devicePrivate;
-    char* schemeStr;
+    InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;
+    char *schemeStr;
 
     if (dev->valuator && dev->ptrfeed) {
-	schemeStr = xf86SetStrOption(pInfo->options, "AccelerationScheme", "");
+        schemeStr = xf86SetStrOption(pInfo->options, "AccelerationScheme", "");
 
-	scheme = dev->valuator->accelScheme.number;
+        scheme = dev->valuator->accelScheme.number;
 
-	if (!xf86NameCmp(schemeStr, "predictable"))
-	    scheme = PtrAccelPredictable;
+        if (!xf86NameCmp(schemeStr, "predictable"))
+            scheme = PtrAccelPredictable;
 
-	if (!xf86NameCmp(schemeStr, "lightweight"))
-	    scheme = PtrAccelLightweight;
+        if (!xf86NameCmp(schemeStr, "lightweight"))
+            scheme = PtrAccelLightweight;
 
-	if (!xf86NameCmp(schemeStr, "none"))
-	    scheme = PtrAccelNoOp;
+        if (!xf86NameCmp(schemeStr, "none"))
+            scheme = PtrAccelNoOp;
 
         /* reinit scheme if needed */
         if (dev->valuator->accelScheme.number != scheme) {
@@ -221,14 +224,16 @@ ApplyAccelerationSettings(DeviceIntPtr dev){
             }
 
             if (InitPointerAccelerationScheme(dev, scheme)) {
-		xf86Msg(X_CONFIG, "%s: (accel) selected scheme %s/%i\n",
-		        pInfo->name, schemeStr, scheme);
-	    } else {
-        	xf86Msg(X_CONFIG, "%s: (accel) could not init scheme %s\n",
-		        pInfo->name, schemeStr);
-        	scheme = dev->valuator->accelScheme.number;
+                xf86Msg(X_CONFIG, "%s: (accel) selected scheme %s/%i\n",
+                        pInfo->name, schemeStr, scheme);
             }
-        } else {
+            else {
+                xf86Msg(X_CONFIG, "%s: (accel) could not init scheme %s\n",
+                        pInfo->name, schemeStr);
+                scheme = dev->valuator->accelScheme.number;
+            }
+        }
+        else {
             xf86Msg(X_CONFIG, "%s: (accel) keeping acceleration scheme %i\n",
                     pInfo->name, scheme);
         }
@@ -237,11 +242,11 @@ ApplyAccelerationSettings(DeviceIntPtr dev){
 
         /* process special configuration */
         switch (scheme) {
-            case PtrAccelPredictable:
-                pVel = GetDevicePredictableAccelData(dev);
-                ProcessVelocityConfiguration (dev, pInfo->name, pInfo->options,
-                                              pVel);
-                break;
+        case PtrAccelPredictable:
+            pVel = GetDevicePredictableAccelData(dev);
+            ProcessVelocityConfiguration(dev, pInfo->name, pInfo->options,
+                                         pVel);
+            break;
         }
 
         i = xf86SetIntOption(pInfo->options, "AccelerationNumerator",
@@ -260,8 +265,8 @@ ApplyAccelerationSettings(DeviceIntPtr dev){
             dev->ptrfeed->ctrl.threshold = i;
 
         xf86Msg(X_CONFIG, "%s: (accel) acceleration factor: %.3f\n",
-                            pInfo->name, ((float)dev->ptrfeed->ctrl.num)/
-                                         ((float)dev->ptrfeed->ctrl.den));
+                pInfo->name, ((float) dev->ptrfeed->ctrl.num) /
+                ((float) dev->ptrfeed->ctrl.den));
         xf86Msg(X_CONFIG, "%s: (accel) acceleration threshold: %i\n",
                 pInfo->name, dev->ptrfeed->ctrl.threshold);
     }
@@ -270,10 +275,10 @@ ApplyAccelerationSettings(DeviceIntPtr dev){
 static void
 ApplyTransformationMatrix(DeviceIntPtr dev)
 {
-    InputInfoPtr pInfo = (InputInfoPtr)dev->public.devicePrivate;
+    InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;
     char *str;
     int rc;
-    float matrix[9] = {0};
+    float matrix[9] = { 0 };
 
     if (!dev->valuator)
         return;
@@ -282,10 +287,12 @@ ApplyTransformationMatrix(DeviceIntPtr dev)
     if (!str)
         return;
 
-    rc = sscanf(str, "%f %f %f %f %f %f %f %f %f", &matrix[0], &matrix[1], &matrix[2],
-                &matrix[3], &matrix[4], &matrix[5], &matrix[6], &matrix[7], &matrix[8]);
+    rc = sscanf(str, "%f %f %f %f %f %f %f %f %f", &matrix[0], &matrix[1],
+                &matrix[2], &matrix[3], &matrix[4], &matrix[5], &matrix[6],
+                &matrix[7], &matrix[8]);
     if (rc != 9) {
-        xf86Msg(X_ERROR, "%s: invalid format for transformation matrix. Ignoring configuration.\n",
+        xf86Msg(X_ERROR,
+                "%s: invalid format for transformation matrix. Ignoring configuration.\n",
                 pInfo->name);
         return;
     }
@@ -304,8 +311,7 @@ ApplyTransformationMatrix(DeviceIntPtr dev)
  ***********************************************************************
  */
 void
-xf86ProcessCommonOptions(InputInfoPtr pInfo,
-                         XF86OptionPtr list)
+xf86ProcessCommonOptions(InputInfoPtr pInfo, XF86OptionPtr list)
 {
     if (xf86SetBoolOption(list, "Floating", 0) ||
         !xf86SetBoolOption(list, "AlwaysCore", 1) ||
@@ -313,7 +319,8 @@ xf86ProcessCommonOptions(InputInfoPtr pInfo,
         !xf86SetBoolOption(list, "CorePointer", 1) ||
         !xf86SetBoolOption(list, "CoreKeyboard", 1)) {
         xf86Msg(X_CONFIG, "%s: doesn't report core events\n", pInfo->name);
-    } else {
+    }
+    else {
         pInfo->flags |= XI86_ALWAYS_CORE;
         xf86Msg(X_CONFIG, "%s: always reports core events\n", pInfo->name);
     }
@@ -331,15 +338,13 @@ xf86ProcessCommonOptions(InputInfoPtr pInfo,
 static DeviceIntPtr
 xf86ActivateDevice(InputInfoPtr pInfo)
 {
-    DeviceIntPtr	dev;
-    Atom		atom;
+    DeviceIntPtr dev;
+    Atom atom;
 
     dev = AddInputDevice(serverClient, pInfo->device_control, TRUE);
 
-    if (dev == NULL)
-    {
-        xf86Msg(X_ERROR, "Too many input devices. Ignoring %s\n",
-                pInfo->name);
+    if (dev == NULL) {
+        xf86Msg(X_ERROR, "Too many input devices. Ignoring %s\n", pInfo->name);
         pInfo->dev = NULL;
         return NULL;
     }
@@ -356,7 +361,8 @@ xf86ActivateDevice(InputInfoPtr pInfo)
     dev->config_info = xf86SetStrOption(pInfo->options, "config_info", NULL);
 
     if (serverGeneration == 1)
-        xf86Msg(X_INFO, "XINPUT: Adding extended input device \"%s\" (type: %s, id %d)\n",
+        xf86Msg(X_INFO,
+                "XINPUT: Adding extended input device \"%s\" (type: %s, id %d)\n",
                 pInfo->name, pInfo->type_name, dev->id);
 
     return dev;
@@ -376,18 +382,17 @@ xf86ActivateDevice(InputInfoPtr pInfo)
  */
 
 int
-SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode)
+SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)
 {
-  InputInfoPtr        pInfo = (InputInfoPtr)dev->public.devicePrivate;
+    InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;
 
-  if (pInfo->switch_mode) {
-    return (*pInfo->switch_mode)(client, dev, mode);
-  }
-  else
-    return BadMatch;
+    if (pInfo->switch_mode) {
+        return (*pInfo->switch_mode) (client, dev, mode);
+    }
+    else
+        return BadMatch;
 }
 
-
 /***********************************************************************
  *
  * Caller:	ProcXSetDeviceValuators
@@ -402,19 +407,18 @@ SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode)
  */
 
 int
-SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators,
-                    int first_valuator, int num_valuators)
+SetDeviceValuators(ClientPtr client, DeviceIntPtr dev, int *valuators,
+                   int first_valuator, int num_valuators)
 {
     InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;
 
     if (pInfo->set_device_valuators)
-	return (*pInfo->set_device_valuators)(pInfo, valuators, first_valuator,
-					      num_valuators);
+        return (*pInfo->set_device_valuators) (pInfo, valuators, first_valuator,
+                                               num_valuators);
 
     return BadMatch;
 }
 
-
 /***********************************************************************
  *
  * Caller:	ProcXChangeDeviceControl
@@ -425,26 +429,26 @@ SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators,
  */
 
 int
-ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
+ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev, xDeviceCtl * control)
 {
-  InputInfoPtr        pInfo = (InputInfoPtr)dev->public.devicePrivate;
-
-  if (!pInfo->control_proc) {
-      switch (control->control) {
-      case DEVICE_CORE:
-      case DEVICE_ABS_CALIB:
-      case DEVICE_ABS_AREA:
-          return BadMatch;
-      case DEVICE_RESOLUTION:
-      case DEVICE_ENABLE:
-        return Success;
-      default:
-        return BadMatch;
-      }
-  }
-  else {
-      return (*pInfo->control_proc)(pInfo, control);
-  }
+    InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;
+
+    if (!pInfo->control_proc) {
+        switch (control->control) {
+        case DEVICE_CORE:
+        case DEVICE_ABS_CALIB:
+        case DEVICE_ABS_AREA:
+            return BadMatch;
+        case DEVICE_RESOLUTION:
+        case DEVICE_ENABLE:
+            return Success;
+        default:
+            return BadMatch;
+        }
+    }
+    else {
+        return (*pInfo->control_proc) (pInfo, control);
+    }
 }
 
 /*
@@ -506,8 +510,9 @@ match_string_implicit(const char *attr, const char *pattern)
 {
     if (strlen(pattern)) {
         return strcmp(attr, pattern);
-    } else {
-        return strcmp(attr,"(implicit)");
+    }
+    else {
+        return strcmp(attr, "(implicit)");
     }
 }
 
@@ -517,7 +522,7 @@ match_string_implicit(const char *attr, const char *pattern)
  */
 static Bool
 MatchAttrToken(const char *attr, struct xorg_list *patterns,
-               int (*compare)(const char *attr, const char *pattern))
+               int (*compare) (const char *attr, const char *pattern))
 {
     const xf86MatchGroup *group;
 
@@ -534,11 +539,11 @@ MatchAttrToken(const char *attr, struct xorg_list *patterns,
      * match. Each list entry is a separate Match line of the same type.
      */
     xorg_list_for_each_entry(group, patterns, entry) {
-        char * const *cur;
+        char *const *cur;
         Bool match = FALSE;
 
         for (cur = group->values; *cur; cur++)
-            if ((*compare)(attr, *cur) == 0) {
+            if ((*compare) (attr, *cur) == 0) {
                 match = TRUE;
                 break;
             }
@@ -556,10 +561,11 @@ MatchAttrToken(const char *attr, struct xorg_list *patterns,
  */
 static Bool
 InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,
-                  const InputAttributes *attrs)
+                  const InputAttributes * attrs)
 {
     /* MatchProduct substring */
-    if (!MatchAttrToken(attrs->product, &iclass->match_product, match_substring))
+    if (!MatchAttrToken
+        (attrs->product, &iclass->match_product, match_substring))
         return FALSE;
 
     /* MatchVendor substring */
@@ -567,7 +573,8 @@ InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,
         return FALSE;
 
     /* MatchDevicePath pattern */
-    if (!MatchAttrToken(attrs->device, &iclass->match_device, match_path_pattern))
+    if (!MatchAttrToken
+        (attrs->device, &iclass->match_device, match_path_pattern))
         return FALSE;
 
     /* MatchOS case-insensitive string */
@@ -591,7 +598,7 @@ InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,
      * See if any of the device's tags match any of the MatchTag tokens.
      */
     if (!xorg_list_is_empty(&iclass->match_tag)) {
-        char * const *tag;
+        char *const *tag;
         Bool match;
 
         if (!attrs->tags)
@@ -615,22 +622,22 @@ InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,
 
     /* MatchIs* booleans */
     if (iclass->is_keyboard.set &&
-        iclass->is_keyboard.val != !!(attrs->flags & ATTR_KEYBOARD))
+        iclass->is_keyboard.val != ! !(attrs->flags & ATTR_KEYBOARD))
         return FALSE;
     if (iclass->is_pointer.set &&
-        iclass->is_pointer.val != !!(attrs->flags & ATTR_POINTER))
+        iclass->is_pointer.val != ! !(attrs->flags & ATTR_POINTER))
         return FALSE;
     if (iclass->is_joystick.set &&
-        iclass->is_joystick.val != !!(attrs->flags & ATTR_JOYSTICK))
+        iclass->is_joystick.val != ! !(attrs->flags & ATTR_JOYSTICK))
         return FALSE;
     if (iclass->is_tablet.set &&
-        iclass->is_tablet.val != !!(attrs->flags & ATTR_TABLET))
+        iclass->is_tablet.val != ! !(attrs->flags & ATTR_TABLET))
         return FALSE;
     if (iclass->is_touchpad.set &&
-        iclass->is_touchpad.val != !!(attrs->flags & ATTR_TOUCHPAD))
+        iclass->is_touchpad.val != ! !(attrs->flags & ATTR_TOUCHPAD))
         return FALSE;
     if (iclass->is_touchscreen.set &&
-        iclass->is_touchscreen.val != !!(attrs->flags & ATTR_TOUCHSCREEN))
+        iclass->is_touchscreen.val != ! !(attrs->flags & ATTR_TOUCHSCREEN))
         return FALSE;
 
     return TRUE;
@@ -642,7 +649,7 @@ InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,
  * well as any previous InputClass sections.
  */
 static int
-MergeInputClasses(const InputInfoPtr idev, const InputAttributes *attrs)
+MergeInputClasses(const InputInfoPtr idev, const InputAttributes * attrs)
 {
     XF86ConfInputClassPtr cl;
     XF86OptionPtr classopts;
@@ -661,8 +668,7 @@ MergeInputClasses(const InputInfoPtr idev, const InputAttributes *attrs)
                         "InputClass configuration");
                 return BadAlloc;
             }
-            classopts = xf86ReplaceStrOption(classopts, "driver",
-                                             idev->driver);
+            classopts = xf86ReplaceStrOption(classopts, "driver", idev->driver);
         }
 
         /* Apply options to device with InputClass settings preferred. */
@@ -679,7 +685,7 @@ MergeInputClasses(const InputInfoPtr idev, const InputAttributes *attrs)
  * value of the last matching class and holler when returning TRUE.
  */
 static Bool
-IgnoreInputClass(const InputInfoPtr idev, const InputAttributes *attrs)
+IgnoreInputClass(const InputInfoPtr idev, const InputAttributes * attrs)
 {
     XF86ConfInputClassPtr cl;
     Bool ignore = FALSE;
@@ -724,13 +730,12 @@ xf86AddInput(InputDriverPtr drv, InputInfoPtr pInfo)
     pInfo->drv = drv;
     pInfo->module = DuplicateModule(drv->module, NULL);
 
-    for (prev = &xf86InputDevs; *prev; prev = &(*prev)->next)
-        ;
+    for (prev = &xf86InputDevs; *prev; prev = &(*prev)->next);
 
     *prev = pInfo;
     pInfo->next = NULL;
 
-    xf86CollectInputOptions(pInfo, (const char**)drv->default_options);
+    xf86CollectInputOptions(pInfo, (const char **) drv->default_options);
     xf86OptionListReport(pInfo->options);
     xf86ProcessCommonOptions(pInfo, pInfo->options);
 }
@@ -743,10 +748,10 @@ xf86DeleteInput(InputInfoPtr pInp, int flags)
 {
     /* First check if the inputdev is valid. */
     if (pInp == NULL)
-	return;
+        return;
 
     if (pInp->module)
-	UnloadModule(pInp->module);
+        UnloadModule(pInp->module);
 
     /* This should *really* be handled in drv->UnInit(dev) call instead, but
      * if the driver forgets about it make sure we free it or at least crash
@@ -757,14 +762,15 @@ xf86DeleteInput(InputInfoPtr pInp, int flags)
 
     /* Remove the entry from the list. */
     if (pInp == xf86InputDevs)
-	xf86InputDevs = pInp->next;
+        xf86InputDevs = pInp->next;
     else {
-	InputInfoPtr p = xf86InputDevs;
-	while (p && p->next != pInp)
-	    p = p->next;
-	if (p)
-	    p->next = pInp->next;
-	/* Else the entry wasn't in the xf86InputDevs list (ignore this). */
+        InputInfoPtr p = xf86InputDevs;
+
+        while (p && p->next != pInp)
+            p = p->next;
+        if (p)
+            p->next = pInp->next;
+        /* Else the entry wasn't in the xf86InputDevs list (ignore this). */
     }
 
     free(pInp->driver);
@@ -781,7 +787,8 @@ xf86DeleteInput(InputInfoPtr pInp, int flags)
  * @return Success or an error code
  */
 static int
-xf86InputDevicePostInit(DeviceIntPtr dev) {
+xf86InputDevicePostInit(DeviceIntPtr dev)
+{
     ApplyAccelerationSettings(dev);
     ApplyTransformationMatrix(dev);
     return Success;
@@ -823,7 +830,8 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
         goto unwind;
     }
 
-    xf86Msg(X_INFO, "Using input driver '%s' for '%s'\n", drv->driverName, pInfo->name);
+    xf86Msg(X_INFO, "Using input driver '%s' for '%s'\n", drv->driverName,
+            pInfo->name);
 
     if (!drv->PreInit) {
         xf86Msg(X_ERROR,
@@ -842,35 +850,30 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
         goto unwind;
     }
 
-    if (!(dev = xf86ActivateDevice(pInfo)))
-    {
+    if (!(dev = xf86ActivateDevice(pInfo))) {
         rval = BadAlloc;
         goto unwind;
     }
 
     rval = ActivateDevice(dev, TRUE);
-    if (rval != Success)
-    {
+    if (rval != Success) {
         xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);
         RemoveDevice(dev, TRUE);
         goto unwind;
     }
 
     rval = xf86InputDevicePostInit(dev);
-    if (rval != Success)
-    {
-	xf86Msg(X_ERROR, "Couldn't post-init device \"%s\"\n", pInfo->name);
-	RemoveDevice(dev, TRUE);
-	goto unwind;
+    if (rval != Success) {
+        xf86Msg(X_ERROR, "Couldn't post-init device \"%s\"\n", pInfo->name);
+        RemoveDevice(dev, TRUE);
+        goto unwind;
     }
 
     /* Enable it if it's properly initialised and we're currently in the VT */
-    if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema)
-    {
+    if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema) {
         OsBlockSignals();
         EnableDevice(dev, TRUE);
-        if (!dev->enabled)
-        {
+        if (!dev->enabled) {
             OsReleaseSignals();
             xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);
             RemoveDevice(dev, TRUE);
@@ -885,9 +888,9 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
     *pdev = dev;
     return Success;
 
-unwind:
-    if(pInfo) {
-        if(drv && drv->UnInit)
+ unwind:
+    if (pInfo) {
+        if (drv && drv->UnInit)
             drv->UnInit(drv, pInfo, 0);
         else
             xf86DeleteInput(pInfo, 0);
@@ -896,8 +899,8 @@ unwind:
 }
 
 int
-NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
-                       DeviceIntPtr *pdev)
+NewInputDeviceRequest(InputOption *options, InputAttributes * attrs,
+                      DeviceIntPtr *pdev)
 {
     InputInfoPtr pInfo = NULL;
     InputOption *option = NULL;
@@ -924,8 +927,7 @@ NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
             }
         }
 
-        if (strcasecmp(key, "name") == 0 ||
-            strcasecmp(key, "identifier") == 0) {
+        if (strcasecmp(key, "name") == 0 || strcasecmp(key, "identifier") == 0) {
             if (pInfo->name) {
                 rval = BadRequest;
                 goto unwind;
@@ -978,17 +980,19 @@ NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
 
     if (!pInfo->driver) {
         xf86Msg(X_INFO, "No input driver specified, ignoring this device.\n");
-        xf86Msg(X_INFO, "This device may have been added with another device file.\n");
+        xf86Msg(X_INFO,
+                "This device may have been added with another device file.\n");
         rval = BadRequest;
         goto unwind;
     }
 
     rval = xf86NewInputDevice(pInfo, pdev,
-                (!is_auto || (is_auto && xf86Info.autoEnableDevices)));
+                              (!is_auto ||
+                               (is_auto && xf86Info.autoEnableDevices)));
 
     return rval;
 
-unwind:
+ unwind:
     if (is_auto && !xf86Info.autoAddDevices)
         xf86Msg(X_INFO, "AutoAddDevices is off - not adding device.\n");
     xf86DeleteInput(pInfo, 0);
@@ -1002,15 +1006,14 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
     InputDriverPtr drv = NULL;
     Bool isMaster = IsMaster(pDev);
 
-    if (pInfo) /* need to get these before RemoveDevice */
+    if (pInfo)                  /* need to get these before RemoveDevice */
         drv = pInfo->drv;
 
     OsBlockSignals();
     RemoveDevice(pDev, TRUE);
 
-    if (!isMaster && pInfo != NULL)
-    {
-        if(drv->UnInit)
+    if (!isMaster && pInfo != NULL) {
+        if (drv->UnInit)
             drv->UnInit(drv, pInfo, 0);
         else
             xf86DeleteInput(pInfo, 0);
@@ -1023,11 +1026,8 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
  */
 
 void
-xf86PostMotionEvent(DeviceIntPtr	device,
-                    int			is_absolute,
-                    int			first_valuator,
-                    int			num_valuators,
-                    ...)
+xf86PostMotionEvent(DeviceIntPtr device,
+                    int is_absolute, int first_valuator, int num_valuators, ...)
 {
     va_list var;
     int i = 0;
@@ -1039,17 +1039,17 @@ xf86PostMotionEvent(DeviceIntPtr	device,
     va_start(var, num_valuators);
     for (i = 0; i < num_valuators; i++)
         valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+
     va_end(var);
 
     xf86PostMotionEventM(device, is_absolute, &mask);
 }
 
 void
-xf86PostMotionEventP(DeviceIntPtr	device,
-                    int			is_absolute,
-                    int			first_valuator,
-                    int			num_valuators,
-                    const int		*valuators)
+xf86PostMotionEventP(DeviceIntPtr device,
+                     int is_absolute,
+                     int first_valuator,
+                     int num_valuators, const int *valuators)
 {
     ValuatorMask mask;
 
@@ -1060,14 +1060,12 @@ xf86PostMotionEventP(DeviceIntPtr	device,
 }
 
 void
-xf86PostMotionEventM(DeviceIntPtr	device,
-                     int		is_absolute,
-                     const ValuatorMask	*mask)
+xf86PostMotionEventM(DeviceIntPtr device,
+                     int is_absolute, const ValuatorMask *mask)
 {
     int flags = 0;
 
-    if (valuator_mask_num_valuators(mask) > 0)
-    {
+    if (valuator_mask_num_valuators(mask) > 0) {
         if (is_absolute)
             flags = POINTER_ABSOLUTE;
         else
@@ -1076,21 +1074,18 @@ xf86PostMotionEventM(DeviceIntPtr	device,
 
 #if XFreeXDGA
     /* The evdev driver may not always send all axes across. */
-    if (valuator_mask_isset(mask, 0) ||
-        valuator_mask_isset(mask, 1))
+    if (valuator_mask_isset(mask, 0) || valuator_mask_isset(mask, 1))
         if (miPointerGetScreen(device)) {
             int index = miPointerGetScreen(device)->myNum;
             int dx = 0, dy = 0;
 
-            if (valuator_mask_isset(mask, 0))
-            {
+            if (valuator_mask_isset(mask, 0)) {
                 dx = valuator_mask_get(mask, 0);
                 if (is_absolute)
                     dx -= device->last.valuators[0];
             }
 
-            if (valuator_mask_isset(mask, 1))
-            {
+            if (valuator_mask_isset(mask, 1)) {
                 dy = valuator_mask_get(mask, 1);
                 if (is_absolute)
                     dy -= device->last.valuators[1];
@@ -1105,11 +1100,8 @@ xf86PostMotionEventM(DeviceIntPtr	device,
 }
 
 void
-xf86PostProximityEvent(DeviceIntPtr	device,
-                       int		is_in,
-                       int		first_valuator,
-                       int		num_valuators,
-                       ...)
+xf86PostProximityEvent(DeviceIntPtr device,
+                       int is_in, int first_valuator, int num_valuators, ...)
 {
     va_list var;
     int i;
@@ -1121,17 +1113,17 @@ xf86PostProximityEvent(DeviceIntPtr	device,
     va_start(var, num_valuators);
     for (i = 0; i < num_valuators; i++)
         valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+
     va_end(var);
 
     xf86PostProximityEventM(device, is_in, &mask);
 }
 
 void
-xf86PostProximityEventP(DeviceIntPtr	device,
-                        int		is_in,
-                        int		first_valuator,
-                        int		num_valuators,
-                        const int	*valuators)
+xf86PostProximityEventP(DeviceIntPtr device,
+                        int is_in,
+                        int first_valuator,
+                        int num_valuators, const int *valuators)
 {
     ValuatorMask mask;
 
@@ -1142,21 +1134,17 @@ xf86PostProximityEventP(DeviceIntPtr	device,
 }
 
 void
-xf86PostProximityEventM(DeviceIntPtr	device,
-                        int		is_in,
-                        const ValuatorMask *mask)
+xf86PostProximityEventM(DeviceIntPtr device,
+                        int is_in, const ValuatorMask *mask)
 {
     QueueProximityEvents(device, is_in ? ProximityIn : ProximityOut, mask);
 }
 
 void
-xf86PostButtonEvent(DeviceIntPtr	device,
-                    int			is_absolute,
-                    int			button,
-                    int			is_down,
-                    int			first_valuator,
-                    int			num_valuators,
-                    ...)
+xf86PostButtonEvent(DeviceIntPtr device,
+                    int is_absolute,
+                    int button,
+                    int is_down, int first_valuator, int num_valuators, ...)
 {
     va_list var;
     ValuatorMask mask;
@@ -1169,19 +1157,19 @@ xf86PostButtonEvent(DeviceIntPtr	device,
     va_start(var, num_valuators);
     for (i = 0; i < num_valuators; i++)
         valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+
     va_end(var);
 
     xf86PostButtonEventM(device, is_absolute, button, is_down, &mask);
 }
 
 void
-xf86PostButtonEventP(DeviceIntPtr	device,
-                     int		is_absolute,
-                     int		button,
-                     int		is_down,
-                     int		first_valuator,
-                     int		num_valuators,
-                     const int		*valuators)
+xf86PostButtonEventP(DeviceIntPtr device,
+                     int is_absolute,
+                     int button,
+                     int is_down,
+                     int first_valuator,
+                     int num_valuators, const int *valuators)
 {
     ValuatorMask mask;
 
@@ -1192,16 +1180,13 @@ xf86PostButtonEventP(DeviceIntPtr	device,
 }
 
 void
-xf86PostButtonEventM(DeviceIntPtr	device,
-                     int		is_absolute,
-                     int		button,
-                     int		is_down,
-                     const ValuatorMask	*mask)
+xf86PostButtonEventM(DeviceIntPtr device,
+                     int is_absolute,
+                     int button, int is_down, const ValuatorMask *mask)
 {
     int flags = 0;
 
-    if (valuator_mask_num_valuators(mask) > 0)
-    {
+    if (valuator_mask_num_valuators(mask) > 0) {
         if (is_absolute)
             flags = POINTER_ABSOLUTE;
         else
@@ -1223,13 +1208,10 @@ xf86PostButtonEventM(DeviceIntPtr	device,
 }
 
 void
-xf86PostKeyEvent(DeviceIntPtr	device,
-                 unsigned int	key_code,
-                 int		is_down,
-                 int		is_absolute,
-                 int		first_valuator,
-                 int		num_valuators,
-                 ...)
+xf86PostKeyEvent(DeviceIntPtr device,
+                 unsigned int key_code,
+                 int is_down,
+                 int is_absolute, int first_valuator, int num_valuators, ...)
 {
     va_list var;
     int i = 0;
@@ -1242,19 +1224,18 @@ xf86PostKeyEvent(DeviceIntPtr	device,
     va_start(var, num_valuators);
     for (i = 0; i < num_valuators; i++)
         valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+
     va_end(var);
 
     xf86PostKeyEventM(device, key_code, is_down, is_absolute, &mask);
 }
 
 void
-xf86PostKeyEventP(DeviceIntPtr	device,
-                  unsigned int	key_code,
-                  int		is_down,
-                  int		is_absolute,
-                  int		first_valuator,
-                  int		num_valuators,
-                  const int	*valuators)
+xf86PostKeyEventP(DeviceIntPtr device,
+                  unsigned int key_code,
+                  int is_down,
+                  int is_absolute,
+                  int first_valuator, int num_valuators, const int *valuators)
 {
     ValuatorMask mask;
 
@@ -1265,17 +1246,16 @@ xf86PostKeyEventP(DeviceIntPtr	device,
 }
 
 void
-xf86PostKeyEventM(DeviceIntPtr	device,
-                  unsigned int	key_code,
-                  int		is_down,
-                  int		is_absolute,
-                  const ValuatorMask *mask)
+xf86PostKeyEventM(DeviceIntPtr device,
+                  unsigned int key_code,
+                  int is_down, int is_absolute, const ValuatorMask *mask)
 {
 #if XFreeXDGA
     DeviceIntPtr pointer;
 
     /* Some pointers send key events, paired device is wrong then. */
     pointer = GetMaster(device, POINTER_OR_FLOAT);
+
     if (miPointerGetScreen(pointer)) {
         int index = miPointerGetScreen(pointer)->myNum;
 
@@ -1285,14 +1265,11 @@ xf86PostKeyEventM(DeviceIntPtr	device,
 #endif
 
     QueueKeyboardEvents(device,
-                        is_down ? KeyPress : KeyRelease,
-                        key_code, mask);
+                        is_down ? KeyPress : KeyRelease, key_code, mask);
 }
 
 void
-xf86PostKeyboardEvent(DeviceIntPtr      device,
-                      unsigned int      key_code,
-                      int               is_down)
+xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, int is_down)
 {
     ValuatorMask mask;
 
@@ -1323,41 +1300,38 @@ xf86FirstLocalDevice(void)
  */
 
 int
-xf86ScaleAxis(int	Cx,
-              int	to_max,
-              int	to_min,
-              int	from_max,
-              int	from_min )
+xf86ScaleAxis(int Cx, int to_max, int to_min, int from_max, int from_min)
 {
     int X;
     int64_t to_width = to_max - to_min;
     int64_t from_width = from_max - from_min;
 
     if (from_width) {
-	X = (int)(((to_width * (Cx - from_min)) / from_width) + to_min);
+        X = (int) (((to_width * (Cx - from_min)) / from_width) + to_min);
     }
     else {
-	X = 0;
-	ErrorF ("Divide by Zero in xf86ScaleAxis\n");
+        X = 0;
+        ErrorF("Divide by Zero in xf86ScaleAxis\n");
     }
-    
+
     if (X > to_max)
-	X = to_max;
+        X = to_max;
     if (X < to_min)
-	X = to_min;
-    
+        X = to_min;
+
     return X;
 }
 
 Bool
-xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval,
-			   int resolution, int min_res, int max_res, int mode)
+xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval,
+                           int maxval, int resolution, int min_res, int max_res,
+                           int mode)
 {
     if (!dev || !dev->valuator)
         return FALSE;
 
-    return InitValuatorAxisStruct(dev, axnum, label, minval, maxval, resolution, min_res,
-				  max_res, mode);
+    return InitValuatorAxisStruct(dev, axnum, label, minval, maxval, resolution,
+                                  min_res, max_res, mode);
 }
 
 /*
@@ -1368,16 +1342,15 @@ void
 xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum)
 {
     if (axnum == 0) {
-	dev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2;
+        dev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2;
         dev->last.valuators[0] = dev->valuator->axisVal[0];
     }
     else if (axnum == 1) {
-	dev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2;
+        dev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2;
         dev->last.valuators[1] = dev->valuator->axisVal[1];
     }
 }
 
-
 /**
  * Deactivate a device. Call this function from the driver if you receive a
  * read error or something else that spoils your day.
@@ -1390,11 +1363,10 @@ xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum)
 void
 xf86DisableDevice(DeviceIntPtr dev, Bool panic)
 {
-    if(!panic)
-    {
+    if (!panic) {
         DisableDevice(dev, TRUE);
-    } else
-    {
+    }
+    else {
         SendDevicePresenceEvent(dev->id, DeviceUnrecoverable);
         DeleteInputDeviceRequest(dev);
     }
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h
index ad092dd03..3731a34d5 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.h
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.h
@@ -48,7 +48,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 #ifndef _xf86Xinput_h
 #define _xf86Xinput_h
 
@@ -59,52 +58,48 @@
 #include "XIstubs.h"
 
 /* Input device flags */
-#define XI86_ALWAYS_CORE	0x04 /* device always controls the pointer */
+#define XI86_ALWAYS_CORE	0x04    /* device always controls the pointer */
 /* the device sends Xinput and core pointer events */
 #define XI86_SEND_CORE_EVENTS	XI86_ALWAYS_CORE
 
 /* This holds the input driver entry and module information. */
 typedef struct _InputDriverRec {
-    int			    driverVersion;
-    char *		    driverName;
-    void		    (*Identify)(int flags);
-    int			    (*PreInit)(struct _InputDriverRec *drv,
-				       struct _InputInfoRec* pInfo, int flags);
-    void		    (*UnInit)(struct _InputDriverRec *drv,
-				      struct _InputInfoRec *pInfo,
-				      int flags);
-    pointer		    module;
-    char **		    default_options;
+    int driverVersion;
+    char *driverName;
+    void (*Identify) (int flags);
+    int (*PreInit) (struct _InputDriverRec * drv,
+                    struct _InputInfoRec * pInfo, int flags);
+    void (*UnInit) (struct _InputDriverRec * drv,
+                    struct _InputInfoRec * pInfo, int flags);
+    pointer module;
+    char **default_options;
 } InputDriverRec, *InputDriverPtr;
 
 /* This is to input devices what the ScrnInfoRec is to screens. */
 
 typedef struct _InputInfoRec {
     struct _InputInfoRec *next;
-    char *		    name;
-    char *		    driver;
-
-    int			    flags;
-
-    Bool		    (*device_control)(DeviceIntPtr device, int what);
-    void		    (*read_input)(struct _InputInfoRec *local);
-    int			    (*control_proc)(struct _InputInfoRec *local,
-					   xDeviceCtl *control);
-    int			    (*switch_mode)(ClientPtr client, DeviceIntPtr dev,
-					  int mode);
-    int                     (*set_device_valuators)
-				(struct _InputInfoRec *local,
-				 int *valuators, int first_valuator,
-				 int num_valuators);
-
-    int			    fd;
-    DeviceIntPtr	    dev;
-    pointer		    private;
-    char *		    type_name;
-    InputDriverPtr	    drv;
-    pointer		    module;
-    XF86OptionPtr	    options;
-    InputAttributes         *attrs;
+    char *name;
+    char *driver;
+
+    int flags;
+
+    Bool (*device_control) (DeviceIntPtr device, int what);
+    void (*read_input) (struct _InputInfoRec * local);
+    int (*control_proc) (struct _InputInfoRec * local, xDeviceCtl * control);
+    int (*switch_mode) (ClientPtr client, DeviceIntPtr dev, int mode);
+    int (*set_device_valuators)
+     (struct _InputInfoRec * local,
+      int *valuators, int first_valuator, int num_valuators);
+
+    int fd;
+    DeviceIntPtr dev;
+    pointer private;
+    char *type_name;
+    InputDriverPtr drv;
+    pointer module;
+    XF86OptionPtr options;
+    InputAttributes *attrs;
 } *InputInfoPtr;
 
 /* xf86Globals.c */
@@ -112,73 +107,95 @@ extern InputInfoPtr xf86InputDevs;
 
 /* xf86Xinput.c */
 extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute,
-			 int first_valuator, int num_valuators, ...);
+                                          int first_valuator, int num_valuators,
+                                          ...);
 extern _X_EXPORT void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute,
-			 int first_valuator, int num_valuators, const int *valuators);
+                                           int first_valuator,
+                                           int num_valuators,
+                                           const int *valuators);
 extern _X_EXPORT void xf86PostMotionEventM(DeviceIntPtr device, int is_absolute,
-			 const ValuatorMask *mask);
+                                           const ValuatorMask *mask);
 extern _X_EXPORT void xf86PostProximityEvent(DeviceIntPtr device, int is_in,
-			    int first_valuator, int num_valuators, ...);
-extern _X_EXPORT void xf86PostProximityEventP(DeviceIntPtr device, int is_in, int first_valuator,
-			     int num_valuators, const int *valuators);
+                                             int first_valuator,
+                                             int num_valuators, ...);
+extern _X_EXPORT void xf86PostProximityEventP(DeviceIntPtr device, int is_in,
+                                              int first_valuator,
+                                              int num_valuators,
+                                              const int *valuators);
 extern _X_EXPORT void xf86PostProximityEventM(DeviceIntPtr device, int is_in,
-			 const ValuatorMask *mask);
-extern _X_EXPORT void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute, int button,
-		    	 int is_down, int first_valuator, int num_valuators,
-			 ...);
-extern _X_EXPORT void xf86PostButtonEventP(DeviceIntPtr device, int is_absolute, int button,
-			  int is_down, int first_valuator, int num_valuators,
-			  const int *valuators);
-extern _X_EXPORT void xf86PostButtonEventM(DeviceIntPtr device, int is_absolute, int button,
-			  int is_down, const ValuatorMask *mask);
-extern _X_EXPORT void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down,
-		      int is_absolute, int first_valuator, int num_valuators,
-		      ...);
-extern _X_EXPORT void xf86PostKeyEventM(DeviceIntPtr device, unsigned int key_code, int is_down,
-		       int is_absolute, const ValuatorMask *mask);
-extern _X_EXPORT void xf86PostKeyEventP(DeviceIntPtr device, unsigned int key_code, int is_down,
-		       int is_absolute, int first_valuator, int num_valuators,
-		       const int *valuators);
-extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code,
-                           int is_down);
+                                              const ValuatorMask *mask);
+extern _X_EXPORT void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute,
+                                          int button, int is_down,
+                                          int first_valuator, int num_valuators,
+                                          ...);
+extern _X_EXPORT void xf86PostButtonEventP(DeviceIntPtr device, int is_absolute,
+                                           int button, int is_down,
+                                           int first_valuator,
+                                           int num_valuators,
+                                           const int *valuators);
+extern _X_EXPORT void xf86PostButtonEventM(DeviceIntPtr device, int is_absolute,
+                                           int button, int is_down,
+                                           const ValuatorMask *mask);
+extern _X_EXPORT void xf86PostKeyEvent(DeviceIntPtr device,
+                                       unsigned int key_code, int is_down,
+                                       int is_absolute, int first_valuator,
+                                       int num_valuators, ...);
+extern _X_EXPORT void xf86PostKeyEventM(DeviceIntPtr device,
+                                        unsigned int key_code, int is_down,
+                                        int is_absolute,
+                                        const ValuatorMask *mask);
+extern _X_EXPORT void xf86PostKeyEventP(DeviceIntPtr device,
+                                        unsigned int key_code, int is_down,
+                                        int is_absolute, int first_valuator,
+                                        int num_valuators,
+                                        const int *valuators);
+extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device,
+                                            unsigned int key_code, int is_down);
 extern _X_EXPORT void xf86PostTouchEvent(DeviceIntPtr dev, uint32_t touchid,
                                          uint16_t type, uint32_t flags,
                                          const ValuatorMask *mask);
 extern _X_EXPORT InputInfoPtr xf86FirstLocalDevice(void);
-extern _X_EXPORT int xf86ScaleAxis(int Cx, int to_max, int to_min, int from_max, int from_min);
-extern _X_EXPORT void xf86ProcessCommonOptions(InputInfoPtr pInfo, XF86OptionPtr options);
-extern _X_EXPORT Bool xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval,
-				int maxval, int resolution, int min_res,
-				int max_res, int mode);
+extern _X_EXPORT int xf86ScaleAxis(int Cx, int to_max, int to_min, int from_max,
+                                   int from_min);
+extern _X_EXPORT void xf86ProcessCommonOptions(InputInfoPtr pInfo,
+                                               XF86OptionPtr options);
+extern _X_EXPORT Bool xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum,
+                                                 Atom label, int minval,
+                                                 int maxval, int resolution,
+                                                 int min_res, int max_res,
+                                                 int mode);
 extern _X_EXPORT void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum);
 extern _X_EXPORT void xf86AddEnabledDevice(InputInfoPtr pInfo);
 extern _X_EXPORT void xf86RemoveEnabledDevice(InputInfoPtr pInfo);
 extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
 extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);
+
 /* not exported */
 int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
 InputInfoPtr xf86AllocateInput(void);
 
 /* xf86Helper.c */
-extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags);
+extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module,
+                                         int flags);
 extern _X_EXPORT void xf86DeleteInputDriver(int drvIndex);
 extern _X_EXPORT InputDriverPtr xf86LookupInputDriver(const char *name);
 extern _X_EXPORT InputInfoPtr xf86LookupInput(const char *name);
 extern _X_EXPORT void xf86DeleteInput(InputInfoPtr pInp, int flags);
 extern _X_EXPORT void xf86MotionHistoryAllocate(InputInfoPtr pInfo);
-extern _X_EXPORT void xf86IDrvMsgVerb(InputInfoPtr dev,
-				      MessageType type, int verb,
-				      const char *format, ...) _X_ATTRIBUTE_PRINTF(4,5);
-extern _X_EXPORT void xf86IDrvMsg(InputInfoPtr dev,
-				  MessageType type,
-				  const char *format, ...) _X_ATTRIBUTE_PRINTF(3,4);
-extern _X_EXPORT void xf86VIDrvMsgVerb(InputInfoPtr dev,
-				       MessageType type,
-				       int verb,
-				       const char *format,
-				       va_list args) _X_ATTRIBUTE_PRINTF(4,0);
+extern _X_EXPORT void
+xf86IDrvMsgVerb(InputInfoPtr dev,
+                MessageType type, int verb, const char *format, ...)
+_X_ATTRIBUTE_PRINTF(4, 5);
+extern _X_EXPORT void
+xf86IDrvMsg(InputInfoPtr dev, MessageType type, const char *format, ...)
+_X_ATTRIBUTE_PRINTF(3, 4);
+extern _X_EXPORT void
+xf86VIDrvMsgVerb(InputInfoPtr dev,
+                 MessageType type, int verb, const char *format, va_list args)
+_X_ATTRIBUTE_PRINTF(4, 0);
 
 /* xf86Option.c */
-extern _X_EXPORT void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts);
+extern _X_EXPORT void
+xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts);
 
-#endif /* _xf86Xinput_h */
+#endif                          /* _xf86Xinput_h */
diff --git a/xorg-server/hw/xfree86/common/xf86cmap.c b/xorg-server/hw/xfree86/common/xf86cmap.c
index 191ae6132..cdc8459af 100644
--- a/xorg-server/hw/xfree86/common/xf86cmap.c
+++ b/xorg-server/hw/xfree86/common/xf86cmap.c
@@ -1,1183 +1,1181 @@
-/*

- * Copyright (c) 1998-2001 by The XFree86 Project, Inc.

- *

- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#if defined(_XOPEN_SOURCE) || defined(sun) && defined(__SVR4)

-#include <math.h>

-#else

-#define _XOPEN_SOURCE   /* to get prototype for pow on some systems */

-#include <math.h>

-#undef _XOPEN_SOURCE

-#endif

-

-#include <X11/X.h>

-#include "misc.h"

-#include <X11/Xproto.h>

-#include "colormapst.h"

-#include "scrnintstr.h"

-

-#include "resource.h"

-

-#include "xf86.h"

-#include "xf86_OSproc.h"

-#include "xf86str.h"

-#include "micmap.h"

-#include "xf86Crtc.h"

-

-#ifdef XFreeXDGA

-#include <X11/extensions/xf86dgaproto.h>

-#include "dgaproc.h"

-#endif

-

-#include "xf86cmap.h"

-

-#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = \

-    ((CMapScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, CMapScreenKey))->field)

-#define SCREEN_EPILOGUE(pScreen, field, wrapper)\

-    ((pScreen)->field = wrapper)

-

-#define LOAD_PALETTE(pmap) \

-    ((pmap == GetInstalledmiColormap(pmap->pScreen)) && \

-     ((pScreenPriv->flags & CMAP_LOAD_EVEN_IF_OFFSCREEN) || \

-      xf86Screens[pmap->pScreen->myNum]->vtSema || pScreenPriv->isDGAmode))

-

-

-typedef struct _CMapLink {

-  ColormapPtr		cmap;

-  struct _CMapLink	*next;

-} CMapLink, *CMapLinkPtr;

-

-typedef struct {

-  ScrnInfoPtr			pScrn;

-  CloseScreenProcPtr		CloseScreen;

-  CreateColormapProcPtr 	CreateColormap;

-  DestroyColormapProcPtr	DestroyColormap;

-  InstallColormapProcPtr	InstallColormap;

-  StoreColorsProcPtr		StoreColors;

-  Bool				(*EnterVT)(int, int);

-  Bool				(*SwitchMode)(int, DisplayModePtr, int);

-  int				(*SetDGAMode)(int, int, DGADevicePtr);

-  xf86ChangeGammaProc		*ChangeGamma;

-  int				maxColors;

-  int				sigRGBbits;

-  int				gammaElements;

-  LOCO				*gamma;

-  int				*PreAllocIndices;

-  CMapLinkPtr			maps;

-  unsigned int			flags;

-  Bool				isDGAmode;

-} CMapScreenRec, *CMapScreenPtr;

-

-typedef struct {

-  int		numColors;

-  LOCO		*colors;

-  Bool		recalculate;

-  int		overscan;

-} CMapColormapRec, *CMapColormapPtr;

-

-static DevPrivateKeyRec CMapScreenKeyRec;

-#define CMapScreenKeyRegistered dixPrivateKeyRegistered(&CMapScreenKeyRec)

-#define CMapScreenKey (&CMapScreenKeyRec)

-static DevPrivateKeyRec CMapColormapKeyRec;

-#define CMapColormapKey (&CMapColormapKeyRec)

-

-static void CMapInstallColormap(ColormapPtr);

-static void CMapStoreColors(ColormapPtr, int, xColorItem *);

-static Bool CMapCloseScreen (int, ScreenPtr);

-static Bool CMapCreateColormap (ColormapPtr);

-static void CMapDestroyColormap (ColormapPtr);

-

-static Bool CMapEnterVT(int, int);

-static Bool CMapSwitchMode(int, DisplayModePtr, int);

-#ifdef XFreeXDGA

-static int  CMapSetDGAMode(int, int, DGADevicePtr);

-#endif

-static int  CMapChangeGamma(int, Gamma);

-

-static void ComputeGamma(CMapScreenPtr);

-static Bool CMapAllocateColormapPrivate(ColormapPtr);

-static void CMapRefreshColors(ColormapPtr, int, int*);

-static void CMapSetOverscan(ColormapPtr, int, int *);

-static void CMapReinstallMap(ColormapPtr);

-static void CMapUnwrapScreen(ScreenPtr pScreen);

-

-

-Bool xf86ColormapAllocatePrivates(ScrnInfoPtr pScrn)

-{

-    /* If we support a better colormap system, then pretend we succeeded. */

-    if (xf86_crtc_supports_gamma(pScrn))

-	return TRUE;

-    if (!dixRegisterPrivateKey(&CMapScreenKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-

-    if (!dixRegisterPrivateKey(&CMapColormapKeyRec, PRIVATE_COLORMAP, 0))

-	return FALSE;

-    return TRUE;

-}

-

-Bool xf86HandleColormaps(

-    ScreenPtr pScreen,

-    int maxColors,

-    int sigRGBbits,

-    xf86LoadPaletteProc *loadPalette,

-    xf86SetOverscanProc *setOverscan,

-    unsigned int flags

-){

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    ColormapPtr pDefMap = NULL;

-    CMapScreenPtr pScreenPriv;  

-    LOCO *gamma; 

-    int *indices; 

-    int elements;

-

-    /* If we support a better colormap system, then pretend we succeeded. */

-    if (xf86_crtc_supports_gamma(pScrn))

-	return TRUE;

-

-    if(!maxColors || !sigRGBbits || !loadPalette)

-	return FALSE;

-

-    elements = 1 << sigRGBbits;

-

-    if(!(gamma = malloc(elements * sizeof(LOCO))))

-    	return FALSE;

-

-    if(!(indices = malloc(maxColors * sizeof(int)))) {

-	free(gamma);

-	return FALSE;

-    }

-      

-    if(!(pScreenPriv = malloc(sizeof(CMapScreenRec)))) {

-	free(gamma);

-	free(indices);

-	return FALSE;     

-    }

-

-    dixSetPrivate(&pScreen->devPrivates, &CMapScreenKeyRec, pScreenPriv);

-     

-    pScreenPriv->CloseScreen = pScreen->CloseScreen;

-    pScreenPriv->CreateColormap = pScreen->CreateColormap;

-    pScreenPriv->DestroyColormap = pScreen->DestroyColormap;

-    pScreenPriv->InstallColormap = pScreen->InstallColormap;

-    pScreenPriv->StoreColors = pScreen->StoreColors;

-    pScreen->CloseScreen = CMapCloseScreen;

-    pScreen->CreateColormap = CMapCreateColormap;

-    pScreen->DestroyColormap = CMapDestroyColormap;

-    pScreen->InstallColormap = CMapInstallColormap;

-    pScreen->StoreColors = CMapStoreColors;

-

-    pScreenPriv->pScrn = pScrn;

-    pScrn->LoadPalette = loadPalette;

-    pScrn->SetOverscan = setOverscan;

-    pScreenPriv->maxColors = maxColors;

-    pScreenPriv->sigRGBbits = sigRGBbits;

-    pScreenPriv->gammaElements = elements;

-    pScreenPriv->gamma = gamma;

-    pScreenPriv->PreAllocIndices = indices;

-    pScreenPriv->maps = NULL;

-    pScreenPriv->flags = flags;

-    pScreenPriv->isDGAmode = FALSE;

-

-    pScreenPriv->EnterVT = pScrn->EnterVT;

-    pScreenPriv->SwitchMode = pScrn->SwitchMode;

-    pScreenPriv->SetDGAMode = pScrn->SetDGAMode;    

-    pScreenPriv->ChangeGamma = pScrn->ChangeGamma;

-

-    if (!(flags & CMAP_LOAD_EVEN_IF_OFFSCREEN)) {

-	pScrn->EnterVT = CMapEnterVT;

-	if ((flags & CMAP_RELOAD_ON_MODE_SWITCH) && pScrn->SwitchMode) 

-	    pScrn->SwitchMode = CMapSwitchMode;

-    }

-#ifdef XFreeXDGA

-    pScrn->SetDGAMode = CMapSetDGAMode;

-#endif

-    pScrn->ChangeGamma = CMapChangeGamma;

- 

-    ComputeGamma(pScreenPriv);

-

-    /* get the default map */

-    dixLookupResourceByType((pointer *)&pDefMap, pScreen->defColormap,

-			    RT_COLORMAP, serverClient, DixInstallAccess);

-    

-    if(!CMapAllocateColormapPrivate(pDefMap)) {

-        CMapUnwrapScreen(pScreen);

-	return FALSE;

-    }

-

-    /* Force the initial map to be loaded */

-    SetInstalledmiColormap(pScreen, NULL);

-    CMapInstallColormap(pDefMap);

-    return TRUE;

-}

-

-

-/**** Screen functions ****/

-

-

-static Bool

-CMapCloseScreen (int i, ScreenPtr pScreen)

-{

-    CMapUnwrapScreen(pScreen);

-

-    return (*pScreen->CloseScreen) (i, pScreen);

-}

-

-static Bool

-CMapColormapUseMax(VisualPtr pVisual, CMapScreenPtr pScreenPriv)

-{

-    if (pVisual->nplanes > 16)

-        return TRUE;

-    return ((1 << pVisual->nplanes) > pScreenPriv->maxColors);

-}

-

-static Bool

-CMapAllocateColormapPrivate(ColormapPtr pmap)

-{

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pmap->pScreen->devPrivates, CMapScreenKey);

-    CMapColormapPtr pColPriv;

-    CMapLinkPtr pLink;

-    int numColors;

-    LOCO *colors;

-

-    if (CMapColormapUseMax(pmap->pVisual, pScreenPriv))

-	numColors = pmap->pVisual->ColormapEntries;

-    else 

-	numColors = 1 << pmap->pVisual->nplanes; 

-

-    if(!(colors = malloc(numColors * sizeof(LOCO))))

-	return FALSE;

-

-    if(!(pColPriv = malloc(sizeof(CMapColormapRec)))) {

-	free(colors);

-	return FALSE;

-    }	

-

-    dixSetPrivate(&pmap->devPrivates, CMapColormapKey, pColPriv);

- 

-    pColPriv->numColors = numColors;

-    pColPriv->colors = colors;

-    pColPriv->recalculate = TRUE;

-    pColPriv->overscan = -1;

-

-    /* add map to list */

-    pLink = malloc(sizeof(CMapLink));

-    if(pLink) {

-	pLink->cmap = pmap;

-	pLink->next = pScreenPriv->maps;

-	pScreenPriv->maps = pLink;

-    }

-

-    return TRUE;

-}

-

-static Bool 

-CMapCreateColormap (ColormapPtr pmap)

-{

-    ScreenPtr pScreen = pmap->pScreen;

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pScreen->devPrivates, CMapScreenKey);

-    Bool ret = FALSE;

-

-    pScreen->CreateColormap = pScreenPriv->CreateColormap;

-    if((*pScreen->CreateColormap)(pmap)) { 

-	if(CMapAllocateColormapPrivate(pmap)) 

-	   ret = TRUE;

-    }

-    pScreen->CreateColormap = CMapCreateColormap;

-

-    return ret;

-}

-

-static void

-CMapDestroyColormap (ColormapPtr cmap)

-{

-    ScreenPtr pScreen = cmap->pScreen;

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pScreen->devPrivates, CMapScreenKey);

-    CMapColormapPtr pColPriv = (CMapColormapPtr)dixLookupPrivate(

-	&cmap->devPrivates, CMapColormapKey);

-    CMapLinkPtr prevLink = NULL, pLink = pScreenPriv->maps;

-

-    if(pColPriv) {

-	free(pColPriv->colors);

-	free(pColPriv);

-    }

-   

-    /* remove map from list */

-    while(pLink) {

-	if(pLink->cmap == cmap) {

-	   if(prevLink)

-		prevLink->next = pLink->next;

-	   else

-		pScreenPriv->maps = pLink->next;

-	   free(pLink);

-	   break;

-	}

-	prevLink = pLink;

-	pLink = pLink->next;

-    }

-

-    if(pScreenPriv->DestroyColormap) {

-    	pScreen->DestroyColormap = pScreenPriv->DestroyColormap;

-	(*pScreen->DestroyColormap)(cmap);

-    	pScreen->DestroyColormap = CMapDestroyColormap;

-    }

-}

-

-

-

-static void

-CMapStoreColors(

-     ColormapPtr	pmap,

-     int		ndef,

-     xColorItem	        *pdefs

-){

-    ScreenPtr 	pScreen = pmap->pScreen;

-    VisualPtr	pVisual = pmap->pVisual;

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pScreen->devPrivates, CMapScreenKey);

-    int 	*indices = pScreenPriv->PreAllocIndices;

-    int		num = ndef;

-

-    /* At the moment this isn't necessary since there's nobody below us */

-    pScreen->StoreColors = pScreenPriv->StoreColors;

-    (*pScreen->StoreColors)(pmap, ndef, pdefs); 

-    pScreen->StoreColors = CMapStoreColors;

-

-    /* should never get here for these */

-    if(	(pVisual->class == TrueColor) ||

-	(pVisual->class == StaticColor) ||

-	(pVisual->class == StaticGray))

-	return;

-

-    if(pVisual->class == DirectColor) {

-	CMapColormapPtr pColPriv = (CMapColormapPtr)dixLookupPrivate(

-	    &pmap->devPrivates, CMapColormapKey);

-	int i;

-

-	if (CMapColormapUseMax(pVisual, pScreenPriv)) {

-	    int index;

-

-	    num = 0;

-	    while(ndef--) {

-		if(pdefs[ndef].flags & DoRed) {

-		    index = (pdefs[ndef].pixel & pVisual->redMask) >>

-					pVisual->offsetRed;

-		    i = num;

-		    while(i--)

-			if(indices[i] == index) break;

-		    if(i == -1)

-			indices[num++] = index;

-		}

-		if(pdefs[ndef].flags & DoGreen) {

-		    index = (pdefs[ndef].pixel & pVisual->greenMask) >>

-					pVisual->offsetGreen;

-		    i = num;

-		    while(i--)

-			if(indices[i] == index) break;

-		    if(i == -1)

-			indices[num++] = index;

-		}

-		if(pdefs[ndef].flags & DoBlue) {

-		    index = (pdefs[ndef].pixel & pVisual->blueMask) >>

-					pVisual->offsetBlue;

-		    i = num;

-		    while(i--)

-			if(indices[i] == index) break;

-		    if(i == -1)

-			indices[num++] = index;

-		}

-	    }

-

-	} else {

-	    /* not really as overkill as it seems */

-	    num = pColPriv->numColors;

-	    for(i = 0; i < pColPriv->numColors; i++)

-		indices[i] = i;

-	}

-    } else {

-	while(ndef--)

-	   indices[ndef] = pdefs[ndef].pixel;

-    } 

-

-    CMapRefreshColors(pmap, num, indices);

-}

-

-

-static void

-CMapInstallColormap(ColormapPtr pmap)

-{

-    ScreenPtr 	  pScreen = pmap->pScreen;

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pScreen->devPrivates, CMapScreenKey);

-

-    if (pmap == GetInstalledmiColormap(pmap->pScreen))

-	return;

-

-    pScreen->InstallColormap = pScreenPriv->InstallColormap;

-    (*pScreen->InstallColormap)(pmap);

-    pScreen->InstallColormap = CMapInstallColormap;

-

-    /* Important. We let the lower layers, namely DGA, 

-       overwrite the choice of Colormap to install */

-    if (GetInstalledmiColormap(pmap->pScreen))

-	pmap = GetInstalledmiColormap(pmap->pScreen);

-

-    if (!(pScreenPriv->flags & CMAP_PALETTED_TRUECOLOR) &&

-	 (pmap->pVisual->class == TrueColor) &&

-	 CMapColormapUseMax(pmap->pVisual, pScreenPriv))

-	return;

-

-    if(LOAD_PALETTE(pmap))

-	CMapReinstallMap(pmap);

-}

-

-

-/**** ScrnInfoRec functions ****/

-

-static Bool 

-CMapEnterVT(int index, int flags)

-{

-    ScrnInfoPtr pScrn = xf86Screens[index];

-    ScreenPtr pScreen = screenInfo.screens[index];

-    Bool ret;

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pScreen->devPrivates, CMapScreenKey);

-

-    pScrn->EnterVT = pScreenPriv->EnterVT;

-    ret = (*pScreenPriv->EnterVT)(index, flags);

-    pScreenPriv->EnterVT = pScrn->EnterVT;

-    pScrn->EnterVT = CMapEnterVT;

-    if(ret) {

-	if(GetInstalledmiColormap(pScreen))

-	    CMapReinstallMap(GetInstalledmiColormap(pScreen));

-	return TRUE;

-    }

-    return FALSE;

-}

-

-

-static Bool 

-CMapSwitchMode(int index, DisplayModePtr mode, int flags)

-{

-    ScreenPtr pScreen = screenInfo.screens[index];

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pScreen->devPrivates, CMapScreenKey);

-

-    if((*pScreenPriv->SwitchMode)(index, mode, flags)) {

-	if(GetInstalledmiColormap(pScreen))

-	    CMapReinstallMap(GetInstalledmiColormap(pScreen));

-	return TRUE;

-    }

-    return FALSE;

-}

-

-#ifdef XFreeXDGA

-static int  

-CMapSetDGAMode(int index, int num, DGADevicePtr dev)

-{

-    ScreenPtr pScreen = screenInfo.screens[index];

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pScreen->devPrivates, CMapScreenKey);

-    int ret;

-

-    ret = (*pScreenPriv->SetDGAMode)(index, num, dev);

-

-    pScreenPriv->isDGAmode = DGAActive(index);

-

-    if(!pScreenPriv->isDGAmode && GetInstalledmiColormap(pScreen)

-         && xf86Screens[pScreen->myNum]->vtSema)

-	CMapReinstallMap(GetInstalledmiColormap(pScreen));

-

-    return ret;

-}

-#endif

-

-

-/**** Utilities ****/

-

-static void

-CMapReinstallMap(ColormapPtr pmap)

-{

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pmap->pScreen->devPrivates, CMapScreenKey);

-    CMapColormapPtr cmapPriv = (CMapColormapPtr)dixLookupPrivate(

-	&pmap->devPrivates, CMapColormapKey);

-    ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum];

-    int i = cmapPriv->numColors;

-    int *indices = pScreenPriv->PreAllocIndices;

-

-    while(i--)

-	indices[i] = i;

-   

-    if(cmapPriv->recalculate)

-	CMapRefreshColors(pmap, cmapPriv->numColors, indices);

-    else {

-	(*pScrn->LoadPalette)(pScrn, cmapPriv->numColors,

- 			indices, cmapPriv->colors, pmap->pVisual);

-	if (pScrn->SetOverscan) {

-#ifdef DEBUGOVERSCAN

-	    ErrorF("SetOverscan() called from CMapReinstallMap\n");

-#endif

-	    pScrn->SetOverscan(pScrn, cmapPriv->overscan);

-	}

-    }

-

-    cmapPriv->recalculate = FALSE;

-}

-

-

-static void 

-CMapRefreshColors(ColormapPtr pmap, int defs, int* indices)

-{

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pmap->pScreen->devPrivates, CMapScreenKey);

-    CMapColormapPtr pColPriv = (CMapColormapPtr)dixLookupPrivate(

-	&pmap->devPrivates, CMapColormapKey);

-    VisualPtr pVisual = pmap->pVisual;

-    ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum];

-    int numColors, i;

-    LOCO *gamma, *colors;

-    EntryPtr entry;

-    int reds, greens, blues, maxValue, index, shift;

-

-    numColors = pColPriv->numColors;

-    shift = 16 - pScreenPriv->sigRGBbits;

-    maxValue = (1 << pScreenPriv->sigRGBbits) - 1;

-    gamma = pScreenPriv->gamma;

-    colors = pColPriv->colors;

-

-    reds = pVisual->redMask >> pVisual->offsetRed;

-    greens = pVisual->greenMask >> pVisual->offsetGreen;

-    blues = pVisual->blueMask >> pVisual->offsetBlue;

-

-    switch(pVisual->class) {

-    case StaticGray:

-	for(i = 0; i < numColors; i++) { 

-	    index = (i+1) * maxValue / numColors;

-	    colors[i].red   = gamma[index].red;

-	    colors[i].green = gamma[index].green;

-	    colors[i].blue  = gamma[index].blue;

-	}

-	break;

-    case TrueColor:

-        if (CMapColormapUseMax(pVisual, pScreenPriv)) {

-	    for(i = 0; i <= reds; i++) 

-		colors[i].red   = gamma[i * maxValue / reds].red;

-	    for(i = 0; i <= greens; i++) 

-		colors[i].green = gamma[i * maxValue / greens].green;

-	    for(i = 0; i <= blues; i++) 

-		colors[i].blue  = gamma[i * maxValue / blues].blue;

-	    break;

-	}

-	for(i = 0; i < numColors; i++) {

-	    colors[i].red   = gamma[((i >> pVisual->offsetRed) & reds) * 

-					maxValue / reds].red;

-	    colors[i].green = gamma[((i >> pVisual->offsetGreen) & greens) * 

-					maxValue / greens].green;

-	    colors[i].blue  = gamma[((i >> pVisual->offsetBlue) & blues) * 

-					maxValue / blues].blue;

-	}

-	break;

-    case StaticColor:

-    case PseudoColor:

-    case GrayScale:

-	for(i = 0; i < defs; i++) { 

-	    index = indices[i];

-	    entry = (EntryPtr)&pmap->red[index];

-

-	    if(entry->fShared) {

-		colors[index].red = 

-			gamma[entry->co.shco.red->color >> shift].red;

-		colors[index].green = 

-			gamma[entry->co.shco.green->color >> shift].green;

-		colors[index].blue = 

-			gamma[entry->co.shco.blue->color >> shift].blue;

-	    } else {

-		colors[index].red   = 

-				gamma[entry->co.local.red >> shift].red;

-		colors[index].green = 

-				gamma[entry->co.local.green >> shift].green;

-		colors[index].blue  = 

-				gamma[entry->co.local.blue >> shift].blue;

-	    }

-	}

-	break;

-    case DirectColor:

-        if (CMapColormapUseMax(pVisual, pScreenPriv)) {

-	    for(i = 0; i < defs; i++) { 

-		index = indices[i];

-		if(index <= reds)

-		    colors[index].red   = 

-			gamma[pmap->red[index].co.local.red >> shift].red;

-		if(index <= greens)

-		    colors[index].green = 

-			gamma[pmap->green[index].co.local.green >> shift].green;

-		if(index <= blues)

-		    colors[index].blue   = 

-			gamma[pmap->blue[index].co.local.blue >> shift].blue;

-

-	    }

-	    break;

-	}

-	for(i = 0; i < defs; i++) { 

-	    index = indices[i];

-

-	    colors[index].red   = gamma[pmap->red[

-				(index >> pVisual->offsetRed) & reds

-				].co.local.red >> shift].red;

-	    colors[index].green = gamma[pmap->green[

-				(index >> pVisual->offsetGreen) & greens

-				].co.local.green >> shift].green;

-	    colors[index].blue  = gamma[pmap->blue[

-				(index >> pVisual->offsetBlue) & blues

-				].co.local.blue >> shift].blue;

-	}

-	break;

-    }

-

-

-    if(LOAD_PALETTE(pmap))

-	(*pScrn->LoadPalette)(pScreenPriv->pScrn, defs, indices,

- 					colors, pmap->pVisual);

-

-    if (pScrn->SetOverscan)

-	CMapSetOverscan(pmap, defs, indices);

-

-}

-

-static Bool

-CMapCompareColors(LOCO *color1, LOCO *color2)

-{

-    /* return TRUE if the color1 is "closer" to black than color2 */

-#ifdef DEBUGOVERSCAN

-    ErrorF("#%02x%02x%02x vs #%02x%02x%02x (%d vs %d)\n",

-	color1->red, color1->green, color1->blue,

-	color2->red, color2->green, color2->blue,

-	color1->red + color1->green + color1->blue,

-	color2->red + color2->green + color2->blue);

-#endif

-    return (color1->red + color1->green + color1->blue <

-	    color2->red + color2->green + color2->blue);

-}

-

-static void

-CMapSetOverscan(ColormapPtr pmap, int defs, int *indices)

-{

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pmap->pScreen->devPrivates, CMapScreenKey);

-    CMapColormapPtr pColPriv = (CMapColormapPtr)dixLookupPrivate(

-	&pmap->devPrivates, CMapColormapKey);

-    ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum];

-    VisualPtr pVisual = pmap->pVisual;

-    int i;

-    LOCO *colors;

-    int index;

-    Bool newOverscan = FALSE;

-    int overscan, tmpOverscan;

-

-    colors = pColPriv->colors;

-    overscan = pColPriv->overscan;

-

-    /*

-     * Search for a new overscan index in the following cases:

-     *

-     *   - The index hasn't yet been initialised.  In this case search

-     *     for an index that is black or a close match to black.

-     *

-     *   - The colour of the old index is changed.  In this case search

-     *     all indices for a black or close match to black.

-     *

-     *   - The colour of the old index wasn't black.  In this case only

-     *     search the indices that were changed for a better match to black.

-     */

-

-    switch (pVisual->class) {

-    case StaticGray:

-    case TrueColor:

-	/* Should only come here once.  Initialise the overscan index to 0 */

-	overscan = 0;

-	newOverscan = TRUE;

-	break;

-    case StaticColor:

-	/*

-         * Only come here once, but search for the overscan in the same way

-         * as for the other cases.

-	 */

-    case DirectColor:

-    case PseudoColor:

-    case GrayScale:

-	if (overscan < 0 || overscan > pScreenPriv->maxColors - 1) {

-	    /* Uninitialised */

-	    newOverscan = TRUE;

-	} else {

-	    /* Check if the overscan was changed */

-	    for (i = 0; i < defs; i++) {

-		index = indices[i];

-		if (index == overscan) {

-		    newOverscan = TRUE;

-		    break;

-		}

-	    }

-	}

-	if (newOverscan) {

-	    /* The overscan is either uninitialised or it has been changed */

-

-	    if (overscan < 0 || overscan > pScreenPriv->maxColors - 1)

-		tmpOverscan = pScreenPriv->maxColors - 1;

-	    else

-		tmpOverscan = overscan;

-

-	    /* search all entries for a close match to black */

-	    for (i = pScreenPriv->maxColors - 1; i >= 0; i--) {

-		if (colors[i].red == 0 && colors[i].green == 0 &&

-		    colors[i].blue == 0) {

-		    overscan = i;

-#ifdef DEBUGOVERSCAN

-		    ErrorF("Black found at index 0x%02x\n", i);

-#endif

-		    break;

-		} else {

-#ifdef DEBUGOVERSCAN

-		    ErrorF("0x%02x: ", i);

-#endif

-		    if (CMapCompareColors(&colors[i], &colors[tmpOverscan])) {

-			tmpOverscan = i;

-#ifdef DEBUGOVERSCAN

-			ErrorF("possible \"Black\" at index 0x%02x\n", i);

-#endif

-		    }

-		}

-	    }

-	    if (i < 0)

-		overscan = tmpOverscan;

-	} else {

-	    /* Check of the old overscan wasn't black */

-	    if (colors[overscan].red != 0 || colors[overscan].green != 0 ||

-		colors[overscan].blue != 0) {

-		int oldOverscan = tmpOverscan = overscan;

-		/* See of there is now a better match */

-		for (i = 0; i < defs; i++) {

-		    index = indices[i];

-		    if (colors[index].red == 0 && colors[index].green == 0 &&

-			colors[index].blue == 0) {

-			overscan = index;

-#ifdef DEBUGOVERSCAN

-			ErrorF("Black found at index 0x%02x\n", index);

-#endif

-			break;

-		    } else {

-#ifdef DEBUGOVERSCAN

-			ErrorF("0x%02x: ", index);

-#endif

-			if (CMapCompareColors(&colors[index],

-					      &colors[tmpOverscan])) {

-			    tmpOverscan = index;

-#ifdef DEBUGOVERSCAN

-			    ErrorF("possible \"Black\" at index 0x%02x\n",

-				   index);

-#endif

-			}

-		    }

-		}

-		if (i == defs)

-		    overscan = tmpOverscan;

-		if (overscan != oldOverscan)

-		    newOverscan = TRUE;

-	    }

-	}

-	break;

-    }

-    if (newOverscan) {

-	pColPriv->overscan = overscan;

-	if (LOAD_PALETTE(pmap)) {

-#ifdef DEBUGOVERSCAN

-	    ErrorF("SetOverscan() called from CmapSetOverscan\n");

-#endif

-	    pScrn->SetOverscan(pScreenPriv->pScrn, overscan);

-	}

-    }

-}

-

-static void

-CMapUnwrapScreen(ScreenPtr pScreen)

-{

-    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(

-	&pScreen->devPrivates, CMapScreenKey);

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-

-    pScreen->CloseScreen = pScreenPriv->CloseScreen;

-    pScreen->CreateColormap = pScreenPriv->CreateColormap;

-    pScreen->DestroyColormap = pScreenPriv->DestroyColormap;

-    pScreen->InstallColormap = pScreenPriv->InstallColormap;

-    pScreen->StoreColors = pScreenPriv->StoreColors;

-

-    pScrn->EnterVT = pScreenPriv->EnterVT; 

-    pScrn->SwitchMode = pScreenPriv->SwitchMode; 

-    pScrn->SetDGAMode = pScreenPriv->SetDGAMode; 

-    pScrn->ChangeGamma = pScreenPriv->ChangeGamma;

-

-    free(pScreenPriv->gamma);

-    free(pScreenPriv->PreAllocIndices);

-    free(pScreenPriv);

-}

-

-

-static void 

-ComputeGamma(CMapScreenPtr priv)

-{

-    int elements = priv->gammaElements - 1;

-    double RedGamma, GreenGamma, BlueGamma;

-    int i;

-

-#ifndef DONT_CHECK_GAMMA

-    /* This check is to catch drivers that are not initialising pScrn->gamma */

-    if (priv->pScrn->gamma.red < GAMMA_MIN ||

-	priv->pScrn->gamma.red > GAMMA_MAX ||

-	priv->pScrn->gamma.green < GAMMA_MIN ||

-	priv->pScrn->gamma.green > GAMMA_MAX ||

-	priv->pScrn->gamma.blue < GAMMA_MIN ||

-	priv->pScrn->gamma.blue > GAMMA_MAX) {

-

-	xf86DrvMsgVerb(priv->pScrn->scrnIndex, X_WARNING, 0,

-	    "The %s driver didn't call xf86SetGamma() to initialise\n"

-	    "\tthe gamma values.\n", priv->pScrn->driverName);

-	xf86DrvMsgVerb(priv->pScrn->scrnIndex, X_WARNING, 0,

-	    "PLEASE FIX THE `%s' DRIVER!\n", priv->pScrn->driverName);

-	priv->pScrn->gamma.red = 1.0;

-	priv->pScrn->gamma.green = 1.0;

-	priv->pScrn->gamma.blue = 1.0;

-    }

-#endif

-

-    RedGamma = 1.0 / (double)priv->pScrn->gamma.red;

-    GreenGamma = 1.0 / (double)priv->pScrn->gamma.green;

-    BlueGamma = 1.0 / (double)priv->pScrn->gamma.blue;

-    

-    for(i = 0; i <= elements; i++) {

-	if(RedGamma == 1.0)  

-	    priv->gamma[i].red = i;

-	else

-	    priv->gamma[i].red = (CARD16)(pow((double)i/(double)elements,

-			RedGamma) * (double)elements + 0.5);

-

-	if(GreenGamma == 1.0)  

-	    priv->gamma[i].green = i;

-	else

-	    priv->gamma[i].green = (CARD16)(pow((double)i/(double)elements,

-			GreenGamma) * (double)elements + 0.5);

-

-	if(BlueGamma == 1.0)  

-	    priv->gamma[i].blue = i;

-	else

-	    priv->gamma[i].blue = (CARD16)(pow((double)i/(double)elements,

-			BlueGamma) * (double)elements + 0.5);

-    }

-}

-

-

-int

-CMapChangeGamma(

-   int index,

-   Gamma gamma

-){

-    int ret = Success;

-    ScrnInfoPtr pScrn = xf86Screens[index];

-    ScreenPtr pScreen = pScrn->pScreen;

-    CMapColormapPtr pColPriv;

-    CMapScreenPtr pScreenPriv;

-    CMapLinkPtr pLink;

-        

-    /* Is this sufficient checking ? */

-    if(!CMapScreenKeyRegistered)

-	return BadImplementation;

-

-    pScreenPriv = (CMapScreenPtr)dixLookupPrivate(&pScreen->devPrivates,

-						  CMapScreenKey);

-    if(!pScreenPriv)

-	return BadImplementation;

- 

-    if (gamma.red < GAMMA_MIN || gamma.red > GAMMA_MAX ||

-	gamma.green < GAMMA_MIN || gamma.green > GAMMA_MAX ||

-	gamma.blue < GAMMA_MIN || gamma.blue > GAMMA_MAX)

-	return BadValue;

-

-    pScrn->gamma.red = gamma.red;

-    pScrn->gamma.green = gamma.green;

-    pScrn->gamma.blue = gamma.blue;

-

-    ComputeGamma(pScreenPriv);

-

-    /* mark all colormaps on this screen */

-    pLink = pScreenPriv->maps;

-    while(pLink) {

-    	pColPriv = (CMapColormapPtr)dixLookupPrivate(&pLink->cmap->devPrivates,

-						     CMapColormapKey);

-	pColPriv->recalculate = TRUE;

-	pLink = pLink->next;

-    }

-

-    if(GetInstalledmiColormap(pScreen) &&

-       ((pScreenPriv->flags & CMAP_LOAD_EVEN_IF_OFFSCREEN) ||

-	pScrn->vtSema || pScreenPriv->isDGAmode)) {

-	ColormapPtr pMap = GetInstalledmiColormap(pScreen);

-

-	if (!(pScreenPriv->flags & CMAP_PALETTED_TRUECOLOR) &&

-	    (pMap->pVisual->class == TrueColor) &&

-	    CMapColormapUseMax(pMap->pVisual, pScreenPriv)) {

-

-	    /* if the current map doesn't have a palette look

-		for another map to change the gamma on. */

-

-	    pLink = pScreenPriv->maps;

-	    while(pLink) {

-		if(pLink->cmap->pVisual->class == PseudoColor)

-		    break;

-		pLink = pLink->next;

-	    }

-

-	    if(pLink) {

-		/* need to trick CMapRefreshColors() into thinking 

-		   this is the currently installed map */

-		SetInstalledmiColormap(pScreen, pLink->cmap);

-		CMapReinstallMap(pLink->cmap);

-		SetInstalledmiColormap(pScreen, pMap);

-	    }

-	} else

-	    CMapReinstallMap(pMap);

-    }

-

-    pScrn->ChangeGamma = pScreenPriv->ChangeGamma;

-    if (pScrn->ChangeGamma)

-	ret = pScrn->ChangeGamma(index, gamma);

-    pScrn->ChangeGamma = CMapChangeGamma;

-

-    return ret;

-}

-

-

-static void

-ComputeGammaRamp (

-    CMapScreenPtr priv,

-    unsigned short *red,

-    unsigned short *green,

-    unsigned short *blue

-){

-    int elements = priv->gammaElements;

-    LOCO *entry = priv->gamma;

-    int shift = 16 - priv->sigRGBbits;

-

-    while(elements--) {

-	entry->red = *(red++) >> shift;

-	entry->green = *(green++) >> shift;

-	entry->blue = *(blue++) >> shift;

-	entry++;

-    }

-}

-

-int

-xf86ChangeGammaRamp(

-   ScreenPtr pScreen,

-   int size,

-   unsigned short *red, 

-   unsigned short *green,

-   unsigned short *blue

-){

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    CMapColormapPtr pColPriv;

-    CMapScreenPtr pScreenPriv;

-    CMapLinkPtr pLink;

-

-    if (xf86_crtc_supports_gamma(pScrn)) {

-	RRCrtcPtr crtc = xf86CompatRRCrtc(pScrn);

-

-	if (crtc) {

-	    if (crtc->gammaSize != size)

-		return BadValue;

-

-	    RRCrtcGammaSet(crtc, red, green, blue);

-

-	    return Success;

-	}

-    }

-

-    if(!CMapScreenKeyRegistered)

-        return BadImplementation;

-

-    pScreenPriv = (CMapScreenPtr)dixLookupPrivate(&pScreen->devPrivates,

-						  CMapScreenKey);

-    if(!pScreenPriv)

-        return BadImplementation;

-

-    if(pScreenPriv->gammaElements != size)

-	return BadValue;

-

-    ComputeGammaRamp(pScreenPriv, red, green, blue);

-

-    /* mark all colormaps on this screen */

-    pLink = pScreenPriv->maps;

-    while(pLink) {

-    	pColPriv = (CMapColormapPtr)dixLookupPrivate(&pLink->cmap->devPrivates,

-						     CMapColormapKey);

-        pColPriv->recalculate = TRUE;

-        pLink = pLink->next;

-    }

-

-    if(GetInstalledmiColormap(pScreen) &&

-       ((pScreenPriv->flags & CMAP_LOAD_EVEN_IF_OFFSCREEN) ||

-        pScrn->vtSema || pScreenPriv->isDGAmode)) {

-        ColormapPtr pMap = GetInstalledmiColormap(pScreen);

-

-        if (!(pScreenPriv->flags & CMAP_PALETTED_TRUECOLOR) &&

-            (pMap->pVisual->class == TrueColor) &&

-	    CMapColormapUseMax(pMap->pVisual, pScreenPriv)) {

-

-            /* if the current map doesn't have a palette look

-                for another map to change the gamma on. */

-

-            pLink = pScreenPriv->maps;

-            while(pLink) {

-                if(pLink->cmap->pVisual->class == PseudoColor)

-                    break;

-                pLink = pLink->next;

-            }

-

-            if(pLink) {

-                /* need to trick CMapRefreshColors() into thinking

-                   this is the currently installed map */

-                SetInstalledmiColormap(pScreen, pLink->cmap);

-                CMapReinstallMap(pLink->cmap);

-                SetInstalledmiColormap(pScreen, pMap);

-            }

-        } else

-            CMapReinstallMap(pMap);

-    }

-

-    return Success;

-}

-

-int

-xf86GetGammaRampSize(ScreenPtr pScreen)

-{

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    CMapScreenPtr pScreenPriv;

-

-    if (xf86_crtc_supports_gamma(pScrn)) {

-	RRCrtcPtr crtc = xf86CompatRRCrtc(pScrn);

-

-	if (crtc)

-	    return crtc->gammaSize;

-    }

-

-    if(!CMapScreenKeyRegistered) return 0;

-

-    pScreenPriv = (CMapScreenPtr)dixLookupPrivate(&pScreen->devPrivates,

-						  CMapScreenKey);

-    if(!pScreenPriv) return 0;

-

-    return pScreenPriv->gammaElements;

-}

-

-int

-xf86GetGammaRamp(

-   ScreenPtr pScreen,

-   int size,

-   unsigned short *red,

-   unsigned short *green,

-   unsigned short *blue

-){

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    CMapScreenPtr pScreenPriv;

-    LOCO *entry;

-    int shift, sigbits;

-

-    if (xf86_crtc_supports_gamma(pScrn)) {

-	RRCrtcPtr crtc = xf86CompatRRCrtc(pScrn);

-

-	if (crtc) {

-	    if (crtc->gammaSize < size)

-		return BadValue;

-

-	    if (!RRCrtcGammaGet(crtc))

-		return BadImplementation;

-

-	    memcpy(red, crtc->gammaRed, size * sizeof(*red));

-	    memcpy(green, crtc->gammaGreen, size * sizeof(*green));

-	    memcpy(blue, crtc->gammaBlue, size * sizeof(*blue));

-

-	    return Success;

-	}

-    }

-

-    if(!CMapScreenKeyRegistered)

-	return BadImplementation;

-

-    pScreenPriv = (CMapScreenPtr)dixLookupPrivate(&pScreen->devPrivates,

-						  CMapScreenKey);

-    if(!pScreenPriv) 

-	return BadImplementation;

-

-    if(size > pScreenPriv->gammaElements)

-	return BadValue;

-

-    entry = pScreenPriv->gamma;

-    sigbits = pScreenPriv->sigRGBbits;

-

-    while(size--) {

-	*red = entry->red << (16 - sigbits);

-	*green = entry->green << (16 - sigbits);

-	*blue = entry->blue << (16 - sigbits);

-	shift = sigbits;

-	while(shift < 16) {

-	    *red |= *red >> shift;

-	    *green |= *green >> shift;

-	    *blue |= *blue >> shift;

-	    shift += sigbits;

-	}

-	red++; green++; blue++;

-        entry++;

-    }

-

-    return Success;

-}

-

-int

-xf86ChangeGamma(

-   ScreenPtr pScreen,

-   Gamma gamma

-){

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-

-    if(pScrn->ChangeGamma)

-	return (*pScrn->ChangeGamma)(pScreen->myNum, gamma);

-

-    return BadImplementation;

-}

+/*
+ * Copyright (c) 1998-2001 by The XFree86 Project, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#if defined(_XOPEN_SOURCE) || defined(sun) && defined(__SVR4)
+#include <math.h>
+#else
+#define _XOPEN_SOURCE           /* to get prototype for pow on some systems */
+#include <math.h>
+#undef _XOPEN_SOURCE
+#endif
+
+#include <X11/X.h>
+#include "misc.h"
+#include <X11/Xproto.h>
+#include "colormapst.h"
+#include "scrnintstr.h"
+
+#include "resource.h"
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86str.h"
+#include "micmap.h"
+#include "xf86Crtc.h"
+
+#ifdef XFreeXDGA
+#include <X11/extensions/xf86dgaproto.h>
+#include "dgaproc.h"
+#endif
+
+#include "xf86cmap.h"
+
+#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = \
+    ((CMapScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, CMapScreenKey))->field)
+#define SCREEN_EPILOGUE(pScreen, field, wrapper)\
+    ((pScreen)->field = wrapper)
+
+#define LOAD_PALETTE(pmap) \
+    ((pmap == GetInstalledmiColormap(pmap->pScreen)) && \
+     ((pScreenPriv->flags & CMAP_LOAD_EVEN_IF_OFFSCREEN) || \
+      xf86Screens[pmap->pScreen->myNum]->vtSema || pScreenPriv->isDGAmode))
+
+typedef struct _CMapLink {
+    ColormapPtr cmap;
+    struct _CMapLink *next;
+} CMapLink, *CMapLinkPtr;
+
+typedef struct {
+    ScrnInfoPtr pScrn;
+    CloseScreenProcPtr CloseScreen;
+    CreateColormapProcPtr CreateColormap;
+    DestroyColormapProcPtr DestroyColormap;
+    InstallColormapProcPtr InstallColormap;
+    StoreColorsProcPtr StoreColors;
+    Bool (*EnterVT) (int, int);
+    Bool (*SwitchMode) (int, DisplayModePtr, int);
+    int (*SetDGAMode) (int, int, DGADevicePtr);
+    xf86ChangeGammaProc *ChangeGamma;
+    int maxColors;
+    int sigRGBbits;
+    int gammaElements;
+    LOCO *gamma;
+    int *PreAllocIndices;
+    CMapLinkPtr maps;
+    unsigned int flags;
+    Bool isDGAmode;
+} CMapScreenRec, *CMapScreenPtr;
+
+typedef struct {
+    int numColors;
+    LOCO *colors;
+    Bool recalculate;
+    int overscan;
+} CMapColormapRec, *CMapColormapPtr;
+
+static DevPrivateKeyRec CMapScreenKeyRec;
+
+#define CMapScreenKeyRegistered dixPrivateKeyRegistered(&CMapScreenKeyRec)
+#define CMapScreenKey (&CMapScreenKeyRec)
+static DevPrivateKeyRec CMapColormapKeyRec;
+
+#define CMapColormapKey (&CMapColormapKeyRec)
+
+static void CMapInstallColormap(ColormapPtr);
+static void CMapStoreColors(ColormapPtr, int, xColorItem *);
+static Bool CMapCloseScreen(int, ScreenPtr);
+static Bool CMapCreateColormap(ColormapPtr);
+static void CMapDestroyColormap(ColormapPtr);
+
+static Bool CMapEnterVT(int, int);
+static Bool CMapSwitchMode(int, DisplayModePtr, int);
+
+#ifdef XFreeXDGA
+static int CMapSetDGAMode(int, int, DGADevicePtr);
+#endif
+static int CMapChangeGamma(int, Gamma);
+
+static void ComputeGamma(CMapScreenPtr);
+static Bool CMapAllocateColormapPrivate(ColormapPtr);
+static void CMapRefreshColors(ColormapPtr, int, int *);
+static void CMapSetOverscan(ColormapPtr, int, int *);
+static void CMapReinstallMap(ColormapPtr);
+static void CMapUnwrapScreen(ScreenPtr pScreen);
+
+Bool
+xf86ColormapAllocatePrivates(ScrnInfoPtr pScrn)
+{
+    /* If we support a better colormap system, then pretend we succeeded. */
+    if (xf86_crtc_supports_gamma(pScrn))
+        return TRUE;
+    if (!dixRegisterPrivateKey(&CMapScreenKeyRec, PRIVATE_SCREEN, 0))
+        return FALSE;
+
+    if (!dixRegisterPrivateKey(&CMapColormapKeyRec, PRIVATE_COLORMAP, 0))
+        return FALSE;
+    return TRUE;
+}
+
+Bool
+xf86HandleColormaps(ScreenPtr pScreen,
+                    int maxColors,
+                    int sigRGBbits,
+                    xf86LoadPaletteProc * loadPalette,
+                    xf86SetOverscanProc * setOverscan, unsigned int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    ColormapPtr pDefMap = NULL;
+    CMapScreenPtr pScreenPriv;
+    LOCO *gamma;
+    int *indices;
+    int elements;
+
+    /* If we support a better colormap system, then pretend we succeeded. */
+    if (xf86_crtc_supports_gamma(pScrn))
+        return TRUE;
+
+    if (!maxColors || !sigRGBbits || !loadPalette)
+        return FALSE;
+
+    elements = 1 << sigRGBbits;
+
+    if (!(gamma = malloc(elements * sizeof(LOCO))))
+        return FALSE;
+
+    if (!(indices = malloc(maxColors * sizeof(int)))) {
+        free(gamma);
+        return FALSE;
+    }
+
+    if (!(pScreenPriv = malloc(sizeof(CMapScreenRec)))) {
+        free(gamma);
+        free(indices);
+        return FALSE;
+    }
+
+    dixSetPrivate(&pScreen->devPrivates, &CMapScreenKeyRec, pScreenPriv);
+
+    pScreenPriv->CloseScreen = pScreen->CloseScreen;
+    pScreenPriv->CreateColormap = pScreen->CreateColormap;
+    pScreenPriv->DestroyColormap = pScreen->DestroyColormap;
+    pScreenPriv->InstallColormap = pScreen->InstallColormap;
+    pScreenPriv->StoreColors = pScreen->StoreColors;
+    pScreen->CloseScreen = CMapCloseScreen;
+    pScreen->CreateColormap = CMapCreateColormap;
+    pScreen->DestroyColormap = CMapDestroyColormap;
+    pScreen->InstallColormap = CMapInstallColormap;
+    pScreen->StoreColors = CMapStoreColors;
+
+    pScreenPriv->pScrn = pScrn;
+    pScrn->LoadPalette = loadPalette;
+    pScrn->SetOverscan = setOverscan;
+    pScreenPriv->maxColors = maxColors;
+    pScreenPriv->sigRGBbits = sigRGBbits;
+    pScreenPriv->gammaElements = elements;
+    pScreenPriv->gamma = gamma;
+    pScreenPriv->PreAllocIndices = indices;
+    pScreenPriv->maps = NULL;
+    pScreenPriv->flags = flags;
+    pScreenPriv->isDGAmode = FALSE;
+
+    pScreenPriv->EnterVT = pScrn->EnterVT;
+    pScreenPriv->SwitchMode = pScrn->SwitchMode;
+    pScreenPriv->SetDGAMode = pScrn->SetDGAMode;
+    pScreenPriv->ChangeGamma = pScrn->ChangeGamma;
+
+    if (!(flags & CMAP_LOAD_EVEN_IF_OFFSCREEN)) {
+        pScrn->EnterVT = CMapEnterVT;
+        if ((flags & CMAP_RELOAD_ON_MODE_SWITCH) && pScrn->SwitchMode)
+            pScrn->SwitchMode = CMapSwitchMode;
+    }
+#ifdef XFreeXDGA
+    pScrn->SetDGAMode = CMapSetDGAMode;
+#endif
+    pScrn->ChangeGamma = CMapChangeGamma;
+
+    ComputeGamma(pScreenPriv);
+
+    /* get the default map */
+    dixLookupResourceByType((pointer *) &pDefMap, pScreen->defColormap,
+                            RT_COLORMAP, serverClient, DixInstallAccess);
+
+    if (!CMapAllocateColormapPrivate(pDefMap)) {
+        CMapUnwrapScreen(pScreen);
+        return FALSE;
+    }
+
+    /* Force the initial map to be loaded */
+    SetInstalledmiColormap(pScreen, NULL);
+    CMapInstallColormap(pDefMap);
+    return TRUE;
+}
+
+/**** Screen functions ****/
+
+static Bool
+CMapCloseScreen(int i, ScreenPtr pScreen)
+{
+    CMapUnwrapScreen(pScreen);
+
+    return (*pScreen->CloseScreen) (i, pScreen);
+}
+
+static Bool
+CMapColormapUseMax(VisualPtr pVisual, CMapScreenPtr pScreenPriv)
+{
+    if (pVisual->nplanes > 16)
+        return TRUE;
+    return ((1 << pVisual->nplanes) > pScreenPriv->maxColors);
+}
+
+static Bool
+CMapAllocateColormapPrivate(ColormapPtr pmap)
+{
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pmap->pScreen->devPrivates,
+                                         CMapScreenKey);
+    CMapColormapPtr pColPriv;
+    CMapLinkPtr pLink;
+    int numColors;
+    LOCO *colors;
+
+    if (CMapColormapUseMax(pmap->pVisual, pScreenPriv))
+        numColors = pmap->pVisual->ColormapEntries;
+    else
+        numColors = 1 << pmap->pVisual->nplanes;
+
+    if (!(colors = malloc(numColors * sizeof(LOCO))))
+        return FALSE;
+
+    if (!(pColPriv = malloc(sizeof(CMapColormapRec)))) {
+        free(colors);
+        return FALSE;
+    }
+
+    dixSetPrivate(&pmap->devPrivates, CMapColormapKey, pColPriv);
+
+    pColPriv->numColors = numColors;
+    pColPriv->colors = colors;
+    pColPriv->recalculate = TRUE;
+    pColPriv->overscan = -1;
+
+    /* add map to list */
+    pLink = malloc(sizeof(CMapLink));
+    if (pLink) {
+        pLink->cmap = pmap;
+        pLink->next = pScreenPriv->maps;
+        pScreenPriv->maps = pLink;
+    }
+
+    return TRUE;
+}
+
+static Bool
+CMapCreateColormap(ColormapPtr pmap)
+{
+    ScreenPtr pScreen = pmap->pScreen;
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
+    Bool ret = FALSE;
+
+    pScreen->CreateColormap = pScreenPriv->CreateColormap;
+    if ((*pScreen->CreateColormap) (pmap)) {
+        if (CMapAllocateColormapPrivate(pmap))
+            ret = TRUE;
+    }
+    pScreen->CreateColormap = CMapCreateColormap;
+
+    return ret;
+}
+
+static void
+CMapDestroyColormap(ColormapPtr cmap)
+{
+    ScreenPtr pScreen = cmap->pScreen;
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
+    CMapColormapPtr pColPriv =
+        (CMapColormapPtr) dixLookupPrivate(&cmap->devPrivates, CMapColormapKey);
+    CMapLinkPtr prevLink = NULL, pLink = pScreenPriv->maps;
+
+    if (pColPriv) {
+        free(pColPriv->colors);
+        free(pColPriv);
+    }
+
+    /* remove map from list */
+    while (pLink) {
+        if (pLink->cmap == cmap) {
+            if (prevLink)
+                prevLink->next = pLink->next;
+            else
+                pScreenPriv->maps = pLink->next;
+            free(pLink);
+            break;
+        }
+        prevLink = pLink;
+        pLink = pLink->next;
+    }
+
+    if (pScreenPriv->DestroyColormap) {
+        pScreen->DestroyColormap = pScreenPriv->DestroyColormap;
+        (*pScreen->DestroyColormap) (cmap);
+        pScreen->DestroyColormap = CMapDestroyColormap;
+    }
+}
+
+static void
+CMapStoreColors(ColormapPtr pmap, int ndef, xColorItem * pdefs)
+{
+    ScreenPtr pScreen = pmap->pScreen;
+    VisualPtr pVisual = pmap->pVisual;
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
+    int *indices = pScreenPriv->PreAllocIndices;
+    int num = ndef;
+
+    /* At the moment this isn't necessary since there's nobody below us */
+    pScreen->StoreColors = pScreenPriv->StoreColors;
+    (*pScreen->StoreColors) (pmap, ndef, pdefs);
+    pScreen->StoreColors = CMapStoreColors;
+
+    /* should never get here for these */
+    if ((pVisual->class == TrueColor) ||
+        (pVisual->class == StaticColor) || (pVisual->class == StaticGray))
+        return;
+
+    if (pVisual->class == DirectColor) {
+        CMapColormapPtr pColPriv =
+            (CMapColormapPtr) dixLookupPrivate(&pmap->devPrivates,
+                                               CMapColormapKey);
+        int i;
+
+        if (CMapColormapUseMax(pVisual, pScreenPriv)) {
+            int index;
+
+            num = 0;
+            while (ndef--) {
+                if (pdefs[ndef].flags & DoRed) {
+                    index = (pdefs[ndef].pixel & pVisual->redMask) >>
+                        pVisual->offsetRed;
+                    i = num;
+                    while (i--)
+                        if (indices[i] == index)
+                            break;
+                    if (i == -1)
+                        indices[num++] = index;
+                }
+                if (pdefs[ndef].flags & DoGreen) {
+                    index = (pdefs[ndef].pixel & pVisual->greenMask) >>
+                        pVisual->offsetGreen;
+                    i = num;
+                    while (i--)
+                        if (indices[i] == index)
+                            break;
+                    if (i == -1)
+                        indices[num++] = index;
+                }
+                if (pdefs[ndef].flags & DoBlue) {
+                    index = (pdefs[ndef].pixel & pVisual->blueMask) >>
+                        pVisual->offsetBlue;
+                    i = num;
+                    while (i--)
+                        if (indices[i] == index)
+                            break;
+                    if (i == -1)
+                        indices[num++] = index;
+                }
+            }
+
+        }
+        else {
+            /* not really as overkill as it seems */
+            num = pColPriv->numColors;
+            for (i = 0; i < pColPriv->numColors; i++)
+                indices[i] = i;
+        }
+    }
+    else {
+        while (ndef--)
+            indices[ndef] = pdefs[ndef].pixel;
+    }
+
+    CMapRefreshColors(pmap, num, indices);
+}
+
+static void
+CMapInstallColormap(ColormapPtr pmap)
+{
+    ScreenPtr pScreen = pmap->pScreen;
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
+
+    if (pmap == GetInstalledmiColormap(pmap->pScreen))
+        return;
+
+    pScreen->InstallColormap = pScreenPriv->InstallColormap;
+    (*pScreen->InstallColormap) (pmap);
+    pScreen->InstallColormap = CMapInstallColormap;
+
+    /* Important. We let the lower layers, namely DGA, 
+       overwrite the choice of Colormap to install */
+    if (GetInstalledmiColormap(pmap->pScreen))
+        pmap = GetInstalledmiColormap(pmap->pScreen);
+
+    if (!(pScreenPriv->flags & CMAP_PALETTED_TRUECOLOR) &&
+        (pmap->pVisual->class == TrueColor) &&
+        CMapColormapUseMax(pmap->pVisual, pScreenPriv))
+        return;
+
+    if (LOAD_PALETTE(pmap))
+        CMapReinstallMap(pmap);
+}
+
+/**** ScrnInfoRec functions ****/
+
+static Bool
+CMapEnterVT(int index, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[index];
+    ScreenPtr pScreen = screenInfo.screens[index];
+    Bool ret;
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
+
+    pScrn->EnterVT = pScreenPriv->EnterVT;
+    ret = (*pScreenPriv->EnterVT) (index, flags);
+    pScreenPriv->EnterVT = pScrn->EnterVT;
+    pScrn->EnterVT = CMapEnterVT;
+    if (ret) {
+        if (GetInstalledmiColormap(pScreen))
+            CMapReinstallMap(GetInstalledmiColormap(pScreen));
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static Bool
+CMapSwitchMode(int index, DisplayModePtr mode, int flags)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
+
+    if ((*pScreenPriv->SwitchMode) (index, mode, flags)) {
+        if (GetInstalledmiColormap(pScreen))
+            CMapReinstallMap(GetInstalledmiColormap(pScreen));
+        return TRUE;
+    }
+    return FALSE;
+}
+
+#ifdef XFreeXDGA
+static int
+CMapSetDGAMode(int index, int num, DGADevicePtr dev)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
+    int ret;
+
+    ret = (*pScreenPriv->SetDGAMode) (index, num, dev);
+
+    pScreenPriv->isDGAmode = DGAActive(index);
+
+    if (!pScreenPriv->isDGAmode && GetInstalledmiColormap(pScreen)
+        && xf86Screens[pScreen->myNum]->vtSema)
+        CMapReinstallMap(GetInstalledmiColormap(pScreen));
+
+    return ret;
+}
+#endif
+
+/**** Utilities ****/
+
+static void
+CMapReinstallMap(ColormapPtr pmap)
+{
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pmap->pScreen->devPrivates,
+                                         CMapScreenKey);
+    CMapColormapPtr cmapPriv =
+        (CMapColormapPtr) dixLookupPrivate(&pmap->devPrivates, CMapColormapKey);
+    ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum];
+    int i = cmapPriv->numColors;
+    int *indices = pScreenPriv->PreAllocIndices;
+
+    while (i--)
+        indices[i] = i;
+
+    if (cmapPriv->recalculate)
+        CMapRefreshColors(pmap, cmapPriv->numColors, indices);
+    else {
+        (*pScrn->LoadPalette) (pScrn, cmapPriv->numColors,
+                               indices, cmapPriv->colors, pmap->pVisual);
+        if (pScrn->SetOverscan) {
+#ifdef DEBUGOVERSCAN
+            ErrorF("SetOverscan() called from CMapReinstallMap\n");
+#endif
+            pScrn->SetOverscan(pScrn, cmapPriv->overscan);
+        }
+    }
+
+    cmapPriv->recalculate = FALSE;
+}
+
+static void
+CMapRefreshColors(ColormapPtr pmap, int defs, int *indices)
+{
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pmap->pScreen->devPrivates,
+                                         CMapScreenKey);
+    CMapColormapPtr pColPriv =
+        (CMapColormapPtr) dixLookupPrivate(&pmap->devPrivates, CMapColormapKey);
+    VisualPtr pVisual = pmap->pVisual;
+    ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum];
+    int numColors, i;
+    LOCO *gamma, *colors;
+    EntryPtr entry;
+    int reds, greens, blues, maxValue, index, shift;
+
+    numColors = pColPriv->numColors;
+    shift = 16 - pScreenPriv->sigRGBbits;
+    maxValue = (1 << pScreenPriv->sigRGBbits) - 1;
+    gamma = pScreenPriv->gamma;
+    colors = pColPriv->colors;
+
+    reds = pVisual->redMask >> pVisual->offsetRed;
+    greens = pVisual->greenMask >> pVisual->offsetGreen;
+    blues = pVisual->blueMask >> pVisual->offsetBlue;
+
+    switch (pVisual->class) {
+    case StaticGray:
+        for (i = 0; i < numColors; i++) {
+            index = (i + 1) * maxValue / numColors;
+            colors[i].red = gamma[index].red;
+            colors[i].green = gamma[index].green;
+            colors[i].blue = gamma[index].blue;
+        }
+        break;
+    case TrueColor:
+        if (CMapColormapUseMax(pVisual, pScreenPriv)) {
+            for (i = 0; i <= reds; i++)
+                colors[i].red = gamma[i * maxValue / reds].red;
+            for (i = 0; i <= greens; i++)
+                colors[i].green = gamma[i * maxValue / greens].green;
+            for (i = 0; i <= blues; i++)
+                colors[i].blue = gamma[i * maxValue / blues].blue;
+            break;
+        }
+        for (i = 0; i < numColors; i++) {
+            colors[i].red = gamma[((i >> pVisual->offsetRed) & reds) *
+                                  maxValue / reds].red;
+            colors[i].green = gamma[((i >> pVisual->offsetGreen) & greens) *
+                                    maxValue / greens].green;
+            colors[i].blue = gamma[((i >> pVisual->offsetBlue) & blues) *
+                                   maxValue / blues].blue;
+        }
+        break;
+    case StaticColor:
+    case PseudoColor:
+    case GrayScale:
+        for (i = 0; i < defs; i++) {
+            index = indices[i];
+            entry = (EntryPtr) & pmap->red[index];
+
+            if (entry->fShared) {
+                colors[index].red =
+                    gamma[entry->co.shco.red->color >> shift].red;
+                colors[index].green =
+                    gamma[entry->co.shco.green->color >> shift].green;
+                colors[index].blue =
+                    gamma[entry->co.shco.blue->color >> shift].blue;
+            }
+            else {
+                colors[index].red = gamma[entry->co.local.red >> shift].red;
+                colors[index].green =
+                    gamma[entry->co.local.green >> shift].green;
+                colors[index].blue = gamma[entry->co.local.blue >> shift].blue;
+            }
+        }
+        break;
+    case DirectColor:
+        if (CMapColormapUseMax(pVisual, pScreenPriv)) {
+            for (i = 0; i < defs; i++) {
+                index = indices[i];
+                if (index <= reds)
+                    colors[index].red =
+                        gamma[pmap->red[index].co.local.red >> shift].red;
+                if (index <= greens)
+                    colors[index].green =
+                        gamma[pmap->green[index].co.local.green >> shift].green;
+                if (index <= blues)
+                    colors[index].blue =
+                        gamma[pmap->blue[index].co.local.blue >> shift].blue;
+
+            }
+            break;
+        }
+        for (i = 0; i < defs; i++) {
+            index = indices[i];
+
+            colors[index].red = gamma[pmap->red[(index >> pVisual->
+                                                 offsetRed) & reds].co.local.
+                                      red >> shift].red;
+            colors[index].green =
+                gamma[pmap->green[(index >> pVisual->offsetGreen) & greens].co.
+                      local.green >> shift].green;
+            colors[index].blue =
+                gamma[pmap->blue[(index >> pVisual->offsetBlue) & blues].co.
+                      local.blue >> shift].blue;
+        }
+        break;
+    }
+
+    if (LOAD_PALETTE(pmap))
+        (*pScrn->LoadPalette) (pScreenPriv->pScrn, defs, indices,
+                               colors, pmap->pVisual);
+
+    if (pScrn->SetOverscan)
+        CMapSetOverscan(pmap, defs, indices);
+
+}
+
+static Bool
+CMapCompareColors(LOCO * color1, LOCO * color2)
+{
+    /* return TRUE if the color1 is "closer" to black than color2 */
+#ifdef DEBUGOVERSCAN
+    ErrorF("#%02x%02x%02x vs #%02x%02x%02x (%d vs %d)\n",
+           color1->red, color1->green, color1->blue,
+           color2->red, color2->green, color2->blue,
+           color1->red + color1->green + color1->blue,
+           color2->red + color2->green + color2->blue);
+#endif
+    return (color1->red + color1->green + color1->blue <
+            color2->red + color2->green + color2->blue);
+}
+
+static void
+CMapSetOverscan(ColormapPtr pmap, int defs, int *indices)
+{
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pmap->pScreen->devPrivates,
+                                         CMapScreenKey);
+    CMapColormapPtr pColPriv =
+        (CMapColormapPtr) dixLookupPrivate(&pmap->devPrivates, CMapColormapKey);
+    ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum];
+    VisualPtr pVisual = pmap->pVisual;
+    int i;
+    LOCO *colors;
+    int index;
+    Bool newOverscan = FALSE;
+    int overscan, tmpOverscan;
+
+    colors = pColPriv->colors;
+    overscan = pColPriv->overscan;
+
+    /*
+     * Search for a new overscan index in the following cases:
+     *
+     *   - The index hasn't yet been initialised.  In this case search
+     *     for an index that is black or a close match to black.
+     *
+     *   - The colour of the old index is changed.  In this case search
+     *     all indices for a black or close match to black.
+     *
+     *   - The colour of the old index wasn't black.  In this case only
+     *     search the indices that were changed for a better match to black.
+     */
+
+    switch (pVisual->class) {
+    case StaticGray:
+    case TrueColor:
+        /* Should only come here once.  Initialise the overscan index to 0 */
+        overscan = 0;
+        newOverscan = TRUE;
+        break;
+    case StaticColor:
+        /*
+         * Only come here once, but search for the overscan in the same way
+         * as for the other cases.
+         */
+    case DirectColor:
+    case PseudoColor:
+    case GrayScale:
+        if (overscan < 0 || overscan > pScreenPriv->maxColors - 1) {
+            /* Uninitialised */
+            newOverscan = TRUE;
+        }
+        else {
+            /* Check if the overscan was changed */
+            for (i = 0; i < defs; i++) {
+                index = indices[i];
+                if (index == overscan) {
+                    newOverscan = TRUE;
+                    break;
+                }
+            }
+        }
+        if (newOverscan) {
+            /* The overscan is either uninitialised or it has been changed */
+
+            if (overscan < 0 || overscan > pScreenPriv->maxColors - 1)
+                tmpOverscan = pScreenPriv->maxColors - 1;
+            else
+                tmpOverscan = overscan;
+
+            /* search all entries for a close match to black */
+            for (i = pScreenPriv->maxColors - 1; i >= 0; i--) {
+                if (colors[i].red == 0 && colors[i].green == 0 &&
+                    colors[i].blue == 0) {
+                    overscan = i;
+#ifdef DEBUGOVERSCAN
+                    ErrorF("Black found at index 0x%02x\n", i);
+#endif
+                    break;
+                }
+                else {
+#ifdef DEBUGOVERSCAN
+                    ErrorF("0x%02x: ", i);
+#endif
+                    if (CMapCompareColors(&colors[i], &colors[tmpOverscan])) {
+                        tmpOverscan = i;
+#ifdef DEBUGOVERSCAN
+                        ErrorF("possible \"Black\" at index 0x%02x\n", i);
+#endif
+                    }
+                }
+            }
+            if (i < 0)
+                overscan = tmpOverscan;
+        }
+        else {
+            /* Check of the old overscan wasn't black */
+            if (colors[overscan].red != 0 || colors[overscan].green != 0 ||
+                colors[overscan].blue != 0) {
+                int oldOverscan = tmpOverscan = overscan;
+
+                /* See of there is now a better match */
+                for (i = 0; i < defs; i++) {
+                    index = indices[i];
+                    if (colors[index].red == 0 && colors[index].green == 0 &&
+                        colors[index].blue == 0) {
+                        overscan = index;
+#ifdef DEBUGOVERSCAN
+                        ErrorF("Black found at index 0x%02x\n", index);
+#endif
+                        break;
+                    }
+                    else {
+#ifdef DEBUGOVERSCAN
+                        ErrorF("0x%02x: ", index);
+#endif
+                        if (CMapCompareColors(&colors[index],
+                                              &colors[tmpOverscan])) {
+                            tmpOverscan = index;
+#ifdef DEBUGOVERSCAN
+                            ErrorF("possible \"Black\" at index 0x%02x\n",
+                                   index);
+#endif
+                        }
+                    }
+                }
+                if (i == defs)
+                    overscan = tmpOverscan;
+                if (overscan != oldOverscan)
+                    newOverscan = TRUE;
+            }
+        }
+        break;
+    }
+    if (newOverscan) {
+        pColPriv->overscan = overscan;
+        if (LOAD_PALETTE(pmap)) {
+#ifdef DEBUGOVERSCAN
+            ErrorF("SetOverscan() called from CmapSetOverscan\n");
+#endif
+            pScrn->SetOverscan(pScreenPriv->pScrn, overscan);
+        }
+    }
+}
+
+static void
+CMapUnwrapScreen(ScreenPtr pScreen)
+{
+    CMapScreenPtr pScreenPriv =
+        (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+
+    pScreen->CloseScreen = pScreenPriv->CloseScreen;
+    pScreen->CreateColormap = pScreenPriv->CreateColormap;
+    pScreen->DestroyColormap = pScreenPriv->DestroyColormap;
+    pScreen->InstallColormap = pScreenPriv->InstallColormap;
+    pScreen->StoreColors = pScreenPriv->StoreColors;
+
+    pScrn->EnterVT = pScreenPriv->EnterVT;
+    pScrn->SwitchMode = pScreenPriv->SwitchMode;
+    pScrn->SetDGAMode = pScreenPriv->SetDGAMode;
+    pScrn->ChangeGamma = pScreenPriv->ChangeGamma;
+
+    free(pScreenPriv->gamma);
+    free(pScreenPriv->PreAllocIndices);
+    free(pScreenPriv);
+}
+
+static void
+ComputeGamma(CMapScreenPtr priv)
+{
+    int elements = priv->gammaElements - 1;
+    double RedGamma, GreenGamma, BlueGamma;
+    int i;
+
+#ifndef DONT_CHECK_GAMMA
+    /* This check is to catch drivers that are not initialising pScrn->gamma */
+    if (priv->pScrn->gamma.red < GAMMA_MIN ||
+        priv->pScrn->gamma.red > GAMMA_MAX ||
+        priv->pScrn->gamma.green < GAMMA_MIN ||
+        priv->pScrn->gamma.green > GAMMA_MAX ||
+        priv->pScrn->gamma.blue < GAMMA_MIN ||
+        priv->pScrn->gamma.blue > GAMMA_MAX) {
+
+        xf86DrvMsgVerb(priv->pScrn->scrnIndex, X_WARNING, 0,
+                       "The %s driver didn't call xf86SetGamma() to initialise\n"
+                       "\tthe gamma values.\n", priv->pScrn->driverName);
+        xf86DrvMsgVerb(priv->pScrn->scrnIndex, X_WARNING, 0,
+                       "PLEASE FIX THE `%s' DRIVER!\n",
+                       priv->pScrn->driverName);
+        priv->pScrn->gamma.red = 1.0;
+        priv->pScrn->gamma.green = 1.0;
+        priv->pScrn->gamma.blue = 1.0;
+    }
+#endif
+
+    RedGamma = 1.0 / (double) priv->pScrn->gamma.red;
+    GreenGamma = 1.0 / (double) priv->pScrn->gamma.green;
+    BlueGamma = 1.0 / (double) priv->pScrn->gamma.blue;
+
+    for (i = 0; i <= elements; i++) {
+        if (RedGamma == 1.0)
+            priv->gamma[i].red = i;
+        else
+            priv->gamma[i].red = (CARD16) (pow((double) i / (double) elements,
+                                               RedGamma) * (double) elements +
+                                           0.5);
+
+        if (GreenGamma == 1.0)
+            priv->gamma[i].green = i;
+        else
+            priv->gamma[i].green = (CARD16) (pow((double) i / (double) elements,
+                                                 GreenGamma) *
+                                             (double) elements + 0.5);
+
+        if (BlueGamma == 1.0)
+            priv->gamma[i].blue = i;
+        else
+            priv->gamma[i].blue = (CARD16) (pow((double) i / (double) elements,
+                                                BlueGamma) * (double) elements +
+                                            0.5);
+    }
+}
+
+int
+CMapChangeGamma(int index, Gamma gamma)
+{
+    int ret = Success;
+    ScrnInfoPtr pScrn = xf86Screens[index];
+    ScreenPtr pScreen = pScrn->pScreen;
+    CMapColormapPtr pColPriv;
+    CMapScreenPtr pScreenPriv;
+    CMapLinkPtr pLink;
+
+    /* Is this sufficient checking ? */
+    if (!CMapScreenKeyRegistered)
+        return BadImplementation;
+
+    pScreenPriv = (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                   CMapScreenKey);
+    if (!pScreenPriv)
+        return BadImplementation;
+
+    if (gamma.red < GAMMA_MIN || gamma.red > GAMMA_MAX ||
+        gamma.green < GAMMA_MIN || gamma.green > GAMMA_MAX ||
+        gamma.blue < GAMMA_MIN || gamma.blue > GAMMA_MAX)
+        return BadValue;
+
+    pScrn->gamma.red = gamma.red;
+    pScrn->gamma.green = gamma.green;
+    pScrn->gamma.blue = gamma.blue;
+
+    ComputeGamma(pScreenPriv);
+
+    /* mark all colormaps on this screen */
+    pLink = pScreenPriv->maps;
+    while (pLink) {
+        pColPriv = (CMapColormapPtr) dixLookupPrivate(&pLink->cmap->devPrivates,
+                                                      CMapColormapKey);
+        pColPriv->recalculate = TRUE;
+        pLink = pLink->next;
+    }
+
+    if (GetInstalledmiColormap(pScreen) &&
+        ((pScreenPriv->flags & CMAP_LOAD_EVEN_IF_OFFSCREEN) ||
+         pScrn->vtSema || pScreenPriv->isDGAmode)) {
+        ColormapPtr pMap = GetInstalledmiColormap(pScreen);
+
+        if (!(pScreenPriv->flags & CMAP_PALETTED_TRUECOLOR) &&
+            (pMap->pVisual->class == TrueColor) &&
+            CMapColormapUseMax(pMap->pVisual, pScreenPriv)) {
+
+            /* if the current map doesn't have a palette look
+               for another map to change the gamma on. */
+
+            pLink = pScreenPriv->maps;
+            while (pLink) {
+                if (pLink->cmap->pVisual->class == PseudoColor)
+                    break;
+                pLink = pLink->next;
+            }
+
+            if (pLink) {
+                /* need to trick CMapRefreshColors() into thinking 
+                   this is the currently installed map */
+                SetInstalledmiColormap(pScreen, pLink->cmap);
+                CMapReinstallMap(pLink->cmap);
+                SetInstalledmiColormap(pScreen, pMap);
+            }
+        }
+        else
+            CMapReinstallMap(pMap);
+    }
+
+    pScrn->ChangeGamma = pScreenPriv->ChangeGamma;
+    if (pScrn->ChangeGamma)
+        ret = pScrn->ChangeGamma(index, gamma);
+    pScrn->ChangeGamma = CMapChangeGamma;
+
+    return ret;
+}
+
+static void
+ComputeGammaRamp(CMapScreenPtr priv,
+                 unsigned short *red,
+                 unsigned short *green, unsigned short *blue)
+{
+    int elements = priv->gammaElements;
+    LOCO *entry = priv->gamma;
+    int shift = 16 - priv->sigRGBbits;
+
+    while (elements--) {
+        entry->red = *(red++) >> shift;
+        entry->green = *(green++) >> shift;
+        entry->blue = *(blue++) >> shift;
+        entry++;
+    }
+}
+
+int
+xf86ChangeGammaRamp(ScreenPtr pScreen,
+                    int size,
+                    unsigned short *red,
+                    unsigned short *green, unsigned short *blue)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    CMapColormapPtr pColPriv;
+    CMapScreenPtr pScreenPriv;
+    CMapLinkPtr pLink;
+
+    if (xf86_crtc_supports_gamma(pScrn)) {
+        RRCrtcPtr crtc = xf86CompatRRCrtc(pScrn);
+
+        if (crtc) {
+            if (crtc->gammaSize != size)
+                return BadValue;
+
+            RRCrtcGammaSet(crtc, red, green, blue);
+
+            return Success;
+        }
+    }
+
+    if (!CMapScreenKeyRegistered)
+        return BadImplementation;
+
+    pScreenPriv = (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                   CMapScreenKey);
+    if (!pScreenPriv)
+        return BadImplementation;
+
+    if (pScreenPriv->gammaElements != size)
+        return BadValue;
+
+    ComputeGammaRamp(pScreenPriv, red, green, blue);
+
+    /* mark all colormaps on this screen */
+    pLink = pScreenPriv->maps;
+    while (pLink) {
+        pColPriv = (CMapColormapPtr) dixLookupPrivate(&pLink->cmap->devPrivates,
+                                                      CMapColormapKey);
+        pColPriv->recalculate = TRUE;
+        pLink = pLink->next;
+    }
+
+    if (GetInstalledmiColormap(pScreen) &&
+        ((pScreenPriv->flags & CMAP_LOAD_EVEN_IF_OFFSCREEN) ||
+         pScrn->vtSema || pScreenPriv->isDGAmode)) {
+        ColormapPtr pMap = GetInstalledmiColormap(pScreen);
+
+        if (!(pScreenPriv->flags & CMAP_PALETTED_TRUECOLOR) &&
+            (pMap->pVisual->class == TrueColor) &&
+            CMapColormapUseMax(pMap->pVisual, pScreenPriv)) {
+
+            /* if the current map doesn't have a palette look
+               for another map to change the gamma on. */
+
+            pLink = pScreenPriv->maps;
+            while (pLink) {
+                if (pLink->cmap->pVisual->class == PseudoColor)
+                    break;
+                pLink = pLink->next;
+            }
+
+            if (pLink) {
+                /* need to trick CMapRefreshColors() into thinking
+                   this is the currently installed map */
+                SetInstalledmiColormap(pScreen, pLink->cmap);
+                CMapReinstallMap(pLink->cmap);
+                SetInstalledmiColormap(pScreen, pMap);
+            }
+        }
+        else
+            CMapReinstallMap(pMap);
+    }
+
+    return Success;
+}
+
+int
+xf86GetGammaRampSize(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    CMapScreenPtr pScreenPriv;
+
+    if (xf86_crtc_supports_gamma(pScrn)) {
+        RRCrtcPtr crtc = xf86CompatRRCrtc(pScrn);
+
+        if (crtc)
+            return crtc->gammaSize;
+    }
+
+    if (!CMapScreenKeyRegistered)
+        return 0;
+
+    pScreenPriv = (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                   CMapScreenKey);
+    if (!pScreenPriv)
+        return 0;
+
+    return pScreenPriv->gammaElements;
+}
+
+int
+xf86GetGammaRamp(ScreenPtr pScreen,
+                 int size,
+                 unsigned short *red,
+                 unsigned short *green, unsigned short *blue)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    CMapScreenPtr pScreenPriv;
+    LOCO *entry;
+    int shift, sigbits;
+
+    if (xf86_crtc_supports_gamma(pScrn)) {
+        RRCrtcPtr crtc = xf86CompatRRCrtc(pScrn);
+
+        if (crtc) {
+            if (crtc->gammaSize < size)
+                return BadValue;
+
+            if (!RRCrtcGammaGet(crtc))
+                return BadImplementation;
+
+            memcpy(red, crtc->gammaRed, size * sizeof(*red));
+            memcpy(green, crtc->gammaGreen, size * sizeof(*green));
+            memcpy(blue, crtc->gammaBlue, size * sizeof(*blue));
+
+            return Success;
+        }
+    }
+
+    if (!CMapScreenKeyRegistered)
+        return BadImplementation;
+
+    pScreenPriv = (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                   CMapScreenKey);
+    if (!pScreenPriv)
+        return BadImplementation;
+
+    if (size > pScreenPriv->gammaElements)
+        return BadValue;
+
+    entry = pScreenPriv->gamma;
+    sigbits = pScreenPriv->sigRGBbits;
+
+    while (size--) {
+        *red = entry->red << (16 - sigbits);
+        *green = entry->green << (16 - sigbits);
+        *blue = entry->blue << (16 - sigbits);
+        shift = sigbits;
+        while (shift < 16) {
+            *red |= *red >> shift;
+            *green |= *green >> shift;
+            *blue |= *blue >> shift;
+            shift += sigbits;
+        }
+        red++;
+        green++;
+        blue++;
+        entry++;
+    }
+
+    return Success;
+}
+
+int
+xf86ChangeGamma(ScreenPtr pScreen, Gamma gamma)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+
+    if (pScrn->ChangeGamma)
+        return (*pScrn->ChangeGamma) (pScreen->myNum, gamma);
+
+    return BadImplementation;
+}
diff --git a/xorg-server/hw/xfree86/common/xf86cmap.h b/xorg-server/hw/xfree86/common/xf86cmap.h
index caa01e8ed..2661cf429 100644
--- a/xorg-server/hw/xfree86/common/xf86cmap.h
+++ b/xorg-server/hw/xfree86/common/xf86cmap.h
@@ -1,79 +1,67 @@
-

-/*

- * Copyright (c) 1998-2001 by The XFree86 Project, Inc.

- *

- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-#ifndef _XF86CMAP_H

-#define _XF86CMAP_H

-

-#include "xf86str.h"

-#include "colormapst.h"

-

-#define CMAP_PALETTED_TRUECOLOR		0x0000001

-#define CMAP_RELOAD_ON_MODE_SWITCH	0x0000002

-#define CMAP_LOAD_EVEN_IF_OFFSCREEN	0x0000004

-

-extern _X_EXPORT Bool xf86HandleColormaps(

-    ScreenPtr pScreen,

-    int maxCol,

-    int sigRGBbits,

-    xf86LoadPaletteProc *loadPalette,

-    xf86SetOverscanProc *setOverscan,

-    unsigned int flags

-);

-

-extern _X_EXPORT Bool xf86ColormapAllocatePrivates(

-    ScrnInfoPtr pScrn

-);

-

-extern _X_EXPORT int

-xf86ChangeGamma(

-   ScreenPtr pScreen,

-   Gamma newGamma

-);

-

-extern _X_EXPORT int

-xf86ChangeGammaRamp(

-   ScreenPtr pScreen,

-   int size,

-   unsigned short *red,

-   unsigned short *green,

-   unsigned short *blue

-);

-

-extern _X_EXPORT int xf86GetGammaRampSize(ScreenPtr pScreen);

-

-extern _X_EXPORT int

-xf86GetGammaRamp(

-   ScreenPtr pScreen,

-   int size,

-   unsigned short *red,

-   unsigned short *green,

-   unsigned short *blue

-);

-

-#endif /* _XF86CMAP_H */

-

+
+/*
+ * Copyright (c) 1998-2001 by The XFree86 Project, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+#ifndef _XF86CMAP_H
+#define _XF86CMAP_H
+
+#include "xf86str.h"
+#include "colormapst.h"
+
+#define CMAP_PALETTED_TRUECOLOR		0x0000001
+#define CMAP_RELOAD_ON_MODE_SWITCH	0x0000002
+#define CMAP_LOAD_EVEN_IF_OFFSCREEN	0x0000004
+
+extern _X_EXPORT Bool xf86HandleColormaps(ScreenPtr pScreen,
+                                          int maxCol,
+                                          int sigRGBbits,
+                                          xf86LoadPaletteProc * loadPalette,
+                                          xf86SetOverscanProc * setOverscan,
+                                          unsigned int flags);
+
+extern _X_EXPORT Bool xf86ColormapAllocatePrivates(ScrnInfoPtr pScrn);
+
+extern _X_EXPORT int
+ xf86ChangeGamma(ScreenPtr pScreen, Gamma newGamma);
+
+extern _X_EXPORT int
+
+xf86ChangeGammaRamp(ScreenPtr pScreen,
+                    int size,
+                    unsigned short *red,
+                    unsigned short *green, unsigned short *blue);
+
+extern _X_EXPORT int xf86GetGammaRampSize(ScreenPtr pScreen);
+
+extern _X_EXPORT int
+
+xf86GetGammaRamp(ScreenPtr pScreen,
+                 int size,
+                 unsigned short *red,
+                 unsigned short *green, unsigned short *blue);
+
+#endif                          /* _XF86CMAP_H */
diff --git a/xorg-server/hw/xfree86/common/xf86fbman.c b/xorg-server/hw/xfree86/common/xf86fbman.c
index ccb761a2c..3c29bf531 100644
--- a/xorg-server/hw/xfree86/common/xf86fbman.c
+++ b/xorg-server/hw/xfree86/common/xf86fbman.c
@@ -1,1446 +1,1431 @@
-

-/*

- * Copyright (c) 1998-2001 by The XFree86 Project, Inc.

- *

- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "regionstr.h"

-#include "xf86fbman.h"

-

-/* 

-#define DEBUG

-*/

-

-static DevPrivateKeyRec xf86FBManagerKeyRec;

-static DevPrivateKey xf86FBManagerKey;

-

-Bool xf86RegisterOffscreenManager(

-    ScreenPtr pScreen, 

-    FBManagerFuncsPtr funcs

-){

-

-   xf86FBManagerKey = &xf86FBManagerKeyRec;

-

-   if (!dixRegisterPrivateKey(&xf86FBManagerKeyRec, PRIVATE_SCREEN, 0))

-       return FALSE;

-

-   dixSetPrivate(&pScreen->devPrivates, xf86FBManagerKey, funcs);

-

-   return TRUE;

-}

-

-

-Bool

-xf86FBManagerRunning(ScreenPtr pScreen)

-{

-    if (xf86FBManagerKey == NULL)

-	return FALSE;

-

-    if(!dixLookupPrivate(&pScreen->devPrivates, xf86FBManagerKey))

-	return FALSE;

-

-    return TRUE;

-}

-

-Bool

-xf86RegisterFreeBoxCallback(

-    ScreenPtr pScreen,  

-    FreeBoxCallbackProcPtr FreeBoxCallback,

-    pointer devPriv

-){

-   FBManagerFuncsPtr funcs;

-

-   if(xf86FBManagerKey == NULL) 

-	return FALSE;

-   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,

-						    xf86FBManagerKey)))

-	return FALSE;

-

-   return (*funcs->RegisterFreeBoxCallback)(pScreen, FreeBoxCallback, devPriv);

-}

-

-

-FBAreaPtr

-xf86AllocateOffscreenArea(

-   ScreenPtr pScreen, 

-   int w, int h,

-   int gran,

-   MoveAreaCallbackProcPtr moveCB,

-   RemoveAreaCallbackProcPtr removeCB,

-   pointer privData

-){

-   FBManagerFuncsPtr funcs;

-

-   if(xf86FBManagerKey == NULL) 

-	return NULL;

-   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,

-						    xf86FBManagerKey)))

-	return NULL;

-

-   return (*funcs->AllocateOffscreenArea)(

-		pScreen, w, h, gran, moveCB, removeCB, privData);

-}

-

-

-FBLinearPtr

-xf86AllocateOffscreenLinear(

-    ScreenPtr pScreen, 

-    int length,

-    int gran,

-    MoveLinearCallbackProcPtr moveCB,

-    RemoveLinearCallbackProcPtr removeCB,

-    pointer privData

-){

-   FBManagerFuncsPtr funcs;

-

-   if(xf86FBManagerKey == NULL) 

-	return NULL;

-   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,

-						    xf86FBManagerKey)))

-	return NULL;

-

-   return (*funcs->AllocateOffscreenLinear)(

-		pScreen, length, gran, moveCB, removeCB, privData);

-}

-

-

-void

-xf86FreeOffscreenArea(FBAreaPtr area)

-{

-   FBManagerFuncsPtr funcs;

-

-   if(!area) return;

-

-   if(xf86FBManagerKey == NULL) 

-	return;

-   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(

-	    &area->pScreen->devPrivates, xf86FBManagerKey)))

-	return;

-

-   (*funcs->FreeOffscreenArea)(area);

-

-   return;

-}

-

-

-void

-xf86FreeOffscreenLinear(FBLinearPtr linear)

-{

-   FBManagerFuncsPtr funcs;

-

-   if(!linear) return;

-

-   if(xf86FBManagerKey == NULL) 

-	return;

-   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(

-	    &linear->pScreen->devPrivates, xf86FBManagerKey)))

-	return;

-

-   (*funcs->FreeOffscreenLinear)(linear);

-

-   return;

-}

-

-

-Bool

-xf86ResizeOffscreenArea(

-   FBAreaPtr resize,

-   int w, int h

-){

-   FBManagerFuncsPtr funcs;

-

-   if(!resize) return FALSE;

-

-   if(xf86FBManagerKey == NULL) 

-	return FALSE;

-   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(

-	    &resize->pScreen->devPrivates, xf86FBManagerKey)))

-	return FALSE;

-

-   return (*funcs->ResizeOffscreenArea)(resize, w, h);

-}

-

-Bool

-xf86ResizeOffscreenLinear(

-   FBLinearPtr resize,

-   int size

-){

-   FBManagerFuncsPtr funcs;

-

-   if(!resize) return FALSE;

-

-   if(xf86FBManagerKey == NULL) 

-	return FALSE;

-   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(

-	    &resize->pScreen->devPrivates, xf86FBManagerKey)))

-	return FALSE;

-

-   return (*funcs->ResizeOffscreenLinear)(resize, size);

-}

-

-

-Bool

-xf86QueryLargestOffscreenArea(

-    ScreenPtr pScreen,

-    int *w, int *h,

-    int gran,

-    int preferences,

-    int severity

-){

-   FBManagerFuncsPtr funcs;

-

-   *w = 0;

-   *h = 0;

-

-   if(xf86FBManagerKey == NULL) 

-	return FALSE;

-   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,

-						    xf86FBManagerKey)))

-	return FALSE;

-

-   return (*funcs->QueryLargestOffscreenArea)(

-		pScreen, w, h, gran, preferences, severity);

-}

-

-Bool

-xf86QueryLargestOffscreenLinear(

-    ScreenPtr pScreen,

-    int *size,

-    int gran,

-    int severity

-){

-   FBManagerFuncsPtr funcs;

-

-   *size = 0;

-

-   if(xf86FBManagerKey == NULL) 

-	return FALSE;

-   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,

-						    xf86FBManagerKey)))

-	return FALSE;

-

-   return (*funcs->QueryLargestOffscreenLinear)(

-		pScreen, size, gran, severity);

-}

-

-

-Bool

-xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen)

-{

-   FBManagerFuncsPtr funcs;

-

-   if(xf86FBManagerKey == NULL) 

-	return FALSE;

-   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,

-						    xf86FBManagerKey)))

-	return FALSE;

-

-   return (*funcs->PurgeOffscreenAreas)(pScreen);

-}

-

-/************************************************************\ 

-

-   Below is a specific implementation of an offscreen manager.

-

-\************************************************************/ 

-

-static DevPrivateKeyRec xf86FBScreenKeyRec;

-#define xf86FBScreenKey (&xf86FBScreenKeyRec)

-

-typedef struct _FBLink {

-  FBArea area;

-  struct _FBLink *next;  

-} FBLink, *FBLinkPtr;

-

-typedef struct _FBLinearLink {

-  FBLinear linear;

-  int free;	/* need to add free here as FBLinear is publicly accessible */

-  FBAreaPtr area;	/* only used if allocation came from XY area */

-  struct _FBLinearLink *next;  

-} FBLinearLink, *FBLinearLinkPtr;

-

-

-typedef struct {

-   ScreenPtr    		pScreen;

-   RegionPtr    		InitialBoxes;

-   RegionPtr    		FreeBoxes;

-   FBLinkPtr    		UsedAreas;

-   int          		NumUsedAreas;

-   FBLinearLinkPtr              LinearAreas;

-   CloseScreenProcPtr           CloseScreen;

-   int                          NumCallbacks;

-   FreeBoxCallbackProcPtr       *FreeBoxesUpdateCallback;

-   DevUnion                     *devPrivates;

-} FBManager, *FBManagerPtr;

-

-

-static void

-SendCallFreeBoxCallbacks(FBManagerPtr offman)

-{

-   int i = offman->NumCallbacks;

-

-   while(i--) {

-	(*offman->FreeBoxesUpdateCallback[i])(

-	   offman->pScreen, offman->FreeBoxes, offman->devPrivates[i].ptr);

-   }

-}

-

-static Bool

-localRegisterFreeBoxCallback(

-    ScreenPtr pScreen,  

-    FreeBoxCallbackProcPtr FreeBoxCallback,

-    pointer devPriv

-){

-   FBManagerPtr offman;

-   FreeBoxCallbackProcPtr *newCallbacks;

-   DevUnion *newPrivates; 

-

-   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					   xf86FBScreenKey);

-   newCallbacks = realloc( offman->FreeBoxesUpdateCallback,

-		sizeof(FreeBoxCallbackProcPtr) * (offman->NumCallbacks + 1));

-

-   newPrivates = realloc(offman->devPrivates,

-			  sizeof(DevUnion) * (offman->NumCallbacks + 1));

-

-   if(!newCallbacks || !newPrivates)

-	return FALSE;     

-

-   offman->FreeBoxesUpdateCallback = newCallbacks;

-   offman->devPrivates = newPrivates;

-

-   offman->FreeBoxesUpdateCallback[offman->NumCallbacks] = FreeBoxCallback;

-   offman->devPrivates[offman->NumCallbacks].ptr = devPriv;

-   offman->NumCallbacks++;

-

-   SendCallFreeBoxCallbacks(offman);

-

-   return TRUE;

-}

-

-

-static FBAreaPtr

-AllocateArea(

-   FBManagerPtr offman,

-   int w, int h,

-   int granularity,

-   MoveAreaCallbackProcPtr moveCB,

-   RemoveAreaCallbackProcPtr removeCB,

-   pointer privData

-){

-   ScreenPtr pScreen = offman->pScreen;

-   FBLinkPtr link = NULL;

-   FBAreaPtr area = NULL;

-   RegionRec NewReg;

-   int i, x = 0, num;

-   BoxPtr boxp;

-

-   if(granularity <= 1) granularity = 0;

-

-   boxp = RegionRects(offman->FreeBoxes);

-   num = RegionNumRects(offman->FreeBoxes);

-

-   /* look through the free boxes */

-   for(i = 0; i < num; i++, boxp++) {

-	x = boxp->x1;

-	if (granularity > 1)

-	    x = ((x + granularity - 1) / granularity) * granularity;

-

-	if(((boxp->y2 - boxp->y1) < h) || ((boxp->x2 - x) < w))

-	   continue;

-

-	link = malloc(sizeof(FBLink));

-	if(!link) return NULL;

-

-        area = &(link->area);

-        link->next = offman->UsedAreas;

-        offman->UsedAreas = link;

-        offman->NumUsedAreas++;

-	break;

-   }

-

-   /* try to boot a removeable one out if we are not expendable ourselves */

-   if(!area && !removeCB) {

-	link = offman->UsedAreas;

-

-	while(link) {

-	   if(!link->area.RemoveAreaCallback) {

-		link = link->next;

-		continue;

-	   }

-

-	   boxp = &(link->area.box);

-	   x = boxp->x1;

- 	   if (granularity > 1)

-		x = ((x + granularity - 1) / granularity) * granularity;

-

-	   if(((boxp->y2 - boxp->y1) < h) || ((boxp->x2 - x) < w)) {

-		link = link->next;

-		continue;

-	   }

-

-	   /* bye, bye */

-	   (*link->area.RemoveAreaCallback)(&link->area);

-	   RegionInit(&NewReg, &(link->area.box), 1);

-	   RegionUnion(offman->FreeBoxes, offman->FreeBoxes, &NewReg);

-	   RegionUninit(&NewReg);

-

-           area = &(link->area);

-	   break;

-	}

-   }

-

-   if(area) {

-	area->pScreen = pScreen;

-	area->granularity = granularity;

-	area->box.x1 = x;

-	area->box.x2 = x + w;

-	area->box.y1 = boxp->y1;

-	area->box.y2 = boxp->y1 + h;

-	area->MoveAreaCallback = moveCB;

-	area->RemoveAreaCallback = removeCB;

-	area->devPrivate.ptr = privData;

-

-        RegionInit(&NewReg, &(area->box), 1);

-	RegionSubtract(offman->FreeBoxes, offman->FreeBoxes, &NewReg);

-	RegionUninit(&NewReg);

-   }

-

-   return area;

-}

-

-static FBAreaPtr

-localAllocateOffscreenArea(

-   ScreenPtr pScreen, 

-   int w, int h,

-   int gran,

-   MoveAreaCallbackProcPtr moveCB,

-   RemoveAreaCallbackProcPtr removeCB,

-   pointer privData

-){

-   FBManagerPtr offman;

-   FBAreaPtr area = NULL;

-

-   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					   xf86FBScreenKey);

-   if((area = AllocateArea(offman, w, h, gran, moveCB, removeCB, privData)))

-	SendCallFreeBoxCallbacks(offman);

-

-   return area;

-}

-

-

-static void

-localFreeOffscreenArea(FBAreaPtr area)

-{

-   FBManagerPtr offman;

-   FBLinkPtr pLink, pLinkPrev = NULL;

-   RegionRec FreedRegion;

-   ScreenPtr pScreen;

-

-   pScreen = area->pScreen;

-   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					   xf86FBScreenKey);

-   pLink = offman->UsedAreas;

-   if(!pLink) return;  

- 

-   while(&(pLink->area) != area) {

-	pLinkPrev = pLink;

-	pLink = pLink->next;

-	if(!pLink) return;

-   }

-

-   /* put the area back into the pool */

-   RegionInit(&FreedRegion, &(pLink->area.box), 1);

-   RegionUnion(offman->FreeBoxes, offman->FreeBoxes, &FreedRegion);

-   RegionUninit(&FreedRegion);

-

-   if(pLinkPrev)

-	pLinkPrev->next = pLink->next;

-   else offman->UsedAreas = pLink->next;

-

-   free(pLink);

-   offman->NumUsedAreas--;

-

-   SendCallFreeBoxCallbacks(offman);

-}

-   

-

-

-static Bool

-localResizeOffscreenArea(

-   FBAreaPtr resize,

-   int w, int h

-){

-   FBManagerPtr offman;

-   ScreenPtr pScreen;

-   BoxRec OrigArea;

-   RegionRec FreedReg;

-   FBAreaPtr area = NULL;

-   FBLinkPtr pLink, newLink, pLinkPrev = NULL;

-

-   pScreen = resize->pScreen;

-   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					   xf86FBScreenKey);

-   /* find this link */

-   if(!(pLink = offman->UsedAreas))

-	return FALSE;  

- 

-   while(&(pLink->area) != resize) {

-	pLinkPrev = pLink;

-	pLink = pLink->next;

-	if(!pLink) return FALSE;

-   }

-

-   OrigArea.x1 = resize->box.x1;

-   OrigArea.x2 = resize->box.x2;

-   OrigArea.y1 = resize->box.y1;

-   OrigArea.y2 = resize->box.y2;

-

-   /* if it's smaller, this is easy */

-

-   if((w <= (resize->box.x2 - resize->box.x1)) && 

-      (h <= (resize->box.y2 - resize->box.y1))) {

-	RegionRec NewReg;

-

-	resize->box.x2 = resize->box.x1 + w;

-	resize->box.y2 = resize->box.y1 + h;

-

-        if((resize->box.y2 == OrigArea.y2) &&

-	   (resize->box.x2 == OrigArea.x2))

-		return TRUE;

-

-	RegionInit(&FreedReg, &OrigArea, 1);

-	RegionInit(&NewReg, &(resize->box), 1);

-	RegionSubtract(&FreedReg, &FreedReg, &NewReg);

-	RegionUnion(offman->FreeBoxes, offman->FreeBoxes, &FreedReg);

-	RegionUninit(&FreedReg);

-	RegionUninit(&NewReg);

-

-	SendCallFreeBoxCallbacks(offman);

-

-	return TRUE;

-   }

-

-

-   /* otherwise we remove the old region */

-

-   RegionInit(&FreedReg, &OrigArea, 1);

-   RegionUnion(offman->FreeBoxes, offman->FreeBoxes, &FreedReg);

-  

-   /* remove the old link */

-   if(pLinkPrev)

-	pLinkPrev->next = pLink->next;

-   else offman->UsedAreas = pLink->next;

-

-   /* and try to add a new one */

-

-   if((area = AllocateArea(offman, w, h, resize->granularity,

-		resize->MoveAreaCallback, resize->RemoveAreaCallback,

-		resize->devPrivate.ptr))) {

-

-        /* copy data over to our link and replace the new with old */

-	memcpy(resize, area, sizeof(FBArea));

-

-        pLinkPrev = NULL;

- 	newLink = offman->UsedAreas;

-

-        while(&(newLink->area) != area) {

-	    pLinkPrev = newLink;

-	    newLink = newLink->next;

-        }

-

-	if(pLinkPrev)

-	    pLinkPrev->next = newLink->next;

-	else offman->UsedAreas = newLink->next;

-

-        pLink->next = offman->UsedAreas;

-        offman->UsedAreas = pLink;

-

-	free(newLink);

-

-	/* AllocateArea added one but we really only exchanged one */

-	offman->NumUsedAreas--;  

-   } else {

-      /* reinstate the old region */

-      RegionSubtract(offman->FreeBoxes, offman->FreeBoxes, &FreedReg);

-      RegionUninit(&FreedReg);

-

-      pLink->next = offman->UsedAreas;

-      offman->UsedAreas = pLink;

-      return FALSE;

-   }

-

-

-   RegionUninit(&FreedReg);

-

-   SendCallFreeBoxCallbacks(offman);

-

-   return TRUE;

-}

-

-static Bool

-localQueryLargestOffscreenArea(

-    ScreenPtr pScreen,

-    int *width, int *height,

-    int granularity,

-    int preferences,

-    int severity

-){

-    FBManagerPtr offman;

-    RegionPtr newRegion = NULL;

-    BoxPtr pbox;

-    int nbox;

-    int x, w, h, area, oldArea;

-

-    *width = *height = oldArea = 0;

-

-    if(granularity <= 1) granularity = 0;

-

-    if((preferences < 0) || (preferences > 3))

-	return FALSE;	

-

-    offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					    xf86FBScreenKey);

-    if(severity < 0) severity = 0;

-    if(severity > 2) severity = 2;

-

-    switch(severity) {

-    case 2:

-	if(offman->NumUsedAreas) {

-	    FBLinkPtr pLink;

-	    RegionRec tmpRegion;

-	    newRegion = RegionCreate(NULL, 1);

-	    RegionCopy(newRegion, offman->InitialBoxes);

-	    pLink = offman->UsedAreas;

-

-	    while(pLink) {

-		if(!pLink->area.RemoveAreaCallback) {

-		    RegionInit(&tmpRegion, &(pLink->area.box), 1);

-		    RegionSubtract(newRegion, newRegion, &tmpRegion);

-		    RegionUninit(&tmpRegion);

-		}

-		pLink = pLink->next;

-	    }

-

-	    nbox = RegionNumRects(newRegion);

-	    pbox = RegionRects(newRegion);

-	    break;

-	}

-    case 1:

-	if(offman->NumUsedAreas) {

-	    FBLinkPtr pLink;

-	    RegionRec tmpRegion;

-	    newRegion = RegionCreate(NULL, 1);

-	    RegionCopy(newRegion, offman->FreeBoxes);

-	    pLink = offman->UsedAreas;

-

-	    while(pLink) {

-		if(pLink->area.RemoveAreaCallback) {

-		    RegionInit(&tmpRegion, &(pLink->area.box), 1);

-		    RegionAppend(newRegion, &tmpRegion);

-		    RegionUninit(&tmpRegion);

-		}

-		pLink = pLink->next;

-	    }

-

-	    nbox = RegionNumRects(newRegion);

-	    pbox = RegionRects(newRegion);

-	    break;

-	}

-    default:

-	nbox = RegionNumRects(offman->FreeBoxes);

-	pbox = RegionRects(offman->FreeBoxes);

-	break;

-    }

-

-    while(nbox--) {

-	x = pbox->x1;

-	if (granularity > 1)

-	   x = ((x + granularity - 1) / granularity) * granularity;

-

-	w = pbox->x2 - x;

-	h = pbox->y2 - pbox->y1;

-	area = w * h;

-

-	if(w > 0) {

-	    Bool gotIt = FALSE;

-	    switch(preferences) {

-	    case FAVOR_AREA_THEN_WIDTH:

-		if((area > oldArea) || ((area == oldArea) && (w > *width))) 

-		    gotIt = TRUE;

-		break;

-	    case FAVOR_AREA_THEN_HEIGHT:

-		if((area > oldArea) || ((area == oldArea) && (h > *height)))

-		    gotIt = TRUE;

-		break;

-	    case FAVOR_WIDTH_THEN_AREA:

-		if((w > *width) || ((w == *width) && (area > oldArea)))

-		    gotIt = TRUE;

-		break;

-	    case FAVOR_HEIGHT_THEN_AREA:

-		if((h > *height) || ((h == *height) && (area > oldArea)))

-		    gotIt = TRUE;

-		break;

-	    }

-	    if(gotIt) {

-		*width = w;

-		*height = h;

-		oldArea = area;

-	    }

-        }

-	pbox++;

-    }

-

-    if(newRegion)

-	RegionDestroy(newRegion);

-

-    return TRUE;

-}

-

-static Bool

-localPurgeUnlockedOffscreenAreas(ScreenPtr pScreen)

-{

-   FBManagerPtr offman;

-   FBLinkPtr pLink, tmp, pPrev = NULL;

-   RegionRec FreedRegion;

-   Bool anyUsed = FALSE;

-

-   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					   xf86FBScreenKey);

-   pLink = offman->UsedAreas;

-   if(!pLink) return TRUE;  

- 

-   while(pLink) {

-	if(pLink->area.RemoveAreaCallback) {

-	    (*pLink->area.RemoveAreaCallback)(&pLink->area);

-

-	    RegionInit(&FreedRegion, &(pLink->area.box), 1);

-	    RegionAppend(offman->FreeBoxes, &FreedRegion);

-	    RegionUninit(&FreedRegion);

-

-	    if(pPrev)

-	      pPrev->next = pLink->next;

-	    else offman->UsedAreas = pLink->next;

-

-	    tmp = pLink;

-	    pLink = pLink->next;

-            free(tmp);

-	    offman->NumUsedAreas--;

-	    anyUsed = TRUE;

-	} else {

-	    pPrev = pLink;

-	    pLink = pLink->next;

-	}

-   }

-

-   if(anyUsed) {

-	RegionValidate(offman->FreeBoxes, &anyUsed);

-	SendCallFreeBoxCallbacks(offman);

-   }

-

-   return TRUE;

-}

-

-static void 

-LinearMoveCBWrapper(FBAreaPtr from, FBAreaPtr to)

-{

-    /* this will never get called */

-}

-

-static void 

-LinearRemoveCBWrapper(FBAreaPtr area)

-{

-   FBManagerPtr offman;

-   FBLinearLinkPtr pLink, pLinkPrev = NULL;

-   ScreenPtr pScreen = area->pScreen;

-

-   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					   xf86FBScreenKey);

-   pLink = offman->LinearAreas;

-   if(!pLink) return;  

- 

-   while(pLink->area != area) {

-        pLinkPrev = pLink;

-        pLink = pLink->next;

-        if(!pLink) return;

-   }

-

-   /* give the user the callback it is expecting */

-   (*pLink->linear.RemoveLinearCallback)(&(pLink->linear));

-

-   if(pLinkPrev)

-        pLinkPrev->next = pLink->next;

-   else offman->LinearAreas = pLink->next;

-

-   free(pLink);

-}

-

-static void

-DumpDebug(FBLinearLinkPtr pLink)

-{

-#ifdef DEBUG

-   if (!pLink) ErrorF("MMmm, PLINK IS NULL!\n");

-

-   while (pLink) {

-	 ErrorF("  Offset:%08x, Size:%08x, %s,%s\n",

-		pLink->linear.offset,

-		pLink->linear.size,

-		pLink->free ? "Free" : "Used",

-		pLink->area ? "Area" : "Linear");

-

-	 pLink = pLink->next;

-   }

-#endif

-}

-

-static FBLinearPtr

-AllocateLinear(

-   FBManagerPtr offman,

-   int size,

-   int granularity,

-   pointer privData

-){

-   ScreenPtr pScreen = offman->pScreen;

-   FBLinearLinkPtr linear = NULL;

-   FBLinearLinkPtr newlink = NULL;

-   int offset, end;

-

-   if(size <= 0) return NULL;

-

-   if (!offman->LinearAreas) return NULL;

-

-   linear = offman->LinearAreas;

-   while (linear) {

- 	/* Make sure we get a free area that's not an XY fallback case */

-      if (!linear->area && linear->free) {

-	 offset = linear->linear.offset;

-	 if (granularity > 1)

-	    offset = ((offset + granularity - 1) / granularity) * granularity;

-	 end = offset+size;

-	 if (end <= (linear->linear.offset + linear->linear.size))

-	    break;

-      }

-      linear = linear->next;

-   }

-   if (!linear)

-      return NULL;

-

-   /* break left */

-   if (offset > linear->linear.offset) {

-      newlink = malloc(sizeof(FBLinearLink));

-      if (!newlink)

-	 return NULL;

-      newlink->area = NULL;

-      newlink->linear.offset = offset;

-      newlink->linear.size = linear->linear.size - (offset - linear->linear.offset);

-      newlink->free = 1;

-      newlink->next = linear->next;

-      linear->linear.size -= newlink->linear.size;

-      linear->next = newlink;

-      linear = newlink;

-   }

-

-   /* break right */

-   if (size < linear->linear.size) {

-      newlink = malloc(sizeof(FBLinearLink));

-      if (!newlink)

-	 return NULL;

-      newlink->area = NULL;

-      newlink->linear.offset = offset + size;

-      newlink->linear.size = linear->linear.size - size;

-      newlink->free = 1;

-      newlink->next = linear->next;

-      linear->linear.size = size;

-      linear->next = newlink;

-   }

-

-   /* p = middle block */

-   linear->linear.granularity = granularity;

-   linear->free = 0;

-   linear->linear.pScreen = pScreen;

-   linear->linear.MoveLinearCallback = NULL;

-   linear->linear.RemoveLinearCallback = NULL;

-   linear->linear.devPrivate.ptr = NULL;

-

-   DumpDebug(offman->LinearAreas);

-

-   return &(linear->linear);

-}

-

-static FBLinearPtr

-localAllocateOffscreenLinear(

-    ScreenPtr pScreen, 

-    int length,

-    int gran,

-    MoveLinearCallbackProcPtr moveCB,

-    RemoveLinearCallbackProcPtr removeCB,

-    pointer privData

-){

-   FBManagerPtr offman;

-   FBLinearLinkPtr link;

-   FBAreaPtr area;

-   FBLinearPtr linear = NULL;

-   BoxPtr extents;

-   int w, h, pitch;

-

-   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					   xf86FBScreenKey);

-

-   /* Try to allocate from linear memory first...... */

-   DebugF("ALLOCATING LINEAR\n");

-   if ((linear = AllocateLinear(offman, length, gran, privData)))

-  	return linear;

-

-   DebugF("NOPE, ALLOCATING AREA\n");

-

-   if(!(link = malloc(sizeof(FBLinearLink))))

-     return NULL;

-

-   /* No linear available, so try and pinch some from the XY areas */

-   extents = RegionExtents(offman->InitialBoxes);

-   pitch = extents->x2 - extents->x1;

-

-   if (gran > 1) {

-        if (gran > pitch) {

-            /* we can't match the specified alignment with XY allocations */

-            free(link);

-            return NULL;

-        }

-

-        if (pitch % gran) {

-            /* pitch and granularity aren't a perfect match, let's allocate

-             * a bit more so we can align later on

-             */

-            length += gran - 1;

-        }

-    }

-

-   if(length < pitch) { /* special case */

-	w = length;

-	h = 1;

-   } else {

-	w = pitch;

-	h = (length + pitch - 1) / pitch;

-   }

-

-   if((area = localAllocateOffscreenArea(pScreen, w, h, gran, 

-			moveCB   ? LinearMoveCBWrapper   : NULL, 

-			removeCB ? LinearRemoveCBWrapper : NULL, 

-			privData))) 

-   {

-	link->area = area;

-	link->free = 0;

-	link->next = offman->LinearAreas;

-	offman->LinearAreas = link;

-	linear = &(link->linear);

-	linear->pScreen = pScreen;

-	linear->size = h * w;

-	linear->offset = (pitch * area->box.y1) + area->box.x1;

-	if (gran > 1)

-            linear->offset = ((linear->offset + gran - 1) / gran) * gran;

-	linear->granularity = gran;

-	linear->MoveLinearCallback = moveCB;

-	linear->RemoveLinearCallback = removeCB;

-	linear->devPrivate.ptr = privData;

-   } else 

-	free(link);

-

-   DumpDebug(offman->LinearAreas);

-

-   return linear;

-}

-

-

-static void 

-localFreeOffscreenLinear(FBLinearPtr linear)

-{

-   FBManagerPtr offman;

-   FBLinearLinkPtr pLink, pLinkPrev = NULL;

-   ScreenPtr pScreen = linear->pScreen;

-

-   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					   xf86FBScreenKey);

-   pLink = offman->LinearAreas;

-   if(!pLink) return;  

- 

-   while(&(pLink->linear) != linear) {

-        pLinkPrev = pLink;

-        pLink = pLink->next;

-        if(!pLink) return;

-   }

-

-   if(pLink->area) {  /* really an XY area */

-	DebugF("FREEING AREA\n");

-	localFreeOffscreenArea(pLink->area);

-   	if(pLinkPrev)

-	    pLinkPrev->next = pLink->next;

-   	else offman->LinearAreas = pLink->next;

-        free(pLink);

-	DumpDebug(offman->LinearAreas);

-	return;

-   }

-

-   pLink->free = 1;

-

-   if (pLink->next && pLink->next->free) {

-      FBLinearLinkPtr p = pLink->next;

-      pLink->linear.size += p->linear.size;

-      pLink->next = p->next;

-      free(p);

-   }

-

-   if(pLinkPrev) {

-   	if (pLinkPrev->next && pLinkPrev->next->free && !pLinkPrev->area) {

-      	    FBLinearLinkPtr p = pLinkPrev->next;

-      	    pLinkPrev->linear.size += p->linear.size;

-      	    pLinkPrev->next = p->next;

-      	    free(p);

-    	}

-   } 

-   

-   DebugF("FREEING LINEAR\n");

-   DumpDebug(offman->LinearAreas);

-}

-

-

-static Bool 

-localResizeOffscreenLinear(FBLinearPtr resize, int length)

-{

-   FBManagerPtr offman;

-   FBLinearLinkPtr pLink;

-   ScreenPtr pScreen = resize->pScreen;

-

-   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					   xf86FBScreenKey);

-   pLink = offman->LinearAreas;

-   if(!pLink) return FALSE;  

- 

-   while(&(pLink->linear) != resize) {

-        pLink = pLink->next;

-        if(!pLink) return FALSE;

-   }

-

-   /* This could actually be alot smarter and try to move allocations

-      from XY to linear when available.  For now if it was XY, we keep

-      it XY */

-

-   if(pLink->area) {  /* really an XY area */

-	BoxPtr extents;

-	int pitch, w, h;

-

-	extents = RegionExtents(offman->InitialBoxes);

-	pitch = extents->x2 - extents->x1;

-

-	if(length < pitch) { /* special case */

-	    w = length;

-	    h = 1;

-	} else {

-	    w = pitch;

-	    h = (length + pitch - 1) / pitch;

-	}

-

-	if(localResizeOffscreenArea(pLink->area, w, h)) {

-	    resize->size = h * w;

-	    resize->offset = (pitch * pLink->area->box.y1) + pLink->area->box.x1;

-	    return TRUE;	

-	}

-   } else {

-	/* TODO!!!! resize the linear area */

-   }

-

-   return FALSE;

-}

-

-

-static Bool

-localQueryLargestOffscreenLinear(

-    ScreenPtr pScreen,

-    int *size,

-    int gran,

-    int priority

-)

-{

-    FBManagerPtr offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-							 xf86FBScreenKey);

-    FBLinearLinkPtr pLink;

-    FBLinearLinkPtr pLinkRet;

-

-    *size = 0;

-    

-    pLink = offman->LinearAreas;

-

-    if (pLink && !pLink->area) {

-	pLinkRet = pLink;

-	while (pLink) {

-	    if (pLink->free) {

-		if (pLink->linear.size > pLinkRet->linear.size)

-		    pLinkRet = pLink;

-	    }

-	    pLink = pLink->next;

-    	}

-

-	if (pLinkRet->free) {

-	    *size = pLinkRet->linear.size;

-	    return TRUE;

-    	}

-    } else {

-	int w, h;

-

-    	if(localQueryLargestOffscreenArea(pScreen, &w, &h, gran, 

-				FAVOR_WIDTH_THEN_AREA, priority))

-    	{

-	    FBManagerPtr offman;

-	    BoxPtr extents;

-

-	    offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-						    xf86FBScreenKey);

-	    extents = RegionExtents(offman->InitialBoxes);

-	    if((extents->x2 - extents->x1) == w)

-	    	*size = w * h;

-	    return TRUE;

-        }

-    }

-

-    return FALSE;

-}

-

-

-

-static FBManagerFuncs xf86FBManFuncs = {

-   localAllocateOffscreenArea,

-   localFreeOffscreenArea,

-   localResizeOffscreenArea,

-   localQueryLargestOffscreenArea,

-   localRegisterFreeBoxCallback,

-   localAllocateOffscreenLinear,

-   localFreeOffscreenLinear,

-   localResizeOffscreenLinear,

-   localQueryLargestOffscreenLinear,

-   localPurgeUnlockedOffscreenAreas

- };

-

-

-static Bool

-xf86FBCloseScreen (int i, ScreenPtr pScreen)

-{

-   FBLinkPtr pLink, tmp;

-   FBLinearLinkPtr pLinearLink, tmp2;

-   FBManagerPtr offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-							xf86FBScreenKey);

-   

-   pScreen->CloseScreen = offman->CloseScreen;

-

-   pLink = offman->UsedAreas;

-   while(pLink) {

-	tmp = pLink;

-	pLink = pLink->next;

-	free(tmp);

-   }

-

-   pLinearLink = offman->LinearAreas;

-   while(pLinearLink) {

-	tmp2 = pLinearLink;

-	pLinearLink = pLinearLink->next;

-	free(tmp2);

-   }

-

-   RegionDestroy(offman->InitialBoxes);

-   RegionDestroy(offman->FreeBoxes);

-

-   free(offman->FreeBoxesUpdateCallback);

-   free(offman->devPrivates);

-   free(offman);

-   dixSetPrivate(&pScreen->devPrivates, xf86FBScreenKey, NULL);

-

-   return (*pScreen->CloseScreen) (i, pScreen);

-}

-

-Bool

-xf86InitFBManager(

-    ScreenPtr pScreen,  

-    BoxPtr FullBox

-){

-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-   RegionRec ScreenRegion;

-   RegionRec FullRegion;

-   BoxRec ScreenBox;

-   Bool ret;

-

-   ScreenBox.x1 = 0;

-   ScreenBox.y1 = 0;

-   ScreenBox.x2 = pScrn->virtualX;

-   ScreenBox.y2 = pScrn->virtualY;

-

-   if((FullBox->x1 >  ScreenBox.x1) || (FullBox->y1 >  ScreenBox.y1) ||

-      (FullBox->x2 <  ScreenBox.x2) || (FullBox->y2 <  ScreenBox.y2)) {

-	return FALSE;   

-   }

-

-   if (FullBox->y2 < FullBox->y1) return FALSE;

-   if (FullBox->x2 < FullBox->x1) return FALSE;

-

-   RegionInit(&ScreenRegion, &ScreenBox, 1);

-   RegionInit(&FullRegion, FullBox, 1);

-

-   RegionSubtract(&FullRegion, &FullRegion, &ScreenRegion);

-

-   ret = xf86InitFBManagerRegion(pScreen, &FullRegion);

-

-   RegionUninit(&ScreenRegion);

-   RegionUninit(&FullRegion);

-    

-   return ret;

-}

-

-Bool

-xf86InitFBManagerArea(

-    ScreenPtr pScreen,

-    int PixelArea,

-    int Verbosity

-)

-{

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    xRectangle Rect[3];

-    RegionPtr pRegion, pScreenRegion;

-    int nRect;

-    Bool ret = FALSE;

-

-    if (PixelArea < (pScrn->displayWidth * pScrn->virtualY))

-	return FALSE;

-

-    Rect[0].x = Rect[0].y = 0;

-    Rect[0].width = pScrn->displayWidth;

-    Rect[0].height = PixelArea / pScrn->displayWidth;

-    nRect = 1;

-

-    /* Add a possible partial scanline */

-    if ((Rect[1].height = Rect[1].width = PixelArea % pScrn->displayWidth)) {

-	Rect[1].x = 0;

-	Rect[1].y = Rect[0].height;

-	Rect[1].height = 1;

-	nRect++;

-    }

-

-    /* Factor out virtual resolution */

-    pRegion = RegionFromRects(nRect, Rect, 0);

-    if (pRegion) {

-	if (!RegionNar(pRegion)) {

-	    Rect[2].x = Rect[2].y = 0;

-	    Rect[2].width = pScrn->virtualX;

-	    Rect[2].height = pScrn->virtualY;

-

-	    pScreenRegion = RegionFromRects(1, &Rect[2], 0);

-	    if (pScreenRegion) {

-		if (!RegionNar(pScreenRegion)) {

-		    RegionSubtract(pRegion, pRegion, pScreenRegion);

-

-		    ret = xf86InitFBManagerRegion(pScreen, pRegion);

-

-		    if (ret && xf86GetVerbosity() >= Verbosity) {

-			int scrnIndex = pScrn->scrnIndex;

-

-			xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity,

-			    "Largest offscreen areas (with overlaps):\n");

-

-			if (Rect[2].width < Rect[0].width) {

-			    xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity,

-				"\t%d x %d rectangle at %d,0\n",

-				Rect[0].width - Rect[2].width,

-				Rect[0].height,

-				Rect[2].width);

-			}

-			if (Rect[2].width < Rect[1].width) {

-			    xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity,

-				"\t%d x %d rectangle at %d,0\n",

-				Rect[1].width - Rect[2].width,

-				Rect[0].height + Rect[1].height,

-				Rect[2].width);

-			}

-			if (Rect[2].height < Rect[0].height) {

-			    xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity,

-				"\t%d x %d rectangle at 0,%d\n",

-				Rect[0].width,

-				Rect[0].height - Rect[2].height,

-				Rect[2].height);

-			}

-			if (Rect[1].height) {

-			    xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity,

-				"\t%d x %d rectangle at 0,%d\n",

-				Rect[1].width,

-				Rect[0].height - Rect[2].height +

-				    Rect[1].height,

-				Rect[2].height);

-			}

-		    }

-		}

-

-		RegionDestroy(pScreenRegion);

-	    }

-	}

-

-	RegionDestroy(pRegion);

-    }

-

-    return ret;

-}

-

-Bool

-xf86InitFBManagerRegion(

-    ScreenPtr pScreen,  

-    RegionPtr FullRegion

-){

-   FBManagerPtr offman;

-

-   if(RegionNil(FullRegion))

-	return FALSE;

-

-   if (!dixRegisterPrivateKey(&xf86FBScreenKeyRec, PRIVATE_SCREEN, 0))

-       return FALSE;

-

-   if(!xf86RegisterOffscreenManager(pScreen, &xf86FBManFuncs))

-	return FALSE;

-

-   offman = malloc(sizeof(FBManager));

-   if(!offman) return FALSE;

-

-   dixSetPrivate(&pScreen->devPrivates, xf86FBScreenKey, offman);

-

-   offman->CloseScreen = pScreen->CloseScreen;

-   pScreen->CloseScreen = xf86FBCloseScreen;

-

-   offman->InitialBoxes = RegionCreate(NULL, 1);

-   offman->FreeBoxes = RegionCreate(NULL, 1);

-

-   RegionCopy(offman->InitialBoxes, FullRegion);

-   RegionCopy(offman->FreeBoxes, FullRegion);

-

-   offman->pScreen = pScreen;

-   offman->UsedAreas = NULL;

-   offman->LinearAreas = NULL;

-   offman->NumUsedAreas = 0;  

-   offman->NumCallbacks = 0;

-   offman->FreeBoxesUpdateCallback = NULL;

-   offman->devPrivates = NULL;

-

-   return TRUE;

-} 

-

-Bool

-xf86InitFBManagerLinear(

-    ScreenPtr pScreen,  

-    int offset,

-    int size

-){

-   FBManagerPtr offman;

-   FBLinearLinkPtr link;

-   FBLinearPtr linear;

-

-   if (size <= 0)

-	return FALSE;

-

-   /* we expect people to have called the Area setup first for pixmap cache */

-   if (!dixLookupPrivate(&pScreen->devPrivates, xf86FBScreenKey))

-	return FALSE;

-

-   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					   xf86FBScreenKey);

-   offman->LinearAreas = malloc(sizeof(FBLinearLink));

-   if (!offman->LinearAreas)

-	return FALSE;

-

-   link = offman->LinearAreas;

-   link->area = NULL;

-   link->next = NULL;

-   link->free = 1;

-   linear = &(link->linear);

-   linear->pScreen = pScreen;

-   linear->size = size;

-   linear->offset = offset;

-   linear->granularity = 0;

-   linear->MoveLinearCallback = NULL;

-   linear->RemoveLinearCallback = NULL;

-   linear->devPrivate.ptr = NULL;

-

-   return TRUE;

-}

-

-

-/* This is an implementation specific function and should 

-   disappear after the next release.  People should use the

-   real linear functions instead */

-

-FBAreaPtr

-xf86AllocateLinearOffscreenArea (

-   ScreenPtr pScreen, 

-   int length,

-   int gran,

-   MoveAreaCallbackProcPtr moveCB,

-   RemoveAreaCallbackProcPtr removeCB,

-   pointer privData

-){

-   FBManagerFuncsPtr funcs;

-   FBManagerPtr offman;

-   BoxPtr extents;

-   int w, h;

-

-   if(xf86FBManagerKey == NULL) 

-        return NULL;

-   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,

-						    xf86FBManagerKey)))

-        return NULL;

-

-   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,

-					   xf86FBScreenKey);

-   extents = RegionExtents(offman->InitialBoxes);

-   w = extents->x2 - extents->x1;

-

-   if (gran > 1) {

-	if (gran > w)

-	    return NULL;

-

-	if (w % gran)

-	    length += gran - 1;

-   }

-

-   if(length <= w) { /* special case */

-	h = 1;

-	w = length;

-   } else {

-	h = (length + w - 1) / w;

-   }

-

-   return (*funcs->AllocateOffscreenArea)(

-                pScreen, w, h, gran, moveCB, removeCB, privData);

-}

+
+/*
+ * Copyright (c) 1998-2001 by The XFree86 Project, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "regionstr.h"
+#include "xf86fbman.h"
+
+/* 
+#define DEBUG
+*/
+
+static DevPrivateKeyRec xf86FBManagerKeyRec;
+static DevPrivateKey xf86FBManagerKey;
+
+Bool
+xf86RegisterOffscreenManager(ScreenPtr pScreen, FBManagerFuncsPtr funcs)
+{
+
+    xf86FBManagerKey = &xf86FBManagerKeyRec;
+
+    if (!dixRegisterPrivateKey(&xf86FBManagerKeyRec, PRIVATE_SCREEN, 0))
+        return FALSE;
+
+    dixSetPrivate(&pScreen->devPrivates, xf86FBManagerKey, funcs);
+
+    return TRUE;
+}
+
+Bool
+xf86FBManagerRunning(ScreenPtr pScreen)
+{
+    if (xf86FBManagerKey == NULL)
+        return FALSE;
+
+    if (!dixLookupPrivate(&pScreen->devPrivates, xf86FBManagerKey))
+        return FALSE;
+
+    return TRUE;
+}
+
+Bool
+xf86RegisterFreeBoxCallback(ScreenPtr pScreen,
+                            FreeBoxCallbackProcPtr FreeBoxCallback,
+                            pointer devPriv)
+{
+    FBManagerFuncsPtr funcs;
+
+    if (xf86FBManagerKey == NULL)
+        return FALSE;
+    if (!(funcs = (FBManagerFuncsPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                       xf86FBManagerKey)))
+        return FALSE;
+
+    return (*funcs->RegisterFreeBoxCallback) (pScreen, FreeBoxCallback,
+                                              devPriv);
+}
+
+FBAreaPtr
+xf86AllocateOffscreenArea(ScreenPtr pScreen,
+                          int w, int h,
+                          int gran,
+                          MoveAreaCallbackProcPtr moveCB,
+                          RemoveAreaCallbackProcPtr removeCB, pointer privData)
+{
+    FBManagerFuncsPtr funcs;
+
+    if (xf86FBManagerKey == NULL)
+        return NULL;
+    if (!(funcs = (FBManagerFuncsPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                       xf86FBManagerKey)))
+        return NULL;
+
+    return (*funcs->AllocateOffscreenArea) (pScreen, w, h, gran, moveCB,
+                                            removeCB, privData);
+}
+
+FBLinearPtr
+xf86AllocateOffscreenLinear(ScreenPtr pScreen,
+                            int length,
+                            int gran,
+                            MoveLinearCallbackProcPtr moveCB,
+                            RemoveLinearCallbackProcPtr removeCB,
+                            pointer privData)
+{
+    FBManagerFuncsPtr funcs;
+
+    if (xf86FBManagerKey == NULL)
+        return NULL;
+    if (!(funcs = (FBManagerFuncsPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                       xf86FBManagerKey)))
+        return NULL;
+
+    return (*funcs->AllocateOffscreenLinear) (pScreen, length, gran, moveCB,
+                                              removeCB, privData);
+}
+
+void
+xf86FreeOffscreenArea(FBAreaPtr area)
+{
+    FBManagerFuncsPtr funcs;
+
+    if (!area)
+        return;
+
+    if (xf86FBManagerKey == NULL)
+        return;
+    if (!
+        (funcs =
+         (FBManagerFuncsPtr) dixLookupPrivate(&area->pScreen->devPrivates,
+                                              xf86FBManagerKey)))
+        return;
+
+    (*funcs->FreeOffscreenArea) (area);
+
+    return;
+}
+
+void
+xf86FreeOffscreenLinear(FBLinearPtr linear)
+{
+    FBManagerFuncsPtr funcs;
+
+    if (!linear)
+        return;
+
+    if (xf86FBManagerKey == NULL)
+        return;
+    if (!
+        (funcs =
+         (FBManagerFuncsPtr) dixLookupPrivate(&linear->pScreen->devPrivates,
+                                              xf86FBManagerKey)))
+        return;
+
+    (*funcs->FreeOffscreenLinear) (linear);
+
+    return;
+}
+
+Bool
+xf86ResizeOffscreenArea(FBAreaPtr resize, int w, int h)
+{
+    FBManagerFuncsPtr funcs;
+
+    if (!resize)
+        return FALSE;
+
+    if (xf86FBManagerKey == NULL)
+        return FALSE;
+    if (!
+        (funcs =
+         (FBManagerFuncsPtr) dixLookupPrivate(&resize->pScreen->devPrivates,
+                                              xf86FBManagerKey)))
+        return FALSE;
+
+    return (*funcs->ResizeOffscreenArea) (resize, w, h);
+}
+
+Bool
+xf86ResizeOffscreenLinear(FBLinearPtr resize, int size)
+{
+    FBManagerFuncsPtr funcs;
+
+    if (!resize)
+        return FALSE;
+
+    if (xf86FBManagerKey == NULL)
+        return FALSE;
+    if (!
+        (funcs =
+         (FBManagerFuncsPtr) dixLookupPrivate(&resize->pScreen->devPrivates,
+                                              xf86FBManagerKey)))
+        return FALSE;
+
+    return (*funcs->ResizeOffscreenLinear) (resize, size);
+}
+
+Bool
+xf86QueryLargestOffscreenArea(ScreenPtr pScreen,
+                              int *w, int *h,
+                              int gran, int preferences, int severity)
+{
+    FBManagerFuncsPtr funcs;
+
+    *w = 0;
+    *h = 0;
+
+    if (xf86FBManagerKey == NULL)
+        return FALSE;
+    if (!(funcs = (FBManagerFuncsPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                       xf86FBManagerKey)))
+        return FALSE;
+
+    return (*funcs->QueryLargestOffscreenArea) (pScreen, w, h, gran,
+                                                preferences, severity);
+}
+
+Bool
+xf86QueryLargestOffscreenLinear(ScreenPtr pScreen,
+                                int *size, int gran, int severity)
+{
+    FBManagerFuncsPtr funcs;
+
+    *size = 0;
+
+    if (xf86FBManagerKey == NULL)
+        return FALSE;
+    if (!(funcs = (FBManagerFuncsPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                       xf86FBManagerKey)))
+        return FALSE;
+
+    return (*funcs->QueryLargestOffscreenLinear) (pScreen, size, gran,
+                                                  severity);
+}
+
+Bool
+xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen)
+{
+    FBManagerFuncsPtr funcs;
+
+    if (xf86FBManagerKey == NULL)
+        return FALSE;
+    if (!(funcs = (FBManagerFuncsPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                       xf86FBManagerKey)))
+        return FALSE;
+
+    return (*funcs->PurgeOffscreenAreas) (pScreen);
+}
+
+/************************************************************\ 
+
+   Below is a specific implementation of an offscreen manager.
+
+\************************************************************/
+
+static DevPrivateKeyRec xf86FBScreenKeyRec;
+
+#define xf86FBScreenKey (&xf86FBScreenKeyRec)
+
+typedef struct _FBLink {
+    FBArea area;
+    struct _FBLink *next;
+} FBLink, *FBLinkPtr;
+
+typedef struct _FBLinearLink {
+    FBLinear linear;
+    int free;                   /* need to add free here as FBLinear is publicly accessible */
+    FBAreaPtr area;             /* only used if allocation came from XY area */
+    struct _FBLinearLink *next;
+} FBLinearLink, *FBLinearLinkPtr;
+
+typedef struct {
+    ScreenPtr pScreen;
+    RegionPtr InitialBoxes;
+    RegionPtr FreeBoxes;
+    FBLinkPtr UsedAreas;
+    int NumUsedAreas;
+    FBLinearLinkPtr LinearAreas;
+    CloseScreenProcPtr CloseScreen;
+    int NumCallbacks;
+    FreeBoxCallbackProcPtr *FreeBoxesUpdateCallback;
+    DevUnion *devPrivates;
+} FBManager, *FBManagerPtr;
+
+static void
+SendCallFreeBoxCallbacks(FBManagerPtr offman)
+{
+    int i = offman->NumCallbacks;
+
+    while (i--) {
+        (*offman->FreeBoxesUpdateCallback[i]) (offman->pScreen,
+                                               offman->FreeBoxes,
+                                               offman->devPrivates[i].ptr);
+    }
+}
+
+static Bool
+localRegisterFreeBoxCallback(ScreenPtr pScreen,
+                             FreeBoxCallbackProcPtr FreeBoxCallback,
+                             pointer devPriv)
+{
+    FBManagerPtr offman;
+    FreeBoxCallbackProcPtr *newCallbacks;
+    DevUnion *newPrivates;
+
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+    newCallbacks = realloc(offman->FreeBoxesUpdateCallback,
+                           sizeof(FreeBoxCallbackProcPtr) *
+                           (offman->NumCallbacks + 1));
+
+    newPrivates = realloc(offman->devPrivates,
+                          sizeof(DevUnion) * (offman->NumCallbacks + 1));
+
+    if (!newCallbacks || !newPrivates)
+        return FALSE;
+
+    offman->FreeBoxesUpdateCallback = newCallbacks;
+    offman->devPrivates = newPrivates;
+
+    offman->FreeBoxesUpdateCallback[offman->NumCallbacks] = FreeBoxCallback;
+    offman->devPrivates[offman->NumCallbacks].ptr = devPriv;
+    offman->NumCallbacks++;
+
+    SendCallFreeBoxCallbacks(offman);
+
+    return TRUE;
+}
+
+static FBAreaPtr
+AllocateArea(FBManagerPtr offman,
+             int w, int h,
+             int granularity,
+             MoveAreaCallbackProcPtr moveCB,
+             RemoveAreaCallbackProcPtr removeCB, pointer privData)
+{
+    ScreenPtr pScreen = offman->pScreen;
+    FBLinkPtr link = NULL;
+    FBAreaPtr area = NULL;
+    RegionRec NewReg;
+    int i, x = 0, num;
+    BoxPtr boxp;
+
+    if (granularity <= 1)
+        granularity = 0;
+
+    boxp = RegionRects(offman->FreeBoxes);
+    num = RegionNumRects(offman->FreeBoxes);
+
+    /* look through the free boxes */
+    for (i = 0; i < num; i++, boxp++) {
+        x = boxp->x1;
+        if (granularity > 1)
+            x = ((x + granularity - 1) / granularity) * granularity;
+
+        if (((boxp->y2 - boxp->y1) < h) || ((boxp->x2 - x) < w))
+            continue;
+
+        link = malloc(sizeof(FBLink));
+        if (!link)
+            return NULL;
+
+        area = &(link->area);
+        link->next = offman->UsedAreas;
+        offman->UsedAreas = link;
+        offman->NumUsedAreas++;
+        break;
+    }
+
+    /* try to boot a removeable one out if we are not expendable ourselves */
+    if (!area && !removeCB) {
+        link = offman->UsedAreas;
+
+        while (link) {
+            if (!link->area.RemoveAreaCallback) {
+                link = link->next;
+                continue;
+            }
+
+            boxp = &(link->area.box);
+            x = boxp->x1;
+            if (granularity > 1)
+                x = ((x + granularity - 1) / granularity) * granularity;
+
+            if (((boxp->y2 - boxp->y1) < h) || ((boxp->x2 - x) < w)) {
+                link = link->next;
+                continue;
+            }
+
+            /* bye, bye */
+            (*link->area.RemoveAreaCallback) (&link->area);
+            RegionInit(&NewReg, &(link->area.box), 1);
+            RegionUnion(offman->FreeBoxes, offman->FreeBoxes, &NewReg);
+            RegionUninit(&NewReg);
+
+            area = &(link->area);
+            break;
+        }
+    }
+
+    if (area) {
+        area->pScreen = pScreen;
+        area->granularity = granularity;
+        area->box.x1 = x;
+        area->box.x2 = x + w;
+        area->box.y1 = boxp->y1;
+        area->box.y2 = boxp->y1 + h;
+        area->MoveAreaCallback = moveCB;
+        area->RemoveAreaCallback = removeCB;
+        area->devPrivate.ptr = privData;
+
+        RegionInit(&NewReg, &(area->box), 1);
+        RegionSubtract(offman->FreeBoxes, offman->FreeBoxes, &NewReg);
+        RegionUninit(&NewReg);
+    }
+
+    return area;
+}
+
+static FBAreaPtr
+localAllocateOffscreenArea(ScreenPtr pScreen,
+                           int w, int h,
+                           int gran,
+                           MoveAreaCallbackProcPtr moveCB,
+                           RemoveAreaCallbackProcPtr removeCB, pointer privData)
+{
+    FBManagerPtr offman;
+    FBAreaPtr area = NULL;
+
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+    if ((area = AllocateArea(offman, w, h, gran, moveCB, removeCB, privData)))
+        SendCallFreeBoxCallbacks(offman);
+
+    return area;
+}
+
+static void
+localFreeOffscreenArea(FBAreaPtr area)
+{
+    FBManagerPtr offman;
+    FBLinkPtr pLink, pLinkPrev = NULL;
+    RegionRec FreedRegion;
+    ScreenPtr pScreen;
+
+    pScreen = area->pScreen;
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+    pLink = offman->UsedAreas;
+    if (!pLink)
+        return;
+
+    while (&(pLink->area) != area) {
+        pLinkPrev = pLink;
+        pLink = pLink->next;
+        if (!pLink)
+            return;
+    }
+
+    /* put the area back into the pool */
+    RegionInit(&FreedRegion, &(pLink->area.box), 1);
+    RegionUnion(offman->FreeBoxes, offman->FreeBoxes, &FreedRegion);
+    RegionUninit(&FreedRegion);
+
+    if (pLinkPrev)
+        pLinkPrev->next = pLink->next;
+    else
+        offman->UsedAreas = pLink->next;
+
+    free(pLink);
+    offman->NumUsedAreas--;
+
+    SendCallFreeBoxCallbacks(offman);
+}
+
+static Bool
+localResizeOffscreenArea(FBAreaPtr resize, int w, int h)
+{
+    FBManagerPtr offman;
+    ScreenPtr pScreen;
+    BoxRec OrigArea;
+    RegionRec FreedReg;
+    FBAreaPtr area = NULL;
+    FBLinkPtr pLink, newLink, pLinkPrev = NULL;
+
+    pScreen = resize->pScreen;
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+    /* find this link */
+    if (!(pLink = offman->UsedAreas))
+        return FALSE;
+
+    while (&(pLink->area) != resize) {
+        pLinkPrev = pLink;
+        pLink = pLink->next;
+        if (!pLink)
+            return FALSE;
+    }
+
+    OrigArea.x1 = resize->box.x1;
+    OrigArea.x2 = resize->box.x2;
+    OrigArea.y1 = resize->box.y1;
+    OrigArea.y2 = resize->box.y2;
+
+    /* if it's smaller, this is easy */
+
+    if ((w <= (resize->box.x2 - resize->box.x1)) &&
+        (h <= (resize->box.y2 - resize->box.y1))) {
+        RegionRec NewReg;
+
+        resize->box.x2 = resize->box.x1 + w;
+        resize->box.y2 = resize->box.y1 + h;
+
+        if ((resize->box.y2 == OrigArea.y2) && (resize->box.x2 == OrigArea.x2))
+            return TRUE;
+
+        RegionInit(&FreedReg, &OrigArea, 1);
+        RegionInit(&NewReg, &(resize->box), 1);
+        RegionSubtract(&FreedReg, &FreedReg, &NewReg);
+        RegionUnion(offman->FreeBoxes, offman->FreeBoxes, &FreedReg);
+        RegionUninit(&FreedReg);
+        RegionUninit(&NewReg);
+
+        SendCallFreeBoxCallbacks(offman);
+
+        return TRUE;
+    }
+
+    /* otherwise we remove the old region */
+
+    RegionInit(&FreedReg, &OrigArea, 1);
+    RegionUnion(offman->FreeBoxes, offman->FreeBoxes, &FreedReg);
+
+    /* remove the old link */
+    if (pLinkPrev)
+        pLinkPrev->next = pLink->next;
+    else
+        offman->UsedAreas = pLink->next;
+
+    /* and try to add a new one */
+
+    if ((area = AllocateArea(offman, w, h, resize->granularity,
+                             resize->MoveAreaCallback,
+                             resize->RemoveAreaCallback,
+                             resize->devPrivate.ptr))) {
+
+        /* copy data over to our link and replace the new with old */
+        memcpy(resize, area, sizeof(FBArea));
+
+        pLinkPrev = NULL;
+        newLink = offman->UsedAreas;
+
+        while (&(newLink->area) != area) {
+            pLinkPrev = newLink;
+            newLink = newLink->next;
+        }
+
+        if (pLinkPrev)
+            pLinkPrev->next = newLink->next;
+        else
+            offman->UsedAreas = newLink->next;
+
+        pLink->next = offman->UsedAreas;
+        offman->UsedAreas = pLink;
+
+        free(newLink);
+
+        /* AllocateArea added one but we really only exchanged one */
+        offman->NumUsedAreas--;
+    }
+    else {
+        /* reinstate the old region */
+        RegionSubtract(offman->FreeBoxes, offman->FreeBoxes, &FreedReg);
+        RegionUninit(&FreedReg);
+
+        pLink->next = offman->UsedAreas;
+        offman->UsedAreas = pLink;
+        return FALSE;
+    }
+
+    RegionUninit(&FreedReg);
+
+    SendCallFreeBoxCallbacks(offman);
+
+    return TRUE;
+}
+
+static Bool
+localQueryLargestOffscreenArea(ScreenPtr pScreen,
+                               int *width, int *height,
+                               int granularity, int preferences, int severity)
+{
+    FBManagerPtr offman;
+    RegionPtr newRegion = NULL;
+    BoxPtr pbox;
+    int nbox;
+    int x, w, h, area, oldArea;
+
+    *width = *height = oldArea = 0;
+
+    if (granularity <= 1)
+        granularity = 0;
+
+    if ((preferences < 0) || (preferences > 3))
+        return FALSE;
+
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+    if (severity < 0)
+        severity = 0;
+    if (severity > 2)
+        severity = 2;
+
+    switch (severity) {
+    case 2:
+        if (offman->NumUsedAreas) {
+            FBLinkPtr pLink;
+            RegionRec tmpRegion;
+
+            newRegion = RegionCreate(NULL, 1);
+            RegionCopy(newRegion, offman->InitialBoxes);
+            pLink = offman->UsedAreas;
+
+            while (pLink) {
+                if (!pLink->area.RemoveAreaCallback) {
+                    RegionInit(&tmpRegion, &(pLink->area.box), 1);
+                    RegionSubtract(newRegion, newRegion, &tmpRegion);
+                    RegionUninit(&tmpRegion);
+                }
+                pLink = pLink->next;
+            }
+
+            nbox = RegionNumRects(newRegion);
+            pbox = RegionRects(newRegion);
+            break;
+        }
+    case 1:
+        if (offman->NumUsedAreas) {
+            FBLinkPtr pLink;
+            RegionRec tmpRegion;
+
+            newRegion = RegionCreate(NULL, 1);
+            RegionCopy(newRegion, offman->FreeBoxes);
+            pLink = offman->UsedAreas;
+
+            while (pLink) {
+                if (pLink->area.RemoveAreaCallback) {
+                    RegionInit(&tmpRegion, &(pLink->area.box), 1);
+                    RegionAppend(newRegion, &tmpRegion);
+                    RegionUninit(&tmpRegion);
+                }
+                pLink = pLink->next;
+            }
+
+            nbox = RegionNumRects(newRegion);
+            pbox = RegionRects(newRegion);
+            break;
+        }
+    default:
+        nbox = RegionNumRects(offman->FreeBoxes);
+        pbox = RegionRects(offman->FreeBoxes);
+        break;
+    }
+
+    while (nbox--) {
+        x = pbox->x1;
+        if (granularity > 1)
+            x = ((x + granularity - 1) / granularity) * granularity;
+
+        w = pbox->x2 - x;
+        h = pbox->y2 - pbox->y1;
+        area = w * h;
+
+        if (w > 0) {
+            Bool gotIt = FALSE;
+
+            switch (preferences) {
+            case FAVOR_AREA_THEN_WIDTH:
+                if ((area > oldArea) || ((area == oldArea) && (w > *width)))
+                    gotIt = TRUE;
+                break;
+            case FAVOR_AREA_THEN_HEIGHT:
+                if ((area > oldArea) || ((area == oldArea) && (h > *height)))
+                    gotIt = TRUE;
+                break;
+            case FAVOR_WIDTH_THEN_AREA:
+                if ((w > *width) || ((w == *width) && (area > oldArea)))
+                    gotIt = TRUE;
+                break;
+            case FAVOR_HEIGHT_THEN_AREA:
+                if ((h > *height) || ((h == *height) && (area > oldArea)))
+                    gotIt = TRUE;
+                break;
+            }
+            if (gotIt) {
+                *width = w;
+                *height = h;
+                oldArea = area;
+            }
+        }
+        pbox++;
+    }
+
+    if (newRegion)
+        RegionDestroy(newRegion);
+
+    return TRUE;
+}
+
+static Bool
+localPurgeUnlockedOffscreenAreas(ScreenPtr pScreen)
+{
+    FBManagerPtr offman;
+    FBLinkPtr pLink, tmp, pPrev = NULL;
+    RegionRec FreedRegion;
+    Bool anyUsed = FALSE;
+
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+    pLink = offman->UsedAreas;
+    if (!pLink)
+        return TRUE;
+
+    while (pLink) {
+        if (pLink->area.RemoveAreaCallback) {
+            (*pLink->area.RemoveAreaCallback) (&pLink->area);
+
+            RegionInit(&FreedRegion, &(pLink->area.box), 1);
+            RegionAppend(offman->FreeBoxes, &FreedRegion);
+            RegionUninit(&FreedRegion);
+
+            if (pPrev)
+                pPrev->next = pLink->next;
+            else
+                offman->UsedAreas = pLink->next;
+
+            tmp = pLink;
+            pLink = pLink->next;
+            free(tmp);
+            offman->NumUsedAreas--;
+            anyUsed = TRUE;
+        }
+        else {
+            pPrev = pLink;
+            pLink = pLink->next;
+        }
+    }
+
+    if (anyUsed) {
+        RegionValidate(offman->FreeBoxes, &anyUsed);
+        SendCallFreeBoxCallbacks(offman);
+    }
+
+    return TRUE;
+}
+
+static void
+LinearMoveCBWrapper(FBAreaPtr from, FBAreaPtr to)
+{
+    /* this will never get called */
+}
+
+static void
+LinearRemoveCBWrapper(FBAreaPtr area)
+{
+    FBManagerPtr offman;
+    FBLinearLinkPtr pLink, pLinkPrev = NULL;
+    ScreenPtr pScreen = area->pScreen;
+
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+    pLink = offman->LinearAreas;
+    if (!pLink)
+        return;
+
+    while (pLink->area != area) {
+        pLinkPrev = pLink;
+        pLink = pLink->next;
+        if (!pLink)
+            return;
+    }
+
+    /* give the user the callback it is expecting */
+    (*pLink->linear.RemoveLinearCallback) (&(pLink->linear));
+
+    if (pLinkPrev)
+        pLinkPrev->next = pLink->next;
+    else
+        offman->LinearAreas = pLink->next;
+
+    free(pLink);
+}
+
+static void
+DumpDebug(FBLinearLinkPtr pLink)
+{
+#ifdef DEBUG
+    if (!pLink)
+        ErrorF("MMmm, PLINK IS NULL!\n");
+
+    while (pLink) {
+        ErrorF("  Offset:%08x, Size:%08x, %s,%s\n",
+               pLink->linear.offset,
+               pLink->linear.size,
+               pLink->free ? "Free" : "Used", pLink->area ? "Area" : "Linear");
+
+        pLink = pLink->next;
+    }
+#endif
+}
+
+static FBLinearPtr
+AllocateLinear(FBManagerPtr offman, int size, int granularity, pointer privData)
+{
+    ScreenPtr pScreen = offman->pScreen;
+    FBLinearLinkPtr linear = NULL;
+    FBLinearLinkPtr newlink = NULL;
+    int offset, end;
+
+    if (size <= 0)
+        return NULL;
+
+    if (!offman->LinearAreas)
+        return NULL;
+
+    linear = offman->LinearAreas;
+    while (linear) {
+        /* Make sure we get a free area that's not an XY fallback case */
+        if (!linear->area && linear->free) {
+            offset = linear->linear.offset;
+            if (granularity > 1)
+                offset =
+                    ((offset + granularity - 1) / granularity) * granularity;
+            end = offset + size;
+            if (end <= (linear->linear.offset + linear->linear.size))
+                break;
+        }
+        linear = linear->next;
+    }
+    if (!linear)
+        return NULL;
+
+    /* break left */
+    if (offset > linear->linear.offset) {
+        newlink = malloc(sizeof(FBLinearLink));
+        if (!newlink)
+            return NULL;
+        newlink->area = NULL;
+        newlink->linear.offset = offset;
+        newlink->linear.size =
+            linear->linear.size - (offset - linear->linear.offset);
+        newlink->free = 1;
+        newlink->next = linear->next;
+        linear->linear.size -= newlink->linear.size;
+        linear->next = newlink;
+        linear = newlink;
+    }
+
+    /* break right */
+    if (size < linear->linear.size) {
+        newlink = malloc(sizeof(FBLinearLink));
+        if (!newlink)
+            return NULL;
+        newlink->area = NULL;
+        newlink->linear.offset = offset + size;
+        newlink->linear.size = linear->linear.size - size;
+        newlink->free = 1;
+        newlink->next = linear->next;
+        linear->linear.size = size;
+        linear->next = newlink;
+    }
+
+    /* p = middle block */
+    linear->linear.granularity = granularity;
+    linear->free = 0;
+    linear->linear.pScreen = pScreen;
+    linear->linear.MoveLinearCallback = NULL;
+    linear->linear.RemoveLinearCallback = NULL;
+    linear->linear.devPrivate.ptr = NULL;
+
+    DumpDebug(offman->LinearAreas);
+
+    return &(linear->linear);
+}
+
+static FBLinearPtr
+localAllocateOffscreenLinear(ScreenPtr pScreen,
+                             int length,
+                             int gran,
+                             MoveLinearCallbackProcPtr moveCB,
+                             RemoveLinearCallbackProcPtr removeCB,
+                             pointer privData)
+{
+    FBManagerPtr offman;
+    FBLinearLinkPtr link;
+    FBAreaPtr area;
+    FBLinearPtr linear = NULL;
+    BoxPtr extents;
+    int w, h, pitch;
+
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+
+    /* Try to allocate from linear memory first...... */
+    DebugF("ALLOCATING LINEAR\n");
+    if ((linear = AllocateLinear(offman, length, gran, privData)))
+        return linear;
+
+    DebugF("NOPE, ALLOCATING AREA\n");
+
+    if (!(link = malloc(sizeof(FBLinearLink))))
+        return NULL;
+
+    /* No linear available, so try and pinch some from the XY areas */
+    extents = RegionExtents(offman->InitialBoxes);
+    pitch = extents->x2 - extents->x1;
+
+    if (gran > 1) {
+        if (gran > pitch) {
+            /* we can't match the specified alignment with XY allocations */
+            free(link);
+            return NULL;
+        }
+
+        if (pitch % gran) {
+            /* pitch and granularity aren't a perfect match, let's allocate
+             * a bit more so we can align later on
+             */
+            length += gran - 1;
+        }
+    }
+
+    if (length < pitch) {       /* special case */
+        w = length;
+        h = 1;
+    }
+    else {
+        w = pitch;
+        h = (length + pitch - 1) / pitch;
+    }
+
+    if ((area = localAllocateOffscreenArea(pScreen, w, h, gran,
+                                           moveCB ? LinearMoveCBWrapper : NULL,
+                                           removeCB ? LinearRemoveCBWrapper :
+                                           NULL, privData))) {
+        link->area = area;
+        link->free = 0;
+        link->next = offman->LinearAreas;
+        offman->LinearAreas = link;
+        linear = &(link->linear);
+        linear->pScreen = pScreen;
+        linear->size = h * w;
+        linear->offset = (pitch * area->box.y1) + area->box.x1;
+        if (gran > 1)
+            linear->offset = ((linear->offset + gran - 1) / gran) * gran;
+        linear->granularity = gran;
+        linear->MoveLinearCallback = moveCB;
+        linear->RemoveLinearCallback = removeCB;
+        linear->devPrivate.ptr = privData;
+    }
+    else
+        free(link);
+
+    DumpDebug(offman->LinearAreas);
+
+    return linear;
+}
+
+static void
+localFreeOffscreenLinear(FBLinearPtr linear)
+{
+    FBManagerPtr offman;
+    FBLinearLinkPtr pLink, pLinkPrev = NULL;
+    ScreenPtr pScreen = linear->pScreen;
+
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+    pLink = offman->LinearAreas;
+    if (!pLink)
+        return;
+
+    while (&(pLink->linear) != linear) {
+        pLinkPrev = pLink;
+        pLink = pLink->next;
+        if (!pLink)
+            return;
+    }
+
+    if (pLink->area) {          /* really an XY area */
+        DebugF("FREEING AREA\n");
+        localFreeOffscreenArea(pLink->area);
+        if (pLinkPrev)
+            pLinkPrev->next = pLink->next;
+        else
+            offman->LinearAreas = pLink->next;
+        free(pLink);
+        DumpDebug(offman->LinearAreas);
+        return;
+    }
+
+    pLink->free = 1;
+
+    if (pLink->next && pLink->next->free) {
+        FBLinearLinkPtr p = pLink->next;
+
+        pLink->linear.size += p->linear.size;
+        pLink->next = p->next;
+        free(p);
+    }
+
+    if (pLinkPrev) {
+        if (pLinkPrev->next && pLinkPrev->next->free && !pLinkPrev->area) {
+            FBLinearLinkPtr p = pLinkPrev->next;
+
+            pLinkPrev->linear.size += p->linear.size;
+            pLinkPrev->next = p->next;
+            free(p);
+        }
+    }
+
+    DebugF("FREEING LINEAR\n");
+    DumpDebug(offman->LinearAreas);
+}
+
+static Bool
+localResizeOffscreenLinear(FBLinearPtr resize, int length)
+{
+    FBManagerPtr offman;
+    FBLinearLinkPtr pLink;
+    ScreenPtr pScreen = resize->pScreen;
+
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+    pLink = offman->LinearAreas;
+    if (!pLink)
+        return FALSE;
+
+    while (&(pLink->linear) != resize) {
+        pLink = pLink->next;
+        if (!pLink)
+            return FALSE;
+    }
+
+    /* This could actually be alot smarter and try to move allocations
+       from XY to linear when available.  For now if it was XY, we keep
+       it XY */
+
+    if (pLink->area) {          /* really an XY area */
+        BoxPtr extents;
+        int pitch, w, h;
+
+        extents = RegionExtents(offman->InitialBoxes);
+        pitch = extents->x2 - extents->x1;
+
+        if (length < pitch) {   /* special case */
+            w = length;
+            h = 1;
+        }
+        else {
+            w = pitch;
+            h = (length + pitch - 1) / pitch;
+        }
+
+        if (localResizeOffscreenArea(pLink->area, w, h)) {
+            resize->size = h * w;
+            resize->offset =
+                (pitch * pLink->area->box.y1) + pLink->area->box.x1;
+            return TRUE;
+        }
+    }
+    else {
+        /* TODO!!!! resize the linear area */
+    }
+
+    return FALSE;
+}
+
+static Bool
+localQueryLargestOffscreenLinear(ScreenPtr pScreen,
+                                 int *size, int gran, int priority)
+{
+    FBManagerPtr offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                          xf86FBScreenKey);
+    FBLinearLinkPtr pLink;
+    FBLinearLinkPtr pLinkRet;
+
+    *size = 0;
+
+    pLink = offman->LinearAreas;
+
+    if (pLink && !pLink->area) {
+        pLinkRet = pLink;
+        while (pLink) {
+            if (pLink->free) {
+                if (pLink->linear.size > pLinkRet->linear.size)
+                    pLinkRet = pLink;
+            }
+            pLink = pLink->next;
+        }
+
+        if (pLinkRet->free) {
+            *size = pLinkRet->linear.size;
+            return TRUE;
+        }
+    }
+    else {
+        int w, h;
+
+        if (localQueryLargestOffscreenArea(pScreen, &w, &h, gran,
+                                           FAVOR_WIDTH_THEN_AREA, priority)) {
+            FBManagerPtr offman;
+            BoxPtr extents;
+
+            offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                     xf86FBScreenKey);
+            extents = RegionExtents(offman->InitialBoxes);
+            if ((extents->x2 - extents->x1) == w)
+                *size = w * h;
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+static FBManagerFuncs xf86FBManFuncs = {
+    localAllocateOffscreenArea,
+    localFreeOffscreenArea,
+    localResizeOffscreenArea,
+    localQueryLargestOffscreenArea,
+    localRegisterFreeBoxCallback,
+    localAllocateOffscreenLinear,
+    localFreeOffscreenLinear,
+    localResizeOffscreenLinear,
+    localQueryLargestOffscreenLinear,
+    localPurgeUnlockedOffscreenAreas
+};
+
+static Bool
+xf86FBCloseScreen(int i, ScreenPtr pScreen)
+{
+    FBLinkPtr pLink, tmp;
+    FBLinearLinkPtr pLinearLink, tmp2;
+    FBManagerPtr offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                          xf86FBScreenKey);
+
+    pScreen->CloseScreen = offman->CloseScreen;
+
+    pLink = offman->UsedAreas;
+    while (pLink) {
+        tmp = pLink;
+        pLink = pLink->next;
+        free(tmp);
+    }
+
+    pLinearLink = offman->LinearAreas;
+    while (pLinearLink) {
+        tmp2 = pLinearLink;
+        pLinearLink = pLinearLink->next;
+        free(tmp2);
+    }
+
+    RegionDestroy(offman->InitialBoxes);
+    RegionDestroy(offman->FreeBoxes);
+
+    free(offman->FreeBoxesUpdateCallback);
+    free(offman->devPrivates);
+    free(offman);
+    dixSetPrivate(&pScreen->devPrivates, xf86FBScreenKey, NULL);
+
+    return (*pScreen->CloseScreen) (i, pScreen);
+}
+
+Bool
+xf86InitFBManager(ScreenPtr pScreen, BoxPtr FullBox)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    RegionRec ScreenRegion;
+    RegionRec FullRegion;
+    BoxRec ScreenBox;
+    Bool ret;
+
+    ScreenBox.x1 = 0;
+    ScreenBox.y1 = 0;
+    ScreenBox.x2 = pScrn->virtualX;
+    ScreenBox.y2 = pScrn->virtualY;
+
+    if ((FullBox->x1 > ScreenBox.x1) || (FullBox->y1 > ScreenBox.y1) ||
+        (FullBox->x2 < ScreenBox.x2) || (FullBox->y2 < ScreenBox.y2)) {
+        return FALSE;
+    }
+
+    if (FullBox->y2 < FullBox->y1)
+        return FALSE;
+    if (FullBox->x2 < FullBox->x1)
+        return FALSE;
+
+    RegionInit(&ScreenRegion, &ScreenBox, 1);
+    RegionInit(&FullRegion, FullBox, 1);
+
+    RegionSubtract(&FullRegion, &FullRegion, &ScreenRegion);
+
+    ret = xf86InitFBManagerRegion(pScreen, &FullRegion);
+
+    RegionUninit(&ScreenRegion);
+    RegionUninit(&FullRegion);
+
+    return ret;
+}
+
+Bool
+xf86InitFBManagerArea(ScreenPtr pScreen, int PixelArea, int Verbosity)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    xRectangle Rect[3];
+    RegionPtr pRegion, pScreenRegion;
+    int nRect;
+    Bool ret = FALSE;
+
+    if (PixelArea < (pScrn->displayWidth * pScrn->virtualY))
+        return FALSE;
+
+    Rect[0].x = Rect[0].y = 0;
+    Rect[0].width = pScrn->displayWidth;
+    Rect[0].height = PixelArea / pScrn->displayWidth;
+    nRect = 1;
+
+    /* Add a possible partial scanline */
+    if ((Rect[1].height = Rect[1].width = PixelArea % pScrn->displayWidth)) {
+        Rect[1].x = 0;
+        Rect[1].y = Rect[0].height;
+        Rect[1].height = 1;
+        nRect++;
+    }
+
+    /* Factor out virtual resolution */
+    pRegion = RegionFromRects(nRect, Rect, 0);
+    if (pRegion) {
+        if (!RegionNar(pRegion)) {
+            Rect[2].x = Rect[2].y = 0;
+            Rect[2].width = pScrn->virtualX;
+            Rect[2].height = pScrn->virtualY;
+
+            pScreenRegion = RegionFromRects(1, &Rect[2], 0);
+            if (pScreenRegion) {
+                if (!RegionNar(pScreenRegion)) {
+                    RegionSubtract(pRegion, pRegion, pScreenRegion);
+
+                    ret = xf86InitFBManagerRegion(pScreen, pRegion);
+
+                    if (ret && xf86GetVerbosity() >= Verbosity) {
+                        int scrnIndex = pScrn->scrnIndex;
+
+                        xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity,
+                                       "Largest offscreen areas (with overlaps):\n");
+
+                        if (Rect[2].width < Rect[0].width) {
+                            xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity,
+                                           "\t%d x %d rectangle at %d,0\n",
+                                           Rect[0].width - Rect[2].width,
+                                           Rect[0].height, Rect[2].width);
+                        }
+                        if (Rect[2].width < Rect[1].width) {
+                            xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity,
+                                           "\t%d x %d rectangle at %d,0\n",
+                                           Rect[1].width - Rect[2].width,
+                                           Rect[0].height + Rect[1].height,
+                                           Rect[2].width);
+                        }
+                        if (Rect[2].height < Rect[0].height) {
+                            xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity,
+                                           "\t%d x %d rectangle at 0,%d\n",
+                                           Rect[0].width,
+                                           Rect[0].height - Rect[2].height,
+                                           Rect[2].height);
+                        }
+                        if (Rect[1].height) {
+                            xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity,
+                                           "\t%d x %d rectangle at 0,%d\n",
+                                           Rect[1].width,
+                                           Rect[0].height - Rect[2].height +
+                                           Rect[1].height, Rect[2].height);
+                        }
+                    }
+                }
+
+                RegionDestroy(pScreenRegion);
+            }
+        }
+
+        RegionDestroy(pRegion);
+    }
+
+    return ret;
+}
+
+Bool
+xf86InitFBManagerRegion(ScreenPtr pScreen, RegionPtr FullRegion)
+{
+    FBManagerPtr offman;
+
+    if (RegionNil(FullRegion))
+        return FALSE;
+
+    if (!dixRegisterPrivateKey(&xf86FBScreenKeyRec, PRIVATE_SCREEN, 0))
+        return FALSE;
+
+    if (!xf86RegisterOffscreenManager(pScreen, &xf86FBManFuncs))
+        return FALSE;
+
+    offman = malloc(sizeof(FBManager));
+    if (!offman)
+        return FALSE;
+
+    dixSetPrivate(&pScreen->devPrivates, xf86FBScreenKey, offman);
+
+    offman->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = xf86FBCloseScreen;
+
+    offman->InitialBoxes = RegionCreate(NULL, 1);
+    offman->FreeBoxes = RegionCreate(NULL, 1);
+
+    RegionCopy(offman->InitialBoxes, FullRegion);
+    RegionCopy(offman->FreeBoxes, FullRegion);
+
+    offman->pScreen = pScreen;
+    offman->UsedAreas = NULL;
+    offman->LinearAreas = NULL;
+    offman->NumUsedAreas = 0;
+    offman->NumCallbacks = 0;
+    offman->FreeBoxesUpdateCallback = NULL;
+    offman->devPrivates = NULL;
+
+    return TRUE;
+}
+
+Bool
+xf86InitFBManagerLinear(ScreenPtr pScreen, int offset, int size)
+{
+    FBManagerPtr offman;
+    FBLinearLinkPtr link;
+    FBLinearPtr linear;
+
+    if (size <= 0)
+        return FALSE;
+
+    /* we expect people to have called the Area setup first for pixmap cache */
+    if (!dixLookupPrivate(&pScreen->devPrivates, xf86FBScreenKey))
+        return FALSE;
+
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+    offman->LinearAreas = malloc(sizeof(FBLinearLink));
+    if (!offman->LinearAreas)
+        return FALSE;
+
+    link = offman->LinearAreas;
+    link->area = NULL;
+    link->next = NULL;
+    link->free = 1;
+    linear = &(link->linear);
+    linear->pScreen = pScreen;
+    linear->size = size;
+    linear->offset = offset;
+    linear->granularity = 0;
+    linear->MoveLinearCallback = NULL;
+    linear->RemoveLinearCallback = NULL;
+    linear->devPrivate.ptr = NULL;
+
+    return TRUE;
+}
+
+/* This is an implementation specific function and should 
+   disappear after the next release.  People should use the
+   real linear functions instead */
+
+FBAreaPtr
+xf86AllocateLinearOffscreenArea(ScreenPtr pScreen,
+                                int length,
+                                int gran,
+                                MoveAreaCallbackProcPtr moveCB,
+                                RemoveAreaCallbackProcPtr removeCB,
+                                pointer privData)
+{
+    FBManagerFuncsPtr funcs;
+    FBManagerPtr offman;
+    BoxPtr extents;
+    int w, h;
+
+    if (xf86FBManagerKey == NULL)
+        return NULL;
+    if (!(funcs = (FBManagerFuncsPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                       xf86FBManagerKey)))
+        return NULL;
+
+    offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                             xf86FBScreenKey);
+    extents = RegionExtents(offman->InitialBoxes);
+    w = extents->x2 - extents->x1;
+
+    if (gran > 1) {
+        if (gran > w)
+            return NULL;
+
+        if (w % gran)
+            length += gran - 1;
+    }
+
+    if (length <= w) {          /* special case */
+        h = 1;
+        w = length;
+    }
+    else {
+        h = (length + w - 1) / w;
+    }
+
+    return (*funcs->AllocateOffscreenArea) (pScreen, w, h, gran, moveCB,
+                                            removeCB, privData);
+}
diff --git a/xorg-server/hw/xfree86/common/xf86fbman.h b/xorg-server/hw/xfree86/common/xf86fbman.h
index 1b3c31635..99bf9917b 100644
--- a/xorg-server/hw/xfree86/common/xf86fbman.h
+++ b/xorg-server/hw/xfree86/common/xf86fbman.h
@@ -29,11 +29,9 @@
 #ifndef _XF86FBMAN_H
 #define _XF86FBMAN_H
 
-
 #include "scrnintstr.h"
 #include "regionstr.h"
 
-
 #define FAVOR_AREA_THEN_WIDTH		0
 #define FAVOR_AREA_THEN_HEIGHT		1
 #define FAVOR_WIDTH_THEN_AREA		2
@@ -43,184 +41,131 @@
 #define PRIORITY_NORMAL			1
 #define PRIORITY_EXTREME		2
 
-
 typedef struct _FBArea {
-   ScreenPtr    pScreen;
-   BoxRec   	box;
-   int 		granularity;
-   void 	(*MoveAreaCallback)(struct _FBArea*, struct _FBArea*);
-   void 	(*RemoveAreaCallback)(struct _FBArea*);
-   DevUnion 	devPrivate;
+    ScreenPtr pScreen;
+    BoxRec box;
+    int granularity;
+    void (*MoveAreaCallback) (struct _FBArea *, struct _FBArea *);
+    void (*RemoveAreaCallback) (struct _FBArea *);
+    DevUnion devPrivate;
 } FBArea, *FBAreaPtr;
 
 typedef struct _FBLinear {
-   ScreenPtr    pScreen;
-   int		size;
-   int 		offset;
-   int 		granularity;
-   void 	(*MoveLinearCallback)(struct _FBLinear*, struct _FBLinear*);
-   void 	(*RemoveLinearCallback)(struct _FBLinear*);
-   DevUnion 	devPrivate;
+    ScreenPtr pScreen;
+    int size;
+    int offset;
+    int granularity;
+    void (*MoveLinearCallback) (struct _FBLinear *, struct _FBLinear *);
+    void (*RemoveLinearCallback) (struct _FBLinear *);
+    DevUnion devPrivate;
 } FBLinear, *FBLinearPtr;
 
-typedef void (*FreeBoxCallbackProcPtr)(ScreenPtr, RegionPtr, pointer);
-typedef void (*MoveAreaCallbackProcPtr)(FBAreaPtr, FBAreaPtr);
-typedef void (*RemoveAreaCallbackProcPtr)(FBAreaPtr);
-
-typedef void (*MoveLinearCallbackProcPtr)(FBLinearPtr, FBLinearPtr);
-typedef void (*RemoveLinearCallbackProcPtr)(FBLinearPtr);
+typedef void (*FreeBoxCallbackProcPtr) (ScreenPtr, RegionPtr, pointer);
+typedef void (*MoveAreaCallbackProcPtr) (FBAreaPtr, FBAreaPtr);
+typedef void (*RemoveAreaCallbackProcPtr) (FBAreaPtr);
 
+typedef void (*MoveLinearCallbackProcPtr) (FBLinearPtr, FBLinearPtr);
+typedef void (*RemoveLinearCallbackProcPtr) (FBLinearPtr);
 
 typedef struct {
-    FBAreaPtr (*AllocateOffscreenArea)(
-		ScreenPtr pScreen, 
-		int w, int h,
-		int granularity,
-		MoveAreaCallbackProcPtr moveCB,
-		RemoveAreaCallbackProcPtr removeCB,
-		pointer privData);
-    void      (*FreeOffscreenArea)(FBAreaPtr area);
-    Bool      (*ResizeOffscreenArea)(FBAreaPtr area, int w, int h);
-    Bool      (*QueryLargestOffscreenArea)(
-		ScreenPtr pScreen,
-		int *width, int *height,
-		int granularity,
-		int preferences,
-		int priority);
-    Bool      (*RegisterFreeBoxCallback)( 
-		ScreenPtr pScreen,  
-		FreeBoxCallbackProcPtr FreeBoxCallback,
-		pointer devPriv);
+    FBAreaPtr(*AllocateOffscreenArea) (ScreenPtr pScreen,
+                                       int w, int h,
+                                       int granularity,
+                                       MoveAreaCallbackProcPtr moveCB,
+                                       RemoveAreaCallbackProcPtr removeCB,
+                                       pointer privData);
+    void (*FreeOffscreenArea) (FBAreaPtr area);
+    Bool (*ResizeOffscreenArea) (FBAreaPtr area, int w, int h);
+    Bool (*QueryLargestOffscreenArea) (ScreenPtr pScreen,
+                                       int *width, int *height,
+                                       int granularity,
+                                       int preferences, int priority);
+    Bool (*RegisterFreeBoxCallback) (ScreenPtr pScreen,
+                                     FreeBoxCallbackProcPtr FreeBoxCallback,
+                                     pointer devPriv);
 /* linear functions */
-    FBLinearPtr (*AllocateOffscreenLinear)(
-		ScreenPtr pScreen, 
-		int size,
-		int granularity,
-		MoveLinearCallbackProcPtr moveCB,
-		RemoveLinearCallbackProcPtr removeCB,
-		pointer privData);
-    void      (*FreeOffscreenLinear)(FBLinearPtr area);
-    Bool      (*ResizeOffscreenLinear)(FBLinearPtr area, int size);
-    Bool      (*QueryLargestOffscreenLinear)(
-		ScreenPtr pScreen,
-		int *size,
-		int granularity,
-		int priority);
-    Bool      (*PurgeOffscreenAreas) (ScreenPtr);
+     FBLinearPtr(*AllocateOffscreenLinear) (ScreenPtr pScreen,
+                                            int size,
+                                            int granularity,
+                                            MoveLinearCallbackProcPtr moveCB,
+                                            RemoveLinearCallbackProcPtr
+                                            removeCB, pointer privData);
+    void (*FreeOffscreenLinear) (FBLinearPtr area);
+    Bool (*ResizeOffscreenLinear) (FBLinearPtr area, int size);
+    Bool (*QueryLargestOffscreenLinear) (ScreenPtr pScreen,
+                                         int *size,
+                                         int granularity, int priority);
+    Bool (*PurgeOffscreenAreas) (ScreenPtr);
 } FBManagerFuncs, *FBManagerFuncsPtr;
 
-
-extern _X_EXPORT Bool xf86RegisterOffscreenManager(
-    ScreenPtr pScreen, 
-    FBManagerFuncsPtr funcs
-);
+extern _X_EXPORT Bool xf86RegisterOffscreenManager(ScreenPtr pScreen,
+                                                   FBManagerFuncsPtr funcs);
 
 extern _X_EXPORT Bool
-xf86InitFBManagerRegion(
-    ScreenPtr pScreen, 
-    RegionPtr ScreenRegion
-);
+ xf86InitFBManagerRegion(ScreenPtr pScreen, RegionPtr ScreenRegion);
 
 extern _X_EXPORT Bool
-xf86InitFBManagerArea(
-    ScreenPtr pScreen,
-    int PixalArea,
-    int Verbosity
-);
+ xf86InitFBManagerArea(ScreenPtr pScreen, int PixalArea, int Verbosity);
 
 extern _X_EXPORT Bool
-xf86InitFBManager(
-    ScreenPtr pScreen, 
-    BoxPtr FullBox
-);
+ xf86InitFBManager(ScreenPtr pScreen, BoxPtr FullBox);
 
 extern _X_EXPORT Bool
-xf86InitFBManagerLinear(
-    ScreenPtr pScreen, 
-    int offset,
-    int size
-);
+ xf86InitFBManagerLinear(ScreenPtr pScreen, int offset, int size);
 
 extern _X_EXPORT Bool
-xf86FBManagerRunning(
-    ScreenPtr pScreen
-);
+ xf86FBManagerRunning(ScreenPtr pScreen);
 
 extern _X_EXPORT FBAreaPtr
-xf86AllocateOffscreenArea (
-   ScreenPtr pScreen, 
-   int w, int h,
-   int granularity,
-   MoveAreaCallbackProcPtr moveCB,
-   RemoveAreaCallbackProcPtr removeCB,
-   pointer privData
-);
+xf86AllocateOffscreenArea(ScreenPtr pScreen,
+                          int w, int h,
+                          int granularity,
+                          MoveAreaCallbackProcPtr moveCB,
+                          RemoveAreaCallbackProcPtr removeCB, pointer privData);
 
 extern _X_EXPORT FBAreaPtr
-xf86AllocateLinearOffscreenArea (
-   ScreenPtr pScreen, 
-   int length,
-   int granularity,
-   MoveAreaCallbackProcPtr moveCB,
-   RemoveAreaCallbackProcPtr removeCB,
-   pointer privData
-);
+xf86AllocateLinearOffscreenArea(ScreenPtr pScreen,
+                                int length,
+                                int granularity,
+                                MoveAreaCallbackProcPtr moveCB,
+                                RemoveAreaCallbackProcPtr removeCB,
+                                pointer privData);
 
 extern _X_EXPORT FBLinearPtr
-xf86AllocateOffscreenLinear (
-   ScreenPtr pScreen, 
-   int length,
-   int granularity,
-   MoveLinearCallbackProcPtr moveCB,
-   RemoveLinearCallbackProcPtr removeCB,
-   pointer privData
-);
+xf86AllocateOffscreenLinear(ScreenPtr pScreen,
+                            int length,
+                            int granularity,
+                            MoveLinearCallbackProcPtr moveCB,
+                            RemoveLinearCallbackProcPtr removeCB,
+                            pointer privData);
 
 extern _X_EXPORT void xf86FreeOffscreenArea(FBAreaPtr area);
 extern _X_EXPORT void xf86FreeOffscreenLinear(FBLinearPtr area);
 
 extern _X_EXPORT Bool
-xf86ResizeOffscreenArea(
-   FBAreaPtr resize,
-   int w, int h
-);
+ xf86ResizeOffscreenArea(FBAreaPtr resize, int w, int h);
 
 extern _X_EXPORT Bool
-xf86ResizeOffscreenLinear(
-   FBLinearPtr resize,
-   int size
-);
-
+ xf86ResizeOffscreenLinear(FBLinearPtr resize, int size);
 
 extern _X_EXPORT Bool
-xf86RegisterFreeBoxCallback(
-    ScreenPtr pScreen,  
-    FreeBoxCallbackProcPtr FreeBoxCallback,
-    pointer devPriv
-);
 
-extern _X_EXPORT Bool
-xf86PurgeUnlockedOffscreenAreas(
-    ScreenPtr pScreen
-);
+xf86RegisterFreeBoxCallback(ScreenPtr pScreen,
+                            FreeBoxCallbackProcPtr FreeBoxCallback,
+                            pointer devPriv);
 
+extern _X_EXPORT Bool
+ xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen);
 
 extern _X_EXPORT Bool
-xf86QueryLargestOffscreenArea(
-    ScreenPtr pScreen,
-    int *width, int *height,
-    int granularity,
-    int preferences,
-    int priority
-);
+
+xf86QueryLargestOffscreenArea(ScreenPtr pScreen,
+                              int *width, int *height,
+                              int granularity, int preferences, int priority);
 
 extern _X_EXPORT Bool
-xf86QueryLargestOffscreenLinear(
-    ScreenPtr pScreen,
-    int *size,
-    int granularity,
-    int priority
-);
 
+xf86QueryLargestOffscreenLinear(ScreenPtr pScreen,
+                                int *size, int granularity, int priority);
 
-#endif /* _XF86FBMAN_H */
+#endif                          /* _XF86FBMAN_H */
diff --git a/xorg-server/hw/xfree86/common/xf86pciBus.c b/xorg-server/hw/xfree86/common/xf86pciBus.c
index b95b25359..e52f1da84 100644
--- a/xorg-server/hw/xfree86/common/xf86pciBus.c
+++ b/xorg-server/hw/xfree86/common/xf86pciBus.c
@@ -41,7 +41,7 @@
 #include "Pci.h"
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "dirent.h" /* DIR, FILE type definitions */
+#include "dirent.h"             /* DIR, FILE type definitions */
 
 /* Bus-specific headers */
 #include "xf86Bus.h"
@@ -77,7 +77,6 @@ Bool pciSlotClaimed = FALSE;
     (((c) & 0x00ffff00) \
 	 == ((PCI_CLASS_DISPLAY << 16) | (PCI_SUBCLASS_DISPLAY_VGA << 8)))
 
-
 static struct pci_slot_match xf86IsolateDevice = {
     PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0
 };
@@ -93,108 +92,110 @@ xf86PciProbe(void)
     int num = 0;
     struct pci_device *info;
     struct pci_device_iterator *iter;
-    struct pci_device ** xf86PciVideoInfo = NULL;
-
+    struct pci_device **xf86PciVideoInfo = NULL;
 
     if (!xf86scanpci()) {
-	xf86PciVideoInfo = NULL;
-	return;
+        xf86PciVideoInfo = NULL;
+        return;
     }
 
-    iter = pci_slot_match_iterator_create(& xf86IsolateDevice);
+    iter = pci_slot_match_iterator_create(&xf86IsolateDevice);
     while ((info = pci_device_next(iter)) != NULL) {
-	if (PCIINFOCLASSES(info->device_class)) {
-	    num++;
-	    xf86PciVideoInfo = xnfrealloc(xf86PciVideoInfo,
-					  (sizeof(struct pci_device *)
-					   * (num + 1)));
-	    xf86PciVideoInfo[num] = NULL;
-	    xf86PciVideoInfo[num - 1] = info;
-
-	    pci_device_probe(info);
-	    if (pci_device_is_boot_vga(info)) {
+        if (PCIINFOCLASSES(info->device_class)) {
+            num++;
+            xf86PciVideoInfo = xnfrealloc(xf86PciVideoInfo,
+                                          (sizeof(struct pci_device *)
+                                           * (num + 1)));
+            xf86PciVideoInfo[num] = NULL;
+            xf86PciVideoInfo[num - 1] = info;
+
+            pci_device_probe(info);
+            if (pci_device_is_boot_vga(info)) {
                 primaryBus.type = BUS_PCI;
                 primaryBus.id.pci = info;
             }
-	    info->user_data = 0;
-	}
+            info->user_data = 0;
+        }
     }
     free(iter);
 
     /* If we haven't found a primary device try a different heuristic */
     if (primaryBus.type == BUS_NONE && num) {
-	for (i = 0; i < num; i++) {
-	    uint16_t  command;
-
-	    info = xf86PciVideoInfo[i];
-	    pci_device_cfg_read_u16(info, & command, 4);
-
-	    if ((command & PCI_CMD_MEM_ENABLE) 
-		&& ((num == 1) || IS_VGA(info->device_class))) {
-		if (primaryBus.type == BUS_NONE) {
-		    primaryBus.type = BUS_PCI;
-		    primaryBus.id.pci = info;
-		} else {
-		    xf86Msg(X_NOTICE,
-			    "More than one possible primary device found\n");
-		    primaryBus.type ^= (BusType)(-1);
-		}
-	    }
-	}
+        for (i = 0; i < num; i++) {
+            uint16_t command;
+
+            info = xf86PciVideoInfo[i];
+            pci_device_cfg_read_u16(info, &command, 4);
+
+            if ((command & PCI_CMD_MEM_ENABLE)
+                && ((num == 1) || IS_VGA(info->device_class))) {
+                if (primaryBus.type == BUS_NONE) {
+                    primaryBus.type = BUS_PCI;
+                    primaryBus.id.pci = info;
+                }
+                else {
+                    xf86Msg(X_NOTICE,
+                            "More than one possible primary device found\n");
+                    primaryBus.type ^= (BusType) (-1);
+                }
+            }
+        }
     }
-    
+
     /* Print a summary of the video devices found */
     for (k = 0; k < num; k++) {
-	const char *prim = " ";
-	Bool memdone = FALSE, iodone = FALSE;
-
+        const char *prim = " ";
+        Bool memdone = FALSE, iodone = FALSE;
 
-	info = xf86PciVideoInfo[k];
+        info = xf86PciVideoInfo[k];
 
-	if (!PCIALWAYSPRINTCLASSES(info->device_class))
-	    continue;
+        if (!PCIALWAYSPRINTCLASSES(info->device_class))
+            continue;
 
-	if (xf86IsPrimaryPci(info))
-	    prim = "*";
+        if (xf86IsPrimaryPci(info))
+            prim = "*";
 
-	xf86Msg(X_PROBED, "PCI:%s(%u:%u:%u:%u) %04x:%04x:%04x:%04x ", prim,
-		info->domain, info->bus, info->dev, info->func,
-		info->vendor_id, info->device_id,
-		info->subvendor_id, info->subdevice_id);
+        xf86Msg(X_PROBED, "PCI:%s(%u:%u:%u:%u) %04x:%04x:%04x:%04x ", prim,
+                info->domain, info->bus, info->dev, info->func,
+                info->vendor_id, info->device_id,
+                info->subvendor_id, info->subdevice_id);
 
-	xf86ErrorF("rev %d", info->revision);
+        xf86ErrorF("rev %d", info->revision);
 
-	for (i = 0; i < 6; i++) {
-	    struct pci_mem_region * r = & info->regions[i];
+        for (i = 0; i < 6; i++) {
+            struct pci_mem_region *r = &info->regions[i];
 
-	    if ( r->size && ! r->is_IO ) {
-		if (!memdone) {
-		    xf86ErrorF(", Mem @ ");
-		    memdone = TRUE;
-		} else
-		    xf86ErrorF(", ");
-		xf86ErrorF("0x%08lx/%ld", (long)r->base_addr, (long)r->size);
-	    }
-	}
+            if (r->size && !r->is_IO) {
+                if (!memdone) {
+                    xf86ErrorF(", Mem @ ");
+                    memdone = TRUE;
+                }
+                else
+                    xf86ErrorF(", ");
+                xf86ErrorF("0x%08lx/%ld", (long) r->base_addr, (long) r->size);
+            }
+        }
 
-	for (i = 0; i < 6; i++) {
-	    struct pci_mem_region * r = & info->regions[i];
+        for (i = 0; i < 6; i++) {
+            struct pci_mem_region *r = &info->regions[i];
 
-	    if ( r->size && r->is_IO ) {
-		if (!iodone) {
-		    xf86ErrorF(", I/O @ ");
-		    iodone = TRUE;
-		} else
-		    xf86ErrorF(", ");
-		xf86ErrorF("0x%08lx/%ld", (long)r->base_addr, (long)r->size);
-	    }
-	}
+            if (r->size && r->is_IO) {
+                if (!iodone) {
+                    xf86ErrorF(", I/O @ ");
+                    iodone = TRUE;
+                }
+                else
+                    xf86ErrorF(", ");
+                xf86ErrorF("0x%08lx/%ld", (long) r->base_addr, (long) r->size);
+            }
+        }
 
-	if ( info->rom_size ) {
-	    xf86ErrorF(", BIOS @ 0x\?\?\?\?\?\?\?\?/%ld", (long)info->rom_size);
-	}
+        if (info->rom_size) {
+            xf86ErrorF(", BIOS @ 0x\?\?\?\?\?\?\?\?/%ld",
+                       (long) info->rom_size);
+        }
 
-	xf86ErrorF("\n");
+        xf86ErrorF("\n");
     }
     free(xf86PciVideoInfo);
 }
@@ -205,28 +206,29 @@ xf86PciProbe(void)
  */
 
 int
-xf86ClaimPciSlot(struct pci_device * d, DriverPtr drvp,
-		 int chipset, GDevPtr dev, Bool active)
+xf86ClaimPciSlot(struct pci_device *d, DriverPtr drvp,
+                 int chipset, GDevPtr dev, Bool active)
 {
     EntityPtr p = NULL;
     int num;
-    
+
     if (xf86CheckPciSlot(d)) {
-	num = xf86AllocateEntity();
-	p = xf86Entities[num];
-	p->driver = drvp;
-	p->chipset = chipset;
-	p->bus.type = BUS_PCI;
-	p->bus.id.pci = d;
-	p->active = active;
-	p->inUse = FALSE;
-	if (dev)
+        num = xf86AllocateEntity();
+        p = xf86Entities[num];
+        p->driver = drvp;
+        p->chipset = chipset;
+        p->bus.type = BUS_PCI;
+        p->bus.id.pci = d;
+        p->active = active;
+        p->inUse = FALSE;
+        if (dev)
             xf86AddDevToEntity(num, dev);
-	pciSlotClaimed = TRUE;
+        pciSlotClaimed = TRUE;
 
- 	return num;
-    } else
- 	return -1;
+        return num;
+    }
+    else
+        return -1;
 }
 
 /*
@@ -238,13 +240,13 @@ xf86UnclaimPciSlot(struct pci_device *d)
     int i;
 
     for (i = 0; i < xf86NumEntities; i++) {
-	const EntityPtr p = xf86Entities[i];
+        const EntityPtr p = xf86Entities[i];
 
-	if ((p->bus.type == BUS_PCI) && (p->bus.id.pci == d)) {
-	    /* Probably the slot should be deallocated? */
-	    p->bus.type = BUS_NONE;
-	    return;
-	}
+        if ((p->bus.type == BUS_PCI) && (p->bus.id.pci == d)) {
+            /* Probably the slot should be deallocated? */
+            p->bus.type = BUS_NONE;
+            return;
+        }
     }
 }
 
@@ -267,56 +269,56 @@ xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func)
     int i;
 
     if (StringToBusType(busID, &id) != BUS_PCI)
-	return FALSE;
+        return FALSE;
 
     s = xstrdup(id);
     p = strtok(s, ":");
     if (p == NULL || *p == 0) {
-	free(s);
-	return FALSE;
+        free(s);
+        return FALSE;
     }
     d = strpbrk(p, "@");
     if (d != NULL) {
-	*(d++) = 0;
-	for (i = 0; d[i] != 0; i++) {
-	    if (!isdigit(d[i])) {
-		free(s);
-		return FALSE;
-	    }
-	}
+        *(d++) = 0;
+        for (i = 0; d[i] != 0; i++) {
+            if (!isdigit(d[i])) {
+                free(s);
+                return FALSE;
+            }
+        }
     }
     for (i = 0; p[i] != 0; i++) {
-	if (!isdigit(p[i])) {
-	    free(s);
-	    return FALSE;
-	}
+        if (!isdigit(p[i])) {
+            free(s);
+            return FALSE;
+        }
     }
     *bus = atoi(p);
     if (d != NULL && *d != 0)
-	*bus += atoi(d) << 8;
+        *bus += atoi(d) << 8;
     p = strtok(NULL, ":");
     if (p == NULL || *p == 0) {
-	free(s);
-	return FALSE;
+        free(s);
+        return FALSE;
     }
     for (i = 0; p[i] != 0; i++) {
-	if (!isdigit(p[i])) {
-	    free(s);
-	    return FALSE;
-	}
+        if (!isdigit(p[i])) {
+            free(s);
+            return FALSE;
+        }
     }
     *device = atoi(p);
     *func = 0;
     p = strtok(NULL, ":");
     if (p == NULL || *p == 0) {
-	free(s);
-	return TRUE;
+        free(s);
+        return TRUE;
     }
     for (i = 0; p[i] != 0; i++) {
-	if (!isdigit(p[i])) {
-	    free(s);
-	    return FALSE;
-	}
+        if (!isdigit(p[i])) {
+            free(s);
+            return FALSE;
+        }
     }
     *func = atoi(p);
     free(s);
@@ -333,9 +335,10 @@ xf86ComparePciBusString(const char *busID, int bus, int device, int func)
     int ibus, idevice, ifunc;
 
     if (xf86ParsePciBusString(busID, &ibus, &idevice, &ifunc)) {
-	return bus == ibus && device == idevice && func == ifunc;
-    } else {
-	return FALSE;
+        return bus == ibus && device == idevice && func == ifunc;
+    }
+    else {
+        return FALSE;
     }
 }
 
@@ -343,7 +346,7 @@ xf86ComparePciBusString(const char *busID, int bus, int device, int func)
  * xf86IsPrimaryPci() -- return TRUE if primary device
  * is PCI and bus, dev and func numbers match.
  */
- 
+
 Bool
 xf86IsPrimaryPci(struct pci_device *pPci)
 {
@@ -357,9 +360,9 @@ struct pci_device *
 xf86GetPciInfoForEntity(int entityIndex)
 {
     EntityPtr p;
-    
+
     if (entityIndex >= xf86NumEntities)
-	return NULL;
+        return NULL;
 
     p = xf86Entities[entityIndex];
     return (p->bus.type == BUS_PCI) ? p->bus.id.pci : NULL;
@@ -370,13 +373,13 @@ xf86GetPciInfoForEntity(int entityIndex)
  * PCI base address register values for the given PCI device.
  */
 Bool
-xf86CheckPciMemBase( struct pci_device * pPci, memType base )
+xf86CheckPciMemBase(struct pci_device *pPci, memType base)
 {
     int i;
 
     for (i = 0; i < 6; i++)
-	if (base == pPci->regions[i].base_addr)
-	    return TRUE;
+        if (base == pPci->regions[i].base_addr)
+            return TRUE;
     return FALSE;
 }
 
@@ -390,11 +393,11 @@ xf86CheckPciSlot(const struct pci_device *d)
     int i;
 
     for (i = 0; i < xf86NumEntities; i++) {
-	const EntityPtr p = xf86Entities[i];
+        const EntityPtr p = xf86Entities[i];
 
-	if ((p->bus.type == BUS_PCI) && (p->bus.id.pci == d)) {
-	    return FALSE;
-	}
+        if ((p->bus.type == BUS_PCI) && (p->bus.id.pci == d)) {
+            return FALSE;
+        }
     }
     return TRUE;
 }
@@ -405,41 +408,41 @@ xf86CheckPciSlot(const struct pci_device *d)
 Bool
 xf86PciAddMatchingDev(DriverPtr drvp)
 {
-    const struct pci_id_match * const devices = drvp->supported_devices;
+    const struct pci_id_match *const devices = drvp->supported_devices;
     int j;
     struct pci_device *pPci;
     struct pci_device_iterator *iter;
     int numFound = 0;
 
-
     iter = pci_id_match_iterator_create(NULL);
     while ((pPci = pci_device_next(iter)) != NULL) {
-    /* Determine if this device is supported by the driver.  If it is,
-     * add it to the list of devices to configure.
-     */
-    for (j = 0 ; ! END_OF_MATCHES(devices[j]) ; j++) {
-        if ( PCI_ID_COMPARE( devices[j].vendor_id, pPci->vendor_id )
-         && PCI_ID_COMPARE( devices[j].device_id, pPci->device_id )
-         && ((devices[j].device_class_mask & pPci->device_class)
-             == devices[j].device_class) ) {
-        if (xf86CheckPciSlot(pPci)) {
-            GDevPtr pGDev = xf86AddBusDeviceToConfigure(
-                    drvp->driverName, BUS_PCI, pPci, -1);
-            if (pGDev != NULL) {
-            /* After configure pass 1, chipID and chipRev are
-             * treated as over-rides, so clobber them here.
-             */
-            pGDev->chipID = -1;
-            pGDev->chipRev = -1;
-            }
+        /* Determine if this device is supported by the driver.  If it is,
+         * add it to the list of devices to configure.
+         */
+        for (j = 0; !END_OF_MATCHES(devices[j]); j++) {
+            if (PCI_ID_COMPARE(devices[j].vendor_id, pPci->vendor_id)
+                && PCI_ID_COMPARE(devices[j].device_id, pPci->device_id)
+                && ((devices[j].device_class_mask & pPci->device_class)
+                    == devices[j].device_class)) {
+                if (xf86CheckPciSlot(pPci)) {
+                    GDevPtr pGDev =
+                        xf86AddBusDeviceToConfigure(drvp->driverName, BUS_PCI,
+                                                    pPci, -1);
+                    if (pGDev != NULL) {
+                        /* After configure pass 1, chipID and chipRev are
+                         * treated as over-rides, so clobber them here.
+                         */
+                        pGDev->chipID = -1;
+                        pGDev->chipRev = -1;
+                    }
 
-            numFound++;
-        }
+                    numFound++;
+                }
 
-        break;
+                break;
+            }
         }
     }
-    }
 
     pci_iterator_destroy(iter);
 
@@ -450,97 +453,96 @@ Bool
 xf86PciProbeDev(DriverPtr drvp)
 {
     int i, j;
-    struct pci_device * pPci;
+    struct pci_device *pPci;
     Bool foundScreen = FALSE;
-    const struct pci_id_match * const devices = drvp->supported_devices;
+    const struct pci_id_match *const devices = drvp->supported_devices;
     GDevPtr *devList;
-    const unsigned numDevs = xf86MatchDevice(drvp->driverName, & devList);
-
-    for ( i = 0 ; i < numDevs ; i++ ) {
-       struct pci_device_iterator *iter;
-       unsigned device_id;
-
-
-       /* Find the pciVideoRec associated with this device section.
-        */
-       iter = pci_id_match_iterator_create(NULL);
-       while ((pPci = pci_device_next(iter)) != NULL) {
-           if (devList[i]->busID && *devList[i]->busID) {
-               if (xf86ComparePciBusString(devList[i]->busID,
-                                           ((pPci->domain << 8)
-                                            | pPci->bus),
-                                           pPci->dev,
-                                           pPci->func)) {
-                   break;
-               }
-           }
-           else if (xf86IsPrimaryPci(pPci)) {
-               break;
-           }
-       }
-
-       pci_iterator_destroy(iter);
-
-       if (pPci == NULL) {
-           continue;
-       }
-       device_id = (devList[i]->chipID > 0)
-         ? devList[i]->chipID : pPci->device_id;
-
-
-       /* Once the pciVideoRec is found, determine if the device is supported
-        * by the driver.  If it is, probe it!
-        */
-       for ( j = 0 ; ! END_OF_MATCHES( devices[j] ) ; j++ ) {
-           if ( PCI_ID_COMPARE( devices[j].vendor_id, pPci->vendor_id )
-                && PCI_ID_COMPARE( devices[j].device_id, device_id )
+    const unsigned numDevs = xf86MatchDevice(drvp->driverName, &devList);
+
+    for (i = 0; i < numDevs; i++) {
+        struct pci_device_iterator *iter;
+        unsigned device_id;
+
+        /* Find the pciVideoRec associated with this device section.
+         */
+        iter = pci_id_match_iterator_create(NULL);
+        while ((pPci = pci_device_next(iter)) != NULL) {
+            if (devList[i]->busID && *devList[i]->busID) {
+                if (xf86ComparePciBusString(devList[i]->busID,
+                                            ((pPci->domain << 8)
+                                             | pPci->bus),
+                                            pPci->dev, pPci->func)) {
+                    break;
+                }
+            }
+            else if (xf86IsPrimaryPci(pPci)) {
+                break;
+            }
+        }
+
+        pci_iterator_destroy(iter);
+
+        if (pPci == NULL) {
+            continue;
+        }
+        device_id = (devList[i]->chipID > 0)
+            ? devList[i]->chipID : pPci->device_id;
+
+        /* Once the pciVideoRec is found, determine if the device is supported
+         * by the driver.  If it is, probe it!
+         */
+        for (j = 0; !END_OF_MATCHES(devices[j]); j++) {
+            if (PCI_ID_COMPARE(devices[j].vendor_id, pPci->vendor_id)
+                && PCI_ID_COMPARE(devices[j].device_id, device_id)
                 && ((devices[j].device_class_mask & pPci->device_class)
-                     == devices[j].device_class) ) {
-               int  entry;
-
-               /* Allow the same entity to be used more than once for
-                * devices with multiple screens per entity.  This assumes
-                * implicitly that there will be a screen == 0 instance.
-                *
-                * FIXME Need to make sure that two different drivers don't
-                * FIXME claim the same screen > 0 instance.
-                */
-               if ((devList[i]->screen == 0) && !xf86CheckPciSlot(pPci))
-                   continue;
-
-               DebugF("%s: card at %d:%d:%d is claimed by a Device section\n",
-                      drvp->driverName, pPci->bus, pPci->dev, pPci->func);
-
-               /* Allocate an entry in the lists to be returned */
-               entry = xf86ClaimPciSlot(pPci, drvp, device_id,
+                    == devices[j].device_class)) {
+                int entry;
+
+                /* Allow the same entity to be used more than once for
+                 * devices with multiple screens per entity.  This assumes
+                 * implicitly that there will be a screen == 0 instance.
+                 *
+                 * FIXME Need to make sure that two different drivers don't
+                 * FIXME claim the same screen > 0 instance.
+                 */
+                if ((devList[i]->screen == 0) && !xf86CheckPciSlot(pPci))
+                    continue;
+
+                DebugF("%s: card at %d:%d:%d is claimed by a Device section\n",
+                       drvp->driverName, pPci->bus, pPci->dev, pPci->func);
+
+                /* Allocate an entry in the lists to be returned */
+                entry = xf86ClaimPciSlot(pPci, drvp, device_id,
                                          devList[i], devList[i]->active);
 
-               if ((entry == -1) && (devList[i]->screen > 0)) {
-                   unsigned k;
-
-                   for (k = 0; k < xf86NumEntities; k++ ) {
-                       EntityPtr pEnt = xf86Entities[k];
-                       if (pEnt->bus.type != BUS_PCI)
-                           continue;
-                       if (pEnt->bus.id.pci == pPci) {
-                           entry = k;
-                           xf86AddDevToEntity(k, devList[i]);
-                           break;
-                       }
-                   }
-               }
-
-               if (entry != -1) {
-                   if ((*drvp->PciProbe)(drvp, entry, pPci,
-                                         devices[j].match_data)) {
-                       foundScreen = TRUE;
-                   } else
-                       xf86UnclaimPciSlot(pPci);
-               }
-
-               break;
-           }
-       }
+                if ((entry == -1) && (devList[i]->screen > 0)) {
+                    unsigned k;
+
+                    for (k = 0; k < xf86NumEntities; k++) {
+                        EntityPtr pEnt = xf86Entities[k];
+
+                        if (pEnt->bus.type != BUS_PCI)
+                            continue;
+                        if (pEnt->bus.id.pci == pPci) {
+                            entry = k;
+                            xf86AddDevToEntity(k, devList[i]);
+                            break;
+                        }
+                    }
+                }
+
+                if (entry != -1) {
+                    if ((*drvp->PciProbe) (drvp, entry, pPci,
+                                           devices[j].match_data)) {
+                        foundScreen = TRUE;
+                    }
+                    else
+                        xf86UnclaimPciSlot(pPci);
+                }
+
+                break;
+            }
+        }
     }
     free(devList);
 
@@ -557,7 +559,8 @@ xf86PciIsolateDevice(char *argument)
         xf86IsolateDevice.bus = PCI_BUS_NO_DOMAIN(bus);
         xf86IsolateDevice.dev = device;
         xf86IsolateDevice.func = func;
-    } else
+    }
+    else
         FatalError("Invalid isolated device specification\n");
 }
 
@@ -567,25 +570,24 @@ pciDeviceHasBars(struct pci_device *pci)
     int i;
 
     for (i = 0; i < 6; i++)
-	if (pci->regions[i].size)
-	    return TRUE;
+        if (pci->regions[i].size)
+            return TRUE;
 
     if (pci->rom_size)
-	return TRUE;
+        return TRUE;
 
     return FALSE;
 }
 
 struct Inst {
-    struct pci_device *	pci;
-    GDevPtr		dev;
-    Bool		foundHW;  /* PCIid in list of supported chipsets */
-    Bool		claimed;  /* BusID matches with a device section */
-    int 		chip;
-    int 		screen;
+    struct pci_device *pci;
+    GDevPtr dev;
+    Bool foundHW;               /* PCIid in list of supported chipsets */
+    Bool claimed;               /* BusID matches with a device section */
+    int chip;
+    int screen;
 };
 
-
 /**
  * Find set of unclaimed devices matching a given vendor ID.
  *
@@ -620,12 +622,12 @@ struct Inst {
  */
 int
 xf86MatchPciInstances(const char *driverName, int vendorID,
-		      SymTabPtr chipsets, PciChipsets *PCIchipsets,
-		      GDevPtr *devList, int numDevs, DriverPtr drvp,
-		      int **foundEntities)
+                      SymTabPtr chipsets, PciChipsets * PCIchipsets,
+                      GDevPtr * devList, int numDevs, DriverPtr drvp,
+                      int **foundEntities)
 {
-    int i,j;
-    struct pci_device * pPci;
+    int i, j;
+    struct pci_device *pPci;
     struct pci_device_iterator *iter;
     struct Inst *instances = NULL;
     int numClaimedInstances = 0;
@@ -637,7 +639,6 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
 
     *foundEntities = NULL;
 
-
     /* Each PCI device will contribute at least one entry.  Each device
      * section can contribute at most one entry.  The sum of the two is
      * guaranteed to be larger than the maximum possible number of entries.
@@ -645,199 +646,199 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
      * need for realloc calls inside the loop.
      */
     if (!(xf86DoConfigure && xf86DoConfigurePass1)) {
-	unsigned max_entries = numDevs;
+        unsigned max_entries = numDevs;
 
-	iter = pci_slot_match_iterator_create(NULL);
-	while ((pPci = pci_device_next(iter)) != NULL) {
-	    max_entries++;
-	}
+        iter = pci_slot_match_iterator_create(NULL);
+        while ((pPci = pci_device_next(iter)) != NULL) {
+            max_entries++;
+        }
 
-	pci_iterator_destroy(iter);
-	instances = xnfalloc(max_entries * sizeof(struct Inst));
+        pci_iterator_destroy(iter);
+        instances = xnfalloc(max_entries * sizeof(struct Inst));
     }
 
     iter = pci_slot_match_iterator_create(NULL);
     while ((pPci = pci_device_next(iter)) != NULL) {
-	unsigned device_class = pPci->device_class;
-	Bool foundVendor = FALSE;
-
-
-	/* Convert the pre-PCI 2.0 device class for a VGA adapter to the
-	 * 2.0 version of the same class.
-	 */
-	if ( device_class == 0x00000101 ) {
-	    device_class = 0x00030000;
-	}
-
-
-	/* Find PCI devices that match the given vendor ID.  The vendor ID is
-	 * either specified explicitly as a parameter to the function or
-	 * implicitly encoded in the high bits of id->PCIid.
-	 *
-	 * The first device with a matching vendor is recorded, even if the
-	 * device ID doesn't match.  This is done because the Device section
-	 * in the xorg.conf file can over-ride the device ID.  A matching PCI
-	 * ID might not be found now, but after the device ID over-ride is
-	 * applied there /might/ be a match.
-	 */
-	for (id = PCIchipsets; id->PCIid != -1; id++) {
-	    const unsigned vendor_id = ((id->PCIid & 0xFFFF0000) >> 16)
-		| vendorID;
-	    const unsigned device_id = (id->PCIid & 0x0000FFFF);
-	    const unsigned match_class = 0x00030000 | id->PCIid;
-
-	    if ((vendor_id == pPci->vendor_id)
-		|| ((vendorID == PCI_VENDOR_GENERIC) && (match_class == device_class))) {
-		if (!foundVendor && (instances != NULL)) {
-		    ++allocatedInstances;
-		    instances[allocatedInstances - 1].pci = pPci;
-		    instances[allocatedInstances - 1].dev = NULL;
-		    instances[allocatedInstances - 1].claimed = FALSE;
-		    instances[allocatedInstances - 1].foundHW = FALSE;
-		    instances[allocatedInstances - 1].screen = 0;
-		}
-
-		foundVendor = TRUE;
-
-		if ( (device_id == pPci->device_id)
-		     || ((vendorID == PCI_VENDOR_GENERIC)
-			 && (match_class == device_class)) ) {
-		    if ( instances != NULL ) {
-			instances[allocatedInstances - 1].foundHW = TRUE;
-			instances[allocatedInstances - 1].chip = id->numChipset;
-		    }
-
-
-		    if ( xf86DoConfigure && xf86DoConfigurePass1 ) {
-			if (xf86CheckPciSlot(pPci)) {
-			    GDevPtr pGDev =
-			      xf86AddBusDeviceToConfigure(drvp->driverName,
-							  BUS_PCI, pPci, -1);
-			    if (pGDev) {
-				/* After configure pass 1, chipID and chipRev
-				 * are treated as over-rides, so clobber them
-				 * here.
-				 */
-				pGDev->chipID = -1;
-				pGDev->chipRev = -1;
-			    }
-
-			    numFound++;
-			}
-		    }
-		    else {
-			numFound++;
-		    }
-
-		    break;
-		}
-	    }
-	}
+        unsigned device_class = pPci->device_class;
+        Bool foundVendor = FALSE;
+
+        /* Convert the pre-PCI 2.0 device class for a VGA adapter to the
+         * 2.0 version of the same class.
+         */
+        if (device_class == 0x00000101) {
+            device_class = 0x00030000;
+        }
+
+        /* Find PCI devices that match the given vendor ID.  The vendor ID is
+         * either specified explicitly as a parameter to the function or
+         * implicitly encoded in the high bits of id->PCIid.
+         *
+         * The first device with a matching vendor is recorded, even if the
+         * device ID doesn't match.  This is done because the Device section
+         * in the xorg.conf file can over-ride the device ID.  A matching PCI
+         * ID might not be found now, but after the device ID over-ride is
+         * applied there /might/ be a match.
+         */
+        for (id = PCIchipsets; id->PCIid != -1; id++) {
+            const unsigned vendor_id = ((id->PCIid & 0xFFFF0000) >> 16)
+                | vendorID;
+            const unsigned device_id = (id->PCIid & 0x0000FFFF);
+            const unsigned match_class = 0x00030000 | id->PCIid;
+
+            if ((vendor_id == pPci->vendor_id)
+                || ((vendorID == PCI_VENDOR_GENERIC) &&
+                    (match_class == device_class))) {
+                if (!foundVendor && (instances != NULL)) {
+                    ++allocatedInstances;
+                    instances[allocatedInstances - 1].pci = pPci;
+                    instances[allocatedInstances - 1].dev = NULL;
+                    instances[allocatedInstances - 1].claimed = FALSE;
+                    instances[allocatedInstances - 1].foundHW = FALSE;
+                    instances[allocatedInstances - 1].screen = 0;
+                }
+
+                foundVendor = TRUE;
+
+                if ((device_id == pPci->device_id)
+                    || ((vendorID == PCI_VENDOR_GENERIC)
+                        && (match_class == device_class))) {
+                    if (instances != NULL) {
+                        instances[allocatedInstances - 1].foundHW = TRUE;
+                        instances[allocatedInstances - 1].chip = id->numChipset;
+                    }
+
+                    if (xf86DoConfigure && xf86DoConfigurePass1) {
+                        if (xf86CheckPciSlot(pPci)) {
+                            GDevPtr pGDev =
+                                xf86AddBusDeviceToConfigure(drvp->driverName,
+                                                            BUS_PCI, pPci, -1);
+
+                            if (pGDev) {
+                                /* After configure pass 1, chipID and chipRev
+                                 * are treated as over-rides, so clobber them
+                                 * here.
+                                 */
+                                pGDev->chipID = -1;
+                                pGDev->chipRev = -1;
+                            }
+
+                            numFound++;
+                        }
+                    }
+                    else {
+                        numFound++;
+                    }
+
+                    break;
+                }
+            }
+        }
     }
 
     pci_iterator_destroy(iter);
 
-
     /* In "probe only" or "configure" mode (signaled by instances being NULL),
      * our work is done.  Return the number of detected devices.
      */
-    if ( instances == NULL ) {
-	return numFound;
+    if (instances == NULL) {
+        return numFound;
     }
 
-
     /*
      * This may be debatable, but if no PCI devices with a matching vendor
      * type is found, return zero now.  It is probably not desirable to
      * allow the config file to override this.
      */
     if (allocatedInstances <= 0) {
-	free(instances);
-	return 0;
+        free(instances);
+        return 0;
     }
 
-
     DebugF("%s instances found: %d\n", driverName, allocatedInstances);
 
-   /*
-    * Check for devices that need duplicated instances.  This is required
-    * when there is more than one screen per entity.
-    *
-    * XXX This currently doesn't work for cases where the BusID isn't
-    * specified explicitly in the config file.
-    */
+    /*
+     * Check for devices that need duplicated instances.  This is required
+     * when there is more than one screen per entity.
+     *
+     * XXX This currently doesn't work for cases where the BusID isn't
+     * specified explicitly in the config file.
+     */
 
     for (j = 0; j < numDevs; j++) {
-        if (devList[j]->screen > 0 && devList[j]->busID
-	    && *devList[j]->busID) {
-	    for (i = 0; i < allocatedInstances; i++) {
-	        pPci = instances[i].pci;
-	        if (xf86ComparePciBusString(devList[j]->busID,
-					    PCI_MAKE_BUS( pPci->domain, pPci->bus ),
-					    pPci->dev,
-					    pPci->func)) {
-		    allocatedInstances++;
-		    instances[allocatedInstances - 1] = instances[i];
-		    instances[allocatedInstances - 1].screen = devList[j]->screen;
-		    numFound++;
-		    break;
-		}
-	    }
-	}
+        if (devList[j]->screen > 0 && devList[j]->busID && *devList[j]->busID) {
+            for (i = 0; i < allocatedInstances; i++) {
+                pPci = instances[i].pci;
+                if (xf86ComparePciBusString(devList[j]->busID,
+                                            PCI_MAKE_BUS(pPci->domain,
+                                                         pPci->bus), pPci->dev,
+                                            pPci->func)) {
+                    allocatedInstances++;
+                    instances[allocatedInstances - 1] = instances[i];
+                    instances[allocatedInstances - 1].screen =
+                        devList[j]->screen;
+                    numFound++;
+                    break;
+                }
+            }
+        }
     }
 
     for (i = 0; i < allocatedInstances; i++) {
-	GDevPtr dev = NULL;
-	GDevPtr devBus = NULL;
-
-	pPci = instances[i].pci;
-	for (j = 0; j < numDevs; j++) {
-	    if (devList[j]->busID && *devList[j]->busID) {
-		if (xf86ComparePciBusString(devList[j]->busID,
-					    PCI_MAKE_BUS( pPci->domain, pPci->bus ),
-					    pPci->dev,
-					    pPci->func) &&
-		    devList[j]->screen == instances[i].screen) {
-
-		    if (devBus)
-                        xf86MsgVerb(X_WARNING,0,
-			    "%s: More than one matching Device section for "
-			    "instances\n\t(BusID: %s) found: %s\n",
-			    driverName, devList[j]->busID,
-			    devList[j]->identifier);
-		    else
-			devBus = devList[j];
-		}
-	    } else {
-		/*
-		 * if device section without BusID is found
-		 * only assign to it to the primary device.
-		 */
-		if (xf86IsPrimaryPci(pPci)) {
-		    xf86Msg(X_PROBED, "Assigning device section with no busID"
-			    " to primary device\n");
-		    if (dev || devBus)
-			xf86MsgVerb(X_WARNING, 0,
-			    "%s: More than one matching Device section "
-			    "found: %s\n", driverName, devList[j]->identifier);
-		    else
-			dev = devList[j];
-		}
-	    }
-	}
-	if (devBus) dev = devBus;  /* busID preferred */
-	if (!dev) {
-	    if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) {
-		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
-			    "for instance (BusID PCI:%u@%u:%u:%u) found\n",
-			    driverName, pPci->domain, pPci->bus, pPci->dev,
-			    pPci->func);
-	    }
-	} else {
-	    numClaimedInstances++;
-	    instances[i].claimed = TRUE;
-	    instances[i].dev = dev;
-	}
+        GDevPtr dev = NULL;
+        GDevPtr devBus = NULL;
+
+        pPci = instances[i].pci;
+        for (j = 0; j < numDevs; j++) {
+            if (devList[j]->busID && *devList[j]->busID) {
+                if (xf86ComparePciBusString(devList[j]->busID,
+                                            PCI_MAKE_BUS(pPci->domain,
+                                                         pPci->bus), pPci->dev,
+                                            pPci->func) &&
+                    devList[j]->screen == instances[i].screen) {
+
+                    if (devBus)
+                        xf86MsgVerb(X_WARNING, 0,
+                                    "%s: More than one matching Device section for "
+                                    "instances\n\t(BusID: %s) found: %s\n",
+                                    driverName, devList[j]->busID,
+                                    devList[j]->identifier);
+                    else
+                        devBus = devList[j];
+                }
+            }
+            else {
+                /*
+                 * if device section without BusID is found
+                 * only assign to it to the primary device.
+                 */
+                if (xf86IsPrimaryPci(pPci)) {
+                    xf86Msg(X_PROBED, "Assigning device section with no busID"
+                            " to primary device\n");
+                    if (dev || devBus)
+                        xf86MsgVerb(X_WARNING, 0,
+                                    "%s: More than one matching Device section "
+                                    "found: %s\n", driverName,
+                                    devList[j]->identifier);
+                    else
+                        dev = devList[j];
+                }
+            }
+        }
+        if (devBus)
+            dev = devBus;       /* busID preferred */
+        if (!dev) {
+            if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) {
+                xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+                            "for instance (BusID PCI:%u@%u:%u:%u) found\n",
+                            driverName, pPci->domain, pPci->bus, pPci->dev,
+                            pPci->func);
+            }
+        }
+        else {
+            numClaimedInstances++;
+            instances[i].claimed = TRUE;
+            instances[i].dev = dev;
+        }
     }
     DebugF("%s instances found: %d\n", driverName, numClaimedInstances);
     /*
@@ -846,78 +847,82 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
      * If chipset is not valid ignore BusSlot completely.
      */
     for (i = 0; i < allocatedInstances && numClaimedInstances > 0; i++) {
-	MessageType from = X_PROBED;
-
-	if (!instances[i].claimed) {
-	    continue;
-	}
-	if (instances[i].dev->chipset) {
-	    for (c = chipsets; c->token >= 0; c++) {
-		if (xf86NameCmp(c->name, instances[i].dev->chipset) == 0)
-		    break;
-	    }
-	    if (c->token == -1) {
-		instances[i].claimed = FALSE;
-		numClaimedInstances--;
-		xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
-			    "section \"%s\" isn't valid for this driver\n",
-			    driverName, instances[i].dev->chipset,
-			    instances[i].dev->identifier);
-	    } else {
-		instances[i].chip = c->token;
-
-		for (id = PCIchipsets; id->numChipset >= 0; id++) {
-		    if (id->numChipset == instances[i].chip)
-			break;
-		}
-		if(id->numChipset >=0){
-		    xf86Msg(X_CONFIG,"Chipset override: %s\n",
-			     instances[i].dev->chipset);
-		    from = X_CONFIG;
-		} else {
-		    instances[i].claimed = FALSE;
-		    numClaimedInstances--;
-		    xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
-				"section \"%s\" isn't a valid PCI chipset\n",
-				driverName, instances[i].dev->chipset,
-				instances[i].dev->identifier);
-		}
-	    }
-	} else if (instances[i].dev->chipID > 0) {
-	    for (id = PCIchipsets; id->numChipset >= 0; id++) {
-		if (id->PCIid == instances[i].dev->chipID)
-		    break;
-	    }
-	    if (id->numChipset == -1) {
-		instances[i].claimed = FALSE;
-		numClaimedInstances--;
-		xf86MsgVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device "
-			    "section \"%s\" isn't valid for this driver\n",
-			    driverName, instances[i].dev->chipID,
-			    instances[i].dev->identifier);
-	    } else {
-		instances[i].chip = id->numChipset;
-
-		xf86Msg( X_CONFIG,"ChipID override: 0x%04X\n",
-			 instances[i].dev->chipID);
-		from = X_CONFIG;
-	    }
-	} else if (!instances[i].foundHW) {
-	    /*
-	     * This means that there was no override and the PCI chipType
-	     * doesn't match one that is supported
-	     */
-	    instances[i].claimed = FALSE;
-	    numClaimedInstances--;
-	}
-	if (instances[i].claimed == TRUE){
-	    for (c = chipsets; c->token >= 0; c++) {
-		if (c->token == instances[i].chip)
-		    break;
-	    }
-	    xf86Msg(from,"Chipset %s found\n",
-		    c->name);
-	}
+        MessageType from = X_PROBED;
+
+        if (!instances[i].claimed) {
+            continue;
+        }
+        if (instances[i].dev->chipset) {
+            for (c = chipsets; c->token >= 0; c++) {
+                if (xf86NameCmp(c->name, instances[i].dev->chipset) == 0)
+                    break;
+            }
+            if (c->token == -1) {
+                instances[i].claimed = FALSE;
+                numClaimedInstances--;
+                xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
+                            "section \"%s\" isn't valid for this driver\n",
+                            driverName, instances[i].dev->chipset,
+                            instances[i].dev->identifier);
+            }
+            else {
+                instances[i].chip = c->token;
+
+                for (id = PCIchipsets; id->numChipset >= 0; id++) {
+                    if (id->numChipset == instances[i].chip)
+                        break;
+                }
+                if (id->numChipset >= 0) {
+                    xf86Msg(X_CONFIG, "Chipset override: %s\n",
+                            instances[i].dev->chipset);
+                    from = X_CONFIG;
+                }
+                else {
+                    instances[i].claimed = FALSE;
+                    numClaimedInstances--;
+                    xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
+                                "section \"%s\" isn't a valid PCI chipset\n",
+                                driverName, instances[i].dev->chipset,
+                                instances[i].dev->identifier);
+                }
+            }
+        }
+        else if (instances[i].dev->chipID > 0) {
+            for (id = PCIchipsets; id->numChipset >= 0; id++) {
+                if (id->PCIid == instances[i].dev->chipID)
+                    break;
+            }
+            if (id->numChipset == -1) {
+                instances[i].claimed = FALSE;
+                numClaimedInstances--;
+                xf86MsgVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device "
+                            "section \"%s\" isn't valid for this driver\n",
+                            driverName, instances[i].dev->chipID,
+                            instances[i].dev->identifier);
+            }
+            else {
+                instances[i].chip = id->numChipset;
+
+                xf86Msg(X_CONFIG, "ChipID override: 0x%04X\n",
+                        instances[i].dev->chipID);
+                from = X_CONFIG;
+            }
+        }
+        else if (!instances[i].foundHW) {
+            /*
+             * This means that there was no override and the PCI chipType
+             * doesn't match one that is supported
+             */
+            instances[i].claimed = FALSE;
+            numClaimedInstances--;
+        }
+        if (instances[i].claimed == TRUE) {
+            for (c = chipsets; c->token >= 0; c++) {
+                if (c->token == instances[i].chip)
+                    break;
+            }
+            xf86Msg(from, "Chipset %s found\n", c->name);
+        }
     }
 
     /*
@@ -926,48 +931,48 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
      */
     numFound = 0;
     for (i = 0; i < allocatedInstances && numClaimedInstances > 0; i++) {
-	if (!instances[i].claimed)
-	    continue;
-	pPci = instances[i].pci;
-
+        if (!instances[i].claimed)
+            continue;
+        pPci = instances[i].pci;
 
         /*
-	 * Allow the same entity to be used more than once for devices with
-	 * multiple screens per entity.  This assumes implicitly that there
-	 * will be a screen == 0 instance.
-	 *
-	 * XXX Need to make sure that two different drivers don't claim
-	 * the same screen > 0 instance.
-	 */
-        if (instances[i].screen == 0 && !xf86CheckPciSlot( pPci ))
-	    continue;
-
-	DebugF("%s: card at %d:%d:%d is claimed by a Device section\n",
-	       driverName, pPci->bus, pPci->dev, pPci->func);
-
-	/* Allocate an entry in the lists to be returned */
-	numFound++;
-	retEntities = xnfrealloc(retEntities, numFound * sizeof(int));
-	retEntities[numFound - 1] = xf86ClaimPciSlot( pPci, drvp,
-						      instances[i].chip,
-						      instances[i].dev,
-						      instances[i].dev->active);
+         * Allow the same entity to be used more than once for devices with
+         * multiple screens per entity.  This assumes implicitly that there
+         * will be a screen == 0 instance.
+         *
+         * XXX Need to make sure that two different drivers don't claim
+         * the same screen > 0 instance.
+         */
+        if (instances[i].screen == 0 && !xf86CheckPciSlot(pPci))
+            continue;
+
+        DebugF("%s: card at %d:%d:%d is claimed by a Device section\n",
+               driverName, pPci->bus, pPci->dev, pPci->func);
+
+        /* Allocate an entry in the lists to be returned */
+        numFound++;
+        retEntities = xnfrealloc(retEntities, numFound * sizeof(int));
+        retEntities[numFound - 1] = xf86ClaimPciSlot(pPci, drvp,
+                                                     instances[i].chip,
+                                                     instances[i].dev,
+                                                     instances[i].dev->active);
         if (retEntities[numFound - 1] == -1 && instances[i].screen > 0) {
-	    for (j = 0; j < xf86NumEntities; j++) {
-	        EntityPtr pEnt = xf86Entities[j];
-	        if (pEnt->bus.type != BUS_PCI)
-		    continue;
-	        if (pEnt->bus.id.pci == pPci) {
-		    retEntities[numFound - 1] = j;
-		    xf86AddDevToEntity(j, instances[i].dev);
-		    break;
-		}
-	    }
-	}
+            for (j = 0; j < xf86NumEntities; j++) {
+                EntityPtr pEnt = xf86Entities[j];
+
+                if (pEnt->bus.type != BUS_PCI)
+                    continue;
+                if (pEnt->bus.id.pci == pPci) {
+                    retEntities[numFound - 1] = j;
+                    xf86AddDevToEntity(j, instances[i].dev);
+                    break;
+                }
+            }
+        }
     }
     free(instances);
     if (numFound > 0) {
-	*foundEntities = retEntities;
+        *foundEntities = retEntities;
     }
 
     return numFound;
@@ -981,51 +986,52 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
  * non-NULL all static resources listed there will be registered.
  */
 static void
-xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip,
-			    EntityProc init, EntityProc enter,
-			    EntityProc leave, pointer private)
+xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets * p_chip,
+                            EntityProc init, EntityProc enter,
+                            EntityProc leave, pointer private)
 {
     ScrnInfoPtr pScrn;
 
     if ((pScrn = xf86FindScreenForEntity(pEnt->index)))
-	xf86RemoveEntityFromScreen(pScrn,pEnt->index);
+        xf86RemoveEntityFromScreen(pScrn, pEnt->index);
 
     /* shared resources are only needed when entity is active: remove */
-    xf86SetEntityFuncs(pEnt->index,init,enter,leave,private);
+    xf86SetEntityFuncs(pEnt->index, init, enter, leave, private);
 }
 
 ScrnInfoPtr
 xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
-			  PciChipsets *p_chip, void *dummy, EntityProc init,
-			  EntityProc enter, EntityProc leave, pointer private)
+                    PciChipsets * p_chip, void *dummy, EntityProc init,
+                    EntityProc enter, EntityProc leave, pointer private)
 {
     EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
-    if (!pEnt) return pScrn;
+
+    if (!pEnt)
+        return pScrn;
 
     if (!(pEnt->location.type == BUS_PCI)
-	|| !xf86GetPciInfoForEntity(entityIndex)) {
-	free(pEnt);
-	return pScrn;
+        || !xf86GetPciInfoForEntity(entityIndex)) {
+        free(pEnt);
+        return pScrn;
     }
     if (!pEnt->active) {
-	xf86ConfigPciEntityInactive(pEnt, p_chip, init,  enter,
-				    leave,  private);
-	free(pEnt);
-	return pScrn;
+        xf86ConfigPciEntityInactive(pEnt, p_chip, init, enter, leave, private);
+        free(pEnt);
+        return pScrn;
     }
 
     if (!pScrn)
-	pScrn = xf86AllocateScreen(pEnt->driver,scrnFlag);
+        pScrn = xf86AllocateScreen(pEnt->driver, scrnFlag);
     if (xf86IsEntitySharable(entityIndex)) {
         xf86SetEntityShared(entityIndex);
     }
-    xf86AddEntityToScreen(pScrn,entityIndex);
+    xf86AddEntityToScreen(pScrn, entityIndex);
     if (xf86IsEntityShared(entityIndex)) {
         return pScrn;
     }
     free(pEnt);
 
-    xf86SetEntityFuncs(entityIndex,init,enter,leave,private);
+    xf86SetEntityFuncs(entityIndex, init, enter, leave, private);
 
     return pScrn;
 }
@@ -1036,20 +1042,22 @@ xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
  */
 Bool
 xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
-                          PciChipsets *p_chip, void *dummy, EntityProc init,
+                          PciChipsets * p_chip, void *dummy, EntityProc init,
                           EntityProc enter, EntityProc leave, pointer private)
 {
     EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
-    if (!pEnt) return FALSE;
+
+    if (!pEnt)
+        return FALSE;
 
     if (!pEnt->active || !(pEnt->location.type == BUS_PCI)) {
         free(pEnt);
         return FALSE;
     }
-    xf86AddEntityToScreen(pScrn,entityIndex);
+    xf86AddEntityToScreen(pScrn, entityIndex);
 
     free(pEnt);
-    if (!xf86SetEntityFuncs(entityIndex,init,enter,leave,private))
+    if (!xf86SetEntityFuncs(entityIndex, init, enter, leave, private))
         return FALSE;
 
     return TRUE;
@@ -1057,106 +1065,165 @@ xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
 
 static int
 videoPtrToDriverList(struct pci_device *dev,
-		     char *returnList[], int returnListMax)
+                     char *returnList[], int returnListMax)
 {
     int i;
+
     /* Add more entries here if we ever return more than 4 drivers for
        any device */
     const char *driverList[5] = { NULL, NULL, NULL, NULL, NULL };
 
-    switch (dev->vendor_id)
+    switch (dev->vendor_id) {
+        /* AMD Geode LX */
+    case 0x1022:
+        if (dev->device_id == 0x2081)
+            driverList[0] = "geode";
+        break;
+        /* older Geode products acquired by AMD still carry an NSC vendor_id */
+    case 0x100b:
+        if (dev->device_id == 0x0030) {
+            /* NSC Geode GX2 specifically */
+            driverList[0] = "geode";
+            /* GX2 support started its life in the NSC tree and was later
+               forked by AMD for GEODE so we keep it as a backup */
+            driverList[1] = "nsc";
+        }
+        else
+            /* other NSC variant e.g. 0x0104 (SC1400), 0x0504 (SCx200) */
+            driverList[0] = "nsc";
+        break;
+        /* Cyrix Geode GX1 */
+    case 0x1078:
+        if (dev->device_id == 0x0104)
+            driverList[0] = "cyrix";
+        break;
+    case 0x1142:
+        driverList[0] = "apm";
+        break;
+    case 0xedd8:
+        driverList[0] = "ark";
+        break;
+    case 0x1a03:
+        driverList[0] = "ast";
+        break;
+    case 0x1002:
+        driverList[0] = "ati";
+        break;
+    case 0x102c:
+        driverList[0] = "chips";
+        break;
+    case 0x1013:
+        driverList[0] = "cirrus";
+        break;
+    case 0x3d3d:
+        driverList[0] = "glint";
+        break;
+    case 0x105d:
+        driverList[0] = "i128";
+        break;
+    case 0x8086:
+        if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
+            driverList[0] = "i740";
+        }
+        else if (dev->device_id == 0x8108) {
+            break;              /* "hooray" for poulsbo */
+        }
+        else {
+            driverList[0] = "intel";
+        }
+        break;
+    case 0x102b:
+        driverList[0] = "mga";
+        break;
+    case 0x10c8:
+        driverList[0] = "neomagic";
+        break;
+    case 0x10de:
+    case 0x12d2:
     {
-	/* AMD Geode LX */
-	case 0x1022:
-	    if (dev->device_id == 0x2081)
-		driverList[0] = "geode";
-	    break;
-	/* older Geode products acquired by AMD still carry an NSC vendor_id */
-	case 0x100b:
-	    if (dev->device_id == 0x0030) {
-		/* NSC Geode GX2 specifically */
-		driverList[0] = "geode";
-		/* GX2 support started its life in the NSC tree and was later
-		   forked by AMD for GEODE so we keep it as a backup */
-		driverList[1] = "nsc";
-	    } else
-		/* other NSC variant e.g. 0x0104 (SC1400), 0x0504 (SCx200) */
-		driverList[0] = "nsc";
-	    break;
-	/* Cyrix Geode GX1 */
-	case 0x1078:
-	    if (dev->device_id == 0x0104)
-		driverList[0] = "cyrix";
-	    break;
-	case 0x1142:		    driverList[0] = "apm"; break;
-	case 0xedd8:		    driverList[0] = "ark"; break;
-	case 0x1a03:		    driverList[0] = "ast"; break;
-	case 0x1002:		    driverList[0] = "ati"; break;
-	case 0x102c:		    driverList[0] = "chips"; break;
-	case 0x1013:		    driverList[0] = "cirrus"; break;
-	case 0x3d3d:		    driverList[0] = "glint"; break;
-	case 0x105d:		    driverList[0] = "i128"; break;
-	case 0x8086:
-	    if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
-		driverList[0] = "i740";
-            } else if (dev->device_id == 0x8108) {
-                break; /* "hooray" for poulsbo */
-	    } else {
-		driverList[0] = "intel";
-	    }
-	    break;
-	case 0x102b:		    driverList[0] = "mga";	break;
-	case 0x10c8:		    driverList[0] = "neomagic"; break;
-	case 0x10de: case 0x12d2:
-	{
-	    int idx = 0;
+        int idx = 0;
+
 #ifdef __linux__
-	    driverList[idx++] = "nouveau";
+        driverList[idx++] = "nouveau";
 #endif
-	    driverList[idx++] = "nv";
-	    break;
-	}
-	case 0x1106:		    driverList[0] = "openchrome"; break;
-        case 0x1b36:		    driverList[0] = "qxl"; break;
-	case 0x1163:		    driverList[0] = "rendition"; break;
-	case 0x5333:
-	    switch (dev->device_id)
-	    {
-		case 0x88d0: case 0x88d1: case 0x88f0: case 0x8811:
-		case 0x8812: case 0x8814: case 0x8901:
-		    driverList[0] = "s3"; break;
-		case 0x5631: case 0x883d: case 0x8a01: case 0x8a10:
-		case 0x8c01: case 0x8c03: case 0x8904: case 0x8a13:
-		    driverList[0] = "s3virge"; break;
-		default:
-		    driverList[0] = "savage"; break;
-	    }
-	    break;
-	case 0x1039:		    driverList[0] = "sis";	break;
-	case 0x126f:		    driverList[0] = "siliconmotion"; break;
-	case 0x121a:
-	    if (dev->device_id < 0x0003)
-	        driverList[0] = "voodoo";
-	    else
-	        driverList[0] = "tdfx";
-	    break;
-	case 0x1011:		    driverList[0] = "tga"; break;
-	case 0x1023:		    driverList[0] = "trident"; break;
-	case 0x100c:		    driverList[0] = "tseng"; break;
-	case 0x80ee:		    driverList[0] = "vboxvideo"; break;
-	case 0x15ad:		    driverList[0] = "vmware"; break;
-	case 0x18ca:
-	    if (dev->device_id == 0x47)
-		driverList[0] = "xgixp";
-	    else
-		driverList[0] = "xgi";
-	    break;
-	default: break;
+        driverList[idx++] = "nv";
+        break;
+    }
+    case 0x1106:
+        driverList[0] = "openchrome";
+        break;
+    case 0x1b36:
+        driverList[0] = "qxl";
+        break;
+    case 0x1163:
+        driverList[0] = "rendition";
+        break;
+    case 0x5333:
+        switch (dev->device_id) {
+        case 0x88d0:
+        case 0x88d1:
+        case 0x88f0:
+        case 0x8811:
+        case 0x8812:
+        case 0x8814:
+        case 0x8901:
+            driverList[0] = "s3";
+            break;
+        case 0x5631:
+        case 0x883d:
+        case 0x8a01:
+        case 0x8a10:
+        case 0x8c01:
+        case 0x8c03:
+        case 0x8904:
+        case 0x8a13:
+            driverList[0] = "s3virge";
+            break;
+        default:
+            driverList[0] = "savage";
+            break;
+        }
+        break;
+    case 0x1039:
+        driverList[0] = "sis";
+        break;
+    case 0x126f:
+        driverList[0] = "siliconmotion";
+        break;
+    case 0x121a:
+        if (dev->device_id < 0x0003)
+            driverList[0] = "voodoo";
+        else
+            driverList[0] = "tdfx";
+        break;
+    case 0x1011:
+        driverList[0] = "tga";
+        break;
+    case 0x1023:
+        driverList[0] = "trident";
+        break;
+    case 0x100c:
+        driverList[0] = "tseng";
+        break;
+    case 0x80ee:
+        driverList[0] = "vboxvideo";
+        break;
+    case 0x15ad:
+        driverList[0] = "vmware";
+        break;
+    case 0x18ca:
+        if (dev->device_id == 0x47)
+            driverList[0] = "xgixp";
+        else
+            driverList[0] = "xgi";
+        break;
+    default:
+        break;
     }
     for (i = 0; (i < returnListMax) && (driverList[i] != NULL); i++) {
-	returnList[i] = xnfstrdup(driverList[i]);
+        returnList[i] = xnfstrdup(driverList[i]);
     }
-    return i;	/* Number of entries added */
+    return i;                   /* Number of entries added */
 }
 
 #ifdef __linux__
@@ -1181,7 +1248,7 @@ xchomp(char *line)
  * feature it can and should be removed because the symbol-based resolution
  * scheme should be the primary one */
 static void
-matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip)
+matchDriverFromFiles(char **matches, uint16_t match_vendor, uint16_t match_chip)
 {
     DIR *idsdir;
     FILE *fp;
@@ -1197,7 +1264,9 @@ matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip
     if (!idsdir)
         return;
 
-    xf86Msg(X_INFO, "Scanning %s directory for additional PCI ID's supported by the drivers\n", PCI_TXT_IDS_PATH);
+    xf86Msg(X_INFO,
+            "Scanning %s directory for additional PCI ID's supported by the drivers\n",
+            PCI_TXT_IDS_PATH);
     direntry = readdir(idsdir);
     /* Read the directory */
     while (direntry) {
@@ -1207,63 +1276,72 @@ matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip
         }
         len = strlen(direntry->d_name);
         /* A tiny bit of sanity checking. We should probably do better */
-        if (strncmp(&(direntry->d_name[len-4]), ".ids", 4) == 0) {
+        if (strncmp(&(direntry->d_name[len - 4]), ".ids", 4) == 0) {
             /* We need the full path name to open the file */
             snprintf(path_name, sizeof(path_name), "%s/%s",
                      PCI_TXT_IDS_PATH, direntry->d_name);
             fp = fopen(path_name, "r");
             if (fp == NULL) {
-                xf86Msg(X_ERROR, "Could not open %s for reading. Exiting.\n", path_name);
+                xf86Msg(X_ERROR, "Could not open %s for reading. Exiting.\n",
+                        path_name);
                 goto end;
             }
             /* Read the file */
 #ifdef __GLIBC__
             while ((read = getline(&line, &len, fp)) != -1) {
 #else
-            while ((line = fgetln(fp, &len)) != (char *)NULL) {
-#endif /* __GLIBC __ */
+            while ((line = fgetln(fp, &len)) != (char *) NULL) {
+#endif                          /* __GLIBC __ */
                 xchomp(line);
                 if (isdigit(line[0])) {
                     strlcpy(vendor_str, line, sizeof(vendor_str));
-                    vendor = (int)strtol(vendor_str, NULL, 16);
+                    vendor = (int) strtol(vendor_str, NULL, 16);
                     if ((strlen(&line[4])) == 0) {
                         chip_str[0] = '\0';
                         chip = -1;
-                    } else {
+                    }
+                    else {
                         /* Handle trailing whitespace */
                         if (isspace(line[4])) {
                             chip_str[0] = '\0';
                             chip = -1;
-                        } else {
+                        }
+                        else {
                             /* Ok, it's a real ID */
                             strlcpy(chip_str, &line[4], sizeof(chip_str));
-                            chip = (int)strtol(chip_str, NULL, 16);
+                            chip = (int) strtol(chip_str, NULL, 16);
                         }
                     }
-                    if (vendor == match_vendor && chip == match_chip ) {
+                    if (vendor == match_vendor && chip == match_chip) {
                         i = 0;
                         while (matches[i]) {
                             i++;
                         }
-                        matches[i] = (char*)malloc(sizeof(char) * strlen(direntry->d_name) -  3);
+                        matches[i] =
+                            (char *) malloc(sizeof(char) *
+                                            strlen(direntry->d_name) - 3);
                         if (!matches[i]) {
-                            xf86Msg(X_ERROR, "Could not allocate space for the module name. Exiting.\n");
+                            xf86Msg(X_ERROR,
+                                    "Could not allocate space for the module name. Exiting.\n");
                             goto end;
                         }
                         /* hack off the .ids suffix. This should guard
                          * against other problems, but it will end up
                          * taking off anything after the first '.' */
-                        for (j = 0; j < (strlen(direntry->d_name) - 3) ; j++) {
+                        for (j = 0; j < (strlen(direntry->d_name) - 3); j++) {
                             if (direntry->d_name[j] == '.') {
                                 matches[i][j] = '\0';
                                 break;
-                            } else {
+                            }
+                            else {
                                 matches[i][j] = direntry->d_name[j];
                             }
                         }
-                        xf86Msg(X_INFO, "Matched %s from file name %s\n", matches[i], direntry->d_name);
+                        xf86Msg(X_INFO, "Matched %s from file name %s\n",
+                                matches[i], direntry->d_name);
                     }
-                } else {
+                }
+                else {
                     /* TODO Handle driver overrides here */
                 }
             }
@@ -1275,38 +1353,39 @@ matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip
     free(line);
     closedir(idsdir);
 }
-#endif /* __linux__ */
+#endif                          /* __linux__ */
 
 /**
  *  @return The numbers of found devices that match with the current system
  *  drivers.
  */
 int
-xf86PciMatchDriver(char* matches[], int nmatches) {
+xf86PciMatchDriver(char *matches[], int nmatches)
+{
     int i;
-    struct pci_device * info = NULL;
+    struct pci_device *info = NULL;
     struct pci_device_iterator *iter;
 
     /* Find the primary device, and get some information about it. */
     iter = pci_slot_match_iterator_create(NULL);
     while ((info = pci_device_next(iter)) != NULL) {
-	if (xf86IsPrimaryPci(info)) {
-	    break;
-	}
+        if (xf86IsPrimaryPci(info)) {
+            break;
+        }
     }
 
     pci_iterator_destroy(iter);
 #ifdef __linux__
     if (info)
-	matchDriverFromFiles(matches, info->vendor_id, info->device_id);
+        matchDriverFromFiles(matches, info->vendor_id, info->device_id);
 #endif
 
     for (i = 0; (i < nmatches) && (matches[i]); i++) {
-	/* find end of matches list */
+        /* find end of matches list */
     }
 
     if ((info != NULL) && (i < nmatches)) {
-	i += videoPtrToDriverList(info, &(matches[i]), nmatches - i);
+        i += videoPtrToDriverList(info, &(matches[i]), nmatches - i);
     }
 
     return i;
@@ -1315,14 +1394,13 @@ xf86PciMatchDriver(char* matches[], int nmatches) {
 Bool
 xf86PciConfigure(void *busData, struct pci_device *pDev)
 {
-    struct pci_device * pVideo = NULL;
+    struct pci_device *pVideo = NULL;
 
     pVideo = (struct pci_device *) busData;
     if (pDev &&
         (pDev->domain == pVideo->domain) &&
         (pDev->bus == pVideo->bus) &&
-        (pDev->dev == pVideo->dev) &&
-        (pDev->func == pVideo->func))
+        (pDev->dev == pVideo->dev) && (pDev->func == pVideo->func))
         return 0;
 
     return 1;
@@ -1330,20 +1408,20 @@ xf86PciConfigure(void *busData, struct pci_device *pDev)
 
 void
 xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
-                         GDevRec *GDev, int *chipset)
+                       GDevRec * GDev, int *chipset)
 {
     char busnum[8];
 
     pVideo = (struct pci_device *) busData;
 
     if (pVideo->bus < 256)
-	snprintf(busnum, sizeof(busnum), "%d", pVideo->bus);
+        snprintf(busnum, sizeof(busnum), "%d", pVideo->bus);
     else
-	snprintf(busnum, sizeof(busnum), "%d@%d",
-		 pVideo->bus & 0x00ff, pVideo->bus >> 8);
+        snprintf(busnum, sizeof(busnum), "%d@%d",
+                 pVideo->bus & 0x00ff, pVideo->bus >> 8);
 
     XNFasprintf(&GDev->busID, "PCI:%s:%d:%d",
-		busnum, pVideo->dev, pVideo->func);
+                busnum, pVideo->dev, pVideo->func);
 
     GDev->chipID = pVideo->device_id;
     GDev->chipRev = pVideo->revision;
diff --git a/xorg-server/hw/xfree86/common/xf86sbusBus.c b/xorg-server/hw/xfree86/common/xf86sbusBus.c
index b7bb913fe..c993b603c 100644
--- a/xorg-server/hw/xfree86/common/xf86sbusBus.c
+++ b/xorg-server/hw/xfree86/common/xf86sbusBus.c
@@ -53,23 +53,24 @@ CheckSbusDevice(const char *device, int fbNum)
 
     fd = open(device, O_RDONLY, 0);
     if (fd < 0)
-	return;
+        return;
     memset(&fbattr, 0, sizeof(fbattr));
     if (ioctl(fd, FBIOGATTR, &fbattr) < 0) {
-	if (ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0) {
-	    close(fd);
-	    return;
-	}
+        if (ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0) {
+            close(fd);
+            return;
+        }
     }
     close(fd);
     for (i = 0; sbusDeviceTable[i].devId; i++)
-	if (sbusDeviceTable[i].fbType == fbattr.fbtype.fb_type)
-	    break;
-    if (! sbusDeviceTable[i].devId)
-	return;
-    xf86SbusInfo = xnfrealloc(xf86SbusInfo, sizeof(psdp) * (++xf86nSbusInfo + 1));
+        if (sbusDeviceTable[i].fbType == fbattr.fbtype.fb_type)
+            break;
+    if (!sbusDeviceTable[i].devId)
+        return;
+    xf86SbusInfo =
+        xnfrealloc(xf86SbusInfo, sizeof(psdp) * (++xf86nSbusInfo + 1));
     xf86SbusInfo[xf86nSbusInfo] = NULL;
-    xf86SbusInfo[xf86nSbusInfo - 1] = psdp = xnfcalloc(sizeof (sbusDevice), 1);
+    xf86SbusInfo[xf86nSbusInfo - 1] = psdp = xnfcalloc(sizeof(sbusDevice), 1);
     psdp->devId = sbusDeviceTable[i].devId;
     psdp->fbNum = fbNum;
     psdp->device = xnfstrdup(device);
@@ -88,136 +89,154 @@ xf86SbusProbe(void)
     xf86SbusInfo = malloc(sizeof(psdp));
     *xf86SbusInfo = NULL;
     for (i = 0; i < 32; i++) {
-	snprintf(fbDevName, sizeof(fbDevName), "/dev/fb%d", i);
-	CheckSbusDevice(fbDevName, i);
+        snprintf(fbDevName, sizeof(fbDevName), "/dev/fb%d", i);
+        CheckSbusDevice(fbDevName, i);
     }
     if (sparcPromInit() >= 0) {
-	useProm = 1;
-	sparcPromAssignNodes();
+        useProm = 1;
+        sparcPromAssignNodes();
     }
     for (psdpp = xf86SbusInfo; (psdp = *psdpp); psdpp++) {
-	for (i = 0; sbusDeviceTable[i].devId; i++)
-	    if (sbusDeviceTable[i].devId == psdp->devId)
-		psdp->descr = sbusDeviceTable[i].descr;
-	/*
-	 * If we can use PROM information and found the PROM node for this
-	 * device, we can tell more about the card.
-	 */
-	if (useProm && psdp->node.node) {
-	    char *prop, *promPath;
-	    int len, chiprev, vmsize;
-
-	    switch (psdp->devId) {
-	    case SBUS_DEVICE_MGX:
-		prop = sparcPromGetProperty(&psdp->node, "fb_size", &len);
-		if (prop && len == 4 && *(int *)prop == 0x400000)
-		    psdp->descr = "Quantum 3D MGXplus with 4M VRAM";
-		break;
-	    case SBUS_DEVICE_CG6:
-		chiprev = 0;
-		vmsize = 0;
-		prop = sparcPromGetProperty(&psdp->node, "chiprev", &len);
-		if (prop && len == 4)
-		    chiprev = *(int *)prop;
-		prop = sparcPromGetProperty(&psdp->node, "vmsize", &len);
-		if (prop && len == 4)
-		    vmsize = *(int *)prop;
-		switch (chiprev) {
-		case 1:
-		case 2:
-		case 3:
-		case 4:
-		    psdp->descr = "Sun Double width GX"; break;
-		case 5:
-		case 6:
-		case 7:
-		case 8:
-		case 9:
-		    psdp->descr = "Sun Single width GX"; break;
-		case 11:
-		    switch (vmsize) {
-		    case 2:
-			psdp->descr = "Sun Turbo GX with 1M VSIMM"; break;
-		    case 4:
-			psdp->descr = "Sun Turbo GX Plus"; break;
-		    default:
-			psdp->descr = "Sun Turbo GX"; break;
-		    }
-		}
-		break;
-	    case SBUS_DEVICE_CG14:
-		prop = sparcPromGetProperty(&psdp->node, "reg", &len);
-		vmsize = 0;
-		if (prop && !(len % 12) && len > 0)
-		    vmsize = *(int *)(prop + len - 4);
-		switch (vmsize) {
-		case 0x400000:
-		    psdp->descr = "Sun SX with 4M VSIMM"; break;
-		case 0x800000:
-		    psdp->descr = "Sun SX with 8M VSIMM"; break;
-		}
-		break;
-	    case SBUS_DEVICE_LEO:
-		prop = sparcPromGetProperty(&psdp->node, "model", &len);
-		if (prop && len > 0 && !strstr(prop, "501-2503"))
-		    psdp->descr = "Sun Turbo ZX";
-		break;
-	    case SBUS_DEVICE_TCX:
-		if (sparcPromGetBool(&psdp->node, "tcx-8-bit"))
-		    psdp->descr = "Sun TCX (8bit)";
-		else
-		    psdp->descr = "Sun TCX (S24)";
-		break;
-	    case SBUS_DEVICE_FFB:
-		prop = sparcPromGetProperty(&psdp->node, "name", &len);
-		chiprev = 0;
-		prop = sparcPromGetProperty(&psdp->node, "board_type", &len);
-		if (prop && len == 4)
-		    chiprev = *(int *)prop;
-		if (strstr (prop, "afb")) {
-		    if (chiprev == 3)
-			psdp->descr = "Sun|Elite3D-M6 Horizontal";
-		} else {
-		    switch (chiprev) {
-		    case 0x08:
-			psdp->descr = "Sun FFB 67MHz Creator"; break;
-		    case 0x0b:
-			psdp->descr = "Sun FFB 67MHz Creator 3D"; break;
-		    case 0x1b:
-			psdp->descr = "Sun FFB 75MHz Creator 3D"; break;
-		    case 0x20:
-		    case 0x28:
-			psdp->descr = "Sun FFB2 Vertical Creator"; break;
-		    case 0x23:
-		    case 0x2b:
-			psdp->descr = "Sun FFB2 Vertical Creator 3D"; break;
-		    case 0x30:
-			psdp->descr = "Sun FFB2+ Vertical Creator"; break;
-		    case 0x33:
-			psdp->descr = "Sun FFB2+ Vertical Creator 3D"; break;
-		    case 0x40:
-		    case 0x48:
-			psdp->descr = "Sun FFB2 Horizontal Creator"; break;
-		    case 0x43:
-		    case 0x4b:
-			psdp->descr = "Sun FFB2 Horizontal Creator 3D"; break;
-		    }
-		}
-		break;
-	    }
-
-	    xf86Msg(X_PROBED, "SBUS:(0x%08x) %s", psdp->node.node, psdp->descr);
-	    promPath = sparcPromNode2Pathname (&psdp->node);
-	    if (promPath) {
-		xf86ErrorF(" at %s", promPath);
-		free(promPath);
-	    }
-	} else
-	    xf86Msg(X_PROBED, "SBUS: %s", psdp->descr);
-	xf86ErrorF("\n");
+        for (i = 0; sbusDeviceTable[i].devId; i++)
+            if (sbusDeviceTable[i].devId == psdp->devId)
+                psdp->descr = sbusDeviceTable[i].descr;
+        /*
+         * If we can use PROM information and found the PROM node for this
+         * device, we can tell more about the card.
+         */
+        if (useProm && psdp->node.node) {
+            char *prop, *promPath;
+            int len, chiprev, vmsize;
+
+            switch (psdp->devId) {
+            case SBUS_DEVICE_MGX:
+                prop = sparcPromGetProperty(&psdp->node, "fb_size", &len);
+                if (prop && len == 4 && *(int *) prop == 0x400000)
+                    psdp->descr = "Quantum 3D MGXplus with 4M VRAM";
+                break;
+            case SBUS_DEVICE_CG6:
+                chiprev = 0;
+                vmsize = 0;
+                prop = sparcPromGetProperty(&psdp->node, "chiprev", &len);
+                if (prop && len == 4)
+                    chiprev = *(int *) prop;
+                prop = sparcPromGetProperty(&psdp->node, "vmsize", &len);
+                if (prop && len == 4)
+                    vmsize = *(int *) prop;
+                switch (chiprev) {
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                    psdp->descr = "Sun Double width GX";
+                    break;
+                case 5:
+                case 6:
+                case 7:
+                case 8:
+                case 9:
+                    psdp->descr = "Sun Single width GX";
+                    break;
+                case 11:
+                    switch (vmsize) {
+                    case 2:
+                        psdp->descr = "Sun Turbo GX with 1M VSIMM";
+                        break;
+                    case 4:
+                        psdp->descr = "Sun Turbo GX Plus";
+                        break;
+                    default:
+                        psdp->descr = "Sun Turbo GX";
+                        break;
+                    }
+                }
+                break;
+            case SBUS_DEVICE_CG14:
+                prop = sparcPromGetProperty(&psdp->node, "reg", &len);
+                vmsize = 0;
+                if (prop && !(len % 12) && len > 0)
+                    vmsize = *(int *) (prop + len - 4);
+                switch (vmsize) {
+                case 0x400000:
+                    psdp->descr = "Sun SX with 4M VSIMM";
+                    break;
+                case 0x800000:
+                    psdp->descr = "Sun SX with 8M VSIMM";
+                    break;
+                }
+                break;
+            case SBUS_DEVICE_LEO:
+                prop = sparcPromGetProperty(&psdp->node, "model", &len);
+                if (prop && len > 0 && !strstr(prop, "501-2503"))
+                    psdp->descr = "Sun Turbo ZX";
+                break;
+            case SBUS_DEVICE_TCX:
+                if (sparcPromGetBool(&psdp->node, "tcx-8-bit"))
+                    psdp->descr = "Sun TCX (8bit)";
+                else
+                    psdp->descr = "Sun TCX (S24)";
+                break;
+            case SBUS_DEVICE_FFB:
+                prop = sparcPromGetProperty(&psdp->node, "name", &len);
+                chiprev = 0;
+                prop = sparcPromGetProperty(&psdp->node, "board_type", &len);
+                if (prop && len == 4)
+                    chiprev = *(int *) prop;
+                if (strstr(prop, "afb")) {
+                    if (chiprev == 3)
+                        psdp->descr = "Sun|Elite3D-M6 Horizontal";
+                }
+                else {
+                    switch (chiprev) {
+                    case 0x08:
+                        psdp->descr = "Sun FFB 67MHz Creator";
+                        break;
+                    case 0x0b:
+                        psdp->descr = "Sun FFB 67MHz Creator 3D";
+                        break;
+                    case 0x1b:
+                        psdp->descr = "Sun FFB 75MHz Creator 3D";
+                        break;
+                    case 0x20:
+                    case 0x28:
+                        psdp->descr = "Sun FFB2 Vertical Creator";
+                        break;
+                    case 0x23:
+                    case 0x2b:
+                        psdp->descr = "Sun FFB2 Vertical Creator 3D";
+                        break;
+                    case 0x30:
+                        psdp->descr = "Sun FFB2+ Vertical Creator";
+                        break;
+                    case 0x33:
+                        psdp->descr = "Sun FFB2+ Vertical Creator 3D";
+                        break;
+                    case 0x40:
+                    case 0x48:
+                        psdp->descr = "Sun FFB2 Horizontal Creator";
+                        break;
+                    case 0x43:
+                    case 0x4b:
+                        psdp->descr = "Sun FFB2 Horizontal Creator 3D";
+                        break;
+                    }
+                }
+                break;
+            }
+
+            xf86Msg(X_PROBED, "SBUS:(0x%08x) %s", psdp->node.node, psdp->descr);
+            promPath = sparcPromNode2Pathname(&psdp->node);
+            if (promPath) {
+                xf86ErrorF(" at %s", promPath);
+                free(promPath);
+            }
+        }
+        else
+            xf86Msg(X_PROBED, "SBUS: %s", psdp->descr);
+        xf86ErrorF("\n");
     }
     if (useProm)
-	sparcPromClose();
+        sparcPromClose();
 }
 
 /*
@@ -240,52 +259,55 @@ xf86ParseSbusBusString(const char *busID, int *fbNum)
     int i, len;
 
     if (StringToBusType(busID, &id) != BUS_SBUS)
-	return FALSE;
+        return FALSE;
 
     if (*id != '/') {
-	if (!strncmp (id, "fb", 2)) {
-	    if (!isdigit(id[2]))
-		return FALSE;
-	    *fbNum = atoi(id + 2);
-	    return TRUE;
-	} else {
-	    sbusDevicePtr *psdpp;
-	    int devId;
-
-	    for (i = 0, len = 0; sbusDeviceTable[i].devId; i++) {
-		len = strlen(sbusDeviceTable[i].promName);
-		if (!strncmp (sbusDeviceTable[i].promName, id, len)
-		    && isdigit(id[len]))
-		    break;
-	    }
-	    devId = sbusDeviceTable[i].devId;
-	    if (!devId) return FALSE;
-	    i = atoi(id + len);
-	    for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
-		if ((*psdpp)->devId != devId)
-		    continue;
-		if (!i) {
-		    *fbNum = (*psdpp)->fbNum;
-		    return TRUE;
-		}
-		i--;
-	    }
-	}
-	return FALSE;
+        if (!strncmp(id, "fb", 2)) {
+            if (!isdigit(id[2]))
+                return FALSE;
+            *fbNum = atoi(id + 2);
+            return TRUE;
+        }
+        else {
+            sbusDevicePtr *psdpp;
+            int devId;
+
+            for (i = 0, len = 0; sbusDeviceTable[i].devId; i++) {
+                len = strlen(sbusDeviceTable[i].promName);
+                if (!strncmp(sbusDeviceTable[i].promName, id, len)
+                    && isdigit(id[len]))
+                    break;
+            }
+            devId = sbusDeviceTable[i].devId;
+            if (!devId)
+                return FALSE;
+            i = atoi(id + len);
+            for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
+                if ((*psdpp)->devId != devId)
+                    continue;
+                if (!i) {
+                    *fbNum = (*psdpp)->fbNum;
+                    return TRUE;
+                }
+                i--;
+            }
+        }
+        return FALSE;
     }
 
     if (sparcPromInit() >= 0) {
-	i = sparcPromPathname2Node(id);
-	sparcPromClose();
-	if (i) {
-	    sbusDevicePtr *psdpp;
-	    for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
-		if ((*psdpp)->node.node == i) {
-		    *fbNum = (*psdpp)->fbNum;
-		    return TRUE;
-		}
-	    }
-	}
+        i = sparcPromPathname2Node(id);
+        sparcPromClose();
+        if (i) {
+            sbusDevicePtr *psdpp;
+
+            for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
+                if ((*psdpp)->node.node == i) {
+                    *fbNum = (*psdpp)->fbNum;
+                    return TRUE;
+                }
+            }
+        }
     }
     return FALSE;
 }
@@ -300,9 +322,10 @@ xf86CompareSbusBusString(const char *busID, int fbNum)
     int iFbNum;
 
     if (xf86ParseSbusBusString(busID, &iFbNum)) {
-	return fbNum == iFbNum;
-    } else {
-	return FALSE;
+        return fbNum == iFbNum;
+    }
+    else {
+        return FALSE;
     }
 }
 
@@ -317,10 +340,10 @@ xf86CheckSbusSlot(int fbNum)
     EntityPtr p;
 
     for (i = 0; i < xf86NumEntities; i++) {
-	p = xf86Entities[i];
-	/* Check if this SBUS slot is taken */
-	if (p->bus.type == BUS_SBUS && p->bus.id.sbus.fbNum == fbNum)
-	    return FALSE;
+        p = xf86Entities[i];
+        /* Check if this SBUS slot is taken */
+        if (p->bus.type == BUS_SBUS && p->bus.id.sbus.fbNum == fbNum)
+            return FALSE;
     }
 
     return TRUE;
@@ -332,8 +355,7 @@ xf86CheckSbusSlot(int fbNum)
  */
 
 int
-xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp,
-		  GDevPtr dev, Bool active)
+xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp, GDevPtr dev, Bool active)
 {
     EntityPtr p = NULL;
 
@@ -349,18 +371,19 @@ xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp,
         p->bus.id.sbus.fbNum = psdp->fbNum;
         p->active = active;
         p->inUse = FALSE;
-	sbusSlotClaimed = TRUE;
-	return num;
-    } else
-	return -1;
+        sbusSlotClaimed = TRUE;
+        return num;
+    }
+    else
+        return -1;
 }
 
 int
-xf86MatchSbusInstances(const char *driverName, int sbusDevId, 
-		       GDevPtr *devList, int numDevs, DriverPtr drvp,
-		       int **foundEntities)
+xf86MatchSbusInstances(const char *driverName, int sbusDevId,
+                       GDevPtr * devList, int numDevs, DriverPtr drvp,
+                       int **foundEntities)
 {
-    int i,j;
+    int i, j;
     sbusDevicePtr psdp, *psdpp;
     int numClaimedInstances = 0;
     int allocatedInstances = 0;
@@ -371,24 +394,24 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
     int useProm = 0;
 
     struct Inst {
-	sbusDevicePtr	sbus;
-	GDevPtr		dev;
-	Bool		claimed;  /* BusID matches with a device section */
+        sbusDevicePtr sbus;
+        GDevPtr dev;
+        Bool claimed;           /* BusID matches with a device section */
     } *instances = NULL;
 
     *foundEntities = NULL;
     for (psdpp = xf86SbusInfo, psdp = *psdpp; psdp; psdp = *++psdpp) {
-	if (psdp->devId != sbusDevId)
-	    continue;
-	if (psdp->fd == -2)
-	    continue;
-	++allocatedInstances;
-	instances = xnfrealloc(instances,
-			       allocatedInstances * sizeof(struct Inst));
-	instances[allocatedInstances - 1].sbus = psdp;
-	instances[allocatedInstances - 1].dev = NULL;
-	instances[allocatedInstances - 1].claimed = FALSE;
-	numFound++;
+        if (psdp->devId != sbusDevId)
+            continue;
+        if (psdp->fd == -2)
+            continue;
+        ++allocatedInstances;
+        instances = xnfrealloc(instances,
+                               allocatedInstances * sizeof(struct Inst));
+        instances[allocatedInstances - 1].sbus = psdp;
+        instances[allocatedInstances - 1].dev = NULL;
+        instances[allocatedInstances - 1].claimed = FALSE;
+        numFound++;
     }
 
     /*
@@ -397,88 +420,97 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
      * allow the config file to override this.
      */
     if (allocatedInstances <= 0) {
-	free(instances);
-	return 0;
+        free(instances);
+        return 0;
     }
 
     if (sparcPromInit() >= 0)
-	useProm = 1;
+        useProm = 1;
 
     if (xf86DoConfigure && xf86DoConfigurePass1) {
-	GDevPtr pGDev;
-	int actualcards = 0;
-	for (i = 0; i < allocatedInstances; i++) {
-	    actualcards++;
-	    pGDev = xf86AddBusDeviceToConfigure(drvp->driverName, BUS_SBUS,
-						instances[i].sbus, -1);
-	    if (pGDev) {
-		/*
-		 * XF86Match???Instances() treat chipID and chipRev as
-		 * overrides, so clobber them here.
-		 */
-		pGDev->chipID = pGDev->chipRev = -1;
-	    }
-	}
-	free(instances);
-	if (useProm)
-	    sparcPromClose();
-	return actualcards;
+        GDevPtr pGDev;
+        int actualcards = 0;
+
+        for (i = 0; i < allocatedInstances; i++) {
+            actualcards++;
+            pGDev = xf86AddBusDeviceToConfigure(drvp->driverName, BUS_SBUS,
+                                                instances[i].sbus, -1);
+            if (pGDev) {
+                /*
+                 * XF86Match???Instances() treat chipID and chipRev as
+                 * overrides, so clobber them here.
+                 */
+                pGDev->chipID = pGDev->chipRev = -1;
+            }
+        }
+        free(instances);
+        if (useProm)
+            sparcPromClose();
+        return actualcards;
     }
 
     DebugF("%s instances found: %d\n", driverName, allocatedInstances);
 
     for (i = 0; i < allocatedInstances; i++) {
-	char *promPath = NULL;
-
-	psdp = instances[i].sbus;
-	devBus = NULL;
-	dev = NULL;
-	if (useProm && psdp->node.node)
-	    promPath = sparcPromNode2Pathname(&psdp->node);
-
-	for (j = 0; j < numDevs; j++) {
-	    if (devList[j]->busID && *devList[j]->busID) {
-		if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) {
-		    if (devBus)
-			xf86MsgVerb(X_WARNING,0,
-			    "%s: More than one matching Device section for "
-			    "instance (BusID: %s) found: %s\n",
-			    driverName,devList[j]->identifier,
-			    devList[j]->busID);
-		    else
-			devBus = devList[j];
-		} 
-	    } else {
-		if (!dev && !devBus) {
-		    if (promPath)
-			xf86Msg(X_PROBED, "Assigning device section with no busID to SBUS:%s\n",
-				promPath);
-		    else
-			xf86Msg(X_PROBED, "Assigning device section with no busID to SBUS:fb%d\n",
-				psdp->fbNum);
-		    dev = devList[j];
-		} else
-		    xf86MsgVerb(X_WARNING, 0,
-			    "%s: More than one matching Device section "
-			    "found: %s\n", driverName, devList[j]->identifier);
-	    }
-	}
-	if (devBus) dev = devBus;  /* busID preferred */ 
-	if (!dev && psdp->fd != -2) {
-	    if (promPath) {
-		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
-			    "for instance (BusID SBUS:%s) found\n",
-			    driverName, promPath);
-	    } else
-		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
-			    "for instance (BusID SBUS:fb%d) found\n",
-			    driverName, psdp->fbNum);
-	} else if (dev) {
-	    numClaimedInstances++;
-	    instances[i].claimed = TRUE;
-	    instances[i].dev = dev;
-	}
-	free(promPath);
+        char *promPath = NULL;
+
+        psdp = instances[i].sbus;
+        devBus = NULL;
+        dev = NULL;
+        if (useProm && psdp->node.node)
+            promPath = sparcPromNode2Pathname(&psdp->node);
+
+        for (j = 0; j < numDevs; j++) {
+            if (devList[j]->busID && *devList[j]->busID) {
+                if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) {
+                    if (devBus)
+                        xf86MsgVerb(X_WARNING, 0,
+                                    "%s: More than one matching Device section for "
+                                    "instance (BusID: %s) found: %s\n",
+                                    driverName, devList[j]->identifier,
+                                    devList[j]->busID);
+                    else
+                        devBus = devList[j];
+                }
+            }
+            else {
+                if (!dev && !devBus) {
+                    if (promPath)
+                        xf86Msg(X_PROBED,
+                                "Assigning device section with no busID to SBUS:%s\n",
+                                promPath);
+                    else
+                        xf86Msg(X_PROBED,
+                                "Assigning device section with no busID to SBUS:fb%d\n",
+                                psdp->fbNum);
+                    dev = devList[j];
+                }
+                else
+                    xf86MsgVerb(X_WARNING, 0,
+                                "%s: More than one matching Device section "
+                                "found: %s\n", driverName,
+                                devList[j]->identifier);
+            }
+        }
+        if (devBus)
+            dev = devBus;       /* busID preferred */
+        if (!dev && psdp->fd != -2) {
+            if (promPath) {
+                xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+                            "for instance (BusID SBUS:%s) found\n",
+                            driverName, promPath);
+            }
+            else
+                xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+                            "for instance (BusID SBUS:fb%d) found\n",
+                            driverName, psdp->fbNum);
+        }
+        else if (dev) {
+            numClaimedInstances++;
+            instances[i].claimed = TRUE;
+            instances[i].dev = dev;
+        }
+        free(promPath);
     }
 
     DebugF("%s instances found: %d\n", driverName, numClaimedInstances);
@@ -489,29 +521,29 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
      */
     numFound = 0;
     for (i = 0; i < allocatedInstances && numClaimedInstances > 0; i++) {
-	if (!instances[i].claimed)
-	    continue;
-	psdp = instances[i].sbus;
-	if (!xf86CheckSbusSlot(psdp->fbNum))
-	    continue;
-
-	DebugF("%s: card at fb%d %08x is claimed by a Device section\n",
-	       driverName, psdp->fbNum, psdp->node.node);
-
-	/* Allocate an entry in the lists to be returned */
-	numFound++;
-	retEntities = xnfrealloc(retEntities, numFound * sizeof(int));
-	retEntities[numFound - 1]
-	    = xf86ClaimSbusSlot(psdp, drvp, instances[i].dev,instances[i].dev->active ?
-				TRUE : FALSE);
+        if (!instances[i].claimed)
+            continue;
+        psdp = instances[i].sbus;
+        if (!xf86CheckSbusSlot(psdp->fbNum))
+            continue;
+
+        DebugF("%s: card at fb%d %08x is claimed by a Device section\n",
+               driverName, psdp->fbNum, psdp->node.node);
+
+        /* Allocate an entry in the lists to be returned */
+        numFound++;
+        retEntities = xnfrealloc(retEntities, numFound * sizeof(int));
+        retEntities[numFound - 1]
+            = xf86ClaimSbusSlot(psdp, drvp, instances[i].dev,
+                                instances[i].dev->active ? TRUE : FALSE);
     }
     free(instances);
     if (numFound > 0) {
-	*foundEntities = retEntities;
+        *foundEntities = retEntities;
     }
 
     if (useProm)
-	sparcPromClose();
+        sparcPromClose();
 
     return numFound;
 }
@@ -525,12 +557,12 @@ xf86GetSbusInfoForEntity(int entityIndex)
     sbusDevicePtr *psdpp;
     EntityPtr p = xf86Entities[entityIndex];
 
-    if (entityIndex >= xf86NumEntities
-	|| p->bus.type != BUS_SBUS) return NULL;
+    if (entityIndex >= xf86NumEntities || p->bus.type != BUS_SBUS)
+        return NULL;
 
     for (psdpp = xf86SbusInfo; *psdpp != NULL; psdpp++) {
-	if (p->bus.id.sbus.fbNum == (*psdpp)->fbNum)
-	    return *psdpp;
+        if (p->bus.id.sbus.fbNum == (*psdpp)->fbNum)
+            return *psdpp;
     }
     return NULL;
 }
@@ -541,11 +573,13 @@ xf86GetEntityForSbusInfo(sbusDevicePtr psdp)
     int i;
 
     for (i = 0; i < xf86NumEntities; i++) {
-	EntityPtr p = xf86Entities[i];
-	if (p->bus.type != BUS_SBUS) continue;
+        EntityPtr p = xf86Entities[i];
 
-	if (p->bus.id.sbus.fbNum == psdp->fbNum)
-	    return i;
+        if (p->bus.type != BUS_SBUS)
+            continue;
+
+        if (p->bus.id.sbus.fbNum == psdp->fbNum)
+            return i;
     }
     return -1;
 }
@@ -601,32 +635,33 @@ typedef struct _sbusCmap {
 
 static void
 xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
-			LOCO *colors, VisualPtr pVisual)
+                        LOCO * colors, VisualPtr pVisual)
 {
     int i, index;
     sbusCmapPtr cmap;
     struct fbcmap fbcmap;
-    unsigned char *data = malloc(numColors*3);
-                             
+    unsigned char *data = malloc(numColors * 3);
+
     cmap = SBUSCMAPPTR(pScrn->pScreen);
-    if (!cmap) return;
+    if (!cmap)
+        return;
     fbcmap.count = 0;
     fbcmap.index = indices[0];
     fbcmap.red = data;
     fbcmap.green = data + numColors;
     fbcmap.blue = fbcmap.green + numColors;
     for (i = 0; i < numColors; i++) {
-	index = indices[i];
-	if (fbcmap.count && index != fbcmap.index + fbcmap.count) {
-	    ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
-	    fbcmap.count = 0;
-	    fbcmap.index = index;
-	}
-	fbcmap.red[fbcmap.count] = colors[index].red;
-	fbcmap.green[fbcmap.count] = colors[index].green;
-	fbcmap.blue[fbcmap.count++] = colors[index].blue;
+        index = indices[i];
+        if (fbcmap.count && index != fbcmap.index + fbcmap.count) {
+            ioctl(cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+            fbcmap.count = 0;
+            fbcmap.index = index;
+        }
+        fbcmap.red[fbcmap.count] = colors[index].red;
+        fbcmap.green[fbcmap.count] = colors[index].green;
+        fbcmap.blue[fbcmap.count++] = colors[index].blue;
     }
-    ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+    ioctl(cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
     free(data);
 }
 
@@ -635,20 +670,20 @@ xf86SbusCmapCloseScreen(int i, ScreenPtr pScreen)
 {
     sbusCmapPtr cmap;
     struct fbcmap fbcmap;
-                         
+
     cmap = SBUSCMAPPTR(pScreen);
     if (cmap->origCmapValid) {
-	fbcmap.index = 0;
-	fbcmap.count = 16;
-	fbcmap.red = cmap->origRed;
-	fbcmap.green = cmap->origGreen;
-	fbcmap.blue = cmap->origBlue;
-	ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+        fbcmap.index = 0;
+        fbcmap.count = 16;
+        fbcmap.red = cmap->origRed;
+        fbcmap.green = cmap->origGreen;
+        fbcmap.blue = cmap->origBlue;
+        ioctl(cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
     }
     pScreen->CloseScreen = cmap->CloseScreen;
     free(cmap);
     return (*pScreen->CloseScreen) (i, pScreen);
-}    
+}
 
 Bool
 xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)
@@ -665,25 +700,26 @@ xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)
     fbcmap.red = cmap->origRed;
     fbcmap.green = cmap->origGreen;
     fbcmap.blue = cmap->origBlue;
-    if (ioctl (psdp->fd, FBIOGETCMAP, &fbcmap) >= 0)
-	cmap->origCmapValid = TRUE;
+    if (ioctl(psdp->fd, FBIOGETCMAP, &fbcmap) >= 0)
+        cmap->origCmapValid = TRUE;
     fbcmap.index = 0;
     fbcmap.count = 2;
     fbcmap.red = data;
     fbcmap.green = data;
     fbcmap.blue = data;
     if (pScreen->whitePixel == 0) {
-	data[0] = 255;
-	data[1] = 0;
-    } else {
-	data[0] = 0;
-	data[1] = 255;
+        data[0] = 255;
+        data[1] = 0;
+    }
+    else {
+        data[0] = 0;
+        data[1] = 255;
     }
-    ioctl (psdp->fd, FBIOPUTCMAP, &fbcmap);
+    ioctl(psdp->fd, FBIOPUTCMAP, &fbcmap);
     cmap->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = xf86SbusCmapCloseScreen;
     return xf86HandleColormaps(pScreen, 256, 8,
-			       xf86SbusCmapLoadPalette, NULL, 0);
+                               xf86SbusCmapLoadPalette, NULL, 0);
 }
 
 Bool
@@ -695,7 +731,7 @@ xf86SbusConfigure(void *busData, sbusDevicePtr sBus)
 }
 
 void
-xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec *GDev)
+xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec * GDev)
 {
     char *promPath = NULL;
 
@@ -708,7 +744,8 @@ xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec *GDev)
     if (promPath) {
         XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
         free(promPath);
-    } else {
+    }
+    else {
         XNFasprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
     }
 }
diff --git a/xorg-server/hw/xfree86/common/xf86sbusBus.h b/xorg-server/hw/xfree86/common/xf86sbusBus.h
index e210770db..a4d9c6cde 100644
--- a/xorg-server/hw/xfree86/common/xf86sbusBus.h
+++ b/xorg-server/hw/xfree86/common/xf86sbusBus.h
@@ -1,104 +1,111 @@
-/*

- * SBUS bus-specific declarations

- *

- * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)

- *

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

- * JAKUB JELINEK 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.

- */

-

-#ifndef _XF86_SBUSBUS_H

-#define _XF86_SBUSBUS_H

-

-#include "xf86str.h"

-

-#define SBUS_DEVICE_BW2		0x0001

-#define SBUS_DEVICE_CG2		0x0002

-#define SBUS_DEVICE_CG3		0x0003

-#define SBUS_DEVICE_CG4		0x0004

-#define SBUS_DEVICE_CG6		0x0005

-#define SBUS_DEVICE_CG8		0x0006

-#define SBUS_DEVICE_CG12	0x0007

-#define SBUS_DEVICE_CG14	0x0008

-#define SBUS_DEVICE_LEO		0x0009

-#define SBUS_DEVICE_TCX		0x000a

-#define SBUS_DEVICE_FFB		0x000b

-#define SBUS_DEVICE_GT		0x000c

-#define SBUS_DEVICE_MGX		0x000d

-

-typedef struct sbus_prom_node {

-    int			node;

-    /* Because of misdesigned openpromio */

-    int			cookie[2];

-} sbusPromNode, *sbusPromNodePtr;

-

-typedef struct sbus_device {

-    int			devId;

-    int			fbNum;

-    int			fd;

-    int			width, height;

-    sbusPromNode	node;

-    char		*descr;

-    char		*device;

-} sbusDevice, *sbusDevicePtr;

-

-struct sbus_devtable {

-    int devId;

-    int fbType;

-    char *promName;

-    char *driverName;

-    char *descr;

-};

-

-extern _X_EXPORT void xf86SbusProbe(void);

-extern _X_EXPORT sbusDevicePtr *xf86SbusInfo;

-extern _X_EXPORT struct sbus_devtable sbusDeviceTable[];

-

-extern _X_EXPORT int xf86MatchSbusInstances(const char *driverName, int sbusDevId,

-			   GDevPtr *devList, int numDevs, DriverPtr drvp,

-			   int **foundEntities);

-extern _X_EXPORT sbusDevicePtr xf86GetSbusInfoForEntity(int entityIndex);

-extern _X_EXPORT int xf86GetEntityForSbusInfo(sbusDevicePtr psdp);

-extern _X_EXPORT void xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp);

-extern _X_EXPORT pointer xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset,

-		       unsigned long size);

-extern _X_EXPORT void xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size);

-extern _X_EXPORT void xf86SbusHideOsHwCursor(sbusDevicePtr psdp);

-extern _X_EXPORT void xf86SbusSetOsHwCursorCmap(sbusDevicePtr psdp, int bg, int fg);

-extern _X_EXPORT Bool xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp);

-

-extern _X_EXPORT int promRootNode;

-

-extern _X_EXPORT int promGetSibling(int node);

-extern _X_EXPORT int promGetChild(int node);

-extern _X_EXPORT char * promGetProperty(const char *prop, int *lenp);

-extern _X_EXPORT int promGetBool(const char *prop);

-

-extern _X_EXPORT int sparcPromInit(void);

-extern _X_EXPORT void sparcPromClose(void);

-extern _X_EXPORT char * sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp);

-extern _X_EXPORT int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop);

-extern _X_EXPORT void sparcPromAssignNodes(void);

-extern _X_EXPORT char * sparcPromNode2Pathname(sbusPromNodePtr pnode);

-extern _X_EXPORT int sparcPromPathname2Node(const char *pathName);

-extern _X_EXPORT char *sparcDriverName(void);

-

-extern Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);

-extern void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus,

-                                    GDevRec *GDev);

-

-#endif /* _XF86_SBUSBUS_H */

+/*
+ * SBUS bus-specific declarations
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * 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 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
+ * JAKUB JELINEK 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.
+ */
+
+#ifndef _XF86_SBUSBUS_H
+#define _XF86_SBUSBUS_H
+
+#include "xf86str.h"
+
+#define SBUS_DEVICE_BW2		0x0001
+#define SBUS_DEVICE_CG2		0x0002
+#define SBUS_DEVICE_CG3		0x0003
+#define SBUS_DEVICE_CG4		0x0004
+#define SBUS_DEVICE_CG6		0x0005
+#define SBUS_DEVICE_CG8		0x0006
+#define SBUS_DEVICE_CG12	0x0007
+#define SBUS_DEVICE_CG14	0x0008
+#define SBUS_DEVICE_LEO		0x0009
+#define SBUS_DEVICE_TCX		0x000a
+#define SBUS_DEVICE_FFB		0x000b
+#define SBUS_DEVICE_GT		0x000c
+#define SBUS_DEVICE_MGX		0x000d
+
+typedef struct sbus_prom_node {
+    int node;
+    /* Because of misdesigned openpromio */
+    int cookie[2];
+} sbusPromNode, *sbusPromNodePtr;
+
+typedef struct sbus_device {
+    int devId;
+    int fbNum;
+    int fd;
+    int width, height;
+    sbusPromNode node;
+    char *descr;
+    char *device;
+} sbusDevice, *sbusDevicePtr;
+
+struct sbus_devtable {
+    int devId;
+    int fbType;
+    char *promName;
+    char *driverName;
+    char *descr;
+};
+
+extern _X_EXPORT void xf86SbusProbe(void);
+extern _X_EXPORT sbusDevicePtr *xf86SbusInfo;
+extern _X_EXPORT struct sbus_devtable sbusDeviceTable[];
+
+extern _X_EXPORT int xf86MatchSbusInstances(const char *driverName,
+                                            int sbusDevId, GDevPtr * devList,
+                                            int numDevs, DriverPtr drvp,
+                                            int **foundEntities);
+extern _X_EXPORT sbusDevicePtr xf86GetSbusInfoForEntity(int entityIndex);
+extern _X_EXPORT int xf86GetEntityForSbusInfo(sbusDevicePtr psdp);
+extern _X_EXPORT void xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn,
+                                             sbusDevicePtr psdp);
+extern _X_EXPORT pointer xf86MapSbusMem(sbusDevicePtr psdp,
+                                        unsigned long offset,
+                                        unsigned long size);
+extern _X_EXPORT void xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr,
+                                       unsigned long size);
+extern _X_EXPORT void xf86SbusHideOsHwCursor(sbusDevicePtr psdp);
+extern _X_EXPORT void xf86SbusSetOsHwCursorCmap(sbusDevicePtr psdp, int bg,
+                                                int fg);
+extern _X_EXPORT Bool xf86SbusHandleColormaps(ScreenPtr pScreen,
+                                              sbusDevicePtr psdp);
+
+extern _X_EXPORT int promRootNode;
+
+extern _X_EXPORT int promGetSibling(int node);
+extern _X_EXPORT int promGetChild(int node);
+extern _X_EXPORT char *promGetProperty(const char *prop, int *lenp);
+extern _X_EXPORT int promGetBool(const char *prop);
+
+extern _X_EXPORT int sparcPromInit(void);
+extern _X_EXPORT void sparcPromClose(void);
+extern _X_EXPORT char *sparcPromGetProperty(sbusPromNodePtr pnode,
+                                            const char *prop, int *lenp);
+extern _X_EXPORT int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop);
+extern _X_EXPORT void sparcPromAssignNodes(void);
+extern _X_EXPORT char *sparcPromNode2Pathname(sbusPromNodePtr pnode);
+extern _X_EXPORT int sparcPromPathname2Node(const char *pathName);
+extern _X_EXPORT char *sparcDriverName(void);
+
+extern Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);
+extern void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus,
+                                    GDevRec * GDev);
+
+#endif                          /* _XF86_SBUSBUS_H */
diff --git a/xorg-server/hw/xfree86/common/xf86str.h b/xorg-server/hw/xfree86/common/xf86str.h
index e2ca55875..6294845bc 100644
--- a/xorg-server/hw/xfree86/common/xf86str.h
+++ b/xorg-server/hw/xfree86/common/xf86str.h
@@ -55,139 +55,138 @@ typedef uint64_t memType;
 typedef uintptr_t memType;
 #endif
 
-
 /* Video mode flags */
 
 typedef enum {
-    V_PHSYNC	= 0x0001,
-    V_NHSYNC	= 0x0002,
-    V_PVSYNC	= 0x0004,
-    V_NVSYNC	= 0x0008,
-    V_INTERLACE	= 0x0010,
-    V_DBLSCAN	= 0x0020,
-    V_CSYNC	= 0x0040,
-    V_PCSYNC	= 0x0080,
-    V_NCSYNC	= 0x0100,
-    V_HSKEW	= 0x0200,	/* hskew provided */
-    V_BCAST	= 0x0400,
-    V_PIXMUX	= 0x1000,
-    V_DBLCLK	= 0x2000,
-    V_CLKDIV2	= 0x4000
+    V_PHSYNC = 0x0001,
+    V_NHSYNC = 0x0002,
+    V_PVSYNC = 0x0004,
+    V_NVSYNC = 0x0008,
+    V_INTERLACE = 0x0010,
+    V_DBLSCAN = 0x0020,
+    V_CSYNC = 0x0040,
+    V_PCSYNC = 0x0080,
+    V_NCSYNC = 0x0100,
+    V_HSKEW = 0x0200,           /* hskew provided */
+    V_BCAST = 0x0400,
+    V_PIXMUX = 0x1000,
+    V_DBLCLK = 0x2000,
+    V_CLKDIV2 = 0x4000
 } ModeFlags;
 
 typedef enum {
-    INTERLACE_HALVE_V	= 0x0001	/* Halve V values for interlacing */
+    INTERLACE_HALVE_V = 0x0001  /* Halve V values for interlacing */
 } CrtcAdjustFlags;
 
 /* Flags passed to ChipValidMode() */
 typedef enum {
     MODECHECK_INITIAL = 0,
-    MODECHECK_FINAL   = 1
+    MODECHECK_FINAL = 1
 } ModeCheckFlags;
 
 /* These are possible return values for xf86CheckMode() and ValidMode() */
 typedef enum {
-    MODE_OK	= 0,	/* Mode OK */
-    MODE_HSYNC,		/* hsync out of range */
-    MODE_VSYNC,		/* vsync out of range */
-    MODE_H_ILLEGAL,	/* mode has illegal horizontal timings */
-    MODE_V_ILLEGAL,	/* mode has illegal horizontal timings */
-    MODE_BAD_WIDTH,	/* requires an unsupported linepitch */
-    MODE_NOMODE,	/* no mode with a maching name */
-    MODE_NO_INTERLACE,	/* interlaced mode not supported */
-    MODE_NO_DBLESCAN,	/* doublescan mode not supported */
-    MODE_NO_VSCAN,	/* multiscan mode not supported */
-    MODE_MEM,		/* insufficient video memory */
-    MODE_VIRTUAL_X,	/* mode width too large for specified virtual size */
-    MODE_VIRTUAL_Y,	/* mode height too large for specified virtual size */
-    MODE_MEM_VIRT,	/* insufficient video memory given virtual size */
-    MODE_NOCLOCK,	/* no fixed clock available */
-    MODE_CLOCK_HIGH,	/* clock required is too high */
-    MODE_CLOCK_LOW,	/* clock required is too low */
-    MODE_CLOCK_RANGE,	/* clock/mode isn't in a ClockRange */
-    MODE_BAD_HVALUE,	/* horizontal timing was out of range */
-    MODE_BAD_VVALUE,	/* vertical timing was out of range */
-    MODE_BAD_VSCAN,	/* VScan value out of range */
-    MODE_HSYNC_NARROW,	/* horizontal sync too narrow */
-    MODE_HSYNC_WIDE,	/* horizontal sync too wide */
-    MODE_HBLANK_NARROW,	/* horizontal blanking too narrow */
-    MODE_HBLANK_WIDE,	/* horizontal blanking too wide */
-    MODE_VSYNC_NARROW,	/* vertical sync too narrow */
-    MODE_VSYNC_WIDE,	/* vertical sync too wide */
-    MODE_VBLANK_NARROW,	/* vertical blanking too narrow */
-    MODE_VBLANK_WIDE,	/* vertical blanking too wide */
-    MODE_PANEL,         /* exceeds panel dimensions */
-    MODE_INTERLACE_WIDTH, /* width too large for interlaced mode */
-    MODE_ONE_WIDTH,     /* only one width is supported */
-    MODE_ONE_HEIGHT,    /* only one height is supported */
-    MODE_ONE_SIZE,      /* only one resolution is supported */
-    MODE_NO_REDUCED,    /* monitor doesn't accept reduced blanking */
-    MODE_BANDWIDTH,	/* mode requires too much memory bandwidth */
-    MODE_BAD = -2,	/* unspecified reason */
-    MODE_ERROR	= -1	/* error condition */
+    MODE_OK = 0,                /* Mode OK */
+    MODE_HSYNC,                 /* hsync out of range */
+    MODE_VSYNC,                 /* vsync out of range */
+    MODE_H_ILLEGAL,             /* mode has illegal horizontal timings */
+    MODE_V_ILLEGAL,             /* mode has illegal horizontal timings */
+    MODE_BAD_WIDTH,             /* requires an unsupported linepitch */
+    MODE_NOMODE,                /* no mode with a maching name */
+    MODE_NO_INTERLACE,          /* interlaced mode not supported */
+    MODE_NO_DBLESCAN,           /* doublescan mode not supported */
+    MODE_NO_VSCAN,              /* multiscan mode not supported */
+    MODE_MEM,                   /* insufficient video memory */
+    MODE_VIRTUAL_X,             /* mode width too large for specified virtual size */
+    MODE_VIRTUAL_Y,             /* mode height too large for specified virtual size */
+    MODE_MEM_VIRT,              /* insufficient video memory given virtual size */
+    MODE_NOCLOCK,               /* no fixed clock available */
+    MODE_CLOCK_HIGH,            /* clock required is too high */
+    MODE_CLOCK_LOW,             /* clock required is too low */
+    MODE_CLOCK_RANGE,           /* clock/mode isn't in a ClockRange */
+    MODE_BAD_HVALUE,            /* horizontal timing was out of range */
+    MODE_BAD_VVALUE,            /* vertical timing was out of range */
+    MODE_BAD_VSCAN,             /* VScan value out of range */
+    MODE_HSYNC_NARROW,          /* horizontal sync too narrow */
+    MODE_HSYNC_WIDE,            /* horizontal sync too wide */
+    MODE_HBLANK_NARROW,         /* horizontal blanking too narrow */
+    MODE_HBLANK_WIDE,           /* horizontal blanking too wide */
+    MODE_VSYNC_NARROW,          /* vertical sync too narrow */
+    MODE_VSYNC_WIDE,            /* vertical sync too wide */
+    MODE_VBLANK_NARROW,         /* vertical blanking too narrow */
+    MODE_VBLANK_WIDE,           /* vertical blanking too wide */
+    MODE_PANEL,                 /* exceeds panel dimensions */
+    MODE_INTERLACE_WIDTH,       /* width too large for interlaced mode */
+    MODE_ONE_WIDTH,             /* only one width is supported */
+    MODE_ONE_HEIGHT,            /* only one height is supported */
+    MODE_ONE_SIZE,              /* only one resolution is supported */
+    MODE_NO_REDUCED,            /* monitor doesn't accept reduced blanking */
+    MODE_BANDWIDTH,             /* mode requires too much memory bandwidth */
+    MODE_BAD = -2,              /* unspecified reason */
+    MODE_ERROR = -1             /* error condition */
 } ModeStatus;
 
 /*
  * The mode sets are, from best to worst: USERDEF, DRIVER, and DEFAULT/BUILTIN.
  * Preferred will bubble a mode to the top within a set.
  */
-# define M_T_BUILTIN 0x01        /* built-in mode */
-# define M_T_CLOCK_C (0x02 | M_T_BUILTIN) /* built-in mode - configure clock */
-# define M_T_CRTC_C  (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC  */
-# define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)
+#define M_T_BUILTIN 0x01        /* built-in mode */
+#define M_T_CLOCK_C (0x02 | M_T_BUILTIN)        /* built-in mode - configure clock */
+#define M_T_CRTC_C  (0x04 | M_T_BUILTIN)        /* built-in mode - configure CRTC  */
+#define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)
                                /* built-in mode - configure CRTC and clock */
-# define M_T_PREFERRED 0x08	/* preferred mode within a set */
-# define M_T_DEFAULT 0x10	/* (VESA) default modes */
-# define M_T_USERDEF 0x20	/* One of the modes from the config file */
-# define M_T_DRIVER  0x40	/* Supplied by the driver (EDID, etc) */
-# define M_T_USERPREF 0x80	/* mode preferred by the user config */
+#define M_T_PREFERRED 0x08      /* preferred mode within a set */
+#define M_T_DEFAULT 0x10        /* (VESA) default modes */
+#define M_T_USERDEF 0x20        /* One of the modes from the config file */
+#define M_T_DRIVER  0x40        /* Supplied by the driver (EDID, etc) */
+#define M_T_USERPREF 0x80       /* mode preferred by the user config */
 
 /* Video mode */
 typedef struct _DisplayModeRec {
-    struct _DisplayModeRec *	prev;
-    struct _DisplayModeRec *	next;
-    char *			name;		/* identifier for the mode */
-    ModeStatus			status;
-    int				type;
+    struct _DisplayModeRec *prev;
+    struct _DisplayModeRec *next;
+    char *name;                 /* identifier for the mode */
+    ModeStatus status;
+    int type;
 
     /* These are the values that the user sees/provides */
-    int				Clock;		/* pixel clock freq (kHz) */
-    int				HDisplay;	/* horizontal timing */
-    int				HSyncStart;
-    int				HSyncEnd;
-    int				HTotal;
-    int				HSkew;
-    int				VDisplay;	/* vertical timing */
-    int				VSyncStart;
-    int				VSyncEnd;
-    int				VTotal;
-    int				VScan;
-    int				Flags;
-
-  /* These are the values the hardware uses */
-    int				ClockIndex;
-    int				SynthClock;	/* Actual clock freq to
-					  	 * be programmed  (kHz) */
-    int				CrtcHDisplay;
-    int				CrtcHBlankStart;
-    int				CrtcHSyncStart;
-    int				CrtcHSyncEnd;
-    int				CrtcHBlankEnd;
-    int				CrtcHTotal;
-    int				CrtcHSkew;
-    int				CrtcVDisplay;
-    int				CrtcVBlankStart;
-    int				CrtcVSyncStart;
-    int				CrtcVSyncEnd;
-    int				CrtcVBlankEnd;
-    int				CrtcVTotal;
-    Bool			CrtcHAdjusted;
-    Bool			CrtcVAdjusted;
-    int				PrivSize;
-    INT32 *			Private;
-    int				PrivFlags;
-
-    float			HSync, VRefresh;
+    int Clock;                  /* pixel clock freq (kHz) */
+    int HDisplay;               /* horizontal timing */
+    int HSyncStart;
+    int HSyncEnd;
+    int HTotal;
+    int HSkew;
+    int VDisplay;               /* vertical timing */
+    int VSyncStart;
+    int VSyncEnd;
+    int VTotal;
+    int VScan;
+    int Flags;
+
+    /* These are the values the hardware uses */
+    int ClockIndex;
+    int SynthClock;             /* Actual clock freq to
+                                 * be programmed  (kHz) */
+    int CrtcHDisplay;
+    int CrtcHBlankStart;
+    int CrtcHSyncStart;
+    int CrtcHSyncEnd;
+    int CrtcHBlankEnd;
+    int CrtcHTotal;
+    int CrtcHSkew;
+    int CrtcVDisplay;
+    int CrtcVBlankStart;
+    int CrtcVSyncStart;
+    int CrtcVSyncEnd;
+    int CrtcVBlankEnd;
+    int CrtcVTotal;
+    Bool CrtcHAdjusted;
+    Bool CrtcVAdjusted;
+    int PrivSize;
+    INT32 *Private;
+    int PrivFlags;
+
+    float HSync, VRefresh;
 } DisplayModeRec, *DisplayModePtr;
 
 /* The monitor description */
@@ -195,11 +194,17 @@ typedef struct _DisplayModeRec {
 #define MAX_HSYNC 8
 #define MAX_VREFRESH 8
 
-typedef struct { float hi, lo; } range;
+typedef struct {
+    float hi, lo;
+} range;
 
-typedef struct { CARD32 red, green, blue; } rgb;
+typedef struct {
+    CARD32 red, green, blue;
+} rgb;
 
-typedef struct { float red, green, blue; } Gamma;
+typedef struct {
+    float red, green, blue;
+} Gamma;
 
 /* The permitted gamma range is 1 / GAMMA_MAX <= g <= GAMMA_MAX */
 #define GAMMA_MAX	10.0
@@ -207,35 +212,35 @@ typedef struct { float red, green, blue; } Gamma;
 #define GAMMA_ZERO	(GAMMA_MIN / 100.0)
 
 typedef struct {
-    char *		id;
-    char *		vendor;
-    char *		model;
-    int			nHsync;
-    range		hsync[MAX_HSYNC];
-    int			nVrefresh;
-    range		vrefresh[MAX_VREFRESH];
-    DisplayModePtr	Modes;		/* Start of the monitor's mode list */
-    DisplayModePtr	Last;		/* End of the monitor's mode list */
-    Gamma		gamma;		/* Gamma of the monitor */
-    int			widthmm;
-    int			heightmm;
-    pointer		options;
-    pointer		DDC;
-    Bool                reducedblanking; /* Allow CVT reduced blanking modes? */
-    int			maxPixClock;	 /* in kHz, like mode->Clock */
+    char *id;
+    char *vendor;
+    char *model;
+    int nHsync;
+    range hsync[MAX_HSYNC];
+    int nVrefresh;
+    range vrefresh[MAX_VREFRESH];
+    DisplayModePtr Modes;       /* Start of the monitor's mode list */
+    DisplayModePtr Last;        /* End of the monitor's mode list */
+    Gamma gamma;                /* Gamma of the monitor */
+    int widthmm;
+    int heightmm;
+    pointer options;
+    pointer DDC;
+    Bool reducedblanking;       /* Allow CVT reduced blanking modes? */
+    int maxPixClock;            /* in kHz, like mode->Clock */
 } MonRec, *MonPtr;
 
 /* the list of clock ranges */
 typedef struct x_ClockRange {
     struct x_ClockRange *next;
-    int			minClock;	/* (kHz) */
-    int			maxClock;	/* (kHz) */
-    int			clockIndex;	/* -1 for programmable clocks */
-    Bool		interlaceAllowed;
-    Bool		doubleScanAllowed;
-    int			ClockMulFactor;
-    int			ClockDivFactor;
-    int			PrivFlags;
+    int minClock;               /* (kHz) */
+    int maxClock;               /* (kHz) */
+    int clockIndex;             /* -1 for programmable clocks */
+    Bool interlaceAllowed;
+    Bool doubleScanAllowed;
+    int ClockMulFactor;
+    int ClockDivFactor;
+    int PrivFlags;
 } ClockRange, *ClockRangePtr;
 
 /*
@@ -254,8 +259,7 @@ typedef enum {
     GET_REQUIRED_HW_INTERFACES = 10
 } xorgDriverFuncOp;
 
-typedef Bool xorgDriverFuncProc		  (ScrnInfoPtr, xorgDriverFuncOp,
-					   pointer);
+typedef Bool xorgDriverFuncProc(ScrnInfoPtr, xorgDriverFuncOp, pointer);
 
 /* RR_GET_INFO, RR_SET_CONFIG */
 typedef struct {
@@ -294,13 +298,13 @@ typedef CARD32 xorgHWFlags;
 struct _DriverRec;
 
 typedef struct {
-    int			driverVersion;
-    char *		driverName;
-    void		(*Identify)(int flags);
-    Bool		(*Probe)(struct _DriverRec *drv, int flags);
-    const OptionInfoRec * (*AvailableOptions)(int chipid, int bustype);
-    pointer		module;
-    int			refCount;
+    int driverVersion;
+    char *driverName;
+    void (*Identify) (int flags);
+    Bool (*Probe) (struct _DriverRec * drv, int flags);
+    const OptionInfoRec *(*AvailableOptions) (int chipid, int bustype);
+    pointer module;
+    int refCount;
 } DriverRec1;
 
 struct _SymTabRec;
@@ -309,18 +313,18 @@ struct _PciChipsets;
 struct pci_device;
 
 typedef struct _DriverRec {
-    int			driverVersion;
-    char *		driverName;
-    void		(*Identify)(int flags);
-    Bool		(*Probe)(struct _DriverRec *drv, int flags);
-    const OptionInfoRec * (*AvailableOptions)(int chipid, int bustype);
-    pointer		module;
-    int			refCount;
-    xorgDriverFuncProc  *driverFunc;
-
-    const struct pci_id_match * supported_devices;
-    Bool (*PciProbe)( struct _DriverRec * drv, int entity_num,
-        struct pci_device * dev, intptr_t match_data );
+    int driverVersion;
+    char *driverName;
+    void (*Identify) (int flags);
+    Bool (*Probe) (struct _DriverRec * drv, int flags);
+    const OptionInfoRec *(*AvailableOptions) (int chipid, int bustype);
+    pointer module;
+    int refCount;
+    xorgDriverFuncProc *driverFunc;
+
+    const struct pci_id_match *supported_devices;
+    Bool (*PciProbe) (struct _DriverRec * drv, int entity_num,
+                      struct pci_device * dev, intptr_t match_data);
 } DriverRec, *DriverPtr;
 
 /*
@@ -346,18 +350,18 @@ typedef enum {
     BUS_NONE,
     BUS_PCI,
     BUS_SBUS,
-    BUS_last    /* Keep last */
+    BUS_last                    /* Keep last */
 } BusType;
 
 typedef struct {
-    int		fbNum;
+    int fbNum;
 } SbusBusId;
 
 typedef struct _bus {
     BusType type;
     union {
-	struct pci_device *pci;
-	SbusBusId sbus;
+        struct pci_device *pci;
+        SbusBusId sbus;
     } id;
 } BusRec, *BusPtr;
 
@@ -371,73 +375,73 @@ typedef enum {
 } DacSpeedIndex;
 
 typedef struct {
-   char *			identifier;
-   char *			vendor;
-   char *			board;
-   char *			chipset;
-   char *			ramdac;
-   char *			driver;
-   struct _confscreenrec *	myScreenSection;
-   Bool				claimed;
-   int				dacSpeeds[MAXDACSPEEDS];
-   int				numclocks;
-   int				clock[MAXCLOCKS];
-   char *			clockchip;
-   char *			busID;
-   Bool				active;
-   Bool				inUse;
-   int				videoRam;
-   int				textClockFreq;
-   unsigned long		BiosBase;	/* Base address of video BIOS */
-   unsigned long		MemBase;	/* Frame buffer base address */
-   unsigned long		IOBase;
-   int				chipID;
-   int				chipRev;
-   pointer			options;
-   int                          irq;
-   int                          screen;         /* For multi-CRTC cards */
+    char *identifier;
+    char *vendor;
+    char *board;
+    char *chipset;
+    char *ramdac;
+    char *driver;
+    struct _confscreenrec *myScreenSection;
+    Bool claimed;
+    int dacSpeeds[MAXDACSPEEDS];
+    int numclocks;
+    int clock[MAXCLOCKS];
+    char *clockchip;
+    char *busID;
+    Bool active;
+    Bool inUse;
+    int videoRam;
+    int textClockFreq;
+    unsigned long BiosBase;     /* Base address of video BIOS */
+    unsigned long MemBase;      /* Frame buffer base address */
+    unsigned long IOBase;
+    int chipID;
+    int chipRev;
+    pointer options;
+    int irq;
+    int screen;                 /* For multi-CRTC cards */
 } GDevRec, *GDevPtr;
 
 typedef struct {
-    int			frameX0;
-    int			frameY0;
-    int			virtualX;
-    int			virtualY;
-    int			depth;
-    int			fbbpp;
-    rgb			weight;
-    rgb			blackColour;
-    rgb			whiteColour;
-    int			defaultVisual;
-    char **		modes;
-    pointer		options;
+    int frameX0;
+    int frameY0;
+    int virtualX;
+    int virtualY;
+    int depth;
+    int fbbpp;
+    rgb weight;
+    rgb blackColour;
+    rgb whiteColour;
+    int defaultVisual;
+    char **modes;
+    pointer options;
 } DispRec, *DispPtr;
 
 typedef struct _confxvportrec {
-    char *		identifier;
-    pointer		options;
+    char *identifier;
+    pointer options;
 } confXvPortRec, *confXvPortPtr;
 
 typedef struct _confxvadaptrec {
-    char *		identifier;
-    int			numports;
-    confXvPortPtr	ports;
-    pointer		options;
+    char *identifier;
+    int numports;
+    confXvPortPtr ports;
+    pointer options;
 } confXvAdaptorRec, *confXvAdaptorPtr;
 
 typedef struct _confscreenrec {
-    char *		id;
-    int			screennum;
-    int			defaultdepth;
-    int			defaultbpp;
-    int			defaultfbbpp;
-    MonPtr		monitor;
-    GDevPtr		device;
-    int			numdisplays;
-    DispPtr		displays;
-    int			numxvadaptors;
-    confXvAdaptorPtr	xvadaptors;
-    pointer		options;
+    char *id;
+    int screennum;
+    int defaultdepth;
+    int defaultbpp;
+    int defaultfbbpp;
+    MonPtr monitor;
+    GDevPtr device;
+    int numdisplays;
+    DispPtr displays;
+    int numxvadaptors;
+    confXvAdaptorPtr xvadaptors;
+    pointer options;
 } confScreenRec, *confScreenPtr;
 
 typedef enum {
@@ -451,45 +455,45 @@ typedef enum {
 } PositionType;
 
 typedef struct _screenlayoutrec {
-    confScreenPtr	screen;
-    char *		topname;
-    confScreenPtr	top;
-    char *		bottomname;
-    confScreenPtr	bottom;
-    char *		leftname;
-    confScreenPtr	left;
-    char *		rightname;
-    confScreenPtr	right;
-    PositionType	where;
-    int			x;
-    int			y;
-    char *		refname;
-    confScreenPtr	refscreen;
+    confScreenPtr screen;
+    char *topname;
+    confScreenPtr top;
+    char *bottomname;
+    confScreenPtr bottom;
+    char *leftname;
+    confScreenPtr left;
+    char *rightname;
+    confScreenPtr right;
+    PositionType where;
+    int x;
+    int y;
+    char *refname;
+    confScreenPtr refscreen;
 } screenLayoutRec, *screenLayoutPtr;
 
 typedef struct _InputInfoRec InputInfoRec;
 
 typedef struct _serverlayoutrec {
-    char *		id;
-    screenLayoutPtr	screens;
-    GDevPtr		inactives;
-    InputInfoRec**      inputs; /* NULL terminated */
-    pointer		options;
+    char *id;
+    screenLayoutPtr screens;
+    GDevPtr inactives;
+    InputInfoRec **inputs;      /* NULL terminated */
+    pointer options;
 } serverLayoutRec, *serverLayoutPtr;
 
 typedef struct _confdribufferrec {
-    int                 count;
-    int                 size;
+    int count;
+    int size;
     enum {
-	XF86DRI_WC_HINT = 0x0001 /* Placeholder: not implemented */
-    }                   flags;
+        XF86DRI_WC_HINT = 0x0001        /* Placeholder: not implemented */
+    } flags;
 } confDRIBufferRec, *confDRIBufferPtr;
 
 typedef struct _confdrirec {
-    int                 group;
-    int                 mode;
-    int                 bufs_count;
-    confDRIBufferRec    *bufs;
+    int group;
+    int mode;
+    int bufs_count;
+    confDRIBufferRec *bufs;
 } confDRIRec, *confDRIPtr;
 
 /* These values should be adjusted when new fields are added to ScrnInfoRec */
@@ -497,7 +501,7 @@ typedef struct _confdrirec {
 #define NUM_RESERVED_POINTERS		14
 #define NUM_RESERVED_FUNCS		10
 
-typedef pointer (*funcPointer)(void);
+typedef pointer (*funcPointer) (void);
 
 /* flags for depth 24 pixmap options */
 typedef enum {
@@ -565,9 +569,8 @@ typedef struct _PciChipsets {
     void *dummy;
 } PciChipsets;
 
-
 /* Entity properties */
-typedef void (*EntityProc)(int entityIndex,pointer private);
+typedef void (*EntityProc) (int entityIndex, pointer private);
 
 typedef struct _entityInfo {
     int index;
@@ -581,37 +584,37 @@ typedef struct _entityInfo {
 /* DGA */
 
 typedef struct {
-   int num;		/* A unique identifier for the mode (num > 0) */
-   DisplayModePtr mode;
-   int flags;		/* DGA_CONCURRENT_ACCESS, etc... */
-   int imageWidth;	/* linear accessible portion (pixels) */
-   int imageHeight;
-   int pixmapWidth;	/* Xlib accessible portion (pixels) */
-   int pixmapHeight;	/* both fields ignored if no concurrent access */
-   int bytesPerScanline;
-   int byteOrder;	/* MSBFirst, LSBFirst */
-   int depth;
-   int bitsPerPixel;
-   unsigned long red_mask;
-   unsigned long green_mask;
-   unsigned long blue_mask;
-   short visualClass;
-   int viewportWidth;
-   int viewportHeight;
-   int xViewportStep;	/* viewport position granularity */
-   int yViewportStep;
-   int maxViewportX;	/* max viewport origin */
-   int maxViewportY;
-   int viewportFlags;	/* types of page flipping possible */
-   int offset;		/* offset into physical memory */
-   unsigned char *address;	/* server's mapped framebuffer */
-   int reserved1;
-   int reserved2;
+    int num;                    /* A unique identifier for the mode (num > 0) */
+    DisplayModePtr mode;
+    int flags;                  /* DGA_CONCURRENT_ACCESS, etc... */
+    int imageWidth;             /* linear accessible portion (pixels) */
+    int imageHeight;
+    int pixmapWidth;            /* Xlib accessible portion (pixels) */
+    int pixmapHeight;           /* both fields ignored if no concurrent access */
+    int bytesPerScanline;
+    int byteOrder;              /* MSBFirst, LSBFirst */
+    int depth;
+    int bitsPerPixel;
+    unsigned long red_mask;
+    unsigned long green_mask;
+    unsigned long blue_mask;
+    short visualClass;
+    int viewportWidth;
+    int viewportHeight;
+    int xViewportStep;          /* viewport position granularity */
+    int yViewportStep;
+    int maxViewportX;           /* max viewport origin */
+    int maxViewportY;
+    int viewportFlags;          /* types of page flipping possible */
+    int offset;                 /* offset into physical memory */
+    unsigned char *address;     /* server's mapped framebuffer */
+    int reserved1;
+    int reserved2;
 } DGAModeRec, *DGAModePtr;
 
 typedef struct {
-   DGAModePtr mode;
-   PixmapPtr pPix;
+    DGAModePtr mode;
+    PixmapPtr pPix;
 } DGADeviceRec, *DGADevicePtr;
 
 /*
@@ -625,25 +628,24 @@ typedef struct {
  * Driver entry point types
  */
 
-typedef Bool xf86ProbeProc                (DriverPtr, int);
-typedef Bool xf86PreInitProc              (ScrnInfoPtr, int);
-typedef Bool xf86ScreenInitProc           (int, ScreenPtr, int, char**);
-typedef Bool xf86SwitchModeProc           (int, DisplayModePtr, int);
-typedef void xf86AdjustFrameProc          (int, int, int, int);
-typedef Bool xf86EnterVTProc              (int, int);
-typedef void xf86LeaveVTProc              (int, int);
-typedef void xf86FreeScreenProc           (int, int);
-typedef ModeStatus xf86ValidModeProc      (int, DisplayModePtr, Bool, int);
+typedef Bool xf86ProbeProc(DriverPtr, int);
+typedef Bool xf86PreInitProc(ScrnInfoPtr, int);
+typedef Bool xf86ScreenInitProc(int, ScreenPtr, int, char **);
+typedef Bool xf86SwitchModeProc(int, DisplayModePtr, int);
+typedef void xf86AdjustFrameProc(int, int, int, int);
+typedef Bool xf86EnterVTProc(int, int);
+typedef void xf86LeaveVTProc(int, int);
+typedef void xf86FreeScreenProc(int, int);
+typedef ModeStatus xf86ValidModeProc(int, DisplayModePtr, Bool, int);
 typedef void xf86EnableDisableFBAccessProc(int, Bool);
-typedef int  xf86SetDGAModeProc           (int, int, DGADevicePtr);
-typedef int  xf86ChangeGammaProc          (int, Gamma);
-typedef void xf86PointerMovedProc         (int, int, int);
-typedef Bool xf86PMEventProc              (int, pmEvent, Bool);
-typedef void xf86DPMSSetProc		  (ScrnInfoPtr, int, int);
-typedef void xf86LoadPaletteProc   (ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
-typedef void xf86SetOverscanProc          (ScrnInfoPtr, int);
-typedef void xf86ModeSetProc              (ScrnInfoPtr);
-
+typedef int xf86SetDGAModeProc(int, int, DGADevicePtr);
+typedef int xf86ChangeGammaProc(int, Gamma);
+typedef void xf86PointerMovedProc(int, int, int);
+typedef Bool xf86PMEventProc(int, pmEvent, Bool);
+typedef void xf86DPMSSetProc(ScrnInfoPtr, int, int);
+typedef void xf86LoadPaletteProc(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
+typedef void xf86SetOverscanProc(ScrnInfoPtr, int);
+typedef void xf86ModeSetProc(ScrnInfoPtr);
 
 /*
  * ScrnInfoRec
@@ -656,217 +658,200 @@ typedef void xf86ModeSetProc              (ScrnInfoPtr);
  * are to be dependent on compile-time defines.
  */
 
-
 typedef struct _ScrnInfoRec {
-    int			driverVersion;
-    char *		driverName;		/* canonical name used in */
-						/* the config file */
-    ScreenPtr		pScreen;		/* Pointer to the ScreenRec */
-    int			scrnIndex;		/* Number of this screen */
-    Bool		configured;		/* Is this screen valid */
-    int			origIndex;		/* initial number assigned to
-						 * this screen before
-						 * finalising the number of
-						 * available screens */
+    int driverVersion;
+    char *driverName;           /* canonical name used in */
+    /* the config file */
+    ScreenPtr pScreen;          /* Pointer to the ScreenRec */
+    int scrnIndex;              /* Number of this screen */
+    Bool configured;            /* Is this screen valid */
+    int origIndex;              /* initial number assigned to
+                                 * this screen before
+                                 * finalising the number of
+                                 * available screens */
 
     /* Display-wide screenInfo values needed by this screen */
-    int			imageByteOrder;
-    int			bitmapScanlineUnit;
-    int			bitmapScanlinePad;
-    int			bitmapBitOrder;
-    int			numFormats;
-    PixmapFormatRec	formats[MAXFORMATS];
-    PixmapFormatRec	fbFormat;
-
-    int			bitsPerPixel;		/* fb bpp */
-    Pix24Flags		pixmap24;		/* pixmap pref for depth 24 */
-    int			depth;			/* depth of default visual */
-    MessageType		depthFrom;		/* set from config? */
-    MessageType		bitsPerPixelFrom;	/* set from config? */
-    rgb			weight;			/* r/g/b weights */
-    rgb			mask;			/* rgb masks */
-    rgb			offset;			/* rgb offsets */
-    int			rgbBits;		/* Number of bits in r/g/b */
-    Gamma		gamma;			/* Gamma of the monitor */
-    int			defaultVisual;		/* default visual class */
-    int			maxHValue;		/* max horizontal timing */
-    int			maxVValue;		/* max vertical timing value */
-    int			virtualX;		/* Virtual width */
-    int			virtualY; 		/* Virtual height */
-    int			xInc;			/* Horizontal timing increment */
-    MessageType		virtualFrom;		/* set from config? */
-    int			displayWidth;		/* memory pitch */
-    int			frameX0;		/* viewport position */
-    int			frameY0;
-    int			frameX1;
-    int			frameY1;
-    int			zoomLocked;		/* Disallow mode changes */
-    DisplayModePtr	modePool;		/* list of compatible modes */
-    DisplayModePtr	modes;			/* list of actual modes */
-    DisplayModePtr	currentMode;		/* current mode
-						 * This was previously
-						 * overloaded with the modes
-						 * field, which is a pointer
-						 * into a circular list */
-    confScreenPtr	confScreen;		/* Screen config info */
-    MonPtr		monitor;		/* Monitor information */
-    DispPtr		display;		/* Display information */
-    int *		entityList;		/* List of device entities */
-    int			numEntities;
-    int			widthmm;		/* physical display dimensions
-						 * in mm */
-    int			heightmm;
-    int			xDpi;			/* width DPI */
-    int			yDpi;			/* height DPI */
-    char *		name;			/* Name to prefix messages */
-    pointer		driverPrivate;		/* Driver private area */
-    DevUnion *		privates;		/* Other privates can hook in
-						 * here */
-    DriverPtr		drv;			/* xf86DriverList[] entry */
-    pointer		module;			/* Pointer to module head */
-    int			colorKey;
-    int			overlayFlags;
+    int imageByteOrder;
+    int bitmapScanlineUnit;
+    int bitmapScanlinePad;
+    int bitmapBitOrder;
+    int numFormats;
+    PixmapFormatRec formats[MAXFORMATS];
+    PixmapFormatRec fbFormat;
+
+    int bitsPerPixel;           /* fb bpp */
+    Pix24Flags pixmap24;        /* pixmap pref for depth 24 */
+    int depth;                  /* depth of default visual */
+    MessageType depthFrom;      /* set from config? */
+    MessageType bitsPerPixelFrom;       /* set from config? */
+    rgb weight;                 /* r/g/b weights */
+    rgb mask;                   /* rgb masks */
+    rgb offset;                 /* rgb offsets */
+    int rgbBits;                /* Number of bits in r/g/b */
+    Gamma gamma;                /* Gamma of the monitor */
+    int defaultVisual;          /* default visual class */
+    int maxHValue;              /* max horizontal timing */
+    int maxVValue;              /* max vertical timing value */
+    int virtualX;               /* Virtual width */
+    int virtualY;               /* Virtual height */
+    int xInc;                   /* Horizontal timing increment */
+    MessageType virtualFrom;    /* set from config? */
+    int displayWidth;           /* memory pitch */
+    int frameX0;                /* viewport position */
+    int frameY0;
+    int frameX1;
+    int frameY1;
+    int zoomLocked;             /* Disallow mode changes */
+    DisplayModePtr modePool;    /* list of compatible modes */
+    DisplayModePtr modes;       /* list of actual modes */
+    DisplayModePtr currentMode; /* current mode
+                                 * This was previously
+                                 * overloaded with the modes
+                                 * field, which is a pointer
+                                 * into a circular list */
+    confScreenPtr confScreen;   /* Screen config info */
+    MonPtr monitor;             /* Monitor information */
+    DispPtr display;            /* Display information */
+    int *entityList;            /* List of device entities */
+    int numEntities;
+    int widthmm;                /* physical display dimensions
+                                 * in mm */
+    int heightmm;
+    int xDpi;                   /* width DPI */
+    int yDpi;                   /* height DPI */
+    char *name;                 /* Name to prefix messages */
+    pointer driverPrivate;      /* Driver private area */
+    DevUnion *privates;         /* Other privates can hook in
+                                 * here */
+    DriverPtr drv;              /* xf86DriverList[] entry */
+    pointer module;             /* Pointer to module head */
+    int colorKey;
+    int overlayFlags;
 
     /* Some of these may be moved out of here into the driver private area */
 
-    char *		chipset;		/* chipset name */
-    char *		ramdac;			/* ramdac name */
-    char *		clockchip;		/* clock name */
-    Bool		progClock;		/* clock is programmable */
-    int			numClocks;		/* number of clocks */
-    int			clock[MAXCLOCKS];	/* list of clock frequencies */
-    int			videoRam;		/* amount of video ram (kb) */
-    unsigned long	biosBase;		/* Base address of video BIOS */
-    unsigned long	memPhysBase;		/* Physical address of FB */
-    unsigned long 	fbOffset;		/* Offset of FB in the above */
-    int			memClk;			/* memory clock */
-    int			textClockFreq;		/* clock of text mode */
-    Bool		flipPixels;		/* swap default black/white */
-    pointer		options;
-
-    int			chipID;
-    int			chipRev;
+    char *chipset;              /* chipset name */
+    char *ramdac;               /* ramdac name */
+    char *clockchip;            /* clock name */
+    Bool progClock;             /* clock is programmable */
+    int numClocks;              /* number of clocks */
+    int clock[MAXCLOCKS];       /* list of clock frequencies */
+    int videoRam;               /* amount of video ram (kb) */
+    unsigned long biosBase;     /* Base address of video BIOS */
+    unsigned long memPhysBase;  /* Physical address of FB */
+    unsigned long fbOffset;     /* Offset of FB in the above */
+    int memClk;                 /* memory clock */
+    int textClockFreq;          /* clock of text mode */
+    Bool flipPixels;            /* swap default black/white */
+    pointer options;
+
+    int chipID;
+    int chipRev;
 
     /* Allow screens to be enabled/disabled individually */
-    Bool		vtSema;
+    Bool vtSema;
 
     /* hw cursor moves at SIGIO time */
-    Bool		silkenMouse;
+    Bool silkenMouse;
 
     /* Storage for clockRanges and adjustFlags for use with the VidMode ext */
-    ClockRangePtr	clockRanges;
-    int			adjustFlags;
+    ClockRangePtr clockRanges;
+    int adjustFlags;
 
     /*
      * These can be used when the minor ABI version is incremented.
      * The NUM_* parameters must be reduced appropriately to keep the
      * structure size and alignment unchanged.
      */
-    int			reservedInt[NUM_RESERVED_INTS];
+    int reservedInt[NUM_RESERVED_INTS];
 
-    int *		entityInstanceList;
-    struct pci_device   *vgaDev;
+    int *entityInstanceList;
+    struct pci_device *vgaDev;
 
-    pointer		reservedPtr[NUM_RESERVED_POINTERS];
+    pointer reservedPtr[NUM_RESERVED_POINTERS];
 
     /*
      * Driver entry points.
      *
      */
 
-    xf86ProbeProc			*Probe;
-    xf86PreInitProc			*PreInit;
-    xf86ScreenInitProc			*ScreenInit;
-    xf86SwitchModeProc			*SwitchMode;
-    xf86AdjustFrameProc			*AdjustFrame;
-    xf86EnterVTProc			*EnterVT;
-    xf86LeaveVTProc			*LeaveVT;
-    xf86FreeScreenProc			*FreeScreen;
-    xf86ValidModeProc			*ValidMode;
-    xf86EnableDisableFBAccessProc	*EnableDisableFBAccess;
-    xf86SetDGAModeProc			*SetDGAMode;
-    xf86ChangeGammaProc			*ChangeGamma;
-    xf86PointerMovedProc		*PointerMoved;
-    xf86PMEventProc			*PMEvent;
-    xf86DPMSSetProc			*DPMSSet;
-    xf86LoadPaletteProc			*LoadPalette;
-    xf86SetOverscanProc			*SetOverscan;
-    xorgDriverFuncProc			*DriverFunc;
-    xf86ModeSetProc			*ModeSet;
+    xf86ProbeProc *Probe;
+    xf86PreInitProc *PreInit;
+    xf86ScreenInitProc *ScreenInit;
+    xf86SwitchModeProc *SwitchMode;
+    xf86AdjustFrameProc *AdjustFrame;
+    xf86EnterVTProc *EnterVT;
+    xf86LeaveVTProc *LeaveVT;
+    xf86FreeScreenProc *FreeScreen;
+    xf86ValidModeProc *ValidMode;
+    xf86EnableDisableFBAccessProc *EnableDisableFBAccess;
+    xf86SetDGAModeProc *SetDGAMode;
+    xf86ChangeGammaProc *ChangeGamma;
+    xf86PointerMovedProc *PointerMoved;
+    xf86PMEventProc *PMEvent;
+    xf86DPMSSetProc *DPMSSet;
+    xf86LoadPaletteProc *LoadPalette;
+    xf86SetOverscanProc *SetOverscan;
+    xorgDriverFuncProc *DriverFunc;
+    xf86ModeSetProc *ModeSet;
 
     /*
      * This can be used when the minor ABI version is incremented.
      * The NUM_* parameter must be reduced appropriately to keep the
      * structure size and alignment unchanged.
      */
-    funcPointer		reservedFuncs[NUM_RESERVED_FUNCS];
+    funcPointer reservedFuncs[NUM_RESERVED_FUNCS];
 
 } ScrnInfoRec;
 
-
 typedef struct {
-   Bool (*OpenFramebuffer)(
-	ScrnInfoPtr pScrn,
-	char **name,
-	unsigned char **mem,
-	int *size,
-	int *offset,
-        int *extra
-   );
-   void	(*CloseFramebuffer)(ScrnInfoPtr pScrn);
-   Bool (*SetMode)(ScrnInfoPtr pScrn, DGAModePtr pMode);
-   void (*SetViewport)(ScrnInfoPtr pScrn, int x, int y, int flags);
-   int  (*GetViewport)(ScrnInfoPtr pScrn);
-   void (*Sync)(ScrnInfoPtr);
-   void (*FillRect)(
-	ScrnInfoPtr pScrn,
-	int x, int y, int w, int h,
-	unsigned long color
-   );
-   void (*BlitRect)(
-	ScrnInfoPtr pScrn,
-	int srcx, int srcy,
-	int w, int h,
-	int dstx, int dsty
-   );
-   void (*BlitTransRect)(
-	ScrnInfoPtr pScrn,
-	int srcx, int srcy,
-	int w, int h,
-	int dstx, int dsty,
-	unsigned long color
-   );
+    Bool (*OpenFramebuffer) (ScrnInfoPtr pScrn,
+                             char **name,
+                             unsigned char **mem,
+                             int *size, int *offset, int *extra);
+    void (*CloseFramebuffer) (ScrnInfoPtr pScrn);
+    Bool (*SetMode) (ScrnInfoPtr pScrn, DGAModePtr pMode);
+    void (*SetViewport) (ScrnInfoPtr pScrn, int x, int y, int flags);
+    int (*GetViewport) (ScrnInfoPtr pScrn);
+    void (*Sync) (ScrnInfoPtr);
+    void (*FillRect) (ScrnInfoPtr pScrn,
+                      int x, int y, int w, int h, unsigned long color);
+    void (*BlitRect) (ScrnInfoPtr pScrn,
+                      int srcx, int srcy, int w, int h, int dstx, int dsty);
+    void (*BlitTransRect) (ScrnInfoPtr pScrn,
+                           int srcx, int srcy,
+                           int w, int h,
+                           int dstx, int dsty, unsigned long color);
 } DGAFunctionRec, *DGAFunctionPtr;
 
 typedef struct _SymTabRec {
-    int			token;		/* id of the token */
-    const char *	name;		/* token name */
+    int token;                  /* id of the token */
+    const char *name;           /* token name */
 } SymTabRec, *SymTabPtr;
 
 /* flags for xf86LookupMode */
 typedef enum {
-    LOOKUP_DEFAULT		= 0,	/* Use default mode lookup method */
-    LOOKUP_BEST_REFRESH,		/* Pick modes with best refresh */
-    LOOKUP_CLOSEST_CLOCK,		/* Pick modes with the closest clock */
-    LOOKUP_LIST_ORDER,			/* Pick first useful mode in list */
-    LOOKUP_CLKDIV2		= 0x0100, /* Allow half clocks */
-    LOOKUP_OPTIONAL_TOLERANCES	= 0x0200  /* Allow missing hsync/vrefresh */
+    LOOKUP_DEFAULT = 0,         /* Use default mode lookup method */
+    LOOKUP_BEST_REFRESH,        /* Pick modes with best refresh */
+    LOOKUP_CLOSEST_CLOCK,       /* Pick modes with the closest clock */
+    LOOKUP_LIST_ORDER,          /* Pick first useful mode in list */
+    LOOKUP_CLKDIV2 = 0x0100,    /* Allow half clocks */
+    LOOKUP_OPTIONAL_TOLERANCES = 0x0200 /* Allow missing hsync/vrefresh */
 } LookupModeFlags;
 
 #define NoDepth24Support	0x00
-#define Support24bppFb		0x01	/* 24bpp framebuffer supported */
-#define Support32bppFb		0x02	/* 32bpp framebuffer supported */
-#define SupportConvert24to32	0x04	/* Can convert 24bpp pixmap to 32bpp */
-#define SupportConvert32to24	0x08	/* Can convert 32bpp pixmap to 24bpp */
-#define PreferConvert24to32	0x10	/* prefer 24bpp pixmap to 32bpp conv */
-#define PreferConvert32to24	0x20	/* prefer 32bpp pixmap to 24bpp conv */
-
+#define Support24bppFb		0x01    /* 24bpp framebuffer supported */
+#define Support32bppFb		0x02    /* 32bpp framebuffer supported */
+#define SupportConvert24to32	0x04    /* Can convert 24bpp pixmap to 32bpp */
+#define SupportConvert32to24	0x08    /* Can convert 32bpp pixmap to 24bpp */
+#define PreferConvert24to32	0x10    /* prefer 24bpp pixmap to 32bpp conv */
+#define PreferConvert32to24	0x20    /* prefer 32bpp pixmap to 24bpp conv */
 
 /* For DPMS */
-typedef void (*DPMSSetProcPtr)(ScrnInfoPtr, int, int);
+typedef void (*DPMSSetProcPtr) (ScrnInfoPtr, int, int);
 
 /* Input handler proc */
-typedef void (*InputHandlerProc)(int fd, pointer data);
+typedef void (*InputHandlerProc) (int fd, pointer data);
 
 /* These are used by xf86GetClocks */
 #define CLK_REG_SAVE		-1
@@ -876,9 +861,8 @@ typedef void (*InputHandlerProc)(int fd, pointer data);
  * misc constants
  */
 #define INTERLACE_REFRESH_WEIGHT	1.5
-#define SYNC_TOLERANCE		0.01	/* 1 percent */
-#define CLOCK_TOLERANCE		2000	/* Clock matching tolerance (2MHz) */
-
+#define SYNC_TOLERANCE		0.01    /* 1 percent */
+#define CLOCK_TOLERANCE		2000    /* Clock matching tolerance (2MHz) */
 
 #define OVERLAY_8_32_DUALFB	0x00000001
 #define OVERLAY_8_24_DUALFB	0x00000002
@@ -891,12 +875,12 @@ typedef void (*InputHandlerProc)(int fd, pointer data);
 
 /* Action Events */
 typedef enum {
-    ACTION_TERMINATE		= 0,	/* Terminate Server */
-    ACTION_NEXT_MODE		= 10,	/* Switch to next video mode */
+    ACTION_TERMINATE = 0,       /* Terminate Server */
+    ACTION_NEXT_MODE = 10,      /* Switch to next video mode */
     ACTION_PREV_MODE,
-    ACTION_SWITCHSCREEN		= 100,	/* VT switch */
+    ACTION_SWITCHSCREEN = 100,  /* VT switch */
     ACTION_SWITCHSCREEN_NEXT,
     ACTION_SWITCHSCREEN_PREV,
 } ActionEvent;
 
-#endif /* _XF86STR_H */
+#endif                          /* _XF86STR_H */
diff --git a/xorg-server/hw/xfree86/common/xf86xv.c b/xorg-server/hw/xfree86/common/xf86xv.c
index b46dfefed..88e2f314b 100644
--- a/xorg-server/hw/xfree86/common/xf86xv.c
+++ b/xorg-server/hw/xfree86/common/xf86xv.c
@@ -28,7 +28,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -56,7 +55,6 @@
 
 #include "xf86xvpriv.h"
 
-
 /* XvScreenRec fields */
 
 static Bool xf86XVCloseScreen(int, ScreenPtr);
@@ -64,40 +62,39 @@ static int xf86XVQueryAdaptors(ScreenPtr, XvAdaptorPtr *, int *);
 
 /* XvAdaptorRec fields */
 
-static int xf86XVAllocatePort(unsigned long, XvPortPtr, XvPortPtr*);
+static int xf86XVAllocatePort(unsigned long, XvPortPtr, XvPortPtr *);
 static int xf86XVFreePort(XvPortPtr);
-static int xf86XVPutVideo(ClientPtr, DrawablePtr,XvPortPtr, GCPtr,
-				INT16, INT16, CARD16, CARD16,
-				INT16, INT16, CARD16, CARD16);
-static int xf86XVPutStill(ClientPtr, DrawablePtr,XvPortPtr, GCPtr,
-				INT16, INT16, CARD16, CARD16,
-				INT16, INT16, CARD16, CARD16);
-static int xf86XVGetVideo(ClientPtr, DrawablePtr,XvPortPtr, GCPtr,
-				INT16, INT16, CARD16, CARD16,
-				INT16, INT16, CARD16, CARD16);
-static int xf86XVGetStill(ClientPtr, DrawablePtr,XvPortPtr, GCPtr,
-				INT16, INT16, CARD16, CARD16,
-				INT16, INT16, CARD16, CARD16);
+static int xf86XVPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+                          INT16, INT16, CARD16, CARD16,
+                          INT16, INT16, CARD16, CARD16);
+static int xf86XVPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+                          INT16, INT16, CARD16, CARD16,
+                          INT16, INT16, CARD16, CARD16);
+static int xf86XVGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+                          INT16, INT16, CARD16, CARD16,
+                          INT16, INT16, CARD16, CARD16);
+static int xf86XVGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+                          INT16, INT16, CARD16, CARD16,
+                          INT16, INT16, CARD16, CARD16);
 static int xf86XVStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
 static int xf86XVSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
-static int xf86XVGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32*);
+static int xf86XVGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32 *);
 static int xf86XVQueryBestSize(ClientPtr, XvPortPtr, CARD8,
-				CARD16, CARD16,CARD16, CARD16,
-				unsigned int*, unsigned int*);
+                               CARD16, CARD16, CARD16, CARD16,
+                               unsigned int *, unsigned int *);
 static int xf86XVPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
-				INT16, INT16, CARD16, CARD16,
-				INT16, INT16, CARD16, CARD16,
-				XvImagePtr, unsigned char*, Bool,
-				CARD16, CARD16);
+                          INT16, INT16, CARD16, CARD16,
+                          INT16, INT16, CARD16, CARD16,
+                          XvImagePtr, unsigned char *, Bool, CARD16, CARD16);
 static int xf86XVQueryImageAttributes(ClientPtr, XvPortPtr, XvImagePtr,
-				CARD16*, CARD16*, int*, int*);
-
+                                      CARD16 *, CARD16 *, int *, int *);
 
 /* ScreenRec fields */
 
 static Bool xf86XVDestroyWindow(WindowPtr pWin);
 static void xf86XVWindowExposures(WindowPtr pWin, RegionPtr r1, RegionPtr r2);
-static void xf86XVPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin, VTKind kind);
+static void xf86XVPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin,
+                                   VTKind kind);
 static void xf86XVClipNotify(WindowPtr pWin, int dx, int dy);
 
 #define PostValidateTreeUndefined ((PostValidateTreeProcPtr)-1)
@@ -111,19 +108,19 @@ static void xf86XVModeSet(ScrnInfoPtr pScrn);
 
 /* misc */
 
-static Bool xf86XVInitAdaptors(ScreenPtr, XF86VideoAdaptorPtr*, int);
-
+static Bool xf86XVInitAdaptors(ScreenPtr, XF86VideoAdaptorPtr *, int);
 
 static DevPrivateKeyRec XF86XVWindowKeyRec;
+
 #define XF86XVWindowKey (&XF86XVWindowKeyRec)
 
 DevPrivateKey XF86XvScreenKey;
 
 static unsigned long PortResource = 0;
 
-DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL;
-unsigned long (*XvGetRTPortProc)(void) = NULL;
-int (*XvScreenInitProc)(ScreenPtr) = NULL;
+DevPrivateKey (*XvGetScreenKeyProc) (void) = NULL;
+unsigned long (*XvGetRTPortProc) (void) = NULL;
+int (*XvScreenInitProc) (ScreenPtr) = NULL;
 
 #define GET_XV_SCREEN(pScreen) \
     ((XvScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XF86XvScreenKey))
@@ -138,29 +135,26 @@ static xf86XVInitGenericAdaptorPtr *GenDrivers = NULL;
 static int NumGenDrivers = 0;
 
 int
-xf86XVRegisterGenericAdaptorDriver(
-    xf86XVInitGenericAdaptorPtr InitFunc
-){
-  xf86XVInitGenericAdaptorPtr *newdrivers;
+xf86XVRegisterGenericAdaptorDriver(xf86XVInitGenericAdaptorPtr InitFunc)
+{
+    xf86XVInitGenericAdaptorPtr *newdrivers;
 
-  newdrivers = realloc(GenDrivers, sizeof(xf86XVInitGenericAdaptorPtr) *
-			(1 + NumGenDrivers));
-  if (!newdrivers)
-    return 0;
-  GenDrivers = newdrivers;
+    newdrivers = realloc(GenDrivers, sizeof(xf86XVInitGenericAdaptorPtr) *
+                         (1 + NumGenDrivers));
+    if (!newdrivers)
+        return 0;
+    GenDrivers = newdrivers;
 
-  GenDrivers[NumGenDrivers++] = InitFunc;
+    GenDrivers[NumGenDrivers++] = InitFunc;
 
-  return 1;
+    return 1;
 }
 
 int
-xf86XVListGenericAdaptors(
-    ScrnInfoPtr pScrn,
-    XF86VideoAdaptorPtr **adaptors
-){
-    int i,j,n,num;
-    XF86VideoAdaptorPtr *DrivAdap,*new;
+xf86XVListGenericAdaptors(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr ** adaptors)
+{
+    int i, j, n, num;
+    XF86VideoAdaptorPtr *DrivAdap, *new;
 
     num = 0;
     *adaptors = NULL;
@@ -168,48 +162,49 @@ xf86XVListGenericAdaptors(
      * The v4l driver registers itself first, but can use surfaces registered
      * by other drivers.  So, call the v4l driver last.
      */
-    for (i = NumGenDrivers; --i >= 0; ) {
-	DrivAdap = NULL;
-	n = (*GenDrivers[i])(pScrn, &DrivAdap);
-	if (0 == n)
-	    continue;
-	new = realloc(*adaptors, sizeof(XF86VideoAdaptorPtr) * (num+n));
-	if (NULL == new)
-	    continue;
-	*adaptors = new;
-	for (j = 0; j < n; j++, num++)
-	    (*adaptors)[num] = DrivAdap[j];
+    for (i = NumGenDrivers; --i >= 0;) {
+        DrivAdap = NULL;
+        n = (*GenDrivers[i]) (pScrn, &DrivAdap);
+        if (0 == n)
+            continue;
+        new = realloc(*adaptors, sizeof(XF86VideoAdaptorPtr) * (num + n));
+        if (NULL == new)
+            continue;
+        *adaptors = new;
+        for (j = 0; j < n; j++, num++)
+            (*adaptors)[num] = DrivAdap[j];
     }
     return num;
 }
 
-
 /****************  Offscreen surface stuff *******************/
 
 typedef struct {
-   XF86OffscreenImagePtr images;
-   int num;
+    XF86OffscreenImagePtr images;
+    int num;
 } OffscreenImageRec;
 
 static DevPrivateKeyRec OffscreenPrivateKeyRec;
+
 #define OffscreenPrivateKey (&OffscreenPrivateKeyRec)
 #define GetOffscreenImage(pScreen) ((OffscreenImageRec *) dixLookupPrivate(&(pScreen)->devPrivates, OffscreenPrivateKey))
 
 Bool
-xf86XVRegisterOffscreenImages(
-    ScreenPtr pScreen,
-    XF86OffscreenImagePtr images,
-    int num
-){
+xf86XVRegisterOffscreenImages(ScreenPtr pScreen,
+                              XF86OffscreenImagePtr images, int num)
+{
     OffscreenImageRec *OffscreenImage;
+
     /* This function may be called before xf86XVScreenInit, so there's
      * no better place than this to call dixRegisterPrivateKey to ensure we
      * have space reserved. After the first call it is a no-op. */
-    if(!dixRegisterPrivateKey(OffscreenPrivateKey, PRIVATE_SCREEN, sizeof(OffscreenImageRec)) ||
-       !(OffscreenImage = GetOffscreenImage(pScreen)))
+    if (!dixRegisterPrivateKey
+        (OffscreenPrivateKey, PRIVATE_SCREEN, sizeof(OffscreenImageRec)) ||
+        !(OffscreenImage = GetOffscreenImage(pScreen)))
         /* Every X.org driver assumes this function always succeeds, so
          * just die on allocation failure. */
-        FatalError("Could not allocate private storage for XV offscreen images.\n");
+        FatalError
+            ("Could not allocate private storage for XV offscreen images.\n");
 
     OffscreenImage->num = num;
     OffscreenImage->images = images;
@@ -217,16 +212,14 @@ xf86XVRegisterOffscreenImages(
 }
 
 XF86OffscreenImagePtr
-xf86XVQueryOffscreenImages(
-   ScreenPtr pScreen,
-   int *num
-){
+xf86XVQueryOffscreenImages(ScreenPtr pScreen, int *num)
+{
     OffscreenImageRec *OffscreenImage = GetOffscreenImage(pScreen);
+
     *num = OffscreenImage->num;
     return OffscreenImage->images;
 }
 
-
 XF86VideoAdaptorPtr
 xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn)
 {
@@ -239,396 +232,388 @@ xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr)
     free(ptr);
 }
 
-
 Bool
-xf86XVScreenInit(
-   ScreenPtr pScreen,
-   XF86VideoAdaptorPtr *adaptors,
-   int num
-){
-  ScrnInfoPtr pScrn;
-  XF86XVScreenPtr ScreenPriv;
-  XvScreenPtr pxvs;
+xf86XVScreenInit(ScreenPtr pScreen, XF86VideoAdaptorPtr * adaptors, int num)
+{
+    ScrnInfoPtr pScrn;
+    XF86XVScreenPtr ScreenPriv;
+    XvScreenPtr pxvs;
 
-  if(num <= 0 ||
-     !XvGetScreenKeyProc || !XvGetRTPortProc || !XvScreenInitProc)
-	return FALSE;
+    if (num <= 0 ||
+        !XvGetScreenKeyProc || !XvGetRTPortProc || !XvScreenInitProc)
+        return FALSE;
 
-  if(Success != (*XvScreenInitProc)(pScreen)) return FALSE;
+    if (Success != (*XvScreenInitProc) (pScreen))
+        return FALSE;
 
-  if (!dixRegisterPrivateKey(&XF86XVWindowKeyRec, PRIVATE_WINDOW, 0))
-      return FALSE;
+    if (!dixRegisterPrivateKey(&XF86XVWindowKeyRec, PRIVATE_WINDOW, 0))
+        return FALSE;
 
-  XF86XvScreenKey = (*XvGetScreenKeyProc)();
+    XF86XvScreenKey = (*XvGetScreenKeyProc) ();
 
-  PortResource = (*XvGetRTPortProc)();
+    PortResource = (*XvGetRTPortProc) ();
 
-  pxvs = GET_XV_SCREEN(pScreen);
+    pxvs = GET_XV_SCREEN(pScreen);
 
-  /* Anyone initializing the Xv layer must provide these two.
-     The Xv di layer calls them without even checking if they exist! */
+    /* Anyone initializing the Xv layer must provide these two.
+       The Xv di layer calls them without even checking if they exist! */
 
-  pxvs->ddCloseScreen = xf86XVCloseScreen;
-  pxvs->ddQueryAdaptors = xf86XVQueryAdaptors;
+    pxvs->ddCloseScreen = xf86XVCloseScreen;
+    pxvs->ddQueryAdaptors = xf86XVQueryAdaptors;
 
-  /* The Xv di layer provides us with a private hook so that we don't
-     have to allocate our own screen private.  They also provide
-     a CloseScreen hook so that we don't have to wrap it.  I'm not
-     sure that I appreciate that.  */
+    /* The Xv di layer provides us with a private hook so that we don't
+       have to allocate our own screen private.  They also provide
+       a CloseScreen hook so that we don't have to wrap it.  I'm not
+       sure that I appreciate that.  */
 
-  ScreenPriv = malloc(sizeof(XF86XVScreenRec));
-  pxvs->devPriv.ptr = (pointer)ScreenPriv;
+    ScreenPriv = malloc(sizeof(XF86XVScreenRec));
+    pxvs->devPriv.ptr = (pointer) ScreenPriv;
 
-  if(!ScreenPriv) return FALSE;
+    if (!ScreenPriv)
+        return FALSE;
 
-  pScrn = xf86Screens[pScreen->myNum];
+    pScrn = xf86Screens[pScreen->myNum];
 
-  ScreenPriv->DestroyWindow = pScreen->DestroyWindow;
-  ScreenPriv->WindowExposures = pScreen->WindowExposures;
-  ScreenPriv->PostValidateTree = PostValidateTreeUndefined;
-  ScreenPriv->ClipNotify = pScreen->ClipNotify;
-  ScreenPriv->EnterVT = pScrn->EnterVT;
-  ScreenPriv->LeaveVT = pScrn->LeaveVT;
-  ScreenPriv->AdjustFrame = pScrn->AdjustFrame;
-  ScreenPriv->ModeSet = pScrn->ModeSet;
+    ScreenPriv->DestroyWindow = pScreen->DestroyWindow;
+    ScreenPriv->WindowExposures = pScreen->WindowExposures;
+    ScreenPriv->PostValidateTree = PostValidateTreeUndefined;
+    ScreenPriv->ClipNotify = pScreen->ClipNotify;
+    ScreenPriv->EnterVT = pScrn->EnterVT;
+    ScreenPriv->LeaveVT = pScrn->LeaveVT;
+    ScreenPriv->AdjustFrame = pScrn->AdjustFrame;
+    ScreenPriv->ModeSet = pScrn->ModeSet;
 
-  pScreen->DestroyWindow = xf86XVDestroyWindow;
-  pScreen->WindowExposures = xf86XVWindowExposures;
-  pScreen->ClipNotify = xf86XVClipNotify;
-  pScrn->EnterVT = xf86XVEnterVT;
-  pScrn->LeaveVT = xf86XVLeaveVT;
-  if(pScrn->AdjustFrame)
-     pScrn->AdjustFrame = xf86XVAdjustFrame;
-  pScrn->ModeSet = xf86XVModeSet;
+    pScreen->DestroyWindow = xf86XVDestroyWindow;
+    pScreen->WindowExposures = xf86XVWindowExposures;
+    pScreen->ClipNotify = xf86XVClipNotify;
+    pScrn->EnterVT = xf86XVEnterVT;
+    pScrn->LeaveVT = xf86XVLeaveVT;
+    if (pScrn->AdjustFrame)
+        pScrn->AdjustFrame = xf86XVAdjustFrame;
+    pScrn->ModeSet = xf86XVModeSet;
 
-  if(!xf86XVInitAdaptors(pScreen, adaptors, num))
-	return FALSE;
+    if (!xf86XVInitAdaptors(pScreen, adaptors, num))
+        return FALSE;
 
-  return TRUE;
+    return TRUE;
 }
 
 static void
 xf86XVFreeAdaptor(XvAdaptorPtr pAdaptor)
 {
-   int i;
-
-   free(pAdaptor->name);
-   pAdaptor->name = NULL;
-
-   if(pAdaptor->pEncodings) {
-      XvEncodingPtr pEncode = pAdaptor->pEncodings;
-
-      for(i = 0; i < pAdaptor->nEncodings; i++, pEncode++)
-	  free(pEncode->name);
-      free(pAdaptor->pEncodings);
-      pAdaptor->pEncodings = NULL;
-   }
-
-   free(pAdaptor->pFormats);
-   pAdaptor->pFormats = NULL;
-
-   if(pAdaptor->pPorts) {
-      XvPortPtr pPort = pAdaptor->pPorts;
-      XvPortRecPrivatePtr pPriv;
-
-      for(i = 0; i < pAdaptor->nPorts; i++, pPort++) {
-	  pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;
-	  if(pPriv) {
-	     if(pPriv->clientClip)
-		RegionDestroy(pPriv->clientClip);
-	     if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)
-		RegionDestroy(pPriv->pCompositeClip);
-	     if (pPriv->ckeyFilled)
-		RegionDestroy(pPriv->ckeyFilled);
-	     free(pPriv);
-	  }
-      }
-      free(pAdaptor->pPorts);
-      pAdaptor->pPorts = NULL;
-   }
-
-   if(pAdaptor->pAttributes) {
-      XvAttributePtr pAttribute = pAdaptor->pAttributes;
-
-      for(i = 0; i < pAdaptor->nAttributes; i++, pAttribute++)
-	  free(pAttribute->name);
-      free(pAdaptor->pAttributes);
-      pAdaptor->pAttributes = NULL;
-   }
-
-   free(pAdaptor->pImages);
-   free(pAdaptor->devPriv.ptr);
-   pAdaptor->pImages = NULL;
-   pAdaptor->devPriv.ptr = NULL;
+    int i;
+
+    free(pAdaptor->name);
+    pAdaptor->name = NULL;
+
+    if (pAdaptor->pEncodings) {
+        XvEncodingPtr pEncode = pAdaptor->pEncodings;
+
+        for (i = 0; i < pAdaptor->nEncodings; i++, pEncode++)
+            free(pEncode->name);
+        free(pAdaptor->pEncodings);
+        pAdaptor->pEncodings = NULL;
+    }
+
+    free(pAdaptor->pFormats);
+    pAdaptor->pFormats = NULL;
+
+    if (pAdaptor->pPorts) {
+        XvPortPtr pPort = pAdaptor->pPorts;
+        XvPortRecPrivatePtr pPriv;
+
+        for (i = 0; i < pAdaptor->nPorts; i++, pPort++) {
+            pPriv = (XvPortRecPrivatePtr) pPort->devPriv.ptr;
+            if (pPriv) {
+                if (pPriv->clientClip)
+                    RegionDestroy(pPriv->clientClip);
+                if (pPriv->pCompositeClip && pPriv->FreeCompositeClip)
+                    RegionDestroy(pPriv->pCompositeClip);
+                if (pPriv->ckeyFilled)
+                    RegionDestroy(pPriv->ckeyFilled);
+                free(pPriv);
+            }
+        }
+        free(pAdaptor->pPorts);
+        pAdaptor->pPorts = NULL;
+    }
+
+    if (pAdaptor->pAttributes) {
+        XvAttributePtr pAttribute = pAdaptor->pAttributes;
+
+        for (i = 0; i < pAdaptor->nAttributes; i++, pAttribute++)
+            free(pAttribute->name);
+        free(pAdaptor->pAttributes);
+        pAdaptor->pAttributes = NULL;
+    }
+
+    free(pAdaptor->pImages);
+    free(pAdaptor->devPriv.ptr);
+    pAdaptor->pImages = NULL;
+    pAdaptor->devPriv.ptr = NULL;
 }
 
 static Bool
-xf86XVInitAdaptors(
-   ScreenPtr pScreen,
-   XF86VideoAdaptorPtr *infoPtr,
-   int number
-) {
-  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
-  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-  XF86VideoAdaptorPtr adaptorPtr;
-  XvAdaptorPtr pAdaptor, pa;
-  XvAdaptorRecPrivatePtr adaptorPriv;
-  int na, numAdaptor;
-  XvPortRecPrivatePtr portPriv;
-  XvPortPtr pPort, pp;
-  int numPort;
-  XF86AttributePtr attributePtr;
-  XvAttributePtr pAttribute, pat;
-  XF86VideoFormatPtr formatPtr;
-  XvFormatPtr pFormat, pf;
-  int numFormat, totFormat;
-  XF86VideoEncodingPtr encodingPtr;
-  XvEncodingPtr pEncode, pe;
-  XF86ImagePtr imagePtr;
-  XvImagePtr pImage, pi;
-  int numVisuals;
-  VisualPtr pVisual;
-  int i;
-
-  pxvs->nAdaptors = 0;
-  pxvs->pAdaptors = NULL;
-
-  if(!(pAdaptor = calloc(number, sizeof(XvAdaptorRec))))
-      return FALSE;
-
-  for(pa = pAdaptor, na = 0, numAdaptor = 0; na < number; na++, adaptorPtr++) {
-      adaptorPtr = infoPtr[na];
-
-      if(!adaptorPtr->StopVideo || !adaptorPtr->SetPortAttribute ||
-	 !adaptorPtr->GetPortAttribute || !adaptorPtr->QueryBestSize)
-	   continue;
-
-      /* client libs expect at least one encoding */
-      if(!adaptorPtr->nEncodings || !adaptorPtr->pEncodings)
-	   continue;
-
-      pa->type = adaptorPtr->type;
-
-      if(!adaptorPtr->PutVideo && !adaptorPtr->GetVideo)
-	 pa->type &= ~XvVideoMask;
-
-      if(!adaptorPtr->PutStill && !adaptorPtr->GetStill)
-	 pa->type &= ~XvStillMask;
-
-      if(!adaptorPtr->PutImage || !adaptorPtr->QueryImageAttributes)
-	 pa->type &= ~XvImageMask;
-
-      if(!adaptorPtr->PutVideo && !adaptorPtr->PutImage &&
-							  !adaptorPtr->PutStill)
-	 pa->type &= ~XvInputMask;
-
-      if(!adaptorPtr->GetVideo && !adaptorPtr->GetStill)
-	 pa->type &= ~XvOutputMask;
-
-      if(!(adaptorPtr->type & (XvPixmapMask | XvWindowMask)))
-	  continue;
-      if(!(adaptorPtr->type & (XvImageMask | XvVideoMask | XvStillMask)))
-	  continue;
-
-      pa->pScreen = pScreen;
-      pa->ddAllocatePort = xf86XVAllocatePort;
-      pa->ddFreePort = xf86XVFreePort;
-      pa->ddPutVideo = xf86XVPutVideo;
-      pa->ddPutStill = xf86XVPutStill;
-      pa->ddGetVideo = xf86XVGetVideo;
-      pa->ddGetStill = xf86XVGetStill;
-      pa->ddStopVideo = xf86XVStopVideo;
-      pa->ddPutImage = xf86XVPutImage;
-      pa->ddSetPortAttribute = xf86XVSetPortAttribute;
-      pa->ddGetPortAttribute = xf86XVGetPortAttribute;
-      pa->ddQueryBestSize = xf86XVQueryBestSize;
-      pa->ddQueryImageAttributes = xf86XVQueryImageAttributes;
-      pa->name = strdup(adaptorPtr->name);
-
-      if(adaptorPtr->nEncodings &&
-	(pEncode = calloc(adaptorPtr->nEncodings, sizeof(XvEncodingRec)))) {
-
-	for(pe = pEncode, encodingPtr = adaptorPtr->pEncodings, i = 0;
-	    i < adaptorPtr->nEncodings; pe++, i++, encodingPtr++)
-	{
-	    pe->id = encodingPtr->id;
-	    pe->pScreen = pScreen;
-	    pe->name = strdup(encodingPtr->name);
-	    pe->width = encodingPtr->width;
-	    pe->height = encodingPtr->height;
-	    pe->rate.numerator = encodingPtr->rate.numerator;
-	    pe->rate.denominator = encodingPtr->rate.denominator;
-	}
-	pa->nEncodings = adaptorPtr->nEncodings;
-	pa->pEncodings = pEncode;
-      }
-
-      if(adaptorPtr->nImages &&
-	 (pImage = calloc(adaptorPtr->nImages, sizeof(XvImageRec)))) {
-
-	  for(i = 0, pi = pImage, imagePtr = adaptorPtr->pImages;
-	      i < adaptorPtr->nImages; i++, pi++, imagePtr++)
-	  {
-	     pi->id = imagePtr->id;
-	     pi->type = imagePtr->type;
-	     pi->byte_order = imagePtr->byte_order;
-	     memcpy(pi->guid, imagePtr->guid, 16);
-	     pi->bits_per_pixel = imagePtr->bits_per_pixel;
-	     pi->format = imagePtr->format;
-	     pi->num_planes = imagePtr->num_planes;
-	     pi->depth = imagePtr->depth;
-	     pi->red_mask = imagePtr->red_mask;
-	     pi->green_mask = imagePtr->green_mask;
-	     pi->blue_mask = imagePtr->blue_mask;
-	     pi->y_sample_bits = imagePtr->y_sample_bits;
-	     pi->u_sample_bits = imagePtr->u_sample_bits;
-	     pi->v_sample_bits = imagePtr->v_sample_bits;
-	     pi->horz_y_period = imagePtr->horz_y_period;
-	     pi->horz_u_period = imagePtr->horz_u_period;
-	     pi->horz_v_period = imagePtr->horz_v_period;
-	     pi->vert_y_period = imagePtr->vert_y_period;
-	     pi->vert_u_period = imagePtr->vert_u_period;
-	     pi->vert_v_period = imagePtr->vert_v_period;
-	     memcpy(pi->component_order, imagePtr->component_order, 32);
-	     pi->scanline_order = imagePtr->scanline_order;
-	  }
-	  pa->nImages = adaptorPtr->nImages;
-	  pa->pImages = pImage;
-      }
-
-      if(adaptorPtr->nAttributes &&
-	(pAttribute = calloc(adaptorPtr->nAttributes, sizeof(XvAttributeRec))))
-      {
-	for(pat = pAttribute, attributePtr = adaptorPtr->pAttributes, i = 0;
-	    i < adaptorPtr->nAttributes; pat++, i++, attributePtr++)
-	{
-	    pat->flags = attributePtr->flags;
-	    pat->min_value = attributePtr->min_value;
-	    pat->max_value = attributePtr->max_value;
-	    pat->name = strdup(attributePtr->name);
-	}
-	pa->nAttributes = adaptorPtr->nAttributes;
-	pa->pAttributes = pAttribute;
-      }
-
-
-      totFormat = adaptorPtr->nFormats;
-
-      if(!(pFormat = calloc(totFormat, sizeof(XvFormatRec)))) {
-	  xf86XVFreeAdaptor(pa);
-	  continue;
-      }
-      for(pf = pFormat, i = 0, numFormat = 0, formatPtr = adaptorPtr->pFormats;
-	  i < adaptorPtr->nFormats; i++, formatPtr++)
-      {
-	  numVisuals = pScreen->numVisuals;
-	  pVisual = pScreen->visuals;
-
-	  while(numVisuals--) {
-	      if((pVisual->class == formatPtr->class) &&
-		 (pVisual->nplanes == formatPtr->depth)) {
-
-		   if(numFormat >= totFormat) {
-			void *moreSpace;
-			totFormat *= 2;
-			moreSpace = realloc(pFormat,
-					     totFormat * sizeof(XvFormatRec));
-			if(!moreSpace) break;
-			pFormat = moreSpace;
-			pf = pFormat + numFormat;
-		   }
-
-		   pf->visual = pVisual->vid;
-		   pf->depth = formatPtr->depth;
-
-		   pf++;
-		   numFormat++;
-	      }
-	      pVisual++;
-	  }
-      }
-      pa->nFormats = numFormat;
-      pa->pFormats = pFormat;
-      if(!numFormat) {
-	  xf86XVFreeAdaptor(pa);
-	  continue;
-      }
-
-      if(!(adaptorPriv = calloc(1, sizeof(XvAdaptorRecPrivate)))) {
-	  xf86XVFreeAdaptor(pa);
-	  continue;
-      }
-
-      adaptorPriv->flags = adaptorPtr->flags;
-      adaptorPriv->PutVideo = adaptorPtr->PutVideo;
-      adaptorPriv->PutStill = adaptorPtr->PutStill;
-      adaptorPriv->GetVideo = adaptorPtr->GetVideo;
-      adaptorPriv->GetStill = adaptorPtr->GetStill;
-      adaptorPriv->StopVideo = adaptorPtr->StopVideo;
-      adaptorPriv->SetPortAttribute = adaptorPtr->SetPortAttribute;
-      adaptorPriv->GetPortAttribute = adaptorPtr->GetPortAttribute;
-      adaptorPriv->QueryBestSize = adaptorPtr->QueryBestSize;
-      adaptorPriv->QueryImageAttributes = adaptorPtr->QueryImageAttributes;
-      adaptorPriv->PutImage = adaptorPtr->PutImage;
-      adaptorPriv->ReputImage = adaptorPtr->ReputImage; /* image/still */
-
-      pa->devPriv.ptr = (pointer)adaptorPriv;
-
-      if(!(pPort = calloc(adaptorPtr->nPorts, sizeof(XvPortRec)))) {
-	  xf86XVFreeAdaptor(pa);
-	  continue;
-      }
-      for(pp = pPort, i = 0, numPort = 0;
-	  i < adaptorPtr->nPorts; i++) {
-
-	  if(!(pp->id = FakeClientID(0)))
-		continue;
-
-	  if(!(portPriv = calloc(1, sizeof(XvPortRecPrivate))))
-		continue;
-
-	  if(!AddResource(pp->id, PortResource, pp)) {
-		free(portPriv);
-		continue;
-	  }
-
-	  pp->pAdaptor = pa;
-	  pp->pNotify = (XvPortNotifyPtr)NULL;
-	  pp->pDraw = (DrawablePtr)NULL;
-	  pp->client = (ClientPtr)NULL;
-	  pp->grab.client = (ClientPtr)NULL;
-	  pp->time = currentTime;
-	  pp->devPriv.ptr = portPriv;
-
-	  portPriv->pScrn = pScrn;
-	  portPriv->AdaptorRec = adaptorPriv;
-	  portPriv->DevPriv.ptr = adaptorPtr->pPortPrivates[i].ptr;
-
-	  pp++;
-	  numPort++;
-      }
-      pa->nPorts = numPort;
-      pa->pPorts = pPort;
-      if(!numPort) {
-	  xf86XVFreeAdaptor(pa);
-	  continue;
-      }
-
-      pa->base_id = pPort->id;
-
-      pa++;
-      numAdaptor++;
-  }
-
-  if(numAdaptor) {
-      pxvs->nAdaptors = numAdaptor;
-      pxvs->pAdaptors = pAdaptor;
-  } else {
-     free(pAdaptor);
-     return FALSE;
-  }
-
-  return TRUE;
+xf86XVInitAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr * infoPtr, int number)
+{
+    XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    XF86VideoAdaptorPtr adaptorPtr;
+    XvAdaptorPtr pAdaptor, pa;
+    XvAdaptorRecPrivatePtr adaptorPriv;
+    int na, numAdaptor;
+    XvPortRecPrivatePtr portPriv;
+    XvPortPtr pPort, pp;
+    int numPort;
+    XF86AttributePtr attributePtr;
+    XvAttributePtr pAttribute, pat;
+    XF86VideoFormatPtr formatPtr;
+    XvFormatPtr pFormat, pf;
+    int numFormat, totFormat;
+    XF86VideoEncodingPtr encodingPtr;
+    XvEncodingPtr pEncode, pe;
+    XF86ImagePtr imagePtr;
+    XvImagePtr pImage, pi;
+    int numVisuals;
+    VisualPtr pVisual;
+    int i;
+
+    pxvs->nAdaptors = 0;
+    pxvs->pAdaptors = NULL;
+
+    if (!(pAdaptor = calloc(number, sizeof(XvAdaptorRec))))
+        return FALSE;
+
+    for (pa = pAdaptor, na = 0, numAdaptor = 0; na < number; na++, adaptorPtr++) {
+        adaptorPtr = infoPtr[na];
+
+        if (!adaptorPtr->StopVideo || !adaptorPtr->SetPortAttribute ||
+            !adaptorPtr->GetPortAttribute || !adaptorPtr->QueryBestSize)
+            continue;
+
+        /* client libs expect at least one encoding */
+        if (!adaptorPtr->nEncodings || !adaptorPtr->pEncodings)
+            continue;
+
+        pa->type = adaptorPtr->type;
+
+        if (!adaptorPtr->PutVideo && !adaptorPtr->GetVideo)
+            pa->type &= ~XvVideoMask;
+
+        if (!adaptorPtr->PutStill && !adaptorPtr->GetStill)
+            pa->type &= ~XvStillMask;
+
+        if (!adaptorPtr->PutImage || !adaptorPtr->QueryImageAttributes)
+            pa->type &= ~XvImageMask;
+
+        if (!adaptorPtr->PutVideo && !adaptorPtr->PutImage &&
+            !adaptorPtr->PutStill)
+            pa->type &= ~XvInputMask;
+
+        if (!adaptorPtr->GetVideo && !adaptorPtr->GetStill)
+            pa->type &= ~XvOutputMask;
+
+        if (!(adaptorPtr->type & (XvPixmapMask | XvWindowMask)))
+            continue;
+        if (!(adaptorPtr->type & (XvImageMask | XvVideoMask | XvStillMask)))
+            continue;
+
+        pa->pScreen = pScreen;
+        pa->ddAllocatePort = xf86XVAllocatePort;
+        pa->ddFreePort = xf86XVFreePort;
+        pa->ddPutVideo = xf86XVPutVideo;
+        pa->ddPutStill = xf86XVPutStill;
+        pa->ddGetVideo = xf86XVGetVideo;
+        pa->ddGetStill = xf86XVGetStill;
+        pa->ddStopVideo = xf86XVStopVideo;
+        pa->ddPutImage = xf86XVPutImage;
+        pa->ddSetPortAttribute = xf86XVSetPortAttribute;
+        pa->ddGetPortAttribute = xf86XVGetPortAttribute;
+        pa->ddQueryBestSize = xf86XVQueryBestSize;
+        pa->ddQueryImageAttributes = xf86XVQueryImageAttributes;
+        pa->name = strdup(adaptorPtr->name);
+
+        if (adaptorPtr->nEncodings &&
+            (pEncode = calloc(adaptorPtr->nEncodings, sizeof(XvEncodingRec)))) {
+
+            for (pe = pEncode, encodingPtr = adaptorPtr->pEncodings, i = 0;
+                 i < adaptorPtr->nEncodings; pe++, i++, encodingPtr++) {
+                pe->id = encodingPtr->id;
+                pe->pScreen = pScreen;
+                pe->name = strdup(encodingPtr->name);
+                pe->width = encodingPtr->width;
+                pe->height = encodingPtr->height;
+                pe->rate.numerator = encodingPtr->rate.numerator;
+                pe->rate.denominator = encodingPtr->rate.denominator;
+            }
+            pa->nEncodings = adaptorPtr->nEncodings;
+            pa->pEncodings = pEncode;
+        }
+
+        if (adaptorPtr->nImages &&
+            (pImage = calloc(adaptorPtr->nImages, sizeof(XvImageRec)))) {
+
+            for (i = 0, pi = pImage, imagePtr = adaptorPtr->pImages;
+                 i < adaptorPtr->nImages; i++, pi++, imagePtr++) {
+                pi->id = imagePtr->id;
+                pi->type = imagePtr->type;
+                pi->byte_order = imagePtr->byte_order;
+                memcpy(pi->guid, imagePtr->guid, 16);
+                pi->bits_per_pixel = imagePtr->bits_per_pixel;
+                pi->format = imagePtr->format;
+                pi->num_planes = imagePtr->num_planes;
+                pi->depth = imagePtr->depth;
+                pi->red_mask = imagePtr->red_mask;
+                pi->green_mask = imagePtr->green_mask;
+                pi->blue_mask = imagePtr->blue_mask;
+                pi->y_sample_bits = imagePtr->y_sample_bits;
+                pi->u_sample_bits = imagePtr->u_sample_bits;
+                pi->v_sample_bits = imagePtr->v_sample_bits;
+                pi->horz_y_period = imagePtr->horz_y_period;
+                pi->horz_u_period = imagePtr->horz_u_period;
+                pi->horz_v_period = imagePtr->horz_v_period;
+                pi->vert_y_period = imagePtr->vert_y_period;
+                pi->vert_u_period = imagePtr->vert_u_period;
+                pi->vert_v_period = imagePtr->vert_v_period;
+                memcpy(pi->component_order, imagePtr->component_order, 32);
+                pi->scanline_order = imagePtr->scanline_order;
+            }
+            pa->nImages = adaptorPtr->nImages;
+            pa->pImages = pImage;
+        }
+
+        if (adaptorPtr->nAttributes &&
+            (pAttribute =
+             calloc(adaptorPtr->nAttributes, sizeof(XvAttributeRec)))) {
+            for (pat = pAttribute, attributePtr = adaptorPtr->pAttributes, i =
+                 0; i < adaptorPtr->nAttributes; pat++, i++, attributePtr++) {
+                pat->flags = attributePtr->flags;
+                pat->min_value = attributePtr->min_value;
+                pat->max_value = attributePtr->max_value;
+                pat->name = strdup(attributePtr->name);
+            }
+            pa->nAttributes = adaptorPtr->nAttributes;
+            pa->pAttributes = pAttribute;
+        }
+
+        totFormat = adaptorPtr->nFormats;
+
+        if (!(pFormat = calloc(totFormat, sizeof(XvFormatRec)))) {
+            xf86XVFreeAdaptor(pa);
+            continue;
+        }
+        for (pf = pFormat, i = 0, numFormat = 0, formatPtr =
+             adaptorPtr->pFormats; i < adaptorPtr->nFormats; i++, formatPtr++) {
+            numVisuals = pScreen->numVisuals;
+            pVisual = pScreen->visuals;
+
+            while (numVisuals--) {
+                if ((pVisual->class == formatPtr->class) &&
+                    (pVisual->nplanes == formatPtr->depth)) {
+
+                    if (numFormat >= totFormat) {
+                        void *moreSpace;
+
+                        totFormat *= 2;
+                        moreSpace = realloc(pFormat,
+                                            totFormat * sizeof(XvFormatRec));
+                        if (!moreSpace)
+                            break;
+                        pFormat = moreSpace;
+                        pf = pFormat + numFormat;
+                    }
+
+                    pf->visual = pVisual->vid;
+                    pf->depth = formatPtr->depth;
+
+                    pf++;
+                    numFormat++;
+                }
+                pVisual++;
+            }
+        }
+        pa->nFormats = numFormat;
+        pa->pFormats = pFormat;
+        if (!numFormat) {
+            xf86XVFreeAdaptor(pa);
+            continue;
+        }
+
+        if (!(adaptorPriv = calloc(1, sizeof(XvAdaptorRecPrivate)))) {
+            xf86XVFreeAdaptor(pa);
+            continue;
+        }
+
+        adaptorPriv->flags = adaptorPtr->flags;
+        adaptorPriv->PutVideo = adaptorPtr->PutVideo;
+        adaptorPriv->PutStill = adaptorPtr->PutStill;
+        adaptorPriv->GetVideo = adaptorPtr->GetVideo;
+        adaptorPriv->GetStill = adaptorPtr->GetStill;
+        adaptorPriv->StopVideo = adaptorPtr->StopVideo;
+        adaptorPriv->SetPortAttribute = adaptorPtr->SetPortAttribute;
+        adaptorPriv->GetPortAttribute = adaptorPtr->GetPortAttribute;
+        adaptorPriv->QueryBestSize = adaptorPtr->QueryBestSize;
+        adaptorPriv->QueryImageAttributes = adaptorPtr->QueryImageAttributes;
+        adaptorPriv->PutImage = adaptorPtr->PutImage;
+        adaptorPriv->ReputImage = adaptorPtr->ReputImage;       /* image/still */
+
+        pa->devPriv.ptr = (pointer) adaptorPriv;
+
+        if (!(pPort = calloc(adaptorPtr->nPorts, sizeof(XvPortRec)))) {
+            xf86XVFreeAdaptor(pa);
+            continue;
+        }
+        for (pp = pPort, i = 0, numPort = 0; i < adaptorPtr->nPorts; i++) {
+
+            if (!(pp->id = FakeClientID(0)))
+                continue;
+
+            if (!(portPriv = calloc(1, sizeof(XvPortRecPrivate))))
+                continue;
+
+            if (!AddResource(pp->id, PortResource, pp)) {
+                free(portPriv);
+                continue;
+            }
+
+            pp->pAdaptor = pa;
+            pp->pNotify = (XvPortNotifyPtr) NULL;
+            pp->pDraw = (DrawablePtr) NULL;
+            pp->client = (ClientPtr) NULL;
+            pp->grab.client = (ClientPtr) NULL;
+            pp->time = currentTime;
+            pp->devPriv.ptr = portPriv;
+
+            portPriv->pScrn = pScrn;
+            portPriv->AdaptorRec = adaptorPriv;
+            portPriv->DevPriv.ptr = adaptorPtr->pPortPrivates[i].ptr;
+
+            pp++;
+            numPort++;
+        }
+        pa->nPorts = numPort;
+        pa->pPorts = pPort;
+        if (!numPort) {
+            xf86XVFreeAdaptor(pa);
+            continue;
+        }
+
+        pa->base_id = pPort->id;
+
+        pa++;
+        numAdaptor++;
+    }
+
+    if (numAdaptor) {
+        pxvs->nAdaptors = numAdaptor;
+        pxvs->pAdaptors = pAdaptor;
+    }
+    else {
+        free(pAdaptor);
+        return FALSE;
+    }
+
+    return TRUE;
 }
 
 /* Video should be clipped to the intersection of the window cliplist
@@ -650,66 +635,64 @@ xf86XVInitAdaptors(
 static void
 xf86XVUpdateCompositeClip(XvPortRecPrivatePtr portPriv)
 {
-   RegionPtr	pregWin, pCompositeClip;
-   WindowPtr	pWin;
-   Bool		freeCompClip = FALSE;
-
-   if(portPriv->pCompositeClip)
-	return;
-
-   pWin = (WindowPtr)portPriv->pDraw;
-
-   /* get window clip list */
-   if(portPriv->subWindowMode == IncludeInferiors) {
-	pregWin = NotClippedByChildren(pWin);
-	freeCompClip = TRUE;
-   } else
-	pregWin = &pWin->clipList;
-
-   if(!portPriv->clientClip) {
-	portPriv->pCompositeClip = pregWin;
-	portPriv->FreeCompositeClip = freeCompClip;
-	return;
-   }
-
-   pCompositeClip = RegionCreate(NullBox, 1);
-   RegionCopy(pCompositeClip, portPriv->clientClip);
-   RegionTranslate(pCompositeClip,
-		   portPriv->pDraw->x, portPriv->pDraw->y);
-   RegionIntersect(pCompositeClip, pregWin, pCompositeClip);
-
-   portPriv->pCompositeClip = pCompositeClip;
-   portPriv->FreeCompositeClip = TRUE;
-
-   if(freeCompClip) {
-	RegionDestroy(pregWin);
-   }
+    RegionPtr pregWin, pCompositeClip;
+    WindowPtr pWin;
+    Bool freeCompClip = FALSE;
+
+    if (portPriv->pCompositeClip)
+        return;
+
+    pWin = (WindowPtr) portPriv->pDraw;
+
+    /* get window clip list */
+    if (portPriv->subWindowMode == IncludeInferiors) {
+        pregWin = NotClippedByChildren(pWin);
+        freeCompClip = TRUE;
+    }
+    else
+        pregWin = &pWin->clipList;
+
+    if (!portPriv->clientClip) {
+        portPriv->pCompositeClip = pregWin;
+        portPriv->FreeCompositeClip = freeCompClip;
+        return;
+    }
+
+    pCompositeClip = RegionCreate(NullBox, 1);
+    RegionCopy(pCompositeClip, portPriv->clientClip);
+    RegionTranslate(pCompositeClip, portPriv->pDraw->x, portPriv->pDraw->y);
+    RegionIntersect(pCompositeClip, pregWin, pCompositeClip);
+
+    portPriv->pCompositeClip = pCompositeClip;
+    portPriv->FreeCompositeClip = TRUE;
+
+    if (freeCompClip) {
+        RegionDestroy(pregWin);
+    }
 }
 
 /* Save the current clientClip and update the CompositeClip whenever
    we have a fresh GC */
 
 static void
-xf86XVCopyClip(
-   XvPortRecPrivatePtr portPriv,
-   GCPtr pGC
-){
+xf86XVCopyClip(XvPortRecPrivatePtr portPriv, GCPtr pGC)
+{
     /* copy the new clip if it exists */
-    if((pGC->clientClipType == CT_REGION) && pGC->clientClip) {
-	if(!portPriv->clientClip)
-	    portPriv->clientClip = RegionCreate(NullBox, 1);
-	/* Note: this is in window coordinates */
-	RegionCopy(portPriv->clientClip, pGC->clientClip);
-	RegionTranslate(portPriv->clientClip,
-			pGC->clipOrg.x, pGC->clipOrg.y);
-    } else if(portPriv->clientClip) { /* free the old clientClip */
-	RegionDestroy(portPriv->clientClip);
-	portPriv->clientClip = NULL;
+    if ((pGC->clientClipType == CT_REGION) && pGC->clientClip) {
+        if (!portPriv->clientClip)
+            portPriv->clientClip = RegionCreate(NullBox, 1);
+        /* Note: this is in window coordinates */
+        RegionCopy(portPriv->clientClip, pGC->clientClip);
+        RegionTranslate(portPriv->clientClip, pGC->clipOrg.x, pGC->clipOrg.y);
+    }
+    else if (portPriv->clientClip) {    /* free the old clientClip */
+        RegionDestroy(portPriv->clientClip);
+        portPriv->clientClip = NULL;
     }
 
     /* get rid of the old clip list */
-    if(portPriv->pCompositeClip && portPriv->FreeCompositeClip) {
-	RegionDestroy(portPriv->pCompositeClip);
+    if (portPriv->pCompositeClip && portPriv->FreeCompositeClip) {
+        RegionDestroy(portPriv->pCompositeClip);
     }
 
     portPriv->pCompositeClip = pGC->pCompositeClip;
@@ -719,19 +702,17 @@ xf86XVCopyClip(
 
 static void
 xf86XVCopyCompositeClip(XvPortRecPrivatePtr portPriv,
-			GCPtr pGC,
-			DrawablePtr pDraw)
+                        GCPtr pGC, DrawablePtr pDraw)
 {
     if (!portPriv->clientClip)
-	portPriv->clientClip = RegionCreate(NullBox, 1);
+        portPriv->clientClip = RegionCreate(NullBox, 1);
     /* Keep the original GC composite clip around for ReputImage */
     RegionCopy(portPriv->clientClip, pGC->pCompositeClip);
-    RegionTranslate(portPriv->clientClip,
-		    -pDraw->x, -pDraw->y);
+    RegionTranslate(portPriv->clientClip, -pDraw->x, -pDraw->y);
 
     /* get rid of the old clip list */
     if (portPriv->pCompositeClip && portPriv->FreeCompositeClip)
-	RegionDestroy(portPriv->pCompositeClip);
+        RegionDestroy(portPriv->pCompositeClip);
 
     portPriv->pCompositeClip = pGC->pCompositeClip;
     portPriv->FreeCompositeClip = FALSE;
@@ -741,257 +722,257 @@ xf86XVCopyCompositeClip(XvPortRecPrivatePtr portPriv,
 static int
 xf86XVRegetVideo(XvPortRecPrivatePtr portPriv)
 {
-  RegionRec WinRegion;
-  RegionRec ClipRegion;
-  BoxRec WinBox;
-  int ret = Success;
-  Bool clippedAway = FALSE;
-
-  xf86XVUpdateCompositeClip(portPriv);
-
-  /* translate the video region to the screen */
-  WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;
-  WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;
-  WinBox.x2 = WinBox.x1 + portPriv->drw_w;
-  WinBox.y2 = WinBox.y1 + portPriv->drw_h;
-
-  /* clip to the window composite clip */
-  RegionInit(&WinRegion, &WinBox, 1);
-  RegionNull(&ClipRegion);
-  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);
-
-  /* that's all if it's totally obscured */
-  if(!RegionNotEmpty(&ClipRegion)) {
-	clippedAway = TRUE;
-	goto CLIP_VIDEO_BAILOUT;
-  }
-
-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
-  }
-
-  ret = (*portPriv->AdaptorRec->GetVideo)(portPriv->pScrn,
-			portPriv->vid_x, portPriv->vid_y,
-			WinBox.x1, WinBox.y1,
-			portPriv->vid_w, portPriv->vid_h,
-			portPriv->drw_w, portPriv->drw_h,
-			&ClipRegion, portPriv->DevPriv.ptr,
-			portPriv->pDraw);
-
-  if(ret == Success)
-	portPriv->isOn = XV_ON;
-
-CLIP_VIDEO_BAILOUT:
-
-  if((clippedAway || (ret != Success)) && portPriv->isOn == XV_ON) {
-	(*portPriv->AdaptorRec->StopVideo)(
-		portPriv->pScrn, portPriv->DevPriv.ptr, FALSE);
-	portPriv->isOn = XV_PENDING;
-  }
-
-  /* This clip was copied and only good for one shot */
-  if(!portPriv->FreeCompositeClip)
-     portPriv->pCompositeClip = NULL;
-
-  RegionUninit(&WinRegion);
-  RegionUninit(&ClipRegion);
-
-  return ret;
-}
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    xf86XVUpdateCompositeClip(portPriv);
+
+    /* translate the video region to the screen */
+    WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;
+    WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;
+    WinBox.x2 = WinBox.x1 + portPriv->drw_w;
+    WinBox.y2 = WinBox.y1 + portPriv->drw_h;
+
+    /* clip to the window composite clip */
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionNull(&ClipRegion);
+    RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);
+
+    /* that's all if it's totally obscured */
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto CLIP_VIDEO_BAILOUT;
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret = (*portPriv->AdaptorRec->GetVideo) (portPriv->pScrn,
+                                             portPriv->vid_x, portPriv->vid_y,
+                                             WinBox.x1, WinBox.y1,
+                                             portPriv->vid_w, portPriv->vid_h,
+                                             portPriv->drw_w, portPriv->drw_h,
+                                             &ClipRegion, portPriv->DevPriv.ptr,
+                                             portPriv->pDraw);
+
+    if (ret == Success)
+        portPriv->isOn = XV_ON;
+
+ CLIP_VIDEO_BAILOUT:
+
+    if ((clippedAway || (ret != Success)) && portPriv->isOn == XV_ON) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->pScrn,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
 
+    /* This clip was copied and only good for one shot */
+    if (!portPriv->FreeCompositeClip)
+        portPriv->pCompositeClip = NULL;
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
+}
 
 static int
 xf86XVReputVideo(XvPortRecPrivatePtr portPriv)
 {
-  RegionRec WinRegion;
-  RegionRec ClipRegion;
-  BoxRec WinBox;
-  int ret = Success;
-  Bool clippedAway = FALSE;
-
-  xf86XVUpdateCompositeClip(portPriv);
-
-  /* translate the video region to the screen */
-  WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;
-  WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;
-  WinBox.x2 = WinBox.x1 + portPriv->drw_w;
-  WinBox.y2 = WinBox.y1 + portPriv->drw_h;
-
-  /* clip to the window composite clip */
-  RegionInit(&WinRegion, &WinBox, 1);
-  RegionNull(&ClipRegion);
-  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);
-
-  /* clip and translate to the viewport */
-  if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
-     RegionRec VPReg;
-     BoxRec VPBox;
-
-     VPBox.x1 = portPriv->pScrn->frameX0;
-     VPBox.y1 = portPriv->pScrn->frameY0;
-     VPBox.x2 = portPriv->pScrn->frameX1 + 1;
-     VPBox.y2 = portPriv->pScrn->frameY1 + 1;
-
-     RegionInit(&VPReg, &VPBox, 1);
-     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
-     RegionUninit(&VPReg);
-  }
-
-  /* that's all if it's totally obscured */
-  if(!RegionNotEmpty(&ClipRegion)) {
-	clippedAway = TRUE;
-	goto CLIP_VIDEO_BAILOUT;
-  }
-
-  /* bailout if we have to clip but the hardware doesn't support it */
-  if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
-     BoxPtr clipBox = RegionRects(&ClipRegion);
-     if(  (RegionNumRects(&ClipRegion) != 1) ||
-	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
-	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))
-     {
-	    clippedAway = TRUE;
-	    goto CLIP_VIDEO_BAILOUT;
-     }
-  }
-
-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
-  }
-
-  ret = (*portPriv->AdaptorRec->PutVideo)(portPriv->pScrn,
-			portPriv->vid_x, portPriv->vid_y,
-			WinBox.x1, WinBox.y1,
-			portPriv->vid_w, portPriv->vid_h,
-			portPriv->drw_w, portPriv->drw_h,
-			&ClipRegion, portPriv->DevPriv.ptr,
-			portPriv->pDraw);
-
-  if(ret == Success) portPriv->isOn = XV_ON;
-
-CLIP_VIDEO_BAILOUT:
-
-  if((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
-	(*portPriv->AdaptorRec->StopVideo)(
-		portPriv->pScrn, portPriv->DevPriv.ptr, FALSE);
-	portPriv->isOn = XV_PENDING;
-  }
-
-  /* This clip was copied and only good for one shot */
-  if(!portPriv->FreeCompositeClip)
-     portPriv->pCompositeClip = NULL;
-
-  RegionUninit(&WinRegion);
-  RegionUninit(&ClipRegion);
-
-  return ret;
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    xf86XVUpdateCompositeClip(portPriv);
+
+    /* translate the video region to the screen */
+    WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;
+    WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;
+    WinBox.x2 = WinBox.x1 + portPriv->drw_w;
+    WinBox.y2 = WinBox.y1 + portPriv->drw_h;
+
+    /* clip to the window composite clip */
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionNull(&ClipRegion);
+    RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);
+
+    /* clip and translate to the viewport */
+    if (portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
+        RegionRec VPReg;
+        BoxRec VPBox;
+
+        VPBox.x1 = portPriv->pScrn->frameX0;
+        VPBox.y1 = portPriv->pScrn->frameY0;
+        VPBox.x2 = portPriv->pScrn->frameX1 + 1;
+        VPBox.y2 = portPriv->pScrn->frameY1 + 1;
+
+        RegionInit(&VPReg, &VPBox, 1);
+        RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
+        RegionUninit(&VPReg);
+    }
+
+    /* that's all if it's totally obscured */
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto CLIP_VIDEO_BAILOUT;
+    }
+
+    /* bailout if we have to clip but the hardware doesn't support it */
+    if (portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
+        BoxPtr clipBox = RegionRects(&ClipRegion);
+
+        if ((RegionNumRects(&ClipRegion) != 1) ||
+            (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
+            (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2)) {
+            clippedAway = TRUE;
+            goto CLIP_VIDEO_BAILOUT;
+        }
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret = (*portPriv->AdaptorRec->PutVideo) (portPriv->pScrn,
+                                             portPriv->vid_x, portPriv->vid_y,
+                                             WinBox.x1, WinBox.y1,
+                                             portPriv->vid_w, portPriv->vid_h,
+                                             portPriv->drw_w, portPriv->drw_h,
+                                             &ClipRegion, portPriv->DevPriv.ptr,
+                                             portPriv->pDraw);
+
+    if (ret == Success)
+        portPriv->isOn = XV_ON;
+
+ CLIP_VIDEO_BAILOUT:
+
+    if ((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->pScrn,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
+
+    /* This clip was copied and only good for one shot */
+    if (!portPriv->FreeCompositeClip)
+        portPriv->pCompositeClip = NULL;
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
 }
 
 /* Reput image/still */
 static int
 xf86XVReputImage(XvPortRecPrivatePtr portPriv)
 {
-  RegionRec WinRegion;
-  RegionRec ClipRegion;
-  BoxRec WinBox;
-  int ret = Success;
-  Bool clippedAway = FALSE;
-
-  xf86XVUpdateCompositeClip(portPriv);
-
-  /* the clip can get smaller over time */
-  RegionCopy(portPriv->clientClip, portPriv->pCompositeClip);
-  RegionTranslate(portPriv->clientClip,
-		  -portPriv->pDraw->x, -portPriv->pDraw->y);
-
-  /* translate the video region to the screen */
-  WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;
-  WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;
-  WinBox.x2 = WinBox.x1 + portPriv->drw_w;
-  WinBox.y2 = WinBox.y1 + portPriv->drw_h;
-
-  /* clip to the window composite clip */
-  RegionInit(&WinRegion, &WinBox, 1);
-  RegionNull(&ClipRegion);
-  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);
-
-  /* clip and translate to the viewport */
-  if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
-     RegionRec VPReg;
-     BoxRec VPBox;
-
-     VPBox.x1 = portPriv->pScrn->frameX0;
-     VPBox.y1 = portPriv->pScrn->frameY0;
-     VPBox.x2 = portPriv->pScrn->frameX1 + 1;
-     VPBox.y2 = portPriv->pScrn->frameY1 + 1;
-
-     RegionInit(&VPReg, &VPBox, 1);
-     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
-     RegionUninit(&VPReg);
-  }
-
-  /* that's all if it's totally obscured */
-  if(!RegionNotEmpty(&ClipRegion)) {
-	clippedAway = TRUE;
-	goto CLIP_VIDEO_BAILOUT;
-  }
-
-  /* bailout if we have to clip but the hardware doesn't support it */
-  if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
-     BoxPtr clipBox = RegionRects(&ClipRegion);
-     if(  (RegionNumRects(&ClipRegion) != 1) ||
-	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
-	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))
-     {
-	    clippedAway = TRUE;
-	    goto CLIP_VIDEO_BAILOUT;
-     }
-  }
-
-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
-  }
-
-  ret = (*portPriv->AdaptorRec->ReputImage)(portPriv->pScrn,
-			portPriv->vid_x, portPriv->vid_y,
-			WinBox.x1, WinBox.y1,
-			portPriv->vid_w, portPriv->vid_h,
-			portPriv->drw_w, portPriv->drw_h,
-			&ClipRegion, portPriv->DevPriv.ptr,
-			portPriv->pDraw);
-
-  portPriv->isOn = (ret == Success) ? XV_ON : XV_OFF;
-
-CLIP_VIDEO_BAILOUT:
-
-  if((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
-	(*portPriv->AdaptorRec->StopVideo)(
-		portPriv->pScrn, portPriv->DevPriv.ptr, FALSE);
-	portPriv->isOn = XV_PENDING;
-  }
-
-  /* This clip was copied and only good for one shot */
-  if(!portPriv->FreeCompositeClip)
-     portPriv->pCompositeClip = NULL;
-
-  RegionUninit(&WinRegion);
-  RegionUninit(&ClipRegion);
-
-  return ret;
-}
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    xf86XVUpdateCompositeClip(portPriv);
+
+    /* the clip can get smaller over time */
+    RegionCopy(portPriv->clientClip, portPriv->pCompositeClip);
+    RegionTranslate(portPriv->clientClip,
+                    -portPriv->pDraw->x, -portPriv->pDraw->y);
+
+    /* translate the video region to the screen */
+    WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;
+    WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;
+    WinBox.x2 = WinBox.x1 + portPriv->drw_w;
+    WinBox.y2 = WinBox.y1 + portPriv->drw_h;
+
+    /* clip to the window composite clip */
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionNull(&ClipRegion);
+    RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);
+
+    /* clip and translate to the viewport */
+    if (portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
+        RegionRec VPReg;
+        BoxRec VPBox;
+
+        VPBox.x1 = portPriv->pScrn->frameX0;
+        VPBox.y1 = portPriv->pScrn->frameY0;
+        VPBox.x2 = portPriv->pScrn->frameX1 + 1;
+        VPBox.y2 = portPriv->pScrn->frameY1 + 1;
+
+        RegionInit(&VPReg, &VPBox, 1);
+        RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
+        RegionUninit(&VPReg);
+    }
+
+    /* that's all if it's totally obscured */
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto CLIP_VIDEO_BAILOUT;
+    }
+
+    /* bailout if we have to clip but the hardware doesn't support it */
+    if (portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
+        BoxPtr clipBox = RegionRects(&ClipRegion);
+
+        if ((RegionNumRects(&ClipRegion) != 1) ||
+            (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
+            (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2)) {
+            clippedAway = TRUE;
+            goto CLIP_VIDEO_BAILOUT;
+        }
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret = (*portPriv->AdaptorRec->ReputImage) (portPriv->pScrn,
+                                               portPriv->vid_x, portPriv->vid_y,
+                                               WinBox.x1, WinBox.y1,
+                                               portPriv->vid_w, portPriv->vid_h,
+                                               portPriv->drw_w, portPriv->drw_h,
+                                               &ClipRegion,
+                                               portPriv->DevPriv.ptr,
+                                               portPriv->pDraw);
 
+    portPriv->isOn = (ret == Success) ? XV_ON : XV_OFF;
+
+ CLIP_VIDEO_BAILOUT:
+
+    if ((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->pScrn,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
+
+    /* This clip was copied and only good for one shot */
+    if (!portPriv->FreeCompositeClip)
+        portPriv->pCompositeClip = NULL;
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
+}
 
 static int
 xf86XVReputAllVideo(WindowPtr pWin, pointer data)
 {
     XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
 
-    while(WinPriv) {
-	if(WinPriv->PortRec->type == XvInputMask)
-	    xf86XVReputVideo(WinPriv->PortRec);
-	else
-	    xf86XVRegetVideo(WinPriv->PortRec);
-	WinPriv = WinPriv->next;
+    while (WinPriv) {
+        if (WinPriv->PortRec->type == XvInputMask)
+            xf86XVReputVideo(WinPriv->PortRec);
+        else
+            xf86XVRegetVideo(WinPriv->PortRec);
+        WinPriv = WinPriv->next;
     }
 
     return WT_WALKCHILDREN;
@@ -1000,86 +981,86 @@ xf86XVReputAllVideo(WindowPtr pWin, pointer data)
 static int
 xf86XVEnlistPortInWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
 {
-   XF86XVWindowPtr winPriv, PrivRoot;
+    XF86XVWindowPtr winPriv, PrivRoot;
 
-   winPriv = PrivRoot = GET_XF86XV_WINDOW(pWin);
+    winPriv = PrivRoot = GET_XF86XV_WINDOW(pWin);
 
-  /* Enlist our port in the window private */
-   while(winPriv) {
-	if(winPriv->PortRec == portPriv) /* we're already listed */
-	    break;
-	winPriv = winPriv->next;
-   }
+    /* Enlist our port in the window private */
+    while (winPriv) {
+        if (winPriv->PortRec == portPriv)       /* we're already listed */
+            break;
+        winPriv = winPriv->next;
+    }
 
-   if(!winPriv) {
-	winPriv = calloc(1, sizeof(XF86XVWindowRec));
-	if(!winPriv) return BadAlloc;
-	winPriv->PortRec = portPriv;
-	winPriv->next = PrivRoot;
-	dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey, winPriv);
-   }
+    if (!winPriv) {
+        winPriv = calloc(1, sizeof(XF86XVWindowRec));
+        if (!winPriv)
+            return BadAlloc;
+        winPriv->PortRec = portPriv;
+        winPriv->next = PrivRoot;
+        dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey, winPriv);
+    }
 
-   portPriv->pDraw = (DrawablePtr)pWin;
+    portPriv->pDraw = (DrawablePtr) pWin;
 
-   return Success;
+    return Success;
 }
 
-
 static void
 xf86XVRemovePortFromWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
 {
-     XF86XVWindowPtr winPriv, prevPriv = NULL;
-     winPriv = GET_XF86XV_WINDOW(pWin);
-
-     while(winPriv) {
-	if(winPriv->PortRec == portPriv) {
-	    if(prevPriv)
-		prevPriv->next = winPriv->next;
-	    else
-		dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey,
-			      winPriv->next);
-	    free(winPriv);
-	    break;
-	}
-	prevPriv = winPriv;
-	winPriv = winPriv->next;
-     }
-     portPriv->pDraw = NULL;
-     if (portPriv->ckeyFilled) {
-	RegionDestroy(portPriv->ckeyFilled);
-	portPriv->ckeyFilled = NULL;
-     }
-     portPriv->clipChanged = FALSE;
+    XF86XVWindowPtr winPriv, prevPriv = NULL;
+
+    winPriv = GET_XF86XV_WINDOW(pWin);
+
+    while (winPriv) {
+        if (winPriv->PortRec == portPriv) {
+            if (prevPriv)
+                prevPriv->next = winPriv->next;
+            else
+                dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey,
+                              winPriv->next);
+            free(winPriv);
+            break;
+        }
+        prevPriv = winPriv;
+        winPriv = winPriv->next;
+    }
+    portPriv->pDraw = NULL;
+    if (portPriv->ckeyFilled) {
+        RegionDestroy(portPriv->ckeyFilled);
+        portPriv->ckeyFilled = NULL;
+    }
+    portPriv->clipChanged = FALSE;
 }
 
 static void
-xf86XVReputOrStopPort(XvPortRecPrivatePtr pPriv,
-		      WindowPtr pWin,
-		      Bool visible)
+xf86XVReputOrStopPort(XvPortRecPrivatePtr pPriv, WindowPtr pWin, Bool visible)
 {
     if (!visible) {
-	if (pPriv->isOn == XV_ON) {
-	    (*pPriv->AdaptorRec->StopVideo)(pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);
-	    pPriv->isOn = XV_PENDING;
-	}
+        if (pPriv->isOn == XV_ON) {
+            (*pPriv->AdaptorRec->StopVideo) (pPriv->pScrn, pPriv->DevPriv.ptr,
+                                             FALSE);
+            pPriv->isOn = XV_PENDING;
+        }
 
-	if (!pPriv->type) /* overlaid still/image*/
-	    xf86XVRemovePortFromWindow(pWin, pPriv);
+        if (!pPriv->type)       /* overlaid still/image */
+            xf86XVRemovePortFromWindow(pWin, pPriv);
 
-	return;
+        return;
     }
 
     switch (pPriv->type) {
     case XvInputMask:
-	xf86XVReputVideo(pPriv);
-	break;
+        xf86XVReputVideo(pPriv);
+        break;
     case XvOutputMask:
-	xf86XVRegetVideo(pPriv);
-	break;
-    default:  /* overlaid still/image*/
-	if (pPriv->AdaptorRec->ReputImage)
-	    xf86XVReputImage(pPriv);
-	break;
+        xf86XVRegetVideo(pPriv);
+        break;
+    default:                   /* overlaid still/image */
+        if (pPriv->AdaptorRec->ReputImage)
+            xf86XVReputImage(pPriv);
+        break;
     }
 }
 
@@ -1092,33 +1073,34 @@ xf86XVReputOrStopAllPorts(ScrnInfoPtr pScrn, Bool onlyChanged)
     int c, i;
 
     for (c = pxvs->nAdaptors, pa = pxvs->pAdaptors; c > 0; c--, pa++) {
-	XvPortPtr pPort = pa->pPorts;
+        XvPortPtr pPort = pa->pPorts;
 
-	for (i = pa->nPorts; i > 0; i--, pPort++) {
-	    XvPortRecPrivatePtr pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;
-	    WindowPtr pWin = (WindowPtr)pPriv->pDraw;
-	    Bool visible;
+        for (i = pa->nPorts; i > 0; i--, pPort++) {
+            XvPortRecPrivatePtr pPriv =
+                (XvPortRecPrivatePtr) pPort->devPriv.ptr;
+            WindowPtr pWin = (WindowPtr) pPriv->pDraw;
+            Bool visible;
 
-	    if (pPriv->isOn == XV_OFF || !pWin)
-		continue;
+            if (pPriv->isOn == XV_OFF || !pWin)
+                continue;
 
-	    if (onlyChanged && !pPriv->clipChanged)
-		continue;
+            if (onlyChanged && !pPriv->clipChanged)
+                continue;
 
-	    visible = pWin->visibility == VisibilityUnobscured ||
-		      pWin->visibility == VisibilityPartiallyObscured;
+            visible = pWin->visibility == VisibilityUnobscured ||
+                pWin->visibility == VisibilityPartiallyObscured;
 
-	    /*
-	     * Stop and remove still/images if
-	     * ReputImage isn't supported.
-	     */
-	    if (!pPriv->type && !pPriv->AdaptorRec->ReputImage)
-		visible = FALSE;
+            /*
+             * Stop and remove still/images if
+             * ReputImage isn't supported.
+             */
+            if (!pPriv->type && !pPriv->AdaptorRec->ReputImage)
+                visible = FALSE;
 
-	    xf86XVReputOrStopPort(pPriv, pWin, visible);
+            xf86XVReputOrStopPort(pPriv, pWin, visible);
 
-	    pPriv->clipChanged = FALSE;
-	}
+            pPriv->clipChanged = FALSE;
+        }
     }
 }
 
@@ -1127,33 +1109,33 @@ xf86XVReputOrStopAllPorts(ScrnInfoPtr pScrn, Bool onlyChanged)
 static Bool
 xf86XVDestroyWindow(WindowPtr pWin)
 {
-  ScreenPtr pScreen = pWin->drawable.pScreen;
-  XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
-  XF86XVWindowPtr tmp, WinPriv = GET_XF86XV_WINDOW(pWin);
-  int ret;
-
-  while(WinPriv) {
-     XvPortRecPrivatePtr pPriv = WinPriv->PortRec;
-
-     if(pPriv->isOn > XV_OFF) {
-	(*pPriv->AdaptorRec->StopVideo)(
-			pPriv->pScrn, pPriv->DevPriv.ptr, TRUE);
-	pPriv->isOn = XV_OFF;
-     }
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
+    XF86XVWindowPtr tmp, WinPriv = GET_XF86XV_WINDOW(pWin);
+    int ret;
 
-     pPriv->pDraw = NULL;
-     tmp = WinPriv;
-     WinPriv = WinPriv->next;
-     free(tmp);
-  }
+    while (WinPriv) {
+        XvPortRecPrivatePtr pPriv = WinPriv->PortRec;
+
+        if (pPriv->isOn > XV_OFF) {
+            (*pPriv->AdaptorRec->StopVideo) (pPriv->pScrn, pPriv->DevPriv.ptr,
+                                             TRUE);
+            pPriv->isOn = XV_OFF;
+        }
+
+        pPriv->pDraw = NULL;
+        tmp = WinPriv;
+        WinPriv = WinPriv->next;
+        free(tmp);
+    }
 
-  dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey, NULL);
+    dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey, NULL);
 
-  pScreen->DestroyWindow = ScreenPriv->DestroyWindow;
-  ret = (*pScreen->DestroyWindow)(pWin);
-  pScreen->DestroyWindow = xf86XVDestroyWindow;
+    pScreen->DestroyWindow = ScreenPriv->DestroyWindow;
+    ret = (*pScreen->DestroyWindow) (pWin);
+    pScreen->DestroyWindow = xf86XVDestroyWindow;
 
-  return ret;
+    return ret;
 }
 
 static void
@@ -1164,9 +1146,9 @@ xf86XVPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin, VTKind kind)
     ScrnInfoPtr pScrn;
 
     if (pWin)
-	pScreen = pWin->drawable.pScreen;
+        pScreen = pWin->drawable.pScreen;
     else
-	pScreen = pLayerWin->drawable.pScreen;
+        pScreen = pLayerWin->drawable.pScreen;
 
     ScreenPriv = GET_XF86XV_SCREEN(pScreen);
     pScrn = xf86Screens[pScreen->myNum];
@@ -1175,7 +1157,7 @@ xf86XVPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin, VTKind kind)
 
     pScreen->PostValidateTree = ScreenPriv->PostValidateTree;
     if (pScreen->PostValidateTree) {
-	(*pScreen->PostValidateTree)(pWin, pLayerWin, kind);
+        (*pScreen->PostValidateTree) (pWin, pLayerWin, kind);
     }
     ScreenPriv->PostValidateTree = PostValidateTreeUndefined;
 }
@@ -1183,140 +1165,137 @@ xf86XVPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin, VTKind kind)
 static void
 xf86XVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
 {
-  ScreenPtr pScreen = pWin->drawable.pScreen;
-  XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
-  XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
-  XvPortRecPrivatePtr pPriv;
-  Bool AreasExposed;
-
-  AreasExposed = (WinPriv && reg1 && RegionNotEmpty(reg1));
-
-  pScreen->WindowExposures = ScreenPriv->WindowExposures;
-  (*pScreen->WindowExposures)(pWin, reg1, reg2);
-  pScreen->WindowExposures = xf86XVWindowExposures;
-
-  /* filter out XClearWindow/Area */
-  if (!pWin->valdata) return;
-
-  while(WinPriv) {
-     Bool visible = TRUE;
-
-     pPriv = WinPriv->PortRec;
-
-     /*
-      * Stop and remove still/images if areas were exposed and
-      * ReputImage isn't supported.
-      */
-     if (!pPriv->type && !pPriv->AdaptorRec->ReputImage)
-	visible = !AreasExposed;
-
-     /*
-      * Subtract exposed areas from overlaid image to match textured video
-      * behavior.
-      */
-     if (!pPriv->type && pPriv->clientClip)
-	    RegionSubtract(pPriv->clientClip, pPriv->clientClip, reg1);
-
-     if (visible && pPriv->ckeyFilled) {
-        RegionRec tmp;
-        RegionNull(&tmp);
-        RegionCopy(&tmp, reg1);
-        RegionTranslate(&tmp, pWin->drawable.x, pWin->drawable.y);
-        RegionSubtract(pPriv->ckeyFilled, pPriv->ckeyFilled, &tmp);
-     }
-
-     WinPriv = WinPriv->next;
-     xf86XVReputOrStopPort(pPriv, pWin, visible);
-
-     pPriv->clipChanged = FALSE;
-  }
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
+    XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
+    XvPortRecPrivatePtr pPriv;
+    Bool AreasExposed;
+
+    AreasExposed = (WinPriv && reg1 && RegionNotEmpty(reg1));
+
+    pScreen->WindowExposures = ScreenPriv->WindowExposures;
+    (*pScreen->WindowExposures) (pWin, reg1, reg2);
+    pScreen->WindowExposures = xf86XVWindowExposures;
+
+    /* filter out XClearWindow/Area */
+    if (!pWin->valdata)
+        return;
+
+    while (WinPriv) {
+        Bool visible = TRUE;
+
+        pPriv = WinPriv->PortRec;
+
+        /*
+         * Stop and remove still/images if areas were exposed and
+         * ReputImage isn't supported.
+         */
+        if (!pPriv->type && !pPriv->AdaptorRec->ReputImage)
+            visible = !AreasExposed;
+
+        /*
+         * Subtract exposed areas from overlaid image to match textured video
+         * behavior.
+         */
+        if (!pPriv->type && pPriv->clientClip)
+            RegionSubtract(pPriv->clientClip, pPriv->clientClip, reg1);
+
+        if (visible && pPriv->ckeyFilled) {
+            RegionRec tmp;
+
+            RegionNull(&tmp);
+            RegionCopy(&tmp, reg1);
+            RegionTranslate(&tmp, pWin->drawable.x, pWin->drawable.y);
+            RegionSubtract(pPriv->ckeyFilled, pPriv->ckeyFilled, &tmp);
+        }
+
+        WinPriv = WinPriv->next;
+        xf86XVReputOrStopPort(pPriv, pWin, visible);
+
+        pPriv->clipChanged = FALSE;
+    }
 }
 
 static void
 xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
 {
-  ScreenPtr pScreen = pWin->drawable.pScreen;
-  XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
-  XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
-  XvPortRecPrivatePtr pPriv;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
+    XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
+    XvPortRecPrivatePtr pPriv;
 
-  while(WinPriv) {
-     pPriv = WinPriv->PortRec;
+    while (WinPriv) {
+        pPriv = WinPriv->PortRec;
 
-     if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)
-	RegionDestroy(pPriv->pCompositeClip);
+        if (pPriv->pCompositeClip && pPriv->FreeCompositeClip)
+            RegionDestroy(pPriv->pCompositeClip);
 
-     pPriv->pCompositeClip = NULL;
+        pPriv->pCompositeClip = NULL;
 
-     if (pPriv->AdaptorRec->ClipNotify)
-        (*pPriv->AdaptorRec->ClipNotify)(pPriv->pScrn, pPriv->DevPriv.ptr,
-                                         pWin, dx, dy);
+        if (pPriv->AdaptorRec->ClipNotify)
+            (*pPriv->AdaptorRec->ClipNotify) (pPriv->pScrn, pPriv->DevPriv.ptr,
+                                              pWin, dx, dy);
 
-     pPriv->clipChanged = TRUE;
+        pPriv->clipChanged = TRUE;
 
-     if (ScreenPriv->PostValidateTree == PostValidateTreeUndefined) {
-        ScreenPriv->PostValidateTree = pScreen->PostValidateTree;
-        pScreen->PostValidateTree = xf86XVPostValidateTree;
-     }
+        if (ScreenPriv->PostValidateTree == PostValidateTreeUndefined) {
+            ScreenPriv->PostValidateTree = pScreen->PostValidateTree;
+            pScreen->PostValidateTree = xf86XVPostValidateTree;
+        }
 
-     WinPriv = WinPriv->next;
-  }
+        WinPriv = WinPriv->next;
+    }
 
-  if(ScreenPriv->ClipNotify) {
-      pScreen->ClipNotify = ScreenPriv->ClipNotify;
-      (*pScreen->ClipNotify)(pWin, dx, dy);
-      pScreen->ClipNotify = xf86XVClipNotify;
-  }
+    if (ScreenPriv->ClipNotify) {
+        pScreen->ClipNotify = ScreenPriv->ClipNotify;
+        (*pScreen->ClipNotify) (pWin, dx, dy);
+        pScreen->ClipNotify = xf86XVClipNotify;
+    }
 }
 
-
-
 /**** Required XvScreenRec fields ****/
 
 static Bool
 xf86XVCloseScreen(int i, ScreenPtr pScreen)
 {
-  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
-  XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
-  XvAdaptorPtr pa;
-  int c;
-
-  if(!ScreenPriv) return TRUE;
-
-  pScreen->DestroyWindow = ScreenPriv->DestroyWindow;
-  pScreen->WindowExposures = ScreenPriv->WindowExposures;
-  pScreen->ClipNotify = ScreenPriv->ClipNotify;
-
-  pScrn->EnterVT = ScreenPriv->EnterVT;
-  pScrn->LeaveVT = ScreenPriv->LeaveVT;
-  pScrn->AdjustFrame = ScreenPriv->AdjustFrame;
-  pScrn->ModeSet = ScreenPriv->ModeSet;
-
-  for(c = 0, pa = pxvs->pAdaptors; c < pxvs->nAdaptors; c++, pa++) {
-       xf86XVFreeAdaptor(pa);
-  }
-
-  free(pxvs->pAdaptors);
-  free(ScreenPriv);
-  return TRUE;
-}
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
+    XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
+    XvAdaptorPtr pa;
+    int c;
 
+    if (!ScreenPriv)
+        return TRUE;
 
-static int
-xf86XVQueryAdaptors(
-   ScreenPtr pScreen,
-   XvAdaptorPtr *p_pAdaptors,
-   int *p_nAdaptors
-){
-  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
+    pScreen->DestroyWindow = ScreenPriv->DestroyWindow;
+    pScreen->WindowExposures = ScreenPriv->WindowExposures;
+    pScreen->ClipNotify = ScreenPriv->ClipNotify;
+
+    pScrn->EnterVT = ScreenPriv->EnterVT;
+    pScrn->LeaveVT = ScreenPriv->LeaveVT;
+    pScrn->AdjustFrame = ScreenPriv->AdjustFrame;
+    pScrn->ModeSet = ScreenPriv->ModeSet;
 
-  *p_nAdaptors = pxvs->nAdaptors;
-  *p_pAdaptors = pxvs->pAdaptors;
+    for (c = 0, pa = pxvs->pAdaptors; c < pxvs->nAdaptors; c++, pa++) {
+        xf86XVFreeAdaptor(pa);
+    }
 
-  return Success;
+    free(pxvs->pAdaptors);
+    free(ScreenPriv);
+    return TRUE;
 }
 
+static int
+xf86XVQueryAdaptors(ScreenPtr pScreen,
+                    XvAdaptorPtr * p_pAdaptors, int *p_nAdaptors)
+{
+    XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
+
+    *p_nAdaptors = pxvs->nAdaptors;
+    *p_pAdaptors = pxvs->pAdaptors;
+
+    return Success;
+}
 
 /**** ScrnInfoRec fields ****/
 
@@ -1329,11 +1308,12 @@ xf86XVEnterVT(int index, int flags)
     Bool ret;
 
     pScrn->EnterVT = ScreenPriv->EnterVT;
-    ret = (*ScreenPriv->EnterVT)(index, flags);
+    ret = (*ScreenPriv->EnterVT) (index, flags);
     ScreenPriv->EnterVT = pScrn->EnterVT;
     pScrn->EnterVT = xf86XVEnterVT;
 
-    if(ret) WalkTree(pScreen, xf86XVReputAllVideo, 0);
+    if (ret)
+        WalkTree(pScreen, xf86XVReputAllVideo, 0);
 
     return ret;
 }
@@ -1350,31 +1330,31 @@ xf86XVLeaveVT(int index, int flags)
     XvPortRecPrivatePtr pPriv;
     int i, j;
 
-    for(i = 0; i < pxvs->nAdaptors; i++) {
-	pAdaptor = &pxvs->pAdaptors[i];
-	for(j = 0; j < pAdaptor->nPorts; j++) {
-	    pPort = &pAdaptor->pPorts[j];
-	    pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;
-	    if(pPriv->isOn > XV_OFF) {
+    for (i = 0; i < pxvs->nAdaptors; i++) {
+        pAdaptor = &pxvs->pAdaptors[i];
+        for (j = 0; j < pAdaptor->nPorts; j++) {
+            pPort = &pAdaptor->pPorts[j];
+            pPriv = (XvPortRecPrivatePtr) pPort->devPriv.ptr;
+            if (pPriv->isOn > XV_OFF) {
 
-		(*pPriv->AdaptorRec->StopVideo)(
-			pPriv->pScrn, pPriv->DevPriv.ptr, TRUE);
-		pPriv->isOn = XV_OFF;
+                (*pPriv->AdaptorRec->StopVideo) (pPriv->pScrn,
+                                                 pPriv->DevPriv.ptr, TRUE);
+                pPriv->isOn = XV_OFF;
 
-		if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)
-		    RegionDestroy(pPriv->pCompositeClip);
+                if (pPriv->pCompositeClip && pPriv->FreeCompositeClip)
+                    RegionDestroy(pPriv->pCompositeClip);
 
-		pPriv->pCompositeClip = NULL;
+                pPriv->pCompositeClip = NULL;
 
-		if(!pPriv->type && pPriv->pDraw) { /* still */
-		    xf86XVRemovePortFromWindow((WindowPtr)pPriv->pDraw, pPriv);
-		}
-	    }
-	}
+                if (!pPriv->type && pPriv->pDraw) {     /* still */
+                    xf86XVRemovePortFromWindow((WindowPtr) pPriv->pDraw, pPriv);
+                }
+            }
+        }
     }
 
     pScrn->LeaveVT = ScreenPriv->LeaveVT;
-    (*ScreenPriv->LeaveVT)(index, flags);
+    (*ScreenPriv->LeaveVT) (index, flags);
     ScreenPriv->LeaveVT = pScrn->LeaveVT;
     pScrn->LeaveVT = xf86XVLeaveVT;
 }
@@ -1382,17 +1362,17 @@ xf86XVLeaveVT(int index, int flags)
 static void
 xf86XVAdjustFrame(int index, int x, int y, int flags)
 {
-  ScrnInfoPtr pScrn = xf86Screens[index];
-  ScreenPtr pScreen = pScrn->pScreen;
-  XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[index];
+    ScreenPtr pScreen = pScrn->pScreen;
+    XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
 
-  if(ScreenPriv->AdjustFrame) {
-	pScrn->AdjustFrame = ScreenPriv->AdjustFrame;
-	(*pScrn->AdjustFrame)(index, x, y, flags);
-	pScrn->AdjustFrame = xf86XVAdjustFrame;
-  }
+    if (ScreenPriv->AdjustFrame) {
+        pScrn->AdjustFrame = ScreenPriv->AdjustFrame;
+        (*pScrn->AdjustFrame) (index, x, y, flags);
+        pScrn->AdjustFrame = xf86XVAdjustFrame;
+    }
 
-  xf86XVReputOrStopAllPorts(pScrn, FALSE);
+    xf86XVReputOrStopAllPorts(pScrn, FALSE);
 }
 
 static void
@@ -1403,14 +1383,14 @@ xf86XVModeSet(ScrnInfoPtr pScrn)
 
     /* Can be called before pScrn->pScreen is set */
     if (!pScreen)
-	return;
+        return;
 
     ScreenPriv = GET_XF86XV_SCREEN(pScreen);
 
     if (ScreenPriv->ModeSet) {
-	pScrn->ModeSet = ScreenPriv->ModeSet;
-	(*pScrn->ModeSet)(pScrn);
-	pScrn->ModeSet = xf86XVModeSet;
+        pScrn->ModeSet = ScreenPriv->ModeSet;
+        (*pScrn->ModeSet) (pScrn);
+        pScrn->ModeSet = xf86XVModeSet;
     }
 
     xf86XVReputOrStopAllPorts(pScrn, FALSE);
@@ -1419,589 +1399,583 @@ xf86XVModeSet(ScrnInfoPtr pScrn)
 /**** XvAdaptorRec fields ****/
 
 static int
-xf86XVAllocatePort(
-   unsigned long port,
-   XvPortPtr pPort,
-   XvPortPtr *ppPort
-){
-  *ppPort = pPort;
-  return Success;
+xf86XVAllocatePort(unsigned long port, XvPortPtr pPort, XvPortPtr * ppPort)
+{
+    *ppPort = pPort;
+    return Success;
 }
 
-
-
 static int
 xf86XVFreePort(XvPortPtr pPort)
 {
-  return Success;
+    return Success;
 }
 
-
 static int
-xf86XVPutVideo(
-   ClientPtr client,
-   DrawablePtr pDraw,
-   XvPortPtr pPort,
-   GCPtr pGC,
-   INT16 vid_x, INT16 vid_y,
-   CARD16 vid_w, CARD16 vid_h,
-   INT16 drw_x, INT16 drw_y,
-   CARD16 drw_w, CARD16 drw_h
-){
-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);
-  int result;
-
-  /* No dumping video to pixmaps... For now anyhow */
-  if(pDraw->type != DRAWABLE_WINDOW) {
-      pPort->pDraw = (DrawablePtr)NULL;
-      return BadAlloc;
-  }
-
-  /* If we are changing windows, unregister our port in the old window */
-  if(portPriv->pDraw && (portPriv->pDraw != pDraw))
-     xf86XVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);
-
-  /* Register our port with the new window */
-  result =  xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
-  if(result != Success) return result;
-
-  portPriv->type = XvInputMask;
-
-  /* save a copy of these parameters */
-  portPriv->vid_x = vid_x;  portPriv->vid_y = vid_y;
-  portPriv->vid_w = vid_w;  portPriv->vid_h = vid_h;
-  portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;
-  portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
-
-  /* make sure we have the most recent copy of the clientClip */
-  xf86XVCopyClip(portPriv, pGC);
-
-  /* To indicate to the DI layer that we were successful */
-  pPort->pDraw = pDraw;
-
-  if(!portPriv->pScrn->vtSema) return Success; /* Success ? */
-
-  return(xf86XVReputVideo(portPriv));
+xf86XVPutVideo(ClientPtr client,
+               DrawablePtr pDraw,
+               XvPortPtr pPort,
+               GCPtr pGC,
+               INT16 vid_x, INT16 vid_y,
+               CARD16 vid_w, CARD16 vid_h,
+               INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+    int result;
+
+    /* No dumping video to pixmaps... For now anyhow */
+    if (pDraw->type != DRAWABLE_WINDOW) {
+        pPort->pDraw = (DrawablePtr) NULL;
+        return BadAlloc;
+    }
+
+    /* If we are changing windows, unregister our port in the old window */
+    if (portPriv->pDraw && (portPriv->pDraw != pDraw))
+        xf86XVRemovePortFromWindow((WindowPtr) (portPriv->pDraw), portPriv);
+
+    /* Register our port with the new window */
+    result = xf86XVEnlistPortInWindow((WindowPtr) pDraw, portPriv);
+    if (result != Success)
+        return result;
+
+    portPriv->type = XvInputMask;
+
+    /* save a copy of these parameters */
+    portPriv->vid_x = vid_x;
+    portPriv->vid_y = vid_y;
+    portPriv->vid_w = vid_w;
+    portPriv->vid_h = vid_h;
+    portPriv->drw_x = drw_x;
+    portPriv->drw_y = drw_y;
+    portPriv->drw_w = drw_w;
+    portPriv->drw_h = drw_h;
+
+    /* make sure we have the most recent copy of the clientClip */
+    xf86XVCopyClip(portPriv, pGC);
+
+    /* To indicate to the DI layer that we were successful */
+    pPort->pDraw = pDraw;
+
+    if (!portPriv->pScrn->vtSema)
+        return Success;         /* Success ? */
+
+    return (xf86XVReputVideo(portPriv));
 }
 
 static int
-xf86XVPutStill(
-   ClientPtr client,
-   DrawablePtr pDraw,
-   XvPortPtr pPort,
-   GCPtr pGC,
-   INT16 vid_x, INT16 vid_y,
-   CARD16 vid_w, CARD16 vid_h,
-   INT16 drw_x, INT16 drw_y,
-   CARD16 drw_w, CARD16 drw_h
-){
-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);
-  RegionRec WinRegion;
-  RegionRec ClipRegion;
-  BoxRec WinBox;
-  int ret = Success;
-  Bool clippedAway = FALSE;
-
-  if (pDraw->type != DRAWABLE_WINDOW)
-      return BadAlloc;
-
-  if(!portPriv->pScrn->vtSema) return Success; /* Success ? */
-
-  WinBox.x1 = pDraw->x + drw_x;
-  WinBox.y1 = pDraw->y + drw_y;
-  WinBox.x2 = WinBox.x1 + drw_w;
-  WinBox.y2 = WinBox.y1 + drw_h;
-
-  xf86XVCopyCompositeClip(portPriv, pGC, pDraw);
-
-  RegionInit(&WinRegion, &WinBox, 1);
-  RegionNull(&ClipRegion);
-  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);
-
-  if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
-     RegionRec VPReg;
-     BoxRec VPBox;
-
-     VPBox.x1 = portPriv->pScrn->frameX0;
-     VPBox.y1 = portPriv->pScrn->frameY0;
-     VPBox.x2 = portPriv->pScrn->frameX1 + 1;
-     VPBox.y2 = portPriv->pScrn->frameY1 + 1;
-
-     RegionInit(&VPReg, &VPBox, 1);
-     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
-     RegionUninit(&VPReg);
-  }
-
-  if(portPriv->pDraw) {
-     xf86XVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);
-  }
-
-  if(!RegionNotEmpty(&ClipRegion)) {
-     clippedAway = TRUE;
-     goto PUT_STILL_BAILOUT;
-  }
-
-  if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
-     BoxPtr clipBox = RegionRects(&ClipRegion);
-     if(  (RegionNumRects(&ClipRegion) != 1) ||
-	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
-	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))
-     {
-	  clippedAway = TRUE;
-	  goto PUT_STILL_BAILOUT;
-     }
-  }
-
-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
-  }
-
-  ret = (*portPriv->AdaptorRec->PutStill)(portPriv->pScrn,
-		vid_x, vid_y, WinBox.x1, WinBox.y1,
-		vid_w, vid_h, drw_w, drw_h,
-		&ClipRegion, portPriv->DevPriv.ptr,
-		pDraw);
-
-  if((ret == Success) &&
-	(portPriv->AdaptorRec->flags & VIDEO_OVERLAID_STILLS)) {
-
-     xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
-     portPriv->isOn = XV_ON;
-     portPriv->vid_x = vid_x;  portPriv->vid_y = vid_y;
-     portPriv->vid_w = vid_w;  portPriv->vid_h = vid_h;
-     portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;
-     portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
-     portPriv->type = 0;  /* no mask means it's transient and should
-			     not be reput once it's removed */
-     pPort->pDraw = pDraw;  /* make sure we can get stop requests */
-  }
-
-PUT_STILL_BAILOUT:
-
-  if((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
-	(*portPriv->AdaptorRec->StopVideo)(
-		portPriv->pScrn, portPriv->DevPriv.ptr, FALSE);
-	portPriv->isOn = XV_PENDING;
-  }
-
-  /* This clip was copied and only good for one shot */
-  if(!portPriv->FreeCompositeClip)
-     portPriv->pCompositeClip = NULL;
-
-  RegionUninit(&WinRegion);
-  RegionUninit(&ClipRegion);
-
-  return ret;
+xf86XVPutStill(ClientPtr client,
+               DrawablePtr pDraw,
+               XvPortPtr pPort,
+               GCPtr pGC,
+               INT16 vid_x, INT16 vid_y,
+               CARD16 vid_w, CARD16 vid_h,
+               INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    if (pDraw->type != DRAWABLE_WINDOW)
+        return BadAlloc;
+
+    if (!portPriv->pScrn->vtSema)
+        return Success;         /* Success ? */
+
+    WinBox.x1 = pDraw->x + drw_x;
+    WinBox.y1 = pDraw->y + drw_y;
+    WinBox.x2 = WinBox.x1 + drw_w;
+    WinBox.y2 = WinBox.y1 + drw_h;
+
+    xf86XVCopyCompositeClip(portPriv, pGC, pDraw);
+
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionNull(&ClipRegion);
+    RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);
+
+    if (portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
+        RegionRec VPReg;
+        BoxRec VPBox;
+
+        VPBox.x1 = portPriv->pScrn->frameX0;
+        VPBox.y1 = portPriv->pScrn->frameY0;
+        VPBox.x2 = portPriv->pScrn->frameX1 + 1;
+        VPBox.y2 = portPriv->pScrn->frameY1 + 1;
+
+        RegionInit(&VPReg, &VPBox, 1);
+        RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
+        RegionUninit(&VPReg);
+    }
+
+    if (portPriv->pDraw) {
+        xf86XVRemovePortFromWindow((WindowPtr) (portPriv->pDraw), portPriv);
+    }
+
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto PUT_STILL_BAILOUT;
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
+        BoxPtr clipBox = RegionRects(&ClipRegion);
+
+        if ((RegionNumRects(&ClipRegion) != 1) ||
+            (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
+            (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2)) {
+            clippedAway = TRUE;
+            goto PUT_STILL_BAILOUT;
+        }
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret = (*portPriv->AdaptorRec->PutStill) (portPriv->pScrn,
+                                             vid_x, vid_y, WinBox.x1, WinBox.y1,
+                                             vid_w, vid_h, drw_w, drw_h,
+                                             &ClipRegion, portPriv->DevPriv.ptr,
+                                             pDraw);
+
+    if ((ret == Success) &&
+        (portPriv->AdaptorRec->flags & VIDEO_OVERLAID_STILLS)) {
+
+        xf86XVEnlistPortInWindow((WindowPtr) pDraw, portPriv);
+        portPriv->isOn = XV_ON;
+        portPriv->vid_x = vid_x;
+        portPriv->vid_y = vid_y;
+        portPriv->vid_w = vid_w;
+        portPriv->vid_h = vid_h;
+        portPriv->drw_x = drw_x;
+        portPriv->drw_y = drw_y;
+        portPriv->drw_w = drw_w;
+        portPriv->drw_h = drw_h;
+        portPriv->type = 0;     /* no mask means it's transient and should
+                                   not be reput once it's removed */
+        pPort->pDraw = pDraw;   /* make sure we can get stop requests */
+    }
+
+ PUT_STILL_BAILOUT:
+
+    if ((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->pScrn,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
+
+    /* This clip was copied and only good for one shot */
+    if (!portPriv->FreeCompositeClip)
+        portPriv->pCompositeClip = NULL;
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
 }
 
 static int
-xf86XVGetVideo(
-   ClientPtr client,
-   DrawablePtr pDraw,
-   XvPortPtr pPort,
-   GCPtr pGC,
-   INT16 vid_x, INT16 vid_y,
-   CARD16 vid_w, CARD16 vid_h,
-   INT16 drw_x, INT16 drw_y,
-   CARD16 drw_w, CARD16 drw_h
-){
-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);
-  int result;
-
-  /* No pixmaps... For now anyhow */
-  if(pDraw->type != DRAWABLE_WINDOW) {
-      pPort->pDraw = (DrawablePtr)NULL;
-      return BadAlloc;
-  }
-
-  /* If we are changing windows, unregister our port in the old window */
-  if(portPriv->pDraw && (portPriv->pDraw != pDraw))
-     xf86XVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);
-
-  /* Register our port with the new window */
-  result =  xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
-  if(result != Success) return result;
-
-  portPriv->type = XvOutputMask;
-
-  /* save a copy of these parameters */
-  portPriv->vid_x = vid_x;  portPriv->vid_y = vid_y;
-  portPriv->vid_w = vid_w;  portPriv->vid_h = vid_h;
-  portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;
-  portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
-
-  /* make sure we have the most recent copy of the clientClip */
-  xf86XVCopyClip(portPriv, pGC);
-
-  /* To indicate to the DI layer that we were successful */
-  pPort->pDraw = pDraw;
-
-  if(!portPriv->pScrn->vtSema) return Success; /* Success ? */
-
-  return(xf86XVRegetVideo(portPriv));
+xf86XVGetVideo(ClientPtr client,
+               DrawablePtr pDraw,
+               XvPortPtr pPort,
+               GCPtr pGC,
+               INT16 vid_x, INT16 vid_y,
+               CARD16 vid_w, CARD16 vid_h,
+               INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+    int result;
+
+    /* No pixmaps... For now anyhow */
+    if (pDraw->type != DRAWABLE_WINDOW) {
+        pPort->pDraw = (DrawablePtr) NULL;
+        return BadAlloc;
+    }
+
+    /* If we are changing windows, unregister our port in the old window */
+    if (portPriv->pDraw && (portPriv->pDraw != pDraw))
+        xf86XVRemovePortFromWindow((WindowPtr) (portPriv->pDraw), portPriv);
+
+    /* Register our port with the new window */
+    result = xf86XVEnlistPortInWindow((WindowPtr) pDraw, portPriv);
+    if (result != Success)
+        return result;
+
+    portPriv->type = XvOutputMask;
+
+    /* save a copy of these parameters */
+    portPriv->vid_x = vid_x;
+    portPriv->vid_y = vid_y;
+    portPriv->vid_w = vid_w;
+    portPriv->vid_h = vid_h;
+    portPriv->drw_x = drw_x;
+    portPriv->drw_y = drw_y;
+    portPriv->drw_w = drw_w;
+    portPriv->drw_h = drw_h;
+
+    /* make sure we have the most recent copy of the clientClip */
+    xf86XVCopyClip(portPriv, pGC);
+
+    /* To indicate to the DI layer that we were successful */
+    pPort->pDraw = pDraw;
+
+    if (!portPriv->pScrn->vtSema)
+        return Success;         /* Success ? */
+
+    return (xf86XVRegetVideo(portPriv));
 }
 
 static int
-xf86XVGetStill(
-   ClientPtr client,
-   DrawablePtr pDraw,
-   XvPortPtr pPort,
-   GCPtr pGC,
-   INT16 vid_x, INT16 vid_y,
-   CARD16 vid_w, CARD16 vid_h,
-   INT16 drw_x, INT16 drw_y,
-   CARD16 drw_w, CARD16 drw_h
-){
-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);
-  RegionRec WinRegion;
-  RegionRec ClipRegion;
-  BoxRec WinBox;
-  int ret = Success;
-  Bool clippedAway = FALSE;
-
-  if (pDraw->type != DRAWABLE_WINDOW)
-      return BadAlloc;
-
-  if(!portPriv->pScrn->vtSema) return Success; /* Success ? */
-
-  WinBox.x1 = pDraw->x + drw_x;
-  WinBox.y1 = pDraw->y + drw_y;
-  WinBox.x2 = WinBox.x1 + drw_w;
-  WinBox.y2 = WinBox.y1 + drw_h;
-
-  RegionInit(&WinRegion, &WinBox, 1);
-  RegionNull(&ClipRegion);
-  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);
-
-  if(portPriv->pDraw) {
-     xf86XVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);
-  }
-
-  if(!RegionNotEmpty(&ClipRegion)) {
-     clippedAway = TRUE;
-     goto GET_STILL_BAILOUT;
-  }
-
-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
-  }
-
-  ret = (*portPriv->AdaptorRec->GetStill)(portPriv->pScrn,
-		vid_x, vid_y, WinBox.x1, WinBox.y1,
-		vid_w, vid_h, drw_w, drw_h,
-		&ClipRegion, portPriv->DevPriv.ptr,
-		pDraw);
-
-GET_STILL_BAILOUT:
-
-  if((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
-	(*portPriv->AdaptorRec->StopVideo)(
-		portPriv->pScrn, portPriv->DevPriv.ptr, FALSE);
-	portPriv->isOn = XV_PENDING;
-  }
-
-  RegionUninit(&WinRegion);
-  RegionUninit(&ClipRegion);
-
-  return ret;
-}
+xf86XVGetStill(ClientPtr client,
+               DrawablePtr pDraw,
+               XvPortPtr pPort,
+               GCPtr pGC,
+               INT16 vid_x, INT16 vid_y,
+               CARD16 vid_w, CARD16 vid_h,
+               INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    if (pDraw->type != DRAWABLE_WINDOW)
+        return BadAlloc;
+
+    if (!portPriv->pScrn->vtSema)
+        return Success;         /* Success ? */
+
+    WinBox.x1 = pDraw->x + drw_x;
+    WinBox.y1 = pDraw->y + drw_y;
+    WinBox.x2 = WinBox.x1 + drw_w;
+    WinBox.y2 = WinBox.y1 + drw_h;
+
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionNull(&ClipRegion);
+    RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);
+
+    if (portPriv->pDraw) {
+        xf86XVRemovePortFromWindow((WindowPtr) (portPriv->pDraw), portPriv);
+    }
+
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto GET_STILL_BAILOUT;
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret = (*portPriv->AdaptorRec->GetStill) (portPriv->pScrn,
+                                             vid_x, vid_y, WinBox.x1, WinBox.y1,
+                                             vid_w, vid_h, drw_w, drw_h,
+                                             &ClipRegion, portPriv->DevPriv.ptr,
+                                             pDraw);
 
+ GET_STILL_BAILOUT:
 
+    if ((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->pScrn,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
+}
 
 static int
-xf86XVStopVideo(
-   ClientPtr client,
-   XvPortPtr pPort,
-   DrawablePtr pDraw
-){
-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);
+xf86XVStopVideo(ClientPtr client, XvPortPtr pPort, DrawablePtr pDraw)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
 
-  if(pDraw->type != DRAWABLE_WINDOW)
-      return BadAlloc;
+    if (pDraw->type != DRAWABLE_WINDOW)
+        return BadAlloc;
 
-  xf86XVRemovePortFromWindow((WindowPtr)pDraw, portPriv);
+    xf86XVRemovePortFromWindow((WindowPtr) pDraw, portPriv);
 
-  if(!portPriv->pScrn->vtSema) return Success; /* Success ? */
+    if (!portPriv->pScrn->vtSema)
+        return Success;         /* Success ? */
 
-  /* Must free resources. */
+    /* Must free resources. */
 
-  if(portPriv->isOn > XV_OFF) {
-	(*portPriv->AdaptorRec->StopVideo)(
-		portPriv->pScrn, portPriv->DevPriv.ptr, TRUE);
-	portPriv->isOn = XV_OFF;
-  }
+    if (portPriv->isOn > XV_OFF) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->pScrn,
+                                            portPriv->DevPriv.ptr, TRUE);
+        portPriv->isOn = XV_OFF;
+    }
 
-  return Success;
+    return Success;
 }
 
 static int
-xf86XVSetPortAttribute(
-   ClientPtr client,
-   XvPortPtr pPort,
-   Atom attribute,
-   INT32 value
-){
-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);
-
-  return((*portPriv->AdaptorRec->SetPortAttribute)(portPriv->pScrn,
-		attribute, value, portPriv->DevPriv.ptr));
-}
+xf86XVSetPortAttribute(ClientPtr client,
+                       XvPortPtr pPort, Atom attribute, INT32 value)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
 
+    return ((*portPriv->AdaptorRec->SetPortAttribute) (portPriv->pScrn,
+                                                       attribute, value,
+                                                       portPriv->DevPriv.ptr));
+}
 
 static int
-xf86XVGetPortAttribute(
-   ClientPtr client,
-   XvPortPtr pPort,
-   Atom attribute,
-   INT32 *p_value
-){
-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);
-
-  return((*portPriv->AdaptorRec->GetPortAttribute)(portPriv->pScrn,
-		attribute, p_value, portPriv->DevPriv.ptr));
+xf86XVGetPortAttribute(ClientPtr client,
+                       XvPortPtr pPort, Atom attribute, INT32 *p_value)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+
+    return ((*portPriv->AdaptorRec->GetPortAttribute) (portPriv->pScrn,
+                                                       attribute, p_value,
+                                                       portPriv->DevPriv.ptr));
 }
 
+static int
+xf86XVQueryBestSize(ClientPtr client,
+                    XvPortPtr pPort,
+                    CARD8 motion,
+                    CARD16 vid_w, CARD16 vid_h,
+                    CARD16 drw_w, CARD16 drw_h,
+                    unsigned int *p_w, unsigned int *p_h)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
 
+    (*portPriv->AdaptorRec->QueryBestSize) (portPriv->pScrn,
+                                            (Bool) motion, vid_w, vid_h, drw_w,
+                                            drw_h, p_w, p_h,
+                                            portPriv->DevPriv.ptr);
 
-static int
-xf86XVQueryBestSize(
-   ClientPtr client,
-   XvPortPtr pPort,
-   CARD8 motion,
-   CARD16 vid_w, CARD16 vid_h,
-   CARD16 drw_w, CARD16 drw_h,
-   unsigned int *p_w, unsigned int *p_h
-){
-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);
-
-  (*portPriv->AdaptorRec->QueryBestSize)(portPriv->pScrn,
-		(Bool)motion, vid_w, vid_h, drw_w, drw_h,
-		p_w, p_h, portPriv->DevPriv.ptr);
-
-  return Success;
+    return Success;
 }
 
-
 static int
-xf86XVPutImage(
-   ClientPtr client,
-   DrawablePtr pDraw,
-   XvPortPtr pPort,
-   GCPtr pGC,
-   INT16 src_x, INT16 src_y,
-   CARD16 src_w, CARD16 src_h,
-   INT16 drw_x, INT16 drw_y,
-   CARD16 drw_w, CARD16 drw_h,
-   XvImagePtr format,
-   unsigned char* data,
-   Bool sync,
-   CARD16 width, CARD16 height
-){
-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);
-  RegionRec WinRegion;
-  RegionRec ClipRegion;
-  BoxRec WinBox;
-  int ret = Success;
-  Bool clippedAway = FALSE;
-
-  if (pDraw->type != DRAWABLE_WINDOW)
-      return BadAlloc;
-
-  if(!portPriv->pScrn->vtSema) return Success; /* Success ? */
-
-  xf86XVCopyCompositeClip(portPriv, pGC, pDraw);
-
-  WinBox.x1 = pDraw->x + drw_x;
-  WinBox.y1 = pDraw->y + drw_y;
-  WinBox.x2 = WinBox.x1 + drw_w;
-  WinBox.y2 = WinBox.y1 + drw_h;
-
-  RegionInit(&WinRegion, &WinBox, 1);
-  RegionNull(&ClipRegion);
-  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);
-
-  if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
-     RegionRec VPReg;
-     BoxRec VPBox;
-
-     VPBox.x1 = portPriv->pScrn->frameX0;
-     VPBox.y1 = portPriv->pScrn->frameY0;
-     VPBox.x2 = portPriv->pScrn->frameX1 + 1;
-     VPBox.y2 = portPriv->pScrn->frameY1 + 1;
-
-     RegionInit(&VPReg, &VPBox, 1);
-     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
-     RegionUninit(&VPReg);
-  }
-
-  /* If we are changing windows, unregister our port in the old window */
-  if(portPriv->pDraw && (portPriv->pDraw != pDraw))
-     xf86XVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);
-
-  /* Register our port with the new window */
-  ret =  xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
-  if(ret != Success) goto PUT_IMAGE_BAILOUT;
-
-  if(!RegionNotEmpty(&ClipRegion)) {
-     clippedAway = TRUE;
-     goto PUT_IMAGE_BAILOUT;
-  }
-
-  if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
-     BoxPtr clipBox = RegionRects(&ClipRegion);
-     if(  (RegionNumRects(&ClipRegion) != 1) ||
-	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
-	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))
-     {
-	  clippedAway = TRUE;
-	  goto PUT_IMAGE_BAILOUT;
-     }
-  }
-
-  if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
-     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
-  }
-
-  ret = (*portPriv->AdaptorRec->PutImage)(portPriv->pScrn,
-		src_x, src_y, WinBox.x1, WinBox.y1,
-		src_w, src_h, drw_w, drw_h, format->id, data, width, height,
-		sync, &ClipRegion, portPriv->DevPriv.ptr,
-		pDraw);
-
-  if((ret == Success) &&
-	(portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {
-
-     portPriv->isOn = XV_ON;
-     portPriv->vid_x = src_x;  portPriv->vid_y = src_y;
-     portPriv->vid_w = src_w;  portPriv->vid_h = src_h;
-     portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;
-     portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
-     portPriv->type = 0;  /* no mask means it's transient and should
-			     not be reput once it's removed */
-     pPort->pDraw = pDraw;  /* make sure we can get stop requests */
-  }
-
-PUT_IMAGE_BAILOUT:
-
-  if((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
-	(*portPriv->AdaptorRec->StopVideo)(
-		portPriv->pScrn, portPriv->DevPriv.ptr, FALSE);
-	portPriv->isOn = XV_PENDING;
-  }
-
-  /* This clip was copied and only good for one shot */
-  if(!portPriv->FreeCompositeClip)
-     portPriv->pCompositeClip = NULL;
-
-  RegionUninit(&WinRegion);
-  RegionUninit(&ClipRegion);
-
-  return ret;
+xf86XVPutImage(ClientPtr client,
+               DrawablePtr pDraw,
+               XvPortPtr pPort,
+               GCPtr pGC,
+               INT16 src_x, INT16 src_y,
+               CARD16 src_w, CARD16 src_h,
+               INT16 drw_x, INT16 drw_y,
+               CARD16 drw_w, CARD16 drw_h,
+               XvImagePtr format,
+               unsigned char *data, Bool sync, CARD16 width, CARD16 height)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+    RegionRec WinRegion;
+    RegionRec ClipRegion;
+    BoxRec WinBox;
+    int ret = Success;
+    Bool clippedAway = FALSE;
+
+    if (pDraw->type != DRAWABLE_WINDOW)
+        return BadAlloc;
+
+    if (!portPriv->pScrn->vtSema)
+        return Success;         /* Success ? */
+
+    xf86XVCopyCompositeClip(portPriv, pGC, pDraw);
+
+    WinBox.x1 = pDraw->x + drw_x;
+    WinBox.y1 = pDraw->y + drw_y;
+    WinBox.x2 = WinBox.x1 + drw_w;
+    WinBox.y2 = WinBox.y1 + drw_h;
+
+    RegionInit(&WinRegion, &WinBox, 1);
+    RegionNull(&ClipRegion);
+    RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);
+
+    if (portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {
+        RegionRec VPReg;
+        BoxRec VPBox;
+
+        VPBox.x1 = portPriv->pScrn->frameX0;
+        VPBox.y1 = portPriv->pScrn->frameY0;
+        VPBox.x2 = portPriv->pScrn->frameX1 + 1;
+        VPBox.y2 = portPriv->pScrn->frameY1 + 1;
+
+        RegionInit(&VPReg, &VPBox, 1);
+        RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);
+        RegionUninit(&VPReg);
+    }
+
+    /* If we are changing windows, unregister our port in the old window */
+    if (portPriv->pDraw && (portPriv->pDraw != pDraw))
+        xf86XVRemovePortFromWindow((WindowPtr) (portPriv->pDraw), portPriv);
+
+    /* Register our port with the new window */
+    ret = xf86XVEnlistPortInWindow((WindowPtr) pDraw, portPriv);
+    if (ret != Success)
+        goto PUT_IMAGE_BAILOUT;
+
+    if (!RegionNotEmpty(&ClipRegion)) {
+        clippedAway = TRUE;
+        goto PUT_IMAGE_BAILOUT;
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {
+        BoxPtr clipBox = RegionRects(&ClipRegion);
+
+        if ((RegionNumRects(&ClipRegion) != 1) ||
+            (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||
+            (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2)) {
+            clippedAway = TRUE;
+            goto PUT_IMAGE_BAILOUT;
+        }
+    }
+
+    if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
+        RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
+    }
+
+    ret = (*portPriv->AdaptorRec->PutImage) (portPriv->pScrn,
+                                             src_x, src_y, WinBox.x1, WinBox.y1,
+                                             src_w, src_h, drw_w, drw_h,
+                                             format->id, data, width, height,
+                                             sync, &ClipRegion,
+                                             portPriv->DevPriv.ptr, pDraw);
+
+    if ((ret == Success) &&
+        (portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {
+
+        portPriv->isOn = XV_ON;
+        portPriv->vid_x = src_x;
+        portPriv->vid_y = src_y;
+        portPriv->vid_w = src_w;
+        portPriv->vid_h = src_h;
+        portPriv->drw_x = drw_x;
+        portPriv->drw_y = drw_y;
+        portPriv->drw_w = drw_w;
+        portPriv->drw_h = drw_h;
+        portPriv->type = 0;     /* no mask means it's transient and should
+                                   not be reput once it's removed */
+        pPort->pDraw = pDraw;   /* make sure we can get stop requests */
+    }
+
+ PUT_IMAGE_BAILOUT:
+
+    if ((clippedAway || (ret != Success)) && (portPriv->isOn == XV_ON)) {
+        (*portPriv->AdaptorRec->StopVideo) (portPriv->pScrn,
+                                            portPriv->DevPriv.ptr, FALSE);
+        portPriv->isOn = XV_PENDING;
+    }
+
+    /* This clip was copied and only good for one shot */
+    if (!portPriv->FreeCompositeClip)
+        portPriv->pCompositeClip = NULL;
+
+    RegionUninit(&WinRegion);
+    RegionUninit(&ClipRegion);
+
+    return ret;
 }
 
+static int
+xf86XVQueryImageAttributes(ClientPtr client,
+                           XvPortPtr pPort,
+                           XvImagePtr format,
+                           CARD16 *width,
+                           CARD16 *height, int *pitches, int *offsets)
+{
+    XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
 
-static  int
-xf86XVQueryImageAttributes(
-   ClientPtr client,
-   XvPortPtr pPort,
-   XvImagePtr format,
-   CARD16 *width,
-   CARD16 *height,
-   int *pitches,
-   int *offsets
-){
-  XvPortRecPrivatePtr portPriv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);
-
-  return (*portPriv->AdaptorRec->QueryImageAttributes)(portPriv->pScrn,
-			format->id, width, height, pitches, offsets);
+    return (*portPriv->AdaptorRec->QueryImageAttributes) (portPriv->pScrn,
+                                                          format->id, width,
+                                                          height, pitches,
+                                                          offsets);
 }
 
 void
-xf86XVFillKeyHelperDrawable (DrawablePtr pDraw, CARD32 key, RegionPtr fillboxes)
+xf86XVFillKeyHelperDrawable(DrawablePtr pDraw, CARD32 key, RegionPtr fillboxes)
 {
-   ScreenPtr pScreen = pDraw->pScreen;
-   ChangeGCVal pval[2];
-   BoxPtr pbox = RegionRects(fillboxes);
-   int i, nbox = RegionNumRects(fillboxes);
-   xRectangle *rects;
-   GCPtr gc;
-
-   if(!xf86Screens[pScreen->myNum]->vtSema) return;
-
-   gc = GetScratchGC(pDraw->depth, pScreen);
-   pval[0].val = key;
-   pval[1].val = IncludeInferiors;
-   (void) ChangeGC(NullClient, gc, GCForeground|GCSubwindowMode, pval);
-   ValidateGC(pDraw, gc);
-
-   rects = malloc(nbox * sizeof(xRectangle));
-
-   for(i = 0; i < nbox; i++, pbox++) 
-   {
-      rects[i].x = pbox->x1 - pDraw->x;
-      rects[i].y = pbox->y1 - pDraw->y;
-      rects[i].width = pbox->x2 - pbox->x1;
-      rects[i].height = pbox->y2 - pbox->y1;
-   }
-   
-   (*gc->ops->PolyFillRect)(pDraw, gc, nbox, rects);
-   
-   free(rects);
-   FreeScratchGC (gc);
+    ScreenPtr pScreen = pDraw->pScreen;
+    ChangeGCVal pval[2];
+    BoxPtr pbox = RegionRects(fillboxes);
+    int i, nbox = RegionNumRects(fillboxes);
+    xRectangle *rects;
+    GCPtr gc;
+
+    if (!xf86Screens[pScreen->myNum]->vtSema)
+        return;
+
+    gc = GetScratchGC(pDraw->depth, pScreen);
+    pval[0].val = key;
+    pval[1].val = IncludeInferiors;
+    (void) ChangeGC(NullClient, gc, GCForeground | GCSubwindowMode, pval);
+    ValidateGC(pDraw, gc);
+
+    rects = malloc(nbox * sizeof(xRectangle));
+
+    for (i = 0; i < nbox; i++, pbox++) {
+        rects[i].x = pbox->x1 - pDraw->x;
+        rects[i].y = pbox->y1 - pDraw->y;
+        rects[i].width = pbox->x2 - pbox->x1;
+        rects[i].height = pbox->y2 - pbox->y1;
+    }
+
+    (*gc->ops->PolyFillRect) (pDraw, gc, nbox, rects);
+
+    free(rects);
+    FreeScratchGC(gc);
 }
 
 void
-xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr fillboxes)
+xf86XVFillKeyHelper(ScreenPtr pScreen, CARD32 key, RegionPtr fillboxes)
 {
-    xf86XVFillKeyHelperDrawable (&pScreen->root->drawable, key, fillboxes);
+    xf86XVFillKeyHelperDrawable(&pScreen->root->drawable, key, fillboxes);
 }
 
 void
-xf86XVFillKeyHelperPort (DrawablePtr pDraw, pointer data, CARD32 key, RegionPtr clipboxes, Bool fillEverything)
+xf86XVFillKeyHelperPort(DrawablePtr pDraw, pointer data, CARD32 key,
+                        RegionPtr clipboxes, Bool fillEverything)
 {
-    WindowPtr pWin = (WindowPtr)pDraw;
+    WindowPtr pWin = (WindowPtr) pDraw;
     XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
     XvPortRecPrivatePtr portPriv = NULL;
     RegionRec reg;
     RegionPtr fillboxes;
 
     while (WinPriv) {
-	XvPortRecPrivatePtr pPriv = WinPriv->PortRec;
+        XvPortRecPrivatePtr pPriv = WinPriv->PortRec;
 
-	if (data == pPriv->DevPriv.ptr) {
-	    portPriv = pPriv;
-	    break;
-	}
+        if (data == pPriv->DevPriv.ptr) {
+            portPriv = pPriv;
+            break;
+        }
 
-	WinPriv = WinPriv->next;
+        WinPriv = WinPriv->next;
     }
 
     if (!portPriv)
-	return;
+        return;
 
     if (!portPriv->ckeyFilled)
-	portPriv->ckeyFilled = RegionCreate(NULL, 0);
+        portPriv->ckeyFilled = RegionCreate(NULL, 0);
 
     if (!fillEverything) {
-	RegionNull(&reg);
-	fillboxes = &reg;
-	RegionSubtract(fillboxes, clipboxes, portPriv->ckeyFilled);
-
-	if (!RegionNotEmpty(fillboxes))
-	    goto out;
-    } else
-	fillboxes = clipboxes;
+        RegionNull(&reg);
+        fillboxes = &reg;
+        RegionSubtract(fillboxes, clipboxes, portPriv->ckeyFilled);
 
+        if (!RegionNotEmpty(fillboxes))
+            goto out;
+    }
+    else
+        fillboxes = clipboxes;
 
     RegionCopy(portPriv->ckeyFilled, clipboxes);
 
     xf86XVFillKeyHelperDrawable(pDraw, key, fillboxes);
-out:
+ out:
     if (!fillEverything)
         RegionUninit(&reg);
 }
 
-
 /* xf86XVClipVideoHelper -
 
    Takes the dst box in standard X BoxRec form (top and left
@@ -2012,16 +1986,12 @@ out:
 */
 
 Bool
-xf86XVClipVideoHelper(
-    BoxPtr dst,
-    INT32 *xa,
-    INT32 *xb,
-    INT32 *ya,
-    INT32 *yb,
-    RegionPtr reg,
-    INT32 width,
-    INT32 height
-){
+xf86XVClipVideoHelper(BoxPtr dst,
+                      INT32 *xa,
+                      INT32 *xb,
+                      INT32 *ya,
+                      INT32 *yb, RegionPtr reg, INT32 width, INT32 height)
+{
     double xsw, xdw, ysw, ydw;
     INT32 delta;
     BoxPtr extents = RegionExtents(reg);
@@ -2032,159 +2002,168 @@ xf86XVClipVideoHelper(
     ysw = (*yb - *ya) << 16;
     ydw = dst->y2 - dst->y1;
 
-    *xa <<= 16; *xb <<= 16;
-    *ya <<= 16; *yb <<= 16;
+    *xa <<= 16;
+    *xb <<= 16;
+    *ya <<= 16;
+    *yb <<= 16;
 
     diff = extents->x1 - dst->x1;
     if (diff > 0) {
-	dst->x1 = extents->x1;
-	*xa += (diff * xsw) / xdw;
+        dst->x1 = extents->x1;
+        *xa += (diff * xsw) / xdw;
     }
     diff = dst->x2 - extents->x2;
     if (diff > 0) {
-	dst->x2 = extents->x2;
-	*xb -= (diff * xsw) / xdw;
+        dst->x2 = extents->x2;
+        *xb -= (diff * xsw) / xdw;
     }
     diff = extents->y1 - dst->y1;
     if (diff > 0) {
-	dst->y1 = extents->y1;
-	*ya += (diff * ysw) / ydw;
+        dst->y1 = extents->y1;
+        *ya += (diff * ysw) / ydw;
     }
     diff = dst->y2 - extents->y2;
     if (diff > 0) {
-	dst->y2 = extents->y2;
-	*yb -= (diff * ysw) / ydw;
+        dst->y2 = extents->y2;
+        *yb -= (diff * ysw) / ydw;
     }
 
     if (*xa < 0) {
-	diff = (((-*xa) * xdw) + xsw - 1) / xsw;
-	dst->x1 += diff;
-	*xa += (diff * xsw) / xdw;
+        diff = (((-*xa) * xdw) + xsw - 1) / xsw;
+        dst->x1 += diff;
+        *xa += (diff * xsw) / xdw;
     }
     delta = *xb - (width << 16);
     if (delta > 0) {
-	diff = ((delta * xdw) + xsw - 1) / xsw;
-	dst->x2 -= diff;
-	*xb -= (diff * xsw) / xdw;
+        diff = ((delta * xdw) + xsw - 1) / xsw;
+        dst->x2 -= diff;
+        *xb -= (diff * xsw) / xdw;
     }
-    if (*xa >= *xb) return FALSE;
+    if (*xa >= *xb)
+        return FALSE;
 
     if (*ya < 0) {
-	diff = (((-*ya) * ydw) + ysw - 1) / ysw;
-	dst->y1 += diff;
-	*ya += (diff * ysw) / ydw;
+        diff = (((-*ya) * ydw) + ysw - 1) / ysw;
+        dst->y1 += diff;
+        *ya += (diff * ysw) / ydw;
     }
     delta = *yb - (height << 16);
     if (delta > 0) {
-	diff = ((delta * ydw) + ysw - 1) / ysw;
-	dst->y2 -= diff;
-	*yb -= (diff * ysw) / ydw;
+        diff = ((delta * ydw) + ysw - 1) / ysw;
+        dst->y2 -= diff;
+        *yb -= (diff * ysw) / ydw;
     }
-    if (*ya >= *yb) return FALSE;
+    if (*ya >= *yb)
+        return FALSE;
 
     if ((dst->x1 > extents->x1) || (dst->x2 < extents->x2) ||
-	(dst->y1 > extents->y1) || (dst->y2 < extents->y2))
-    {
-	RegionRec clipReg;
-	RegionInit(&clipReg, dst, 1);
-	RegionIntersect(reg, reg, &clipReg);
-	RegionUninit(&clipReg);
+        (dst->y1 > extents->y1) || (dst->y2 < extents->y2)) {
+        RegionRec clipReg;
+
+        RegionInit(&clipReg, dst, 1);
+        RegionIntersect(reg, reg, &clipReg);
+        RegionUninit(&clipReg);
     }
     return TRUE;
 }
 
 void
-xf86XVCopyYUV12ToPacked(
-    const void *srcy,
-    const void *srcv,
-    const void *srcu,
-    void *dst,
-    int srcPitchy,
-    int srcPitchuv,
-    int dstPitch,
-    int h,
-    int w
-){
+xf86XVCopyYUV12ToPacked(const void *srcy,
+                        const void *srcv,
+                        const void *srcu,
+                        void *dst,
+                        int srcPitchy,
+                        int srcPitchuv, int dstPitch, int h, int w)
+{
     CARD32 *Dst;
     const CARD8 *Y, *U, *V;
     int i, j;
 
     w >>= 1;
 
-    for (j = 0;  j < h;  j++) {
-	Dst = dst;
-	Y = srcy;  V = srcv;  U = srcu;
-	i = w;
-	while (i >= 4) {
+    for (j = 0; j < h; j++) {
+        Dst = dst;
+        Y = srcy;
+        V = srcv;
+        U = srcu;
+        i = w;
+        while (i >= 4) {
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
-	    Dst[0] = Y[0] | (Y[1] << 16) | (U[0] << 8) | (V[0] << 24);
-	    Dst[1] = Y[2] | (Y[3] << 16) | (U[1] << 8) | (V[1] << 24);
-	    Dst[2] = Y[4] | (Y[5] << 16) | (U[2] << 8) | (V[2] << 24);
-	    Dst[3] = Y[6] | (Y[7] << 16) | (U[3] << 8) | (V[3] << 24);
+            Dst[0] = Y[0] | (Y[1] << 16) | (U[0] << 8) | (V[0] << 24);
+            Dst[1] = Y[2] | (Y[3] << 16) | (U[1] << 8) | (V[1] << 24);
+            Dst[2] = Y[4] | (Y[5] << 16) | (U[2] << 8) | (V[2] << 24);
+            Dst[3] = Y[6] | (Y[7] << 16) | (U[3] << 8) | (V[3] << 24);
 #else
-	    /* This assumes a little-endian framebuffer */
-	    Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0];
-	    Dst[1] = (Y[2] << 24) | (Y[3] << 8) | (U[1] << 16) | V[1];
-	    Dst[2] = (Y[4] << 24) | (Y[5] << 8) | (U[2] << 16) | V[2];
-	    Dst[3] = (Y[6] << 24) | (Y[7] << 8) | (U[3] << 16) | V[3];
+            /* This assumes a little-endian framebuffer */
+            Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0];
+            Dst[1] = (Y[2] << 24) | (Y[3] << 8) | (U[1] << 16) | V[1];
+            Dst[2] = (Y[4] << 24) | (Y[5] << 8) | (U[2] << 16) | V[2];
+            Dst[3] = (Y[6] << 24) | (Y[7] << 8) | (U[3] << 16) | V[3];
 #endif
-	    Dst += 4;  Y += 8;  V += 4;  U += 4;
-	    i -= 4;
-	}
-
-	while (i--) {
+            Dst += 4;
+            Y += 8;
+            V += 4;
+            U += 4;
+            i -= 4;
+        }
+
+        while (i--) {
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
-	    Dst[0] = Y[0] | (Y[1] << 16) | (U[0] << 8) | (V[0] << 24);
+            Dst[0] = Y[0] | (Y[1] << 16) | (U[0] << 8) | (V[0] << 24);
 #else
-	    /* This assumes a little-endian framebuffer */
-	    Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0];
+            /* This assumes a little-endian framebuffer */
+            Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0];
 #endif
-	    Dst++;  Y += 2;  V++;  U++;
-	}
-
-	dst = (CARD8 *)dst + dstPitch;
-	srcy = (const CARD8 *)srcy + srcPitchy;
-	if (j & 1) {
-	    srcu = (const CARD8 *)srcu + srcPitchuv;
-	    srcv = (const CARD8 *)srcv + srcPitchuv;
-	}
+            Dst++;
+            Y += 2;
+            V++;
+            U++;
+        }
+
+        dst = (CARD8 *) dst + dstPitch;
+        srcy = (const CARD8 *) srcy + srcPitchy;
+        if (j & 1) {
+            srcu = (const CARD8 *) srcu + srcPitchuv;
+            srcv = (const CARD8 *) srcv + srcPitchuv;
+        }
     }
 }
 
 void
-xf86XVCopyPacked(
-    const void *src,
-    void *dst,
-    int srcPitch,
-    int dstPitch,
-    int h,
-    int w
-){
+xf86XVCopyPacked(const void *src,
+                 void *dst, int srcPitch, int dstPitch, int h, int w)
+{
     const CARD32 *Src;
     CARD32 *Dst;
     int i;
 
     w >>= 1;
     while (--h >= 0) {
-	do {
-	    Dst = dst;  Src = src;
-	    i = w;
-	    while (i >= 4) {
-		Dst[0] = Src[0];
-		Dst[1] = Src[1];
-		Dst[2] = Src[2];
-		Dst[3] = Src[3];
-		Dst += 4;  Src += 4;  i -= 4;
-	    }
-	    if (!i) break;
-	    Dst[0] = Src[0];
-	    if (i == 1) break;
-	    Dst[1] = Src[1];
-	    if (i == 2) break;
-	    Dst[2] = Src[2];
-	} while (0);
-
-	src = (const CARD8 *)src + srcPitch;
-	dst = (CARD8 *)dst + dstPitch;
+        do {
+            Dst = dst;
+            Src = src;
+            i = w;
+            while (i >= 4) {
+                Dst[0] = Src[0];
+                Dst[1] = Src[1];
+                Dst[2] = Src[2];
+                Dst[3] = Src[3];
+                Dst += 4;
+                Src += 4;
+                i -= 4;
+            }
+            if (!i)
+                break;
+            Dst[0] = Src[0];
+            if (i == 1)
+                break;
+            Dst[1] = Src[1];
+            if (i == 2)
+                break;
+            Dst[2] = Src[2];
+        } while (0);
+
+        src = (const CARD8 *) src + srcPitch;
+        dst = (CARD8 *) dst + dstPitch;
     }
 }
diff --git a/xorg-server/hw/xfree86/common/xf86xv.h b/xorg-server/hw/xfree86/common/xf86xv.h
index 08e5c790d..2db00a83f 100644
--- a/xorg-server/hw/xfree86/common/xf86xv.h
+++ b/xorg-server/hw/xfree86/common/xf86xv.h
@@ -1,289 +1,270 @@
-

-/*

- * Copyright (c) 1998-2003 by The XFree86 Project, Inc.

- *

- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-#ifndef _XF86XV_H_

-#define _XF86XV_H_

-

-#include "xvdix.h"

-#include "xf86str.h"

-

-#define VIDEO_NO_CLIPPING			0x00000001

-#define VIDEO_INVERT_CLIPLIST			0x00000002

-#define VIDEO_OVERLAID_IMAGES			0x00000004

-#define VIDEO_OVERLAID_STILLS			0x00000008

-/*

- * Usage of VIDEO_CLIP_TO_VIEWPORT is not recommended.

- * It can make reput behaviour inconsistent.

- */

-#define VIDEO_CLIP_TO_VIEWPORT			0x00000010

-

-typedef struct {

-  int id;

-  int type;

-  int byte_order;

-  unsigned char guid[16];               

-  int bits_per_pixel;

-  int format;

-  int num_planes;

-

-  /* for RGB formats only */

-  int depth;

-  unsigned int red_mask;       

-  unsigned int green_mask;   

-  unsigned int blue_mask;   

-

-  /* for YUV formats only */

-  unsigned int y_sample_bits;

-  unsigned int u_sample_bits;

-  unsigned int v_sample_bits;   

-  unsigned int horz_y_period;

-  unsigned int horz_u_period;

-  unsigned int horz_v_period;

-  unsigned int vert_y_period;

-  unsigned int vert_u_period;

-  unsigned int vert_v_period;

-  char component_order[32];

-  int scanline_order;

-} XF86ImageRec, *XF86ImagePtr; 

-

-

-typedef struct {

-  ScrnInfoPtr pScrn;

-  int id;

-  unsigned short width, height;

-  int *pitches; /* bytes */

-  int *offsets; /* in bytes from start of framebuffer */

-  DevUnion devPrivate;  

-} XF86SurfaceRec, *XF86SurfacePtr;

-

-

-typedef int (* PutVideoFuncPtr)( ScrnInfoPtr pScrn, 

-	short vid_x, short vid_y, short drw_x, short drw_y,

-	short vid_w, short vid_h, short drw_w, short drw_h,

-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

-typedef int (* PutStillFuncPtr)( ScrnInfoPtr pScrn, 

-	short vid_x, short vid_y, short drw_x, short drw_y,

-	short vid_w, short vid_h, short drw_w, short drw_h,

-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

-typedef int (* GetVideoFuncPtr)( ScrnInfoPtr pScrn, 

-	short vid_x, short vid_y, short drw_x, short drw_y,

-	short vid_w, short vid_h, short drw_w, short drw_h,

-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

-typedef int (* GetStillFuncPtr)( ScrnInfoPtr pScrn, 

-	short vid_x, short vid_y, short drw_x, short drw_y,

-	short vid_w, short vid_h, short drw_w, short drw_h,

-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

-typedef void (* StopVideoFuncPtr)(ScrnInfoPtr pScrn, pointer data, Bool Exit);

-typedef int (* SetPortAttributeFuncPtr)(ScrnInfoPtr pScrn, Atom attribute,

-	INT32 value, pointer data);

-typedef int (* GetPortAttributeFuncPtr)(ScrnInfoPtr pScrn, Atom attribute,

-	INT32 *value, pointer data);

-typedef void (* QueryBestSizeFuncPtr)(ScrnInfoPtr pScrn, Bool motion,

-	short vid_w, short vid_h, short drw_w, short drw_h, 

-	unsigned int *p_w, unsigned int *p_h, pointer data);

-typedef int (* PutImageFuncPtr)( ScrnInfoPtr pScrn, 

-	short src_x, short src_y, short drw_x, short drw_y,

-	short src_w, short src_h, short drw_w, short drw_h,

-	int image, unsigned char* buf, short width, short height, Bool Sync,

-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

-typedef int (* ReputImageFuncPtr)( ScrnInfoPtr pScrn,

-	short src_x, short src_y, short drw_x, short drw_y,

-	short src_w, short src_h, short drw_w, short drw_h,

-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

-typedef int (*QueryImageAttributesFuncPtr)(ScrnInfoPtr pScrn, 

-	int image, unsigned short *width, unsigned short *height, 

-	int *pitches, int *offsets);

-typedef void (*ClipNotifyFuncPtr)(ScrnInfoPtr pScrn, pointer data,

-                                  WindowPtr window, int dx, int dy);

-

-typedef enum {

-    XV_OFF,

-    XV_PENDING,

-    XV_ON

-} XvStatus;

-

-/*** this is what the driver needs to fill out ***/

-

-typedef struct {

-  int id;

-  char *name;

-  unsigned short width, height;

-  XvRationalRec rate;

-} XF86VideoEncodingRec, *XF86VideoEncodingPtr;

-

-typedef struct {

-  char 	depth;  

-  short class;

-} XF86VideoFormatRec, *XF86VideoFormatPtr;

-

-typedef struct {

-  int   flags;

-  int   min_value;

-  int   max_value;

-  char  *name;

-} XF86AttributeRec, *XF86AttributePtr;

-

-typedef struct {

-  unsigned int type; 

-  int flags;

-  char *name;

-  int nEncodings;

-  XF86VideoEncodingPtr pEncodings;  

-  int nFormats;

-  XF86VideoFormatPtr pFormats;  

-  int nPorts;

-  DevUnion *pPortPrivates;

-  int nAttributes;

-  XF86AttributePtr pAttributes;

-  int nImages;

-  XF86ImagePtr pImages;

-  PutVideoFuncPtr PutVideo;

-  PutStillFuncPtr PutStill;

-  GetVideoFuncPtr GetVideo;

-  GetStillFuncPtr GetStill;

-  StopVideoFuncPtr StopVideo;

-  SetPortAttributeFuncPtr SetPortAttribute;

-  GetPortAttributeFuncPtr GetPortAttribute;

-  QueryBestSizeFuncPtr QueryBestSize;

-  PutImageFuncPtr PutImage;

-  ReputImageFuncPtr ReputImage; /* image/still */

-  QueryImageAttributesFuncPtr QueryImageAttributes;

-  ClipNotifyFuncPtr ClipNotify;

-} XF86VideoAdaptorRec, *XF86VideoAdaptorPtr;

-

-typedef struct {

-  XF86ImagePtr image;

-  int flags;

-  int (*alloc_surface)(ScrnInfoPtr pScrn,

-		  int id,

-		  unsigned short width, 	

-		  unsigned short height,

-		  XF86SurfacePtr surface);

-  int (*free_surface)(XF86SurfacePtr surface);

-  int (*display) (XF86SurfacePtr surface,

-		  short vid_x, short vid_y, 

-		  short drw_x, short drw_y,

-		  short vid_w, short vid_h, 

-		  short drw_w, short drw_h,

-		  RegionPtr clipBoxes);

-  int (*stop)    (XF86SurfacePtr surface);

-  int (*getAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 *value);

-  int (*setAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 value);

-  int max_width;

-  int max_height;

-  int num_attributes;

-  XF86AttributePtr attributes;

-} XF86OffscreenImageRec, *XF86OffscreenImagePtr;

-

-extern _X_EXPORT Bool

-xf86XVScreenInit(

-   ScreenPtr pScreen, 

-   XF86VideoAdaptorPtr 	*Adaptors,

-   int num

-);

-

-typedef int (* xf86XVInitGenericAdaptorPtr)(ScrnInfoPtr pScrn,

-	XF86VideoAdaptorPtr **Adaptors);

-

-extern _X_EXPORT int

-xf86XVRegisterGenericAdaptorDriver(

-    xf86XVInitGenericAdaptorPtr InitFunc

-);

-

-extern _X_EXPORT int

-xf86XVListGenericAdaptors(

-    ScrnInfoPtr          pScrn,

-    XF86VideoAdaptorPtr  **Adaptors

-);

-

-extern _X_EXPORT Bool

-xf86XVRegisterOffscreenImages(

-   ScreenPtr pScreen,

-   XF86OffscreenImagePtr images,

-   int num

-);

-

-extern _X_EXPORT XF86OffscreenImagePtr

-xf86XVQueryOffscreenImages(

-   ScreenPtr pScreen,

-   int *num

-);

-   

-extern _X_EXPORT XF86VideoAdaptorPtr xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn);

-

-extern _X_EXPORT void xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr);

-

-extern _X_EXPORT void

-xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes);

-

-extern _X_EXPORT void

-xf86XVFillKeyHelperDrawable (DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes);

-

-extern _X_EXPORT void

-xf86XVFillKeyHelperPort (DrawablePtr pDraw, pointer data, CARD32 key, RegionPtr clipboxes, Bool fillEverything);

-

-extern _X_EXPORT Bool

-xf86XVClipVideoHelper(

-    BoxPtr dst,

-    INT32 *xa,

-    INT32 *xb,

-    INT32 *ya,

-    INT32 *yb,

-    RegionPtr reg,

-    INT32 width,

-    INT32 height

-);

-

-extern _X_EXPORT void

-xf86XVCopyYUV12ToPacked(

-    const void *srcy,

-    const void *srcv,

-    const void *srcu,

-    void *dst,

-    int srcPitchy,

-    int srcPitchuv,

-    int dstPitch,

-    int h,

-    int w

-);

-

-extern _X_EXPORT void

-xf86XVCopyPacked(

-    const void *src,

-    void *dst,

-    int srcPitch,

-    int dstPitch,

-    int h,

-    int w

-);

-

-extern _X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void);

-extern _X_EXPORT unsigned long (*XvGetRTPortProc)(void);

-extern _X_EXPORT int (*XvScreenInitProc)(ScreenPtr);

-

-#endif  /* _XF86XV_H_ */

+
+/*
+ * Copyright (c) 1998-2003 by The XFree86 Project, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+#ifndef _XF86XV_H_
+#define _XF86XV_H_
+
+#include "xvdix.h"
+#include "xf86str.h"
+
+#define VIDEO_NO_CLIPPING			0x00000001
+#define VIDEO_INVERT_CLIPLIST			0x00000002
+#define VIDEO_OVERLAID_IMAGES			0x00000004
+#define VIDEO_OVERLAID_STILLS			0x00000008
+/*
+ * Usage of VIDEO_CLIP_TO_VIEWPORT is not recommended.
+ * It can make reput behaviour inconsistent.
+ */
+#define VIDEO_CLIP_TO_VIEWPORT			0x00000010
+
+typedef struct {
+    int id;
+    int type;
+    int byte_order;
+    unsigned char guid[16];
+    int bits_per_pixel;
+    int format;
+    int num_planes;
+
+    /* for RGB formats only */
+    int depth;
+    unsigned int red_mask;
+    unsigned int green_mask;
+    unsigned int blue_mask;
+
+    /* for YUV formats only */
+    unsigned int y_sample_bits;
+    unsigned int u_sample_bits;
+    unsigned int v_sample_bits;
+    unsigned int horz_y_period;
+    unsigned int horz_u_period;
+    unsigned int horz_v_period;
+    unsigned int vert_y_period;
+    unsigned int vert_u_period;
+    unsigned int vert_v_period;
+    char component_order[32];
+    int scanline_order;
+} XF86ImageRec, *XF86ImagePtr;
+
+typedef struct {
+    ScrnInfoPtr pScrn;
+    int id;
+    unsigned short width, height;
+    int *pitches;               /* bytes */
+    int *offsets;               /* in bytes from start of framebuffer */
+    DevUnion devPrivate;
+} XF86SurfaceRec, *XF86SurfacePtr;
+
+typedef int (*PutVideoFuncPtr) (ScrnInfoPtr pScrn,
+                                short vid_x, short vid_y, short drw_x,
+                                short drw_y, short vid_w, short vid_h,
+                                short drw_w, short drw_h, RegionPtr clipBoxes,
+                                pointer data, DrawablePtr pDraw);
+typedef int (*PutStillFuncPtr) (ScrnInfoPtr pScrn, short vid_x, short vid_y,
+                                short drw_x, short drw_y, short vid_w,
+                                short vid_h, short drw_w, short drw_h,
+                                RegionPtr clipBoxes, pointer data,
+                                DrawablePtr pDraw);
+typedef int (*GetVideoFuncPtr) (ScrnInfoPtr pScrn, short vid_x, short vid_y,
+                                short drw_x, short drw_y, short vid_w,
+                                short vid_h, short drw_w, short drw_h,
+                                RegionPtr clipBoxes, pointer data,
+                                DrawablePtr pDraw);
+typedef int (*GetStillFuncPtr) (ScrnInfoPtr pScrn, short vid_x, short vid_y,
+                                short drw_x, short drw_y, short vid_w,
+                                short vid_h, short drw_w, short drw_h,
+                                RegionPtr clipBoxes, pointer data,
+                                DrawablePtr pDraw);
+typedef void (*StopVideoFuncPtr) (ScrnInfoPtr pScrn, pointer data, Bool Exit);
+typedef int (*SetPortAttributeFuncPtr) (ScrnInfoPtr pScrn, Atom attribute,
+                                        INT32 value, pointer data);
+typedef int (*GetPortAttributeFuncPtr) (ScrnInfoPtr pScrn, Atom attribute,
+                                        INT32 *value, pointer data);
+typedef void (*QueryBestSizeFuncPtr) (ScrnInfoPtr pScrn, Bool motion,
+                                      short vid_w, short vid_h, short drw_w,
+                                      short drw_h, unsigned int *p_w,
+                                      unsigned int *p_h, pointer data);
+typedef int (*PutImageFuncPtr) (ScrnInfoPtr pScrn, short src_x, short src_y,
+                                short drw_x, short drw_y, short src_w,
+                                short src_h, short drw_w, short drw_h,
+                                int image, unsigned char *buf, short width,
+                                short height, Bool Sync, RegionPtr clipBoxes,
+                                pointer data, DrawablePtr pDraw);
+typedef int (*ReputImageFuncPtr) (ScrnInfoPtr pScrn, short src_x, short src_y,
+                                  short drw_x, short drw_y, short src_w,
+                                  short src_h, short drw_w, short drw_h,
+                                  RegionPtr clipBoxes, pointer data,
+                                  DrawablePtr pDraw);
+typedef int (*QueryImageAttributesFuncPtr) (ScrnInfoPtr pScrn, int image,
+                                            unsigned short *width,
+                                            unsigned short *height,
+                                            int *pitches, int *offsets);
+typedef void (*ClipNotifyFuncPtr) (ScrnInfoPtr pScrn, pointer data,
+                                   WindowPtr window, int dx, int dy);
+
+typedef enum {
+    XV_OFF,
+    XV_PENDING,
+    XV_ON
+} XvStatus;
+
+/*** this is what the driver needs to fill out ***/
+
+typedef struct {
+    int id;
+    char *name;
+    unsigned short width, height;
+    XvRationalRec rate;
+} XF86VideoEncodingRec, *XF86VideoEncodingPtr;
+
+typedef struct {
+    char depth;
+    short class;
+} XF86VideoFormatRec, *XF86VideoFormatPtr;
+
+typedef struct {
+    int flags;
+    int min_value;
+    int max_value;
+    char *name;
+} XF86AttributeRec, *XF86AttributePtr;
+
+typedef struct {
+    unsigned int type;
+    int flags;
+    char *name;
+    int nEncodings;
+    XF86VideoEncodingPtr pEncodings;
+    int nFormats;
+    XF86VideoFormatPtr pFormats;
+    int nPorts;
+    DevUnion *pPortPrivates;
+    int nAttributes;
+    XF86AttributePtr pAttributes;
+    int nImages;
+    XF86ImagePtr pImages;
+    PutVideoFuncPtr PutVideo;
+    PutStillFuncPtr PutStill;
+    GetVideoFuncPtr GetVideo;
+    GetStillFuncPtr GetStill;
+    StopVideoFuncPtr StopVideo;
+    SetPortAttributeFuncPtr SetPortAttribute;
+    GetPortAttributeFuncPtr GetPortAttribute;
+    QueryBestSizeFuncPtr QueryBestSize;
+    PutImageFuncPtr PutImage;
+    ReputImageFuncPtr ReputImage;       /* image/still */
+    QueryImageAttributesFuncPtr QueryImageAttributes;
+    ClipNotifyFuncPtr ClipNotify;
+} XF86VideoAdaptorRec, *XF86VideoAdaptorPtr;
+
+typedef struct {
+    XF86ImagePtr image;
+    int flags;
+    int (*alloc_surface) (ScrnInfoPtr pScrn,
+                          int id,
+                          unsigned short width,
+                          unsigned short height, XF86SurfacePtr surface);
+    int (*free_surface) (XF86SurfacePtr surface);
+    int (*display) (XF86SurfacePtr surface,
+                    short vid_x, short vid_y,
+                    short drw_x, short drw_y,
+                    short vid_w, short vid_h,
+                    short drw_w, short drw_h, RegionPtr clipBoxes);
+    int (*stop) (XF86SurfacePtr surface);
+    int (*getAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 *value);
+    int (*setAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 value);
+    int max_width;
+    int max_height;
+    int num_attributes;
+    XF86AttributePtr attributes;
+} XF86OffscreenImageRec, *XF86OffscreenImagePtr;
+
+extern _X_EXPORT Bool
+ xf86XVScreenInit(ScreenPtr pScreen, XF86VideoAdaptorPtr * Adaptors, int num);
+
+typedef int (*xf86XVInitGenericAdaptorPtr) (ScrnInfoPtr pScrn,
+                                            XF86VideoAdaptorPtr ** Adaptors);
+
+extern _X_EXPORT int
+ xf86XVRegisterGenericAdaptorDriver(xf86XVInitGenericAdaptorPtr InitFunc);
+
+extern _X_EXPORT int
+ xf86XVListGenericAdaptors(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr ** Adaptors);
+
+extern _X_EXPORT Bool
+
+xf86XVRegisterOffscreenImages(ScreenPtr pScreen,
+                              XF86OffscreenImagePtr images, int num);
+
+extern _X_EXPORT XF86OffscreenImagePtr
+xf86XVQueryOffscreenImages(ScreenPtr pScreen, int *num);
+
+extern _X_EXPORT XF86VideoAdaptorPtr xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr
+                                                                   pScrn);
+
+extern _X_EXPORT void xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr);
+
+extern _X_EXPORT void
+ xf86XVFillKeyHelper(ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes);
+
+extern _X_EXPORT void
+
+xf86XVFillKeyHelperDrawable(DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes);
+
+extern _X_EXPORT void
+
+xf86XVFillKeyHelperPort(DrawablePtr pDraw, pointer data, CARD32 key,
+                        RegionPtr clipboxes, Bool fillEverything);
+
+extern _X_EXPORT Bool
+
+xf86XVClipVideoHelper(BoxPtr dst,
+                      INT32 *xa,
+                      INT32 *xb,
+                      INT32 *ya,
+                      INT32 *yb, RegionPtr reg, INT32 width, INT32 height);
+
+extern _X_EXPORT void
+
+xf86XVCopyYUV12ToPacked(const void *srcy,
+                        const void *srcv,
+                        const void *srcu,
+                        void *dst,
+                        int srcPitchy,
+                        int srcPitchuv, int dstPitch, int h, int w);
+
+extern _X_EXPORT void
+
+xf86XVCopyPacked(const void *src,
+                 void *dst, int srcPitch, int dstPitch, int h, int w);
+
+extern _X_EXPORT DevPrivateKey (*XvGetScreenKeyProc) (void);
+extern _X_EXPORT unsigned long (*XvGetRTPortProc) (void);
+extern _X_EXPORT int (*XvScreenInitProc) (ScreenPtr);
+
+#endif                          /* _XF86XV_H_ */
diff --git a/xorg-server/hw/xfree86/common/xf86xvmc.c b/xorg-server/hw/xfree86/common/xf86xvmc.c
index 5a7f69d8a..e58465289 100644
--- a/xorg-server/hw/xfree86/common/xf86xvmc.c
+++ b/xorg-server/hw/xfree86/common/xf86xvmc.c
@@ -1,232 +1,224 @@
-

-/*

- * Copyright (c) 2001-2003 by The XFree86 Project, Inc.

- *

- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "scrnintstr.h"

-#include "resource.h"

-#include "dixstruct.h"

-

-#include "xvmodproc.h"

-

-#include "xf86xvpriv.h"

-#include "xf86xvmc.h"

-

-XvMCScreenInitProcPtr XvMCScreenInitProc = NULL;

-

-

-typedef struct {

-  CloseScreenProcPtr CloseScreen; 

-  int num_adaptors;

-  XF86MCAdaptorPtr *adaptors;

-  XvMCAdaptorPtr dixinfo;

-} xf86XvMCScreenRec, *xf86XvMCScreenPtr;

-

-static DevPrivateKeyRec XF86XvMCScreenKeyRec;

-#define XF86XvMCScreenKey (&XF86XvMCScreenKeyRec)

-

-#define XF86XVMC_GET_PRIVATE(pScreen) (xf86XvMCScreenPtr) \

-    dixLookupPrivate(&(pScreen)->devPrivates, XF86XvMCScreenKey)

-

-

-static int 

-xf86XvMCCreateContext (

-  XvPortPtr pPort,

-  XvMCContextPtr pContext,

-  int *num_priv,

-  CARD32 **priv

-)

-{

-    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);

-    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];

-

-    pContext->port_priv = (XvPortRecPrivatePtr)(pPort->devPriv.ptr);

-

-    return (*pScreenPriv->adaptors[pContext->adapt_num]->CreateContext)(

-		pScrn, pContext, num_priv, priv);

-}

-

-static void 

-xf86XvMCDestroyContext ( XvMCContextPtr pContext)

-{

-    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);

-    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];

-

-    (*pScreenPriv->adaptors[pContext->adapt_num]->DestroyContext)(

-                				pScrn, pContext);

-}

-

-static int 

-xf86XvMCCreateSurface (

-  XvMCSurfacePtr pSurface,

-  int *num_priv,

-  CARD32 **priv

-)

-{

-    XvMCContextPtr pContext = pSurface->context;

-    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);

-    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];

-

-    return (*pScreenPriv->adaptors[pContext->adapt_num]->CreateSurface)(

-                pScrn, pSurface, num_priv, priv);

-}

-

-static void 

-xf86XvMCDestroySurface (XvMCSurfacePtr pSurface)

-{

-    XvMCContextPtr pContext = pSurface->context;

-    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);

-    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];

-

-    (*pScreenPriv->adaptors[pContext->adapt_num]->DestroySurface)(

-                                                pScrn, pSurface);

-}

-

-static int 

-xf86XvMCCreateSubpicture (

-  XvMCSubpicturePtr pSubpicture,

-  int *num_priv,

-  CARD32 **priv

-)

-{

-    XvMCContextPtr pContext = pSubpicture->context;

-    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);

-    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];

-

-    return (*pScreenPriv->adaptors[pContext->adapt_num]->CreateSubpicture)(

-                                  pScrn, pSubpicture, num_priv, priv);

-}

-

-static void

-xf86XvMCDestroySubpicture (XvMCSubpicturePtr pSubpicture)

-{

-    XvMCContextPtr pContext = pSubpicture->context;

-    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);

-    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];

-

-    (*pScreenPriv->adaptors[pContext->adapt_num]->DestroySubpicture)(

-                                                pScrn, pSubpicture);

-}

-

-

-static Bool

-xf86XvMCCloseScreen (int i, ScreenPtr pScreen)

-{

-    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pScreen);

-

-    pScreen->CloseScreen = pScreenPriv->CloseScreen;

-

-    free(pScreenPriv->dixinfo);

-    free(pScreenPriv);

-

-    return (*pScreen->CloseScreen)(i, pScreen);

-}

-

-Bool xf86XvMCScreenInit(

-   ScreenPtr pScreen, 

-   int num_adaptors,

-   XF86MCAdaptorPtr *adaptors

-)

-{

-   XvMCAdaptorPtr pAdapt;

-   xf86XvMCScreenPtr pScreenPriv;

-   XvScreenPtr pxvs = (XvScreenPtr)dixLookupPrivate(&pScreen->devPrivates,

-						    XF86XvScreenKey);

-   int i, j;

-

-   if(!XvMCScreenInitProc) return FALSE;

-

-   if(!(pAdapt = malloc(sizeof(XvMCAdaptorRec) * num_adaptors)))

-	return FALSE;

-

-   if (!dixRegisterPrivateKey(&XF86XvMCScreenKeyRec, PRIVATE_SCREEN, 0))

-       return FALSE;

-

-   if(!(pScreenPriv = malloc(sizeof(xf86XvMCScreenRec)))) {

-	free(pAdapt);

-	return FALSE;

-   }

-

-   dixSetPrivate(&pScreen->devPrivates, XF86XvMCScreenKey, pScreenPriv);

-

-   pScreenPriv->CloseScreen = pScreen->CloseScreen;

-   pScreen->CloseScreen = xf86XvMCCloseScreen;

-

-   pScreenPriv->num_adaptors = num_adaptors;

-   pScreenPriv->adaptors = adaptors;

-   pScreenPriv->dixinfo = pAdapt;

-

-   for(i = 0; i < num_adaptors; i++) {

-	pAdapt[i].xv_adaptor = NULL;

-	for(j = 0; j < pxvs->nAdaptors; j++) {

-	   if(!strcmp((*adaptors)->name, pxvs->pAdaptors[j].name)) {

-		pAdapt[i].xv_adaptor = &(pxvs->pAdaptors[j]); 

-		break;

-	   }

-	}

-	if(!pAdapt[i].xv_adaptor) {

-	    /* no adaptor by that name */

-	    free(pAdapt);

-	    return FALSE;

-	}

-	pAdapt[i].num_surfaces = (*adaptors)->num_surfaces;

-	pAdapt[i].surfaces = (XvMCSurfaceInfoPtr*)((*adaptors)->surfaces);

-	pAdapt[i].num_subpictures = (*adaptors)->num_subpictures;

-	pAdapt[i].subpictures = (XvImagePtr*)((*adaptors)->subpictures);

-	pAdapt[i].CreateContext = xf86XvMCCreateContext;

-	pAdapt[i].DestroyContext = xf86XvMCDestroyContext;

-	pAdapt[i].CreateSurface = xf86XvMCCreateSurface;

-	pAdapt[i].DestroySurface = xf86XvMCDestroySurface;

-	pAdapt[i].CreateSubpicture = xf86XvMCCreateSubpicture;

-	pAdapt[i].DestroySubpicture = xf86XvMCDestroySubpicture;

-	adaptors++;

-   }

-

-   if(Success != (*XvMCScreenInitProc)(pScreen, num_adaptors, pAdapt))

-	return FALSE;

-

-   return TRUE;

-}

-

-XF86MCAdaptorPtr xf86XvMCCreateAdaptorRec (void)

-{

-   return calloc(1, sizeof(XF86MCAdaptorRec));

-}

-

-void xf86XvMCDestroyAdaptorRec(XF86MCAdaptorPtr adaptor)

-{

-   free(adaptor);

-}

+
+/*
+ * Copyright (c) 2001-2003 by The XFree86 Project, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "scrnintstr.h"
+#include "resource.h"
+#include "dixstruct.h"
+
+#include "xvmodproc.h"
+
+#include "xf86xvpriv.h"
+#include "xf86xvmc.h"
+
+XvMCScreenInitProcPtr XvMCScreenInitProc = NULL;
+
+typedef struct {
+    CloseScreenProcPtr CloseScreen;
+    int num_adaptors;
+    XF86MCAdaptorPtr *adaptors;
+    XvMCAdaptorPtr dixinfo;
+} xf86XvMCScreenRec, *xf86XvMCScreenPtr;
+
+static DevPrivateKeyRec XF86XvMCScreenKeyRec;
+
+#define XF86XvMCScreenKey (&XF86XvMCScreenKeyRec)
+
+#define XF86XVMC_GET_PRIVATE(pScreen) (xf86XvMCScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, XF86XvMCScreenKey)
+
+static int
+xf86XvMCCreateContext(XvPortPtr pPort,
+                      XvMCContextPtr pContext, int *num_priv, CARD32 **priv)
+{
+    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];
+
+    pContext->port_priv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
+
+    return (*pScreenPriv->adaptors[pContext->adapt_num]->CreateContext) (pScrn,
+                                                                         pContext,
+                                                                         num_priv,
+                                                                         priv);
+}
+
+static void
+xf86XvMCDestroyContext(XvMCContextPtr pContext)
+{
+    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];
+
+    (*pScreenPriv->adaptors[pContext->adapt_num]->DestroyContext) (pScrn,
+                                                                   pContext);
+}
+
+static int
+xf86XvMCCreateSurface(XvMCSurfacePtr pSurface, int *num_priv, CARD32 **priv)
+{
+    XvMCContextPtr pContext = pSurface->context;
+    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];
+
+    return (*pScreenPriv->adaptors[pContext->adapt_num]->CreateSurface) (pScrn,
+                                                                         pSurface,
+                                                                         num_priv,
+                                                                         priv);
+}
+
+static void
+xf86XvMCDestroySurface(XvMCSurfacePtr pSurface)
+{
+    XvMCContextPtr pContext = pSurface->context;
+    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];
+
+    (*pScreenPriv->adaptors[pContext->adapt_num]->DestroySurface) (pScrn,
+                                                                   pSurface);
+}
+
+static int
+xf86XvMCCreateSubpicture(XvMCSubpicturePtr pSubpicture,
+                         int *num_priv, CARD32 **priv)
+{
+    XvMCContextPtr pContext = pSubpicture->context;
+    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];
+
+    return (*pScreenPriv->adaptors[pContext->adapt_num]->
+            CreateSubpicture) (pScrn, pSubpicture, num_priv, priv);
+}
+
+static void
+xf86XvMCDestroySubpicture(XvMCSubpicturePtr pSubpicture)
+{
+    XvMCContextPtr pContext = pSubpicture->context;
+    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum];
+
+    (*pScreenPriv->adaptors[pContext->adapt_num]->DestroySubpicture) (pScrn,
+                                                                      pSubpicture);
+}
+
+static Bool
+xf86XvMCCloseScreen(int i, ScreenPtr pScreen)
+{
+    xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pScreen);
+
+    pScreen->CloseScreen = pScreenPriv->CloseScreen;
+
+    free(pScreenPriv->dixinfo);
+    free(pScreenPriv);
+
+    return (*pScreen->CloseScreen) (i, pScreen);
+}
+
+Bool
+xf86XvMCScreenInit(ScreenPtr pScreen,
+                   int num_adaptors, XF86MCAdaptorPtr * adaptors)
+{
+    XvMCAdaptorPtr pAdapt;
+    xf86XvMCScreenPtr pScreenPriv;
+    XvScreenPtr pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                                      XF86XvScreenKey);
+    int i, j;
+
+    if (!XvMCScreenInitProc)
+        return FALSE;
+
+    if (!(pAdapt = malloc(sizeof(XvMCAdaptorRec) * num_adaptors)))
+        return FALSE;
+
+    if (!dixRegisterPrivateKey(&XF86XvMCScreenKeyRec, PRIVATE_SCREEN, 0))
+        return FALSE;
+
+    if (!(pScreenPriv = malloc(sizeof(xf86XvMCScreenRec)))) {
+        free(pAdapt);
+        return FALSE;
+    }
+
+    dixSetPrivate(&pScreen->devPrivates, XF86XvMCScreenKey, pScreenPriv);
+
+    pScreenPriv->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = xf86XvMCCloseScreen;
+
+    pScreenPriv->num_adaptors = num_adaptors;
+    pScreenPriv->adaptors = adaptors;
+    pScreenPriv->dixinfo = pAdapt;
+
+    for (i = 0; i < num_adaptors; i++) {
+        pAdapt[i].xv_adaptor = NULL;
+        for (j = 0; j < pxvs->nAdaptors; j++) {
+            if (!strcmp((*adaptors)->name, pxvs->pAdaptors[j].name)) {
+                pAdapt[i].xv_adaptor = &(pxvs->pAdaptors[j]);
+                break;
+            }
+        }
+        if (!pAdapt[i].xv_adaptor) {
+            /* no adaptor by that name */
+            free(pAdapt);
+            return FALSE;
+        }
+        pAdapt[i].num_surfaces = (*adaptors)->num_surfaces;
+        pAdapt[i].surfaces = (XvMCSurfaceInfoPtr *) ((*adaptors)->surfaces);
+        pAdapt[i].num_subpictures = (*adaptors)->num_subpictures;
+        pAdapt[i].subpictures = (XvImagePtr *) ((*adaptors)->subpictures);
+        pAdapt[i].CreateContext = xf86XvMCCreateContext;
+        pAdapt[i].DestroyContext = xf86XvMCDestroyContext;
+        pAdapt[i].CreateSurface = xf86XvMCCreateSurface;
+        pAdapt[i].DestroySurface = xf86XvMCDestroySurface;
+        pAdapt[i].CreateSubpicture = xf86XvMCCreateSubpicture;
+        pAdapt[i].DestroySubpicture = xf86XvMCDestroySubpicture;
+        adaptors++;
+    }
+
+    if (Success != (*XvMCScreenInitProc) (pScreen, num_adaptors, pAdapt))
+        return FALSE;
+
+    return TRUE;
+}
+
+XF86MCAdaptorPtr
+xf86XvMCCreateAdaptorRec(void)
+{
+    return calloc(1, sizeof(XF86MCAdaptorRec));
+}
+
+void
+xf86XvMCDestroyAdaptorRec(XF86MCAdaptorPtr adaptor)
+{
+    free(adaptor);
+}
diff --git a/xorg-server/hw/xfree86/common/xf86xvmc.h b/xorg-server/hw/xfree86/common/xf86xvmc.h
index 902b4f8fc..ff32379fe 100644
--- a/xorg-server/hw/xfree86/common/xf86xvmc.h
+++ b/xorg-server/hw/xfree86/common/xf86xvmc.h
@@ -33,24 +33,23 @@
 #include "xf86xv.h"
 
 typedef struct {
-  int num_xvimages;
-  int *xvimage_ids;  /* reference the subpictures in the XF86MCAdaptorRec */
-} XF86MCImageIDList; 
+    int num_xvimages;
+    int *xvimage_ids;           /* reference the subpictures in the XF86MCAdaptorRec */
+} XF86MCImageIDList;
 
 typedef struct {
-  int surface_type_id;  /* Driver generated.  Must be unique on the port */
-  int chroma_format;
-  int color_description;  /* no longer used */
-  unsigned short max_width;       
-  unsigned short max_height;   
-  unsigned short subpicture_max_width;
-  unsigned short subpicture_max_height;
-  int mc_type;         
-  int flags;
-  XF86MCImageIDList *compatible_subpictures; /* can be null, if none */
+    int surface_type_id;        /* Driver generated.  Must be unique on the port */
+    int chroma_format;
+    int color_description;      /* no longer used */
+    unsigned short max_width;
+    unsigned short max_height;
+    unsigned short subpicture_max_width;
+    unsigned short subpicture_max_height;
+    int mc_type;
+    int flags;
+    XF86MCImageIDList *compatible_subpictures;  /* can be null, if none */
 } XF86MCSurfaceInfoRec, *XF86MCSurfaceInfoPtr;
 
-
 /*
    xf86XvMCCreateContextProc 
 
@@ -63,19 +62,13 @@ typedef struct {
    of 32 bit words in num_priv.  This must be dynamically allocated
    space because DIX will free it after it passes it to the client.
 */
-   
 
-typedef int (*xf86XvMCCreateContextProcPtr) (
-  ScrnInfoPtr pScrn,
-  XvMCContextPtr context,
-  int *num_priv,
-  CARD32 **priv 
-);
+typedef int (*xf86XvMCCreateContextProcPtr) (ScrnInfoPtr pScrn,
+                                             XvMCContextPtr context,
+                                             int *num_priv, CARD32 **priv);
 
-typedef void (*xf86XvMCDestroyContextProcPtr) (
-  ScrnInfoPtr pScrn,
-  XvMCContextPtr context
-);
+typedef void (*xf86XvMCDestroyContextProcPtr) (ScrnInfoPtr pScrn,
+                                               XvMCContextPtr context);
 
 /*
    xf86XvMCCreateSurfaceProc 
@@ -86,18 +79,12 @@ typedef void (*xf86XvMCDestroyContextProcPtr) (
    xf86XvMCCreateContextProc.
 */
 
+typedef int (*xf86XvMCCreateSurfaceProcPtr) (ScrnInfoPtr pScrn,
+                                             XvMCSurfacePtr surface,
+                                             int *num_priv, CARD32 **priv);
 
-typedef int (*xf86XvMCCreateSurfaceProcPtr) (
-  ScrnInfoPtr pScrn,
-  XvMCSurfacePtr surface,
-  int *num_priv,
-  CARD32 **priv
-);
-
-typedef void (*xf86XvMCDestroySurfaceProcPtr) (
-  ScrnInfoPtr pScrn,
-  XvMCSurfacePtr surface
-);
+typedef void (*xf86XvMCDestroySurfaceProcPtr) (ScrnInfoPtr pScrn,
+                                               XvMCSurfacePtr surface);
 
 /*
    xf86XvMCCreateSubpictureProc 
@@ -114,32 +101,25 @@ typedef void (*xf86XvMCDestroySurfaceProcPtr) (
    xf86XvMCCreateContextProc.
 */
 
+typedef int (*xf86XvMCCreateSubpictureProcPtr) (ScrnInfoPtr pScrn,
+                                                XvMCSubpicturePtr subpicture,
+                                                int *num_priv, CARD32 **priv);
 
-typedef int (*xf86XvMCCreateSubpictureProcPtr) (
-  ScrnInfoPtr pScrn,
-  XvMCSubpicturePtr subpicture,
-  int *num_priv,
-  CARD32 **priv
-);
-
-typedef void (*xf86XvMCDestroySubpictureProcPtr) (
-  ScrnInfoPtr pScrn,
-  XvMCSubpicturePtr subpicture
-);
-
+typedef void (*xf86XvMCDestroySubpictureProcPtr) (ScrnInfoPtr pScrn,
+                                                  XvMCSubpicturePtr subpicture);
 
 typedef struct {
-  char *name;
-  int num_surfaces;
-  XF86MCSurfaceInfoPtr *surfaces;
-  int num_subpictures;
-  XF86ImagePtr *subpictures;
-  xf86XvMCCreateContextProcPtr 		CreateContext; 
-  xf86XvMCDestroyContextProcPtr		DestroyContext; 
-  xf86XvMCCreateSurfaceProcPtr 		CreateSurface; 
-  xf86XvMCDestroySurfaceProcPtr		DestroySurface; 
-  xf86XvMCCreateSubpictureProcPtr	CreateSubpicture; 
-  xf86XvMCDestroySubpictureProcPtr	DestroySubpicture; 
+    char *name;
+    int num_surfaces;
+    XF86MCSurfaceInfoPtr *surfaces;
+    int num_subpictures;
+    XF86ImagePtr *subpictures;
+    xf86XvMCCreateContextProcPtr CreateContext;
+    xf86XvMCDestroyContextProcPtr DestroyContext;
+    xf86XvMCCreateSurfaceProcPtr CreateSurface;
+    xf86XvMCDestroySurfaceProcPtr DestroySurface;
+    xf86XvMCCreateSubpictureProcPtr CreateSubpicture;
+    xf86XvMCDestroySubpictureProcPtr DestroySubpicture;
 } XF86MCAdaptorRec, *XF86MCAdaptorPtr;
 
 /* 
@@ -151,16 +131,14 @@ typedef struct {
    an array of structures.
 */
 
-extern _X_EXPORT Bool xf86XvMCScreenInit(
-  ScreenPtr pScreen, 
-  int num_adaptors,
-  XF86MCAdaptorPtr *adaptors
-);
+extern _X_EXPORT Bool xf86XvMCScreenInit(ScreenPtr pScreen,
+                                         int num_adaptors,
+                                         XF86MCAdaptorPtr * adaptors);
 
-extern _X_EXPORT XF86MCAdaptorPtr xf86XvMCCreateAdaptorRec (void);
+extern _X_EXPORT XF86MCAdaptorPtr xf86XvMCCreateAdaptorRec(void);
 extern _X_EXPORT void xf86XvMCDestroyAdaptorRec(XF86MCAdaptorPtr adaptor);
 
-typedef int (*XvMCScreenInitProcPtr)(ScreenPtr, int, XvMCAdaptorPtr);
+typedef int (*XvMCScreenInitProcPtr) (ScreenPtr, int, XvMCAdaptorPtr);
 extern _X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc;
 
-#endif /* _XF86XVMC_H */
+#endif                          /* _XF86XVMC_H */
diff --git a/xorg-server/hw/xfree86/common/xisb.c b/xorg-server/hw/xfree86/common/xisb.c
index 287a98b53..3568a578c 100644
--- a/xorg-server/hw/xfree86/common/xisb.c
+++ b/xorg-server/hw/xfree86/common/xisb.c
@@ -1,174 +1,168 @@
-/*

- * Copyright (c) 1997  Metro Link Incorporated

- *

- * 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 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 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of the Metro Link shall not be

- * used in advertising or otherwise to promote the sale, use or other dealings

- * in this Software without prior written authorization from Metro Link.

- *

- */

-

-/*

-	X Input Serial Buffer routines for use in any XInput driver that accesses

-	a serial device.

-*/

-

-

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

- *	Standard Headers

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

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <misc.h>

-#include <xf86.h>

-#include <xf86_OSproc.h>

-#include <xf86_OSlib.h>

-#include <xf86Xinput.h>

-#include "xisb.h"

-

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

- *	Local Headers

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

-

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

- *	Variables without includable headers

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

-

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

- *	Local Variables

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

-

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

- *	Function Definitions

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

-

-XISBuffer *

-XisbNew (int fd, ssize_t size)

-{

-	XISBuffer *b;

-

-	b = malloc(sizeof (XISBuffer));

-	if (!b)

-		return NULL;

-	b->buf = malloc((sizeof (unsigned char) * size));

-	if (!b->buf)

-	{

-		free(b);

-		return NULL;

-	}

-

-	b->fd = fd;

-	b->trace = 0;

-	b->block_duration = 0;

-	b->current = 1;	/* force it to be past the end to trigger initial read */

-	b->end = 0;

-	b->buffer_size = size;

-	return b;

-}

-

-void

-XisbFree (XISBuffer *b)

-{

-	free(b->buf);

-	free(b);

-}

-

-int

-XisbRead (XISBuffer *b)

-{

-	int ret;

-

-	if (b->current >= b->end)

-	{

-		if (b->block_duration >= 0)

-		{

-			if (xf86WaitForInput (b->fd, b->block_duration) < 1)

-				return -1;

-		}

-		else

-		{

-			/*

-			 * automatically clear it so if XisbRead is called in a loop

-			 * the next call will make sure there is data with select and

-			 * thus prevent a blocking read

-			 */

-			b->block_duration = 0;

-		}

-		

-		ret = xf86ReadSerial (b->fd, b->buf, b->buffer_size);

-		switch (ret)

-		{

-			case 0:

-				return -1; /* timeout */

-			case -1:

-				return -2; /* error */

-			default:

-				b->end = ret;

-				b->current = 0;

-				break;

-		}

-	}

-	if (b->trace)

-		ErrorF ("read 0x%02x (%c)\n", b->buf[b->current], 

-			isprint(b->buf[b->current])?b->buf[b->current]:'.');

-

-	return b->buf[b->current++];

-}

-

-/* the only purpose of this function is to provide output tracing */

-ssize_t

-XisbWrite (XISBuffer *b, unsigned char *msg, ssize_t len)

-{

-    if (b->trace)

-    {

-        int i = 0;

-        for (i = 0; i < len; i++)

-            ErrorF ("\t\twrote 0x%02x (%c)\n", msg[i], msg[i]);

-    }

-    return (xf86WriteSerial (b->fd, msg, len));

-}

-

-/* turn tracing of this buffer on (1) or off (0) */

-void

-XisbTrace (XISBuffer *b, int trace)

-{

-	b->trace = trace;

-}

-

-/*

- * specify a block_duration of -1 when you know the buffer's fd is ready to

- * read. After a read, it is automatically set to 0 so that the next read

- * will use check to select for data and prevent a block.

- * It is the caller's responsibility to set the block_duration to -1 if it

- * knows that there is data to read (because the main select loop triggered

- * the read) and want's to avoid the unnecessary overhead of the select call

- *

- * a zero or positive block duration will cause the select to block for the

- * give duration in usecs.

- */

-

-void

-XisbBlockDuration (XISBuffer *b, int block_duration)

-{

-	b->block_duration = block_duration;

-}

+/*
+ * Copyright (c) 1997  Metro Link Incorporated
+ *
+ * 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 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 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the Metro Link shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from Metro Link.
+ *
+ */
+
+/*
+	X Input Serial Buffer routines for use in any XInput driver that accesses
+	a serial device.
+*/
+
+/*****************************************************************************
+ *	Standard Headers
+ ****************************************************************************/
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <misc.h>
+#include <xf86.h>
+#include <xf86_OSproc.h>
+#include <xf86_OSlib.h>
+#include <xf86Xinput.h>
+#include "xisb.h"
+
+/*****************************************************************************
+ *	Local Headers
+ ****************************************************************************/
+
+/*****************************************************************************
+ *	Variables without includable headers
+ ****************************************************************************/
+
+/*****************************************************************************
+ *	Local Variables
+ ****************************************************************************/
+
+/*****************************************************************************
+ *	Function Definitions
+ ****************************************************************************/
+
+XISBuffer *
+XisbNew(int fd, ssize_t size)
+{
+    XISBuffer *b;
+
+    b = malloc(sizeof(XISBuffer));
+    if (!b)
+        return NULL;
+    b->buf = malloc((sizeof(unsigned char) * size));
+    if (!b->buf) {
+        free(b);
+        return NULL;
+    }
+
+    b->fd = fd;
+    b->trace = 0;
+    b->block_duration = 0;
+    b->current = 1;             /* force it to be past the end to trigger initial read */
+    b->end = 0;
+    b->buffer_size = size;
+    return b;
+}
+
+void
+XisbFree(XISBuffer * b)
+{
+    free(b->buf);
+    free(b);
+}
+
+int
+XisbRead(XISBuffer * b)
+{
+    int ret;
+
+    if (b->current >= b->end) {
+        if (b->block_duration >= 0) {
+            if (xf86WaitForInput(b->fd, b->block_duration) < 1)
+                return -1;
+        }
+        else {
+            /*
+             * automatically clear it so if XisbRead is called in a loop
+             * the next call will make sure there is data with select and
+             * thus prevent a blocking read
+             */
+            b->block_duration = 0;
+        }
+
+        ret = xf86ReadSerial(b->fd, b->buf, b->buffer_size);
+        switch (ret) {
+        case 0:
+            return -1;          /* timeout */
+        case -1:
+            return -2;          /* error */
+        default:
+            b->end = ret;
+            b->current = 0;
+            break;
+        }
+    }
+    if (b->trace)
+        ErrorF("read 0x%02x (%c)\n", b->buf[b->current],
+               isprint(b->buf[b->current]) ? b->buf[b->current] : '.');
+
+    return b->buf[b->current++];
+}
+
+/* the only purpose of this function is to provide output tracing */
+ssize_t
+XisbWrite(XISBuffer * b, unsigned char *msg, ssize_t len)
+{
+    if (b->trace) {
+        int i = 0;
+
+        for (i = 0; i < len; i++)
+            ErrorF("\t\twrote 0x%02x (%c)\n", msg[i], msg[i]);
+    }
+    return (xf86WriteSerial(b->fd, msg, len));
+}
+
+/* turn tracing of this buffer on (1) or off (0) */
+void
+XisbTrace(XISBuffer * b, int trace)
+{
+    b->trace = trace;
+}
+
+/*
+ * specify a block_duration of -1 when you know the buffer's fd is ready to
+ * read. After a read, it is automatically set to 0 so that the next read
+ * will use check to select for data and prevent a block.
+ * It is the caller's responsibility to set the block_duration to -1 if it
+ * knows that there is data to read (because the main select loop triggered
+ * the read) and want's to avoid the unnecessary overhead of the select call
+ *
+ * a zero or positive block duration will cause the select to block for the
+ * give duration in usecs.
+ */
+
+void
+XisbBlockDuration(XISBuffer * b, int block_duration)
+{
+    b->block_duration = block_duration;
+}
diff --git a/xorg-server/hw/xfree86/common/xisb.h b/xorg-server/hw/xfree86/common/xisb.h
index bacfde166..6ac1a6e37 100644
--- a/xorg-server/hw/xfree86/common/xisb.h
+++ b/xorg-server/hw/xfree86/common/xisb.h
@@ -35,15 +35,14 @@
  *									structs, typedefs, #defines, enums
  *****************************************************************************/
 
-typedef struct _XISBuffer
-{
-	int fd;
-	int trace;
-	int block_duration;
-	ssize_t current;	/* bytes read */
-	ssize_t end;
-	ssize_t buffer_size;
-	unsigned char *buf;
+typedef struct _XISBuffer {
+    int fd;
+    int trace;
+    int block_duration;
+    ssize_t current;            /* bytes read */
+    ssize_t end;
+    ssize_t buffer_size;
+    unsigned char *buf;
 } XISBuffer;
 
 /******************************************************************************
@@ -52,12 +51,13 @@ typedef struct _XISBuffer
  *											of globals.
  *											put locals in the .c file.
  *****************************************************************************/
-extern _X_EXPORT XISBuffer * XisbNew (int fd, ssize_t size);
-extern _X_EXPORT void XisbFree (XISBuffer *b);
-extern _X_EXPORT int XisbRead (XISBuffer *b);
-extern _X_EXPORT ssize_t XisbWrite (XISBuffer *b, unsigned char *msg, ssize_t len);
-extern _X_EXPORT void XisbTrace (XISBuffer *b, int trace);
-extern _X_EXPORT void XisbBlockDuration (XISBuffer *b, int block_duration);
+extern _X_EXPORT XISBuffer *XisbNew(int fd, ssize_t size);
+extern _X_EXPORT void XisbFree(XISBuffer * b);
+extern _X_EXPORT int XisbRead(XISBuffer * b);
+extern _X_EXPORT ssize_t XisbWrite(XISBuffer * b, unsigned char *msg,
+                                   ssize_t len);
+extern _X_EXPORT void XisbTrace(XISBuffer * b, int trace);
+extern _X_EXPORT void XisbBlockDuration(XISBuffer * b, int block_duration);
 
 /*
  *	DO NOT PUT ANYTHING AFTER THIS ENDIF
diff --git a/xorg-server/hw/xfree86/ddc/ddc.c b/xorg-server/hw/xfree86/ddc/ddc.c
index 179f42ccd..a1281d735 100644
--- a/xorg-server/hw/xfree86/ddc/ddc.c
+++ b/xorg-server/hw/xfree86/ddc/ddc.c
@@ -29,10 +29,10 @@ typedef enum {
 } DDCOpts;
 
 static const OptionInfoRec DDCOptions[] = {
-    { DDCOPT_NODDC1,	"NoDDC1",	OPTV_BOOLEAN,	{0},	FALSE },
-    { DDCOPT_NODDC2,	"NoDDC2",	OPTV_BOOLEAN,	{0},	FALSE },
-    { DDCOPT_NODDC,	"NoDDC",	OPTV_BOOLEAN,	{0},	FALSE },
-    { -1,		NULL,		OPTV_NONE,	{0},	FALSE },
+    {DDCOPT_NODDC1, "NoDDC1", OPTV_BOOLEAN, {0}, FALSE},
+    {DDCOPT_NODDC2, "NoDDC2", OPTV_BOOLEAN, {0}, FALSE},
+    {DDCOPT_NODDC, "NoDDC", OPTV_BOOLEAN, {0}, FALSE},
+    {-1, NULL, OPTV_NONE, {0}, FALSE},
 };
 
 /* DDC1 */
@@ -41,19 +41,20 @@ static int
 find_start(unsigned int *ptr)
 {
     unsigned int comp[9], test[9];
-    int i,j;
-  
-    for (i=0;i<9;i++){
-	comp[i] = *(ptr++);
-	test[i] = 1;
+    int i, j;
+
+    for (i = 0; i < 9; i++) {
+        comp[i] = *(ptr++);
+        test[i] = 1;
     }
-    for (i=0;i<127;i++){
-	for (j=0;j<9;j++){
-	    test[j] = test[j] & !(comp[j] ^ *(ptr++));
-	}
+    for (i = 0; i < 127; i++) {
+        for (j = 0; j < 9; j++) {
+            test[j] = test[j] & !(comp[j] ^ *(ptr++));
+        }
     }
-    for (i=0;i<9;i++)
-	if (test[i]) return i+1;
+    for (i = 0; i < 9; i++)
+        if (test[i])
+            return i + 1;
     return -1;
 }
 
@@ -61,21 +62,26 @@ static unsigned char *
 find_header(unsigned char *block)
 {
     unsigned char *ptr, *head_ptr, *end;
-    unsigned char header[]={0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
- 
+    unsigned char header[] = { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 };
+
     ptr = block;
     end = block + EDID1_LEN;
-    while (ptr<end) {
-	int i;
-	head_ptr = ptr;
-	for (i=0;i<8;i++){
-	    if (header[i] != *(head_ptr++)) break;
-	    if (head_ptr == end) head_ptr = block;
-	}
-	if (i==8) break;
-	ptr++; 
+    while (ptr < end) {
+        int i;
+
+        head_ptr = ptr;
+        for (i = 0; i < 8; i++) {
+            if (header[i] != *(head_ptr++))
+                break;
+            if (head_ptr == end)
+                head_ptr = block;
+        }
+        if (i == 8)
+            break;
+        ptr++;
     }
-    if (ptr == end) return NULL;
+    if (ptr == end)
+        return NULL;
     return ptr;
 }
 
@@ -87,15 +93,18 @@ resort(unsigned char *s_block)
 
     s_end = s_block + EDID1_LEN;
     d_new = malloc(EDID1_LEN);
-    if (!d_new) return NULL;
+    if (!d_new)
+        return NULL;
     d_end = d_new + EDID1_LEN;
 
     s_ptr = find_header(s_block);
-    if (!s_ptr) return NULL;
-    for (d_ptr=d_new;d_ptr<d_end;d_ptr++){
-	tmp = *(s_ptr++);
-	*d_ptr = tmp; 
-	if (s_ptr == s_end) s_ptr = s_block;
+    if (!s_ptr)
+        return NULL;
+    for (d_ptr = d_new; d_ptr < d_end; d_ptr++) {
+        tmp = *(s_ptr++);
+        *d_ptr = tmp;
+        if (s_ptr == s_end)
+            s_ptr = s_block;
     }
     free(s_block);
     return d_new;
@@ -106,21 +115,24 @@ DDC_checksum(const unsigned char *block, int len)
 {
     int i, result = 0;
     int not_null = 0;
-    
-    for (i=0;i<len;i++) {
-	not_null |= block[i];
-	result += block[i];
+
+    for (i = 0; i < len; i++) {
+        not_null |= block[i];
+        result += block[i];
     }
-    
+
 #ifdef DEBUG
-    if (result & 0xFF) ErrorF("DDC checksum not correct\n");
-    if (!not_null) ErrorF("DDC read all Null\n");
+    if (result & 0xFF)
+        ErrorF("DDC checksum not correct\n");
+    if (!not_null)
+        ErrorF("DDC read all Null\n");
 #endif
 
     /* catch the trivial case where all bytes are 0 */
-    if (!not_null) return 1;
+    if (!not_null)
+        return 1;
 
-    return result&0xFF;
+    return result & 0xFF;
 }
 
 static unsigned char *
@@ -129,64 +141,73 @@ GetEDID_DDC1(unsigned int *s_ptr)
     unsigned char *d_block, *d_pos;
     unsigned int *s_pos, *s_end;
     int s_start;
-    int i,j;
+    int i, j;
+
     s_start = find_start(s_ptr);
-    if (s_start==-1) return NULL;
+    if (s_start == -1)
+        return NULL;
     s_end = s_ptr + NUM;
     s_pos = s_ptr + s_start;
-    d_block=malloc(EDID1_LEN);
-    if (!d_block) return NULL;
+    d_block = malloc(EDID1_LEN);
+    if (!d_block)
+        return NULL;
     d_pos = d_block;
-    for (i=0;i<EDID1_LEN;i++) {
-	for (j=0;j<8;j++) {
-	    *d_pos <<= 1;
-	    if (*s_pos) {
-		*d_pos |= 0x01;
-	    }
-	    s_pos++; if (s_pos == s_end) s_pos=s_ptr;
-	};
-	s_pos++; if (s_pos == s_end) s_pos=s_ptr;
-	d_pos++;
+    for (i = 0; i < EDID1_LEN; i++) {
+        for (j = 0; j < 8; j++) {
+            *d_pos <<= 1;
+            if (*s_pos) {
+                *d_pos |= 0x01;
+            }
+            s_pos++;
+            if (s_pos == s_end)
+                s_pos = s_ptr;
+        };
+        s_pos++;
+        if (s_pos == s_end)
+            s_pos = s_ptr;
+        d_pos++;
     }
     free(s_ptr);
-    if (d_block && DDC_checksum(d_block,EDID1_LEN)) {
-	free(d_block);
-	return NULL;
+    if (d_block && DDC_checksum(d_block, EDID1_LEN)) {
+        free(d_block);
+        return NULL;
     }
     return (resort(d_block));
 }
 
 /* fetch entire EDID record; DDC bit needs to be masked */
-static unsigned int * 
+static unsigned int *
 FetchEDID_DDC1(register ScrnInfoPtr pScrn,
-	       register unsigned int (*read_DDC)(ScrnInfoPtr))
+               register unsigned int (*read_DDC) (ScrnInfoPtr))
 {
     int count = NUM;
     unsigned int *ptr, *xp;
 
-    ptr=xp=malloc(sizeof(int)*NUM);
+    ptr = xp = malloc(sizeof(int) * NUM);
 
-    if (!ptr)  return NULL;
+    if (!ptr)
+        return NULL;
     do {
-	/* wait for next retrace */
-	*xp = read_DDC(pScrn);
-	xp++;
-    } while(--count);
+        /* wait for next retrace */
+        *xp = read_DDC(pScrn);
+        xp++;
+    } while (--count);
     return ptr;
 }
 
 /* test if DDC1  return 0 if not */
 static Bool
-TestDDC1(ScrnInfoPtr pScrn, unsigned int (*read_DDC)(ScrnInfoPtr))
+TestDDC1(ScrnInfoPtr pScrn, unsigned int (*read_DDC) (ScrnInfoPtr))
 {
     int old, count;
 
     old = read_DDC(pScrn);
     count = HEADER * BITS_PER_BYTE;
     do {
-	/* wait for next retrace */
-	if (old != read_DDC(pScrn)) break;
-    } while(count--);
+        /* wait for next retrace */
+        if (old != read_DDC(pScrn))
+            break;
+    } while (count--);
     return count;
 }
 
@@ -196,29 +217,31 @@ TestDDC1(ScrnInfoPtr pScrn, unsigned int (*read_DDC)(ScrnInfoPtr))
  * function; it will also decide if we need to reread it 
  */
 static unsigned char *
-EDIDRead_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDCSpeed, 
-              unsigned int (*read_DDC)(ScrnInfoPtr))
+EDIDRead_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDCSpeed,
+              unsigned int (*read_DDC) (ScrnInfoPtr))
 {
     unsigned char *EDID_block = NULL;
     int count = RETRIES;
 
-    if (!read_DDC) { 
-	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 
-		   "chipset doesn't support DDC1\n");
-	return NULL; 
+    if (!read_DDC) {
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+                   "chipset doesn't support DDC1\n");
+        return NULL;
     };
 
-    if (TestDDC1(pScrn,read_DDC)==-1) { 
-	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "No DDC signal\n"); 
-	return NULL; 
+    if (TestDDC1(pScrn, read_DDC) == -1) {
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "No DDC signal\n");
+        return NULL;
     };
 
-    if (DDCSpeed) DDCSpeed(pScrn,DDC_FAST);
+    if (DDCSpeed)
+        DDCSpeed(pScrn, DDC_FAST);
     do {
-	EDID_block = GetEDID_DDC1(FetchEDID_DDC1(pScrn,read_DDC)); 
-	count --;
+        EDID_block = GetEDID_DDC1(FetchEDID_DDC1(pScrn, read_DDC));
+        count--;
     } while (!EDID_block && count);
-    if (DDCSpeed) DDCSpeed(pScrn,DDC_SLOW);
+    if (DDCSpeed)
+        DDCSpeed(pScrn, DDC_SLOW);
 
     return EDID_block;
 }
@@ -235,40 +258,42 @@ EDIDRead_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDCSpeed,
  * @return NULL if no monitor attached or failure to interpret the EDID.
  */
 xf86MonPtr
-xf86DoEDID_DDC1(int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed, 
-		unsigned int (*DDC1Read)(ScrnInfoPtr))
+xf86DoEDID_DDC1(int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed,
+                unsigned int (*DDC1Read) (ScrnInfoPtr))
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     unsigned char *EDID_block = NULL;
     xf86MonPtr tmp = NULL;
+
     /* Default DDC and DDC1 to enabled. */
     Bool noddc = FALSE, noddc1 = FALSE;
     OptionInfoPtr options;
 
     options = xnfalloc(sizeof(DDCOptions));
-    (void)memcpy(options, DDCOptions, sizeof(DDCOptions));
+    (void) memcpy(options, DDCOptions, sizeof(DDCOptions));
     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
 
     xf86GetOptValBool(options, DDCOPT_NODDC, &noddc);
     xf86GetOptValBool(options, DDCOPT_NODDC1, &noddc1);
     free(options);
-    
+
     if (noddc || noddc1)
-	return NULL;
-    
+        return NULL;
+
     OsBlockSignals();
-    EDID_block = EDIDRead_DDC1(pScrn,DDC1SetSpeed,DDC1Read);
+    EDID_block = EDIDRead_DDC1(pScrn, DDC1SetSpeed, DDC1Read);
     OsReleaseSignals();
 
-    if (EDID_block){
-	tmp = xf86InterpretEDID(scrnIndex,EDID_block);
+    if (EDID_block) {
+        tmp = xf86InterpretEDID(scrnIndex, EDID_block);
     }
 #ifdef DEBUG
-	else ErrorF("No EDID block returned\n");
+    else
+        ErrorF("No EDID block returned\n");
     if (!tmp)
-	ErrorF("Cannot interpret EDID block\n");
+        ErrorF("Cannot interpret EDID block\n");
 #endif
-	return tmp;
+    return tmp;
 }
 
 /* DDC2 */
@@ -279,19 +304,19 @@ DDC2MakeDevice(I2CBusPtr pBus, int address, char *name)
     I2CDevPtr dev = NULL;
 
     if (!(dev = xf86I2CFindDev(pBus, address))) {
-	dev = xf86CreateI2CDevRec();
-	dev->DevName = name;
-	dev->SlaveAddr = address;
-	dev->ByteTimeout = 2200; /* VESA DDC spec 3 p. 43 (+10 %) */
-	dev->StartTimeout = 550;
-	dev->BitTimeout = 40;
-	dev->AcknTimeout = 40;
-
-	dev->pI2CBus = pBus;
-	if (!xf86I2CDevInit(dev)) {
-	    xf86DrvMsg(pBus->scrnIndex, X_PROBED, "No DDC2 device\n");
-	    return NULL;
-	}
+        dev = xf86CreateI2CDevRec();
+        dev->DevName = name;
+        dev->SlaveAddr = address;
+        dev->ByteTimeout = 2200;        /* VESA DDC spec 3 p. 43 (+10 %) */
+        dev->StartTimeout = 550;
+        dev->BitTimeout = 40;
+        dev->AcknTimeout = 40;
+
+        dev->pI2CBus = pBus;
+        if (!xf86I2CDevInit(dev)) {
+            xf86DrvMsg(pBus->scrnIndex, X_PROBED, "No DDC2 device\n");
+            return NULL;
+        }
     }
 
     return dev;
@@ -307,10 +332,10 @@ DDC2Init(int scrnIndex, I2CBusPtr pBus)
      * miss things.
      */
     pBus->RiseFallTime = 20;
- 
+
     dev = DDC2MakeDevice(pBus, 0x00A0, "ddc2");
     if (xf86I2CProbeAddress(pBus, 0x0060))
-	DDC2MakeDevice(pBus, 0x0060, "E-EDID segment register");
+        DDC2MakeDevice(pBus, 0x0060, "E-EDID segment register");
 
     return dev;
 }
@@ -328,39 +353,39 @@ DDC2Read(I2CDevPtr dev, int block, unsigned char *R_Buffer)
     unsigned char W_Buffer[1];
     int i, segment;
     I2CDevPtr seg;
-    void (*stop)(I2CDevPtr);
+    void (*stop) (I2CDevPtr);
 
     for (i = 0; i < RETRIES; i++) {
-	/* Stop bits reset the segment pointer to 0, so be careful here. */
-	segment = block >> 1;
-	if (segment) {
-	    Bool b;
-	    
-	    if (!(seg = xf86I2CFindDev(dev->pI2CBus, 0x0060)))
-		return FALSE;
-
-	    W_Buffer[0] = segment;
-
-	    stop = dev->pI2CBus->I2CStop;
-	    dev->pI2CBus->I2CStop = EEDIDStop;
-
-	    b = xf86I2CWriteRead(seg, W_Buffer, 1, NULL, 0);
-
-	    dev->pI2CBus->I2CStop = stop;
-	    if (!b) {
-		dev->pI2CBus->I2CStop(dev);
-		continue;
-	    }
-	}
-
-	W_Buffer[0] = (block & 0x01) * EDID1_LEN;
-
-	if (xf86I2CWriteRead(dev, W_Buffer, 1, R_Buffer, EDID1_LEN)) {
-	    if (!DDC_checksum(R_Buffer, EDID1_LEN))
-		return TRUE;
-	}
+        /* Stop bits reset the segment pointer to 0, so be careful here. */
+        segment = block >> 1;
+        if (segment) {
+            Bool b;
+
+            if (!(seg = xf86I2CFindDev(dev->pI2CBus, 0x0060)))
+                return FALSE;
+
+            W_Buffer[0] = segment;
+
+            stop = dev->pI2CBus->I2CStop;
+            dev->pI2CBus->I2CStop = EEDIDStop;
+
+            b = xf86I2CWriteRead(seg, W_Buffer, 1, NULL, 0);
+
+            dev->pI2CBus->I2CStop = stop;
+            if (!b) {
+                dev->pI2CBus->I2CStop(dev);
+                continue;
+            }
+        }
+
+        W_Buffer[0] = (block & 0x01) * EDID1_LEN;
+
+        if (xf86I2CWriteRead(dev, W_Buffer, 1, R_Buffer, EDID1_LEN)) {
+            if (!DDC_checksum(R_Buffer, EDID1_LEN))
+                return TRUE;
+        }
     }
- 
+
     return FALSE;
 }
 
@@ -384,13 +409,14 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
     unsigned char *EDID_block = NULL;
     xf86MonPtr tmp = NULL;
     I2CDevPtr dev = NULL;
+
     /* Default DDC and DDC2 to enabled. */
     Bool noddc = FALSE, noddc2 = FALSE;
     OptionInfoPtr options;
 
     options = malloc(sizeof(DDCOptions));
     if (!options)
-	return NULL;
+        return NULL;
     memcpy(options, DDCOptions, sizeof(DDCOptions));
     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
 
@@ -399,30 +425,30 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
     free(options);
 
     if (noddc || noddc2)
-	return NULL;
+        return NULL;
 
     if (!(dev = DDC2Init(scrnIndex, pBus)))
-	return NULL;
+        return NULL;
 
     EDID_block = calloc(1, EDID1_LEN);
     if (!EDID_block)
-	return NULL;
+        return NULL;
 
     if (DDC2Read(dev, 0, EDID_block)) {
-	int i, n = EDID_block[0x7e];
+        int i, n = EDID_block[0x7e];
 
-	if (complete && n) {
-	    EDID_block = realloc(EDID_block, EDID1_LEN * (1+n));
+        if (complete && n) {
+            EDID_block = realloc(EDID_block, EDID1_LEN * (1 + n));
 
-	    for (i = 0; i < n; i++)
-		DDC2Read(dev, i+1, EDID_block + (EDID1_LEN * (1+i)));
-	}
+            for (i = 0; i < n; i++)
+                DDC2Read(dev, i + 1, EDID_block + (EDID1_LEN * (1 + i)));
+        }
 
-	tmp = xf86InterpretEEDID(scrnIndex, EDID_block);
+        tmp = xf86InterpretEEDID(scrnIndex, EDID_block);
     }
 
     if (tmp && complete)
-	tmp->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
+        tmp->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
 
     return tmp;
 }
@@ -469,13 +495,14 @@ xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus)
     unsigned char *did = NULL;
     xf86MonPtr tmp = NULL;
     I2CDevPtr dev = NULL;
+
     /* Default DDC and DDC2 to enabled. */
     Bool noddc = FALSE, noddc2 = FALSE;
     OptionInfoPtr options;
 
     options = malloc(sizeof(DDCOptions));
     if (!options)
-	return NULL;
+        return NULL;
     memcpy(options, DDCOptions, sizeof(DDCOptions));
     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
 
@@ -484,19 +511,19 @@ xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus)
     free(options);
 
     if (noddc || noddc2)
-	return NULL;
+        return NULL;
 
     if (!(dev = DDC2Init(scrnIndex, pBus)))
-	return NULL;
+        return NULL;
 
     if ((did = DDC2ReadDisplayID())) {
-	tmp = calloc(1, sizeof(*tmp));
-	if (!tmp)
-	    return NULL;
+        tmp = calloc(1, sizeof(*tmp));
+        if (!tmp)
+            return NULL;
 
-	tmp->scrnIndex = scrnIndex;
-	tmp->flags |= MONITOR_DISPLAYID;
-	tmp->rawData = did;
+        tmp->scrnIndex = scrnIndex;
+        tmp->flags |= MONITOR_DISPLAYID;
+        tmp->rawData = did;
     }
 
     return tmp;
diff --git a/xorg-server/hw/xfree86/ddc/ddcProperty.c b/xorg-server/hw/xfree86/ddc/ddcProperty.c
index c3aced5c2..fc63f0e8a 100644
--- a/xorg-server/hw/xfree86/ddc/ddcProperty.c
+++ b/xorg-server/hw/xfree86/ddc/ddcProperty.c
@@ -40,8 +40,8 @@ edidMakeAtom(int i, const char *name, CARD8 *data, int size)
     Atom atom;
     unsigned char *atom_data;
 
-    if (!(atom_data = malloc(size*sizeof(CARD8))))
-	return;
+    if (!(atom_data = malloc(size * sizeof(CARD8))))
+        return;
 
     atom = MakeAtom(name, strlen(name), TRUE);
     memcpy(atom_data, data, size);
@@ -54,17 +54,19 @@ addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
     int scrnIndex = pScrn->scrnIndex;
 
     if (DDC->flags & MONITOR_DISPLAYID) {
-	/* Don't bother, use RANDR already */
-	return;
-    } else if (DDC->ver.version == 1) {
-	int size = 128 +
-	    (DDC->flags & EDID_COMPLETE_RAWDATA ? DDC->no_sections * 128 : 0);
+        /* Don't bother, use RANDR already */
+        return;
+    }
+    else if (DDC->ver.version == 1) {
+        int size = 128 +
+            (DDC->flags & EDID_COMPLETE_RAWDATA ? DDC->no_sections * 128 : 0);
 
-	edidMakeAtom(scrnIndex, EDID1_ATOM_NAME, DDC->rawData, size);
-    } else {
-	xf86DrvMsg(scrnIndex, X_PROBED, "unexpected EDID version %d.%d\n",
-		DDC->ver.version, DDC->ver.revision);
-	return;
+        edidMakeAtom(scrnIndex, EDID1_ATOM_NAME, DDC->rawData, size);
+    }
+    else {
+        xf86DrvMsg(scrnIndex, X_PROBED, "unexpected EDID version %d.%d\n",
+                   DDC->ver.version, DDC->ver.revision);
+        return;
     }
 }
 
@@ -74,10 +76,9 @@ xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
     if (!pScrn || !pScrn->monitor || !DDC)
         return FALSE;
 
-    if (DDC->flags & MONITOR_DISPLAYID)
-	;
+    if (DDC->flags & MONITOR_DISPLAYID);
     else
-	xf86EdidMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC);
+        xf86EdidMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC);
 
     addRootWindowProperties(pScrn, DDC);
 
diff --git a/xorg-server/hw/xfree86/ddc/edid.h b/xorg-server/hw/xfree86/ddc/edid.h
index cc4bd02ea..91565a2cf 100644
--- a/xorg-server/hw/xfree86/ddc/edid.h
+++ b/xorg-server/hw/xfree86/ddc/edid.h
@@ -10,12 +10,12 @@
  */
 
 #ifndef _EDID_H_
-#define _EDID_H_ 
+#define _EDID_H_
 
 #include <X11/Xmd.h>
 
 #ifndef _X_EXPORT
-# include <X11/Xfuncproto.h>
+#include <X11/Xfuncproto.h>
 #endif
 
 /* read complete EDID record */
@@ -72,7 +72,7 @@
 #define E_T1 0
 #define E_T2 (E_T1 + 1)
 #define E_TMANU (E_T2 + 1)
-#define E_TIMING_LENGTH (E_TMANU + 1) 
+#define E_TIMING_LENGTH (E_TMANU + 1)
 
 /* non predefined standard timings supported by display */
 #define STD_TIMING_SECTION (ESTABLISHED_TIMING_SECTION + E_TIMING_LENGTH)
@@ -90,13 +90,12 @@
 /* number of EDID sections to follow */
 #define NO_EDID (DET_TIMING_SECTION + DET_TIMING_LENGTH)
 /* one byte checksum */
-#define CHECKSUM (NO_EDID + 1)  
+#define CHECKSUM (NO_EDID + 1)
 
 #if (CHECKSUM != (EDID1_LEN - 1))
-# error "EDID1 length != 128!" 
+#error "EDID1 length != 128!"
 #endif
 
-
 #define SECTION(x,y) (Uchar *)(x + y)
 #define GET_ARRAY(y) ((Uchar *)(c + y))
 #define GET(y) *(Uchar *)(c + y)
@@ -146,7 +145,6 @@
 #define _MSC(x) (x & 0x7)
 #define MSC _MSC(GET(FEAT_S))
 
-
 /* color characteristics */
 #define CC_L(x,y) ((x & (0x03 << y)) >> y)
 #define CC_H(x) (x << 2)
@@ -198,7 +196,6 @@
 #define _NEXT_STD_TIMING(x)  (x = (x + STD_TIMING_INFO_LEN))
 #define NEXT_STD_TIMING _NEXT_STD_TIMING(c)
 
-
 /* EDID Ver. >= 1.2 */
 /**
  * Returns true if the pointer is the start of a monitor descriptor block
@@ -264,7 +261,7 @@
 #define _MAX_H(x) x[8]
 #define MAX_H (_MAX_H(c) + _MAX_H_OFFSET(c))
 #define _MAX_CLOCK(x) x[9]
-#define MAX_CLOCK _MAX_CLOCK(c) 
+#define MAX_CLOCK _MAX_CLOCK(c)
 #define _HAVE_2ND_GTF(x) (x[10] == 0x02)
 #define HAVE_2ND_GTF _HAVE_2ND_GTF(c)
 #define _F_2ND_GTF(x) (x[12] * 2)
@@ -325,7 +322,7 @@
 #define WHITEX2 _WHITEX_ADD(c,12)
 #define WHITEY2 _WHITEY_ADD(c,12)
 #define _WHITE_GAMMA1(x) _GAMMA(x[9])
-#define WHITE_GAMMA1 _WHITE_GAMMA1(c) 
+#define WHITE_GAMMA1 _WHITE_GAMMA1(c)
 #define _WHITE_GAMMA2(x) _GAMMA(x[14])
 #define WHITE_GAMMA2 _WHITE_GAMMA2(c)
 #define ADD_STD_TIMINGS 0xFA
@@ -337,7 +334,7 @@
 #define _NEXT_DT_MD_SECTION(x) (x = (x + DET_TIMING_INFO_LEN))
 #define NEXT_DT_MD_SECTION _NEXT_DT_MD_SECTION(c)
 
-#endif /* _PARSE_EDID_ */
+#endif                          /* _PARSE_EDID_ */
 
 /* input type */
 #define DIGITAL(x) x
@@ -346,10 +343,10 @@
 #define DFP1(x) x
 
 /* input voltage level */
-#define V070 0  /* 0.700V/0.300V */
-#define V071 1  /* 0.714V/0.286V */
-#define V100 2  /* 1.000V/0.400V */
-#define V007 3 /* 0.700V/0.000V */
+#define V070 0                  /* 0.700V/0.300V */
+#define V071 1                  /* 0.714V/0.286V */
+#define V100 2                  /* 1.000V/0.400V */
+#define V007 3                  /* 0.700V/0.000V */
 
 /* Signal level setup */
 #define SIG_SETUP(x) (x)
@@ -382,88 +379,87 @@
 #define CVT_SUPPORTED(x) (x & 0x1)
 
 /* detailed timing misc */
-#define IS_INTERLACED(x)  (x) 
-#define IS_STEREO(x)  (x) 
+#define IS_INTERLACED(x)  (x)
+#define IS_STEREO(x)  (x)
 #define IS_RIGHT_STEREO(x) (x & 0x01)
 #define IS_LEFT_STEREO(x) (x & 0x02)
 #define IS_4WAY_STEREO(x) (x & 0x03)
 #define IS_RIGHT_ON_SYNC(x) IS_RIGHT_STEREO(x)
 #define IS_LEFT_ON_SYNC(x) IS_LEFT_STEREO(x)
 
-
 typedef unsigned int Uint;
 typedef unsigned char Uchar;
 
 struct vendor {
-  char name[4];
-  int prod_id;
-  Uint serial;
-  int week;
-  int year;
+    char name[4];
+    int prod_id;
+    Uint serial;
+    int week;
+    int year;
 };
 
 struct edid_version {
-  int version;
-  int revision;
+    int version;
+    int revision;
 };
 
 struct disp_features {
-  unsigned int input_type:1;
-  unsigned int input_voltage:2;
-  unsigned int input_setup:1;
-  unsigned int input_sync:5;
-  unsigned int input_dfp:1;
-  unsigned int input_bpc:3;
-  unsigned int input_interface:4;
-  /* 15 bit hole */
-  int hsize;
-  int vsize;
-  float gamma;
-  unsigned int dpms:3;
-  unsigned int display_type:2;
-  unsigned int msc:3;
-  float redx;
-  float redy;
-  float greenx;
-  float greeny;
-  float bluex;
-  float bluey;
-  float whitex;
-  float whitey;
+    unsigned int input_type:1;
+    unsigned int input_voltage:2;
+    unsigned int input_setup:1;
+    unsigned int input_sync:5;
+    unsigned int input_dfp:1;
+    unsigned int input_bpc:3;
+    unsigned int input_interface:4;
+    /* 15 bit hole */
+    int hsize;
+    int vsize;
+    float gamma;
+    unsigned int dpms:3;
+    unsigned int display_type:2;
+    unsigned int msc:3;
+    float redx;
+    float redy;
+    float greenx;
+    float greeny;
+    float bluex;
+    float bluey;
+    float whitex;
+    float whitey;
 };
 
 struct established_timings {
-  Uchar t1;
-  Uchar t2;
-  Uchar t_manu;
+    Uchar t1;
+    Uchar t2;
+    Uchar t_manu;
 };
 
 struct std_timings {
-  int hsize;
-  int vsize;
-  int refresh;
-  CARD16 id;
+    int hsize;
+    int vsize;
+    int refresh;
+    CARD16 id;
 };
 
 struct detailed_timings {
-  int clock;
-  int h_active;
-  int h_blanking;
-  int v_active;
-  int v_blanking;
-  int h_sync_off;
-  int h_sync_width;
-  int v_sync_off;
-  int v_sync_width;
-  int h_size;
-  int v_size;
-  int h_border;
-  int v_border;
-  unsigned int interlaced:1;
-  unsigned int stereo:2;
-  unsigned int sync:2;
-  unsigned int misc:2;
-  unsigned int stereo_1:1;
+    int clock;
+    int h_active;
+    int h_blanking;
+    int v_active;
+    int v_blanking;
+    int h_sync_off;
+    int h_sync_width;
+    int v_sync_off;
+    int v_sync_width;
+    int h_size;
+    int v_size;
+    int h_border;
+    int v_border;
+    unsigned int interlaced:1;
+    unsigned int stereo:2;
+    unsigned int sync:2;
+    unsigned int misc:2;
+    unsigned int stereo_1:1;
 };
 
 #define DT 0
@@ -477,35 +473,35 @@ struct detailed_timings {
 #define DS_CVT 0xF8
 #define DS_EST_III 0xF7
 #define DS_DUMMY 0x10
-#define DS_UNKOWN 0x100 /* type is an int */
+#define DS_UNKOWN 0x100         /* type is an int */
 #define DS_VENDOR 0x101
 #define DS_VENDOR_MAX 0x110
 
 struct monitor_ranges {
-  int min_v;
-  int max_v;
-  int min_h;
-  int max_h;
-  int max_clock;    /* in mhz */
-  int gtf_2nd_f;
-  int gtf_2nd_c;
-  int gtf_2nd_m;
-  int gtf_2nd_k;
-  int gtf_2nd_j;
-  int max_clock_khz;
-  int maxwidth;	    /* in pixels */
-  char supported_aspect;
-  char preferred_aspect;
-  char supported_blanking;
-  char supported_scaling;
-  int preferred_refresh; /* in hz */
+    int min_v;
+    int max_v;
+    int min_h;
+    int max_h;
+    int max_clock;              /* in mhz */
+    int gtf_2nd_f;
+    int gtf_2nd_c;
+    int gtf_2nd_m;
+    int gtf_2nd_k;
+    int gtf_2nd_j;
+    int max_clock_khz;
+    int maxwidth;               /* in pixels */
+    char supported_aspect;
+    char preferred_aspect;
+    char supported_blanking;
+    char supported_scaling;
+    int preferred_refresh;      /* in hz */
 };
 
-struct whitePoints{
-  int   index;
-  float white_x;
-  float white_y;
-  float white_gamma;
+struct whitePoints {
+    int index;
+    float white_x;
+    float white_y;
+    float white_gamma;
 };
 
 struct cvt_timings {
@@ -522,19 +518,19 @@ struct cvt_timings {
  * literally like serial and friends.
  */
 struct detailed_monitor_section {
-  int type;
-  union {
-    struct detailed_timings d_timings;	/* 56 */
-    Uchar serial[13];
-    Uchar ascii_data[13];
-    Uchar name[13];
-    struct monitor_ranges ranges;	/* 56 */
-    struct std_timings std_t[5];	/* 80 */
-    struct whitePoints wp[2];		/* 32 */
-    /* color management data */
-    struct cvt_timings cvt[4];		/* 64 */
-    Uchar est_iii[6];			/* 6 */
-  } section;				/* max: 80 */
+    int type;
+    union {
+        struct detailed_timings d_timings;      /* 56 */
+        Uchar serial[13];
+        Uchar ascii_data[13];
+        Uchar name[13];
+        struct monitor_ranges ranges;   /* 56 */
+        struct std_timings std_t[5];    /* 80 */
+        struct whitePoints wp[2];       /* 32 */
+        /* color management data */
+        struct cvt_timings cvt[4];      /* 64 */
+        Uchar est_iii[6];       /* 6 */
+    } section;                  /* max: 80 */
 };
 
 /* flags */
@@ -548,16 +544,16 @@ struct detailed_monitor_section {
  * are meaningful.  For EDID, they all are.
  */
 typedef struct {
-  int scrnIndex;
-  struct vendor vendor;
-  struct edid_version ver;
-  struct disp_features features;
-  struct established_timings timings1;
-  struct std_timings timings2[8];
-  struct detailed_monitor_section det_mon[4];
-  unsigned long flags;
-  int no_sections;
-  Uchar *rawData;
+    int scrnIndex;
+    struct vendor vendor;
+    struct edid_version ver;
+    struct disp_features features;
+    struct established_timings timings1;
+    struct std_timings timings2[8];
+    struct detailed_monitor_section det_mon[4];
+    unsigned long flags;
+    int no_sections;
+    Uchar *rawData;
 } xf86Monitor, *xf86MonPtr;
 
 extern _X_EXPORT xf86MonPtr ConfiguredMonitor;
@@ -590,73 +586,72 @@ extern _X_EXPORT xf86MonPtr ConfiguredMonitor;
 #define HDMI_MAX_TMDS_UNIT   (5000)
 
 struct cea_video_block {
-  Uchar video_code;
+    Uchar video_code;
 };
 
 struct cea_audio_block_descriptor {
-  Uchar audio_code[3];
+    Uchar audio_code[3];
 };
 
 struct cea_audio_block {
-  struct cea_audio_block_descriptor descriptor[10];
+    struct cea_audio_block_descriptor descriptor[10];
 };
 
 struct cea_vendor_block_hdmi {
-  Uchar  portB:4;
-  Uchar  portA:4;
-  Uchar  portD:4;
-  Uchar  portC:4;
-  Uchar  support_flags;
-  Uchar  max_tmds_clock;
-  Uchar  latency_present;
-  Uchar  video_latency;
-  Uchar  audio_latency;
-  Uchar  interlaced_video_latency;
-  Uchar  interlaced_audio_latency;
+    Uchar portB:4;
+    Uchar portA:4;
+    Uchar portD:4;
+    Uchar portC:4;
+    Uchar support_flags;
+    Uchar max_tmds_clock;
+    Uchar latency_present;
+    Uchar video_latency;
+    Uchar audio_latency;
+    Uchar interlaced_video_latency;
+    Uchar interlaced_audio_latency;
 };
 
 struct cea_vendor_block {
-  unsigned char ieee_id[3];
-  union {
-      struct cea_vendor_block_hdmi hdmi;
-      /* any other vendor blocks we know about */
-  };
+    unsigned char ieee_id[3];
+    union {
+        struct cea_vendor_block_hdmi hdmi;
+        /* any other vendor blocks we know about */
+    };
 };
 
-struct cea_speaker_block
-{
-  Uchar FLR:1;
-  Uchar LFE:1;
-  Uchar FC:1;
-  Uchar RLR:1;
-  Uchar RC:1;
-  Uchar FLRC:1;
-  Uchar RLRC:1;
-  Uchar FLRW:1;
-  Uchar FLRH:1;
-  Uchar TC:1;
-  Uchar FCH:1;
-  Uchar Resv:5;
-  Uchar ResvByte;
+struct cea_speaker_block {
+    Uchar FLR:1;
+    Uchar LFE:1;
+    Uchar FC:1;
+    Uchar RLR:1;
+    Uchar RC:1;
+    Uchar FLRC:1;
+    Uchar RLRC:1;
+    Uchar FLRW:1;
+    Uchar FLRH:1;
+    Uchar TC:1;
+    Uchar FCH:1;
+    Uchar Resv:5;
+    Uchar ResvByte;
 };
 
 struct cea_data_block {
-  Uchar len:5;
-  Uchar tag:3;
-  union{
-    struct cea_video_block video;
-    struct cea_audio_block audio;
-    struct cea_vendor_block vendor;
-    struct cea_speaker_block speaker;
-  }u;
+    Uchar len:5;
+    Uchar tag:3;
+    union {
+        struct cea_video_block video;
+        struct cea_audio_block audio;
+        struct cea_vendor_block vendor;
+        struct cea_speaker_block speaker;
+    } u;
 };
 
 struct cea_ext_body {
-  Uchar tag;
-  Uchar rev;
-  Uchar dt_offset;
-  Uchar flags;
-  struct cea_data_block data_collection;
+    Uchar tag;
+    Uchar rev;
+    Uchar dt_offset;
+    Uchar flags;
+    struct cea_data_block data_collection;
 };
 
-#endif /* _EDID_H_ */
+#endif                          /* _EDID_H_ */
diff --git a/xorg-server/hw/xfree86/ddc/interpret_edid.c b/xorg-server/hw/xfree86/ddc/interpret_edid.c
index d1001a21f..882a6b201 100644
--- a/xorg-server/hw/xfree86/ddc/interpret_edid.c
+++ b/xorg-server/hw/xfree86/ddc/interpret_edid.c
@@ -1,685 +1,714 @@
-/*

- * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>

- * Copyright 2007 Red Hat, Inc.

- *

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

- *

- * interpret_edid.c: interpret a primary EDID block

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-#define _PARSE_EDID_

-#include "xf86DDC.h"

-#include <string.h>

-

-static void get_vendor_section(Uchar*, struct vendor *);

-static void get_version_section(Uchar*, struct edid_version *);

-static void get_display_section(Uchar*, struct disp_features *,

-				struct edid_version *);

-static void get_established_timing_section(Uchar*, struct established_timings *);

-static void get_std_timing_section(Uchar*, struct std_timings *,

-				   struct edid_version *);

-static void fetch_detailed_block(Uchar *c, struct edid_version *ver,

-                                 struct detailed_monitor_section *det_mon);

-static void get_dt_md_section(Uchar *, struct edid_version *,

-			      struct detailed_monitor_section *det_mon);

-static void copy_string(Uchar *, Uchar *);

-static void get_dst_timing_section(Uchar *, struct std_timings *,

-				   struct edid_version *);

-static void get_monitor_ranges(Uchar *, struct monitor_ranges *);

-static void get_whitepoint_section(Uchar *, struct whitePoints *);

-static void get_detailed_timing_section(Uchar*, struct 	detailed_timings *);

-static Bool validate_version(int scrnIndex, struct edid_version *);

-

-static void

-find_ranges_section(struct detailed_monitor_section *det, void *ranges)

-{

-   if (det->type == DS_RANGES && det->section.ranges.max_clock)

-       *(struct monitor_ranges **)ranges = &det->section.ranges;

-}

-

-static void

-find_max_detailed_clock(struct detailed_monitor_section *det, void *ret)

-{

-    if (det->type == DT) {

-        *(int *)ret = max(*((int *)ret),

-                          det->section.d_timings.clock);

-    }

-}

-

-static void

-handle_edid_quirks(xf86MonPtr m)

-{

-    struct monitor_ranges *ranges = NULL;

-

-    /*

-     * max_clock is only encoded in EDID in tens of MHz, so occasionally we

-     * find a monitor claiming a max of 160 with a mode requiring 162, or

-     * similar.  Strictly we should refuse to round up too far, but let's

-     * see how well this works.

-     */

-

-    /* Try to find Monitor Range and max clock, then re-set range value*/

-    xf86ForEachDetailedBlock(m, find_ranges_section, &ranges);

-    if (ranges && ranges->max_clock) {

-        int clock = 0;

-        xf86ForEachDetailedBlock(m, find_max_detailed_clock, &clock);

-        if (clock && (ranges->max_clock * 1e6 < clock)) {

-            xf86Msg(X_WARNING, "EDID timing clock %.2f exceeds claimed max "

-                    "%dMHz, fixing\n", clock / 1.0e6, ranges->max_clock);

-            ranges->max_clock = (clock+999999)/1e6;

-        }

-    }

-}

-

-struct det_hv_parameter {

-    int real_hsize;

-    int real_vsize;

-    float target_aspect;

-};

-

-static void handle_detailed_hvsize(struct detailed_monitor_section *det_mon,

-                                   void *data)

-{

-    struct det_hv_parameter *p = (struct det_hv_parameter *)data;

-    float timing_aspect;

-

-    if (det_mon->type == DT) {

-        struct detailed_timings *timing;

-        timing = &det_mon->section.d_timings;

-

-        if (!timing->v_size)

-            return;

-

-        timing_aspect = (float)timing->h_size / timing->v_size;

-        if (fabs(1 - (timing_aspect / p->target_aspect)) < 0.05) {

-            p->real_hsize = max(p->real_hsize, timing->h_size);

-            p->real_vsize = max(p->real_vsize, timing->v_size);

-        }

-    }

-}

-

-static void encode_aspect_ratio(xf86MonPtr m)

-{

-    /*

-     * some monitors encode the aspect ratio instead of the physical size.

-     * try to find the largest detailed timing that matches that aspect

-     * ratio and use that to fill in the feature section.

-     */

-    if ((m->features.hsize == 16 && m->features.vsize == 9) ||

-	(m->features.hsize == 16 && m->features.vsize == 10) ||

-	(m->features.hsize == 4 && m->features.vsize == 3) ||

-	(m->features.hsize == 5 && m->features.vsize == 4)) {

-

-        struct det_hv_parameter p;

-        p.real_hsize = 0;

-        p.real_vsize = 0;

-        p.target_aspect = (float)m->features.hsize /m->features.vsize;

-

-        xf86ForEachDetailedBlock(m, handle_detailed_hvsize, &p);

-

-	if (!p.real_hsize || !p.real_vsize) {

-	    m->features.hsize = m->features.vsize = 0;

-	} else if ((m->features.hsize * 10 == p.real_hsize) &&

-		   (m->features.vsize * 10 == p.real_vsize)) {

-	    /* exact match is just unlikely, should do a better check though */

-	    m->features.hsize = m->features.vsize = 0;

-	} else {

-	    /* convert mm to cm */

-	    m->features.hsize = (p.real_hsize + 5) / 10;

-	    m->features.vsize = (p.real_vsize + 5) / 10;

-	}

-

-	xf86Msg(X_INFO, "Quirked EDID physical size to %dx%d cm\n",

-		m->features.hsize, m->features.vsize);

-    }

-}

-

-xf86MonPtr

-xf86InterpretEDID(int scrnIndex, Uchar *block)

-{

-    xf86MonPtr m;

-

-    if (!block) return NULL;

-    if (! (m = xnfcalloc(sizeof(xf86Monitor),1))) return NULL;

-    m->scrnIndex = scrnIndex;

-    m->rawData = block;

-

-    get_vendor_section(SECTION(VENDOR_SECTION,block),&m->vendor);

-    get_version_section(SECTION(VERSION_SECTION,block),&m->ver);

-    if (!validate_version(scrnIndex, &m->ver)) goto error;

-    get_display_section(SECTION(DISPLAY_SECTION,block),&m->features,

-			&m->ver);

-    get_established_timing_section(SECTION(ESTABLISHED_TIMING_SECTION,block),

-				   &m->timings1);

-    get_std_timing_section(SECTION(STD_TIMING_SECTION,block),m->timings2,

-			   &m->ver);

-    get_dt_md_section(SECTION(DET_TIMING_SECTION,block),&m->ver, m->det_mon);

-    m->no_sections = (int)*(char *)SECTION(NO_EDID,block);

-

-    handle_edid_quirks(m);

-    encode_aspect_ratio(m);

-

-    return m;

-

- error:

-    free(m);

-    return NULL;

-}

-

-static int get_cea_detail_timing(Uchar *blk, xf86MonPtr mon,

-                                 struct detailed_monitor_section *det_mon)

-{

-    int dt_num;

-    int dt_offset = ((struct cea_ext_body *)blk)->dt_offset;

-

-    dt_num = 0;

-

-    if (dt_offset < CEA_EXT_MIN_DATA_OFFSET)

-        return dt_num;

-

-    for (; dt_offset < (CEA_EXT_MAX_DATA_OFFSET - DET_TIMING_INFO_LEN) &&

-           dt_num < CEA_EXT_DET_TIMING_NUM;

-	   _NEXT_DT_MD_SECTION(dt_offset)) {

-

-        fetch_detailed_block(blk + dt_offset, &mon->ver, det_mon + dt_num);

-        dt_num = dt_num + 1 ;

-    }

-

-    return dt_num;

-}

-

-static void handle_cea_detail_block(Uchar *ext, xf86MonPtr mon,

-                                    handle_detailed_fn fn,

-                                    void *data)

-{

-    int i;

-    struct detailed_monitor_section det_mon[CEA_EXT_DET_TIMING_NUM];

-    int det_mon_num;

-

-    det_mon_num = get_cea_detail_timing(ext, mon, det_mon);

-

-    for (i = 0; i < det_mon_num; i++)

-        fn(det_mon + i, data);

-}

-

-void xf86ForEachDetailedBlock(xf86MonPtr mon,

-                              handle_detailed_fn fn,

-                              void *data)

-{

-    int i;

-    Uchar *ext;

-

-    if (mon == NULL)

-        return;

-

-    for (i = 0; i < DET_TIMINGS; i++)

-        fn(mon->det_mon + i, data);

-

-    for (i = 0; i < mon->no_sections; i++) {

-        ext = mon->rawData + EDID1_LEN * (i + 1);

-        switch (ext[EXT_TAG]){

-        case CEA_EXT:

-            handle_cea_detail_block(ext, mon, fn, data);

-            break;

-        case VTB_EXT:

-        case DI_EXT:

-        case LS_EXT:

-        case MI_EXT:

-	    break;

-        }

-    }

-}

-

-static struct cea_data_block *

-extract_cea_data_block(Uchar *ext, int data_type)

-{

-    struct cea_ext_body *cea;

-    struct cea_data_block *data_collection;

-    struct cea_data_block *data_end;

-

-    cea = (struct cea_ext_body *)ext;

-

-    if (cea->dt_offset <= CEA_EXT_MIN_DATA_OFFSET)

-        return NULL;

-

-    data_collection = &cea->data_collection;

-    data_end = (struct cea_data_block *)(cea->dt_offset + ext);

-

-    for ( ;data_collection < data_end;) {

-

-	if (data_type == data_collection->tag) {

-	    return data_collection;

-	}

-	data_collection = (void *)((unsigned char *)data_collection +

-	    data_collection->len + 1);

-    }

-

-    return NULL;

-}

-

-static void handle_cea_video_block(Uchar *ext, handle_video_fn fn, void *data)

-{

-    struct cea_video_block *video;

-    struct cea_video_block *video_end;

-    struct cea_data_block *data_collection;

-

-    data_collection = extract_cea_data_block(ext, CEA_VIDEO_BLK);

-    if (data_collection == NULL)

-        return;

-

-    video = &data_collection->u.video;

-    video_end = (struct cea_video_block *)

-	((Uchar *)video + data_collection->len);

-

-    for (; video < video_end; video = video + 1) {

-	fn(video, data);

-    }

-}

-

-void xf86ForEachVideoBlock(xf86MonPtr mon,

-	                   handle_video_fn fn,

-                           void *data)

-{

-    int i;

-    Uchar *ext;

-

-    if (mon == NULL)

-	return;

-

-    for (i = 0; i < mon->no_sections; i++) {

-	ext = mon->rawData + EDID1_LEN * (i + 1);

-	switch (ext[EXT_TAG]) {

-	case CEA_EXT:

-	    handle_cea_video_block(ext, fn, data);

-	    break;

-	case VTB_EXT:

-	case DI_EXT:

-	case LS_EXT:

-	case MI_EXT:

-	    break;

-	}

-    }

-}

-

-xf86MonPtr

-xf86InterpretEEDID(int scrnIndex, Uchar *block)

-{

-    xf86MonPtr m;

-

-    m = xf86InterpretEDID(scrnIndex, block);

-    if (!m)

-	return NULL;

-

-    /* extension parse */

-

-    return m;

-}

-

-static void

-get_vendor_section(Uchar *c, struct vendor *r)

-{

-    r->name[0] = L1;

-    r->name[1] = L2;

-    r->name[2] = L3;

-    r->name[3] = '\0';

-  

-    r->prod_id = PROD_ID;

-    r->serial  = SERIAL_NO;

-    r->week    = WEEK;

-    r->year    = YEAR;

-}

-

-static void 

-get_version_section(Uchar *c, struct edid_version *r)

-{

-    r->version  = VERSION;

-    r->revision = REVISION;

-}

-

-static void 

-get_display_section(Uchar *c, struct disp_features *r,

-		    struct edid_version *v)

-{

-    r->input_type = INPUT_TYPE;

-    if (!DIGITAL(r->input_type)) {

-	r->input_voltage = INPUT_VOLTAGE;

-	r->input_setup = SETUP;

-	r->input_sync = SYNC;

-    } else if (v->revision == 2 || v->revision == 3) {

-	r->input_dfp = DFP;

-    } else if (v->revision >= 4) {

-	r->input_bpc = BPC;

-	r->input_interface = DIGITAL_INTERFACE;

-    }

-    r->hsize = HSIZE_MAX;

-    r->vsize = VSIZE_MAX;

-    r->gamma = GAMMA;

-    r->dpms =  DPMS;

-    r->display_type = DISPLAY_TYPE;

-    r->msc = MSC;

-    r->redx = REDX;

-    r->redy = REDY;

-    r->greenx = GREENX;

-    r->greeny = GREENY;

-    r->bluex = BLUEX;

-    r->bluey = BLUEY;

-    r->whitex = WHITEX;

-    r->whitey = WHITEY;

-}

-

-static void 

-get_established_timing_section(Uchar *c, struct established_timings *r)

-{

-    r->t1 = T1;

-    r->t2 = T2;

-    r->t_manu = T_MANU;

-}

-

-static void

-get_cvt_timing_section(Uchar *c, struct cvt_timings *r)

-{

-    int i;

-

-    for (i = 0; i < 4; i++) {

-	if (c[0] && c[1] && c[2]) {

-	    r[i].height = (c[0] + ((c[1] & 0xF0) << 8) + 1) * 2;

-	    switch (c[1] & 0xc0) {

-		case 0x00: r[i].width = r[i].height * 4 / 3; break;

-		case 0x40: r[i].width = r[i].height * 16 / 9; break;

-		case 0x80: r[i].width = r[i].height * 16 / 10; break;

-		case 0xc0: r[i].width = r[i].height * 15 / 9; break;

-	    }

-	    switch (c[2] & 0x60) {

-		case 0x00: r[i].rate = 50; break;

-		case 0x20: r[i].rate = 60; break;

-		case 0x40: r[i].rate = 75; break;

-		case 0x60: r[i].rate = 85; break;

-	    }

-	    r[i].rates = c[2] & 0x1f;

-	} else {

-	    return;

-	}

-	c += 3;

-    }

-}

-

-static void

-get_std_timing_section(Uchar *c, struct std_timings *r,

-		       struct edid_version *v)

-{

-    int i;

-

-    for (i=0;i<STD_TIMINGS;i++){

-	if (VALID_TIMING) {

-	    r[i].hsize = HSIZE1;

-	    VSIZE1(r[i].vsize);

-	    r[i].refresh = REFRESH_R;

-	    r[i].id = STD_TIMING_ID;

-	} else {

-	    r[i].hsize = r[i].vsize = r[i].refresh = r[i].id = 0;

-	}

-	NEXT_STD_TIMING;

-    }

-}

-

-static const unsigned char empty_block[18];

-

-static void

-fetch_detailed_block(Uchar *c, struct edid_version *ver,

-                     struct detailed_monitor_section *det_mon)

-{

-    if (ver->version == 1 && ver->revision >= 1 && IS_MONITOR_DESC) {

-        switch (MONITOR_DESC_TYPE) {

-        case SERIAL_NUMBER:

-            det_mon->type = DS_SERIAL;

-            copy_string(c,det_mon->section.serial);

-            break;

-        case ASCII_STR:

-            det_mon->type = DS_ASCII_STR;

-            copy_string(c,det_mon->section.ascii_data);

-            break;

-        case MONITOR_RANGES:

-            det_mon->type = DS_RANGES;

-            get_monitor_ranges(c,&det_mon->section.ranges);

-            break;

-        case MONITOR_NAME:

-            det_mon->type = DS_NAME;

-            copy_string(c,det_mon->section.name);

-            break;

-        case ADD_COLOR_POINT:

-            det_mon->type = DS_WHITE_P;

-            get_whitepoint_section(c,det_mon->section.wp);

-            break;

-        case ADD_STD_TIMINGS:

-            det_mon->type = DS_STD_TIMINGS;

-            get_dst_timing_section(c,det_mon->section.std_t, ver);

-            break;

-        case COLOR_MANAGEMENT_DATA:

-            det_mon->type = DS_CMD;

-            break;

-        case CVT_3BYTE_DATA:

-            det_mon->type = DS_CVT;

-            get_cvt_timing_section(c, det_mon->section.cvt);

-            break;

-        case ADD_EST_TIMINGS:

-            det_mon->type = DS_EST_III;

-	    memcpy(det_mon->section.est_iii, c + 6, 6);

-            break;

-        case ADD_DUMMY:

-            det_mon->type = DS_DUMMY;

-            break;

-        default:

-            det_mon->type = DS_UNKOWN;

-            break;

-        }

-	if (c[3] <= 0x0F && memcmp(c, empty_block, sizeof(empty_block))) {

-            det_mon->type = DS_VENDOR + c[3];

-        }

-    } else {

-        det_mon->type = DT;

-        get_detailed_timing_section(c, &det_mon->section.d_timings);

-    }

-}

-

-static void

-get_dt_md_section(Uchar *c, struct edid_version *ver,

-		  struct detailed_monitor_section *det_mon)

-{

-    int i;

-

-    for (i=0; i < DET_TIMINGS; i++) {

-        fetch_detailed_block(c, ver, det_mon + i);

-        NEXT_DT_MD_SECTION;

-    }

-}

-

-static void

-copy_string(Uchar *c, Uchar *s)

-{

-  int i;

-  c = c + 5;

-  for (i = 0; (i < 13 && *c != 0x0A); i++) 

-    *(s++) = *(c++);

-  *s = 0;

-  while (i-- && (*--s == 0x20)) *s = 0;

-}

-

-static void

-get_dst_timing_section(Uchar *c, struct std_timings *t,

-		       struct edid_version *v)

-{

-  int j;

-    c = c + 5;

-    for (j = 0; j < 5; j++) {

-	t[j].hsize = HSIZE1;

-	VSIZE1(t[j].vsize);

-	t[j].refresh = REFRESH_R;

-	t[j].id = STD_TIMING_ID;

-	NEXT_STD_TIMING;

-    }

-}

-

-static void

-get_monitor_ranges(Uchar *c, struct monitor_ranges *r)

-{

-    r->min_v = MIN_V;

-    r->max_v = MAX_V;

-    r->min_h = MIN_H;

-    r->max_h = MAX_H;

-    r->max_clock = 0;

-    if(MAX_CLOCK != 0xff) /* is specified? */

-	r->max_clock = MAX_CLOCK * 10 + 5;

-    if (HAVE_2ND_GTF) {

-	r->gtf_2nd_f = F_2ND_GTF;

-	r->gtf_2nd_c = C_2ND_GTF;

-	r->gtf_2nd_m = M_2ND_GTF;

-	r->gtf_2nd_k = K_2ND_GTF;

-	r->gtf_2nd_j = J_2ND_GTF;

-    } else {

-	r->gtf_2nd_f = 0;

-    }

-    if (HAVE_CVT) {

-	r->max_clock_khz = MAX_CLOCK_KHZ;

-	r->max_clock = r->max_clock_khz / 1000;

-	r->maxwidth = MAXWIDTH;

-	r->supported_aspect = SUPPORTED_ASPECT;

-	r->preferred_aspect = PREFERRED_ASPECT;

-	r->supported_blanking = SUPPORTED_BLANKING;

-	r->supported_scaling = SUPPORTED_SCALING;

-	r->preferred_refresh = PREFERRED_REFRESH;

-    } else {

-	r->max_clock_khz = 0;

-    }

-}

-

-static void

-get_whitepoint_section(Uchar *c, struct whitePoints *wp)

-{

-    wp[0].white_x = WHITEX1;

-    wp[0].white_y = WHITEY1;

-    wp[1].white_x = WHITEX2;

-    wp[1].white_y = WHITEY2;

-    wp[0].index  = WHITE_INDEX1;

-    wp[1].index  = WHITE_INDEX2;

-    wp[0].white_gamma  = WHITE_GAMMA1;

-    wp[1].white_gamma  = WHITE_GAMMA2;

-}

-

-static void

-get_detailed_timing_section(Uchar *c, struct detailed_timings *r)

-{

-  r->clock = PIXEL_CLOCK;

-  r->h_active = H_ACTIVE;

-  r->h_blanking = H_BLANK;

-  r->v_active = V_ACTIVE;

-  r->v_blanking = V_BLANK;

-  r->h_sync_off = H_SYNC_OFF;

-  r->h_sync_width = H_SYNC_WIDTH;

-  r->v_sync_off = V_SYNC_OFF;

-  r->v_sync_width = V_SYNC_WIDTH;

-  r->h_size = H_SIZE;

-  r->v_size = V_SIZE;

-  r->h_border = H_BORDER;

-  r->v_border = V_BORDER;

-  r->interlaced = INTERLACED;

-  r->stereo = STEREO;

-  r->stereo_1 = STEREO1;

-  r->sync = SYNC_T;

-  r->misc = MISC;

-}

-

-#define MAX_EDID_MINOR 4

-

-static Bool

-validate_version(int scrnIndex, struct edid_version *r)

-{

-    if (r->version != 1) {

-	xf86DrvMsg(scrnIndex, X_ERROR, "Unknown EDID version %d\n",

-		   r->version);

-	return FALSE;

-    }

-

-    if (r->revision > MAX_EDID_MINOR)

-	xf86DrvMsg(scrnIndex, X_WARNING,

-		   "Assuming version 1.%d is compatible with 1.%d\n",

-		   r->revision, MAX_EDID_MINOR);

-

-    return TRUE;

-}

-

-/*

- * Returns true if HDMI, false if definitely not or unknown.

- */

-Bool

-xf86MonitorIsHDMI(xf86MonPtr mon)

-{

-    int i = 0, version, offset;

-    char *edid = NULL;

-

-    if (!mon)

-       return FALSE;

-

-    if (!(mon->flags & EDID_COMPLETE_RAWDATA))

-       return FALSE;

-

-    if (!mon->no_sections)

-       return FALSE;

-

-    edid = (char *)mon->rawData;

-    if (!edid)

-       return FALSE;

-

-    /* find the CEA extension block */

-    for (i = 1; i <= mon->no_sections; i++)

-       if (edid[i * 128] == 0x02)

-           break;

-    if (i == mon->no_sections + 1)

-       return FALSE;

-    edid += (i * 128);

-

-    version = edid[1];

-    offset = edid[2];

-    if (version < 3 || offset < 4)

-       return FALSE;

-

-    /* walk the cea data blocks */

-    for (i = 4; i < offset; i += (edid[i] & 0x1f) + 1) {

-       char *x = edid + i;

-

-       /* find a vendor specific block */

-       if ((x[0] & 0xe0) >> 5 == 0x03) {

-           int oui = (x[3] << 16) + (x[2] << 8) + x[1];

-

-           /* find the HDMI vendor OUI */

-           if (oui == 0x000c03)

-               return TRUE;

-       }

-    }

-

-    /* guess it's not HDMI after all */

-    return FALSE;

-}

+/*
+ * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>
+ * Copyright 2007 Red Hat, Inc.
+ *
+ * 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.
+ *
+ * interpret_edid.c: interpret a primary EDID block
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#define _PARSE_EDID_
+#include "xf86DDC.h"
+#include <string.h>
+
+static void get_vendor_section(Uchar *, struct vendor *);
+static void get_version_section(Uchar *, struct edid_version *);
+static void get_display_section(Uchar *, struct disp_features *,
+                                struct edid_version *);
+static void get_established_timing_section(Uchar *,
+                                           struct established_timings *);
+static void get_std_timing_section(Uchar *, struct std_timings *,
+                                   struct edid_version *);
+static void fetch_detailed_block(Uchar * c, struct edid_version *ver,
+                                 struct detailed_monitor_section *det_mon);
+static void get_dt_md_section(Uchar *, struct edid_version *,
+                              struct detailed_monitor_section *det_mon);
+static void copy_string(Uchar *, Uchar *);
+static void get_dst_timing_section(Uchar *, struct std_timings *,
+                                   struct edid_version *);
+static void get_monitor_ranges(Uchar *, struct monitor_ranges *);
+static void get_whitepoint_section(Uchar *, struct whitePoints *);
+static void get_detailed_timing_section(Uchar *, struct detailed_timings *);
+static Bool validate_version(int scrnIndex, struct edid_version *);
+
+static void
+find_ranges_section(struct detailed_monitor_section *det, void *ranges)
+{
+    if (det->type == DS_RANGES && det->section.ranges.max_clock)
+        *(struct monitor_ranges **) ranges = &det->section.ranges;
+}
+
+static void
+find_max_detailed_clock(struct detailed_monitor_section *det, void *ret)
+{
+    if (det->type == DT) {
+        *(int *) ret = max(*((int *) ret), det->section.d_timings.clock);
+    }
+}
+
+static void
+handle_edid_quirks(xf86MonPtr m)
+{
+    struct monitor_ranges *ranges = NULL;
+
+    /*
+     * max_clock is only encoded in EDID in tens of MHz, so occasionally we
+     * find a monitor claiming a max of 160 with a mode requiring 162, or
+     * similar.  Strictly we should refuse to round up too far, but let's
+     * see how well this works.
+     */
+
+    /* Try to find Monitor Range and max clock, then re-set range value */
+    xf86ForEachDetailedBlock(m, find_ranges_section, &ranges);
+    if (ranges && ranges->max_clock) {
+        int clock = 0;
+
+        xf86ForEachDetailedBlock(m, find_max_detailed_clock, &clock);
+        if (clock && (ranges->max_clock * 1e6 < clock)) {
+            xf86Msg(X_WARNING, "EDID timing clock %.2f exceeds claimed max "
+                    "%dMHz, fixing\n", clock / 1.0e6, ranges->max_clock);
+            ranges->max_clock = (clock + 999999) / 1e6;
+        }
+    }
+}
+
+struct det_hv_parameter {
+    int real_hsize;
+    int real_vsize;
+    float target_aspect;
+};
+
+static void
+handle_detailed_hvsize(struct detailed_monitor_section *det_mon, void *data)
+{
+    struct det_hv_parameter *p = (struct det_hv_parameter *) data;
+    float timing_aspect;
+
+    if (det_mon->type == DT) {
+        struct detailed_timings *timing;
+
+        timing = &det_mon->section.d_timings;
+
+        if (!timing->v_size)
+            return;
+
+        timing_aspect = (float) timing->h_size / timing->v_size;
+        if (fabs(1 - (timing_aspect / p->target_aspect)) < 0.05) {
+            p->real_hsize = max(p->real_hsize, timing->h_size);
+            p->real_vsize = max(p->real_vsize, timing->v_size);
+        }
+    }
+}
+
+static void
+encode_aspect_ratio(xf86MonPtr m)
+{
+    /*
+     * some monitors encode the aspect ratio instead of the physical size.
+     * try to find the largest detailed timing that matches that aspect
+     * ratio and use that to fill in the feature section.
+     */
+    if ((m->features.hsize == 16 && m->features.vsize == 9) ||
+        (m->features.hsize == 16 && m->features.vsize == 10) ||
+        (m->features.hsize == 4 && m->features.vsize == 3) ||
+        (m->features.hsize == 5 && m->features.vsize == 4)) {
+
+        struct det_hv_parameter p;
+
+        p.real_hsize = 0;
+        p.real_vsize = 0;
+        p.target_aspect = (float) m->features.hsize / m->features.vsize;
+
+        xf86ForEachDetailedBlock(m, handle_detailed_hvsize, &p);
+
+        if (!p.real_hsize || !p.real_vsize) {
+            m->features.hsize = m->features.vsize = 0;
+        }
+        else if ((m->features.hsize * 10 == p.real_hsize) &&
+                 (m->features.vsize * 10 == p.real_vsize)) {
+            /* exact match is just unlikely, should do a better check though */
+            m->features.hsize = m->features.vsize = 0;
+        }
+        else {
+            /* convert mm to cm */
+            m->features.hsize = (p.real_hsize + 5) / 10;
+            m->features.vsize = (p.real_vsize + 5) / 10;
+        }
+
+        xf86Msg(X_INFO, "Quirked EDID physical size to %dx%d cm\n",
+                m->features.hsize, m->features.vsize);
+    }
+}
+
+xf86MonPtr
+xf86InterpretEDID(int scrnIndex, Uchar * block)
+{
+    xf86MonPtr m;
+
+    if (!block)
+        return NULL;
+    if (!(m = xnfcalloc(sizeof(xf86Monitor), 1)))
+        return NULL;
+    m->scrnIndex = scrnIndex;
+    m->rawData = block;
+
+    get_vendor_section(SECTION(VENDOR_SECTION, block), &m->vendor);
+    get_version_section(SECTION(VERSION_SECTION, block), &m->ver);
+    if (!validate_version(scrnIndex, &m->ver))
+        goto error;
+    get_display_section(SECTION(DISPLAY_SECTION, block), &m->features, &m->ver);
+    get_established_timing_section(SECTION(ESTABLISHED_TIMING_SECTION, block),
+                                   &m->timings1);
+    get_std_timing_section(SECTION(STD_TIMING_SECTION, block), m->timings2,
+                           &m->ver);
+    get_dt_md_section(SECTION(DET_TIMING_SECTION, block), &m->ver, m->det_mon);
+    m->no_sections = (int) *(char *) SECTION(NO_EDID, block);
+
+    handle_edid_quirks(m);
+    encode_aspect_ratio(m);
+
+    return m;
+
+ error:
+    free(m);
+    return NULL;
+}
+
+static int
+get_cea_detail_timing(Uchar * blk, xf86MonPtr mon,
+                      struct detailed_monitor_section *det_mon)
+{
+    int dt_num;
+    int dt_offset = ((struct cea_ext_body *) blk)->dt_offset;
+
+    dt_num = 0;
+
+    if (dt_offset < CEA_EXT_MIN_DATA_OFFSET)
+        return dt_num;
+
+    for (; dt_offset < (CEA_EXT_MAX_DATA_OFFSET - DET_TIMING_INFO_LEN) &&
+         dt_num < CEA_EXT_DET_TIMING_NUM; _NEXT_DT_MD_SECTION(dt_offset)) {
+
+        fetch_detailed_block(blk + dt_offset, &mon->ver, det_mon + dt_num);
+        dt_num = dt_num + 1;
+    }
+
+    return dt_num;
+}
+
+static void
+handle_cea_detail_block(Uchar * ext, xf86MonPtr mon,
+                        handle_detailed_fn fn, void *data)
+{
+    int i;
+    struct detailed_monitor_section det_mon[CEA_EXT_DET_TIMING_NUM];
+    int det_mon_num;
+
+    det_mon_num = get_cea_detail_timing(ext, mon, det_mon);
+
+    for (i = 0; i < det_mon_num; i++)
+        fn(det_mon + i, data);
+}
+
+void
+xf86ForEachDetailedBlock(xf86MonPtr mon, handle_detailed_fn fn, void *data)
+{
+    int i;
+    Uchar *ext;
+
+    if (mon == NULL)
+        return;
+
+    for (i = 0; i < DET_TIMINGS; i++)
+        fn(mon->det_mon + i, data);
+
+    for (i = 0; i < mon->no_sections; i++) {
+        ext = mon->rawData + EDID1_LEN * (i + 1);
+        switch (ext[EXT_TAG]) {
+        case CEA_EXT:
+            handle_cea_detail_block(ext, mon, fn, data);
+            break;
+        case VTB_EXT:
+        case DI_EXT:
+        case LS_EXT:
+        case MI_EXT:
+            break;
+        }
+    }
+}
+
+static struct cea_data_block *
+extract_cea_data_block(Uchar * ext, int data_type)
+{
+    struct cea_ext_body *cea;
+    struct cea_data_block *data_collection;
+    struct cea_data_block *data_end;
+
+    cea = (struct cea_ext_body *) ext;
+
+    if (cea->dt_offset <= CEA_EXT_MIN_DATA_OFFSET)
+        return NULL;
+
+    data_collection = &cea->data_collection;
+    data_end = (struct cea_data_block *) (cea->dt_offset + ext);
+
+    for (; data_collection < data_end;) {
+
+        if (data_type == data_collection->tag) {
+            return data_collection;
+        }
+        data_collection = (void *) ((unsigned char *) data_collection +
+                                    data_collection->len + 1);
+    }
+
+    return NULL;
+}
+
+static void
+handle_cea_video_block(Uchar * ext, handle_video_fn fn, void *data)
+{
+    struct cea_video_block *video;
+    struct cea_video_block *video_end;
+    struct cea_data_block *data_collection;
+
+    data_collection = extract_cea_data_block(ext, CEA_VIDEO_BLK);
+    if (data_collection == NULL)
+        return;
+
+    video = &data_collection->u.video;
+    video_end = (struct cea_video_block *)
+        ((Uchar *) video + data_collection->len);
+
+    for (; video < video_end; video = video + 1) {
+        fn(video, data);
+    }
+}
+
+void
+xf86ForEachVideoBlock(xf86MonPtr mon, handle_video_fn fn, void *data)
+{
+    int i;
+    Uchar *ext;
+
+    if (mon == NULL)
+        return;
+
+    for (i = 0; i < mon->no_sections; i++) {
+        ext = mon->rawData + EDID1_LEN * (i + 1);
+        switch (ext[EXT_TAG]) {
+        case CEA_EXT:
+            handle_cea_video_block(ext, fn, data);
+            break;
+        case VTB_EXT:
+        case DI_EXT:
+        case LS_EXT:
+        case MI_EXT:
+            break;
+        }
+    }
+}
+
+xf86MonPtr
+xf86InterpretEEDID(int scrnIndex, Uchar * block)
+{
+    xf86MonPtr m;
+
+    m = xf86InterpretEDID(scrnIndex, block);
+    if (!m)
+        return NULL;
+
+    /* extension parse */
+
+    return m;
+}
+
+static void
+get_vendor_section(Uchar * c, struct vendor *r)
+{
+    r->name[0] = L1;
+    r->name[1] = L2;
+    r->name[2] = L3;
+    r->name[3] = '\0';
+
+    r->prod_id = PROD_ID;
+    r->serial = SERIAL_NO;
+    r->week = WEEK;
+    r->year = YEAR;
+}
+
+static void
+get_version_section(Uchar * c, struct edid_version *r)
+{
+    r->version = VERSION;
+    r->revision = REVISION;
+}
+
+static void
+get_display_section(Uchar * c, struct disp_features *r, struct edid_version *v)
+{
+    r->input_type = INPUT_TYPE;
+    if (!DIGITAL(r->input_type)) {
+        r->input_voltage = INPUT_VOLTAGE;
+        r->input_setup = SETUP;
+        r->input_sync = SYNC;
+    }
+    else if (v->revision == 2 || v->revision == 3) {
+        r->input_dfp = DFP;
+    }
+    else if (v->revision >= 4) {
+        r->input_bpc = BPC;
+        r->input_interface = DIGITAL_INTERFACE;
+    }
+    r->hsize = HSIZE_MAX;
+    r->vsize = VSIZE_MAX;
+    r->gamma = GAMMA;
+    r->dpms = DPMS;
+    r->display_type = DISPLAY_TYPE;
+    r->msc = MSC;
+    r->redx = REDX;
+    r->redy = REDY;
+    r->greenx = GREENX;
+    r->greeny = GREENY;
+    r->bluex = BLUEX;
+    r->bluey = BLUEY;
+    r->whitex = WHITEX;
+    r->whitey = WHITEY;
+}
+
+static void
+get_established_timing_section(Uchar * c, struct established_timings *r)
+{
+    r->t1 = T1;
+    r->t2 = T2;
+    r->t_manu = T_MANU;
+}
+
+static void
+get_cvt_timing_section(Uchar * c, struct cvt_timings *r)
+{
+    int i;
+
+    for (i = 0; i < 4; i++) {
+        if (c[0] && c[1] && c[2]) {
+            r[i].height = (c[0] + ((c[1] & 0xF0) << 8) + 1) * 2;
+            switch (c[1] & 0xc0) {
+            case 0x00:
+                r[i].width = r[i].height * 4 / 3;
+                break;
+            case 0x40:
+                r[i].width = r[i].height * 16 / 9;
+                break;
+            case 0x80:
+                r[i].width = r[i].height * 16 / 10;
+                break;
+            case 0xc0:
+                r[i].width = r[i].height * 15 / 9;
+                break;
+            }
+            switch (c[2] & 0x60) {
+            case 0x00:
+                r[i].rate = 50;
+                break;
+            case 0x20:
+                r[i].rate = 60;
+                break;
+            case 0x40:
+                r[i].rate = 75;
+                break;
+            case 0x60:
+                r[i].rate = 85;
+                break;
+            }
+            r[i].rates = c[2] & 0x1f;
+        }
+        else {
+            return;
+        }
+        c += 3;
+    }
+}
+
+static void
+get_std_timing_section(Uchar * c, struct std_timings *r, struct edid_version *v)
+{
+    int i;
+
+    for (i = 0; i < STD_TIMINGS; i++) {
+        if (VALID_TIMING) {
+            r[i].hsize = HSIZE1;
+            VSIZE1(r[i].vsize);
+            r[i].refresh = REFRESH_R;
+            r[i].id = STD_TIMING_ID;
+        }
+        else {
+            r[i].hsize = r[i].vsize = r[i].refresh = r[i].id = 0;
+        }
+        NEXT_STD_TIMING;
+    }
+}
+
+static const unsigned char empty_block[18];
+
+static void
+fetch_detailed_block(Uchar * c, struct edid_version *ver,
+                     struct detailed_monitor_section *det_mon)
+{
+    if (ver->version == 1 && ver->revision >= 1 && IS_MONITOR_DESC) {
+        switch (MONITOR_DESC_TYPE) {
+        case SERIAL_NUMBER:
+            det_mon->type = DS_SERIAL;
+            copy_string(c, det_mon->section.serial);
+            break;
+        case ASCII_STR:
+            det_mon->type = DS_ASCII_STR;
+            copy_string(c, det_mon->section.ascii_data);
+            break;
+        case MONITOR_RANGES:
+            det_mon->type = DS_RANGES;
+            get_monitor_ranges(c, &det_mon->section.ranges);
+            break;
+        case MONITOR_NAME:
+            det_mon->type = DS_NAME;
+            copy_string(c, det_mon->section.name);
+            break;
+        case ADD_COLOR_POINT:
+            det_mon->type = DS_WHITE_P;
+            get_whitepoint_section(c, det_mon->section.wp);
+            break;
+        case ADD_STD_TIMINGS:
+            det_mon->type = DS_STD_TIMINGS;
+            get_dst_timing_section(c, det_mon->section.std_t, ver);
+            break;
+        case COLOR_MANAGEMENT_DATA:
+            det_mon->type = DS_CMD;
+            break;
+        case CVT_3BYTE_DATA:
+            det_mon->type = DS_CVT;
+            get_cvt_timing_section(c, det_mon->section.cvt);
+            break;
+        case ADD_EST_TIMINGS:
+            det_mon->type = DS_EST_III;
+            memcpy(det_mon->section.est_iii, c + 6, 6);
+            break;
+        case ADD_DUMMY:
+            det_mon->type = DS_DUMMY;
+            break;
+        default:
+            det_mon->type = DS_UNKOWN;
+            break;
+        }
+        if (c[3] <= 0x0F && memcmp(c, empty_block, sizeof(empty_block))) {
+            det_mon->type = DS_VENDOR + c[3];
+        }
+    }
+    else {
+        det_mon->type = DT;
+        get_detailed_timing_section(c, &det_mon->section.d_timings);
+    }
+}
+
+static void
+get_dt_md_section(Uchar * c, struct edid_version *ver,
+                  struct detailed_monitor_section *det_mon)
+{
+    int i;
+
+    for (i = 0; i < DET_TIMINGS; i++) {
+        fetch_detailed_block(c, ver, det_mon + i);
+        NEXT_DT_MD_SECTION;
+    }
+}
+
+static void
+copy_string(Uchar * c, Uchar * s)
+{
+    int i;
+
+    c = c + 5;
+    for (i = 0; (i < 13 && *c != 0x0A); i++)
+        *(s++) = *(c++);
+    *s = 0;
+    while (i-- && (*--s == 0x20))
+        *s = 0;
+}
+
+static void
+get_dst_timing_section(Uchar * c, struct std_timings *t, struct edid_version *v)
+{
+    int j;
+
+    c = c + 5;
+    for (j = 0; j < 5; j++) {
+        t[j].hsize = HSIZE1;
+        VSIZE1(t[j].vsize);
+        t[j].refresh = REFRESH_R;
+        t[j].id = STD_TIMING_ID;
+        NEXT_STD_TIMING;
+    }
+}
+
+static void
+get_monitor_ranges(Uchar * c, struct monitor_ranges *r)
+{
+    r->min_v = MIN_V;
+    r->max_v = MAX_V;
+    r->min_h = MIN_H;
+    r->max_h = MAX_H;
+    r->max_clock = 0;
+    if (MAX_CLOCK != 0xff)      /* is specified? */
+        r->max_clock = MAX_CLOCK * 10 + 5;
+    if (HAVE_2ND_GTF) {
+        r->gtf_2nd_f = F_2ND_GTF;
+        r->gtf_2nd_c = C_2ND_GTF;
+        r->gtf_2nd_m = M_2ND_GTF;
+        r->gtf_2nd_k = K_2ND_GTF;
+        r->gtf_2nd_j = J_2ND_GTF;
+    }
+    else {
+        r->gtf_2nd_f = 0;
+    }
+    if (HAVE_CVT) {
+        r->max_clock_khz = MAX_CLOCK_KHZ;
+        r->max_clock = r->max_clock_khz / 1000;
+        r->maxwidth = MAXWIDTH;
+        r->supported_aspect = SUPPORTED_ASPECT;
+        r->preferred_aspect = PREFERRED_ASPECT;
+        r->supported_blanking = SUPPORTED_BLANKING;
+        r->supported_scaling = SUPPORTED_SCALING;
+        r->preferred_refresh = PREFERRED_REFRESH;
+    }
+    else {
+        r->max_clock_khz = 0;
+    }
+}
+
+static void
+get_whitepoint_section(Uchar * c, struct whitePoints *wp)
+{
+    wp[0].white_x = WHITEX1;
+    wp[0].white_y = WHITEY1;
+    wp[1].white_x = WHITEX2;
+    wp[1].white_y = WHITEY2;
+    wp[0].index = WHITE_INDEX1;
+    wp[1].index = WHITE_INDEX2;
+    wp[0].white_gamma = WHITE_GAMMA1;
+    wp[1].white_gamma = WHITE_GAMMA2;
+}
+
+static void
+get_detailed_timing_section(Uchar * c, struct detailed_timings *r)
+{
+    r->clock = PIXEL_CLOCK;
+    r->h_active = H_ACTIVE;
+    r->h_blanking = H_BLANK;
+    r->v_active = V_ACTIVE;
+    r->v_blanking = V_BLANK;
+    r->h_sync_off = H_SYNC_OFF;
+    r->h_sync_width = H_SYNC_WIDTH;
+    r->v_sync_off = V_SYNC_OFF;
+    r->v_sync_width = V_SYNC_WIDTH;
+    r->h_size = H_SIZE;
+    r->v_size = V_SIZE;
+    r->h_border = H_BORDER;
+    r->v_border = V_BORDER;
+    r->interlaced = INTERLACED;
+    r->stereo = STEREO;
+    r->stereo_1 = STEREO1;
+    r->sync = SYNC_T;
+    r->misc = MISC;
+}
+
+#define MAX_EDID_MINOR 4
+
+static Bool
+validate_version(int scrnIndex, struct edid_version *r)
+{
+    if (r->version != 1) {
+        xf86DrvMsg(scrnIndex, X_ERROR, "Unknown EDID version %d\n", r->version);
+        return FALSE;
+    }
+
+    if (r->revision > MAX_EDID_MINOR)
+        xf86DrvMsg(scrnIndex, X_WARNING,
+                   "Assuming version 1.%d is compatible with 1.%d\n",
+                   r->revision, MAX_EDID_MINOR);
+
+    return TRUE;
+}
+
+/*
+ * Returns true if HDMI, false if definitely not or unknown.
+ */
+Bool
+xf86MonitorIsHDMI(xf86MonPtr mon)
+{
+    int i = 0, version, offset;
+    char *edid = NULL;
+
+    if (!mon)
+        return FALSE;
+
+    if (!(mon->flags & EDID_COMPLETE_RAWDATA))
+        return FALSE;
+
+    if (!mon->no_sections)
+        return FALSE;
+
+    edid = (char *) mon->rawData;
+    if (!edid)
+        return FALSE;
+
+    /* find the CEA extension block */
+    for (i = 1; i <= mon->no_sections; i++)
+        if (edid[i * 128] == 0x02)
+            break;
+    if (i == mon->no_sections + 1)
+        return FALSE;
+    edid += (i * 128);
+
+    version = edid[1];
+    offset = edid[2];
+    if (version < 3 || offset < 4)
+        return FALSE;
+
+    /* walk the cea data blocks */
+    for (i = 4; i < offset; i += (edid[i] & 0x1f) + 1) {
+        char *x = edid + i;
+
+        /* find a vendor specific block */
+        if ((x[0] & 0xe0) >> 5 == 0x03) {
+            int oui = (x[3] << 16) + (x[2] << 8) + x[1];
+
+            /* find the HDMI vendor OUI */
+            if (oui == 0x000c03)
+                return TRUE;
+        }
+    }
+
+    /* guess it's not HDMI after all */
+    return FALSE;
+}
diff --git a/xorg-server/hw/xfree86/ddc/print_edid.c b/xorg-server/hw/xfree86/ddc/print_edid.c
index 1faae1e33..4f983f934 100644
--- a/xorg-server/hw/xfree86/ddc/print_edid.c
+++ b/xorg-server/hw/xfree86/ddc/print_edid.c
@@ -36,24 +36,24 @@
 #include "xf86_OSproc.h"
 #include "xf86DDC.h"
 #include "edid.h"
-  
+
 #define EDID_WIDTH	16
-  
+
 static void
 print_vendor(int scrnIndex, struct vendor *c)
 {
     xf86DrvMsg(scrnIndex, X_INFO, "Manufacturer: %s  Model: %x  Serial#: %u\n",
-	(char *)&c->name, c->prod_id, c->serial);
+               (char *) &c->name, c->prod_id, c->serial);
     xf86DrvMsg(scrnIndex, X_INFO, "Year: %u  Week: %u\n", c->year, c->week);
 }
 
 static void
 print_version(int scrnIndex, struct edid_version *c)
 {
-    xf86DrvMsg(scrnIndex,X_INFO,"EDID Version: %u.%u\n",c->version,
-	       c->revision);  
+    xf86DrvMsg(scrnIndex, X_INFO, "EDID Version: %u.%u\n", c->version,
+               c->revision);
 }
-  
+
 static const char *digital_interfaces[] = {
     "undefined",
     "DVI",
@@ -64,212 +64,241 @@ static const char *digital_interfaces[] = {
     "unknown"
 };
 
-static void 
+static void
 print_input_features(int scrnIndex, struct disp_features *c,
-		     struct edid_version *v)
+                     struct edid_version *v)
 {
     if (DIGITAL(c->input_type)) {
-	xf86DrvMsg(scrnIndex, X_INFO, "Digital Display Input\n");
-	if (v->revision == 2 || v->revision == 3) {
-	    if (DFP1(c->input_dfp))
-		xf86DrvMsg(scrnIndex, X_INFO, "DFP 1.x compatible TMDS\n");
-	} else if (v->revision >= 4) {
-	    int interface = c->input_interface;
-	    int bpc = c->input_bpc;
-	    if (interface > 6)
-		interface = 6; /* unknown */
-	    if (bpc == 0 || bpc == 7)
-		xf86DrvMsg(scrnIndex, X_INFO, "Undefined color depth\n");
-	    else
-		xf86DrvMsg(scrnIndex, X_INFO, "%d bits per channel\n",
-			   bpc * 2 + 4);
-	    xf86DrvMsg(scrnIndex, X_INFO, "Digital interface is %s\n",
-		       digital_interfaces[interface]);
-	}
-    } else {
-	xf86DrvMsg(scrnIndex,X_INFO,"Analog Display Input,  ");
-	xf86ErrorF("Input Voltage Level: ");
-	switch (c->input_voltage){
-	case V070:
-	    xf86ErrorF("0.700/0.300 V\n");
-	    break;
-	case V071:
-	    xf86ErrorF("0.714/0.286 V\n");
-	    break;
-	case V100:
-	    xf86ErrorF("1.000/0.400 V\n");
-	    break;
-	case V007:
+        xf86DrvMsg(scrnIndex, X_INFO, "Digital Display Input\n");
+        if (v->revision == 2 || v->revision == 3) {
+            if (DFP1(c->input_dfp))
+                xf86DrvMsg(scrnIndex, X_INFO, "DFP 1.x compatible TMDS\n");
+        }
+        else if (v->revision >= 4) {
+            int interface = c->input_interface;
+            int bpc = c->input_bpc;
+
+            if (interface > 6)
+                interface = 6;  /* unknown */
+            if (bpc == 0 || bpc == 7)
+                xf86DrvMsg(scrnIndex, X_INFO, "Undefined color depth\n");
+            else
+                xf86DrvMsg(scrnIndex, X_INFO, "%d bits per channel\n",
+                           bpc * 2 + 4);
+            xf86DrvMsg(scrnIndex, X_INFO, "Digital interface is %s\n",
+                       digital_interfaces[interface]);
+        }
+    }
+    else {
+        xf86DrvMsg(scrnIndex, X_INFO, "Analog Display Input,  ");
+        xf86ErrorF("Input Voltage Level: ");
+        switch (c->input_voltage) {
+        case V070:
+            xf86ErrorF("0.700/0.300 V\n");
+            break;
+        case V071:
+            xf86ErrorF("0.714/0.286 V\n");
+            break;
+        case V100:
+            xf86ErrorF("1.000/0.400 V\n");
+            break;
+        case V007:
             xf86ErrorF("0.700/0.700 V\n");
-	    break;
-	default:
-	    xf86ErrorF("undefined\n");
-	}
-	if (SIG_SETUP(c->input_setup))
-	    xf86DrvMsg(scrnIndex,X_INFO,"Signal levels configurable\n");
-	xf86DrvMsg(scrnIndex,X_INFO,"Sync:");
-	if (SEP_SYNC(c->input_sync))
-	    xf86ErrorF("  Separate");
-	if (COMP_SYNC(c->input_sync))
-	    xf86ErrorF("  Composite");
-	if (SYNC_O_GREEN(c->input_sync))
-	    xf86ErrorF("  SyncOnGreen");
-	if (SYNC_SERR(c->input_sync)) 
-	    xf86ErrorF("Serration on. "
-		       "V.Sync Pulse req. if CompSync or SyncOnGreen\n");
-	else xf86ErrorF("\n");
+            break;
+        default:
+            xf86ErrorF("undefined\n");
+        }
+        if (SIG_SETUP(c->input_setup))
+            xf86DrvMsg(scrnIndex, X_INFO, "Signal levels configurable\n");
+        xf86DrvMsg(scrnIndex, X_INFO, "Sync:");
+        if (SEP_SYNC(c->input_sync))
+            xf86ErrorF("  Separate");
+        if (COMP_SYNC(c->input_sync))
+            xf86ErrorF("  Composite");
+        if (SYNC_O_GREEN(c->input_sync))
+            xf86ErrorF("  SyncOnGreen");
+        if (SYNC_SERR(c->input_sync))
+            xf86ErrorF("Serration on. "
+                       "V.Sync Pulse req. if CompSync or SyncOnGreen\n");
+        else
+            xf86ErrorF("\n");
     }
 }
-  
-static void 
+
+static void
 print_dpms_features(int scrnIndex, struct disp_features *c,
-		    struct edid_version *v)
+                    struct edid_version *v)
 {
-     if (c->dpms) {
-	 xf86DrvMsg(scrnIndex,X_INFO,"DPMS capabilities:");
-	 if (DPMS_STANDBY(c->dpms)) xf86ErrorF(" StandBy");
-	 if (DPMS_SUSPEND(c->dpms)) xf86ErrorF(" Suspend");
-	 if (DPMS_OFF(c->dpms)) xf86ErrorF(" Off");
-     } else 
-	 xf86DrvMsg(scrnIndex,X_INFO,"No DPMS capabilities specified");
-    if (!c->input_type) { /* analog */
-	switch (c->display_type){
-	    case DISP_MONO:
-		xf86ErrorF("; Monochorome/GrayScale Display\n");
-		break;
-	    case DISP_RGB:
-		xf86ErrorF("; RGB/Color Display\n");
-		break;
-	    case DISP_MULTCOLOR:
-		xf86ErrorF("; Non RGB Multicolor Display\n");
-		break;
-	    default:
-		xf86ErrorF("\n");
-		break;
-	}
-    } else {
-	int enc = c->display_type;
-	xf86ErrorF("\n");
-	xf86DrvMsg(scrnIndex, X_INFO, "Supported color encodings: "
-		   "RGB 4:4:4 %s%s\n",
-		   enc & DISP_YCRCB444 ? "YCrCb 4:4:4 " : "",
-		   enc & DISP_YCRCB422 ? "YCrCb 4:2:2" : "");
+    if (c->dpms) {
+        xf86DrvMsg(scrnIndex, X_INFO, "DPMS capabilities:");
+        if (DPMS_STANDBY(c->dpms))
+            xf86ErrorF(" StandBy");
+        if (DPMS_SUSPEND(c->dpms))
+            xf86ErrorF(" Suspend");
+        if (DPMS_OFF(c->dpms))
+            xf86ErrorF(" Off");
+    }
+    else
+        xf86DrvMsg(scrnIndex, X_INFO, "No DPMS capabilities specified");
+    if (!c->input_type) {       /* analog */
+        switch (c->display_type) {
+        case DISP_MONO:
+            xf86ErrorF("; Monochorome/GrayScale Display\n");
+            break;
+        case DISP_RGB:
+            xf86ErrorF("; RGB/Color Display\n");
+            break;
+        case DISP_MULTCOLOR:
+            xf86ErrorF("; Non RGB Multicolor Display\n");
+            break;
+        default:
+            xf86ErrorF("\n");
+            break;
+        }
+    }
+    else {
+        int enc = c->display_type;
+
+        xf86ErrorF("\n");
+        xf86DrvMsg(scrnIndex, X_INFO, "Supported color encodings: "
+                   "RGB 4:4:4 %s%s\n",
+                   enc & DISP_YCRCB444 ? "YCrCb 4:4:4 " : "",
+                   enc & DISP_YCRCB422 ? "YCrCb 4:2:2" : "");
     }
 
     if (STD_COLOR_SPACE(c->msc))
-	xf86DrvMsg(scrnIndex,X_INFO,
-		   "Default color space is primary color space\n"); 
+        xf86DrvMsg(scrnIndex, X_INFO,
+                   "Default color space is primary color space\n");
 
     if (PREFERRED_TIMING_MODE(c->msc) || v->revision >= 4) {
-	xf86DrvMsg(scrnIndex, X_INFO,
-		   "First detailed timing is preferred mode\n"); 
-	if (v->revision >= 4)
-	    xf86DrvMsg(scrnIndex, X_INFO,
-		"Preferred mode is native pixel format and refresh rate\n");
-    } else if (v->revision == 3) {
-	xf86DrvMsg(scrnIndex,X_INFO,
-		   "First detailed timing not preferred "
-		   "mode in violation of standard!\n");
+        xf86DrvMsg(scrnIndex, X_INFO,
+                   "First detailed timing is preferred mode\n");
+        if (v->revision >= 4)
+            xf86DrvMsg(scrnIndex, X_INFO,
+                       "Preferred mode is native pixel format and refresh rate\n");
+    }
+    else if (v->revision == 3) {
+        xf86DrvMsg(scrnIndex, X_INFO,
+                   "First detailed timing not preferred "
+                   "mode in violation of standard!\n");
     }
 
     if (v->revision >= 4) {
-	if (GFT_SUPPORTED(c->msc)) {
-	    xf86DrvMsg(scrnIndex, X_INFO, "Display is continuous-frequency\n");
-	}
-    } else {
-	if (GFT_SUPPORTED(c->msc))
-	    xf86DrvMsg(scrnIndex, X_INFO, "GTF timings supported\n"); 
+        if (GFT_SUPPORTED(c->msc)) {
+            xf86DrvMsg(scrnIndex, X_INFO, "Display is continuous-frequency\n");
+        }
+    }
+    else {
+        if (GFT_SUPPORTED(c->msc))
+            xf86DrvMsg(scrnIndex, X_INFO, "GTF timings supported\n");
     }
 }
-  
-static void 
+
+static void
 print_whitepoint(int scrnIndex, struct disp_features *disp)
 {
-    xf86DrvMsg(scrnIndex,X_INFO,"redX: %.3f redY: %.3f   ",
-	       disp->redx,disp->redy);
-    xf86ErrorF("greenX: %.3f greenY: %.3f\n",
-	       disp->greenx,disp->greeny);
-    xf86DrvMsg(scrnIndex,X_INFO,"blueX: %.3f blueY: %.3f   ",
-	       disp->bluex,disp->bluey);
-    xf86ErrorF("whiteX: %.3f whiteY: %.3f\n",
-	       disp->whitex,disp->whitey);
+    xf86DrvMsg(scrnIndex, X_INFO, "redX: %.3f redY: %.3f   ",
+               disp->redx, disp->redy);
+    xf86ErrorF("greenX: %.3f greenY: %.3f\n", disp->greenx, disp->greeny);
+    xf86DrvMsg(scrnIndex, X_INFO, "blueX: %.3f blueY: %.3f   ",
+               disp->bluex, disp->bluey);
+    xf86ErrorF("whiteX: %.3f whiteY: %.3f\n", disp->whitex, disp->whitey);
 }
 
 static void
-print_display(int scrnIndex, struct disp_features *disp,
-	      struct edid_version *v)
+print_display(int scrnIndex, struct disp_features *disp, struct edid_version *v)
 {
     print_input_features(scrnIndex, disp, v);
     if (disp->hsize && disp->vsize) {
-	xf86DrvMsg(scrnIndex, X_INFO, "Max Image Size [cm]: ");
-	xf86ErrorF("horiz.: %i  ", disp->hsize);
-	xf86ErrorF("vert.: %i\n", disp->vsize);
-    } else if (v->revision >= 4 && (disp->hsize || disp->vsize)) {
-	if (disp->hsize)
-	    xf86DrvMsg(scrnIndex, X_INFO, "Aspect ratio: %.2f (landscape)\n",
-		       (disp->hsize + 99) / 100.0);
-	if (disp->vsize)
-	    xf86DrvMsg(scrnIndex, X_INFO, "Aspect ratio: %.2f (portrait)\n",
-		       100.0 / (float)(disp->vsize + 99));
-
-    } else {
-	xf86DrvMsg(scrnIndex, X_INFO, "Indeterminate output size\n");
+        xf86DrvMsg(scrnIndex, X_INFO, "Max Image Size [cm]: ");
+        xf86ErrorF("horiz.: %i  ", disp->hsize);
+        xf86ErrorF("vert.: %i\n", disp->vsize);
+    }
+    else if (v->revision >= 4 && (disp->hsize || disp->vsize)) {
+        if (disp->hsize)
+            xf86DrvMsg(scrnIndex, X_INFO, "Aspect ratio: %.2f (landscape)\n",
+                       (disp->hsize + 99) / 100.0);
+        if (disp->vsize)
+            xf86DrvMsg(scrnIndex, X_INFO, "Aspect ratio: %.2f (portrait)\n",
+                       100.0 / (float) (disp->vsize + 99));
+
+    }
+    else {
+        xf86DrvMsg(scrnIndex, X_INFO, "Indeterminate output size\n");
     }
 
     if (!disp->gamma && v->revision >= 1.4)
-	xf86DrvMsg(scrnIndex, X_INFO, "Gamma defined in extension block\n");
+        xf86DrvMsg(scrnIndex, X_INFO, "Gamma defined in extension block\n");
     else
-	xf86DrvMsg(scrnIndex, X_INFO, "Gamma: %.2f\n", disp->gamma);
+        xf86DrvMsg(scrnIndex, X_INFO, "Gamma: %.2f\n", disp->gamma);
 
     print_dpms_features(scrnIndex, disp, v);
     print_whitepoint(scrnIndex, disp);
 }
 
-static void 
+static void
 print_established_timings(int scrnIndex, struct established_timings *t)
 {
     unsigned char c;
 
     if (t->t1 || t->t2 || t->t_manu)
-	xf86DrvMsg(scrnIndex,X_INFO,"Supported established timings:\n");
-    c=t->t1;
-    if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"720x400@70Hz\n");
-    if (c&0x40) xf86DrvMsg(scrnIndex,X_INFO,"720x400@88Hz\n");
-    if (c&0x20) xf86DrvMsg(scrnIndex,X_INFO,"640x480@60Hz\n");
-    if (c&0x10) xf86DrvMsg(scrnIndex,X_INFO,"640x480@67Hz\n");
-    if (c&0x08) xf86DrvMsg(scrnIndex,X_INFO,"640x480@72Hz\n");
-    if (c&0x04) xf86DrvMsg(scrnIndex,X_INFO,"640x480@75Hz\n");
-    if (c&0x02) xf86DrvMsg(scrnIndex,X_INFO,"800x600@56Hz\n");
-    if (c&0x01) xf86DrvMsg(scrnIndex,X_INFO,"800x600@60Hz\n");
-    c=t->t2;
-    if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"800x600@72Hz\n");
-    if (c&0x40) xf86DrvMsg(scrnIndex,X_INFO,"800x600@75Hz\n");
-    if (c&0x20) xf86DrvMsg(scrnIndex,X_INFO,"832x624@75Hz\n");
-    if (c&0x10) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@87Hz (interlaced)\n");
-    if (c&0x08) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@60Hz\n");
-    if (c&0x04) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@70Hz\n");
-    if (c&0x02) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@75Hz\n");
-    if (c&0x01) xf86DrvMsg(scrnIndex,X_INFO,"1280x1024@75Hz\n");
-    c=t->t_manu;
-    if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"1152x864@75Hz\n");
-    xf86DrvMsg(scrnIndex,X_INFO,"Manufacturer's mask: %X\n",c&0x7F);
+        xf86DrvMsg(scrnIndex, X_INFO, "Supported established timings:\n");
+    c = t->t1;
+    if (c & 0x80)
+        xf86DrvMsg(scrnIndex, X_INFO, "720x400@70Hz\n");
+    if (c & 0x40)
+        xf86DrvMsg(scrnIndex, X_INFO, "720x400@88Hz\n");
+    if (c & 0x20)
+        xf86DrvMsg(scrnIndex, X_INFO, "640x480@60Hz\n");
+    if (c & 0x10)
+        xf86DrvMsg(scrnIndex, X_INFO, "640x480@67Hz\n");
+    if (c & 0x08)
+        xf86DrvMsg(scrnIndex, X_INFO, "640x480@72Hz\n");
+    if (c & 0x04)
+        xf86DrvMsg(scrnIndex, X_INFO, "640x480@75Hz\n");
+    if (c & 0x02)
+        xf86DrvMsg(scrnIndex, X_INFO, "800x600@56Hz\n");
+    if (c & 0x01)
+        xf86DrvMsg(scrnIndex, X_INFO, "800x600@60Hz\n");
+    c = t->t2;
+    if (c & 0x80)
+        xf86DrvMsg(scrnIndex, X_INFO, "800x600@72Hz\n");
+    if (c & 0x40)
+        xf86DrvMsg(scrnIndex, X_INFO, "800x600@75Hz\n");
+    if (c & 0x20)
+        xf86DrvMsg(scrnIndex, X_INFO, "832x624@75Hz\n");
+    if (c & 0x10)
+        xf86DrvMsg(scrnIndex, X_INFO, "1024x768@87Hz (interlaced)\n");
+    if (c & 0x08)
+        xf86DrvMsg(scrnIndex, X_INFO, "1024x768@60Hz\n");
+    if (c & 0x04)
+        xf86DrvMsg(scrnIndex, X_INFO, "1024x768@70Hz\n");
+    if (c & 0x02)
+        xf86DrvMsg(scrnIndex, X_INFO, "1024x768@75Hz\n");
+    if (c & 0x01)
+        xf86DrvMsg(scrnIndex, X_INFO, "1280x1024@75Hz\n");
+    c = t->t_manu;
+    if (c & 0x80)
+        xf86DrvMsg(scrnIndex, X_INFO, "1152x864@75Hz\n");
+    xf86DrvMsg(scrnIndex, X_INFO, "Manufacturer's mask: %X\n", c & 0x7F);
 }
-  
+
 static void
 print_std_timings(int scrnIndex, struct std_timings *t)
 {
     int i;
     char done = 0;
-    for (i=0;i<STD_TIMINGS;i++) {
-	if (t[i].hsize > 256) {  /* sanity check */
-	    if (!done) {
-		xf86DrvMsg(scrnIndex,X_INFO,"Supported standard timings:\n");
-		done = 1;
-	    }
-	    xf86DrvMsg(scrnIndex,X_INFO,
-		       "#%i: hsize: %i  vsize %i  refresh: %i  vid: %i\n",
-		       i, t[i].hsize, t[i].vsize, t[i].refresh, t[i].id);
-	}
+
+    for (i = 0; i < STD_TIMINGS; i++) {
+        if (t[i].hsize > 256) { /* sanity check */
+            if (!done) {
+                xf86DrvMsg(scrnIndex, X_INFO, "Supported standard timings:\n");
+                done = 1;
+            }
+            xf86DrvMsg(scrnIndex, X_INFO,
+                       "#%i: hsize: %i  vsize %i  refresh: %i  vid: %i\n",
+                       i, t[i].hsize, t[i].vsize, t[i].refresh, t[i].id);
+        }
     }
 }
 
@@ -279,15 +308,17 @@ print_cvt_timings(int si, struct cvt_timings *t)
     int i;
 
     for (i = 0; i < 4; i++) {
-	if (t[i].height) {
-	    xf86DrvMsg(si, X_INFO, "%dx%d @ %s%s%s%s%s Hz\n",
-		    t[i].width, t[i].height,
-		    t[i].rates & 0x10 ? "50," : "",
-		    t[i].rates & 0x08 ? "60," : "",
-		    t[i].rates & 0x04 ? "75," : "",
-		    t[i].rates & 0x02 ? "85," : "",
-		    t[i].rates & 0x01 ? "60RB" : "");
-	} else break;
+        if (t[i].height) {
+            xf86DrvMsg(si, X_INFO, "%dx%d @ %s%s%s%s%s Hz\n",
+                       t[i].width, t[i].height,
+                       t[i].rates & 0x10 ? "50," : "",
+                       t[i].rates & 0x08 ? "60," : "",
+                       t[i].rates & 0x04 ? "75," : "",
+                       t[i].rates & 0x02 ? "85," : "",
+                       t[i].rates & 0x01 ? "60RB" : "");
+        }
+        else
+            break;
     }
 }
 
@@ -296,166 +327,174 @@ print_detailed_timings(int scrnIndex, struct detailed_timings *t)
 {
 
     if (t->clock > 15000000) {  /* sanity check */
-	xf86DrvMsg(scrnIndex,X_INFO,"Supported detailed timing:\n");
-	xf86DrvMsg(scrnIndex,X_INFO,"clock: %.1f MHz   ",t->clock/1000000.0);
-	xf86ErrorF("Image Size:  %i x %i mm\n",t->h_size,t->v_size); 
-	xf86DrvMsg(scrnIndex,X_INFO,
-		   "h_active: %i  h_sync: %i  h_sync_end %i h_blank_end %i ",
-		   t->h_active, t->h_sync_off + t->h_active,
-		   t->h_sync_off + t->h_sync_width + t->h_active,
-		   t->h_active + t->h_blanking);
-	xf86ErrorF("h_border: %i\n",t->h_border);
-	xf86DrvMsg(scrnIndex,X_INFO,
-		   "v_active: %i  v_sync: %i  v_sync_end %i v_blanking: %i ",
-		   t->v_active, t->v_sync_off + t->v_active,
-		   t->v_sync_off + t->v_sync_width + t->v_active,
-		   t->v_active + t->v_blanking);
-	xf86ErrorF("v_border: %i\n",t->v_border);
-	if (IS_STEREO(t->stereo)) {
-	    xf86DrvMsg(scrnIndex,X_INFO,"Stereo: ");
-	    if (IS_RIGHT_STEREO(t->stereo)) {
-		if (!t->stereo_1)
-		    xf86ErrorF("right channel on sync\n");
-		else
-		    xf86ErrorF("left channel on sync\n");
-	    } else if (IS_LEFT_STEREO(t->stereo)) {
-		if (!t->stereo_1)
-		    xf86ErrorF("right channel on even line\n");
-		else 
-		    xf86ErrorF("left channel on evel line\n");
-	    }
-	    if (IS_4WAY_STEREO(t->stereo)) {
-		if (!t->stereo_1)
-		    xf86ErrorF("4-way interleaved\n");
-		else
-		    xf86ErrorF("side-by-side interleaved");
-	    }
-	}
+        xf86DrvMsg(scrnIndex, X_INFO, "Supported detailed timing:\n");
+        xf86DrvMsg(scrnIndex, X_INFO, "clock: %.1f MHz   ",
+                   t->clock / 1000000.0);
+        xf86ErrorF("Image Size:  %i x %i mm\n", t->h_size, t->v_size);
+        xf86DrvMsg(scrnIndex, X_INFO,
+                   "h_active: %i  h_sync: %i  h_sync_end %i h_blank_end %i ",
+                   t->h_active, t->h_sync_off + t->h_active,
+                   t->h_sync_off + t->h_sync_width + t->h_active,
+                   t->h_active + t->h_blanking);
+        xf86ErrorF("h_border: %i\n", t->h_border);
+        xf86DrvMsg(scrnIndex, X_INFO,
+                   "v_active: %i  v_sync: %i  v_sync_end %i v_blanking: %i ",
+                   t->v_active, t->v_sync_off + t->v_active,
+                   t->v_sync_off + t->v_sync_width + t->v_active,
+                   t->v_active + t->v_blanking);
+        xf86ErrorF("v_border: %i\n", t->v_border);
+        if (IS_STEREO(t->stereo)) {
+            xf86DrvMsg(scrnIndex, X_INFO, "Stereo: ");
+            if (IS_RIGHT_STEREO(t->stereo)) {
+                if (!t->stereo_1)
+                    xf86ErrorF("right channel on sync\n");
+                else
+                    xf86ErrorF("left channel on sync\n");
+            }
+            else if (IS_LEFT_STEREO(t->stereo)) {
+                if (!t->stereo_1)
+                    xf86ErrorF("right channel on even line\n");
+                else
+                    xf86ErrorF("left channel on evel line\n");
+            }
+            if (IS_4WAY_STEREO(t->stereo)) {
+                if (!t->stereo_1)
+                    xf86ErrorF("4-way interleaved\n");
+                else
+                    xf86ErrorF("side-by-side interleaved");
+            }
+        }
     }
 }
 
 /* This function handle all detailed patchs,
  * including EDID and EDID-extension
  */
-struct det_print_parameter{
-  xf86MonPtr m;
-  int index;
-  ddc_quirk_t quirks;
+struct det_print_parameter {
+    xf86MonPtr m;
+    int index;
+    ddc_quirk_t quirks;
 };
 
 static void
-handle_detailed_print(struct detailed_monitor_section *det_mon,
-                      void *data)
+handle_detailed_print(struct detailed_monitor_section *det_mon, void *data)
 {
     int j, scrnIndex;
     struct det_print_parameter *p;
 
-    p = (struct det_print_parameter *)data;
+    p = (struct det_print_parameter *) data;
     scrnIndex = p->m->scrnIndex;
-    xf86DetTimingApplyQuirks(det_mon,p->quirks,
-                             p->m->features.hsize,
-                             p->m->features.vsize);
+    xf86DetTimingApplyQuirks(det_mon, p->quirks,
+                             p->m->features.hsize, p->m->features.vsize);
 
     switch (det_mon->type) {
     case DT:
-        print_detailed_timings(scrnIndex,&det_mon->section.d_timings);
+        print_detailed_timings(scrnIndex, &det_mon->section.d_timings);
         break;
     case DS_SERIAL:
-        xf86DrvMsg(scrnIndex,X_INFO,"Serial No: %s\n",det_mon->section.serial);
+        xf86DrvMsg(scrnIndex, X_INFO, "Serial No: %s\n",
+                   det_mon->section.serial);
         break;
     case DS_ASCII_STR:
-        xf86DrvMsg(scrnIndex,X_INFO," %s\n",det_mon->section.ascii_data);
+        xf86DrvMsg(scrnIndex, X_INFO, " %s\n", det_mon->section.ascii_data);
         break;
     case DS_NAME:
-        xf86DrvMsg(scrnIndex,X_INFO,"Monitor name: %s\n",det_mon->section.name);
+        xf86DrvMsg(scrnIndex, X_INFO, "Monitor name: %s\n",
+                   det_mon->section.name);
         break;
     case DS_RANGES:
     {
         struct monitor_ranges *r = &det_mon->section.ranges;
-        xf86DrvMsg(scrnIndex,X_INFO,
+
+        xf86DrvMsg(scrnIndex, X_INFO,
                    "Ranges: V min: %i V max: %i Hz, H min: %i H max: %i kHz,",
                    r->min_v, r->max_v, r->min_h, r->max_h);
         if (r->max_clock_khz != 0) {
             xf86ErrorF(" PixClock max %i kHz\n", r->max_clock_khz);
-        if (r->maxwidth)
-            xf86DrvMsg(scrnIndex, X_INFO, "Maximum pixel width: %d\n",
-                       r->maxwidth);
-	xf86DrvMsg(scrnIndex, X_INFO, "Supported aspect ratios:");
-	if (r->supported_aspect & SUPPORTED_ASPECT_4_3)
-	    xf86ErrorF(" 4:3%s",
-                       r->preferred_aspect == PREFERRED_ASPECT_4_3?"*":"");
-	if (r->supported_aspect & SUPPORTED_ASPECT_16_9)
-	    xf86ErrorF(" 16:9%s",
-                       r->preferred_aspect == PREFERRED_ASPECT_16_9?"*":"");
-        if (r->supported_aspect & SUPPORTED_ASPECT_16_10)
-            xf86ErrorF(" 16:10%s",
-                       r->preferred_aspect == PREFERRED_ASPECT_16_10?"*":"");
-	if (r->supported_aspect & SUPPORTED_ASPECT_5_4)
-	    xf86ErrorF(" 5:4%s",
-                       r->preferred_aspect == PREFERRED_ASPECT_5_4?"*":"");
-	if (r->supported_aspect & SUPPORTED_ASPECT_15_9)
-	    xf86ErrorF(" 15:9%s",
-                       r->preferred_aspect == PREFERRED_ASPECT_15_9?"*":"");
-        xf86ErrorF("\n");
-	xf86DrvMsg(scrnIndex, X_INFO, "Supported blankings:");
-	if (r->supported_blanking & CVT_STANDARD)
-	    xf86ErrorF(" standard");
-	if (r->supported_blanking & CVT_REDUCED)
-	    xf86ErrorF(" reduced");
-	xf86ErrorF("\n");
-	xf86DrvMsg(scrnIndex, X_INFO, "Supported scalings:");
-	if (r->supported_scaling & SCALING_HSHRINK)
-	    xf86ErrorF(" hshrink");
-	if (r->supported_scaling & SCALING_HSTRETCH)
-	    xf86ErrorF(" hstretch");
-	if (r->supported_scaling & SCALING_VSHRINK)
-	    xf86ErrorF(" vshrink");
-	if (r->supported_scaling & SCALING_VSTRETCH)
-	    xf86ErrorF(" vstretch");
-        xf86ErrorF("\n");
-	if (r->preferred_refresh)
-	    xf86DrvMsg(scrnIndex, X_INFO, "Preferred refresh rate: %d\n",
-		    r->preferred_refresh);
-	else
-	    xf86DrvMsg(scrnIndex, X_INFO, "Buggy monitor, no preferred "
-		       "refresh rate given\n");
-        } else if (r->max_clock != 0) {
-	    xf86ErrorF(" PixClock max %i MHz\n", r->max_clock);
-        } else {
-	    xf86ErrorF("\n");
+            if (r->maxwidth)
+                xf86DrvMsg(scrnIndex, X_INFO, "Maximum pixel width: %d\n",
+                           r->maxwidth);
+            xf86DrvMsg(scrnIndex, X_INFO, "Supported aspect ratios:");
+            if (r->supported_aspect & SUPPORTED_ASPECT_4_3)
+                xf86ErrorF(" 4:3%s",
+                           r->preferred_aspect ==
+                           PREFERRED_ASPECT_4_3 ? "*" : "");
+            if (r->supported_aspect & SUPPORTED_ASPECT_16_9)
+                xf86ErrorF(" 16:9%s",
+                           r->preferred_aspect ==
+                           PREFERRED_ASPECT_16_9 ? "*" : "");
+            if (r->supported_aspect & SUPPORTED_ASPECT_16_10)
+                xf86ErrorF(" 16:10%s",
+                           r->preferred_aspect ==
+                           PREFERRED_ASPECT_16_10 ? "*" : "");
+            if (r->supported_aspect & SUPPORTED_ASPECT_5_4)
+                xf86ErrorF(" 5:4%s",
+                           r->preferred_aspect ==
+                           PREFERRED_ASPECT_5_4 ? "*" : "");
+            if (r->supported_aspect & SUPPORTED_ASPECT_15_9)
+                xf86ErrorF(" 15:9%s",
+                           r->preferred_aspect ==
+                           PREFERRED_ASPECT_15_9 ? "*" : "");
+            xf86ErrorF("\n");
+            xf86DrvMsg(scrnIndex, X_INFO, "Supported blankings:");
+            if (r->supported_blanking & CVT_STANDARD)
+                xf86ErrorF(" standard");
+            if (r->supported_blanking & CVT_REDUCED)
+                xf86ErrorF(" reduced");
+            xf86ErrorF("\n");
+            xf86DrvMsg(scrnIndex, X_INFO, "Supported scalings:");
+            if (r->supported_scaling & SCALING_HSHRINK)
+                xf86ErrorF(" hshrink");
+            if (r->supported_scaling & SCALING_HSTRETCH)
+                xf86ErrorF(" hstretch");
+            if (r->supported_scaling & SCALING_VSHRINK)
+                xf86ErrorF(" vshrink");
+            if (r->supported_scaling & SCALING_VSTRETCH)
+                xf86ErrorF(" vstretch");
+            xf86ErrorF("\n");
+            if (r->preferred_refresh)
+                xf86DrvMsg(scrnIndex, X_INFO, "Preferred refresh rate: %d\n",
+                           r->preferred_refresh);
+            else
+                xf86DrvMsg(scrnIndex, X_INFO, "Buggy monitor, no preferred "
+                           "refresh rate given\n");
+        }
+        else if (r->max_clock != 0) {
+            xf86ErrorF(" PixClock max %i MHz\n", r->max_clock);
+        }
+        else {
+            xf86ErrorF("\n");
         }
         if (r->gtf_2nd_f > 0)
-            xf86DrvMsg(scrnIndex,X_INFO," 2nd GTF parameters: f: %i kHz "
+            xf86DrvMsg(scrnIndex, X_INFO, " 2nd GTF parameters: f: %i kHz "
                        "c: %i m: %i k %i j %i\n", r->gtf_2nd_f,
-                       r->gtf_2nd_c, r->gtf_2nd_m, r->gtf_2nd_k,
-                       r->gtf_2nd_j);
+                       r->gtf_2nd_c, r->gtf_2nd_m, r->gtf_2nd_k, r->gtf_2nd_j);
         break;
     }
     case DS_STD_TIMINGS:
-        for (j = 0; j<5; j++)
-	    xf86DrvMsg(scrnIndex,X_INFO,
-		    "#%i: hsize: %i  vsize %i  refresh: %i  "
-		    "vid: %i\n",p->index ,det_mon->section.std_t[j].hsize,
-		    det_mon->section.std_t[j].vsize,
-		    det_mon->section.std_t[j].refresh,
-		    det_mon->section.std_t[j].id);
+        for (j = 0; j < 5; j++)
+            xf86DrvMsg(scrnIndex, X_INFO,
+                       "#%i: hsize: %i  vsize %i  refresh: %i  "
+                       "vid: %i\n", p->index, det_mon->section.std_t[j].hsize,
+                       det_mon->section.std_t[j].vsize,
+                       det_mon->section.std_t[j].refresh,
+                       det_mon->section.std_t[j].id);
         break;
     case DS_WHITE_P:
-        for (j = 0; j<2; j++)
-        if (det_mon->section.wp[j].index != 0)
-            xf86DrvMsg(scrnIndex,X_INFO,
-                       "White point %i: whiteX: %f, whiteY: %f; gamma: %f\n",
-                       det_mon->section.wp[j].index,det_mon->section.wp[j].white_x,
-                       det_mon->section.wp[j].white_y,
-                       det_mon->section.wp[j].white_gamma);
+        for (j = 0; j < 2; j++)
+            if (det_mon->section.wp[j].index != 0)
+                xf86DrvMsg(scrnIndex, X_INFO,
+                           "White point %i: whiteX: %f, whiteY: %f; gamma: %f\n",
+                           det_mon->section.wp[j].index,
+                           det_mon->section.wp[j].white_x,
+                           det_mon->section.wp[j].white_y,
+                           det_mon->section.wp[j].white_gamma);
         break;
     case DS_CMD:
-        xf86DrvMsg(scrnIndex, X_INFO,
-                   "Color management data: (not decoded)\n");
+        xf86DrvMsg(scrnIndex, X_INFO, "Color management data: (not decoded)\n");
         break;
     case DS_CVT:
-        xf86DrvMsg(scrnIndex, X_INFO,
-                   "CVT 3-byte-code modes:\n");
+        xf86DrvMsg(scrnIndex, X_INFO, "CVT 3-byte-code modes:\n");
         print_cvt_timings(scrnIndex, det_mon->section.cvt);
         break;
     case DS_EST_III:
@@ -479,8 +518,8 @@ static void
 print_number_sections(int scrnIndex, int num)
 {
     if (num)
-	xf86DrvMsg(scrnIndex,X_INFO,"Number of EDID sections to follow: %i\n",
-		   num);
+        xf86DrvMsg(scrnIndex, X_INFO, "Number of EDID sections to follow: %i\n",
+                   num);
 }
 
 xf86MonPtr
@@ -490,7 +529,8 @@ xf86PrintEDID(xf86MonPtr m)
     char buf[EDID_WIDTH * 2 + 1];
     struct det_print_parameter p;
 
-    if (!m) return NULL;
+    if (!m)
+        return NULL;
 
     print_vendor(m->scrnIndex, &m->vendor);
     print_version(m->scrnIndex, &m->ver);
@@ -500,9 +540,7 @@ xf86PrintEDID(xf86MonPtr m)
     p.m = m;
     p.index = 0;
     p.quirks = xf86DDCDetectQuirks(m->scrnIndex, m, FALSE);
-    xf86ForEachDetailedBlock(m,
-                             handle_detailed_print ,
-                             &p);
+    xf86ForEachDetailedBlock(m, handle_detailed_print, &p);
     print_number_sections(m->scrnIndex, m->no_sections);
 
     /* extension block section stuff */
@@ -511,13 +549,13 @@ xf86PrintEDID(xf86MonPtr m)
 
     n = 128;
     if (m->flags & EDID_COMPLETE_RAWDATA)
-	n += m->no_sections * 128;
+        n += m->no_sections * 128;
 
     for (i = 0; i < n; i += j) {
-	for (j = 0; j < EDID_WIDTH; ++j) {
-	    sprintf(&buf[j * 2], "%02x", m->rawData[i + j]);
-	}
-	xf86DrvMsg(m->scrnIndex, X_INFO, "\t%s\n", buf);
+        for (j = 0; j < EDID_WIDTH; ++j) {
+            sprintf(&buf[j * 2], "%02x", m->rawData[i + j]);
+        }
+        xf86DrvMsg(m->scrnIndex, X_INFO, "\t%s\n", buf);
     }
 
     return m;
diff --git a/xorg-server/hw/xfree86/ddc/xf86DDC.h b/xorg-server/hw/xfree86/ddc/xf86DDC.h
index 16a8641c6..2071d530d 100644
--- a/xorg-server/hw/xfree86/ddc/xf86DDC.h
+++ b/xorg-server/hw/xfree86/ddc/xf86DDC.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef XF86_DDC_H
-# define XF86_DDC_H
+#define XF86_DDC_H
 
 #include "edid.h"
 #include "xf86i2c.h"
@@ -18,55 +18,42 @@
 
 /* speed up / slow down */
 typedef enum {
-  DDC_SLOW,
-  DDC_FAST
+    DDC_SLOW,
+    DDC_FAST
 } xf86ddcSpeed;
 
-typedef void (* DDC1SetSpeedProc)(ScrnInfoPtr, xf86ddcSpeed);
+typedef void (*DDC1SetSpeedProc) (ScrnInfoPtr, xf86ddcSpeed);
 
-extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC1(
-    int scrnIndex, 
-    DDC1SetSpeedProc DDC1SetSpeed,
-    unsigned int (*DDC1Read)(ScrnInfoPtr)
-);
+extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC1(int scrnIndex,
+                                            DDC1SetSpeedProc DDC1SetSpeed,
+                                            unsigned
+                                            int (*DDC1Read) (ScrnInfoPtr)
+    );
 
-extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC2(
-   int scrnIndex,
-   I2CBusPtr pBus
-);
+extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus);
 
 extern _X_EXPORT xf86MonPtr xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool);
 
-extern _X_EXPORT xf86MonPtr xf86PrintEDID(
-    xf86MonPtr monPtr
-);
+extern _X_EXPORT xf86MonPtr xf86PrintEDID(xf86MonPtr monPtr);
 
-extern _X_EXPORT xf86MonPtr xf86InterpretEDID(
-    int screenIndex, Uchar *block
-);
+extern _X_EXPORT xf86MonPtr xf86InterpretEDID(int screenIndex, Uchar * block);
 
-extern _X_EXPORT xf86MonPtr xf86InterpretEEDID(
-    int screenIndex, Uchar *block
-);
+extern _X_EXPORT xf86MonPtr xf86InterpretEEDID(int screenIndex, Uchar * block);
 
 extern _X_EXPORT void
-xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC);
+ xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC);
 
-extern _X_EXPORT Bool xf86SetDDCproperties(
-    ScrnInfoPtr pScreen,
-    xf86MonPtr DDC
-);
+extern _X_EXPORT Bool xf86SetDDCproperties(ScrnInfoPtr pScreen, xf86MonPtr DDC);
 
 extern _X_EXPORT DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC);
 
 extern _X_EXPORT Bool
-xf86MonitorIsHDMI(xf86MonPtr mon);
+ xf86MonitorIsHDMI(xf86MonPtr mon);
 
-extern _X_EXPORT xf86MonPtr
-xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus);
+extern _X_EXPORT xf86MonPtr xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus);
 
 extern _X_EXPORT void
-xf86DisplayIDMonitorSet(int scrnIndex, MonPtr mon, xf86MonPtr DDC);
+ xf86DisplayIDMonitorSet(int scrnIndex, MonPtr mon, xf86MonPtr DDC);
 
 extern _X_EXPORT DisplayModePtr
 FindDMTMode(int hsize, int vsize, int refresh, Bool rb);
@@ -100,22 +87,17 @@ typedef enum {
     DDC_QUIRK_DVI_SINGLE_LINK = 1 << 8,
 } ddc_quirk_t;
 
-typedef void (* handle_detailed_fn)(struct detailed_monitor_section *,void *);
+typedef void (*handle_detailed_fn) (struct detailed_monitor_section *, void *);
 
-void xf86ForEachDetailedBlock(xf86MonPtr mon,
-                              handle_detailed_fn,
-                              void *data);
+void xf86ForEachDetailedBlock(xf86MonPtr mon, handle_detailed_fn, void *data);
 
-ddc_quirk_t
-xf86DDCDetectQuirks(int scrnIndex, xf86MonPtr DDC, Bool verbose);
+ddc_quirk_t xf86DDCDetectQuirks(int scrnIndex, xf86MonPtr DDC, Bool verbose);
 
 void xf86DetTimingApplyQuirks(struct detailed_monitor_section *det_mon,
                               ddc_quirk_t quirks, int hsize, int vsize);
 
-typedef void (* handle_video_fn)(struct cea_video_block *, void *);
+typedef void (*handle_video_fn) (struct cea_video_block *, void *);
 
-void xf86ForEachVideoBlock(xf86MonPtr,
-                           handle_video_fn,
-                           void *);
+void xf86ForEachVideoBlock(xf86MonPtr, handle_video_fn, void *);
 
 #endif
diff --git a/xorg-server/hw/xfree86/dixmods/dbemodule.c b/xorg-server/hw/xfree86/dixmods/dbemodule.c
index 73639886f..5541eacab 100644
--- a/xorg-server/hw/xfree86/dixmods/dbemodule.c
+++ b/xorg-server/hw/xfree86/dixmods/dbemodule.c
@@ -17,18 +17,17 @@ static ExtensionModule dbeExt = {
     NULL
 };
 
-static XF86ModuleVersionInfo VersRec =
-{
-	"dbe",
-	MODULEVENDORSTRING,
-	MODINFOSTRING1,
-	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
-	1, 0, 0,
-	ABI_CLASS_EXTENSION,
-	ABI_EXTENSION_VERSION,
-	MOD_CLASS_EXTENSION,
-	{0,0,0,0}
+static XF86ModuleVersionInfo VersRec = {
+    "dbe",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_EXTENSION,
+    ABI_EXTENSION_VERSION,
+    MOD_CLASS_EXTENSION,
+    {0, 0, 0, 0}
 };
 
 /*
@@ -42,5 +41,5 @@ dbeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
     LoadExtension(&dbeExt, FALSE);
 
     /* Need a non-NULL return value to indicate success */
-    return (pointer)1;
+    return (pointer) 1;
 }
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/dgaproc.h b/xorg-server/hw/xfree86/dixmods/extmod/dgaproc.h
index a13a51794..b4e0ddfea 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/dgaproc.h
+++ b/xorg-server/hw/xfree86/dixmods/extmod/dgaproc.h
@@ -23,58 +23,45 @@
 #define DGA_NEED_ROOT		0x00000001
 
 typedef struct {
-   int num;		/* A unique identifier for the mode (num > 0) */
-   char *name;		/* name of mode given in the XF86Config */
-   int VSync_num;
-   int VSync_den;
-   int flags;		/* DGA_CONCURRENT_ACCESS, etc... */
-   int imageWidth;	/* linear accessible portion (pixels) */
-   int imageHeight;
-   int pixmapWidth;	/* Xlib accessible portion (pixels) */
-   int pixmapHeight;	/* both fields ignored if no concurrent access */
-   int bytesPerScanline; 
-   int byteOrder;	/* MSBFirst, LSBFirst */
-   int depth;		
-   int bitsPerPixel;
-   unsigned long red_mask;
-   unsigned long green_mask;
-   unsigned long blue_mask;
-   short visualClass;
-   int viewportWidth;
-   int viewportHeight;
-   int xViewportStep;	/* viewport position granularity */
-   int yViewportStep;
-   int maxViewportX;	/* max viewport origin */
-   int maxViewportY;
-   int viewportFlags;	/* types of page flipping possible */
-   int offset;
-   int reserved1;
-   int reserved2;
+    int num;                    /* A unique identifier for the mode (num > 0) */
+    char *name;                 /* name of mode given in the XF86Config */
+    int VSync_num;
+    int VSync_den;
+    int flags;                  /* DGA_CONCURRENT_ACCESS, etc... */
+    int imageWidth;             /* linear accessible portion (pixels) */
+    int imageHeight;
+    int pixmapWidth;            /* Xlib accessible portion (pixels) */
+    int pixmapHeight;           /* both fields ignored if no concurrent access */
+    int bytesPerScanline;
+    int byteOrder;              /* MSBFirst, LSBFirst */
+    int depth;
+    int bitsPerPixel;
+    unsigned long red_mask;
+    unsigned long green_mask;
+    unsigned long blue_mask;
+    short visualClass;
+    int viewportWidth;
+    int viewportHeight;
+    int xViewportStep;          /* viewport position granularity */
+    int yViewportStep;
+    int maxViewportX;           /* max viewport origin */
+    int maxViewportY;
+    int viewportFlags;          /* types of page flipping possible */
+    int offset;
+    int reserved1;
+    int reserved2;
 } XDGAModeRec, *XDGAModePtr;
 
 /* DDX interface */
 
 extern _X_EXPORT int
-DGASetMode(
-   int Index,
-   int num,
-   XDGAModePtr mode,
-   PixmapPtr *pPix
-);
+ DGASetMode(int Index, int num, XDGAModePtr mode, PixmapPtr *pPix);
 
 extern _X_EXPORT void
-DGASetInputMode(
-   int Index,
-   Bool keyboard,
-   Bool mouse
-);
+ DGASetInputMode(int Index, Bool keyboard, Bool mouse);
 
 extern _X_EXPORT void
-DGASelectInput(
-   int Index,
-   ClientPtr client,
-   long mask
-);
+ DGASelectInput(int Index, ClientPtr client, long mask);
 
 extern _X_EXPORT Bool DGAAvailable(int Index);
 extern _X_EXPORT Bool DGAActive(int Index);
@@ -84,35 +71,19 @@ extern _X_EXPORT int DGAGetViewportStatus(int Index);
 extern _X_EXPORT int DGASync(int Index);
 
 extern _X_EXPORT int
-DGAFillRect(
-   int Index,
-   int x, int y, int w, int h,
-   unsigned long color
-);
+ DGAFillRect(int Index, int x, int y, int w, int h, unsigned long color);
 
 extern _X_EXPORT int
-DGABlitRect(
-   int Index,
-   int srcx, int srcy, 
-   int w, int h, 
-   int dstx, int dsty
-);
+ DGABlitRect(int Index, int srcx, int srcy, int w, int h, int dstx, int dsty);
 
 extern _X_EXPORT int
-DGABlitTransRect(
-   int Index,
-   int srcx, int srcy, 
-   int w, int h, 
-   int dstx, int dsty,
-   unsigned long color
-);
+
+DGABlitTransRect(int Index,
+                 int srcx, int srcy,
+                 int w, int h, int dstx, int dsty, unsigned long color);
 
 extern _X_EXPORT int
-DGASetViewport(
-   int Index,
-   int x, int y,
-   int mode
-); 
+ DGASetViewport(int Index, int x, int y, int mode);
 
 extern _X_EXPORT int DGAGetModes(int Index);
 extern _X_EXPORT int DGAGetOldDGAMode(int Index);
@@ -120,23 +91,24 @@ extern _X_EXPORT int DGAGetOldDGAMode(int Index);
 extern _X_EXPORT int DGAGetModeInfo(int Index, XDGAModePtr mode, int num);
 
 extern _X_EXPORT Bool DGAVTSwitch(void);
-extern _X_EXPORT Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index, int button,
-                         int is_down);
-extern _X_EXPORT Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy);
-extern _X_EXPORT Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index, int key_code, int is_down);
-	    
-extern _X_EXPORT Bool DGAOpenFramebuffer(int Index, char **name, unsigned char **mem,
-			int *size, int *offset, int *flags);
+extern _X_EXPORT Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index,
+                                          int button, int is_down);
+extern _X_EXPORT Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx,
+                                          int dy);
+extern _X_EXPORT Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index,
+                                       int key_code, int is_down);
+
+extern _X_EXPORT Bool DGAOpenFramebuffer(int Index, char **name,
+                                         unsigned char **mem, int *size,
+                                         int *offset, int *flags);
 extern _X_EXPORT void DGACloseFramebuffer(int Index);
 extern _X_EXPORT Bool DGAChangePixmapMode(int Index, int *x, int *y, int mode);
-extern _X_EXPORT int DGACreateColormap(int Index, ClientPtr client, int id, int mode,
-			int alloc);
+extern _X_EXPORT int DGACreateColormap(int Index, ClientPtr client, int id,
+                                       int mode, int alloc);
 
 extern _X_EXPORT unsigned char DGAReqCode;
 extern _X_EXPORT int DGAErrorBase;
 extern _X_EXPORT int DGAEventBase;
 extern _X_EXPORT int *XDGAEventBase;
 
-
-
-#endif /* __DGAPROC_H */
+#endif                          /* __DGAPROC_H */
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/modinit.c b/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
index 632454f37..ca15ee0e7 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
@@ -1,184 +1,177 @@
-/*

- * Copyright (c) 1997 Matthieu Herrb

- *

- * 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 Matthieu Herrb not be used in

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

- * specific, written prior permission.  Matthieu Herrb makes no

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

- *  It is provided "as is" without express or implied warranty.

- *

- * MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL MATTHIEU HERRB 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_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Module.h"

-#include "xf86Opt.h"

-

-#include <X11/Xproto.h>

-

-#include "modinit.h"

-#include "globals.h"

-

-static MODULESETUPPROTO(extmodSetup);

-

-/*

- * Array describing extensions to be initialized

- */

-static ExtensionModule extensionModules[] = {

-#ifdef XSELINUX

-    {

-	SELinuxExtensionInit,

-	SELINUX_EXTENSION_NAME,

-	&noSELinuxExtension,

-	NULL,

-	NULL

-    },

-#endif

-#ifdef SCREENSAVER

-    {

-	ScreenSaverExtensionInit,

-	ScreenSaverName,

-	&noScreenSaverExtension,

-	NULL,

-	NULL

-    },

-#endif

-#ifdef XF86VIDMODE

-    {

-	XFree86VidModeExtensionInit,

-	XF86VIDMODENAME,

-	&noXFree86VidModeExtension,

-	NULL,

-	NULL

-    },

-#endif

-#ifdef XFreeXDGA

-    {

-	XFree86DGAExtensionInit,

-	XF86DGANAME,

-	&noXFree86DGAExtension,

-	XFree86DGARegister,

-	NULL

-    },

-#endif

-#ifdef DPMSExtension

-    {

-	DPMSExtensionInit,

-	DPMSExtensionName,

-	&noDPMSExtension,

-	NULL,

-	NULL

-    },

-#endif

-#ifdef XV

-    {

-	XvExtensionInit,

-	XvName,

-	&noXvExtension,

-	XvRegister,

-	NULL

-    },

-    {

-        XvMCExtensionInit,

-        XvMCName,

-        &noXvExtension,

-        NULL,

-        NULL

-    },

-#endif

-#ifdef RES

-    {

-        ResExtensionInit,

-        XRES_NAME, 

-        &noResExtension,

-        NULL,

-        NULL

-    },

-#endif

-    {				/* DON'T delete this entry ! */

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL

-    }

-};

-

-static XF86ModuleVersionInfo VersRec =

-{

-	"extmod",

-	MODULEVENDORSTRING,

-	MODINFOSTRING1,

-	MODINFOSTRING2,

-	XORG_VERSION_CURRENT,

-	1, 0, 0,

-	ABI_CLASS_EXTENSION,

-	ABI_EXTENSION_VERSION,

-	MOD_CLASS_EXTENSION,

-	{0,0,0,0}

-};

-

-/*

- * Data for the loader

- */

-_X_EXPORT XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };

-

-static pointer

-extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)

-{

-    int i;

-

-    /* XXX the option stuff here is largely a sample/test case */

-

-    for (i = 0; extensionModules[i].name != NULL; i++) {

-	if (opts) {

-	    char *s;

-	    if (asprintf(&s, "omit%s", extensionModules[i].name) != -1) {

-		pointer o;

-		o = xf86FindOption(opts, s);

-		free(s);

-		if (o) {

-		    xf86MarkOptionUsed(o);

-		    continue;

-		}

-	    }

-	}

-

-#ifdef XSELINUX

-	if (! strcmp(SELINUX_EXTENSION_NAME, extensionModules[i].name)) {

-	    pointer o;

-	    selinuxEnforcingState = SELINUX_MODE_DEFAULT;

-

-	    if ((o = xf86FindOption(opts, "SELinux mode disabled"))) {

-		xf86MarkOptionUsed(o);

-		selinuxEnforcingState = SELINUX_MODE_DISABLED;

-	    }

-	    if ((o = xf86FindOption(opts, "SELinux mode permissive"))) {

-		xf86MarkOptionUsed(o);

-		selinuxEnforcingState = SELINUX_MODE_PERMISSIVE;

-	    }

-	    if ((o = xf86FindOption(opts, "SELinux mode enforcing"))) {

-		xf86MarkOptionUsed(o);

-		selinuxEnforcingState = SELINUX_MODE_ENFORCING;

-	    }

-	}

-#endif

-

-	LoadExtension(&extensionModules[i], FALSE);

-    }

-    /* Need a non-NULL return */

-    return (pointer)1;

-}

+/*
+ * Copyright (c) 1997 Matthieu Herrb
+ *
+ * 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 Matthieu Herrb not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Matthieu Herrb makes no
+ * representations about the suitability of this software for any purpose.
+ *  It is provided "as is" without express or implied warranty.
+ *
+ * MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL MATTHIEU HERRB 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_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Module.h"
+#include "xf86Opt.h"
+
+#include <X11/Xproto.h>
+
+#include "modinit.h"
+#include "globals.h"
+
+static MODULESETUPPROTO(extmodSetup);
+
+/*
+ * Array describing extensions to be initialized
+ */
+static ExtensionModule extensionModules[] = {
+#ifdef XSELINUX
+    {
+     SELinuxExtensionInit,
+     SELINUX_EXTENSION_NAME,
+     &noSELinuxExtension,
+     NULL,
+     NULL},
+#endif
+#ifdef SCREENSAVER
+    {
+     ScreenSaverExtensionInit,
+     ScreenSaverName,
+     &noScreenSaverExtension,
+     NULL,
+     NULL},
+#endif
+#ifdef XF86VIDMODE
+    {
+     XFree86VidModeExtensionInit,
+     XF86VIDMODENAME,
+     &noXFree86VidModeExtension,
+     NULL,
+     NULL},
+#endif
+#ifdef XFreeXDGA
+    {
+     XFree86DGAExtensionInit,
+     XF86DGANAME,
+     &noXFree86DGAExtension,
+     XFree86DGARegister,
+     NULL},
+#endif
+#ifdef DPMSExtension
+    {
+     DPMSExtensionInit,
+     DPMSExtensionName,
+     &noDPMSExtension,
+     NULL,
+     NULL},
+#endif
+#ifdef XV
+    {
+     XvExtensionInit,
+     XvName,
+     &noXvExtension,
+     XvRegister,
+     NULL},
+    {
+     XvMCExtensionInit,
+     XvMCName,
+     &noXvExtension,
+     NULL,
+     NULL},
+#endif
+#ifdef RES
+    {
+     ResExtensionInit,
+     XRES_NAME,
+     &noResExtension,
+     NULL,
+     NULL},
+#endif
+    {                           /* DON'T delete this entry ! */
+     NULL,
+     NULL,
+     NULL,
+     NULL,
+     NULL}
+};
+
+static XF86ModuleVersionInfo VersRec = {
+    "extmod",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_EXTENSION,
+    ABI_EXTENSION_VERSION,
+    MOD_CLASS_EXTENSION,
+    {0, 0, 0, 0}
+};
+
+/*
+ * Data for the loader
+ */
+_X_EXPORT XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };
+
+static pointer
+extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    int i;
+
+    /* XXX the option stuff here is largely a sample/test case */
+
+    for (i = 0; extensionModules[i].name != NULL; i++) {
+        if (opts) {
+            char *s;
+
+            if (asprintf(&s, "omit%s", extensionModules[i].name) != -1) {
+                pointer o;
+
+                o = xf86FindOption(opts, s);
+                free(s);
+                if (o) {
+                    xf86MarkOptionUsed(o);
+                    continue;
+                }
+            }
+        }
+
+#ifdef XSELINUX
+        if (!strcmp(SELINUX_EXTENSION_NAME, extensionModules[i].name)) {
+            pointer o;
+
+            selinuxEnforcingState = SELINUX_MODE_DEFAULT;
+
+            if ((o = xf86FindOption(opts, "SELinux mode disabled"))) {
+                xf86MarkOptionUsed(o);
+                selinuxEnforcingState = SELINUX_MODE_DISABLED;
+            }
+            if ((o = xf86FindOption(opts, "SELinux mode permissive"))) {
+                xf86MarkOptionUsed(o);
+                selinuxEnforcingState = SELINUX_MODE_PERMISSIVE;
+            }
+            if ((o = xf86FindOption(opts, "SELinux mode enforcing"))) {
+                xf86MarkOptionUsed(o);
+                selinuxEnforcingState = SELINUX_MODE_ENFORCING;
+            }
+        }
+#endif
+
+        LoadExtension(&extensionModules[i], FALSE);
+    }
+    /* Need a non-NULL return */
+    return (pointer) 1;
+}
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/modinit.h b/xorg-server/hw/xfree86/dixmods/extmod/modinit.h
index 9753e6f14..9753fe0fd 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/modinit.h
+++ b/xorg-server/hw/xfree86/dixmods/extmod/modinit.h
@@ -1,86 +1,93 @@
-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#ifndef INITARGS

-#define INITARGS void

-#endif

-

-#include <X11/extensions/shapeproto.h>

-

-#ifdef XTEST

-extern void XTestExtensionInit(INITARGS);

-#include <X11/extensions/xtestproto.h>

-#endif

-

-#if 1

-extern void XTestExtension1Init(INITARGS);

-#endif

-

-#if 1

-extern void XCMiscExtensionInit(INITARGS);

-#endif

-

-#ifdef SCREENSAVER

-extern void ScreenSaverExtensionInit (INITARGS);

-#include <X11/extensions/saver.h>

-#endif

-

-#ifdef XF86VIDMODE

-extern void	XFree86VidModeExtensionInit(INITARGS);

-#include <X11/extensions/xf86vmproto.h>

-#endif

-

-#ifdef XFreeXDGA

-extern void XFree86DGAExtensionInit(INITARGS);

-extern void XFree86DGARegister(INITARGS);

-#include <X11/extensions/xf86dgaproto.h>

-#endif

-

-#ifdef DPMSExtension

-extern void DPMSExtensionInit(INITARGS);

-#include <X11/extensions/dpmsconst.h>

-#endif

-

-#ifdef XV

-extern void XvExtensionInit(INITARGS);

-extern void XvMCExtensionInit(INITARGS);

-extern void XvRegister(INITARGS);

-#include <X11/extensions/Xv.h>

-#include <X11/extensions/XvMC.h>

-#endif

-

-#ifdef RES

-extern void ResExtensionInit(INITARGS);

-#include <X11/extensions/XResproto.h>

-#endif

-

-#ifdef SHM

-extern void ShmExtensionInit(INITARGS);

-#include <X11/extensions/shmproto.h>

-extern void ShmRegisterFuncs(

-    ScreenPtr pScreen,

-    ShmFuncsPtr funcs);

-#endif

-

-#ifdef XSELINUX

-extern void SELinuxExtensionInit(INITARGS);

-#include "xselinux.h"

-#endif

-

-#ifdef XEVIE

-extern void XevieExtensionInit(INITARGS);

-#endif

-

-#if 1

-extern void SecurityExtensionInit(INITARGS);

-#endif

-

-#if 1

-extern void PanoramiXExtensionInit(int argc, char *argv[]);

-#endif

-

-#if 1

-extern void XkbExtensionInit(INITARGS);

-#endif

+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#ifndef INITARGS
+#define INITARGS void
+#endif
+
+#include <X11/extensions/shapeproto.h>
+
+#ifdef XTEST
+extern void XTestExtensionInit(INITARGS);
+
+#include <X11/extensions/xtestproto.h>
+#endif
+
+#if 1
+extern void XTestExtension1Init(INITARGS);
+#endif
+
+#if 1
+extern void XCMiscExtensionInit(INITARGS);
+#endif
+
+#ifdef SCREENSAVER
+extern void ScreenSaverExtensionInit(INITARGS);
+
+#include <X11/extensions/saver.h>
+#endif
+
+#ifdef XF86VIDMODE
+extern void XFree86VidModeExtensionInit(INITARGS);
+
+#include <X11/extensions/xf86vmproto.h>
+#endif
+
+#ifdef XFreeXDGA
+extern void XFree86DGAExtensionInit(INITARGS);
+extern void XFree86DGARegister(INITARGS);
+
+#include <X11/extensions/xf86dgaproto.h>
+#endif
+
+#ifdef DPMSExtension
+extern void DPMSExtensionInit(INITARGS);
+
+#include <X11/extensions/dpmsconst.h>
+#endif
+
+#ifdef XV
+extern void XvExtensionInit(INITARGS);
+extern void XvMCExtensionInit(INITARGS);
+extern void XvRegister(INITARGS);
+
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/XvMC.h>
+#endif
+
+#ifdef RES
+extern void ResExtensionInit(INITARGS);
+
+#include <X11/extensions/XResproto.h>
+#endif
+
+#ifdef SHM
+extern void ShmExtensionInit(INITARGS);
+
+#include <X11/extensions/shmproto.h>
+extern void ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
+#endif
+
+#ifdef XSELINUX
+extern void SELinuxExtensionInit(INITARGS);
+
+#include "xselinux.h"
+#endif
+
+#ifdef XEVIE
+extern void XevieExtensionInit(INITARGS);
+#endif
+
+#if 1
+extern void SecurityExtensionInit(INITARGS);
+#endif
+
+#if 1
+extern void PanoramiXExtensionInit(int argc, char *argv[]);
+#endif
+
+#if 1
+extern void XkbExtensionInit(INITARGS);
+#endif
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
index 4bcf77efd..6b33941ef 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -6,7 +6,6 @@
  * Written by Mark Vojkovich
  */
 
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -33,26 +32,27 @@
 
 #define DGA_PROTOCOL_OLD_SUPPORT 1
 
+static void XDGAResetProc(ExtensionEntry * extEntry);
 
-static void XDGAResetProc(ExtensionEntry *extEntry);
-
-static void DGAClientStateChange (CallbackListPtr*, pointer, pointer);
+static void DGAClientStateChange(CallbackListPtr *, pointer, pointer);
 
 unsigned char DGAReqCode = 0;
 int DGAErrorBase;
 int DGAEventBase;
 
 static DevPrivateKeyRec DGAScreenPrivateKeyRec;
+
 #define DGAScreenPrivateKey (&DGAScreenPrivateKeyRec)
 #define DGAScreenPrivateKeyRegistered (DGAScreenPrivateKeyRec.initialized)
 static DevPrivateKeyRec DGAClientPrivateKeyRec;
+
 #define DGAClientPrivateKey (&DGAClientPrivateKeyRec)
 static int DGACallbackRefCount = 0;
 
 /* This holds the client's version information */
 typedef struct {
-    int		major;
-    int		minor;
+    int major;
+    int minor;
 } DGAPrivRec, *DGAPrivPtr;
 
 #define DGA_GETCLIENT(idx) ((ClientPtr) \
@@ -65,15 +65,13 @@ typedef struct {
 #define DGA_SETPRIV(c,p) \
     dixSetPrivate(&(c)->devPrivates, DGAClientPrivateKey, p)
 
-
 static void
-XDGAResetProc (ExtensionEntry *extEntry)
+XDGAResetProc(ExtensionEntry * extEntry)
 {
-   DeleteCallback (&ClientStateCallback, DGAClientStateChange, NULL);
-   DGACallbackRefCount = 0;
+    DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);
+    DGACallbackRefCount = 0;
 }
 
-
 static int
 ProcXDGAQueryVersion(ClientPtr client)
 {
@@ -86,11 +84,10 @@ ProcXDGAQueryVersion(ClientPtr client)
     rep.majorVersion = SERVER_XDGA_MAJOR_VERSION;
     rep.minorVersion = SERVER_XDGA_MINOR_VERSION;
 
-    WriteToClient(client, sizeof(xXDGAQueryVersionReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXDGAQueryVersionReply), (char *) &rep);
     return Success;
 }
 
-
 static int
 ProcXDGAOpenFramebuffer(ClientPtr client)
 {
@@ -110,24 +107,23 @@ ProcXDGAOpenFramebuffer(ClientPtr client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    if(!DGAOpenFramebuffer(stuff->screen, &deviceName,
-			(unsigned char**)(&rep.mem1),
-			(int*)&rep.size, (int*)&rep.offset, (int*)&rep.extra))
-    {
-	return BadAlloc;
+    if (!DGAOpenFramebuffer(stuff->screen, &deviceName,
+                            (unsigned char **) (&rep.mem1),
+                            (int *) &rep.size, (int *) &rep.offset,
+                            (int *) &rep.extra)) {
+        return BadAlloc;
     }
 
     nameSize = deviceName ? (strlen(deviceName) + 1) : 0;
     rep.length = bytes_to_int32(nameSize);
 
-    WriteToClient(client, sizeof(xXDGAOpenFramebufferReply), (char *)&rep);
-    if(rep.length)
-	WriteToClient(client, nameSize, deviceName);
+    WriteToClient(client, sizeof(xXDGAOpenFramebufferReply), (char *) &rep);
+    if (rep.length)
+        WriteToClient(client, nameSize, deviceName);
 
     return Success;
 }
 
-
 static int
 ProcXDGACloseFramebuffer(ClientPtr client)
 {
@@ -150,6 +146,7 @@ static int
 ProcXDGAQueryModes(ClientPtr client)
 {
     int i, num, size;
+
     REQUEST(xXDGAQueryModesReq);
     xXDGAQueryModesReply rep;
     xXDGAModeInfo info;
@@ -165,64 +162,64 @@ ProcXDGAQueryModes(ClientPtr client)
     rep.sequenceNumber = client->sequence;
 
     if (!DGAAvailable(stuff->screen)) {
-	rep.number = 0;
-	rep.length = 0;
-	WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);
-	return Success;
+        rep.number = 0;
+        rep.length = 0;
+        WriteToClient(client, sz_xXDGAQueryModesReply, (char *) &rep);
+        return Success;
     }
 
-    if(!(num = DGAGetModes(stuff->screen))) {
-	WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);
-	return Success;
+    if (!(num = DGAGetModes(stuff->screen))) {
+        WriteToClient(client, sz_xXDGAQueryModesReply, (char *) &rep);
+        return Success;
     }
 
-    if(!(mode = (XDGAModePtr)malloc(num * sizeof(XDGAModeRec))))
-	return BadAlloc;
+    if (!(mode = (XDGAModePtr) malloc(num * sizeof(XDGAModeRec))))
+        return BadAlloc;
 
-    for(i = 0; i < num; i++)
-	DGAGetModeInfo(stuff->screen, mode + i, i + 1);
+    for (i = 0; i < num; i++)
+        DGAGetModeInfo(stuff->screen, mode + i, i + 1);
 
     size = num * sz_xXDGAModeInfo;
-    for(i = 0; i < num; i++)
-	size += pad_to_int32(strlen(mode[i].name) + 1);  /* plus NULL */
+    for (i = 0; i < num; i++)
+        size += pad_to_int32(strlen(mode[i].name) + 1); /* plus NULL */
 
     rep.number = num;
     rep.length = bytes_to_int32(size);
 
-    WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);
-
-    for(i = 0; i < num; i++) {
-	size = strlen(mode[i].name) + 1;
-
-	info.byte_order = mode[i].byteOrder;
-	info.depth = mode[i].depth;
-	info.num = mode[i].num;
-	info.bpp = mode[i].bitsPerPixel;
-	info.name_size = (size + 3) & ~3L;
-	info.vsync_num = mode[i].VSync_num;
-	info.vsync_den = mode[i].VSync_den;
-	info.flags = mode[i].flags;
-	info.image_width = mode[i].imageWidth;
-	info.image_height = mode[i].imageHeight;
-	info.pixmap_width = mode[i].pixmapWidth;
-	info.pixmap_height = mode[i].pixmapHeight;
-	info.bytes_per_scanline = mode[i].bytesPerScanline;
-	info.red_mask = mode[i].red_mask;
-	info.green_mask = mode[i].green_mask;
-	info.blue_mask = mode[i].blue_mask;
-	info.visual_class = mode[i].visualClass;
-	info.viewport_width = mode[i].viewportWidth;
-	info.viewport_height = mode[i].viewportHeight;
-	info.viewport_xstep = mode[i].xViewportStep;
-	info.viewport_ystep = mode[i].yViewportStep;
- 	info.viewport_xmax = mode[i].maxViewportX;
-	info.viewport_ymax = mode[i].maxViewportY;
-	info.viewport_flags = mode[i].viewportFlags;
-	info.reserved1 = mode[i].reserved1;
-	info.reserved2 = mode[i].reserved2;
-
-	WriteToClient(client, sz_xXDGAModeInfo, (char*)(&info));
-	WriteToClient(client, size, mode[i].name);
+    WriteToClient(client, sz_xXDGAQueryModesReply, (char *) &rep);
+
+    for (i = 0; i < num; i++) {
+        size = strlen(mode[i].name) + 1;
+
+        info.byte_order = mode[i].byteOrder;
+        info.depth = mode[i].depth;
+        info.num = mode[i].num;
+        info.bpp = mode[i].bitsPerPixel;
+        info.name_size = (size + 3) & ~3L;
+        info.vsync_num = mode[i].VSync_num;
+        info.vsync_den = mode[i].VSync_den;
+        info.flags = mode[i].flags;
+        info.image_width = mode[i].imageWidth;
+        info.image_height = mode[i].imageHeight;
+        info.pixmap_width = mode[i].pixmapWidth;
+        info.pixmap_height = mode[i].pixmapHeight;
+        info.bytes_per_scanline = mode[i].bytesPerScanline;
+        info.red_mask = mode[i].red_mask;
+        info.green_mask = mode[i].green_mask;
+        info.blue_mask = mode[i].blue_mask;
+        info.visual_class = mode[i].visualClass;
+        info.viewport_width = mode[i].viewportWidth;
+        info.viewport_height = mode[i].viewportHeight;
+        info.viewport_xstep = mode[i].xViewportStep;
+        info.viewport_ystep = mode[i].yViewportStep;
+        info.viewport_xmax = mode[i].maxViewportX;
+        info.viewport_ymax = mode[i].maxViewportY;
+        info.viewport_flags = mode[i].viewportFlags;
+        info.reserved1 = mode[i].reserved1;
+        info.reserved2 = mode[i].reserved2;
+
+        WriteToClient(client, sz_xXDGAModeInfo, (char *) (&info));
+        WriteToClient(client, size, mode[i].name);
     }
 
     free(mode);
@@ -230,36 +227,32 @@ ProcXDGAQueryModes(ClientPtr client)
     return Success;
 }
 
-
 static void
-DGAClientStateChange (
-    CallbackListPtr* pcbl,
-    pointer nulldata,
-    pointer calldata
-){
-    NewClientInfoRec* pci = (NewClientInfoRec*) calldata;
+DGAClientStateChange(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
+{
+    NewClientInfoRec *pci = (NewClientInfoRec *) calldata;
     ClientPtr client = NULL;
     int i;
 
-    for(i = 0; i < screenInfo.numScreens; i++) {
-	if(DGA_GETCLIENT(i) == pci->client) {
-	   client = pci->client;
-	   break;
-	}
+    for (i = 0; i < screenInfo.numScreens; i++) {
+        if (DGA_GETCLIENT(i) == pci->client) {
+            client = pci->client;
+            break;
+        }
     }
 
-    if(client &&
-      ((client->clientState == ClientStateGone) ||
-       (client->clientState == ClientStateRetained))) {
-	XDGAModeRec mode;
-	PixmapPtr pPix;
+    if (client &&
+        ((client->clientState == ClientStateGone) ||
+         (client->clientState == ClientStateRetained))) {
+        XDGAModeRec mode;
+        PixmapPtr pPix;
 
-	DGA_SETCLIENT(i, NULL);
-	DGASelectInput(i, NULL, 0);
-	DGASetMode(i, 0, &mode, &pPix);
+        DGA_SETCLIENT(i, NULL);
+        DGASelectInput(i, NULL, 0);
+        DGASetMode(i, 0, &mode, &pPix);
 
-	if(--DGACallbackRefCount == 0)
-	    DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);
+        if (--DGACallbackRefCount == 0)
+            DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);
     }
 }
 
@@ -288,36 +281,37 @@ ProcXDGASetMode(ClientPtr client)
     if (!DGAAvailable(stuff->screen))
         return DGAErrorBase + XF86DGANoDirectVideoMode;
 
-    if(owner && owner != client)
+    if (owner && owner != client)
         return DGAErrorBase + XF86DGANoDirectVideoMode;
 
-    if(!stuff->mode) {
-	if(owner) {
-	  if(--DGACallbackRefCount == 0)
-	    DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);
-	}
-	DGA_SETCLIENT(stuff->screen, NULL);
-	DGASelectInput(stuff->screen, NULL, 0);
-	DGASetMode(stuff->screen, 0, &mode, &pPix);
-	WriteToClient(client, sz_xXDGASetModeReply, (char*)&rep);
-	return Success;
+    if (!stuff->mode) {
+        if (owner) {
+            if (--DGACallbackRefCount == 0)
+                DeleteCallback(&ClientStateCallback, DGAClientStateChange,
+                               NULL);
+        }
+        DGA_SETCLIENT(stuff->screen, NULL);
+        DGASelectInput(stuff->screen, NULL, 0);
+        DGASetMode(stuff->screen, 0, &mode, &pPix);
+        WriteToClient(client, sz_xXDGASetModeReply, (char *) &rep);
+        return Success;
     }
 
-    if(Success != DGASetMode(stuff->screen, stuff->mode, &mode, &pPix))
-	return BadValue;
+    if (Success != DGASetMode(stuff->screen, stuff->mode, &mode, &pPix))
+        return BadValue;
 
-    if(!owner) {
-	if(DGACallbackRefCount++ == 0)
-	   AddCallback (&ClientStateCallback, DGAClientStateChange, NULL);
+    if (!owner) {
+        if (DGACallbackRefCount++ == 0)
+            AddCallback(&ClientStateCallback, DGAClientStateChange, NULL);
     }
 
     DGA_SETCLIENT(stuff->screen, client);
 
-    if(pPix) {
-	if(AddResource(stuff->pid, RT_PIXMAP, (pointer)(pPix))) {
-	    pPix->drawable.id = (int)stuff->pid;
-	    rep.flags = DGA_PIXMAP_AVAILABLE;
-	}
+    if (pPix) {
+        if (AddResource(stuff->pid, RT_PIXMAP, (pointer) (pPix))) {
+            pPix->drawable.id = (int) stuff->pid;
+            rep.flags = DGA_PIXMAP_AVAILABLE;
+        }
     }
 
     size = strlen(mode.name) + 1;
@@ -351,8 +345,8 @@ ProcXDGASetMode(ClientPtr client)
 
     rep.length = bytes_to_int32(sz_xXDGAModeInfo + info.name_size);
 
-    WriteToClient(client, sz_xXDGASetModeReply, (char*)&rep);
-    WriteToClient(client, sz_xXDGAModeInfo, (char*)(&info));
+    WriteToClient(client, sz_xXDGASetModeReply, (char *) &rep);
+    WriteToClient(client, sz_xXDGAModeInfo, (char *) (&info));
     WriteToClient(client, size, mode.name);
 
     return Success;
@@ -366,7 +360,7 @@ ProcXDGASetViewport(ClientPtr client)
     if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if(DGA_GETCLIENT(stuff->screen) != client)
+    if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGASetViewportReq);
@@ -381,25 +375,25 @@ ProcXDGAInstallColormap(ClientPtr client)
 {
     ColormapPtr cmap;
     int rc;
+
     REQUEST(xXDGAInstallColormapReq);
 
     if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if(DGA_GETCLIENT(stuff->screen) != client)
+    if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGAInstallColormapReq);
 
-    rc = dixLookupResourceByType((pointer *)&cmap, stuff->cmap, RT_COLORMAP,
-				 client, DixInstallAccess);
+    rc = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, RT_COLORMAP,
+                                 client, DixInstallAccess);
     if (rc != Success)
         return rc;
     DGAInstallCmap(cmap);
     return Success;
 }
 
-
 static int
 ProcXDGASelectInput(ClientPtr client)
 {
@@ -408,18 +402,17 @@ ProcXDGASelectInput(ClientPtr client)
     if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if(DGA_GETCLIENT(stuff->screen) != client)
+    if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGASelectInputReq);
 
-    if(DGA_GETCLIENT(stuff->screen) == client)
-	DGASelectInput(stuff->screen, client, stuff->mask);
+    if (DGA_GETCLIENT(stuff->screen) == client)
+        DGASelectInput(stuff->screen, client, stuff->mask);
 
     return Success;
 }
 
-
 static int
 ProcXDGAFillRectangle(ClientPtr client)
 {
@@ -428,14 +421,14 @@ ProcXDGAFillRectangle(ClientPtr client)
     if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if(DGA_GETCLIENT(stuff->screen) != client)
+    if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGAFillRectangleReq);
 
-    if(Success != DGAFillRect(stuff->screen, stuff->x, stuff->y,
-			stuff->width, stuff->height, stuff->color))
-	return BadMatch;
+    if (Success != DGAFillRect(stuff->screen, stuff->x, stuff->y,
+                               stuff->width, stuff->height, stuff->color))
+        return BadMatch;
 
     return Success;
 }
@@ -448,19 +441,19 @@ ProcXDGACopyArea(ClientPtr client)
     if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if(DGA_GETCLIENT(stuff->screen) != client)
+    if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGACopyAreaReq);
 
-    if(Success != DGABlitRect(stuff->screen, stuff->srcx, stuff->srcy,
-		stuff->width, stuff->height, stuff->dstx, stuff->dsty))
-	return BadMatch;
+    if (Success != DGABlitRect(stuff->screen, stuff->srcx, stuff->srcy,
+                               stuff->width, stuff->height, stuff->dstx,
+                               stuff->dsty))
+        return BadMatch;
 
     return Success;
 }
 
-
 static int
 ProcXDGACopyTransparentArea(ClientPtr client)
 {
@@ -469,19 +462,19 @@ ProcXDGACopyTransparentArea(ClientPtr client)
     if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if(DGA_GETCLIENT(stuff->screen) != client)
+    if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGACopyTransparentAreaReq);
 
-    if(Success != DGABlitTransRect(stuff->screen, stuff->srcx, stuff->srcy,
-	stuff->width, stuff->height, stuff->dstx, stuff->dsty, stuff->key))
-	return BadMatch;
+    if (Success != DGABlitTransRect(stuff->screen, stuff->srcx, stuff->srcy,
+                                    stuff->width, stuff->height, stuff->dstx,
+                                    stuff->dsty, stuff->key))
+        return BadMatch;
 
     return Success;
 }
 
-
 static int
 ProcXDGAGetViewportStatus(ClientPtr client)
 {
@@ -491,7 +484,7 @@ ProcXDGAGetViewportStatus(ClientPtr client)
     if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if(DGA_GETCLIENT(stuff->screen) != client)
+    if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGAGetViewportStatusReq);
@@ -501,7 +494,7 @@ ProcXDGAGetViewportStatus(ClientPtr client)
 
     rep.status = DGAGetViewportStatus(stuff->screen);
 
-    WriteToClient(client, sizeof(xXDGAGetViewportStatusReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXDGAGetViewportStatusReply), (char *) &rep);
     return Success;
 }
 
@@ -514,7 +507,7 @@ ProcXDGASync(ClientPtr client)
     if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if(DGA_GETCLIENT(stuff->screen) != client)
+    if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGASyncReq);
@@ -524,7 +517,7 @@ ProcXDGASync(ClientPtr client)
 
     DGASync(stuff->screen);
 
-    WriteToClient(client, sizeof(xXDGASyncReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXDGASyncReply), (char *) &rep);
     return Success;
 }
 
@@ -537,11 +530,11 @@ ProcXDGASetClientVersion(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xXDGASetClientVersionReq);
     if ((pPriv = DGA_GETPRIV(client)) == NULL) {
-	pPriv = malloc(sizeof(DGAPrivRec));
-	/* XXX Need to look into freeing this */
-	if (!pPriv)
-	    return BadAlloc;
-	DGA_SETPRIV(client, pPriv);
+        pPriv = malloc(sizeof(DGAPrivRec));
+        /* XXX Need to look into freeing this */
+        if (!pPriv)
+            return BadAlloc;
+        DGA_SETPRIV(client, pPriv);
     }
     pPriv->major = stuff->major;
     pPriv->minor = stuff->minor;
@@ -559,7 +552,7 @@ ProcXDGAChangePixmapMode(ClientPtr client)
     if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if(DGA_GETCLIENT(stuff->screen) != client)
+    if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGAChangePixmapModeReq);
@@ -570,17 +563,16 @@ ProcXDGAChangePixmapMode(ClientPtr client)
     x = stuff->x;
     y = stuff->y;
 
-    if(!DGAChangePixmapMode(stuff->screen, &x, &y, stuff->flags))
-	return BadMatch;
+    if (!DGAChangePixmapMode(stuff->screen, &x, &y, stuff->flags))
+        return BadMatch;
 
     rep.x = x;
     rep.y = y;
-    WriteToClient(client, sizeof(xXDGAChangePixmapModeReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXDGAChangePixmapModeReply), (char *) &rep);
 
     return Success;
 }
 
-
 static int
 ProcXDGACreateColormap(ClientPtr client)
 {
@@ -590,18 +582,18 @@ ProcXDGACreateColormap(ClientPtr client)
     if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if(DGA_GETCLIENT(stuff->screen) != client)
+    if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGACreateColormapReq);
 
-    if(!stuff->mode)
-	return BadValue;
+    if (!stuff->mode)
+        return BadValue;
 
     result = DGACreateColormap(stuff->screen, client, stuff->id,
-				stuff->mode, stuff->alloc);
-    if(result != Success)
-	return result;
+                               stuff->mode, stuff->alloc);
+    if (result != Success)
+        return result;
 
     return Success;
 }
@@ -614,8 +606,6 @@ ProcXDGACreateColormap(ClientPtr client)
 
 #ifdef DGA_PROTOCOL_OLD_SUPPORT
 
-
-
 static int
 ProcXF86DGAGetVideoLL(ClientPtr client)
 {
@@ -626,32 +616,32 @@ ProcXF86DGAGetVideoLL(ClientPtr client)
     char *name;
 
     if (stuff->screen >= screenInfo.numScreens)
-	return BadValue;
+        return BadValue;
 
     REQUEST_SIZE_MATCH(xXF86DGAGetVideoLLReq);
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    if(!DGAAvailable(stuff->screen))
-	return DGAErrorBase + XF86DGANoDirectVideoMode;
+    if (!DGAAvailable(stuff->screen))
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
 
-    if(!(num = DGAGetOldDGAMode(stuff->screen)))
-	return DGAErrorBase + XF86DGANoDirectVideoMode;
+    if (!(num = DGAGetOldDGAMode(stuff->screen)))
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
 
     /* get the parameters for the mode that best matches */
     DGAGetModeInfo(stuff->screen, &mode, num);
 
-    if(!DGAOpenFramebuffer(stuff->screen, &name,
-			(unsigned char**)(&rep.offset),
-			(int*)(&rep.bank_size), &offset, &flags))
-	return BadAlloc;
+    if (!DGAOpenFramebuffer(stuff->screen, &name,
+                            (unsigned char **) (&rep.offset),
+                            (int *) (&rep.bank_size), &offset, &flags))
+        return BadAlloc;
 
     rep.offset += mode.offset;
     rep.width = mode.bytesPerScanline / (mode.bitsPerPixel >> 3);
     rep.ram_size = rep.bank_size >> 10;
 
-    WriteToClient(client, SIZEOF(xXF86DGAGetVideoLLReply), (char *)&rep);
+    WriteToClient(client, SIZEOF(xXF86DGAGetVideoLLReply), (char *) &rep);
     return Success;
 }
 
@@ -662,14 +652,15 @@ ProcXF86DGADirectVideo(ClientPtr client)
     PixmapPtr pix;
     XDGAModeRec mode;
     ClientPtr owner;
+
     REQUEST(xXF86DGADirectVideoReq);
 
     if (stuff->screen >= screenInfo.numScreens)
-	return BadValue;
+        return BadValue;
     REQUEST_SIZE_MATCH(xXF86DGADirectVideoReq);
 
     if (!DGAAvailable(stuff->screen))
-	return DGAErrorBase + XF86DGANoDirectVideoMode;
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
 
     owner = DGA_GETCLIENT(stuff->screen);
 
@@ -677,34 +668,37 @@ ProcXF86DGADirectVideo(ClientPtr client)
         return DGAErrorBase + XF86DGANoDirectVideoMode;
 
     if (stuff->enable & XF86DGADirectGraphics) {
-	if(!(num = DGAGetOldDGAMode(stuff->screen)))
-	    return DGAErrorBase + XF86DGANoDirectVideoMode;
-    } else
-	num = 0;
+        if (!(num = DGAGetOldDGAMode(stuff->screen)))
+            return DGAErrorBase + XF86DGANoDirectVideoMode;
+    }
+    else
+        num = 0;
 
-    if(Success != DGASetMode(stuff->screen, num, &mode, &pix))
-	return DGAErrorBase + XF86DGAScreenNotActive;
+    if (Success != DGASetMode(stuff->screen, num, &mode, &pix))
+        return DGAErrorBase + XF86DGAScreenNotActive;
 
-    DGASetInputMode (stuff->screen,
-		     (stuff->enable & XF86DGADirectKeyb) != 0,
-		     (stuff->enable & XF86DGADirectMouse) != 0);
+    DGASetInputMode(stuff->screen,
+                    (stuff->enable & XF86DGADirectKeyb) != 0,
+                    (stuff->enable & XF86DGADirectMouse) != 0);
 
     /* We need to track the client and attach the teardown callback */
     if (stuff->enable &
-	(XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse)) {
-	if (!owner) {
-	    if (DGACallbackRefCount++ == 0)
-		AddCallback (&ClientStateCallback, DGAClientStateChange, NULL);
-	}
-
-	DGA_SETCLIENT(stuff->screen, client);
-    } else {
-	if (owner) {
-	    if (--DGACallbackRefCount == 0)
-		DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);
-	}
-
-	DGA_SETCLIENT(stuff->screen, NULL);
+        (XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse)) {
+        if (!owner) {
+            if (DGACallbackRefCount++ == 0)
+                AddCallback(&ClientStateCallback, DGAClientStateChange, NULL);
+        }
+
+        DGA_SETCLIENT(stuff->screen, client);
+    }
+    else {
+        if (owner) {
+            if (--DGACallbackRefCount == 0)
+                DeleteCallback(&ClientStateCallback, DGAClientStateChange,
+                               NULL);
+        }
+
+        DGA_SETCLIENT(stuff->screen, NULL);
     }
 
     return Success;
@@ -715,11 +709,12 @@ ProcXF86DGAGetViewPortSize(ClientPtr client)
 {
     int num;
     XDGAModeRec mode;
+
     REQUEST(xXF86DGAGetViewPortSizeReq);
     xXF86DGAGetViewPortSizeReply rep;
 
     if (stuff->screen >= screenInfo.numScreens)
-	return BadValue;
+        return BadValue;
 
     REQUEST_SIZE_MATCH(xXF86DGAGetViewPortSizeReq);
     rep.type = X_Reply;
@@ -727,17 +722,17 @@ ProcXF86DGAGetViewPortSize(ClientPtr client)
     rep.sequenceNumber = client->sequence;
 
     if (!DGAAvailable(stuff->screen))
-	return DGAErrorBase + XF86DGANoDirectVideoMode;
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
 
-    if(!(num = DGAGetOldDGAMode(stuff->screen)))
-	return DGAErrorBase + XF86DGANoDirectVideoMode;
+    if (!(num = DGAGetOldDGAMode(stuff->screen)))
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
 
     DGAGetModeInfo(stuff->screen, &mode, num);
 
     rep.width = mode.viewportWidth;
     rep.height = mode.viewportHeight;
 
-    WriteToClient(client, SIZEOF(xXF86DGAGetViewPortSizeReply), (char *)&rep);
+    WriteToClient(client, SIZEOF(xXF86DGAGetViewPortSizeReply), (char *) &rep);
     return Success;
 }
 
@@ -747,7 +742,7 @@ ProcXF86DGASetViewPort(ClientPtr client)
     REQUEST(xXF86DGASetViewPortReq);
 
     if (stuff->screen >= screenInfo.numScreens)
-	return BadValue;
+        return BadValue;
 
     if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
@@ -755,14 +750,14 @@ ProcXF86DGASetViewPort(ClientPtr client)
     REQUEST_SIZE_MATCH(xXF86DGASetViewPortReq);
 
     if (!DGAAvailable(stuff->screen))
-	return DGAErrorBase + XF86DGANoDirectVideoMode;
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
 
     if (!DGAActive(stuff->screen))
-	return DGAErrorBase + XF86DGADirectNotActivated;
+        return DGAErrorBase + XF86DGADirectNotActivated;
 
     if (DGASetViewport(stuff->screen, stuff->x, stuff->y, DGA_FLIP_RETRACE)
-		!= Success)
-	return DGAErrorBase + XF86DGADirectNotActivated;
+        != Success)
+        return DGAErrorBase + XF86DGADirectNotActivated;
 
     return Success;
 }
@@ -774,26 +769,25 @@ ProcXF86DGAGetVidPage(ClientPtr client)
     xXF86DGAGetVidPageReply rep;
 
     if (stuff->screen >= screenInfo.numScreens)
-	return BadValue;
+        return BadValue;
 
     REQUEST_SIZE_MATCH(xXF86DGAGetVidPageReq);
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    rep.vpage = 0;  /* silently fail */
+    rep.vpage = 0;              /* silently fail */
 
-    WriteToClient(client, SIZEOF(xXF86DGAGetVidPageReply), (char *)&rep);
+    WriteToClient(client, SIZEOF(xXF86DGAGetVidPageReply), (char *) &rep);
     return Success;
 }
 
-
 static int
 ProcXF86DGASetVidPage(ClientPtr client)
 {
     REQUEST(xXF86DGASetVidPageReq);
 
     if (stuff->screen >= screenInfo.numScreens)
-	return BadValue;
+        return BadValue;
 
     REQUEST_SIZE_MATCH(xXF86DGASetVidPageReq);
 
@@ -802,16 +796,16 @@ ProcXF86DGASetVidPage(ClientPtr client)
     return Success;
 }
 
-
 static int
 ProcXF86DGAInstallColormap(ClientPtr client)
 {
     ColormapPtr pcmp;
     int rc;
+
     REQUEST(xXF86DGAInstallColormapReq);
 
     if (stuff->screen >= screenInfo.numScreens)
-	return BadValue;
+        return BadValue;
 
     if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
@@ -819,14 +813,15 @@ ProcXF86DGAInstallColormap(ClientPtr client)
     REQUEST_SIZE_MATCH(xXF86DGAInstallColormapReq);
 
     if (!DGAActive(stuff->screen))
-	return DGAErrorBase + XF86DGADirectNotActivated;
+        return DGAErrorBase + XF86DGADirectNotActivated;
 
-    rc = dixLookupResourceByType((pointer *)&pcmp, stuff->id, RT_COLORMAP,
-				 client, DixInstallAccess);
+    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->id, RT_COLORMAP,
+                                 client, DixInstallAccess);
     if (rc == Success) {
-	DGAInstallCmap(pcmp);
+        DGAInstallCmap(pcmp);
         return Success;
-    } else {
+    }
+    else {
         return rc;
     }
 }
@@ -838,7 +833,7 @@ ProcXF86DGAQueryDirectVideo(ClientPtr client)
     xXF86DGAQueryDirectVideoReply rep;
 
     if (stuff->screen >= screenInfo.numScreens)
-	return BadValue;
+        return BadValue;
 
     REQUEST_SIZE_MATCH(xXF86DGAQueryDirectVideoReq);
     rep.type = X_Reply;
@@ -847,9 +842,9 @@ ProcXF86DGAQueryDirectVideo(ClientPtr client)
     rep.flags = 0;
 
     if (DGAAvailable(stuff->screen))
-	rep.flags = XF86DGADirectPresent;
+        rep.flags = XF86DGADirectPresent;
 
-    WriteToClient(client, SIZEOF(xXF86DGAQueryDirectVideoReply), (char *)&rep);
+    WriteToClient(client, SIZEOF(xXF86DGAQueryDirectVideoReply), (char *) &rep);
     return Success;
 }
 
@@ -860,7 +855,7 @@ ProcXF86DGAViewPortChanged(ClientPtr client)
     xXF86DGAViewPortChangedReply rep;
 
     if (stuff->screen >= screenInfo.numScreens)
-	return BadValue;
+        return BadValue;
 
     if (DGA_GETCLIENT(stuff->screen) != client)
         return DGAErrorBase + XF86DGADirectNotActivated;
@@ -868,23 +863,23 @@ ProcXF86DGAViewPortChanged(ClientPtr client)
     REQUEST_SIZE_MATCH(xXF86DGAViewPortChangedReq);
 
     if (!DGAActive(stuff->screen))
-	return DGAErrorBase + XF86DGADirectNotActivated;
+        return DGAErrorBase + XF86DGADirectNotActivated;
 
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
     rep.result = 1;
 
-    WriteToClient(client, SIZEOF(xXF86DGAViewPortChangedReply), (char *)&rep);
+    WriteToClient(client, SIZEOF(xXF86DGAViewPortChangedReply), (char *) &rep);
     return Success;
 }
 
-#endif /* DGA_PROTOCOL_OLD_SUPPORT */
+#endif                          /* DGA_PROTOCOL_OLD_SUPPORT */
 
 static int
-SProcXDGADispatch (ClientPtr client)
+SProcXDGADispatch(ClientPtr client)
 {
-   return DGAErrorBase + XF86DGAClientNotLocal;
+    return DGAErrorBase + XF86DGAClientNotLocal;
 }
 
 #if 0
@@ -924,112 +919,111 @@ static char *dgaMinor[] = {
 #endif
 
 static int
-ProcXDGADispatch (ClientPtr client)
+ProcXDGADispatch(ClientPtr client)
 {
     REQUEST(xReq);
 
     if (!LocalClient(client))
-	return DGAErrorBase + XF86DGAClientNotLocal;
+        return DGAErrorBase + XF86DGAClientNotLocal;
 
 #ifdef DGA_REQ_DEBUG
     if (stuff->data <= X_XDGACreateColormap)
-	fprintf (stderr, "    DGA %s\n", dgaMinor[stuff->data]);
+        fprintf(stderr, "    DGA %s\n", dgaMinor[stuff->data]);
 #endif
 
-    switch (stuff->data){
-    /*
-     * DGA2 Protocol
-     */
+    switch (stuff->data) {
+        /*
+         * DGA2 Protocol
+         */
     case X_XDGAQueryVersion:
-	return ProcXDGAQueryVersion(client);
+        return ProcXDGAQueryVersion(client);
     case X_XDGAQueryModes:
-	return ProcXDGAQueryModes(client);
+        return ProcXDGAQueryModes(client);
     case X_XDGASetMode:
-	return ProcXDGASetMode(client);
+        return ProcXDGASetMode(client);
     case X_XDGAOpenFramebuffer:
-	return ProcXDGAOpenFramebuffer(client);
+        return ProcXDGAOpenFramebuffer(client);
     case X_XDGACloseFramebuffer:
-	return ProcXDGACloseFramebuffer(client);
+        return ProcXDGACloseFramebuffer(client);
     case X_XDGASetViewport:
-	return ProcXDGASetViewport(client);
+        return ProcXDGASetViewport(client);
     case X_XDGAInstallColormap:
-	return ProcXDGAInstallColormap(client);
+        return ProcXDGAInstallColormap(client);
     case X_XDGASelectInput:
-	return ProcXDGASelectInput(client);
+        return ProcXDGASelectInput(client);
     case X_XDGAFillRectangle:
-	return ProcXDGAFillRectangle(client);
+        return ProcXDGAFillRectangle(client);
     case X_XDGACopyArea:
-	return ProcXDGACopyArea(client);
+        return ProcXDGACopyArea(client);
     case X_XDGACopyTransparentArea:
-	return ProcXDGACopyTransparentArea(client);
+        return ProcXDGACopyTransparentArea(client);
     case X_XDGAGetViewportStatus:
-	return ProcXDGAGetViewportStatus(client);
+        return ProcXDGAGetViewportStatus(client);
     case X_XDGASync:
-	return ProcXDGASync(client);
+        return ProcXDGASync(client);
     case X_XDGASetClientVersion:
-	return ProcXDGASetClientVersion(client);
+        return ProcXDGASetClientVersion(client);
     case X_XDGAChangePixmapMode:
-	return ProcXDGAChangePixmapMode(client);
+        return ProcXDGAChangePixmapMode(client);
     case X_XDGACreateColormap:
-	return ProcXDGACreateColormap(client);
-    /*
-     * Old DGA Protocol
-     */
+        return ProcXDGACreateColormap(client);
+        /*
+         * Old DGA Protocol
+         */
 #ifdef DGA_PROTOCOL_OLD_SUPPORT
     case X_XF86DGAGetVideoLL:
-	return ProcXF86DGAGetVideoLL(client);
+        return ProcXF86DGAGetVideoLL(client);
     case X_XF86DGADirectVideo:
-	return ProcXF86DGADirectVideo(client);
+        return ProcXF86DGADirectVideo(client);
     case X_XF86DGAGetViewPortSize:
-	return ProcXF86DGAGetViewPortSize(client);
+        return ProcXF86DGAGetViewPortSize(client);
     case X_XF86DGASetViewPort:
-	return ProcXF86DGASetViewPort(client);
+        return ProcXF86DGASetViewPort(client);
     case X_XF86DGAGetVidPage:
-	return ProcXF86DGAGetVidPage(client);
+        return ProcXF86DGAGetVidPage(client);
     case X_XF86DGASetVidPage:
-	return ProcXF86DGASetVidPage(client);
+        return ProcXF86DGASetVidPage(client);
     case X_XF86DGAInstallColormap:
-	return ProcXF86DGAInstallColormap(client);
+        return ProcXF86DGAInstallColormap(client);
     case X_XF86DGAQueryDirectVideo:
-	return ProcXF86DGAQueryDirectVideo(client);
+        return ProcXF86DGAQueryDirectVideo(client);
     case X_XF86DGAViewPortChanged:
-	return ProcXF86DGAViewPortChanged(client);
-#endif /* DGA_PROTOCOL_OLD_SUPPORT */
+        return ProcXF86DGAViewPortChanged(client);
+#endif                          /* DGA_PROTOCOL_OLD_SUPPORT */
     default:
-	return BadRequest;
+        return BadRequest;
     }
 }
 
 void
 XFree86DGARegister(INITARGS)
 {
-  XDGAEventBase = &DGAEventBase;
+    XDGAEventBase = &DGAEventBase;
 }
 
 void
 XFree86DGAExtensionInit(INITARGS)
 {
-    ExtensionEntry* extEntry;
+    ExtensionEntry *extEntry;
 
     if (!dixRegisterPrivateKey(&DGAClientPrivateKeyRec, PRIVATE_CLIENT, 0))
-	return;
+        return;
 
     if (!dixRegisterPrivateKey(&DGAScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
-	return;
+        return;
 
     if ((extEntry = AddExtension(XF86DGANAME,
-				XF86DGANumberEvents,
-				XF86DGANumberErrors,
-				ProcXDGADispatch,
-				SProcXDGADispatch,
-				XDGAResetProc,
-				StandardMinorOpcode))) {
-	int i;
-
-	DGAReqCode = (unsigned char)extEntry->base;
-	DGAErrorBase = extEntry->errorBase;
-	DGAEventBase = extEntry->eventBase;
-	for (i = KeyPress; i <= MotionNotify; i++)
-	    SetCriticalEvent (DGAEventBase + i);
+                                 XF86DGANumberEvents,
+                                 XF86DGANumberErrors,
+                                 ProcXDGADispatch,
+                                 SProcXDGADispatch,
+                                 XDGAResetProc, StandardMinorOpcode))) {
+        int i;
+
+        DGAReqCode = (unsigned char) extEntry->base;
+        DGAErrorBase = extEntry->errorBase;
+        DGAEventBase = extEntry->eventBase;
+        for (i = KeyPress; i <= MotionNotify; i++)
+            SetCriticalEvent(DGAEventBase + i);
     }
 }
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c b/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
index 6d3d5fcbc..6e2a8e9b2 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -52,12 +52,13 @@ from Kaleb S. KEITHLEY
 
 static int VidModeErrorBase;
 static DevPrivateKeyRec VidModeClientPrivateKeyRec;
+
 #define VidModeClientPrivateKey (&VidModeClientPrivateKeyRec)
 
 /* This holds the client's version information */
 typedef struct {
-    int		major;
-    int		minor;
+    int major;
+    int minor;
 } VidModePrivRec, *VidModePrivPtr;
 
 #define VM_GETPRIV(c) ((VidModePrivPtr) \
@@ -65,7 +66,6 @@ typedef struct {
 #define VM_SETPRIV(c,p) \
     dixSetPrivate(&(c)->devPrivates, VidModeClientPrivateKey, p)
 
-
 #if 0
 static unsigned char XF86VidModeReqCode = 0;
 #endif
@@ -76,30 +76,30 @@ static unsigned char XF86VidModeReqCode = 0;
 static int XF86VidModeEventBase = 0;
 
 static void SXF86VidModeNotifyEvent();
-    xXF86VidModeNotifyEvent * /* from */,
-    xXF86VidModeNotifyEvent * /* to */
-);
+xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent *        /* to */
+    );
 
-static RESTYPE EventType;	/* resource type for event masks */
+static RESTYPE EventType;       /* resource type for event masks */
 
 typedef struct _XF86VidModeEvent *XF86VidModeEventPtr;
 
 typedef struct _XF86VidModeEvent {
-    XF86VidModeEventPtr	next;
-    ClientPtr		client;
-    ScreenPtr		screen;
-    XID			resource;
-    CARD32		mask;
+    XF86VidModeEventPtr next;
+    ClientPtr client;
+    ScreenPtr screen;
+    XID resource;
+    CARD32 mask;
 } XF86VidModeEventRec;
 
 static int XF86VidModeFreeEvents();
 
 typedef struct _XF86VidModeScreenPrivate {
-    XF86VidModeEventPtr	events;
-    Bool		hasWindow;
+    XF86VidModeEventPtr events;
+    Bool hasWindow;
 } XF86VidModeScreenPrivateRec, *XF86VidModeScreenPrivatePtr;
 
 static DevPrivateKeyRec ScreenPrivateKeyRec;
+
 #define ScreenPrivateKey (&ScreenPrivateKeyRec)
 
 #define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr) \
@@ -112,198 +112,181 @@ static DevPrivateKeyRec ScreenPrivateKeyRec;
 #endif
 
 #ifdef DEBUG
-# define DEBUG_P(x) ErrorF(x"\n");
+#define DEBUG_P(x) ErrorF(x"\n");
 #else
-# define DEBUG_P(x) /**/
+#define DEBUG_P(x) /**/
 #endif
-
-static int
-ClientMajorVersion(ClientPtr client)
-{
+    static int
+ ClientMajorVersion(ClientPtr client) {
     VidModePrivPtr pPriv;
 
-    pPriv = VM_GETPRIV(client);
+     pPriv = VM_GETPRIV(client);
     if (!pPriv)
-	return 0;
+         return 0;
     else
-	return pPriv->major;
+         return pPriv->major;
 }
-
 #ifdef XF86VIDMODE_EVENTS
 static void
-CheckScreenPrivate (pScreen)
-    ScreenPtr	pScreen;
+ CheckScreenPrivate(pScreen)
+ScreenPtr
+    pScreen;
 {
-    SetupScreen (pScreen);
+    SetupScreen(pScreen);
 
     if (!pPriv)
-	return;
+        return;
     if (!pPriv->events && !pPriv->hasWindow) {
-	free(pPriv);
-	SetScreenPrivate (pScreen, NULL);
+        free(pPriv);
+        SetScreenPrivate(pScreen, NULL);
     }
 }
-    
-static XF86VidModeScreenPrivatePtr
-MakeScreenPrivate (pScreen)
-    ScreenPtr	pScreen;
+
+static XF86VidModeScreenPrivatePtr MakeScreenPrivate(pScreen)
+ScreenPtr
+    pScreen;
 {
-    SetupScreen (pScreen);
+    SetupScreen(pScreen);
 
     if (pPriv)
-	return pPriv;
-    pPriv = New (XF86VidModeScreenPrivateRec);
+        return pPriv;
+    pPriv = New(XF86VidModeScreenPrivateRec);
     if (!pPriv)
-	return 0;
+        return 0;
     pPriv->events = 0;
     pPriv->hasWindow = FALSE;
-    SetScreenPrivate (pScreen, pPriv);
+    SetScreenPrivate(pScreen, pPriv);
     return pPriv;
 }
 
 static unsigned long
-getEventMask (ScreenPtr pScreen, ClientPtr client)
-{
+ getEventMask(ScreenPtr pScreen, ClientPtr client) {
     SetupScreen(pScreen);
     XF86VidModeEventPtr pEv;
 
     if (!pPriv)
-	return 0;
+         return 0;
     for (pEv = pPriv->events; pEv; pEv = pEv->next)
-	if (pEv->client == client)
-	    return pEv->mask;
-    return 0;
-}
-
-static Bool
-setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask)
-{
+        if (pEv->client == client)
+            return pEv->mask;
+     return 0;
+} static Bool
+ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) {
     SetupScreen(pScreen);
     XF86VidModeEventPtr pEv, *pPrev;
 
-    if (getEventMask (pScreen, client) == mask)
-	return TRUE;
+    if (getEventMask(pScreen, client) == mask)
+        return TRUE;
     if (!pPriv) {
-	pPriv = MakeScreenPrivate (pScreen);
-	if (!pPriv)
-	    return FALSE;
-    }
-    for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
-	if (pEv->client == client)
-	    break;
+        pPriv = MakeScreenPrivate(pScreen);
+        if (!pPriv)
+            return FALSE;
+    } for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
+        if (pEv->client == client)
+            break;
     if (mask == 0) {
-	*pPrev = pEv->next;
-	free(pEv);
-	CheckScreenPrivate (pScreen);
-    } else {
-	if (!pEv) {
-	    pEv = New (ScreenSaverEventRec);
-	    if (!pEv) {
-		CheckScreenPrivate (pScreen);
-		return FALSE;
-	    }
-	    *pPrev = pEv;
-	    pEv->next = NULL;
-	    pEv->client = client;
-	    pEv->screen = pScreen;
-	    pEv->resource = FakeClientID (client->index);
-	}
-	pEv->mask = mask;
+        *pPrev = pEv->next;
+        free(pEv);
+        CheckScreenPrivate(pScreen);
+    }
+    else {
+        if (!pEv) {
+            pEv = New(ScreenSaverEventRec);
+            if (!pEv) {
+                CheckScreenPrivate(pScreen);
+                return FALSE;
+            }
+            *pPrev = pEv;
+            pEv->next = NULL;
+            pEv->client = client;
+            pEv->screen = pScreen;
+            pEv->resource = FakeClientID(client->index);
+        }
+        pEv->mask = mask;
     }
     return TRUE;
 }
 
 static int
-XF86VidModeFreeEvents(pointer value, XID id)
-{
-    XF86VidModeEventPtr	pOld = (XF86VidModeEventPtr)value;
+ XF86VidModeFreeEvents(pointer value, XID id) {
+    XF86VidModeEventPtr pOld = (XF86VidModeEventPtr) value;
     ScreenPtr pScreen = pOld->screen;
-    SetupScreen (pScreen);
-    XF86VidModeEventPtr	pEv, *pPrev;
+     SetupScreen(pScreen);
+    XF86VidModeEventPtr pEv, *pPrev;
 
     if (!pPriv)
-	return TRUE;
+         return TRUE;
     for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
-	if (pEv == pOld)
-	    break;
+        if (pEv == pOld)
+            break;
     if (!pEv)
-	return TRUE;
+         return TRUE;
     *pPrev = pEv->next;
-    free(pEv);
-    CheckScreenPrivate (pScreen);
-    return TRUE;
-}
-
-static void
-SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced)
-{
-    XF86VidModeScreenPrivatePtr	pPriv;
-    XF86VidModeEventPtr		pEv;
-    unsigned long		mask;
-    xXF86VidModeNotifyEvent	ev;
-    int				kind;
-
-    UpdateCurrentTimeIf ();
-    mask = XF86VidModeNotifyMask;
-    pScreen = screenInfo.screens[pScreen->myNum];
-    pPriv = GetScreenPrivate(pScreen);
+     free(pEv);
+     CheckScreenPrivate(pScreen);
+     return TRUE;
+} static void
+ SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced) {
+    XF86VidModeScreenPrivatePtr pPriv;
+    XF86VidModeEventPtr pEv;
+    unsigned long mask;
+    xXF86VidModeNotifyEvent ev;
+    int kind;
+
+     UpdateCurrentTimeIf();
+     mask = XF86VidModeNotifyMask;
+     pScreen = screenInfo.screens[pScreen->myNum];
+     pPriv = GetScreenPrivate(pScreen);
     if (!pPriv)
-	return;
-    kind = XF86VidModeModeChange;
-    for (pEv = pPriv->events; pEv; pEv = pEv->next)
-    {
-	if (!(pEv->mask & mask))
-	    continue;
-	ev.type = XF86VidModeNotify + XF86VidModeEventBase;
-	ev.state = state;
-	ev.timestamp = currentTime.milliseconds;
-	ev.root = pScreen->root->drawable.id;
-	ev.kind = kind;
-	ev.forced = forced;
-	WriteEventsToClient (pEv->client, 1, (xEvent *) &ev);
-    }
-}
-
-static void
-SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent *from,
-			xXF86VidModeNotifyEvent *to)
-{
+         return;
+     kind = XF86VidModeModeChange;
+    for (pEv = pPriv->events; pEv; pEv = pEv->next) {
+        if (!(pEv->mask & mask))
+            continue;
+        ev.type = XF86VidModeNotify + XF86VidModeEventBase;
+        ev.state = state;
+        ev.timestamp = currentTime.milliseconds;
+        ev.root = pScreen->root->drawable.id;
+        ev.kind = kind;
+        ev.forced = forced;
+        WriteEventsToClient(pEv->client, 1, (xEvent *) &ev);
+}} static void
+ SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from,
+                         xXF86VidModeNotifyEvent * to) {
     to->type = from->type;
     to->state = from->state;
-    cpswaps (from->sequenceNumber, to->sequenceNumber);
-    cpswapl (from->timestamp, to->timestamp);    
-    cpswapl (from->root, to->root);    
+    cpswaps(from->sequenceNumber, to->sequenceNumber);
+    cpswapl(from->timestamp, to->timestamp);
+    cpswapl(from->root, to->root);
     to->kind = from->kind;
     to->forced = from->forced;
 }
 #endif
-	
+
 static int
-ProcXF86VidModeQueryVersion(ClientPtr client)
-{
+ ProcXF86VidModeQueryVersion(ClientPtr client) {
     xXF86VidModeQueryVersionReply rep;
 
-    DEBUG_P("XF86VidModeQueryVersion");
+     DEBUG_P("XF86VidModeQueryVersion");
 
-    REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq);
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION;
-    rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION;
+     REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq);
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
+     rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION;
+     rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION;
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swaps(&rep.majorVersion);
-	swaps(&rep.minorVersion);
-    }
-    WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), (char *)&rep);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swaps(&rep.majorVersion);
+        swaps(&rep.minorVersion);
+    } WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply),
+                    (char *) &rep);
     return Success;
 }
 
 static int
-ProcXF86VidModeGetModeLine(ClientPtr client)
-{
+ ProcXF86VidModeGetModeLine(ClientPtr client) {
     REQUEST(xXF86VidModeGetModeLineReq);
     xXF86VidModeGetModeLineReply rep;
     xXF86OldVidModeGetModeLineReply oldrep;
@@ -311,25 +294,26 @@ ProcXF86VidModeGetModeLine(ClientPtr client)
     int dotClock;
     int ver;
 
-    DEBUG_P("XF86VidModeGetModeline");
+     DEBUG_P("XF86VidModeGetModeline");
 
-    ver = ClientMajorVersion(client);
-    REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
-    rep.type = X_Reply;
+     ver = ClientMajorVersion(client);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
+     rep.type = X_Reply;
     if (ver < 2) {
-	rep.length = bytes_to_int32(SIZEOF(xXF86OldVidModeGetModeLineReply) -
-			SIZEOF(xGenericReply));
-    } else {
-	rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetModeLineReply) -
-			SIZEOF(xGenericReply));
+        rep.length = bytes_to_int32(SIZEOF(xXF86OldVidModeGetModeLineReply) -
+                                    SIZEOF(xGenericReply));
+    }
+    else {
+        rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetModeLineReply) -
+                                    SIZEOF(xGenericReply));
     }
     rep.sequenceNumber = client->sequence;
 
-    if(stuff->screen >= screenInfo.numScreens)
+    if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
     if (!VidModeGetCurrentModeline(stuff->screen, &mode, &dotClock))
-	return BadValue;
+        return BadValue;
 
     rep.dotclock = dotClock;
     rep.hdisplay = VidModeGetModeValue(mode, VIDMODE_H_DISPLAY);
@@ -344,16 +328,15 @@ ProcXF86VidModeGetModeLine(ClientPtr client)
     rep.flags = VidModeGetModeValue(mode, VIDMODE_FLAGS);
 
     if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-	ErrorF("GetModeLine - scrn: %d clock: %ld\n",
-	       stuff->screen, (unsigned long)rep.dotclock);
-	ErrorF("GetModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
-	       rep.hdisplay, rep.hsyncstart,
-	       rep.hsyncend, rep.htotal);
-	ErrorF("              vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
-	       rep.vdisplay, rep.vsyncstart, rep.vsyncend,
-	       rep.vtotal, (unsigned long)rep.flags);
+        ErrorF("GetModeLine - scrn: %d clock: %ld\n",
+               stuff->screen, (unsigned long) rep.dotclock);
+        ErrorF("GetModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
+               rep.hdisplay, rep.hsyncstart, rep.hsyncend, rep.htotal);
+        ErrorF("              vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+               rep.vdisplay, rep.vsyncstart, rep.vsyncend,
+               rep.vtotal, (unsigned long) rep.flags);
     }
-    
+
     /*
      * Older servers sometimes had server privates that the VidMode 
      * extention made available. So to be compatiable pretend that
@@ -362,48 +345,48 @@ ProcXF86VidModeGetModeLine(ClientPtr client)
     rep.privsize = 0;
 
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.dotclock);
-	swaps(&rep.hdisplay);
-	swaps(&rep.hsyncstart);
-	swaps(&rep.hsyncend);
-	swaps(&rep.htotal);
-	swaps(&rep.hskew);
-	swaps(&rep.vdisplay);
-	swaps(&rep.vsyncstart);
-	swaps(&rep.vsyncend);
-	swaps(&rep.vtotal);
-	swapl(&rep.flags);
-	swapl(&rep.privsize);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.dotclock);
+        swaps(&rep.hdisplay);
+        swaps(&rep.hsyncstart);
+        swaps(&rep.hsyncend);
+        swaps(&rep.htotal);
+        swaps(&rep.hskew);
+        swaps(&rep.vdisplay);
+        swaps(&rep.vsyncstart);
+        swaps(&rep.vsyncend);
+        swaps(&rep.vtotal);
+        swapl(&rep.flags);
+        swapl(&rep.privsize);
     }
     if (ver < 2) {
-	oldrep.type = rep.type;
-	oldrep.sequenceNumber = rep.sequenceNumber;
-	oldrep.length = rep.length;
-	oldrep.dotclock = rep.dotclock;
-	oldrep.hdisplay = rep.hdisplay;
-	oldrep.hsyncstart = rep.hsyncstart;
-	oldrep.hsyncend = rep.hsyncend;
-	oldrep.htotal = rep.htotal;
-	oldrep.vdisplay = rep.vdisplay;
-	oldrep.vsyncstart = rep.vsyncstart;
-	oldrep.vsyncend = rep.vsyncend;
-	oldrep.vtotal = rep.vtotal;
-	oldrep.flags = rep.flags;
-	oldrep.privsize = rep.privsize;
-	WriteToClient(client, sizeof(xXF86OldVidModeGetModeLineReply),
-			(char *)&oldrep);
-    } else {
-	WriteToClient(client, sizeof(xXF86VidModeGetModeLineReply),
-			(char *)&rep);
+        oldrep.type = rep.type;
+        oldrep.sequenceNumber = rep.sequenceNumber;
+        oldrep.length = rep.length;
+        oldrep.dotclock = rep.dotclock;
+        oldrep.hdisplay = rep.hdisplay;
+        oldrep.hsyncstart = rep.hsyncstart;
+        oldrep.hsyncend = rep.hsyncend;
+        oldrep.htotal = rep.htotal;
+        oldrep.vdisplay = rep.vdisplay;
+        oldrep.vsyncstart = rep.vsyncstart;
+        oldrep.vsyncend = rep.vsyncend;
+        oldrep.vtotal = rep.vtotal;
+        oldrep.flags = rep.flags;
+        oldrep.privsize = rep.privsize;
+        WriteToClient(client, sizeof(xXF86OldVidModeGetModeLineReply),
+                      (char *) &oldrep);
+    }
+    else {
+        WriteToClient(client, sizeof(xXF86VidModeGetModeLineReply),
+                      (char *) &rep);
     }
     return Success;
 }
 
 static int
-ProcXF86VidModeGetAllModeLines(ClientPtr client)
-{
+ ProcXF86VidModeGetAllModeLines(ClientPtr client) {
     REQUEST(xXF86VidModeGetAllModeLinesReq);
     xXF86VidModeGetAllModeLinesReply rep;
     xXF86VidModeModeInfo mdinf;
@@ -412,85 +395,87 @@ ProcXF86VidModeGetAllModeLines(ClientPtr client)
     int modecount, dotClock;
     int ver;
 
-    DEBUG_P("XF86VidModeGetAllModelines");
+     DEBUG_P("XF86VidModeGetAllModelines");
 
-    REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
 
-    if(stuff->screen >= screenInfo.numScreens)
-        return BadValue;
+    if (stuff->screen >= screenInfo.numScreens)
+         return BadValue;
 
-    ver = ClientMajorVersion(client);
+     ver = ClientMajorVersion(client);
 
-    modecount = VidModeGetNumOfModes(stuff->screen);
+     modecount = VidModeGetNumOfModes(stuff->screen);
     if (modecount < 1)
-      return VidModeErrorBase + XF86VidModeExtensionDisabled;
+         return VidModeErrorBase + XF86VidModeExtensionDisabled;
 
     if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock))
-	return BadValue;
-    
-    rep.type = X_Reply;
-    rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) -
-		 SIZEOF(xGenericReply);
+         return BadValue;
+
+     rep.type = X_Reply;
+     rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) -
+        SIZEOF(xGenericReply);
     if (ver < 2)
-	rep.length += modecount * sizeof(xXF86OldVidModeModeInfo);
+         rep.length += modecount * sizeof(xXF86OldVidModeModeInfo);
     else
-	rep.length += modecount * sizeof(xXF86VidModeModeInfo);
-    rep.length >>= 2;
-    rep.sequenceNumber = client->sequence;
-    rep.modecount = modecount;
+         rep.length += modecount * sizeof(xXF86VidModeModeInfo);
+     rep.length >>= 2;
+     rep.sequenceNumber = client->sequence;
+     rep.modecount = modecount;
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.modecount);
-    }
-    WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply), (char *)&rep);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.modecount);
+    } WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply),
+                    (char *) &rep);
 
     do {
-	mdinf.dotclock = dotClock;
-	mdinf.hdisplay = VidModeGetModeValue(mode, VIDMODE_H_DISPLAY);
-	mdinf.hsyncstart = VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART);
-	mdinf.hsyncend = VidModeGetModeValue(mode, VIDMODE_H_SYNCEND);
-	mdinf.htotal = VidModeGetModeValue(mode, VIDMODE_H_TOTAL);
-	mdinf.hskew = VidModeGetModeValue(mode, VIDMODE_H_SKEW);
-	mdinf.vdisplay = VidModeGetModeValue(mode, VIDMODE_V_DISPLAY);
-	mdinf.vsyncstart = VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART);
-	mdinf.vsyncend = VidModeGetModeValue(mode, VIDMODE_V_SYNCEND);
-	mdinf.vtotal = VidModeGetModeValue(mode, VIDMODE_V_TOTAL);
-	mdinf.flags = VidModeGetModeValue(mode, VIDMODE_FLAGS);
-	mdinf.privsize = 0;
+        mdinf.dotclock = dotClock;
+        mdinf.hdisplay = VidModeGetModeValue(mode, VIDMODE_H_DISPLAY);
+        mdinf.hsyncstart = VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART);
+        mdinf.hsyncend = VidModeGetModeValue(mode, VIDMODE_H_SYNCEND);
+        mdinf.htotal = VidModeGetModeValue(mode, VIDMODE_H_TOTAL);
+        mdinf.hskew = VidModeGetModeValue(mode, VIDMODE_H_SKEW);
+        mdinf.vdisplay = VidModeGetModeValue(mode, VIDMODE_V_DISPLAY);
+        mdinf.vsyncstart = VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART);
+        mdinf.vsyncend = VidModeGetModeValue(mode, VIDMODE_V_SYNCEND);
+        mdinf.vtotal = VidModeGetModeValue(mode, VIDMODE_V_TOTAL);
+        mdinf.flags = VidModeGetModeValue(mode, VIDMODE_FLAGS);
+        mdinf.privsize = 0;
         if (client->swapped) {
-	    swapl(&mdinf.dotclock);
-	    swaps(&mdinf.hdisplay);
-	    swaps(&mdinf.hsyncstart);
-	    swaps(&mdinf.hsyncend);
-	    swaps(&mdinf.htotal);
-	    swapl(&mdinf.hskew);
-	    swaps(&mdinf.vdisplay);
-	    swaps(&mdinf.vsyncstart);
-	    swaps(&mdinf.vsyncend);
-	    swaps(&mdinf.vtotal);
-	    swapl(&mdinf.flags);
-	    swapl(&mdinf.privsize);
-	}
-	if (ver < 2) {
-	    oldmdinf.dotclock = mdinf.dotclock;
-	    oldmdinf.hdisplay = mdinf.hdisplay;
-	    oldmdinf.hsyncstart = mdinf.hsyncstart;
-	    oldmdinf.hsyncend = mdinf.hsyncend;
-	    oldmdinf.htotal = mdinf.htotal;
-	    oldmdinf.vdisplay = mdinf.vdisplay;
-	    oldmdinf.vsyncstart = mdinf.vsyncstart;
-	    oldmdinf.vsyncend = mdinf.vsyncend;
-	    oldmdinf.vtotal = mdinf.vtotal;
-	    oldmdinf.flags = mdinf.flags;
-	    oldmdinf.privsize = mdinf.privsize;
+            swapl(&mdinf.dotclock);
+            swaps(&mdinf.hdisplay);
+            swaps(&mdinf.hsyncstart);
+            swaps(&mdinf.hsyncend);
+            swaps(&mdinf.htotal);
+            swapl(&mdinf.hskew);
+            swaps(&mdinf.vdisplay);
+            swaps(&mdinf.vsyncstart);
+            swaps(&mdinf.vsyncend);
+            swaps(&mdinf.vtotal);
+            swapl(&mdinf.flags);
+            swapl(&mdinf.privsize);
+        }
+        if (ver < 2) {
+            oldmdinf.dotclock = mdinf.dotclock;
+            oldmdinf.hdisplay = mdinf.hdisplay;
+            oldmdinf.hsyncstart = mdinf.hsyncstart;
+            oldmdinf.hsyncend = mdinf.hsyncend;
+            oldmdinf.htotal = mdinf.htotal;
+            oldmdinf.vdisplay = mdinf.vdisplay;
+            oldmdinf.vsyncstart = mdinf.vsyncstart;
+            oldmdinf.vsyncend = mdinf.vsyncend;
+            oldmdinf.vtotal = mdinf.vtotal;
+            oldmdinf.flags = mdinf.flags;
+            oldmdinf.privsize = mdinf.privsize;
             WriteToClient(client, sizeof(xXF86OldVidModeModeInfo),
-			  (char *)&oldmdinf);
-	} else {
-            WriteToClient(client, sizeof(xXF86VidModeModeInfo), (char *)&mdinf);
-	}
+                          (char *) &oldmdinf);
+        }
+        else {
+            WriteToClient(client, sizeof(xXF86VidModeModeInfo),
+                          (char *) &mdinf);
+        }
 
-   } while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock));
+    } while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock));
 
     return Success;
 }
@@ -507,394 +492,404 @@ ProcXF86VidModeGetAllModeLines(ClientPtr client)
      && VidModeGetModeValue(mode, VIDMODE_FLAGS)  == stuff->flags )
 
 static int
-ProcXF86VidModeAddModeLine(ClientPtr client)
-{
+ ProcXF86VidModeAddModeLine(ClientPtr client) {
     REQUEST(xXF86VidModeAddModeLineReq);
     xXF86OldVidModeAddModeLineReq *oldstuff =
-			(xXF86OldVidModeAddModeLineReq *)client->requestBuffer;
+        (xXF86OldVidModeAddModeLineReq *) client->requestBuffer;
     xXF86VidModeAddModeLineReq newstuff;
     pointer mode;
     int len;
     int dotClock;
     int ver;
 
-    DEBUG_P("XF86VidModeAddModeline");
+     DEBUG_P("XF86VidModeAddModeline");
 
-    ver = ClientMajorVersion(client);
+     ver = ClientMajorVersion(client);
     if (ver < 2) {
-	/* convert from old format */
-	stuff = &newstuff;
-	stuff->length = oldstuff->length;
-	stuff->screen = oldstuff->screen;
-	stuff->dotclock = oldstuff->dotclock;
-	stuff->hdisplay = oldstuff->hdisplay;
-	stuff->hsyncstart = oldstuff->hsyncstart;
-	stuff->hsyncend = oldstuff->hsyncend;
-	stuff->htotal = oldstuff->htotal;
-	stuff->hskew = 0;
-	stuff->vdisplay = oldstuff->vdisplay;
-	stuff->vsyncstart = oldstuff->vsyncstart;
-	stuff->vsyncend = oldstuff->vsyncend;
-	stuff->vtotal = oldstuff->vtotal;
-	stuff->flags = oldstuff->flags;
-	stuff->privsize = oldstuff->privsize;
-	stuff->after_dotclock = oldstuff->after_dotclock;
-	stuff->after_hdisplay = oldstuff->after_hdisplay;
-	stuff->after_hsyncstart = oldstuff->after_hsyncstart;
-	stuff->after_hsyncend = oldstuff->after_hsyncend;
-	stuff->after_htotal = oldstuff->after_htotal;
-	stuff->after_hskew = 0;
-	stuff->after_vdisplay = oldstuff->after_vdisplay;
-	stuff->after_vsyncstart = oldstuff->after_vsyncstart;
-	stuff->after_vsyncend = oldstuff->after_vsyncend;
-	stuff->after_vtotal = oldstuff->after_vtotal;
-	stuff->after_flags = oldstuff->after_flags;
-    }
-    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-	ErrorF("AddModeLine - scrn: %d clock: %ld\n",
-		(int)stuff->screen, (unsigned long)stuff->dotclock);
-	ErrorF("AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
-		stuff->hdisplay, stuff->hsyncstart,
-		stuff->hsyncend, stuff->htotal);
-	ErrorF("              vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
-		stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend,
-		stuff->vtotal, (unsigned long)stuff->flags);
-	ErrorF("      after - scrn: %d clock: %ld\n",
-		(int)stuff->screen, (unsigned long)stuff->after_dotclock);
-	ErrorF("              hdsp: %d hbeg: %d hend: %d httl: %d\n",
-		stuff->after_hdisplay, stuff->after_hsyncstart,
-		stuff->after_hsyncend, stuff->after_htotal);
-	ErrorF("              vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
-		stuff->after_vdisplay, stuff->after_vsyncstart,
-		stuff->after_vsyncend, stuff->after_vtotal,
-		(unsigned long)stuff->after_flags);
+        /* convert from old format */
+        stuff = &newstuff;
+        stuff->length = oldstuff->length;
+        stuff->screen = oldstuff->screen;
+        stuff->dotclock = oldstuff->dotclock;
+        stuff->hdisplay = oldstuff->hdisplay;
+        stuff->hsyncstart = oldstuff->hsyncstart;
+        stuff->hsyncend = oldstuff->hsyncend;
+        stuff->htotal = oldstuff->htotal;
+        stuff->hskew = 0;
+        stuff->vdisplay = oldstuff->vdisplay;
+        stuff->vsyncstart = oldstuff->vsyncstart;
+        stuff->vsyncend = oldstuff->vsyncend;
+        stuff->vtotal = oldstuff->vtotal;
+        stuff->flags = oldstuff->flags;
+        stuff->privsize = oldstuff->privsize;
+        stuff->after_dotclock = oldstuff->after_dotclock;
+        stuff->after_hdisplay = oldstuff->after_hdisplay;
+        stuff->after_hsyncstart = oldstuff->after_hsyncstart;
+        stuff->after_hsyncend = oldstuff->after_hsyncend;
+        stuff->after_htotal = oldstuff->after_htotal;
+        stuff->after_hskew = 0;
+        stuff->after_vdisplay = oldstuff->after_vdisplay;
+        stuff->after_vsyncstart = oldstuff->after_vsyncstart;
+        stuff->after_vsyncend = oldstuff->after_vsyncend;
+        stuff->after_vtotal = oldstuff->after_vtotal;
+        stuff->after_flags = oldstuff->after_flags;
+    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+        ErrorF("AddModeLine - scrn: %d clock: %ld\n",
+               (int) stuff->screen, (unsigned long) stuff->dotclock);
+        ErrorF("AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
+               stuff->hdisplay, stuff->hsyncstart,
+               stuff->hsyncend, stuff->htotal);
+        ErrorF("              vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+               stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend,
+               stuff->vtotal, (unsigned long) stuff->flags);
+        ErrorF("      after - scrn: %d clock: %ld\n",
+               (int) stuff->screen, (unsigned long) stuff->after_dotclock);
+        ErrorF("              hdsp: %d hbeg: %d hend: %d httl: %d\n",
+               stuff->after_hdisplay, stuff->after_hsyncstart,
+               stuff->after_hsyncend, stuff->after_htotal);
+        ErrorF("              vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+               stuff->after_vdisplay, stuff->after_vsyncstart,
+               stuff->after_vsyncend, stuff->after_vtotal,
+               (unsigned long) stuff->after_flags);
     }
 
     if (ver < 2) {
-	REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq);
-	len = client->req_len - bytes_to_int32(sizeof(xXF86OldVidModeAddModeLineReq));
-    } else {
-	REQUEST_AT_LEAST_SIZE(xXF86VidModeAddModeLineReq);
-	len = client->req_len - bytes_to_int32(sizeof(xXF86VidModeAddModeLineReq));
+        REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq);
+        len =
+            client->req_len -
+            bytes_to_int32(sizeof(xXF86OldVidModeAddModeLineReq));
+    }
+    else {
+        REQUEST_AT_LEAST_SIZE(xXF86VidModeAddModeLineReq);
+        len =
+            client->req_len -
+            bytes_to_int32(sizeof(xXF86VidModeAddModeLineReq));
     }
     if (len != stuff->privsize)
-	return BadLength;
+        return BadLength;
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
 
-    if(stuff->screen >= screenInfo.numScreens)
+    if (stuff->hsyncstart < stuff->hdisplay ||
+        stuff->hsyncend < stuff->hsyncstart ||
+        stuff->htotal < stuff->hsyncend ||
+        stuff->vsyncstart < stuff->vdisplay ||
+        stuff->vsyncend < stuff->vsyncstart || stuff->vtotal < stuff->vsyncend)
         return BadValue;
 
-    if (stuff->hsyncstart < stuff->hdisplay   ||
-	stuff->hsyncend   < stuff->hsyncstart ||
-	stuff->htotal     < stuff->hsyncend   ||
-	stuff->vsyncstart < stuff->vdisplay   ||
-	stuff->vsyncend   < stuff->vsyncstart ||
-	stuff->vtotal     < stuff->vsyncend)
-	return BadValue;
-
-    if (stuff->after_hsyncstart < stuff->after_hdisplay   ||
-	stuff->after_hsyncend   < stuff->after_hsyncstart ||
-	stuff->after_htotal     < stuff->after_hsyncend   ||
-	stuff->after_vsyncstart < stuff->after_vdisplay   ||
-	stuff->after_vsyncend   < stuff->after_vsyncstart ||
-	stuff->after_vtotal     < stuff->after_vsyncend)
-	return BadValue;
+    if (stuff->after_hsyncstart < stuff->after_hdisplay ||
+        stuff->after_hsyncend < stuff->after_hsyncstart ||
+        stuff->after_htotal < stuff->after_hsyncend ||
+        stuff->after_vsyncstart < stuff->after_vdisplay ||
+        stuff->after_vsyncend < stuff->after_vsyncstart ||
+        stuff->after_vtotal < stuff->after_vsyncend)
+        return BadValue;
 
     if (stuff->after_htotal != 0 || stuff->after_vtotal != 0) {
-	Bool found = FALSE;
-	if (VidModeGetFirstModeline(stuff->screen, &mode, &dotClock)) {
-	    do {
-		if ((VidModeGetDotClock(stuff->screen, stuff->dotclock)
-			== dotClock) && MODEMATCH(mode, stuff)) {
-		    found = TRUE;
-		    break;
-		}
-	    } while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock));
-	}
-	if (!found)
-	    return BadValue;
+        Bool found = FALSE;
+
+        if (VidModeGetFirstModeline(stuff->screen, &mode, &dotClock)) {
+            do {
+                if ((VidModeGetDotClock(stuff->screen, stuff->dotclock)
+                     == dotClock) && MODEMATCH(mode, stuff)) {
+                    found = TRUE;
+                    break;
+                }
+            } while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock));
+        }
+        if (!found)
+            return BadValue;
     }
 
-
     mode = VidModeCreateMode();
     if (mode == NULL)
-	return BadValue;
+        return BadValue;
 
     VidModeSetModeValue(mode, VIDMODE_CLOCK, stuff->dotclock);
     VidModeSetModeValue(mode, VIDMODE_H_DISPLAY, stuff->hdisplay);
-    VidModeSetModeValue(mode, VIDMODE_H_SYNCSTART, stuff->hsyncstart); 
+    VidModeSetModeValue(mode, VIDMODE_H_SYNCSTART, stuff->hsyncstart);
     VidModeSetModeValue(mode, VIDMODE_H_SYNCEND, stuff->hsyncend);
     VidModeSetModeValue(mode, VIDMODE_H_TOTAL, stuff->htotal);
     VidModeSetModeValue(mode, VIDMODE_H_SKEW, stuff->hskew);
     VidModeSetModeValue(mode, VIDMODE_V_DISPLAY, stuff->vdisplay);
-    VidModeSetModeValue(mode, VIDMODE_V_SYNCSTART, stuff->vsyncstart); 
+    VidModeSetModeValue(mode, VIDMODE_V_SYNCSTART, stuff->vsyncstart);
     VidModeSetModeValue(mode, VIDMODE_V_SYNCEND, stuff->vsyncend);
     VidModeSetModeValue(mode, VIDMODE_V_TOTAL, stuff->vtotal);
     VidModeSetModeValue(mode, VIDMODE_FLAGS, stuff->flags);
 
     if (stuff->privsize)
-	ErrorF("AddModeLine - Privates in request have been ignored\n");
+        ErrorF("AddModeLine - Privates in request have been ignored\n");
 
     /* Check that the mode is consistent with the monitor specs */
     switch (VidModeCheckModeForMonitor(stuff->screen, mode)) {
-    	case MODE_OK:
-	    break;
-	case MODE_HSYNC:
-	case MODE_H_ILLEGAL:
-	    free(mode);
-	    return VidModeErrorBase + XF86VidModeBadHTimings;
-	case MODE_VSYNC:
-	case MODE_V_ILLEGAL:
-	    free(mode);
-	    return VidModeErrorBase + XF86VidModeBadVTimings;
-	default:
-	    free(mode);
-	    return VidModeErrorBase + XF86VidModeModeUnsuitable;
+    case MODE_OK:
+        break;
+    case MODE_HSYNC:
+    case MODE_H_ILLEGAL:
+        free(mode);
+        return VidModeErrorBase + XF86VidModeBadHTimings;
+    case MODE_VSYNC:
+    case MODE_V_ILLEGAL:
+        free(mode);
+        return VidModeErrorBase + XF86VidModeBadVTimings;
+    default:
+        free(mode);
+        return VidModeErrorBase + XF86VidModeModeUnsuitable;
     }
 
     /* Check that the driver is happy with the mode */
     if (VidModeCheckModeForDriver(stuff->screen, mode) != MODE_OK) {
-	free(mode);
-	return VidModeErrorBase + XF86VidModeModeUnsuitable;
+        free(mode);
+        return VidModeErrorBase + XF86VidModeModeUnsuitable;
     }
 
     VidModeSetCrtcForMode(stuff->screen, mode);
-    
+
     VidModeAddModeline(stuff->screen, mode);
-    
+
     if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
-	ErrorF("AddModeLine - Succeeded\n");
+        ErrorF("AddModeLine - Succeeded\n");
     return Success;
 }
 
 static int
-ProcXF86VidModeDeleteModeLine(ClientPtr client)
-{
+ ProcXF86VidModeDeleteModeLine(ClientPtr client) {
     REQUEST(xXF86VidModeDeleteModeLineReq);
     xXF86OldVidModeDeleteModeLineReq *oldstuff =
-		(xXF86OldVidModeDeleteModeLineReq *)client->requestBuffer;
+        (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer;
     xXF86VidModeDeleteModeLineReq newstuff;
     pointer mode;
     int len, dotClock;
     int ver;
 
-    DEBUG_P("XF86VidModeDeleteModeline");
+     DEBUG_P("XF86VidModeDeleteModeline");
 
-    ver = ClientMajorVersion(client);
+     ver = ClientMajorVersion(client);
     if (ver < 2) {
-	/* convert from old format */
-	stuff = &newstuff;
-	stuff->length = oldstuff->length;
-	stuff->screen = oldstuff->screen;
-	stuff->dotclock = oldstuff->dotclock;
-	stuff->hdisplay = oldstuff->hdisplay;
-	stuff->hsyncstart = oldstuff->hsyncstart;
-	stuff->hsyncend = oldstuff->hsyncend;
-	stuff->htotal = oldstuff->htotal;
-	stuff->hskew = 0;
-	stuff->vdisplay = oldstuff->vdisplay;
-	stuff->vsyncstart = oldstuff->vsyncstart;
-	stuff->vsyncend = oldstuff->vsyncend;
-	stuff->vtotal = oldstuff->vtotal;
-	stuff->flags = oldstuff->flags;
-	stuff->privsize = oldstuff->privsize;
-    }
-    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-	ErrorF("DeleteModeLine - scrn: %d clock: %ld\n",
-		(int)stuff->screen, (unsigned long)stuff->dotclock);
-	ErrorF("                 hdsp: %d hbeg: %d hend: %d httl: %d\n",
-		stuff->hdisplay, stuff->hsyncstart,
-		stuff->hsyncend, stuff->htotal);
-	ErrorF("                 vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
-		stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend,
-		stuff->vtotal, (unsigned long)stuff->flags);
+        /* convert from old format */
+        stuff = &newstuff;
+        stuff->length = oldstuff->length;
+        stuff->screen = oldstuff->screen;
+        stuff->dotclock = oldstuff->dotclock;
+        stuff->hdisplay = oldstuff->hdisplay;
+        stuff->hsyncstart = oldstuff->hsyncstart;
+        stuff->hsyncend = oldstuff->hsyncend;
+        stuff->htotal = oldstuff->htotal;
+        stuff->hskew = 0;
+        stuff->vdisplay = oldstuff->vdisplay;
+        stuff->vsyncstart = oldstuff->vsyncstart;
+        stuff->vsyncend = oldstuff->vsyncend;
+        stuff->vtotal = oldstuff->vtotal;
+        stuff->flags = oldstuff->flags;
+        stuff->privsize = oldstuff->privsize;
+    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+        ErrorF("DeleteModeLine - scrn: %d clock: %ld\n",
+               (int) stuff->screen, (unsigned long) stuff->dotclock);
+        ErrorF("                 hdsp: %d hbeg: %d hend: %d httl: %d\n",
+               stuff->hdisplay, stuff->hsyncstart,
+               stuff->hsyncend, stuff->htotal);
+        ErrorF
+            ("                 vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+             stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
+             (unsigned long) stuff->flags);
     }
 
     if (ver < 2) {
-	REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq);
-	len = client->req_len - bytes_to_int32(sizeof(xXF86OldVidModeDeleteModeLineReq));
-    } else {
-	REQUEST_AT_LEAST_SIZE(xXF86VidModeDeleteModeLineReq);
-	len = client->req_len - bytes_to_int32(sizeof(xXF86VidModeDeleteModeLineReq));
+        REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq);
+        len =
+            client->req_len -
+            bytes_to_int32(sizeof(xXF86OldVidModeDeleteModeLineReq));
+    }
+    else {
+        REQUEST_AT_LEAST_SIZE(xXF86VidModeDeleteModeLineReq);
+        len =
+            client->req_len -
+            bytes_to_int32(sizeof(xXF86VidModeDeleteModeLineReq));
     }
     if (len != stuff->privsize) {
-	if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-	    ErrorF("req_len = %ld, sizeof(Req) = %d, privsize = %ld, "
-		   "len = %d, length = %d\n",
-		    (unsigned long)client->req_len,
-		    (int)sizeof(xXF86VidModeDeleteModeLineReq)>>2,
-		    (unsigned long)stuff->privsize, len, stuff->length);
-	}
-	return BadLength;
+        if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+            ErrorF("req_len = %ld, sizeof(Req) = %d, privsize = %ld, "
+                   "len = %d, length = %d\n",
+                   (unsigned long) client->req_len,
+                   (int) sizeof(xXF86VidModeDeleteModeLineReq) >> 2,
+                   (unsigned long) stuff->privsize, len, stuff->length);
+        }
+        return BadLength;
     }
 
-    if(stuff->screen >= screenInfo.numScreens)
+    if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
     if (!VidModeGetCurrentModeline(stuff->screen, &mode, &dotClock))
-	return BadValue;
+        return BadValue;
 
     if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-	ErrorF("Checking against clock: %d (%d)\n",
-		VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock);
-	ErrorF("                 hdsp: %d hbeg: %d hend: %d httl: %d\n",
-	       VidModeGetModeValue(mode, VIDMODE_H_DISPLAY),
-	       VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART),
-	       VidModeGetModeValue(mode, VIDMODE_H_SYNCEND),
-	       VidModeGetModeValue(mode, VIDMODE_H_TOTAL));
-	ErrorF("                 vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
-	       VidModeGetModeValue(mode, VIDMODE_V_DISPLAY),
-	       VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART),
-	       VidModeGetModeValue(mode, VIDMODE_V_SYNCEND),
-	       VidModeGetModeValue(mode, VIDMODE_V_TOTAL),
-	       VidModeGetModeValue(mode, VIDMODE_FLAGS));
+        ErrorF("Checking against clock: %d (%d)\n",
+               VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock);
+        ErrorF("                 hdsp: %d hbeg: %d hend: %d httl: %d\n",
+               VidModeGetModeValue(mode, VIDMODE_H_DISPLAY),
+               VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART),
+               VidModeGetModeValue(mode, VIDMODE_H_SYNCEND),
+               VidModeGetModeValue(mode, VIDMODE_H_TOTAL));
+        ErrorF
+            ("                 vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
+             VidModeGetModeValue(mode, VIDMODE_V_DISPLAY),
+             VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART),
+             VidModeGetModeValue(mode, VIDMODE_V_SYNCEND),
+             VidModeGetModeValue(mode, VIDMODE_V_TOTAL),
+             VidModeGetModeValue(mode, VIDMODE_FLAGS));
     }
     if ((VidModeGetDotClock(stuff->screen, stuff->dotclock) == dotClock) &&
-	    MODEMATCH(mode, stuff))
-	return BadValue;
+        MODEMATCH(mode, stuff))
+        return BadValue;
 
     if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock))
-	return BadValue;
-
-     do {
-	if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-	    ErrorF("Checking against clock: %d (%d)\n",
-		 VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock);
-	    ErrorF("                 hdsp: %d hbeg: %d hend: %d httl: %d\n",
-		 VidModeGetModeValue(mode, VIDMODE_H_DISPLAY),
-		 VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART),
-		 VidModeGetModeValue(mode, VIDMODE_H_SYNCEND),
-		 VidModeGetModeValue(mode, VIDMODE_H_TOTAL));
-	    ErrorF("                 vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
-		 VidModeGetModeValue(mode, VIDMODE_V_DISPLAY),
-		 VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART),
-		 VidModeGetModeValue(mode, VIDMODE_V_SYNCEND),
-		 VidModeGetModeValue(mode, VIDMODE_V_TOTAL),
-		 VidModeGetModeValue(mode, VIDMODE_FLAGS));
-	}
-	if ((VidModeGetDotClock(stuff->screen, stuff->dotclock) == dotClock) &&
-		MODEMATCH(mode, stuff)) {
-	    VidModeDeleteModeline(stuff->screen, mode);
-	    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
-		ErrorF("DeleteModeLine - Succeeded\n");
-	    return Success;
-	}
+        return BadValue;
+
+    do {
+        if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+            ErrorF("Checking against clock: %d (%d)\n",
+                   VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock);
+            ErrorF("                 hdsp: %d hbeg: %d hend: %d httl: %d\n",
+                   VidModeGetModeValue(mode, VIDMODE_H_DISPLAY),
+                   VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART),
+                   VidModeGetModeValue(mode, VIDMODE_H_SYNCEND),
+                   VidModeGetModeValue(mode, VIDMODE_H_TOTAL));
+            ErrorF
+                ("                 vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
+                 VidModeGetModeValue(mode, VIDMODE_V_DISPLAY),
+                 VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART),
+                 VidModeGetModeValue(mode, VIDMODE_V_SYNCEND),
+                 VidModeGetModeValue(mode, VIDMODE_V_TOTAL),
+                 VidModeGetModeValue(mode, VIDMODE_FLAGS));
+        }
+        if ((VidModeGetDotClock(stuff->screen, stuff->dotclock) == dotClock) &&
+            MODEMATCH(mode, stuff)) {
+            VidModeDeleteModeline(stuff->screen, mode);
+            if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
+                ErrorF("DeleteModeLine - Succeeded\n");
+            return Success;
+        }
     } while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock));
 
     return BadValue;
 }
 
 static int
-ProcXF86VidModeModModeLine(ClientPtr client)
-{
+ ProcXF86VidModeModModeLine(ClientPtr client) {
     REQUEST(xXF86VidModeModModeLineReq);
     xXF86OldVidModeModModeLineReq *oldstuff =
-			(xXF86OldVidModeModModeLineReq *)client->requestBuffer;
+        (xXF86OldVidModeModModeLineReq *) client->requestBuffer;
     xXF86VidModeModModeLineReq newstuff;
     pointer mode, modetmp;
     int len, dotClock;
     int ver;
 
-    DEBUG_P("XF86VidModeModModeline");
-
-    ver = ClientMajorVersion(client);
-    if (ver < 2 ) {
-	/* convert from old format */
-	stuff = &newstuff;
-	stuff->length = oldstuff->length;
-	stuff->screen = oldstuff->screen;
-	stuff->hdisplay = oldstuff->hdisplay;
-	stuff->hsyncstart = oldstuff->hsyncstart;
-	stuff->hsyncend = oldstuff->hsyncend;
-	stuff->htotal = oldstuff->htotal;
-	stuff->hskew = 0;
-	stuff->vdisplay = oldstuff->vdisplay;
-	stuff->vsyncstart = oldstuff->vsyncstart;
-	stuff->vsyncend = oldstuff->vsyncend;
-	stuff->vtotal = oldstuff->vtotal;
-	stuff->flags = oldstuff->flags;
-	stuff->privsize = oldstuff->privsize;
-    }
-    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-	ErrorF("ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n",
-		(int)stuff->screen, stuff->hdisplay, stuff->hsyncstart,
-		stuff->hsyncend, stuff->htotal);
-	ErrorF("              vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
-		stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend,
-		stuff->vtotal, (unsigned long)stuff->flags);
+     DEBUG_P("XF86VidModeModModeline");
+
+     ver = ClientMajorVersion(client);
+    if (ver < 2) {
+        /* convert from old format */
+        stuff = &newstuff;
+        stuff->length = oldstuff->length;
+        stuff->screen = oldstuff->screen;
+        stuff->hdisplay = oldstuff->hdisplay;
+        stuff->hsyncstart = oldstuff->hsyncstart;
+        stuff->hsyncend = oldstuff->hsyncend;
+        stuff->htotal = oldstuff->htotal;
+        stuff->hskew = 0;
+        stuff->vdisplay = oldstuff->vdisplay;
+        stuff->vsyncstart = oldstuff->vsyncstart;
+        stuff->vsyncend = oldstuff->vsyncend;
+        stuff->vtotal = oldstuff->vtotal;
+        stuff->flags = oldstuff->flags;
+        stuff->privsize = oldstuff->privsize;
+    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+        ErrorF("ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n",
+               (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart,
+               stuff->hsyncend, stuff->htotal);
+        ErrorF("              vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+               stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend,
+               stuff->vtotal, (unsigned long) stuff->flags);
     }
 
     if (ver < 2) {
-	REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq);
-	len = client->req_len - bytes_to_int32(sizeof(xXF86OldVidModeModModeLineReq));
-    } else {
-	REQUEST_AT_LEAST_SIZE(xXF86VidModeModModeLineReq);
-	len = client->req_len - bytes_to_int32(sizeof(xXF86VidModeModModeLineReq));
+        REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq);
+        len =
+            client->req_len -
+            bytes_to_int32(sizeof(xXF86OldVidModeModModeLineReq));
+    }
+    else {
+        REQUEST_AT_LEAST_SIZE(xXF86VidModeModModeLineReq);
+        len =
+            client->req_len -
+            bytes_to_int32(sizeof(xXF86VidModeModModeLineReq));
     }
     if (len != stuff->privsize)
-	return BadLength;
+        return BadLength;
 
-    if (stuff->hsyncstart < stuff->hdisplay   ||
-	stuff->hsyncend   < stuff->hsyncstart ||
-	stuff->htotal     < stuff->hsyncend   ||
-	stuff->vsyncstart < stuff->vdisplay   ||
-	stuff->vsyncend   < stuff->vsyncstart ||
-	stuff->vtotal     < stuff->vsyncend)
-	return BadValue;
+    if (stuff->hsyncstart < stuff->hdisplay ||
+        stuff->hsyncend < stuff->hsyncstart ||
+        stuff->htotal < stuff->hsyncend ||
+        stuff->vsyncstart < stuff->vdisplay ||
+        stuff->vsyncend < stuff->vsyncstart || stuff->vtotal < stuff->vsyncend)
+        return BadValue;
 
-    if(stuff->screen >= screenInfo.numScreens)
+    if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
     if (!VidModeGetCurrentModeline(stuff->screen, &mode, &dotClock))
-	return BadValue;
+        return BadValue;
 
     modetmp = VidModeCreateMode();
     VidModeCopyMode(mode, modetmp);
 
     VidModeSetModeValue(modetmp, VIDMODE_H_DISPLAY, stuff->hdisplay);
-    VidModeSetModeValue(modetmp, VIDMODE_H_SYNCSTART, stuff->hsyncstart); 
+    VidModeSetModeValue(modetmp, VIDMODE_H_SYNCSTART, stuff->hsyncstart);
     VidModeSetModeValue(modetmp, VIDMODE_H_SYNCEND, stuff->hsyncend);
     VidModeSetModeValue(modetmp, VIDMODE_H_TOTAL, stuff->htotal);
     VidModeSetModeValue(modetmp, VIDMODE_H_SKEW, stuff->hskew);
     VidModeSetModeValue(modetmp, VIDMODE_V_DISPLAY, stuff->vdisplay);
-    VidModeSetModeValue(modetmp, VIDMODE_V_SYNCSTART, stuff->vsyncstart); 
+    VidModeSetModeValue(modetmp, VIDMODE_V_SYNCSTART, stuff->vsyncstart);
     VidModeSetModeValue(modetmp, VIDMODE_V_SYNCEND, stuff->vsyncend);
     VidModeSetModeValue(modetmp, VIDMODE_V_TOTAL, stuff->vtotal);
     VidModeSetModeValue(modetmp, VIDMODE_FLAGS, stuff->flags);
 
     if (stuff->privsize)
-	ErrorF("ModModeLine - Privates in request have been ignored\n");
+        ErrorF("ModModeLine - Privates in request have been ignored\n");
 
     /* Check that the mode is consistent with the monitor specs */
     switch (VidModeCheckModeForMonitor(stuff->screen, modetmp)) {
-    	case MODE_OK:
-	    break;
-	case MODE_HSYNC:
-	case MODE_H_ILLEGAL:
-	    free(modetmp);
-	    return VidModeErrorBase + XF86VidModeBadHTimings;
-	case MODE_VSYNC:
-	case MODE_V_ILLEGAL:
-	    free(modetmp);
-	    return VidModeErrorBase + XF86VidModeBadVTimings;
-	default:
-	    free(modetmp);
-	    return VidModeErrorBase + XF86VidModeModeUnsuitable;
+    case MODE_OK:
+        break;
+    case MODE_HSYNC:
+    case MODE_H_ILLEGAL:
+        free(modetmp);
+        return VidModeErrorBase + XF86VidModeBadHTimings;
+    case MODE_VSYNC:
+    case MODE_V_ILLEGAL:
+        free(modetmp);
+        return VidModeErrorBase + XF86VidModeBadVTimings;
+    default:
+        free(modetmp);
+        return VidModeErrorBase + XF86VidModeModeUnsuitable;
     }
 
     /* Check that the driver is happy with the mode */
     if (VidModeCheckModeForDriver(stuff->screen, modetmp) != MODE_OK) {
-	free(modetmp);
-	return VidModeErrorBase + XF86VidModeModeUnsuitable;
+        free(modetmp);
+        return VidModeErrorBase + XF86VidModeModeUnsuitable;
     }
     free(modetmp);
 
     VidModeSetModeValue(mode, VIDMODE_H_DISPLAY, stuff->hdisplay);
-    VidModeSetModeValue(mode, VIDMODE_H_SYNCSTART, stuff->hsyncstart); 
+    VidModeSetModeValue(mode, VIDMODE_H_SYNCSTART, stuff->hsyncstart);
     VidModeSetModeValue(mode, VIDMODE_H_SYNCEND, stuff->hsyncend);
     VidModeSetModeValue(mode, VIDMODE_H_TOTAL, stuff->htotal);
     VidModeSetModeValue(mode, VIDMODE_H_SKEW, stuff->hskew);
     VidModeSetModeValue(mode, VIDMODE_V_DISPLAY, stuff->vdisplay);
-    VidModeSetModeValue(mode, VIDMODE_V_SYNCSTART, stuff->vsyncstart); 
+    VidModeSetModeValue(mode, VIDMODE_V_SYNCSTART, stuff->vsyncstart);
     VidModeSetModeValue(mode, VIDMODE_V_SYNCEND, stuff->vsyncend);
     VidModeSetModeValue(mode, VIDMODE_V_TOTAL, stuff->vtotal);
     VidModeSetModeValue(mode, VIDMODE_FLAGS, stuff->flags);
@@ -903,337 +898,349 @@ ProcXF86VidModeModModeLine(ClientPtr client)
     VidModeSwitchMode(stuff->screen, mode);
 
     if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
-	ErrorF("ModModeLine - Succeeded\n");
+        ErrorF("ModModeLine - Succeeded\n");
     return Success;
 }
 
 static int
-ProcXF86VidModeValidateModeLine(ClientPtr client)
-{
+ ProcXF86VidModeValidateModeLine(ClientPtr client) {
     REQUEST(xXF86VidModeValidateModeLineReq);
     xXF86OldVidModeValidateModeLineReq *oldstuff =
-		(xXF86OldVidModeValidateModeLineReq *)client->requestBuffer;
+        (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer;
     xXF86VidModeValidateModeLineReq newstuff;
     xXF86VidModeValidateModeLineReply rep;
     pointer mode, modetmp = NULL;
     int len, status, dotClock;
     int ver;
 
-    DEBUG_P("XF86VidModeValidateModeline");
+     DEBUG_P("XF86VidModeValidateModeline");
 
-    ver = ClientMajorVersion(client);
+     ver = ClientMajorVersion(client);
     if (ver < 2) {
-	/* convert from old format */
-	stuff = &newstuff;
-	stuff->length = oldstuff->length;
-	stuff->screen = oldstuff->screen;
-	stuff->dotclock = oldstuff->dotclock;
-	stuff->hdisplay = oldstuff->hdisplay;
-	stuff->hsyncstart = oldstuff->hsyncstart;
-	stuff->hsyncend = oldstuff->hsyncend;
-	stuff->htotal = oldstuff->htotal;
-	stuff->hskew = 0;
-	stuff->vdisplay = oldstuff->vdisplay;
-	stuff->vsyncstart = oldstuff->vsyncstart;
-	stuff->vsyncend = oldstuff->vsyncend;
-	stuff->vtotal = oldstuff->vtotal;
-	stuff->flags = oldstuff->flags;
-	stuff->privsize = oldstuff->privsize;
-    }
-    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-	ErrorF("ValidateModeLine - scrn: %d clock: %ld\n",
-		(int)stuff->screen, (unsigned long)stuff->dotclock);
-	ErrorF("                   hdsp: %d hbeg: %d hend: %d httl: %d\n",
-		stuff->hdisplay, stuff->hsyncstart,
-		stuff->hsyncend, stuff->htotal);
-	ErrorF("                   vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
-		stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend,
-		stuff->vtotal, (unsigned long)stuff->flags);
+        /* convert from old format */
+        stuff = &newstuff;
+        stuff->length = oldstuff->length;
+        stuff->screen = oldstuff->screen;
+        stuff->dotclock = oldstuff->dotclock;
+        stuff->hdisplay = oldstuff->hdisplay;
+        stuff->hsyncstart = oldstuff->hsyncstart;
+        stuff->hsyncend = oldstuff->hsyncend;
+        stuff->htotal = oldstuff->htotal;
+        stuff->hskew = 0;
+        stuff->vdisplay = oldstuff->vdisplay;
+        stuff->vsyncstart = oldstuff->vsyncstart;
+        stuff->vsyncend = oldstuff->vsyncend;
+        stuff->vtotal = oldstuff->vtotal;
+        stuff->flags = oldstuff->flags;
+        stuff->privsize = oldstuff->privsize;
+    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+        ErrorF("ValidateModeLine - scrn: %d clock: %ld\n",
+               (int) stuff->screen, (unsigned long) stuff->dotclock);
+        ErrorF("                   hdsp: %d hbeg: %d hend: %d httl: %d\n",
+               stuff->hdisplay, stuff->hsyncstart,
+               stuff->hsyncend, stuff->htotal);
+        ErrorF
+            ("                   vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+             stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
+             (unsigned long) stuff->flags);
     }
 
     if (ver < 2) {
-	REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq);
-	len = client->req_len -
-			bytes_to_int32(sizeof(xXF86OldVidModeValidateModeLineReq));
-    } else {
-	REQUEST_AT_LEAST_SIZE(xXF86VidModeValidateModeLineReq);
-	len = client->req_len - bytes_to_int32(sizeof(xXF86VidModeValidateModeLineReq));
+        REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq);
+        len = client->req_len -
+            bytes_to_int32(sizeof(xXF86OldVidModeValidateModeLineReq));
+    }
+    else {
+        REQUEST_AT_LEAST_SIZE(xXF86VidModeValidateModeLineReq);
+        len =
+            client->req_len -
+            bytes_to_int32(sizeof(xXF86VidModeValidateModeLineReq));
     }
     if (len != stuff->privsize)
-	return BadLength;
+        return BadLength;
 
-    if(stuff->screen >= screenInfo.numScreens)
+    if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
     status = MODE_OK;
 
-    if (stuff->hsyncstart < stuff->hdisplay   ||
-	stuff->hsyncend   < stuff->hsyncstart ||
-	stuff->htotal     < stuff->hsyncend   ||
-	stuff->vsyncstart < stuff->vdisplay   ||
-	stuff->vsyncend   < stuff->vsyncstart ||
-	stuff->vtotal     < stuff->vsyncend)
-    {
-	status = MODE_BAD;
-	goto status_reply;
+    if (stuff->hsyncstart < stuff->hdisplay ||
+        stuff->hsyncend < stuff->hsyncstart ||
+        stuff->htotal < stuff->hsyncend ||
+        stuff->vsyncstart < stuff->vdisplay ||
+        stuff->vsyncend < stuff->vsyncstart ||
+        stuff->vtotal < stuff->vsyncend) {
+        status = MODE_BAD;
+        goto status_reply;
     }
 
     if (!VidModeGetCurrentModeline(stuff->screen, &mode, &dotClock))
-	return BadValue;
+        return BadValue;
 
     modetmp = VidModeCreateMode();
     VidModeCopyMode(mode, modetmp);
 
     VidModeSetModeValue(modetmp, VIDMODE_H_DISPLAY, stuff->hdisplay);
-    VidModeSetModeValue(modetmp, VIDMODE_H_SYNCSTART, stuff->hsyncstart); 
+    VidModeSetModeValue(modetmp, VIDMODE_H_SYNCSTART, stuff->hsyncstart);
     VidModeSetModeValue(modetmp, VIDMODE_H_SYNCEND, stuff->hsyncend);
     VidModeSetModeValue(modetmp, VIDMODE_H_TOTAL, stuff->htotal);
     VidModeSetModeValue(modetmp, VIDMODE_H_SKEW, stuff->hskew);
     VidModeSetModeValue(modetmp, VIDMODE_V_DISPLAY, stuff->vdisplay);
-    VidModeSetModeValue(modetmp, VIDMODE_V_SYNCSTART, stuff->vsyncstart); 
+    VidModeSetModeValue(modetmp, VIDMODE_V_SYNCSTART, stuff->vsyncstart);
     VidModeSetModeValue(modetmp, VIDMODE_V_SYNCEND, stuff->vsyncend);
     VidModeSetModeValue(modetmp, VIDMODE_V_TOTAL, stuff->vtotal);
     VidModeSetModeValue(modetmp, VIDMODE_FLAGS, stuff->flags);
     if (stuff->privsize)
-	ErrorF("ValidateModeLine - Privates in request have been ignored\n");
+        ErrorF("ValidateModeLine - Privates in request have been ignored\n");
 
     /* Check that the mode is consistent with the monitor specs */
-    if ((status = VidModeCheckModeForMonitor(stuff->screen, modetmp)) != MODE_OK)
-	goto status_reply;
+    if ((status =
+         VidModeCheckModeForMonitor(stuff->screen, modetmp)) != MODE_OK)
+        goto status_reply;
 
     /* Check that the driver is happy with the mode */
     status = VidModeCheckModeForDriver(stuff->screen, modetmp);
 
-status_reply:
+ status_reply:
     free(modetmp);
 
     rep.type = X_Reply;
     rep.length = bytes_to_int32(SIZEOF(xXF86VidModeValidateModeLineReply)
-			 - SIZEOF(xGenericReply));
+                                - SIZEOF(xGenericReply));
     rep.sequenceNumber = client->sequence;
     rep.status = status;
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.status);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.status);
     }
-    WriteToClient(client, sizeof(xXF86VidModeValidateModeLineReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86VidModeValidateModeLineReply),
+                  (char *) &rep);
     if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
-	ErrorF("ValidateModeLine - Succeeded (status = %d)\n", status);
+        ErrorF("ValidateModeLine - Succeeded (status = %d)\n", status);
     return Success;
 }
 
 static int
-ProcXF86VidModeSwitchMode(ClientPtr client)
-{
+ ProcXF86VidModeSwitchMode(ClientPtr client) {
     REQUEST(xXF86VidModeSwitchModeReq);
 
     DEBUG_P("XF86VidModeSwitchMode");
 
     REQUEST_SIZE_MATCH(xXF86VidModeSwitchModeReq);
 
-    if(stuff->screen >= screenInfo.numScreens)
+    if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    VidModeZoomViewport(stuff->screen, (short)stuff->zoom);
+    VidModeZoomViewport(stuff->screen, (short) stuff->zoom);
 
     return Success;
-}
-
-static int
-ProcXF86VidModeSwitchToMode(ClientPtr client)
-{
+} static int
+ ProcXF86VidModeSwitchToMode(ClientPtr client) {
     REQUEST(xXF86VidModeSwitchToModeReq);
     xXF86OldVidModeSwitchToModeReq *oldstuff =
-		(xXF86OldVidModeSwitchToModeReq *)client->requestBuffer;
+        (xXF86OldVidModeSwitchToModeReq *) client->requestBuffer;
     xXF86VidModeSwitchToModeReq newstuff;
     pointer mode;
     int len, dotClock;
     int ver;
 
-    DEBUG_P("XF86VidModeSwitchToMode");
+     DEBUG_P("XF86VidModeSwitchToMode");
 
-    ver = ClientMajorVersion(client);
+     ver = ClientMajorVersion(client);
     if (ver < 2) {
-	/* convert from old format */
-	stuff = &newstuff;
-	stuff->length = oldstuff->length;
-	stuff->screen = oldstuff->screen;
-	stuff->dotclock = oldstuff->dotclock;
-	stuff->hdisplay = oldstuff->hdisplay;
-	stuff->hsyncstart = oldstuff->hsyncstart;
-	stuff->hsyncend = oldstuff->hsyncend;
-	stuff->htotal = oldstuff->htotal;
-	stuff->hskew = 0;
-	stuff->vdisplay = oldstuff->vdisplay;
-	stuff->vsyncstart = oldstuff->vsyncstart;
-	stuff->vsyncend = oldstuff->vsyncend;
-	stuff->vtotal = oldstuff->vtotal;
-	stuff->flags = oldstuff->flags;
-	stuff->privsize = oldstuff->privsize;
-    }
-    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-	ErrorF("SwitchToMode - scrn: %d clock: %ld\n",
-		(int)stuff->screen, (unsigned long)stuff->dotclock);
-	ErrorF("               hdsp: %d hbeg: %d hend: %d httl: %d\n",
-		stuff->hdisplay, stuff->hsyncstart,
-		stuff->hsyncend, stuff->htotal);
-	ErrorF("               vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
-		stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend,
-		stuff->vtotal, (unsigned long)stuff->flags);
+        /* convert from old format */
+        stuff = &newstuff;
+        stuff->length = oldstuff->length;
+        stuff->screen = oldstuff->screen;
+        stuff->dotclock = oldstuff->dotclock;
+        stuff->hdisplay = oldstuff->hdisplay;
+        stuff->hsyncstart = oldstuff->hsyncstart;
+        stuff->hsyncend = oldstuff->hsyncend;
+        stuff->htotal = oldstuff->htotal;
+        stuff->hskew = 0;
+        stuff->vdisplay = oldstuff->vdisplay;
+        stuff->vsyncstart = oldstuff->vsyncstart;
+        stuff->vsyncend = oldstuff->vsyncend;
+        stuff->vtotal = oldstuff->vtotal;
+        stuff->flags = oldstuff->flags;
+        stuff->privsize = oldstuff->privsize;
+    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+        ErrorF("SwitchToMode - scrn: %d clock: %ld\n",
+               (int) stuff->screen, (unsigned long) stuff->dotclock);
+        ErrorF("               hdsp: %d hbeg: %d hend: %d httl: %d\n",
+               stuff->hdisplay, stuff->hsyncstart,
+               stuff->hsyncend, stuff->htotal);
+        ErrorF
+            ("               vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+             stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
+             (unsigned long) stuff->flags);
     }
 
     if (ver < 2) {
-	REQUEST_AT_LEAST_SIZE(xXF86OldVidModeSwitchToModeReq);
-	len = client->req_len - bytes_to_int32(sizeof(xXF86OldVidModeSwitchToModeReq));
-    } else {
-	REQUEST_AT_LEAST_SIZE(xXF86VidModeSwitchToModeReq);
-	len = client->req_len - bytes_to_int32(sizeof(xXF86VidModeSwitchToModeReq));
+        REQUEST_AT_LEAST_SIZE(xXF86OldVidModeSwitchToModeReq);
+        len =
+            client->req_len -
+            bytes_to_int32(sizeof(xXF86OldVidModeSwitchToModeReq));
+    }
+    else {
+        REQUEST_AT_LEAST_SIZE(xXF86VidModeSwitchToModeReq);
+        len =
+            client->req_len -
+            bytes_to_int32(sizeof(xXF86VidModeSwitchToModeReq));
     }
     if (len != stuff->privsize)
-	return BadLength;
+        return BadLength;
 
-    if(stuff->screen >= screenInfo.numScreens)
+    if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
     if (!VidModeGetCurrentModeline(stuff->screen, &mode, &dotClock))
-	return BadValue;
+        return BadValue;
 
     if ((VidModeGetDotClock(stuff->screen, stuff->dotclock) == dotClock)
-	    && MODEMATCH(mode, stuff))
-	return Success;
+        && MODEMATCH(mode, stuff))
+        return Success;
 
     if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock))
-	return BadValue;
+        return BadValue;
 
     do {
-	if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-	    ErrorF("Checking against clock: %d (%d)\n",
-		 VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock);
-	    ErrorF("                 hdsp: %d hbeg: %d hend: %d httl: %d\n",
-		 VidModeGetModeValue(mode, VIDMODE_H_DISPLAY),
-		 VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART),
-		 VidModeGetModeValue(mode, VIDMODE_H_SYNCEND),
-		 VidModeGetModeValue(mode, VIDMODE_H_TOTAL));
-	    ErrorF("                 vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
-		 VidModeGetModeValue(mode, VIDMODE_V_DISPLAY),
-		 VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART),
-		 VidModeGetModeValue(mode, VIDMODE_V_SYNCEND),
-		 VidModeGetModeValue(mode, VIDMODE_V_TOTAL),
-		 VidModeGetModeValue(mode, VIDMODE_FLAGS));
-	}
-	if ((VidModeGetDotClock(stuff->screen, stuff->dotclock) == dotClock) &&
-		MODEMATCH(mode, stuff)) {
-
-	    if (!VidModeSwitchMode(stuff->screen, mode))
-		return BadValue;
-
-	    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
-		ErrorF("SwitchToMode - Succeeded\n");
-	    return Success;
-	}
+        if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+            ErrorF("Checking against clock: %d (%d)\n",
+                   VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock);
+            ErrorF("                 hdsp: %d hbeg: %d hend: %d httl: %d\n",
+                   VidModeGetModeValue(mode, VIDMODE_H_DISPLAY),
+                   VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART),
+                   VidModeGetModeValue(mode, VIDMODE_H_SYNCEND),
+                   VidModeGetModeValue(mode, VIDMODE_H_TOTAL));
+            ErrorF
+                ("                 vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
+                 VidModeGetModeValue(mode, VIDMODE_V_DISPLAY),
+                 VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART),
+                 VidModeGetModeValue(mode, VIDMODE_V_SYNCEND),
+                 VidModeGetModeValue(mode, VIDMODE_V_TOTAL),
+                 VidModeGetModeValue(mode, VIDMODE_FLAGS));
+        }
+        if ((VidModeGetDotClock(stuff->screen, stuff->dotclock) == dotClock) &&
+            MODEMATCH(mode, stuff)) {
+
+            if (!VidModeSwitchMode(stuff->screen, mode))
+                return BadValue;
+
+            if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
+                ErrorF("SwitchToMode - Succeeded\n");
+            return Success;
+        }
     } while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock));
 
     return BadValue;
 }
 
 static int
-ProcXF86VidModeLockModeSwitch(ClientPtr client)
-{
+ ProcXF86VidModeLockModeSwitch(ClientPtr client) {
     REQUEST(xXF86VidModeLockModeSwitchReq);
 
     REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq);
 
     DEBUG_P("XF86VidModeLockModeSwitch");
 
-    if(stuff->screen >= screenInfo.numScreens)
+    if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if (!VidModeLockZoom(stuff->screen, (short)stuff->lock))
-	return VidModeErrorBase + XF86VidModeZoomLocked;
+    if (!VidModeLockZoom(stuff->screen, (short) stuff->lock))
+        return VidModeErrorBase + XF86VidModeZoomLocked;
 
     return Success;
-}
-
-static int
-ProcXF86VidModeGetMonitor(ClientPtr client)
-{
+} static int
+ ProcXF86VidModeGetMonitor(ClientPtr client) {
     REQUEST(xXF86VidModeGetMonitorReq);
     xXF86VidModeGetMonitorReply rep;
     CARD32 *hsyncdata, *vsyncdata;
     int i, nHsync, nVrefresh;
     pointer monitor;
-    
-    DEBUG_P("XF86VidModeGetMonitor");
 
-    REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
+     DEBUG_P("XF86VidModeGetMonitor");
 
-    if(stuff->screen >= screenInfo.numScreens)
-        return BadValue;
+     REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+         return BadValue;
 
     if (!VidModeGetMonitor(stuff->screen, &monitor))
-	return BadValue;
+         return BadValue;
 
-    nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i;
-    nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i;
-    
-    rep.type = X_Reply;
-    if ((char *)(VidModeGetMonitorValue(monitor, VIDMODE_MON_VENDOR, 0)).ptr)
-	rep.vendorLength = strlen((char *)(VidModeGetMonitorValue(monitor,
-				  VIDMODE_MON_VENDOR, 0)).ptr);
+     nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i;
+     nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i;
+
+     rep.type = X_Reply;
+    if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VENDOR, 0)).ptr)
+         rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor,
+                                                                    VIDMODE_MON_VENDOR,
+                                                                    0)).ptr);
     else
-	rep.vendorLength = 0;
-    if ((char *)(VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL, 0)).ptr)
-	rep.modelLength = strlen((char *)(VidModeGetMonitorValue(monitor,
-				  VIDMODE_MON_MODEL, 0)).ptr);
+         rep.vendorLength = 0;
+    if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL, 0)).ptr)
+         rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor,
+                                                                   VIDMODE_MON_MODEL,
+                                                                   0)).ptr);
     else
-	rep.modelLength = 0;
-    rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetMonitorReply) - SIZEOF(xGenericReply) +
-		  (nHsync + nVrefresh) * sizeof(CARD32) +
-	          pad_to_int32(rep.vendorLength) +
-		  pad_to_int32(rep.modelLength));
-    rep.sequenceNumber = client->sequence;
-    rep.nhsync = nHsync;
-    rep.nvsync = nVrefresh;
-    hsyncdata = malloc(nHsync * sizeof(CARD32));
+         rep.modelLength = 0;
+     rep.length =
+        bytes_to_int32(SIZEOF(xXF86VidModeGetMonitorReply) -
+                       SIZEOF(xGenericReply) + (nHsync +
+                                                nVrefresh) * sizeof(CARD32) +
+                       pad_to_int32(rep.vendorLength) +
+                       pad_to_int32(rep.modelLength));
+     rep.sequenceNumber = client->sequence;
+     rep.nhsync = nHsync;
+     rep.nvsync = nVrefresh;
+     hsyncdata = malloc(nHsync * sizeof(CARD32));
     if (!hsyncdata) {
-	return BadAlloc;
-    }
+        return BadAlloc;
+    } vsyncdata = malloc(nVrefresh * sizeof(CARD32));
 
-    vsyncdata = malloc(nVrefresh * sizeof(CARD32));
     if (!vsyncdata) {
-	free(hsyncdata);
-	return BadAlloc;
+        free(hsyncdata);
+        return BadAlloc;
     }
 
     for (i = 0; i < nHsync; i++) {
-	hsyncdata[i] = (unsigned short)(VidModeGetMonitorValue(monitor,
-			     VIDMODE_MON_HSYNC_LO, i)).f |
-		       (unsigned short)(VidModeGetMonitorValue(monitor,
-			     VIDMODE_MON_HSYNC_HI, i)).f << 16;
+        hsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor,
+                                                                VIDMODE_MON_HSYNC_LO,
+                                                                i)).
+            f | (unsigned
+                 short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI,
+                                                i)).f << 16;
     }
     for (i = 0; i < nVrefresh; i++) {
-	vsyncdata[i] = (unsigned short)(VidModeGetMonitorValue(monitor,
-			     VIDMODE_MON_VREFRESH_LO, i)).f |
-		       (unsigned short)(VidModeGetMonitorValue(monitor,
-			     VIDMODE_MON_VREFRESH_HI, i)).f << 16;
+        vsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor,
+                                                                VIDMODE_MON_VREFRESH_LO,
+                                                                i)).
+            f | (unsigned
+                 short) (VidModeGetMonitorValue(monitor,
+                                                VIDMODE_MON_VREFRESH_HI,
+                                                i)).f << 16;
     }
-    
 
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
     }
-    WriteToClient(client, SIZEOF(xXF86VidModeGetMonitorReply), (char *)&rep);
+    WriteToClient(client, SIZEOF(xXF86VidModeGetMonitorReply), (char *) &rep);
     client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
-    WriteSwappedDataToClient(client, nHsync * sizeof(CARD32),
-			     hsyncdata);
-    WriteSwappedDataToClient(client, nVrefresh * sizeof(CARD32),
-			     vsyncdata);
+    WriteSwappedDataToClient(client, nHsync * sizeof(CARD32), hsyncdata);
+    WriteSwappedDataToClient(client, nVrefresh * sizeof(CARD32), vsyncdata);
     if (rep.vendorLength)
-	WriteToClient(client, rep.vendorLength, (char *)(VidModeGetMonitorValue(monitor, VIDMODE_MON_VENDOR, 0)).ptr);
+        WriteToClient(client, rep.vendorLength,
+                      (char
+                       *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VENDOR,
+                                                  0)).ptr);
     if (rep.modelLength)
-	WriteToClient(client, rep.modelLength, (char *)(VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL, 0)).ptr);
+        WriteToClient(client, rep.modelLength,
+                      (char
+                       *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL,
+                                                  0)).ptr);
 
     free(hsyncdata);
     free(vsyncdata);
@@ -1242,113 +1249,106 @@ ProcXF86VidModeGetMonitor(ClientPtr client)
 }
 
 static int
-ProcXF86VidModeGetViewPort(ClientPtr client)
-{
+ ProcXF86VidModeGetViewPort(ClientPtr client) {
     REQUEST(xXF86VidModeGetViewPortReq);
     xXF86VidModeGetViewPortReply rep;
     int x, y;
 
-    DEBUG_P("XF86VidModeGetViewPort");
+     DEBUG_P("XF86VidModeGetViewPort");
 
-    REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
 
-    if(stuff->screen >= screenInfo.numScreens)
-        return BadValue;
+    if (stuff->screen >= screenInfo.numScreens)
+         return BadValue;
 
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
 
-    VidModeGetViewPort(stuff->screen, &x, &y);
-    rep.x = x;
-    rep.y = y;
+     VidModeGetViewPort(stuff->screen, &x, &y);
+     rep.x = x;
+     rep.y = y;
 
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.x);
-	swapl(&rep.y);
-    }
-    WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), (char *)&rep);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.x);
+        swapl(&rep.y);
+    } WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply),
+                    (char *) &rep);
     return Success;
 }
 
 static int
-ProcXF86VidModeSetViewPort(ClientPtr client)
-{
+ ProcXF86VidModeSetViewPort(ClientPtr client) {
     REQUEST(xXF86VidModeSetViewPortReq);
 
     DEBUG_P("XF86VidModeSetViewPort");
 
     REQUEST_SIZE_MATCH(xXF86VidModeSetViewPortReq);
 
-    if(stuff->screen >= screenInfo.numScreens)
+    if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
     if (!VidModeSetViewPort(stuff->screen, stuff->x, stuff->y))
-	return BadValue;
+        return BadValue;
 
     return Success;
-}
-
-static int
-ProcXF86VidModeGetDotClocks(ClientPtr client)
-{
+} static int
+ ProcXF86VidModeGetDotClocks(ClientPtr client) {
     REQUEST(xXF86VidModeGetDotClocksReq);
     xXF86VidModeGetDotClocksReply rep;
-	int n;
+    int n;
     int numClocks;
     CARD32 dotclock;
     int *Clocks = NULL;
     Bool ClockProg;
 
-    DEBUG_P("XF86VidModeGetDotClocks");
+     DEBUG_P("XF86VidModeGetDotClocks");
 
-    REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
 
-    if(stuff->screen >= screenInfo.numScreens)
-        return BadValue;
+    if (stuff->screen >= screenInfo.numScreens)
+         return BadValue;
 
-    numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg);
+     numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg);
 
-    rep.type = X_Reply;
-    rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply)
-		    - SIZEOF(xGenericReply) + numClocks);
-    rep.sequenceNumber = client->sequence;
-    rep.clocks = numClocks;
-    rep.maxclocks = MAXCLOCKS;
-    rep.flags = 0;
+     rep.type = X_Reply;
+     rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply)
+                                 - SIZEOF(xGenericReply) + numClocks);
+     rep.sequenceNumber = client->sequence;
+     rep.clocks = numClocks;
+     rep.maxclocks = MAXCLOCKS;
+     rep.flags = 0;
 
     if (!ClockProg) {
-	Clocks = malloc(numClocks * sizeof(int));
-	if (!Clocks)
-	    return BadValue;
-	if (!VidModeGetClocks(stuff->screen, Clocks)) {
-	    free(Clocks);
-	    return BadValue;
-	}
-    }
-
-    if (ClockProg) {
-    	rep.flags |= CLKFLAG_PROGRAMABLE;
+        Clocks = malloc(numClocks * sizeof(int));
+        if (!Clocks)
+             return BadValue;
+        if (!VidModeGetClocks(stuff->screen, Clocks)) {
+            free(Clocks);
+            return BadValue;
+    }} if (ClockProg) {
+        rep.flags |= CLKFLAG_PROGRAMABLE;
     }
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.clocks);
-	swapl(&rep.maxclocks);
-	swapl(&rep.flags);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.clocks);
+        swapl(&rep.maxclocks);
+        swapl(&rep.flags);
     }
-    WriteToClient(client, sizeof(xXF86VidModeGetDotClocksReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86VidModeGetDotClocksReply), (char *) &rep);
     if (!ClockProg) {
-	for (n = 0; n < numClocks; n++) {
-    	    dotclock = *Clocks++;
-	    if (client->swapped) {
-		WriteSwappedDataToClient(client, 4, (char *)&dotclock);
-	    } else {
-		WriteToClient(client, 4, (char *)&dotclock);
-	    }
-	}
+        for (n = 0; n < numClocks; n++) {
+            dotclock = *Clocks++;
+            if (client->swapped) {
+                WriteSwappedDataToClient(client, 4, (char *) &dotclock);
+            }
+            else {
+                WriteToClient(client, 4, (char *) &dotclock);
+            }
+        }
     }
 
     free(Clocks);
@@ -1356,534 +1356,486 @@ ProcXF86VidModeGetDotClocks(ClientPtr client)
 }
 
 static int
-ProcXF86VidModeSetGamma(ClientPtr client)
-{
+ ProcXF86VidModeSetGamma(ClientPtr client) {
     REQUEST(xXF86VidModeSetGammaReq);
 
     DEBUG_P("XF86VidModeSetGamma");
 
     REQUEST_SIZE_MATCH(xXF86VidModeSetGammaReq);
 
-    if(stuff->screen >= screenInfo.numScreens)
+    if (stuff->screen >= screenInfo.numScreens)
         return BadValue;
 
-    if (!VidModeSetGamma(stuff->screen, ((float)stuff->red)/10000.,
-		((float)stuff->green)/10000., ((float)stuff->blue)/10000.))
-	return BadValue;
+    if (!VidModeSetGamma(stuff->screen, ((float) stuff->red) / 10000.,
+                         ((float) stuff->green) / 10000.,
+                         ((float) stuff->blue) / 10000.))
+        return BadValue;
 
     return Success;
-}
-
-static int
-ProcXF86VidModeGetGamma(ClientPtr client)
-{
+} static int
+ ProcXF86VidModeGetGamma(ClientPtr client) {
     REQUEST(xXF86VidModeGetGammaReq);
     xXF86VidModeGetGammaReply rep;
     float red, green, blue;
 
-    DEBUG_P("XF86VidModeGetGamma");
+     DEBUG_P("XF86VidModeGetGamma");
 
-    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
 
-    if(stuff->screen >= screenInfo.numScreens)
-        return BadValue;
+    if (stuff->screen >= screenInfo.numScreens)
+         return BadValue;
 
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
     if (!VidModeGetGamma(stuff->screen, &red, &green, &blue))
-	return BadValue;
-    rep.red = (CARD32)(red * 10000.);
-    rep.green = (CARD32)(green * 10000.);
-    rep.blue = (CARD32)(blue * 10000.);
+         return BadValue;
+     rep.red = (CARD32) (red * 10000.);
+     rep.green = (CARD32) (green * 10000.);
+     rep.blue = (CARD32) (blue * 10000.);
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.red);
-	swapl(&rep.green);
-	swapl(&rep.blue);
-    }
-    WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *)&rep);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.red);
+        swapl(&rep.green);
+        swapl(&rep.blue);
+    } WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep);
+
     return Success;
 }
 
 static int
-ProcXF86VidModeSetGammaRamp(ClientPtr client)
-{
+ ProcXF86VidModeSetGammaRamp(ClientPtr client) {
     CARD16 *r, *g, *b;
     int length;
-    REQUEST(xXF86VidModeSetGammaRampReq);
+     REQUEST(xXF86VidModeSetGammaRampReq);
 
-    if(stuff->screen >= screenInfo.numScreens)
-	return BadValue;
+    if (stuff->screen >= screenInfo.numScreens)
+         return BadValue;
 
-    if(stuff->size != VidModeGetGammaRampSize(stuff->screen))
-	return BadValue;
+    if (stuff->size != VidModeGetGammaRampSize(stuff->screen))
+         return BadValue;
 
-    length = (stuff->size + 1) & ~1;
+     length = (stuff->size + 1) & ~1;
 
-    REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6);
+     REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6);
 
-    r = (CARD16*)&stuff[1];
-    g = r + length;
-    b = g + length;
+     r = (CARD16 *) &stuff[1];
+     g = r + length;
+     b = g + length;
 
     if (!VidModeSetGammaRamp(stuff->screen, stuff->size, r, g, b))
-        return BadValue;
-
-    return Success;
-}
+         return BadValue;
 
-static int
-ProcXF86VidModeGetGammaRamp(ClientPtr client)
-{
+     return Success;
+} static int
+ ProcXF86VidModeGetGammaRamp(ClientPtr client) {
     CARD16 *ramp = NULL;
     int length;
     size_t ramplen = 0;
     xXF86VidModeGetGammaRampReply rep;
-    REQUEST(xXF86VidModeGetGammaRampReq);
+     REQUEST(xXF86VidModeGetGammaRampReq);
 
-    if(stuff->screen >= screenInfo.numScreens)
-        return BadValue;
+    if (stuff->screen >= screenInfo.numScreens)
+         return BadValue;
 
-    if(stuff->size != VidModeGetGammaRampSize(stuff->screen))
-        return BadValue;
+    if (stuff->size != VidModeGetGammaRampSize(stuff->screen))
+         return BadValue;
 
-    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
 
-    length = (stuff->size + 1) & ~1;
+     length = (stuff->size + 1) & ~1;
 
-    if(stuff->size) {
-	ramplen = length * 3 * sizeof(CARD16);
-	if (!(ramp = malloc(ramplen)))
-	    return BadAlloc;
-   
-        if (!VidModeGetGammaRamp(stuff->screen, stuff->size, 
-		ramp, ramp + length, ramp + (length * 2))) {
-	    free(ramp);
-            return BadValue;
-	}
-    }
+    if (stuff->size) {
+        ramplen = length * 3 * sizeof(CARD16);
+        if (!(ramp = malloc(ramplen)))
+            return BadAlloc;
 
-    rep.type = X_Reply;
+        if (!VidModeGetGammaRamp(stuff->screen, stuff->size,
+                                 ramp, ramp + length, ramp + (length * 2))) {
+            free(ramp);
+            return BadValue;
+    }} rep.type = X_Reply;
     rep.length = (length >> 1) * 3;
     rep.sequenceNumber = client->sequence;
     rep.size = stuff->size;
-    if(client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swaps(&rep.size);
-	SwapShorts((short*)ramp, length * 3);
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swaps(&rep.size);
+        SwapShorts((short *) ramp, length * 3);
     }
-    WriteToClient(client, sizeof(xXF86VidModeGetGammaRampReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86VidModeGetGammaRampReply), (char *) &rep);
 
-    if(stuff->size) {
-	WriteToClient(client, ramplen, (char*)ramp);
+    if (stuff->size) {
+        WriteToClient(client, ramplen, (char *) ramp);
         free(ramp);
     }
 
     return Success;
 }
 
-
 static int
-ProcXF86VidModeGetGammaRampSize(ClientPtr client)
-{
+ ProcXF86VidModeGetGammaRampSize(ClientPtr client) {
     xXF86VidModeGetGammaRampSizeReply rep;
-    REQUEST(xXF86VidModeGetGammaRampSizeReq);
+     REQUEST(xXF86VidModeGetGammaRampSizeReq);
 
-    if(stuff->screen >= screenInfo.numScreens)
-        return BadValue;
+    if (stuff->screen >= screenInfo.numScreens)
+         return BadValue;
 
-    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
 
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.size = VidModeGetGammaRampSize(stuff->screen); 
-    if(client->swapped) {
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
+     rep.size = VidModeGetGammaRampSize(stuff->screen);
+    if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
         swaps(&rep.size);
-    }
-    WriteToClient(client,sizeof(xXF86VidModeGetGammaRampSizeReply),(char*)&rep);
+    } WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply),
+                    (char *) &rep);
 
     return Success;
 }
 
 static int
-ProcXF86VidModeGetPermissions(ClientPtr client)
-{
+ ProcXF86VidModeGetPermissions(ClientPtr client) {
     xXF86VidModeGetPermissionsReply rep;
-    REQUEST(xXF86VidModeGetPermissionsReq);
+     REQUEST(xXF86VidModeGetPermissionsReq);
 
-    if(stuff->screen >= screenInfo.numScreens)
-        return BadValue;
+    if (stuff->screen >= screenInfo.numScreens)
+         return BadValue;
 
-    REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
 
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.permissions = XF86VM_READ_PERMISSION;
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
+     rep.permissions = XF86VM_READ_PERMISSION;
     if (xf86GetVidModeEnabled() &&
-	(xf86GetVidModeAllowNonLocal() || LocalClient (client))) {
-	rep.permissions |= XF86VM_WRITE_PERMISSION;
-    }
-    if(client->swapped) {
+        (xf86GetVidModeAllowNonLocal() || LocalClient(client))) {
+        rep.permissions |= XF86VM_WRITE_PERMISSION;
+    } if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
         swapl(&rep.permissions);
     }
-    WriteToClient(client,sizeof(xXF86VidModeGetPermissionsReply),(char*)&rep);
+    WriteToClient(client, sizeof(xXF86VidModeGetPermissionsReply),
+                  (char *) &rep);
 
     return Success;
 }
 
-
 static int
-ProcXF86VidModeSetClientVersion(ClientPtr client)
-{
+ ProcXF86VidModeSetClientVersion(ClientPtr client) {
     REQUEST(xXF86VidModeSetClientVersionReq);
 
     VidModePrivPtr pPriv;
 
-    DEBUG_P("XF86VidModeSetClientVersion");
+     DEBUG_P("XF86VidModeSetClientVersion");
 
-    REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
+     REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
 
     if ((pPriv = VM_GETPRIV(client)) == NULL) {
-	pPriv = malloc(sizeof(VidModePrivRec));
-	if (!pPriv)
-	    return BadAlloc;
-	VM_SETPRIV(client, pPriv);
-    }
-    pPriv->major = stuff->major;
+        pPriv = malloc(sizeof(VidModePrivRec));
+        if (!pPriv)
+            return BadAlloc;
+        VM_SETPRIV(client, pPriv);
+    } pPriv->major = stuff->major;
+
     pPriv->minor = stuff->minor;
-    
+
     return Success;
 }
 
 static int
-ProcXF86VidModeDispatch(ClientPtr client)
-{
+ ProcXF86VidModeDispatch(ClientPtr client) {
     REQUEST(xReq);
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_XF86VidModeQueryVersion:
-	return ProcXF86VidModeQueryVersion(client);
-    case X_XF86VidModeGetModeLine:
-	return ProcXF86VidModeGetModeLine(client);
-    case X_XF86VidModeGetMonitor:
-	return ProcXF86VidModeGetMonitor(client);
-    case X_XF86VidModeGetAllModeLines:
-	return ProcXF86VidModeGetAllModeLines(client);
-    case X_XF86VidModeValidateModeLine:
-	return ProcXF86VidModeValidateModeLine(client);
-    case X_XF86VidModeGetViewPort:
-	return ProcXF86VidModeGetViewPort(client);
-    case X_XF86VidModeGetDotClocks:
-	return ProcXF86VidModeGetDotClocks(client);
-    case X_XF86VidModeSetClientVersion:
-	return ProcXF86VidModeSetClientVersion(client);
-    case X_XF86VidModeGetGamma:
-	return ProcXF86VidModeGetGamma(client);
-    case X_XF86VidModeGetGammaRamp:
-	return ProcXF86VidModeGetGammaRamp(client);
-    case X_XF86VidModeGetGammaRampSize:
-	return ProcXF86VidModeGetGammaRampSize(client);
-    case X_XF86VidModeGetPermissions:
-	return ProcXF86VidModeGetPermissions(client);
-    default:
-	if (!xf86GetVidModeEnabled())
-	    return VidModeErrorBase + XF86VidModeExtensionDisabled;
-	if (xf86GetVidModeAllowNonLocal() || LocalClient (client)) {
-	    switch (stuff->data) {
-	    case X_XF86VidModeAddModeLine:
-		return ProcXF86VidModeAddModeLine(client);
-	    case X_XF86VidModeDeleteModeLine:
-		return ProcXF86VidModeDeleteModeLine(client);
-	    case X_XF86VidModeModModeLine:
-		return ProcXF86VidModeModModeLine(client);
-	    case X_XF86VidModeSwitchMode:
-		return ProcXF86VidModeSwitchMode(client);
-	    case X_XF86VidModeSwitchToMode:
-		return ProcXF86VidModeSwitchToMode(client);
-	    case X_XF86VidModeLockModeSwitch:
-		return ProcXF86VidModeLockModeSwitch(client);
-	    case X_XF86VidModeSetViewPort:
-		return ProcXF86VidModeSetViewPort(client);
-	    case X_XF86VidModeSetGamma:
-		return ProcXF86VidModeSetGamma(client);
-	    case X_XF86VidModeSetGammaRamp:
-		return ProcXF86VidModeSetGammaRamp(client);
-	    default:
-		return BadRequest;
-	    }
-	} else
-	    return VidModeErrorBase + XF86VidModeClientNotLocal;
+        return ProcXF86VidModeQueryVersion(client);
+        case X_XF86VidModeGetModeLine:return ProcXF86VidModeGetModeLine(client);
+        case X_XF86VidModeGetMonitor:return ProcXF86VidModeGetMonitor(client);
+        case X_XF86VidModeGetAllModeLines:return
+            ProcXF86VidModeGetAllModeLines(client);
+        case X_XF86VidModeValidateModeLine:return
+            ProcXF86VidModeValidateModeLine(client);
+        case X_XF86VidModeGetViewPort:return ProcXF86VidModeGetViewPort(client);
+        case X_XF86VidModeGetDotClocks:return
+            ProcXF86VidModeGetDotClocks(client);
+        case X_XF86VidModeSetClientVersion:return
+            ProcXF86VidModeSetClientVersion(client);
+        case X_XF86VidModeGetGamma:return ProcXF86VidModeGetGamma(client);
+        case X_XF86VidModeGetGammaRamp:return
+            ProcXF86VidModeGetGammaRamp(client);
+        case X_XF86VidModeGetGammaRampSize:return
+            ProcXF86VidModeGetGammaRampSize(client);
+        case X_XF86VidModeGetPermissions:return
+            ProcXF86VidModeGetPermissions(client);
+        default:if (!xf86GetVidModeEnabled())
+            return VidModeErrorBase + XF86VidModeExtensionDisabled;
+        if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
+            switch (stuff->data) {
+            case X_XF86VidModeAddModeLine:
+                return ProcXF86VidModeAddModeLine(client);
+                case X_XF86VidModeDeleteModeLine:return
+                    ProcXF86VidModeDeleteModeLine(client);
+                case X_XF86VidModeModModeLine:return
+                    ProcXF86VidModeModModeLine(client);
+                case X_XF86VidModeSwitchMode:return
+                    ProcXF86VidModeSwitchMode(client);
+                case X_XF86VidModeSwitchToMode:return
+                    ProcXF86VidModeSwitchToMode(client);
+                case X_XF86VidModeLockModeSwitch:return
+                    ProcXF86VidModeLockModeSwitch(client);
+                case X_XF86VidModeSetViewPort:return
+                    ProcXF86VidModeSetViewPort(client);
+                case X_XF86VidModeSetGamma:return
+                    ProcXF86VidModeSetGamma(client);
+                case X_XF86VidModeSetGammaRamp:return
+                    ProcXF86VidModeSetGammaRamp(client);
+                default:return BadRequest;
+        }}
+        else
+             return VidModeErrorBase + XF86VidModeClientNotLocal;
     }
 }
 
 static int
-SProcXF86VidModeQueryVersion(ClientPtr client)
-{
+ SProcXF86VidModeQueryVersion(ClientPtr client) {
     REQUEST(xXF86VidModeQueryVersionReq);
     swaps(&stuff->length);
     return ProcXF86VidModeQueryVersion(client);
-}
-
-static int
-SProcXF86VidModeGetModeLine(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeGetModeLine(ClientPtr client) {
     REQUEST(xXF86VidModeGetModeLineReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
     swaps(&stuff->screen);
     return ProcXF86VidModeGetModeLine(client);
-}
-
-static int
-SProcXF86VidModeGetAllModeLines(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeGetAllModeLines(ClientPtr client) {
     REQUEST(xXF86VidModeGetAllModeLinesReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
     swaps(&stuff->screen);
     return ProcXF86VidModeGetAllModeLines(client);
-}
-
-static int
-SProcXF86VidModeAddModeLine(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeAddModeLine(ClientPtr client) {
     xXF86OldVidModeAddModeLineReq *oldstuff =
-			(xXF86OldVidModeAddModeLineReq *)client->requestBuffer;
+        (xXF86OldVidModeAddModeLineReq *) client->requestBuffer;
     int ver;
-    
-    REQUEST(xXF86VidModeAddModeLineReq);
-    ver = ClientMajorVersion(client);
+
+     REQUEST(xXF86VidModeAddModeLineReq);
+     ver = ClientMajorVersion(client);
     if (ver < 2) {
-	swaps(&oldstuff->length);
-	REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq);
-	swapl(&oldstuff->screen);
-	swaps(&oldstuff->hdisplay);
-	swaps(&oldstuff->hsyncstart);
-	swaps(&oldstuff->hsyncend);
-	swaps(&oldstuff->htotal);
-	swaps(&oldstuff->vdisplay);
-	swaps(&oldstuff->vsyncstart);
-	swaps(&oldstuff->vsyncend);
-	swaps(&oldstuff->vtotal);
-	swapl(&oldstuff->flags);
-	swapl(&oldstuff->privsize);
-	SwapRestL(oldstuff);
-    } else {
-	swaps(&stuff->length);
-	REQUEST_AT_LEAST_SIZE(xXF86VidModeAddModeLineReq);
-	swapl(&stuff->screen);
-	swaps(&stuff->hdisplay);
-	swaps(&stuff->hsyncstart);
-	swaps(&stuff->hsyncend);
-	swaps(&stuff->htotal);
-	swaps(&stuff->hskew);
-	swaps(&stuff->vdisplay);
-	swaps(&stuff->vsyncstart);
-	swaps(&stuff->vsyncend);
-	swaps(&stuff->vtotal);
-	swapl(&stuff->flags);
-	swapl(&stuff->privsize);
-	SwapRestL(stuff);
+        swaps(&oldstuff->length);
+        REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq);
+        swapl(&oldstuff->screen);
+        swaps(&oldstuff->hdisplay);
+        swaps(&oldstuff->hsyncstart);
+        swaps(&oldstuff->hsyncend);
+        swaps(&oldstuff->htotal);
+        swaps(&oldstuff->vdisplay);
+        swaps(&oldstuff->vsyncstart);
+        swaps(&oldstuff->vsyncend);
+        swaps(&oldstuff->vtotal);
+        swapl(&oldstuff->flags);
+        swapl(&oldstuff->privsize);
+        SwapRestL(oldstuff);
+    }
+    else {
+        swaps(&stuff->length);
+        REQUEST_AT_LEAST_SIZE(xXF86VidModeAddModeLineReq);
+        swapl(&stuff->screen);
+        swaps(&stuff->hdisplay);
+        swaps(&stuff->hsyncstart);
+        swaps(&stuff->hsyncend);
+        swaps(&stuff->htotal);
+        swaps(&stuff->hskew);
+        swaps(&stuff->vdisplay);
+        swaps(&stuff->vsyncstart);
+        swaps(&stuff->vsyncend);
+        swaps(&stuff->vtotal);
+        swapl(&stuff->flags);
+        swapl(&stuff->privsize);
+        SwapRestL(stuff);
     }
     return ProcXF86VidModeAddModeLine(client);
 }
 
 static int
-SProcXF86VidModeDeleteModeLine(ClientPtr client)
-{
+ SProcXF86VidModeDeleteModeLine(ClientPtr client) {
     xXF86OldVidModeDeleteModeLineReq *oldstuff =
-		(xXF86OldVidModeDeleteModeLineReq *)client->requestBuffer;
+        (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer;
     int ver;
 
-    REQUEST(xXF86VidModeDeleteModeLineReq);
-    ver = ClientMajorVersion(client);
+     REQUEST(xXF86VidModeDeleteModeLineReq);
+     ver = ClientMajorVersion(client);
     if (ver < 2) {
-	swaps(&oldstuff->length);
-	REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq);
-	swapl(&oldstuff->screen);
-	swaps(&oldstuff->hdisplay);
-	swaps(&oldstuff->hsyncstart);
-	swaps(&oldstuff->hsyncend);
-	swaps(&oldstuff->htotal);
-	swaps(&oldstuff->vdisplay);
-	swaps(&oldstuff->vsyncstart);
-	swaps(&oldstuff->vsyncend);
-	swaps(&oldstuff->vtotal);
-	swapl(&oldstuff->flags);
-	swapl(&oldstuff->privsize);
-	SwapRestL(oldstuff);
-    } else {
-	swaps(&stuff->length);
-	REQUEST_AT_LEAST_SIZE(xXF86VidModeDeleteModeLineReq);
-	swapl(&stuff->screen);
-	swaps(&stuff->hdisplay);
-	swaps(&stuff->hsyncstart);
-	swaps(&stuff->hsyncend);
-	swaps(&stuff->htotal);
-	swaps(&stuff->hskew);
-	swaps(&stuff->vdisplay);
-	swaps(&stuff->vsyncstart);
-	swaps(&stuff->vsyncend);
-	swaps(&stuff->vtotal);
-	swapl(&stuff->flags);
-	swapl(&stuff->privsize);
-	SwapRestL(stuff);
+        swaps(&oldstuff->length);
+        REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq);
+        swapl(&oldstuff->screen);
+        swaps(&oldstuff->hdisplay);
+        swaps(&oldstuff->hsyncstart);
+        swaps(&oldstuff->hsyncend);
+        swaps(&oldstuff->htotal);
+        swaps(&oldstuff->vdisplay);
+        swaps(&oldstuff->vsyncstart);
+        swaps(&oldstuff->vsyncend);
+        swaps(&oldstuff->vtotal);
+        swapl(&oldstuff->flags);
+        swapl(&oldstuff->privsize);
+        SwapRestL(oldstuff);
+    }
+    else {
+        swaps(&stuff->length);
+        REQUEST_AT_LEAST_SIZE(xXF86VidModeDeleteModeLineReq);
+        swapl(&stuff->screen);
+        swaps(&stuff->hdisplay);
+        swaps(&stuff->hsyncstart);
+        swaps(&stuff->hsyncend);
+        swaps(&stuff->htotal);
+        swaps(&stuff->hskew);
+        swaps(&stuff->vdisplay);
+        swaps(&stuff->vsyncstart);
+        swaps(&stuff->vsyncend);
+        swaps(&stuff->vtotal);
+        swapl(&stuff->flags);
+        swapl(&stuff->privsize);
+        SwapRestL(stuff);
     }
     return ProcXF86VidModeDeleteModeLine(client);
 }
 
 static int
-SProcXF86VidModeModModeLine(ClientPtr client)
-{
+ SProcXF86VidModeModModeLine(ClientPtr client) {
     xXF86OldVidModeModModeLineReq *oldstuff =
-		(xXF86OldVidModeModModeLineReq *)client->requestBuffer;
+        (xXF86OldVidModeModModeLineReq *) client->requestBuffer;
     int ver;
 
-    REQUEST(xXF86VidModeModModeLineReq);
-    ver = ClientMajorVersion(client);
+     REQUEST(xXF86VidModeModModeLineReq);
+     ver = ClientMajorVersion(client);
     if (ver < 2) {
-	swaps(&oldstuff->length);
-	REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq);
-	swapl(&oldstuff->screen);
-	swaps(&oldstuff->hdisplay);
-	swaps(&oldstuff->hsyncstart);
-	swaps(&oldstuff->hsyncend);
-	swaps(&oldstuff->htotal);
-	swaps(&oldstuff->vdisplay);
-	swaps(&oldstuff->vsyncstart);
-	swaps(&oldstuff->vsyncend);
-	swaps(&oldstuff->vtotal);
-	swapl(&oldstuff->flags);
-	swapl(&oldstuff->privsize);
-	SwapRestL(oldstuff);
-    } else {
-	swaps(&stuff->length);
-	REQUEST_AT_LEAST_SIZE(xXF86VidModeModModeLineReq);
-	swapl(&stuff->screen);
-	swaps(&stuff->hdisplay);
-	swaps(&stuff->hsyncstart);
-	swaps(&stuff->hsyncend);
-	swaps(&stuff->htotal);
-	swaps(&stuff->hskew);
-	swaps(&stuff->vdisplay);
-	swaps(&stuff->vsyncstart);
-	swaps(&stuff->vsyncend);
-	swaps(&stuff->vtotal);
-	swapl(&stuff->flags);
-	swapl(&stuff->privsize);
-	SwapRestL(stuff);      
+        swaps(&oldstuff->length);
+        REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq);
+        swapl(&oldstuff->screen);
+        swaps(&oldstuff->hdisplay);
+        swaps(&oldstuff->hsyncstart);
+        swaps(&oldstuff->hsyncend);
+        swaps(&oldstuff->htotal);
+        swaps(&oldstuff->vdisplay);
+        swaps(&oldstuff->vsyncstart);
+        swaps(&oldstuff->vsyncend);
+        swaps(&oldstuff->vtotal);
+        swapl(&oldstuff->flags);
+        swapl(&oldstuff->privsize);
+        SwapRestL(oldstuff);
+    }
+    else {
+        swaps(&stuff->length);
+        REQUEST_AT_LEAST_SIZE(xXF86VidModeModModeLineReq);
+        swapl(&stuff->screen);
+        swaps(&stuff->hdisplay);
+        swaps(&stuff->hsyncstart);
+        swaps(&stuff->hsyncend);
+        swaps(&stuff->htotal);
+        swaps(&stuff->hskew);
+        swaps(&stuff->vdisplay);
+        swaps(&stuff->vsyncstart);
+        swaps(&stuff->vsyncend);
+        swaps(&stuff->vtotal);
+        swapl(&stuff->flags);
+        swapl(&stuff->privsize);
+        SwapRestL(stuff);
     }
     return ProcXF86VidModeModModeLine(client);
 }
 
 static int
-SProcXF86VidModeValidateModeLine(ClientPtr client)
-{
+ SProcXF86VidModeValidateModeLine(ClientPtr client) {
     xXF86OldVidModeValidateModeLineReq *oldstuff =
-		(xXF86OldVidModeValidateModeLineReq *)client->requestBuffer;
+        (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer;
     int ver;
 
-    REQUEST(xXF86VidModeValidateModeLineReq);
-    ver = ClientMajorVersion(client);
+     REQUEST(xXF86VidModeValidateModeLineReq);
+     ver = ClientMajorVersion(client);
     if (ver < 2) {
-	swaps(&oldstuff->length);
-	REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq);
-	swapl(&oldstuff->screen);
-	swaps(&oldstuff->hdisplay);
-	swaps(&oldstuff->hsyncstart);
-	swaps(&oldstuff->hsyncend);
-	swaps(&oldstuff->htotal);
-	swaps(&oldstuff->vdisplay);
-	swaps(&oldstuff->vsyncstart);
-	swaps(&oldstuff->vsyncend);
-	swaps(&oldstuff->vtotal);
-	swapl(&oldstuff->flags);
-	swapl(&oldstuff->privsize);
-	SwapRestL(oldstuff);
-    } else {
-	swaps(&stuff->length);
-	REQUEST_AT_LEAST_SIZE(xXF86VidModeValidateModeLineReq);
-	swapl(&stuff->screen);
-	swaps(&stuff->hdisplay);
-	swaps(&stuff->hsyncstart);
-	swaps(&stuff->hsyncend);
-	swaps(&stuff->htotal);
-	swaps(&stuff->hskew);
-	swaps(&stuff->vdisplay);
-	swaps(&stuff->vsyncstart);
-	swaps(&stuff->vsyncend);
-	swaps(&stuff->vtotal);
-	swapl(&stuff->flags);
-	swapl(&stuff->privsize);
-	SwapRestL(stuff);
+        swaps(&oldstuff->length);
+        REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq);
+        swapl(&oldstuff->screen);
+        swaps(&oldstuff->hdisplay);
+        swaps(&oldstuff->hsyncstart);
+        swaps(&oldstuff->hsyncend);
+        swaps(&oldstuff->htotal);
+        swaps(&oldstuff->vdisplay);
+        swaps(&oldstuff->vsyncstart);
+        swaps(&oldstuff->vsyncend);
+        swaps(&oldstuff->vtotal);
+        swapl(&oldstuff->flags);
+        swapl(&oldstuff->privsize);
+        SwapRestL(oldstuff);
+    }
+    else {
+        swaps(&stuff->length);
+        REQUEST_AT_LEAST_SIZE(xXF86VidModeValidateModeLineReq);
+        swapl(&stuff->screen);
+        swaps(&stuff->hdisplay);
+        swaps(&stuff->hsyncstart);
+        swaps(&stuff->hsyncend);
+        swaps(&stuff->htotal);
+        swaps(&stuff->hskew);
+        swaps(&stuff->vdisplay);
+        swaps(&stuff->vsyncstart);
+        swaps(&stuff->vsyncend);
+        swaps(&stuff->vtotal);
+        swapl(&stuff->flags);
+        swapl(&stuff->privsize);
+        SwapRestL(stuff);
     }
     return ProcXF86VidModeValidateModeLine(client);
 }
 
 static int
-SProcXF86VidModeSwitchMode(ClientPtr client)
-{
+ SProcXF86VidModeSwitchMode(ClientPtr client) {
     REQUEST(xXF86VidModeSwitchModeReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeSwitchModeReq);
     swaps(&stuff->screen);
     swaps(&stuff->zoom);
     return ProcXF86VidModeSwitchMode(client);
-}
-
-static int
-SProcXF86VidModeSwitchToMode(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeSwitchToMode(ClientPtr client) {
     REQUEST(xXF86VidModeSwitchToModeReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeSwitchToModeReq);
     swapl(&stuff->screen);
     return ProcXF86VidModeSwitchToMode(client);
-}
-
-static int
-SProcXF86VidModeLockModeSwitch(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeLockModeSwitch(ClientPtr client) {
     REQUEST(xXF86VidModeLockModeSwitchReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq);
     swaps(&stuff->screen);
     swaps(&stuff->lock);
     return ProcXF86VidModeLockModeSwitch(client);
-}
-
-static int
-SProcXF86VidModeGetMonitor(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeGetMonitor(ClientPtr client) {
     REQUEST(xXF86VidModeGetMonitorReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
     swaps(&stuff->screen);
     return ProcXF86VidModeGetMonitor(client);
-}
-
-static int
-SProcXF86VidModeGetViewPort(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeGetViewPort(ClientPtr client) {
     REQUEST(xXF86VidModeGetViewPortReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
     swaps(&stuff->screen);
     return ProcXF86VidModeGetViewPort(client);
-}
-
-static int
-SProcXF86VidModeSetViewPort(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeSetViewPort(ClientPtr client) {
     REQUEST(xXF86VidModeSetViewPortReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeSetViewPortReq);
@@ -1891,32 +1843,23 @@ SProcXF86VidModeSetViewPort(ClientPtr client)
     swapl(&stuff->x);
     swapl(&stuff->y);
     return ProcXF86VidModeSetViewPort(client);
-}
-
-static int
-SProcXF86VidModeGetDotClocks(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeGetDotClocks(ClientPtr client) {
     REQUEST(xXF86VidModeGetDotClocksReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
     swaps(&stuff->screen);
     return ProcXF86VidModeGetDotClocks(client);
-}
-
-static int
-SProcXF86VidModeSetClientVersion(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeSetClientVersion(ClientPtr client) {
     REQUEST(xXF86VidModeSetClientVersionReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
     swaps(&stuff->major);
     swaps(&stuff->minor);
     return ProcXF86VidModeSetClientVersion(client);
-}
-
-static int
-SProcXF86VidModeSetGamma(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeSetGamma(ClientPtr client) {
     REQUEST(xXF86VidModeSetGammaReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeSetGammaReq);
@@ -1925,174 +1868,149 @@ SProcXF86VidModeSetGamma(ClientPtr client)
     swapl(&stuff->green);
     swapl(&stuff->blue);
     return ProcXF86VidModeSetGamma(client);
-}
-
-static int
-SProcXF86VidModeGetGamma(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeGetGamma(ClientPtr client) {
     REQUEST(xXF86VidModeGetGammaReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
     swaps(&stuff->screen);
     return ProcXF86VidModeGetGamma(client);
-}
-
-static int
-SProcXF86VidModeSetGammaRamp(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeSetGammaRamp(ClientPtr client) {
     int length;
-    REQUEST(xXF86VidModeSetGammaRampReq);
-    swaps(&stuff->length);
-    REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq);
-    swaps(&stuff->size);
-    swaps(&stuff->screen);
-    length = ((stuff->size + 1) & ~1) * 6;
-    REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
-    SwapRestS(stuff);
-    return ProcXF86VidModeSetGammaRamp(client);
-}
-
-static int
-SProcXF86VidModeGetGammaRamp(ClientPtr client)
-{
+     REQUEST(xXF86VidModeSetGammaRampReq);
+     swaps(&stuff->length);
+     REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq);
+     swaps(&stuff->size);
+     swaps(&stuff->screen);
+     length = ((stuff->size + 1) & ~1) * 6;
+     REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
+     SwapRestS(stuff);
+     return ProcXF86VidModeSetGammaRamp(client);
+} static int
+ SProcXF86VidModeGetGammaRamp(ClientPtr client) {
     REQUEST(xXF86VidModeGetGammaRampReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
     swaps(&stuff->size);
     swaps(&stuff->screen);
     return ProcXF86VidModeGetGammaRamp(client);
-}
-
-static int
-SProcXF86VidModeGetGammaRampSize(ClientPtr client)
-{   
+} static int
+ SProcXF86VidModeGetGammaRampSize(ClientPtr client) {
     REQUEST(xXF86VidModeGetGammaRampSizeReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
     swaps(&stuff->screen);
     return ProcXF86VidModeGetGammaRampSize(client);
-}
-
-static int
-SProcXF86VidModeGetPermissions(ClientPtr client)
-{   
+} static int
+ SProcXF86VidModeGetPermissions(ClientPtr client) {
     REQUEST(xXF86VidModeGetPermissionsReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
     swaps(&stuff->screen);
     return ProcXF86VidModeGetPermissions(client);
-}
-
-
-static int
-SProcXF86VidModeDispatch(ClientPtr client)
-{
+} static int
+ SProcXF86VidModeDispatch(ClientPtr client) {
     REQUEST(xReq);
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_XF86VidModeQueryVersion:
-	return SProcXF86VidModeQueryVersion(client);
-    case X_XF86VidModeGetModeLine:
-	return SProcXF86VidModeGetModeLine(client);
-    case X_XF86VidModeGetMonitor:
-	return SProcXF86VidModeGetMonitor(client);
-    case X_XF86VidModeGetAllModeLines:
-	return SProcXF86VidModeGetAllModeLines(client);
-    case X_XF86VidModeGetViewPort:
-	return SProcXF86VidModeGetViewPort(client);
-    case X_XF86VidModeValidateModeLine:
-	return SProcXF86VidModeValidateModeLine(client);
-    case X_XF86VidModeGetDotClocks:
-	return SProcXF86VidModeGetDotClocks(client);
-    case X_XF86VidModeSetClientVersion:
-	return SProcXF86VidModeSetClientVersion(client);
-    case X_XF86VidModeGetGamma:
-	return SProcXF86VidModeGetGamma(client);
-    case X_XF86VidModeGetGammaRamp:
-	return SProcXF86VidModeGetGammaRamp(client);
-    case X_XF86VidModeGetGammaRampSize:
-	return SProcXF86VidModeGetGammaRampSize(client);
-    case X_XF86VidModeGetPermissions:
-	return SProcXF86VidModeGetPermissions(client);
-    default:
-	if (!xf86GetVidModeEnabled())
-	    return VidModeErrorBase + XF86VidModeExtensionDisabled;
-	if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
-	    switch (stuff->data) {
-	    case X_XF86VidModeAddModeLine:
-		return SProcXF86VidModeAddModeLine(client);
-	    case X_XF86VidModeDeleteModeLine:
-		return SProcXF86VidModeDeleteModeLine(client);
-	    case X_XF86VidModeModModeLine:
-		return SProcXF86VidModeModModeLine(client);
-	    case X_XF86VidModeSwitchMode:
-		return SProcXF86VidModeSwitchMode(client);
-	    case X_XF86VidModeSwitchToMode:
-		return SProcXF86VidModeSwitchToMode(client);
-	    case X_XF86VidModeLockModeSwitch:
-		return SProcXF86VidModeLockModeSwitch(client);
-	    case X_XF86VidModeSetViewPort:
-		return SProcXF86VidModeSetViewPort(client);
-	    case X_XF86VidModeSetGamma:
-		return SProcXF86VidModeSetGamma(client);
-	    case X_XF86VidModeSetGammaRamp:
-		return SProcXF86VidModeSetGammaRamp(client);
-	    default:
-		return BadRequest;
-	    }
-	} else
-	    return VidModeErrorBase + XF86VidModeClientNotLocal;
+        return SProcXF86VidModeQueryVersion(client);
+        case X_XF86VidModeGetModeLine:return
+            SProcXF86VidModeGetModeLine(client);
+        case X_XF86VidModeGetMonitor:return SProcXF86VidModeGetMonitor(client);
+        case X_XF86VidModeGetAllModeLines:return
+            SProcXF86VidModeGetAllModeLines(client);
+        case X_XF86VidModeGetViewPort:return
+            SProcXF86VidModeGetViewPort(client);
+        case X_XF86VidModeValidateModeLine:return
+            SProcXF86VidModeValidateModeLine(client);
+        case X_XF86VidModeGetDotClocks:return
+            SProcXF86VidModeGetDotClocks(client);
+        case X_XF86VidModeSetClientVersion:return
+            SProcXF86VidModeSetClientVersion(client);
+        case X_XF86VidModeGetGamma:return SProcXF86VidModeGetGamma(client);
+        case X_XF86VidModeGetGammaRamp:return
+            SProcXF86VidModeGetGammaRamp(client);
+        case X_XF86VidModeGetGammaRampSize:return
+            SProcXF86VidModeGetGammaRampSize(client);
+        case X_XF86VidModeGetPermissions:return
+            SProcXF86VidModeGetPermissions(client);
+        default:if (!xf86GetVidModeEnabled())
+            return VidModeErrorBase + XF86VidModeExtensionDisabled;
+        if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
+            switch (stuff->data) {
+            case X_XF86VidModeAddModeLine:
+                return SProcXF86VidModeAddModeLine(client);
+                case X_XF86VidModeDeleteModeLine:return
+                    SProcXF86VidModeDeleteModeLine(client);
+                case X_XF86VidModeModModeLine:return
+                    SProcXF86VidModeModModeLine(client);
+                case X_XF86VidModeSwitchMode:return
+                    SProcXF86VidModeSwitchMode(client);
+                case X_XF86VidModeSwitchToMode:return
+                    SProcXF86VidModeSwitchToMode(client);
+                case X_XF86VidModeLockModeSwitch:return
+                    SProcXF86VidModeLockModeSwitch(client);
+                case X_XF86VidModeSetViewPort:return
+                    SProcXF86VidModeSetViewPort(client);
+                case X_XF86VidModeSetGamma:return
+                    SProcXF86VidModeSetGamma(client);
+                case X_XF86VidModeSetGammaRamp:return
+                    SProcXF86VidModeSetGammaRamp(client);
+                default:return BadRequest;
+        }}
+        else
+             return VidModeErrorBase + XF86VidModeClientNotLocal;
     }
 }
 
 void
-XFree86VidModeExtensionInit(void)
-{
-    ExtensionEntry* extEntry;
+ XFree86VidModeExtensionInit(void) {
+    ExtensionEntry *extEntry;
     ScreenPtr pScreen;
-    int		    i;
-    Bool	    enabled = FALSE;
+    int i;
+    Bool enabled = FALSE;
 
-    DEBUG_P("XFree86VidModeExtensionInit");
+     DEBUG_P("XFree86VidModeExtensionInit");
 
     if (!dixRegisterPrivateKey(&VidModeClientPrivateKeyRec, PRIVATE_CLIENT, 0))
-	return;
+         return;
 #ifdef XF86VIDMODE_EVENTS
     if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
-	return;
+         return;
 #endif
 
 #ifdef XF86VIDMODE_EVENTS
-    EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");
+     EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");
 #endif
 
-    for(i = 0; i < screenInfo.numScreens; i++) {
+    for (i = 0; i < screenInfo.numScreens; i++) {
         pScreen = screenInfo.screens[i];
-	if (VidModeExtensionInit(pScreen))
-	    enabled = TRUE;
+        if (VidModeExtensionInit(pScreen))
+            enabled = TRUE;
     }
     /* This means that the DDX doesn't want the vidmode extension enabled */
-    if (!enabled)
-	return;
+        if (!enabled)
+         return;
 
     if (
 #ifdef XF86VIDMODE_EVENTS
-        EventType &&
+           EventType &&
 #endif
-	(extEntry = AddExtension(XF86VIDMODENAME,
-				XF86VidModeNumberEvents,
-				XF86VidModeNumberErrors,
-				ProcXF86VidModeDispatch,
-				SProcXF86VidModeDispatch,
-				NULL,
-				StandardMinorOpcode))) {
+           (extEntry = AddExtension(XF86VIDMODENAME,
+                                    XF86VidModeNumberEvents,
+                                    XF86VidModeNumberErrors,
+                                    ProcXF86VidModeDispatch,
+                                    SProcXF86VidModeDispatch,
+                                    NULL, StandardMinorOpcode))) {
 #if 0
-	XF86VidModeReqCode = (unsigned char)extEntry->base;
+        XF86VidModeReqCode = (unsigned char) extEntry->base;
 #endif
-	VidModeErrorBase = extEntry->errorBase;
+        VidModeErrorBase = extEntry->errorBase;
 #ifdef XF86VIDMODE_EVENTS
-	XF86VidModeEventBase = extEntry->eventBase;
-	EventSwapVector[XF86VidModeEventBase] = (EventSwapPtr)SXF86VidModeNotifyEvent;
+        XF86VidModeEventBase = extEntry->eventBase;
+        EventSwapVector[XF86VidModeEventBase] =
+            (EventSwapPtr) SXF86VidModeNotifyEvent;
 #endif
     }
 }
diff --git a/xorg-server/hw/xfree86/dixmods/fbmodule.c b/xorg-server/hw/xfree86/dixmods/fbmodule.c
index 4df2646dd..5895ba296 100644
--- a/xorg-server/hw/xfree86/dixmods/fbmodule.c
+++ b/xorg-server/hw/xfree86/dixmods/fbmodule.c
@@ -31,22 +31,22 @@
 #include "xf86Module.h"
 #include "fb.h"
 
-static XF86ModuleVersionInfo VersRec =
-{
+static XF86ModuleVersionInfo VersRec = {
 #ifdef FB_ACCESS_WRAPPER
-	"wfb",
+    "wfb",
 #else
-	"fb",
+    "fb",
 #endif
-	MODULEVENDORSTRING,
-	MODINFOSTRING1,
-	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
-	1, 0, 0,
-	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
-	ABI_ANSIC_VERSION,
-	MOD_CLASS_NONE,
-	{0,0,0,0}       /* signature, to be patched into the file by a tool */
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_ANSIC,            /* Only need the ansic layer */
+    ABI_ANSIC_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}                /* signature, to be patched into the file by a tool */
 };
 
-_X_EXPORT XF86ModuleData FBPREFIX(ModuleData) = { &VersRec, NULL, NULL };
+_X_EXPORT XF86ModuleData FBPREFIX(ModuleData) = {
+&VersRec, NULL, NULL};
diff --git a/xorg-server/hw/xfree86/dixmods/glxmodule.c b/xorg-server/hw/xfree86/dixmods/glxmodule.c
index 62a047e26..e72f3821a 100644
--- a/xorg-server/hw/xfree86/dixmods/glxmodule.c
+++ b/xorg-server/hw/xfree86/dixmods/glxmodule.c
@@ -47,8 +47,7 @@ static MODULESETUPPROTO(glxSetup);
 
 static const char *initdeps[] = { "DOUBLE-BUFFER", "COMPOSITE", NULL };
 
-static ExtensionModule GLXExt =
-{
+static ExtensionModule GLXExt = {
     GlxExtensionInit,
     "GLX",
     &noGlxExtension,
@@ -56,18 +55,17 @@ static ExtensionModule GLXExt =
     initdeps
 };
 
-static XF86ModuleVersionInfo VersRec =
-{
-        "glx",
-        MODULEVENDORSTRING,
-        MODINFOSTRING1,
-        MODINFOSTRING2,
-        XORG_VERSION_CURRENT,
-        1, 0, 0,
-        ABI_CLASS_EXTENSION,
-        ABI_EXTENSION_VERSION,
-        MOD_CLASS_NONE,
-        {0,0,0,0}
+static XF86ModuleVersionInfo VersRec = {
+    "glx",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_EXTENSION,
+    ABI_EXTENSION_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
 };
 
 _X_EXPORT XF86ModuleData glxModuleData = { &VersRec, glxSetup, NULL };
@@ -79,26 +77,27 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
     __GLXprovider *provider;
 
     if (setupDone) {
-	if (errmaj) *errmaj = LDR_ONCEONLY;
-	return NULL;
-    } 
+        if (errmaj)
+            *errmaj = LDR_ONCEONLY;
+        return NULL;
+    }
 
     setupDone = TRUE;
 
     provider = LoaderSymbol("__glXDRISWRastProvider");
     if (provider == NULL)
-	return NULL;
+        return NULL;
     GlxPushProvider(provider);
 
-    xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n", 
-	    xf86Info.aiglx ? "enabled" : "disabled");
+    xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n",
+            xf86Info.aiglx ? "enabled" : "disabled");
     if (xf86Info.aiglx) {
-      provider = LoaderSymbol("__glXDRIProvider");
-      if (provider)
-	GlxPushProvider(provider);
-      provider = LoaderSymbol("__glXDRI2Provider");
-      if (provider)
-	GlxPushProvider(provider);
+        provider = LoaderSymbol("__glXDRIProvider");
+        if (provider)
+            GlxPushProvider(provider);
+        provider = LoaderSymbol("__glXDRI2Provider");
+        if (provider)
+            GlxPushProvider(provider);
     }
 
     LoadExtension(&GLXExt, FALSE);
diff --git a/xorg-server/hw/xfree86/dixmods/shmodule.c b/xorg-server/hw/xfree86/dixmods/shmodule.c
index 3136c0c05..0cbb9df71 100644
--- a/xorg-server/hw/xfree86/dixmods/shmodule.c
+++ b/xorg-server/hw/xfree86/dixmods/shmodule.c
@@ -37,18 +37,17 @@
 #include    "gcstruct.h"
 #include "shadow.h"
 
-static XF86ModuleVersionInfo VersRec =
-{
-	"shadow",
-	MODULEVENDORSTRING,
-	MODINFOSTRING1,
-	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
-	1, 1, 0,
-	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
-	ABI_ANSIC_VERSION,
-	MOD_CLASS_NONE,
-	{0,0,0,0}       /* signature, to be patched into the file by a tool */
+static XF86ModuleVersionInfo VersRec = {
+    "shadow",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 1, 0,
+    ABI_CLASS_ANSIC,            /* Only need the ansic layer */
+    ABI_ANSIC_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}                /* signature, to be patched into the file by a tool */
 };
 
 _X_EXPORT XF86ModuleData shadowModuleData = { &VersRec, NULL, NULL };
diff --git a/xorg-server/hw/xfree86/dri/dri.c b/xorg-server/hw/xfree86/dri/dri.c
index 1726960ae..9530eb40e 100644
--- a/xorg-server/hw/xfree86/dri/dri.c
+++ b/xorg-server/hw/xfree86/dri/dri.c
@@ -71,23 +71,25 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 static int DRIEntPrivIndex = -1;
 static DevPrivateKeyRec DRIScreenPrivKeyRec;
+
 #define DRIScreenPrivKey (&DRIScreenPrivKeyRec)
 static DevPrivateKeyRec DRIWindowPrivKeyRec;
+
 #define DRIWindowPrivKey (&DRIWindowPrivKeyRec)
 static unsigned long DRIGeneration = 0;
 static unsigned int DRIDrawableValidationStamp = 0;
 
 static RESTYPE DRIDrawablePrivResType;
 static RESTYPE DRIContextPrivResType;
-static void    DRIDestroyDummyContext(ScreenPtr pScreen, Bool hasCtxPriv);
+static void DRIDestroyDummyContext(ScreenPtr pScreen, Bool hasCtxPriv);
 
 drmServerInfo DRIDRMServerInfo;
 
-				/* Wrapper just like xf86DrvMsg, but
-				   without the verbosity level checking.
-				   This will make it easy to turn off some
-				   messages later, based on verbosity
-				   level. */
+                                /* Wrapper just like xf86DrvMsg, but
+                                   without the verbosity level checking.
+                                   This will make it easy to turn off some
+                                   messages later, based on verbosity
+                                   level. */
 
 /*
  * Since we're already referencing things from the XFree86 common layer in
@@ -99,27 +101,26 @@ drmServerInfo DRIDRMServerInfo;
 static void
 DRIDrvMsg(int scrnIndex, MessageType type, const char *format, ...)
 {
-    va_list     ap;
+    va_list ap;
 
     va_start(ap, format);
     xf86VDrvMsgVerb(scrnIndex, type, DRI_MSG_VERBOSITY, format, ap);
     va_end(ap);
 }
 
-
 static void
 DRIOpenDRMCleanup(DRIEntPrivPtr pDRIEntPriv)
 {
     if (pDRIEntPriv->pLSAREA != NULL) {
-	drmUnmap(pDRIEntPriv->pLSAREA, pDRIEntPriv->sAreaSize);
-	pDRIEntPriv->pLSAREA = NULL;
+        drmUnmap(pDRIEntPriv->pLSAREA, pDRIEntPriv->sAreaSize);
+        pDRIEntPriv->pLSAREA = NULL;
     }
     if (pDRIEntPriv->hLSAREA != 0) {
-	drmRmMap(pDRIEntPriv->drmFD, pDRIEntPriv->hLSAREA);
+        drmRmMap(pDRIEntPriv->drmFD, pDRIEntPriv->hLSAREA);
     }
     if (pDRIEntPriv->drmFD >= 0) {
-	drmClose(pDRIEntPriv->drmFD);
-	pDRIEntPriv->drmFD = 0;
+        drmClose(pDRIEntPriv->drmFD);
+        pDRIEntPriv->drmFD = 0;
     }
 }
 
@@ -141,12 +142,10 @@ DRIMasterSareaHandle(ScrnInfoPtr pScrn)
     return DRI_ENT_PRIV(pScrn)->hLSAREA;
 }
 
-
 Bool
 DRIOpenDRMMaster(ScrnInfoPtr pScrn,
-		 unsigned long sAreaSize,
-		 const char *busID,
-		 const char *drmDriverName)
+                 unsigned long sAreaSize,
+                 const char *busID, const char *drmDriverName)
 {
     drmSetVersion saveSv, sv;
     Bool drmWasAvailable;
@@ -159,12 +158,12 @@ DRIOpenDRMMaster(ScrnInfoPtr pScrn,
     int err;
 
     if (DRIEntPrivIndex == -1)
-	DRIEntPrivIndex = xf86AllocateEntityPrivateIndex();
+        DRIEntPrivIndex = xf86AllocateEntityPrivateIndex();
 
     pDRIEntPriv = DRI_ENT_PRIV(pScrn);
 
     if (pDRIEntPriv && pDRIEntPriv->drmFD != -1)
-	return TRUE;
+        return TRUE;
 
     drmWasAvailable = drmAvailable();
 
@@ -178,12 +177,12 @@ DRIOpenDRMMaster(ScrnInfoPtr pScrn,
     drmlibmajor = 1;
     drmlibminor = 0;
     if (xf86LoaderCheckSymbol("drmGetLibVersion")) {
-	drmlibv = drmGetLibVersion(-1);
-	if (drmlibv != NULL) {
-	    drmlibmajor = drmlibv->version_major;
-	    drmlibminor = drmlibv->version_minor;
-	    drmFreeVersion(drmlibv);
-	}
+        drmlibv = drmGetLibVersion(-1);
+        if (drmlibv != NULL) {
+            drmlibmajor = drmlibv->version_major;
+            drmlibminor = drmlibv->version_minor;
+            drmFreeVersion(drmlibv);
+        }
     }
 
     /* Check if the libdrm can handle falling back to loading based on name
@@ -199,69 +198,69 @@ DRIOpenDRMMaster(ScrnInfoPtr pScrn,
     saveSv = sv;
     count = 10;
     while (count--) {
-	tmp.drmFD = drmOpen(drmDriverName, openBusID);
+        tmp.drmFD = drmOpen(drmDriverName, openBusID);
 
-	if (tmp.drmFD < 0) {
-	    DRIDrvMsg(-1, X_ERROR, "[drm] drmOpen failed.\n");
-	    goto out_err;
-	}
+        if (tmp.drmFD < 0) {
+            DRIDrvMsg(-1, X_ERROR, "[drm] drmOpen failed.\n");
+            goto out_err;
+        }
 
-	err = drmSetInterfaceVersion(tmp.drmFD, &sv);
+        err = drmSetInterfaceVersion(tmp.drmFD, &sv);
 
-	if (err != -EPERM)
-	    break;
+        if (err != -EPERM)
+            break;
 
-	sv = saveSv;
-	drmClose(tmp.drmFD);
-	tmp.drmFD = -1;
-	usleep(100000);
+        sv = saveSv;
+        drmClose(tmp.drmFD);
+        tmp.drmFD = -1;
+        usleep(100000);
     }
 
     if (tmp.drmFD <= 0) {
-	DRIDrvMsg(-1, X_ERROR, "[drm] DRM was busy with another master.\n");
-	goto out_err;
+        DRIDrvMsg(-1, X_ERROR, "[drm] DRM was busy with another master.\n");
+        goto out_err;
     }
 
     if (!drmWasAvailable) {
-	DRIDrvMsg(-1, X_INFO,
-		  "[drm] loaded kernel module for \"%s\" driver.\n",
-		  drmDriverName);
+        DRIDrvMsg(-1, X_INFO,
+                  "[drm] loaded kernel module for \"%s\" driver.\n",
+                  drmDriverName);
     }
 
     if (err != 0) {
-	sv.drm_di_major = 1;
-	sv.drm_di_minor = 0;
+        sv.drm_di_major = 1;
+        sv.drm_di_minor = 0;
     }
 
     DRIDrvMsg(-1, X_INFO, "[drm] DRM interface version %d.%d\n",
-	      sv.drm_di_major, sv.drm_di_minor);
+              sv.drm_di_major, sv.drm_di_minor);
 
     if (sv.drm_di_major == 1 && sv.drm_di_minor >= 1)
-	err = 0;
+        err = 0;
     else
-	err = drmSetBusid(tmp.drmFD, busID);
+        err = drmSetBusid(tmp.drmFD, busID);
 
     if (err) {
-	DRIDrvMsg(-1, X_ERROR, "[drm] Could not set DRM device bus ID.\n");
-	goto out_err;
+        DRIDrvMsg(-1, X_ERROR, "[drm] Could not set DRM device bus ID.\n");
+        goto out_err;
     }
 
     /*
      * Create a lock-containing sarea.
      */
 
-    if (drmAddMap( tmp.drmFD, 0, sAreaSize, DRM_SHM,
-		   DRM_CONTAINS_LOCK, &tmp.hLSAREA) < 0) {
+    if (drmAddMap(tmp.drmFD, 0, sAreaSize, DRM_SHM,
+                  DRM_CONTAINS_LOCK, &tmp.hLSAREA) < 0) {
         DRIDrvMsg(-1, X_INFO, "[drm] Could not create SAREA for DRM lock.\n");
-	tmp.hLSAREA = 0;
-	goto out_err;
+        tmp.hLSAREA = 0;
+        goto out_err;
     }
 
-    if (drmMap( tmp.drmFD, tmp.hLSAREA, sAreaSize,
-		(drmAddressPtr)(&tmp.pLSAREA)) < 0) {
+    if (drmMap(tmp.drmFD, tmp.hLSAREA, sAreaSize,
+               (drmAddressPtr) (&tmp.pLSAREA)) < 0) {
         DRIDrvMsg(-1, X_INFO, "[drm] Mapping SAREA for DRM lock failed.\n");
-	tmp.pLSAREA = NULL;
-	goto out_err;
+        tmp.pLSAREA = NULL;
+        goto out_err;
     }
 
     memset(tmp.pLSAREA, 0, sAreaSize);
@@ -273,62 +272,64 @@ DRIOpenDRMMaster(ScrnInfoPtr pScrn,
     tmp.resOwner = NULL;
 
     if (!pDRIEntPriv)
-	pDRIEntPriv = xnfcalloc(sizeof(*pDRIEntPriv), 1);
+        pDRIEntPriv = xnfcalloc(sizeof(*pDRIEntPriv), 1);
 
     if (!pDRIEntPriv) {
         DRIDrvMsg(-1, X_INFO, "[drm] Failed to allocate memory for "
-		  "DRM device.\n");
-	goto out_err;
+                  "DRM device.\n");
+        goto out_err;
     }
     *pDRIEntPriv = tmp;
-    xf86GetEntityPrivate((pScrn)->entityList[0],DRIEntPrivIndex)->ptr =
-	pDRIEntPriv;
+    xf86GetEntityPrivate((pScrn)->entityList[0], DRIEntPrivIndex)->ptr =
+        pDRIEntPriv;
 
     DRIDrvMsg(-1, X_INFO, "[drm] DRM open master succeeded.\n");
     return TRUE;
 
-  out_err:
+ out_err:
 
     DRIOpenDRMCleanup(&tmp);
     return FALSE;
 }
 
 static void
-DRIClipNotifyAllDrawables(ScreenPtr pScreen);
+ DRIClipNotifyAllDrawables(ScreenPtr pScreen);
 
 static void
 dri_crtc_notify(ScreenPtr pScreen)
 {
-    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
     DRIClipNotifyAllDrawables(pScreen);
     xf86_unwrap_crtc_notify(pScreen, pDRIPriv->xf86_crtc_notify);
     xf86_crtc_notify(pScreen);
-    pDRIPriv->xf86_crtc_notify = xf86_wrap_crtc_notify(pScreen, dri_crtc_notify);
+    pDRIPriv->xf86_crtc_notify =
+        xf86_wrap_crtc_notify(pScreen, dri_crtc_notify);
 }
 
 Bool
 DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 {
-    DRIScreenPrivPtr    pDRIPriv;
-    drm_context_t *       reserved;
-    int                 reserved_count;
-    int                 i;
-    DRIEntPrivPtr       pDRIEntPriv;
-    ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
-    DRIContextFlags	flags    = 0;
-    DRIContextPrivPtr	pDRIContextPriv;
+    DRIScreenPrivPtr pDRIPriv;
+    drm_context_t *reserved;
+    int reserved_count;
+    int i;
+    DRIEntPrivPtr pDRIEntPriv;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    DRIContextFlags flags = 0;
+    DRIContextPrivPtr pDRIContextPriv;
 
     /* If the DRI extension is disabled, do not initialize the DRI */
     if (noXFree86DRIExtension) {
-	DRIDrvMsg(pScreen->myNum, X_WARNING,
-		  "Direct rendering has been disabled.\n");
-	return FALSE;
+        DRIDrvMsg(pScreen->myNum, X_WARNING,
+                  "Direct rendering has been disabled.\n");
+        return FALSE;
     }
 
     if (!xf86VGAarbiterAllowDRI(pScreen)) {
         DRIDrvMsg(pScreen->myNum, X_WARNING,
                   "Direct rendering is not supported when VGA arb is necessary for the device\n");
-	return FALSE;
+        return FALSE;
     }
 
 #ifdef PANORAMIX
@@ -336,31 +337,30 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
      * If Xinerama is on, don't allow DRI to initialise.  It won't be usable
      * anyway.
      */
-	if (!noPanoramiXExtension) {
-	    DRIDrvMsg(pScreen->myNum, X_WARNING,
-		"Direct rendering is not supported when Xinerama is enabled\n");
-	    return FALSE;
-	}
+    if (!noPanoramiXExtension) {
+        DRIDrvMsg(pScreen->myNum, X_WARNING,
+                  "Direct rendering is not supported when Xinerama is enabled\n");
+        return FALSE;
+    }
 #endif
 
     if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
-			  pDRIInfo->busIdString,
-			  pDRIInfo->drmDriverName))
-	return FALSE;
+                          pDRIInfo->busIdString, pDRIInfo->drmDriverName))
+        return FALSE;
 
     pDRIEntPriv = DRI_ENT_PRIV(pScrn);
 
     if (DRIGeneration != serverGeneration)
-	DRIGeneration = serverGeneration;
+        DRIGeneration = serverGeneration;
 
     if (!dixRegisterPrivateKey(&DRIScreenPrivKeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
     if (!dixRegisterPrivateKey(&DRIWindowPrivKeyRec, PRIVATE_WINDOW, 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;
     }
 
@@ -372,7 +372,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
     pDRIPriv->nrWindowsVisible = 0;
     pDRIPriv->fullscreen = NULL;
 
-    pDRIPriv->createDummyCtx     = pDRIInfo->createDummyCtx;
+    pDRIPriv->createDummyCtx = pDRIInfo->createDummyCtx;
     pDRIPriv->createDummyCtxPriv = pDRIInfo->createDummyCtxPriv;
 
     pDRIPriv->grabbedDRILock = FALSE;
@@ -381,141 +381,132 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 
     if (pDRIEntPriv->sAreaGrabbed || pDRIInfo->allocSarea) {
 
-	if (drmAddMap( pDRIPriv->drmFD,
-		       0,
-		       pDRIPriv->pDriverInfo->SAREASize,
-		       DRM_SHM,
-		       0,
-		       &pDRIPriv->hSAREA) < 0)
-	{
-	    pDRIPriv->directRenderingSupport = FALSE;
-	    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
-	    drmClose(pDRIPriv->drmFD);
-	    DRIDrvMsg(pScreen->myNum, X_INFO,
-		      "[drm] drmAddMap failed\n");
-	    return FALSE;
-	}
-	DRIDrvMsg(pScreen->myNum, X_INFO,
-		  "[drm] added %d byte SAREA at %p\n",
-		  pDRIPriv->pDriverInfo->SAREASize, pDRIPriv->hSAREA);
-
-	/* Backwards compat. */
-	if (drmMap( pDRIPriv->drmFD,
-		    pDRIPriv->hSAREA,
-		    pDRIPriv->pDriverInfo->SAREASize,
-		    (drmAddressPtr)(&pDRIPriv->pSAREA)) < 0)
-	{
-	    pDRIPriv->directRenderingSupport = FALSE;
-	    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
-	    drmClose(pDRIPriv->drmFD);
-	    DRIDrvMsg(pScreen->myNum, X_INFO,
-		      "[drm] drmMap failed\n");
-	    return FALSE;
-	}
-	DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] mapped SAREA %p to %p\n",
-		  pDRIPriv->hSAREA, pDRIPriv->pSAREA);
-	memset(pDRIPriv->pSAREA, 0, pDRIPriv->pDriverInfo->SAREASize);
-    } else {
-	DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] Using the DRM lock "
-		  "SAREA also for drawables.\n");
-	pDRIPriv->hSAREA = pDRIEntPriv->hLSAREA;
-	pDRIPriv->pSAREA = (XF86DRISAREAPtr) pDRIEntPriv->pLSAREA;
-	pDRIEntPriv->sAreaGrabbed = TRUE;
+        if (drmAddMap(pDRIPriv->drmFD,
+                      0,
+                      pDRIPriv->pDriverInfo->SAREASize,
+                      DRM_SHM, 0, &pDRIPriv->hSAREA) < 0) {
+            pDRIPriv->directRenderingSupport = FALSE;
+            dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+            drmClose(pDRIPriv->drmFD);
+            DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] drmAddMap failed\n");
+            return FALSE;
+        }
+        DRIDrvMsg(pScreen->myNum, X_INFO,
+                  "[drm] added %d byte SAREA at %p\n",
+                  pDRIPriv->pDriverInfo->SAREASize, pDRIPriv->hSAREA);
+
+        /* Backwards compat. */
+        if (drmMap(pDRIPriv->drmFD,
+                   pDRIPriv->hSAREA,
+                   pDRIPriv->pDriverInfo->SAREASize,
+                   (drmAddressPtr) (&pDRIPriv->pSAREA)) < 0) {
+            pDRIPriv->directRenderingSupport = FALSE;
+            dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+            drmClose(pDRIPriv->drmFD);
+            DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] drmMap failed\n");
+            return FALSE;
+        }
+        DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] mapped SAREA %p to %p\n",
+                  pDRIPriv->hSAREA, pDRIPriv->pSAREA);
+        memset(pDRIPriv->pSAREA, 0, pDRIPriv->pDriverInfo->SAREASize);
+    }
+    else {
+        DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] Using the DRM lock "
+                  "SAREA also for drawables.\n");
+        pDRIPriv->hSAREA = pDRIEntPriv->hLSAREA;
+        pDRIPriv->pSAREA = (XF86DRISAREAPtr) pDRIEntPriv->pLSAREA;
+        pDRIEntPriv->sAreaGrabbed = TRUE;
     }
 
     pDRIPriv->hLSAREA = pDRIEntPriv->hLSAREA;
     pDRIPriv->pLSAREA = pDRIEntPriv->pLSAREA;
 
-    if (!pDRIPriv->pDriverInfo->dontMapFrameBuffer)
-    {
-	if (drmAddMap( pDRIPriv->drmFD,
-		       (uintptr_t)pDRIPriv->pDriverInfo->frameBufferPhysicalAddress,
-		       pDRIPriv->pDriverInfo->frameBufferSize,
-		       DRM_FRAME_BUFFER,
-		       0,
-		       &pDRIPriv->pDriverInfo->hFrameBuffer) < 0)
-	    {
-		pDRIPriv->directRenderingSupport = FALSE;
-		dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
-		drmUnmap(pDRIPriv->pSAREA, pDRIPriv->pDriverInfo->SAREASize);
-		drmClose(pDRIPriv->drmFD);
-		DRIDrvMsg(pScreen->myNum, X_INFO,
-			  "[drm] drmAddMap failed\n");
-		return FALSE;
-	    }
-	DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] framebuffer handle = %p\n",
-		  pDRIPriv->pDriverInfo->hFrameBuffer);
-    } else {
-	DRIDrvMsg(pScreen->myNum, X_INFO,
-		  "[drm] framebuffer mapped by ddx driver\n");
+    if (!pDRIPriv->pDriverInfo->dontMapFrameBuffer) {
+        if (drmAddMap(pDRIPriv->drmFD,
+                      (uintptr_t) pDRIPriv->pDriverInfo->
+                      frameBufferPhysicalAddress,
+                      pDRIPriv->pDriverInfo->frameBufferSize, DRM_FRAME_BUFFER,
+                      0, &pDRIPriv->pDriverInfo->hFrameBuffer) < 0) {
+            pDRIPriv->directRenderingSupport = FALSE;
+            dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+            drmUnmap(pDRIPriv->pSAREA, pDRIPriv->pDriverInfo->SAREASize);
+            drmClose(pDRIPriv->drmFD);
+            DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] drmAddMap failed\n");
+            return FALSE;
+        }
+        DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] framebuffer handle = %p\n",
+                  pDRIPriv->pDriverInfo->hFrameBuffer);
+    }
+    else {
+        DRIDrvMsg(pScreen->myNum, X_INFO,
+                  "[drm] framebuffer mapped by ddx driver\n");
     }
 
     if (pDRIEntPriv->resOwner == NULL) {
-	pDRIEntPriv->resOwner = pScreen;
-
-	/* Add tags for reserved contexts */
-	if ((reserved = drmGetReservedContextList(pDRIPriv->drmFD,
-						  &reserved_count))) {
-	    int  i;
-	    void *tag;
-
-	    for (i = 0; i < reserved_count; i++) {
-		tag = DRICreateContextPrivFromHandle(pScreen,
-						     reserved[i],
-						     DRI_CONTEXT_RESERVED);
-		drmAddContextTag(pDRIPriv->drmFD, reserved[i], tag);
-	    }
-	    drmFreeReservedContextList(reserved);
-	    DRIDrvMsg(pScreen->myNum, X_INFO,
-		      "[drm] added %d reserved context%s for kernel\n",
-		      reserved_count, reserved_count > 1 ? "s" : "");
-	}
+        pDRIEntPriv->resOwner = pScreen;
+
+        /* Add tags for reserved contexts */
+        if ((reserved = drmGetReservedContextList(pDRIPriv->drmFD,
+                                                  &reserved_count))) {
+            int i;
+            void *tag;
+
+            for (i = 0; i < reserved_count; i++) {
+                tag = DRICreateContextPrivFromHandle(pScreen,
+                                                     reserved[i],
+                                                     DRI_CONTEXT_RESERVED);
+                drmAddContextTag(pDRIPriv->drmFD, reserved[i], tag);
+            }
+            drmFreeReservedContextList(reserved);
+            DRIDrvMsg(pScreen->myNum, X_INFO,
+                      "[drm] added %d reserved context%s for kernel\n",
+                      reserved_count, reserved_count > 1 ? "s" : "");
+        }
     }
 
     /* validate max drawable table entry set by driver */
     if ((pDRIPriv->pDriverInfo->maxDrawableTableEntry <= 0) ||
         (pDRIPriv->pDriverInfo->maxDrawableTableEntry > SAREA_MAX_DRAWABLES)) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR,
-		      "Invalid max drawable table size set by driver: %d\n",
-		      pDRIPriv->pDriverInfo->maxDrawableTableEntry);
+        DRIDrvMsg(pScreen->myNum, X_ERROR,
+                  "Invalid max drawable table size set by driver: %d\n",
+                  pDRIPriv->pDriverInfo->maxDrawableTableEntry);
     }
 
     /* Initialize drawable tables (screen private and SAREA) */
-    for( i=0; i < pDRIPriv->pDriverInfo->maxDrawableTableEntry; i++) {
-	pDRIPriv->DRIDrawables[i] = NULL;
-	pDRIPriv->pSAREA->drawableTable[i].stamp = 0;
-	pDRIPriv->pSAREA->drawableTable[i].flags = 0;
+    for (i = 0; i < pDRIPriv->pDriverInfo->maxDrawableTableEntry; i++) {
+        pDRIPriv->DRIDrawables[i] = NULL;
+        pDRIPriv->pSAREA->drawableTable[i].stamp = 0;
+        pDRIPriv->pSAREA->drawableTable[i].flags = 0;
     }
 
     pDRIPriv->pLockRefCount = &pDRIEntPriv->lockRefCount;
     pDRIPriv->pLockingContext = &pDRIEntPriv->lockingContext;
 
     if (!pDRIEntPriv->keepFDOpen)
-	pDRIEntPriv->keepFDOpen = pDRIInfo->keepFDOpen;
+        pDRIEntPriv->keepFDOpen = pDRIInfo->keepFDOpen;
 
     pDRIEntPriv->refCount++;
 
     /* Set up flags for DRICreateContextPriv */
     switch (pDRIInfo->driverSwapMethod) {
     case DRI_KERNEL_SWAP:
-	flags = DRI_CONTEXT_2DONLY;
-	break;
+        flags = DRI_CONTEXT_2DONLY;
+        break;
     case DRI_HIDE_X_CONTEXT:
-	flags = DRI_CONTEXT_PRESERVED;
-	break;
+        flags = DRI_CONTEXT_PRESERVED;
+        break;
     }
 
     if (!(pDRIContextPriv = DRICreateContextPriv(pScreen,
-						 &pDRIPriv->myContext,
-						 flags))) {
-	DRIDrvMsg(pScreen->myNum, X_ERROR,
-		  "failed to create server context\n");
-	return FALSE;
+                                                 &pDRIPriv->myContext,
+                                                 flags))) {
+        DRIDrvMsg(pScreen->myNum, X_ERROR, "failed to create server context\n");
+        return FALSE;
     }
     pDRIPriv->myContextPriv = pDRIContextPriv;
 
     DRIDrvMsg(pScreen->myNum, X_INFO,
-	      "X context handle = %p\n", pDRIPriv->myContext);
+              "X context handle = %p\n", pDRIPriv->myContext);
 
     /* Now that we have created the X server's context, we can grab the
      * hardware lock for the X server.
@@ -524,67 +515,66 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
     pDRIPriv->grabbedDRILock = TRUE;
 
     /* pointers so that we can prevent memory leaks later */
-    pDRIPriv->hiddenContextStore    = NULL;
+    pDRIPriv->hiddenContextStore = NULL;
     pDRIPriv->partial3DContextStore = NULL;
 
-    switch(pDRIInfo->driverSwapMethod) {
+    switch (pDRIInfo->driverSwapMethod) {
     case DRI_HIDE_X_CONTEXT:
-	/* Server will handle 3D swaps, and hide 2D swaps from kernel.
-	 * Register server context as a preserved context.
-	 */
-
-	/* allocate memory for hidden context store */
-	pDRIPriv->hiddenContextStore
-	    = (void *)calloc(1, pDRIInfo->contextSize);
-	if (!pDRIPriv->hiddenContextStore) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR,
-		      "failed to allocate hidden context\n");
-	    DRIDestroyContextPriv(pDRIContextPriv);
-	    return FALSE;
-	}
-
-	/* allocate memory for partial 3D context store */
-	pDRIPriv->partial3DContextStore
-	    = (void *)calloc(1, pDRIInfo->contextSize);
-	if (!pDRIPriv->partial3DContextStore) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR,
-		      "[DRI] failed to allocate partial 3D context\n");
-	    free(pDRIPriv->hiddenContextStore);
-	    DRIDestroyContextPriv(pDRIContextPriv);
-	    return FALSE;
-	}
-
-	/* save initial context store */
-	if (pDRIInfo->SwapContext) {
-	    (*pDRIInfo->SwapContext)(
-		pScreen,
-		DRI_NO_SYNC,
-		DRI_2D_CONTEXT,
-		pDRIPriv->hiddenContextStore,
-		DRI_NO_CONTEXT,
-		NULL);
-	}
-	/* fall through */
+        /* Server will handle 3D swaps, and hide 2D swaps from kernel.
+         * Register server context as a preserved context.
+         */
+
+        /* allocate memory for hidden context store */
+        pDRIPriv->hiddenContextStore
+            = (void *) calloc(1, pDRIInfo->contextSize);
+        if (!pDRIPriv->hiddenContextStore) {
+            DRIDrvMsg(pScreen->myNum, X_ERROR,
+                      "failed to allocate hidden context\n");
+            DRIDestroyContextPriv(pDRIContextPriv);
+            return FALSE;
+        }
+
+        /* allocate memory for partial 3D context store */
+        pDRIPriv->partial3DContextStore
+            = (void *) calloc(1, pDRIInfo->contextSize);
+        if (!pDRIPriv->partial3DContextStore) {
+            DRIDrvMsg(pScreen->myNum, X_ERROR,
+                      "[DRI] failed to allocate partial 3D context\n");
+            free(pDRIPriv->hiddenContextStore);
+            DRIDestroyContextPriv(pDRIContextPriv);
+            return FALSE;
+        }
+
+        /* save initial context store */
+        if (pDRIInfo->SwapContext) {
+            (*pDRIInfo->SwapContext) (pScreen,
+                                      DRI_NO_SYNC,
+                                      DRI_2D_CONTEXT,
+                                      pDRIPriv->hiddenContextStore,
+                                      DRI_NO_CONTEXT, NULL);
+        }
+        /* fall through */
 
     case DRI_SERVER_SWAP:
         /* For swap methods of DRI_SERVER_SWAP and DRI_HIDE_X_CONTEXT
          * setup signal handler for receiving swap requests from kernel
-	 */
-	if (!(pDRIPriv->drmSIGIOHandlerInstalled =
-	      drmInstallSIGIOHandler(pDRIPriv->drmFD, DRISwapContext))) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR,
-		      "[drm] failed to setup DRM signal handler\n");
-	    free(pDRIPriv->hiddenContextStore);
-	    free(pDRIPriv->partial3DContextStore);
-	    DRIDestroyContextPriv(pDRIContextPriv);
-	    return FALSE;
-	} else {
-	    DRIDrvMsg(pScreen->myNum, X_INFO,
-		      "[drm] installed DRM signal handler\n");
-	}
+         */
+        if (!(pDRIPriv->drmSIGIOHandlerInstalled =
+              drmInstallSIGIOHandler(pDRIPriv->drmFD, DRISwapContext))) {
+            DRIDrvMsg(pScreen->myNum, X_ERROR,
+                      "[drm] failed to setup DRM signal handler\n");
+            free(pDRIPriv->hiddenContextStore);
+            free(pDRIPriv->partial3DContextStore);
+            DRIDestroyContextPriv(pDRIContextPriv);
+            return FALSE;
+        }
+        else {
+            DRIDrvMsg(pScreen->myNum, X_INFO,
+                      "[drm] installed DRM signal handler\n");
+        }
 
     default:
-	break;
+        break;
     }
 
     return TRUE;
@@ -593,41 +583,42 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 Bool
 DRIFinishScreenInit(ScreenPtr pScreen)
 {
-    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    DRIInfoPtr        pDRIInfo = pDRIPriv->pDriverInfo;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
 
     /* Wrap DRI support */
     if (pDRIInfo->wrap.ValidateTree) {
-	pDRIPriv->wrap.ValidateTree     = pScreen->ValidateTree;
-	pScreen->ValidateTree           = pDRIInfo->wrap.ValidateTree;
+        pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;
+        pScreen->ValidateTree = pDRIInfo->wrap.ValidateTree;
     }
     if (pDRIInfo->wrap.PostValidateTree) {
-	pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
-	pScreen->PostValidateTree       = pDRIInfo->wrap.PostValidateTree;
+        pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
+        pScreen->PostValidateTree = pDRIInfo->wrap.PostValidateTree;
     }
     if (pDRIInfo->wrap.WindowExposures) {
-	pDRIPriv->wrap.WindowExposures  = pScreen->WindowExposures;
-	pScreen->WindowExposures        = pDRIInfo->wrap.WindowExposures;
+        pDRIPriv->wrap.WindowExposures = pScreen->WindowExposures;
+        pScreen->WindowExposures = pDRIInfo->wrap.WindowExposures;
     }
 
-    pDRIPriv->DestroyWindow             = pScreen->DestroyWindow;
-    pScreen->DestroyWindow              = DRIDestroyWindow;
+    pDRIPriv->DestroyWindow = pScreen->DestroyWindow;
+    pScreen->DestroyWindow = DRIDestroyWindow;
 
     pDRIPriv->xf86_crtc_notify = xf86_wrap_crtc_notify(pScreen,
-						       dri_crtc_notify);
-						       
+                                                       dri_crtc_notify);
+
     if (pDRIInfo->wrap.CopyWindow) {
-	pDRIPriv->wrap.CopyWindow       = pScreen->CopyWindow;
-	pScreen->CopyWindow             = pDRIInfo->wrap.CopyWindow;
+        pDRIPriv->wrap.CopyWindow = pScreen->CopyWindow;
+        pScreen->CopyWindow = pDRIInfo->wrap.CopyWindow;
     }
     if (pDRIInfo->wrap.ClipNotify) {
-	pDRIPriv->wrap.ClipNotify       = pScreen->ClipNotify;
-	pScreen->ClipNotify             = pDRIInfo->wrap.ClipNotify;
+        pDRIPriv->wrap.ClipNotify = pScreen->ClipNotify;
+        pScreen->ClipNotify = pDRIInfo->wrap.ClipNotify;
     }
     if (pDRIInfo->wrap.AdjustFrame) {
-	ScrnInfoPtr pScrn               = xf86Screens[pScreen->myNum];
-	pDRIPriv->wrap.AdjustFrame      = pScrn->AdjustFrame;
-	pScrn->AdjustFrame              = pDRIInfo->wrap.AdjustFrame;
+        ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+
+        pDRIPriv->wrap.AdjustFrame = pScrn->AdjustFrame;
+        pScrn->AdjustFrame = pDRIInfo->wrap.AdjustFrame;
     }
     pDRIPriv->wrapped = TRUE;
 
@@ -640,161 +631,161 @@ void
 DRICloseScreen(ScreenPtr pScreen)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    DRIInfoPtr       pDRIInfo;
-    drm_context_t *    reserved;
-    int              reserved_count;
-    ScrnInfoPtr      pScrn = xf86Screens[pScreen->myNum];
-    DRIEntPrivPtr    pDRIEntPriv = DRI_ENT_PRIV(pScrn);
+    DRIInfoPtr pDRIInfo;
+    drm_context_t *reserved;
+    int reserved_count;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    DRIEntPrivPtr pDRIEntPriv = DRI_ENT_PRIV(pScrn);
     Bool closeMaster;
 
     if (pDRIPriv) {
 
         pDRIInfo = pDRIPriv->pDriverInfo;
 
-	if (pDRIPriv->wrapped) {
-	    /* Unwrap DRI Functions */
-	    if (pDRIInfo->wrap.ValidateTree) {
-		pScreen->ValidateTree           = pDRIPriv->wrap.ValidateTree;
-		pDRIPriv->wrap.ValidateTree     = NULL;
-	    }
-	    if (pDRIInfo->wrap.PostValidateTree) {
-		pScreen->PostValidateTree       = pDRIPriv->wrap.PostValidateTree;
-		pDRIPriv->wrap.PostValidateTree = NULL;
-	    }
-	    if (pDRIInfo->wrap.WindowExposures) {
-		pScreen->WindowExposures        = pDRIPriv->wrap.WindowExposures;
-		pDRIPriv->wrap.WindowExposures  = NULL;
-	    }
-	    if (pDRIPriv->DestroyWindow) {
-		pScreen->DestroyWindow          = pDRIPriv->DestroyWindow;
-		pDRIPriv->DestroyWindow         = NULL;
-	    }
-
-	    xf86_unwrap_crtc_notify(pScreen, pDRIPriv->xf86_crtc_notify);
-
-	    if (pDRIInfo->wrap.CopyWindow) {
-		pScreen->CopyWindow             = pDRIPriv->wrap.CopyWindow;
-		pDRIPriv->wrap.CopyWindow       = NULL;
-	    }
-	    if (pDRIInfo->wrap.ClipNotify) {
-		pScreen->ClipNotify             = pDRIPriv->wrap.ClipNotify;
-		pDRIPriv->wrap.ClipNotify       = NULL;
-	    }
-	    if (pDRIInfo->wrap.AdjustFrame) {
-		ScrnInfoPtr pScrn               = xf86Screens[pScreen->myNum];
-		pScrn->AdjustFrame              = pDRIPriv->wrap.AdjustFrame;
-		pDRIPriv->wrap.AdjustFrame      = NULL;
-	    }
-	    
-	    pDRIPriv->wrapped = FALSE;
-	}
-
-	if (pDRIPriv->drmSIGIOHandlerInstalled) {
-	    if (!drmRemoveSIGIOHandler(pDRIPriv->drmFD)) {
-		DRIDrvMsg(pScreen->myNum, X_ERROR,
-			  "[drm] failed to remove DRM signal handler\n");
-	    }
-	}
+        if (pDRIPriv->wrapped) {
+            /* Unwrap DRI Functions */
+            if (pDRIInfo->wrap.ValidateTree) {
+                pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;
+                pDRIPriv->wrap.ValidateTree = NULL;
+            }
+            if (pDRIInfo->wrap.PostValidateTree) {
+                pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;
+                pDRIPriv->wrap.PostValidateTree = NULL;
+            }
+            if (pDRIInfo->wrap.WindowExposures) {
+                pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures;
+                pDRIPriv->wrap.WindowExposures = NULL;
+            }
+            if (pDRIPriv->DestroyWindow) {
+                pScreen->DestroyWindow = pDRIPriv->DestroyWindow;
+                pDRIPriv->DestroyWindow = NULL;
+            }
+
+            xf86_unwrap_crtc_notify(pScreen, pDRIPriv->xf86_crtc_notify);
+
+            if (pDRIInfo->wrap.CopyWindow) {
+                pScreen->CopyWindow = pDRIPriv->wrap.CopyWindow;
+                pDRIPriv->wrap.CopyWindow = NULL;
+            }
+            if (pDRIInfo->wrap.ClipNotify) {
+                pScreen->ClipNotify = pDRIPriv->wrap.ClipNotify;
+                pDRIPriv->wrap.ClipNotify = NULL;
+            }
+            if (pDRIInfo->wrap.AdjustFrame) {
+                ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+
+                pScrn->AdjustFrame = pDRIPriv->wrap.AdjustFrame;
+                pDRIPriv->wrap.AdjustFrame = NULL;
+            }
+
+            pDRIPriv->wrapped = FALSE;
+        }
+
+        if (pDRIPriv->drmSIGIOHandlerInstalled) {
+            if (!drmRemoveSIGIOHandler(pDRIPriv->drmFD)) {
+                DRIDrvMsg(pScreen->myNum, X_ERROR,
+                          "[drm] failed to remove DRM signal handler\n");
+            }
+        }
 
         if (pDRIPriv->dummyCtxPriv && pDRIPriv->createDummyCtx) {
-	    DRIDestroyDummyContext(pScreen, pDRIPriv->createDummyCtxPriv);
-	}
-
-	if (!DRIDestroyContextPriv(pDRIPriv->myContextPriv)) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR,
-		      "failed to destroy server context\n");
-	}
-
-				/* Remove tags for reserved contexts */
-	if (pDRIEntPriv->resOwner == pScreen) {
-	    pDRIEntPriv->resOwner = NULL;
-
-	    if ((reserved = drmGetReservedContextList(pDRIPriv->drmFD,
-						  &reserved_count))) {
-		int  i;
-
-		for (i = 0; i < reserved_count; i++) {
-		    DRIDestroyContextPriv(drmGetContextTag(pDRIPriv->drmFD,
-							   reserved[i]));
-		}
-		drmFreeReservedContextList(reserved);
-		DRIDrvMsg(pScreen->myNum, X_INFO,
-			  "[drm] removed %d reserved context%s for kernel\n",
-			  reserved_count, reserved_count > 1 ? "s" : "");
-	    }
-	}
-
-	/* Make sure signals get unblocked etc. */
-	drmUnlock(pDRIPriv->drmFD, pDRIPriv->myContext);
-	pDRIPriv->pLockRefCount = NULL;
-	closeMaster = (--pDRIEntPriv->refCount == 0) &&
-	    !pDRIEntPriv->keepFDOpen;
-	if (closeMaster || pDRIPriv->hSAREA != pDRIEntPriv->hLSAREA) {
-	    DRIDrvMsg(pScreen->myNum, X_INFO,
-		      "[drm] unmapping %d bytes of SAREA %p at %p\n",
-		      pDRIInfo->SAREASize,
-		      pDRIPriv->hSAREA,
-		      pDRIPriv->pSAREA);
-	    if (drmUnmap(pDRIPriv->pSAREA, pDRIInfo->SAREASize)) {
-		DRIDrvMsg(pScreen->myNum, X_ERROR,
-			  "[drm] unable to unmap %d bytes"
-			  " of SAREA %p at %p\n",
-			  pDRIInfo->SAREASize,
-			  pDRIPriv->hSAREA,
-			  pDRIPriv->pSAREA);
-	    }
-	} else {
-	    pDRIEntPriv->sAreaGrabbed = FALSE;
-	}
-
-	if (closeMaster || (pDRIEntPriv->drmFD != pDRIPriv->drmFD)) {
-	    drmClose(pDRIPriv->drmFD);
-	    if (pDRIEntPriv->drmFD == pDRIPriv->drmFD) {
-		DRIDrvMsg(pScreen->myNum, X_INFO,
-			  "[drm] Closed DRM master.\n");
-		pDRIEntPriv->drmFD = -1;
-	    }
-	}
-
-	free(pDRIPriv);
-	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+            DRIDestroyDummyContext(pScreen, pDRIPriv->createDummyCtxPriv);
+        }
+
+        if (!DRIDestroyContextPriv(pDRIPriv->myContextPriv)) {
+            DRIDrvMsg(pScreen->myNum, X_ERROR,
+                      "failed to destroy server context\n");
+        }
+
+        /* Remove tags for reserved contexts */
+        if (pDRIEntPriv->resOwner == pScreen) {
+            pDRIEntPriv->resOwner = NULL;
+
+            if ((reserved = drmGetReservedContextList(pDRIPriv->drmFD,
+                                                      &reserved_count))) {
+                int i;
+
+                for (i = 0; i < reserved_count; i++) {
+                    DRIDestroyContextPriv(drmGetContextTag(pDRIPriv->drmFD,
+                                                           reserved[i]));
+                }
+                drmFreeReservedContextList(reserved);
+                DRIDrvMsg(pScreen->myNum, X_INFO,
+                          "[drm] removed %d reserved context%s for kernel\n",
+                          reserved_count, reserved_count > 1 ? "s" : "");
+            }
+        }
+
+        /* Make sure signals get unblocked etc. */
+        drmUnlock(pDRIPriv->drmFD, pDRIPriv->myContext);
+        pDRIPriv->pLockRefCount = NULL;
+        closeMaster = (--pDRIEntPriv->refCount == 0) &&
+            !pDRIEntPriv->keepFDOpen;
+        if (closeMaster || pDRIPriv->hSAREA != pDRIEntPriv->hLSAREA) {
+            DRIDrvMsg(pScreen->myNum, X_INFO,
+                      "[drm] unmapping %d bytes of SAREA %p at %p\n",
+                      pDRIInfo->SAREASize, pDRIPriv->hSAREA, pDRIPriv->pSAREA);
+            if (drmUnmap(pDRIPriv->pSAREA, pDRIInfo->SAREASize)) {
+                DRIDrvMsg(pScreen->myNum, X_ERROR,
+                          "[drm] unable to unmap %d bytes"
+                          " of SAREA %p at %p\n",
+                          pDRIInfo->SAREASize,
+                          pDRIPriv->hSAREA, pDRIPriv->pSAREA);
+            }
+        }
+        else {
+            pDRIEntPriv->sAreaGrabbed = FALSE;
+        }
+
+        if (closeMaster || (pDRIEntPriv->drmFD != pDRIPriv->drmFD)) {
+            drmClose(pDRIPriv->drmFD);
+            if (pDRIEntPriv->drmFD == pDRIPriv->drmFD) {
+                DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] Closed DRM master.\n");
+                pDRIEntPriv->drmFD = -1;
+            }
+        }
+
+        free(pDRIPriv);
+        dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
     }
 }
 
 #define DRM_MSG_VERBOSITY 3
 
-static int dri_drm_debug_print(const char *format, va_list ap)
+static int
+dri_drm_debug_print(const char *format, va_list ap)
 {
-  xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap);
-  return 0;
+    xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap);
+    return 0;
 }
 
-static void dri_drm_get_perms(gid_t *group, mode_t *mode)
+static void
+dri_drm_get_perms(gid_t * group, mode_t * mode)
 {
-  *group = xf86ConfigDRI.group;
-  *mode = xf86ConfigDRI.mode;
+    *group = xf86ConfigDRI.group;
+    *mode = xf86ConfigDRI.mode;
 }
 
-drmServerInfo DRIDRMServerInfo =  {
-  dri_drm_debug_print,
-  xf86LoadKernelModule,
-  dri_drm_get_perms,
+drmServerInfo DRIDRMServerInfo = {
+    dri_drm_debug_print,
+    xf86LoadKernelModule,
+    dri_drm_get_perms,
 };
 
 Bool
 DRIExtensionInit(void)
 {
     if (DRIGeneration != serverGeneration) {
-	return FALSE;
+        return FALSE;
     }
 
     DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete,
-						   "DRIDrawable");
+                                                   "DRIDrawable");
     DRIContextPrivResType = CreateNewResourceType(DRIContextPrivDelete,
-						  "DRIContext");
+                                                  "DRIContext");
 
     if (!DRIDrawablePrivResType || !DRIContextPrivResType)
-	return FALSE;
+        return FALSE;
 
     RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL);
 
@@ -814,14 +805,14 @@ DRIReset(void)
 }
 
 Bool
-DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)
+DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool *isCapable)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
     if (pDRIPriv)
-	*isCapable = pDRIPriv->directRenderingSupport;
+        *isCapable = pDRIPriv->directRenderingSupport;
     else
-	*isCapable = FALSE;
+        *isCapable = FALSE;
 
     return TRUE;
 }
@@ -831,8 +822,8 @@ DRIOpenConnection(ScreenPtr pScreen, drm_handle_t * hSAREA, char **busIdString)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    *hSAREA           = pDRIPriv->hSAREA;
-    *busIdString      = pDRIPriv->pDriverInfo->busIdString;
+    *hSAREA = pDRIPriv->hSAREA;
+    *busIdString = pDRIPriv->pDriverInfo->busIdString;
 
     return TRUE;
 }
@@ -842,7 +833,8 @@ DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    if (drmAuthMagic(pDRIPriv->drmFD, magic)) return FALSE;
+    if (drmAuthMagic(pDRIPriv->drmFD, magic))
+        return FALSE;
     return TRUE;
 }
 
@@ -856,15 +848,14 @@ Bool
 DRIGetClientDriverName(ScreenPtr pScreen,
                        int *ddxDriverMajorVersion,
                        int *ddxDriverMinorVersion,
-                       int *ddxDriverPatchVersion,
-                       char **clientDriverName)
+                       int *ddxDriverPatchVersion, char **clientDriverName)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
     *ddxDriverMajorVersion = pDRIPriv->pDriverInfo->ddxDriverMajorVersion;
     *ddxDriverMinorVersion = pDRIPriv->pDriverInfo->ddxDriverMinorVersion;
     *ddxDriverPatchVersion = pDRIPriv->pDriverInfo->ddxDriverPatchVersion;
-    *clientDriverName      = pDRIPriv->pDriverInfo->clientDriverName;
+    *clientDriverName = pDRIPriv->pDriverInfo->clientDriverName;
 
     return TRUE;
 }
@@ -883,13 +874,12 @@ DRIGetClientDriverName(ScreenPtr pScreen,
 
 DRIContextPrivPtr
 DRICreateContextPriv(ScreenPtr pScreen,
-		     drm_context_t * pHWContext,
-		     DRIContextFlags flags)
+                     drm_context_t * pHWContext, DRIContextFlags flags)
 {
-    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
     if (drmCreateContext(pDRIPriv->drmFD, pHWContext)) {
-	return NULL;
+        return NULL;
     }
 
     return DRICreateContextPrivFromHandle(pScreen, *pHWContext, flags);
@@ -897,46 +887,42 @@ DRICreateContextPriv(ScreenPtr pScreen,
 
 DRIContextPrivPtr
 DRICreateContextPrivFromHandle(ScreenPtr pScreen,
-			       drm_context_t hHWContext,
-			       DRIContextFlags flags)
+                               drm_context_t hHWContext, DRIContextFlags flags)
 {
-    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     DRIContextPrivPtr pDRIContextPriv;
-    int 	      contextPrivSize;
+    int contextPrivSize;
 
     contextPrivSize = sizeof(DRIContextPrivRec) +
-			    pDRIPriv->pDriverInfo->contextSize;
+        pDRIPriv->pDriverInfo->contextSize;
     if (!(pDRIContextPriv = calloc(1, contextPrivSize))) {
-	return NULL;
+        return NULL;
     }
-    pDRIContextPriv->pContextStore = (void *)(pDRIContextPriv + 1);
+    pDRIContextPriv->pContextStore = (void *) (pDRIContextPriv + 1);
 
     drmAddContextTag(pDRIPriv->drmFD, hHWContext, pDRIContextPriv);
 
     pDRIContextPriv->hwContext = hHWContext;
-    pDRIContextPriv->pScreen   = pScreen;
-    pDRIContextPriv->flags     = flags;
-    pDRIContextPriv->valid3D   = FALSE;
+    pDRIContextPriv->pScreen = pScreen;
+    pDRIContextPriv->flags = flags;
+    pDRIContextPriv->valid3D = FALSE;
 
     if (flags & DRI_CONTEXT_2DONLY) {
-	if (drmSetContextFlags(pDRIPriv->drmFD,
-			       hHWContext,
-			       DRM_CONTEXT_2DONLY)) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR,
-		      "[drm] failed to set 2D context flag\n");
-	    DRIDestroyContextPriv(pDRIContextPriv);
-	    return NULL;
-	}
+        if (drmSetContextFlags(pDRIPriv->drmFD, hHWContext, DRM_CONTEXT_2DONLY)) {
+            DRIDrvMsg(pScreen->myNum, X_ERROR,
+                      "[drm] failed to set 2D context flag\n");
+            DRIDestroyContextPriv(pDRIContextPriv);
+            return NULL;
+        }
     }
     if (flags & DRI_CONTEXT_PRESERVED) {
-	if (drmSetContextFlags(pDRIPriv->drmFD,
-			       hHWContext,
-			       DRM_CONTEXT_PRESERVED)) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR,
-		      "[drm] failed to set preserved flag\n");
-	    DRIDestroyContextPriv(pDRIContextPriv);
-	    return NULL;
-	}
+        if (drmSetContextFlags(pDRIPriv->drmFD,
+                               hHWContext, DRM_CONTEXT_PRESERVED)) {
+            DRIDrvMsg(pScreen->myNum, X_ERROR,
+                      "[drm] failed to set preserved flag\n");
+            DRIDestroyContextPriv(pDRIContextPriv);
+            return NULL;
+        }
     }
     return pDRIContextPriv;
 }
@@ -946,23 +932,24 @@ DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv)
 {
     DRIScreenPrivPtr pDRIPriv;
 
-    if (!pDRIContextPriv) return TRUE;
+    if (!pDRIContextPriv)
+        return TRUE;
 
     pDRIPriv = DRI_SCREEN_PRIV(pDRIContextPriv->pScreen);
 
     if (!(pDRIContextPriv->flags & DRI_CONTEXT_RESERVED)) {
-				/* Don't delete reserved contexts from
-                                   kernel area -- the kernel manages its
-                                   reserved contexts itself. */
-	if (drmDestroyContext(pDRIPriv->drmFD, pDRIContextPriv->hwContext))
-	    return FALSE;
-    }
-
-				/* Remove the tag last to prevent a race
-                                   condition where the context has pending
-                                   buffers.  The context can't be re-used
-                                   while in this thread, but buffers can be
-                                   dispatched asynchronously. */
+        /* Don't delete reserved contexts from
+           kernel area -- the kernel manages its
+           reserved contexts itself. */
+        if (drmDestroyContext(pDRIPriv->drmFD, pDRIContextPriv->hwContext))
+            return FALSE;
+    }
+
+    /* Remove the tag last to prevent a race
+       condition where the context has pending
+       buffers.  The context can't be re-used
+       while in this thread, but buffers can be
+       dispatched asynchronously. */
     drmDelContextTag(pDRIPriv->drmFD, pDRIContextPriv->hwContext);
     free(pDRIContextPriv);
     return TRUE;
@@ -976,20 +963,20 @@ DRICreateDummyContext(ScreenPtr pScreen, Bool needCtxPriv)
     void *contextStore;
 
     if (!(pDRIContextPriv =
-	  DRICreateContextPriv(pScreen,
-			       &pDRIPriv->pSAREA->dummy_context, 0))) {
-	return FALSE;
+          DRICreateContextPriv(pScreen, &pDRIPriv->pSAREA->dummy_context, 0))) {
+        return FALSE;
     }
 
     contextStore = DRIGetContextStore(pDRIContextPriv);
     if (pDRIPriv->pDriverInfo->CreateContext && needCtxPriv) {
-	if (!pDRIPriv->pDriverInfo->CreateContext(pScreen, NULL,
-						  pDRIPriv->pSAREA->dummy_context,
-						  NULL,
-						  (DRIContextType)(long)contextStore)) {
-	    DRIDestroyContextPriv(pDRIContextPriv);
-	    return FALSE;
-	}
+        if (!pDRIPriv->pDriverInfo->CreateContext(pScreen, NULL,
+                                                  pDRIPriv->pSAREA->
+                                                  dummy_context, NULL,
+                                                  (DRIContextType) (long)
+                                                  contextStore)) {
+            DRIDestroyContextPriv(pDRIContextPriv);
+            return FALSE;
+        }
     }
 
     pDRIPriv->dummyCtxPriv = pDRIContextPriv;
@@ -1003,12 +990,14 @@ DRIDestroyDummyContext(ScreenPtr pScreen, Bool hasCtxPriv)
     DRIContextPrivPtr pDRIContextPriv = pDRIPriv->dummyCtxPriv;
     void *contextStore;
 
-    if (!pDRIContextPriv) return;
+    if (!pDRIContextPriv)
+        return;
     if (pDRIPriv->pDriverInfo->DestroyContext && hasCtxPriv) {
-	contextStore = DRIGetContextStore(pDRIContextPriv);
-	pDRIPriv->pDriverInfo->DestroyContext(pDRIContextPriv->pScreen,
-					      pDRIContextPriv->hwContext,
-					      (DRIContextType)(long)contextStore);
+        contextStore = DRIGetContextStore(pDRIContextPriv);
+        pDRIPriv->pDriverInfo->DestroyContext(pDRIContextPriv->pScreen,
+                                              pDRIContextPriv->hwContext,
+                                              (DRIContextType) (long)
+                                              contextStore);
     }
 
     DRIDestroyContextPriv(pDRIPriv->dummyCtxPriv);
@@ -1025,28 +1014,29 @@ DRICreateContext(ScreenPtr pScreen, VisualPtr visual,
 
     if (pDRIPriv->createDummyCtx && !pDRIPriv->dummyCtxPriv) {
         if (!DRICreateDummyContext(pScreen, pDRIPriv->createDummyCtxPriv)) {
-	    DRIDrvMsg(pScreen->myNum, X_INFO,
-		      "[drm] Could not create dummy context\n");
-	    return FALSE;
-	}
+            DRIDrvMsg(pScreen->myNum, X_INFO,
+                      "[drm] Could not create dummy context\n");
+            return FALSE;
+        }
     }
 
     if (!(pDRIContextPriv = DRICreateContextPriv(pScreen, pHWContext, 0))) {
-	return FALSE;
+        return FALSE;
     }
 
     contextStore = DRIGetContextStore(pDRIContextPriv);
     if (pDRIPriv->pDriverInfo->CreateContext) {
-	if (!((*pDRIPriv->pDriverInfo->CreateContext)(pScreen, NULL,
-		*pHWContext, NULL,
-		(DRIContextType)(long)contextStore))) {
-	    DRIDestroyContextPriv(pDRIContextPriv);
-	    return FALSE;
-	}
+        if (!((*pDRIPriv->pDriverInfo->CreateContext) (pScreen, NULL,
+                                                       *pHWContext, NULL,
+                                                       (DRIContextType) (long)
+                                                       contextStore))) {
+            DRIDestroyContextPriv(pDRIContextPriv);
+            return FALSE;
+        }
     }
 
     /* track this in case the client dies before cleanup */
-    AddResource(context, DRIContextPrivResType, (pointer)pDRIContextPriv);
+    AddResource(context, DRIContextPrivResType, (pointer) pDRIContextPriv);
 
     return TRUE;
 }
@@ -1063,21 +1053,21 @@ DRIDestroyContext(ScreenPtr pScreen, XID context)
 Bool
 DRIContextPrivDelete(pointer pResource, XID id)
 {
-    DRIContextPrivPtr pDRIContextPriv = (DRIContextPrivPtr)pResource;
+    DRIContextPrivPtr pDRIContextPriv = (DRIContextPrivPtr) pResource;
     DRIScreenPrivPtr pDRIPriv;
     void *contextStore;
 
     pDRIPriv = DRI_SCREEN_PRIV(pDRIContextPriv->pScreen);
     if (pDRIPriv->pDriverInfo->DestroyContext) {
-      contextStore = DRIGetContextStore(pDRIContextPriv);
-      pDRIPriv->pDriverInfo->DestroyContext(pDRIContextPriv->pScreen,
-					    pDRIContextPriv->hwContext,
-					    (DRIContextType)(long)contextStore);
+        contextStore = DRIGetContextStore(pDRIContextPriv);
+        pDRIPriv->pDriverInfo->DestroyContext(pDRIContextPriv->pScreen,
+                                              pDRIContextPriv->hwContext,
+                                              (DRIContextType) (long)
+                                              contextStore);
     }
     return DRIDestroyContextPriv(pDRIContextPriv);
 }
 
-
 /* This walks the drawable timestamp array and invalidates all of them
  * in the case of transition from private to shared backbuffers.  It's
  * not necessary for correctness, because DRIClipNotify gets called in
@@ -1087,51 +1077,48 @@ DRIContextPrivDelete(pointer pResource, XID id)
 static void
 DRIClipNotifyAllDrawables(ScreenPtr pScreen)
 {
-   int i;
-   DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    int i;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-   for( i=0; i < pDRIPriv->pDriverInfo->maxDrawableTableEntry; i++) {
-      pDRIPriv->pSAREA->drawableTable[i].stamp = DRIDrawableValidationStamp++;
-   }
+    for (i = 0; i < pDRIPriv->pDriverInfo->maxDrawableTableEntry; i++) {
+        pDRIPriv->pSAREA->drawableTable[i].stamp = DRIDrawableValidationStamp++;
+    }
 }
 
-
 static void
 DRITransitionToSharedBuffers(ScreenPtr pScreen)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
 
-    DRIClipNotifyAllDrawables( pScreen );
+    DRIClipNotifyAllDrawables(pScreen);
 
     if (pDRIInfo->TransitionSingleToMulti3D)
-	pDRIInfo->TransitionSingleToMulti3D( pScreen );
+        pDRIInfo->TransitionSingleToMulti3D(pScreen);
 }
 
-
 static void
 DRITransitionToPrivateBuffers(ScreenPtr pScreen)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
 
-    DRIClipNotifyAllDrawables( pScreen );
+    DRIClipNotifyAllDrawables(pScreen);
 
     if (pDRIInfo->TransitionMultiToSingle3D)
-	pDRIInfo->TransitionMultiToSingle3D( pScreen );
+        pDRIInfo->TransitionMultiToSingle3D(pScreen);
 }
 
-
 static void
 DRITransitionTo3d(ScreenPtr pScreen)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
 
-    DRIClipNotifyAllDrawables( pScreen );
+    DRIClipNotifyAllDrawables(pScreen);
 
     if (pDRIInfo->TransitionTo3d)
-	pDRIInfo->TransitionTo3d( pScreen );
+        pDRIInfo->TransitionTo3d(pScreen);
 }
 
 static void
@@ -1140,36 +1127,35 @@ DRITransitionTo2d(ScreenPtr pScreen)
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
 
-    DRIClipNotifyAllDrawables( pScreen );
+    DRIClipNotifyAllDrawables(pScreen);
 
     if (pDRIInfo->TransitionTo2d)
-	pDRIInfo->TransitionTo2d( pScreen );
+        pDRIInfo->TransitionTo2d(pScreen);
 }
 
-
 static int
 DRIDCNTreeTraversal(WindowPtr pWin, pointer data)
 {
     DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
 
     if (pDRIDrawablePriv) {
-	ScreenPtr pScreen = pWin->drawable.pScreen;
-	DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+        ScreenPtr pScreen = pWin->drawable.pScreen;
+        DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-	if (RegionNumRects(&pWin->clipList) > 0) {
-	    WindowPtr *pDRIWindows = (WindowPtr*)data;
-	    int i = 0;
+        if (RegionNumRects(&pWin->clipList) > 0) {
+            WindowPtr *pDRIWindows = (WindowPtr *) data;
+            int i = 0;
 
-	    while (pDRIWindows[i])
-		i++;
+            while (pDRIWindows[i])
+                i++;
 
-	    pDRIWindows[i] = pWin;
+            pDRIWindows[i] = pWin;
 
-	    pDRIPriv->nrWalked++;
-	}
+            pDRIPriv->nrWalked++;
+        }
 
-	if (pDRIPriv->nrWindows == pDRIPriv->nrWalked)
-	    return WT_STOPWALKING;
+        if (pDRIPriv->nrWindows == pDRIPriv->nrWalked)
+            return WT_STOPWALKING;
     }
 
     return WT_WALKCHILDREN;
@@ -1181,18 +1167,18 @@ DRIDriverClipNotify(ScreenPtr pScreen)
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
     if (pDRIPriv->pDriverInfo->ClipNotify) {
-	WindowPtr *pDRIWindows = calloc(sizeof(WindowPtr), pDRIPriv->nrWindows);
-	DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
+        WindowPtr *pDRIWindows = calloc(sizeof(WindowPtr), pDRIPriv->nrWindows);
+        DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
 
-	if (pDRIPriv->nrWindows > 0) {
-	    pDRIPriv->nrWalked = 0;
-	    TraverseTree(pScreen->root, DRIDCNTreeTraversal,
-			 (pointer)pDRIWindows);
-	}
+        if (pDRIPriv->nrWindows > 0) {
+            pDRIPriv->nrWalked = 0;
+            TraverseTree(pScreen->root, DRIDCNTreeTraversal,
+                         (pointer) pDRIWindows);
+        }
 
-	pDRIInfo->ClipNotify(pScreen, pDRIWindows, pDRIPriv->nrWindows);
+        pDRIInfo->ClipNotify(pScreen, pDRIWindows, pDRIPriv->nrWindows);
 
-	free(pDRIWindows);
+        free(pDRIWindows);
     }
 }
 
@@ -1203,13 +1189,13 @@ DRIIncreaseNumberVisible(ScreenPtr pScreen)
 
     switch (++pDRIPriv->nrWindowsVisible) {
     case 1:
-	DRITransitionTo3d( pScreen );
-	break;
+        DRITransitionTo3d(pScreen);
+        break;
     case 2:
-	DRITransitionToSharedBuffers( pScreen );
-	break;
+        DRITransitionToSharedBuffers(pScreen);
+        break;
     default:
-	break;
+        break;
     }
 
     DRIDriverClipNotify(pScreen);
@@ -1222,13 +1208,13 @@ DRIDecreaseNumberVisible(ScreenPtr pScreen)
 
     switch (--pDRIPriv->nrWindowsVisible) {
     case 0:
-	DRITransitionTo2d( pScreen );
-	break;
+        DRITransitionTo2d(pScreen);
+        break;
     case 1:
-	DRITransitionToPrivateBuffers( pScreen );
-	break;
+        DRITransitionToPrivateBuffers(pScreen);
+        break;
     default:
-	break;
+        break;
     }
 
     DRIDriverClipNotify(pScreen);
@@ -1236,65 +1222,66 @@ DRIDecreaseNumberVisible(ScreenPtr pScreen)
 
 Bool
 DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
-		  drm_drawable_t * hHWDrawable)
+                  drm_drawable_t * hHWDrawable)
 {
-    DRIScreenPrivPtr	pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    DRIDrawablePrivPtr	pDRIDrawablePriv;
-    WindowPtr		pWin;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIDrawablePrivPtr pDRIDrawablePriv;
+    WindowPtr pWin;
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
-	pWin = (WindowPtr)pDrawable;
-	if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
-	    pDRIDrawablePriv->refCount++;
-
-	    if (!pDRIDrawablePriv->hwDrawable) {
-		drmCreateDrawable(pDRIPriv->drmFD, &pDRIDrawablePriv->hwDrawable);
-	    }
-	}
-	else {
-	    /* allocate a DRI Window Private record */
-	    if (!(pDRIDrawablePriv = malloc(sizeof(DRIDrawablePrivRec)))) {
-		return FALSE;
-	    }
-
-	    /* Only create a drm_drawable_t once */
-	    if (drmCreateDrawable(pDRIPriv->drmFD,
-				  &pDRIDrawablePriv->hwDrawable)) {
-		free(pDRIDrawablePriv);
-		return FALSE;
-	    }
-
-	    /* add it to the list of DRI drawables for this screen */
-	    pDRIDrawablePriv->pScreen = pScreen;
-	    pDRIDrawablePriv->refCount = 1;
-	    pDRIDrawablePriv->drawableIndex = -1;
-	    pDRIDrawablePriv->nrects = RegionNumRects(&pWin->clipList);
-
-	    /* save private off of preallocated index */
-	    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey,
-			  pDRIDrawablePriv);
-	    pDRIPriv->nrWindows++;
-
-	    if (pDRIDrawablePriv->nrects)
-		DRIIncreaseNumberVisible(pScreen);
-	}
-
-	/* track this in case the client dies */
-	AddResource(FakeClientID(client->index), DRIDrawablePrivResType,
-		    (pointer)(intptr_t)pDrawable->id);
-
-	if (pDRIDrawablePriv->hwDrawable) {
-	    drmUpdateDrawableInfo(pDRIPriv->drmFD,
-				  pDRIDrawablePriv->hwDrawable,
-				  DRM_DRAWABLE_CLIPRECTS,
-				  RegionNumRects(&pWin->clipList),
-				  RegionRects(&pWin->clipList));
-	    *hHWDrawable = pDRIDrawablePriv->hwDrawable;
-	}
-    }
-    else if (pDrawable->type != DRAWABLE_PIXMAP) { /* PBuffer */
-	/* NOT_DONE */
-	return FALSE;
+        pWin = (WindowPtr) pDrawable;
+        if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
+            pDRIDrawablePriv->refCount++;
+
+            if (!pDRIDrawablePriv->hwDrawable) {
+                drmCreateDrawable(pDRIPriv->drmFD,
+                                  &pDRIDrawablePriv->hwDrawable);
+            }
+        }
+        else {
+            /* allocate a DRI Window Private record */
+            if (!(pDRIDrawablePriv = malloc(sizeof(DRIDrawablePrivRec)))) {
+                return FALSE;
+            }
+
+            /* Only create a drm_drawable_t once */
+            if (drmCreateDrawable(pDRIPriv->drmFD,
+                                  &pDRIDrawablePriv->hwDrawable)) {
+                free(pDRIDrawablePriv);
+                return FALSE;
+            }
+
+            /* add it to the list of DRI drawables for this screen */
+            pDRIDrawablePriv->pScreen = pScreen;
+            pDRIDrawablePriv->refCount = 1;
+            pDRIDrawablePriv->drawableIndex = -1;
+            pDRIDrawablePriv->nrects = RegionNumRects(&pWin->clipList);
+
+            /* save private off of preallocated index */
+            dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey,
+                          pDRIDrawablePriv);
+            pDRIPriv->nrWindows++;
+
+            if (pDRIDrawablePriv->nrects)
+                DRIIncreaseNumberVisible(pScreen);
+        }
+
+        /* track this in case the client dies */
+        AddResource(FakeClientID(client->index), DRIDrawablePrivResType,
+                    (pointer) (intptr_t) pDrawable->id);
+
+        if (pDRIDrawablePriv->hwDrawable) {
+            drmUpdateDrawableInfo(pDRIPriv->drmFD,
+                                  pDRIDrawablePriv->hwDrawable,
+                                  DRM_DRAWABLE_CLIPRECTS,
+                                  RegionNumRects(&pWin->clipList),
+                                  RegionRects(&pWin->clipList));
+            *hHWDrawable = pDRIDrawablePriv->hwDrawable;
+        }
+    }
+    else if (pDrawable->type != DRAWABLE_PIXMAP) {      /* PBuffer */
+        /* NOT_DONE */
+        return FALSE;
     }
 
     return TRUE;
@@ -1308,24 +1295,24 @@ DRIDrawablePrivDestroy(WindowPtr pWin)
     DRIScreenPrivPtr pDRIPriv;
 
     if (!pDRIDrawablePriv)
-	return;
+        return;
 
     pScreen = pWin->drawable.pScreen;
     pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
     if (pDRIDrawablePriv->drawableIndex != -1) {
-	/* bump stamp to force outstanding 3D requests to resync */
-	pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp
-	    = DRIDrawableValidationStamp++;
+        /* bump stamp to force outstanding 3D requests to resync */
+        pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp
+            = DRIDrawableValidationStamp++;
 
-	/* release drawable table entry */
-	pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL;
+        /* release drawable table entry */
+        pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL;
     }
 
     pDRIPriv->nrWindows--;
 
     if (pDRIDrawablePriv->nrects)
-	DRIDecreaseNumberVisible(pScreen);
+        DRIDecreaseNumberVisible(pScreen);
 
     drmDestroyDrawable(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable);
 
@@ -1337,10 +1324,10 @@ static Bool
 DRIDestroyDrawableCB(pointer value, XID id, pointer data)
 {
     if (value == data) {
-	/* This calls back DRIDrawablePrivDelete which frees private area */
-	FreeResourceByType(id, DRIDrawablePrivResType, FALSE);
+        /* This calls back DRIDrawablePrivDelete which frees private area */
+        FreeResourceByType(id, DRIDrawablePrivResType, FALSE);
 
-	return TRUE;
+        return TRUE;
     }
 
     return FALSE;
@@ -1350,13 +1337,13 @@ Bool
 DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable)
 {
     if (pDrawable->type == DRAWABLE_WINDOW) {
-	LookupClientResourceComplex(client, DRIDrawablePrivResType,
-				    DRIDestroyDrawableCB,
-				    (pointer)(intptr_t)pDrawable->id);
+        LookupClientResourceComplex(client, DRIDrawablePrivResType,
+                                    DRIDestroyDrawableCB,
+                                    (pointer) (intptr_t) pDrawable->id);
     }
-    else { /* pixmap (or for GLX 1.3, a PBuffer) */
-	/* NOT_DONE */
-	return FALSE;
+    else {                      /* pixmap (or for GLX 1.3, a PBuffer) */
+        /* NOT_DONE */
+        return FALSE;
     }
 
     return TRUE;
@@ -1370,189 +1357,198 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
 
     /* For DRIDrawablePrivResType, the XID is the client's fake ID. The
      * important XID is the value in pResource. */
-    id = (XID)(intptr_t)pResource;
+    id = (XID) (intptr_t) pResource;
     rc = dixLookupWindow(&pWin, id, serverClient, DixGetAttrAccess);
 
     if (rc == Success) {
-	DRIDrawablePrivPtr pDRIDrwPriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+        DRIDrawablePrivPtr pDRIDrwPriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
 
-	if (!pDRIDrwPriv)
-	    return FALSE;
+        if (!pDRIDrwPriv)
+            return FALSE;
 
-	if (--pDRIDrwPriv->refCount == 0)
-	    DRIDrawablePrivDestroy(pWin);
+        if (--pDRIDrwPriv->refCount == 0)
+            DRIDrawablePrivDestroy(pWin);
 
-	return TRUE;
+        return TRUE;
     }
-    else { /* pixmap (or for GLX 1.3, a PBuffer) */
-	/* NOT_DONE */
-	return FALSE;
+    else {                      /* pixmap (or for GLX 1.3, a PBuffer) */
+        /* NOT_DONE */
+        return FALSE;
     }
 }
 
 Bool
 DRIGetDrawableInfo(ScreenPtr pScreen,
                    DrawablePtr pDrawable,
-                   unsigned int* index,
-                   unsigned int* stamp,
-                   int* X,
-                   int* Y,
-                   int* W,
-                   int* H,
-                   int* numClipRects,
+                   unsigned int *index,
+                   unsigned int *stamp,
+                   int *X,
+                   int *Y,
+                   int *W,
+                   int *H,
+                   int *numClipRects,
                    drm_clip_rect_t ** pClipRects,
-                   int* backX,
-                   int* backY,
-                   int* numBackClipRects,
-                   drm_clip_rect_t ** pBackClipRects)
+                   int *backX,
+                   int *backY,
+                   int *numBackClipRects, drm_clip_rect_t ** pBackClipRects)
 {
-    DRIScreenPrivPtr    pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    DRIDrawablePrivPtr	pDRIDrawablePriv, pOldDrawPriv;
-    WindowPtr		pWin, pOldWin;
-    int			i;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIDrawablePrivPtr pDRIDrawablePriv, pOldDrawPriv;
+    WindowPtr pWin, pOldWin;
+    int i;
 
 #if 0
-    printf("maxDrawableTableEntry = %d\n", pDRIPriv->pDriverInfo->maxDrawableTableEntry);
+    printf("maxDrawableTableEntry = %d\n",
+           pDRIPriv->pDriverInfo->maxDrawableTableEntry);
 #endif
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
-	pWin = (WindowPtr)pDrawable;
-	if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
-
-	    /* Manage drawable table */
-	    if (pDRIDrawablePriv->drawableIndex == -1) { /* load SAREA table */
-
-		/* Search table for empty entry */
-		i = 0;
-		while (i < pDRIPriv->pDriverInfo->maxDrawableTableEntry) {
-		    if (!(pDRIPriv->DRIDrawables[i])) {
-			pDRIPriv->DRIDrawables[i] = pDrawable;
-			pDRIDrawablePriv->drawableIndex = i;
-			pDRIPriv->pSAREA->drawableTable[i].stamp =
-					    DRIDrawableValidationStamp++;
-			break;
-		    }
-		    i++;
-		}
-
-		/* Search table for oldest entry */
-		if (i == pDRIPriv->pDriverInfo->maxDrawableTableEntry) {
+        pWin = (WindowPtr) pDrawable;
+        if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
+
+            /* Manage drawable table */
+            if (pDRIDrawablePriv->drawableIndex == -1) {        /* load SAREA table */
+
+                /* Search table for empty entry */
+                i = 0;
+                while (i < pDRIPriv->pDriverInfo->maxDrawableTableEntry) {
+                    if (!(pDRIPriv->DRIDrawables[i])) {
+                        pDRIPriv->DRIDrawables[i] = pDrawable;
+                        pDRIDrawablePriv->drawableIndex = i;
+                        pDRIPriv->pSAREA->drawableTable[i].stamp =
+                            DRIDrawableValidationStamp++;
+                        break;
+                    }
+                    i++;
+                }
+
+                /* Search table for oldest entry */
+                if (i == pDRIPriv->pDriverInfo->maxDrawableTableEntry) {
                     unsigned int oldestStamp = ~0;
                     int oldestIndex = 0;
-		    i = pDRIPriv->pDriverInfo->maxDrawableTableEntry;
-		    while (i--) {
-			if (pDRIPriv->pSAREA->drawableTable[i].stamp <
-								oldestStamp) {
-			    oldestIndex = i;
-			    oldestStamp =
-				pDRIPriv->pSAREA->drawableTable[i].stamp;
-			}
-		    }
-		    pDRIDrawablePriv->drawableIndex = oldestIndex;
-
-		    /* release oldest drawable table entry */
-		    pOldWin = (WindowPtr)pDRIPriv->DRIDrawables[oldestIndex];
-		    pOldDrawPriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pOldWin);
-		    pOldDrawPriv->drawableIndex = -1;
-
-		    /* claim drawable table entry */
-		    pDRIPriv->DRIDrawables[oldestIndex] = pDrawable;
-
-		    /* validate SAREA entry */
-		    pDRIPriv->pSAREA->drawableTable[oldestIndex].stamp =
-					DRIDrawableValidationStamp++;
-
-		    /* check for stamp wrap around */
-		    if (oldestStamp > DRIDrawableValidationStamp) {
-
-			/* walk SAREA table and invalidate all drawables */
-			for( i=0;
+
+                    i = pDRIPriv->pDriverInfo->maxDrawableTableEntry;
+                    while (i--) {
+                        if (pDRIPriv->pSAREA->drawableTable[i].stamp <
+                            oldestStamp) {
+                            oldestIndex = i;
+                            oldestStamp =
+                                pDRIPriv->pSAREA->drawableTable[i].stamp;
+                        }
+                    }
+                    pDRIDrawablePriv->drawableIndex = oldestIndex;
+
+                    /* release oldest drawable table entry */
+                    pOldWin = (WindowPtr) pDRIPriv->DRIDrawables[oldestIndex];
+                    pOldDrawPriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pOldWin);
+                    pOldDrawPriv->drawableIndex = -1;
+
+                    /* claim drawable table entry */
+                    pDRIPriv->DRIDrawables[oldestIndex] = pDrawable;
+
+                    /* validate SAREA entry */
+                    pDRIPriv->pSAREA->drawableTable[oldestIndex].stamp =
+                        DRIDrawableValidationStamp++;
+
+                    /* check for stamp wrap around */
+                    if (oldestStamp > DRIDrawableValidationStamp) {
+
+                        /* walk SAREA table and invalidate all drawables */
+                        for (i = 0;
                              i < pDRIPriv->pDriverInfo->maxDrawableTableEntry;
                              i++) {
-				pDRIPriv->pSAREA->drawableTable[i].stamp =
-					DRIDrawableValidationStamp++;
-			}
-		    }
-		}
-
-		/* If the driver wants to be notified when the index is
-		 * set for a drawable, let it know now.
-		 */
-		if (pDRIPriv->pDriverInfo->SetDrawableIndex)
-			pDRIPriv->pDriverInfo->SetDrawableIndex(pWin,
-				pDRIDrawablePriv->drawableIndex);
-
-		/* reinit drawable ID if window is visible */
-		if ((pWin->viewable) &&
-		    (pDRIPriv->pDriverInfo->bufferRequests != DRI_NO_WINDOWS))
-		{
-		    (*pDRIPriv->pDriverInfo->InitBuffers)(pWin,
-			    &pWin->clipList, pDRIDrawablePriv->drawableIndex);
-		}
-	    }
-
-	    *index = pDRIDrawablePriv->drawableIndex;
-	    *stamp = pDRIPriv->pSAREA->drawableTable[*index].stamp;
-	    *X = (int)(pWin->drawable.x);
-	    *Y = (int)(pWin->drawable.y);
-	    *W = (int)(pWin->drawable.width);
-	    *H = (int)(pWin->drawable.height);
-	    *numClipRects = RegionNumRects(&pWin->clipList);
-	    *pClipRects = (drm_clip_rect_t *)RegionRects(&pWin->clipList);
-
-	    if (!*numClipRects && pDRIPriv->fullscreen) {
-				/* use fake full-screen clip rect */
-		pDRIPriv->fullscreen_rect.x1 = *X;
-		pDRIPriv->fullscreen_rect.y1 = *Y;
-		pDRIPriv->fullscreen_rect.x2 = *X + *W;
-		pDRIPriv->fullscreen_rect.y2 = *Y + *H;
-
-		*numClipRects = 1;
-		*pClipRects   = &pDRIPriv->fullscreen_rect;
-	    }
-
-	    *backX = *X;
-	    *backY = *Y;
-
-	    if (pDRIPriv->nrWindowsVisible == 1 && *numClipRects) {
-	       /* Use a single cliprect. */
-
-	       int x0 = *X;
-	       int y0 = *Y;
-	       int x1 = x0 + *W;
-	       int y1 = y0 + *H;
-
-	       if (x0 < 0) x0 = 0;
-	       if (y0 < 0) y0 = 0;
-	       if (x1 > pScreen->width) x1 = pScreen->width;
-	       if (y1 > pScreen->height) y1 = pScreen->height;
-
-	       if (y0 >= y1 || x0 >= x1) {
-		    *numBackClipRects = 0;
-		    *pBackClipRects = NULL;
-	       } else {
-		    pDRIPriv->private_buffer_rect.x1 = x0;
-		    pDRIPriv->private_buffer_rect.y1 = y0;
-		    pDRIPriv->private_buffer_rect.x2 = x1;
-		    pDRIPriv->private_buffer_rect.y2 = y1;
-
-		    *numBackClipRects = 1;
-		    *pBackClipRects = &(pDRIPriv->private_buffer_rect);
-	       }
-	    } else {
-	       /* Use the frontbuffer cliprects for back buffers.  */
-	       *numBackClipRects = 0;
-	       *pBackClipRects = 0;
-	    }
-	}
-	else {
-	    /* Not a DRIDrawable */
-	    return FALSE;
-	}
-    }
-    else { /* pixmap (or for GLX 1.3, a PBuffer) */
-	/* NOT_DONE */
-	return FALSE;
+                            pDRIPriv->pSAREA->drawableTable[i].stamp =
+                                DRIDrawableValidationStamp++;
+                        }
+                    }
+                }
+
+                /* If the driver wants to be notified when the index is
+                 * set for a drawable, let it know now.
+                 */
+                if (pDRIPriv->pDriverInfo->SetDrawableIndex)
+                    pDRIPriv->pDriverInfo->SetDrawableIndex(pWin,
+                                                            pDRIDrawablePriv->
+                                                            drawableIndex);
+
+                /* reinit drawable ID if window is visible */
+                if ((pWin->viewable) &&
+                    (pDRIPriv->pDriverInfo->bufferRequests != DRI_NO_WINDOWS)) {
+                    (*pDRIPriv->pDriverInfo->InitBuffers) (pWin,
+                                                           &pWin->clipList,
+                                                           pDRIDrawablePriv->
+                                                           drawableIndex);
+                }
+            }
+
+            *index = pDRIDrawablePriv->drawableIndex;
+            *stamp = pDRIPriv->pSAREA->drawableTable[*index].stamp;
+            *X = (int) (pWin->drawable.x);
+            *Y = (int) (pWin->drawable.y);
+            *W = (int) (pWin->drawable.width);
+            *H = (int) (pWin->drawable.height);
+            *numClipRects = RegionNumRects(&pWin->clipList);
+            *pClipRects = (drm_clip_rect_t *) RegionRects(&pWin->clipList);
+
+            if (!*numClipRects && pDRIPriv->fullscreen) {
+                /* use fake full-screen clip rect */
+                pDRIPriv->fullscreen_rect.x1 = *X;
+                pDRIPriv->fullscreen_rect.y1 = *Y;
+                pDRIPriv->fullscreen_rect.x2 = *X + *W;
+                pDRIPriv->fullscreen_rect.y2 = *Y + *H;
+
+                *numClipRects = 1;
+                *pClipRects = &pDRIPriv->fullscreen_rect;
+            }
+
+            *backX = *X;
+            *backY = *Y;
+
+            if (pDRIPriv->nrWindowsVisible == 1 && *numClipRects) {
+                /* Use a single cliprect. */
+
+                int x0 = *X;
+                int y0 = *Y;
+                int x1 = x0 + *W;
+                int y1 = y0 + *H;
+
+                if (x0 < 0)
+                    x0 = 0;
+                if (y0 < 0)
+                    y0 = 0;
+                if (x1 > pScreen->width)
+                    x1 = pScreen->width;
+                if (y1 > pScreen->height)
+                    y1 = pScreen->height;
+
+                if (y0 >= y1 || x0 >= x1) {
+                    *numBackClipRects = 0;
+                    *pBackClipRects = NULL;
+                }
+                else {
+                    pDRIPriv->private_buffer_rect.x1 = x0;
+                    pDRIPriv->private_buffer_rect.y1 = y0;
+                    pDRIPriv->private_buffer_rect.x2 = x1;
+                    pDRIPriv->private_buffer_rect.y2 = y1;
+
+                    *numBackClipRects = 1;
+                    *pBackClipRects = &(pDRIPriv->private_buffer_rect);
+                }
+            }
+            else {
+                /* Use the frontbuffer cliprects for back buffers.  */
+                *numBackClipRects = 0;
+                *pBackClipRects = 0;
+            }
+        }
+        else {
+            /* Not a DRIDrawable */
+            return FALSE;
+        }
+    }
+    else {                      /* pixmap (or for GLX 1.3, a PBuffer) */
+        /* NOT_DONE */
+        return FALSE;
     }
 
     return TRUE;
@@ -1561,11 +1557,9 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
 Bool
 DRIGetDeviceInfo(ScreenPtr pScreen,
                  drm_handle_t * hFrameBuffer,
-                 int* fbOrigin,
-                 int* fbSize,
-                 int* fbStride,
-                 int* devPrivateSize,
-                 void** pDevPrivate)
+                 int *fbOrigin,
+                 int *fbSize,
+                 int *fbStride, int *devPrivateSize, void **pDevPrivate)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
@@ -1582,21 +1576,23 @@ DRIGetDeviceInfo(ScreenPtr pScreen,
 DRIInfoPtr
 DRICreateInfoRec(void)
 {
-    DRIInfoPtr inforec = (DRIInfoPtr)calloc(1, sizeof(DRIInfoRec));
-    if (!inforec) return NULL;
+    DRIInfoPtr inforec = (DRIInfoPtr) calloc(1, sizeof(DRIInfoRec));
+
+    if (!inforec)
+        return NULL;
 
     /* Initialize defaults */
     inforec->busIdString = NULL;
 
     /* Wrapped function defaults */
-    inforec->wrap.WakeupHandler         = DRIDoWakeupHandler;
-    inforec->wrap.BlockHandler          = DRIDoBlockHandler;
-    inforec->wrap.WindowExposures       = DRIWindowExposures;
-    inforec->wrap.CopyWindow            = DRICopyWindow;
-    inforec->wrap.ValidateTree          = DRIValidateTree;
-    inforec->wrap.PostValidateTree      = DRIPostValidateTree;
-    inforec->wrap.ClipNotify            = DRIClipNotify;
-    inforec->wrap.AdjustFrame           = DRIAdjustFrame;
+    inforec->wrap.WakeupHandler = DRIDoWakeupHandler;
+    inforec->wrap.BlockHandler = DRIDoBlockHandler;
+    inforec->wrap.WindowExposures = DRIWindowExposures;
+    inforec->wrap.CopyWindow = DRICopyWindow;
+    inforec->wrap.ValidateTree = DRIValidateTree;
+    inforec->wrap.PostValidateTree = DRIPostValidateTree;
+    inforec->wrap.ClipNotify = DRIClipNotify;
+    inforec->wrap.AdjustFrame = DRIAdjustFrame;
 
     inforec->TransitionTo2d = 0;
     inforec->TransitionTo3d = 0;
@@ -1609,23 +1605,21 @@ void
 DRIDestroyInfoRec(DRIInfoPtr DRIInfo)
 {
     free(DRIInfo->busIdString);
-    free((char*)DRIInfo);
+    free((char *) DRIInfo);
 }
 
-
 void
 DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask)
 {
     int i;
 
     for (i = 0; i < screenInfo.numScreens; i++) {
-	ScreenPtr        pScreen  = screenInfo.screens[i];
-	DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+        ScreenPtr pScreen = screenInfo.screens[i];
+        DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-	if (pDRIPriv &&
-	    pDRIPriv->pDriverInfo->wrap.WakeupHandler)
-	    (*pDRIPriv->pDriverInfo->wrap.WakeupHandler)(i, wakeupData,
-							 result, pReadmask);
+        if (pDRIPriv && pDRIPriv->pDriverInfo->wrap.WakeupHandler)
+            (*pDRIPriv->pDriverInfo->wrap.WakeupHandler) (i, wakeupData,
+                                                          result, pReadmask);
     }
 }
 
@@ -1635,13 +1629,12 @@ DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
     int i;
 
     for (i = 0; i < screenInfo.numScreens; i++) {
-	ScreenPtr        pScreen  = screenInfo.screens[i];
-	DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+        ScreenPtr pScreen = screenInfo.screens[i];
+        DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-	if (pDRIPriv &&
-	    pDRIPriv->pDriverInfo->wrap.BlockHandler)
-	    (*pDRIPriv->pDriverInfo->wrap.BlockHandler)(i, blockData,
-							pTimeout, pReadmask);
+        if (pDRIPriv && pDRIPriv->pDriverInfo->wrap.BlockHandler)
+            (*pDRIPriv->pDriverInfo->wrap.BlockHandler) (i, blockData,
+                                                         pTimeout, pReadmask);
     }
 }
 
@@ -1654,13 +1647,13 @@ DRIDoWakeupHandler(int screenNum, pointer wakeupData,
 
     DRILock(pScreen, 0);
     if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
-	/* hide X context by swapping 2D component here */
-	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
-					      DRI_3D_SYNC,
-					      DRI_2D_CONTEXT,
-					      pDRIPriv->partial3DContextStore,
-					      DRI_2D_CONTEXT,
-					      pDRIPriv->hiddenContextStore);
+        /* hide X context by swapping 2D component here */
+        (*pDRIPriv->pDriverInfo->SwapContext) (pScreen,
+                                               DRI_3D_SYNC,
+                                               DRI_2D_CONTEXT,
+                                               pDRIPriv->partial3DContextStore,
+                                               DRI_2D_CONTEXT,
+                                               pDRIPriv->hiddenContextStore);
     }
 }
 
@@ -1672,13 +1665,13 @@ DRIDoBlockHandler(int screenNum, pointer blockData,
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
     if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
-	/* hide X context by swapping 2D component here */
-	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
-					      DRI_2D_SYNC,
-					      DRI_NO_CONTEXT,
-					      NULL,
-					      DRI_2D_CONTEXT,
-					      pDRIPriv->partial3DContextStore);
+        /* hide X context by swapping 2D component here */
+        (*pDRIPriv->pDriverInfo->SwapContext) (pScreen,
+                                               DRI_2D_SYNC,
+                                               DRI_NO_CONTEXT,
+                                               NULL,
+                                               DRI_2D_CONTEXT,
+                                               pDRIPriv->partial3DContextStore);
     }
 
     if (pDRIPriv->windowsTouched)
@@ -1691,154 +1684,155 @@ DRIDoBlockHandler(int screenNum, pointer blockData,
 void
 DRISwapContext(int drmFD, void *oldctx, void *newctx)
 {
-    DRIContextPrivPtr oldContext      = (DRIContextPrivPtr)oldctx;
-    DRIContextPrivPtr newContext      = (DRIContextPrivPtr)newctx;
-    ScreenPtr         pScreen         = newContext->pScreen;
-    DRIScreenPrivPtr  pDRIPriv        = DRI_SCREEN_PRIV(pScreen);
-    void*             oldContextStore = NULL;
-    DRIContextType    oldContextType;
-    void*             newContextStore = NULL;
-    DRIContextType    newContextType;
-    DRISyncType       syncType;
+    DRIContextPrivPtr oldContext = (DRIContextPrivPtr) oldctx;
+    DRIContextPrivPtr newContext = (DRIContextPrivPtr) newctx;
+    ScreenPtr pScreen = newContext->pScreen;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    void *oldContextStore = NULL;
+    DRIContextType oldContextType;
+    void *newContextStore = NULL;
+    DRIContextType newContextType;
+    DRISyncType syncType;
+
 #ifdef DEBUG
-    static int        count = 0;
+    static int count = 0;
 
     if (!newContext) {
-	DRIDrvMsg(pScreen->myNum, X_ERROR,
-		  "[DRI] Context Switch Error: oldContext=%x, newContext=%x\n",
-		  oldContext, newContext);
-	return;
+        DRIDrvMsg(pScreen->myNum, X_ERROR,
+                  "[DRI] Context Switch Error: oldContext=%x, newContext=%x\n",
+                  oldContext, newContext);
+        return;
     }
 
     /* usefull for debugging, just print out after n context switches */
     if (!count || !(count % 1)) {
-	DRIDrvMsg(pScreen->myNum, X_INFO,
-		  "[DRI] Context switch %5d from %p/0x%08x (%d)\n",
-		  count,
-		  oldContext,
-		  oldContext ? oldContext->flags : 0,
-		  oldContext ? oldContext->hwContext : -1);
-	DRIDrvMsg(pScreen->myNum, X_INFO,
-		  "[DRI] Context switch %5d to   %p/0x%08x (%d)\n",
-		  count,
-		  newContext,
-		  newContext ? newContext->flags : 0,
-		  newContext ? newContext->hwContext : -1);
+        DRIDrvMsg(pScreen->myNum, X_INFO,
+                  "[DRI] Context switch %5d from %p/0x%08x (%d)\n",
+                  count,
+                  oldContext,
+                  oldContext ? oldContext->flags : 0,
+                  oldContext ? oldContext->hwContext : -1);
+        DRIDrvMsg(pScreen->myNum, X_INFO,
+                  "[DRI] Context switch %5d to   %p/0x%08x (%d)\n",
+                  count,
+                  newContext,
+                  newContext ? newContext->flags : 0,
+                  newContext ? newContext->hwContext : -1);
     }
     ++count;
 #endif
 
     if (!pDRIPriv->pDriverInfo->SwapContext) {
-	DRIDrvMsg(pScreen->myNum, X_ERROR,
-		  "[DRI] DDX driver missing context swap call back\n");
-	return;
+        DRIDrvMsg(pScreen->myNum, X_ERROR,
+                  "[DRI] DDX driver missing context swap call back\n");
+        return;
     }
 
     if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
 
         /* only 3D contexts are swapped in this case */
-	if (oldContext) {
-	    oldContextStore     = DRIGetContextStore(oldContext);
-	    oldContext->valid3D = TRUE;
-	    oldContextType      = DRI_3D_CONTEXT;
-	} else {
-	    oldContextType      = DRI_NO_CONTEXT;
-	}
-	newContextStore = DRIGetContextStore(newContext);
-	if ((newContext->valid3D) &&
-	  (newContext->hwContext != pDRIPriv->myContext)) {
-	    newContextType = DRI_3D_CONTEXT;
-	}
-	else {
-	    newContextType = DRI_2D_CONTEXT;
-	}
-	syncType = DRI_3D_SYNC;
-    }
-    else /* default: driverSwapMethod == DRI_SERVER_SWAP */ {
+        if (oldContext) {
+            oldContextStore = DRIGetContextStore(oldContext);
+            oldContext->valid3D = TRUE;
+            oldContextType = DRI_3D_CONTEXT;
+        }
+        else {
+            oldContextType = DRI_NO_CONTEXT;
+        }
+        newContextStore = DRIGetContextStore(newContext);
+        if ((newContext->valid3D) &&
+            (newContext->hwContext != pDRIPriv->myContext)) {
+            newContextType = DRI_3D_CONTEXT;
+        }
+        else {
+            newContextType = DRI_2D_CONTEXT;
+        }
+        syncType = DRI_3D_SYNC;
+    }
+    else {                      /* default: driverSwapMethod == DRI_SERVER_SWAP */
 
         /* optimize 2D context swaps */
 
-	if (newContext->flags & DRI_CONTEXT_2DONLY) {
-	    /* go from 3D context to 2D context and only save 2D
+        if (newContext->flags & DRI_CONTEXT_2DONLY) {
+            /* go from 3D context to 2D context and only save 2D
              * subset of 3D state
              */
-	    oldContextStore = DRIGetContextStore(oldContext);
-	    oldContextType = DRI_2D_CONTEXT;
-	    newContextStore = DRIGetContextStore(newContext);
-	    newContextType = DRI_2D_CONTEXT;
-	    syncType = DRI_3D_SYNC;
-	    pDRIPriv->lastPartial3DContext = oldContext;
-	}
-	else if (oldContext->flags & DRI_CONTEXT_2DONLY) {
-	    if (pDRIPriv->lastPartial3DContext == newContext) {
-		/* go from 2D context back to previous 3D context and
-		 * only restore 2D subset of previous 3D state
-		 */
-		oldContextStore = DRIGetContextStore(oldContext);
-		oldContextType = DRI_2D_CONTEXT;
-		newContextStore = DRIGetContextStore(newContext);
-		newContextType = DRI_2D_CONTEXT;
-		syncType = DRI_2D_SYNC;
-	    }
-	    else {
-		/* go from 2D context to a different 3D context */
-
-		/* call DDX driver to do partial restore */
-		oldContextStore = DRIGetContextStore(oldContext);
-		newContextStore =
-			DRIGetContextStore(pDRIPriv->lastPartial3DContext);
-		(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
-						      DRI_2D_SYNC,
-						      DRI_2D_CONTEXT,
-						      oldContextStore,
-						      DRI_2D_CONTEXT,
-						      newContextStore);
-
-		/* now setup for a complete 3D swap */
-		oldContextStore = newContextStore;
-		oldContext->valid3D = TRUE;
-		oldContextType = DRI_3D_CONTEXT;
-		newContextStore = DRIGetContextStore(newContext);
-		if ((newContext->valid3D) &&
-		  (newContext->hwContext != pDRIPriv->myContext)) {
-		    newContextType = DRI_3D_CONTEXT;
-		}
-		else {
-		    newContextType = DRI_2D_CONTEXT;
-		}
-		syncType = DRI_NO_SYNC;
-	    }
-	}
-	else {
-	    /* now setup for a complete 3D swap */
-	    oldContextStore = newContextStore;
-	    oldContext->valid3D = TRUE;
-	    oldContextType = DRI_3D_CONTEXT;
-	    newContextStore = DRIGetContextStore(newContext);
-	    if ((newContext->valid3D) &&
-	      (newContext->hwContext != pDRIPriv->myContext)) {
-		newContextType = DRI_3D_CONTEXT;
-	    }
-	    else {
-		newContextType = DRI_2D_CONTEXT;
-	    }
-	    syncType = DRI_3D_SYNC;
-	}
+            oldContextStore = DRIGetContextStore(oldContext);
+            oldContextType = DRI_2D_CONTEXT;
+            newContextStore = DRIGetContextStore(newContext);
+            newContextType = DRI_2D_CONTEXT;
+            syncType = DRI_3D_SYNC;
+            pDRIPriv->lastPartial3DContext = oldContext;
+        }
+        else if (oldContext->flags & DRI_CONTEXT_2DONLY) {
+            if (pDRIPriv->lastPartial3DContext == newContext) {
+                /* go from 2D context back to previous 3D context and
+                 * only restore 2D subset of previous 3D state
+                 */
+                oldContextStore = DRIGetContextStore(oldContext);
+                oldContextType = DRI_2D_CONTEXT;
+                newContextStore = DRIGetContextStore(newContext);
+                newContextType = DRI_2D_CONTEXT;
+                syncType = DRI_2D_SYNC;
+            }
+            else {
+                /* go from 2D context to a different 3D context */
+
+                /* call DDX driver to do partial restore */
+                oldContextStore = DRIGetContextStore(oldContext);
+                newContextStore =
+                    DRIGetContextStore(pDRIPriv->lastPartial3DContext);
+                (*pDRIPriv->pDriverInfo->SwapContext) (pScreen,
+                                                       DRI_2D_SYNC,
+                                                       DRI_2D_CONTEXT,
+                                                       oldContextStore,
+                                                       DRI_2D_CONTEXT,
+                                                       newContextStore);
+
+                /* now setup for a complete 3D swap */
+                oldContextStore = newContextStore;
+                oldContext->valid3D = TRUE;
+                oldContextType = DRI_3D_CONTEXT;
+                newContextStore = DRIGetContextStore(newContext);
+                if ((newContext->valid3D) &&
+                    (newContext->hwContext != pDRIPriv->myContext)) {
+                    newContextType = DRI_3D_CONTEXT;
+                }
+                else {
+                    newContextType = DRI_2D_CONTEXT;
+                }
+                syncType = DRI_NO_SYNC;
+            }
+        }
+        else {
+            /* now setup for a complete 3D swap */
+            oldContextStore = newContextStore;
+            oldContext->valid3D = TRUE;
+            oldContextType = DRI_3D_CONTEXT;
+            newContextStore = DRIGetContextStore(newContext);
+            if ((newContext->valid3D) &&
+                (newContext->hwContext != pDRIPriv->myContext)) {
+                newContextType = DRI_3D_CONTEXT;
+            }
+            else {
+                newContextType = DRI_2D_CONTEXT;
+            }
+            syncType = DRI_3D_SYNC;
+        }
     }
 
     /* call DDX driver to perform the swap */
-    (*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
-					  syncType,
-					  oldContextType,
-					  oldContextStore,
-					  newContextType,
-					  newContextStore);
+    (*pDRIPriv->pDriverInfo->SwapContext) (pScreen,
+                                           syncType,
+                                           oldContextType,
+                                           oldContextStore,
+                                           newContextType, newContextStore);
 }
 
-void*
+void *
 DRIGetContextStore(DRIContextPrivPtr context)
 {
-    return((void *)context->pContextStore);
+    return ((void *) context->pContextStore);
 }
 
 void
@@ -1848,45 +1842,44 @@ DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg)
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
 
-    if(pDRIDrawablePriv) {
-         (*pDRIPriv->pDriverInfo->InitBuffers)(pWin, prgn,
+    if (pDRIDrawablePriv) {
+        (*pDRIPriv->pDriverInfo->InitBuffers) (pWin, prgn,
                                                pDRIDrawablePriv->drawableIndex);
     }
 
     /* call lower wrapped functions */
     if (pDRIPriv && pDRIPriv->wrap.WindowExposures) {
 
-	/* unwrap */
-	pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures;
+        /* unwrap */
+        pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures;
 
-	/* call lower layers */
-	(*pScreen->WindowExposures)(pWin, prgn, bsreg);
+        /* call lower layers */
+        (*pScreen->WindowExposures) (pWin, prgn, bsreg);
 
-	/* rewrap */
-	pDRIPriv->wrap.WindowExposures = pScreen->WindowExposures;
-	pScreen->WindowExposures = DRIWindowExposures;
+        /* rewrap */
+        pDRIPriv->wrap.WindowExposures = pScreen->WindowExposures;
+        pScreen->WindowExposures = DRIWindowExposures;
     }
 }
 
-
 static int
 DRITreeTraversal(WindowPtr pWin, pointer data)
 {
     DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
 
-    if(pDRIDrawablePriv) {
+    if (pDRIDrawablePriv) {
         ScreenPtr pScreen = pWin->drawable.pScreen;
         DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-	if(RegionNumRects(&(pWin->clipList)) > 0) {
-	   RegionPtr reg = (RegionPtr)data;
+        if (RegionNumRects(&(pWin->clipList)) > 0) {
+            RegionPtr reg = (RegionPtr) data;
 
-	   RegionUnion(reg, reg, &(pWin->clipList));
-	   pDRIPriv->nrWalked++;
-	}
+            RegionUnion(reg, reg, &(pWin->clipList));
+            pDRIPriv->nrWalked++;
+        }
 
-	if(pDRIPriv->nrWindows == pDRIPriv->nrWalked)
-	   return WT_STOPWALKING;
+        if (pDRIPriv->nrWindows == pDRIPriv->nrWalked)
+            return WT_STOPWALKING;
     }
     return WT_WALKCHILDREN;
 }
@@ -1901,16 +1894,16 @@ DRIDestroyWindow(WindowPtr pWin)
     DRIDrawablePrivDestroy(pWin);
 
     /* call lower wrapped functions */
-    if(pDRIPriv->DestroyWindow) {
-	/* unwrap */
-	pScreen->DestroyWindow = pDRIPriv->DestroyWindow;
+    if (pDRIPriv->DestroyWindow) {
+        /* unwrap */
+        pScreen->DestroyWindow = pDRIPriv->DestroyWindow;
 
-	/* call lower layers */
-	retval = (*pScreen->DestroyWindow)(pWin);
+        /* call lower layers */
+        retval = (*pScreen->DestroyWindow) (pWin);
 
-	/* rewrap */
-	pDRIPriv->DestroyWindow = pScreen->DestroyWindow;
-	pScreen->DestroyWindow = DRIDestroyWindow;
+        /* rewrap */
+        pDRIPriv->DestroyWindow = pScreen->DestroyWindow;
+        pScreen->DestroyWindow = DRIDestroyWindow;
     }
 
     return retval;
@@ -1922,39 +1915,41 @@ DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     ScreenPtr pScreen = pWin->drawable.pScreen;
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    if(!pDRIPriv) return;
+    if (!pDRIPriv)
+        return;
 
-    if(pDRIPriv->nrWindowsVisible > 0) {
-       RegionRec reg;
+    if (pDRIPriv->nrWindowsVisible > 0) {
+        RegionRec reg;
 
-       RegionNull(&reg);
-       pDRIPriv->nrWalked = 0;
-       TraverseTree(pWin, DRITreeTraversal, (pointer)(&reg));
+        RegionNull(&reg);
+        pDRIPriv->nrWalked = 0;
+        TraverseTree(pWin, DRITreeTraversal, (pointer) (&reg));
 
-       if(RegionNotEmpty(&reg)) {
-           RegionTranslate(&reg, ptOldOrg.x - pWin->drawable.x,
-                                        ptOldOrg.y - pWin->drawable.y);
-           RegionIntersect(&reg, &reg, prgnSrc);
+        if (RegionNotEmpty(&reg)) {
+            RegionTranslate(&reg, ptOldOrg.x - pWin->drawable.x,
+                            ptOldOrg.y - pWin->drawable.y);
+            RegionIntersect(&reg, &reg, prgnSrc);
 
-           /* The MoveBuffers interface is not ideal */
-           (*pDRIPriv->pDriverInfo->MoveBuffers)(pWin, ptOldOrg, &reg,
-				pDRIPriv->pDriverInfo->ddxDrawableTableEntry);
-       }
+            /* The MoveBuffers interface is not ideal */
+            (*pDRIPriv->pDriverInfo->MoveBuffers) (pWin, ptOldOrg, &reg,
+                                                   pDRIPriv->pDriverInfo->
+                                                   ddxDrawableTableEntry);
+        }
 
-       RegionUninit(&reg);
+        RegionUninit(&reg);
     }
 
     /* call lower wrapped functions */
-    if(pDRIPriv->wrap.CopyWindow) {
-	/* unwrap */
-	pScreen->CopyWindow = pDRIPriv->wrap.CopyWindow;
+    if (pDRIPriv->wrap.CopyWindow) {
+        /* unwrap */
+        pScreen->CopyWindow = pDRIPriv->wrap.CopyWindow;
 
-	/* call lower layers */
-	(*pScreen->CopyWindow)(pWin, ptOldOrg, prgnSrc);
+        /* call lower layers */
+        (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);
 
-	/* rewrap */
-	pDRIPriv->wrap.CopyWindow = pScreen->CopyWindow;
-	pScreen->CopyWindow = DRICopyWindow;
+        /* rewrap */
+        pDRIPriv->wrap.CopyWindow = pScreen->CopyWindow;
+        pScreen->CopyWindow = DRICopyWindow;
     }
 }
 
@@ -1965,25 +1960,26 @@ DRIGetSecs(long *secs, long *usecs)
 
     gettimeofday(&tv, NULL);
 
-    *secs  = tv.tv_sec;
+    *secs = tv.tv_sec;
     *usecs = tv.tv_usec;
 }
 
 static unsigned long
 DRIComputeMilliSeconds(unsigned long s_secs, unsigned long s_usecs,
-		       unsigned long f_secs, unsigned long f_usecs)
+                       unsigned long f_secs, unsigned long f_usecs)
 {
     if (f_usecs < s_usecs) {
-	--f_secs;
-	f_usecs += 1000000;
+        --f_secs;
+        f_usecs += 1000000;
     }
     return (f_secs - s_secs) * 1000 + (f_usecs - s_usecs) / 1000;
 }
 
 static void
-DRISpinLockTimeout(drmLock *lock, int val, unsigned long timeout /* in mS */)
+DRISpinLockTimeout(drmLock * lock, int val, unsigned long timeout /* in mS */ )
 {
-    int  count = 10000;
+    int count = 10000;
+
 #if !defined(__alpha__) && !defined(__powerpc__)
     char ret;
 #else
@@ -1992,25 +1988,27 @@ DRISpinLockTimeout(drmLock *lock, int val, unsigned long timeout /* in mS */)
     long s_secs, s_usecs;
     long f_secs, f_usecs;
     long msecs;
-    long prev  = 0;
+    long prev = 0;
 
     DRIGetSecs(&s_secs, &s_usecs);
 
     do {
-	DRM_SPINLOCK_COUNT(lock, val, count, ret);
-	if (!ret) return;	/* Got lock */
-	DRIGetSecs(&f_secs, &f_usecs);
-	msecs = DRIComputeMilliSeconds(s_secs, s_usecs, f_secs, f_usecs);
-	if (msecs - prev < 250) count *= 2; /* Not more than 0.5S */
+        DRM_SPINLOCK_COUNT(lock, val, count, ret);
+        if (!ret)
+            return;             /* Got lock */
+        DRIGetSecs(&f_secs, &f_usecs);
+        msecs = DRIComputeMilliSeconds(s_secs, s_usecs, f_secs, f_usecs);
+        if (msecs - prev < 250)
+            count *= 2;         /* Not more than 0.5S */
     } while (msecs < timeout);
 
-				/* Didn't get lock, so take it.  The worst
-                                   that can happen is that there is some
-                                   garbage written to the wrong part of the
-                                   framebuffer that a refresh will repair.
-                                   That's undesirable, but better than
-                                   locking the server.  This should be a
-                                   very rare event. */
+    /* Didn't get lock, so take it.  The worst
+       that can happen is that there is some
+       garbage written to the wrong part of the
+       framebuffer that a refresh will repair.
+       That's undesirable, but better than
+       locking the server.  This should be a
+       very rare event. */
     DRM_SPINLOCK_TAKE(lock, val);
 }
 
@@ -2019,16 +2017,17 @@ DRILockTree(ScreenPtr pScreen)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    if(!pDRIPriv) return;
+    if (!pDRIPriv)
+        return;
 
     /* Restore the last known 3D context if the X context is hidden */
     if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
-	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
-					      DRI_2D_SYNC,
-					      DRI_NO_CONTEXT,
-					      NULL,
-					      DRI_2D_CONTEXT,
-					      pDRIPriv->partial3DContextStore);
+        (*pDRIPriv->pDriverInfo->SwapContext) (pScreen,
+                                               DRI_2D_SYNC,
+                                               DRI_NO_CONTEXT,
+                                               NULL,
+                                               DRI_2D_CONTEXT,
+                                               pDRIPriv->partial3DContextStore);
     }
 
     /* Call kernel to release lock */
@@ -2038,20 +2037,20 @@ DRILockTree(ScreenPtr pScreen)
        appropriate, since this should never time out except in the case of
        client death while the lock is being held.  The timeout must be
        greater than any reasonable rendering time. */
-    DRISpinLockTimeout(&pDRIPriv->pSAREA->drawable_lock, 1, 10000); /*10 secs*/
+    DRISpinLockTimeout(&pDRIPriv->pSAREA->drawable_lock, 1, 10000);     /*10 secs */
 
     /* Call kernel flush outstanding buffers and relock */
-    DRILock(pScreen, DRM_LOCK_QUIESCENT|DRM_LOCK_FLUSH_ALL);
+    DRILock(pScreen, DRM_LOCK_QUIESCENT | DRM_LOCK_FLUSH_ALL);
 
     /* Switch back to our 2D context if the X context is hidden */
     if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
-	/* hide X context by swapping 2D component here */
-	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
-					      DRI_3D_SYNC,
-					      DRI_2D_CONTEXT,
-					      pDRIPriv->partial3DContextStore,
-					      DRI_2D_CONTEXT,
-					      pDRIPriv->hiddenContextStore);
+        /* hide X context by swapping 2D component here */
+        (*pDRIPriv->pDriverInfo->SwapContext) (pScreen,
+                                               DRI_3D_SYNC,
+                                               DRI_2D_CONTEXT,
+                                               pDRIPriv->partial3DContextStore,
+                                               DRI_2D_CONTEXT,
+                                               pDRIPriv->hiddenContextStore);
     }
 }
 
@@ -2061,21 +2060,22 @@ DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
     ScreenPtr pScreen = pParent->drawable.pScreen;
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    int returnValue = 1; /* always return 1, not checked by dix/window.c */
+    int returnValue = 1;        /* always return 1, not checked by dix/window.c */
 
-    if(!pDRIPriv) return returnValue;
+    if (!pDRIPriv)
+        return returnValue;
 
     /* call lower wrapped functions */
-    if(pDRIPriv->wrap.ValidateTree) {
-	/* unwrap */
-	pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;
+    if (pDRIPriv->wrap.ValidateTree) {
+        /* unwrap */
+        pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;
 
-	/* call lower layers */
-	returnValue = (*pScreen->ValidateTree)(pParent, pChild, kind);
+        /* call lower layers */
+        returnValue = (*pScreen->ValidateTree) (pParent, pChild, kind);
 
-	/* rewrap */
-	pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;
-	pScreen->ValidateTree = DRIValidateTree;
+        /* rewrap */
+        pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;
+        pScreen->ValidateTree = DRIValidateTree;
     }
 
     return returnValue;
@@ -2088,22 +2088,24 @@ DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
     DRIScreenPrivPtr pDRIPriv;
 
     if (pParent) {
-	pScreen = pParent->drawable.pScreen;
-    } else {
-	pScreen = pChild->drawable.pScreen;
+        pScreen = pParent->drawable.pScreen;
     }
-    if(!(pDRIPriv = DRI_SCREEN_PRIV(pScreen))) return;
+    else {
+        pScreen = pChild->drawable.pScreen;
+    }
+    if (!(pDRIPriv = DRI_SCREEN_PRIV(pScreen)))
+        return;
 
     if (pDRIPriv->wrap.PostValidateTree) {
-	/* unwrap */
-	pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;
+        /* unwrap */
+        pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;
 
-	/* call lower layers */
-	(*pScreen->PostValidateTree)(pParent, pChild, kind);
+        /* call lower layers */
+        (*pScreen->PostValidateTree) (pParent, pChild, kind);
 
-	/* rewrap */
-	pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
-	pScreen->PostValidateTree = DRIPostValidateTree;
+        /* rewrap */
+        pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
+        pScreen->PostValidateTree = DRIPostValidateTree;
     }
 }
 
@@ -2112,45 +2114,46 @@ DRIClipNotify(WindowPtr pWin, int dx, int dy)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    DRIDrawablePrivPtr	pDRIDrawablePriv;
+    DRIDrawablePrivPtr pDRIDrawablePriv;
 
-    if(!pDRIPriv) return;
+    if (!pDRIPriv)
+        return;
 
     if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
         int nrects = RegionNumRects(&pWin->clipList);
 
-        if(!pDRIPriv->windowsTouched) {
+        if (!pDRIPriv->windowsTouched) {
             DRILockTree(pScreen);
             pDRIPriv->windowsTouched = TRUE;
         }
 
-	if (nrects && !pDRIDrawablePriv->nrects)
-	    DRIIncreaseNumberVisible(pScreen);
-	else if (!nrects && pDRIDrawablePriv->nrects)
-	    DRIDecreaseNumberVisible(pScreen);
-	else
-	    DRIDriverClipNotify(pScreen);
+        if (nrects && !pDRIDrawablePriv->nrects)
+            DRIIncreaseNumberVisible(pScreen);
+        else if (!nrects && pDRIDrawablePriv->nrects)
+            DRIDecreaseNumberVisible(pScreen);
+        else
+            DRIDriverClipNotify(pScreen);
 
-	pDRIDrawablePriv->nrects = nrects;
+        pDRIDrawablePriv->nrects = nrects;
 
-	pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp
-	    = DRIDrawableValidationStamp++;
+        pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp
+            = DRIDrawableValidationStamp++;
 
-	drmUpdateDrawableInfo(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable,
-			      DRM_DRAWABLE_CLIPRECTS,
-			      nrects, RegionRects(&pWin->clipList));
+        drmUpdateDrawableInfo(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable,
+                              DRM_DRAWABLE_CLIPRECTS,
+                              nrects, RegionRects(&pWin->clipList));
     }
 
     /* call lower wrapped functions */
-    if(pDRIPriv->wrap.ClipNotify) {
+    if (pDRIPriv->wrap.ClipNotify) {
 
-	/* unwrap */
+        /* unwrap */
         pScreen->ClipNotify = pDRIPriv->wrap.ClipNotify;
 
-	/* call lower layers */
-        (*pScreen->ClipNotify)(pWin, dx, dy);
+        /* call lower layers */
+        (*pScreen->ClipNotify) (pWin, dx, dy);
 
-	/* rewrap */
+        /* rewrap */
         pDRIPriv->wrap.ClipNotify = pScreen->ClipNotify;
         pScreen->ClipNotify = DRIClipNotify;
     }
@@ -2165,10 +2168,10 @@ DRIGetDrawableIndex(WindowPtr pWin)
     CARD32 index;
 
     if (pDRIDrawablePriv) {
-	index = pDRIDrawablePriv->drawableIndex;
+        index = pDRIDrawablePriv->drawableIndex;
     }
     else {
-	index = pDRIPriv->pDriverInfo->ddxDrawableTableEntry;
+        index = pDRIPriv->pDriverInfo->ddxDrawableTableEntry;
     }
 
     return index;
@@ -2178,16 +2181,16 @@ unsigned int
 DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
     return pDRIPriv->pSAREA->drawableTable[drawable_index].stamp;
 }
 
-
 void
 DRIPrintDrawableLock(ScreenPtr pScreen, char *msg)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    ErrorF("%s: %d\n", msg,  pDRIPriv->pSAREA->drawable_lock.lock);
+    ErrorF("%s: %d\n", msg, pDRIPriv->pSAREA->drawable_lock.lock);
 }
 
 void
@@ -2195,18 +2198,20 @@ DRILock(ScreenPtr pScreen, int flags)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    if(!pDRIPriv || !pDRIPriv->pLockRefCount) return;
+    if (!pDRIPriv || !pDRIPriv->pLockRefCount)
+        return;
 
     if (!*pDRIPriv->pLockRefCount) {
-        DRM_LOCK(pDRIPriv->drmFD, pDRIPriv->pLSAREA, pDRIPriv->myContext, flags);
-	*pDRIPriv->pLockingContext = pDRIPriv->myContext;
-    } else if (*pDRIPriv->pLockingContext != pDRIPriv->myContext) {
-	DRIDrvMsg(pScreen->myNum, X_ERROR,
-		  "[DRI] Locking deadlock.\n"
-		  "\tAlready locked with context %d,\n"
-		  "\ttrying to lock with context %d.\n",
-		  pDRIPriv->pLockingContext,
-		  pDRIPriv->myContext);
+        DRM_LOCK(pDRIPriv->drmFD, pDRIPriv->pLSAREA, pDRIPriv->myContext,
+                 flags);
+        *pDRIPriv->pLockingContext = pDRIPriv->myContext;
+    }
+    else if (*pDRIPriv->pLockingContext != pDRIPriv->myContext) {
+        DRIDrvMsg(pScreen->myNum, X_ERROR,
+                  "[DRI] Locking deadlock.\n"
+                  "\tAlready locked with context %d,\n"
+                  "\ttrying to lock with context %d.\n",
+                  pDRIPriv->pLockingContext, pDRIPriv->myContext);
     }
     (*pDRIPriv->pLockRefCount)++;
 }
@@ -2216,23 +2221,24 @@ DRIUnlock(ScreenPtr pScreen)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    if(!pDRIPriv || !pDRIPriv->pLockRefCount) return;
+    if (!pDRIPriv || !pDRIPriv->pLockRefCount)
+        return;
 
     if (*pDRIPriv->pLockRefCount > 0) {
-	if (pDRIPriv->myContext != *pDRIPriv->pLockingContext) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR,
-		      "[DRI] Unlocking inconsistency:\n"
-		      "\tContext %d trying to unlock lock held by context %d\n",
-		      pDRIPriv->pLockingContext,
-		      pDRIPriv->myContext);
-	}
-	(*pDRIPriv->pLockRefCount)--;
-    } else {
+        if (pDRIPriv->myContext != *pDRIPriv->pLockingContext) {
+            DRIDrvMsg(pScreen->myNum, X_ERROR,
+                      "[DRI] Unlocking inconsistency:\n"
+                      "\tContext %d trying to unlock lock held by context %d\n",
+                      pDRIPriv->pLockingContext, pDRIPriv->myContext);
+        }
+        (*pDRIPriv->pLockRefCount)--;
+    }
+    else {
         DRIDrvMsg(pScreen->myNum, X_ERROR,
-		  "DRIUnlock called when not locked.\n");
+                  "DRIUnlock called when not locked.\n");
         return;
     }
-    if (! *pDRIPriv->pLockRefCount)
+    if (!*pDRIPriv->pLockRefCount)
         DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pLSAREA, pDRIPriv->myContext);
 }
 
@@ -2240,30 +2246,35 @@ void *
 DRIGetSAREAPrivate(ScreenPtr pScreen)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    if (!pDRIPriv) return 0;
 
-    return (void *)(((char*)pDRIPriv->pSAREA)+sizeof(XF86DRISAREARec));
+    if (!pDRIPriv)
+        return 0;
+
+    return (void *) (((char *) pDRIPriv->pSAREA) + sizeof(XF86DRISAREARec));
 }
 
 drm_context_t
 DRIGetContext(ScreenPtr pScreen)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    if (!pDRIPriv) return 0;
+
+    if (!pDRIPriv)
+        return 0;
 
     return pDRIPriv->myContext;
 }
 
 void
 DRIGetTexOffsetFuncs(ScreenPtr pScreen,
-		     DRITexOffsetStartProcPtr *texOffsetStartFunc,
-		     DRITexOffsetFinishProcPtr *texOffsetFinishFunc)
+                     DRITexOffsetStartProcPtr * texOffsetStartFunc,
+                     DRITexOffsetFinishProcPtr * texOffsetFinishFunc)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    if (!pDRIPriv) return;
+    if (!pDRIPriv)
+        return;
 
-    *texOffsetStartFunc  = pDRIPriv->pDriverInfo->texOffsetStart;
+    *texOffsetStartFunc = pDRIPriv->pDriverInfo->texOffsetStart;
     *texOffsetFinishFunc = pDRIPriv->pDriverInfo->texOffsetFinish;
 }
 
@@ -2279,9 +2290,7 @@ DRIGetWrappedFuncs(ScreenPtr pScreen)
 
 /* note that this returns the library version, not the protocol version */
 void
-DRIQueryVersion(int *majorVersion,
-                int *minorVersion,
-                int *patchVersion)
+DRIQueryVersion(int *majorVersion, int *minorVersion, int *patchVersion)
 {
     *majorVersion = DRIINFO_MAJOR_VERSION;
     *minorVersion = DRIINFO_MINOR_VERSION;
@@ -2291,51 +2300,57 @@ DRIQueryVersion(int *majorVersion,
 static void
 _DRIAdjustFrame(ScrnInfoPtr pScrn, DRIScreenPrivPtr pDRIPriv, int x, int y)
 {
-    pDRIPriv->pSAREA->frame.x      = x;
-    pDRIPriv->pSAREA->frame.y      = y;
-    pDRIPriv->pSAREA->frame.width  = pScrn->frameX1 - x + 1;
+    pDRIPriv->pSAREA->frame.x = x;
+    pDRIPriv->pSAREA->frame.y = y;
+    pDRIPriv->pSAREA->frame.width = pScrn->frameX1 - x + 1;
     pDRIPriv->pSAREA->frame.height = pScrn->frameY1 - y + 1;
 }
 
 void
 DRIAdjustFrame(int scrnIndex, int x, int y, int flags)
 {
-    ScreenPtr        pScreen  = screenInfo.screens[scrnIndex];
+    ScreenPtr pScreen = screenInfo.screens[scrnIndex];
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    ScrnInfoPtr      pScrn    = xf86Screens[pScreen->myNum];
-    int              px, py;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    int px, py;
 
     if (!pDRIPriv || !pDRIPriv->pSAREA) {
-	DRIDrvMsg(scrnIndex, X_ERROR, "[DRI] No SAREA (%p %p)\n",
-		  pDRIPriv, pDRIPriv ? pDRIPriv->pSAREA : NULL);
-	return;
+        DRIDrvMsg(scrnIndex, X_ERROR, "[DRI] No SAREA (%p %p)\n",
+                  pDRIPriv, pDRIPriv ? pDRIPriv->pSAREA : NULL);
+        return;
     }
 
     if (pDRIPriv->fullscreen) {
-				/* Fix up frame */
-	pScrn->frameX0 = pDRIPriv->pSAREA->frame.x;
-	pScrn->frameY0 = pDRIPriv->pSAREA->frame.y;
-	pScrn->frameX1 = pScrn->frameX0 + pDRIPriv->pSAREA->frame.width - 1;
-	pScrn->frameY1 = pScrn->frameY0 + pDRIPriv->pSAREA->frame.height - 1;
-
-				/* Fix up cursor */
-    miPointerGetPosition(inputInfo.pointer, &px, &py);
-	if (px < pScrn->frameX0) px = pScrn->frameX0;
-	if (px > pScrn->frameX1) px = pScrn->frameX1;
-	if (py < pScrn->frameY0) py = pScrn->frameY0;
-	if (py > pScrn->frameY1) py = pScrn->frameY1;
-	pScreen->SetCursorPosition(inputInfo.pointer, pScreen, px, py, TRUE);
-	return;
+        /* Fix up frame */
+        pScrn->frameX0 = pDRIPriv->pSAREA->frame.x;
+        pScrn->frameY0 = pDRIPriv->pSAREA->frame.y;
+        pScrn->frameX1 = pScrn->frameX0 + pDRIPriv->pSAREA->frame.width - 1;
+        pScrn->frameY1 = pScrn->frameY0 + pDRIPriv->pSAREA->frame.height - 1;
+
+        /* Fix up cursor */
+        miPointerGetPosition(inputInfo.pointer, &px, &py);
+
+        if (px < pScrn->frameX0)
+            px = pScrn->frameX0;
+        if (px > pScrn->frameX1)
+            px = pScrn->frameX1;
+        if (py < pScrn->frameY0)
+            py = pScrn->frameY0;
+        if (py > pScrn->frameY1)
+            py = pScrn->frameY1;
+        pScreen->SetCursorPosition(inputInfo.pointer, pScreen, px, py, TRUE);
+
+        return;
     }
 
     if (pDRIPriv->wrap.AdjustFrame) {
-	/* unwrap */
-	pScrn->AdjustFrame = pDRIPriv->wrap.AdjustFrame;
-	/* call lower layers */
-	(*pScrn->AdjustFrame)(scrnIndex, x, y, flags);
-	/* rewrap */
-	pDRIPriv->wrap.AdjustFrame = pScrn->AdjustFrame;
-	pScrn->AdjustFrame         = DRIAdjustFrame;
+        /* unwrap */
+        pScrn->AdjustFrame = pDRIPriv->wrap.AdjustFrame;
+        /* call lower layers */
+        (*pScrn->AdjustFrame) (scrnIndex, x, y, flags);
+        /* rewrap */
+        pDRIPriv->wrap.AdjustFrame = pScrn->AdjustFrame;
+        pScrn->AdjustFrame = DRIAdjustFrame;
     }
 
     _DRIAdjustFrame(pScrn, pDRIPriv, x, y);
@@ -2350,145 +2365,147 @@ DRIAdjustFrame(int scrnIndex, int x, int y, int flags)
  */
 
 void
-DRIMoveBuffersHelper(
-   ScreenPtr pScreen, 
-   int dx,
-   int dy,
-   int *xdir, 
-   int *ydir, 
-   RegionPtr reg
-)
-{
-   BoxPtr extents, pbox, firstBox, lastBox;
-   BoxRec tmpBox;
-   int y, nbox;
-
-   extents = RegionExtents(reg);
-   nbox = RegionNumRects(reg);
-   pbox = RegionRects(reg);
-
-   if((dy > 0) && (dy < (extents->y2 - extents->y1))) {
-     *ydir = -1;
-     if(nbox > 1) {
-        firstBox = pbox;
-        lastBox = pbox + nbox - 1;
-        while((unsigned long)firstBox < (unsigned long)lastBox) {
-           tmpBox = *firstBox;
-           *firstBox = *lastBox;
-           *lastBox = tmpBox;
-           firstBox++;
-           lastBox--;
+DRIMoveBuffersHelper(ScreenPtr pScreen,
+                     int dx, int dy, int *xdir, int *ydir, RegionPtr reg)
+{
+    BoxPtr extents, pbox, firstBox, lastBox;
+    BoxRec tmpBox;
+    int y, nbox;
+
+    extents = RegionExtents(reg);
+    nbox = RegionNumRects(reg);
+    pbox = RegionRects(reg);
+
+    if ((dy > 0) && (dy < (extents->y2 - extents->y1))) {
+        *ydir = -1;
+        if (nbox > 1) {
+            firstBox = pbox;
+            lastBox = pbox + nbox - 1;
+            while ((unsigned long) firstBox < (unsigned long) lastBox) {
+                tmpBox = *firstBox;
+                *firstBox = *lastBox;
+                *lastBox = tmpBox;
+                firstBox++;
+                lastBox--;
+            }
         }
-     }
-   } else *ydir = 1;
-
-   if((dx > 0) && (dx < (extents->x2 - extents->x1))) {
-     *xdir = -1;
-     if(nbox > 1) {
-        firstBox = lastBox = pbox;
-        y = pbox->y1;
-        while(--nbox) {
-           pbox++;
-           if(pbox->y1 == y) lastBox++;
-           else {
-              while((unsigned long)firstBox < (unsigned long)lastBox) {
-                 tmpBox = *firstBox;
-                 *firstBox = *lastBox;
-                 *lastBox = tmpBox;
-                 firstBox++;
-                 lastBox--;
-              }
-
-              firstBox = lastBox = pbox;
-              y = pbox->y1;
-           }
-         }
-         while((unsigned long)firstBox < (unsigned long)lastBox) {
-           tmpBox = *firstBox;
-           *firstBox = *lastBox;
-           *lastBox = tmpBox;
-           firstBox++;
-           lastBox--;
+    }
+    else
+        *ydir = 1;
+
+    if ((dx > 0) && (dx < (extents->x2 - extents->x1))) {
+        *xdir = -1;
+        if (nbox > 1) {
+            firstBox = lastBox = pbox;
+            y = pbox->y1;
+            while (--nbox) {
+                pbox++;
+                if (pbox->y1 == y)
+                    lastBox++;
+                else {
+                    while ((unsigned long) firstBox < (unsigned long) lastBox) {
+                        tmpBox = *firstBox;
+                        *firstBox = *lastBox;
+                        *lastBox = tmpBox;
+                        firstBox++;
+                        lastBox--;
+                    }
+
+                    firstBox = lastBox = pbox;
+                    y = pbox->y1;
+                }
+            }
+            while ((unsigned long) firstBox < (unsigned long) lastBox) {
+                tmpBox = *firstBox;
+                *firstBox = *lastBox;
+                *lastBox = tmpBox;
+                firstBox++;
+                lastBox--;
+            }
         }
-     }
-   } else *xdir = 1;
+    }
+    else
+        *xdir = 1;
 
 }
 
 char *
-DRICreatePCIBusID(const struct pci_device * dev)
+DRICreatePCIBusID(const struct pci_device *dev)
 {
     char *busID;
 
     if (asprintf(&busID, "pci:%04x:%02x:%02x.%d",
-		 dev->domain, dev->bus, dev->dev, dev->func) == -1)
-	return NULL;
+                 dev->domain, dev->bus, dev->dev, dev->func) == -1)
+        return NULL;
 
     return busID;
 }
 
-static void drmSIGIOHandler(int interrupt, void *closure)
+static void
+drmSIGIOHandler(int interrupt, void *closure)
 {
     unsigned long key;
-    void          *value;
-    ssize_t       count;
-    drm_ctx_t     ctx;
-    typedef void  (*_drmCallback)(int, void *, void *);
-    char          buf[256];
-    drm_context_t    old;
-    drm_context_t    new;
-    void          *oldctx;
-    void          *newctx;
-    char          *pt;
-    drmHashEntry  *entry;
+    void *value;
+    ssize_t count;
+    drm_ctx_t ctx;
+    typedef void (*_drmCallback) (int, void *, void *);
+    char buf[256];
+    drm_context_t old;
+    drm_context_t new;
+    void *oldctx;
+    void *newctx;
+    char *pt;
+    drmHashEntry *entry;
     void *hash_table;
 
     hash_table = drmGetHashTable();
 
-    if (!hash_table) return;
+    if (!hash_table)
+        return;
     if (drmHashFirst(hash_table, &key, &value)) {
-	entry = value;
-	do {
+        entry = value;
+        do {
 #if 0
-	    fprintf(stderr, "Trying %d\n", entry->fd);
+            fprintf(stderr, "Trying %d\n", entry->fd);
 #endif
-	    if ((count = read(entry->fd, buf, sizeof(buf) - 1)) > 0) {
-		buf[count] = '\0';
+            if ((count = read(entry->fd, buf, sizeof(buf) - 1)) > 0) {
+                buf[count] = '\0';
 #if 0
-		fprintf(stderr, "Got %s\n", buf);
+                fprintf(stderr, "Got %s\n", buf);
 #endif
 
-		for (pt = buf; *pt != ' '; ++pt); /* Find first space */
-		++pt;
-		old    = strtol(pt, &pt, 0);
-		new    = strtol(pt, NULL, 0);
-		oldctx = drmGetContextTag(entry->fd, old);
-		newctx = drmGetContextTag(entry->fd, new);
+                for (pt = buf; *pt != ' '; ++pt);       /* Find first space */
+                ++pt;
+                old = strtol(pt, &pt, 0);
+                new = strtol(pt, NULL, 0);
+                oldctx = drmGetContextTag(entry->fd, old);
+                newctx = drmGetContextTag(entry->fd, new);
 #if 0
-		fprintf(stderr, "%d %d %p %p\n", old, new, oldctx, newctx);
+                fprintf(stderr, "%d %d %p %p\n", old, new, oldctx, newctx);
 #endif
-		((_drmCallback)entry->f)(entry->fd, oldctx, newctx);
-		ctx.handle = new;
-		ioctl(entry->fd, DRM_IOCTL_NEW_CTX, &ctx);
-	    }
-	} while (drmHashNext(hash_table, &key, &value));
+                ((_drmCallback) entry->f) (entry->fd, oldctx, newctx);
+                ctx.handle = new;
+                ioctl(entry->fd, DRM_IOCTL_NEW_CTX, &ctx);
+            }
+        } while (drmHashNext(hash_table, &key, &value));
     }
 }
 
-
-int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *))
+int
+drmInstallSIGIOHandler(int fd, void (*f) (int, void *, void *))
 {
-    drmHashEntry     *entry;
+    drmHashEntry *entry;
 
-    entry     = drmGetEntry(fd);
-    entry->f  = f;
+    entry = drmGetEntry(fd);
+    entry->f = f;
 
     return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0);
 }
 
-int drmRemoveSIGIOHandler(int fd)
+int
+drmRemoveSIGIOHandler(int fd)
 {
-    drmHashEntry     *entry = drmGetEntry(fd);
+    drmHashEntry *entry = drmGetEntry(fd);
 
     entry->f = NULL;
 
diff --git a/xorg-server/hw/xfree86/dri/dri.h b/xorg-server/hw/xfree86/dri/dri.h
index f690e234b..53458bb4a 100644
--- a/xorg-server/hw/xfree86/dri/dri.h
+++ b/xorg-server/hw/xfree86/dri/dri.h
@@ -50,11 +50,10 @@ typedef int DRIContextType;
 
 typedef struct _DRIContextPrivRec DRIContextPrivRec, *DRIContextPrivPtr;
 
-typedef enum _DRIContextFlags
-{
-    DRI_CONTEXT_2DONLY    = 0x01,
+typedef enum _DRIContextFlags {
+    DRI_CONTEXT_2DONLY = 0x01,
     DRI_CONTEXT_PRESERVED = 0x02,
-    DRI_CONTEXT_RESERVED  = 0x04 /* DRI Only -- no kernel equivalent */
+    DRI_CONTEXT_RESERVED = 0x04 /* DRI Only -- no kernel equivalent */
 } DRIContextFlags;
 
 #define DRI_NO_CONTEXT 0
@@ -73,10 +72,8 @@ typedef int DRIWindowRequests;
 #define DRI_3D_WINDOWS_ONLY  1
 #define DRI_ALL_WINDOWS      2
 
-
-typedef void (*ClipNotifyPtr)( WindowPtr, int, int );
-typedef void (*AdjustFramePtr)(int scrnIndex, int x, int y, int flags);
-
+typedef void (*ClipNotifyPtr) (WindowPtr, int, int);
+typedef void (*AdjustFramePtr) (int scrnIndex, int x, int y, int flags);
 
 /*
  * These functions can be wrapped by the DRI.  Each of these have
@@ -84,17 +81,16 @@ typedef void (*AdjustFramePtr)(int scrnIndex, int x, int y, int flags);
  * overridden by the driver in its [driver]DRIScreenInit function.
  */
 typedef struct {
-    ScreenWakeupHandlerProcPtr   WakeupHandler;
-    ScreenBlockHandlerProcPtr    BlockHandler;
-    WindowExposuresProcPtr       WindowExposures;
-    CopyWindowProcPtr            CopyWindow;
-    ValidateTreeProcPtr          ValidateTree;
-    PostValidateTreeProcPtr      PostValidateTree;
-    ClipNotifyProcPtr            ClipNotify;
-    AdjustFramePtr               AdjustFrame;
+    ScreenWakeupHandlerProcPtr WakeupHandler;
+    ScreenBlockHandlerProcPtr BlockHandler;
+    WindowExposuresProcPtr WindowExposures;
+    CopyWindowProcPtr CopyWindow;
+    ValidateTreeProcPtr ValidateTree;
+    PostValidateTreeProcPtr PostValidateTree;
+    ClipNotifyProcPtr ClipNotify;
+    AdjustFramePtr AdjustFrame;
 } DRIWrappedFuncsRec, *DRIWrappedFuncsPtr;
 
-
 /*
  * Prior to Xorg 6.8.99.8, the DRIInfoRec structure was implicitly versioned
  * by the XF86DRI_*_VERSION defines in xf86dristr.h.  These numbers were also
@@ -112,8 +108,8 @@ typedef struct {
 #define DRIINFO_MINOR_VERSION   4
 #define DRIINFO_PATCH_VERSION   0
 
-typedef unsigned long long (*DRITexOffsetStartProcPtr)(PixmapPtr pPix);
-typedef void (*DRITexOffsetFinishProcPtr)(PixmapPtr pPix);
+typedef unsigned long long (*DRITexOffsetStartProcPtr) (PixmapPtr pPix);
+typedef void (*DRITexOffsetFinishProcPtr) (PixmapPtr pPix);
 
 typedef struct {
     /* driver call back functions
@@ -123,88 +119,81 @@ typedef struct {
      * Bump the DRIINFO minor number to indicate new fields.
      * Bump the DRIINFO major number to indicate binary-incompatible changes.
      */
-    Bool	(*CreateContext)(ScreenPtr pScreen,
-				 VisualPtr visual,
-				 drm_context_t hHWContext,
-				 void* pVisualConfigPriv,
-				 DRIContextType context);
-    void        (*DestroyContext)(ScreenPtr pScreen,
-				  drm_context_t hHWContext,
-                                  DRIContextType context);
-    void	(*SwapContext)(ScreenPtr pScreen,
-			       DRISyncType syncType,
-			       DRIContextType readContextType,
-			       void* readContextStore,
-			       DRIContextType writeContextType,
-			       void* writeContextStore);
-    void	(*InitBuffers)(WindowPtr pWin,
-			       RegionPtr prgn,
-			       CARD32 indx);
-    void	(*MoveBuffers)(WindowPtr pWin,
-			       DDXPointRec ptOldOrg,
-			       RegionPtr prgnSrc,
-			       CARD32 indx);
-    void        (*TransitionTo3d)(ScreenPtr pScreen);
-    void        (*TransitionTo2d)(ScreenPtr pScreen);
-
-    void	(*SetDrawableIndex)(WindowPtr pWin, CARD32 indx);
-    Bool        (*OpenFullScreen)(ScreenPtr pScreen);
-    Bool        (*CloseFullScreen)(ScreenPtr pScreen);
+    Bool (*CreateContext) (ScreenPtr pScreen,
+                           VisualPtr visual,
+                           drm_context_t hHWContext,
+                           void *pVisualConfigPriv, DRIContextType context);
+    void (*DestroyContext) (ScreenPtr pScreen,
+                            drm_context_t hHWContext, DRIContextType context);
+    void (*SwapContext) (ScreenPtr pScreen,
+                         DRISyncType syncType,
+                         DRIContextType readContextType,
+                         void *readContextStore,
+                         DRIContextType writeContextType,
+                         void *writeContextStore);
+    void (*InitBuffers) (WindowPtr pWin, RegionPtr prgn, CARD32 indx);
+    void (*MoveBuffers) (WindowPtr pWin,
+                         DDXPointRec ptOldOrg, RegionPtr prgnSrc, CARD32 indx);
+    void (*TransitionTo3d) (ScreenPtr pScreen);
+    void (*TransitionTo2d) (ScreenPtr pScreen);
+
+    void (*SetDrawableIndex) (WindowPtr pWin, CARD32 indx);
+    Bool (*OpenFullScreen) (ScreenPtr pScreen);
+    Bool (*CloseFullScreen) (ScreenPtr pScreen);
 
     /* wrapped functions */
-    DRIWrappedFuncsRec  wrap;
+    DRIWrappedFuncsRec wrap;
 
     /* device info */
-    char*		drmDriverName;
-    char*		clientDriverName;
-    char*		busIdString;
-    int			ddxDriverMajorVersion;
-    int			ddxDriverMinorVersion;
-    int			ddxDriverPatchVersion;
-    pointer		frameBufferPhysicalAddress;
-    long		frameBufferSize;
-    long		frameBufferStride;
-    long		SAREASize;
-    int			maxDrawableTableEntry;
-    int			ddxDrawableTableEntry;
-    long		contextSize;
-    DRISwapMethod	driverSwapMethod;
-    DRIWindowRequests	bufferRequests;
-    int			devPrivateSize;
-    void*		devPrivate;
-    Bool		createDummyCtx;
-    Bool		createDummyCtxPriv;
+    char *drmDriverName;
+    char *clientDriverName;
+    char *busIdString;
+    int ddxDriverMajorVersion;
+    int ddxDriverMinorVersion;
+    int ddxDriverPatchVersion;
+    pointer frameBufferPhysicalAddress;
+    long frameBufferSize;
+    long frameBufferStride;
+    long SAREASize;
+    int maxDrawableTableEntry;
+    int ddxDrawableTableEntry;
+    long contextSize;
+    DRISwapMethod driverSwapMethod;
+    DRIWindowRequests bufferRequests;
+    int devPrivateSize;
+    void *devPrivate;
+    Bool createDummyCtx;
+    Bool createDummyCtxPriv;
 
     /* New with DRI version 4.1.0 */
-    void        (*TransitionSingleToMulti3D)(ScreenPtr pScreen);
-    void        (*TransitionMultiToSingle3D)(ScreenPtr pScreen);
+    void (*TransitionSingleToMulti3D) (ScreenPtr pScreen);
+    void (*TransitionMultiToSingle3D) (ScreenPtr pScreen);
 
     /* New with DRI version 5.1.0 */
-    void        (*ClipNotify)(ScreenPtr pScreen, WindowPtr *ppWin, int num);
+    void (*ClipNotify) (ScreenPtr pScreen, WindowPtr *ppWin, int num);
 
     /* New with DRI version 5.2.0 */
-    Bool                allocSarea;
-    Bool                keepFDOpen;
+    Bool allocSarea;
+    Bool keepFDOpen;
 
     /* New with DRI version 5.3.0 */
-    DRITexOffsetStartProcPtr  texOffsetStart;
+    DRITexOffsetStartProcPtr texOffsetStart;
     DRITexOffsetFinishProcPtr texOffsetFinish;
 
     /* New with DRI version 5.4.0 */
-    int			dontMapFrameBuffer;
-    drm_handle_t   	hFrameBuffer; /* Handle to framebuffer, either
-				       * mapped by DDX driver or DRI */
-    
-} DRIInfoRec, *DRIInfoPtr;
+    int dontMapFrameBuffer;
+    drm_handle_t hFrameBuffer;  /* Handle to framebuffer, either
+                                 * mapped by DDX driver or DRI */
 
+} DRIInfoRec, *DRIInfoPtr;
 
-extern _X_EXPORT Bool DRIOpenDRMMaster(ScrnInfoPtr pScrn, unsigned long sAreaSize,
-			     const char *busID,
-			     const char *drmDriverName);
+extern _X_EXPORT Bool DRIOpenDRMMaster(ScrnInfoPtr pScrn,
+                                       unsigned long sAreaSize,
+                                       const char *busID,
+                                       const char *drmDriverName);
 
 extern _X_EXPORT Bool DRIScreenInit(ScreenPtr pScreen,
-                          DRIInfoPtr pDRIInfo,
-                          int *pDRMFD);
+                                    DRIInfoPtr pDRIInfo, int *pDRMFD);
 
 extern _X_EXPORT void DRICloseScreen(ScreenPtr pScreen);
 
@@ -213,65 +202,62 @@ extern _X_EXPORT Bool DRIExtensionInit(void);
 extern _X_EXPORT void DRIReset(void);
 
 extern _X_EXPORT Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen,
-                                           Bool *isCapable);
+                                                     Bool *isCapable);
 
 extern _X_EXPORT Bool DRIOpenConnection(ScreenPtr pScreen,
-                              drm_handle_t * hSAREA,
-                              char **busIdString);
+                                        drm_handle_t * hSAREA,
+                                        char **busIdString);
 
 extern _X_EXPORT Bool DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic);
 
 extern _X_EXPORT Bool DRICloseConnection(ScreenPtr pScreen);
 
 extern _X_EXPORT Bool DRIGetClientDriverName(ScreenPtr pScreen,
-                                   int* ddxDriverMajorVersion,
-                                   int* ddxDriverMinorVersion,
-                                   int* ddxDriverPatchVersion,
-                                   char** clientDriverName);
+                                             int *ddxDriverMajorVersion,
+                                             int *ddxDriverMinorVersion,
+                                             int *ddxDriverPatchVersion,
+                                             char **clientDriverName);
 
 extern _X_EXPORT Bool DRICreateContext(ScreenPtr pScreen,
-                             VisualPtr visual,
-                             XID context,
-                             drm_context_t * pHWContext);
+                                       VisualPtr visual,
+                                       XID context, drm_context_t * pHWContext);
 
 extern _X_EXPORT Bool DRIDestroyContext(ScreenPtr pScreen, XID context);
 
 extern _X_EXPORT Bool DRIContextPrivDelete(pointer pResource, XID id);
 
 extern _X_EXPORT Bool DRICreateDrawable(ScreenPtr pScreen,
-                              ClientPtr client,
-                              DrawablePtr pDrawable,
-                              drm_drawable_t * hHWDrawable);
+                                        ClientPtr client,
+                                        DrawablePtr pDrawable,
+                                        drm_drawable_t * hHWDrawable);
 
 extern _X_EXPORT Bool DRIDestroyDrawable(ScreenPtr pScreen,
-			       ClientPtr client,
-                               DrawablePtr pDrawable);
+                                         ClientPtr client,
+                                         DrawablePtr pDrawable);
 
-extern _X_EXPORT Bool DRIDrawablePrivDelete(pointer pResource,
-                                  XID id);
+extern _X_EXPORT Bool DRIDrawablePrivDelete(pointer pResource, XID id);
 
 extern _X_EXPORT Bool DRIGetDrawableInfo(ScreenPtr pScreen,
-                               DrawablePtr pDrawable,
-                               unsigned int* indx,
-                               unsigned int* stamp,
-                               int* X,
-                               int* Y,
-                               int* W,
-                               int* H,
-                               int* numClipRects,
-                               drm_clip_rect_t ** pClipRects,
-                               int* backX,
-                               int* backY,
-                               int* numBackClipRects,
-                               drm_clip_rect_t ** pBackClipRects);
+                                         DrawablePtr pDrawable,
+                                         unsigned int *indx,
+                                         unsigned int *stamp,
+                                         int *X,
+                                         int *Y,
+                                         int *W,
+                                         int *H,
+                                         int *numClipRects,
+                                         drm_clip_rect_t ** pClipRects,
+                                         int *backX,
+                                         int *backY,
+                                         int *numBackClipRects,
+                                         drm_clip_rect_t ** pBackClipRects);
 
 extern _X_EXPORT Bool DRIGetDeviceInfo(ScreenPtr pScreen,
-                             drm_handle_t * hFrameBuffer,
-                             int* fbOrigin,
-                             int* fbSize,
-                             int* fbStride,
-                             int* devPrivateSize,
-                             void** pDevPrivate);
+                                       drm_handle_t * hFrameBuffer,
+                                       int *fbOrigin,
+                                       int *fbSize,
+                                       int *fbStride,
+                                       int *devPrivateSize, void **pDevPrivate);
 
 extern _X_EXPORT DRIInfoPtr DRICreateInfoRec(void);
 
@@ -280,50 +266,39 @@ extern _X_EXPORT void DRIDestroyInfoRec(DRIInfoPtr DRIInfo);
 extern _X_EXPORT Bool DRIFinishScreenInit(ScreenPtr pScreen);
 
 extern _X_EXPORT void DRIWakeupHandler(pointer wakeupData,
-                             int result,
-                             pointer pReadmask);
+                                       int result, pointer pReadmask);
 
 extern _X_EXPORT void DRIBlockHandler(pointer blockData,
-                            OSTimePtr pTimeout,
-                            pointer pReadmask);
+                                      OSTimePtr pTimeout, pointer pReadmask);
 
 extern _X_EXPORT void DRIDoWakeupHandler(int screenNum,
-                               pointer wakeupData,
-                               unsigned long result,
-                               pointer pReadmask);
+                                         pointer wakeupData,
+                                         unsigned long result,
+                                         pointer pReadmask);
 
 extern _X_EXPORT void DRIDoBlockHandler(int screenNum,
-                              pointer blockData,
-                              pointer pTimeout,
-                              pointer pReadmask);
+                                        pointer blockData,
+                                        pointer pTimeout, pointer pReadmask);
 
-extern _X_EXPORT void DRISwapContext(int drmFD,
-                           void *oldctx,
-                           void *newctx);
+extern _X_EXPORT void DRISwapContext(int drmFD, void *oldctx, void *newctx);
 
 extern _X_EXPORT void *DRIGetContextStore(DRIContextPrivPtr context);
 
 extern _X_EXPORT void DRIWindowExposures(WindowPtr pWin,
-                              RegionPtr prgn,
-                              RegionPtr bsreg);
+                                         RegionPtr prgn, RegionPtr bsreg);
 
 extern _X_EXPORT Bool DRIDestroyWindow(WindowPtr pWin);
 
 extern _X_EXPORT void DRICopyWindow(WindowPtr pWin,
-                          DDXPointRec ptOldOrg,
-                          RegionPtr prgnSrc);
+                                    DDXPointRec ptOldOrg, RegionPtr prgnSrc);
 
 extern _X_EXPORT int DRIValidateTree(WindowPtr pParent,
-                           WindowPtr pChild,
-                           VTKind    kind);
+                                     WindowPtr pChild, VTKind kind);
 
 extern _X_EXPORT void DRIPostValidateTree(WindowPtr pParent,
-                                WindowPtr pChild,
-                                VTKind    kind);
+                                          WindowPtr pChild, VTKind kind);
 
-extern _X_EXPORT void DRIClipNotify(WindowPtr pWin,
-                          int dx,
-                          int dy);
+extern _X_EXPORT void DRIClipNotify(WindowPtr pWin, int dx, int dy);
 
 extern _X_EXPORT CARD32 DRIGetDrawableIndex(WindowPtr pWin);
 
@@ -338,36 +313,38 @@ extern _X_EXPORT DRIWrappedFuncsRec *DRIGetWrappedFuncs(ScreenPtr pScreen);
 extern _X_EXPORT void *DRIGetSAREAPrivate(ScreenPtr pScreen);
 
 extern _X_EXPORT unsigned int DRIGetDrawableStamp(ScreenPtr pScreen,
-                                        CARD32 drawable_index);
+                                                  CARD32 drawable_index);
 
 extern _X_EXPORT DRIContextPrivPtr DRICreateContextPriv(ScreenPtr pScreen,
-                                              drm_context_t * pHWContext,
-                                              DRIContextFlags flags);
-
-extern _X_EXPORT DRIContextPrivPtr DRICreateContextPrivFromHandle(ScreenPtr pScreen,
-                                                        drm_context_t hHWContext,
+                                                        drm_context_t *
+                                                        pHWContext,
                                                         DRIContextFlags flags);
 
+extern _X_EXPORT DRIContextPrivPtr DRICreateContextPrivFromHandle(ScreenPtr
+                                                                  pScreen,
+                                                                  drm_context_t
+                                                                  hHWContext,
+                                                                  DRIContextFlags
+                                                                  flags);
+
 extern _X_EXPORT Bool DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv);
 
 extern _X_EXPORT drm_context_t DRIGetContext(ScreenPtr pScreen);
 
 extern _X_EXPORT void DRIQueryVersion(int *majorVersion,
-                            int *minorVersion,
-                            int *patchVersion);
+                                      int *minorVersion, int *patchVersion);
 
 extern _X_EXPORT void DRIAdjustFrame(int scrnIndex, int x, int y, int flags);
 
 extern _X_EXPORT void DRIMoveBuffersHelper(ScreenPtr pScreen,
-                                 int dx,
-                                 int dy,
-                                 int *xdir, 
-                                 int *ydir, 
-                                 RegionPtr reg);
+                                           int dx,
+                                           int dy,
+                                           int *xdir, int *ydir, RegionPtr reg);
 
 extern _X_EXPORT char *DRICreatePCIBusID(const struct pci_device *PciInfo);
 
-extern _X_EXPORT int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *));
+extern _X_EXPORT int drmInstallSIGIOHandler(int fd,
+                                            void (*f) (int, void *, void *));
 extern _X_EXPORT int drmRemoveSIGIOHandler(int fd);
 extern _X_EXPORT int DRIMasterFD(ScrnInfoPtr pScrn);
 
@@ -376,8 +353,10 @@ extern _X_EXPORT void *DRIMasterSareaPointer(ScrnInfoPtr pScrn);
 extern _X_EXPORT drm_handle_t DRIMasterSareaHandle(ScrnInfoPtr pScrn);
 
 extern _X_EXPORT void DRIGetTexOffsetFuncs(ScreenPtr pScreen,
-				 DRITexOffsetStartProcPtr *texOffsetStartFunc,
-				 DRITexOffsetFinishProcPtr *texOffsetFinishFunc);
+                                           DRITexOffsetStartProcPtr *
+                                           texOffsetStartFunc,
+                                           DRITexOffsetFinishProcPtr *
+                                           texOffsetFinishFunc);
 
 #define _DRI_H_
 
diff --git a/xorg-server/hw/xfree86/dri/drimodule.c b/xorg-server/hw/xfree86/dri/drimodule.c
index 28f6ad8c0..83eca4eb9 100644
--- a/xorg-server/hw/xfree86/dri/drimodule.c
+++ b/xorg-server/hw/xfree86/dri/drimodule.c
@@ -44,26 +44,25 @@ static MODULESETUPPROTO(driSetup);
 
 drmServerInfo DRIDRMServerInfo;
 
-static XF86ModuleVersionInfo VersRec =
-{
-        "dri",
-        MODULEVENDORSTRING,
-        MODINFOSTRING1,
-        MODINFOSTRING2,
-        XORG_VERSION_CURRENT,
-        1, 0, 0,
-        ABI_CLASS_EXTENSION,
-        ABI_EXTENSION_VERSION,
-        MOD_CLASS_NONE,
-        {0,0,0,0}
+static XF86ModuleVersionInfo VersRec = {
+    "dri",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_EXTENSION,
+    ABI_EXTENSION_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
 };
 
 extern void XFree86DRIExtensionInit(INITARGS);
+
 #define _XF86DRI_SERVER_
 #include <X11/dri/xf86driproto.h>
 
-static ExtensionModule XF86DRIExt =
-{
+static ExtensionModule XF86DRIExt = {
     XFree86DRIExtensionInit,
     XF86DRINAME,
     &noXFree86DRIExtension,
@@ -79,15 +78,16 @@ driSetup(pointer module, pointer opts, int *errmaj, int *errmin)
     static Bool setupDone = FALSE;
 
     if (!setupDone) {
-	setupDone = TRUE;
-	LoadExtension(&XF86DRIExt, FALSE);
-    } else {
-	if (errmaj) *errmaj = LDR_ONCEONLY;
+        setupDone = TRUE;
+        LoadExtension(&XF86DRIExt, FALSE);
+    }
+    else {
+        if (errmaj)
+            *errmaj = LDR_ONCEONLY;
     }
 
     drmSetServerInfo(&DRIDRMServerInfo);
 
     /* Need a non-NULL return value to indicate success */
-    return (pointer)1;
+    return (pointer) 1;
 }
-
diff --git a/xorg-server/hw/xfree86/dri/dristruct.h b/xorg-server/hw/xfree86/dri/dristruct.h
index bbd158e11..9f944a793 100644
--- a/xorg-server/hw/xfree86/dri/dristruct.h
+++ b/xorg-server/hw/xfree86/dri/dristruct.h
@@ -1,129 +1,124 @@
-/**************************************************************************

-

-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

-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, sub license, 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 NON-INFRINGEMENT.

-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.

-

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

-

-/*

- * Authors:

- *   Jens Owen <jens@tungstengraphics.com>

- *

- */

-

-#ifndef DRI_STRUCT_H

-#define DRI_STRUCT_H

-

-#include "xf86drm.h"

-#include "xf86Crtc.h"

-

-

-#define DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin) ((DRIDrawablePrivPtr) \

-    dixLookupPrivate(&(pWin)->devPrivates, DRIWindowPrivKey))

-#define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) ((DRIDrawablePrivPtr) \

-    dixLookupPrivate(&(pPix)->devPrivates, DRIWindowPrivKey))

-

-typedef struct _DRIDrawablePrivRec

-{

-    drm_drawable_t		hwDrawable;

-    int			drawableIndex;

-    ScreenPtr		pScreen;

-    int 		refCount;

-    int 		nrects;

-} DRIDrawablePrivRec, *DRIDrawablePrivPtr;

-

-struct _DRIContextPrivRec

-{

-    drm_context_t		hwContext;

-    ScreenPtr		pScreen;

-    Bool     		valid3D;

-    DRIContextFlags     flags;

-    void**     		pContextStore;

-};

-

-#define DRI_SCREEN_PRIV(pScreen) ((DRIScreenPrivPtr) \

-    (dixPrivateKeyRegistered(DRIScreenPrivKey) ?			\

-     dixLookupPrivate(&(pScreen)->devPrivates, DRIScreenPrivKey) : NULL))

-

-#define DRI_SCREEN_PRIV_FROM_INDEX(screenIndex) ((DRIScreenPrivPtr) \

-    dixLookupPrivate(&screenInfo.screens[screenIndex]->devPrivates, \

-		     DRIScreenPrivKey))

-

-#define DRI_ENT_PRIV(pScrn)  \

-    ((DRIEntPrivIndex < 0) ? \

-     NULL:		     \

-     ((DRIEntPrivPtr)(xf86GetEntityPrivate((pScrn)->entityList[0], \

-					   DRIEntPrivIndex)->ptr)))

-

-typedef struct _DRIScreenPrivRec

-{

-    Bool		directRenderingSupport;

-    int			drmFD;	      /* File descriptor for /dev/video/?   */

-    drm_handle_t   	hSAREA;	      /* Handle to SAREA, for mapping       */

-    XF86DRISAREAPtr	pSAREA;	      /* Mapped pointer to SAREA            */

-    drm_context_t          myContext;    /* DDX Driver's context               */

-    DRIContextPrivPtr   myContextPriv;/* Pointer to server's private area   */

-    DRIContextPrivPtr   lastPartial3DContext;  /* last one partially saved  */

-    void**		hiddenContextStore;    /* hidden X context          */

-    void**		partial3DContextStore; /* parital 3D context        */

-    DRIInfoPtr		pDriverInfo;

-    int                 nrWindows;

-    int                 nrWindowsVisible;

-    int                 nrWalked;

-    drm_clip_rect_t  private_buffer_rect; /* management of private buffers */

-    DrawablePtr         fullscreen; /* pointer to fullscreen drawable */

-    drm_clip_rect_t  fullscreen_rect; /* fake rect for fullscreen mode */

-    DRIWrappedFuncsRec	wrap;

-    DestroyWindowProcPtr DestroyWindow;

-    DrawablePtr		DRIDrawables[SAREA_MAX_DRAWABLES];

-    DRIContextPrivPtr   dummyCtxPriv; /* Pointer to dummy context */

-    Bool		createDummyCtx;

-    Bool		createDummyCtxPriv;

-    Bool		grabbedDRILock;

-    Bool		drmSIGIOHandlerInstalled;

-    Bool		wrapped;

-    Bool		windowsTouched;

-    int			lockRefCount;

-    drm_handle_t        hLSAREA;      /* Handle to SAREA containing lock, for mapping */

-    XF86DRILSAREAPtr    pLSAREA;      /* Mapped pointer to SAREA containing lock */

-    int*                pLockRefCount;

-    int*                pLockingContext;

-    xf86_crtc_notify_proc_ptr	xf86_crtc_notify;

-} DRIScreenPrivRec, *DRIScreenPrivPtr;

-

-

-typedef struct _DRIEntPrivRec {

-    int drmFD;

-    Bool drmOpened;

-    Bool sAreaGrabbed;

-    drm_handle_t hLSAREA;

-    XF86DRILSAREAPtr pLSAREA;

-    unsigned long sAreaSize;

-    int lockRefCount;

-    int lockingContext;

-    ScreenPtr resOwner;

-    Bool keepFDOpen;

-    int refCount;

-} DRIEntPrivRec, *DRIEntPrivPtr;

-

-#endif /* DRI_STRUCT_H */

+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+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, sub license, 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 NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Jens Owen <jens@tungstengraphics.com>
+ *
+ */
+
+#ifndef DRI_STRUCT_H
+#define DRI_STRUCT_H
+
+#include "xf86drm.h"
+#include "xf86Crtc.h"
+
+#define DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin) ((DRIDrawablePrivPtr) \
+    dixLookupPrivate(&(pWin)->devPrivates, DRIWindowPrivKey))
+#define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) ((DRIDrawablePrivPtr) \
+    dixLookupPrivate(&(pPix)->devPrivates, DRIWindowPrivKey))
+
+typedef struct _DRIDrawablePrivRec {
+    drm_drawable_t hwDrawable;
+    int drawableIndex;
+    ScreenPtr pScreen;
+    int refCount;
+    int nrects;
+} DRIDrawablePrivRec, *DRIDrawablePrivPtr;
+
+struct _DRIContextPrivRec {
+    drm_context_t hwContext;
+    ScreenPtr pScreen;
+    Bool valid3D;
+    DRIContextFlags flags;
+    void **pContextStore;
+};
+
+#define DRI_SCREEN_PRIV(pScreen) ((DRIScreenPrivPtr) \
+    (dixPrivateKeyRegistered(DRIScreenPrivKey) ?			\
+     dixLookupPrivate(&(pScreen)->devPrivates, DRIScreenPrivKey) : NULL))
+
+#define DRI_SCREEN_PRIV_FROM_INDEX(screenIndex) ((DRIScreenPrivPtr) \
+    dixLookupPrivate(&screenInfo.screens[screenIndex]->devPrivates, \
+		     DRIScreenPrivKey))
+
+#define DRI_ENT_PRIV(pScrn)  \
+    ((DRIEntPrivIndex < 0) ? \
+     NULL:		     \
+     ((DRIEntPrivPtr)(xf86GetEntityPrivate((pScrn)->entityList[0], \
+					   DRIEntPrivIndex)->ptr)))
+
+typedef struct _DRIScreenPrivRec {
+    Bool directRenderingSupport;
+    int drmFD;                  /* File descriptor for /dev/video/?   */
+    drm_handle_t hSAREA;        /* Handle to SAREA, for mapping       */
+    XF86DRISAREAPtr pSAREA;     /* Mapped pointer to SAREA            */
+    drm_context_t myContext;    /* DDX Driver's context               */
+    DRIContextPrivPtr myContextPriv;    /* Pointer to server's private area   */
+    DRIContextPrivPtr lastPartial3DContext;     /* last one partially saved  */
+    void **hiddenContextStore;  /* hidden X context          */
+    void **partial3DContextStore;       /* parital 3D context        */
+    DRIInfoPtr pDriverInfo;
+    int nrWindows;
+    int nrWindowsVisible;
+    int nrWalked;
+    drm_clip_rect_t private_buffer_rect;        /* management of private buffers */
+    DrawablePtr fullscreen;     /* pointer to fullscreen drawable */
+    drm_clip_rect_t fullscreen_rect;    /* fake rect for fullscreen mode */
+    DRIWrappedFuncsRec wrap;
+    DestroyWindowProcPtr DestroyWindow;
+    DrawablePtr DRIDrawables[SAREA_MAX_DRAWABLES];
+    DRIContextPrivPtr dummyCtxPriv;     /* Pointer to dummy context */
+    Bool createDummyCtx;
+    Bool createDummyCtxPriv;
+    Bool grabbedDRILock;
+    Bool drmSIGIOHandlerInstalled;
+    Bool wrapped;
+    Bool windowsTouched;
+    int lockRefCount;
+    drm_handle_t hLSAREA;       /* Handle to SAREA containing lock, for mapping */
+    XF86DRILSAREAPtr pLSAREA;   /* Mapped pointer to SAREA containing lock */
+    int *pLockRefCount;
+    int *pLockingContext;
+    xf86_crtc_notify_proc_ptr xf86_crtc_notify;
+} DRIScreenPrivRec, *DRIScreenPrivPtr;
+
+typedef struct _DRIEntPrivRec {
+    int drmFD;
+    Bool drmOpened;
+    Bool sAreaGrabbed;
+    drm_handle_t hLSAREA;
+    XF86DRILSAREAPtr pLSAREA;
+    unsigned long sAreaSize;
+    int lockRefCount;
+    int lockingContext;
+    ScreenPtr resOwner;
+    Bool keepFDOpen;
+    int refCount;
+} DRIEntPrivRec, *DRIEntPrivPtr;
+
+#endif                          /* DRI_STRUCT_H */
diff --git a/xorg-server/hw/xfree86/dri/xf86dri.c b/xorg-server/hw/xfree86/dri/xf86dri.c
index c35ba2f94..72ce8690d 100644
--- a/xorg-server/hw/xfree86/dri/xf86dri.c
+++ b/xorg-server/hw/xfree86/dri/xf86dri.c
@@ -63,27 +63,20 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 static int DRIErrorBase;
 
-
-
-static void XF86DRIResetProc(ExtensionEntry* extEntry);
+static void XF86DRIResetProc(ExtensionEntry * extEntry);
 
 static unsigned char DRIReqCode = 0;
 
 extern void XFree86DRIExtensionInit(void);
 
-/*ARGSUSED*/
-static void
-XF86DRIResetProc (
-    ExtensionEntry* extEntry
-)
+ /*ARGSUSED*/ static void
+XF86DRIResetProc(ExtensionEntry * extEntry)
 {
     DRIReset();
 }
 
 static int
-ProcXF86DRIQueryVersion(
-    register ClientPtr client
-)
+ProcXF86DRIQueryVersion(register ClientPtr client)
 {
     xXF86DRIQueryVersionReply rep;
 
@@ -95,109 +88,105 @@ ProcXF86DRIQueryVersion(
     rep.minorVersion = SERVER_XF86DRI_MINOR_VERSION;
     rep.patchVersion = SERVER_XF86DRI_PATCH_VERSION;
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swaps(&rep.majorVersion);
-	swaps(&rep.minorVersion);
-	swapl(&rep.patchVersion);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swaps(&rep.majorVersion);
+        swaps(&rep.minorVersion);
+        swapl(&rep.patchVersion);
     }
-    WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *) &rep);
     return Success;
 }
 
 static int
-ProcXF86DRIQueryDirectRenderingCapable(
-    register ClientPtr client
-)
+ProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
 {
-    xXF86DRIQueryDirectRenderingCapableReply	rep;
+    xXF86DRIQueryDirectRenderingCapableReply rep;
     Bool isCapable;
 
     REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
     REQUEST_SIZE_MATCH(xXF86DRIQueryDirectRenderingCapableReq);
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    if (!DRIQueryDirectRenderingCapable( screenInfo.screens[stuff->screen], 
-					 &isCapable)) {
-	return BadValue;
+    if (!DRIQueryDirectRenderingCapable(screenInfo.screens[stuff->screen],
+                                        &isCapable)) {
+        return BadValue;
     }
     rep.isCapable = isCapable;
 
     if (!LocalClient(client) || client->swapped)
-	rep.isCapable = 0;
+        rep.isCapable = 0;
 
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
     }
 
-    WriteToClient(client, 
-	sizeof(xXF86DRIQueryDirectRenderingCapableReply), (char *)&rep);
+    WriteToClient(client,
+                  sizeof(xXF86DRIQueryDirectRenderingCapableReply),
+                  (char *) &rep);
     return Success;
 }
 
 static int
-ProcXF86DRIOpenConnection(
-    register ClientPtr client
-)
+ProcXF86DRIOpenConnection(register ClientPtr client)
 {
     xXF86DRIOpenConnectionReply rep;
-    drm_handle_t			hSAREA;
-    char*			busIdString;
+    drm_handle_t hSAREA;
+    char *busIdString;
 
     REQUEST(xXF86DRIOpenConnectionReq);
     REQUEST_SIZE_MATCH(xXF86DRIOpenConnectionReq);
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
-    if (!DRIOpenConnection( screenInfo.screens[stuff->screen], 
-			    &hSAREA,
-			    &busIdString)) {
-	return BadValue;
+    if (!DRIOpenConnection(screenInfo.screens[stuff->screen],
+                           &hSAREA, &busIdString)) {
+        return BadValue;
     }
 
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
     rep.busIdStringLength = 0;
     if (busIdString)
-	rep.busIdStringLength = strlen(busIdString);
-    rep.length = bytes_to_int32(SIZEOF(xXF86DRIOpenConnectionReply) - SIZEOF(xGenericReply) +
-                  pad_to_int32(rep.busIdStringLength));
+        rep.busIdStringLength = strlen(busIdString);
+    rep.length =
+        bytes_to_int32(SIZEOF(xXF86DRIOpenConnectionReply) -
+                       SIZEOF(xGenericReply) +
+                       pad_to_int32(rep.busIdStringLength));
 
-    rep.hSAREALow  = (CARD32)(hSAREA & 0xffffffff);
+    rep.hSAREALow = (CARD32) (hSAREA & 0xffffffff);
 #if defined(LONG64) && !defined(__linux__)
-    rep.hSAREAHigh = (CARD32)(hSAREA >> 32);
+    rep.hSAREAHigh = (CARD32) (hSAREA >> 32);
 #else
     rep.hSAREAHigh = 0;
 #endif
 
-    WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), (char *) &rep);
     if (rep.busIdStringLength)
-	WriteToClient(client, rep.busIdStringLength, busIdString);
+        WriteToClient(client, rep.busIdStringLength, busIdString);
     return Success;
 }
 
 static int
-ProcXF86DRIAuthConnection(
-    register ClientPtr client
-)
+ProcXF86DRIAuthConnection(register ClientPtr client)
 {
     xXF86DRIAuthConnectionReply rep;
-    
+
     REQUEST(xXF86DRIAuthConnectionReq);
     REQUEST_SIZE_MATCH(xXF86DRIAuthConnectionReq);
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
     rep.type = X_Reply;
@@ -205,83 +194,75 @@ ProcXF86DRIAuthConnection(
     rep.sequenceNumber = client->sequence;
     rep.authenticated = 1;
 
-    if (!DRIAuthConnection( screenInfo.screens[stuff->screen], stuff->magic)) {
-        ErrorF("Failed to authenticate %lu\n", (unsigned long)stuff->magic);
-	rep.authenticated = 0;
+    if (!DRIAuthConnection(screenInfo.screens[stuff->screen], stuff->magic)) {
+        ErrorF("Failed to authenticate %lu\n", (unsigned long) stuff->magic);
+        rep.authenticated = 0;
     }
-    WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *) &rep);
     return Success;
 }
 
 static int
-ProcXF86DRICloseConnection(
-    register ClientPtr client
-)
+ProcXF86DRICloseConnection(register ClientPtr client)
 {
     REQUEST(xXF86DRICloseConnectionReq);
     REQUEST_SIZE_MATCH(xXF86DRICloseConnectionReq);
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
-    DRICloseConnection( screenInfo.screens[stuff->screen]);
+    DRICloseConnection(screenInfo.screens[stuff->screen]);
 
     return Success;
 }
 
 static int
-ProcXF86DRIGetClientDriverName(
-    register ClientPtr client
-)
+ProcXF86DRIGetClientDriverName(register ClientPtr client)
 {
-    xXF86DRIGetClientDriverNameReply	rep;
-    char* clientDriverName;
+    xXF86DRIGetClientDriverNameReply rep;
+    char *clientDriverName;
 
     REQUEST(xXF86DRIGetClientDriverNameReq);
     REQUEST_SIZE_MATCH(xXF86DRIGetClientDriverNameReq);
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
-    DRIGetClientDriverName( screenInfo.screens[stuff->screen],
-			    (int *)&rep.ddxDriverMajorVersion,
-			    (int *)&rep.ddxDriverMinorVersion,
-			    (int *)&rep.ddxDriverPatchVersion,
-			    &clientDriverName);
+    DRIGetClientDriverName(screenInfo.screens[stuff->screen],
+                           (int *) &rep.ddxDriverMajorVersion,
+                           (int *) &rep.ddxDriverMinorVersion,
+                           (int *) &rep.ddxDriverPatchVersion,
+                           &clientDriverName);
 
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
     rep.clientDriverNameLength = 0;
     if (clientDriverName)
-	rep.clientDriverNameLength = strlen(clientDriverName);
+        rep.clientDriverNameLength = strlen(clientDriverName);
     rep.length = bytes_to_int32(SIZEOF(xXF86DRIGetClientDriverNameReply) -
-			SIZEOF(xGenericReply) +
-			pad_to_int32(rep.clientDriverNameLength));
+                                SIZEOF(xGenericReply) +
+                                pad_to_int32(rep.clientDriverNameLength));
 
-    WriteToClient(client, 
-	sizeof(xXF86DRIGetClientDriverNameReply), (char *)&rep);
+    WriteToClient(client,
+                  sizeof(xXF86DRIGetClientDriverNameReply), (char *) &rep);
     if (rep.clientDriverNameLength)
-	WriteToClient(client, 
-                      rep.clientDriverNameLength, 
-                      clientDriverName);
+        WriteToClient(client, rep.clientDriverNameLength, clientDriverName);
     return Success;
 }
 
 static int
-ProcXF86DRICreateContext(
-    register ClientPtr client
-)
+ProcXF86DRICreateContext(register ClientPtr client)
 {
-    xXF86DRICreateContextReply	rep;
+    xXF86DRICreateContextReply rep;
     ScreenPtr pScreen;
 
     REQUEST(xXF86DRICreateContextReq);
     REQUEST_SIZE_MATCH(xXF86DRICreateContextReq);
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
     rep.type = X_Reply;
@@ -290,51 +271,45 @@ ProcXF86DRICreateContext(
 
     pScreen = screenInfo.screens[stuff->screen];
 
-    if (!DRICreateContext( pScreen,
-			   NULL,
-			   stuff->context,
-			   (drm_context_t *)&rep.hHWContext)) {
-	return BadValue;
+    if (!DRICreateContext(pScreen,
+                          NULL,
+                          stuff->context, (drm_context_t *) & rep.hHWContext)) {
+        return BadValue;
     }
 
-    WriteToClient(client, sizeof(xXF86DRICreateContextReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86DRICreateContextReply), (char *) &rep);
     return Success;
 }
 
 static int
-ProcXF86DRIDestroyContext(
-    register ClientPtr client
-)
+ProcXF86DRIDestroyContext(register ClientPtr client)
 {
     REQUEST(xXF86DRIDestroyContextReq);
     REQUEST_SIZE_MATCH(xXF86DRIDestroyContextReq);
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
-    if (!DRIDestroyContext( screenInfo.screens[stuff->screen],
-			    stuff->context)) {
-	return BadValue;
+    if (!DRIDestroyContext(screenInfo.screens[stuff->screen], stuff->context)) {
+        return BadValue;
     }
 
     return Success;
 }
 
 static int
-ProcXF86DRICreateDrawable(
-    ClientPtr client
-)
+ProcXF86DRICreateDrawable(ClientPtr client)
 {
-    xXF86DRICreateDrawableReply	rep;
+    xXF86DRICreateDrawableReply rep;
     DrawablePtr pDrawable;
     int rc;
 
     REQUEST(xXF86DRICreateDrawableReq);
     REQUEST_SIZE_MATCH(xXF86DRICreateDrawableReq);
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
     rep.type = X_Reply;
@@ -342,64 +317,61 @@ ProcXF86DRICreateDrawable(
     rep.sequenceNumber = client->sequence;
 
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
-			   DixReadAccess);
+                           DixReadAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
     if (!DRICreateDrawable(screenInfo.screens[stuff->screen], client,
-			   pDrawable, (drm_drawable_t *)&rep.hHWDrawable)) {
-	return BadValue;
+                           pDrawable, (drm_drawable_t *) & rep.hHWDrawable)) {
+        return BadValue;
     }
 
-    WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *) &rep);
     return Success;
 }
 
 static int
-ProcXF86DRIDestroyDrawable(
-    register ClientPtr client
-)
+ProcXF86DRIDestroyDrawable(register ClientPtr client)
 {
     REQUEST(xXF86DRIDestroyDrawableReq);
     DrawablePtr pDrawable;
     int rc;
+
     REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq);
 
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
-			   DixReadAccess);
+                           DixReadAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
     if (!DRIDestroyDrawable(screenInfo.screens[stuff->screen], client,
-			    pDrawable)) {
-	return BadValue;
+                            pDrawable)) {
+        return BadValue;
     }
 
     return Success;
 }
 
 static int
-ProcXF86DRIGetDrawableInfo(
-    register ClientPtr client
-)
+ProcXF86DRIGetDrawableInfo(register ClientPtr client)
 {
-    xXF86DRIGetDrawableInfoReply	rep;
+    xXF86DRIGetDrawableInfoReply rep;
     DrawablePtr pDrawable;
     int X, Y, W, H;
-    drm_clip_rect_t * pClipRects, *pClippedRects;
-    drm_clip_rect_t * pBackClipRects;
+    drm_clip_rect_t *pClipRects, *pClippedRects;
+    drm_clip_rect_t *pBackClipRects;
     int backX, backY, rc;
 
     REQUEST(xXF86DRIGetDrawableInfoReq);
     REQUEST_SIZE_MATCH(xXF86DRIGetDrawableInfoReq);
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
     rep.type = X_Reply;
@@ -407,191 +379,181 @@ ProcXF86DRIGetDrawableInfo(
     rep.sequenceNumber = client->sequence;
 
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
-			   DixReadAccess);
+                           DixReadAccess);
     if (rc != Success)
-	return rc;
-
-    if (!DRIGetDrawableInfo( screenInfo.screens[stuff->screen],
-			     pDrawable,
-			     (unsigned int*)&rep.drawableTableIndex,
-			     (unsigned int*)&rep.drawableTableStamp,
-			     (int*)&X,
-			     (int*)&Y,
-			     (int*)&W,
-			     (int*)&H,
-			     (int*)&rep.numClipRects,
-			     &pClipRects,
-			     &backX, 
-			     &backY,
-			     (int*)&rep.numBackClipRects,
-			     &pBackClipRects)) {
-	return BadValue;
+        return rc;
+
+    if (!DRIGetDrawableInfo(screenInfo.screens[stuff->screen],
+                            pDrawable,
+                            (unsigned int *) &rep.drawableTableIndex,
+                            (unsigned int *) &rep.drawableTableStamp,
+                            (int *) &X,
+                            (int *) &Y,
+                            (int *) &W,
+                            (int *) &H,
+                            (int *) &rep.numClipRects,
+                            &pClipRects,
+                            &backX,
+                            &backY,
+                            (int *) &rep.numBackClipRects, &pBackClipRects)) {
+        return BadValue;
     }
 
     rep.drawableX = X;
     rep.drawableY = Y;
     rep.drawableWidth = W;
     rep.drawableHeight = H;
-    rep.length = (SIZEOF(xXF86DRIGetDrawableInfoReply) - 
-		  SIZEOF(xGenericReply));
+    rep.length = (SIZEOF(xXF86DRIGetDrawableInfoReply) - SIZEOF(xGenericReply));
 
     rep.backX = backX;
     rep.backY = backY;
-        
-    if (rep.numBackClipRects) 
-       rep.length += sizeof(drm_clip_rect_t) * rep.numBackClipRects;    
+
+    if (rep.numBackClipRects)
+        rep.length += sizeof(drm_clip_rect_t) * rep.numBackClipRects;
 
     pClippedRects = pClipRects;
 
     if (rep.numClipRects) {
-       /* Clip cliprects to screen dimensions (redirected windows) */
-       pClippedRects = malloc(rep.numClipRects * sizeof(drm_clip_rect_t));
-
-       if (pClippedRects) {
-	    ScreenPtr pScreen = screenInfo.screens[stuff->screen];
-	    int i, j;
-
-	    for (i = 0, j = 0; i < rep.numClipRects; i++) {
-		pClippedRects[j].x1 = max(pClipRects[i].x1, 0);
-		pClippedRects[j].y1 = max(pClipRects[i].y1, 0);
-		pClippedRects[j].x2 = min(pClipRects[i].x2, pScreen->width);
-		pClippedRects[j].y2 = min(pClipRects[i].y2, pScreen->height);
-
-		if (pClippedRects[j].x1 < pClippedRects[j].x2 &&
-		    pClippedRects[j].y1 < pClippedRects[j].y2) {
-		    j++;
-		}
-	    }
-
-	    rep.numClipRects = j;
-       } else {
-	    rep.numClipRects = 0;
-       }
-
-       rep.length += sizeof(drm_clip_rect_t) * rep.numClipRects;
+        /* Clip cliprects to screen dimensions (redirected windows) */
+        pClippedRects = malloc(rep.numClipRects * sizeof(drm_clip_rect_t));
+
+        if (pClippedRects) {
+            ScreenPtr pScreen = screenInfo.screens[stuff->screen];
+            int i, j;
+
+            for (i = 0, j = 0; i < rep.numClipRects; i++) {
+                pClippedRects[j].x1 = max(pClipRects[i].x1, 0);
+                pClippedRects[j].y1 = max(pClipRects[i].y1, 0);
+                pClippedRects[j].x2 = min(pClipRects[i].x2, pScreen->width);
+                pClippedRects[j].y2 = min(pClipRects[i].y2, pScreen->height);
+
+                if (pClippedRects[j].x1 < pClippedRects[j].x2 &&
+                    pClippedRects[j].y1 < pClippedRects[j].y2) {
+                    j++;
+                }
+            }
+
+            rep.numClipRects = j;
+        }
+        else {
+            rep.numClipRects = 0;
+        }
+
+        rep.length += sizeof(drm_clip_rect_t) * rep.numClipRects;
     }
-    
+
     rep.length = bytes_to_int32(rep.length);
 
-    WriteToClient(client, sizeof(xXF86DRIGetDrawableInfoReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86DRIGetDrawableInfoReply), (char *) &rep);
 
     if (rep.numClipRects) {
-	WriteToClient(client,  
-		      sizeof(drm_clip_rect_t) * rep.numClipRects,
-		      (char *)pClippedRects);
-	free(pClippedRects);
+        WriteToClient(client,
+                      sizeof(drm_clip_rect_t) * rep.numClipRects,
+                      (char *) pClippedRects);
+        free(pClippedRects);
     }
 
     if (rep.numBackClipRects) {
-       WriteToClient(client, 
-		     sizeof(drm_clip_rect_t) * rep.numBackClipRects,
-		     (char *)pBackClipRects);
+        WriteToClient(client,
+                      sizeof(drm_clip_rect_t) * rep.numBackClipRects,
+                      (char *) pBackClipRects);
     }
 
     return Success;
 }
 
 static int
-ProcXF86DRIGetDeviceInfo(
-    register ClientPtr client
-)
+ProcXF86DRIGetDeviceInfo(register ClientPtr client)
 {
-    xXF86DRIGetDeviceInfoReply	rep;
+    xXF86DRIGetDeviceInfoReply rep;
     drm_handle_t hFrameBuffer;
     void *pDevPrivate;
 
     REQUEST(xXF86DRIGetDeviceInfoReq);
     REQUEST_SIZE_MATCH(xXF86DRIGetDeviceInfoReq);
     if (stuff->screen >= screenInfo.numScreens) {
-	client->errorValue = stuff->screen;
-	return BadValue;
+        client->errorValue = stuff->screen;
+        return BadValue;
     }
 
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    if (!DRIGetDeviceInfo( screenInfo.screens[stuff->screen],
-			   &hFrameBuffer,
-			   (int*)&rep.framebufferOrigin,
-			   (int*)&rep.framebufferSize,
-			   (int*)&rep.framebufferStride,
-			   (int*)&rep.devPrivateSize,
-			   &pDevPrivate)) {
-	return BadValue;
+    if (!DRIGetDeviceInfo(screenInfo.screens[stuff->screen],
+                          &hFrameBuffer,
+                          (int *) &rep.framebufferOrigin,
+                          (int *) &rep.framebufferSize,
+                          (int *) &rep.framebufferStride,
+                          (int *) &rep.devPrivateSize, &pDevPrivate)) {
+        return BadValue;
     }
 
-    rep.hFrameBufferLow  = (CARD32)(hFrameBuffer & 0xffffffff);
+    rep.hFrameBufferLow = (CARD32) (hFrameBuffer & 0xffffffff);
 #if defined(LONG64) && !defined(__linux__)
-    rep.hFrameBufferHigh = (CARD32)(hFrameBuffer >> 32);
+    rep.hFrameBufferHigh = (CARD32) (hFrameBuffer >> 32);
 #else
     rep.hFrameBufferHigh = 0;
 #endif
 
     rep.length = 0;
     if (rep.devPrivateSize) {
-	rep.length = bytes_to_int32(SIZEOF(xXF86DRIGetDeviceInfoReply) -
-		      SIZEOF(xGenericReply) +
-		      pad_to_int32(rep.devPrivateSize));
+        rep.length = bytes_to_int32(SIZEOF(xXF86DRIGetDeviceInfoReply) -
+                                    SIZEOF(xGenericReply) +
+                                    pad_to_int32(rep.devPrivateSize));
     }
 
-    WriteToClient(client, sizeof(xXF86DRIGetDeviceInfoReply), (char *)&rep);
+    WriteToClient(client, sizeof(xXF86DRIGetDeviceInfoReply), (char *) &rep);
     if (rep.length) {
-	WriteToClient(client, rep.devPrivateSize, (char *)pDevPrivate);
+        WriteToClient(client, rep.devPrivateSize, (char *) pDevPrivate);
     }
     return Success;
 }
 
 static int
-ProcXF86DRIDispatch (
-    register ClientPtr	client
-)
+ProcXF86DRIDispatch(register ClientPtr client)
 {
     REQUEST(xReq);
 
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_XF86DRIQueryVersion:
-	return ProcXF86DRIQueryVersion(client);
+        return ProcXF86DRIQueryVersion(client);
     case X_XF86DRIQueryDirectRenderingCapable:
-	return ProcXF86DRIQueryDirectRenderingCapable(client);
+        return ProcXF86DRIQueryDirectRenderingCapable(client);
     }
 
     if (!LocalClient(client))
-	return DRIErrorBase + XF86DRIClientNotLocal;
+        return DRIErrorBase + XF86DRIClientNotLocal;
 
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_XF86DRIOpenConnection:
-	return ProcXF86DRIOpenConnection(client);
+        return ProcXF86DRIOpenConnection(client);
     case X_XF86DRICloseConnection:
-	return ProcXF86DRICloseConnection(client);
+        return ProcXF86DRICloseConnection(client);
     case X_XF86DRIGetClientDriverName:
-	return ProcXF86DRIGetClientDriverName(client);
+        return ProcXF86DRIGetClientDriverName(client);
     case X_XF86DRICreateContext:
-	return ProcXF86DRICreateContext(client);
+        return ProcXF86DRICreateContext(client);
     case X_XF86DRIDestroyContext:
-	return ProcXF86DRIDestroyContext(client);
+        return ProcXF86DRIDestroyContext(client);
     case X_XF86DRICreateDrawable:
-	return ProcXF86DRICreateDrawable(client);
+        return ProcXF86DRICreateDrawable(client);
     case X_XF86DRIDestroyDrawable:
-	return ProcXF86DRIDestroyDrawable(client);
+        return ProcXF86DRIDestroyDrawable(client);
     case X_XF86DRIGetDrawableInfo:
-	return ProcXF86DRIGetDrawableInfo(client);
+        return ProcXF86DRIGetDrawableInfo(client);
     case X_XF86DRIGetDeviceInfo:
-	return ProcXF86DRIGetDeviceInfo(client);
+        return ProcXF86DRIGetDeviceInfo(client);
     case X_XF86DRIAuthConnection:
-	return ProcXF86DRIAuthConnection(client);
-    /* {Open,Close}FullScreen are deprecated now */
+        return ProcXF86DRIAuthConnection(client);
+        /* {Open,Close}FullScreen are deprecated now */
     default:
-	return BadRequest;
+        return BadRequest;
     }
 }
 
 static int
-SProcXF86DRIQueryVersion(
-    register ClientPtr	client
-)
+SProcXF86DRIQueryVersion(register ClientPtr client)
 {
     REQUEST(xXF86DRIQueryVersionReq);
     swaps(&stuff->length);
@@ -599,9 +561,7 @@ SProcXF86DRIQueryVersion(
 }
 
 static int
-SProcXF86DRIQueryDirectRenderingCapable(
-    register ClientPtr client
-)
+SProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
 {
     REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
     swaps(&stuff->length);
@@ -610,9 +570,7 @@ SProcXF86DRIQueryDirectRenderingCapable(
 }
 
 static int
-SProcXF86DRIDispatch (
-    register ClientPtr	client
-)
+SProcXF86DRIDispatch(register ClientPtr client)
 {
     REQUEST(xReq);
 
@@ -620,39 +578,36 @@ SProcXF86DRIDispatch (
      * Only local clients are allowed DRI access, but remote clients still need
      * these requests to find out cleanly.
      */
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_XF86DRIQueryVersion:
-	return SProcXF86DRIQueryVersion(client);
+        return SProcXF86DRIQueryVersion(client);
     case X_XF86DRIQueryDirectRenderingCapable:
-	return SProcXF86DRIQueryDirectRenderingCapable(client);
+        return SProcXF86DRIQueryDirectRenderingCapable(client);
     default:
-	return DRIErrorBase + XF86DRIClientNotLocal;
+        return DRIErrorBase + XF86DRIClientNotLocal;
     }
 }
 
 void
 XFree86DRIExtensionInit(void)
 {
-    ExtensionEntry* extEntry;
+    ExtensionEntry *extEntry;
 
 #ifdef XF86DRI_EVENTS
     EventType = CreateNewResourceType(XF86DRIFreeEvents, "DRIEvent");
 #endif
 
-    if (
-	DRIExtensionInit() &&
+    if (DRIExtensionInit() &&
 #ifdef XF86DRI_EVENTS
         EventType && ScreenPrivateIndex != -1 &&
 #endif
-	(extEntry = AddExtension(XF86DRINAME,
-				 XF86DRINumberEvents,
-				 XF86DRINumberErrors,
-				 ProcXF86DRIDispatch,
-				 SProcXF86DRIDispatch,
-				 XF86DRIResetProc,
-				 StandardMinorOpcode))) {
-	DRIReqCode = (unsigned char)extEntry->base;
-	DRIErrorBase = extEntry->errorBase;
+        (extEntry = AddExtension(XF86DRINAME,
+                                 XF86DRINumberEvents,
+                                 XF86DRINumberErrors,
+                                 ProcXF86DRIDispatch,
+                                 SProcXF86DRIDispatch,
+                                 XF86DRIResetProc, StandardMinorOpcode))) {
+        DRIReqCode = (unsigned char) extEntry->base;
+        DRIErrorBase = extEntry->errorBase;
     }
 }
diff --git a/xorg-server/hw/xfree86/dri2/dri2.c b/xorg-server/hw/xfree86/dri2/dri2.c
index 5cc9068af..591ff3ace 100644
--- a/xorg-server/hw/xfree86/dri2/dri2.c
+++ b/xorg-server/hw/xfree86/dri2/dri2.c
@@ -48,66 +48,69 @@
 
 #include "xf86.h"
 
-CARD8 dri2_major; /* version of DRI2 supported by DDX */
+CARD8 dri2_major;               /* version of DRI2 supported by DDX */
 CARD8 dri2_minor;
 
 static DevPrivateKeyRec dri2ScreenPrivateKeyRec;
+
 #define dri2ScreenPrivateKey (&dri2ScreenPrivateKeyRec)
 
 static DevPrivateKeyRec dri2WindowPrivateKeyRec;
+
 #define dri2WindowPrivateKey (&dri2WindowPrivateKeyRec)
 
 static DevPrivateKeyRec dri2PixmapPrivateKeyRec;
+
 #define dri2PixmapPrivateKey (&dri2PixmapPrivateKeyRec)
 
-static RESTYPE       dri2DrawableRes;
+static RESTYPE dri2DrawableRes;
 
 typedef struct _DRI2Screen *DRI2ScreenPtr;
 
 typedef struct _DRI2Drawable {
-    DRI2ScreenPtr        dri2_screen;
-    DrawablePtr		 drawable;
-    struct xorg_list	 reference_list;
-    int			 width;
-    int			 height;
-    DRI2BufferPtr	*buffers;
-    int			 bufferCount;
-    unsigned int	 swapsPending;
-    ClientPtr		 blockedClient;
-    Bool		 blockedOnMsc;
-    int			 swap_interval;
-    CARD64		 swap_count;
-    int64_t		 target_sbc; /* -1 means no SBC wait outstanding */
-    CARD64		 last_swap_target; /* most recently queued swap target */
-    CARD64		 last_swap_msc; /* msc at completion of most recent swap */
-    CARD64		 last_swap_ust; /* ust at completion of most recent swap */
-    int			 swap_limit; /* for N-buffering */
-    unsigned long	 serialNumber;
-    Bool		 needInvalidate;
+    DRI2ScreenPtr dri2_screen;
+    DrawablePtr drawable;
+    struct xorg_list reference_list;
+    int width;
+    int height;
+    DRI2BufferPtr *buffers;
+    int bufferCount;
+    unsigned int swapsPending;
+    ClientPtr blockedClient;
+    Bool blockedOnMsc;
+    int swap_interval;
+    CARD64 swap_count;
+    int64_t target_sbc;         /* -1 means no SBC wait outstanding */
+    CARD64 last_swap_target;    /* most recently queued swap target */
+    CARD64 last_swap_msc;       /* msc at completion of most recent swap */
+    CARD64 last_swap_ust;       /* ust at completion of most recent swap */
+    int swap_limit;             /* for N-buffering */
+    unsigned long serialNumber;
+    Bool needInvalidate;
 } DRI2DrawableRec, *DRI2DrawablePtr;
 
 typedef struct _DRI2Screen {
-    ScreenPtr			 screen;
-    int				 refcnt;
-    unsigned int		 numDrivers;
-    const char			**driverNames;
-    const char			*deviceName;
-    int				 fd;
-    unsigned int		 lastSequence;
-
-    DRI2CreateBufferProcPtr	 CreateBuffer;
-    DRI2DestroyBufferProcPtr	 DestroyBuffer;
-    DRI2CopyRegionProcPtr	 CopyRegion;
-    DRI2ScheduleSwapProcPtr	 ScheduleSwap;
-    DRI2GetMSCProcPtr		 GetMSC;
-    DRI2ScheduleWaitMSCProcPtr	 ScheduleWaitMSC;
-    DRI2AuthMagicProcPtr	 AuthMagic;
+    ScreenPtr screen;
+    int refcnt;
+    unsigned int numDrivers;
+    const char **driverNames;
+    const char *deviceName;
+    int fd;
+    unsigned int lastSequence;
+
+    DRI2CreateBufferProcPtr CreateBuffer;
+    DRI2DestroyBufferProcPtr DestroyBuffer;
+    DRI2CopyRegionProcPtr CopyRegion;
+    DRI2ScheduleSwapProcPtr ScheduleSwap;
+    DRI2GetMSCProcPtr GetMSC;
+    DRI2ScheduleWaitMSCProcPtr ScheduleWaitMSC;
+    DRI2AuthMagicProcPtr AuthMagic;
     DRI2ReuseBufferNotifyProcPtr ReuseBufferNotify;
     DRI2SwapLimitValidateProcPtr SwapLimitValidate;
 
-    HandleExposuresProcPtr       HandleExposures;
+    HandleExposuresProcPtr HandleExposures;
 
-    ConfigNotifyProcPtr		 ConfigNotify;
+    ConfigNotifyProcPtr ConfigNotify;
 } DRI2ScreenRec;
 
 static DRI2ScreenPtr
@@ -124,13 +127,13 @@ DRI2GetDrawable(DrawablePtr pDraw)
 
     switch (pDraw->type) {
     case DRAWABLE_WINDOW:
-	pWin = (WindowPtr) pDraw;
-	return dixLookupPrivate(&pWin->devPrivates, dri2WindowPrivateKey);
+        pWin = (WindowPtr) pDraw;
+        return dixLookupPrivate(&pWin->devPrivates, dri2WindowPrivateKey);
     case DRAWABLE_PIXMAP:
-	pPixmap = (PixmapPtr) pDraw;
-	return dixLookupPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey);
+        pPixmap = (PixmapPtr) pDraw;
+        return dixLookupPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey);
     default:
-	return NULL;
+        return NULL;
     }
 }
 
@@ -141,24 +144,24 @@ DRI2DrawableSerial(DrawablePtr pDraw)
     PixmapPtr pPix;
 
     if (pDraw->type != DRAWABLE_WINDOW)
-	return pDraw->serialNumber;
+        return pDraw->serialNumber;
 
-    pPix = pScreen->GetWindowPixmap((WindowPtr)pDraw);
+    pPix = pScreen->GetWindowPixmap((WindowPtr) pDraw);
     return pPix->drawable.serialNumber;
 }
 
 static DRI2DrawablePtr
 DRI2AllocateDrawable(DrawablePtr pDraw)
 {
-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
+    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
     DRI2DrawablePtr pPriv;
-    CARD64          ust;
+    CARD64 ust;
     WindowPtr pWin;
     PixmapPtr pPixmap;
 
     pPriv = malloc(sizeof *pPriv);
     if (pPriv == NULL)
-	return NULL;
+        return NULL;
 
     pPriv->dri2_screen = ds;
     pPriv->drawable = pDraw;
@@ -173,10 +176,10 @@ DRI2AllocateDrawable(DrawablePtr pDraw)
     pPriv->target_sbc = -1;
     pPriv->swap_interval = 1;
     /* Initialize last swap target from DDX if possible */
-    if (!ds->GetMSC || !(*ds->GetMSC)(pDraw, &ust, &pPriv->last_swap_target))
-	pPriv->last_swap_target = 0;
+    if (!ds->GetMSC || !(*ds->GetMSC) (pDraw, &ust, &pPriv->last_swap_target))
+        pPriv->last_swap_target = 0;
 
-    pPriv->swap_limit = 1; /* default to double buffering */
+    pPriv->swap_limit = 1;      /* default to double buffering */
     pPriv->last_swap_msc = 0;
     pPriv->last_swap_ust = 0;
     xorg_list_init(&pPriv->reference_list);
@@ -184,11 +187,12 @@ DRI2AllocateDrawable(DrawablePtr pDraw)
     pPriv->needInvalidate = FALSE;
 
     if (pDraw->type == DRAWABLE_WINDOW) {
-	pWin = (WindowPtr) pDraw;
-	dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, pPriv);
-    } else {
-	pPixmap = (PixmapPtr) pDraw;
-	dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, pPriv);
+        pWin = (WindowPtr) pDraw;
+        dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, pPriv);
+    }
+    else {
+        pPixmap = (PixmapPtr) pDraw;
+        dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, pPriv);
     }
 
     return pPriv;
@@ -199,37 +203,37 @@ DRI2SwapLimit(DrawablePtr pDraw, int swap_limit)
 {
     DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
     DRI2ScreenPtr ds;
+
     if (!pPriv)
-	return FALSE;
+        return FALSE;
 
     ds = pPriv->dri2_screen;
 
-    if (!ds->SwapLimitValidate
-	|| !ds->SwapLimitValidate(pDraw, swap_limit))
-	return FALSE;
+    if (!ds->SwapLimitValidate || !ds->SwapLimitValidate(pDraw, swap_limit))
+        return FALSE;
 
     pPriv->swap_limit = swap_limit;
 
     /* Check throttling */
     if (pPriv->swapsPending >= pPriv->swap_limit)
-	return TRUE;
+        return TRUE;
 
     if (pPriv->target_sbc == -1 && !pPriv->blockedOnMsc) {
-	if (pPriv->blockedClient) {
-	    AttendClient(pPriv->blockedClient);
-	    pPriv->blockedClient = NULL;
-	}
+        if (pPriv->blockedClient) {
+            AttendClient(pPriv->blockedClient);
+            pPriv->blockedClient = NULL;
+        }
     }
 
     return TRUE;
 }
 
 typedef struct DRI2DrawableRefRec {
-    XID		  id;
-    XID		  dri2_id;
-    DRI2InvalidateProcPtr	invalidate;
-    void	 *priv;
-    struct xorg_list		link;
+    XID id;
+    XID dri2_id;
+    DRI2InvalidateProcPtr invalidate;
+    void *priv;
+    struct xorg_list link;
 } DRI2DrawableRefRec, *DRI2DrawableRefPtr;
 
 static DRI2DrawableRefPtr
@@ -238,36 +242,36 @@ DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
     DRI2DrawableRefPtr ref;
 
     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
-	if (ref->id == id)
-	    return ref;
+        if (ref->id == id)
+            return ref;
     }
-    
+
     return NULL;
 }
 
 static int
 DRI2AddDrawableRef(DRI2DrawablePtr pPriv, XID id, XID dri2_id,
-		   DRI2InvalidateProcPtr invalidate, void *priv)
+                   DRI2InvalidateProcPtr invalidate, void *priv)
 {
     DRI2DrawableRefPtr ref;
 
     ref = malloc(sizeof *ref);
     if (ref == NULL)
-	return BadAlloc;
-	
+        return BadAlloc;
+
     if (!AddResource(dri2_id, dri2DrawableRes, pPriv)) {
-	free(ref);
-	return BadAlloc;
+        free(ref);
+        return BadAlloc;
     }
     if (!DRI2LookupDrawableRef(pPriv, id))
-	if (!AddResource(id, dri2DrawableRes, pPriv)) {
-	    FreeResourceByType(dri2_id, dri2DrawableRes, TRUE);
-	    free(ref);
-	    return BadAlloc;
+        if (!AddResource(id, dri2DrawableRes, pPriv)) {
+            FreeResourceByType(dri2_id, dri2DrawableRes, TRUE);
+            free(ref);
+            return BadAlloc;
         }
 
     ref->id = id;
-    ref->dri2_id = dri2_id; 
+    ref->dri2_id = dri2_id;
     ref->invalidate = invalidate;
     ref->priv = priv;
     xorg_list_add(&ref->link, &pPriv->reference_list);
@@ -277,7 +281,7 @@ DRI2AddDrawableRef(DRI2DrawablePtr pPriv, XID id, XID dri2_id,
 
 int
 DRI2CreateDrawable(ClientPtr client, DrawablePtr pDraw, XID id,
-		   DRI2InvalidateProcPtr invalidate, void *priv)
+                   DRI2InvalidateProcPtr invalidate, void *priv)
 {
     DRI2DrawablePtr pPriv;
     XID dri2_id;
@@ -285,22 +289,23 @@ DRI2CreateDrawable(ClientPtr client, DrawablePtr pDraw, XID id,
 
     pPriv = DRI2GetDrawable(pDraw);
     if (pPriv == NULL)
-	pPriv = DRI2AllocateDrawable(pDraw);
+        pPriv = DRI2AllocateDrawable(pDraw);
     if (pPriv == NULL)
-	return BadAlloc;
-    
+        return BadAlloc;
+
     dri2_id = FakeClientID(client->index);
     rc = DRI2AddDrawableRef(pPriv, id, dri2_id, invalidate, priv);
     if (rc != Success)
-	return rc;
+        return rc;
 
     return Success;
 }
 
-static int DRI2DrawableGone(pointer p, XID id)
+static int
+DRI2DrawableGone(pointer p, XID id)
 {
     DRI2DrawablePtr pPriv = p;
-    DRI2ScreenPtr   ds = pPriv->dri2_screen;
+    DRI2ScreenPtr ds = pPriv->dri2_screen;
     DRI2DrawableRefPtr ref, next;
     WindowPtr pWin;
     PixmapPtr pPixmap;
@@ -308,40 +313,41 @@ static int DRI2DrawableGone(pointer p, XID id)
     int i;
 
     xorg_list_for_each_entry_safe(ref, next, &pPriv->reference_list, link) {
-	if (ref->dri2_id == id) {
-	    xorg_list_del(&ref->link);
-	    /* If this was the last ref under this X drawable XID,
-	     * unregister the X drawable resource. */
-	    if (!DRI2LookupDrawableRef(pPriv, ref->id))
-		FreeResourceByType(ref->id, dri2DrawableRes, TRUE);
-	    free(ref);
-	    break;
-	}
-
-	if (ref->id == id) {
-	    xorg_list_del(&ref->link);
-	    FreeResourceByType(ref->dri2_id, dri2DrawableRes, TRUE);
-	    free(ref);
-	}
+        if (ref->dri2_id == id) {
+            xorg_list_del(&ref->link);
+            /* If this was the last ref under this X drawable XID,
+             * unregister the X drawable resource. */
+            if (!DRI2LookupDrawableRef(pPriv, ref->id))
+                FreeResourceByType(ref->id, dri2DrawableRes, TRUE);
+            free(ref);
+            break;
+        }
+
+        if (ref->id == id) {
+            xorg_list_del(&ref->link);
+            FreeResourceByType(ref->dri2_id, dri2DrawableRes, TRUE);
+            free(ref);
+        }
     }
 
     if (!xorg_list_is_empty(&pPriv->reference_list))
-	return Success;
+        return Success;
 
     pDraw = pPriv->drawable;
     if (pDraw->type == DRAWABLE_WINDOW) {
-	pWin = (WindowPtr) pDraw;
-	dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, NULL);
-    } else {
-	pPixmap = (PixmapPtr) pDraw;
-	dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, NULL);
+        pWin = (WindowPtr) pDraw;
+        dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, NULL);
+    }
+    else {
+        pPixmap = (PixmapPtr) pDraw;
+        dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, NULL);
     }
 
     if (pPriv->buffers != NULL) {
-	for (i = 0; i < pPriv->bufferCount; i++)
-	    (*ds->DestroyBuffer)(pDraw, pPriv->buffers[i]);
+        for (i = 0; i < pPriv->bufferCount; i++)
+            (*ds->DestroyBuffer) (pDraw, pPriv->buffers[i]);
 
-	free(pPriv->buffers);
+        free(pPriv->buffers);
     }
 
     free(pPriv);
@@ -355,14 +361,14 @@ find_attachment(DRI2DrawablePtr pPriv, unsigned attachment)
     int i;
 
     if (pPriv->buffers == NULL) {
-	return -1;
+        return -1;
     }
 
     for (i = 0; i < pPriv->bufferCount; i++) {
-	if ((pPriv->buffers[i] != NULL)
-	    && (pPriv->buffers[i]->attachment == attachment)) {
-	    return i;
-	}
+        if ((pPriv->buffers[i] != NULL)
+            && (pPriv->buffers[i]->attachment == attachment)) {
+            return i;
+        }
     }
 
     return -1;
@@ -370,46 +376,47 @@ find_attachment(DRI2DrawablePtr pPriv, unsigned attachment)
 
 static Bool
 allocate_or_reuse_buffer(DrawablePtr pDraw, DRI2ScreenPtr ds,
-			 DRI2DrawablePtr pPriv,
-			 unsigned int attachment, unsigned int format,
-			 int dimensions_match, DRI2BufferPtr *buffer)
+                         DRI2DrawablePtr pPriv,
+                         unsigned int attachment, unsigned int format,
+                         int dimensions_match, DRI2BufferPtr * buffer)
 {
     int old_buf = find_attachment(pPriv, attachment);
 
     if ((old_buf < 0)
-	|| attachment == DRI2BufferFrontLeft
-	|| !dimensions_match
-	|| (pPriv->buffers[old_buf]->format != format)) {
-	*buffer = (*ds->CreateBuffer)(pDraw, attachment, format);
-	pPriv->serialNumber = DRI2DrawableSerial(pDraw);
-	return TRUE;
+        || attachment == DRI2BufferFrontLeft
+        || !dimensions_match || (pPriv->buffers[old_buf]->format != format)) {
+        *buffer = (*ds->CreateBuffer) (pDraw, attachment, format);
+        pPriv->serialNumber = DRI2DrawableSerial(pDraw);
+        return TRUE;
 
-    } else {
-	*buffer = pPriv->buffers[old_buf];
+    }
+    else {
+        *buffer = pPriv->buffers[old_buf];
 
-	if (ds->ReuseBufferNotify)
-		(*ds->ReuseBufferNotify)(pDraw, *buffer);
+        if (ds->ReuseBufferNotify)
+            (*ds->ReuseBufferNotify) (pDraw, *buffer);
 
-	pPriv->buffers[old_buf] = NULL;
-	return FALSE;
+        pPriv->buffers[old_buf] = NULL;
+        return FALSE;
     }
 }
 
 static void
 update_dri2_drawable_buffers(DRI2DrawablePtr pPriv, DrawablePtr pDraw,
-			     DRI2BufferPtr *buffers, int out_count, int *width, int *height)
+                             DRI2BufferPtr * buffers, int out_count, int *width,
+                             int *height)
 {
-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
+    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
     int i;
 
     if (pPriv->buffers != NULL) {
-	for (i = 0; i < pPriv->bufferCount; i++) {
-	    if (pPriv->buffers[i] != NULL) {
-		(*ds->DestroyBuffer)(pDraw, pPriv->buffers[i]);
-	    }
-	}
+        for (i = 0; i < pPriv->bufferCount; i++) {
+            if (pPriv->buffers[i] != NULL) {
+                (*ds->DestroyBuffer) (pDraw, pPriv->buffers[i]);
+            }
+        }
 
-	free(pPriv->buffers);
+        free(pPriv->buffers);
     }
 
     pPriv->buffers = buffers;
@@ -422,12 +429,12 @@ update_dri2_drawable_buffers(DRI2DrawablePtr pPriv, DrawablePtr pDraw,
 
 static DRI2BufferPtr *
 do_get_buffers(DrawablePtr pDraw, int *width, int *height,
-	       unsigned int *attachments, int count, int *out_count,
-	       int has_format)
+               unsigned int *attachments, int count, int *out_count,
+               int has_format)
 {
-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
+    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
     DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
-    DRI2BufferPtr  *buffers;
+    DRI2BufferPtr *buffers;
     int need_real_front = 0;
     int need_fake_front = 0;
     int have_fake_front = 0;
@@ -437,142 +444,143 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height,
     int i;
 
     if (!pPriv) {
-	*width = pDraw->width;
-	*height = pDraw->height;
-	*out_count = 0;
-	return NULL;
+        *width = pDraw->width;
+        *height = pDraw->height;
+        *out_count = 0;
+        return NULL;
     }
 
     dimensions_match = (pDraw->width == pPriv->width)
-	&& (pDraw->height == pPriv->height)
-	&& (pPriv->serialNumber == DRI2DrawableSerial(pDraw));
+        && (pDraw->height == pPriv->height)
+        && (pPriv->serialNumber == DRI2DrawableSerial(pDraw));
 
     buffers = calloc((count + 1), sizeof(buffers[0]));
     if (!buffers)
-	goto err_out;
+        goto err_out;
 
     for (i = 0; i < count; i++) {
-	const unsigned attachment = *(attachments++);
-	const unsigned format = (has_format) ? *(attachments++) : 0;
-
-	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, attachment,
-				     format, dimensions_match,
-				     &buffers[i]))
-		buffers_changed = 1;
-
-	if (buffers[i] == NULL)
-	    goto err_out;
-
-	/* If the drawable is a window and the front-buffer is requested,
-	 * silently add the fake front-buffer to the list of requested
-	 * attachments.  The counting logic in the loop accounts for the case
-	 * where the client requests both the fake and real front-buffer.
-	 */
-	if (attachment == DRI2BufferBackLeft) {
-	    need_real_front++;
-	    front_format = format;
-	}
-
-	if (attachment == DRI2BufferFrontLeft) {
-	    need_real_front--;
-	    front_format = format;
-
-	    if (pDraw->type == DRAWABLE_WINDOW) {
-		need_fake_front++;
-	    }
-	}
-
-	if (pDraw->type == DRAWABLE_WINDOW) {
-	    if (attachment == DRI2BufferFakeFrontLeft) {
-		need_fake_front--;
-		have_fake_front = 1;
-	    }
-	}
+        const unsigned attachment = *(attachments++);
+        const unsigned format = (has_format) ? *(attachments++) : 0;
+
+        if (allocate_or_reuse_buffer(pDraw, ds, pPriv, attachment,
+                                     format, dimensions_match, &buffers[i]))
+            buffers_changed = 1;
+
+        if (buffers[i] == NULL)
+            goto err_out;
+
+        /* If the drawable is a window and the front-buffer is requested,
+         * silently add the fake front-buffer to the list of requested
+         * attachments.  The counting logic in the loop accounts for the case
+         * where the client requests both the fake and real front-buffer.
+         */
+        if (attachment == DRI2BufferBackLeft) {
+            need_real_front++;
+            front_format = format;
+        }
+
+        if (attachment == DRI2BufferFrontLeft) {
+            need_real_front--;
+            front_format = format;
+
+            if (pDraw->type == DRAWABLE_WINDOW) {
+                need_fake_front++;
+            }
+        }
+
+        if (pDraw->type == DRAWABLE_WINDOW) {
+            if (attachment == DRI2BufferFakeFrontLeft) {
+                need_fake_front--;
+                have_fake_front = 1;
+            }
+        }
     }
 
     if (need_real_front > 0) {
-	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFrontLeft,
-				     front_format, dimensions_match,
-				     &buffers[i]))
-	    buffers_changed = 1;
-
-	if (buffers[i] == NULL)
-	    goto err_out;
-	i++;
+        if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFrontLeft,
+                                     front_format, dimensions_match,
+                                     &buffers[i]))
+            buffers_changed = 1;
+
+        if (buffers[i] == NULL)
+            goto err_out;
+        i++;
     }
 
     if (need_fake_front > 0) {
-	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFakeFrontLeft,
-				     front_format, dimensions_match,
-				     &buffers[i]))
-	    buffers_changed = 1;
+        if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFakeFrontLeft,
+                                     front_format, dimensions_match,
+                                     &buffers[i]))
+            buffers_changed = 1;
 
-	if (buffers[i] == NULL)
-	    goto err_out;
+        if (buffers[i] == NULL)
+            goto err_out;
 
-	i++;
-	have_fake_front = 1;
+        i++;
+        have_fake_front = 1;
     }
 
     *out_count = i;
 
-    update_dri2_drawable_buffers(pPriv, pDraw, buffers, *out_count, width, height);
+    update_dri2_drawable_buffers(pPriv, pDraw, buffers, *out_count, width,
+                                 height);
 
     /* If the client is getting a fake front-buffer, pre-fill it with the
      * contents of the real front-buffer.  This ensures correct operation of
      * applications that call glXWaitX before calling glDrawBuffer.
      */
     if (have_fake_front && buffers_changed) {
-	BoxRec box;
-	RegionRec region;
+        BoxRec box;
+        RegionRec region;
 
-	box.x1 = 0;
-	box.y1 = 0;
-	box.x2 = pPriv->width;
-	box.y2 = pPriv->height;
-	RegionInit(&region, &box, 0);
+        box.x1 = 0;
+        box.y1 = 0;
+        box.x2 = pPriv->width;
+        box.y2 = pPriv->height;
+        RegionInit(&region, &box, 0);
 
-	DRI2CopyRegion(pDraw, &region, DRI2BufferFakeFrontLeft,
-		       DRI2BufferFrontLeft);
+        DRI2CopyRegion(pDraw, &region, DRI2BufferFakeFrontLeft,
+                       DRI2BufferFrontLeft);
     }
 
     pPriv->needInvalidate = TRUE;
 
     return pPriv->buffers;
 
-err_out:
+ err_out:
 
     *out_count = 0;
 
     if (buffers) {
-	for (i = 0; i < count; i++) {
-	    if (buffers[i] != NULL)
-		(*ds->DestroyBuffer)(pDraw, buffers[i]);
-	}
+        for (i = 0; i < count; i++) {
+            if (buffers[i] != NULL)
+                (*ds->DestroyBuffer) (pDraw, buffers[i]);
+        }
 
-	free(buffers);
-	buffers = NULL;
+        free(buffers);
+        buffers = NULL;
     }
 
-    update_dri2_drawable_buffers(pPriv, pDraw, buffers, *out_count, width, height);
+    update_dri2_drawable_buffers(pPriv, pDraw, buffers, *out_count, width,
+                                 height);
 
     return buffers;
 }
 
 DRI2BufferPtr *
 DRI2GetBuffers(DrawablePtr pDraw, int *width, int *height,
-	       unsigned int *attachments, int count, int *out_count)
+               unsigned int *attachments, int count, int *out_count)
 {
     return do_get_buffers(pDraw, width, height, attachments, count,
-			  out_count, FALSE);
+                          out_count, FALSE);
 }
 
 DRI2BufferPtr *
 DRI2GetBuffersWithFormat(DrawablePtr pDraw, int *width, int *height,
-			 unsigned int *attachments, int count, int *out_count)
+                         unsigned int *attachments, int count, int *out_count)
 {
     return do_get_buffers(pDraw, width, height, attachments, count,
-			  out_count, TRUE);
+                          out_count, TRUE);
 }
 
 static void
@@ -587,7 +595,7 @@ DRI2InvalidateDrawable(DrawablePtr pDraw)
     pPriv->needInvalidate = FALSE;
 
     xorg_list_for_each_entry(ref, &pPriv->reference_list, link)
-	ref->invalidate(pDraw, ref->priv, ref->id);
+        ref->invalidate(pDraw, ref->priv, ref->id);
 }
 
 /*
@@ -604,16 +612,15 @@ DRI2ThrottleClient(ClientPtr client, DrawablePtr pDraw)
 
     pPriv = DRI2GetDrawable(pDraw);
     if (pPriv == NULL)
-	return FALSE;
+        return FALSE;
 
     /* Throttle to swap limit */
-    if ((pPriv->swapsPending >= pPriv->swap_limit) &&
-	!pPriv->blockedClient) {
-	ResetCurrentRequest(client);
-	client->sequence--;
-	IgnoreClient(client);
-	pPriv->blockedClient = client;
-	return TRUE;
+    if ((pPriv->swapsPending >= pPriv->swap_limit) && !pPriv->blockedClient) {
+        ResetCurrentRequest(client);
+        client->sequence--;
+        IgnoreClient(client);
+        pPriv->blockedClient = client;
+        return TRUE;
     }
 
     return FALSE;
@@ -623,8 +630,8 @@ static void
 __DRI2BlockClient(ClientPtr client, DRI2DrawablePtr pPriv)
 {
     if (pPriv->blockedClient == NULL) {
-	IgnoreClient(client);
-	pPriv->blockedClient = client;
+        IgnoreClient(client);
+        pPriv->blockedClient = client;
     }
 }
 
@@ -635,7 +642,7 @@ DRI2BlockClient(ClientPtr client, DrawablePtr pDraw)
 
     pPriv = DRI2GetDrawable(pDraw);
     if (pPriv == NULL)
-	return;
+        return;
 
     __DRI2BlockClient(client, pPriv);
     pPriv->blockedOnMsc = TRUE;
@@ -643,30 +650,29 @@ DRI2BlockClient(ClientPtr client, DrawablePtr pDraw)
 
 int
 DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
-	       unsigned int dest, unsigned int src)
+               unsigned int dest, unsigned int src)
 {
-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
+    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
     DRI2DrawablePtr pPriv;
-    DRI2BufferPtr   pDestBuffer, pSrcBuffer;
-    int		    i;
+    DRI2BufferPtr pDestBuffer, pSrcBuffer;
+    int i;
 
     pPriv = DRI2GetDrawable(pDraw);
     if (pPriv == NULL)
-	return BadDrawable;
+        return BadDrawable;
 
     pDestBuffer = NULL;
     pSrcBuffer = NULL;
-    for (i = 0; i < pPriv->bufferCount; i++)
-    {
-	if (pPriv->buffers[i]->attachment == dest)
-	    pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];
-	if (pPriv->buffers[i]->attachment == src)
-	    pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];
+    for (i = 0; i < pPriv->bufferCount; i++) {
+        if (pPriv->buffers[i]->attachment == dest)
+            pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];
+        if (pPriv->buffers[i]->attachment == src)
+            pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];
     }
     if (pSrcBuffer == NULL || pDestBuffer == NULL)
-	return BadValue;
+        return BadValue;
 
-    (*ds->CopyRegion)(pDraw, pRegion, pDestBuffer, pSrcBuffer);
+    (*ds->CopyRegion) (pDraw, pRegion, pDestBuffer, pSrcBuffer);
 
     return Success;
 }
@@ -680,7 +686,7 @@ DRI2CanFlip(DrawablePtr pDraw)
     PixmapPtr pWinPixmap, pRootPixmap;
 
     if (pDraw->type == DRAWABLE_PIXMAP)
-	return TRUE;
+        return TRUE;
 
     pRoot = pScreen->root;
     pRootPixmap = pScreen->GetWindowPixmap(pRoot);
@@ -688,20 +694,18 @@ DRI2CanFlip(DrawablePtr pDraw)
     pWin = (WindowPtr) pDraw;
     pWinPixmap = pScreen->GetWindowPixmap(pWin);
     if (pRootPixmap != pWinPixmap)
-	return FALSE;
+        return FALSE;
     if (!RegionEqual(&pWin->clipList, &pRoot->winSize))
-	return FALSE;
+        return FALSE;
 
     /* Does the window match the pixmap exactly? */
-    if (pDraw->x != 0 ||
-	pDraw->y != 0 ||
+    if (pDraw->x != 0 || pDraw->y != 0 ||
 #ifdef COMPOSITE
-	pDraw->x != pWinPixmap->screen_x ||
-	pDraw->y != pWinPixmap->screen_y ||
+        pDraw->x != pWinPixmap->screen_x || pDraw->y != pWinPixmap->screen_y ||
 #endif
-	pDraw->width != pWinPixmap->drawable.width ||
-	pDraw->height != pWinPixmap->drawable.height)
-	return FALSE;
+        pDraw->width != pWinPixmap->drawable.width ||
+        pDraw->height != pWinPixmap->drawable.height)
+        return FALSE;
 
     return TRUE;
 }
@@ -715,19 +719,19 @@ DRI2CanExchange(DrawablePtr pDraw)
 
 void
 DRI2WaitMSCComplete(ClientPtr client, DrawablePtr pDraw, int frame,
-		    unsigned int tv_sec, unsigned int tv_usec)
+                    unsigned int tv_sec, unsigned int tv_usec)
 {
     DRI2DrawablePtr pPriv;
 
     pPriv = DRI2GetDrawable(pDraw);
     if (pPriv == NULL)
-	return;
+        return;
 
-    ProcDRI2WaitMSCReply(client, ((CARD64)tv_sec * 1000000) + tv_usec,
-			 frame, pPriv->swap_count);
+    ProcDRI2WaitMSCReply(client, ((CARD64) tv_sec * 1000000) + tv_usec,
+                         frame, pPriv->swap_count);
 
     if (pPriv->blockedClient)
-	AttendClient(pPriv->blockedClient);
+        AttendClient(pPriv->blockedClient);
 
     pPriv->blockedClient = NULL;
     pPriv->blockedOnMsc = FALSE;
@@ -735,16 +739,16 @@ DRI2WaitMSCComplete(ClientPtr client, DrawablePtr pDraw, int frame,
 
 static void
 DRI2WakeClient(ClientPtr client, DrawablePtr pDraw, int frame,
-	       unsigned int tv_sec, unsigned int tv_usec)
+               unsigned int tv_sec, unsigned int tv_usec)
 {
-    ScreenPtr	    pScreen = pDraw->pScreen;
+    ScreenPtr pScreen = pDraw->pScreen;
     DRI2DrawablePtr pPriv;
 
     pPriv = DRI2GetDrawable(pDraw);
     if (pPriv == NULL) {
         xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: bad drawable\n", __func__);
-	return;
+                   "[DRI2] %s: bad drawable\n", __func__);
+        return;
     }
 
     /*
@@ -755,38 +759,38 @@ DRI2WakeClient(ClientPtr client, DrawablePtr pDraw, int frame,
      *   - was blocked due to swap throttling
      *   - is not blocked due to an MSC wait
      */
-    if (pPriv->target_sbc != -1 &&
-	pPriv->target_sbc <= pPriv->swap_count) {
-	ProcDRI2WaitMSCReply(client, ((CARD64)tv_sec * 1000000) + tv_usec,
-			     frame, pPriv->swap_count);
-	pPriv->target_sbc = -1;
-
-	AttendClient(pPriv->blockedClient);
-	pPriv->blockedClient = NULL;
-    } else if (pPriv->target_sbc == -1 && !pPriv->blockedOnMsc) {
-	if (pPriv->blockedClient) {
-	    AttendClient(pPriv->blockedClient);
-	    pPriv->blockedClient = NULL;
-	}
+    if (pPriv->target_sbc != -1 && pPriv->target_sbc <= pPriv->swap_count) {
+        ProcDRI2WaitMSCReply(client, ((CARD64) tv_sec * 1000000) + tv_usec,
+                             frame, pPriv->swap_count);
+        pPriv->target_sbc = -1;
+
+        AttendClient(pPriv->blockedClient);
+        pPriv->blockedClient = NULL;
+    }
+    else if (pPriv->target_sbc == -1 && !pPriv->blockedOnMsc) {
+        if (pPriv->blockedClient) {
+            AttendClient(pPriv->blockedClient);
+            pPriv->blockedClient = NULL;
+        }
     }
 }
 
 void
 DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame,
-		   unsigned int tv_sec, unsigned int tv_usec, int type,
-		   DRI2SwapEventPtr swap_complete, void *swap_data)
+                 unsigned int tv_sec, unsigned int tv_usec, int type,
+                 DRI2SwapEventPtr swap_complete, void *swap_data)
 {
-    ScreenPtr	    pScreen = pDraw->pScreen;
+    ScreenPtr pScreen = pDraw->pScreen;
     DRI2DrawablePtr pPriv;
-    CARD64          ust = 0;
-    BoxRec          box;
-    RegionRec       region;
+    CARD64 ust = 0;
+    BoxRec box;
+    RegionRec region;
 
     pPriv = DRI2GetDrawable(pDraw);
     if (pPriv == NULL) {
         xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: bad drawable\n", __func__);
-	return;
+                   "[DRI2] %s: bad drawable\n", __func__);
+        return;
     }
 
     pPriv->swapsPending--;
@@ -798,11 +802,11 @@ DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame,
     box.y2 = pDraw->height;
     RegionInit(&region, &box, 0);
     DRI2CopyRegion(pDraw, &region, DRI2BufferFakeFrontLeft,
-		   DRI2BufferFrontLeft);
+                   DRI2BufferFrontLeft);
 
-    ust = ((CARD64)tv_sec * 1000000) + tv_usec;
+    ust = ((CARD64) tv_sec * 1000000) + tv_usec;
     if (swap_complete)
-	swap_complete(client, swap_data, type, ust, frame, pPriv->swap_count);
+        swap_complete(client, swap_data, type, ust, frame, pPriv->swap_count);
 
     pPriv->last_swap_msc = frame;
     pPriv->last_swap_ust = ust;
@@ -818,13 +822,11 @@ DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable)
     /* If we're currently waiting for a swap on this drawable, reset
      * the request and suspend the client.  We only support one
      * blocked client per drawable. */
-    if (pPriv &&
-	pPriv->swapsPending &&
-	pPriv->blockedClient == NULL) {
-	ResetCurrentRequest(client);
-	client->sequence--;
-	__DRI2BlockClient(client, pPriv);
-	return TRUE;
+    if (pPriv && pPriv->swapsPending && pPriv->blockedClient == NULL) {
+        ResetCurrentRequest(client);
+        client->sequence--;
+        __DRI2BlockClient(client, pPriv);
+        return TRUE;
     }
 
     return FALSE;
@@ -838,59 +840,59 @@ static int
 DRI2InvalidateWalk(WindowPtr pWin, pointer data)
 {
     if (pWin->drawable.pScreen->GetWindowPixmap(pWin) != data)
-	return WT_DONTWALKCHILDREN;
+        return WT_DONTWALKCHILDREN;
     DRI2InvalidateDrawable(&pWin->drawable);
     return WT_WALKCHILDREN;
 }
 
 int
 DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
-		CARD64 divisor, CARD64 remainder, CARD64 *swap_target,
-		DRI2SwapEventPtr func, void *data)
+                CARD64 divisor, CARD64 remainder, CARD64 * swap_target,
+                DRI2SwapEventPtr func, void *data)
 {
-    ScreenPtr       pScreen = pDraw->pScreen;
-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
+    ScreenPtr pScreen = pDraw->pScreen;
+    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
     DRI2DrawablePtr pPriv;
-    DRI2BufferPtr   pDestBuffer = NULL, pSrcBuffer = NULL;
-    int             ret, i;
-    CARD64          ust, current_msc;
+    DRI2BufferPtr pDestBuffer = NULL, pSrcBuffer = NULL;
+    int ret, i;
+    CARD64 ust, current_msc;
 
     pPriv = DRI2GetDrawable(pDraw);
     if (pPriv == NULL) {
         xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: bad drawable\n", __func__);
-	return BadDrawable;
+                   "[DRI2] %s: bad drawable\n", __func__);
+        return BadDrawable;
     }
 
     for (i = 0; i < pPriv->bufferCount; i++) {
-	if (pPriv->buffers[i]->attachment == DRI2BufferFrontLeft)
-	    pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];
-	if (pPriv->buffers[i]->attachment == DRI2BufferBackLeft)
-	    pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];
+        if (pPriv->buffers[i]->attachment == DRI2BufferFrontLeft)
+            pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];
+        if (pPriv->buffers[i]->attachment == DRI2BufferBackLeft)
+            pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];
     }
     if (pSrcBuffer == NULL || pDestBuffer == NULL) {
         xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: drawable has no back or front?\n", __func__);
-	return BadDrawable;
+                   "[DRI2] %s: drawable has no back or front?\n", __func__);
+        return BadDrawable;
     }
 
     /* Old DDX or no swap interval, just blit */
     if (!ds->ScheduleSwap || !pPriv->swap_interval) {
-	BoxRec box;
-	RegionRec region;
+        BoxRec box;
+        RegionRec region;
 
-	box.x1 = 0;
-	box.y1 = 0;
-	box.x2 = pDraw->width;
-	box.y2 = pDraw->height;
-	RegionInit(&region, &box, 0);
+        box.x1 = 0;
+        box.y1 = 0;
+        box.x2 = pDraw->width;
+        box.y2 = pDraw->height;
+        RegionInit(&region, &box, 0);
 
-	pPriv->swapsPending++;
+        pPriv->swapsPending++;
 
-	(*ds->CopyRegion)(pDraw, &region, pDestBuffer, pSrcBuffer);
-	DRI2SwapComplete(client, pDraw, target_msc, 0, 0, DRI2_BLIT_COMPLETE,
-			 func, data);
-	return Success;
+        (*ds->CopyRegion) (pDraw, &region, pDestBuffer, pSrcBuffer);
+        DRI2SwapComplete(client, pDraw, target_msc, 0, 0, DRI2_BLIT_COMPLETE,
+                         func, data);
+        return Success;
     }
 
     /*
@@ -898,42 +900,43 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
      * need to schedule a swap for the last swap target + the swap interval.
      */
     if (target_msc == 0 && divisor == 0 && remainder == 0) {
-	/* If the current vblank count of the drawable's crtc is lower
-	 * than the count stored in last_swap_target from a previous swap
-	 * then reinitialize last_swap_target to the current crtc's msc,
-	 * otherwise the swap will hang. This will happen if the drawable
-	 * is moved to a crtc with a lower refresh rate, or a crtc that just
-	 * got enabled.
-	 */
-	if (ds->GetMSC) {
-	    if (!(*ds->GetMSC)(pDraw, &ust, &current_msc))
-		pPriv->last_swap_target = 0;
-
-	    if (current_msc < pPriv->last_swap_target)
-		pPriv->last_swap_target = current_msc;
-
-	}
-
-	/*
-	 * Swap target for this swap is last swap target + swap interval since
-	 * we have to account for the current swap count, interval, and the
-	 * number of pending swaps.
-	 */
-	*swap_target = pPriv->last_swap_target + pPriv->swap_interval;
-
-    } else {
-	/* glXSwapBuffersMscOML could have a 0 target_msc, honor it */
-	*swap_target = target_msc;
+        /* If the current vblank count of the drawable's crtc is lower
+         * than the count stored in last_swap_target from a previous swap
+         * then reinitialize last_swap_target to the current crtc's msc,
+         * otherwise the swap will hang. This will happen if the drawable
+         * is moved to a crtc with a lower refresh rate, or a crtc that just
+         * got enabled.
+         */
+        if (ds->GetMSC) {
+            if (!(*ds->GetMSC) (pDraw, &ust, &current_msc))
+                pPriv->last_swap_target = 0;
+
+            if (current_msc < pPriv->last_swap_target)
+                pPriv->last_swap_target = current_msc;
+
+        }
+
+        /*
+         * Swap target for this swap is last swap target + swap interval since
+         * we have to account for the current swap count, interval, and the
+         * number of pending swaps.
+         */
+        *swap_target = pPriv->last_swap_target + pPriv->swap_interval;
+
+    }
+    else {
+        /* glXSwapBuffersMscOML could have a 0 target_msc, honor it */
+        *swap_target = target_msc;
     }
 
     pPriv->swapsPending++;
-    ret = (*ds->ScheduleSwap)(client, pDraw, pDestBuffer, pSrcBuffer,
-			      swap_target, divisor, remainder, func, data);
+    ret = (*ds->ScheduleSwap) (client, pDraw, pDestBuffer, pSrcBuffer,
+                               swap_target, divisor, remainder, func, data);
     if (!ret) {
-	pPriv->swapsPending--; /* didn't schedule */
+        pPriv->swapsPending--;  /* didn't schedule */
         xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: driver failed to schedule swap\n", __func__);
-	return BadDrawable;
+                   "[DRI2] %s: driver failed to schedule swap\n", __func__);
+        return BadDrawable;
     }
 
     pPriv->last_swap_target = *swap_target;
@@ -944,23 +947,25 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
     *swap_target = pPriv->swap_count + pPriv->swapsPending;
 
     if (pDraw->type == DRAWABLE_WINDOW) {
-	WindowPtr	pWin = (WindowPtr) pDraw;
-	PixmapPtr	pPixmap = pScreen->GetWindowPixmap(pWin);
-
-	/*
-	 * Find the top-most window using this pixmap
-	 */
-	while (pWin->parent && pScreen->GetWindowPixmap(pWin->parent) == pPixmap)
-	    pWin = pWin->parent;
-
-	/*
-	 * Walk the sub-tree to invalidate all of the
-	 * windows using the same pixmap
-	 */
-	TraverseTree(pWin, DRI2InvalidateWalk, pPixmap);
-	DRI2InvalidateDrawable(&pPixmap->drawable);
-    } else
-	DRI2InvalidateDrawable(pDraw);
+        WindowPtr pWin = (WindowPtr) pDraw;
+        PixmapPtr pPixmap = pScreen->GetWindowPixmap(pWin);
+
+        /*
+         * Find the top-most window using this pixmap
+         */
+        while (pWin->parent &&
+               pScreen->GetWindowPixmap(pWin->parent) == pPixmap)
+            pWin = pWin->parent;
+
+        /*
+         * Walk the sub-tree to invalidate all of the
+         * windows using the same pixmap
+         */
+        TraverseTree(pWin, DRI2InvalidateWalk, pPixmap);
+        DRI2InvalidateDrawable(&pPixmap->drawable);
+    }
+    else
+        DRI2InvalidateDrawable(pDraw);
 
     return Success;
 }
@@ -968,13 +973,13 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
 void
 DRI2SwapInterval(DrawablePtr pDrawable, int interval)
 {
-    ScreenPtr       pScreen = pDrawable->pScreen;
+    ScreenPtr pScreen = pDrawable->pScreen;
     DRI2DrawablePtr pPriv = DRI2GetDrawable(pDrawable);
 
     if (pPriv == NULL) {
         xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: bad drawable\n", __func__);
-	return;
+                   "[DRI2] %s: bad drawable\n", __func__);
+        return;
     }
 
     /* fixme: check against arbitrary max? */
@@ -982,7 +987,7 @@ DRI2SwapInterval(DrawablePtr pDrawable, int interval)
 }
 
 int
-DRI2GetMSC(DrawablePtr pDraw, CARD64 *ust, CARD64 *msc, CARD64 *sbc)
+DRI2GetMSC(DrawablePtr pDraw, CARD64 * ust, CARD64 * msc, CARD64 * sbc)
 {
     ScreenPtr pScreen = pDraw->pScreen;
     DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
@@ -992,15 +997,15 @@ DRI2GetMSC(DrawablePtr pDraw, CARD64 *ust, CARD64 *msc, CARD64 *sbc)
     pPriv = DRI2GetDrawable(pDraw);
     if (pPriv == NULL) {
         xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: bad drawable\n", __func__);
-	return BadDrawable;
+                   "[DRI2] %s: bad drawable\n", __func__);
+        return BadDrawable;
     }
 
     if (!ds->GetMSC) {
-	*ust = 0;
-	*msc = 0;
-	*sbc = pPriv->swap_count;
-	return Success;
+        *ust = 0;
+        *msc = 0;
+        *sbc = pPriv->swap_count;
+        return Success;
     }
 
     /*
@@ -1008,9 +1013,9 @@ DRI2GetMSC(DrawablePtr pDraw, CARD64 *ust, CARD64 *msc, CARD64 *sbc)
      * drawables
      */
 
-    ret = (*ds->GetMSC)(pDraw, ust, msc);
+    ret = (*ds->GetMSC) (pDraw, ust, msc);
     if (!ret)
-	return BadDrawable;
+        return BadDrawable;
 
     *sbc = pPriv->swap_count;
 
@@ -1019,7 +1024,7 @@ DRI2GetMSC(DrawablePtr pDraw, CARD64 *ust, CARD64 *msc, CARD64 *sbc)
 
 int
 DRI2WaitMSC(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
-	    CARD64 divisor, CARD64 remainder)
+            CARD64 divisor, CARD64 remainder)
 {
     DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
     DRI2DrawablePtr pPriv;
@@ -1027,18 +1032,19 @@ DRI2WaitMSC(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
 
     pPriv = DRI2GetDrawable(pDraw);
     if (pPriv == NULL)
-	return BadDrawable;
+        return BadDrawable;
 
     /* Old DDX just completes immediately */
     if (!ds->ScheduleWaitMSC) {
-	DRI2WaitMSCComplete(client, pDraw, target_msc, 0, 0);
+        DRI2WaitMSCComplete(client, pDraw, target_msc, 0, 0);
 
-	return Success;
+        return Success;
     }
 
-    ret = (*ds->ScheduleWaitMSC)(client, pDraw, target_msc, divisor, remainder);
+    ret =
+        (*ds->ScheduleWaitMSC) (client, pDraw, target_msc, divisor, remainder);
     if (!ret)
-	return BadDrawable;
+        return BadDrawable;
 
     return Success;
 }
@@ -1050,7 +1056,7 @@ DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw, CARD64 target_sbc)
 
     pPriv = DRI2GetDrawable(pDraw);
     if (pPriv == NULL)
-	return BadDrawable;
+        return BadDrawable;
 
     /* target_sbc == 0 means to block until all pending swaps are
      * finished. Recalculate target_sbc to get that behaviour.
@@ -1084,17 +1090,17 @@ DRI2HasSwapControl(ScreenPtr pScreen)
 
 Bool
 DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd,
-	    const char **driverName, const char **deviceName)
+            const char **driverName, const char **deviceName)
 {
     DRI2ScreenPtr ds;
 
     if (!dixPrivateKeyRegistered(dri2ScreenPrivateKey))
-	return FALSE;
+        return FALSE;
 
     ds = DRI2GetScreen(pScreen);
     if (ds == NULL || driverType >= ds->numDrivers ||
-	    !ds->driverNames[driverType])
-	return FALSE;
+        !ds->driverNames[driverType])
+        return FALSE;
 
     *fd = ds->fd;
     *driverName = ds->driverNames[driverType];
@@ -1108,7 +1114,7 @@ DRI2Authenticate(ScreenPtr pScreen, uint32_t magic)
 {
     DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
 
-    if (ds == NULL || (*ds->AuthMagic)(ds->fd, magic))
+    if (ds == NULL || (*ds->AuthMagic) (ds->fd, magic))
         return FALSE;
 
     return TRUE;
@@ -1116,27 +1122,27 @@ DRI2Authenticate(ScreenPtr pScreen, uint32_t magic)
 
 static int
 DRI2ConfigNotify(WindowPtr pWin, int x, int y, int w, int h, int bw,
-		 WindowPtr pSib)
+                 WindowPtr pSib)
 {
-    DrawablePtr pDraw = (DrawablePtr)pWin;
+    DrawablePtr pDraw = (DrawablePtr) pWin;
     ScreenPtr pScreen = pDraw->pScreen;
     DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
     DRI2DrawablePtr dd = DRI2GetDrawable(pDraw);
     int ret;
 
     if (ds->ConfigNotify) {
-	pScreen->ConfigNotify = ds->ConfigNotify;
+        pScreen->ConfigNotify = ds->ConfigNotify;
 
-	ret = (*pScreen->ConfigNotify)(pWin, x, y, w, h, bw, pSib);
+        ret = (*pScreen->ConfigNotify) (pWin, x, y, w, h, bw, pSib);
 
-	ds->ConfigNotify = pScreen->ConfigNotify;
-	pScreen->ConfigNotify = DRI2ConfigNotify;
-	if (ret)
-	    return ret;
+        ds->ConfigNotify = pScreen->ConfigNotify;
+        pScreen->ConfigNotify = DRI2ConfigNotify;
+        if (ret)
+            return ret;
     }
 
     if (!dd || (dd->width == w && dd->height == h))
-	return Success;
+        return Success;
 
     DRI2InvalidateDrawable(pDraw);
     return Success;
@@ -1146,51 +1152,53 @@ Bool
 DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
 {
     DRI2ScreenPtr ds;
-    const char* driverTypeNames[] = {
-	"DRI", /* DRI2DriverDRI */
-	"VDPAU", /* DRI2DriverVDPAU */
+
+    const char *driverTypeNames[] = {
+        "DRI",                  /* DRI2DriverDRI */
+        "VDPAU",                /* DRI2DriverVDPAU */
     };
     unsigned int i;
     CARD8 cur_minor;
 
     if (info->version < 3)
-	return FALSE;
+        return FALSE;
 
     if (!xf86VGAarbiterAllowDRI(pScreen)) {
         xf86DrvMsg(pScreen->myNum, X_WARNING,
-                  "[DRI2] Direct rendering is not supported when VGA arb is necessary for the device\n");
+                   "[DRI2] Direct rendering is not supported when VGA arb is necessary for the device\n");
         return FALSE;
     }
 
     if (!dixRegisterPrivateKey(&dri2ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
 
     if (!dixRegisterPrivateKey(&dri2WindowPrivateKeyRec, PRIVATE_WINDOW, 0))
-	return FALSE;
+        return FALSE;
 
     if (!dixRegisterPrivateKey(&dri2PixmapPrivateKeyRec, PRIVATE_PIXMAP, 0))
-	return FALSE;
+        return FALSE;
 
     ds = calloc(1, sizeof *ds);
     if (!ds)
-	return FALSE;
+        return FALSE;
 
-    ds->screen         = pScreen;
-    ds->fd	       = info->fd;
-    ds->deviceName     = info->deviceName;
-    dri2_major         = 1;
+    ds->screen = pScreen;
+    ds->fd = info->fd;
+    ds->deviceName = info->deviceName;
+    dri2_major = 1;
 
-    ds->CreateBuffer   = info->CreateBuffer;
-    ds->DestroyBuffer  = info->DestroyBuffer;
-    ds->CopyRegion     = info->CopyRegion;
+    ds->CreateBuffer = info->CreateBuffer;
+    ds->DestroyBuffer = info->DestroyBuffer;
+    ds->CopyRegion = info->CopyRegion;
 
     if (info->version >= 4) {
-	ds->ScheduleSwap = info->ScheduleSwap;
-	ds->ScheduleWaitMSC = info->ScheduleWaitMSC;
-	ds->GetMSC = info->GetMSC;
-	cur_minor = 3;
-    } else {
-	cur_minor = 1;
+        ds->ScheduleSwap = info->ScheduleSwap;
+        ds->ScheduleWaitMSC = info->ScheduleWaitMSC;
+        ds->GetMSC = info->GetMSC;
+        cur_minor = 3;
+    }
+    else {
+        cur_minor = 1;
     }
 
     if (info->version >= 5) {
@@ -1198,8 +1206,8 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
     }
 
     if (info->version >= 6) {
-	ds->ReuseBufferNotify = info->ReuseBufferNotify;
-	ds->SwapLimitValidate = info->SwapLimitValidate;
+        ds->ReuseBufferNotify = info->ReuseBufferNotify;
+        ds->SwapLimitValidate = info->SwapLimitValidate;
     }
 
     /*
@@ -1215,22 +1223,23 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
 
     /* Initialize minor if needed and set to minimum provied by DDX */
     if (!dri2_minor || dri2_minor > cur_minor)
-	dri2_minor = cur_minor;
+        dri2_minor = cur_minor;
 
     if (info->version == 3 || info->numDrivers == 0) {
-	/* Driver too old: use the old-style driverName field */
-	ds->numDrivers = 1;
-	ds->driverNames = malloc(sizeof(*ds->driverNames));
-	if (!ds->driverNames)
-	    goto err_out;
-	ds->driverNames[0] = info->driverName;
-    } else {
-	ds->numDrivers = info->numDrivers;
-	ds->driverNames = malloc(info->numDrivers * sizeof(*ds->driverNames));
-	if (!ds->driverNames)
-		goto err_out;
-	memcpy(ds->driverNames, info->driverNames,
-	       info->numDrivers * sizeof(*ds->driverNames));
+        /* Driver too old: use the old-style driverName field */
+        ds->numDrivers = 1;
+        ds->driverNames = malloc(sizeof(*ds->driverNames));
+        if (!ds->driverNames)
+            goto err_out;
+        ds->driverNames[0] = info->driverName;
+    }
+    else {
+        ds->numDrivers = info->numDrivers;
+        ds->driverNames = malloc(info->numDrivers * sizeof(*ds->driverNames));
+        if (!ds->driverNames)
+            goto err_out;
+        memcpy(ds->driverNames, info->driverNames,
+               info->numDrivers * sizeof(*ds->driverNames));
     }
 
     dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, ds);
@@ -1240,17 +1249,18 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
 
     xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2] Setup complete\n");
     for (i = 0; i < sizeof(driverTypeNames) / sizeof(driverTypeNames[0]); i++) {
-	if (i < ds->numDrivers && ds->driverNames[i]) {
-	    xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2]   %s driver: %s\n",
-		       driverTypeNames[i], ds->driverNames[i]);
-	}
+        if (i < ds->numDrivers && ds->driverNames[i]) {
+            xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2]   %s driver: %s\n",
+                       driverTypeNames[i], ds->driverNames[i]);
+        }
     }
 
     return TRUE;
 
-err_out:
+ err_out:
     xf86DrvMsg(pScreen->myNum, X_WARNING,
-            "[DRI2] Initialization failed for info version %d.\n", info->version);
+               "[DRI2] Initialization failed for info version %d.\n",
+               info->version);
     free(ds);
     return FALSE;
 }
@@ -1259,6 +1269,7 @@ void
 DRI2CloseScreen(ScreenPtr pScreen)
 {
     DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
+
     pScreen->ConfigNotify = ds->ConfigNotify;
 
     free(ds->driverNames);
@@ -1275,7 +1286,7 @@ DRI2ModuleSetup(void)
 {
     dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone, "DRI2Drawable");
     if (!dri2DrawableRes)
-	return FALSE;
+        return FALSE;
 
     return TRUE;
 }
@@ -1285,22 +1296,19 @@ DRI2Setup(pointer module, pointer opts, int *errmaj, int *errmin)
 {
     static Bool setupDone = FALSE;
 
-    if (!setupDone)
-    {
-	setupDone = TRUE;
-	LoadExtension(&dri2ExtensionModule, FALSE);
+    if (!setupDone) {
+        setupDone = TRUE;
+        LoadExtension(&dri2ExtensionModule, FALSE);
     }
-    else
-    {
-	if (errmaj)
-	    *errmaj = LDR_ONCEONLY;
+    else {
+        if (errmaj)
+            *errmaj = LDR_ONCEONLY;
     }
 
     return (pointer) 1;
 }
 
-static XF86ModuleVersionInfo DRI2VersRec =
-{
+static XF86ModuleVersionInfo DRI2VersRec = {
     "dri2",
     MODULEVENDORSTRING,
     MODINFOSTRING1,
@@ -1310,7 +1318,7 @@ static XF86ModuleVersionInfo DRI2VersRec =
     ABI_CLASS_EXTENSION,
     ABI_EXTENSION_VERSION,
     MOD_CLASS_NONE,
-    { 0, 0, 0, 0 }
+    {0, 0, 0, 0}
 };
 
 _X_EXPORT XF86ModuleData dri2ModuleData = { &DRI2VersRec, DRI2Setup, NULL };
@@ -1319,8 +1327,8 @@ void
 DRI2Version(int *major, int *minor)
 {
     if (major != NULL)
-	*major = DRI2VersRec.majorversion;
+        *major = DRI2VersRec.majorversion;
 
     if (minor != NULL)
-	*minor = DRI2VersRec.minorversion;
+        *minor = DRI2VersRec.minorversion;
 }
diff --git a/xorg-server/hw/xfree86/dri2/dri2.h b/xorg-server/hw/xfree86/dri2/dri2.h
index a67e35f73..00b3668cc 100644
--- a/xorg-server/hw/xfree86/dri2/dri2.h
+++ b/xorg-server/hw/xfree86/dri2/dri2.h
@@ -46,27 +46,24 @@ typedef struct {
     void *driverPrivate;
 } DRI2BufferRec, *DRI2BufferPtr;
 
-extern CARD8 dri2_major; /* version of DRI2 supported by DDX */
+extern CARD8 dri2_major;        /* version of DRI2 supported by DDX */
 extern CARD8 dri2_minor;
 
 typedef DRI2BufferRec DRI2Buffer2Rec, *DRI2Buffer2Ptr;
-typedef void (*DRI2SwapEventPtr)(ClientPtr client, void *data, int type,
-				 CARD64 ust, CARD64 msc, CARD32 sbc);
-
-
-typedef DRI2BufferPtr	(*DRI2CreateBuffersProcPtr)(DrawablePtr pDraw,
-						    unsigned int *attachments,
-						    int count);
-typedef void		(*DRI2DestroyBuffersProcPtr)(DrawablePtr pDraw,
-						     DRI2BufferPtr buffers,
-						     int count);
-typedef void		(*DRI2CopyRegionProcPtr)(DrawablePtr pDraw,
-						 RegionPtr pRegion,
-						 DRI2BufferPtr pDestBuffer,
-						 DRI2BufferPtr pSrcBuffer);
-typedef void		(*DRI2WaitProcPtr)(WindowPtr pWin,
-					   unsigned int sequence);
-typedef int		(*DRI2AuthMagicProcPtr)(int fd, uint32_t magic);
+typedef void (*DRI2SwapEventPtr) (ClientPtr client, void *data, int type,
+                                  CARD64 ust, CARD64 msc, CARD32 sbc);
+
+typedef DRI2BufferPtr(*DRI2CreateBuffersProcPtr) (DrawablePtr pDraw,
+                                                  unsigned int *attachments,
+                                                  int count);
+typedef void (*DRI2DestroyBuffersProcPtr) (DrawablePtr pDraw,
+                                           DRI2BufferPtr buffers, int count);
+typedef void (*DRI2CopyRegionProcPtr) (DrawablePtr pDraw,
+                                       RegionPtr pRegion,
+                                       DRI2BufferPtr pDestBuffer,
+                                       DRI2BufferPtr pSrcBuffer);
+typedef void (*DRI2WaitProcPtr) (WindowPtr pWin, unsigned int sequence);
+typedef int (*DRI2AuthMagicProcPtr) (int fd, uint32_t magic);
 
 /**
  * Schedule a buffer swap
@@ -95,20 +92,19 @@ typedef int		(*DRI2AuthMagicProcPtr)(int fd, uint32_t magic);
  * \param func function to call when the swap completes
  * \param data data for the callback \p func.
  */
-typedef int		(*DRI2ScheduleSwapProcPtr)(ClientPtr client,
-						   DrawablePtr pDraw,
-						   DRI2BufferPtr pDestBuffer,
-						   DRI2BufferPtr pSrcBuffer,
-						   CARD64 *target_msc,
-						   CARD64 divisor,
-						   CARD64 remainder,
-						   DRI2SwapEventPtr func,
-						   void *data);
-typedef DRI2BufferPtr	(*DRI2CreateBufferProcPtr)(DrawablePtr pDraw,
-						   unsigned int attachment,
-						   unsigned int format);
-typedef void		(*DRI2DestroyBufferProcPtr)(DrawablePtr pDraw,
-						    DRI2BufferPtr buffer);
+typedef int (*DRI2ScheduleSwapProcPtr) (ClientPtr client,
+                                        DrawablePtr pDraw,
+                                        DRI2BufferPtr pDestBuffer,
+                                        DRI2BufferPtr pSrcBuffer,
+                                        CARD64 * target_msc,
+                                        CARD64 divisor,
+                                        CARD64 remainder,
+                                        DRI2SwapEventPtr func, void *data);
+typedef DRI2BufferPtr(*DRI2CreateBufferProcPtr) (DrawablePtr pDraw,
+                                                 unsigned int attachment,
+                                                 unsigned int format);
+typedef void (*DRI2DestroyBufferProcPtr) (DrawablePtr pDraw,
+                                          DRI2BufferPtr buffer);
 /**
  * Notifies driver when DRI2GetBuffers reuses a dri2 buffer.
  *
@@ -117,8 +113,8 @@ typedef void		(*DRI2DestroyBufferProcPtr)(DrawablePtr pDraw,
  * \param pDraw drawable whose count we want
  * \param buffer buffer that will be returned to client
  */
-typedef void		(*DRI2ReuseBufferNotifyProcPtr)(DrawablePtr pDraw,
-						      DRI2BufferPtr buffer);
+typedef void (*DRI2ReuseBufferNotifyProcPtr) (DrawablePtr pDraw,
+                                              DRI2BufferPtr buffer);
 /**
  * Get current media stamp counter values
  *
@@ -137,8 +133,8 @@ typedef void		(*DRI2ReuseBufferNotifyProcPtr)(DrawablePtr pDraw,
  * \param ust timestamp from when the count was last incremented.
  * \param mst current frame count
  */
-typedef int		(*DRI2GetMSCProcPtr)(DrawablePtr pDraw, CARD64 *ust,
-					     CARD64 *msc);
+typedef int (*DRI2GetMSCProcPtr) (DrawablePtr pDraw, CARD64 * ust,
+                                  CARD64 * msc);
 /**
  * Schedule a frame count related wait
  *
@@ -159,15 +155,12 @@ typedef int		(*DRI2GetMSCProcPtr)(DrawablePtr pDraw, CARD64 *ust,
  * \param divisor divisor for condition equation
  * \param remainder remainder for division equation
  */
-typedef int		(*DRI2ScheduleWaitMSCProcPtr)(ClientPtr client,
-						      DrawablePtr pDraw,
-						      CARD64 target_msc,
-						      CARD64 divisor,
-						      CARD64 remainder);
+typedef int (*DRI2ScheduleWaitMSCProcPtr) (ClientPtr client,
+                                           DrawablePtr pDraw,
+                                           CARD64 target_msc,
+                                           CARD64 divisor, CARD64 remainder);
 
-typedef void		(*DRI2InvalidateProcPtr)(DrawablePtr pDraw,
-						 void *data,
-						 XID id);
+typedef void (*DRI2InvalidateProcPtr) (DrawablePtr pDraw, void *data, XID id);
 
 /**
  * DRI2 calls this hook when ever swap_limit is going to be changed. Default
@@ -179,8 +172,8 @@ typedef void		(*DRI2InvalidateProcPtr)(DrawablePtr pDraw,
  * \param swap_limit new swap_limit that going to be set
  * \return TRUE if limit is support, FALSE if not.
  */
-typedef Bool		(*DRI2SwapLimitValidateProcPtr)(DrawablePtr pDraw,
-							int swap_limit);
+typedef Bool (*DRI2SwapLimitValidateProcPtr) (DrawablePtr pDraw,
+                                              int swap_limit);
 
 /**
  * Version of the DRI2InfoRec structure defined in this header
@@ -188,74 +181,71 @@ typedef Bool		(*DRI2SwapLimitValidateProcPtr)(DrawablePtr pDraw,
 #define DRI2INFOREC_VERSION 6
 
 typedef struct {
-    unsigned int version;	/**< Version of this struct */
+    unsigned int version;       /**< Version of this struct */
     int fd;
     const char *driverName;
     const char *deviceName;
 
-    DRI2CreateBufferProcPtr	CreateBuffer;
-    DRI2DestroyBufferProcPtr	DestroyBuffer;
-    DRI2CopyRegionProcPtr	CopyRegion;
-    DRI2WaitProcPtr		Wait;
+    DRI2CreateBufferProcPtr CreateBuffer;
+    DRI2DestroyBufferProcPtr DestroyBuffer;
+    DRI2CopyRegionProcPtr CopyRegion;
+    DRI2WaitProcPtr Wait;
 
     /* added in version 4 */
 
-    DRI2ScheduleSwapProcPtr	ScheduleSwap;
-    DRI2GetMSCProcPtr		GetMSC;
-    DRI2ScheduleWaitMSCProcPtr	ScheduleWaitMSC;
+    DRI2ScheduleSwapProcPtr ScheduleSwap;
+    DRI2GetMSCProcPtr GetMSC;
+    DRI2ScheduleWaitMSCProcPtr ScheduleWaitMSC;
 
     /* number of drivers in the driverNames array */
     unsigned int numDrivers;
     /* array of driver names, indexed by DRI2Driver* driver types */
     /* a name of NULL means that driver is not supported */
-    const char * const *driverNames;
+    const char *const *driverNames;
 
     /* added in version 5 */
 
-    DRI2AuthMagicProcPtr	AuthMagic;
+    DRI2AuthMagicProcPtr AuthMagic;
 
     /* added in version 6 */
 
     DRI2ReuseBufferNotifyProcPtr ReuseBufferNotify;
     DRI2SwapLimitValidateProcPtr SwapLimitValidate;
-}  DRI2InfoRec, *DRI2InfoPtr;
+} DRI2InfoRec, *DRI2InfoPtr;
 
 extern _X_EXPORT int DRI2EventBase;
 
-extern _X_EXPORT Bool DRI2ScreenInit(ScreenPtr	pScreen,
-		    DRI2InfoPtr info);
+extern _X_EXPORT Bool DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info);
 
 extern _X_EXPORT void DRI2CloseScreen(ScreenPtr pScreen);
 
 extern _X_EXPORT Bool DRI2HasSwapControl(ScreenPtr pScreen);
 
 extern _X_EXPORT Bool DRI2Connect(ScreenPtr pScreen,
-		 unsigned int driverType,
-		 int *fd,
-		 const char **driverName,
-		 const char **deviceName);
+                                  unsigned int driverType,
+                                  int *fd,
+                                  const char **driverName,
+                                  const char **deviceName);
 
 extern _X_EXPORT Bool DRI2Authenticate(ScreenPtr pScreen, uint32_t magic);
 
 extern _X_EXPORT int DRI2CreateDrawable(ClientPtr client,
-					DrawablePtr pDraw,
-					XID id,
-					DRI2InvalidateProcPtr invalidate,
-					void *priv);
+                                        DrawablePtr pDraw,
+                                        XID id,
+                                        DRI2InvalidateProcPtr invalidate,
+                                        void *priv);
 
 extern _X_EXPORT void DRI2DestroyDrawable(DrawablePtr pDraw);
 
 extern _X_EXPORT DRI2BufferPtr *DRI2GetBuffers(DrawablePtr pDraw,
-			     int *width,
-			     int *height,
-			     unsigned int *attachments,
-			     int count,
-			     int *out_count);
+                                               int *width,
+                                               int *height,
+                                               unsigned int *attachments,
+                                               int count, int *out_count);
 
 extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw,
-		   RegionPtr pRegion,
-		   unsigned int dest,
-		   unsigned int src);
+                                    RegionPtr pRegion,
+                                    unsigned int dest, unsigned int src);
 
 /**
  * Determine the major and minor version of the DRI2 extension.
@@ -276,26 +266,30 @@ extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw,
 extern _X_EXPORT void DRI2Version(int *major, int *minor);
 
 extern _X_EXPORT DRI2BufferPtr *DRI2GetBuffersWithFormat(DrawablePtr pDraw,
-	int *width, int *height, unsigned int *attachments, int count,
-	int *out_count);
+                                                         int *width,
+                                                         int *height,
+                                                         unsigned int
+                                                         *attachments,
+                                                         int count,
+                                                         int *out_count);
 
 extern _X_EXPORT void DRI2SwapInterval(DrawablePtr pDrawable, int interval);
 extern _X_EXPORT Bool DRI2SwapLimit(DrawablePtr pDraw, int swap_limit);
 extern _X_EXPORT int DRI2SwapBuffers(ClientPtr client, DrawablePtr pDrawable,
-				     CARD64 target_msc, CARD64 divisor,
-				     CARD64 remainder, CARD64 *swap_target,
-				     DRI2SwapEventPtr func, void *data);
+                                     CARD64 target_msc, CARD64 divisor,
+                                     CARD64 remainder, CARD64 * swap_target,
+                                     DRI2SwapEventPtr func, void *data);
 extern _X_EXPORT Bool DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable);
 
-extern _X_EXPORT int DRI2GetMSC(DrawablePtr pDrawable, CARD64 *ust,
-				CARD64 *msc, CARD64 *sbc);
+extern _X_EXPORT int DRI2GetMSC(DrawablePtr pDrawable, CARD64 * ust,
+                                CARD64 * msc, CARD64 * sbc);
 extern _X_EXPORT int DRI2WaitMSC(ClientPtr client, DrawablePtr pDrawable,
-				 CARD64 target_msc, CARD64 divisor,
-				 CARD64 remainder);
+                                 CARD64 target_msc, CARD64 divisor,
+                                 CARD64 remainder);
 extern _X_EXPORT int ProcDRI2WaitMSCReply(ClientPtr client, CARD64 ust,
-					  CARD64 msc, CARD64 sbc);
+                                          CARD64 msc, CARD64 sbc);
 extern _X_EXPORT int DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw,
-				 CARD64 target_sbc);
+                                 CARD64 target_sbc);
 extern _X_EXPORT Bool DRI2ThrottleClient(ClientPtr client, DrawablePtr pDraw);
 
 extern _X_EXPORT Bool DRI2CanFlip(DrawablePtr pDraw);
@@ -306,12 +300,12 @@ extern _X_EXPORT Bool DRI2CanExchange(DrawablePtr pDraw);
 extern _X_EXPORT void DRI2BlockClient(ClientPtr client, DrawablePtr pDraw);
 
 extern _X_EXPORT void DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw,
-				       int frame, unsigned int tv_sec,
-				       unsigned int tv_usec, int type,
-				       DRI2SwapEventPtr swap_complete,
-				       void *swap_data);
+                                       int frame, unsigned int tv_sec,
+                                       unsigned int tv_usec, int type,
+                                       DRI2SwapEventPtr swap_complete,
+                                       void *swap_data);
 extern _X_EXPORT void DRI2WaitMSCComplete(ClientPtr client, DrawablePtr pDraw,
-					  int frame, unsigned int tv_sec,
-					  unsigned int tv_usec);
+                                          int frame, unsigned int tv_sec,
+                                          unsigned int tv_usec);
 
 #endif
diff --git a/xorg-server/hw/xfree86/dri2/dri2ext.c b/xorg-server/hw/xfree86/dri2/dri2ext.c
index 73ef7f25e..2579a5c86 100644
--- a/xorg-server/hw/xfree86/dri2/dri2ext.c
+++ b/xorg-server/hw/xfree86/dri2/dri2ext.c
@@ -49,19 +49,19 @@
 /* The only xf86 include */
 #include "xf86Module.h"
 
-static ExtensionEntry	*dri2Extension;
+static ExtensionEntry *dri2Extension;
 extern Bool DRI2ModuleSetup(void);
 
 static Bool
 validDrawable(ClientPtr client, XID drawable, Mask access_mode,
-	      DrawablePtr *pDrawable, int *status)
+              DrawablePtr *pDrawable, int *status)
 {
     *status = dixLookupDrawable(pDrawable, drawable, client,
-				M_DRAWABLE_WINDOW | M_DRAWABLE_PIXMAP,
-				access_mode);
+                                M_DRAWABLE_WINDOW | M_DRAWABLE_PIXMAP,
+                                access_mode);
     if (*status != Success) {
-	client->errorValue = drawable;
-	return FALSE;
+        client->errorValue = drawable;
+        return FALSE;
     }
 
     return TRUE;
@@ -74,7 +74,7 @@ ProcDRI2QueryVersion(ClientPtr client)
     xDRI2QueryVersionReply rep;
 
     if (client->swapped)
-	swaps(&stuff->length);
+        swaps(&stuff->length);
 
     REQUEST_SIZE_MATCH(xDRI2QueryVersionReq);
     rep.type = X_Reply;
@@ -84,10 +84,10 @@ ProcDRI2QueryVersion(ClientPtr client)
     rep.minorVersion = dri2_minor;
 
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.majorVersion);
-	swapl(&rep.minorVersion);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.majorVersion);
+        swapl(&rep.minorVersion);
     }
 
     WriteToClient(client, sizeof(xDRI2QueryVersionReply), &rep);
@@ -107,9 +107,9 @@ ProcDRI2Connect(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xDRI2ConnectReq);
     if (!validDrawable(client, stuff->window, DixGetAttrAccess,
-		       &pDraw, &status))
-	return status;
-    
+                       &pDraw, &status))
+        return status;
+
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
@@ -117,13 +117,13 @@ ProcDRI2Connect(ClientPtr client)
     rep.deviceNameLength = 0;
 
     if (!DRI2Connect(pDraw->pScreen,
-		     stuff->driverType, &fd, &driverName, &deviceName))
-	goto fail;
+                     stuff->driverType, &fd, &driverName, &deviceName))
+        goto fail;
 
     rep.driverNameLength = strlen(driverName);
     rep.deviceNameLength = strlen(deviceName);
     rep.length = (rep.driverNameLength + 3) / 4 +
-	    (rep.deviceNameLength + 3) / 4;
+        (rep.deviceNameLength + 3) / 4;
 
  fail:
     WriteToClient(client, sizeof(xDRI2ConnectReply), &rep);
@@ -143,8 +143,8 @@ ProcDRI2Authenticate(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xDRI2AuthenticateReq);
     if (!validDrawable(client, stuff->window, DixGetAttrAccess,
-		       &pDraw, &status))
-	return status;
+                       &pDraw, &status))
+        return status;
 
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
@@ -164,7 +164,7 @@ DRI2InvalidateBuffersEvent(DrawablePtr pDraw, void *priv, XID id)
     event.type = DRI2EventBase + DRI2_InvalidateBuffers;
     event.drawable = id;
 
-    WriteEventsToClient(client, 1, (xEvent *)&event);
+    WriteEventsToClient(client, 1, (xEvent *) &event);
 }
 
 static int
@@ -177,13 +177,13 @@ ProcDRI2CreateDrawable(ClientPtr client)
     REQUEST_SIZE_MATCH(xDRI2CreateDrawableReq);
 
     if (!validDrawable(client, stuff->drawable, DixAddAccess,
-		       &pDrawable, &status))
-	return status;
+                       &pDrawable, &status))
+        return status;
 
     status = DRI2CreateDrawable(client, pDrawable, stuff->drawable,
-				DRI2InvalidateBuffersEvent, client);
+                                DRI2InvalidateBuffersEvent, client);
     if (status != Success)
-	return status;
+        return status;
 
     return Success;
 }
@@ -197,33 +197,32 @@ ProcDRI2DestroyDrawable(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xDRI2DestroyDrawableReq);
     if (!validDrawable(client, stuff->drawable, DixRemoveAccess,
-		       &pDrawable, &status))
-	return status;
+                       &pDrawable, &status))
+        return status;
 
     return Success;
 }
 
-
 static int
 send_buffers_reply(ClientPtr client, DrawablePtr pDrawable,
-		   DRI2BufferPtr *buffers, int count, int width, int height)
+                   DRI2BufferPtr * buffers, int count, int width, int height)
 {
     xDRI2GetBuffersReply rep;
     int skip = 0;
     int i;
 
     if (buffers == NULL)
-	    return BadAlloc;
+        return BadAlloc;
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
-	for (i = 0; i < count; i++) {
-	    /* Do not send the real front buffer of a window to the client.
-	     */
-	    if (buffers[i]->attachment == DRI2BufferFrontLeft) {
-		skip++;
-		continue;
-	    }
-	}
+        for (i = 0; i < count; i++) {
+            /* Do not send the real front buffer of a window to the client.
+             */
+            if (buffers[i]->attachment == DRI2BufferFrontLeft) {
+                skip++;
+                continue;
+            }
+        }
     }
 
     rep.type = X_Reply;
@@ -235,26 +234,25 @@ send_buffers_reply(ClientPtr client, DrawablePtr pDrawable,
     WriteToClient(client, sizeof(xDRI2GetBuffersReply), &rep);
 
     for (i = 0; i < count; i++) {
-	xDRI2Buffer buffer;
-
-	/* Do not send the real front buffer of a window to the client.
-	 */
-	if ((pDrawable->type == DRAWABLE_WINDOW)
-	    && (buffers[i]->attachment == DRI2BufferFrontLeft)) {
-	    continue;
-	}
-
-	buffer.attachment = buffers[i]->attachment;
-	buffer.name = buffers[i]->name;
-	buffer.pitch = buffers[i]->pitch;
-	buffer.cpp = buffers[i]->cpp;
-	buffer.flags = buffers[i]->flags;
-	WriteToClient(client, sizeof(xDRI2Buffer), &buffer);
+        xDRI2Buffer buffer;
+
+        /* Do not send the real front buffer of a window to the client.
+         */
+        if ((pDrawable->type == DRAWABLE_WINDOW)
+            && (buffers[i]->attachment == DRI2BufferFrontLeft)) {
+            continue;
+        }
+
+        buffer.attachment = buffers[i]->attachment;
+        buffer.name = buffers[i]->name;
+        buffer.pitch = buffers[i]->pitch;
+        buffer.cpp = buffers[i]->cpp;
+        buffer.flags = buffers[i]->flags;
+        WriteToClient(client, sizeof(xDRI2Buffer), &buffer);
     }
     return Success;
 }
 
-
 static int
 ProcDRI2GetBuffers(ClientPtr client)
 {
@@ -266,16 +264,15 @@ ProcDRI2GetBuffers(ClientPtr client)
 
     REQUEST_FIXED_SIZE(xDRI2GetBuffersReq, stuff->count * 4);
     if (!validDrawable(client, stuff->drawable, DixReadAccess | DixWriteAccess,
-		       &pDrawable, &status))
-	return status;
+                       &pDrawable, &status))
+        return status;
 
     if (DRI2ThrottleClient(client, pDrawable))
-	return Success;
+        return Success;
 
     attachments = (unsigned int *) &stuff[1];
     buffers = DRI2GetBuffers(pDrawable, &width, &height,
-			     attachments, stuff->count, &count);
-
+                             attachments, stuff->count, &count);
 
     return send_buffers_reply(client, pDrawable, buffers, count, width, height);
 
@@ -292,15 +289,15 @@ ProcDRI2GetBuffersWithFormat(ClientPtr client)
 
     REQUEST_FIXED_SIZE(xDRI2GetBuffersReq, stuff->count * (2 * 4));
     if (!validDrawable(client, stuff->drawable, DixReadAccess | DixWriteAccess,
-		       &pDrawable, &status))
-	return status;
+                       &pDrawable, &status))
+        return status;
 
     if (DRI2ThrottleClient(client, pDrawable))
-	return Success;
+        return Success;
 
     attachments = (unsigned int *) &stuff[1];
     buffers = DRI2GetBuffersWithFormat(pDrawable, &width, &height,
-				       attachments, stuff->count, &count);
+                                       attachments, stuff->count, &count);
 
     return send_buffers_reply(client, pDrawable, buffers, count, width, height);
 }
@@ -317,14 +314,14 @@ ProcDRI2CopyRegion(ClientPtr client)
     REQUEST_SIZE_MATCH(xDRI2CopyRegionReq);
 
     if (!validDrawable(client, stuff->drawable, DixWriteAccess,
-		       &pDrawable, &status))
-	return status;
+                       &pDrawable, &status))
+        return status;
 
     VERIFY_REGION(pRegion, stuff->region, client, DixReadAccess);
 
     status = DRI2CopyRegion(pDrawable, pRegion, stuff->dest, stuff->src);
     if (status != Success)
-	return status;
+        return status;
 
     /* CopyRegion needs to be a round trip to make sure the X server
      * queues the swap buffer rendering commands before the DRI client
@@ -343,7 +340,7 @@ ProcDRI2CopyRegion(ClientPtr client)
 }
 
 static void
-load_swap_reply(xDRI2SwapBuffersReply *rep, CARD64 sbc)
+load_swap_reply(xDRI2SwapBuffersReply * rep, CARD64 sbc)
 {
     rep->swap_hi = sbc >> 32;
     rep->swap_lo = sbc & 0xffffffff;
@@ -352,12 +349,12 @@ load_swap_reply(xDRI2SwapBuffersReply *rep, CARD64 sbc)
 static CARD64
 vals_to_card64(CARD32 lo, CARD32 hi)
 {
-    return (CARD64)hi << 32 | lo;
+    return (CARD64) hi << 32 | lo;
 }
 
 static void
 DRI2SwapEvent(ClientPtr client, void *data, int type, CARD64 ust, CARD64 msc,
-	      CARD32 sbc)
+              CARD32 sbc)
 {
     xDRI2BufferSwapComplete2 event;
     DrawablePtr pDrawable = data;
@@ -365,13 +362,13 @@ DRI2SwapEvent(ClientPtr client, void *data, int type, CARD64 ust, CARD64 msc,
     event.type = DRI2EventBase + DRI2_BufferSwapComplete;
     event.event_type = type;
     event.drawable = pDrawable->id;
-    event.ust_hi = (CARD64)ust >> 32;
+    event.ust_hi = (CARD64) ust >> 32;
     event.ust_lo = ust & 0xffffffff;
-    event.msc_hi = (CARD64)msc >> 32;
+    event.msc_hi = (CARD64) msc >> 32;
     event.msc_lo = msc & 0xffffffff;
     event.sbc = sbc;
 
-    WriteEventsToClient(client, 1, (xEvent *)&event);
+    WriteEventsToClient(client, 1, (xEvent *) &event);
 }
 
 static int
@@ -386,24 +383,24 @@ ProcDRI2SwapBuffers(ClientPtr client)
     REQUEST_SIZE_MATCH(xDRI2SwapBuffersReq);
 
     if (!validDrawable(client, stuff->drawable,
-		       DixReadAccess | DixWriteAccess, &pDrawable, &status))
-	return status;
+                       DixReadAccess | DixWriteAccess, &pDrawable, &status))
+        return status;
 
     /*
      * Ensures an out of control client can't exhaust our swap queue, and
      * also orders swaps.
      */
     if (DRI2ThrottleClient(client, pDrawable))
-	return Success;
+        return Success;
 
     target_msc = vals_to_card64(stuff->target_msc_lo, stuff->target_msc_hi);
     divisor = vals_to_card64(stuff->divisor_lo, stuff->divisor_hi);
     remainder = vals_to_card64(stuff->remainder_lo, stuff->remainder_hi);
 
     status = DRI2SwapBuffers(client, pDrawable, target_msc, divisor, remainder,
-			     &swap_target, DRI2SwapEvent, pDrawable);
+                             &swap_target, DRI2SwapEvent, pDrawable);
     if (status != Success)
-	return BadDrawable;
+        return BadDrawable;
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -416,7 +413,7 @@ ProcDRI2SwapBuffers(ClientPtr client)
 }
 
 static void
-load_msc_reply(xDRI2MSCReply *rep, CARD64 ust, CARD64 msc, CARD64 sbc)
+load_msc_reply(xDRI2MSCReply * rep, CARD64 ust, CARD64 msc, CARD64 sbc)
 {
     rep->ust_hi = ust >> 32;
     rep->ust_lo = ust & 0xffffffff;
@@ -438,12 +435,12 @@ ProcDRI2GetMSC(ClientPtr client)
     REQUEST_SIZE_MATCH(xDRI2GetMSCReq);
 
     if (!validDrawable(client, stuff->drawable, DixReadAccess, &pDrawable,
-		       &status))
-	return status;
+                       &status))
+        return status;
 
     status = DRI2GetMSC(pDrawable, &ust, &msc, &sbc);
     if (status != Success)
-	return status;
+        return status;
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -468,8 +465,8 @@ ProcDRI2WaitMSC(ClientPtr client)
     REQUEST_SIZE_MATCH(xDRI2WaitMSCReq);
 
     if (!validDrawable(client, stuff->drawable, DixReadAccess, &pDrawable,
-		       &status))
-	return status;
+                       &status))
+        return status;
 
     target = vals_to_card64(stuff->target_msc_lo, stuff->target_msc_hi);
     divisor = vals_to_card64(stuff->divisor_lo, stuff->divisor_hi);
@@ -477,7 +474,7 @@ ProcDRI2WaitMSC(ClientPtr client)
 
     status = DRI2WaitMSC(client, pDrawable, target, divisor, remainder);
     if (status != Success)
-	return status;
+        return status;
 
     return Success;
 }
@@ -509,8 +506,8 @@ ProcDRI2SwapInterval(ClientPtr client)
     REQUEST_SIZE_MATCH(xDRI2SwapIntervalReq);
 
     if (!validDrawable(client, stuff->drawable, DixReadAccess | DixWriteAccess,
-		       &pDrawable, &status))
-	return status;
+                       &pDrawable, &status))
+        return status;
 
     DRI2SwapInterval(pDrawable, stuff->interval);
 
@@ -528,8 +525,8 @@ ProcDRI2WaitSBC(ClientPtr client)
     REQUEST_SIZE_MATCH(xDRI2WaitSBCReq);
 
     if (!validDrawable(client, stuff->drawable, DixReadAccess, &pDrawable,
-		       &status))
-	return status;
+                       &status))
+        return status;
 
     target = vals_to_card64(stuff->target_sbc_lo, stuff->target_sbc_hi);
     status = DRI2WaitSBC(client, pDrawable, target);
@@ -538,45 +535,45 @@ ProcDRI2WaitSBC(ClientPtr client)
 }
 
 static int
-ProcDRI2Dispatch (ClientPtr client)
+ProcDRI2Dispatch(ClientPtr client)
 {
     REQUEST(xReq);
-    
+
     switch (stuff->data) {
     case X_DRI2QueryVersion:
-	return ProcDRI2QueryVersion(client);
+        return ProcDRI2QueryVersion(client);
     }
 
     if (!LocalClient(client))
-	return BadRequest;
+        return BadRequest;
 
     switch (stuff->data) {
     case X_DRI2Connect:
-	return ProcDRI2Connect(client);
+        return ProcDRI2Connect(client);
     case X_DRI2Authenticate:
-	return ProcDRI2Authenticate(client);
+        return ProcDRI2Authenticate(client);
     case X_DRI2CreateDrawable:
-	return ProcDRI2CreateDrawable(client);
+        return ProcDRI2CreateDrawable(client);
     case X_DRI2DestroyDrawable:
-	return ProcDRI2DestroyDrawable(client);
+        return ProcDRI2DestroyDrawable(client);
     case X_DRI2GetBuffers:
-	return ProcDRI2GetBuffers(client);
+        return ProcDRI2GetBuffers(client);
     case X_DRI2CopyRegion:
-	return ProcDRI2CopyRegion(client);
+        return ProcDRI2CopyRegion(client);
     case X_DRI2GetBuffersWithFormat:
-	return ProcDRI2GetBuffersWithFormat(client);
+        return ProcDRI2GetBuffersWithFormat(client);
     case X_DRI2SwapBuffers:
-	return ProcDRI2SwapBuffers(client);
+        return ProcDRI2SwapBuffers(client);
     case X_DRI2GetMSC:
-	return ProcDRI2GetMSC(client);
+        return ProcDRI2GetMSC(client);
     case X_DRI2WaitMSC:
-	return ProcDRI2WaitMSC(client);
+        return ProcDRI2WaitMSC(client);
     case X_DRI2WaitSBC:
-	return ProcDRI2WaitSBC(client);
+        return ProcDRI2WaitSBC(client);
     case X_DRI2SwapInterval:
-	return ProcDRI2SwapInterval(client);
+        return ProcDRI2SwapInterval(client);
     default:
-	return BadRequest;
+        return BadRequest;
     }
 }
 
@@ -590,7 +587,7 @@ SProcDRI2Connect(ClientPtr client)
 
     swaps(&stuff->length);
     if (sizeof(*stuff) / 4 != client->req_len)
-	return BadLength;
+        return BadLength;
 
     rep.sequenceNumber = client->sequence;
     swaps(&rep.sequenceNumber);
@@ -602,7 +599,7 @@ SProcDRI2Connect(ClientPtr client)
 }
 
 static int
-SProcDRI2Dispatch (ClientPtr client)
+SProcDRI2Dispatch(ClientPtr client)
 {
     REQUEST(xReq);
 
@@ -610,14 +607,13 @@ SProcDRI2Dispatch (ClientPtr client)
      * Only local clients are allowed DRI access, but remote clients
      * still need these requests to find out cleanly.
      */
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_DRI2QueryVersion:
-	return ProcDRI2QueryVersion(client);
+        return ProcDRI2QueryVersion(client);
     case X_DRI2Connect:
-	return SProcDRI2Connect(client);
+        return SProcDRI2Connect(client);
     default:
-	return BadRequest;
+        return BadRequest;
     }
 }
 
@@ -627,12 +623,10 @@ static void
 DRI2ExtensionInit(void)
 {
     dri2Extension = AddExtension(DRI2_NAME,
-				 DRI2NumberEvents,
-				 DRI2NumberErrors,
-				 ProcDRI2Dispatch,
-				 SProcDRI2Dispatch,
-				 NULL,
-				 StandardMinorOpcode);
+                                 DRI2NumberEvents,
+                                 DRI2NumberErrors,
+                                 ProcDRI2Dispatch,
+                                 SProcDRI2Dispatch, NULL, StandardMinorOpcode);
 
     DRI2EventBase = dri2Extension->eventBase;
 
diff --git a/xorg-server/hw/xfree86/exa/examodule.c b/xorg-server/hw/xfree86/exa/examodule.c
index 15560513d..72cf7988d 100644
--- a/xorg-server/hw/xfree86/exa/examodule.c
+++ b/xorg-server/hw/xfree86/exa/examodule.c
@@ -37,12 +37,13 @@
 #include "xf86.h"
 
 typedef struct _ExaXorgScreenPrivRec {
-    CloseScreenProcPtr 		 SavedCloseScreen;
+    CloseScreenProcPtr SavedCloseScreen;
     EnableDisableFBAccessProcPtr SavedEnableDisableFBAccess;
-    OptionInfoPtr		 options;
+    OptionInfoPtr options;
 } ExaXorgScreenPrivRec, *ExaXorgScreenPrivPtr;
 
 static DevPrivateKeyRec exaXorgScreenPrivateKeyRec;
+
 #define exaXorgScreenPrivateKey (&exaXorgScreenPrivateKeyRec)
 
 typedef enum {
@@ -54,26 +55,26 @@ typedef enum {
 } EXAOpts;
 
 static const OptionInfoRec EXAOptions[] = {
-    { EXAOPT_MIGRATION_HEURISTIC,	"MigrationHeuristic",
-				OPTV_ANYSTR,	{0}, FALSE },
-    { EXAOPT_NO_COMPOSITE,		"EXANoComposite",
-				OPTV_BOOLEAN,	{0}, FALSE },
-    { EXAOPT_NO_UTS,			"EXANoUploadToScreen",
-				OPTV_BOOLEAN,	{0}, FALSE },
-    { EXAOPT_NO_DFS,			"EXANoDownloadFromScreen",
-				OPTV_BOOLEAN,	{0}, FALSE },
-    { EXAOPT_OPTIMIZE_MIGRATION,	"EXAOptimizeMigration",
-				OPTV_BOOLEAN,	{0}, FALSE },
-    { -1,				NULL,
-				OPTV_NONE,	{0}, FALSE }
+    {EXAOPT_MIGRATION_HEURISTIC, "MigrationHeuristic",
+     OPTV_ANYSTR, {0}, FALSE},
+    {EXAOPT_NO_COMPOSITE, "EXANoComposite",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {EXAOPT_NO_UTS, "EXANoUploadToScreen",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {EXAOPT_NO_DFS, "EXANoDownloadFromScreen",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {EXAOPT_OPTIMIZE_MIGRATION, "EXAOptimizeMigration",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {-1, NULL,
+     OPTV_NONE, {0}, FALSE}
 };
 
 static Bool
-exaXorgCloseScreen (int i, ScreenPtr pScreen)
+exaXorgCloseScreen(int i, ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
     ExaXorgScreenPrivPtr pScreenPriv = (ExaXorgScreenPrivPtr)
-	dixLookupPrivate(&pScreen->devPrivates, exaXorgScreenPrivateKey);
+        dixLookupPrivate(&pScreen->devPrivates, exaXorgScreenPrivateKey);
 
     pScreen->CloseScreen = pScreenPriv->SavedCloseScreen;
 
@@ -82,24 +83,24 @@ exaXorgCloseScreen (int i, ScreenPtr pScreen)
     free(pScreenPriv->options);
     free(pScreenPriv);
 
-    return pScreen->CloseScreen (i, pScreen);
+    return pScreen->CloseScreen(i, pScreen);
 }
 
 static void
-exaXorgEnableDisableFBAccess (int index, Bool enable)
+exaXorgEnableDisableFBAccess(int index, Bool enable)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
     ExaXorgScreenPrivPtr pScreenPriv = (ExaXorgScreenPrivPtr)
-	dixLookupPrivate(&pScreen->devPrivates, exaXorgScreenPrivateKey);
+        dixLookupPrivate(&pScreen->devPrivates, exaXorgScreenPrivateKey);
 
     if (!enable)
-	exaEnableDisableFBAccess (index, enable);
+        exaEnableDisableFBAccess(index, enable);
 
     if (pScreenPriv->SavedEnableDisableFBAccess)
-       pScreenPriv->SavedEnableDisableFBAccess (index, enable);
+        pScreenPriv->SavedEnableDisableFBAccess(index, enable);
 
     if (enable)
-	exaEnableDisableFBAccess (index, enable);
+        exaEnableDisableFBAccess(index, enable);
 }
 
 /**
@@ -115,87 +116,83 @@ exaDDXDriverInit(ScreenPtr pScreen)
     ExaXorgScreenPrivPtr pScreenPriv;
 
     if (!dixRegisterPrivateKey(&exaXorgScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
-	return;
+        return;
 
     pScreenPriv = calloc(1, sizeof(ExaXorgScreenPrivRec));
     if (pScreenPriv == NULL)
-	return;
+        return;
 
-    pScreenPriv->options = xnfalloc (sizeof(EXAOptions));
+    pScreenPriv->options = xnfalloc(sizeof(EXAOptions));
     memcpy(pScreenPriv->options, EXAOptions, sizeof(EXAOptions));
-    xf86ProcessOptions (pScrn->scrnIndex, pScrn->options, pScreenPriv->options);
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pScreenPriv->options);
 
     if (pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) {
-	if (!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS) &&
-	    pExaScr->info->offScreenBase < pExaScr->info->memorySize) {
-	    char *heuristicName;
-
-	    heuristicName = xf86GetOptValString (pScreenPriv->options,
-						 EXAOPT_MIGRATION_HEURISTIC);
-	    if (heuristicName != NULL) {
-		if (strcmp(heuristicName, "greedy") == 0)
-		    pExaScr->migration = ExaMigrationGreedy;
-		else if (strcmp(heuristicName, "always") == 0)
-		    pExaScr->migration = ExaMigrationAlways;
-		else if (strcmp(heuristicName, "smart") == 0)
-		    pExaScr->migration = ExaMigrationSmart;
-		else {
-		    xf86DrvMsg (pScreen->myNum, X_WARNING, 
-				"EXA: unknown migration heuristic %s\n",
-				heuristicName);
-		}
-	    }
-	}
-
-	pExaScr->optimize_migration =
-	    xf86ReturnOptValBool(pScreenPriv->options,
-				 EXAOPT_OPTIMIZE_MIGRATION,
-				 TRUE);
+        if (!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS) &&
+            pExaScr->info->offScreenBase < pExaScr->info->memorySize) {
+            char *heuristicName;
+
+            heuristicName = xf86GetOptValString(pScreenPriv->options,
+                                                EXAOPT_MIGRATION_HEURISTIC);
+            if (heuristicName != NULL) {
+                if (strcmp(heuristicName, "greedy") == 0)
+                    pExaScr->migration = ExaMigrationGreedy;
+                else if (strcmp(heuristicName, "always") == 0)
+                    pExaScr->migration = ExaMigrationAlways;
+                else if (strcmp(heuristicName, "smart") == 0)
+                    pExaScr->migration = ExaMigrationSmart;
+                else {
+                    xf86DrvMsg(pScreen->myNum, X_WARNING,
+                               "EXA: unknown migration heuristic %s\n",
+                               heuristicName);
+                }
+            }
+        }
+
+        pExaScr->optimize_migration =
+            xf86ReturnOptValBool(pScreenPriv->options,
+                                 EXAOPT_OPTIMIZE_MIGRATION, TRUE);
     }
 
-    if (xf86ReturnOptValBool(pScreenPriv->options,
-                             EXAOPT_NO_COMPOSITE, FALSE)) {
-	xf86DrvMsg(pScreen->myNum, X_CONFIG,
-		   "EXA: Disabling Composite operation "
-		   "(RENDER acceleration)\n");
-	pExaScr->info->CheckComposite = NULL;
-	pExaScr->info->PrepareComposite = NULL;
+    if (xf86ReturnOptValBool(pScreenPriv->options, EXAOPT_NO_COMPOSITE, FALSE)) {
+        xf86DrvMsg(pScreen->myNum, X_CONFIG,
+                   "EXA: Disabling Composite operation "
+                   "(RENDER acceleration)\n");
+        pExaScr->info->CheckComposite = NULL;
+        pExaScr->info->PrepareComposite = NULL;
     }
 
     if (xf86ReturnOptValBool(pScreenPriv->options, EXAOPT_NO_UTS, FALSE)) {
-	xf86DrvMsg(pScreen->myNum, X_CONFIG,
-		   "EXA: Disabling UploadToScreen\n");
-	pExaScr->info->UploadToScreen = NULL;
+        xf86DrvMsg(pScreen->myNum, X_CONFIG, "EXA: Disabling UploadToScreen\n");
+        pExaScr->info->UploadToScreen = NULL;
     }
 
     if (xf86ReturnOptValBool(pScreenPriv->options, EXAOPT_NO_DFS, FALSE)) {
-	xf86DrvMsg(pScreen->myNum, X_CONFIG,
-		   "EXA: Disabling DownloadFromScreen\n");
-	pExaScr->info->DownloadFromScreen = NULL;
+        xf86DrvMsg(pScreen->myNum, X_CONFIG,
+                   "EXA: Disabling DownloadFromScreen\n");
+        pExaScr->info->DownloadFromScreen = NULL;
     }
 
     dixSetPrivate(&pScreen->devPrivates, exaXorgScreenPrivateKey, pScreenPriv);
 
     pScreenPriv->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
     pScrn->EnableDisableFBAccess = exaXorgEnableDisableFBAccess;
-    
+
     pScreenPriv->SavedCloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = exaXorgCloseScreen;
-    
+
 }
 
-static XF86ModuleVersionInfo exaVersRec =
-{
-	"exa",
-	MODULEVENDORSTRING,
-	MODINFOSTRING1,
-	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
-	EXA_VERSION_MAJOR, EXA_VERSION_MINOR, EXA_VERSION_RELEASE,
-	ABI_CLASS_VIDEODRV,		/* requires the video driver ABI */
-	ABI_VIDEODRV_VERSION,
-	MOD_CLASS_NONE,
-	{0,0,0,0}
+static XF86ModuleVersionInfo exaVersRec = {
+    "exa",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    EXA_VERSION_MAJOR, EXA_VERSION_MINOR, EXA_VERSION_RELEASE,
+    ABI_CLASS_VIDEODRV,         /* requires the video driver ABI */
+    ABI_VIDEODRV_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
 };
 
 _X_EXPORT XF86ModuleData exaModuleData = { &exaVersRec, NULL, NULL };
diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c
index 309fa654a..2881d7ec2 100644
--- a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c
@@ -20,18 +20,17 @@
 
 #define PAGE_MASK               (~(getpagesize() - 1))
 
-static XF86ModuleVersionInfo fbdevHWVersRec =
-{
-	"fbdevhw",
-	MODULEVENDORSTRING,
-	MODINFOSTRING1,
-	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
-	0, 0, 2,
-	ABI_CLASS_VIDEODRV,
-	ABI_VIDEODRV_VERSION,
-	MOD_CLASS_NONE,
-	{0,0,0,0}
+static XF86ModuleVersionInfo fbdevHWVersRec = {
+    "fbdevhw",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    0, 0, 2,
+    ABI_CLASS_VIDEODRV,
+    ABI_VIDEODRV_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
 };
 
 _X_EXPORT XF86ModuleData fbdevhwModuleData = {
@@ -57,49 +56,49 @@ _X_EXPORT XF86ModuleData fbdevhwModuleData = {
 static int fbdevHWPrivateIndex = -1;
 
 typedef struct {
-	/* framebuffer device: filename (/dev/fb*), handle, more */
-	char*				device;
-	int				fd;
-	void*				fbmem;
-	unsigned int			fbmem_len;
-	unsigned int			fboff;
-	char*				mmio;
-	unsigned int			mmio_len;
+    /* framebuffer device: filename (/dev/fb*), handle, more */
+    char *device;
+    int fd;
+    void *fbmem;
+    unsigned int fbmem_len;
+    unsigned int fboff;
+    char *mmio;
+    unsigned int mmio_len;
 
-	/* current hardware state */
-	struct fb_fix_screeninfo	fix;
-	struct fb_var_screeninfo	var;
+    /* current hardware state */
+    struct fb_fix_screeninfo fix;
+    struct fb_var_screeninfo var;
 
-	/* saved video mode */
-	struct fb_var_screeninfo	saved_var;
+    /* saved video mode */
+    struct fb_var_screeninfo saved_var;
 
-	/* buildin video mode */
-	DisplayModeRec			buildin;
+    /* buildin video mode */
+    DisplayModeRec buildin;
 
 } fbdevHWRec, *fbdevHWPtr;
 
 Bool
 fbdevHWGetRec(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr;
-	
-	if (fbdevHWPrivateIndex < 0)
-		fbdevHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
+    fbdevHWPtr fPtr;
+
+    if (fbdevHWPrivateIndex < 0)
+        fbdevHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
+
+    if (FBDEVHWPTR(pScrn) != NULL)
+        return TRUE;
 
-	if (FBDEVHWPTR(pScrn) != NULL)
-		return TRUE;
-	
-	fPtr = FBDEVHWPTRLVAL(pScrn) = xnfcalloc(sizeof(fbdevHWRec), 1);
-	return TRUE;
+    fPtr = FBDEVHWPTRLVAL(pScrn) = xnfcalloc(sizeof(fbdevHWRec), 1);
+    return TRUE;
 }
 
 void
 fbdevHWFreeRec(ScrnInfoPtr pScrn)
 {
-	if (fbdevHWPrivateIndex < 0)
-		return;
-	free(FBDEVHWPTR(pScrn));
-	FBDEVHWPTRLVAL(pScrn) = NULL;
+    if (fbdevHWPrivateIndex < 0)
+        return;
+    free(FBDEVHWPTR(pScrn));
+    FBDEVHWPTRLVAL(pScrn) = NULL;
 }
 
 int
@@ -120,21 +119,21 @@ fbdevHWGetFD(ScrnInfoPtr pScrn)
 static void
 print_fbdev_mode(char *txt, struct fb_var_screeninfo *var)
 {
-	ErrorF( "fbdev %s mode:\t%d   %d %d %d %d   %d %d %d %d   %d %d:%d:%d\n",
-		txt,var->pixclock,
-		var->xres, var->right_margin, var->hsync_len, var->left_margin,
-		var->yres, var->lower_margin, var->vsync_len, var->upper_margin,
-		var->bits_per_pixel,
-		var->red.length, var->green.length, var->blue.length);
+    ErrorF("fbdev %s mode:\t%d   %d %d %d %d   %d %d %d %d   %d %d:%d:%d\n",
+           txt, var->pixclock,
+           var->xres, var->right_margin, var->hsync_len, var->left_margin,
+           var->yres, var->lower_margin, var->vsync_len, var->upper_margin,
+           var->bits_per_pixel,
+           var->red.length, var->green.length, var->blue.length);
 }
 
 static void
 print_xfree_mode(char *txt, DisplayModePtr mode)
 {
-	ErrorF( "xfree %s mode:\t%d   %d %d %d %d   %d %d %d %d\n",
-		txt,mode->Clock,
-		mode->HDisplay, mode->HSyncStart, mode->HSyncEnd, mode->HTotal,
-		mode->VDisplay, mode->VSyncStart, mode->VSyncEnd, mode->VTotal);
+    ErrorF("xfree %s mode:\t%d   %d %d %d %d   %d %d %d %d\n",
+           txt, mode->Clock,
+           mode->HDisplay, mode->HSyncStart, mode->HSyncEnd, mode->HTotal,
+           mode->VDisplay, mode->VSyncStart, mode->VSyncEnd, mode->VTotal);
 }
 #endif
 
@@ -144,111 +143,111 @@ print_xfree_mode(char *txt, DisplayModePtr mode)
 static void
 xfree2fbdev_fblayout(ScrnInfoPtr pScrn, struct fb_var_screeninfo *var)
 {
-	var->xres_virtual   = pScrn->displayWidth ? pScrn->displayWidth :
-			      pScrn->virtualX;
-	var->yres_virtual   = pScrn->virtualY;
-	var->bits_per_pixel = pScrn->bitsPerPixel;
-	if (pScrn->defaultVisual == TrueColor ||
-	    pScrn->defaultVisual == DirectColor) {
-	    var->red.length     = pScrn->weight.red;
-	    var->green.length   = pScrn->weight.green;
-	    var->blue.length    = pScrn->weight.blue;
-	} else {
-	    var->red.length     = 8;
-	    var->green.length   = 8;
-	    var->blue.length    = 8;
-	}
+    var->xres_virtual = pScrn->displayWidth ? pScrn->displayWidth :
+        pScrn->virtualX;
+    var->yres_virtual = pScrn->virtualY;
+    var->bits_per_pixel = pScrn->bitsPerPixel;
+    if (pScrn->defaultVisual == TrueColor ||
+        pScrn->defaultVisual == DirectColor) {
+        var->red.length = pScrn->weight.red;
+        var->green.length = pScrn->weight.green;
+        var->blue.length = pScrn->weight.blue;
+    }
+    else {
+        var->red.length = 8;
+        var->green.length = 8;
+        var->blue.length = 8;
+    }
 }
 
 static void
 xfree2fbdev_timing(DisplayModePtr mode, struct fb_var_screeninfo *var)
 {
-	var->xres = mode->HDisplay;
-	var->yres = mode->VDisplay;
-	if (var->xres_virtual < var->xres)
-		var->xres_virtual = var->xres;
-	if (var->yres_virtual < var->yres)
-		var->yres_virtual = var->yres;
-	var->xoffset = var->yoffset = 0;
-	var->pixclock = mode->Clock ? 1000000000/mode->Clock : 0;
-	var->right_margin = mode->HSyncStart-mode->HDisplay;
-	var->hsync_len = mode->HSyncEnd-mode->HSyncStart;
-	var->left_margin = mode->HTotal-mode->HSyncEnd;
-	var->lower_margin = mode->VSyncStart-mode->VDisplay;
-	var->vsync_len = mode->VSyncEnd-mode->VSyncStart;
-	var->upper_margin = mode->VTotal-mode->VSyncEnd;
-	var->sync = 0;
-	if (mode->Flags & V_PHSYNC)
-		var->sync |= FB_SYNC_HOR_HIGH_ACT;
-	if (mode->Flags & V_PVSYNC)
-		var->sync |= FB_SYNC_VERT_HIGH_ACT;
-	if (mode->Flags & V_PCSYNC)
-		var->sync |= FB_SYNC_COMP_HIGH_ACT;
-	if (mode->Flags & V_BCAST)
-		var->sync |= FB_SYNC_BROADCAST;
-	if (mode->Flags & V_INTERLACE)
-		var->vmode = FB_VMODE_INTERLACED;
-	else if (mode->Flags & V_DBLSCAN)
-		var->vmode = FB_VMODE_DOUBLE;
-	else
-		var->vmode = FB_VMODE_NONINTERLACED;
+    var->xres = mode->HDisplay;
+    var->yres = mode->VDisplay;
+    if (var->xres_virtual < var->xres)
+        var->xres_virtual = var->xres;
+    if (var->yres_virtual < var->yres)
+        var->yres_virtual = var->yres;
+    var->xoffset = var->yoffset = 0;
+    var->pixclock = mode->Clock ? 1000000000 / mode->Clock : 0;
+    var->right_margin = mode->HSyncStart - mode->HDisplay;
+    var->hsync_len = mode->HSyncEnd - mode->HSyncStart;
+    var->left_margin = mode->HTotal - mode->HSyncEnd;
+    var->lower_margin = mode->VSyncStart - mode->VDisplay;
+    var->vsync_len = mode->VSyncEnd - mode->VSyncStart;
+    var->upper_margin = mode->VTotal - mode->VSyncEnd;
+    var->sync = 0;
+    if (mode->Flags & V_PHSYNC)
+        var->sync |= FB_SYNC_HOR_HIGH_ACT;
+    if (mode->Flags & V_PVSYNC)
+        var->sync |= FB_SYNC_VERT_HIGH_ACT;
+    if (mode->Flags & V_PCSYNC)
+        var->sync |= FB_SYNC_COMP_HIGH_ACT;
+    if (mode->Flags & V_BCAST)
+        var->sync |= FB_SYNC_BROADCAST;
+    if (mode->Flags & V_INTERLACE)
+        var->vmode = FB_VMODE_INTERLACED;
+    else if (mode->Flags & V_DBLSCAN)
+        var->vmode = FB_VMODE_DOUBLE;
+    else
+        var->vmode = FB_VMODE_NONINTERLACED;
 }
 
 static Bool
 fbdev_modes_equal(struct fb_var_screeninfo *set, struct fb_var_screeninfo *req)
 {
-	return (set->xres_virtual >= req->xres_virtual &&
-		set->yres_virtual >= req->yres_virtual &&
-		set->bits_per_pixel == req->bits_per_pixel &&
-		set->red.length == req->red.length &&
-		set->green.length == req->green.length &&
-		set->blue.length == req->blue.length &&
-		set->xres == req->xres && set->yres == req->yres &&
-		set->right_margin == req->right_margin &&
-		set->hsync_len == req->hsync_len &&
-		set->left_margin == req->left_margin &&
-		set->lower_margin == req->lower_margin &&
-		set->vsync_len == req->vsync_len &&
-		set->upper_margin == req->upper_margin &&
-		set->sync == req->sync && set->vmode == req->vmode);
+    return (set->xres_virtual >= req->xres_virtual &&
+            set->yres_virtual >= req->yres_virtual &&
+            set->bits_per_pixel == req->bits_per_pixel &&
+            set->red.length == req->red.length &&
+            set->green.length == req->green.length &&
+            set->blue.length == req->blue.length &&
+            set->xres == req->xres && set->yres == req->yres &&
+            set->right_margin == req->right_margin &&
+            set->hsync_len == req->hsync_len &&
+            set->left_margin == req->left_margin &&
+            set->lower_margin == req->lower_margin &&
+            set->vsync_len == req->vsync_len &&
+            set->upper_margin == req->upper_margin &&
+            set->sync == req->sync && set->vmode == req->vmode);
 }
 
 static void
 fbdev2xfree_timing(struct fb_var_screeninfo *var, DisplayModePtr mode)
 {
-	mode->Clock = var->pixclock ? 1000000000/var->pixclock : 0;
-	mode->HDisplay = var->xres;
-	mode->HSyncStart = mode->HDisplay+var->right_margin;
-	mode->HSyncEnd = mode->HSyncStart+var->hsync_len;
-	mode->HTotal = mode->HSyncEnd+var->left_margin;
-	mode->VDisplay = var->yres;
-	mode->VSyncStart = mode->VDisplay+var->lower_margin;
-	mode->VSyncEnd = mode->VSyncStart+var->vsync_len;
-	mode->VTotal = mode->VSyncEnd+var->upper_margin;
-	mode->Flags = 0;
-	mode->Flags |= var->sync & FB_SYNC_HOR_HIGH_ACT ? V_PHSYNC : V_NHSYNC;
-	mode->Flags |= var->sync & FB_SYNC_VERT_HIGH_ACT ? V_PVSYNC : V_NVSYNC;
-	mode->Flags |= var->sync & FB_SYNC_COMP_HIGH_ACT ? V_PCSYNC : V_NCSYNC;
-	if (var->sync & FB_SYNC_BROADCAST)
-		mode->Flags |= V_BCAST;
-	if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED)
-		mode->Flags |= V_INTERLACE;
-	else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE)
-		mode->Flags |= V_DBLSCAN;
-	mode->SynthClock = mode->Clock;
-	mode->CrtcHDisplay = mode->HDisplay;
-	mode->CrtcHSyncStart = mode->HSyncStart;
-	mode->CrtcHSyncEnd = mode->HSyncEnd;
-	mode->CrtcHTotal = mode->HTotal;
-	mode->CrtcVDisplay = mode->VDisplay;
-	mode->CrtcVSyncStart = mode->VSyncStart;
-	mode->CrtcVSyncEnd = mode->VSyncEnd;
-	mode->CrtcVTotal = mode->VTotal;
-	mode->CrtcHAdjusted = FALSE;
-	mode->CrtcVAdjusted = FALSE;
+    mode->Clock = var->pixclock ? 1000000000 / var->pixclock : 0;
+    mode->HDisplay = var->xres;
+    mode->HSyncStart = mode->HDisplay + var->right_margin;
+    mode->HSyncEnd = mode->HSyncStart + var->hsync_len;
+    mode->HTotal = mode->HSyncEnd + var->left_margin;
+    mode->VDisplay = var->yres;
+    mode->VSyncStart = mode->VDisplay + var->lower_margin;
+    mode->VSyncEnd = mode->VSyncStart + var->vsync_len;
+    mode->VTotal = mode->VSyncEnd + var->upper_margin;
+    mode->Flags = 0;
+    mode->Flags |= var->sync & FB_SYNC_HOR_HIGH_ACT ? V_PHSYNC : V_NHSYNC;
+    mode->Flags |= var->sync & FB_SYNC_VERT_HIGH_ACT ? V_PVSYNC : V_NVSYNC;
+    mode->Flags |= var->sync & FB_SYNC_COMP_HIGH_ACT ? V_PCSYNC : V_NCSYNC;
+    if (var->sync & FB_SYNC_BROADCAST)
+        mode->Flags |= V_BCAST;
+    if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED)
+        mode->Flags |= V_INTERLACE;
+    else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE)
+        mode->Flags |= V_DBLSCAN;
+    mode->SynthClock = mode->Clock;
+    mode->CrtcHDisplay = mode->HDisplay;
+    mode->CrtcHSyncStart = mode->HSyncStart;
+    mode->CrtcHSyncEnd = mode->HSyncEnd;
+    mode->CrtcHTotal = mode->HTotal;
+    mode->CrtcVDisplay = mode->VDisplay;
+    mode->CrtcVSyncStart = mode->VSyncStart;
+    mode->CrtcVSyncEnd = mode->VSyncEnd;
+    mode->CrtcVTotal = mode->VTotal;
+    mode->CrtcHAdjusted = FALSE;
+    mode->CrtcVAdjusted = FALSE;
 }
 
-
 /* -------------------------------------------------------------------- */
 /* open correct framebuffer device                                      */
 
@@ -256,314 +255,316 @@ fbdev2xfree_timing(struct fb_var_screeninfo *var, DisplayModePtr mode)
  * Try to find the framebuffer device for a given PCI device 
  */
 static int
-fbdev_open_pci(struct pci_device * pPci, char **namep)
+fbdev_open_pci(struct pci_device *pPci, char **namep)
 {
-    struct	fb_fix_screeninfo fix;
-    char	filename[256];
-    int	fd, i;
+    struct fb_fix_screeninfo fix;
+    char filename[256];
+    int fd, i;
 
     for (i = 0; i < 8; i++) {
-	snprintf(filename, sizeof(filename),
-		"/sys/bus/pci/devices/%04x:%02x:%02x.%d/graphics/fb%d",
-		pPci->domain, pPci->bus, pPci->dev, pPci->func, i);
+        snprintf(filename, sizeof(filename),
+                 "/sys/bus/pci/devices/%04x:%02x:%02x.%d/graphics/fb%d",
+                 pPci->domain, pPci->bus, pPci->dev, pPci->func, i);
 
-	fd = open(filename, O_RDONLY, 0);
+        fd = open(filename, O_RDONLY, 0);
         if (fd < 0) {
             snprintf(filename, sizeof(filename),
-                    "/sys/bus/pci/devices/%04x:%02x:%02x.%d/graphics:fb%d",
-                    pPci->domain, pPci->bus, pPci->dev, pPci->func, i);
+                     "/sys/bus/pci/devices/%04x:%02x:%02x.%d/graphics:fb%d",
+                     pPci->domain, pPci->bus, pPci->dev, pPci->func, i);
             fd = open(filename, O_RDONLY, 0);
         }
-	if (fd >= 0) {
-	    close(fd);
-	    snprintf(filename, sizeof(filename), "/dev/fb%d", i);
-
-	    fd = open(filename, O_RDWR, 0);
-	    if (fd != -1) {
-		if (ioctl(fd, FBIOGET_FSCREENINFO, (void*) & fix) != -1) {
-		    if (namep) {
-			*namep = xnfalloc(16);
-			strncpy(*namep,fix.id,16);
-		    }
-
-		    return fd;
-		}
-		close(fd);
-	    }
-	}
+        if (fd >= 0) {
+            close(fd);
+            snprintf(filename, sizeof(filename), "/dev/fb%d", i);
+
+            fd = open(filename, O_RDWR, 0);
+            if (fd != -1) {
+                if (ioctl(fd, FBIOGET_FSCREENINFO, (void *) &fix) != -1) {
+                    if (namep) {
+                        *namep = xnfalloc(16);
+                        strncpy(*namep, fix.id, 16);
+                    }
+
+                    return fd;
+                }
+                close(fd);
+            }
+        }
     }
 
     if (namep)
-      *namep = NULL;
+        *namep = NULL;
 
     xf86DrvMsg(-1, X_ERROR, "Unable to find a valid framebuffer device\n");
     return -1;
 }
 
 static int
-fbdev_open(int scrnIndex, char *dev, char** namep)
-{
-	struct	fb_fix_screeninfo fix;
-	int    fd;
-
-	/* try argument (from XF86Config) first */
-	if (dev) {
-	    fd = open(dev,O_RDWR,0);
-	} else {
-	    /* second: environment variable */
-	    dev = getenv("FRAMEBUFFER");
-	    if ((NULL == dev) || ((fd = open(dev,O_RDWR,0)) == -1)) {
-		/* last try: default device */
-		dev = "/dev/fb0";
-		fd = open(dev,O_RDWR,0);
-	    }
-	}
-
-	if (fd == -1) {
-	    xf86DrvMsg(scrnIndex, X_ERROR,
-		       "open %s: %s\n", dev, strerror(errno));
-	    return -1;
-	}
-
-	if (namep) {
-	    if (-1 == ioctl(fd,FBIOGET_FSCREENINFO,(void*)(&fix))) {
-		*namep = NULL;
-		xf86DrvMsg(scrnIndex, X_ERROR,
-			   "FBIOGET_FSCREENINFO: %s\n", strerror(errno));
-		return -1;
-	    } else {
-		*namep = xnfalloc(16);
-		strncpy(*namep,fix.id,16);
-	    }
-	}
-	return fd;
+fbdev_open(int scrnIndex, char *dev, char **namep)
+{
+    struct fb_fix_screeninfo fix;
+    int fd;
+
+    /* try argument (from XF86Config) first */
+    if (dev) {
+        fd = open(dev, O_RDWR, 0);
+    }
+    else {
+        /* second: environment variable */
+        dev = getenv("FRAMEBUFFER");
+        if ((NULL == dev) || ((fd = open(dev, O_RDWR, 0)) == -1)) {
+            /* last try: default device */
+            dev = "/dev/fb0";
+            fd = open(dev, O_RDWR, 0);
+        }
+    }
+
+    if (fd == -1) {
+        xf86DrvMsg(scrnIndex, X_ERROR, "open %s: %s\n", dev, strerror(errno));
+        return -1;
+    }
+
+    if (namep) {
+        if (-1 == ioctl(fd, FBIOGET_FSCREENINFO, (void *) (&fix))) {
+            *namep = NULL;
+            xf86DrvMsg(scrnIndex, X_ERROR,
+                       "FBIOGET_FSCREENINFO: %s\n", strerror(errno));
+            return -1;
+        }
+        else {
+            *namep = xnfalloc(16);
+            strncpy(*namep, fix.id, 16);
+        }
+    }
+    return fd;
 }
 
 /* -------------------------------------------------------------------- */
 
 Bool
-fbdevHWProbe(struct pci_device * pPci, char *device,char **namep)
+fbdevHWProbe(struct pci_device *pPci, char *device, char **namep)
 {
-	int fd;
+    int fd;
 
-	if (pPci)
-		fd = fbdev_open_pci(pPci,namep);
-	else
-		fd = fbdev_open(-1,device,namep);
+    if (pPci)
+        fd = fbdev_open_pci(pPci, namep);
+    else
+        fd = fbdev_open(-1, device, namep);
 
-	if (-1 == fd)
-		return FALSE;
-	close(fd);
-	return TRUE;
+    if (-1 == fd)
+        return FALSE;
+    close(fd);
+    return TRUE;
 }
 
 Bool
-fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device)
-{
-	fbdevHWPtr fPtr;
-
-	fbdevHWGetRec(pScrn);
-	fPtr = FBDEVHWPTR(pScrn);
-
-	/* open device */
-	if (pPci)
-		fPtr->fd = fbdev_open_pci(pPci,NULL);
-	else
-		fPtr->fd = fbdev_open(pScrn->scrnIndex,device,NULL);
-	if (-1 == fPtr->fd) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "Failed to open framebuffer device, consult warnings"
-			   " and/or errors above for possible reasons\n"
-			   "\t(you may have to look at the server log to see"
-			   " warnings)\n");
-		return FALSE;
-	}
-
-	/* get current fb device settings */
-	if (-1 == ioctl(fPtr->fd,FBIOGET_FSCREENINFO,(void*)(&fPtr->fix))) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "ioctl FBIOGET_FSCREENINFO: %s\n",
-			   strerror(errno));
-		return FALSE;
-	}
-	if (-1 == ioctl(fPtr->fd,FBIOGET_VSCREENINFO,(void*)(&fPtr->var))) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "ioctl FBIOGET_VSCREENINFO: %s\n",
-			   strerror(errno));
-		return FALSE;
-	}
-
-	/* we can use the current settings as "buildin mode" */
-	fbdev2xfree_timing(&fPtr->var, &fPtr->buildin);
-	fPtr->buildin.name  = "current";
-	fPtr->buildin.next  = &fPtr->buildin;
-	fPtr->buildin.prev  = &fPtr->buildin;
-	fPtr->buildin.type |= M_T_BUILTIN;
-	
-	return TRUE;
-}
-
-char*
+fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device *pPci, char *device)
+{
+    fbdevHWPtr fPtr;
+
+    fbdevHWGetRec(pScrn);
+    fPtr = FBDEVHWPTR(pScrn);
+
+    /* open device */
+    if (pPci)
+        fPtr->fd = fbdev_open_pci(pPci, NULL);
+    else
+        fPtr->fd = fbdev_open(pScrn->scrnIndex, device, NULL);
+    if (-1 == fPtr->fd) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "Failed to open framebuffer device, consult warnings"
+                   " and/or errors above for possible reasons\n"
+                   "\t(you may have to look at the server log to see"
+                   " warnings)\n");
+        return FALSE;
+    }
+
+    /* get current fb device settings */
+    if (-1 == ioctl(fPtr->fd, FBIOGET_FSCREENINFO, (void *) (&fPtr->fix))) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "ioctl FBIOGET_FSCREENINFO: %s\n", strerror(errno));
+        return FALSE;
+    }
+    if (-1 == ioctl(fPtr->fd, FBIOGET_VSCREENINFO, (void *) (&fPtr->var))) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "ioctl FBIOGET_VSCREENINFO: %s\n", strerror(errno));
+        return FALSE;
+    }
+
+    /* we can use the current settings as "buildin mode" */
+    fbdev2xfree_timing(&fPtr->var, &fPtr->buildin);
+    fPtr->buildin.name = "current";
+    fPtr->buildin.next = &fPtr->buildin;
+    fPtr->buildin.prev = &fPtr->buildin;
+    fPtr->buildin.type |= M_T_BUILTIN;
+
+    return TRUE;
+}
+
+char *
 fbdevHWGetName(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
-	return fPtr->fix.id;
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+
+    return fPtr->fix.id;
 }
 
 int
 fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
 
-	if (fbbpp)
-	    *fbbpp = fPtr->var.bits_per_pixel;
+    if (fbbpp)
+        *fbbpp = fPtr->var.bits_per_pixel;
 
-	if (fPtr->fix.visual == FB_VISUAL_TRUECOLOR ||
-	    fPtr->fix.visual == FB_VISUAL_DIRECTCOLOR)
-		return fPtr->var.red.length+fPtr->var.green.length+
-			fPtr->var.blue.length;
-	else
-		return fPtr->var.bits_per_pixel;
+    if (fPtr->fix.visual == FB_VISUAL_TRUECOLOR ||
+        fPtr->fix.visual == FB_VISUAL_DIRECTCOLOR)
+        return fPtr->var.red.length + fPtr->var.green.length +
+            fPtr->var.blue.length;
+    else
+        return fPtr->var.bits_per_pixel;
 }
 
 int
 fbdevHWGetLineLength(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
 
-	if (fPtr->fix.line_length)
-		return fPtr->fix.line_length;
-	else
-		return fPtr->var.xres_virtual*fPtr->var.bits_per_pixel/8;
+    if (fPtr->fix.line_length)
+        return fPtr->fix.line_length;
+    else
+        return fPtr->var.xres_virtual * fPtr->var.bits_per_pixel / 8;
 }
 
 int
 fbdevHWGetType(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
-	return fPtr->fix.type;
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+
+    return fPtr->fix.type;
 }
 
 int
 fbdevHWGetVidmem(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
-	return fPtr->fix.smem_len;
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+
+    return fPtr->fix.smem_len;
 }
 
 static Bool
 fbdevHWSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool check)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
-	struct fb_var_screeninfo req_var = fPtr->var, set_var;
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    struct fb_var_screeninfo req_var = fPtr->var, set_var;
 
-	xfree2fbdev_fblayout(pScrn, &req_var);
-	xfree2fbdev_timing(mode, &req_var);
+    xfree2fbdev_fblayout(pScrn, &req_var);
+    xfree2fbdev_timing(mode, &req_var);
 
 #if DEBUG
-	print_xfree_mode("init", mode);
-	print_fbdev_mode("init", &req_var);
+    print_xfree_mode("init", mode);
+    print_fbdev_mode("init", &req_var);
 #endif
 
-	set_var = req_var;
+    set_var = req_var;
 
-	if (check)
-		set_var.activate = FB_ACTIVATE_TEST;
+    if (check)
+        set_var.activate = FB_ACTIVATE_TEST;
 
-	if (0 != ioctl(fPtr->fd, FBIOPUT_VSCREENINFO, (void*)(&set_var))) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "FBIOPUT_VSCREENINFO: %s\n", strerror(errno));
-		return FALSE;
-	}
+    if (0 != ioctl(fPtr->fd, FBIOPUT_VSCREENINFO, (void *) (&set_var))) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "FBIOPUT_VSCREENINFO: %s\n", strerror(errno));
+        return FALSE;
+    }
 
-	if (!fbdev_modes_equal(&set_var, &req_var)) {
-		if (!check)
-			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-				   "FBIOPUT_VSCREENINFO succeeded but modified "
-				   "mode\n");
+    if (!fbdev_modes_equal(&set_var, &req_var)) {
+        if (!check)
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                       "FBIOPUT_VSCREENINFO succeeded but modified " "mode\n");
 #if DEBUG
-		print_fbdev_mode("returned", &set_var);
+        print_fbdev_mode("returned", &set_var);
 #endif
-		return FALSE;
-	}
+        return FALSE;
+    }
 
-	if (!check)
-		fPtr->var = set_var;
+    if (!check)
+        fPtr->var = set_var;
 
-	return TRUE;
+    return TRUE;
 }
 
 void
 fbdevHWSetVideoModes(ScrnInfoPtr pScrn)
 {
-	char **modename;
-	DisplayModePtr mode,this,last = pScrn->modes;
-
-	if (NULL == pScrn->display->modes)
-		return;
-
-	pScrn->virtualX = pScrn->display->virtualX;
-	pScrn->virtualY = pScrn->display->virtualY;
-
-	for (modename = pScrn->display->modes; *modename != NULL; modename++) {
-		for (mode = pScrn->monitor->Modes; mode != NULL; mode = mode->next) {
-			if (0 == strcmp(mode->name,*modename)) {
-				if (fbdevHWSetMode(pScrn, mode, TRUE))
-					break;
-
-				xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-					   "\tmode \"%s\" test failed\n", *modename);
-			}
-		}
-
-		if (NULL == mode) {
-			xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-				   "\tmode \"%s\" not found\n", *modename);
-			continue;
-		}
-
-		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-			   "\tmode \"%s\" ok\n", *modename);
-
-		if (pScrn->virtualX < mode->HDisplay)
-			pScrn->virtualX = mode->HDisplay;
-		if (pScrn->virtualY < mode->VDisplay)
-			pScrn->virtualY = mode->VDisplay;
-
-		if (NULL == pScrn->modes) {
-			this = pScrn->modes = xf86DuplicateMode(mode);
-			this->next = this;
-			this->prev = this;
-		} else {
-			this = xf86DuplicateMode(mode);
-			this->next = pScrn->modes;
-			this->prev = last;
-			last->next = this;
-			pScrn->modes->prev = this;
-		}
-		last = this;
-	}
+    char **modename;
+    DisplayModePtr mode, this, last = pScrn->modes;
+
+    if (NULL == pScrn->display->modes)
+        return;
+
+    pScrn->virtualX = pScrn->display->virtualX;
+    pScrn->virtualY = pScrn->display->virtualY;
+
+    for (modename = pScrn->display->modes; *modename != NULL; modename++) {
+        for (mode = pScrn->monitor->Modes; mode != NULL; mode = mode->next) {
+            if (0 == strcmp(mode->name, *modename)) {
+                if (fbdevHWSetMode(pScrn, mode, TRUE))
+                    break;
+
+                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                           "\tmode \"%s\" test failed\n", *modename);
+            }
+        }
+
+        if (NULL == mode) {
+            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                       "\tmode \"%s\" not found\n", *modename);
+            continue;
+        }
+
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "\tmode \"%s\" ok\n", *modename);
+
+        if (pScrn->virtualX < mode->HDisplay)
+            pScrn->virtualX = mode->HDisplay;
+        if (pScrn->virtualY < mode->VDisplay)
+            pScrn->virtualY = mode->VDisplay;
+
+        if (NULL == pScrn->modes) {
+            this = pScrn->modes = xf86DuplicateMode(mode);
+            this->next = this;
+            this->prev = this;
+        }
+        else {
+            this = xf86DuplicateMode(mode);
+            this->next = pScrn->modes;
+            this->prev = last;
+            last->next = this;
+            pScrn->modes->prev = this;
+        }
+        last = this;
+    }
 }
 
 DisplayModePtr
 fbdevHWGetBuildinMode(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
-	return &fPtr->buildin;
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+
+    return &fPtr->buildin;
 }
 
 void
 fbdevHWUseBuildinMode(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
 
-	pScrn->modes    = &fPtr->buildin;
-	pScrn->virtualX = pScrn->display->virtualX;
-	pScrn->virtualY = pScrn->display->virtualY;
-	if (pScrn->virtualX < fPtr->buildin.HDisplay)
-		pScrn->virtualX = fPtr->buildin.HDisplay;
-	if (pScrn->virtualY < fPtr->buildin.VDisplay)
-		pScrn->virtualY = fPtr->buildin.VDisplay;
+    pScrn->modes = &fPtr->buildin;
+    pScrn->virtualX = pScrn->display->virtualX;
+    pScrn->virtualY = pScrn->display->virtualY;
+    if (pScrn->virtualX < fPtr->buildin.HDisplay)
+        pScrn->virtualX = fPtr->buildin.HDisplay;
+    if (pScrn->virtualY < fPtr->buildin.VDisplay)
+        pScrn->virtualY = fPtr->buildin.VDisplay;
 }
 
 /* -------------------------------------------------------------------- */
@@ -571,145 +572,153 @@ fbdevHWUseBuildinMode(ScrnInfoPtr pScrn)
 static void
 calculateFbmem_len(fbdevHWPtr fPtr)
 {
-	fPtr->fboff = (unsigned long) fPtr->fix.smem_start & ~PAGE_MASK;
-	fPtr->fbmem_len = (fPtr->fboff+fPtr->fix.smem_len+~PAGE_MASK) &
-			  PAGE_MASK;
+    fPtr->fboff = (unsigned long) fPtr->fix.smem_start & ~PAGE_MASK;
+    fPtr->fbmem_len = (fPtr->fboff + fPtr->fix.smem_len + ~PAGE_MASK) &
+        PAGE_MASK;
 }
 
-
-void*
+void *
 fbdevHWMapVidmem(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
-
-	if (NULL == fPtr->fbmem) {
-		calculateFbmem_len(fPtr);
-		fPtr->fbmem = mmap(NULL, fPtr->fbmem_len, PROT_READ | PROT_WRITE,
-				   MAP_SHARED, fPtr->fd, 0);
-		if (-1 == (long)fPtr->fbmem) {
-			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-				   "mmap fbmem: %s\n", strerror(errno));
-			fPtr->fbmem = NULL;
-		} else {
-		    /* Perhaps we'd better add fboff to fbmem and return 0 in
-		       fbdevHWLinearOffset()? Of course we then need to mask
-		       fPtr->fbmem with PAGE_MASK in fbdevHWUnmapVidmem() as
-		       well. [geert] */
-		}
-	}
-	pScrn->memPhysBase = (unsigned long)fPtr->fix.smem_start & (unsigned long)(PAGE_MASK);
-	pScrn->fbOffset = (unsigned long)fPtr->fix.smem_start & (unsigned long)(~PAGE_MASK);
-	return fPtr->fbmem;
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+
+    if (NULL == fPtr->fbmem) {
+        calculateFbmem_len(fPtr);
+        fPtr->fbmem = mmap(NULL, fPtr->fbmem_len, PROT_READ | PROT_WRITE,
+                           MAP_SHARED, fPtr->fd, 0);
+        if (-1 == (long) fPtr->fbmem) {
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                       "mmap fbmem: %s\n", strerror(errno));
+            fPtr->fbmem = NULL;
+        }
+        else {
+            /* Perhaps we'd better add fboff to fbmem and return 0 in
+               fbdevHWLinearOffset()? Of course we then need to mask
+               fPtr->fbmem with PAGE_MASK in fbdevHWUnmapVidmem() as
+               well. [geert] */
+        }
+    }
+    pScrn->memPhysBase =
+        (unsigned long) fPtr->fix.smem_start & (unsigned long) (PAGE_MASK);
+    pScrn->fbOffset =
+        (unsigned long) fPtr->fix.smem_start & (unsigned long) (~PAGE_MASK);
+    return fPtr->fbmem;
 }
 
 int
 fbdevHWLinearOffset(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
 
-	return fPtr->fboff;
+    return fPtr->fboff;
 }
 
 Bool
 fbdevHWUnmapVidmem(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
 
-	if (NULL != fPtr->fbmem) {
-		if (-1 == munmap(fPtr->fbmem, fPtr->fbmem_len))
-			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-				   "munmap fbmem: %s\n", strerror(errno));
-		fPtr->fbmem = NULL;
-	}
-	return TRUE;
+    if (NULL != fPtr->fbmem) {
+        if (-1 == munmap(fPtr->fbmem, fPtr->fbmem_len))
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                       "munmap fbmem: %s\n", strerror(errno));
+        fPtr->fbmem = NULL;
+    }
+    return TRUE;
 }
 
-void*
+void *
 fbdevHWMapMMIO(ScrnInfoPtr pScrn)
 {
-	unsigned int mmio_off;
-
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
-
-	if (NULL == fPtr->mmio) {
-		/* tell the kernel not to use accels to speed up console scrolling */
-		fPtr->var.accel_flags = 0;
-		if (0 != ioctl(fPtr->fd,FBIOPUT_VSCREENINFO,(void*)(&fPtr->var))) {
-			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-				   "FBIOPUT_VSCREENINFO: %s\n", strerror(errno));
-			return FALSE;
-		}
-		mmio_off = (unsigned long) fPtr->fix.mmio_start & ~PAGE_MASK;
-		fPtr->mmio_len = (mmio_off+fPtr->fix.mmio_len+~PAGE_MASK) &
-				  PAGE_MASK;
-		if (NULL == fPtr->fbmem)
-			calculateFbmem_len(fPtr);
-		fPtr->mmio = mmap(NULL, fPtr->mmio_len, PROT_READ | PROT_WRITE,
-				  MAP_SHARED, fPtr->fd, fPtr->fbmem_len);
-		if (-1 == (long)fPtr->mmio) {
-			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-				   "mmap mmio: %s\n", strerror(errno));
-			fPtr->mmio = NULL;
-		} else
-			fPtr->mmio += mmio_off;
-	}
-	return fPtr->mmio;
+    unsigned int mmio_off;
+
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+
+    if (NULL == fPtr->mmio) {
+        /* tell the kernel not to use accels to speed up console scrolling */
+        fPtr->var.accel_flags = 0;
+        if (0 != ioctl(fPtr->fd, FBIOPUT_VSCREENINFO, (void *) (&fPtr->var))) {
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                       "FBIOPUT_VSCREENINFO: %s\n", strerror(errno));
+            return FALSE;
+        }
+        mmio_off = (unsigned long) fPtr->fix.mmio_start & ~PAGE_MASK;
+        fPtr->mmio_len = (mmio_off + fPtr->fix.mmio_len + ~PAGE_MASK) &
+            PAGE_MASK;
+        if (NULL == fPtr->fbmem)
+            calculateFbmem_len(fPtr);
+        fPtr->mmio = mmap(NULL, fPtr->mmio_len, PROT_READ | PROT_WRITE,
+                          MAP_SHARED, fPtr->fd, fPtr->fbmem_len);
+        if (-1 == (long) fPtr->mmio) {
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                       "mmap mmio: %s\n", strerror(errno));
+            fPtr->mmio = NULL;
+        }
+        else
+            fPtr->mmio += mmio_off;
+    }
+    return fPtr->mmio;
 }
 
 Bool
 fbdevHWUnmapMMIO(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
 
-	if (NULL != fPtr->mmio) {
-		if (-1 == munmap((void *)((unsigned long)fPtr->mmio & PAGE_MASK), fPtr->mmio_len))
-			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-				   "munmap mmio: %s\n", strerror(errno));
-		fPtr->mmio = NULL;
-		/* FIXME: restore var.accel_flags [geert] */
-	}
-	return TRUE;
+    if (NULL != fPtr->mmio) {
+        if (-1 ==
+            munmap((void *) ((unsigned long) fPtr->mmio & PAGE_MASK),
+                   fPtr->mmio_len))
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "munmap mmio: %s\n",
+                       strerror(errno));
+        fPtr->mmio = NULL;
+        /* FIXME: restore var.accel_flags [geert] */
+    }
+    return TRUE;
 }
 
 /* -------------------------------------------------------------------- */
 
 Bool
 fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-{	
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
-	
-	pScrn->vtSema = TRUE;
-
-	/* set */
-	if (!fbdevHWSetMode(pScrn, mode, FALSE))
-		return FALSE;
-
-	/* read back */
-	if (0 != ioctl(fPtr->fd,FBIOGET_FSCREENINFO,(void*)(&fPtr->fix))) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "FBIOGET_FSCREENINFO: %s\n", strerror(errno));
-		return FALSE;
-	}
-	if (0 != ioctl(fPtr->fd,FBIOGET_VSCREENINFO,(void*)(&fPtr->var))) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "FBIOGET_VSCREENINFO: %s\n", strerror(errno));
-		return FALSE;
-	}
-
-	if (pScrn->defaultVisual == TrueColor ||
-	    pScrn->defaultVisual == DirectColor) {
-	    /* XXX: This is a hack, but it should be a NOP for all the setups that
-	     * worked before and actually seems to fix some others...
-	     */
-	    pScrn->offset.red   = fPtr->var.red.offset;
-	    pScrn->offset.green = fPtr->var.green.offset;
-	    pScrn->offset.blue  = fPtr->var.blue.offset;
-	    pScrn->mask.red     = ((1 << fPtr->var.red.length) - 1) << fPtr->var.red.offset;
-	    pScrn->mask.green   = ((1 << fPtr->var.green.length) - 1) << fPtr->var.green.offset;
-	    pScrn->mask.blue    = ((1 << fPtr->var.blue.length) - 1) << fPtr->var.blue.offset;
-	}
-
-	return TRUE;
+{
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+
+    pScrn->vtSema = TRUE;
+
+    /* set */
+    if (!fbdevHWSetMode(pScrn, mode, FALSE))
+        return FALSE;
+
+    /* read back */
+    if (0 != ioctl(fPtr->fd, FBIOGET_FSCREENINFO, (void *) (&fPtr->fix))) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "FBIOGET_FSCREENINFO: %s\n", strerror(errno));
+        return FALSE;
+    }
+    if (0 != ioctl(fPtr->fd, FBIOGET_VSCREENINFO, (void *) (&fPtr->var))) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "FBIOGET_VSCREENINFO: %s\n", strerror(errno));
+        return FALSE;
+    }
+
+    if (pScrn->defaultVisual == TrueColor ||
+        pScrn->defaultVisual == DirectColor) {
+        /* XXX: This is a hack, but it should be a NOP for all the setups that
+         * worked before and actually seems to fix some others...
+         */
+        pScrn->offset.red = fPtr->var.red.offset;
+        pScrn->offset.green = fPtr->var.green.offset;
+        pScrn->offset.blue = fPtr->var.blue.offset;
+        pScrn->mask.red =
+            ((1 << fPtr->var.red.length) - 1) << fPtr->var.red.offset;
+        pScrn->mask.green =
+            ((1 << fPtr->var.green.length) - 1) << fPtr->var.green.offset;
+        pScrn->mask.blue =
+            ((1 << fPtr->var.blue.length) - 1) << fPtr->var.blue.offset;
+    }
+
+    return TRUE;
 }
 
 /* -------------------------------------------------------------------- */
@@ -717,21 +726,21 @@ fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 void
 fbdevHWSave(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
 
-	if (0 != ioctl(fPtr->fd,FBIOGET_VSCREENINFO,(void*)(&fPtr->saved_var)))
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "FBIOGET_VSCREENINFO: %s\n", strerror(errno));
+    if (0 != ioctl(fPtr->fd, FBIOGET_VSCREENINFO, (void *) (&fPtr->saved_var)))
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "FBIOGET_VSCREENINFO: %s\n", strerror(errno));
 }
 
 void
 fbdevHWRestore(ScrnInfoPtr pScrn)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
 
-	if (0 != ioctl(fPtr->fd,FBIOPUT_VSCREENINFO,(void*)(&fPtr->saved_var)))
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "FBIOPUT_VSCREENINFO: %s\n", strerror(errno));
+    if (0 != ioctl(fPtr->fd, FBIOPUT_VSCREENINFO, (void *) (&fPtr->saved_var)))
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "FBIOPUT_VSCREENINFO: %s\n", strerror(errno));
 }
 
 /* -------------------------------------------------------------------- */
@@ -739,30 +748,27 @@ fbdevHWRestore(ScrnInfoPtr pScrn)
 
 void
 fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
-		 LOCO *colors, VisualPtr pVisual)
-{
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
-	struct fb_cmap cmap;
-	unsigned short red,green,blue;
-	int i;
-
-	cmap.len   = 1;
-	cmap.red   = &red;
-	cmap.green = &green;
-	cmap.blue  = &blue;
-	cmap.transp = NULL;
-	for (i = 0; i < numColors; i++) {
-		cmap.start = indices[i];
-		red   = (colors[indices[i]].red   << 8) |
-			colors[indices[i]].red;
-		green = (colors[indices[i]].green << 8) |
-			colors[indices[i]].green;
-		blue  = (colors[indices[i]].blue  << 8) |
-			colors[indices[i]].blue;
-		if (-1 == ioctl(fPtr->fd,FBIOPUTCMAP,(void*)&cmap))
-			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-				   "FBIOPUTCMAP: %s\n", strerror(errno));
-	}
+                   LOCO * colors, VisualPtr pVisual)
+{
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    struct fb_cmap cmap;
+    unsigned short red, green, blue;
+    int i;
+
+    cmap.len = 1;
+    cmap.red = &red;
+    cmap.green = &green;
+    cmap.blue = &blue;
+    cmap.transp = NULL;
+    for (i = 0; i < numColors; i++) {
+        cmap.start = indices[i];
+        red = (colors[indices[i]].red << 8) | colors[indices[i]].red;
+        green = (colors[indices[i]].green << 8) | colors[indices[i]].green;
+        blue = (colors[indices[i]].blue << 8) | colors[indices[i]].blue;
+        if (-1 == ioctl(fPtr->fd, FBIOPUTCMAP, (void *) &cmap))
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                       "FBIOPUTCMAP: %s\n", strerror(errno));
+    }
 }
 
 /* -------------------------------------------------------------------- */
@@ -771,134 +777,157 @@ fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
 ModeStatus
 fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 
-	if (!fbdevHWSetMode(pScrn, mode, TRUE))
-		return MODE_BAD;
+    if (!fbdevHWSetMode(pScrn, mode, TRUE))
+        return MODE_BAD;
 
-	return MODE_OK;
+    return MODE_OK;
 }
 
 Bool
 fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 {
-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 
-	if (!fbdevHWSetMode(pScrn, mode, FALSE))
-		return FALSE;
+    if (!fbdevHWSetMode(pScrn, mode, FALSE))
+        return FALSE;
 
-	return TRUE;
+    return TRUE;
 }
 
 void
 fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
 {
-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
 
-	if ( x < 0 || x + fPtr->var.xres > fPtr->var.xres_virtual || 
-	     y < 0 || y + fPtr->var.yres > fPtr->var.yres_virtual )
-		return;
+    if (x < 0 || x + fPtr->var.xres > fPtr->var.xres_virtual ||
+        y < 0 || y + fPtr->var.yres > fPtr->var.yres_virtual)
+        return;
 
-	fPtr->var.xoffset = x;
-	fPtr->var.yoffset = y;
-	if (-1 == ioctl(fPtr->fd,FBIOPAN_DISPLAY,(void*)&fPtr->var))
-		xf86DrvMsgVerb(scrnIndex, X_WARNING, 5, 
-			   "FBIOPAN_DISPLAY: %s\n", strerror(errno));
+    fPtr->var.xoffset = x;
+    fPtr->var.yoffset = y;
+    if (-1 == ioctl(fPtr->fd, FBIOPAN_DISPLAY, (void *) &fPtr->var))
+        xf86DrvMsgVerb(scrnIndex, X_WARNING, 5,
+                       "FBIOPAN_DISPLAY: %s\n", strerror(errno));
 }
 
 Bool
 fbdevHWEnterVT(int scrnIndex, int flags)
 {
-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-	
-	if (!fbdevHWModeInit(pScrn, pScrn->currentMode))
-		return FALSE;
-	fbdevHWAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-	return TRUE;
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+
+    if (!fbdevHWModeInit(pScrn, pScrn->currentMode))
+        return FALSE;
+    fbdevHWAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+    return TRUE;
 }
 
 void
 fbdevHWLeaveVT(int scrnIndex, int flags)
 {
-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 
-	fbdevHWRestore(pScrn);
+    fbdevHWRestore(pScrn);
 }
 
 void
 fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
 {
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
-	unsigned long fbmode;
-
-	if (!pScrn->vtSema)
-		return;
-
-	switch (mode) {
-		case DPMSModeOn:
-			fbmode = 0;
-			break;
-		case DPMSModeStandby:
-			fbmode = 2;
-			break;
-		case DPMSModeSuspend:
-			fbmode = 3;
-			break;
-		case DPMSModeOff:
-			fbmode = 4;
-			break;
-		default:
-			return;
-	}
-
-	if (-1 == ioctl(fPtr->fd, FBIOBLANK, (void *)fbmode))
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "FBIOBLANK: %s\n", strerror(errno));
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    unsigned long fbmode;
+
+    if (!pScrn->vtSema)
+        return;
+
+    switch (mode) {
+    case DPMSModeOn:
+        fbmode = 0;
+        break;
+    case DPMSModeStandby:
+        fbmode = 2;
+        break;
+    case DPMSModeSuspend:
+        fbmode = 3;
+        break;
+    case DPMSModeOff:
+        fbmode = 4;
+        break;
+    default:
+        return;
+    }
+
+    if (-1 == ioctl(fPtr->fd, FBIOBLANK, (void *) fbmode))
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "FBIOBLANK: %s\n", strerror(errno));
 }
 
 Bool
 fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-	fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
-	unsigned long unblank;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
+    unsigned long unblank;
 
-	if (!pScrn->vtSema)
-		return TRUE;
+    if (!pScrn->vtSema)
+        return TRUE;
 
-	unblank = xf86IsUnblank(mode);
+    unblank = xf86IsUnblank(mode);
 
-	if (-1 == ioctl(fPtr->fd, FBIOBLANK, (void *)(1-unblank))) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "FBIOBLANK: %s\n", strerror(errno));
-		return FALSE;
-	}
+    if (-1 == ioctl(fPtr->fd, FBIOBLANK, (void *) (1 - unblank))) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "FBIOBLANK: %s\n", strerror(errno));
+        return FALSE;
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 xf86SwitchModeProc *
-fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; }
+fbdevHWSwitchModeWeak(void)
+{
+    return fbdevHWSwitchMode;
+}
 
 xf86AdjustFrameProc *
-fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; }
+fbdevHWAdjustFrameWeak(void)
+{
+    return fbdevHWAdjustFrame;
+}
 
 xf86EnterVTProc *
-fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; }
+fbdevHWEnterVTWeak(void)
+{
+    return fbdevHWEnterVT;
+}
 
 xf86LeaveVTProc *
-fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; }
+fbdevHWLeaveVTWeak(void)
+{
+    return fbdevHWLeaveVT;
+}
 
 xf86ValidModeProc *
-fbdevHWValidModeWeak(void) { return fbdevHWValidMode; }
+fbdevHWValidModeWeak(void)
+{
+    return fbdevHWValidMode;
+}
 
 xf86DPMSSetProc *
-fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; }
+fbdevHWDPMSSetWeak(void)
+{
+    return fbdevHWDPMSSet;
+}
 
 xf86LoadPaletteProc *
-fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; }
+fbdevHWLoadPaletteWeak(void)
+{
+    return fbdevHWLoadPalette;
+}
 
 SaveScreenProcPtr
-fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; }
+fbdevHWSaveScreenWeak(void)
+{
+    return fbdevHWSaveScreen;
+}
diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h
index 34870c27d..536987101 100644
--- a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h
+++ b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h
@@ -5,58 +5,64 @@
 #include "xf86str.h"
 #include "colormapst.h"
 
-#define FBDEVHW_PACKED_PIXELS		0	/* Packed Pixels	*/
-#define FBDEVHW_PLANES			1	/* Non interleaved planes */
-#define FBDEVHW_INTERLEAVED_PLANES	2	/* Interleaved planes	*/
-#define FBDEVHW_TEXT			3	/* Text/attributes	*/
-#define FBDEVHW_VGA_PLANES		4	/* EGA/VGA planes       */
+#define FBDEVHW_PACKED_PIXELS		0       /* Packed Pixels        */
+#define FBDEVHW_PLANES			1       /* Non interleaved planes */
+#define FBDEVHW_INTERLEAVED_PLANES	2       /* Interleaved planes   */
+#define FBDEVHW_TEXT			3       /* Text/attributes      */
+#define FBDEVHW_VGA_PLANES		4       /* EGA/VGA planes       */
 
-extern _X_EXPORT Bool  fbdevHWGetRec(ScrnInfoPtr pScrn);
-extern _X_EXPORT void  fbdevHWFreeRec(ScrnInfoPtr pScrn);
+extern _X_EXPORT Bool fbdevHWGetRec(ScrnInfoPtr pScrn);
+extern _X_EXPORT void fbdevHWFreeRec(ScrnInfoPtr pScrn);
 
-extern _X_EXPORT int   fbdevHWGetFD(ScrnInfoPtr pScrn);
+extern _X_EXPORT int fbdevHWGetFD(ScrnInfoPtr pScrn);
 
-extern _X_EXPORT Bool  fbdevHWProbe(struct pci_device * pPci, char *device, char **namep);
-extern _X_EXPORT Bool  fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device);
+extern _X_EXPORT Bool fbdevHWProbe(struct pci_device *pPci, char *device,
+                                   char **namep);
+extern _X_EXPORT Bool fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device *pPci,
+                                  char *device);
 
-extern _X_EXPORT char* fbdevHWGetName(ScrnInfoPtr pScrn);
-extern _X_EXPORT int   fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp);
-extern _X_EXPORT int   fbdevHWGetLineLength(ScrnInfoPtr pScrn);
-extern _X_EXPORT int   fbdevHWGetType(ScrnInfoPtr pScrn);
-extern _X_EXPORT int   fbdevHWGetVidmem(ScrnInfoPtr pScrn);
+extern _X_EXPORT char *fbdevHWGetName(ScrnInfoPtr pScrn);
+extern _X_EXPORT int fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp);
+extern _X_EXPORT int fbdevHWGetLineLength(ScrnInfoPtr pScrn);
+extern _X_EXPORT int fbdevHWGetType(ScrnInfoPtr pScrn);
+extern _X_EXPORT int fbdevHWGetVidmem(ScrnInfoPtr pScrn);
 
-extern _X_EXPORT void* fbdevHWMapVidmem(ScrnInfoPtr pScrn);
-extern _X_EXPORT int   fbdevHWLinearOffset(ScrnInfoPtr pScrn);
-extern _X_EXPORT Bool  fbdevHWUnmapVidmem(ScrnInfoPtr pScrn);
-extern _X_EXPORT void* fbdevHWMapMMIO(ScrnInfoPtr pScrn);
-extern _X_EXPORT Bool  fbdevHWUnmapMMIO(ScrnInfoPtr pScrn);
+extern _X_EXPORT void *fbdevHWMapVidmem(ScrnInfoPtr pScrn);
+extern _X_EXPORT int fbdevHWLinearOffset(ScrnInfoPtr pScrn);
+extern _X_EXPORT Bool fbdevHWUnmapVidmem(ScrnInfoPtr pScrn);
+extern _X_EXPORT void *fbdevHWMapMMIO(ScrnInfoPtr pScrn);
+extern _X_EXPORT Bool fbdevHWUnmapMMIO(ScrnInfoPtr pScrn);
 
-extern _X_EXPORT void  fbdevHWSetVideoModes(ScrnInfoPtr pScrn);
+extern _X_EXPORT void fbdevHWSetVideoModes(ScrnInfoPtr pScrn);
 extern _X_EXPORT DisplayModePtr fbdevHWGetBuildinMode(ScrnInfoPtr pScrn);
-extern _X_EXPORT void  fbdevHWUseBuildinMode(ScrnInfoPtr pScrn);
-extern _X_EXPORT Bool  fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
-extern _X_EXPORT void  fbdevHWSave(ScrnInfoPtr pScrn);
-extern _X_EXPORT void  fbdevHWRestore(ScrnInfoPtr pScrn);
-
-extern _X_EXPORT void  fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
-		 LOCO *colors, VisualPtr pVisual);
-
-extern _X_EXPORT ModeStatus fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags);
-extern _X_EXPORT Bool  fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
-extern _X_EXPORT void  fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags);
-extern _X_EXPORT Bool  fbdevHWEnterVT(int scrnIndex, int flags);
-extern _X_EXPORT void  fbdevHWLeaveVT(int scrnIndex, int flags);
-extern _X_EXPORT void  fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags);
-
-extern _X_EXPORT Bool  fbdevHWSaveScreen(ScreenPtr pScreen, int mode);
-
-extern _X_EXPORT xf86SwitchModeProc	*fbdevHWSwitchModeWeak(void);
-extern _X_EXPORT xf86AdjustFrameProc	*fbdevHWAdjustFrameWeak(void);
-extern _X_EXPORT xf86EnterVTProc	*fbdevHWEnterVTWeak(void);
-extern _X_EXPORT xf86LeaveVTProc	*fbdevHWLeaveVTWeak(void);
-extern _X_EXPORT xf86ValidModeProc	*fbdevHWValidModeWeak(void);
-extern _X_EXPORT xf86DPMSSetProc	*fbdevHWDPMSSetWeak(void);
-extern _X_EXPORT xf86LoadPaletteProc	*fbdevHWLoadPaletteWeak(void);
-extern _X_EXPORT SaveScreenProcPtr	fbdevHWSaveScreenWeak(void);
+extern _X_EXPORT void fbdevHWUseBuildinMode(ScrnInfoPtr pScrn);
+extern _X_EXPORT Bool fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
+extern _X_EXPORT void fbdevHWSave(ScrnInfoPtr pScrn);
+extern _X_EXPORT void fbdevHWRestore(ScrnInfoPtr pScrn);
+
+extern _X_EXPORT void fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors,
+                                         int *indices, LOCO * colors,
+                                         VisualPtr pVisual);
+
+extern _X_EXPORT ModeStatus fbdevHWValidMode(int scrnIndex, DisplayModePtr mode,
+                                             Bool verbose, int flags);
+extern _X_EXPORT Bool fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode,
+                                        int flags);
+extern _X_EXPORT void fbdevHWAdjustFrame(int scrnIndex, int x, int y,
+                                         int flags);
+extern _X_EXPORT Bool fbdevHWEnterVT(int scrnIndex, int flags);
+extern _X_EXPORT void fbdevHWLeaveVT(int scrnIndex, int flags);
+extern _X_EXPORT void fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags);
+
+extern _X_EXPORT Bool fbdevHWSaveScreen(ScreenPtr pScreen, int mode);
+
+extern _X_EXPORT xf86SwitchModeProc *fbdevHWSwitchModeWeak(void);
+extern _X_EXPORT xf86AdjustFrameProc *fbdevHWAdjustFrameWeak(void);
+extern _X_EXPORT xf86EnterVTProc *fbdevHWEnterVTWeak(void);
+extern _X_EXPORT xf86LeaveVTProc *fbdevHWLeaveVTWeak(void);
+extern _X_EXPORT xf86ValidModeProc *fbdevHWValidModeWeak(void);
+extern _X_EXPORT xf86DPMSSetProc *fbdevHWDPMSSetWeak(void);
+extern _X_EXPORT xf86LoadPaletteProc *fbdevHWLoadPaletteWeak(void);
+extern _X_EXPORT SaveScreenProcPtr fbdevHWSaveScreenWeak(void);
 
 #endif
diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhwstub.c b/xorg-server/hw/xfree86/fbdevhw/fbdevhwstub.c
index 191a6d33d..6e0a470b8 100644
--- a/xorg-server/hw/xfree86/fbdevhw/fbdevhwstub.c
+++ b/xorg-server/hw/xfree86/fbdevhw/fbdevhwstub.c
@@ -8,11 +8,10 @@
 
 /* Stubs for the static server on platforms that don't support fbdev */
 
-
 Bool
 fbdevHWGetRec(ScrnInfoPtr pScrn)
 {
-	return FALSE;
+    return FALSE;
 }
 
 void
@@ -20,48 +19,47 @@ fbdevHWFreeRec(ScrnInfoPtr pScrn)
 {
 }
 
-
 Bool
 fbdevHWProbe(struct pci_device *pPci, char *device, char **namep)
 {
-	return FALSE;
+    return FALSE;
 }
 
 Bool
 fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device *pPci, char *device)
 {
-	xf86Msg(X_ERROR, "fbdevhw is not available on this platform\n");
-	return FALSE;
+    xf86Msg(X_ERROR, "fbdevhw is not available on this platform\n");
+    return FALSE;
 }
 
-char*
+char *
 fbdevHWGetName(ScrnInfoPtr pScrn)
 {
-	return NULL;
+    return NULL;
 }
 
 int
 fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp)
 {
-	return -1;
+    return -1;
 }
 
 int
 fbdevHWGetLineLength(ScrnInfoPtr pScrn)
 {
-	return -1;	/* Should cause something spectacular... */
+    return -1;                  /* Should cause something spectacular... */
 }
 
 int
 fbdevHWGetType(ScrnInfoPtr pScrn)
 {
-	return -1;
+    return -1;
 }
 
 int
 fbdevHWGetVidmem(ScrnInfoPtr pScrn)
 {
-	return -1;
+    return -1;
 }
 
 void
@@ -72,7 +70,7 @@ fbdevHWSetVideoModes(ScrnInfoPtr pScrn)
 DisplayModePtr
 fbdevHWGetBuildinMode(ScrnInfoPtr pScrn)
 {
-	return NULL;
+    return NULL;
 }
 
 void
@@ -80,40 +78,40 @@ fbdevHWUseBuildinMode(ScrnInfoPtr pScrn)
 {
 }
 
-void*
+void *
 fbdevHWMapVidmem(ScrnInfoPtr pScrn)
 {
-	return NULL;
+    return NULL;
 }
 
 int
 fbdevHWLinearOffset(ScrnInfoPtr pScrn)
 {
-	return 0;
+    return 0;
 }
 
 Bool
 fbdevHWUnmapVidmem(ScrnInfoPtr pScrn)
 {
-	return FALSE;
+    return FALSE;
 }
 
-void*
+void *
 fbdevHWMapMMIO(ScrnInfoPtr pScrn)
 {
-	return NULL;
+    return NULL;
 }
 
 Bool
 fbdevHWUnmapMMIO(ScrnInfoPtr pScrn)
 {
-	return FALSE;
+    return FALSE;
 }
 
 Bool
 fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-{	
-	return FALSE;
+{
+    return FALSE;
 }
 
 void
@@ -128,20 +126,20 @@ fbdevHWRestore(ScrnInfoPtr pScrn)
 
 void
 fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
-		 LOCO *colors, VisualPtr pVisual)
+                   LOCO * colors, VisualPtr pVisual)
 {
 }
 
 ModeStatus
 fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
-	return MODE_ERROR;
+    return MODE_ERROR;
 }
 
 Bool
 fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 {
-	return FALSE;
+    return FALSE;
 }
 
 void
@@ -152,7 +150,7 @@ fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
 Bool
 fbdevHWEnterVT(int scrnIndex, int flags)
 {
-	return FALSE;
+    return FALSE;
 }
 
 void
@@ -168,29 +166,53 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
 Bool
 fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
 {
-	return FALSE;
+    return FALSE;
 }
 
 xf86SwitchModeProc *
-fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; }
+fbdevHWSwitchModeWeak(void)
+{
+    return fbdevHWSwitchMode;
+}
 
 xf86AdjustFrameProc *
-fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; }
+fbdevHWAdjustFrameWeak(void)
+{
+    return fbdevHWAdjustFrame;
+}
 
 xf86EnterVTProc *
-fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; }
+fbdevHWEnterVTWeak(void)
+{
+    return fbdevHWEnterVT;
+}
 
 xf86LeaveVTProc *
-fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; }
+fbdevHWLeaveVTWeak(void)
+{
+    return fbdevHWLeaveVT;
+}
 
 xf86ValidModeProc *
-fbdevHWValidModeWeak(void) { return fbdevHWValidMode; }
+fbdevHWValidModeWeak(void)
+{
+    return fbdevHWValidMode;
+}
 
 xf86DPMSSetProc *
-fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; }
+fbdevHWDPMSSetWeak(void)
+{
+    return fbdevHWDPMSSet;
+}
 
 xf86LoadPaletteProc *
-fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; }
+fbdevHWLoadPaletteWeak(void)
+{
+    return fbdevHWLoadPalette;
+}
 
 SaveScreenProcPtr
-fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; }
+fbdevHWSaveScreenWeak(void)
+{
+    return fbdevHWSaveScreen;
+}
diff --git a/xorg-server/hw/xfree86/i2c/bt829.c b/xorg-server/hw/xfree86/i2c/bt829.c
index 64c711681..070cb2044 100644
--- a/xorg-server/hw/xfree86/i2c/bt829.c
+++ b/xorg-server/hw/xfree86/i2c/bt829.c
@@ -1,745 +1,821 @@
-/* TODO: clean up/fix CC code */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <stdlib.h>

-#include <string.h>

-#include <stdio.h>

-

-#include "xf86.h"

-#include "xf86i2c.h"

-#include "bt829.h"

-#include "i2c_def.h"

-

-/* Changing the following settings (especially VCROP) may */

-/* require modifying code that calls this driver.         */

-#define HCROP	0	/* amount to crop from the left and right edges */

-#define VCROP	0	/* amount to crop from the top and bottom edges */

-

-#define BTVERSION	(bt->id>>4)

-

-#define H(X)		( ((X)>>8) & 0xFF )

-#define L(X)		( (X) & 0xFF )

-

-#define LIMIT(X,A,B)	(((X)<(A)) ? (A) : ((X)>(B)) ? (B) : (X) )

-

-/* Bt829 family chip ID's */

-#define BT815	0x02

-#define BT817	0x06

-#define BT819	0x07

-#define BT827	0x0C

-#define BT829	0x0E

-

-/* Bt829 registers */

-#define STATUS		0x00	/* Device Status */

-#define IFORM		0x01	/* Input Format */

-#define TDEC		0x02	/* Temporal Decimation */

-#define CROP		0x03	/* MSB Cropping */

-#define VDELAY_LO	0x04	/* Vertical Delay */

-#define VACTIVE_LO	0x05	/* Vertical Active */

-#define HDELAY_LO	0x06	/* Horizontal Delay */

-#define HACTIVE_LO	0x07	/* Horizontal Active */

-#define HSCALE_HI	0x08	/* Horizontal Scaling */

-#define HSCALE_LO	0x09	/* Horizontal Scaling */

-#define BRIGHT		0x0A	/* Brightness Control */

-#define CONTROL		0x0B	/* Miscellaneous Control */

-#define CONTRAST_LO	0x0C	/* Luma Gain (Contrast) */

-#define SAT_U_LO	0x0D	/* Chroma (U) Gain (Saturation) */

-#define SAT_V_LO	0x0E	/* Chroma (V) Gain (Saturation) */

-#define HUE		0x0F	/* Hue Control */

-#define SCLOOP		0x10	/* SC Loop Control */

-#define WC_UP		0x11	/* White Crush Up Count */

-#define OFORM		0x12	/* Output Format */

-#define VSCALE_HI	0x13	/* Vertical Scaling */

-#define VSCALE_LO	0x14	/* Vertical Scaling */

-#define TEST		0x15	/* Test Control */

-#define VPOLE		0x16	/* Video Timing Polarity */

-#define IDCODE		0x17	/* ID Code */

-#define ADELAY		0x18	/* AGC Delay */

-#define BDELAY		0x19	/* Burst Gate Delay */

-#define ADC		0x1A	/* ADC Interface */

-#define VTC		0x1B	/* Video Timing Control */

-#define CC_STATUS	0x1C	/* Extended Data Services/Closed Capt Status */

-#define CC_DATA		0x1D	/* Extended Data Services/Closed Capt Data */

-#define WC_DN		0x1E	/* White Crush Down Count */

-#define SRESET		0x1F	/* Software Reset */

-#define P_IO		0x3F	/* Programmable I/O */

-

-static CARD8 btread(BT829Ptr bt, CARD8 reg)

-{

-  CARD8 v;

-

-  I2C_WriteRead(&(bt->d), &reg, 1, &v, 1);

-

-  return v;

-}

-

-static void btwrite(BT829Ptr bt, CARD8 reg, CARD8 val)

-{

-  CARD8 data[2];

-

-  data[0] = reg;

-  data[1] = val;

-  I2C_WriteRead(&(bt->d), data, 2, NULL, 0);

-}

-

-/*

- * Register access

- */

-static void btwrite_status(BT829Ptr bt) /* STATUS */

-{

-  btwrite(bt, STATUS, 0x00); /* clear */

-}

-

-static void btwrite_iform(BT829Ptr bt) /* IFORM */

-{

-  int xtsel;

-

-  switch (bt->format) {

-    case BT829_NTSC:

-    case BT829_NTSC_JAPAN:

-    case BT829_PAL_M:

-    case BT829_PAL_N_COMB: /* gatos says xtsel = 2 */

-      xtsel = 1;

-      break;

-    case BT829_PAL:

-    case BT829_PAL_N:

-    case BT829_SECAM:

-      xtsel = 2;

-      break;

-    default: /* shouldn't get here */

-      xtsel = 3; /* hardware default */

-      break;

-  }

-

-  btwrite(bt, IFORM, (bt->mux<<5) | (xtsel<<3) | bt->format);

-}

-

-static void btwrite_tdec(BT829Ptr bt) /* TDEC */

-{

-  /* use default */

-}

-

-static void btwrite_crop(BT829Ptr bt) /* CROP */

-{

-  btwrite(bt, CROP, (H(bt->vdelay)<<6) | (H(bt->vactive)<<4) |

-    (H(bt->hdelay)<<2) | H(bt->width));

-}

-

-static void btwrite_vdelay_lo(BT829Ptr bt) /* VDELAY_LO */

-{

-  btwrite(bt, VDELAY_LO, L(bt->vdelay));

-}

-

-static void btwrite_vactive_lo(BT829Ptr bt) /* VACTIVE_LO */

-{

-  btwrite(bt, VACTIVE_LO, L(bt->vactive));

-}

-

-static void btwrite_hdelay_lo(BT829Ptr bt) /* HDELAY_LO */

-{

-  btwrite(bt, HDELAY_LO, L(bt->hdelay));

-}

-

-static void btwrite_hactive_lo(BT829Ptr bt) /* HACTIVE_LO */

-{

-  btwrite(bt, HACTIVE_LO, L(bt->width));

-}

-

-static void btwrite_hscale_hi(BT829Ptr bt) /* HSCALE_HI */

-{

-  btwrite(bt, HSCALE_HI, H(bt->hscale));

-}

-

-static void btwrite_hscale_lo(BT829Ptr bt) /* HSCALE_LO */

-{

-  btwrite(bt, HSCALE_LO, L(bt->hscale));

-}

-

-static void btwrite_bright(BT829Ptr bt) /* BRIGHT */

-{

-  btwrite(bt, BRIGHT, bt->brightness);

-}

-

-static void btwrite_control(BT829Ptr bt) /* CONTROL */

-{

-  int ldec;

-

-  /* The data sheet says ldec should always be 0 for SECAM */

-  /* but the picture quality is better with ldec = 1       */

-  ldec = (bt->width > 360); /* gatos says 384 */

-

-  btwrite(bt, CONTROL,

-    ((bt->mux==bt->svideo_mux) ? 0xC0:0x00) | /* LNOTCH and COMP */

-    (ldec<<5) | (H(bt->contrast)<<2) | (H(bt->sat_u)<<1) | H(bt->sat_v));

-}

-

-static void btwrite_contrast_lo(BT829Ptr bt) /* CONTRAST_LO */

-{

-  btwrite(bt, CONTRAST_LO, L(bt->contrast));

-}

-

-static void btwrite_sat_u_lo(BT829Ptr bt) /* SAT_U_LO */

-{

-  btwrite(bt, SAT_U_LO, L(bt->sat_u));

-}

-

-static void btwrite_sat_v_lo(BT829Ptr bt) /* SAT_V_LO */

-{

-  btwrite(bt, SAT_V_LO, L(bt->sat_v));

-}

-

-static void btwrite_hue(BT829Ptr bt) /* HUE */

-{

-  btwrite(bt, HUE, bt->hue);

-}

-

-static void btwrite_scloop(BT829Ptr bt) /* SCLOOP */

-{

-  if (BTVERSION >= BT827) {

-    btwrite(bt, SCLOOP,

-      (bt->format==BT829_SECAM) ? 0x10:0x00 /* QCIF or AUTO */

-    );

-  }

-}

-

-static void btwrite_wc_up(BT829Ptr bt) /* WC_UP */

-{

-  if (BTVERSION >= BT827) {

-    /* use default */

-  }

-}

-

-static void btwrite_oform(BT829Ptr bt) /* OFORM */

-{

-  btwrite(bt, OFORM, (bt->code<<3) | (bt->len<<2) |

-    0x02 /* RANGE = 0, CORE = 0, VBI_FRAME = 0, OES = 2 (default) */

-  );

-}

-

-static void btwrite_vscale_hi(BT829Ptr bt) /* VSCALE_HI */

-{

-  btwrite(bt, VSCALE_HI, H(bt->vscale) |

-    0x60 /* YCOMB = 0, COMB = 1, INT = 1 (default) */

-  );

-}

-

-static void btwrite_vscale_lo(BT829Ptr bt) /* VSCALE_LO */

-{

-  btwrite(bt, VSCALE_LO, L(bt->vscale));

-}

-

-/* TEST should not be written to */

-

-static void btwrite_vpole(BT829Ptr bt) /* VPOLE */

-{

-  btwrite(bt, VPOLE, (bt->out_en<<7));

-}

-

-/* IDCODE is read only */

-

-static void btwrite_adelay(BT829Ptr bt) /* ADELAY */

-{

-  switch (bt->format) {

-    case BT829_NTSC:

-    case BT829_NTSC_JAPAN:

-    case BT829_PAL_M:

-      btwrite(bt, ADELAY, 104);

-      break;

-    case BT829_PAL:

-    case BT829_PAL_N:

-    case BT829_SECAM:

-    case BT829_PAL_N_COMB:

-      btwrite(bt, ADELAY, 127);

-      break;

-    default: /* shouldn't get here */

-      btwrite(bt, ADELAY, 104); /* hardware default */

-      break;

-  }

-}

-

-static void btwrite_bdelay(BT829Ptr bt) /* BDELAY */

-{

-  switch (bt->format) {

-    case BT829_NTSC:

-    case BT829_NTSC_JAPAN:

-    case BT829_PAL_M:

-      btwrite(bt, BDELAY, 93);

-      break;

-    case BT829_PAL:

-    case BT829_PAL_N:

-    case BT829_PAL_N_COMB:

-      btwrite(bt, BDELAY, 114);

-      break;

-    case BT829_SECAM:

-      btwrite(bt, BDELAY, 160);

-      break;

-    default: /* shouldn't get here */

-      btwrite(bt, BDELAY, 93); /* hardware default */

-      break;

-  }

-}

-

-static void btwrite_adc(BT829Ptr bt) /* ADC */

-{

-  btwrite(bt, ADC, bt->mux==bt->svideo_mux ? 0x80:0x82); /* CSLEEP = 0 or 1 */

-}

-

-static void btwrite_vtc(BT829Ptr bt) /* VTC */

-{

-  int vfilt = 0; /* hardware default */

-

-  if (BTVERSION > BT827) { /* gatos says >= BT827 */

-    switch (bt->format) {

-      case BT829_NTSC:

-      case BT829_NTSC_JAPAN:

-      case BT829_PAL_M:

-      case BT829_PAL_N_COMB: /* gatos groups with BT829_PAL */

-        if (bt->width <= 360) vfilt = 1; /* gatos says <= 240 */

-        if (bt->width <= 180) vfilt = 2; /* gatos says <= 120 */

-        if (bt->width <=  90) vfilt = 3; /* gatos says <= 60 */

-        break;

-      case BT829_PAL:

-      case BT829_PAL_N:

-      case BT829_SECAM:

-        if (bt->width <= 384) vfilt = 1;

-        if (bt->width <= 192) vfilt = 2;

-        if (bt->width<=  96) vfilt = 3;

-        break;

-      default: /* shouldn't get here */

-        break; /* use hardware default */

-    }

-    btwrite(bt, VTC, (bt->vbien<<4) | (bt->vbifmt<<3) | vfilt);

-  }

-}

-

-static void btwrite_cc_status(BT829Ptr bt) /* CC_STATUS */

-{ /* FIXME: ATI specific */

-  if (BTVERSION >= BT827) {

-    if (bt->ccmode == 0) btwrite(bt, CC_STATUS, 0x00);

-    /* 0x40 is activate to set the CCVALID line. Not required yet */

-    else btwrite(bt, CC_STATUS, (bt->ccmode<<4) | 0x40);

-  }

-}

-

-/* CC_DATA is read only */

-

-static void btwrite_wc_dn(BT829Ptr bt) /* WC_DN */

-{

-  if (BTVERSION >= BT827) {

-    /* use default */

-  }

-}

-

-static void bt_reset(BT829Ptr bt) { /* SRESET */

-  btwrite(bt, SRESET, 0x0); /* Reset all registers */

-}

-

-static void btwrite_p_io(BT829Ptr bt) /* P_IO */

-{

-  if (BTVERSION >= BT827) {

-    btwrite(bt, P_IO, bt->p_io);

-  }

-}

-

-/*

- * Deal with dependencies

- */

-static void propagate_changes(BT829Ptr bt)

-{

-  CARD16 hdelay, unscaled_hdelay, vdelay, hscale, vscale;

-  int htotal, vactive;

-

-  switch (bt->format) {

-    case BT829_NTSC:

-    case BT829_NTSC_JAPAN:

-    case BT829_PAL_M:

-      vdelay = 22;

-      htotal = 754;

-      vactive = 480;

-      unscaled_hdelay = 135;

-      break;

-    case BT829_PAL:

-    case BT829_PAL_N:

-      vdelay = (bt->tunertype==5) ? 34 : 22;

-      htotal = 922;

-      vactive = 576;

-      unscaled_hdelay = 186;

-      break;

-    case BT829_SECAM:

-      vdelay = 34;

-      htotal = 922;

-      vactive = 576;

-      unscaled_hdelay = 186;

-      break;

-    case BT829_PAL_N_COMB:

-      vdelay = (bt->tunertype==5) ? 34 : 22; /* windows says 22 */

-      htotal = 754; /* gatos and windows say 922 */

-      vactive = 576;

-      unscaled_hdelay = 135; /* gatos and windows say 186 */

-      break;

-    default: /* shouldn't get here */

-      vdelay = 22; /* hardware default */

-      htotal = 754;

-      vactive = 480; /* hardware default */

-      unscaled_hdelay = 135;

-      break;

-  }

-

-  bt->htotal = htotal; /* Used for error checking in bt829_SetCaptSize */

-

-  hscale = 4096 * htotal / (bt->width + 2 * HCROP)-4096;

-  hdelay = (

-    HCROP + (bt->width + 2 * HCROP) * unscaled_hdelay / htotal

-  ) & 0x3FE;

-

-  vactive = vactive - 2 * VCROP;

-  vdelay = vdelay + VCROP;

-  vscale = (0x10000 - (512*vactive/bt->height-512)) & 0x1FFF;

-

-  if ((hdelay  != bt->hdelay)  || (vdelay != bt->vdelay) ||

-      (vactive != bt->vactive) || (hscale != bt->hscale) ||

-      (vscale  != bt->vscale)) {

-    bt->hdelay = hdelay;

-    bt->vdelay = vdelay;

-    bt->vactive = vactive;

-    bt->hscale = hscale;

-    bt->vscale = vscale;

-    btwrite_crop(bt);

-    btwrite_vdelay_lo(bt);

-    btwrite_vactive_lo(bt);

-    btwrite_hdelay_lo(bt);

-    btwrite_hscale_hi(bt);

-    btwrite_hscale_lo(bt);

-    btwrite_control(bt);

-    btwrite_vscale_hi(bt);

-    btwrite_vscale_lo(bt);

-  }

-}

-

-static void write_all(BT829Ptr bt)

-{

-  bt_reset(bt);

-  propagate_changes(bt); /* ensure consistency */

-  btwrite_iform(bt);

-  btwrite_tdec(bt);

-  btwrite_crop(bt);

-  btwrite_vdelay_lo(bt);

-  btwrite_vactive_lo(bt);

-  btwrite_hdelay_lo(bt);

-  btwrite_hactive_lo(bt);

-  btwrite_hscale_hi(bt);

-  btwrite_hscale_lo(bt);

-  btwrite_bright(bt);

-  btwrite_control(bt);

-  btwrite_contrast_lo(bt);

-  btwrite_sat_u_lo(bt);

-  btwrite_sat_v_lo(bt);

-  btwrite_hue(bt);

-  btwrite_scloop(bt);

-  btwrite_wc_up(bt);

-  btwrite_oform(bt);

-  btwrite_vscale_hi(bt);

-  btwrite_vscale_lo(bt);

-  btwrite_vpole(bt);

-  btwrite_adelay(bt);

-  btwrite_bdelay(bt);

-  btwrite_adc(bt);

-  btwrite_vtc(bt);

-/*  btwrite_cc_status(bt); */ /* FIXME: CC code needs cleaning */

-  btwrite_wc_dn(bt);

-  btwrite_p_io(bt);

-}

-

-/*

- * Public functions

- */

-BT829Ptr bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr)

-{

-  BT829Ptr bt;

-  I2CByte a;

-

-  bt = calloc(1, sizeof(BT829Rec));

-  if(bt == NULL) return NULL;

-  bt->d.DevName = strdup("BT829 video decoder");

-  bt->d.SlaveAddr = addr;

-  bt->d.pI2CBus = b;

-  bt->d.NextDev = NULL;

-  bt->d.StartTimeout = b->StartTimeout;

-  bt->d.BitTimeout = b->BitTimeout;

-  bt->d.AcknTimeout = b->AcknTimeout;

-  bt->d.ByteTimeout = b->ByteTimeout;

-

-

-  if(!I2C_WriteRead(&(bt->d), NULL, 0, &a, 1))

-  {

-     free(bt);

-     return NULL;

-  }

-

-  bt->id = btread(bt,IDCODE);

-

-  free(bt->d.DevName);

-  bt->d.DevName = calloc(200, sizeof(char));

-  switch(BTVERSION){

-  	case BT815:

-		sprintf(bt->d.DevName, "bt815a video decoder, revision %d",bt->id & 0xf);

-		break;

-	case BT817:

-		sprintf(bt->d.DevName, "bt817a video decoder, revision %d",bt->id & 0xf);

-  		break;

-	case BT819:

-		sprintf(bt->d.DevName, "bt819a video decoder, revision %d",bt->id & 0xf);

-  		break;

-	case BT827:

-		sprintf(bt->d.DevName, "bt827a/b video decoder, revision %d",bt->id & 0xf);

-  		break;

-	case BT829:

-		sprintf(bt->d.DevName, "bt829a/b video decoder, revision %d",bt->id & 0xf);

-  		break;

-	default:

-		sprintf(bt->d.DevName, "bt8xx/unknown video decoder version %d, revision %d",bt->id >> 4,bt->id & 0xf);

-  		break;

-	}

-

-  /* set default parameters */

-  if(!I2CDevInit(&(bt->d)))

-  {

-     free(bt);

-     return NULL;

-  }

-

-  bt->tunertype = 1;

-

-  bt->brightness = 0; /* hardware default */

-  bt->ccmode = 0;

-  bt->code = 0; /* hardware default */

-  bt->contrast = 216; /* hardware default */

-  bt->format = BT829_NTSC;

-  bt->height = 480; /* hardware default for vactive */

-  bt->hue = 0; /* hardware default */

-  bt->len = 1; /* hardware default */

-  bt->mux = BT829_MUX0; /* hardware default */

-  bt->out_en = 0; /* hardware default */

-  bt->p_io = 0; /* hardware default */

-  bt->sat_u = 254; /* hardware default */

-  bt->sat_v = 180; /* hardware default */

-  bt->vbien = 0; /* hardware default */

-  bt->vbifmt = 0; /* hardware default */

-  bt->width = 640; /* hardware default for hactive */

-

-  bt->hdelay = 120; /* hardware default */

-  bt->hscale = 684; /* hardware default */

-  bt->vactive = 480; /* hardware default */

-  bt->vdelay = 22; /* hardware default */

-  bt->vscale = 0; /* hardware default */

-

-  bt->htotal = 754; /* NTSC */

-  bt->svideo_mux = 0; /* no s-video */

-

-  return bt;

-}

-

-int bt829_ATIInit(BT829Ptr bt)

-{

-  bt->code = 1;

-  bt->len = 0;

-  bt->vbien = 1;

-  bt->vbifmt = 1;

-  bt->svideo_mux = BT829_MUX1;

-

-  write_all (bt);

-

-  return 0;

-}

-

-int bt829_SetFormat(BT829Ptr bt, CARD8 format)

-{

-  if ((format < 1) || (format > 7)) return -1;

-  if ((BTVERSION <= BT819) &&

-      (format != BT829_NTSC) && (format != BT829_PAL)) return -1;

-  if (format == bt->format) return 0;

-  bt->format = format;

-  propagate_changes(bt);

-  btwrite_iform(bt);

-  btwrite_scloop(bt);

-  btwrite_adelay(bt);

-  btwrite_bdelay(bt);

-  btwrite_vtc(bt);

-  return 0;

-}

-

-int bt829_SetMux(BT829Ptr bt, CARD8 mux)

-{

-  if ((mux < 1) || (mux > 3)) return -1;

-  if (mux == bt->mux) return 0;

-  bt->mux = mux;

-  /* propagate_changes(bt); */ /* no dependencies */

-  btwrite_iform(bt);

-  btwrite_control(bt);

-  btwrite_adc(bt);

-  return 0;

-}

-

-void bt829_SetBrightness(BT829Ptr bt, int brightness)

-{

-  brightness = LIMIT(brightness,-1000,999); /* ensure -128 <= brightness <= 127 below */

-  brightness = (128*brightness)/1000;

-  if (brightness == bt->brightness) return;

-  bt->brightness = brightness;

-  /* propagate_changes(bt); */ /* no dependencies */

-  btwrite_bright(bt);

-}

-

-void bt829_SetContrast(BT829Ptr bt, int contrast)

-{

-  contrast = LIMIT(contrast,-1000,1000);

-  contrast = (216*(contrast+1000))/1000;

-  if (contrast == bt->contrast) return;

-  bt->contrast = contrast;

-  /* propagate_changes(bt); */ /* no dependencies */

-  btwrite_control(bt);

-  btwrite_contrast_lo(bt);

-}

-

-void bt829_SetSaturation(BT829Ptr bt, int saturation)

-{

-  CARD16 sat_u, sat_v;

-

-  saturation = LIMIT(saturation,-1000,1000);

-  sat_u = (254*(saturation+1000))/1000;

-  sat_v = (180*(saturation+1000))/1000;

-  if ((sat_u == bt->sat_u) && (sat_v == bt->sat_v)) return;

-  bt->sat_u = sat_u;

-  bt->sat_v = sat_v;

-  /* propagate_changes(bt); */ /* no dependencies */

-  btwrite_control(bt);

-  btwrite_sat_u_lo(bt);

-  btwrite_sat_v_lo(bt);

-}

-

-void bt829_SetTint(BT829Ptr bt, int hue)

-{

-  hue = LIMIT(hue,-1000,999); /* ensure -128 <= hue <= 127 below */

-  hue = (128*hue)/1000;

-  if (hue == bt->hue) return;

-  bt->hue = hue;

-  /* propagate_changes(bt); */ /* no dependencies */

-  btwrite_hue(bt);

-}

-

-int bt829_SetCaptSize(BT829Ptr bt, int width, int height)

-{

-  if ((width > bt->htotal - 2 * HCROP) ||

-      (16 * width < bt->htotal - 32 * HCROP)) return -1;

-  if ((height > bt->vactive) || (16 * height < bt->vactive)) return -1;

-  if ((width == bt->width) && (height == bt->height)) return 0;

-  bt->width = width;

-  bt->height = height;

-  propagate_changes(bt);

-  btwrite_crop(bt);

-  btwrite_hactive_lo(bt);

-  btwrite_control(bt);

-  btwrite_vtc(bt);

-  return 0;

-}

-

-int bt829_SetCC(BT829Ptr bt) /* FIXME: should take ccmode as a parameter */

-{

-  if (BTVERSION < BT827) return -1; /* can't do it */

-  /* propagate_changes(bt); */ /* no dependencies */

-  btwrite_cc_status(bt);

-  /* we write to STATUS to reset the CCVALID flag */

-  if (bt->ccmode != 0) btwrite_status(bt);

-  return 0;

-}

-

-void bt829_SetOUT_EN(BT829Ptr bt, BOOL out_en)

-{

-  out_en = (out_en != 0);

-  if (out_en == bt->out_en) return;

-  bt->out_en = out_en;

-  /* propagate_changes(bt); */ /* no dependencies */

-  btwrite_vpole(bt);

-}

-

-void bt829_SetP_IO(BT829Ptr bt, CARD8 p_io)

-{

-  if (p_io == bt->p_io) return;

-  bt->p_io = p_io;

-  /* propagate_changes(bt); */ /* no dependencies */

-  btwrite_p_io(bt);

-}

-

-#define BTREAD(R)	btread(bt,(R))

-

-#if 0

-

-void bt829_getCCdata(BT829Ptr bt,struct CCdata *data)

-{

-  CARD8 status;

-  data->num_valid=0;

-  /* wait for buffer to be half full (means 8/16 bytes)

-   * either 4 (one of CC/EDS) or 2 (both CC/EDS) frames */

-  if(!(BTREAD(STATUS)&0x04)) return; /* could comment this line */

-  for(;data->num_valid<CC_FIFO_SIZE;data->num_valid++) {

-    status=BTREAD(CC_STATUS);

-    if(!(status&0x04)) break;

-    data->data[data->num_valid]= BTREAD(CC_DATA)&0x7f;

-                         /* stripped high bit (parity) */

-    data->status[data->num_valid]= (CCS_EDS*((status&0x02)>>1))  |

-                                 (CCS_HIGH*(status&0x01)) |

-                                 (CCS_OVER*((status&0x08)>>3)) |

-                                 (CCS_PAR*((status&0x80)>>7)) ; }

-  btwrite(bt,STATUS,0x00); /* Reset CCVALID status bit */

-  return;

-}

-

-#endif

-

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

-/* Debug and report routines */

-

-#define DUMPREG(REG)   \

-  xf86DrvMsg(bt->d.pI2CBus->scrnIndex,X_INFO," %-12s (0x%02X) = 0x%02X\n", \

-              #REG,REG,BTREAD(REG))

-

-/*static void bt829_dumpregs(BT829Ptr bt)

-{

-  DUMPREG(STATUS);

-  DUMPREG(IFORM);

-  DUMPREG(TDEC);

-  DUMPREG(CROP);

-  DUMPREG(VDELAY_LO);

-  DUMPREG(VACTIVE_LO);

-  DUMPREG(HDELAY_LO);

-  DUMPREG(HACTIVE_LO);

-  DUMPREG(HSCALE_HI);

-  DUMPREG(HSCALE_LO);

-  DUMPREG(BRIGHT);

-  DUMPREG(CONTROL);

-  DUMPREG(CONTRAST_LO);

-  DUMPREG(SAT_U_LO);

-  DUMPREG(SAT_V_LO);

-  DUMPREG(HUE);

-  if (BTVERSION >= BT827) {

-    DUMPREG(SCLOOP);

-    DUMPREG(WC_UP) ; }

-  DUMPREG(OFORM);

-  DUMPREG(VSCALE_HI);

-  DUMPREG(VSCALE_LO);

-  DUMPREG(TEST);

-  DUMPREG(VPOLE);

-  DUMPREG(IDCODE);

-  DUMPREG(ADELAY);

-  DUMPREG(BDELAY);

-  DUMPREG(ADC);

-  if (BTVERSION >= BT827) {

-    DUMPREG(VTC);

-    DUMPREG(CC_STATUS);

-    DUMPREG(CC_DATA);

-    DUMPREG(WC_DN);

-    DUMPREG(P_IO) ; }

-}*/

+/* TODO: clean up/fix CC code */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "xf86.h"
+#include "xf86i2c.h"
+#include "bt829.h"
+#include "i2c_def.h"
+
+/* Changing the following settings (especially VCROP) may */
+/* require modifying code that calls this driver.         */
+#define HCROP	0               /* amount to crop from the left and right edges */
+#define VCROP	0               /* amount to crop from the top and bottom edges */
+
+#define BTVERSION	(bt->id>>4)
+
+#define H(X)		( ((X)>>8) & 0xFF )
+#define L(X)		( (X) & 0xFF )
+
+#define LIMIT(X,A,B)	(((X)<(A)) ? (A) : ((X)>(B)) ? (B) : (X) )
+
+/* Bt829 family chip ID's */
+#define BT815	0x02
+#define BT817	0x06
+#define BT819	0x07
+#define BT827	0x0C
+#define BT829	0x0E
+
+/* Bt829 registers */
+#define STATUS		0x00    /* Device Status */
+#define IFORM		0x01    /* Input Format */
+#define TDEC		0x02    /* Temporal Decimation */
+#define CROP		0x03    /* MSB Cropping */
+#define VDELAY_LO	0x04    /* Vertical Delay */
+#define VACTIVE_LO	0x05    /* Vertical Active */
+#define HDELAY_LO	0x06    /* Horizontal Delay */
+#define HACTIVE_LO	0x07    /* Horizontal Active */
+#define HSCALE_HI	0x08    /* Horizontal Scaling */
+#define HSCALE_LO	0x09    /* Horizontal Scaling */
+#define BRIGHT		0x0A    /* Brightness Control */
+#define CONTROL		0x0B    /* Miscellaneous Control */
+#define CONTRAST_LO	0x0C    /* Luma Gain (Contrast) */
+#define SAT_U_LO	0x0D    /* Chroma (U) Gain (Saturation) */
+#define SAT_V_LO	0x0E    /* Chroma (V) Gain (Saturation) */
+#define HUE		0x0F    /* Hue Control */
+#define SCLOOP		0x10    /* SC Loop Control */
+#define WC_UP		0x11    /* White Crush Up Count */
+#define OFORM		0x12    /* Output Format */
+#define VSCALE_HI	0x13    /* Vertical Scaling */
+#define VSCALE_LO	0x14    /* Vertical Scaling */
+#define TEST		0x15    /* Test Control */
+#define VPOLE		0x16    /* Video Timing Polarity */
+#define IDCODE		0x17    /* ID Code */
+#define ADELAY		0x18    /* AGC Delay */
+#define BDELAY		0x19    /* Burst Gate Delay */
+#define ADC		0x1A    /* ADC Interface */
+#define VTC		0x1B    /* Video Timing Control */
+#define CC_STATUS	0x1C    /* Extended Data Services/Closed Capt Status */
+#define CC_DATA		0x1D    /* Extended Data Services/Closed Capt Data */
+#define WC_DN		0x1E    /* White Crush Down Count */
+#define SRESET		0x1F    /* Software Reset */
+#define P_IO		0x3F    /* Programmable I/O */
+
+static CARD8
+btread(BT829Ptr bt, CARD8 reg)
+{
+    CARD8 v;
+
+    I2C_WriteRead(&(bt->d), &reg, 1, &v, 1);
+
+    return v;
+}
+
+static void
+btwrite(BT829Ptr bt, CARD8 reg, CARD8 val)
+{
+    CARD8 data[2];
+
+    data[0] = reg;
+    data[1] = val;
+    I2C_WriteRead(&(bt->d), data, 2, NULL, 0);
+}
+
+/*
+ * Register access
+ */
+static void
+btwrite_status(BT829Ptr bt)
+{                               /* STATUS */
+    btwrite(bt, STATUS, 0x00);  /* clear */
+}
+
+static void
+btwrite_iform(BT829Ptr bt)
+{                               /* IFORM */
+    int xtsel;
+
+    switch (bt->format) {
+    case BT829_NTSC:
+    case BT829_NTSC_JAPAN:
+    case BT829_PAL_M:
+    case BT829_PAL_N_COMB:     /* gatos says xtsel = 2 */
+        xtsel = 1;
+        break;
+    case BT829_PAL:
+    case BT829_PAL_N:
+    case BT829_SECAM:
+        xtsel = 2;
+        break;
+    default:                   /* shouldn't get here */
+        xtsel = 3;              /* hardware default */
+        break;
+    }
+
+    btwrite(bt, IFORM, (bt->mux << 5) | (xtsel << 3) | bt->format);
+}
+
+static void
+btwrite_tdec(BT829Ptr bt)
+{                               /* TDEC */
+    /* use default */
+}
+
+static void
+btwrite_crop(BT829Ptr bt)
+{                               /* CROP */
+    btwrite(bt, CROP, (H(bt->vdelay) << 6) | (H(bt->vactive) << 4) |
+            (H(bt->hdelay) << 2) | H(bt->width));
+}
+
+static void
+btwrite_vdelay_lo(BT829Ptr bt)
+{                               /* VDELAY_LO */
+    btwrite(bt, VDELAY_LO, L(bt->vdelay));
+}
+
+static void
+btwrite_vactive_lo(BT829Ptr bt)
+{                               /* VACTIVE_LO */
+    btwrite(bt, VACTIVE_LO, L(bt->vactive));
+}
+
+static void
+btwrite_hdelay_lo(BT829Ptr bt)
+{                               /* HDELAY_LO */
+    btwrite(bt, HDELAY_LO, L(bt->hdelay));
+}
+
+static void
+btwrite_hactive_lo(BT829Ptr bt)
+{                               /* HACTIVE_LO */
+    btwrite(bt, HACTIVE_LO, L(bt->width));
+}
+
+static void
+btwrite_hscale_hi(BT829Ptr bt)
+{                               /* HSCALE_HI */
+    btwrite(bt, HSCALE_HI, H(bt->hscale));
+}
+
+static void
+btwrite_hscale_lo(BT829Ptr bt)
+{                               /* HSCALE_LO */
+    btwrite(bt, HSCALE_LO, L(bt->hscale));
+}
+
+static void
+btwrite_bright(BT829Ptr bt)
+{                               /* BRIGHT */
+    btwrite(bt, BRIGHT, bt->brightness);
+}
+
+static void
+btwrite_control(BT829Ptr bt)
+{                               /* CONTROL */
+    int ldec;
+
+    /* The data sheet says ldec should always be 0 for SECAM */
+    /* but the picture quality is better with ldec = 1       */
+    ldec = (bt->width > 360);   /* gatos says 384 */
+
+    btwrite(bt, CONTROL, ((bt->mux == bt->svideo_mux) ? 0xC0 : 0x00) |  /* LNOTCH and COMP */
+            (ldec << 5) | (H(bt->contrast) << 2) | (H(bt->sat_u) << 1) | H(bt->
+                                                                           sat_v));
+}
+
+static void
+btwrite_contrast_lo(BT829Ptr bt)
+{                               /* CONTRAST_LO */
+    btwrite(bt, CONTRAST_LO, L(bt->contrast));
+}
+
+static void
+btwrite_sat_u_lo(BT829Ptr bt)
+{                               /* SAT_U_LO */
+    btwrite(bt, SAT_U_LO, L(bt->sat_u));
+}
+
+static void
+btwrite_sat_v_lo(BT829Ptr bt)
+{                               /* SAT_V_LO */
+    btwrite(bt, SAT_V_LO, L(bt->sat_v));
+}
+
+static void
+btwrite_hue(BT829Ptr bt)
+{                               /* HUE */
+    btwrite(bt, HUE, bt->hue);
+}
+
+static void
+btwrite_scloop(BT829Ptr bt)
+{                               /* SCLOOP */
+    if (BTVERSION >= BT827) {
+        btwrite(bt, SCLOOP, (bt->format == BT829_SECAM) ? 0x10 : 0x00   /* QCIF or AUTO */
+            );
+    }
+}
+
+static void
+btwrite_wc_up(BT829Ptr bt)
+{                               /* WC_UP */
+    if (BTVERSION >= BT827) {
+        /* use default */
+    }
+}
+
+static void
+btwrite_oform(BT829Ptr bt)
+{                               /* OFORM */
+    btwrite(bt, OFORM, (bt->code << 3) | (bt->len << 2) | 0x02  /* RANGE = 0, CORE = 0, VBI_FRAME = 0, OES = 2 (default) */
+        );
+}
+
+static void
+btwrite_vscale_hi(BT829Ptr bt)
+{                               /* VSCALE_HI */
+    btwrite(bt, VSCALE_HI, H(bt->vscale) | 0x60 /* YCOMB = 0, COMB = 1, INT = 1 (default) */
+        );
+}
+
+static void
+btwrite_vscale_lo(BT829Ptr bt)
+{                               /* VSCALE_LO */
+    btwrite(bt, VSCALE_LO, L(bt->vscale));
+}
+
+/* TEST should not be written to */
+
+static void
+btwrite_vpole(BT829Ptr bt)
+{                               /* VPOLE */
+    btwrite(bt, VPOLE, (bt->out_en << 7));
+}
+
+/* IDCODE is read only */
+
+static void
+btwrite_adelay(BT829Ptr bt)
+{                               /* ADELAY */
+    switch (bt->format) {
+    case BT829_NTSC:
+    case BT829_NTSC_JAPAN:
+    case BT829_PAL_M:
+        btwrite(bt, ADELAY, 104);
+        break;
+    case BT829_PAL:
+    case BT829_PAL_N:
+    case BT829_SECAM:
+    case BT829_PAL_N_COMB:
+        btwrite(bt, ADELAY, 127);
+        break;
+    default:                   /* shouldn't get here */
+        btwrite(bt, ADELAY, 104);       /* hardware default */
+        break;
+    }
+}
+
+static void
+btwrite_bdelay(BT829Ptr bt)
+{                               /* BDELAY */
+    switch (bt->format) {
+    case BT829_NTSC:
+    case BT829_NTSC_JAPAN:
+    case BT829_PAL_M:
+        btwrite(bt, BDELAY, 93);
+        break;
+    case BT829_PAL:
+    case BT829_PAL_N:
+    case BT829_PAL_N_COMB:
+        btwrite(bt, BDELAY, 114);
+        break;
+    case BT829_SECAM:
+        btwrite(bt, BDELAY, 160);
+        break;
+    default:                   /* shouldn't get here */
+        btwrite(bt, BDELAY, 93);        /* hardware default */
+        break;
+    }
+}
+
+static void
+btwrite_adc(BT829Ptr bt)
+{                               /* ADC */
+    btwrite(bt, ADC, bt->mux == bt->svideo_mux ? 0x80 : 0x82);  /* CSLEEP = 0 or 1 */
+}
+
+static void
+btwrite_vtc(BT829Ptr bt)
+{                               /* VTC */
+    int vfilt = 0;              /* hardware default */
+
+    if (BTVERSION > BT827) {    /* gatos says >= BT827 */
+        switch (bt->format) {
+        case BT829_NTSC:
+        case BT829_NTSC_JAPAN:
+        case BT829_PAL_M:
+        case BT829_PAL_N_COMB: /* gatos groups with BT829_PAL */
+            if (bt->width <= 360)
+                vfilt = 1;      /* gatos says <= 240 */
+            if (bt->width <= 180)
+                vfilt = 2;      /* gatos says <= 120 */
+            if (bt->width <= 90)
+                vfilt = 3;      /* gatos says <= 60 */
+            break;
+        case BT829_PAL:
+        case BT829_PAL_N:
+        case BT829_SECAM:
+            if (bt->width <= 384)
+                vfilt = 1;
+            if (bt->width <= 192)
+                vfilt = 2;
+            if (bt->width <= 96)
+                vfilt = 3;
+            break;
+        default:               /* shouldn't get here */
+            break;              /* use hardware default */
+        }
+        btwrite(bt, VTC, (bt->vbien << 4) | (bt->vbifmt << 3) | vfilt);
+    }
+}
+
+static void
+btwrite_cc_status(BT829Ptr bt)
+{                               /* CC_STATUS *//* FIXME: ATI specific */
+    if (BTVERSION >= BT827) {
+        if (bt->ccmode == 0)
+            btwrite(bt, CC_STATUS, 0x00);
+        /* 0x40 is activate to set the CCVALID line. Not required yet */
+        else
+            btwrite(bt, CC_STATUS, (bt->ccmode << 4) | 0x40);
+    }
+}
+
+/* CC_DATA is read only */
+
+static void
+btwrite_wc_dn(BT829Ptr bt)
+{                               /* WC_DN */
+    if (BTVERSION >= BT827) {
+        /* use default */
+    }
+}
+
+static void
+bt_reset(BT829Ptr bt)
+{                               /* SRESET */
+    btwrite(bt, SRESET, 0x0);   /* Reset all registers */
+}
+
+static void
+btwrite_p_io(BT829Ptr bt)
+{                               /* P_IO */
+    if (BTVERSION >= BT827) {
+        btwrite(bt, P_IO, bt->p_io);
+    }
+}
+
+/*
+ * Deal with dependencies
+ */
+static void
+propagate_changes(BT829Ptr bt)
+{
+    CARD16 hdelay, unscaled_hdelay, vdelay, hscale, vscale;
+    int htotal, vactive;
+
+    switch (bt->format) {
+    case BT829_NTSC:
+    case BT829_NTSC_JAPAN:
+    case BT829_PAL_M:
+        vdelay = 22;
+        htotal = 754;
+        vactive = 480;
+        unscaled_hdelay = 135;
+        break;
+    case BT829_PAL:
+    case BT829_PAL_N:
+        vdelay = (bt->tunertype == 5) ? 34 : 22;
+        htotal = 922;
+        vactive = 576;
+        unscaled_hdelay = 186;
+        break;
+    case BT829_SECAM:
+        vdelay = 34;
+        htotal = 922;
+        vactive = 576;
+        unscaled_hdelay = 186;
+        break;
+    case BT829_PAL_N_COMB:
+        vdelay = (bt->tunertype == 5) ? 34 : 22;        /* windows says 22 */
+        htotal = 754;           /* gatos and windows say 922 */
+        vactive = 576;
+        unscaled_hdelay = 135;  /* gatos and windows say 186 */
+        break;
+    default:                   /* shouldn't get here */
+        vdelay = 22;            /* hardware default */
+        htotal = 754;
+        vactive = 480;          /* hardware default */
+        unscaled_hdelay = 135;
+        break;
+    }
+
+    bt->htotal = htotal;        /* Used for error checking in bt829_SetCaptSize */
+
+    hscale = 4096 * htotal / (bt->width + 2 * HCROP) - 4096;
+    hdelay =
+        (HCROP + (bt->width + 2 * HCROP) * unscaled_hdelay / htotal) & 0x3FE;
+
+    vactive = vactive - 2 * VCROP;
+    vdelay = vdelay + VCROP;
+    vscale = (0x10000 - (512 * vactive / bt->height - 512)) & 0x1FFF;
+
+    if ((hdelay != bt->hdelay) || (vdelay != bt->vdelay) ||
+        (vactive != bt->vactive) || (hscale != bt->hscale) ||
+        (vscale != bt->vscale)) {
+        bt->hdelay = hdelay;
+        bt->vdelay = vdelay;
+        bt->vactive = vactive;
+        bt->hscale = hscale;
+        bt->vscale = vscale;
+        btwrite_crop(bt);
+        btwrite_vdelay_lo(bt);
+        btwrite_vactive_lo(bt);
+        btwrite_hdelay_lo(bt);
+        btwrite_hscale_hi(bt);
+        btwrite_hscale_lo(bt);
+        btwrite_control(bt);
+        btwrite_vscale_hi(bt);
+        btwrite_vscale_lo(bt);
+    }
+}
+
+static void
+write_all(BT829Ptr bt)
+{
+    bt_reset(bt);
+    propagate_changes(bt);      /* ensure consistency */
+    btwrite_iform(bt);
+    btwrite_tdec(bt);
+    btwrite_crop(bt);
+    btwrite_vdelay_lo(bt);
+    btwrite_vactive_lo(bt);
+    btwrite_hdelay_lo(bt);
+    btwrite_hactive_lo(bt);
+    btwrite_hscale_hi(bt);
+    btwrite_hscale_lo(bt);
+    btwrite_bright(bt);
+    btwrite_control(bt);
+    btwrite_contrast_lo(bt);
+    btwrite_sat_u_lo(bt);
+    btwrite_sat_v_lo(bt);
+    btwrite_hue(bt);
+    btwrite_scloop(bt);
+    btwrite_wc_up(bt);
+    btwrite_oform(bt);
+    btwrite_vscale_hi(bt);
+    btwrite_vscale_lo(bt);
+    btwrite_vpole(bt);
+    btwrite_adelay(bt);
+    btwrite_bdelay(bt);
+    btwrite_adc(bt);
+    btwrite_vtc(bt);
+    /*  btwrite_cc_status(bt); *//* FIXME: CC code needs cleaning */
+    btwrite_wc_dn(bt);
+    btwrite_p_io(bt);
+}
+
+/*
+ * Public functions
+ */
+BT829Ptr
+bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr)
+{
+    BT829Ptr bt;
+    I2CByte a;
+
+    bt = calloc(1, sizeof(BT829Rec));
+    if (bt == NULL)
+        return NULL;
+    bt->d.DevName = strdup("BT829 video decoder");
+    bt->d.SlaveAddr = addr;
+    bt->d.pI2CBus = b;
+    bt->d.NextDev = NULL;
+    bt->d.StartTimeout = b->StartTimeout;
+    bt->d.BitTimeout = b->BitTimeout;
+    bt->d.AcknTimeout = b->AcknTimeout;
+    bt->d.ByteTimeout = b->ByteTimeout;
+
+    if (!I2C_WriteRead(&(bt->d), NULL, 0, &a, 1)) {
+        free(bt);
+        return NULL;
+    }
+
+    bt->id = btread(bt, IDCODE);
+
+    free(bt->d.DevName);
+    bt->d.DevName = calloc(200, sizeof(char));
+    switch (BTVERSION) {
+    case BT815:
+        sprintf(bt->d.DevName, "bt815a video decoder, revision %d",
+                bt->id & 0xf);
+        break;
+    case BT817:
+        sprintf(bt->d.DevName, "bt817a video decoder, revision %d",
+                bt->id & 0xf);
+        break;
+    case BT819:
+        sprintf(bt->d.DevName, "bt819a video decoder, revision %d",
+                bt->id & 0xf);
+        break;
+    case BT827:
+        sprintf(bt->d.DevName, "bt827a/b video decoder, revision %d",
+                bt->id & 0xf);
+        break;
+    case BT829:
+        sprintf(bt->d.DevName, "bt829a/b video decoder, revision %d",
+                bt->id & 0xf);
+        break;
+    default:
+        sprintf(bt->d.DevName,
+                "bt8xx/unknown video decoder version %d, revision %d",
+                bt->id >> 4, bt->id & 0xf);
+        break;
+    }
+
+    /* set default parameters */
+    if (!I2CDevInit(&(bt->d))) {
+        free(bt);
+        return NULL;
+    }
+
+    bt->tunertype = 1;
+
+    bt->brightness = 0;         /* hardware default */
+    bt->ccmode = 0;
+    bt->code = 0;               /* hardware default */
+    bt->contrast = 216;         /* hardware default */
+    bt->format = BT829_NTSC;
+    bt->height = 480;           /* hardware default for vactive */
+    bt->hue = 0;                /* hardware default */
+    bt->len = 1;                /* hardware default */
+    bt->mux = BT829_MUX0;       /* hardware default */
+    bt->out_en = 0;             /* hardware default */
+    bt->p_io = 0;               /* hardware default */
+    bt->sat_u = 254;            /* hardware default */
+    bt->sat_v = 180;            /* hardware default */
+    bt->vbien = 0;              /* hardware default */
+    bt->vbifmt = 0;             /* hardware default */
+    bt->width = 640;            /* hardware default for hactive */
+
+    bt->hdelay = 120;           /* hardware default */
+    bt->hscale = 684;           /* hardware default */
+    bt->vactive = 480;          /* hardware default */
+    bt->vdelay = 22;            /* hardware default */
+    bt->vscale = 0;             /* hardware default */
+
+    bt->htotal = 754;           /* NTSC */
+    bt->svideo_mux = 0;         /* no s-video */
+
+    return bt;
+}
+
+int
+bt829_ATIInit(BT829Ptr bt)
+{
+    bt->code = 1;
+    bt->len = 0;
+    bt->vbien = 1;
+    bt->vbifmt = 1;
+    bt->svideo_mux = BT829_MUX1;
+
+    write_all(bt);
+
+    return 0;
+}
+
+int
+bt829_SetFormat(BT829Ptr bt, CARD8 format)
+{
+    if ((format < 1) || (format > 7))
+        return -1;
+    if ((BTVERSION <= BT819) && (format != BT829_NTSC) && (format != BT829_PAL))
+        return -1;
+    if (format == bt->format)
+        return 0;
+    bt->format = format;
+    propagate_changes(bt);
+    btwrite_iform(bt);
+    btwrite_scloop(bt);
+    btwrite_adelay(bt);
+    btwrite_bdelay(bt);
+    btwrite_vtc(bt);
+    return 0;
+}
+
+int
+bt829_SetMux(BT829Ptr bt, CARD8 mux)
+{
+    if ((mux < 1) || (mux > 3))
+        return -1;
+    if (mux == bt->mux)
+        return 0;
+    bt->mux = mux;
+    /* propagate_changes(bt); *//* no dependencies */
+    btwrite_iform(bt);
+    btwrite_control(bt);
+    btwrite_adc(bt);
+    return 0;
+}
+
+void
+bt829_SetBrightness(BT829Ptr bt, int brightness)
+{
+    brightness = LIMIT(brightness, -1000, 999); /* ensure -128 <= brightness <= 127 below */
+    brightness = (128 * brightness) / 1000;
+    if (brightness == bt->brightness)
+        return;
+    bt->brightness = brightness;
+    /* propagate_changes(bt); *//* no dependencies */
+    btwrite_bright(bt);
+}
+
+void
+bt829_SetContrast(BT829Ptr bt, int contrast)
+{
+    contrast = LIMIT(contrast, -1000, 1000);
+    contrast = (216 * (contrast + 1000)) / 1000;
+    if (contrast == bt->contrast)
+        return;
+    bt->contrast = contrast;
+    /* propagate_changes(bt); *//* no dependencies */
+    btwrite_control(bt);
+    btwrite_contrast_lo(bt);
+}
+
+void
+bt829_SetSaturation(BT829Ptr bt, int saturation)
+{
+    CARD16 sat_u, sat_v;
+
+    saturation = LIMIT(saturation, -1000, 1000);
+    sat_u = (254 * (saturation + 1000)) / 1000;
+    sat_v = (180 * (saturation + 1000)) / 1000;
+    if ((sat_u == bt->sat_u) && (sat_v == bt->sat_v))
+        return;
+    bt->sat_u = sat_u;
+    bt->sat_v = sat_v;
+    /* propagate_changes(bt); *//* no dependencies */
+    btwrite_control(bt);
+    btwrite_sat_u_lo(bt);
+    btwrite_sat_v_lo(bt);
+}
+
+void
+bt829_SetTint(BT829Ptr bt, int hue)
+{
+    hue = LIMIT(hue, -1000, 999);       /* ensure -128 <= hue <= 127 below */
+    hue = (128 * hue) / 1000;
+    if (hue == bt->hue)
+        return;
+    bt->hue = hue;
+    /* propagate_changes(bt); *//* no dependencies */
+    btwrite_hue(bt);
+}
+
+int
+bt829_SetCaptSize(BT829Ptr bt, int width, int height)
+{
+    if ((width > bt->htotal - 2 * HCROP) ||
+        (16 * width < bt->htotal - 32 * HCROP))
+        return -1;
+    if ((height > bt->vactive) || (16 * height < bt->vactive))
+        return -1;
+    if ((width == bt->width) && (height == bt->height))
+        return 0;
+    bt->width = width;
+    bt->height = height;
+    propagate_changes(bt);
+    btwrite_crop(bt);
+    btwrite_hactive_lo(bt);
+    btwrite_control(bt);
+    btwrite_vtc(bt);
+    return 0;
+}
+
+int
+bt829_SetCC(BT829Ptr bt)
+{                               /* FIXME: should take ccmode as a parameter */
+    if (BTVERSION < BT827)
+        return -1;              /* can't do it */
+    /* propagate_changes(bt); *//* no dependencies */
+    btwrite_cc_status(bt);
+    /* we write to STATUS to reset the CCVALID flag */
+    if (bt->ccmode != 0)
+        btwrite_status(bt);
+    return 0;
+}
+
+void
+bt829_SetOUT_EN(BT829Ptr bt, BOOL out_en)
+{
+    out_en = (out_en != 0);
+    if (out_en == bt->out_en)
+        return;
+    bt->out_en = out_en;
+    /* propagate_changes(bt); *//* no dependencies */
+    btwrite_vpole(bt);
+}
+
+void
+bt829_SetP_IO(BT829Ptr bt, CARD8 p_io)
+{
+    if (p_io == bt->p_io)
+        return;
+    bt->p_io = p_io;
+    /* propagate_changes(bt); *//* no dependencies */
+    btwrite_p_io(bt);
+}
+
+#define BTREAD(R)	btread(bt,(R))
+
+#if 0
+
+void
+bt829_getCCdata(BT829Ptr bt, struct CCdata *data)
+{
+    CARD8 status;
+
+    data->num_valid = 0;
+    /* wait for buffer to be half full (means 8/16 bytes)
+     * either 4 (one of CC/EDS) or 2 (both CC/EDS) frames */
+    if (!(BTREAD(STATUS) & 0x04))
+        return;                 /* could comment this line */
+    for (; data->num_valid < CC_FIFO_SIZE; data->num_valid++) {
+        status = BTREAD(CC_STATUS);
+        if (!(status & 0x04))
+            break;
+        data->data[data->num_valid] = BTREAD(CC_DATA) & 0x7f;
+        /* stripped high bit (parity) */
+        data->status[data->num_valid] = (CCS_EDS * ((status & 0x02) >> 1)) |
+            (CCS_HIGH * (status & 0x01)) |
+            (CCS_OVER * ((status & 0x08) >> 3)) |
+            (CCS_PAR * ((status & 0x80) >> 7));
+    }
+    btwrite(bt, STATUS, 0x00);  /* Reset CCVALID status bit */
+    return;
+}
+
+#endif
+
+/* ------------------------------------------------------------------------ */
+/* Debug and report routines */
+
+#define DUMPREG(REG)   \
+  xf86DrvMsg(bt->d.pI2CBus->scrnIndex,X_INFO," %-12s (0x%02X) = 0x%02X\n", \
+              #REG,REG,BTREAD(REG))
+
+/*static void bt829_dumpregs(BT829Ptr bt)
+{
+  DUMPREG(STATUS);
+  DUMPREG(IFORM);
+  DUMPREG(TDEC);
+  DUMPREG(CROP);
+  DUMPREG(VDELAY_LO);
+  DUMPREG(VACTIVE_LO);
+  DUMPREG(HDELAY_LO);
+  DUMPREG(HACTIVE_LO);
+  DUMPREG(HSCALE_HI);
+  DUMPREG(HSCALE_LO);
+  DUMPREG(BRIGHT);
+  DUMPREG(CONTROL);
+  DUMPREG(CONTRAST_LO);
+  DUMPREG(SAT_U_LO);
+  DUMPREG(SAT_V_LO);
+  DUMPREG(HUE);
+  if (BTVERSION >= BT827) {
+    DUMPREG(SCLOOP);
+    DUMPREG(WC_UP) ; }
+  DUMPREG(OFORM);
+  DUMPREG(VSCALE_HI);
+  DUMPREG(VSCALE_LO);
+  DUMPREG(TEST);
+  DUMPREG(VPOLE);
+  DUMPREG(IDCODE);
+  DUMPREG(ADELAY);
+  DUMPREG(BDELAY);
+  DUMPREG(ADC);
+  if (BTVERSION >= BT827) {
+    DUMPREG(VTC);
+    DUMPREG(CC_STATUS);
+    DUMPREG(CC_DATA);
+    DUMPREG(WC_DN);
+    DUMPREG(P_IO) ; }
+}*/
diff --git a/xorg-server/hw/xfree86/i2c/bt829_module.c b/xorg-server/hw/xfree86/i2c/bt829_module.c
index 12801fbf3..c8a6ac6d1 100644
--- a/xorg-server/hw/xfree86/i2c/bt829_module.c
+++ b/xorg-server/hw/xfree86/i2c/bt829_module.c
@@ -1,21 +1,20 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Module.h"

-

-static XF86ModuleVersionInfo bt829VersRec =

-{

-        "bt829",

-        MODULEVENDORSTRING,

-        MODINFOSTRING1,

-        MODINFOSTRING2,

-        XORG_VERSION_CURRENT,

-        1, 0, 0,

-        ABI_CLASS_VIDEODRV,             /* This needs the video driver ABI */

-        ABI_VIDEODRV_VERSION,

-        MOD_CLASS_NONE,

-        {0,0,0,0}

-};

- 

-_X_EXPORT XF86ModuleData bt829ModuleData = { &bt829VersRec, NULL, NULL }; 

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Module.h"
+
+static XF86ModuleVersionInfo bt829VersRec = {
+    "bt829",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_VIDEODRV,         /* This needs the video driver ABI */
+    ABI_VIDEODRV_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
+};
+
+_X_EXPORT XF86ModuleData bt829ModuleData = { &bt829VersRec, NULL, NULL };
diff --git a/xorg-server/hw/xfree86/i2c/fi1236.c b/xorg-server/hw/xfree86/i2c/fi1236.c
index 0bc50e566..282fe7e34 100644
--- a/xorg-server/hw/xfree86/i2c/fi1236.c
+++ b/xorg-server/hw/xfree86/i2c/fi1236.c
@@ -15,38 +15,36 @@
 
 #define NUM_TUNERS    8
 
-const FI1236_parameters tuner_parms[NUM_TUNERS] =
-{
+const FI1236_parameters tuner_parms[NUM_TUNERS] = {
     /* 0 - FI1236 */
-    { 733, 884, 12820, 2516, 7220, 0xA2, 0x94, 0x34, 0x8e },
+    {733, 884, 12820, 2516, 7220, 0xA2, 0x94, 0x34, 0x8e},
     /* !!!based on documentation - it should be:
-    {733, 16*55.25, 16*801.25, 16*160, 16*454, 0xA0, 0x90, 0x30, 0x8e},*/
+       {733, 16*55.25, 16*801.25, 16*160, 16*454, 0xA0, 0x90, 0x30, 0x8e}, */
 
     /* 1 - FI1216 */
-    { 623, 16*48.75, 16*855.25, 16*170, 16*450, 0xA0, 0x90, 0x30, 0x8e },
+    {623, 16 * 48.75, 16 * 855.25, 16 * 170, 16 * 450, 0xA0, 0x90, 0x30, 0x8e},
     /* 2 - TEMIC FN5AL */
-    { 623, 16*45.75, 16*855.25, 16*169, 16*454, 0xA0, 0x90, 0x30, 0x8e },
+    {623, 16 * 45.75, 16 * 855.25, 16 * 169, 16 * 454, 0xA0, 0x90, 0x30, 0x8e},
     /* 3 - MT2032.. */
-    { 733, 768, 13760,  0,  0,  0,  0,  0, 0 },
+    {733, 768, 13760, 0, 0, 0, 0, 0, 0},
     /* 4 - FI1246 */
-    { 623, 16*45.75, 16*855.25, 16*170, 16*450, 0xA0, 0x90, 0x30, 0x8e },
+    {623, 16 * 45.75, 16 * 855.25, 16 * 170, 16 * 450, 0xA0, 0x90, 0x30, 0x8e},
     /* 5 - FI1256 */
-    { 623, 16*49.75, 16*863.25, 16*170, 16*450, 0xA0, 0x90, 0x30, 0x8e },
+    {623, 16 * 49.75, 16 * 863.25, 16 * 170, 16 * 450, 0xA0, 0x90, 0x30, 0x8e},
     /* 6 - FI1236W */
-    /*{ 733, 884, 12820, 2516, 7220, 0x1, 0x2, 0x4, 0x8e },*/
-    { 732, 16*55.25, 16*801.25, 16*160, 16*442, 0x1, 0x2, 0x4, 0x8e },
+    /*{ 733, 884, 12820, 2516, 7220, 0x1, 0x2, 0x4, 0x8e }, */
+    {732, 16 * 55.25, 16 * 801.25, 16 * 160, 16 * 442, 0x1, 0x2, 0x4, 0x8e},
     /* 7 - FM1216ME */
-    { 623, 16*48.25, 16*863.25, 16*158.00, 16*442.00, 0x1, 0x2, 0x4, 0x8e }
+    {623, 16 * 48.25, 16 * 863.25, 16 * 158.00, 16 * 442.00, 0x1, 0x2, 0x4, 0x8e}
 };
 
-
 FI1236Ptr
-Detect_FI1236 (I2CBusPtr b, I2CSlaveAddr addr)
+Detect_FI1236(I2CBusPtr b, I2CSlaveAddr addr)
 {
     FI1236Ptr f;
     I2CByte a;
 
-    f = calloc(1,sizeof(FI1236Rec));
+    f = calloc(1, sizeof(FI1236Rec));
     if (f == NULL)
         return NULL;
     f->d.DevName = strdup("FI12xx Tuner");
@@ -57,10 +55,10 @@ Detect_FI1236 (I2CBusPtr b, I2CSlaveAddr addr)
     f->d.BitTimeout = b->BitTimeout;
     f->d.AcknTimeout = b->AcknTimeout;
     f->d.ByteTimeout = b->ByteTimeout;
-    f->type=TUNER_TYPE_FI1236;
-    f->afc_timer_installed=FALSE;
-    f->last_afc_hint=TUNER_OFF;
-    f->video_if=45.7812;
+    f->type = TUNER_TYPE_FI1236;
+    f->afc_timer_installed = FALSE;
+    f->last_afc_hint = TUNER_OFF;
+    f->video_if = 45.7812;
 
     if (!I2C_WriteRead(&(f->d), NULL, 0, &a, 1)) {
         free(f);
@@ -75,7 +73,7 @@ Detect_FI1236 (I2CBusPtr b, I2CSlaveAddr addr)
 }
 
 static void
-MT2032_dump_parameters (FI1236Ptr f, MT2032_parameters *m)
+MT2032_dump_parameters(FI1236Ptr f, MT2032_parameters * m)
 {
     xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
                "MT2032: input f_rf=%g f_if1=%g f_if2=%g f_ref=%g f_ifbw=%g f_step=%g\n",
@@ -86,15 +84,14 @@ MT2032_dump_parameters (FI1236Ptr f, MT2032_parameters *m)
                m->f_lo1, m->f_lo2, m->LO1I, m->LO2I, m->SEL, m->STEP, m->NUM);
 }
 
-
 static void
-MT2032_getid (FI1236Ptr f)
+MT2032_getid(FI1236Ptr f)
 {
     CARD8 out[4];
     CARD8 in;
 
     in = 0x11;
-    I2C_WriteRead(&(f->d), (I2CByte *)&in, 1, out, 4);
+    I2C_WriteRead(&(f->d), (I2CByte *) & in, 1, out, 4);
     xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
                "MT2032: Company code 0x%02x%02x, part code 0x%02x, revision code 0x%02x\n",
                out[0], out[1], out[2], out[3]);
@@ -104,37 +101,37 @@ MT2032_getid (FI1236Ptr f)
 /* might be buggy */
 #if 0
 static void
-MT2032_shutdown (FI1236Ptr f)
+MT2032_shutdown(FI1236Ptr f)
 {
     CARD8 data[10];
 
-    data[0] = 0x00; /* start with register 0x00 */
+    data[0] = 0x00;             /* start with register 0x00 */
     data[1] = 0x1A;
     data[2] = 0x44;
     data[3] = 0x20;
 
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 4, NULL, 0);
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 4, NULL, 0);
 
-    data[0] = 0x05; /* now start with register 0x05 */
+    data[0] = 0x05;             /* now start with register 0x05 */
     data[1] = 0xD7;
     data[2] = 0x14;
     data[3] = 0x05;
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 4, NULL, 0);
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 4, NULL, 0);
 
-    data[0] = 0x0B; /* now start with register 0x05 */
+    data[0] = 0x0B;             /* now start with register 0x05 */
     data[1] = 0x8F;
     data[2] = 0x07;
     data[3] = 0x43;
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 4, NULL, 0);
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 4, NULL, 0);
 
     usleep(15000);
 }
 #endif
 
-static void MT2032_dump_status (FI1236Ptr f);
+static void MT2032_dump_status(FI1236Ptr f);
 
 static void
-MT2032_init (FI1236Ptr f)
+MT2032_init(FI1236Ptr f)
 {
     CARD8 data[10];
     CARD8 value;
@@ -142,31 +139,31 @@ MT2032_init (FI1236Ptr f)
 
     MT2032_getid(f);
 
-    data[0] = 0x02; /* start with register 0x02 */
+    data[0] = 0x02;             /* start with register 0x02 */
     data[1] = 0xFF;
     data[2] = 0x0F;
     data[3] = 0x1F;
 
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 4, NULL, 0);
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 4, NULL, 0);
 
-    data[0] = 0x06; /* now start with register 0x06 */
+    data[0] = 0x06;             /* now start with register 0x06 */
     data[1] = 0xE4;
     data[2] = 0x8F;
     data[3] = 0xC3;
     data[4] = 0x4E;
     data[5] = 0xEC;
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 6, NULL, 0);
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 6, NULL, 0);
 
-    data[0] = 0x0d; /* now start with register 0x0d */
+    data[0] = 0x0d;             /* now start with register 0x0d */
     data[1] = 0x32;
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 2, NULL, 0);
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 2, NULL, 0);
 
     while (1) {
-        usleep(15000); /* wait 15 milliseconds */
+        usleep(15000);          /* wait 15 milliseconds */
 
-        data[0] = 0x0e; /* register number 7, status */
+        data[0] = 0x0e;         /* register number 7, status */
         value = 0xFF;
-        if (!I2C_WriteRead(&(f->d), (I2CByte *)data, 1, &value, 1))
+        if (!I2C_WriteRead(&(f->d), (I2CByte *) data, 1, &value, 1))
             xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
                        "MT2032: failed to read XOK\n");
         xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
@@ -175,32 +172,33 @@ MT2032_init (FI1236Ptr f)
             break;
 
         data[0] = 0x07;
-        if (!I2C_WriteRead(&(f->d), (I2CByte *)data, 1, &value, 1))
+        if (!I2C_WriteRead(&(f->d), (I2CByte *) data, 1, &value, 1))
             xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
                        "MT2032: failed to read XOGC\n");
 
-        xogc=value & 0x7;
+        xogc = value & 0x7;
         if (xogc == 4)
-            break; /* XOGC has reached 4.. stop */
+            break;              /* XOGC has reached 4.. stop */
         xogc--;
         xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
                    "MT2032: try XOGC=%d\n", xogc);
         usleep(15000);
-        data[0] = 0x07; /* register number 7, control byte 2 */
+        data[0] = 0x07;         /* register number 7, control byte 2 */
         data[1] = 0x08 | xogc;
-        I2C_WriteRead(&(f->d), (I2CByte *)data, 2, NULL, 0);
+        I2C_WriteRead(&(f->d), (I2CByte *) data, 2, NULL, 0);
     }
     f->xogc = xogc;
     /* wait before continuing */
-    usleep(15000); /* wait 50 milliseconds */
+    usleep(15000);              /* wait 50 milliseconds */
     MT2032_dump_status(f);
 }
 
 static int
-MT2032_no_spur_in_band (MT2032_parameters *m)
+MT2032_no_spur_in_band(MT2032_parameters * m)
 {
     int n_max, n1, n2;
     double f_test;
+
     n_max = 5;
     n1 = 1;
     while (1) {
@@ -233,10 +231,12 @@ MT2032_no_spur_in_band (MT2032_parameters *m)
 }
 
 static void
-MT2032_calculate_register_settings (MT2032_parameters *m, double f_rf,
-   double f_if1, double f_if2, double f_ref, double f_ifbw, double f_step)
+MT2032_calculate_register_settings(MT2032_parameters * m, double f_rf,
+                                   double f_if1, double f_if2, double f_ref,
+                                   double f_ifbw, double f_step)
 {
     int n;
+
     m->f_rf = f_rf;
     m->f_if1 = f_if1;
     m->f_if2 = f_if2;
@@ -244,7 +244,7 @@ MT2032_calculate_register_settings (MT2032_parameters *m, double f_rf,
     m->f_ifbw = f_ifbw;
     m->f_step = f_step;
 
-    m->f_lo1 = f_rf+f_if1;
+    m->f_lo1 = f_rf + f_if1;
     m->LO1I = lrint(m->f_lo1 / f_ref);
     m->f_lo1 = f_ref * m->LO1I;
 
@@ -277,33 +277,33 @@ MT2032_calculate_register_settings (MT2032_parameters *m, double f_rf,
         m->SEL = 2;
     else if (m->f_lo1 < 1890.0)
         m->SEL = 1;
-    else  /* m->f_lo1 < 1958.0 */
+    else                        /* m->f_lo1 < 1958.0 */
         m->SEL = 0;
 
     /* calculate the rest of the registers */
     m->LO2I = floor(m->f_lo2 / f_ref);
     m->STEP = floor(3780.0 * f_step / f_ref);
-    m->NUM  = floor(3780.0 * (m->f_lo2 / f_ref - m->LO2I));
-    m->NUM  = m->STEP * lrint((1.0 * m->NUM) / (1.0 * m->STEP));
+    m->NUM = floor(3780.0 * (m->f_lo2 / f_ref - m->LO2I));
+    m->NUM = m->STEP * lrint((1.0 * m->NUM) / (1.0 * m->STEP));
 }
 
 static int
-MT2032_wait_for_lock (FI1236Ptr f)
+MT2032_wait_for_lock(FI1236Ptr f)
 {
     int n;
     CARD8 data[10];
     CARD8 value;
 
-    n=12;
-    while(1) {
-        data[0] = 0x0e; /* register number 7, status */
-        I2C_WriteRead(&(f->d), (I2CByte *)data, 1, &value, 1);
-     /* xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
-                   "MT2032: LO1LK=%d LO2LK=%d\n",
-                   (value & 0x04)>>2, (value & 0x02)>>1); */
-        if ((value & 6)==6)
+    n = 12;
+    while (1) {
+        data[0] = 0x0e;         /* register number 7, status */
+        I2C_WriteRead(&(f->d), (I2CByte *) data, 1, &value, 1);
+        /* xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
+           "MT2032: LO1LK=%d LO2LK=%d\n",
+           (value & 0x04)>>2, (value & 0x02)>>1); */
+        if ((value & 6) == 6)
             break;
-        usleep (1500);
+        usleep(1500);
         n--;
         if (n < 0)
             break;
@@ -317,50 +317,50 @@ MT2032_wait_for_lock (FI1236Ptr f)
 }
 
 static void
-MT2032_implement_settings (FI1236Ptr f, MT2032_parameters *m)
+MT2032_implement_settings(FI1236Ptr f, MT2032_parameters * m)
 {
     CARD8 data[10];
     CARD8 value;
 
-    data[0] = 0x00;     /* start with register 0x00 */
+    data[0] = 0x00;             /* start with register 0x00 */
     data[1] = (m->LO1I >> 3) - 1;
     data[2] = (m->SEL << 4) | (m->LO1I & 0x7);
     data[3] = 0x86;
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 4, NULL, 0);
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 4, NULL, 0);
 
-    data[0] = 0x05;     /* start with register 0x05 */
+    data[0] = 0x05;             /* start with register 0x05 */
     data[1] = ((m->LO2I & 0x7) << 5) | ((m->LO2I >> 3) - 1);
     if (m->f_rf < 400.0)
         data[2] = 0xe4;
     else
         data[2] = 0xf4;
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 3, NULL, 0);
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 3, NULL, 0);
 
-    data[0] = 0x07;     /* register number 7, control byte 2 */
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 1, &value, 1);
+    data[0] = 0x07;             /* register number 7, control byte 2 */
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 1, &value, 1);
     xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
                "MT2032: using XOGC=%d\n", (value & 0x07));
     data[1] = 8 | (value & 0x7);
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 2, NULL, 0);
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 2, NULL, 0);
 
-    data[0] = 0x0b;     /* start with register 0x0b */
+    data[0] = 0x0b;             /* start with register 0x0b */
     data[1] = m->NUM & 0xff;
-    data[2] = (1<<7) | ((m->NUM >> 8) & 0x0f);
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 3, NULL, 0);
+    data[2] = (1 << 7) | ((m->NUM >> 8) & 0x0f);
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 3, NULL, 0);
 
     MT2032_wait_for_lock(f);
 }
 
 static void
-MT2032_optimize_VCO (FI1236Ptr f, MT2032_parameters *m)
+MT2032_optimize_VCO(FI1236Ptr f, MT2032_parameters * m)
 {
     CARD8 data[10];
     CARD8 value;
     CARD8 TAD1;
 
-    data[0] = 0x0f; /* register number 7, status */
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 1, &value, 1);
-    TAD1=value & 0x07;
+    data[0] = 0x0f;             /* register number 7, status */
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 1, &value, 1);
+    TAD1 = value & 0x07;
     xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
                "MT2032: TAD1=%d SEL=%d\n", TAD1, m->SEL);
     if (TAD1 < 2)
@@ -369,25 +369,27 @@ MT2032_optimize_VCO (FI1236Ptr f, MT2032_parameters *m)
         if (m->SEL == 0)
             return;
         m->SEL--;
-    } else {
+    }
+    else {
         if (m->SEL >= 4)
             return;
         m->SEL++;
     }
-    data[0] = 0x01;  /* start with register 1 */
+    data[0] = 0x01;             /* start with register 1 */
     data[1] = (m->SEL << 4) | (m->LO1I & 0x7);
-    I2C_WriteRead(&(f->d), (I2CByte *)data, 2, NULL, 0);
+    I2C_WriteRead(&(f->d), (I2CByte *) data, 2, NULL, 0);
 
 }
 
 static int
-FI1236_get_afc_hint (FI1236Ptr f)
+FI1236_get_afc_hint(FI1236Ptr f)
 {
     CARD8 out;
     CARD8 AFC;
 
     if ((f->type == TUNER_TYPE_FM1216ME) || (f->type == TUNER_TYPE_FI1236W)) {
-        TDA9885Ptr t = (TDA9885Ptr)f->afc_source;
+        TDA9885Ptr t = (TDA9885Ptr) f->afc_source;
+
         if (t == NULL)
             return TUNER_OFF;
 
@@ -405,7 +407,8 @@ FI1236_get_afc_hint (FI1236Ptr f)
             return TUNER_JUST_ABOVE;
         else if (AFC == 0x0f)
             return TUNER_TUNED;
-    } else {
+    }
+    else {
         I2C_WriteRead(&(f->d), NULL, 0, &out, 1);
         AFC = out & 0x7;
         xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
@@ -422,17 +425,18 @@ FI1236_get_afc_hint (FI1236Ptr f)
 }
 
 static int
-MT2032_get_afc_hint (FI1236Ptr f)
+MT2032_get_afc_hint(FI1236Ptr f)
 {
     CARD8 in;
     CARD8 out[2];
     CARD8 AFC;
+
     in = 0x0e;
-    I2C_WriteRead(&(f->d), (I2CByte *)&in, 1, out, 2);
+    I2C_WriteRead(&(f->d), (I2CByte *) & in, 1, out, 2);
     AFC = (out[0] >> 4) & 0x7;
 #if 0
     xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "AFC=%d TAD1=%d TAD2=%d\n",
-               AFC, out[1] & 0x7, (out[1]>>4)& 0x07);
+               AFC, out[1] & 0x7, (out[1] >> 4) & 0x07);
 #endif
     if (AFC == 2)
         return TUNER_TUNED;
@@ -445,7 +449,7 @@ MT2032_get_afc_hint (FI1236Ptr f)
 
 /* this function is for external use only */
 int
-TUNER_get_afc_hint (FI1236Ptr f)
+TUNER_get_afc_hint(FI1236Ptr f)
 {
     if (f->afc_timer_installed)
         return TUNER_STILL_TUNING;
@@ -453,7 +457,7 @@ TUNER_get_afc_hint (FI1236Ptr f)
 }
 
 static void
-MT2032_dump_status (FI1236Ptr f)
+MT2032_dump_status(FI1236Ptr f)
 {
     CARD8 in;
     CARD8 out[2];
@@ -463,16 +467,16 @@ MT2032_dump_status (FI1236Ptr f)
     CARD8 TAD2, TAD1;
 
     in = 0x0e;
-    I2C_WriteRead(&(f->d), (I2CByte *)&in, 1, out, 2);
+    I2C_WriteRead(&(f->d), (I2CByte *) & in, 1, out, 2);
     XOK = out[0] & 1;
-    LO1LK  = (out[0] >> 2) & 1;
-    LO2LK  = (out[0] >> 1) & 1;
+    LO1LK = (out[0] >> 2) & 1;
+    LO2LK = (out[0] >> 1) & 1;
     LDONrb = (out[0] >> 3) & 1;
 
-    AFC    = (out[0] >> 4) & 0x7;
+    AFC = (out[0] >> 4) & 0x7;
 
-    TAD1   = (out[1] & 0x7);
-    TAD2   = (out[1] >> 4) & 0x7;
+    TAD1 = (out[1] & 0x7);
+    TAD2 = (out[1] >> 4) & 0x7;
 
     xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
                "MT2032: status: XOK=%d LO1LK=%d LO2LK=%d LDONrb=%d AFC=%d TAD1=%d TAD2=%d\n",
@@ -480,12 +484,12 @@ MT2032_dump_status (FI1236Ptr f)
     xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
                "MT2032: status: OSCILLATOR:%s PLL1:%s PLL2:%s\n",
                XOK ? "ok" : "off",
-               LO1LK ? "locked" : "off",
-               LO2LK ? "locked" : "off");
+               LO1LK ? "locked" : "off", LO2LK ? "locked" : "off");
 
 }
 
-static void MT2032_tune(FI1236Ptr f, double freq, double step)
+static void
+MT2032_tune(FI1236Ptr f, double freq, double step)
 {
     MT2032_parameters m;
     CARD8 data[10];
@@ -494,38 +498,41 @@ static void MT2032_tune(FI1236Ptr f, double freq, double step)
     /* NTSC IF is 44mhz.. but 733/16=45.8125 and all TDAXXXX docs mention
        45.75, 39, 58.75 and 30. */
 #if 0
-    MT2032_calculate_register_settings(&m, freq, 1090.0, 45.125, 5.25, 6.0, step);
-    MT2032_calculate_register_settings(&m, freq, 1090.0, 45.74, 5.25, 6.0, step);
+    MT2032_calculate_register_settings(&m, freq, 1090.0, 45.125, 5.25, 6.0,
+                                       step);
+    MT2032_calculate_register_settings(&m, freq, 1090.0, 45.74, 5.25, 6.0,
+                                       step);
 #endif
-    MT2032_calculate_register_settings(&m, freq, 1090.0, f->video_if, 5.25, 3.0, step);
+    MT2032_calculate_register_settings(&m, freq, 1090.0, f->video_if, 5.25, 3.0,
+                                       step);
     MT2032_dump_parameters(f, &m);
     MT2032_implement_settings(f, &m);
- /* MT2032_dump_parameters(f, &m); */
+    /* MT2032_dump_parameters(f, &m); */
     for (i = 0; i < 3; i++) {
         MT2032_optimize_VCO(f, &m);
         if (MT2032_wait_for_lock(f)) {
-            data[0] = 0x02;  /* LO Gain control register 0x02 */
+            data[0] = 0x02;     /* LO Gain control register 0x02 */
             data[1] = 0x20;
-            I2C_WriteRead(&(f->d), (I2CByte *)data, 2, NULL, 0);
+            I2C_WriteRead(&(f->d), (I2CByte *) data, 2, NULL, 0);
             return;
         }
         data[0] = 0x07;
         data[1] = 0x88 | f->xogc;
-        I2C_WriteRead(&(f->d), (I2CByte *)data, 2, NULL, 0);
+        I2C_WriteRead(&(f->d), (I2CByte *) data, 2, NULL, 0);
         usleep(15000);
         data[1] = 0x08 | f->xogc;
-        I2C_WriteRead(&(f->d), (I2CByte *)data, 2, NULL, 0);
+        I2C_WriteRead(&(f->d), (I2CByte *) data, 2, NULL, 0);
     }
     xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
                "MT2032: failed to set frequency\n");
 }
 
 void
-FI1236_set_tuner_type (FI1236Ptr f, int type)
+FI1236_set_tuner_type(FI1236Ptr f, int type)
 {
     f->type = type;
     if (type >= NUM_TUNERS)
-        type = NUM_TUNERS-1;
+        type = NUM_TUNERS - 1;
     if (type < 0)
         type = 0;
     memcpy(&(f->parm), &(tuner_parms[type]), sizeof(FI1236_parameters));
@@ -537,11 +544,11 @@ FI1236_set_tuner_type (FI1236Ptr f, int type)
     }
 }
 
-
 static CARD32
 AFC_TimerCallback(OsTimerPtr timer, CARD32 time, pointer data)
 {
-    FI1236Ptr f = (FI1236Ptr)data;
+    FI1236Ptr f = (FI1236Ptr) data;
+
     if (FI1236_AFC(f))
         return 150;
     else {
@@ -557,12 +564,14 @@ FI1236_tune(FI1236Ptr f, CARD32 frequency)
     CARD16 divider;
     CARD8 data;
 
-    if (frequency < f->parm.min_freq) frequency = f->parm.min_freq;
-    if (frequency > f->parm.max_freq) frequency = f->parm.max_freq;
+    if (frequency < f->parm.min_freq)
+        frequency = f->parm.min_freq;
+    if (frequency > f->parm.max_freq)
+        frequency = f->parm.max_freq;
 
-    divider = (f->parm.fcar + (CARD16)frequency) & 0x7fff;
-    f->tuner_data.div1 = (CARD8)((divider >> 8)&0x7f);
-    f->tuner_data.div2 = (CARD8)(divider & 0xff);
+    divider = (f->parm.fcar + (CARD16) frequency) & 0x7fff;
+    f->tuner_data.div1 = (CARD8) ((divider >> 8) & 0x7f);
+    f->tuner_data.div2 = (CARD8) (divider & 0xff);
     f->tuner_data.control = f->parm.control;
 
     if (frequency < f->parm.threshold1)
@@ -576,41 +585,42 @@ FI1236_tune(FI1236Ptr f, CARD32 frequency)
                "Setting tuner band to %d\n", f->tuner_data.band);
 
     xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
-               "Setting tuner frequency to %d\n", (int)frequency);
+               "Setting tuner frequency to %d\n", (int) frequency);
 
     if ((f->type == TUNER_TYPE_FM1216ME) || (f->type == TUNER_TYPE_FI1236W)) {
         f->tuner_data.aux = 0x20;
-        I2C_WriteRead(&(f->d), (I2CByte *)&(f->tuner_data), 5, NULL, 0);
+        I2C_WriteRead(&(f->d), (I2CByte *) & (f->tuner_data), 5, NULL, 0);
         I2C_WriteRead(&(f->d), NULL, 0, &data, 1);
         xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Tuner status %x\n", data);
     }
     else
-        I2C_WriteRead(&(f->d), (I2CByte *)&(f->tuner_data), 4, NULL, 0);
+        I2C_WriteRead(&(f->d), (I2CByte *) & (f->tuner_data), 4, NULL, 0);
 }
 
 void
 TUNER_set_frequency(FI1236Ptr f, CARD32 frequency)
 {
-    if (frequency < f->parm.min_freq) frequency = f->parm.min_freq;
-    if (frequency > f->parm.max_freq) frequency = f->parm.max_freq;
+    if (frequency < f->parm.min_freq)
+        frequency = f->parm.min_freq;
+    if (frequency > f->parm.max_freq)
+        frequency = f->parm.max_freq;
 
-    f->afc_delta=0;
-    f->original_frequency=frequency;
+    f->afc_delta = 0;
+    f->original_frequency = frequency;
 
     if (f->type == TUNER_TYPE_MT2032)
-        MT2032_tune(f, (1.0*frequency)/16.0, 0.0625);
+        MT2032_tune(f, (1.0 * frequency) / 16.0, 0.0625);
     else
         FI1236_tune(f, frequency);
 
     if (!f->afc_timer_installed) {
-        f->afc_timer_installed=TRUE;
+        f->afc_timer_installed = TRUE;
 /*      RegisterBlockAndWakeupHandlers(FI1236_BlockHandler, AFCWakeup, f); */
         TimerSet(NULL, 0, 300, AFC_TimerCallback, f);
     }
 
 }
 
-
 int
 FI1236_AFC(FI1236Ptr f)
 {
@@ -637,12 +647,13 @@ FI1236_AFC(FI1236Ptr f)
                    "AFC: Setting tuner frequency to %g\n",
                    (0.5 * (2 * f->original_frequency + f->afc_delta)) / 16.0);
         MT2032_tune(f,
-                    (1.0 * f->original_frequency+ 0.5 * f->afc_delta) / 16.0,
+                    (1.0 * f->original_frequency + 0.5 * f->afc_delta) / 16.0,
                     0.03125);
         if (f->last_afc_hint == TUNER_OFF)
             return 0;
-        return 1; /* call me again */
-    } else {
+        return 1;               /* call me again */
+    }
+    else {
         f->last_afc_hint = FI1236_get_afc_hint(f);
         if (f->last_afc_hint == TUNER_TUNED) {
             xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "AFC: TUNER_TUNNED\n");
@@ -652,9 +663,9 @@ FI1236_AFC(FI1236Ptr f)
             f->last_afc_hint = TUNER_OFF;
 
         if (f->last_afc_hint == TUNER_OFF)
-            f->afc_delta=0;
+            f->afc_delta = 0;
         else
-            f->afc_delta+=f->last_afc_hint;
+            f->afc_delta += f->last_afc_hint;
 
         xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
                    "AFC: Setting tuner frequency to %g\n",
@@ -662,9 +673,9 @@ FI1236_AFC(FI1236Ptr f)
         FI1236_tune(f, f->original_frequency + f->afc_delta);
         if (f->last_afc_hint == TUNER_OFF)
             return 0;
-        return 1; /* call me again */
+        return 1;               /* call me again */
     }
-    return 0; /* done */
+    return 0;                   /* done */
 }
 
 void
diff --git a/xorg-server/hw/xfree86/i2c/fi1236_module.c b/xorg-server/hw/xfree86/i2c/fi1236_module.c
index 7375e0fb9..2f453d964 100644
--- a/xorg-server/hw/xfree86/i2c/fi1236_module.c
+++ b/xorg-server/hw/xfree86/i2c/fi1236_module.c
@@ -1,25 +1,24 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Module.h"

-

-static XF86ModuleVersionInfo fi1236VersRec =

-{

-        "fi1236",

-        MODULEVENDORSTRING,

-        MODINFOSTRING1,

-        MODINFOSTRING2,

-        XORG_VERSION_CURRENT,

-        1, 0, 0,

-        ABI_CLASS_VIDEODRV,             /* This needs the video driver ABI */

-        ABI_VIDEODRV_VERSION,

-        MOD_CLASS_NONE,

-        {0,0,0,0}

-};

- 

-_X_EXPORT XF86ModuleData fi1236ModuleData = {

-        &fi1236VersRec,

-        NULL,

-        NULL

-}; 

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Module.h"
+
+static XF86ModuleVersionInfo fi1236VersRec = {
+    "fi1236",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_VIDEODRV,         /* This needs the video driver ABI */
+    ABI_VIDEODRV_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
+};
+
+_X_EXPORT XF86ModuleData fi1236ModuleData = {
+    &fi1236VersRec,
+    NULL,
+    NULL
+};
diff --git a/xorg-server/hw/xfree86/i2c/msp3430.c b/xorg-server/hw/xfree86/i2c/msp3430.c
index df8adc435..312a2d1d1 100644
--- a/xorg-server/hw/xfree86/i2c/msp3430.c
+++ b/xorg-server/hw/xfree86/i2c/msp3430.c
@@ -16,11 +16,10 @@
 #define WR_DSP          0x12
 #define RD_DSP          0x13
 
-
 void InitMSP34xxG(MSP3430Ptr m);
 void InitMSP34x5D(MSP3430Ptr m);
 void CheckModeMSP34x5D(MSP3430Ptr m);
-static const char *MSP_getProductName (CARD16 product_id);
+static const char *MSP_getProductName(CARD16 product_id);
 void mpause(int milliseconds);
 
 #define __MSPDEBUG__	0
@@ -28,275 +27,296 @@ void mpause(int milliseconds);
 #if __MSPDEBUG__ > 3
 
 void MSPBeep(MSP3430Ptr m, CARD8 freq);
+
 #define __MSPBEEP MSPBeep(m,0x14);
 
 #else
 
-#define __MSPBEEP 
+#define __MSPBEEP
 #endif
 
-static void SetMSP3430Control(MSP3430Ptr m, CARD8 RegAddress, CARD8 RegValueHigh, CARD8 RegValueLow)
+static void
+SetMSP3430Control(MSP3430Ptr m, CARD8 RegAddress, CARD8 RegValueHigh,
+                  CARD8 RegValueLow)
 {
-   I2CByte data[3];
-   
-   data[0]=RegAddress;
-   data[1]=RegValueHigh;
-   data[2]=RegValueLow;
-   
-   I2C_WriteRead(&(m->d),data,3,NULL,0);
+    I2CByte data[3];
+
+    data[0] = RegAddress;
+    data[1] = RegValueHigh;
+    data[2] = RegValueLow;
+
+    I2C_WriteRead(&(m->d), data, 3, NULL, 0);
 }
 
-static void SetMSP3430Data(MSP3430Ptr m, CARD8 RegAddress, CARD8 RegSubAddressHigh, CARD8 RegSubAddressLow, 
-     CARD8 RegValueHigh, CARD8 RegValueLow)
+static void
+SetMSP3430Data(MSP3430Ptr m, CARD8 RegAddress, CARD8 RegSubAddressHigh,
+               CARD8 RegSubAddressLow, CARD8 RegValueHigh, CARD8 RegValueLow)
 {
-   I2CByte data[5];
+    I2CByte data[5];
+
 #ifdef MSP_DEBUG
-   if(!m->registers_present[RegSubAddressLow]){
-   	xf86DrvMsg(m->d.pI2CBus->scrnIndex,X_ERROR, "Attempt to access non-existent register in MSP34xxX: 0x%02x 0x%02x 0x%02x <- 0x%02x 0x%02x\n",
-		RegAddress, RegSubAddressHigh, RegSubAddressLow, RegValueHigh, RegValueLow);
-   	}
+    if (!m->registers_present[RegSubAddressLow]) {
+        xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_ERROR,
+                   "Attempt to access non-existent register in MSP34xxX: 0x%02x 0x%02x 0x%02x <- 0x%02x 0x%02x\n",
+                   RegAddress, RegSubAddressHigh, RegSubAddressLow,
+                   RegValueHigh, RegValueLow);
+    }
 #endif
-   
-   data[0] = RegAddress;
-   data[1] = RegSubAddressHigh;
-   data[2] = RegSubAddressLow;
-   data[3] = RegValueHigh;
-   data[4] = RegValueLow;
-   
-   I2C_WriteRead(&(m->d),data,5,NULL,0);
+
+    data[0] = RegAddress;
+    data[1] = RegSubAddressHigh;
+    data[2] = RegSubAddressLow;
+    data[3] = RegValueHigh;
+    data[4] = RegValueLow;
+
+    I2C_WriteRead(&(m->d), data, 5, NULL, 0);
 }
 
-static void GetMSP3430Data(MSP3430Ptr m, CARD8 RegAddress, CARD8 RegSubAddressHigh, CARD8 RegSubAddressLow,
-            CARD8 *RegValueHigh, CARD8 *RegValueLow)
+static void
+GetMSP3430Data(MSP3430Ptr m, CARD8 RegAddress, CARD8 RegSubAddressHigh,
+               CARD8 RegSubAddressLow, CARD8 *RegValueHigh, CARD8 *RegValueLow)
 {
-   I2CByte  send[3];
-   I2CByte  receive[2];
-   
-   send[0] = RegAddress;
-   send[1] = RegSubAddressHigh;
-   send[2] = RegSubAddressLow;
-   
-   I2C_WriteRead(&(m->d), send, 3, receive, 2);
-   
-   *RegValueHigh = receive[0];
-   *RegValueLow = receive[1];
+    I2CByte send[3];
+    I2CByte receive[2];
+
+    send[0] = RegAddress;
+    send[1] = RegSubAddressHigh;
+    send[2] = RegSubAddressLow;
+
+    I2C_WriteRead(&(m->d), send, 3, receive, 2);
+
+    *RegValueHigh = receive[0];
+    *RegValueLow = receive[1];
 }
 
 #if __MSPDEBUG__ > 2
-static void MSP3430DumpStatus(MSP3430Ptr m)
+static void
+MSP3430DumpStatus(MSP3430Ptr m)
 {
-CARD8 status_hi, status_lo;
-CARD8 subaddr, data[2];
-
-GetMSP3430Data(m, RD_DEM, 0x02, 0x00, &status_hi, &status_lo);
-xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP34xx: SAP(8)=%d mono/NICAM(7)=%d stereo=%d %s O_1=%d O_0=%d 2nd car=%d 1st car=%d\n",
-		status_hi & 1, (status_lo>>7) & 1, (status_lo>>6)&1, 
-		(status_lo>>5)? ( (status_hi>>1)&1? "bad NICAM reception" : "NICAM" ) : 
-		                ((status_hi>>1)&1 ? "bogus" : "ANALOG FM/AM") , 
-		(status_lo>>4)&1, (status_lo>>3)&1,!( (status_lo>>2)&1), !((status_lo>>1)&1));
-
-GetMSP3430Data(m, RD_DEM, 0x00, 0x7E, &status_hi, &status_lo);
-xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP34xx: standard result=0x%02x%02x\n",
-		status_hi, status_lo);
-subaddr=0x0;
-I2C_WriteRead(&(m->d), &subaddr, 1, data, 2);
-xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP34xx: control=0x%02x%02x\n",
-		data[1], data[0]);
+    CARD8 status_hi, status_lo;
+    CARD8 subaddr, data[2];
+
+    GetMSP3430Data(m, RD_DEM, 0x02, 0x00, &status_hi, &status_lo);
+    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO,
+               "MSP34xx: SAP(8)=%d mono/NICAM(7)=%d stereo=%d %s O_1=%d O_0=%d 2nd car=%d 1st car=%d\n",
+               status_hi & 1, (status_lo >> 7) & 1, (status_lo >> 6) & 1,
+               (status_lo >> 5) ? ((status_hi >> 1) & 1 ? "bad NICAM reception"
+                                   : "NICAM") : ((status_hi >> 1) & 1 ? "bogus"
+                                                 : "ANALOG FM/AM"),
+               (status_lo >> 4) & 1, (status_lo >> 3) & 1,
+               !((status_lo >> 2) & 1), !((status_lo >> 1) & 1));
+
+    GetMSP3430Data(m, RD_DEM, 0x00, 0x7E, &status_hi, &status_lo);
+    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO,
+               "MSP34xx: standard result=0x%02x%02x\n", status_hi, status_lo);
+    subaddr = 0x0;
+    I2C_WriteRead(&(m->d), &subaddr, 1, data, 2);
+    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP34xx: control=0x%02x%02x\n",
+               data[1], data[0]);
 }
 #endif
 
 /* wrapper */
-void InitMSP3430(MSP3430Ptr m)
+void
+InitMSP3430(MSP3430Ptr m)
 {
-  #if __MSPDEBUG__ > 1
-  xf86DrvMsg(m->d.pI2CBus->scrnIndex,X_INFO,"InitMSP3430(m->connector=%d, m->standard=%d, m->chip_family=%d)\n",
-  		m->connector, m->standard, m->chip_family);
-  #endif
-	switch (m->chip_family) {
-		case MSPFAMILY_34x0G:
-			InitMSP34xxG(m);
-			break;
-		case MSPFAMILY_34x5G:
-			InitMSP34xxG(m);
-			break;
-		case MSPFAMILY_34x5D:
-			InitMSP34x5D(m);
-			break;
-	}
+#if __MSPDEBUG__ > 1
+    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO,
+               "InitMSP3430(m->connector=%d, m->standard=%d, m->chip_family=%d)\n",
+               m->connector, m->standard, m->chip_family);
+#endif
+    switch (m->chip_family) {
+    case MSPFAMILY_34x0G:
+        InitMSP34xxG(m);
+        break;
+    case MSPFAMILY_34x5G:
+        InitMSP34xxG(m);
+        break;
+    case MSPFAMILY_34x5D:
+        InitMSP34x5D(m);
+        break;
+    }
 }
 
 /*-----------------------------------------------------------------
 | common functions for all MSP34xx chips 
 |----------------------------------------------------------------*/
 
-MSP3430Ptr DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr)
+MSP3430Ptr
+DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr)
 {
-   MSP3430Ptr m;
-   I2CByte a;
-   CARD8 hardware_version, major_revision, product_code, rom_version;
-   Bool supported;
-   
-   m = calloc(1,sizeof(MSP3430Rec));
-   if(m == NULL)return NULL;
-   m->d.DevName = strdup("MSP34xx");
-   m->d.SlaveAddr = addr;
-   m->d.pI2CBus = b;
-   m->d.NextDev = NULL;
-   m->d.StartTimeout = b->StartTimeout;
-   m->d.BitTimeout = b->BitTimeout;
-   m->d.AcknTimeout = b->AcknTimeout;
-   m->d.ByteTimeout = b->ByteTimeout;
-   
-   if(!I2C_WriteRead(&(m->d), NULL, 0, &a, 1))
-   {
-       free(m->d.DevName);
-       free(m);
-	return NULL;
+    MSP3430Ptr m;
+    I2CByte a;
+    CARD8 hardware_version, major_revision, product_code, rom_version;
+    Bool supported;
+
+    m = calloc(1, sizeof(MSP3430Rec));
+    if (m == NULL)
+        return NULL;
+    m->d.DevName = strdup("MSP34xx");
+    m->d.SlaveAddr = addr;
+    m->d.pI2CBus = b;
+    m->d.NextDev = NULL;
+    m->d.StartTimeout = b->StartTimeout;
+    m->d.BitTimeout = b->BitTimeout;
+    m->d.AcknTimeout = b->AcknTimeout;
+    m->d.ByteTimeout = b->ByteTimeout;
+
+    if (!I2C_WriteRead(&(m->d), NULL, 0, &a, 1)) {
+        free(m->d.DevName);
+        free(m);
+        return NULL;
+    }
+
+    m->standard = MSP3430_NTSC;
+    m->connector = MSP3430_CONNECTOR_1;
+    m->mode = MSPMODE_STEREO_A; /*stereo or chanel A if avail. */
+    m->c_format = MSPFORMAT_UNKNOWN;
+    m->c_standard = MSPSTANDARD_UNKNOWN;
+    m->c_matrix = m->c_fmmatrix = m->c_source = 0;
+    m->volume = 0;
+    m->recheck = FALSE;
+
+    GetMSP3430Data(m, RD_DSP, 0x00, 0x1E, &hardware_version, &major_revision);
+    GetMSP3430Data(m, RD_DSP, 0x00, 0x1F, &product_code, &rom_version);
+    m->hardware_version = hardware_version;
+    m->major_revision = major_revision;
+    m->product_code = product_code;
+    m->rom_version = rom_version;
+
+    m->chip_id = ((major_revision << 8) | product_code);
+
+    supported = FALSE;
+    switch (major_revision) {
+    case 4:                    /* 34xxD */
+        switch (product_code) {
+        case 0x05:             /* 3405D */
+        case 0x0A:             /* 3410D */
+        case 0x0F:             /* 3415D */
+            m->chip_family = MSPFAMILY_34x5D;
+            m->recheck = TRUE;
+            supported = TRUE;
+            break;
+        default:
+            m->chip_family = MSPFAMILY_34x0D;
+        }
+        break;
+    case 7:                    /* 34xxG */
+        switch (product_code) {
+        case 0x00:
+        case 0x0A:
+        case 0x1E:
+        case 0x28:
+        case 0x32:
+            m->chip_family = MSPFAMILY_34x0G;
+            supported = TRUE;
+            break;
+        case 0x0f:
+        case 0x19:
+        case 0x2d:
+        case 0x37:
+        case 0x41:
+            m->chip_family = MSPFAMILY_34x5G;
+            supported = TRUE;
+#ifdef MSP_DEBUG
+            memset(m->registers_present, 0, 256);
+#define A(num) m->registers_present[(num)]=1;
+#define B(num1, num2) memset(&(m->registers_present[num1]), 1, num2-num1);
+            A(0x20)
+                A(0x30)
+                A(0x40)
+                A(0x00)
+                B(0x01, 0x08)
+                B(0x0B, 0x0E)
+                A(0x10)
+                B(0x12, 0x14)
+                A(0x16)
+                A(0x29)
+#undef B
+#undef A
+#endif
+                break;
+        default:
+            m->chip_family = MSPFAMILY_UNKNOWN;
+        }
+        break;
+    default:
+        m->chip_family = MSPFAMILY_UNKNOWN;
     }
 
+    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO,
+               "Found %s%s, rom version 0x%02x, chip_id=0x%04x\n",
+               MSP_getProductName(m->chip_id),
+               supported ? "" : " (unsupported)", rom_version, m->chip_id);
 
-	m->standard=MSP3430_NTSC;
-	m->connector=MSP3430_CONNECTOR_1;
-	m->mode=MSPMODE_STEREO_A;	/*stereo or chanel A if avail. */
-    	m->c_format=MSPFORMAT_UNKNOWN;
-    	m->c_standard=MSPSTANDARD_UNKNOWN;
-    	m->c_matrix=m->c_fmmatrix=m->c_source=0;
-	m->volume=0;
-	m->recheck=FALSE;
-
-   GetMSP3430Data(m, RD_DSP, 0x00, 0x1E, &hardware_version, &major_revision);
-   GetMSP3430Data(m, RD_DSP, 0x00, 0x1F, &product_code, &rom_version);
-   m->hardware_version=hardware_version;
-   m->major_revision=major_revision;
-   m->product_code=product_code;
-   m->rom_version=rom_version;
-
-   m->chip_id=((major_revision << 8) | product_code);
-   
-   supported=FALSE;
-   switch (major_revision) {
-   case 4:	/* 34xxD */
-      switch (product_code) {
-	  case 0x05: /* 3405D */
-	  case 0x0A: /* 3410D */
-	  case 0x0F: /* 3415D */
-	  	m->chip_family=MSPFAMILY_34x5D;
-		m->recheck=TRUE;
-		supported=TRUE;
-		break;
-      default:
-	  	m->chip_family=MSPFAMILY_34x0D;
-      }
-	  break;
-   case 7:	/* 34xxG */
-   	switch(product_code){
-		case 0x00:
-		case 0x0A:
-		case 0x1E:
-		case 0x28:
-		case 0x32:
-		  	m->chip_family=MSPFAMILY_34x0G;
-			supported=TRUE;
-			break;
-		case 0x0f:
-		case 0x19:
-		case 0x2d:
-		case 0x37:
-		case 0x41:
-		  	m->chip_family=MSPFAMILY_34x5G;
-			supported=TRUE;
-			#ifdef MSP_DEBUG
-			memset(m->registers_present, 0, 256);
-			#define A(num) m->registers_present[(num)]=1;
-			#define B(num1, num2) memset(&(m->registers_present[num1]), 1, num2-num1);
-			A(0x20)
-			A(0x30)
-			A(0x40)
-			A(0x00)
-			B(0x01, 0x08)
-			B(0x0B, 0x0E)
-			A(0x10)
-			B(0x12,0x14)
-			A(0x16)
-			A(0x29)
-			#undef B
-			#undef A
-			#endif
-			break;
-		default:
-		  	m->chip_family=MSPFAMILY_UNKNOWN;
-		}
-		break;
-   default:
-	  	m->chip_family=MSPFAMILY_UNKNOWN;
-   }
-   
-	xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "Found %s%s, rom version 0x%02x, chip_id=0x%04x\n",
-		MSP_getProductName(m->chip_id), supported?"":" (unsupported)", rom_version, m->chip_id);
-
-	if (!supported) {
-            free(m->d.DevName);
-            free(m);
-            return NULL;
-	}
-   if(!I2CDevInit(&(m->d)))
-   {
-       free(m->d.DevName);
-       free(m);
-       return NULL;
-   }
-
-   return m;  
+    if (!supported) {
+        free(m->d.DevName);
+        free(m);
+        return NULL;
+    }
+    if (!I2CDevInit(&(m->d))) {
+        free(m->d.DevName);
+        free(m);
+        return NULL;
+    }
+
+    return m;
 }
 
-void ResetMSP3430(MSP3430Ptr m)
+void
+ResetMSP3430(MSP3430Ptr m)
 {
     /* Reset the MSP3430 */
     SetMSP3430Control(m, 0x00, 0x80, 0x00);
     /* Set it back to normal operation */
     SetMSP3430Control(m, 0x00, 0x00, 0x00);
 
-    m->c_format=MSPFORMAT_UNKNOWN;
-    m->c_standard=MSPSTANDARD_UNKNOWN;
-    m->c_matrix=m->c_fmmatrix=m->c_source=0;
-	m->volume=0;
-}   
+    m->c_format = MSPFORMAT_UNKNOWN;
+    m->c_standard = MSPSTANDARD_UNKNOWN;
+    m->c_matrix = m->c_fmmatrix = m->c_source = 0;
+    m->volume = 0;
+}
 
-void MSP3430SetVolume (MSP3430Ptr m, CARD8 value)
+void
+MSP3430SetVolume(MSP3430Ptr m, CARD8 value)
 {
     CARD8 result;
+
 #if 0
     CARD8 old_volume;
-    GetMSP3430Data(m, RD_DSP, 0x00, 0x00, &old_volume, &result);   
-    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP3430 result 0x%02x\n", result);
+
+    GetMSP3430Data(m, RD_DSP, 0x00, 0x00, &old_volume, &result);
+    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP3430 result 0x%02x\n",
+               result);
 #endif
     /* save an extra Get call */
-    result=0;
+    result = 0;
 
     SetMSP3430Data(m, WR_DSP, 0x00, 0x00, value, result);
 
     SetMSP3430Data(m, WR_DSP, 0x00, 0x07, value, 0);
-    m->volume=value;
+    m->volume = value;
 
 #if __MSPDEBUG__ > 2
-    MSP3430DumpStatus(m); 
-    __MSPBEEP
-    GetMSP3430Data(m, RD_DSP, 0x00, 0x00, &old_volume, &result);
-    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP3430 volume 0x%02x\n",value);
+    MSP3430DumpStatus(m);
+    __MSPBEEP GetMSP3430Data(m, RD_DSP, 0x00, 0x00, &old_volume, &result);
+    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP3430 volume 0x%02x\n",
+               value);
 #endif
 }
 
-
-void MSP3430SetSAP (MSP3430Ptr m, int mode)
+void
+MSP3430SetSAP(MSP3430Ptr m, int mode)
 {
-	xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "Put actual code to change SAP here\n");
+    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO,
+               "Put actual code to change SAP here\n");
 
-      SetMSP3430Data(m, WR_DSP, 0x00, 0x08, mode & 0xff, 0x20); 
+    SetMSP3430Data(m, WR_DSP, 0x00, 0x08, mode & 0xff, 0x20);
 }
 
-
 #if 0
-void MSP3430SetSource(MSP3430Ptr m, CARD8 value)
+void
+MSP3430SetSource(MSP3430Ptr m, CARD8 value)
 {
     /* Write to DSP, register 0x0008, (loudspeaker channel source/matrix) */
     /* This sets the source to the TV tuner, for stereo operation */
@@ -304,121 +324,142 @@ void MSP3430SetSource(MSP3430Ptr m, CARD8 value)
 }
 #endif
 
-
 static const char *
-MSP_getProductName (CARD16 product_id)
+MSP_getProductName(CARD16 product_id)
 {
-	switch (product_id) {
-		case 0x0400: return "MSP3400D";
-		case 0x040a: return "MSP3410D";
-		case 0x0405: return "MSP3405D";
-		case 0x040f: return "MSP3415D";
-		case 0x0700: return "MSP3400G";
-		case 0x070a: return "MSP3410G";
-		case 0x071e: return "MSP3430G";
-		case 0x0728: return "MSP3440G";
-		case 0x0732: return "MSP3450G";
-		case 0x070f: return "MSP3415G";
-		case 0x0719: return "MSP3425G";
-		case 0x072d: return "MSP3445G";
-		case 0x0737: return "MSP3455G";
-		case 0x0741: return "MSP3465G";
-	}
-	return "MSP - unknown type";
+    switch (product_id) {
+    case 0x0400:
+        return "MSP3400D";
+    case 0x040a:
+        return "MSP3410D";
+    case 0x0405:
+        return "MSP3405D";
+    case 0x040f:
+        return "MSP3415D";
+    case 0x0700:
+        return "MSP3400G";
+    case 0x070a:
+        return "MSP3410G";
+    case 0x071e:
+        return "MSP3430G";
+    case 0x0728:
+        return "MSP3440G";
+    case 0x0732:
+        return "MSP3450G";
+    case 0x070f:
+        return "MSP3415G";
+    case 0x0719:
+        return "MSP3425G";
+    case 0x072d:
+        return "MSP3445G";
+    case 0x0737:
+        return "MSP3455G";
+    case 0x0741:
+        return "MSP3465G";
+    }
+    return "MSP - unknown type";
 }
 
 #if __MSPDEBUG__ > 2
 /*puts beep in MSP output
     freq = 0x01 - 16Hz ... 0x40 - 1kHz ... 0xff - 4kHz  
 */
-void MSPBeep(MSP3430Ptr m, CARD8 freq) {
-    SetMSP3430Data (m, WR_DSP, 0x00, freq, 0x7f, 0x40);
+void
+MSPBeep(MSP3430Ptr m, CARD8 freq)
+{
+    SetMSP3430Data(m, WR_DSP, 0x00, freq, 0x7f, 0x40);
     mpause(100);
-    SetMSP3430Data (m, WR_DSP, 0x00, 0x14, 0x00, 0x00);
+    SetMSP3430Data(m, WR_DSP, 0x00, 0x14, 0x00, 0x00);
 }
 #endif
 
-void mpause(int milliseconds) {
-    int i,m;
-    m=milliseconds/20;
-    for (i=0;i<m;i++) usleep(20000);
+void
+mpause(int milliseconds)
+{
+    int i, m;
+
+    m = milliseconds / 20;
+    for (i = 0; i < m; i++)
+        usleep(20000);
 }
 
 /*-----------------------------------------------------------------
 | specific functions for all MSP34xxG chips 
 |----------------------------------------------------------------*/
 
-void InitMSP34xxG(MSP3430Ptr m)
+void
+InitMSP34xxG(MSP3430Ptr m)
 {
 
-  #if __MSPDEBUG__ > 1
-  xf86DrvMsg(m->d.pI2CBus->scrnIndex,X_INFO,"InitMSP34xxG(m->connector=%d, m->standard=%d, m->chip_family=%d)\n",
-  		m->connector, m->standard, m->chip_family);
-  #endif
-   /* Reset MSP3430 */
-   SetMSP3430Control(m, 0x00, 0x80, 0x00);
-   /* Set it back to normal operation */
-   SetMSP3430Control(m, 0x00, 0x00, 0x00);
-   
-   /*set MODUS register */
-   /* bits: 0 - automatic sound detection */
-   /*       1 - enable STATUS change */
-   /*       12 - detect 6.5 Mhz carrier as D/K1, D/K2 or D/K NICAM  (does not seem to work ) */
-   /*       13 - detect 4.5 Mhz carrier as BTSC */ 
-   if ( (m->standard & 0xff) == MSP3430_PAL )
-   {
-      SetMSP3430Data(m, WR_DEM, 0x00, 0x30, 0x30, 0x03|0x08);    /* make O_ pins tristate */
-      /* PAL standard */
-      SetMSP3430Data(m, WR_DEM, 0x00, 0x20, 0x00, 0x01); /* possibly wrong */
-   } else {
-      SetMSP3430Data(m, WR_DEM, 0x00, 0x30, 0x20, 0x03|0x08);
-      /* standard selection is M-BTSC-Stereo */
-      SetMSP3430Data(m, WR_DEM, 0x00, 0x20, 0x00, 0x20); 
-   }
-   
-   switch(m->connector){
-         case MSP3430_CONNECTOR_1:
-	        SetMSP3430Data(m, WR_DSP, 0x00, 0x08, 0x03, 0x20);
-	        break;
-	 case MSP3430_CONNECTOR_2:
-		/* this has not been checked yet.. could be bogus */
-    		/* SCART Input Prescale: 0 dB gain */
-		SetMSP3430Data(m, WR_DSP, 0x00, 0x0d, 0x19, 0x00);
-    		SetMSP3430Data(m, WR_DSP, 0x00, 0x08, 0x02, 0x20);   	
-		break;
-	case MSP3430_CONNECTOR_3:
-	default:
-    		/* SCART Input Prescale: 0 dB gain */
-		SetMSP3430Data(m, WR_DSP, 0x00, 0x0d, 0x19, 0x00);
-		
-    		SetMSP3430Data(m, WR_DSP, 0x00, 0x08, 0x02, 0x20);
-    		break;
-	}
-	      
-    switch(m->standard){
-        case MSP3430_PAL:
-     		SetMSP3430Data(m, WR_DSP, 0x00, 0x0e, 0x24, 0x03);
-     		SetMSP3430Data(m, WR_DSP, 0x00, 0x10, 0x00, 0x5a);
-                SetMSP3430Data(m, WR_DEM, 0x00, 0x20, 0x00, 0x03);
-                /* Set volume to FAST_MUTE. */
-     	        SetMSP3430Data(m, WR_DSP, 0x00, 0x00, 0xFF, 0x00);
-	        break;
-        case MSP3430_PAL_DK1:
-     		SetMSP3430Data(m, WR_DSP, 0x00, 0x0e, 0x24, 0x03);
-     		SetMSP3430Data(m, WR_DSP, 0x00, 0x10, 0x00, 0x5a);
-		SetMSP3430Data(m, WR_DEM, 0x00, 0x20, 0x00, 0x04);
-                /* Set volume to FAST_MUTE. */
-     	        SetMSP3430Data(m, WR_DSP, 0x00, 0x00, 0xFF, 0x00);
-		break;
-	case MSP3430_SECAM: /* is this right ? */
-        case MSP3430_NTSC:         
-                /* Write to DSP, register 0x000E, (prescale FM/FM matrix) */
-                SetMSP3430Data(m, WR_DSP, 0x00, 0x0e, 0x24, 0x03);
-
-                /* Set volume to FAST_MUTE. */
-                SetMSP3430Data(m, WR_DSP, 0x00, 0x00, 0xFF, 0x00);
-		break;
-	}
+#if __MSPDEBUG__ > 1
+    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO,
+               "InitMSP34xxG(m->connector=%d, m->standard=%d, m->chip_family=%d)\n",
+               m->connector, m->standard, m->chip_family);
+#endif
+    /* Reset MSP3430 */
+    SetMSP3430Control(m, 0x00, 0x80, 0x00);
+    /* Set it back to normal operation */
+    SetMSP3430Control(m, 0x00, 0x00, 0x00);
+
+    /*set MODUS register */
+    /* bits: 0 - automatic sound detection */
+    /*       1 - enable STATUS change */
+    /*       12 - detect 6.5 Mhz carrier as D/K1, D/K2 or D/K NICAM  (does not seem to work ) */
+    /*       13 - detect 4.5 Mhz carrier as BTSC */
+    if ((m->standard & 0xff) == MSP3430_PAL) {
+        SetMSP3430Data(m, WR_DEM, 0x00, 0x30, 0x30, 0x03 | 0x08);       /* make O_ pins tristate */
+        /* PAL standard */
+        SetMSP3430Data(m, WR_DEM, 0x00, 0x20, 0x00, 0x01);      /* possibly wrong */
+    }
+    else {
+        SetMSP3430Data(m, WR_DEM, 0x00, 0x30, 0x20, 0x03 | 0x08);
+        /* standard selection is M-BTSC-Stereo */
+        SetMSP3430Data(m, WR_DEM, 0x00, 0x20, 0x00, 0x20);
+    }
+
+    switch (m->connector) {
+    case MSP3430_CONNECTOR_1:
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x08, 0x03, 0x20);
+        break;
+    case MSP3430_CONNECTOR_2:
+        /* this has not been checked yet.. could be bogus */
+        /* SCART Input Prescale: 0 dB gain */
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x0d, 0x19, 0x00);
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x08, 0x02, 0x20);
+        break;
+    case MSP3430_CONNECTOR_3:
+    default:
+        /* SCART Input Prescale: 0 dB gain */
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x0d, 0x19, 0x00);
+
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x08, 0x02, 0x20);
+        break;
+    }
+
+    switch (m->standard) {
+    case MSP3430_PAL:
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x0e, 0x24, 0x03);
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x10, 0x00, 0x5a);
+        SetMSP3430Data(m, WR_DEM, 0x00, 0x20, 0x00, 0x03);
+        /* Set volume to FAST_MUTE. */
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x00, 0xFF, 0x00);
+        break;
+    case MSP3430_PAL_DK1:
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x0e, 0x24, 0x03);
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x10, 0x00, 0x5a);
+        SetMSP3430Data(m, WR_DEM, 0x00, 0x20, 0x00, 0x04);
+        /* Set volume to FAST_MUTE. */
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x00, 0xFF, 0x00);
+        break;
+    case MSP3430_SECAM:        /* is this right ? */
+    case MSP3430_NTSC:
+        /* Write to DSP, register 0x000E, (prescale FM/FM matrix) */
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x0e, 0x24, 0x03);
+
+        /* Set volume to FAST_MUTE. */
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x00, 0xFF, 0x00);
+        break;
+    }
 
 }
 
@@ -426,41 +467,40 @@ void InitMSP34xxG(MSP3430Ptr m)
 | specific functions for all MSP34x5D chips 
 |----------------------------------------------------------------*/
 
-void InitMSP34x5D(MSP3430Ptr m)
+void
+InitMSP34x5D(MSP3430Ptr m)
 {
-int count;
-CARD8 high,low;
-CARD16 result,standard;
-CARD16 peak;
-
-
-if (m->c_format==MSPFORMAT_UNKNOWN) ResetMSP3430(m);
-else {
-    /*mute volume*/
-    SetMSP3430Data (m, WR_DSP, 0x00, 0x00, 0x00, 0x00);
-}
-
-
+    int count;
+    CARD8 high, low;
+    CARD16 result, standard;
+    CARD16 peak;
+
+    if (m->c_format == MSPFORMAT_UNKNOWN)
+        ResetMSP3430(m);
+    else {
+        /*mute volume */
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x00, 0x00, 0x00);
+    }
 
-    switch(m->connector){
-	case MSP3430_CONNECTOR_2:
-	case MSP3430_CONNECTOR_3:
-	    if (m->c_format!=MSPFORMAT_SCART) {
-    		/* SCART Input Prescale: 0 dB gain */
-			SetMSP3430Data (m, WR_DSP, 0x00, 0x0d, 0x19, 0x00);
-			/* this has not been checked yet.. could be bogus */
-			m->c_format=MSPFORMAT_SCART;	/*stereo*/
-		}
-	    break;
-	case MSP3430_CONNECTOR_1:
-	default:
-	
-	    switch ( m->standard & 0x00ff ) {
-		case MSP3430_PAL:
-			switch( m->standard ) {
-			case MSP3430_PAL_DK1:
-			    standard=MSPSTANDARD_FM_DK1;
-			    break;
+    switch (m->connector) {
+    case MSP3430_CONNECTOR_2:
+    case MSP3430_CONNECTOR_3:
+        if (m->c_format != MSPFORMAT_SCART) {
+            /* SCART Input Prescale: 0 dB gain */
+            SetMSP3430Data(m, WR_DSP, 0x00, 0x0d, 0x19, 0x00);
+            /* this has not been checked yet.. could be bogus */
+            m->c_format = MSPFORMAT_SCART;      /*stereo */
+        }
+        break;
+    case MSP3430_CONNECTOR_1:
+    default:
+
+        switch (m->standard & 0x00ff) {
+        case MSP3430_PAL:
+            switch (m->standard) {
+            case MSP3430_PAL_DK1:
+                standard = MSPSTANDARD_FM_DK1;
+                break;
 /*			case MSP3430_PAL_DK2:
 			    standard=MSPSTANDARD_FM_DK2;
 			    break;
@@ -469,259 +509,271 @@ else {
 			    standard=MSPSTANDARD_AUTO;
 			    break;
 */
-			default:
-			    standard=MSPSTANDARD_AUTO;
-			}
-		    break;
-		case MSP3430_SECAM:
-		    standard=MSPSTANDARD_AUTO;
-		case MSP3430_NTSC:
-			    /* Only MSP34x5 supported format - Korean NTSC-M*/
-			 standard=MSPSTANDARD_FM_M;
-		default:
-		    standard=MSPSTANDARD_AUTO;
-		}
-		
-	    /*no NICAM support in MSP3410D - force to autodetect*/
-	    if ((m->chip_id==0x405) && (standard>=MSPSTANDARD_NICAM_BG))
-    		standard=MSPSTANDARD_AUTO;
-		    
-	    if (m->c_standard != standard) {
-
-   	        SetMSP3430Data (m, WR_DEM, 0x00, 0x20, standard>>8, standard & 0xFF);
-	        if (standard==MSPSTANDARD_AUTO) {
-			    count = 50; /* time shouldn't exceed 1s, just in case */
-			    do {
-     		        usleep(20000);
-     		        GetMSP3430Data (m, RD_DEM, 0x00, 0x7e, &high, &low);
-			        result = ( high << 8 ) | low;
-     		        --count;
-	    	    } while( result > 0x07ff && count > 0 );
-		    
-		    	if ((result > MSPSTANDARD_AUTO))
-					standard=result;
-		    	else standard=MSPSTANDARD_UNKNOWN;
+            default:
+                standard = MSPSTANDARD_AUTO;
+            }
+            break;
+        case MSP3430_SECAM:
+            standard = MSPSTANDARD_AUTO;
+        case MSP3430_NTSC:
+            /* Only MSP34x5 supported format - Korean NTSC-M */
+            standard = MSPSTANDARD_FM_M;
+        default:
+            standard = MSPSTANDARD_AUTO;
+        }
+
+        /*no NICAM support in MSP3410D - force to autodetect */
+        if ((m->chip_id == 0x405) && (standard >= MSPSTANDARD_NICAM_BG))
+            standard = MSPSTANDARD_AUTO;
+
+        if (m->c_standard != standard) {
+
+            SetMSP3430Data(m, WR_DEM, 0x00, 0x20, standard >> 8,
+                           standard & 0xFF);
+            if (standard == MSPSTANDARD_AUTO) {
+                count = 50;     /* time shouldn't exceed 1s, just in case */
+                do {
+                    usleep(20000);
+                    GetMSP3430Data(m, RD_DEM, 0x00, 0x7e, &high, &low);
+                    result = (high << 8) | low;
+                    --count;
+                } while (result > 0x07ff && count > 0);
+
+                if ((result > MSPSTANDARD_AUTO))
+                    standard = result;
+                else
+                    standard = MSPSTANDARD_UNKNOWN;
 #if __MSPDEBUG__ > 1
-				xf86DrvMsg(m->d.pI2CBus->scrnIndex,X_INFO,"Detected audio standard: %d\n",result);
-#endif		    	
-		    	/* result = MSPSTANDARD_NICAM_L can be one of:
-		    	SECAM_L - MSPSTANDARD_NICAM_L
-		    	D/K1 - MSPSTANDARD_FM_DK1
-		    	D/K2 - MSPSTANDARD_FM_DK2
-		    	D/K-NICAM - MSPSTANDARD_NICAM_DK*/
-		    	if( standard == MSPSTANDARD_NICAM_L ) {
-		        	if ((m->standard & 0x00ff)==MSP3430_PAL) {
-			    		/* force PAL D/K  */
-			    		standard=MSPSTANDARD_FM_DK1;
-		            	SetMSP3430Data (m, WR_DEM, 0x00, 0x20, standard>>8, standard & 0xFF);
+                xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO,
+                           "Detected audio standard: %d\n", result);
+#endif
+                /* result = MSPSTANDARD_NICAM_L can be one of:
+                   SECAM_L - MSPSTANDARD_NICAM_L
+                   D/K1 - MSPSTANDARD_FM_DK1
+                   D/K2 - MSPSTANDARD_FM_DK2
+                   D/K-NICAM - MSPSTANDARD_NICAM_DK */
+                if (standard == MSPSTANDARD_NICAM_L) {
+                    if ((m->standard & 0x00ff) == MSP3430_PAL) {
+                        /* force PAL D/K  */
+                        standard = MSPSTANDARD_FM_DK1;
+                        SetMSP3430Data(m, WR_DEM, 0x00, 0x20, standard >> 8,
+                                       standard & 0xFF);
 #if __MSPDEBUG__ > 1
-			        	xf86DrvMsg(m->d.pI2CBus->scrnIndex,X_INFO, "Detected 6.5MHz carrier - forced to D/K1 !!!\n" );
+                        xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO,
+                                   "Detected 6.5MHz carrier - forced to D/K1 !!!\n");
 #endif
-					}
-		    	}
-			}
-			m->c_standard=standard;
-	    } /*end - standard changed*/
-	    else {
-			if (standard<MSPSTANDARD_NICAM_BG) {
-    		    /* get old value of ident. mode register*/
-		    	GetMSP3430Data (m, RD_DSP, 0x00, 0x15, &high, &low);
-    		    /* reset Ident-Filter */
-    		    SetMSP3430Data (m, WR_DSP, 0x00, 0x14, 0x00, 0x3F);
-		    	/* put back old value to ident. mode register*/
-    		    SetMSP3430Data (m, WR_DSP, 0x00, 0x14, 0x00, low);
-			}
-	    }
-
-	    if (standard<=MSPSTANDARD_AUTO) {
-    	   	m->c_format=MSPFORMAT_1xFM;
-	    }
-	    else if (standard<MSPSTANDARD_NICAM_BG) {
-			/* set FM prescale */
-			SetMSP3430Data (m, WR_DSP, 0x00, 0x0e, 0x30, 0);
-			/* set FM deemphasis*/
-			SetMSP3430Data (m, WR_DSP, 0x00, 0x0f, ((standard==MSPSTANDARD_FM_M)?0:1), 0);
-		    	
-			/* check if FM2 carrier is present */
-			/*turn off FM DC Notch*/
-			SetMSP3430Data (m, WR_DSP, 0x00, 0x17, 0x00, 0x3f);
-			/*matrix source for Quasi-Peak Detector - stereo: ch2->L ch1->R*/
-			SetMSP3430Data (m, WR_DSP, 0x00, 0x0c, 0x00, 0x20);
-			
-			mpause(250);
-   		    GetMSP3430Data (m, RD_DSP, 0x00, 0x1A, &high, &low);
-			peak = (high << 8) | low;
+                    }
+                }
+            }
+            m->c_standard = standard;
+        }                       /*end - standard changed */
+        else {
+            if (standard < MSPSTANDARD_NICAM_BG) {
+                /* get old value of ident. mode register */
+                GetMSP3430Data(m, RD_DSP, 0x00, 0x15, &high, &low);
+                /* reset Ident-Filter */
+                SetMSP3430Data(m, WR_DSP, 0x00, 0x14, 0x00, 0x3F);
+                /* put back old value to ident. mode register */
+                SetMSP3430Data(m, WR_DSP, 0x00, 0x14, 0x00, low);
+            }
+        }
+
+        if (standard <= MSPSTANDARD_AUTO) {
+            m->c_format = MSPFORMAT_1xFM;
+        }
+        else if (standard < MSPSTANDARD_NICAM_BG) {
+            /* set FM prescale */
+            SetMSP3430Data(m, WR_DSP, 0x00, 0x0e, 0x30, 0);
+            /* set FM deemphasis */
+            SetMSP3430Data(m, WR_DSP, 0x00, 0x0f,
+                           ((standard == MSPSTANDARD_FM_M) ? 0 : 1), 0);
+
+            /* check if FM2 carrier is present */
+            /*turn off FM DC Notch */
+            SetMSP3430Data(m, WR_DSP, 0x00, 0x17, 0x00, 0x3f);
+            /*matrix source for Quasi-Peak Detector - stereo: ch2->L ch1->R */
+            SetMSP3430Data(m, WR_DSP, 0x00, 0x0c, 0x00, 0x20);
+
+            mpause(250);
+            GetMSP3430Data(m, RD_DSP, 0x00, 0x1A, &high, &low);
+            peak = (high << 8) | low;
 #if __MSPDEBUG__ > 1
-			xf86DrvMsg(m->d.pI2CBus->scrnIndex,X_INFO,"Second carrier Quasi-Peak detection: %d\n",peak);
-#endif	    	
-			/*turn on FM DC Notch*/
-			SetMSP3430Data (m, WR_DSP, 0x00, 0x17, 0x00, 0x00);
-	    	
-			if (peak<5) {
-	    	    /* if second carrier not detected - only mono from first carrier*/
-	    	    m->c_format=MSPFORMAT_1xFM;
-			}
-			else {
-	    	    m->c_format=MSPFORMAT_2xFM;
-    	   	    /*start of FM identification process - FM_WAIT
-	    	    wait at least 0.5s - used 1s - gives beter resolution*/
-    	   	    mpause(1000);
-			}
-	    }
-	    else {
-			if (standard==MSPSTANDARD_NICAM_L) {
-	    	    m->c_format=MSPFORMAT_NICAM_AM;
-		    	/* set AM prescale */
-		    	SetMSP3430Data (m, WR_DSP, 0x00, 0x0e, 0x7C, 0);
-			}
-			else {
-	    	    m->c_format=MSPFORMAT_NICAM_FM;
-		    	/* set FM prescale */
-			    SetMSP3430Data (m, WR_DSP, 0x00, 0x0e, 0x30, 0);
-			}
-			/* set FM deemphasis*/
-			SetMSP3430Data (m, WR_DSP, 0x00, 0x0f, 0x00, 0);
-			/* set NICAM prescale to 0dB */
-			SetMSP3430Data (m, WR_DSP, 0x00, 0x10, 0x20, 0);
-	    }
-	    
-	    break;
-	} /*end - case conector*/
+            xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO,
+                       "Second carrier Quasi-Peak detection: %d\n", peak);
+#endif
+            /*turn on FM DC Notch */
+            SetMSP3430Data(m, WR_DSP, 0x00, 0x17, 0x00, 0x00);
+
+            if (peak < 5) {
+                /* if second carrier not detected - only mono from first carrier */
+                m->c_format = MSPFORMAT_1xFM;
+            }
+            else {
+                m->c_format = MSPFORMAT_2xFM;
+                /*start of FM identification process - FM_WAIT
+                   wait at least 0.5s - used 1s - gives beter resolution */
+                mpause(1000);
+            }
+        }
+        else {
+            if (standard == MSPSTANDARD_NICAM_L) {
+                m->c_format = MSPFORMAT_NICAM_AM;
+                /* set AM prescale */
+                SetMSP3430Data(m, WR_DSP, 0x00, 0x0e, 0x7C, 0);
+            }
+            else {
+                m->c_format = MSPFORMAT_NICAM_FM;
+                /* set FM prescale */
+                SetMSP3430Data(m, WR_DSP, 0x00, 0x0e, 0x30, 0);
+            }
+            /* set FM deemphasis */
+            SetMSP3430Data(m, WR_DSP, 0x00, 0x0f, 0x00, 0);
+            /* set NICAM prescale to 0dB */
+            SetMSP3430Data(m, WR_DSP, 0x00, 0x10, 0x20, 0);
+        }
+
+        break;
+    }                           /*end - case conector */
 
     CheckModeMSP34x5D(m);
-    
-    /* Set volume to FAST_MUTE. */
-    /*SetMSP3430Data(m, WR_DSP, 0x00, 0x00, 0xFF, 0x00);*/
-    /*set volume*/
-	MSP3430SetVolume(m,m->volume);
-    
-    __MSPBEEP
-
-
-} /* EnableMSP34x5D ()... */
-
 
+    /* Set volume to FAST_MUTE. */
+    /*SetMSP3430Data(m, WR_DSP, 0x00, 0x00, 0xFF, 0x00); */
+    /*set volume */
+    MSP3430SetVolume(m, m->volume);
 
+__MSPBEEP}                      /* EnableMSP34x5D ()... */
 
-void CheckModeMSP34x5D(MSP3430Ptr m) {
-    const char stereo_on=25;
-    const char stereo_off=20;
-    const char dual_on=-stereo_on;
-    const char dual_off=-stereo_off;
+void
+CheckModeMSP34x5D(MSP3430Ptr m)
+{
+    const char stereo_on = 25;
+    const char stereo_off = 20;
+    const char dual_on = -stereo_on;
+    const char dual_off = -stereo_off;
     char detect;
     CARD8 matrix, fmmatrix, source, high, low;
 
-    fmmatrix=0;		/*no matrix*/
-    source=0;		/*FM*/
-    switch (m->c_format) {
-	case MSPFORMAT_NICAM_FM:
-	case MSPFORMAT_NICAM_AM:
-	case MSPFORMAT_SCART:
-	    source=( (m->c_format == MSPFORMAT_SCART)?2:1 );
-	    switch (m->mode) {
-		case MSPMODE_MONO:
-		    matrix=0x30;	/*MONO*/
-		    break;
-		case MSPMODE_A:
-		    matrix=0x00;	/*A*/
-		    break;
-		case MSPMODE_B:
-		    matrix=0x10;	/*B*/
-		    break;
-		default:
-		    matrix=0x20;	/*STEREO*/
-		    break;
-		}
-	    break;
-	default:
-	case MSPFORMAT_1xFM:
-	    matrix=0x00;	/*A*/
-	    break;
-	case MSPFORMAT_2xFM:
-	    switch (m->mode) {
-		case MSPMODE_MONO:
-		    matrix=0x30;	/*MONO*/
-		    break;
-		case MSPMODE_STEREO:
-		    matrix=0x20;	/*STEREO*/
-		    fmmatrix=((m->c_standard==MSPSTANDARD_FM_M)?2:1);
-		    break;
-		case MSPMODE_AB:
-		    matrix=0x20;	/*STEREO*/
-		    break;
-		case MSPMODE_A:
-		    matrix=0x00;	/*A*/
-		    break;
-		case MSPMODE_B:
-		    matrix=0x10;	/*B*/
-		    break;
-		default:
-    		/*FM_IDENT_CHECK*/
-    		GetMSP3430Data (m, RD_DSP, 0x00, 0x18, &high, &low);
-    		detect=(char)high;
+    fmmatrix = 0;               /*no matrix */
+    source = 0;
+    /*FM*/ switch (m->c_format) {
+    case MSPFORMAT_NICAM_FM:
+    case MSPFORMAT_NICAM_AM:
+    case MSPFORMAT_SCART:
+        source = ((m->c_format == MSPFORMAT_SCART) ? 2 : 1);
+        switch (m->mode) {
+        case MSPMODE_MONO:
+            matrix = 0x30;
+            /*MONO*/ break;
+        case MSPMODE_A:
+            matrix = 0x00;
+            /*A*/ break;
+        case MSPMODE_B:
+            matrix = 0x10;
+            /*B*/ break;
+        default:
+            matrix = 0x20;
+            /*STEREO*/ break;
+        }
+        break;
+    default:
+    case MSPFORMAT_1xFM:
+        matrix = 0x00;
+        /*A*/ break;
+    case MSPFORMAT_2xFM:
+        switch (m->mode) {
+        case MSPMODE_MONO:
+            matrix = 0x30;
+            /*MONO*/ break;
+        case MSPMODE_STEREO:
+            matrix = 0x20;
+            /*STEREO*/ fmmatrix = ((m->c_standard == MSPSTANDARD_FM_M) ? 2 : 1);
+            break;
+        case MSPMODE_AB:
+            matrix = 0x20;
+            /*STEREO*/ break;
+        case MSPMODE_A:
+            matrix = 0x00;
+            /*A*/ break;
+        case MSPMODE_B:
+            matrix = 0x10;
+            /*B*/ break;
+        default:
+            /*FM_IDENT_CHECK */
+            GetMSP3430Data(m, RD_DSP, 0x00, 0x18, &high, &low);
+            detect = (char) high;
 #if __MSPDEBUG__ > 1
-    		xf86DrvMsg(m->d.pI2CBus->scrnIndex,X_INFO,"Stereo Detection Register: %d\n",detect);
+            xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO,
+                       "Stereo Detection Register: %d\n", detect);
 #endif
-    		if (detect>=((m->c_mode==MSPMODE_STEREO)?stereo_off:stereo_on)) {
-				m->c_mode=MSPMODE_STEREO;
-				matrix=0x20;	/*STEREO*/
-				fmmatrix=((m->c_standard==MSPSTANDARD_FM_M)?2:1);
-		    }
-			else if (detect<=((m->c_mode==MSPMODE_AB)?dual_off:dual_on)) {
-				m->c_mode=MSPMODE_AB;
-    			switch (m->mode) {
-			    case MSPMODE_STEREO_AB: matrix=0x20; break;
-			    case MSPMODE_STEREO_B: matrix=0x10; break;
-			    default:
-				case MSPMODE_A: matrix=0x00; break;
-				}
-			}
-    		else {
-				m->c_mode=MSPMODE_MONO;
-				matrix=0x30;	/*MONO*/
-			}
-		    break;
-	    } /* end - case mode*/
-	    break;
+            if (detect >=
+                ((m->c_mode == MSPMODE_STEREO) ? stereo_off : stereo_on)) {
+                m->c_mode = MSPMODE_STEREO;
+                matrix = 0x20;
+                /*STEREO*/
+                    fmmatrix = ((m->c_standard == MSPSTANDARD_FM_M) ? 2 : 1);
+            }
+            else if (detect <= ((m->c_mode == MSPMODE_AB) ? dual_off : dual_on)) {
+                m->c_mode = MSPMODE_AB;
+                switch (m->mode) {
+                case MSPMODE_STEREO_AB:
+                    matrix = 0x20;
+                    break;
+                case MSPMODE_STEREO_B:
+                    matrix = 0x10;
+                    break;
+                default:
+                case MSPMODE_A:
+                    matrix = 0x00;
+                    break;
+                }
+            }
+            else {
+                m->c_mode = MSPMODE_MONO;
+                matrix = 0x30;
+            /*MONO*/}
+            break;
+        }                       /* end - case mode */
+        break;
     }
 
     if (m->c_fmmatrix != fmmatrix) {
-        GetMSP3430Data (m, RD_DSP, 0x00, 0x0e, &high, &low);
-		SetMSP3430Data (m, WR_DSP, 0x00, 0x0e, high, fmmatrix);
-		m->c_fmmatrix = fmmatrix;
+        GetMSP3430Data(m, RD_DSP, 0x00, 0x0e, &high, &low);
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x0e, high, fmmatrix);
+        m->c_fmmatrix = fmmatrix;
     }
 
     if ((m->c_matrix != matrix) || (m->c_source != source)) {
-        /*set chanel source and matrix for loudspeaker*/
-		SetMSP3430Data (m, WR_DSP, 0x00, 0x08, source, matrix);
-    	
-		m->c_matrix = matrix;
-		m->c_source = source;
+        /*set chanel source and matrix for loudspeaker */
+        SetMSP3430Data(m, WR_DSP, 0x00, 0x08, source, matrix);
+
+        m->c_matrix = matrix;
+        m->c_source = source;
     }
 
-	if ( ((m->c_format) & 0xF0) == MSPFORMAT_NICAM)
-			SetMSP3430Data (m, WR_DEM, 0x00, 0x21, 0, 1);
+    if (((m->c_format) & 0xF0) == MSPFORMAT_NICAM)
+        SetMSP3430Data(m, WR_DEM, 0x00, 0x21, 0, 1);
 
 #if __MSPDEBUG__ > 0
-		    char *msg;
-		    switch (matrix) {
-			case 0x30: /*MONO*/
-			    msg="MONO";
-			    break;
-			case 0x00: /*LEFT*/
-			    msg="MONO/CHANNEL_1";
-			    break;
-			case 0x10: /*RIGHT*/
-			    msg="MONO/CHANNEL_2";
-			    break;
-			case 0x20: /*LEFT*/
-			    msg="STEREO";
-			    break;
-			default:
-			    msg="unknown";
-			    break;
-		    }
-    		    xf86DrvMsg(m->d.pI2CBus->scrnIndex,X_INFO,"Audio mode set to: %s\n",msg);
+    char *msg;
+
+    switch (matrix) {
+    case 0x30:
+        /*MONO*/ msg = "MONO";
+        break;
+    case 0x00:
+        /*LEFT*/ msg = "MONO/CHANNEL_1";
+        break;
+    case 0x10:
+        /*RIGHT*/ msg = "MONO/CHANNEL_2";
+        break;
+    case 0x20:
+        /*LEFT*/ msg = "STEREO";
+        break;
+    default:
+        msg = "unknown";
+        break;
+    }
+    xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "Audio mode set to: %s\n", msg);
 #endif
 }
-
diff --git a/xorg-server/hw/xfree86/i2c/msp3430_module.c b/xorg-server/hw/xfree86/i2c/msp3430_module.c
index c5c24635f..e177efe7f 100644
--- a/xorg-server/hw/xfree86/i2c/msp3430_module.c
+++ b/xorg-server/hw/xfree86/i2c/msp3430_module.c
@@ -1,25 +1,24 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Module.h"

-

-static XF86ModuleVersionInfo msp3430VersRec =

-{

-        "msp3430",

-        MODULEVENDORSTRING,

-        MODINFOSTRING1,

-        MODINFOSTRING2,

-        XORG_VERSION_CURRENT,

-        1, 0, 0,

-        ABI_CLASS_VIDEODRV,             /* This needs the video driver ABI */

-        ABI_VIDEODRV_VERSION,

-        MOD_CLASS_NONE,

-        {0,0,0,0}

-};

- 

-_X_EXPORT XF86ModuleData msp3430ModuleData = {

-        &msp3430VersRec,

-        NULL,

-        NULL

-}; 

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Module.h"
+
+static XF86ModuleVersionInfo msp3430VersRec = {
+    "msp3430",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_VIDEODRV,         /* This needs the video driver ABI */
+    ABI_VIDEODRV_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
+};
+
+_X_EXPORT XF86ModuleData msp3430ModuleData = {
+    &msp3430VersRec,
+    NULL,
+    NULL
+};
diff --git a/xorg-server/hw/xfree86/i2c/tda8425.c b/xorg-server/hw/xfree86/i2c/tda8425.c
index abbbb2a03..051249b8a 100644
--- a/xorg-server/hw/xfree86/i2c/tda8425.c
+++ b/xorg-server/hw/xfree86/i2c/tda8425.c
@@ -1,78 +1,83 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include "xf86i2c.h"

-#include "tda8425.h"

-#include "i2c_def.h"

-

-#define TDA8425(a,b)	{ \

-		data[0]=a; \

-		data[1]=b; \

-		I2C_WriteRead(&(t->d), data, 2, NULL, 0); \

-		}

-

-TDA8425Ptr Detect_tda8425(I2CBusPtr b, I2CSlaveAddr addr, Bool force)

-{

-  TDA8425Ptr t;

-  

-  t = calloc(1, sizeof(TDA8425Rec));

-  if(t == NULL) return NULL;

-  t->d.DevName = "TDA8425 BTSC Stereo Audio Processor";

-  t->d.SlaveAddr = addr;

-  t->d.pI2CBus = b;

-  t->d.NextDev = NULL;

-  t->d.StartTimeout = b->StartTimeout;

-  t->d.BitTimeout = b->BitTimeout;

-  t->d.AcknTimeout = b->AcknTimeout;

-  t->d.ByteTimeout = b->ByteTimeout;

-  

-  if(!force && !I2CProbeAddress(b, addr))

-  {

-     free(t);

-     return NULL;

-  }

-  

-  /* set default parameters */

-  if(!I2CDevInit(&(t->d)))

-  {

-     free(t);

-     return NULL;

-  }

-

-  return t;  

-}

-

-Bool tda8425_init(TDA8425Ptr t)

-{

-  t->stereo = 3; 	/* 3 = Spacial 2 = Linear 1 = Pseudo 0 = Forced mono */

-  t->v_left = 0xFF; 	/* FF - C0 */

-  t->v_right = 0xFF; 	/* FF - C0 */

-  t->bass = 0xF6;	/* 0xFF - 0xF0 */

-  t->treble = 0xF6;	/* 0xFF - 0xF0 */

-  t->src_sel = 3;	/* 3 - stereo */

-  t->mute = TRUE;

-  t->mux = 0;           /* 0 - source one, 1 -source 2 */

-  

-  tda8425_setaudio(t);

-  return TRUE;

-}

-

-void tda8425_setaudio(TDA8425Ptr t)

-{

-    I2CByte data[2];

-

-    TDA8425(0x00, t->v_left ); 

-    TDA8425(0x01, t->v_right );

-    TDA8425(0x02, t->bass ); 

-    TDA8425(0x03, t->treble );

-    TDA8425(0x08, 0xC0 | (t->mute ? 0x20 : 0x0) | (t->stereo << 3) | (t->src_sel << 1) |

-	    t->mux); 

-}

-

-void tda8425_mute(TDA8425Ptr t, Bool mute)

-{

-   t->mute = mute;

-   tda8425_setaudio(t);

-}

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86i2c.h"
+#include "tda8425.h"
+#include "i2c_def.h"
+
+#define TDA8425(a,b)	{ \
+		data[0]=a; \
+		data[1]=b; \
+		I2C_WriteRead(&(t->d), data, 2, NULL, 0); \
+		}
+
+TDA8425Ptr
+Detect_tda8425(I2CBusPtr b, I2CSlaveAddr addr, Bool force)
+{
+    TDA8425Ptr t;
+
+    t = calloc(1, sizeof(TDA8425Rec));
+    if (t == NULL)
+        return NULL;
+    t->d.DevName = "TDA8425 BTSC Stereo Audio Processor";
+    t->d.SlaveAddr = addr;
+    t->d.pI2CBus = b;
+    t->d.NextDev = NULL;
+    t->d.StartTimeout = b->StartTimeout;
+    t->d.BitTimeout = b->BitTimeout;
+    t->d.AcknTimeout = b->AcknTimeout;
+    t->d.ByteTimeout = b->ByteTimeout;
+
+    if (!force && !I2CProbeAddress(b, addr)) {
+        free(t);
+        return NULL;
+    }
+
+    /* set default parameters */
+    if (!I2CDevInit(&(t->d))) {
+        free(t);
+        return NULL;
+    }
+
+    return t;
+}
+
+Bool
+tda8425_init(TDA8425Ptr t)
+{
+    t->stereo = 3;              /* 3 = Spacial 2 = Linear 1 = Pseudo 0 = Forced mono */
+    t->v_left = 0xFF;           /* FF - C0 */
+    t->v_right = 0xFF;          /* FF - C0 */
+    t->bass = 0xF6;             /* 0xFF - 0xF0 */
+    t->treble = 0xF6;           /* 0xFF - 0xF0 */
+    t->src_sel = 3;             /* 3 - stereo */
+    t->mute = TRUE;
+    t->mux = 0;                 /* 0 - source one, 1 -source 2 */
+
+    tda8425_setaudio(t);
+    return TRUE;
+}
+
+void
+tda8425_setaudio(TDA8425Ptr t)
+{
+    I2CByte data[2];
+
+    TDA8425(0x00, t->v_left);
+    TDA8425(0x01, t->v_right);
+    TDA8425(0x02, t->bass);
+    TDA8425(0x03, t->treble);
+    TDA8425(0x08,
+            0xC0 | (t->mute ? 0x20 : 0x0) | (t->stereo << 3) | (t->
+                                                                src_sel << 1) |
+            t->mux);
+}
+
+void
+tda8425_mute(TDA8425Ptr t, Bool mute)
+{
+    t->mute = mute;
+    tda8425_setaudio(t);
+}
diff --git a/xorg-server/hw/xfree86/i2c/tda8425.h b/xorg-server/hw/xfree86/i2c/tda8425.h
index 9c33e7f60..e3dfb1384 100644
--- a/xorg-server/hw/xfree86/i2c/tda8425.h
+++ b/xorg-server/hw/xfree86/i2c/tda8425.h
@@ -4,17 +4,17 @@
 #include "xf86i2c.h"
 
 typedef struct {
-	I2CDevRec d;
-	
-	int mux;
-	int stereo;
-	int v_left;
-	int v_right;
-	int bass;
-	int treble;
-	int src_sel;
-	Bool mute;
-	} TDA8425Rec, *TDA8425Ptr;
+    I2CDevRec d;
+
+    int mux;
+    int stereo;
+    int v_left;
+    int v_right;
+    int bass;
+    int treble;
+    int src_sel;
+    Bool mute;
+} TDA8425Rec, *TDA8425Ptr;
 
 #define TDA8425_ADDR_1   0x82
 
@@ -22,13 +22,16 @@ typedef struct {
    This is because tda8425 is write-only and complete implementation
    of I2C protocol is not always available. Besides address there is no good
    way to autodetect it so we have to _know_ it is there anyway */
-   
+
 #define xf86_Detect_tda8425	Detect_tda8425
-extern _X_EXPORT TDA8425Ptr Detect_tda8425(I2CBusPtr b, I2CSlaveAddr addr,Bool force);
+extern _X_EXPORT TDA8425Ptr Detect_tda8425(I2CBusPtr b, I2CSlaveAddr addr,
+                                           Bool force);
 #define xf86_tda8425_init	tda8425_init
 extern _X_EXPORT Bool tda8425_init(TDA8425Ptr t);
+
 #define xf86_tda8425_setaudio	tda8425_setaudio
 extern _X_EXPORT void tda8425_setaudio(TDA8425Ptr t);
+
 #define xf86_tda8425_mute	tda8425_mute
 extern _X_EXPORT void tda8425_mute(TDA8425Ptr t, Bool mute);
 
diff --git a/xorg-server/hw/xfree86/i2c/tda8425_module.c b/xorg-server/hw/xfree86/i2c/tda8425_module.c
index 936281460..74c820f73 100644
--- a/xorg-server/hw/xfree86/i2c/tda8425_module.c
+++ b/xorg-server/hw/xfree86/i2c/tda8425_module.c
@@ -1,25 +1,24 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Module.h"

-

-static XF86ModuleVersionInfo tda8425VersRec =

-{

-        "tda8425",

-        MODULEVENDORSTRING,

-        MODINFOSTRING1,

-        MODINFOSTRING2,

-        XORG_VERSION_CURRENT,

-        1, 0, 0,

-        ABI_CLASS_VIDEODRV,             /* This needs the video driver ABI */

-        ABI_VIDEODRV_VERSION,

-        MOD_CLASS_NONE,

-        {0,0,0,0}

-};

- 

-_X_EXPORT XF86ModuleData tda8425ModuleData = {

-        &tda8425VersRec,

-        NULL,

-        NULL

-}; 

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Module.h"
+
+static XF86ModuleVersionInfo tda8425VersRec = {
+    "tda8425",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_VIDEODRV,         /* This needs the video driver ABI */
+    ABI_VIDEODRV_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
+};
+
+_X_EXPORT XF86ModuleData tda8425ModuleData = {
+    &tda8425VersRec,
+    NULL,
+    NULL
+};
diff --git a/xorg-server/hw/xfree86/i2c/tda9850.c b/xorg-server/hw/xfree86/i2c/tda9850.c
index 5d794dfe5..c2ce6971f 100644
--- a/xorg-server/hw/xfree86/i2c/tda9850.c
+++ b/xorg-server/hw/xfree86/i2c/tda9850.c
@@ -1,112 +1,136 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include "xf86i2c.h"

-#include "tda9850.h"

-#include "i2c_def.h"

-

-#define TDA9850(a,b)	{ \

-		data[0]=a; \

-		data[1]=b; \

-		I2C_WriteRead(&(t->d), data, 2, NULL, 0); \

-		}

-

-TDA9850Ptr Detect_tda9850(I2CBusPtr b, I2CSlaveAddr addr)

-{

-  TDA9850Ptr t;

-  I2CByte a;

-  

-  t = calloc(1, sizeof(TDA9850Rec));

-  if(t == NULL) return NULL;

-  switch(addr)

-  {

-      case TDA9850_ADDR_1:

-	  t->d.DevName = "TDA9850 BTSC Stereo+SAP Audio Processor";

-	  break;

-      default:

-          t->d.DevName = "Generic TDAxxxx";

-	  break;

-  }

-  t->d.SlaveAddr = addr;

-  t->d.pI2CBus = b;

-  t->d.NextDev = NULL;

-  t->d.StartTimeout = b->StartTimeout;

-  t->d.BitTimeout = b->BitTimeout;

-  t->d.AcknTimeout = b->AcknTimeout;

-  t->d.ByteTimeout = b->ByteTimeout;

-  

-  if(!I2C_WriteRead(&(t->d), NULL, 0, &a, 1))

-  {

-     free(t);

-     return NULL;

-  }

-  

-  /* set default parameters */

-  if(!I2CDevInit(&(t->d)))

-  {

-     free(t);

-     return NULL;

-  }

-

-  return t;  

-}

-

-Bool tda9850_init(TDA9850Ptr t)

-{

-  t->stereo = 1;

-  t->sap = 0;

-  t->mute = TRUE;

-  t->sap_mute = TRUE;

-  tda9850_setaudio(t);

-  return TRUE;

-}

-

-void tda9850_setaudio(TDA9850Ptr t)

-{

-CARD8 data[2];

-

-if(t->mux==2)

-{

-   TDA9850(0x04,0x0F); TDA9850(0x05,0x0F); TDA9850(0x06, 0x58);

-   TDA9850(0x07,0x07); TDA9850(0x08,0x00);

-   TDA9850(0x09,0x00); TDA9850(0x0A,0x03); 

-} else 

-{

-  TDA9850(0x04,0x07); TDA9850(0x05,0x07); 

-  TDA9850(0x06,0x58); TDA9850(0x07,0x07); 

-  TDA9850(0x08,0x10); TDA9850(0x09,0x10); 

-  TDA9850(0x0A,0x03); 

-}

-	

-TDA9850(0x06,(t->stereo<<6)|(t->sap<<7)|(t->mute?0x8:0)|(t->sap_mute?0x10:0x0)); 

-}

-

-void tda9850_mute(TDA9850Ptr t, Bool mute)

-{

-CARD8 data[2];

-

-xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO, "tda9850_mute %s\n", mute ? "on" : "off");

-t->mute = mute;

-   

-TDA9850(0x06,(t->stereo<<6)|(t->sap<<7)|(t->mute?0x8:0x0)|(t->sap_mute?0x10:0x0)); 

-}

-

-void tda9850_sap_mute(TDA9850Ptr t, Bool sap_mute)

-{

-CARD8 data[2];

-

-xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO, "tda9850_sap_mute %s\n", sap_mute ? "on" : "off");

-t->sap_mute = sap_mute;

-   

-TDA9850(0x06,(t->stereo<<6)|(t->sap<<7)|(t->mute?0x8:0x0)|(t->sap_mute?0x10:0x0)); 

-}

-

-CARD16 tda9850_getstatus(TDA9850Ptr t)

-{

-CARD16 status;

-

-I2C_WriteRead(&(t->d), NULL, 0, (I2CByte *)&status, 2); 

-return status;

-}

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86i2c.h"
+#include "tda9850.h"
+#include "i2c_def.h"
+
+#define TDA9850(a,b)	{ \
+		data[0]=a; \
+		data[1]=b; \
+		I2C_WriteRead(&(t->d), data, 2, NULL, 0); \
+		}
+
+TDA9850Ptr
+Detect_tda9850(I2CBusPtr b, I2CSlaveAddr addr)
+{
+    TDA9850Ptr t;
+    I2CByte a;
+
+    t = calloc(1, sizeof(TDA9850Rec));
+    if (t == NULL)
+        return NULL;
+    switch (addr) {
+    case TDA9850_ADDR_1:
+        t->d.DevName = "TDA9850 BTSC Stereo+SAP Audio Processor";
+        break;
+    default:
+        t->d.DevName = "Generic TDAxxxx";
+        break;
+    }
+    t->d.SlaveAddr = addr;
+    t->d.pI2CBus = b;
+    t->d.NextDev = NULL;
+    t->d.StartTimeout = b->StartTimeout;
+    t->d.BitTimeout = b->BitTimeout;
+    t->d.AcknTimeout = b->AcknTimeout;
+    t->d.ByteTimeout = b->ByteTimeout;
+
+    if (!I2C_WriteRead(&(t->d), NULL, 0, &a, 1)) {
+        free(t);
+        return NULL;
+    }
+
+    /* set default parameters */
+    if (!I2CDevInit(&(t->d))) {
+        free(t);
+        return NULL;
+    }
+
+    return t;
+}
+
+Bool
+tda9850_init(TDA9850Ptr t)
+{
+    t->stereo = 1;
+    t->sap = 0;
+    t->mute = TRUE;
+    t->sap_mute = TRUE;
+    tda9850_setaudio(t);
+    return TRUE;
+}
+
+void
+tda9850_setaudio(TDA9850Ptr t)
+{
+    CARD8 data[2];
+
+    if (t->mux == 2) {
+        TDA9850(0x04, 0x0F);
+        TDA9850(0x05, 0x0F);
+        TDA9850(0x06, 0x58);
+        TDA9850(0x07, 0x07);
+        TDA9850(0x08, 0x00);
+        TDA9850(0x09, 0x00);
+        TDA9850(0x0A, 0x03);
+    }
+    else {
+        TDA9850(0x04, 0x07);
+        TDA9850(0x05, 0x07);
+        TDA9850(0x06, 0x58);
+        TDA9850(0x07, 0x07);
+        TDA9850(0x08, 0x10);
+        TDA9850(0x09, 0x10);
+        TDA9850(0x0A, 0x03);
+    }
+
+    TDA9850(0x06,
+            (t->stereo << 6) | (t->sap << 7) | (t->mute ? 0x8 : 0) | (t->
+                                                                      sap_mute ?
+                                                                      0x10 :
+                                                                      0x0));
+}
+
+void
+tda9850_mute(TDA9850Ptr t, Bool mute)
+{
+    CARD8 data[2];
+
+    xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO, "tda9850_mute %s\n",
+               mute ? "on" : "off");
+    t->mute = mute;
+
+    TDA9850(0x06,
+            (t->stereo << 6) | (t->sap << 7) | (t->mute ? 0x8 : 0x0) | (t->
+                                                                        sap_mute
+                                                                        ? 0x10 :
+                                                                        0x0));
+}
+
+void
+tda9850_sap_mute(TDA9850Ptr t, Bool sap_mute)
+{
+    CARD8 data[2];
+
+    xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO, "tda9850_sap_mute %s\n",
+               sap_mute ? "on" : "off");
+    t->sap_mute = sap_mute;
+
+    TDA9850(0x06,
+            (t->stereo << 6) | (t->sap << 7) | (t->mute ? 0x8 : 0x0) | (t->
+                                                                        sap_mute
+                                                                        ? 0x10 :
+                                                                        0x0));
+}
+
+CARD16
+tda9850_getstatus(TDA9850Ptr t)
+{
+    CARD16 status;
+
+    I2C_WriteRead(&(t->d), NULL, 0, (I2CByte *) & status, 2);
+    return status;
+}
diff --git a/xorg-server/hw/xfree86/i2c/tda9850_module.c b/xorg-server/hw/xfree86/i2c/tda9850_module.c
index 239cff4fd..197d65a71 100644
--- a/xorg-server/hw/xfree86/i2c/tda9850_module.c
+++ b/xorg-server/hw/xfree86/i2c/tda9850_module.c
@@ -1,25 +1,24 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Module.h"

-

-static XF86ModuleVersionInfo tda9850VersRec =

-{

-        "tda9850",

-        MODULEVENDORSTRING,

-        MODINFOSTRING1,

-        MODINFOSTRING2,

-        XORG_VERSION_CURRENT,

-        1, 0, 0,

-        ABI_CLASS_VIDEODRV,             /* This needs the video driver ABI */

-        ABI_VIDEODRV_VERSION,

-        MOD_CLASS_NONE,

-        {0,0,0,0}

-};

- 

-_X_EXPORT XF86ModuleData tda9850ModuleData = {

-        &tda9850VersRec,

-        NULL,

-        NULL

-}; 

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Module.h"
+
+static XF86ModuleVersionInfo tda9850VersRec = {
+    "tda9850",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_VIDEODRV,         /* This needs the video driver ABI */
+    ABI_VIDEODRV_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
+};
+
+_X_EXPORT XF86ModuleData tda9850ModuleData = {
+    &tda9850VersRec,
+    NULL,
+    NULL
+};
diff --git a/xorg-server/hw/xfree86/i2c/tda9885.c b/xorg-server/hw/xfree86/i2c/tda9885.c
index f22233995..fd859bde0 100644
--- a/xorg-server/hw/xfree86/i2c/tda9885.c
+++ b/xorg-server/hw/xfree86/i2c/tda9885.c
@@ -1,104 +1,100 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include "xf86i2c.h"

-#include "tda9885.h"

-#include "i2c_def.h"

-

-

-TDA9885Ptr Detect_tda9885(I2CBusPtr b, I2CSlaveAddr addr)

-{

-  TDA9885Ptr t;

-  I2CByte a;

-  

-  t = calloc(1, sizeof(TDA9885Rec));

-  if(t == NULL) return NULL;

-  switch(addr)

-  {

-      case TDA9885_ADDR_1:

-      case TDA9885_ADDR_2:

-      case TDA9885_ADDR_3:

-      case TDA9885_ADDR_4:

-	  t->d.DevName = "TDA9885 Alignment-free IF-PLL";

-	  break;

-      default:

-          t->d.DevName = "Generic TDAxxxx";

-	  break;

-  }

-  t->d.SlaveAddr = addr;

-  t->d.pI2CBus = b;

-  t->d.NextDev = NULL;

-  t->d.StartTimeout = b->StartTimeout;

-  t->d.BitTimeout = b->BitTimeout;

-  t->d.AcknTimeout = b->AcknTimeout;

-  t->d.ByteTimeout = b->ByteTimeout;

-  

-  if(!I2C_WriteRead(&(t->d), NULL, 0, &a, 1))

-  {

-     free(t);

-     return NULL;

-  }

-  

-  /* set default parameters */

-  if(!I2CDevInit(&(t->d)))

-  {

-     free(t);

-     return NULL;

-  }

-

-  return t;  

-}

-

-Bool tda9885_init(TDA9885Ptr t)

-{

-  t->forced_mute_audio=1;

-  return TRUE;

-}

-

-void tda9885_getstatus(TDA9885Ptr t)

-{

-CARD8 value;

-

-I2C_WriteRead(&(t->d), NULL, 0, &value, 1); 

-t->after_reset=value & 1;

-t->afc_status=(value >> 1) & 0xf;

-t->fm_carrier=(value>>5)& 1;

-t->vif_level=(value >>6) & 1;

-t->afc_win=(value >> 7)&1;

-}

-

-void tda9885_setparameters(TDA9885Ptr t)

-{

-CARD8 data[4];

-

-data[0]=0;  /* start with subaddress 0 */

-data[1]=(t->sound_trap & 1) |

-	((t->auto_mute_fm &1)<<1) |

-	((t->carrier_mode &1)<<2) |

-	((t->modulation &3)<<3) |

-	((t->forced_mute_audio &1)<<5) |

-	((t->port1 & 1)<<6) |

-	((t->port2 &1)<<7);         /* B data */

-data[2]=(t->top_adjustment & 0x1f) |

-	((t->deemphasis & 0x3)<<5) |

-	((t->audio_gain & 1) << 7);  /* C data */

-data[3]=(t->standard_sound_carrier & 0x3) |

-	((t->standard_video_if & 0x07)<<2) |

-	((t->minimum_gain & 0x01)<<5) |

-	((t->gating & 0x01)<<6) |

-	((t->vif_agc & 0x01)<<7);   /* E data */

-

-I2C_WriteRead(&(t->d), data, 4, NULL, 0); 

-

-xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"TDA9885 setparam: B data: %x, C data: %x, E data: %x\n", data[1], data[2], data[3]);

-}

-

-void tda9885_dumpstatus(TDA9885Ptr t)

-{

-xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"TDA9885 status: after_reset=%d afc_status=%d (%3.1f kHz off) fm_carrier=%d vif_level=%d afc_win=%d %s\n",

-		t->after_reset, t->afc_status, 

-		(t->afc_status<8)?-12.5-t->afc_status*25.0:-12.5+(16-t->afc_status)*25.0,

-		t->fm_carrier, t->vif_level, t->afc_win, t->afc_win?"VCO in": "VCO out");

-}

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86i2c.h"
+#include "tda9885.h"
+#include "i2c_def.h"
+
+TDA9885Ptr
+Detect_tda9885(I2CBusPtr b, I2CSlaveAddr addr)
+{
+    TDA9885Ptr t;
+    I2CByte a;
+
+    t = calloc(1, sizeof(TDA9885Rec));
+    if (t == NULL)
+        return NULL;
+    switch (addr) {
+    case TDA9885_ADDR_1:
+    case TDA9885_ADDR_2:
+    case TDA9885_ADDR_3:
+    case TDA9885_ADDR_4:
+        t->d.DevName = "TDA9885 Alignment-free IF-PLL";
+        break;
+    default:
+        t->d.DevName = "Generic TDAxxxx";
+        break;
+    }
+    t->d.SlaveAddr = addr;
+    t->d.pI2CBus = b;
+    t->d.NextDev = NULL;
+    t->d.StartTimeout = b->StartTimeout;
+    t->d.BitTimeout = b->BitTimeout;
+    t->d.AcknTimeout = b->AcknTimeout;
+    t->d.ByteTimeout = b->ByteTimeout;
+
+    if (!I2C_WriteRead(&(t->d), NULL, 0, &a, 1)) {
+        free(t);
+        return NULL;
+    }
+
+    /* set default parameters */
+    if (!I2CDevInit(&(t->d))) {
+        free(t);
+        return NULL;
+    }
+
+    return t;
+}
+
+Bool
+tda9885_init(TDA9885Ptr t)
+{
+    t->forced_mute_audio = 1;
+    return TRUE;
+}
+
+void
+tda9885_getstatus(TDA9885Ptr t)
+{
+    CARD8 value;
+
+    I2C_WriteRead(&(t->d), NULL, 0, &value, 1);
+    t->after_reset = value & 1;
+    t->afc_status = (value >> 1) & 0xf;
+    t->fm_carrier = (value >> 5) & 1;
+    t->vif_level = (value >> 6) & 1;
+    t->afc_win = (value >> 7) & 1;
+}
+
+void
+tda9885_setparameters(TDA9885Ptr t)
+{
+    CARD8 data[4];
+
+    data[0] = 0;                /* start with subaddress 0 */
+    data[1] = (t->sound_trap & 1) | ((t->auto_mute_fm & 1) << 1) | ((t->carrier_mode & 1) << 2) | ((t->modulation & 3) << 3) | ((t->forced_mute_audio & 1) << 5) | ((t->port1 & 1) << 6) | ((t->port2 & 1) << 7);       /* B data */
+    data[2] = (t->top_adjustment & 0x1f) | ((t->deemphasis & 0x3) << 5) | ((t->audio_gain & 1) << 7);   /* C data */
+    data[3] = (t->standard_sound_carrier & 0x3) | ((t->standard_video_if & 0x07) << 2) | ((t->minimum_gain & 0x01) << 5) | ((t->gating & 0x01) << 6) | ((t->vif_agc & 0x01) << 7);      /* E data */
+
+    I2C_WriteRead(&(t->d), data, 4, NULL, 0);
+
+    xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO,
+               "TDA9885 setparam: B data: %x, C data: %x, E data: %x\n",
+               data[1], data[2], data[3]);
+}
+
+void
+tda9885_dumpstatus(TDA9885Ptr t)
+{
+    xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO,
+               "TDA9885 status: after_reset=%d afc_status=%d (%3.1f kHz off) fm_carrier=%d vif_level=%d afc_win=%d %s\n",
+               t->after_reset, t->afc_status,
+               (t->afc_status <
+                8) ? -12.5 - t->afc_status * 25.0 : -12.5 + (16 -
+                                                             t->afc_status) *
+               25.0, t->fm_carrier, t->vif_level, t->afc_win,
+               t->afc_win ? "VCO in" : "VCO out");
+}
diff --git a/xorg-server/hw/xfree86/i2c/tda9885_module.c b/xorg-server/hw/xfree86/i2c/tda9885_module.c
index 51eaca7e8..e71bd6061 100644
--- a/xorg-server/hw/xfree86/i2c/tda9885_module.c
+++ b/xorg-server/hw/xfree86/i2c/tda9885_module.c
@@ -1,25 +1,24 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Module.h"

-

-static XF86ModuleVersionInfo tda9885VersRec =

-{

-        "tda9885",

-        MODULEVENDORSTRING,

-        MODINFOSTRING1,

-        MODINFOSTRING2,

-        XORG_VERSION_CURRENT,

-        1, 0, 0,

-        ABI_CLASS_VIDEODRV,             /* This needs the video driver ABI */

-        ABI_VIDEODRV_VERSION,

-        MOD_CLASS_NONE,

-        {0,0,0,0}

-};

- 

-_X_EXPORT XF86ModuleData tda9885ModuleData = {

-        &tda9885VersRec,

-        NULL,

-        NULL

-}; 

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Module.h"
+
+static XF86ModuleVersionInfo tda9885VersRec = {
+    "tda9885",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_VIDEODRV,         /* This needs the video driver ABI */
+    ABI_VIDEODRV_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
+};
+
+_X_EXPORT XF86ModuleData tda9885ModuleData = {
+    &tda9885VersRec,
+    NULL,
+    NULL
+};
diff --git a/xorg-server/hw/xfree86/i2c/uda1380.c b/xorg-server/hw/xfree86/i2c/uda1380.c
index eebe127ed..87226877b 100644
--- a/xorg-server/hw/xfree86/i2c/uda1380.c
+++ b/xorg-server/hw/xfree86/i2c/uda1380.c
@@ -1,183 +1,196 @@
-/*************************************************************************************

- * Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net

- *

- * 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 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 AUTHOR BE LIABLE FOR ANY CLAIM, 

- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 

- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the author shall not be used in advertising or 

- * otherwise to promote the sale, use or other dealings in this Software without prior written 

- * authorization from the author.

- *

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

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include "xf86i2c.h"

-#include "uda1380.h"

-#include "i2c_def.h"

-

-UDA1380Ptr Detect_uda1380(I2CBusPtr b, I2CSlaveAddr addr)

-{

-	UDA1380Ptr t;

-	I2CByte a;

-  

-	t = calloc(1, sizeof(UDA1380Rec));

-	if(t == NULL) return NULL;

-	switch(addr)

-	{

-		case UDA1380_ADDR_1:

-		case UDA1380_ADDR_2:

-			t->d.DevName = "UDA1380 Stereo audion coder-decoder";

-			break;

-		default:

-			t->d.DevName = "Generic UDAxxxx";

-		break;

-	}

-	t->d.SlaveAddr = addr;

-	t->d.pI2CBus = b;

-	t->d.NextDev = NULL;

-	t->d.StartTimeout = b->StartTimeout;

-	t->d.BitTimeout = b->BitTimeout;

-	t->d.AcknTimeout = b->AcknTimeout;

-	t->d.ByteTimeout = b->ByteTimeout;

-  

-	if(!I2C_WriteRead(&(t->d), NULL, 0, &a, 1))

-	{

-		free(t);

-		return NULL;

-	}

-  

-	/* set default parameters */

-	if(!I2CDevInit(&(t->d)))

-	{

-		free(t);

-		return NULL;

-	}

-  

-	xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 stereo coder-decoder detected\n");

-

-	return t;  

-}

-

-Bool uda1380_init(UDA1380Ptr t)

-{

-	CARD8 data[3];

-	CARD16 tmp;

-	Bool ret;

-

-	/* Power control */

-	data[0] = 0x02;

-	tmp = (1 << 13) | (1 << 10) | ( 1 << 8) | (1 << 7) | (1 << 6) | (1 << 3) | (1 << 1);

-	data[1] = (CARD8)((tmp >> 8) & 0xff);

-	data[2] = (CARD8)(tmp & 0xff);

-	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

-	if (ret == FALSE)

-	{

-		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to initialize\n");

-		return FALSE;

-	}

-

-	/* Analog mixer  (AVC) */

-	data[0] = 0x03;

-	/* the analog mixer is muted initially */

-	data[1] = 0x3f;

-	data[2] = 0x3f;

-	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

-	if (ret == FALSE)

-	{

-		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to initialize\n");

-		return FALSE;

-	}

-		  

-	xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 initialized\n");

-

-	return TRUE;

-}

-

-void uda1380_shutdown(UDA1380Ptr t)

-{

-	CARD8 data[3];

-	Bool ret;

-

-	/* Power control */

-	data[0] = 0x02;

-	data[1] = 0;

-	data[2] = 0;

-	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

-	if (ret == FALSE)

-		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to shutdown\n");

-}

-

-void uda1380_setvolume(UDA1380Ptr t, INT32 value)

-{

-	CARD8 data[3];

-	/*

-	 * We have to scale the value ranging from -1000 to 1000 to 0x2c to 0

-	 */

-	CARD8 volume = 47 - (CARD8)((value + 1000) * 47 / 2000);

-	Bool ret;

-		  

-	t->analog_mixer_settings = ((volume << 8) & 0x3f00) | (volume & 0x3f);

-					 

-	/* Analog mixer  (AVC) */

-	data[0] = 0x03;

-	data[1] = volume & 0x3f;

-	data[2] = volume & 0x3f;

-	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

-	if (ret == FALSE)

-		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to set volume\n");

-}

-

-void uda1380_mute(UDA1380Ptr t, Bool mute)

-{

-	CARD8 data[3];

-	Bool ret;

-		  

-	if (mute == TRUE)

-	{

-		/* Analog mixer  (AVC) */

-		data[0] = 0x03;

-		data[1] = 0xff;

-		data[2] = 0xff;

-		ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

-		if (ret == FALSE)

-			xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to mute\n");

-	}

-	else

-	{

-		/* Analog mixer  (AVC) */

-		data[0] = 0x03;

-		data[1] = (CARD8)((t->analog_mixer_settings >> 8) & 0x3f);

-		data[2] = (CARD8)(t->analog_mixer_settings & 0x3f);

-		ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

-		if (ret == FALSE)

-			xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to unmute\n");

-	}

-}

-

-void uda1380_getstatus(UDA1380Ptr t)

-{

-}

-

-void uda1380_setparameters(UDA1380Ptr t)

-{

-}

-

-void uda1380_dumpstatus(UDA1380Ptr t)

-{

-}

+/*************************************************************************************
+ * Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net
+ *
+ * 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 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 AUTHOR BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the author shall not be used in advertising or 
+ * otherwise to promote the sale, use or other dealings in this Software without prior written 
+ * authorization from the author.
+ *
+ ************************************************************************************/
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86i2c.h"
+#include "uda1380.h"
+#include "i2c_def.h"
+
+UDA1380Ptr
+Detect_uda1380(I2CBusPtr b, I2CSlaveAddr addr)
+{
+    UDA1380Ptr t;
+    I2CByte a;
+
+    t = calloc(1, sizeof(UDA1380Rec));
+    if (t == NULL)
+        return NULL;
+    switch (addr) {
+    case UDA1380_ADDR_1:
+    case UDA1380_ADDR_2:
+        t->d.DevName = "UDA1380 Stereo audion coder-decoder";
+        break;
+    default:
+        t->d.DevName = "Generic UDAxxxx";
+        break;
+    }
+    t->d.SlaveAddr = addr;
+    t->d.pI2CBus = b;
+    t->d.NextDev = NULL;
+    t->d.StartTimeout = b->StartTimeout;
+    t->d.BitTimeout = b->BitTimeout;
+    t->d.AcknTimeout = b->AcknTimeout;
+    t->d.ByteTimeout = b->ByteTimeout;
+
+    if (!I2C_WriteRead(&(t->d), NULL, 0, &a, 1)) {
+        free(t);
+        return NULL;
+    }
+
+    /* set default parameters */
+    if (!I2CDevInit(&(t->d))) {
+        free(t);
+        return NULL;
+    }
+
+    xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO,
+               "UDA1380 stereo coder-decoder detected\n");
+
+    return t;
+}
+
+Bool
+uda1380_init(UDA1380Ptr t)
+{
+    CARD8 data[3];
+    CARD16 tmp;
+    Bool ret;
+
+    /* Power control */
+    data[0] = 0x02;
+    tmp =
+        (1 << 13) | (1 << 10) | (1 << 8) | (1 << 7) | (1 << 6) | (1 << 3) | (1
+                                                                             <<
+                                                                             1);
+    data[1] = (CARD8) ((tmp >> 8) & 0xff);
+    data[2] = (CARD8) (tmp & 0xff);
+    ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
+    if (ret == FALSE) {
+        xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO,
+                   "UDA1380 failed to initialize\n");
+        return FALSE;
+    }
+
+    /* Analog mixer  (AVC) */
+    data[0] = 0x03;
+    /* the analog mixer is muted initially */
+    data[1] = 0x3f;
+    data[2] = 0x3f;
+    ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
+    if (ret == FALSE) {
+        xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO,
+                   "UDA1380 failed to initialize\n");
+        return FALSE;
+    }
+
+    xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO, "UDA1380 initialized\n");
+
+    return TRUE;
+}
+
+void
+uda1380_shutdown(UDA1380Ptr t)
+{
+    CARD8 data[3];
+    Bool ret;
+
+    /* Power control */
+    data[0] = 0x02;
+    data[1] = 0;
+    data[2] = 0;
+    ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
+    if (ret == FALSE)
+        xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO,
+                   "UDA1380 failed to shutdown\n");
+}
+
+void
+uda1380_setvolume(UDA1380Ptr t, INT32 value)
+{
+    CARD8 data[3];
+
+    /*
+     * We have to scale the value ranging from -1000 to 1000 to 0x2c to 0
+     */
+    CARD8 volume = 47 - (CARD8) ((value + 1000) * 47 / 2000);
+    Bool ret;
+
+    t->analog_mixer_settings = ((volume << 8) & 0x3f00) | (volume & 0x3f);
+
+    /* Analog mixer  (AVC) */
+    data[0] = 0x03;
+    data[1] = volume & 0x3f;
+    data[2] = volume & 0x3f;
+    ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
+    if (ret == FALSE)
+        xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO,
+                   "UDA1380 failed to set volume\n");
+}
+
+void
+uda1380_mute(UDA1380Ptr t, Bool mute)
+{
+    CARD8 data[3];
+    Bool ret;
+
+    if (mute == TRUE) {
+        /* Analog mixer  (AVC) */
+        data[0] = 0x03;
+        data[1] = 0xff;
+        data[2] = 0xff;
+        ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
+        if (ret == FALSE)
+            xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO,
+                       "UDA1380 failed to mute\n");
+    }
+    else {
+        /* Analog mixer  (AVC) */
+        data[0] = 0x03;
+        data[1] = (CARD8) ((t->analog_mixer_settings >> 8) & 0x3f);
+        data[2] = (CARD8) (t->analog_mixer_settings & 0x3f);
+        ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
+        if (ret == FALSE)
+            xf86DrvMsg(t->d.pI2CBus->scrnIndex, X_INFO,
+                       "UDA1380 failed to unmute\n");
+    }
+}
+
+void
+uda1380_getstatus(UDA1380Ptr t)
+{
+}
+
+void
+uda1380_setparameters(UDA1380Ptr t)
+{
+}
+
+void
+uda1380_dumpstatus(UDA1380Ptr t)
+{
+}
diff --git a/xorg-server/hw/xfree86/i2c/uda1380_module.c b/xorg-server/hw/xfree86/i2c/uda1380_module.c
index 203055d46..dca834b12 100644
--- a/xorg-server/hw/xfree86/i2c/uda1380_module.c
+++ b/xorg-server/hw/xfree86/i2c/uda1380_module.c
@@ -1,25 +1,24 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Module.h"

-

-static XF86ModuleVersionInfo uda1380VersRec =

-{

-        "uda1380",

-        MODULEVENDORSTRING,

-        MODINFOSTRING1,

-        MODINFOSTRING2,

-        XORG_VERSION_CURRENT,

-        1, 0, 0,

-        ABI_CLASS_VIDEODRV,             /* This needs the video driver ABI */

-        ABI_VIDEODRV_VERSION,

-        MOD_CLASS_NONE,

-        {0,0,0,0}

-};

- 

-_X_EXPORT XF86ModuleData uda1380ModuleData = {

-        &uda1380VersRec,

-        NULL,

-        NULL

-}; 

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Module.h"
+
+static XF86ModuleVersionInfo uda1380VersRec = {
+    "uda1380",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_VIDEODRV,         /* This needs the video driver ABI */
+    ABI_VIDEODRV_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
+};
+
+_X_EXPORT XF86ModuleData uda1380ModuleData = {
+    &uda1380VersRec,
+    NULL,
+    NULL
+};
diff --git a/xorg-server/hw/xfree86/i2c/xf86i2c.c b/xorg-server/hw/xfree86/i2c/xf86i2c.c
index 488b6815f..1273f4bab 100644
--- a/xorg-server/hw/xfree86/i2c/xf86i2c.c
+++ b/xorg-server/hw/xfree86/i2c/xf86i2c.c
@@ -1,866 +1,879 @@
-/*

- * Copyright (C) 1998 Itai Nahshon, Michael Schimek

- *

- * The original code was derived from and inspired by 

- * the I2C driver from the Linux kernel.

- *      (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>

- */

-

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <sys/time.h>

-#include <string.h>

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include <X11/Xos.h>

-#include <X11/Xproto.h>

-#include "scrnintstr.h"

-#include "regionstr.h"

-#include "windowstr.h"

-#include "pixmapstr.h"

-#include "validate.h"

-#include "resource.h"

-#include "gcstruct.h"

-#include "dixstruct.h"

-

-#include "xf86i2c.h"

-

-#define I2C_TIMEOUT(x)	/*(x)*/  /* Report timeouts */

-#define I2C_TRACE(x)    /*(x)*/  /* Report progress */

-

-/* This is the default I2CUDelay function if not supplied by the driver.

- * High level I2C interfaces implementing the bus protocol in hardware

- * should supply this function too.

- *

- * Delay execution at least usec microseconds.

- * All values 0 to 1e6 inclusive must be expected.

- */

-

-static void

-I2CUDelay(I2CBusPtr b, int usec)

-{

-  struct timeval begin, cur;

-  long d_secs, d_usecs;

-  long diff;

-

-  if (usec > 0) {

-    X_GETTIMEOFDAY(&begin);

-    do {

-      /* It would be nice to use {xf86}usleep, 

-       * but usleep (1) takes >10000 usec !

-       */

-      X_GETTIMEOFDAY(&cur);

-      d_secs  = (cur.tv_sec - begin.tv_sec);

-      d_usecs = (cur.tv_usec - begin.tv_usec);

-      diff = d_secs*1000000 + d_usecs;

-    } while (diff>=0 && diff< (usec + 1));

-  }

-}

-

-/* Most drivers will register just with GetBits/PutBits functions.

- * The following functions implement a software I2C protocol

- * by using the promitive functions given by the driver.

- * ================================================================

- *

- * It is assumed that there is just one master on the I2C bus, therefore

- * there is no explicit test for conflits.

- */

-

-#define RISEFALLTIME 2 /* usec, actually 300 to 1000 ns according to the i2c specs */

-

-/* Some devices will hold SCL low to slow down the bus or until 

- * ready for transmission.

- *

- * This condition will be noticed when the master tries to raise

- * the SCL line. You can set the timeout to zero if the slave device

- * does not support this clock synchronization.

- */

-

-static Bool

-I2CRaiseSCL(I2CBusPtr b, int sda, int timeout)

-{

-    int i, scl;

-

-    b->I2CPutBits(b, 1, sda);

-    b->I2CUDelay(b, b->RiseFallTime);

-

-    for (i = timeout; i > 0; i -= b->RiseFallTime) {

-	b->I2CGetBits(b, &scl, &sda);

-	if (scl) break;

-	b->I2CUDelay(b, b->RiseFallTime);

-    }

-

-    if (i <= 0) {

-	I2C_TIMEOUT(ErrorF("[I2CRaiseSCL(<%s>, %d, %d) timeout]", b->BusName, sda, timeout));    

-	return FALSE;

-    }

-

-    return TRUE;

-}

-

-/* Send a start signal on the I2C bus. The start signal notifies

- * devices that a new transaction is initiated by the bus master.

- *

- * The start signal is always followed by a slave address.

- * Slave addresses are 8+ bits. The first 7 bits identify the

- * device and the last bit signals if this is a read (1) or

- * write (0) operation.

- *

- * There may be more than one start signal on one transaction.

- * This happens for example on some devices that allow reading

- * of registers. First send a start bit followed by the device

- * address (with the last bit 0) and the register number. Then send

- * a new start bit with the device address (with the last bit 1)

- * and then read the value from the device.

- *

- * Note this is function does not implement a multiple master

- * arbitration procedure.

- */

-

-static Bool

-I2CStart(I2CBusPtr b, int timeout)

-{

-    if (!I2CRaiseSCL(b, 1, timeout))

-	return FALSE;

-

-    b->I2CPutBits(b, 1, 0);

-    b->I2CUDelay(b, b->HoldTime);

-    b->I2CPutBits(b, 0, 0);

-    b->I2CUDelay(b, b->HoldTime);

-

-    I2C_TRACE(ErrorF("\ni2c: <"));

-

-    return TRUE;

-}

-

-/* This is the default I2CStop function if not supplied by the driver.

- *

- * Signal devices on the I2C bus that a transaction on the

- * bus has finished. There may be more than one start signal

- * on a transaction but only one stop signal.

- */

-

-static void

-I2CStop(I2CDevPtr d)

-{

-    I2CBusPtr b = d->pI2CBus;

-

-    b->I2CPutBits(b, 0, 0);

-    b->I2CUDelay(b, b->RiseFallTime);

-

-    b->I2CPutBits(b, 1, 0);

-    b->I2CUDelay(b, b->HoldTime);

-    b->I2CPutBits(b, 1, 1);

-    b->I2CUDelay(b, b->HoldTime);

-

-    I2C_TRACE(ErrorF(">\n"));

-}

-

-/* Write/Read a single bit to/from a device.

- * Return FALSE if a timeout occurs.

- */

-

-static Bool

-I2CWriteBit(I2CBusPtr b, int sda, int timeout)

-{

-    Bool r;

-

-    b->I2CPutBits(b, 0, sda);

-    b->I2CUDelay(b, b->RiseFallTime);

-

-    r = I2CRaiseSCL(b, sda, timeout);

-    b->I2CUDelay(b, b->HoldTime);

-

-    b->I2CPutBits(b, 0, sda);

-    b->I2CUDelay(b, b->HoldTime);

-

-    return r;

-}

-

-static Bool

-I2CReadBit(I2CBusPtr b, int *psda, int timeout)

-{

-    Bool r;

-    int scl;

-

-    r = I2CRaiseSCL(b, 1, timeout);

-    b->I2CUDelay(b, b->HoldTime);

-

-    b->I2CGetBits(b, &scl, psda);

-

-    b->I2CPutBits(b, 0, 1);

-    b->I2CUDelay(b, b->HoldTime);

-

-    return r;

-}

-

-/* This is the default I2CPutByte function if not supplied by the driver.

- *

- * A single byte is sent to the device.

- * The function returns FALSE if a timeout occurs, you should send 

- * a stop condition afterwards to reset the bus.

- *

- * A timeout occurs,

- * if the slave pulls SCL to slow down the bus more than ByteTimeout usecs,

- * or slows down the bus for more than BitTimeout usecs for each bit,

- * or does not send an ACK bit (0) to acknowledge the transmission within

- * AcknTimeout usecs, but a NACK (1) bit.

- *

- * AcknTimeout must be at least b->HoldTime, the other timeouts can be

- * zero according to the comment on I2CRaiseSCL.

- */

-

-static Bool

-I2CPutByte(I2CDevPtr d, I2CByte data)

-{

-    Bool r;

-    int i, scl, sda;

-    I2CBusPtr b = d->pI2CBus;

-

-    if (!I2CWriteBit(b, (data >> 7) & 1, d->ByteTimeout))

-	return FALSE;

-

-    for (i = 6; i >= 0; i--)

-	if (!I2CWriteBit(b, (data >> i) & 1, d->BitTimeout))

-	    return FALSE;

-

-    b->I2CPutBits(b, 0, 1);

-    b->I2CUDelay(b, b->RiseFallTime);

-

-    r = I2CRaiseSCL(b, 1, b->HoldTime);

-

-    if (r) {

-    	for (i = d->AcknTimeout; i > 0; i -= b->HoldTime) {

-	    b->I2CUDelay(b, b->HoldTime);

-	    b->I2CGetBits(b, &scl, &sda);

-	    if (sda == 0) break;

-	}

-

-	if (i <= 0) {

-	    I2C_TIMEOUT(ErrorF("[I2CPutByte(<%s>, 0x%02x, %d, %d, %d) timeout]", 

-				       b->BusName, data, d->BitTimeout, 

-				       d->ByteTimeout, d->AcknTimeout));

-	    r = FALSE;

-	}

-

-	I2C_TRACE(ErrorF("W%02x%c ", (int) data, sda ? '-' : '+'));

-    }

-

-    b->I2CPutBits(b, 0, 1);

-    b->I2CUDelay(b, b->HoldTime);

-

-    return r;

-}

-

-/* This is the default I2CGetByte function if not supplied by the driver.

- *

- * A single byte is read from the device.

- * The function returns FALSE if a timeout occurs, you should send

- * a stop condition afterwards to reset the bus.

- * 

- * A timeout occurs,

- * if the slave pulls SCL to slow down the bus more than ByteTimeout usecs,

- * or slows down the bus for more than b->BitTimeout usecs for each bit.

- *

- * ByteTimeout must be at least b->HoldTime, the other timeouts can be

- * zero according to the comment on I2CRaiseSCL.

- *

- * For the <last> byte in a sequence the acknowledge bit NACK (1), 

- * otherwise ACK (0) will be sent.

- */

-

-static Bool

-I2CGetByte(I2CDevPtr d, I2CByte *data, Bool last)

-{

-    int i, sda;

-    I2CBusPtr b = d->pI2CBus;

-

-    b->I2CPutBits(b, 0, 1);

-    b->I2CUDelay(b, b->RiseFallTime);

-

-    if (!I2CReadBit(b, &sda, d->ByteTimeout))

-	return FALSE;

-

-    *data = (sda > 0) << 7;

-

-    for (i = 6; i >= 0; i--)

-	if (!I2CReadBit(b, &sda, d->BitTimeout))

-	    return FALSE;

-	else

-	    *data |= (sda > 0) << i;

-

-    if (!I2CWriteBit(b, last ? 1 : 0, d->BitTimeout))

-	return FALSE;

-

-    I2C_TRACE(ErrorF("R%02x%c ", (int) *data, last ? '+' : '-'));

-

-    return TRUE;

-}

-

-/* This is the default I2CAddress function if not supplied by the driver.

- *

- * It creates the start condition, followed by the d->SlaveAddr.

- * Higher level functions must call this routine rather than

- * I2CStart/PutByte because a hardware I2C master may not be able 

- * to send a slave address without a start condition.

- *

- * The same timeouts apply as with I2CPutByte and additional a

- * StartTimeout, similar to the ByteTimeout but for the start 

- * condition.

- *

- * In case of a timeout, the bus is left in a clean idle condition.

- * I. e. you *must not* send a Stop. If this function succeeds, you *must*.

- *

- * The slave address format is 16 bit, with the legacy _8_bit_ slave address

- * in the least significant byte. This is, the slave address must include the

- * R/_W flag as least significant bit.

- *

- * The most significant byte of the address will be sent _after_ the LSB, 

- * but only if the LSB indicates:

- * a) an 11 bit address, this is LSB = 1111 0xxx.

- * b) a 'general call address', this is LSB = 0000 000x - see the I2C specs

- *    for more.

- */

-

-static Bool

-I2CAddress(I2CDevPtr d, I2CSlaveAddr addr)

-{

-    if (I2CStart(d->pI2CBus, d->StartTimeout)) {

-	if (I2CPutByte(d, addr & 0xFF)) {

-	    if ((addr & 0xF8) != 0xF0 &&

-		(addr & 0xFE) != 0x00)

-		return TRUE;

-

-	    if (I2CPutByte(d, (addr >> 8) & 0xFF))

-		return TRUE;

-	}

-

-	I2CStop(d);

-    }

-

-    return FALSE;

-}

-

-/* These are the hardware independent I2C helper functions.

- * ========================================================

- */

-

-/* Function for probing. Just send the slave address 

- * and return true if the device responds. The slave address

- * must have the lsb set to reflect a read (1) or write (0) access.

- * Don't expect a read- or write-only device will respond otherwise.

- */

-

-Bool

-xf86I2CProbeAddress(I2CBusPtr b, I2CSlaveAddr addr)

-{

-    int r;

-    I2CDevRec d;

-

-    d.DevName = "Probing";

-    d.BitTimeout = b->BitTimeout;

-    d.ByteTimeout = b->ByteTimeout;

-    d.AcknTimeout = b->AcknTimeout;

-    d.StartTimeout = b->StartTimeout;

-    d.SlaveAddr = addr;

-    d.pI2CBus = b;

-    d.NextDev = NULL;

-

-    r = b->I2CAddress(&d, addr);

-

-    if (r) b->I2CStop(&d);

-

-    return r;

-}

-

-/* All functions below are related to devices and take the

- * slave address and timeout values from an I2CDevRec. They

- * return FALSE in case of an error (presumably a timeout).

- */

-

-/* General purpose read and write function.

- *

- * 1st, if nWrite > 0

- *   Send a start condition

- *   Send the slave address (1 or 2 bytes) with write flag

- *   Write n bytes from WriteBuffer

- * 2nd, if nRead > 0

- *   Send a start condition [again]

- *   Send the slave address (1 or 2 bytes) with read flag

- *   Read n bytes to ReadBuffer

- * 3rd, if a Start condition has been successfully sent,

- *   Send a Stop condition.

- *

- * The functions exits immediately when an error occures,

- * not proceeding any data left. However, step 3 will

- * be executed anyway to leave the bus in clean idle state. 

- */

-

-static Bool

-I2CWriteRead(I2CDevPtr d,

-		 I2CByte *WriteBuffer, int nWrite,

-		 I2CByte *ReadBuffer,  int nRead) 

-{

-    Bool r = TRUE;

-    I2CBusPtr b = d->pI2CBus;

-    int s = 0;

-

-    if (r && nWrite > 0) {

-	r = b->I2CAddress(d, d->SlaveAddr & ~1);

-	if (r) {

-	    for (; nWrite > 0; WriteBuffer++, nWrite--)

-		if (!(r = b->I2CPutByte(d, *WriteBuffer))) 

-		    break;

-	    s++;

-	}

-    }

-

-    if (r && nRead > 0) {

-	r = b->I2CAddress(d, d->SlaveAddr | 1);

-	if (r) {

-	    for (; nRead > 0; ReadBuffer++, nRead--)

-		if (!(r = b->I2CGetByte(d, ReadBuffer, nRead == 1))) 

-		    break;

-	    s++;

-	}

-    }

-

-    if (s) b->I2CStop(d);

-

-    return r;

-}

-

-/* wrapper - for compatibility and convinience */

-

-Bool

-xf86I2CWriteRead(I2CDevPtr d,

-		 I2CByte *WriteBuffer, int nWrite,

-		 I2CByte *ReadBuffer,  int nRead) 

-{

-    I2CBusPtr b = d->pI2CBus;

-    return b->I2CWriteRead(d,WriteBuffer,nWrite,ReadBuffer,nRead);

-}

-

-/* Read a byte, the only readable register of a device.

- */

-

-Bool

-xf86I2CReadStatus(I2CDevPtr d, I2CByte *pbyte)

-{

-    return xf86I2CWriteRead(d, NULL, 0, pbyte, 1);

-}

-

-/* Read a byte from one of the registers determined by its sub-address.

- */

-

-Bool

-xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte)

-{

-    return xf86I2CWriteRead(d, &subaddr, 1, pbyte, 1);

-}

-

-/* Read bytes from subsequent registers determined by the 

- * sub-address of the first register.

- */

-

-Bool

-xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte, int n)

-{

-    return xf86I2CWriteRead(d, &subaddr, 1, pbyte, n);

-}

-

-/* Read a word (high byte, then low byte) from one of the registers 

- * determined by its sub-address.

- */

-

-Bool

-xf86I2CReadWord(I2CDevPtr d, I2CByte subaddr, unsigned short *pword)

-{

-    I2CByte rb[2];

-

-    if (!xf86I2CWriteRead(d, &subaddr, 1, rb, 2)) return FALSE;

-

-    *pword = (rb[0] << 8) | rb[1];

-

-    return TRUE;

-}

-

-/* Write a byte to one of the registers determined by its sub-address.

- */

-

-Bool

-xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte)

-{

-    I2CByte wb[2];

-

-    wb[0] = subaddr;

-    wb[1] = byte;

-

-    return xf86I2CWriteRead(d, wb, 2, NULL, 0);

-}

-

-/* Write bytes to subsequent registers determined by the 

- * sub-address of the first register.

- */

-

-Bool

-xf86I2CWriteBytes(I2CDevPtr d, I2CByte subaddr, 

-		  I2CByte *WriteBuffer, int nWrite)

-{

-    I2CBusPtr b = d->pI2CBus;

-    Bool r = TRUE;

-

-    if (nWrite > 0) {

-	r = b->I2CAddress(d, d->SlaveAddr & ~1);

-	if (r){

-	    if ((r = b->I2CPutByte(d, subaddr)))

-		for (; nWrite > 0; WriteBuffer++, nWrite--)

-		    if (!(r = b->I2CPutByte(d, *WriteBuffer))) 

-			break;

-

-	    b->I2CStop(d);

-	}

-    }

-

-    return r;

-}

-

-/* Write a word (high byte, then low byte) to one of the registers 

- * determined by its sub-address.

- */

-

-Bool

-xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr, unsigned short word)

-{

-    I2CByte wb[3];

-

-    wb[0] = subaddr;

-    wb[1] = word >> 8;

-    wb[2] = word & 0xFF;

-

-    return xf86I2CWriteRead(d, wb, 3, NULL, 0);

-}

-

-/* Write a vector of bytes to not adjacent registers. This vector is, 

- * 1st byte sub-address, 2nd byte value, 3rd byte sub-address asf.

- * This function is intended to initialize devices. Note this function

- * exits immediately when an error occurs, some registers may

- * remain uninitialized.

- */

-

-Bool

-xf86I2CWriteVec(I2CDevPtr d, I2CByte *vec, int nValues)

-{

-    I2CBusPtr b = d->pI2CBus;

-    Bool r = TRUE;

-    int s = 0;

-

-    if (nValues > 0) {

-	for (; nValues > 0; nValues--, vec += 2) {

-	    if (!(r = b->I2CAddress(d, d->SlaveAddr & ~1)))

-	    	break;

-

-	    s++;

-

-	    if (!(r = b->I2CPutByte(d, vec[0])))

-		break;

-

-	    if (!(r = b->I2CPutByte(d, vec[1]))) 

-		break;

-	}

-

-	if (s > 0) b->I2CStop(d);	

-    }

-

-    return r;

-}

-

-/* Administrative functions.

- * =========================

- */

-

-/* Allocates an I2CDevRec for you and initializes with propper defaults

- * you may modify before calling xf86I2CDevInit. Your I2CDevRec must

- * contain at least a SlaveAddr, and a pI2CBus pointer to the bus this

- * device shall be linked to.

- *

- * See function I2CAddress for the slave address format. Always set

- * the least significant bit, indicating a read or write access, to zero.

- */

-

-I2CDevPtr

-xf86CreateI2CDevRec(void) 

-{

-    return calloc(1, sizeof(I2CDevRec));

-}

-

-/* Unlink an I2C device. If you got the I2CDevRec from xf86CreateI2CDevRec

- * you should set <unalloc> to free it.

- */

-

-void

-xf86DestroyI2CDevRec(I2CDevPtr d, Bool unalloc) 

-{

-    if (d) {

-	I2CDevPtr *p;

-

-	/* Remove this from the list of active I2C devices. */

-

-	for (p = &d->pI2CBus->FirstDev; *p != NULL; p = &(*p)->NextDev) 

-	    if (*p == d) {

-		*p = (*p)->NextDev;

-		break;

-	    }

-

-	xf86DrvMsg(d->pI2CBus->scrnIndex, X_INFO,

-		   "I2C device \"%s:%s\" removed.\n",

-		   d->pI2CBus->BusName, d->DevName);

-

-	if (unalloc) free(d);

-    }

-}

-

-/* I2C transmissions are related to an I2CDevRec you must link to a

- * previously registered bus (see xf86I2CBusInit) before attempting

- * to read and write data. You may call xf86I2CProbeAddress first to

- * see if the device in question is present on this bus. 

- *

- * xf86I2CDevInit will not allocate an I2CBusRec for you, instead you

- * may enter a pointer to a statically allocated I2CDevRec or the (modified)

- * result of xf86CreateI2CDevRec.

- *

- * If you don't specify timeouts for the device (n <= 0), it will inherit

- * the bus-wide defaults. The function returns TRUE on success.

- */

-

-Bool

-xf86I2CDevInit(I2CDevPtr d) 

-{

-    I2CBusPtr b;

-

-    if (d == NULL ||

-	(b = d->pI2CBus) == NULL ||

-        (d->SlaveAddr & 1) ||

-        xf86I2CFindDev(b, d->SlaveAddr) != NULL)

-	return FALSE;

-

-    if (d->BitTimeout <= 0) d->BitTimeout = b->BitTimeout;

-    if (d->ByteTimeout <= 0) d->ByteTimeout = b->ByteTimeout;

-    if (d->AcknTimeout <= 0) d->AcknTimeout = b->AcknTimeout;

-    if (d->StartTimeout <= 0) d->StartTimeout = b->StartTimeout;

-

-    d->NextDev = b->FirstDev;

-    b->FirstDev = d;

-

-    xf86DrvMsg(b->scrnIndex, X_INFO,

-	       "I2C device \"%s:%s\" registered at address 0x%02X.\n",

-	       b->BusName, d->DevName, d->SlaveAddr);

-

-    return TRUE;

-}

-

-I2CDevPtr

-xf86I2CFindDev(I2CBusPtr b, I2CSlaveAddr addr) 

-{

-    I2CDevPtr d;

-

-    if (b) { 

-         for (d = b->FirstDev; d != NULL; d = d->NextDev) 

-	    if (d->SlaveAddr == addr)

-		return d;

-    }

-

-    return NULL;

-}

-

-static I2CBusPtr I2CBusList;

-

-/* Allocates an I2CBusRec for you and initializes with propper defaults

- * you may modify before calling xf86I2CBusInit. Your I2CBusRec must

- * contain at least a BusName, a scrnIndex (or -1), and a complete set

- * of either high or low level I2C function pointers. You may pass

- * bus-wide timeouts, otherwise inplausible values will be replaced

- * with safe defaults.

- */

-

-I2CBusPtr

-xf86CreateI2CBusRec(void) 

-{

-    I2CBusPtr b;

-

-    b = (I2CBusPtr) calloc(1, sizeof(I2CBusRec));

-

-    if (b != NULL) {

-	b->scrnIndex = -1;

-	b->HoldTime = 5; /* 100 kHz bus */

-	b->BitTimeout = 5;

-	b->ByteTimeout = 5;

-	b->AcknTimeout = 5;

-	b->StartTimeout = 5;

-	b->RiseFallTime = RISEFALLTIME;

-    }

-

-    return b;

-}

-

-/* Unregister an I2C bus. If you got the I2CBusRec from xf86CreateI2CBusRec

- * you should set <unalloc> to free it. If you set <devs_too>, the function

- * xf86DestroyI2CDevRec will be called for all devices linked to the bus

- * first, passing down the <unalloc> option.

- */

-

-void

-xf86DestroyI2CBusRec(I2CBusPtr b, Bool unalloc, Bool devs_too) 

-{

-    if (b) {

-	I2CBusPtr *p;

-

-	/* Remove this from the list of active I2C buses */

-

-	for (p = &I2CBusList; *p != NULL; p = &(*p)->NextBus) 

-	    if (*p == b) {

-		*p = (*p)->NextBus;

-		break;

-	    }

-

-	if (b->FirstDev != NULL) {

-	    if (devs_too) {

-		I2CDevPtr d;

-

-		while ((d = b->FirstDev) != NULL) {

-		    b->FirstDev = d->NextDev;

-		    xf86DestroyI2CDevRec(d, unalloc);

-		}

-	    } else {

-		if (unalloc) {

-		    xf86Msg(X_ERROR, "i2c bug: Attempt to remove I2C bus \"%s\", "

-			    "but device list is not empty.\n",

-			    b->BusName);

-		    return;

-		}

-	    }

-	}

-

-	xf86DrvMsg(b->scrnIndex, X_INFO, "I2C bus \"%s\" removed.\n",

-		   b->BusName);

-

-	if (unalloc) free(b);

-    }

-}

-

-/* I2C masters have to register themselves using this function.

- * It will not allocate an I2CBusRec for you, instead you may enter

- * a pointer to a statically allocated I2CBusRec or the (modified)

- * result of xf86CreateI2CBusRec. Returns TRUE on success.

- *

- * At this point there won't be any traffic on the I2C bus.

- */

-

-Bool

-xf86I2CBusInit(I2CBusPtr b) 

-{

-    /* I2C buses must be identified by a unique scrnIndex 

-     * and name. If scrnIndex is unspecified (a negative value), 

-     * then the name must be unique throughout the server. 

-     */

-

-    if (b->BusName == NULL ||

-	xf86I2CFindBus(b->scrnIndex, b->BusName) != NULL)

-	return FALSE;

-

-    /* If the high level functions are not

-     * supplied, use the generic functions.

-     * In this case we need the low-level

-     * function.

-     */

-    if (b->I2CWriteRead == NULL) 

-    {

-        b->I2CWriteRead=I2CWriteRead;

-

-        if (b->I2CPutBits == NULL ||

-	    b->I2CGetBits == NULL) 

-        {

-	    if (b->I2CPutByte == NULL ||

-	        b->I2CGetByte == NULL ||

-	        b->I2CAddress == NULL ||

-	        b->I2CStart   == NULL ||

-	        b->I2CStop    == NULL)

-	        return FALSE;

-        } else { 

-	    b->I2CPutByte = I2CPutByte;

-	    b->I2CGetByte = I2CGetByte;

-	    b->I2CAddress = I2CAddress;

-	    b->I2CStop    = I2CStop;

-	    b->I2CStart   = I2CStart;

-        }

-     }

-

-    if (b->I2CUDelay == NULL)

-	b->I2CUDelay = I2CUDelay;

-

-    if (b->HoldTime < 2) b->HoldTime = 5;

-    if (b->BitTimeout <= 0) b->BitTimeout = b->HoldTime;

-    if (b->ByteTimeout <= 0) b->ByteTimeout = b->HoldTime;

-    if (b->AcknTimeout <= 0) b->AcknTimeout = b->HoldTime;

-    if (b->StartTimeout <= 0) b->StartTimeout = b->HoldTime;

-

-    /* Put new bus on list. */

-

-    b->NextBus = I2CBusList;

-    I2CBusList = b;

-

-    xf86DrvMsg(b->scrnIndex, X_INFO, "I2C bus \"%s\" initialized.\n",

-	       b->BusName);

-

-    return TRUE;

-}

-

-I2CBusPtr

-xf86I2CFindBus(int scrnIndex, char *name) 

-{

-    I2CBusPtr p;

-

-    if (name != NULL)

-	for (p = I2CBusList; p != NULL; p = p->NextBus)

-	    if (scrnIndex < 0 || p->scrnIndex == scrnIndex)

-		if (!strcmp(p->BusName, name))

-		    return p;

-    

-    return NULL;

-}

-

-/*

- * Return an array of I2CBusPtr's related to a screen.  The caller is

- * responsible for freeing the array.

- */

-int

-xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr **pppI2CBus)

-{

-    I2CBusPtr pI2CBus;

-    int n = 0;

-

-    if (pppI2CBus)

-	*pppI2CBus = NULL;

-

-    for (pI2CBus = I2CBusList;  pI2CBus;  pI2CBus = pI2CBus->NextBus) {

-	if ((pI2CBus->scrnIndex >= 0) && (pI2CBus->scrnIndex != scrnIndex))

-	    continue;

-

-	n++;

-

-	if (!pppI2CBus)

-	    continue;

-

-        *pppI2CBus = xnfrealloc(*pppI2CBus, n * sizeof(I2CBusPtr));

-	(*pppI2CBus)[n - 1] = pI2CBus;

-    }

-

-    return n;

-}

+/*
+ * Copyright (C) 1998 Itai Nahshon, Michael Schimek
+ *
+ * The original code was derived from and inspired by 
+ * the I2C driver from the Linux kernel.
+ *      (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <sys/time.h>
+#include <string.h>
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include <X11/Xos.h>
+#include <X11/Xproto.h>
+#include "scrnintstr.h"
+#include "regionstr.h"
+#include "windowstr.h"
+#include "pixmapstr.h"
+#include "validate.h"
+#include "resource.h"
+#include "gcstruct.h"
+#include "dixstruct.h"
+
+#include "xf86i2c.h"
+
+#define I2C_TIMEOUT(x)	/*(x)*/ /* Report timeouts */
+#define I2C_TRACE(x)    /*(x)*/ /* Report progress */
+
+/* This is the default I2CUDelay function if not supplied by the driver.
+ * High level I2C interfaces implementing the bus protocol in hardware
+ * should supply this function too.
+ *
+ * Delay execution at least usec microseconds.
+ * All values 0 to 1e6 inclusive must be expected.
+ */
+
+static void
+I2CUDelay(I2CBusPtr b, int usec)
+{
+    struct timeval begin, cur;
+    long d_secs, d_usecs;
+    long diff;
+
+    if (usec > 0) {
+        X_GETTIMEOFDAY(&begin);
+        do {
+            /* It would be nice to use {xf86}usleep, 
+             * but usleep (1) takes >10000 usec !
+             */
+            X_GETTIMEOFDAY(&cur);
+            d_secs = (cur.tv_sec - begin.tv_sec);
+            d_usecs = (cur.tv_usec - begin.tv_usec);
+            diff = d_secs * 1000000 + d_usecs;
+        } while (diff >= 0 && diff < (usec + 1));
+    }
+}
+
+/* Most drivers will register just with GetBits/PutBits functions.
+ * The following functions implement a software I2C protocol
+ * by using the promitive functions given by the driver.
+ * ================================================================
+ *
+ * It is assumed that there is just one master on the I2C bus, therefore
+ * there is no explicit test for conflits.
+ */
+
+#define RISEFALLTIME 2          /* usec, actually 300 to 1000 ns according to the i2c specs */
+
+/* Some devices will hold SCL low to slow down the bus or until 
+ * ready for transmission.
+ *
+ * This condition will be noticed when the master tries to raise
+ * the SCL line. You can set the timeout to zero if the slave device
+ * does not support this clock synchronization.
+ */
+
+static Bool
+I2CRaiseSCL(I2CBusPtr b, int sda, int timeout)
+{
+    int i, scl;
+
+    b->I2CPutBits(b, 1, sda);
+    b->I2CUDelay(b, b->RiseFallTime);
+
+    for (i = timeout; i > 0; i -= b->RiseFallTime) {
+        b->I2CGetBits(b, &scl, &sda);
+        if (scl)
+            break;
+        b->I2CUDelay(b, b->RiseFallTime);
+    }
+
+    if (i <= 0) {
+        I2C_TIMEOUT(ErrorF
+                    ("[I2CRaiseSCL(<%s>, %d, %d) timeout]", b->BusName, sda,
+                     timeout));
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/* Send a start signal on the I2C bus. The start signal notifies
+ * devices that a new transaction is initiated by the bus master.
+ *
+ * The start signal is always followed by a slave address.
+ * Slave addresses are 8+ bits. The first 7 bits identify the
+ * device and the last bit signals if this is a read (1) or
+ * write (0) operation.
+ *
+ * There may be more than one start signal on one transaction.
+ * This happens for example on some devices that allow reading
+ * of registers. First send a start bit followed by the device
+ * address (with the last bit 0) and the register number. Then send
+ * a new start bit with the device address (with the last bit 1)
+ * and then read the value from the device.
+ *
+ * Note this is function does not implement a multiple master
+ * arbitration procedure.
+ */
+
+static Bool
+I2CStart(I2CBusPtr b, int timeout)
+{
+    if (!I2CRaiseSCL(b, 1, timeout))
+        return FALSE;
+
+    b->I2CPutBits(b, 1, 0);
+    b->I2CUDelay(b, b->HoldTime);
+    b->I2CPutBits(b, 0, 0);
+    b->I2CUDelay(b, b->HoldTime);
+
+    I2C_TRACE(ErrorF("\ni2c: <"));
+
+    return TRUE;
+}
+
+/* This is the default I2CStop function if not supplied by the driver.
+ *
+ * Signal devices on the I2C bus that a transaction on the
+ * bus has finished. There may be more than one start signal
+ * on a transaction but only one stop signal.
+ */
+
+static void
+I2CStop(I2CDevPtr d)
+{
+    I2CBusPtr b = d->pI2CBus;
+
+    b->I2CPutBits(b, 0, 0);
+    b->I2CUDelay(b, b->RiseFallTime);
+
+    b->I2CPutBits(b, 1, 0);
+    b->I2CUDelay(b, b->HoldTime);
+    b->I2CPutBits(b, 1, 1);
+    b->I2CUDelay(b, b->HoldTime);
+
+    I2C_TRACE(ErrorF(">\n"));
+}
+
+/* Write/Read a single bit to/from a device.
+ * Return FALSE if a timeout occurs.
+ */
+
+static Bool
+I2CWriteBit(I2CBusPtr b, int sda, int timeout)
+{
+    Bool r;
+
+    b->I2CPutBits(b, 0, sda);
+    b->I2CUDelay(b, b->RiseFallTime);
+
+    r = I2CRaiseSCL(b, sda, timeout);
+    b->I2CUDelay(b, b->HoldTime);
+
+    b->I2CPutBits(b, 0, sda);
+    b->I2CUDelay(b, b->HoldTime);
+
+    return r;
+}
+
+static Bool
+I2CReadBit(I2CBusPtr b, int *psda, int timeout)
+{
+    Bool r;
+    int scl;
+
+    r = I2CRaiseSCL(b, 1, timeout);
+    b->I2CUDelay(b, b->HoldTime);
+
+    b->I2CGetBits(b, &scl, psda);
+
+    b->I2CPutBits(b, 0, 1);
+    b->I2CUDelay(b, b->HoldTime);
+
+    return r;
+}
+
+/* This is the default I2CPutByte function if not supplied by the driver.
+ *
+ * A single byte is sent to the device.
+ * The function returns FALSE if a timeout occurs, you should send 
+ * a stop condition afterwards to reset the bus.
+ *
+ * A timeout occurs,
+ * if the slave pulls SCL to slow down the bus more than ByteTimeout usecs,
+ * or slows down the bus for more than BitTimeout usecs for each bit,
+ * or does not send an ACK bit (0) to acknowledge the transmission within
+ * AcknTimeout usecs, but a NACK (1) bit.
+ *
+ * AcknTimeout must be at least b->HoldTime, the other timeouts can be
+ * zero according to the comment on I2CRaiseSCL.
+ */
+
+static Bool
+I2CPutByte(I2CDevPtr d, I2CByte data)
+{
+    Bool r;
+    int i, scl, sda;
+    I2CBusPtr b = d->pI2CBus;
+
+    if (!I2CWriteBit(b, (data >> 7) & 1, d->ByteTimeout))
+        return FALSE;
+
+    for (i = 6; i >= 0; i--)
+        if (!I2CWriteBit(b, (data >> i) & 1, d->BitTimeout))
+            return FALSE;
+
+    b->I2CPutBits(b, 0, 1);
+    b->I2CUDelay(b, b->RiseFallTime);
+
+    r = I2CRaiseSCL(b, 1, b->HoldTime);
+
+    if (r) {
+        for (i = d->AcknTimeout; i > 0; i -= b->HoldTime) {
+            b->I2CUDelay(b, b->HoldTime);
+            b->I2CGetBits(b, &scl, &sda);
+            if (sda == 0)
+                break;
+        }
+
+        if (i <= 0) {
+            I2C_TIMEOUT(ErrorF("[I2CPutByte(<%s>, 0x%02x, %d, %d, %d) timeout]",
+                               b->BusName, data, d->BitTimeout,
+                               d->ByteTimeout, d->AcknTimeout));
+            r = FALSE;
+        }
+
+        I2C_TRACE(ErrorF("W%02x%c ", (int) data, sda ? '-' : '+'));
+    }
+
+    b->I2CPutBits(b, 0, 1);
+    b->I2CUDelay(b, b->HoldTime);
+
+    return r;
+}
+
+/* This is the default I2CGetByte function if not supplied by the driver.
+ *
+ * A single byte is read from the device.
+ * The function returns FALSE if a timeout occurs, you should send
+ * a stop condition afterwards to reset the bus.
+ * 
+ * A timeout occurs,
+ * if the slave pulls SCL to slow down the bus more than ByteTimeout usecs,
+ * or slows down the bus for more than b->BitTimeout usecs for each bit.
+ *
+ * ByteTimeout must be at least b->HoldTime, the other timeouts can be
+ * zero according to the comment on I2CRaiseSCL.
+ *
+ * For the <last> byte in a sequence the acknowledge bit NACK (1), 
+ * otherwise ACK (0) will be sent.
+ */
+
+static Bool
+I2CGetByte(I2CDevPtr d, I2CByte * data, Bool last)
+{
+    int i, sda;
+    I2CBusPtr b = d->pI2CBus;
+
+    b->I2CPutBits(b, 0, 1);
+    b->I2CUDelay(b, b->RiseFallTime);
+
+    if (!I2CReadBit(b, &sda, d->ByteTimeout))
+        return FALSE;
+
+    *data = (sda > 0) << 7;
+
+    for (i = 6; i >= 0; i--)
+        if (!I2CReadBit(b, &sda, d->BitTimeout))
+            return FALSE;
+        else
+            *data |= (sda > 0) << i;
+
+    if (!I2CWriteBit(b, last ? 1 : 0, d->BitTimeout))
+        return FALSE;
+
+    I2C_TRACE(ErrorF("R%02x%c ", (int) *data, last ? '+' : '-'));
+
+    return TRUE;
+}
+
+/* This is the default I2CAddress function if not supplied by the driver.
+ *
+ * It creates the start condition, followed by the d->SlaveAddr.
+ * Higher level functions must call this routine rather than
+ * I2CStart/PutByte because a hardware I2C master may not be able 
+ * to send a slave address without a start condition.
+ *
+ * The same timeouts apply as with I2CPutByte and additional a
+ * StartTimeout, similar to the ByteTimeout but for the start 
+ * condition.
+ *
+ * In case of a timeout, the bus is left in a clean idle condition.
+ * I. e. you *must not* send a Stop. If this function succeeds, you *must*.
+ *
+ * The slave address format is 16 bit, with the legacy _8_bit_ slave address
+ * in the least significant byte. This is, the slave address must include the
+ * R/_W flag as least significant bit.
+ *
+ * The most significant byte of the address will be sent _after_ the LSB, 
+ * but only if the LSB indicates:
+ * a) an 11 bit address, this is LSB = 1111 0xxx.
+ * b) a 'general call address', this is LSB = 0000 000x - see the I2C specs
+ *    for more.
+ */
+
+static Bool
+I2CAddress(I2CDevPtr d, I2CSlaveAddr addr)
+{
+    if (I2CStart(d->pI2CBus, d->StartTimeout)) {
+        if (I2CPutByte(d, addr & 0xFF)) {
+            if ((addr & 0xF8) != 0xF0 && (addr & 0xFE) != 0x00)
+                return TRUE;
+
+            if (I2CPutByte(d, (addr >> 8) & 0xFF))
+                return TRUE;
+        }
+
+        I2CStop(d);
+    }
+
+    return FALSE;
+}
+
+/* These are the hardware independent I2C helper functions.
+ * ========================================================
+ */
+
+/* Function for probing. Just send the slave address 
+ * and return true if the device responds. The slave address
+ * must have the lsb set to reflect a read (1) or write (0) access.
+ * Don't expect a read- or write-only device will respond otherwise.
+ */
+
+Bool
+xf86I2CProbeAddress(I2CBusPtr b, I2CSlaveAddr addr)
+{
+    int r;
+    I2CDevRec d;
+
+    d.DevName = "Probing";
+    d.BitTimeout = b->BitTimeout;
+    d.ByteTimeout = b->ByteTimeout;
+    d.AcknTimeout = b->AcknTimeout;
+    d.StartTimeout = b->StartTimeout;
+    d.SlaveAddr = addr;
+    d.pI2CBus = b;
+    d.NextDev = NULL;
+
+    r = b->I2CAddress(&d, addr);
+
+    if (r)
+        b->I2CStop(&d);
+
+    return r;
+}
+
+/* All functions below are related to devices and take the
+ * slave address and timeout values from an I2CDevRec. They
+ * return FALSE in case of an error (presumably a timeout).
+ */
+
+/* General purpose read and write function.
+ *
+ * 1st, if nWrite > 0
+ *   Send a start condition
+ *   Send the slave address (1 or 2 bytes) with write flag
+ *   Write n bytes from WriteBuffer
+ * 2nd, if nRead > 0
+ *   Send a start condition [again]
+ *   Send the slave address (1 or 2 bytes) with read flag
+ *   Read n bytes to ReadBuffer
+ * 3rd, if a Start condition has been successfully sent,
+ *   Send a Stop condition.
+ *
+ * The functions exits immediately when an error occures,
+ * not proceeding any data left. However, step 3 will
+ * be executed anyway to leave the bus in clean idle state. 
+ */
+
+static Bool
+I2CWriteRead(I2CDevPtr d,
+             I2CByte * WriteBuffer, int nWrite, I2CByte * ReadBuffer, int nRead)
+{
+    Bool r = TRUE;
+    I2CBusPtr b = d->pI2CBus;
+    int s = 0;
+
+    if (r && nWrite > 0) {
+        r = b->I2CAddress(d, d->SlaveAddr & ~1);
+        if (r) {
+            for (; nWrite > 0; WriteBuffer++, nWrite--)
+                if (!(r = b->I2CPutByte(d, *WriteBuffer)))
+                    break;
+            s++;
+        }
+    }
+
+    if (r && nRead > 0) {
+        r = b->I2CAddress(d, d->SlaveAddr | 1);
+        if (r) {
+            for (; nRead > 0; ReadBuffer++, nRead--)
+                if (!(r = b->I2CGetByte(d, ReadBuffer, nRead == 1)))
+                    break;
+            s++;
+        }
+    }
+
+    if (s)
+        b->I2CStop(d);
+
+    return r;
+}
+
+/* wrapper - for compatibility and convinience */
+
+Bool
+xf86I2CWriteRead(I2CDevPtr d,
+                 I2CByte * WriteBuffer, int nWrite,
+                 I2CByte * ReadBuffer, int nRead)
+{
+    I2CBusPtr b = d->pI2CBus;
+
+    return b->I2CWriteRead(d, WriteBuffer, nWrite, ReadBuffer, nRead);
+}
+
+/* Read a byte, the only readable register of a device.
+ */
+
+Bool
+xf86I2CReadStatus(I2CDevPtr d, I2CByte * pbyte)
+{
+    return xf86I2CWriteRead(d, NULL, 0, pbyte, 1);
+}
+
+/* Read a byte from one of the registers determined by its sub-address.
+ */
+
+Bool
+xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte * pbyte)
+{
+    return xf86I2CWriteRead(d, &subaddr, 1, pbyte, 1);
+}
+
+/* Read bytes from subsequent registers determined by the 
+ * sub-address of the first register.
+ */
+
+Bool
+xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte * pbyte, int n)
+{
+    return xf86I2CWriteRead(d, &subaddr, 1, pbyte, n);
+}
+
+/* Read a word (high byte, then low byte) from one of the registers 
+ * determined by its sub-address.
+ */
+
+Bool
+xf86I2CReadWord(I2CDevPtr d, I2CByte subaddr, unsigned short *pword)
+{
+    I2CByte rb[2];
+
+    if (!xf86I2CWriteRead(d, &subaddr, 1, rb, 2))
+        return FALSE;
+
+    *pword = (rb[0] << 8) | rb[1];
+
+    return TRUE;
+}
+
+/* Write a byte to one of the registers determined by its sub-address.
+ */
+
+Bool
+xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte)
+{
+    I2CByte wb[2];
+
+    wb[0] = subaddr;
+    wb[1] = byte;
+
+    return xf86I2CWriteRead(d, wb, 2, NULL, 0);
+}
+
+/* Write bytes to subsequent registers determined by the 
+ * sub-address of the first register.
+ */
+
+Bool
+xf86I2CWriteBytes(I2CDevPtr d, I2CByte subaddr,
+                  I2CByte * WriteBuffer, int nWrite)
+{
+    I2CBusPtr b = d->pI2CBus;
+    Bool r = TRUE;
+
+    if (nWrite > 0) {
+        r = b->I2CAddress(d, d->SlaveAddr & ~1);
+        if (r) {
+            if ((r = b->I2CPutByte(d, subaddr)))
+                for (; nWrite > 0; WriteBuffer++, nWrite--)
+                    if (!(r = b->I2CPutByte(d, *WriteBuffer)))
+                        break;
+
+            b->I2CStop(d);
+        }
+    }
+
+    return r;
+}
+
+/* Write a word (high byte, then low byte) to one of the registers 
+ * determined by its sub-address.
+ */
+
+Bool
+xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr, unsigned short word)
+{
+    I2CByte wb[3];
+
+    wb[0] = subaddr;
+    wb[1] = word >> 8;
+    wb[2] = word & 0xFF;
+
+    return xf86I2CWriteRead(d, wb, 3, NULL, 0);
+}
+
+/* Write a vector of bytes to not adjacent registers. This vector is, 
+ * 1st byte sub-address, 2nd byte value, 3rd byte sub-address asf.
+ * This function is intended to initialize devices. Note this function
+ * exits immediately when an error occurs, some registers may
+ * remain uninitialized.
+ */
+
+Bool
+xf86I2CWriteVec(I2CDevPtr d, I2CByte * vec, int nValues)
+{
+    I2CBusPtr b = d->pI2CBus;
+    Bool r = TRUE;
+    int s = 0;
+
+    if (nValues > 0) {
+        for (; nValues > 0; nValues--, vec += 2) {
+            if (!(r = b->I2CAddress(d, d->SlaveAddr & ~1)))
+                break;
+
+            s++;
+
+            if (!(r = b->I2CPutByte(d, vec[0])))
+                break;
+
+            if (!(r = b->I2CPutByte(d, vec[1])))
+                break;
+        }
+
+        if (s > 0)
+            b->I2CStop(d);
+    }
+
+    return r;
+}
+
+/* Administrative functions.
+ * =========================
+ */
+
+/* Allocates an I2CDevRec for you and initializes with propper defaults
+ * you may modify before calling xf86I2CDevInit. Your I2CDevRec must
+ * contain at least a SlaveAddr, and a pI2CBus pointer to the bus this
+ * device shall be linked to.
+ *
+ * See function I2CAddress for the slave address format. Always set
+ * the least significant bit, indicating a read or write access, to zero.
+ */
+
+I2CDevPtr
+xf86CreateI2CDevRec(void)
+{
+    return calloc(1, sizeof(I2CDevRec));
+}
+
+/* Unlink an I2C device. If you got the I2CDevRec from xf86CreateI2CDevRec
+ * you should set <unalloc> to free it.
+ */
+
+void
+xf86DestroyI2CDevRec(I2CDevPtr d, Bool unalloc)
+{
+    if (d) {
+        I2CDevPtr *p;
+
+        /* Remove this from the list of active I2C devices. */
+
+        for (p = &d->pI2CBus->FirstDev; *p != NULL; p = &(*p)->NextDev)
+            if (*p == d) {
+                *p = (*p)->NextDev;
+                break;
+            }
+
+        xf86DrvMsg(d->pI2CBus->scrnIndex, X_INFO,
+                   "I2C device \"%s:%s\" removed.\n",
+                   d->pI2CBus->BusName, d->DevName);
+
+        if (unalloc)
+            free(d);
+    }
+}
+
+/* I2C transmissions are related to an I2CDevRec you must link to a
+ * previously registered bus (see xf86I2CBusInit) before attempting
+ * to read and write data. You may call xf86I2CProbeAddress first to
+ * see if the device in question is present on this bus. 
+ *
+ * xf86I2CDevInit will not allocate an I2CBusRec for you, instead you
+ * may enter a pointer to a statically allocated I2CDevRec or the (modified)
+ * result of xf86CreateI2CDevRec.
+ *
+ * If you don't specify timeouts for the device (n <= 0), it will inherit
+ * the bus-wide defaults. The function returns TRUE on success.
+ */
+
+Bool
+xf86I2CDevInit(I2CDevPtr d)
+{
+    I2CBusPtr b;
+
+    if (d == NULL ||
+        (b = d->pI2CBus) == NULL ||
+        (d->SlaveAddr & 1) || xf86I2CFindDev(b, d->SlaveAddr) != NULL)
+        return FALSE;
+
+    if (d->BitTimeout <= 0)
+        d->BitTimeout = b->BitTimeout;
+    if (d->ByteTimeout <= 0)
+        d->ByteTimeout = b->ByteTimeout;
+    if (d->AcknTimeout <= 0)
+        d->AcknTimeout = b->AcknTimeout;
+    if (d->StartTimeout <= 0)
+        d->StartTimeout = b->StartTimeout;
+
+    d->NextDev = b->FirstDev;
+    b->FirstDev = d;
+
+    xf86DrvMsg(b->scrnIndex, X_INFO,
+               "I2C device \"%s:%s\" registered at address 0x%02X.\n",
+               b->BusName, d->DevName, d->SlaveAddr);
+
+    return TRUE;
+}
+
+I2CDevPtr
+xf86I2CFindDev(I2CBusPtr b, I2CSlaveAddr addr)
+{
+    I2CDevPtr d;
+
+    if (b) {
+        for (d = b->FirstDev; d != NULL; d = d->NextDev)
+            if (d->SlaveAddr == addr)
+                return d;
+    }
+
+    return NULL;
+}
+
+static I2CBusPtr I2CBusList;
+
+/* Allocates an I2CBusRec for you and initializes with propper defaults
+ * you may modify before calling xf86I2CBusInit. Your I2CBusRec must
+ * contain at least a BusName, a scrnIndex (or -1), and a complete set
+ * of either high or low level I2C function pointers. You may pass
+ * bus-wide timeouts, otherwise inplausible values will be replaced
+ * with safe defaults.
+ */
+
+I2CBusPtr
+xf86CreateI2CBusRec(void)
+{
+    I2CBusPtr b;
+
+    b = (I2CBusPtr) calloc(1, sizeof(I2CBusRec));
+
+    if (b != NULL) {
+        b->scrnIndex = -1;
+        b->HoldTime = 5;        /* 100 kHz bus */
+        b->BitTimeout = 5;
+        b->ByteTimeout = 5;
+        b->AcknTimeout = 5;
+        b->StartTimeout = 5;
+        b->RiseFallTime = RISEFALLTIME;
+    }
+
+    return b;
+}
+
+/* Unregister an I2C bus. If you got the I2CBusRec from xf86CreateI2CBusRec
+ * you should set <unalloc> to free it. If you set <devs_too>, the function
+ * xf86DestroyI2CDevRec will be called for all devices linked to the bus
+ * first, passing down the <unalloc> option.
+ */
+
+void
+xf86DestroyI2CBusRec(I2CBusPtr b, Bool unalloc, Bool devs_too)
+{
+    if (b) {
+        I2CBusPtr *p;
+
+        /* Remove this from the list of active I2C buses */
+
+        for (p = &I2CBusList; *p != NULL; p = &(*p)->NextBus)
+            if (*p == b) {
+                *p = (*p)->NextBus;
+                break;
+            }
+
+        if (b->FirstDev != NULL) {
+            if (devs_too) {
+                I2CDevPtr d;
+
+                while ((d = b->FirstDev) != NULL) {
+                    b->FirstDev = d->NextDev;
+                    xf86DestroyI2CDevRec(d, unalloc);
+                }
+            }
+            else {
+                if (unalloc) {
+                    xf86Msg(X_ERROR,
+                            "i2c bug: Attempt to remove I2C bus \"%s\", "
+                            "but device list is not empty.\n", b->BusName);
+                    return;
+                }
+            }
+        }
+
+        xf86DrvMsg(b->scrnIndex, X_INFO, "I2C bus \"%s\" removed.\n",
+                   b->BusName);
+
+        if (unalloc)
+            free(b);
+    }
+}
+
+/* I2C masters have to register themselves using this function.
+ * It will not allocate an I2CBusRec for you, instead you may enter
+ * a pointer to a statically allocated I2CBusRec or the (modified)
+ * result of xf86CreateI2CBusRec. Returns TRUE on success.
+ *
+ * At this point there won't be any traffic on the I2C bus.
+ */
+
+Bool
+xf86I2CBusInit(I2CBusPtr b)
+{
+    /* I2C buses must be identified by a unique scrnIndex 
+     * and name. If scrnIndex is unspecified (a negative value), 
+     * then the name must be unique throughout the server. 
+     */
+
+    if (b->BusName == NULL || xf86I2CFindBus(b->scrnIndex, b->BusName) != NULL)
+        return FALSE;
+
+    /* If the high level functions are not
+     * supplied, use the generic functions.
+     * In this case we need the low-level
+     * function.
+     */
+    if (b->I2CWriteRead == NULL) {
+        b->I2CWriteRead = I2CWriteRead;
+
+        if (b->I2CPutBits == NULL || b->I2CGetBits == NULL) {
+            if (b->I2CPutByte == NULL ||
+                b->I2CGetByte == NULL ||
+                b->I2CAddress == NULL ||
+                b->I2CStart == NULL || b->I2CStop == NULL)
+                return FALSE;
+        }
+        else {
+            b->I2CPutByte = I2CPutByte;
+            b->I2CGetByte = I2CGetByte;
+            b->I2CAddress = I2CAddress;
+            b->I2CStop = I2CStop;
+            b->I2CStart = I2CStart;
+        }
+    }
+
+    if (b->I2CUDelay == NULL)
+        b->I2CUDelay = I2CUDelay;
+
+    if (b->HoldTime < 2)
+        b->HoldTime = 5;
+    if (b->BitTimeout <= 0)
+        b->BitTimeout = b->HoldTime;
+    if (b->ByteTimeout <= 0)
+        b->ByteTimeout = b->HoldTime;
+    if (b->AcknTimeout <= 0)
+        b->AcknTimeout = b->HoldTime;
+    if (b->StartTimeout <= 0)
+        b->StartTimeout = b->HoldTime;
+
+    /* Put new bus on list. */
+
+    b->NextBus = I2CBusList;
+    I2CBusList = b;
+
+    xf86DrvMsg(b->scrnIndex, X_INFO, "I2C bus \"%s\" initialized.\n",
+               b->BusName);
+
+    return TRUE;
+}
+
+I2CBusPtr
+xf86I2CFindBus(int scrnIndex, char *name)
+{
+    I2CBusPtr p;
+
+    if (name != NULL)
+        for (p = I2CBusList; p != NULL; p = p->NextBus)
+            if (scrnIndex < 0 || p->scrnIndex == scrnIndex)
+                if (!strcmp(p->BusName, name))
+                    return p;
+
+    return NULL;
+}
+
+/*
+ * Return an array of I2CBusPtr's related to a screen.  The caller is
+ * responsible for freeing the array.
+ */
+int
+xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr ** pppI2CBus)
+{
+    I2CBusPtr pI2CBus;
+    int n = 0;
+
+    if (pppI2CBus)
+        *pppI2CBus = NULL;
+
+    for (pI2CBus = I2CBusList; pI2CBus; pI2CBus = pI2CBus->NextBus) {
+        if ((pI2CBus->scrnIndex >= 0) && (pI2CBus->scrnIndex != scrnIndex))
+            continue;
+
+        n++;
+
+        if (!pppI2CBus)
+            continue;
+
+        *pppI2CBus = xnfrealloc(*pppI2CBus, n * sizeof(I2CBusPtr));
+        (*pppI2CBus)[n - 1] = pI2CBus;
+    }
+
+    return n;
+}
diff --git a/xorg-server/hw/xfree86/i2c/xf86i2c.h b/xorg-server/hw/xfree86/i2c/xf86i2c.h
index f2ded09db..9a8fb21a3 100644
--- a/xorg-server/hw/xfree86/i2c/xf86i2c.h
+++ b/xorg-server/hw/xfree86/i2c/xf86i2c.h
@@ -2,13 +2,12 @@
  *  Copyright (C) 1998 Itai Nahshon, Michael Schimek
  */
 
-
 #ifndef _XF86I2C_H
 #define _XF86I2C_H
 
 #include "regionstr.h"
 
-typedef unsigned char  I2CByte;
+typedef unsigned char I2CByte;
 typedef unsigned short I2CSlaveAddr;
 
 typedef struct _I2CBusRec *I2CBusPtr;
@@ -17,68 +16,71 @@ typedef struct _I2CDevRec *I2CDevPtr;
 /* I2C masters have to register themselves */
 
 typedef struct _I2CBusRec {
-    char *		BusName;
-    int			scrnIndex;
-    
-    void		(*I2CUDelay) (I2CBusPtr b, int usec);
-    
-    void		(*I2CPutBits)(I2CBusPtr b, int  scl, int  sda);
-    void		(*I2CGetBits)(I2CBusPtr b, int *scl, int *sda);
+    char *BusName;
+    int scrnIndex;
+
+    void (*I2CUDelay) (I2CBusPtr b, int usec);
+
+    void (*I2CPutBits) (I2CBusPtr b, int scl, int sda);
+    void (*I2CGetBits) (I2CBusPtr b, int *scl, int *sda);
 
     /* Look at the generic routines to see how these functions should behave. */
 
-    Bool        	(*I2CStart)  (I2CBusPtr b, int timeout);
-    Bool        	(*I2CAddress)(I2CDevPtr d, I2CSlaveAddr);
-    void        	(*I2CStop)   (I2CDevPtr d);
-    Bool		(*I2CPutByte)(I2CDevPtr d, I2CByte data);
-    Bool		(*I2CGetByte)(I2CDevPtr d, I2CByte *data, Bool);
+    Bool (*I2CStart) (I2CBusPtr b, int timeout);
+    Bool (*I2CAddress) (I2CDevPtr d, I2CSlaveAddr);
+    void (*I2CStop) (I2CDevPtr d);
+    Bool (*I2CPutByte) (I2CDevPtr d, I2CByte data);
+    Bool (*I2CGetByte) (I2CDevPtr d, I2CByte * data, Bool);
 
-    DevUnion		DriverPrivate;
+    DevUnion DriverPrivate;
 
-    int         	HoldTime; 	/* 1 / bus clock frequency, 5 or 2 usec */
+    int HoldTime;               /* 1 / bus clock frequency, 5 or 2 usec */
 
-    int			BitTimeout;	/* usec */
-    int 		ByteTimeout;	/* usec */
-    int			AcknTimeout;    /* usec */
-    int 		StartTimeout;	/* usec */
-    int                 RiseFallTime;   /* usec */
+    int BitTimeout;             /* usec */
+    int ByteTimeout;            /* usec */
+    int AcknTimeout;            /* usec */
+    int StartTimeout;           /* usec */
+    int RiseFallTime;           /* usec */
 
-    I2CDevPtr		FirstDev;
-    I2CBusPtr		NextBus;
-    Bool 		(*I2CWriteRead)(I2CDevPtr d, I2CByte *WriteBuffer, int nWrite,
-		                   I2CByte *ReadBuffer,  int nRead);
+    I2CDevPtr FirstDev;
+    I2CBusPtr NextBus;
+    Bool (*I2CWriteRead) (I2CDevPtr d, I2CByte * WriteBuffer, int nWrite,
+                          I2CByte * ReadBuffer, int nRead);
 } I2CBusRec;
 
 #define CreateI2CBusRec		xf86CreateI2CBusRec
 extern _X_EXPORT I2CBusPtr xf86CreateI2CBusRec(void);
+
 #define DestroyI2CBusRec	xf86DestroyI2CBusRec
-extern _X_EXPORT void xf86DestroyI2CBusRec(I2CBusPtr pI2CBus, Bool unalloc, Bool devs_too);
+extern _X_EXPORT void xf86DestroyI2CBusRec(I2CBusPtr pI2CBus, Bool unalloc,
+                                           Bool devs_too);
 #define I2CBusInit		xf86I2CBusInit
 extern _X_EXPORT Bool xf86I2CBusInit(I2CBusPtr pI2CBus);
 
 extern _X_EXPORT I2CBusPtr xf86I2CFindBus(int scrnIndex, char *name);
-extern _X_EXPORT int xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr **pppI2CBus);
-
+extern _X_EXPORT int xf86I2CGetScreenBuses(int scrnIndex,
+                                           I2CBusPtr ** pppI2CBus);
 
 /* I2C slave devices */
 
 typedef struct _I2CDevRec {
-    char *		DevName;
+    char *DevName;
 
-    int			BitTimeout;	/* usec */
-    int 		ByteTimeout;	/* usec */
-    int			AcknTimeout;    /* usec */
-    int 		StartTimeout;	/* usec */
+    int BitTimeout;             /* usec */
+    int ByteTimeout;            /* usec */
+    int AcknTimeout;            /* usec */
+    int StartTimeout;           /* usec */
 
-    I2CSlaveAddr	SlaveAddr;
-    I2CBusPtr		pI2CBus;
-    I2CDevPtr		NextDev;
-    DevUnion		DriverPrivate;
+    I2CSlaveAddr SlaveAddr;
+    I2CBusPtr pI2CBus;
+    I2CDevPtr NextDev;
+    DevUnion DriverPrivate;
 } I2CDevRec;
 
 #define CreateI2CDevRec		xf86CreateI2CDevRec
 extern _X_EXPORT I2CDevPtr xf86CreateI2CDevRec(void);
 extern _X_EXPORT void xf86DestroyI2CDevRec(I2CDevPtr pI2CDev, Bool unalloc);
+
 #define I2CDevInit		xf86I2CDevInit
 extern _X_EXPORT Bool xf86I2CDevInit(I2CDevPtr pI2CDev);
 extern _X_EXPORT I2CDevPtr xf86I2CFindDev(I2CBusPtr, I2CSlaveAddr);
@@ -89,18 +91,25 @@ extern _X_EXPORT I2CDevPtr xf86I2CFindDev(I2CBusPtr, I2CSlaveAddr);
 extern _X_EXPORT Bool xf86I2CProbeAddress(I2CBusPtr pI2CBus, I2CSlaveAddr);
 
 #define		I2C_WriteRead xf86I2CWriteRead
-extern _X_EXPORT Bool xf86I2CWriteRead(I2CDevPtr d, I2CByte *WriteBuffer, int nWrite,
-		                   I2CByte *ReadBuffer,  int nRead);
+extern _X_EXPORT Bool xf86I2CWriteRead(I2CDevPtr d, I2CByte * WriteBuffer,
+                                       int nWrite, I2CByte * ReadBuffer,
+                                       int nRead);
 #define 	xf86I2CRead(d, rb, nr) xf86I2CWriteRead(d, NULL, 0, rb, nr)
 
-extern _X_EXPORT Bool xf86I2CReadStatus(I2CDevPtr d, I2CByte *pbyte);
-extern _X_EXPORT Bool xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte);
-extern _X_EXPORT Bool xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte, int n);
-extern _X_EXPORT Bool xf86I2CReadWord(I2CDevPtr d, I2CByte subaddr, unsigned short *pword);
+extern _X_EXPORT Bool xf86I2CReadStatus(I2CDevPtr d, I2CByte * pbyte);
+extern _X_EXPORT Bool xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr,
+                                      I2CByte * pbyte);
+extern _X_EXPORT Bool xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr,
+                                       I2CByte * pbyte, int n);
+extern _X_EXPORT Bool xf86I2CReadWord(I2CDevPtr d, I2CByte subaddr,
+                                      unsigned short *pword);
 #define 	xf86I2CWrite(d, wb, nw) xf86I2CWriteRead(d, wb, nw, NULL, 0)
-extern _X_EXPORT Bool xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte);
-extern _X_EXPORT Bool xf86I2CWriteBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *WriteBuffer, int nWrite);
-extern _X_EXPORT Bool xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr, unsigned short word);
-extern _X_EXPORT Bool xf86I2CWriteVec(I2CDevPtr d, I2CByte *vec, int nValues);
+extern _X_EXPORT Bool xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr,
+                                       I2CByte byte);
+extern _X_EXPORT Bool xf86I2CWriteBytes(I2CDevPtr d, I2CByte subaddr,
+                                        I2CByte * WriteBuffer, int nWrite);
+extern _X_EXPORT Bool xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr,
+                                       unsigned short word);
+extern _X_EXPORT Bool xf86I2CWriteVec(I2CDevPtr d, I2CByte * vec, int nValues);
 
 #endif /*_XF86I2C_H */
diff --git a/xorg-server/hw/xfree86/int10/generic.c b/xorg-server/hw/xfree86/int10/generic.c
index fbc9b8507..8614e0b9b 100644
--- a/xorg-server/hw/xfree86/int10/generic.c
+++ b/xorg-server/hw/xfree86/int10/generic.c
@@ -20,12 +20,12 @@
 
 #define ALLOC_ENTRIES(x) ((V_RAM / x) - 1)
 
-static CARD8 read_b(xf86Int10InfoPtr pInt,int addr);
-static CARD16 read_w(xf86Int10InfoPtr pInt,int addr);
-static CARD32 read_l(xf86Int10InfoPtr pInt,int addr);
-static void write_b(xf86Int10InfoPtr pInt,int addr, CARD8 val);
-static void write_w(xf86Int10InfoPtr pInt,int addr, CARD16 val);
-static void write_l(xf86Int10InfoPtr pInt,int addr, CARD32 val);
+static CARD8 read_b(xf86Int10InfoPtr pInt, int addr);
+static CARD16 read_w(xf86Int10InfoPtr pInt, int addr);
+static CARD32 read_l(xf86Int10InfoPtr pInt, int addr);
+static void write_b(xf86Int10InfoPtr pInt, int addr, CARD8 val);
+static void write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val);
+static void write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val);
 
 /*
  * the emulator cannot pass a pointer to the current xf86Int10InfoRec
@@ -35,11 +35,11 @@ static void write_l(xf86Int10InfoPtr pInt,int addr, CARD32 val);
 typedef struct {
     int shift;
     int entries;
-    void* base;
-    void* vRam;
+    void *base;
+    void *vRam;
     int highMemory;
-    void* sysMem;
-    char* alloc;
+    void *sysMem;
+    char *alloc;
 } genericInt10Priv;
 
 #define INTPriv(x) ((genericInt10Priv*)x->private)
@@ -55,6 +55,7 @@ int10MemRec genericMem = {
 
 static void MapVRam(xf86Int10InfoPtr pInt);
 static void UnmapVRam(xf86Int10InfoPtr pInt);
+
 #ifdef _PC
 #define GET_HIGH_BASE(x) (((V_BIOS + (x) + getpagesize() - 1)/getpagesize()) \
                               * getpagesize())
@@ -66,28 +67,28 @@ xf86Int10InfoPtr
 xf86ExtendedInitInt10(int entityIndex, int Flags)
 {
     xf86Int10InfoPtr pInt;
-    void* base = 0;
-    void* vbiosMem = 0;
-    void* options = NULL;
+    void *base = 0;
+    void *vbiosMem = 0;
+    void *options = NULL;
     int screen;
     legacyVGARec vga;
- 
+
     screen = (xf86FindScreenForEntity(entityIndex))->scrnIndex;
 
-    options = xf86HandleInt10Options(xf86Screens[screen],entityIndex);
-    
+    options = xf86HandleInt10Options(xf86Screens[screen], entityIndex);
+
     if (int10skip(options)) {
-	free(options);
-	return NULL;
+        free(options);
+        return NULL;
     }
-    
-    pInt = (xf86Int10InfoPtr)xnfcalloc(1, sizeof(xf86Int10InfoRec));
+
+    pInt = (xf86Int10InfoPtr) xnfcalloc(1, sizeof(xf86Int10InfoRec));
     pInt->entityIndex = entityIndex;
     if (!xf86Int10ExecSetup(pInt))
-	goto error0;
+        goto error0;
     pInt->mem = &genericMem;
-    pInt->private = (pointer)xnfcalloc(1, sizeof(genericInt10Priv));
-    INTPriv(pInt)->alloc = (pointer)xnfcalloc(1, ALLOC_ENTRIES(getpagesize()));
+    pInt->private = (pointer) xnfcalloc(1, sizeof(genericInt10Priv));
+    INTPriv(pInt)->alloc = (pointer) xnfcalloc(1, ALLOC_ENTRIES(getpagesize()));
     pInt->scrnIndex = screen;
     base = INTPriv(pInt)->base = xnfalloc(SYS_BIOS);
 
@@ -103,69 +104,70 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
     MapVRam(pInt);
 #ifdef _PC
     if (!sysMem)
-	pci_device_map_legacy(pInt->dev, V_BIOS, BIOS_SIZE + SYS_BIOS - V_BIOS,
-			      PCI_DEV_MAP_FLAG_WRITABLE, &sysMem);
+        pci_device_map_legacy(pInt->dev, V_BIOS, BIOS_SIZE + SYS_BIOS - V_BIOS,
+                              PCI_DEV_MAP_FLAG_WRITABLE, &sysMem);
     INTPriv(pInt)->sysMem = sysMem;
 
     if (xf86ReadBIOS(0, 0, base, LOW_PAGE_SIZE) < 0) {
-	xf86DrvMsg(screen, X_ERROR, "Cannot read int vect\n");
-	goto error1;
+        xf86DrvMsg(screen, X_ERROR, "Cannot read int vect\n");
+        goto error1;
     }
 
     /*
      * Retrieve everything between V_BIOS and SYS_BIOS as some system BIOSes
      * have executable code there.
      */
-    memset((char *)base + V_BIOS, 0, SYS_BIOS - V_BIOS);
+    memset((char *) base + V_BIOS, 0, SYS_BIOS - V_BIOS);
     INTPriv(pInt)->highMemory = V_BIOS;
-    
+
     if (xf86IsEntityPrimary(entityIndex) && !(initPrimary(options))) {
-	if (!xf86int10GetBiosSegment(pInt, (unsigned char *)sysMem - V_BIOS))
-	    goto error1;
+        if (!xf86int10GetBiosSegment(pInt, (unsigned char *) sysMem - V_BIOS))
+            goto error1;
+
+        set_return_trap(pInt);
 
-	set_return_trap(pInt);
+        pInt->Flags = Flags & (SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH);
+        if (!(pInt->Flags & SET_BIOS_SCRATCH))
+            pInt->Flags &= ~RESTORE_BIOS_SCRATCH;
+        xf86Int10SaveRestoreBIOSVars(pInt, TRUE);
 
-	pInt->Flags = Flags & (SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH);
-	if (! (pInt->Flags & SET_BIOS_SCRATCH))
-	    pInt->Flags &= ~RESTORE_BIOS_SCRATCH;
-	xf86Int10SaveRestoreBIOSVars(pInt, TRUE);
-	
-    } else {
-	const BusType location_type = xf86int10GetBiosLocationType(pInt);
-	int bios_location = V_BIOS;
+    }
+    else {
+        const BusType location_type = xf86int10GetBiosLocationType(pInt);
+        int bios_location = V_BIOS;
 
         reset_int_vect(pInt);
-	set_return_trap(pInt);
-
-	switch (location_type) {
-	case BUS_PCI: {
-	    int err;
-	    struct pci_device *rom_device =
-		xf86GetPciInfoForEntity(pInt->entityIndex);
-
-	    vbiosMem = (unsigned char *)base + bios_location;
-	    err = pci_device_read_rom(rom_device, vbiosMem);
-	    if (err) {
-		xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (3) %s\n",
-			   strerror(err));
-		goto error1;
-	    }
-	    INTPriv(pInt)->highMemory = GET_HIGH_BASE(rom_device->rom_size);
-	    break;
-	}
-	default:
-	    goto error1;
-	}
-	pInt->BIOSseg = V_BIOS >> 4;
-	pInt->num = 0xe6;
-	LockLegacyVGA(pInt, &vga);
-	xf86ExecX86int10(pInt);
-	UnlockLegacyVGA(pInt, &vga);
+        set_return_trap(pInt);
+
+        switch (location_type) {
+        case BUS_PCI:{
+            int err;
+            struct pci_device *rom_device =
+                xf86GetPciInfoForEntity(pInt->entityIndex);
+
+            vbiosMem = (unsigned char *) base + bios_location;
+            err = pci_device_read_rom(rom_device, vbiosMem);
+            if (err) {
+                xf86DrvMsg(screen, X_ERROR, "Cannot read V_BIOS (3) %s\n",
+                           strerror(err));
+                goto error1;
+            }
+            INTPriv(pInt)->highMemory = GET_HIGH_BASE(rom_device->rom_size);
+            break;
+        }
+        default:
+            goto error1;
+        }
+        pInt->BIOSseg = V_BIOS >> 4;
+        pInt->num = 0xe6;
+        LockLegacyVGA(pInt, &vga);
+        xf86ExecX86int10(pInt);
+        UnlockLegacyVGA(pInt, &vga);
     }
 #else
     if (!sysMem) {
-	sysMem = xnfalloc(BIOS_SIZE);
-	setup_system_bios(sysMem);
+        sysMem = xnfalloc(BIOS_SIZE);
+        setup_system_bios(sysMem);
     }
     INTPriv(pInt)->sysMem = sysMem;
     setup_int_vect(pInt);
@@ -174,11 +176,11 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
     /* Retrieve the entire legacy video BIOS segment.  This can be upto
      * 128KiB.
      */
-    vbiosMem = (char *)base + V_BIOS;
+    vbiosMem = (char *) base + V_BIOS;
     memset(vbiosMem, 0, 2 * V_BIOS_SIZE);
     if (pci_device_read_rom(pInt->dev, vbiosMem) < V_BIOS_SIZE) {
-	xf86DrvMsg(screen, X_WARNING,
-		   "Unable to retrieve all of segment 0x0C0000.\n");
+        xf86DrvMsg(screen, X_WARNING,
+                   "Unable to retrieve all of segment 0x0C0000.\n");
     }
 
     /*
@@ -186,29 +188,30 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
      * it).
      */
     {
-	int bios_location = V_BIOS;
-	Bool done = FALSE;
-	vbiosMem = (unsigned char *)base + bios_location;
-	
-	if (xf86IsEntityPrimary(entityIndex)) {
-	    if (int10_check_bios(screen, bios_location >> 4, vbiosMem)) 
-		done = TRUE;
-	    else 
-		xf86DrvMsg(screen,X_INFO,
-			"No legacy BIOS found -- trying PCI\n");
-	} 
-	if (!done) {
-	    int err;
-	    struct pci_device *rom_device =
-		xf86GetPciInfoForEntity(pInt->entityIndex);
-
-	    err = pci_device_read_rom(rom_device, vbiosMem);
-	    if (err) {
-		xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (5) %s\n",
-			   strerror(err));
-		goto error1;
-	    }
-	} 
+        int bios_location = V_BIOS;
+        Bool done = FALSE;
+
+        vbiosMem = (unsigned char *) base + bios_location;
+
+        if (xf86IsEntityPrimary(entityIndex)) {
+            if (int10_check_bios(screen, bios_location >> 4, vbiosMem))
+                done = TRUE;
+            else
+                xf86DrvMsg(screen, X_INFO,
+                           "No legacy BIOS found -- trying PCI\n");
+        }
+        if (!done) {
+            int err;
+            struct pci_device *rom_device =
+                xf86GetPciInfoForEntity(pInt->entityIndex);
+
+            err = pci_device_read_rom(rom_device, vbiosMem);
+            if (err) {
+                xf86DrvMsg(screen, X_ERROR, "Cannot read V_BIOS (5) %s\n",
+                           strerror(err));
+                goto error1;
+            }
+        }
     }
 
     pInt->BIOSseg = V_BIOS >> 4;
@@ -228,7 +231,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
  error0:
     free(pInt);
     free(options);
-    
+
     return NULL;
 }
 
@@ -238,7 +241,8 @@ MapVRam(xf86Int10InfoPtr pInt)
     int pagesize = getpagesize();
     int size = ((VRAM_SIZE + pagesize - 1) / pagesize) * pagesize;
 
-    pci_device_map_legacy(pInt->dev, V_RAM, size, PCI_DEV_MAP_FLAG_WRITABLE, &(INTPriv(pInt)->vRam));
+    pci_device_map_legacy(pInt->dev, V_RAM, size, PCI_DEV_MAP_FLAG_WRITABLE,
+                          &(INTPriv(pInt)->vRam));
     pInt->io = pci_legacy_open_io(pInt->dev, 0, 64 * 1024);
 }
 
@@ -247,7 +251,7 @@ UnmapVRam(xf86Int10InfoPtr pInt)
 {
     int screen = pInt->scrnIndex;
     int pagesize = getpagesize();
-    int size = ((VRAM_SIZE + pagesize - 1)/pagesize) * pagesize;
+    int size = ((VRAM_SIZE + pagesize - 1) / pagesize) * pagesize;
 
     pci_device_unmap_legacy(pInt->dev, INTPriv(pInt)->vRam, size);
     pci_device_close_io(pInt->dev, pInt->io);
@@ -265,12 +269,12 @@ void
 xf86FreeInt10(xf86Int10InfoPtr pInt)
 {
     if (!pInt)
-      return;
+        return;
 #if defined (_PC)
     xf86Int10SaveRestoreBIOSVars(pInt, FALSE);
 #endif
     if (Int10Current == pInt)
-	Int10Current = NULL;
+        Int10Current = NULL;
     free(INTPriv(pInt)->base);
     UnmapVRam(pInt);
     free(INTPriv(pInt)->alloc);
@@ -283,49 +287,50 @@ xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
 {
     int pagesize = getpagesize();
     int num_pages = ALLOC_ENTRIES(pagesize);
-    int i,j;
+    int i, j;
 
     for (i = 0; i < (num_pages - num); i++) {
-	if (INTPriv(pInt)->alloc[i] == 0) {
-	    for (j = i; j < (num + i); j++)
-		if (INTPriv(pInt)->alloc[j] != 0)
-		    break;
-	    if (j == (num + i))
-		break;
-	    i += num;
-	}
+        if (INTPriv(pInt)->alloc[i] == 0) {
+            for (j = i; j < (num + i); j++)
+                if (INTPriv(pInt)->alloc[j] != 0)
+                    break;
+            if (j == (num + i))
+                break;
+            i += num;
+        }
     }
     if (i == (num_pages - num))
-	return NULL;
+        return NULL;
 
     for (j = i; j < (i + num); j++)
-	INTPriv(pInt)->alloc[j] = 1;
+        INTPriv(pInt)->alloc[j] = 1;
 
     *off = (i + 1) * pagesize;
 
-    return (char *)INTPriv(pInt)->base + *off;
+    return (char *) INTPriv(pInt)->base + *off;
 }
 
 void
 xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
 {
     int pagesize = getpagesize();
-    int first = (((char *)pbase - (char *)INTPriv(pInt)->base) / pagesize) - 1;
+    int first =
+        (((char *) pbase - (char *) INTPriv(pInt)->base) / pagesize) - 1;
     int i;
 
     for (i = first; i < (first + num); i++)
-	INTPriv(pInt)->alloc[i] = 0;
+        INTPriv(pInt)->alloc[i] = 0;
 }
 
 #define OFF(addr) ((addr) & 0xffff)
 #if defined _PC
-# define HIGH_OFFSET (INTPriv(pInt)->highMemory)
-# define HIGH_BASE   V_BIOS
+#define HIGH_OFFSET (INTPriv(pInt)->highMemory)
+#define HIGH_BASE   V_BIOS
 #else
-# define HIGH_OFFSET SYS_BIOS
-# define HIGH_BASE   SYS_BIOS
+#define HIGH_OFFSET SYS_BIOS
+#define HIGH_BASE   SYS_BIOS
 #endif
-# define SYS(addr) ((addr) >= HIGH_OFFSET)
+#define SYS(addr) ((addr) >= HIGH_OFFSET)
 #define V_ADDR(addr) \
 	  (SYS(addr) ? ((char*)INTPriv(pInt)->sysMem) + (addr - HIGH_BASE) \
 	   : (((char*)(INTPriv(pInt)->base) + addr)))
@@ -371,7 +376,7 @@ read_w(xf86Int10InfoPtr pInt, int addr)
 {
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
     if (OFF(addr + 1) > 0)
-	return V_ADDR_RW(addr);
+        return V_ADDR_RW(addr);
 #endif
     return V_ADDR_RB(addr) | (V_ADDR_RB(addr + 1) << 8);
 }
@@ -381,26 +386,26 @@ read_l(xf86Int10InfoPtr pInt, int addr)
 {
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
     if (OFF(addr + 3) > 2)
-	return V_ADDR_RL(addr);
+        return V_ADDR_RL(addr);
 #endif
     return V_ADDR_RB(addr) |
-	   (V_ADDR_RB(addr + 1) << 8) |
-	   (V_ADDR_RB(addr + 2) << 16) |
-	   (V_ADDR_RB(addr + 3) << 24);
+        (V_ADDR_RB(addr + 1) << 8) |
+        (V_ADDR_RB(addr + 2) << 16) | (V_ADDR_RB(addr + 3) << 24);
 }
 
 static void
 write_b(xf86Int10InfoPtr pInt, int addr, CARD8 val)
 {
-    V_ADDR_WB(addr,val);
+    V_ADDR_WB(addr, val);
 }
 
 static void
 write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val)
 {
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
-    if (OFF(addr + 1) > 0)
-      { V_ADDR_WW(addr, val); }
+    if (OFF(addr + 1) > 0) {
+        V_ADDR_WW(addr, val);
+    }
 #endif
     V_ADDR_WB(addr, val);
     V_ADDR_WB(addr + 1, val >> 8);
@@ -410,8 +415,9 @@ static void
 write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
 {
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
-    if (OFF(addr + 3) > 2)
-      { V_ADDR_WL(addr, val); }
+    if (OFF(addr + 3) > 2) {
+        V_ADDR_WL(addr, val);
+    }
 #endif
     V_ADDR_WB(addr, val);
     V_ADDR_WB(addr + 1, val >> 8);
diff --git a/xorg-server/hw/xfree86/int10/helper_exec.c b/xorg-server/hw/xfree86/int10/helper_exec.c
index 03f9f7da6..1e908778f 100644
--- a/xorg-server/hw/xfree86/int10/helper_exec.c
+++ b/xorg-server/hw/xfree86/int10/helper_exec.c
@@ -43,6 +43,7 @@ static int pciCfg1inw(CARD16 addr, CARD16 *val);
 static int pciCfg1outw(CARD16 addr, CARD16 val);
 static int pciCfg1inb(CARD16 addr, CARD8 *val);
 static int pciCfg1outb(CARD16 addr, CARD8 val);
+
 #if defined (_PC)
 static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set);
 #endif
@@ -53,9 +54,9 @@ int
 setup_int(xf86Int10InfoPtr pInt)
 {
     if (pInt != Int10Current) {
-	if (!MapCurrentInt10(pInt))
-	    return -1;
-	Int10Current = pInt;
+        if (!MapCurrentInt10(pInt))
+            return -1;
+        Int10Current = pInt;
     }
     X86_EAX = (CARD32) pInt->ax;
     X86_EBX = (CARD32) pInt->bx;
@@ -64,16 +65,18 @@ setup_int(xf86Int10InfoPtr pInt)
     X86_ESI = (CARD32) pInt->si;
     X86_EDI = (CARD32) pInt->di;
     X86_EBP = (CARD32) pInt->bp;
-    X86_ESP = 0x1000; X86_SS = pInt->stackseg >> 4;
-    X86_EIP = 0x0600; X86_CS = 0x0;	/* address of 'hlt' */
-    X86_DS = 0x40;			/* standard pc ds */
+    X86_ESP = 0x1000;
+    X86_SS = pInt->stackseg >> 4;
+    X86_EIP = 0x0600;
+    X86_CS = 0x0;               /* address of 'hlt' */
+    X86_DS = 0x40;              /* standard pc ds */
     X86_ES = pInt->es;
     X86_FS = 0;
     X86_GS = 0;
     X86_EFLAGS = X86_IF_MASK | X86_IOPL_MASK;
 #if defined (_PC)
     if (pInt->Flags & SET_BIOS_SCRATCH)
-	SetResetBIOSVars(pInt, TRUE);
+        SetResetBIOSVars(pInt, TRUE);
 #endif
     OsBlockSignals();
     return 0;
@@ -94,13 +97,13 @@ finish_int(xf86Int10InfoPtr pInt, int sig)
     pInt->flags = (CARD32) X86_FLAGS;
 #if defined (_PC)
     if (pInt->Flags & RESTORE_BIOS_SCRATCH)
-	SetResetBIOSVars(pInt, FALSE);
+        SetResetBIOSVars(pInt, FALSE);
 #endif
 }
 
 /* general software interrupt handler */
 CARD32
-getIntVect(xf86Int10InfoPtr pInt,int num)
+getIntVect(xf86Int10InfoPtr pInt, int num)
 {
     return MEM_RW(pInt, num << 2) + (MEM_RW(pInt, (num << 2) + 2) << 4);
 }
@@ -116,26 +119,28 @@ int
 run_bios_int(int num, xf86Int10InfoPtr pInt)
 {
     CARD32 eflags;
+
 #ifndef _PC
     /* check if bios vector is initialized */
-    if (MEM_RW(pInt, (num << 2) + 2) == (SYS_BIOS >> 4)) { /* SYS_BIOS_SEG ?*/
-
-	if (num == 21 && X86_AH == 0x4e) {
- 	    xf86DrvMsg(pInt->scrnIndex, X_NOTICE,
-		       "Failing Find-Matching-File on non-PC"
-			" (int 21, func 4e)\n");
- 	    X86_AX = 2;
- 	    SET_FLAG(F_CF);
- 	    return 1;
- 	} else {
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-			   "Ignoring int 0x%02x call\n", num);
-	    if (xf86GetVerbosity() > 3) {
-		dump_registers(pInt);
-		stack_trace(pInt);
-	    }
-	    return 1;
-	}
+    if (MEM_RW(pInt, (num << 2) + 2) == (SYS_BIOS >> 4)) {      /* SYS_BIOS_SEG ? */
+
+        if (num == 21 && X86_AH == 0x4e) {
+            xf86DrvMsg(pInt->scrnIndex, X_NOTICE,
+                       "Failing Find-Matching-File on non-PC"
+                       " (int 21, func 4e)\n");
+            X86_AX = 2;
+            SET_FLAG(F_CF);
+            return 1;
+        }
+        else {
+            xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                           "Ignoring int 0x%02x call\n", num);
+            if (xf86GetVerbosity() > 3) {
+                dump_registers(pInt);
+                stack_trace(pInt);
+            }
+            return 1;
+        }
     }
 #endif
 #ifdef PRINT_INT
@@ -144,13 +149,13 @@ run_bios_int(int num, xf86Int10InfoPtr pInt)
     eflags = X86_EFLAGS;
 #if 0
     eflags = eflags | IF_MASK;
-    X86_EFLAGS = X86_EFLAGS  & ~(VIF_MASK | TF_MASK | IF_MASK | NT_MASK);
+    X86_EFLAGS = X86_EFLAGS & ~(VIF_MASK | TF_MASK | IF_MASK | NT_MASK);
 #endif
     pushw(pInt, eflags);
     pushw(pInt, X86_CS);
     pushw(pInt, X86_IP);
     X86_CS = MEM_RW(pInt, (num << 2) + 2);
-    X86_IP = MEM_RW(pInt,  num << 2);
+    X86_IP = MEM_RW(pInt, num << 2);
 #ifdef PRINT_INT
     ErrorF("0x%x:%lx\n", X86_CS, X86_EIP);
 #endif
@@ -164,12 +169,13 @@ dump_code(xf86Int10InfoPtr pInt)
     int i;
     CARD32 lina = SEG_ADR((CARD32), X86_CS, IP);
 
-    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3, "code at 0x%8.8" PRIx32 ":\n", lina);
-    for (i=0; i<0x10; i++)
-	xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, lina + i));
+    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3, "code at 0x%8.8" PRIx32 ":\n",
+                   lina);
+    for (i = 0; i < 0x10; i++)
+        xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, lina + i));
     xf86ErrorFVerb(3, "\n");
-    for (; i<0x20; i++)
-	xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, lina + i));
+    for (; i < 0x20; i++)
+        xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, lina + i));
     xf86ErrorFVerb(3, "\n");
 }
 
@@ -177,20 +183,20 @@ void
 dump_registers(xf86Int10InfoPtr pInt)
 {
     xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
-	"EAX=0x%8.8lx, EBX=0x%8.8lx, ECX=0x%8.8lx, EDX=0x%8.8lx\n",
-	(unsigned long)X86_EAX, (unsigned long)X86_EBX,
-	(unsigned long)X86_ECX, (unsigned long)X86_EDX);
+                   "EAX=0x%8.8lx, EBX=0x%8.8lx, ECX=0x%8.8lx, EDX=0x%8.8lx\n",
+                   (unsigned long) X86_EAX, (unsigned long) X86_EBX,
+                   (unsigned long) X86_ECX, (unsigned long) X86_EDX);
     xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
-	"ESP=0x%8.8lx, EBP=0x%8.8lx, ESI=0x%8.8lx, EDI=0x%8.8lx\n",
-	(unsigned long)X86_ESP, (unsigned long)X86_EBP,
-	(unsigned long)X86_ESI, (unsigned long)X86_EDI);
+                   "ESP=0x%8.8lx, EBP=0x%8.8lx, ESI=0x%8.8lx, EDI=0x%8.8lx\n",
+                   (unsigned long) X86_ESP, (unsigned long) X86_EBP,
+                   (unsigned long) X86_ESI, (unsigned long) X86_EDI);
     xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
-	"CS=0x%4.4x, SS=0x%4.4x,"
-	" DS=0x%4.4x, ES=0x%4.4x, FS=0x%4.4x, GS=0x%4.4x\n",
-	X86_CS, X86_SS, X86_DS, X86_ES, X86_FS, X86_GS);
+                   "CS=0x%4.4x, SS=0x%4.4x,"
+                   " DS=0x%4.4x, ES=0x%4.4x, FS=0x%4.4x, GS=0x%4.4x\n",
+                   X86_CS, X86_SS, X86_DS, X86_ES, X86_FS, X86_GS);
     xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
-	"EIP=0x%8.8lx, EFLAGS=0x%8.8lx\n",
-	(unsigned long)X86_EIP, (unsigned long)X86_EFLAGS);
+                   "EIP=0x%8.8lx, EFLAGS=0x%8.8lx\n",
+                   (unsigned long) X86_EIP, (unsigned long) X86_EFLAGS);
 }
 
 void
@@ -198,113 +204,120 @@ stack_trace(xf86Int10InfoPtr pInt)
 {
     int i = 0;
     unsigned long stack = SEG_ADR((CARD32), X86_SS, SP);
-    unsigned long tail  = (CARD32)((X86_SS << 4) + 0x1000);
+    unsigned long tail = (CARD32) ((X86_SS << 4) + 0x1000);
 
-    if (stack >= tail) return;
+    if (stack >= tail)
+        return;
 
     xf86MsgVerb(X_INFO, 3, "stack at 0x%8.8lx:\n", stack);
     for (; stack < tail; stack++) {
-	xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, stack));
-	i = (i + 1) % 0x10;
-	if (!i)
-	    xf86ErrorFVerb(3, "\n");
+        xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, stack));
+        i = (i + 1) % 0x10;
+        if (!i)
+            xf86ErrorFVerb(3, "\n");
     }
     if (i)
-	xf86ErrorFVerb(3, "\n");
+        xf86ErrorFVerb(3, "\n");
 }
 
 int
 port_rep_inb(xf86Int10InfoPtr pInt,
-	     CARD16 port, CARD32 base, int d_f, CARD32 count)
+             CARD16 port, CARD32 base, int d_f, CARD32 count)
 {
     register int inc = d_f ? -1 : 1;
     CARD32 dst = base;
+
     if (PRINT_PORT && DEBUG_IO_TRACE())
-	ErrorF(" rep_insb(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
-		port, count, base, d_f ? "up" : "down");
+        ErrorF(" rep_insb(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
+               port, count, base, d_f ? "up" : "down");
     while (count--) {
-	MEM_WB(pInt, dst, x_inb(port));
-	dst += inc;
+        MEM_WB(pInt, dst, x_inb(port));
+        dst += inc;
     }
     return dst - base;
 }
 
 int
 port_rep_inw(xf86Int10InfoPtr pInt,
-	     CARD16 port, CARD32 base, int d_f, CARD32 count)
+             CARD16 port, CARD32 base, int d_f, CARD32 count)
 {
     register int inc = d_f ? -2 : 2;
     CARD32 dst = base;
+
     if (PRINT_PORT && DEBUG_IO_TRACE())
-	ErrorF(" rep_insw(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
-	     port, count, base, d_f ? "up" : "down");
+        ErrorF(" rep_insw(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
+               port, count, base, d_f ? "up" : "down");
     while (count--) {
-	MEM_WW(pInt, dst, x_inw(port));
-	dst += inc;
+        MEM_WW(pInt, dst, x_inw(port));
+        dst += inc;
     }
     return dst - base;
 }
 
 int
 port_rep_inl(xf86Int10InfoPtr pInt,
-	     CARD16 port, CARD32 base, int d_f, CARD32 count)
+             CARD16 port, CARD32 base, int d_f, CARD32 count)
 {
     register int inc = d_f ? -4 : 4;
     CARD32 dst = base;
+
     if (PRINT_PORT && DEBUG_IO_TRACE())
-	ErrorF(" rep_insl(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
-	     port, count, base, d_f ? "up" : "down");
+        ErrorF(" rep_insl(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
+               port, count, base, d_f ? "up" : "down");
     while (count--) {
-	MEM_WL(pInt, dst, x_inl(port));
-	dst += inc;
+        MEM_WL(pInt, dst, x_inl(port));
+        dst += inc;
     }
     return dst - base;
 }
 
 int
 port_rep_outb(xf86Int10InfoPtr pInt,
-	      CARD16 port, CARD32 base, int d_f, CARD32 count)
+              CARD16 port, CARD32 base, int d_f, CARD32 count)
 {
     register int inc = d_f ? -1 : 1;
     CARD32 dst = base;
+
     if (PRINT_PORT && DEBUG_IO_TRACE())
-	ErrorF(" rep_outb(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
-	     port, count, base, d_f ? "up" : "down");
+        ErrorF(" rep_outb(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
+               port, count, base, d_f ? "up" : "down");
     while (count--) {
-	x_outb(port, MEM_RB(pInt, dst));
-	dst += inc;
+        x_outb(port, MEM_RB(pInt, dst));
+        dst += inc;
     }
     return dst - base;
 }
 
 int
 port_rep_outw(xf86Int10InfoPtr pInt,
-	      CARD16 port, CARD32 base, int d_f, CARD32 count)
+              CARD16 port, CARD32 base, int d_f, CARD32 count)
 {
     register int inc = d_f ? -2 : 2;
     CARD32 dst = base;
+
     if (PRINT_PORT && DEBUG_IO_TRACE())
-	ErrorF(" rep_outw(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
-	     port, count, base, d_f ? "up" : "down");
+        ErrorF(" rep_outw(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
+               port, count, base, d_f ? "up" : "down");
     while (count--) {
-	x_outw(port, MEM_RW(pInt, dst));
-	dst += inc;
+        x_outw(port, MEM_RW(pInt, dst));
+        dst += inc;
     }
     return dst - base;
 }
 
 int
 port_rep_outl(xf86Int10InfoPtr pInt,
-	      CARD16 port, CARD32 base, int d_f, CARD32 count)
+              CARD16 port, CARD32 base, int d_f, CARD32 count)
 {
     register int inc = d_f ? -4 : 4;
     CARD32 dst = base;
+
     if (PRINT_PORT && DEBUG_IO_TRACE())
-	ErrorF(" rep_outl(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
-	     port, count, base, d_f ? "up" : "down");
+        ErrorF(" rep_outl(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
+               port, count, base, d_f ? "up" : "down");
     while (count--) {
-	x_outl(port, MEM_RL(pInt, dst));
-	dst += inc;
+        x_outl(port, MEM_RL(pInt, dst));
+        dst += inc;
     }
     return dst - base;
 }
@@ -315,25 +328,27 @@ x_inb(CARD16 port)
     CARD8 val;
 
     if (port == 0x40) {
-	Int10Current->inb40time++;
-	val = (CARD8)(Int10Current->inb40time >>
-		      ((Int10Current->inb40time & 1) << 3));
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" inb(%#x) = %2.2x\n", port, val);
+        Int10Current->inb40time++;
+        val = (CARD8) (Int10Current->inb40time >>
+                       ((Int10Current->inb40time & 1) << 3));
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" inb(%#x) = %2.2x\n", port, val);
 #ifdef __NOT_YET__
-    } else if (port < 0x0100) {		/* Don't interfere with mainboard */
-	val = 0;
-	xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2,
-	    "inb 0x%4.4x\n", port);
-	if (xf86GetVerbosity() > 3) {
-	    dump_registers(Int10Current);
-	    stack_trace(Int10Current);
-	}
-#endif /* __NOT_YET__ */
-    } else if (!pciCfg1inb(port, &val)) {
-	val = pci_io_read8(Int10Current->io, port);
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" inb(%#x) = %2.2x\n", port, val);
+    }
+    else if (port < 0x0100) {   /* Don't interfere with mainboard */
+        val = 0;
+        xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "inb 0x%4.4x\n", port);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(Int10Current);
+            stack_trace(Int10Current);
+        }
+#endif                          /* __NOT_YET__ */
+    }
+    else if (!pciCfg1inb(port, &val)) {
+        val = pci_io_read8(Int10Current->io, port);
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" inb(%#x) = %2.2x\n", port, val);
     }
     return val;
 }
@@ -344,18 +359,19 @@ x_inw(CARD16 port)
     CARD16 val;
 
     if (port == 0x5c) {
-	struct timeval tv;
-
-	/*
-	 * Emulate a PC's timer.  Typical resolution is 3.26 usec.
-	 * Approximate this by dividing by 3.
-	 */
-	X_GETTIMEOFDAY(&tv);
-	val = (CARD16)(tv.tv_usec / 3);
-    } else if (!pciCfg1inw(port, &val)) {
-	val = pci_io_read16(Int10Current->io, port);
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" inw(%#x) = %4.4x\n", port, val);
+        struct timeval tv;
+
+        /*
+         * Emulate a PC's timer.  Typical resolution is 3.26 usec.
+         * Approximate this by dividing by 3.
+         */
+        X_GETTIMEOFDAY(&tv);
+        val = (CARD16) (tv.tv_usec / 3);
+    }
+    else if (!pciCfg1inw(port, &val)) {
+        val = pci_io_read16(Int10Current->io, port);
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" inw(%#x) = %4.4x\n", port, val);
     }
     return val;
 }
@@ -364,30 +380,33 @@ void
 x_outb(CARD16 port, CARD8 val)
 {
     if ((port == 0x43) && (val == 0)) {
-	struct timeval tv;
-	/*
-	 * Emulate a PC's timer 0.  Such timers typically have a resolution of
-	 * some .838 usec per tick, but this can only provide 1 usec per tick.
-	 * (Not that this matters much, given inherent emulation delays.)  Use
-	 * the bottom bit as a byte select.  See inb(0x40) above.
-	 */
-	X_GETTIMEOFDAY(&tv);
-	Int10Current->inb40time = (CARD16)(tv.tv_usec | 1);
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" outb(%#x, %2.2x)\n", port, val);
+        struct timeval tv;
+
+        /*
+         * Emulate a PC's timer 0.  Such timers typically have a resolution of
+         * some .838 usec per tick, but this can only provide 1 usec per tick.
+         * (Not that this matters much, given inherent emulation delays.)  Use
+         * the bottom bit as a byte select.  See inb(0x40) above.
+         */
+        X_GETTIMEOFDAY(&tv);
+        Int10Current->inb40time = (CARD16) (tv.tv_usec | 1);
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" outb(%#x, %2.2x)\n", port, val);
 #ifdef __NOT_YET__
-    } else if (port < 0x0100) {		/* Don't interfere with mainboard */
-	xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2,
-	    "outb 0x%4.4x,0x%2.2x\n", port, val);
-	if (xf86GetVerbosity() > 3) {
-	    dump_registers(Int10Current);
-	    stack_trace(Int10Current);
-	}
-#endif /* __NOT_YET__ */
-    } else if (!pciCfg1outb(port, val)) {
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" outb(%#x, %2.2x)\n", port, val);
-	pci_io_write8(Int10Current->io, port, val);
+    }
+    else if (port < 0x0100) {   /* Don't interfere with mainboard */
+        xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "outb 0x%4.4x,0x%2.2x\n", port, val);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(Int10Current);
+            stack_trace(Int10Current);
+        }
+#endif                          /* __NOT_YET__ */
+    }
+    else if (!pciCfg1outb(port, val)) {
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" outb(%#x, %2.2x)\n", port, val);
+        pci_io_write8(Int10Current->io, port, val);
     }
 }
 
@@ -396,9 +415,9 @@ x_outw(CARD16 port, CARD16 val)
 {
 
     if (!pciCfg1outw(port, val)) {
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" outw(%#x, %4.4x)\n", port, val);
-	pci_io_write16(Int10Current->io, port, val);
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" outw(%#x, %4.4x)\n", port, val);
+        pci_io_write16(Int10Current->io, port, val);
     }
 }
 
@@ -408,9 +427,9 @@ x_inl(CARD16 port)
     CARD32 val;
 
     if (!pciCfg1in(port, &val)) {
-	val = pci_io_read32(Int10Current->io, port);
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" inl(%#x) = %8.8" PRIx32 "\n", port, val);
+        val = pci_io_read32(Int10Current->io, port);
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" inl(%#x) = %8.8" PRIx32 "\n", port, val);
     }
     return val;
 }
@@ -419,46 +438,46 @@ void
 x_outl(CARD16 port, CARD32 val)
 {
     if (!pciCfg1out(port, val)) {
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" outl(%#x, %8.8" PRIx32 ")\n", port, val);
-	pci_io_write32(Int10Current->io, port, val);
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" outl(%#x, %8.8" PRIx32 ")\n", port, val);
+        pci_io_write32(Int10Current->io, port, val);
     }
 }
 
 CARD8
 Mem_rb(CARD32 addr)
 {
-    return (*Int10Current->mem->rb)(Int10Current, addr);
+    return (*Int10Current->mem->rb) (Int10Current, addr);
 }
 
 CARD16
 Mem_rw(CARD32 addr)
 {
-    return (*Int10Current->mem->rw)(Int10Current, addr);
+    return (*Int10Current->mem->rw) (Int10Current, addr);
 }
 
 CARD32
 Mem_rl(CARD32 addr)
 {
-    return (*Int10Current->mem->rl)(Int10Current, addr);
+    return (*Int10Current->mem->rl) (Int10Current, addr);
 }
 
 void
 Mem_wb(CARD32 addr, CARD8 val)
 {
-    (*Int10Current->mem->wb)(Int10Current, addr, val);
+    (*Int10Current->mem->wb) (Int10Current, addr, val);
 }
 
 void
 Mem_ww(CARD32 addr, CARD16 val)
 {
-    (*Int10Current->mem->ww)(Int10Current, addr, val);
+    (*Int10Current->mem->ww) (Int10Current, addr, val);
 }
 
 void
 Mem_wl(CARD32 addr, CARD32 val)
 {
-    (*Int10Current->mem->wl)(Int10Current, addr, val);
+    (*Int10Current->mem->wl) (Int10Current, addr, val);
 }
 
 static CARD32 PciCfg1Addr = 0;
@@ -471,43 +490,45 @@ static CARD32 PciCfg1Addr = 0;
 #define PCI_OFFSET(x) ((x) & 0x000000ff)
 #define PCI_TAG(x)    ((x) & 0x7fffff00)
 
-static struct pci_device*
-pci_device_for_cfg_address (CARD32 addr)
+static struct pci_device *
+pci_device_for_cfg_address(CARD32 addr)
 {
-	struct pci_device *dev = NULL;
-	CARD32 tag = PCI_TAG(addr);
-	struct pci_slot_match slot_match = {
-		.domain = PCI_DOM_FROM_TAG(tag),
-		.bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)),
-		.dev = PCI_DEV_FROM_TAG(tag),
-		.func = PCI_FUNC_FROM_TAG(tag),
-		.match_data = 0
-	};
+    struct pci_device *dev = NULL;
+    CARD32 tag = PCI_TAG(addr);
+
+    struct pci_slot_match slot_match = {
+        .domain = PCI_DOM_FROM_TAG(tag),
+        .bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)),
+        .dev = PCI_DEV_FROM_TAG(tag),
+        .func = PCI_FUNC_FROM_TAG(tag),
+        .match_data = 0
+    };
 
-	struct pci_device_iterator *iter =
-	    pci_slot_match_iterator_create (&slot_match);
+    struct pci_device_iterator *iter =
+        pci_slot_match_iterator_create(&slot_match);
 
-	if (iter)
-		dev = pci_device_next(iter);
+    if (iter)
+        dev = pci_device_next(iter);
 
-	pci_iterator_destroy(iter);
+    pci_iterator_destroy(iter);
 
-	return dev;
+    return dev;
 }
 
 static int
 pciCfg1in(CARD16 addr, CARD32 *val)
 {
     if (addr == 0xCF8) {
-	*val = PciCfg1Addr;
-	return 1;
+        *val = PciCfg1Addr;
+        return 1;
     }
     if (addr == 0xCFC) {
-	pci_device_cfg_read_u32(pci_device_for_cfg_address(PciCfg1Addr),
-			(uint32_t *)val, PCI_OFFSET(PciCfg1Addr));
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" cfg_inl(%#" PRIx32 ") = %8.8" PRIx32 "\n", PciCfg1Addr, *val);
-	return 1;
+        pci_device_cfg_read_u32(pci_device_for_cfg_address(PciCfg1Addr),
+                                (uint32_t *) val, PCI_OFFSET(PciCfg1Addr));
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" cfg_inl(%#" PRIx32 ") = %8.8" PRIx32 "\n", PciCfg1Addr,
+                   *val);
+        return 1;
     }
     return 0;
 }
@@ -516,15 +537,16 @@ static int
 pciCfg1out(CARD16 addr, CARD32 val)
 {
     if (addr == 0xCF8) {
-	PciCfg1Addr = val;
-	return 1;
+        PciCfg1Addr = val;
+        return 1;
     }
     if (addr == 0xCFC) {
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" cfg_outl(%#" PRIx32 ", %8.8" PRIx32 ")\n", PciCfg1Addr, val);
-	pci_device_cfg_write_u32(pci_device_for_cfg_address(PciCfg1Addr),
-			val, PCI_OFFSET(PciCfg1Addr));
-	return 1;
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" cfg_outl(%#" PRIx32 ", %8.8" PRIx32 ")\n", PciCfg1Addr,
+                   val);
+        pci_device_cfg_write_u32(pci_device_for_cfg_address(PciCfg1Addr), val,
+                                 PCI_OFFSET(PciCfg1Addr));
+        return 1;
     }
     return 0;
 }
@@ -535,18 +557,19 @@ pciCfg1inw(CARD16 addr, CARD16 *val)
     int shift;
 
     if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
-	shift = (addr - 0xCF8) * 8;
-	*val = (PciCfg1Addr >> shift) & 0xffff;
-	return 1;
+        shift = (addr - 0xCF8) * 8;
+        *val = (PciCfg1Addr >> shift) & 0xffff;
+        return 1;
     }
     if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
-	const unsigned offset = addr - 0xCFC;
-
-	pci_device_cfg_read_u16(pci_device_for_cfg_address(PciCfg1Addr),
-			val, PCI_OFFSET(PciCfg1Addr) + offset);
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" cfg_inw(%#" PRIx32 ") = %4.4x\n", PciCfg1Addr + offset, *val);
-	return 1;
+        const unsigned offset = addr - 0xCFC;
+
+        pci_device_cfg_read_u16(pci_device_for_cfg_address(PciCfg1Addr),
+                                val, PCI_OFFSET(PciCfg1Addr) + offset);
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" cfg_inw(%#" PRIx32 ") = %4.4x\n", PciCfg1Addr + offset,
+                   *val);
+        return 1;
     }
     return 0;
 }
@@ -557,19 +580,20 @@ pciCfg1outw(CARD16 addr, CARD16 val)
     int shift;
 
     if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
-	shift = (addr - 0xCF8) * 8;
-	PciCfg1Addr &= ~(0xffff << shift);
-	PciCfg1Addr |= ((CARD32) val) << shift;
-	return 1;
+        shift = (addr - 0xCF8) * 8;
+        PciCfg1Addr &= ~(0xffff << shift);
+        PciCfg1Addr |= ((CARD32) val) << shift;
+        return 1;
     }
     if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
-	const unsigned offset = addr - 0xCFC;
-
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" cfg_outw(%#" PRIx32 ", %4.4x)\n", PciCfg1Addr + offset, val);
-	pci_device_cfg_write_u16(pci_device_for_cfg_address(PciCfg1Addr),
-			val, PCI_OFFSET(PciCfg1Addr) + offset);
-	return 1;
+        const unsigned offset = addr - 0xCFC;
+
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" cfg_outw(%#" PRIx32 ", %4.4x)\n", PciCfg1Addr + offset,
+                   val);
+        pci_device_cfg_write_u16(pci_device_for_cfg_address(PciCfg1Addr), val,
+                                 PCI_OFFSET(PciCfg1Addr) + offset);
+        return 1;
     }
     return 0;
 }
@@ -580,18 +604,19 @@ pciCfg1inb(CARD16 addr, CARD8 *val)
     int shift;
 
     if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
-	shift = (addr - 0xCF8) * 8;
-	*val = (PciCfg1Addr >> shift) & 0xff;
-	return 1;
+        shift = (addr - 0xCF8) * 8;
+        *val = (PciCfg1Addr >> shift) & 0xff;
+        return 1;
     }
     if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
-	const unsigned offset = addr - 0xCFC;
-
-	pci_device_cfg_read_u8(pci_device_for_cfg_address(PciCfg1Addr),
-			val, PCI_OFFSET(PciCfg1Addr) + offset);
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" cfg_inb(%#" PRIx32 ") = %2.2x\n", PciCfg1Addr + offset, *val);
-	return 1;
+        const unsigned offset = addr - 0xCFC;
+
+        pci_device_cfg_read_u8(pci_device_for_cfg_address(PciCfg1Addr),
+                               val, PCI_OFFSET(PciCfg1Addr) + offset);
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" cfg_inb(%#" PRIx32 ") = %2.2x\n", PciCfg1Addr + offset,
+                   *val);
+        return 1;
     }
     return 0;
 }
@@ -602,19 +627,20 @@ pciCfg1outb(CARD16 addr, CARD8 val)
     int shift;
 
     if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
-	shift = (addr - 0xCF8) * 8;
-	PciCfg1Addr &= ~(0xff << shift);
-	PciCfg1Addr |= ((CARD32) val) << shift;
-	return 1;
+        shift = (addr - 0xCF8) * 8;
+        PciCfg1Addr &= ~(0xff << shift);
+        PciCfg1Addr |= ((CARD32) val) << shift;
+        return 1;
     }
     if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
-	const unsigned offset = addr - 0xCFC;
-
-	if (PRINT_PORT && DEBUG_IO_TRACE())
-	    ErrorF(" cfg_outb(%#" PRIx32 ", %2.2x)\n", PciCfg1Addr + offset, val);
-	pci_device_cfg_write_u8(pci_device_for_cfg_address(PciCfg1Addr),
-			val, PCI_OFFSET(PciCfg1Addr) + offset);
-	return 1;
+        const unsigned offset = addr - 0xCFC;
+
+        if (PRINT_PORT && DEBUG_IO_TRACE())
+            ErrorF(" cfg_outb(%#" PRIx32 ", %2.2x)\n", PciCfg1Addr + offset,
+                   val);
+        pci_device_cfg_write_u8(pci_device_for_cfg_address(PciCfg1Addr), val,
+                                PCI_OFFSET(PciCfg1Addr) + offset);
+        return 1;
     }
     return 0;
 }
@@ -625,7 +651,7 @@ bios_checksum(const CARD8 *start, int size)
     CARD8 sum = 0;
 
     while (size-- > 0)
-	sum += *start++;
+        sum += *start++;
     return sum;
 }
 
@@ -650,18 +676,18 @@ bios_checksum(const CARD8 *start, int size)
 void
 LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
 {
-    vga->save_msr    = pci_io_read8(pInt->io, 0x03CC);
-    vga->save_vse    = pci_io_read8(pInt->io, 0x03C3);
+    vga->save_msr = pci_io_read8(pInt->io, 0x03CC);
+    vga->save_vse = pci_io_read8(pInt->io, 0x03C3);
 #ifndef __ia64__
-    vga->save_46e8   = pci_io_read8(pInt->io, 0x46E8);
+    vga->save_46e8 = pci_io_read8(pInt->io, 0x46E8);
 #endif
     vga->save_pos102 = pci_io_read8(pInt->io, 0x0102);
-    pci_io_write8(pInt->io, 0x03C2, ~(CARD8)0x03 & vga->save_msr);
-    pci_io_write8(pInt->io, 0x03C3, ~(CARD8)0x01 & vga->save_vse);
+    pci_io_write8(pInt->io, 0x03C2, ~(CARD8) 0x03 & vga->save_msr);
+    pci_io_write8(pInt->io, 0x03C3, ~(CARD8) 0x01 & vga->save_vse);
 #ifndef __ia64__
-    pci_io_write8(pInt->io, 0x46E8, ~(CARD8)0x08 & vga->save_46e8);
+    pci_io_write8(pInt->io, 0x46E8, ~(CARD8) 0x08 & vga->save_46e8);
 #endif
-    pci_io_write8(pInt->io, 0x0102, ~(CARD8)0x01 & vga->save_pos102);
+    pci_io_write8(pInt->io, 0x0102, ~(CARD8) 0x01 & vga->save_pos102);
 }
 
 void
@@ -680,20 +706,22 @@ static void
 SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set)
 {
     int pagesize = getpagesize();
-    unsigned char* base;
+    unsigned char *base;
     int i;
 
-    if (pci_device_map_legacy(pInt->dev, 0, pagesize, PCI_DEV_MAP_FLAG_WRITABLE, (void **)&base))
-	return; /* eek */
+    if (pci_device_map_legacy
+        (pInt->dev, 0, pagesize, PCI_DEV_MAP_FLAG_WRITABLE, (void **) &base))
+        return;                 /* eek */
 
     if (set) {
-	for (i = BIOS_SCRATCH_OFF; i < BIOS_SCRATCH_END; i++)
-	    MEM_WW(pInt, i, *(base + i));
-    } else {
-	for (i = BIOS_SCRATCH_OFF; i < BIOS_SCRATCH_END; i++)
-	    *(base + i) = MEM_RW(pInt, i);
+        for (i = BIOS_SCRATCH_OFF; i < BIOS_SCRATCH_END; i++)
+            MEM_WW(pInt, i, *(base + i));
     }
-    
+    else {
+        for (i = BIOS_SCRATCH_OFF; i < BIOS_SCRATCH_END; i++)
+            *(base + i) = MEM_RW(pInt, i);
+    }
+
     pci_device_unmap_legacy(pInt->dev, base, pagesize);
 }
 
@@ -701,31 +729,32 @@ void
 xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save)
 {
     int pagesize = getpagesize();
-    unsigned char* base;
+    unsigned char *base;
     int i;
 
     if (!xf86IsEntityPrimary(pInt->entityIndex)
-	|| (!save && !pInt->BIOSScratch))
-	return;
-    
-    if (pci_device_map_legacy(pInt->dev, 0, pagesize, PCI_DEV_MAP_FLAG_WRITABLE, (void **)&base))
-	return; /* eek */
+        || (!save && !pInt->BIOSScratch))
+        return;
+
+    if (pci_device_map_legacy
+        (pInt->dev, 0, pagesize, PCI_DEV_MAP_FLAG_WRITABLE, (void **) &base))
+        return;                 /* eek */
 
     base += BIOS_SCRATCH_OFF;
     if (save) {
-	if ((pInt->BIOSScratch
-	     = xnfalloc(BIOS_SCRATCH_LEN)))
-	    for (i = 0; i < BIOS_SCRATCH_LEN; i++)
-		*(((char*)pInt->BIOSScratch + i)) = *(base + i);	
-    } else {
-	if (pInt->BIOSScratch) {
-	    for (i = 0; i < BIOS_SCRATCH_LEN; i++)
-		*(base + i) = *(pInt->BIOSScratch + i); 
-	    free(pInt->BIOSScratch);
-	    pInt->BIOSScratch = NULL;
-	}
-    }
-    
+        if ((pInt->BIOSScratch = xnfalloc(BIOS_SCRATCH_LEN)))
+            for (i = 0; i < BIOS_SCRATCH_LEN; i++)
+                *(((char *) pInt->BIOSScratch + i)) = *(base + i);
+    }
+    else {
+        if (pInt->BIOSScratch) {
+            for (i = 0; i < BIOS_SCRATCH_LEN; i++)
+                *(base + i) = *(pInt->BIOSScratch + i);
+            free(pInt->BIOSScratch);
+            pInt->BIOSScratch = NULL;
+        }
+    }
+
     pci_device_unmap_legacy(pInt->dev, base - BIOS_SCRATCH_OFF, pagesize);
 }
 #endif
diff --git a/xorg-server/hw/xfree86/int10/helper_mem.c b/xorg-server/hw/xfree86/int10/helper_mem.c
index 9088298a9..96c598a53 100644
--- a/xorg-server/hw/xfree86/int10/helper_mem.c
+++ b/xorg-server/hw/xfree86/int10/helper_mem.c
@@ -28,29 +28,30 @@ typedef enum {
 } INT10Opts;
 
 static const OptionInfoRec INT10Options[] = {
-    {OPT_NOINT10,       "NoINT10",      OPTV_BOOLEAN,   {0},    FALSE },
-    {OPT_INIT_PRIMARY,  "InitPrimary",  OPTV_BOOLEAN,   {0},    FALSE },   
-    { -1,		NULL,		OPTV_NONE,	{0},	FALSE },
+    {OPT_NOINT10, "NoINT10", OPTV_BOOLEAN, {0}, FALSE},
+    {OPT_INIT_PRIMARY, "InitPrimary", OPTV_BOOLEAN, {0}, FALSE},
+    {-1, NULL, OPTV_NONE, {0}, FALSE},
 };
 
 #ifdef DEBUG
 void
 dprint(unsigned long start, unsigned long size)
 {
-    int i,j;
-    char *c = (char *)start;
+    int i, j;
+    char *c = (char *) start;
 
     for (j = 0; j < (size >> 4); j++) {
-	char *d = c;
-	ErrorF("\n0x%lx:  ",(unsigned long)c);
-	for (i = 0; i<16; i++)
-	    ErrorF("%2.2x ",(unsigned char) (*(c++)));
-	c = d;
-	for (i = 0; i<16; i++) {
-	    ErrorF("%c",((((CARD8)(*c)) > 32) && (((CARD8)(*c)) < 128)) ?
-		   (unsigned char) (*(c)): '.');
-	    c++;
-	}
+        char *d = c;
+
+        ErrorF("\n0x%lx:  ", (unsigned long) c);
+        for (i = 0; i < 16; i++)
+            ErrorF("%2.2x ", (unsigned char) (*(c++)));
+        c = d;
+        for (i = 0; i < 16; i++) {
+            ErrorF("%c", ((((CARD8) (*c)) > 32) && (((CARD8) (*c)) < 128)) ?
+                   (unsigned char) (*(c)) : '.');
+            c++;
+        }
     }
     ErrorF("\n");
 }
@@ -69,13 +70,13 @@ setup_int_vect(xf86Int10InfoPtr pInt)
 
     /* let the int vects point to the SYS_BIOS seg */
     for (i = 0; i < 0x80; i++) {
-	MEM_WW(pInt, i << 2, 0);
-	MEM_WW(pInt, (i << 2) + 2, SYS_BIOS >> 4);
+        MEM_WW(pInt, i << 2, 0);
+        MEM_WW(pInt, (i << 2) + 2, SYS_BIOS >> 4);
     }
 
     reset_int_vect(pInt);
     /* font tables default location (int 1F) */
-    MEM_WW(pInt,0x1f<<2,0xfa6e);
+    MEM_WW(pInt, 0x1f << 2, 0xfa6e);
 
     /* int 11 default location (Get Equipment Configuration) */
     MEM_WW(pInt, 0x11 << 2, 0xf84d);
@@ -122,7 +123,7 @@ setup_system_bios(void *base_addr)
     /* set up eisa ident string */
     strcpy(base + 0x0FFD9, "PCI_ISA");
     /* write system model id for IBM-AT */
-    *((unsigned char *)(base + 0x0FFFE)) = 0xfc;
+    *((unsigned char *) (base + 0x0FFFE)) = 0xfc;
 
     return 1;
 }
@@ -137,42 +138,42 @@ reset_int_vect(xf86Int10InfoPtr pInt)
      * only be used during EGA/VGA BIOS initialisation.
      */
     static const CARD8 VideoParms[] = {
-	/* Timing for modes 0x00 & 0x01 */
-	0x38, 0x28, 0x2d, 0x0a, 0x1f, 0x06, 0x19, 0x1c,
-	0x02, 0x07, 0x06, 0x07, 0x00, 0x00, 0x00, 0x00,
-	/* Timing for modes 0x02 & 0x03 */
-	0x71, 0x50, 0x5a, 0x0a, 0x1f, 0x06, 0x19, 0x1c,
-	0x02, 0x07, 0x06, 0x07, 0x00, 0x00, 0x00, 0x00,
-	/* Timing for modes 0x04, 0x05 & 0x06 */
-	0x38, 0x28, 0x2d, 0x0a, 0x7f, 0x06, 0x64, 0x70,
-	0x02, 0x01, 0x06, 0x07, 0x00, 0x00, 0x00, 0x00,
-	/* Timing for mode 0x07 */
-	0x61, 0x50, 0x52, 0x0f, 0x19, 0x06, 0x19, 0x19,
-	0x02, 0x0d, 0x0b, 0x0c, 0x00, 0x00, 0x00, 0x00,
-	/* Display page lengths in little endian order */
-	0x00, 0x08, /* Modes 0x00 and 0x01 */
-	0x00, 0x10, /* Modes 0x02 and 0x03 */
-	0x00, 0x40, /* Modes 0x04 and 0x05 */
-	0x00, 0x40, /* Modes 0x06 and 0x07 */
-	/* Number of columns for each mode */
-	40, 40, 80, 80, 40, 40, 80, 80,
-	/* CGA Mode register value for each mode */
-	0x2c, 0x28, 0x2d, 0x29, 0x2a, 0x2e, 0x1e, 0x29,
-	/* Padding */
-	0x00, 0x00, 0x00, 0x00
-	};
+        /* Timing for modes 0x00 & 0x01 */
+        0x38, 0x28, 0x2d, 0x0a, 0x1f, 0x06, 0x19, 0x1c,
+        0x02, 0x07, 0x06, 0x07, 0x00, 0x00, 0x00, 0x00,
+        /* Timing for modes 0x02 & 0x03 */
+        0x71, 0x50, 0x5a, 0x0a, 0x1f, 0x06, 0x19, 0x1c,
+        0x02, 0x07, 0x06, 0x07, 0x00, 0x00, 0x00, 0x00,
+        /* Timing for modes 0x04, 0x05 & 0x06 */
+        0x38, 0x28, 0x2d, 0x0a, 0x7f, 0x06, 0x64, 0x70,
+        0x02, 0x01, 0x06, 0x07, 0x00, 0x00, 0x00, 0x00,
+        /* Timing for mode 0x07 */
+        0x61, 0x50, 0x52, 0x0f, 0x19, 0x06, 0x19, 0x19,
+        0x02, 0x0d, 0x0b, 0x0c, 0x00, 0x00, 0x00, 0x00,
+        /* Display page lengths in little endian order */
+        0x00, 0x08,             /* Modes 0x00 and 0x01 */
+        0x00, 0x10,             /* Modes 0x02 and 0x03 */
+        0x00, 0x40,             /* Modes 0x04 and 0x05 */
+        0x00, 0x40,             /* Modes 0x06 and 0x07 */
+        /* Number of columns for each mode */
+        40, 40, 80, 80, 40, 40, 80, 80,
+        /* CGA Mode register value for each mode */
+        0x2c, 0x28, 0x2d, 0x29, 0x2a, 0x2e, 0x1e, 0x29,
+        /* Padding */
+        0x00, 0x00, 0x00, 0x00
+    };
     int i;
 
     for (i = 0; i < sizeof(VideoParms); i++)
-	MEM_WB(pInt, i + (0x1000 - sizeof(VideoParms)), VideoParms[i]);
-    MEM_WW(pInt,  0x1d << 2, 0x1000 - sizeof(VideoParms));
+        MEM_WB(pInt, i + (0x1000 - sizeof(VideoParms)), VideoParms[i]);
+    MEM_WW(pInt, 0x1d << 2, 0x1000 - sizeof(VideoParms));
     MEM_WW(pInt, (0x1d << 2) + 2, 0);
 
-    MEM_WW(pInt,  0x10 << 2, 0xf065);
+    MEM_WW(pInt, 0x10 << 2, 0xf065);
     MEM_WW(pInt, (0x10 << 2) + 2, SYS_BIOS >> 4);
-    MEM_WW(pInt,  0x42 << 2, 0xf065);
+    MEM_WW(pInt, 0x42 << 2, 0xf065);
     MEM_WW(pInt, (0x42 << 2) + 2, SYS_BIOS >> 4);
-    MEM_WW(pInt,  0x6D << 2, 0xf065);
+    MEM_WW(pInt, 0x6D << 2, 0xf065);
     MEM_WW(pInt, (0x6D << 2) + 2, SYS_BIOS >> 4);
 }
 
@@ -196,24 +197,22 @@ xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex)
 {
     EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
     OptionInfoPtr options = NULL;
-    
+
     if (pEnt->device) {
-	pointer configOptions = NULL;
-
-	/* Check if xf86CollectOptions() has already been called */
-	if (((pEnt->index < 0) ||
-	    !pScrn ||
-	    !(configOptions = pScrn->options)) &&
-	    pEnt->device)
-	    configOptions = pEnt->device->options;
-
-	if (configOptions) {
-	    if (!(options = (OptionInfoPtr) malloc(sizeof(INT10Options))))
-		return NULL;
-	     
-	    (void)memcpy(options, INT10Options, sizeof(INT10Options));
-	    xf86ProcessOptions(pScrn->scrnIndex, configOptions, options);
-	}
+        pointer configOptions = NULL;
+
+        /* Check if xf86CollectOptions() has already been called */
+        if (((pEnt->index < 0) ||
+             !pScrn || !(configOptions = pScrn->options)) && pEnt->device)
+            configOptions = pEnt->device->options;
+
+        if (configOptions) {
+            if (!(options = (OptionInfoPtr) malloc(sizeof(INT10Options))))
+                return NULL;
+
+            (void) memcpy(options, INT10Options, sizeof(INT10Options));
+            xf86ProcessOptions(pScrn->scrnIndex, configOptions, options);
+        }
     }
     free(pEnt);
 
@@ -221,47 +220,48 @@ xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex)
 }
 
 Bool
-int10skip(const void* options)
+int10skip(const void *options)
 {
     Bool noint10 = FALSE;
 
-    if (!options) return FALSE;
-    
+    if (!options)
+        return FALSE;
+
     xf86GetOptValBool(options, OPT_NOINT10, &noint10);
     return noint10;
 }
 
 Bool
-int10_check_bios(int scrnIndex, int codeSeg, const unsigned char* vbiosMem)
+int10_check_bios(int scrnIndex, int codeSeg, const unsigned char *vbiosMem)
 {
     int size;
 
-    if ((codeSeg & 0x1f) ||	/* Not 512-byte aligned otherwise */
-	((codeSeg << 4) < V_BIOS) ||
-	((codeSeg << 4) >= SYS_SIZE))
-	return FALSE;
+    if ((codeSeg & 0x1f) ||     /* Not 512-byte aligned otherwise */
+        ((codeSeg << 4) < V_BIOS) || ((codeSeg << 4) >= SYS_SIZE))
+        return FALSE;
 
-    if ((*vbiosMem != 0x55) || (*(vbiosMem+1) != 0xAA) || !*(vbiosMem+2))
-	return FALSE;
+    if ((*vbiosMem != 0x55) || (*(vbiosMem + 1) != 0xAA) || !*(vbiosMem + 2))
+        return FALSE;
 
     size = *(vbiosMem + 2) * 512;
 
     if ((size + (codeSeg << 4)) > SYS_SIZE)
-	return FALSE;
+        return FALSE;
 
     if (bios_checksum(vbiosMem, size))
-	xf86DrvMsg(scrnIndex, X_INFO, "Bad V_BIOS checksum\n");
+        xf86DrvMsg(scrnIndex, X_INFO, "Bad V_BIOS checksum\n");
 
     return TRUE;
 }
 
 Bool
-initPrimary(const void* options)
+initPrimary(const void *options)
 {
     Bool initPrimary = FALSE;
 
-    if (!options) return FALSE;
-    
+    if (!options)
+        return FALSE;
+
     xf86GetOptValBool(options, OPT_INIT_PRIMARY, &initPrimary);
     return initPrimary;
 }
@@ -272,13 +272,13 @@ xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt)
     BusType location_type;
 
     EntityInfoPtr pEnt = xf86GetEntityInfo(pInt->entityIndex);
+
     location_type = pEnt->location.type;
     free(pEnt);
 
     return location_type;
 }
 
-
 #define CHECK_V_SEGMENT_RANGE(x)   \
     if (((x) << 4) < V_BIOS) { \
 	xf86DrvMsg(pInt->scrnIndex, X_ERROR, \
@@ -300,24 +300,24 @@ xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base)
     segments[3] = ~0;
 
     for (i = 0; segments[i] != ~0; i++) {
-	unsigned char * vbiosMem;
+        unsigned char *vbiosMem;
 
-	cs = segments[i];
+        cs = segments[i];
 
-	CHECK_V_SEGMENT_RANGE(cs);
-	vbiosMem = (unsigned char *)base + (cs << 4);
-	if (int10_check_bios(pInt->scrnIndex, cs, vbiosMem)) {
-	    break;
-	}
+        CHECK_V_SEGMENT_RANGE(cs);
+        vbiosMem = (unsigned char *) base + (cs << 4);
+        if (int10_check_bios(pInt->scrnIndex, cs, vbiosMem)) {
+            break;
+        }
     }
 
     if (segments[i] == ~0) {
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR, "No V_BIOS found\n");
-	return FALSE;
+        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "No V_BIOS found\n");
+        return FALSE;
     }
 
     xf86DrvMsg(pInt->scrnIndex, X_INFO, "Primary V_BIOS segment is: 0x%lx\n",
-	    (unsigned long)cs);
+               (unsigned long) cs);
 
     pInt->BIOSseg = cs;
     return TRUE;
diff --git a/xorg-server/hw/xfree86/int10/xf86int10.c b/xorg-server/hw/xfree86/int10/xf86int10.c
index dd00e5465..df347d4dd 100644
--- a/xorg-server/hw/xfree86/int10/xf86int10.c
+++ b/xorg-server/hw/xfree86/int10/xf86int10.c
@@ -20,12 +20,13 @@
 xf86Int10InfoPtr Int10Current = NULL;
 
 static int int1A_handler(xf86Int10InfoPtr pInt);
+
 #ifndef _PC
 static int int42_handler(xf86Int10InfoPtr pInt);
 #endif
 static int intE6_handler(xf86Int10InfoPtr pInt);
 static struct pci_device *findPci(xf86Int10InfoPtr pInt, unsigned short bx);
-static CARD32 pciSlotBX( const struct pci_device * pvp );
+static CARD32 pciSlotBX(const struct pci_device *pvp);
 
 int
 int_handler(xf86Int10InfoPtr pInt)
@@ -38,28 +39,27 @@ int_handler(xf86Int10InfoPtr pInt)
     case 0x10:
     case 0x42:
     case 0x6D:
-	if (getIntVect(pInt, num) == I_S_DEFAULT_INT_VECT)
-	    ret = int42_handler(pInt);
-	break;
+        if (getIntVect(pInt, num) == I_S_DEFAULT_INT_VECT)
+            ret = int42_handler(pInt);
+        break;
 #endif
     case 0x1A:
-	ret = int1A_handler(pInt);
-	break;
+        ret = int1A_handler(pInt);
+        break;
     case 0xe6:
-	ret = intE6_handler(pInt);
-	break;
+        ret = intE6_handler(pInt);
+        break;
     default:
-	break;
+        break;
     }
 
     if (!ret)
-	ret = run_bios_int(num, pInt);
+        ret = run_bios_int(num, pInt);
 
     if (!ret) {
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR,
-	    "Halting on int 0x%2.2x!\n", num);
-	dump_registers(pInt);
-	stack_trace(pInt);
+        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "Halting on int 0x%2.2x!\n", num);
+        dump_registers(pInt);
+        stack_trace(pInt);
     }
 
     return ret;
@@ -79,507 +79,511 @@ int42_handler(xf86Int10InfoPtr pInt)
 {
     switch (X86_AH) {
     case 0x00:
-	/* Set Video Mode                                     */
-	/* Enter:  AL = video mode number                     */
-	/* Leave:  Nothing                                    */
-	/* Implemented (except for clearing the screen)       */
-	{                                         /* Localise */
-	    unsigned int ioport;
-	    int i;
-	    CARD16 int1d, regvals, tmp;
-	    CARD8 mode, cgamode, cgacolour;
-
-	    /*
-	     * Ignore all mode numbers but 0x00-0x13.  Some systems also ignore
-	     * 0x0B and 0x0C, but don't do that here.
-	     */
-	    if (X86_AL > 0x13)
-		break;
-
-	    /*
-	     * You didn't think that was really the mode set, did you?  There
-	     * are only so many slots in the video parameter table...
-	     */
-	    mode = X86_AL;
-	    ioport = 0x03D4;
-	    switch (MEM_RB(pInt, 0x0410) & 0x30) {
-	    case 0x30:                  /* MDA */
-		mode = 0x07;            /* Force mode to 0x07 */
-		ioport = 0x03B4;
-		break;
-	    case 0x10:                  /* CGA 40x25 */
-		if (mode >= 0x07)
-		    mode = 0x01;
-		break;
-	    case 0x20:                  /* CGA 80x25 (MCGA?) */
-		if (mode >= 0x07)
-		    mode = 0x03;
-		break;
-	    case 0x00:                  /* EGA/VGA */
-		if (mode >= 0x07)       /* Don't try MDA timings */
-		    mode = 0x01;        /* !?!?! */
-		break;
-	    }
-
-	    /* Locate data in video parameter table */
-	    int1d = MEM_RW(pInt, 0x1d << 2);
-	    regvals = ((mode >> 1) << 4) + int1d;
-	    cgacolour = 0x30;
-	    if (mode == 0x06) {
-		regvals -= 0x10;
-		cgacolour = 0x3F;
-	    }
-
-	    /** Update BIOS Data Area **/
-
-	    /* Video mode */
-	    MEM_WB(pInt, 0x0449, mode);
-
-	    /* Columns */
-	    tmp = MEM_RB(pInt, mode + int1d + 0x48);
-	    MEM_WW(pInt, 0x044A, tmp);
-
-	    /* Page length */
-	    tmp = MEM_RW(pInt, (mode & 0x06) + int1d + 0x40);
-	    MEM_WW(pInt, 0x044C, tmp);
-
-	    /* Start Address */
-	    MEM_WW(pInt, 0x044E, 0);
-
-	    /* Cursor positions, one for each display page */
-	    for (i = 0x0450; i < 0x0460; i += 2)
-		MEM_WW(pInt, i, 0);
-
-	    /* Cursor start & end scanlines */
-	    tmp = MEM_RB(pInt, regvals + 0x0B);
-	    MEM_WB(pInt, 0x0460, tmp);
-	    tmp = MEM_RB(pInt, regvals + 0x0A);
-	    MEM_WB(pInt, 0x0461, tmp);
-
-	    /* Current display page number */
-	    MEM_WB(pInt, 0x0462, 0);
-
-	    /* CRTC I/O address */
-	    MEM_WW(pInt, 0x0463, ioport);
-
-	    /* CGA Mode register value */
-	    cgamode = MEM_RB(pInt, mode + int1d + 0x50);
-	    MEM_WB(pInt, 0x0465, cgamode);
-
-	    /* CGA Colour register value */
-	    MEM_WB(pInt, 0x0466, cgacolour);
-
-	    /* Rows */
-	    MEM_WB(pInt, 0x0484, (25 - 1));
-
-	    /* Program the mode */
-	    pci_io_write8(pInt->io, ioport + 4, cgamode & 0x37);   /* Turn off screen */
-	    for (i = 0; i < 0x10; i++) {
-		tmp = MEM_RB(pInt, regvals + i);
-		pci_io_write8(pInt->io, ioport, i);
-		pci_io_write8(pInt->io, ioport + 1, tmp);
-	    }
-	    pci_io_write8(pInt->io, ioport + 5, cgacolour);        /* Select colour mode */
-	    pci_io_write8(pInt->io, ioport + 4, cgamode);          /* Turn on screen */
-	}
-	break;
+        /* Set Video Mode                                     */
+        /* Enter:  AL = video mode number                     */
+        /* Leave:  Nothing                                    */
+        /* Implemented (except for clearing the screen)       */
+    {                           /* Localise */
+        unsigned int ioport;
+        int i;
+        CARD16 int1d, regvals, tmp;
+        CARD8 mode, cgamode, cgacolour;
+
+        /*
+         * Ignore all mode numbers but 0x00-0x13.  Some systems also ignore
+         * 0x0B and 0x0C, but don't do that here.
+         */
+        if (X86_AL > 0x13)
+            break;
+
+        /*
+         * You didn't think that was really the mode set, did you?  There
+         * are only so many slots in the video parameter table...
+         */
+        mode = X86_AL;
+        ioport = 0x03D4;
+        switch (MEM_RB(pInt, 0x0410) & 0x30) {
+        case 0x30:             /* MDA */
+            mode = 0x07;        /* Force mode to 0x07 */
+            ioport = 0x03B4;
+            break;
+        case 0x10:             /* CGA 40x25 */
+            if (mode >= 0x07)
+                mode = 0x01;
+            break;
+        case 0x20:             /* CGA 80x25 (MCGA?) */
+            if (mode >= 0x07)
+                mode = 0x03;
+            break;
+        case 0x00:             /* EGA/VGA */
+            if (mode >= 0x07)   /* Don't try MDA timings */
+                mode = 0x01;    /* !?!?! */
+            break;
+        }
+
+        /* Locate data in video parameter table */
+        int1d = MEM_RW(pInt, 0x1d << 2);
+        regvals = ((mode >> 1) << 4) + int1d;
+        cgacolour = 0x30;
+        if (mode == 0x06) {
+            regvals -= 0x10;
+            cgacolour = 0x3F;
+        }
+
+            /** Update BIOS Data Area **/
+
+        /* Video mode */
+        MEM_WB(pInt, 0x0449, mode);
+
+        /* Columns */
+        tmp = MEM_RB(pInt, mode + int1d + 0x48);
+        MEM_WW(pInt, 0x044A, tmp);
+
+        /* Page length */
+        tmp = MEM_RW(pInt, (mode & 0x06) + int1d + 0x40);
+        MEM_WW(pInt, 0x044C, tmp);
+
+        /* Start Address */
+        MEM_WW(pInt, 0x044E, 0);
+
+        /* Cursor positions, one for each display page */
+        for (i = 0x0450; i < 0x0460; i += 2)
+            MEM_WW(pInt, i, 0);
+
+        /* Cursor start & end scanlines */
+        tmp = MEM_RB(pInt, regvals + 0x0B);
+        MEM_WB(pInt, 0x0460, tmp);
+        tmp = MEM_RB(pInt, regvals + 0x0A);
+        MEM_WB(pInt, 0x0461, tmp);
+
+        /* Current display page number */
+        MEM_WB(pInt, 0x0462, 0);
+
+        /* CRTC I/O address */
+        MEM_WW(pInt, 0x0463, ioport);
+
+        /* CGA Mode register value */
+        cgamode = MEM_RB(pInt, mode + int1d + 0x50);
+        MEM_WB(pInt, 0x0465, cgamode);
+
+        /* CGA Colour register value */
+        MEM_WB(pInt, 0x0466, cgacolour);
+
+        /* Rows */
+        MEM_WB(pInt, 0x0484, (25 - 1));
+
+        /* Program the mode */
+        pci_io_write8(pInt->io, ioport + 4, cgamode & 0x37);    /* Turn off screen */
+        for (i = 0; i < 0x10; i++) {
+            tmp = MEM_RB(pInt, regvals + i);
+            pci_io_write8(pInt->io, ioport, i);
+            pci_io_write8(pInt->io, ioport + 1, tmp);
+        }
+        pci_io_write8(pInt->io, ioport + 5, cgacolour); /* Select colour mode */
+        pci_io_write8(pInt->io, ioport + 4, cgamode);   /* Turn on screen */
+    }
+        break;
 
     case 0x01:
-	/* Set Cursor Type                                    */
-	/* Enter:  CH = starting line for cursor              */
-	/*         CL = ending line for cursor                */
-	/* Leave:  Nothing                                    */
-	/* Implemented                                        */
-	{                                         /* Localise */
-	    unsigned int ioport = MEM_RW(pInt, 0x0463);
-
-	    MEM_WB(pInt, 0x0460, X86_CL);
-	    MEM_WB(pInt, 0x0461, X86_CH);
-
-	    pci_io_write8(pInt->io, ioport, 0x0A);
-	    pci_io_write8(pInt->io, ioport + 1, X86_CH);
-	    pci_io_write8(pInt->io, ioport, 0x0B);
-	    pci_io_write8(pInt->io, ioport + 1, X86_CL);
-	}
-	break;
+        /* Set Cursor Type                                    */
+        /* Enter:  CH = starting line for cursor              */
+        /*         CL = ending line for cursor                */
+        /* Leave:  Nothing                                    */
+        /* Implemented                                        */
+    {                           /* Localise */
+        unsigned int ioport = MEM_RW(pInt, 0x0463);
+
+        MEM_WB(pInt, 0x0460, X86_CL);
+        MEM_WB(pInt, 0x0461, X86_CH);
+
+        pci_io_write8(pInt->io, ioport, 0x0A);
+        pci_io_write8(pInt->io, ioport + 1, X86_CH);
+        pci_io_write8(pInt->io, ioport, 0x0B);
+        pci_io_write8(pInt->io, ioport + 1, X86_CL);
+    }
+        break;
 
     case 0x02:
-	/* Set Cursor Position                                */
-	/* Enter:  BH = display page number                   */
-	/*         DH = row                                   */
-	/*         DL = column                                */
-	/* Leave:  Nothing                                    */
-	/* Implemented                                        */
-	{                                         /* Localise */
-	    unsigned int ioport;
-	    CARD16 offset;
-
-	    MEM_WB(pInt, (X86_BH << 1) + 0x0450, X86_DL);
-	    MEM_WB(pInt, (X86_BH << 1) + 0x0451, X86_DH);
-
-	    if (X86_BH != MEM_RB(pInt, 0x0462))
-		break;
-
-	    offset = (X86_DH * MEM_RW(pInt, 0x044A)) + X86_DL;
-	    offset += MEM_RW(pInt, 0x044E) << 1;
-
-	    ioport = MEM_RW(pInt, 0x0463);
-	    pci_io_write8(pInt->io, ioport, 0x0E);
-	    pci_io_write8(pInt->io, ioport + 1, offset >> 8);
-	    pci_io_write8(pInt->io, ioport, 0x0F);
-	    pci_io_write8(pInt->io, ioport + 1, offset & 0xFF);
-	}
-	break;
+        /* Set Cursor Position                                */
+        /* Enter:  BH = display page number                   */
+        /*         DH = row                                   */
+        /*         DL = column                                */
+        /* Leave:  Nothing                                    */
+        /* Implemented                                        */
+    {                           /* Localise */
+        unsigned int ioport;
+        CARD16 offset;
+
+        MEM_WB(pInt, (X86_BH << 1) + 0x0450, X86_DL);
+        MEM_WB(pInt, (X86_BH << 1) + 0x0451, X86_DH);
+
+        if (X86_BH != MEM_RB(pInt, 0x0462))
+            break;
+
+        offset = (X86_DH * MEM_RW(pInt, 0x044A)) + X86_DL;
+        offset += MEM_RW(pInt, 0x044E) << 1;
+
+        ioport = MEM_RW(pInt, 0x0463);
+        pci_io_write8(pInt->io, ioport, 0x0E);
+        pci_io_write8(pInt->io, ioport + 1, offset >> 8);
+        pci_io_write8(pInt->io, ioport, 0x0F);
+        pci_io_write8(pInt->io, ioport + 1, offset & 0xFF);
+    }
+        break;
 
     case 0x03:
-	/* Get Cursor Position                                */
-	/* Enter:  BH = display page number                   */
-	/* Leave:  CH = starting line for cursor              */
-	/*         CL = ending line for cursor                */
-	/*         DH = row                                   */
-	/*         DL = column                                */
-	/* Implemented                                        */
-	{                                         /* Localise */
-	    X86_CL = MEM_RB(pInt, 0x0460);
-	    X86_CH = MEM_RB(pInt, 0x0461);
-	    X86_DL = MEM_RB(pInt, (X86_BH << 1) + 0x0450);
-	    X86_DH = MEM_RB(pInt, (X86_BH << 1) + 0x0451);
-	}
-	break;
+        /* Get Cursor Position                                */
+        /* Enter:  BH = display page number                   */
+        /* Leave:  CH = starting line for cursor              */
+        /*         CL = ending line for cursor                */
+        /*         DH = row                                   */
+        /*         DL = column                                */
+        /* Implemented                                        */
+    {                           /* Localise */
+        X86_CL = MEM_RB(pInt, 0x0460);
+        X86_CH = MEM_RB(pInt, 0x0461);
+        X86_DL = MEM_RB(pInt, (X86_BH << 1) + 0x0450);
+        X86_DH = MEM_RB(pInt, (X86_BH << 1) + 0x0451);
+    }
+        break;
 
     case 0x04:
-	/* Get Light Pen Position                             */
-	/* Enter:  Nothing                                    */
-	/* Leave:  AH = 0x01 (down/triggered) or 0x00 (not)   */
-	/*         BX = pixel column                          */
-	/*         CX = pixel row                             */
-	/*         DH = character row                         */
-	/*         DL = character column                      */
-	/* Not Implemented                                    */
-	{                                         /* Localise */
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-		"int 0x%2.2x(AH=0x04) -- Get Light Pen Position\n", pInt->num);
-	    if (xf86GetVerbosity() > 3) {
-		dump_registers(pInt);
-		stack_trace(pInt);
-	    }
-	    X86_AH = X86_BX = X86_CX = X86_DX = 0;
-	}
-	break;
+        /* Get Light Pen Position                             */
+        /* Enter:  Nothing                                    */
+        /* Leave:  AH = 0x01 (down/triggered) or 0x00 (not)   */
+        /*         BX = pixel column                          */
+        /*         CX = pixel row                             */
+        /*         DH = character row                         */
+        /*         DL = character column                      */
+        /* Not Implemented                                    */
+    {                           /* Localise */
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "int 0x%2.2x(AH=0x04) -- Get Light Pen Position\n",
+                       pInt->num);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(pInt);
+            stack_trace(pInt);
+        }
+        X86_AH = X86_BX = X86_CX = X86_DX = 0;
+    }
+        break;
 
     case 0x05:
-	/* Set Display Page                                   */
-	/* Enter:  AL = display page number                   */
-	/* Leave:  Nothing                                    */
-	/* Implemented                                        */
-	{                                         /* Localise */
-	    unsigned int ioport = MEM_RW(pInt, 0x0463);
-	    CARD16 start;
-	    CARD8 x, y;
-
-	    /* Calculate new start address */
-	    MEM_WB(pInt, 0x0462, X86_AL);
-	    start = X86_AL * MEM_RW(pInt, 0x044C);
-	    MEM_WW(pInt, 0x044E, start);
-	    start <<= 1;
-
-	    /* Update start address */
-	    pci_io_write8(pInt->io, ioport, 0x0C);
-	    pci_io_write8(pInt->io, ioport + 1, start >> 8);
-	    pci_io_write8(pInt->io, ioport, 0x0D);
-	    pci_io_write8(pInt->io, ioport + 1, start & 0xFF);
-
-	    /* Switch cursor position */
-	    y = MEM_RB(pInt, (X86_AL << 1) + 0x0450);
-	    x = MEM_RB(pInt, (X86_AL << 1) + 0x0451);
-	    start += (y * MEM_RW(pInt, 0x044A)) + x;
-
-	    /* Update cursor position */
-	    pci_io_write8(pInt->io, ioport, 0x0E);
-	    pci_io_write8(pInt->io, ioport + 1, start >> 8);
-	    pci_io_write8(pInt->io, ioport, 0x0F);
-	    pci_io_write8(pInt->io, ioport + 1, start & 0xFF);
-	}
-	break;
+        /* Set Display Page                                   */
+        /* Enter:  AL = display page number                   */
+        /* Leave:  Nothing                                    */
+        /* Implemented                                        */
+    {                           /* Localise */
+        unsigned int ioport = MEM_RW(pInt, 0x0463);
+        CARD16 start;
+        CARD8 x, y;
+
+        /* Calculate new start address */
+        MEM_WB(pInt, 0x0462, X86_AL);
+        start = X86_AL * MEM_RW(pInt, 0x044C);
+        MEM_WW(pInt, 0x044E, start);
+        start <<= 1;
+
+        /* Update start address */
+        pci_io_write8(pInt->io, ioport, 0x0C);
+        pci_io_write8(pInt->io, ioport + 1, start >> 8);
+        pci_io_write8(pInt->io, ioport, 0x0D);
+        pci_io_write8(pInt->io, ioport + 1, start & 0xFF);
+
+        /* Switch cursor position */
+        y = MEM_RB(pInt, (X86_AL << 1) + 0x0450);
+        x = MEM_RB(pInt, (X86_AL << 1) + 0x0451);
+        start += (y * MEM_RW(pInt, 0x044A)) + x;
+
+        /* Update cursor position */
+        pci_io_write8(pInt->io, ioport, 0x0E);
+        pci_io_write8(pInt->io, ioport + 1, start >> 8);
+        pci_io_write8(pInt->io, ioport, 0x0F);
+        pci_io_write8(pInt->io, ioport + 1, start & 0xFF);
+    }
+        break;
 
     case 0x06:
-	/* Initialise or Scroll Window Up                     */
-	/* Enter:  AL = lines to scroll up                    */
-	/*         BH = attribute for blank                   */
-	/*         CH = upper y of window                     */
-	/*         CL = left x of window                      */
-	/*         DH = lower y of window                     */
-	/*         DL = right x of window                     */
-	/* Leave:  Nothing                                    */
-	/* Not Implemented                                    */
-	{                                         /* Localise */
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-		"int 0x%2.2x(AH=0x06) -- Initialise or Scroll Window Up\n",
-		pInt->num);
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
-		" AL=0x%2.2x, BH=0x%2.2x,"
-		" CH=0x%2.2x, CL=0x%2.2x, DH=0x%2.2x, DL=0x%2.2x\n",
-		X86_AL, X86_BH, X86_CH, X86_CL, X86_DH, X86_DL);
-	    if (xf86GetVerbosity() > 3) {
-		dump_registers(pInt);
-		stack_trace(pInt);
-	    }
-	}
-	break;
+        /* Initialise or Scroll Window Up                     */
+        /* Enter:  AL = lines to scroll up                    */
+        /*         BH = attribute for blank                   */
+        /*         CH = upper y of window                     */
+        /*         CL = left x of window                      */
+        /*         DH = lower y of window                     */
+        /*         DL = right x of window                     */
+        /* Leave:  Nothing                                    */
+        /* Not Implemented                                    */
+    {                           /* Localise */
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "int 0x%2.2x(AH=0x06) -- Initialise or Scroll Window Up\n",
+                       pInt->num);
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+                       " AL=0x%2.2x, BH=0x%2.2x,"
+                       " CH=0x%2.2x, CL=0x%2.2x, DH=0x%2.2x, DL=0x%2.2x\n",
+                       X86_AL, X86_BH, X86_CH, X86_CL, X86_DH, X86_DL);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(pInt);
+            stack_trace(pInt);
+        }
+    }
+        break;
 
     case 0x07:
-	/* Initialise or Scroll Window Down                   */
-	/* Enter:  AL = lines to scroll down                  */
-	/*         BH = attribute for blank                   */
-	/*         CH = upper y of window                     */
-	/*         CL = left x of window                      */
-	/*         DH = lower y of window                     */
-	/*         DL = right x of window                     */
-	/* Leave:  Nothing                                    */
-	/* Not Implemented                                    */
-	{                                         /* Localise */
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-		"int 0x%2.2x(AH=0x07) -- Initialise or Scroll Window Down\n",
-		pInt->num);
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
-		" AL=0x%2.2x, BH=0x%2.2x,"
-		" CH=0x%2.2x, CL=0x%2.2x, DH=0x%2.2x, DL=0x%2.2x\n",
-		X86_AL, X86_BH, X86_CH, X86_CL, X86_DH, X86_DL);
-	    if (xf86GetVerbosity() > 3) {
-		dump_registers(pInt);
-		stack_trace(pInt);
-	    }
-	}
-	break;
+        /* Initialise or Scroll Window Down                   */
+        /* Enter:  AL = lines to scroll down                  */
+        /*         BH = attribute for blank                   */
+        /*         CH = upper y of window                     */
+        /*         CL = left x of window                      */
+        /*         DH = lower y of window                     */
+        /*         DL = right x of window                     */
+        /* Leave:  Nothing                                    */
+        /* Not Implemented                                    */
+    {                           /* Localise */
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "int 0x%2.2x(AH=0x07) -- Initialise or Scroll Window Down\n",
+                       pInt->num);
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+                       " AL=0x%2.2x, BH=0x%2.2x,"
+                       " CH=0x%2.2x, CL=0x%2.2x, DH=0x%2.2x, DL=0x%2.2x\n",
+                       X86_AL, X86_BH, X86_CH, X86_CL, X86_DH, X86_DL);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(pInt);
+            stack_trace(pInt);
+        }
+    }
+        break;
 
     case 0x08:
-	/* Read Character and Attribute at Cursor             */
-	/* Enter:  BH = display page number                   */
-	/* Leave:  AH = attribute                             */
-	/*         AL = character                             */
-	/* Not Implemented                                    */
-	{                                         /* Localise */
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-		"int 0x%2.2x(AH=0x08) -- Read Character and Attribute at"
-		" Cursor\n", pInt->num);
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
-		"BH=0x%2.2x\n", X86_BH);
-	    if (xf86GetVerbosity() > 3) {
-		dump_registers(pInt);
-		stack_trace(pInt);
-	    }
-	    X86_AX = 0;
-	}
-	break;
+        /* Read Character and Attribute at Cursor             */
+        /* Enter:  BH = display page number                   */
+        /* Leave:  AH = attribute                             */
+        /*         AL = character                             */
+        /* Not Implemented                                    */
+    {                           /* Localise */
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "int 0x%2.2x(AH=0x08) -- Read Character and Attribute at"
+                       " Cursor\n", pInt->num);
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+                       "BH=0x%2.2x\n", X86_BH);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(pInt);
+            stack_trace(pInt);
+        }
+        X86_AX = 0;
+    }
+        break;
 
     case 0x09:
-	/* Write Character and Attribute at Cursor            */
-	/* Enter:  AL = character                             */
-	/*         BH = display page number                   */
-	/*         BL = attribute (text) or colour (graphics) */
-	/*         CX = replication count                     */
-	/* Leave:  Nothing                                    */
-	/* Not Implemented                                    */
-	{                                         /* Localise */
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-		"int 0x%2.2x(AH=0x09) -- Write Character and Attribute at"
-		" Cursor\n", pInt->num);
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
-		"AL=0x%2.2x, BH=0x%2.2x, BL=0x%2.2x, CX=0x%4.4x\n",
-		X86_AL, X86_BH, X86_BL, X86_CX);
-	    if (xf86GetVerbosity() > 3) {
-		dump_registers(pInt);
-		stack_trace(pInt);
-	    }
-	}
-	break;
+        /* Write Character and Attribute at Cursor            */
+        /* Enter:  AL = character                             */
+        /*         BH = display page number                   */
+        /*         BL = attribute (text) or colour (graphics) */
+        /*         CX = replication count                     */
+        /* Leave:  Nothing                                    */
+        /* Not Implemented                                    */
+    {                           /* Localise */
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "int 0x%2.2x(AH=0x09) -- Write Character and Attribute at"
+                       " Cursor\n", pInt->num);
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+                       "AL=0x%2.2x, BH=0x%2.2x, BL=0x%2.2x, CX=0x%4.4x\n",
+                       X86_AL, X86_BH, X86_BL, X86_CX);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(pInt);
+            stack_trace(pInt);
+        }
+    }
+        break;
 
     case 0x0a:
-	/* Write Character at Cursor                          */
-	/* Enter:  AL = character                             */
-	/*         BH = display page number                   */
-	/*         BL = colour                                */
-	/*         CX = replication count                     */
-	/* Leave:  Nothing                                    */
-	/* Not Implemented                                    */
-	{                                         /* Localise */
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-		"int 0x%2.2x(AH=0x0A) -- Write Character at Cursor\n",
-		pInt->num);
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
-		"AL=0x%2.2x, BH=0x%2.2x, BL=0x%2.2x, CX=0x%4.4x\n",
-		X86_AL, X86_BH, X86_BL, X86_CX);
-	    if (xf86GetVerbosity() > 3) {
-		dump_registers(pInt);
-		stack_trace(pInt);
-	    }
-	}
-	break;
+        /* Write Character at Cursor                          */
+        /* Enter:  AL = character                             */
+        /*         BH = display page number                   */
+        /*         BL = colour                                */
+        /*         CX = replication count                     */
+        /* Leave:  Nothing                                    */
+        /* Not Implemented                                    */
+    {                           /* Localise */
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "int 0x%2.2x(AH=0x0A) -- Write Character at Cursor\n",
+                       pInt->num);
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+                       "AL=0x%2.2x, BH=0x%2.2x, BL=0x%2.2x, CX=0x%4.4x\n",
+                       X86_AL, X86_BH, X86_BL, X86_CX);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(pInt);
+            stack_trace(pInt);
+        }
+    }
+        break;
 
     case 0x0b:
-	/* Set Palette, Background or Border                  */
-	/* Enter:  BH = 0x00 or 0x01                          */
-	/*         BL = colour or palette (respectively)      */
-	/* Leave:  Nothing                                    */
-	/* Implemented                                        */
-	{                                         /* Localise */
-	    unsigned int ioport = MEM_RW(pInt, 0x0463) + 5;
-	    CARD8 cgacolour = MEM_RB(pInt, 0x0466);
-
-	    if (X86_BH) {
-		cgacolour &= 0xDF;
-		cgacolour |= (X86_BL & 0x01) << 5;
-	    } else {
-		cgacolour &= 0xE0;
-		cgacolour |= X86_BL & 0x1F;
-	    }
-
-	    MEM_WB(pInt, 0x0466, cgacolour);
-	    pci_io_write8(pInt->io, ioport, cgacolour);
-	}
-	break;
+        /* Set Palette, Background or Border                  */
+        /* Enter:  BH = 0x00 or 0x01                          */
+        /*         BL = colour or palette (respectively)      */
+        /* Leave:  Nothing                                    */
+        /* Implemented                                        */
+    {                           /* Localise */
+        unsigned int ioport = MEM_RW(pInt, 0x0463) + 5;
+        CARD8 cgacolour = MEM_RB(pInt, 0x0466);
+
+        if (X86_BH) {
+            cgacolour &= 0xDF;
+            cgacolour |= (X86_BL & 0x01) << 5;
+        }
+        else {
+            cgacolour &= 0xE0;
+            cgacolour |= X86_BL & 0x1F;
+        }
+
+        MEM_WB(pInt, 0x0466, cgacolour);
+        pci_io_write8(pInt->io, ioport, cgacolour);
+    }
+        break;
 
     case 0x0c:
-	/* Write Graphics Pixel                               */
-	/* Enter:  AL = pixel value                           */
-	/*         BH = display page number                   */
-	/*         CX = column                                */
-	/*         DX = row                                   */
-	/* Leave:  Nothing                                    */
-	/* Not Implemented                                    */
-	{                                         /* Localise */
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-		"int 0x%2.2x(AH=0x0C) -- Write Graphics Pixel\n", pInt->num);
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
-		"AL=0x%2.2x, BH=0x%2.2x, CX=0x%4.4x, DX=0x%4.4x\n",
-		X86_AL, X86_BH, X86_CX, X86_DX);
-	    if (xf86GetVerbosity() > 3) {
-		dump_registers(pInt);
-		stack_trace(pInt);
-	    }
-	}
-	break;
+        /* Write Graphics Pixel                               */
+        /* Enter:  AL = pixel value                           */
+        /*         BH = display page number                   */
+        /*         CX = column                                */
+        /*         DX = row                                   */
+        /* Leave:  Nothing                                    */
+        /* Not Implemented                                    */
+    {                           /* Localise */
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "int 0x%2.2x(AH=0x0C) -- Write Graphics Pixel\n",
+                       pInt->num);
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+                       "AL=0x%2.2x, BH=0x%2.2x, CX=0x%4.4x, DX=0x%4.4x\n",
+                       X86_AL, X86_BH, X86_CX, X86_DX);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(pInt);
+            stack_trace(pInt);
+        }
+    }
+        break;
 
     case 0x0d:
-	/* Read Graphics Pixel                                */
-	/* Enter:  BH = display page number                   */
-	/*         CX = column                                */
-	/*         DX = row                                   */
-	/* Leave:  AL = pixel value                           */
-	/* Not Implemented                                    */
-	{                                         /* Localise */
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-		"int 0x%2.2x(AH=0x0D) -- Read Graphics Pixel\n", pInt->num);
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
-		"BH=0x%2.2x, CX=0x%4.4x, DX=0x%4.4x\n",
-		X86_BH, X86_CX, X86_DX);
-	    if (xf86GetVerbosity() > 3) {
-		dump_registers(pInt);
-		stack_trace(pInt);
-	    }
-	    X86_AL = 0;
-	}
-	break;
+        /* Read Graphics Pixel                                */
+        /* Enter:  BH = display page number                   */
+        /*         CX = column                                */
+        /*         DX = row                                   */
+        /* Leave:  AL = pixel value                           */
+        /* Not Implemented                                    */
+    {                           /* Localise */
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "int 0x%2.2x(AH=0x0D) -- Read Graphics Pixel\n",
+                       pInt->num);
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+                       "BH=0x%2.2x, CX=0x%4.4x, DX=0x%4.4x\n", X86_BH, X86_CX,
+                       X86_DX);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(pInt);
+            stack_trace(pInt);
+        }
+        X86_AL = 0;
+    }
+        break;
 
     case 0x0e:
-	/* Write Character in Teletype Mode                   */
-	/* Enter:  AL = character                             */
-	/*         BH = display page number                   */
-	/*         BL = foreground colour                     */
-	/* Leave:  Nothing                                    */
-	/* Not Implemented                                    */
-	/* WARNING:  Emulation of BEL characters will require */
-	/*           emulation of RTC and PC speaker I/O.     */
-	/*           Also, this recurses through int 0x10     */
-	/*           which might or might not have been       */
-	/*           installed yet.                           */
-	{                                         /* Localise */
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-		"int 0x%2.2x(AH=0x0E) -- Write Character in Teletype Mode\n",
-		pInt->num);
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
-		"AL=0x%2.2x, BH=0x%2.2x, BL=0x%2.2x\n",
-		X86_AL, X86_BH, X86_BL);
-	    if (xf86GetVerbosity() > 3) {
-		dump_registers(pInt);
-		stack_trace(pInt);
-	    }
-	}
-	break;
+        /* Write Character in Teletype Mode                   */
+        /* Enter:  AL = character                             */
+        /*         BH = display page number                   */
+        /*         BL = foreground colour                     */
+        /* Leave:  Nothing                                    */
+        /* Not Implemented                                    */
+        /* WARNING:  Emulation of BEL characters will require */
+        /*           emulation of RTC and PC speaker I/O.     */
+        /*           Also, this recurses through int 0x10     */
+        /*           which might or might not have been       */
+        /*           installed yet.                           */
+    {                           /* Localise */
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "int 0x%2.2x(AH=0x0E) -- Write Character in Teletype Mode\n",
+                       pInt->num);
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+                       "AL=0x%2.2x, BH=0x%2.2x, BL=0x%2.2x\n",
+                       X86_AL, X86_BH, X86_BL);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(pInt);
+            stack_trace(pInt);
+        }
+    }
+        break;
 
     case 0x0f:
-	/* Get Video Mode                                     */
-	/* Enter:  Nothing                                    */
-	/* Leave:  AH = number of columns                     */
-	/*         AL = video mode number                     */
-	/*         BH = display page number                   */
-	/* Implemented                                        */
-	{                                         /* Localise */
-	    X86_AH = MEM_RW(pInt, 0x044A);
-	    X86_AL = MEM_RB(pInt, 0x0449);
-	    X86_BH = MEM_RB(pInt, 0x0462);
-	}
-	break;
+        /* Get Video Mode                                     */
+        /* Enter:  Nothing                                    */
+        /* Leave:  AH = number of columns                     */
+        /*         AL = video mode number                     */
+        /*         BH = display page number                   */
+        /* Implemented                                        */
+    {                           /* Localise */
+        X86_AH = MEM_RW(pInt, 0x044A);
+        X86_AL = MEM_RB(pInt, 0x0449);
+        X86_BH = MEM_RB(pInt, 0x0462);
+    }
+        break;
 
     case 0x10:
-	/* Colour Control (subfunction in AL)                 */
-	/* Enter:  Various                                    */
-	/* Leave:  Various                                    */
-	/* Ignored                                            */
-	break;
+        /* Colour Control (subfunction in AL)                 */
+        /* Enter:  Various                                    */
+        /* Leave:  Various                                    */
+        /* Ignored                                            */
+        break;
 
     case 0x11:
-	/* Font Control (subfunction in AL)                   */
-	/* Enter:  Various                                    */
-	/* Leave:  Various                                    */
-	/* Ignored                                            */
-	break;
+        /* Font Control (subfunction in AL)                   */
+        /* Enter:  Various                                    */
+        /* Leave:  Various                                    */
+        /* Ignored                                            */
+        break;
 
     case 0x12:
-	/* Miscellaneous (subfunction in BL)                  */
-	/* Enter:  Various                                    */
-	/* Leave:  Various                                    */
-	/* Ignored.  Previous code here optionally allowed    */
-	/* the enabling and disabling of VGA, but no system   */
-	/* BIOS I've come across actually implements it.      */
-	break;
+        /* Miscellaneous (subfunction in BL)                  */
+        /* Enter:  Various                                    */
+        /* Leave:  Various                                    */
+        /* Ignored.  Previous code here optionally allowed    */
+        /* the enabling and disabling of VGA, but no system   */
+        /* BIOS I've come across actually implements it.      */
+        break;
 
     case 0x13:
-	/* Write String in Teletype Mode                      */
-	/* Enter:  AL = write mode                            */
-	/*         BL = attribute (if (AL & 0x02) == 0)       */
-	/*         CX = string length                         */
-	/*         DH = row                                   */
-	/*         DL = column                                */
-	/*         ES:BP = string segment:offset              */
-	/* Leave:  Nothing                                    */
-	/* Not Implemented                                    */
-	/* WARNING:  Emulation of BEL characters will require */
-	/*           emulation of RTC and PC speaker I/O.     */
-	/*           Also, this recurses through int 0x10     */
-	/*           which might or might not have been       */
-	/*           installed yet.                           */
-	{                                         /* Localise */
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-		"int 0x%2.2x(AH=0x13) -- Write String in Teletype Mode\n",
-		pInt->num);
-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
-		"AL=0x%2.2x, BL=0x%2.2x, CX=0x%4.4x,"
-		" DH=0x%2.2x, DL=0x%2.2x, ES:BP=0x%4.4x:0x%4.4x\n",
-		X86_AL, X86_BL, X86_CX, X86_DH, X86_DL, X86_ES, X86_BP);
-	    if (xf86GetVerbosity() > 3) {
-		dump_registers(pInt);
-		stack_trace(pInt);
-	    }
-	}
-	break;
+        /* Write String in Teletype Mode                      */
+        /* Enter:  AL = write mode                            */
+        /*         BL = attribute (if (AL & 0x02) == 0)       */
+        /*         CX = string length                         */
+        /*         DH = row                                   */
+        /*         DL = column                                */
+        /*         ES:BP = string segment:offset              */
+        /* Leave:  Nothing                                    */
+        /* Not Implemented                                    */
+        /* WARNING:  Emulation of BEL characters will require */
+        /*           emulation of RTC and PC speaker I/O.     */
+        /*           Also, this recurses through int 0x10     */
+        /*           which might or might not have been       */
+        /*           installed yet.                           */
+    {                           /* Localise */
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "int 0x%2.2x(AH=0x13) -- Write String in Teletype Mode\n",
+                       pInt->num);
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+                       "AL=0x%2.2x, BL=0x%2.2x, CX=0x%4.4x,"
+                       " DH=0x%2.2x, DL=0x%2.2x, ES:BP=0x%4.4x:0x%4.4x\n",
+                       X86_AL, X86_BL, X86_CX, X86_DH, X86_DL, X86_ES, X86_BP);
+        if (xf86GetVerbosity() > 3) {
+            dump_registers(pInt);
+            stack_trace(pInt);
+        }
+    }
+        break;
 
     default:
-	/* Various extensions                                 */
-	/* Enter:  Various                                    */
-	/* Leave:  Various                                    */
-	/* Ignored                                            */
-	break;
+        /* Various extensions                                 */
+        /* Enter:  Various                                    */
+        /* Leave:  Various                                    */
+        /* Ignored                                            */
+        break;
     }
 
     return 1;
@@ -598,7 +602,7 @@ int42_handler(xf86Int10InfoPtr pInt)
  * required.
  */
 static struct pci_device *
-do_find(const struct pci_id_match *m, char n, const struct pci_device * exclude)
+do_find(const struct pci_id_match *m, char n, const struct pci_device *exclude)
 {
     struct pci_device *dev;
     struct pci_device_iterator *iter;
@@ -607,9 +611,9 @@ do_find(const struct pci_id_match *m, char n, const struct pci_device * exclude)
 
     iter = pci_id_match_iterator_create(m);
     while ((dev = pci_device_next(iter)) != NULL) {
-	if ((dev != exclude) && !(--n)) {
-	    break;
-	}
+        if ((dev != exclude) && !(--n)) {
+            break;
+        }
     }
 
     pci_iterator_destroy(iter);
@@ -617,10 +621,9 @@ do_find(const struct pci_id_match *m, char n, const struct pci_device * exclude)
     return dev;
 }
 
-
 static struct pci_device *
 find_pci_device_vendor(CARD16 vendorID, CARD16 deviceID,
-			char n, const struct pci_device * exclude)
+                       char n, const struct pci_device *exclude)
 {
     struct pci_id_match m;
 
@@ -631,12 +634,12 @@ find_pci_device_vendor(CARD16 vendorID, CARD16 deviceID,
     m.device_class = 0;
     m.device_class_mask = 0;
 
-    return do_find(& m, n, exclude);
+    return do_find(&m, n, exclude);
 }
 
 static struct pci_device *
 find_pci_class(CARD8 intf, CARD8 subClass, CARD16 _class,
-	       char n, const struct pci_device * exclude)
+               char n, const struct pci_device *exclude)
 {
     struct pci_id_match m;
 
@@ -644,11 +647,11 @@ find_pci_class(CARD8 intf, CARD8 subClass, CARD16 _class,
     m.device_id = PCI_MATCH_ANY;
     m.subvendor_id = PCI_MATCH_ANY;
     m.subdevice_id = PCI_MATCH_ANY;
-    m.device_class = (((uint32_t)_class) << 16) 
-      | (((uint32_t)subClass) << 8) | intf;
+    m.device_class = (((uint32_t) _class) << 16)
+        | (((uint32_t) subClass) << 8) | intf;
     m.device_class_mask = 0x00ffffff;
 
-    return do_find(& m, n, exclude);
+    return do_find(&m, n, exclude);
 }
 #endif
 
@@ -660,18 +663,20 @@ static int
 int1A_last_bus_number(struct pci_device *dev)
 {
     struct pci_device *d;
+
     struct pci_slot_match m = { dev->domain,
-				PCI_MATCH_ANY,
-				PCI_MATCH_ANY,
-				PCI_MATCH_ANY };
+        PCI_MATCH_ANY,
+        PCI_MATCH_ANY,
+        PCI_MATCH_ANY
+    };
     struct pci_device_iterator *iter;
     int i = 0;
 
     iter = pci_slot_match_iterator_create(&m);
 
     while ((d = pci_device_next(iter)))
-	if (d->bus > i)
-	    i = d->bus;
+        if (d->bus > i)
+            i = d->bus;
 
     pci_iterator_destroy(iter);
 
@@ -681,176 +686,181 @@ int1A_last_bus_number(struct pci_device *dev)
 static int
 int1A_handler(xf86Int10InfoPtr pInt)
 {
-    struct pci_device * const pvp = xf86GetPciInfoForEntity(pInt->entityIndex);
-    struct pci_device * dev;
+    struct pci_device *const pvp = xf86GetPciInfoForEntity(pInt->entityIndex);
+    struct pci_device *dev;
 
     if (pvp == NULL)
-	return 0; /* oops */
+        return 0;               /* oops */
 
 #ifdef PRINT_INT
     ErrorF("int 0x1a: ax=0x%x bx=0x%x cx=0x%x dx=0x%x di=0x%x es=0x%x\n",
-	    X86_EAX, X86_EBX, X86_ECX, X86_EDX, X86_EDI, X86_ESI);
+           X86_EAX, X86_EBX, X86_ECX, X86_EDX, X86_EDI, X86_ESI);
 #endif
     switch (X86_AX) {
     case 0xb101:
-	X86_EAX &= 0xFF00;   /* no config space/special cycle support */
-	X86_EDX = 0x20494350; /* " ICP" */
-	X86_EBX = 0x0210;    /* Version 2.10 */
-	X86_ECX &= 0xFF00;
-	X86_ECX |= int1A_last_bus_number(pvp);
-	X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
+        X86_EAX &= 0xFF00;      /* no config space/special cycle support */
+        X86_EDX = 0x20494350;   /* " ICP" */
+        X86_EBX = 0x0210;       /* Version 2.10 */
+        X86_ECX &= 0xFF00;
+        X86_ECX |= int1A_last_bus_number(pvp);
+        X86_EFLAGS &= ~((unsigned long) 0x01);  /* clear carry flag */
 #ifdef PRINT_INT
-	ErrorF("ax=0x%x dx=0x%x bx=0x%x cx=0x%x flags=0x%x\n",
-		 X86_EAX, X86_EDX, X86_EBX, X86_ECX, X86_EFLAGS);
+        ErrorF("ax=0x%x dx=0x%x bx=0x%x cx=0x%x flags=0x%x\n",
+               X86_EAX, X86_EDX, X86_EBX, X86_ECX, X86_EFLAGS);
 #endif
-	return 1;
+        return 1;
     case 0xb102:
-	if ( (X86_DX == pvp->vendor_id) 
-	     && (X86_CX == pvp->device_id)
-	     && (X86_ESI == 0) ) {
-	    X86_EAX = X86_AL | (SUCCESSFUL << 8);
-	    X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
-	    X86_EBX = pciSlotBX(pvp);
-	}
+        if ((X86_DX == pvp->vendor_id)
+            && (X86_CX == pvp->device_id)
+            && (X86_ESI == 0)) {
+            X86_EAX = X86_AL | (SUCCESSFUL << 8);
+            X86_EFLAGS &= ~((unsigned long) 0x01);      /* clear carry flag */
+            X86_EBX = pciSlotBX(pvp);
+        }
 #ifdef SHOW_ALL_DEVICES
-	else
-	if ((dev = find_pci_device_vendor(X86_EDX, X86_ECX, X86_ESI, pvp))) {
-	    X86_EAX = X86_AL | (SUCCESSFUL << 8);
-	    X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
-	    X86_EBX = pciSlotBX(dev);
-	}
+        else if ((dev = find_pci_device_vendor(X86_EDX, X86_ECX, X86_ESI, pvp))) {
+            X86_EAX = X86_AL | (SUCCESSFUL << 8);
+            X86_EFLAGS &= ~((unsigned long) 0x01);      /* clear carry flag */
+            X86_EBX = pciSlotBX(dev);
+        }
 #endif
-	else {
-	    X86_EAX = X86_AL | (DEVICE_NOT_FOUND << 8);
-	    X86_EFLAGS |= ((unsigned long)0x01); /* set carry flag */
-	}
+        else {
+            X86_EAX = X86_AL | (DEVICE_NOT_FOUND << 8);
+            X86_EFLAGS |= ((unsigned long) 0x01);       /* set carry flag */
+        }
 #ifdef PRINT_INT
-	ErrorF("ax=0x%x bx=0x%x flags=0x%x\n", X86_EAX, X86_EBX, X86_EFLAGS);
+        ErrorF("ax=0x%x bx=0x%x flags=0x%x\n", X86_EAX, X86_EBX, X86_EFLAGS);
 #endif
-	return 1;
+        return 1;
     case 0xb103:
-	if ( (X86_ECX & 0x00FFFFFF) == pvp->device_class ) {
-	    X86_EAX = X86_AL | (SUCCESSFUL << 8);
-	    X86_EBX = pciSlotBX(pvp);
-	    X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
-	}
+        if ((X86_ECX & 0x00FFFFFF) == pvp->device_class) {
+            X86_EAX = X86_AL | (SUCCESSFUL << 8);
+            X86_EBX = pciSlotBX(pvp);
+            X86_EFLAGS &= ~((unsigned long) 0x01);      /* clear carry flag */
+        }
 #ifdef SHOW_ALL_DEVICES
-	else if ((dev = find_pci_class(X86_CL, X86_CH,
-				       (X86_ECX & 0xffff0000) >> 16,
-				       X86_ESI, pvp))) {
-	    X86_EAX = X86_AL | (SUCCESSFUL << 8);
-	    X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
-	    X86_EBX = pciSlotBX(dev);
-	}
+        else if ((dev = find_pci_class(X86_CL, X86_CH,
+                                       (X86_ECX & 0xffff0000) >> 16,
+                                       X86_ESI, pvp))) {
+            X86_EAX = X86_AL | (SUCCESSFUL << 8);
+            X86_EFLAGS &= ~((unsigned long) 0x01);      /* clear carry flag */
+            X86_EBX = pciSlotBX(dev);
+        }
 #endif
-	else {
-	    X86_EAX = X86_AL | (DEVICE_NOT_FOUND << 8);
-	    X86_EFLAGS |= ((unsigned long)0x01); /* set carry flag */
-	}
+        else {
+            X86_EAX = X86_AL | (DEVICE_NOT_FOUND << 8);
+            X86_EFLAGS |= ((unsigned long) 0x01);       /* set carry flag */
+        }
 #ifdef PRINT_INT
-	ErrorF("ax=0x%x flags=0x%x\n", X86_EAX, X86_EFLAGS);
+        ErrorF("ax=0x%x flags=0x%x\n", X86_EAX, X86_EFLAGS);
 #endif
-	return 1;
+        return 1;
     case 0xb108:
-	if ((dev = findPci(pInt, X86_EBX)) != NULL) {
-	    pci_device_cfg_read_u8(dev, & X86_CL, X86_DI);
-	    X86_EAX = X86_AL | (SUCCESSFUL << 8);
-	    X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
-	} else {
-	    X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
-	    X86_EFLAGS |= ((unsigned long)0x01); /* set carry flag */
-	}
+        if ((dev = findPci(pInt, X86_EBX)) != NULL) {
+            pci_device_cfg_read_u8(dev, &X86_CL, X86_DI);
+            X86_EAX = X86_AL | (SUCCESSFUL << 8);
+            X86_EFLAGS &= ~((unsigned long) 0x01);      /* clear carry flag */
+        }
+        else {
+            X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
+            X86_EFLAGS |= ((unsigned long) 0x01);       /* set carry flag */
+        }
 #ifdef PRINT_INT
-	ErrorF("ax=0x%x cx=0x%x flags=0x%x\n", X86_EAX, X86_ECX, X86_EFLAGS);
+        ErrorF("ax=0x%x cx=0x%x flags=0x%x\n", X86_EAX, X86_ECX, X86_EFLAGS);
 #endif
-	return 1;
+        return 1;
     case 0xb109:
-	if ((dev = findPci(pInt, X86_EBX)) != NULL) {
-	    pci_device_cfg_read_u16(dev, & X86_CX, X86_DI);
-	    X86_EAX = X86_AL | (SUCCESSFUL << 8);
-	    X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
-	} else {
-	    X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
-	    X86_EFLAGS |= ((unsigned long)0x01); /* set carry flag */
-	}
+        if ((dev = findPci(pInt, X86_EBX)) != NULL) {
+            pci_device_cfg_read_u16(dev, &X86_CX, X86_DI);
+            X86_EAX = X86_AL | (SUCCESSFUL << 8);
+            X86_EFLAGS &= ~((unsigned long) 0x01);      /* clear carry flag */
+        }
+        else {
+            X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
+            X86_EFLAGS |= ((unsigned long) 0x01);       /* set carry flag */
+        }
 #ifdef PRINT_INT
-	ErrorF("ax=0x%x cx=0x%x flags=0x%x\n", X86_EAX, X86_ECX, X86_EFLAGS);
+        ErrorF("ax=0x%x cx=0x%x flags=0x%x\n", X86_EAX, X86_ECX, X86_EFLAGS);
 #endif
-	return 1;
+        return 1;
     case 0xb10a:
-	if ((dev = findPci(pInt, X86_EBX)) != NULL) {
-	    pci_device_cfg_read_u32(dev, & X86_ECX, X86_DI);
-	    X86_EAX = X86_AL | (SUCCESSFUL << 8);
-	    X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
-	} else {
-	    X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
-	    X86_EFLAGS |= ((unsigned long)0x01); /* set carry flag */
-	}
+        if ((dev = findPci(pInt, X86_EBX)) != NULL) {
+            pci_device_cfg_read_u32(dev, &X86_ECX, X86_DI);
+            X86_EAX = X86_AL | (SUCCESSFUL << 8);
+            X86_EFLAGS &= ~((unsigned long) 0x01);      /* clear carry flag */
+        }
+        else {
+            X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
+            X86_EFLAGS |= ((unsigned long) 0x01);       /* set carry flag */
+        }
 #ifdef PRINT_INT
-	ErrorF("ax=0x%x cx=0x%x flags=0x%x\n", X86_EAX, X86_ECX, X86_EFLAGS);
+        ErrorF("ax=0x%x cx=0x%x flags=0x%x\n", X86_EAX, X86_ECX, X86_EFLAGS);
 #endif
-	return 1;
+        return 1;
     case 0xb10b:
-	if ((dev = findPci(pInt, X86_EBX)) != NULL) {
-	    pci_device_cfg_write_u8(dev, X86_CL, X86_DI);
-	    X86_EAX = X86_AL | (SUCCESSFUL << 8);
-	    X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
-	} else {
-	    X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
-	    X86_EFLAGS |= ((unsigned long)0x01); /* set carry flag */
-	}
+        if ((dev = findPci(pInt, X86_EBX)) != NULL) {
+            pci_device_cfg_write_u8(dev, X86_CL, X86_DI);
+            X86_EAX = X86_AL | (SUCCESSFUL << 8);
+            X86_EFLAGS &= ~((unsigned long) 0x01);      /* clear carry flag */
+        }
+        else {
+            X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
+            X86_EFLAGS |= ((unsigned long) 0x01);       /* set carry flag */
+        }
 #ifdef PRINT_INT
-	ErrorF("ax=0x%x flags=0x%x\n", X86_EAX, X86_EFLAGS);
+        ErrorF("ax=0x%x flags=0x%x\n", X86_EAX, X86_EFLAGS);
 #endif
-	return 1;
+        return 1;
     case 0xb10c:
-	if ((dev = findPci(pInt, X86_EBX)) != NULL) {
-	    pci_device_cfg_write_u16(dev, X86_CX, X86_DI);
-	    X86_EAX = X86_AL | (SUCCESSFUL << 8);
-	    X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
-	} else {
-	    X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
-	    X86_EFLAGS |= ((unsigned long)0x01); /* set carry flag */
-	}
+        if ((dev = findPci(pInt, X86_EBX)) != NULL) {
+            pci_device_cfg_write_u16(dev, X86_CX, X86_DI);
+            X86_EAX = X86_AL | (SUCCESSFUL << 8);
+            X86_EFLAGS &= ~((unsigned long) 0x01);      /* clear carry flag */
+        }
+        else {
+            X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
+            X86_EFLAGS |= ((unsigned long) 0x01);       /* set carry flag */
+        }
 #ifdef PRINT_INT
-	ErrorF("ax=0x%x flags=0x%x\n", X86_EAX, X86_EFLAGS);
+        ErrorF("ax=0x%x flags=0x%x\n", X86_EAX, X86_EFLAGS);
 #endif
-	return 1;
+        return 1;
     case 0xb10d:
-	if ((dev = findPci(pInt, X86_EBX)) != NULL) {
-	    pci_device_cfg_write_u32(dev, X86_ECX, X86_DI);
-	    X86_EAX = X86_AL | (SUCCESSFUL << 8);
-	    X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
-	} else {
-	    X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
-	    X86_EFLAGS |= ((unsigned long)0x01); /* set carry flag */
-	}
+        if ((dev = findPci(pInt, X86_EBX)) != NULL) {
+            pci_device_cfg_write_u32(dev, X86_ECX, X86_DI);
+            X86_EAX = X86_AL | (SUCCESSFUL << 8);
+            X86_EFLAGS &= ~((unsigned long) 0x01);      /* clear carry flag */
+        }
+        else {
+            X86_EAX = X86_AL | (BAD_REGISTER_NUMBER << 8);
+            X86_EFLAGS |= ((unsigned long) 0x01);       /* set carry flag */
+        }
 #ifdef PRINT_INT
-	ErrorF("ax=0x%x flags=0x%x\n", X86_EAX, X86_EFLAGS);
+        ErrorF("ax=0x%x flags=0x%x\n", X86_EAX, X86_EFLAGS);
 #endif
-	return 1;
+        return 1;
     default:
-	xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
-	    "int 0x1a subfunction\n");
-	dump_registers(pInt);
-	if (xf86GetVerbosity() > 3)
-	    stack_trace(pInt);
-	return 0;
+        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+                       "int 0x1a subfunction\n");
+        dump_registers(pInt);
+        if (xf86GetVerbosity() > 3)
+            stack_trace(pInt);
+        return 0;
     }
 }
 
 static struct pci_device *
 findPci(xf86Int10InfoPtr pInt, unsigned short bx)
 {
-    const unsigned bus =  (bx >> 8) & 0x00FF;
-    const unsigned dev =  (bx >> 3) & 0x001F;
-    const unsigned func = (bx     ) & 0x0007;
+    const unsigned bus = (bx >> 8) & 0x00FF;
+    const unsigned dev = (bx >> 3) & 0x001F;
+    const unsigned func = (bx) & 0x0007;
 
     return pci_device_find_by_slot(pInt->dev->domain, bus, dev, func);
 }
 
 static CARD32
-pciSlotBX(const struct pci_device * pvp)
+pciSlotBX(const struct pci_device *pvp)
 {
     return ((pvp->bus << 8) & 0x00FF00) | (pvp->dev << 3) | (pvp->func);
 }
@@ -861,14 +871,14 @@ pciSlotBX(const struct pci_device * pvp)
 static int
 intE6_handler(xf86Int10InfoPtr pInt)
 {
-    struct pci_device * pvp;
+    struct pci_device *pvp;
 
     if ((pvp = xf86GetPciInfoForEntity(pInt->entityIndex)))
-	X86_AX = (pvp->bus << 8) | (pvp->dev << 3) | (pvp->func & 0x7);
+        X86_AX = (pvp->bus << 8) | (pvp->dev << 3) | (pvp->func & 0x7);
     pushw(pInt, X86_CS);
     pushw(pInt, X86_IP);
     X86_CS = pInt->BIOSseg;
     X86_EIP = 0x0003;
-    X86_ES = 0;                  /* standard pc es */
+    X86_ES = 0;                 /* standard pc es */
     return 1;
 }
diff --git a/xorg-server/hw/xfree86/int10/xf86int10.h b/xorg-server/hw/xfree86/int10/xf86int10.h
index 5bf326e78..36b659fd7 100644
--- a/xorg-server/hw/xfree86/int10/xf86int10.h
+++ b/xorg-server/hw/xfree86/int10/xf86int10.h
@@ -23,12 +23,12 @@ typedef struct {
     int entityIndex;
     int scrnIndex;
     pointer cpuRegs;
-    CARD16  BIOSseg;
-    CARD16  inb40time;
-    char * BIOSScratch;
+    CARD16 BIOSseg;
+    CARD16 inb40time;
+    char *BIOSScratch;
     int Flags;
     pointer private;
-    struct _int10Mem* mem;
+    struct _int10Mem *mem;
     int num;
     int ax;
     int bx;
@@ -45,12 +45,12 @@ typedef struct {
 } xf86Int10InfoRec, *xf86Int10InfoPtr;
 
 typedef struct _int10Mem {
-    CARD8(*rb)(xf86Int10InfoPtr, int);
-    CARD16(*rw)(xf86Int10InfoPtr, int);
-    CARD32(*rl)(xf86Int10InfoPtr, int);
-    void(*wb)(xf86Int10InfoPtr, int, CARD8);
-    void(*ww)(xf86Int10InfoPtr, int, CARD16);
-    void(*wl)(xf86Int10InfoPtr, int, CARD32);
+    CARD8 (*rb) (xf86Int10InfoPtr, int);
+    CARD16 (*rw) (xf86Int10InfoPtr, int);
+    CARD32 (*rl) (xf86Int10InfoPtr, int);
+    void (*wb) (xf86Int10InfoPtr, int, CARD8);
+    void (*ww) (xf86Int10InfoPtr, int, CARD16);
+    void (*wl) (xf86Int10InfoPtr, int, CARD32);
 } int10MemRec, *int10MemPtr;
 
 typedef struct {
@@ -59,16 +59,16 @@ typedef struct {
     CARD8 save_vse;
     CARD8 save_46e8;
 } legacyVGARec, *legacyVGAPtr;
-    
+
 /* OS dependent functions */
 extern _X_EXPORT xf86Int10InfoPtr xf86InitInt10(int entityIndex);
 extern _X_EXPORT xf86Int10InfoPtr xf86ExtendedInitInt10(int entityIndex,
-							int Flags);
+                                                        int Flags);
 extern _X_EXPORT void xf86FreeInt10(xf86Int10InfoPtr pInt);
 extern _X_EXPORT void *xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num,
-					   int *off);
+                                           int *off);
 extern _X_EXPORT void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase,
-					 int num);
+                                         int num);
 extern _X_EXPORT pointer xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr);
 
 /* x86 executor related functions */
@@ -81,7 +81,7 @@ extern _X_EXPORT void xf86ExecX86int10(xf86Int10InfoPtr pInt);
 #define SYS_BIOS 0xF0000
 #if 1
 #define BIOS_SIZE 0x10000
-#else /* a bug in DGUX requires this - let's try it */
+#else                           /* a bug in DGUX requires this - let's try it */
 #define BIOS_SIZE (0x10000 - 1)
 #endif
 #define LOW_PAGE_SIZE 0x600
@@ -103,8 +103,8 @@ extern _X_EXPORT void xf86ExecX86int10(xf86Int10InfoPtr pInt);
 #define X86_NT_MASK		0x00004000
 #define X86_VM_MASK		0x00020000
 #define X86_AC_MASK		0x00040000
-#define X86_VIF_MASK		0x00080000	/* virtual interrupt flag */
-#define X86_VIP_MASK		0x00100000	/* virtual interrupt pending */
+#define X86_VIF_MASK		0x00080000      /* virtual interrupt flag */
+#define X86_VIP_MASK		0x00100000      /* virtual interrupt pending */
 #define X86_ID_MASK		0x00200000
 
 #define MEM_RB(name, addr)      (*name->mem->rb)(name, addr)
@@ -116,6 +116,7 @@ extern _X_EXPORT void xf86ExecX86int10(xf86Int10InfoPtr pInt);
 
 /* OS dependent functions */
 extern _X_EXPORT Bool MapCurrentInt10(xf86Int10InfoPtr pInt);
+
 /* x86 executor related functions */
 extern _X_EXPORT Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt);
 
@@ -135,21 +136,23 @@ void stack_trace(xf86Int10InfoPtr pInt);
 CARD8 bios_checksum(const CARD8 *start, int size);
 void LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);
 void UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);
+
 #if defined (_PC)
-extern _X_EXPORT void xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save);
+extern _X_EXPORT void xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt,
+                                                   Bool save);
 #endif
 int port_rep_inb(xf86Int10InfoPtr pInt,
-		 CARD16 port, CARD32 base, int d_f, CARD32 count);
+                 CARD16 port, CARD32 base, int d_f, CARD32 count);
 int port_rep_inw(xf86Int10InfoPtr pInt,
-		 CARD16 port, CARD32 base, int d_f, CARD32 count);
+                 CARD16 port, CARD32 base, int d_f, CARD32 count);
 int port_rep_inl(xf86Int10InfoPtr pInt,
-		 CARD16 port, CARD32 base, int d_f, CARD32 count);
+                 CARD16 port, CARD32 base, int d_f, CARD32 count);
 int port_rep_outb(xf86Int10InfoPtr pInt,
-		  CARD16 port, CARD32 base, int d_f, CARD32 count);
+                  CARD16 port, CARD32 base, int d_f, CARD32 count);
 int port_rep_outw(xf86Int10InfoPtr pInt,
-		  CARD16 port, CARD32 base, int d_f, CARD32 count);
+                  CARD16 port, CARD32 base, int d_f, CARD32 count);
 int port_rep_outl(xf86Int10InfoPtr pInt,
-		  CARD16 port, CARD32 base, int d_f, CARD32 count);
+                  CARD16 port, CARD32 base, int d_f, CARD32 count);
 
 CARD8 x_inb(CARD16 port);
 CARD16 x_inw(CARD16 port);
@@ -170,16 +173,19 @@ void setup_int_vect(xf86Int10InfoPtr pInt);
 int setup_system_bios(void *base_addr);
 void reset_int_vect(xf86Int10InfoPtr pInt);
 void set_return_trap(xf86Int10InfoPtr pInt);
-extern _X_EXPORT void * xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex);
-Bool int10skip(const void* options);
+extern _X_EXPORT void *xf86HandleInt10Options(ScrnInfoPtr pScrn,
+                                              int entityIndex);
+Bool int10skip(const void *options);
 Bool int10_check_bios(int scrnIndex, int codeSeg,
-    const unsigned char* vbiosMem);
-Bool initPrimary(const void* options);
-extern _X_EXPORT BusType xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt);
-extern _X_EXPORT Bool xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base);
+                      const unsigned char *vbiosMem);
+Bool initPrimary(const void *options);
+extern _X_EXPORT BusType xf86int10GetBiosLocationType(const xf86Int10InfoPtr
+                                                      pInt);
+extern _X_EXPORT Bool xf86int10GetBiosSegment(xf86Int10InfoPtr pInt,
+                                              void *base);
 #ifdef DEBUG
 void dprint(unsigned long start, unsigned long size);
 #endif
 
-#endif /* _INT10_PRIVATE */
-#endif /* _XF86INT10_H */
+#endif                          /* _INT10_PRIVATE */
+#endif                          /* _XF86INT10_H */
diff --git a/xorg-server/hw/xfree86/int10/xf86int10module.c b/xorg-server/hw/xfree86/int10/xf86int10module.c
index 52bf0eeb1..1eb5a0783 100644
--- a/xorg-server/hw/xfree86/int10/xf86int10module.c
+++ b/xorg-server/hw/xfree86/int10/xf86int10module.c
@@ -1,43 +1,32 @@
-/*

- *                   XFree86 int10 module

- *   execute BIOS int 10h calls in x86 real mode environment

- *                 Copyright 1999 Egbert Eich

- */

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include "xf86str.h"

-#include "xf86Pci.h"

-#include "xf86int10.h"

-

-#ifndef MOD_NAME

-# define MOD_NAME int10

-#endif

-

-#define stringify(x) #x

-#define STRING(x) stringify(x)

-#define concat(x,y) x ## y

-#define combine(a,b) concat(a,b)

-#define NAME(x) combine(MOD_NAME,x)

-

-static XF86ModuleVersionInfo NAME(VersRec) =

-{

-    STRING(NAME( )),

-    MODULEVENDORSTRING,

-    MODINFOSTRING1,

-    MODINFOSTRING2,

-    XORG_VERSION_CURRENT,

-    1, 0, 0,

-    ABI_CLASS_VIDEODRV,		/* needs the video driver ABI */

-    ABI_VIDEODRV_VERSION,

-    MOD_CLASS_NONE,

-    {0,0,0,0}

-};

-

-_X_EXPORT XF86ModuleData NAME(ModuleData) = {

-    &NAME(VersRec),

-    NULL,

-    NULL

-};

+/*
+ *                   XFree86 int10 module
+ *   execute BIOS int 10h calls in x86 real mode environment
+ *                 Copyright 1999 Egbert Eich
+ */
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86str.h"
+#include "xf86Pci.h"
+#include "xf86int10.h"
+
+#ifndef MOD_NAME
+#define MOD_NAME int10
+#endif
+
+#define stringify(x) #x
+#define STRING(x) stringify(x)
+#define concat(x,y) x ## y
+#define combine(a,b) concat(a,b)
+#define NAME(x) combine(MOD_NAME,x)
+
+static XF86ModuleVersionInfo NAME(VersRec) = {
+    STRING(NAME()), MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_VIDEODRV,      /* needs the video driver ABI */
+        ABI_VIDEODRV_VERSION, MOD_CLASS_NONE, {
+    0, 0, 0, 0}
+};
+
+_X_EXPORT XF86ModuleData NAME(ModuleData) = {
+&NAME(VersRec), NULL, NULL};
diff --git a/xorg-server/hw/xfree86/loader/loader.c b/xorg-server/hw/xfree86/loader/loader.c
index 159b61198..b72b8b89d 100644
--- a/xorg-server/hw/xfree86/loader/loader.c
+++ b/xorg-server/hw/xfree86/loader/loader.c
@@ -99,20 +99,20 @@ extern void *xorg_symbols[];
 void
 LoaderInit(void)
 {
-    xf86MsgVerb(X_INFO, 2, "Loader magic: %p\n", (void *)xorg_symbols);
+    xf86MsgVerb(X_INFO, 2, "Loader magic: %p\n", (void *) xorg_symbols);
     xf86MsgVerb(X_INFO, 2, "Module ABI versions:\n");
     xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC,
-		   GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion),
-		   GET_ABI_MINOR(LoaderVersionInfo.ansicVersion));
+                   GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion),
+                   GET_ABI_MINOR(LoaderVersionInfo.ansicVersion));
     xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_VIDEODRV,
-		   GET_ABI_MAJOR(LoaderVersionInfo.videodrvVersion),
-		   GET_ABI_MINOR(LoaderVersionInfo.videodrvVersion));
+                   GET_ABI_MAJOR(LoaderVersionInfo.videodrvVersion),
+                   GET_ABI_MINOR(LoaderVersionInfo.videodrvVersion));
     xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_XINPUT,
-		   GET_ABI_MAJOR(LoaderVersionInfo.xinputVersion),
-		   GET_ABI_MINOR(LoaderVersionInfo.xinputVersion));
+                   GET_ABI_MAJOR(LoaderVersionInfo.xinputVersion),
+                   GET_ABI_MINOR(LoaderVersionInfo.xinputVersion));
     xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_EXTENSION,
-		   GET_ABI_MAJOR(LoaderVersionInfo.extensionVersion),
-		   GET_ABI_MINOR(LoaderVersionInfo.extensionVersion));
+                   GET_ABI_MAJOR(LoaderVersionInfo.extensionVersion),
+                   GET_ABI_MINOR(LoaderVersionInfo.extensionVersion));
 
 }
 
@@ -130,12 +130,12 @@ LoaderOpen(const char *module, int *errmaj, int *errmin)
     xf86Msg(X_INFO, "Loading %s\n", module);
 
     if (!(ret = dlopen(module, DLOPEN_LAZY | DLOPEN_GLOBAL))) {
-	xf86Msg(X_ERROR, "Failed to load %s: %s\n", module, dlerror());
-	if (errmaj)
-	    *errmaj = LDR_NOLOAD;
-	if (errmin)
-	    *errmin = LDR_NOLOAD;
-	return NULL;
+        xf86Msg(X_ERROR, "Failed to load %s: %s\n", module, dlerror());
+        if (errmaj)
+            *errmaj = LDR_NOLOAD;
+        if (errmin)
+            *errmin = LDR_NOLOAD;
+        return NULL;
     }
 
     return ret;
@@ -149,13 +149,13 @@ LoaderSymbol(const char *name)
 
     p = dlsym(RTLD_DEFAULT, name);
     if (p != NULL)
-	return p;
+        return p;
 
     if (!global_scope)
-	global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);
+        global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);
 
     if (global_scope)
-	return dlsym(global_scope, name);
+        return dlsym(global_scope, name);
 
     return NULL;
 }
@@ -165,7 +165,7 @@ LoaderUnload(const char *name, void *handle)
 {
     xf86Msg(X_INFO, "Unloading %s\n", name);
     if (handle)
-	dlclose(handle);
+        dlclose(handle);
 }
 
 unsigned long LoaderOptions = 0;
@@ -189,17 +189,18 @@ LoaderGetABIVersion(const char *abiclass)
         const char *name;
         int version;
     } classes[] = {
-        { ABI_CLASS_ANSIC,     LoaderVersionInfo.ansicVersion },
-        { ABI_CLASS_VIDEODRV,  LoaderVersionInfo.videodrvVersion },
-        { ABI_CLASS_XINPUT,    LoaderVersionInfo.xinputVersion },
-        { ABI_CLASS_EXTENSION, LoaderVersionInfo.extensionVersion },
-        { ABI_CLASS_FONT,      LoaderVersionInfo.fontVersion },
-        { NULL,                0 }
+        {
+        ABI_CLASS_ANSIC, LoaderVersionInfo.ansicVersion}, {
+        ABI_CLASS_VIDEODRV, LoaderVersionInfo.videodrvVersion}, {
+        ABI_CLASS_XINPUT, LoaderVersionInfo.xinputVersion}, {
+        ABI_CLASS_EXTENSION, LoaderVersionInfo.extensionVersion}, {
+        ABI_CLASS_FONT, LoaderVersionInfo.fontVersion}, {
+        NULL, 0}
     };
     int i;
 
-    for(i = 0; classes[i].name; i++) {
-        if(!strcmp(classes[i].name, abiclass)) {
+    for (i = 0; classes[i].name; i++) {
+        if (!strcmp(classes[i].name, abiclass)) {
             return classes[i].version;
         }
     }
diff --git a/xorg-server/hw/xfree86/loader/loadext.c b/xorg-server/hw/xfree86/loader/loadext.c
index 8380c300b..daa1abf8d 100644
--- a/xorg-server/hw/xfree86/loader/loadext.c
+++ b/xorg-server/hw/xfree86/loader/loadext.c
@@ -1,440 +1,440 @@
-/*

- * Copyright (c) 2000 by The XFree86 Project, Inc.

- *

- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-/* Maybe this file belongs elsewhere? */

-

-#define LOADERDECLARATIONS

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "loaderProcs.h"

-#include "misc.h"

-#include "xf86.h"

-

-/*

- * This should be static, but miinitext wants it.  FIXME: make extension

- * initialization not completely terrible.

- */

-ExtensionModule *ExtensionModuleList = NULL;

-static int numExtensionModules = 0;

-

-static ExtensionModule *

-NewExtensionModule(void)

-{

-    ExtensionModule *save = ExtensionModuleList;

-    int n;

-

-    /* Sanity check */

-    if (!ExtensionModuleList)

-	numExtensionModules = 0;

-

-    n = numExtensionModules + 1;

-    ExtensionModuleList = realloc(ExtensionModuleList,

-				   (n + 1) * sizeof(ExtensionModule));

-    if (ExtensionModuleList == NULL) {

-	ExtensionModuleList = save;

-	return NULL;

-    } else {

-	numExtensionModules++;

-	ExtensionModuleList[numExtensionModules].name = NULL;

-	return ExtensionModuleList + (numExtensionModules - 1);

-    }

-}

-

-void

-LoadExtension(ExtensionModule * e, Bool builtin)

-{

-    ExtensionModule *newext;

-

-    if (e == NULL || e->name == NULL)

-	return;

-

-    if (!(newext = NewExtensionModule()))

-	return;

-

-    if (builtin)

-	xf86MsgVerb(X_INFO, 2, "Initializing built-in extension %s\n",

-		    e->name);

-    else

-	xf86MsgVerb(X_INFO, 2, "Loading extension %s\n", e->name);

-

-    newext->name = e->name;

-    newext->initFunc = e->initFunc;

-    newext->disablePtr = e->disablePtr;

-    newext->setupFunc = e->setupFunc;

-    newext->initDependencies = e->initDependencies;

-

-    if (e->setupFunc != NULL)

-	e->setupFunc();

-}

-

-/*

- * Sort ExtensionModuleList according to the initialisation order

- * dependencies.  The code for this is taken from BSD's tsort,

- * and carries the following copyright/license:

- *

- *

- * Copyright (c) 1989, 1993, 1994

- *      The Regents of the University of California.  All rights reserved.

- *

- * This code is derived from software contributed to Berkeley by

- * Michael Rendell of Memorial University of Newfoundland.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in the

- *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software

- *    must display the following acknowledgement:

- *      This product includes software developed by the University of

- *      California, Berkeley and its contributors.

- * 4. Neither the name of the University nor the names of its contributors

- *    may be used to endorse or promote products derived from this software

- *    without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- * SUCH DAMAGE.

- */

-

-#define	NF_MARK		0x1	/* marker for cycle detection */

-#define	NF_ACYCLIC	0x2	/* this node is cycle free */

-#define	NF_NODEST	0x4	/* Unreachable */

-

-typedef struct node_str NODE;

-struct node_str {

-    NODE **n_prevp;		/* pointer to previous node's n_next */

-    NODE *n_next;		/* next node in graph */

-    NODE **n_arcs;		/* array of arcs to other nodes */

-    int n_narcs;		/* number of arcs in n_arcs[] */

-    int n_arcsize;		/* size of n_arcs[] array */

-    int n_refcnt;		/* # of arcs pointing to this node */

-    int n_flags;		/* NF_* */

-    const char *n_name;		/* name of this node */

-};

-

-static NODE *graph = NULL, **cycle_buf = NULL, **longest_cycle = NULL;

-static int longest = 0;

-static NODE *sorted = NULL, *last = NULL;

-

-/* Find a node in the graph (insert if not found) and return a pointer to it. */

-static NODE *

-get_node(const char *name)

-{

-    NODE *n;

-

-    for (n = graph; n && n->n_name && strcmp(n->n_name, name);

-	 n = n->n_next) ;

-    if (n)

-	return n;

-

-    n = xnfalloc(sizeof(NODE));

-

-    n->n_narcs = 0;

-    n->n_arcsize = 0;

-    n->n_arcs = NULL;

-    n->n_refcnt = 0;

-    n->n_flags = 0;

-    n->n_name = name;

-

-    /* Add to linked list. */

-    if ((n->n_next = graph) != NULL)

-	graph->n_prevp = &n->n_next;

-    n->n_prevp = &graph;

-    graph = n;

-

-    return n;

-}

-

-/*

- * add an arc from node s1 to node s2 in the graph.  If s1 or s2 are not in

- * the graph, then add them.

- */

-static void

-add_arc(const char *s1, const char *s2)

-{

-    NODE *n1;

-    NODE *n2;

-    int bsize, i;

-

-    n1 = get_node(s1);

-

-    if (!strcmp(s1, s2))

-	return;

-

-    n2 = get_node(s2);

-

-    /*

-     * Check if this arc is already here.

-     */

-    for (i = 0; i < n1->n_narcs; i++)

-	if (n1->n_arcs[i] == n2)

-	    return;

-    /*

-     * Add it.

-     */

-    if (n1->n_narcs == n1->n_arcsize) {

-	if (!n1->n_arcsize)

-	    n1->n_arcsize = 10;

-	bsize = n1->n_arcsize * sizeof(*n1->n_arcs) * 2;

-	n1->n_arcs = xnfrealloc(n1->n_arcs, bsize);

-	n1->n_arcsize = bsize / sizeof(*n1->n_arcs);

-    }

-    n1->n_arcs[n1->n_narcs++] = n2;

-    ++n2->n_refcnt;

-}

-

-/*

- * Clear the NODEST flag from all nodes.

- */

-static void

-clear_cycle(void)

-{

-    NODE *n;

-

-    for (n = graph; n != NULL; n = n->n_next)

-	n->n_flags &= ~NF_NODEST;

-}

-

-/* print node and remove from graph (does not actually free node) */

-static void

-remove_node(NODE * n)

-{

-    NODE **np;

-    NODE *newnode;

-    int i;

-

-#ifdef DEBUG

-    ErrorF("%s\n", n->n_name);

-#endif

-    newnode = xnfalloc(sizeof(NODE));

-    memcpy(newnode, n, sizeof(NODE));

-    if (last)

-	last->n_next = newnode;

-    else

-	sorted = newnode;

-    last = newnode;

-    newnode->n_next = NULL;

-

-    for (np = n->n_arcs, i = n->n_narcs; --i >= 0; np++)

-	--(*np)->n_refcnt;

-    n->n_narcs = 0;

-    *n->n_prevp = n->n_next;

-    if (n->n_next)

-	n->n_next->n_prevp = n->n_prevp;

-}

-

-static void

-free_nodes(NODE * nodelist)

-{

-    NODE *n, *nextnode;

-

-    for (n = nodelist; n;) {

-	nextnode = n->n_next;

-	free(n);

-	n = nextnode;

-    }

-}

-

-/* look for the longest? cycle from node from to node to. */

-static int

-find_cycle(NODE * from, NODE * to, int longest_len, int depth)

-{

-    NODE **np;

-    int i, len;

-

-    /*

-     * avoid infinite loops and ignore portions of the graph known

-     * to be acyclic

-     */

-    if (from->n_flags & (NF_NODEST | NF_MARK | NF_ACYCLIC))

-	return 0;

-    from->n_flags |= NF_MARK;

-

-    for (np = from->n_arcs, i = from->n_narcs; --i >= 0; np++) {

-	cycle_buf[depth] = *np;

-	if (*np == to) {

-	    if (depth + 1 > longest_len) {

-		longest_len = depth + 1;

-		memcpy((char *)longest_cycle,

-		       (char *)cycle_buf, longest_len * sizeof(NODE *));

-	    }

-	} else {

-	    if ((*np)->n_flags & (NF_MARK | NF_ACYCLIC | NF_NODEST))

-		continue;

-	    len = find_cycle(*np, to, longest_len, depth + 1);

-

-#ifdef DEBUG

-	    ErrorF("%*s %s->%s %d\n", depth, "",

-		   from->n_name, to->n_name, len);

-#endif

-

-	    if (len == 0)

-		(*np)->n_flags |= NF_NODEST;

-

-	    if (len > longest_len)

-		longest_len = len;

-

-	    if (len > 0 && !longest)

-		break;

-	}

-    }

-    from->n_flags &= ~NF_MARK;

-    return longest_len;

-}

-

-/* do topological sort on graph */

-static void

-tsort(void)

-{

-    NODE *n, *next;

-    int cnt, i;

-

-    while (graph != NULL) {

-	/*

-	 * Keep getting rid of simple cases until there are none left,

-	 * if there are any nodes still in the graph, then there is

-	 * a cycle in it.

-	 */

-	do {

-	    for (cnt = 0, n = graph; n != NULL; n = next) {

-		next = n->n_next;

-		if (n->n_refcnt == 0) {

-		    remove_node(n);

-		    ++cnt;

-		}

-	    }

-	} while (graph != NULL && cnt);

-

-	if (graph == NULL)

-	    break;

-

-	if (!cycle_buf) {

-	    /*

-	     * Allocate space for two cycle logs - one to be used

-	     * as scratch space, the other to save the longest

-	     * cycle.

-	     */

-	    for (cnt = 0, n = graph; n != NULL; n = n->n_next)

-		++cnt;

-	    cycle_buf = xnfalloc(sizeof(NODE *) * cnt);

-	    longest_cycle = xnfalloc(sizeof(NODE *) * cnt);

-	    if (cycle_buf == NULL || longest_cycle == NULL)

-		return;

-	}

-	for (n = graph; n != NULL; n = n->n_next)

-	    if (!(n->n_flags & NF_ACYCLIC)) {

-		if ((cnt = find_cycle(n, n, 0, 0))) {

-		    ErrorF("tsort: cycle in data");

-		    for (i = 0; i < cnt; i++)

-			ErrorF("%s", longest_cycle[i]->n_name);

-		    remove_node(n);

-		    clear_cycle();

-		    break;

-		} else {

-		    /* to avoid further checks */

-		    n->n_flags |= NF_ACYCLIC;

-		    clear_cycle();

-		}

-	    }

-

-	if (n == NULL)

-	    ErrorF("tsort: internal error -- could not find cycle");

-    }

-    free(cycle_buf);

-    free(longest_cycle);

-    if (graph)

-	free_nodes(graph);

-}

-

-void

-LoaderSortExtensions(void)

-{

-    int i, j;

-    ExtensionModule *ext, *newList;

-    NODE *node;

-

-    graph = NULL;

-    longest = 0;

-    sorted = NULL;

-    last = NULL;

-    cycle_buf = NULL;

-    longest_cycle = NULL;

-

-    /*

-     * Parse list and build the graph.  Enter them in reverse order

-     * because tsort() will reverse those that have no depedencies.

-     */

-    for (i = numExtensionModules - 1; i >= 0; i--) {

-	ext = &ExtensionModuleList[i];

-	add_arc(ext->name, ext->name);

-#ifdef DEBUG

-	ErrorF("Extension %s:\n", ext->name);

-#endif

-	if (ext->initDependencies)

-	    for (j = 0; ext->initDependencies[j]; j++) {

-		add_arc(ext->initDependencies[j], ext->name);

-#ifdef DEBUG

-		ErrorF("\t%s\n", ext->initDependencies[j]);

-#endif

-	    }

-    }

-    tsort();

-    newList = xnfalloc((numExtensionModules + 1) * sizeof(ExtensionModule));

-    i = 0;

-    for (node = sorted; node; node = node->n_next) {

-	for (j = 0; j < numExtensionModules; j++)

-	    if (!strcmp(node->n_name, ExtensionModuleList[j].name))

-		break;

-	if (j != numExtensionModules)

-	    newList[i++] = ExtensionModuleList[j];

-    }

-    if (sorted)

-	free_nodes(sorted);

-    if (graph)

-	free_nodes(graph);

-    newList[i].name = NULL;

-    free(ExtensionModuleList);

-    ExtensionModuleList = newList;

-#ifdef DEBUG

-    for (i = 0; ExtensionModuleList[i].name; i++)

-	ErrorF("Extension %s\n", ExtensionModuleList[i].name);

-#endif

-}

+/*
+ * Copyright (c) 2000 by The XFree86 Project, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+/* Maybe this file belongs elsewhere? */
+
+#define LOADERDECLARATIONS
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "loaderProcs.h"
+#include "misc.h"
+#include "xf86.h"
+
+/*
+ * This should be static, but miinitext wants it.  FIXME: make extension
+ * initialization not completely terrible.
+ */
+ExtensionModule *ExtensionModuleList = NULL;
+static int numExtensionModules = 0;
+
+static ExtensionModule *
+NewExtensionModule(void)
+{
+    ExtensionModule *save = ExtensionModuleList;
+    int n;
+
+    /* Sanity check */
+    if (!ExtensionModuleList)
+        numExtensionModules = 0;
+
+    n = numExtensionModules + 1;
+    ExtensionModuleList = realloc(ExtensionModuleList,
+                                  (n + 1) * sizeof(ExtensionModule));
+    if (ExtensionModuleList == NULL) {
+        ExtensionModuleList = save;
+        return NULL;
+    }
+    else {
+        numExtensionModules++;
+        ExtensionModuleList[numExtensionModules].name = NULL;
+        return ExtensionModuleList + (numExtensionModules - 1);
+    }
+}
+
+void
+LoadExtension(ExtensionModule * e, Bool builtin)
+{
+    ExtensionModule *newext;
+
+    if (e == NULL || e->name == NULL)
+        return;
+
+    if (!(newext = NewExtensionModule()))
+        return;
+
+    if (builtin)
+        xf86MsgVerb(X_INFO, 2, "Initializing built-in extension %s\n", e->name);
+    else
+        xf86MsgVerb(X_INFO, 2, "Loading extension %s\n", e->name);
+
+    newext->name = e->name;
+    newext->initFunc = e->initFunc;
+    newext->disablePtr = e->disablePtr;
+    newext->setupFunc = e->setupFunc;
+    newext->initDependencies = e->initDependencies;
+
+    if (e->setupFunc != NULL)
+        e->setupFunc();
+}
+
+/*
+ * Sort ExtensionModuleList according to the initialisation order
+ * dependencies.  The code for this is taken from BSD's tsort,
+ * and carries the following copyright/license:
+ *
+ *
+ * Copyright (c) 1989, 1993, 1994
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Michael Rendell of Memorial University of Newfoundland.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#define	NF_MARK		0x1     /* marker for cycle detection */
+#define	NF_ACYCLIC	0x2     /* this node is cycle free */
+#define	NF_NODEST	0x4     /* Unreachable */
+
+typedef struct node_str NODE;
+struct node_str {
+    NODE **n_prevp;             /* pointer to previous node's n_next */
+    NODE *n_next;               /* next node in graph */
+    NODE **n_arcs;              /* array of arcs to other nodes */
+    int n_narcs;                /* number of arcs in n_arcs[] */
+    int n_arcsize;              /* size of n_arcs[] array */
+    int n_refcnt;               /* # of arcs pointing to this node */
+    int n_flags;                /* NF_* */
+    const char *n_name;         /* name of this node */
+};
+
+static NODE *graph = NULL, **cycle_buf = NULL, **longest_cycle = NULL;
+static int longest = 0;
+static NODE *sorted = NULL, *last = NULL;
+
+/* Find a node in the graph (insert if not found) and return a pointer to it. */
+static NODE *
+get_node(const char *name)
+{
+    NODE *n;
+
+    for (n = graph; n && n->n_name && strcmp(n->n_name, name); n = n->n_next);
+    if (n)
+        return n;
+
+    n = xnfalloc(sizeof(NODE));
+
+    n->n_narcs = 0;
+    n->n_arcsize = 0;
+    n->n_arcs = NULL;
+    n->n_refcnt = 0;
+    n->n_flags = 0;
+    n->n_name = name;
+
+    /* Add to linked list. */
+    if ((n->n_next = graph) != NULL)
+        graph->n_prevp = &n->n_next;
+    n->n_prevp = &graph;
+    graph = n;
+
+    return n;
+}
+
+/*
+ * add an arc from node s1 to node s2 in the graph.  If s1 or s2 are not in
+ * the graph, then add them.
+ */
+static void
+add_arc(const char *s1, const char *s2)
+{
+    NODE *n1;
+    NODE *n2;
+    int bsize, i;
+
+    n1 = get_node(s1);
+
+    if (!strcmp(s1, s2))
+        return;
+
+    n2 = get_node(s2);
+
+    /*
+     * Check if this arc is already here.
+     */
+    for (i = 0; i < n1->n_narcs; i++)
+        if (n1->n_arcs[i] == n2)
+            return;
+    /*
+     * Add it.
+     */
+    if (n1->n_narcs == n1->n_arcsize) {
+        if (!n1->n_arcsize)
+            n1->n_arcsize = 10;
+        bsize = n1->n_arcsize * sizeof(*n1->n_arcs) * 2;
+        n1->n_arcs = xnfrealloc(n1->n_arcs, bsize);
+        n1->n_arcsize = bsize / sizeof(*n1->n_arcs);
+    }
+    n1->n_arcs[n1->n_narcs++] = n2;
+    ++n2->n_refcnt;
+}
+
+/*
+ * Clear the NODEST flag from all nodes.
+ */
+static void
+clear_cycle(void)
+{
+    NODE *n;
+
+    for (n = graph; n != NULL; n = n->n_next)
+        n->n_flags &= ~NF_NODEST;
+}
+
+/* print node and remove from graph (does not actually free node) */
+static void
+remove_node(NODE * n)
+{
+    NODE **np;
+    NODE *newnode;
+    int i;
+
+#ifdef DEBUG
+    ErrorF("%s\n", n->n_name);
+#endif
+    newnode = xnfalloc(sizeof(NODE));
+    memcpy(newnode, n, sizeof(NODE));
+    if (last)
+        last->n_next = newnode;
+    else
+        sorted = newnode;
+    last = newnode;
+    newnode->n_next = NULL;
+
+    for (np = n->n_arcs, i = n->n_narcs; --i >= 0; np++)
+        --(*np)->n_refcnt;
+    n->n_narcs = 0;
+    *n->n_prevp = n->n_next;
+    if (n->n_next)
+        n->n_next->n_prevp = n->n_prevp;
+}
+
+static void
+free_nodes(NODE * nodelist)
+{
+    NODE *n, *nextnode;
+
+    for (n = nodelist; n;) {
+        nextnode = n->n_next;
+        free(n);
+        n = nextnode;
+    }
+}
+
+/* look for the longest? cycle from node from to node to. */
+static int
+find_cycle(NODE * from, NODE * to, int longest_len, int depth)
+{
+    NODE **np;
+    int i, len;
+
+    /*
+     * avoid infinite loops and ignore portions of the graph known
+     * to be acyclic
+     */
+    if (from->n_flags & (NF_NODEST | NF_MARK | NF_ACYCLIC))
+        return 0;
+    from->n_flags |= NF_MARK;
+
+    for (np = from->n_arcs, i = from->n_narcs; --i >= 0; np++) {
+        cycle_buf[depth] = *np;
+        if (*np == to) {
+            if (depth + 1 > longest_len) {
+                longest_len = depth + 1;
+                memcpy((char *) longest_cycle,
+                       (char *) cycle_buf, longest_len * sizeof(NODE *));
+            }
+        }
+        else {
+            if ((*np)->n_flags & (NF_MARK | NF_ACYCLIC | NF_NODEST))
+                continue;
+            len = find_cycle(*np, to, longest_len, depth + 1);
+
+#ifdef DEBUG
+            ErrorF("%*s %s->%s %d\n", depth, "", from->n_name, to->n_name, len);
+#endif
+
+            if (len == 0)
+                (*np)->n_flags |= NF_NODEST;
+
+            if (len > longest_len)
+                longest_len = len;
+
+            if (len > 0 && !longest)
+                break;
+        }
+    }
+    from->n_flags &= ~NF_MARK;
+    return longest_len;
+}
+
+/* do topological sort on graph */
+static void
+tsort(void)
+{
+    NODE *n, *next;
+    int cnt, i;
+
+    while (graph != NULL) {
+        /*
+         * Keep getting rid of simple cases until there are none left,
+         * if there are any nodes still in the graph, then there is
+         * a cycle in it.
+         */
+        do {
+            for (cnt = 0, n = graph; n != NULL; n = next) {
+                next = n->n_next;
+                if (n->n_refcnt == 0) {
+                    remove_node(n);
+                    ++cnt;
+                }
+            }
+        } while (graph != NULL && cnt);
+
+        if (graph == NULL)
+            break;
+
+        if (!cycle_buf) {
+            /*
+             * Allocate space for two cycle logs - one to be used
+             * as scratch space, the other to save the longest
+             * cycle.
+             */
+            for (cnt = 0, n = graph; n != NULL; n = n->n_next)
+                ++cnt;
+            cycle_buf = xnfalloc(sizeof(NODE *) * cnt);
+            longest_cycle = xnfalloc(sizeof(NODE *) * cnt);
+            if (cycle_buf == NULL || longest_cycle == NULL)
+                return;
+        }
+        for (n = graph; n != NULL; n = n->n_next)
+            if (!(n->n_flags & NF_ACYCLIC)) {
+                if ((cnt = find_cycle(n, n, 0, 0))) {
+                    ErrorF("tsort: cycle in data");
+                    for (i = 0; i < cnt; i++)
+                        ErrorF("%s", longest_cycle[i]->n_name);
+                    remove_node(n);
+                    clear_cycle();
+                    break;
+                }
+                else {
+                    /* to avoid further checks */
+                    n->n_flags |= NF_ACYCLIC;
+                    clear_cycle();
+                }
+            }
+
+        if (n == NULL)
+            ErrorF("tsort: internal error -- could not find cycle");
+    }
+    free(cycle_buf);
+    free(longest_cycle);
+    if (graph)
+        free_nodes(graph);
+}
+
+void
+LoaderSortExtensions(void)
+{
+    int i, j;
+    ExtensionModule *ext, *newList;
+    NODE *node;
+
+    graph = NULL;
+    longest = 0;
+    sorted = NULL;
+    last = NULL;
+    cycle_buf = NULL;
+    longest_cycle = NULL;
+
+    /*
+     * Parse list and build the graph.  Enter them in reverse order
+     * because tsort() will reverse those that have no depedencies.
+     */
+    for (i = numExtensionModules - 1; i >= 0; i--) {
+        ext = &ExtensionModuleList[i];
+        add_arc(ext->name, ext->name);
+#ifdef DEBUG
+        ErrorF("Extension %s:\n", ext->name);
+#endif
+        if (ext->initDependencies)
+            for (j = 0; ext->initDependencies[j]; j++) {
+                add_arc(ext->initDependencies[j], ext->name);
+#ifdef DEBUG
+                ErrorF("\t%s\n", ext->initDependencies[j]);
+#endif
+            }
+    }
+    tsort();
+    newList = xnfalloc((numExtensionModules + 1) * sizeof(ExtensionModule));
+    i = 0;
+    for (node = sorted; node; node = node->n_next) {
+        for (j = 0; j < numExtensionModules; j++)
+            if (!strcmp(node->n_name, ExtensionModuleList[j].name))
+                break;
+        if (j != numExtensionModules)
+            newList[i++] = ExtensionModuleList[j];
+    }
+    if (sorted)
+        free_nodes(sorted);
+    if (graph)
+        free_nodes(graph);
+    newList[i].name = NULL;
+    free(ExtensionModuleList);
+    ExtensionModuleList = newList;
+#ifdef DEBUG
+    for (i = 0; ExtensionModuleList[i].name; i++)
+        ErrorF("Extension %s\n", ExtensionModuleList[i].name);
+#endif
+}
diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 5b9c11950..c6b559072 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -74,16 +74,15 @@ typedef struct _pattern {
 } PatternRec, *PatternPtr;
 
 /* Prototypes for static functions */
-static char *FindModule(const char *, const char *, const char **,
-			PatternPtr);
+static char *FindModule(const char *, const char *, const char **, PatternPtr);
 static Bool CheckVersion(const char *, XF86ModuleVersionInfo *,
-			 const XF86ModReqInfo *);
+                         const XF86ModReqInfo *);
 static void UnloadModuleOrDriver(ModuleDescPtr mod);
 static char *LoaderGetCanonicalName(const char *, PatternPtr);
 static void RemoveChild(ModuleDescPtr);
 static ModuleDescPtr doLoadModule(const char *, const char *, const char **,
-				  const char **, pointer,
-				  const XF86ModReqInfo *, int *, int *);
+                                  const char **, pointer,
+                                  const XF86ModReqInfo *, int *, int *);
 
 const ModuleVersions LoaderVersionInfo = {
     XORG_VERSION_CURRENT,
@@ -94,7 +93,7 @@ const ModuleVersions LoaderVersionInfo = {
     ABI_FONT_VERSION
 };
 
-static int ModuleDuplicated[] = {};
+static int ModuleDuplicated[] = { };
 
 static void
 FreeStringList(char **paths)
@@ -102,10 +101,10 @@ FreeStringList(char **paths)
     char **p;
 
     if (!paths)
-	return;
+        return;
 
     for (p = paths; *p; p++)
-	free(*p);
+        free(*p);
 
     free(paths);
 }
@@ -116,7 +115,7 @@ static Bool
 PathIsAbsolute(const char *path)
 {
     return *path == '/';
-}	
+}
 
 /*
  * Convert a comma-separated path into a NULL-terminated array of path
@@ -134,46 +133,45 @@ InitPathList(const char *path)
     int n = 0;
 
     if (!path)
-	return defaultPathList;
+        return defaultPathList;
 
     fullpath = strdup(path);
     if (!fullpath)
-	return NULL;
+        return NULL;
     elem = strtok(fullpath, ",");
     while (elem) {
-	if (PathIsAbsolute(elem))
-	{
-	    len = strlen(elem);
-	    addslash = (elem[len - 1] != '/');
-	    if (addslash)
-		len++;
-	    save = list;
-	    list = realloc(list, (n + 2) * sizeof(char *));
-	    if (!list) {
-		if (save) {
-		    save[n] = NULL;
-		    FreeStringList(save);
-		}
-		free(fullpath);
-		return NULL;
-	    }
-	    list[n] = malloc(len + 1);
-	    if (!list[n]) {
-		FreeStringList(list);
-		free(fullpath);
-		return NULL;
-	    }
-	    strcpy(list[n], elem);
-	    if (addslash) {
-		list[n][len - 1] = '/';
-		list[n][len] = '\0';
-	    }
-	    n++;
-	}
-	elem = strtok(NULL, ",");
+        if (PathIsAbsolute(elem)) {
+            len = strlen(elem);
+            addslash = (elem[len - 1] != '/');
+            if (addslash)
+                len++;
+            save = list;
+            list = realloc(list, (n + 2) * sizeof(char *));
+            if (!list) {
+                if (save) {
+                    save[n] = NULL;
+                    FreeStringList(save);
+                }
+                free(fullpath);
+                return NULL;
+            }
+            list[n] = malloc(len + 1);
+            if (!list[n]) {
+                FreeStringList(list);
+                free(fullpath);
+                return NULL;
+            }
+            strcpy(list[n], elem);
+            if (addslash) {
+                list[n][len - 1] = '/';
+                list[n][len] = '\0';
+            }
+            n++;
+        }
+        elem = strtok(NULL, ",");
     }
     if (list)
-	list[n] = NULL;
+        list[n] = NULL;
     free(fullpath);
     return list;
 }
@@ -182,14 +180,14 @@ static void
 FreePathList(char **pathlist)
 {
     if (pathlist && pathlist != defaultPathList)
-	FreeStringList(pathlist);
+        FreeStringList(pathlist);
 }
 
 void
 LoaderSetPath(const char *path)
 {
     if (!path)
-	return;
+        return;
 
     defaultPathList = InitPathList(path);
 }
@@ -231,43 +229,45 @@ InitPatterns(const char **patternlist)
     const char **s;
 
     if (firstTime) {
-	/* precompile stdPatterns */
-	firstTime = 0;
-	for (p = stdPatterns; p->pattern; p++)
-	    if ((e = regcomp(&p->rex, p->pattern, REG_EXTENDED)) != 0) {
-		regerror(e, &p->rex, errmsg, sizeof(errmsg));
-		FatalError("InitPatterns: regcomp error for `%s': %s\n",
-			   p->pattern, errmsg);
-	    }
+        /* precompile stdPatterns */
+        firstTime = 0;
+        for (p = stdPatterns; p->pattern; p++)
+            if ((e = regcomp(&p->rex, p->pattern, REG_EXTENDED)) != 0) {
+                regerror(e, &p->rex, errmsg, sizeof(errmsg));
+                FatalError("InitPatterns: regcomp error for `%s': %s\n",
+                           p->pattern, errmsg);
+            }
     }
 
     if (patternlist) {
-	for (i = 0, s = patternlist; *s; i++, s++)
-	    if (*s == DEFAULT_LIST)
-		i += sizeof(stdPatterns) / sizeof(stdPatterns[0]) - 1 - 1;
-	patterns = malloc((i + 1) * sizeof(PatternRec));
-	if (!patterns) {
-	    return NULL;
-	}
-	for (i = 0, s = patternlist; *s; i++, s++)
-	    if (*s != DEFAULT_LIST) {
-		p = patterns + i;
-		p->pattern = *s;
-		if ((e = regcomp(&p->rex, p->pattern, REG_EXTENDED)) != 0) {
-		    regerror(e, &p->rex, errmsg, sizeof(errmsg));
-		    ErrorF("InitPatterns: regcomp error for `%s': %s\n",
-			   p->pattern, errmsg);
-		    i--;
-		}
-	    } else {
-		for (p = stdPatterns; p->pattern; p++, i++)
-		    patterns[i] = *p;
-		if (p != stdPatterns)
-		    i--;
-	    }
-	patterns[i].pattern = NULL;
-    } else
-	patterns = stdPatterns;
+        for (i = 0, s = patternlist; *s; i++, s++)
+            if (*s == DEFAULT_LIST)
+                i += sizeof(stdPatterns) / sizeof(stdPatterns[0]) - 1 - 1;
+        patterns = malloc((i + 1) * sizeof(PatternRec));
+        if (!patterns) {
+            return NULL;
+        }
+        for (i = 0, s = patternlist; *s; i++, s++)
+            if (*s != DEFAULT_LIST) {
+                p = patterns + i;
+                p->pattern = *s;
+                if ((e = regcomp(&p->rex, p->pattern, REG_EXTENDED)) != 0) {
+                    regerror(e, &p->rex, errmsg, sizeof(errmsg));
+                    ErrorF("InitPatterns: regcomp error for `%s': %s\n",
+                           p->pattern, errmsg);
+                    i--;
+                }
+            }
+            else {
+                for (p = stdPatterns; p->pattern; p++, i++)
+                    patterns[i] = *p;
+                if (p != stdPatterns)
+                    i--;
+            }
+        patterns[i].pattern = NULL;
+    }
+    else
+        patterns = stdPatterns;
     return patterns;
 }
 
@@ -275,7 +275,7 @@ static void
 FreePatterns(PatternPtr patterns)
 {
     if (patterns && patterns != stdPatterns)
-	free(patterns);
+        free(patterns);
 }
 
 static const char **
@@ -291,82 +291,84 @@ InitSubdirs(const char **subdirlist)
     Bool indefault;
 
     if (subdirlist == NULL) {
-	subdirlist = tmp_subdirlist = malloc(2 * sizeof(char *));
-	if (subdirlist == NULL)
-	    return NULL;
-	subdirlist[0] = DEFAULT_LIST;
-	subdirlist[1] = NULL;
+        subdirlist = tmp_subdirlist = malloc(2 * sizeof(char *));
+        if (subdirlist == NULL)
+            return NULL;
+        subdirlist[0] = DEFAULT_LIST;
+        subdirlist[1] = NULL;
     }
 
     LoaderGetOS(&osname, NULL, NULL, NULL);
     oslen = strlen(osname);
 
     {
-	/* Count number of entries and check for invalid paths */
-	for (i = 0, s = subdirlist; *s; i++, s++) {
-	    if (*s == DEFAULT_LIST) {
-		i += sizeof(stdSubdirs) / sizeof(stdSubdirs[0]) - 1 - 1;
-	    } else {
-		/*
-		 * Path validity check.  Don't allow absolute paths, or
-		 * paths containing "..".  To catch absolute paths on
-		 * platforms that use driver letters, don't allow the ':'
-		 * character to appear at all.
-		 */
-		if (**s == '/' || **s == '\\' || strchr(*s, ':') ||
-		    strstr(*s, "..")) {
-		    xf86Msg(X_ERROR, "InitSubdirs: Bad subdir: \"%s\"\n", *s);
-		    free(tmp_subdirlist);
-		    return NULL;
-		}
-	    }
-	}
-	subdirs = malloc((i * 2 + 1) * sizeof(char *));
-	if (!subdirs) {
-	    free(tmp_subdirlist);
-	    return NULL;
-	}
-	i = 0;
-	s = subdirlist;
-	indefault = FALSE;
-	while (*s) {
-	    if (*s == DEFAULT_LIST) {
-		/* Divert to the default list */
-		indefault = TRUE;
-		stmp = ++s;
-		s = stdSubdirs;
-	    }
-	    len = strlen(*s);
-	    if (**s && (*s)[len - 1] != '/') {
-		slash = "/";
-		len++;
-	    } else
-		slash = "";
-	    len += oslen + 2;
-	    if (!(subdirs[i] = malloc(len))) {
-		while (--i >= 0)
-		    free(subdirs[i]);
-		free(subdirs);
-		free(tmp_subdirlist);
-		return NULL;
-	    }
-	    /* tack on the OS name */
-	    sprintf(subdirs[i], "%s%s%s/", *s, slash, osname);
-	    i++;
-	    /* path as given */
-	    subdirs[i] = strdup(*s);
-	    i++;
-	    s++;
-	    if (indefault && !s) {
-		/* revert back to the main list */
-		indefault = FALSE;
-		s = stmp;
-	    }
-	}
-	subdirs[i] = NULL;
+        /* Count number of entries and check for invalid paths */
+        for (i = 0, s = subdirlist; *s; i++, s++) {
+            if (*s == DEFAULT_LIST) {
+                i += sizeof(stdSubdirs) / sizeof(stdSubdirs[0]) - 1 - 1;
+            }
+            else {
+                /*
+                 * Path validity check.  Don't allow absolute paths, or
+                 * paths containing "..".  To catch absolute paths on
+                 * platforms that use driver letters, don't allow the ':'
+                 * character to appear at all.
+                 */
+                if (**s == '/' || **s == '\\' || strchr(*s, ':') ||
+                    strstr(*s, "..")) {
+                    xf86Msg(X_ERROR, "InitSubdirs: Bad subdir: \"%s\"\n", *s);
+                    free(tmp_subdirlist);
+                    return NULL;
+                }
+            }
+        }
+        subdirs = malloc((i * 2 + 1) * sizeof(char *));
+        if (!subdirs) {
+            free(tmp_subdirlist);
+            return NULL;
+        }
+        i = 0;
+        s = subdirlist;
+        indefault = FALSE;
+        while (*s) {
+            if (*s == DEFAULT_LIST) {
+                /* Divert to the default list */
+                indefault = TRUE;
+                stmp = ++s;
+                s = stdSubdirs;
+            }
+            len = strlen(*s);
+            if (**s && (*s)[len - 1] != '/') {
+                slash = "/";
+                len++;
+            }
+            else
+                slash = "";
+            len += oslen + 2;
+            if (!(subdirs[i] = malloc(len))) {
+                while (--i >= 0)
+                    free(subdirs[i]);
+                free(subdirs);
+                free(tmp_subdirlist);
+                return NULL;
+            }
+            /* tack on the OS name */
+            sprintf(subdirs[i], "%s%s%s/", *s, slash, osname);
+            i++;
+            /* path as given */
+            subdirs[i] = strdup(*s);
+            i++;
+            s++;
+            if (indefault && !s) {
+                /* revert back to the main list */
+                indefault = FALSE;
+                s = stmp;
+            }
+        }
+        subdirs[i] = NULL;
     }
     free(tmp_subdirlist);
-    return (const char **)subdirs;
+    return (const char **) subdirs;
 }
 
 static void
@@ -375,9 +377,9 @@ FreeSubdirs(const char **subdirs)
     const char **s;
 
     if (subdirs) {
-	for (s = subdirs; *s; s++)
-	    free((char *)*s);
-	free(subdirs);
+        for (s = subdirs; *s; s++)
+            free((char *) *s);
+        free(subdirs);
     }
 }
 
@@ -397,44 +399,44 @@ FindModuleInSubdir(const char *dirpath, const char *module)
         if (direntry->d_name[0] == '.')
             continue;
         snprintf(tmpBuf, PATH_MAX, "%s%s/", dirpath, direntry->d_name);
-	/* the stat with the appended / fails for normal files,
-	   and works for sub dirs fine, looks a bit strange in strace
-	   but does seem to work */
+        /* the stat with the appended / fails for normal files,
+           and works for sub dirs fine, looks a bit strange in strace
+           but does seem to work */
         if ((stat(tmpBuf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
             if ((ret = FindModuleInSubdir(tmpBuf, module)))
                 break;
             continue;
         }
- 
+
         snprintf(tmpBuf, PATH_MAX, "lib%s.so", module);
         if (strcmp(direntry->d_name, tmpBuf) == 0) {
             if (asprintf(&ret, "%s%s", dirpath, tmpBuf) == -1)
-		ret = NULL;
+                ret = NULL;
             break;
         }
 
         snprintf(tmpBuf, PATH_MAX, "%s_drv.so", module);
         if (strcmp(direntry->d_name, tmpBuf) == 0) {
             if (asprintf(&ret, "%s%s", dirpath, tmpBuf) == -1)
-		ret = NULL;
+                ret = NULL;
             break;
         }
 
         snprintf(tmpBuf, PATH_MAX, "%s.so", module);
         if (strcmp(direntry->d_name, tmpBuf) == 0) {
             if (asprintf(&ret, "%s%s", dirpath, tmpBuf) == -1)
-		ret = NULL;
+                ret = NULL;
             break;
         }
     }
-    
+
     closedir(dir);
     return ret;
 }
 
 static char *
 FindModule(const char *module, const char *dirname, const char **subdirlist,
-	   PatternPtr patterns)
+           PatternPtr patterns)
 {
     char buf[PATH_MAX + 1];
     char *name = NULL;
@@ -442,17 +444,17 @@ FindModule(const char *module, const char *dirname, const char **subdirlist,
     const char **s;
 
     if (strlen(dirname) > PATH_MAX)
-	return NULL;
-    
+        return NULL;
+
     subdirs = InitSubdirs(subdirlist);
     if (!subdirs)
-	return NULL;
+        return NULL;
 
     for (s = subdirs; *s; s++) {
-	if ((strlen(dirname) + strlen(*s)) > PATH_MAX)
-	    continue;
-	strcpy(buf, dirname);
-	strcat(buf, *s);
+        if ((strlen(dirname) + strlen(*s)) > PATH_MAX)
+            continue;
+        strcpy(buf, dirname);
+        strcat(buf, *s);
         if ((name = FindModuleInSubdir(buf, module)))
             break;
     }
@@ -484,70 +486,70 @@ LoaderListDirs(const char **subdirlist, const char **patternlist)
     int n = 0;
 
     if (!(pathlist = InitPathList(NULL)))
-	return NULL;
+        return NULL;
     if (!(subdirs = InitSubdirs(subdirlist)))
-	goto bail;
+        goto bail;
     if (!(patterns = InitPatterns(patternlist)))
-	goto bail;
+        goto bail;
 
     for (elem = pathlist; *elem; elem++) {
-	for (s = subdirs; *s; s++) {
-	    if ((dirlen = strlen(*elem) + strlen(*s)) > PATH_MAX)
-		continue;
-	    strcpy(buf, *elem);
-	    strcat(buf, *s);
-	    fp = buf + dirlen;
-	    if (stat(buf, &stat_buf) == 0 && S_ISDIR(stat_buf.st_mode) &&
-		(d = opendir(buf))) {
-		if (buf[dirlen - 1] != '/') {
-		    buf[dirlen++] = '/';
-		    fp++;
-		}
-		while ((dp = readdir(d))) {
-		    if (dirlen + strlen(dp->d_name) > PATH_MAX)
-			continue;
-		    strcpy(fp, dp->d_name);
-		    if (!(stat(buf, &stat_buf) == 0 &&
-			  S_ISREG(stat_buf.st_mode)))
-			continue;
-		    for (p = patterns; p->pattern; p++) {
-			if (regexec(&p->rex, dp->d_name, 2, match, 0) == 0 &&
-			    match[1].rm_so != -1) {
-			    len = match[1].rm_eo - match[1].rm_so;
-			    save = listing;
-			    listing = realloc(listing,
-					       (n + 2) * sizeof(char *));
-			    if (!listing) {
-				if (save) {
-				    save[n] = NULL;
-				    FreeStringList(save);
-				}
-				closedir(d);
-				goto bail;
-			    }
-			    listing[n] = malloc(len + 1);
-			    if (!listing[n]) {
-				FreeStringList(listing);
-				closedir(d);
-				goto bail;
-			    }
-			    strncpy(listing[n], dp->d_name + match[1].rm_so,
-				    len);
-			    listing[n][len] = '\0';
-			    n++;
-			    break;
-			}
-		    }
-		}
-		closedir(d);
-	    }
-	}
+        for (s = subdirs; *s; s++) {
+            if ((dirlen = strlen(*elem) + strlen(*s)) > PATH_MAX)
+                continue;
+            strcpy(buf, *elem);
+            strcat(buf, *s);
+            fp = buf + dirlen;
+            if (stat(buf, &stat_buf) == 0 && S_ISDIR(stat_buf.st_mode) &&
+                (d = opendir(buf))) {
+                if (buf[dirlen - 1] != '/') {
+                    buf[dirlen++] = '/';
+                    fp++;
+                }
+                while ((dp = readdir(d))) {
+                    if (dirlen + strlen(dp->d_name) > PATH_MAX)
+                        continue;
+                    strcpy(fp, dp->d_name);
+                    if (!(stat(buf, &stat_buf) == 0 &&
+                          S_ISREG(stat_buf.st_mode)))
+                        continue;
+                    for (p = patterns; p->pattern; p++) {
+                        if (regexec(&p->rex, dp->d_name, 2, match, 0) == 0 &&
+                            match[1].rm_so != -1) {
+                            len = match[1].rm_eo - match[1].rm_so;
+                            save = listing;
+                            listing = realloc(listing,
+                                              (n + 2) * sizeof(char *));
+                            if (!listing) {
+                                if (save) {
+                                    save[n] = NULL;
+                                    FreeStringList(save);
+                                }
+                                closedir(d);
+                                goto bail;
+                            }
+                            listing[n] = malloc(len + 1);
+                            if (!listing[n]) {
+                                FreeStringList(listing);
+                                closedir(d);
+                                goto bail;
+                            }
+                            strncpy(listing[n], dp->d_name + match[1].rm_so,
+                                    len);
+                            listing[n][len] = '\0';
+                            n++;
+                            break;
+                        }
+                    }
+                }
+                closedir(d);
+            }
+        }
     }
     if (listing)
-	listing[n] = NULL;
+        listing[n] = NULL;
     ret = listing;
 
-bail:
+ bail:
     FreePatterns(patterns);
     FreeSubdirs(subdirs);
     FreePathList(pathlist);
@@ -562,7 +564,7 @@ LoaderFreeDirList(char **list)
 
 static Bool
 CheckVersion(const char *module, XF86ModuleVersionInfo * data,
-	     const XF86ModReqInfo * req)
+             const XF86ModReqInfo * req)
 {
     int vercode[4];
     char verstr[4];
@@ -570,8 +572,8 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
     MessageType errtype;
 
     xf86Msg(X_INFO, "Module %s: vendor=\"%s\"\n",
-	    data->modname ? data->modname : "UNKNOWN!",
-	    data->vendor ? data->vendor : "UNKNOWN!");
+            data->modname ? data->modname : "UNKNOWN!",
+            data->vendor ? data->vendor : "UNKNOWN!");
 
     /* Check for the different scheme used in XFree86 4.0.x releases:
      * ((((((((major << 7) | minor) << 7) | subminor) << 5) | beta) << 5) | alpha)
@@ -579,152 +581,157 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
      * range, which limits the overlap with the new version scheme to conflicts
      * with 6.71.8.764 through 6.72.39.934.
      */
-    if ((ver > (4 << 24)) && (ver < ( (4 << 24) + (1 << 17)))) {
-	/* 4.0.x and earlier */
-	verstr[1] = verstr[3] = 0;
-	verstr[2] = (ver & 0x1f) ? (ver & 0x1f) + 'a' - 1 : 0;
-	ver >>= 5;
-	verstr[0] = (ver & 0x1f) ? (ver & 0x1f) + 'A' - 1 : 0;
-	ver >>= 5;
-	vercode[2] = ver & 0x7f;
-	ver >>= 7;
-	vercode[1] = ver & 0x7f;
-	ver >>= 7;
-	vercode[0] = ver;
-	xf86ErrorF("\tcompiled for %d.%d", vercode[0], vercode[1]);
-	if (vercode[2] != 0)
-	    xf86ErrorF(".%d", vercode[2]);
-	xf86ErrorF("%s%s, module version = %d.%d.%d\n", verstr, verstr + 2,
-		   data->majorversion, data->minorversion, data->patchlevel);
-    } else {
-	vercode[0] = ver / 10000000;
-	vercode[1] = (ver / 100000) % 100;
-	vercode[2] = (ver / 1000) % 100;
-	vercode[3] = ver % 1000;
-	xf86ErrorF("\tcompiled for %d.%d.%d", vercode[0], vercode[1],
-		   vercode[2]);
-	if (vercode[3] != 0)
-	    xf86ErrorF(".%d", vercode[3]);
-	xf86ErrorF(", module version = %d.%d.%d\n", data->majorversion,
-		   data->minorversion, data->patchlevel);
+    if ((ver > (4 << 24)) && (ver < ((4 << 24) + (1 << 17)))) {
+        /* 4.0.x and earlier */
+        verstr[1] = verstr[3] = 0;
+        verstr[2] = (ver & 0x1f) ? (ver & 0x1f) + 'a' - 1 : 0;
+        ver >>= 5;
+        verstr[0] = (ver & 0x1f) ? (ver & 0x1f) + 'A' - 1 : 0;
+        ver >>= 5;
+        vercode[2] = ver & 0x7f;
+        ver >>= 7;
+        vercode[1] = ver & 0x7f;
+        ver >>= 7;
+        vercode[0] = ver;
+        xf86ErrorF("\tcompiled for %d.%d", vercode[0], vercode[1]);
+        if (vercode[2] != 0)
+            xf86ErrorF(".%d", vercode[2]);
+        xf86ErrorF("%s%s, module version = %d.%d.%d\n", verstr, verstr + 2,
+                   data->majorversion, data->minorversion, data->patchlevel);
+    }
+    else {
+        vercode[0] = ver / 10000000;
+        vercode[1] = (ver / 100000) % 100;
+        vercode[2] = (ver / 1000) % 100;
+        vercode[3] = ver % 1000;
+        xf86ErrorF("\tcompiled for %d.%d.%d", vercode[0], vercode[1],
+                   vercode[2]);
+        if (vercode[3] != 0)
+            xf86ErrorF(".%d", vercode[3]);
+        xf86ErrorF(", module version = %d.%d.%d\n", data->majorversion,
+                   data->minorversion, data->patchlevel);
     }
 
     if (data->moduleclass)
-	xf86ErrorFVerb(2, "\tModule class: %s\n", data->moduleclass);
+        xf86ErrorFVerb(2, "\tModule class: %s\n", data->moduleclass);
 
     ver = -1;
     if (data->abiclass) {
-	int abimaj, abimin;
-	int vermaj, vermin;
-
-	if (!strcmp(data->abiclass, ABI_CLASS_ANSIC))
-	    ver = LoaderVersionInfo.ansicVersion;
-	else if (!strcmp(data->abiclass, ABI_CLASS_VIDEODRV))
-	    ver = LoaderVersionInfo.videodrvVersion;
-	else if (!strcmp(data->abiclass, ABI_CLASS_XINPUT))
-	    ver = LoaderVersionInfo.xinputVersion;
-	else if (!strcmp(data->abiclass, ABI_CLASS_EXTENSION))
-	    ver = LoaderVersionInfo.extensionVersion;
-	else if (!strcmp(data->abiclass, ABI_CLASS_FONT))
-	    ver = LoaderVersionInfo.fontVersion;
-
-	abimaj = GET_ABI_MAJOR(data->abiversion);
-	abimin = GET_ABI_MINOR(data->abiversion);
-	xf86ErrorFVerb(2, "\tABI class: %s, version %d.%d\n",
-		       data->abiclass, abimaj, abimin);
-	if (ver != -1) {
-	    vermaj = GET_ABI_MAJOR(ver);
-	    vermin = GET_ABI_MINOR(ver);
-	    if (abimaj != vermaj) {
-		if (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL)
-		    errtype = X_WARNING;
-		else
-		    errtype = X_ERROR;
-		xf86MsgVerb(errtype, 0,
-			    "module ABI major version (%d) doesn't"
-			    " match the server's version (%d)\n",
-			    abimaj, vermaj);
-		if (!(LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL))
-		    return FALSE;
-	    } else if (abimin > vermin) {
-		if (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL)
-		    errtype = X_WARNING;
-		else
-		    errtype = X_ERROR;
-		xf86MsgVerb(errtype, 0,
-			    "module ABI minor version (%d) is "
-			    "newer than the server's version "
-			    "(%d)\n", abimin, vermin);
-		if (!(LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL))
-		    return FALSE;
-	    }
-	}
+        int abimaj, abimin;
+        int vermaj, vermin;
+
+        if (!strcmp(data->abiclass, ABI_CLASS_ANSIC))
+            ver = LoaderVersionInfo.ansicVersion;
+        else if (!strcmp(data->abiclass, ABI_CLASS_VIDEODRV))
+            ver = LoaderVersionInfo.videodrvVersion;
+        else if (!strcmp(data->abiclass, ABI_CLASS_XINPUT))
+            ver = LoaderVersionInfo.xinputVersion;
+        else if (!strcmp(data->abiclass, ABI_CLASS_EXTENSION))
+            ver = LoaderVersionInfo.extensionVersion;
+        else if (!strcmp(data->abiclass, ABI_CLASS_FONT))
+            ver = LoaderVersionInfo.fontVersion;
+
+        abimaj = GET_ABI_MAJOR(data->abiversion);
+        abimin = GET_ABI_MINOR(data->abiversion);
+        xf86ErrorFVerb(2, "\tABI class: %s, version %d.%d\n",
+                       data->abiclass, abimaj, abimin);
+        if (ver != -1) {
+            vermaj = GET_ABI_MAJOR(ver);
+            vermin = GET_ABI_MINOR(ver);
+            if (abimaj != vermaj) {
+                if (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL)
+                    errtype = X_WARNING;
+                else
+                    errtype = X_ERROR;
+                xf86MsgVerb(errtype, 0,
+                            "module ABI major version (%d) doesn't"
+                            " match the server's version (%d)\n",
+                            abimaj, vermaj);
+                if (!(LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL))
+                    return FALSE;
+            }
+            else if (abimin > vermin) {
+                if (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL)
+                    errtype = X_WARNING;
+                else
+                    errtype = X_ERROR;
+                xf86MsgVerb(errtype, 0,
+                            "module ABI minor version (%d) is "
+                            "newer than the server's version "
+                            "(%d)\n", abimin, vermin);
+                if (!(LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL))
+                    return FALSE;
+            }
+        }
     }
 
     /* Check against requirements that the caller has specified */
     if (req) {
-	if (req->majorversion != MAJOR_UNSPEC) {
-	    if (data->majorversion != req->majorversion) {
-		xf86MsgVerb(X_WARNING, 2, "module major version (%d) "
-			    "doesn't match required major version (%d)\n",
-			    data->majorversion, req->majorversion);
-		return FALSE;
-	    } else if (req->minorversion != MINOR_UNSPEC) {
-		if (data->minorversion < req->minorversion) {
-		    xf86MsgVerb(X_WARNING, 2, "module minor version (%d) "
-				"is less than the required minor version (%d)\n",
-				data->minorversion, req->minorversion);
-		    return FALSE;
-		} else if (data->minorversion == req->minorversion &&
-			   req->patchlevel != PATCH_UNSPEC) {
-		    if (data->patchlevel < req->patchlevel) {
-			xf86MsgVerb(X_WARNING, 2, "module patch level (%d) "
-				    "is less than the required patch level (%d)\n",
-				    data->patchlevel, req->patchlevel);
-			return FALSE;
-		    }
-		}
-	    }
-	}
-	if (req->moduleclass) {
-	    if (!data->moduleclass ||
-		strcmp(req->moduleclass, data->moduleclass)) {
-		xf86MsgVerb(X_WARNING, 2, "Module class (%s) doesn't match "
-			    "the required class (%s)\n",
-			    data->moduleclass ? data->moduleclass : "<NONE>",
-			    req->moduleclass);
-		return FALSE;
-	    }
-	} else if (req->abiclass != ABI_CLASS_NONE) {
-	    if (!data->abiclass || strcmp(req->abiclass, data->abiclass)) {
-		xf86MsgVerb(X_WARNING, 2, "ABI class (%s) doesn't match the "
-			    "required ABI class (%s)\n",
-			    data->abiclass ? data->abiclass : "<NONE>",
-			    req->abiclass);
-		return FALSE;
-	    }
-	}
-	if ((req->abiclass != ABI_CLASS_NONE) &&
-	    req->abiversion != ABI_VERS_UNSPEC) {
-	    int reqmaj, reqmin, maj, min;
-
-	    reqmaj = GET_ABI_MAJOR(req->abiversion);
-	    reqmin = GET_ABI_MINOR(req->abiversion);
-	    maj = GET_ABI_MAJOR(data->abiversion);
-	    min = GET_ABI_MINOR(data->abiversion);
-	    if (maj != reqmaj) {
-		xf86MsgVerb(X_WARNING, 2, "ABI major version (%d) doesn't "
-			    "match the required ABI major version (%d)\n",
-			    maj, reqmaj);
-		return FALSE;
-	    }
-	    /* XXX Maybe this should be the other way around? */
-	    if (min > reqmin) {
-		xf86MsgVerb(X_WARNING, 2, "module ABI minor version (%d) "
-			    "is newer than that available (%d)\n", min, reqmin);
-		return FALSE;
-	    }
-	}
+        if (req->majorversion != MAJOR_UNSPEC) {
+            if (data->majorversion != req->majorversion) {
+                xf86MsgVerb(X_WARNING, 2, "module major version (%d) "
+                            "doesn't match required major version (%d)\n",
+                            data->majorversion, req->majorversion);
+                return FALSE;
+            }
+            else if (req->minorversion != MINOR_UNSPEC) {
+                if (data->minorversion < req->minorversion) {
+                    xf86MsgVerb(X_WARNING, 2, "module minor version (%d) "
+                                "is less than the required minor version (%d)\n",
+                                data->minorversion, req->minorversion);
+                    return FALSE;
+                }
+                else if (data->minorversion == req->minorversion &&
+                         req->patchlevel != PATCH_UNSPEC) {
+                    if (data->patchlevel < req->patchlevel) {
+                        xf86MsgVerb(X_WARNING, 2, "module patch level (%d) "
+                                    "is less than the required patch level (%d)\n",
+                                    data->patchlevel, req->patchlevel);
+                        return FALSE;
+                    }
+                }
+            }
+        }
+        if (req->moduleclass) {
+            if (!data->moduleclass ||
+                strcmp(req->moduleclass, data->moduleclass)) {
+                xf86MsgVerb(X_WARNING, 2, "Module class (%s) doesn't match "
+                            "the required class (%s)\n",
+                            data->moduleclass ? data->moduleclass : "<NONE>",
+                            req->moduleclass);
+                return FALSE;
+            }
+        }
+        else if (req->abiclass != ABI_CLASS_NONE) {
+            if (!data->abiclass || strcmp(req->abiclass, data->abiclass)) {
+                xf86MsgVerb(X_WARNING, 2, "ABI class (%s) doesn't match the "
+                            "required ABI class (%s)\n",
+                            data->abiclass ? data->abiclass : "<NONE>",
+                            req->abiclass);
+                return FALSE;
+            }
+        }
+        if ((req->abiclass != ABI_CLASS_NONE) &&
+            req->abiversion != ABI_VERS_UNSPEC) {
+            int reqmaj, reqmin, maj, min;
+
+            reqmaj = GET_ABI_MAJOR(req->abiversion);
+            reqmin = GET_ABI_MINOR(req->abiversion);
+            maj = GET_ABI_MAJOR(data->abiversion);
+            min = GET_ABI_MINOR(data->abiversion);
+            if (maj != reqmaj) {
+                xf86MsgVerb(X_WARNING, 2, "ABI major version (%d) doesn't "
+                            "match the required ABI major version (%d)\n",
+                            maj, reqmaj);
+                return FALSE;
+            }
+            /* XXX Maybe this should be the other way around? */
+            if (min > reqmin) {
+                xf86MsgVerb(X_WARNING, 2, "module ABI minor version (%d) "
+                            "is newer than that available (%d)\n", min, reqmin);
+                return FALSE;
+            }
+        }
     }
     return TRUE;
 }
@@ -738,31 +745,31 @@ AddSibling(ModuleDescPtr head, ModuleDescPtr new)
 
 pointer
 LoadSubModule(pointer _parent, const char *module,
-	      const char **subdirlist, const char **patternlist,
-	      pointer options, const XF86ModReqInfo * modreq,
-	      int *errmaj, int *errmin)
+              const char **subdirlist, const char **patternlist,
+              pointer options, const XF86ModReqInfo * modreq,
+              int *errmaj, int *errmin)
 {
     ModuleDescPtr submod;
-    ModuleDescPtr parent = (ModuleDescPtr)_parent;
+    ModuleDescPtr parent = (ModuleDescPtr) _parent;
 
     xf86MsgVerb(X_INFO, 3, "Loading sub module \"%s\"\n", module);
 
     if (PathIsAbsolute(module)) {
-	xf86Msg(X_ERROR,
-		"LoadSubModule: Absolute module path not permitted: \"%s\"\n",
-		module);
-	if (errmaj)
-	    *errmaj = LDR_BADUSAGE;
-	if (errmin)
-	    *errmin = 0;
-	return NULL;
+        xf86Msg(X_ERROR,
+                "LoadSubModule: Absolute module path not permitted: \"%s\"\n",
+                module);
+        if (errmaj)
+            *errmaj = LDR_BADUSAGE;
+        if (errmin)
+            *errmin = 0;
+        return NULL;
     }
 
     submod = doLoadModule(module, NULL, subdirlist, patternlist, options,
-			  modreq, errmaj, errmin);
+                          modreq, errmaj, errmin);
     if (submod && submod != (ModuleDescPtr) 1) {
-	parent->child = AddSibling(parent->child, submod);
-	submod->parent = parent;
+        parent->child = AddSibling(parent->child, submod);
+        submod->parent = parent;
     }
     return submod;
 }
@@ -773,7 +780,7 @@ NewModuleDesc(const char *name)
     ModuleDescPtr mdp = calloc(1, sizeof(ModuleDesc));
 
     if (mdp)
-	mdp->name = xstrdup(name);
+        mdp->name = xstrdup(name);
 
     return mdp;
 }
@@ -784,11 +791,11 @@ DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent)
     ModuleDescPtr ret;
 
     if (!mod)
-	return NULL;
+        return NULL;
 
     ret = NewModuleDesc(mod->name);
     if (ret == NULL)
-	return NULL;
+        return NULL;
 
     ret->handle = mod->handle;
 
@@ -813,9 +820,8 @@ static const char *compiled_in_modules[] = {
 
 static ModuleDescPtr
 doLoadModule(const char *module, const char *path, const char **subdirlist,
-	     const char **patternlist, pointer options,
-	     const XF86ModReqInfo * modreq,
-	     int *errmaj, int *errmin)
+             const char **patternlist, pointer options,
+             const XF86ModReqInfo * modreq, int *errmaj, int *errmin)
 {
     XF86ModuleData *initdata = NULL;
     char **pathlist = NULL;
@@ -835,48 +841,48 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
     name = LoaderGetCanonicalName(module, patterns);
     noncanonical = (name && strcmp(module, name) != 0);
     if (noncanonical) {
-	xf86ErrorFVerb(3, " (%s)\n", name);
-	xf86MsgVerb(X_WARNING, 1,
-		    "LoadModule: given non-canonical module name \"%s\"\n",
-		    module);
-	m = name;
-    } else {
-	xf86ErrorFVerb(3, "\n");
-	m = (char *)module;
+        xf86ErrorFVerb(3, " (%s)\n", name);
+        xf86MsgVerb(X_WARNING, 1,
+                    "LoadModule: given non-canonical module name \"%s\"\n",
+                    module);
+        m = name;
+    }
+    else {
+        xf86ErrorFVerb(3, "\n");
+        m = (char *) module;
     }
 
     for (cim = compiled_in_modules; *cim; cim++)
-	if (!strcmp (m, *cim))
-	{
-	    xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", m);
-	    ret = (ModuleDescPtr) 1;
-	    goto LoadModule_exit;
-	}
+        if (!strcmp(m, *cim)) {
+            xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", m);
+            ret = (ModuleDescPtr) 1;
+            goto LoadModule_exit;
+        }
 
     if (!name) {
-	if (errmaj)
-	    *errmaj = LDR_BADUSAGE;
-	if (errmin)
-	    *errmin = 0;
-	goto LoadModule_fail;
+        if (errmaj)
+            *errmaj = LDR_BADUSAGE;
+        if (errmin)
+            *errmin = 0;
+        goto LoadModule_fail;
     }
     ret = NewModuleDesc(name);
     if (!ret) {
-	if (errmaj)
-	    *errmaj = LDR_NOMEM;
-	if (errmin)
-	    *errmin = 0;
-	goto LoadModule_fail;
+        if (errmaj)
+            *errmaj = LDR_NOMEM;
+        if (errmin)
+            *errmin = 0;
+        goto LoadModule_fail;
     }
 
     pathlist = InitPathList(path);
     if (!pathlist) {
-	/* This could be a malloc failure too */
-	if (errmaj)
-	    *errmaj = LDR_BADUSAGE;
-	if (errmin)
-	    *errmin = 1;
-	goto LoadModule_fail;
+        /* This could be a malloc failure too */
+        if (errmaj)
+            *errmaj = LDR_BADUSAGE;
+        if (errmin)
+            *errmin = 1;
+        goto LoadModule_fail;
     }
 
     /* 
@@ -884,35 +890,35 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
      * check the elements in the path
      */
     if (PathIsAbsolute(module))
-	found = xstrdup(module);
+        found = xstrdup(module);
     path_elem = pathlist;
     while (!found && *path_elem != NULL) {
-	found = FindModule(m, *path_elem, subdirlist, patterns);
-	path_elem++;
-	/*
-	 * When the module name isn't the canonical name, search for the
-	 * former if no match was found for the latter.
-	 */
-	if (!*path_elem && m == name) {
-	    path_elem = pathlist;
-	    m = (char *)module;
-	}
+        found = FindModule(m, *path_elem, subdirlist, patterns);
+        path_elem++;
+        /*
+         * When the module name isn't the canonical name, search for the
+         * former if no match was found for the latter.
+         */
+        if (!*path_elem && m == name) {
+            path_elem = pathlist;
+            m = (char *) module;
+        }
     }
 
     /* 
      * did we find the module?
      */
     if (!found) {
-	xf86Msg(X_WARNING, "Warning, couldn't open module %s\n", module);
-	if (errmaj)
-	    *errmaj = LDR_NOENT;
-	if (errmin)
-	    *errmin = 0;
-	goto LoadModule_fail;
+        xf86Msg(X_WARNING, "Warning, couldn't open module %s\n", module);
+        if (errmaj)
+            *errmaj = LDR_NOENT;
+        if (errmin)
+            *errmin = 0;
+        goto LoadModule_fail;
     }
     ret->handle = LoaderOpen(found, errmaj, errmin);
     if (ret->handle == NULL)
-	goto LoadModule_fail;
+        goto LoadModule_fail;
     ret->path = strdup(found);
 
     /* drop any explicit suffix from the module name */
@@ -925,22 +931,22 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
      * present.
      */
     if (asprintf(&p, "%sModuleData", name) == -1) {
-	p = NULL;
-	if (errmaj)
-	    *errmaj = LDR_NOMEM;
-	if (errmin)
-	    *errmin = 0;
-	goto LoadModule_fail;
+        p = NULL;
+        if (errmaj)
+            *errmaj = LDR_NOMEM;
+        if (errmin)
+            *errmin = 0;
+        goto LoadModule_fail;
     }
     initdata = LoaderSymbol(p);
     if (initdata) {
-	ModuleSetupProc setup;
-	ModuleTearDownProc teardown;
-	XF86ModuleVersionInfo *vers;
+        ModuleSetupProc setup;
+        ModuleTearDownProc teardown;
+        XF86ModuleVersionInfo *vers;
 
-	vers = initdata->vers;
-	setup = initdata->setup;
-	teardown = initdata->teardown;
+        vers = initdata->vers;
+        setup = initdata->setup;
+        teardown = initdata->teardown;
 
         if (vers) {
             if (!CheckVersion(module, vers, modreq)) {
@@ -950,7 +956,8 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
                     *errmin = 0;
                 goto LoadModule_fail;
             }
-        } else {
+        }
+        else {
             xf86Msg(X_ERROR,
                     "LoadModule: Module %s does not supply"
                     " version information\n", module);
@@ -960,41 +967,43 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
                 *errmin = 0;
             goto LoadModule_fail;
         }
-	if (setup)
-	    ret->SetupProc = setup;
-	if (teardown)
-	    ret->TearDownProc = teardown;
-	ret->VersionInfo = vers;
-    } else {
-	/* No initdata is OK for external modules */
-	if (options == EXTERN_MODULE)
-	    goto LoadModule_exit;
-
-	/* no initdata, fail the load */
-	xf86Msg(X_ERROR, "LoadModule: Module %s does not have a %s "
-		"data object.\n", module, p);
-	if (errmaj)
-	    *errmaj = LDR_INVALID;
-	if (errmin)
-	    *errmin = 0;
-	goto LoadModule_fail;
+        if (setup)
+            ret->SetupProc = setup;
+        if (teardown)
+            ret->TearDownProc = teardown;
+        ret->VersionInfo = vers;
+    }
+    else {
+        /* No initdata is OK for external modules */
+        if (options == EXTERN_MODULE)
+            goto LoadModule_exit;
+
+        /* no initdata, fail the load */
+        xf86Msg(X_ERROR, "LoadModule: Module %s does not have a %s "
+                "data object.\n", module, p);
+        if (errmaj)
+            *errmaj = LDR_INVALID;
+        if (errmin)
+            *errmin = 0;
+        goto LoadModule_fail;
     }
     if (ret->SetupProc) {
-	ret->TearDownData = ret->SetupProc(ret, options, errmaj, errmin);
-	if (!ret->TearDownData) {
-	    goto LoadModule_fail;
-	}
-    } else if (options) {
-	xf86Msg(X_WARNING, "Module Options present, but no SetupProc "
-		"available for %s\n", module);
+        ret->TearDownData = ret->SetupProc(ret, options, errmaj, errmin);
+        if (!ret->TearDownData) {
+            goto LoadModule_fail;
+        }
+    }
+    else if (options) {
+        xf86Msg(X_WARNING, "Module Options present, but no SetupProc "
+                "available for %s\n", module);
     }
     goto LoadModule_exit;
 
-  LoadModule_fail:
+ LoadModule_fail:
     UnloadModule(ret);
     ret = NULL;
 
-  LoadModule_exit:
+ LoadModule_exit:
     FreePathList(pathlist);
     FreePatterns(patterns);
     free(found);
@@ -1043,43 +1052,43 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
  */
 ModuleDescPtr
 LoadModule(const char *module, const char *path, const char **subdirlist,
-	   const char **patternlist, pointer options,
-	   const XF86ModReqInfo * modreq, int *errmaj, int *errmin)
+           const char **patternlist, pointer options,
+           const XF86ModReqInfo * modreq, int *errmaj, int *errmin)
 {
-  return doLoadModule(module, path, subdirlist, patternlist, options,
-		      modreq, errmaj, errmin);
+    return doLoadModule(module, path, subdirlist, patternlist, options,
+                        modreq, errmaj, errmin);
 }
 
 void
 UnloadModule(pointer mod)
 {
-    UnloadModuleOrDriver((ModuleDescPtr)mod);
+    UnloadModuleOrDriver((ModuleDescPtr) mod);
 }
 
 static void
 UnloadModuleOrDriver(ModuleDescPtr mod)
 {
     if (mod == (ModuleDescPtr) 1)
-	return;
+        return;
 
     if (mod == NULL || mod->name == NULL)
-	return;
+        return;
 
     if (mod->parent)
-	xf86MsgVerb(X_INFO, 3, "UnloadSubModule: \"%s\"\n", mod->name);
+        xf86MsgVerb(X_INFO, 3, "UnloadSubModule: \"%s\"\n", mod->name);
     else
-	xf86MsgVerb(X_INFO, 3, "UnloadModule: \"%s\"\n", mod->name);
+        xf86MsgVerb(X_INFO, 3, "UnloadModule: \"%s\"\n", mod->name);
 
     if (mod->TearDownData != ModuleDuplicated) {
-	if ((mod->TearDownProc) && (mod->TearDownData))
-	    mod->TearDownProc(mod->TearDownData);
-	LoaderUnload(mod->name, mod->handle);
+        if ((mod->TearDownProc) && (mod->TearDownData))
+            mod->TearDownProc(mod->TearDownData);
+        LoaderUnload(mod->name, mod->handle);
     }
 
     if (mod->child)
-	UnloadModuleOrDriver(mod->child);
+        UnloadModuleOrDriver(mod->child);
     if (mod->sib)
-	UnloadModuleOrDriver(mod->sib);
+        UnloadModuleOrDriver(mod->sib);
     free(mod->path);
     free(mod->name);
     free(mod);
@@ -1088,11 +1097,11 @@ UnloadModuleOrDriver(ModuleDescPtr mod)
 void
 UnloadSubModule(pointer _mod)
 {
-    ModuleDescPtr mod = (ModuleDescPtr)_mod;
+    ModuleDescPtr mod = (ModuleDescPtr) _mod;
 
     /* Some drivers are calling us on built-in submodules, ignore them */
-    if (mod == (ModuleDescPtr)1)
-	return;
+    if (mod == (ModuleDescPtr) 1)
+        return;
     RemoveChild(mod);
     UnloadModuleOrDriver(mod);
 }
@@ -1105,22 +1114,22 @@ RemoveChild(ModuleDescPtr child)
     ModuleDescPtr parent;
 
     if (!child->parent)
-	return;
+        return;
 
     parent = child->parent;
     if (parent->child == child) {
-	parent->child = child->sib;
-	return;
+        parent->child = child->sib;
+        return;
     }
 
     prevsib = parent->child;
     mdp = prevsib->sib;
     while (mdp && mdp != child) {
-	prevsib = mdp;
-	mdp = mdp->sib;
+        prevsib = mdp;
+        mdp = mdp->sib;
     }
     if (mdp == child)
-	prevsib->sib = child->sib;
+        prevsib->sib = child->sib;
     child->sib = NULL;
     return;
 }
@@ -1133,63 +1142,63 @@ LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
 
     switch (errmaj) {
     case LDR_NOERROR:
-	msg = "no error";
-	break;
+        msg = "no error";
+        break;
     case LDR_NOMEM:
-	msg = "out of memory";
-	break;
+        msg = "out of memory";
+        break;
     case LDR_NOENT:
-	msg = "module does not exist";
-	break;
+        msg = "module does not exist";
+        break;
     case LDR_NOSUBENT:
-	msg = "a required submodule could not be loaded";
-	break;
+        msg = "a required submodule could not be loaded";
+        break;
     case LDR_NOSPACE:
-	msg = "too many modules";
-	break;
+        msg = "too many modules";
+        break;
     case LDR_NOMODOPEN:
-	msg = "open failed";
-	break;
+        msg = "open failed";
+        break;
     case LDR_UNKTYPE:
-	msg = "unknown module type";
-	break;
+        msg = "unknown module type";
+        break;
     case LDR_NOLOAD:
-	msg = "loader failed";
-	break;
+        msg = "loader failed";
+        break;
     case LDR_ONCEONLY:
-	msg = "already loaded";
+        msg = "already loaded";
         type = X_INFO;
-	break;
+        break;
     case LDR_NOPORTOPEN:
-	msg = "port open failed";
-	break;
+        msg = "port open failed";
+        break;
     case LDR_NOHARDWARE:
-	msg = "no hardware found";
-	break;
+        msg = "no hardware found";
+        break;
     case LDR_MISMATCH:
-	msg = "module requirement mismatch";
-	break;
+        msg = "module requirement mismatch";
+        break;
     case LDR_BADUSAGE:
-	msg = "invalid argument(s) to LoadModule()";
-	break;
+        msg = "invalid argument(s) to LoadModule()";
+        break;
     case LDR_INVALID:
-	msg = "invalid module";
-	break;
+        msg = "invalid module";
+        break;
     case LDR_BADOS:
-	msg = "module doesn't support this OS";
-	break;
+        msg = "module doesn't support this OS";
+        break;
     case LDR_MODSPECIFIC:
-	msg = "module-specific error";
-	break;
+        msg = "module-specific error";
+        break;
     default:
-	msg = "unknown error";
+        msg = "unknown error";
     }
     if (name)
-	xf86Msg(type, "%s: Failed to load module \"%s\" (%s, %d)\n",
-		name, modname, msg, errmin);
+        xf86Msg(type, "%s: Failed to load module \"%s\" (%s, %d)\n",
+                name, modname, msg, errmin);
     else
-	xf86Msg(type, "Failed to load module \"%s\" (%s, %d)\n",
-		modname, msg, errmin);
+        xf86Msg(type, "Failed to load module \"%s\" (%s, %d)\n",
+                modname, msg, errmin);
 }
 
 /* Given a module path or file name, return the module's canonical name */
@@ -1205,21 +1214,21 @@ LoaderGetCanonicalName(const char *modname, PatternPtr patterns)
     /* Strip off any leading path */
     s = strrchr(modname, '/');
     if (s == NULL)
-	s = modname;
+        s = modname;
     else
-	s++;
+        s++;
 
     /* Find the first regex that is matched */
     for (p = patterns; p->pattern; p++)
-	if (regexec(&p->rex, s, 2, match, 0) == 0 && match[1].rm_so != -1) {
-	    len = match[1].rm_eo - match[1].rm_so;
-	    str = malloc(len + 1);
-	    if (!str)
-		return NULL;
-	    strncpy(str, s + match[1].rm_so, len);
-	    str[len] = '\0';
-	    return str;
-	}
+        if (regexec(&p->rex, s, 2, match, 0) == 0 && match[1].rm_so != -1) {
+            len = match[1].rm_eo - match[1].rm_so;
+            str = malloc(len + 1);
+            if (!str)
+                return NULL;
+            strncpy(str, s + match[1].rm_so, len);
+            str[len] = '\0';
+            return str;
+        }
 
     /* If there is no match, return the whole name minus the leading path */
     return strdup(s);
@@ -1232,9 +1241,9 @@ unsigned long
 LoaderGetModuleVersion(ModuleDescPtr mod)
 {
     if (!mod || mod == (ModuleDescPtr) 1 || !mod->VersionInfo)
-	return 0;
+        return 0;
 
     return MODULE_VERSION_NUMERIC(mod->VersionInfo->majorversion,
-				  mod->VersionInfo->minorversion,
-				  mod->VersionInfo->patchlevel);
+                                  mod->VersionInfo->minorversion,
+                                  mod->VersionInfo->patchlevel);
 }
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index da9db3460..6d5e92f12 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -55,26 +55,24 @@
 int xf86CrtcConfigPrivateIndex = -1;
 
 void
-xf86CrtcConfigInit (ScrnInfoPtr scrn,
-		    const xf86CrtcConfigFuncsRec *funcs)
+xf86CrtcConfigInit(ScrnInfoPtr scrn, const xf86CrtcConfigFuncsRec * funcs)
 {
-    xf86CrtcConfigPtr	config;
-    
+    xf86CrtcConfigPtr config;
+
     if (xf86CrtcConfigPrivateIndex == -1)
-	xf86CrtcConfigPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
-    config = xnfcalloc (1, sizeof (xf86CrtcConfigRec));
+        xf86CrtcConfigPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
+    config = xnfcalloc(1, sizeof(xf86CrtcConfigRec));
 
     config->funcs = funcs;
 
     scrn->privates[xf86CrtcConfigPrivateIndex].ptr = config;
 }
- 
+
 void
-xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
-		      int minWidth, int minHeight,
-		      int maxWidth, int maxHeight)
+xf86CrtcSetSizeRange(ScrnInfoPtr scrn,
+                     int minWidth, int minHeight, int maxWidth, int maxHeight)
 {
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
 
     config->minWidth = minWidth;
     config->minHeight = minHeight;
@@ -86,15 +84,14 @@ xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
  * Crtc functions
  */
 xf86CrtcPtr
-xf86CrtcCreate (ScrnInfoPtr		scrn,
-		const xf86CrtcFuncsRec	*funcs)
+xf86CrtcCreate(ScrnInfoPtr scrn, const xf86CrtcFuncsRec * funcs)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CrtcPtr		crtc, *crtcs;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CrtcPtr crtc, *crtcs;
 
-    crtc = calloc(sizeof (xf86CrtcRec), 1);
+    crtc = calloc(sizeof(xf86CrtcRec), 1);
     if (!crtc)
-	return NULL;
+        return NULL;
     crtc->version = XF86_CRTC_VERSION;
     crtc->scrn = scrn;
     crtc->funcs = funcs;
@@ -103,9 +100,9 @@ xf86CrtcCreate (ScrnInfoPtr		scrn,
 #endif
     crtc->rotation = RR_Rotate_0;
     crtc->desiredRotation = RR_Rotate_0;
-    pixman_transform_init_identity (&crtc->crtc_to_framebuffer);
-    pixman_f_transform_init_identity (&crtc->f_crtc_to_framebuffer);
-    pixman_f_transform_init_identity (&crtc->f_framebuffer_to_crtc);
+    pixman_transform_init_identity(&crtc->crtc_to_framebuffer);
+    pixman_f_transform_init_identity(&crtc->f_crtc_to_framebuffer);
+    pixman_f_transform_init_identity(&crtc->f_framebuffer_to_crtc);
     crtc->filter = NULL;
     crtc->params = NULL;
     crtc->nparams = 0;
@@ -114,28 +111,27 @@ xf86CrtcCreate (ScrnInfoPtr		scrn,
     crtc->transform_in_use = FALSE;
     crtc->transformPresent = FALSE;
     crtc->desiredTransformPresent = FALSE;
-    memset (&crtc->bounds, '\0', sizeof (crtc->bounds));
+    memset(&crtc->bounds, '\0', sizeof(crtc->bounds));
 
     /* Preallocate gamma at a sensible size. */
     crtc->gamma_size = 256;
-    crtc->gamma_red = malloc(3 * crtc->gamma_size * sizeof (CARD16));
+    crtc->gamma_red = malloc(3 * crtc->gamma_size * sizeof(CARD16));
     if (!crtc->gamma_red) {
-	free(crtc);
-	return NULL;
+        free(crtc);
+        return NULL;
     }
     crtc->gamma_green = crtc->gamma_red + crtc->gamma_size;
     crtc->gamma_blue = crtc->gamma_green + crtc->gamma_size;
 
     if (xf86_config->crtc)
-	crtcs = realloc(xf86_config->crtc,
-			  (xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr));
+        crtcs = realloc(xf86_config->crtc,
+                        (xf86_config->num_crtc + 1) * sizeof(xf86CrtcPtr));
     else
-	crtcs = malloc((xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr));
-    if (!crtcs)
-    {
-	free(crtc->gamma_red);
-	free(crtc);
-	return NULL;
+        crtcs = malloc((xf86_config->num_crtc + 1) * sizeof(xf86CrtcPtr));
+    if (!crtcs) {
+        free(crtc->gamma_red);
+        free(crtc);
+        return NULL;
     }
     xf86_config->crtc = crtcs;
     xf86_config->crtc[xf86_config->num_crtc++] = crtc;
@@ -143,146 +139,140 @@ xf86CrtcCreate (ScrnInfoPtr		scrn,
 }
 
 void
-xf86CrtcDestroy (xf86CrtcPtr crtc)
+xf86CrtcDestroy(xf86CrtcPtr crtc)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-    int			c;
-    
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
+    int c;
+
     (*crtc->funcs->destroy) (crtc);
     for (c = 0; c < xf86_config->num_crtc; c++)
-	if (xf86_config->crtc[c] == crtc)
-	{
-	    memmove (&xf86_config->crtc[c],
-		     &xf86_config->crtc[c+1],
-		     ((xf86_config->num_crtc - (c + 1)) * sizeof(void*)));
-	    xf86_config->num_crtc--;
-	    break;
-	}
+        if (xf86_config->crtc[c] == crtc) {
+            memmove(&xf86_config->crtc[c],
+                    &xf86_config->crtc[c + 1],
+                    ((xf86_config->num_crtc - (c + 1)) * sizeof(void *)));
+            xf86_config->num_crtc--;
+            break;
+        }
     free(crtc->params);
     free(crtc->gamma_red);
     free(crtc);
 }
 
-
 /**
  * Return whether any outputs are connected to the specified pipe
  */
 
 Bool
-xf86CrtcInUse (xf86CrtcPtr crtc)
+xf86CrtcInUse(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr		pScrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    int			o;
-    
+    ScrnInfoPtr pScrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int o;
+
     for (o = 0; o < xf86_config->num_output; o++)
-	if (xf86_config->output[o]->crtc == crtc)
-	    return TRUE;
+        if (xf86_config->output[o]->crtc == crtc)
+            return TRUE;
     return FALSE;
 }
 
 void
-xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
+xf86CrtcSetScreenSubpixelOrder(ScreenPtr pScreen)
 {
-    int			subpixel_order = SubPixelUnknown;
-    Bool		has_none = FALSE;
-    ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c, o;
+    int subpixel_order = SubPixelUnknown;
+    Bool has_none = FALSE;
+    ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c, o;
 
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-	
-	for (o = 0; o < xf86_config->num_output; o++)
-	{
-	    xf86OutputPtr   output = xf86_config->output[o];
-
-	    if (output->crtc == crtc)
-	    {
-		switch (output->subpixel_order) {
-		case SubPixelNone:
-		    has_none = TRUE;
-		    break;
-		case SubPixelUnknown:
-		    break;
-		default:
-		    subpixel_order = output->subpixel_order;
-		    break;
-		}
-	    }
-	    if (subpixel_order != SubPixelUnknown)
-		break;
-	}
-	if (subpixel_order != SubPixelUnknown)
-	{
-	    static const int circle[4] = {
-		SubPixelHorizontalRGB,
-		SubPixelVerticalRGB,
-		SubPixelHorizontalBGR,
-		SubPixelVerticalBGR,
-	    };
-	    int	rotate;
-	    int c;
-	    for (rotate = 0; rotate < 4; rotate++)
-		if (crtc->rotation & (1 << rotate))
-		    break;
-	    for (c = 0; c < 4; c++)
-		if (circle[c] == subpixel_order)
-		    break;
-	    c = (c + rotate) & 0x3;
-	    if ((crtc->rotation & RR_Reflect_X) && !(c & 1))
-		c ^= 2;
-	    if ((crtc->rotation & RR_Reflect_Y) && (c & 1))
-		c ^= 2;
-	    subpixel_order = circle[c];
-	    break;
-	}
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+        for (o = 0; o < xf86_config->num_output; o++) {
+            xf86OutputPtr output = xf86_config->output[o];
+
+            if (output->crtc == crtc) {
+                switch (output->subpixel_order) {
+                case SubPixelNone:
+                    has_none = TRUE;
+                    break;
+                case SubPixelUnknown:
+                    break;
+                default:
+                    subpixel_order = output->subpixel_order;
+                    break;
+                }
+            }
+            if (subpixel_order != SubPixelUnknown)
+                break;
+        }
+        if (subpixel_order != SubPixelUnknown) {
+            static const int circle[4] = {
+                SubPixelHorizontalRGB,
+                SubPixelVerticalRGB,
+                SubPixelHorizontalBGR,
+                SubPixelVerticalBGR,
+            };
+            int rotate;
+            int c;
+
+            for (rotate = 0; rotate < 4; rotate++)
+                if (crtc->rotation & (1 << rotate))
+                    break;
+            for (c = 0; c < 4; c++)
+                if (circle[c] == subpixel_order)
+                    break;
+            c = (c + rotate) & 0x3;
+            if ((crtc->rotation & RR_Reflect_X) && !(c & 1))
+                c ^= 2;
+            if ((crtc->rotation & RR_Reflect_Y) && (c & 1))
+                c ^= 2;
+            subpixel_order = circle[c];
+            break;
+        }
     }
     if (subpixel_order == SubPixelUnknown && has_none)
-	subpixel_order = SubPixelNone;
-    PictureSetSubpixelOrder (pScreen, subpixel_order);
+        subpixel_order = SubPixelNone;
+    PictureSetSubpixelOrder(pScreen, subpixel_order);
 }
 
 /**
  * Sets the given video mode on the given crtc
  */
 Bool
-xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-			  RRTransformPtr transform, int x, int y)
-{
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			i;
-    Bool		ret = FALSE;
-    Bool		didLock = FALSE;
-    DisplayModePtr	adjusted_mode;
-    DisplayModeRec	saved_mode;
-    int			saved_x, saved_y;
-    Rotation		saved_rotation;
-    RRTransformRec	saved_transform;
-    Bool		saved_transform_present;
-
-    crtc->enabled = xf86CrtcInUse (crtc);
+xf86CrtcSetModeTransform(xf86CrtcPtr crtc, DisplayModePtr mode,
+                         Rotation rotation, RRTransformPtr transform, int x,
+                         int y)
+{
+    ScrnInfoPtr scrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int i;
+    Bool ret = FALSE;
+    Bool didLock = FALSE;
+    DisplayModePtr adjusted_mode;
+    DisplayModeRec saved_mode;
+    int saved_x, saved_y;
+    Rotation saved_rotation;
+    RRTransformRec saved_transform;
+    Bool saved_transform_present;
+
+    crtc->enabled = xf86CrtcInUse(crtc);
 
     /* We only hit this if someone explicitly sends a "disabled" modeset. */
-    if (!crtc->enabled)
-    {
-	/* Check everything for stuff that should be off. */
-	xf86DisableUnusedFunctions(scrn);
-	return TRUE;
+    if (!crtc->enabled) {
+        /* Check everything for stuff that should be off. */
+        xf86DisableUnusedFunctions(scrn);
+        return TRUE;
     }
 
     adjusted_mode = xf86DuplicateMode(mode);
 
-
     saved_mode = crtc->mode;
     saved_x = crtc->x;
     saved_y = crtc->y;
     saved_rotation = crtc->rotation;
     if (crtc->transformPresent) {
-	RRTransformInit (&saved_transform);
-	RRTransformCopy (&saved_transform, &crtc->transform);
+        RRTransformInit(&saved_transform);
+        RRTransformCopy(&saved_transform, &crtc->transform);
     }
     saved_transform_present = crtc->transformPresent;
 
@@ -294,48 +284,49 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
     crtc->y = y;
     crtc->rotation = rotation;
     if (transform) {
-	RRTransformCopy (&crtc->transform, transform);
-	crtc->transformPresent = TRUE;
-    } else
-	crtc->transformPresent = FALSE;
+        RRTransformCopy(&crtc->transform, transform);
+        crtc->transformPresent = TRUE;
+    }
+    else
+        crtc->transformPresent = FALSE;
 
     if (crtc->funcs->set_mode_major) {
-	ret = crtc->funcs->set_mode_major(crtc, mode, rotation, x, y);
-	goto done;
+        ret = crtc->funcs->set_mode_major(crtc, mode, rotation, x, y);
+        goto done;
     }
 
-    didLock = crtc->funcs->lock (crtc);
+    didLock = crtc->funcs->lock(crtc);
     /* Pass our mode to the outputs and the CRTC to give them a chance to
      * adjust it according to limitations or output properties, and also
      * a chance to reject the mode entirely.
      */
     for (i = 0; i < xf86_config->num_output; i++) {
-	xf86OutputPtr output = xf86_config->output[i];
+        xf86OutputPtr output = xf86_config->output[i];
 
-	if (output->crtc != crtc)
-	    continue;
+        if (output->crtc != crtc)
+            continue;
 
-	if (!output->funcs->mode_fixup(output, mode, adjusted_mode)) {
-	    goto done;
-	}
+        if (!output->funcs->mode_fixup(output, mode, adjusted_mode)) {
+            goto done;
+        }
     }
 
     if (!crtc->funcs->mode_fixup(crtc, mode, adjusted_mode)) {
-	goto done;
+        goto done;
     }
 
-    if (!xf86CrtcRotate (crtc))
-	goto done;
+    if (!xf86CrtcRotate(crtc))
+        goto done;
 
     /* Prepare the outputs and CRTCs before setting the mode. */
     for (i = 0; i < xf86_config->num_output; i++) {
-	xf86OutputPtr output = xf86_config->output[i];
+        xf86OutputPtr output = xf86_config->output[i];
 
-	if (output->crtc != crtc)
-	    continue;
+        if (output->crtc != crtc)
+            continue;
 
-	/* Disable the output as the first thing we do. */
-	output->funcs->prepare(output);
+        /* Disable the output as the first thing we do. */
+        output->funcs->prepare(output);
     }
 
     crtc->funcs->prepare(crtc);
@@ -344,51 +335,52 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
      * on the DPLL.
      */
     crtc->funcs->mode_set(crtc, mode, adjusted_mode, crtc->x, crtc->y);
-    for (i = 0; i < xf86_config->num_output; i++) 
-    {
-	xf86OutputPtr output = xf86_config->output[i];
-	if (output->crtc == crtc)
-	    output->funcs->mode_set(output, mode, adjusted_mode);
+    for (i = 0; i < xf86_config->num_output; i++) {
+        xf86OutputPtr output = xf86_config->output[i];
+
+        if (output->crtc == crtc)
+            output->funcs->mode_set(output, mode, adjusted_mode);
     }
 
     /* Only upload when needed, to avoid unneeded delays. */
     if (!crtc->active && crtc->funcs->gamma_set)
-	crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
-                                            crtc->gamma_blue, crtc->gamma_size);
+        crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
+                               crtc->gamma_blue, crtc->gamma_size);
 
     /* Now, enable the clocks, plane, pipe, and outputs that we set up. */
     crtc->funcs->commit(crtc);
-    for (i = 0; i < xf86_config->num_output; i++) 
-    {
-	xf86OutputPtr output = xf86_config->output[i];
-	if (output->crtc == crtc)
-	    output->funcs->commit(output);
+    for (i = 0; i < xf86_config->num_output; i++) {
+        xf86OutputPtr output = xf86_config->output[i];
+
+        if (output->crtc == crtc)
+            output->funcs->commit(output);
     }
 
     ret = TRUE;
 
-done:
+ done:
     if (ret) {
-	crtc->active = TRUE;
-	if (scrn->pScreen)
-	    xf86CrtcSetScreenSubpixelOrder (scrn->pScreen);
-	if (scrn->ModeSet)
-	    scrn->ModeSet(scrn);
-    } else {
-	crtc->x = saved_x;
-	crtc->y = saved_y;
-	crtc->rotation = saved_rotation;
-	crtc->mode = saved_mode;
-	if (saved_transform_present)
-	    RRTransformCopy (&crtc->transform, &saved_transform);
-	crtc->transformPresent = saved_transform_present;
+        crtc->active = TRUE;
+        if (scrn->pScreen)
+            xf86CrtcSetScreenSubpixelOrder(scrn->pScreen);
+        if (scrn->ModeSet)
+            scrn->ModeSet(scrn);
+    }
+    else {
+        crtc->x = saved_x;
+        crtc->y = saved_y;
+        crtc->rotation = saved_rotation;
+        crtc->mode = saved_mode;
+        if (saved_transform_present)
+            RRTransformCopy(&crtc->transform, &saved_transform);
+        crtc->transformPresent = saved_transform_present;
     }
 
     free(adjusted_mode->name);
     free(adjusted_mode);
 
     if (didLock)
-	crtc->funcs->unlock (crtc);
+        crtc->funcs->unlock(crtc);
 
     return ret;
 }
@@ -398,31 +390,31 @@ done:
  * a transform
  */
 Bool
-xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-		 int x, int y)
+xf86CrtcSetMode(xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
+                int x, int y)
 {
-    return xf86CrtcSetModeTransform (crtc, mode, rotation, NULL, x, y);
+    return xf86CrtcSetModeTransform(crtc, mode, rotation, NULL, x, y);
 }
 
 /**
  * Pans the screen, does not change the mode
  */
 void
-xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)
+xf86CrtcSetOrigin(xf86CrtcPtr crtc, int x, int y)
 {
     ScrnInfoPtr scrn = crtc->scrn;
 
     crtc->x = x;
     crtc->y = y;
     if (crtc->funcs->set_origin) {
-	if (!xf86CrtcRotate (crtc))
-	    return;
-	crtc->funcs->set_origin (crtc, x, y);
-	if (scrn->ModeSet)
-	    scrn->ModeSet(scrn);
+        if (!xf86CrtcRotate(crtc))
+            return;
+        crtc->funcs->set_origin(crtc, x, y);
+        if (scrn->ModeSet)
+            scrn->ModeSet(scrn);
     }
     else
-	xf86CrtcSetMode (crtc, &crtc->mode, crtc->rotation, x, y);
+        xf86CrtcSetMode(crtc, &crtc->mode, crtc->rotation, x, y);
 }
 
 /*
@@ -450,22 +442,22 @@ typedef enum {
 } OutputOpts;
 
 static OptionInfoRec xf86OutputOptions[] = {
-    {OPTION_PREFERRED_MODE, "PreferredMode",	OPTV_STRING,  {0}, FALSE },
-    {OPTION_POSITION,	    "Position",		OPTV_STRING,  {0}, FALSE },
-    {OPTION_BELOW,	    "Below",		OPTV_STRING,  {0}, FALSE },
-    {OPTION_RIGHT_OF,	    "RightOf",		OPTV_STRING,  {0}, FALSE },
-    {OPTION_ABOVE,	    "Above",		OPTV_STRING,  {0}, FALSE },
-    {OPTION_LEFT_OF,	    "LeftOf",		OPTV_STRING,  {0}, FALSE },
-    {OPTION_ENABLE,	    "Enable",		OPTV_BOOLEAN, {0}, FALSE },
-    {OPTION_DISABLE,	    "Disable",		OPTV_BOOLEAN, {0}, FALSE },
-    {OPTION_MIN_CLOCK,	    "MinClock",		OPTV_FREQ,    {0}, FALSE },
-    {OPTION_MAX_CLOCK,	    "MaxClock",		OPTV_FREQ,    {0}, FALSE },
-    {OPTION_IGNORE,	    "Ignore",		OPTV_BOOLEAN, {0}, FALSE },
-    {OPTION_ROTATE,	    "Rotate",		OPTV_STRING,  {0}, FALSE },
-    {OPTION_PANNING,	    "Panning",		OPTV_STRING,  {0}, FALSE },
-    {OPTION_PRIMARY,	    "Primary",		OPTV_BOOLEAN, {0}, FALSE },
-    {OPTION_DEFAULT_MODES,  "DefaultModes",	OPTV_BOOLEAN, {0}, FALSE },
-    {-1,		    NULL,		OPTV_NONE,    {0}, FALSE },
+    {OPTION_PREFERRED_MODE, "PreferredMode", OPTV_STRING, {0}, FALSE},
+    {OPTION_POSITION, "Position", OPTV_STRING, {0}, FALSE},
+    {OPTION_BELOW, "Below", OPTV_STRING, {0}, FALSE},
+    {OPTION_RIGHT_OF, "RightOf", OPTV_STRING, {0}, FALSE},
+    {OPTION_ABOVE, "Above", OPTV_STRING, {0}, FALSE},
+    {OPTION_LEFT_OF, "LeftOf", OPTV_STRING, {0}, FALSE},
+    {OPTION_ENABLE, "Enable", OPTV_BOOLEAN, {0}, FALSE},
+    {OPTION_DISABLE, "Disable", OPTV_BOOLEAN, {0}, FALSE},
+    {OPTION_MIN_CLOCK, "MinClock", OPTV_FREQ, {0}, FALSE},
+    {OPTION_MAX_CLOCK, "MaxClock", OPTV_FREQ, {0}, FALSE},
+    {OPTION_IGNORE, "Ignore", OPTV_BOOLEAN, {0}, FALSE},
+    {OPTION_ROTATE, "Rotate", OPTV_STRING, {0}, FALSE},
+    {OPTION_PANNING, "Panning", OPTV_STRING, {0}, FALSE},
+    {OPTION_PRIMARY, "Primary", OPTV_BOOLEAN, {0}, FALSE},
+    {OPTION_DEFAULT_MODES, "DefaultModes", OPTV_BOOLEAN, {0}, FALSE},
+    {-1, NULL, OPTV_NONE, {0}, FALSE},
 };
 
 enum {
@@ -473,144 +465,138 @@ enum {
 };
 
 static OptionInfoRec xf86DeviceOptions[] = {
-    {OPTION_MODEDEBUG,	    "ModeDebug",	OPTV_BOOLEAN,  {0}, FALSE },
-    {-1,		    NULL,		OPTV_NONE,    {0}, FALSE },
+    {OPTION_MODEDEBUG, "ModeDebug", OPTV_BOOLEAN, {0}, FALSE},
+    {-1, NULL, OPTV_NONE, {0}, FALSE},
 };
 
 static void
-xf86OutputSetMonitor (xf86OutputPtr output)
+xf86OutputSetMonitor(xf86OutputPtr output)
 {
-    char    *option_name;
-    const char    *monitor;
+    char *option_name;
+    const char *monitor;
 
     if (!output->name)
-	return;
+        return;
 
     free(output->options);
 
-    output->options = xnfalloc (sizeof (xf86OutputOptions));
-    memcpy (output->options, xf86OutputOptions, sizeof (xf86OutputOptions));
+    output->options = xnfalloc(sizeof(xf86OutputOptions));
+    memcpy(output->options, xf86OutputOptions, sizeof(xf86OutputOptions));
 
     XNFasprintf(&option_name, "monitor-%s", output->name);
-    monitor = xf86findOptionValue (output->scrn->options, option_name);
+    monitor = xf86findOptionValue(output->scrn->options, option_name);
     if (!monitor)
-	monitor = output->name;
+        monitor = output->name;
     else
-	xf86MarkOptionUsedByName (output->scrn->options, option_name);
+        xf86MarkOptionUsedByName(output->scrn->options, option_name);
     free(option_name);
-    output->conf_monitor = xf86findMonitor (monitor,
-					    xf86configptr->conf_monitor_lst);
+    output->conf_monitor = xf86findMonitor(monitor,
+                                           xf86configptr->conf_monitor_lst);
     /*
      * Find the monitor section of the screen and use that
      */
     if (!output->conf_monitor && output->use_screen_monitor)
-	output->conf_monitor = xf86findMonitor (output->scrn->monitor->id,
-						xf86configptr->conf_monitor_lst);
-    if (output->conf_monitor)
-    {
-	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
-		    "Output %s using monitor section %s\n",
-		    output->name, output->conf_monitor->mon_identifier);
-	xf86ProcessOptions (output->scrn->scrnIndex,
-			    output->conf_monitor->mon_option_lst,
-			    output->options);
+        output->conf_monitor = xf86findMonitor(output->scrn->monitor->id,
+                                               xf86configptr->conf_monitor_lst);
+    if (output->conf_monitor) {
+        xf86DrvMsg(output->scrn->scrnIndex, X_INFO,
+                   "Output %s using monitor section %s\n",
+                   output->name, output->conf_monitor->mon_identifier);
+        xf86ProcessOptions(output->scrn->scrnIndex,
+                           output->conf_monitor->mon_option_lst,
+                           output->options);
     }
     else
-	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
-		    "Output %s has no monitor section\n",
-		    output->name);
+        xf86DrvMsg(output->scrn->scrnIndex, X_INFO,
+                   "Output %s has no monitor section\n", output->name);
 }
 
 static Bool
-xf86OutputEnabled (xf86OutputPtr output, Bool strict)
+xf86OutputEnabled(xf86OutputPtr output, Bool strict)
 {
-    Bool    enable, disable;
+    Bool enable, disable;
 
     /* check to see if this output was enabled in the config file */
-    if (xf86GetOptValBool (output->options, OPTION_ENABLE, &enable) && enable)
-    {
-	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
-		    "Output %s enabled by config file\n", output->name);
-	return TRUE;
+    if (xf86GetOptValBool(output->options, OPTION_ENABLE, &enable) && enable) {
+        xf86DrvMsg(output->scrn->scrnIndex, X_INFO,
+                   "Output %s enabled by config file\n", output->name);
+        return TRUE;
     }
     /* or if this output was disabled in the config file */
-    if (xf86GetOptValBool (output->options, OPTION_DISABLE, &disable) && disable)
-    {
-	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
-		    "Output %s disabled by config file\n", output->name);
-	return FALSE;
+    if (xf86GetOptValBool(output->options, OPTION_DISABLE, &disable) && disable) {
+        xf86DrvMsg(output->scrn->scrnIndex, X_INFO,
+                   "Output %s disabled by config file\n", output->name);
+        return FALSE;
     }
 
     /* If not, try to only light up the ones we know are connected */
     if (strict) {
-	enable = output->status == XF86OutputStatusConnected;
+        enable = output->status == XF86OutputStatusConnected;
     }
     /* But if that fails, try to light up even outputs we're unsure of */
     else {
-	enable = output->status != XF86OutputStatusDisconnected;
+        enable = output->status != XF86OutputStatusDisconnected;
     }
 
-    xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
-    	    "Output %s %sconnected\n", output->name, enable ? "" : "dis");
+    xf86DrvMsg(output->scrn->scrnIndex, X_INFO,
+               "Output %s %sconnected\n", output->name, enable ? "" : "dis");
     return enable;
 }
 
 static Bool
-xf86OutputIgnored (xf86OutputPtr    output)
+xf86OutputIgnored(xf86OutputPtr output)
 {
-    return xf86ReturnOptValBool (output->options, OPTION_IGNORE, FALSE);
+    return xf86ReturnOptValBool(output->options, OPTION_IGNORE, FALSE);
 }
 
 static const char *direction[4] = {
-    "normal", 
-    "left", 
-    "inverted", 
+    "normal",
+    "left",
+    "inverted",
     "right"
 };
 
 static Rotation
-xf86OutputInitialRotation (xf86OutputPtr output)
+xf86OutputInitialRotation(xf86OutputPtr output)
 {
-    char    *rotate_name = xf86GetOptValString (output->options, 
-						OPTION_ROTATE);
-    int	    i;
+    char *rotate_name = xf86GetOptValString(output->options,
+                                            OPTION_ROTATE);
+    int i;
 
     if (!rotate_name) {
-	if (output->initial_rotation)
-	    return output->initial_rotation;
-	return RR_Rotate_0;
+        if (output->initial_rotation)
+            return output->initial_rotation;
+        return RR_Rotate_0;
     }
-    
+
     for (i = 0; i < 4; i++)
-	if (xf86nameCompare (direction[i], rotate_name) == 0)
-	    return 1 << i;
+        if (xf86nameCompare(direction[i], rotate_name) == 0)
+            return 1 << i;
     return RR_Rotate_0;
 }
 
 xf86OutputPtr
-xf86OutputCreate (ScrnInfoPtr		    scrn,
-		  const xf86OutputFuncsRec  *funcs,
-		  const char		    *name)
+xf86OutputCreate(ScrnInfoPtr scrn,
+                 const xf86OutputFuncsRec * funcs, const char *name)
 {
-    xf86OutputPtr	output, *outputs;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			len;
-    Bool		primary;
+    xf86OutputPtr output, *outputs;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int len;
+    Bool primary;
 
     if (name)
-	len = strlen (name) + 1;
+        len = strlen(name) + 1;
     else
-	len = 0;
+        len = 0;
 
-    output = calloc(sizeof (xf86OutputRec) + len, 1);
+    output = calloc(sizeof(xf86OutputRec) + len, 1);
     if (!output)
-	return NULL;
+        return NULL;
     output->scrn = scrn;
     output->funcs = funcs;
-    if (name)
-    {
-	output->name = (char *) (output + 1);
-	strcpy (output->name, name);
+    if (name) {
+        output->name = (char *) (output + 1);
+        strcpy(output->name, name);
     }
     output->subpixel_order = SubPixelUnknown;
     /*
@@ -620,39 +606,34 @@ xf86OutputCreate (ScrnInfoPtr		    scrn,
 #ifdef RANDR_12_INTERFACE
     output->randr_output = NULL;
 #endif
-    if (name)
-    {
-	xf86OutputSetMonitor (output);
-	if (xf86OutputIgnored (output))
-	{
-	    free(output);
-	    return FALSE;
-	}
-    }
-    
-    
+    if (name) {
+        xf86OutputSetMonitor(output);
+        if (xf86OutputIgnored(output)) {
+            free(output);
+            return FALSE;
+        }
+    }
+
     if (xf86_config->output)
-	outputs = realloc(xf86_config->output,
-			  (xf86_config->num_output + 1) * sizeof (xf86OutputPtr));
+        outputs = realloc(xf86_config->output,
+                          (xf86_config->num_output +
+                           1) * sizeof(xf86OutputPtr));
     else
-	outputs = malloc((xf86_config->num_output + 1) * sizeof (xf86OutputPtr));
-    if (!outputs)
-    {
-	free(output);
-	return NULL;
+        outputs = malloc((xf86_config->num_output + 1) * sizeof(xf86OutputPtr));
+    if (!outputs) {
+        free(output);
+        return NULL;
     }
 
     xf86_config->output = outputs;
 
-    if (xf86GetOptValBool (output->options, OPTION_PRIMARY, &primary) && primary)
-    {
-	memmove(xf86_config->output + 1, xf86_config->output,
-		xf86_config->num_output * sizeof (xf86OutputPtr));
-	xf86_config->output[0] = output;
+    if (xf86GetOptValBool(output->options, OPTION_PRIMARY, &primary) && primary) {
+        memmove(xf86_config->output + 1, xf86_config->output,
+                xf86_config->num_output * sizeof(xf86OutputPtr));
+        xf86_config->output[0] = output;
     }
-    else
-    {
-	xf86_config->output[xf86_config->num_output] = output;
+    else {
+        xf86_config->output[xf86_config->num_output] = output;
     }
 
     xf86_config->num_output++;
@@ -661,53 +642,51 @@ xf86OutputCreate (ScrnInfoPtr		    scrn,
 }
 
 Bool
-xf86OutputRename (xf86OutputPtr output, const char *name)
+xf86OutputRename(xf86OutputPtr output, const char *name)
 {
-    char    *newname = strdup(name);
-    
+    char *newname = strdup(name);
+
     if (!newname)
-	return FALSE;	/* so sorry... */
-    
+        return FALSE;           /* so sorry... */
+
     if (output->name && output->name != (char *) (output + 1))
-	free(output->name);
+        free(output->name);
     output->name = newname;
-    xf86OutputSetMonitor (output);
-    if (xf86OutputIgnored (output))
-	return FALSE;
+    xf86OutputSetMonitor(output);
+    if (xf86OutputIgnored(output))
+        return FALSE;
     return TRUE;
 }
 
 void
-xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor)
+xf86OutputUseScreenMonitor(xf86OutputPtr output, Bool use_screen_monitor)
 {
-    if (use_screen_monitor != output->use_screen_monitor)
-    {
-	output->use_screen_monitor = use_screen_monitor;
-	xf86OutputSetMonitor (output);
+    if (use_screen_monitor != output->use_screen_monitor) {
+        output->use_screen_monitor = use_screen_monitor;
+        xf86OutputSetMonitor(output);
     }
 }
 
 void
-xf86OutputDestroy (xf86OutputPtr output)
+xf86OutputDestroy(xf86OutputPtr output)
 {
-    ScrnInfoPtr		scrn = output->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			o;
-    
+    ScrnInfoPtr scrn = output->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int o;
+
     (*output->funcs->destroy) (output);
     while (output->probed_modes)
-	xf86DeleteMode (&output->probed_modes, output->probed_modes);
+        xf86DeleteMode(&output->probed_modes, output->probed_modes);
     for (o = 0; o < xf86_config->num_output; o++)
-	if (xf86_config->output[o] == output)
-	{
-	    memmove (&xf86_config->output[o],
-		     &xf86_config->output[o+1],
-		     ((xf86_config->num_output - (o + 1)) * sizeof(void*)));
-	    xf86_config->num_output--;
-	    break;
-	}
+        if (xf86_config->output[o] == output) {
+            memmove(&xf86_config->output[o],
+                    &xf86_config->output[o + 1],
+                    ((xf86_config->num_output - (o + 1)) * sizeof(void *)));
+            xf86_config->num_output--;
+            break;
+        }
     if (output->name && output->name != (char *) (output + 1))
-	free(output->name);
+        free(output->name);
     free(output);
 }
 
@@ -715,18 +694,18 @@ xf86OutputDestroy (xf86OutputPtr output)
  * Called during CreateScreenResources to hook up RandR
  */
 static Bool
-xf86CrtcCreateScreenResources (ScreenPtr screen)
+xf86CrtcCreateScreenResources(ScreenPtr screen)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
 
     screen->CreateScreenResources = config->CreateScreenResources;
-    
-    if (!(*screen->CreateScreenResources)(screen))
-	return FALSE;
 
-    if (!xf86RandR12CreateScreenResources (screen))
-	return FALSE;
+    if (!(*screen->CreateScreenResources) (screen))
+        return FALSE;
+
+    if (!xf86RandR12CreateScreenResources(screen))
+        return FALSE;
 
     return TRUE;
 }
@@ -735,31 +714,29 @@ xf86CrtcCreateScreenResources (ScreenPtr screen)
  * Clean up config on server reset
  */
 static Bool
-xf86CrtcCloseScreen (int index, ScreenPtr screen)
+xf86CrtcCloseScreen(int index, ScreenPtr screen)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			o, c;
-    
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    int o, c;
+
     screen->CloseScreen = config->CloseScreen;
 
-    xf86RotateCloseScreen (screen);
+    xf86RotateCloseScreen(screen);
 
-    for (o = 0; o < config->num_output; o++)
-    {
-	xf86OutputPtr	output = config->output[o];
+    for (o = 0; o < config->num_output; o++) {
+        xf86OutputPtr output = config->output[o];
 
-	output->randr_output = NULL;
+        output->randr_output = NULL;
     }
-    for (c = 0; c < config->num_crtc; c++)
-    {
-	xf86CrtcPtr	crtc = config->crtc[c];
+    for (c = 0; c < config->num_crtc; c++) {
+        xf86CrtcPtr crtc = config->crtc[c];
 
-	crtc->randr_crtc = NULL;
+        crtc->randr_crtc = NULL;
     }
-    xf86RandR12CloseScreen (screen);
+    xf86RandR12CloseScreen(screen);
 
-    return screen->CloseScreen (index, screen);
+    return screen->CloseScreen(index, screen);
 }
 
 /*
@@ -770,37 +747,36 @@ int
 #else
 Bool
 #endif
-xf86CrtcScreenInit (ScreenPtr screen)
+xf86CrtcScreenInit(ScreenPtr screen)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
 
     /* Rotation */
-    xf86DrvMsg(scrn->scrnIndex, X_INFO, "RandR 1.2 enabled, ignore the following RandR disabled message.\n");
-    xf86DisableRandR(); /* Disable old RandR extension support */
-    xf86RandR12Init (screen);
+    xf86DrvMsg(scrn->scrnIndex, X_INFO,
+               "RandR 1.2 enabled, ignore the following RandR disabled message.\n");
+    xf86DisableRandR();         /* Disable old RandR extension support */
+    xf86RandR12Init(screen);
 
     /* support all rotations if every crtc has the shadow alloc funcs */
-    for (c = 0; c < config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = config->crtc[c];
-	if (!crtc->funcs->shadow_allocate || !crtc->funcs->shadow_create)
-	    break;
-    }
-    if (c == config->num_crtc)
-    {
-	xf86RandR12SetRotations (screen, RR_Rotate_0 | RR_Rotate_90 |
-				 RR_Rotate_180 | RR_Rotate_270 |
-				 RR_Reflect_X | RR_Reflect_Y);
-	xf86RandR12SetTransformSupport (screen, TRUE);
+    for (c = 0; c < config->num_crtc; c++) {
+        xf86CrtcPtr crtc = config->crtc[c];
+
+        if (!crtc->funcs->shadow_allocate || !crtc->funcs->shadow_create)
+            break;
     }
-    else
-    {
-	xf86RandR12SetRotations (screen, RR_Rotate_0);
-	xf86RandR12SetTransformSupport (screen, FALSE);
+    if (c == config->num_crtc) {
+        xf86RandR12SetRotations(screen, RR_Rotate_0 | RR_Rotate_90 |
+                                RR_Rotate_180 | RR_Rotate_270 |
+                                RR_Reflect_X | RR_Reflect_Y);
+        xf86RandR12SetTransformSupport(screen, TRUE);
+    }
+    else {
+        xf86RandR12SetRotations(screen, RR_Rotate_0);
+        xf86RandR12SetTransformSupport(screen, FALSE);
     }
-    
+
     /* Wrap CreateScreenResources so we can initialize the RandR code */
     config->CreateScreenResources = screen->CreateScreenResources;
     screen->CreateScreenResources = xf86CrtcCreateScreenResources;
@@ -810,7 +786,7 @@ xf86CrtcScreenInit (ScreenPtr screen)
 
     /* This might still be marked wrapped from a previous generation */
     config->BlockHandler = NULL;
-    
+
 #ifdef XFreeXDGA
     _xf86_di_dga_init_internal(screen);
 #endif
@@ -822,205 +798,198 @@ xf86CrtcScreenInit (ScreenPtr screen)
 }
 
 static DisplayModePtr
-xf86DefaultMode (xf86OutputPtr output, int width, int height)
-{
-    DisplayModePtr  target_mode = NULL;
-    DisplayModePtr  mode;
-    int		    target_diff = 0;
-    int		    target_preferred = 0;
-    int		    mm_height;
-    
+xf86DefaultMode(xf86OutputPtr output, int width, int height)
+{
+    DisplayModePtr target_mode = NULL;
+    DisplayModePtr mode;
+    int target_diff = 0;
+    int target_preferred = 0;
+    int mm_height;
+
     mm_height = output->mm_height;
     if (!mm_height)
-	mm_height = (768 * 25.4) / DEFAULT_DPI;
+        mm_height = (768 * 25.4) / DEFAULT_DPI;
     /*
      * Pick a mode closest to DEFAULT_DPI
      */
-    for (mode = output->probed_modes; mode; mode = mode->next)
-    {
-	int	    dpi;
-	int	    preferred = (((mode->type & M_T_PREFERRED) != 0) +
-				 ((mode->type & M_T_USERPREF) != 0));
-	int	    diff;
-
-	if (xf86ModeWidth (mode, output->initial_rotation) > width ||
-	    xf86ModeHeight (mode, output->initial_rotation) > height)
-	    continue;
-	
-	/* yes, use VDisplay here, not xf86ModeHeight */
-	dpi = (mode->VDisplay * 254) / (mm_height * 10);
-	diff = dpi - DEFAULT_DPI;
-	diff = diff < 0 ? -diff : diff;
-	if (target_mode == NULL || (preferred > target_preferred) ||
-	    (preferred == target_preferred && diff < target_diff))
-	{
-	    target_mode = mode;
-	    target_diff = diff;
-	    target_preferred = preferred;
-	}
+    for (mode = output->probed_modes; mode; mode = mode->next) {
+        int dpi;
+        int preferred = (((mode->type & M_T_PREFERRED) != 0) +
+                         ((mode->type & M_T_USERPREF) != 0));
+        int diff;
+
+        if (xf86ModeWidth(mode, output->initial_rotation) > width ||
+            xf86ModeHeight(mode, output->initial_rotation) > height)
+            continue;
+
+        /* yes, use VDisplay here, not xf86ModeHeight */
+        dpi = (mode->VDisplay * 254) / (mm_height * 10);
+        diff = dpi - DEFAULT_DPI;
+        diff = diff < 0 ? -diff : diff;
+        if (target_mode == NULL || (preferred > target_preferred) ||
+            (preferred == target_preferred && diff < target_diff)) {
+            target_mode = mode;
+            target_diff = diff;
+            target_preferred = preferred;
+        }
     }
     return target_mode;
 }
 
 static DisplayModePtr
-xf86ClosestMode (xf86OutputPtr output, 
-		 DisplayModePtr match, Rotation match_rotation,
-		 int width, int height)
-{
-    DisplayModePtr  target_mode = NULL;
-    DisplayModePtr  mode;
-    int		    target_diff = 0;
-    
+xf86ClosestMode(xf86OutputPtr output,
+                DisplayModePtr match, Rotation match_rotation,
+                int width, int height)
+{
+    DisplayModePtr target_mode = NULL;
+    DisplayModePtr mode;
+    int target_diff = 0;
+
     /*
      * Pick a mode closest to the specified mode
      */
-    for (mode = output->probed_modes; mode; mode = mode->next)
-    {
-	int	    dx, dy;
-	int	    diff;
-
-	if (xf86ModeWidth (mode, output->initial_rotation) > width ||
-	    xf86ModeHeight (mode, output->initial_rotation) > height)
-	    continue;
-	
-	/* exact matches are preferred */
-	if (output->initial_rotation == match_rotation &&
-	    xf86ModesEqual (mode, match))
-	    return mode;
-	
-	dx = xf86ModeWidth (match, match_rotation) - xf86ModeWidth (mode, output->initial_rotation);
-	dy = xf86ModeHeight (match, match_rotation) - xf86ModeHeight (mode, output->initial_rotation);
-	diff = dx * dx + dy * dy;
-	if (target_mode == NULL || diff < target_diff)
-	{
-	    target_mode = mode;
-	    target_diff = diff;
-	}
+    for (mode = output->probed_modes; mode; mode = mode->next) {
+        int dx, dy;
+        int diff;
+
+        if (xf86ModeWidth(mode, output->initial_rotation) > width ||
+            xf86ModeHeight(mode, output->initial_rotation) > height)
+            continue;
+
+        /* exact matches are preferred */
+        if (output->initial_rotation == match_rotation &&
+            xf86ModesEqual(mode, match))
+            return mode;
+
+        dx = xf86ModeWidth(match, match_rotation) - xf86ModeWidth(mode,
+                                                                  output->
+                                                                  initial_rotation);
+        dy = xf86ModeHeight(match, match_rotation) - xf86ModeHeight(mode,
+                                                                    output->
+                                                                    initial_rotation);
+        diff = dx * dx + dy * dy;
+        if (target_mode == NULL || diff < target_diff) {
+            target_mode = mode;
+            target_diff = diff;
+        }
     }
     return target_mode;
 }
 
 static DisplayModePtr
-xf86OutputHasPreferredMode (xf86OutputPtr output, int width, int height)
+xf86OutputHasPreferredMode(xf86OutputPtr output, int width, int height)
 {
-    DisplayModePtr  mode;
+    DisplayModePtr mode;
 
-    for (mode = output->probed_modes; mode; mode = mode->next)
-    {
-	if (xf86ModeWidth (mode, output->initial_rotation) > width ||
-	    xf86ModeHeight (mode, output->initial_rotation) > height)
-	    continue;
+    for (mode = output->probed_modes; mode; mode = mode->next) {
+        if (xf86ModeWidth(mode, output->initial_rotation) > width ||
+            xf86ModeHeight(mode, output->initial_rotation) > height)
+            continue;
 
-	if (mode->type & M_T_PREFERRED)
-	    return mode;
+        if (mode->type & M_T_PREFERRED)
+            return mode;
     }
     return NULL;
 }
 
 static DisplayModePtr
-xf86OutputHasUserPreferredMode (xf86OutputPtr output)
+xf86OutputHasUserPreferredMode(xf86OutputPtr output)
 {
     DisplayModePtr mode, first = output->probed_modes;
 
     for (mode = first; mode && mode->next != first; mode = mode->next)
-	if (mode->type & M_T_USERPREF)
-	    return mode;
+        if (mode->type & M_T_USERPREF)
+            return mode;
 
     return NULL;
 }
 
 static int
-xf86PickCrtcs (ScrnInfoPtr	scrn,
-	       xf86CrtcPtr	*best_crtcs,
-	       DisplayModePtr	*modes,
-	       int		n,
-	       int		width,
-	       int		height)
-{
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    int		    c, o;
-    xf86OutputPtr   output;
-    xf86CrtcPtr	    crtc;
-    xf86CrtcPtr	    *crtcs;
-    xf86CrtcPtr	    best_crtc;
-    int		    best_score;
-    int		    score;
-    int		    my_score;
-    
+xf86PickCrtcs(ScrnInfoPtr scrn,
+              xf86CrtcPtr * best_crtcs,
+              DisplayModePtr * modes, int n, int width, int height)
+{
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c, o;
+    xf86OutputPtr output;
+    xf86CrtcPtr crtc;
+    xf86CrtcPtr *crtcs;
+    xf86CrtcPtr best_crtc;
+    int best_score;
+    int score;
+    int my_score;
+
     if (n == config->num_output)
-	return 0;
+        return 0;
     output = config->output[n];
-    
+
     /*
      * Compute score with this output disabled
      */
     best_crtcs[n] = NULL;
     best_crtc = NULL;
-    best_score = xf86PickCrtcs (scrn, best_crtcs, modes, n+1, width, height);
+    best_score = xf86PickCrtcs(scrn, best_crtcs, modes, n + 1, width, height);
     if (modes[n] == NULL)
-	return best_score;
-    
-    crtcs = malloc(config->num_output * sizeof (xf86CrtcPtr));
+        return best_score;
+
+    crtcs = malloc(config->num_output * sizeof(xf86CrtcPtr));
     if (!crtcs)
-	return best_score;
+        return best_score;
 
     my_score = 1;
     /* Score outputs that are known to be connected higher */
     if (output->status == XF86OutputStatusConnected)
-	my_score++;
+        my_score++;
     /* Score outputs with preferred modes higher */
-    if (xf86OutputHasPreferredMode (output, width, height))
-	my_score++;
+    if (xf86OutputHasPreferredMode(output, width, height))
+        my_score++;
     /*
      * Select a crtc for this output and
      * then attempt to configure the remaining
      * outputs
      */
-    for (c = 0; c < config->num_crtc; c++)
-    {
-	if ((output->possible_crtcs & (1 << c)) == 0)
-	    continue;
-	
-	crtc = config->crtc[c];
-	/*
-	 * Check to see if some other output is
-	 * using this crtc
-	 */
-	for (o = 0; o < n; o++)
-	    if (best_crtcs[o] == crtc)
-		break;
-	if (o < n)
-	{
-	    /*
-	     * If the two outputs desire the same mode,
-	     * see if they can be cloned
-	     */
-	    if (xf86ModesEqual (modes[o], modes[n]) &&
-		config->output[o]->initial_rotation == config->output[n]->initial_rotation &&
-		config->output[o]->initial_x == config->output[n]->initial_x &&
-		config->output[o]->initial_y == config->output[n]->initial_y)
-	    {
-		if ((output->possible_clones & (1 << o)) == 0)
-		    continue;		/* nope, try next CRTC */
-	    }
-	    else
-		continue;		/* different modes, can't clone */
-	}
-	crtcs[n] = crtc;
-	memcpy (crtcs, best_crtcs, n * sizeof (xf86CrtcPtr));
-	score = my_score + xf86PickCrtcs (scrn, crtcs, modes, n+1, width, height);
-	if (score > best_score)
-	{
-	    best_crtc = crtc;
-	    best_score = score;
-	    memcpy (best_crtcs, crtcs, config->num_output * sizeof (xf86CrtcPtr));
-	}
+    for (c = 0; c < config->num_crtc; c++) {
+        if ((output->possible_crtcs & (1 << c)) == 0)
+            continue;
+
+        crtc = config->crtc[c];
+        /*
+         * Check to see if some other output is
+         * using this crtc
+         */
+        for (o = 0; o < n; o++)
+            if (best_crtcs[o] == crtc)
+                break;
+        if (o < n) {
+            /*
+             * If the two outputs desire the same mode,
+             * see if they can be cloned
+             */
+            if (xf86ModesEqual(modes[o], modes[n]) &&
+                config->output[o]->initial_rotation ==
+                config->output[n]->initial_rotation &&
+                config->output[o]->initial_x == config->output[n]->initial_x &&
+                config->output[o]->initial_y == config->output[n]->initial_y) {
+                if ((output->possible_clones & (1 << o)) == 0)
+                    continue;   /* nope, try next CRTC */
+            }
+            else
+                continue;       /* different modes, can't clone */
+        }
+        crtcs[n] = crtc;
+        memcpy(crtcs, best_crtcs, n * sizeof(xf86CrtcPtr));
+        score =
+            my_score + xf86PickCrtcs(scrn, crtcs, modes, n + 1, width, height);
+        if (score > best_score) {
+            best_crtc = crtc;
+            best_score = score;
+            memcpy(best_crtcs, crtcs, config->num_output * sizeof(xf86CrtcPtr));
+        }
     }
     free(crtcs);
     return best_score;
 }
 
-
 /*
  * Compute the virtual size necessary to place all of the available
  * crtcs in the specified configuration.
@@ -1031,57 +1000,62 @@ xf86PickCrtcs (ScrnInfoPtr	scrn,
  */
 
 static void
-xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
-			 Bool canGrow)
-{
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    int	    width = 0, height = 0;
-    int	    o;
-    int	    c;
-    int	    s;
-
-    for (c = 0; c < config->num_crtc; c++)
-    {
-	int	    crtc_width = 0, crtc_height = 0;
-	xf86CrtcPtr crtc = config->crtc[c];
-
-	if (crtc->enabled)
-	{
-	    crtc_width = crtc->desiredX + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation);
-	    crtc_height = crtc->desiredY + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation);
-	}
-	if (!canGrow) {
-	    for (o = 0; o < config->num_output; o++)
-	    {
-		xf86OutputPtr   output = config->output[o];
-
-		for (s = 0; s < config->num_crtc; s++)
-		    if (output->possible_crtcs & (1 << s))
-		    {
-			DisplayModePtr  mode;
-			for (mode = output->probed_modes; mode; mode = mode->next)
-			{
-			    if (mode->HDisplay > crtc_width)
-				crtc_width = mode->HDisplay;
-			    if (mode->VDisplay > crtc_width)
-				crtc_width = mode->VDisplay;
-			    if (mode->VDisplay > crtc_height)
-				crtc_height = mode->VDisplay;
-			    if (mode->HDisplay > crtc_height)
-				crtc_height = mode->HDisplay;
-			}
-		    }
-	    }
-	}
-	if (crtc_width > width)
-	    width = crtc_width;
-	if (crtc_height > height)
-	    height = crtc_height;
-    }
-    if (config->maxWidth && width > config->maxWidth) width = config->maxWidth;
-    if (config->maxHeight && height > config->maxHeight) height = config->maxHeight;
-    if (config->minWidth && width < config->minWidth) width = config->minWidth;
-    if (config->minHeight && height < config->minHeight) height = config->minHeight;
+xf86DefaultScreenLimits(ScrnInfoPtr scrn, int *widthp, int *heightp,
+                        Bool canGrow)
+{
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    int width = 0, height = 0;
+    int o;
+    int c;
+    int s;
+
+    for (c = 0; c < config->num_crtc; c++) {
+        int crtc_width = 0, crtc_height = 0;
+        xf86CrtcPtr crtc = config->crtc[c];
+
+        if (crtc->enabled) {
+            crtc_width =
+                crtc->desiredX + xf86ModeWidth(&crtc->desiredMode,
+                                               crtc->desiredRotation);
+            crtc_height =
+                crtc->desiredY + xf86ModeHeight(&crtc->desiredMode,
+                                                crtc->desiredRotation);
+        }
+        if (!canGrow) {
+            for (o = 0; o < config->num_output; o++) {
+                xf86OutputPtr output = config->output[o];
+
+                for (s = 0; s < config->num_crtc; s++)
+                    if (output->possible_crtcs & (1 << s)) {
+                        DisplayModePtr mode;
+
+                        for (mode = output->probed_modes; mode;
+                             mode = mode->next) {
+                            if (mode->HDisplay > crtc_width)
+                                crtc_width = mode->HDisplay;
+                            if (mode->VDisplay > crtc_width)
+                                crtc_width = mode->VDisplay;
+                            if (mode->VDisplay > crtc_height)
+                                crtc_height = mode->VDisplay;
+                            if (mode->HDisplay > crtc_height)
+                                crtc_height = mode->HDisplay;
+                        }
+                    }
+            }
+        }
+        if (crtc_width > width)
+            width = crtc_width;
+        if (crtc_height > height)
+            height = crtc_height;
+    }
+    if (config->maxWidth && width > config->maxWidth)
+        width = config->maxWidth;
+    if (config->maxHeight && height > config->maxHeight)
+        height = config->maxHeight;
+    if (config->minWidth && width < config->minWidth)
+        width = config->minWidth;
+    if (config->minHeight && height < config->minHeight)
+        height = config->minHeight;
     *widthp = width;
     *heightp = height;
 }
@@ -1093,216 +1067,200 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
  * with either a position or a relative setting or a mode.
  */
 static Bool
-xf86UserConfiguredOutputs(ScrnInfoPtr scrn, DisplayModePtr *modes)
+xf86UserConfiguredOutputs(ScrnInfoPtr scrn, DisplayModePtr * modes)
 {
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
     int o;
     Bool user_conf = FALSE;
 
-    for (o = 0; o < config->num_output; o++)
-    {
-	xf86OutputPtr output = config->output[o];
-	char	    *position;
-	char	    *relative_name;
-	OutputOpts	    relation;
-	int r;
-	static const OutputOpts	relations[] = {
-	    OPTION_BELOW, OPTION_RIGHT_OF, OPTION_ABOVE, OPTION_LEFT_OF
-	};
-
-	position = xf86GetOptValString (output->options,
-					OPTION_POSITION);
-	if (position)
-	    user_conf = TRUE;
-
-	relation = 0;
-	relative_name = NULL;
-	for (r = 0; r < 4; r++)
-	{
-	    relation = relations[r];
-	    relative_name = xf86GetOptValString (output->options,
-						     relation);
-	    if (relative_name)
-		break;
-	}
-	if (relative_name)
-	    user_conf = TRUE;
-
-	modes[o] = xf86OutputHasUserPreferredMode(output);
-	if (modes[o])
-	    user_conf = TRUE;
+    for (o = 0; o < config->num_output; o++) {
+        xf86OutputPtr output = config->output[o];
+        char *position;
+        char *relative_name;
+        OutputOpts relation;
+        int r;
+
+        static const OutputOpts relations[] = {
+            OPTION_BELOW, OPTION_RIGHT_OF, OPTION_ABOVE, OPTION_LEFT_OF
+        };
+
+        position = xf86GetOptValString(output->options, OPTION_POSITION);
+        if (position)
+            user_conf = TRUE;
+
+        relation = 0;
+        relative_name = NULL;
+        for (r = 0; r < 4; r++) {
+            relation = relations[r];
+            relative_name = xf86GetOptValString(output->options, relation);
+            if (relative_name)
+                break;
+        }
+        if (relative_name)
+            user_conf = TRUE;
+
+        modes[o] = xf86OutputHasUserPreferredMode(output);
+        if (modes[o])
+            user_conf = TRUE;
     }
 
     return user_conf;
 }
 
 static Bool
-xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
+xf86InitialOutputPositions(ScrnInfoPtr scrn, DisplayModePtr * modes)
 {
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			o;
-    int			min_x, min_y;
-    
-    for (o = 0; o < config->num_output; o++)
-    {
-	xf86OutputPtr	output = config->output[o];
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    int o;
+    int min_x, min_y;
+
+    for (o = 0; o < config->num_output; o++) {
+        xf86OutputPtr output = config->output[o];
 
-	output->initial_x = output->initial_y = POSITION_UNSET;
+        output->initial_x = output->initial_y = POSITION_UNSET;
     }
-    
+
     /*
      * Loop until all outputs are set
      */
-    for (;;)
-    {
-	Bool	any_set = FALSE;
-	Bool	keep_going = FALSE;
-
-	for (o = 0; o < config->num_output; o++)	
-	{
-	    static const OutputOpts	relations[] = {
-		OPTION_BELOW, OPTION_RIGHT_OF, OPTION_ABOVE, OPTION_LEFT_OF
-	    };
-	    xf86OutputPtr   output = config->output[o];
-	    xf86OutputPtr   relative;
-	    char	    *relative_name;
-	    char	    *position;
-	    OutputOpts	    relation;
-	    int		    r;
-
-	    if (output->initial_x != POSITION_UNSET)
-		continue;
-	    position = xf86GetOptValString (output->options,
-					    OPTION_POSITION);
-	    /*
-	     * Absolute position wins
-	     */
-	    if (position)
-	    {
-		int		    x, y;
-		if (sscanf (position, "%d %d", &x, &y) == 2)
-		{
-		    output->initial_x = x;
-		    output->initial_y = y;
-		}
-		else
-		{
-		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
-				"Output %s position not of form \"x y\"\n",
-				output->name);
-		    output->initial_x = output->initial_y = 0;
-		}
-		any_set = TRUE;
-		continue;
-	    }
-	    /*
-	     * Next comes relative positions
-	     */
-	    relation = 0;
-	    relative_name = NULL;
-	    for (r = 0; r < 4; r++)
-	    {
-		relation = relations[r];
-		relative_name = xf86GetOptValString (output->options,
-						     relation);
-		if (relative_name)
-		    break;
-	    }
-	    if (relative_name)
-	    {
-		int or;
-		relative = NULL;
-		for (or = 0; or < config->num_output; or++)
-		{
-		    xf86OutputPtr	out_rel = config->output[or];
-		    XF86ConfMonitorPtr	rel_mon = out_rel->conf_monitor;
-
-		    if (rel_mon)
-		    {
-			if (xf86nameCompare (rel_mon->mon_identifier,
-					      relative_name) == 0)
-			{
-			    relative = config->output[or];
-			    break;
-			}
-		    }
-		    if (strcmp (out_rel->name, relative_name) == 0)
-		    {
-			relative = config->output[or];
-			break;
-		    }
-		}
-		if (!relative)
-		{
-		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
-				"Cannot position output %s relative to unknown output %s\n",
-				output->name, relative_name);
-		    output->initial_x = 0;
-		    output->initial_y = 0;
-		    any_set = TRUE;
-		    continue;
-		}
-		if (!modes[or])
-		{
-		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
-				"Cannot position output %s relative to output %s without modes\n",
-				output->name, relative_name);
-		    output->initial_x = 0;
-		    output->initial_y = 0;
-		    any_set = TRUE;
-		    continue;
-		}
-		if (relative->initial_x == POSITION_UNSET)
-		{
-		    keep_going = TRUE;
-		    continue;
-		}
-		output->initial_x = relative->initial_x;
-		output->initial_y = relative->initial_y;
-		switch (relation) {
-		case OPTION_BELOW:
-		    output->initial_y += xf86ModeHeight (modes[or], relative->initial_rotation);
-		    break;
-		case OPTION_RIGHT_OF:
-		    output->initial_x += xf86ModeWidth (modes[or], relative->initial_rotation);
-		    break;
-		case OPTION_ABOVE:
-		    if (modes[o])
-			output->initial_y -= xf86ModeHeight (modes[o], output->initial_rotation);
-		    break;
-		case OPTION_LEFT_OF:
-		    if (modes[o])
-			output->initial_x -= xf86ModeWidth (modes[o], output->initial_rotation);
-		    break;
-		default:
-		    break;
-		}
-		any_set = TRUE;
-		continue;
-	    }
-	    
-	    /* Nothing set, just stick them at 0,0 */
-	    output->initial_x = 0;
-	    output->initial_y = 0;
-	    any_set = TRUE;
-	}
-	if (!keep_going)
-	    break;
-	if (!any_set) 
-	{
-	    for (o = 0; o < config->num_output; o++)
-	    {
-		xf86OutputPtr   output = config->output[o];
-		if (output->initial_x == POSITION_UNSET)
-		{
-		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
-				"Output position loop. Moving %s to 0,0\n",
-				output->name);
-		    output->initial_x = output->initial_y = 0;
-		    break;
-		}
-	    }
-	}
+    for (;;) {
+        Bool any_set = FALSE;
+        Bool keep_going = FALSE;
+
+        for (o = 0; o < config->num_output; o++) {
+            static const OutputOpts relations[] = {
+                OPTION_BELOW, OPTION_RIGHT_OF, OPTION_ABOVE, OPTION_LEFT_OF
+            };
+            xf86OutputPtr output = config->output[o];
+            xf86OutputPtr relative;
+            char *relative_name;
+            char *position;
+            OutputOpts relation;
+            int r;
+
+            if (output->initial_x != POSITION_UNSET)
+                continue;
+            position = xf86GetOptValString(output->options, OPTION_POSITION);
+            /*
+             * Absolute position wins
+             */
+            if (position) {
+                int x, y;
+
+                if (sscanf(position, "%d %d", &x, &y) == 2) {
+                    output->initial_x = x;
+                    output->initial_y = y;
+                }
+                else {
+                    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+                               "Output %s position not of form \"x y\"\n",
+                               output->name);
+                    output->initial_x = output->initial_y = 0;
+                }
+                any_set = TRUE;
+                continue;
+            }
+            /*
+             * Next comes relative positions
+             */
+            relation = 0;
+            relative_name = NULL;
+            for (r = 0; r < 4; r++) {
+                relation = relations[r];
+                relative_name = xf86GetOptValString(output->options, relation);
+                if (relative_name)
+                    break;
+            }
+            if (relative_name) {
+                int or;
+
+                relative = NULL;
+                for (or = 0; or < config->num_output; or++) {
+                    xf86OutputPtr out_rel = config->output[or];
+                    XF86ConfMonitorPtr rel_mon = out_rel->conf_monitor;
+
+                    if (rel_mon) {
+                        if (xf86nameCompare(rel_mon->mon_identifier,
+                                            relative_name) == 0) {
+                            relative = config->output[or];
+                            break;
+                        }
+                    }
+                    if (strcmp(out_rel->name, relative_name) == 0) {
+                        relative = config->output[or];
+                        break;
+                    }
+                }
+                if (!relative) {
+                    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+                               "Cannot position output %s relative to unknown output %s\n",
+                               output->name, relative_name);
+                    output->initial_x = 0;
+                    output->initial_y = 0;
+                    any_set = TRUE;
+                    continue;
+                }
+                if (!modes[or]) {
+                    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+                               "Cannot position output %s relative to output %s without modes\n",
+                               output->name, relative_name);
+                    output->initial_x = 0;
+                    output->initial_y = 0;
+                    any_set = TRUE;
+                    continue;
+                }
+                if (relative->initial_x == POSITION_UNSET) {
+                    keep_going = TRUE;
+                    continue;
+                }
+                output->initial_x = relative->initial_x;
+                output->initial_y = relative->initial_y;
+                switch (relation) {
+                case OPTION_BELOW:
+                    output->initial_y +=
+                        xf86ModeHeight(modes[or], relative->initial_rotation);
+                    break;
+                case OPTION_RIGHT_OF:
+                    output->initial_x +=
+                        xf86ModeWidth(modes[or], relative->initial_rotation);
+                    break;
+                case OPTION_ABOVE:
+                    if (modes[o])
+                        output->initial_y -=
+                            xf86ModeHeight(modes[o], output->initial_rotation);
+                    break;
+                case OPTION_LEFT_OF:
+                    if (modes[o])
+                        output->initial_x -=
+                            xf86ModeWidth(modes[o], output->initial_rotation);
+                    break;
+                default:
+                    break;
+                }
+                any_set = TRUE;
+                continue;
+            }
+
+            /* Nothing set, just stick them at 0,0 */
+            output->initial_x = 0;
+            output->initial_y = 0;
+            any_set = TRUE;
+        }
+        if (!keep_going)
+            break;
+        if (!any_set) {
+            for (o = 0; o < config->num_output; o++) {
+                xf86OutputPtr output = config->output[o];
+
+                if (output->initial_x == POSITION_UNSET) {
+                    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+                               "Output position loop. Moving %s to 0,0\n",
+                               output->name);
+                    output->initial_x = output->initial_y = 0;
+                    break;
+                }
+            }
+        }
     }
 
     /*
@@ -1310,92 +1268,89 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
      */
     min_x = 1000000;
     min_y = 1000000;
-    for (o = 0; o < config->num_output; o++)
-    {
-	xf86OutputPtr	output = config->output[o];
+    for (o = 0; o < config->num_output; o++) {
+        xf86OutputPtr output = config->output[o];
 
-	if (output->initial_x < min_x)
-	    min_x = output->initial_x;
-	if (output->initial_y < min_y)
-	    min_y = output->initial_y;
+        if (output->initial_x < min_x)
+            min_x = output->initial_x;
+        if (output->initial_y < min_y)
+            min_y = output->initial_y;
     }
-    
-    for (o = 0; o < config->num_output; o++)
-    {
-	xf86OutputPtr	output = config->output[o];
 
-	output->initial_x -= min_x;
-	output->initial_y -= min_y;
+    for (o = 0; o < config->num_output; o++) {
+        xf86OutputPtr output = config->output[o];
+
+        output->initial_x -= min_x;
+        output->initial_y -= min_y;
     }
     return TRUE;
 }
 
 static void
-xf86InitialPanning (ScrnInfoPtr scrn)
+xf86InitialPanning(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			o;
-    
-    for (o = 0; o < config->num_output; o++)
-    {
-	xf86OutputPtr	output = config->output[o];
-	char	       *panning = xf86GetOptValString (output->options, OPTION_PANNING);
-	int		width, height, left, top;
-	int		track_width, track_height, track_left, track_top;
-	int		brdr[4];
-
-	memset (&output->initialTotalArea,    0, sizeof(BoxRec));
-	memset (&output->initialTrackingArea, 0, sizeof(BoxRec));
-	memset (output->initialBorder,        0, 4*sizeof(INT16));
-
-	if (! panning)
-	    continue;
-
-	switch (sscanf (panning, "%dx%d+%d+%d/%dx%d+%d+%d/%d/%d/%d/%d",
-			&width, &height, &left, &top,
-			&track_width, &track_height, &track_left, &track_top,
-			&brdr[0], &brdr[1], &brdr[2], &brdr[3])) {
-	case 12:
-	    output->initialBorder[0] = brdr[0];
-	    output->initialBorder[1] = brdr[1];
-	    output->initialBorder[2] = brdr[2];
-	    output->initialBorder[3] = brdr[3];
-	    /* fall through */
-	case 8:
-	    output->initialTrackingArea.x1 = track_left;
-	    output->initialTrackingArea.y1 = track_top;
-	    output->initialTrackingArea.x2 = track_left + track_width;
-	    output->initialTrackingArea.y2 = track_top  + track_height;
-	    /* fall through */
-	case 4:
-	    output->initialTotalArea.x1 = left;
-	    output->initialTotalArea.y1 = top;
-	    /* fall through */
-	case 2:
-	    output->initialTotalArea.x2 = output->initialTotalArea.x1 + width;
-	    output->initialTotalArea.y2 = output->initialTotalArea.y1 + height;
-	    break;
-	default:
-	    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
-			"Broken panning specification '%s' for output %s in config file\n",
-			panning, output->name);
-	}
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    int o;
+
+    for (o = 0; o < config->num_output; o++) {
+        xf86OutputPtr output = config->output[o];
+        char *panning = xf86GetOptValString(output->options, OPTION_PANNING);
+        int width, height, left, top;
+        int track_width, track_height, track_left, track_top;
+        int brdr[4];
+
+        memset(&output->initialTotalArea, 0, sizeof(BoxRec));
+        memset(&output->initialTrackingArea, 0, sizeof(BoxRec));
+        memset(output->initialBorder, 0, 4 * sizeof(INT16));
+
+        if (!panning)
+            continue;
+
+        switch (sscanf(panning, "%dx%d+%d+%d/%dx%d+%d+%d/%d/%d/%d/%d",
+                       &width, &height, &left, &top,
+                       &track_width, &track_height, &track_left, &track_top,
+                       &brdr[0], &brdr[1], &brdr[2], &brdr[3])) {
+        case 12:
+            output->initialBorder[0] = brdr[0];
+            output->initialBorder[1] = brdr[1];
+            output->initialBorder[2] = brdr[2];
+            output->initialBorder[3] = brdr[3];
+            /* fall through */
+        case 8:
+            output->initialTrackingArea.x1 = track_left;
+            output->initialTrackingArea.y1 = track_top;
+            output->initialTrackingArea.x2 = track_left + track_width;
+            output->initialTrackingArea.y2 = track_top + track_height;
+            /* fall through */
+        case 4:
+            output->initialTotalArea.x1 = left;
+            output->initialTotalArea.y1 = top;
+            /* fall through */
+        case 2:
+            output->initialTotalArea.x2 = output->initialTotalArea.x1 + width;
+            output->initialTotalArea.y2 = output->initialTotalArea.y1 + height;
+            break;
+        default:
+            xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+                       "Broken panning specification '%s' for output %s in config file\n",
+                       panning, output->name);
+        }
     }
 }
 
 /** Return - 0 + if a should be earlier, same or later than b in list
  */
 static int
-xf86ModeCompare (DisplayModePtr a, DisplayModePtr b)
+xf86ModeCompare(DisplayModePtr a, DisplayModePtr b)
 {
-    int	diff;
+    int diff;
 
     diff = ((b->type & M_T_PREFERRED) != 0) - ((a->type & M_T_PREFERRED) != 0);
     if (diff)
-	return diff;
+        return diff;
     diff = b->HDisplay * b->VDisplay - a->HDisplay * a->VDisplay;
     if (diff)
-	return diff;
+        return diff;
     diff = b->Clock - a->Clock;
     return diff;
 }
@@ -1404,38 +1359,34 @@ xf86ModeCompare (DisplayModePtr a, DisplayModePtr b)
  * Insertion sort input in-place and return the resulting head
  */
 static DisplayModePtr
-xf86SortModes (DisplayModePtr input)
+xf86SortModes(DisplayModePtr input)
 {
-    DisplayModePtr  output = NULL, i, o, n, *op, prev;
+    DisplayModePtr output = NULL, i, o, n, *op, prev;
 
     /* sort by preferred status and pixel area */
-    while (input)
-    {
-	i = input;
-	input = input->next;
-	for (op = &output; (o = *op); op = &o->next)
-	    if (xf86ModeCompare (o, i) > 0)
-		break;
-	i->next = *op;
-	*op = i;
+    while (input) {
+        i = input;
+        input = input->next;
+        for (op = &output; (o = *op); op = &o->next)
+            if (xf86ModeCompare(o, i) > 0)
+                break;
+        i->next = *op;
+        *op = i;
     }
     /* prune identical modes */
-    for (o = output; o && (n = o->next); o = n)
-    {
-	if (!strcmp (o->name, n->name) && xf86ModesEqual (o, n))
-	{
-	    o->next = n->next;
-	    free(n->name);
-	    free(n);
-	    n = o;
-	}
+    for (o = output; o && (n = o->next); o = n) {
+        if (!strcmp(o->name, n->name) && xf86ModesEqual(o, n)) {
+            o->next = n->next;
+            free(n->name);
+            free(n);
+            n = o;
+        }
     }
     /* hook up backward links */
     prev = NULL;
-    for (o = output; o; o = o->next)
-    {
-	o->prev = prev;
-	prev = o;
+    for (o = output; o; o = o->next) {
+        o->prev = prev;
+        prev = o;
     }
     return output;
 }
@@ -1446,13 +1397,13 @@ preferredMode(ScrnInfoPtr pScrn, xf86OutputPtr output)
     char *preferred_mode = NULL;
 
     /* Check for a configured preference for a particular mode */
-    preferred_mode = xf86GetOptValString (output->options,
-					  OPTION_PREFERRED_MODE);
+    preferred_mode = xf86GetOptValString(output->options,
+                                         OPTION_PREFERRED_MODE);
     if (preferred_mode)
-	return preferred_mode;
+        return preferred_mode;
 
     if (pScrn->display->modes && *pScrn->display->modes)
-	preferred_mode = *pScrn->display->modes;
+        preferred_mode = *pScrn->display->modes;
 
     return preferred_mode;
 }
@@ -1461,7 +1412,7 @@ static void
 GuessRangeFromModes(MonPtr mon, DisplayModePtr mode)
 {
     if (!mon || !mode)
-       return;
+        return;
 
     mon->nHsync = 1;
     mon->hsync[0].lo = 1024.0;
@@ -1472,33 +1423,33 @@ GuessRangeFromModes(MonPtr mon, DisplayModePtr mode)
     mon->vrefresh[0].hi = 0.0;
 
     while (mode) {
-	if (!mode->HSync)
-	    mode->HSync = ((float) mode->Clock ) / ((float) mode->HTotal);
+        if (!mode->HSync)
+            mode->HSync = ((float) mode->Clock) / ((float) mode->HTotal);
 
-	if (!mode->VRefresh)
-	    mode->VRefresh = (1000.0 * ((float) mode->Clock)) / 
-		((float) (mode->HTotal * mode->VTotal));
+        if (!mode->VRefresh)
+            mode->VRefresh = (1000.0 * ((float) mode->Clock)) /
+                ((float) (mode->HTotal * mode->VTotal));
 
-	if (mode->HSync < mon->hsync[0].lo)
-	    mon->hsync[0].lo = mode->HSync;
+        if (mode->HSync < mon->hsync[0].lo)
+            mon->hsync[0].lo = mode->HSync;
 
-	if (mode->HSync > mon->hsync[0].hi)
-	    mon->hsync[0].hi = mode->HSync;
+        if (mode->HSync > mon->hsync[0].hi)
+            mon->hsync[0].hi = mode->HSync;
 
-	if (mode->VRefresh < mon->vrefresh[0].lo)
-	    mon->vrefresh[0].lo = mode->VRefresh;
+        if (mode->VRefresh < mon->vrefresh[0].lo)
+            mon->vrefresh[0].lo = mode->VRefresh;
 
-	if (mode->VRefresh > mon->vrefresh[0].hi)
-	    mon->vrefresh[0].hi = mode->VRefresh;
+        if (mode->VRefresh > mon->vrefresh[0].hi)
+            mon->vrefresh[0].hi = mode->VRefresh;
 
-	mode = mode->next;
+        mode = mode->next;
     }
 
     /* stretch out the bottom to fit 640x480@60 */
     if (mon->hsync[0].lo > 31.0)
-       mon->hsync[0].lo = 31.0;
+        mon->hsync[0].lo = 31.0;
     if (mon->vrefresh[0].lo > 58.0)
-       mon->vrefresh[0].lo = 58.0;
+        mon->vrefresh[0].lo = 58.0;
 }
 
 enum det_monrec_source {
@@ -1513,14 +1464,16 @@ struct det_monrec_parameter {
     enum det_monrec_source *sync_source;
 };
 
-static void handle_detailed_monrec(struct detailed_monitor_section *det_mon,
-                                   void *data)
+static void
+handle_detailed_monrec(struct detailed_monitor_section *det_mon, void *data)
 {
     struct det_monrec_parameter *p;
-    p = (struct det_monrec_parameter *)data;
+
+    p = (struct det_monrec_parameter *) data;
 
     if (det_mon->type == DS_RANGES) {
         struct monitor_ranges *ranges = &det_mon->section.ranges;
+
         if (p->set_hsync && ranges->max_h) {
             p->mon_rec->hsync[p->mon_rec->nHsync].lo = ranges->min_h;
             p->mon_rec->hsync[p->mon_rec->nHsync].hi = ranges->max_h;
@@ -1541,10 +1494,10 @@ static void handle_detailed_monrec(struct detailed_monitor_section *det_mon,
 }
 
 void
-xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+xf86ProbeOutputModes(ScrnInfoPtr scrn, int maxX, int maxY)
 {
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			o;
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    int o;
 
     /* When canGrow was TRUE in the initial configuration we have to
      * compare against the maximum values so that we don't drop modes.
@@ -1552,251 +1505,238 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
      * anyway.
      */
     if (maxX == 0 || maxY == 0) {
-	maxX = config->maxWidth;
-	maxY = config->maxHeight;
+        maxX = config->maxWidth;
+        maxY = config->maxHeight;
     }
 
     /* Probe the list of modes for each output. */
-    for (o = 0; o < config->num_output; o++) 
-    {
-	xf86OutputPtr	    output = config->output[o];
-	DisplayModePtr	    mode;
-	DisplayModePtr	    config_modes = NULL, output_modes, default_modes = NULL;
-	char		    *preferred_mode;
-	xf86MonPtr	    edid_monitor;
-	XF86ConfMonitorPtr  conf_monitor;
-	MonRec		    mon_rec;
-	int		    min_clock = 0;
-	int		    max_clock = 0;
-	double		    clock;
-	Bool		    add_default_modes;
-	Bool		    debug_modes = config->debug_modes ||
-					  xf86Initialising;
-	enum det_monrec_source sync_source = sync_default;
-	
-	while (output->probed_modes != NULL)
-	    xf86DeleteMode(&output->probed_modes, output->probed_modes);
-
-	/*
-	 * Check connection status
-	 */
-	output->status = (*output->funcs->detect)(output);
-
-	if (output->status == XF86OutputStatusDisconnected &&
-		!xf86ReturnOptValBool(output->options, OPTION_ENABLE, FALSE))
-	{
-	    xf86OutputSetEDID (output, NULL);
-	    continue;
-	}
-
-	memset (&mon_rec, '\0', sizeof (mon_rec));
-	
-	conf_monitor = output->conf_monitor;
-	
-	if (conf_monitor)
-	{
-	    int	i;
-	    
-	    for (i = 0; i < conf_monitor->mon_n_hsync; i++)
-	    {
-		mon_rec.hsync[mon_rec.nHsync].lo = conf_monitor->mon_hsync[i].lo;
-		mon_rec.hsync[mon_rec.nHsync].hi = conf_monitor->mon_hsync[i].hi;
-		mon_rec.nHsync++;
-		sync_source = sync_config;
-	    }
-	    for (i = 0; i < conf_monitor->mon_n_vrefresh; i++)
-	    {
-		mon_rec.vrefresh[mon_rec.nVrefresh].lo = conf_monitor->mon_vrefresh[i].lo;
-		mon_rec.vrefresh[mon_rec.nVrefresh].hi = conf_monitor->mon_vrefresh[i].hi;
-		mon_rec.nVrefresh++;
-		sync_source = sync_config;
-	    }
-	    config_modes = xf86GetMonitorModes (scrn, conf_monitor);
-	}
-	
-	output_modes = (*output->funcs->get_modes) (output);
-
-	/*
-	 * If the user has a preference, respect it.
-	 * Otherwise, don't second-guess the driver.
-	 */
-	if (!xf86GetOptValBool(output->options, OPTION_DEFAULT_MODES,
-			       &add_default_modes))
-	    add_default_modes = (output_modes == NULL);
-	
-	edid_monitor = output->MonInfo;
-	
-        if (edid_monitor)
-        {
+    for (o = 0; o < config->num_output; o++) {
+        xf86OutputPtr output = config->output[o];
+        DisplayModePtr mode;
+        DisplayModePtr config_modes = NULL, output_modes, default_modes = NULL;
+        char *preferred_mode;
+        xf86MonPtr edid_monitor;
+        XF86ConfMonitorPtr conf_monitor;
+        MonRec mon_rec;
+        int min_clock = 0;
+        int max_clock = 0;
+        double clock;
+        Bool add_default_modes;
+        Bool debug_modes = config->debug_modes || xf86Initialising;
+        enum det_monrec_source sync_source = sync_default;
+
+        while (output->probed_modes != NULL)
+            xf86DeleteMode(&output->probed_modes, output->probed_modes);
+
+        /*
+         * Check connection status
+         */
+        output->status = (*output->funcs->detect) (output);
+
+        if (output->status == XF86OutputStatusDisconnected &&
+            !xf86ReturnOptValBool(output->options, OPTION_ENABLE, FALSE)) {
+            xf86OutputSetEDID(output, NULL);
+            continue;
+        }
+
+        memset(&mon_rec, '\0', sizeof(mon_rec));
+
+        conf_monitor = output->conf_monitor;
+
+        if (conf_monitor) {
+            int i;
+
+            for (i = 0; i < conf_monitor->mon_n_hsync; i++) {
+                mon_rec.hsync[mon_rec.nHsync].lo =
+                    conf_monitor->mon_hsync[i].lo;
+                mon_rec.hsync[mon_rec.nHsync].hi =
+                    conf_monitor->mon_hsync[i].hi;
+                mon_rec.nHsync++;
+                sync_source = sync_config;
+            }
+            for (i = 0; i < conf_monitor->mon_n_vrefresh; i++) {
+                mon_rec.vrefresh[mon_rec.nVrefresh].lo =
+                    conf_monitor->mon_vrefresh[i].lo;
+                mon_rec.vrefresh[mon_rec.nVrefresh].hi =
+                    conf_monitor->mon_vrefresh[i].hi;
+                mon_rec.nVrefresh++;
+                sync_source = sync_config;
+            }
+            config_modes = xf86GetMonitorModes(scrn, conf_monitor);
+        }
+
+        output_modes = (*output->funcs->get_modes) (output);
+
+        /*
+         * If the user has a preference, respect it.
+         * Otherwise, don't second-guess the driver.
+         */
+        if (!xf86GetOptValBool(output->options, OPTION_DEFAULT_MODES,
+                               &add_default_modes))
+            add_default_modes = (output_modes == NULL);
+
+        edid_monitor = output->MonInfo;
+
+        if (edid_monitor) {
             struct det_monrec_parameter p;
-            struct disp_features    *features = &edid_monitor->features;
-
-	    /* if display is not continuous-frequency, don't add default modes */
-	    if (!GTF_SUPPORTED(features->msc))
-		add_default_modes = FALSE;
-
-	    p.mon_rec = &mon_rec;
-	    p.max_clock = &max_clock;
-	    p.set_hsync = mon_rec.nHsync == 0;
-	    p.set_vrefresh = mon_rec.nVrefresh == 0;
-	    p.sync_source = &sync_source;
-
-	    xf86ForEachDetailedBlock(edid_monitor,
-			             handle_detailed_monrec,
-			             &p);
-	}
-
-	if (xf86GetOptValFreq (output->options, OPTION_MIN_CLOCK,
-			       OPTUNITS_KHZ, &clock))
-	    min_clock = (int) clock;
-	if (xf86GetOptValFreq (output->options, OPTION_MAX_CLOCK,
-			       OPTUNITS_KHZ, &clock))
-	    max_clock = (int) clock;
-
-	/* If we still don't have a sync range, guess wildly */
-	if (!mon_rec.nHsync || !mon_rec.nVrefresh)
-	    GuessRangeFromModes(&mon_rec, output_modes);
-
-	/*
-	 * These limits will end up setting a 1024x768@60Hz mode by default,
-	 * which seems like a fairly good mode to use when nothing else is
-	 * specified
-	 */
-	if (mon_rec.nHsync == 0)
-	{
-	    mon_rec.hsync[0].lo = 31.0;
-	    mon_rec.hsync[0].hi = 55.0;
-	    mon_rec.nHsync = 1;
-	}
-	if (mon_rec.nVrefresh == 0)
-	{
-	    mon_rec.vrefresh[0].lo = 58.0;
-	    mon_rec.vrefresh[0].hi = 62.0;
-	    mon_rec.nVrefresh = 1;
-	}
-
-	if (add_default_modes)
-	    default_modes = xf86GetDefaultModes ();
-
-	/*
-	 * If this is not an RB monitor, remove RB modes from the default
-	 * pool.  RB modes from the config or the monitor itself are fine.
-	 */
-	if (!mon_rec.reducedblanking)
-	    xf86ValidateModesReducedBlanking (scrn, default_modes);
-
-	if (sync_source == sync_config)
-	{
-	    /* 
-	     * Check output and config modes against sync range from config file
-	     */
-	    xf86ValidateModesSync (scrn, output_modes, &mon_rec);
-	    xf86ValidateModesSync (scrn, config_modes, &mon_rec);
-	}
-	/*
-	 * Check default modes against sync range
-	 */
-        xf86ValidateModesSync (scrn, default_modes, &mon_rec);
-	/*
-	 * Check default modes against monitor max clock
-	 */
-	if (max_clock) {
-	    xf86ValidateModesClocks(scrn, default_modes,
-				    &min_clock, &max_clock, 1);
-	    xf86ValidateModesClocks(scrn, output_modes,
-				    &min_clock, &max_clock, 1);
-	}
-	
-	output->probed_modes = NULL;
-	output->probed_modes = xf86ModesAdd (output->probed_modes, config_modes);
-	output->probed_modes = xf86ModesAdd (output->probed_modes, output_modes);
-	output->probed_modes = xf86ModesAdd (output->probed_modes, default_modes);
-	
-	/*
-	 * Check all modes against max size, interlace, and doublescan
-	 */
-	if (maxX && maxY)
-	    xf86ValidateModesSize (scrn, output->probed_modes,
-				       maxX, maxY, 0);
-
-	{
-	    int flags = (output->interlaceAllowed ? V_INTERLACE : 0) |
-			(output->doubleScanAllowed ? V_DBLSCAN : 0);
-	    xf86ValidateModesFlags (scrn, output->probed_modes, flags);
-	}
-	 
-	/*
-	 * Check all modes against output
-	 */
-	for (mode = output->probed_modes; mode != NULL; mode = mode->next) 
-	    if (mode->status == MODE_OK)
-		mode->status = (*output->funcs->mode_valid)(output, mode);
-	
-	xf86PruneInvalidModes(scrn, &output->probed_modes, debug_modes);
-	
-	output->probed_modes = xf86SortModes (output->probed_modes);
-	
-	/* Check for a configured preference for a particular mode */
-	preferred_mode = preferredMode(scrn, output);
-
-	if (preferred_mode)
-	{
-	    for (mode = output->probed_modes; mode; mode = mode->next)
-	    {
-		if (!strcmp (preferred_mode, mode->name))
-		{
-		    if (mode != output->probed_modes)
-		    {
-			if (mode->prev)
-			    mode->prev->next = mode->next;
-			if (mode->next)
-			    mode->next->prev = mode->prev;
-			mode->next = output->probed_modes;
-			output->probed_modes->prev = mode;
-			mode->prev = NULL;
-			output->probed_modes = mode;
-		    }
-		    mode->type |= (M_T_PREFERRED|M_T_USERPREF);
-		    break;
-		}
-	    }
-	}
-	
-	output->initial_rotation = xf86OutputInitialRotation (output);
-
-	if (debug_modes) {
-	    if (output->probed_modes != NULL) {
-		xf86DrvMsg(scrn->scrnIndex, X_INFO,
-			   "Printing probed modes for output %s\n",
-			   output->name);
-	    } else {
-		xf86DrvMsg(scrn->scrnIndex, X_INFO,
-			   "No remaining probed modes for output %s\n",
-			   output->name);
-	    }
-	}
-	for (mode = output->probed_modes; mode != NULL; mode = mode->next)
-	{
-	    /* The code to choose the best mode per pipe later on will require
-	     * VRefresh to be set.
-	     */
-	    mode->VRefresh = xf86ModeVRefresh(mode);
-	    xf86SetModeCrtc(mode, INTERLACE_HALVE_V);
-
-	    if (debug_modes)
-		xf86PrintModeline(scrn->scrnIndex, mode);
-	}
+            struct disp_features *features = &edid_monitor->features;
+
+            /* if display is not continuous-frequency, don't add default modes */
+            if (!GTF_SUPPORTED(features->msc))
+                add_default_modes = FALSE;
+
+            p.mon_rec = &mon_rec;
+            p.max_clock = &max_clock;
+            p.set_hsync = mon_rec.nHsync == 0;
+            p.set_vrefresh = mon_rec.nVrefresh == 0;
+            p.sync_source = &sync_source;
+
+            xf86ForEachDetailedBlock(edid_monitor, handle_detailed_monrec, &p);
+        }
+
+        if (xf86GetOptValFreq(output->options, OPTION_MIN_CLOCK,
+                              OPTUNITS_KHZ, &clock))
+            min_clock = (int) clock;
+        if (xf86GetOptValFreq(output->options, OPTION_MAX_CLOCK,
+                              OPTUNITS_KHZ, &clock))
+            max_clock = (int) clock;
+
+        /* If we still don't have a sync range, guess wildly */
+        if (!mon_rec.nHsync || !mon_rec.nVrefresh)
+            GuessRangeFromModes(&mon_rec, output_modes);
+
+        /*
+         * These limits will end up setting a 1024x768@60Hz mode by default,
+         * which seems like a fairly good mode to use when nothing else is
+         * specified
+         */
+        if (mon_rec.nHsync == 0) {
+            mon_rec.hsync[0].lo = 31.0;
+            mon_rec.hsync[0].hi = 55.0;
+            mon_rec.nHsync = 1;
+        }
+        if (mon_rec.nVrefresh == 0) {
+            mon_rec.vrefresh[0].lo = 58.0;
+            mon_rec.vrefresh[0].hi = 62.0;
+            mon_rec.nVrefresh = 1;
+        }
+
+        if (add_default_modes)
+            default_modes = xf86GetDefaultModes();
+
+        /*
+         * If this is not an RB monitor, remove RB modes from the default
+         * pool.  RB modes from the config or the monitor itself are fine.
+         */
+        if (!mon_rec.reducedblanking)
+            xf86ValidateModesReducedBlanking(scrn, default_modes);
+
+        if (sync_source == sync_config) {
+            /* 
+             * Check output and config modes against sync range from config file
+             */
+            xf86ValidateModesSync(scrn, output_modes, &mon_rec);
+            xf86ValidateModesSync(scrn, config_modes, &mon_rec);
+        }
+        /*
+         * Check default modes against sync range
+         */
+        xf86ValidateModesSync(scrn, default_modes, &mon_rec);
+        /*
+         * Check default modes against monitor max clock
+         */
+        if (max_clock) {
+            xf86ValidateModesClocks(scrn, default_modes,
+                                    &min_clock, &max_clock, 1);
+            xf86ValidateModesClocks(scrn, output_modes,
+                                    &min_clock, &max_clock, 1);
+        }
+
+        output->probed_modes = NULL;
+        output->probed_modes = xf86ModesAdd(output->probed_modes, config_modes);
+        output->probed_modes = xf86ModesAdd(output->probed_modes, output_modes);
+        output->probed_modes =
+            xf86ModesAdd(output->probed_modes, default_modes);
+
+        /*
+         * Check all modes against max size, interlace, and doublescan
+         */
+        if (maxX && maxY)
+            xf86ValidateModesSize(scrn, output->probed_modes, maxX, maxY, 0);
+
+        {
+            int flags = (output->interlaceAllowed ? V_INTERLACE : 0) |
+                (output->doubleScanAllowed ? V_DBLSCAN : 0);
+            xf86ValidateModesFlags(scrn, output->probed_modes, flags);
+        }
+
+        /*
+         * Check all modes against output
+         */
+        for (mode = output->probed_modes; mode != NULL; mode = mode->next)
+            if (mode->status == MODE_OK)
+                mode->status = (*output->funcs->mode_valid) (output, mode);
+
+        xf86PruneInvalidModes(scrn, &output->probed_modes, debug_modes);
+
+        output->probed_modes = xf86SortModes(output->probed_modes);
+
+        /* Check for a configured preference for a particular mode */
+        preferred_mode = preferredMode(scrn, output);
+
+        if (preferred_mode) {
+            for (mode = output->probed_modes; mode; mode = mode->next) {
+                if (!strcmp(preferred_mode, mode->name)) {
+                    if (mode != output->probed_modes) {
+                        if (mode->prev)
+                            mode->prev->next = mode->next;
+                        if (mode->next)
+                            mode->next->prev = mode->prev;
+                        mode->next = output->probed_modes;
+                        output->probed_modes->prev = mode;
+                        mode->prev = NULL;
+                        output->probed_modes = mode;
+                    }
+                    mode->type |= (M_T_PREFERRED | M_T_USERPREF);
+                    break;
+                }
+            }
+        }
+
+        output->initial_rotation = xf86OutputInitialRotation(output);
+
+        if (debug_modes) {
+            if (output->probed_modes != NULL) {
+                xf86DrvMsg(scrn->scrnIndex, X_INFO,
+                           "Printing probed modes for output %s\n",
+                           output->name);
+            }
+            else {
+                xf86DrvMsg(scrn->scrnIndex, X_INFO,
+                           "No remaining probed modes for output %s\n",
+                           output->name);
+            }
+        }
+        for (mode = output->probed_modes; mode != NULL; mode = mode->next) {
+            /* The code to choose the best mode per pipe later on will require
+             * VRefresh to be set.
+             */
+            mode->VRefresh = xf86ModeVRefresh(mode);
+            xf86SetModeCrtc(mode, INTERLACE_HALVE_V);
+
+            if (debug_modes)
+                xf86PrintModeline(scrn->scrnIndex, mode);
+        }
     }
 }
 
-
 /**
  * Copy one of the output mode lists to the ScrnInfo record
  */
 
 /* XXX where does this function belong? Here? */
 void
-xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr scrn, int *x, int *y);
+ xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr scrn, int *x, int *y);
 
 static DisplayModePtr
 biggestMode(DisplayModePtr a, DisplayModePtr b)
@@ -1804,15 +1744,15 @@ biggestMode(DisplayModePtr a, DisplayModePtr b)
     int A, B;
 
     if (!a)
-	return b;
+        return b;
     if (!b)
-	return a;
+        return a;
 
     A = a->HDisplay * a->VDisplay;
     B = b->HDisplay * b->VDisplay;
 
     if (A > B)
-	return a;
+        return a;
 
     return b;
 }
@@ -1825,141 +1765,143 @@ SetCompatOutput(xf86CrtcConfigPtr config)
     int o, compat = -1, count, mincount = 0;
 
     /* Look for one that's definitely connected */
-    for (o = 0; o < config->num_output; o++)
-    {
-	test = config->output[o];
-	if (!test->crtc)
-	    continue;
-	if (test->status != XF86OutputStatusConnected)
-	    continue;
-	if (!test->probed_modes)
-	    continue;
-
-	testmode = mode = test->probed_modes;
-	for (count = 0; mode; mode = mode->next, count++)
-	    testmode = biggestMode(testmode, mode);
-
-	if (!output) {
-	    output = test;
-	    compat = o;
-	    maxmode = testmode;
-	    mincount = count;
-	} else if (maxmode == biggestMode(maxmode, testmode)) {
-	    output = test;
-	    compat = o;
-	    maxmode = testmode;
-	    mincount = count;
-	} else if ((maxmode->HDisplay == testmode->HDisplay) && 
-		(maxmode->VDisplay == testmode->VDisplay) &&
-		count <= mincount) {
-	    output = test;
-	    compat = o;
-	    maxmode = testmode;
-	    mincount = count;
-	}
+    for (o = 0; o < config->num_output; o++) {
+        test = config->output[o];
+        if (!test->crtc)
+            continue;
+        if (test->status != XF86OutputStatusConnected)
+            continue;
+        if (!test->probed_modes)
+            continue;
+
+        testmode = mode = test->probed_modes;
+        for (count = 0; mode; mode = mode->next, count++)
+            testmode = biggestMode(testmode, mode);
+
+        if (!output) {
+            output = test;
+            compat = o;
+            maxmode = testmode;
+            mincount = count;
+        }
+        else if (maxmode == biggestMode(maxmode, testmode)) {
+            output = test;
+            compat = o;
+            maxmode = testmode;
+            mincount = count;
+        }
+        else if ((maxmode->HDisplay == testmode->HDisplay) &&
+                 (maxmode->VDisplay == testmode->VDisplay) &&
+                 count <= mincount) {
+            output = test;
+            compat = o;
+            maxmode = testmode;
+            mincount = count;
+        }
     }
 
     /* If we didn't find one, take anything we can get */
-    if (!output)
-    {
-	for (o = 0; o < config->num_output; o++)
-	{
-	    test = config->output[o];
-	    if (!test->crtc)
-		continue;
-	    if (!test->probed_modes)
-		continue;
-
-	    if (!output) {
-		output = test;
-		compat = o;
-	    } else if (test->probed_modes->HDisplay < output->probed_modes->HDisplay) {
-		output = test;
-		compat = o;
-	    }
-	}
+    if (!output) {
+        for (o = 0; o < config->num_output; o++) {
+            test = config->output[o];
+            if (!test->crtc)
+                continue;
+            if (!test->probed_modes)
+                continue;
+
+            if (!output) {
+                output = test;
+                compat = o;
+            }
+            else if (test->probed_modes->HDisplay <
+                     output->probed_modes->HDisplay) {
+                output = test;
+                compat = o;
+            }
+        }
     }
 
     if (compat >= 0) {
-	config->compat_output = compat;
-    } else {
-	/* Don't change the compat output when no valid outputs found */
-	output = config->output[config->compat_output];
+        config->compat_output = compat;
+    }
+    else {
+        /* Don't change the compat output when no valid outputs found */
+        output = config->output[config->compat_output];
     }
 
     return output;
 }
 
 void
-xf86SetScrnInfoModes (ScrnInfoPtr scrn)
+xf86SetScrnInfoModes(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86OutputPtr	output;
-    xf86CrtcPtr		crtc;
-    DisplayModePtr	last, mode = NULL;
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86OutputPtr output;
+    xf86CrtcPtr crtc;
+    DisplayModePtr last, mode = NULL;
 
     output = SetCompatOutput(config);
 
     if (!output)
-	return; /* punt */
+        return;                 /* punt */
 
     crtc = output->crtc;
 
     /* Clear any existing modes from scrn->modes */
     while (scrn->modes != NULL)
-	xf86DeleteMode(&scrn->modes, scrn->modes);
+        xf86DeleteMode(&scrn->modes, scrn->modes);
 
     /* Set scrn->modes to the mode list for the 'compat' output */
     scrn->modes = xf86DuplicateModes(scrn, output->probed_modes);
 
     if (crtc) {
-	for (mode = scrn->modes; mode; mode = mode->next)
-	    if (xf86ModesEqual (mode, &crtc->desiredMode))
-		break;
+        for (mode = scrn->modes; mode; mode = mode->next)
+            if (xf86ModesEqual(mode, &crtc->desiredMode))
+                break;
     }
 
     if (!scrn->modes) {
-	scrn->modes = xf86ModesAdd(scrn->modes,
-				   xf86CVTMode(scrn->display->virtualX,
-					       scrn->display->virtualY,
-					       60, 0, 0));
+        scrn->modes = xf86ModesAdd(scrn->modes,
+                                   xf86CVTMode(scrn->display->virtualX,
+                                               scrn->display->virtualY,
+                                               60, 0, 0));
     }
 
     /* For some reason, scrn->modes is circular, unlike the other mode
      * lists.  How great is that?
      */
-    for (last = scrn->modes; last && last->next; last = last->next)
-	;
+    for (last = scrn->modes; last && last->next; last = last->next);
     last->next = scrn->modes;
     scrn->modes->prev = last;
     if (mode) {
-	while (scrn->modes != mode)
-	    scrn->modes = scrn->modes->next;
+        while (scrn->modes != mode)
+            scrn->modes = scrn->modes->next;
     }
 
     scrn->currentMode = scrn->modes;
 #ifdef XFreeXDGA
     if (scrn->pScreen)
-	    _xf86_di_dga_reinit_internal(scrn->pScreen);
+        _xf86_di_dga_reinit_internal(scrn->pScreen);
 #endif
 }
 
 static Bool
 xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
-			  Bool *enabled)
+                          Bool *enabled)
 {
     Bool any_enabled = FALSE;
     int o;
 
     for (o = 0; o < config->num_output; o++)
-	any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], TRUE);
-    
+        any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], TRUE);
+
     if (!any_enabled) {
-	xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-		   "No outputs definitely connected, trying again...\n");
+        xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+                   "No outputs definitely connected, trying again...\n");
 
-	for (o = 0; o < config->num_output; o++)
-	    any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], FALSE);
+        for (o = 0; o < config->num_output; o++)
+            any_enabled |= enabled[o] =
+                xf86OutputEnabled(config->output[o], FALSE);
     }
 
     return any_enabled;
@@ -1971,12 +1913,12 @@ nextEnabledOutput(xf86CrtcConfigPtr config, Bool *enabled, int *index)
     int o = *index;
 
     for (o++; o < config->num_output; o++) {
-	if (enabled[o]) {
-	    *index = o;
-	    return TRUE;
-	}
+        if (enabled[o]) {
+            *index = o;
+            return TRUE;
+        }
     }
-    
+
     return FALSE;
 }
 
@@ -1992,16 +1934,16 @@ nextAspectMode(xf86OutputPtr o, DisplayModePtr last, float aspect)
     DisplayModePtr m = NULL;
 
     if (!o)
-	return NULL;
+        return NULL;
 
     if (!last)
-	m = o->probed_modes;
+        m = o->probed_modes;
     else
-	m = last->next;
+        m = last->next;
 
     for (; m; m = m->next)
-	if (aspectMatch(aspect, (float)m->HDisplay / (float)m->VDisplay))
-	    return m;
+        if (aspectMatch(aspect, (float) m->HDisplay / (float) m->VDisplay))
+            return m;
 
     return NULL;
 }
@@ -2013,27 +1955,27 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
     DisplayModePtr mode = NULL, test = NULL, match = NULL;
 
     if (!nextEnabledOutput(config, enabled, &o))
-	return NULL;
+        return NULL;
     while ((mode = nextAspectMode(config->output[o], mode, aspect))) {
-	test = mode;
-	for (p = o; nextEnabledOutput(config, enabled, &p); ) {
-	    test = xf86OutputFindClosestMode(config->output[p], mode);
-	    if (!test)
-		break;
-	    if (test->HDisplay != mode->HDisplay ||
-		    test->VDisplay != mode->VDisplay) {
-		test = NULL;
-		break;
-	    }
-	}
-
-	/* if we didn't match it on all outputs, try the next one */
-	if (!test)
-	    continue;
-
-	/* if it's bigger than the last one, save it */
-	if (!match || (test->HDisplay > match->HDisplay))
-	    match = test;
+        test = mode;
+        for (p = o; nextEnabledOutput(config, enabled, &p);) {
+            test = xf86OutputFindClosestMode(config->output[p], mode);
+            if (!test)
+                break;
+            if (test->HDisplay != mode->HDisplay ||
+                test->VDisplay != mode->VDisplay) {
+                test = NULL;
+                break;
+            }
+        }
+
+        /* if we didn't match it on all outputs, try the next one */
+        if (!test)
+            continue;
+
+        /* if it's bigger than the last one, save it */
+        if (!match || (test->HDisplay > match->HDisplay))
+            match = test;
     }
 
     /* return the biggest one found */
@@ -2042,8 +1984,8 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
 
 static Bool
 xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
-		    DisplayModePtr *modes, Bool *enabled,
-		    int width, int height)
+                    DisplayModePtr * modes, Bool *enabled,
+                    int width, int height)
 {
     int o, p;
     int max_pref_width = 0, max_pref_height = 0;
@@ -2054,91 +1996,95 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
     preferred_match = xnfcalloc(config->num_output, sizeof(DisplayModePtr));
 
     /* Check if the preferred mode is available on all outputs */
-    for (p = -1; nextEnabledOutput(config, enabled, &p); ) {
-	Rotation r = config->output[p]->initial_rotation;
-	DisplayModePtr mode;
-	if ((preferred[p] = xf86OutputHasPreferredMode(config->output[p],
-			width, height))) {
-	    int pref_width = xf86ModeWidth(preferred[p], r);
-	    int pref_height = xf86ModeHeight(preferred[p], r);
-	    Bool all_match = TRUE;
-
-	    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-		Bool match = FALSE;
-		xf86OutputPtr output = config->output[o];
-		if (o == p)
-		    continue;
-
-		/*
-		 * First see if the preferred mode matches on the next
-		 * output as well.  This catches the common case of identical
-		 * monitors and makes sure they all have the same timings
-		 * and refresh.  If that fails, we fall back to trying to
-		 * match just width & height.
-		 */
-		mode = xf86OutputHasPreferredMode(output, pref_width,
-						  pref_height);
-		if (mode && xf86ModesEqual(mode, preferred[p])) {
-			preferred[o] = mode;
-			match = TRUE;
-		} else {
-			for (mode = output->probed_modes; mode;
-			     mode = mode->next) {
-				Rotation r = output->initial_rotation;
-				if (xf86ModeWidth(mode, r) == pref_width &&
-				    xf86ModeHeight(mode, r) == pref_height) {
-					preferred[o] = mode;
-					match = TRUE;
-				}
-			}
-		}
-
-		all_match &= match;
-	    }
-
-	    if (all_match &&
-		    (pref_width*pref_height > max_pref_width*max_pref_height)) {
-		for (o = -1; nextEnabledOutput(config, enabled, &o); )
-		    preferred_match[o] = preferred[o];
-		max_pref_width = pref_width;
-		max_pref_height = pref_height;
-		ret = TRUE;
-	    }
-	}
+    for (p = -1; nextEnabledOutput(config, enabled, &p);) {
+        Rotation r = config->output[p]->initial_rotation;
+        DisplayModePtr mode;
+
+        if ((preferred[p] = xf86OutputHasPreferredMode(config->output[p],
+                                                       width, height))) {
+            int pref_width = xf86ModeWidth(preferred[p], r);
+            int pref_height = xf86ModeHeight(preferred[p], r);
+            Bool all_match = TRUE;
+
+            for (o = -1; nextEnabledOutput(config, enabled, &o);) {
+                Bool match = FALSE;
+                xf86OutputPtr output = config->output[o];
+
+                if (o == p)
+                    continue;
+
+                /*
+                 * First see if the preferred mode matches on the next
+                 * output as well.  This catches the common case of identical
+                 * monitors and makes sure they all have the same timings
+                 * and refresh.  If that fails, we fall back to trying to
+                 * match just width & height.
+                 */
+                mode = xf86OutputHasPreferredMode(output, pref_width,
+                                                  pref_height);
+                if (mode && xf86ModesEqual(mode, preferred[p])) {
+                    preferred[o] = mode;
+                    match = TRUE;
+                }
+                else {
+                    for (mode = output->probed_modes; mode; mode = mode->next) {
+                        Rotation r = output->initial_rotation;
+
+                        if (xf86ModeWidth(mode, r) == pref_width &&
+                            xf86ModeHeight(mode, r) == pref_height) {
+                            preferred[o] = mode;
+                            match = TRUE;
+                        }
+                    }
+                }
+
+                all_match &= match;
+            }
+
+            if (all_match &&
+                (pref_width * pref_height > max_pref_width * max_pref_height)) {
+                for (o = -1; nextEnabledOutput(config, enabled, &o);)
+                    preferred_match[o] = preferred[o];
+                max_pref_width = pref_width;
+                max_pref_height = pref_height;
+                ret = TRUE;
+            }
+        }
     }
 
     /*
      * If there's no preferred mode, but only one monitor, pick the
      * biggest mode for its aspect ratio, assuming one exists.
      */
-    if (!ret) do {
-	int i = 0;
-	float aspect = 0.0;
+    if (!ret)
+        do {
+            int i = 0;
+            float aspect = 0.0;
 
-	/* count the number of enabled outputs */
-	for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ;
+            /* count the number of enabled outputs */
+            for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++);
 
-	if (i != 1)
-	    break;
+            if (i != 1)
+                break;
 
-	p = -1;
-	nextEnabledOutput(config, enabled, &p);
-	if (config->output[p]->mm_height)
-	    aspect = (float)config->output[p]->mm_width /
-		     (float)config->output[p]->mm_height;
+            p = -1;
+            nextEnabledOutput(config, enabled, &p);
+            if (config->output[p]->mm_height)
+                aspect = (float) config->output[p]->mm_width /
+                    (float) config->output[p]->mm_height;
 
-	if (aspect)
-	    preferred_match[p] = bestModeForAspect(config, enabled, aspect);
+            if (aspect)
+                preferred_match[p] = bestModeForAspect(config, enabled, aspect);
 
-	if (preferred_match[p])
-	    ret = TRUE;
+            if (preferred_match[p])
+                ret = TRUE;
 
-    } while (0);
+        } while (0);
 
     if (ret) {
-	/* oh good, there is a match.  stash the selected modes and return. */
-	memcpy(modes, preferred_match,
-		config->num_output * sizeof(DisplayModePtr));
+        /* oh good, there is a match.  stash the selected modes and return. */
+        memcpy(modes, preferred_match,
+               config->num_output * sizeof(DisplayModePtr));
     }
 
     free(preferred);
@@ -2148,8 +2094,7 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
 
 static Bool
 xf86TargetAspect(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
-		 DisplayModePtr *modes, Bool *enabled,
-		 int width, int height)
+                 DisplayModePtr * modes, Bool *enabled, int width, int height)
 {
     int o;
     float aspect = 0.0, *aspects;
@@ -2160,51 +2105,51 @@ xf86TargetAspect(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
     aspects = xnfcalloc(config->num_output, sizeof(float));
 
     /* collect the aspect ratios */
-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-	output = config->output[o];
-	if (output->mm_height)
-	    aspects[o] = (float)output->mm_width / (float)output->mm_height;
-	else
-	    aspects[o] = 4.0 / 3.0;
+    for (o = -1; nextEnabledOutput(config, enabled, &o);) {
+        output = config->output[o];
+        if (output->mm_height)
+            aspects[o] = (float) output->mm_width / (float) output->mm_height;
+        else
+            aspects[o] = 4.0 / 3.0;
     }
 
     /* check that they're all the same */
-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-	output = config->output[o];
-	if (!aspect) {
-	    aspect = aspects[o];
-	} else if (!aspectMatch(aspect, aspects[o])) {
-	    goto no_aspect_match;
-	}
+    for (o = -1; nextEnabledOutput(config, enabled, &o);) {
+        output = config->output[o];
+        if (!aspect) {
+            aspect = aspects[o];
+        }
+        else if (!aspectMatch(aspect, aspects[o])) {
+            goto no_aspect_match;
+        }
     }
 
     /* if they're all 4:3, just skip ahead and save effort */
-    if (!aspectMatch(aspect, 4.0/3.0))
-	aspect_guess = bestModeForAspect(config, enabled, aspect);
+    if (!aspectMatch(aspect, 4.0 / 3.0))
+        aspect_guess = bestModeForAspect(config, enabled, aspect);
 
-no_aspect_match:
-    base_guess = bestModeForAspect(config, enabled, 4.0/3.0);
+ no_aspect_match:
+    base_guess = bestModeForAspect(config, enabled, 4.0 / 3.0);
 
     guess = biggestMode(base_guess, aspect_guess);
 
     if (!guess)
-	goto out;
+        goto out;
 
     /* found a mode that works everywhere, now apply it */
-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-	modes[o] = xf86OutputFindClosestMode(config->output[o], guess);
+    for (o = -1; nextEnabledOutput(config, enabled, &o);) {
+        modes[o] = xf86OutputFindClosestMode(config->output[o], guess);
     }
     ret = TRUE;
 
-out:
+ out:
     free(aspects);
     return ret;
 }
 
 static Bool
 xf86TargetFallback(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
-		   DisplayModePtr *modes, Bool *enabled,
-		   int width, int height)
+                   DisplayModePtr * modes, Bool *enabled, int width, int height)
 {
     DisplayModePtr target_mode = NULL;
     Rotation target_rotation = RR_Rotate_0;
@@ -2212,30 +2157,30 @@ xf86TargetFallback(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
     int default_preferred, target_preferred = 0, o;
 
     /* User preferred > preferred > other modes */
-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-	default_mode = xf86DefaultMode (config->output[o], width, height);
-	if (!default_mode)
-	    continue;
-
-	default_preferred = (((default_mode->type & M_T_PREFERRED) != 0) +
-		((default_mode->type & M_T_USERPREF) != 0));
-
-	if (default_preferred > target_preferred || !target_mode) {
-	    target_mode = default_mode;
-	    target_preferred = default_preferred;
-	    target_rotation = config->output[o]->initial_rotation;
-	    config->compat_output = o;
-	}
+    for (o = -1; nextEnabledOutput(config, enabled, &o);) {
+        default_mode = xf86DefaultMode(config->output[o], width, height);
+        if (!default_mode)
+            continue;
+
+        default_preferred = (((default_mode->type & M_T_PREFERRED) != 0) +
+                             ((default_mode->type & M_T_USERPREF) != 0));
+
+        if (default_preferred > target_preferred || !target_mode) {
+            target_mode = default_mode;
+            target_preferred = default_preferred;
+            target_rotation = config->output[o]->initial_rotation;
+            config->compat_output = o;
+        }
     }
 
     if (target_mode)
-	modes[config->compat_output] = target_mode;
+        modes[config->compat_output] = target_mode;
 
     /* Fill in other output modes */
-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-	if (!modes[o])
-	    modes[o] = xf86ClosestMode(config->output[o], target_mode,
-				       target_rotation, width, height);
+    for (o = -1; nextEnabledOutput(config, enabled, &o);) {
+        if (!modes[o])
+            modes[o] = xf86ClosestMode(config->output[o], target_mode,
+                                       target_rotation, width, height);
     }
 
     return target_mode != NULL;
@@ -2243,25 +2188,24 @@ xf86TargetFallback(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
 
 static Bool
 xf86TargetUserpref(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
-		   DisplayModePtr *modes, Bool *enabled,
-		   int width, int height)
+                   DisplayModePtr * modes, Bool *enabled, int width, int height)
 {
     int o;
 
     if (xf86UserConfiguredOutputs(scrn, modes))
-	return xf86TargetFallback(scrn, config, modes, enabled, width, height);
-    
-    for (o = -1; nextEnabledOutput(config, enabled, &o); )
-	if (xf86OutputHasUserPreferredMode(config->output[o]))
-	    return 
-		xf86TargetFallback(scrn, config, modes, enabled, width, height);
+        return xf86TargetFallback(scrn, config, modes, enabled, width, height);
+
+    for (o = -1; nextEnabledOutput(config, enabled, &o);)
+        if (xf86OutputHasUserPreferredMode(config->output[o]))
+            return
+                xf86TargetFallback(scrn, config, modes, enabled, width, height);
 
     return FALSE;
 }
 
 static Bool
 xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green,
-        float gamma_blue)
+                        float gamma_blue)
 {
     int i, size = 256;
     CARD16 *red, *green, *blue;
@@ -2270,14 +2214,16 @@ xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green,
     green = red + size;
     blue = green + size;
 
-     /* Only cause warning if user wanted gamma to be set. */
-    if (!crtc->funcs->gamma_set && (gamma_red != 1.0 || gamma_green != 1.0 || gamma_blue != 1.0)) {
+    /* Only cause warning if user wanted gamma to be set. */
+    if (!crtc->funcs->gamma_set &&
+        (gamma_red != 1.0 || gamma_green != 1.0 || gamma_blue != 1.0)) {
         free(red);
         return FALSE;
-    } else if (!crtc->funcs->gamma_set) {
+    }
+    else if (!crtc->funcs->gamma_set) {
         free(red);
         return TRUE;
-      }
+    }
 
     /* At this early stage none of the randr-interface stuff is up.
      * So take the default gamma size for lack of something better.
@@ -2286,32 +2232,37 @@ xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green,
         if (gamma_red == 1.0)
             red[i] = i << 8;
         else
-            red[i] = (CARD16)(pow((double)i/(double)(size - 1),
-			1. / (double)gamma_red) * (double)(size - 1) * 256);
+            red[i] = (CARD16) (pow((double) i / (double) (size - 1),
+                                   1. / (double) gamma_red) * (double) (size -
+                                                                        1) *
+                               256);
 
         if (gamma_green == 1.0)
             green[i] = i << 8;
         else
-            green[i] = (CARD16)(pow((double)i/(double)(size - 1),
-			1. / (double)gamma_green) * (double)(size - 1) * 256);
+            green[i] = (CARD16) (pow((double) i / (double) (size - 1),
+                                     1. / (double) gamma_green) *
+                                 (double) (size - 1) * 256);
 
         if (gamma_blue == 1.0)
             blue[i] = i << 8;
         else
-            blue[i] = (CARD16)(pow((double)i/(double)(size - 1),
-			1. / (double)gamma_blue) * (double)(size - 1) * 256);
+            blue[i] = (CARD16) (pow((double) i / (double) (size - 1),
+                                    1. / (double) gamma_blue) * (double) (size -
+                                                                          1) *
+                                256);
     }
 
     /* Default size is 256, so anything else is failure. */
     if (size != crtc->gamma_size) {
         free(red);
         return FALSE;
-      }
+    }
 
     crtc->gamma_size = size;
-    memcpy (crtc->gamma_red, red, crtc->gamma_size * sizeof (CARD16));
-    memcpy (crtc->gamma_green, green, crtc->gamma_size * sizeof (CARD16));
-    memcpy (crtc->gamma_blue, blue, crtc->gamma_size * sizeof (CARD16));
+    memcpy(crtc->gamma_red, red, crtc->gamma_size * sizeof(CARD16));
+    memcpy(crtc->gamma_green, green, crtc->gamma_size * sizeof(CARD16));
+    memcpy(crtc->gamma_blue, blue, crtc->gamma_size * sizeof(CARD16));
 
     /* Do not set gamma now, delay until the crtc is activated. */
 
@@ -2325,7 +2276,7 @@ xf86OutputSetInitialGamma(xf86OutputPtr output)
 {
     XF86ConfMonitorPtr mon = output->conf_monitor;
     float gamma_red = 1.0, gamma_green = 1.0, gamma_blue = 1.0;
-    
+
     if (!mon)
         return TRUE;
 
@@ -2333,24 +2284,25 @@ xf86OutputSetInitialGamma(xf86OutputPtr output)
         return FALSE;
 
     /* Get configured values, where they exist. */
-    if (mon->mon_gamma_red >= GAMMA_MIN &&
-        mon->mon_gamma_red <= GAMMA_MAX)
-            gamma_red = mon->mon_gamma_red;
+    if (mon->mon_gamma_red >= GAMMA_MIN && mon->mon_gamma_red <= GAMMA_MAX)
+        gamma_red = mon->mon_gamma_red;
 
-    if (mon->mon_gamma_green >= GAMMA_MIN &&
-        mon->mon_gamma_green <= GAMMA_MAX)
-            gamma_green = mon->mon_gamma_green;
+    if (mon->mon_gamma_green >= GAMMA_MIN && mon->mon_gamma_green <= GAMMA_MAX)
+        gamma_green = mon->mon_gamma_green;
 
-    if (mon->mon_gamma_blue >= GAMMA_MIN &&
-        mon->mon_gamma_blue <= GAMMA_MAX)
-            gamma_blue = mon->mon_gamma_blue;
+    if (mon->mon_gamma_blue >= GAMMA_MIN && mon->mon_gamma_blue <= GAMMA_MAX)
+        gamma_blue = mon->mon_gamma_blue;
 
     /* This avoids setting gamma 1.0 in case another cloned output on this crtc has a specific gamma. */
     if (gamma_red != 1.0 || gamma_green != 1.0 || gamma_blue != 1.0) {
-	xf86DrvMsg(output->scrn->scrnIndex, X_INFO, "Output %s wants gamma correction (%.1f, %.1f, %.1f)\n", output->name, gamma_red, gamma_green, gamma_blue);
-	return xf86CrtcSetInitialGamma(output->crtc, gamma_red, gamma_green, gamma_blue);
-    }else
-	return TRUE;
+        xf86DrvMsg(output->scrn->scrnIndex, X_INFO,
+                   "Output %s wants gamma correction (%.1f, %.1f, %.1f)\n",
+                   output->name, gamma_red, gamma_green, gamma_blue);
+        return xf86CrtcSetInitialGamma(output->crtc, gamma_red, gamma_green,
+                                       gamma_blue);
+    }
+    else
+        return TRUE;
 }
 
 /**
@@ -2368,177 +2320,183 @@ xf86OutputSetInitialGamma(xf86OutputPtr output)
  */
 
 Bool
-xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
-{
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			o, c;
-    xf86CrtcPtr		*crtcs;
-    DisplayModePtr	*modes;
-    Bool		*enabled;
-    int			width, height;
-    int			i = scrn->scrnIndex;
+xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow)
+{
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    int o, c;
+    xf86CrtcPtr *crtcs;
+    DisplayModePtr *modes;
+    Bool *enabled;
+    int width, height;
+    int i = scrn->scrnIndex;
     Bool have_outputs = TRUE;
     Bool ret;
     Bool success = FALSE;
 
     /* Set up the device options */
-    config->options = xnfalloc (sizeof (xf86DeviceOptions));
-    memcpy (config->options, xf86DeviceOptions, sizeof (xf86DeviceOptions));
-    xf86ProcessOptions (scrn->scrnIndex,
-			scrn->options,
-			config->options);
-    config->debug_modes = xf86ReturnOptValBool (config->options,
-						OPTION_MODEDEBUG, FALSE);
+    config->options = xnfalloc(sizeof(xf86DeviceOptions));
+    memcpy(config->options, xf86DeviceOptions, sizeof(xf86DeviceOptions));
+    xf86ProcessOptions(scrn->scrnIndex, scrn->options, config->options);
+    config->debug_modes = xf86ReturnOptValBool(config->options,
+                                               OPTION_MODEDEBUG, FALSE);
 
     if (scrn->display->virtualX)
-	width = scrn->display->virtualX;
+        width = scrn->display->virtualX;
     else
-	width = config->maxWidth;
+        width = config->maxWidth;
     if (scrn->display->virtualY)
-	height = scrn->display->virtualY;
+        height = scrn->display->virtualY;
     else
-	height = config->maxHeight;
+        height = config->maxHeight;
 
-    xf86ProbeOutputModes (scrn, width, height);
+    xf86ProbeOutputModes(scrn, width, height);
+
+    crtcs = xnfcalloc(config->num_output, sizeof(xf86CrtcPtr));
+    modes = xnfcalloc(config->num_output, sizeof(DisplayModePtr));
+    enabled = xnfcalloc(config->num_output, sizeof(Bool));
 
-    crtcs = xnfcalloc (config->num_output, sizeof (xf86CrtcPtr));
-    modes = xnfcalloc (config->num_output, sizeof (DisplayModePtr));
-    enabled = xnfcalloc (config->num_output, sizeof (Bool));
-    
     ret = xf86CollectEnabledOutputs(scrn, config, enabled);
     if (ret == FALSE && canGrow) {
-	xf86DrvMsg(i, X_WARNING, "Unable to find connected outputs - setting %dx%d initial framebuffer\n",
-		   NO_OUTPUT_DEFAULT_WIDTH, NO_OUTPUT_DEFAULT_HEIGHT);
-	have_outputs = FALSE;
-    } else {
-	if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
-	    xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
-	else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))
-	    xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
-	else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
-	    xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n");
-	else if (xf86TargetFallback(scrn, config, modes, enabled, width, height))
-	    xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n");
-	else
-	    xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n");
-    }
-
-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-	if (!modes[o])
-	    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
-			"Output %s enabled but has no modes\n",
-			config->output[o]->name);
-	else
-	    xf86DrvMsg (scrn->scrnIndex, X_INFO,
-			"Output %s using initial mode %s\n",
-			config->output[o]->name, modes[o]->name);
+        xf86DrvMsg(i, X_WARNING,
+                   "Unable to find connected outputs - setting %dx%d initial framebuffer\n",
+                   NO_OUTPUT_DEFAULT_WIDTH, NO_OUTPUT_DEFAULT_HEIGHT);
+        have_outputs = FALSE;
+    }
+    else {
+        if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
+            xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
+        else if (xf86TargetPreferred
+                 (scrn, config, modes, enabled, width, height))
+            xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
+        else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
+            xf86DrvMsg(i, X_INFO,
+                       "Using fuzzy aspect match for initial modes\n");
+        else if (xf86TargetFallback
+                 (scrn, config, modes, enabled, width, height))
+            xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n");
+        else
+            xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n");
+    }
+
+    for (o = -1; nextEnabledOutput(config, enabled, &o);) {
+        if (!modes[o])
+            xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+                       "Output %s enabled but has no modes\n",
+                       config->output[o]->name);
+        else
+            xf86DrvMsg(scrn->scrnIndex, X_INFO,
+                       "Output %s using initial mode %s\n",
+                       config->output[o]->name, modes[o]->name);
     }
 
     /*
      * Set the position of each output
      */
-    if (!xf86InitialOutputPositions (scrn, modes))
-	goto bailout;
+    if (!xf86InitialOutputPositions(scrn, modes))
+        goto bailout;
 
     /*
      * Set initial panning of each output
      */
-    xf86InitialPanning (scrn);
-	
+    xf86InitialPanning(scrn);
+
     /*
      * Assign CRTCs to fit output configuration
      */
-    if (have_outputs && !xf86PickCrtcs (scrn, crtcs, modes, 0, width, height))
-	goto bailout;
-    
+    if (have_outputs && !xf86PickCrtcs(scrn, crtcs, modes, 0, width, height))
+        goto bailout;
+
     /* XXX override xf86 common frame computation code */
-    
+
     scrn->display->frameX0 = 0;
     scrn->display->frameY0 = 0;
-    
-    for (c = 0; c < config->num_crtc; c++)
-    {
-	xf86CrtcPtr	crtc = config->crtc[c];
 
-	crtc->enabled = FALSE;
-	memset (&crtc->desiredMode, '\0', sizeof (crtc->desiredMode));
-	/* Set default gamma for all crtc's. */
-	/* This is done to avoid problems later on with cloned outputs. */
-	xf86CrtcSetInitialGamma(crtc, 1.0, 1.0, 1.0);
+    for (c = 0; c < config->num_crtc; c++) {
+        xf86CrtcPtr crtc = config->crtc[c];
+
+        crtc->enabled = FALSE;
+        memset(&crtc->desiredMode, '\0', sizeof(crtc->desiredMode));
+        /* Set default gamma for all crtc's. */
+        /* This is done to avoid problems later on with cloned outputs. */
+        xf86CrtcSetInitialGamma(crtc, 1.0, 1.0, 1.0);
     }
 
     if (xf86_crtc_supports_gamma(scrn))
-	xf86DrvMsg(scrn->scrnIndex, X_INFO, "Using default gamma of (1.0, 1.0, 1.0) unless otherwise stated.\n");
+        xf86DrvMsg(scrn->scrnIndex, X_INFO,
+                   "Using default gamma of (1.0, 1.0, 1.0) unless otherwise stated.\n");
 
     /*
      * Set initial configuration
      */
-    for (o = 0; o < config->num_output; o++)
-    {
-	xf86OutputPtr	output = config->output[o];
-	DisplayModePtr	mode = modes[o];
-        xf86CrtcPtr	crtc = crtcs[o];
-
-	if (mode && crtc)
-	{
-	    crtc->desiredMode = *mode;
-	    crtc->desiredRotation = output->initial_rotation;
-	    crtc->desiredX = output->initial_x;
-	    crtc->desiredY = output->initial_y;
-	    crtc->desiredTransformPresent = FALSE;
-	    crtc->enabled = TRUE;
-	    memcpy (&crtc->panningTotalArea,    &output->initialTotalArea,    sizeof(BoxRec));
-	    memcpy (&crtc->panningTrackingArea, &output->initialTrackingArea, sizeof(BoxRec));
-	    memcpy (crtc->panningBorder,        output->initialBorder,        4*sizeof(INT16));
-	    output->crtc = crtc;
-	    if (!xf86OutputSetInitialGamma(output))
-		xf86DrvMsg (scrn->scrnIndex, X_WARNING, "Initial gamma correction for output %s: failed.\n", output->name);
-	} else {
-	    output->crtc = NULL;
-	}
-    }
-
-    if (scrn->display->virtualX == 0)
-    {
-	/*
-	 * Expand virtual size to cover the current config and potential mode
-	 * switches, if the driver can't enlarge the screen later.
-	 */
-	xf86DefaultScreenLimits (scrn, &width, &height, canGrow);
-    
-	if (have_outputs == FALSE) {
-	    if (width < NO_OUTPUT_DEFAULT_WIDTH && height < NO_OUTPUT_DEFAULT_HEIGHT) {
-		width = NO_OUTPUT_DEFAULT_WIDTH;
-		height = NO_OUTPUT_DEFAULT_HEIGHT;
-	    }
-	}
-
-	scrn->display->virtualX = width;
-	scrn->display->virtualY = height;
+    for (o = 0; o < config->num_output; o++) {
+        xf86OutputPtr output = config->output[o];
+        DisplayModePtr mode = modes[o];
+        xf86CrtcPtr crtc = crtcs[o];
+
+        if (mode && crtc) {
+            crtc->desiredMode = *mode;
+            crtc->desiredRotation = output->initial_rotation;
+            crtc->desiredX = output->initial_x;
+            crtc->desiredY = output->initial_y;
+            crtc->desiredTransformPresent = FALSE;
+            crtc->enabled = TRUE;
+            memcpy(&crtc->panningTotalArea, &output->initialTotalArea,
+                   sizeof(BoxRec));
+            memcpy(&crtc->panningTrackingArea, &output->initialTrackingArea,
+                   sizeof(BoxRec));
+            memcpy(crtc->panningBorder, output->initialBorder,
+                   4 * sizeof(INT16));
+            output->crtc = crtc;
+            if (!xf86OutputSetInitialGamma(output))
+                xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+                           "Initial gamma correction for output %s: failed.\n",
+                           output->name);
+        }
+        else {
+            output->crtc = NULL;
+        }
+    }
+
+    if (scrn->display->virtualX == 0) {
+        /*
+         * Expand virtual size to cover the current config and potential mode
+         * switches, if the driver can't enlarge the screen later.
+         */
+        xf86DefaultScreenLimits(scrn, &width, &height, canGrow);
+
+        if (have_outputs == FALSE) {
+            if (width < NO_OUTPUT_DEFAULT_WIDTH &&
+                height < NO_OUTPUT_DEFAULT_HEIGHT) {
+                width = NO_OUTPUT_DEFAULT_WIDTH;
+                height = NO_OUTPUT_DEFAULT_HEIGHT;
+            }
+        }
+
+        scrn->display->virtualX = width;
+        scrn->display->virtualY = height;
     }
 
     if (width > scrn->virtualX)
-	scrn->virtualX = width;
+        scrn->virtualX = width;
     if (height > scrn->virtualY)
-	scrn->virtualY = height;
+        scrn->virtualY = height;
 
     /*
      * Make sure the configuration isn't too small.
      */
     if (width < config->minWidth || height < config->minHeight)
-	goto bailout;
+        goto bailout;
 
     /*
      * Limit the crtc config to virtual[XY] if the driver can't grow the
      * desktop.
      */
-    if (!canGrow)
-    {
-	xf86CrtcSetSizeRange (scrn, config->minWidth, config->minHeight,
-			      width, height);
+    if (!canGrow) {
+        xf86CrtcSetSizeRange(scrn, config->minWidth, config->minHeight,
+                             width, height);
     }
 
-    xf86SetScrnInfoModes (scrn);
+    xf86SetScrnInfoModes(scrn);
 
     success = TRUE;
  bailout:
@@ -2554,58 +2512,58 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
  * since the driver will have to re-route things.
  */
 static void
-xf86PrepareOutputs (ScrnInfoPtr scrn)
+xf86PrepareOutputs(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			o;
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    int o;
 
     for (o = 0; o < config->num_output; o++) {
-	xf86OutputPtr output = config->output[o];
+        xf86OutputPtr output = config->output[o];
+
 #if RANDR_GET_CRTC_INTERFACE
-	/* Disable outputs that are unused or will be re-routed */
-	if (!output->funcs->get_crtc ||
-	    output->crtc != (*output->funcs->get_crtc)(output) ||
-	    output->crtc == NULL)
+        /* Disable outputs that are unused or will be re-routed */
+        if (!output->funcs->get_crtc ||
+            output->crtc != (*output->funcs->get_crtc) (output) ||
+            output->crtc == NULL)
 #endif
-	    (*output->funcs->dpms)(output, DPMSModeOff);
+            (*output->funcs->dpms) (output, DPMSModeOff);
     }
 }
 
 static void
-xf86PrepareCrtcs (ScrnInfoPtr scrn)
+xf86PrepareCrtcs(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
 
     for (c = 0; c < config->num_crtc; c++) {
 #if RANDR_GET_CRTC_INTERFACE
-	xf86CrtcPtr	crtc = config->crtc[c];
-	xf86OutputPtr	output = NULL;
-	uint32_t	desired_outputs = 0, current_outputs = 0;
-	int		o;
-
-	for (o = 0; o < config->num_output; o++) {
-	    output = config->output[o];
-	    if (output->crtc == crtc)
-		desired_outputs |= (1<<o);
-	    /* If we can't tell where it's mapped, force it off */
-	    if (!output->funcs->get_crtc) {
-		desired_outputs = 0;
-		break;
-	    }
-	    if ((*output->funcs->get_crtc)(output) == crtc)
-		current_outputs |= (1<<o);
-	}
-
-	/*
-	 * If mappings are different or the CRTC is unused,
-	 * we need to disable it
-	 */
-	if (desired_outputs != current_outputs ||
-	    !desired_outputs)
-	    (*crtc->funcs->dpms)(crtc, DPMSModeOff);
+        xf86CrtcPtr crtc = config->crtc[c];
+        xf86OutputPtr output = NULL;
+        uint32_t desired_outputs = 0, current_outputs = 0;
+        int o;
+
+        for (o = 0; o < config->num_output; o++) {
+            output = config->output[o];
+            if (output->crtc == crtc)
+                desired_outputs |= (1 << o);
+            /* If we can't tell where it's mapped, force it off */
+            if (!output->funcs->get_crtc) {
+                desired_outputs = 0;
+                break;
+            }
+            if ((*output->funcs->get_crtc) (output) == crtc)
+                current_outputs |= (1 << o);
+        }
+
+        /*
+         * If mappings are different or the CRTC is unused,
+         * we need to disable it
+         */
+        if (desired_outputs != current_outputs || !desired_outputs)
+            (*crtc->funcs->dpms) (crtc, DPMSModeOff);
 #else
-	(*crtc->funcs->dpms)(crtc, DPMSModeOff);
+        (*crtc->funcs->dpms) (crtc, DPMSModeOff);
 #endif
     }
 }
@@ -2616,67 +2574,65 @@ xf86PrepareCrtcs (ScrnInfoPtr scrn)
  */
 
 Bool
-xf86SetDesiredModes (ScrnInfoPtr scrn)
+xf86SetDesiredModes(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CrtcPtr         crtc = config->crtc[0];
-    int			c;
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CrtcPtr crtc = config->crtc[0];
+    int c;
 
     /* A driver with this hook will take care of this */
     if (!crtc->funcs->set_mode_major) {
-	xf86PrepareOutputs(scrn);
-	xf86PrepareCrtcs(scrn);
-    }
-
-    for (c = 0; c < config->num_crtc; c++)
-    {
-	xf86OutputPtr	output = NULL;
-	int		o;
-	RRTransformPtr	transform;
-
-	crtc = config->crtc[c];
-
-	/* Skip disabled CRTCs */
-	if (!crtc->enabled)
-	    continue;
-
-	if (xf86CompatOutput(scrn) && xf86CompatCrtc(scrn) == crtc)
-	    output = xf86CompatOutput(scrn);
-	else
-	{
-	    for (o = 0; o < config->num_output; o++)
-		if (config->output[o]->crtc == crtc)
-		{
-		    output = config->output[o];
-		    break;
-		}
-	}
-	/* paranoia */
-	if (!output)
-	    continue;
-
-	/* Mark that we'll need to re-set the mode for sure */
-	memset(&crtc->mode, 0, sizeof(crtc->mode));
-	if (!crtc->desiredMode.CrtcHDisplay)
-	{
-	    DisplayModePtr  mode = xf86OutputFindClosestMode (output, scrn->currentMode);
-
-	    if (!mode)
-		return FALSE;
-	    crtc->desiredMode = *mode;
-	    crtc->desiredRotation = RR_Rotate_0;
-	    crtc->desiredTransformPresent = FALSE;
-	    crtc->desiredX = 0;
-	    crtc->desiredY = 0;
-	}
-
-	if (crtc->desiredTransformPresent)
-	    transform = &crtc->desiredTransform;
-	else
-	    transform = NULL;
-	if (!xf86CrtcSetModeTransform (crtc, &crtc->desiredMode, crtc->desiredRotation,
-				       transform, crtc->desiredX, crtc->desiredY))
-	    return FALSE;
+        xf86PrepareOutputs(scrn);
+        xf86PrepareCrtcs(scrn);
+    }
+
+    for (c = 0; c < config->num_crtc; c++) {
+        xf86OutputPtr output = NULL;
+        int o;
+        RRTransformPtr transform;
+
+        crtc = config->crtc[c];
+
+        /* Skip disabled CRTCs */
+        if (!crtc->enabled)
+            continue;
+
+        if (xf86CompatOutput(scrn) && xf86CompatCrtc(scrn) == crtc)
+            output = xf86CompatOutput(scrn);
+        else {
+            for (o = 0; o < config->num_output; o++)
+                if (config->output[o]->crtc == crtc) {
+                    output = config->output[o];
+                    break;
+                }
+        }
+        /* paranoia */
+        if (!output)
+            continue;
+
+        /* Mark that we'll need to re-set the mode for sure */
+        memset(&crtc->mode, 0, sizeof(crtc->mode));
+        if (!crtc->desiredMode.CrtcHDisplay) {
+            DisplayModePtr mode =
+                xf86OutputFindClosestMode(output, scrn->currentMode);
+
+            if (!mode)
+                return FALSE;
+            crtc->desiredMode = *mode;
+            crtc->desiredRotation = RR_Rotate_0;
+            crtc->desiredTransformPresent = FALSE;
+            crtc->desiredX = 0;
+            crtc->desiredY = 0;
+        }
+
+        if (crtc->desiredTransformPresent)
+            transform = &crtc->desiredTransform;
+        else
+            transform = NULL;
+        if (!xf86CrtcSetModeTransform
+            (crtc, &crtc->desiredMode, crtc->desiredRotation, transform,
+             crtc->desiredX, crtc->desiredY))
+            return FALSE;
     }
 
     xf86DisableUnusedFunctions(scrn);
@@ -2694,56 +2650,52 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
  */
 
 DisplayModePtr
-xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired)
-{
-    DisplayModePtr	best = NULL, scan = NULL;
-
-    for (scan = output->probed_modes; scan != NULL; scan = scan->next) 
-    {
-	/* If there's an exact match, we're done. */
-	if (xf86ModesEqual(scan, desired)) {
-	    best = desired;
-	    break;
-	}
-
-	/* Reject if it's larger than the desired mode. */
-	if (scan->HDisplay > desired->HDisplay || 
-	    scan->VDisplay > desired->VDisplay)
-	{
-	    continue;
-	}
-
-	/*
-	 * If we haven't picked a best mode yet, use the first
-	 * one in the size range
-	 */
-	if (best == NULL) 
-	{
-	    best = scan;
-	    continue;
-	}
-
-	/* Find if it's closer to the right size than the current best
-	 * option.
-	 */
-	if ((scan->HDisplay > best->HDisplay &&
-	     scan->VDisplay >= best->VDisplay) ||
-	    (scan->HDisplay >= best->HDisplay &&
-	     scan->VDisplay > best->VDisplay))
-	{
-	    best = scan;
-	    continue;
-	}
-
-	/* Find if it's still closer to the right refresh than the current
-	 * best resolution.
-	 */
-	if (scan->HDisplay == best->HDisplay &&
-	    scan->VDisplay == best->VDisplay &&
-	    (fabs(scan->VRefresh - desired->VRefresh) <
-	     fabs(best->VRefresh - desired->VRefresh))) {
-	    best = scan;
-	}
+xf86OutputFindClosestMode(xf86OutputPtr output, DisplayModePtr desired)
+{
+    DisplayModePtr best = NULL, scan = NULL;
+
+    for (scan = output->probed_modes; scan != NULL; scan = scan->next) {
+        /* If there's an exact match, we're done. */
+        if (xf86ModesEqual(scan, desired)) {
+            best = desired;
+            break;
+        }
+
+        /* Reject if it's larger than the desired mode. */
+        if (scan->HDisplay > desired->HDisplay ||
+            scan->VDisplay > desired->VDisplay) {
+            continue;
+        }
+
+        /*
+         * If we haven't picked a best mode yet, use the first
+         * one in the size range
+         */
+        if (best == NULL) {
+            best = scan;
+            continue;
+        }
+
+        /* Find if it's closer to the right size than the current best
+         * option.
+         */
+        if ((scan->HDisplay > best->HDisplay &&
+             scan->VDisplay >= best->VDisplay) ||
+            (scan->HDisplay >= best->HDisplay &&
+             scan->VDisplay > best->VDisplay)) {
+            best = scan;
+            continue;
+        }
+
+        /* Find if it's still closer to the right refresh than the current
+         * best resolution.
+         */
+        if (scan->HDisplay == best->HDisplay &&
+            scan->VDisplay == best->VDisplay &&
+            (fabs(scan->VRefresh - desired->VRefresh) <
+             fabs(best->VRefresh - desired->VRefresh))) {
+            best = scan;
+        }
     }
     return best;
 }
@@ -2757,74 +2709,68 @@ xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired)
  */
 
 Bool
-xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
+xf86SetSingleMode(ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
 {
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(pScrn);
-    Bool		ok = TRUE;
-    xf86OutputPtr	compat_output;
-    DisplayModePtr	compat_mode = NULL;
-    int			c;
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    Bool ok = TRUE;
+    xf86OutputPtr compat_output;
+    DisplayModePtr compat_mode = NULL;
+    int c;
 
     /*
      * Let the compat output drive the final mode selection
      */
     compat_output = xf86CompatOutput(pScrn);
     if (compat_output)
-	compat_mode = xf86OutputFindClosestMode (compat_output, desired);
+        compat_mode = xf86OutputFindClosestMode(compat_output, desired);
     if (compat_mode)
-	desired = compat_mode;
-    
-    for (c = 0; c < config->num_crtc; c++)
-    {
-	xf86CrtcPtr	crtc = config->crtc[c];
-	DisplayModePtr	crtc_mode = NULL;
-	int		o;
-
-	if (!crtc->enabled)
-	    continue;
-	
-	for (o = 0; o < config->num_output; o++)
-	{
-	    xf86OutputPtr   output = config->output[o];
-	    DisplayModePtr  output_mode;
-
-	    /* skip outputs not on this crtc */
-	    if (output->crtc != crtc)
-		continue;
-	    
-	    if (crtc_mode)
-	    {
-		output_mode = xf86OutputFindClosestMode (output, crtc_mode);
-		if (output_mode != crtc_mode)
-		    output->crtc = NULL;
-	    }
-	    else
-		crtc_mode = xf86OutputFindClosestMode (output, desired);
-	}
-	if (!crtc_mode)
-	{
-	    crtc->enabled = FALSE;
-	    continue;
-	}
-	if (!xf86CrtcSetModeTransform (crtc, crtc_mode, rotation, NULL, 0, 0))
-	    ok = FALSE;
-	else
-	{
-	    crtc->desiredMode = *crtc_mode;
-	    crtc->desiredRotation = rotation;
-	    crtc->desiredTransformPresent = FALSE;
-	    crtc->desiredX = 0;
-	    crtc->desiredY = 0;
-	}
+        desired = compat_mode;
+
+    for (c = 0; c < config->num_crtc; c++) {
+        xf86CrtcPtr crtc = config->crtc[c];
+        DisplayModePtr crtc_mode = NULL;
+        int o;
+
+        if (!crtc->enabled)
+            continue;
+
+        for (o = 0; o < config->num_output; o++) {
+            xf86OutputPtr output = config->output[o];
+            DisplayModePtr output_mode;
+
+            /* skip outputs not on this crtc */
+            if (output->crtc != crtc)
+                continue;
+
+            if (crtc_mode) {
+                output_mode = xf86OutputFindClosestMode(output, crtc_mode);
+                if (output_mode != crtc_mode)
+                    output->crtc = NULL;
+            }
+            else
+                crtc_mode = xf86OutputFindClosestMode(output, desired);
+        }
+        if (!crtc_mode) {
+            crtc->enabled = FALSE;
+            continue;
+        }
+        if (!xf86CrtcSetModeTransform(crtc, crtc_mode, rotation, NULL, 0, 0))
+            ok = FALSE;
+        else {
+            crtc->desiredMode = *crtc_mode;
+            crtc->desiredRotation = rotation;
+            crtc->desiredTransformPresent = FALSE;
+            crtc->desiredX = 0;
+            crtc->desiredY = 0;
+        }
     }
     xf86DisableUnusedFunctions(pScrn);
 #ifdef RANDR_12_INTERFACE
-    xf86RandR12TellChanged (pScrn->pScreen);
+    xf86RandR12TellChanged(pScrn->pScreen);
 #endif
     return ok;
 }
 
-
 /**
  * Set the DPMS power mode of all outputs and CRTCs.
  *
@@ -2834,32 +2780,35 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
 void
 xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags)
 {
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			i;
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    int i;
 
     if (!scrn->vtSema)
-	return;
+        return;
 
     if (mode == DPMSModeOff) {
-	for (i = 0; i < config->num_output; i++) {
-	    xf86OutputPtr output = config->output[i];
-	    if (output->crtc != NULL)
-		(*output->funcs->dpms) (output, mode);
-	}
+        for (i = 0; i < config->num_output; i++) {
+            xf86OutputPtr output = config->output[i];
+
+            if (output->crtc != NULL)
+                (*output->funcs->dpms) (output, mode);
+        }
     }
 
     for (i = 0; i < config->num_crtc; i++) {
-	xf86CrtcPtr crtc = config->crtc[i];
-	if (crtc->enabled)
-	    (*crtc->funcs->dpms) (crtc, mode);
+        xf86CrtcPtr crtc = config->crtc[i];
+
+        if (crtc->enabled)
+            (*crtc->funcs->dpms) (crtc, mode);
     }
 
     if (mode != DPMSModeOff) {
-	for (i = 0; i < config->num_output; i++) {
-	    xf86OutputPtr output = config->output[i];
-	    if (output->crtc != NULL)
-		(*output->funcs->dpms) (output, mode);
-	}
+        for (i = 0; i < config->num_output; i++) {
+            xf86OutputPtr output = config->output[i];
+
+            if (output->crtc != NULL)
+                (*output->funcs->dpms) (output, mode);
+        }
     }
 }
 
@@ -2875,9 +2824,9 @@ xf86SaveScreen(ScreenPtr pScreen, int mode)
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 
     if (xf86IsUnblank(mode))
-	xf86DPMSSet(pScrn, DPMSModeOn, 0);
+        xf86DPMSSet(pScrn, DPMSModeOn, 0);
     else
-	xf86DPMSSet(pScrn, DPMSModeOff, 0);
+        xf86DPMSSet(pScrn, DPMSModeOff, 0);
 
     return TRUE;
 }
@@ -2888,32 +2837,30 @@ xf86SaveScreen(ScreenPtr pScreen, int mode)
 void
 xf86DisableUnusedFunctions(ScrnInfoPtr pScrn)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    int			o, c;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int o, c;
+
+    for (o = 0; o < xf86_config->num_output; o++) {
+        xf86OutputPtr output = xf86_config->output[o];
 
-    for (o = 0; o < xf86_config->num_output; o++) 
-    {
-	xf86OutputPtr  output = xf86_config->output[o];
-	if (!output->crtc) 
-	    (*output->funcs->dpms)(output, DPMSModeOff);
+        if (!output->crtc)
+            (*output->funcs->dpms) (output, DPMSModeOff);
     }
 
-    for (c = 0; c < xf86_config->num_crtc; c++) 
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
 
-	if (!crtc->enabled) 
-	{
-	    crtc->funcs->dpms(crtc, DPMSModeOff);
-	    memset(&crtc->mode, 0, sizeof(crtc->mode));
-	    xf86RotateDestroy(crtc);
-	    crtc->active = FALSE;
-	}
+        if (!crtc->enabled) {
+            crtc->funcs->dpms(crtc, DPMSModeOff);
+            memset(&crtc->mode, 0, sizeof(crtc->mode));
+            xf86RotateDestroy(crtc);
+            crtc->active = FALSE;
+        }
     }
     if (pScrn->pScreen)
-	xf86_crtc_notify(pScrn->pScreen);
+        xf86_crtc_notify(pScrn->pScreen);
     if (pScrn->ModeSet)
-	pScrn->ModeSet(pScrn);
+        pScrn->ModeSet(pScrn);
 }
 
 #ifdef RANDR_12_INTERFACE
@@ -2924,19 +2871,20 @@ xf86DisableUnusedFunctions(ScrnInfoPtr pScrn)
  * Set the RandR EDID property
  */
 static void
-xf86OutputSetEDIDProperty (xf86OutputPtr output, void *data, int data_len)
+xf86OutputSetEDIDProperty(xf86OutputPtr output, void *data, int data_len)
 {
     Atom edid_atom = MakeAtom(EDID_ATOM_NAME, sizeof(EDID_ATOM_NAME) - 1, TRUE);
 
     /* This may get called before the RandR resources have been created */
     if (output->randr_output == NULL)
-	return;
+        return;
 
     if (data_len != 0) {
-	RRChangeOutputProperty(output->randr_output, edid_atom, XA_INTEGER, 8,
-			       PropModeReplace, data_len, data, FALSE, TRUE);
-    } else {
-	RRDeleteOutputProperty(output->randr_output, edid_atom);
+        RRChangeOutputProperty(output->randr_output, edid_atom, XA_INTEGER, 8,
+                               PropModeReplace, data_len, data, FALSE, TRUE);
+    }
+    else {
+        RRDeleteOutputProperty(output->randr_output, edid_atom);
     }
 }
 
@@ -2949,14 +2897,16 @@ struct det_phySize_parameter {
     Bool ret;
 };
 
-static void  handle_detailed_physical_size(struct detailed_monitor_section
-		                          *det_mon, void *data)
+static void
+handle_detailed_physical_size(struct detailed_monitor_section
+                              *det_mon, void *data)
 {
     struct det_phySize_parameter *p;
-    p = (struct det_phySize_parameter *)data;
 
-    if (p->ret == TRUE )
-        return ;
+    p = (struct det_phySize_parameter *) data;
+
+    if (p->ret == TRUE)
+        return;
 
     xf86DetTimingApplyQuirks(det_mon, p->quirks,
                              p->output->MonInfo->features.hsize,
@@ -2975,25 +2925,26 @@ static void  handle_detailed_physical_size(struct detailed_monitor_section
  * Set the EDID information for the specified output
  */
 void
-xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
+xf86OutputSetEDID(xf86OutputPtr output, xf86MonPtr edid_mon)
 {
-    ScrnInfoPtr		scrn = output->scrn;
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    Bool		debug_modes = config->debug_modes || xf86Initialising;
+    ScrnInfoPtr scrn = output->scrn;
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+    Bool debug_modes = config->debug_modes || xf86Initialising;
+
 #ifdef RANDR_12_INTERFACE
-    int			size;
+    int size;
 #endif
-    
+
     free(output->MonInfo);
-    
+
     output->MonInfo = edid_mon;
     output->mm_width = 0;
     output->mm_height = 0;
 
     if (debug_modes) {
-	xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n",
-		   output->name);
-	xf86PrintEDID(edid_mon);
+        xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n",
+                   output->name);
+        xf86PrintEDID(edid_mon);
     }
 
     /* Set the DDC properties for the 'compat' output */
@@ -3003,34 +2954,34 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
 #ifdef RANDR_12_INTERFACE
     /* Set the RandR output properties */
     size = 0;
-    if (edid_mon)
-    {
-	if (edid_mon->ver.version == 1) {
-	    size = 128;
-	    if (edid_mon->flags & EDID_COMPLETE_RAWDATA)
-		size += edid_mon->no_sections * 128;
-	} else if (edid_mon->ver.version == 2)
-	    size = 256;
-    }
-    xf86OutputSetEDIDProperty (output, edid_mon ? edid_mon->rawData : NULL, size);
+    if (edid_mon) {
+        if (edid_mon->ver.version == 1) {
+            size = 128;
+            if (edid_mon->flags & EDID_COMPLETE_RAWDATA)
+                size += edid_mon->no_sections * 128;
+        }
+        else if (edid_mon->ver.version == 2)
+            size = 256;
+    }
+    xf86OutputSetEDIDProperty(output, edid_mon ? edid_mon->rawData : NULL,
+                              size);
 #endif
 
     if (edid_mon) {
 
         struct det_phySize_parameter p;
+
         p.output = output;
-        p.quirks = xf86DDCDetectQuirks(scrn->scrnIndex,edid_mon, FALSE);
+        p.quirks = xf86DDCDetectQuirks(scrn->scrnIndex, edid_mon, FALSE);
         p.ret = FALSE;
-        xf86ForEachDetailedBlock(edid_mon,
-                                 handle_detailed_physical_size, &p);
+        xf86ForEachDetailedBlock(edid_mon, handle_detailed_physical_size, &p);
 
-	/* if no mm size is available from a detailed timing, check the max size field */
-	if ((!output->mm_width || !output->mm_height) &&
-	    (edid_mon->features.hsize && edid_mon->features.vsize))
-	{
-	    output->mm_width = edid_mon->features.hsize * 10;
-	    output->mm_height = edid_mon->features.vsize * 10;
-	}
+        /* if no mm size is available from a detailed timing, check the max size field */
+        if ((!output->mm_width || !output->mm_height) &&
+            (edid_mon->features.hsize && edid_mon->features.vsize)) {
+            output->mm_width = edid_mon->features.hsize * 10;
+            output->mm_height = edid_mon->features.vsize * 10;
+        }
     }
 }
 
@@ -3039,21 +2990,21 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
  * stored in 'output'
  */
 DisplayModePtr
-xf86OutputGetEDIDModes (xf86OutputPtr output)
+xf86OutputGetEDIDModes(xf86OutputPtr output)
 {
-    ScrnInfoPtr	scrn = output->scrn;
-    xf86MonPtr	edid_mon = output->MonInfo;
+    ScrnInfoPtr scrn = output->scrn;
+    xf86MonPtr edid_mon = output->MonInfo;
 
     if (!edid_mon)
-	return NULL;
+        return NULL;
     return xf86DDCGetModes(scrn->scrnIndex, edid_mon);
 }
 
 /* maybe we should care about DDC1?  meh. */
 xf86MonPtr
-xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
+xf86OutputGetEDID(xf86OutputPtr output, I2CBusPtr pDDCBus)
 {
-    ScrnInfoPtr	scrn = output->scrn;
+    ScrnInfoPtr scrn = output->scrn;
     xf86MonPtr mon;
 
     mon = xf86DoEEDID(scrn->scrnIndex, pDDCBus, TRUE);
@@ -3064,11 +3015,12 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
 }
 
 static const char *_xf86ConnectorNames[] = {
-					"None", "VGA", "DVI-I", "DVI-D",
-					"DVI-A", "Composite", "S-Video",
-					"Component", "LFP", "Proprietary",
-					"HDMI", "DisplayPort",
-				     };
+    "None", "VGA", "DVI-I", "DVI-D",
+    "DVI-A", "Composite", "S-Video",
+    "Component", "LFP", "Proprietary",
+    "HDMI", "DisplayPort",
+};
+
 const char *
 xf86ConnectorGetName(xf86ConnectorType connector)
 {
@@ -3084,19 +3036,20 @@ x86_crtc_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b)
     dest->y2 = a->y2 < b->y2 ? a->y2 : b->y2;
 
     if (dest->x1 >= dest->x2 || dest->y1 >= dest->y2)
-	dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0;
+        dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0;
 }
 
 static void
 x86_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box)
 {
     if (crtc->enabled) {
-	crtc_box->x1 = crtc->x;
-	crtc_box->x2 = crtc->x + xf86ModeWidth(&crtc->mode, crtc->rotation);
-	crtc_box->y1 = crtc->y;
-	crtc_box->y2 = crtc->y + xf86ModeHeight(&crtc->mode, crtc->rotation);
-    } else
-	crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0;
+        crtc_box->x1 = crtc->x;
+        crtc_box->x2 = crtc->x + xf86ModeWidth(&crtc->mode, crtc->rotation);
+        crtc_box->y1 = crtc->y;
+        crtc_box->y2 = crtc->y + xf86ModeHeight(&crtc->mode, crtc->rotation);
+    }
+    else
+        crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0;
 }
 
 static int
@@ -3114,15 +3067,13 @@ xf86_crtc_box_area(BoxPtr box)
 
 static xf86CrtcPtr
 xf86_covering_crtc(ScrnInfoPtr pScrn,
-		   BoxPtr      box,
-		   xf86CrtcPtr desired,
-		   BoxPtr      crtc_box_ret)
+                   BoxPtr box, xf86CrtcPtr desired, BoxPtr crtc_box_ret)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    xf86CrtcPtr		crtc, best_crtc;
-    int			coverage, best_coverage;
-    int			c;
-    BoxRec		crtc_box, cover_box;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    xf86CrtcPtr crtc, best_crtc;
+    int coverage, best_coverage;
+    int c;
+    BoxRec crtc_box, cover_box;
 
     best_crtc = NULL;
     best_coverage = 0;
@@ -3131,18 +3082,19 @@ xf86_covering_crtc(ScrnInfoPtr pScrn,
     crtc_box_ret->y1 = 0;
     crtc_box_ret->y2 = 0;
     for (c = 0; c < xf86_config->num_crtc; c++) {
-	crtc = xf86_config->crtc[c];
-	x86_crtc_box(crtc, &crtc_box);
-	x86_crtc_box_intersect(&cover_box, &crtc_box, box);
-	coverage = xf86_crtc_box_area(&cover_box);
-	if (coverage && crtc == desired) {
-	    *crtc_box_ret = crtc_box;
-	    return crtc;
-	} else if (coverage > best_coverage) {
-	    *crtc_box_ret = crtc_box;
-	    best_crtc = crtc;
-	    best_coverage = coverage;
-	}
+        crtc = xf86_config->crtc[c];
+        x86_crtc_box(crtc, &crtc_box);
+        x86_crtc_box_intersect(&cover_box, &crtc_box, box);
+        coverage = xf86_crtc_box_area(&cover_box);
+        if (coverage && crtc == desired) {
+            *crtc_box_ret = crtc_box;
+            return crtc;
+        }
+        else if (coverage > best_coverage) {
+            *crtc_box_ret = crtc_box;
+            best_crtc = crtc;
+            best_coverage = coverage;
+        }
     }
     return best_crtc;
 }
@@ -3157,57 +3109,53 @@ xf86_covering_crtc(ScrnInfoPtr pScrn,
 
 Bool
 xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
-			    xf86CrtcPtr *crtc_ret,
-			    xf86CrtcPtr desired_crtc,
-			    BoxPtr      dst,
-			    INT32	*xa,
-			    INT32	*xb,
-			    INT32	*ya,
-			    INT32	*yb,
-			    RegionPtr   reg,
-			    INT32	width,
-			    INT32	height)
-{
-    Bool	ret;
-    RegionRec	crtc_region_local;
-    RegionPtr	crtc_region = reg;
-    
-    if (crtc_ret) {
-	BoxRec		crtc_box;
-	xf86CrtcPtr	crtc = xf86_covering_crtc(pScrn, dst,
-						  desired_crtc,
-						  &crtc_box);
+                            xf86CrtcPtr * crtc_ret,
+                            xf86CrtcPtr desired_crtc,
+                            BoxPtr dst,
+                            INT32 *xa,
+                            INT32 *xb,
+                            INT32 *ya,
+                            INT32 *yb, RegionPtr reg, INT32 width, INT32 height)
+{
+    Bool ret;
+    RegionRec crtc_region_local;
+    RegionPtr crtc_region = reg;
 
-	if (crtc) {
-	    RegionInit(&crtc_region_local, &crtc_box, 1);
-	    crtc_region = &crtc_region_local;
-	    RegionIntersect(crtc_region, crtc_region, reg);
-	}
-	*crtc_ret = crtc;
+    if (crtc_ret) {
+        BoxRec crtc_box;
+        xf86CrtcPtr crtc = xf86_covering_crtc(pScrn, dst,
+                                              desired_crtc,
+                                              &crtc_box);
+
+        if (crtc) {
+            RegionInit(&crtc_region_local, &crtc_box, 1);
+            crtc_region = &crtc_region_local;
+            RegionIntersect(crtc_region, crtc_region, reg);
+        }
+        *crtc_ret = crtc;
     }
 
-    ret = xf86XVClipVideoHelper(dst, xa, xb, ya, yb, 
-				crtc_region, width, height);
+    ret = xf86XVClipVideoHelper(dst, xa, xb, ya, yb,
+                                crtc_region, width, height);
 
     if (crtc_region != reg)
-	RegionUninit(&crtc_region_local);
+        RegionUninit(&crtc_region_local);
 
     return ret;
 }
 #endif
 
 xf86_crtc_notify_proc_ptr
-xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
-{
-    if (xf86CrtcConfigPrivateIndex != -1)
-    {
-	ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-	xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-	xf86_crtc_notify_proc_ptr	old;
-	
-	old = config->xf86_crtc_notify;
-	config->xf86_crtc_notify = new;
-	return old;
+xf86_wrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
+{
+    if (xf86CrtcConfigPrivateIndex != -1) {
+        ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+        xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+        xf86_crtc_notify_proc_ptr old;
+
+        old = config->xf86_crtc_notify;
+        config->xf86_crtc_notify = new;
+        return old;
     }
     return NULL;
 }
@@ -3215,40 +3163,39 @@ xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
 void
 xf86_unwrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr old)
 {
-    if (xf86CrtcConfigPrivateIndex != -1)
-    {
-	ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-	xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    
-	config->xf86_crtc_notify = old;
+    if (xf86CrtcConfigPrivateIndex != -1) {
+        ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+        xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+
+        config->xf86_crtc_notify = old;
     }
 }
 
 void
 xf86_crtc_notify(ScreenPtr screen)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
-    
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+
     if (config->xf86_crtc_notify)
-	config->xf86_crtc_notify(screen);
+        config->xf86_crtc_notify(screen);
 }
 
 Bool
 xf86_crtc_supports_gamma(ScrnInfoPtr pScrn)
 {
     if (xf86CrtcConfigPrivateIndex != -1) {
-	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-	xf86CrtcPtr crtc;
+        xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+        xf86CrtcPtr crtc;
 
-	/* for multiple drivers loaded we need this */
-	if (!xf86_config)
-		return FALSE;
-	if (xf86_config->num_crtc == 0)
-	    return FALSE;
-	crtc = xf86_config->crtc[0];
+        /* for multiple drivers loaded we need this */
+        if (!xf86_config)
+            return FALSE;
+        if (xf86_config->num_crtc == 0)
+            return FALSE;
+        crtc = xf86_config->crtc[0];
 
-	return crtc->funcs->gamma_set != NULL;
+        return crtc->funcs->gamma_set != NULL;
     }
 
     return FALSE;
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.h b/xorg-server/hw/xfree86/modes/xf86Crtc.h
index 8d4a08938..a6a3c2e95 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.h
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.h
@@ -53,24 +53,24 @@ typedef struct _xf86Output xf86OutputRec, *xf86OutputPtr;
 
 /* define a standard for connector types */
 typedef enum _xf86ConnectorType {
-   XF86ConnectorNone,
-   XF86ConnectorVGA,
-   XF86ConnectorDVI_I,
-   XF86ConnectorDVI_D,
-   XF86ConnectorDVI_A,
-   XF86ConnectorComposite,
-   XF86ConnectorSvideo,
-   XF86ConnectorComponent,
-   XF86ConnectorLFP,
-   XF86ConnectorProprietary,
-   XF86ConnectorHDMI,
-   XF86ConnectorDisplayPort,
+    XF86ConnectorNone,
+    XF86ConnectorVGA,
+    XF86ConnectorDVI_I,
+    XF86ConnectorDVI_D,
+    XF86ConnectorDVI_A,
+    XF86ConnectorComposite,
+    XF86ConnectorSvideo,
+    XF86ConnectorComponent,
+    XF86ConnectorLFP,
+    XF86ConnectorProprietary,
+    XF86ConnectorHDMI,
+    XF86ConnectorDisplayPort,
 } xf86ConnectorType;
 
 typedef enum _xf86OutputStatus {
-   XF86OutputStatusConnected,
-   XF86OutputStatusDisconnected,
-   XF86OutputStatusUnknown
+    XF86OutputStatusConnected,
+    XF86OutputStatusDisconnected,
+    XF86OutputStatusUnknown
 } xf86OutputStatus;
 
 typedef struct _xf86CrtcFuncs {
@@ -81,35 +81,34 @@ typedef struct _xf86CrtcFuncs {
     * mode is DPMSModeOff, the crtc must be disabled sufficiently for it to
     * be safe to call mode_set.
     */
-   void
-    (*dpms)(xf86CrtcPtr		crtc,
-	    int		    	mode);
+    void
+     (*dpms) (xf86CrtcPtr crtc, int mode);
 
    /**
     * Saves the crtc's state for restoration on VT switch.
     */
-   void
-    (*save)(xf86CrtcPtr		crtc);
+    void
+     (*save) (xf86CrtcPtr crtc);
 
    /**
     * Restore's the crtc's state at VT switch.
     */
-   void
-    (*restore)(xf86CrtcPtr	crtc);
+    void
+     (*restore) (xf86CrtcPtr crtc);
 
     /**
      * Lock CRTC prior to mode setting, mostly for DRI.
      * Returns whether unlock is needed
      */
     Bool
-    (*lock) (xf86CrtcPtr crtc);
-    
+     (*lock) (xf86CrtcPtr crtc);
+
     /**
      * Unlock CRTC after mode setting, mostly for DRI
      */
     void
-    (*unlock) (xf86CrtcPtr crtc);
-    
+     (*unlock) (xf86CrtcPtr crtc);
+
     /**
      * Callback to adjust the mode to be set in the CRTC.
      *
@@ -118,109 +117,106 @@ typedef struct _xf86CrtcFuncs {
      * buses with clock limitations.
      */
     Bool
-    (*mode_fixup)(xf86CrtcPtr crtc,
-		  DisplayModePtr mode,
-		  DisplayModePtr adjusted_mode);
+     (*mode_fixup) (xf86CrtcPtr crtc,
+                    DisplayModePtr mode, DisplayModePtr adjusted_mode);
 
     /**
      * Prepare CRTC for an upcoming mode set.
      */
     void
-    (*prepare)(xf86CrtcPtr crtc);
+     (*prepare) (xf86CrtcPtr crtc);
 
     /**
      * Callback for setting up a video mode after fixups have been made.
      */
     void
-    (*mode_set)(xf86CrtcPtr crtc,
-		DisplayModePtr mode,
-		DisplayModePtr adjusted_mode,
-		int x, int y);
+     (*mode_set) (xf86CrtcPtr crtc,
+                  DisplayModePtr mode,
+                  DisplayModePtr adjusted_mode, int x, int y);
 
     /**
      * Commit mode changes to a CRTC
      */
     void
-    (*commit)(xf86CrtcPtr crtc);
+     (*commit) (xf86CrtcPtr crtc);
 
     /* Set the color ramps for the CRTC to the given values. */
     void
-    (*gamma_set)(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
-		 int size);
+     (*gamma_set) (xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
+                   int size);
 
     /**
      * Allocate the shadow area, delay the pixmap creation until needed
      */
-    void *
-    (*shadow_allocate) (xf86CrtcPtr crtc, int width, int height);
-    
+    void *(*shadow_allocate) (xf86CrtcPtr crtc, int width, int height);
+
     /**
      * Create shadow pixmap for rotation support
      */
     PixmapPtr
-    (*shadow_create) (xf86CrtcPtr crtc, void *data, int width, int height);
-    
+     (*shadow_create) (xf86CrtcPtr crtc, void *data, int width, int height);
+
     /**
      * Destroy shadow pixmap
      */
     void
-    (*shadow_destroy) (xf86CrtcPtr crtc, PixmapPtr pPixmap, void *data);
+     (*shadow_destroy) (xf86CrtcPtr crtc, PixmapPtr pPixmap, void *data);
 
     /**
      * Set cursor colors
      */
     void
-    (*set_cursor_colors) (xf86CrtcPtr crtc, int bg, int fg);
+     (*set_cursor_colors) (xf86CrtcPtr crtc, int bg, int fg);
 
     /**
      * Set cursor position
      */
     void
-    (*set_cursor_position) (xf86CrtcPtr crtc, int x, int y);
+     (*set_cursor_position) (xf86CrtcPtr crtc, int x, int y);
 
     /**
      * Show cursor
      */
     void
-    (*show_cursor) (xf86CrtcPtr crtc);
+     (*show_cursor) (xf86CrtcPtr crtc);
 
     /**
      * Hide cursor
      */
     void
-    (*hide_cursor) (xf86CrtcPtr crtc);
+     (*hide_cursor) (xf86CrtcPtr crtc);
 
     /**
      * Load monochrome image
      */
     void
-    (*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);
+     (*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);
 
     /**
      * Load ARGB image
      */
-     void
+    void
      (*load_cursor_argb) (xf86CrtcPtr crtc, CARD32 *image);
-     
+
     /**
      * Clean up driver-specific bits of the crtc
      */
     void
-    (*destroy) (xf86CrtcPtr	crtc);
+     (*destroy) (xf86CrtcPtr crtc);
 
     /**
      * Less fine-grained mode setting entry point for kernel modesetting
      */
     Bool
-    (*set_mode_major)(xf86CrtcPtr crtc, DisplayModePtr mode,
-		      Rotation rotation, int x, int y);
+     (*set_mode_major) (xf86CrtcPtr crtc, DisplayModePtr mode,
+                        Rotation rotation, int x, int y);
 
     /**
      * Callback for panning. Doesn't change the mode.
      * Added in ABI version 2
      */
     void
-    (*set_origin)(xf86CrtcPtr crtc, int x, int y);
+     (*set_origin) (xf86CrtcPtr crtc, int x, int y);
 
 } xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;
 
@@ -235,15 +231,15 @@ struct _xf86Crtc {
     /**
      * Associated ScrnInfo
      */
-    ScrnInfoPtr	    scrn;
-    
+    ScrnInfoPtr scrn;
+
     /**
      * Desired state of this CRTC
      *
      * Set when this CRTC should be driving one or more outputs 
      */
-    Bool	    enabled;
-    
+    Bool enabled;
+
     /**
      * Active mode
      *
@@ -251,18 +247,18 @@ struct _xf86Crtc {
      * It will be cleared when the VT is not active or
      * during server startup
      */
-    DisplayModeRec  mode;
-    Rotation	    rotation;
-    PixmapPtr	    rotatedPixmap;
-    void	    *rotatedData;
-    
+    DisplayModeRec mode;
+    Rotation rotation;
+    PixmapPtr rotatedPixmap;
+    void *rotatedData;
+
     /**
      * Position on screen
      *
      * Locates this CRTC within the frame buffer
      */
-    int		    x, y;
-    
+    int x, y;
+
     /**
      * Desired mode
      *
@@ -271,10 +267,10 @@ struct _xf86Crtc {
      * the startup configured mode and saves the active mode
      * on VT switch.
      */
-    DisplayModeRec  desiredMode;
-    Rotation	    desiredRotation;
-    int		    desiredX, desiredY;
-    
+    DisplayModeRec desiredMode;
+    Rotation desiredRotation;
+    int desiredX, desiredY;
+
     /** crtc-specific functions */
     const xf86CrtcFuncsRec *funcs;
 
@@ -283,7 +279,7 @@ struct _xf86Crtc {
      *
      * Holds driver-private information
      */
-    void	    *driver_private;
+    void *driver_private;
 
 #ifdef RANDR_12_INTERFACE
     /**
@@ -292,45 +288,45 @@ struct _xf86Crtc {
      * When RandR 1.2 is available, this
      * points at the associated crtc object
      */
-    RRCrtcPtr	    randr_crtc;
+    RRCrtcPtr randr_crtc;
 #else
-    void	    *randr_crtc;
+    void *randr_crtc;
 #endif
 
     /**
      * Current cursor is ARGB
      */
-    Bool	    cursor_argb;
+    Bool cursor_argb;
     /**
      * Track whether cursor is within CRTC range 
      */
-    Bool	    cursor_in_range;
+    Bool cursor_in_range;
     /**
      * Track state of cursor associated with this CRTC
      */
-    Bool	    cursor_shown;
+    Bool cursor_shown;
 
     /**
      * Current transformation matrix
      */
-    PictTransform   crtc_to_framebuffer;
+    PictTransform crtc_to_framebuffer;
     /* framebuffer_to_crtc was removed in ABI 2 */
-    struct pict_f_transform f_crtc_to_framebuffer; /* ABI 2 */
-    struct pict_f_transform f_framebuffer_to_crtc; /* ABI 2 */
-    PictFilterPtr   filter; /* ABI 2 */
-    xFixed	    *params; /* ABI 2 */
-    int		    nparams; /* ABI 2 */
-    int		    filter_width; /* ABI 2 */
-    int		    filter_height; /* ABI 2 */
-    Bool	    transform_in_use;
-    RRTransformRec  transform; /* ABI 2 */
-    Bool	    transformPresent; /* ABI 2 */
-    RRTransformRec  desiredTransform; /* ABI 2 */
-    Bool	    desiredTransformPresent; /* ABI 2 */
+    struct pict_f_transform f_crtc_to_framebuffer;      /* ABI 2 */
+    struct pict_f_transform f_framebuffer_to_crtc;      /* ABI 2 */
+    PictFilterPtr filter;       /* ABI 2 */
+    xFixed *params;             /* ABI 2 */
+    int nparams;                /* ABI 2 */
+    int filter_width;           /* ABI 2 */
+    int filter_height;          /* ABI 2 */
+    Bool transform_in_use;
+    RRTransformRec transform;   /* ABI 2 */
+    Bool transformPresent;      /* ABI 2 */
+    RRTransformRec desiredTransform;    /* ABI 2 */
+    Bool desiredTransformPresent;       /* ABI 2 */
     /**
      * Bounding box in screen space
      */
-    BoxRec	    bounds;
+    BoxRec bounds;
     /**
      * Panning:
      * TotalArea: total panning area, larger than CRTC's size
@@ -338,9 +334,9 @@ struct _xf86Crtc {
      * border: Borders of the displayed CRTC area which induces panning if the pointer reaches them
      * Added in ABI version 2
      */
-    BoxRec          panningTotalArea;
-    BoxRec          panningTrackingArea;
-    INT16           panningBorder[4];
+    BoxRec panningTotalArea;
+    BoxRec panningTrackingArea;
+    INT16 panningBorder[4];
 
     /**
      * Current gamma, especially useful after initial config.
@@ -357,11 +353,11 @@ struct _xf86Crtc {
      * Set to TRUE after modesetting, set to FALSE if no outputs are connected
      * Added in ABI version 3
      */
-    Bool	    active;
+    Bool active;
     /**
      * Clear the shadow
      */
-    Bool	    shadowClear;
+    Bool shadowClear;
 
     /**
      * Indicates that the driver is handling the transform, so the shadow
@@ -374,7 +370,7 @@ struct _xf86Crtc {
      *
      * Added in ABI version 4
      */
-    Bool	    driverIsPerformingTransform;
+    Bool driverIsPerformingTransform;
 };
 
 typedef struct _xf86OutputFuncs {
@@ -383,7 +379,7 @@ typedef struct _xf86OutputFuncs {
      * RandR objects have been created.
      */
     void
-    (*create_resources)(xf86OutputPtr output);
+     (*create_resources) (xf86OutputPtr output);
 
     /**
      * Turns the output on/off, or sets intermediate power levels if available.
@@ -393,20 +389,19 @@ typedef struct _xf86OutputFuncs {
      * disabled afterwards.
      */
     void
-    (*dpms)(xf86OutputPtr	output,
-	    int			mode);
+     (*dpms) (xf86OutputPtr output, int mode);
 
     /**
      * Saves the output's state for restoration on VT switch.
      */
     void
-    (*save)(xf86OutputPtr	output);
+     (*save) (xf86OutputPtr output);
 
     /**
      * Restore's the output's state at VT switch.
      */
     void
-    (*restore)(xf86OutputPtr	output);
+     (*restore) (xf86OutputPtr output);
 
     /**
      * Callback for testing a video mode for a given output.
@@ -417,8 +412,7 @@ typedef struct _xf86OutputFuncs {
      * \return MODE_OK if the mode is valid, or another MODE_* otherwise.
      */
     int
-    (*mode_valid)(xf86OutputPtr	    output,
-		  DisplayModePtr    pMode);
+     (*mode_valid) (xf86OutputPtr output, DisplayModePtr pMode);
 
     /**
      * Callback to adjust the mode to be set in the CRTC.
@@ -428,21 +422,20 @@ typedef struct _xf86OutputFuncs {
      * buses with clock limitations.
      */
     Bool
-    (*mode_fixup)(xf86OutputPtr output,
-		  DisplayModePtr mode,
-		  DisplayModePtr adjusted_mode);
+     (*mode_fixup) (xf86OutputPtr output,
+                    DisplayModePtr mode, DisplayModePtr adjusted_mode);
 
     /**
      * Callback for preparing mode changes on an output
      */
     void
-    (*prepare)(xf86OutputPtr output);
+     (*prepare) (xf86OutputPtr output);
 
     /**
      * Callback for committing mode changes on an output
      */
     void
-    (*commit)(xf86OutputPtr output);
+     (*commit) (xf86OutputPtr output);
 
     /**
      * Callback for setting up a video mode after fixups have been made.
@@ -452,15 +445,13 @@ typedef struct _xf86OutputFuncs {
      * after this function is called.
      */
     void
-    (*mode_set)(xf86OutputPtr  output,
-		DisplayModePtr mode,
-		DisplayModePtr adjusted_mode);
+     (*mode_set) (xf86OutputPtr output,
+                  DisplayModePtr mode, DisplayModePtr adjusted_mode);
 
     /**
      * Probe for a connected output, and return detect_status.
      */
-    xf86OutputStatus
-    (*detect)(xf86OutputPtr	    output);
+     xf86OutputStatus(*detect) (xf86OutputPtr output);
 
     /**
      * Query the device for the modes it provides.
@@ -469,41 +460,36 @@ typedef struct _xf86OutputFuncs {
      *
      * \return singly-linked list of modes or NULL if no modes found.
      */
-    DisplayModePtr
-    (*get_modes)(xf86OutputPtr	    output);
+     DisplayModePtr(*get_modes) (xf86OutputPtr output);
 
 #ifdef RANDR_12_INTERFACE
     /**
      * Callback when an output's property has changed.
      */
     Bool
-    (*set_property)(xf86OutputPtr output,
-		    Atom property,
-		    RRPropertyValuePtr value);
+     (*set_property) (xf86OutputPtr output,
+                      Atom property, RRPropertyValuePtr value);
 #endif
 #ifdef RANDR_13_INTERFACE
     /**
      * Callback to get an updated property value
      */
     Bool
-    (*get_property)(xf86OutputPtr output,
-		    Atom property);
+     (*get_property) (xf86OutputPtr output, Atom property);
 #endif
 #ifdef RANDR_GET_CRTC_INTERFACE
     /**
      * Callback to get current CRTC for a given output
      */
-    xf86CrtcPtr
-    (*get_crtc)(xf86OutputPtr output);
+     xf86CrtcPtr(*get_crtc) (xf86OutputPtr output);
 #endif
     /**
      * Clean up driver-specific bits of the output
      */
     void
-    (*destroy) (xf86OutputPtr	    output);
+     (*destroy) (xf86OutputPtr output);
 } xf86OutputFuncsRec, *xf86OutputFuncsPtr;
 
-
 #define XF86_OUTPUT_VERSION 2
 
 struct _xf86Output {
@@ -515,34 +501,34 @@ struct _xf86Output {
     /**
      * Associated ScrnInfo
      */
-    ScrnInfoPtr		scrn;
+    ScrnInfoPtr scrn;
 
     /**
      * Currently connected crtc (if any)
      *
      * If this output is not in use, this field will be NULL.
      */
-    xf86CrtcPtr		crtc;
+    xf86CrtcPtr crtc;
 
     /**
      * Possible CRTCs for this output as a mask of crtc indices
      */
-    CARD32		possible_crtcs;
+    CARD32 possible_crtcs;
 
     /**
      * Possible outputs to share the same CRTC as a mask of output indices
      */
-    CARD32		possible_clones;
-    
+    CARD32 possible_clones;
+
     /**
      * Whether this output can support interlaced modes
      */
-    Bool		interlaceAllowed;
+    Bool interlaceAllowed;
 
     /**
      * Whether this output can support double scan modes
      */
-    Bool		doubleScanAllowed;
+    Bool doubleScanAllowed;
 
     /**
      * List of available modes on this output.
@@ -550,27 +536,27 @@ struct _xf86Output {
      * This should be the list from get_modes(), plus perhaps additional
      * compatible modes added later.
      */
-    DisplayModePtr	probed_modes;
+    DisplayModePtr probed_modes;
 
     /**
      * Options parsed from the related monitor section
      */
-    OptionInfoPtr	options;
-    
+    OptionInfoPtr options;
+
     /**
      * Configured monitor section
      */
-    XF86ConfMonitorPtr  conf_monitor;
-    
+    XF86ConfMonitorPtr conf_monitor;
+
     /**
      * Desired initial position
      */
-    int			initial_x, initial_y;
+    int initial_x, initial_y;
 
     /**
      * Desired initial rotation
      */
-    Rotation		initial_rotation;
+    Rotation initial_rotation;
 
     /**
      * Current connection status
@@ -578,28 +564,28 @@ struct _xf86Output {
      * This indicates whether a monitor is known to be connected
      * to this output or not, or whether there is no way to tell
      */
-    xf86OutputStatus	status;
+    xf86OutputStatus status;
 
     /** EDID monitor information */
-    xf86MonPtr		MonInfo;
+    xf86MonPtr MonInfo;
 
     /** subpixel order */
-    int			subpixel_order;
+    int subpixel_order;
 
     /** Physical size of the currently attached output device. */
-    int			mm_width, mm_height;
+    int mm_width, mm_height;
 
     /** Output name */
-    char		*name;
+    char *name;
 
     /** output-specific functions */
     const xf86OutputFuncsRec *funcs;
 
     /** driver private information */
-    void		*driver_private;
-    
+    void *driver_private;
+
     /** Whether to use the old per-screen Monitor config section */
-    Bool		use_screen_monitor;
+    Bool use_screen_monitor;
 
 #ifdef RANDR_12_INTERFACE
     /**
@@ -608,17 +594,17 @@ struct _xf86Output {
      * When RandR 1.2 is available, this points at the associated
      * RandR output structure and is created when this output is created
      */
-    RROutputPtr		randr_output;
+    RROutputPtr randr_output;
 #else
-    void		*randr_output;
+    void *randr_output;
 #endif
     /** 
      * Desired initial panning
      * Added in ABI version 2
      */
-    BoxRec          initialTotalArea;
-    BoxRec          initialTrackingArea;
-    INT16           initialBorder[4];
+    BoxRec initialTotalArea;
+    BoxRec initialTrackingArea;
+    INT16 initialBorder[4];
 };
 
 typedef struct _xf86CrtcConfigFuncs {
@@ -635,67 +621,65 @@ typedef struct _xf86CrtcConfigFuncs {
      * pixmaps it may have moved, and change pScrn->displayWidth.
      */
     Bool
-    (*resize)(ScrnInfoPtr	scrn,
-	      int		width,
-	      int		height);
+     (*resize) (ScrnInfoPtr scrn, int width, int height);
 } xf86CrtcConfigFuncsRec, *xf86CrtcConfigFuncsPtr;
 
 typedef void (*xf86_crtc_notify_proc_ptr) (ScreenPtr pScreen);
 
 typedef struct _xf86CrtcConfig {
-    int			num_output;
-    xf86OutputPtr	*output;
+    int num_output;
+    xf86OutputPtr *output;
     /**
      * compat_output is used whenever we deal
      * with legacy code that only understands a single
      * output. pScrn->modes will be loaded from this output,
      * adjust frame will whack this output, etc.
      */
-    int			compat_output;
+    int compat_output;
+
+    int num_crtc;
+    xf86CrtcPtr *crtc;
 
-    int			num_crtc;
-    xf86CrtcPtr		*crtc;
+    int minWidth, minHeight;
+    int maxWidth, maxHeight;
 
-    int			minWidth, minHeight;
-    int			maxWidth, maxHeight;
-    
     /* For crtc-based rotation */
-    DamagePtr		rotation_damage;
-    Bool		rotation_damage_registered;
+    DamagePtr rotation_damage;
+    Bool rotation_damage_registered;
 
     /* DGA */
-    unsigned int	dga_flags;
-    unsigned long	dga_address;
-    DGAModePtr		dga_modes;
-    int			dga_nmode;
-    int			dga_width, dga_height, dga_stride;
-    DisplayModePtr	dga_save_mode;
+    unsigned int dga_flags;
+    unsigned long dga_address;
+    DGAModePtr dga_modes;
+    int dga_nmode;
+    int dga_width, dga_height, dga_stride;
+    DisplayModePtr dga_save_mode;
 
     const xf86CrtcConfigFuncsRec *funcs;
 
-    CreateScreenResourcesProcPtr    CreateScreenResources;
+    CreateScreenResourcesProcPtr CreateScreenResources;
 
-    CloseScreenProcPtr		    CloseScreen;
+    CloseScreenProcPtr CloseScreen;
 
     /* Cursor information */
-    xf86CursorInfoPtr	cursor_info;
-    CursorPtr		cursor;
-    CARD8		*cursor_image;
-    Bool		cursor_on;
-    CARD32		cursor_fg, cursor_bg;
+    xf86CursorInfoPtr cursor_info;
+    CursorPtr cursor;
+    CARD8 *cursor_image;
+    Bool cursor_on;
+    CARD32 cursor_fg, cursor_bg;
 
     /**
      * Options parsed from the related device section
      */
-    OptionInfoPtr	options;
+    OptionInfoPtr options;
 
-    Bool		debug_modes;
+    Bool debug_modes;
 
     /* wrap screen BlockHandler for rotation */
-    ScreenBlockHandlerProcPtr	BlockHandler;
+    ScreenBlockHandlerProcPtr BlockHandler;
 
     /* callback when crtc configuration changes */
-    xf86_crtc_notify_proc_ptr  xf86_crtc_notify;
+    xf86_crtc_notify_proc_ptr xf86_crtc_notify;
 
 } xf86CrtcConfigRec, *xf86CrtcConfigPtr;
 
@@ -707,6 +691,7 @@ static _X_INLINE xf86OutputPtr
 xf86CompatOutput(ScrnInfoPtr pScrn)
 {
     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+
     return config->output[config->compat_output];
 }
 
@@ -714,156 +699,155 @@ static _X_INLINE xf86CrtcPtr
 xf86CompatCrtc(ScrnInfoPtr pScrn)
 {
     xf86OutputPtr compat_output = xf86CompatOutput(pScrn);
+
     if (!compat_output)
-	return NULL;
+        return NULL;
     return compat_output->crtc;
 }
 
 static _X_INLINE RRCrtcPtr
 xf86CompatRRCrtc(ScrnInfoPtr pScrn)
 {
-    xf86CrtcPtr	compat_crtc = xf86CompatCrtc(pScrn);
+    xf86CrtcPtr compat_crtc = xf86CompatCrtc(pScrn);
+
     if (!compat_crtc)
-	return NULL;
+        return NULL;
     return compat_crtc->randr_crtc;
 }
 
-
 /*
  * Initialize xf86CrtcConfig structure
  */
 
 extern _X_EXPORT void
-xf86CrtcConfigInit (ScrnInfoPtr				scrn,
-		    const xf86CrtcConfigFuncsRec	*funcs);
+ xf86CrtcConfigInit(ScrnInfoPtr scrn, const xf86CrtcConfigFuncsRec * funcs);
 
 extern _X_EXPORT void
-xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
-		      int minWidth, int minHeight,
-		      int maxWidth, int maxHeight);
+
+xf86CrtcSetSizeRange(ScrnInfoPtr scrn,
+                     int minWidth, int minHeight, int maxWidth, int maxHeight);
 
 /*
  * Crtc functions
  */
 extern _X_EXPORT xf86CrtcPtr
-xf86CrtcCreate (ScrnInfoPtr		scrn,
-		const xf86CrtcFuncsRec	*funcs);
+xf86CrtcCreate(ScrnInfoPtr scrn, const xf86CrtcFuncsRec * funcs);
 
 extern _X_EXPORT void
-xf86CrtcDestroy (xf86CrtcPtr		crtc);
-
+ xf86CrtcDestroy(xf86CrtcPtr crtc);
 
 /**
  * Sets the given video mode on the given crtc
  */
 
 extern _X_EXPORT Bool
-xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-			  RRTransformPtr transform, int x, int y);
+
+xf86CrtcSetModeTransform(xf86CrtcPtr crtc, DisplayModePtr mode,
+                         Rotation rotation, RRTransformPtr transform, int x,
+                         int y);
 
 extern _X_EXPORT Bool
-xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-		 int x, int y);
+
+xf86CrtcSetMode(xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
+                int x, int y);
 
 extern _X_EXPORT void
-xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);
+ xf86CrtcSetOrigin(xf86CrtcPtr crtc, int x, int y);
 
 /*
  * Assign crtc rotation during mode set
  */
 extern _X_EXPORT Bool
-xf86CrtcRotate (xf86CrtcPtr crtc);
+ xf86CrtcRotate(xf86CrtcPtr crtc);
 
 /*
  * Clean up any rotation data, used when a crtc is turned off
  * as well as when rotation is disabled.
  */
 extern _X_EXPORT void
-xf86RotateDestroy (xf86CrtcPtr crtc);
+ xf86RotateDestroy(xf86CrtcPtr crtc);
 
 /*
  * free shadow memory allocated for all crtcs
  */
 extern _X_EXPORT void
-xf86RotateFreeShadow(ScrnInfoPtr pScrn);
+ xf86RotateFreeShadow(ScrnInfoPtr pScrn);
 
 /*
  * Clean up rotation during CloseScreen
  */
 extern _X_EXPORT void
-xf86RotateCloseScreen (ScreenPtr pScreen);
+ xf86RotateCloseScreen(ScreenPtr pScreen);
 
 /**
  * Return whether any output is assigned to the crtc
  */
 extern _X_EXPORT Bool
-xf86CrtcInUse (xf86CrtcPtr crtc);
+ xf86CrtcInUse(xf86CrtcPtr crtc);
 
 /*
  * Output functions
  */
 extern _X_EXPORT xf86OutputPtr
-xf86OutputCreate (ScrnInfoPtr		    scrn,
-		  const xf86OutputFuncsRec  *funcs,
-		  const char		    *name);
+xf86OutputCreate(ScrnInfoPtr scrn,
+                 const xf86OutputFuncsRec * funcs, const char *name);
 
 extern _X_EXPORT void
-xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor);
+ xf86OutputUseScreenMonitor(xf86OutputPtr output, Bool use_screen_monitor);
 
 extern _X_EXPORT Bool
-xf86OutputRename (xf86OutputPtr output, const char *name);
+ xf86OutputRename(xf86OutputPtr output, const char *name);
 
 extern _X_EXPORT void
-xf86OutputDestroy (xf86OutputPtr	output);
+ xf86OutputDestroy(xf86OutputPtr output);
 
 extern _X_EXPORT void
-xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY);
+ xf86ProbeOutputModes(ScrnInfoPtr pScrn, int maxX, int maxY);
 
 extern _X_EXPORT void
-xf86SetScrnInfoModes (ScrnInfoPtr pScrn);
+ xf86SetScrnInfoModes(ScrnInfoPtr pScrn);
 
 #ifdef RANDR_13_INTERFACE
-# define ScreenInitRetType	int
+#define ScreenInitRetType	int
 #else
-# define ScreenInitRetType	Bool
+#define ScreenInitRetType	Bool
 #endif
 
-extern _X_EXPORT ScreenInitRetType
-xf86CrtcScreenInit (ScreenPtr pScreen);
+extern _X_EXPORT ScreenInitRetType xf86CrtcScreenInit(ScreenPtr pScreen);
 
 extern _X_EXPORT Bool
-xf86InitialConfiguration (ScrnInfoPtr pScrn, Bool canGrow);
+ xf86InitialConfiguration(ScrnInfoPtr pScrn, Bool canGrow);
 
 extern _X_EXPORT void
-xf86DPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);
-    
+ xf86DPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);
+
 extern _X_EXPORT Bool
-xf86SaveScreen(ScreenPtr pScreen, int mode);
+ xf86SaveScreen(ScreenPtr pScreen, int mode);
 
 extern _X_EXPORT void
-xf86DisableUnusedFunctions(ScrnInfoPtr pScrn);
+ xf86DisableUnusedFunctions(ScrnInfoPtr pScrn);
 
 extern _X_EXPORT DisplayModePtr
-xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired);
-    
+xf86OutputFindClosestMode(xf86OutputPtr output, DisplayModePtr desired);
+
 extern _X_EXPORT Bool
-xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation);
+
+xf86SetSingleMode(ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation);
 
 /**
  * Set the EDID information for the specified output
  */
 extern _X_EXPORT void
-xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon);
+ xf86OutputSetEDID(xf86OutputPtr output, xf86MonPtr edid_mon);
 
 /**
  * Return the list of modes supported by the EDID information
  * stored in 'output'
  */
-extern _X_EXPORT DisplayModePtr
-xf86OutputGetEDIDModes (xf86OutputPtr output);
+extern _X_EXPORT DisplayModePtr xf86OutputGetEDIDModes(xf86OutputPtr output);
 
 extern _X_EXPORT xf86MonPtr
-xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);
+xf86OutputGetEDID(xf86OutputPtr output, I2CBusPtr pDDCBus);
 
 /**
  * Initialize dga for this screen
@@ -871,23 +855,23 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);
 
 #ifdef XFreeXDGA
 extern _X_EXPORT Bool
-xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);
+ xf86DiDGAInit(ScreenPtr pScreen, unsigned long dga_address);
 
 /* this is the real function, used only internally */
 _X_INTERNAL Bool
-_xf86_di_dga_init_internal (ScreenPtr pScreen);
+ _xf86_di_dga_init_internal(ScreenPtr pScreen);
 
 /**
  * Re-initialize dga for this screen (as when the set of modes changes)
  */
 
 extern _X_EXPORT Bool
-xf86DiDGAReInit (ScreenPtr pScreen);
+ xf86DiDGAReInit(ScreenPtr pScreen);
 #endif
 
 /* This is the real function, used only internally */
 _X_INTERNAL Bool
-_xf86_di_dga_reinit_internal (ScreenPtr pScreen);
+ _xf86_di_dga_reinit_internal(ScreenPtr pScreen);
 
 /*
  * Set the subpixel order reported for the screen using
@@ -895,13 +879,12 @@ _xf86_di_dga_reinit_internal (ScreenPtr pScreen);
  */
 
 extern _X_EXPORT void
-xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen);
+ xf86CrtcSetScreenSubpixelOrder(ScreenPtr pScreen);
 
 /*
  * Get a standard string name for a connector type 
  */
-extern _X_EXPORT const char *
-xf86ConnectorGetName(xf86ConnectorType connector);
+extern _X_EXPORT const char *xf86ConnectorGetName(xf86ConnectorType connector);
 
 /*
  * Using the desired mode information in each crtc, set
@@ -909,7 +892,7 @@ xf86ConnectorGetName(xf86ConnectorType connector);
  */
 
 extern _X_EXPORT Bool
-xf86SetDesiredModes (ScrnInfoPtr pScrn);
+ xf86SetDesiredModes(ScrnInfoPtr pScrn);
 
 /**
  * Initialize the CRTC-based cursor code. CRTC function vectors must
@@ -918,7 +901,7 @@ xf86SetDesiredModes (ScrnInfoPtr pScrn);
  * Driver should call this from ScreenInit function
  */
 extern _X_EXPORT Bool
-xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags);
+ xf86_cursors_init(ScreenPtr screen, int max_width, int max_height, int flags);
 
 /**
  * Called when anything on the screen is reconfigured.
@@ -928,25 +911,25 @@ xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags);
  * Driver should call this from crtc commit function.
  */
 extern _X_EXPORT void
-xf86_reload_cursors (ScreenPtr screen);
+ xf86_reload_cursors(ScreenPtr screen);
 
 /**
  * Called from EnterVT to turn the cursors back on
  */
 extern _X_EXPORT void
-xf86_show_cursors (ScrnInfoPtr scrn);
+ xf86_show_cursors(ScrnInfoPtr scrn);
 
 /**
  * Called by the driver to turn cursors off
  */
 extern _X_EXPORT void
-xf86_hide_cursors (ScrnInfoPtr scrn);
+ xf86_hide_cursors(ScrnInfoPtr scrn);
 
 /**
  * Clean up CRTC-based cursor code. Driver must call this at CloseScreen time.
  */
 extern _X_EXPORT void
-xf86_cursors_fini (ScreenPtr screen);
+ xf86_cursors_fini(ScreenPtr screen);
 
 /**
  * Transform the cursor's coordinates based on the crtc transform.  Normally
@@ -954,7 +937,7 @@ xf86_cursors_fini (ScreenPtr screen);
  * then the server does not transform the cursor position automatically.
  */
 extern _X_EXPORT void
-xf86CrtcTransformCursorPos (xf86CrtcPtr crtc, int *x, int *y);
+ xf86CrtcTransformCursorPos(xf86CrtcPtr crtc, int *x, int *y);
 
 #ifdef XV
 /*
@@ -964,33 +947,32 @@ xf86CrtcTransformCursorPos (xf86CrtcPtr crtc, int *x, int *y);
  */
 
 extern _X_EXPORT Bool
+
 xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
-			    xf86CrtcPtr *crtc_ret,
-			    xf86CrtcPtr desired_crtc,
-			    BoxPtr      dst,
-			    INT32	*xa,
-			    INT32	*xb,
-			    INT32	*ya,
-			    INT32	*yb,
-			    RegionPtr   reg,
-			    INT32	width,
-			    INT32	height);
+                            xf86CrtcPtr * crtc_ret,
+                            xf86CrtcPtr desired_crtc,
+                            BoxPtr dst,
+                            INT32 *xa,
+                            INT32 *xb,
+                            INT32 *ya,
+                            INT32 *yb,
+                            RegionPtr reg, INT32 width, INT32 height);
 #endif
-    
+
 extern _X_EXPORT xf86_crtc_notify_proc_ptr
-xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);
+xf86_wrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);
 
 extern _X_EXPORT void
-xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old);
+ xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old);
 
 extern _X_EXPORT void
-xf86_crtc_notify(ScreenPtr pScreen);
+ xf86_crtc_notify(ScreenPtr pScreen);
 
 /**
  * Gamma
  */
 
 extern _X_EXPORT Bool
-xf86_crtc_supports_gamma(ScrnInfoPtr pScrn);
+ xf86_crtc_supports_gamma(ScrnInfoPtr pScrn);
 
-#endif /* _XF86CRTC_H_ */
+#endif                          /* _XF86CRTC_H_ */
diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index 669da0d5b..95a78921d 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -52,10 +52,10 @@
  * that it's handling the screen transform, then this returns RR_Rotate_0.
  */
 static Rotation
-xf86_crtc_cursor_rotation (xf86CrtcPtr crtc)
+xf86_crtc_cursor_rotation(xf86CrtcPtr crtc)
 {
     if (crtc->driverIsPerformingTransform)
-	return RR_Rotate_0;
+        return RR_Rotate_0;
     return crtc->rotation;
 }
 
@@ -63,38 +63,34 @@ xf86_crtc_cursor_rotation (xf86CrtcPtr crtc)
  * Given a screen coordinate, rotate back to a cursor source coordinate
  */
 static void
-xf86_crtc_rotate_coord (Rotation    rotation,
-			int	    width,
-			int	    height,
-			int	    x_dst,
-			int	    y_dst,
-			int	    *x_src,
-			int	    *y_src)
+xf86_crtc_rotate_coord(Rotation rotation,
+                       int width,
+                       int height, int x_dst, int y_dst, int *x_src, int *y_src)
 {
     int t;
-    
+
     switch (rotation & 0xf) {
     case RR_Rotate_0:
-	break;
+        break;
     case RR_Rotate_90:
-	t = x_dst;
-	x_dst = height - y_dst - 1;
-	y_dst = t;
-	break;
+        t = x_dst;
+        x_dst = height - y_dst - 1;
+        y_dst = t;
+        break;
     case RR_Rotate_180:
-	x_dst = width - x_dst - 1;
-	y_dst = height - y_dst - 1;
-	break;
+        x_dst = width - x_dst - 1;
+        y_dst = height - y_dst - 1;
+        break;
     case RR_Rotate_270:
-	t = x_dst;
-	x_dst = y_dst;
-	y_dst = width - t - 1;
-	break;
+        t = x_dst;
+        x_dst = y_dst;
+        y_dst = width - t - 1;
+        break;
     }
     if (rotation & RR_Reflect_X)
-	x_dst = width - x_dst - 1;
+        x_dst = width - x_dst - 1;
     if (rotation & RR_Reflect_Y)
-	y_dst = height - y_dst - 1;
+        y_dst = height - y_dst - 1;
     *x_src = x_dst;
     *y_src = y_dst;
 }
@@ -103,38 +99,35 @@ xf86_crtc_rotate_coord (Rotation    rotation,
  * Given a cursor source  coordinate, rotate to a screen coordinate
  */
 static void
-xf86_crtc_rotate_coord_back (Rotation    rotation,
-			     int	    width,
-			     int	    height,
-			     int	    x_dst,
-			     int	    y_dst,
-			     int	    *x_src,
-			     int	    *y_src)
+xf86_crtc_rotate_coord_back(Rotation rotation,
+                            int width,
+                            int height,
+                            int x_dst, int y_dst, int *x_src, int *y_src)
 {
     int t;
-    
+
     if (rotation & RR_Reflect_X)
-	x_dst = width - x_dst - 1;
+        x_dst = width - x_dst - 1;
     if (rotation & RR_Reflect_Y)
-	y_dst = height - y_dst - 1;
+        y_dst = height - y_dst - 1;
 
     switch (rotation & 0xf) {
     case RR_Rotate_0:
-	break;
+        break;
     case RR_Rotate_90:
-	t = x_dst;
-	x_dst = y_dst;
-	y_dst = width - t - 1;
-	break;
+        t = x_dst;
+        x_dst = y_dst;
+        y_dst = width - t - 1;
+        break;
     case RR_Rotate_180:
-	x_dst = width - x_dst - 1;
-	y_dst = height - y_dst - 1;
-	break;
+        x_dst = width - x_dst - 1;
+        y_dst = height - y_dst - 1;
+        break;
     case RR_Rotate_270:
-	t = x_dst;
-	x_dst = height - y_dst - 1;
-	y_dst = t;
-	break;
+        t = x_dst;
+        x_dst = height - y_dst - 1;
+        y_dst = t;
+        break;
     }
     *x_src = x_dst;
     *y_src = y_dst;
@@ -149,16 +142,16 @@ struct cursor_bit {
  * Convert an x coordinate to a position within the cursor bitmap
  */
 static struct cursor_bit
-cursor_bitpos (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y,
-	       Bool mask)
+cursor_bitpos(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y,
+              Bool mask)
 {
     const int flags = cursor_info->Flags;
     const Bool interleaved =
-	!!(flags & (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1 |
-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8 |
-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16 |
-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32 |
-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64));
+        ! !(flags & (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1 |
+                     HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8 |
+                     HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16 |
+                     HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32 |
+                     HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64));
     const int width = cursor_info->MaxWidth;
     const int height = cursor_info->MaxHeight;
     const int stride = interleaved ? width / 4 : width / 8;
@@ -168,24 +161,24 @@ cursor_bitpos (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y,
     image += y * stride;
 
     if (flags & HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK)
-	mask = !mask;
+        mask = !mask;
     if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)
-	x = (x & ~3) | (3 - (x & 3));
+        x = (x & ~3) | (3 - (x & 3));
     if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) ==
-	(X_BYTE_ORDER == X_BIG_ENDIAN))
-	x = (x & ~7) | (7 - (x & 7));
+        (X_BYTE_ORDER == X_BIG_ENDIAN))
+        x = (x & ~7) | (7 - (x & 7));
     if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1)
-	x = (x << 1) + mask;
+        x = (x << 1) + mask;
     else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8)
-	x = ((x & ~7) << 1) | (mask << 3) | (x & 7);
+        x = ((x & ~7) << 1) | (mask << 3) | (x & 7);
     else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16)
-	x = ((x & ~15) << 1) | (mask << 4) | (x & 15);
+        x = ((x & ~15) << 1) | (mask << 4) | (x & 15);
     else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32)
-	x = ((x & ~31) << 1) | (mask << 5) | (x & 31);
+        x = ((x & ~31) << 1) | (mask << 5) | (x & 31);
     else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64)
-	x = ((x & ~63) << 1) | (mask << 6) | (x & 63);
+        x = ((x & ~63) << 1) | (mask << 6) | (x & 63);
     else if (mask)
-	image += stride * height;
+        image += stride * height;
 
     ret.byte = image + (x / 8);
     ret.bitpos = x & 7;
@@ -197,9 +190,10 @@ cursor_bitpos (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y,
  * Fetch one bit from a cursor bitmap
  */
 static CARD8
-get_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
+get_bit(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
 {
     struct cursor_bit bit = cursor_bitpos(image, cursor_info, x, y, mask);
+
     return (*bit.byte >> bit.bitpos) & 1;
 }
 
@@ -207,185 +201,177 @@ get_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
  * Set one bit in a cursor bitmap
  */
 static void
-set_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
+set_bit(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
 {
     struct cursor_bit bit = cursor_bitpos(image, cursor_info, x, y, mask);
+
     *bit.byte |= 1 << bit.bitpos;
 }
-    
+
 /*
  * Load a two color cursor into a driver that supports only ARGB cursors
  */
 static void
-xf86_crtc_convert_cursor_to_argb (xf86CrtcPtr crtc, unsigned char *src)
+xf86_crtc_convert_cursor_to_argb(xf86CrtcPtr crtc, unsigned char *src)
 {
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;
-    int			x, y;
-    int			xin, yin;
-    int			flags = cursor_info->Flags;
-    CARD32		bits;
-    const Rotation	rotation = xf86_crtc_cursor_rotation(crtc);
+    ScrnInfoPtr scrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+    CARD32 *cursor_image = (CARD32 *) xf86_config->cursor_image;
+    int x, y;
+    int xin, yin;
+    int flags = cursor_info->Flags;
+    CARD32 bits;
+    const Rotation rotation = xf86_crtc_cursor_rotation(crtc);
 
 #ifdef ARGB_CURSOR
     crtc->cursor_argb = FALSE;
 #endif
 
     for (y = 0; y < cursor_info->MaxHeight; y++)
-	for (x = 0; x < cursor_info->MaxWidth; x++) 
-	{
-	    xf86_crtc_rotate_coord (rotation,
-				    cursor_info->MaxWidth,
-				    cursor_info->MaxHeight,
-				    x, y, &xin, &yin);
-	    if (get_bit (src, cursor_info, xin, yin, TRUE) ==
-		((flags & HARDWARE_CURSOR_INVERT_MASK) == 0))
-	    {
-		if (get_bit (src, cursor_info, xin, yin, FALSE))
-		    bits = xf86_config->cursor_fg;
-		else
-		    bits = xf86_config->cursor_bg;
-	    }
-	    else
-		bits = 0;
-	    cursor_image[y * cursor_info->MaxWidth + x] = bits;
-	}
-    crtc->funcs->load_cursor_argb (crtc, cursor_image);
+        for (x = 0; x < cursor_info->MaxWidth; x++) {
+            xf86_crtc_rotate_coord(rotation,
+                                   cursor_info->MaxWidth,
+                                   cursor_info->MaxHeight, x, y, &xin, &yin);
+            if (get_bit(src, cursor_info, xin, yin, TRUE) ==
+                ((flags & HARDWARE_CURSOR_INVERT_MASK) == 0)) {
+                if (get_bit(src, cursor_info, xin, yin, FALSE))
+                    bits = xf86_config->cursor_fg;
+                else
+                    bits = xf86_config->cursor_bg;
+            }
+            else
+                bits = 0;
+            cursor_image[y * cursor_info->MaxWidth + x] = bits;
+        }
+    crtc->funcs->load_cursor_argb(crtc, cursor_image);
 }
 
 /*
  * Set the colors for a two-color cursor (ignore for ARGB cursors)
  */
 static void
-xf86_set_cursor_colors (ScrnInfoPtr scrn, int bg, int fg)
+xf86_set_cursor_colors(ScrnInfoPtr scrn, int bg, int fg)
 {
-    ScreenPtr		screen = scrn->pScreen;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    CursorPtr		cursor = xf86_config->cursor;
-    int			c;
-    CARD8		*bits = cursor ?
+    ScreenPtr screen = scrn->pScreen;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    CursorPtr cursor = xf86_config->cursor;
+    int c;
+    CARD8 *bits = cursor ?
         dixLookupScreenPrivate(&cursor->devPrivates, CursorScreenKey, screen)
-      : NULL;
+        : NULL;
 
     /* Save ARGB versions of these colors */
     xf86_config->cursor_fg = (CARD32) fg | 0xff000000;
     xf86_config->cursor_bg = (CARD32) bg | 0xff000000;
-    
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-
-	if (crtc->enabled && !crtc->cursor_argb)
-	{
-	    if (crtc->funcs->load_cursor_image)
-		crtc->funcs->set_cursor_colors (crtc, bg, fg);
-	    else if (bits)
-		xf86_crtc_convert_cursor_to_argb (crtc, bits);
-	}
+
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+        if (crtc->enabled && !crtc->cursor_argb) {
+            if (crtc->funcs->load_cursor_image)
+                crtc->funcs->set_cursor_colors(crtc, bg, fg);
+            else if (bits)
+                xf86_crtc_convert_cursor_to_argb(crtc, bits);
+        }
     }
 }
 
 static void
-xf86_crtc_hide_cursor (xf86CrtcPtr crtc)
+xf86_crtc_hide_cursor(xf86CrtcPtr crtc)
 {
-    if (crtc->cursor_shown)
-    {
-	crtc->funcs->hide_cursor (crtc);
-	crtc->cursor_shown = FALSE;
+    if (crtc->cursor_shown) {
+        crtc->funcs->hide_cursor(crtc);
+        crtc->cursor_shown = FALSE;
     }
 }
 
 void
-xf86_hide_cursors (ScrnInfoPtr scrn)
+xf86_hide_cursors(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
 
     xf86_config->cursor_on = FALSE;
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
 
-	if (crtc->enabled)
-	    xf86_crtc_hide_cursor (crtc);
+        if (crtc->enabled)
+            xf86_crtc_hide_cursor(crtc);
     }
 }
-    
+
 static void
-xf86_crtc_show_cursor (xf86CrtcPtr crtc)
+xf86_crtc_show_cursor(xf86CrtcPtr crtc)
 {
-    if (!crtc->cursor_shown && crtc->cursor_in_range)
-    {
-	crtc->funcs->show_cursor (crtc);
-	crtc->cursor_shown = TRUE;
+    if (!crtc->cursor_shown && crtc->cursor_in_range) {
+        crtc->funcs->show_cursor(crtc);
+        crtc->cursor_shown = TRUE;
     }
 }
 
 void
-xf86_show_cursors (ScrnInfoPtr scrn)
+xf86_show_cursors(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
 
     xf86_config->cursor_on = TRUE;
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
 
-	if (crtc->enabled)
-	    xf86_crtc_show_cursor (crtc);
+        if (crtc->enabled)
+            xf86_crtc_show_cursor(crtc);
     }
 }
 
-void xf86CrtcTransformCursorPos (xf86CrtcPtr crtc, int *x, int *y)
+void
+xf86CrtcTransformCursorPos(xf86CrtcPtr crtc, int *x, int *y)
 {
     ScrnInfoPtr scrn = crtc->scrn;
     ScreenPtr screen = scrn->pScreen;
     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
     xf86CursorScreenPtr ScreenPriv =
-	(xf86CursorScreenPtr)dixLookupPrivate(&screen->devPrivates,
-					      xf86CursorScreenKey);
+        (xf86CursorScreenPtr) dixLookupPrivate(&screen->devPrivates,
+                                               xf86CursorScreenKey);
     struct pict_f_vector v;
     int dx, dy;
 
     v.v[0] = (*x + ScreenPriv->HotX) + 0.5;
     v.v[1] = (*y + ScreenPriv->HotY) + 0.5;
     v.v[2] = 1;
-    pixman_f_transform_point (&crtc->f_framebuffer_to_crtc, &v);
+    pixman_f_transform_point(&crtc->f_framebuffer_to_crtc, &v);
     /* cursor will have 0.5 added to it already so floor is sufficent */
-    *x = floor (v.v[0]);
-    *y = floor (v.v[1]);
+    *x = floor(v.v[0]);
+    *y = floor(v.v[1]);
     /*
      * Transform position of cursor upper left corner
      */
-    xf86_crtc_rotate_coord_back (crtc->rotation, cursor_info->MaxWidth,
-				 cursor_info->MaxHeight, ScreenPriv->HotX,
-				 ScreenPriv->HotY, &dx, &dy);
+    xf86_crtc_rotate_coord_back(crtc->rotation, cursor_info->MaxWidth,
+                                cursor_info->MaxHeight, ScreenPriv->HotX,
+                                ScreenPriv->HotY, &dx, &dy);
     *x -= dx;
     *y -= dy;
 }
 
 static void
-xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
+xf86_crtc_set_cursor_position(xf86CrtcPtr crtc, int x, int y)
 {
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    DisplayModePtr	mode = &crtc->mode;
-    Bool		in_range;
+    ScrnInfoPtr scrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+    DisplayModePtr mode = &crtc->mode;
+    Bool in_range;
 
     /*
      * Transform position of cursor on screen
      */
     if (crtc->transform_in_use && !crtc->driverIsPerformingTransform)
-	xf86CrtcTransformCursorPos(crtc, &x, &y);
-    else
-    {
-	x -= crtc->x;
-	y -= crtc->y;
+        xf86CrtcTransformCursorPos(crtc, &x, &y);
+    else {
+        x -= crtc->x;
+        y -= crtc->y;
     }
 
     /*
@@ -393,216 +379,206 @@ xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
      */
     in_range = TRUE;
     if (x >= mode->HDisplay || y >= mode->VDisplay ||
-	x <= -cursor_info->MaxWidth || y <= -cursor_info->MaxHeight) 
-    {
-	in_range = FALSE;
-	x = 0;
-	y = 0;
+        x <= -cursor_info->MaxWidth || y <= -cursor_info->MaxHeight) {
+        in_range = FALSE;
+        x = 0;
+        y = 0;
     }
 
     crtc->cursor_in_range = in_range;
-    
-    if (in_range)
-    {
-	crtc->funcs->set_cursor_position (crtc, x, y);
-	xf86_crtc_show_cursor (crtc);
+
+    if (in_range) {
+        crtc->funcs->set_cursor_position(crtc, x, y);
+        xf86_crtc_show_cursor(crtc);
     }
     else
-	xf86_crtc_hide_cursor (crtc);
+        xf86_crtc_hide_cursor(crtc);
 }
 
 static void
-xf86_set_cursor_position (ScrnInfoPtr scrn, int x, int y)
+xf86_set_cursor_position(ScrnInfoPtr scrn, int x, int y)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
 
     /* undo what xf86HWCurs did to the coordinates */
     x += scrn->frameX0;
     y += scrn->frameY0;
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
 
-	if (crtc->enabled)
-	    xf86_crtc_set_cursor_position (crtc, x, y);
+        if (crtc->enabled)
+            xf86_crtc_set_cursor_position(crtc, x, y);
     }
 }
-    
+
 /*
  * Load a two-color cursor into a crtc, performing rotation as needed
  */
 static void
-xf86_crtc_load_cursor_image (xf86CrtcPtr crtc, CARD8 *src)
+xf86_crtc_load_cursor_image(xf86CrtcPtr crtc, CARD8 *src)
 {
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    CARD8		*cursor_image;
-    const Rotation	rotation = xf86_crtc_cursor_rotation(crtc);
+    ScrnInfoPtr scrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+    CARD8 *cursor_image;
+    const Rotation rotation = xf86_crtc_cursor_rotation(crtc);
 
 #ifdef ARGB_CURSOR
     crtc->cursor_argb = FALSE;
 #endif
 
     if (rotation == RR_Rotate_0)
-	cursor_image = src;
-    else
-    {
+        cursor_image = src;
+    else {
         int x, y;
-    	int xin, yin;
-	int stride = cursor_info->MaxWidth >> 2;
-	
-	cursor_image = xf86_config->cursor_image;
-	memset(cursor_image, 0, cursor_info->MaxHeight * stride);
-	
+        int xin, yin;
+        int stride = cursor_info->MaxWidth >> 2;
+
+        cursor_image = xf86_config->cursor_image;
+        memset(cursor_image, 0, cursor_info->MaxHeight * stride);
+
         for (y = 0; y < cursor_info->MaxHeight; y++)
-	    for (x = 0; x < cursor_info->MaxWidth; x++) 
-	    {
-		xf86_crtc_rotate_coord (rotation,
-					cursor_info->MaxWidth,
-					cursor_info->MaxHeight,
-					x, y, &xin, &yin);
-		if (get_bit(src, cursor_info, xin, yin, FALSE))
-		    set_bit(cursor_image, cursor_info, x, y, FALSE);
-		if (get_bit(src, cursor_info, xin, yin, TRUE))
-		    set_bit(cursor_image, cursor_info, x, y, TRUE);
-	    }
+            for (x = 0; x < cursor_info->MaxWidth; x++) {
+                xf86_crtc_rotate_coord(rotation,
+                                       cursor_info->MaxWidth,
+                                       cursor_info->MaxHeight,
+                                       x, y, &xin, &yin);
+                if (get_bit(src, cursor_info, xin, yin, FALSE))
+                    set_bit(cursor_image, cursor_info, x, y, FALSE);
+                if (get_bit(src, cursor_info, xin, yin, TRUE))
+                    set_bit(cursor_image, cursor_info, x, y, TRUE);
+            }
     }
-    crtc->funcs->load_cursor_image (crtc, cursor_image);
+    crtc->funcs->load_cursor_image(crtc, cursor_image);
 }
-    
+
 /*
  * Load a cursor image into all active CRTCs
  */
 static void
-xf86_load_cursor_image (ScrnInfoPtr scrn, unsigned char *src)
+xf86_load_cursor_image(ScrnInfoPtr scrn, unsigned char *src)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
-
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-
-	if (crtc->enabled)
-	{
-	    if (crtc->funcs->load_cursor_image)
-		xf86_crtc_load_cursor_image (crtc, src);
-	    else if (crtc->funcs->load_cursor_argb)
-		xf86_crtc_convert_cursor_to_argb (crtc, src);
-	}
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
+
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+        if (crtc->enabled) {
+            if (crtc->funcs->load_cursor_image)
+                xf86_crtc_load_cursor_image(crtc, src);
+            else if (crtc->funcs->load_cursor_argb)
+                xf86_crtc_convert_cursor_to_argb(crtc, src);
+        }
     }
 }
 
 static Bool
-xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor)
+xf86_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
 
     ++cursor->refcnt;
     if (xf86_config->cursor)
-	FreeCursor (xf86_config->cursor, None);
+        FreeCursor(xf86_config->cursor, None);
     xf86_config->cursor = cursor;
 
     if (cursor->bits->width > cursor_info->MaxWidth ||
-	cursor->bits->height> cursor_info->MaxHeight)
-	return FALSE;
+        cursor->bits->height > cursor_info->MaxHeight)
+        return FALSE;
 
     return TRUE;
 }
 
 static Bool
-xf86_use_hw_cursor_argb (ScreenPtr screen, CursorPtr cursor)
+xf86_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+
     ++cursor->refcnt;
     if (xf86_config->cursor)
-	FreeCursor (xf86_config->cursor, None);
+        FreeCursor(xf86_config->cursor, None);
     xf86_config->cursor = cursor;
-    
+
     /* Make sure ARGB support is available */
     if ((cursor_info->Flags & HARDWARE_CURSOR_ARGB) == 0)
-	return FALSE;
-    
+        return FALSE;
+
     if (cursor->bits->width > cursor_info->MaxWidth ||
-	cursor->bits->height> cursor_info->MaxHeight)
-	return FALSE;
+        cursor->bits->height > cursor_info->MaxHeight)
+        return FALSE;
 
     return TRUE;
 }
 
 static void
-xf86_crtc_load_cursor_argb (xf86CrtcPtr crtc, CursorPtr cursor)
+xf86_crtc_load_cursor_argb(xf86CrtcPtr crtc, CursorPtr cursor)
 {
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;
-    CARD32		*cursor_source = (CARD32 *) cursor->bits->argb;
-    int			x, y;
-    int			xin, yin;
-    CARD32		bits;
-    int			source_width = cursor->bits->width;
-    int			source_height = cursor->bits->height;
-    int			image_width = cursor_info->MaxWidth;
-    int			image_height = cursor_info->MaxHeight;
-    const Rotation	rotation = xf86_crtc_cursor_rotation(crtc);
+    ScrnInfoPtr scrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+    CARD32 *cursor_image = (CARD32 *) xf86_config->cursor_image;
+    CARD32 *cursor_source = (CARD32 *) cursor->bits->argb;
+    int x, y;
+    int xin, yin;
+    CARD32 bits;
+    int source_width = cursor->bits->width;
+    int source_height = cursor->bits->height;
+    int image_width = cursor_info->MaxWidth;
+    int image_height = cursor_info->MaxHeight;
+    const Rotation rotation = xf86_crtc_cursor_rotation(crtc);
 
     for (y = 0; y < image_height; y++)
-	for (x = 0; x < image_width; x++)
-	{
-	    xf86_crtc_rotate_coord (rotation, image_width, image_height, x, y,
-				    &xin, &yin);
-	    if (xin < source_width && yin < source_height)
-		bits = cursor_source[yin * source_width + xin];
-	    else
-		bits = 0;
-	    cursor_image[y * image_width + x] = bits;
-	}
-    
-    crtc->funcs->load_cursor_argb (crtc, cursor_image);
+        for (x = 0; x < image_width; x++) {
+            xf86_crtc_rotate_coord(rotation, image_width, image_height, x, y,
+                                   &xin, &yin);
+            if (xin < source_width && yin < source_height)
+                bits = cursor_source[yin * source_width + xin];
+            else
+                bits = 0;
+            cursor_image[y * image_width + x] = bits;
+        }
+
+    crtc->funcs->load_cursor_argb(crtc, cursor_image);
 }
 
 static void
-xf86_load_cursor_argb (ScrnInfoPtr scrn, CursorPtr cursor)
+xf86_load_cursor_argb(ScrnInfoPtr scrn, CursorPtr cursor)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
 
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
 
-	if (crtc->enabled)
-	    xf86_crtc_load_cursor_argb (crtc, cursor);
+        if (crtc->enabled)
+            xf86_crtc_load_cursor_argb(crtc, cursor);
     }
 }
 
 Bool
-xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags)
+xf86_cursors_init(ScreenPtr screen, int max_width, int max_height, int flags)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info;
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info;
 
     cursor_info = xf86CreateCursorInfoRec();
     if (!cursor_info)
-	return FALSE;
+        return FALSE;
 
     xf86_config->cursor_image = malloc(max_width * max_height * 4);
 
-    if (!xf86_config->cursor_image)
-    {
-	xf86DestroyCursorInfoRec (cursor_info);
-	return FALSE;
+    if (!xf86_config->cursor_image) {
+        xf86DestroyCursorInfoRec(cursor_info);
+        return FALSE;
     }
-	
+
     xf86_config->cursor_info = cursor_info;
 
     cursor_info->MaxWidth = max_width;
@@ -616,17 +592,16 @@ xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags)
     cursor_info->ShowCursor = xf86_show_cursors;
     cursor_info->UseHWCursor = xf86_use_hw_cursor;
 #ifdef ARGB_CURSOR
-    if (flags & HARDWARE_CURSOR_ARGB)
-    {
-	cursor_info->UseHWCursorARGB = xf86_use_hw_cursor_argb;
-	cursor_info->LoadCursorARGB = xf86_load_cursor_argb;
+    if (flags & HARDWARE_CURSOR_ARGB) {
+        cursor_info->UseHWCursorARGB = xf86_use_hw_cursor_argb;
+        cursor_info->LoadCursorARGB = xf86_load_cursor_argb;
     }
 #endif
-    
+
     xf86_config->cursor = NULL;
-    xf86_hide_cursors (scrn);
-    
-    return xf86InitCursor (screen, cursor_info);
+    xf86_hide_cursors(scrn);
+
+    return xf86InitCursor(screen, cursor_info);
 }
 
 /**
@@ -636,25 +611,25 @@ xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags)
  */
 
 void
-xf86_reload_cursors (ScreenPtr screen)
+xf86_reload_cursors(ScreenPtr screen)
 {
-    ScrnInfoPtr		scrn;
-    xf86CrtcConfigPtr   xf86_config;
-    xf86CursorInfoPtr   cursor_info;
-    CursorPtr		cursor;
-    int			x, y;
+    ScrnInfoPtr scrn;
+    xf86CrtcConfigPtr xf86_config;
+    xf86CursorInfoPtr cursor_info;
+    CursorPtr cursor;
+    int x, y;
     xf86CursorScreenPtr cursor_screen_priv;
-    
+
     /* initial mode setting will not have set a screen yet.
        May be called before the devices are initialised.
      */
     if (!screen || !inputInfo.pointer)
-	return;
+        return;
     cursor_screen_priv = dixLookupPrivate(&screen->devPrivates,
-					  xf86CursorScreenKey);
+                                          xf86CursorScreenKey);
     /* return if HW cursor is inactive, to avoid displaying two cursors */
     if (!cursor_screen_priv || !cursor_screen_priv->isUp)
-	return;
+        return;
 
     scrn = xf86Screens[screen->myNum];
     xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
@@ -662,26 +637,27 @@ xf86_reload_cursors (ScreenPtr screen)
     /* make sure the cursor code has been initialized */
     cursor_info = xf86_config->cursor_info;
     if (!cursor_info)
-	return;
+        return;
 
     cursor = xf86_config->cursor;
-    GetSpritePosition (inputInfo.pointer, &x, &y);
+    GetSpritePosition(inputInfo.pointer, &x, &y);
     if (!(cursor_info->Flags & HARDWARE_CURSOR_UPDATE_UNHIDDEN))
-	(*cursor_info->HideCursor)(scrn);
+        (*cursor_info->HideCursor) (scrn);
 
-    if (cursor)
-    {
-	void *src = dixLookupScreenPrivate(&cursor->devPrivates, CursorScreenKey, screen);
+    if (cursor) {
+        void *src =
+            dixLookupScreenPrivate(&cursor->devPrivates, CursorScreenKey,
+                                   screen);
 #ifdef ARGB_CURSOR
-	if (cursor->bits->argb && cursor_info->LoadCursorARGB)
-	    (*cursor_info->LoadCursorARGB) (scrn, cursor);
-	else if (src)
+        if (cursor->bits->argb && cursor_info->LoadCursorARGB)
+            (*cursor_info->LoadCursorARGB) (scrn, cursor);
+        else if (src)
 #endif
-	    (*cursor_info->LoadCursorImage)(scrn, src);
+            (*cursor_info->LoadCursorImage) (scrn, src);
 
-	x += scrn->frameX0 + cursor_screen_priv->HotX;
-	y += scrn->frameY0 + cursor_screen_priv->HotY;
-	(*cursor_info->SetCursorPosition)(scrn, x, y);
+        x += scrn->frameX0 + cursor_screen_priv->HotX;
+        y += scrn->frameY0 + cursor_screen_priv->HotY;
+        (*cursor_info->SetCursorPosition) (scrn, x, y);
     }
 }
 
@@ -689,21 +665,19 @@ xf86_reload_cursors (ScreenPtr screen)
  * Clean up CRTC-based cursor code
  */
 void
-xf86_cursors_fini (ScreenPtr screen)
+xf86_cursors_fini(ScreenPtr screen)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    
-    if (xf86_config->cursor_info)
-    {
-	xf86DestroyCursorInfoRec (xf86_config->cursor_info);
-	xf86_config->cursor_info = NULL;
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+    if (xf86_config->cursor_info) {
+        xf86DestroyCursorInfoRec(xf86_config->cursor_info);
+        xf86_config->cursor_info = NULL;
     }
     free(xf86_config->cursor_image);
     xf86_config->cursor_image = NULL;
-    if (xf86_config->cursor)
-    {
-	FreeCursor (xf86_config->cursor, None);
-	xf86_config->cursor = NULL;
+    if (xf86_config->cursor) {
+        FreeCursor(xf86_config->cursor, None);
+        xf86_config->cursor = NULL;
     }
 }
diff --git a/xorg-server/hw/xfree86/modes/xf86DiDGA.c b/xorg-server/hw/xfree86/modes/xf86DiDGA.c
index b2bbefa62..fafd95aed 100644
--- a/xorg-server/hw/xfree86/modes/xf86DiDGA.c
+++ b/xorg-server/hw/xfree86/modes/xf86DiDGA.c
@@ -1,217 +1,214 @@
-/*

- * Copyright © 2006 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 the copyright holders not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  The copyright holders make no representations

- * about the suitability of this software for any purpose.  It is provided "as

- * is" without express or implied warranty.

- *

- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL THE COPYRIGHT HOLDERS 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_XORG_CONFIG_H

-#include <xorg-config.h>

-#else

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#endif

-

-#include "xf86.h"

-#include "xf86DDC.h"

-#include "xf86_OSproc.h"

-#include "dgaproc.h"

-#include "xf86Crtc.h"

-#include "xf86Modes.h"

-#include "gcstruct.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-

-static Bool

-xf86_dga_get_modes (ScreenPtr pScreen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    DGAModePtr		modes, mode;

-    DisplayModePtr	display_mode;

-    int			bpp = scrn->bitsPerPixel >> 3;

-    int			num;

-

-    num = 0;

-    display_mode = scrn->modes;

-    while (display_mode) 

-    {

-	num++;

-	display_mode = display_mode->next;

-	if (display_mode == scrn->modes)

-	    break;

-    }

-    

-    if (!num)

-	return FALSE;

-    

-    modes = malloc(num * sizeof(DGAModeRec));

-    if (!modes)

-	return FALSE;

-    

-    num = 0;

-    display_mode = scrn->modes;

-    while (display_mode) 

-    {

-	mode = modes + num++;

-

-	mode->mode = display_mode;

-	mode->flags = DGA_CONCURRENT_ACCESS;

-	if (display_mode->Flags & V_DBLSCAN)

-	    mode->flags |= DGA_DOUBLESCAN;

-	if (display_mode->Flags & V_INTERLACE)

-	    mode->flags |= DGA_INTERLACED;

-	mode->byteOrder = scrn->imageByteOrder;

-	mode->depth = scrn->depth;

-	mode->bitsPerPixel = scrn->bitsPerPixel;

-	mode->red_mask = scrn->mask.red;

-	mode->green_mask = scrn->mask.green;

-	mode->blue_mask = scrn->mask.blue;

-	mode->visualClass = (bpp == 1) ? PseudoColor : TrueColor;

-	mode->viewportWidth = display_mode->HDisplay;

-	mode->viewportHeight = display_mode->VDisplay;

-	mode->xViewportStep = (bpp == 3) ? 2 : 1;

-	mode->yViewportStep = 1;

-	mode->viewportFlags = DGA_FLIP_RETRACE;

-	mode->offset = 0;

-	mode->address = 0;

-	mode->imageWidth = mode->viewportWidth;

-	mode->imageHeight = mode->viewportHeight;

-	mode->bytesPerScanline = (mode->imageWidth * scrn->bitsPerPixel) >> 3;

-	mode->pixmapWidth = mode->imageWidth;

-	mode->pixmapHeight = mode->imageHeight;

-	mode->maxViewportX = 0;

-	mode->maxViewportY = 0;

-

-	display_mode = display_mode->next;

-	if (display_mode == scrn->modes)

-	    break;

-    }

-    free(xf86_config->dga_modes);

-    xf86_config->dga_nmode = num;

-    xf86_config->dga_modes = modes;

-    return TRUE;

-}

-

-static Bool

-xf86_dga_set_mode(ScrnInfoPtr scrn, DGAModePtr display_mode)

-{

-    ScreenPtr		pScreen = scrn->pScreen;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-

-    if (!display_mode) 

-    {

-	if (xf86_config->dga_save_mode)

-	{

-	    xf86SwitchMode(pScreen, xf86_config->dga_save_mode);

-	    xf86_config->dga_save_mode = NULL;

-	}

-    }

-    else

-    {

-	if (!xf86_config->dga_save_mode)

-	{

-	    xf86_config->dga_save_mode = scrn->currentMode;

-	    xf86SwitchMode(pScreen, display_mode->mode);

-	}

-    }

-    return TRUE;

-}

-

-static int

-xf86_dga_get_viewport(ScrnInfoPtr scrn)

-{

-    return 0;

-}

-

-static void

-xf86_dga_set_viewport(ScrnInfoPtr scrn, int x, int y, int flags)

-{

-   scrn->AdjustFrame(scrn->pScreen->myNum, x, y, flags);

-}

-

-static Bool

-xf86_dga_open_framebuffer(ScrnInfoPtr scrn,

-			  char **name,

-			  unsigned char **mem, int *size, int *offset, int *flags)

-{

-    return FALSE;

-}

-

-static void

-xf86_dga_close_framebuffer(ScrnInfoPtr scrn)

-{

-}

-

-static DGAFunctionRec xf86_dga_funcs = {

-   xf86_dga_open_framebuffer,

-   xf86_dga_close_framebuffer,

-   xf86_dga_set_mode,

-   xf86_dga_set_viewport,

-   xf86_dga_get_viewport,

-   NULL,

-   NULL,

-   NULL,

-   NULL

-};

-

-Bool

-xf86DiDGAReInit (ScreenPtr pScreen)

-{

-    return TRUE;

-}

-

-Bool

-_xf86_di_dga_reinit_internal (ScreenPtr pScreen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    

-    if (!DGAAvailable(pScreen->myNum))

-	return TRUE;

-

-    if (!xf86_dga_get_modes (pScreen))

-	return FALSE;

-    

-    return DGAReInitModes (pScreen, xf86_config->dga_modes, xf86_config->dga_nmode);

-}

-

-Bool

-xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address)

-{

-    return TRUE;

-}

-

-Bool

-_xf86_di_dga_init_internal (ScreenPtr pScreen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-

-    xf86_config->dga_flags = 0;

-    xf86_config->dga_address = 0;

-    xf86_config->dga_width = 0;

-    xf86_config->dga_height = 0;

-    xf86_config->dga_stride = 0;

-    

-    if (!xf86_dga_get_modes (pScreen))

-	return FALSE;

-    

-    return DGAInit(pScreen, &xf86_dga_funcs, xf86_config->dga_modes, xf86_config->dga_nmode);

-}

+/*
+ * Copyright © 2006 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 the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS 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_XORG_CONFIG_H
+#include <xorg-config.h>
+#else
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#endif
+
+#include "xf86.h"
+#include "xf86DDC.h"
+#include "xf86_OSproc.h"
+#include "dgaproc.h"
+#include "xf86Crtc.h"
+#include "xf86Modes.h"
+#include "gcstruct.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+
+static Bool
+xf86_dga_get_modes(ScreenPtr pScreen)
+{
+    ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    DGAModePtr modes, mode;
+    DisplayModePtr display_mode;
+    int bpp = scrn->bitsPerPixel >> 3;
+    int num;
+
+    num = 0;
+    display_mode = scrn->modes;
+    while (display_mode) {
+        num++;
+        display_mode = display_mode->next;
+        if (display_mode == scrn->modes)
+            break;
+    }
+
+    if (!num)
+        return FALSE;
+
+    modes = malloc(num * sizeof(DGAModeRec));
+    if (!modes)
+        return FALSE;
+
+    num = 0;
+    display_mode = scrn->modes;
+    while (display_mode) {
+        mode = modes + num++;
+
+        mode->mode = display_mode;
+        mode->flags = DGA_CONCURRENT_ACCESS;
+        if (display_mode->Flags & V_DBLSCAN)
+            mode->flags |= DGA_DOUBLESCAN;
+        if (display_mode->Flags & V_INTERLACE)
+            mode->flags |= DGA_INTERLACED;
+        mode->byteOrder = scrn->imageByteOrder;
+        mode->depth = scrn->depth;
+        mode->bitsPerPixel = scrn->bitsPerPixel;
+        mode->red_mask = scrn->mask.red;
+        mode->green_mask = scrn->mask.green;
+        mode->blue_mask = scrn->mask.blue;
+        mode->visualClass = (bpp == 1) ? PseudoColor : TrueColor;
+        mode->viewportWidth = display_mode->HDisplay;
+        mode->viewportHeight = display_mode->VDisplay;
+        mode->xViewportStep = (bpp == 3) ? 2 : 1;
+        mode->yViewportStep = 1;
+        mode->viewportFlags = DGA_FLIP_RETRACE;
+        mode->offset = 0;
+        mode->address = 0;
+        mode->imageWidth = mode->viewportWidth;
+        mode->imageHeight = mode->viewportHeight;
+        mode->bytesPerScanline = (mode->imageWidth * scrn->bitsPerPixel) >> 3;
+        mode->pixmapWidth = mode->imageWidth;
+        mode->pixmapHeight = mode->imageHeight;
+        mode->maxViewportX = 0;
+        mode->maxViewportY = 0;
+
+        display_mode = display_mode->next;
+        if (display_mode == scrn->modes)
+            break;
+    }
+    free(xf86_config->dga_modes);
+    xf86_config->dga_nmode = num;
+    xf86_config->dga_modes = modes;
+    return TRUE;
+}
+
+static Bool
+xf86_dga_set_mode(ScrnInfoPtr scrn, DGAModePtr display_mode)
+{
+    ScreenPtr pScreen = scrn->pScreen;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+    if (!display_mode) {
+        if (xf86_config->dga_save_mode) {
+            xf86SwitchMode(pScreen, xf86_config->dga_save_mode);
+            xf86_config->dga_save_mode = NULL;
+        }
+    }
+    else {
+        if (!xf86_config->dga_save_mode) {
+            xf86_config->dga_save_mode = scrn->currentMode;
+            xf86SwitchMode(pScreen, display_mode->mode);
+        }
+    }
+    return TRUE;
+}
+
+static int
+xf86_dga_get_viewport(ScrnInfoPtr scrn)
+{
+    return 0;
+}
+
+static void
+xf86_dga_set_viewport(ScrnInfoPtr scrn, int x, int y, int flags)
+{
+    scrn->AdjustFrame(scrn->pScreen->myNum, x, y, flags);
+}
+
+static Bool
+xf86_dga_open_framebuffer(ScrnInfoPtr scrn,
+                          char **name,
+                          unsigned char **mem, int *size, int *offset,
+                          int *flags)
+{
+    return FALSE;
+}
+
+static void
+xf86_dga_close_framebuffer(ScrnInfoPtr scrn)
+{
+}
+
+static DGAFunctionRec xf86_dga_funcs = {
+    xf86_dga_open_framebuffer,
+    xf86_dga_close_framebuffer,
+    xf86_dga_set_mode,
+    xf86_dga_set_viewport,
+    xf86_dga_get_viewport,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+};
+
+Bool
+xf86DiDGAReInit(ScreenPtr pScreen)
+{
+    return TRUE;
+}
+
+Bool
+_xf86_di_dga_reinit_internal(ScreenPtr pScreen)
+{
+    ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+    if (!DGAAvailable(pScreen->myNum))
+        return TRUE;
+
+    if (!xf86_dga_get_modes(pScreen))
+        return FALSE;
+
+    return DGAReInitModes(pScreen, xf86_config->dga_modes,
+                          xf86_config->dga_nmode);
+}
+
+Bool
+xf86DiDGAInit(ScreenPtr pScreen, unsigned long dga_address)
+{
+    return TRUE;
+}
+
+Bool
+_xf86_di_dga_init_internal(ScreenPtr pScreen)
+{
+    ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+    xf86_config->dga_flags = 0;
+    xf86_config->dga_address = 0;
+    xf86_config->dga_width = 0;
+    xf86_config->dga_height = 0;
+    xf86_config->dga_stride = 0;
+
+    if (!xf86_dga_get_modes(pScreen))
+        return FALSE;
+
+    return DGAInit(pScreen, &xf86_dga_funcs, xf86_config->dga_modes,
+                   xf86_config->dga_nmode);
+}
diff --git a/xorg-server/hw/xfree86/modes/xf86DisplayIDModes.c b/xorg-server/hw/xfree86/modes/xf86DisplayIDModes.c
index d507e3b14..781c806bc 100644
--- a/xorg-server/hw/xfree86/modes/xf86DisplayIDModes.c
+++ b/xorg-server/hw/xfree86/modes/xf86DisplayIDModes.c
@@ -1,437 +1,452 @@
-/*

- * Copyright 2009 Red Hat, Inc.

- *

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

- * on the rights to use, copy, modify, merge, publish, distribute, sub

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

- * them 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 MERCHANTIBILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

- * THE AUTHORS 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.

- *

- * Authors:

- *	Adam Jackson <ajax@redhat.com>

- */

-

-#include "xorg-config.h"

-#include "xf86.h"

-#include "xf86str.h"

-#include "edid.h"

-#include "xf86DDC.h"

-

-typedef void (*did_proc)(int scrnIndex, unsigned char *data, void *closure);

-

-#define DID_PRODUCT_ID		    0x00

-#define DID_DISPLAY_PARAMETERS	    0x01

-#define DID_COLOR_INFO		    0x02

-#define DID_TIMING_1_DETAILED	    0x03

-#define DID_TIMING_2_DETAILED	    0x04

-#define DID_TIMING_3_SHORT	    0x05

-#define DID_TIMING_4_DMT	    0x06

-#define DID_TIMING_VESA		    0x07

-#define DID_TIMING_CEA		    0x08

-#define DID_TIMING_RANGE_LIMITS	    0x09

-#define DID_PRODUCT_SERIAL	    0x0A

-#define DID_ASCII_STRING	    0x0B

-#define DID_DISPLAY_DEVICE	    0x0C

-#define DID_POWER_SEQUENCING	    0x0D

-#define DID_TRANSFER_INFO	    0x0E

-#define DID_DISPLAY_INTERFACE	    0x0F

-#define DID_STEREO		    0x10

-#define DID_VENDOR		    0x7F

-

-#define extract_le16(x, i) ((x[i+1] << 8) + (x[i]))

-#define extract_le24(x, i) ((x[i+2] << 16) + (x[i+1] << 8) + (x[i]))

-

-static DisplayModePtr

-modeCalloc(void)

-{

-    return calloc(1, sizeof(DisplayModeRec));

-}

-

-/*

- * How awesome is it to have two detailed timing formats, neither of which

- * are compatible with the format in EDID?  So awesome.

- */

-

-static void

-didDetailedTiming1(int i, unsigned char *x, MonPtr mon)

-{

-    DisplayModePtr m = modeCalloc();

-

-    if (!m)

-	return;

-

-    m->Clock = extract_le24(x, 0);

-

-    m->HDisplay = extract_le16(x, 4);

-    m->HSyncStart = m->HDisplay + (extract_le16(x, 8) & 0x7f);

-    m->HSyncEnd = m->HSyncStart + extract_le16(x, 10);

-    m->HTotal = m->HDisplay + extract_le16(x, 6);

-    m->Flags |= (x[9] & 0x80) ? V_PHSYNC : V_NHSYNC;

-

-    m->VDisplay = extract_le16(x, 12);

-    m->VSyncStart = m->VDisplay + (extract_le16(x, 16) & 0x7f);

-    m->VSyncEnd = m->VSyncStart + extract_le16(x, 18);

-    m->VTotal = m->VDisplay + extract_le16(x, 14);

-    m->Flags |= (x[17] & 0x80) ? V_PVSYNC : V_NVSYNC;

-

-    m->type = M_T_DRIVER;

-    if (x[3] & 0x80)

-	m->type |= M_T_PREFERRED;

-

-    /* XXX double check handling of this */

-    if (x[3] & 0x10)

-	m->Flags |= V_INTERLACE;

-

-    mon->Modes = xf86ModesAdd(mon->Modes, m);

-}

-

-/* XXX no sync bits.  what to do? */

-static void

-didDetailedTiming2(int i, unsigned char *x, MonPtr mon)

-{

-    DisplayModePtr mode = modeCalloc();

-

-    if (!mode)

-	return;

-

-    mode->Clock = extract_le24(x, 0);

-

-    /* horiz sizes are in character cells, not pixels, hence * 8 */

-    mode->HDisplay = ((extract_le16(x, 4) & 0x01ff) + 1) * 8;

-    mode->HSyncStart = mode->HDisplay + (((x[6] & 0xf0) >> 4) + 1) * 8;

-    mode->HSyncEnd = mode->HSyncStart + ((x[6] & 0x0f) + 1) * 8;

-    mode->HTotal = mode->HDisplay + ((x[5] >> 1) + 1) * 8;

-

-    mode->VDisplay = extract_le16(x, 7) & 0x07ff;

-    mode->VSyncStart = mode->VDisplay + (x[10] >> 4) + 1;

-    mode->VSyncEnd = mode->VSyncStart + (x[10] & 0x0f) + 1;

-    mode->VTotal = mode->VDisplay + x[9];

-

-    mode->status = M_T_DRIVER;

-    if (x[3] & 0x80)

-	mode->status |= M_T_PREFERRED;

-

-    /* XXX double check handling of this */

-    if (x[3] & 0x10)

-	mode->Flags |= V_INTERLACE;

-

-    mon->Modes = xf86ModesAdd(mon->Modes, mode);

-}

-

-static void

-didShortTiming(int i, unsigned char *x, MonPtr mon)

-{

-    DisplayModePtr m;

-    int w, h, r;

-

-    w = (x[1] + 1) * 8;

-    switch (x[0] & 0x0f) {

-	case 0:

-	    h = w;

-	    break;

-	case 1:

-	    h = (w * 4) / 5;

-	    break;

-	case 2:

-	    h = (w * 3) / 4;

-	    break;

-	case 3:

-	    h = (w * 9) / 15;

-	    break;

-	case 4:

-	    h = (w * 9) / 16;

-	    break;

-	case 5:

-	    h = (w * 10) / 16;

-	    break;

-	default:

-	    return;

-    }

-    r = (x[2] & 0x7f) + 1;

- 

-    m = xf86CVTMode(w, h, r, !!(x[0] & 0x10), !!(x[2] & 0x80));

-

-    m->type = M_T_DRIVER;

-    if (x[0] & 0x80)

-	m->type |= M_T_PREFERRED;

-

-    mon->Modes = xf86ModesAdd(mon->Modes, m);

-}

-

-static void

-didDMTTiming(int i, unsigned char *x, void *closure)

-{

-    MonPtr mon = closure;

-

-    mon->Modes = xf86ModesAdd(mon->Modes,

-			      xf86DuplicateMode(DMTModes + *x));

-}

-

-#define RB 1

-#define INT 2

-static const struct did_dmt {

-    short w, h, r, f;

-} did_dmt[] = {

-    /* byte 3 */

-    { 640, 350, 85, 0 },

-    { 640, 400, 85, 0 },

-    { 720, 400, 85, 0 },

-    { 640, 480, 60, 0 },

-    { 640, 480, 72, 0 },

-    { 640, 480, 75, 0 },

-    { 640, 480, 85, 0 },

-    { 800, 600, 56, 0 },

-    /* byte 4 */

-    { 800, 600, 60, 0 },

-    { 800, 600, 72, 0 },

-    { 800, 600, 75, 0 },

-    { 800, 600, 85, 0 },

-    { 800, 600, 120, RB },

-    { 848, 480, 60, 0 },

-    { 1024, 768, 43, INT },

-    { 1024, 768, 60, 0 },

-    /* byte 5 */

-    { 1024, 768, 70, 0 },

-    { 1024, 768, 75, 0 },

-    { 1024, 768, 85, 0 },

-    { 1024, 768, 120, RB },

-    { 1152, 864, 75, 0 },

-    { 1280, 768, 60, RB },

-    { 1280, 768, 60, 0 },

-    { 1280, 768, 75, 0 },

-    /* byte 6 */

-    { 1280, 768, 85, 0 },

-    { 1280, 768, 120, RB },

-    { 1280, 800, 60, RB },

-    { 1280, 800, 60, 0 },

-    { 1280, 800, 75, 0 },

-    { 1280, 800, 85, 0 },

-    { 1280, 800, 120, RB },

-    { 1280, 960, 60, 0 },

-    /* byte 7 */

-    { 1280, 960, 85, 0 },

-    { 1280, 960, 120, RB },

-    { 1280, 1024, 60, 0 },

-    { 1280, 1024, 75, 0 },

-    { 1280, 1024, 85, 0 },

-    { 1280, 1024, 120, RB },

-    { 1360, 768, 60, 0 },

-    { 1360, 768, 120, RB },

-    /* byte 8 */

-    { 1400, 1050, 60, RB },

-    { 1400, 1050, 60, 0 },

-    { 1400, 1050, 75, 0 },

-    { 1400, 1050, 85, 0 },

-    { 1400, 1050, 120, RB },

-    { 1440, 900, 60, RB },

-    { 1440, 900, 60, 0 },

-    { 1440, 900, 75, 0 },

-    /* byte 9 */

-    { 1440, 900, 85, 0 },

-    { 1440, 900, 120, RB },

-    { 1600, 1200, 60, 0 },

-    { 1600, 1200, 65, 0 },

-    { 1600, 1200, 70, 0 },

-    { 1600, 1200, 75, 0 },

-    { 1600, 1200, 85, 0 },

-    { 1600, 1200, 120, RB },

-    /* byte a */

-    { 1680, 1050, 60, RB },

-    { 1680, 1050, 60, 0 },

-    { 1680, 1050, 75, 0 },

-    { 1680, 1050, 85, 0 },

-    { 1680, 1050, 120, RB },

-    { 1792, 1344, 60, 0 },

-    { 1792, 1344, 75, 0 },

-    { 1792, 1344, 120, RB },

-    /* byte b */

-    { 1856, 1392, 60, 0 },

-    { 1856, 1392, 75, 0 },

-    { 1856, 1392, 120, RB },

-    { 1920, 1200, 60, RB },

-    { 1920, 1200, 60, 0 },

-    { 1920, 1200, 75, 0 },

-    { 1920, 1200, 85, 0 },

-    { 1920, 1200, 120, RB },

-    /* byte c */

-    { 1920, 1440, 60, 0 },

-    { 1920, 1440, 75, 0 },

-    { 1920, 1440, 120, RB },

-    { 2560, 1600, 60, RB },

-    { 2560, 1600, 60, 0 },

-    { 2560, 1600, 75, 0 },

-    { 2560, 1600, 85, 0 },

-    { 2560, 1600, 120, RB },

-};

-

-static void

-didVesaTiming(int scrn, unsigned char *x, MonPtr mon)

-{

-    int i, j;

-

-    x += 3;

-    

-    for (i = 0; i < 10; i++)

-	for (j = 0; j < 8; j++)

-	    if (x[i] & (1 << j)) {

-		const struct did_dmt *d = &(did_dmt[i * 8 + j]);

-		if (d->f == INT)

-		    continue;

-		mon->Modes = xf86ModesAdd(mon->Modes,

-					  FindDMTMode(d->w, d->h, d->r,

-						      d->f == RB));

-	    }

-

-}

-

-static void

-handleDisplayIDBlock(int scrnIndex, unsigned char *x, void *closure)

-{

-    MonPtr mon = closure;

-

-    switch (x[0]) {

-	case DID_DISPLAY_PARAMETERS:

-	    /* w/h are in decimillimeters */

-	    mon->widthmm = (extract_le16(x, 3) + 5) / 10;

-	    mon->heightmm = (extract_le16(x, 5) + 5) / 10;

-	    /* XXX pixel count, feature flags, gamma, aspect, color depth */

-	    break;

-

-	case DID_TIMING_RANGE_LIMITS:

-	{

-	    int n;

-

-	    mon->maxPixClock = max(mon->maxPixClock, extract_le24(x, 6) * 10);

-

-	    n = mon->nHsync++;

-	    if (n < MAX_HSYNC) {

-		mon->hsync[n].lo = x[9];

-		mon->hsync[n].hi = x[10];

-	    } else {

-		n = MAX_HSYNC;

-	    }

-	    n = mon->nVrefresh++;

-	    if (n < MAX_VREFRESH) {

-		mon->vrefresh[n].lo = x[13];

-		mon->vrefresh[n].hi = x[14];

-	    } else {

-		n = MAX_VREFRESH;

-	    }

-	    break;

-	}

-

-	case DID_TIMING_1_DETAILED:

-	{

-	    int i;

-	    for (i = 0; i < x[2]; i += 20)

-		didDetailedTiming1(scrnIndex, x + i + 3, mon);

-	    break;

-	}

-

-	case DID_TIMING_2_DETAILED:

-	{

-	    int i;

-	    for (i = 0; i < x[2]; i += 11)

-		didDetailedTiming2(scrnIndex, x + i + 3, mon);

-	    break;

-	}

-

-	case DID_TIMING_3_SHORT:

-	{

-	    int i;

-	    for (i = 0; i < x[2]; i += 3)

-		didShortTiming(scrnIndex, x + i + 3, mon);

-	    break;

-	}

-

-	case DID_TIMING_4_DMT:

-	{

-	    int i;

-	    for (i = 0; i < x[2]; i++)

-		didDMTTiming(scrnIndex, x + i + 3, mon);

-	    break;

-	}

-

-	case DID_TIMING_VESA:

-	    didVesaTiming(scrnIndex, x, mon);

-	    break;

-

-	/* XXX pixel format, ar, orientation, subpixel, dot pitch, bit depth */

-	case DID_DISPLAY_DEVICE:

-

-	/* XXX interface, links, color encoding, ss, drm */

-	case DID_DISPLAY_INTERFACE:

-

-	/* XXX stereo */

-	case DID_STEREO:

-

-	/* nothing interesting in these */

-	case DID_COLOR_INFO:

-	case DID_PRODUCT_SERIAL:

-	case DID_ASCII_STRING:

-	case DID_POWER_SEQUENCING:

-	case DID_TRANSFER_INFO:

-	case DID_VENDOR:

-	    break;

-

-	/* warn about anything else */

-	default:

-	    xf86DrvMsg(scrnIndex, X_WARNING,

-		       "Unknown DisplayID block type %hx\n", x[0]);

-	    break;

-    }

-}

-

-static void

-forEachDisplayIDBlock(int scrnIndex, unsigned char *did, did_proc proc,

-		      void *closure)

-{

-    int num_extensions = did[3];

-    int section_size = did[1];

-    unsigned char *block;

-

-    do {

-	if ((did[0] & 0xf0) != 0x10) /* not 1.x, abort */

-	    return;

-	/* XXX also, checksum */

-

-	block = did + 4;

-

-	while (section_size > 0) {

-	    int block_size = (block[2] + 2);

-

-	    proc(scrnIndex, block, closure);

-

-	    section_size -= block_size;

-	    block += block_size;

-	}

-

-	did += (did[1] + 5);

-    } while (num_extensions--);

-}

-

-/*

- * Fill out MonPtr with xf86MonPtr information.

- */

-void

-xf86DisplayIDMonitorSet(int scrnIndex, MonPtr mon, xf86MonPtr DDC)

-{

-    if (!mon || !DDC)

-        return;

-

-    mon->DDC = DDC;

-

-    forEachDisplayIDBlock(scrnIndex, DDC->rawData, handleDisplayIDBlock, mon);

-}

+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * 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
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * them 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 MERCHANTIBILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS 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.
+ *
+ * Authors:
+ *	Adam Jackson <ajax@redhat.com>
+ */
+
+#include "xorg-config.h"
+#include "xf86.h"
+#include "xf86str.h"
+#include "edid.h"
+#include "xf86DDC.h"
+
+typedef void (*did_proc) (int scrnIndex, unsigned char *data, void *closure);
+
+#define DID_PRODUCT_ID		    0x00
+#define DID_DISPLAY_PARAMETERS	    0x01
+#define DID_COLOR_INFO		    0x02
+#define DID_TIMING_1_DETAILED	    0x03
+#define DID_TIMING_2_DETAILED	    0x04
+#define DID_TIMING_3_SHORT	    0x05
+#define DID_TIMING_4_DMT	    0x06
+#define DID_TIMING_VESA		    0x07
+#define DID_TIMING_CEA		    0x08
+#define DID_TIMING_RANGE_LIMITS	    0x09
+#define DID_PRODUCT_SERIAL	    0x0A
+#define DID_ASCII_STRING	    0x0B
+#define DID_DISPLAY_DEVICE	    0x0C
+#define DID_POWER_SEQUENCING	    0x0D
+#define DID_TRANSFER_INFO	    0x0E
+#define DID_DISPLAY_INTERFACE	    0x0F
+#define DID_STEREO		    0x10
+#define DID_VENDOR		    0x7F
+
+#define extract_le16(x, i) ((x[i+1] << 8) + (x[i]))
+#define extract_le24(x, i) ((x[i+2] << 16) + (x[i+1] << 8) + (x[i]))
+
+static DisplayModePtr
+modeCalloc(void)
+{
+    return calloc(1, sizeof(DisplayModeRec));
+}
+
+/*
+ * How awesome is it to have two detailed timing formats, neither of which
+ * are compatible with the format in EDID?  So awesome.
+ */
+
+static void
+didDetailedTiming1(int i, unsigned char *x, MonPtr mon)
+{
+    DisplayModePtr m = modeCalloc();
+
+    if (!m)
+        return;
+
+    m->Clock = extract_le24(x, 0);
+
+    m->HDisplay = extract_le16(x, 4);
+    m->HSyncStart = m->HDisplay + (extract_le16(x, 8) & 0x7f);
+    m->HSyncEnd = m->HSyncStart + extract_le16(x, 10);
+    m->HTotal = m->HDisplay + extract_le16(x, 6);
+    m->Flags |= (x[9] & 0x80) ? V_PHSYNC : V_NHSYNC;
+
+    m->VDisplay = extract_le16(x, 12);
+    m->VSyncStart = m->VDisplay + (extract_le16(x, 16) & 0x7f);
+    m->VSyncEnd = m->VSyncStart + extract_le16(x, 18);
+    m->VTotal = m->VDisplay + extract_le16(x, 14);
+    m->Flags |= (x[17] & 0x80) ? V_PVSYNC : V_NVSYNC;
+
+    m->type = M_T_DRIVER;
+    if (x[3] & 0x80)
+        m->type |= M_T_PREFERRED;
+
+    /* XXX double check handling of this */
+    if (x[3] & 0x10)
+        m->Flags |= V_INTERLACE;
+
+    mon->Modes = xf86ModesAdd(mon->Modes, m);
+}
+
+/* XXX no sync bits.  what to do? */
+static void
+didDetailedTiming2(int i, unsigned char *x, MonPtr mon)
+{
+    DisplayModePtr mode = modeCalloc();
+
+    if (!mode)
+        return;
+
+    mode->Clock = extract_le24(x, 0);
+
+    /* horiz sizes are in character cells, not pixels, hence * 8 */
+    mode->HDisplay = ((extract_le16(x, 4) & 0x01ff) + 1) * 8;
+    mode->HSyncStart = mode->HDisplay + (((x[6] & 0xf0) >> 4) + 1) * 8;
+    mode->HSyncEnd = mode->HSyncStart + ((x[6] & 0x0f) + 1) * 8;
+    mode->HTotal = mode->HDisplay + ((x[5] >> 1) + 1) * 8;
+
+    mode->VDisplay = extract_le16(x, 7) & 0x07ff;
+    mode->VSyncStart = mode->VDisplay + (x[10] >> 4) + 1;
+    mode->VSyncEnd = mode->VSyncStart + (x[10] & 0x0f) + 1;
+    mode->VTotal = mode->VDisplay + x[9];
+
+    mode->status = M_T_DRIVER;
+    if (x[3] & 0x80)
+        mode->status |= M_T_PREFERRED;
+
+    /* XXX double check handling of this */
+    if (x[3] & 0x10)
+        mode->Flags |= V_INTERLACE;
+
+    mon->Modes = xf86ModesAdd(mon->Modes, mode);
+}
+
+static void
+didShortTiming(int i, unsigned char *x, MonPtr mon)
+{
+    DisplayModePtr m;
+    int w, h, r;
+
+    w = (x[1] + 1) * 8;
+    switch (x[0] & 0x0f) {
+    case 0:
+        h = w;
+        break;
+    case 1:
+        h = (w * 4) / 5;
+        break;
+    case 2:
+        h = (w * 3) / 4;
+        break;
+    case 3:
+        h = (w * 9) / 15;
+        break;
+    case 4:
+        h = (w * 9) / 16;
+        break;
+    case 5:
+        h = (w * 10) / 16;
+        break;
+    default:
+        return;
+    }
+    r = (x[2] & 0x7f) + 1;
+
+    m = xf86CVTMode(w, h, r, ! !(x[0] & 0x10), ! !(x[2] & 0x80));
+
+    m->type = M_T_DRIVER;
+    if (x[0] & 0x80)
+        m->type |= M_T_PREFERRED;
+
+    mon->Modes = xf86ModesAdd(mon->Modes, m);
+}
+
+static void
+didDMTTiming(int i, unsigned char *x, void *closure)
+{
+    MonPtr mon = closure;
+
+    mon->Modes = xf86ModesAdd(mon->Modes, xf86DuplicateMode(DMTModes + *x));
+}
+
+#define RB 1
+#define INT 2
+static const struct did_dmt {
+    short w, h, r, f;
+} did_dmt[] = {
+    /* byte 3 */
+    {
+    640, 350, 85, 0}, {
+    640, 400, 85, 0}, {
+    720, 400, 85, 0}, {
+    640, 480, 60, 0}, {
+    640, 480, 72, 0}, {
+    640, 480, 75, 0}, {
+    640, 480, 85, 0}, {
+    800, 600, 56, 0},
+        /* byte 4 */
+    {
+    800, 600, 60, 0}, {
+    800, 600, 72, 0}, {
+    800, 600, 75, 0}, {
+    800, 600, 85, 0}, {
+    800, 600, 120, RB}, {
+    848, 480, 60, 0}, {
+    1024, 768, 43, INT}, {
+    1024, 768, 60, 0},
+        /* byte 5 */
+    {
+    1024, 768, 70, 0}, {
+    1024, 768, 75, 0}, {
+    1024, 768, 85, 0}, {
+    1024, 768, 120, RB}, {
+    1152, 864, 75, 0}, {
+    1280, 768, 60, RB}, {
+    1280, 768, 60, 0}, {
+    1280, 768, 75, 0},
+        /* byte 6 */
+    {
+    1280, 768, 85, 0}, {
+    1280, 768, 120, RB}, {
+    1280, 800, 60, RB}, {
+    1280, 800, 60, 0}, {
+    1280, 800, 75, 0}, {
+    1280, 800, 85, 0}, {
+    1280, 800, 120, RB}, {
+    1280, 960, 60, 0},
+        /* byte 7 */
+    {
+    1280, 960, 85, 0}, {
+    1280, 960, 120, RB}, {
+    1280, 1024, 60, 0}, {
+    1280, 1024, 75, 0}, {
+    1280, 1024, 85, 0}, {
+    1280, 1024, 120, RB}, {
+    1360, 768, 60, 0}, {
+    1360, 768, 120, RB},
+        /* byte 8 */
+    {
+    1400, 1050, 60, RB}, {
+    1400, 1050, 60, 0}, {
+    1400, 1050, 75, 0}, {
+    1400, 1050, 85, 0}, {
+    1400, 1050, 120, RB}, {
+    1440, 900, 60, RB}, {
+    1440, 900, 60, 0}, {
+    1440, 900, 75, 0},
+        /* byte 9 */
+    {
+    1440, 900, 85, 0}, {
+    1440, 900, 120, RB}, {
+    1600, 1200, 60, 0}, {
+    1600, 1200, 65, 0}, {
+    1600, 1200, 70, 0}, {
+    1600, 1200, 75, 0}, {
+    1600, 1200, 85, 0}, {
+    1600, 1200, 120, RB},
+        /* byte a */
+    {
+    1680, 1050, 60, RB}, {
+    1680, 1050, 60, 0}, {
+    1680, 1050, 75, 0}, {
+    1680, 1050, 85, 0}, {
+    1680, 1050, 120, RB}, {
+    1792, 1344, 60, 0}, {
+    1792, 1344, 75, 0}, {
+    1792, 1344, 120, RB},
+        /* byte b */
+    {
+    1856, 1392, 60, 0}, {
+    1856, 1392, 75, 0}, {
+    1856, 1392, 120, RB}, {
+    1920, 1200, 60, RB}, {
+    1920, 1200, 60, 0}, {
+    1920, 1200, 75, 0}, {
+    1920, 1200, 85, 0}, {
+    1920, 1200, 120, RB},
+        /* byte c */
+    {
+    1920, 1440, 60, 0}, {
+    1920, 1440, 75, 0}, {
+    1920, 1440, 120, RB}, {
+    2560, 1600, 60, RB}, {
+    2560, 1600, 60, 0}, {
+    2560, 1600, 75, 0}, {
+    2560, 1600, 85, 0}, {
+2560, 1600, 120, RB},};
+
+static void
+didVesaTiming(int scrn, unsigned char *x, MonPtr mon)
+{
+    int i, j;
+
+    x += 3;
+
+    for (i = 0; i < 10; i++)
+        for (j = 0; j < 8; j++)
+            if (x[i] & (1 << j)) {
+                const struct did_dmt *d = &(did_dmt[i * 8 + j]);
+
+                if (d->f == INT)
+                    continue;
+                mon->Modes = xf86ModesAdd(mon->Modes,
+                                          FindDMTMode(d->w, d->h, d->r,
+                                                      d->f == RB));
+            }
+
+}
+
+static void
+handleDisplayIDBlock(int scrnIndex, unsigned char *x, void *closure)
+{
+    MonPtr mon = closure;
+
+    switch (x[0]) {
+    case DID_DISPLAY_PARAMETERS:
+        /* w/h are in decimillimeters */
+        mon->widthmm = (extract_le16(x, 3) + 5) / 10;
+        mon->heightmm = (extract_le16(x, 5) + 5) / 10;
+        /* XXX pixel count, feature flags, gamma, aspect, color depth */
+        break;
+
+    case DID_TIMING_RANGE_LIMITS:
+    {
+        int n;
+
+        mon->maxPixClock = max(mon->maxPixClock, extract_le24(x, 6) * 10);
+
+        n = mon->nHsync++;
+        if (n < MAX_HSYNC) {
+            mon->hsync[n].lo = x[9];
+            mon->hsync[n].hi = x[10];
+        }
+        else {
+            n = MAX_HSYNC;
+        }
+        n = mon->nVrefresh++;
+        if (n < MAX_VREFRESH) {
+            mon->vrefresh[n].lo = x[13];
+            mon->vrefresh[n].hi = x[14];
+        }
+        else {
+            n = MAX_VREFRESH;
+        }
+        break;
+    }
+
+    case DID_TIMING_1_DETAILED:
+    {
+        int i;
+
+        for (i = 0; i < x[2]; i += 20)
+            didDetailedTiming1(scrnIndex, x + i + 3, mon);
+        break;
+    }
+
+    case DID_TIMING_2_DETAILED:
+    {
+        int i;
+
+        for (i = 0; i < x[2]; i += 11)
+            didDetailedTiming2(scrnIndex, x + i + 3, mon);
+        break;
+    }
+
+    case DID_TIMING_3_SHORT:
+    {
+        int i;
+
+        for (i = 0; i < x[2]; i += 3)
+            didShortTiming(scrnIndex, x + i + 3, mon);
+        break;
+    }
+
+    case DID_TIMING_4_DMT:
+    {
+        int i;
+
+        for (i = 0; i < x[2]; i++)
+            didDMTTiming(scrnIndex, x + i + 3, mon);
+        break;
+    }
+
+    case DID_TIMING_VESA:
+        didVesaTiming(scrnIndex, x, mon);
+        break;
+
+        /* XXX pixel format, ar, orientation, subpixel, dot pitch, bit depth */
+    case DID_DISPLAY_DEVICE:
+
+        /* XXX interface, links, color encoding, ss, drm */
+    case DID_DISPLAY_INTERFACE:
+
+        /* XXX stereo */
+    case DID_STEREO:
+
+        /* nothing interesting in these */
+    case DID_COLOR_INFO:
+    case DID_PRODUCT_SERIAL:
+    case DID_ASCII_STRING:
+    case DID_POWER_SEQUENCING:
+    case DID_TRANSFER_INFO:
+    case DID_VENDOR:
+        break;
+
+        /* warn about anything else */
+    default:
+        xf86DrvMsg(scrnIndex, X_WARNING,
+                   "Unknown DisplayID block type %hx\n", x[0]);
+        break;
+    }
+}
+
+static void
+forEachDisplayIDBlock(int scrnIndex, unsigned char *did, did_proc proc,
+                      void *closure)
+{
+    int num_extensions = did[3];
+    int section_size = did[1];
+    unsigned char *block;
+
+    do {
+        if ((did[0] & 0xf0) != 0x10)    /* not 1.x, abort */
+            return;
+        /* XXX also, checksum */
+
+        block = did + 4;
+
+        while (section_size > 0) {
+            int block_size = (block[2] + 2);
+
+            proc(scrnIndex, block, closure);
+
+            section_size -= block_size;
+            block += block_size;
+        }
+
+        did += (did[1] + 5);
+    } while (num_extensions--);
+}
+
+/*
+ * Fill out MonPtr with xf86MonPtr information.
+ */
+void
+xf86DisplayIDMonitorSet(int scrnIndex, MonPtr mon, xf86MonPtr DDC)
+{
+    if (!mon || !DDC)
+        return;
+
+    mon->DDC = DDC;
+
+    forEachDisplayIDBlock(scrnIndex, DDC->rawData, handleDisplayIDBlock, mon);
+}
diff --git a/xorg-server/hw/xfree86/modes/xf86EdidModes.c b/xorg-server/hw/xfree86/modes/xf86EdidModes.c
index 0100d2a59..8aa82d114 100644
--- a/xorg-server/hw/xfree86/modes/xf86EdidModes.c
+++ b/xorg-server/hw/xfree86/modes/xf86EdidModes.c
@@ -45,12 +45,12 @@
 #include <string.h>
 #include <math.h>
 
-static void handle_detailed_rblank(struct detailed_monitor_section *det_mon,
-                                   void *data)
+static void
+handle_detailed_rblank(struct detailed_monitor_section *det_mon, void *data)
 {
     if (det_mon->type == DS_RANGES)
         if (det_mon->section.ranges.supported_blanking & CVT_REDUCED)
-            *(Bool*)data = TRUE;
+            *(Bool *) data = TRUE;
 }
 
 static Bool
@@ -71,209 +71,189 @@ xf86MonitorSupportsReducedBlanking(xf86MonPtr DDC)
     return FALSE;
 }
 
-static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC)
+static Bool
+quirk_prefer_large_60(int scrnIndex, xf86MonPtr DDC)
 {
     /* Belinea 10 15 55 */
-    if (memcmp (DDC->vendor.name, "MAX", 4) == 0 &&
-	((DDC->vendor.prod_id == 1516) ||
-	(DDC->vendor.prod_id == 0x77e)))
-	return TRUE;
-    
+    if (memcmp(DDC->vendor.name, "MAX", 4) == 0 &&
+        ((DDC->vendor.prod_id == 1516) || (DDC->vendor.prod_id == 0x77e)))
+        return TRUE;
+
     /* Acer AL1706 */
-    if (memcmp (DDC->vendor.name, "ACR", 4) == 0 &&
-	DDC->vendor.prod_id == 44358)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "ACR", 4) == 0 && DDC->vendor.prod_id == 44358)
+        return TRUE;
 
     /* Bug #10814: Samsung SyncMaster 225BW */
-    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
-	DDC->vendor.prod_id == 596)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "SAM", 4) == 0 && DDC->vendor.prod_id == 596)
+        return TRUE;
 
     /* Bug #10545: Samsung SyncMaster 226BW */
-    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
-	DDC->vendor.prod_id == 638)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "SAM", 4) == 0 && DDC->vendor.prod_id == 638)
+        return TRUE;
 
     /* Acer F51 */
-    if (memcmp (DDC->vendor.name, "API", 4) == 0 &&
-	DDC->vendor.prod_id == 0x7602)
-	return TRUE;
-
+    if (memcmp(DDC->vendor.name, "API", 4) == 0 &&
+        DDC->vendor.prod_id == 0x7602)
+        return TRUE;
 
     return FALSE;
 }
 
-static Bool quirk_prefer_large_75 (int scrnIndex, xf86MonPtr DDC)
+static Bool
+quirk_prefer_large_75(int scrnIndex, xf86MonPtr DDC)
 {
     /* Bug #11603: Funai Electronics PM36B */
-    if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&
-	DDC->vendor.prod_id == 13600)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "FCM", 4) == 0 && DDC->vendor.prod_id == 13600)
+        return TRUE;
 
     return FALSE;
 }
 
-static Bool quirk_detailed_h_in_cm (int scrnIndex, xf86MonPtr DDC)
+static Bool
+quirk_detailed_h_in_cm(int scrnIndex, xf86MonPtr DDC)
 {
     /* Bug #11603: Funai Electronics PM36B */
-    if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&
-	DDC->vendor.prod_id == 13600)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "FCM", 4) == 0 && DDC->vendor.prod_id == 13600)
+        return TRUE;
 
     return FALSE;
 }
 
-static Bool quirk_detailed_v_in_cm (int scrnIndex, xf86MonPtr DDC)
+static Bool
+quirk_detailed_v_in_cm(int scrnIndex, xf86MonPtr DDC)
 {
     /* Bug #11603: Funai Electronics PM36B */
-    if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&
-	DDC->vendor.prod_id == 13600)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "FCM", 4) == 0 && DDC->vendor.prod_id == 13600)
+        return TRUE;
 
     /* Bug #21000: LGPhilipsLCD LP154W01-TLAJ */
-    if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
-	DDC->vendor.prod_id == 47360)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "LPL", 4) == 0 && DDC->vendor.prod_id == 47360)
+        return TRUE;
 
     /* Bug #10304: LGPhilipsLCD LP154W01-A5 */
-    if (memcmp(DDC->vendor.name, "LPL", 4) == 0 &&
-	DDC->vendor.prod_id == 0)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "LPL", 4) == 0 && DDC->vendor.prod_id == 0)
+        return TRUE;
 
     /* Bug #24482: LGPhilipsLCD LP154W01-TLA1 */
     if (memcmp(DDC->vendor.name, "LPL", 4) == 0 &&
-	DDC->vendor.prod_id == 0x2a00)
-	return TRUE;
+        DDC->vendor.prod_id == 0x2a00)
+        return TRUE;
 
     /* Bug #28414: HP Compaq NC8430 LP154W01-TLA8 */
-    if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
-	DDC->vendor.prod_id == 5750)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "LPL", 4) == 0 && DDC->vendor.prod_id == 5750)
+        return TRUE;
 
     /* Bug #21750: Samsung Syncmaster 2333HD */
-    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
-	DDC->vendor.prod_id == 1157)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "SAM", 4) == 0 && DDC->vendor.prod_id == 1157)
+        return TRUE;
 
     return FALSE;
 }
 
-static Bool quirk_detailed_use_maximum_size (int scrnIndex, xf86MonPtr DDC)
+static Bool
+quirk_detailed_use_maximum_size(int scrnIndex, xf86MonPtr DDC)
 {
     /* Bug #21324: Iiyama Vision Master 450 */
-    if (memcmp (DDC->vendor.name, "IVM", 4) == 0 &&
-	DDC->vendor.prod_id == 6400)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "IVM", 4) == 0 && DDC->vendor.prod_id == 6400)
+        return TRUE;
 
     /* Bug #41141: Acer Aspire One */
-    if (memcmp (DDC->vendor.name, "LGD", 4) == 0 &&
-	DDC->vendor.prod_id == 0x7f01)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "LGD", 4) == 0 &&
+        DDC->vendor.prod_id == 0x7f01)
+        return TRUE;
 
     return FALSE;
 }
 
-static Bool quirk_135_clock_too_high (int scrnIndex, xf86MonPtr DDC)
+static Bool
+quirk_135_clock_too_high(int scrnIndex, xf86MonPtr DDC)
 {
     /* Envision Peripherals, Inc. EN-7100e.  See bug #9550. */
-    if (memcmp (DDC->vendor.name, "EPI", 4) == 0 &&
-	DDC->vendor.prod_id == 59264)
-	return TRUE;
-    
+    if (memcmp(DDC->vendor.name, "EPI", 4) == 0 && DDC->vendor.prod_id == 59264)
+        return TRUE;
+
     return FALSE;
 }
 
-static Bool quirk_first_detailed_preferred (int scrnIndex, xf86MonPtr DDC)
+static Bool
+quirk_first_detailed_preferred(int scrnIndex, xf86MonPtr DDC)
 {
     /* Philips 107p5 CRT. Reported on xorg@ with pastebin. */
-    if (memcmp (DDC->vendor.name, "PHL", 4) == 0 &&
-	DDC->vendor.prod_id == 57364)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "PHL", 4) == 0 && DDC->vendor.prod_id == 57364)
+        return TRUE;
 
-    /* Proview AY765C 17" LCD. See bug #15160*/
-    if (memcmp (DDC->vendor.name, "PTS", 4) == 0 &&
-	DDC->vendor.prod_id == 765)
-	return TRUE;
+    /* Proview AY765C 17" LCD. See bug #15160 */
+    if (memcmp(DDC->vendor.name, "PTS", 4) == 0 && DDC->vendor.prod_id == 765)
+        return TRUE;
 
     /* ACR of some sort RH #284231 */
-    if (memcmp (DDC->vendor.name, "ACR", 4) == 0 &&
-	DDC->vendor.prod_id == 2423)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "ACR", 4) == 0 && DDC->vendor.prod_id == 2423)
+        return TRUE;
 
     /* Peacock Ergovision 19.  See rh#492359 */
-    if (memcmp (DDC->vendor.name, "PEA", 4) == 0 &&
-	DDC->vendor.prod_id == 9003)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "PEA", 4) == 0 && DDC->vendor.prod_id == 9003)
+        return TRUE;
 
     return FALSE;
 }
 
-static Bool quirk_detailed_sync_pp(int scrnIndex, xf86MonPtr DDC)
+static Bool
+quirk_detailed_sync_pp(int scrnIndex, xf86MonPtr DDC)
 {
     /* Bug #12439: Samsung SyncMaster 205BW */
-    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
-	DDC->vendor.prod_id == 541)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "SAM", 4) == 0 && DDC->vendor.prod_id == 541)
+        return TRUE;
     return FALSE;
 }
 
 /* This should probably be made more generic */
-static Bool quirk_dvi_single_link(int scrnIndex, xf86MonPtr DDC)
+static Bool
+quirk_dvi_single_link(int scrnIndex, xf86MonPtr DDC)
 {
     /* Red Hat bug #453106: Apple 23" Cinema Display */
-    if (memcmp (DDC->vendor.name, "APL", 4) == 0 &&
-	DDC->vendor.prod_id == 0x921c)
-	return TRUE;
+    if (memcmp(DDC->vendor.name, "APL", 4) == 0 &&
+        DDC->vendor.prod_id == 0x921c)
+        return TRUE;
     return FALSE;
 }
 
 typedef struct {
-    Bool	(*detect) (int scrnIndex, xf86MonPtr DDC);
-    ddc_quirk_t	quirk;
-    const char	*description;
+    Bool (*detect) (int scrnIndex, xf86MonPtr DDC);
+    ddc_quirk_t quirk;
+    const char *description;
 } ddc_quirk_map_t;
 
 static const ddc_quirk_map_t ddc_quirks[] = {
     {
-	quirk_prefer_large_60,   DDC_QUIRK_PREFER_LARGE_60,
-	"Detailed timing is not preferred, use largest mode at 60Hz"
-    },
+     quirk_prefer_large_60, DDC_QUIRK_PREFER_LARGE_60,
+     "Detailed timing is not preferred, use largest mode at 60Hz"},
+    {
+     quirk_135_clock_too_high, DDC_QUIRK_135_CLOCK_TOO_HIGH,
+     "Recommended 135MHz pixel clock is too high"},
     {
-	quirk_135_clock_too_high,   DDC_QUIRK_135_CLOCK_TOO_HIGH,
-	"Recommended 135MHz pixel clock is too high"
-    },
+     quirk_prefer_large_75, DDC_QUIRK_PREFER_LARGE_75,
+     "Detailed timing is not preferred, use largest mode at 75Hz"},
     {
-	quirk_prefer_large_75,   DDC_QUIRK_PREFER_LARGE_75,
-	"Detailed timing is not preferred, use largest mode at 75Hz"
-    },
+     quirk_detailed_h_in_cm, DDC_QUIRK_DETAILED_H_IN_CM,
+     "Detailed timings give horizontal size in cm."},
     {
-	quirk_detailed_h_in_cm,   DDC_QUIRK_DETAILED_H_IN_CM,
-	"Detailed timings give horizontal size in cm."
-    },
+     quirk_detailed_v_in_cm, DDC_QUIRK_DETAILED_V_IN_CM,
+     "Detailed timings give vertical size in cm."},
     {
-	quirk_detailed_v_in_cm,   DDC_QUIRK_DETAILED_V_IN_CM,
-	"Detailed timings give vertical size in cm."
-    },
+     quirk_detailed_use_maximum_size, DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE,
+     "Use maximum size instead of detailed timing sizes."},
     {
-	quirk_detailed_use_maximum_size,   DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE,
-	"Use maximum size instead of detailed timing sizes."
-    },
+     quirk_first_detailed_preferred, DDC_QUIRK_FIRST_DETAILED_PREFERRED,
+     "First detailed timing was not marked as preferred."},
     {
-	quirk_first_detailed_preferred, DDC_QUIRK_FIRST_DETAILED_PREFERRED,
-	"First detailed timing was not marked as preferred."
-    },
+     quirk_detailed_sync_pp, DDC_QUIRK_DETAILED_SYNC_PP,
+     "Use +hsync +vsync for detailed timing."},
     {
-	quirk_detailed_sync_pp, DDC_QUIRK_DETAILED_SYNC_PP,
-	"Use +hsync +vsync for detailed timing."
-    },
+     quirk_dvi_single_link, DDC_QUIRK_DVI_SINGLE_LINK,
+     "Forcing maximum pixel clock to single DVI link."},
     {
-	quirk_dvi_single_link, DDC_QUIRK_DVI_SINGLE_LINK,
-	"Forcing maximum pixel clock to single DVI link."
-    },
-    { 
-	NULL,		DDC_QUIRK_NONE,
-	"No known quirks"
-    },
+     NULL, DDC_QUIRK_NONE,
+     "No known quirks"},
 };
 
 /*
@@ -289,28 +269,28 @@ static const ddc_quirk_map_t ddc_quirks[] = {
 #define MODESUFFIX 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0
 
 static const DisplayModeRec DDCEstablishedModes[17] = {
-    { MODEPREFIX,    40000,  800,  840,  968, 1056, 0,  600,  601,  605,  628, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@60Hz */
-    { MODEPREFIX,    36000,  800,  824,  896, 1024, 0,  600,  601,  603,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@56Hz */
-    { MODEPREFIX,    31500,  640,  656,  720,  840, 0,  480,  481,  484,  500, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@75Hz */
-    { MODEPREFIX,    31500,  640,  664,  704,  832, 0,  480,  489,  492,  520, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@72Hz */
-    { MODEPREFIX,    30240,  640,  704,  768,  864, 0,  480,  483,  486,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@67Hz */
-    { MODEPREFIX,    25175,  640,  656,  752,  800, 0,  480,  490,  492,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@60Hz */
-    { MODEPREFIX,    35500,  720,  738,  846,  900, 0,  400,  421,  423,  449, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 720x400@88Hz */
-    { MODEPREFIX,    28320,  720,  738,  846,  900, 0,  400,  412,  414,  449, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 720x400@70Hz */
-    { MODEPREFIX,   135000, 1280, 1296, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@75Hz */
-    { MODEPREFIX,    78750, 1024, 1040, 1136, 1312, 0,  768,  769,  772,  800, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1024x768@75Hz */
-    { MODEPREFIX,    75000, 1024, 1048, 1184, 1328, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@70Hz */
-    { MODEPREFIX,    65000, 1024, 1048, 1184, 1344, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@60Hz */
-    { MODEPREFIX,    44900, 1024, 1032, 1208, 1264, 0,  768,  768,  772,  817, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* 1024x768@43Hz */
-    { MODEPREFIX,    57284,  832,  864,  928, 1152, 0,  624,  625,  628,  667, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 832x624@75Hz */
-    { MODEPREFIX,    49500,  800,  816,  896, 1056, 0,  600,  601,  604,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@75Hz */
-    { MODEPREFIX,    50000,  800,  856,  976, 1040, 0,  600,  637,  643,  666, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@72Hz */
-    { MODEPREFIX,   108000, 1152, 1216, 1344, 1600, 0,  864,  865,  868,  900, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1152x864@75Hz */
+    {MODEPREFIX, 40000, 800, 840, 968, 1056, 0, 600, 601, 605, 628, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 800x600@60Hz */
+    {MODEPREFIX, 36000, 800, 824, 896, 1024, 0, 600, 601, 603, 625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 800x600@56Hz */
+    {MODEPREFIX, 31500, 640, 656, 720, 840, 0, 480, 481, 484, 500, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* 640x480@75Hz */
+    {MODEPREFIX, 31500, 640, 664, 704, 832, 0, 480, 489, 492, 520, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* 640x480@72Hz */
+    {MODEPREFIX, 30240, 640, 704, 768, 864, 0, 480, 483, 486, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* 640x480@67Hz */
+    {MODEPREFIX, 25175, 640, 656, 752, 800, 0, 480, 490, 492, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* 640x480@60Hz */
+    {MODEPREFIX, 35500, 720, 738, 846, 900, 0, 400, 421, 423, 449, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* 720x400@88Hz */
+    {MODEPREFIX, 28320, 720, 738, 846, 900, 0, 400, 412, 414, 449, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX}, /* 720x400@70Hz */
+    {MODEPREFIX, 135000, 1280, 1296, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 1280x1024@75Hz */
+    {MODEPREFIX, 78750, 1024, 1040, 1136, 1312, 0, 768, 769, 772, 800, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},     /* 1024x768@75Hz */
+    {MODEPREFIX, 75000, 1024, 1048, 1184, 1328, 0, 768, 771, 777, 806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* 1024x768@70Hz */
+    {MODEPREFIX, 65000, 1024, 1048, 1184, 1344, 0, 768, 771, 777, 806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* 1024x768@60Hz */
+    {MODEPREFIX, 44900, 1024, 1032, 1208, 1264, 0, 768, 768, 772, 817, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX},       /* 1024x768@43Hz */
+    {MODEPREFIX, 57284, 832, 864, 928, 1152, 0, 624, 625, 628, 667, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},        /* 832x624@75Hz */
+    {MODEPREFIX, 49500, 800, 816, 896, 1056, 0, 600, 601, 604, 625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 800x600@75Hz */
+    {MODEPREFIX, 50000, 800, 856, 976, 1040, 0, 600, 637, 643, 666, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 800x600@72Hz */
+    {MODEPREFIX, 108000, 1152, 1216, 1344, 1600, 0, 864, 865, 868, 900, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},    /* 1152x864@75Hz */
 };
 
 static DisplayModePtr
 DDCModesFromEstablished(int scrnIndex, struct established_timings *timing,
-			ddc_quirk_t quirks)
+                        ddc_quirk_t quirks)
 {
     DisplayModePtr Modes = NULL, Mode = NULL;
     CARD32 bits = (timing->t1) | (timing->t2 << 8) |
@@ -329,86 +309,86 @@ DDCModesFromEstablished(int scrnIndex, struct established_timings *timing,
 
 /* Autogenerated from the DMT spec */
 const DisplayModeRec DMTModes[] = {
-    { MODEPREFIX,    31500,  640,  672,  736,  832, 0,  350,  382,  385,  445, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x350@85Hz */
-    { MODEPREFIX,    31500,  640,  672,  736,  832, 0,  400,  401,  404,  445, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 640x400@85Hz */
-    { MODEPREFIX,    35500,  720,  756,  828,  936, 0,  400,  401,  404,  446, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 720x400@85Hz */
-    { MODEPREFIX,    25175,  640,  656,  752,  800, 0,  480,  490,  492,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@60Hz */
-    { MODEPREFIX,    31500,  640,  664,  704,  832, 0,  480,  489,  492,  520, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@72Hz */
-    { MODEPREFIX,    31500,  640,  656,  720,  840, 0,  480,  481,  484,  500, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@75Hz */
-    { MODEPREFIX,    36000,  640,  696,  752,  832, 0,  480,  481,  484,  509, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@85Hz */
-    { MODEPREFIX,    36000,  800,  824,  896, 1024, 0,  600,  601,  603,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@56Hz */
-    { MODEPREFIX,    40000,  800,  840,  968, 1056, 0,  600,  601,  605,  628, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@60Hz */
-    { MODEPREFIX,    50000,  800,  856,  976, 1040, 0,  600,  637,  643,  666, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@72Hz */
-    { MODEPREFIX,    49500,  800,  816,  896, 1056, 0,  600,  601,  604,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@75Hz */
-    { MODEPREFIX,    56250,  800,  832,  896, 1048, 0,  600,  601,  604,  631, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@85Hz */
-    { MODEPREFIX,    73250,  800,  848,  880,  960, 0,  600,  603,  607,  636, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 800x600@120Hz RB */
-    { MODEPREFIX,    33750,  848,  864,  976, 1088, 0,  480,  486,  494,  517, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 848x480@60Hz */
-    { MODEPREFIX,    44900, 1024, 1032, 1208, 1264, 0,  768,  768,  772,  817, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* 1024x768@43Hz (interlaced) */
-    { MODEPREFIX,    65000, 1024, 1048, 1184, 1344, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@60Hz */
-    { MODEPREFIX,    75000, 1024, 1048, 1184, 1328, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@70Hz */
-    { MODEPREFIX,    78750, 1024, 1040, 1136, 1312, 0,  768,  769,  772,  800, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1024x768@75Hz */
-    { MODEPREFIX,    94500, 1024, 1072, 1168, 1376, 0,  768,  769,  772,  808, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1024x768@85Hz */
-    { MODEPREFIX,   115500, 1024, 1072, 1104, 1184, 0,  768,  771,  775,  813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@120Hz RB */
-    { MODEPREFIX,   108000, 1152, 1216, 1344, 1600, 0,  864,  865,  868,  900, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1152x864@75Hz */
-    { MODEPREFIX,    68250, 1280, 1328, 1360, 1440, 0,  768,  771,  778,  790, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x768@60Hz RB */
-    { MODEPREFIX,    79500, 1280, 1344, 1472, 1664, 0,  768,  771,  778,  798, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x768@60Hz */
-    { MODEPREFIX,   102250, 1280, 1360, 1488, 1696, 0,  768,  771,  778,  805, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x768@75Hz */
-    { MODEPREFIX,   117500, 1280, 1360, 1496, 1712, 0,  768,  771,  778,  809, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x768@85Hz */
-    { MODEPREFIX,   140250, 1280, 1328, 1360, 1440, 0,  768,  771,  778,  813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x768@120Hz RB */
-    { MODEPREFIX,    71000, 1280, 1328, 1360, 1440, 0,  800,  803,  809,  823, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x800@60Hz RB */
-    { MODEPREFIX,    83500, 1280, 1352, 1480, 1680, 0,  800,  803,  809,  831, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x800@60Hz */
-    { MODEPREFIX,   106500, 1280, 1360, 1488, 1696, 0,  800,  803,  809,  838, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x800@75Hz */
-    { MODEPREFIX,   122500, 1280, 1360, 1496, 1712, 0,  800,  803,  809,  843, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x800@85Hz */
-    { MODEPREFIX,   146250, 1280, 1328, 1360, 1440, 0,  800,  803,  809,  847, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x800@120Hz RB */
-    { MODEPREFIX,   108000, 1280, 1376, 1488, 1800, 0,  960,  961,  964, 1000, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x960@60Hz */
-    { MODEPREFIX,   148500, 1280, 1344, 1504, 1728, 0,  960,  961,  964, 1011, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x960@85Hz */
-    { MODEPREFIX,   175500, 1280, 1328, 1360, 1440, 0,  960,  963,  967, 1017, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x960@120Hz RB */
-    { MODEPREFIX,   108000, 1280, 1328, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@60Hz */
-    { MODEPREFIX,   135000, 1280, 1296, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@75Hz */
-    { MODEPREFIX,   157500, 1280, 1344, 1504, 1728, 0, 1024, 1025, 1028, 1072, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@85Hz */
-    { MODEPREFIX,   187250, 1280, 1328, 1360, 1440, 0, 1024, 1027, 1034, 1084, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x1024@120Hz RB */
-    { MODEPREFIX,    85500, 1360, 1424, 1536, 1792, 0,  768,  771,  777,  795, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1360x768@60Hz */
-    { MODEPREFIX,   148250, 1360, 1408, 1440, 1520, 0,  768,  771,  776,  813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1360x768@120Hz RB */
-    { MODEPREFIX,   101000, 1400, 1448, 1480, 1560, 0, 1050, 1053, 1057, 1080, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1400x1050@60Hz RB */
-    { MODEPREFIX,   121750, 1400, 1488, 1632, 1864, 0, 1050, 1053, 1057, 1089, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1400x1050@60Hz */
-    { MODEPREFIX,   156000, 1400, 1504, 1648, 1896, 0, 1050, 1053, 1057, 1099, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1400x1050@75Hz */
-    { MODEPREFIX,   179500, 1400, 1504, 1656, 1912, 0, 1050, 1053, 1057, 1105, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1400x1050@85Hz */
-    { MODEPREFIX,   208000, 1400, 1448, 1480, 1560, 0, 1050, 1053, 1057, 1112, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1400x1050@120Hz RB */
-    { MODEPREFIX,    88750, 1440, 1488, 1520, 1600, 0,  900,  903,  909,  926, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1440x900@60Hz RB */
-    { MODEPREFIX,   106500, 1440, 1520, 1672, 1904, 0,  900,  903,  909,  934, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1440x900@60Hz */
-    { MODEPREFIX,   136750, 1440, 1536, 1688, 1936, 0,  900,  903,  909,  942, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1440x900@75Hz */
-    { MODEPREFIX,   157000, 1440, 1544, 1696, 1952, 0,  900,  903,  909,  948, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1440x900@85Hz */
-    { MODEPREFIX,   182750, 1440, 1488, 1520, 1600, 0,  900,  903,  909,  953, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1440x900@120Hz RB */
-    { MODEPREFIX,   162000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@60Hz */
-    { MODEPREFIX,   175500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@65Hz */
-    { MODEPREFIX,   189000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@70Hz */
-    { MODEPREFIX,   202500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@75Hz */
-    { MODEPREFIX,   229500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@85Hz */
-    { MODEPREFIX,   268250, 1600, 1648, 1680, 1760, 0, 1200, 1203, 1207, 1271, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1600x1200@120Hz RB */
-    { MODEPREFIX,   119000, 1680, 1728, 1760, 1840, 0, 1050, 1053, 1059, 1080, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1680x1050@60Hz RB */
-    { MODEPREFIX,   146250, 1680, 1784, 1960, 2240, 0, 1050, 1053, 1059, 1089, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1680x1050@60Hz */
-    { MODEPREFIX,   187000, 1680, 1800, 1976, 2272, 0, 1050, 1053, 1059, 1099, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1680x1050@75Hz */
-    { MODEPREFIX,   214750, 1680, 1808, 1984, 2288, 0, 1050, 1053, 1059, 1105, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1680x1050@85Hz */
-    { MODEPREFIX,   245500, 1680, 1728, 1760, 1840, 0, 1050, 1053, 1059, 1112, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1680x1050@120Hz RB */
-    { MODEPREFIX,   204750, 1792, 1920, 2120, 2448, 0, 1344, 1345, 1348, 1394, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1792x1344@60Hz */
-    { MODEPREFIX,   261000, 1792, 1888, 2104, 2456, 0, 1344, 1345, 1348, 1417, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1792x1344@75Hz */
-    { MODEPREFIX,   333250, 1792, 1840, 1872, 1952, 0, 1344, 1347, 1351, 1423, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1792x1344@120Hz RB */
-    { MODEPREFIX,   218250, 1856, 1952, 2176, 2528, 0, 1392, 1393, 1396, 1439, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1856x1392@60Hz */
-    { MODEPREFIX,   288000, 1856, 1984, 2208, 2560, 0, 1392, 1393, 1396, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1856x1392@75Hz */
-    { MODEPREFIX,   356500, 1856, 1904, 1936, 2016, 0, 1392, 1395, 1399, 1474, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1856x1392@120Hz RB */
-    { MODEPREFIX,   154000, 1920, 1968, 2000, 2080, 0, 1200, 1203, 1209, 1235, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1920x1200@60Hz RB */
-    { MODEPREFIX,   193250, 1920, 2056, 2256, 2592, 0, 1200, 1203, 1209, 1245, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1200@60Hz */
-    { MODEPREFIX,   245250, 1920, 2056, 2264, 2608, 0, 1200, 1203, 1209, 1255, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1200@75Hz */
-    { MODEPREFIX,   281250, 1920, 2064, 2272, 2624, 0, 1200, 1203, 1209, 1262, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1200@85Hz */
-    { MODEPREFIX,   317000, 1920, 1968, 2000, 2080, 0, 1200, 1203, 1209, 1271, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1920x1200@120Hz RB */
-    { MODEPREFIX,   234000, 1920, 2048, 2256, 2600, 0, 1440, 1441, 1444, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1440@60Hz */
-    { MODEPREFIX,   297000, 1920, 2064, 2288, 2640, 0, 1440, 1441, 1444, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1440@75Hz */
-    { MODEPREFIX,   380500, 1920, 1968, 2000, 2080, 0, 1440, 1443, 1447, 1525, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1920x1440@120Hz RB */
-    { MODEPREFIX,   268500, 2560, 2608, 2640, 2720, 0, 1600, 1603, 1609, 1646, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 2560x1600@60Hz RB */
-    { MODEPREFIX,   348500, 2560, 2752, 3032, 3504, 0, 1600, 1603, 1609, 1658, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 2560x1600@60Hz */
-    { MODEPREFIX,   443250, 2560, 2768, 3048, 3536, 0, 1600, 1603, 1609, 1672, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 2560x1600@75Hz */
-    { MODEPREFIX,   505250, 2560, 2768, 3048, 3536, 0, 1600, 1603, 1609, 1682, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 2560x1600@85Hz */
-    { MODEPREFIX,   552750, 2560, 2608, 2640, 2720, 0, 1600, 1603, 1609, 1694, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 2560x1600@120Hz RB */
+    {MODEPREFIX, 31500, 640, 672, 736, 832, 0, 350, 382, 385, 445, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX}, /* 640x350@85Hz */
+    {MODEPREFIX, 31500, 640, 672, 736, 832, 0, 400, 401, 404, 445, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX}, /* 640x400@85Hz */
+    {MODEPREFIX, 35500, 720, 756, 828, 936, 0, 400, 401, 404, 446, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX}, /* 720x400@85Hz */
+    {MODEPREFIX, 25175, 640, 656, 752, 800, 0, 480, 490, 492, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* 640x480@60Hz */
+    {MODEPREFIX, 31500, 640, 664, 704, 832, 0, 480, 489, 492, 520, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* 640x480@72Hz */
+    {MODEPREFIX, 31500, 640, 656, 720, 840, 0, 480, 481, 484, 500, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* 640x480@75Hz */
+    {MODEPREFIX, 36000, 640, 696, 752, 832, 0, 480, 481, 484, 509, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* 640x480@85Hz */
+    {MODEPREFIX, 36000, 800, 824, 896, 1024, 0, 600, 601, 603, 625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 800x600@56Hz */
+    {MODEPREFIX, 40000, 800, 840, 968, 1056, 0, 600, 601, 605, 628, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 800x600@60Hz */
+    {MODEPREFIX, 50000, 800, 856, 976, 1040, 0, 600, 637, 643, 666, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 800x600@72Hz */
+    {MODEPREFIX, 49500, 800, 816, 896, 1056, 0, 600, 601, 604, 625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 800x600@75Hz */
+    {MODEPREFIX, 56250, 800, 832, 896, 1048, 0, 600, 601, 604, 631, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 800x600@85Hz */
+    {MODEPREFIX, 73250, 800, 848, 880, 960, 0, 600, 603, 607, 636, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX}, /* 800x600@120Hz RB */
+    {MODEPREFIX, 33750, 848, 864, 976, 1088, 0, 480, 486, 494, 517, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 848x480@60Hz */
+    {MODEPREFIX, 44900, 1024, 1032, 1208, 1264, 0, 768, 768, 772, 817, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX},       /* 1024x768@43Hz (interlaced) */
+    {MODEPREFIX, 65000, 1024, 1048, 1184, 1344, 0, 768, 771, 777, 806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* 1024x768@60Hz */
+    {MODEPREFIX, 75000, 1024, 1048, 1184, 1328, 0, 768, 771, 777, 806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* 1024x768@70Hz */
+    {MODEPREFIX, 78750, 1024, 1040, 1136, 1312, 0, 768, 769, 772, 800, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},     /* 1024x768@75Hz */
+    {MODEPREFIX, 94500, 1024, 1072, 1168, 1376, 0, 768, 769, 772, 808, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},     /* 1024x768@85Hz */
+    {MODEPREFIX, 115500, 1024, 1072, 1104, 1184, 0, 768, 771, 775, 813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},    /* 1024x768@120Hz RB */
+    {MODEPREFIX, 108000, 1152, 1216, 1344, 1600, 0, 864, 865, 868, 900, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},    /* 1152x864@75Hz */
+    {MODEPREFIX, 68250, 1280, 1328, 1360, 1440, 0, 768, 771, 778, 790, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},     /* 1280x768@60Hz RB */
+    {MODEPREFIX, 79500, 1280, 1344, 1472, 1664, 0, 768, 771, 778, 798, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},     /* 1280x768@60Hz */
+    {MODEPREFIX, 102250, 1280, 1360, 1488, 1696, 0, 768, 771, 778, 805, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},    /* 1280x768@75Hz */
+    {MODEPREFIX, 117500, 1280, 1360, 1496, 1712, 0, 768, 771, 778, 809, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},    /* 1280x768@85Hz */
+    {MODEPREFIX, 140250, 1280, 1328, 1360, 1440, 0, 768, 771, 778, 813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},    /* 1280x768@120Hz RB */
+    {MODEPREFIX, 71000, 1280, 1328, 1360, 1440, 0, 800, 803, 809, 823, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},     /* 1280x800@60Hz RB */
+    {MODEPREFIX, 83500, 1280, 1352, 1480, 1680, 0, 800, 803, 809, 831, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},     /* 1280x800@60Hz */
+    {MODEPREFIX, 106500, 1280, 1360, 1488, 1696, 0, 800, 803, 809, 838, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},    /* 1280x800@75Hz */
+    {MODEPREFIX, 122500, 1280, 1360, 1496, 1712, 0, 800, 803, 809, 843, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},    /* 1280x800@85Hz */
+    {MODEPREFIX, 146250, 1280, 1328, 1360, 1440, 0, 800, 803, 809, 847, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},    /* 1280x800@120Hz RB */
+    {MODEPREFIX, 108000, 1280, 1376, 1488, 1800, 0, 960, 961, 964, 1000, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},   /* 1280x960@60Hz */
+    {MODEPREFIX, 148500, 1280, 1344, 1504, 1728, 0, 960, 961, 964, 1011, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},   /* 1280x960@85Hz */
+    {MODEPREFIX, 175500, 1280, 1328, 1360, 1440, 0, 960, 963, 967, 1017, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},   /* 1280x960@120Hz RB */
+    {MODEPREFIX, 108000, 1280, 1328, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 1280x1024@60Hz */
+    {MODEPREFIX, 135000, 1280, 1296, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 1280x1024@75Hz */
+    {MODEPREFIX, 157500, 1280, 1344, 1504, 1728, 0, 1024, 1025, 1028, 1072, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 1280x1024@85Hz */
+    {MODEPREFIX, 187250, 1280, 1328, 1360, 1440, 0, 1024, 1027, 1034, 1084, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 1280x1024@120Hz RB */
+    {MODEPREFIX, 85500, 1360, 1424, 1536, 1792, 0, 768, 771, 777, 795, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},     /* 1360x768@60Hz */
+    {MODEPREFIX, 148250, 1360, 1408, 1440, 1520, 0, 768, 771, 776, 813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},    /* 1360x768@120Hz RB */
+    {MODEPREFIX, 101000, 1400, 1448, 1480, 1560, 0, 1050, 1053, 1057, 1080, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 1400x1050@60Hz RB */
+    {MODEPREFIX, 121750, 1400, 1488, 1632, 1864, 0, 1050, 1053, 1057, 1089, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1400x1050@60Hz */
+    {MODEPREFIX, 156000, 1400, 1504, 1648, 1896, 0, 1050, 1053, 1057, 1099, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1400x1050@75Hz */
+    {MODEPREFIX, 179500, 1400, 1504, 1656, 1912, 0, 1050, 1053, 1057, 1105, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1400x1050@85Hz */
+    {MODEPREFIX, 208000, 1400, 1448, 1480, 1560, 0, 1050, 1053, 1057, 1112, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 1400x1050@120Hz RB */
+    {MODEPREFIX, 88750, 1440, 1488, 1520, 1600, 0, 900, 903, 909, 926, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},     /* 1440x900@60Hz RB */
+    {MODEPREFIX, 106500, 1440, 1520, 1672, 1904, 0, 900, 903, 909, 934, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},    /* 1440x900@60Hz */
+    {MODEPREFIX, 136750, 1440, 1536, 1688, 1936, 0, 900, 903, 909, 942, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},    /* 1440x900@75Hz */
+    {MODEPREFIX, 157000, 1440, 1544, 1696, 1952, 0, 900, 903, 909, 948, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},    /* 1440x900@85Hz */
+    {MODEPREFIX, 182750, 1440, 1488, 1520, 1600, 0, 900, 903, 909, 953, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},    /* 1440x900@120Hz RB */
+    {MODEPREFIX, 162000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 1600x1200@60Hz */
+    {MODEPREFIX, 175500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 1600x1200@65Hz */
+    {MODEPREFIX, 189000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 1600x1200@70Hz */
+    {MODEPREFIX, 202500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 1600x1200@75Hz */
+    {MODEPREFIX, 229500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* 1600x1200@85Hz */
+    {MODEPREFIX, 268250, 1600, 1648, 1680, 1760, 0, 1200, 1203, 1207, 1271, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 1600x1200@120Hz RB */
+    {MODEPREFIX, 119000, 1680, 1728, 1760, 1840, 0, 1050, 1053, 1059, 1080, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 1680x1050@60Hz RB */
+    {MODEPREFIX, 146250, 1680, 1784, 1960, 2240, 0, 1050, 1053, 1059, 1089, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1680x1050@60Hz */
+    {MODEPREFIX, 187000, 1680, 1800, 1976, 2272, 0, 1050, 1053, 1059, 1099, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1680x1050@75Hz */
+    {MODEPREFIX, 214750, 1680, 1808, 1984, 2288, 0, 1050, 1053, 1059, 1105, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1680x1050@85Hz */
+    {MODEPREFIX, 245500, 1680, 1728, 1760, 1840, 0, 1050, 1053, 1059, 1112, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 1680x1050@120Hz RB */
+    {MODEPREFIX, 204750, 1792, 1920, 2120, 2448, 0, 1344, 1345, 1348, 1394, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1792x1344@60Hz */
+    {MODEPREFIX, 261000, 1792, 1888, 2104, 2456, 0, 1344, 1345, 1348, 1417, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1792x1344@75Hz */
+    {MODEPREFIX, 333250, 1792, 1840, 1872, 1952, 0, 1344, 1347, 1351, 1423, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 1792x1344@120Hz RB */
+    {MODEPREFIX, 218250, 1856, 1952, 2176, 2528, 0, 1392, 1393, 1396, 1439, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1856x1392@60Hz */
+    {MODEPREFIX, 288000, 1856, 1984, 2208, 2560, 0, 1392, 1393, 1396, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1856x1392@75Hz */
+    {MODEPREFIX, 356500, 1856, 1904, 1936, 2016, 0, 1392, 1395, 1399, 1474, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 1856x1392@120Hz RB */
+    {MODEPREFIX, 154000, 1920, 1968, 2000, 2080, 0, 1200, 1203, 1209, 1235, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 1920x1200@60Hz RB */
+    {MODEPREFIX, 193250, 1920, 2056, 2256, 2592, 0, 1200, 1203, 1209, 1245, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1920x1200@60Hz */
+    {MODEPREFIX, 245250, 1920, 2056, 2264, 2608, 0, 1200, 1203, 1209, 1255, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1920x1200@75Hz */
+    {MODEPREFIX, 281250, 1920, 2064, 2272, 2624, 0, 1200, 1203, 1209, 1262, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1920x1200@85Hz */
+    {MODEPREFIX, 317000, 1920, 1968, 2000, 2080, 0, 1200, 1203, 1209, 1271, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 1920x1200@120Hz RB */
+    {MODEPREFIX, 234000, 1920, 2048, 2256, 2600, 0, 1440, 1441, 1444, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1920x1440@60Hz */
+    {MODEPREFIX, 297000, 1920, 2064, 2288, 2640, 0, 1440, 1441, 1444, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 1920x1440@75Hz */
+    {MODEPREFIX, 380500, 1920, 1968, 2000, 2080, 0, 1440, 1443, 1447, 1525, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 1920x1440@120Hz RB */
+    {MODEPREFIX, 268500, 2560, 2608, 2640, 2720, 0, 1600, 1603, 1609, 1646, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 2560x1600@60Hz RB */
+    {MODEPREFIX, 348500, 2560, 2752, 3032, 3504, 0, 1600, 1603, 1609, 1658, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 2560x1600@60Hz */
+    {MODEPREFIX, 443250, 2560, 2768, 3048, 3536, 0, 1600, 1603, 1609, 1672, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 2560x1600@75Hz */
+    {MODEPREFIX, 505250, 2560, 2768, 3048, 3536, 0, 1600, 1603, 1609, 1682, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX},        /* 2560x1600@85Hz */
+    {MODEPREFIX, 552750, 2560, 2608, 2640, 2720, 0, 1600, 1603, 1609, 1694, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX},        /* 2560x1600@120Hz RB */
 };
 
 #define LEVEL_DMT 0
@@ -419,18 +399,18 @@ static int
 MonitorStandardTimingLevel(xf86MonPtr DDC)
 {
     if (DDC->ver.revision >= 2) {
-	if (DDC->ver.revision >= 4 && CVT_SUPPORTED(DDC->features.msc)) {
-	    return LEVEL_CVT;
-	}
-	return LEVEL_GTF;
+        if (DDC->ver.revision >= 4 && CVT_SUPPORTED(DDC->features.msc)) {
+            return LEVEL_CVT;
+        }
+        return LEVEL_GTF;
     }
     return LEVEL_DMT;
 }
 
 static int
-ModeRefresh(const DisplayModeRec *mode)
+ModeRefresh(const DisplayModeRec * mode)
 {
-    return (int)(xf86ModeVRefresh(mode) + 0.5);
+    return (int) (xf86ModeVRefresh(mode) + 0.5);
 }
 
 /*
@@ -445,15 +425,14 @@ FindDMTMode(int hsize, int vsize, int refresh, Bool rb)
     const DisplayModeRec *ret;
 
     for (i = 0; i < sizeof(DMTModes) / sizeof(DisplayModeRec); i++) {
-	ret = &DMTModes[i];
+        ret = &DMTModes[i];
 
-	if (!rb && xf86ModeIsReduced(ret))
-	    continue;
+        if (!rb && xf86ModeIsReduced(ret))
+            continue;
 
-	if (ret->HDisplay == hsize &&
-	    ret->VDisplay == vsize &&
-	    refresh == ModeRefresh(ret))
-	    return xf86DuplicateMode(ret);
+        if (ret->HDisplay == hsize &&
+            ret->VDisplay == vsize && refresh == ModeRefresh(ret))
+            return xf86DuplicateMode(ret);
     }
 
     return NULL;
@@ -478,42 +457,43 @@ FindDMTMode(int hsize, int vsize, int refresh, Bool rb)
  */
 static DisplayModePtr
 DDCModesFromStandardTiming(struct std_timings *timing, ddc_quirk_t quirks,
-			   int timing_level, Bool rb)
+                           int timing_level, Bool rb)
 {
     DisplayModePtr Modes = NULL, Mode = NULL;
     int i, hsize, vsize, refresh;
 
     for (i = 0; i < STD_TIMINGS; i++) {
-	hsize = timing[i].hsize;
-	vsize = timing[i].vsize;
-	refresh = timing[i].refresh;
-
-	/* HDTV hack, because you can't say 1366 */
-	if (refresh == 60 &&
-	    ((hsize == 1360 && vsize == 765) ||
-	     (hsize == 1368 && vsize == 769))) {
-	    Mode = xf86CVTMode(1366, 768, 60, FALSE, FALSE);
-	    Mode->HDisplay = 1366;
-	    Mode->HSyncStart--;
-	    Mode->HSyncEnd--;
-	} else if (hsize && vsize && refresh) {
-	    Mode = FindDMTMode(hsize, vsize, refresh, rb);
-
-	    if (!Mode) {
-		if (timing_level == LEVEL_CVT)
-		    /* pass rb here too? */
-		    Mode = xf86CVTMode(hsize, vsize, refresh, FALSE, FALSE);
-		else if (timing_level == LEVEL_GTF)
-		    Mode = xf86GTFMode(hsize, vsize, refresh, FALSE, FALSE);
-	    }
-
-	}
-
-	if (Mode) {
-	    Mode->type = M_T_DRIVER;
-	    Modes = xf86ModesAdd(Modes, Mode);
-	}
-	Mode = NULL;
+        hsize = timing[i].hsize;
+        vsize = timing[i].vsize;
+        refresh = timing[i].refresh;
+
+        /* HDTV hack, because you can't say 1366 */
+        if (refresh == 60 &&
+            ((hsize == 1360 && vsize == 765) ||
+             (hsize == 1368 && vsize == 769))) {
+            Mode = xf86CVTMode(1366, 768, 60, FALSE, FALSE);
+            Mode->HDisplay = 1366;
+            Mode->HSyncStart--;
+            Mode->HSyncEnd--;
+        }
+        else if (hsize && vsize && refresh) {
+            Mode = FindDMTMode(hsize, vsize, refresh, rb);
+
+            if (!Mode) {
+                if (timing_level == LEVEL_CVT)
+                    /* pass rb here too? */
+                    Mode = xf86CVTMode(hsize, vsize, refresh, FALSE, FALSE);
+                else if (timing_level == LEVEL_GTF)
+                    Mode = xf86GTFMode(hsize, vsize, refresh, FALSE, FALSE);
+            }
+
+        }
+
+        if (Mode) {
+            Mode->type = M_T_DRIVER;
+            Modes = xf86ModesAdd(Modes, Mode);
+        }
+        Mode = NULL;
     }
 
     return Modes;
@@ -531,28 +511,29 @@ DDCModeDoInterlaceQuirks(DisplayModePtr mode)
      * should be checking refresh rate too.  Whatever.
      */
     static const struct {
-	int w, h;
+        int w, h;
     } cea_interlaced[] = {
-	{ 1920, 1080 },
-	{  720,  480 },
-	{ 1440,  480 },
-	{ 2880,  480 },
-	{  720,  576 },
-	{ 1440,  576 },
-	{ 2880,  576 },
-    };
-    static const int n_modes = sizeof(cea_interlaced)/sizeof(cea_interlaced[0]);
+        {
+        1920, 1080}, {
+        720, 480}, {
+        1440, 480}, {
+        2880, 480}, {
+        720, 576}, {
+        1440, 576}, {
+    2880, 576},};
+    static const int n_modes =
+        sizeof(cea_interlaced) / sizeof(cea_interlaced[0]);
     int i;
 
     for (i = 0; i < n_modes; i++) {
-	if ((mode->HDisplay == cea_interlaced[i].w) &&
-	    (mode->VDisplay == cea_interlaced[i].h / 2)) {
-	    mode->VDisplay *= 2;
-	    mode->VSyncStart *= 2;
-	    mode->VSyncEnd *= 2;
-	    mode->VTotal *= 2;
-	    mode->VTotal |= 1;
-	}
+        if ((mode->HDisplay == cea_interlaced[i].w) &&
+            (mode->VDisplay == cea_interlaced[i].h / 2)) {
+            mode->VDisplay *= 2;
+            mode->VSyncStart *= 2;
+            mode->VSyncEnd *= 2;
+            mode->VTotal *= 2;
+            mode->VTotal |= 1;
+        }
     }
 
     mode->Flags |= V_INTERLACE;
@@ -563,7 +544,7 @@ DDCModeDoInterlaceQuirks(DisplayModePtr mode)
  */
 static DisplayModePtr
 DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
-			  Bool preferred, ddc_quirk_t quirks)
+                          Bool preferred, ddc_quirk_t quirks)
 {
     DisplayModePtr Mode;
 
@@ -574,34 +555,33 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
      * our parser is just being too aggresive there.
      */
     if (timing->h_active < 64 || timing->v_active < 64) {
-	xf86DrvMsg(scrnIndex, X_INFO,
-		   "%s: Ignoring tiny %dx%d mode\n", __func__,
-		   timing->h_active, timing->v_active);
-	return NULL;
+        xf86DrvMsg(scrnIndex, X_INFO,
+                   "%s: Ignoring tiny %dx%d mode\n", __func__,
+                   timing->h_active, timing->v_active);
+        return NULL;
     }
 
     /* We don't do stereo */
     if (timing->stereo) {
         xf86DrvMsg(scrnIndex, X_INFO,
-		   "%s: Ignoring: We don't handle stereo.\n", __func__);
+                   "%s: Ignoring: We don't handle stereo.\n", __func__);
         return NULL;
     }
 
     /* We only do seperate sync currently */
     if (timing->sync != 0x03) {
-         xf86DrvMsg(scrnIndex, X_INFO,
-		    "%s: %dx%d Warning: We only handle separate"
-                    " sync.\n", __func__, timing->h_active, timing->v_active);
+        xf86DrvMsg(scrnIndex, X_INFO,
+                   "%s: %dx%d Warning: We only handle separate"
+                   " sync.\n", __func__, timing->h_active, timing->v_active);
     }
 
     Mode = xnfcalloc(1, sizeof(DisplayModeRec));
 
     Mode->type = M_T_DRIVER;
     if (preferred)
-	Mode->type |= M_T_PREFERRED;
+        Mode->type |= M_T_PREFERRED;
 
-    if( ( quirks & DDC_QUIRK_135_CLOCK_TOO_HIGH ) &&
-	timing->clock == 135000000 )
+    if ((quirks & DDC_QUIRK_135_CLOCK_TOO_HIGH) && timing->clock == 135000000)
         Mode->Clock = 108880;
     else
         Mode->Clock = timing->clock / 1000.0;
@@ -618,27 +598,27 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
 
     /* perform basic check on the detail timing */
     if (Mode->HSyncEnd > Mode->HTotal || Mode->VSyncEnd > Mode->VTotal) {
-	free(Mode);
-	return NULL;
+        free(Mode);
+        return NULL;
     }
 
     /* We ignore h/v_size and h/v_border for now. */
 
     if (timing->interlaced)
-	DDCModeDoInterlaceQuirks(Mode);
+        DDCModeDoInterlaceQuirks(Mode);
 
     if (quirks & DDC_QUIRK_DETAILED_SYNC_PP)
-	Mode->Flags |= V_PVSYNC | V_PHSYNC;
+        Mode->Flags |= V_PVSYNC | V_PHSYNC;
     else {
-	if (timing->misc & 0x02)
-	    Mode->Flags |= V_PVSYNC;
-	else
-	    Mode->Flags |= V_NVSYNC;
-
-	if (timing->misc & 0x01)
-	    Mode->Flags |= V_PHSYNC;
-	else
-	    Mode->Flags |= V_NHSYNC;
+        if (timing->misc & 0x02)
+            Mode->Flags |= V_PVSYNC;
+        else
+            Mode->Flags |= V_NVSYNC;
+
+        if (timing->misc & 0x01)
+            Mode->Flags |= V_PHSYNC;
+        else
+            Mode->Flags |= V_NHSYNC;
     }
 
     xf86SetModeDefaultName(Mode);
@@ -653,23 +633,30 @@ DDCModesFromCVT(int scrnIndex, struct cvt_timings *t)
     int i;
 
     for (i = 0; i < 4; i++) {
-	if (t[i].height) {
-	    if (t[i].rates & 0x10)
-		modes = xf86ModesAdd(modes,
-			xf86CVTMode(t[i].width, t[i].height, 50, 0, 0));
-	    if (t[i].rates & 0x08)
-		modes = xf86ModesAdd(modes,
-			xf86CVTMode(t[i].width, t[i].height, 60, 0, 0));
-	    if (t[i].rates & 0x04)
-		modes = xf86ModesAdd(modes,
-			xf86CVTMode(t[i].width, t[i].height, 75, 0, 0));
-	    if (t[i].rates & 0x02)
-		modes = xf86ModesAdd(modes,
-			xf86CVTMode(t[i].width, t[i].height, 85, 0, 0));
-	    if (t[i].rates & 0x01)
-		modes = xf86ModesAdd(modes,
-			xf86CVTMode(t[i].width, t[i].height, 60, 1, 0));
-	} else break;
+        if (t[i].height) {
+            if (t[i].rates & 0x10)
+                modes = xf86ModesAdd(modes,
+                                     xf86CVTMode(t[i].width, t[i].height, 50, 0,
+                                                 0));
+            if (t[i].rates & 0x08)
+                modes = xf86ModesAdd(modes,
+                                     xf86CVTMode(t[i].width, t[i].height, 60, 0,
+                                                 0));
+            if (t[i].rates & 0x04)
+                modes = xf86ModesAdd(modes,
+                                     xf86CVTMode(t[i].width, t[i].height, 75, 0,
+                                                 0));
+            if (t[i].rates & 0x02)
+                modes = xf86ModesAdd(modes,
+                                     xf86CVTMode(t[i].width, t[i].height, 85, 0,
+                                                 0));
+            if (t[i].rates & 0x01)
+                modes = xf86ModesAdd(modes,
+                                     xf86CVTMode(t[i].width, t[i].height, 60, 1,
+                                                 0));
+        }
+        else
+            break;
     }
 
     return modes;
@@ -682,56 +669,61 @@ static const struct {
     short rb;
 } EstIIIModes[] = {
     /* byte 6 */
-    { 640, 350, 85, 0 },
-    { 640, 400, 85, 0 },
-    { 720, 400, 85, 0 },
-    { 640, 480, 85, 0 },
-    { 848, 480, 60, 0 },
-    { 800, 600, 85, 0 },
-    { 1024, 768, 85, 0 },
-    { 1152, 864, 75, 0 },
-    /* byte 7 */
-    { 1280, 768, 60, 1 },
-    { 1280, 768, 60, 0 },
-    { 1280, 768, 75, 0 },
-    { 1280, 768, 85, 0 },
-    { 1280, 960, 60, 0 },
-    { 1280, 960, 85, 0 },
-    { 1280, 1024, 60, 0 },
-    { 1280, 1024, 85, 0 },
-    /* byte 8 */
-    { 1360, 768, 60, 0 },
-    { 1440, 900, 60, 1 },
-    { 1440, 900, 60, 0 },
-    { 1440, 900, 75, 0 },
-    { 1440, 900, 85, 0 },
-    { 1400, 1050, 60, 1 },
-    { 1400, 1050, 60, 0 },
-    { 1400, 1050, 75, 0 },
-    /* byte 9 */
-    { 1400, 1050, 85, 0 },
-    { 1680, 1050, 60, 1 },
-    { 1680, 1050, 60, 0 },
-    { 1680, 1050, 75, 0 },
-    { 1680, 1050, 85, 0 },
-    { 1600, 1200, 60, 0 },
-    { 1600, 1200, 65, 0 },
-    { 1600, 1200, 70, 0 },
-    /* byte 10 */
-    { 1600, 1200, 75, 0 },
-    { 1600, 1200, 85, 0 },
-    { 1792, 1344, 60, 0 },
-    { 1792, 1344, 85, 0 },
-    { 1856, 1392, 60, 0 },
-    { 1856, 1392, 75, 0 },
-    { 1920, 1200, 60, 1 },
-    { 1920, 1200, 60, 0 },
-    /* byte 11 */
-    { 1920, 1200, 75, 0 },
-    { 1920, 1200, 85, 0 },
-    { 1920, 1440, 60, 0 },
-    { 1920, 1440, 75, 0 },
-};
+    {
+    640, 350, 85, 0}, {
+    640, 400, 85, 0}, {
+    720, 400, 85, 0}, {
+    640, 480, 85, 0}, {
+    848, 480, 60, 0}, {
+    800, 600, 85, 0}, {
+    1024, 768, 85, 0}, {
+    1152, 864, 75, 0},
+        /* byte 7 */
+    {
+    1280, 768, 60, 1}, {
+    1280, 768, 60, 0}, {
+    1280, 768, 75, 0}, {
+    1280, 768, 85, 0}, {
+    1280, 960, 60, 0}, {
+    1280, 960, 85, 0}, {
+    1280, 1024, 60, 0}, {
+    1280, 1024, 85, 0},
+        /* byte 8 */
+    {
+    1360, 768, 60, 0}, {
+    1440, 900, 60, 1}, {
+    1440, 900, 60, 0}, {
+    1440, 900, 75, 0}, {
+    1440, 900, 85, 0}, {
+    1400, 1050, 60, 1}, {
+    1400, 1050, 60, 0}, {
+    1400, 1050, 75, 0},
+        /* byte 9 */
+    {
+    1400, 1050, 85, 0}, {
+    1680, 1050, 60, 1}, {
+    1680, 1050, 60, 0}, {
+    1680, 1050, 75, 0}, {
+    1680, 1050, 85, 0}, {
+    1600, 1200, 60, 0}, {
+    1600, 1200, 65, 0}, {
+    1600, 1200, 70, 0},
+        /* byte 10 */
+    {
+    1600, 1200, 75, 0}, {
+    1600, 1200, 85, 0}, {
+    1792, 1344, 60, 0}, {
+    1792, 1344, 85, 0}, {
+    1856, 1392, 60, 0}, {
+    1856, 1392, 75, 0}, {
+    1920, 1200, 60, 1}, {
+    1920, 1200, 60, 0},
+        /* byte 11 */
+    {
+    1920, 1200, 75, 0}, {
+    1920, 1200, 85, 0}, {
+    1920, 1440, 60, 0}, {
+1920, 1440, 75, 0},};
 
 static DisplayModePtr
 DDCModesFromEstIII(unsigned char *est)
@@ -740,16 +732,16 @@ DDCModesFromEstIII(unsigned char *est)
     int i, j, m;
 
     for (i = 0; i < 6; i++) {
-	for (j = 7; j > 0; j--) {
-	    if (est[i] & (1 << j)) {
-		m = (i * 8) + (7 - j);
-		modes = xf86ModesAdd(modes,
-				     FindDMTMode(EstIIIModes[m].w,
-						 EstIIIModes[m].h,
-						 EstIIIModes[m].r,
-						 EstIIIModes[m].rb));
-	    }
-	}
+        for (j = 7; j > 0; j--) {
+            if (est[i] & (1 << j)) {
+                m = (i * 8) + (7 - j);
+                modes = xf86ModesAdd(modes,
+                                     FindDMTMode(EstIIIModes[m].w,
+                                                 EstIIIModes[m].h,
+                                                 EstIIIModes[m].r,
+                                                 EstIIIModes[m].rb));
+            }
+        }
     }
 
     return modes;
@@ -781,10 +773,10 @@ DDCGuessRangesFromModes(int scrnIndex, MonPtr Monitor, DisplayModePtr Modes)
 
     while (Mode) {
         if (!Mode->HSync)
-            Mode->HSync = ((float) Mode->Clock ) / ((float) Mode->HTotal);
+            Mode->HSync = ((float) Mode->Clock) / ((float) Mode->HTotal);
 
         if (!Mode->VRefresh)
-            Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) / 
+            Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) /
                 ((float) (Mode->HTotal * Mode->VTotal));
 
         if (Mode->HSync < Monitor->hsync[0].lo)
@@ -806,26 +798,26 @@ DDCGuessRangesFromModes(int scrnIndex, MonPtr Monitor, DisplayModePtr Modes)
 ddc_quirk_t
 xf86DDCDetectQuirks(int scrnIndex, xf86MonPtr DDC, Bool verbose)
 {
-    ddc_quirk_t	quirks;
+    ddc_quirk_t quirks;
     int i;
 
     quirks = DDC_QUIRK_NONE;
     for (i = 0; ddc_quirks[i].detect; i++) {
-	if (ddc_quirks[i].detect (scrnIndex, DDC)) {
-	    if (verbose) {
-		xf86DrvMsg (scrnIndex, X_INFO, "    EDID quirk: %s\n",
-			    ddc_quirks[i].description);
-	    }
-	    quirks |= ddc_quirks[i].quirk;
-	}
+        if (ddc_quirks[i].detect(scrnIndex, DDC)) {
+            if (verbose) {
+                xf86DrvMsg(scrnIndex, X_INFO, "    EDID quirk: %s\n",
+                           ddc_quirks[i].description);
+            }
+            quirks |= ddc_quirks[i].quirk;
+        }
     }
 
     return quirks;
 }
 
-void xf86DetTimingApplyQuirks(struct detailed_monitor_section *det_mon,
-                              ddc_quirk_t quirks,
-                              int hsize, int vsize)
+void
+xf86DetTimingApplyQuirks(struct detailed_monitor_section *det_mon,
+                         ddc_quirk_t quirks, int hsize, int vsize)
 {
     if (det_mon->type != DT)
         return;
@@ -851,13 +843,12 @@ void xf86DetTimingApplyQuirks(struct detailed_monitor_section *det_mon,
 void
 xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC)
 {
-    ddc_quirk_t quirks = xf86DDCDetectQuirks (scrnIndex, DDC, FALSE);
+    ddc_quirk_t quirks = xf86DDCDetectQuirks(scrnIndex, DDC, FALSE);
     int i;
 
     for (i = 0; i < DET_TIMINGS; i++) {
         xf86DetTimingApplyQuirks(DDC->det_mon + i, quirks,
-                                 DDC->features.hsize,
-                                 DDC->features.vsize);
+                                 DDC->features.hsize, DDC->features.vsize);
     }
 }
 
@@ -867,120 +858,116 @@ xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC)
 */
 static void
 xf86DDCSetPreferredRefresh(int scrnIndex, DisplayModePtr modes,
-			   float target_refresh)
+                           float target_refresh)
 {
-	DisplayModePtr	mode, best = modes;
-
-	for (mode = modes; mode; mode = mode->next)
-	{
-	    mode->type &= ~M_T_PREFERRED;
-
-	    if (mode == best) continue;
-
-	    if (mode->HDisplay * mode->VDisplay >
-		best->HDisplay * best->VDisplay)
-	    {
-		best = mode;
-		continue;
-	    }
-	    if (mode->HDisplay * mode->VDisplay ==
-		best->HDisplay * best->VDisplay)
-	    {
-		double	mode_refresh = xf86ModeVRefresh (mode);
-		double	best_refresh = xf86ModeVRefresh (best);
-		double	mode_dist = fabs(mode_refresh - target_refresh);
-		double	best_dist = fabs(best_refresh - target_refresh);
-
-		if (mode_dist < best_dist)
-		{
-		    best = mode;
-		    continue;
-		}
-	    }
-	}
-	if (best)
-	    best->type |= M_T_PREFERRED;
+    DisplayModePtr mode, best = modes;
+
+    for (mode = modes; mode; mode = mode->next) {
+        mode->type &= ~M_T_PREFERRED;
+
+        if (mode == best)
+            continue;
+
+        if (mode->HDisplay * mode->VDisplay > best->HDisplay * best->VDisplay) {
+            best = mode;
+            continue;
+        }
+        if (mode->HDisplay * mode->VDisplay == best->HDisplay * best->VDisplay) {
+            double mode_refresh = xf86ModeVRefresh(mode);
+            double best_refresh = xf86ModeVRefresh(best);
+            double mode_dist = fabs(mode_refresh - target_refresh);
+            double best_dist = fabs(best_refresh - target_refresh);
+
+            if (mode_dist < best_dist) {
+                best = mode;
+                continue;
+            }
+        }
+    }
+    if (best)
+        best->type |= M_T_PREFERRED;
 }
 
 #define CEA_VIDEO_MODES_NUM  64
 static const DisplayModeRec CEAVideoModes[CEA_VIDEO_MODES_NUM] = {
-    { MODEPREFIX,    25175,  640,  656,  752,  800, 0,  480,  490,  492,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 1:640x480@60Hz */
-    { MODEPREFIX,    27000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 2:720x480@60Hz */
-    { MODEPREFIX,    27000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 3:720x480@60Hz */
-    { MODEPREFIX,    74250, 1280, 1390, 1430, 1650, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 4: 1280x720@60Hz */
-    { MODEPREFIX,    74250, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 5:1920x1080i@60Hz */
-    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 6:1440x480i@60Hz */
-    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 7:1440x480i@60Hz */
-    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 8:1440x240@60Hz */
-    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 9:1440x240@60Hz */
-    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 10:2880x480i@60Hz */
-    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 11:2880x480i@60Hz */
-    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 12:2880x240@60Hz */
-    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 13:2880x240@60Hz */
-    { MODEPREFIX,    54000, 1440, 1472, 1596, 1716, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 14:1440x480@60Hz */
-    { MODEPREFIX,    54000, 1440, 1472, 1596, 1716, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 15:1440x480@60Hz */
-    { MODEPREFIX,   148500, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 16:1920x1080@60Hz */
-    { MODEPREFIX,    27000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 17:720x576@50Hz */
-    { MODEPREFIX,    27000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 18:720x576@50Hz */
-    { MODEPREFIX,    74250, 1280, 1720, 1760, 1980, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 19: 1280x720@50Hz */
-    { MODEPREFIX,    74250, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 20:1920x1080i@50Hz */
-    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 21:1440x576i@50Hz */
-    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 22:1440x576i@50Hz */
-    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 23:1440x288@50Hz */
-    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 24:1440x288@50Hz */
-    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 25:2880x576i@50Hz */
-    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 26:2880x576i@50Hz */
-    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 27:2880x288@50Hz */
-    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 28:2880x288@50Hz */
-    { MODEPREFIX,    54000, 1440, 1464, 1592, 1728, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 29:1440x576@50Hz */
-    { MODEPREFIX,    54000, 1440, 1464, 1592, 1728, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 30:1440x576@50Hz */
-    { MODEPREFIX,   148500, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 31:1920x1080@50Hz */
-    { MODEPREFIX,    74250, 1920, 2558, 2602, 2750, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 32:1920x1080@24Hz */
-    { MODEPREFIX,    74250, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 33:1920x1080@25Hz */
-    { MODEPREFIX,    74250, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 34:1920x1080@30Hz */
-    { MODEPREFIX,   108000, 2880, 2944, 3192, 3432, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 35:2880x480@60Hz */
-    { MODEPREFIX,   108000, 2880, 2944, 3192, 3432, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 36:2880x480@60Hz */
-    { MODEPREFIX,   108000, 2880, 2928, 3184, 3456, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 37:2880x576@50Hz */
-    { MODEPREFIX,   108000, 2880, 2928, 3184, 3456, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 38:2880x576@50Hz */
-    { MODEPREFIX,    72000, 1920, 1952, 2120, 2304, 0, 1080, 1126, 1136, 1250, 0, V_PHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 39:1920x1080i@50Hz */
-    { MODEPREFIX,   148500, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 40:1920x1080i@100Hz */
-    { MODEPREFIX,   148500, 1280, 1720, 1760, 1980, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 41:1280x720@100Hz */
-    { MODEPREFIX,    54000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 42:720x576@100Hz */
-    { MODEPREFIX,    54000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 43:720x576@100Hz */
-    { MODEPREFIX,    54000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 44:1440x576i@100Hz */
-    { MODEPREFIX,    54000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 45:1440x576i@100Hz */
-    { MODEPREFIX,   148500, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 46:1920x1080i@120Hz */
-    { MODEPREFIX,   148500, 1280, 1390, 1430, 1650, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 47:1280x720@120Hz */
-    { MODEPREFIX,    54000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 48:720x480@120Hz */
-    { MODEPREFIX,    54000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 49:720x480@120Hz */
-    { MODEPREFIX,    54000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 50:1440x480i@120Hz */
-    { MODEPREFIX,    54000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 51:1440x480i@120Hz */
-    { MODEPREFIX,   108000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 52:720x576@200Hz */
-    { MODEPREFIX,   108000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 53:720x576@200Hz */
-    { MODEPREFIX,   108000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 54:1440x576i@200Hz */
-    { MODEPREFIX,   108000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 55:1440x576i@200Hz */
-    { MODEPREFIX,   108000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 56:720x480@240Hz */
-    { MODEPREFIX,   108000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 57:720x480@240Hz */
-    { MODEPREFIX,   108000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 58:1440x480i@240 */
-    { MODEPREFIX,   108000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 59:1440x480i@240 */
-    { MODEPREFIX,    59400, 1280, 3040, 3080, 3300, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 60: 1280x720@24Hz */
-    { MODEPREFIX,    74250, 1280, 3700, 3740, 3960, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 61: 1280x720@25Hz */
-    { MODEPREFIX,    74250, 1280, 3040, 3080, 3300, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 62: 1280x720@30Hz */
-    { MODEPREFIX,   297000, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 63: 1920x1080@120Hz */
-    { MODEPREFIX,   297000, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 64:1920x1080@100Hz */
+    {MODEPREFIX, 25175, 640, 656, 752, 800, 0, 480, 490, 492, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* VIC 1:640x480@60Hz */
+    {MODEPREFIX, 27000, 720, 736, 798, 858, 0, 480, 489, 495, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* VIC 2:720x480@60Hz */
+    {MODEPREFIX, 27000, 720, 736, 798, 858, 0, 480, 489, 495, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* VIC 3:720x480@60Hz */
+    {MODEPREFIX, 74250, 1280, 1390, 1430, 1650, 0, 720, 725, 730, 750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},     /* VIC 4: 1280x720@60Hz */
+    {MODEPREFIX, 74250, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX},   /* VIC 5:1920x1080i@60Hz */
+    {MODEPREFIX, 27000, 1440, 1478, 1602, 1716, 0, 480, 488, 494, 525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},       /* VIC 6:1440x480i@60Hz */
+    {MODEPREFIX, 27000, 1440, 1478, 1602, 1716, 0, 480, 488, 494, 525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},       /* VIC 7:1440x480i@60Hz */
+    {MODEPREFIX, 27000, 1440, 1478, 1602, 1716, 0, 240, 244, 247, 262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 8:1440x240@60Hz */
+    {MODEPREFIX, 27000, 1440, 1478, 1602, 1716, 0, 240, 244, 247, 262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 9:1440x240@60Hz */
+    {MODEPREFIX, 54000, 2880, 2956, 3204, 3432, 0, 480, 488, 494, 525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},       /* VIC 10:2880x480i@60Hz */
+    {MODEPREFIX, 54000, 2880, 2956, 3204, 3432, 0, 480, 488, 494, 525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},       /* VIC 11:2880x480i@60Hz */
+    {MODEPREFIX, 54000, 2880, 2956, 3204, 3432, 0, 240, 244, 247, 262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 12:2880x240@60Hz */
+    {MODEPREFIX, 54000, 2880, 2956, 3204, 3432, 0, 240, 244, 247, 262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 13:2880x240@60Hz */
+    {MODEPREFIX, 54000, 1440, 1472, 1596, 1716, 0, 480, 489, 495, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 14:1440x480@60Hz */
+    {MODEPREFIX, 54000, 1440, 1472, 1596, 1716, 0, 480, 489, 495, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 15:1440x480@60Hz */
+    {MODEPREFIX, 148500, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* VIC 16:1920x1080@60Hz */
+    {MODEPREFIX, 27000, 720, 732, 796, 864, 0, 576, 581, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* VIC 17:720x576@50Hz */
+    {MODEPREFIX, 27000, 720, 732, 796, 864, 0, 576, 581, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* VIC 18:720x576@50Hz */
+    {MODEPREFIX, 74250, 1280, 1720, 1760, 1980, 0, 720, 725, 730, 750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},     /* VIC 19: 1280x720@50Hz */
+    {MODEPREFIX, 74250, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX},   /* VIC 20:1920x1080i@50Hz */
+    {MODEPREFIX, 27000, 1440, 1464, 1590, 1728, 0, 576, 580, 586, 625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},       /* VIC 21:1440x576i@50Hz */
+    {MODEPREFIX, 27000, 1440, 1464, 1590, 1728, 0, 576, 580, 586, 625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},       /* VIC 22:1440x576i@50Hz */
+    {MODEPREFIX, 27000, 1440, 1464, 1590, 1728, 0, 288, 290, 293, 312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 23:1440x288@50Hz */
+    {MODEPREFIX, 27000, 1440, 1464, 1590, 1728, 0, 288, 290, 293, 312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 24:1440x288@50Hz */
+    {MODEPREFIX, 54000, 2880, 2928, 3180, 3456, 0, 576, 580, 586, 625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},       /* VIC 25:2880x576i@50Hz */
+    {MODEPREFIX, 54000, 2880, 2928, 3180, 3456, 0, 576, 580, 586, 625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},       /* VIC 26:2880x576i@50Hz */
+    {MODEPREFIX, 54000, 2880, 2928, 3180, 3456, 0, 288, 290, 293, 312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 27:2880x288@50Hz */
+    {MODEPREFIX, 54000, 2880, 2928, 3180, 3456, 0, 288, 290, 293, 312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 28:2880x288@50Hz */
+    {MODEPREFIX, 54000, 1440, 1464, 1592, 1728, 0, 576, 581, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 29:1440x576@50Hz */
+    {MODEPREFIX, 54000, 1440, 1464, 1592, 1728, 0, 576, 581, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 30:1440x576@50Hz */
+    {MODEPREFIX, 148500, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* VIC 31:1920x1080@50Hz */
+    {MODEPREFIX, 74250, 1920, 2558, 2602, 2750, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX}, /* VIC 32:1920x1080@24Hz */
+    {MODEPREFIX, 74250, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX}, /* VIC 33:1920x1080@25Hz */
+    {MODEPREFIX, 74250, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX}, /* VIC 34:1920x1080@30Hz */
+    {MODEPREFIX, 108000, 2880, 2944, 3192, 3432, 0, 480, 489, 495, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},    /* VIC 35:2880x480@60Hz */
+    {MODEPREFIX, 108000, 2880, 2944, 3192, 3432, 0, 480, 489, 495, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},    /* VIC 36:2880x480@60Hz */
+    {MODEPREFIX, 108000, 2880, 2928, 3184, 3456, 0, 576, 581, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},    /* VIC 37:2880x576@50Hz */
+    {MODEPREFIX, 108000, 2880, 2928, 3184, 3456, 0, 576, 581, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},    /* VIC 38:2880x576@50Hz */
+    {MODEPREFIX, 72000, 1920, 1952, 2120, 2304, 0, 1080, 1126, 1136, 1250, 0, V_PHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},   /* VIC 39:1920x1080i@50Hz */
+    {MODEPREFIX, 148500, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX},  /* VIC 40:1920x1080i@100Hz */
+    {MODEPREFIX, 148500, 1280, 1720, 1760, 1980, 0, 720, 725, 730, 750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},    /* VIC 41:1280x720@100Hz */
+    {MODEPREFIX, 54000, 720, 732, 796, 864, 0, 576, 581, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* VIC 42:720x576@100Hz */
+    {MODEPREFIX, 54000, 720, 732, 796, 864, 0, 576, 581, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* VIC 43:720x576@100Hz */
+    {MODEPREFIX, 54000, 1440, 1464, 1590, 1728, 0, 576, 580, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 44:1440x576i@100Hz */
+    {MODEPREFIX, 54000, 1440, 1464, 1590, 1728, 0, 576, 580, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},     /* VIC 45:1440x576i@100Hz */
+    {MODEPREFIX, 148500, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX},  /* VIC 46:1920x1080i@120Hz */
+    {MODEPREFIX, 148500, 1280, 1390, 1430, 1650, 0, 720, 725, 730, 750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},    /* VIC 47:1280x720@120Hz */
+    {MODEPREFIX, 54000, 720, 736, 798, 858, 0, 480, 489, 495, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* VIC 48:720x480@120Hz */
+    {MODEPREFIX, 54000, 720, 736, 798, 858, 0, 480, 489, 495, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX}, /* VIC 49:720x480@120Hz */
+    {MODEPREFIX, 54000, 1440, 1478, 1602, 1716, 0, 480, 488, 494, 525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},       /* VIC 50:1440x480i@120Hz */
+    {MODEPREFIX, 54000, 1440, 1478, 1602, 1716, 0, 480, 488, 494, 525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},       /* VIC 51:1440x480i@120Hz */
+    {MODEPREFIX, 108000, 720, 732, 796, 864, 0, 576, 581, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},        /* VIC 52:720x576@200Hz */
+    {MODEPREFIX, 108000, 720, 732, 796, 864, 0, 576, 581, 586, 625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},        /* VIC 53:720x576@200Hz */
+    {MODEPREFIX, 108000, 1440, 1464, 1590, 1728, 0, 576, 580, 586, 625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},      /* VIC 54:1440x576i@200Hz */
+    {MODEPREFIX, 108000, 1440, 1464, 1590, 1728, 0, 576, 580, 586, 625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},      /* VIC 55:1440x576i@200Hz */
+    {MODEPREFIX, 108000, 720, 736, 798, 858, 0, 480, 489, 495, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},        /* VIC 56:720x480@240Hz */
+    {MODEPREFIX, 108000, 720, 736, 798, 858, 0, 480, 489, 495, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX},        /* VIC 57:720x480@240Hz */
+    {MODEPREFIX, 108000, 1440, 1478, 1602, 1716, 0, 480, 488, 494, 525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},      /* VIC 58:1440x480i@240 */
+    {MODEPREFIX, 108000, 1440, 1478, 1602, 1716, 0, 480, 488, 494, 525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX},      /* VIC 59:1440x480i@240 */
+    {MODEPREFIX, 59400, 1280, 3040, 3080, 3300, 0, 720, 725, 730, 750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},     /* VIC 60: 1280x720@24Hz */
+    {MODEPREFIX, 74250, 1280, 3700, 3740, 3960, 0, 720, 725, 730, 750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},     /* VIC 61: 1280x720@25Hz */
+    {MODEPREFIX, 74250, 1280, 3040, 3080, 3300, 0, 720, 725, 730, 750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},     /* VIC 62: 1280x720@30Hz */
+    {MODEPREFIX, 297000, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* VIC 63: 1920x1080@120Hz */
+    {MODEPREFIX, 297000, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX},        /* VIC 64:1920x1080@100Hz */
 };
 
 /* chose mode line by cea short video descriptor*/
-static void handle_cea_svd(struct cea_video_block *video, void *data)
+static void
+handle_cea_svd(struct cea_video_block *video, void *data)
 {
     DisplayModePtr Mode;
     DisplayModePtr *Modes = (DisplayModePtr *) data;
     int vid;
 
-    vid = video ->video_code & 0x7f;
+    vid = video->video_code & 0x7f;
     if (vid < CEA_VIDEO_MODES_NUM) {
-	Mode = xf86DuplicateMode(CEAVideoModes + vid);
-	*Modes = xf86ModesAdd(*Modes, Mode);
+        Mode = xf86DuplicateMode(CEAVideoModes + vid);
+        *Modes = xf86ModesAdd(*Modes, Mode);
     }
 }
 
@@ -989,9 +976,7 @@ DDCModesFromCEAExtension(int scrnIndex, xf86MonPtr MonPtr)
 {
     DisplayModePtr Modes = NULL;
 
-    xf86ForEachVideoBlock(MonPtr,
-                          handle_cea_svd,
-                          &Modes);
+    xf86ForEachVideoBlock(MonPtr, handle_cea_svd, &Modes);
 
     return Modes;
 }
@@ -999,34 +984,32 @@ DDCModesFromCEAExtension(int scrnIndex, xf86MonPtr MonPtr)
 struct det_modes_parameter {
     xf86MonPtr DDC;
     ddc_quirk_t quirks;
-    DisplayModePtr  Modes;
+    DisplayModePtr Modes;
     Bool rb;
     Bool preferred;
     int timing_level;
 };
 
-static void handle_detailed_modes(struct detailed_monitor_section *det_mon,
-	                          void *data)
+static void
+handle_detailed_modes(struct detailed_monitor_section *det_mon, void *data)
 {
-    DisplayModePtr  Mode;
-    struct det_modes_parameter *p = (struct det_modes_parameter *)data;
+    DisplayModePtr Mode;
+    struct det_modes_parameter *p = (struct det_modes_parameter *) data;
 
-    xf86DetTimingApplyQuirks(det_mon,p->quirks,
-                             p->DDC->features.hsize,
-                             p->DDC->features.vsize);
+    xf86DetTimingApplyQuirks(det_mon, p->quirks,
+                             p->DDC->features.hsize, p->DDC->features.vsize);
 
     switch (det_mon->type) {
     case DT:
         Mode = DDCModeFromDetailedTiming(p->DDC->scrnIndex,
                                          &det_mon->section.d_timings,
-                                         p->preferred,
-                                         p->quirks);
+                                         p->preferred, p->quirks);
         p->preferred = FALSE;
         p->Modes = xf86ModesAdd(p->Modes, Mode);
         break;
     case DS_STD_TIMINGS:
         Mode = DDCModesFromStandardTiming(det_mon->section.std_t,
-                                          p->quirks, p->timing_level,p->rb);
+                                          p->quirks, p->timing_level, p->rb);
         p->Modes = xf86ModesAdd(p->Modes, Mode);
         break;
     case DS_CVT:
@@ -1034,9 +1017,9 @@ static void handle_detailed_modes(struct detailed_monitor_section *det_mon,
         p->Modes = xf86ModesAdd(p->Modes, Mode);
         break;
     case DS_EST_III:
-	Mode = DDCModesFromEstIII(det_mon->section.est_iii);
-	p->Modes = xf86ModesAdd(p->Modes, Mode);
-	break;
+        Mode = DDCModesFromEstIII(det_mon->section.est_iii);
+        p->Modes = xf86ModesAdd(p->Modes, Mode);
+        break;
     default:
         break;
     }
@@ -1045,24 +1028,24 @@ static void handle_detailed_modes(struct detailed_monitor_section *det_mon,
 DisplayModePtr
 xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC)
 {
-    DisplayModePtr  Modes = NULL, Mode;
-    ddc_quirk_t	    quirks;
-    Bool	    preferred, rb;
-    int		    timing_level;
+    DisplayModePtr Modes = NULL, Mode;
+    ddc_quirk_t quirks;
+    Bool preferred, rb;
+    int timing_level;
     struct det_modes_parameter p;
 
-    xf86DrvMsg (scrnIndex, X_INFO, "EDID vendor \"%s\", prod id %d\n",
-		DDC->vendor.name, DDC->vendor.prod_id);
+    xf86DrvMsg(scrnIndex, X_INFO, "EDID vendor \"%s\", prod id %d\n",
+               DDC->vendor.name, DDC->vendor.prod_id);
 
     quirks = xf86DDCDetectQuirks(scrnIndex, DDC, TRUE);
 
     preferred = PREFERRED_TIMING_MODE(DDC->features.msc);
     if (DDC->ver.revision >= 4)
-	preferred = TRUE;
+        preferred = TRUE;
     if (quirks & DDC_QUIRK_FIRST_DETAILED_PREFERRED)
-	preferred = TRUE;
+        preferred = TRUE;
     if (quirks & (DDC_QUIRK_PREFER_LARGE_60 | DDC_QUIRK_PREFER_LARGE_75))
-	preferred = FALSE;
+        preferred = FALSE;
 
     rb = xf86MonitorSupportsReducedBlanking(DDC);
 
@@ -1086,14 +1069,14 @@ xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC)
     Modes = xf86ModesAdd(Modes, Mode);
 
     /* Add cea-extension mode timings */
-    Mode = DDCModesFromCEAExtension(scrnIndex,DDC);
+    Mode = DDCModesFromCEAExtension(scrnIndex, DDC);
     Modes = xf86ModesAdd(Modes, Mode);
 
     if (quirks & DDC_QUIRK_PREFER_LARGE_60)
-	xf86DDCSetPreferredRefresh(scrnIndex, Modes, 60);
+        xf86DDCSetPreferredRefresh(scrnIndex, Modes, 60);
 
     if (quirks & DDC_QUIRK_PREFER_LARGE_75)
-	xf86DDCSetPreferredRefresh(scrnIndex, Modes, 75);
+        xf86DDCSetPreferredRefresh(scrnIndex, Modes, 75);
 
     Modes = xf86PruneDuplicateModes(Modes);
 
@@ -1108,41 +1091,43 @@ struct det_mon_parameter {
     Bool have_maxpixclock;
 };
 
-static void handle_detailed_monset(struct detailed_monitor_section *det_mon,
-                                   void *data)
+static void
+handle_detailed_monset(struct detailed_monitor_section *det_mon, void *data)
 {
     int clock;
-    struct det_mon_parameter *p = (struct det_mon_parameter *)data;
-    int scrnIndex = ((xf86MonPtr)(p->Monitor->DDC))->scrnIndex;
+    struct det_mon_parameter *p = (struct det_mon_parameter *) data;
+    int scrnIndex = ((xf86MonPtr) (p->Monitor->DDC))->scrnIndex;
 
     switch (det_mon->type) {
     case DS_RANGES:
         if (!p->have_hsync) {
             if (!p->Monitor->nHsync)
                 xf86DrvMsg(scrnIndex, X_INFO,
-                    "Using EDID range info for horizontal sync\n");
-                p->Monitor->hsync[p->Monitor->nHsync].lo =
-                    det_mon->section.ranges.min_h;
-                p->Monitor->hsync[p->Monitor->nHsync].hi =
-                    det_mon->section.ranges.max_h;
-                p->Monitor->nHsync++;
-        } else {
+                           "Using EDID range info for horizontal sync\n");
+            p->Monitor->hsync[p->Monitor->nHsync].lo =
+                det_mon->section.ranges.min_h;
+            p->Monitor->hsync[p->Monitor->nHsync].hi =
+                det_mon->section.ranges.max_h;
+            p->Monitor->nHsync++;
+        }
+        else {
             xf86DrvMsg(scrnIndex, X_INFO,
-                "Using hsync ranges from config file\n");
+                       "Using hsync ranges from config file\n");
         }
 
         if (!p->have_vrefresh) {
             if (!p->Monitor->nVrefresh)
                 xf86DrvMsg(scrnIndex, X_INFO,
-                    "Using EDID range info for vertical refresh\n");
+                           "Using EDID range info for vertical refresh\n");
             p->Monitor->vrefresh[p->Monitor->nVrefresh].lo =
                 det_mon->section.ranges.min_v;
             p->Monitor->vrefresh[p->Monitor->nVrefresh].hi =
                 det_mon->section.ranges.max_v;
             p->Monitor->nVrefresh++;
-        } else {
+        }
+        else {
             xf86DrvMsg(scrnIndex, X_INFO,
-                "Using vrefresh ranges from config file\n");
+                       "Using vrefresh ranges from config file\n");
         }
 
         clock = det_mon->section.ranges.max_clock * 1000;
@@ -1172,8 +1157,8 @@ xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
     Monitor->DDC = DDC;
 
     if (Monitor->widthmm <= 0 || Monitor->heightmm <= 0) {
-	Monitor->widthmm = 10 * DDC->features.hsize;
-	Monitor->heightmm = 10 * DDC->features.vsize;
+        Monitor->widthmm = 10 * DDC->features.hsize;
+        Monitor->heightmm = 10 * DDC->features.vsize;
     }
 
     Monitor->reducedblanking = xf86MonitorSupportsReducedBlanking(DDC);
@@ -1213,7 +1198,8 @@ xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
             Monitor->Last->next = Modes;
             Modes->prev = Monitor->Last;
             Monitor->Last = Mode;
-        } else {
+        }
+        else {
             Monitor->Modes = Modes;
             Monitor->Last = Mode;
         }
diff --git a/xorg-server/hw/xfree86/modes/xf86Modes.c b/xorg-server/hw/xfree86/modes/xf86Modes.c
index 49cc14992..2a6d26756 100644
--- a/xorg-server/hw/xfree86/modes/xf86Modes.c
+++ b/xorg-server/hw/xfree86/modes/xf86Modes.c
@@ -42,14 +42,14 @@ extern XF86ConfigPtr xf86configptr;
  * Calculates the horizontal sync rate of a mode.
  */
 double
-xf86ModeHSync(const DisplayModeRec *mode)
+xf86ModeHSync(const DisplayModeRec * mode)
 {
     double hsync = 0.0;
-    
+
     if (mode->HSync > 0.0)
-	    hsync = mode->HSync;
+        hsync = mode->HSync;
     else if (mode->HTotal > 0)
-	    hsync = (float)mode->Clock / (float)mode->HTotal;
+        hsync = (float) mode->Clock / (float) mode->HTotal;
 
     return hsync;
 }
@@ -58,51 +58,51 @@ xf86ModeHSync(const DisplayModeRec *mode)
  * Calculates the vertical refresh rate of a mode.
  */
 double
-xf86ModeVRefresh(const DisplayModeRec *mode)
+xf86ModeVRefresh(const DisplayModeRec * mode)
 {
     double refresh = 0.0;
 
     if (mode->VRefresh > 0.0)
-	refresh = mode->VRefresh;
+        refresh = mode->VRefresh;
     else if (mode->HTotal > 0 && mode->VTotal > 0) {
-	refresh = mode->Clock * 1000.0 / mode->HTotal / mode->VTotal;
-	if (mode->Flags & V_INTERLACE)
-	    refresh *= 2.0;
-	if (mode->Flags & V_DBLSCAN)
-	    refresh /= 2.0;
-	if (mode->VScan > 1)
-	    refresh /= (float)(mode->VScan);
+        refresh = mode->Clock * 1000.0 / mode->HTotal / mode->VTotal;
+        if (mode->Flags & V_INTERLACE)
+            refresh *= 2.0;
+        if (mode->Flags & V_DBLSCAN)
+            refresh /= 2.0;
+        if (mode->VScan > 1)
+            refresh /= (float) (mode->VScan);
     }
     return refresh;
 }
 
 int
-xf86ModeWidth (const DisplayModeRec *mode, Rotation rotation)
+xf86ModeWidth(const DisplayModeRec * mode, Rotation rotation)
 {
     switch (rotation & 0xf) {
     case RR_Rotate_0:
     case RR_Rotate_180:
-	return mode->HDisplay;
+        return mode->HDisplay;
     case RR_Rotate_90:
     case RR_Rotate_270:
-	return mode->VDisplay;
+        return mode->VDisplay;
     default:
-	return 0;
+        return 0;
     }
 }
 
 int
-xf86ModeHeight (const DisplayModeRec *mode, Rotation rotation)
+xf86ModeHeight(const DisplayModeRec * mode, Rotation rotation)
 {
     switch (rotation & 0xf) {
     case RR_Rotate_0:
     case RR_Rotate_180:
-	return mode->VDisplay;
+        return mode->VDisplay;
     case RR_Rotate_90:
     case RR_Rotate_270:
-	return mode->HDisplay;
+        return mode->HDisplay;
     default:
-	return 0;
+        return 0;
     }
 }
 
@@ -114,26 +114,26 @@ xf86ModeBandwidth(DisplayModePtr mode, int depth)
     int bytes_per_pixel = bits_to_bytes(depth);
 
     if (!mode->HTotal || !mode->VTotal || !mode->Clock)
-	return 0;
+        return 0;
 
     a_active = mode->HDisplay * mode->VDisplay;
     a_total = mode->HTotal * mode->VTotal;
     active_percent = a_active / a_total;
     pixels_per_second = active_percent * mode->Clock * 1000.0;
 
-    return (unsigned int)(pixels_per_second * bytes_per_pixel / (1024 * 1024));
+    return (unsigned int) (pixels_per_second * bytes_per_pixel / (1024 * 1024));
 }
 
 /** Sets a default mode name of <width>x<height> on a mode. */
 void
 xf86SetModeDefaultName(DisplayModePtr mode)
 {
-    Bool interlaced = !!(mode->Flags & V_INTERLACE);
+    Bool interlaced = ! !(mode->Flags & V_INTERLACE);
 
     free(mode->name);
 
     XNFasprintf(&mode->name, "%dx%d%s", mode->HDisplay, mode->VDisplay,
-		interlaced ? "i" : "");
+                interlaced ? "i" : "");
 }
 
 /*
@@ -146,40 +146,40 @@ void
 xf86SetModeCrtc(DisplayModePtr p, int adjustFlags)
 {
     if ((p == NULL) || ((p->type & M_T_CRTC_C) == M_T_BUILTIN))
-	return;
-
-    p->CrtcHDisplay             = p->HDisplay;
-    p->CrtcHSyncStart           = p->HSyncStart;
-    p->CrtcHSyncEnd             = p->HSyncEnd;
-    p->CrtcHTotal               = p->HTotal;
-    p->CrtcHSkew                = p->HSkew;
-    p->CrtcVDisplay             = p->VDisplay;
-    p->CrtcVSyncStart           = p->VSyncStart;
-    p->CrtcVSyncEnd             = p->VSyncEnd;
-    p->CrtcVTotal               = p->VTotal;
+        return;
+
+    p->CrtcHDisplay = p->HDisplay;
+    p->CrtcHSyncStart = p->HSyncStart;
+    p->CrtcHSyncEnd = p->HSyncEnd;
+    p->CrtcHTotal = p->HTotal;
+    p->CrtcHSkew = p->HSkew;
+    p->CrtcVDisplay = p->VDisplay;
+    p->CrtcVSyncStart = p->VSyncStart;
+    p->CrtcVSyncEnd = p->VSyncEnd;
+    p->CrtcVTotal = p->VTotal;
     if (p->Flags & V_INTERLACE) {
-	if (adjustFlags & INTERLACE_HALVE_V) {
-	    p->CrtcVDisplay         /= 2;
-	    p->CrtcVSyncStart       /= 2;
-	    p->CrtcVSyncEnd         /= 2;
-	    p->CrtcVTotal           /= 2;
-	}
-	/* Force interlaced modes to have an odd VTotal */
-	/* maybe we should only do this when INTERLACE_HALVE_V is set? */
-	p->CrtcVTotal |= 1;
+        if (adjustFlags & INTERLACE_HALVE_V) {
+            p->CrtcVDisplay /= 2;
+            p->CrtcVSyncStart /= 2;
+            p->CrtcVSyncEnd /= 2;
+            p->CrtcVTotal /= 2;
+        }
+        /* Force interlaced modes to have an odd VTotal */
+        /* maybe we should only do this when INTERLACE_HALVE_V is set? */
+        p->CrtcVTotal |= 1;
     }
 
     if (p->Flags & V_DBLSCAN) {
-        p->CrtcVDisplay         *= 2;
-        p->CrtcVSyncStart       *= 2;
-        p->CrtcVSyncEnd         *= 2;
-        p->CrtcVTotal           *= 2;
+        p->CrtcVDisplay *= 2;
+        p->CrtcVSyncStart *= 2;
+        p->CrtcVSyncEnd *= 2;
+        p->CrtcVTotal *= 2;
     }
     if (p->VScan > 1) {
-        p->CrtcVDisplay         *= p->VScan;
-        p->CrtcVSyncStart       *= p->VScan;
-        p->CrtcVSyncEnd         *= p->VScan;
-        p->CrtcVTotal           *= p->VScan;
+        p->CrtcVDisplay *= p->VScan;
+        p->CrtcVSyncStart *= p->VScan;
+        p->CrtcVSyncEnd *= p->VScan;
+        p->CrtcVTotal *= p->VScan;
     }
     p->CrtcVBlankStart = min(p->CrtcVSyncStart, p->CrtcVDisplay);
     p->CrtcVBlankEnd = max(p->CrtcVSyncEnd, p->CrtcVTotal);
@@ -194,7 +194,7 @@ xf86SetModeCrtc(DisplayModePtr p, int adjustFlags)
  * Allocates and returns a copy of pMode, including pointers within pMode.
  */
 DisplayModePtr
-xf86DuplicateMode(const DisplayModeRec *pMode)
+xf86DuplicateMode(const DisplayModeRec * pMode)
 {
     DisplayModePtr pNew;
 
@@ -204,9 +204,9 @@ xf86DuplicateMode(const DisplayModeRec *pMode)
     pNew->prev = NULL;
 
     if (pMode->name == NULL)
-	xf86SetModeDefaultName(pNew);
+        xf86SetModeDefaultName(pNew);
     else
-	pNew->name = xnfstrdup(pMode->name);
+        pNew->name = xnfstrdup(pMode->name);
 
     return pNew;
 }
@@ -224,20 +224,21 @@ xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList)
     DisplayModePtr mode;
 
     for (mode = modeList; mode != NULL; mode = mode->next) {
-	DisplayModePtr new;
-
-	new = xf86DuplicateMode(mode);
-
-	/* Insert pNew into modeList */
-	if (last) {
-	    last->next = new;
-	    new->prev = last;
-	} else {
-	    first = new;
-	    new->prev = NULL;
-	}
-	new->next = NULL;
-	last = new;
+        DisplayModePtr new;
+
+        new = xf86DuplicateMode(mode);
+
+        /* Insert pNew into modeList */
+        if (last) {
+            last->next = new;
+            new->prev = last;
+        }
+        else {
+            first = new;
+            new->prev = NULL;
+        }
+        new->next = NULL;
+        last = new;
     }
 
     return first;
@@ -250,25 +251,24 @@ xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList)
  * Crtc values set.  So, it's assumed that the other numbers are enough.
  */
 Bool
-xf86ModesEqual(const DisplayModeRec *pMode1, const DisplayModeRec *pMode2)
+xf86ModesEqual(const DisplayModeRec * pMode1, const DisplayModeRec * pMode2)
 {
-     if (pMode1->Clock == pMode2->Clock &&
-	 pMode1->HDisplay == pMode2->HDisplay &&
-	 pMode1->HSyncStart == pMode2->HSyncStart &&
-	 pMode1->HSyncEnd == pMode2->HSyncEnd &&
-	 pMode1->HTotal == pMode2->HTotal &&
-	 pMode1->HSkew == pMode2->HSkew &&
-	 pMode1->VDisplay == pMode2->VDisplay &&
-	 pMode1->VSyncStart == pMode2->VSyncStart &&
-	 pMode1->VSyncEnd == pMode2->VSyncEnd &&
-	 pMode1->VTotal == pMode2->VTotal &&
-	 pMode1->VScan == pMode2->VScan &&
-	 pMode1->Flags == pMode2->Flags)
-     {
-	return TRUE;
-     } else {
-	return FALSE;
-     }
+    if (pMode1->Clock == pMode2->Clock &&
+        pMode1->HDisplay == pMode2->HDisplay &&
+        pMode1->HSyncStart == pMode2->HSyncStart &&
+        pMode1->HSyncEnd == pMode2->HSyncEnd &&
+        pMode1->HTotal == pMode2->HTotal &&
+        pMode1->HSkew == pMode2->HSkew &&
+        pMode1->VDisplay == pMode2->VDisplay &&
+        pMode1->VSyncStart == pMode2->VSyncStart &&
+        pMode1->VSyncEnd == pMode2->VSyncEnd &&
+        pMode1->VTotal == pMode2->VTotal &&
+        pMode1->VScan == pMode2->VScan && pMode1->Flags == pMode2->Flags) {
+        return TRUE;
+    }
+    else {
+        return FALSE;
+    }
 }
 
 static void
@@ -309,54 +309,68 @@ xf86PrintModeline(int scrnIndex, DisplayModePtr mode)
 {
     char tmp[256];
     char *flags = xnfcalloc(1, 1);
+
 #define TBITS 6
-    const char tchar[TBITS+1] = "UezdPb";
+    const char tchar[TBITS + 1] = "UezdPb";
+
     int tbit[TBITS] = {
-	M_T_USERPREF, M_T_DRIVER, M_T_USERDEF,
-	M_T_DEFAULT, M_T_PREFERRED, M_T_BUILTIN
+        M_T_USERPREF, M_T_DRIVER, M_T_USERDEF,
+        M_T_DEFAULT, M_T_PREFERRED, M_T_BUILTIN
     };
-    char type[TBITS+2];   /* +1 for leading space */
+    char type[TBITS + 2];       /* +1 for leading space */
+
 #undef TBITS
     int tlen = 0;
 
     if (mode->type) {
-	int i;
+        int i;
 
-	type[tlen++] = ' ';
-	for (i = 0; tchar[i]; i++)
-	    if (mode->type & tbit[i])
-		type[tlen++] = tchar[i];
+        type[tlen++] = ' ';
+        for (i = 0; tchar[i]; i++)
+            if (mode->type & tbit[i])
+                type[tlen++] = tchar[i];
     }
     type[tlen] = '\0';
 
-    if (mode->HSkew) { 
-	snprintf(tmp, 256, "hskew %i", mode->HSkew); 
-	add(&flags, tmp);
+    if (mode->HSkew) {
+        snprintf(tmp, 256, "hskew %i", mode->HSkew);
+        add(&flags, tmp);
     }
-    if (mode->VScan) { 
-	snprintf(tmp, 256, "vscan %i", mode->VScan); 
-	add(&flags, tmp);
+    if (mode->VScan) {
+        snprintf(tmp, 256, "vscan %i", mode->VScan);
+        add(&flags, tmp);
     }
-    if (mode->Flags & V_INTERLACE) add(&flags, "interlace");
-    if (mode->Flags & V_CSYNC) add(&flags, "composite");
-    if (mode->Flags & V_DBLSCAN) add(&flags, "doublescan");
-    if (mode->Flags & V_BCAST) add(&flags, "bcast");
-    if (mode->Flags & V_PHSYNC) add(&flags, "+hsync");
-    if (mode->Flags & V_NHSYNC) add(&flags, "-hsync");
-    if (mode->Flags & V_PVSYNC) add(&flags, "+vsync");
-    if (mode->Flags & V_NVSYNC) add(&flags, "-vsync");
-    if (mode->Flags & V_PCSYNC) add(&flags, "+csync");
-    if (mode->Flags & V_NCSYNC) add(&flags, "-csync");
+    if (mode->Flags & V_INTERLACE)
+        add(&flags, "interlace");
+    if (mode->Flags & V_CSYNC)
+        add(&flags, "composite");
+    if (mode->Flags & V_DBLSCAN)
+        add(&flags, "doublescan");
+    if (mode->Flags & V_BCAST)
+        add(&flags, "bcast");
+    if (mode->Flags & V_PHSYNC)
+        add(&flags, "+hsync");
+    if (mode->Flags & V_NHSYNC)
+        add(&flags, "-hsync");
+    if (mode->Flags & V_PVSYNC)
+        add(&flags, "+vsync");
+    if (mode->Flags & V_NVSYNC)
+        add(&flags, "-vsync");
+    if (mode->Flags & V_PCSYNC)
+        add(&flags, "+csync");
+    if (mode->Flags & V_NCSYNC)
+        add(&flags, "-csync");
 #if 0
-    if (mode->Flags & V_CLKDIV2) add(&flags, "vclk/2");
+    if (mode->Flags & V_CLKDIV2)
+        add(&flags, "vclk/2");
 #endif
     xf86DrvMsg(scrnIndex, X_INFO,
-	       "Modeline \"%s\"x%.01f  %6.2f  %i %i %i %i  %i %i %i %i%s"
-	       " (%.01f kHz%s)\n",
-	       mode->name, mode->VRefresh, mode->Clock/1000.,
-	       mode->HDisplay, mode->HSyncStart, mode->HSyncEnd, mode->HTotal,
-	       mode->VDisplay, mode->VSyncStart, mode->VSyncEnd, mode->VTotal,
-	       flags, xf86ModeHSync(mode), type);
+               "Modeline \"%s\"x%.01f  %6.2f  %i %i %i %i  %i %i %i %i%s"
+               " (%.01f kHz%s)\n",
+               mode->name, mode->VRefresh, mode->Clock / 1000.,
+               mode->HDisplay, mode->HSyncStart, mode->HSyncEnd, mode->HTotal,
+               mode->VDisplay, mode->VSyncStart, mode->VSyncEnd, mode->VTotal,
+               flags, xf86ModeHSync(mode), type);
     free(flags);
 }
 
@@ -369,19 +383,18 @@ xf86PrintModeline(int scrnIndex, DisplayModePtr mode)
  * \bug only V_INTERLACE and V_DBLSCAN are supported.  Is that enough?
  */
 void
-xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList,
-			    int flags)
+xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, int flags)
 {
     DisplayModePtr mode;
 
     if (flags == (V_INTERLACE | V_DBLSCAN))
-	return;
+        return;
 
     for (mode = modeList; mode != NULL; mode = mode->next) {
-	if (mode->Flags & V_INTERLACE && !(flags & V_INTERLACE))
-	    mode->status = MODE_NO_INTERLACE;
-	if (mode->Flags & V_DBLSCAN && !(flags & V_DBLSCAN))
-	    mode->status = MODE_NO_DBLESCAN;
+        if (mode->Flags & V_INTERLACE && !(flags & V_INTERLACE))
+            mode->status = MODE_NO_INTERLACE;
+        if (mode->Flags & V_DBLSCAN && !(flags & V_DBLSCAN))
+            mode->status = MODE_NO_DBLESCAN;
     }
 }
 
@@ -392,39 +405,39 @@ xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList,
  */
 void
 xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList,
-			  int maxX, int maxY, int maxPitch)
+                      int maxX, int maxY, int maxPitch)
 {
     DisplayModePtr mode;
 
     if (maxPitch <= 0)
-	    maxPitch = MAXINT;
+        maxPitch = MAXINT;
     if (maxX <= 0)
-	    maxX = MAXINT;
+        maxX = MAXINT;
     if (maxY <= 0)
-	    maxY = MAXINT;
+        maxY = MAXINT;
 
     for (mode = modeList; mode != NULL; mode = mode->next) {
-	if ((xf86ModeWidth(mode, RR_Rotate_0) > maxPitch ||
-	     xf86ModeWidth(mode, RR_Rotate_0) > maxX ||
-	     xf86ModeHeight(mode, RR_Rotate_0) > maxY) &&
-	    (xf86ModeWidth(mode, RR_Rotate_90) > maxPitch ||
-	     xf86ModeWidth(mode, RR_Rotate_90) > maxX ||
-	     xf86ModeHeight(mode, RR_Rotate_90) > maxY)) {
-	    if (xf86ModeWidth(mode, RR_Rotate_0) > maxPitch ||
-		xf86ModeWidth(mode, RR_Rotate_90) > maxPitch)
-		mode->status = MODE_BAD_WIDTH;
-
-	    if (xf86ModeWidth(mode, RR_Rotate_0) > maxX ||
-		xf86ModeWidth(mode, RR_Rotate_90) > maxX)
-		mode->status = MODE_VIRTUAL_X;
-
-	    if (xf86ModeHeight(mode, RR_Rotate_0) > maxY ||
-		xf86ModeHeight(mode, RR_Rotate_90) > maxY)
-		mode->status = MODE_VIRTUAL_Y;
-	}
-
-	if (mode->next == modeList)
-	    break;
+        if ((xf86ModeWidth(mode, RR_Rotate_0) > maxPitch ||
+             xf86ModeWidth(mode, RR_Rotate_0) > maxX ||
+             xf86ModeHeight(mode, RR_Rotate_0) > maxY) &&
+            (xf86ModeWidth(mode, RR_Rotate_90) > maxPitch ||
+             xf86ModeWidth(mode, RR_Rotate_90) > maxX ||
+             xf86ModeHeight(mode, RR_Rotate_90) > maxY)) {
+            if (xf86ModeWidth(mode, RR_Rotate_0) > maxPitch ||
+                xf86ModeWidth(mode, RR_Rotate_90) > maxPitch)
+                mode->status = MODE_BAD_WIDTH;
+
+            if (xf86ModeWidth(mode, RR_Rotate_0) > maxX ||
+                xf86ModeWidth(mode, RR_Rotate_90) > maxX)
+                mode->status = MODE_VIRTUAL_X;
+
+            if (xf86ModeHeight(mode, RR_Rotate_0) > maxY ||
+                xf86ModeHeight(mode, RR_Rotate_90) > maxY)
+                mode->status = MODE_VIRTUAL_Y;
+        }
+
+        if (mode->next == modeList)
+            break;
     }
 }
 
@@ -435,39 +448,39 @@ xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList,
  * \param modeList doubly-linked list of modes.
  */
 void
-xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList,
-			  MonPtr mon)
+xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList, MonPtr mon)
 {
     DisplayModePtr mode;
 
     for (mode = modeList; mode != NULL; mode = mode->next) {
-	Bool bad;
-	int i;
-
-	bad = TRUE;
-	for (i = 0; i < mon->nHsync; i++) {
-	    if (xf86ModeHSync(mode) >= mon->hsync[i].lo * (1-SYNC_TOLERANCE) &&
-		xf86ModeHSync(mode) <= mon->hsync[i].hi * (1+SYNC_TOLERANCE))
-	    {
-		bad = FALSE;
-	    }
-	}
-	if (bad)
-	    mode->status = MODE_HSYNC;
-
-	bad = TRUE;
-	for (i = 0; i < mon->nVrefresh; i++) {
-	    if (xf86ModeVRefresh(mode) >= mon->vrefresh[i].lo * (1-SYNC_TOLERANCE) &&
-		xf86ModeVRefresh(mode) <= mon->vrefresh[i].hi * (1+SYNC_TOLERANCE))
-	    {
-		bad = FALSE;
-	    }
-	}
-	if (bad)
-	    mode->status = MODE_VSYNC;
-
-	if (mode->next == modeList)
-	    break;
+        Bool bad;
+        int i;
+
+        bad = TRUE;
+        for (i = 0; i < mon->nHsync; i++) {
+            if (xf86ModeHSync(mode) >= mon->hsync[i].lo * (1 - SYNC_TOLERANCE)
+                && xf86ModeHSync(mode) <=
+                mon->hsync[i].hi * (1 + SYNC_TOLERANCE)) {
+                bad = FALSE;
+            }
+        }
+        if (bad)
+            mode->status = MODE_HSYNC;
+
+        bad = TRUE;
+        for (i = 0; i < mon->nVrefresh; i++) {
+            if (xf86ModeVRefresh(mode) >=
+                mon->vrefresh[i].lo * (1 - SYNC_TOLERANCE) &&
+                xf86ModeVRefresh(mode) <=
+                mon->vrefresh[i].hi * (1 + SYNC_TOLERANCE)) {
+                bad = FALSE;
+            }
+        }
+        if (bad)
+            mode->status = MODE_VSYNC;
+
+        if (mode->next == modeList)
+            break;
     }
 }
 
@@ -481,22 +494,23 @@ xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList,
  */
 void
 xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList,
-			    int *min, int *max, int n_ranges)
+                        int *min, int *max, int n_ranges)
 {
     DisplayModePtr mode;
     int i;
 
     for (mode = modeList; mode != NULL; mode = mode->next) {
-	Bool good = FALSE;
-	for (i = 0; i < n_ranges; i++) {
-	    if (mode->Clock >= min[i] * (1-SYNC_TOLERANCE) &&
-		mode->Clock <= max[i] * (1+SYNC_TOLERANCE)) {
-		good = TRUE;
-		break;
-	    }
-	}
-	if (!good)
-	    mode->status = MODE_CLOCK_RANGE;
+        Bool good = FALSE;
+
+        for (i = 0; i < n_ranges; i++) {
+            if (mode->Clock >= min[i] * (1 - SYNC_TOLERANCE) &&
+                mode->Clock <= max[i] * (1 + SYNC_TOLERANCE)) {
+                good = TRUE;
+                break;
+            }
+        }
+        if (!good)
+            mode->status = MODE_CLOCK_RANGE;
     }
 }
 
@@ -518,25 +532,24 @@ xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList)
     DisplayModePtr mode;
 
     if (pScrn->display->modes[0] == NULL)
-	return;
+        return;
 
     for (mode = modeList; mode != NULL; mode = mode->next) {
-	int i;
-	Bool good = FALSE;
-
-	for (i = 0; pScrn->display->modes[i] != NULL; i++) {
-	    if (strncmp(pScrn->display->modes[i], mode->name,
-			strlen(pScrn->display->modes[i])) == 0) {
-		good = TRUE;
-		break;
-	    }
-	}
-	if (!good)
-	    mode->status = MODE_BAD;
+        int i;
+        Bool good = FALSE;
+
+        for (i = 0; pScrn->display->modes[i] != NULL; i++) {
+            if (strncmp(pScrn->display->modes[i], mode->name,
+                        strlen(pScrn->display->modes[i])) == 0) {
+                good = TRUE;
+                break;
+            }
+        }
+        if (!good)
+            mode->status = MODE_BAD;
     }
 }
 
-
 /**
  * Marks as bad any modes exceeding the given bandwidth.
  *
@@ -546,25 +559,25 @@ xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList)
  */
 void
 xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList,
-			   unsigned int bandwidth, int depth)
+                           unsigned int bandwidth, int depth)
 {
     DisplayModePtr mode;
 
     for (mode = modeList; mode != NULL; mode = mode->next) {
-	if (xf86ModeBandwidth(mode, depth) > bandwidth)
-	    mode->status = MODE_BANDWIDTH;
+        if (xf86ModeBandwidth(mode, depth) > bandwidth)
+            mode->status = MODE_BANDWIDTH;
     }
 }
 
 Bool
-xf86ModeIsReduced(const DisplayModeRec *mode)
+xf86ModeIsReduced(const DisplayModeRec * mode)
 {
     if ((((mode->HDisplay * 5 / 4) & ~0x07) > mode->HTotal) &&
         ((mode->HTotal - mode->HDisplay) == 160) &&
-	((mode->HSyncEnd - mode->HDisplay) == 80) &&
-	((mode->HSyncEnd - mode->HSyncStart) == 32) &&
-	((mode->VSyncStart - mode->VDisplay) == 3))
-	return TRUE;
+        ((mode->HSyncEnd - mode->HDisplay) == 80) &&
+        ((mode->HSyncEnd - mode->HSyncStart) == 32) &&
+        ((mode->VSyncStart - mode->VDisplay) == 3))
+        return TRUE;
     return FALSE;
 }
 
@@ -577,8 +590,8 @@ void
 xf86ValidateModesReducedBlanking(ScrnInfoPtr pScrn, DisplayModePtr modeList)
 {
     for (; modeList != NULL; modeList = modeList->next)
-	if (xf86ModeIsReduced(modeList))
-	    modeList->status = MODE_NO_REDUCED;
+        if (xf86ModeIsReduced(modeList))
+            modeList->status = MODE_NO_REDUCED;
 }
 
 /**
@@ -589,31 +602,32 @@ xf86ValidateModesReducedBlanking(ScrnInfoPtr pScrn, DisplayModePtr modeList)
  *	  printed.
  */
 void
-xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList,
-			  Bool verbose)
+xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr * modeList,
+                      Bool verbose)
 {
     DisplayModePtr mode;
 
     for (mode = *modeList; mode != NULL;) {
-	DisplayModePtr next = mode->next, first = *modeList;
-
-	if (mode->status != MODE_OK) {
-	    if (verbose) {
-		const char *type = "";
-		if (mode->type & M_T_BUILTIN)
-		    type = "built-in ";
-		else if (mode->type & M_T_DEFAULT)
-		    type = "default ";
-		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-			   "Not using %smode \"%s\" (%s)\n", type, mode->name,
-			   xf86ModeStatusToString(mode->status));
-	    }
-	    xf86DeleteMode(modeList, mode);
-	}
-
-	if (next == first)
-	    break;
-	mode = next;
+        DisplayModePtr next = mode->next, first = *modeList;
+
+        if (mode->status != MODE_OK) {
+            if (verbose) {
+                const char *type = "";
+
+                if (mode->type & M_T_BUILTIN)
+                    type = "built-in ";
+                else if (mode->type & M_T_DEFAULT)
+                    type = "default ";
+                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                           "Not using %smode \"%s\" (%s)\n", type, mode->name,
+                           xf86ModeStatusToString(mode->status));
+            }
+            xf86DeleteMode(modeList, mode);
+        }
+
+        if (next == first)
+            break;
+        mode = next;
     }
 }
 
@@ -626,16 +640,16 @@ DisplayModePtr
 xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new)
 {
     if (modes == NULL)
-	return new;
+        return new;
 
     if (new) {
-	DisplayModePtr mode = modes;
+        DisplayModePtr mode = modes;
 
-	while (mode->next)
-	    mode = mode->next;
+        while (mode->next)
+            mode = mode->next;
 
-	mode->next = new;
-	new->prev = mode;
+        mode->next = new;
+        new->prev = mode;
     }
 
     return modes;
@@ -645,42 +659,40 @@ xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new)
  * Build a mode list from a list of config file modes
  */
 static DisplayModePtr
-xf86GetConfigModes (XF86ConfModeLinePtr conf_mode)
+xf86GetConfigModes(XF86ConfModeLinePtr conf_mode)
 {
-    DisplayModePtr  head = NULL, prev = NULL, mode;
-    
-    for (; conf_mode; conf_mode = (XF86ConfModeLinePtr) conf_mode->list.next)
-    {
+    DisplayModePtr head = NULL, prev = NULL, mode;
+
+    for (; conf_mode; conf_mode = (XF86ConfModeLinePtr) conf_mode->list.next) {
         mode = calloc(1, sizeof(DisplayModeRec));
-	if (!mode)
-	    continue;
-        mode->name       = xstrdup(conf_mode->ml_identifier);
-	if (!mode->name)
-	{
-	    free(mode);
-	    continue;
-	}
-	mode->type       = 0;
-        mode->Clock      = conf_mode->ml_clock;
-        mode->HDisplay   = conf_mode->ml_hdisplay;
+        if (!mode)
+            continue;
+        mode->name = xstrdup(conf_mode->ml_identifier);
+        if (!mode->name) {
+            free(mode);
+            continue;
+        }
+        mode->type = 0;
+        mode->Clock = conf_mode->ml_clock;
+        mode->HDisplay = conf_mode->ml_hdisplay;
         mode->HSyncStart = conf_mode->ml_hsyncstart;
-        mode->HSyncEnd   = conf_mode->ml_hsyncend;
-        mode->HTotal     = conf_mode->ml_htotal;
-        mode->VDisplay   = conf_mode->ml_vdisplay;
+        mode->HSyncEnd = conf_mode->ml_hsyncend;
+        mode->HTotal = conf_mode->ml_htotal;
+        mode->VDisplay = conf_mode->ml_vdisplay;
         mode->VSyncStart = conf_mode->ml_vsyncstart;
-        mode->VSyncEnd   = conf_mode->ml_vsyncend;
-        mode->VTotal     = conf_mode->ml_vtotal;
-        mode->Flags      = conf_mode->ml_flags;
-        mode->HSkew      = conf_mode->ml_hskew;
-        mode->VScan      = conf_mode->ml_vscan;
+        mode->VSyncEnd = conf_mode->ml_vsyncend;
+        mode->VTotal = conf_mode->ml_vtotal;
+        mode->Flags = conf_mode->ml_flags;
+        mode->HSkew = conf_mode->ml_hskew;
+        mode->VScan = conf_mode->ml_vscan;
 
         mode->prev = prev;
-	mode->next = NULL;
-	if (prev)
-	    prev->next = mode;
-	else
-	    head = mode;
-	prev = mode;
+        mode->next = NULL;
+        if (prev)
+            prev->next = mode;
+        else
+            head = mode;
+        prev = mode;
     }
     return head;
 }
@@ -689,49 +701,47 @@ xf86GetConfigModes (XF86ConfModeLinePtr conf_mode)
  * Build a mode list from a monitor configuration
  */
 DisplayModePtr
-xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor)
+xf86GetMonitorModes(ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor)
 {
-    DisplayModePtr	    modes = NULL;
-    XF86ConfModesLinkPtr    modes_link;
-    
+    DisplayModePtr modes = NULL;
+    XF86ConfModesLinkPtr modes_link;
+
     if (!conf_monitor)
-	return NULL;
+        return NULL;
 
     /*
      * first we collect the mode lines from the UseModes directive
      */
-    for (modes_link = conf_monitor->mon_modes_sect_lst; 
-	 modes_link; 
-	 modes_link = modes_link->list.next)
-    {
-	/* If this modes link hasn't been resolved, go look it up now */
-	if (!modes_link->ml_modes)
-	    modes_link->ml_modes = xf86findModes (modes_link->ml_modes_str, 
-						  xf86configptr->conf_modes_lst);
-	if (modes_link->ml_modes)
-	    modes = xf86ModesAdd (modes,
-				  xf86GetConfigModes (modes_link->ml_modes->mon_modeline_lst));
+    for (modes_link = conf_monitor->mon_modes_sect_lst;
+         modes_link; modes_link = modes_link->list.next) {
+        /* If this modes link hasn't been resolved, go look it up now */
+        if (!modes_link->ml_modes)
+            modes_link->ml_modes = xf86findModes(modes_link->ml_modes_str,
+                                                 xf86configptr->conf_modes_lst);
+        if (modes_link->ml_modes)
+            modes = xf86ModesAdd(modes,
+                                 xf86GetConfigModes(modes_link->ml_modes->
+                                                    mon_modeline_lst));
     }
 
-    return xf86ModesAdd (modes,
-			 xf86GetConfigModes (conf_monitor->mon_modeline_lst));
+    return xf86ModesAdd(modes,
+                        xf86GetConfigModes(conf_monitor->mon_modeline_lst));
 }
 
 /**
  * Build a mode list containing all of the default modes
  */
 DisplayModePtr
-xf86GetDefaultModes (void)
+xf86GetDefaultModes(void)
 {
-    DisplayModePtr  head = NULL, mode;
-    int		    i;
-
-    for (i = 0; i < xf86NumDefaultModes; i++)
-    {
-	const DisplayModeRec	*defMode = &xf86DefaultModes[i];
-	
-	mode = xf86DuplicateMode(defMode);
-	head = xf86ModesAdd(head, mode);
+    DisplayModePtr head = NULL, mode;
+    int i;
+
+    for (i = 0; i < xf86NumDefaultModes; i++) {
+        const DisplayModeRec *defMode = &xf86DefaultModes[i];
+
+        mode = xf86DuplicateMode(defMode);
+        head = xf86ModesAdd(head, mode);
     }
     return head;
 }
@@ -752,19 +762,19 @@ xf86PruneDuplicateModes(DisplayModePtr modes)
 {
     DisplayModePtr m, n, o;
 
-top:
+ top:
     for (m = modes; m; m = m->next) {
-	for (n = m->next; n; n = o) {
-	    o = n->next;
-	    if (xf86ModesEqual(m, n)) {
-		if (n->type & M_T_PREFERRED) {
-		    xf86DeleteMode(&modes, m);
-		    goto top;
-		}
-		else
-		    xf86DeleteMode(&modes, n);
-	    }
-	}
+        for (n = m->next; n; n = o) {
+            o = n->next;
+            if (xf86ModesEqual(m, n)) {
+                if (n->type & M_T_PREFERRED) {
+                    xf86DeleteMode(&modes, m);
+                    goto top;
+                }
+                else
+                    xf86DeleteMode(&modes, n);
+            }
+        }
     }
 
     return modes;
diff --git a/xorg-server/hw/xfree86/modes/xf86Modes.h b/xorg-server/hw/xfree86/modes/xf86Modes.h
index 89ec0d81d..aec7688c4 100644
--- a/xorg-server/hw/xfree86/modes/xf86Modes.h
+++ b/xorg-server/hw/xfree86/modes/xf86Modes.h
@@ -40,74 +40,78 @@
 #include "xf86Rename.h"
 #endif
 
-extern _X_EXPORT double xf86ModeHSync(const DisplayModeRec *mode);
-extern _X_EXPORT double xf86ModeVRefresh(const DisplayModeRec *mode);
+extern _X_EXPORT double xf86ModeHSync(const DisplayModeRec * mode);
+extern _X_EXPORT double xf86ModeVRefresh(const DisplayModeRec * mode);
 extern _X_EXPORT unsigned int xf86ModeBandwidth(DisplayModePtr mode, int depth);
 
 extern _X_EXPORT int
-xf86ModeWidth (const DisplayModeRec *mode, Rotation rotation);
-    
+ xf86ModeWidth(const DisplayModeRec * mode, Rotation rotation);
+
 extern _X_EXPORT int
-xf86ModeHeight (const DisplayModeRec *mode, Rotation rotation);
+ xf86ModeHeight(const DisplayModeRec * mode, Rotation rotation);
 
-extern _X_EXPORT DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode);
+extern _X_EXPORT DisplayModePtr xf86DuplicateMode(const DisplayModeRec * pMode);
 extern _X_EXPORT DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn,
-				       DisplayModePtr modeList);
+                                                   DisplayModePtr modeList);
 extern _X_EXPORT void xf86SetModeDefaultName(DisplayModePtr mode);
 extern _X_EXPORT void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags);
-extern _X_EXPORT Bool xf86ModesEqual(const DisplayModeRec *pMode1,
-		    const DisplayModeRec *pMode2);
-extern _X_EXPORT void xf86PrintModeline(int scrnIndex,DisplayModePtr mode);
-extern _X_EXPORT DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new);
+extern _X_EXPORT Bool xf86ModesEqual(const DisplayModeRec * pMode1,
+                                     const DisplayModeRec * pMode2);
+extern _X_EXPORT void xf86PrintModeline(int scrnIndex, DisplayModePtr mode);
+extern _X_EXPORT DisplayModePtr xf86ModesAdd(DisplayModePtr modes,
+                                             DisplayModePtr new);
 
 extern _X_EXPORT DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC);
-extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh,
-			   Bool Reduced, Bool Interlaced);
-extern _X_EXPORT DisplayModePtr xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins);
+extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay,
+                                            float VRefresh, Bool Reduced,
+                                            Bool Interlaced);
+extern _X_EXPORT DisplayModePtr xf86GTFMode(int h_pixels, int v_lines,
+                                            float freq, int interlaced,
+                                            int margins);
 
 extern _X_EXPORT Bool
-xf86ModeIsReduced(const DisplayModeRec *mode);
+ xf86ModeIsReduced(const DisplayModeRec * mode);
 
 extern _X_EXPORT void
-xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList,
-		       int flags);
+ xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, int flags);
 
 extern _X_EXPORT void
+
 xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList,
-			int *min, int *max, int n_ranges);
+                        int *min, int *max, int n_ranges);
 
 extern _X_EXPORT void
+
 xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList,
-		      int maxX, int maxY, int maxPitch);
+                      int maxX, int maxY, int maxPitch);
 
 extern _X_EXPORT void
-xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList,
-		      MonPtr mon);
+ xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList, MonPtr mon);
 
 extern _X_EXPORT void
+
 xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList,
-			   unsigned int bandwidth, int depth);
+                           unsigned int bandwidth, int depth);
 
 extern _X_EXPORT void
-xf86ValidateModesReducedBlanking(ScrnInfoPtr pScrn, DisplayModePtr modeList);
+ xf86ValidateModesReducedBlanking(ScrnInfoPtr pScrn, DisplayModePtr modeList);
 
 extern _X_EXPORT void
-xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList,
-		      Bool verbose);
 
-extern _X_EXPORT DisplayModePtr
-xf86PruneDuplicateModes(DisplayModePtr modes);
+xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr * modeList,
+                      Bool verbose);
+
+extern _X_EXPORT DisplayModePtr xf86PruneDuplicateModes(DisplayModePtr modes);
 
 extern _X_EXPORT void
-xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList);
+ xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList);
 
 extern _X_EXPORT DisplayModePtr
-xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor);
+xf86GetMonitorModes(ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor);
 
-extern _X_EXPORT DisplayModePtr
-xf86GetDefaultModes (void);
+extern _X_EXPORT DisplayModePtr xf86GetDefaultModes(void);
 
 extern _X_EXPORT void
-xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC);
+ xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC);
 
-#endif /* _XF86MODES_H_ */
+#endif                          /* _XF86MODES_H_ */
diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index d5031a2f1..a773c34c6 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -43,16 +43,16 @@
 #include "xf86RandR12.h"
 
 typedef struct _xf86RandR12Info {
-    int				    virtualX;
-    int				    virtualY;
-    int				    mmWidth;
-    int				    mmHeight;
-    int				    maxX;
-    int				    maxY;
-    int				    pointerX;
-    int				    pointerY;
-    Rotation			    rotation; /* current mode */
-    Rotation                        supported_rotations; /* driver supported */
+    int virtualX;
+    int virtualY;
+    int mmWidth;
+    int mmHeight;
+    int maxX;
+    int maxY;
+    int pointerX;
+    int pointerY;
+    Rotation rotation;          /* current mode */
+    Rotation supported_rotations;       /* driver supported */
 
     /* Used to wrap EnterVT so we can re-probe the outputs when a laptop unsuspends
      * (actually, any time that we switch back into our VT).
@@ -63,106 +63,117 @@ typedef struct _xf86RandR12Info {
 } XF86RandRInfoRec, *XF86RandRInfoPtr;
 
 #ifdef RANDR_12_INTERFACE
-static Bool xf86RandR12Init12 (ScreenPtr pScreen);
-static Bool xf86RandR12CreateScreenResources12 (ScreenPtr pScreen);
+static Bool xf86RandR12Init12(ScreenPtr pScreen);
+static Bool xf86RandR12CreateScreenResources12(ScreenPtr pScreen);
 #endif
 
 static int xf86RandR12Generation;
 
 static DevPrivateKeyRec xf86RandR12KeyRec;
 static DevPrivateKey xf86RandR12Key;
+
 #define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \
     dixLookupPrivate(&(p)->devPrivates, xf86RandR12Key))
 
-
 static int
-xf86RandR12ModeRefresh (DisplayModePtr mode)
+xf86RandR12ModeRefresh(DisplayModePtr mode)
 {
     if (mode->VRefresh)
-	return (int) (mode->VRefresh + 0.5);
+        return (int) (mode->VRefresh + 0.5);
     else
-	return (int) (mode->Clock * 1000.0 / mode->HTotal / mode->VTotal + 0.5);
+        return (int) (mode->Clock * 1000.0 / mode->HTotal / mode->VTotal + 0.5);
 }
 
 /* Adapt panning area; return TRUE if panning area was valid without adaption */
 static int
-xf86RandR13VerifyPanningArea (xf86CrtcPtr crtc, int screenWidth, int screenHeight)
+xf86RandR13VerifyPanningArea(xf86CrtcPtr crtc, int screenWidth,
+                             int screenHeight)
 {
     int ret = TRUE;
 
     if (crtc->version < 2)
-	return FALSE;
+        return FALSE;
 
     if (crtc->panningTotalArea.x2 <= crtc->panningTotalArea.x1) {
-	/* Panning in X is disabled */
-	if (crtc->panningTotalArea.x1 || crtc->panningTotalArea.x2)
-	    /* Illegal configuration -> fail/disable */
-	    ret = FALSE;
-	crtc->panningTotalArea.x1    = crtc->panningTotalArea.x2    = 0;
-	crtc->panningTrackingArea.x1 = crtc->panningTrackingArea.x2 = 0;
-	crtc->panningBorder[0]       = crtc->panningBorder[2]       = 0;
-    } else {
-	/* Panning in X is enabled */
-	if (crtc->panningTotalArea.x1 < 0) {
-	    /* Panning region outside screen -> move inside */
-	    crtc->panningTotalArea.x2 -= crtc->panningTotalArea.x1;
-	    crtc->panningTotalArea.x1 = 0;
-	    ret = FALSE;
-	}
-	if (crtc->panningTotalArea.x2 < crtc->panningTotalArea.x1 + crtc->mode.HDisplay) {
-	    /* Panning region smaller than displayed area -> crop to displayed area */
-	    crtc->panningTotalArea.x2 = crtc->panningTotalArea.x1 + crtc->mode.HDisplay;
-	    ret = FALSE;
-	}
-	if (crtc->panningTotalArea.x2 > screenWidth) {
-	    /* Panning region larger than screen -> move inside, then crop to screen */
-	    crtc->panningTotalArea.x1 -= crtc->panningTotalArea.x2 - screenWidth;
-	    crtc->panningTotalArea.x2 = screenWidth;
-	    ret = FALSE;
-	    if (crtc->panningTotalArea.x1 < 0)
-		crtc->panningTotalArea.x1 = 0;
-	}
-	if (crtc->panningBorder[0] + crtc->panningBorder[2] > crtc->mode.HDisplay) {
-	    /* Borders too large -> set to 0 */
-	    crtc->panningBorder[0] = crtc->panningBorder[2] = 0;
-	    ret = FALSE;
-	}
+        /* Panning in X is disabled */
+        if (crtc->panningTotalArea.x1 || crtc->panningTotalArea.x2)
+            /* Illegal configuration -> fail/disable */
+            ret = FALSE;
+        crtc->panningTotalArea.x1 = crtc->panningTotalArea.x2 = 0;
+        crtc->panningTrackingArea.x1 = crtc->panningTrackingArea.x2 = 0;
+        crtc->panningBorder[0] = crtc->panningBorder[2] = 0;
+    }
+    else {
+        /* Panning in X is enabled */
+        if (crtc->panningTotalArea.x1 < 0) {
+            /* Panning region outside screen -> move inside */
+            crtc->panningTotalArea.x2 -= crtc->panningTotalArea.x1;
+            crtc->panningTotalArea.x1 = 0;
+            ret = FALSE;
+        }
+        if (crtc->panningTotalArea.x2 <
+            crtc->panningTotalArea.x1 + crtc->mode.HDisplay) {
+            /* Panning region smaller than displayed area -> crop to displayed area */
+            crtc->panningTotalArea.x2 =
+                crtc->panningTotalArea.x1 + crtc->mode.HDisplay;
+            ret = FALSE;
+        }
+        if (crtc->panningTotalArea.x2 > screenWidth) {
+            /* Panning region larger than screen -> move inside, then crop to screen */
+            crtc->panningTotalArea.x1 -=
+                crtc->panningTotalArea.x2 - screenWidth;
+            crtc->panningTotalArea.x2 = screenWidth;
+            ret = FALSE;
+            if (crtc->panningTotalArea.x1 < 0)
+                crtc->panningTotalArea.x1 = 0;
+        }
+        if (crtc->panningBorder[0] + crtc->panningBorder[2] >
+            crtc->mode.HDisplay) {
+            /* Borders too large -> set to 0 */
+            crtc->panningBorder[0] = crtc->panningBorder[2] = 0;
+            ret = FALSE;
+        }
     }
 
     if (crtc->panningTotalArea.y2 <= crtc->panningTotalArea.y1) {
-	/* Panning in Y is disabled */
-	if (crtc->panningTotalArea.y1 || crtc->panningTotalArea.y2)
-	    /* Illegal configuration -> fail/disable */
-	    ret = FALSE;
-	crtc->panningTotalArea.y1    = crtc->panningTotalArea.y2    = 0;
-	crtc->panningTrackingArea.y1 = crtc->panningTrackingArea.y2 = 0;
-	crtc->panningBorder[1]       = crtc->panningBorder[3]       = 0;
-    } else {
-	/* Panning in Y is enabled */
-	if (crtc->panningTotalArea.y1 < 0) {
-	    /* Panning region outside screen -> move inside */
-	    crtc->panningTotalArea.y2 -= crtc->panningTotalArea.y1;
-	    crtc->panningTotalArea.y1 = 0;
-	    ret = FALSE;
-	}
-	if (crtc->panningTotalArea.y2 < crtc->panningTotalArea.y1 + crtc->mode.VDisplay) {
-	    /* Panning region smaller than displayed area -> crop to displayed area */
-	    crtc->panningTotalArea.y2 = crtc->panningTotalArea.y1 + crtc->mode.VDisplay;
-	    ret = FALSE;
-	}
-	if (crtc->panningTotalArea.y2 > screenHeight) {
-	    /* Panning region larger than screen -> move inside, then crop to screen */
-	    crtc->panningTotalArea.y1 -= crtc->panningTotalArea.y2 - screenHeight;
-	    crtc->panningTotalArea.y2 = screenHeight;
-	    ret = FALSE;
-	    if (crtc->panningTotalArea.y1 < 0)
-		crtc->panningTotalArea.y1 = 0;
-	}
-	if (crtc->panningBorder[1] + crtc->panningBorder[3] > crtc->mode.VDisplay) {
-	    /* Borders too large -> set to 0 */
-	    crtc->panningBorder[1] = crtc->panningBorder[3] = 0;
-	    ret = FALSE;
-	}
+        /* Panning in Y is disabled */
+        if (crtc->panningTotalArea.y1 || crtc->panningTotalArea.y2)
+            /* Illegal configuration -> fail/disable */
+            ret = FALSE;
+        crtc->panningTotalArea.y1 = crtc->panningTotalArea.y2 = 0;
+        crtc->panningTrackingArea.y1 = crtc->panningTrackingArea.y2 = 0;
+        crtc->panningBorder[1] = crtc->panningBorder[3] = 0;
+    }
+    else {
+        /* Panning in Y is enabled */
+        if (crtc->panningTotalArea.y1 < 0) {
+            /* Panning region outside screen -> move inside */
+            crtc->panningTotalArea.y2 -= crtc->panningTotalArea.y1;
+            crtc->panningTotalArea.y1 = 0;
+            ret = FALSE;
+        }
+        if (crtc->panningTotalArea.y2 <
+            crtc->panningTotalArea.y1 + crtc->mode.VDisplay) {
+            /* Panning region smaller than displayed area -> crop to displayed area */
+            crtc->panningTotalArea.y2 =
+                crtc->panningTotalArea.y1 + crtc->mode.VDisplay;
+            ret = FALSE;
+        }
+        if (crtc->panningTotalArea.y2 > screenHeight) {
+            /* Panning region larger than screen -> move inside, then crop to screen */
+            crtc->panningTotalArea.y1 -=
+                crtc->panningTotalArea.y2 - screenHeight;
+            crtc->panningTotalArea.y2 = screenHeight;
+            ret = FALSE;
+            if (crtc->panningTotalArea.y1 < 0)
+                crtc->panningTotalArea.y1 = 0;
+        }
+        if (crtc->panningBorder[1] + crtc->panningBorder[3] >
+            crtc->mode.VDisplay) {
+            /* Borders too large -> set to 0 */
+            crtc->panningBorder[1] = crtc->panningBorder[3] = 0;
+            ret = FALSE;
+        }
     }
 
     return ret;
@@ -179,232 +190,232 @@ xf86RandR13VerifyPanningArea (xf86CrtcPtr crtc, int screenWidth, int screenHeigh
  */
 
 static void
-xf86ComputeCrtcPan (Bool transform_in_use,
-		    struct pixman_f_transform *m,
-		    double screen_x, double screen_y,
-		    double crtc_x, double crtc_y,
-		    int old_pan_x, int old_pan_y,
-		    int *new_pan_x, int *new_pan_y)
+xf86ComputeCrtcPan(Bool transform_in_use,
+                   struct pixman_f_transform *m,
+                   double screen_x, double screen_y,
+                   double crtc_x, double crtc_y,
+                   int old_pan_x, int old_pan_y, int *new_pan_x, int *new_pan_y)
 {
     if (transform_in_use) {
-	/*
-	 * Given the current transform, M, the current position
-	 * on the Screen, S, and the desired position on the CRTC,
-	 * C, compute a translation, T, such that:
-	 *
-	 * M T S = C
-	 *
-	 * where T is of the form
-	 *
-	 * | 1 0 dx |
-	 * | 0 1 dy |
-	 * | 0 0 1  |
-	 *
-	 * M T S =
-	 *   | M00 Sx + M01 Sy + M00 dx + M01 dy + M02 |   | Cx F |
-	 *   | M10 Sx + M11 Sy + M10 dx + M11 dy + M12 | = | Cy F |
-	 *   | M20 Sx + M21 Sy + M20 dx + M21 dy + M22 |   |  F   |
-	 *
-	 * R = M S
-	 *
-	 *   Cx F = M00 dx + M01 dy + R0
-	 *   Cy F = M10 dx + M11 dy + R1
-	 *      F = M20 dx + M21 dy + R2
-	 *
-	 * Zero out dx, then dy
-	 *
-	 * F (Cx M10 - Cy M00) =
-	 *	    (M10 M01 - M00 M11) dy + M10 R0 - M00 R1
-	 * F (M10 - Cy M20) =
-	 *	    (M10 M21 - M20 M11) dy + M10 R2 - M20 R1
-	 *
-	 * F (Cx M11 - Cy M01) =
-	 *	    (M11 M00 - M01 M10) dx + M11 R0 - M01 R1
-	 * F (M11 - Cy M21) =
-	 *	    (M11 M20 - M21 M10) dx + M11 R2 - M21 R1
-	 *
-	 * Make some temporaries
-	 *
-	 * T = | Cx M10 - Cy M00 |
-	 *     | Cx M11 - Cy M01 |
-	 *
-	 * U = | M10 M01 - M00 M11 |
-	 *     | M11 M00 - M01 M10 |
-	 *
-	 * Q = | M10 R0 - M00 R1 |
-	 *     | M11 R0 - M01 R1 |
-	 *
-	 * P = | M10 - Cy M20 |
-	 *     | M11 - Cy M21 |
-	 *
-	 * W = | M10 M21 - M20 M11 |
-	 *     | M11 M20 - M21 M10 |
-	 *
-	 * V = | M10 R2 - M20 R1 |
-	 *	   | M11 R2 - M21 R1 |
-	 *
-	 * Rewrite:
-	 *
-	 * F T0 = U0 dy + Q0
-	 * F P0 = W0 dy + V0
-	 * F T1 = U1 dx + Q1
-	 * F P1 = W1 dx + V1
-	 *
-	 * Solve for F (two ways)
-	 *
-	 * F (W0 T0 - U0 P0)  = W0 Q0 - U0 V0
-	 *
-	 *     W0 Q0 - U0 V0
-	 * F = -------------
-	 *     W0 T0 - U0 P0
-	 *
-	 * F (W1 T1 - U1 P1) = W1 Q1 - U1 V1
-	 *
-	 *     W1 Q1 - U1 V1
-	 * F = -------------
-	 *     W1 T1 - U1 P1
-	 *
-	 * We'll use which ever solution works (denominator != 0)
-	 *
-	 * Finally, solve for dx and dy:
-	 *
-	 * dx = (F T1 - Q1) / U1
-	 * dx = (F P1 - V1) / W1
-	 *
-	 * dy = (F T0 - Q0) / U0
-	 * dy = (F P0 - V0) / W0
-	 */
-	double			    r[3];
-	double			    q[2], u[2], t[2], v[2], w[2], p[2];
-	double			    f;
-	struct pict_f_vector	    d;
-	int			    i;
-
-	/* Get the un-normalized crtc coordinates again */
-	for (i = 0; i < 3; i++)
-	    r[i] = m->m[i][0] * screen_x + m->m[i][1] * screen_y + m->m[i][2];
-
-	/* Combine values into temporaries */
-	for (i = 0; i < 2; i++) {
-	    q[i] = m->m[1][i] * r[0] - m->m[0][i] * r[1];
-	    u[i] = m->m[1][i] * m->m[0][1-i] - m->m[0][i] * m->m[1][1-i];
-	    t[i] = m->m[1][i] * crtc_x - m->m[0][i] * crtc_y;
-
-	    v[i] = m->m[1][i] * r[2] - m->m[2][i] * r[1];
-	    w[i] = m->m[1][i] * m->m[2][1-i] - m->m[2][i] * m->m[1][1-i];
-	    p[i] = m->m[1][i] - m->m[2][i] * crtc_y;
-	}
-
-	/* Find a way to compute f */
-	f = 0;
-	for (i = 0; i < 2; i++) {
-	    double a = w[i] * q[i] - u[i] * v[i];
-	    double b = w[i] * t[i] - u[i] * p[i];
-	    if (b != 0) {
-		f = a/b;
-		break;
-	    }
-	}
-
-	/* Solve for the resulting transform vector */
-	for (i = 0; i < 2; i++) {
-	    if (u[i])
-		d.v[1-i] = (t[i] * f - q[i]) / u[i];
-	    else if (w[1])
-		d.v[1-i] = (p[i] * f - v[i]) / w[i];
-	    else
-		d.v[1-i] = 0;
-	}
-	*new_pan_x = old_pan_x - floor (d.v[0] + 0.5);
-	*new_pan_y = old_pan_y - floor (d.v[1] + 0.5);
-    } else {
-	*new_pan_x = screen_x - crtc_x;
-	*new_pan_y = screen_y - crtc_y;
+        /*
+         * Given the current transform, M, the current position
+         * on the Screen, S, and the desired position on the CRTC,
+         * C, compute a translation, T, such that:
+         *
+         * M T S = C
+         *
+         * where T is of the form
+         *
+         * | 1 0 dx |
+         * | 0 1 dy |
+         * | 0 0 1  |
+         *
+         * M T S =
+         *   | M00 Sx + M01 Sy + M00 dx + M01 dy + M02 |   | Cx F |
+         *   | M10 Sx + M11 Sy + M10 dx + M11 dy + M12 | = | Cy F |
+         *   | M20 Sx + M21 Sy + M20 dx + M21 dy + M22 |   |  F   |
+         *
+         * R = M S
+         *
+         *   Cx F = M00 dx + M01 dy + R0
+         *   Cy F = M10 dx + M11 dy + R1
+         *      F = M20 dx + M21 dy + R2
+         *
+         * Zero out dx, then dy
+         *
+         * F (Cx M10 - Cy M00) =
+         *          (M10 M01 - M00 M11) dy + M10 R0 - M00 R1
+         * F (M10 - Cy M20) =
+         *          (M10 M21 - M20 M11) dy + M10 R2 - M20 R1
+         *
+         * F (Cx M11 - Cy M01) =
+         *          (M11 M00 - M01 M10) dx + M11 R0 - M01 R1
+         * F (M11 - Cy M21) =
+         *          (M11 M20 - M21 M10) dx + M11 R2 - M21 R1
+         *
+         * Make some temporaries
+         *
+         * T = | Cx M10 - Cy M00 |
+         *     | Cx M11 - Cy M01 |
+         *
+         * U = | M10 M01 - M00 M11 |
+         *     | M11 M00 - M01 M10 |
+         *
+         * Q = | M10 R0 - M00 R1 |
+         *     | M11 R0 - M01 R1 |
+         *
+         * P = | M10 - Cy M20 |
+         *     | M11 - Cy M21 |
+         *
+         * W = | M10 M21 - M20 M11 |
+         *     | M11 M20 - M21 M10 |
+         *
+         * V = | M10 R2 - M20 R1 |
+         *         | M11 R2 - M21 R1 |
+         *
+         * Rewrite:
+         *
+         * F T0 = U0 dy + Q0
+         * F P0 = W0 dy + V0
+         * F T1 = U1 dx + Q1
+         * F P1 = W1 dx + V1
+         *
+         * Solve for F (two ways)
+         *
+         * F (W0 T0 - U0 P0)  = W0 Q0 - U0 V0
+         *
+         *     W0 Q0 - U0 V0
+         * F = -------------
+         *     W0 T0 - U0 P0
+         *
+         * F (W1 T1 - U1 P1) = W1 Q1 - U1 V1
+         *
+         *     W1 Q1 - U1 V1
+         * F = -------------
+         *     W1 T1 - U1 P1
+         *
+         * We'll use which ever solution works (denominator != 0)
+         *
+         * Finally, solve for dx and dy:
+         *
+         * dx = (F T1 - Q1) / U1
+         * dx = (F P1 - V1) / W1
+         *
+         * dy = (F T0 - Q0) / U0
+         * dy = (F P0 - V0) / W0
+         */
+        double r[3];
+        double q[2], u[2], t[2], v[2], w[2], p[2];
+        double f;
+        struct pict_f_vector d;
+        int i;
+
+        /* Get the un-normalized crtc coordinates again */
+        for (i = 0; i < 3; i++)
+            r[i] = m->m[i][0] * screen_x + m->m[i][1] * screen_y + m->m[i][2];
+
+        /* Combine values into temporaries */
+        for (i = 0; i < 2; i++) {
+            q[i] = m->m[1][i] * r[0] - m->m[0][i] * r[1];
+            u[i] = m->m[1][i] * m->m[0][1 - i] - m->m[0][i] * m->m[1][1 - i];
+            t[i] = m->m[1][i] * crtc_x - m->m[0][i] * crtc_y;
+
+            v[i] = m->m[1][i] * r[2] - m->m[2][i] * r[1];
+            w[i] = m->m[1][i] * m->m[2][1 - i] - m->m[2][i] * m->m[1][1 - i];
+            p[i] = m->m[1][i] - m->m[2][i] * crtc_y;
+        }
+
+        /* Find a way to compute f */
+        f = 0;
+        for (i = 0; i < 2; i++) {
+            double a = w[i] * q[i] - u[i] * v[i];
+            double b = w[i] * t[i] - u[i] * p[i];
+
+            if (b != 0) {
+                f = a / b;
+                break;
+            }
+        }
+
+        /* Solve for the resulting transform vector */
+        for (i = 0; i < 2; i++) {
+            if (u[i])
+                d.v[1 - i] = (t[i] * f - q[i]) / u[i];
+            else if (w[1])
+                d.v[1 - i] = (p[i] * f - v[i]) / w[i];
+            else
+                d.v[1 - i] = 0;
+        }
+        *new_pan_x = old_pan_x - floor(d.v[0] + 0.5);
+        *new_pan_y = old_pan_y - floor(d.v[1] + 0.5);
+    }
+    else {
+        *new_pan_x = screen_x - crtc_x;
+        *new_pan_y = screen_y - crtc_y;
     }
 }
 
 static void
-xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
+xf86RandR13Pan(xf86CrtcPtr crtc, int x, int y)
 {
     int newX, newY;
     int width, height;
     Bool panned = FALSE;
 
     if (crtc->version < 2)
-	return;
+        return;
 
-    if (! crtc->enabled						||
-	(crtc->panningTotalArea.x2 <= crtc->panningTotalArea.x1	&&
-	 crtc->panningTotalArea.y2 <= crtc->panningTotalArea.y1))
-	return;
+    if (!crtc->enabled ||
+        (crtc->panningTotalArea.x2 <= crtc->panningTotalArea.x1 &&
+         crtc->panningTotalArea.y2 <= crtc->panningTotalArea.y1))
+        return;
 
-    newX   = crtc->x;
-    newY   = crtc->y;
-    width  = crtc->mode.HDisplay;
+    newX = crtc->x;
+    newY = crtc->y;
+    width = crtc->mode.HDisplay;
     height = crtc->mode.VDisplay;
 
     if ((crtc->panningTrackingArea.x2 <= crtc->panningTrackingArea.x1 ||
-	 (x >= crtc->panningTrackingArea.x1 && x < crtc->panningTrackingArea.x2)) &&
-	(crtc->panningTrackingArea.y2 <= crtc->panningTrackingArea.y1 ||
-	 (y >= crtc->panningTrackingArea.y1 && y < crtc->panningTrackingArea.y2)))
-    {
-	struct pict_f_vector    c;
-
-	/*
-	 * Pre-clip the mouse position to the panning area so that we don't
-	 * push the crtc outside. This doesn't deal with changes to the
-	 * panning values, only mouse position changes.
-	 */
-	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1)
-	{
-	    if (x < crtc->panningTotalArea.x1)
-		x = crtc->panningTotalArea.x1;
-	    if (x >= crtc->panningTotalArea.x2)
-		x = crtc->panningTotalArea.x2 - 1;
-	}
-	if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1)
-	{
-	    if (y < crtc->panningTotalArea.y1)
-		y = crtc->panningTotalArea.y1;
-	    if (y >= crtc->panningTotalArea.y2)
-		y = crtc->panningTotalArea.y2 - 1;
-	}
-
-	c.v[0] = x;
-	c.v[1] = y;
-	c.v[2] = 1.0;
-	if (crtc->transform_in_use) {
-	    pixman_f_transform_point(&crtc->f_framebuffer_to_crtc, &c);
-	} else {
-	    c.v[0] -= crtc->x;
-	    c.v[1] -= crtc->y;
-	}
-
-	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {
-	    if (c.v[0] < crtc->panningBorder[0]) {
-		c.v[0] = crtc->panningBorder[0];
-		panned = TRUE;
-	    }
-	    if (c.v[0] >= width - crtc->panningBorder[2]) {
-		c.v[0] = width - crtc->panningBorder[2] - 1;
-		panned = TRUE;
-	    }
-	}
-	if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {
-	    if (c.v[1] < crtc->panningBorder[1]) {
-		c.v[1] = crtc->panningBorder[1];
-		panned = TRUE;
-	    }
-	    if (c.v[1] >= height - crtc->panningBorder[3]) {
-		c.v[1] = height - crtc->panningBorder[3] - 1;
-		panned = TRUE;
-	    }
-	}
-	if (panned)
-	    xf86ComputeCrtcPan (crtc->transform_in_use,
-				&crtc->f_framebuffer_to_crtc,
-				x, y, c.v[0], c.v[1],
-				newX, newY, &newX, &newY);
+         (x >= crtc->panningTrackingArea.x1 &&
+          x < crtc->panningTrackingArea.x2)) &&
+        (crtc->panningTrackingArea.y2 <= crtc->panningTrackingArea.y1 ||
+         (y >= crtc->panningTrackingArea.y1 &&
+          y < crtc->panningTrackingArea.y2))) {
+        struct pict_f_vector c;
+
+        /*
+         * Pre-clip the mouse position to the panning area so that we don't
+         * push the crtc outside. This doesn't deal with changes to the
+         * panning values, only mouse position changes.
+         */
+        if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {
+            if (x < crtc->panningTotalArea.x1)
+                x = crtc->panningTotalArea.x1;
+            if (x >= crtc->panningTotalArea.x2)
+                x = crtc->panningTotalArea.x2 - 1;
+        }
+        if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {
+            if (y < crtc->panningTotalArea.y1)
+                y = crtc->panningTotalArea.y1;
+            if (y >= crtc->panningTotalArea.y2)
+                y = crtc->panningTotalArea.y2 - 1;
+        }
+
+        c.v[0] = x;
+        c.v[1] = y;
+        c.v[2] = 1.0;
+        if (crtc->transform_in_use) {
+            pixman_f_transform_point(&crtc->f_framebuffer_to_crtc, &c);
+        }
+        else {
+            c.v[0] -= crtc->x;
+            c.v[1] -= crtc->y;
+        }
+
+        if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {
+            if (c.v[0] < crtc->panningBorder[0]) {
+                c.v[0] = crtc->panningBorder[0];
+                panned = TRUE;
+            }
+            if (c.v[0] >= width - crtc->panningBorder[2]) {
+                c.v[0] = width - crtc->panningBorder[2] - 1;
+                panned = TRUE;
+            }
+        }
+        if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {
+            if (c.v[1] < crtc->panningBorder[1]) {
+                c.v[1] = crtc->panningBorder[1];
+                panned = TRUE;
+            }
+            if (c.v[1] >= height - crtc->panningBorder[3]) {
+                c.v[1] = height - crtc->panningBorder[3] - 1;
+                panned = TRUE;
+            }
+        }
+        if (panned)
+            xf86ComputeCrtcPan(crtc->transform_in_use,
+                               &crtc->f_framebuffer_to_crtc,
+                               x, y, c.v[0], c.v[1], newX, newY, &newX, &newY);
     }
 
     /*
@@ -413,131 +424,119 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
      * XXX This computation only works when we do not have a transform
      * in use.
      */
-    if (!crtc->transform_in_use)
-    {
-	/* Validate against [xy]1 after [xy]2, to be sure that results are > 0 for [xy]1 > 0 */
-	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {
-	    if (newX > crtc->panningTotalArea.x2 - width)
-		newX =  crtc->panningTotalArea.x2 - width;
-	    if (newX <  crtc->panningTotalArea.x1)
-		newX =  crtc->panningTotalArea.x1;
-	}
-	if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {
-	    if (newY > crtc->panningTotalArea.y2 - height)
-		newY =  crtc->panningTotalArea.y2 - height;
-	    if (newY <  crtc->panningTotalArea.y1)
-		newY =  crtc->panningTotalArea.y1;
-	}
+    if (!crtc->transform_in_use) {
+        /* Validate against [xy]1 after [xy]2, to be sure that results are > 0 for [xy]1 > 0 */
+        if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {
+            if (newX > crtc->panningTotalArea.x2 - width)
+                newX = crtc->panningTotalArea.x2 - width;
+            if (newX < crtc->panningTotalArea.x1)
+                newX = crtc->panningTotalArea.x1;
+        }
+        if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {
+            if (newY > crtc->panningTotalArea.y2 - height)
+                newY = crtc->panningTotalArea.y2 - height;
+            if (newY < crtc->panningTotalArea.y1)
+                newY = crtc->panningTotalArea.y1;
+        }
     }
     if (newX != crtc->x || newY != crtc->y)
-	xf86CrtcSetOrigin (crtc, newX, newY);
+        xf86CrtcSetOrigin(crtc, newX, newY);
 }
 
 static Bool
-xf86RandR12GetInfo (ScreenPtr pScreen, Rotation *rotations)
+xf86RandR12GetInfo(ScreenPtr pScreen, Rotation * rotations)
 {
-    RRScreenSizePtr	    pSize;
-    ScrnInfoPtr		    scrp = XF86SCRNINFO(pScreen);
-    XF86RandRInfoPtr	    randrp = XF86RANDRINFO(pScreen);
-    DisplayModePtr	    mode;
-    int			    refresh0 = 60;
-    int			    maxX = 0, maxY = 0;
+    RRScreenSizePtr pSize;
+    ScrnInfoPtr scrp = XF86SCRNINFO(pScreen);
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+    DisplayModePtr mode;
+    int refresh0 = 60;
+    int maxX = 0, maxY = 0;
 
     *rotations = randrp->supported_rotations;
 
-    if (randrp->virtualX == -1 || randrp->virtualY == -1)
-    {
-	randrp->virtualX = scrp->virtualX;
-	randrp->virtualY = scrp->virtualY;
+    if (randrp->virtualX == -1 || randrp->virtualY == -1) {
+        randrp->virtualX = scrp->virtualX;
+        randrp->virtualY = scrp->virtualY;
     }
 
     /* Re-probe the outputs for new monitors or modes */
-    if (scrp->vtSema)
-    {
-	xf86ProbeOutputModes (scrp, 0, 0);
-	xf86SetScrnInfoModes (scrp);
+    if (scrp->vtSema) {
+        xf86ProbeOutputModes(scrp, 0, 0);
+        xf86SetScrnInfoModes(scrp);
     }
 
-    for (mode = scrp->modes; ; mode = mode->next)
-    {
-	int refresh = xf86RandR12ModeRefresh (mode);
-	if (randrp->maxX == 0 || randrp->maxY == 0)
-	{
-		if (maxX < mode->HDisplay)
-			maxX = mode->HDisplay;
-		if (maxY < mode->VDisplay)
-			maxY = mode->VDisplay;
-	}
-	if (mode == scrp->modes)
-	    refresh0 = refresh;
-	pSize = RRRegisterSize (pScreen,
-				mode->HDisplay, mode->VDisplay,
-				randrp->mmWidth, randrp->mmHeight);
-	if (!pSize)
-	    return FALSE;
-	RRRegisterRate (pScreen, pSize, refresh);
-
-	if (xf86ModesEqual(mode, scrp->currentMode))
-	{
-	    RRSetCurrentConfig (pScreen, randrp->rotation, refresh, pSize);
-	}
-	if (mode->next == scrp->modes)
-	    break;
+    for (mode = scrp->modes;; mode = mode->next) {
+        int refresh = xf86RandR12ModeRefresh(mode);
+
+        if (randrp->maxX == 0 || randrp->maxY == 0) {
+            if (maxX < mode->HDisplay)
+                maxX = mode->HDisplay;
+            if (maxY < mode->VDisplay)
+                maxY = mode->VDisplay;
+        }
+        if (mode == scrp->modes)
+            refresh0 = refresh;
+        pSize = RRRegisterSize(pScreen,
+                               mode->HDisplay, mode->VDisplay,
+                               randrp->mmWidth, randrp->mmHeight);
+        if (!pSize)
+            return FALSE;
+        RRRegisterRate(pScreen, pSize, refresh);
+
+        if (xf86ModesEqual(mode, scrp->currentMode)) {
+            RRSetCurrentConfig(pScreen, randrp->rotation, refresh, pSize);
+        }
+        if (mode->next == scrp->modes)
+            break;
     }
 
-    if (randrp->maxX == 0 || randrp->maxY == 0)
-    {
-	randrp->maxX = maxX;
-	randrp->maxY = maxY;
+    if (randrp->maxX == 0 || randrp->maxY == 0) {
+        randrp->maxX = maxX;
+        randrp->maxY = maxY;
     }
 
     return TRUE;
 }
 
 static Bool
-xf86RandR12SetMode (ScreenPtr	    pScreen,
-		  DisplayModePtr    mode,
-		  Bool		    useVirtual,
-		  int		    mmWidth,
-		  int		    mmHeight)
+xf86RandR12SetMode(ScreenPtr pScreen,
+                   DisplayModePtr mode,
+                   Bool useVirtual, int mmWidth, int mmHeight)
 {
-    ScrnInfoPtr		scrp = XF86SCRNINFO(pScreen);
-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
-    int			oldWidth = pScreen->width;
-    int			oldHeight = pScreen->height;
-    int			oldmmWidth = pScreen->mmWidth;
-    int			oldmmHeight = pScreen->mmHeight;
-    WindowPtr		pRoot = pScreen->root;
-    DisplayModePtr      currentMode = NULL;
-    Bool 		ret = TRUE;
+    ScrnInfoPtr scrp = XF86SCRNINFO(pScreen);
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+    int oldWidth = pScreen->width;
+    int oldHeight = pScreen->height;
+    int oldmmWidth = pScreen->mmWidth;
+    int oldmmHeight = pScreen->mmHeight;
+    WindowPtr pRoot = pScreen->root;
+    DisplayModePtr currentMode = NULL;
+    Bool ret = TRUE;
 
     if (pRoot)
-	(*scrp->EnableDisableFBAccess) (pScreen->myNum, FALSE);
-    if (useVirtual)
-    {
-	scrp->virtualX = randrp->virtualX;
-	scrp->virtualY = randrp->virtualY;
+        (*scrp->EnableDisableFBAccess) (pScreen->myNum, FALSE);
+    if (useVirtual) {
+        scrp->virtualX = randrp->virtualX;
+        scrp->virtualY = randrp->virtualY;
     }
-    else
-    {
-	scrp->virtualX = mode->HDisplay;
-	scrp->virtualY = mode->VDisplay;
+    else {
+        scrp->virtualX = mode->HDisplay;
+        scrp->virtualY = mode->VDisplay;
     }
 
-    if(randrp->rotation & (RR_Rotate_90 | RR_Rotate_270))
-    {
-	/* If the screen is rotated 90 or 270 degrees, swap the sizes. */
-	pScreen->width = scrp->virtualY;
-	pScreen->height = scrp->virtualX;
-	pScreen->mmWidth = mmHeight;
-	pScreen->mmHeight = mmWidth;
+    if (randrp->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
+        /* If the screen is rotated 90 or 270 degrees, swap the sizes. */
+        pScreen->width = scrp->virtualY;
+        pScreen->height = scrp->virtualX;
+        pScreen->mmWidth = mmHeight;
+        pScreen->mmHeight = mmWidth;
     }
-    else
-    {
-	pScreen->width = scrp->virtualX;
-	pScreen->height = scrp->virtualY;
-	pScreen->mmWidth = mmWidth;
-	pScreen->mmHeight = mmHeight;
+    else {
+        pScreen->width = scrp->virtualX;
+        pScreen->height = scrp->virtualY;
+        pScreen->mmWidth = mmWidth;
+        pScreen->mmHeight = mmHeight;
     }
     if (scrp->currentMode == mode) {
         /* Save current mode */
@@ -549,13 +548,12 @@ xf86RandR12SetMode (ScreenPtr	    pScreen,
      * We know that if the driver failed to SwitchMode to the rotated
      * version, then it should revert back to it's prior mode.
      */
-    if (!xf86SwitchMode (pScreen, mode))
-    {
+    if (!xf86SwitchMode(pScreen, mode)) {
         ret = FALSE;
-	scrp->virtualX = pScreen->width = oldWidth;
-	scrp->virtualY = pScreen->height = oldHeight;
-	pScreen->mmWidth = oldmmWidth;
-	pScreen->mmHeight = oldmmHeight;
+        scrp->virtualX = pScreen->width = oldWidth;
+        scrp->virtualY = pScreen->height = oldHeight;
+        pScreen->mmWidth = oldmmWidth;
+        pScreen->mmHeight = oldmmHeight;
         scrp->currentMode = currentMode;
     }
 
@@ -567,182 +565,169 @@ xf86RandR12SetMode (ScreenPtr	    pScreen,
     /*
      * Make sure the whole screen is visible
      */
-    xf86SetViewport (pScreen, pScreen->width, pScreen->height);
-    xf86SetViewport (pScreen, 0, 0);
+    xf86SetViewport(pScreen, pScreen->width, pScreen->height);
+    xf86SetViewport(pScreen, 0, 0);
     if (pRoot)
-	(*scrp->EnableDisableFBAccess) (pScreen->myNum, TRUE);
+        (*scrp->EnableDisableFBAccess) (pScreen->myNum, TRUE);
     return ret;
 }
 
 Bool
-xf86RandR12SetConfig (ScreenPtr		pScreen,
-		    Rotation		rotation,
-		    int			rate,
-		    RRScreenSizePtr	pSize)
+xf86RandR12SetConfig(ScreenPtr pScreen,
+                     Rotation rotation, int rate, RRScreenSizePtr pSize)
 {
-    ScrnInfoPtr		scrp = XF86SCRNINFO(pScreen);
-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
-    DisplayModePtr	mode;
-    int			pos[MAXDEVICES][2];
-    Bool		useVirtual = FALSE;
-    int			maxX = 0, maxY = 0;
-    Rotation		oldRotation = randrp->rotation;
-    DeviceIntPtr	dev;
-    Bool		view_adjusted = FALSE;
+    ScrnInfoPtr scrp = XF86SCRNINFO(pScreen);
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+    DisplayModePtr mode;
+    int pos[MAXDEVICES][2];
+    Bool useVirtual = FALSE;
+    int maxX = 0, maxY = 0;
+    Rotation oldRotation = randrp->rotation;
+    DeviceIntPtr dev;
+    Bool view_adjusted = FALSE;
 
     randrp->rotation = rotation;
 
-    if (randrp->virtualX == -1 || randrp->virtualY == -1)
-    {
-	randrp->virtualX = scrp->virtualX;
-	randrp->virtualY = scrp->virtualY;
+    if (randrp->virtualX == -1 || randrp->virtualY == -1) {
+        randrp->virtualX = scrp->virtualX;
+        randrp->virtualY = scrp->virtualY;
     }
 
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-    {
-	if (!IsMaster(dev) && !IsFloating(dev))
-		continue;
+    for (dev = inputInfo.devices; dev; dev = dev->next) {
+        if (!IsMaster(dev) && !IsFloating(dev))
+            continue;
 
-	miPointerGetPosition(dev, &pos[dev->id][0], &pos[dev->id][1]);
+        miPointerGetPosition(dev, &pos[dev->id][0], &pos[dev->id][1]);
     }
 
-    for (mode = scrp->modes; ; mode = mode->next)
-    {
-	if (randrp->maxX == 0 || randrp->maxY == 0)
-	{
-		if (maxX < mode->HDisplay)
-			maxX = mode->HDisplay;
-		if (maxY < mode->VDisplay)
-			maxY = mode->VDisplay;
-	}
-	if (mode->HDisplay == pSize->width &&
-	    mode->VDisplay == pSize->height &&
-	    (rate == 0 || xf86RandR12ModeRefresh (mode) == rate))
-	    break;
-	if (mode->next == scrp->modes)
-	{
-	    if (pSize->width == randrp->virtualX &&
-		pSize->height == randrp->virtualY)
-	    {
-		mode = scrp->modes;
-		useVirtual = TRUE;
-		break;
-	    }
-    	    if (randrp->maxX == 0 || randrp->maxY == 0)
-    	    {
-		randrp->maxX = maxX;
-		randrp->maxY = maxY;
-    	    }
-	    return FALSE;
-	}
+    for (mode = scrp->modes;; mode = mode->next) {
+        if (randrp->maxX == 0 || randrp->maxY == 0) {
+            if (maxX < mode->HDisplay)
+                maxX = mode->HDisplay;
+            if (maxY < mode->VDisplay)
+                maxY = mode->VDisplay;
+        }
+        if (mode->HDisplay == pSize->width &&
+            mode->VDisplay == pSize->height &&
+            (rate == 0 || xf86RandR12ModeRefresh(mode) == rate))
+            break;
+        if (mode->next == scrp->modes) {
+            if (pSize->width == randrp->virtualX &&
+                pSize->height == randrp->virtualY) {
+                mode = scrp->modes;
+                useVirtual = TRUE;
+                break;
+            }
+            if (randrp->maxX == 0 || randrp->maxY == 0) {
+                randrp->maxX = maxX;
+                randrp->maxY = maxY;
+            }
+            return FALSE;
+        }
     }
 
-    if (randrp->maxX == 0 || randrp->maxY == 0)
-    {
-	randrp->maxX = maxX;
-	randrp->maxY = maxY;
+    if (randrp->maxX == 0 || randrp->maxY == 0) {
+        randrp->maxX = maxX;
+        randrp->maxY = maxY;
     }
 
-    if (!xf86RandR12SetMode (pScreen, mode, useVirtual, pSize->mmWidth,
-			   pSize->mmHeight)) {
+    if (!xf86RandR12SetMode(pScreen, mode, useVirtual, pSize->mmWidth,
+                            pSize->mmHeight)) {
         randrp->rotation = oldRotation;
-	return FALSE;
+        return FALSE;
     }
 
     /*
      * Move the cursor back where it belongs; SwitchMode repositions it
      * FIXME: duplicated code, see modes/xf86RandR12.c
      */
-    for (dev = inputInfo.devices; dev; dev = dev->next)
-    {
-	if (!IsMaster(dev) && !IsFloating(dev))
-		continue;
-
-	if (pScreen == miPointerGetScreen(dev)) {
-	    int px = pos[dev->id][0];
-	    int py = pos[dev->id][1];
-
-	    px = (px >= pScreen->width ? (pScreen->width - 1) : px);
-	    py = (py >= pScreen->height ? (pScreen->height - 1) : py);
-
-	    /* Setting the viewpoint makes only sense on one device */
-	    if (!view_adjusted && IsMaster(dev)) {
-		xf86SetViewport(pScreen, px, py);
-		view_adjusted = TRUE;
-	    }
-
-	    (*pScreen->SetCursorPosition) (dev, pScreen, px, py, FALSE);
-	}
+    for (dev = inputInfo.devices; dev; dev = dev->next) {
+        if (!IsMaster(dev) && !IsFloating(dev))
+            continue;
+
+        if (pScreen == miPointerGetScreen(dev)) {
+            int px = pos[dev->id][0];
+            int py = pos[dev->id][1];
+
+            px = (px >= pScreen->width ? (pScreen->width - 1) : px);
+            py = (py >= pScreen->height ? (pScreen->height - 1) : py);
+
+            /* Setting the viewpoint makes only sense on one device */
+            if (!view_adjusted && IsMaster(dev)) {
+                xf86SetViewport(pScreen, px, py);
+                view_adjusted = TRUE;
+            }
+
+            (*pScreen->SetCursorPosition) (dev, pScreen, px, py, FALSE);
+        }
     }
 
     return TRUE;
 }
 
 static Bool
-xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
-			CARD16		width,
-			CARD16		height,
-			CARD32		mmWidth,
-			CARD32		mmHeight)
+xf86RandR12ScreenSetSize(ScreenPtr pScreen,
+                         CARD16 width,
+                         CARD16 height, CARD32 mmWidth, CARD32 mmHeight)
 {
-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
-    ScrnInfoPtr		pScrn = XF86SCRNINFO(pScreen);
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(pScrn);
-    WindowPtr		pRoot = pScreen->root;
-    PixmapPtr		pScrnPix;
-    Bool		ret = FALSE;
-    int                 c;
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+    ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    WindowPtr pRoot = pScreen->root;
+    PixmapPtr pScrnPix;
+    Bool ret = FALSE;
+    int c;
 
     if (xf86RandR12Key) {
-        if (randrp->virtualX == -1 || randrp->virtualY == -1)
-        {
-	    randrp->virtualX = pScrn->virtualX;
-	    randrp->virtualY = pScrn->virtualY;
+        if (randrp->virtualX == -1 || randrp->virtualY == -1) {
+            randrp->virtualX = pScrn->virtualX;
+            randrp->virtualY = pScrn->virtualY;
         }
     }
     if (pRoot && pScrn->vtSema)
-	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);
+        (*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);
 
     /* Let the driver update virtualX and virtualY */
-    if (!(*config->funcs->resize)(pScrn, width, height))
-	goto finish;
+    if (!(*config->funcs->resize) (pScrn, width, height))
+        goto finish;
 
     ret = TRUE;
     /* Update panning information */
     for (c = 0; c < config->num_crtc; c++) {
-	xf86CrtcPtr crtc = config->crtc[c];
-	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1 ||
-	    crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {
-	    if (crtc->panningTotalArea.x2 > crtc->panningTrackingArea.x1)
-		crtc->panningTotalArea.x2 += width  - pScreen->width;
-	    if (crtc->panningTotalArea.y2 > crtc->panningTrackingArea.y1)
-		crtc->panningTotalArea.y2 += height - pScreen->height;
-	    if (crtc->panningTrackingArea.x2 > crtc->panningTrackingArea.x1)
-		crtc->panningTrackingArea.x2 += width  - pScreen->width;
-	    if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1)
-		crtc->panningTrackingArea.y2 += height - pScreen->height;
-	    xf86RandR13VerifyPanningArea (crtc, width, height);
-	    xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);
-	}
+        xf86CrtcPtr crtc = config->crtc[c];
+
+        if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1 ||
+            crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {
+            if (crtc->panningTotalArea.x2 > crtc->panningTrackingArea.x1)
+                crtc->panningTotalArea.x2 += width - pScreen->width;
+            if (crtc->panningTotalArea.y2 > crtc->panningTrackingArea.y1)
+                crtc->panningTotalArea.y2 += height - pScreen->height;
+            if (crtc->panningTrackingArea.x2 > crtc->panningTrackingArea.x1)
+                crtc->panningTrackingArea.x2 += width - pScreen->width;
+            if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1)
+                crtc->panningTrackingArea.y2 += height - pScreen->height;
+            xf86RandR13VerifyPanningArea(crtc, width, height);
+            xf86RandR13Pan(crtc, randrp->pointerX, randrp->pointerY);
+        }
     }
 
-    pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);
+    pScrnPix = (*pScreen->GetScreenPixmap) (pScreen);
     pScreen->width = pScrnPix->drawable.width = width;
     pScreen->height = pScrnPix->drawable.height = height;
     randrp->mmWidth = pScreen->mmWidth = mmWidth;
     randrp->mmHeight = pScreen->mmHeight = mmHeight;
 
-    xf86SetViewport (pScreen, pScreen->width-1, pScreen->height-1);
-    xf86SetViewport (pScreen, 0, 0);
+    xf86SetViewport(pScreen, pScreen->width - 1, pScreen->height - 1);
+    xf86SetViewport(pScreen, 0, 0);
 
-finish:
+ finish:
     update_desktop_dimensions();
 
     if (pRoot && pScrn->vtSema)
-	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);
+        (*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);
 #if RANDR_12_INTERFACE
     if (xf86RandR12Key && pScreen->root && ret)
-	RRScreenSizeNotify (pScreen);
+        RRScreenSizeNotify(pScreen);
 #endif
     return ret;
 }
@@ -750,24 +735,25 @@ finish:
 Rotation
 xf86RandR12GetRotation(ScreenPtr pScreen)
 {
-    XF86RandRInfoPtr	    randrp = XF86RANDRINFO(pScreen);
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
 
     return randrp->rotation;
 }
 
 Bool
-xf86RandR12CreateScreenResources (ScreenPtr pScreen)
+xf86RandR12CreateScreenResources(ScreenPtr pScreen)
 {
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   config;
-    XF86RandRInfoPtr	randrp;
-    int			c;
-    int			width, height;
-    int			mmWidth, mmHeight;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr config;
+    XF86RandRInfoPtr randrp;
+    int c;
+    int width, height;
+    int mmWidth, mmHeight;
+
 #ifdef PANORAMIX
     /* XXX disable RandR when using Xinerama */
     if (!noPanoramiXExtension)
-	return TRUE;
+        return TRUE;
 #endif
 
     config = XF86_CRTC_CONFIG_PTR(pScrn);
@@ -775,103 +761,91 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
     /*
      * Compute size of screen
      */
-    width = 0; height = 0;
-    for (c = 0; c < config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = config->crtc[c];
-	int	    crtc_width = crtc->x + xf86ModeWidth (&crtc->mode, crtc->rotation);
-	int	    crtc_height = crtc->y + xf86ModeHeight (&crtc->mode, crtc->rotation);
-	
-	if (crtc->enabled) {
-	    if (crtc_width > width)
-		width = crtc_width;
-	    if (crtc_height > height)
-		height = crtc_height;
-	    if (crtc->panningTotalArea.x2 > width)
-		width = crtc->panningTotalArea.x2;
-	    if (crtc->panningTotalArea.y2 > height)
-		height = crtc->panningTotalArea.y2;
-	}
+    width = 0;
+    height = 0;
+    for (c = 0; c < config->num_crtc; c++) {
+        xf86CrtcPtr crtc = config->crtc[c];
+        int crtc_width = crtc->x + xf86ModeWidth(&crtc->mode, crtc->rotation);
+        int crtc_height = crtc->y + xf86ModeHeight(&crtc->mode, crtc->rotation);
+
+        if (crtc->enabled) {
+            if (crtc_width > width)
+                width = crtc_width;
+            if (crtc_height > height)
+                height = crtc_height;
+            if (crtc->panningTotalArea.x2 > width)
+                width = crtc->panningTotalArea.x2;
+            if (crtc->panningTotalArea.y2 > height)
+                height = crtc->panningTotalArea.y2;
+        }
     }
-    
-    if (width && height)
-    {
-	/*
-	 * Compute physical size of screen
-	 */
-	if (monitorResolution) 
-	{
-	    mmWidth = width * 25.4 / monitorResolution;
-	    mmHeight = height * 25.4 / monitorResolution;
-	}
-	else
-	{
-	    xf86OutputPtr   output = xf86CompatOutput(pScrn);
-
-	    if (output &&
-		output->conf_monitor &&
-		(output->conf_monitor->mon_width  > 0 &&
-		 output->conf_monitor->mon_height > 0))
-	    {
-		/*
-		 * Prefer user configured DisplaySize
-		 */
-		mmWidth = output->conf_monitor->mon_width;
-		mmHeight = output->conf_monitor->mon_height;
-	    }
-	    else
-	    {
-		/*
-		 * Otherwise, just set the screen to DEFAULT_DPI
-		 */
-		mmWidth = width * 25.4 / DEFAULT_DPI;
-		mmHeight = height * 25.4 / DEFAULT_DPI;
-	    }
-	}
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		   "Setting screen physical size to %d x %d\n",
-		   mmWidth, mmHeight);
-	/*
-	 * This is the initial setting of the screen size.
-	 * We have to pre-set it here, otherwise panning would be adapted
-	 * to the new screen size.
-	 */
-	pScreen->width  = width;
-	pScreen->height = height;
-	xf86RandR12ScreenSetSize (pScreen,
-				  width,
-				  height,
-				  mmWidth,
-				  mmHeight);
+
+    if (width && height) {
+        /*
+         * Compute physical size of screen
+         */
+        if (monitorResolution) {
+            mmWidth = width * 25.4 / monitorResolution;
+            mmHeight = height * 25.4 / monitorResolution;
+        }
+        else {
+            xf86OutputPtr output = xf86CompatOutput(pScrn);
+
+            if (output &&
+                output->conf_monitor &&
+                (output->conf_monitor->mon_width > 0 &&
+                 output->conf_monitor->mon_height > 0)) {
+                /*
+                 * Prefer user configured DisplaySize
+                 */
+                mmWidth = output->conf_monitor->mon_width;
+                mmHeight = output->conf_monitor->mon_height;
+            }
+            else {
+                /*
+                 * Otherwise, just set the screen to DEFAULT_DPI
+                 */
+                mmWidth = width * 25.4 / DEFAULT_DPI;
+                mmHeight = height * 25.4 / DEFAULT_DPI;
+            }
+        }
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                   "Setting screen physical size to %d x %d\n",
+                   mmWidth, mmHeight);
+        /*
+         * This is the initial setting of the screen size.
+         * We have to pre-set it here, otherwise panning would be adapted
+         * to the new screen size.
+         */
+        pScreen->width = width;
+        pScreen->height = height;
+        xf86RandR12ScreenSetSize(pScreen, width, height, mmWidth, mmHeight);
     }
 
     if (xf86RandR12Key == NULL)
-	return TRUE;
+        return TRUE;
 
-    if (randrp->virtualX == -1 || randrp->virtualY == -1)
-    {
-	randrp->virtualX = pScrn->virtualX;
-	randrp->virtualY = pScrn->virtualY;
+    if (randrp->virtualX == -1 || randrp->virtualY == -1) {
+        randrp->virtualX = pScrn->virtualX;
+        randrp->virtualY = pScrn->virtualY;
     }
-    xf86CrtcSetScreenSubpixelOrder (pScreen);
+    xf86CrtcSetScreenSubpixelOrder(pScreen);
 #if RANDR_12_INTERFACE
-    if (xf86RandR12CreateScreenResources12 (pScreen))
-	return TRUE;
+    if (xf86RandR12CreateScreenResources12(pScreen))
+        return TRUE;
 #endif
     return TRUE;
 }
 
-
 Bool
-xf86RandR12Init (ScreenPtr pScreen)
+xf86RandR12Init(ScreenPtr pScreen)
 {
-    rrScrPrivPtr	rp;
-    XF86RandRInfoPtr	randrp;
+    rrScrPrivPtr rp;
+    XF86RandRInfoPtr randrp;
 
 #ifdef PANORAMIX
     /* XXX disable RandR when using Xinerama */
-    if (!noPanoramiXExtension)
-    {
+    if (!noPanoramiXExtension) {
         if (xf86NumScreens == 1)
             noPanoramiXExtension = TRUE;
         else
@@ -880,20 +854,19 @@ xf86RandR12Init (ScreenPtr pScreen)
 #endif
 
     if (xf86RandR12Generation != serverGeneration)
-	xf86RandR12Generation = serverGeneration;
+        xf86RandR12Generation = serverGeneration;
 
     xf86RandR12Key = &xf86RandR12KeyRec;
     if (!dixRegisterPrivateKey(&xf86RandR12KeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
 
-    randrp = malloc(sizeof (XF86RandRInfoRec));
+    randrp = malloc(sizeof(XF86RandRInfoRec));
     if (!randrp)
-	return FALSE;
+        return FALSE;
 
-    if (!RRScreenInit(pScreen))
-    {
-	free(randrp);
-	return FALSE;
+    if (!RRScreenInit(pScreen)) {
+        free(randrp);
+        return FALSE;
     }
     rp = rrGetScrPriv(pScreen);
     rp->rrGetInfo = xf86RandR12GetInfo;
@@ -904,7 +877,7 @@ xf86RandR12Init (ScreenPtr pScreen)
     randrp->mmWidth = pScreen->mmWidth;
     randrp->mmHeight = pScreen->mmHeight;
 
-    randrp->rotation = RR_Rotate_0; /* initial rotated mode */
+    randrp->rotation = RR_Rotate_0;     /* initial rotated mode */
 
     randrp->supported_rotations = RR_Rotate_0;
 
@@ -913,19 +886,19 @@ xf86RandR12Init (ScreenPtr pScreen)
     dixSetPrivate(&pScreen->devPrivates, xf86RandR12Key, randrp);
 
 #if RANDR_12_INTERFACE
-    if (!xf86RandR12Init12 (pScreen))
-	return FALSE;
+    if (!xf86RandR12Init12(pScreen))
+        return FALSE;
 #endif
     return TRUE;
 }
 
 void
-xf86RandR12CloseScreen (ScreenPtr pScreen)
+xf86RandR12CloseScreen(ScreenPtr pScreen)
 {
-    XF86RandRInfoPtr	randrp;
+    XF86RandRInfoPtr randrp;
 
     if (xf86RandR12Key == NULL)
-	return;
+        return;
 
     randrp = XF86RANDRINFO(pScreen);
 #if RANDR_12_INTERFACE
@@ -936,48 +909,50 @@ xf86RandR12CloseScreen (ScreenPtr pScreen)
 }
 
 void
-xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations)
+xf86RandR12SetRotations(ScreenPtr pScreen, Rotation rotations)
 {
-    XF86RandRInfoPtr	randrp;
+    XF86RandRInfoPtr randrp;
+
 #if RANDR_12_INTERFACE
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    int			c;
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    int c;
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
 #endif
 
     if (xf86RandR12Key == NULL)
-	return;
+        return;
 
     randrp = XF86RANDRINFO(pScreen);
 #if RANDR_12_INTERFACE
     for (c = 0; c < config->num_crtc; c++) {
-	xf86CrtcPtr    crtc = config->crtc[c];
+        xf86CrtcPtr crtc = config->crtc[c];
 
-	RRCrtcSetRotations (crtc->randr_crtc, rotations);
+        RRCrtcSetRotations(crtc->randr_crtc, rotations);
     }
 #endif
     randrp->supported_rotations = rotations;
 }
 
 void
-xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms)
+xf86RandR12SetTransformSupport(ScreenPtr pScreen, Bool transforms)
 {
-    XF86RandRInfoPtr	randrp;
+    XF86RandRInfoPtr randrp;
+
 #if RANDR_13_INTERFACE
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    int			c;
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    int c;
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
 #endif
 
     if (xf86RandR12Key == NULL)
-	return;
+        return;
 
     randrp = XF86RANDRINFO(pScreen);
 #if RANDR_13_INTERFACE
     for (c = 0; c < config->num_crtc; c++) {
-	xf86CrtcPtr    crtc = config->crtc[c];
+        xf86CrtcPtr crtc = config->crtc[c];
 
-	RRCrtcSetTransformSupport (crtc->randr_crtc, transforms);
+        RRCrtcSetTransformSupport(crtc->randr_crtc, transforms);
     }
 #endif
 }
@@ -988,15 +963,15 @@ xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y)
     ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
 
     if (xf86RandR12Generation != serverGeneration ||
-	XF86RANDRINFO(pScreen)->virtualX == -1)
-    {
-	*x = pScrn->virtualX;
-	*y = pScrn->virtualY;
-    } else {
-	XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
-
-	*x = randrp->virtualX;
-	*y = randrp->virtualY;
+        XF86RANDRINFO(pScreen)->virtualX == -1) {
+        *x = pScrn->virtualX;
+        *y = pScrn->virtualY;
+    }
+    else {
+        XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+
+        *x = randrp->virtualX;
+        *y = randrp->virtualY;
     }
 }
 
@@ -1018,95 +993,106 @@ xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y)
 		   RR_ClockDivideBy2)
 
 static Bool
-xf86RandRModeMatches (RRModePtr		randr_mode,
-		      DisplayModePtr	mode)
+xf86RandRModeMatches(RRModePtr randr_mode, DisplayModePtr mode)
 {
 #if 0
-    if (match_name)
-    {
-	/* check for same name */
-	int	len = strlen (mode->name);
-	if (randr_mode->mode.nameLength != len)			return FALSE;
-	if (memcmp (randr_mode->name, mode->name, len) != 0)	return FALSE;
+    if (match_name) {
+        /* check for same name */
+        int len = strlen(mode->name);
+
+        if (randr_mode->mode.nameLength != len)
+            return FALSE;
+        if (memcmp(randr_mode->name, mode->name, len) != 0)
+            return FALSE;
     }
 #endif
-    
+
     /* check for same timings */
-    if (randr_mode->mode.dotClock / 1000 != mode->Clock)    return FALSE;
-    if (randr_mode->mode.width        != mode->HDisplay)    return FALSE;
-    if (randr_mode->mode.hSyncStart   != mode->HSyncStart)  return FALSE;
-    if (randr_mode->mode.hSyncEnd     != mode->HSyncEnd)    return FALSE;
-    if (randr_mode->mode.hTotal       != mode->HTotal)	    return FALSE;
-    if (randr_mode->mode.hSkew        != mode->HSkew)	    return FALSE;
-    if (randr_mode->mode.height       != mode->VDisplay)    return FALSE;
-    if (randr_mode->mode.vSyncStart   != mode->VSyncStart)  return FALSE;
-    if (randr_mode->mode.vSyncEnd     != mode->VSyncEnd)    return FALSE;
-    if (randr_mode->mode.vTotal       != mode->VTotal)	    return FALSE;
-    
+    if (randr_mode->mode.dotClock / 1000 != mode->Clock)
+        return FALSE;
+    if (randr_mode->mode.width != mode->HDisplay)
+        return FALSE;
+    if (randr_mode->mode.hSyncStart != mode->HSyncStart)
+        return FALSE;
+    if (randr_mode->mode.hSyncEnd != mode->HSyncEnd)
+        return FALSE;
+    if (randr_mode->mode.hTotal != mode->HTotal)
+        return FALSE;
+    if (randr_mode->mode.hSkew != mode->HSkew)
+        return FALSE;
+    if (randr_mode->mode.height != mode->VDisplay)
+        return FALSE;
+    if (randr_mode->mode.vSyncStart != mode->VSyncStart)
+        return FALSE;
+    if (randr_mode->mode.vSyncEnd != mode->VSyncEnd)
+        return FALSE;
+    if (randr_mode->mode.vTotal != mode->VTotal)
+        return FALSE;
+
     /* check for same flags (using only the XF86 valid flag bits) */
     if ((randr_mode->mode.modeFlags & FLAG_BITS) != (mode->Flags & FLAG_BITS))
-	return FALSE;
-    
+        return FALSE;
+
     /* everything matches */
     return TRUE;
 }
 
 static Bool
-xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
+xf86RandR12CrtcNotify(RRCrtcPtr randr_crtc)
 {
-    ScreenPtr		pScreen = randr_crtc->pScreen;
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
-    RRModePtr		randr_mode = NULL;
-    int			x;
-    int			y;
-    Rotation		rotation;
-    int			numOutputs;
-    RROutputPtr		*randr_outputs;
-    RROutputPtr		randr_output;
-    xf86CrtcPtr		crtc = randr_crtc->devPrivate;
-    xf86OutputPtr	output;
-    int			i, j;
-    DisplayModePtr	mode = &crtc->mode;
-    Bool		ret;
-
-    randr_outputs = malloc(config->num_output * sizeof (RROutputPtr));
+    ScreenPtr pScreen = randr_crtc->pScreen;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    RRModePtr randr_mode = NULL;
+    int x;
+    int y;
+    Rotation rotation;
+    int numOutputs;
+    RROutputPtr *randr_outputs;
+    RROutputPtr randr_output;
+    xf86CrtcPtr crtc = randr_crtc->devPrivate;
+    xf86OutputPtr output;
+    int i, j;
+    DisplayModePtr mode = &crtc->mode;
+    Bool ret;
+
+    randr_outputs = malloc(config->num_output * sizeof(RROutputPtr));
     if (!randr_outputs)
-	return FALSE;
+        return FALSE;
     x = crtc->x;
     y = crtc->y;
     rotation = crtc->rotation;
     numOutputs = 0;
     randr_mode = NULL;
-    for (i = 0; i < config->num_output; i++)
-    {
-	output = config->output[i];
-	if (output->crtc == crtc)
-	{
-	    randr_output = output->randr_output;
-	    randr_outputs[numOutputs++] = randr_output;
-	    /*
-	     * We make copies of modes, so pointer equality 
-	     * isn't sufficient
-	     */
-	    for (j = 0; j < randr_output->numModes + randr_output->numUserModes; j++)
-	    {
-		RRModePtr   m = (j < randr_output->numModes ?
-				 randr_output->modes[j] :
-				 randr_output->userModes[j-randr_output->numModes]);
-					 
-		if (xf86RandRModeMatches (m, mode))
-		{
-		    randr_mode = m;
-		    break;
-		}
-	    }
-	}
+    for (i = 0; i < config->num_output; i++) {
+        output = config->output[i];
+        if (output->crtc == crtc) {
+            randr_output = output->randr_output;
+            randr_outputs[numOutputs++] = randr_output;
+            /*
+             * We make copies of modes, so pointer equality 
+             * isn't sufficient
+             */
+            for (j = 0; j < randr_output->numModes + randr_output->numUserModes;
+                 j++) {
+                RRModePtr m =
+                    (j <
+                     randr_output->numModes ? randr_output->
+                     modes[j] : randr_output->userModes[j -
+                                                        randr_output->
+                                                        numModes]);
+
+                if (xf86RandRModeMatches(m, mode)) {
+                    randr_mode = m;
+                    break;
+                }
+            }
+        }
     }
-    ret = RRCrtcNotify (randr_crtc, randr_mode, x, y,
-			rotation, 
-			crtc->transformPresent ? &crtc->transform : NULL,
-			numOutputs, randr_outputs);
+    ret = RRCrtcNotify(randr_crtc, randr_mode, x, y,
+                       rotation,
+                       crtc->transformPresent ? &crtc->transform : NULL,
+                       numOutputs, randr_outputs);
     free(randr_outputs);
     return ret;
 }
@@ -1115,21 +1101,20 @@ xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
  * Convert a RandR mode to a DisplayMode
  */
 static void
-xf86RandRModeConvert (ScrnInfoPtr	scrn,
-		      RRModePtr		randr_mode,
-		      DisplayModePtr	mode)
+xf86RandRModeConvert(ScrnInfoPtr scrn,
+                     RRModePtr randr_mode, DisplayModePtr mode)
 {
     memset(mode, 0, sizeof(DisplayModeRec));
     mode->status = MODE_OK;
 
     mode->Clock = randr_mode->mode.dotClock / 1000;
-    
+
     mode->HDisplay = randr_mode->mode.width;
     mode->HSyncStart = randr_mode->mode.hSyncStart;
     mode->HSyncEnd = randr_mode->mode.hSyncEnd;
     mode->HTotal = randr_mode->mode.hTotal;
     mode->HSkew = randr_mode->mode.hSkew;
-    
+
     mode->VDisplay = randr_mode->mode.height;
     mode->VSyncStart = randr_mode->mode.vSyncStart;
     mode->VSyncEnd = randr_mode->mode.vSyncEnd;
@@ -1138,137 +1123,134 @@ xf86RandRModeConvert (ScrnInfoPtr	scrn,
 
     mode->Flags = randr_mode->mode.modeFlags & FLAG_BITS;
 
-    xf86SetModeCrtc (mode, scrn->adjustFlags);
+    xf86SetModeCrtc(mode, scrn->adjustFlags);
 }
 
 static Bool
-xf86RandR12CrtcSet (ScreenPtr	    pScreen,
-		    RRCrtcPtr	    randr_crtc,
-		    RRModePtr	    randr_mode,
-		    int		    x,
-		    int		    y,
-		    Rotation	    rotation,
-		    int		    num_randr_outputs,
-		    RROutputPtr	    *randr_outputs)
+xf86RandR12CrtcSet(ScreenPtr pScreen,
+                   RRCrtcPtr randr_crtc,
+                   RRModePtr randr_mode,
+                   int x,
+                   int y,
+                   Rotation rotation,
+                   int num_randr_outputs, RROutputPtr * randr_outputs)
 {
-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
-    xf86CrtcPtr		crtc = randr_crtc->devPrivate;
-    RRTransformPtr	transform;
-    Bool		changed = FALSE;
-    int			o, ro;
-    xf86CrtcPtr		*save_crtcs;
-    Bool		save_enabled = crtc->enabled;
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    xf86CrtcPtr crtc = randr_crtc->devPrivate;
+    RRTransformPtr transform;
+    Bool changed = FALSE;
+    int o, ro;
+    xf86CrtcPtr *save_crtcs;
+    Bool save_enabled = crtc->enabled;
 
     if (!crtc->scrn->vtSema)
-	return FALSE;
+        return FALSE;
 
-    save_crtcs = malloc(config->num_output * sizeof (xf86CrtcPtr));
+    save_crtcs = malloc(config->num_output * sizeof(xf86CrtcPtr));
     if ((randr_mode != NULL) != crtc->enabled)
-	changed = TRUE;
-    else if (randr_mode && !xf86RandRModeMatches (randr_mode, &crtc->mode))
-	changed = TRUE;
-    
+        changed = TRUE;
+    else if (randr_mode && !xf86RandRModeMatches(randr_mode, &crtc->mode))
+        changed = TRUE;
+
     if (rotation != crtc->rotation)
-	changed = TRUE;
+        changed = TRUE;
 
-    transform = RRCrtcGetTransform (randr_crtc);
+    transform = RRCrtcGetTransform(randr_crtc);
     if ((transform != NULL) != crtc->transformPresent)
-	changed = TRUE;
-    else if (transform && memcmp (&transform->transform, &crtc->transform.transform,
-				  sizeof (transform->transform)) != 0)
-	changed = TRUE;
+        changed = TRUE;
+    else if (transform &&
+             memcmp(&transform->transform, &crtc->transform.transform,
+                    sizeof(transform->transform)) != 0)
+        changed = TRUE;
 
     if (x != crtc->x || y != crtc->y)
-	changed = TRUE;
-    for (o = 0; o < config->num_output; o++) 
-    {
-	xf86OutputPtr  output = config->output[o];
-	xf86CrtcPtr    new_crtc;
-
-	save_crtcs[o] = output->crtc;
-	
-	if (output->crtc == crtc)
-	    new_crtc = NULL;
-	else
-	    new_crtc = output->crtc;
-	for (ro = 0; ro < num_randr_outputs; ro++) 
-	    if (output->randr_output == randr_outputs[ro])
-	    {
-		new_crtc = crtc;
-		break;
-	    }
-	if (new_crtc != output->crtc)
-	{
-	    changed = TRUE;
-	    output->crtc = new_crtc;
-	}
+        changed = TRUE;
+    for (o = 0; o < config->num_output; o++) {
+        xf86OutputPtr output = config->output[o];
+        xf86CrtcPtr new_crtc;
+
+        save_crtcs[o] = output->crtc;
+
+        if (output->crtc == crtc)
+            new_crtc = NULL;
+        else
+            new_crtc = output->crtc;
+        for (ro = 0; ro < num_randr_outputs; ro++)
+            if (output->randr_output == randr_outputs[ro]) {
+                new_crtc = crtc;
+                break;
+            }
+        if (new_crtc != output->crtc) {
+            changed = TRUE;
+            output->crtc = new_crtc;
+        }
     }
-    for (ro = 0; ro < num_randr_outputs; ro++) 
+    for (ro = 0; ro < num_randr_outputs; ro++)
         if (randr_outputs[ro]->pendingProperties)
-	    changed = TRUE;
+            changed = TRUE;
 
     /* XXX need device-independent mode setting code through an API */
-    if (changed)
-    {
-	crtc->enabled = randr_mode != NULL;
-
-	if (randr_mode)
-	{
-	    DisplayModeRec  mode;
-	    RRTransformPtr  transform = RRCrtcGetTransform (randr_crtc);
-
-	    xf86RandRModeConvert (pScrn, randr_mode, &mode);
-	    if (!xf86CrtcSetModeTransform (crtc, &mode, rotation, transform, x, y))
-	    {
-		crtc->enabled = save_enabled;
-		for (o = 0; o < config->num_output; o++)
-		{
-		    xf86OutputPtr	output = config->output[o];
-		    output->crtc = save_crtcs[o];
-		}
-		free(save_crtcs);
-		return FALSE;
-	    }
-	    xf86RandR13VerifyPanningArea (crtc, pScreen->width, pScreen->height);
-	    xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);
-	    /*
-	     * Save the last successful setting for EnterVT
-	     */
-	    crtc->desiredMode = mode;
-	    crtc->desiredRotation = rotation;
-	    if (transform) {
-		crtc->desiredTransform = *transform;
-		crtc->desiredTransformPresent = TRUE;
-	    } else
-		crtc->desiredTransformPresent = FALSE;
-
-	    crtc->desiredX = x;
-	    crtc->desiredY = y;
-	}
-	xf86DisableUnusedFunctions (pScrn);
+    if (changed) {
+        crtc->enabled = randr_mode != NULL;
+
+        if (randr_mode) {
+            DisplayModeRec mode;
+            RRTransformPtr transform = RRCrtcGetTransform(randr_crtc);
+
+            xf86RandRModeConvert(pScrn, randr_mode, &mode);
+            if (!xf86CrtcSetModeTransform
+                (crtc, &mode, rotation, transform, x, y)) {
+                crtc->enabled = save_enabled;
+                for (o = 0; o < config->num_output; o++) {
+                    xf86OutputPtr output = config->output[o];
+
+                    output->crtc = save_crtcs[o];
+                }
+                free(save_crtcs);
+                return FALSE;
+            }
+            xf86RandR13VerifyPanningArea(crtc, pScreen->width, pScreen->height);
+            xf86RandR13Pan(crtc, randrp->pointerX, randrp->pointerY);
+            /*
+             * Save the last successful setting for EnterVT
+             */
+            crtc->desiredMode = mode;
+            crtc->desiredRotation = rotation;
+            if (transform) {
+                crtc->desiredTransform = *transform;
+                crtc->desiredTransformPresent = TRUE;
+            }
+            else
+                crtc->desiredTransformPresent = FALSE;
+
+            crtc->desiredX = x;
+            crtc->desiredY = y;
+        }
+        xf86DisableUnusedFunctions(pScrn);
     }
     free(save_crtcs);
-    return xf86RandR12CrtcNotify (randr_crtc);
+    return xf86RandR12CrtcNotify(randr_crtc);
 }
 
 static Bool
-xf86RandR12CrtcSetGamma (ScreenPtr    pScreen,
-			 RRCrtcPtr    randr_crtc)
+xf86RandR12CrtcSetGamma(ScreenPtr pScreen, RRCrtcPtr randr_crtc)
 {
-    xf86CrtcPtr		crtc = randr_crtc->devPrivate;
+    xf86CrtcPtr crtc = randr_crtc->devPrivate;
 
     if (crtc->funcs->gamma_set == NULL)
-	return FALSE;
+        return FALSE;
 
     if (!crtc->scrn->vtSema)
-	return TRUE;
+        return TRUE;
 
     /* Realloc local gamma if needed. */
     if (randr_crtc->gammaSize != crtc->gamma_size) {
         CARD16 *tmp_ptr;
-        tmp_ptr = realloc(crtc->gamma_red, 3 * crtc->gamma_size * sizeof (CARD16));
+
+        tmp_ptr =
+            realloc(crtc->gamma_red, 3 * crtc->gamma_size * sizeof(CARD16));
         if (!tmp_ptr)
             return FALSE;
         crtc->gamma_red = tmp_ptr;
@@ -1277,23 +1259,25 @@ xf86RandR12CrtcSetGamma (ScreenPtr    pScreen,
     }
 
     crtc->gamma_size = randr_crtc->gammaSize;
-    memcpy (crtc->gamma_red, randr_crtc->gammaRed, crtc->gamma_size * sizeof (CARD16));
-    memcpy (crtc->gamma_green, randr_crtc->gammaGreen, crtc->gamma_size * sizeof (CARD16));
-    memcpy (crtc->gamma_blue, randr_crtc->gammaBlue, crtc->gamma_size * sizeof (CARD16));
+    memcpy(crtc->gamma_red, randr_crtc->gammaRed,
+           crtc->gamma_size * sizeof(CARD16));
+    memcpy(crtc->gamma_green, randr_crtc->gammaGreen,
+           crtc->gamma_size * sizeof(CARD16));
+    memcpy(crtc->gamma_blue, randr_crtc->gammaBlue,
+           crtc->gamma_size * sizeof(CARD16));
 
     /* Only set it when the crtc is actually running.
      * Otherwise it will be set when it's activated.
      */
     if (crtc->active)
-	crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
-						crtc->gamma_blue, crtc->gamma_size);
+        crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
+                               crtc->gamma_blue, crtc->gamma_size);
 
     return TRUE;
 }
 
 static Bool
-xf86RandR12CrtcGetGamma (ScreenPtr    pScreen,
-			 RRCrtcPtr    randr_crtc)
+xf86RandR12CrtcGetGamma(ScreenPtr pScreen, RRCrtcPtr randr_crtc)
 {
     xf86CrtcPtr crtc = randr_crtc->devPrivate;
 
@@ -1306,7 +1290,10 @@ xf86RandR12CrtcGetGamma (ScreenPtr    pScreen,
     /* Realloc randr gamma if needed. */
     if (randr_crtc->gammaSize != crtc->gamma_size) {
         CARD16 *tmp_ptr;
-        tmp_ptr = realloc(randr_crtc->gammaRed, 3 * crtc->gamma_size * sizeof (CARD16));
+
+        tmp_ptr =
+            realloc(randr_crtc->gammaRed,
+                    3 * crtc->gamma_size * sizeof(CARD16));
         if (!tmp_ptr)
             return FALSE;
         randr_crtc->gammaRed = tmp_ptr;
@@ -1314,18 +1301,20 @@ xf86RandR12CrtcGetGamma (ScreenPtr    pScreen,
         randr_crtc->gammaBlue = randr_crtc->gammaGreen + crtc->gamma_size;
     }
     randr_crtc->gammaSize = crtc->gamma_size;
-    memcpy (randr_crtc->gammaRed, crtc->gamma_red, crtc->gamma_size * sizeof (CARD16));
-    memcpy (randr_crtc->gammaGreen, crtc->gamma_green, crtc->gamma_size * sizeof (CARD16));
-    memcpy (randr_crtc->gammaBlue, crtc->gamma_blue, crtc->gamma_size * sizeof (CARD16));
+    memcpy(randr_crtc->gammaRed, crtc->gamma_red,
+           crtc->gamma_size * sizeof(CARD16));
+    memcpy(randr_crtc->gammaGreen, crtc->gamma_green,
+           crtc->gamma_size * sizeof(CARD16));
+    memcpy(randr_crtc->gammaBlue, crtc->gamma_blue,
+           crtc->gamma_size * sizeof(CARD16));
 
     return TRUE;
 }
 
 static Bool
-xf86RandR12OutputSetProperty (ScreenPtr pScreen,
-			      RROutputPtr randr_output,
-			      Atom property,
-			      RRPropertyValuePtr value)
+xf86RandR12OutputSetProperty(ScreenPtr pScreen,
+                             RROutputPtr randr_output,
+                             Atom property, RRPropertyValuePtr value)
 {
     xf86OutputPtr output = randr_output->devPrivate;
 
@@ -1333,7 +1322,7 @@ xf86RandR12OutputSetProperty (ScreenPtr pScreen,
      * user is setting properties to.
      */
     if (output->funcs->set_property == NULL)
-	return TRUE;
+        return TRUE;
 
     /*
      * This function gets called even when vtSema is FALSE, as
@@ -1344,41 +1333,39 @@ xf86RandR12OutputSetProperty (ScreenPtr pScreen,
 }
 
 static Bool
-xf86RandR13OutputGetProperty (ScreenPtr pScreen,
-			      RROutputPtr randr_output,
-			      Atom property)
+xf86RandR13OutputGetProperty(ScreenPtr pScreen,
+                             RROutputPtr randr_output, Atom property)
 {
     xf86OutputPtr output = randr_output->devPrivate;
 
     if (output->funcs->get_property == NULL)
-	return TRUE;
+        return TRUE;
 
     /* Should be safe even w/o vtSema */
     return output->funcs->get_property(output, property);
 }
 
 static Bool
-xf86RandR12OutputValidateMode (ScreenPtr    pScreen,
-			       RROutputPtr  randr_output,
-			       RRModePtr    randr_mode)
+xf86RandR12OutputValidateMode(ScreenPtr pScreen,
+                              RROutputPtr randr_output, RRModePtr randr_mode)
 {
-    ScrnInfoPtr	    pScrn = xf86Screens[pScreen->myNum];
-    xf86OutputPtr   output = randr_output->devPrivate;
-    DisplayModeRec  mode;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    xf86OutputPtr output = randr_output->devPrivate;
+    DisplayModeRec mode;
 
-    xf86RandRModeConvert (pScrn, randr_mode, &mode);
+    xf86RandRModeConvert(pScrn, randr_mode, &mode);
     /*
      * This function may be called when vtSema is FALSE, so
      * the underlying function must either avoid touching the hardware
      * or return FALSE when vtSema is FALSE
      */
-    if (output->funcs->mode_valid (output, &mode) != MODE_OK)
-	return FALSE;
+    if (output->funcs->mode_valid(output, &mode) != MODE_OK)
+        return FALSE;
     return TRUE;
 }
 
 static void
-xf86RandR12ModeDestroy (ScreenPtr pScreen, RRModePtr randr_mode)
+xf86RandR12ModeDestroy(ScreenPtr pScreen, RRModePtr randr_mode)
 {
 }
 
@@ -1387,56 +1374,56 @@ xf86RandR12ModeDestroy (ScreenPtr pScreen, RRModePtr randr_mode)
  * RandR modes and assign them to the output
  */
 static Bool
-xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
+xf86RROutputSetModes(RROutputPtr randr_output, DisplayModePtr modes)
 {
-    DisplayModePtr  mode;
-    RRModePtr	    *rrmodes = NULL;
-    int		    nmode = 0;
-    int		    npreferred = 0;
-    Bool	    ret = TRUE;
-    int		    pref;
+    DisplayModePtr mode;
+    RRModePtr *rrmodes = NULL;
+    int nmode = 0;
+    int npreferred = 0;
+    Bool ret = TRUE;
+    int pref;
 
     for (mode = modes; mode; mode = mode->next)
-	nmode++;
+        nmode++;
 
     if (nmode) {
-	rrmodes = malloc(nmode * sizeof (RRModePtr));
-	
-	if (!rrmodes)
-	    return FALSE;
-	nmode = 0;
-
-	for (pref = 1; pref >= 0; pref--) {
-	    for (mode = modes; mode; mode = mode->next) {
-		if ((pref != 0) == ((mode->type & M_T_PREFERRED) != 0)) {
-		    xRRModeInfo		modeInfo;
-		    RRModePtr		rrmode;
-		    
-		    modeInfo.nameLength = strlen (mode->name);
-		    modeInfo.width = mode->HDisplay;
-		    modeInfo.dotClock = mode->Clock * 1000;
-		    modeInfo.hSyncStart = mode->HSyncStart;
-		    modeInfo.hSyncEnd = mode->HSyncEnd;
-		    modeInfo.hTotal = mode->HTotal;
-		    modeInfo.hSkew = mode->HSkew;
-
-		    modeInfo.height = mode->VDisplay;
-		    modeInfo.vSyncStart = mode->VSyncStart;
-		    modeInfo.vSyncEnd = mode->VSyncEnd;
-		    modeInfo.vTotal = mode->VTotal;
-		    modeInfo.modeFlags = mode->Flags;
-
-		    rrmode = RRModeGet (&modeInfo, mode->name);
-		    if (rrmode) {
-			rrmodes[nmode++] = rrmode;
-			npreferred += pref;
-		    }
-		}
-	    }
-	}
+        rrmodes = malloc(nmode * sizeof(RRModePtr));
+
+        if (!rrmodes)
+            return FALSE;
+        nmode = 0;
+
+        for (pref = 1; pref >= 0; pref--) {
+            for (mode = modes; mode; mode = mode->next) {
+                if ((pref != 0) == ((mode->type & M_T_PREFERRED) != 0)) {
+                    xRRModeInfo modeInfo;
+                    RRModePtr rrmode;
+
+                    modeInfo.nameLength = strlen(mode->name);
+                    modeInfo.width = mode->HDisplay;
+                    modeInfo.dotClock = mode->Clock * 1000;
+                    modeInfo.hSyncStart = mode->HSyncStart;
+                    modeInfo.hSyncEnd = mode->HSyncEnd;
+                    modeInfo.hTotal = mode->HTotal;
+                    modeInfo.hSkew = mode->HSkew;
+
+                    modeInfo.height = mode->VDisplay;
+                    modeInfo.vSyncStart = mode->VSyncStart;
+                    modeInfo.vSyncEnd = mode->VSyncEnd;
+                    modeInfo.vTotal = mode->VTotal;
+                    modeInfo.modeFlags = mode->Flags;
+
+                    rrmode = RRModeGet(&modeInfo, mode->name);
+                    if (rrmode) {
+                        rrmodes[nmode++] = rrmode;
+                        npreferred += pref;
+                    }
+                }
+            }
+        }
     }
-    
-    ret = RROutputSetModes (randr_output, rrmodes, nmode, npreferred);
+
+    ret = RROutputSetModes(randr_output, rrmodes, nmode, npreferred);
     free(rrmodes);
     return ret;
 }
@@ -1445,154 +1432,144 @@ xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
  * Mirror the current mode configuration to RandR
  */
 static Bool
-xf86RandR12SetInfo12 (ScreenPtr pScreen)
+xf86RandR12SetInfo12(ScreenPtr pScreen)
 {
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
-    RROutputPtr		*clones;
-    RRCrtcPtr		*crtcs;
-    int			ncrtc;
-    int			o, c, l;
-    RRCrtcPtr		randr_crtc;
-    int			nclone;
-    
-    clones = malloc(config->num_output * sizeof (RROutputPtr));
-    crtcs = malloc(config->num_crtc * sizeof (RRCrtcPtr));
-    for (o = 0; o < config->num_output; o++)
-    {
-	xf86OutputPtr	output = config->output[o];
-	
-	ncrtc = 0;
-	for (c = 0; c < config->num_crtc; c++)
-	    if (output->possible_crtcs & (1 << c))
-		crtcs[ncrtc++] = config->crtc[c]->randr_crtc;
-
-	if (output->crtc)
-	    randr_crtc = output->crtc->randr_crtc;
-	else
-	    randr_crtc = NULL;
-
-	if (!RROutputSetCrtcs (output->randr_output, crtcs, ncrtc))
-	{
-	    free(crtcs);
-	    free(clones);
-	    return FALSE;
-	}
-
-	RROutputSetPhysicalSize(output->randr_output, 
-				output->mm_width,
-				output->mm_height);
-	xf86RROutputSetModes (output->randr_output, output->probed_modes);
-
-	switch (output->status) {
-	case XF86OutputStatusConnected:
-	    RROutputSetConnection (output->randr_output, RR_Connected);
-	    break;
-	case XF86OutputStatusDisconnected:
-	    RROutputSetConnection (output->randr_output, RR_Disconnected);
-	    break;
-	case XF86OutputStatusUnknown:
-	    RROutputSetConnection (output->randr_output, RR_UnknownConnection);
-	    break;
-	}
-
-	RROutputSetSubpixelOrder (output->randr_output, output->subpixel_order);
-
-	/*
-	 * Valid clones
-	 */
-	nclone = 0;
-	for (l = 0; l < config->num_output; l++)
-	{
-	    xf86OutputPtr	    clone = config->output[l];
-	    
-	    if (l != o && (output->possible_clones & (1 << l)))
-		clones[nclone++] = clone->randr_output;
-	}
-	if (!RROutputSetClones (output->randr_output, clones, nclone))
-	{
-	    free(crtcs);
-	    free(clones);
-	    return FALSE;
-	}
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    RROutputPtr *clones;
+    RRCrtcPtr *crtcs;
+    int ncrtc;
+    int o, c, l;
+    RRCrtcPtr randr_crtc;
+    int nclone;
+
+    clones = malloc(config->num_output * sizeof(RROutputPtr));
+    crtcs = malloc(config->num_crtc * sizeof(RRCrtcPtr));
+    for (o = 0; o < config->num_output; o++) {
+        xf86OutputPtr output = config->output[o];
+
+        ncrtc = 0;
+        for (c = 0; c < config->num_crtc; c++)
+            if (output->possible_crtcs & (1 << c))
+                crtcs[ncrtc++] = config->crtc[c]->randr_crtc;
+
+        if (output->crtc)
+            randr_crtc = output->crtc->randr_crtc;
+        else
+            randr_crtc = NULL;
+
+        if (!RROutputSetCrtcs(output->randr_output, crtcs, ncrtc)) {
+            free(crtcs);
+            free(clones);
+            return FALSE;
+        }
+
+        RROutputSetPhysicalSize(output->randr_output,
+                                output->mm_width, output->mm_height);
+        xf86RROutputSetModes(output->randr_output, output->probed_modes);
+
+        switch (output->status) {
+        case XF86OutputStatusConnected:
+            RROutputSetConnection(output->randr_output, RR_Connected);
+            break;
+        case XF86OutputStatusDisconnected:
+            RROutputSetConnection(output->randr_output, RR_Disconnected);
+            break;
+        case XF86OutputStatusUnknown:
+            RROutputSetConnection(output->randr_output, RR_UnknownConnection);
+            break;
+        }
+
+        RROutputSetSubpixelOrder(output->randr_output, output->subpixel_order);
+
+        /*
+         * Valid clones
+         */
+        nclone = 0;
+        for (l = 0; l < config->num_output; l++) {
+            xf86OutputPtr clone = config->output[l];
+
+            if (l != o && (output->possible_clones & (1 << l)))
+                clones[nclone++] = clone->randr_output;
+        }
+        if (!RROutputSetClones(output->randr_output, clones, nclone)) {
+            free(crtcs);
+            free(clones);
+            return FALSE;
+        }
     }
     free(crtcs);
     free(clones);
     return TRUE;
 }
 
-
-
 /*
  * Query the hardware for the current state, then mirror
  * that to RandR
  */
 static Bool
-xf86RandR12GetInfo12 (ScreenPtr pScreen, Rotation *rotations)
+xf86RandR12GetInfo12(ScreenPtr pScreen, Rotation * rotations)
 {
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 
     if (!pScrn->vtSema)
-	return TRUE;
-    xf86ProbeOutputModes (pScrn, 0, 0);
-    xf86SetScrnInfoModes (pScrn);
-    return xf86RandR12SetInfo12 (pScreen);
+        return TRUE;
+    xf86ProbeOutputModes(pScrn, 0, 0);
+    xf86SetScrnInfoModes(pScrn);
+    return xf86RandR12SetInfo12(pScreen);
 }
 
 static Bool
-xf86RandR12CreateObjects12 (ScreenPtr pScreen)
+xf86RandR12CreateObjects12(ScreenPtr pScreen)
 {
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
-    int			c;
-    int			o;
-    
-    if (!RRInit ())
-	return FALSE;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int c;
+    int o;
+
+    if (!RRInit())
+        return FALSE;
 
     /*
      * Configure crtcs
      */
-    for (c = 0; c < config->num_crtc; c++)
-    {
-	xf86CrtcPtr    crtc = config->crtc[c];
-	
-	crtc->randr_crtc = RRCrtcCreate (pScreen, crtc);
-	RRCrtcGammaSetSize (crtc->randr_crtc, 256);
+    for (c = 0; c < config->num_crtc; c++) {
+        xf86CrtcPtr crtc = config->crtc[c];
+
+        crtc->randr_crtc = RRCrtcCreate(pScreen, crtc);
+        RRCrtcGammaSetSize(crtc->randr_crtc, 256);
     }
     /*
      * Configure outputs
      */
-    for (o = 0; o < config->num_output; o++)
-    {
-	xf86OutputPtr	output = config->output[o];
+    for (o = 0; o < config->num_output; o++) {
+        xf86OutputPtr output = config->output[o];
 
-	output->randr_output = RROutputCreate (pScreen, output->name, 
-					       strlen (output->name),
-					       output);
+        output->randr_output = RROutputCreate(pScreen, output->name,
+                                              strlen(output->name), output);
 
-	if (output->funcs->create_resources != NULL)
-	    output->funcs->create_resources(output);
-	RRPostPendingProperties (output->randr_output);
+        if (output->funcs->create_resources != NULL)
+            output->funcs->create_resources(output);
+        RRPostPendingProperties(output->randr_output);
     }
     return TRUE;
 }
 
 static Bool
-xf86RandR12CreateScreenResources12 (ScreenPtr pScreen)
+xf86RandR12CreateScreenResources12(ScreenPtr pScreen)
 {
-    int			c;
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int c;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
 
     if (xf86RandR12Key == NULL)
-	return TRUE;
+        return TRUE;
 
     for (c = 0; c < config->num_crtc; c++)
-        xf86RandR12CrtcNotify (config->crtc[c]->randr_crtc);
-    
-    RRScreenSetSizeRange (pScreen, config->minWidth, config->minHeight,
-			  config->maxWidth, config->maxHeight);
+        xf86RandR12CrtcNotify(config->crtc[c]->randr_crtc);
+
+    RRScreenSetSizeRange(pScreen, config->minWidth, config->minHeight,
+                         config->maxWidth, config->maxHeight);
     return TRUE;
 }
 
@@ -1602,95 +1579,91 @@ xf86RandR12CreateScreenResources12 (ScreenPtr pScreen)
  */
 
 void
-xf86RandR12TellChanged (ScreenPtr pScreen)
+xf86RandR12TellChanged(ScreenPtr pScreen)
 {
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
-    int			c;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int c;
 
     if (xf86RandR12Key == NULL)
-	return;
+        return;
 
-    xf86RandR12SetInfo12 (pScreen);
+    xf86RandR12SetInfo12(pScreen);
     for (c = 0; c < config->num_crtc; c++)
-	xf86RandR12CrtcNotify (config->crtc[c]->randr_crtc);
+        xf86RandR12CrtcNotify(config->crtc[c]->randr_crtc);
 
-    RRTellChanged (pScreen);
+    RRTellChanged(pScreen);
 }
 
 static void
-xf86RandR12PointerMoved (int scrnIndex, int x, int y)
+xf86RandR12PointerMoved(int scrnIndex, int x, int y)
 {
-    ScreenPtr		pScreen = screenInfo.screens[scrnIndex];
-    ScrnInfoPtr		pScrn   = XF86SCRNINFO(pScreen);
-    xf86CrtcConfigPtr	config  = XF86_CRTC_CONFIG_PTR(pScrn);
-    XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);
+    ScreenPtr pScreen = screenInfo.screens[scrnIndex];
+    ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
     int c;
 
     randrp->pointerX = x;
     randrp->pointerY = y;
     for (c = 0; c < config->num_crtc; c++)
-	xf86RandR13Pan (config->crtc[c], x, y);
+        xf86RandR13Pan(config->crtc[c], x, y);
 }
 
 static Bool
-xf86RandR13GetPanning (ScreenPtr           pScreen,
-		       RRCrtcPtr           randr_crtc,
-		       BoxPtr              totalArea,
-		       BoxPtr              trackingArea,
-		       INT16               *border)
+xf86RandR13GetPanning(ScreenPtr pScreen,
+                      RRCrtcPtr randr_crtc,
+                      BoxPtr totalArea, BoxPtr trackingArea, INT16 *border)
 {
-    xf86CrtcPtr		crtc = randr_crtc->devPrivate;
+    xf86CrtcPtr crtc = randr_crtc->devPrivate;
 
     if (crtc->version < 2)
-	return FALSE;
+        return FALSE;
     if (totalArea)
-	memcpy (totalArea,    &crtc->panningTotalArea,    sizeof(BoxRec));
+        memcpy(totalArea, &crtc->panningTotalArea, sizeof(BoxRec));
     if (trackingArea)
-	memcpy (trackingArea, &crtc->panningTrackingArea, sizeof(BoxRec));
+        memcpy(trackingArea, &crtc->panningTrackingArea, sizeof(BoxRec));
     if (border)
-	memcpy (border,        crtc->panningBorder,       4*sizeof(INT16));
+        memcpy(border, crtc->panningBorder, 4 * sizeof(INT16));
 
     return TRUE;
 }
 
 static Bool
-xf86RandR13SetPanning (ScreenPtr           pScreen,
-		       RRCrtcPtr           randr_crtc,
-		       BoxPtr              totalArea,
-		       BoxPtr              trackingArea,
-		       INT16               *border)
+xf86RandR13SetPanning(ScreenPtr pScreen,
+                      RRCrtcPtr randr_crtc,
+                      BoxPtr totalArea, BoxPtr trackingArea, INT16 *border)
 {
-    XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);
-    xf86CrtcPtr		crtc = randr_crtc->devPrivate;
-    BoxRec		oldTotalArea;
-    BoxRec		oldTrackingArea;
-    INT16		oldBorder[4];
-
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+    xf86CrtcPtr crtc = randr_crtc->devPrivate;
+    BoxRec oldTotalArea;
+    BoxRec oldTrackingArea;
+    INT16 oldBorder[4];
 
     if (crtc->version < 2)
-	return FALSE;
+        return FALSE;
 
-    memcpy (&oldTotalArea,    &crtc->panningTotalArea,    sizeof(BoxRec));
-    memcpy (&oldTrackingArea, &crtc->panningTrackingArea, sizeof(BoxRec));
-    memcpy (oldBorder,         crtc->panningBorder,       4*sizeof(INT16));
+    memcpy(&oldTotalArea, &crtc->panningTotalArea, sizeof(BoxRec));
+    memcpy(&oldTrackingArea, &crtc->panningTrackingArea, sizeof(BoxRec));
+    memcpy(oldBorder, crtc->panningBorder, 4 * sizeof(INT16));
 
     if (totalArea)
-	memcpy (&crtc->panningTotalArea, totalArea, sizeof(BoxRec));
+        memcpy(&crtc->panningTotalArea, totalArea, sizeof(BoxRec));
     if (trackingArea)
-	memcpy (&crtc->panningTrackingArea, trackingArea, sizeof(BoxRec));
+        memcpy(&crtc->panningTrackingArea, trackingArea, sizeof(BoxRec));
     if (border)
-	memcpy (crtc->panningBorder, border, 4*sizeof(INT16));
-
-    if (xf86RandR13VerifyPanningArea (crtc, pScreen->width, pScreen->height)) {
-	xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);
-	return TRUE;
-    } else {
-	/* Restore old settings */
-	memcpy (&crtc->panningTotalArea,    &oldTotalArea,    sizeof(BoxRec));
-	memcpy (&crtc->panningTrackingArea, &oldTrackingArea, sizeof(BoxRec));
-	memcpy (crtc->panningBorder,         oldBorder,       4*sizeof(INT16));
-	return FALSE;
+        memcpy(crtc->panningBorder, border, 4 * sizeof(INT16));
+
+    if (xf86RandR13VerifyPanningArea(crtc, pScreen->width, pScreen->height)) {
+        xf86RandR13Pan(crtc, randrp->pointerX, randrp->pointerY);
+        return TRUE;
+    }
+    else {
+        /* Restore old settings */
+        memcpy(&crtc->panningTotalArea, &oldTotalArea, sizeof(BoxRec));
+        memcpy(&crtc->panningTrackingArea, &oldTrackingArea, sizeof(BoxRec));
+        memcpy(crtc->panningBorder, oldBorder, 4 * sizeof(INT16));
+        return FALSE;
     }
 }
 
@@ -1705,11 +1678,12 @@ gamma_to_ramp(float gamma, CARD16 *ramp, int size)
     int i;
 
     for (i = 0; i < size; i++) {
-	if (gamma == 1.0)
-	    ramp[i] = i << 8;
-	else
-	    ramp[i] = (CARD16)(pow((double)i / (double)(size - 1), 1. / gamma)
-			       * (double)(size - 1) * 256);
+        if (gamma == 1.0)
+            ramp[i] = i << 8;
+        else
+            ramp[i] =
+                (CARD16) (pow((double) i / (double) (size - 1), 1. / gamma)
+                          * (double) (size - 1) * 256);
     }
 }
 
@@ -1722,15 +1696,15 @@ xf86RandR12ChangeGamma(int scrnIndex, Gamma gamma)
     int size;
 
     if (!crtc)
-	return Success;
+        return Success;
 
     size = max(0, crtc->gammaSize);
     if (!size)
-	return Success;
+        return Success;
 
     points = calloc(size, 3 * sizeof(CARD16));
     if (!points)
-	return BadAlloc;
+        return BadAlloc;
 
     red = points;
     green = points + size;
@@ -1749,37 +1723,37 @@ xf86RandR12ChangeGamma(int scrnIndex, Gamma gamma)
 }
 
 static Bool
-xf86RandR12EnterVT (int screen_index, int flags)
+xf86RandR12EnterVT(int screen_index, int flags)
 {
-    ScreenPtr        pScreen = screenInfo.screens[screen_index];
-    ScrnInfoPtr	     pScrn = xf86Screens[screen_index];
-    XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);
-    rrScrPrivPtr     rp = rrGetScrPriv(pScreen);
-    Bool	     ret;
-    int              i;
+    ScreenPtr pScreen = screenInfo.screens[screen_index];
+    ScrnInfoPtr pScrn = xf86Screens[screen_index];
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+    rrScrPrivPtr rp = rrGetScrPriv(pScreen);
+    Bool ret;
+    int i;
 
     if (randrp->orig_EnterVT) {
-	pScrn->EnterVT = randrp->orig_EnterVT;
-	ret = pScrn->EnterVT (screen_index, flags);
-	randrp->orig_EnterVT = pScrn->EnterVT;
-	pScrn->EnterVT = xf86RandR12EnterVT;
-	if (!ret)
-	    return FALSE;
+        pScrn->EnterVT = randrp->orig_EnterVT;
+        ret = pScrn->EnterVT(screen_index, flags);
+        randrp->orig_EnterVT = pScrn->EnterVT;
+        pScrn->EnterVT = xf86RandR12EnterVT;
+        if (!ret)
+            return FALSE;
     }
 
     /* reload gamma */
     for (i = 0; i < rp->numCrtcs; i++)
-	xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);
+        xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);
 
-    return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */
+    return RRGetInfo(pScreen, TRUE);    /* force a re-probe of outputs and notify clients about changes */
 }
 
 static Bool
-xf86RandR12Init12 (ScreenPtr pScreen)
+xf86RandR12Init12(ScreenPtr pScreen)
 {
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    rrScrPrivPtr	rp = rrGetScrPriv(pScreen);
-    XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    rrScrPrivPtr rp = rrGetScrPriv(pScreen);
+    XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
     int i;
 
     rp->rrGetInfo = xf86RandR12GetInfo12;
@@ -1802,16 +1776,16 @@ xf86RandR12Init12 (ScreenPtr pScreen)
     randrp->orig_EnterVT = pScrn->EnterVT;
     pScrn->EnterVT = xf86RandR12EnterVT;
 
-    if (!xf86RandR12CreateObjects12 (pScreen))
-	return FALSE;
+    if (!xf86RandR12CreateObjects12(pScreen))
+        return FALSE;
 
     /*
      * Configure output modes
      */
-    if (!xf86RandR12SetInfo12 (pScreen))
-	return FALSE;
+    if (!xf86RandR12SetInfo12(pScreen))
+        return FALSE;
     for (i = 0; i < rp->numCrtcs; i++) {
-	xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]);
+        xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]);
     }
     return TRUE;
 }
@@ -1819,7 +1793,7 @@ xf86RandR12Init12 (ScreenPtr pScreen)
 #endif
 
 Bool
-xf86RandR12PreInit (ScrnInfoPtr pScrn)
+xf86RandR12PreInit(ScrnInfoPtr pScrn)
 {
     return TRUE;
 }
diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.h b/xorg-server/hw/xfree86/modes/xf86RandR12.h
index 755a472d1..9ad695cec 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.h
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.h
@@ -1,43 +1,46 @@
-/*

- * Copyright © 2006 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 the copyright holders not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  The copyright holders make no representations

- * about the suitability of this software for any purpose.  It is provided "as

- * is" without express or implied warranty.

- *

- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

- * OF THIS SOFTWARE.

- */

-

-#ifndef _XF86_RANDR_H_

-#define _XF86_RANDR_H_

-#include <randrstr.h>

-#include <X11/extensions/render.h>

-#if XF86_MODES_RENAME

-#include "xf86Rename.h"

-#endif

-

-extern _X_EXPORT Bool xf86RandR12CreateScreenResources (ScreenPtr pScreen);

-extern _X_EXPORT Bool xf86RandR12Init(ScreenPtr pScreen);

-extern _X_EXPORT void xf86RandR12CloseScreen(ScreenPtr pScreen);

-extern _X_EXPORT void xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotation);

-extern _X_EXPORT void xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms);

-extern _X_EXPORT Bool xf86RandR12SetConfig(ScreenPtr pScreen, Rotation rotation, int rate,

-			RRScreenSizePtr pSize);

-extern _X_EXPORT Rotation xf86RandR12GetRotation(ScreenPtr pScreen);

-extern _X_EXPORT void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y);

-extern _X_EXPORT Bool xf86RandR12PreInit (ScrnInfoPtr pScrn);

-extern _X_EXPORT void xf86RandR12TellChanged (ScreenPtr pScreen);

-

-#endif /* _XF86_RANDR_H_ */

+/*
+ * Copyright © 2006 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 the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _XF86_RANDR_H_
+#define _XF86_RANDR_H_
+#include <randrstr.h>
+#include <X11/extensions/render.h>
+#if XF86_MODES_RENAME
+#include "xf86Rename.h"
+#endif
+
+extern _X_EXPORT Bool xf86RandR12CreateScreenResources(ScreenPtr pScreen);
+extern _X_EXPORT Bool xf86RandR12Init(ScreenPtr pScreen);
+extern _X_EXPORT void xf86RandR12CloseScreen(ScreenPtr pScreen);
+extern _X_EXPORT void xf86RandR12SetRotations(ScreenPtr pScreen,
+                                              Rotation rotation);
+extern _X_EXPORT void xf86RandR12SetTransformSupport(ScreenPtr pScreen,
+                                                     Bool transforms);
+extern _X_EXPORT Bool xf86RandR12SetConfig(ScreenPtr pScreen, Rotation rotation,
+                                           int rate, RRScreenSizePtr pSize);
+extern _X_EXPORT Rotation xf86RandR12GetRotation(ScreenPtr pScreen);
+extern _X_EXPORT void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn,
+                                                        int *x, int *y);
+extern _X_EXPORT Bool xf86RandR12PreInit(ScrnInfoPtr pScrn);
+extern _X_EXPORT void xf86RandR12TellChanged(ScreenPtr pScreen);
+
+#endif                          /* _XF86_RANDR_H_ */
diff --git a/xorg-server/hw/xfree86/modes/xf86Rotate.c b/xorg-server/hw/xfree86/modes/xf86Rotate.c
index ff7000b5a..85d75573d 100644
--- a/xorg-server/hw/xfree86/modes/xf86Rotate.c
+++ b/xorg-server/hw/xfree86/modes/xf86Rotate.c
@@ -47,25 +47,25 @@
 /* borrowed from composite extension, move to Render and publish? */
 
 static VisualPtr
-compGetWindowVisual (WindowPtr pWin)
+compGetWindowVisual(WindowPtr pWin)
 {
-    ScreenPtr	    pScreen = pWin->drawable.pScreen;
-    VisualID	    vid = wVisual (pWin);
-    int		    i;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    VisualID vid = wVisual(pWin);
+    int i;
 
     for (i = 0; i < pScreen->numVisuals; i++)
-	if (pScreen->visuals[i].vid == vid)
-	    return &pScreen->visuals[i];
+        if (pScreen->visuals[i].vid == vid)
+            return &pScreen->visuals[i];
     return 0;
 }
 
 static PictFormatPtr
-compWindowFormat (WindowPtr pWin)
+compWindowFormat(WindowPtr pWin)
 {
-    ScreenPtr	pScreen = pWin->drawable.pScreen;
-    
-    return PictureMatchVisual (pScreen, pWin->drawable.depth,
-			       compGetWindowVisual (pWin));
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    return PictureMatchVisual(pScreen, pWin->drawable.depth,
+                              compGetWindowVisual(pWin));
 }
 
 #define F(x)	IntToxFixed(x)
@@ -73,201 +73,190 @@ compWindowFormat (WindowPtr pWin)
 #define toF(x)	((float) (x) / 65536.0f)
 
 static void
-xf86RotateCrtcRedisplay (xf86CrtcPtr crtc, RegionPtr region)
+xf86RotateCrtcRedisplay(xf86CrtcPtr crtc, RegionPtr region)
 {
-    ScrnInfoPtr		scrn = crtc->scrn;
-    ScreenPtr		screen = scrn->pScreen;
-    WindowPtr		root = screen->root;
-    PixmapPtr		dst_pixmap = crtc->rotatedPixmap;
-    PictFormatPtr	format = compWindowFormat (screen->root);
-    int			error;
-    PicturePtr		src, dst;
-    int			n = RegionNumRects(region);
-    BoxPtr		b = RegionRects(region);
-    XID			include_inferiors = IncludeInferiors;
+    ScrnInfoPtr scrn = crtc->scrn;
+    ScreenPtr screen = scrn->pScreen;
+    WindowPtr root = screen->root;
+    PixmapPtr dst_pixmap = crtc->rotatedPixmap;
+    PictFormatPtr format = compWindowFormat(screen->root);
+    int error;
+    PicturePtr src, dst;
+    int n = RegionNumRects(region);
+    BoxPtr b = RegionRects(region);
+    XID include_inferiors = IncludeInferiors;
 
     if (crtc->driverIsPerformingTransform)
-	return;
-
-    src = CreatePicture (None,
-			 &root->drawable,
-			 format,
-			 CPSubwindowMode,
-			 &include_inferiors,
-			 serverClient,
-			 &error);
+        return;
+
+    src = CreatePicture(None,
+                        &root->drawable,
+                        format,
+                        CPSubwindowMode,
+                        &include_inferiors, serverClient, &error);
     if (!src)
-	return;
-
-    dst = CreatePicture (None,
-			 &dst_pixmap->drawable,
-			 format,
-			 0L,
-			 NULL,
-			 serverClient,
-			 &error);
+        return;
+
+    dst = CreatePicture(None,
+                        &dst_pixmap->drawable,
+                        format, 0L, NULL, serverClient, &error);
     if (!dst)
-	return;
+        return;
 
-    error = SetPictureTransform (src, &crtc->crtc_to_framebuffer);
+    error = SetPictureTransform(src, &crtc->crtc_to_framebuffer);
     if (error)
-	return;
+        return;
     if (crtc->transform_in_use && crtc->filter)
-	SetPicturePictFilter (src, crtc->filter,
-			      crtc->params, crtc->nparams);
-
-    if (crtc->shadowClear)
-    {
-	CompositePicture (PictOpSrc,
-			  src, NULL, dst,
-			  0, 0, 0, 0, 0, 0,
-			  crtc->mode.HDisplay, crtc->mode.VDisplay);
-	crtc->shadowClear = FALSE;
+        SetPicturePictFilter(src, crtc->filter, crtc->params, crtc->nparams);
+
+    if (crtc->shadowClear) {
+        CompositePicture(PictOpSrc,
+                         src, NULL, dst,
+                         0, 0, 0, 0, 0, 0,
+                         crtc->mode.HDisplay, crtc->mode.VDisplay);
+        crtc->shadowClear = FALSE;
     }
-    else
-    {
-	while (n--)
-	{
-	    BoxRec	dst_box;
-
-	    dst_box = *b;
-	    dst_box.x1 -= crtc->filter_width >> 1;
-	    dst_box.x2 += crtc->filter_width >> 1;
-	    dst_box.y1 -= crtc->filter_height >> 1;
-	    dst_box.y2 += crtc->filter_height >> 1;
-	    pixman_f_transform_bounds (&crtc->f_framebuffer_to_crtc, &dst_box);
-	    CompositePicture (PictOpSrc,
-			      src, NULL, dst,
-			      dst_box.x1, dst_box.y1, 0, 0, dst_box.x1, dst_box.y1,
-			      dst_box.x2 - dst_box.x1,
-			      dst_box.y2 - dst_box.y1);
-	    b++;
-	}
+    else {
+        while (n--) {
+            BoxRec dst_box;
+
+            dst_box = *b;
+            dst_box.x1 -= crtc->filter_width >> 1;
+            dst_box.x2 += crtc->filter_width >> 1;
+            dst_box.y1 -= crtc->filter_height >> 1;
+            dst_box.y2 += crtc->filter_height >> 1;
+            pixman_f_transform_bounds(&crtc->f_framebuffer_to_crtc, &dst_box);
+            CompositePicture(PictOpSrc,
+                             src, NULL, dst,
+                             dst_box.x1, dst_box.y1, 0, 0, dst_box.x1,
+                             dst_box.y1, dst_box.x2 - dst_box.x1,
+                             dst_box.y2 - dst_box.y1);
+            b++;
+        }
     }
-    FreePicture (src, None);
-    FreePicture (dst, None);
+    FreePicture(src, None);
+    FreePicture(dst, None);
 }
 
 static void
-xf86CrtcDamageShadow (xf86CrtcPtr crtc)
+xf86CrtcDamageShadow(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr	pScrn = crtc->scrn;
-    BoxRec	damage_box;
-    RegionRec   damage_region;
-    ScreenPtr	pScreen = pScrn->pScreen;
+    ScrnInfoPtr pScrn = crtc->scrn;
+    BoxRec damage_box;
+    RegionRec damage_region;
+    ScreenPtr pScreen = pScrn->pScreen;
 
     damage_box.x1 = 0;
     damage_box.x2 = crtc->mode.HDisplay;
     damage_box.y1 = 0;
     damage_box.y2 = crtc->mode.VDisplay;
-    if (!pixman_transform_bounds (&crtc->crtc_to_framebuffer, &damage_box))
-    {
-	damage_box.x1 = 0;
-	damage_box.y1 = 0;
-	damage_box.x2 = pScreen->width;
-	damage_box.y2 = pScreen->height;
+    if (!pixman_transform_bounds(&crtc->crtc_to_framebuffer, &damage_box)) {
+        damage_box.x1 = 0;
+        damage_box.y1 = 0;
+        damage_box.x2 = pScreen->width;
+        damage_box.y2 = pScreen->height;
     }
-    if (damage_box.x1 < 0) damage_box.x1 = 0;
-    if (damage_box.y1 < 0) damage_box.y1 = 0;
-    if (damage_box.x2 > pScreen->width) damage_box.x2 = pScreen->width;
-    if (damage_box.y2 > pScreen->height) damage_box.y2 = pScreen->height;
+    if (damage_box.x1 < 0)
+        damage_box.x1 = 0;
+    if (damage_box.y1 < 0)
+        damage_box.y1 = 0;
+    if (damage_box.x2 > pScreen->width)
+        damage_box.x2 = pScreen->width;
+    if (damage_box.y2 > pScreen->height)
+        damage_box.y2 = pScreen->height;
     RegionInit(&damage_region, &damage_box, 1);
-    DamageDamageRegion (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,
-			&damage_region);
+    DamageDamageRegion(&(*pScreen->GetScreenPixmap) (pScreen)->drawable,
+                       &damage_region);
     RegionUninit(&damage_region);
     crtc->shadowClear = TRUE;
 }
 
 static void
-xf86RotatePrepare (ScreenPtr pScreen)
+xf86RotatePrepare(ScreenPtr pScreen)
 {
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    int			c;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int c;
 
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-	
-	if (crtc->rotatedData && !crtc->rotatedPixmap)
-	{
-	    crtc->rotatedPixmap = crtc->funcs->shadow_create (crtc,
-							     crtc->rotatedData,
-							     crtc->mode.HDisplay,
-							     crtc->mode.VDisplay);
-	    if (!xf86_config->rotation_damage_registered)
-	    {
-		/* Hook damage to screen pixmap */
-		DamageRegister (&pScreen->root->drawable,
-				xf86_config->rotation_damage);
-		xf86_config->rotation_damage_registered = TRUE;
-		EnableLimitedSchedulingLatency();
-	    }
-	    
-	    xf86CrtcDamageShadow (crtc);
-	}
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+        if (crtc->rotatedData && !crtc->rotatedPixmap) {
+            crtc->rotatedPixmap = crtc->funcs->shadow_create(crtc,
+                                                             crtc->rotatedData,
+                                                             crtc->mode.
+                                                             HDisplay,
+                                                             crtc->mode.
+                                                             VDisplay);
+            if (!xf86_config->rotation_damage_registered) {
+                /* Hook damage to screen pixmap */
+                DamageRegister(&pScreen->root->drawable,
+                               xf86_config->rotation_damage);
+                xf86_config->rotation_damage_registered = TRUE;
+                EnableLimitedSchedulingLatency();
+            }
+
+            xf86CrtcDamageShadow(crtc);
+        }
     }
 }
 
 static Bool
 xf86RotateRedisplay(ScreenPtr pScreen)
 {
-    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    DamagePtr		damage = xf86_config->rotation_damage;
-    RegionPtr		region;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    DamagePtr damage = xf86_config->rotation_damage;
+    RegionPtr region;
 
     if (!damage)
-	return FALSE;
-    xf86RotatePrepare (pScreen);
+        return FALSE;
+    xf86RotatePrepare(pScreen);
     region = DamageRegion(damage);
-    if (RegionNotEmpty(region))
-    {
-	int			c;
-	SourceValidateProcPtr	SourceValidate;
-
-	/*
-	 * SourceValidate is used by the software cursor code
-	 * to pull the cursor off of the screen when reading
-	 * bits from the frame buffer. Bypassing this function
-	 * leaves the software cursor in place
-	 */
-	SourceValidate = pScreen->SourceValidate;
-	pScreen->SourceValidate = NULL;
-
-	for (c = 0; c < xf86_config->num_crtc; c++)
-	{
-	    xf86CrtcPtr	    crtc = xf86_config->crtc[c];
-
-	    if (crtc->transform_in_use && crtc->enabled)
-	    {
-		RegionRec   crtc_damage;
-
-		/* compute portion of damage that overlaps crtc */
-		RegionInit(&crtc_damage, &crtc->bounds, 1);
-		RegionIntersect(&crtc_damage, &crtc_damage, region);
-		
-		/* update damaged region */
-		if (RegionNotEmpty(&crtc_damage))
-    		    xf86RotateCrtcRedisplay (crtc, &crtc_damage);
-		
-		RegionUninit(&crtc_damage);
-	    }
-	}
-	pScreen->SourceValidate = SourceValidate;
-	DamageEmpty(damage);
+    if (RegionNotEmpty(region)) {
+        int c;
+        SourceValidateProcPtr SourceValidate;
+
+        /*
+         * SourceValidate is used by the software cursor code
+         * to pull the cursor off of the screen when reading
+         * bits from the frame buffer. Bypassing this function
+         * leaves the software cursor in place
+         */
+        SourceValidate = pScreen->SourceValidate;
+        pScreen->SourceValidate = NULL;
+
+        for (c = 0; c < xf86_config->num_crtc; c++) {
+            xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+            if (crtc->transform_in_use && crtc->enabled) {
+                RegionRec crtc_damage;
+
+                /* compute portion of damage that overlaps crtc */
+                RegionInit(&crtc_damage, &crtc->bounds, 1);
+                RegionIntersect(&crtc_damage, &crtc_damage, region);
+
+                /* update damaged region */
+                if (RegionNotEmpty(&crtc_damage))
+                    xf86RotateCrtcRedisplay(crtc, &crtc_damage);
+
+                RegionUninit(&crtc_damage);
+            }
+        }
+        pScreen->SourceValidate = SourceValidate;
+        DamageEmpty(damage);
     }
     return TRUE;
 }
 
 static void
 xf86RotateBlockHandler(int screenNum, pointer blockData,
-		       pointer pTimeout, pointer pReadmask)
+                       pointer pTimeout, pointer pReadmask)
 {
-    ScreenPtr		pScreen = screenInfo.screens[screenNum];
-    ScrnInfoPtr		pScrn = xf86Screens[screenNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    Bool		rotation_active;
+    ScreenPtr pScreen = screenInfo.screens[screenNum];
+    ScrnInfoPtr pScrn = xf86Screens[screenNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    Bool rotation_active;
 
     rotation_active = xf86RotateRedisplay(pScreen);
     pScreen->BlockHandler = xf86_config->BlockHandler;
@@ -278,40 +267,38 @@ xf86RotateBlockHandler(int screenNum, pointer blockData,
 }
 
 void
-xf86RotateDestroy (xf86CrtcPtr crtc)
+xf86RotateDestroy(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr		pScrn = crtc->scrn;
-    ScreenPtr		pScreen = pScrn->pScreen;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    int			c;
-    
+    ScrnInfoPtr pScrn = crtc->scrn;
+    ScreenPtr pScreen = pScrn->pScreen;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int c;
+
     /* Free memory from rotation */
-    if (crtc->rotatedPixmap || crtc->rotatedData)
-    {
-	crtc->funcs->shadow_destroy (crtc, crtc->rotatedPixmap, crtc->rotatedData);
-	crtc->rotatedPixmap = NULL;
-	crtc->rotatedData = NULL;
+    if (crtc->rotatedPixmap || crtc->rotatedData) {
+        crtc->funcs->shadow_destroy(crtc, crtc->rotatedPixmap,
+                                    crtc->rotatedData);
+        crtc->rotatedPixmap = NULL;
+        crtc->rotatedData = NULL;
     }
 
     for (c = 0; c < xf86_config->num_crtc; c++)
-	if (xf86_config->crtc[c]->rotatedData)
-	    return;
+        if (xf86_config->crtc[c]->rotatedData)
+            return;
 
     /*
      * Clean up damage structures when no crtcs are rotated
      */
-    if (xf86_config->rotation_damage)
-    {
-	/* Free damage structure */
-	if (xf86_config->rotation_damage_registered)
-	{
-	    DamageUnregister (&pScreen->root->drawable,
-			      xf86_config->rotation_damage);
-	    xf86_config->rotation_damage_registered = FALSE;
-	    DisableLimitedSchedulingLatency();
-	}
-	DamageDestroy (xf86_config->rotation_damage);
-	xf86_config->rotation_damage = NULL;
+    if (xf86_config->rotation_damage) {
+        /* Free damage structure */
+        if (xf86_config->rotation_damage_registered) {
+            DamageUnregister(&pScreen->root->drawable,
+                             xf86_config->rotation_damage);
+            xf86_config->rotation_damage_registered = FALSE;
+            DisableLimitedSchedulingLatency();
+        }
+        DamageDestroy(xf86_config->rotation_damage);
+        xf86_config->rotation_damage = NULL;
     }
 }
 
@@ -321,193 +308,186 @@ xf86RotateFreeShadow(ScrnInfoPtr pScrn)
     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
     int c;
 
-   for (c = 0; c < config->num_crtc; c++) {
-       xf86CrtcPtr crtc = config->crtc[c];
+    for (c = 0; c < config->num_crtc; c++) {
+        xf86CrtcPtr crtc = config->crtc[c];
 
-       if (crtc->rotatedPixmap || crtc->rotatedData) {
-	   crtc->funcs->shadow_destroy(crtc, crtc->rotatedPixmap,
-				crtc->rotatedData);
-	   crtc->rotatedPixmap = NULL;
-	   crtc->rotatedData = NULL;
-       }
-   }
+        if (crtc->rotatedPixmap || crtc->rotatedData) {
+            crtc->funcs->shadow_destroy(crtc, crtc->rotatedPixmap,
+                                        crtc->rotatedData);
+            crtc->rotatedPixmap = NULL;
+            crtc->rotatedData = NULL;
+        }
+    }
 }
 
 void
-xf86RotateCloseScreen (ScreenPtr screen)
+xf86RotateCloseScreen(ScreenPtr screen)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
 
     for (c = 0; c < xf86_config->num_crtc; c++)
-	xf86RotateDestroy (xf86_config->crtc[c]);
+        xf86RotateDestroy(xf86_config->crtc[c]);
 }
 
 static Bool
-xf86CrtcFitsScreen (xf86CrtcPtr crtc, struct pict_f_transform *crtc_to_fb)
+xf86CrtcFitsScreen(xf86CrtcPtr crtc, struct pict_f_transform *crtc_to_fb)
 {
-    ScrnInfoPtr		pScrn = crtc->scrn;
-    BoxRec		b;
+    ScrnInfoPtr pScrn = crtc->scrn;
+    BoxRec b;
 
     /* When called before PreInit, the driver is
      * presumably doing load detect
      */
     if (pScrn->virtualX == 0 || pScrn->virtualY == 0)
-	return TRUE;
+        return TRUE;
 
     b.x1 = 0;
     b.y1 = 0;
     b.x2 = crtc->mode.HDisplay;
     b.y2 = crtc->mode.VDisplay;
     if (crtc_to_fb)
-	pixman_f_transform_bounds (crtc_to_fb, &b);
+        pixman_f_transform_bounds(crtc_to_fb, &b);
     else {
-	b.x1 += crtc->x;
-	b.y1 += crtc->y;
-	b.x2 += crtc->x;
-	b.y2 += crtc->y;
+        b.x1 += crtc->x;
+        b.y1 += crtc->y;
+        b.x2 += crtc->x;
+        b.y2 += crtc->y;
     }
 
     return (0 <= b.x1 && b.x2 <= pScrn->virtualX &&
-	    0 <= b.y1 && b.y2 <= pScrn->virtualY);
+            0 <= b.y1 && b.y2 <= pScrn->virtualY);
 }
 
 Bool
-xf86CrtcRotate (xf86CrtcPtr crtc)
+xf86CrtcRotate(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr		pScrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    ScrnInfoPtr pScrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+
     /* if this is called during ScreenInit() we don't have pScrn->pScreen yet */
-    ScreenPtr		pScreen = screenInfo.screens[pScrn->scrnIndex];
-    PictTransform	crtc_to_fb;
+    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
+    PictTransform crtc_to_fb;
     struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc;
-    xFixed		*new_params = NULL;
-    int			new_nparams = 0;
-    PictFilterPtr	new_filter = NULL;
-    int			new_width = 0;
-    int			new_height = 0;
-    RRTransformPtr	transform = NULL;
-    Bool		damage = FALSE;
+    xFixed *new_params = NULL;
+    int new_nparams = 0;
+    PictFilterPtr new_filter = NULL;
+    int new_width = 0;
+    int new_height = 0;
+    RRTransformPtr transform = NULL;
+    Bool damage = FALSE;
 
     if (crtc->transformPresent)
-	transform = &crtc->transform;
-
-    if (!RRTransformCompute (crtc->x, crtc->y,
-			     crtc->mode.HDisplay, crtc->mode.VDisplay,
-			     crtc->rotation,
-			     transform,
-
-			     &crtc_to_fb,
-			     &f_crtc_to_fb,
-			     &f_fb_to_crtc) &&
-	xf86CrtcFitsScreen (crtc, &f_crtc_to_fb))
-    {
-	/*
-	 * If the untranslated transformation is the identity,
-	 * disable the shadow buffer
-	 */
-	xf86RotateDestroy (crtc);
-	crtc->transform_in_use = FALSE;
-	free(new_params);
-	new_params = NULL;
-	new_nparams = 0;
-	new_filter = NULL;
-	new_width = 0;
-	new_height = 0;
+        transform = &crtc->transform;
+
+    if (!RRTransformCompute(crtc->x, crtc->y,
+                            crtc->mode.HDisplay, crtc->mode.VDisplay,
+                            crtc->rotation,
+                            transform,
+                            &crtc_to_fb,
+                            &f_crtc_to_fb,
+                            &f_fb_to_crtc) &&
+        xf86CrtcFitsScreen(crtc, &f_crtc_to_fb)) {
+        /*
+         * If the untranslated transformation is the identity,
+         * disable the shadow buffer
+         */
+        xf86RotateDestroy(crtc);
+        crtc->transform_in_use = FALSE;
+        free(new_params);
+        new_params = NULL;
+        new_nparams = 0;
+        new_filter = NULL;
+        new_width = 0;
+        new_height = 0;
     }
-    else
-    {
-	if (crtc->driverIsPerformingTransform) {
-	    xf86RotateDestroy(crtc);
-	} else {
-	    /*
-	     * these are the size of the shadow pixmap, which
-	     * matches the mode, not the pre-rotated copy in the
-	     * frame buffer
-	     */
-	    int		width = crtc->mode.HDisplay;
-	    int		height = crtc->mode.VDisplay;
-	    void	*shadowData = crtc->rotatedData;
-	    PixmapPtr	shadow = crtc->rotatedPixmap;
-	    int		old_width = shadow ? shadow->drawable.width : 0;
-	    int		old_height = shadow ? shadow->drawable.height : 0;
-
-	    /* Allocate memory for rotation */
-	    if (old_width != width || old_height != height)
-	    {
-		if (shadow || shadowData)
-		{
-		    crtc->funcs->shadow_destroy (crtc, shadow, shadowData);
-		    crtc->rotatedPixmap = NULL;
-		    crtc->rotatedData = NULL;
-		}
-		shadowData = crtc->funcs->shadow_allocate (crtc, width, height);
-		if (!shadowData)
-		    goto bail1;
-		crtc->rotatedData = shadowData;
-		/* shadow will be damaged in xf86RotatePrepare */
-	    }
-	    else
-	    {
-		/* mark shadowed area as damaged so it will be repainted */
-		damage = TRUE;
-	    }
-
-	    if (!xf86_config->rotation_damage)
-	    {
-		/* Create damage structure */
-		xf86_config->rotation_damage = DamageCreate (NULL, NULL,
-						    DamageReportNone,
-						    TRUE, pScreen, pScreen);
-		if (!xf86_config->rotation_damage)
-		    goto bail2;
-
-		/* Wrap block handler */
-		if (!xf86_config->BlockHandler) {
-		    xf86_config->BlockHandler = pScreen->BlockHandler;
-		    pScreen->BlockHandler = xf86RotateBlockHandler;
-		}
-	    }
-
-	    if (0)
-	    {
-	bail2:
-		if (shadow || shadowData)
-		{
-		    crtc->funcs->shadow_destroy (crtc, shadow, shadowData);
-		    crtc->rotatedPixmap = NULL;
-		    crtc->rotatedData = NULL;
-		}
-	bail1:
-		if (old_width && old_height)
-		    crtc->rotatedPixmap =
-			crtc->funcs->shadow_create (crtc, NULL, old_width,
-						    old_height);
-		return FALSE;
-	    }
-	}
+    else {
+        if (crtc->driverIsPerformingTransform) {
+            xf86RotateDestroy(crtc);
+        }
+        else {
+            /*
+             * these are the size of the shadow pixmap, which
+             * matches the mode, not the pre-rotated copy in the
+             * frame buffer
+             */
+            int width = crtc->mode.HDisplay;
+            int height = crtc->mode.VDisplay;
+            void *shadowData = crtc->rotatedData;
+            PixmapPtr shadow = crtc->rotatedPixmap;
+            int old_width = shadow ? shadow->drawable.width : 0;
+            int old_height = shadow ? shadow->drawable.height : 0;
+
+            /* Allocate memory for rotation */
+            if (old_width != width || old_height != height) {
+                if (shadow || shadowData) {
+                    crtc->funcs->shadow_destroy(crtc, shadow, shadowData);
+                    crtc->rotatedPixmap = NULL;
+                    crtc->rotatedData = NULL;
+                }
+                shadowData = crtc->funcs->shadow_allocate(crtc, width, height);
+                if (!shadowData)
+                    goto bail1;
+                crtc->rotatedData = shadowData;
+                /* shadow will be damaged in xf86RotatePrepare */
+            }
+            else {
+                /* mark shadowed area as damaged so it will be repainted */
+                damage = TRUE;
+            }
+
+            if (!xf86_config->rotation_damage) {
+                /* Create damage structure */
+                xf86_config->rotation_damage = DamageCreate(NULL, NULL,
+                                                            DamageReportNone,
+                                                            TRUE, pScreen,
+                                                            pScreen);
+                if (!xf86_config->rotation_damage)
+                    goto bail2;
+
+                /* Wrap block handler */
+                if (!xf86_config->BlockHandler) {
+                    xf86_config->BlockHandler = pScreen->BlockHandler;
+                    pScreen->BlockHandler = xf86RotateBlockHandler;
+                }
+            }
+
+            if (0) {
+ bail2:
+                if (shadow || shadowData) {
+                    crtc->funcs->shadow_destroy(crtc, shadow, shadowData);
+                    crtc->rotatedPixmap = NULL;
+                    crtc->rotatedData = NULL;
+                }
+ bail1:
+                if (old_width && old_height)
+                    crtc->rotatedPixmap =
+                        crtc->funcs->shadow_create(crtc, NULL, old_width,
+                                                   old_height);
+                return FALSE;
+            }
+        }
 #ifdef RANDR_12_INTERFACE
-	if (transform)
-	{
-	    if (transform->nparams) {
-		new_params = malloc(transform->nparams * sizeof (xFixed));
-		if (new_params) {
-		    memcpy (new_params, transform->params,
-			    transform->nparams * sizeof (xFixed));
-		    new_nparams = transform->nparams;
-		    new_filter = transform->filter;
-		}
-	    } else
-		new_filter = transform->filter;
-	    if (new_filter)
-	    {
-		new_width = new_filter->width;
-		new_height = new_filter->height;
-	    }
-	}
+        if (transform) {
+            if (transform->nparams) {
+                new_params = malloc(transform->nparams * sizeof(xFixed));
+                if (new_params) {
+                    memcpy(new_params, transform->params,
+                           transform->nparams * sizeof(xFixed));
+                    new_nparams = transform->nparams;
+                    new_filter = transform->filter;
+                }
+            }
+            else
+                new_filter = transform->filter;
+            if (new_filter) {
+                new_width = new_filter->width;
+                new_height = new_filter->height;
+            }
+        }
 #endif
-	crtc->transform_in_use = TRUE;
+        crtc->transform_in_use = TRUE;
     }
     crtc->crtc_to_framebuffer = crtc_to_fb;
     crtc->f_crtc_to_framebuffer = f_crtc_to_fb;
@@ -522,10 +502,10 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
     crtc->bounds.x2 = crtc->mode.HDisplay;
     crtc->bounds.y1 = 0;
     crtc->bounds.y2 = crtc->mode.VDisplay;
-    pixman_f_transform_bounds (&f_crtc_to_fb, &crtc->bounds);
+    pixman_f_transform_bounds(&f_crtc_to_fb, &crtc->bounds);
 
     if (damage)
-        xf86CrtcDamageShadow (crtc);
+        xf86CrtcDamageShadow(crtc);
 
     /* All done */
     return TRUE;
diff --git a/xorg-server/hw/xfree86/modes/xf86cvt.c b/xorg-server/hw/xfree86/modes/xf86cvt.c
index d5fecccb5..de0784493 100644
--- a/xorg-server/hw/xfree86/modes/xf86cvt.c
+++ b/xorg-server/hw/xfree86/modes/xf86cvt.c
@@ -65,12 +65,12 @@
  */
 DisplayModePtr
 xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
-	    Bool Interlaced)
+            Bool Interlaced)
 {
-    DisplayModeRec  *Mode = xnfcalloc(1, sizeof(DisplayModeRec));
+    DisplayModeRec *Mode = xnfcalloc(1, sizeof(DisplayModeRec));
 
     /* 1) top/bottom margin size (% of height) - default: 1.8 */
-#define CVT_MARGIN_PERCENTAGE 1.8    
+#define CVT_MARGIN_PERCENTAGE 1.8
 
     /* 2) character cell horizontal granularity (pixels) - default 8 */
 #define CVT_H_GRANULARITY 8
@@ -85,10 +85,10 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
 #define CVT_CLOCK_STEP 250
 
     Bool Margins = FALSE;
-    float  VFieldRate, HPeriod;
-    int  HDisplayRnd, HMargin;
-    int  VDisplayRnd, VMargin, VSync;
-    float  Interlace; /* Please rename this */
+    float VFieldRate, HPeriod;
+    int HDisplayRnd, HMargin;
+    int VDisplayRnd, VMargin, VSync;
+    float Interlace;            /* Please rename this */
 
     /* CVT default is 60.0Hz */
     if (!VRefresh)
@@ -108,11 +108,12 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
         /* right margin is actually exactly the same as left */
         HMargin = (((float) HDisplayRnd) * CVT_MARGIN_PERCENTAGE / 100.0);
         HMargin -= HMargin % CVT_H_GRANULARITY;
-    } else
+    }
+    else
         HMargin = 0;
 
     /* 4. Find total active pixels */
-    Mode->HDisplay = HDisplayRnd + 2*HMargin;
+    Mode->HDisplay = HDisplayRnd + 2 * HMargin;
 
     /* 5. Find number of lines per field */
     if (Interlaced)
@@ -128,7 +129,7 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
     else
         VMargin = 0;
 
-    Mode->VDisplay = VDisplay + 2*VMargin;
+    Mode->VDisplay = VDisplay + 2 * VMargin;
 
     /* 7. Interlace */
     if (Interlaced)
@@ -147,10 +148,10 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
         VSync = 7;
     else if (!(VDisplay % 9) && ((VDisplay * 15 / 9) == HDisplay))
         VSync = 7;
-    else /* Custom */
+    else                        /* Custom */
         VSync = 10;
 
-    if (!Reduced) { /* simplified GTF calculation */
+    if (!Reduced) {             /* simplified GTF calculation */
 
         /* 4) Minimum time of vertical sync + back porch interval (µs) 
          * default 550.0 */
@@ -159,19 +160,20 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
         /* 3) Nominal HSync width (% of line period) - default 8 */
 #define CVT_HSYNC_PERCENTAGE 8
 
-        float  HBlankPercentage;
-        int  VSyncAndBackPorch, VBackPorch;
-        int  HBlank;
+        float HBlankPercentage;
+        int VSyncAndBackPorch, VBackPorch;
+        int HBlank;
 
         /* 8. Estimated Horizontal period */
-        HPeriod = ((float) (1000000.0 / VFieldRate - CVT_MIN_VSYNC_BP)) / 
+        HPeriod = ((float) (1000000.0 / VFieldRate - CVT_MIN_VSYNC_BP)) /
             (VDisplayRnd + 2 * VMargin + CVT_MIN_V_PORCH + Interlace);
 
         /* 9. Find number of lines in sync + backporch */
-        if (((int)(CVT_MIN_VSYNC_BP / HPeriod) + 1) < (VSync + CVT_MIN_V_PORCH))
+        if (((int) (CVT_MIN_VSYNC_BP / HPeriod) + 1) <
+            (VSync + CVT_MIN_V_PORCH))
             VSyncAndBackPorch = VSync + CVT_MIN_V_PORCH;
         else
-            VSyncAndBackPorch = (int)(CVT_MIN_VSYNC_BP / HPeriod) + 1;
+            VSyncAndBackPorch = (int) (CVT_MIN_VSYNC_BP / HPeriod) + 1;
 
         /* 10. Find number of lines in back porch */
         VBackPorch = VSyncAndBackPorch - VSync;
@@ -198,31 +200,32 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
         CVT_J_FACTOR
 
         /* 12. Find ideal blanking duty cycle from formula */
-        HBlankPercentage = CVT_C_PRIME - CVT_M_PRIME * HPeriod/1000.0;
+        HBlankPercentage = CVT_C_PRIME - CVT_M_PRIME * HPeriod / 1000.0;
 
         /* 13. Blanking time */
         if (HBlankPercentage < 20)
             HBlankPercentage = 20;
 
-        HBlank = Mode->HDisplay * HBlankPercentage/(100.0 - HBlankPercentage);
-        HBlank -= HBlank % (2*CVT_H_GRANULARITY);
-        
+        HBlank = Mode->HDisplay * HBlankPercentage / (100.0 - HBlankPercentage);
+        HBlank -= HBlank % (2 * CVT_H_GRANULARITY);
+
         /* 14. Find total number of pixels in a line. */
         Mode->HTotal = Mode->HDisplay + HBlank;
 
         /* Fill in HSync values */
         Mode->HSyncEnd = Mode->HDisplay + HBlank / 2;
 
-        Mode->HSyncStart = Mode->HSyncEnd - 
+        Mode->HSyncStart = Mode->HSyncEnd -
             (Mode->HTotal * CVT_HSYNC_PERCENTAGE) / 100;
-        Mode->HSyncStart += CVT_H_GRANULARITY - 
+        Mode->HSyncStart += CVT_H_GRANULARITY -
             Mode->HSyncStart % CVT_H_GRANULARITY;
 
         /* Fill in VSync values */
         Mode->VSyncStart = Mode->VDisplay + CVT_MIN_V_PORCH;
         Mode->VSyncEnd = Mode->VSyncStart + VSync;
 
-    } else { /* Reduced blanking */
+    }
+    else {                      /* Reduced blanking */
         /* Minimum vertical blanking interval time (µs) - default 460 */
 #define CVT_RB_MIN_VBLANK 460.0
 
@@ -235,11 +238,11 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
         /* Fixed number of lines for vertical front porch - default 3 */
 #define CVT_RB_VFPORCH 3
 
-        int  VBILines;
+        int VBILines;
 
         /* 8. Estimate Horizontal period. */
-        HPeriod = ((float) (1000000.0 / VFieldRate - CVT_RB_MIN_VBLANK)) / 
-            (VDisplayRnd + 2*VMargin);
+        HPeriod = ((float) (1000000.0 / VFieldRate - CVT_RB_MIN_VBLANK)) /
+            (VDisplayRnd + 2 * VMargin);
 
         /* 9. Find number of lines in vertical blanking */
         VBILines = ((float) CVT_RB_MIN_VBLANK) / HPeriod + 1;
@@ -247,7 +250,7 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
         /* 10. Check if vertical blanking is sufficient */
         if (VBILines < (CVT_RB_VFPORCH + VSync + CVT_MIN_V_BPORCH))
             VBILines = CVT_RB_VFPORCH + VSync + CVT_MIN_V_BPORCH;
-        
+
         /* 11. Find total number of lines in vertical field */
         Mode->VTotal = VDisplayRnd + 2 * VMargin + Interlace + VBILines;
 
@@ -271,7 +274,7 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
     Mode->HSync = ((float) Mode->Clock) / ((float) Mode->HTotal);
 
     /* 17/15. Find actual Field rate */
-    Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) / 
+    Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) /
         ((float) (Mode->HTotal * Mode->VTotal));
 
     /* 18/16. Find actual vertical frame frequency */
diff --git a/xorg-server/hw/xfree86/modes/xf86gtf.c b/xorg-server/hw/xfree86/modes/xf86gtf.c
index 9d5d50a2d..23707b481 100644
--- a/xorg-server/hw/xfree86/modes/xf86gtf.c
+++ b/xorg-server/hw/xfree86/modes/xf86gtf.c
@@ -61,7 +61,7 @@
 /* Ruthlessly converted to server code by Adam Jackson <ajax@redhat.com> */
 
 #ifdef HAVE_XORG_CONFIG_H
-# include <xorg-config.h>
+#include <xorg-config.h>
 #else
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -88,7 +88,6 @@
 #define C_PRIME           (((C - J) * K/256.0) + J)
 #define M_PRIME           (K/256.0 * M)
 
-
 /*
  * xf86GTFMode() - as defined by the GTF Timing Standard, compute the
  * Stage 1 Parameters using the vertical refresh frequency.  In other
@@ -141,9 +140,9 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
      *
      *  [H PIXELS RND] = ((ROUND([H PIXELS]/[CELL GRAN RND],0))*[CELLGRAN RND])
      */
-    
+
     h_pixels_rnd = rint((float) h_pixels / CELL_GRAN) * CELL_GRAN;
-    
+
     /*  2. If interlace is requested, the number of vertical lines assumed
      *  by the calculation must be halved, as the computation calculates
      *  the number of vertical lines per field. In either case, the
@@ -154,9 +153,8 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
      */
 
     v_lines_rnd = interlaced ?
-            rint((float) v_lines) / 2.0 :
-            rint((float) v_lines);
-    
+        rint((float) v_lines) / 2.0 : rint((float) v_lines);
+
     /*  3. Find the frame rate required:
      *
      *  [V FIELD RATE RQD] = IF([INT RQD?]="y", [I/P FREQ RQD]*2,
@@ -181,7 +179,8 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
      *          0)
      */
 
-    bottom_margin = margins ? rint(MARGIN_PERCENT/100.0 * v_lines_rnd) : (0.0);
+    bottom_margin =
+        margins ? rint(MARGIN_PERCENT / 100.0 * v_lines_rnd) : (0.0);
 
     /*  6. If interlace is required, then set variable [INTERLACE]=0.5:
      *   
@@ -197,8 +196,8 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
      *                     [MIN PORCH RND]+[INTERLACE]) * 1000000
      */
 
-    h_period_est = (((1.0/v_field_rate_rqd) - (MIN_VSYNC_PLUS_BP/1000000.0))
-                    / (v_lines_rnd + (2*top_margin) + MIN_PORCH + interlace)
+    h_period_est = (((1.0 / v_field_rate_rqd) - (MIN_VSYNC_PLUS_BP / 1000000.0))
+                    / (v_lines_rnd + (2 * top_margin) + MIN_PORCH + interlace)
                     * 1000000.0);
 
     /*  8. Find the number of lines in V sync + back porch:
@@ -206,7 +205,7 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
      *  [V SYNC+BP] = ROUND(([MIN VSYNC+BP]/[H PERIOD EST]),0)
      */
 
-    vsync_plus_bp = rint(MIN_VSYNC_PLUS_BP/h_period_est);
+    vsync_plus_bp = rint(MIN_VSYNC_PLUS_BP / h_period_est);
 
     /*  9. Find the number of lines in V back porch alone:
      *
@@ -214,9 +213,9 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
      *
      *  XXX is "[V SYNC RND]" a typo? should be [V SYNC RQD]?
      */
-    
+
     v_back_porch = vsync_plus_bp - V_SYNC_RQD;
-    
+
     /*  10. Find the total number of lines in Vertical field period:
      *
      *  [TOTAL V LINES] = [V LINES RND] + [TOP MARGIN (LINES)] +
@@ -226,21 +225,21 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
 
     total_v_lines = v_lines_rnd + top_margin + bottom_margin + vsync_plus_bp +
         interlace + MIN_PORCH;
-    
+
     /*  11. Estimate the Vertical field frequency:
      *
      *  [V FIELD RATE EST] = 1 / [H PERIOD EST] / [TOTAL V LINES] * 1000000
      */
 
     v_field_rate_est = 1.0 / h_period_est / total_v_lines * 1000000.0;
-    
+
     /*  12. Find the actual horizontal period:
      *
      *  [H PERIOD] = [H PERIOD EST] / ([V FIELD RATE RQD] / [V FIELD RATE EST])
      */
 
     h_period = h_period_est / (v_field_rate_rqd / v_field_rate_est);
-    
+
     /*  13. Find the actual Vertical field frequency:
      *
      *  [V FIELD RATE] = 1 / [H PERIOD] / [TOTAL V LINES] * 1000000
@@ -266,7 +265,7 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
     left_margin = margins ?
         rint(h_pixels_rnd * MARGIN_PERCENT / 100.0 / CELL_GRAN) * CELL_GRAN :
         0.0;
-    
+
     /*  16. Find number of pixels in right margin:
      *
      *  [RIGHT MARGIN (PIXELS)] = (IF( [MARGINS RQD?]="Y",
@@ -274,11 +273,11 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
      *                   [CELL GRAN RND]),0)) * [CELL GRAN RND],
      *          0))
      */
-    
+
     right_margin = margins ?
         rint(h_pixels_rnd * MARGIN_PERCENT / 100.0 / CELL_GRAN) * CELL_GRAN :
         0.0;
-    
+
     /*  17. Find total number of active pixels in image and left and right
      *  margins:
      *
@@ -287,7 +286,7 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
      */
 
     total_active_pixels = h_pixels_rnd + left_margin + right_margin;
-    
+
     /*  18. Find the ideal blanking duty cycle from the blanking duty cycle
      *  equation:
      *
@@ -295,7 +294,7 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
      */
 
     ideal_duty_cycle = C_PRIME - (M_PRIME * h_period / 1000.0);
-    
+
     /*  19. Find the number of pixels in the blanking time to the nearest
      *  double character cell:
      *
@@ -310,34 +309,32 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
                    ideal_duty_cycle /
                    (100.0 - ideal_duty_cycle) /
                    (2.0 * CELL_GRAN)) * (2.0 * CELL_GRAN);
-    
+
     /*  20. Find total number of pixels:
      *
      *  [TOTAL PIXELS] = [TOTAL ACTIVE PIXELS] + [H BLANK (PIXELS)]
      */
 
     total_pixels = total_active_pixels + h_blank;
-    
+
     /*  21. Find pixel clock frequency:
      *
      *  [PIXEL FREQ] = [TOTAL PIXELS] / [H PERIOD]
      */
-    
+
     pixel_freq = total_pixels / h_period;
-    
+
     /*  22. Find horizontal frequency:
      *
      *  [H FREQ] = 1000 / [H PERIOD]
      */
 
     h_freq = 1000.0 / h_period;
-    
 
     /* Stage 1 computations are now complete; I should really pass
        the results to another function and do the Stage 2
        computations, but I only need a few more values so I'll just
        append the computations here for now */
-    
 
     /*  17. Find the number of pixels in the horizontal sync period:
      *
@@ -345,7 +342,8 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
      *                             [CELL GRAN RND]),0))*[CELL GRAN RND]
      */
 
-    h_sync = rint(H_SYNC_PERCENT/100.0 * total_pixels / CELL_GRAN) * CELL_GRAN;
+    h_sync =
+        rint(H_SYNC_PERCENT / 100.0 * total_pixels / CELL_GRAN) * CELL_GRAN;
 
     /*  18. Find the number of pixels in the horizontal front porch period:
      *
@@ -358,30 +356,30 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
      *
      *  [V ODD FRONT PORCH(LINES)]=([MIN PORCH RND]+[INTERLACE])
      */
-    
+
     v_odd_front_porch_lines = MIN_PORCH + interlace;
-    
+
     /* finally, pack the results in the mode struct */
 
-    mode->HDisplay	= (int) (h_pixels_rnd);
-    mode->HSyncStart	= (int) (h_pixels_rnd + h_front_porch);
-    mode->HSyncEnd	= (int) (h_pixels_rnd + h_front_porch + h_sync);
-    mode->HTotal	= (int) (total_pixels);
-    mode->VDisplay	= (int) (v_lines_rnd);
-    mode->VSyncStart	= (int) (v_lines_rnd + v_odd_front_porch_lines);
-    mode->VSyncEnd	= (int) (v_lines_rnd + v_odd_front_porch_lines + V_SYNC_RQD);
-    mode->VTotal	= (int) (total_v_lines);
+    mode->HDisplay = (int) (h_pixels_rnd);
+    mode->HSyncStart = (int) (h_pixels_rnd + h_front_porch);
+    mode->HSyncEnd = (int) (h_pixels_rnd + h_front_porch + h_sync);
+    mode->HTotal = (int) (total_pixels);
+    mode->VDisplay = (int) (v_lines_rnd);
+    mode->VSyncStart = (int) (v_lines_rnd + v_odd_front_porch_lines);
+    mode->VSyncEnd = (int) (v_lines_rnd + v_odd_front_porch_lines + V_SYNC_RQD);
+    mode->VTotal = (int) (total_v_lines);
 
-    mode->Clock	    = (int) (pixel_freq * 1000.0);
-    mode->HSync	    = h_freq;
-    mode->VRefresh  = freq;
+    mode->Clock = (int) (pixel_freq * 1000.0);
+    mode->HSync = h_freq;
+    mode->VRefresh = freq;
 
     xf86SetModeDefaultName(mode);
 
     mode->Flags = V_NHSYNC | V_PVSYNC;
     if (interlaced) {
-	mode->VTotal *= 2;
-	mode->Flags |= V_INTERLACE;
+        mode->VTotal *= 2;
+        mode->Flags |= V_INTERLACE;
     }
 
     return mode;
diff --git a/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c b/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c
index 882fb3b46..91f9fc826 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c
@@ -65,21 +65,21 @@ memory_base(void)
     static unsigned long base = 0;
 
     if (base == 0) {
-	size_t len = sizeof(base);
-	int error;
+        size_t len = sizeof(base);
+        int error;
+
 #ifdef __OpenBSD__
-       int mib[3];
+        int mib[3];
 
-       mib[0] = CTL_MACHDEP;
-       mib[1] = CPU_CHIPSET;
-       mib[2] = CPU_CHIPSET_MEM;
+        mib[0] = CTL_MACHDEP;
+        mib[1] = CPU_CHIPSET;
+        mib[2] = CPU_CHIPSET_MEM;
 
-       if ((error = sysctl(mib, 3, &base, &len, NULL, 0)) < 0)
+        if ((error = sysctl(mib, 3, &base, &len, NULL, 0)) < 0)
 #else
-	if ((error = sysctlbyname("hw.chipset.memory", &base, &len,
-				  0, 0)) < 0)
+        if ((error = sysctlbyname("hw.chipset.memory", &base, &len, 0, 0)) < 0)
 #endif
-	    FatalError("xf86MapVidMem: can't find memory\n");
+            FatalError("xf86MapVidMem: can't find memory\n");
     }
 
     return base;
@@ -91,6 +91,7 @@ has_bwx(void)
     static int bwx = 0;
     size_t len = sizeof(bwx);
     int error;
+
 #ifdef __OpenBSD__
     int mib[3];
 
@@ -99,76 +100,74 @@ has_bwx(void)
     mib[2] = CPU_CHIPSET_BWX;
 
     if ((error = sysctl(mib, 3, &bwx, &len, NULL, 0)) < 0)
-	return FALSE;
+        return FALSE;
     else
-	return bwx;
+        return bwx;
 #else
     if ((error = sysctlbyname("hw.chipset.bwx", &bwx, &len, 0, 0)) < 0)
-	return FALSE;
+        return FALSE;
     else
-	return bwx;
+        return bwx;
 #endif
 }
-#else /* __NetBSD__ */
+#else                           /* __NetBSD__ */
 static unsigned long hae_thresh = (1UL << 24);
-static unsigned long hae_mask = 0xf8000000UL; /* XXX - should use xf86AXP.c */
+static unsigned long hae_mask = 0xf8000000UL;   /* XXX - should use xf86AXP.c */
 static struct alpha_bus_window *abw;
 static int abw_count = -1;
 
 static void
 init_abw(void)
 {
-	if (abw_count < 0) {
-		abw_count = alpha_bus_getwindows(ALPHA_BUS_TYPE_PCI_MEM, &abw);
-		if (abw_count <= 0)
-			FatalError("init_abw: alpha_bus_getwindows failed\n");
-	}
+    if (abw_count < 0) {
+        abw_count = alpha_bus_getwindows(ALPHA_BUS_TYPE_PCI_MEM, &abw);
+        if (abw_count <= 0)
+            FatalError("init_abw: alpha_bus_getwindows failed\n");
+    }
 }
 
 static int
 has_bwx(void)
 {
-	if (abw_count < 0)
-		init_abw();
+    if (abw_count < 0)
+        init_abw();
 
-	xf86Msg(X_INFO, "has_bwx = %d\n", 
-		abw[0].abw_abst.abst_flags & ABST_BWX ? 1 : 0);	/* XXXX */
-	return abw[0].abw_abst.abst_flags & ABST_BWX;
+    xf86Msg(X_INFO, "has_bwx = %d\n", abw[0].abw_abst.abst_flags & ABST_BWX ? 1 : 0);   /* XXXX */
+    return abw[0].abw_abst.abst_flags & ABST_BWX;
 }
 
 static unsigned long
 dense_base(void)
 {
-	if (abw_count < 0)
-		init_abw();
+    if (abw_count < 0)
+        init_abw();
 
-	/* XXX check abst_flags for ABST_DENSE just to be safe? */
-	xf86Msg(X_INFO, "dense base = %#lx\n", 
-		abw[0].abw_abst.abst_sys_start); /* XXXX */
-	return abw[0].abw_abst.abst_sys_start;
+    /* XXX check abst_flags for ABST_DENSE just to be safe? */
+    xf86Msg(X_INFO, "dense base = %#lx\n", abw[0].abw_abst.abst_sys_start);     /* XXXX */
+    return abw[0].abw_abst.abst_sys_start;
 }
 
 static unsigned long
 memory_base(void)
 {
-	if (abw_count < 0)
-		init_abw();
-	
-	if (abw_count > 1) {
-		xf86Msg(X_INFO, "memory base = %#lx\n", 
-			abw[1].abw_abst.abst_sys_start); /* XXXX */
-		return abw[1].abw_abst.abst_sys_start;
-	} else if (abw_count == 1) {
-		/* assume memory_base == dense_base */
-		xf86Msg(X_INFO, "memory base = %#lx\n",
-			abw[0].abw_abst.abst_sys_start); /* XXXX */
-		return abw[0].abw_abst.abst_sys_start;
-	} else {
-		xf86Msg(X_INFO, "no memory base\n"); /* XXXX */
-		return 0;
-	}
+    if (abw_count < 0)
+        init_abw();
+
+    if (abw_count > 1) {
+        xf86Msg(X_INFO, "memory base = %#lx\n", abw[1].abw_abst.abst_sys_start);        /* XXXX */
+        return abw[1].abw_abst.abst_sys_start;
+    }
+    else if (abw_count == 1) {
+        /* assume memory_base == dense_base */
+        xf86Msg(X_INFO, "memory base = %#lx\n", abw[0].abw_abst.abst_sys_start);        /* XXXX */
+        return abw[0].abw_abst.abst_sys_start;
+    }
+    else {
+        xf86Msg(X_INFO, "no memory base\n");    /* XXXX */
+        return 0;
+    }
 }
-#endif /* __NetBSD__ */
+#endif                          /* __NetBSD__ */
 
 #define BUS_BASE	dense_base()
 #define BUS_BASE_BWX	memory_base()
@@ -184,7 +183,7 @@ memory_base(void)
 #endif
 
 static Bool useDevMem = FALSE;
-static int  devMemFd = -1;
+static int devMemFd = -1;
 
 #ifdef HAS_APERTURE_DRV
 #define DEV_APERTURE "/dev/xf86"
@@ -202,148 +201,144 @@ static void unmapVidMemSparse(int, pointer, unsigned long);
 static void
 checkDevMem(Bool warn)
 {
-	static Bool devMemChecked = FALSE;
-	int fd;
-	pointer base;
+    static Bool devMemChecked = FALSE;
+    int fd;
+    pointer base;
 
-	if (devMemChecked)
-	    return;
-	devMemChecked = TRUE;
+    if (devMemChecked)
+        return;
+    devMemChecked = TRUE;
 
 #ifdef HAS_APERTURE_DRV
-       /* Try the aperture driver first */
-       if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0) {
-           /* Try to map a page at the VGA address */
-           base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
-                            MAP_FLAGS, fd, (off_t)0xA0000 + BUS_BASE);
-       
-           if (base != MAP_FAILED) {
-               munmap((caddr_t)base, 4096);
-               devMemFd = fd;
-               useDevMem = TRUE;
-               xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
-                       DEV_APERTURE);
-               return;
-           } else {
-               if (warn) {
-                   xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-                           DEV_APERTURE, strerror(errno));
-               }
-           }
-       } 
+    /* Try the aperture driver first */
+    if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0) {
+        /* Try to map a page at the VGA address */
+        base = mmap((caddr_t) 0, 4096, PROT_READ | PROT_WRITE,
+                    MAP_FLAGS, fd, (off_t) 0xA0000 + BUS_BASE);
+
+        if (base != MAP_FAILED) {
+            munmap((caddr_t) base, 4096);
+            devMemFd = fd;
+            useDevMem = TRUE;
+            xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
+                    DEV_APERTURE);
+            return;
+        }
+        else {
+            if (warn) {
+                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+                        DEV_APERTURE, strerror(errno));
+            }
+        }
+    }
 #endif
-       if ((fd = open(DEV_MEM, O_RDWR)) >= 0) {
-	    /* Try to map a page at the VGA address */
-	    base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
-				 MAP_FLAGS, fd, (off_t)0xA0000 + BUS_BASE);
-	
-	    if (base != MAP_FAILED) {
-		munmap((caddr_t)base, 4096);
-		devMemFd = fd;
-		useDevMem = TRUE;
-		return;
-	    } else {
-		if (warn) {
-		    xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-			    DEV_MEM, strerror(errno));
-		}
-	    }
-	}
-	if (warn) { 
+    if ((fd = open(DEV_MEM, O_RDWR)) >= 0) {
+        /* Try to map a page at the VGA address */
+        base = mmap((caddr_t) 0, 4096, PROT_READ | PROT_WRITE,
+                    MAP_FLAGS, fd, (off_t) 0xA0000 + BUS_BASE);
+
+        if (base != MAP_FAILED) {
+            munmap((caddr_t) base, 4096);
+            devMemFd = fd;
+            useDevMem = TRUE;
+            return;
+        }
+        else {
+            if (warn) {
+                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+                        DEV_MEM, strerror(errno));
+            }
+        }
+    }
+    if (warn) {
 #ifndef HAS_APERTURE_DRV
-           xf86Msg(X_WARNING, "checkDevMem: failed to open/mmap %s (%s)\n",
-                   DEV_MEM, strerror(errno));
+        xf86Msg(X_WARNING, "checkDevMem: failed to open/mmap %s (%s)\n",
+                DEV_MEM, strerror(errno));
 #else
 #ifndef __OpenBSD__
-           xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-               "\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno));
-#else /* __OpenBSD__ */
-           xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-                   "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
-                   SYSCTL_MSG);
-#endif /* __OpenBSD__ */
+        xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
+                "\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno));
+#else                           /* __OpenBSD__ */
+        xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
+                "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
+                SYSCTL_MSG);
+#endif                          /* __OpenBSD__ */
 #endif
-           xf86ErrorF("\tlinear framebuffer access unavailable\n");
-	}
-	useDevMem = FALSE;
-	return;
+        xf86ErrorF("\tlinear framebuffer access unavailable\n");
+    }
+    useDevMem = FALSE;
+    return;
 }
 
 void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
-	checkDevMem(TRUE);
-	pVidMem->linearSupported = useDevMem;
-
-	if (has_bwx()) {
-	    xf86Msg(X_PROBED,"Machine type has 8/16 bit access\n");
-	    pVidMem->mapMem = mapVidMem;
-	    pVidMem->unmapMem = unmapVidMem;
-	} else {
-	    xf86Msg(X_PROBED,"Machine needs sparse mapping\n");
-	    pVidMem->mapMem = mapVidMemSparse;
-	    pVidMem->unmapMem = unmapVidMemSparse;
+    checkDevMem(TRUE);
+    pVidMem->linearSupported = useDevMem;
+
+    if (has_bwx()) {
+        xf86Msg(X_PROBED, "Machine type has 8/16 bit access\n");
+        pVidMem->mapMem = mapVidMem;
+        pVidMem->unmapMem = unmapVidMem;
+    }
+    else {
+        xf86Msg(X_PROBED, "Machine needs sparse mapping\n");
+        pVidMem->mapMem = mapVidMemSparse;
+        pVidMem->unmapMem = unmapVidMemSparse;
 #ifndef __NetBSD__
-	    if (axpSystem == -1)
-                axpSystem = bsdGetAXP(); 
-	    hae_thresh = xf86AXPParams[axpSystem].hae_thresh;
-            hae_mask = xf86AXPParams[axpSystem].hae_mask;
-#endif /* __NetBSD__ */
-	}
-	pVidMem->initialised = TRUE;
+        if (axpSystem == -1)
+            axpSystem = bsdGetAXP();
+        hae_thresh = xf86AXPParams[axpSystem].hae_thresh;
+        hae_mask = xf86AXPParams[axpSystem].hae_mask;
+#endif                          /* __NetBSD__ */
+    }
+    pVidMem->initialised = TRUE;
 }
 
 static pointer
 mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 {
-	pointer base;
-
-	checkDevMem(FALSE);
-	Base = Base & ((1L<<32) - 1);
-
-	if (useDevMem)
-	{
-	    if (devMemFd < 0) 
-	    {
-		FatalError("xf86MapVidMem: failed to open %s (%s)\n",
-			   DEV_MEM, strerror(errno));
-	    }
-	    base = mmap((caddr_t)0, Size,
-			(flags & VIDMEM_READONLY) ?
-			 PROT_READ : (PROT_READ | PROT_WRITE),
-			 MAP_FLAGS, devMemFd, (off_t)Base + BUS_BASE_BWX);
-	    if (base == MAP_FAILED)
-	    {
-		FatalError("%s: could not mmap %s [s=%lx,a=%lx] (%s)\n",
-			   "xf86MapVidMem", DEV_MEM, Size, Base, 
-			   strerror(errno));
-	    }
-	    return base;
-	}
-		
-	/* else, mmap /dev/vga */
-	if ((unsigned long)Base < 0xA0000 || (unsigned long)Base >= 0xC0000)
-	{
-		FatalError("%s: Address 0x%lx outside allowable range\n",
-			   "xf86MapVidMem", Base);
-	}
-	base = mmap(0, Size,
-		    (flags & VIDMEM_READONLY) ?
-		     PROT_READ : (PROT_READ | PROT_WRITE),
-		    MAP_FLAGS, xf86Info.consoleFd,
-		    (unsigned long)Base + BUS_BASE);
-	if (base == MAP_FAILED)
-	{
-	    FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n",
-		       strerror(errno));
-	}
-	return base;
+    pointer base;
+
+    checkDevMem(FALSE);
+    Base = Base & ((1L << 32) - 1);
+
+    if (useDevMem) {
+        if (devMemFd < 0) {
+            FatalError("xf86MapVidMem: failed to open %s (%s)\n",
+                       DEV_MEM, strerror(errno));
+        }
+        base = mmap((caddr_t) 0, Size,
+                    (flags & VIDMEM_READONLY) ?
+                    PROT_READ : (PROT_READ | PROT_WRITE),
+                    MAP_FLAGS, devMemFd, (off_t) Base + BUS_BASE_BWX);
+        if (base == MAP_FAILED) {
+            FatalError("%s: could not mmap %s [s=%lx,a=%lx] (%s)\n",
+                       "xf86MapVidMem", DEV_MEM, Size, Base, strerror(errno));
+        }
+        return base;
+    }
+
+    /* else, mmap /dev/vga */
+    if ((unsigned long) Base < 0xA0000 || (unsigned long) Base >= 0xC0000) {
+        FatalError("%s: Address 0x%lx outside allowable range\n",
+                   "xf86MapVidMem", Base);
+    }
+    base = mmap(0, Size,
+                (flags & VIDMEM_READONLY) ?
+                PROT_READ : (PROT_READ | PROT_WRITE),
+                MAP_FLAGS, xf86Info.consoleFd, (unsigned long) Base + BUS_BASE);
+    if (base == MAP_FAILED) {
+        FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n",
+                   strerror(errno));
+    }
+    return base;
 }
 
 static void
 unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 {
-	munmap((caddr_t)Base, Size);
+    munmap((caddr_t) Base, Size);
 }
 
 /*
@@ -352,45 +347,44 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 
 int
 xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
+             int Len)
 {
-	unsigned char *ptr;
-	int psize;
-	int mlen;
-
-	checkDevMem(TRUE);
-	if (devMemFd == -1) {
-	    return -1;
-	}
-
-	psize = getpagesize();
-	Offset += Base & (psize - 1);
-	Base &= ~(psize - 1);
-	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-	ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ,
-					MAP_SHARED, devMemFd, (off_t)Base+BUS_BASE);
-	if ((long)ptr == -1)
-	{
-		xf86Msg(X_WARNING, 
-			"xf86ReadBIOS: %s mmap[s=%x,a=%lx,o=%lx] failed (%s)\n",
-			DEV_MEM, Len, Base, Offset, strerror(errno));
-		return -1;
-	}
+    unsigned char *ptr;
+    int psize;
+    int mlen;
+
+    checkDevMem(TRUE);
+    if (devMemFd == -1) {
+        return -1;
+    }
+
+    psize = getpagesize();
+    Offset += Base & (psize - 1);
+    Base &= ~(psize - 1);
+    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
+    ptr = (unsigned char *) mmap((caddr_t) 0, mlen, PROT_READ,
+                                 MAP_SHARED, devMemFd, (off_t) Base + BUS_BASE);
+    if ((long) ptr == -1) {
+        xf86Msg(X_WARNING,
+                "xf86ReadBIOS: %s mmap[s=%x,a=%lx,o=%lx] failed (%s)\n",
+                DEV_MEM, Len, Base, Offset, strerror(errno));
+        return -1;
+    }
 #ifdef DEBUG
-	xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
-		Base, ptr[0] | (ptr[1] << 8));
+    xf86MsgVerb(X_INFO, 3,
+                "xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n", Base,
+                ptr[0] | (ptr[1] << 8));
 #endif
-	(void)memcpy(Buf, (void *)(ptr + Offset), Len);
-	(void)munmap((caddr_t)ptr, mlen);
+    (void) memcpy(Buf, (void *) (ptr + Offset), Len);
+    (void) munmap((caddr_t) ptr, mlen);
 #ifdef DEBUG
-	xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
-		"-> %02x %02x %02x %02x...\n",
-		Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
+    xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
+                "-> %02x %02x %02x %02x...\n",
+                Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
 #endif
-	return Len;
+    return Len;
 }
 
-
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 
 extern int ioperm(unsigned long from, unsigned long num, int on);
@@ -399,34 +393,34 @@ Bool
 xf86EnableIO()
 {
     if (!ioperm(0, 65536, TRUE))
-	return TRUE;
+        return TRUE;
     return FALSE;
 }
 
 void
 xf86DisableIO()
 {
-	return;
+    return;
 }
 
-#endif /* __FreeBSD_kernel__ || __OpenBSD__ */
+#endif                          /* __FreeBSD_kernel__ || __OpenBSD__ */
 
 #ifdef USE_ALPHA_PIO
 
 Bool
 xf86EnableIO()
 {
-	alpha_pci_io_enable(1);
-	return TRUE;
+    alpha_pci_io_enable(1);
+    return TRUE;
 }
 
 void
 xf86DisableIO()
 {
-	alpha_pci_io_enable(0);
+    alpha_pci_io_enable(0);
 }
 
-#endif /* USE_ALPHA_PIO */
+#endif                          /* USE_ALPHA_PIO */
 
 #define vuip    volatile unsigned int *
 
@@ -437,39 +431,39 @@ extern int readDense8(pointer Base, register unsigned long Offset);
 extern int readDense16(pointer Base, register unsigned long Offset);
 extern int readDense32(pointer Base, register unsigned long Offset);
 extern void
-writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
 extern void
-writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
 extern void
-writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
 extern void
-writeDense8(int Value, pointer Base, register unsigned long Offset);
+ writeDense8(int Value, pointer Base, register unsigned long Offset);
 extern void
-writeDense16(int Value, pointer Base, register unsigned long Offset);
+ writeDense16(int Value, pointer Base, register unsigned long Offset);
 extern void
-writeDense32(int Value, pointer Base, register unsigned long Offset);
+ writeDense32(int Value, pointer Base, register unsigned long Offset);
 
 static int readSparse8(pointer Base, register unsigned long Offset);
 static int readSparse16(pointer Base, register unsigned long Offset);
 static int readSparse32(pointer Base, register unsigned long Offset);
 static void
-writeSparseNB8(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB8(int Value, pointer Base, register unsigned long Offset);
 static void
-writeSparseNB16(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB16(int Value, pointer Base, register unsigned long Offset);
 static void
-writeSparseNB32(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB32(int Value, pointer Base, register unsigned long Offset);
 static void
-writeSparse8(int Value, pointer Base, register unsigned long Offset);
+ writeSparse8(int Value, pointer Base, register unsigned long Offset);
 static void
-writeSparse16(int Value, pointer Base, register unsigned long Offset);
+ writeSparse16(int Value, pointer Base, register unsigned long Offset);
 static void
-writeSparse32(int Value, pointer Base, register unsigned long Offset);
+ writeSparse32(int Value, pointer Base, register unsigned long Offset);
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 extern int sysarch(int, void *);
 
 struct parms {
-	u_int64_t hae;
+    u_int64_t hae;
 };
 
 static void
@@ -478,50 +472,49 @@ sethae(u_int64_t hae)
 #ifndef ALPHA_SETHAE
 #define ALPHA_SETHAE 0
 #endif
-	static struct parms p;
+    static struct parms p;
 
-	if (p.hae != hae) {
-		p.hae = hae;
-		sysarch(ALPHA_SETHAE, (char *)&p);
-	}
+    if (p.hae != hae) {
+        p.hae = hae;
+        sysarch(ALPHA_SETHAE, (char *) &p);
+    }
 }
 #endif
 
 static pointer
-mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
+mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size,
+                int flags)
 {
     static Bool was_here = FALSE;
 
     if (!was_here) {
-      was_here = TRUE;
-
-      checkDevMem(FALSE);
-
-      xf86WriteMmio8 = writeSparse8;
-      xf86WriteMmio16 = writeSparse16;
-      xf86WriteMmio32 = writeSparse32;
-      xf86WriteMmioNB8 = writeSparseNB8;
-      xf86WriteMmioNB16 = writeSparseNB16;
-      xf86WriteMmioNB32 = writeSparseNB32;
-      xf86ReadMmio8 = readSparse8;
-      xf86ReadMmio16 = readSparse16;
-      xf86ReadMmio32 = readSparse32;
-	
-      memBase = mmap((caddr_t)0, 0x100000000,
-		     PROT_READ | PROT_WRITE,
-		     MAP_SHARED, devMemFd,
-		     (off_t) BUS_BASE);
-      memSBase = mmap((caddr_t)0, 0x100000000,
-		      PROT_READ | PROT_WRITE,
-		      MAP_SHARED, devMemFd,
-		      (off_t) BUS_BASE_BWX);
-      
-      if (memSBase == MAP_FAILED || memBase == MAP_FAILED)	{
-	FatalError("xf86MapVidMem: Could not mmap framebuffer (%s)\n",
-		   strerror(errno));
-      }
+        was_here = TRUE;
+
+        checkDevMem(FALSE);
+
+        xf86WriteMmio8 = writeSparse8;
+        xf86WriteMmio16 = writeSparse16;
+        xf86WriteMmio32 = writeSparse32;
+        xf86WriteMmioNB8 = writeSparseNB8;
+        xf86WriteMmioNB16 = writeSparseNB16;
+        xf86WriteMmioNB32 = writeSparseNB32;
+        xf86ReadMmio8 = readSparse8;
+        xf86ReadMmio16 = readSparse16;
+        xf86ReadMmio32 = readSparse32;
+
+        memBase = mmap((caddr_t) 0, 0x100000000,
+                       PROT_READ | PROT_WRITE,
+                       MAP_SHARED, devMemFd, (off_t) BUS_BASE);
+        memSBase = mmap((caddr_t) 0, 0x100000000,
+                        PROT_READ | PROT_WRITE,
+                        MAP_SHARED, devMemFd, (off_t) BUS_BASE_BWX);
+
+        if (memSBase == MAP_FAILED || memBase == MAP_FAILED) {
+            FatalError("xf86MapVidMem: Could not mmap framebuffer (%s)\n",
+                       strerror(errno));
+        }
     }
-    return (pointer)((unsigned long)memBase + Base);
+    return (pointer) ((unsigned long) memBase + Base);
 }
 
 static void
@@ -534,17 +527,18 @@ readSparse8(pointer Base, register unsigned long Offset)
 {
     register unsigned long result, shift;
     register unsigned long msb;
+
     mem_barrier();
-    Offset += (unsigned long)Base - (unsigned long)memBase;
+    Offset += (unsigned long) Base - (unsigned long) memBase;
     shift = (Offset & 0x3) << 3;
-      if (Offset >= (hae_thresh)) {
+    if (Offset >= (hae_thresh)) {
         msb = Offset & hae_mask;
         Offset -= msb;
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-	sethae(msb);
+        sethae(msb);
 #endif
-      }
-    result = *(vuip) ((unsigned long)memSBase + (Offset << 5));
+    }
+    result = *(vuip) ((unsigned long) memSBase + (Offset << 5));
     result >>= shift;
     return 0xffUL & result;
 }
@@ -556,16 +550,17 @@ readSparse16(pointer Base, register unsigned long Offset)
     register unsigned long msb;
 
     mem_barrier();
-    Offset += (unsigned long)Base - (unsigned long)memBase;
+    Offset += (unsigned long) Base - (unsigned long) memBase;
     shift = (Offset & 0x2) << 3;
     if (Offset >= (hae_thresh)) {
         msb = Offset & hae_mask;
         Offset -= msb;
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-	sethae(msb);
+        sethae(msb);
 #endif
     }
-    result = *(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2)));
+    result =
+        *(vuip) ((unsigned long) memSBase + (Offset << 5) + (1 << (5 - 2)));
     result >>= shift;
     return 0xffffUL & result;
 }
@@ -574,7 +569,7 @@ static int
 readSparse32(pointer Base, register unsigned long Offset)
 {
     mem_barrier();
-    return *(vuip)((unsigned long)Base+(Offset));
+    return *(vuip) ((unsigned long) Base + (Offset));
 }
 
 static void
@@ -584,15 +579,15 @@ writeSparse8(int Value, pointer Base, register unsigned long Offset)
     register unsigned int b = Value & 0xffU;
 
     write_mem_barrier();
-    Offset += (unsigned long)Base - (unsigned long)memBase;
+    Offset += (unsigned long) Base - (unsigned long) memBase;
     if (Offset >= (hae_thresh)) {
-      msb = Offset & hae_mask;
-      Offset -= msb;
+        msb = Offset & hae_mask;
+        Offset -= msb;
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-	sethae(msb);
+        sethae(msb);
 #endif
     }
-    *(vuip) ((unsigned long)memSBase + (Offset << 5)) = b * 0x01010101;
+    *(vuip) ((unsigned long) memSBase + (Offset << 5)) = b * 0x01010101;
 }
 
 static void
@@ -602,16 +597,16 @@ writeSparse16(int Value, pointer Base, register unsigned long Offset)
     register unsigned int w = Value & 0xffffU;
 
     write_mem_barrier();
-    Offset += (unsigned long)Base - (unsigned long)memBase;
+    Offset += (unsigned long) Base - (unsigned long) memBase;
     if (Offset >= (hae_thresh)) {
-      msb = Offset & hae_mask;
-      Offset -= msb;
+        msb = Offset & hae_mask;
+        Offset -= msb;
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-	sethae(msb);
+        sethae(msb);
 #endif
     }
-    *(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2))) =
-      w * 0x00010001;
+    *(vuip) ((unsigned long) memSBase + (Offset << 5) + (1 << (5 - 2))) =
+        w * 0x00010001;
 
 }
 
@@ -619,7 +614,7 @@ static void
 writeSparse32(int Value, pointer Base, register unsigned long Offset)
 {
     write_mem_barrier();
-    *(vuip)((unsigned long)Base + (Offset)) = Value;
+    *(vuip) ((unsigned long) Base + (Offset)) = Value;
     return;
 }
 
@@ -629,15 +624,15 @@ writeSparseNB8(int Value, pointer Base, register unsigned long Offset)
     register unsigned long msb;
     register unsigned int b = Value & 0xffU;
 
-    Offset += (unsigned long)Base - (unsigned long)memBase;
+    Offset += (unsigned long) Base - (unsigned long) memBase;
     if (Offset >= (hae_thresh)) {
-      msb = Offset & hae_mask;
-      Offset -= msb;
+        msb = Offset & hae_mask;
+        Offset -= msb;
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-	sethae(msb);
+        sethae(msb);
 #endif
     }
-    *(vuip) ((unsigned long)memSBase + (Offset << 5)) = b * 0x01010101;
+    *(vuip) ((unsigned long) memSBase + (Offset << 5)) = b * 0x01010101;
 }
 
 static void
@@ -646,41 +641,40 @@ writeSparseNB16(int Value, pointer Base, register unsigned long Offset)
     register unsigned long msb;
     register unsigned int w = Value & 0xffffU;
 
-    Offset += (unsigned long)Base - (unsigned long)memBase;
+    Offset += (unsigned long) Base - (unsigned long) memBase;
     if (Offset >= (hae_thresh)) {
-      msb = Offset & hae_mask ;
-      Offset -= msb;
+        msb = Offset & hae_mask;
+        Offset -= msb;
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-	sethae(msb);
+        sethae(msb);
 #endif
     }
-    *(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2))) =
-      w * 0x00010001;
+    *(vuip) ((unsigned long) memSBase + (Offset << 5) + (1 << (5 - 2))) =
+        w * 0x00010001;
 }
 
 static void
 writeSparseNB32(int Value, pointer Base, register unsigned long Offset)
 {
-    *(vuip)((unsigned long)Base + (Offset)) = Value;
+    *(vuip) ((unsigned long) Base + (Offset)) = Value;
     return;
 }
 
-void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset)
-     = writeDense8;
-void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset)
-     = writeDense16;
-void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset)
-     = writeDense32;
-void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset)
-     = writeDenseNB8;
-void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset)
-     = writeDenseNB16;
-void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset)
-     = writeDenseNB32;
-int  (*xf86ReadMmio8)(pointer Base, unsigned long Offset)
-     = readDense8;
-int  (*xf86ReadMmio16)(pointer Base, unsigned long Offset)
-     = readDense16;
-int  (*xf86ReadMmio32)(pointer Base, unsigned long Offset)
-     = readDense32;
-
+void (*xf86WriteMmio8) (int Value, pointer Base, unsigned long Offset)
+    = writeDense8;
+void (*xf86WriteMmio16) (int Value, pointer Base, unsigned long Offset)
+    = writeDense16;
+void (*xf86WriteMmio32) (int Value, pointer Base, unsigned long Offset)
+    = writeDense32;
+void (*xf86WriteMmioNB8) (int Value, pointer Base, unsigned long Offset)
+    = writeDenseNB8;
+void (*xf86WriteMmioNB16) (int Value, pointer Base, unsigned long Offset)
+    = writeDenseNB16;
+void (*xf86WriteMmioNB32) (int Value, pointer Base, unsigned long Offset)
+    = writeDenseNB32;
+int (*xf86ReadMmio8) (pointer Base, unsigned long Offset)
+    = readDense8;
+int (*xf86ReadMmio16) (pointer Base, unsigned long Offset)
+    = readDense16;
+int (*xf86ReadMmio32) (pointer Base, unsigned long Offset)
+    = readDense32;
diff --git a/xorg-server/hw/xfree86/os-support/bsd/arm_video.c b/xorg-server/hw/xfree86/os-support/bsd/arm_video.c
index 1de6c87d6..71064af03 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/arm_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/arm_video.c
@@ -68,8 +68,7 @@
 
 #ifdef __arm32__
 #include "machine/devmap.h"
-struct memAccess
-{
+struct memAccess {
     int ioctl;
     struct map_info memInfo;
     pointer regionVirtBase;
@@ -82,14 +81,19 @@ static void xf86MapInfoUnmap();
 static struct memAccess *checkMapInfo();
 extern int vgaPhysLinearBase;
 
-/* A memAccess structure is needed for each possible region */ 
-struct memAccess vgaMemInfo = { CONSOLE_GET_MEM_INFO, NULL, NULL, 
-				    FALSE, FALSE };
-struct memAccess linearMemInfo = { CONSOLE_GET_LINEAR_INFO, NULL, NULL, 
-				       FALSE, FALSE };
+/* A memAccess structure is needed for each possible region */
+struct memAccess vgaMemInfo = { CONSOLE_GET_MEM_INFO, NULL, NULL,
+    FALSE, FALSE
+};
+
+struct memAccess linearMemInfo = { CONSOLE_GET_LINEAR_INFO, NULL, NULL,
+    FALSE, FALSE
+};
+
 struct memAccess ioMemInfo = { CONSOLE_GET_IO_INFO, NULL, NULL,
-				   FALSE, FALSE };
-#endif /* __arm32__ */
+    FALSE, FALSE
+};
+#endif                          /* __arm32__ */
 
 #if defined(__NetBSD__) && !defined(MAP_FILE)
 #define MAP_FLAGS MAP_SHARED
@@ -100,13 +104,12 @@ struct memAccess ioMemInfo = { CONSOLE_GET_IO_INFO, NULL, NULL,
 #define BUS_BASE	0L
 #define BUS_BASE_BWX	0L
 
-
 /***************************************************************************/
 /* Video Memory Mapping section                                            */
 /***************************************************************************/
 
 static Bool useDevMem = FALSE;
-static int  devMemFd = -1;
+static int devMemFd = -1;
 
 static pointer mapVidMem(int, unsigned long, unsigned long, int);
 static void unmapVidMem(int, pointer, unsigned long);
@@ -118,108 +121,98 @@ static void unmapVidMem(int, pointer, unsigned long);
 static void
 checkDevMem(Bool warn)
 {
-	static Bool devMemChecked = FALSE;
-	int fd;
-	pointer base;
-
-	if (devMemChecked)
-	    return;
-	devMemChecked = TRUE;
-
-	if ((fd = open(DEV_MEM, O_RDWR)) >= 0)
-	{
-	    /* Try to map a page at the VGA address */
-	    base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
-				 MAP_FLAGS, fd, (off_t)0xA0000 + BUS_BASE);
-	
-	    if (base != MAP_FAILED)
-	    {
-		munmap((caddr_t)base, 4096);
-		devMemFd = fd;
-		useDevMem = TRUE;
-		return;
-	    } else {
-		/* This should not happen */
-		if (warn)
-		{
-		    xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-			    DEV_MEM, strerror(errno));
-		}
-		useDevMem = FALSE;
-		return;
-	    }
-	}
-	if (warn)
-	{ 
-	    xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
-		    DEV_MEM, strerror(errno));
-	} 
-	useDevMem = FALSE;
-	return;
+    static Bool devMemChecked = FALSE;
+    int fd;
+    pointer base;
+
+    if (devMemChecked)
+        return;
+    devMemChecked = TRUE;
+
+    if ((fd = open(DEV_MEM, O_RDWR)) >= 0) {
+        /* Try to map a page at the VGA address */
+        base = mmap((caddr_t) 0, 4096, PROT_READ | PROT_WRITE,
+                    MAP_FLAGS, fd, (off_t) 0xA0000 + BUS_BASE);
+
+        if (base != MAP_FAILED) {
+            munmap((caddr_t) base, 4096);
+            devMemFd = fd;
+            useDevMem = TRUE;
+            return;
+        }
+        else {
+            /* This should not happen */
+            if (warn) {
+                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+                        DEV_MEM, strerror(errno));
+            }
+            useDevMem = FALSE;
+            return;
+        }
+    }
+    if (warn) {
+        xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
+                DEV_MEM, strerror(errno));
+    }
+    useDevMem = FALSE;
+    return;
 }
 
 void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
 
-	checkDevMem(TRUE);
-	pVidMem->linearSupported = useDevMem;
-	pVidMem->mapMem = armMapVidMem;
-	pVidMem->unmapVidMem = armUnmapVidMem;
+    checkDevMem(TRUE);
+    pVidMem->linearSupported = useDevMem;
+    pVidMem->mapMem = armMapVidMem;
+    pVidMem->unmapVidMem = armUnmapVidMem;
 
-	pVidMem->initialised = TRUE;
+    pVidMem->initialised = TRUE;
 }
 
 static pointer
 mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 {
-	pointer base;
-
-	checkDevMem(FALSE);
-
-	if (useDevMem)
-	{
-	    if (devMemFd < 0) 
-	    {
-		FatalError("xf86MapVidMem: failed to open %s (%s)\n",
-			   DEV_MEM, strerror(errno));
-	    }
-	    base = mmap((caddr_t)0, Size,
-			(flags & VIDMEM_READONLY) ?
-			 PROT_READ : (PROT_READ | PROT_WRITE),
-			MAP_FLAGS, devMemFd, (off_t)Base + BUS_BASE_BWX);
-	    if (base == MAP_FAILED)
-	    {
-		FatalError("%s: could not mmap %s [s=%x,a=%x] (%s)\n",
-			   "xf86MapVidMem", DEV_MEM, Size, Base, 
-			   strerror(errno));
-	    }
-	    return base;
-	}
-		
-	/* else, mmap /dev/vga */
-	if ((unsigned long)Base < 0xA0000 || (unsigned long)Base >= 0xC0000)
-	{
-		FatalError("%s: Address 0x%x outside allowable range\n",
-			   "xf86MapVidMem", Base);
-	}
-	base = mmap(0, Size,
-		    (flags & VIDMEM_READONLY) ?
-		     PROT_READ : (PROT_READ | PROT_WRITE),
-		    MAP_FLAGS, xf86Info.consoleFd,
-		    (unsigned long)Base - 0xA0000);
-	if (base == MAP_FAILED)
-	{
-	    FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n",
-		       strerror(errno));
-	}
-	return base;
+    pointer base;
+
+    checkDevMem(FALSE);
+
+    if (useDevMem) {
+        if (devMemFd < 0) {
+            FatalError("xf86MapVidMem: failed to open %s (%s)\n",
+                       DEV_MEM, strerror(errno));
+        }
+        base = mmap((caddr_t) 0, Size,
+                    (flags & VIDMEM_READONLY) ?
+                    PROT_READ : (PROT_READ | PROT_WRITE),
+                    MAP_FLAGS, devMemFd, (off_t) Base + BUS_BASE_BWX);
+        if (base == MAP_FAILED) {
+            FatalError("%s: could not mmap %s [s=%x,a=%x] (%s)\n",
+                       "xf86MapVidMem", DEV_MEM, Size, Base, strerror(errno));
+        }
+        return base;
+    }
+
+    /* else, mmap /dev/vga */
+    if ((unsigned long) Base < 0xA0000 || (unsigned long) Base >= 0xC0000) {
+        FatalError("%s: Address 0x%x outside allowable range\n",
+                   "xf86MapVidMem", Base);
+    }
+    base = mmap(0, Size,
+                (flags & VIDMEM_READONLY) ?
+                PROT_READ : (PROT_READ | PROT_WRITE),
+                MAP_FLAGS, xf86Info.consoleFd, (unsigned long) Base - 0xA0000);
+    if (base == MAP_FAILED) {
+        FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n",
+                   strerror(errno));
+    }
+    return base;
 }
 
 static void
 unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 {
-	munmap((caddr_t)Base, Size);
+    munmap((caddr_t) Base, Size);
 }
 
 /*
@@ -228,45 +221,43 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 
 int
 xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
+             int Len)
 {
-	unsigned char *ptr;
-	int psize;
-	int mlen;
-
-	checkDevMem(TRUE);
-	if (devMemFd == -1) {
-	    return -1;
-	}
-
-	psize = getpagesize();
-	Offset += Base & (psize - 1);
-	Base &= ~(psize - 1);
-	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-	ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ,
-					MAP_SHARED, devMemFd, (off_t)Base+BUS_BASE);
-	if ((long)ptr == -1)
-	{
-		xf86Msg(X_WARNING, 
-			"xf86ReadBIOS: %s mmap[s=%x,a=%x,o=%x] failed (%s)\n",
-			DEV_MEM, Len, Base, Offset, strerror(errno));
-		return -1;
-	}
+    unsigned char *ptr;
+    int psize;
+    int mlen;
+
+    checkDevMem(TRUE);
+    if (devMemFd == -1) {
+        return -1;
+    }
+
+    psize = getpagesize();
+    Offset += Base & (psize - 1);
+    Base &= ~(psize - 1);
+    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
+    ptr = (unsigned char *) mmap((caddr_t) 0, mlen, PROT_READ,
+                                 MAP_SHARED, devMemFd, (off_t) Base + BUS_BASE);
+    if ((long) ptr == -1) {
+        xf86Msg(X_WARNING,
+                "xf86ReadBIOS: %s mmap[s=%x,a=%x,o=%x] failed (%s)\n",
+                DEV_MEM, Len, Base, Offset, strerror(errno));
+        return -1;
+    }
 #ifdef DEBUG
-	ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
-		Base, ptr[0] | (ptr[1] << 8));
+    ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
+           Base, ptr[0] | (ptr[1] << 8));
 #endif
-	(void)memcpy(Buf, (void *)(ptr + Offset), Len);
-	(void)munmap((caddr_t)ptr, mlen);
+    (void) memcpy(Buf, (void *) (ptr + Offset), Len);
+    (void) munmap((caddr_t) ptr, mlen);
 #ifdef DEBUG
-	xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
-		"-> %02x %02x %02x %02x...\n",
-		Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
+    xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
+                "-> %02x %02x %02x %02x...\n",
+                Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
 #endif
-	return Len;
+    return Len;
 }
 
-
 /* XXX This needs to be updated for the ND */
 
 /*
@@ -277,52 +268,45 @@ static struct memAccess *
 checkMapInfo(Bool warn, int Region)
 {
     struct memAccess *memAccP;
-        
-    switch (Region)
-    {
-	case VGA_REGION:
-	    memAccP = &vgaMemInfo;
-	    break;
-	    	    
-	case LINEAR_REGION:
-	    memAccP = &linearMemInfo;
-	    break;
-	    
-	case MMIO_REGION:
-	    memAccP = &ioMemInfo;
-	    break;
-	
-	default:
-	    return NULL;
-	    break;
+
+    switch (Region) {
+    case VGA_REGION:
+        memAccP = &vgaMemInfo;
+        break;
+
+    case LINEAR_REGION:
+        memAccP = &linearMemInfo;
+        break;
+
+    case MMIO_REGION:
+        memAccP = &ioMemInfo;
+        break;
+
+    default:
+        return NULL;
+        break;
     }
-    
-    if(!memAccP->Checked)
-    {	
-	if(ioctl(xf86Info.consoleFd, memAccP->ioctl, &(memAccP->memInfo)) == -1)
-	{
-	    if(warn)
-	    {
-		xf86Msg(X_WARNING,
-		 "checkMapInfo: failed to get map info for region %d\n\t(%s)\n",
-		       Region, strerror(errno));
-	    }
-	}
-	else
-	{
-	    if(memAccP->memInfo.u.map_info_mmap.map_offset 
-	       != MAP_INFO_UNKNOWN)
-		memAccP->OK = TRUE;
-	}
-	memAccP->Checked = TRUE;
+
+    if (!memAccP->Checked) {
+        if (ioctl(xf86Info.consoleFd, memAccP->ioctl, &(memAccP->memInfo)) ==
+            -1) {
+            if (warn) {
+                xf86Msg(X_WARNING,
+                        "checkMapInfo: failed to get map info for region %d\n\t(%s)\n",
+                        Region, strerror(errno));
+            }
+        }
+        else {
+            if (memAccP->memInfo.u.map_info_mmap.map_offset != MAP_INFO_UNKNOWN)
+                memAccP->OK = TRUE;
+        }
+        memAccP->Checked = TRUE;
     }
-    if (memAccP->OK)
-    {
-	return memAccP;
+    if (memAccP->OK) {
+        return memAccP;
     }
-    else
-    {
-	return NULL;
+    else {
+        return NULL;
     }
 }
 
@@ -331,113 +315,103 @@ xf86MapInfoMap(struct memAccess *memInfoP, pointer Base, unsigned long Size)
 {
     struct map_info *mapInfoP = &(memInfoP->memInfo);
 
-    if (mapInfoP->u.map_info_mmap.map_size == MAP_INFO_UNKNOWN)
-    {	
-	Size = (unsigned long)Base + Size;
+    if (mapInfoP->u.map_info_mmap.map_size == MAP_INFO_UNKNOWN) {
+        Size = (unsigned long) Base + Size;
     }
-    else
-    {
-	Size = mapInfoP->u.map_info_mmap.map_size;
+    else {
+        Size = mapInfoP->u.map_info_mmap.map_size;
     }
-    
-    switch(mapInfoP->method)
-    {
-	case MAP_MMAP:
-	    /* Need to remap if size is unknown because we may not have
-	       mapped the whole region initially */
-	    if(memInfoP->regionVirtBase == NULL ||
-	       mapInfoP->u.map_info_mmap.map_size == MAP_INFO_UNKNOWN)
-	    {
-		if((memInfoP->regionVirtBase = 
-		    mmap((caddr_t)0,
-			 Size,
-			 PROT_READ | PROT_WRITE,
-			 MAP_SHARED,
-			 xf86Info.consoleFd,
-			 (unsigned long)mapInfoP->u.map_info_mmap.map_offset))
-		   == (pointer)-1)
-		{
-		    FatalError("xf86MapInfoMap: Failed to map memory at 0x%x\n\t%s\n", 
-			       mapInfoP->u.map_info_mmap.map_offset, strerror(errno));
-		}
-		if(mapInfoP->u.map_info_mmap.internal_offset > 0)
-		    memInfoP->regionVirtBase += 
-			mapInfoP->u.map_info_mmap.internal_offset;
-	    }
-	    break;
-	    
-	default:
-	    FatalError("xf86MapInfoMap: Unsuported mapping method\n");
-	    break;
+
+    switch (mapInfoP->method) {
+    case MAP_MMAP:
+        /* Need to remap if size is unknown because we may not have
+           mapped the whole region initially */
+        if (memInfoP->regionVirtBase == NULL ||
+            mapInfoP->u.map_info_mmap.map_size == MAP_INFO_UNKNOWN) {
+            if ((memInfoP->regionVirtBase =
+                 mmap((caddr_t) 0,
+                      Size,
+                      PROT_READ | PROT_WRITE,
+                      MAP_SHARED,
+                      xf86Info.consoleFd,
+                      (unsigned long) mapInfoP->u.map_info_mmap.map_offset))
+                == (pointer) -1) {
+                FatalError
+                    ("xf86MapInfoMap: Failed to map memory at 0x%x\n\t%s\n",
+                     mapInfoP->u.map_info_mmap.map_offset, strerror(errno));
+            }
+            if (mapInfoP->u.map_info_mmap.internal_offset > 0)
+                memInfoP->regionVirtBase +=
+                    mapInfoP->u.map_info_mmap.internal_offset;
+        }
+        break;
+
+    default:
+        FatalError("xf86MapInfoMap: Unsuported mapping method\n");
+        break;
     }
-	    
-    return (pointer)((int)memInfoP->regionVirtBase + (int)Base);
+
+    return (pointer) ((int) memInfoP->regionVirtBase + (int) Base);
 }
 
 static void
 xf86MapInfoUnmap(struct memAccess *memInfoP, unsigned long Size)
 {
     struct map_info *mapInfoP = &(memInfoP->memInfo);
-    
-    switch(mapInfoP->method)
-    {
-	case MAP_MMAP:
-	    if(memInfoP->regionVirtBase != NULL)
-	    {
-		if(mapInfoP->u.map_info_mmap.map_size != MAP_INFO_UNKNOWN)
-		    Size = mapInfoP->u.map_info_mmap.map_size;
-		munmap((caddr_t)memInfoP->regionVirtBase, Size);
-		memInfoP->regionVirtBase = NULL;
-	    }
-	    break;
-	 default:
-	    FatalError("xf86MapInfoMap: Unsuported mapping method\n");
-	    break;
+
+    switch (mapInfoP->method) {
+    case MAP_MMAP:
+        if (memInfoP->regionVirtBase != NULL) {
+            if (mapInfoP->u.map_info_mmap.map_size != MAP_INFO_UNKNOWN)
+                Size = mapInfoP->u.map_info_mmap.map_size;
+            munmap((caddr_t) memInfoP->regionVirtBase, Size);
+            memInfoP->regionVirtBase = NULL;
+        }
+        break;
+    default:
+        FatalError("xf86MapInfoMap: Unsuported mapping method\n");
+        break;
     }
 }
 
 static pointer
 armMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 {
-	struct memAccess *memInfoP;
-	
-	if((memInfoP = checkMapInfo(FALSE, Region)) != NULL)
-	{
-	    /*
-	     ** xf86 passes in a physical address offset from the start
-	     ** of physical memory, but xf86MapInfoMap expects an 
-	     ** offset from the start of the specified region - it gets 
-	     ** the physical address of the region from the display driver.
-	     */
-	    switch(Region)
-	    {
-	        case LINEAR_REGION:
-		    if (vgaPhysLinearBase)
-		    {
-			Base -= vgaPhysLinearBase;
-		    }
-		    break;
-		case VGA_REGION:
-		    Base -= 0xA0000;
-		    break;
-	    }
-	    
-	    base = xf86MapInfoMap(memInfoP, Base, Size);
-	    return base;
-	}
-	return mapVidMem(ScreenNum, Base, Size, flags);
+    struct memAccess *memInfoP;
+
+    if ((memInfoP = checkMapInfo(FALSE, Region)) != NULL) {
+        /*
+         ** xf86 passes in a physical address offset from the start
+         ** of physical memory, but xf86MapInfoMap expects an 
+         ** offset from the start of the specified region - it gets 
+         ** the physical address of the region from the display driver.
+         */
+        switch (Region) {
+        case LINEAR_REGION:
+            if (vgaPhysLinearBase) {
+                Base -= vgaPhysLinearBase;
+            }
+            break;
+        case VGA_REGION:
+            Base -= 0xA0000;
+            break;
+        }
+
+        base = xf86MapInfoMap(memInfoP, Base, Size);
+        return base;
+    }
+    return mapVidMem(ScreenNum, Base, Size, flags);
 }
 
 static void
 armUnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 {
-        struct memAccess *memInfoP;
-	
-	if((memInfoP = checkMapInfo(FALSE, Region)) != NULL)
-	{
-	    xf86MapInfoUnmap(memInfoP, Base, Size);
-	}
-	unmapVidMem(ScreenNum, Base, Size);
+    struct memAccess *memInfoP;
+
+    if ((memInfoP = checkMapInfo(FALSE, Region)) != NULL) {
+        xf86MapInfoUnmap(memInfoP, Base, Size);
+    }
+    unmapVidMem(ScreenNum, Base, Size);
 }
 
 #ifdef USE_DEV_IO
@@ -446,27 +420,26 @@ static int IoFd = -1;
 Bool
 xf86EnableIO()
 {
-	if (IoFd >= 0)
-		return TRUE;
-
-	if ((IoFd = open("/dev/io", O_RDWR)) == -1)
-	{
-		xf86Msg(X_WARNING,"xf86EnableIO: "
-				"Failed to open /dev/io for extended I/O\n");
-		return FALSE;
-	}
-	return TRUE;
+    if (IoFd >= 0)
+        return TRUE;
+
+    if ((IoFd = open("/dev/io", O_RDWR)) == -1) {
+        xf86Msg(X_WARNING, "xf86EnableIO: "
+                "Failed to open /dev/io for extended I/O\n");
+        return FALSE;
+    }
+    return TRUE;
 }
 
 void
 xf86DisableIO()
 {
-	if (IoFd < 0)
-		return;
+    if (IoFd < 0)
+        return;
 
-	close(IoFd);
-	IoFd = -1;
-	return;
+    close(IoFd);
+    IoFd = -1;
+    return;
 }
 
 #endif
@@ -476,44 +449,44 @@ xf86DisableIO()
 Bool
 xf86EnableIO()
 {
-	int fd;
-	pointer base;
-
-	if (ExtendedEnabled)
-		return TRUE;
-
-	if ((fd = open("/dev/ttyC0", O_RDWR)) >= 0) {
-		/* Try to map a page at the pccons I/O space */
-		base = (pointer)mmap((caddr_t)0, 65536, PROT_READ | PROT_WRITE,
-				MAP_FLAGS, fd, (off_t)0x0000);
-
-		if (base != (pointer)-1) {
-			IOPortBase = base;
-		}
-		else {
-			xf86Msg(X_WARNING,"EnableIO: failed to mmap %s (%s)\n",
-				"/dev/ttyC0", strerror(errno));
-			return FALSE;
-		}
-	}
-	else {
-		xf86Msg("EnableIO: failed to open %s (%s)\n",
-			"/dev/ttyC0", strerror(errno));
-		return FALSE;
-	}
-	
-	ExtendedEnabled = TRUE;
-
-	return TRUE;
+    int fd;
+    pointer base;
+
+    if (ExtendedEnabled)
+        return TRUE;
+
+    if ((fd = open("/dev/ttyC0", O_RDWR)) >= 0) {
+        /* Try to map a page at the pccons I/O space */
+        base = (pointer) mmap((caddr_t) 0, 65536, PROT_READ | PROT_WRITE,
+                              MAP_FLAGS, fd, (off_t) 0x0000);
+
+        if (base != (pointer) -1) {
+            IOPortBase = base;
+        }
+        else {
+            xf86Msg(X_WARNING, "EnableIO: failed to mmap %s (%s)\n",
+                    "/dev/ttyC0", strerror(errno));
+            return FALSE;
+        }
+    }
+    else {
+        xf86Msg("EnableIO: failed to open %s (%s)\n",
+                "/dev/ttyC0", strerror(errno));
+        return FALSE;
+    }
+
+    ExtendedEnabled = TRUE;
+
+    return TRUE;
 }
 
 void
 xf86DisableIO()
 {
-	return;
+    return;
 }
 
-#endif /* USE_ARC_MMAP */
+#endif                          /* USE_ARC_MMAP */
 
 #if 0
 /*
@@ -534,126 +507,122 @@ Bool
 xf86EnableIOPorts(ScreenNum)
 int ScreenNum;
 {
-	int i;
-	int fd;
-	pointer base;
+    int i;
+    int fd;
+    pointer base;
 
 #ifdef __arm32__
-	struct memAccess *memInfoP;
-	int *Size;
+    struct memAccess *memInfoP;
+    int *Size;
 #endif
 
-	ScreenEnabled[ScreenNum] = TRUE;
+    ScreenEnabled[ScreenNum] = TRUE;
 
-	if (ExtendedEnabled)
-		return TRUE;
+    if (ExtendedEnabled)
+        return TRUE;
 
 #ifdef USE_ARC_MMAP
-	if ((fd = open("/dev/ttyC0", O_RDWR)) >= 0) {
-		/* Try to map a page at the pccons I/O space */
-		base = (pointer)mmap((caddr_t)0, 65536, PROT_READ | PROT_WRITE,
-				MAP_FLAGS, fd, (off_t)0x0000);
-
-		if (base != (pointer)-1) {
-			IOPortBase = base;
-		}
-		else {
-			xf86Msg(X_ERROR,
-				"EnableIOPorts: failed to mmap %s (%s)\n",
-				"/dev/ttyC0", strerror(errno));
-		}
-	}
-	else {
-		xf86Msg(X_ERROR, "EnableIOPorts: failed to open %s (%s)\n",
-			"/dev/ttyC0", strerror(errno));
-	}
+    if ((fd = open("/dev/ttyC0", O_RDWR)) >= 0) {
+        /* Try to map a page at the pccons I/O space */
+        base = (pointer) mmap((caddr_t) 0, 65536, PROT_READ | PROT_WRITE,
+                              MAP_FLAGS, fd, (off_t) 0x0000);
+
+        if (base != (pointer) -1) {
+            IOPortBase = base;
+        }
+        else {
+            xf86Msg(X_ERROR,
+                    "EnableIOPorts: failed to mmap %s (%s)\n",
+                    "/dev/ttyC0", strerror(errno));
+        }
+    }
+    else {
+        xf86Msg(X_ERROR, "EnableIOPorts: failed to open %s (%s)\n",
+                "/dev/ttyC0", strerror(errno));
+    }
 #endif
 
 #ifdef __arm32__
-	IOPortBase = (unsigned int)-1;
-
-	if((memInfoP = checkMapInfo(TRUE, MMIO_REGION)) != NULL)
-	{
-	    /* 
-	     * xf86MapInfoMap maps an offset from the start of video IO
-	     * space (e.g. 0x3B0), but IOPortBase is expected to map to
-	     * physical address 0x000, so subtract the start of video I/O
-	     * space from the result.  This is safe for now becase we
-	     * actually mmap the start of the page, then the start of video
-	     * I/O space is added as an internal offset.
-	     */
-	    IOPortBase = (unsigned int)xf86MapInfoMap(memInfoP,
-						      (caddr_t)0x0, 0L) 
-		- memInfoP->memInfo.u.map_info_mmap.internal_offset;
-	    ExtendedEnabled = TRUE;
-	    return TRUE;
-	}
+    IOPortBase = (unsigned int) -1;
+
+    if ((memInfoP = checkMapInfo(TRUE, MMIO_REGION)) != NULL) {
+        /* 
+         * xf86MapInfoMap maps an offset from the start of video IO
+         * space (e.g. 0x3B0), but IOPortBase is expected to map to
+         * physical address 0x000, so subtract the start of video I/O
+         * space from the result.  This is safe for now becase we
+         * actually mmap the start of the page, then the start of video
+         * I/O space is added as an internal offset.
+         */
+        IOPortBase = (unsigned int) xf86MapInfoMap(memInfoP, (caddr_t) 0x0, 0L)
+            - memInfoP->memInfo.u.map_info_mmap.internal_offset;
+        ExtendedEnabled = TRUE;
+        return TRUE;
+    }
 #ifdef USE_ARM32_MMAP
-	checkDevMem(TRUE);
+    checkDevMem(TRUE);
 
-	if (devMemFd >= 0 && useDevMem)
-	{
-	    base = (pointer)mmap((caddr_t)0, 0x400, PROT_READ | PROT_WRITE,
-				 MAP_FLAGS, devMemFd, (off_t)DEV_MEM_IOBASE);
+    if (devMemFd >= 0 && useDevMem) {
+        base = (pointer) mmap((caddr_t) 0, 0x400, PROT_READ | PROT_WRITE,
+                              MAP_FLAGS, devMemFd, (off_t) DEV_MEM_IOBASE);
 
-	    if (base != (pointer)-1)
-		IOPortBase = (unsigned int)base;
-	}
+        if (base != (pointer) -1)
+            IOPortBase = (unsigned int) base;
+    }
 
-        if (IOPortBase == (unsigned int)-1)
-	{	
-	    xf86Msg(X_WARNING,"xf86EnableIOPorts: failed to open mem device or map IO base. \n\
+    if (IOPortBase == (unsigned int) -1) {
+        xf86Msg(X_WARNING,
+                "xf86EnableIOPorts: failed to open mem device or map IO base. \n\
 Make sure you have the Aperture Driver installed, or a kernel built with the INSECURE option\n");
-	    return FALSE;
-	}
+        return FALSE;
+    }
 #else
-	/* We don't have the IOBASE, so we can't map the address */
-	xf86Msg(X_WARNING,"xf86EnableIOPorts: failed to open mem device or map IO base. \n\
+    /* We don't have the IOBASE, so we can't map the address */
+    xf86Msg(X_WARNING,
+            "xf86EnableIOPorts: failed to open mem device or map IO base. \n\
 Try building the server with USE_ARM32_MMAP defined\n");
-	return FALSE;
+    return FALSE;
 #endif
 #endif
-	
-	ExtendedEnabled = TRUE;
 
-	return TRUE;
+    ExtendedEnabled = TRUE;
+
+    return TRUE;
 }
 
 void
 xf86DisableIOPorts(ScreenNum)
 int ScreenNum;
 {
-	int i;
+    int i;
+
 #ifdef __arm32__
-        struct memAccess *memInfoP;
+    struct memAccess *memInfoP;
 #endif
 
-	ScreenEnabled[ScreenNum] = FALSE;
+    ScreenEnabled[ScreenNum] = FALSE;
 
 #ifdef __arm32__
-	if((memInfoP = checkMapInfo(FALSE, MMIO_REGION)) != NULL)
-	{
-	    xf86MapInfoUnmap(memInfoP, 0);
-	}
+    if ((memInfoP = checkMapInfo(FALSE, MMIO_REGION)) != NULL) {
+        xf86MapInfoUnmap(memInfoP, 0);
+    }
 #endif
 
 #ifdef USE_ARM32_MMAP
-	if (!ExtendedEnabled)
-	return;
+    if (!ExtendedEnabled)
+        return;
 
-	for (i = 0; i < MAXSCREENS; i++)
-		if (ScreenEnabled[i])
-			return;
+    for (i = 0; i < MAXSCREENS; i++)
+        if (ScreenEnabled[i])
+            return;
 
-	munmap((caddr_t)IOPortBase, 0x400);
-	IOPortBase = (unsigned int)-1;
-	ExtendedEnabled = FALSE;
+    munmap((caddr_t) IOPortBase, 0x400);
+    IOPortBase = (unsigned int) -1;
+    ExtendedEnabled = FALSE;
 #endif
 
-	return;
+    return;
 }
 
-#endif /* USE_ARC_MMAP || USE_ARM32_MMAP */
+#endif                          /* USE_ARC_MMAP || USE_ARM32_MMAP */
 #endif
-
-
diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_apm.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_apm.c
index 73c88dca3..a8a4164e0 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_apm.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_apm.c
@@ -20,20 +20,22 @@ static void bsdCloseAPM(void);
 static struct {
     u_int apmBsd;
     pmEvent xf86;
-} bsdToXF86Array [] = {
-    { APM_STANDBY_REQ, XF86_APM_SYS_STANDBY },
-    { APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND },
-    { APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME },
-    { APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME },
-    { APM_BATTERY_LOW, XF86_APM_LOW_BATTERY },
-    { APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE },
-    { APM_UPDATE_TIME, XF86_APM_UPDATE_TIME },
-    { APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND },
-    { APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY },
-    { APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND },
-    { APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME },
+} bsdToXF86Array[] = {
+    {
+    APM_STANDBY_REQ, XF86_APM_SYS_STANDBY}, {
+    APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND}, {
+    APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME}, {
+    APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME}, {
+    APM_BATTERY_LOW, XF86_APM_LOW_BATTERY}, {
+    APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE}, {
+    APM_UPDATE_TIME, XF86_APM_UPDATE_TIME}, {
+    APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND}, {
+    APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY}, {
+    APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND}, {
+    APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
 #ifdef APM_CAPABILITY_CHANGE
-    { APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED },
+    {
+    APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED},
 #endif
 };
 
@@ -45,9 +47,9 @@ bsdToXF86(int type)
     int i;
 
     for (i = 0; i < numApmEvents; i++) {
-	if (type == bsdToXF86Array[i].apmBsd) {
-	    return bsdToXF86Array[i].xf86;
-	}
+        if (type == bsdToXF86Array[i].apmBsd) {
+            return bsdToXF86Array[i].xf86;
+        }
     }
     return XF86_APM_UNKNOWN;
 }
@@ -55,22 +57,22 @@ bsdToXF86(int type)
 /*
  * APM events can be requested direclty from /dev/apm 
  */
-static int 
-bsdPMGetEventFromOS(int fd, pmEvent *events, int num)
+static int
+bsdPMGetEventFromOS(int fd, pmEvent * events, int num)
 {
     struct apm_event_info bsdEvent;
     int i;
 
     for (i = 0; i < num; i++) {
-	
-	if (ioctl(fd, APM_IOC_NEXTEVENT, &bsdEvent) < 0) {
-	    if (errno != EAGAIN) {
-		xf86Msg(X_WARNING, "bsdPMGetEventFromOS: APM_IOC_NEXTEVENT"
-			" %s\n", strerror(errno));
-	    }
-	    break;
-	}
-	events[i] = bsdToXF86(bsdEvent.type);
+
+        if (ioctl(fd, APM_IOC_NEXTEVENT, &bsdEvent) < 0) {
+            if (errno != EAGAIN) {
+                xf86Msg(X_WARNING, "bsdPMGetEventFromOS: APM_IOC_NEXTEVENT"
+                        " %s\n", strerror(errno));
+            }
+            break;
+        }
+        events[i] = bsdToXF86(bsdEvent.type);
     }
     return i;
 }
@@ -84,27 +86,27 @@ static pmWait
 bsdPMConfirmEventToOs(int fd, pmEvent event)
 {
     switch (event) {
-      case XF86_APM_SYS_STANDBY:
-      case XF86_APM_USER_STANDBY:
-        if (ioctl( fd, APM_IOC_STANDBY, NULL ) == 0)
-            return PM_WAIT;  /* should we stop the Xserver in standby, too? */
+    case XF86_APM_SYS_STANDBY:
+    case XF86_APM_USER_STANDBY:
+        if (ioctl(fd, APM_IOC_STANDBY, NULL) == 0)
+            return PM_WAIT;     /* should we stop the Xserver in standby, too? */
         else
             return PM_NONE;
-      case XF86_APM_SYS_SUSPEND:
-      case XF86_APM_CRITICAL_SUSPEND:
-      case XF86_APM_USER_SUSPEND:
-        if (ioctl( fd, APM_IOC_SUSPEND, NULL ) == 0)
+    case XF86_APM_SYS_SUSPEND:
+    case XF86_APM_CRITICAL_SUSPEND:
+    case XF86_APM_USER_SUSPEND:
+        if (ioctl(fd, APM_IOC_SUSPEND, NULL) == 0)
             return PM_WAIT;
         else
             return PM_NONE;
-      case XF86_APM_STANDBY_RESUME:
-      case XF86_APM_NORMAL_RESUME:
-      case XF86_APM_CRITICAL_RESUME:
-      case XF86_APM_STANDBY_FAILED:
-      case XF86_APM_SUSPEND_FAILED:
+    case XF86_APM_STANDBY_RESUME:
+    case XF86_APM_NORMAL_RESUME:
+    case XF86_APM_CRITICAL_RESUME:
+    case XF86_APM_STANDBY_FAILED:
+    case XF86_APM_SUSPEND_FAILED:
         return PM_CONTINUE;
-      default:
-	return PM_NONE;
+    default:
+        return PM_NONE;
     }
 }
 
@@ -114,11 +116,11 @@ xf86OSPMOpen(void)
     int fd;
 
     if (APMihPtr || !xf86Info.pmFlag) {
-	return NULL;
+        return NULL;
     }
 
     if ((fd = open(APM_DEVICE, O_RDWR)) == -1) {
-	return NULL;
+        return NULL;
     }
     xf86PMGetEventFromOs = bsdPMGetEventFromOS;
     xf86PMConfirmEventToOs = bsdPMConfirmEventToOs;
@@ -132,8 +134,8 @@ bsdCloseAPM(void)
     int fd;
 
     if (APMihPtr) {
-	fd = xf86RemoveGeneralHandler(APMihPtr);
-	close(fd);
-	APMihPtr = NULL;
+        fd = xf86RemoveGeneralHandler(APMihPtr);
+        close(fd);
+        APMihPtr = NULL;
     }
 }
diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_axp.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_axp.c
index 77c87ce1d..e7a36f8bf 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_axp.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_axp.c
@@ -24,49 +24,48 @@ axpDevice bsdGetAXP(void);
  */
 
 typedef struct {
-	char *name;
-	int type;
-} _AXP; 
+    char *name;
+    int type;
+} _AXP;
 
 static _AXP axpList[] = {
-	{"apecs",APECS},
-	{"pyxis",PYXIS},
-	{"cia",CIA},
-	{"irongate",IRONGATE},
-	{"lca",LCA},
-	{"t2",T2},
-	{"tsunami",TSUNAMI},
-	{NULL,SYS_NONE}
+    {"apecs", APECS},
+    {"pyxis", PYXIS},
+    {"cia", CIA},
+    {"irongate", IRONGATE},
+    {"lca", LCA},
+    {"t2", T2},
+    {"tsunami", TSUNAMI},
+    {NULL, SYS_NONE}
 };
 
 axpDevice
 bsdGetAXP(void)
 {
-	int i;
-	char sysname[64];
-	size_t len = sizeof(sysname);
-	
+    int i;
+    char sysname[64];
+    size_t len = sizeof(sysname);
+
 #ifdef __OpenBSD__
-	int mib[3];
-	int error;
+    int mib[3];
+    int error;
 
-	mib[0] = CTL_MACHDEP;
-	mib[1] = CPU_CHIPSET;
-	mib[2] = CPU_CHIPSET_TYPE;
+    mib[0] = CTL_MACHDEP;
+    mib[1] = CPU_CHIPSET;
+    mib[2] = CPU_CHIPSET_TYPE;
 
-	if ((error = sysctl(mib, 3, &sysname, &len, NULL, 0)) < 0)
-#else	
-	if ((sysctlbyname("hw.chipset.type", &sysname, &len,
-                                  0, 0)) < 0)
+    if ((error = sysctl(mib, 3, &sysname, &len, NULL, 0)) < 0)
+#else
+    if ((sysctlbyname("hw.chipset.type", &sysname, &len, 0, 0)) < 0)
 #endif
-            FatalError("bsdGetAXP: can't find machine type\n");
+        FatalError("bsdGetAXP: can't find machine type\n");
 #ifdef DEBUG
-	xf86Msg(X_INFO,"AXP is a: %s\n",sysname);
+    xf86Msg(X_INFO, "AXP is a: %s\n", sysname);
 #endif
-	for (i=0;;i++) {
-		if (axpList[i].name == NULL)
-			return SYS_NONE;
-		if (!strcmp(sysname, axpList[i].name))
-			return axpList[i].type;
-	}
-}	
+    for (i = 0;; i++) {
+        if (axpList[i].name == NULL)
+            return SYS_NONE;
+        if (!strcmp(sysname, axpList[i].name))
+            return axpList[i].type;
+    }
+}
diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_bell.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_bell.c
index fb457db71..f6643ee62 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_bell.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_bell.c
@@ -41,42 +41,40 @@ void
 xf86OSRingBell(int loudness, int pitch, int duration)
 {
 #ifdef WSCONS_SUPPORT
-        struct wskbd_bell_data wsb;
+    struct wskbd_bell_data wsb;
 #endif
 
-        if (loudness && pitch)
-        {
+    if (loudness && pitch) {
 #ifdef PCCONS_SUPPORT
-                int data[2];
+        int data[2];
 #endif
 
-                switch (xf86Info.consType) {
+        switch (xf86Info.consType) {
 
 #ifdef PCCONS_SUPPORT
-                case PCCONS:
-                        data[0] = pitch;
-                        data[1] = (duration * loudness) / 50;
-                        ioctl(xf86Info.consoleFd, CONSOLE_X_BELL, data);
-                        break;
+        case PCCONS:
+            data[0] = pitch;
+            data[1] = (duration * loudness) / 50;
+            ioctl(xf86Info.consoleFd, CONSOLE_X_BELL, data);
+            break;
 #endif
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
-                case SYSCONS:
-                case PCVT:
-                        ioctl(xf86Info.consoleFd, KDMKTONE,
-                              ((1193190 / pitch) & 0xffff) |
-                              (((unsigned long)duration*loudness/50)<<16));
-                        break;
+        case SYSCONS:
+        case PCVT:
+            ioctl(xf86Info.consoleFd, KDMKTONE,
+                  ((1193190 / pitch) & 0xffff) |
+                  (((unsigned long) duration * loudness / 50) << 16));
+            break;
 #endif
 #if defined (WSCONS_SUPPORT)
-                case WSCONS:
-                        wsb.which = WSKBD_BELL_DOALL;
-                        wsb.pitch = pitch;
-                        wsb.period = duration;
-                        wsb.volume = loudness;
-                        ioctl(xf86Info.consoleFd, WSKBDIO_COMPLEXBELL,
-                                      &wsb);
-                        break;
+        case WSCONS:
+            wsb.which = WSKBD_BELL_DOALL;
+            wsb.pitch = pitch;
+            wsb.period = duration;
+            wsb.volume = loudness;
+            ioctl(xf86Info.consoleFd, WSKBDIO_COMPLEXBELL, &wsb);
+            break;
 #endif
-                }
         }
+    }
 }
diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c
index 7079d62b4..c9f823321 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c
@@ -67,9 +67,9 @@ static int initialVT = -1;
 #ifdef PCVT_SUPPORT
 /* Hellmuth Michaelis' pcvt driver */
 #ifndef __OpenBSD__
-#  define PCVT_CONSOLE_DEV "/dev/ttyv0"
+#define PCVT_CONSOLE_DEV "/dev/ttyv0"
 #else
-#  define PCVT_CONSOLE_DEV "/dev/ttyC0"
+#define PCVT_CONSOLE_DEV "/dev/ttyC0"
 #endif
 #define PCVT_CONSOLE_MODE O_RDWR|O_NDELAY
 #endif
@@ -88,20 +88,19 @@ static int initialVT = -1;
 
 static char *supported_drivers[] = {
 #ifdef PCCONS_SUPPORT
-	"pccons (with X support)",
+    "pccons (with X support)",
 #endif
 #ifdef SYSCONS_SUPPORT
-	"syscons",
+    "syscons",
 #endif
 #ifdef PCVT_SUPPORT
-	"pcvt",
+    "pcvt",
 #endif
 #ifdef WSCONS_SUPPORT
-	"wscons",
+    "wscons",
 #endif
 };
 
-
 /*
  * Functions to probe for the existance of a supported console driver.
  * Any function returns either a valid file descriptor (driver probed
@@ -110,19 +109,19 @@ static char *supported_drivers[] = {
  * an X server.
  */
 
-typedef int (*xf86ConsOpen_t)(void);
+typedef int (*xf86ConsOpen_t) (void);
 
 #ifdef PCCONS_SUPPORT
 static int xf86OpenPccons(void);
-#endif /* PCCONS_SUPPORT */
+#endif                          /* PCCONS_SUPPORT */
 
 #ifdef SYSCONS_SUPPORT
 static int xf86OpenSyscons(void);
-#endif /* SYSCONS_SUPPORT */
+#endif                          /* SYSCONS_SUPPORT */
 
 #ifdef PCVT_SUPPORT
 static int xf86OpenPcvt(void);
-#endif /* PCVT_SUPPORT */
+#endif                          /* PCVT_SUPPORT */
 
 #ifdef WSCONS_SUPPORT
 static int xf86OpenWScons(void);
@@ -147,191 +146,174 @@ static xf86ConsOpen_t xf86ConsTab[] = {
 #ifdef WSCONS_SUPPORT
     xf86OpenWScons,
 #endif
-    (xf86ConsOpen_t)NULL
+    (xf86ConsOpen_t) NULL
 };
 
-
 void
 xf86OpenConsole()
 {
     int i, fd = -1;
     xf86ConsOpen_t *driver;
+
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
     int result;
+
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     struct utsname uts;
 #endif
     vtmode_t vtmode;
 #endif
-    
-    if (serverGeneration == 1)
-    {
-	/* check if we are run with euid==0 */
-	if (geteuid() != 0)
-	{
-	    FatalError("xf86OpenConsole: Server must be suid root");
-	}
-
-	if (!KeepTty)
-	{
-	    /*
-	     * detaching the controlling tty solves problems of kbd character
-	     * loss.  This is not interesting for CO driver, because it is 
-	     * exclusive.
-	     */
-	    setpgrp(0, getpid());
-	    if ((i = open("/dev/tty",O_RDWR)) >= 0)
-	    {
-		ioctl(i,TIOCNOTTY,(char *)0);
-		close(i);
-	    }
-	}
-
-	/* detect which driver we are running on */
-	for (driver = xf86ConsTab; *driver; driver++)
-	{
-	    if ((fd = (*driver)()) >= 0)
-		break;
-	}
-
-	/* Check that a supported console driver was found */
-	if (fd < 0)
-	{
-	    char cons_drivers[80] = {0, };
-	    for (i = 0; i < sizeof(supported_drivers) / sizeof(char *); i++)
-	    {
-		if (i)
-		{
-		    strcat(cons_drivers, ", ");
-		}
-		strcat(cons_drivers, supported_drivers[i]);
-	    }
-	    FatalError(
-		"%s: No console driver found\n\tSupported drivers: %s\n\t%s",
-		"xf86OpenConsole", cons_drivers, CHECK_DRIVER_MSG);
-	}
-	xf86Info.consoleFd = fd;
-
-	switch (xf86Info.consType)
-	{
+
+    if (serverGeneration == 1) {
+        /* check if we are run with euid==0 */
+        if (geteuid() != 0) {
+            FatalError("xf86OpenConsole: Server must be suid root");
+        }
+
+        if (!KeepTty) {
+            /*
+             * detaching the controlling tty solves problems of kbd character
+             * loss.  This is not interesting for CO driver, because it is 
+             * exclusive.
+             */
+            setpgrp(0, getpid());
+            if ((i = open("/dev/tty", O_RDWR)) >= 0) {
+                ioctl(i, TIOCNOTTY, (char *) 0);
+                close(i);
+            }
+        }
+
+        /* detect which driver we are running on */
+        for (driver = xf86ConsTab; *driver; driver++) {
+            if ((fd = (*driver) ()) >= 0)
+                break;
+        }
+
+        /* Check that a supported console driver was found */
+        if (fd < 0) {
+            char cons_drivers[80] = { 0, };
+            for (i = 0; i < sizeof(supported_drivers) / sizeof(char *); i++) {
+                if (i) {
+                    strcat(cons_drivers, ", ");
+                }
+                strcat(cons_drivers, supported_drivers[i]);
+            }
+            FatalError
+                ("%s: No console driver found\n\tSupported drivers: %s\n\t%s",
+                 "xf86OpenConsole", cons_drivers, CHECK_DRIVER_MSG);
+        }
+        xf86Info.consoleFd = fd;
+
+        switch (xf86Info.consType) {
 #ifdef PCCONS_SUPPORT
-	case PCCONS:
-	    if (ioctl (xf86Info.consoleFd, CONSOLE_X_MODE_ON, 0) < 0)
-	    {
-		FatalError("%s: CONSOLE_X_MODE_ON failed (%s)\n%s",
-			   "xf86OpenConsole", strerror(errno),
-			   CHECK_DRIVER_MSG);
-	    }
-	    /*
-	     * Hack to prevent keyboard hanging when syslogd closes
-	     * /dev/console
-	     */
-	    if ((devConsoleFd = open("/dev/console", O_WRONLY,0)) < 0)
-	    {
-		xf86Msg(X_WARNING,
-			"xf86OpenConsole: couldn't open /dev/console (%s)\n",
-			strerror(errno));
-	    }
-	    break;
+        case PCCONS:
+            if (ioctl(xf86Info.consoleFd, CONSOLE_X_MODE_ON, 0) < 0) {
+                FatalError("%s: CONSOLE_X_MODE_ON failed (%s)\n%s",
+                           "xf86OpenConsole", strerror(errno),
+                           CHECK_DRIVER_MSG);
+            }
+            /*
+             * Hack to prevent keyboard hanging when syslogd closes
+             * /dev/console
+             */
+            if ((devConsoleFd = open("/dev/console", O_WRONLY, 0)) < 0) {
+                xf86Msg(X_WARNING,
+                        "xf86OpenConsole: couldn't open /dev/console (%s)\n",
+                        strerror(errno));
+            }
+            break;
 #endif
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
-	case SYSCONS:
-	    /* as of FreeBSD 2.2.8, syscons driver does not need the #1 vt
-	     * switching anymore. Here we check for FreeBSD 3.1 and up.
-	     * Add cases for other *BSD that behave the same.
-	    */
+        case SYSCONS:
+            /* as of FreeBSD 2.2.8, syscons driver does not need the #1 vt
+             * switching anymore. Here we check for FreeBSD 3.1 and up.
+             * Add cases for other *BSD that behave the same.
+             */
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-	    uname (&uts);
-	    i = atof(uts.release) * 100;
-	    if (i >= 310) goto acquire_vt;
+            uname(&uts);
+            i = atof(uts.release) * 100;
+            if (i >= 310)
+                goto acquire_vt;
 #endif
-	    /* otherwise fall through */
-	case PCVT:
+            /* otherwise fall through */
+        case PCVT:
 #if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000))
-	    /*
-	     * First activate the #1 VT.  This is a hack to allow a server
-	     * to be started while another one is active.  There should be
-	     * a better way.
-	     */
-	    if (initialVT != 1) {
-
-		if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, 1) != 0)
-		{
-		    xf86Msg(X_WARNING,
-				"xf86OpenConsole: VT_ACTIVATE failed\n");
-		}
-		sleep(1);
-	    }
-#endif
-acquire_vt:
-	    if (!xf86Info.ShareVTs) {
-		    /*
-		     * now get the VT
-		     */
-		    SYSCALL(result =
-			    ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno));
-		    if (result != 0)
-		    {
-			xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
-		    }
-		    SYSCALL(result =
-		    ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno));
-		    if (result != 0)
-		    {
-			xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed\n");
-		    }
-
-		    signal(SIGUSR1, xf86VTRequest);
-
-		    vtmode.mode = VT_PROCESS;
-		    vtmode.relsig = SIGUSR1;
-		    vtmode.acqsig = SIGUSR1;
-		    vtmode.frsig = SIGUSR1;
-		    if (ioctl(xf86Info.consoleFd, VT_SETMODE, &vtmode) < 0) 
-		    {
-			FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed");
-		    }
+            /*
+             * First activate the #1 VT.  This is a hack to allow a server
+             * to be started while another one is active.  There should be
+             * a better way.
+             */
+            if (initialVT != 1) {
+
+                if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, 1) != 0) {
+                    xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
+                }
+                sleep(1);
+            }
+#endif
+ acquire_vt:
+            if (!xf86Info.ShareVTs) {
+                /*
+                 * now get the VT
+                 */
+                SYSCALL(result =
+                        ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno));
+                if (result != 0) {
+                    xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
+                }
+                SYSCALL(result =
+                        ioctl(xf86Info.consoleFd, VT_WAITACTIVE,
+                              xf86Info.vtno));
+                if (result != 0) {
+                    xf86Msg(X_WARNING,
+                            "xf86OpenConsole: VT_WAITACTIVE failed\n");
+                }
+
+                signal(SIGUSR1, xf86VTRequest);
+
+                vtmode.mode = VT_PROCESS;
+                vtmode.relsig = SIGUSR1;
+                vtmode.acqsig = SIGUSR1;
+                vtmode.frsig = SIGUSR1;
+                if (ioctl(xf86Info.consoleFd, VT_SETMODE, &vtmode) < 0) {
+                    FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed");
+                }
 #if !defined(__OpenBSD__) && !defined(USE_DEV_IO) && !defined(USE_I386_IOPL)
-		    if (ioctl(xf86Info.consoleFd, KDENABIO, 0) < 0)
-		    {
-			FatalError("xf86OpenConsole: KDENABIO failed (%s)",
-				   strerror(errno));
-		    }
-#endif
-		    if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0)
-		    {
-			FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed");
-		    }
-	    } else { /* xf86Info.ShareVTs */
-		    close(xf86Info.consoleFd);
-	    }	
-  	    break; 
-#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
+                if (ioctl(xf86Info.consoleFd, KDENABIO, 0) < 0) {
+                    FatalError("xf86OpenConsole: KDENABIO failed (%s)",
+                               strerror(errno));
+                }
+#endif
+                if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0) {
+                    FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed");
+                }
+            }
+            else {              /* xf86Info.ShareVTs */
+                close(xf86Info.consoleFd);
+            }
+            break;
+#endif                          /* SYSCONS_SUPPORT || PCVT_SUPPORT */
 #ifdef WSCONS_SUPPORT
-	case WSCONS:
-	    /* Nothing to do */
-   	    break; 
+        case WSCONS:
+            /* Nothing to do */
+            break;
 #endif
         }
     }
-    else 
-    {
-	/* serverGeneration != 1 */
+    else {
+        /* serverGeneration != 1 */
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
-	if (!xf86Info.ShareVTs &&
-	    (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT))
-    	{
-	    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0)
-	    {
-	        xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
-	    }
+        if (!xf86Info.ShareVTs &&
+            (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)) {
+            if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0) {
+                xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
+            }
         }
-#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
+#endif                          /* SYSCONS_SUPPORT || PCVT_SUPPORT */
     }
     return;
 }
 
-
 #ifdef PCCONS_SUPPORT
 
 static int
@@ -340,26 +322,22 @@ xf86OpenPccons()
     int fd = -1;
 
     if ((fd = open(PCCONS_CONSOLE_DEV1, PCCONS_CONSOLE_MODE, 0))
-	>= 0 ||
-	(fd = open(PCCONS_CONSOLE_DEV2, PCCONS_CONSOLE_MODE, 0))
-	>= 0)
-    {
-	if (ioctl(fd, CONSOLE_X_MODE_OFF, 0) < 0)
-	{
-	    FatalError(
-		"%s: CONSOLE_X_MODE_OFF failed (%s)\n%s\n%s",
-		"xf86OpenPccons",
-		strerror(errno),
-		"Was expecting pccons driver with X support",
-		CHECK_DRIVER_MSG);
-	}
-	xf86Info.consType = PCCONS;
-	xf86Msg(X_PROBED, "Using pccons driver with X support\n");
+        >= 0 || (fd = open(PCCONS_CONSOLE_DEV2, PCCONS_CONSOLE_MODE, 0))
+        >= 0) {
+        if (ioctl(fd, CONSOLE_X_MODE_OFF, 0) < 0) {
+            FatalError("%s: CONSOLE_X_MODE_OFF failed (%s)\n%s\n%s",
+                       "xf86OpenPccons",
+                       strerror(errno),
+                       "Was expecting pccons driver with X support",
+                       CHECK_DRIVER_MSG);
+        }
+        xf86Info.consType = PCCONS;
+        xf86Msg(X_PROBED, "Using pccons driver with X support\n");
     }
     return fd;
 }
 
-#endif /* PCCONS_SUPPORT */
+#endif                          /* PCCONS_SUPPORT */
 
 #ifdef SYSCONS_SUPPORT
 
@@ -374,113 +352,98 @@ xf86OpenSyscons()
 
     /* Check for syscons */
     if ((fd = open(SYSCONS_CONSOLE_DEV1, SYSCONS_CONSOLE_MODE, 0)) >= 0
-	|| (fd = open(SYSCONS_CONSOLE_DEV2, SYSCONS_CONSOLE_MODE, 0)) >= 0)
-    {
-	if (ioctl(fd, VT_GETMODE, &vtmode) >= 0)
-	{
-	    /* Get syscons version */
-	    if (ioctl(fd, CONS_GETVERS, &syscons_version) < 0)
-	    {
-		syscons_version = 0;
-	    }
+        || (fd = open(SYSCONS_CONSOLE_DEV2, SYSCONS_CONSOLE_MODE, 0)) >= 0) {
+        if (ioctl(fd, VT_GETMODE, &vtmode) >= 0) {
+            /* Get syscons version */
+            if (ioctl(fd, CONS_GETVERS, &syscons_version) < 0) {
+                syscons_version = 0;
+            }
 
-	    xf86Info.vtno = VTnum;
-	    from = X_CMDLINE;
+            xf86Info.vtno = VTnum;
+            from = X_CMDLINE;
 
 #ifdef VT_GETACTIVE
-	    if (ioctl(fd, VT_GETACTIVE, &initialVT) < 0)
-		initialVT = -1;
+            if (ioctl(fd, VT_GETACTIVE, &initialVT) < 0)
+                initialVT = -1;
 #endif
             if (xf86Info.ShareVTs)
-		xf86Info.vtno = initialVT;
+                xf86Info.vtno = initialVT;
 
-	    if (xf86Info.vtno == -1)
-	    {
-		/*
-		 * For old syscons versions (<0x100), VT_OPENQRY returns
-		 * the current VT rather than the next free VT.  In this
-		 * case, the server gets started on the current VT instead
-		 * of the next free VT.
-		 */
+            if (xf86Info.vtno == -1) {
+                /*
+                 * For old syscons versions (<0x100), VT_OPENQRY returns
+                 * the current VT rather than the next free VT.  In this
+                 * case, the server gets started on the current VT instead
+                 * of the next free VT.
+                 */
 
 #if 0
-		/* check for the fixed VT_OPENQRY */
-		if (syscons_version >= 0x100)
-		{
-#endif
-		    if (ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0)
-		    {
-			/* No free VTs */
-			xf86Info.vtno = -1;
-		    }
+                /* check for the fixed VT_OPENQRY */
+                if (syscons_version >= 0x100) {
+#endif
+                    if (ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) {
+                        /* No free VTs */
+                        xf86Info.vtno = -1;
+                    }
 #if 0
-		}
-#endif
-
-		if (xf86Info.vtno == -1)
-		{
-		    /*
-		     * All VTs are in use.  If initialVT was found, use it.
-		     */
-		    if (initialVT != -1)
-		    {
-			xf86Info.vtno = initialVT;
-		    }
-		    else
-		    {
-			if (syscons_version >= 0x100)
-			{
-			    FatalError("%s: Cannot find a free VT",
-				       "xf86OpenSyscons");
-			}
-			/* Should no longer reach here */
-			FatalError("%s: %s %s\n\t%s %s",
-				   "xf86OpenSyscons",
-				   "syscons versions prior to 1.0 require",
-				   "either the",
-				   "server's stdin be a VT",
-				   "or the use of the vtxx server option");
-		    }
-		}
-		from = X_PROBED;
-	    }
-
-	    close(fd);
-	    snprintf(vtname, sizeof(vtname), "/dev/ttyv%01x", xf86Info.vtno - 1);
-	    if ((fd = open(vtname, SYSCONS_CONSOLE_MODE, 0)) < 0)
-	    {
-		FatalError("xf86OpenSyscons: Cannot open %s (%s)",
-			   vtname, strerror(errno));
-	    }
-	    if (ioctl(fd, VT_GETMODE, &vtmode) < 0)
-	    {
-		FatalError("xf86OpenSyscons: VT_GETMODE failed");
-	    }
-	    xf86Info.consType = SYSCONS;
-	    xf86Msg(X_PROBED, "Using syscons driver with X support");
-	    if (syscons_version >= 0x100)
-	    {
-		xf86ErrorF(" (version %ld.%ld)\n", syscons_version >> 8,
-			   syscons_version & 0xFF);
-	    }
-	    else
-	    {
-		xf86ErrorF(" (version 0.x)\n");
-	    }
-	    xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
-	}
-	else
-	{
-	    /* VT_GETMODE failed, probably not syscons */
-	    close(fd);
-	    fd = -1;
-	}
+                }
+#endif
+
+                if (xf86Info.vtno == -1) {
+                    /*
+                     * All VTs are in use.  If initialVT was found, use it.
+                     */
+                    if (initialVT != -1) {
+                        xf86Info.vtno = initialVT;
+                    }
+                    else {
+                        if (syscons_version >= 0x100) {
+                            FatalError("%s: Cannot find a free VT",
+                                       "xf86OpenSyscons");
+                        }
+                        /* Should no longer reach here */
+                        FatalError("%s: %s %s\n\t%s %s",
+                                   "xf86OpenSyscons",
+                                   "syscons versions prior to 1.0 require",
+                                   "either the",
+                                   "server's stdin be a VT",
+                                   "or the use of the vtxx server option");
+                    }
+                }
+                from = X_PROBED;
+            }
+
+            close(fd);
+            snprintf(vtname, sizeof(vtname), "/dev/ttyv%01x",
+                     xf86Info.vtno - 1);
+            if ((fd = open(vtname, SYSCONS_CONSOLE_MODE, 0)) < 0) {
+                FatalError("xf86OpenSyscons: Cannot open %s (%s)",
+                           vtname, strerror(errno));
+            }
+            if (ioctl(fd, VT_GETMODE, &vtmode) < 0) {
+                FatalError("xf86OpenSyscons: VT_GETMODE failed");
+            }
+            xf86Info.consType = SYSCONS;
+            xf86Msg(X_PROBED, "Using syscons driver with X support");
+            if (syscons_version >= 0x100) {
+                xf86ErrorF(" (version %ld.%ld)\n", syscons_version >> 8,
+                           syscons_version & 0xFF);
+            }
+            else {
+                xf86ErrorF(" (version 0.x)\n");
+            }
+            xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
+        }
+        else {
+            /* VT_GETMODE failed, probably not syscons */
+            close(fd);
+            fd = -1;
+        }
     }
     return fd;
 }
 
-#endif /* SYSCONS_SUPPORT */
-
+#endif                          /* SYSCONS_SUPPORT */
 
 #ifdef PCVT_SUPPORT
 
@@ -501,93 +464,82 @@ xf86OpenPcvt()
 
     fd = open(PCVT_CONSOLE_DEV, PCVT_CONSOLE_MODE, 0);
 #ifdef WSCONS_PCVT_COMPAT_CONSOLE_DEV
-    if (fd < 0)
-    {
-	fd = open(WSCONS_PCVT_COMPAT_CONSOLE_DEV, PCVT_CONSOLE_MODE, 0);
-	vtprefix = "/dev/ttyE";
+    if (fd < 0) {
+        fd = open(WSCONS_PCVT_COMPAT_CONSOLE_DEV, PCVT_CONSOLE_MODE, 0);
+        vtprefix = "/dev/ttyE";
     }
 #endif
-    if (fd >= 0) 
-    {
-	if (ioctl(fd, VGAPCVTID, &pcvt_version) >= 0)
-	{
-	    if(ioctl(fd, VT_GETMODE, &vtmode) < 0)
-	    {
-		FatalError("%s: VT_GETMODE failed\n%s%s\n%s",
-			   "xf86OpenPcvt",
-			   "Found pcvt driver but X11 seems to be",
-			   " not supported.", CHECK_DRIVER_MSG);
-	    }
-
-	    xf86Info.vtno = VTnum;
-		
-	    if (ioctl(fd, VT_GETACTIVE, &initialVT) < 0)
-		initialVT = -1;
-
-	    if (xf86Info.vtno == -1)
-	    {
-		if (ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0)
-		{
-		    /* No free VTs */
-		    xf86Info.vtno = -1;
-		}
-
-		if (xf86Info.vtno == -1)
-		{
-		    /*
-		     * All VTs are in use.  If initialVT was found, use it.
-		     */
-		    if (initialVT != -1)
-		    {
-			xf86Info.vtno = initialVT;
-		    }
-		    else
-		    {
-			FatalError("%s: Cannot find a free VT",
-				   "xf86OpenPcvt");
-		    }
-		}
-	    }
-
-	    close(fd);
-            snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix, xf86Info.vtno - 1);
-	    if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0)
-	    {
-		ErrorF("xf86OpenPcvt: Cannot open %s (%s)",
-			   vtname, strerror(errno));
-		xf86Info.vtno = initialVT;
-	        snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix, xf86Info.vtno - 1);
-		if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0) {
-			FatalError("xf86OpenPcvt: Cannot open %s (%s)",
-			   	vtname, strerror(errno));
-		}
-	    }
-	    if (ioctl(fd, VT_GETMODE, &vtmode) < 0)
-	    {
-		FatalError("xf86OpenPcvt: VT_GETMODE failed");
-	    }
-	    xf86Info.consType = PCVT;
+    if (fd >= 0) {
+        if (ioctl(fd, VGAPCVTID, &pcvt_version) >= 0) {
+            if (ioctl(fd, VT_GETMODE, &vtmode) < 0) {
+                FatalError("%s: VT_GETMODE failed\n%s%s\n%s",
+                           "xf86OpenPcvt",
+                           "Found pcvt driver but X11 seems to be",
+                           " not supported.", CHECK_DRIVER_MSG);
+            }
+
+            xf86Info.vtno = VTnum;
+
+            if (ioctl(fd, VT_GETACTIVE, &initialVT) < 0)
+                initialVT = -1;
+
+            if (xf86Info.vtno == -1) {
+                if (ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) {
+                    /* No free VTs */
+                    xf86Info.vtno = -1;
+                }
+
+                if (xf86Info.vtno == -1) {
+                    /*
+                     * All VTs are in use.  If initialVT was found, use it.
+                     */
+                    if (initialVT != -1) {
+                        xf86Info.vtno = initialVT;
+                    }
+                    else {
+                        FatalError("%s: Cannot find a free VT", "xf86OpenPcvt");
+                    }
+                }
+            }
+
+            close(fd);
+            snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix,
+                     xf86Info.vtno - 1);
+            if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0) {
+                ErrorF("xf86OpenPcvt: Cannot open %s (%s)",
+                       vtname, strerror(errno));
+                xf86Info.vtno = initialVT;
+                snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix,
+                         xf86Info.vtno - 1);
+                if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0) {
+                    FatalError("xf86OpenPcvt: Cannot open %s (%s)",
+                               vtname, strerror(errno));
+                }
+            }
+            if (ioctl(fd, VT_GETMODE, &vtmode) < 0) {
+                FatalError("xf86OpenPcvt: VT_GETMODE failed");
+            }
+            xf86Info.consType = PCVT;
 #ifdef WSCONS_SUPPORT
-	    xf86Msg(X_PROBED,
-		    "Using wscons driver on %s in pcvt compatibility mode "
-		    "(version %d.%d)\n", vtname,
-		    pcvt_version.rmajor, pcvt_version.rminor);
+            xf86Msg(X_PROBED,
+                    "Using wscons driver on %s in pcvt compatibility mode "
+                    "(version %d.%d)\n", vtname,
+                    pcvt_version.rmajor, pcvt_version.rminor);
 #else
-	    xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",
-		    pcvt_version.rmajor, pcvt_version.rminor);
-#endif
-	}
-	else
-	{
-	    /* Not pcvt */
-	    close(fd);
-	    fd = -1;
-	}
+            xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",
+                    pcvt_version.rmajor, pcvt_version.rminor);
+#endif
+        }
+        else {
+            /* Not pcvt */
+            close(fd);
+            fd = -1;
+        }
     }
     return fd;
 }
 
-#endif /* PCVT_SUPPORT */
+#endif                          /* PCVT_SUPPORT */
 
 #ifdef WSCONS_SUPPORT
 
@@ -602,77 +554,75 @@ xf86OpenWScons()
     /* XXX Is this ok? */
     for (i = 0; i < 8; i++) {
 #if defined(__NetBSD__)
-	snprintf(ttyname, sizeof(ttyname), "/dev/ttyE%d", i);
+        snprintf(ttyname, sizeof(ttyname), "/dev/ttyE%d", i);
 #elif defined(__OpenBSD__)
-	snprintf(ttyname,  sizeof(ttyname), "/dev/ttyC%x", i);
+        snprintf(ttyname, sizeof(ttyname), "/dev/ttyC%x", i);
 #endif
-	if ((fd = open(ttyname, 2)) != -1)
-	    break;
+        if ((fd = open(ttyname, 2)) != -1)
+            break;
     }
     if (fd != -1) {
-	if (ioctl(fd, WSDISPLAYIO_SMODE, &mode) < 0) {
-	    FatalError("%s: WSDISPLAYIO_MODE_MAPPED failed (%s)\n%s",
-		       "xf86OpenConsole", strerror(errno),
-		       CHECK_DRIVER_MSG);
-	}
-	xf86Info.consType = WSCONS;
-	xf86Msg(X_PROBED, "Using wscons driver\n");
+        if (ioctl(fd, WSDISPLAYIO_SMODE, &mode) < 0) {
+            FatalError("%s: WSDISPLAYIO_MODE_MAPPED failed (%s)\n%s",
+                       "xf86OpenConsole", strerror(errno), CHECK_DRIVER_MSG);
+        }
+        xf86Info.consType = WSCONS;
+        xf86Msg(X_PROBED, "Using wscons driver\n");
     }
     return fd;
 }
 
-#endif /* WSCONS_SUPPORT */
+#endif                          /* WSCONS_SUPPORT */
 
 void
 xf86CloseConsole()
 {
 #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT)
-    struct vt_mode   VT;
+    struct vt_mode VT;
 #endif
 
-    if (xf86Info.ShareVTs) return;
+    if (xf86Info.ShareVTs)
+        return;
 
-    switch (xf86Info.consType)
-    {
+    switch (xf86Info.consType) {
 #ifdef PCCONS_SUPPORT
     case PCCONS:
-	ioctl (xf86Info.consoleFd, CONSOLE_X_MODE_OFF, 0);
-	break;
-#endif /* PCCONS_SUPPORT */
+        ioctl(xf86Info.consoleFd, CONSOLE_X_MODE_OFF, 0);
+        break;
+#endif                          /* PCCONS_SUPPORT */
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
     case SYSCONS:
     case PCVT:
         ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);  /* Back to text mode */
-        if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1)
-        {
-	    VT.mode = VT_AUTO;
-	    ioctl(xf86Info.consoleFd, VT_SETMODE, &VT); /* dflt vt handling */
+        if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1) {
+            VT.mode = VT_AUTO;
+            ioctl(xf86Info.consoleFd, VT_SETMODE, &VT); /* dflt vt handling */
         }
 #if !defined(__OpenBSD__) && !defined(USE_DEV_IO) && !defined(USE_I386_IOPL)
-        if (ioctl(xf86Info.consoleFd, KDDISABIO, 0) < 0)
-        {
+        if (ioctl(xf86Info.consoleFd, KDDISABIO, 0) < 0) {
             xf86FatalError("xf86CloseConsole: KDDISABIO failed (%s)",
-	                   strerror(errno));
+                           strerror(errno));
         }
 #endif
-	if (initialVT != -1)
-		ioctl(xf86Info.consoleFd, VT_ACTIVATE, initialVT);
+        if (initialVT != -1)
+            ioctl(xf86Info.consoleFd, VT_ACTIVATE, initialVT);
         break;
-#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
+#endif                          /* SYSCONS_SUPPORT || PCVT_SUPPORT */
 #ifdef WSCONS_SUPPORT
     case WSCONS:
-      {
-	int mode = WSDISPLAYIO_MODE_EMUL;
-	ioctl(xf86Info.consoleFd, WSDISPLAYIO_SMODE, &mode);
-	break;
-      }
+    {
+        int mode = WSDISPLAYIO_MODE_EMUL;
+
+        ioctl(xf86Info.consoleFd, WSDISPLAYIO_SMODE, &mode);
+        break;
+    }
 #endif
     }
 
     close(xf86Info.consoleFd);
 #ifdef PCCONS_SUPPORT
     if (devConsoleFd >= 0)
-	close(devConsoleFd);
+        close(devConsoleFd);
 #endif
     return;
 }
@@ -680,38 +630,34 @@ xf86CloseConsole()
 int
 xf86ProcessArgument(int argc, char *argv[], int i)
 {
-	/*
-	 * Keep server from detaching from controlling tty.  This is useful 
-	 * when debugging (so the server can receive keyboard signals.
-	 */
-	if (!strcmp(argv[i], "-keeptty"))
-	{
-		KeepTty = TRUE;
-		return 1;
-	}
+    /*
+     * Keep server from detaching from controlling tty.  This is useful 
+     * when debugging (so the server can receive keyboard signals.
+     */
+    if (!strcmp(argv[i], "-keeptty")) {
+        KeepTty = TRUE;
+        return 1;
+    }
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
-	if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
-	{
-		if (sscanf(argv[i], "vt%2d", &VTnum) == 0 ||
-		    VTnum < 1 || VTnum > 12)
-		{
-			UseMsg();
-			VTnum = -1;
-			return 0;
-		}
-		return 1;
-	}
-#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
-	return 0;
+    if ((argv[i][0] == 'v') && (argv[i][1] == 't')) {
+        if (sscanf(argv[i], "vt%2d", &VTnum) == 0 || VTnum < 1 || VTnum > 12) {
+            UseMsg();
+            VTnum = -1;
+            return 0;
+        }
+        return 1;
+    }
+#endif                          /* SYSCONS_SUPPORT || PCVT_SUPPORT */
+    return 0;
 }
 
 void
 xf86UseMsg()
 {
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
-	ErrorF("vtXX                   use the specified VT number (1-12)\n");
-#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
-	ErrorF("-keeptty               ");
-	ErrorF("don't detach controlling tty (for debugging only)\n");
-	return;
+    ErrorF("vtXX                   use the specified VT number (1-12)\n");
+#endif                          /* SYSCONS_SUPPORT || PCVT_SUPPORT */
+    ErrorF("-keeptty               ");
+    ErrorF("don't detach controlling tty (for debugging only)\n");
+    return;
 }
diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_kmod.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_kmod.c
index 34e434188..150bb0db4 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_kmod.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_kmod.c
@@ -19,10 +19,11 @@
  * Return:
  *    0 for failure, 1 for success
  */
-int xf86LoadKernelModule(const char *modName)
+int
+xf86LoadKernelModule(const char *modName)
 {
     if (kldload(modName) != -1)
-	return 1;
+        return 1;
     else
-	return 0;
+        return 0;
 }
diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
index 053619e1d..10251f38e 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
@@ -53,20 +53,22 @@ static void bsdCloseAPM(void);
 static struct {
     u_int apmBsd;
     pmEvent xf86;
-} bsdToXF86Array [] = {
-    { APM_STANDBY_REQ, XF86_APM_SYS_STANDBY },
-    { APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND },
-    { APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME },
-    { APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME },
-    { APM_BATTERY_LOW, XF86_APM_LOW_BATTERY },
-    { APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE },
-    { APM_UPDATE_TIME, XF86_APM_UPDATE_TIME },
-    { APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND },
-    { APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY },
-    { APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND },
-    { APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME },
+} bsdToXF86Array[] = {
+    {
+    APM_STANDBY_REQ, XF86_APM_SYS_STANDBY}, {
+    APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND}, {
+    APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME}, {
+    APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME}, {
+    APM_BATTERY_LOW, XF86_APM_LOW_BATTERY}, {
+    APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE}, {
+    APM_UPDATE_TIME, XF86_APM_UPDATE_TIME}, {
+    APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND}, {
+    APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY}, {
+    APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND}, {
+    APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
 #ifdef APM_CAPABILITY_CHANGE
-    { APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED },
+    {
+    APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED},
 #endif
 };
 
@@ -78,9 +80,9 @@ bsdToXF86(int type)
     int i;
 
     for (i = 0; i < numApmEvents; i++) {
-	if (type == bsdToXF86Array[i].apmBsd) {
-	    return bsdToXF86Array[i].xf86;
-	}
+        if (type == bsdToXF86Array[i].apmBsd) {
+            return bsdToXF86Array[i].xf86;
+        }
     }
     return XF86_APM_UNKNOWN;
 }
@@ -88,24 +90,25 @@ bsdToXF86(int type)
 /*
  * APM events can be requested direclty from /dev/apm 
  */
-static int 
-bsdPMGetEventFromOS(int kq, pmEvent *events, int num)
+static int
+bsdPMGetEventFromOS(int kq, pmEvent * events, int num)
 {
     struct kevent ev;
     int i, result;
     struct timespec ts = { 0, 0 };
-    
+
     for (i = 0; i < num; i++) {
-	result = kevent(kq, NULL, 0, &ev, 1, &ts);
-	if (result == 0 || APM_EVENT_TYPE(ev.data) == APM_NOEVENT) {
-	    /* no event */
-	    break;
-	} else if (result < 0) {
-	    xf86Msg(X_WARNING, "bsdPMGetEventFromOS: kevent returns"
-		    " %s\n", strerror(errno));
-	    break;
-	}
-	events[i] = bsdToXF86(APM_EVENT_TYPE(ev.data));
+        result = kevent(kq, NULL, 0, &ev, 1, &ts);
+        if (result == 0 || APM_EVENT_TYPE(ev.data) == APM_NOEVENT) {
+            /* no event */
+            break;
+        }
+        else if (result < 0) {
+            xf86Msg(X_WARNING, "bsdPMGetEventFromOS: kevent returns"
+                    " %s\n", strerror(errno));
+            break;
+        }
+        events[i] = bsdToXF86(APM_EVENT_TYPE(ev.data));
     }
     return i;
 }
@@ -120,36 +123,36 @@ static pmWait
 bsdPMConfirmEventToOs(int dummyfd, pmEvent event)
 {
     if (ctlFd < 0) {
-	if ((ctlFd = open(_PATH_APM_CTLDEV, O_RDWR)) < 0) {
-	    return PM_NONE;
-	}
+        if ((ctlFd = open(_PATH_APM_CTLDEV, O_RDWR)) < 0) {
+            return PM_NONE;
+        }
     }
     /* apmctl open succeedeed */
     switch (event) {
-      case XF86_APM_SYS_STANDBY:
-      case XF86_APM_USER_STANDBY:
-        if (ioctl( ctlFd, APM_IOC_STANDBY, NULL ) == 0)
-            return PM_WAIT;  /* should we stop the Xserver in standby, too? */
+    case XF86_APM_SYS_STANDBY:
+    case XF86_APM_USER_STANDBY:
+        if (ioctl(ctlFd, APM_IOC_STANDBY, NULL) == 0)
+            return PM_WAIT;     /* should we stop the Xserver in standby, too? */
         else
             return PM_NONE;
 
-      case XF86_APM_SYS_SUSPEND:
-      case XF86_APM_CRITICAL_SUSPEND:
-      case XF86_APM_USER_SUSPEND:
-        if (ioctl( ctlFd, APM_IOC_SUSPEND, NULL ) == 0)
+    case XF86_APM_SYS_SUSPEND:
+    case XF86_APM_CRITICAL_SUSPEND:
+    case XF86_APM_USER_SUSPEND:
+        if (ioctl(ctlFd, APM_IOC_SUSPEND, NULL) == 0)
             return PM_WAIT;
         else
             return PM_NONE;
-	break;
-      case XF86_APM_STANDBY_RESUME:
-      case XF86_APM_NORMAL_RESUME:
-      case XF86_APM_CRITICAL_RESUME:
-      case XF86_APM_STANDBY_FAILED:
-      case XF86_APM_SUSPEND_FAILED:
+        break;
+    case XF86_APM_STANDBY_RESUME:
+    case XF86_APM_NORMAL_RESUME:
+    case XF86_APM_CRITICAL_RESUME:
+    case XF86_APM_STANDBY_FAILED:
+    case XF86_APM_SUSPEND_FAILED:
         return PM_CONTINUE;
-	break;
-      default:
-	return PM_NONE;
+        break;
+    default:
+        return PM_NONE;
     }
 }
 
@@ -160,20 +163,19 @@ xf86OSPMOpen(void)
     struct kevent ev;
 
     if (APMihPtr || !xf86Info.pmFlag) {
-	return NULL;
+        return NULL;
     }
     if ((devFd = open(_PATH_APM_DEV, O_RDONLY)) == -1) {
-	return NULL;
+        return NULL;
     }
     if ((kq = kqueue()) <= 0) {
-	close(devFd);
-	return NULL;
+        close(devFd);
+        return NULL;
     }
-    EV_SET(&ev, devFd, EVFILT_READ, EV_ADD | EV_ENABLE | EV_CLEAR,
-	   0, 0, NULL);
+    EV_SET(&ev, devFd, EVFILT_READ, EV_ADD | EV_ENABLE | EV_CLEAR, 0, 0, NULL);
     if (kevent(kq, &ev, 1, NULL, 0, NULL) < 0) {
-	close(devFd);
-	return NULL;
+        close(devFd);
+        return NULL;
     }
 
     xf86PMGetEventFromOs = bsdPMGetEventFromOS;
@@ -188,14 +190,14 @@ bsdCloseAPM(void)
     int kq;
 
     if (APMihPtr) {
-	kq = xf86RemoveGeneralHandler(APMihPtr);
-	close(devFd);
-	devFd = -1;
-	close(kq);
-	if (ctlFd >= 0) {
-	    close(ctlFd);
-	    ctlFd = -1;
-	}
-	APMihPtr = NULL;
+        kq = xf86RemoveGeneralHandler(APMihPtr);
+        close(devFd);
+        devFd = -1;
+        close(kq);
+        if (ctlFd >= 0) {
+            close(ctlFd);
+            ctlFd = -1;
+        }
+        APMihPtr = NULL;
     }
 }
diff --git a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
index 35e00fce7..569a4ec51 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
@@ -79,7 +79,7 @@
 /***************************************************************************/
 
 static Bool useDevMem = FALSE;
-static int  devMemFd = -1;
+static int devMemFd = -1;
 
 #ifdef HAS_APERTURE_DRV
 #define DEV_APERTURE "/dev/xf86"
@@ -95,7 +95,7 @@ static Bool cleanMTRR(void);
 #endif
 #if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
 static pointer NetBSDsetWC(int, unsigned long, unsigned long, Bool,
-			   MessageType);
+                           MessageType);
 static void NetBSDundoWC(int, pointer);
 #endif
 
@@ -106,85 +106,80 @@ static void NetBSDundoWC(int, pointer);
 static void
 checkDevMem(Bool warn)
 {
-	static Bool devMemChecked = FALSE;
-	int fd;
-	pointer base;
-
-	if (devMemChecked)
-	    return;
-	devMemChecked = TRUE;
-
-	if ((fd = open(DEV_MEM, O_RDWR)) >= 0)
-	{
-	    /* Try to map a page at the VGA address */
-	    base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
-				 MAP_FLAGS, fd, (off_t)0xA0000);
-	
-	    if (base != MAP_FAILED)
-	    {
-		munmap((caddr_t)base, 4096);
-		devMemFd = fd;
-		useDevMem = TRUE;
-		return;
-	    } else {
-		/* This should not happen */
-		if (warn)
-		{
-		    xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-			    DEV_MEM, strerror(errno));
-		}
-		useDevMem = FALSE;
-		return;
-	    }
-	}
+    static Bool devMemChecked = FALSE;
+    int fd;
+    pointer base;
+
+    if (devMemChecked)
+        return;
+    devMemChecked = TRUE;
+
+    if ((fd = open(DEV_MEM, O_RDWR)) >= 0) {
+        /* Try to map a page at the VGA address */
+        base = mmap((caddr_t) 0, 4096, PROT_READ | PROT_WRITE,
+                    MAP_FLAGS, fd, (off_t) 0xA0000);
+
+        if (base != MAP_FAILED) {
+            munmap((caddr_t) base, 4096);
+            devMemFd = fd;
+            useDevMem = TRUE;
+            return;
+        }
+        else {
+            /* This should not happen */
+            if (warn) {
+                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+                        DEV_MEM, strerror(errno));
+            }
+            useDevMem = FALSE;
+            return;
+        }
+    }
 #ifndef HAS_APERTURE_DRV
-	if (warn)
-	{ 
-	    xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
-		    DEV_MEM, strerror(errno));
-	} 
-	useDevMem = FALSE;
-	return;
+    if (warn) {
+        xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
+                DEV_MEM, strerror(errno));
+    }
+    useDevMem = FALSE;
+    return;
 #else
-	/* Failed to open /dev/mem, try the aperture driver */
-	if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0)
-	{
-	    /* Try to map a page at the VGA address */
-	    base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
-			     MAP_FLAGS, fd, (off_t)0xA0000);
-	
-	    if (base != MAP_FAILED)
-	    {
-		munmap((caddr_t)base, 4096);
-		devMemFd = fd;
-		useDevMem = TRUE;
-		xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
-		        DEV_APERTURE);
-		return;
-	    } else {
-
-		if (warn)
-		{
-		    xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-			    DEV_APERTURE, strerror(errno));
-		}
-	    }
-	} else {
-	    if (warn)
-	    {
+    /* Failed to open /dev/mem, try the aperture driver */
+    if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0) {
+        /* Try to map a page at the VGA address */
+        base = mmap((caddr_t) 0, 4096, PROT_READ | PROT_WRITE,
+                    MAP_FLAGS, fd, (off_t) 0xA0000);
+
+        if (base != MAP_FAILED) {
+            munmap((caddr_t) base, 4096);
+            devMemFd = fd;
+            useDevMem = TRUE;
+            xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
+                    DEV_APERTURE);
+            return;
+        }
+        else {
+
+            if (warn) {
+                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+                        DEV_APERTURE, strerror(errno));
+            }
+        }
+    }
+    else {
+        if (warn) {
 #ifndef __OpenBSD__
-		xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-			"\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
-#else /* __OpenBSD__ */
-		xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-			"\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
-			SYSCTL_MSG);
-#endif /* __OpenBSD__ */
-	    }
-	}
-	
-	useDevMem = FALSE;
-	return;
+            xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
+                    "\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
+#else                           /* __OpenBSD__ */
+            xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
+                    "\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
+                    SYSCTL_MSG);
+#endif                          /* __OpenBSD__ */
+        }
+    }
+
+    useDevMem = FALSE;
+    return;
 
 #endif
 }
@@ -192,80 +187,72 @@ checkDevMem(Bool warn)
 void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
-	checkDevMem(TRUE);
-	pVidMem->linearSupported = useDevMem;
-	pVidMem->mapMem = mapVidMem;
-	pVidMem->unmapMem = unmapVidMem;
+    checkDevMem(TRUE);
+    pVidMem->linearSupported = useDevMem;
+    pVidMem->mapMem = mapVidMem;
+    pVidMem->unmapMem = unmapVidMem;
 
-	if (useDevMem)
-		pci_system_init_dev_mem(devMemFd);
+    if (useDevMem)
+        pci_system_init_dev_mem(devMemFd);
 
 #ifdef HAS_MTRR_SUPPORT
-	if (useDevMem) {
-		if (cleanMTRR()) {
-			pVidMem->setWC = setWC;
-			pVidMem->undoWC = undoWC;
-		}
-	}
+    if (useDevMem) {
+        if (cleanMTRR()) {
+            pVidMem->setWC = setWC;
+            pVidMem->undoWC = undoWC;
+        }
+    }
 #endif
 #if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
-	pVidMem->setWC = NetBSDsetWC;
-	pVidMem->undoWC = NetBSDundoWC;
+    pVidMem->setWC = NetBSDsetWC;
+    pVidMem->undoWC = NetBSDundoWC;
 #endif
-	pVidMem->initialised = TRUE;
+    pVidMem->initialised = TRUE;
 }
 
 static pointer
 mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 {
-	pointer base;
-
-	checkDevMem(FALSE);
-
-	if (useDevMem)
-	{
-	    if (devMemFd < 0) 
-	    {
-		FatalError("xf86MapVidMem: failed to open %s (%s)",
-			   DEV_MEM, strerror(errno));
-	    }
-	    base = mmap((caddr_t)0, Size,
-			(flags & VIDMEM_READONLY) ?
-			 PROT_READ : (PROT_READ | PROT_WRITE),
-			MAP_FLAGS, devMemFd, (off_t)Base);
-	    if (base == MAP_FAILED)
-	    {
-		FatalError("%s: could not mmap %s [s=%lx,a=%lx] (%s)",
-			   "xf86MapVidMem", DEV_MEM, Size, Base, 
-			   strerror(errno));
-	    }
-	    return base;
-	}
-		
-	/* else, mmap /dev/vga */
-	if ((unsigned long)Base < 0xA0000 || (unsigned long)Base >= 0xC0000)
-	{
-		FatalError("%s: Address 0x%lx outside allowable range",
-			   "xf86MapVidMem", Base);
-	}
-	base = mmap(0, Size,
-		    (flags & VIDMEM_READONLY) ?
-		     PROT_READ : (PROT_READ | PROT_WRITE),
-		    MAP_FLAGS, xf86Info.consoleFd,
-		    (unsigned long)Base - 0xA0000
-	    );
-	if (base == MAP_FAILED)
-	{
-	    FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)",
-		       strerror(errno));
-	}
-	return base;
+    pointer base;
+
+    checkDevMem(FALSE);
+
+    if (useDevMem) {
+        if (devMemFd < 0) {
+            FatalError("xf86MapVidMem: failed to open %s (%s)",
+                       DEV_MEM, strerror(errno));
+        }
+        base = mmap((caddr_t) 0, Size,
+                    (flags & VIDMEM_READONLY) ?
+                    PROT_READ : (PROT_READ | PROT_WRITE),
+                    MAP_FLAGS, devMemFd, (off_t) Base);
+        if (base == MAP_FAILED) {
+            FatalError("%s: could not mmap %s [s=%lx,a=%lx] (%s)",
+                       "xf86MapVidMem", DEV_MEM, Size, Base, strerror(errno));
+        }
+        return base;
+    }
+
+    /* else, mmap /dev/vga */
+    if ((unsigned long) Base < 0xA0000 || (unsigned long) Base >= 0xC0000) {
+        FatalError("%s: Address 0x%lx outside allowable range",
+                   "xf86MapVidMem", Base);
+    }
+    base = mmap(0, Size,
+                (flags & VIDMEM_READONLY) ?
+                PROT_READ : (PROT_READ | PROT_WRITE),
+                MAP_FLAGS, xf86Info.consoleFd, (unsigned long) Base - 0xA0000);
+    if (base == MAP_FAILED) {
+        FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)",
+                   strerror(errno));
+    }
+    return base;
 }
 
 static void
 unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 {
-	munmap((caddr_t)Base, Size);
+    munmap((caddr_t) Base, Size);
 }
 
 /*
@@ -274,47 +261,46 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 
 int
 xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
+             int Len)
 {
-	unsigned char *ptr;
-	int psize;
-	int mlen;
-
-	checkDevMem(TRUE);
-	if (devMemFd == -1) {
-	    return -1;
-	}
-
-	psize = getpagesize();
-	Offset += Base & (psize - 1);
-	Base &= ~(psize - 1);
-	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-	ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ,
-					MAP_SHARED, devMemFd, (off_t)Base);
-	if ((long)ptr == -1)
-	{
-		xf86Msg(X_WARNING, 
-			"xf86ReadBIOS: %s mmap[s=%x,a=%lx,o=%lx] failed (%s)\n",
-			DEV_MEM, Len, Base, Offset, strerror(errno));
+    unsigned char *ptr;
+    int psize;
+    int mlen;
+
+    checkDevMem(TRUE);
+    if (devMemFd == -1) {
+        return -1;
+    }
+
+    psize = getpagesize();
+    Offset += Base & (psize - 1);
+    Base &= ~(psize - 1);
+    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
+    ptr = (unsigned char *) mmap((caddr_t) 0, mlen, PROT_READ,
+                                 MAP_SHARED, devMemFd, (off_t) Base);
+    if ((long) ptr == -1) {
+        xf86Msg(X_WARNING,
+                "xf86ReadBIOS: %s mmap[s=%x,a=%lx,o=%lx] failed (%s)\n",
+                DEV_MEM, Len, Base, Offset, strerror(errno));
 #ifdef __OpenBSD__
-		if (Base < 0xa0000) {
-		    xf86Msg(X_WARNING, SYSCTL_MSG2);
-		} 
+        if (Base < 0xa0000) {
+            xf86Msg(X_WARNING, SYSCTL_MSG2);
+        }
 #endif
-		return -1;
-	}
+        return -1;
+    }
 #ifdef DEBUG
-	ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
-		Base, ptr[0] | (ptr[1] << 8));
+    ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
+           Base, ptr[0] | (ptr[1] << 8));
 #endif
-	(void)memcpy(Buf, (void *)(ptr + Offset), Len);
-	(void)munmap((caddr_t)ptr, mlen);
+    (void) memcpy(Buf, (void *) (ptr + Offset), Len);
+    (void) munmap((caddr_t) ptr, mlen);
 #ifdef DEBUG
-	xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
-		"-> %02x %02x %02x %02x...\n",
-		Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
+    xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
+                "-> %02x %02x %02x %02x...\n",
+                Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
 #endif
-	return Len;
+    return Len;
 }
 
 #ifdef USE_I386_IOPL
@@ -327,38 +313,37 @@ static Bool ExtendedEnabled = FALSE;
 Bool
 xf86EnableIO()
 {
-	if (ExtendedEnabled)
-		return TRUE;
+    if (ExtendedEnabled)
+        return TRUE;
 
-	if (i386_iopl(TRUE) < 0)
-	{
+    if (i386_iopl(TRUE) < 0) {
 #ifndef __OpenBSD__
-		xf86Msg(X_WARNING,"%s: Failed to set IOPL for extended I/O",
-			   "xf86EnableIO");
+        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O",
+                "xf86EnableIO");
 #else
-		xf86Msg(X_WARNING,"%s: Failed to set IOPL for extended I/O\n%s",
-			   "xf86EnableIO", SYSCTL_MSG);
+        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O\n%s",
+                "xf86EnableIO", SYSCTL_MSG);
 #endif
-		return FALSE;
-	}
-	ExtendedEnabled = TRUE;
+        return FALSE;
+    }
+    ExtendedEnabled = TRUE;
 
-	return TRUE;
+    return TRUE;
 }
-	
+
 void
 xf86DisableIO()
 {
-	if (!ExtendedEnabled)
-		return;
+    if (!ExtendedEnabled)
+        return;
 
-	i386_iopl(FALSE);
-	ExtendedEnabled = FALSE;
+    i386_iopl(FALSE);
+    ExtendedEnabled = FALSE;
 
-	return;
+    return;
 }
 
-#endif /* USE_I386_IOPL */
+#endif                          /* USE_I386_IOPL */
 
 #ifdef USE_AMD64_IOPL
 /***************************************************************************/
@@ -370,41 +355,40 @@ static Bool ExtendedEnabled = FALSE;
 Bool
 xf86EnableIO()
 {
-	if (ExtendedEnabled)
-		return TRUE;
+    if (ExtendedEnabled)
+        return TRUE;
 
-	if (amd64_iopl(TRUE) < 0)
-	{
+    if (amd64_iopl(TRUE) < 0) {
 #ifndef __OpenBSD__
-		xf86Msg(X_WARNING,"%s: Failed to set IOPL for extended I/O",
-			   "xf86EnableIO");
+        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O",
+                "xf86EnableIO");
 #else
-		xf86Msg(X_WARNING,"%s: Failed to set IOPL for extended I/O\n%s",
-			   "xf86EnableIO", SYSCTL_MSG);
+        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O\n%s",
+                "xf86EnableIO", SYSCTL_MSG);
 #endif
-		return FALSE;
-	}
-	ExtendedEnabled = TRUE;
+        return FALSE;
+    }
+    ExtendedEnabled = TRUE;
 
-	return TRUE;
+    return TRUE;
 }
-	
+
 void
 xf86DisableIO()
 {
-	if (!ExtendedEnabled)
-		return;
-
-	if (amd64_iopl(FALSE) == 0) {
-		ExtendedEnabled = FALSE;
-	}
-	/* Otherwise, the X server has revoqued its root uid, 
-	   and thus cannot give up IO privileges any more */
-	   
-	return;
+    if (!ExtendedEnabled)
+        return;
+
+    if (amd64_iopl(FALSE) == 0) {
+        ExtendedEnabled = FALSE;
+    }
+    /* Otherwise, the X server has revoqued its root uid, 
+       and thus cannot give up IO privileges any more */
+
+    return;
 }
 
-#endif /* USE_AMD64_IOPL */
+#endif                          /* USE_AMD64_IOPL */
 
 #ifdef USE_DEV_IO
 static int IoFd = -1;
@@ -412,27 +396,26 @@ static int IoFd = -1;
 Bool
 xf86EnableIO()
 {
-	if (IoFd >= 0)
-		return TRUE;
-
-	if ((IoFd = open("/dev/io", O_RDWR)) == -1)
-	{
-		xf86Msg(X_WARNING,"xf86EnableIO: "
-				"Failed to open /dev/io for extended I/O");
-		return FALSE;
-	}
-	return TRUE;
+    if (IoFd >= 0)
+        return TRUE;
+
+    if ((IoFd = open("/dev/io", O_RDWR)) == -1) {
+        xf86Msg(X_WARNING, "xf86EnableIO: "
+                "Failed to open /dev/io for extended I/O");
+        return FALSE;
+    }
+    return TRUE;
 }
 
 void
 xf86DisableIO()
 {
-	if (IoFd < 0)
-		return;
+    if (IoFd < 0)
+        return;
 
-	close(IoFd);
-	IoFd = -1;
-	return;
+    close(IoFd);
+    IoFd = -1;
+    return;
 }
 
 #endif
@@ -443,50 +426,46 @@ xf86DisableIO()
 /***************************************************************************/
 void
 xf86SetTVOut(int mode)
-{    
-    switch (xf86Info.consType)
-    {
+{
+    switch (xf86Info.consType) {
 #ifdef PCCONS_SUPPORT
-	case PCCONS:{
-
-	    if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0)
-	    {
-		xf86Msg(X_WARNING,
-		    "xf86SetTVOut: Could not set console to TV output, %s\n",
-		    strerror(errno));
-	    }
-	}
-	break;
-#endif /* PCCONS_SUPPORT */
-
-	default:
-	    FatalError("Xf86SetTVOut: Unsupported console");
-	    break; 
+    case PCCONS:{
+
+        if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) {
+            xf86Msg(X_WARNING,
+                    "xf86SetTVOut: Could not set console to TV output, %s\n",
+                    strerror(errno));
+        }
+    }
+        break;
+#endif                          /* PCCONS_SUPPORT */
+
+    default:
+        FatalError("Xf86SetTVOut: Unsupported console");
+        break;
     }
     return;
 }
 
 void
 xf86SetRGBOut()
-{    
-    switch (xf86Info.consType)
-    {
+{
+    switch (xf86Info.consType) {
 #ifdef PCCONS_SUPPORT
-	case PCCONS:{
-	    
-	    if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0)
-	    {
-		xf86Msg(X_WARNING,
-		    "xf86SetTVOut: Could not set console to RGB output, %s\n",
-		    strerror(errno));
-	    }
-	}
-	break;
-#endif /* PCCONS_SUPPORT */
-
-	default:
-	    FatalError("Xf86SetTVOut: Unsupported console");
-	    break; 
+    case PCCONS:{
+
+        if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) {
+            xf86Msg(X_WARNING,
+                    "xf86SetTVOut: Could not set console to RGB output, %s\n",
+                    strerror(errno));
+        }
+    }
+        break;
+#endif                          /* PCCONS_SUPPORT */
+
+    default:
+        FatalError("Xf86SetTVOut: Unsupported console");
+        break;
     }
     return;
 }
@@ -507,25 +486,25 @@ xf86SetRGBOut()
 static struct mem_range_desc *
 getAllRanges(int *nmr)
 {
-	struct mem_range_desc *mrd;
-	struct mem_range_op mro;
-
-	/*
-	 * Find how many ranges there are.  If this fails, then the kernel
-	 * probably doesn't have MTRR support.
-	 */
-	mro.mo_arg[0] = 0;
-	if (ioctl(devMemFd, MEMRANGE_GET, &mro))
-		return NULL;
-	*nmr = mro.mo_arg[0];
-	mrd = xnfalloc(*nmr * sizeof(struct mem_range_desc));
-	mro.mo_arg[0] = *nmr;
-	mro.mo_desc = mrd;
-	if (ioctl(devMemFd, MEMRANGE_GET, &mro)) {
-		free(mrd);
-		return NULL;
-	}
-	return mrd;
+    struct mem_range_desc *mrd;
+    struct mem_range_op mro;
+
+    /*
+     * Find how many ranges there are.  If this fails, then the kernel
+     * probably doesn't have MTRR support.
+     */
+    mro.mo_arg[0] = 0;
+    if (ioctl(devMemFd, MEMRANGE_GET, &mro))
+        return NULL;
+    *nmr = mro.mo_arg[0];
+    mrd = xnfalloc(*nmr * sizeof(struct mem_range_desc));
+    mro.mo_arg[0] = *nmr;
+    mro.mo_desc = mrd;
+    if (ioctl(devMemFd, MEMRANGE_GET, &mro)) {
+        free(mrd);
+        return NULL;
+    }
+    return mrd;
 }
 
 /*
@@ -537,109 +516,111 @@ getAllRanges(int *nmr)
 static Bool
 cleanMTRR()
 {
-	struct mem_range_desc *mrd;
-	struct mem_range_op mro;
-	int nmr, i;
+    struct mem_range_desc *mrd;
+    struct mem_range_op mro;
+    int nmr, i;
 
-	/* This shouldn't happen */
-	if (devMemFd < 0)
-		return FALSE;
+    /* This shouldn't happen */
+    if (devMemFd < 0)
+        return FALSE;
 
-	if (!(mrd = getAllRanges(&nmr)))
-		return FALSE;
+    if (!(mrd = getAllRanges(&nmr)))
+        return FALSE;
 
-	for (i = 0; i < nmr; i++) {
-		if (strcmp(mrd[i].mr_owner, X_MTRR_ID) == 0 &&
-		    (mrd[i].mr_flags & MDF_ACTIVE)) {
+    for (i = 0; i < nmr; i++) {
+        if (strcmp(mrd[i].mr_owner, X_MTRR_ID) == 0 &&
+            (mrd[i].mr_flags & MDF_ACTIVE)) {
 #ifdef DEBUG
-			ErrorF("Clean for (0x%lx,0x%lx)\n",
-				(unsigned long)mrd[i].mr_base,
-				(unsigned long)mrd[i].mr_len);
+            ErrorF("Clean for (0x%lx,0x%lx)\n",
+                   (unsigned long) mrd[i].mr_base,
+                   (unsigned long) mrd[i].mr_len);
 #endif
-			if (mrd[i].mr_flags & MDF_FIXACTIVE) {
-				mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-				mrd[i].mr_flags = MDF_UNCACHEABLE;
-			} else {
-				mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
-			}
-			mro.mo_desc = mrd + i;
-			ioctl(devMemFd, MEMRANGE_SET, &mro);
-		}
-	}
+            if (mrd[i].mr_flags & MDF_FIXACTIVE) {
+                mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
+                mrd[i].mr_flags = MDF_UNCACHEABLE;
+            }
+            else {
+                mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
+            }
+            mro.mo_desc = mrd + i;
+            ioctl(devMemFd, MEMRANGE_SET, &mro);
+        }
+    }
 #ifdef DEBUG
-	sleep(10);
+    sleep(10);
 #endif
-	free(mrd);
-	return TRUE;
+    free(mrd);
+    return TRUE;
 }
 
 typedef struct x_RangeRec {
-	struct mem_range_desc	mrd;
-	Bool			wasWC;
-	struct x_RangeRec *	next;
+    struct mem_range_desc mrd;
+    Bool wasWC;
+    struct x_RangeRec *next;
 } RangeRec, *RangePtr;
 
 static void
 freeRangeList(RangePtr range)
 {
-	RangePtr rp;
+    RangePtr rp;
 
-	while (range) {
-		rp = range;
-		range = rp->next;
-		free(rp);
-	}
+    while (range) {
+        rp = range;
+        range = rp->next;
+        free(rp);
+    }
 }
 
 static RangePtr
 dupRangeList(RangePtr list)
 {
-	RangePtr new = NULL, rp, p;
-
-	rp = list;
-	while (rp) {
-		p = xnfalloc(sizeof(RangeRec));
-		*p = *rp;
-		p->next = new;
-		new = p;
-		rp = rp->next;
-	}
-	return new;
+    RangePtr new = NULL, rp, p;
+
+    rp = list;
+    while (rp) {
+        p = xnfalloc(sizeof(RangeRec));
+        *p = *rp;
+        p->next = new;
+        new = p;
+        rp = rp->next;
+    }
+    return new;
 }
 
 static RangePtr
 sortRangeList(RangePtr list)
 {
-	RangePtr rp1, rp2, copy, sorted = NULL, minp, prev, minprev;
-	unsigned long minBase;
-
-	/* Sort by base address */
-	rp1 = copy = dupRangeList(list);
-	while (rp1) {
-		minBase = rp1->mrd.mr_base;
-		minp = rp1;
-		minprev = NULL;
-		prev = rp1;
-		rp2 = rp1->next;
-		while (rp2) {
-			if (rp2->mrd.mr_base < minBase) {
-				minBase = rp2->mrd.mr_base;
-				minp = rp2;
-				minprev = prev;
-			}
-			prev = rp2;
-			rp2 = rp2->next;
-		}
-		if (minprev) {
-			minprev->next = minp->next;
-			rp1 = copy;
-		} else {
-			rp1 = minp->next;
-		}
-		minp->next = sorted;
-		sorted = minp;
-	}
-	return sorted;
+    RangePtr rp1, rp2, copy, sorted = NULL, minp, prev, minprev;
+    unsigned long minBase;
+
+    /* Sort by base address */
+    rp1 = copy = dupRangeList(list);
+    while (rp1) {
+        minBase = rp1->mrd.mr_base;
+        minp = rp1;
+        minprev = NULL;
+        prev = rp1;
+        rp2 = rp1->next;
+        while (rp2) {
+            if (rp2->mrd.mr_base < minBase) {
+                minBase = rp2->mrd.mr_base;
+                minp = rp2;
+                minprev = prev;
+            }
+            prev = rp2;
+            rp2 = rp2->next;
+        }
+        if (minprev) {
+            minprev->next = minp->next;
+            rp1 = copy;
+        }
+        else {
+            rp1 = minp->next;
+        }
+        minp->next = sorted;
+        sorted = minp;
+    }
+    return sorted;
 }
 
 /*
@@ -647,32 +628,33 @@ sortRangeList(RangePtr list)
  */
 
 static void
-findRanges(unsigned long base, unsigned long size, RangePtr *ucp, RangePtr *wcp)
+findRanges(unsigned long base, unsigned long size, RangePtr * ucp,
+           RangePtr * wcp)
 {
-	struct mem_range_desc *mrd;
-	int nmr, i;
-	RangePtr rp, *p;
-	
-	if (!(mrd = getAllRanges(&nmr)))
-		return;
-
-	for (i = 0; i < nmr; i++) {
-		if ((mrd[i].mr_flags & MDF_ACTIVE) &&
-		    mrd[i].mr_base < base + size &&
-		    mrd[i].mr_base + mrd[i].mr_len > base) {
-			if (mrd[i].mr_flags & MDF_WRITECOMBINE)
-				p = wcp;
-			else if (mrd[i].mr_flags & MDF_UNCACHEABLE)
-				p = ucp;
-			else
-				continue;
-			rp = xnfalloc(sizeof(RangeRec));
-			rp->mrd = mrd[i];
-			rp->next = *p;
-			*p = rp;
-		}
-	}
-	free(mrd);
+    struct mem_range_desc *mrd;
+    int nmr, i;
+    RangePtr rp, *p;
+
+    if (!(mrd = getAllRanges(&nmr)))
+        return;
+
+    for (i = 0; i < nmr; i++) {
+        if ((mrd[i].mr_flags & MDF_ACTIVE) &&
+            mrd[i].mr_base < base + size &&
+            mrd[i].mr_base + mrd[i].mr_len > base) {
+            if (mrd[i].mr_flags & MDF_WRITECOMBINE)
+                p = wcp;
+            else if (mrd[i].mr_flags & MDF_UNCACHEABLE)
+                p = ucp;
+            else
+                continue;
+            rp = xnfalloc(sizeof(RangeRec));
+            rp->mrd = mrd[i];
+            rp->next = *p;
+            *p = rp;
+        }
+    }
+    free(mrd);
 }
 
 /*
@@ -683,219 +665,222 @@ findRanges(unsigned long base, unsigned long size, RangePtr *ucp, RangePtr *wcp)
 static Bool
 fullCoverage(unsigned long base, unsigned long size, RangePtr overlap)
 {
-	RangePtr rp1, sorted = NULL;
-	unsigned long end;
-
-	sorted = sortRangeList(overlap);
-	/* Look for gaps */
-	rp1 = sorted;
-	end = base + size;
-	while (rp1) {
-		if (rp1->mrd.mr_base > base) {
-			freeRangeList(sorted);
-			return FALSE;
-		} else {
-			base = rp1->mrd.mr_base + rp1->mrd.mr_len;
-		}
-		if (base >= end) {
-			freeRangeList(sorted);
-			return TRUE;
-		}
-		rp1 = rp1->next;
-	}
-	freeRangeList(sorted);
-	return FALSE;
+    RangePtr rp1, sorted = NULL;
+    unsigned long end;
+
+    sorted = sortRangeList(overlap);
+    /* Look for gaps */
+    rp1 = sorted;
+    end = base + size;
+    while (rp1) {
+        if (rp1->mrd.mr_base > base) {
+            freeRangeList(sorted);
+            return FALSE;
+        }
+        else {
+            base = rp1->mrd.mr_base + rp1->mrd.mr_len;
+        }
+        if (base >= end) {
+            freeRangeList(sorted);
+            return TRUE;
+        }
+        rp1 = rp1->next;
+    }
+    freeRangeList(sorted);
+    return FALSE;
 }
 
 static pointer
 addWC(int screenNum, unsigned long base, unsigned long size, MessageType from)
 {
-	RangePtr uc = NULL, wc = NULL, retlist = NULL;
-	struct mem_range_desc mrd;
-	struct mem_range_op mro;
-
-	findRanges(base, size, &uc, &wc);
-
-	/* See of the full range is already WC */
-	if (!uc && fullCoverage(base, size, wc)) {
-		xf86DrvMsg(screenNum, from, 
-		   "Write-combining range (0x%lx,0x%lx) was already set\n",
-		    base, size);
-		return NULL;
-	}
-
-	/* Otherwise, try to add the new range */
-	mrd.mr_base = base;
-	mrd.mr_len = size;
-	strcpy(mrd.mr_owner, X_MTRR_ID);
-	mrd.mr_flags = MDF_WRITECOMBINE;
-	mro.mo_desc = &mrd;
-	mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-	if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
-		xf86DrvMsg(screenNum, X_WARNING,
-			   "Failed to set write-combining range "
-			   "(0x%lx,0x%lx)\n", base, size);
-		return NULL;
-	} else {
-		xf86DrvMsg(screenNum, from,
-			   "Write-combining range (0x%lx,0x%lx)\n", base, size);
-		retlist = xnfalloc(sizeof(RangeRec));
-		retlist->mrd = mrd;
-		retlist->wasWC = FALSE;
-		retlist->next = NULL;
-		return retlist;
-	}
+    RangePtr uc = NULL, wc = NULL, retlist = NULL;
+    struct mem_range_desc mrd;
+    struct mem_range_op mro;
+
+    findRanges(base, size, &uc, &wc);
+
+    /* See of the full range is already WC */
+    if (!uc && fullCoverage(base, size, wc)) {
+        xf86DrvMsg(screenNum, from,
+                   "Write-combining range (0x%lx,0x%lx) was already set\n",
+                   base, size);
+        return NULL;
+    }
+
+    /* Otherwise, try to add the new range */
+    mrd.mr_base = base;
+    mrd.mr_len = size;
+    strcpy(mrd.mr_owner, X_MTRR_ID);
+    mrd.mr_flags = MDF_WRITECOMBINE;
+    mro.mo_desc = &mrd;
+    mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
+    if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
+        xf86DrvMsg(screenNum, X_WARNING,
+                   "Failed to set write-combining range "
+                   "(0x%lx,0x%lx)\n", base, size);
+        return NULL;
+    }
+    else {
+        xf86DrvMsg(screenNum, from,
+                   "Write-combining range (0x%lx,0x%lx)\n", base, size);
+        retlist = xnfalloc(sizeof(RangeRec));
+        retlist->mrd = mrd;
+        retlist->wasWC = FALSE;
+        retlist->next = NULL;
+        return retlist;
+    }
 }
 
 static pointer
 delWC(int screenNum, unsigned long base, unsigned long size, MessageType from)
 {
-	RangePtr uc = NULL, wc = NULL, retlist = NULL;
-	struct mem_range_desc mrd;
-	struct mem_range_op mro;
-
-	findRanges(base, size, &uc, &wc);
-
-	/*
-	 * See of the full range is already not WC, or if there is full
-	 * coverage from UC ranges.
-	 */
-	if (!wc || fullCoverage(base, size, uc)) {
-		xf86DrvMsg(screenNum, from, 
-		   "Write-combining range (0x%lx,0x%lx) was already clear\n",
-		    base, size);
-		return NULL;
-	}
-
-	/* Otherwise, try to add the new range */
-	mrd.mr_base = base;
-	mrd.mr_len = size;
-	strcpy(mrd.mr_owner, X_MTRR_ID);
-	mrd.mr_flags = MDF_UNCACHEABLE;
-	mro.mo_desc = &mrd;
-	mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-	if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
-		xf86DrvMsg(screenNum, X_WARNING,
-			   "Failed to remove write-combining range "
-			   "(0x%lx,0x%lx)\n", base, size);
-		/* XXX Should then remove all of the overlapping WC ranges */
-		return NULL;
-	} else {
-		xf86DrvMsg(screenNum, from,
-			   "Removed Write-combining range (0x%lx,0x%lx)\n",
-			   base, size);
-		retlist = xnfalloc(sizeof(RangeRec));
-		retlist->mrd = mrd;
-		retlist->wasWC = TRUE;
-		retlist->next = NULL;
-		return retlist;
-	}
+    RangePtr uc = NULL, wc = NULL, retlist = NULL;
+    struct mem_range_desc mrd;
+    struct mem_range_op mro;
+
+    findRanges(base, size, &uc, &wc);
+
+    /*
+     * See of the full range is already not WC, or if there is full
+     * coverage from UC ranges.
+     */
+    if (!wc || fullCoverage(base, size, uc)) {
+        xf86DrvMsg(screenNum, from,
+                   "Write-combining range (0x%lx,0x%lx) was already clear\n",
+                   base, size);
+        return NULL;
+    }
+
+    /* Otherwise, try to add the new range */
+    mrd.mr_base = base;
+    mrd.mr_len = size;
+    strcpy(mrd.mr_owner, X_MTRR_ID);
+    mrd.mr_flags = MDF_UNCACHEABLE;
+    mro.mo_desc = &mrd;
+    mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
+    if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
+        xf86DrvMsg(screenNum, X_WARNING,
+                   "Failed to remove write-combining range "
+                   "(0x%lx,0x%lx)\n", base, size);
+        /* XXX Should then remove all of the overlapping WC ranges */
+        return NULL;
+    }
+    else {
+        xf86DrvMsg(screenNum, from,
+                   "Removed Write-combining range (0x%lx,0x%lx)\n", base, size);
+        retlist = xnfalloc(sizeof(RangeRec));
+        retlist->mrd = mrd;
+        retlist->wasWC = TRUE;
+        retlist->next = NULL;
+        return retlist;
+    }
 }
 
 static pointer
 setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
-	MessageType from)
+      MessageType from)
 {
-	if (enable)
-		return addWC(screenNum, base, size, from);
-	else
-		return delWC(screenNum, base, size, from);
+    if (enable)
+        return addWC(screenNum, base, size, from);
+    else
+        return delWC(screenNum, base, size, from);
 }
 
 static void
 undoWC(int screenNum, pointer list)
 {
-	RangePtr rp;
-	struct mem_range_op mro;
-	Bool failed;
+    RangePtr rp;
+    struct mem_range_op mro;
+    Bool failed;
 
-	rp = list;
-	while (rp) {
+    rp = list;
+    while (rp) {
 #ifdef DEBUG
-		ErrorF("Undo for (0x%lx,0x%lx), %d\n",
-			(unsigned long)rp->mrd.mr_base,
-			(unsigned long)rp->mrd.mr_len, rp->wasWC);
+        ErrorF("Undo for (0x%lx,0x%lx), %d\n",
+               (unsigned long) rp->mrd.mr_base,
+               (unsigned long) rp->mrd.mr_len, rp->wasWC);
 #endif
-		failed = FALSE;
-		if (rp->wasWC) {
-			mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-			rp->mrd.mr_flags = MDF_WRITECOMBINE;
-			strcpy(rp->mrd.mr_owner, "unknown");
-		} else {
-			mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
-		}
-		mro.mo_desc = &rp->mrd;
-
-		if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
-			if (!rp->wasWC) {
-				mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-				rp->mrd.mr_flags = MDF_UNCACHEABLE;
-				strcpy(rp->mrd.mr_owner, "unknown");
-				if (ioctl(devMemFd, MEMRANGE_SET, &mro))
-					failed = TRUE;
-			} else
-				failed = TRUE;
-		}
-		if (failed) {
-			xf86DrvMsg(screenNum, X_WARNING,
-				"Failed to restore MTRR range (0x%lx,0x%lx)\n",
-				(unsigned long)rp->mrd.mr_base,
-				(unsigned long)rp->mrd.mr_len);
-		}
-		rp = rp->next;
-	}
+        failed = FALSE;
+        if (rp->wasWC) {
+            mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
+            rp->mrd.mr_flags = MDF_WRITECOMBINE;
+            strcpy(rp->mrd.mr_owner, "unknown");
+        }
+        else {
+            mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
+        }
+        mro.mo_desc = &rp->mrd;
+
+        if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
+            if (!rp->wasWC) {
+                mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
+                rp->mrd.mr_flags = MDF_UNCACHEABLE;
+                strcpy(rp->mrd.mr_owner, "unknown");
+                if (ioctl(devMemFd, MEMRANGE_SET, &mro))
+                    failed = TRUE;
+            }
+            else
+                failed = TRUE;
+        }
+        if (failed) {
+            xf86DrvMsg(screenNum, X_WARNING,
+                       "Failed to restore MTRR range (0x%lx,0x%lx)\n",
+                       (unsigned long) rp->mrd.mr_base,
+                       (unsigned long) rp->mrd.mr_len);
+        }
+        rp = rp->next;
+    }
 }
 
-#endif /* HAS_MTRR_SUPPORT */
-
+#endif                          /* HAS_MTRR_SUPPORT */
 
 #if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
 static pointer
 NetBSDsetWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
-	    MessageType from)
+            MessageType from)
 {
-	struct mtrr *mtrrp;
-	int n;
-
-	xf86DrvMsg(screenNum, X_WARNING,
-		   "%s MTRR %lx - %lx\n", enable ? "set" : "remove",
-		   base, (base + size));
-
-	mtrrp = xnfalloc(sizeof (struct mtrr));
-	mtrrp->base = base;
-	mtrrp->len = size;
-	mtrrp->type = MTRR_TYPE_WC;
-
-	/*
-	 * MTRR_PRIVATE will make this MTRR get reset automatically
-	 * if this process exits, so we have no need for an explicit
-	 * cleanup operation when starting a new server.
-	 */
-
-	if (enable)
-		mtrrp->flags = MTRR_VALID | MTRR_PRIVATE;
-	else
-		mtrrp->flags = 0;
-	n = 1;
-
-	if (i386_set_mtrr(mtrrp, &n) < 0) {
-		free(mtrrp);
-		return NULL;
-	}
-	return mtrrp;
+    struct mtrr *mtrrp;
+    int n;
+
+    xf86DrvMsg(screenNum, X_WARNING,
+               "%s MTRR %lx - %lx\n", enable ? "set" : "remove",
+               base, (base + size));
+
+    mtrrp = xnfalloc(sizeof(struct mtrr));
+    mtrrp->base = base;
+    mtrrp->len = size;
+    mtrrp->type = MTRR_TYPE_WC;
+
+    /*
+     * MTRR_PRIVATE will make this MTRR get reset automatically
+     * if this process exits, so we have no need for an explicit
+     * cleanup operation when starting a new server.
+     */
+
+    if (enable)
+        mtrrp->flags = MTRR_VALID | MTRR_PRIVATE;
+    else
+        mtrrp->flags = 0;
+    n = 1;
+
+    if (i386_set_mtrr(mtrrp, &n) < 0) {
+        free(mtrrp);
+        return NULL;
+    }
+    return mtrrp;
 }
 
 static void
 NetBSDundoWC(int screenNum, pointer list)
 {
-	struct mtrr *mtrrp = (struct mtrr *)list;
-	int n;
-
-	if (mtrrp == NULL)
-		return;
-	n = 1;
-	mtrrp->flags &= ~MTRR_VALID;
-	i386_set_mtrr(mtrrp, &n);
-	free(mtrrp);
+    struct mtrr *mtrrp = (struct mtrr *) list;
+    int n;
+
+    if (mtrrp == NULL)
+        return;
+    n = 1;
+    mtrrp->flags &= ~MTRR_VALID;
+    i386_set_mtrr(mtrrp, &n);
+    free(mtrrp);
 }
 #endif
diff --git a/xorg-server/hw/xfree86/os-support/bsd/memrange.h b/xorg-server/hw/xfree86/os-support/bsd/memrange.h
index 03c479144..bacd4aa0d 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/memrange.h
+++ b/xorg-server/hw/xfree86/os-support/bsd/memrange.h
@@ -10,36 +10,37 @@
 #define _MEMRANGE_H
 
 /* Memory range attributes */
-#define MDF_UNCACHEABLE		(1<<0)	/* region not cached */
-#define MDF_WRITECOMBINE	(1<<1)	/* region supports "write combine"
-					 * action */
-#define MDF_WRITETHROUGH	(1<<2)	/* write-through cached */
-#define MDF_WRITEBACK		(1<<3)	/* write-back cached */
-#define MDF_WRITEPROTECT	(1<<4)	/* read-only region */
+#define MDF_UNCACHEABLE		(1<<0)  /* region not cached */
+#define MDF_WRITECOMBINE	(1<<1)  /* region supports "write combine"
+                                         * action */
+#define MDF_WRITETHROUGH	(1<<2)  /* write-through cached */
+#define MDF_WRITEBACK		(1<<3)  /* write-back cached */
+#define MDF_WRITEPROTECT	(1<<4)  /* read-only region */
 #define MDF_ATTRMASK		(0x00ffffff)
 
-#define MDF_FIXBASE		(1<<24)	/* fixed base */
-#define MDF_FIXLEN		(1<<25)	/* fixed length */
-#define MDF_FIRMWARE		(1<<26)	/* set by firmware (XXX not useful?) */
-#define MDF_ACTIVE		(1<<27)	/* currently active */
-#define MDF_BOGUS		(1<<28)	/* we don't like it */
-#define MDF_FIXACTIVE		(1<<29)	/* can't be turned off */
-#define MDF_BUSY		(1<<30)	/* range is in use */
+#define MDF_FIXBASE		(1<<24) /* fixed base */
+#define MDF_FIXLEN		(1<<25) /* fixed length */
+#define MDF_FIRMWARE		(1<<26) /* set by firmware (XXX not useful?) */
+#define MDF_ACTIVE		(1<<27) /* currently active */
+#define MDF_BOGUS		(1<<28) /* we don't like it */
+#define MDF_FIXACTIVE		(1<<29) /* can't be turned off */
+#define MDF_BUSY		(1<<30) /* range is in use */
 
 struct mem_range_desc {
-	u_int64_t mr_base;
-	u_int64_t mr_len;
-	int     mr_flags;
-	char    mr_owner[8];
+    u_int64_t mr_base;
+    u_int64_t mr_len;
+    int mr_flags;
+    char mr_owner[8];
 };
 
 struct mem_range_op {
-	struct mem_range_desc *mo_desc;
-	int     mo_arg[2];
+    struct mem_range_desc *mo_desc;
+    int mo_arg[2];
 #define MEMRANGE_SET_UPDATE	0
 #define MEMRANGE_SET_REMOVE	1
-	/* XXX want a flag that says "set and undo when I exit" */
+    /* XXX want a flag that says "set and undo when I exit" */
 };
+
 #define MEMRANGE_GET	_IOWR('m', 50, struct mem_range_op)
 #define MEMRANGE_SET	_IOW('m', 51, struct mem_range_op)
 
@@ -47,16 +48,18 @@ struct mem_range_op {
 
 struct mem_range_softc;
 struct mem_range_ops {
-	void    (*init) __P((struct mem_range_softc * sc));
-	int     (*set) __P((struct mem_range_softc * sc, struct mem_range_desc * mrd, int *arg));
-	void    (*initAP) __P((struct mem_range_softc * sc));
+    void (*init) __P((struct mem_range_softc * sc));
+    int (*set)
+        __P((struct mem_range_softc * sc, struct mem_range_desc * mrd,
+             int *arg));
+    void (*initAP) __P((struct mem_range_softc * sc));
 };
 
 struct mem_range_softc {
-	struct mem_range_ops *mr_op;
-	int     mr_cap;
-	int     mr_ndesc;
-	struct mem_range_desc *mr_desc;
+    struct mem_range_ops *mr_op;
+    int mr_cap;
+    int mr_ndesc;
+    struct mem_range_desc *mr_desc;
 };
 
 extern struct mem_range_softc mem_range_softc;
diff --git a/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c b/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c
index e5d832eed..417adbf4b 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c
@@ -53,94 +53,89 @@ void xf86DisableIO(void);
 void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
-	pVidMem->linearSupported = TRUE;
-	pVidMem->mapMem = ppcMapVidMem;
-	pVidMem->unmapMem = ppcUnmapVidMem;
-	pVidMem->initialised = TRUE;
-	xf86EnableIO();
+    pVidMem->linearSupported = TRUE;
+    pVidMem->mapMem = ppcMapVidMem;
+    pVidMem->unmapMem = ppcUnmapVidMem;
+    pVidMem->initialised = TRUE;
+    xf86EnableIO();
 }
 
-
 volatile unsigned char *ioBase = MAP_FAILED;
 
 static pointer
 ppcMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 {
-	int fd = xf86Info.consoleFd;
-	pointer base;
+    int fd = xf86Info.consoleFd;
+    pointer base;
+
 #ifdef DEBUG
-	xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", 
-		    Base, Size, fd);
+    xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", Base, Size, fd);
 #endif
 
-	base = mmap(0, Size,
-		    (flags & VIDMEM_READONLY) ?
-		     PROT_READ : (PROT_READ | PROT_WRITE),
-		    MAP_SHARED, fd, Base);
-	if (base == MAP_FAILED)
-		FatalError("%s: could not mmap screen [s=%x,a=%x] (%s)",
-			   "xf86MapVidMem", Size, Base, strerror(errno));
+    base = mmap(0, Size,
+                (flags & VIDMEM_READONLY) ?
+                PROT_READ : (PROT_READ | PROT_WRITE), MAP_SHARED, fd, Base);
+    if (base == MAP_FAILED)
+        FatalError("%s: could not mmap screen [s=%x,a=%x] (%s)",
+                   "xf86MapVidMem", Size, Base, strerror(errno));
 
-	return base;
+    return base;
 }
 
 static void
 ppcUnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 {
-	munmap(Base, Size);
+    munmap(Base, Size);
 }
 
 int
 xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
+             int Len)
 {
-	int rv;
-	static int kmem = -1;
+    int rv;
+    static int kmem = -1;
 
-	if (kmem == -1) {
-		kmem = open(DEV_MEM, 2);
-		if (kmem == -1) {
-			FatalError("xf86ReadBIOS: open %s", DEV_MEM);
-		}
-	}
+    if (kmem == -1) {
+        kmem = open(DEV_MEM, 2);
+        if (kmem == -1) {
+            FatalError("xf86ReadBIOS: open %s", DEV_MEM);
+        }
+    }
 
 #ifdef DEBUG
-	xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS() %lx %lx, %x\n", 
-		    Base, Offset, Len);
+    xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS() %lx %lx, %x\n", Base, Offset, Len);
 #endif
 
+    lseek(kmem, Base + Offset, 0);
+    rv = read(kmem, Buf, Len);
 
-	lseek(kmem, Base + Offset, 0);
-	rv = read(kmem, Buf, Len);
-
-	return rv;
+    return rv;
 }
 
-Bool xf86EnableIO()
+Bool
+xf86EnableIO()
 {
-        int fd = xf86Info.consoleFd;
-
-        xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
-        if (ioBase == MAP_FAILED)
-        {
-                ioBase=mmap(NULL, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, fd,
-                    0xf2000000);
-                xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
-                if (ioBase == MAP_FAILED) {
-                        xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
-			return FALSE;
-		}
+    int fd = xf86Info.consoleFd;
+
+    xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
+    if (ioBase == MAP_FAILED) {
+        ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
+                      0xf2000000);
+        xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
+        if (ioBase == MAP_FAILED) {
+            xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
+            return FALSE;
         }
-	return TRUE;
+    }
+    return TRUE;
 }
 
-void xf86DisableIO()
+void
+xf86DisableIO()
 {
 
-        if (ioBase != MAP_FAILED)
-        {
-                munmap(__UNVOLATILE(ioBase), 0x10000);
-                ioBase = MAP_FAILED;
-        }
+    if (ioBase != MAP_FAILED) {
+        munmap(__UNVOLATILE(ioBase), 0x10000);
+        ioBase = MAP_FAILED;
+    }
 }
-
diff --git a/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c b/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c
index 960c850a8..21c166105 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c
@@ -44,44 +44,42 @@ static void sparc64UnmapVidMem(int, pointer, unsigned long);
 void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
-	pVidMem->linearSupported = TRUE;
-	pVidMem->mapMem = sparc64MapVidMem;
-	pVidMem->unmapMem = sparc64UnmapVidMem;
-	pVidMem->initialised = TRUE;
+    pVidMem->linearSupported = TRUE;
+    pVidMem->mapMem = sparc64MapVidMem;
+    pVidMem->unmapMem = sparc64UnmapVidMem;
+    pVidMem->initialised = TRUE;
 }
 
 static pointer
-sparc64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, 
-		 int flags)
+sparc64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size,
+                 int flags)
 {
-	int fd = xf86Info.consoleFd;
-	pointer base;
+    int fd = xf86Info.consoleFd;
+    pointer base;
 
 #ifdef DEBUG
-	xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", 
-		    Base, Size, fd);
+    xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", Base, Size, fd);
 #endif
 
-	base = mmap(0, Size,
-		    (flags & VIDMEM_READONLY) ?
-		     PROT_READ : (PROT_READ | PROT_WRITE),
-		    MAP_SHARED, fd, Base);
-	if (base == MAP_FAILED)
-		FatalError("%s: could not mmap screen [s=%x,a=%x] (%s)",
-			   "xf86MapVidMem", Size, Base, strerror(errno));
-	return base;
+    base = mmap(0, Size,
+                (flags & VIDMEM_READONLY) ?
+                PROT_READ : (PROT_READ | PROT_WRITE), MAP_SHARED, fd, Base);
+    if (base == MAP_FAILED)
+        FatalError("%s: could not mmap screen [s=%x,a=%x] (%s)",
+                   "xf86MapVidMem", Size, Base, strerror(errno));
+    return base;
 }
 
 static void
 sparc64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 {
-	munmap(Base, Size);
+    munmap(Base, Size);
 }
 
 int
 xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
+             int Len)
 {
 
-	return 0;
+    return 0;
 }
diff --git a/xorg-server/hw/xfree86/os-support/bus/Sbus.c b/xorg-server/hw/xfree86/os-support/bus/Sbus.c
index c02d2cd55..b75308aa1 100644
--- a/xorg-server/hw/xfree86/os-support/bus/Sbus.c
+++ b/xorg-server/hw/xfree86/os-support/bus/Sbus.c
@@ -47,6 +47,7 @@ static int promFd = -1;
 static int promCurrentNode;
 static int promOpenCount = 0;
 static int promP1275 = -1;
+
 #define MAX_PROP	128
 #define MAX_VAL		(4096-128-4)
 static struct openpromio *promOpio;
@@ -54,21 +55,23 @@ static struct openpromio *promOpio;
 sbusDevicePtr *xf86SbusInfo = NULL;
 
 struct sbus_devtable sbusDeviceTable[] = {
-    { SBUS_DEVICE_BW2, FBTYPE_SUN2BW, "bwtwo", "sunbw2", "Sun Monochrome (bwtwo)" },
-    { SBUS_DEVICE_CG2, FBTYPE_SUN2COLOR, "cgtwo", NULL, "Sun Color2 (cgtwo)" },
-    { SBUS_DEVICE_CG3, FBTYPE_SUN3COLOR, "cgthree", "suncg3", "Sun Color3 (cgthree)" },
-    { SBUS_DEVICE_CG4, FBTYPE_SUN4COLOR, "cgfour", NULL, "Sun Color4 (cgfour)" },
-    { SBUS_DEVICE_CG6, FBTYPE_SUNFAST_COLOR, "cgsix", "suncg6", "Sun GX" },
-    { SBUS_DEVICE_CG8, FBTYPE_MEMCOLOR, "cgeight", NULL, "Sun CG8/RasterOps" },
-    { SBUS_DEVICE_CG12, FBTYPE_SUNGP3, "cgtwelve", NULL, "Sun GS (cgtwelve)" },
-    { SBUS_DEVICE_CG14, FBTYPE_MDICOLOR, "cgfourteen", "suncg14", "Sun SX" },
-    { SBUS_DEVICE_GT, FBTYPE_SUNGT, "gt", NULL, "Sun Graphics Tower" },
-    { SBUS_DEVICE_MGX, -1, "mgx", NULL, "Quantum 3D MGXplus" },
-    { SBUS_DEVICE_LEO, FBTYPE_SUNLEO, "leo", "sunleo", "Sun ZX or Turbo ZX" },
-    { SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX" },
-    { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB" },
-    { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D" },
-    { 0, 0, NULL }
+    {SBUS_DEVICE_BW2, FBTYPE_SUN2BW, "bwtwo", "sunbw2",
+     "Sun Monochrome (bwtwo)"},
+    {SBUS_DEVICE_CG2, FBTYPE_SUN2COLOR, "cgtwo", NULL, "Sun Color2 (cgtwo)"},
+    {SBUS_DEVICE_CG3, FBTYPE_SUN3COLOR, "cgthree", "suncg3",
+     "Sun Color3 (cgthree)"},
+    {SBUS_DEVICE_CG4, FBTYPE_SUN4COLOR, "cgfour", NULL, "Sun Color4 (cgfour)"},
+    {SBUS_DEVICE_CG6, FBTYPE_SUNFAST_COLOR, "cgsix", "suncg6", "Sun GX"},
+    {SBUS_DEVICE_CG8, FBTYPE_MEMCOLOR, "cgeight", NULL, "Sun CG8/RasterOps"},
+    {SBUS_DEVICE_CG12, FBTYPE_SUNGP3, "cgtwelve", NULL, "Sun GS (cgtwelve)"},
+    {SBUS_DEVICE_CG14, FBTYPE_MDICOLOR, "cgfourteen", "suncg14", "Sun SX"},
+    {SBUS_DEVICE_GT, FBTYPE_SUNGT, "gt", NULL, "Sun Graphics Tower"},
+    {SBUS_DEVICE_MGX, -1, "mgx", NULL, "Quantum 3D MGXplus"},
+    {SBUS_DEVICE_LEO, FBTYPE_SUNLEO, "leo", "sunleo", "Sun ZX or Turbo ZX"},
+    {SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX"},
+    {SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB"},
+    {SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D"},
+    {0, 0, NULL}
 };
 
 int
@@ -76,12 +79,13 @@ promGetSibling(int node)
 {
     promOpio->oprom_size = sizeof(int);
 
-    if (node == -1) return 0;
-    *(int *)promOpio->oprom_array = node;
+    if (node == -1)
+        return 0;
+    *(int *) promOpio->oprom_array = node;
     if (ioctl(promFd, OPROMNEXT, promOpio) < 0)
-	return 0;
-    promCurrentNode = *(int *)promOpio->oprom_array;
-    return *(int *)promOpio->oprom_array;
+        return 0;
+    promCurrentNode = *(int *) promOpio->oprom_array;
+    return *(int *) promOpio->oprom_array;
 }
 
 int
@@ -89,12 +93,13 @@ promGetChild(int node)
 {
     promOpio->oprom_size = sizeof(int);
 
-    if (!node || node == -1) return 0;
-    *(int *)promOpio->oprom_array = node;
+    if (!node || node == -1)
+        return 0;
+    *(int *) promOpio->oprom_array = node;
     if (ioctl(promFd, OPROMCHILD, promOpio) < 0)
-	return 0;
-    promCurrentNode = *(int *)promOpio->oprom_array;
-    return *(int *)promOpio->oprom_array;
+        return 0;
+    promCurrentNode = *(int *) promOpio->oprom_array;
+    return *(int *) promOpio->oprom_array;
 }
 
 char *
@@ -104,8 +109,9 @@ promGetProperty(const char *prop, int *lenp)
 
     strcpy(promOpio->oprom_array, prop);
     if (ioctl(promFd, OPROMGETPROP, promOpio) < 0)
-	return 0;
-    if (lenp) *lenp = promOpio->oprom_size;
+        return 0;
+    if (lenp)
+        *lenp = promOpio->oprom_size;
     return promOpio->oprom_array;
 }
 
@@ -114,15 +120,15 @@ promGetBool(const char *prop)
 {
     promOpio->oprom_size = 0;
 
-    *(int *)promOpio->oprom_array = 0;
+    *(int *) promOpio->oprom_array = 0;
     for (;;) {
-	promOpio->oprom_size = MAX_PROP;
-	if (ioctl(promFd, OPROMNXTPROP, promOpio) < 0)
-	    return 0;
-	if (!promOpio->oprom_size)
-	    return 0;
-	if (!strcmp(promOpio->oprom_array, prop))
-	    return 1;
+        promOpio->oprom_size = MAX_PROP;
+        if (ioctl(promFd, OPROMNXTPROP, promOpio) < 0)
+            return 0;
+        if (!promOpio->oprom_size)
+            return 0;
+        if (!strcmp(promOpio->oprom_array, prop))
+            return 1;
     }
 }
 
@@ -138,13 +144,13 @@ promSetNode(sbusPromNodePtr pnode)
     int node;
 
     if (!pnode->node || pnode->node == -1)
-	return -1;
+        return -1;
     if (pnode->cookie[0] & PROM_NODE_SIBLING)
-	node = promGetSibling(pnode->cookie[1]);
+        node = promGetSibling(pnode->cookie[1]);
     else
-	node = promGetChild(pnode->cookie[1]);
+        node = promGetChild(pnode->cookie[1]);
     if (pnode->node != node)
-	return -1;
+        return -1;
     return 0;
 }
 
@@ -156,23 +162,24 @@ promIsP1275(void)
     char buffer[1024];
 
     if (promP1275 != -1)
-	return;
+        return;
     promP1275 = 0;
-    f = fopen("/proc/cpuinfo","r");
-    if (!f) return;
+    f = fopen("/proc/cpuinfo", "r");
+    if (!f)
+        return;
     while (fgets(buffer, 1024, f) != NULL)
-	if (!strncmp (buffer, "type", 4) && strstr (buffer, "sun4u")) {
-	    promP1275 = 1;
-	    break;
-	}
+        if (!strncmp(buffer, "type", 4) && strstr(buffer, "sun4u")) {
+            promP1275 = 1;
+            break;
+        }
     fclose(f);
 #elif defined(sun)
     struct utsname buffer;
 
     if ((uname(&buffer) >= 0) && !strcmp(buffer.machine, "sun4u"))
-	promP1275 = TRUE;
+        promP1275 = TRUE;
     else
-	promP1275 = FALSE;
+        promP1275 = FALSE;
 #elif defined(__FreeBSD__)
     promP1275 = TRUE;
 #else
@@ -184,12 +191,12 @@ void
 sparcPromClose(void)
 {
     if (promOpenCount > 1) {
-	promOpenCount--;
-	return;
+        promOpenCount--;
+        return;
     }
     if (promFd != -1) {
-	close(promFd);
-	promFd = -1;
+        close(promFd);
+        promFd = -1;
     }
     free(promOpio);
     promOpio = NULL;
@@ -200,21 +207,21 @@ int
 sparcPromInit(void)
 {
     if (promOpenCount) {
-	promOpenCount++;
-	return 0;
+        promOpenCount++;
+        return 0;
     }
     promFd = open("/dev/openprom", O_RDONLY, 0);
     if (promFd == -1)
-	return -1;
-    promOpio = (struct openpromio *)malloc(4096);
+        return -1;
+    promOpio = (struct openpromio *) malloc(4096);
     if (!promOpio) {
-	sparcPromClose();
-	return -1;
+        sparcPromClose();
+        return -1;
     }
     promRootNode = promGetSibling(0);
     if (!promRootNode) {
-	sparcPromClose();
-	return -1;
+        sparcPromClose();
+        return -1;
     }
     promIsP1275();
     promOpenCount++;
@@ -226,7 +233,7 @@ char *
 sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp)
 {
     if (promSetNode(pnode))
-	return NULL;
+        return NULL;
     return promGetProperty(prop, lenp);
 }
 
@@ -234,7 +241,7 @@ int
 sparcPromGetBool(sbusPromNodePtr pnode, const char *prop)
 {
     if (promSetNode(pnode))
-	return 0;
+        return 0;
     return promGetBool(prop);
 }
 
@@ -247,35 +254,37 @@ promWalkGetDriverName(int node, int oldnode)
     int devId, i;
 
     prop = promGetProperty("device_type", &len);
-    if (prop && (len > 0)) do {
-	if (!strcmp(prop, "display")) {
-	    prop = promGetProperty("name", &len);
-	    if (!prop || len <= 0)
-		break;
-	    while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',')
-		prop++;
-	    for (i = 0; sbusDeviceTable[i].devId; i++)
-		if (!strcmp(prop, sbusDeviceTable[i].promName))
-		    break;
-	    devId = sbusDeviceTable[i].devId;
-	    if (!devId)
-		break;
-	    if (sbusDeviceTable[i].driverName)
-	    	return sbusDeviceTable[i].driverName;
-	}
-    } while (0);
+    if (prop && (len > 0))
+        do {
+            if (!strcmp(prop, "display")) {
+                prop = promGetProperty("name", &len);
+                if (!prop || len <= 0)
+                    break;
+                while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',')
+                    prop++;
+                for (i = 0; sbusDeviceTable[i].devId; i++)
+                    if (!strcmp(prop, sbusDeviceTable[i].promName))
+                        break;
+                devId = sbusDeviceTable[i].devId;
+                if (!devId)
+                    break;
+                if (sbusDeviceTable[i].driverName)
+                    return sbusDeviceTable[i].driverName;
+            }
+        } while (0);
 
     nextnode = promGetChild(node);
     if (nextnode) {
-	char *name;
-	name = promWalkGetDriverName(nextnode, node);
-	if (name)
-	    return name;
+        char *name;
+
+        name = promWalkGetDriverName(nextnode, node);
+        if (name)
+            return name;
     }
 
     nextnode = promGetSibling(node);
     if (nextnode)
-	return promWalkGetDriverName(nextnode, node);
+        return promWalkGetDriverName(nextnode, node);
     return NULL;
 }
 
@@ -285,7 +294,7 @@ sparcDriverName(void)
     char *name;
 
     if (sparcPromInit() < 0)
-	    return NULL;
+        return NULL;
     promGetSibling(0);
     name = promWalkGetDriverName(promRootNode, 0);
     sparcPromClose();
@@ -293,7 +302,8 @@ sparcDriverName(void)
 }
 
 static void
-promWalkAssignNodes(int node, int oldnode, int flags, sbusDevicePtr *devicePtrs)
+promWalkAssignNodes(int node, int oldnode, int flags,
+                    sbusDevicePtr * devicePtrs)
 {
     int nextnode;
     int len, sbus = flags & PROM_NODE_SBUS;
@@ -302,67 +312,72 @@ promWalkAssignNodes(int node, int oldnode, int flags, sbusDevicePtr *devicePtrs)
     sbusPromNode pNode, pNode2;
 
     prop = promGetProperty("device_type", &len);
-    if (prop && (len > 0)) do {
-	if (!strcmp(prop, "display")) {
-	    prop = promGetProperty("name", &len);
-	    if (!prop || len <= 0)
-		break;
-	    while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',')
-		prop++;
-	    for (i = 0; sbusDeviceTable[i].devId; i++)
-		if (!strcmp(prop, sbusDeviceTable[i].promName))
-		    break;
-	    devId = sbusDeviceTable[i].devId;
-	    if (!devId)
-		break;
-	    if (!sbus) {
-		if (devId == SBUS_DEVICE_FFB) {
-		    /*
-		     * All /SUNW,ffb outside of SBUS tree come before all
-		     * /SUNW,afb outside of SBUS tree in Linux.
-		     */
-		    if (!strcmp(prop, "afb"))
-			flags |= PROM_NODE_PREF;
-		} else if (devId != SBUS_DEVICE_CG14)
-		    break;
-	    }
-	    for (i = 0; i < 32; i++) {
-		if (!devicePtrs[i] || devicePtrs[i]->devId != devId)
-		    continue;
-		if (devicePtrs[i]->node.node) {
-		    if ((devicePtrs[i]->node.cookie[0] & ~PROM_NODE_SIBLING) <=
-			(flags & ~PROM_NODE_SIBLING))
-			continue;
-		    for (j = i + 1, pNode = devicePtrs[i]->node; j < 32; j++) {
-			if (!devicePtrs[j] || devicePtrs[j]->devId != devId)
-			    continue;
-			pNode2 = devicePtrs[j]->node;
-			devicePtrs[j]->node = pNode;
-			pNode = pNode2;
-		    }
-		}
-		devicePtrs[i]->node.node = node;
-		devicePtrs[i]->node.cookie[0] = flags;
-		devicePtrs[i]->node.cookie[1] = oldnode;
-		break;
-	    }
-	    break;
-	}
-    } while (0);
+    if (prop && (len > 0))
+        do {
+            if (!strcmp(prop, "display")) {
+                prop = promGetProperty("name", &len);
+                if (!prop || len <= 0)
+                    break;
+                while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',')
+                    prop++;
+                for (i = 0; sbusDeviceTable[i].devId; i++)
+                    if (!strcmp(prop, sbusDeviceTable[i].promName))
+                        break;
+                devId = sbusDeviceTable[i].devId;
+                if (!devId)
+                    break;
+                if (!sbus) {
+                    if (devId == SBUS_DEVICE_FFB) {
+                        /*
+                         * All /SUNW,ffb outside of SBUS tree come before all
+                         * /SUNW,afb outside of SBUS tree in Linux.
+                         */
+                        if (!strcmp(prop, "afb"))
+                            flags |= PROM_NODE_PREF;
+                    }
+                    else if (devId != SBUS_DEVICE_CG14)
+                        break;
+                }
+                for (i = 0; i < 32; i++) {
+                    if (!devicePtrs[i] || devicePtrs[i]->devId != devId)
+                        continue;
+                    if (devicePtrs[i]->node.node) {
+                        if ((devicePtrs[i]->node.
+                             cookie[0] & ~PROM_NODE_SIBLING) <=
+                            (flags & ~PROM_NODE_SIBLING))
+                            continue;
+                        for (j = i + 1, pNode = devicePtrs[i]->node; j < 32;
+                             j++) {
+                            if (!devicePtrs[j] || devicePtrs[j]->devId != devId)
+                                continue;
+                            pNode2 = devicePtrs[j]->node;
+                            devicePtrs[j]->node = pNode;
+                            pNode = pNode2;
+                        }
+                    }
+                    devicePtrs[i]->node.node = node;
+                    devicePtrs[i]->node.cookie[0] = flags;
+                    devicePtrs[i]->node.cookie[1] = oldnode;
+                    break;
+                }
+                break;
+            }
+        } while (0);
 
     prop = promGetProperty("name", &len);
     if (prop && len > 0) {
-	if (!strcmp(prop, "sbus") || !strcmp(prop, "sbi"))
-	    sbus = PROM_NODE_SBUS;
+        if (!strcmp(prop, "sbus") || !strcmp(prop, "sbi"))
+            sbus = PROM_NODE_SBUS;
     }
 
     nextnode = promGetChild(node);
     if (nextnode)
-	promWalkAssignNodes(nextnode, node, sbus, devicePtrs);
+        promWalkAssignNodes(nextnode, node, sbus, devicePtrs);
 
     nextnode = promGetSibling(node);
     if (nextnode)
-	promWalkAssignNodes(nextnode, node, PROM_NODE_SIBLING | sbus, devicePtrs);
+        promWalkAssignNodes(nextnode, node, PROM_NODE_SIBLING | sbus,
+                            devicePtrs);
 }
 
 void
@@ -375,63 +390,66 @@ sparcPromAssignNodes(void)
 
     memset(devicePtrs, 0, sizeof(devicePtrs));
     for (psdpp = xf86SbusInfo, n = 0; (psdp = *psdpp); psdpp++, n++) {
-	if (psdp->fbNum != n)
-	    holes = 1;
-	devicePtrs[psdp->fbNum] = psdp;
+        if (psdp->fbNum != n)
+            holes = 1;
+        devicePtrs[psdp->fbNum] = psdp;
     }
     if (holes && (f = fopen("/proc/fb", "r")) != NULL) {
-	/* We could not open one of fb devices, check /proc/fb to see what
-	 * were the types of the cards missed. */
-	char buffer[64];
-	int fbNum, devId;
-	static struct {
-	    int devId;
-	    char *prefix;
-	} procFbPrefixes[] = {
-	    { SBUS_DEVICE_BW2, "BWtwo" },
-	    { SBUS_DEVICE_CG14, "CGfourteen" },
-	    { SBUS_DEVICE_CG6, "CGsix" },
-	    { SBUS_DEVICE_CG3, "CGthree" },
-	    { SBUS_DEVICE_FFB, "Creator" },
-	    { SBUS_DEVICE_FFB, "Elite 3D" },
-	    { SBUS_DEVICE_LEO, "Leo" },
-	    { SBUS_DEVICE_TCX, "TCX" },
-	    { 0, NULL },
-	};
-
-	while (fscanf(f, "%d %63s\n", &fbNum, buffer) == 2) {
-	    for (i = 0; procFbPrefixes[i].devId; i++)
-		if (! strncmp(procFbPrefixes[i].prefix, buffer,
-		      strlen(procFbPrefixes[i].prefix)))
-		    break;
-	    devId = procFbPrefixes[i].devId;
-	    if (! devId) continue;
-	    if (devicePtrs[fbNum]) {
-		if (devicePtrs[fbNum]->devId != devId)
-		    xf86ErrorF("Inconsistent /proc/fb with FBIOGATTR\n");
-	    } else if (!devicePtrs[fbNum]) {
-		devicePtrs[fbNum] = psdp = xnfcalloc(sizeof (sbusDevice), 1);
-		psdp->devId = devId;
-		psdp->fbNum = fbNum;
-		psdp->fd = -2;
-	    }
-	}
-	fclose(f);
+        /* We could not open one of fb devices, check /proc/fb to see what
+         * were the types of the cards missed. */
+        char buffer[64];
+        int fbNum, devId;
+        static struct {
+            int devId;
+            char *prefix;
+        } procFbPrefixes[] = {
+            {
+            SBUS_DEVICE_BW2, "BWtwo"}, {
+            SBUS_DEVICE_CG14, "CGfourteen"}, {
+            SBUS_DEVICE_CG6, "CGsix"}, {
+            SBUS_DEVICE_CG3, "CGthree"}, {
+            SBUS_DEVICE_FFB, "Creator"}, {
+            SBUS_DEVICE_FFB, "Elite 3D"}, {
+            SBUS_DEVICE_LEO, "Leo"}, {
+            SBUS_DEVICE_TCX, "TCX"}, {
+        0, NULL},};
+
+        while (fscanf(f, "%d %63s\n", &fbNum, buffer) == 2) {
+            for (i = 0; procFbPrefixes[i].devId; i++)
+                if (!strncmp(procFbPrefixes[i].prefix, buffer,
+                             strlen(procFbPrefixes[i].prefix)))
+                    break;
+            devId = procFbPrefixes[i].devId;
+            if (!devId)
+                continue;
+            if (devicePtrs[fbNum]) {
+                if (devicePtrs[fbNum]->devId != devId)
+                    xf86ErrorF("Inconsistent /proc/fb with FBIOGATTR\n");
+            }
+            else if (!devicePtrs[fbNum]) {
+                devicePtrs[fbNum] = psdp = xnfcalloc(sizeof(sbusDevice), 1);
+                psdp->devId = devId;
+                psdp->fbNum = fbNum;
+                psdp->fd = -2;
+            }
+        }
+        fclose(f);
     }
     promGetSibling(0);
     promWalkAssignNodes(promRootNode, 0, PROM_NODE_PREF, devicePtrs);
     for (i = 0, j = 0; i < 32; i++)
-	if (devicePtrs[i] && devicePtrs[i]->fbNum == -1)
-	    j++;
+        if (devicePtrs[i] && devicePtrs[i]->fbNum == -1)
+            j++;
     xf86SbusInfo = xnfrealloc(xf86SbusInfo, sizeof(psdp) * (n + j + 1));
     for (i = 0, psdpp = xf86SbusInfo; i < 32; i++)
-	if (devicePtrs[i]) {
-	    if (devicePtrs[i]->fbNum == -1) {
-		memmove(psdpp + 1, psdpp, sizeof(psdpp) * (n + 1));
-		*psdpp = devicePtrs[i];
-	    } else
-		n--;
-	}
+        if (devicePtrs[i]) {
+            if (devicePtrs[i]->fbNum == -1) {
+                memmove(psdpp + 1, psdpp, sizeof(psdpp) * (n + 1));
+                *psdpp = devicePtrs[i];
+            }
+            else
+                n--;
+        }
 }
 
 static char *
@@ -444,37 +462,43 @@ promGetReg(int type)
     regstr[0] = 0;
     prop = promGetProperty("reg", &len);
     if (prop && len >= 4) {
-	unsigned int *reg = (unsigned int *)prop;
-	if (!promP1275 || (type == PROM_NODE_SBUS) || (type == PROM_NODE_EBUS))
-	    snprintf (regstr, sizeof(regstr), "@%x,%x", reg[0], reg[1]);
-	else if (type == PROM_NODE_PCI) {
-	    if ((reg[0] >> 8) & 7)
-		snprintf (regstr, sizeof(regstr), "@%x,%x", (reg[0] >> 11) & 0x1f, (reg[0] >> 8) & 7);
-	    else
-		snprintf (regstr, sizeof(regstr), "@%x", (reg[0] >> 11) & 0x1f);
-	} else if (len == 4)
-	    snprintf (regstr, sizeof(regstr), "@%x", reg[0]);
-	else {
-	    unsigned int regs[2];
-
-	    /* Things get more complicated on UPA. If upa-portid exists,
-	       then address is @upa-portid,second-int-in-reg, otherwise
-	       it is @first-int-in-reg/16,second-int-in-reg (well, probably
-	       upa-portid always exists, but just to be safe). */
-	    memcpy (regs, reg, sizeof(regs));
-	    prop = promGetProperty("upa-portid", &len);
-	    if (prop && len == 4) {
-		reg = (unsigned int *)prop;
-		snprintf (regstr, sizeof(regstr), "@%x,%x", reg[0], regs[1]);
-	    } else
-		snprintf (regstr, sizeof(regstr), "@%x,%x", regs[0] >> 4, regs[1]);
-	}
+        unsigned int *reg = (unsigned int *) prop;
+
+        if (!promP1275 || (type == PROM_NODE_SBUS) || (type == PROM_NODE_EBUS))
+            snprintf(regstr, sizeof(regstr), "@%x,%x", reg[0], reg[1]);
+        else if (type == PROM_NODE_PCI) {
+            if ((reg[0] >> 8) & 7)
+                snprintf(regstr, sizeof(regstr), "@%x,%x",
+                         (reg[0] >> 11) & 0x1f, (reg[0] >> 8) & 7);
+            else
+                snprintf(regstr, sizeof(regstr), "@%x", (reg[0] >> 11) & 0x1f);
+        }
+        else if (len == 4)
+            snprintf(regstr, sizeof(regstr), "@%x", reg[0]);
+        else {
+            unsigned int regs[2];
+
+            /* Things get more complicated on UPA. If upa-portid exists,
+               then address is @upa-portid,second-int-in-reg, otherwise
+               it is @first-int-in-reg/16,second-int-in-reg (well, probably
+               upa-portid always exists, but just to be safe). */
+            memcpy(regs, reg, sizeof(regs));
+            prop = promGetProperty("upa-portid", &len);
+            if (prop && len == 4) {
+                reg = (unsigned int *) prop;
+                snprintf(regstr, sizeof(regstr), "@%x,%x", reg[0], regs[1]);
+            }
+            else
+                snprintf(regstr, sizeof(regstr), "@%x,%x", regs[0] >> 4,
+                         regs[1]);
+        }
     }
     return regstr;
 }
 
 static int
-promWalkNode2Pathname(char *path, int parent, int node, int searchNode, int type)
+promWalkNode2Pathname(char *path, int parent, int node, int searchNode,
+                      int type)
 {
     int nextnode;
     int len, ntype = type;
@@ -483,27 +507,28 @@ promWalkNode2Pathname(char *path, int parent, int node, int searchNode, int type
     prop = promGetProperty("name", &len);
     *path = '/';
     if (!prop || len <= 0)
-	return 0;
+        return 0;
     if ((!strcmp(prop, "sbus") || !strcmp(prop, "sbi")) && !type)
-	ntype = PROM_NODE_SBUS;
+        ntype = PROM_NODE_SBUS;
     else if (!strcmp(prop, "ebus") && type == PROM_NODE_PCI)
-	ntype = PROM_NODE_EBUS;
+        ntype = PROM_NODE_EBUS;
     else if (!strcmp(prop, "pci") && !type)
-	ntype = PROM_NODE_PCI;
-    strcpy (path + 1, prop);
+        ntype = PROM_NODE_PCI;
+    strcpy(path + 1, prop);
     p = promGetReg(type);
     if (*p)
-	strcat (path, p);
+        strcat(path, p);
     if (node == searchNode)
-	return 1;
+        return 1;
     nextnode = promGetChild(node);
     if (nextnode &&
-	promWalkNode2Pathname(strchr(path, 0), node, nextnode, searchNode, ntype))
-	return 1;
+        promWalkNode2Pathname(strchr(path, 0), node, nextnode, searchNode,
+                              ntype))
+        return 1;
     nextnode = promGetSibling(node);
     if (nextnode &&
-	promWalkNode2Pathname(path, parent, nextnode, searchNode, type))
-	return 1;
+        promWalkNode2Pathname(path, parent, nextnode, searchNode, type))
+        return 1;
     return 0;
 }
 
@@ -512,11 +537,14 @@ sparcPromNode2Pathname(sbusPromNodePtr pnode)
 {
     char *ret;
 
-    if (!pnode->node) return NULL;
+    if (!pnode->node)
+        return NULL;
     ret = malloc(4096);
-    if (!ret) return NULL;
-    if (promWalkNode2Pathname(ret, promRootNode, promGetChild(promRootNode), pnode->node, 0))
-	return ret;
+    if (!ret)
+        return NULL;
+    if (promWalkNode2Pathname
+        (ret, promRootNode, promGetChild(promRootNode), pnode->node, 0))
+        return ret;
     free(ret);
     return NULL;
 }
@@ -528,51 +556,52 @@ promWalkPathname2Node(char *name, char *regstr, int parent, int type)
     char *prop, *p;
 
     for (;;) {
-	prop = promGetProperty("name", &len);
-	if (!prop || len <= 0)
-	    return 0;
-	if ((!strcmp(prop, "sbus") || !strcmp(prop, "sbi")) && !type)
-	    type = PROM_NODE_SBUS;
-	else if (!strcmp(prop, "ebus") && type == PROM_NODE_PCI)
-	    type = PROM_NODE_EBUS;
-	else if (!strcmp(prop, "pci") && !type)
-	    type = PROM_NODE_PCI;
-	for (node = promGetChild(parent); node; node = promGetSibling(node)) {
-	    prop = promGetProperty("name", &len);
-	    if (!prop || len <= 0)
-		continue;
-	    if (*name && strcmp(name, prop))
-		continue;
-	    if (*regstr) {
-		p = promGetReg(type);
-		if (! *p || strcmp(p + 1, regstr))
-		    continue;
-	    }
-	    break;
-	}
-	if (!node) {
-	    for (node = promGetChild(parent); node; node = promGetSibling(node)) {
-		ret = promWalkPathname2Node(name, regstr, node, type);
-		if (ret) return ret;
-	    }
-	    return 0;
-	}
-	name = strchr(regstr, 0) + 1;
-	if (! *name)
-	    return node;
-	p = strchr(name, '/');
-	if (p)
-	    *p = 0;
-	else
-	    p = strchr(name, 0);
-	regstr = strchr(name, '@');
-	if (regstr)
-	    *regstr++ = 0;
-	else
-	    regstr = p;
-	if (name == regstr)
-	    return 0;
-	parent = node;
+        prop = promGetProperty("name", &len);
+        if (!prop || len <= 0)
+            return 0;
+        if ((!strcmp(prop, "sbus") || !strcmp(prop, "sbi")) && !type)
+            type = PROM_NODE_SBUS;
+        else if (!strcmp(prop, "ebus") && type == PROM_NODE_PCI)
+            type = PROM_NODE_EBUS;
+        else if (!strcmp(prop, "pci") && !type)
+            type = PROM_NODE_PCI;
+        for (node = promGetChild(parent); node; node = promGetSibling(node)) {
+            prop = promGetProperty("name", &len);
+            if (!prop || len <= 0)
+                continue;
+            if (*name && strcmp(name, prop))
+                continue;
+            if (*regstr) {
+                p = promGetReg(type);
+                if (!*p || strcmp(p + 1, regstr))
+                    continue;
+            }
+            break;
+        }
+        if (!node) {
+            for (node = promGetChild(parent); node; node = promGetSibling(node)) {
+                ret = promWalkPathname2Node(name, regstr, node, type);
+                if (ret)
+                    return ret;
+            }
+            return 0;
+        }
+        name = strchr(regstr, 0) + 1;
+        if (!*name)
+            return node;
+        p = strchr(name, '/');
+        if (p)
+            *p = 0;
+        else
+            p = strchr(name, 0);
+        regstr = strchr(name, '@');
+        if (regstr)
+            *regstr++ = 0;
+        else
+            regstr = p;
+        if (name == regstr)
+            return 0;
+        parent = node;
     }
 }
 
@@ -584,23 +613,24 @@ sparcPromPathname2Node(const char *pathName)
 
     i = strlen(pathName);
     name = malloc(i + 2);
-    if (! name) return 0;
-    strcpy (name, pathName);
-    name [i + 1] = 0;
+    if (!name)
+        return 0;
+    strcpy(name, pathName);
+    name[i + 1] = 0;
     if (name[0] != '/')
-	return 0;
+        return 0;
     p = strchr(name + 1, '/');
     if (p)
-	*p = 0;
+        *p = 0;
     else
-	p = strchr(name, 0);
+        p = strchr(name, 0);
     regstr = strchr(name, '@');
     if (regstr)
-	*regstr++ = 0;
+        *regstr++ = 0;
     else
-	regstr = p;
+        regstr = p;
     if (name + 1 == regstr)
-	return 0;
+        return 0;
     promGetSibling(0);
     i = promWalkPathname2Node(name + 1, regstr, promRootNode, 0);
     free(name);
@@ -616,32 +646,33 @@ xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
     unsigned long len = ((offset + size + pagemask) & ~pagemask) - off;
 
     if (psdp->fd == -1) {
-	psdp->fd = open(psdp->device, O_RDWR);
-	if (psdp->fd == -1)
-	    return NULL;
-    } else if (psdp->fd < 0)
-	return NULL;
-
-    ret = (pointer) mmap (NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE,
-			  psdp->fd, off);
+        psdp->fd = open(psdp->device, O_RDWR);
+        if (psdp->fd == -1)
+            return NULL;
+    }
+    else if (psdp->fd < 0)
+        return NULL;
+
+    ret = (pointer) mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE,
+                         psdp->fd, off);
     if (ret == (pointer) -1) {
-	ret = (pointer) mmap (NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED,
-			      psdp->fd, off);
+        ret = (pointer) mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED,
+                             psdp->fd, off);
     }
     if (ret == (pointer) -1)
-	return NULL;
+        return NULL;
 
-    return (char *)ret + (offset - off);
+    return (char *) ret + (offset - off);
 }
 
 void
 xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size)
 {
     unsigned long mask = getpagesize() - 1;
-    unsigned long base = (unsigned long)addr & ~mask;
-    unsigned long len = (((unsigned long)addr + size + mask) & ~mask) - base;
+    unsigned long base = (unsigned long) addr & ~mask;
+    unsigned long len = (((unsigned long) addr + size + mask) & ~mask) - base;
 
-    munmap ((pointer)base, len);
+    munmap((pointer) base, len);
 }
 
 /* Tell OS that we are driving the HW cursor ourselves. */
@@ -657,8 +688,8 @@ xf86SbusHideOsHwCursor(sbusDevicePtr psdp)
     fbcursor.cmap.red = zeros;
     fbcursor.cmap.green = zeros;
     fbcursor.cmap.blue = zeros;
-    fbcursor.image = (char *)zeros;
-    fbcursor.mask = (char *)zeros;
+    fbcursor.image = (char *) zeros;
+    fbcursor.mask = (char *) zeros;
     fbcursor.size.x = 32;
     fbcursor.size.y = 1;
     fbcursor.set = FB_CUR_SETALL;
diff --git a/xorg-server/hw/xfree86/os-support/bus/nobus.c b/xorg-server/hw/xfree86/os-support/bus/nobus.c
index ad23f5288..dca58fee2 100644
--- a/xorg-server/hw/xfree86/os-support/bus/nobus.c
+++ b/xorg-server/hw/xfree86/os-support/bus/nobus.c
@@ -1 +1,5 @@
-static void __noop_to_appease_ar__() { return; }
+static void
+__noop_to_appease_ar__()
+{
+    return;
+}
diff --git a/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h b/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h
index 74ead201e..f69e55b39 100644
--- a/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h
@@ -95,7 +95,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /*
  * This file contains just the public interface to the PCI code.
  * Drivers should use this file rather than Pci.h.
@@ -234,8 +233,8 @@
  */
 
 /* Primitive Types */
-typedef unsigned long ADDRESS;		/* Memory/PCI address */
-typedef unsigned long IOADDRESS _X_DEPRECATED;	/* Must be large enough for a pointer */
+typedef unsigned long ADDRESS;  /* Memory/PCI address */
+typedef unsigned long IOADDRESS _X_DEPRECATED;  /* Must be large enough for a pointer */
 typedef CARD32 PCITAG _X_DEPRECATED;
 
 typedef enum {
@@ -249,12 +248,12 @@ typedef enum {
     PCI_IO_SPARSE_MASK
 } PciAddrType;
 
-
 /* Public PCI access functions */
 extern _X_EXPORT Bool xf86scanpci(void);
 
 /* Domain access functions.  Some of these probably shouldn't be public */
 extern _X_EXPORT struct pci_io_handle *xf86MapLegacyIO(struct pci_device *dev);
-extern _X_EXPORT void xf86UnmapLegacyIO(struct pci_device *, struct pci_io_handle *);
+extern _X_EXPORT void xf86UnmapLegacyIO(struct pci_device *,
+                                        struct pci_io_handle *);
 
-#endif /* _XF86PCI_H */
+#endif                          /* _XF86PCI_H */
diff --git a/xorg-server/hw/xfree86/os-support/hurd/hurd_init.c b/xorg-server/hw/xfree86/os-support/hurd/hurd_init.c
index 94e261553..185b2b951 100644
--- a/xorg-server/hw/xfree86/os-support/hurd/hurd_init.c
+++ b/xorg-server/hw/xfree86/os-support/hurd/hurd_init.c
@@ -44,39 +44,38 @@
 #include <mach.h>
 
 int
-xf86ProcessArgument( int argc,char **argv, int i )
+xf86ProcessArgument(int argc, char **argv, int i)
 {
     return 0;
 }
+
 void
 xf86UseMsg()
 {
     return;
 }
 
-
 void
 xf86OpenConsole()
 {
-    if( serverGeneration == 1 )
-    {
-	kern_return_t err;
-	mach_port_t device;
-	int fd;
-	err = get_privileged_ports( NULL, &device );
-	if( err )
-	{
-	    errno = err;
-	    FatalError( "xf86KbdInit can't get_privileged_ports. (%s)\n" , strerror(errno) );
-	}
-	mach_port_deallocate (mach_task_self (), device);
-	
-	if( ( fd = open( "/dev/kbd" , O_RDONLY|O_NONBLOCK ) ) < 0 )
-	{
-	    fprintf( stderr , "Cannot open keyboard (%s)\n",strerror(errno) );
-	    exit(1);
-	}
-	xf86Info.consoleFd = fd;
+    if (serverGeneration == 1) {
+        kern_return_t err;
+        mach_port_t device;
+        int fd;
+
+        err = get_privileged_ports(NULL, &device);
+        if (err) {
+            errno = err;
+            FatalError("xf86KbdInit can't get_privileged_ports. (%s)\n",
+                       strerror(errno));
+        }
+        mach_port_deallocate(mach_task_self(), device);
+
+        if ((fd = open("/dev/kbd", O_RDONLY | O_NONBLOCK)) < 0) {
+            fprintf(stderr, "Cannot open keyboard (%s)\n", strerror(errno));
+            exit(1);
+        }
+        xf86Info.consoleFd = fd;
     }
     return;
 }
@@ -84,6 +83,6 @@ xf86OpenConsole()
 void
 xf86CloseConsole()
 {
-    close( xf86Info.consoleFd );
+    close(xf86Info.consoleFd);
     return;
 }
diff --git a/xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c b/xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c
index 9d9b84a28..6ac9efdfe 100644
--- a/xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c
+++ b/xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c
@@ -1,95 +1,93 @@
-/*

- * Copyright 1997 by UCHIYAMA Yasushi

- *

- * 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 UCHIYAMA Yasushi not be used in

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

- * specific, written prior permission.  UCHIYAMA Yasushi makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL UCHIYAMA YASUSHI 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_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include<mach.h>

-#include<device/device.h>

-#include<mach/machine/mach_i386.h>

-

-#include <X11/X.h>

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-

-#define BIOS_SIZE 0x20000

-

-int 

-xf86ReadBIOS(unsigned long Base,unsigned long Offset,unsigned char *Buf,int Len)

-{

-    mach_port_t device,mem_dev;

-    memory_object_t mem_obj;

-    vm_address_t addr = (vm_address_t)0; /* serach starting address */

-    kern_return_t err;

-

-

-    err = get_privileged_ports (NULL, &device);

-    if( err )

-    {

-	errno = err;

-	FatalError("xf86ReadBIOS() can't get_privileged_ports. (%s)\n",strerror(errno));

-    }

-    err = device_open(device,D_READ|D_WRITE,"mem",&mem_dev);

-    mach_port_deallocate (mach_task_self (), device);

-    if( err )

-    {

-	errno = err;

-	FatalError("xf86ReadBIOS() can't device_open. (%s)\n",strerror(errno));

-    }

-    err = device_map(mem_dev,VM_PROT_READ|VM_PROT_WRITE, Base , BIOS_SIZE ,&mem_obj,0);

-    if( err )

-    {

-	errno = err;

-	FatalError("xf86ReadBIOS() can't device_map. (%s)\n",strerror(errno));

-    }

-    err = vm_map(mach_task_self(),

-		 &addr,

-		 BIOS_SIZE,

-		 0,

-		 TRUE,

-		 mem_obj,

-		 Base,

-		 FALSE,

-		 VM_PROT_READ|VM_PROT_WRITE,

-		 VM_PROT_READ|VM_PROT_WRITE,

-		 VM_INHERIT_SHARE);

-    mach_port_deallocate(mach_task_self(),mem_obj);

-    if( err )

-    {

-	errno = err;

-	FatalError("xf86ReadBIOS() can't vm_map. (%s)\n",strerror(errno));

-    }

-

-    memcpy(Buf,(void*)((int)addr + Offset), Len);

-    

-    err = vm_deallocate(mach_task_self(), addr, BIOS_SIZE);

-    if( err )

-    {

-	errno = err;

-	FatalError("xf86ReadBIOS() can't vm_deallocate. (%s)\n",strerror(errno));

-    }

-    

-    return Len;

-}

+/*
+ * Copyright 1997 by UCHIYAMA Yasushi
+ *
+ * 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 UCHIYAMA Yasushi not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  UCHIYAMA Yasushi makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL UCHIYAMA YASUSHI 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_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include<mach.h>
+#include<device/device.h>
+#include<mach/machine/mach_i386.h>
+
+#include <X11/X.h>
+
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+
+#define BIOS_SIZE 0x20000
+
+int
+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
+             int Len)
+{
+    mach_port_t device, mem_dev;
+    memory_object_t mem_obj;
+    vm_address_t addr = (vm_address_t) 0;       /* serach starting address */
+    kern_return_t err;
+
+    err = get_privileged_ports(NULL, &device);
+    if (err) {
+        errno = err;
+        FatalError("xf86ReadBIOS() can't get_privileged_ports. (%s)\n",
+                   strerror(errno));
+    }
+    err = device_open(device, D_READ | D_WRITE, "mem", &mem_dev);
+    mach_port_deallocate(mach_task_self(), device);
+    if (err) {
+        errno = err;
+        FatalError("xf86ReadBIOS() can't device_open. (%s)\n", strerror(errno));
+    }
+    err =
+        device_map(mem_dev, VM_PROT_READ | VM_PROT_WRITE, Base, BIOS_SIZE,
+                   &mem_obj, 0);
+    if (err) {
+        errno = err;
+        FatalError("xf86ReadBIOS() can't device_map. (%s)\n", strerror(errno));
+    }
+    err = vm_map(mach_task_self(),
+                 &addr,
+                 BIOS_SIZE,
+                 0,
+                 TRUE,
+                 mem_obj,
+                 Base,
+                 FALSE,
+                 VM_PROT_READ | VM_PROT_WRITE,
+                 VM_PROT_READ | VM_PROT_WRITE, VM_INHERIT_SHARE);
+    mach_port_deallocate(mach_task_self(), mem_obj);
+    if (err) {
+        errno = err;
+        FatalError("xf86ReadBIOS() can't vm_map. (%s)\n", strerror(errno));
+    }
+
+    memcpy(Buf, (void *) ((int) addr + Offset), Len);
+
+    err = vm_deallocate(mach_task_self(), addr, BIOS_SIZE);
+    if (err) {
+        errno = err;
+        FatalError("xf86ReadBIOS() can't vm_deallocate. (%s)\n",
+                   strerror(errno));
+    }
+
+    return Len;
+}
diff --git a/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c b/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c
index a0a3b2758..72474ba10 100644
--- a/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c
@@ -1,155 +1,152 @@
-/*

- * Copyright 1997, 1998 by UCHIYAMA Yasushi

- *

- * 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 UCHIYAMA Yasushi not be used in

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

- * specific, written prior permission.  UCHIYAMA Yasushi makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL UCHIYAMA YASUSHI 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_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <mach.h>

-#include <device/device.h>

-#include <mach/machine/mach_i386.h>

-

-#include <X11/X.h>

-#include "input.h"

-#include "scrnintstr.h"

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-#include "xf86OSpriv.h"

-

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

- * Video Memory Mapping section                                            

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

-static pointer

-mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)

-{

-    mach_port_t device,mem_dev;

-    memory_object_t mem_obj;

-    kern_return_t err;

-    vm_address_t addr=(vm_address_t)0;

-

-    err = get_privileged_ports (NULL, &device);

-    if( err )

-    {

-	errno = err;

-	FatalError("xf86MapVidMem() can't get_privileged_ports. (%s)\n",strerror(errno));

-    }

-    err = device_open(device,D_READ|D_WRITE,"mem",&mem_dev);

-    mach_port_deallocate (mach_task_self(), device);

-    if( err )

-    {

-	errno = err;

-	FatalError("xf86MapVidMem() can't device_open. (%s)\n",strerror(errno));

-    }

-

-    err = device_map(mem_dev,VM_PROT_READ|VM_PROT_WRITE, Base , Size ,&mem_obj,0);

-    if( err )

-    {

-	errno = err;

-	FatalError("xf86MapVidMem() can't device_map. (%s)\n",strerror(errno));

-    }

-    err = vm_map(mach_task_self(),

-		 &addr,

-		 Size,

-		 0,     /* mask */

-		 TRUE,  /* anywhere */

-		 mem_obj,

-		 (vm_offset_t)Base,

-		 FALSE, /* copy on write */

-		 VM_PROT_READ|VM_PROT_WRITE,

-		 VM_PROT_READ|VM_PROT_WRITE,

-		 VM_INHERIT_SHARE);

-    mach_port_deallocate(mach_task_self(),mem_obj);

-    if( err )

-    {

-	errno = err;

-	FatalError("xf86MapVidMem() can't vm_map.(mem_obj) (%s)\n",strerror(errno));

-    }

-    mach_port_deallocate(mach_task_self(),mem_dev);

-    if( err )

-    {

-	errno = err;

-	FatalError("xf86MapVidMem() can't mach_port_deallocate.(mem_dev) (%s)\n",strerror(errno));

-    }

-    return (pointer)addr;

-}

-

-static void

-unmapVidMem(int ScreenNum,pointer Base,unsigned long Size)

-{

-    kern_return_t err = vm_deallocate(mach_task_self(), (int)Base, Size);

-    if( err )

-    {

-	errno = err;

-	ErrorF("xf86UnMapVidMem: can't dealloc framebuffer space (%s)\n",strerror(errno));

-    }

-    return;

-}

-

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

- * I/O Permissions section                                                 

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

-

-/*

- * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare

- * this.

- */

-extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on);

-

-Bool

-xf86EnableIO()

-{

-    if (ioperm(0, 0x10000, 1)) {

-	FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));

-	return FALSE;

-    }

-#if 0

-    /*

-     * Trapping disabled for now, as some VBIOSes (mga-g450 notably) use these

-     * ports, and the int10 wrapper is not emulating them. (Note that it's

-     * effectively what happens in the Linux variant too, as iopl() is used

-     * there, making the ioperm() meaningless.)

-     *

-     * Reenable this when int10 gets fixed.  */

-    ioperm(0x40,4,0); /* trap access to the timer chip */

-    ioperm(0x60,4,0); /* trap access to the keyboard controller */

-#endif

-    return TRUE;

-}

-	

-void

-xf86DisableIO()

-{

-    ioperm(0,0x10000,0);

-    return;

-}

-

-void

-xf86OSInitVidMem(VidMemInfoPtr pVidMem)

-{

-	pVidMem->linearSupported = TRUE;

-	pVidMem->mapMem = mapVidMem;

-	pVidMem->unmapMem = unmapVidMem;

-	pVidMem->initialised = TRUE;

-}

+/*
+ * Copyright 1997, 1998 by UCHIYAMA Yasushi
+ *
+ * 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 UCHIYAMA Yasushi not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  UCHIYAMA Yasushi makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL UCHIYAMA YASUSHI 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_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <mach.h>
+#include <device/device.h>
+#include <mach/machine/mach_i386.h>
+
+#include <X11/X.h>
+#include "input.h"
+#include "scrnintstr.h"
+
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+#include "xf86OSpriv.h"
+
+/**************************************************************************
+ * Video Memory Mapping section                                            
+ ***************************************************************************/
+static pointer
+mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
+{
+    mach_port_t device, mem_dev;
+    memory_object_t mem_obj;
+    kern_return_t err;
+    vm_address_t addr = (vm_address_t) 0;
+
+    err = get_privileged_ports(NULL, &device);
+    if (err) {
+        errno = err;
+        FatalError("xf86MapVidMem() can't get_privileged_ports. (%s)\n",
+                   strerror(errno));
+    }
+    err = device_open(device, D_READ | D_WRITE, "mem", &mem_dev);
+    mach_port_deallocate(mach_task_self(), device);
+    if (err) {
+        errno = err;
+        FatalError("xf86MapVidMem() can't device_open. (%s)\n",
+                   strerror(errno));
+    }
+
+    err =
+        device_map(mem_dev, VM_PROT_READ | VM_PROT_WRITE, Base, Size, &mem_obj,
+                   0);
+    if (err) {
+        errno = err;
+        FatalError("xf86MapVidMem() can't device_map. (%s)\n", strerror(errno));
+    }
+    err = vm_map(mach_task_self(), &addr, Size, 0,      /* mask */
+                 TRUE,          /* anywhere */
+                 mem_obj, (vm_offset_t) Base, FALSE,    /* copy on write */
+                 VM_PROT_READ | VM_PROT_WRITE,
+                 VM_PROT_READ | VM_PROT_WRITE, VM_INHERIT_SHARE);
+    mach_port_deallocate(mach_task_self(), mem_obj);
+    if (err) {
+        errno = err;
+        FatalError("xf86MapVidMem() can't vm_map.(mem_obj) (%s)\n",
+                   strerror(errno));
+    }
+    mach_port_deallocate(mach_task_self(), mem_dev);
+    if (err) {
+        errno = err;
+        FatalError
+            ("xf86MapVidMem() can't mach_port_deallocate.(mem_dev) (%s)\n",
+             strerror(errno));
+    }
+    return (pointer) addr;
+}
+
+static void
+unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+{
+    kern_return_t err = vm_deallocate(mach_task_self(), (int) Base, Size);
+
+    if (err) {
+        errno = err;
+        ErrorF("xf86UnMapVidMem: can't dealloc framebuffer space (%s)\n",
+               strerror(errno));
+    }
+    return;
+}
+
+/**************************************************************************
+ * I/O Permissions section                                                 
+ ***************************************************************************/
+
+/*
+ * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
+ * this.
+ */
+extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on);
+
+Bool
+xf86EnableIO()
+{
+    if (ioperm(0, 0x10000, 1)) {
+        FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
+        return FALSE;
+    }
+#if 0
+    /*
+     * Trapping disabled for now, as some VBIOSes (mga-g450 notably) use these
+     * ports, and the int10 wrapper is not emulating them. (Note that it's
+     * effectively what happens in the Linux variant too, as iopl() is used
+     * there, making the ioperm() meaningless.)
+     *
+     * Reenable this when int10 gets fixed.  */
+    ioperm(0x40, 4, 0);         /* trap access to the timer chip */
+    ioperm(0x60, 4, 0);         /* trap access to the keyboard controller */
+#endif
+    return TRUE;
+}
+
+void
+xf86DisableIO()
+{
+    ioperm(0, 0x10000, 0);
+    return;
+}
+
+void
+xf86OSInitVidMem(VidMemInfoPtr pVidMem)
+{
+    pVidMem->linearSupported = TRUE;
+    pVidMem->mapMem = mapVidMem;
+    pVidMem->unmapMem = unmapVidMem;
+    pVidMem->initialised = TRUE;
+}
diff --git a/xorg-server/hw/xfree86/os-support/linux/int10/linux.c b/xorg-server/hw/xfree86/os-support/linux/int10/linux.c
index 564447ff6..fa58a72b6 100644
--- a/xorg-server/hw/xfree86/os-support/linux/int10/linux.c
+++ b/xorg-server/hw/xfree86/os-support/linux/int10/linux.c
@@ -50,10 +50,10 @@ int10MemRec linuxMem = {
 typedef struct {
     int lowMem;
     int highMem;
-    char* base;
-    char* base_high;
+    char *base;
+    char *base_high;
     int screen;
-    char* alloc;
+    char *alloc;
 } linuxInt10Priv;
 
 #if defined DoSubModules
@@ -69,7 +69,7 @@ static Int10LinuxSubModuleState loadedSubModule = INT10_NOT_LOADED;
 
 static Int10LinuxSubModuleState int10LinuxLoadSubModule(ScrnInfoPtr pScrn);
 
-#endif /* DoSubModules */
+#endif                          /* DoSubModules */
 
 xf86Int10InfoPtr
 xf86ExtendedInitInt10(int entityIndex, int Flags)
@@ -77,152 +77,155 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
     xf86Int10InfoPtr pInt = NULL;
     int screen;
     int fd;
-    static void* vidMem = NULL;
-    static void* sysMem = NULL;
-    void* vMem = NULL;
+    static void *vidMem = NULL;
+    static void *sysMem = NULL;
+    void *vMem = NULL;
     void *options = NULL;
     int low_mem;
     int high_mem = -1;
     char *base = SHMERRORPTR;
     char *base_high = SHMERRORPTR;
-    int pagesize; 
+    int pagesize;
     memType cs;
     legacyVGARec vga;
     Bool videoBiosMapped = FALSE;
-    
+
     if (int10Generation != serverGeneration) {
-	counter = 0;
-	int10Generation = serverGeneration;
+        counter = 0;
+        int10Generation = serverGeneration;
     }
 
     screen = (xf86FindScreenForEntity(entityIndex))->scrnIndex;
 
-    options = xf86HandleInt10Options(xf86Screens[screen],entityIndex);
+    options = xf86HandleInt10Options(xf86Screens[screen], entityIndex);
 
     if (int10skip(options)) {
-	free(options);
-	return NULL;
+        free(options);
+        return NULL;
     }
 
 #if defined DoSubModules
-    if (loadedSubModule == INT10_NOT_LOADED) 
-	loadedSubModule = int10LinuxLoadSubModule(xf86Screens[screen]);
+    if (loadedSubModule == INT10_NOT_LOADED)
+        loadedSubModule = int10LinuxLoadSubModule(xf86Screens[screen]);
 
     if (loadedSubModule == INT10_LOAD_FAILED)
-	return NULL;
+        return NULL;
 #endif
 
     if ((!vidMem) || (!sysMem)) {
-	if ((fd = open(DEV_MEM, O_RDWR, 0)) >= 0) {
-	    if (!sysMem) {
-		DebugF("Mapping sys bios area\n");
-		if ((sysMem = mmap((void *)(SYS_BIOS), BIOS_SIZE,
-				   PROT_READ | PROT_EXEC,
-				   MAP_SHARED | MAP_FIXED, fd, SYS_BIOS))
-		    == MAP_FAILED) {
-		    xf86DrvMsg(screen, X_ERROR, "Cannot map SYS BIOS\n");
-		    close(fd);
-		    goto error0;
-		}
-	    }
-	    if (!vidMem) {
-		DebugF("Mapping VRAM area\n");
-		if ((vidMem = mmap((void *)(V_RAM), VRAM_SIZE,
-				   PROT_READ | PROT_WRITE | PROT_EXEC,
-				   MAP_SHARED | MAP_FIXED, fd, V_RAM))
-		    == MAP_FAILED) {
-		    xf86DrvMsg(screen, X_ERROR, "Cannot map V_RAM\n");
-		    close(fd);
-		    goto error0;
-		}
-	    }
-	    close(fd);
-	} else {
-	    xf86DrvMsg(screen, X_ERROR, "Cannot open %s\n", DEV_MEM);
-	    goto error0;
-	}
+        if ((fd = open(DEV_MEM, O_RDWR, 0)) >= 0) {
+            if (!sysMem) {
+                DebugF("Mapping sys bios area\n");
+                if ((sysMem = mmap((void *) (SYS_BIOS), BIOS_SIZE,
+                                   PROT_READ | PROT_EXEC,
+                                   MAP_SHARED | MAP_FIXED, fd, SYS_BIOS))
+                    == MAP_FAILED) {
+                    xf86DrvMsg(screen, X_ERROR, "Cannot map SYS BIOS\n");
+                    close(fd);
+                    goto error0;
+                }
+            }
+            if (!vidMem) {
+                DebugF("Mapping VRAM area\n");
+                if ((vidMem = mmap((void *) (V_RAM), VRAM_SIZE,
+                                   PROT_READ | PROT_WRITE | PROT_EXEC,
+                                   MAP_SHARED | MAP_FIXED, fd, V_RAM))
+                    == MAP_FAILED) {
+                    xf86DrvMsg(screen, X_ERROR, "Cannot map V_RAM\n");
+                    close(fd);
+                    goto error0;
+                }
+            }
+            close(fd);
+        }
+        else {
+            xf86DrvMsg(screen, X_ERROR, "Cannot open %s\n", DEV_MEM);
+            goto error0;
+        }
     }
 
-    pInt = (xf86Int10InfoPtr)xnfcalloc(1, sizeof(xf86Int10InfoRec));
+    pInt = (xf86Int10InfoPtr) xnfcalloc(1, sizeof(xf86Int10InfoRec));
     pInt->scrnIndex = screen;
     pInt->entityIndex = entityIndex;
     pInt->dev = xf86GetPciInfoForEntity(entityIndex);
 
     if (!xf86Int10ExecSetup(pInt))
-	goto error0;
+        goto error0;
     pInt->mem = &linuxMem;
     pagesize = getpagesize();
-    pInt->private = (pointer)xnfcalloc(1, sizeof(linuxInt10Priv));
-    ((linuxInt10Priv*)pInt->private)->screen = screen;
-    ((linuxInt10Priv*)pInt->private)->alloc =
-	(pointer)xnfcalloc(1, ALLOC_ENTRIES(pagesize));
+    pInt->private = (pointer) xnfcalloc(1, sizeof(linuxInt10Priv));
+    ((linuxInt10Priv *) pInt->private)->screen = screen;
+    ((linuxInt10Priv *) pInt->private)->alloc =
+        (pointer) xnfcalloc(1, ALLOC_ENTRIES(pagesize));
 
     if (!xf86IsEntityPrimary(entityIndex)) {
-	DebugF("Mapping high memory area\n");
-	if ((high_mem = shmget(counter++, HIGH_MEM_SIZE,
-			       IPC_CREAT | SHM_R | SHM_W)) == -1) {
-	    if (errno == ENOSYS)
-		xf86DrvMsg(screen, X_ERROR, "shmget error\n Please reconfigure"
-			   " your kernel to include System V IPC support\n");
-	    else
-		xf86DrvMsg(screen, X_ERROR,
-			   "shmget(highmem) error: %s\n",strerror(errno));
-	    goto error1;
-	}
-    } else {
-	DebugF("Mapping Video BIOS\n");
-	videoBiosMapped = TRUE;
-	if ((fd = open(DEV_MEM, O_RDWR, 0)) >= 0) {
-	    if ((vMem = mmap((void *)(V_BIOS), SYS_BIOS - V_BIOS,
-			     PROT_READ | PROT_WRITE | PROT_EXEC,
-			     MAP_SHARED | MAP_FIXED, fd, V_BIOS))
-		== MAP_FAILED) {
-		xf86DrvMsg(screen, X_ERROR, "Cannot map V_BIOS\n");
-		close(fd);
-		goto error1;
-	    }
-	    close (fd);
-	} else
-	    goto error1;
+        DebugF("Mapping high memory area\n");
+        if ((high_mem = shmget(counter++, HIGH_MEM_SIZE,
+                               IPC_CREAT | SHM_R | SHM_W)) == -1) {
+            if (errno == ENOSYS)
+                xf86DrvMsg(screen, X_ERROR, "shmget error\n Please reconfigure"
+                           " your kernel to include System V IPC support\n");
+            else
+                xf86DrvMsg(screen, X_ERROR,
+                           "shmget(highmem) error: %s\n", strerror(errno));
+            goto error1;
+        }
+    }
+    else {
+        DebugF("Mapping Video BIOS\n");
+        videoBiosMapped = TRUE;
+        if ((fd = open(DEV_MEM, O_RDWR, 0)) >= 0) {
+            if ((vMem = mmap((void *) (V_BIOS), SYS_BIOS - V_BIOS,
+                             PROT_READ | PROT_WRITE | PROT_EXEC,
+                             MAP_SHARED | MAP_FIXED, fd, V_BIOS))
+                == MAP_FAILED) {
+                xf86DrvMsg(screen, X_ERROR, "Cannot map V_BIOS\n");
+                close(fd);
+                goto error1;
+            }
+            close(fd);
+        }
+        else
+            goto error1;
     }
-    ((linuxInt10Priv*)pInt->private)->highMem = high_mem;
-    
+    ((linuxInt10Priv *) pInt->private)->highMem = high_mem;
+
     DebugF("Mapping 640kB area\n");
-    if ((low_mem = shmget(counter++, V_RAM,
-			  IPC_CREAT | SHM_R | SHM_W)) == -1) {
-	xf86DrvMsg(screen, X_ERROR,
-		   "shmget(lowmem) error: %s\n",strerror(errno));
-	goto error2;
+    if ((low_mem = shmget(counter++, V_RAM, IPC_CREAT | SHM_R | SHM_W)) == -1) {
+        xf86DrvMsg(screen, X_ERROR,
+                   "shmget(lowmem) error: %s\n", strerror(errno));
+        goto error2;
     }
 
-    ((linuxInt10Priv*)pInt->private)->lowMem = low_mem;
+    ((linuxInt10Priv *) pInt->private)->lowMem = low_mem;
     base = shmat(low_mem, 0, 0);
     if (base == SHMERRORPTR) {
-	xf86DrvMsg(screen, X_ERROR,
-		   "shmat(low_mem) error: %s\n",strerror(errno));
-	goto error3;
+        xf86DrvMsg(screen, X_ERROR,
+                   "shmat(low_mem) error: %s\n", strerror(errno));
+        goto error3;
     }
-    ((linuxInt10Priv *)pInt->private)->base = base;
+    ((linuxInt10Priv *) pInt->private)->base = base;
     if (high_mem > -1) {
-	base_high = shmat(high_mem, 0, 0);
-	if (base_high == SHMERRORPTR) {
-	    xf86DrvMsg(screen, X_ERROR,
-		       "shmat(high_mem) error: %s\n",strerror(errno));
-	    goto error3;
-	}
-	((linuxInt10Priv*)pInt->private)->base_high = base_high;
-    } else
-	((linuxInt10Priv*)pInt->private)->base_high = NULL;
+        base_high = shmat(high_mem, 0, 0);
+        if (base_high == SHMERRORPTR) {
+            xf86DrvMsg(screen, X_ERROR,
+                       "shmat(high_mem) error: %s\n", strerror(errno));
+            goto error3;
+        }
+        ((linuxInt10Priv *) pInt->private)->base_high = base_high;
+    }
+    else
+        ((linuxInt10Priv *) pInt->private)->base_high = NULL;
 
     if (!MapCurrentInt10(pInt))
-	goto error3;
-    
+        goto error3;
+
     Int10Current = pInt;
 
     DebugF("Mapping int area\n");
-    if (xf86ReadBIOS(0, 0, (unsigned char *)0, LOW_PAGE_SIZE) < 0) {
-	xf86DrvMsg(screen, X_ERROR, "Cannot read int vect\n");
-	goto error3;
+    if (xf86ReadBIOS(0, 0, (unsigned char *) 0, LOW_PAGE_SIZE) < 0) {
+        xf86DrvMsg(screen, X_ERROR, "Cannot read int vect\n");
+        goto error3;
     }
     DebugF("done\n");
     /*
@@ -231,57 +234,58 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
      * 64K bytes at a time.
      */
     if (!videoBiosMapped) {
-	memset((pointer)V_BIOS, 0, SYS_BIOS - V_BIOS);
-	DebugF("Reading BIOS\n");
-	for (cs = V_BIOS;  cs < SYS_BIOS;  cs += V_BIOS_SIZE)
-	    if (xf86ReadBIOS(cs, 0, (pointer)cs, V_BIOS_SIZE) < V_BIOS_SIZE)
-		xf86DrvMsg(screen, X_WARNING,
-			   "Unable to retrieve all of segment 0x%06lX.\n",
-			   (long)cs);
-	DebugF("done\n");
+        memset((pointer) V_BIOS, 0, SYS_BIOS - V_BIOS);
+        DebugF("Reading BIOS\n");
+        for (cs = V_BIOS; cs < SYS_BIOS; cs += V_BIOS_SIZE)
+            if (xf86ReadBIOS(cs, 0, (pointer) cs, V_BIOS_SIZE) < V_BIOS_SIZE)
+                xf86DrvMsg(screen, X_WARNING,
+                           "Unable to retrieve all of segment 0x%06lX.\n",
+                           (long) cs);
+        DebugF("done\n");
     }
 
     if (xf86IsEntityPrimary(entityIndex) && !(initPrimary(options))) {
-	if (!xf86int10GetBiosSegment(pInt, NULL))
-	    goto error3;
-
-	set_return_trap(pInt);
-#ifdef _PC	
-	pInt->Flags = Flags & (SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH);
-	if (! (pInt->Flags & SET_BIOS_SCRATCH))
-	    pInt->Flags &= ~RESTORE_BIOS_SCRATCH;
-  	xf86Int10SaveRestoreBIOSVars(pInt, TRUE);
+        if (!xf86int10GetBiosSegment(pInt, NULL))
+            goto error3;
+
+        set_return_trap(pInt);
+#ifdef _PC
+        pInt->Flags = Flags & (SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH);
+        if (!(pInt->Flags & SET_BIOS_SCRATCH))
+            pInt->Flags &= ~RESTORE_BIOS_SCRATCH;
+        xf86Int10SaveRestoreBIOSVars(pInt, TRUE);
 #endif
-    } else {
-	const BusType location_type = xf86int10GetBiosLocationType(pInt);
-
-	switch (location_type) {
-	case BUS_PCI: {
-	    int err;
-	    struct pci_device *rom_device =
-		xf86GetPciInfoForEntity(pInt->entityIndex);
-
-	    pci_device_enable(rom_device);
-	    err = pci_device_read_rom(rom_device, (unsigned char *)(V_BIOS));
-	    if (err) {
-		xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (%s)\n",
-			   strerror(err));
-		goto error3;
-	    }
-
-	    pInt->BIOSseg = V_BIOS >> 4;
-	    break;
-	}
-	default:
-	    goto error3;
-	}
-
-	pInt->num = 0xe6;
-	reset_int_vect(pInt);
-	set_return_trap(pInt);
-	LockLegacyVGA(pInt, &vga);
-	xf86ExecX86int10(pInt);
-	UnlockLegacyVGA(pInt, &vga);
+    }
+    else {
+        const BusType location_type = xf86int10GetBiosLocationType(pInt);
+
+        switch (location_type) {
+        case BUS_PCI:{
+            int err;
+            struct pci_device *rom_device =
+                xf86GetPciInfoForEntity(pInt->entityIndex);
+
+            pci_device_enable(rom_device);
+            err = pci_device_read_rom(rom_device, (unsigned char *) (V_BIOS));
+            if (err) {
+                xf86DrvMsg(screen, X_ERROR, "Cannot read V_BIOS (%s)\n",
+                           strerror(err));
+                goto error3;
+            }
+
+            pInt->BIOSseg = V_BIOS >> 4;
+            break;
+        }
+        default:
+            goto error3;
+        }
+
+        pInt->num = 0xe6;
+        reset_int_vect(pInt);
+        set_return_trap(pInt);
+        LockLegacyVGA(pInt, &vga);
+        xf86ExecX86int10(pInt);
+        UnlockLegacyVGA(pInt, &vga);
     }
 #ifdef DEBUG
     dprint(0xc0000, 0x20);
@@ -290,24 +294,24 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
     free(options);
     return pInt;
 
-error3:
+ error3:
     if (base_high)
-	shmdt(base_high);
+        shmdt(base_high);
     shmdt(base);
     shmdt(0);
     if (base_high)
-	shmdt((char*)HIGH_MEM);
+        shmdt((char *) HIGH_MEM);
     shmctl(low_mem, IPC_RMID, NULL);
     Int10Current = NULL;
-error2:
+ error2:
     if (high_mem > -1)
-	shmctl(high_mem, IPC_RMID,NULL);
-error1:
+        shmctl(high_mem, IPC_RMID, NULL);
+ error1:
     if (vMem)
-	munmap(vMem, SYS_BIOS - V_BIOS);
-    free(((linuxInt10Priv*)pInt->private)->alloc);
+        munmap(vMem, SYS_BIOS - V_BIOS);
+    free(((linuxInt10Priv *) pInt->private)->alloc);
     free(pInt->private);
-error0:
+ error0:
     free(options);
     free(pInt);
     return NULL;
@@ -318,57 +322,60 @@ MapCurrentInt10(xf86Int10InfoPtr pInt)
 {
     pointer addr;
     int fd = -1;
-    
+
     if (Int10Current) {
-	shmdt(0);
-	if (((linuxInt10Priv*)Int10Current->private)->highMem >= 0)
-	    shmdt((char*)HIGH_MEM);
-	else
-	    munmap((pointer)V_BIOS, (SYS_BIOS - V_BIOS));
+        shmdt(0);
+        if (((linuxInt10Priv *) Int10Current->private)->highMem >= 0)
+            shmdt((char *) HIGH_MEM);
+        else
+            munmap((pointer) V_BIOS, (SYS_BIOS - V_BIOS));
     }
-    addr = shmat(((linuxInt10Priv*)pInt->private)->lowMem, (char*)1, SHM_RND);
+    addr =
+        shmat(((linuxInt10Priv *) pInt->private)->lowMem, (char *) 1, SHM_RND);
     if (addr == SHMERRORPTR) {
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR, "Cannot shmat() low memory\n");
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR,
-		   "shmat(low_mem) error: %s\n",strerror(errno));
-	return FALSE;
+        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "Cannot shmat() low memory\n");
+        xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+                   "shmat(low_mem) error: %s\n", strerror(errno));
+        return FALSE;
     }
-    if (mprotect((void*)0, V_RAM, PROT_READ|PROT_WRITE|PROT_EXEC) != 0)
+    if (mprotect((void *) 0, V_RAM, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
         xf86DrvMsg(pInt->scrnIndex, X_ERROR,
-		   "Cannot set EXEC bit on low memory: %s\n", strerror(errno));
-
-    if (((linuxInt10Priv*)pInt->private)->highMem >= 0) {
-	addr = shmat(((linuxInt10Priv*)pInt->private)->highMem,
-		     (char*)HIGH_MEM, 0);
-	if (addr == SHMERRORPTR) {
-	    xf86DrvMsg(pInt->scrnIndex, X_ERROR,
-		       "Cannot shmat() high memory\n");
-	    xf86DrvMsg(pInt->scrnIndex, X_ERROR,
-		       "shmget error: %s\n",strerror(errno));
-	    return FALSE;
-	}
-	if (mprotect((void*)HIGH_MEM, HIGH_MEM_SIZE,
-		     PROT_READ|PROT_WRITE|PROT_EXEC) != 0)
-	    xf86DrvMsg(pInt->scrnIndex, X_ERROR,
-		       "Cannot set EXEC bit on high memory: %s\n",
-		       strerror(errno));
-    } else {
-	if ((fd = open(DEV_MEM, O_RDWR, 0)) >= 0) {
-	    if (mmap((void *)(V_BIOS), SYS_BIOS - V_BIOS,
-			     PROT_READ | PROT_WRITE | PROT_EXEC,
-			     MAP_SHARED | MAP_FIXED, fd, V_BIOS)
-		== MAP_FAILED) {
-		xf86DrvMsg(pInt->scrnIndex, X_ERROR, "Cannot map V_BIOS\n");
-		close (fd);
-		return FALSE;
-	    }
-	} else {
-	    xf86DrvMsg(pInt->scrnIndex, X_ERROR, "Cannot open %s\n",DEV_MEM);
-	    return FALSE;
-	}
-	close (fd);
+                   "Cannot set EXEC bit on low memory: %s\n", strerror(errno));
+
+    if (((linuxInt10Priv *) pInt->private)->highMem >= 0) {
+        addr = shmat(((linuxInt10Priv *) pInt->private)->highMem,
+                     (char *) HIGH_MEM, 0);
+        if (addr == SHMERRORPTR) {
+            xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+                       "Cannot shmat() high memory\n");
+            xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+                       "shmget error: %s\n", strerror(errno));
+            return FALSE;
+        }
+        if (mprotect((void *) HIGH_MEM, HIGH_MEM_SIZE,
+                     PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
+            xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+                       "Cannot set EXEC bit on high memory: %s\n",
+                       strerror(errno));
     }
-    
+    else {
+        if ((fd = open(DEV_MEM, O_RDWR, 0)) >= 0) {
+            if (mmap((void *) (V_BIOS), SYS_BIOS - V_BIOS,
+                     PROT_READ | PROT_WRITE | PROT_EXEC,
+                     MAP_SHARED | MAP_FIXED, fd, V_BIOS)
+                == MAP_FAILED) {
+                xf86DrvMsg(pInt->scrnIndex, X_ERROR, "Cannot map V_BIOS\n");
+                close(fd);
+                return FALSE;
+            }
+        }
+        else {
+            xf86DrvMsg(pInt->scrnIndex, X_ERROR, "Cannot open %s\n", DEV_MEM);
+            return FALSE;
+        }
+        close(fd);
+    }
+
     return TRUE;
 }
 
@@ -376,27 +383,27 @@ void
 xf86FreeInt10(xf86Int10InfoPtr pInt)
 {
     if (!pInt)
-	return;
+        return;
 
 #ifdef _PC
-    xf86Int10SaveRestoreBIOSVars(pInt, FALSE); 
+    xf86Int10SaveRestoreBIOSVars(pInt, FALSE);
 #endif
     if (Int10Current == pInt) {
-	shmdt(0);
-	if (((linuxInt10Priv*)pInt->private)->highMem >= 0)
-	    shmdt((char*)HIGH_MEM);
-	else
-	    munmap((pointer)V_BIOS, (SYS_BIOS - V_BIOS));
-	Int10Current = NULL;
+        shmdt(0);
+        if (((linuxInt10Priv *) pInt->private)->highMem >= 0)
+            shmdt((char *) HIGH_MEM);
+        else
+            munmap((pointer) V_BIOS, (SYS_BIOS - V_BIOS));
+        Int10Current = NULL;
     }
-    
-    if (((linuxInt10Priv*)pInt->private)->base_high)
-	shmdt(((linuxInt10Priv*)pInt->private)->base_high);
-    shmdt(((linuxInt10Priv*)pInt->private)->base);
-    shmctl(((linuxInt10Priv*)pInt->private)->lowMem, IPC_RMID, NULL);
-    if (((linuxInt10Priv*)pInt->private)->highMem >= 0)
-	shmctl(((linuxInt10Priv*)pInt->private)->highMem, IPC_RMID, NULL);
-    free(((linuxInt10Priv*)pInt->private)->alloc);
+
+    if (((linuxInt10Priv *) pInt->private)->base_high)
+        shmdt(((linuxInt10Priv *) pInt->private)->base_high);
+    shmdt(((linuxInt10Priv *) pInt->private)->base);
+    shmctl(((linuxInt10Priv *) pInt->private)->lowMem, IPC_RMID, NULL);
+    if (((linuxInt10Priv *) pInt->private)->highMem >= 0)
+        shmctl(((linuxInt10Priv *) pInt->private)->highMem, IPC_RMID, NULL);
+    free(((linuxInt10Priv *) pInt->private)->alloc);
     free(pInt->private);
     free(pInt);
 }
@@ -409,91 +416,93 @@ xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
     int i, j;
 
     for (i = 0; i < (num_pages - num); i++) {
-	if (((linuxInt10Priv*)pInt->private)->alloc[i] == 0) {
-	    for (j = i; j < (num + i); j++)
-		if ((((linuxInt10Priv*)pInt->private)->alloc[j] != 0))
-		    break;
-	    if (j == (num + i))
-		break;
-	    else
-		i = i + num;
-	}
+        if (((linuxInt10Priv *) pInt->private)->alloc[i] == 0) {
+            for (j = i; j < (num + i); j++)
+                if ((((linuxInt10Priv *) pInt->private)->alloc[j] != 0))
+                    break;
+            if (j == (num + i))
+                break;
+            else
+                i = i + num;
+        }
     }
     if (i == (num_pages - num))
-	return NULL;
+        return NULL;
 
     for (j = i; j < (i + num); j++)
-	((linuxInt10Priv*)pInt->private)->alloc[j] = 1;
+        ((linuxInt10Priv *) pInt->private)->alloc[j] = 1;
 
     *off = (i + 1) * pagesize;
 
-    return ((linuxInt10Priv*)pInt->private)->base + ((i + 1) * pagesize);
+    return ((linuxInt10Priv *) pInt->private)->base + ((i + 1) * pagesize);
 }
 
 void
 xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
 {
     int pagesize = getpagesize();
-    int first = (((unsigned long)pbase
-		 - (unsigned long)((linuxInt10Priv*)pInt->private)->base)
-	/ pagesize) - 1;
+    int first = (((unsigned long) pbase
+                  - (unsigned long) ((linuxInt10Priv *) pInt->private)->base)
+                 / pagesize) - 1;
     int i;
 
     for (i = first; i < (first + num); i++)
-	((linuxInt10Priv*)pInt->private)->alloc[i] = 0;
+        ((linuxInt10Priv *) pInt->private)->alloc[i] = 0;
 }
 
 static CARD8
 read_b(xf86Int10InfoPtr pInt, int addr)
 {
-    return *((CARD8 *)(memType)addr);
+    return *((CARD8 *) (memType) addr);
 }
 
 static CARD16
 read_w(xf86Int10InfoPtr pInt, int addr)
 {
-    return *((CARD16 *)(memType)addr);
+    return *((CARD16 *) (memType) addr);
 }
 
 static CARD32
 read_l(xf86Int10InfoPtr pInt, int addr)
 {
-    return *((CARD32 *)(memType)addr);
+    return *((CARD32 *) (memType) addr);
 }
 
 static void
 write_b(xf86Int10InfoPtr pInt, int addr, CARD8 val)
 {
-    *((CARD8 *)(memType)addr) = val;
+    *((CARD8 *) (memType) addr) = val;
 }
 
 static void
 write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val)
 {
-    *((CARD16 *)(memType)addr) = val;
+    *((CARD16 *) (memType) addr) = val;
 }
 
 static
-void write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
+    void
+write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
 {
-    *((CARD32 *)(memType) addr) = val;
+    *((CARD32 *) (memType) addr) = val;
 }
 
 pointer
 xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
 {
     if (addr < V_RAM)
-	return ((linuxInt10Priv*)pInt->private)->base + addr;
+        return ((linuxInt10Priv *) pInt->private)->base + addr;
     else if (addr < V_BIOS)
-	return (pointer)(memType)addr;
+        return (pointer) (memType) addr;
     else if (addr < SYS_BIOS) {
-	if (((linuxInt10Priv*)pInt->private)->base_high)
-	    return (pointer)(((linuxInt10Priv*)pInt->private)->base_high
-			     - V_BIOS + addr);
-	else
-	    return (pointer) (memType)addr;
-    } else
-	return (pointer) (memType)addr;
+        if (((linuxInt10Priv *) pInt->private)->base_high)
+            return (pointer) (((linuxInt10Priv *) pInt->private)->base_high
+                              - V_BIOS + addr);
+        else
+            return (pointer) (memType) addr;
+    }
+    else
+        return (pointer) (memType) addr;
 }
 
 #if defined DoSubModules
@@ -507,20 +516,17 @@ vm86_tst(void)
     /* When compiling with -fPIC, we can't use asm constraint "b" because
        %ebx is already taken by gcc. */
     __asm__ __volatile__("pushl %%ebx\n\t"
-			 "movl %2,%%ebx\n\t"
-			 "movl %1,%%eax\n\t"
-			 "int $0x80\n\t"
-			 "popl %%ebx"
-			 :"=a" (__res)
-			 :"n" ((int)113), "r" (NULL));
+                         "movl %2,%%ebx\n\t"
+                         "movl %1,%%eax\n\t"
+                         "int $0x80\n\t" "popl %%ebx":"=a"(__res)
+                         :"n"((int) 113), "r"(NULL));
 #else
-    __asm__ __volatile__("int $0x80\n\t"
-			 :"=a" (__res):"a" ((int)113),
-			 "b" ((struct vm86_struct *)NULL));
+    __asm__ __volatile__("int $0x80\n\t":"=a"(__res):"a"((int) 113),
+                         "b"((struct vm86_struct *) NULL));
 #endif
 
-    if (__res < 0 && __res == -ENOSYS) 
-	return FALSE;
+    if (__res < 0 && __res == -ENOSYS)
+        return FALSE;
 
     return TRUE;
 }
@@ -529,13 +535,13 @@ static Int10LinuxSubModuleState
 int10LinuxLoadSubModule(ScrnInfoPtr pScrn)
 {
     if (vm86_tst()) {
-	if (xf86LoadSubModule(pScrn,"vm86"))
-	    return INT10_LOADED_VM86;
-    } 
-    if (xf86LoadSubModule(pScrn,"x86emu"))
-	return INT10_LOADED_X86EMU;
+        if (xf86LoadSubModule(pScrn, "vm86"))
+            return INT10_LOADED_VM86;
+    }
+    if (xf86LoadSubModule(pScrn, "x86emu"))
+        return INT10_LOADED_X86EMU;
 
     return INT10_LOAD_FAILED;
 }
 
-#endif /* DoSubModules */
+#endif                          /* DoSubModules */
diff --git a/xorg-server/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/xorg-server/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
index 34afd9502..8502b21b7 100644
--- a/xorg-server/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
+++ b/xorg-server/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
@@ -25,7 +25,7 @@ xf86Int10ExecSetup(xf86Int10InfoPtr pInt)
 {
 #define VM86S ((struct vm86_struct *)pInt->cpuRegs)
 
-    pInt->cpuRegs =  &vm86_s;
+    pInt->cpuRegs = &vm86_s;
     VM86S->flags = 0;
     VM86S->screen_bitmap = 0;
     VM86S->cpu_type = CPU_586;
@@ -58,137 +58,172 @@ vm86_GP_fault(xf86Int10InfoPtr pInt)
     /* eat up prefixes */
     done = 0;
     do {
-	switch (MEM_RB(pInt, (int)csp++)) {
-	case 0x66:      /* operand prefix */  prefix66=1; break;
-	case 0x67:      /* address prefix */  prefix67=1; break;
-	case 0x2e:      /* CS */              pref_seg=X86_CS; break;
-	case 0x3e:      /* DS */              pref_seg=X86_DS; break;
-	case 0x26:      /* ES */              pref_seg=X86_ES; break;
-	case 0x36:      /* SS */              pref_seg=X86_SS; break;
-	case 0x65:      /* GS */              pref_seg=X86_GS; break;
-	case 0x64:      /* FS */              pref_seg=X86_FS; break;
-	case 0xf0:      /* lock */            break;
-	case 0xf2:      /* repnz */
-	case 0xf3:      /* rep */             is_rep=1; break;
-	default: done=1;
-	}
+        switch (MEM_RB(pInt, (int) csp++)) {
+        case 0x66:             /* operand prefix */
+            prefix66 = 1;
+            break;
+        case 0x67:             /* address prefix */
+            prefix67 = 1;
+            break;
+        case 0x2e:             /* CS */
+            pref_seg = X86_CS;
+            break;
+        case 0x3e:             /* DS */
+            pref_seg = X86_DS;
+            break;
+        case 0x26:             /* ES */
+            pref_seg = X86_ES;
+            break;
+        case 0x36:             /* SS */
+            pref_seg = X86_SS;
+            break;
+        case 0x65:             /* GS */
+            pref_seg = X86_GS;
+            break;
+        case 0x64:             /* FS */
+            pref_seg = X86_FS;
+            break;
+        case 0xf0:             /* lock */
+            break;
+        case 0xf2:             /* repnz */
+        case 0xf3:             /* rep */
+            is_rep = 1;
+            break;
+        default:
+            done = 1;
+        }
     } while (!done);
-    csp--;   /* oops one too many */
+    csp--;                      /* oops one too many */
     org_eip = X86_EIP;
     X86_IP += (csp - lina);
 
-    switch (MEM_RB(pInt, (int)csp)) {
-    case 0x6c:                    /* insb */
-	/* NOTE: ES can't be overwritten; prefixes 66,67 should use esi,edi,ecx
-	 * but is anyone using extended regs in real mode? */
-	/* WARNING: no test for DI wrapping! */
-	X86_EDI += port_rep_inb(pInt, X86_DX, SEG_EADR((CARD32), X86_ES, DI),
-				X86_FLAGS & DF, is_rep ? LWECX : 1);
-	if (is_rep) LWECX_ZERO;
-	X86_IP++;
-	break;
-
-    case 0x6d:                  /* (rep) insw / insd */
-	/* NOTE: ES can't be overwritten */
-	/* WARNING: no test for _DI wrapping! */
-	if (prefix66) {
-	    X86_DI += port_rep_inl(pInt, X86_DX, SEG_ADR((CARD32), X86_ES, DI),
-				   X86_EFLAGS & DF, is_rep ? LWECX : 1);
-	}
-	else {
-	    X86_DI += port_rep_inw(pInt, X86_DX, SEG_ADR((CARD32), X86_ES, DI),
-				   X86_FLAGS & DF, is_rep ? LWECX : 1);
-	}
-	if (is_rep) LWECX_ZERO;
-	X86_IP++;
-	break;
-
-    case 0x6e:                  /* (rep) outsb */
-	if (pref_seg < 0) pref_seg = X86_DS;
-	/* WARNING: no test for _SI wrapping! */
-	X86_SI += port_rep_outb(pInt, X86_DX, (CARD32)LIN_PREF_SI,
-			        X86_FLAGS & DF, is_rep ? LWECX : 1);
-	if (is_rep) LWECX_ZERO;
-	X86_IP++;
-	break;
-
-    case 0x6f:                  /* (rep) outsw / outsd */
-	if (pref_seg < 0) pref_seg = X86_DS;
-	/* WARNING: no test for _SI wrapping! */
-	if (prefix66) {
-	    X86_SI += port_rep_outl(pInt, X86_DX, (CARD32)LIN_PREF_SI,
-				    X86_EFLAGS & DF, is_rep ? LWECX : 1);
-	}
-	else {
-	    X86_SI += port_rep_outw(pInt, X86_DX, (CARD32)LIN_PREF_SI,
-				    X86_FLAGS & DF, is_rep ? LWECX : 1);
-	}
-	if (is_rep) LWECX_ZERO;
-	X86_IP++;
-	break;
-
-    case 0xe5:                  /* inw xx, inl xx */
-	if (prefix66) X86_EAX = x_inl(csp[1]);
-	else X86_AX = x_inw(csp[1]);
-	X86_IP += 2;
-	break;
-
-    case 0xe4:                  /* inb xx */
-	X86_AL = x_inb(csp[1]);
-	X86_IP += 2;
-	break;
-
-    case 0xed:                  /* inw dx, inl dx */
-	if (prefix66) X86_EAX = x_inl(X86_DX);
-	else X86_AX = x_inw(X86_DX);
-	X86_IP += 1;
-	break;
-
-    case 0xec:                  /* inb dx */
-	X86_AL = x_inb(X86_DX);
-	X86_IP += 1;
-	break;
-
-    case 0xe7:                  /* outw xx */
-	if (prefix66) x_outl(csp[1], X86_EAX);
-	else x_outw(csp[1], X86_AX);
-	X86_IP += 2;
-	break;
-
-    case 0xe6:                  /* outb xx */
-	x_outb(csp[1], X86_AL);
-	X86_IP += 2;
-	break;
-
-    case 0xef:                  /* outw dx */
-	if (prefix66) x_outl(X86_DX, X86_EAX);
-	else x_outw(X86_DX, X86_AX);
-	X86_IP += 1;
-	break;
-
-    case 0xee:                  /* outb dx */
-	x_outb(X86_DX, X86_AL);
-	X86_IP += 1;
-	break;
+    switch (MEM_RB(pInt, (int) csp)) {
+    case 0x6c:                 /* insb */
+        /* NOTE: ES can't be overwritten; prefixes 66,67 should use esi,edi,ecx
+         * but is anyone using extended regs in real mode? */
+        /* WARNING: no test for DI wrapping! */
+        X86_EDI += port_rep_inb(pInt, X86_DX, SEG_EADR((CARD32), X86_ES, DI),
+                                X86_FLAGS & DF, is_rep ? LWECX : 1);
+        if (is_rep)
+            LWECX_ZERO;
+        X86_IP++;
+        break;
+
+    case 0x6d:                 /* (rep) insw / insd */
+        /* NOTE: ES can't be overwritten */
+        /* WARNING: no test for _DI wrapping! */
+        if (prefix66) {
+            X86_DI += port_rep_inl(pInt, X86_DX, SEG_ADR((CARD32), X86_ES, DI),
+                                   X86_EFLAGS & DF, is_rep ? LWECX : 1);
+        }
+        else {
+            X86_DI += port_rep_inw(pInt, X86_DX, SEG_ADR((CARD32), X86_ES, DI),
+                                   X86_FLAGS & DF, is_rep ? LWECX : 1);
+        }
+        if (is_rep)
+            LWECX_ZERO;
+        X86_IP++;
+        break;
+
+    case 0x6e:                 /* (rep) outsb */
+        if (pref_seg < 0)
+            pref_seg = X86_DS;
+        /* WARNING: no test for _SI wrapping! */
+        X86_SI += port_rep_outb(pInt, X86_DX, (CARD32) LIN_PREF_SI,
+                                X86_FLAGS & DF, is_rep ? LWECX : 1);
+        if (is_rep)
+            LWECX_ZERO;
+        X86_IP++;
+        break;
+
+    case 0x6f:                 /* (rep) outsw / outsd */
+        if (pref_seg < 0)
+            pref_seg = X86_DS;
+        /* WARNING: no test for _SI wrapping! */
+        if (prefix66) {
+            X86_SI += port_rep_outl(pInt, X86_DX, (CARD32) LIN_PREF_SI,
+                                    X86_EFLAGS & DF, is_rep ? LWECX : 1);
+        }
+        else {
+            X86_SI += port_rep_outw(pInt, X86_DX, (CARD32) LIN_PREF_SI,
+                                    X86_FLAGS & DF, is_rep ? LWECX : 1);
+        }
+        if (is_rep)
+            LWECX_ZERO;
+        X86_IP++;
+        break;
+
+    case 0xe5:                 /* inw xx, inl xx */
+        if (prefix66)
+            X86_EAX = x_inl(csp[1]);
+        else
+            X86_AX = x_inw(csp[1]);
+        X86_IP += 2;
+        break;
+
+    case 0xe4:                 /* inb xx */
+        X86_AL = x_inb(csp[1]);
+        X86_IP += 2;
+        break;
+
+    case 0xed:                 /* inw dx, inl dx */
+        if (prefix66)
+            X86_EAX = x_inl(X86_DX);
+        else
+            X86_AX = x_inw(X86_DX);
+        X86_IP += 1;
+        break;
+
+    case 0xec:                 /* inb dx */
+        X86_AL = x_inb(X86_DX);
+        X86_IP += 1;
+        break;
+
+    case 0xe7:                 /* outw xx */
+        if (prefix66)
+            x_outl(csp[1], X86_EAX);
+        else
+            x_outw(csp[1], X86_AX);
+        X86_IP += 2;
+        break;
+
+    case 0xe6:                 /* outb xx */
+        x_outb(csp[1], X86_AL);
+        X86_IP += 2;
+        break;
+
+    case 0xef:                 /* outw dx */
+        if (prefix66)
+            x_outl(X86_DX, X86_EAX);
+        else
+            x_outw(X86_DX, X86_AX);
+        X86_IP += 1;
+        break;
+
+    case 0xee:                 /* outb dx */
+        x_outb(X86_DX, X86_AL);
+        X86_IP += 1;
+        break;
 
     case 0xf4:
-	DebugF("hlt at %p\n", lina);
-	return FALSE;
+        DebugF("hlt at %p\n", lina);
+        return FALSE;
 
     case 0x0f:
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR,
-	    "CPU 0x0f Trap at CS:EIP=0x%4.4x:0x%8.8lx\n", X86_CS, X86_EIP);
-	goto op0ferr;
+        xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+                   "CPU 0x0f Trap at CS:EIP=0x%4.4x:0x%8.8lx\n", X86_CS,
+                   X86_EIP);
+        goto op0ferr;
 
     default:
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR, "unknown reason for exception\n");
-
-    op0ferr:
-	dump_registers(pInt);
-	stack_trace(pInt);
-	dump_code(pInt);
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR, "cannot continue\n");
-	return FALSE;
+        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "unknown reason for exception\n");
+
+ op0ferr:
+        dump_registers(pInt);
+        stack_trace(pInt);
+        dump_code(pInt);
+        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "cannot continue\n");
+        return FALSE;
     }                           /* end of switch() */
     return TRUE;
 }
@@ -203,51 +238,52 @@ do_vm86(xf86Int10InfoPtr pInt)
     xf86InterceptSignals(NULL);
 
     if (signo >= 0) {
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR,
-	    "vm86() syscall generated signal %d.\n", signo);
-	dump_registers(pInt);
-	dump_code(pInt);
-	stack_trace(pInt);
-	return 0;
+        xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+                   "vm86() syscall generated signal %d.\n", signo);
+        dump_registers(pInt);
+        dump_code(pInt);
+        stack_trace(pInt);
+        return 0;
     }
 
     switch (VM86_TYPE(retval)) {
     case VM86_UNKNOWN:
-	if (!vm86_GP_fault(pInt)) return 0;
-	break;
+        if (!vm86_GP_fault(pInt))
+            return 0;
+        break;
     case VM86_STI:
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR, "vm86_sti :-((\n");
-	dump_registers(pInt);
-	dump_code(pInt);
-	stack_trace(pInt);
-	return 0;
+        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "vm86_sti :-((\n");
+        dump_registers(pInt);
+        dump_code(pInt);
+        stack_trace(pInt);
+        return 0;
     case VM86_INTx:
-	pInt->num = VM86_ARG(retval);
-	if (!int_handler(pInt)) {
-	    xf86DrvMsg(pInt->scrnIndex, X_ERROR,
-		"Unknown vm86_int: 0x%X\n\n", VM86_ARG(retval));
-	    dump_registers(pInt);
-	    dump_code(pInt);
-	    stack_trace(pInt);
-	    return 0;
-	}
-	/* I'm not sure yet what to do if we can handle ints */
-	break;
+        pInt->num = VM86_ARG(retval);
+        if (!int_handler(pInt)) {
+            xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+                       "Unknown vm86_int: 0x%X\n\n", VM86_ARG(retval));
+            dump_registers(pInt);
+            dump_code(pInt);
+            stack_trace(pInt);
+            return 0;
+        }
+        /* I'm not sure yet what to do if we can handle ints */
+        break;
     case VM86_SIGNAL:
-	return 1;
-	/*
-	 * we used to warn here and bail out - but now the sigio stuff
-	 * always fires signals at us. So we just ignore them for now.
-	 */
-	xf86DrvMsg(pInt->scrnIndex, X_WARNING, "received signal\n");
-	return 0;
+        return 1;
+        /*
+         * we used to warn here and bail out - but now the sigio stuff
+         * always fires signals at us. So we just ignore them for now.
+         */
+        xf86DrvMsg(pInt->scrnIndex, X_WARNING, "received signal\n");
+        return 0;
     default:
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR, "unknown type(0x%x)=0x%x\n",
-		VM86_ARG(retval), VM86_TYPE(retval));
-	dump_registers(pInt);
-	dump_code(pInt);
-	stack_trace(pInt);
-	return 0;
+        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "unknown type(0x%x)=0x%x\n",
+                   VM86_ARG(retval), VM86_TYPE(retval));
+        dump_registers(pInt);
+        dump_code(pInt);
+        stack_trace(pInt);
+        return 0;
     }
 
     return 1;
@@ -259,7 +295,8 @@ xf86ExecX86int10(xf86Int10InfoPtr pInt)
     int sig = setup_int(pInt);
 
     if (int_handler(pInt))
-	while(do_vm86(pInt)) {};
+        while (do_vm86(pInt)) {
+        };
 
     finish_int(pInt, sig);
 }
@@ -273,28 +310,25 @@ vm86_rep(struct vm86_struct *ptr)
     /* When compiling with -fPIC, we can't use asm constraint "b" because
        %ebx is already taken by gcc. */
     __asm__ __volatile__("pushl %%ebx\n\t"
-			 "push %%gs\n\t"
-			 "movl %2,%%ebx\n\t"
-			 "movl %1,%%eax\n\t"
-			 "int $0x80\n\t"
-			 "pop %%gs\n\t"
-			 "popl %%ebx"
-			 :"=a" (__res)
-			 :"n" ((int)113), "r" ((struct vm86_struct *)ptr));
+                         "push %%gs\n\t"
+                         "movl %2,%%ebx\n\t"
+                         "movl %1,%%eax\n\t"
+                         "int $0x80\n\t" "pop %%gs\n\t" "popl %%ebx":"=a"(__res)
+                         :"n"((int) 113), "r"((struct vm86_struct *) ptr));
 #else
     __asm__ __volatile__("push %%gs\n\t"
-			 "int $0x80\n\t"
-			 "pop %%gs"
-			 :"=a" (__res):"a" ((int)113),
-			 "b" ((struct vm86_struct *)ptr));
+                         "int $0x80\n\t"
+                         "pop %%gs":"=a"(__res):"a"((int) 113),
+                         "b"((struct vm86_struct *) ptr));
 #endif
 
-	    if (__res < 0) {
-		errno = -__res;
-		__res = -1;
-	    }
-	    else errno = 0;
-	    return __res;
+    if (__res < 0) {
+        errno = -__res;
+        __res = -1;
+    }
+    else
+        errno = 0;
+    return __res;
 }
 
 #endif
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c b/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c
index dcc878060..e1fa3f8a7 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c
@@ -1,374 +1,371 @@
-/*

- * Abstraction of the AGP GART interface.

- *

- * This version is for Linux and Free/Open/NetBSD.

- *

- * Copyright © 2000 VA Linux Systems, Inc.

- * Copyright © 2001 The XFree86 Project, Inc.

- */

-

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-#include "xf86OSpriv.h"

-

-#if defined(linux)

-#include <asm/ioctl.h>

-#include <linux/agpgart.h>

-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)

-#include <sys/ioctl.h>

-#include <sys/agpio.h>

-#endif

-

-#ifndef AGP_DEVICE

-#define AGP_DEVICE		"/dev/agpgart"

-#endif

-/* AGP page size is independent of the host page size. */

-#ifndef AGP_PAGE_SIZE

-#define AGP_PAGE_SIZE		4096

-#endif

-#define AGPGART_MAJOR_VERSION	0

-#define AGPGART_MINOR_VERSION	99

-

-static int gartFd = -1;

-static int acquiredScreen = -1;

-static Bool initDone = FALSE;

-/*

- * Close /dev/agpgart.  This frees all associated memory allocated during

- * this server generation.

- */

-Bool

-xf86GARTCloseScreen(int screenNum)

-{

-	if(gartFd != -1) {

-		close(gartFd);

-		acquiredScreen = -1;

-		gartFd = -1;

-		initDone = FALSE;

-	}

-	return TRUE;

-}

-

-/*

- * Open /dev/agpgart.  Keep it open until xf86GARTCloseScreen is called.

- */

-static Bool

-GARTInit(int screenNum)

-{

-	struct _agp_info agpinf;

-

-	if (initDone)

-		return gartFd != -1;

-

-	initDone = TRUE;

-

-	if (gartFd == -1)

-		gartFd = open(AGP_DEVICE, O_RDWR, 0);

-	else

-		return FALSE;

-

-	if (gartFd == -1) {

-	    xf86DrvMsg(screenNum, X_ERROR,

-		"GARTInit: Unable to open " AGP_DEVICE " (%s)\n",

-		strerror(errno));

-	    return FALSE;

-	}

-

-	xf86AcquireGART(-1);

-	/* Check the kernel driver version. */

-	if (ioctl(gartFd, AGPIOC_INFO, &agpinf) != 0) {

-		xf86DrvMsg(screenNum, X_ERROR,

-			"GARTInit: AGPIOC_INFO failed (%s)\n", strerror(errno));

-		close(gartFd);

-		gartFd = -1;

-		return FALSE;

-	}

-	xf86ReleaseGART(-1);

-

-#if defined(linux)

-	/* Per Dave Jones, every effort will be made to keep the 

-	 * agpgart interface backwards compatible, so allow all 

-	 * future versions.

-	 */

-	if (

-#if (AGPGART_MAJOR_VERSION > 0) /* quiet compiler */

-	    agpinf.version.major < AGPGART_MAJOR_VERSION ||

-#endif

-	    (agpinf.version.major == AGPGART_MAJOR_VERSION &&

-	     agpinf.version.minor < AGPGART_MINOR_VERSION)) {

-		xf86DrvMsg(screenNum, X_ERROR,

-			"GARTInit: Kernel agpgart driver version is not current"

-			" (%d.%d vs %d.%d)\n",

-			agpinf.version.major, agpinf.version.minor,

-			AGPGART_MAJOR_VERSION, AGPGART_MINOR_VERSION);

-		close(gartFd);

-		gartFd = -1;

-		return FALSE;

-	}

-#endif

-	

-	return TRUE;

-}

-

-Bool

-xf86AgpGARTSupported(void)

-{

-	return GARTInit(-1);

-}

-

-AgpInfoPtr

-xf86GetAGPInfo(int screenNum)

-{

-	struct _agp_info agpinf;

-	AgpInfoPtr info;

-

-	if (!GARTInit(screenNum))

-		return NULL;

-

-

-	if ((info = calloc(sizeof(AgpInfo), 1)) == NULL) {

-		xf86DrvMsg(screenNum, X_ERROR,

-			   "xf86GetAGPInfo: Failed to allocate AgpInfo\n");

-		return NULL;

-	}

-

-	memset((char*)&agpinf, 0, sizeof(agpinf));

-

-	if (ioctl(gartFd, AGPIOC_INFO, &agpinf) != 0) {

-		xf86DrvMsg(screenNum, X_ERROR,

-			   "xf86GetAGPInfo: AGPIOC_INFO failed (%s)\n",

-			   strerror(errno));

-		return NULL;

-	}

-

-	info->bridgeId = agpinf.bridge_id;

-	info->agpMode = agpinf.agp_mode;

-	info->base = agpinf.aper_base;

-	info->size = agpinf.aper_size;

-	info->totalPages = agpinf.pg_total;

-	info->systemPages = agpinf.pg_system;

-	info->usedPages = agpinf.pg_used;

-

-	xf86DrvMsg(screenNum, X_INFO, "Kernel reported %zu total, %zu used\n", agpinf.pg_total, agpinf.pg_used);

-

-	return info;

-}

-

-/*

- * XXX If multiple screens can acquire the GART, should we have a reference

- * count instead of using acquiredScreen?

- */

-

-Bool

-xf86AcquireGART(int screenNum)

-{

-	if (screenNum != -1 && !GARTInit(screenNum))

-		return FALSE;

-

-	if (screenNum == -1 || acquiredScreen != screenNum) {

-		if (ioctl(gartFd, AGPIOC_ACQUIRE, 0) != 0) {

-			xf86DrvMsg(screenNum, X_WARNING,

-				"xf86AcquireGART: AGPIOC_ACQUIRE failed (%s)\n",

-				strerror(errno));

-			return FALSE;

-		}

-		acquiredScreen = screenNum;

-	}

-	return TRUE;

-}

-

-Bool

-xf86ReleaseGART(int screenNum)

-{

-	if (screenNum != -1 && !GARTInit(screenNum))

-		return FALSE;

-

-	if (acquiredScreen == screenNum) {

-		/*

-		 * The FreeBSD agp driver removes allocations on release.

-		 * The Linux driver doesn't.  xf86ReleaseGART() is expected

-		 * to give up access to the GART, but not to remove any

-		 * allocations.

-		 */

-#if !defined(linux)

-	    if (screenNum == -1)

-#endif

-	    {

-		if (ioctl(gartFd, AGPIOC_RELEASE, 0) != 0) {

-			xf86DrvMsg(screenNum, X_WARNING,

-				"xf86ReleaseGART: AGPIOC_RELEASE failed (%s)\n",

-				strerror(errno));

-			return FALSE;

-		}

-		acquiredScreen = -1;

-	    }

-	    return TRUE;

-	}

-	return FALSE;

-}

-

-int

-xf86AllocateGARTMemory(int screenNum, unsigned long size, int type,

-			unsigned long *physical)

-{

-	struct _agp_allocate alloc;

-	int pages;

-

-	/*

-	 * Allocates "size" bytes of GART memory (rounds up to the next

-	 * page multiple) or type "type".  A handle (key) for the allocated

-	 * memory is returned.  On error, the return value is -1.

-	 */

-

-	if (!GARTInit(screenNum) || acquiredScreen != screenNum)

-		return -1;

-

-	pages = (size / AGP_PAGE_SIZE);

-	if (size % AGP_PAGE_SIZE != 0)

-		pages++;

-

-	/* XXX check for pages == 0? */

-

-	alloc.pg_count = pages;

-	alloc.type = type;

-

-	if (ioctl(gartFd, AGPIOC_ALLOCATE, &alloc) != 0) {

-		xf86DrvMsg(screenNum, X_WARNING, "xf86AllocateGARTMemory: "

-			   "allocation of %d pages failed\n\t(%s)\n", pages,

-			   strerror(errno));

-		return -1;

-	}

-

-	if (physical)

-		*physical = alloc.physical;

-

-	return alloc.key;

-}

-

-Bool

-xf86DeallocateGARTMemory(int screenNum, int key)

-{

-	if (!GARTInit(screenNum) || acquiredScreen != screenNum)

-		return FALSE;

-

-	if (acquiredScreen != screenNum) {

-		xf86DrvMsg(screenNum, X_ERROR,

-                   "xf86UnbindGARTMemory: AGP not acquired by this screen\n");

-		return FALSE;

-	}

-

-#ifdef __linux__

-	if (ioctl(gartFd, AGPIOC_DEALLOCATE, (int *)(uintptr_t)key) != 0) {

-#else

-	if (ioctl(gartFd, AGPIOC_DEALLOCATE, &key) != 0) {

-#endif

-		xf86DrvMsg(screenNum, X_WARNING,"xf86DeAllocateGARTMemory: "

-                   "deallocation gart memory with key %d failed\n\t(%s)\n",

-                   key, strerror(errno));

-		return FALSE;

-	}

-

-	return TRUE;

-}

-

-/* Bind GART memory with "key" at "offset" */

-Bool

-xf86BindGARTMemory(int screenNum, int key, unsigned long offset)

-{

-	struct _agp_bind bind;

-	int pageOffset;

-

-	if (!GARTInit(screenNum) || acquiredScreen != screenNum)

-		return FALSE;

-

-	if (acquiredScreen != screenNum) {

-		xf86DrvMsg(screenNum, X_ERROR,

-		      "xf86BindGARTMemory: AGP not acquired by this screen\n");

-		return FALSE;

-	}

-

-	if (offset % AGP_PAGE_SIZE != 0) {

-		xf86DrvMsg(screenNum, X_WARNING, "xf86BindGARTMemory: "

-			   "offset (0x%lx) is not page-aligned (%d)\n",

-			   offset, AGP_PAGE_SIZE);

-		return FALSE;

-	}

-	pageOffset = offset / AGP_PAGE_SIZE;

-

-	xf86DrvMsgVerb(screenNum, X_INFO, 3,

-		       "xf86BindGARTMemory: bind key %d at 0x%08lx "

-		       "(pgoffset %d)\n", key, offset, pageOffset);

-

-	bind.pg_start = pageOffset;

-	bind.key = key;

-

-	if (ioctl(gartFd, AGPIOC_BIND, &bind) != 0) {

-		xf86DrvMsg(screenNum, X_WARNING, "xf86BindGARTMemory: "

-			   "binding of gart memory with key %d\n"

-			   "\tat offset 0x%lx failed (%s)\n",

-			   key, offset, strerror(errno));

-		return FALSE;

-	}

-

-	return TRUE;

-}

-

-

-/* Unbind GART memory with "key" */

-Bool

-xf86UnbindGARTMemory(int screenNum, int key)

-{

-	struct _agp_unbind unbind;

-

-	if (!GARTInit(screenNum) || acquiredScreen != screenNum)

-		return FALSE;

-

-	if (acquiredScreen != screenNum) {

-		xf86DrvMsg(screenNum, X_ERROR,

-		    "xf86UnbindGARTMemory: AGP not acquired by this screen\n");

-		return FALSE;

-	}

-

-	unbind.priority = 0;

-	unbind.key = key;

-

-	if (ioctl(gartFd, AGPIOC_UNBIND, &unbind) != 0) {

-		xf86DrvMsg(screenNum, X_WARNING, "xf86UnbindGARTMemory: "

-			   "unbinding of gart memory with key %d "

-			   "failed (%s)\n", key, strerror(errno));

-		return FALSE;

-	}

-

-	xf86DrvMsgVerb(screenNum, X_INFO, 3,

-		       "xf86UnbindGARTMemory: unbind key %d\n", key);

-

-	return TRUE;

-}

-

-

-/* XXX Interface may change. */

-Bool

-xf86EnableAGP(int screenNum, CARD32 mode)

-{

-	agp_setup setup;

-

-	if (!GARTInit(screenNum) || acquiredScreen != screenNum)

-		return FALSE;

-

-	setup.agp_mode = mode;

-	if (ioctl(gartFd, AGPIOC_SETUP, &setup) != 0) {

-		xf86DrvMsg(screenNum, X_WARNING, "xf86EnableAGP: "

-			   "AGPIOC_SETUP with mode %ld failed (%s)\n",

-			   (unsigned long)mode, strerror(errno));

-		return FALSE;

-	}

-

-	return TRUE;

-}

-

+/*
+ * Abstraction of the AGP GART interface.
+ *
+ * This version is for Linux and Free/Open/NetBSD.
+ *
+ * Copyright © 2000 VA Linux Systems, Inc.
+ * Copyright © 2001 The XFree86 Project, Inc.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+#include "xf86OSpriv.h"
+
+#if defined(linux)
+#include <asm/ioctl.h>
+#include <linux/agpgart.h>
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#include <sys/ioctl.h>
+#include <sys/agpio.h>
+#endif
+
+#ifndef AGP_DEVICE
+#define AGP_DEVICE		"/dev/agpgart"
+#endif
+/* AGP page size is independent of the host page size. */
+#ifndef AGP_PAGE_SIZE
+#define AGP_PAGE_SIZE		4096
+#endif
+#define AGPGART_MAJOR_VERSION	0
+#define AGPGART_MINOR_VERSION	99
+
+static int gartFd = -1;
+static int acquiredScreen = -1;
+static Bool initDone = FALSE;
+
+/*
+ * Close /dev/agpgart.  This frees all associated memory allocated during
+ * this server generation.
+ */
+Bool
+xf86GARTCloseScreen(int screenNum)
+{
+    if (gartFd != -1) {
+        close(gartFd);
+        acquiredScreen = -1;
+        gartFd = -1;
+        initDone = FALSE;
+    }
+    return TRUE;
+}
+
+/*
+ * Open /dev/agpgart.  Keep it open until xf86GARTCloseScreen is called.
+ */
+static Bool
+GARTInit(int screenNum)
+{
+    struct _agp_info agpinf;
+
+    if (initDone)
+        return gartFd != -1;
+
+    initDone = TRUE;
+
+    if (gartFd == -1)
+        gartFd = open(AGP_DEVICE, O_RDWR, 0);
+    else
+        return FALSE;
+
+    if (gartFd == -1) {
+        xf86DrvMsg(screenNum, X_ERROR,
+                   "GARTInit: Unable to open " AGP_DEVICE " (%s)\n",
+                   strerror(errno));
+        return FALSE;
+    }
+
+    xf86AcquireGART(-1);
+    /* Check the kernel driver version. */
+    if (ioctl(gartFd, AGPIOC_INFO, &agpinf) != 0) {
+        xf86DrvMsg(screenNum, X_ERROR,
+                   "GARTInit: AGPIOC_INFO failed (%s)\n", strerror(errno));
+        close(gartFd);
+        gartFd = -1;
+        return FALSE;
+    }
+    xf86ReleaseGART(-1);
+
+#if defined(linux)
+    /* Per Dave Jones, every effort will be made to keep the 
+     * agpgart interface backwards compatible, so allow all 
+     * future versions.
+     */
+    if (
+#if (AGPGART_MAJOR_VERSION > 0) /* quiet compiler */
+           agpinf.version.major < AGPGART_MAJOR_VERSION ||
+#endif
+           (agpinf.version.major == AGPGART_MAJOR_VERSION &&
+            agpinf.version.minor < AGPGART_MINOR_VERSION)) {
+        xf86DrvMsg(screenNum, X_ERROR,
+                   "GARTInit: Kernel agpgart driver version is not current"
+                   " (%d.%d vs %d.%d)\n",
+                   agpinf.version.major, agpinf.version.minor,
+                   AGPGART_MAJOR_VERSION, AGPGART_MINOR_VERSION);
+        close(gartFd);
+        gartFd = -1;
+        return FALSE;
+    }
+#endif
+
+    return TRUE;
+}
+
+Bool
+xf86AgpGARTSupported(void)
+{
+    return GARTInit(-1);
+}
+
+AgpInfoPtr
+xf86GetAGPInfo(int screenNum)
+{
+    struct _agp_info agpinf;
+    AgpInfoPtr info;
+
+    if (!GARTInit(screenNum))
+        return NULL;
+
+    if ((info = calloc(sizeof(AgpInfo), 1)) == NULL) {
+        xf86DrvMsg(screenNum, X_ERROR,
+                   "xf86GetAGPInfo: Failed to allocate AgpInfo\n");
+        return NULL;
+    }
+
+    memset((char *) &agpinf, 0, sizeof(agpinf));
+
+    if (ioctl(gartFd, AGPIOC_INFO, &agpinf) != 0) {
+        xf86DrvMsg(screenNum, X_ERROR,
+                   "xf86GetAGPInfo: AGPIOC_INFO failed (%s)\n",
+                   strerror(errno));
+        return NULL;
+    }
+
+    info->bridgeId = agpinf.bridge_id;
+    info->agpMode = agpinf.agp_mode;
+    info->base = agpinf.aper_base;
+    info->size = agpinf.aper_size;
+    info->totalPages = agpinf.pg_total;
+    info->systemPages = agpinf.pg_system;
+    info->usedPages = agpinf.pg_used;
+
+    xf86DrvMsg(screenNum, X_INFO, "Kernel reported %zu total, %zu used\n",
+               agpinf.pg_total, agpinf.pg_used);
+
+    return info;
+}
+
+/*
+ * XXX If multiple screens can acquire the GART, should we have a reference
+ * count instead of using acquiredScreen?
+ */
+
+Bool
+xf86AcquireGART(int screenNum)
+{
+    if (screenNum != -1 && !GARTInit(screenNum))
+        return FALSE;
+
+    if (screenNum == -1 || acquiredScreen != screenNum) {
+        if (ioctl(gartFd, AGPIOC_ACQUIRE, 0) != 0) {
+            xf86DrvMsg(screenNum, X_WARNING,
+                       "xf86AcquireGART: AGPIOC_ACQUIRE failed (%s)\n",
+                       strerror(errno));
+            return FALSE;
+        }
+        acquiredScreen = screenNum;
+    }
+    return TRUE;
+}
+
+Bool
+xf86ReleaseGART(int screenNum)
+{
+    if (screenNum != -1 && !GARTInit(screenNum))
+        return FALSE;
+
+    if (acquiredScreen == screenNum) {
+        /*
+         * The FreeBSD agp driver removes allocations on release.
+         * The Linux driver doesn't.  xf86ReleaseGART() is expected
+         * to give up access to the GART, but not to remove any
+         * allocations.
+         */
+#if !defined(linux)
+        if (screenNum == -1)
+#endif
+        {
+            if (ioctl(gartFd, AGPIOC_RELEASE, 0) != 0) {
+                xf86DrvMsg(screenNum, X_WARNING,
+                           "xf86ReleaseGART: AGPIOC_RELEASE failed (%s)\n",
+                           strerror(errno));
+                return FALSE;
+            }
+            acquiredScreen = -1;
+        }
+        return TRUE;
+    }
+    return FALSE;
+}
+
+int
+xf86AllocateGARTMemory(int screenNum, unsigned long size, int type,
+                       unsigned long *physical)
+{
+    struct _agp_allocate alloc;
+    int pages;
+
+    /*
+     * Allocates "size" bytes of GART memory (rounds up to the next
+     * page multiple) or type "type".  A handle (key) for the allocated
+     * memory is returned.  On error, the return value is -1.
+     */
+
+    if (!GARTInit(screenNum) || acquiredScreen != screenNum)
+        return -1;
+
+    pages = (size / AGP_PAGE_SIZE);
+    if (size % AGP_PAGE_SIZE != 0)
+        pages++;
+
+    /* XXX check for pages == 0? */
+
+    alloc.pg_count = pages;
+    alloc.type = type;
+
+    if (ioctl(gartFd, AGPIOC_ALLOCATE, &alloc) != 0) {
+        xf86DrvMsg(screenNum, X_WARNING, "xf86AllocateGARTMemory: "
+                   "allocation of %d pages failed\n\t(%s)\n", pages,
+                   strerror(errno));
+        return -1;
+    }
+
+    if (physical)
+        *physical = alloc.physical;
+
+    return alloc.key;
+}
+
+Bool
+xf86DeallocateGARTMemory(int screenNum, int key)
+{
+    if (!GARTInit(screenNum) || acquiredScreen != screenNum)
+        return FALSE;
+
+    if (acquiredScreen != screenNum) {
+        xf86DrvMsg(screenNum, X_ERROR,
+                   "xf86UnbindGARTMemory: AGP not acquired by this screen\n");
+        return FALSE;
+    }
+
+#ifdef __linux__
+    if (ioctl(gartFd, AGPIOC_DEALLOCATE, (int *) (uintptr_t) key) != 0) {
+#else
+    if (ioctl(gartFd, AGPIOC_DEALLOCATE, &key) != 0) {
+#endif
+        xf86DrvMsg(screenNum, X_WARNING, "xf86DeAllocateGARTMemory: "
+                   "deallocation gart memory with key %d failed\n\t(%s)\n",
+                   key, strerror(errno));
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/* Bind GART memory with "key" at "offset" */
+Bool
+xf86BindGARTMemory(int screenNum, int key, unsigned long offset)
+{
+    struct _agp_bind bind;
+    int pageOffset;
+
+    if (!GARTInit(screenNum) || acquiredScreen != screenNum)
+        return FALSE;
+
+    if (acquiredScreen != screenNum) {
+        xf86DrvMsg(screenNum, X_ERROR,
+                   "xf86BindGARTMemory: AGP not acquired by this screen\n");
+        return FALSE;
+    }
+
+    if (offset % AGP_PAGE_SIZE != 0) {
+        xf86DrvMsg(screenNum, X_WARNING, "xf86BindGARTMemory: "
+                   "offset (0x%lx) is not page-aligned (%d)\n",
+                   offset, AGP_PAGE_SIZE);
+        return FALSE;
+    }
+    pageOffset = offset / AGP_PAGE_SIZE;
+
+    xf86DrvMsgVerb(screenNum, X_INFO, 3,
+                   "xf86BindGARTMemory: bind key %d at 0x%08lx "
+                   "(pgoffset %d)\n", key, offset, pageOffset);
+
+    bind.pg_start = pageOffset;
+    bind.key = key;
+
+    if (ioctl(gartFd, AGPIOC_BIND, &bind) != 0) {
+        xf86DrvMsg(screenNum, X_WARNING, "xf86BindGARTMemory: "
+                   "binding of gart memory with key %d\n"
+                   "\tat offset 0x%lx failed (%s)\n",
+                   key, offset, strerror(errno));
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/* Unbind GART memory with "key" */
+Bool
+xf86UnbindGARTMemory(int screenNum, int key)
+{
+    struct _agp_unbind unbind;
+
+    if (!GARTInit(screenNum) || acquiredScreen != screenNum)
+        return FALSE;
+
+    if (acquiredScreen != screenNum) {
+        xf86DrvMsg(screenNum, X_ERROR,
+                   "xf86UnbindGARTMemory: AGP not acquired by this screen\n");
+        return FALSE;
+    }
+
+    unbind.priority = 0;
+    unbind.key = key;
+
+    if (ioctl(gartFd, AGPIOC_UNBIND, &unbind) != 0) {
+        xf86DrvMsg(screenNum, X_WARNING, "xf86UnbindGARTMemory: "
+                   "unbinding of gart memory with key %d "
+                   "failed (%s)\n", key, strerror(errno));
+        return FALSE;
+    }
+
+    xf86DrvMsgVerb(screenNum, X_INFO, 3,
+                   "xf86UnbindGARTMemory: unbind key %d\n", key);
+
+    return TRUE;
+}
+
+/* XXX Interface may change. */
+Bool
+xf86EnableAGP(int screenNum, CARD32 mode)
+{
+    agp_setup setup;
+
+    if (!GARTInit(screenNum) || acquiredScreen != screenNum)
+        return FALSE;
+
+    setup.agp_mode = mode;
+    if (ioctl(gartFd, AGPIOC_SETUP, &setup) != 0) {
+        xf86DrvMsg(screenNum, X_WARNING, "xf86EnableAGP: "
+                   "AGPIOC_SETUP with mode %ld failed (%s)\n",
+                   (unsigned long) mode, strerror(errno));
+        return FALSE;
+    }
+
+    return TRUE;
+}
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_apm.c b/xorg-server/hw/xfree86/os-support/linux/lnx_apm.c
index 54c698965..a37331e52 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_apm.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_apm.c
@@ -23,15 +23,15 @@ extern PMClose lnxACPIOpen(void);
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
- 
+
 #define APM_PROC   "/proc/apm"
 #define APM_DEVICE "/dev/apm_bios"
 
 #ifndef APM_STANDBY_FAILED
-# define APM_STANDBY_FAILED 0xf000
+#define APM_STANDBY_FAILED 0xf000
 #endif
 #ifndef APM_SUSPEND_FAILED
-# define APM_SUSPEND_FAILED 0xf001
+#define APM_SUSPEND_FAILED 0xf001
 #endif
 
 static PMClose lnxAPMOpen(void);
@@ -42,23 +42,26 @@ static struct {
     apm_event_t apmLinux;
     pmEvent xf86;
 } LinuxToXF86[] = {
-    { APM_SYS_STANDBY, XF86_APM_SYS_STANDBY },
-    { APM_SYS_SUSPEND, XF86_APM_SYS_SUSPEND },
-    { APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME },
-    { APM_CRITICAL_RESUME, XF86_APM_CRITICAL_RESUME },
-    { APM_LOW_BATTERY, XF86_APM_LOW_BATTERY },
-    { APM_POWER_STATUS_CHANGE, XF86_APM_POWER_STATUS_CHANGE },
-    { APM_UPDATE_TIME, XF86_APM_UPDATE_TIME },
-    { APM_CRITICAL_SUSPEND, XF86_APM_CRITICAL_SUSPEND },
-    { APM_USER_STANDBY, XF86_APM_USER_STANDBY },
-    { APM_USER_SUSPEND, XF86_APM_USER_SUSPEND },
-    { APM_STANDBY_RESUME, XF86_APM_STANDBY_RESUME },
+    {
+    APM_SYS_STANDBY, XF86_APM_SYS_STANDBY}, {
+    APM_SYS_SUSPEND, XF86_APM_SYS_SUSPEND}, {
+    APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME}, {
+    APM_CRITICAL_RESUME, XF86_APM_CRITICAL_RESUME}, {
+    APM_LOW_BATTERY, XF86_APM_LOW_BATTERY}, {
+    APM_POWER_STATUS_CHANGE, XF86_APM_POWER_STATUS_CHANGE}, {
+    APM_UPDATE_TIME, XF86_APM_UPDATE_TIME}, {
+    APM_CRITICAL_SUSPEND, XF86_APM_CRITICAL_SUSPEND}, {
+    APM_USER_STANDBY, XF86_APM_USER_STANDBY}, {
+    APM_USER_SUSPEND, XF86_APM_USER_SUSPEND}, {
+    APM_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
 #if defined(APM_CAPABILITY_CHANGED)
-    { APM_CAPABILITY_CHANGED, XF86_CAPABILITY_CHANGED },
+    {
+    APM_CAPABILITY_CHANGED, XF86_CAPABILITY_CHANGED},
 #endif
 #if 0
-    { APM_STANDBY_FAILED, XF86_APM_STANDBY_FAILED },
-    { APM_SUSPEND_FAILED, XF86_APM_SUSPEND_FAILED }
+    {
+    APM_STANDBY_FAILED, XF86_APM_STANDBY_FAILED}, {
+    APM_SUSPEND_FAILED, XF86_APM_SUSPEND_FAILED}
 #endif
 };
 
@@ -73,24 +76,24 @@ static struct {
  * event is reasonable.
  */
 static int
-lnxPMGetEventFromOs(int fd, pmEvent *events, int num)
+lnxPMGetEventFromOs(int fd, pmEvent * events, int num)
 {
-    int i,j,n;
+    int i, j, n;
     apm_event_t linuxEvents[8];
 
-    if ((n = read( fd, linuxEvents, num * sizeof(apm_event_t) )) == -1)
-	return 0;
+    if ((n = read(fd, linuxEvents, num * sizeof(apm_event_t))) == -1)
+        return 0;
     n /= sizeof(apm_event_t);
     if (n > num)
-	n = num;
+        n = num;
     for (i = 0; i < n; i++) {
-	for (j = 0; j < numApmEvents; j++)
-	    if (LinuxToXF86[j].apmLinux == linuxEvents[i]) {
-		events[i] = LinuxToXF86[j].xf86;
-		break;
-	    }
-	if (j == numApmEvents)
-	    events[i] = XF86_APM_UNKNOWN;
+        for (j = 0; j < numApmEvents; j++)
+            if (LinuxToXF86[j].apmLinux == linuxEvents[i]) {
+                events[i] = LinuxToXF86[j].xf86;
+                break;
+            }
+        if (j == numApmEvents)
+            events[i] = XF86_APM_UNKNOWN;
     }
     return n;
 }
@@ -101,55 +104,55 @@ lnxPMConfirmEventToOs(int fd, pmEvent event)
     switch (event) {
     case XF86_APM_SYS_STANDBY:
     case XF86_APM_USER_STANDBY:
-        if (ioctl( fd, APM_IOC_STANDBY, NULL ))
-	    return PM_FAILED;
-	return PM_CONTINUE;
+        if (ioctl(fd, APM_IOC_STANDBY, NULL))
+            return PM_FAILED;
+        return PM_CONTINUE;
     case XF86_APM_SYS_SUSPEND:
     case XF86_APM_CRITICAL_SUSPEND:
     case XF86_APM_USER_SUSPEND:
-	if (ioctl( fd, APM_IOC_SUSPEND, NULL )) {
-	    /* I believe this is wrong (EE)
-	       EBUSY is sent when a device refuses to be suspended.
-	       In this case we still need to undo everything we have
-	       done to suspend ourselves or we will stay in suspended
-	       state forever. */
-	    if (errno == EBUSY)
-		return PM_CONTINUE;
-	    else
-		return PM_FAILED;
-	}
-	return PM_CONTINUE;
+        if (ioctl(fd, APM_IOC_SUSPEND, NULL)) {
+            /* I believe this is wrong (EE)
+               EBUSY is sent when a device refuses to be suspended.
+               In this case we still need to undo everything we have
+               done to suspend ourselves or we will stay in suspended
+               state forever. */
+            if (errno == EBUSY)
+                return PM_CONTINUE;
+            else
+                return PM_FAILED;
+        }
+        return PM_CONTINUE;
     case XF86_APM_STANDBY_RESUME:
     case XF86_APM_NORMAL_RESUME:
     case XF86_APM_CRITICAL_RESUME:
     case XF86_APM_STANDBY_FAILED:
     case XF86_APM_SUSPEND_FAILED:
-	return PM_CONTINUE;
+        return PM_CONTINUE;
     default:
-	return PM_NONE;
+        return PM_NONE;
     }
 }
 
-#endif // HAVE_APM
+#endif                          // HAVE_APM
 
 PMClose
 xf86OSPMOpen(void)
 {
-	PMClose ret = NULL;
+    PMClose ret = NULL;
 
 #ifdef HAVE_ACPI
-	/* Favour ACPI over APM, but only when enabled */
+    /* Favour ACPI over APM, but only when enabled */
 
-	if (!xf86acpiDisableFlag)
-		ret = lnxACPIOpen();
+    if (!xf86acpiDisableFlag)
+        ret = lnxACPIOpen();
 
-	if (!ret)
+    if (!ret)
 #endif
 #ifdef HAVE_APM
-		ret = lnxAPMOpen();
+        ret = lnxAPMOpen();
 #endif
 
-	return ret;
+    return ret;
 }
 
 #ifdef HAVE_APM
@@ -157,27 +160,27 @@ xf86OSPMOpen(void)
 static PMClose
 lnxAPMOpen(void)
 {
-    int fd, pfd;    
+    int fd, pfd;
 
     DebugF("APM: OSPMOpen called\n");
     if (APMihPtr || !xf86Info.pmFlag)
-	return NULL;
-   
+        return NULL;
+
     DebugF("APM: Opening device\n");
-    if ((fd = open( APM_DEVICE, O_RDWR )) > -1) {
-	if (access( APM_PROC, R_OK ) ||
-	    ((pfd = open( APM_PROC, O_RDONLY)) == -1)) {
-	    xf86MsgVerb(X_WARNING,3,"Cannot open APM (%s) (%s)\n",
-			APM_PROC, strerror(errno));
-	    close(fd);
-	    return NULL;
-	} else
-	    close(pfd);
-	xf86PMGetEventFromOs = lnxPMGetEventFromOs;
-	xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;
-	APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
-	xf86MsgVerb(X_INFO,3,"Open APM successful\n");
-	return lnxCloseAPM;
+    if ((fd = open(APM_DEVICE, O_RDWR)) > -1) {
+        if (access(APM_PROC, R_OK) || ((pfd = open(APM_PROC, O_RDONLY)) == -1)) {
+            xf86MsgVerb(X_WARNING, 3, "Cannot open APM (%s) (%s)\n",
+                        APM_PROC, strerror(errno));
+            close(fd);
+            return NULL;
+        }
+        else
+            close(pfd);
+        xf86PMGetEventFromOs = lnxPMGetEventFromOs;
+        xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;
+        APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
+        xf86MsgVerb(X_INFO, 3, "Open APM successful\n");
+        return lnxCloseAPM;
     }
     return NULL;
 }
@@ -189,10 +192,10 @@ lnxCloseAPM(void)
 
     DebugF("APM: Closing device\n");
     if (APMihPtr) {
-	fd = xf86RemoveGeneralHandler(APMihPtr);
-	close(fd);
-	APMihPtr = NULL;
+        fd = xf86RemoveGeneralHandler(APMihPtr);
+        close(fd);
+        APMihPtr = NULL;
     }
 }
 
-#endif // HAVE_APM
+#endif                          // HAVE_APM
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_axp.c b/xorg-server/hw/xfree86/os-support/linux/lnx_axp.c
index 10fd9e865..d65a3a487 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_axp.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_axp.c
@@ -9,93 +9,95 @@
 
 axpDevice lnxGetAXP(void);
 
-typedef struct 
- { char* sysName; 
-   char* sysVari; 
-   char* cpu; 
-   axpDevice sys; }
-AXP;
+typedef struct {
+    char *sysName;
+    char *sysVari;
+    char *cpu;
+    axpDevice sys;
+} AXP;
 
 static AXP axpList[] = {
-  { "Tsunami", NULL, NULL, TSUNAMI },
-  { "Eiger", NULL, NULL, TSUNAMI }, 
-  {"Noname", NULL, NULL, LCA },
-  { "AlphaBook1", NULL, NULL, LCA }, 
-  {"EB66", NULL, NULL, LCA}, 
-  {"EB64+",NULL,NULL, APECS}, 
-  {"Noritake",NULL,"EV5",CIA},
-  {"Noritake",NULL,"EV56",CIA},
-  {"Noritake",NULL,NULL,APECS},
-  {"XL",NULL,NULL,APECS},              
-  {"Avanti",NULL,NULL,APECS},
-  {"Mikasa",NULL,"EV5",CIA},
-  {"Mikasa",NULL,"EV56",CIA},
-  {"Mikasa",NULL,NULL,APECS},
-  {"EB164","EB164",NULL,CIA},
-  {"EB164","PC164", NULL,CIA},
-  {"EB164","LX164",NULL, PYXIS},
-  {"EB164","SX164",NULL, PYXIS},
-  {"EB164","RX164",NULL, POLARIS},
-  {"Alcor",NULL,NULL,CIA},
-  {"Takara",NULL,NULL,CIA},
-  {"Sable",NULL, "EV5",T2_GAMMA},
-  {"Sable",NULL,"EV56",T2_GAMMA},
-  {"Sable",NULL,NULL,T2},
-  {"Rawhide",NULL,NULL,MCPCIA},
-  {"Jensen",NULL,NULL,JENSEN},
-  {"Miata",NULL,NULL,PYXIS_CIA},
-  {"Ruffian",NULL,NULL,PYXIS_CIA},
-  {"Nautilus",NULL,NULL,IRONGATE},
-  {NULL,NULL,NULL,SYS_NONE}
+    {"Tsunami", NULL, NULL, TSUNAMI},
+    {"Eiger", NULL, NULL, TSUNAMI},
+    {"Noname", NULL, NULL, LCA},
+    {"AlphaBook1", NULL, NULL, LCA},
+    {"EB66", NULL, NULL, LCA},
+    {"EB64+", NULL, NULL, APECS},
+    {"Noritake", NULL, "EV5", CIA},
+    {"Noritake", NULL, "EV56", CIA},
+    {"Noritake", NULL, NULL, APECS},
+    {"XL", NULL, NULL, APECS},
+    {"Avanti", NULL, NULL, APECS},
+    {"Mikasa", NULL, "EV5", CIA},
+    {"Mikasa", NULL, "EV56", CIA},
+    {"Mikasa", NULL, NULL, APECS},
+    {"EB164", "EB164", NULL, CIA},
+    {"EB164", "PC164", NULL, CIA},
+    {"EB164", "LX164", NULL, PYXIS},
+    {"EB164", "SX164", NULL, PYXIS},
+    {"EB164", "RX164", NULL, POLARIS},
+    {"Alcor", NULL, NULL, CIA},
+    {"Takara", NULL, NULL, CIA},
+    {"Sable", NULL, "EV5", T2_GAMMA},
+    {"Sable", NULL, "EV56", T2_GAMMA},
+    {"Sable", NULL, NULL, T2},
+    {"Rawhide", NULL, NULL, MCPCIA},
+    {"Jensen", NULL, NULL, JENSEN},
+    {"Miata", NULL, NULL, PYXIS_CIA},
+    {"Ruffian", NULL, NULL, PYXIS_CIA},
+    {"Nautilus", NULL, NULL, IRONGATE},
+    {NULL, NULL, NULL, SYS_NONE}
 };
 
-
 axpDevice
 lnxGetAXP(void)
 {
-  FILE *file;
-  int count = 0;
-  char res[256];
-  char cpu[255];
-  char systype[255];
-  char sysvari[255];
-  if (!(file = fopen("/proc/cpuinfo","r")))
-    return SYS_NONE;
-  do {
-    if (!fgets(res,0xff,file)) return SYS_NONE;
-    switch (count) {
-    case 1:
-      sscanf(res, "cpu model : %s",cpu);
-      DebugF("CPU %s\n",cpu);
-      break;
-    case 5:
-      sscanf(res, "system type : %s",systype);
-      DebugF("system type : %s\n",systype);
-      break;
-    case 6:
-      sscanf(res, "system variation : %s",sysvari);
-      DebugF("system variation: %s\n",sysvari);
-      break;
-    }
-    count++;
-  } while (count < 8);
-  
-  fclose(file);
-  
-  count = 0;
-  
-  do {
-    if (!axpList[count].sysName || !strcmp(axpList[count].sysName,systype)) {
-      if (axpList[count].sysVari && strcmp(axpList[count].sysVari,sysvari)) {
-	count++;
-	continue;
-      };
-      if (axpList[count].cpu && strcmp(axpList[count].cpu,cpu)) {
-	count++;
-	continue;
-      }
-      return axpList[count].sys;
-    } 
-	count++;
-  } while (1);
+    FILE *file;
+    int count = 0;
+    char res[256];
+    char cpu[255];
+    char systype[255];
+    char sysvari[255];
+
+    if (!(file = fopen("/proc/cpuinfo", "r")))
+        return SYS_NONE;
+    do {
+        if (!fgets(res, 0xff, file))
+            return SYS_NONE;
+        switch (count) {
+        case 1:
+            sscanf(res, "cpu model : %s", cpu);
+            DebugF("CPU %s\n", cpu);
+            break;
+        case 5:
+            sscanf(res, "system type : %s", systype);
+            DebugF("system type : %s\n", systype);
+            break;
+        case 6:
+            sscanf(res, "system variation : %s", sysvari);
+            DebugF("system variation: %s\n", sysvari);
+            break;
+        }
+        count++;
+    } while (count < 8);
+
+    fclose(file);
+
+    count = 0;
+
+    do {
+        if (!axpList[count].sysName || !strcmp(axpList[count].sysName, systype)) {
+            if (axpList[count].sysVari &&
+                strcmp(axpList[count].sysVari, sysvari)) {
+                count++;
+                continue;
+            };
+            if (axpList[count].cpu && strcmp(axpList[count].cpu, cpu)) {
+                count++;
+                continue;
+            }
+            return axpList[count].sys;
+        }
+        count++;
+    } while (1);
 }
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
index 2176985f9..68c296b0f 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
@@ -43,7 +43,7 @@ static int activeVT = -1;
 
 static char vtname[11];
 static struct termios tty_attr; /* tty state to restore */
-static int tty_mode; /* kbd mode to restore */
+static int tty_mode;            /* kbd mode to restore */
 
 static void
 drain_console(int fd, void *closure)
@@ -61,11 +61,11 @@ switch_to(int vt, const char *from)
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
     if (ret < 0)
-	FatalError("%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
+        FatalError("%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
     if (ret < 0)
-	FatalError("%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
+        FatalError("%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
 }
 
 void
@@ -80,171 +80,169 @@ xf86OpenConsole(void)
 
     if (serverGeneration == 1) {
 
-	/* when KeepTty check if we're run with euid==0 */
-	if (KeepTty && geteuid() != 0) 
-	    FatalError("xf86OpenConsole:"
-		       " Server must be suid root for option \"KeepTTY\"\n");
-
-	/*
-	 * setup the virtual terminal manager
-	 */
-	if (xf86Info.vtno != -1) {
-	    from = X_CMDLINE;
-	} else {
-
-	    i=0;
-	    while (tty0[i] != NULL) {
-		if ((fd = open(tty0[i],O_WRONLY,0)) >= 0)
-		  break;
-		i++;
-	    }
-	    
-	    if (fd < 0)
-		FatalError(
-		    "xf86OpenConsole: Cannot open /dev/tty0 (%s)\n",
-		    strerror(errno));
-
-            if (xf86Info.ShareVTs)
-            {
-		SYSCALL(ret = ioctl(fd, VT_GETSTATE, &vts));
-		if (ret < 0)
-		    FatalError("xf86OpenConsole: Cannot find the current"
-			       " VT (%s)\n", strerror(errno));
+        /* when KeepTty check if we're run with euid==0 */
+        if (KeepTty && geteuid() != 0)
+            FatalError("xf86OpenConsole:"
+                       " Server must be suid root for option \"KeepTTY\"\n");
+
+        /*
+         * setup the virtual terminal manager
+         */
+        if (xf86Info.vtno != -1) {
+            from = X_CMDLINE;
+        }
+        else {
+
+            i = 0;
+            while (tty0[i] != NULL) {
+                if ((fd = open(tty0[i], O_WRONLY, 0)) >= 0)
+                    break;
+                i++;
+            }
+
+            if (fd < 0)
+                FatalError("xf86OpenConsole: Cannot open /dev/tty0 (%s)\n",
+                           strerror(errno));
+
+            if (xf86Info.ShareVTs) {
+                SYSCALL(ret = ioctl(fd, VT_GETSTATE, &vts));
+                if (ret < 0)
+                    FatalError("xf86OpenConsole: Cannot find the current"
+                               " VT (%s)\n", strerror(errno));
                 xf86Info.vtno = vts.v_active;
-            } else {
-		SYSCALL(ret = ioctl(fd, VT_OPENQRY, &xf86Info.vtno));
-		if (ret < 0)
-		    FatalError("xf86OpenConsole: Cannot find a free VT: "
-			       "%s\n", strerror(errno));
-		if (xf86Info.vtno == -1)
-		    FatalError("xf86OpenConsole: Cannot find a free VT\n");
-	    }
-	    close(fd);
-	}
-
-	xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
-
-	if (!KeepTty) {
-	    pid_t ppid = getppid();
-	    pid_t ppgid;
-	    ppgid = getpgid(ppid);
-
-	    /*
-	     * change to parent process group that pgid != pid so
-	     * that setsid() doesn't fail and we become process
-	     * group leader
-	     */
-	    if (setpgid(0,ppgid) < 0)
-		xf86Msg(X_WARNING, "xf86OpenConsole: setpgid failed: %s\n",
-			strerror(errno));
-
-	    /* become process group leader */
-	    if ((setsid() < 0))
-		xf86Msg(X_WARNING, "xf86OpenConsole: setsid failed: %s\n",
-			strerror(errno));
-	}
-
-        i=0;
+            }
+            else {
+                SYSCALL(ret = ioctl(fd, VT_OPENQRY, &xf86Info.vtno));
+                if (ret < 0)
+                    FatalError("xf86OpenConsole: Cannot find a free VT: "
+                               "%s\n", strerror(errno));
+                if (xf86Info.vtno == -1)
+                    FatalError("xf86OpenConsole: Cannot find a free VT\n");
+            }
+            close(fd);
+        }
+
+        xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
+
+        if (!KeepTty) {
+            pid_t ppid = getppid();
+            pid_t ppgid;
+
+            ppgid = getpgid(ppid);
+
+            /*
+             * change to parent process group that pgid != pid so
+             * that setsid() doesn't fail and we become process
+             * group leader
+             */
+            if (setpgid(0, ppgid) < 0)
+                xf86Msg(X_WARNING, "xf86OpenConsole: setpgid failed: %s\n",
+                        strerror(errno));
+
+            /* become process group leader */
+            if ((setsid() < 0))
+                xf86Msg(X_WARNING, "xf86OpenConsole: setsid failed: %s\n",
+                        strerror(errno));
+        }
+
+        i = 0;
         while (vcs[i] != NULL) {
-            snprintf(vtname, sizeof(vtname), vcs[i], xf86Info.vtno); /* /dev/tty1-64 */
-     	    if ((xf86Info.consoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) >= 0)
-		break;
+            snprintf(vtname, sizeof(vtname), vcs[i], xf86Info.vtno);    /* /dev/tty1-64 */
+            if ((xf86Info.consoleFd = open(vtname, O_RDWR | O_NDELAY, 0)) >= 0)
+                break;
             i++;
         }
 
-	if (xf86Info.consoleFd < 0)
-	    FatalError("xf86OpenConsole: Cannot open virtual console"
-		       " %d (%s)\n", xf86Info.vtno, strerror(errno));
-
-	/*
-	 * Linux doesn't switch to an active vt after the last close of a vt,
-	 * so we do this ourselves by remembering which is active now.
-	 */
-	SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
-	if (ret < 0)
-	    xf86Msg(X_WARNING,"xf86OpenConsole: VT_GETSTATE failed: %s\n",
-		    strerror(errno));
-	else
-	    activeVT = vts.v_active;
+        if (xf86Info.consoleFd < 0)
+            FatalError("xf86OpenConsole: Cannot open virtual console"
+                       " %d (%s)\n", xf86Info.vtno, strerror(errno));
+
+        /*
+         * Linux doesn't switch to an active vt after the last close of a vt,
+         * so we do this ourselves by remembering which is active now.
+         */
+        SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
+        if (ret < 0)
+            xf86Msg(X_WARNING, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
+                    strerror(errno));
+        else
+            activeVT = vts.v_active;
 
 #if 0
-	if (!KeepTty) {
-	    /*
-	     * Detach from the controlling tty to avoid char loss
-	     */
-	    if ((i = open("/dev/tty",O_RDWR)) >= 0) {
-		SYSCALL(ioctl(i, TIOCNOTTY, 0));
-		close(i);
-	    }
-	}
+        if (!KeepTty) {
+            /*
+             * Detach from the controlling tty to avoid char loss
+             */
+            if ((i = open("/dev/tty", O_RDWR)) >= 0) {
+                SYSCALL(ioctl(i, TIOCNOTTY, 0));
+                close(i);
+            }
+        }
 #endif
 
-        if (!xf86Info.ShareVTs)
-        {
+        if (!xf86Info.ShareVTs) {
             struct termios nTty;
 
-	    /*
-	     * now get the VT.  This _must_ succeed, or else fail completely.
-	     */
+            /*
+             * now get the VT.  This _must_ succeed, or else fail completely.
+             */
             switch_to(xf86Info.vtno, "xf86OpenConsole");
 
-	    SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
-	    if (ret < 0)
-		FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
-			   strerror(errno));
+            SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
+            if (ret < 0)
+                FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
+                           strerror(errno));
 
-	    signal(SIGUSR1, xf86VTRequest);
+            signal(SIGUSR1, xf86VTRequest);
 
-	    VT.mode = VT_PROCESS;
-	    VT.relsig = SIGUSR1;
-	    VT.acqsig = SIGUSR1;
+            VT.mode = VT_PROCESS;
+            VT.relsig = SIGUSR1;
+            VT.acqsig = SIGUSR1;
 
-	    SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
-	    if (ret < 0)
-		FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed: %s\n",
-		    strerror(errno));
+            SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
+            if (ret < 0)
+                FatalError
+                    ("xf86OpenConsole: VT_SETMODE VT_PROCESS failed: %s\n",
+                     strerror(errno));
 
-	    SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
-	    if (ret < 0)
-		FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed %s\n",
-			   strerror(errno));
+            SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
+            if (ret < 0)
+                FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed %s\n",
+                           strerror(errno));
 
             tcgetattr(xf86Info.consoleFd, &tty_attr);
-	    SYSCALL(ioctl(xf86Info.consoleFd, KDGKBMODE, &tty_mode));
+            SYSCALL(ioctl(xf86Info.consoleFd, KDGKBMODE, &tty_mode));
 
 #ifdef K_OFF
-	    /* disable kernel special keys and buffering */
-	    SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_OFF));
-	    if (ret < 0)
+            /* disable kernel special keys and buffering */
+            SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_OFF));
+            if (ret < 0)
 #endif
-	    {
-		SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_RAW));
-		if (ret < 0)
-		    FatalError("xf86OpenConsole: KDSKBMODE K_RAW failed %s\n",
-			    strerror(errno));
+            {
+                SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_RAW));
+                if (ret < 0)
+                    FatalError("xf86OpenConsole: KDSKBMODE K_RAW failed %s\n",
+                               strerror(errno));
 
-		/* need to keep the buffer clean, else the kernel gets angry */
-		xf86SetConsoleHandler(drain_console, NULL);
-	    }
+                /* need to keep the buffer clean, else the kernel gets angry */
+                xf86SetConsoleHandler(drain_console, NULL);
+            }
 
             nTty = tty_attr;
             nTty.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP);
             nTty.c_oflag = 0;
             nTty.c_cflag = CREAD | CS8;
             nTty.c_lflag = 0;
-            nTty.c_cc[VTIME]=0;
-            nTty.c_cc[VMIN]=1;
+            nTty.c_cc[VTIME] = 0;
+            nTty.c_cc[VMIN] = 1;
             cfsetispeed(&nTty, 9600);
             cfsetospeed(&nTty, 9600);
             tcsetattr(xf86Info.consoleFd, TCSANOW, &nTty);
-
-	    /* we really should have a InitOSInputDevices() function instead
-	     * of Init?$#*&Device(). So I just place it here */
         }
-    } else { 	/* serverGeneration != 1 */
-        if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch)
-        {
-	    /* now get the VT */
+    }
+    else {                      /* serverGeneration != 1 */
+        if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch) {
+            /* now get the VT */
             switch_to(xf86Info.vtno, "xf86OpenConsole");
         }
     }
@@ -253,7 +251,7 @@ xf86OpenConsole(void)
 void
 xf86CloseConsole(void)
 {
-    struct vt_mode   VT;
+    struct vt_mode VT;
     int ret;
 
     if (xf86Info.ShareVTs) {
@@ -270,68 +268,64 @@ xf86CloseConsole(void)
     /* Back to text mode ... */
     SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT));
     if (ret < 0)
-	xf86Msg(X_WARNING, "xf86CloseConsole: KDSETMODE failed: %s\n",
-		strerror(errno));
+        xf86Msg(X_WARNING, "xf86CloseConsole: KDSETMODE failed: %s\n",
+                strerror(errno));
 
     SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode));
     tcsetattr(xf86Info.consoleFd, TCSANOW, &tty_attr);
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
     if (ret < 0)
-	xf86Msg(X_WARNING, "xf86CloseConsole: VT_GETMODE failed: %s\n",
-		strerror(errno));
+        xf86Msg(X_WARNING, "xf86CloseConsole: VT_GETMODE failed: %s\n",
+                strerror(errno));
     else {
-	/* set dflt vt handling */
-	VT.mode = VT_AUTO;
-	SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
-	if (ret < 0)
-	    xf86Msg(X_WARNING, "xf86CloseConsole: VT_SETMODE failed: %s\n",
-		    strerror(errno));
+        /* set dflt vt handling */
+        VT.mode = VT_AUTO;
+        SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
+        if (ret < 0)
+            xf86Msg(X_WARNING, "xf86CloseConsole: VT_SETMODE failed: %s\n",
+                    strerror(errno));
     }
 
-    if (xf86Info.autoVTSwitch)
-    {
+    if (xf86Info.autoVTSwitch) {
         /*
          * Perform a switch back to the active VT when we were started
          */
         if (activeVT >= 0) {
             switch_to(activeVT, "xf86CloseConsole");
-	    activeVT = -1;
+            activeVT = -1;
         }
     }
-    close(xf86Info.consoleFd);	/* make the vt-manager happy */
+    close(xf86Info.consoleFd);  /* make the vt-manager happy */
 }
 
 int
 xf86ProcessArgument(int argc, char *argv[], int i)
 {
-	/*
-	 * Keep server from detaching from controlling tty.  This is useful
-	 * when debugging (so the server can receive keyboard signals.
-	 */
-	if (!strcmp(argv[i], "-keeptty"))
-	{
-		KeepTty = TRUE;
-		return 1;
-	}
-
-	if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
-	{
-		if (sscanf(argv[i], "vt%2d", &xf86Info.vtno) == 0)
-		{
-			UseMsg();
-			xf86Info.vtno = -1;
-			return 0;
-		}
-		return 1;
-	}
-	return 0;
+    /*
+     * Keep server from detaching from controlling tty.  This is useful
+     * when debugging (so the server can receive keyboard signals.
+     */
+    if (!strcmp(argv[i], "-keeptty")) {
+        KeepTty = TRUE;
+        return 1;
+    }
+
+    if ((argv[i][0] == 'v') && (argv[i][1] == 't')) {
+        if (sscanf(argv[i], "vt%2d", &xf86Info.vtno) == 0) {
+            UseMsg();
+            xf86Info.vtno = -1;
+            return 0;
+        }
+        return 1;
+    }
+    return 0;
 }
 
 void
 xf86UseMsg(void)
 {
-	ErrorF("vtXX                   use the specified VT number\n");
-	ErrorF("-keeptty               ");
-	ErrorF("don't detach controlling tty (for debugging only)\n");
+    ErrorF("vtXX                   use the specified VT number\n");
+    ErrorF("-keeptty               ");
+    ErrorF("don't detach controlling tty (for debugging only)\n");
 }
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c
index 0d91f7a52..3526a21d4 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c
@@ -70,10 +70,10 @@ extern int iopl(int __level);
 #endif
 
 #ifdef __alpha__
-# define BUS_BASE bus_base
-#else 
+#define BUS_BASE bus_base
+#else
 #define BUS_BASE (0)
-#endif /*  __alpha__ */
+#endif                          /*  __alpha__ */
 
 /***************************************************************************/
 /* Video Memory Mapping section                                            */
@@ -81,10 +81,11 @@ extern int iopl(int __level);
 
 static pointer mapVidMem(int, unsigned long, unsigned long, int);
 static void unmapVidMem(int, pointer, unsigned long);
-#if defined (__alpha__) 
+
+#if defined (__alpha__)
 extern void sethae(unsigned long hae);
-extern unsigned long _bus_base __P ((void)) __attribute__ ((const));
-extern unsigned long _bus_base_sparse __P ((void)) __attribute__ ((const));
+extern unsigned long _bus_base __P((void)) __attribute__ ((const));
+extern unsigned long _bus_base_sparse __P((void)) __attribute__ ((const));
 
 static pointer mapVidMemSparse(int, unsigned long, unsigned long, int);
 extern axpDevice lnxGetAXP(void);
@@ -105,9 +106,9 @@ static void undoWC(int, pointer);
 
 /* The file desc for /proc/mtrr. Once opened, left opened, and the mtrr
    driver will clean up when we exit. */
-#define MTRR_FD_UNOPENED (-1)	/* We have yet to open /proc/mtrr */
-#define MTRR_FD_PROBLEM (-2)	/* We tried to open /proc/mtrr, but had
-				   a problem. */
+#define MTRR_FD_UNOPENED (-1)   /* We have yet to open /proc/mtrr */
+#define MTRR_FD_PROBLEM (-2)    /* We tried to open /proc/mtrr, but had
+                                   a problem. */
 static int mtrr_fd = MTRR_FD_UNOPENED;
 
 /* Open /proc/mtrr. FALSE on failure. Will always fail on Linux 2.0, 
@@ -116,29 +117,29 @@ static int mtrr_fd = MTRR_FD_UNOPENED;
 static Bool
 mtrr_open(int verbosity)
 {
-	/* Only report absence of /proc/mtrr once. */
-	static Bool warned = FALSE;
-
-	if (mtrr_fd == MTRR_FD_UNOPENED) { 
-		mtrr_fd = open("/proc/mtrr", O_WRONLY);
-
-		if (mtrr_fd < 0)
-			mtrr_fd = MTRR_FD_PROBLEM;
-	}
-
-	if (mtrr_fd == MTRR_FD_PROBLEM) {
-		/* To make sure we only ever warn once, need to check
-		   verbosity outside xf86MsgVerb */
-		if (!warned && verbosity <= xf86GetVerbosity()) {
-			xf86MsgVerb(X_WARNING, verbosity,
-				  "System lacks support for changing MTRRs\n");
-			warned = TRUE;
-		}
-
-		return FALSE;
-	}
-	else
-		return TRUE;
+    /* Only report absence of /proc/mtrr once. */
+    static Bool warned = FALSE;
+
+    if (mtrr_fd == MTRR_FD_UNOPENED) {
+        mtrr_fd = open("/proc/mtrr", O_WRONLY);
+
+        if (mtrr_fd < 0)
+            mtrr_fd = MTRR_FD_PROBLEM;
+    }
+
+    if (mtrr_fd == MTRR_FD_PROBLEM) {
+        /* To make sure we only ever warn once, need to check
+           verbosity outside xf86MsgVerb */
+        if (!warned && verbosity <= xf86GetVerbosity()) {
+            xf86MsgVerb(X_WARNING, verbosity,
+                        "System lacks support for changing MTRRs\n");
+            warned = TRUE;
+        }
+
+        return FALSE;
+    }
+    else
+        return TRUE;
 }
 
 /*
@@ -147,260 +148,257 @@ mtrr_open(int verbosity)
  */
 
 struct mtrr_wc_region {
-	struct mtrr_sentry	sentry;
-	Bool			added;		/* added WC or removed it */
-	struct mtrr_wc_region *	next;
+    struct mtrr_sentry sentry;
+    Bool added;                 /* added WC or removed it */
+    struct mtrr_wc_region *next;
 };
 
-
 static struct mtrr_wc_region *
 mtrr_cull_wc_region(int screenNum, unsigned long base, unsigned long size,
-		      MessageType from)
+                    MessageType from)
 {
-	/* Some BIOS writers thought that setting wc over the mmio
-	   region of a graphics devices was a good idea. Try to fix
-	   it. */
-
-	struct mtrr_gentry gent;
-	struct mtrr_wc_region *wcreturn = NULL, *wcr;
-	int count, ret=0;
-
-	/* Linux 2.0 users should not get a warning without -verbose */
-	if (!mtrr_open(2))
-		return NULL;
-
-	for (gent.regnum = 0; 
-	     ioctl(mtrr_fd, MTRRIOC_GET_ENTRY, &gent) >= 0;
-	     gent.regnum++) {
-		if (gent.type != MTRR_TYPE_WRCOMB
-		    || gent.base + gent.size <= base
-		    || base + size <= gent.base)
-			continue;
-
-		/* Found an overlapping region. Delete it. */
-		
-		wcr = malloc(sizeof(*wcr));
-		if (!wcr)
-			return NULL;
-		wcr->sentry.base = gent.base;
-		wcr->sentry.size = gent.size;
-		wcr->sentry.type = MTRR_TYPE_WRCOMB;
-		wcr->added = FALSE;
-		
-		count = 3;
-		while (count-- && 
-		       (ret = ioctl(mtrr_fd, MTRRIOC_KILL_ENTRY, &(wcr->sentry))) < 0);
-		
-		if (ret >= 0) {
-			xf86DrvMsg(screenNum, from,
-				   "Removed MMIO write-combining range "
-				   "(0x%lx,0x%lx)\n",
-				   (unsigned long) gent.base, (unsigned long) gent.size);
-			wcr->next = wcreturn;
-			wcreturn = wcr;
-			gent.regnum--;
-		} else {
-			free(wcr);
-			xf86DrvMsgVerb(screenNum, X_WARNING, 0,
-				   "Failed to remove MMIO "
-				   "write-combining range (0x%lx,0x%lx)\n",
-				       gent.base, (unsigned long) gent.size);
-		}
-	}
-	return wcreturn;
-}
+    /* Some BIOS writers thought that setting wc over the mmio
+       region of a graphics devices was a good idea. Try to fix
+       it. */
 
+    struct mtrr_gentry gent;
+    struct mtrr_wc_region *wcreturn = NULL, *wcr;
+    int count, ret = 0;
+
+    /* Linux 2.0 users should not get a warning without -verbose */
+    if (!mtrr_open(2))
+        return NULL;
+
+    for (gent.regnum = 0;
+         ioctl(mtrr_fd, MTRRIOC_GET_ENTRY, &gent) >= 0; gent.regnum++) {
+        if (gent.type != MTRR_TYPE_WRCOMB
+            || gent.base + gent.size <= base || base + size <= gent.base)
+            continue;
+
+        /* Found an overlapping region. Delete it. */
+
+        wcr = malloc(sizeof(*wcr));
+        if (!wcr)
+            return NULL;
+        wcr->sentry.base = gent.base;
+        wcr->sentry.size = gent.size;
+        wcr->sentry.type = MTRR_TYPE_WRCOMB;
+        wcr->added = FALSE;
+
+        count = 3;
+        while (count-- &&
+               (ret = ioctl(mtrr_fd, MTRRIOC_KILL_ENTRY, &(wcr->sentry))) < 0);
+
+        if (ret >= 0) {
+            xf86DrvMsg(screenNum, from,
+                       "Removed MMIO write-combining range "
+                       "(0x%lx,0x%lx)\n",
+                       (unsigned long) gent.base, (unsigned long) gent.size);
+            wcr->next = wcreturn;
+            wcreturn = wcr;
+            gent.regnum--;
+        }
+        else {
+            free(wcr);
+            xf86DrvMsgVerb(screenNum, X_WARNING, 0,
+                           "Failed to remove MMIO "
+                           "write-combining range (0x%lx,0x%lx)\n",
+                           gent.base, (unsigned long) gent.size);
+        }
+    }
+    return wcreturn;
+}
 
 static struct mtrr_wc_region *
 mtrr_remove_offending(int screenNum, unsigned long base, unsigned long size,
-		      MessageType from)
+                      MessageType from)
 {
     struct mtrr_gentry gent;
     struct mtrr_wc_region *wcreturn = NULL, **wcr;
 
     if (!mtrr_open(2))
-	return NULL;
+        return NULL;
 
     wcr = &wcreturn;
-    for (gent.regnum = 0; 
-	 ioctl(mtrr_fd, MTRRIOC_GET_ENTRY, &gent) >= 0; gent.regnum++ ) {
-	if (gent.type == MTRR_TYPE_WRCOMB
-	    && ((gent.base >= base && gent.base + gent.size < base + size) || 
-		(gent.base >  base && gent.base + gent.size <= base + size))) {
-	    *wcr = mtrr_cull_wc_region(screenNum, gent.base, gent.size, from);
-	    if (*wcr) gent.regnum--;
-	    while(*wcr) {
-		wcr = &((*wcr)->next);
-	    }
-	}
+    for (gent.regnum = 0;
+         ioctl(mtrr_fd, MTRRIOC_GET_ENTRY, &gent) >= 0; gent.regnum++) {
+        if (gent.type == MTRR_TYPE_WRCOMB
+            && ((gent.base >= base && gent.base + gent.size < base + size) ||
+                (gent.base > base && gent.base + gent.size <= base + size))) {
+            *wcr = mtrr_cull_wc_region(screenNum, gent.base, gent.size, from);
+            if (*wcr)
+                gent.regnum--;
+            while (*wcr) {
+                wcr = &((*wcr)->next);
+            }
+        }
     }
     return wcreturn;
 }
 
-
 static struct mtrr_wc_region *
 mtrr_add_wc_region(int screenNum, unsigned long base, unsigned long size,
-		   MessageType from)
+                   MessageType from)
 {
-        struct mtrr_wc_region **wcr, *wcreturn, *curwcr;
+    struct mtrr_wc_region **wcr, *wcreturn, *curwcr;
 
-       /*
-        * There can be only one....
-        */
+    /*
+     * There can be only one....
+     */
 
-	wcreturn = mtrr_remove_offending(screenNum, base, size, from);
-	wcr = &wcreturn;
-	while (*wcr) {
-	    wcr = &((*wcr)->next);
-	} 
+    wcreturn = mtrr_remove_offending(screenNum, base, size, from);
+    wcr = &wcreturn;
+    while (*wcr) {
+        wcr = &((*wcr)->next);
+    }
 
-	/* Linux 2.0 should not warn, unless the user explicitly asks for
-	   WC. */
+    /* Linux 2.0 should not warn, unless the user explicitly asks for
+       WC. */
 
-	if (!mtrr_open(from == X_CONFIG ? 0 : 2))
-		return wcreturn;
+    if (!mtrr_open(from == X_CONFIG ? 0 : 2))
+        return wcreturn;
 
-	*wcr = curwcr = malloc(sizeof(**wcr));
-	if (!curwcr)
-	    return wcreturn;
+    *wcr = curwcr = malloc(sizeof(**wcr));
+    if (!curwcr)
+        return wcreturn;
 
-	curwcr->sentry.base = base;
-	curwcr->sentry.size = size;
-	curwcr->sentry.type = MTRR_TYPE_WRCOMB;
-	curwcr->added = TRUE;
-	curwcr->next = NULL;
+    curwcr->sentry.base = base;
+    curwcr->sentry.size = size;
+    curwcr->sentry.type = MTRR_TYPE_WRCOMB;
+    curwcr->added = TRUE;
+    curwcr->next = NULL;
 
 #if SPLIT_WC_REGIONS
-	/*
-	 * Splits up the write-combining region if it is not aligned on a
- 	 * size boundary.
-	 */
-
-	{
-	    unsigned long lbase, d_size = 1;
-	    unsigned long n_size = size;
-	    unsigned long n_base = base;
-
-	    for (lbase = n_base, d_size = 1; !(lbase & 1);
-		 lbase = lbase >> 1, d_size <<= 1);
-	    while (d_size > n_size)
-		d_size = d_size >> 1;
-	    DebugF("WC_BASE: 0x%lx WC_END: 0x%lx\n",base,base+d_size-1);
-	    n_base += d_size;
-	    n_size -= d_size;
-	    if (n_size) {
-		xf86DrvMsgVerb(screenNum,X_INFO,3,"Splitting WC range: "
-			       "base: 0x%lx, size: 0x%lx\n",base,size);
-		curwcr->next = mtrr_add_wc_region(screenNum, n_base, n_size,from);
-	    }
-	    curwcr->sentry.size = d_size;
-	} 
-	
-	/*****************************************************************/
-#endif /* SPLIT_WC_REGIONS */
-
-	if (ioctl(mtrr_fd, MTRRIOC_ADD_ENTRY, &curwcr->sentry) >= 0) {
-		/* Avoid printing on every VT switch */
-		if (xf86ServerIsInitialising()) {
-			xf86DrvMsg(screenNum, from,
-				   "Write-combining range (0x%lx,0x%lx)\n",
-				   base, size);
-		}
-		return wcreturn;
-	}
-	else {
-	        *wcr = curwcr->next;
-		free(curwcr);
-		
-		/* Don't complain about the VGA region: MTRR fixed
-		   regions aren't currently supported, but might be in
-		   the future. */
-		if ((unsigned long)base >= 0x100000) {
-			xf86DrvMsgVerb(screenNum, X_WARNING, 0,
-				"Failed to set up write-combining range "
-				"(0x%lx,0x%lx)\n", base, size);
-		}
-		return wcreturn;
-	}
+    /*
+     * Splits up the write-combining region if it is not aligned on a
+     * size boundary.
+     */
+
+    {
+        unsigned long lbase, d_size = 1;
+        unsigned long n_size = size;
+        unsigned long n_base = base;
+
+        for (lbase = n_base, d_size = 1; !(lbase & 1);
+             lbase = lbase >> 1, d_size <<= 1);
+        while (d_size > n_size)
+            d_size = d_size >> 1;
+        DebugF("WC_BASE: 0x%lx WC_END: 0x%lx\n", base, base + d_size - 1);
+        n_base += d_size;
+        n_size -= d_size;
+        if (n_size) {
+            xf86DrvMsgVerb(screenNum, X_INFO, 3, "Splitting WC range: "
+                           "base: 0x%lx, size: 0x%lx\n", base, size);
+            curwcr->next = mtrr_add_wc_region(screenNum, n_base, n_size, from);
+        }
+        curwcr->sentry.size = d_size;
+    }
+
+        /*****************************************************************/
+#endif                          /* SPLIT_WC_REGIONS */
+
+    if (ioctl(mtrr_fd, MTRRIOC_ADD_ENTRY, &curwcr->sentry) >= 0) {
+        /* Avoid printing on every VT switch */
+        if (xf86ServerIsInitialising()) {
+            xf86DrvMsg(screenNum, from,
+                       "Write-combining range (0x%lx,0x%lx)\n", base, size);
+        }
+        return wcreturn;
+    }
+    else {
+        *wcr = curwcr->next;
+        free(curwcr);
+
+        /* Don't complain about the VGA region: MTRR fixed
+           regions aren't currently supported, but might be in
+           the future. */
+        if ((unsigned long) base >= 0x100000) {
+            xf86DrvMsgVerb(screenNum, X_WARNING, 0,
+                           "Failed to set up write-combining range "
+                           "(0x%lx,0x%lx)\n", base, size);
+        }
+        return wcreturn;
+    }
 }
 
 static void
 mtrr_undo_wc_region(int screenNum, struct mtrr_wc_region *wcr)
 {
-	struct mtrr_wc_region *p, *prev;
-
-	if (mtrr_fd >= 0) {
-		p = wcr;
-		while (p) {
-			if (p->added)
-				ioctl(mtrr_fd, MTRRIOC_DEL_ENTRY, &p->sentry);
-			prev = p;
-			p = p->next;
-			free(prev);
-		}
-	}
+    struct mtrr_wc_region *p, *prev;
+
+    if (mtrr_fd >= 0) {
+        p = wcr;
+        while (p) {
+            if (p->added)
+                ioctl(mtrr_fd, MTRRIOC_DEL_ENTRY, &p->sentry);
+            prev = p;
+            p = p->next;
+            free(prev);
+        }
+    }
 }
 
 static pointer
 setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
       MessageType from)
 {
-	if (enable)
-		return mtrr_add_wc_region(screenNum, base, size, from);
-	else
-		return mtrr_cull_wc_region(screenNum, base, size, from);
+    if (enable)
+        return mtrr_add_wc_region(screenNum, base, size, from);
+    else
+        return mtrr_cull_wc_region(screenNum, base, size, from);
 }
 
 static void
 undoWC(int screenNum, pointer regioninfo)
 {
-	mtrr_undo_wc_region(screenNum, regioninfo);
+    mtrr_undo_wc_region(screenNum, regioninfo);
 }
 
-#endif /* HAS_MTRR_SUPPORT */
+#endif                          /* HAS_MTRR_SUPPORT */
 
 void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
-	pVidMem->linearSupported = TRUE;
+    pVidMem->linearSupported = TRUE;
 #ifdef __alpha__
-	if (axpSystem == -1) {
-	  axpSystem = lnxGetAXP();
-	  if ((needSparse = (_bus_base_sparse() > 0))) {
-	    hae_thresh = xf86AXPParams[axpSystem].hae_thresh;
-	    hae_mask = xf86AXPParams[axpSystem].hae_mask;
-	  }
-	  bus_base = _bus_base();
-	}
-	if (needSparse) {
-	  xf86Msg(X_INFO,"Machine needs sparse mapping\n");
-	  pVidMem->mapMem = mapVidMemSparse;
-	  pVidMem->unmapMem = unmapVidMemSparse;
-	} else {
-	  xf86Msg(X_INFO,"Machine type has 8/16 bit access\n");
-	  pVidMem->mapMem = mapVidMem;
-	  pVidMem->unmapMem = unmapVidMem;
-	}	
+    if (axpSystem == -1) {
+        axpSystem = lnxGetAXP();
+        if ((needSparse = (_bus_base_sparse() > 0))) {
+            hae_thresh = xf86AXPParams[axpSystem].hae_thresh;
+            hae_mask = xf86AXPParams[axpSystem].hae_mask;
+        }
+        bus_base = _bus_base();
+    }
+    if (needSparse) {
+        xf86Msg(X_INFO, "Machine needs sparse mapping\n");
+        pVidMem->mapMem = mapVidMemSparse;
+        pVidMem->unmapMem = unmapVidMemSparse;
+    }
+    else {
+        xf86Msg(X_INFO, "Machine type has 8/16 bit access\n");
+        pVidMem->mapMem = mapVidMem;
+        pVidMem->unmapMem = unmapVidMem;
+    }
 #else
-	pVidMem->mapMem = mapVidMem;
-	pVidMem->unmapMem = unmapVidMem;
-#endif /* __alpha__ */
-
+    pVidMem->mapMem = mapVidMem;
+    pVidMem->unmapMem = unmapVidMem;
+#endif                          /* __alpha__ */
 
 #ifdef HAS_MTRR_SUPPORT
-	pVidMem->setWC = setWC;
-	pVidMem->undoWC = undoWC;
+    pVidMem->setWC = setWC;
+    pVidMem->undoWC = undoWC;
 #endif
-	pVidMem->initialised = TRUE;
+    pVidMem->initialised = TRUE;
 }
 
 #ifdef __sparc__
 /* Basically, you simply cannot do this on Sparc.  You have to do something portable
  * like use /dev/fb* or mmap() on /proc/bus/pci/X/Y nodes. -DaveM
  */
-static pointer mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
+static pointer
+mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 {
-	return NULL;
+    return NULL;
 }
 #else
 static pointer
@@ -408,14 +406,14 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 {
     pointer base;
     int fd;
-    int mapflags = MAP_SHARED; 
+    int mapflags = MAP_SHARED;
     int prot;
     memType realBase, alignOff;
 
     realBase = Base & ~(getpagesize() - 1);
     alignOff = Base - realBase;
     DebugF("base: %lx, realBase: %lx, alignOff: %lx \n",
-	   Base,realBase,alignOff);
+           Base, realBase, alignOff);
 
 #if defined(__ia64__) || defined(__arm__) || defined(__s390__)
 #ifndef MAP_WRITECOMBINED
@@ -424,55 +422,52 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 #ifndef MAP_NONCACHED
 #define MAP_NONCACHED 0x00020000
 #endif
-    if(flags & VIDMEM_FRAMEBUFFER) 
-        mapflags |= MAP_WRITECOMBINED; 
+    if (flags & VIDMEM_FRAMEBUFFER)
+        mapflags |= MAP_WRITECOMBINED;
     else
-        mapflags |= MAP_NONCACHED; 
+        mapflags |= MAP_NONCACHED;
 #endif
 
 #if 0
     /* this will disappear when people upgrade their kernels */
     fd = open(DEV_MEM,
-	      ((flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR) | O_SYNC);
+              ((flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR) | O_SYNC);
 #else
     fd = open(DEV_MEM, (flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
 #endif
-    if (fd < 0)
-    {
-	FatalError("xf86MapVidMem: failed to open " DEV_MEM " (%s)\n",
-		   strerror(errno));
+    if (fd < 0) {
+        FatalError("xf86MapVidMem: failed to open " DEV_MEM " (%s)\n",
+                   strerror(errno));
     }
 
     if (flags & VIDMEM_READONLY)
-	prot = PROT_READ;
+        prot = PROT_READ;
     else
-	prot = PROT_READ | PROT_WRITE;
+        prot = PROT_READ | PROT_WRITE;
 
     /* This requires linux-0.99.pl10 or above */
-    base = mmap((caddr_t)0, Size + alignOff, prot, mapflags, fd,
- 		(off_t)realBase  + BUS_BASE);
+    base = mmap((caddr_t) 0, Size + alignOff, prot, mapflags, fd,
+                (off_t) realBase + BUS_BASE);
     close(fd);
     if (base == MAP_FAILED) {
         FatalError("xf86MapVidMem: Could not mmap framebuffer"
-		   " (0x%08lx,0x%lx) (%s)\n", Base, Size,
-		   strerror(errno));
+                   " (0x%08lx,0x%lx) (%s)\n", Base, Size, strerror(errno));
     }
-    DebugF("base: %lx aligned base: %lx\n",base, (char *)base + alignOff);
-    return (char *)base + alignOff;
+    DebugF("base: %lx aligned base: %lx\n", base, (char *) base + alignOff);
+    return (char *) base + alignOff;
 }
-#endif /* !(__sparc__) */
-    
+#endif                          /* !(__sparc__) */
+
 static void
 unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 {
-    uintptr_t alignOff = (uintptr_t)Base
-	- ((uintptr_t)Base & ~(getpagesize() - 1));
+    uintptr_t alignOff = (uintptr_t) Base
+        - ((uintptr_t) Base & ~(getpagesize() - 1));
 
-    DebugF("alignment offset: %lx\n", (unsigned long)alignOff);
-    munmap((void *)((uintptr_t)Base - alignOff), (Size + alignOff));
+    DebugF("alignment offset: %lx\n", (unsigned long) alignOff);
+    munmap((void *) ((uintptr_t) Base - alignOff), (Size + alignOff));
 }
 
-
 /***************************************************************************/
 /* I/O Permissions section                                                 */
 /***************************************************************************/
@@ -490,68 +485,68 @@ Bool
 xf86EnableIO(void)
 {
 #if defined(__powerpc__)
-	int fd;
-	unsigned int ioBase_phys;
+    int fd;
+    unsigned int ioBase_phys;
 #endif
 
-	if (ExtendedEnabled)
-		return TRUE;
+    if (ExtendedEnabled)
+        return TRUE;
 
 #if defined(__powerpc__)
-	ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
+    ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
 
-	fd = open("/dev/mem", O_RDWR);
-	if (ioBase == NULL) {
-		ioBase = (volatile unsigned char *)mmap(0, 0x20000,
-				PROT_READ | PROT_WRITE, MAP_SHARED, fd,
-				ioBase_phys);
+    fd = open("/dev/mem", O_RDWR);
+    if (ioBase == NULL) {
+        ioBase = (volatile unsigned char *) mmap(0, 0x20000,
+                                                 PROT_READ | PROT_WRITE,
+                                                 MAP_SHARED, fd, ioBase_phys);
 /* Should this be fatal or just a warning? */
 #if 0
-		if (ioBase == MAP_FAILED) {
-		    xf86Msg(X_WARNING,
-			    "xf86EnableIOPorts: Failed to map iobase (%s)\n",
-			    strerror(errno));
-		    return FALSE;
-		}
+        if (ioBase == MAP_FAILED) {
+            xf86Msg(X_WARNING,
+                    "xf86EnableIOPorts: Failed to map iobase (%s)\n",
+                    strerror(errno));
+            return FALSE;
+        }
 #endif
-	}
-	close(fd);
+    }
+    close(fd);
 #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
-        if (ioperm(0, 1024, 1) || iopl(3)) {
-                if (errno == ENODEV)
-                        ErrorF("xf86EnableIOPorts: no I/O ports found\n");
-                else
-                        FatalError("xf86EnableIOPorts: failed to set IOPL"
-                                   " for I/O (%s)\n", strerror(errno));
-		return FALSE;
-        }
-# if !defined(__alpha__)
-	/* XXX: this is actually not trapping anything because of iopl(3)
-	 * above */
-	ioperm(0x40,4,0); /* trap access to the timer chip */
-	ioperm(0x60,4,0); /* trap access to the keyboard controller */
-# endif
+    if (ioperm(0, 1024, 1) || iopl(3)) {
+        if (errno == ENODEV)
+            ErrorF("xf86EnableIOPorts: no I/O ports found\n");
+        else
+            FatalError("xf86EnableIOPorts: failed to set IOPL"
+                       " for I/O (%s)\n", strerror(errno));
+        return FALSE;
+    }
+#if !defined(__alpha__)
+    /* XXX: this is actually not trapping anything because of iopl(3)
+     * above */
+    ioperm(0x40, 4, 0);         /* trap access to the timer chip */
+    ioperm(0x60, 4, 0);         /* trap access to the keyboard controller */
+#endif
 #endif
-	ExtendedEnabled = TRUE;
+    ExtendedEnabled = TRUE;
 
-	return TRUE;
+    return TRUE;
 }
 
 void
 xf86DisableIO(void)
 {
-	if (!ExtendedEnabled)
-		return;
+    if (!ExtendedEnabled)
+        return;
 #if defined(__powerpc__)
-	munmap(ioBase, 0x20000);
-	ioBase = NULL;
+    munmap(ioBase, 0x20000);
+    ioBase = NULL;
 #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
-	iopl(0);
-	ioperm(0, 1024, 0);
+    iopl(0);
+    ioperm(0, 1024, 0);
 #endif
-	ExtendedEnabled = FALSE;
+    ExtendedEnabled = FALSE;
 
-	return;
+    return;
 }
 
 #if defined (__alpha__)
@@ -562,33 +557,33 @@ extern int readDense8(pointer Base, register unsigned long Offset);
 extern int readDense16(pointer Base, register unsigned long Offset);
 extern int readDense32(pointer Base, register unsigned long Offset);
 extern void
-writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
 extern void
-writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
 extern void
-writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
 extern void
-writeDense8(int Value, pointer Base, register unsigned long Offset);
+ writeDense8(int Value, pointer Base, register unsigned long Offset);
 extern void
-writeDense16(int Value, pointer Base, register unsigned long Offset);
+ writeDense16(int Value, pointer Base, register unsigned long Offset);
 extern void
-writeDense32(int Value, pointer Base, register unsigned long Offset);
+ writeDense32(int Value, pointer Base, register unsigned long Offset);
 
 static int readSparse8(pointer Base, register unsigned long Offset);
 static int readSparse16(pointer Base, register unsigned long Offset);
 static int readSparse32(pointer Base, register unsigned long Offset);
 static void
-writeSparseNB8(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB8(int Value, pointer Base, register unsigned long Offset);
 static void
-writeSparseNB16(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB16(int Value, pointer Base, register unsigned long Offset);
 static void
-writeSparseNB32(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB32(int Value, pointer Base, register unsigned long Offset);
 static void
-writeSparse8(int Value, pointer Base, register unsigned long Offset);
+ writeSparse8(int Value, pointer Base, register unsigned long Offset);
 static void
-writeSparse16(int Value, pointer Base, register unsigned long Offset);
+ writeSparse16(int Value, pointer Base, register unsigned long Offset);
 static void
-writeSparse32(int Value, pointer Base, register unsigned long Offset);
+ writeSparse32(int Value, pointer Base, register unsigned long Offset);
 
 #define DENSE_BASE	0x2ff00000000UL
 #define SPARSE_BASE	0x30000000000UL
@@ -596,7 +591,8 @@ writeSparse32(int Value, pointer Base, register unsigned long Offset);
 static unsigned long msb_set = 0;
 
 static pointer
-mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
+mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size,
+                int flags)
 {
     int fd, prot;
     unsigned long ret, rets = 0;
@@ -604,43 +600,42 @@ mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size, int flags
     static Bool was_here = FALSE;
 
     if (!was_here) {
-      was_here = TRUE;
-
-      xf86WriteMmio8 = writeSparse8;
-      xf86WriteMmio16 = writeSparse16;
-      xf86WriteMmio32 = writeSparse32;
-      xf86WriteMmioNB8 = writeSparseNB8;
-      xf86WriteMmioNB16 = writeSparseNB16;
-      xf86WriteMmioNB32 = writeSparseNB32;
-      xf86ReadMmio8 = readSparse8;
-      xf86ReadMmio16 = readSparse16;
-      xf86ReadMmio32 = readSparse32;
+        was_here = TRUE;
+
+        xf86WriteMmio8 = writeSparse8;
+        xf86WriteMmio16 = writeSparse16;
+        xf86WriteMmio32 = writeSparse32;
+        xf86WriteMmioNB8 = writeSparseNB8;
+        xf86WriteMmioNB16 = writeSparseNB16;
+        xf86WriteMmioNB32 = writeSparseNB32;
+        xf86ReadMmio8 = readSparse8;
+        xf86ReadMmio16 = readSparse16;
+        xf86ReadMmio32 = readSparse32;
     }
-	
+
     fd = open(DEV_MEM, (flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
     if (fd < 0) {
         FatalError("xf86MapVidMem: failed to open " DEV_MEM " (%s)\n",
-		   strerror(errno));
+                   strerror(errno));
     }
 
 #if 0
-    xf86Msg(X_INFO,"mapVidMemSparse: try Base 0x%lx size 0x%lx flags 0x%x\n",
-	    Base, Size, flags);
+    xf86Msg(X_INFO, "mapVidMemSparse: try Base 0x%lx size 0x%lx flags 0x%x\n",
+            Base, Size, flags);
 #endif
 
     if (flags & VIDMEM_READONLY)
-	prot = PROT_READ;
+        prot = PROT_READ;
     else
-	prot = PROT_READ | PROT_WRITE;
+        prot = PROT_READ | PROT_WRITE;
 
     /* This requirers linux-0.99.pl10 or above */
 
     /*
      * Always do DENSE mmap, since read32/write32 currently require it.
      */
-    ret = (unsigned long)mmap((caddr_t)(DENSE_BASE + Base), Size,
-		   prot, MAP_SHARED, fd,
-		   (off_t) (bus_base + Base));
+    ret = (unsigned long) mmap((caddr_t) (DENSE_BASE + Base), Size,
+                               prot, MAP_SHARED, fd, (off_t) (bus_base + Base));
 
     /*
      * Do SPARSE mmap only when MMIO and not MMIO_32BIT, or FRAMEBUFFER
@@ -650,40 +645,36 @@ mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size, int flags
      * bytes worth of pagetable (32 pages).
      */
     if (((flags & VIDMEM_MMIO) && !(flags & VIDMEM_MMIO_32BIT)) ||
-	((flags & VIDMEM_FRAMEBUFFER) && (flags & VIDMEM_SPARSE)))
-    {
-        rets = (unsigned long)mmap((caddr_t)(SPARSE_BASE + (Base << 5)),
-				   Size << 5, prot, MAP_SHARED, fd,
-				   (off_t) _bus_base_sparse() + (Base << 5));
+        ((flags & VIDMEM_FRAMEBUFFER) && (flags & VIDMEM_SPARSE))) {
+        rets = (unsigned long) mmap((caddr_t) (SPARSE_BASE + (Base << 5)),
+                                    Size << 5, prot, MAP_SHARED, fd,
+                                    (off_t) _bus_base_sparse() + (Base << 5));
     }
 
     close(fd);
-      
-    if (ret == (unsigned long)MAP_FAILED) {
+
+    if (ret == (unsigned long) MAP_FAILED) {
         FatalError("xf86MapVidMemSparse: Could not (dense) mmap fb (%s)\n",
-		   strerror(errno));
+                   strerror(errno));
     }
 
     if (((flags & VIDMEM_MMIO) && !(flags & VIDMEM_MMIO_32BIT)) ||
-	((flags & VIDMEM_FRAMEBUFFER) && (flags & VIDMEM_SPARSE)))
-    {
-        if (rets == (unsigned long)MAP_FAILED ||
-	    rets != (SPARSE_BASE + (Base << 5)))
-	{
-	    FatalError("mapVidMemSparse: Could not (sparse) mmap fb (%s)\n",
-		       strerror(errno));
-	}
+        ((flags & VIDMEM_FRAMEBUFFER) && (flags & VIDMEM_SPARSE))) {
+        if (rets == (unsigned long) MAP_FAILED ||
+            rets != (SPARSE_BASE + (Base << 5))) {
+            FatalError("mapVidMemSparse: Could not (sparse) mmap fb (%s)\n",
+                       strerror(errno));
+        }
     }
 
 #if 1
     if (rets)
-        xf86Msg(X_INFO,"mapVidMemSparse: mapped Base 0x%lx size 0x%lx"
-		" to DENSE at 0x%lx and SPARSE at 0x%lx\n",
-		Base, Size, ret, rets);
+        xf86Msg(X_INFO, "mapVidMemSparse: mapped Base 0x%lx size 0x%lx"
+                " to DENSE at 0x%lx and SPARSE at 0x%lx\n",
+                Base, Size, ret, rets);
     else
-        xf86Msg(X_INFO,"mapVidMemSparse: mapped Base 0x%lx size 0x%lx"
-		" to DENSE only at 0x%lx\n",
-		Base, Size, ret);
+        xf86Msg(X_INFO, "mapVidMemSparse: mapped Base 0x%lx size 0x%lx"
+                " to DENSE only at 0x%lx\n", Base, Size, ret);
 
 #endif
     return (pointer) ret;
@@ -692,16 +683,17 @@ mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size, int flags
 static void
 unmapVidMemSparse(int ScreenNum, pointer Base, unsigned long Size)
 {
-    unsigned long Offset = (unsigned long)Base - DENSE_BASE;
+    unsigned long Offset = (unsigned long) Base - DENSE_BASE;
+
 #if 1
-    xf86Msg(X_INFO,"unmapVidMemSparse: unmapping Base 0x%lx Size 0x%lx\n",
-	    Base, Size);
+    xf86Msg(X_INFO, "unmapVidMemSparse: unmapping Base 0x%lx Size 0x%lx\n",
+            Base, Size);
 #endif
     /* Unmap DENSE always. */
-    munmap((caddr_t)Base, Size);
+    munmap((caddr_t) Base, Size);
 
     /* Unmap SPARSE always, and ignore error in case we did not map it. */
-    munmap((caddr_t)(SPARSE_BASE + (Offset << 5)), Size << 5);
+    munmap((caddr_t) (SPARSE_BASE + (Offset << 5)), Size << 5);
 }
 
 static int
@@ -711,15 +703,15 @@ readSparse8(pointer Base, register unsigned long Offset)
     register unsigned long msb;
 
     mem_barrier();
-    Offset += (unsigned long)Base - DENSE_BASE;
+    Offset += (unsigned long) Base - DENSE_BASE;
     shift = (Offset & 0x3) << 3;
     if (Offset >= (hae_thresh)) {
         msb = Offset & hae_mask;
         Offset -= msb;
-	if (msb_set != msb) {
-	    sethae(msb);
-	    msb_set = msb;
-	}
+        if (msb_set != msb) {
+            sethae(msb);
+            msb_set = msb;
+        }
     }
 
     mem_barrier();
@@ -735,19 +727,19 @@ readSparse16(pointer Base, register unsigned long Offset)
     register unsigned long msb;
 
     mem_barrier();
-    Offset += (unsigned long)Base - DENSE_BASE;
+    Offset += (unsigned long) Base - DENSE_BASE;
     shift = (Offset & 0x2) << 3;
     if (Offset >= hae_thresh) {
         msb = Offset & hae_mask;
         Offset -= msb;
-	if (msb_set != msb) {
-	    sethae(msb);
-	    msb_set = msb;
-	}
+        if (msb_set != msb) {
+            sethae(msb);
+            msb_set = msb;
+        }
     }
 
     mem_barrier();
-    result = *(vuip)(SPARSE_BASE + (Offset<<5) + (1<<(5-2)));
+    result = *(vuip) (SPARSE_BASE + (Offset << 5) + (1 << (5 - 2)));
     result >>= shift;
     return 0xffffUL & result;
 }
@@ -757,7 +749,7 @@ readSparse32(pointer Base, register unsigned long Offset)
 {
     /* NOTE: this is really using DENSE. */
     mem_barrier();
-    return *(vuip)((unsigned long)Base+(Offset));
+    return *(vuip) ((unsigned long) Base + (Offset));
 }
 
 static void
@@ -767,14 +759,14 @@ writeSparse8(int Value, pointer Base, register unsigned long Offset)
     register unsigned int b = Value & 0xffU;
 
     write_mem_barrier();
-    Offset += (unsigned long)Base - DENSE_BASE;
+    Offset += (unsigned long) Base - DENSE_BASE;
     if (Offset >= hae_thresh) {
         msb = Offset & hae_mask;
-	Offset -= msb;
-	if (msb_set != msb) {
-	    sethae(msb); 
-	    msb_set = msb;
-	}
+        Offset -= msb;
+        if (msb_set != msb) {
+            sethae(msb);
+            msb_set = msb;
+        }
     }
 
     write_mem_barrier();
@@ -788,18 +780,18 @@ writeSparse16(int Value, pointer Base, register unsigned long Offset)
     register unsigned int w = Value & 0xffffU;
 
     write_mem_barrier();
-    Offset += (unsigned long)Base - DENSE_BASE;
+    Offset += (unsigned long) Base - DENSE_BASE;
     if (Offset >= hae_thresh) {
         msb = Offset & hae_mask;
-	Offset -= msb;
-	if (msb_set != msb) {
-	    sethae(msb);
-	    msb_set = msb;
-	}
+        Offset -= msb;
+        if (msb_set != msb) {
+            sethae(msb);
+            msb_set = msb;
+        }
     }
 
     write_mem_barrier();
-    *(vuip)(SPARSE_BASE + (Offset<<5) + (1<<(5-2))) = w * 0x00010001;
+    *(vuip) (SPARSE_BASE + (Offset << 5) + (1 << (5 - 2))) = w * 0x00010001;
 }
 
 static void
@@ -807,7 +799,7 @@ writeSparse32(int Value, pointer Base, register unsigned long Offset)
 {
     /* NOTE: this is really using DENSE. */
     write_mem_barrier();
-    *(vuip)((unsigned long)Base + (Offset)) = Value;
+    *(vuip) ((unsigned long) Base + (Offset)) = Value;
     return;
 }
 
@@ -817,14 +809,14 @@ writeSparseNB8(int Value, pointer Base, register unsigned long Offset)
     register unsigned long msb;
     register unsigned int b = Value & 0xffU;
 
-    Offset += (unsigned long)Base - DENSE_BASE;
+    Offset += (unsigned long) Base - DENSE_BASE;
     if (Offset >= hae_thresh) {
         msb = Offset & hae_mask;
-	Offset -= msb;
-	if (msb_set != msb) {
-	    sethae(msb);
-	    msb_set = msb;
-	}
+        Offset -= msb;
+        if (msb_set != msb) {
+            sethae(msb);
+            msb_set = msb;
+        }
     }
     *(vuip) (SPARSE_BASE + (Offset << 5)) = b * 0x01010101;
 }
@@ -835,43 +827,43 @@ writeSparseNB16(int Value, pointer Base, register unsigned long Offset)
     register unsigned long msb;
     register unsigned int w = Value & 0xffffU;
 
-    Offset += (unsigned long)Base - DENSE_BASE;
+    Offset += (unsigned long) Base - DENSE_BASE;
     if (Offset >= hae_thresh) {
         msb = Offset & hae_mask;
-	Offset -= msb;
-	if (msb_set != msb) {
-	    sethae(msb);
-	    msb_set = msb;
-	}
+        Offset -= msb;
+        if (msb_set != msb) {
+            sethae(msb);
+            msb_set = msb;
+        }
     }
-    *(vuip)(SPARSE_BASE+(Offset<<5)+(1<<(5-2))) = w * 0x00010001;
+    *(vuip) (SPARSE_BASE + (Offset << 5) + (1 << (5 - 2))) = w * 0x00010001;
 }
 
 static void
 writeSparseNB32(int Value, pointer Base, register unsigned long Offset)
 {
     /* NOTE: this is really using DENSE. */
-    *(vuip)((unsigned long)Base + (Offset)) = Value;
+    *(vuip) ((unsigned long) Base + (Offset)) = Value;
     return;
 }
 
-void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset)
-     = writeDense8;
-void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset)
-     = writeDense16;
-void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset)
-     = writeDense32;
-void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset)
-     = writeDenseNB8;
-void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset)
-     = writeDenseNB16;
-void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset)
-     = writeDenseNB32;
-int  (*xf86ReadMmio8)(pointer Base, unsigned long Offset)
-     = readDense8;
-int  (*xf86ReadMmio16)(pointer Base, unsigned long Offset)
-     = readDense16;
-int  (*xf86ReadMmio32)(pointer Base, unsigned long Offset)
-     = readDense32;
-
-#endif /* __alpha__ */
+void (*xf86WriteMmio8) (int Value, pointer Base, unsigned long Offset)
+    = writeDense8;
+void (*xf86WriteMmio16) (int Value, pointer Base, unsigned long Offset)
+    = writeDense16;
+void (*xf86WriteMmio32) (int Value, pointer Base, unsigned long Offset)
+    = writeDense32;
+void (*xf86WriteMmioNB8) (int Value, pointer Base, unsigned long Offset)
+    = writeDenseNB8;
+void (*xf86WriteMmioNB16) (int Value, pointer Base, unsigned long Offset)
+    = writeDenseNB16;
+void (*xf86WriteMmioNB32) (int Value, pointer Base, unsigned long Offset)
+    = writeDenseNB32;
+int (*xf86ReadMmio8) (pointer Base, unsigned long Offset)
+    = readDense8;
+int (*xf86ReadMmio16) (pointer Base, unsigned long Offset)
+    = readDense16;
+int (*xf86ReadMmio32) (pointer Base, unsigned long Offset)
+    = readDense32;
+
+#endif                          /* __alpha__ */
diff --git a/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c b/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c
index 0021b5544..254748ff6 100644
--- a/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c
+++ b/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
   for Alpha Linux
 *******************************************************************************/
- 
+
 /* 
  *   Create a dependency that should be immune from the effect of register
  *   renaming as is commonly seen in superscalar processors.  This should
@@ -10,7 +10,7 @@
  *   
  *   Slowbcopy(char *src, char *dst, int count)   
  *   
- */ 
+ */
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
@@ -27,16 +27,16 @@ static int really_slow_bcopy;
 void
 xf86SetReallySlowBcopy(void)
 {
-	really_slow_bcopy = 1;
+    really_slow_bcopy = 1;
 }
 
 #if defined(__i386__) || defined(__amd64__)
-static void xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int len)
+static void
+xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int len)
 {
-    while(len--)
-    {
-	*dst++ = *src++;
-	outb(0x80, 0x00);
+    while (len--) {
+        *dst++ = *src++;
+        outb(0x80, 0x00);
     }
 }
 #endif
@@ -47,12 +47,12 @@ xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len)
 {
 #if defined(__i386__) || defined(__amd64__)
     if (really_slow_bcopy) {
-	xf86_really_slow_bcopy(src, dst, len);
-	return;
+        xf86_really_slow_bcopy(src, dst, len);
+        return;
     }
 #endif
-    while(len--)
-	*dst++ = *src++;
+    while (len--)
+        *dst++ = *src++;
 }
 
 #ifdef __alpha__
@@ -76,42 +76,41 @@ unsigned long _bus_base(void);
 void
 xf86SlowBCopyFromBus(unsigned char *src, unsigned char *dst, int count)
 {
-	if (useSparse())
-	{
-		unsigned long addr;
-		long result;
-
-		addr = (unsigned long) src;
-		while (count) {
-			result = *(volatile int *) addr;
-			result >>= ((addr>>SPARSE) & 3) * 8;
-			*dst++ = (unsigned char) (0xffUL & result);
-			addr += 1<<SPARSE;
-			count--;
-			outb(0x80, 0x00);
-		}
-	}
-	else
-		xf86SlowBcopy(src, dst, count);
+    if (useSparse()) {
+        unsigned long addr;
+        long result;
+
+        addr = (unsigned long) src;
+        while (count) {
+            result = *(volatile int *) addr;
+            result >>= ((addr >> SPARSE) & 3) * 8;
+            *dst++ = (unsigned char) (0xffUL & result);
+            addr += 1 << SPARSE;
+            count--;
+            outb(0x80, 0x00);
+        }
+    }
+    else
+        xf86SlowBcopy(src, dst, count);
 }
 
 void
 xf86SlowBCopyToBus(unsigned char *src, unsigned char *dst, int count)
 {
-	if (useSparse())
-	{
-		unsigned long addr;
-
-		addr = (unsigned long) dst;
-		while (count) {
-			*(volatile unsigned int *) addr = (unsigned short)(*src) * 0x01010101;
-			src++;
-			addr += 1<<SPARSE;
-			count--;
-			outb(0x80, 0x00);
-		}
-	}
-	else
-		xf86SlowBcopy(src, dst, count);
+    if (useSparse()) {
+        unsigned long addr;
+
+        addr = (unsigned long) dst;
+        while (count) {
+            *(volatile unsigned int *) addr =
+                (unsigned short) (*src) * 0x01010101;
+            src++;
+            addr += 1 << SPARSE;
+            count--;
+            outb(0x80, 0x00);
+        }
+    }
+    else
+        xf86SlowBcopy(src, dst, count);
 }
 #endif
diff --git a/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c b/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c
index b7b35d9db..e000dc9c8 100644
--- a/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c
+++ b/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c
@@ -38,41 +38,39 @@
 #ifndef __alpha__
 int
 xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
+             int Len)
 {
-	int fd;
-	unsigned char *ptr;
-	int psize;
-	int mlen;
-
-	if ((fd = open(DEV_MEM, O_RDONLY)) < 0)
-	{
-		xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n",
-			DEV_MEM, strerror(errno));
-		return -1;
-	}
-	psize = getpagesize();
-	Offset += Base & (psize - 1);
-	Base &= ~(psize - 1);
-	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-	ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ,
-					MAP_SHARED, fd, (off_t)Base);
-	if (ptr == MAP_FAILED)
-	{
-		xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed (%s)\n",
-			DEV_MEM, strerror(errno));
-		close(fd);
-		return -1;
-	}
-	DebugF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
-		Base, ptr[0] | (ptr[1] << 8));
-	(void)memcpy(Buf, (void *)(ptr + Offset), Len);
-	(void)munmap((caddr_t)ptr, mlen);
-	(void)close(fd);
-	return Len;
+    int fd;
+    unsigned char *ptr;
+    int psize;
+    int mlen;
+
+    if ((fd = open(DEV_MEM, O_RDONLY)) < 0) {
+        xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n",
+                DEV_MEM, strerror(errno));
+        return -1;
+    }
+    psize = getpagesize();
+    Offset += Base & (psize - 1);
+    Base &= ~(psize - 1);
+    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
+    ptr = (unsigned char *) mmap((caddr_t) 0, mlen, PROT_READ,
+                                 MAP_SHARED, fd, (off_t) Base);
+    if (ptr == MAP_FAILED) {
+        xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed (%s)\n",
+                DEV_MEM, strerror(errno));
+        close(fd);
+        return -1;
+    }
+    DebugF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
+           Base, ptr[0] | (ptr[1] << 8));
+    (void) memcpy(Buf, (void *) (ptr + Offset), Len);
+    (void) munmap((caddr_t) ptr, mlen);
+    (void) close(fd);
+    return Len;
 }
 
-#else /* __alpha__ */
+#else                           /* __alpha__ */
 
   /*
    *  We trick "mmap" into mapping BUS memory for us via BUS_BASE,
@@ -88,50 +86,50 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 #ifdef linux
 
 extern unsigned long _bus_base(void);
+
 #define BUS_BASE _bus_base()
 
 #else
 
 extern u_int64_t dense_base(void);
+
 #define BUS_BASE dense_base()
 
 #endif
 
 int
 xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
+             int Len)
 {
-	caddr_t base;
- 	int fd;
-	int psize;
-	int mlen;
-
-	if ((fd = open(DEV_MEM, O_RDONLY)) < 0)
-	{
-		xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n",
-			DEV_MEM, strerror(errno));
-		return -1;
-	}
-
-	psize = getpagesize();
-	Offset += Base & (psize - 1);
-	Base &= ~(psize - 1);
-	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-	base = mmap((caddr_t)0, mlen, PROT_READ,
-		    MAP_SHARED, fd, (off_t)(Base + BUS_BASE));
-
-	if (base == MAP_FAILED)
-	{
-		xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to mmap %s (%s)\n",
-			DEV_MEM, strerror(errno));
-		return -1;
-	}
-
-	xf86SlowBCopyFromBus((unsigned char *)(base+Offset), Buf, Len);
-
-	munmap((caddr_t)base, mlen);
-	close(fd);
-	return Len;
+    caddr_t base;
+    int fd;
+    int psize;
+    int mlen;
+
+    if ((fd = open(DEV_MEM, O_RDONLY)) < 0) {
+        xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n",
+                DEV_MEM, strerror(errno));
+        return -1;
+    }
+
+    psize = getpagesize();
+    Offset += Base & (psize - 1);
+    Base &= ~(psize - 1);
+    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
+    base = mmap((caddr_t) 0, mlen, PROT_READ,
+                MAP_SHARED, fd, (off_t) (Base + BUS_BASE));
+
+    if (base == MAP_FAILED) {
+        xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to mmap %s (%s)\n",
+                DEV_MEM, strerror(errno));
+        return -1;
+    }
+
+    xf86SlowBCopyFromBus((unsigned char *) (base + Offset), Buf, Len);
+
+    munmap((caddr_t) base, mlen);
+    close(fd);
+    return Len;
 }
 
-#endif /* __alpha__ */
+#endif                          /* __alpha__ */
diff --git a/xorg-server/hw/xfree86/os-support/shared/kmod_noop.c b/xorg-server/hw/xfree86/os-support/shared/kmod_noop.c
index e86d7472f..0437bc564 100644
--- a/xorg-server/hw/xfree86/os-support/shared/kmod_noop.c
+++ b/xorg-server/hw/xfree86/os-support/shared/kmod_noop.c
@@ -31,8 +31,9 @@
 
 #include "xf86_OSproc.h"
 
-int xf86LoadKernelModule(const char *pathname)
+int
+xf86LoadKernelModule(const char *pathname)
 {
     (void) pathname;
-    return 0;  /* failure */
+    return 0;                   /* failure */
 }
diff --git a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
index cc12a31f2..ab3757a2a 100644
--- a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
+++ b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
@@ -61,458 +61,430 @@
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
 
-static int 
-GetBaud (int baudrate)
+static int
+GetBaud(int baudrate)
 {
 #ifdef B300
-	if (baudrate == 300)
-		return B300;
+    if (baudrate == 300)
+        return B300;
 #endif
 #ifdef B1200
-	if (baudrate == 1200)
-		return B1200;
+    if (baudrate == 1200)
+        return B1200;
 #endif
 #ifdef B2400
-	if (baudrate == 2400)
-		return B2400;
+    if (baudrate == 2400)
+        return B2400;
 #endif
 #ifdef B4800
-	if (baudrate == 4800)
-		return B4800;
+    if (baudrate == 4800)
+        return B4800;
 #endif
 #ifdef B9600
-	if (baudrate == 9600)
-		return B9600;
+    if (baudrate == 9600)
+        return B9600;
 #endif
 #ifdef B19200
-	if (baudrate == 19200)
-		return B19200;
+    if (baudrate == 19200)
+        return B19200;
 #endif
 #ifdef B38400
-	if (baudrate == 38400)
-		return B38400;
+    if (baudrate == 38400)
+        return B38400;
 #endif
 #ifdef B57600
-	if (baudrate == 57600)
-		return B57600;
+    if (baudrate == 57600)
+        return B57600;
 #endif
 #ifdef B115200
-	if (baudrate == 115200)
-		return B115200;
+    if (baudrate == 115200)
+        return B115200;
 #endif
 #ifdef B230400
-	if (baudrate == 230400)
-		return B230400;
+    if (baudrate == 230400)
+        return B230400;
 #endif
 #ifdef B460800
-	if (baudrate == 460800)
-		return B460800;
+    if (baudrate == 460800)
+        return B460800;
 #endif
-	return 0;
+    return 0;
 }
 
 int
-xf86OpenSerial (XF86OptionPtr options)
+xf86OpenSerial(XF86OptionPtr options)
 {
-	struct termios t;
-	int fd, i;
-	char *dev;
-
-	dev = xf86SetStrOption (options, "Device", NULL);
-	if (!dev)
-	{
-		xf86Msg (X_ERROR, "xf86OpenSerial: No Device specified.\n");
-		return -1;
-	}
-
-	SYSCALL (fd = open (dev, O_RDWR | O_NONBLOCK));
-	if (fd == -1)
-	{
-		xf86Msg (X_ERROR,
-			 "xf86OpenSerial: Cannot open device %s\n\t%s.\n",
-			 dev, strerror (errno));
-		free(dev);
-		return -1;
-	}
-
-	if (!isatty (fd))
-	{
-		/* Allow non-tty devices to be opened. */
-		free(dev);
-		return fd;
-	}
-
-	/* set up default port parameters */
-	SYSCALL (tcgetattr (fd, &t));
-	t.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR\
-						|IGNCR|ICRNL|IXON);
-	t.c_oflag &= ~OPOST;
-	t.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
-	t.c_cflag &= ~(CSIZE|PARENB);
-	t.c_cflag |= CS8|CLOCAL;
-
-	cfsetispeed (&t, B9600);
-	cfsetospeed (&t, B9600);
-	t.c_cc[VMIN] = 1;
-	t.c_cc[VTIME] = 0;
-
-	SYSCALL (tcsetattr (fd, TCSANOW, &t));
-
-	if (xf86SetSerial (fd, options) == -1)
-	{
-		SYSCALL (close (fd));
-		free(dev);
-		return -1;
-	}
-
-	SYSCALL (i = fcntl (fd, F_GETFL, 0));
-	if (i == -1)
-	{
-		SYSCALL (close (fd));
-		free(dev);
-		return -1;
-	}
-	i &= ~O_NONBLOCK;
-	SYSCALL (i = fcntl (fd, F_SETFL, i));
-	if (i == -1)
-	{
-		SYSCALL (close (fd));
-		free(dev);
-		return -1;
-	}
-	free(dev);
-	return fd;
+    struct termios t;
+    int fd, i;
+    char *dev;
+
+    dev = xf86SetStrOption(options, "Device", NULL);
+    if (!dev) {
+        xf86Msg(X_ERROR, "xf86OpenSerial: No Device specified.\n");
+        return -1;
+    }
+
+    SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK));
+    if (fd == -1) {
+        xf86Msg(X_ERROR,
+                "xf86OpenSerial: Cannot open device %s\n\t%s.\n",
+                dev, strerror(errno));
+        free(dev);
+        return -1;
+    }
+
+    if (!isatty(fd)) {
+        /* Allow non-tty devices to be opened. */
+        free(dev);
+        return fd;
+    }
+
+    /* set up default port parameters */
+    SYSCALL(tcgetattr(fd, &t));
+    t.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR
+                   | IGNCR | ICRNL | IXON);
+    t.c_oflag &= ~OPOST;
+    t.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
+    t.c_cflag &= ~(CSIZE | PARENB);
+    t.c_cflag |= CS8 | CLOCAL;
+
+    cfsetispeed(&t, B9600);
+    cfsetospeed(&t, B9600);
+    t.c_cc[VMIN] = 1;
+    t.c_cc[VTIME] = 0;
+
+    SYSCALL(tcsetattr(fd, TCSANOW, &t));
+
+    if (xf86SetSerial(fd, options) == -1) {
+        SYSCALL(close(fd));
+        free(dev);
+        return -1;
+    }
+
+    SYSCALL(i = fcntl(fd, F_GETFL, 0));
+    if (i == -1) {
+        SYSCALL(close(fd));
+        free(dev);
+        return -1;
+    }
+    i &= ~O_NONBLOCK;
+    SYSCALL(i = fcntl(fd, F_SETFL, i));
+    if (i == -1) {
+        SYSCALL(close(fd));
+        free(dev);
+        return -1;
+    }
+    free(dev);
+    return fd;
 }
 
 int
-xf86SetSerial (int fd, XF86OptionPtr options)
+xf86SetSerial(int fd, XF86OptionPtr options)
 {
-	struct termios t;
-	int val;
-	const char *s;
-	int baud, r;
-
-	if (fd < 0)
-		return -1;
-
-	/* Don't try to set parameters for non-tty devices. */
-	if (!isatty(fd))
-		return 0;
-
-	SYSCALL (tcgetattr (fd, &t));
-
-	if ((val = xf86SetIntOption (options, "BaudRate", 0)))
-	{
-		if ((baud = GetBaud (val)))
-		{
-			cfsetispeed (&t, baud);
-			cfsetospeed (&t, baud);
-		}
-		else
-		{
-			xf86Msg (X_ERROR,
-				 "Invalid Option BaudRate value: %d\n", val);
-			return -1;
-		}
-	}
-
-	if ((val = xf86SetIntOption (options, "StopBits", 0)))
-	{
-		switch (val)
-		{
-		case 1:
-			t.c_cflag &= ~(CSTOPB);
-			break;
-		case 2:
-			t.c_cflag |= CSTOPB;
-			break;
-		default:
-			xf86Msg (X_ERROR,
-				 "Invalid Option StopBits value: %d\n", val);
-			return -1;
-			break;
-		}
-	}
-
-	if ((val = xf86SetIntOption (options, "DataBits", 0)))
-	{
-		switch (val)
-		{
-		case 5:
-			t.c_cflag &= ~(CSIZE);
-			t.c_cflag |= CS5;
-			break;
-		case 6:
-			t.c_cflag &= ~(CSIZE);
-			t.c_cflag |= CS6;
-			break;
-		case 7:
-			t.c_cflag &= ~(CSIZE);
-			t.c_cflag |= CS7;
-			break;
-		case 8:
-			t.c_cflag &= ~(CSIZE);
-			t.c_cflag |= CS8;
-			break;
-		default:
-			xf86Msg (X_ERROR,
-				 "Invalid Option DataBits value: %d\n", val);
-			return -1;
-			break;
-		}
-	}
-
-	if ((s = xf86SetStrOption (options, "Parity", NULL)))
-	{
-		if (xf86NameCmp (s, "Odd") == 0)
-		{
-			t.c_cflag |= PARENB | PARODD;
-		}
-		else if (xf86NameCmp (s, "Even") == 0)
-		{
-			t.c_cflag |= PARENB;
-			t.c_cflag &= ~(PARODD);
-		}
-		else if (xf86NameCmp (s, "None") == 0)
-		{
-			t.c_cflag &= ~(PARENB);
-		}
-		else
-		{
-			xf86Msg (X_ERROR, "Invalid Option Parity value: %s\n",
-				 s);
-			return -1;
-		}
-	}
-
-	if ((val = xf86SetIntOption (options, "Vmin", -1)) != -1)
-	{
-		t.c_cc[VMIN] = val;
-	}
-	if ((val = xf86SetIntOption (options, "Vtime", -1)) != -1)
-	{
-		t.c_cc[VTIME] = val;
-	}
-
-	if ((s = xf86SetStrOption (options, "FlowControl", NULL)))
-	{
-		xf86MarkOptionUsedByName (options, "FlowControl");
-		if (xf86NameCmp (s, "Xoff") == 0)
-		{
-			t.c_iflag |= IXOFF;
-		}
-		else if (xf86NameCmp (s, "Xon") == 0)
-		{
-			t.c_iflag |= IXON;
-		}
-		else if (xf86NameCmp (s, "XonXoff") == 0)
-		{
-			t.c_iflag |= IXON|IXOFF;
-		}
-		else if (xf86NameCmp (s, "None") == 0)
-		{
-			t.c_iflag &= ~(IXON | IXOFF);
-		}
-		else
-		{
-			xf86Msg (X_ERROR,
-				 "Invalid Option FlowControl value: %s\n", s);
-			return -1;
-		}
-	}
-
-	if ((xf86SetBoolOption (options, "ClearDTR", FALSE)))
-	{
+    struct termios t;
+    int val;
+    const char *s;
+    int baud, r;
+
+    if (fd < 0)
+        return -1;
+
+    /* Don't try to set parameters for non-tty devices. */
+    if (!isatty(fd))
+        return 0;
+
+    SYSCALL(tcgetattr(fd, &t));
+
+    if ((val = xf86SetIntOption(options, "BaudRate", 0))) {
+        if ((baud = GetBaud(val))) {
+            cfsetispeed(&t, baud);
+            cfsetospeed(&t, baud);
+        }
+        else {
+            xf86Msg(X_ERROR, "Invalid Option BaudRate value: %d\n", val);
+            return -1;
+        }
+    }
+
+    if ((val = xf86SetIntOption(options, "StopBits", 0))) {
+        switch (val) {
+        case 1:
+            t.c_cflag &= ~(CSTOPB);
+            break;
+        case 2:
+            t.c_cflag |= CSTOPB;
+            break;
+        default:
+            xf86Msg(X_ERROR, "Invalid Option StopBits value: %d\n", val);
+            return -1;
+            break;
+        }
+    }
+
+    if ((val = xf86SetIntOption(options, "DataBits", 0))) {
+        switch (val) {
+        case 5:
+            t.c_cflag &= ~(CSIZE);
+            t.c_cflag |= CS5;
+            break;
+        case 6:
+            t.c_cflag &= ~(CSIZE);
+            t.c_cflag |= CS6;
+            break;
+        case 7:
+            t.c_cflag &= ~(CSIZE);
+            t.c_cflag |= CS7;
+            break;
+        case 8:
+            t.c_cflag &= ~(CSIZE);
+            t.c_cflag |= CS8;
+            break;
+        default:
+            xf86Msg(X_ERROR, "Invalid Option DataBits value: %d\n", val);
+            return -1;
+            break;
+        }
+    }
+
+    if ((s = xf86SetStrOption(options, "Parity", NULL))) {
+        if (xf86NameCmp(s, "Odd") == 0) {
+            t.c_cflag |= PARENB | PARODD;
+        }
+        else if (xf86NameCmp(s, "Even") == 0) {
+            t.c_cflag |= PARENB;
+            t.c_cflag &= ~(PARODD);
+        }
+        else if (xf86NameCmp(s, "None") == 0) {
+            t.c_cflag &= ~(PARENB);
+        }
+        else {
+            xf86Msg(X_ERROR, "Invalid Option Parity value: %s\n", s);
+            return -1;
+        }
+    }
+
+    if ((val = xf86SetIntOption(options, "Vmin", -1)) != -1) {
+        t.c_cc[VMIN] = val;
+    }
+    if ((val = xf86SetIntOption(options, "Vtime", -1)) != -1) {
+        t.c_cc[VTIME] = val;
+    }
+
+    if ((s = xf86SetStrOption(options, "FlowControl", NULL))) {
+        xf86MarkOptionUsedByName(options, "FlowControl");
+        if (xf86NameCmp(s, "Xoff") == 0) {
+            t.c_iflag |= IXOFF;
+        }
+        else if (xf86NameCmp(s, "Xon") == 0) {
+            t.c_iflag |= IXON;
+        }
+        else if (xf86NameCmp(s, "XonXoff") == 0) {
+            t.c_iflag |= IXON | IXOFF;
+        }
+        else if (xf86NameCmp(s, "None") == 0) {
+            t.c_iflag &= ~(IXON | IXOFF);
+        }
+        else {
+            xf86Msg(X_ERROR, "Invalid Option FlowControl value: %s\n", s);
+            return -1;
+        }
+    }
+
+    if ((xf86SetBoolOption(options, "ClearDTR", FALSE))) {
 #ifdef CLEARDTR_SUPPORT
-# if defined(TIOCMBIC)
-		val = TIOCM_DTR;
-		SYSCALL (ioctl(fd, TIOCMBIC, &val));
-# else
-		SYSCALL (ioctl(fd, TIOCCDTR, NULL));
-# endif
+#if defined(TIOCMBIC)
+        val = TIOCM_DTR;
+        SYSCALL(ioctl(fd, TIOCMBIC, &val));
+#else
+        SYSCALL(ioctl(fd, TIOCCDTR, NULL));
+#endif
 #else
-		xf86Msg (X_WARNING,
-			 "Option ClearDTR not supported on this OS\n");
-			return -1;
+        xf86Msg(X_WARNING, "Option ClearDTR not supported on this OS\n");
+        return -1;
 #endif
-		xf86MarkOptionUsedByName (options, "ClearDTR");
-	}
-
-	if ((xf86SetBoolOption (options, "ClearRTS", FALSE)))
-	{
-		xf86Msg (X_WARNING,
-			 "Option ClearRTS not supported on this OS\n");
-			return -1;
-		xf86MarkOptionUsedByName (options, "ClearRTS");
-	}
-
-	SYSCALL (r = tcsetattr (fd, TCSANOW, &t));
-	return r;
+        xf86MarkOptionUsedByName(options, "ClearDTR");
+    }
+
+    if ((xf86SetBoolOption(options, "ClearRTS", FALSE))) {
+        xf86Msg(X_WARNING, "Option ClearRTS not supported on this OS\n");
+        return -1;
+        xf86MarkOptionUsedByName(options, "ClearRTS");
+    }
+
+    SYSCALL(r = tcsetattr(fd, TCSANOW, &t));
+    return r;
 }
 
 int
-xf86SetSerialSpeed (int fd, int speed)
+xf86SetSerialSpeed(int fd, int speed)
 {
-	struct termios t;
-	int baud, r;
-
-	if (fd < 0)
-		return -1;
-
-	/* Don't try to set parameters for non-tty devices. */
-	if (!isatty(fd))
-		return 0;
-
-	SYSCALL (tcgetattr (fd, &t));
-
-	if ((baud = GetBaud (speed)))
-	{
-		cfsetispeed (&t, baud);
-		cfsetospeed (&t, baud);
-	}
-	else
-	{
-		xf86Msg (X_ERROR,
-			 "Invalid Option BaudRate value: %d\n", speed);
-		return -1;
-	}
-
-	SYSCALL (r = tcsetattr (fd, TCSANOW, &t));
-	return r;
+    struct termios t;
+    int baud, r;
+
+    if (fd < 0)
+        return -1;
+
+    /* Don't try to set parameters for non-tty devices. */
+    if (!isatty(fd))
+        return 0;
+
+    SYSCALL(tcgetattr(fd, &t));
+
+    if ((baud = GetBaud(speed))) {
+        cfsetispeed(&t, baud);
+        cfsetospeed(&t, baud);
+    }
+    else {
+        xf86Msg(X_ERROR, "Invalid Option BaudRate value: %d\n", speed);
+        return -1;
+    }
+
+    SYSCALL(r = tcsetattr(fd, TCSANOW, &t));
+    return r;
 }
 
 int
-xf86ReadSerial (int fd, void *buf, int count)
+xf86ReadSerial(int fd, void *buf, int count)
 {
-	int r;
-	int i;
-
-	SYSCALL (r = read (fd, buf, count));
-	DebugF("ReadingSerial: 0x%x",
-	       (unsigned char)*(((unsigned char *)buf)));
-	for (i = 1; i < r; i++)
-	    DebugF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i));
-	DebugF("\n");
-	return r;
+    int r;
+    int i;
+
+    SYSCALL(r = read(fd, buf, count));
+    DebugF("ReadingSerial: 0x%x", (unsigned char) *(((unsigned char *) buf)));
+    for (i = 1; i < r; i++)
+        DebugF(", 0x%x", (unsigned char) *(((unsigned char *) buf) + i));
+    DebugF("\n");
+    return r;
 }
 
 int
-xf86WriteSerial (int fd, const void *buf, int count)
+xf86WriteSerial(int fd, const void *buf, int count)
 {
-	int r;
-	int i;
-
-	DebugF("WritingSerial: 0x%x",(unsigned char)*(((unsigned char *)buf)));
-	for (i = 1; i < count; i++)
-	    DebugF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i));
-	DebugF("\n");
-	SYSCALL (r = write (fd, buf, count));
-	return r;
+    int r;
+    int i;
+
+    DebugF("WritingSerial: 0x%x", (unsigned char) *(((unsigned char *) buf)));
+    for (i = 1; i < count; i++)
+        DebugF(", 0x%x", (unsigned char) *(((unsigned char *) buf) + i));
+    DebugF("\n");
+    SYSCALL(r = write(fd, buf, count));
+    return r;
 }
 
 int
-xf86CloseSerial (int fd)
+xf86CloseSerial(int fd)
 {
-	int r;
+    int r;
 
-	SYSCALL (r = close (fd));
-	return r;
+    SYSCALL(r = close(fd));
+    return r;
 }
 
 int
-xf86WaitForInput (int fd, int timeout)
+xf86WaitForInput(int fd, int timeout)
 {
-	fd_set readfds;
-	struct timeval to;
-	int r;
-
-	FD_ZERO(&readfds);
-
-	if (fd >= 0) {
-	    FD_SET(fd, &readfds);
-	}
-	
-	to.tv_sec = timeout / 1000000;
-	to.tv_usec = timeout % 1000000;
-
-	if (fd >= 0) {
-	    SYSCALL (r = select (FD_SETSIZE, &readfds, NULL, NULL, &to));
-	}
-	else {
-	    SYSCALL (r = select (FD_SETSIZE, NULL, NULL, NULL, &to));
-	}
-	xf86ErrorFVerb (9,"select returned %d\n", r);
-	return r;
+    fd_set readfds;
+    struct timeval to;
+    int r;
+
+    FD_ZERO(&readfds);
+
+    if (fd >= 0) {
+        FD_SET(fd, &readfds);
+    }
+
+    to.tv_sec = timeout / 1000000;
+    to.tv_usec = timeout % 1000000;
+
+    if (fd >= 0) {
+        SYSCALL(r = select(FD_SETSIZE, &readfds, NULL, NULL, &to));
+    }
+    else {
+        SYSCALL(r = select(FD_SETSIZE, NULL, NULL, NULL, &to));
+    }
+    xf86ErrorFVerb(9, "select returned %d\n", r);
+    return r;
 }
 
 int
-xf86SerialSendBreak (int fd, int duration)
+xf86SerialSendBreak(int fd, int duration)
 {
-	int r;
+    int r;
+
+    SYSCALL(r = tcsendbreak(fd, duration));
+    return r;
 
-	SYSCALL (r = tcsendbreak (fd, duration));
-	return r;
-	
 }
 
 int
 xf86FlushInput(int fd)
 {
-	fd_set fds;
-	struct timeval timeout;
-	char c[4];
-
-	DebugF("FlushingSerial\n");
-	if (tcflush(fd, TCIFLUSH) == 0)
-		return 0;
-
-	timeout.tv_sec = 0;
-	timeout.tv_usec = 0;
-	FD_ZERO(&fds);
-	FD_SET(fd, &fds);
-	while (select(FD_SETSIZE, &fds, NULL, NULL, &timeout) > 0) {
-		if (read(fd, &c, sizeof(c)) < 1)
-		    return 0;
-		FD_ZERO(&fds);
-		FD_SET(fd, &fds);
-	}
-	return 0;
+    fd_set fds;
+    struct timeval timeout;
+    char c[4];
+
+    DebugF("FlushingSerial\n");
+    if (tcflush(fd, TCIFLUSH) == 0)
+        return 0;
+
+    timeout.tv_sec = 0;
+    timeout.tv_usec = 0;
+    FD_ZERO(&fds);
+    FD_SET(fd, &fds);
+    while (select(FD_SETSIZE, &fds, NULL, NULL, &timeout) > 0) {
+        if (read(fd, &c, sizeof(c)) < 1)
+            return 0;
+        FD_ZERO(&fds);
+        FD_SET(fd, &fds);
+    }
+    return 0;
 }
 
 static struct states {
-	int xf;
-	int os;
+    int xf;
+    int os;
 } modemStates[] = {
 #ifdef TIOCM_LE
-	{ XF86_M_LE, TIOCM_LE },
+    {
+    XF86_M_LE, TIOCM_LE},
 #endif
 #ifdef TIOCM_DTR
-	{ XF86_M_DTR, TIOCM_DTR },
+    {
+    XF86_M_DTR, TIOCM_DTR},
 #endif
 #ifdef TIOCM_RTS
-	{ XF86_M_RTS, TIOCM_RTS },
+    {
+    XF86_M_RTS, TIOCM_RTS},
 #endif
 #ifdef TIOCM_ST
-	{ XF86_M_ST, TIOCM_ST },
+    {
+    XF86_M_ST, TIOCM_ST},
 #endif
 #ifdef TIOCM_SR
-	{ XF86_M_SR, TIOCM_SR },
+    {
+    XF86_M_SR, TIOCM_SR},
 #endif
 #ifdef TIOCM_CTS
-	{ XF86_M_CTS, TIOCM_CTS },
+    {
+    XF86_M_CTS, TIOCM_CTS},
 #endif
 #ifdef TIOCM_CAR
-	{ XF86_M_CAR, TIOCM_CAR },
+    {
+    XF86_M_CAR, TIOCM_CAR},
 #elif defined(TIOCM_CD)
-	{ XF86_M_CAR, TIOCM_CD },
+    {
+    XF86_M_CAR, TIOCM_CD},
 #endif
 #ifdef TIOCM_RNG
-	{ XF86_M_RNG, TIOCM_RNG },
+    {
+    XF86_M_RNG, TIOCM_RNG},
 #elif defined(TIOCM_RI)
-	{ XF86_M_CAR, TIOCM_RI },
+    {
+    XF86_M_CAR, TIOCM_RI},
 #endif
 #ifdef TIOCM_DSR
-	{ XF86_M_DSR, TIOCM_DSR },
+    {
+    XF86_M_DSR, TIOCM_DSR},
 #endif
 };
 
@@ -521,35 +493,36 @@ static int numStates = sizeof(modemStates) / sizeof(modemStates[0]);
 static int
 xf2osState(int state)
 {
-	int i;
-	int ret = 0;
+    int i;
+    int ret = 0;
 
-	for (i = 0; i < numStates; i++)
-		if (state & modemStates[i].xf)
-			ret |= modemStates[i].os;
-	return ret;
+    for (i = 0; i < numStates; i++)
+        if (state & modemStates[i].xf)
+            ret |= modemStates[i].os;
+    return ret;
 }
 
 static int
 os2xfState(int state)
 {
-	int i;
-	int ret = 0;
+    int i;
+    int ret = 0;
 
-	for (i = 0; i < numStates; i++)
-		if (state & modemStates[i].os)
-			ret |= modemStates[i].xf;
-	return ret;
+    for (i = 0; i < numStates; i++)
+        if (state & modemStates[i].os)
+            ret |= modemStates[i].xf;
+    return ret;
 }
 
 static int
 getOsStateMask(void)
 {
-	int i;
-	int ret = 0;
-	for (i = 0; i < numStates; i++)
-		ret |= modemStates[i].os;
-	return ret;
+    int i;
+    int ret = 0;
+
+    for (i = 0; i < numStates; i++)
+        ret |= modemStates[i].os;
+    return ret;
 }
 
 static int osStateMask = 0;
@@ -557,99 +530,99 @@ static int osStateMask = 0;
 int
 xf86SetSerialModemState(int fd, int state)
 {
-	int ret;
-	int s;
+    int ret;
+    int s;
 
-	if (fd < 0)
-		return -1;
+    if (fd < 0)
+        return -1;
 
-	/* Don't try to set parameters for non-tty devices. */
-	if (!isatty(fd))
-		return 0;
+    /* Don't try to set parameters for non-tty devices. */
+    if (!isatty(fd))
+        return 0;
 
 #ifndef TIOCMGET
-	return -1;
+    return -1;
 #else
-	if (!osStateMask)
-		osStateMask = getOsStateMask();
-
-	state = xf2osState(state);
-	SYSCALL((ret = ioctl(fd, TIOCMGET, &s)));
-	if (ret < 0)
-		return -1;
-	s &= ~osStateMask;
-	s |= state;
-	SYSCALL((ret = ioctl(fd, TIOCMSET, &s)));
-	if (ret < 0)
-		return -1;
-	else
-		return 0;
+    if (!osStateMask)
+        osStateMask = getOsStateMask();
+
+    state = xf2osState(state);
+    SYSCALL((ret = ioctl(fd, TIOCMGET, &s)));
+    if (ret < 0)
+        return -1;
+    s &= ~osStateMask;
+    s |= state;
+    SYSCALL((ret = ioctl(fd, TIOCMSET, &s)));
+    if (ret < 0)
+        return -1;
+    else
+        return 0;
 #endif
 }
 
 int
 xf86GetSerialModemState(int fd)
 {
-	int ret;
-	int s;
+    int ret;
+    int s;
 
-	if (fd < 0)
-		return -1;
+    if (fd < 0)
+        return -1;
 
-	/* Don't try to set parameters for non-tty devices. */
-	if (!isatty(fd))
-		return 0;
+    /* Don't try to set parameters for non-tty devices. */
+    if (!isatty(fd))
+        return 0;
 
 #ifndef TIOCMGET
-	return -1;
+    return -1;
 #else
-	SYSCALL((ret = ioctl(fd, TIOCMGET, &s)));
-	if (ret < 0)
-		return -1;
-	return os2xfState(s);
+    SYSCALL((ret = ioctl(fd, TIOCMGET, &s)));
+    if (ret < 0)
+        return -1;
+    return os2xfState(s);
 #endif
 }
 
 int
 xf86SerialModemSetBits(int fd, int bits)
 {
-	int ret;
-	int s;
+    int ret;
+    int s;
 
-	if (fd < 0)
-		return -1;
+    if (fd < 0)
+        return -1;
 
-	/* Don't try to set parameters for non-tty devices. */
-	if (!isatty(fd))
-		return 0;
+    /* Don't try to set parameters for non-tty devices. */
+    if (!isatty(fd))
+        return 0;
 
 #ifndef TIOCMGET
-	return -1;
+    return -1;
 #else
-	s = xf2osState(bits);
-	SYSCALL((ret = ioctl(fd, TIOCMBIS, &s)));
-	return ret;
+    s = xf2osState(bits);
+    SYSCALL((ret = ioctl(fd, TIOCMBIS, &s)));
+    return ret;
 #endif
 }
 
 int
 xf86SerialModemClearBits(int fd, int bits)
 {
-	int ret;
-	int s;
+    int ret;
+    int s;
 
-	if (fd < 0)
-		return -1;
+    if (fd < 0)
+        return -1;
 
-	/* Don't try to set parameters for non-tty devices. */
-	if (!isatty(fd))
-		return 0;
+    /* Don't try to set parameters for non-tty devices. */
+    if (!isatty(fd))
+        return 0;
 
 #ifndef TIOCMGET
-	return -1;
+    return -1;
 #else
-	s = xf2osState(bits);
-	SYSCALL((ret = ioctl(fd, TIOCMBIC, &s)));
-	return ret;
+    s = xf2osState(bits);
+    SYSCALL((ret = ioctl(fd, TIOCMBIC, &s)));
+    return ret;
 #endif
 }
diff --git a/xorg-server/hw/xfree86/os-support/shared/sigio.c b/xorg-server/hw/xfree86/os-support/shared/sigio.c
index ef04c1140..12ae8a480 100644
--- a/xorg-server/hw/xfree86/os-support/shared/sigio.c
+++ b/xorg-server/hw/xfree86/os-support/shared/sigio.c
@@ -1,309 +1,301 @@
-/* sigio.c -- Support for SIGIO handler installation and removal

- * Created: Thu Jun  3 15:39:18 1999 by faith@precisioninsight.com

- *

- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.

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

- * PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.

- * 

- * Authors: Rickard E. (Rik) Faith <faith@valinux.com>

- */

-/*

- * Copyright (c) 2002 by The XFree86 Project, Inc.

- *

- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-# include <X11/X.h>

-# include "xf86.h"

-# include "xf86Priv.h"

-# include "xf86_OSlib.h"

-# include "inputstr.h"

-

-#ifdef HAVE_STROPTS_H

-# include <stropts.h>

-#endif

-

-#ifdef MAXDEVICES

-/* MAXDEVICES represents the maximimum number of input devices usable

- * at the same time plus one entry for DRM support.

- */

-# define MAX_FUNCS   (MAXDEVICES + 1)

-#else

-# define MAX_FUNCS 16

-#endif

-

-typedef struct _xf86SigIOFunc {

-    void    (*f) (int, void *);

-    int	    fd;

-    void    *closure;

-} Xf86SigIOFunc;

-

-static Xf86SigIOFunc	xf86SigIOFuncs[MAX_FUNCS];

-static int		xf86SigIOMax;

-static int		xf86SigIOMaxFd;

-static fd_set		xf86SigIOMask;

-

-/*

- * SIGIO gives no way of discovering which fd signalled, select

- * to discover

- */

-static void

-xf86SIGIO (int sig)

-{

-    int	    i;

-    fd_set  ready;

-    struct timeval  to;

-    int save_errno = errno;	/* do not clobber the global errno */

-    int	    r;

-

-    ready = xf86SigIOMask;

-    to.tv_sec = 0;

-    to.tv_usec = 0;

-    SYSCALL (r = select (xf86SigIOMaxFd, &ready, 0, 0, &to));

-    for (i = 0; r > 0 && i < xf86SigIOMax; i++)

-	if (xf86SigIOFuncs[i].f && FD_ISSET (xf86SigIOFuncs[i].fd, &ready))

-	{

-	    (*xf86SigIOFuncs[i].f)(xf86SigIOFuncs[i].fd,

-				   xf86SigIOFuncs[i].closure);

-	    r--;

-	}

-    if (r > 0) {

-      xf86Msg(X_ERROR, "SIGIO %d descriptors not handled\n", r);

-    }

-    /* restore global errno */

-    errno = save_errno;

-}

-

-static int

-xf86IsPipe (int fd)

-{

-    struct stat	buf;

-    

-    if (fstat (fd, &buf) < 0)

-	return 0;

-    return S_ISFIFO(buf.st_mode);

-}

-

-int

-xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure)

-{

-    struct sigaction sa;

-    struct sigaction osa;

-    int	i;

-    int blocked;

-    int installed = FALSE;

-

-    if (!xf86Info.useSIGIO)

-	return 0;

-

-    for (i = 0; i < MAX_FUNCS; i++)

-    {

-	if (!xf86SigIOFuncs[i].f)

-	{

-	    if (xf86IsPipe (fd))

-		return 0;

-	    blocked = xf86BlockSIGIO();

-#ifdef O_ASYNC

-	    if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) {

-		xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n",

-			fd, strerror(errno));

-	    } else {

-		if (fcntl(fd, F_SETOWN, getpid()) == -1) {

-		    xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n",

-			    fd, strerror(errno));

-		} else {

-		    installed = TRUE;

-		}

-	    }

-#endif

-#ifdef I_SETSIG /* System V Streams - used on Solaris for input devices */

-	    if (!installed && isastream(fd)) {

-		if (ioctl(fd, I_SETSIG, S_INPUT | S_ERROR | S_HANGUP) == -1) {

-		    xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG): %s\n",

-			    fd, strerror(errno));

-		} else {

-		    installed = TRUE;

-		}

-	    }

-#endif

-	    if (!installed) {

-		xf86UnblockSIGIO(blocked);

-		return 0;

-	    }

-	    sigemptyset(&sa.sa_mask);

-	    sigaddset(&sa.sa_mask, SIGIO);

-	    sa.sa_flags   = 0;

-	    sa.sa_handler = xf86SIGIO;

-	    sigaction(SIGIO, &sa, &osa);

-	    xf86SigIOFuncs[i].fd = fd;

-	    xf86SigIOFuncs[i].closure = closure;

-	    xf86SigIOFuncs[i].f = f;

-	    if (i >= xf86SigIOMax)

-		xf86SigIOMax = i+1;

-	    if (fd >= xf86SigIOMaxFd)

-		xf86SigIOMaxFd = fd + 1;

-	    FD_SET (fd, &xf86SigIOMask);

-	    xf86UnblockSIGIO(blocked);

-	    return 1;

-	}

- 	/* Allow overwriting of the closure and callback */

- 	else if (xf86SigIOFuncs[i].fd == fd)

- 	{

- 	    xf86SigIOFuncs[i].closure = closure;

- 	    xf86SigIOFuncs[i].f = f;

- 	    return 1;

- 	}

-    }

-    return 0;

-}

-

-int

-xf86RemoveSIGIOHandler(int fd)

-{

-    struct sigaction sa;

-    struct sigaction osa;

-    int	i;

-    int max;

-    int maxfd;

-    int ret;

-

-    if (!xf86Info.useSIGIO)

-	return 0;

-

-    max = 0;

-    maxfd = -1;

-    ret = 0;

-    for (i = 0; i < MAX_FUNCS; i++)

-    {

-	if (xf86SigIOFuncs[i].f)

-	{

-	    if (xf86SigIOFuncs[i].fd == fd)

-	    {

-		xf86SigIOFuncs[i].f = 0;

-		xf86SigIOFuncs[i].fd = 0;

-		xf86SigIOFuncs[i].closure = 0;

-		FD_CLR (fd, &xf86SigIOMask);

-		ret = 1;

-	    }

-	    else

-	    {

-		max = i + 1;

-		if (xf86SigIOFuncs[i].fd >= maxfd)

-		    maxfd = xf86SigIOFuncs[i].fd + 1;

-	    }

-	}

-    }

-    if (ret)

-    {

-#ifdef O_ASYNC

-	fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~O_ASYNC);

-#endif

-#ifdef I_SETSIG

-	if (isastream(fd)) {

-	    if (ioctl(fd, I_SETSIG, 0) == -1) {

-		xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG, 0): %s\n",

-			fd, strerror(errno));

-	    }

-	}

-#endif

-	xf86SigIOMax = max;

-	xf86SigIOMaxFd = maxfd;

-	if (!max)

-	{

-	    sigemptyset(&sa.sa_mask);

-	    sigaddset(&sa.sa_mask, SIGIO);

-	    sa.sa_flags   = 0;

-	    sa.sa_handler = SIG_IGN;

-	    sigaction(SIGIO, &sa, &osa);

-	}

-    }

-    return ret;

-}

-

-int

-xf86BlockSIGIO (void)

-{

-    sigset_t	set, old;

-    int		ret;

-    

-    sigemptyset (&set);

-    sigaddset (&set, SIGIO);

-    sigprocmask (SIG_BLOCK, &set, &old);

-    ret = sigismember (&old, SIGIO);

-    return ret; 

-}

-

-void

-xf86UnblockSIGIO (int wasset)

-{

-    sigset_t	set;

-

-    if (!wasset)

-    {

-	sigemptyset (&set);

-	sigaddset (&set, SIGIO);

-	sigprocmask (SIG_UNBLOCK, &set, NULL);

-    }

-}

-

-void

-xf86AssertBlockedSIGIO (char *where)

-{

-    sigset_t	set, old;

-

-    sigemptyset (&set);

-    sigprocmask (SIG_BLOCK, &set, &old);

-    if (!sigismember (&old, SIGIO))

-	xf86Msg (X_ERROR, "SIGIO not blocked at %s\n", where);

-}

-

-/* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */

-

-int

-xf86SIGIOSupported (void)

-{

-    return 1;

-}

+/* sigio.c -- Support for SIGIO handler installation and removal
+ * Created: Thu Jun  3 15:39:18 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * 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
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+ * 
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ */
+/*
+ * Copyright (c) 2002 by The XFree86 Project, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+#include "inputstr.h"
+
+#ifdef HAVE_STROPTS_H
+#include <stropts.h>
+#endif
+
+#ifdef MAXDEVICES
+/* MAXDEVICES represents the maximimum number of input devices usable
+ * at the same time plus one entry for DRM support.
+ */
+#define MAX_FUNCS   (MAXDEVICES + 1)
+#else
+#define MAX_FUNCS 16
+#endif
+
+typedef struct _xf86SigIOFunc {
+    void (*f) (int, void *);
+    int fd;
+    void *closure;
+} Xf86SigIOFunc;
+
+static Xf86SigIOFunc xf86SigIOFuncs[MAX_FUNCS];
+static int xf86SigIOMax;
+static int xf86SigIOMaxFd;
+static fd_set xf86SigIOMask;
+
+/*
+ * SIGIO gives no way of discovering which fd signalled, select
+ * to discover
+ */
+static void
+xf86SIGIO(int sig)
+{
+    int i;
+    fd_set ready;
+    struct timeval to;
+    int save_errno = errno;     /* do not clobber the global errno */
+    int r;
+
+    ready = xf86SigIOMask;
+    to.tv_sec = 0;
+    to.tv_usec = 0;
+    SYSCALL(r = select(xf86SigIOMaxFd, &ready, 0, 0, &to));
+    for (i = 0; r > 0 && i < xf86SigIOMax; i++)
+        if (xf86SigIOFuncs[i].f && FD_ISSET(xf86SigIOFuncs[i].fd, &ready)) {
+            (*xf86SigIOFuncs[i].f) (xf86SigIOFuncs[i].fd,
+                                    xf86SigIOFuncs[i].closure);
+            r--;
+        }
+    if (r > 0) {
+        xf86Msg(X_ERROR, "SIGIO %d descriptors not handled\n", r);
+    }
+    /* restore global errno */
+    errno = save_errno;
+}
+
+static int
+xf86IsPipe(int fd)
+{
+    struct stat buf;
+
+    if (fstat(fd, &buf) < 0)
+        return 0;
+    return S_ISFIFO(buf.st_mode);
+}
+
+int
+xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
+{
+    struct sigaction sa;
+    struct sigaction osa;
+    int i;
+    int blocked;
+    int installed = FALSE;
+
+    if (!xf86Info.useSIGIO)
+        return 0;
+
+    for (i = 0; i < MAX_FUNCS; i++) {
+        if (!xf86SigIOFuncs[i].f) {
+            if (xf86IsPipe(fd))
+                return 0;
+            blocked = xf86BlockSIGIO();
+#ifdef O_ASYNC
+            if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) {
+                xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n",
+                        fd, strerror(errno));
+            }
+            else {
+                if (fcntl(fd, F_SETOWN, getpid()) == -1) {
+                    xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n",
+                            fd, strerror(errno));
+                }
+                else {
+                    installed = TRUE;
+                }
+            }
+#endif
+#ifdef I_SETSIG                 /* System V Streams - used on Solaris for input devices */
+            if (!installed && isastream(fd)) {
+                if (ioctl(fd, I_SETSIG, S_INPUT | S_ERROR | S_HANGUP) == -1) {
+                    xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG): %s\n",
+                            fd, strerror(errno));
+                }
+                else {
+                    installed = TRUE;
+                }
+            }
+#endif
+            if (!installed) {
+                xf86UnblockSIGIO(blocked);
+                return 0;
+            }
+            sigemptyset(&sa.sa_mask);
+            sigaddset(&sa.sa_mask, SIGIO);
+            sa.sa_flags = 0;
+            sa.sa_handler = xf86SIGIO;
+            sigaction(SIGIO, &sa, &osa);
+            xf86SigIOFuncs[i].fd = fd;
+            xf86SigIOFuncs[i].closure = closure;
+            xf86SigIOFuncs[i].f = f;
+            if (i >= xf86SigIOMax)
+                xf86SigIOMax = i + 1;
+            if (fd >= xf86SigIOMaxFd)
+                xf86SigIOMaxFd = fd + 1;
+            FD_SET(fd, &xf86SigIOMask);
+            xf86UnblockSIGIO(blocked);
+            return 1;
+        }
+        /* Allow overwriting of the closure and callback */
+        else if (xf86SigIOFuncs[i].fd == fd) {
+            xf86SigIOFuncs[i].closure = closure;
+            xf86SigIOFuncs[i].f = f;
+            return 1;
+        }
+    }
+    return 0;
+}
+
+int
+xf86RemoveSIGIOHandler(int fd)
+{
+    struct sigaction sa;
+    struct sigaction osa;
+    int i;
+    int max;
+    int maxfd;
+    int ret;
+
+    if (!xf86Info.useSIGIO)
+        return 0;
+
+    max = 0;
+    maxfd = -1;
+    ret = 0;
+    for (i = 0; i < MAX_FUNCS; i++) {
+        if (xf86SigIOFuncs[i].f) {
+            if (xf86SigIOFuncs[i].fd == fd) {
+                xf86SigIOFuncs[i].f = 0;
+                xf86SigIOFuncs[i].fd = 0;
+                xf86SigIOFuncs[i].closure = 0;
+                FD_CLR(fd, &xf86SigIOMask);
+                ret = 1;
+            }
+            else {
+                max = i + 1;
+                if (xf86SigIOFuncs[i].fd >= maxfd)
+                    maxfd = xf86SigIOFuncs[i].fd + 1;
+            }
+        }
+    }
+    if (ret) {
+#ifdef O_ASYNC
+        fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~O_ASYNC);
+#endif
+#ifdef I_SETSIG
+        if (isastream(fd)) {
+            if (ioctl(fd, I_SETSIG, 0) == -1) {
+                xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG, 0): %s\n",
+                        fd, strerror(errno));
+            }
+        }
+#endif
+        xf86SigIOMax = max;
+        xf86SigIOMaxFd = maxfd;
+        if (!max) {
+            sigemptyset(&sa.sa_mask);
+            sigaddset(&sa.sa_mask, SIGIO);
+            sa.sa_flags = 0;
+            sa.sa_handler = SIG_IGN;
+            sigaction(SIGIO, &sa, &osa);
+        }
+    }
+    return ret;
+}
+
+int
+xf86BlockSIGIO(void)
+{
+    sigset_t set, old;
+    int ret;
+
+    sigemptyset(&set);
+    sigaddset(&set, SIGIO);
+    sigprocmask(SIG_BLOCK, &set, &old);
+    ret = sigismember(&old, SIGIO);
+    return ret;
+}
+
+void
+xf86UnblockSIGIO(int wasset)
+{
+    sigset_t set;
+
+    if (!wasset) {
+        sigemptyset(&set);
+        sigaddset(&set, SIGIO);
+        sigprocmask(SIG_UNBLOCK, &set, NULL);
+    }
+}
+
+void
+xf86AssertBlockedSIGIO(char *where)
+{
+    sigset_t set, old;
+
+    sigemptyset(&set);
+    sigprocmask(SIG_BLOCK, &set, &old);
+    if (!sigismember(&old, SIGIO))
+        xf86Msg(X_ERROR, "SIGIO not blocked at %s\n", where);
+}
+
+/* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */
+
+int
+xf86SIGIOSupported(void)
+{
+    return 1;
+}
diff --git a/xorg-server/hw/xfree86/os-support/shared/vidmem.c b/xorg-server/hw/xfree86/os-support/shared/vidmem.c
index 54f6c6497..a7717d8f6 100644
--- a/xorg-server/hw/xfree86/os-support/shared/vidmem.c
+++ b/xorg-server/hw/xfree86/os-support/shared/vidmem.c
@@ -25,7 +25,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -51,240 +50,236 @@
  */
 
 typedef struct {
-	unsigned long 	size;
-	pointer		virtBase;
-	pointer 	mtrrInfo;
+    unsigned long size;
+    pointer virtBase;
+    pointer mtrrInfo;
 } MappingRec, *MappingPtr;
-	
+
 typedef struct {
-	int		numMappings;
-	MappingPtr *	mappings;
-	Bool		mtrrEnabled;
-	MessageType	mtrrFrom;
-	Bool		mtrrOptChecked;
-	ScrnInfoPtr	pScrn;
+    int numMappings;
+    MappingPtr *mappings;
+    Bool mtrrEnabled;
+    MessageType mtrrFrom;
+    Bool mtrrOptChecked;
+    ScrnInfoPtr pScrn;
 } VidMapRec, *VidMapPtr;
 
 static int vidMapIndex = -1;
 
 #define VIDMAPPTR(p) ((VidMapPtr)((p)->privates[vidMapIndex].ptr))
 
-static VidMemInfo vidMemInfo = {FALSE, };
-static VidMapRec  vidMapRec  = {0, NULL, TRUE, X_DEFAULT, FALSE, NULL};
+static VidMemInfo vidMemInfo = { FALSE, };
+static VidMapRec vidMapRec = { 0, NULL, TRUE, X_DEFAULT, FALSE, NULL };
 
 static VidMapPtr
 getVidMapRec(int scrnIndex)
 {
-	VidMapPtr vp;
-	ScrnInfoPtr pScrn;
+    VidMapPtr vp;
+    ScrnInfoPtr pScrn;
 
-	if ((scrnIndex < 0) ||
-	    !(pScrn = xf86Screens[scrnIndex]))
-		return &vidMapRec;
+    if ((scrnIndex < 0) || !(pScrn = xf86Screens[scrnIndex]))
+        return &vidMapRec;
 
-	if (vidMapIndex < 0)
-		vidMapIndex = xf86AllocateScrnInfoPrivateIndex();
+    if (vidMapIndex < 0)
+        vidMapIndex = xf86AllocateScrnInfoPrivateIndex();
 
-	if (VIDMAPPTR(pScrn) != NULL)
-		return VIDMAPPTR(pScrn);
+    if (VIDMAPPTR(pScrn) != NULL)
+        return VIDMAPPTR(pScrn);
 
-	vp = pScrn->privates[vidMapIndex].ptr = xnfcalloc(sizeof(VidMapRec), 1);
-	vp->mtrrEnabled = TRUE;	/* default to enabled */
-	vp->mtrrFrom = X_DEFAULT;
-	vp->mtrrOptChecked = FALSE;
-	vp->pScrn = pScrn;
-	return vp;
+    vp = pScrn->privates[vidMapIndex].ptr = xnfcalloc(sizeof(VidMapRec), 1);
+    vp->mtrrEnabled = TRUE;     /* default to enabled */
+    vp->mtrrFrom = X_DEFAULT;
+    vp->mtrrOptChecked = FALSE;
+    vp->pScrn = pScrn;
+    return vp;
 }
 
 static MappingPtr
 newMapping(VidMapPtr vp)
 {
-	vp->mappings = xnfrealloc(vp->mappings, sizeof(MappingPtr) *
-				  (vp->numMappings + 1));
-	vp->mappings[vp->numMappings] = xnfcalloc(sizeof(MappingRec), 1);
-	return vp->mappings[vp->numMappings++];
+    vp->mappings = xnfrealloc(vp->mappings, sizeof(MappingPtr) *
+                              (vp->numMappings + 1));
+    vp->mappings[vp->numMappings] = xnfcalloc(sizeof(MappingRec), 1);
+    return vp->mappings[vp->numMappings++];
 }
 
 static MappingPtr
 findMapping(VidMapPtr vp, pointer vbase, unsigned long size)
 {
-	int i;
-
-	for (i = 0; i < vp->numMappings; i++) {
-		if (vp->mappings[i]->virtBase == vbase &&
-		    vp->mappings[i]->size == size)
-			return vp->mappings[i];
-	}
-	return NULL;
+    int i;
+
+    for (i = 0; i < vp->numMappings; i++) {
+        if (vp->mappings[i]->virtBase == vbase && vp->mappings[i]->size == size)
+            return vp->mappings[i];
+    }
+    return NULL;
 }
 
 static void
 removeMapping(VidMapPtr vp, MappingPtr mp)
 {
-	int i, found = 0;
-
-	for (i = 0; i < vp->numMappings; i++) {
-		if (vp->mappings[i] == mp) {
-			found = 1;
-			free(vp->mappings[i]);
-		} else if (found) {
-			vp->mappings[i - 1] = vp->mappings[i];
-		}
-	}
-	vp->numMappings--;
-	vp->mappings[vp->numMappings] = NULL;
+    int i, found = 0;
+
+    for (i = 0; i < vp->numMappings; i++) {
+        if (vp->mappings[i] == mp) {
+            found = 1;
+            free(vp->mappings[i]);
+        }
+        else if (found) {
+            vp->mappings[i - 1] = vp->mappings[i];
+        }
+    }
+    vp->numMappings--;
+    vp->mappings[vp->numMappings] = NULL;
 }
 
 enum { OPTION_MTRR };
-static const OptionInfoRec opts[] =
-{
-	{ OPTION_MTRR, "mtrr", OPTV_BOOLEAN, {0}, FALSE },
-	{ -1, NULL, OPTV_NONE, {0}, FALSE }
+
+static const OptionInfoRec opts[] = {
+    {OPTION_MTRR, "mtrr", OPTV_BOOLEAN, {0}, FALSE},
+    {-1, NULL, OPTV_NONE, {0}, FALSE}
 };
 
 static void
 checkMtrrOption(VidMapPtr vp)
 {
-	if (!vp->mtrrOptChecked && vp->pScrn && vp->pScrn->options != NULL) {
-		OptionInfoPtr options;
-
-		options = xnfalloc(sizeof(opts));
-		(void)memcpy(options, opts, sizeof(opts));
-		xf86ProcessOptions(vp->pScrn->scrnIndex, vp->pScrn->options,
-					options);
-		if (xf86GetOptValBool(options, OPTION_MTRR, &vp->mtrrEnabled))
-			vp->mtrrFrom = X_CONFIG;
-		free(options);
-		vp->mtrrOptChecked = TRUE;
-	}
+    if (!vp->mtrrOptChecked && vp->pScrn && vp->pScrn->options != NULL) {
+        OptionInfoPtr options;
+
+        options = xnfalloc(sizeof(opts));
+        (void) memcpy(options, opts, sizeof(opts));
+        xf86ProcessOptions(vp->pScrn->scrnIndex, vp->pScrn->options, options);
+        if (xf86GetOptValBool(options, OPTION_MTRR, &vp->mtrrEnabled))
+            vp->mtrrFrom = X_CONFIG;
+        free(options);
+        vp->mtrrOptChecked = TRUE;
+    }
 }
 
 void
-xf86MakeNewMapping(int ScreenNum, int Flags, unsigned long Base, unsigned long Size, pointer Vbase)
+xf86MakeNewMapping(int ScreenNum, int Flags, unsigned long Base,
+                   unsigned long Size, pointer Vbase)
 {
-	VidMapPtr vp;
-	MappingPtr mp;
+    VidMapPtr vp;
+    MappingPtr mp;
 
-	vp = getVidMapRec(ScreenNum);
-	mp = newMapping(vp);
-	mp->size = Size;
-	mp->virtBase = Vbase;
+    vp = getVidMapRec(ScreenNum);
+    mp = newMapping(vp);
+    mp->size = Size;
+    mp->virtBase = Vbase;
 }
 
 void
 xf86InitVidMem(void)
 {
-	if (!vidMemInfo.initialised) {
-		memset(&vidMemInfo, 0, sizeof(VidMemInfo));
-		xf86OSInitVidMem(&vidMemInfo);
-	}
+    if (!vidMemInfo.initialised) {
+        memset(&vidMemInfo, 0, sizeof(VidMemInfo));
+        xf86OSInitVidMem(&vidMemInfo);
+    }
 }
 
 pointer
 xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
 {
-	pointer vbase = NULL;
-	VidMapPtr vp;
-	MappingPtr mp;
-
-	if (((Flags & VIDMEM_FRAMEBUFFER) &&
-	     (Flags & (VIDMEM_MMIO | VIDMEM_MMIO_32BIT))))
-	    FatalError("Mapping memory with more than one type\n");
-	    
-	xf86InitVidMem();
-	if (!vidMemInfo.initialised || !vidMemInfo.mapMem)
-		return NULL;
-
-	vbase = vidMemInfo.mapMem(ScreenNum, Base, Size, Flags);
-
-	if (!vbase || vbase == (pointer)-1)
-		return NULL;
-
-	vp = getVidMapRec(ScreenNum);
-	mp = newMapping(vp);
-	mp->size = Size;
-	mp->virtBase = vbase;
-
-	/*
-	 * Check the "mtrr" option even when MTRR isn't supported to avoid
-	 * warnings about unrecognised options.
-	 */
-	checkMtrrOption(vp);
-
-	if (vp->mtrrEnabled && vidMemInfo.setWC) {
-		if (Flags & (VIDMEM_MMIO | VIDMEM_MMIO_32BIT))
-			mp->mtrrInfo =
-				vidMemInfo.setWC(ScreenNum, Base, Size, FALSE,
-						 vp->mtrrFrom);
-		else if (Flags & VIDMEM_FRAMEBUFFER)
-			mp->mtrrInfo =
-				vidMemInfo.setWC(ScreenNum, Base, Size, TRUE,
-						 vp->mtrrFrom);
-	}
-	return vbase;
+    pointer vbase = NULL;
+    VidMapPtr vp;
+    MappingPtr mp;
+
+    if (((Flags & VIDMEM_FRAMEBUFFER) &&
+         (Flags & (VIDMEM_MMIO | VIDMEM_MMIO_32BIT))))
+        FatalError("Mapping memory with more than one type\n");
+
+    xf86InitVidMem();
+    if (!vidMemInfo.initialised || !vidMemInfo.mapMem)
+        return NULL;
+
+    vbase = vidMemInfo.mapMem(ScreenNum, Base, Size, Flags);
+
+    if (!vbase || vbase == (pointer) -1)
+        return NULL;
+
+    vp = getVidMapRec(ScreenNum);
+    mp = newMapping(vp);
+    mp->size = Size;
+    mp->virtBase = vbase;
+
+    /*
+     * Check the "mtrr" option even when MTRR isn't supported to avoid
+     * warnings about unrecognised options.
+     */
+    checkMtrrOption(vp);
+
+    if (vp->mtrrEnabled && vidMemInfo.setWC) {
+        if (Flags & (VIDMEM_MMIO | VIDMEM_MMIO_32BIT))
+            mp->mtrrInfo =
+                vidMemInfo.setWC(ScreenNum, Base, Size, FALSE, vp->mtrrFrom);
+        else if (Flags & VIDMEM_FRAMEBUFFER)
+            mp->mtrrInfo =
+                vidMemInfo.setWC(ScreenNum, Base, Size, TRUE, vp->mtrrFrom);
+    }
+    return vbase;
 }
 
 void
 xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 {
-	VidMapPtr vp;
-	MappingPtr mp;
-
-	if (!vidMemInfo.initialised || !vidMemInfo.unmapMem) {
-		xf86DrvMsg(ScreenNum, X_WARNING,
-		  "xf86UnMapVidMem() called before xf86MapVidMem()\n");
-		return;
-	}
-
-	vp = getVidMapRec(ScreenNum);
-	mp = findMapping(vp, Base, Size);
-	if (!mp) {
-		xf86DrvMsg(ScreenNum, X_WARNING,
-		  "xf86UnMapVidMem: cannot find region for [%p,0x%lx]\n",
-		  Base, Size);
-		return;
-	}
-	if (vp->mtrrEnabled && vidMemInfo.undoWC && mp)
-		vidMemInfo.undoWC(ScreenNum, mp->mtrrInfo);
-
-	vidMemInfo.unmapMem(ScreenNum, Base, Size);
-	removeMapping(vp, mp);
+    VidMapPtr vp;
+    MappingPtr mp;
+
+    if (!vidMemInfo.initialised || !vidMemInfo.unmapMem) {
+        xf86DrvMsg(ScreenNum, X_WARNING,
+                   "xf86UnMapVidMem() called before xf86MapVidMem()\n");
+        return;
+    }
+
+    vp = getVidMapRec(ScreenNum);
+    mp = findMapping(vp, Base, Size);
+    if (!mp) {
+        xf86DrvMsg(ScreenNum, X_WARNING,
+                   "xf86UnMapVidMem: cannot find region for [%p,0x%lx]\n",
+                   Base, Size);
+        return;
+    }
+    if (vp->mtrrEnabled && vidMemInfo.undoWC && mp)
+        vidMemInfo.undoWC(ScreenNum, mp->mtrrInfo);
+
+    vidMemInfo.unmapMem(ScreenNum, Base, Size);
+    removeMapping(vp, mp);
 }
 
 Bool
 xf86CheckMTRR(int ScreenNum)
 {
-	VidMapPtr vp = getVidMapRec(ScreenNum);
-
-	/*
-	 * Check the "mtrr" option even when MTRR isn't supported to avoid
-	 * warnings about unrecognised options.
-	 */
-	checkMtrrOption(vp);
-
-	if (vp->mtrrEnabled && vidMemInfo.setWC)
-		return TRUE;
-		
-	return FALSE;
+    VidMapPtr vp = getVidMapRec(ScreenNum);
+
+    /*
+     * Check the "mtrr" option even when MTRR isn't supported to avoid
+     * warnings about unrecognised options.
+     */
+    checkMtrrOption(vp);
+
+    if (vp->mtrrEnabled && vidMemInfo.setWC)
+        return TRUE;
+
+    return FALSE;
 }
 
 Bool
 xf86LinearVidMem(void)
 {
-	xf86InitVidMem();
-	return vidMemInfo.linearSupported;
+    xf86InitVidMem();
+    return vidMemInfo.linearSupported;
 }
 
 void
 xf86MapReadSideEffects(int ScreenNum, int Flags, pointer base,
-			unsigned long Size)
+                       unsigned long Size)
 {
-	if (!(Flags & VIDMEM_READSIDEEFFECT))
-		return;
+    if (!(Flags & VIDMEM_READSIDEEFFECT))
+        return;
 
-	if (!vidMemInfo.initialised || !vidMemInfo.readSideEffects)
-		return;
+    if (!vidMemInfo.initialised || !vidMemInfo.readSideEffects)
+        return;
 
-	vidMemInfo.readSideEffects(ScreenNum, base, Size);
+    vidMemInfo.readSideEffects(ScreenNum, base, Size);
 }
-
diff --git a/xorg-server/hw/xfree86/os-support/shared/xf86Axp.c b/xorg-server/hw/xfree86/os-support/shared/xf86Axp.c
index e6511dd43..5f2f3985e 100644
--- a/xorg-server/hw/xfree86/os-support/shared/xf86Axp.c
+++ b/xorg-server/hw/xfree86/os-support/shared/xf86Axp.c
@@ -31,19 +31,30 @@
 
 #include "xf86Axp.h"
 
-axpParams xf86AXPParams[] = { 
-  {SYS_NONE,     0,         0,         0},
-  {TSUNAMI,      0,         0,         0},
-  {LCA,      1<<24,0xf8000000, 1UL << 32},
-  {APECS,    1<<24,0xf8000000, 1UL << 32},
-  {T2,           0,0xFC000000, 1UL << 31},
-  {T2_GAMMA,     0,0xFC000000, 1UL << 31},
-  {CIA,          0,0xE0000000, 1UL << 34},
-  {MCPCIA,       0,0xf8000000, 1UL << 31},
-  {JENSEN,       0, 0xE000000, 1UL << 32},
-  {POLARIS,      0,         0,         0},
-  {PYXIS,        0,         0,         0},
-  {PYXIS_CIA,    0,0xE0000000, 1UL << 34},
-  {IRONGATE,     0,         0,         0}
+axpParams xf86AXPParams[] = {
+    {SYS_NONE, 0, 0, 0}
+    ,
+    {TSUNAMI, 0, 0, 0}
+    ,
+    {LCA, 1 << 24, 0xf8000000, 1UL << 32}
+    ,
+    {APECS, 1 << 24, 0xf8000000, 1UL << 32}
+    ,
+    {T2, 0, 0xFC000000, 1UL << 31}
+    ,
+    {T2_GAMMA, 0, 0xFC000000, 1UL << 31}
+    ,
+    {CIA, 0, 0xE0000000, 1UL << 34}
+    ,
+    {MCPCIA, 0, 0xf8000000, 1UL << 31}
+    ,
+    {JENSEN, 0, 0xE000000, 1UL << 32}
+    ,
+    {POLARIS, 0, 0, 0}
+    ,
+    {PYXIS, 0, 0, 0}
+    ,
+    {PYXIS_CIA, 0, 0xE0000000, 1UL << 34}
+    ,
+    {IRONGATE, 0, 0, 0}
 };
-
diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_VTsw.c b/xorg-server/hw/xfree86/os-support/solaris/sun_VTsw.c
index d145ac77b..573358b43 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_VTsw.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_VTsw.c
@@ -1,137 +1,134 @@
-/*

- * Copyright (c) 2009, Oracle and/or its affiliates. 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.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-

-#include <door.h>

-#include <sys/vtdaemon.h>

-

-/*

- * Handle the VT-switching interface for Solaris/OpenSolaris

- */

-

-static int xf86VTPruneDoor = 0;

-

-void

-xf86VTRelease(int sig)

-{

-	if (xf86Info.vtPendingNum == -1)

-	{

-		xf86VTPruneDoor = 1;

-		xf86Info.vtRequestsPending = TRUE;

-		return;

-	}

-

-	ioctl(xf86Info.consoleFd, VT_RELDISP, 1);

-	xf86Info.vtPendingNum = -1;

-

-	return;

-}

-

-void

-xf86VTAcquire(int sig)

-{

-	xf86Info.vtRequestsPending = TRUE;

-	return;

-}

-

-Bool

-xf86VTSwitchPending(void)

-{

-    return xf86Info.vtRequestsPending ? TRUE : FALSE;

-}

-

-Bool

-xf86VTSwitchAway(void)

-{

-	int door_fd;

-	vt_cmd_arg_t vt_door_arg;

-	door_arg_t door_arg;

-

-	xf86Info.vtRequestsPending = FALSE;

-

-	if (xf86VTPruneDoor) {

-		xf86VTPruneDoor = 0;

-		ioctl(xf86Info.consoleFd, VT_RELDISP, 1);

-		return TRUE;

-	}

-

-	vt_door_arg.vt_ev = VT_EV_HOTKEYS;

-	vt_door_arg.vt_num = xf86Info.vtPendingNum;

-	door_arg.data_ptr = (char *)&vt_door_arg;

-	door_arg.data_size = sizeof (vt_cmd_arg_t);

-	door_arg.rbuf = NULL;

-	door_arg.rsize = 0;

-	door_arg.desc_ptr = NULL;

-	door_arg.desc_num = 0;

-

-	if ((door_fd = open(VT_DAEMON_DOOR_FILE, O_RDONLY)) < 0)

-		return FALSE;

-

-	if (door_call(door_fd, &door_arg) != 0) {

-		close(door_fd);

-		return FALSE;

-	}

-

-	close(door_fd);

-	return TRUE;

-}

-

-Bool

-xf86VTSwitchTo(void)

-{

-	xf86Info.vtRequestsPending = FALSE;

-	if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)

-	{

-		return FALSE;

-	}

-	else

-	{

-		return TRUE;

-	}

-}

-

-Bool

-xf86VTActivate(int vtno)

-{

-	struct vt_stat state;

-

-	if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &state) < 0)

-		return FALSE;

-

-	if ((state.v_state & (1 << vtno)) == 0)

-		return FALSE;

-

-	xf86Info.vtRequestsPending = TRUE;

-	xf86Info.vtPendingNum = vtno;

-

-	return TRUE;

-}

+/*
+ * Copyright (c) 2009, Oracle and/or its affiliates. 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.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+
+#include <door.h>
+#include <sys/vtdaemon.h>
+
+/*
+ * Handle the VT-switching interface for Solaris/OpenSolaris
+ */
+
+static int xf86VTPruneDoor = 0;
+
+void
+xf86VTRelease(int sig)
+{
+    if (xf86Info.vtPendingNum == -1) {
+        xf86VTPruneDoor = 1;
+        xf86Info.vtRequestsPending = TRUE;
+        return;
+    }
+
+    ioctl(xf86Info.consoleFd, VT_RELDISP, 1);
+    xf86Info.vtPendingNum = -1;
+
+    return;
+}
+
+void
+xf86VTAcquire(int sig)
+{
+    xf86Info.vtRequestsPending = TRUE;
+    return;
+}
+
+Bool
+xf86VTSwitchPending(void)
+{
+    return xf86Info.vtRequestsPending ? TRUE : FALSE;
+}
+
+Bool
+xf86VTSwitchAway(void)
+{
+    int door_fd;
+    vt_cmd_arg_t vt_door_arg;
+    door_arg_t door_arg;
+
+    xf86Info.vtRequestsPending = FALSE;
+
+    if (xf86VTPruneDoor) {
+        xf86VTPruneDoor = 0;
+        ioctl(xf86Info.consoleFd, VT_RELDISP, 1);
+        return TRUE;
+    }
+
+    vt_door_arg.vt_ev = VT_EV_HOTKEYS;
+    vt_door_arg.vt_num = xf86Info.vtPendingNum;
+    door_arg.data_ptr = (char *) &vt_door_arg;
+    door_arg.data_size = sizeof(vt_cmd_arg_t);
+    door_arg.rbuf = NULL;
+    door_arg.rsize = 0;
+    door_arg.desc_ptr = NULL;
+    door_arg.desc_num = 0;
+
+    if ((door_fd = open(VT_DAEMON_DOOR_FILE, O_RDONLY)) < 0)
+        return FALSE;
+
+    if (door_call(door_fd, &door_arg) != 0) {
+        close(door_fd);
+        return FALSE;
+    }
+
+    close(door_fd);
+    return TRUE;
+}
+
+Bool
+xf86VTSwitchTo(void)
+{
+    xf86Info.vtRequestsPending = FALSE;
+    if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0) {
+        return FALSE;
+    }
+    else {
+        return TRUE;
+    }
+}
+
+Bool
+xf86VTActivate(int vtno)
+{
+    struct vt_stat state;
+
+    if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &state) < 0)
+        return FALSE;
+
+    if ((state.v_state & (1 << vtno)) == 0)
+        return FALSE;
+
+    xf86Info.vtRequestsPending = TRUE;
+    xf86Info.vtPendingNum = vtno;
+
+    return TRUE;
+}
diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_apm.c b/xorg-server/hw/xfree86/os-support/solaris/sun_apm.c
index 7a5128ffb..4ff64649a 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_apm.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_apm.c
@@ -1,226 +1,227 @@
-/* Based on hw/xfree86/os-support/bsd/bsd_apm.c which bore no explicit

- * copyright notice, so is covered by the following notice:

- *

- * Copyright (C) 1994-2003 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of the XFree86 Project shall

- * not be used in advertising or otherwise to promote the sale, use or other

- * dealings in this Software without prior written authorization from the

- * XFree86 Project.

- */

-

-/* Copyright (c) 2005, Oracle and/or its affiliates. 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.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include "os.h"

-#include "xf86.h"

-#include "xf86Priv.h"

-#define XF86_OS_PRIVS

-#include "xf86_OSproc.h"

-#include "xf86_OSlib.h"

-

-#ifndef PLEASE_FIX_THIS

-#define APM_STANDBY_REQ 0xa01

-#define APM_SUSPEND_REQ 0xa02

-#define APM_NORMAL_RESUME 0xa03

-#define APM_CRIT_RESUME 0xa04

-#define APM_BATTERY_LOW 0xa05

-#define APM_POWER_CHANGE 0xa06

-#define APM_UPDATE_TIME 0xa07

-#define APM_CRIT_SUSPEND_REQ 0xa08

-#define APM_USER_STANDBY_REQ 0xa09

-#define APM_USER_SUSPEND_REQ 0xa0a

-#define APM_SYS_STANDBY_RESUME 0xa0b

-#define APM_IOC_NEXTEVENT 0xa0c

-#define APM_IOC_RESUME 0xa0d

-#define APM_IOC_SUSPEND 0xa0e

-#define APM_IOC_STANDBY 0xa0f

-#endif

-

-typedef struct apm_event_info 

-{

-	int	type;

-} apm_event_info;

-

-/*

- This may be replaced with a better device name

- very soon...

-*/

-#define APM_DEVICE "/dev/srn"

-#define APM_DEVICE1 "/dev/apm"

-

-static pointer APMihPtr = NULL;

-static void sunCloseAPM(void);

-

-static struct {

-    u_int apmBsd;

-    pmEvent xf86;

-} sunToXF86Array [] = {

-    { APM_STANDBY_REQ, XF86_APM_SYS_STANDBY },

-    { APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND },

-    { APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME },

-    { APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME },

-    { APM_BATTERY_LOW, XF86_APM_LOW_BATTERY },

-    { APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE },

-    { APM_UPDATE_TIME, XF86_APM_UPDATE_TIME },

-    { APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND },

-    { APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY },

-    { APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND },

-    { APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME },

-#ifdef APM_CAPABILITY_CHANGE

-    { APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED },

-#endif

-};

-

-#define numApmEvents (sizeof(sunToXF86Array) / sizeof(sunToXF86Array[0]))

-

-static pmEvent

-sunToXF86(int type)

-{

-    int i;

-

-    for (i = 0; i < numApmEvents; i++) {

-	if (type == sunToXF86Array[i].apmBsd) {

-	    return sunToXF86Array[i].xf86;

-	}

-    }

-    return XF86_APM_UNKNOWN;

-}

-

-/*

- * APM events can be requested direclty from /dev/apm 

- */

-static int 

-sunPMGetEventFromOS(int fd, pmEvent *events, int num)

-{

-    struct apm_event_info sunEvent;

-    int i;

-

-    for (i = 0; i < num; i++) {

-	

-	if (ioctl(fd, APM_IOC_NEXTEVENT, &sunEvent) < 0) {

-	    if (errno != EAGAIN) {

-		xf86Msg(X_WARNING, "sunPMGetEventFromOS: APM_IOC_NEXTEVENT"

-			" %s\n", strerror(errno));

-	    }

-	    break;

-	}

-	events[i] = sunToXF86(sunEvent.type);

-    }

-    xf86Msg(X_WARNING, "Got some events\n");

-    return i;

-}

-

-static pmWait

-sunPMConfirmEventToOs(int fd, pmEvent event)

-{

-    switch (event) {

-/* XXX: NOT CURRENTLY RETURNED FROM OS */

-      case XF86_APM_SYS_STANDBY:

-      case XF86_APM_USER_STANDBY:

-        if (ioctl( fd, APM_IOC_STANDBY, NULL ) == 0)

-            return PM_WAIT;  /* should we stop the Xserver in standby, too? */

-        else

-            return PM_NONE;

-      case XF86_APM_SYS_SUSPEND:

-      case XF86_APM_CRITICAL_SUSPEND:

-      case XF86_APM_USER_SUSPEND:

-	    xf86Msg(X_WARNING, "Got SUSPENDED\n");

-        if (ioctl( fd, APM_IOC_SUSPEND, NULL ) == 0)

-            return PM_CONTINUE;

-        else {

-	    xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_SUSPEND"

-		" %s\n", strerror(errno));

-            return PM_FAILED;

-	}

-      case XF86_APM_STANDBY_RESUME:

-      case XF86_APM_NORMAL_RESUME:

-      case XF86_APM_CRITICAL_RESUME:

-      case XF86_APM_STANDBY_FAILED:

-      case XF86_APM_SUSPEND_FAILED:

-	    xf86Msg(X_WARNING, "Got RESUME\n");

-        if (ioctl( fd, APM_IOC_RESUME, NULL ) == 0)

-            return PM_CONTINUE;

-        else {

-	    xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_RESUME"

-		" %s\n", strerror(errno));

-            return PM_FAILED;

-	}

-      default:

-	return PM_NONE;

-    }

-}

-

-PMClose

-xf86OSPMOpen(void)

-{

-    int fd;

-

-    if (APMihPtr || !xf86Info.pmFlag) {

-	return NULL;

-    }

-

-    if ((fd = open(APM_DEVICE, O_RDWR)) == -1) {

-    	if ((fd = open(APM_DEVICE1, O_RDWR)) == -1) {

-		return NULL;

-	}

-    }

-    xf86PMGetEventFromOs = sunPMGetEventFromOS;

-    xf86PMConfirmEventToOs = sunPMConfirmEventToOs;

-    APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);

-    return sunCloseAPM;

-}

-

-static void

-sunCloseAPM(void)

-{

-    int fd;

-

-    if (APMihPtr) {

-	fd = xf86RemoveGeneralHandler(APMihPtr);

-	close(fd);

-	APMihPtr = NULL;

-    }

-}

+/* Based on hw/xfree86/os-support/bsd/bsd_apm.c which bore no explicit
+ * copyright notice, so is covered by the following notice:
+ *
+ * Copyright (C) 1994-2003 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the XFree86 Project shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from the
+ * XFree86 Project.
+ */
+
+/* Copyright (c) 2005, Oracle and/or its affiliates. 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.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "os.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+#define XF86_OS_PRIVS
+#include "xf86_OSproc.h"
+#include "xf86_OSlib.h"
+
+#ifndef PLEASE_FIX_THIS
+#define APM_STANDBY_REQ 0xa01
+#define APM_SUSPEND_REQ 0xa02
+#define APM_NORMAL_RESUME 0xa03
+#define APM_CRIT_RESUME 0xa04
+#define APM_BATTERY_LOW 0xa05
+#define APM_POWER_CHANGE 0xa06
+#define APM_UPDATE_TIME 0xa07
+#define APM_CRIT_SUSPEND_REQ 0xa08
+#define APM_USER_STANDBY_REQ 0xa09
+#define APM_USER_SUSPEND_REQ 0xa0a
+#define APM_SYS_STANDBY_RESUME 0xa0b
+#define APM_IOC_NEXTEVENT 0xa0c
+#define APM_IOC_RESUME 0xa0d
+#define APM_IOC_SUSPEND 0xa0e
+#define APM_IOC_STANDBY 0xa0f
+#endif
+
+typedef struct apm_event_info {
+    int type;
+} apm_event_info;
+
+/*
+ This may be replaced with a better device name
+ very soon...
+*/
+#define APM_DEVICE "/dev/srn"
+#define APM_DEVICE1 "/dev/apm"
+
+static pointer APMihPtr = NULL;
+static void sunCloseAPM(void);
+
+static struct {
+    u_int apmBsd;
+    pmEvent xf86;
+} sunToXF86Array[] = {
+    {
+    APM_STANDBY_REQ, XF86_APM_SYS_STANDBY}, {
+    APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND}, {
+    APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME}, {
+    APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME}, {
+    APM_BATTERY_LOW, XF86_APM_LOW_BATTERY}, {
+    APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE}, {
+    APM_UPDATE_TIME, XF86_APM_UPDATE_TIME}, {
+    APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND}, {
+    APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY}, {
+    APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND}, {
+    APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
+#ifdef APM_CAPABILITY_CHANGE
+    {
+    APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED},
+#endif
+};
+
+#define numApmEvents (sizeof(sunToXF86Array) / sizeof(sunToXF86Array[0]))
+
+static pmEvent
+sunToXF86(int type)
+{
+    int i;
+
+    for (i = 0; i < numApmEvents; i++) {
+        if (type == sunToXF86Array[i].apmBsd) {
+            return sunToXF86Array[i].xf86;
+        }
+    }
+    return XF86_APM_UNKNOWN;
+}
+
+/*
+ * APM events can be requested direclty from /dev/apm 
+ */
+static int
+sunPMGetEventFromOS(int fd, pmEvent * events, int num)
+{
+    struct apm_event_info sunEvent;
+    int i;
+
+    for (i = 0; i < num; i++) {
+
+        if (ioctl(fd, APM_IOC_NEXTEVENT, &sunEvent) < 0) {
+            if (errno != EAGAIN) {
+                xf86Msg(X_WARNING, "sunPMGetEventFromOS: APM_IOC_NEXTEVENT"
+                        " %s\n", strerror(errno));
+            }
+            break;
+        }
+        events[i] = sunToXF86(sunEvent.type);
+    }
+    xf86Msg(X_WARNING, "Got some events\n");
+    return i;
+}
+
+static pmWait
+sunPMConfirmEventToOs(int fd, pmEvent event)
+{
+    switch (event) {
+/* XXX: NOT CURRENTLY RETURNED FROM OS */
+    case XF86_APM_SYS_STANDBY:
+    case XF86_APM_USER_STANDBY:
+        if (ioctl(fd, APM_IOC_STANDBY, NULL) == 0)
+            return PM_WAIT;     /* should we stop the Xserver in standby, too? */
+        else
+            return PM_NONE;
+    case XF86_APM_SYS_SUSPEND:
+    case XF86_APM_CRITICAL_SUSPEND:
+    case XF86_APM_USER_SUSPEND:
+        xf86Msg(X_WARNING, "Got SUSPENDED\n");
+        if (ioctl(fd, APM_IOC_SUSPEND, NULL) == 0)
+            return PM_CONTINUE;
+        else {
+            xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_SUSPEND"
+                    " %s\n", strerror(errno));
+            return PM_FAILED;
+        }
+    case XF86_APM_STANDBY_RESUME:
+    case XF86_APM_NORMAL_RESUME:
+    case XF86_APM_CRITICAL_RESUME:
+    case XF86_APM_STANDBY_FAILED:
+    case XF86_APM_SUSPEND_FAILED:
+        xf86Msg(X_WARNING, "Got RESUME\n");
+        if (ioctl(fd, APM_IOC_RESUME, NULL) == 0)
+            return PM_CONTINUE;
+        else {
+            xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_RESUME"
+                    " %s\n", strerror(errno));
+            return PM_FAILED;
+        }
+    default:
+        return PM_NONE;
+    }
+}
+
+PMClose
+xf86OSPMOpen(void)
+{
+    int fd;
+
+    if (APMihPtr || !xf86Info.pmFlag) {
+        return NULL;
+    }
+
+    if ((fd = open(APM_DEVICE, O_RDWR)) == -1) {
+        if ((fd = open(APM_DEVICE1, O_RDWR)) == -1) {
+            return NULL;
+        }
+    }
+    xf86PMGetEventFromOs = sunPMGetEventFromOS;
+    xf86PMConfirmEventToOs = sunPMConfirmEventToOs;
+    APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
+    return sunCloseAPM;
+}
+
+static void
+sunCloseAPM(void)
+{
+    int fd;
+
+    if (APMihPtr) {
+        fd = xf86RemoveGeneralHandler(APMihPtr);
+        close(fd);
+        APMihPtr = NULL;
+    }
+}
diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_bell.c b/xorg-server/hw/xfree86/os-support/solaris/sun_bell.c
index 8cd4de25b..beb13d2e9 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_bell.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_bell.c
@@ -1,180 +1,183 @@
-/* Copyright (c) 2004-2005, Oracle and/or its affiliates. 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.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <sys/audio.h>

-#include <sys/uio.h>

-#include <limits.h>

-#include <math.h>

-#include <poll.h>

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-

-#define BELL_RATE       48000   /* Samples per second */

-#define BELL_HZ         50      /* Fraction of a second i.e. 1/x */

-#define BELL_MS         (1000/BELL_HZ)  /* MS */

-#define BELL_SAMPLES    (BELL_RATE / BELL_HZ)

-#define BELL_MIN        3       /* Min # of repeats */

-

-#define AUDIO_DEVICE    "/dev/audio"

-

-void

-xf86OSRingBell(int loudness, int pitch, int duration)

-{

-    static short    samples[BELL_SAMPLES];

-    static short    silence[BELL_SAMPLES]; /* "The Sound of Silence" */

-    static int      lastFreq;

-    int             cnt; 

-    int             i;

-    int             written;

-    int             repeats;

-    int             freq;

-    audio_info_t    audioInfo;

-    struct iovec    iov[IOV_MAX];

-    int             iovcnt;

-    double          ampl, cyclen, phase;

-    int             audioFD;

-

-    if ((loudness <= 0) || (pitch <= 0) || (duration <= 0)) {

-        return;

-    }

-

-    lastFreq = 0;

-    memset(silence, 0, sizeof(silence));

-

-    audioFD = open(AUDIO_DEVICE, O_WRONLY | O_NONBLOCK);

-    if (audioFD == -1) {

-        xf86Msg(X_ERROR, "Bell: cannot open audio device \"%s\": %s\n",

-                AUDIO_DEVICE, strerror(errno));

-        return;

-    }

-

-    freq = pitch;

-    freq = min(freq, (BELL_RATE / 2) - 1);

-    freq = max(freq, 2 * BELL_HZ);

-

-    /*

-     * Ensure full waves per buffer

-     */

-    freq -= freq % BELL_HZ;

-

-    if (freq != lastFreq) {

-        lastFreq = freq;

-        ampl =  16384.0;

-

-        cyclen = (double) freq / (double) BELL_RATE;

-        phase = 0.0;

-

-        for (i = 0; i < BELL_SAMPLES; i++) {

-            samples[i] = (short) (ampl * sin(2.0 * M_PI * phase));

-            phase += cyclen;

-            if (phase >= 1.0)

-                phase -= 1.0;

-        }

-    }

-

-    repeats = (duration + (BELL_MS / 2)) / BELL_MS;

-    repeats = max(repeats, BELL_MIN);

-

-    loudness = max(0, loudness);

-    loudness = min(loudness, 100);

-

-#ifdef DEBUG

-    ErrorF("BELL : freq %d volume %d duration %d repeats %d\n",

-           freq, loudness, duration, repeats);

-#endif

-

-    AUDIO_INITINFO(&audioInfo);

-    audioInfo.play.encoding = AUDIO_ENCODING_LINEAR;

-    audioInfo.play.sample_rate = BELL_RATE;

-    audioInfo.play.channels = 2;

-    audioInfo.play.precision = 16;

-    audioInfo.play.gain = min(AUDIO_MAX_GAIN, AUDIO_MAX_GAIN * loudness / 100);

-

-    if (ioctl(audioFD, AUDIO_SETINFO, &audioInfo) < 0){

-        xf86Msg(X_ERROR,

-                "Bell: AUDIO_SETINFO failed on audio device \"%s\": %s\n",

-                AUDIO_DEVICE, strerror(errno));

-        close(audioFD);

-        return;

-    }

-

-    iovcnt = 0;

-

-    for (cnt = 0; cnt <= repeats; cnt++) {

-        if (cnt == repeats) {

-            /* Insert a bit of silence so that multiple beeps are distinct and

-             * not compressed into a single tone.

-             */

-            iov[iovcnt].iov_base = (char *) silence;

-            iov[iovcnt++].iov_len = sizeof(silence);

-        } else {

-            iov[iovcnt].iov_base = (char *) samples;

-            iov[iovcnt++].iov_len = sizeof(samples);

-        }

-        if ((iovcnt >= IOV_MAX) || (cnt == repeats)) {

-            written = writev(audioFD, iov, iovcnt);

-

-            if ((written < ((int)(sizeof(samples) * iovcnt)))) {

-                /* audio buffer was full! */

-

-                int naptime;

-

-                if (written == -1) {

-                    if (errno != EAGAIN) {

-                        xf86Msg(X_ERROR,

-                               "Bell: writev failed on audio device \"%s\": %s\n",

-                                AUDIO_DEVICE, strerror(errno));

-                        close(audioFD);

-                        return;

-                    }

-                    i = iovcnt;

-                } else {

-                    i = ((sizeof(samples) * iovcnt) - written)

-                        / sizeof(samples);

-                }

-                cnt -= i;

-

-                /* sleep a little to allow audio buffer to drain */

-                naptime = BELL_MS * i;

-                poll(NULL, 0, naptime);

-

-                i = ((sizeof(samples) * iovcnt) - written) % sizeof(samples);

-                iovcnt = 0;

-                if ((written != -1) && (i > 0)) {

-                    iov[iovcnt].iov_base = ((char *) samples) + i;

-                    iov[iovcnt++].iov_len = sizeof(samples) - i;

-                }

-            } else {

-                iovcnt = 0;

-            }

-        }

-    }

-

-    close(audioFD);

-    return;

-}

+/* Copyright (c) 2004-2005, Oracle and/or its affiliates. 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.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <sys/audio.h>
+#include <sys/uio.h>
+#include <limits.h>
+#include <math.h>
+#include <poll.h>
+
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+
+#define BELL_RATE       48000   /* Samples per second */
+#define BELL_HZ         50      /* Fraction of a second i.e. 1/x */
+#define BELL_MS         (1000/BELL_HZ)  /* MS */
+#define BELL_SAMPLES    (BELL_RATE / BELL_HZ)
+#define BELL_MIN        3       /* Min # of repeats */
+
+#define AUDIO_DEVICE    "/dev/audio"
+
+void
+xf86OSRingBell(int loudness, int pitch, int duration)
+{
+    static short samples[BELL_SAMPLES];
+    static short silence[BELL_SAMPLES]; /* "The Sound of Silence" */
+    static int lastFreq;
+    int cnt;
+    int i;
+    int written;
+    int repeats;
+    int freq;
+    audio_info_t audioInfo;
+    struct iovec iov[IOV_MAX];
+    int iovcnt;
+    double ampl, cyclen, phase;
+    int audioFD;
+
+    if ((loudness <= 0) || (pitch <= 0) || (duration <= 0)) {
+        return;
+    }
+
+    lastFreq = 0;
+    memset(silence, 0, sizeof(silence));
+
+    audioFD = open(AUDIO_DEVICE, O_WRONLY | O_NONBLOCK);
+    if (audioFD == -1) {
+        xf86Msg(X_ERROR, "Bell: cannot open audio device \"%s\": %s\n",
+                AUDIO_DEVICE, strerror(errno));
+        return;
+    }
+
+    freq = pitch;
+    freq = min(freq, (BELL_RATE / 2) - 1);
+    freq = max(freq, 2 * BELL_HZ);
+
+    /*
+     * Ensure full waves per buffer
+     */
+    freq -= freq % BELL_HZ;
+
+    if (freq != lastFreq) {
+        lastFreq = freq;
+        ampl = 16384.0;
+
+        cyclen = (double) freq / (double) BELL_RATE;
+        phase = 0.0;
+
+        for (i = 0; i < BELL_SAMPLES; i++) {
+            samples[i] = (short) (ampl * sin(2.0 * M_PI * phase));
+            phase += cyclen;
+            if (phase >= 1.0)
+                phase -= 1.0;
+        }
+    }
+
+    repeats = (duration + (BELL_MS / 2)) / BELL_MS;
+    repeats = max(repeats, BELL_MIN);
+
+    loudness = max(0, loudness);
+    loudness = min(loudness, 100);
+
+#ifdef DEBUG
+    ErrorF("BELL : freq %d volume %d duration %d repeats %d\n",
+           freq, loudness, duration, repeats);
+#endif
+
+    AUDIO_INITINFO(&audioInfo);
+    audioInfo.play.encoding = AUDIO_ENCODING_LINEAR;
+    audioInfo.play.sample_rate = BELL_RATE;
+    audioInfo.play.channels = 2;
+    audioInfo.play.precision = 16;
+    audioInfo.play.gain = min(AUDIO_MAX_GAIN, AUDIO_MAX_GAIN * loudness / 100);
+
+    if (ioctl(audioFD, AUDIO_SETINFO, &audioInfo) < 0) {
+        xf86Msg(X_ERROR,
+                "Bell: AUDIO_SETINFO failed on audio device \"%s\": %s\n",
+                AUDIO_DEVICE, strerror(errno));
+        close(audioFD);
+        return;
+    }
+
+    iovcnt = 0;
+
+    for (cnt = 0; cnt <= repeats; cnt++) {
+        if (cnt == repeats) {
+            /* Insert a bit of silence so that multiple beeps are distinct and
+             * not compressed into a single tone.
+             */
+            iov[iovcnt].iov_base = (char *) silence;
+            iov[iovcnt++].iov_len = sizeof(silence);
+        }
+        else {
+            iov[iovcnt].iov_base = (char *) samples;
+            iov[iovcnt++].iov_len = sizeof(samples);
+        }
+        if ((iovcnt >= IOV_MAX) || (cnt == repeats)) {
+            written = writev(audioFD, iov, iovcnt);
+
+            if ((written < ((int) (sizeof(samples) * iovcnt)))) {
+                /* audio buffer was full! */
+
+                int naptime;
+
+                if (written == -1) {
+                    if (errno != EAGAIN) {
+                        xf86Msg(X_ERROR,
+                                "Bell: writev failed on audio device \"%s\": %s\n",
+                                AUDIO_DEVICE, strerror(errno));
+                        close(audioFD);
+                        return;
+                    }
+                    i = iovcnt;
+                }
+                else {
+                    i = ((sizeof(samples) * iovcnt) - written)
+                        / sizeof(samples);
+                }
+                cnt -= i;
+
+                /* sleep a little to allow audio buffer to drain */
+                naptime = BELL_MS * i;
+                poll(NULL, 0, naptime);
+
+                i = ((sizeof(samples) * iovcnt) - written) % sizeof(samples);
+                iovcnt = 0;
+                if ((written != -1) && (i > 0)) {
+                    iov[iovcnt].iov_base = ((char *) samples) + i;
+                    iov[iovcnt++].iov_len = sizeof(samples) - i;
+                }
+            }
+            else {
+                iovcnt = 0;
+            }
+        }
+    }
+
+    close(audioFD);
+    return;
+}
diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
index 800fc1c3d..4b75a98ac 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
@@ -30,7 +30,7 @@
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
 #ifdef HAVE_SYS_KD_H
-# include <sys/kd.h>
+#include <sys/kd.h>
 #endif
 
 /*
@@ -48,6 +48,7 @@
 static Bool KeepTty = FALSE;
 static Bool Protect0 = FALSE;
 static Bool UseConsole = FALSE;
+
 #ifdef HAS_USL_VTS
 static int VTnum = -1;
 static int xf86StartVT = -1;
@@ -71,18 +72,19 @@ switch_to(int vt, const char *from)
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
     if (ret != 0)
         xf86Msg(X_WARNING, "%s: VT_ACTIVATE failed: %s\n",
-		from, strerror(errno));
+                from, strerror(errno));
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
     if (ret != 0)
         xf86Msg(X_WARNING, "%s: VT_WAITACTIVE failed: %s\n",
-		from, strerror(errno));
+                from, strerror(errno));
 }
 
 void
 xf86OpenConsole(void)
 {
     int i;
+
 #ifdef HAS_USL_VTS
     int fd;
     struct vt_mode VT;
@@ -90,209 +92,192 @@ xf86OpenConsole(void)
     MessageType from = X_PROBED;
 #endif
 
-    if (serverGeneration == 1)
-    {
-	/* Check if we're run with euid==0 */
-	if (geteuid() != 0)
-	    FatalError("xf86OpenConsole: Server must be suid root\n");
-
-	/* Protect page 0 to help find NULL dereferencing */
-	/* mprotect() doesn't seem to work */
-	if (Protect0)
-	{
-	    int fd = -1;
-
-	    if ((fd = open("/dev/zero", O_RDONLY, 0)) < 0)
-	    {
-		xf86Msg(X_WARNING,
-			"xf86OpenConsole: cannot open /dev/zero (%s)\n",
-			strerror(errno));
-	    }
-	    else
-	    {
-		if (mmap(0, 0x1000, PROT_NONE,
-			 MAP_FIXED | MAP_SHARED, fd, 0) == MAP_FAILED)
-		    xf86Msg(X_WARNING,
-			"xf86OpenConsole: failed to protect page 0 (%s)\n",
-			strerror(errno));
-
-		close(fd);
-	    }
-	}
+    if (serverGeneration == 1) {
+        /* Check if we're run with euid==0 */
+        if (geteuid() != 0)
+            FatalError("xf86OpenConsole: Server must be suid root\n");
+
+        /* Protect page 0 to help find NULL dereferencing */
+        /* mprotect() doesn't seem to work */
+        if (Protect0) {
+            int fd = -1;
+
+            if ((fd = open("/dev/zero", O_RDONLY, 0)) < 0) {
+                xf86Msg(X_WARNING,
+                        "xf86OpenConsole: cannot open /dev/zero (%s)\n",
+                        strerror(errno));
+            }
+            else {
+                if (mmap(0, 0x1000, PROT_NONE,
+                         MAP_FIXED | MAP_SHARED, fd, 0) == MAP_FAILED)
+                    xf86Msg(X_WARNING,
+                            "xf86OpenConsole: failed to protect page 0 (%s)\n",
+                            strerror(errno));
+
+                close(fd);
+            }
+        }
 
 #ifdef HAS_USL_VTS
 
-	/*
-	 * Setup the virtual terminal manager
-	 */
-	if ((fd = open("/dev/vt/0",O_RDWR,0)) == -1)
-	{
-	    xf86ErrorF("xf86OpenConsole: Cannot open /dev/vt/0 (%s)\n",
-		       strerror(errno));
-	    vtEnabled = 0;
-	}
-	else
-	{
-	    if (ioctl(fd, VT_ENABLED, &vtEnabled) < 0)
-	    {
-		xf86ErrorF("xf86OpenConsole: VT_ENABLED failed (%s)\n",
-			   strerror(errno));
-		vtEnabled = 0;
-	    }
-	}
-#endif /*  HAS_USL_VTS */
-
-	if (UseConsole)
-	{
-	    strlcpy(consoleDev, SOL_CONSOLE_DEV, sizeof(consoleDev));
+        /*
+         * Setup the virtual terminal manager
+         */
+        if ((fd = open("/dev/vt/0", O_RDWR, 0)) == -1) {
+            xf86ErrorF("xf86OpenConsole: Cannot open /dev/vt/0 (%s)\n",
+                       strerror(errno));
+            vtEnabled = 0;
+        }
+        else {
+            if (ioctl(fd, VT_ENABLED, &vtEnabled) < 0) {
+                xf86ErrorF("xf86OpenConsole: VT_ENABLED failed (%s)\n",
+                           strerror(errno));
+                vtEnabled = 0;
+            }
+        }
+#endif                          /*  HAS_USL_VTS */
+
+        if (UseConsole) {
+            strlcpy(consoleDev, SOL_CONSOLE_DEV, sizeof(consoleDev));
 
 #ifdef HAS_USL_VTS
-	    xf86Info.vtno = CONSOLE_VTNO;
-
-	    if (vtEnabled == 0)
-	    {
-		xf86StartVT = 0;
-	    }
-	    else
-	    {
-		if (ioctl(fd, VT_GETSTATE, &vtinfo) < 0)
-		    FatalError("xf86OpenConsole: Cannot determine current VT\n");
-		xf86StartVT = vtinfo.v_active;
-	    }
-#endif /*  HAS_USL_VTS */
-	    goto OPENCONSOLE;
-	}
+            xf86Info.vtno = CONSOLE_VTNO;
+
+            if (vtEnabled == 0) {
+                xf86StartVT = 0;
+            }
+            else {
+                if (ioctl(fd, VT_GETSTATE, &vtinfo) < 0)
+                    FatalError
+                        ("xf86OpenConsole: Cannot determine current VT\n");
+                xf86StartVT = vtinfo.v_active;
+            }
+#endif                          /*  HAS_USL_VTS */
+            goto OPENCONSOLE;
+        }
 
 #ifdef HAS_USL_VTS
-	if (vtEnabled == 0)
-	{
-	    /* VT not enabled - kernel too old or Sparc platforms
-	       without visual_io support */
-	    xf86Msg(from, "VT infrastructure is not available\n");
-
-	    xf86StartVT = 0;
-	    xf86Info.vtno = 0;
-	    strlcpy(consoleDev, xf86SolarisFbDev, sizeof(consoleDev));
-	    goto OPENCONSOLE;
-	}
-
-	if (ioctl(fd, VT_GETSTATE, &vtinfo) < 0)
-	    FatalError("xf86OpenConsole: Cannot determine current VT\n");
-
-	xf86StartVT = vtinfo.v_active;
-
-	if (VTnum != -1)
-	{
-	    xf86Info.vtno = VTnum;
-	    from = X_CMDLINE;
-	}
-	else if (xf86Info.ShareVTs)
-	{
-	    xf86Info.vtno = vtinfo.v_active;
-	    from = X_CMDLINE;
-	}
-	else
-	{
-	    if ((ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) ||
-		(xf86Info.vtno == -1))
-	    {
-		FatalError("xf86OpenConsole: Cannot find a free VT\n");
-	    }
-	}
-
-	xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
-	snprintf(consoleDev, PATH_MAX, "/dev/vt/%d", xf86Info.vtno);
-
-	if (fd != -1)
-	{
-	    close(fd);
-	}
-
-#endif /* HAS_USL_VTS */
-
-OPENCONSOLE:
-	if (!KeepTty)
-	    setpgrp();
-
-	if (((xf86Info.consoleFd = open(consoleDev, O_RDWR | O_NDELAY, 0)) < 0))
-	    FatalError("xf86OpenConsole: Cannot open %s (%s)\n",
-		       consoleDev, strerror(errno));
-
-	/* Change ownership of the vt or console */
-	chown(consoleDev, getuid(), getgid());
+        if (vtEnabled == 0) {
+            /* VT not enabled - kernel too old or Sparc platforms
+               without visual_io support */
+            xf86Msg(from, "VT infrastructure is not available\n");
+
+            xf86StartVT = 0;
+            xf86Info.vtno = 0;
+            strlcpy(consoleDev, xf86SolarisFbDev, sizeof(consoleDev));
+            goto OPENCONSOLE;
+        }
+
+        if (ioctl(fd, VT_GETSTATE, &vtinfo) < 0)
+            FatalError("xf86OpenConsole: Cannot determine current VT\n");
+
+        xf86StartVT = vtinfo.v_active;
+
+        if (VTnum != -1) {
+            xf86Info.vtno = VTnum;
+            from = X_CMDLINE;
+        }
+        else if (xf86Info.ShareVTs) {
+            xf86Info.vtno = vtinfo.v_active;
+            from = X_CMDLINE;
+        }
+        else {
+            if ((ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) ||
+                (xf86Info.vtno == -1)) {
+                FatalError("xf86OpenConsole: Cannot find a free VT\n");
+            }
+        }
+
+        xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
+        snprintf(consoleDev, PATH_MAX, "/dev/vt/%d", xf86Info.vtno);
+
+        if (fd != -1) {
+            close(fd);
+        }
+
+#endif                          /* HAS_USL_VTS */
+
+ OPENCONSOLE:
+        if (!KeepTty)
+            setpgrp();
+
+        if (((xf86Info.consoleFd = open(consoleDev, O_RDWR | O_NDELAY, 0)) < 0))
+            FatalError("xf86OpenConsole: Cannot open %s (%s)\n",
+                       consoleDev, strerror(errno));
+
+        /* Change ownership of the vt or console */
+        chown(consoleDev, getuid(), getgid());
 
 #ifdef HAS_USL_VTS
-	if (xf86Info.ShareVTs)
-	    return;
-
-	if (vtEnabled)
-	{
-	    /*
-	     * Now get the VT
-	     */
-	    switch_to(xf86Info.vtno, "xf86OpenConsole");
-
-#ifdef VT_SET_CONSUSER /* added in snv_139 */
-	    if (strcmp(display, "0") == 0)
-		if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
-		    xf86Msg(X_WARNING,
-			"xf86OpenConsole: VT_SET_CONSUSER failed\n");
+        if (xf86Info.ShareVTs)
+            return;
+
+        if (vtEnabled) {
+            /*
+             * Now get the VT
+             */
+            switch_to(xf86Info.vtno, "xf86OpenConsole");
+
+#ifdef VT_SET_CONSUSER          /* added in snv_139 */
+            if (strcmp(display, "0") == 0)
+                if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
+                    xf86Msg(X_WARNING,
+                            "xf86OpenConsole: VT_SET_CONSUSER failed\n");
 #endif
 
-	    if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
-		FatalError("xf86OpenConsole: VT_GETMODE failed\n");
+            if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
+                FatalError("xf86OpenConsole: VT_GETMODE failed\n");
 
-	    OsSignal(SIGUSR1, xf86VTAcquire);
-	    OsSignal(SIGUSR2, xf86VTRelease);
+            OsSignal(SIGUSR1, xf86VTAcquire);
+            OsSignal(SIGUSR2, xf86VTRelease);
 
-	    VT.mode = VT_PROCESS;
-	    VT.acqsig = SIGUSR1;
-	    VT.relsig = SIGUSR2;
+            VT.mode = VT_PROCESS;
+            VT.acqsig = SIGUSR1;
+            VT.relsig = SIGUSR2;
 
-	    if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0)
-		FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
+            if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0)
+                FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
 
-	    if (ioctl(xf86Info.consoleFd, VT_SETDISPINFO, atoi(display)) < 0)
-		xf86Msg(X_WARNING, "xf86OpenConsole: VT_SETDISPINFO failed\n");
-	}
+            if (ioctl(xf86Info.consoleFd, VT_SETDISPINFO, atoi(display)) < 0)
+                xf86Msg(X_WARNING, "xf86OpenConsole: VT_SETDISPINFO failed\n");
+        }
 #endif
 
 #ifdef KDSETMODE
-	SYSCALL(i = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
-	if (i < 0) {
-	    xf86Msg(X_WARNING,
-		    "xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n",
-		    consoleDev, strerror(errno));
-	}
+        SYSCALL(i = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
+        if (i < 0) {
+            xf86Msg(X_WARNING,
+                    "xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n",
+                    consoleDev, strerror(errno));
+        }
 #endif
     }
-    else /* serverGeneration != 1 */
-    {
+    else {                      /* serverGeneration != 1 */
+
 #ifdef HAS_USL_VTS
-	if (vtEnabled && !xf86Info.ShareVTs)
-	{
-	    /*
-	     * Now re-get the VT
-	     */
-	    if (xf86Info.autoVTSwitch)
-		switch_to(xf86Info.vtno, "xf86OpenConsole");
-
-#ifdef VT_SET_CONSUSER /* added in snv_139 */
-	    if (strcmp(display, "0") == 0)
-		if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
-		    xf86Msg(X_WARNING,
-			"xf86OpenConsole: VT_SET_CONSUSER failed\n");
+        if (vtEnabled && !xf86Info.ShareVTs) {
+            /*
+             * Now re-get the VT
+             */
+            if (xf86Info.autoVTSwitch)
+                switch_to(xf86Info.vtno, "xf86OpenConsole");
+
+#ifdef VT_SET_CONSUSER          /* added in snv_139 */
+            if (strcmp(display, "0") == 0)
+                if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
+                    xf86Msg(X_WARNING,
+                            "xf86OpenConsole: VT_SET_CONSUSER failed\n");
 #endif
 
-	    /*
-	     * If the server doesn't have the VT when the reset occurs,
-	     * this is to make sure we don't continue until the activate
-	     * signal is received.
-	     */
-	    if (!xf86Screens[0]->vtSema)
-		sleep(5);
-	}
-#endif /* HAS_USL_VTS */
+            /*
+             * If the server doesn't have the VT when the reset occurs,
+             * this is to make sure we don't continue until the activate
+             * signal is received.
+             */
+            if (!xf86Screens[0]->vtSema)
+                sleep(5);
+        }
+#endif                          /* HAS_USL_VTS */
 
     }
 }
@@ -307,44 +292,47 @@ xf86CloseConsole(void)
 #if !defined(__i386__) && !defined(__i386) && !defined(__x86)
 
     if (!xf86DoConfigure) {
-	int fd;
-
-	/*
-	 * Wipe out framebuffer just like the non-SI Xsun server does.  This
-	 * could be improved by saving framebuffer contents in
-	 * xf86OpenConsole() above and restoring them here.  Also, it's unclear
-	 * at this point whether this should be done for all framebuffers in
-	 * the system, rather than only the console.
-	 */
-	if ((fd = open(xf86SolarisFbDev, O_RDWR, 0)) < 0) {
-	    xf86Msg(X_WARNING,
-		    "xf86CloseConsole():  unable to open framebuffer (%s)\n",
-		    strerror(errno));
-	} else {
-	    struct fbgattr fbattr;
-
-	    if ((ioctl(fd, FBIOGATTR, &fbattr) < 0) &&
-		(ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0)) {
-		xf86Msg(X_WARNING,
-			"xf86CloseConsole():  unable to retrieve framebuffer"
-			" attributes (%s)\n", strerror(errno));
-	    } else {
-		pointer fbdata;
-
-		fbdata = mmap(NULL, fbattr.fbtype.fb_size,
-			      PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-		if (fbdata == MAP_FAILED) {
-		    xf86Msg(X_WARNING,
-			    "xf86CloseConsole():  unable to mmap framebuffer"
-			    " (%s)\n", strerror(errno));
-		} else {
-		    memset(fbdata, 0, fbattr.fbtype.fb_size);
-		    munmap(fbdata, fbattr.fbtype.fb_size);
-		}
-	    }
-
-	    close(fd);
-	}
+        int fd;
+
+        /*
+         * Wipe out framebuffer just like the non-SI Xsun server does.  This
+         * could be improved by saving framebuffer contents in
+         * xf86OpenConsole() above and restoring them here.  Also, it's unclear
+         * at this point whether this should be done for all framebuffers in
+         * the system, rather than only the console.
+         */
+        if ((fd = open(xf86SolarisFbDev, O_RDWR, 0)) < 0) {
+            xf86Msg(X_WARNING,
+                    "xf86CloseConsole():  unable to open framebuffer (%s)\n",
+                    strerror(errno));
+        }
+        else {
+            struct fbgattr fbattr;
+
+            if ((ioctl(fd, FBIOGATTR, &fbattr) < 0) &&
+                (ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0)) {
+                xf86Msg(X_WARNING,
+                        "xf86CloseConsole():  unable to retrieve framebuffer"
+                        " attributes (%s)\n", strerror(errno));
+            }
+            else {
+                pointer fbdata;
+
+                fbdata = mmap(NULL, fbattr.fbtype.fb_size,
+                              PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+                if (fbdata == MAP_FAILED) {
+                    xf86Msg(X_WARNING,
+                            "xf86CloseConsole():  unable to mmap framebuffer"
+                            " (%s)\n", strerror(errno));
+                }
+                else {
+                    memset(fbdata, 0, fbattr.fbtype.fb_size);
+                    munmap(fbdata, fbattr.fbtype.fb_size);
+                }
+            }
+
+            close(fd);
+        }
     }
 
 #endif
@@ -355,19 +343,17 @@ xf86CloseConsole(void)
 #endif
 
 #ifdef HAS_USL_VTS
-    if (vtEnabled)
-    {
-	if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1)
-	{
-	    VT.mode = VT_AUTO;		/* Set default vt handling */
-	    ioctl(xf86Info.consoleFd, VT_SETMODE, &VT);
-	}
-
-	/* Activate the VT that X was started on */
-	if (xf86Info.autoVTSwitch)
-	    switch_to(xf86StartVT, "xf86CloseConsole");
+    if (vtEnabled) {
+        if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1) {
+            VT.mode = VT_AUTO;  /* Set default vt handling */
+            ioctl(xf86Info.consoleFd, VT_SETMODE, &VT);
+        }
+
+        /* Activate the VT that X was started on */
+        if (xf86Info.autoVTSwitch)
+            switch_to(xf86StartVT, "xf86CloseConsole");
     }
-#endif /* HAS_USL_VTS */
+#endif                          /* HAS_USL_VTS */
 
     close(xf86Info.consoleFd);
 }
@@ -379,58 +365,54 @@ xf86ProcessArgument(int argc, char **argv, int i)
      * Keep server from detaching from controlling tty.  This is useful when
      * debugging, so the server can receive keyboard signals.
      */
-    if (!strcmp(argv[i], "-keeptty"))
-    {
-	KeepTty = TRUE;
-	return 1;
+    if (!strcmp(argv[i], "-keeptty")) {
+        KeepTty = TRUE;
+        return 1;
     }
 
     /*
      * Undocumented flag to protect page 0 from read/write to help catch NULL
      * pointer dereferences.  This is purely a debugging flag.
      */
-    if (!strcmp(argv[i], "-protect0"))
-    {
-	Protect0 = TRUE;
-	return 1;
+    if (!strcmp(argv[i], "-protect0")) {
+        Protect0 = TRUE;
+        return 1;
     }
 
     /*
      * Use /dev/console as the console device.
      */
-    if (!strcmp(argv[i], "-C"))
-    {
-	UseConsole = TRUE;
-	return 1;
+    if (!strcmp(argv[i], "-C")) {
+        UseConsole = TRUE;
+        return 1;
     }
 
 #ifdef HAS_USL_VTS
 
-    if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
-    {
-	if (sscanf(argv[i], "vt%d", &VTnum) == 0)
-	{
-	    UseMsg();
-	    VTnum = -1;
-	    return 0;
-	}
+    if ((argv[i][0] == 'v') && (argv[i][1] == 't')) {
+        if (sscanf(argv[i], "vt%d", &VTnum) == 0) {
+            UseMsg();
+            VTnum = -1;
+            return 0;
+        }
 
-	return 1;
+        return 1;
     }
 
-#endif /* HAS_USL_VTS */
+#endif                          /* HAS_USL_VTS */
 
     if ((i + 1) < argc) {
-	if (!strcmp(argv[i], "-dev")) {
-	    strlcpy(xf86SolarisFbDev, argv[i+1], sizeof(xf86SolarisFbDev));
-	    return 2;
-	}
+        if (!strcmp(argv[i], "-dev")) {
+            strlcpy(xf86SolarisFbDev, argv[i + 1], sizeof(xf86SolarisFbDev));
+            return 2;
+        }
     }
 
     return 0;
 }
 
-void xf86UseMsg(void)
+void
+xf86UseMsg(void)
 {
 #ifdef HAS_USL_VTS
     ErrorF("vtX                    Use the specified VT number\n");
diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c b/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
index b7b7c0ed7..67ef17689 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
@@ -1,258 +1,247 @@
-/*

- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany

- * Copyright 1993 by David Wexelblat <dwex@goblin.org>

- * Copyright 1999 by David Holland <davidh@iquest.net>

- *

- * 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 names of the copyright holders not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  The copyright holders make no representations

- * about the suitability of this software for any purpose.  It is provided "as

- * is" without express or implied warranty.

- *

- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * SHALL THE COPYRIGHT HOLDERS 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.

- *

- */

-/* Copyright (c) 2008, Oracle and/or its affiliates. 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.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <sys/types.h> /* get __x86 definition if not set by compiler */

-

-#if defined(__i386__) || defined(__i386) || defined(__x86)

-# define _NEED_SYSI86

-#endif

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-#include "xf86OSpriv.h"

-#include <sys/mman.h>

-

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

-/* Video Memory Mapping section 					   */

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

-

-static char *apertureDevName = NULL;

-static int apertureDevFD_ro = -1;

-static int apertureDevFD_rw = -1;

-

-static Bool

-solOpenAperture(void)

-{

-    if (apertureDevName == NULL)

-    {

-	apertureDevName = "/dev/xsvc";

-	if ((apertureDevFD_rw = open(apertureDevName, O_RDWR)) < 0)

-	{

-	    xf86MsgVerb(X_WARNING, 0,

-			"solOpenAperture: failed to open %s (%s)\n",

-			apertureDevName, strerror(errno));

-	    apertureDevName = "/dev/fbs/aperture";

-	    apertureDevFD_rw = open(apertureDevName, O_RDWR);

-	}

-	apertureDevFD_ro = open(apertureDevName, O_RDONLY);

-

-	if ((apertureDevFD_rw < 0) || (apertureDevFD_ro < 0))

-	{

-	    xf86MsgVerb(X_WARNING, 0,

-			"solOpenAperture: failed to open %s (%s)\n",

-			apertureDevName, strerror(errno));

-	    xf86MsgVerb(X_WARNING, 0,

-			"solOpenAperture: either /dev/fbs/aperture"

-			" or /dev/xsvc required\n");

-

-	    apertureDevName = NULL;

-

-	    if (apertureDevFD_rw >= 0)

-	    {

-		close(apertureDevFD_rw);

-	    }

-	    apertureDevFD_rw = -1;

-

-	    if (apertureDevFD_ro >= 0)

-	    {

-		close(apertureDevFD_ro);

-	    }

-	    apertureDevFD_ro = -1;

-

-	    return FALSE;

-	}

-    }

-    return TRUE;

-}

-

-static pointer

-solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)

-{

-    pointer base;

-    int fd;

-    int prot;

-

-    if (Flags & VIDMEM_READONLY)

-    {

-	fd = apertureDevFD_ro;

-	prot = PROT_READ;

-    }

-    else

-    {

-	fd = apertureDevFD_rw;

-	prot = PROT_READ | PROT_WRITE;

-    }

-

-    if (fd < 0)

-    {

-	xf86DrvMsg(ScreenNum, X_ERROR,

-		   "solMapVidMem: failed to open %s (%s)\n",

-		   apertureDevName, strerror(errno));

-	return NULL;

-    }

-

-    base = mmap(NULL, Size, prot, MAP_SHARED, fd, (off_t)Base);

-

-    if (base == MAP_FAILED) {

-        xf86DrvMsg(ScreenNum, X_ERROR,

-		   "solMapVidMem: failed to mmap %s (0x%08lx,0x%lx) (%s)\n",

-		   apertureDevName, Base, Size, strerror(errno));

-	return NULL;

-    }

-

-    return base;

-}

-

-/* ARGSUSED */

-static void

-solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)

-{

-    if (munmap(Base, Size) != 0) {

-	xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,

-		       "solUnMapVidMem: failed to unmap %s"

-		       " (0x%p,0x%lx) (%s)\n",

-		       apertureDevName, Base, Size,

-		       strerror(errno));

-    }

-}

-

-_X_HIDDEN void

-xf86OSInitVidMem(VidMemInfoPtr pVidMem)

-{

-    pVidMem->linearSupported = solOpenAperture();

-    if (pVidMem->linearSupported) {

-	pVidMem->mapMem = solMapVidMem;

-	pVidMem->unmapMem = solUnMapVidMem;

-    } else {

-	xf86MsgVerb(X_WARNING, 0,

-		    "xf86OSInitVidMem: linear memory access disabled\n");

-    }

-    pVidMem->initialised = TRUE;

-}

-

-/*

- * Read BIOS via mmap()ing physical memory.

- */

-int

-xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,

-	     int Len)

-{

-    unsigned char *ptr;

-    int psize;

-    int mlen;

-

-    psize = getpagesize();

-    Offset += Base & (psize - 1);

-    Base &= ~(psize - 1);

-    mlen = (Offset + Len + psize - 1) & ~(psize - 1);

-

-    if (solOpenAperture() == FALSE)

-    {

-	xf86Msg(X_WARNING,

-		"xf86ReadBIOS: Failed to open aperture to read BIOS\n");

-	return -1;

-    }

-

-    ptr = (unsigned char *)mmap(NULL, mlen, PROT_READ,

-				MAP_SHARED, apertureDevFD_ro, (off_t)Base);

-    if (ptr == MAP_FAILED)

-    {

-	xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed [0x%08lx, 0x%04x]\n",

-		apertureDevName, Base, mlen);

-	return -1;

-    }

-

-    (void)memcpy(Buf, (void *)(ptr + Offset), Len);

-    if (munmap((caddr_t)ptr, mlen) != 0) {

-	xf86MsgVerb(X_WARNING, 0,

-		    "xf86ReadBIOS: failed to unmap %s (0x%p,0x%x) (%s)\n",

-		    apertureDevName, ptr, mlen, strerror(errno));

-    }

-

-    return Len;

-}

-

-

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

-/* I/O Permissions section						   */

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

-

-#if defined(__i386__) || defined(__i386) || defined(__x86)

-static Bool ExtendedEnabled = FALSE;

-#endif

-

-Bool

-xf86EnableIO(void)

-{

-#if defined(__i386__) || defined(__i386) || defined(__x86)

-    if (ExtendedEnabled)

-	return TRUE;

-

-    if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {

-	xf86Msg(X_WARNING, "xf86EnableIOPorts: Failed to set IOPL for I/O\n");

-	return FALSE;

-    }

-    ExtendedEnabled = TRUE;

-#endif /* i386 */

-    return TRUE;

-}

-

-void

-xf86DisableIO(void)

-{

-#if defined(__i386__) || defined(__i386) || defined(__x86)

-    if(!ExtendedEnabled)

-	return;

-

-    sysi86(SI86V86, V86SC_IOPL, 0);

-

-    ExtendedEnabled = FALSE;

-#endif /* i386 */

-}

+/*
+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
+ * Copyright 1993 by David Wexelblat <dwex@goblin.org>
+ * Copyright 1999 by David Holland <davidh@iquest.net>
+ *
+ * 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 names of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDERS 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.
+ *
+ */
+/* Copyright (c) 2008, Oracle and/or its affiliates. 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.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <sys/types.h>          /* get __x86 definition if not set by compiler */
+
+#if defined(__i386__) || defined(__i386) || defined(__x86)
+#define _NEED_SYSI86
+#endif
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+#include "xf86OSpriv.h"
+#include <sys/mman.h>
+
+/***************************************************************************/
+/* Video Memory Mapping section 					   */
+/***************************************************************************/
+
+static char *apertureDevName = NULL;
+static int apertureDevFD_ro = -1;
+static int apertureDevFD_rw = -1;
+
+static Bool
+solOpenAperture(void)
+{
+    if (apertureDevName == NULL) {
+        apertureDevName = "/dev/xsvc";
+        if ((apertureDevFD_rw = open(apertureDevName, O_RDWR)) < 0) {
+            xf86MsgVerb(X_WARNING, 0,
+                        "solOpenAperture: failed to open %s (%s)\n",
+                        apertureDevName, strerror(errno));
+            apertureDevName = "/dev/fbs/aperture";
+            apertureDevFD_rw = open(apertureDevName, O_RDWR);
+        }
+        apertureDevFD_ro = open(apertureDevName, O_RDONLY);
+
+        if ((apertureDevFD_rw < 0) || (apertureDevFD_ro < 0)) {
+            xf86MsgVerb(X_WARNING, 0,
+                        "solOpenAperture: failed to open %s (%s)\n",
+                        apertureDevName, strerror(errno));
+            xf86MsgVerb(X_WARNING, 0,
+                        "solOpenAperture: either /dev/fbs/aperture"
+                        " or /dev/xsvc required\n");
+
+            apertureDevName = NULL;
+
+            if (apertureDevFD_rw >= 0) {
+                close(apertureDevFD_rw);
+            }
+            apertureDevFD_rw = -1;
+
+            if (apertureDevFD_ro >= 0) {
+                close(apertureDevFD_ro);
+            }
+            apertureDevFD_ro = -1;
+
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+static pointer
+solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
+{
+    pointer base;
+    int fd;
+    int prot;
+
+    if (Flags & VIDMEM_READONLY) {
+        fd = apertureDevFD_ro;
+        prot = PROT_READ;
+    }
+    else {
+        fd = apertureDevFD_rw;
+        prot = PROT_READ | PROT_WRITE;
+    }
+
+    if (fd < 0) {
+        xf86DrvMsg(ScreenNum, X_ERROR,
+                   "solMapVidMem: failed to open %s (%s)\n",
+                   apertureDevName, strerror(errno));
+        return NULL;
+    }
+
+    base = mmap(NULL, Size, prot, MAP_SHARED, fd, (off_t) Base);
+
+    if (base == MAP_FAILED) {
+        xf86DrvMsg(ScreenNum, X_ERROR,
+                   "solMapVidMem: failed to mmap %s (0x%08lx,0x%lx) (%s)\n",
+                   apertureDevName, Base, Size, strerror(errno));
+        return NULL;
+    }
+
+    return base;
+}
+
+/* ARGSUSED */
+static void
+solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+{
+    if (munmap(Base, Size) != 0) {
+        xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,
+                       "solUnMapVidMem: failed to unmap %s"
+                       " (0x%p,0x%lx) (%s)\n",
+                       apertureDevName, Base, Size, strerror(errno));
+    }
+}
+
+_X_HIDDEN void
+xf86OSInitVidMem(VidMemInfoPtr pVidMem)
+{
+    pVidMem->linearSupported = solOpenAperture();
+    if (pVidMem->linearSupported) {
+        pVidMem->mapMem = solMapVidMem;
+        pVidMem->unmapMem = solUnMapVidMem;
+    }
+    else {
+        xf86MsgVerb(X_WARNING, 0,
+                    "xf86OSInitVidMem: linear memory access disabled\n");
+    }
+    pVidMem->initialised = TRUE;
+}
+
+/*
+ * Read BIOS via mmap()ing physical memory.
+ */
+int
+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
+             int Len)
+{
+    unsigned char *ptr;
+    int psize;
+    int mlen;
+
+    psize = getpagesize();
+    Offset += Base & (psize - 1);
+    Base &= ~(psize - 1);
+    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
+
+    if (solOpenAperture() == FALSE) {
+        xf86Msg(X_WARNING,
+                "xf86ReadBIOS: Failed to open aperture to read BIOS\n");
+        return -1;
+    }
+
+    ptr = (unsigned char *) mmap(NULL, mlen, PROT_READ,
+                                 MAP_SHARED, apertureDevFD_ro, (off_t) Base);
+    if (ptr == MAP_FAILED) {
+        xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed [0x%08lx, 0x%04x]\n",
+                apertureDevName, Base, mlen);
+        return -1;
+    }
+
+    (void) memcpy(Buf, (void *) (ptr + Offset), Len);
+    if (munmap((caddr_t) ptr, mlen) != 0) {
+        xf86MsgVerb(X_WARNING, 0,
+                    "xf86ReadBIOS: failed to unmap %s (0x%p,0x%x) (%s)\n",
+                    apertureDevName, ptr, mlen, strerror(errno));
+    }
+
+    return Len;
+}
+
+/***************************************************************************/
+/* I/O Permissions section						   */
+/***************************************************************************/
+
+#if defined(__i386__) || defined(__i386) || defined(__x86)
+static Bool ExtendedEnabled = FALSE;
+#endif
+
+Bool
+xf86EnableIO(void)
+{
+#if defined(__i386__) || defined(__i386) || defined(__x86)
+    if (ExtendedEnabled)
+        return TRUE;
+
+    if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {
+        xf86Msg(X_WARNING, "xf86EnableIOPorts: Failed to set IOPL for I/O\n");
+        return FALSE;
+    }
+    ExtendedEnabled = TRUE;
+#endif                          /* i386 */
+    return TRUE;
+}
+
+void
+xf86DisableIO(void)
+{
+#if defined(__i386__) || defined(__i386) || defined(__x86)
+    if (!ExtendedEnabled)
+        return;
+
+    sysi86(SI86V86, V86SC_IOPL, 0);
+
+    ExtendedEnabled = FALSE;
+#endif                          /* i386 */
+}
diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSproc.h b/xorg-server/hw/xfree86/os-support/xf86_OSproc.h
index 78ea6e660..e171146dd 100644
--- a/xorg-server/hw/xfree86/os-support/xf86_OSproc.h
+++ b/xorg-server/hw/xfree86/os-support/xf86_OSproc.h
@@ -64,7 +64,6 @@
  *
  */
 
-
 #ifndef _XF86_OSPROC_H
 #define _XF86_OSPROC_H
 
@@ -72,7 +71,7 @@
  * The actual prototypes have been pulled into this seperate file so
  * that they can can be used without pulling in all of the OS specific
  * stuff like sys/stat.h, etc. This casues problem for loadable modules.
- */ 
+ */
 
 /*
  * Flags for xf86MapVidMem().  Multiple flags can be or'd together.  The
@@ -80,31 +79,31 @@
  * enable write combining for memory marked only for framebuffer use.
  */
 
-#define VIDMEM_FRAMEBUFFER	0x01	/* memory for framebuffer use */
-#define VIDMEM_MMIO		0x02	/* memory for I/O use */
-#define VIDMEM_MMIO_32BIT	0x04	/* memory accesses >= 32bit */
-#define VIDMEM_READSIDEEFFECT	0x08	/* reads can have side-effects */
-#define VIDMEM_SPARSE		0x10	/* sparse mapping required
-					 * assumed when VIDMEM_MMIO is
-					 * set. May be used with
-					 * VIDMEM_FRAMEBUFFER) */
-#define VIDMEM_READONLY		0x20	/* read-only mapping
-					 * used when reading BIOS images
-					 * through xf86MapVidMem() */
+#define VIDMEM_FRAMEBUFFER	0x01    /* memory for framebuffer use */
+#define VIDMEM_MMIO		0x02    /* memory for I/O use */
+#define VIDMEM_MMIO_32BIT	0x04    /* memory accesses >= 32bit */
+#define VIDMEM_READSIDEEFFECT	0x08    /* reads can have side-effects */
+#define VIDMEM_SPARSE		0x10    /* sparse mapping required
+                                         * assumed when VIDMEM_MMIO is
+                                         * set. May be used with
+                                         * VIDMEM_FRAMEBUFFER) */
+#define VIDMEM_READONLY		0x20    /* read-only mapping
+                                         * used when reading BIOS images
+                                         * through xf86MapVidMem() */
 
 /*
  * OS-independent modem state flags for xf86SetSerialModemState() and
  * xf86GetSerialModemState().
  */
-#define XF86_M_LE		0x001	/* line enable */
-#define XF86_M_DTR		0x002	/* data terminal ready */
-#define XF86_M_RTS		0x004	/* request to send */
-#define XF86_M_ST		0x008	/* secondary transmit */
-#define XF86_M_SR		0x010	/* secondary receive */
-#define XF86_M_CTS		0x020	/* clear to send */
-#define XF86_M_CAR		0x040	/* carrier detect */
-#define XF86_M_RNG		0x080	/* ring */
-#define XF86_M_DSR		0x100	/* data set ready */
+#define XF86_M_LE		0x001   /* line enable */
+#define XF86_M_DTR		0x002   /* data terminal ready */
+#define XF86_M_RTS		0x004   /* request to send */
+#define XF86_M_ST		0x008   /* secondary transmit */
+#define XF86_M_SR		0x010   /* secondary receive */
+#define XF86_M_CTS		0x020   /* clear to send */
+#define XF86_M_CAR		0x040   /* carrier detect */
+#define XF86_M_RNG		0x080   /* ring */
+#define XF86_M_DSR		0x100   /* data set ready */
 
 #ifndef NO_OSLIB_PROTOTYPES
 /*
@@ -133,12 +132,17 @@ _XFUNCPROTOBEGIN
 /* public functions */
 extern _X_EXPORT Bool xf86LinearVidMem(void);
 extern _X_EXPORT _X_DEPRECATED Bool xf86CheckMTRR(int);
-extern _X_EXPORT _X_DEPRECATED pointer xf86MapVidMem(int, int, unsigned long, unsigned long);
-extern _X_EXPORT _X_DEPRECATED void xf86UnMapVidMem(int, pointer, unsigned long);
-extern _X_EXPORT _X_DEPRECATED void xf86MapReadSideEffects(int, int, pointer, unsigned long);
-extern _X_EXPORT int xf86ReadBIOS(unsigned long, unsigned long, unsigned char *, int);
+extern _X_EXPORT _X_DEPRECATED pointer xf86MapVidMem(int, int, unsigned long,
+                                                     unsigned long);
+extern _X_EXPORT _X_DEPRECATED void xf86UnMapVidMem(int, pointer,
+                                                    unsigned long);
+extern _X_EXPORT _X_DEPRECATED void xf86MapReadSideEffects(int, int, pointer,
+                                                           unsigned long);
+extern _X_EXPORT int xf86ReadBIOS(unsigned long, unsigned long, unsigned char *,
+                                  int);
 extern _X_EXPORT Bool xf86EnableIO(void);
 extern _X_EXPORT void xf86DisableIO(void);
+
 #ifdef __NetBSD__
 extern _X_EXPORT void xf86SetTVOut(int);
 extern _X_EXPORT void xf86SetRGBOut(void);
@@ -164,23 +168,24 @@ extern _X_EXPORT int xf86LoadKernelModule(const char *pathname);
 /* AGP GART interface */
 
 typedef struct _AgpInfo {
-	CARD32		bridgeId;
-	CARD32		agpMode;
-	unsigned long	base;
-	unsigned long	size;
-	unsigned long	totalPages;
-	unsigned long	systemPages;
-	unsigned long	usedPages;
+    CARD32 bridgeId;
+    CARD32 agpMode;
+    unsigned long base;
+    unsigned long size;
+    unsigned long totalPages;
+    unsigned long systemPages;
+    unsigned long usedPages;
 } AgpInfo, *AgpInfoPtr;
 
 extern _X_EXPORT Bool xf86AgpGARTSupported(void);
 extern _X_EXPORT AgpInfoPtr xf86GetAGPInfo(int screenNum);
 extern _X_EXPORT Bool xf86AcquireGART(int screenNum);
 extern _X_EXPORT Bool xf86ReleaseGART(int screenNum);
-extern _X_EXPORT int xf86AllocateGARTMemory(int screenNum, unsigned long size, int type,
-				  unsigned long *physical);
+extern _X_EXPORT int xf86AllocateGARTMemory(int screenNum, unsigned long size,
+                                            int type, unsigned long *physical);
 extern _X_EXPORT Bool xf86DeallocateGARTMemory(int screenNum, int key);
-extern _X_EXPORT Bool xf86BindGARTMemory(int screenNum, int key, unsigned long offset);
+extern _X_EXPORT Bool xf86BindGARTMemory(int screenNum, int key,
+                                         unsigned long offset);
 extern _X_EXPORT Bool xf86UnbindGARTMemory(int screenNum, int key);
 extern _X_EXPORT Bool xf86EnableAGP(int screenNum, CARD32 mode);
 extern _X_EXPORT Bool xf86GARTCloseScreen(int screenNum);
@@ -189,15 +194,16 @@ extern _X_EXPORT Bool xf86GARTCloseScreen(int screenNum);
    module.  These routines are small, and the code if very POSIX-signal (or
    OS-signal) specific, so it seemed better to provide more complex
    wrappers than to wrap each individual function called. */
-extern _X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
+extern _X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f) (int, void *),
+                                             void *);
 extern _X_EXPORT int xf86RemoveSIGIOHandler(int fd);
-extern _X_EXPORT int xf86BlockSIGIO (void);
-extern _X_EXPORT void xf86UnblockSIGIO (int);
-extern _X_EXPORT void xf86AssertBlockedSIGIO (char *);
-extern _X_EXPORT Bool xf86SIGIOSupported (void);
+extern _X_EXPORT int xf86BlockSIGIO(void);
+extern _X_EXPORT void xf86UnblockSIGIO(int);
+extern _X_EXPORT void xf86AssertBlockedSIGIO(char *);
+extern _X_EXPORT Bool xf86SIGIOSupported(void);
 
 #ifdef XF86_OS_PRIVS
-typedef void (*PMClose)(void);
+typedef void (*PMClose) (void);
 extern _X_EXPORT void xf86OpenConsole(void);
 extern _X_EXPORT void xf86CloseConsole(void);
 extern _X_HIDDEN Bool xf86VTActivate(int vtno);
@@ -209,13 +215,12 @@ extern _X_EXPORT int xf86ProcessArgument(int, char **, int);
 extern _X_EXPORT void xf86UseMsg(void);
 extern _X_EXPORT PMClose xf86OSPMOpen(void);
 
-extern _X_EXPORT _X_DEPRECATED void xf86MakeNewMapping(int, int, unsigned long, unsigned long, pointer);
+extern _X_EXPORT _X_DEPRECATED void xf86MakeNewMapping(int, int, unsigned long,
+                                                       unsigned long, pointer);
 extern _X_EXPORT void xf86InitVidMem(void);
 
-#endif /* XF86_OS_PRIVS */
-
+#endif                          /* XF86_OS_PRIVS */
 
 _XFUNCPROTOEND
-#endif /* NO_OSLIB_PROTOTYPES */
-
-#endif /* _XF86_OSPROC_H */
+#endif                          /* NO_OSLIB_PROTOTYPES */
+#endif                          /* _XF86_OSPROC_H */
diff --git a/xorg-server/hw/xfree86/parser/Configint.h b/xorg-server/hw/xfree86/parser/Configint.h
index 3f84ff0fa..81cc1fc59 100644
--- a/xorg-server/hw/xfree86/parser/Configint.h
+++ b/xorg-server/hw/xfree86/parser/Configint.h
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* 
  * These definitions are used through out the configuration file parser, but
  * they should not be visible outside of the parser.
@@ -73,14 +72,12 @@
 
 typedef enum { PARSE_DECIMAL, PARSE_OCTAL, PARSE_HEX } ParserNumType;
 
-typedef struct
-{
-	int num;		/* returned number */
-	char *str;		/* private copy of the return-string */
-	double realnum;		/* returned number as a real */
-        ParserNumType numType;  /* used to enforce correct number formatting */
-}
-LexRec, *LexPtr;
+typedef struct {
+    int num;                    /* returned number */
+    char *str;                  /* private copy of the return-string */
+    double realnum;             /* returned number as a real */
+    ParserNumType numType;      /* used to enforce correct number formatting */
+} LexRec, *LexPtr;
 
 #ifndef TRUE
 #define TRUE 1
@@ -210,4 +207,4 @@ else\
 #define OBSOLETE_MSG \
 "Ignoring obsolete keyword \"%s\"."
 
-#endif /* _Configint_h_ */
+#endif                          /* _Configint_h_ */
diff --git a/xorg-server/hw/xfree86/parser/DRI.c b/xorg-server/hw/xfree86/parser/DRI.c
index 77846da2b..e8d26255f 100644
--- a/xorg-server/hw/xfree86/parser/DRI.c
+++ b/xorg-server/hw/xfree86/parser/DRI.c
@@ -37,87 +37,86 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec DRITab[] =
-{
+static xf86ConfigSymTabRec DRITab[] = {
     {ENDSECTION, "endsection"},
-    {GROUP,      "group"},
-    {MODE,       "mode"},
-    {-1,         ""},
+    {GROUP, "group"},
+    {MODE, "mode"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeDRI
 
 XF86ConfDRIPtr
-xf86parseDRISection (void)
+xf86parseDRISection(void)
 {
     int token;
-    parsePrologue (XF86ConfDRIPtr, XF86ConfDRIRec);
+
+    parsePrologue(XF86ConfDRIPtr, XF86ConfDRIRec);
 
     /* Zero is a valid value for this. */
     ptr->dri_group = -1;
-    while ((token = xf86getToken (DRITab)) != ENDSECTION) {
-	switch (token)
-	    {
-	    case GROUP:
-		if ((token = xf86getSubToken (&(ptr->dri_comment))) == STRING)
-		    ptr->dri_group_name = val.str;
-		else if (token == NUMBER)
-		    ptr->dri_group = val.num;
-		else
-		    Error (GROUP_MSG);
-		break;
-	    case MODE:
-		if (xf86getSubToken (&(ptr->dri_comment)) != NUMBER)
-		    Error (NUMBER_MSG, "Mode");
-                if (val.numType != PARSE_OCTAL)
-                    Error (MUST_BE_OCTAL_MSG, val.num);
-		ptr->dri_mode = val.num;
-		break;
-	    case EOF_TOKEN:
-		Error (UNEXPECTED_EOF_MSG);
-		break;
-	    case COMMENT:
-		ptr->dri_comment = xf86addComment(ptr->dri_comment, val.str);
-		break;
-	    default:
-		Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-		break;
-	    }
+    while ((token = xf86getToken(DRITab)) != ENDSECTION) {
+        switch (token) {
+        case GROUP:
+            if ((token = xf86getSubToken(&(ptr->dri_comment))) == STRING)
+                ptr->dri_group_name = val.str;
+            else if (token == NUMBER)
+                ptr->dri_group = val.num;
+            else
+                Error(GROUP_MSG);
+            break;
+        case MODE:
+            if (xf86getSubToken(&(ptr->dri_comment)) != NUMBER)
+                Error(NUMBER_MSG, "Mode");
+            if (val.numType != PARSE_OCTAL)
+                Error(MUST_BE_OCTAL_MSG, val.num);
+            ptr->dri_mode = val.num;
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        case COMMENT:
+            ptr->dri_comment = xf86addComment(ptr->dri_comment, val.str);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
     }
-    
+
 #ifdef DEBUG
     ErrorF("DRI section parsed\n");
 #endif
-    
+
     return ptr;
 }
 
 #undef CLEANUP
 
 void
-xf86printDRISection (FILE * cf, XF86ConfDRIPtr ptr)
+xf86printDRISection(FILE * cf, XF86ConfDRIPtr ptr)
 {
     if (ptr == NULL)
-	return;
-    
-    fprintf (cf, "Section \"DRI\"\n");
+        return;
+
+    fprintf(cf, "Section \"DRI\"\n");
     if (ptr->dri_comment)
-	fprintf (cf, "%s", ptr->dri_comment);
+        fprintf(cf, "%s", ptr->dri_comment);
     if (ptr->dri_group_name)
-	fprintf (cf, "\tGroup        \"%s\"\n", ptr->dri_group_name);
+        fprintf(cf, "\tGroup        \"%s\"\n", ptr->dri_group_name);
     else if (ptr->dri_group >= 0)
-	fprintf (cf, "\tGroup        %d\n", ptr->dri_group);
+        fprintf(cf, "\tGroup        %d\n", ptr->dri_group);
     if (ptr->dri_mode)
-	fprintf (cf, "\tMode         0%o\n", ptr->dri_mode);
-    fprintf (cf, "EndSection\n\n");
+        fprintf(cf, "\tMode         0%o\n", ptr->dri_mode);
+    fprintf(cf, "EndSection\n\n");
 }
 
 void
-xf86freeDRI (XF86ConfDRIPtr ptr)
+xf86freeDRI(XF86ConfDRIPtr ptr)
 {
     if (ptr == NULL)
-	return;
-    
-    TestFree (ptr->dri_comment);
-    free (ptr);
+        return;
+
+    TestFree(ptr->dri_comment);
+    free(ptr);
 }
diff --git a/xorg-server/hw/xfree86/parser/Device.c b/xorg-server/hw/xfree86/parser/Device.c
index d99dbf79d..f27b56fef 100644
--- a/xorg-server/hw/xfree86/parser/Device.c
+++ b/xorg-server/hw/xfree86/parser/Device.c
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -66,306 +65,296 @@
 extern LexRec val;
 
 static
-xf86ConfigSymTabRec DeviceTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{IDENTIFIER, "identifier"},
-	{VENDOR, "vendorname"},
-	{BOARD, "boardname"},
-	{CHIPSET, "chipset"},
-	{RAMDAC, "ramdac"},
-	{DACSPEED, "dacspeed"},
-	{CLOCKS, "clocks"},
-	{OPTION, "option"},
-	{VIDEORAM, "videoram"},
-	{BIOSBASE, "biosbase"},
-	{MEMBASE, "membase"},
-	{IOBASE, "iobase"},
-	{CLOCKCHIP, "clockchip"},
-	{CHIPID, "chipid"},
-	{CHIPREV, "chiprev"},
-	{CARD, "card"},
-	{DRIVER, "driver"},
-	{BUSID, "busid"},
-	{TEXTCLOCKFRQ, "textclockfreq"},
-	{IRQ, "irq"},
-	{SCREEN, "screen"},
-	{-1, ""},
+xf86ConfigSymTabRec DeviceTab[] = {
+    {ENDSECTION, "endsection"},
+    {IDENTIFIER, "identifier"},
+    {VENDOR, "vendorname"},
+    {BOARD, "boardname"},
+    {CHIPSET, "chipset"},
+    {RAMDAC, "ramdac"},
+    {DACSPEED, "dacspeed"},
+    {CLOCKS, "clocks"},
+    {OPTION, "option"},
+    {VIDEORAM, "videoram"},
+    {BIOSBASE, "biosbase"},
+    {MEMBASE, "membase"},
+    {IOBASE, "iobase"},
+    {CLOCKCHIP, "clockchip"},
+    {CHIPID, "chipid"},
+    {CHIPREV, "chiprev"},
+    {CARD, "card"},
+    {DRIVER, "driver"},
+    {BUSID, "busid"},
+    {TEXTCLOCKFRQ, "textclockfreq"},
+    {IRQ, "irq"},
+    {SCREEN, "screen"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeDeviceList
 
 XF86ConfDevicePtr
-xf86parseDeviceSection (void)
+xf86parseDeviceSection(void)
 {
-	int i;
-	int has_ident = FALSE;
-	int token;
-	parsePrologue (XF86ConfDevicePtr, XF86ConfDeviceRec)
+    int i;
+    int has_ident = FALSE;
+    int token;
+
+    parsePrologue(XF86ConfDevicePtr, XF86ConfDeviceRec)
 
-	/* Zero is a valid value for these */
-	ptr->dev_chipid = -1;
-	ptr->dev_chiprev = -1;
-	ptr->dev_irq = -1;
-	while ((token = xf86getToken (DeviceTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->dev_comment = xf86addComment(ptr->dev_comment, val.str);
-			break;
-		case IDENTIFIER:
-			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
-				Error (QUOTE_MSG, "Identifier");
-			if (has_ident == TRUE)
-				Error (MULTIPLE_MSG, "Identifier");
-			ptr->dev_identifier = val.str;
-			has_ident = TRUE;
-			break;
-		case VENDOR:
-			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
-				Error (QUOTE_MSG, "Vendor");
-			ptr->dev_vendor = val.str;
-			break;
-		case BOARD:
-			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
-				Error (QUOTE_MSG, "Board");
-			ptr->dev_board = val.str;
-			break;
-		case CHIPSET:
-			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
-				Error (QUOTE_MSG, "Chipset");
-			ptr->dev_chipset = val.str;
-			break;
-		case CARD:
-			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
-				Error (QUOTE_MSG, "Card");
-			ptr->dev_card = val.str;
-			break;
-		case DRIVER:
-			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
-				Error (QUOTE_MSG, "Driver");
-			ptr->dev_driver = val.str;
-			break;
-		case RAMDAC:
-			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
-				Error (QUOTE_MSG, "Ramdac");
-			ptr->dev_ramdac = val.str;
-			break;
-		case DACSPEED:
-			for (i = 0; i < CONF_MAXDACSPEEDS; i++)
-				ptr->dev_dacSpeeds[i] = 0;
-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
-			{
-				Error (DACSPEED_MSG, CONF_MAXDACSPEEDS);
-			}
-			else
-			{
-				ptr->dev_dacSpeeds[0] = (int) (val.realnum * 1000.0 + 0.5);
-				for (i = 1; i < CONF_MAXDACSPEEDS; i++)
-				{
-					if (xf86getSubToken (&(ptr->dev_comment)) == NUMBER)
-						ptr->dev_dacSpeeds[i] = (int)
-							(val.realnum * 1000.0 + 0.5);
-					else
-					{
-						xf86unGetToken (token);
-						break;
-					}
-				}
-			}
-			break;
-		case VIDEORAM:
-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
-				Error (NUMBER_MSG, "VideoRam");
-			ptr->dev_videoram = val.num;
-			break;
-		case BIOSBASE:
-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
-				Error (NUMBER_MSG, "BIOSBase");
-			ptr->dev_bios_base = val.num;
-			break;
-		case MEMBASE:
-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
-				Error (NUMBER_MSG, "MemBase");
-			ptr->dev_mem_base = val.num;
-			break;
-		case IOBASE:
-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
-				Error (NUMBER_MSG, "IOBase");
-			ptr->dev_io_base = val.num;
-			break;
-		case CLOCKCHIP:
-			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
-				Error (QUOTE_MSG, "ClockChip");
-			ptr->dev_clockchip = val.str;
-			break;
-		case CHIPID:
-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
-				Error (NUMBER_MSG, "ChipID");
-			ptr->dev_chipid = val.num;
-			break;
-		case CHIPREV:
-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
-				Error (NUMBER_MSG, "ChipRev");
-			ptr->dev_chiprev = val.num;
-			break;
+        /* Zero is a valid value for these */
+        ptr->dev_chipid = -1;
+    ptr->dev_chiprev = -1;
+    ptr->dev_irq = -1;
+    while ((token = xf86getToken(DeviceTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->dev_comment = xf86addComment(ptr->dev_comment, val.str);
+            break;
+        case IDENTIFIER:
+            if (xf86getSubToken(&(ptr->dev_comment)) != STRING)
+                Error(QUOTE_MSG, "Identifier");
+            if (has_ident == TRUE)
+                Error(MULTIPLE_MSG, "Identifier");
+            ptr->dev_identifier = val.str;
+            has_ident = TRUE;
+            break;
+        case VENDOR:
+            if (xf86getSubToken(&(ptr->dev_comment)) != STRING)
+                Error(QUOTE_MSG, "Vendor");
+            ptr->dev_vendor = val.str;
+            break;
+        case BOARD:
+            if (xf86getSubToken(&(ptr->dev_comment)) != STRING)
+                Error(QUOTE_MSG, "Board");
+            ptr->dev_board = val.str;
+            break;
+        case CHIPSET:
+            if (xf86getSubToken(&(ptr->dev_comment)) != STRING)
+                Error(QUOTE_MSG, "Chipset");
+            ptr->dev_chipset = val.str;
+            break;
+        case CARD:
+            if (xf86getSubToken(&(ptr->dev_comment)) != STRING)
+                Error(QUOTE_MSG, "Card");
+            ptr->dev_card = val.str;
+            break;
+        case DRIVER:
+            if (xf86getSubToken(&(ptr->dev_comment)) != STRING)
+                Error(QUOTE_MSG, "Driver");
+            ptr->dev_driver = val.str;
+            break;
+        case RAMDAC:
+            if (xf86getSubToken(&(ptr->dev_comment)) != STRING)
+                Error(QUOTE_MSG, "Ramdac");
+            ptr->dev_ramdac = val.str;
+            break;
+        case DACSPEED:
+            for (i = 0; i < CONF_MAXDACSPEEDS; i++)
+                ptr->dev_dacSpeeds[i] = 0;
+            if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER) {
+                Error(DACSPEED_MSG, CONF_MAXDACSPEEDS);
+            }
+            else {
+                ptr->dev_dacSpeeds[0] = (int) (val.realnum * 1000.0 + 0.5);
+                for (i = 1; i < CONF_MAXDACSPEEDS; i++) {
+                    if (xf86getSubToken(&(ptr->dev_comment)) == NUMBER)
+                        ptr->dev_dacSpeeds[i] = (int)
+                            (val.realnum * 1000.0 + 0.5);
+                    else {
+                        xf86unGetToken(token);
+                        break;
+                    }
+                }
+            }
+            break;
+        case VIDEORAM:
+            if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
+                Error(NUMBER_MSG, "VideoRam");
+            ptr->dev_videoram = val.num;
+            break;
+        case BIOSBASE:
+            if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
+                Error(NUMBER_MSG, "BIOSBase");
+            ptr->dev_bios_base = val.num;
+            break;
+        case MEMBASE:
+            if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
+                Error(NUMBER_MSG, "MemBase");
+            ptr->dev_mem_base = val.num;
+            break;
+        case IOBASE:
+            if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
+                Error(NUMBER_MSG, "IOBase");
+            ptr->dev_io_base = val.num;
+            break;
+        case CLOCKCHIP:
+            if (xf86getSubToken(&(ptr->dev_comment)) != STRING)
+                Error(QUOTE_MSG, "ClockChip");
+            ptr->dev_clockchip = val.str;
+            break;
+        case CHIPID:
+            if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
+                Error(NUMBER_MSG, "ChipID");
+            ptr->dev_chipid = val.num;
+            break;
+        case CHIPREV:
+            if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
+                Error(NUMBER_MSG, "ChipRev");
+            ptr->dev_chiprev = val.num;
+            break;
 
-		case CLOCKS:
-			token = xf86getSubToken(&(ptr->dev_comment));
-			for( i = ptr->dev_clocks;
-				token == NUMBER && i < CONF_MAXCLOCKS; i++ ) {
-				ptr->dev_clock[i] = (int)(val.realnum * 1000.0 + 0.5);
-				token = xf86getSubToken(&(ptr->dev_comment));
-			}
-			ptr->dev_clocks = i;
-			xf86unGetToken (token);
-			break;
-		case TEXTCLOCKFRQ:
-			if ((token = xf86getSubToken(&(ptr->dev_comment))) != NUMBER)
-				Error (NUMBER_MSG, "TextClockFreq");
-			ptr->dev_textclockfreq = (int)(val.realnum * 1000.0 + 0.5);
-			break;
-		case OPTION:
-			ptr->dev_option_lst = xf86parseOption(ptr->dev_option_lst);
-			break;
-		case BUSID:
-			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
-				Error (QUOTE_MSG, "BusID");
-			ptr->dev_busid = val.str;
-			break;
-		case IRQ:
-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
-				Error (QUOTE_MSG, "IRQ");
-			ptr->dev_irq = val.num;
-			break;
-		case SCREEN:
-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
-				Error (NUMBER_MSG, "Screen");
-			ptr->dev_screen = val.num;
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
+        case CLOCKS:
+            token = xf86getSubToken(&(ptr->dev_comment));
+            for (i = ptr->dev_clocks;
+                 token == NUMBER && i < CONF_MAXCLOCKS; i++) {
+                ptr->dev_clock[i] = (int) (val.realnum * 1000.0 + 0.5);
+                token = xf86getSubToken(&(ptr->dev_comment));
+            }
+            ptr->dev_clocks = i;
+            xf86unGetToken(token);
+            break;
+        case TEXTCLOCKFRQ:
+            if ((token = xf86getSubToken(&(ptr->dev_comment))) != NUMBER)
+                Error(NUMBER_MSG, "TextClockFreq");
+            ptr->dev_textclockfreq = (int) (val.realnum * 1000.0 + 0.5);
+            break;
+        case OPTION:
+            ptr->dev_option_lst = xf86parseOption(ptr->dev_option_lst);
+            break;
+        case BUSID:
+            if (xf86getSubToken(&(ptr->dev_comment)) != STRING)
+                Error(QUOTE_MSG, "BusID");
+            ptr->dev_busid = val.str;
+            break;
+        case IRQ:
+            if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
+                Error(QUOTE_MSG, "IRQ");
+            ptr->dev_irq = val.num;
+            break;
+        case SCREEN:
+            if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
+                Error(NUMBER_MSG, "Screen");
+            ptr->dev_screen = val.num;
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
 
-	if (!has_ident)
-		Error (NO_IDENT_MSG);
+    if (!has_ident)
+        Error(NO_IDENT_MSG);
 
 #ifdef DEBUG
-	printf ("Device section parsed\n");
+    printf("Device section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
 void
-xf86printDeviceSection (FILE * cf, XF86ConfDevicePtr ptr)
+xf86printDeviceSection(FILE * cf, XF86ConfDevicePtr ptr)
 {
-	int i;
+    int i;
 
-	while (ptr)
-	{
-		fprintf (cf, "Section \"Device\"\n");
-		if (ptr->dev_comment)
-			fprintf (cf, "%s", ptr->dev_comment);
-		if (ptr->dev_identifier)
-			fprintf (cf, "\tIdentifier  \"%s\"\n", ptr->dev_identifier);
-		if (ptr->dev_driver)
-			fprintf (cf, "\tDriver      \"%s\"\n", ptr->dev_driver);
-		if (ptr->dev_vendor)
-			fprintf (cf, "\tVendorName  \"%s\"\n", ptr->dev_vendor);
-		if (ptr->dev_board)
-			fprintf (cf, "\tBoardName   \"%s\"\n", ptr->dev_board);
-		if (ptr->dev_chipset)
-			fprintf (cf, "\tChipSet     \"%s\"\n", ptr->dev_chipset);
-		if (ptr->dev_card)
-			fprintf (cf, "\tCard        \"%s\"\n", ptr->dev_card);
-		if (ptr->dev_ramdac)
-			fprintf (cf, "\tRamDac      \"%s\"\n", ptr->dev_ramdac);
-		if (ptr->dev_dacSpeeds[0] > 0 ) {
-			fprintf (cf, "\tDacSpeed    ");
-			for (i = 0; i < CONF_MAXDACSPEEDS
-					&& ptr->dev_dacSpeeds[i] > 0; i++ )
-				fprintf (cf, "%g ", (double) (ptr->dev_dacSpeeds[i])/ 1000.0 );
-			fprintf (cf, "\n");
-		}
-		if (ptr->dev_videoram)
-			fprintf (cf, "\tVideoRam    %d\n", ptr->dev_videoram);
-		if (ptr->dev_bios_base)
-			fprintf (cf, "\tBiosBase    0x%lx\n", ptr->dev_bios_base);
-		if (ptr->dev_mem_base)
-			fprintf (cf, "\tMemBase     0x%lx\n", ptr->dev_mem_base);
-		if (ptr->dev_io_base)
-			fprintf (cf, "\tIOBase      0x%lx\n", ptr->dev_io_base);
-		if (ptr->dev_clockchip)
-			fprintf (cf, "\tClockChip   \"%s\"\n", ptr->dev_clockchip);
-		if (ptr->dev_chipid != -1)
-			fprintf (cf, "\tChipId      0x%x\n", ptr->dev_chipid);
-		if (ptr->dev_chiprev != -1)
-			fprintf (cf, "\tChipRev     0x%x\n", ptr->dev_chiprev);
+    while (ptr) {
+        fprintf(cf, "Section \"Device\"\n");
+        if (ptr->dev_comment)
+            fprintf(cf, "%s", ptr->dev_comment);
+        if (ptr->dev_identifier)
+            fprintf(cf, "\tIdentifier  \"%s\"\n", ptr->dev_identifier);
+        if (ptr->dev_driver)
+            fprintf(cf, "\tDriver      \"%s\"\n", ptr->dev_driver);
+        if (ptr->dev_vendor)
+            fprintf(cf, "\tVendorName  \"%s\"\n", ptr->dev_vendor);
+        if (ptr->dev_board)
+            fprintf(cf, "\tBoardName   \"%s\"\n", ptr->dev_board);
+        if (ptr->dev_chipset)
+            fprintf(cf, "\tChipSet     \"%s\"\n", ptr->dev_chipset);
+        if (ptr->dev_card)
+            fprintf(cf, "\tCard        \"%s\"\n", ptr->dev_card);
+        if (ptr->dev_ramdac)
+            fprintf(cf, "\tRamDac      \"%s\"\n", ptr->dev_ramdac);
+        if (ptr->dev_dacSpeeds[0] > 0) {
+            fprintf(cf, "\tDacSpeed    ");
+            for (i = 0; i < CONF_MAXDACSPEEDS && ptr->dev_dacSpeeds[i] > 0; i++)
+                fprintf(cf, "%g ", (double) (ptr->dev_dacSpeeds[i]) / 1000.0);
+            fprintf(cf, "\n");
+        }
+        if (ptr->dev_videoram)
+            fprintf(cf, "\tVideoRam    %d\n", ptr->dev_videoram);
+        if (ptr->dev_bios_base)
+            fprintf(cf, "\tBiosBase    0x%lx\n", ptr->dev_bios_base);
+        if (ptr->dev_mem_base)
+            fprintf(cf, "\tMemBase     0x%lx\n", ptr->dev_mem_base);
+        if (ptr->dev_io_base)
+            fprintf(cf, "\tIOBase      0x%lx\n", ptr->dev_io_base);
+        if (ptr->dev_clockchip)
+            fprintf(cf, "\tClockChip   \"%s\"\n", ptr->dev_clockchip);
+        if (ptr->dev_chipid != -1)
+            fprintf(cf, "\tChipId      0x%x\n", ptr->dev_chipid);
+        if (ptr->dev_chiprev != -1)
+            fprintf(cf, "\tChipRev     0x%x\n", ptr->dev_chiprev);
 
-		xf86printOptionList(cf, ptr->dev_option_lst, 1);
-		if (ptr->dev_clocks > 0 ) {
-			fprintf (cf, "\tClocks      ");
-			for (i = 0; i < ptr->dev_clocks; i++ )
-				fprintf (cf, "%.1f ", (double)ptr->dev_clock[i] / 1000.0 );
-			fprintf (cf, "\n");
-		}
-		if (ptr->dev_textclockfreq) {
-			fprintf (cf, "\tTextClockFreq %.1f\n",
-					 (double)ptr->dev_textclockfreq / 1000.0);
-		}
-		if (ptr->dev_busid)
-			fprintf (cf, "\tBusID       \"%s\"\n", ptr->dev_busid);
-		if (ptr->dev_screen > 0)
-			fprintf (cf, "\tScreen      %d\n", ptr->dev_screen);
-		if (ptr->dev_irq >= 0)
-			fprintf (cf, "\tIRQ         %d\n", ptr->dev_irq);
-		fprintf (cf, "EndSection\n\n");
-		ptr = ptr->list.next;
-	}
+        xf86printOptionList(cf, ptr->dev_option_lst, 1);
+        if (ptr->dev_clocks > 0) {
+            fprintf(cf, "\tClocks      ");
+            for (i = 0; i < ptr->dev_clocks; i++)
+                fprintf(cf, "%.1f ", (double) ptr->dev_clock[i] / 1000.0);
+            fprintf(cf, "\n");
+        }
+        if (ptr->dev_textclockfreq) {
+            fprintf(cf, "\tTextClockFreq %.1f\n",
+                    (double) ptr->dev_textclockfreq / 1000.0);
+        }
+        if (ptr->dev_busid)
+            fprintf(cf, "\tBusID       \"%s\"\n", ptr->dev_busid);
+        if (ptr->dev_screen > 0)
+            fprintf(cf, "\tScreen      %d\n", ptr->dev_screen);
+        if (ptr->dev_irq >= 0)
+            fprintf(cf, "\tIRQ         %d\n", ptr->dev_irq);
+        fprintf(cf, "EndSection\n\n");
+        ptr = ptr->list.next;
+    }
 }
 
 void
-xf86freeDeviceList (XF86ConfDevicePtr ptr)
+xf86freeDeviceList(XF86ConfDevicePtr ptr)
 {
-	XF86ConfDevicePtr prev;
+    XF86ConfDevicePtr prev;
 
-	while (ptr)
-	{
-		TestFree (ptr->dev_identifier);
-		TestFree (ptr->dev_vendor);
-		TestFree (ptr->dev_board);
-		TestFree (ptr->dev_chipset);
-		TestFree (ptr->dev_card);
-		TestFree (ptr->dev_driver);
-		TestFree (ptr->dev_ramdac);
-		TestFree (ptr->dev_clockchip);
-		TestFree (ptr->dev_comment);
-		xf86optionListFree (ptr->dev_option_lst);
+    while (ptr) {
+        TestFree(ptr->dev_identifier);
+        TestFree(ptr->dev_vendor);
+        TestFree(ptr->dev_board);
+        TestFree(ptr->dev_chipset);
+        TestFree(ptr->dev_card);
+        TestFree(ptr->dev_driver);
+        TestFree(ptr->dev_ramdac);
+        TestFree(ptr->dev_clockchip);
+        TestFree(ptr->dev_comment);
+        xf86optionListFree(ptr->dev_option_lst);
 
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 XF86ConfDevicePtr
-xf86findDevice (const char *ident, XF86ConfDevicePtr p)
+xf86findDevice(const char *ident, XF86ConfDevicePtr p)
 {
-	while (p)
-	{
-		if (xf86nameCompare (ident, p->dev_identifier) == 0)
-			return p;
+    while (p) {
+        if (xf86nameCompare(ident, p->dev_identifier) == 0)
+            return p;
 
-		p = p->list.next;
-	}
-	return NULL;
+        p = p->list.next;
+    }
+    return NULL;
 }
diff --git a/xorg-server/hw/xfree86/parser/Extensions.c b/xorg-server/hw/xfree86/parser/Extensions.c
index 662f5260c..ec0bda4c0 100644
--- a/xorg-server/hw/xfree86/parser/Extensions.c
+++ b/xorg-server/hw/xfree86/parser/Extensions.c
@@ -41,37 +41,37 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec ExtensionsTab[] =
-{
+static xf86ConfigSymTabRec ExtensionsTab[] = {
     {ENDSECTION, "endsection"},
-    {OPTION,     "option"},
-    {-1,         ""},
+    {OPTION, "option"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeExtensions
 
 XF86ConfExtensionsPtr
-xf86parseExtensionsSection (void)
+xf86parseExtensionsSection(void)
 {
     int token;
-    parsePrologue (XF86ConfExtensionsPtr, XF86ConfExtensionsRec);
-
-    while ((token = xf86getToken (ExtensionsTab)) != ENDSECTION) {
-	switch (token) {
-	    case OPTION:
-		ptr->ext_option_lst = xf86parseOption(ptr->ext_option_lst);
-		break;
-	    case EOF_TOKEN:
-		Error (UNEXPECTED_EOF_MSG);
-		break;
-	    case COMMENT:
-		ptr->extensions_comment =
-		    xf86addComment(ptr->extensions_comment, val.str);
-		break;
-	    default:
-		Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-		break;
-	}
+
+    parsePrologue(XF86ConfExtensionsPtr, XF86ConfExtensionsRec);
+
+    while ((token = xf86getToken(ExtensionsTab)) != ENDSECTION) {
+        switch (token) {
+        case OPTION:
+            ptr->ext_option_lst = xf86parseOption(ptr->ext_option_lst);
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        case COMMENT:
+            ptr->extensions_comment =
+                xf86addComment(ptr->extensions_comment, val.str);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
     }
 
 #ifdef DEBUG
@@ -84,28 +84,28 @@ xf86parseExtensionsSection (void)
 #undef CLEANUP
 
 void
-xf86printExtensionsSection (FILE * cf, XF86ConfExtensionsPtr ptr)
+xf86printExtensionsSection(FILE * cf, XF86ConfExtensionsPtr ptr)
 {
     XF86OptionPtr p;
 
     if (ptr == NULL || ptr->ext_option_lst == NULL)
-	return;
+        return;
 
     p = ptr->ext_option_lst;
-    fprintf (cf, "Section \"Extensions\"\n");
+    fprintf(cf, "Section \"Extensions\"\n");
     if (ptr->extensions_comment)
-	fprintf (cf, "%s", ptr->extensions_comment);
+        fprintf(cf, "%s", ptr->extensions_comment);
     xf86printOptionList(cf, p, 1);
-    fprintf (cf, "EndSection\n\n");
+    fprintf(cf, "EndSection\n\n");
 }
 
 void
-xf86freeExtensions (XF86ConfExtensionsPtr ptr)
+xf86freeExtensions(XF86ConfExtensionsPtr ptr)
 {
     if (ptr == NULL)
-	return;
+        return;
 
-    xf86optionListFree (ptr->ext_option_lst);
-    TestFree (ptr->extensions_comment);
-    free (ptr);
+    xf86optionListFree(ptr->ext_option_lst);
+    TestFree(ptr->extensions_comment);
+    free(ptr);
 }
diff --git a/xorg-server/hw/xfree86/parser/Files.c b/xorg-server/hw/xfree86/parser/Files.c
index a95be9ee2..d8152c008 100644
--- a/xorg-server/hw/xfree86/parser/Files.c
+++ b/xorg-server/hw/xfree86/parser/Files.c
@@ -51,7 +51,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -65,181 +64,169 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec FilesTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{FONTPATH, "fontpath"},
-	{MODULEPATH, "modulepath"},
-	{LOGFILEPATH, "logfile"},
-	{XKBDIR, "xkbdir"},
-	/* Obsolete keywords that aren't used but shouldn't cause errors: */
-	{OBSOLETE_TOKEN, "rgbpath"},
-	{OBSOLETE_TOKEN, "inputdevices"},
-	{-1, ""},
+static xf86ConfigSymTabRec FilesTab[] = {
+    {ENDSECTION, "endsection"},
+    {FONTPATH, "fontpath"},
+    {MODULEPATH, "modulepath"},
+    {LOGFILEPATH, "logfile"},
+    {XKBDIR, "xkbdir"},
+    /* Obsolete keywords that aren't used but shouldn't cause errors: */
+    {OBSOLETE_TOKEN, "rgbpath"},
+    {OBSOLETE_TOKEN, "inputdevices"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeFiles
 
 XF86ConfFilesPtr
-xf86parseFilesSection (void)
+xf86parseFilesSection(void)
 {
-	int i, j;
-	int k, l;
-	char *str;
-	int token;
-	parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec)
-
-	while ((token = xf86getToken (FilesTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->file_comment = xf86addComment(ptr->file_comment, val.str);
-			break;
-		case FONTPATH:
-			if (xf86getSubToken (&(ptr->file_comment)) != STRING)
-				Error (QUOTE_MSG, "FontPath");
-			j = FALSE;
-			str = val.str;
-			if (ptr->file_fontpath == NULL)
-			{
-				ptr->file_fontpath = malloc (1);
-				ptr->file_fontpath[0] = '\0';
-				i = strlen (str) + 1;
-			}
-			else
-			{
-				i = strlen (ptr->file_fontpath) + strlen (str) + 1;
-				if (ptr->file_fontpath[strlen (ptr->file_fontpath) - 1] != ',')
-				{
-					i++;
-					j = TRUE;
-				}
-			}
-			ptr->file_fontpath =
-				realloc (ptr->file_fontpath, i);
-			if (j)
-				strcat (ptr->file_fontpath, ",");
-
-			strcat (ptr->file_fontpath, str);
-			free (val.str);
-			break;
-		case MODULEPATH:
-			if (xf86getSubToken (&(ptr->file_comment)) != STRING)
-				Error (QUOTE_MSG, "ModulePath");
-			l = FALSE;
-			str = val.str;
-			if (ptr->file_modulepath == NULL)
-			{
-				ptr->file_modulepath = malloc (1);
-				ptr->file_modulepath[0] = '\0';
-				k = strlen (str) + 1;
-			}
-			else
-			{
-				k = strlen (ptr->file_modulepath) + strlen (str) + 1;
-				if (ptr->file_modulepath[strlen (ptr->file_modulepath) - 1] != ',')
-				{
-					k++;
-					l = TRUE;
-				}
-			}
-			ptr->file_modulepath = realloc (ptr->file_modulepath, k);
-			if (l)
-				strcat (ptr->file_modulepath, ",");
-
-			strcat (ptr->file_modulepath, str);
-			free (val.str);
-			break;
-		case LOGFILEPATH:
-			if (xf86getSubToken (&(ptr->file_comment)) != STRING)
-				Error (QUOTE_MSG, "LogFile");
-			ptr->file_logfile = val.str;
-			break;
-		case XKBDIR:
-			if (xf86getSubToken (&(ptr->file_xkbdir)) != STRING)
-				Error (QUOTE_MSG, "XkbDir");
-			ptr->file_xkbdir = val.str;
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		case OBSOLETE_TOKEN:
-			xf86parseError (OBSOLETE_MSG, xf86tokenString ());
-			xf86getSubToken (&(ptr->file_comment));
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
+    int i, j;
+    int k, l;
+    char *str;
+    int token;
+
+    parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec)
+
+        while ((token = xf86getToken(FilesTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->file_comment = xf86addComment(ptr->file_comment, val.str);
+            break;
+        case FONTPATH:
+            if (xf86getSubToken(&(ptr->file_comment)) != STRING)
+                Error(QUOTE_MSG, "FontPath");
+            j = FALSE;
+            str = val.str;
+            if (ptr->file_fontpath == NULL) {
+                ptr->file_fontpath = malloc(1);
+                ptr->file_fontpath[0] = '\0';
+                i = strlen(str) + 1;
+            }
+            else {
+                i = strlen(ptr->file_fontpath) + strlen(str) + 1;
+                if (ptr->file_fontpath[strlen(ptr->file_fontpath) - 1] != ',') {
+                    i++;
+                    j = TRUE;
+                }
+            }
+            ptr->file_fontpath = realloc(ptr->file_fontpath, i);
+            if (j)
+                strcat(ptr->file_fontpath, ",");
+
+            strcat(ptr->file_fontpath, str);
+            free(val.str);
+            break;
+        case MODULEPATH:
+            if (xf86getSubToken(&(ptr->file_comment)) != STRING)
+                Error(QUOTE_MSG, "ModulePath");
+            l = FALSE;
+            str = val.str;
+            if (ptr->file_modulepath == NULL) {
+                ptr->file_modulepath = malloc(1);
+                ptr->file_modulepath[0] = '\0';
+                k = strlen(str) + 1;
+            }
+            else {
+                k = strlen(ptr->file_modulepath) + strlen(str) + 1;
+                if (ptr->file_modulepath[strlen(ptr->file_modulepath) - 1] !=
+                    ',') {
+                    k++;
+                    l = TRUE;
+                }
+            }
+            ptr->file_modulepath = realloc(ptr->file_modulepath, k);
+            if (l)
+                strcat(ptr->file_modulepath, ",");
+
+            strcat(ptr->file_modulepath, str);
+            free(val.str);
+            break;
+        case LOGFILEPATH:
+            if (xf86getSubToken(&(ptr->file_comment)) != STRING)
+                Error(QUOTE_MSG, "LogFile");
+            ptr->file_logfile = val.str;
+            break;
+        case XKBDIR:
+            if (xf86getSubToken(&(ptr->file_xkbdir)) != STRING)
+                Error(QUOTE_MSG, "XkbDir");
+            ptr->file_xkbdir = val.str;
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        case OBSOLETE_TOKEN:
+            xf86parseError(OBSOLETE_MSG, xf86tokenString());
+            xf86getSubToken(&(ptr->file_comment));
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
 
 #ifdef DEBUG
-	printf ("File section parsed\n");
+    printf("File section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
 void
-xf86printFileSection (FILE * cf, XF86ConfFilesPtr ptr)
+xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr)
 {
-	char *p, *s;
-
-	if (ptr == NULL)
-		return;
-
-	if (ptr->file_comment)
-		fprintf (cf, "%s", ptr->file_comment);
-	if (ptr->file_logfile)
-		fprintf (cf, "\tLogFile      \"%s\"\n", ptr->file_logfile);
-	if (ptr->file_modulepath)
-	{
-		s = ptr->file_modulepath;
-		p = index (s, ',');
-		while (p)
-		{
-			*p = '\000';
-			fprintf (cf, "\tModulePath   \"%s\"\n", s);
-			*p = ',';
-			s = p;
-			s++;
-			p = index (s, ',');
-		}
-		fprintf (cf, "\tModulePath   \"%s\"\n", s);
-	}
-	if (ptr->file_fontpath)
-	{
-		s = ptr->file_fontpath;
-		p = index (s, ',');
-		while (p)
-		{
-			*p = '\000';
-			fprintf (cf, "\tFontPath     \"%s\"\n", s);
-			*p = ',';
-			s = p;
-			s++;
-			p = index (s, ',');
-		}
-		fprintf (cf, "\tFontPath     \"%s\"\n", s);
-	}
-	if (ptr->file_xkbdir)
-		fprintf (cf, "\tXkbDir		\"%s\"\n", ptr->file_xkbdir);
+    char *p, *s;
+
+    if (ptr == NULL)
+        return;
+
+    if (ptr->file_comment)
+        fprintf(cf, "%s", ptr->file_comment);
+    if (ptr->file_logfile)
+        fprintf(cf, "\tLogFile      \"%s\"\n", ptr->file_logfile);
+    if (ptr->file_modulepath) {
+        s = ptr->file_modulepath;
+        p = index(s, ',');
+        while (p) {
+            *p = '\000';
+            fprintf(cf, "\tModulePath   \"%s\"\n", s);
+            *p = ',';
+            s = p;
+            s++;
+            p = index(s, ',');
+        }
+        fprintf(cf, "\tModulePath   \"%s\"\n", s);
+    }
+    if (ptr->file_fontpath) {
+        s = ptr->file_fontpath;
+        p = index(s, ',');
+        while (p) {
+            *p = '\000';
+            fprintf(cf, "\tFontPath     \"%s\"\n", s);
+            *p = ',';
+            s = p;
+            s++;
+            p = index(s, ',');
+        }
+        fprintf(cf, "\tFontPath     \"%s\"\n", s);
+    }
+    if (ptr->file_xkbdir)
+        fprintf(cf, "\tXkbDir		\"%s\"\n", ptr->file_xkbdir);
 }
 
 void
-xf86freeFiles (XF86ConfFilesPtr p)
+xf86freeFiles(XF86ConfFilesPtr p)
 {
-	if (p == NULL)
-		return;
+    if (p == NULL)
+        return;
 
-	TestFree (p->file_logfile);
-	TestFree (p->file_modulepath);
-	TestFree (p->file_fontpath);
-	TestFree (p->file_comment);
-	TestFree (p->file_xkbdir);
+    TestFree(p->file_logfile);
+    TestFree(p->file_modulepath);
+    TestFree(p->file_fontpath);
+    TestFree(p->file_comment);
+    TestFree(p->file_xkbdir);
 
-	free (p);
+    free(p);
 }
diff --git a/xorg-server/hw/xfree86/parser/Flags.c b/xorg-server/hw/xfree86/parser/Flags.c
index c2a04062c..29a60a2e1 100644
--- a/xorg-server/hw/xfree86/parser/Flags.c
+++ b/xorg-server/hw/xfree86/parser/Flags.c
@@ -51,7 +51,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -67,242 +66,239 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec ServerFlagsTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{NOTRAPSIGNALS, "notrapsignals"},
-	{DONTZAP, "dontzap"},
-	{DONTZOOM, "dontzoom"},
-	{DISABLEVIDMODE, "disablevidmodeextension"},
-	{ALLOWNONLOCAL, "allownonlocalxvidtune"},
-	{DISABLEMODINDEV, "disablemodindev"},
-	{MODINDEVALLOWNONLOCAL, "allownonlocalmodindev"},
-	{ALLOWMOUSEOPENFAIL, "allowmouseopenfail"},
-	{OPTION, "option"},
-	{BLANKTIME, "blanktime"},
-	{STANDBYTIME, "standbytime"},
-	{SUSPENDTIME, "suspendtime"},
-	{OFFTIME, "offtime"},
-	{DEFAULTLAYOUT, "defaultserverlayout"},
-	{-1, ""},
+static xf86ConfigSymTabRec ServerFlagsTab[] = {
+    {ENDSECTION, "endsection"},
+    {NOTRAPSIGNALS, "notrapsignals"},
+    {DONTZAP, "dontzap"},
+    {DONTZOOM, "dontzoom"},
+    {DISABLEVIDMODE, "disablevidmodeextension"},
+    {ALLOWNONLOCAL, "allownonlocalxvidtune"},
+    {DISABLEMODINDEV, "disablemodindev"},
+    {MODINDEVALLOWNONLOCAL, "allownonlocalmodindev"},
+    {ALLOWMOUSEOPENFAIL, "allowmouseopenfail"},
+    {OPTION, "option"},
+    {BLANKTIME, "blanktime"},
+    {STANDBYTIME, "standbytime"},
+    {SUSPENDTIME, "suspendtime"},
+    {OFFTIME, "offtime"},
+    {DEFAULTLAYOUT, "defaultserverlayout"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeFlags
 
 XF86ConfFlagsPtr
-xf86parseFlagsSection (void)
+xf86parseFlagsSection(void)
 {
-	int token;
-	parsePrologue (XF86ConfFlagsPtr, XF86ConfFlagsRec)
-
-	while ((token = xf86getToken (ServerFlagsTab)) != ENDSECTION)
-	{
-		int hasvalue = FALSE;
-		int strvalue = FALSE;
-		int tokentype;
-		switch (token)
-		{
-		case COMMENT:
-			ptr->flg_comment = xf86addComment(ptr->flg_comment, val.str);
-			break;
-			/* 
-			 * these old keywords are turned into standard generic options.
-			 * we fall through here on purpose
-			 */
-		case DEFAULTLAYOUT:
-			strvalue = TRUE;
-		case BLANKTIME:
-		case STANDBYTIME:
-		case SUSPENDTIME:
-		case OFFTIME:
-			hasvalue = TRUE;
-		case NOTRAPSIGNALS:
-		case DONTZAP:
-		case DONTZOOM:
-		case DISABLEVIDMODE:
-		case ALLOWNONLOCAL:
-		case DISABLEMODINDEV:
-		case MODINDEVALLOWNONLOCAL:
-		case ALLOWMOUSEOPENFAIL:
-			{
-				int i = 0;
-				while (ServerFlagsTab[i].token != -1)
-				{
-					char *tmp;
-
-					if (ServerFlagsTab[i].token == token)
-					{
-						char *valstr = NULL;
-						tmp = strdup (ServerFlagsTab[i].name);
-						if (hasvalue)
-						{
-							tokentype = xf86getSubToken(&(ptr->flg_comment));
-							if (strvalue) {
-								if (tokentype != STRING)
-									Error (QUOTE_MSG, tmp);
-								valstr = val.str;
-							} else {
-								if (tokentype != NUMBER)
-									Error (NUMBER_MSG, tmp);
-								if (asprintf(&valstr, "%d", val.num) == -1)
-									valstr = NULL;
-							}
-						}
-						ptr->flg_option_lst = xf86addNewOption
-							(ptr->flg_option_lst, tmp, valstr);
-					}
-					i++;
-				}
-			}
-			break;
-		case OPTION:
-			ptr->flg_option_lst = xf86parseOption(ptr->flg_option_lst);
-			break;
-
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
+    int token;
+
+    parsePrologue(XF86ConfFlagsPtr, XF86ConfFlagsRec)
+
+        while ((token = xf86getToken(ServerFlagsTab)) != ENDSECTION) {
+        int hasvalue = FALSE;
+        int strvalue = FALSE;
+        int tokentype;
+
+        switch (token) {
+        case COMMENT:
+            ptr->flg_comment = xf86addComment(ptr->flg_comment, val.str);
+            break;
+            /* 
+             * these old keywords are turned into standard generic options.
+             * we fall through here on purpose
+             */
+        case DEFAULTLAYOUT:
+            strvalue = TRUE;
+        case BLANKTIME:
+        case STANDBYTIME:
+        case SUSPENDTIME:
+        case OFFTIME:
+            hasvalue = TRUE;
+        case NOTRAPSIGNALS:
+        case DONTZAP:
+        case DONTZOOM:
+        case DISABLEVIDMODE:
+        case ALLOWNONLOCAL:
+        case DISABLEMODINDEV:
+        case MODINDEVALLOWNONLOCAL:
+        case ALLOWMOUSEOPENFAIL:
+        {
+            int i = 0;
+
+            while (ServerFlagsTab[i].token != -1) {
+                char *tmp;
+
+                if (ServerFlagsTab[i].token == token) {
+                    char *valstr = NULL;
+
+                    tmp = strdup(ServerFlagsTab[i].name);
+                    if (hasvalue) {
+                        tokentype = xf86getSubToken(&(ptr->flg_comment));
+                        if (strvalue) {
+                            if (tokentype != STRING)
+                                Error(QUOTE_MSG, tmp);
+                            valstr = val.str;
+                        }
+                        else {
+                            if (tokentype != NUMBER)
+                                Error(NUMBER_MSG, tmp);
+                            if (asprintf(&valstr, "%d", val.num) == -1)
+                                valstr = NULL;
+                        }
+                    }
+                    ptr->flg_option_lst = xf86addNewOption
+                        (ptr->flg_option_lst, tmp, valstr);
+                }
+                i++;
+            }
+        }
+            break;
+        case OPTION:
+            ptr->flg_option_lst = xf86parseOption(ptr->flg_option_lst);
+            break;
+
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
 
 #ifdef DEBUG
-	printf ("Flags section parsed\n");
+    printf("Flags section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
 void
-xf86printServerFlagsSection (FILE * f, XF86ConfFlagsPtr flags)
+xf86printServerFlagsSection(FILE * f, XF86ConfFlagsPtr flags)
 {
-	XF86OptionPtr p;
-
-	if ((!flags) || (!flags->flg_option_lst))
-		return;
-	p = flags->flg_option_lst;
-	fprintf (f, "Section \"ServerFlags\"\n");
-	if (flags->flg_comment)
-		fprintf (f, "%s", flags->flg_comment);
-	xf86printOptionList(f, p, 1);
-	fprintf (f, "EndSection\n\n");
+    XF86OptionPtr p;
+
+    if ((!flags) || (!flags->flg_option_lst))
+        return;
+    p = flags->flg_option_lst;
+    fprintf(f, "Section \"ServerFlags\"\n");
+    if (flags->flg_comment)
+        fprintf(f, "%s", flags->flg_comment);
+    xf86printOptionList(f, p, 1);
+    fprintf(f, "EndSection\n\n");
 }
 
 static XF86OptionPtr
-addNewOption2 (XF86OptionPtr head, char *name, char *val, int used)
+addNewOption2(XF86OptionPtr head, char *name, char *val, int used)
 {
-	XF86OptionPtr new, old = NULL;
-
-	/* Don't allow duplicates, free old strings */
-	if (head != NULL && (old = xf86findOption(head, name)) != NULL) {
-		new = old;
-		free(new->opt_name);
-		free(new->opt_val);
-	}
-	else
-		new = calloc (1, sizeof (*new));
-	new->opt_name = name;
-	new->opt_val = val;
-	new->opt_used = used;
-
-	if (old)
-		return head;
-	return ((XF86OptionPtr) xf86addListItem ((glp) head, (glp) new));
+    XF86OptionPtr new, old = NULL;
+
+    /* Don't allow duplicates, free old strings */
+    if (head != NULL && (old = xf86findOption(head, name)) != NULL) {
+        new = old;
+        free(new->opt_name);
+        free(new->opt_val);
+    }
+    else
+        new = calloc(1, sizeof(*new));
+    new->opt_name = name;
+    new->opt_val = val;
+    new->opt_used = used;
+
+    if (old)
+        return head;
+    return ((XF86OptionPtr) xf86addListItem((glp) head, (glp) new));
 }
 
 XF86OptionPtr
-xf86addNewOption (XF86OptionPtr head, char *name, char *val)
+xf86addNewOption(XF86OptionPtr head, char *name, char *val)
 {
-	return addNewOption2(head, name, val, 0);
+    return addNewOption2(head, name, val, 0);
 }
 
 void
-xf86freeFlags (XF86ConfFlagsPtr flags)
+xf86freeFlags(XF86ConfFlagsPtr flags)
 {
-	if (flags == NULL)
-		return;
-	xf86optionListFree (flags->flg_option_lst);
-	TestFree(flags->flg_comment);
-	free (flags);
+    if (flags == NULL)
+        return;
+    xf86optionListFree(flags->flg_option_lst);
+    TestFree(flags->flg_comment);
+    free(flags);
 }
 
 XF86OptionPtr
-xf86optionListDup (XF86OptionPtr opt)
+xf86optionListDup(XF86OptionPtr opt)
 {
-	XF86OptionPtr newopt = NULL;
-	char *val;
-
-	while (opt)
-	{
-		val = opt->opt_val ? strdup(opt->opt_val) : NULL;
-		newopt = xf86addNewOption(newopt, strdup(opt->opt_name), val);
-		newopt->opt_used = opt->opt_used;
-		if (opt->opt_comment)
-			newopt->opt_comment = strdup(opt->opt_comment);
-		opt = opt->list.next;
-	}
-	return newopt;
+    XF86OptionPtr newopt = NULL;
+    char *val;
+
+    while (opt) {
+        val = opt->opt_val ? strdup(opt->opt_val) : NULL;
+        newopt = xf86addNewOption(newopt, strdup(opt->opt_name), val);
+        newopt->opt_used = opt->opt_used;
+        if (opt->opt_comment)
+            newopt->opt_comment = strdup(opt->opt_comment);
+        opt = opt->list.next;
+    }
+    return newopt;
 }
 
 void
-xf86optionListFree (XF86OptionPtr opt)
+xf86optionListFree(XF86OptionPtr opt)
 {
-	XF86OptionPtr prev;
-
-	while (opt)
-	{
-		TestFree (opt->opt_name);
-		TestFree (opt->opt_val);
-		TestFree (opt->opt_comment);
-		prev = opt;
-		opt = opt->list.next;
-		free (prev);
-	}
+    XF86OptionPtr prev;
+
+    while (opt) {
+        TestFree(opt->opt_name);
+        TestFree(opt->opt_val);
+        TestFree(opt->opt_comment);
+        prev = opt;
+        opt = opt->list.next;
+        free(prev);
+    }
 }
 
 char *
 xf86optionName(XF86OptionPtr opt)
 {
-	if (opt)
-		return opt->opt_name;
-	return 0;
+    if (opt)
+        return opt->opt_name;
+    return 0;
 }
 
 char *
 xf86optionValue(XF86OptionPtr opt)
 {
-	if (opt)
-		return opt->opt_val;
-	return 0;
+    if (opt)
+        return opt->opt_val;
+    return 0;
 }
 
 XF86OptionPtr
 xf86newOption(char *name, char *value)
 {
-	XF86OptionPtr opt;
+    XF86OptionPtr opt;
 
-	opt = calloc(1, sizeof (*opt));
-	if (!opt)
-		return NULL;
+    opt = calloc(1, sizeof(*opt));
+    if (!opt)
+        return NULL;
 
-	opt->opt_used = 0;
-	opt->list.next = 0;
-	opt->opt_name = name;
-	opt->opt_val = value;
+    opt->opt_used = 0;
+    opt->list.next = 0;
+    opt->opt_name = name;
+    opt->opt_val = value;
 
-	return opt;
+    return opt;
 }
 
 XF86OptionPtr
 xf86nextOption(XF86OptionPtr list)
 {
-	if (!list)
-		return NULL;
-	return list->list.next;
+    if (!list)
+        return NULL;
+    return list->list.next;
 }
 
 /*
@@ -312,15 +308,14 @@ xf86nextOption(XF86OptionPtr list)
  */
 
 XF86OptionPtr
-xf86findOption (XF86OptionPtr list, const char *name)
+xf86findOption(XF86OptionPtr list, const char *name)
 {
-	while (list)
-	{
-		if (xf86nameCompare (list->opt_name, name) == 0)
-			return list;
-		list = list->list.next;
-	}
-	return NULL;
+    while (list) {
+        if (xf86nameCompare(list->opt_name, name) == 0)
+            return list;
+        list = list->list.next;
+    }
+    return NULL;
 }
 
 /*
@@ -331,45 +326,41 @@ xf86findOption (XF86OptionPtr list, const char *name)
  */
 
 const char *
-xf86findOptionValue (XF86OptionPtr list, const char *name)
+xf86findOptionValue(XF86OptionPtr list, const char *name)
 {
-	XF86OptionPtr p = xf86findOption (list, name);
-
-	if (p)
-	{
-		if (p->opt_val)
-			return p->opt_val;
-		else
-			return "";
-	}
-	return NULL;
+    XF86OptionPtr p = xf86findOption(list, name);
+
+    if (p) {
+        if (p->opt_val)
+            return p->opt_val;
+        else
+            return "";
+    }
+    return NULL;
 }
 
 XF86OptionPtr
-xf86optionListCreate( const char **options, int count, int used )
+xf86optionListCreate(const char **options, int count, int used)
 {
-	XF86OptionPtr p = NULL;
-	char *t1, *t2;
-	int i;
-
-	if (count == -1)
-	{
-		for (count = 0; options[count]; count++)
-			;
-	}
-	if( (count % 2) != 0 )
-	{
-		fprintf( stderr, "xf86optionListCreate: count must be an even number.\n" );
-		return NULL;
-	}
-	for (i = 0; i < count; i += 2)
-	{
-		t1 = strdup(options[i]);
-		t2 = strdup(options[i + 1]);
-		p = addNewOption2 (p, t1, t2, used);
-	}
-
-	return p;
+    XF86OptionPtr p = NULL;
+    char *t1, *t2;
+    int i;
+
+    if (count == -1) {
+        for (count = 0; options[count]; count++);
+    }
+    if ((count % 2) != 0) {
+        fprintf(stderr,
+                "xf86optionListCreate: count must be an even number.\n");
+        return NULL;
+    }
+    for (i = 0; i < count; i += 2) {
+        t1 = strdup(options[i]);
+        t2 = strdup(options[i + 1]);
+        p = addNewOption2(p, t1, t2, used);
+    }
+
+    return p;
 }
 
 /* the 2 given lists are merged. If an option with the same name is present in
@@ -378,128 +369,130 @@ xf86optionListCreate( const char **options, int count, int used )
  * are freed, and the original lists are no longer guaranteed to be complete.
  */
 XF86OptionPtr
-xf86optionListMerge (XF86OptionPtr head, XF86OptionPtr tail)
+xf86optionListMerge(XF86OptionPtr head, XF86OptionPtr tail)
 {
-	XF86OptionPtr a, b, ap = NULL, bp = NULL;
-
-	a = tail;
-	b = head;
-	while (tail && b) {
-		if (xf86nameCompare (a->opt_name, b->opt_name) == 0) {
-			if (b == head)
-				head = a;
-			else
-				bp->list.next = a;
-			if (a == tail)
-				tail = a->list.next;
-			else
-				ap->list.next = a->list.next;
-			a->list.next = b->list.next;
-			b->list.next = NULL;
-			xf86optionListFree (b);
-			b = a->list.next;
-			bp = a;
-			a = tail;
-			ap = NULL;
-		} else {
-			ap = a;
-			if (!(a = a->list.next)) {
-				a = tail;
-				bp = b;
-				b = b->list.next;
-				ap = NULL;
-			}
-		}
-	}
-
-	if (head) {
-		for (a = head; a->list.next; a = a->list.next)
-			;
-		a->list.next = tail;
-	} else 
-		head = tail;
-
-	return head;
+    XF86OptionPtr a, b, ap = NULL, bp = NULL;
+
+    a = tail;
+    b = head;
+    while (tail && b) {
+        if (xf86nameCompare(a->opt_name, b->opt_name) == 0) {
+            if (b == head)
+                head = a;
+            else
+                bp->list.next = a;
+            if (a == tail)
+                tail = a->list.next;
+            else
+                ap->list.next = a->list.next;
+            a->list.next = b->list.next;
+            b->list.next = NULL;
+            xf86optionListFree(b);
+            b = a->list.next;
+            bp = a;
+            a = tail;
+            ap = NULL;
+        }
+        else {
+            ap = a;
+            if (!(a = a->list.next)) {
+                a = tail;
+                bp = b;
+                b = b->list.next;
+                ap = NULL;
+            }
+        }
+    }
+
+    if (head) {
+        for (a = head; a->list.next; a = a->list.next);
+        a->list.next = tail;
+    }
+    else
+        head = tail;
+
+    return head;
 }
 
 char *
 xf86uLongToString(unsigned long i)
 {
-	char *s;
+    char *s;
 
-	if (asprintf(&s, "%lu", i) == -1)
-		return NULL;
-	return s;
+    if (asprintf(&s, "%lu", i) == -1)
+        return NULL;
+    return s;
 }
 
 XF86OptionPtr
 xf86parseOption(XF86OptionPtr head)
 {
-	XF86OptionPtr option, cnew, old;
-	char *name, *comment = NULL;
-	int token;
-
-	if ((token = xf86getSubToken(&comment)) != STRING) {
-		xf86parseError(BAD_OPTION_MSG);
-		free(comment);
-		return head;
-	}
-
-	name = val.str;
-	if ((token = xf86getSubToken(&comment)) == STRING) {
-		option = xf86newOption(name, val.str);
-		option->opt_comment = comment;
-		if ((token = xf86getToken(NULL)) == COMMENT)
-			option->opt_comment = xf86addComment(option->opt_comment, val.str);
-		else
-			xf86unGetToken(token);
-	}
-	else {
-		option = xf86newOption(name, NULL);
-		option->opt_comment = comment;
-		if (token == COMMENT)
-			option->opt_comment = xf86addComment(option->opt_comment, val.str);
-		else
-			xf86unGetToken(token);
-	}
-
-	old = NULL;
-
-	/* Don't allow duplicates */
-	if (head != NULL && (old = xf86findOption(head, name)) != NULL) {
-		cnew = old;
-		free(option->opt_name);
-		TestFree(option->opt_val);
-		TestFree(option->opt_comment);
-		free(option);
-	}
-	else
-		cnew = option;
-	
-	if (old == NULL)
-		return ((XF86OptionPtr)xf86addListItem((glp)head, (glp)cnew));
-
-	return head;
+    XF86OptionPtr option, cnew, old;
+    char *name, *comment = NULL;
+    int token;
+
+    if ((token = xf86getSubToken(&comment)) != STRING) {
+        xf86parseError(BAD_OPTION_MSG);
+        free(comment);
+        return head;
+    }
+
+    name = val.str;
+    if ((token = xf86getSubToken(&comment)) == STRING) {
+        option = xf86newOption(name, val.str);
+        option->opt_comment = comment;
+        if ((token = xf86getToken(NULL)) == COMMENT)
+            option->opt_comment = xf86addComment(option->opt_comment, val.str);
+        else
+            xf86unGetToken(token);
+    }
+    else {
+        option = xf86newOption(name, NULL);
+        option->opt_comment = comment;
+        if (token == COMMENT)
+            option->opt_comment = xf86addComment(option->opt_comment, val.str);
+        else
+            xf86unGetToken(token);
+    }
+
+    old = NULL;
+
+    /* Don't allow duplicates */
+    if (head != NULL && (old = xf86findOption(head, name)) != NULL) {
+        cnew = old;
+        free(option->opt_name);
+        TestFree(option->opt_val);
+        TestFree(option->opt_comment);
+        free(option);
+    }
+    else
+        cnew = option;
+
+    if (old == NULL)
+        return ((XF86OptionPtr) xf86addListItem((glp) head, (glp) cnew));
+
+    return head;
 }
 
 void
-xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs)
+xf86printOptionList(FILE * fp, XF86OptionPtr list, int tabs)
 {
-	int i;
-
-	if (!list)
-		return;
-	while (list) {
-		for (i = 0; i < tabs; i++)
-			fputc('\t', fp);
-		if (list->opt_val)
-			fprintf(fp, "Option	    \"%s\" \"%s\"", list->opt_name, list->opt_val);
-		else
-			fprintf(fp, "Option	    \"%s\"", list->opt_name);
-		if (list->opt_comment)
-			fprintf(fp, "%s", list->opt_comment);
-		else
-			fputc('\n', fp);
-		list = list->list.next;
-	}
+    int i;
+
+    if (!list)
+        return;
+    while (list) {
+        for (i = 0; i < tabs; i++)
+            fputc('\t', fp);
+        if (list->opt_val)
+            fprintf(fp, "Option	    \"%s\" \"%s\"", list->opt_name,
+                    list->opt_val);
+        else
+            fprintf(fp, "Option	    \"%s\"", list->opt_name);
+        if (list->opt_comment)
+            fprintf(fp, "%s", list->opt_comment);
+        else
+            fputc('\n', fp);
+        list = list->list.next;
+    }
 }
diff --git a/xorg-server/hw/xfree86/parser/Input.c b/xorg-server/hw/xfree86/parser/Input.c
index e6037732a..6e0073437 100644
--- a/xorg-server/hw/xfree86/parser/Input.c
+++ b/xorg-server/hw/xfree86/parser/Input.c
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -67,147 +66,141 @@
 extern LexRec val;
 
 static
-xf86ConfigSymTabRec InputTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{IDENTIFIER, "identifier"},
-	{OPTION, "option"},
-	{DRIVER, "driver"},
-	{-1, ""},
+xf86ConfigSymTabRec InputTab[] = {
+    {ENDSECTION, "endsection"},
+    {IDENTIFIER, "identifier"},
+    {OPTION, "option"},
+    {DRIVER, "driver"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeInputList
 
 XF86ConfInputPtr
-xf86parseInputSection (void)
+xf86parseInputSection(void)
 {
-	int has_ident = FALSE;
-	int token;
-	parsePrologue (XF86ConfInputPtr, XF86ConfInputRec)
-
-	while ((token = xf86getToken (InputTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->inp_comment = xf86addComment(ptr->inp_comment, val.str);
-			break;
-		case IDENTIFIER:
-			if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
-				Error (QUOTE_MSG, "Identifier");
-			if (has_ident == TRUE)
-				Error (MULTIPLE_MSG, "Identifier");
-			ptr->inp_identifier = val.str;
-			has_ident = TRUE;
-			break;
-		case DRIVER:
-			if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
-				Error (QUOTE_MSG, "Driver");
-                        if (strcmp(val.str, "keyboard") == 0) {
-                            ptr->inp_driver = strdup("kbd");
-                            free(val.str);
-                        }
-                        else
-			    ptr->inp_driver = val.str;
-			break;
-		case OPTION:
-			ptr->inp_option_lst = xf86parseOption(ptr->inp_option_lst);
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
-
-	if (!has_ident)
-		Error (NO_IDENT_MSG);
+    int has_ident = FALSE;
+    int token;
+
+    parsePrologue(XF86ConfInputPtr, XF86ConfInputRec)
+
+        while ((token = xf86getToken(InputTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->inp_comment = xf86addComment(ptr->inp_comment, val.str);
+            break;
+        case IDENTIFIER:
+            if (xf86getSubToken(&(ptr->inp_comment)) != STRING)
+                Error(QUOTE_MSG, "Identifier");
+            if (has_ident == TRUE)
+                Error(MULTIPLE_MSG, "Identifier");
+            ptr->inp_identifier = val.str;
+            has_ident = TRUE;
+            break;
+        case DRIVER:
+            if (xf86getSubToken(&(ptr->inp_comment)) != STRING)
+                Error(QUOTE_MSG, "Driver");
+            if (strcmp(val.str, "keyboard") == 0) {
+                ptr->inp_driver = strdup("kbd");
+                free(val.str);
+            }
+            else
+                ptr->inp_driver = val.str;
+            break;
+        case OPTION:
+            ptr->inp_option_lst = xf86parseOption(ptr->inp_option_lst);
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
+
+    if (!has_ident)
+        Error(NO_IDENT_MSG);
 
 #ifdef DEBUG
-	printf ("InputDevice section parsed\n");
+    printf("InputDevice section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
 void
-xf86printInputSection (FILE * cf, XF86ConfInputPtr ptr)
+xf86printInputSection(FILE * cf, XF86ConfInputPtr ptr)
 {
-	while (ptr)
-	{
-		fprintf (cf, "Section \"InputDevice\"\n");
-		if (ptr->inp_comment)
-			fprintf (cf, "%s", ptr->inp_comment);
-		if (ptr->inp_identifier)
-			fprintf (cf, "\tIdentifier  \"%s\"\n", ptr->inp_identifier);
-		if (ptr->inp_driver)
-			fprintf (cf, "\tDriver      \"%s\"\n", ptr->inp_driver);
-		xf86printOptionList(cf, ptr->inp_option_lst, 1);
-		fprintf (cf, "EndSection\n\n");
-		ptr = ptr->list.next;
-	}
+    while (ptr) {
+        fprintf(cf, "Section \"InputDevice\"\n");
+        if (ptr->inp_comment)
+            fprintf(cf, "%s", ptr->inp_comment);
+        if (ptr->inp_identifier)
+            fprintf(cf, "\tIdentifier  \"%s\"\n", ptr->inp_identifier);
+        if (ptr->inp_driver)
+            fprintf(cf, "\tDriver      \"%s\"\n", ptr->inp_driver);
+        xf86printOptionList(cf, ptr->inp_option_lst, 1);
+        fprintf(cf, "EndSection\n\n");
+        ptr = ptr->list.next;
+    }
 }
 
 void
-xf86freeInputList (XF86ConfInputPtr ptr)
+xf86freeInputList(XF86ConfInputPtr ptr)
 {
-	XF86ConfInputPtr prev;
-
-	while (ptr)
-	{
-		TestFree (ptr->inp_identifier);
-		TestFree (ptr->inp_driver);
-		TestFree (ptr->inp_comment);
-		xf86optionListFree (ptr->inp_option_lst);
-
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ConfInputPtr prev;
+
+    while (ptr) {
+        TestFree(ptr->inp_identifier);
+        TestFree(ptr->inp_driver);
+        TestFree(ptr->inp_comment);
+        xf86optionListFree(ptr->inp_option_lst);
+
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 int
-xf86validateInput (XF86ConfigPtr p)
+xf86validateInput(XF86ConfigPtr p)
 {
-	XF86ConfInputPtr input = p->conf_input_lst;
-
-	while (input) {
-		if (!input->inp_driver) {
-			xf86validationError (UNDEFINED_INPUTDRIVER_MSG, input->inp_identifier);
-			return FALSE;
-		}
-		input = input->list.next;
-	}
-	return TRUE;
+    XF86ConfInputPtr input = p->conf_input_lst;
+
+    while (input) {
+        if (!input->inp_driver) {
+            xf86validationError(UNDEFINED_INPUTDRIVER_MSG,
+                                input->inp_identifier);
+            return FALSE;
+        }
+        input = input->list.next;
+    }
+    return TRUE;
 }
 
 XF86ConfInputPtr
-xf86findInput (const char *ident, XF86ConfInputPtr p)
+xf86findInput(const char *ident, XF86ConfInputPtr p)
 {
-	while (p)
-	{
-		if (xf86nameCompare (ident, p->inp_identifier) == 0)
-			return p;
-
-		p = p->list.next;
-	}
-	return NULL;
+    while (p) {
+        if (xf86nameCompare(ident, p->inp_identifier) == 0)
+            return p;
+
+        p = p->list.next;
+    }
+    return NULL;
 }
 
 XF86ConfInputPtr
-xf86findInputByDriver (const char *driver, XF86ConfInputPtr p)
+xf86findInputByDriver(const char *driver, XF86ConfInputPtr p)
 {
-	while (p)
-	{
-		if (xf86nameCompare (driver, p->inp_driver) == 0)
-			return p;
-
-		p = p->list.next;
-	}
-	return NULL;
-}
+    while (p) {
+        if (xf86nameCompare(driver, p->inp_driver) == 0)
+            return p;
 
+        p = p->list.next;
+    }
+    return NULL;
+}
diff --git a/xorg-server/hw/xfree86/parser/InputClass.c b/xorg-server/hw/xfree86/parser/InputClass.c
index c25117c1a..8493685cd 100644
--- a/xorg-server/hw/xfree86/parser/InputClass.c
+++ b/xorg-server/hw/xfree86/parser/InputClass.c
@@ -38,8 +38,7 @@
 extern LexRec val;
 
 static
-xf86ConfigSymTabRec InputClassTab[] =
-{
+xf86ConfigSymTabRec InputClassTab[] = {
     {ENDSECTION, "endsection"},
     {IDENTIFIER, "identifier"},
     {OPTION, "option"},
@@ -86,8 +85,8 @@ xf86parseInputClassSection(void)
 
     parsePrologue(XF86ConfInputClassPtr, XF86ConfInputClassRec)
 
-    /* Initialize MatchGroup lists */
-    xorg_list_init(&ptr->match_product);
+        /* Initialize MatchGroup lists */
+        xorg_list_init(&ptr->match_product);
     xorg_list_init(&ptr->match_vendor);
     xorg_list_init(&ptr->match_device);
     xorg_list_init(&ptr->match_os);
@@ -147,8 +146,7 @@ xf86parseInputClassSection(void)
         case MATCH_OS:
             if (xf86getSubToken(&(ptr->comment)) != STRING)
                 Error(QUOTE_MSG, "MatchOS");
-            add_group_entry(&ptr->match_os,
-                            xstrtokenize(val.str, TOKEN_SEP));
+            add_group_entry(&ptr->match_os, xstrtokenize(val.str, TOKEN_SEP));
             free(val.str);
             break;
         case MATCH_PNPID:
@@ -175,8 +173,7 @@ xf86parseInputClassSection(void)
         case MATCH_TAG:
             if (xf86getSubToken(&(ptr->comment)) != STRING)
                 Error(QUOTE_MSG, "MatchTag");
-            add_group_entry(&ptr->match_tag,
-                            xstrtokenize(val.str, TOKEN_SEP));
+            add_group_entry(&ptr->match_tag, xstrtokenize(val.str, TOKEN_SEP));
             free(val.str);
             break;
         case MATCH_LAYOUT:
@@ -216,8 +213,7 @@ xf86parseInputClassSection(void)
         case MATCH_IS_TABLET:
             if (xf86getSubToken(&(ptr->comment)) != STRING)
                 Error(QUOTE_MSG, "MatchIsTablet");
-            ptr->is_tablet.set = xf86getBoolValue(&ptr->is_tablet.val,
-                                                  val.str);
+            ptr->is_tablet.set = xf86getBoolValue(&ptr->is_tablet.val, val.str);
             free(val.str);
             if (!ptr->is_tablet.set)
                 Error(BOOL_MSG, "MatchIsTablet");
@@ -244,7 +240,7 @@ xf86parseInputClassSection(void)
             Error(UNEXPECTED_EOF_MSG);
             break;
         default:
-            Error(INVALID_KEYWORD_MSG, xf86tokenString ());
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
             break;
         }
     }
@@ -260,10 +256,10 @@ xf86parseInputClassSection(void)
 }
 
 void
-xf86printInputClassSection (FILE * cf, XF86ConfInputClassPtr ptr)
+xf86printInputClassSection(FILE * cf, XF86ConfInputClassPtr ptr)
 {
     const xf86MatchGroup *group;
-    char * const *cur;
+    char *const *cur;
 
     while (ptr) {
         fprintf(cf, "Section \"InputClass\"\n");
@@ -363,7 +359,7 @@ xf86printInputClassSection (FILE * cf, XF86ConfInputClassPtr ptr)
 }
 
 void
-xf86freeInputClassList (XF86ConfInputClassPtr ptr)
+xf86freeInputClassList(XF86ConfInputClassPtr ptr)
 {
     XF86ConfInputClassPtr prev;
 
diff --git a/xorg-server/hw/xfree86/parser/Layout.c b/xorg-server/hw/xfree86/parser/Layout.c
index 7dd4ebfc6..bd33d6dfc 100644
--- a/xorg-server/hw/xfree86/parser/Layout.c
+++ b/xorg-server/hw/xfree86/parser/Layout.c
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -66,377 +65,363 @@
 #include "optionstr.h"
 
 /* Needed for auto server layout */
-extern int xf86CheckBoolOption(void* optlist, const char *name, int deflt);
+extern int xf86CheckBoolOption(void *optlist, const char *name, int deflt);
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec LayoutTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{SCREEN, "screen"},
-	{IDENTIFIER, "identifier"},
-	{INACTIVE, "inactive"},
-	{INPUTDEVICE, "inputdevice"},
-	{OPTION, "option"},
-	{-1, ""},
+static xf86ConfigSymTabRec LayoutTab[] = {
+    {ENDSECTION, "endsection"},
+    {SCREEN, "screen"},
+    {IDENTIFIER, "identifier"},
+    {INACTIVE, "inactive"},
+    {INPUTDEVICE, "inputdevice"},
+    {OPTION, "option"},
+    {-1, ""},
 };
 
-static xf86ConfigSymTabRec AdjTab[] =
-{
-	{RIGHTOF, "rightof"},
-	{LEFTOF, "leftof"},
-	{ABOVE, "above"},
-	{BELOW, "below"},
-	{RELATIVE, "relative"},
-	{ABSOLUTE, "absolute"},
-	{-1, ""},
+static xf86ConfigSymTabRec AdjTab[] = {
+    {RIGHTOF, "rightof"},
+    {LEFTOF, "leftof"},
+    {ABOVE, "above"},
+    {BELOW, "below"},
+    {RELATIVE, "relative"},
+    {ABSOLUTE, "absolute"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeLayoutList
 
 XF86ConfLayoutPtr
-xf86parseLayoutSection (void)
+xf86parseLayoutSection(void)
 {
-	int has_ident = FALSE;
-	int token;
-	parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec)
-
-	while ((token = xf86getToken (LayoutTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->lay_comment = xf86addComment(ptr->lay_comment, val.str);
-			break;
-		case IDENTIFIER:
-			if (xf86getSubToken (&(ptr->lay_comment)) != STRING)
-				Error (QUOTE_MSG, "Identifier");
-			if (has_ident == TRUE)
-				Error (MULTIPLE_MSG, "Identifier");
-			ptr->lay_identifier = val.str;
-			has_ident = TRUE;
-			break;
-		case INACTIVE:
-			{
-				XF86ConfInactivePtr iptr;
-
-				iptr = calloc (1, sizeof (XF86ConfInactiveRec));
-				iptr->list.next = NULL;
-				if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
-					free (iptr);
-					Error (INACTIVE_MSG);
-				}
-				iptr->inactive_device_str = val.str;
-				ptr->lay_inactive_lst = (XF86ConfInactivePtr)
-					xf86addListItem ((glp) ptr->lay_inactive_lst, (glp) iptr);
-			}
-			break;
-		case SCREEN:
-			{
-				XF86ConfAdjacencyPtr aptr;
-				int absKeyword = 0;
-
-				aptr = calloc (1, sizeof (XF86ConfAdjacencyRec));
-				aptr->list.next = NULL;
-				aptr->adj_scrnum = -1;
-				aptr->adj_where = CONF_ADJ_OBSOLETE;
-				aptr->adj_x = 0;
-				aptr->adj_y = 0;
-				aptr->adj_refscreen = NULL;
-				if ((token = xf86getSubToken (&(ptr->lay_comment))) == NUMBER)
-					aptr->adj_scrnum = val.num;
-				else
-					xf86unGetToken (token);
-				token = xf86getSubToken(&(ptr->lay_comment));
-				if (token != STRING) {
-					free(aptr);
-					Error (SCREEN_MSG);
-				}
-				aptr->adj_screen_str = val.str;
-
-				token = xf86getSubTokenWithTab(&(ptr->lay_comment), AdjTab);
-				switch (token)
-				{
-				case RIGHTOF:
-					aptr->adj_where = CONF_ADJ_RIGHTOF;
-					break;
-				case LEFTOF:
-					aptr->adj_where = CONF_ADJ_LEFTOF;
-					break;
-				case ABOVE:
-					aptr->adj_where = CONF_ADJ_ABOVE;
-					break;
-				case BELOW:
-					aptr->adj_where = CONF_ADJ_BELOW;
-					break;
-				case RELATIVE:
-					aptr->adj_where = CONF_ADJ_RELATIVE;
-					break;
-				case ABSOLUTE:
-					aptr->adj_where = CONF_ADJ_ABSOLUTE;
-					absKeyword = 1;
-					break;
-				case EOF_TOKEN:
-					free(aptr);
-					Error (UNEXPECTED_EOF_MSG);
-					break;
-				default:
-					xf86unGetToken (token);
-					token = xf86getSubToken(&(ptr->lay_comment));
-					if (token == STRING)
-						aptr->adj_where = CONF_ADJ_OBSOLETE;
-					else
-						aptr->adj_where = CONF_ADJ_ABSOLUTE;
-				}
-				switch (aptr->adj_where)
-				{
-				case CONF_ADJ_ABSOLUTE:
-					if (absKeyword) 
-						token = xf86getSubToken(&(ptr->lay_comment));
-					if (token == NUMBER)
-					{
-						aptr->adj_x = val.num;
-						token = xf86getSubToken(&(ptr->lay_comment));
-						if (token != NUMBER) {
-							free(aptr);
-							Error(INVALID_SCR_MSG);
-						}
-						aptr->adj_y = val.num;
-					} else {
-						if (absKeyword) {
-							free(aptr);
-							Error(INVALID_SCR_MSG);
-						} else
-							xf86unGetToken (token);
-					}
-					break;
-				case CONF_ADJ_RIGHTOF:
-				case CONF_ADJ_LEFTOF:
-				case CONF_ADJ_ABOVE:
-				case CONF_ADJ_BELOW:
-				case CONF_ADJ_RELATIVE:
-					token = xf86getSubToken(&(ptr->lay_comment));
-					if (token != STRING) {
-						free(aptr);
-						Error(INVALID_SCR_MSG);
-					}
-					aptr->adj_refscreen = val.str;
-					if (aptr->adj_where == CONF_ADJ_RELATIVE)
-					{
-						token = xf86getSubToken(&(ptr->lay_comment));
-						if (token != NUMBER) {
-							free(aptr);
-							Error(INVALID_SCR_MSG);
-						}
-						aptr->adj_x = val.num;
-						token = xf86getSubToken(&(ptr->lay_comment));
-						if (token != NUMBER) {
-							free(aptr);
-							Error(INVALID_SCR_MSG);
-						}
-						aptr->adj_y = val.num;
-					}
-					break;
-				case CONF_ADJ_OBSOLETE:
-					/* top */
-					aptr->adj_top_str = val.str;
-
-					/* bottom */
-					if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
-						free(aptr);
-						Error (SCREEN_MSG);
-					}
-					aptr->adj_bottom_str = val.str;
-
-					/* left */
-					if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
-						free(aptr);
-						Error (SCREEN_MSG);
-					}
-					aptr->adj_left_str = val.str;
-
-					/* right */
-					if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
-						free(aptr);
-						Error (SCREEN_MSG);
-					}
-					aptr->adj_right_str = val.str;
-
-				}
-				ptr->lay_adjacency_lst = (XF86ConfAdjacencyPtr)
-					xf86addListItem ((glp) ptr->lay_adjacency_lst, (glp) aptr);
-			}
-			break;
-		case INPUTDEVICE:
-			{
-				XF86ConfInputrefPtr iptr;
-
-				iptr = calloc (1, sizeof (XF86ConfInputrefRec));
-				iptr->list.next = NULL;
-				iptr->iref_option_lst = NULL;
-				if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
-					free(iptr);
-					Error (INPUTDEV_MSG);
-				}
-				iptr->iref_inputdev_str = val.str;
-				while ((token = xf86getSubToken (&(ptr->lay_comment))) == STRING)
-				{
-					iptr->iref_option_lst =
-						xf86addNewOption (iptr->iref_option_lst, val.str, NULL);
-				}
-				xf86unGetToken (token);
-				ptr->lay_input_lst = (XF86ConfInputrefPtr)
-					xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);
-			}
-			break;
-		case OPTION:
-			ptr->lay_option_lst = xf86parseOption(ptr->lay_option_lst);
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
-
-	if (!has_ident)
-		Error (NO_IDENT_MSG);
+    int has_ident = FALSE;
+    int token;
+
+    parsePrologue(XF86ConfLayoutPtr, XF86ConfLayoutRec)
+
+        while ((token = xf86getToken(LayoutTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->lay_comment = xf86addComment(ptr->lay_comment, val.str);
+            break;
+        case IDENTIFIER:
+            if (xf86getSubToken(&(ptr->lay_comment)) != STRING)
+                Error(QUOTE_MSG, "Identifier");
+            if (has_ident == TRUE)
+                Error(MULTIPLE_MSG, "Identifier");
+            ptr->lay_identifier = val.str;
+            has_ident = TRUE;
+            break;
+        case INACTIVE:
+        {
+            XF86ConfInactivePtr iptr;
+
+            iptr = calloc(1, sizeof(XF86ConfInactiveRec));
+            iptr->list.next = NULL;
+            if (xf86getSubToken(&(ptr->lay_comment)) != STRING) {
+                free(iptr);
+                Error(INACTIVE_MSG);
+            }
+            iptr->inactive_device_str = val.str;
+            ptr->lay_inactive_lst = (XF86ConfInactivePtr)
+                xf86addListItem((glp) ptr->lay_inactive_lst, (glp) iptr);
+        }
+            break;
+        case SCREEN:
+        {
+            XF86ConfAdjacencyPtr aptr;
+            int absKeyword = 0;
+
+            aptr = calloc(1, sizeof(XF86ConfAdjacencyRec));
+            aptr->list.next = NULL;
+            aptr->adj_scrnum = -1;
+            aptr->adj_where = CONF_ADJ_OBSOLETE;
+            aptr->adj_x = 0;
+            aptr->adj_y = 0;
+            aptr->adj_refscreen = NULL;
+            if ((token = xf86getSubToken(&(ptr->lay_comment))) == NUMBER)
+                aptr->adj_scrnum = val.num;
+            else
+                xf86unGetToken(token);
+            token = xf86getSubToken(&(ptr->lay_comment));
+            if (token != STRING) {
+                free(aptr);
+                Error(SCREEN_MSG);
+            }
+            aptr->adj_screen_str = val.str;
+
+            token = xf86getSubTokenWithTab(&(ptr->lay_comment), AdjTab);
+            switch (token) {
+            case RIGHTOF:
+                aptr->adj_where = CONF_ADJ_RIGHTOF;
+                break;
+            case LEFTOF:
+                aptr->adj_where = CONF_ADJ_LEFTOF;
+                break;
+            case ABOVE:
+                aptr->adj_where = CONF_ADJ_ABOVE;
+                break;
+            case BELOW:
+                aptr->adj_where = CONF_ADJ_BELOW;
+                break;
+            case RELATIVE:
+                aptr->adj_where = CONF_ADJ_RELATIVE;
+                break;
+            case ABSOLUTE:
+                aptr->adj_where = CONF_ADJ_ABSOLUTE;
+                absKeyword = 1;
+                break;
+            case EOF_TOKEN:
+                free(aptr);
+                Error(UNEXPECTED_EOF_MSG);
+                break;
+            default:
+                xf86unGetToken(token);
+                token = xf86getSubToken(&(ptr->lay_comment));
+                if (token == STRING)
+                    aptr->adj_where = CONF_ADJ_OBSOLETE;
+                else
+                    aptr->adj_where = CONF_ADJ_ABSOLUTE;
+            }
+            switch (aptr->adj_where) {
+            case CONF_ADJ_ABSOLUTE:
+                if (absKeyword)
+                    token = xf86getSubToken(&(ptr->lay_comment));
+                if (token == NUMBER) {
+                    aptr->adj_x = val.num;
+                    token = xf86getSubToken(&(ptr->lay_comment));
+                    if (token != NUMBER) {
+                        free(aptr);
+                        Error(INVALID_SCR_MSG);
+                    }
+                    aptr->adj_y = val.num;
+                }
+                else {
+                    if (absKeyword) {
+                        free(aptr);
+                        Error(INVALID_SCR_MSG);
+                    }
+                    else
+                        xf86unGetToken(token);
+                }
+                break;
+            case CONF_ADJ_RIGHTOF:
+            case CONF_ADJ_LEFTOF:
+            case CONF_ADJ_ABOVE:
+            case CONF_ADJ_BELOW:
+            case CONF_ADJ_RELATIVE:
+                token = xf86getSubToken(&(ptr->lay_comment));
+                if (token != STRING) {
+                    free(aptr);
+                    Error(INVALID_SCR_MSG);
+                }
+                aptr->adj_refscreen = val.str;
+                if (aptr->adj_where == CONF_ADJ_RELATIVE) {
+                    token = xf86getSubToken(&(ptr->lay_comment));
+                    if (token != NUMBER) {
+                        free(aptr);
+                        Error(INVALID_SCR_MSG);
+                    }
+                    aptr->adj_x = val.num;
+                    token = xf86getSubToken(&(ptr->lay_comment));
+                    if (token != NUMBER) {
+                        free(aptr);
+                        Error(INVALID_SCR_MSG);
+                    }
+                    aptr->adj_y = val.num;
+                }
+                break;
+            case CONF_ADJ_OBSOLETE:
+                /* top */
+                aptr->adj_top_str = val.str;
+
+                /* bottom */
+                if (xf86getSubToken(&(ptr->lay_comment)) != STRING) {
+                    free(aptr);
+                    Error(SCREEN_MSG);
+                }
+                aptr->adj_bottom_str = val.str;
+
+                /* left */
+                if (xf86getSubToken(&(ptr->lay_comment)) != STRING) {
+                    free(aptr);
+                    Error(SCREEN_MSG);
+                }
+                aptr->adj_left_str = val.str;
+
+                /* right */
+                if (xf86getSubToken(&(ptr->lay_comment)) != STRING) {
+                    free(aptr);
+                    Error(SCREEN_MSG);
+                }
+                aptr->adj_right_str = val.str;
+
+            }
+            ptr->lay_adjacency_lst = (XF86ConfAdjacencyPtr)
+                xf86addListItem((glp) ptr->lay_adjacency_lst, (glp) aptr);
+        }
+            break;
+        case INPUTDEVICE:
+        {
+            XF86ConfInputrefPtr iptr;
+
+            iptr = calloc(1, sizeof(XF86ConfInputrefRec));
+            iptr->list.next = NULL;
+            iptr->iref_option_lst = NULL;
+            if (xf86getSubToken(&(ptr->lay_comment)) != STRING) {
+                free(iptr);
+                Error(INPUTDEV_MSG);
+            }
+            iptr->iref_inputdev_str = val.str;
+            while ((token = xf86getSubToken(&(ptr->lay_comment))) == STRING) {
+                iptr->iref_option_lst =
+                    xf86addNewOption(iptr->iref_option_lst, val.str, NULL);
+            }
+            xf86unGetToken(token);
+            ptr->lay_input_lst = (XF86ConfInputrefPtr)
+                xf86addListItem((glp) ptr->lay_input_lst, (glp) iptr);
+        }
+            break;
+        case OPTION:
+            ptr->lay_option_lst = xf86parseOption(ptr->lay_option_lst);
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
+
+    if (!has_ident)
+        Error(NO_IDENT_MSG);
 
 #ifdef DEBUG
-	printf ("Layout section parsed\n");
+    printf("Layout section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
 void
-xf86printLayoutSection (FILE * cf, XF86ConfLayoutPtr ptr)
+xf86printLayoutSection(FILE * cf, XF86ConfLayoutPtr ptr)
 {
-	XF86ConfAdjacencyPtr aptr;
-	XF86ConfInactivePtr iptr;
-	XF86ConfInputrefPtr inptr;
-	XF86OptionPtr optr;
-
-	while (ptr)
-	{
-		fprintf (cf, "Section \"ServerLayout\"\n");
-		if (ptr->lay_comment)
-			fprintf (cf, "%s", ptr->lay_comment);
-		if (ptr->lay_identifier)
-			fprintf (cf, "\tIdentifier     \"%s\"\n", ptr->lay_identifier);
-
-		for (aptr = ptr->lay_adjacency_lst; aptr; aptr = aptr->list.next)
-		{
-			fprintf (cf, "\tScreen     ");
-			if (aptr->adj_scrnum >= 0)
-				fprintf (cf, "%2d", aptr->adj_scrnum);
-			else
-				fprintf (cf, "  ");
-			fprintf (cf, "  \"%s\"", aptr->adj_screen_str);
-			switch(aptr->adj_where)
-			{
-			case CONF_ADJ_OBSOLETE:
-				fprintf (cf, " \"%s\"", aptr->adj_top_str);
-				fprintf (cf, " \"%s\"", aptr->adj_bottom_str);
-				fprintf (cf, " \"%s\"", aptr->adj_right_str);
-				fprintf (cf, " \"%s\"\n", aptr->adj_left_str);
-				break;
-			case CONF_ADJ_ABSOLUTE:
-				if (aptr->adj_x != -1)
-					fprintf (cf, " %d %d\n", aptr->adj_x, aptr->adj_y);
-				else
-					fprintf (cf, "\n");
-				break;
-			case CONF_ADJ_RIGHTOF:
-				fprintf (cf, " RightOf \"%s\"\n", aptr->adj_refscreen);
-				break;
-			case CONF_ADJ_LEFTOF:
-				fprintf (cf, " LeftOf \"%s\"\n", aptr->adj_refscreen);
-				break;
-			case CONF_ADJ_ABOVE:
-				fprintf (cf, " Above \"%s\"\n", aptr->adj_refscreen);
-				break;
-			case CONF_ADJ_BELOW:
-				fprintf (cf, " Below \"%s\"\n", aptr->adj_refscreen);
-				break;
-			case CONF_ADJ_RELATIVE:
-				fprintf (cf, " Relative \"%s\" %d %d\n", aptr->adj_refscreen,
-						 aptr->adj_x, aptr->adj_y);
-				break;
-			}
-		}
-		for (iptr = ptr->lay_inactive_lst; iptr; iptr = iptr->list.next)
-			fprintf (cf, "\tInactive       \"%s\"\n", iptr->inactive_device_str);
-		for (inptr = ptr->lay_input_lst; inptr; inptr = inptr->list.next)
-		{
-			fprintf (cf, "\tInputDevice    \"%s\"", inptr->iref_inputdev_str);
-			for (optr = inptr->iref_option_lst; optr; optr = optr->list.next)
-			{
-				fprintf(cf, " \"%s\"", optr->opt_name);
-			}
-			fprintf(cf, "\n");
-		}
-		xf86printOptionList(cf, ptr->lay_option_lst, 1);
-		fprintf (cf, "EndSection\n\n");
-		ptr = ptr->list.next;
-	}
+    XF86ConfAdjacencyPtr aptr;
+    XF86ConfInactivePtr iptr;
+    XF86ConfInputrefPtr inptr;
+    XF86OptionPtr optr;
+
+    while (ptr) {
+        fprintf(cf, "Section \"ServerLayout\"\n");
+        if (ptr->lay_comment)
+            fprintf(cf, "%s", ptr->lay_comment);
+        if (ptr->lay_identifier)
+            fprintf(cf, "\tIdentifier     \"%s\"\n", ptr->lay_identifier);
+
+        for (aptr = ptr->lay_adjacency_lst; aptr; aptr = aptr->list.next) {
+            fprintf(cf, "\tScreen     ");
+            if (aptr->adj_scrnum >= 0)
+                fprintf(cf, "%2d", aptr->adj_scrnum);
+            else
+                fprintf(cf, "  ");
+            fprintf(cf, "  \"%s\"", aptr->adj_screen_str);
+            switch (aptr->adj_where) {
+            case CONF_ADJ_OBSOLETE:
+                fprintf(cf, " \"%s\"", aptr->adj_top_str);
+                fprintf(cf, " \"%s\"", aptr->adj_bottom_str);
+                fprintf(cf, " \"%s\"", aptr->adj_right_str);
+                fprintf(cf, " \"%s\"\n", aptr->adj_left_str);
+                break;
+            case CONF_ADJ_ABSOLUTE:
+                if (aptr->adj_x != -1)
+                    fprintf(cf, " %d %d\n", aptr->adj_x, aptr->adj_y);
+                else
+                    fprintf(cf, "\n");
+                break;
+            case CONF_ADJ_RIGHTOF:
+                fprintf(cf, " RightOf \"%s\"\n", aptr->adj_refscreen);
+                break;
+            case CONF_ADJ_LEFTOF:
+                fprintf(cf, " LeftOf \"%s\"\n", aptr->adj_refscreen);
+                break;
+            case CONF_ADJ_ABOVE:
+                fprintf(cf, " Above \"%s\"\n", aptr->adj_refscreen);
+                break;
+            case CONF_ADJ_BELOW:
+                fprintf(cf, " Below \"%s\"\n", aptr->adj_refscreen);
+                break;
+            case CONF_ADJ_RELATIVE:
+                fprintf(cf, " Relative \"%s\" %d %d\n", aptr->adj_refscreen,
+                        aptr->adj_x, aptr->adj_y);
+                break;
+            }
+        }
+        for (iptr = ptr->lay_inactive_lst; iptr; iptr = iptr->list.next)
+            fprintf(cf, "\tInactive       \"%s\"\n", iptr->inactive_device_str);
+        for (inptr = ptr->lay_input_lst; inptr; inptr = inptr->list.next) {
+            fprintf(cf, "\tInputDevice    \"%s\"", inptr->iref_inputdev_str);
+            for (optr = inptr->iref_option_lst; optr; optr = optr->list.next) {
+                fprintf(cf, " \"%s\"", optr->opt_name);
+            }
+            fprintf(cf, "\n");
+        }
+        xf86printOptionList(cf, ptr->lay_option_lst, 1);
+        fprintf(cf, "EndSection\n\n");
+        ptr = ptr->list.next;
+    }
 }
 
 static void
-xf86freeAdjacencyList (XF86ConfAdjacencyPtr ptr)
+xf86freeAdjacencyList(XF86ConfAdjacencyPtr ptr)
 {
-	XF86ConfAdjacencyPtr prev;
-
-	while (ptr)
-	{
-		TestFree (ptr->adj_screen_str);
-		TestFree (ptr->adj_top_str);
-		TestFree (ptr->adj_bottom_str);
-		TestFree (ptr->adj_left_str);
-		TestFree (ptr->adj_right_str);
-
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ConfAdjacencyPtr prev;
+
+    while (ptr) {
+        TestFree(ptr->adj_screen_str);
+        TestFree(ptr->adj_top_str);
+        TestFree(ptr->adj_bottom_str);
+        TestFree(ptr->adj_left_str);
+        TestFree(ptr->adj_right_str);
+
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 
 }
 
 static void
-xf86freeInputrefList (XF86ConfInputrefPtr ptr)
+xf86freeInputrefList(XF86ConfInputrefPtr ptr)
 {
-	XF86ConfInputrefPtr prev;
-
-	while (ptr)
-	{
-		TestFree (ptr->iref_inputdev_str);
-		xf86optionListFree (ptr->iref_option_lst);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ConfInputrefPtr prev;
+
+    while (ptr) {
+        TestFree(ptr->iref_inputdev_str);
+        xf86optionListFree(ptr->iref_option_lst);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 
 }
 
 void
-xf86freeLayoutList (XF86ConfLayoutPtr ptr)
+xf86freeLayoutList(XF86ConfLayoutPtr ptr)
 {
-	XF86ConfLayoutPtr prev;
-
-	while (ptr)
-	{
-		TestFree (ptr->lay_identifier);
-		TestFree (ptr->lay_comment);
-		xf86freeAdjacencyList (ptr->lay_adjacency_lst);
-		xf86freeInputrefList (ptr->lay_input_lst);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ConfLayoutPtr prev;
+
+    while (ptr) {
+        TestFree(ptr->lay_identifier);
+        TestFree(ptr->lay_comment);
+        xf86freeAdjacencyList(ptr->lay_adjacency_lst);
+        xf86freeInputrefList(ptr->lay_input_lst);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 int
@@ -447,112 +432,103 @@ xf86layoutAddInputDevices(XF86ConfigPtr config, XF86ConfLayoutPtr layout)
     XF86ConfInputrefPtr inptr;
 
     /* add all AutoServerLayout devices to the server layout */
-    while (input)
-    {
-	if (xf86CheckBoolOption(input->inp_option_lst, "AutoServerLayout", FALSE))
-	{
-	    XF86ConfInputrefPtr iref = layout->lay_input_lst;
-
-	    /* avoid duplicates if referenced but lists AutoServerLayout too */
-	    while (iref)
-	    {
-		if (strcmp(iref->iref_inputdev_str, input->inp_identifier) == 0)
-		    break;
-		iref = iref->list.next;
-	    }
-
-	    if (!iref)
-	    {
-		XF86ConfInputrefPtr iptr;
-		iptr = calloc(1, sizeof(XF86ConfInputrefRec));
-		iptr->iref_inputdev_str = input->inp_identifier;
-		layout->lay_input_lst = (XF86ConfInputrefPtr)
-		    xf86addListItem((glp)layout->lay_input_lst, (glp)iptr);
-		count++;
-	    }
-	}
-	input = input->list.next;
+    while (input) {
+        if (xf86CheckBoolOption
+            (input->inp_option_lst, "AutoServerLayout", FALSE)) {
+            XF86ConfInputrefPtr iref = layout->lay_input_lst;
+
+            /* avoid duplicates if referenced but lists AutoServerLayout too */
+            while (iref) {
+                if (strcmp(iref->iref_inputdev_str, input->inp_identifier) == 0)
+                    break;
+                iref = iref->list.next;
+            }
+
+            if (!iref) {
+                XF86ConfInputrefPtr iptr;
+
+                iptr = calloc(1, sizeof(XF86ConfInputrefRec));
+                iptr->iref_inputdev_str = input->inp_identifier;
+                layout->lay_input_lst = (XF86ConfInputrefPtr)
+                    xf86addListItem((glp) layout->lay_input_lst, (glp) iptr);
+                count++;
+            }
+        }
+        input = input->list.next;
     }
 
     inptr = layout->lay_input_lst;
-    while (inptr)
-    {
-	input = xf86findInput (inptr->iref_inputdev_str,
-		config->conf_input_lst);
-	if (!input)
-	{
-	    xf86validationError (UNDEFINED_INPUT_MSG,
-		    inptr->iref_inputdev_str, layout->lay_identifier);
-	    return -1;
-	}
-	else
-	    inptr->iref_inputdev = input;
-	inptr = inptr->list.next;
+    while (inptr) {
+        input = xf86findInput(inptr->iref_inputdev_str, config->conf_input_lst);
+        if (!input) {
+            xf86validationError(UNDEFINED_INPUT_MSG,
+                                inptr->iref_inputdev_str,
+                                layout->lay_identifier);
+            return -1;
+        }
+        else
+            inptr->iref_inputdev = input;
+        inptr = inptr->list.next;
     }
 
     return count;
 }
 
 int
-xf86validateLayout (XF86ConfigPtr p)
+xf86validateLayout(XF86ConfigPtr p)
 {
-	XF86ConfLayoutPtr layout = p->conf_layout_lst;
-	XF86ConfAdjacencyPtr adj;
-	XF86ConfInactivePtr iptr;
-	XF86ConfScreenPtr screen;
-	XF86ConfDevicePtr device;
-
-	while (layout)
-	{
-		adj = layout->lay_adjacency_lst;
-		while (adj)
-		{
-			/* the first one can't be "" but all others can */
-			screen = xf86findScreen (adj->adj_screen_str, p->conf_screen_lst);
-			if (!screen)
-			{
-				xf86validationError (UNDEFINED_SCREEN_MSG,
-							   adj->adj_screen_str, layout->lay_identifier);
-				return FALSE;
-			}
-			else
-				adj->adj_screen = screen;
-
-			adj = adj->list.next;
-		}
-		iptr = layout->lay_inactive_lst;
-		while (iptr)
-		{
-			device = xf86findDevice (iptr->inactive_device_str,
-									p->conf_device_lst);
-			if (!device)
-			{
-				xf86validationError (UNDEFINED_DEVICE_LAY_MSG,
-						iptr->inactive_device_str, layout->lay_identifier);
-				return FALSE;
-			}
-			else
-				iptr->inactive_device = device;
-			iptr = iptr->list.next;
-		}
-
-		if (xf86layoutAddInputDevices(p, layout) == -1)
-		    return FALSE;
-
-		layout = layout->list.next;
-	}
-	return TRUE;
+    XF86ConfLayoutPtr layout = p->conf_layout_lst;
+    XF86ConfAdjacencyPtr adj;
+    XF86ConfInactivePtr iptr;
+    XF86ConfScreenPtr screen;
+    XF86ConfDevicePtr device;
+
+    while (layout) {
+        adj = layout->lay_adjacency_lst;
+        while (adj) {
+            /* the first one can't be "" but all others can */
+            screen = xf86findScreen(adj->adj_screen_str, p->conf_screen_lst);
+            if (!screen) {
+                xf86validationError(UNDEFINED_SCREEN_MSG,
+                                    adj->adj_screen_str,
+                                    layout->lay_identifier);
+                return FALSE;
+            }
+            else
+                adj->adj_screen = screen;
+
+            adj = adj->list.next;
+        }
+        iptr = layout->lay_inactive_lst;
+        while (iptr) {
+            device = xf86findDevice(iptr->inactive_device_str,
+                                    p->conf_device_lst);
+            if (!device) {
+                xf86validationError(UNDEFINED_DEVICE_LAY_MSG,
+                                    iptr->inactive_device_str,
+                                    layout->lay_identifier);
+                return FALSE;
+            }
+            else
+                iptr->inactive_device = device;
+            iptr = iptr->list.next;
+        }
+
+        if (xf86layoutAddInputDevices(p, layout) == -1)
+            return FALSE;
+
+        layout = layout->list.next;
+    }
+    return TRUE;
 }
 
 XF86ConfLayoutPtr
-xf86findLayout (const char *name, XF86ConfLayoutPtr list)
+xf86findLayout(const char *name, XF86ConfLayoutPtr list)
 {
-	while (list)
-	{
-		if (xf86nameCompare (list->lay_identifier, name) == 0)
-			return list;
-		list = list->list.next;
-	}
-	return NULL;
+    while (list) {
+        if (xf86nameCompare(list->lay_identifier, name) == 0)
+            return list;
+        list = list->list.next;
+    }
+    return NULL;
 }
-
diff --git a/xorg-server/hw/xfree86/parser/Module.c b/xorg-server/hw/xfree86/parser/Module.c
index 3c4cefc18..1c458ae6c 100644
--- a/xorg-server/hw/xfree86/parser/Module.c
+++ b/xorg-server/hw/xfree86/parser/Module.c
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -65,215 +64,207 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec SubModuleTab[] =
-{
-	{ENDSUBSECTION, "endsubsection"},
-	{OPTION, "option"},
-	{-1, ""},
+static xf86ConfigSymTabRec SubModuleTab[] = {
+    {ENDSUBSECTION, "endsubsection"},
+    {OPTION, "option"},
+    {-1, ""},
 };
 
-static xf86ConfigSymTabRec ModuleTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{LOAD, "load"},
-    {DISABLE, "disable"}, 
-	{LOAD_DRIVER, "loaddriver"},
-	{SUBSECTION, "subsection"},
-	{-1, ""},
+static xf86ConfigSymTabRec ModuleTab[] = {
+    {ENDSECTION, "endsection"},
+    {LOAD, "load"},
+    {DISABLE, "disable"},
+    {LOAD_DRIVER, "loaddriver"},
+    {SUBSECTION, "subsection"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeModules
 
 static XF86LoadPtr
-xf86parseModuleSubSection (XF86LoadPtr head, char *name)
+xf86parseModuleSubSection(XF86LoadPtr head, char *name)
 {
-	int token;
-	parsePrologue (XF86LoadPtr, XF86LoadRec)
+    int token;
 
-	ptr->load_name = name;
-	ptr->load_type = XF86_LOAD_MODULE;
-        ptr->ignore    = 0;
-	ptr->load_opt  = NULL;
-	ptr->list.next = NULL;
+    parsePrologue(XF86LoadPtr, XF86LoadRec)
 
-	while ((token = xf86getToken (SubModuleTab)) != ENDSUBSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->load_comment = xf86addComment(ptr->load_comment, val.str);
-			break;
-		case OPTION:
-			ptr->load_opt = xf86parseOption(ptr->load_opt);
-			break;
-		case EOF_TOKEN:
-			xf86parseError (UNEXPECTED_EOF_MSG);
-			free(ptr);
-			return NULL;
-		default:
-			xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ());
-			free(ptr);
-			return NULL;
-			break;
-		}
+        ptr->load_name = name;
+    ptr->load_type = XF86_LOAD_MODULE;
+    ptr->ignore = 0;
+    ptr->load_opt = NULL;
+    ptr->list.next = NULL;
 
-	}
+    while ((token = xf86getToken(SubModuleTab)) != ENDSUBSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->load_comment = xf86addComment(ptr->load_comment, val.str);
+            break;
+        case OPTION:
+            ptr->load_opt = xf86parseOption(ptr->load_opt);
+            break;
+        case EOF_TOKEN:
+            xf86parseError(UNEXPECTED_EOF_MSG);
+            free(ptr);
+            return NULL;
+        default:
+            xf86parseError(INVALID_KEYWORD_MSG, xf86tokenString());
+            free(ptr);
+            return NULL;
+            break;
+        }
 
-	return ((XF86LoadPtr) xf86addListItem ((glp) head, (glp) ptr));
+    }
+
+    return ((XF86LoadPtr) xf86addListItem((glp) head, (glp) ptr));
 }
 
 XF86ConfModulePtr
-xf86parseModuleSection (void)
+xf86parseModuleSection(void)
 {
-	int token;
-	parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec)
+    int token;
+
+    parsePrologue(XF86ConfModulePtr, XF86ConfModuleRec)
 
-	while ((token = xf86getToken (ModuleTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->mod_comment = xf86addComment(ptr->mod_comment, val.str);
-			break;
-		case LOAD:
-			if (xf86getSubToken (&(ptr->mod_comment)) != STRING)
-				Error (QUOTE_MSG, "Load");
-			ptr->mod_load_lst =
-				xf86addNewLoadDirective (ptr->mod_load_lst, val.str,
-									 XF86_LOAD_MODULE, NULL);
-			break;
-		case DISABLE:
-			if (xf86getSubToken (&(ptr->mod_comment)) != STRING)
-				Error (QUOTE_MSG, "Disable");
-			ptr->mod_disable_lst =
-				xf86addNewLoadDirective (ptr->mod_disable_lst, val.str,
-									 XF86_DISABLE_MODULE, NULL);
-			break;
-		case LOAD_DRIVER:
-			if (xf86getSubToken (&(ptr->mod_comment)) != STRING)
-				Error (QUOTE_MSG, "LoadDriver");
-			ptr->mod_load_lst =
-				xf86addNewLoadDirective (ptr->mod_load_lst, val.str,
-									 XF86_LOAD_DRIVER, NULL);
-			break;
-		case SUBSECTION:
-			if (xf86getSubToken (&(ptr->mod_comment)) != STRING)
-						Error (QUOTE_MSG, "SubSection");
-			ptr->mod_load_lst =
-				xf86parseModuleSubSection (ptr->mod_load_lst, val.str);
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
+        while ((token = xf86getToken(ModuleTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->mod_comment = xf86addComment(ptr->mod_comment, val.str);
+            break;
+        case LOAD:
+            if (xf86getSubToken(&(ptr->mod_comment)) != STRING)
+                Error(QUOTE_MSG, "Load");
+            ptr->mod_load_lst =
+                xf86addNewLoadDirective(ptr->mod_load_lst, val.str,
+                                        XF86_LOAD_MODULE, NULL);
+            break;
+        case DISABLE:
+            if (xf86getSubToken(&(ptr->mod_comment)) != STRING)
+                Error(QUOTE_MSG, "Disable");
+            ptr->mod_disable_lst =
+                xf86addNewLoadDirective(ptr->mod_disable_lst, val.str,
+                                        XF86_DISABLE_MODULE, NULL);
+            break;
+        case LOAD_DRIVER:
+            if (xf86getSubToken(&(ptr->mod_comment)) != STRING)
+                Error(QUOTE_MSG, "LoadDriver");
+            ptr->mod_load_lst =
+                xf86addNewLoadDirective(ptr->mod_load_lst, val.str,
+                                        XF86_LOAD_DRIVER, NULL);
+            break;
+        case SUBSECTION:
+            if (xf86getSubToken(&(ptr->mod_comment)) != STRING)
+                Error(QUOTE_MSG, "SubSection");
+            ptr->mod_load_lst =
+                xf86parseModuleSubSection(ptr->mod_load_lst, val.str);
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
 
 #ifdef DEBUG
-	printf ("Module section parsed\n");
+    printf("Module section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
 void
-xf86printModuleSection (FILE * cf, XF86ConfModulePtr ptr)
+xf86printModuleSection(FILE * cf, XF86ConfModulePtr ptr)
 {
-	XF86LoadPtr lptr;
+    XF86LoadPtr lptr;
 
-	if (ptr == NULL)
-		return;
+    if (ptr == NULL)
+        return;
 
-	if (ptr->mod_comment)
-		fprintf(cf, "%s", ptr->mod_comment);
-	for (lptr = ptr->mod_load_lst; lptr; lptr = lptr->list.next)
-	{
-		switch (lptr->load_type)
-		{
-		case XF86_LOAD_MODULE:
-			if( lptr->load_opt == NULL ) {
-				fprintf (cf, "\tLoad  \"%s\"", lptr->load_name);
-				if (lptr->load_comment)
-					fprintf(cf, "%s", lptr->load_comment);
-				else
-					fputc('\n', cf);
-			}
-			else
-			{
-				fprintf (cf, "\tSubSection \"%s\"\n", lptr->load_name);
-				if (lptr->load_comment)
-					fprintf(cf, "%s", lptr->load_comment);
-				xf86printOptionList(cf, lptr->load_opt, 2);
-				fprintf (cf, "\tEndSubSection\n");
-			}
-			break;
-		case XF86_LOAD_DRIVER:
-			fprintf (cf, "\tLoadDriver  \"%s\"", lptr->load_name);
-				if (lptr->load_comment)
-					fprintf(cf, "%s", lptr->load_comment);
-				else
-					fputc('\n', cf);
-			break;
+    if (ptr->mod_comment)
+        fprintf(cf, "%s", ptr->mod_comment);
+    for (lptr = ptr->mod_load_lst; lptr; lptr = lptr->list.next) {
+        switch (lptr->load_type) {
+        case XF86_LOAD_MODULE:
+            if (lptr->load_opt == NULL) {
+                fprintf(cf, "\tLoad  \"%s\"", lptr->load_name);
+                if (lptr->load_comment)
+                    fprintf(cf, "%s", lptr->load_comment);
+                else
+                    fputc('\n', cf);
+            }
+            else {
+                fprintf(cf, "\tSubSection \"%s\"\n", lptr->load_name);
+                if (lptr->load_comment)
+                    fprintf(cf, "%s", lptr->load_comment);
+                xf86printOptionList(cf, lptr->load_opt, 2);
+                fprintf(cf, "\tEndSubSection\n");
+            }
+            break;
+        case XF86_LOAD_DRIVER:
+            fprintf(cf, "\tLoadDriver  \"%s\"", lptr->load_name);
+            if (lptr->load_comment)
+                fprintf(cf, "%s", lptr->load_comment);
+            else
+                fputc('\n', cf);
+            break;
 #if 0
-		default:
-			fprintf (cf, "#\tUnknown type  \"%s\"\n", lptr->load_name);
-			break;
+        default:
+            fprintf(cf, "#\tUnknown type  \"%s\"\n", lptr->load_name);
+            break;
 #endif
-		}
-	}
+        }
+    }
 }
 
 XF86LoadPtr
-xf86addNewLoadDirective (XF86LoadPtr head, char *name, int type, XF86OptionPtr opts)
+xf86addNewLoadDirective(XF86LoadPtr head, char *name, int type,
+                        XF86OptionPtr opts)
 {
-	XF86LoadPtr new;
-	int token;
+    XF86LoadPtr new;
+    int token;
 
-	new = calloc (1, sizeof (XF86LoadRec));
-	new->load_name = name;
-	new->load_type = type;
-	new->load_opt  = opts;
-        new->ignore    = 0;
-	new->list.next = NULL;
+    new = calloc(1, sizeof(XF86LoadRec));
+    new->load_name = name;
+    new->load_type = type;
+    new->load_opt = opts;
+    new->ignore = 0;
+    new->list.next = NULL;
 
-	if ((token = xf86getToken(NULL)) == COMMENT)
-		new->load_comment = xf86addComment(new->load_comment, val.str);
-	else
-		xf86unGetToken(token);
+    if ((token = xf86getToken(NULL)) == COMMENT)
+        new->load_comment = xf86addComment(new->load_comment, val.str);
+    else
+        xf86unGetToken(token);
 
-	return ((XF86LoadPtr) xf86addListItem ((glp) head, (glp) new));
+    return ((XF86LoadPtr) xf86addListItem((glp) head, (glp) new));
 }
 
 void
-xf86freeModules (XF86ConfModulePtr ptr)
+xf86freeModules(XF86ConfModulePtr ptr)
 {
-	XF86LoadPtr lptr;
-	XF86LoadPtr prev;
+    XF86LoadPtr lptr;
+    XF86LoadPtr prev;
 
-	if (ptr == NULL)
-		return;
-	lptr = ptr->mod_load_lst;
-	while (lptr)
-	{
-		TestFree (lptr->load_name);
-		TestFree (lptr->load_comment);
-		prev = lptr;
-		lptr = lptr->list.next;
-		free (prev);
-	}
-	lptr = ptr->mod_disable_lst;
-	while (lptr)
-	{
-		TestFree (lptr->load_name);
-		TestFree (lptr->load_comment);
-		prev = lptr;
-		lptr = lptr->list.next;
-		free (prev);
-	}
-	TestFree (ptr->mod_comment);
-	free (ptr);
+    if (ptr == NULL)
+        return;
+    lptr = ptr->mod_load_lst;
+    while (lptr) {
+        TestFree(lptr->load_name);
+        TestFree(lptr->load_comment);
+        prev = lptr;
+        lptr = lptr->list.next;
+        free(prev);
+    }
+    lptr = ptr->mod_disable_lst;
+    while (lptr) {
+        TestFree(lptr->load_name);
+        TestFree(lptr->load_comment);
+        prev = lptr;
+        lptr = lptr->list.next;
+        free(prev);
+    }
+    TestFree(ptr->mod_comment);
+    free(ptr);
 }
diff --git a/xorg-server/hw/xfree86/parser/Monitor.c b/xorg-server/hw/xfree86/parser/Monitor.c
index 52c55007e..b237dfb32 100644
--- a/xorg-server/hw/xfree86/parser/Monitor.c
+++ b/xorg-server/hw/xfree86/parser/Monitor.c
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -65,348 +64,340 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec MonitorTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{IDENTIFIER, "identifier"},
-	{VENDOR, "vendorname"},
-	{MODEL, "modelname"},
-	{USEMODES, "usemodes"},
-	{MODELINE, "modeline"},
-	{DISPLAYSIZE, "displaysize"},
-	{HORIZSYNC, "horizsync"},
-	{VERTREFRESH, "vertrefresh"},
-	{MODE, "mode"},
-	{GAMMA, "gamma"},
-	{OPTION, "option"},
-	{-1, ""},
+static xf86ConfigSymTabRec MonitorTab[] = {
+    {ENDSECTION, "endsection"},
+    {IDENTIFIER, "identifier"},
+    {VENDOR, "vendorname"},
+    {MODEL, "modelname"},
+    {USEMODES, "usemodes"},
+    {MODELINE, "modeline"},
+    {DISPLAYSIZE, "displaysize"},
+    {HORIZSYNC, "horizsync"},
+    {VERTREFRESH, "vertrefresh"},
+    {MODE, "mode"},
+    {GAMMA, "gamma"},
+    {OPTION, "option"},
+    {-1, ""},
 };
 
-static xf86ConfigSymTabRec ModesTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{IDENTIFIER, "identifier"},
-	{MODELINE, "modeline"},
-	{MODE, "mode"},
-	{-1, ""},
+static xf86ConfigSymTabRec ModesTab[] = {
+    {ENDSECTION, "endsection"},
+    {IDENTIFIER, "identifier"},
+    {MODELINE, "modeline"},
+    {MODE, "mode"},
+    {-1, ""},
 };
 
-static xf86ConfigSymTabRec TimingTab[] =
-{
-	{TT_INTERLACE, "interlace"},
-	{TT_PHSYNC, "+hsync"},
-	{TT_NHSYNC, "-hsync"},
-	{TT_PVSYNC, "+vsync"},
-	{TT_NVSYNC, "-vsync"},
-	{TT_CSYNC, "composite"},
-	{TT_PCSYNC, "+csync"},
-	{TT_NCSYNC, "-csync"},
-	{TT_DBLSCAN, "doublescan"},
-	{TT_HSKEW, "hskew"},
-	{TT_BCAST, "bcast"},
-	{TT_VSCAN, "vscan"},
-	{-1, ""},
+static xf86ConfigSymTabRec TimingTab[] = {
+    {TT_INTERLACE, "interlace"},
+    {TT_PHSYNC, "+hsync"},
+    {TT_NHSYNC, "-hsync"},
+    {TT_PVSYNC, "+vsync"},
+    {TT_NVSYNC, "-vsync"},
+    {TT_CSYNC, "composite"},
+    {TT_PCSYNC, "+csync"},
+    {TT_NCSYNC, "-csync"},
+    {TT_DBLSCAN, "doublescan"},
+    {TT_HSKEW, "hskew"},
+    {TT_BCAST, "bcast"},
+    {TT_VSCAN, "vscan"},
+    {-1, ""},
 };
 
-static xf86ConfigSymTabRec ModeTab[] =
-{
-	{DOTCLOCK, "dotclock"},
-	{HTIMINGS, "htimings"},
-	{VTIMINGS, "vtimings"},
-	{FLAGS, "flags"},
-	{HSKEW, "hskew"},
-	{BCAST, "bcast"},
-	{VSCAN, "vscan"},
-	{ENDMODE, "endmode"},
-	{-1, ""},
+static xf86ConfigSymTabRec ModeTab[] = {
+    {DOTCLOCK, "dotclock"},
+    {HTIMINGS, "htimings"},
+    {VTIMINGS, "vtimings"},
+    {FLAGS, "flags"},
+    {HSKEW, "hskew"},
+    {BCAST, "bcast"},
+    {VSCAN, "vscan"},
+    {ENDMODE, "endmode"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeModeLineList
 
 static void
-xf86freeModeLineList (XF86ConfModeLinePtr ptr)
+xf86freeModeLineList(XF86ConfModeLinePtr ptr)
 {
-	XF86ConfModeLinePtr prev;
-	while (ptr)
-	{
-		TestFree (ptr->ml_identifier);
-		TestFree (ptr->ml_comment);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ConfModeLinePtr prev;
+
+    while (ptr) {
+        TestFree(ptr->ml_identifier);
+        TestFree(ptr->ml_comment);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 static XF86ConfModeLinePtr
-xf86parseModeLine (void)
+xf86parseModeLine(void)
 {
-	int token;
-	parsePrologue (XF86ConfModeLinePtr, XF86ConfModeLineRec)
-
-	/* Identifier */
-	if (xf86getSubToken (&(ptr->ml_comment)) != STRING)
-		Error ("ModeLine identifier expected");
-	ptr->ml_identifier = val.str;
-
-	/* DotClock */
-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-		Error ("ModeLine dotclock expected");
-	ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5);
-
-	/* HDisplay */
-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-		Error ("ModeLine Hdisplay expected");
-	ptr->ml_hdisplay = val.num;
-
-	/* HSyncStart */
-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-		Error ("ModeLine HSyncStart expected");
-	ptr->ml_hsyncstart = val.num;
-
-	/* HSyncEnd */
-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-		Error ("ModeLine HSyncEnd expected");
-	ptr->ml_hsyncend = val.num;
-
-	/* HTotal */
-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-		Error ("ModeLine HTotal expected");
-	ptr->ml_htotal = val.num;
-
-	/* VDisplay */
-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-		Error ("ModeLine Vdisplay expected");
-	ptr->ml_vdisplay = val.num;
-
-	/* VSyncStart */
-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-		Error ("ModeLine VSyncStart expected");
-	ptr->ml_vsyncstart = val.num;
-
-	/* VSyncEnd */
-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-		Error ("ModeLine VSyncEnd expected");
-	ptr->ml_vsyncend = val.num;
-
-	/* VTotal */
-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-		Error ("ModeLine VTotal expected");
-	ptr->ml_vtotal = val.num;
-
-	token = xf86getSubTokenWithTab (&(ptr->ml_comment), TimingTab);
-	while ((token == TT_INTERLACE) || (token == TT_PHSYNC) ||
-		   (token == TT_NHSYNC) || (token == TT_PVSYNC) ||
-		   (token == TT_NVSYNC) || (token == TT_CSYNC) ||
-		   (token == TT_PCSYNC) || (token == TT_NCSYNC) ||
-		   (token == TT_DBLSCAN) || (token == TT_HSKEW) ||
-		   (token == TT_VSCAN) || (token == TT_BCAST))
-	{
-		switch (token)
-		{
-
-		case TT_INTERLACE:
-			ptr->ml_flags |= XF86CONF_INTERLACE;
-			break;
-		case TT_PHSYNC:
-			ptr->ml_flags |= XF86CONF_PHSYNC;
-			break;
-		case TT_NHSYNC:
-			ptr->ml_flags |= XF86CONF_NHSYNC;
-			break;
-		case TT_PVSYNC:
-			ptr->ml_flags |= XF86CONF_PVSYNC;
-			break;
-		case TT_NVSYNC:
-			ptr->ml_flags |= XF86CONF_NVSYNC;
-			break;
-		case TT_CSYNC:
-			ptr->ml_flags |= XF86CONF_CSYNC;
-			break;
-		case TT_PCSYNC:
-			ptr->ml_flags |= XF86CONF_PCSYNC;
-			break;
-		case TT_NCSYNC:
-			ptr->ml_flags |= XF86CONF_NCSYNC;
-			break;
-		case TT_DBLSCAN:
-			ptr->ml_flags |= XF86CONF_DBLSCAN;
-			break;
-		case TT_HSKEW:
-			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-				Error (NUMBER_MSG, "Hskew");
-			ptr->ml_hskew = val.num;
-			ptr->ml_flags |= XF86CONF_HSKEW;
-			break;
-		case TT_BCAST:
-			ptr->ml_flags |= XF86CONF_BCAST;
-			break;
-		case TT_VSCAN:
-			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-				Error (NUMBER_MSG, "Vscan");
-			ptr->ml_vscan = val.num;
-			ptr->ml_flags |= XF86CONF_VSCAN;
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-		token = xf86getSubTokenWithTab (&(ptr->ml_comment), TimingTab);
-	}
-	xf86unGetToken (token);
+    int token;
+
+    parsePrologue(XF86ConfModeLinePtr, XF86ConfModeLineRec)
+
+        /* Identifier */
+        if (xf86getSubToken(&(ptr->ml_comment)) != STRING)
+        Error("ModeLine identifier expected");
+    ptr->ml_identifier = val.str;
+
+    /* DotClock */
+    if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+        Error("ModeLine dotclock expected");
+    ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5);
+
+    /* HDisplay */
+    if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+        Error("ModeLine Hdisplay expected");
+    ptr->ml_hdisplay = val.num;
+
+    /* HSyncStart */
+    if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+        Error("ModeLine HSyncStart expected");
+    ptr->ml_hsyncstart = val.num;
+
+    /* HSyncEnd */
+    if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+        Error("ModeLine HSyncEnd expected");
+    ptr->ml_hsyncend = val.num;
+
+    /* HTotal */
+    if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+        Error("ModeLine HTotal expected");
+    ptr->ml_htotal = val.num;
+
+    /* VDisplay */
+    if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+        Error("ModeLine Vdisplay expected");
+    ptr->ml_vdisplay = val.num;
+
+    /* VSyncStart */
+    if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+        Error("ModeLine VSyncStart expected");
+    ptr->ml_vsyncstart = val.num;
+
+    /* VSyncEnd */
+    if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+        Error("ModeLine VSyncEnd expected");
+    ptr->ml_vsyncend = val.num;
+
+    /* VTotal */
+    if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+        Error("ModeLine VTotal expected");
+    ptr->ml_vtotal = val.num;
+
+    token = xf86getSubTokenWithTab(&(ptr->ml_comment), TimingTab);
+    while ((token == TT_INTERLACE) || (token == TT_PHSYNC) ||
+           (token == TT_NHSYNC) || (token == TT_PVSYNC) ||
+           (token == TT_NVSYNC) || (token == TT_CSYNC) ||
+           (token == TT_PCSYNC) || (token == TT_NCSYNC) ||
+           (token == TT_DBLSCAN) || (token == TT_HSKEW) ||
+           (token == TT_VSCAN) || (token == TT_BCAST)) {
+        switch (token) {
+
+        case TT_INTERLACE:
+            ptr->ml_flags |= XF86CONF_INTERLACE;
+            break;
+        case TT_PHSYNC:
+            ptr->ml_flags |= XF86CONF_PHSYNC;
+            break;
+        case TT_NHSYNC:
+            ptr->ml_flags |= XF86CONF_NHSYNC;
+            break;
+        case TT_PVSYNC:
+            ptr->ml_flags |= XF86CONF_PVSYNC;
+            break;
+        case TT_NVSYNC:
+            ptr->ml_flags |= XF86CONF_NVSYNC;
+            break;
+        case TT_CSYNC:
+            ptr->ml_flags |= XF86CONF_CSYNC;
+            break;
+        case TT_PCSYNC:
+            ptr->ml_flags |= XF86CONF_PCSYNC;
+            break;
+        case TT_NCSYNC:
+            ptr->ml_flags |= XF86CONF_NCSYNC;
+            break;
+        case TT_DBLSCAN:
+            ptr->ml_flags |= XF86CONF_DBLSCAN;
+            break;
+        case TT_HSKEW:
+            if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+                Error(NUMBER_MSG, "Hskew");
+            ptr->ml_hskew = val.num;
+            ptr->ml_flags |= XF86CONF_HSKEW;
+            break;
+        case TT_BCAST:
+            ptr->ml_flags |= XF86CONF_BCAST;
+            break;
+        case TT_VSCAN:
+            if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+                Error(NUMBER_MSG, "Vscan");
+            ptr->ml_vscan = val.num;
+            ptr->ml_flags |= XF86CONF_VSCAN;
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+        token = xf86getSubTokenWithTab(&(ptr->ml_comment), TimingTab);
+    }
+    xf86unGetToken(token);
 
 #ifdef DEBUG
-	printf ("ModeLine parsed\n");
+    printf("ModeLine parsed\n");
 #endif
-	return ptr;
+    return ptr;
 }
 
 static XF86ConfModeLinePtr
-xf86parseVerboseMode (void)
+xf86parseVerboseMode(void)
 {
-	int token, token2;
-	int had_dotclock = 0, had_htimings = 0, had_vtimings = 0;
-	parsePrologue (XF86ConfModeLinePtr, XF86ConfModeLineRec)
-
-		if (xf86getSubToken (&(ptr->ml_comment)) != STRING)
-		Error ("Mode name expected");
-	ptr->ml_identifier = val.str;
-	while ((token = xf86getToken (ModeTab)) != ENDMODE)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->ml_comment = xf86addComment(ptr->ml_comment, val.str);
-			break;
-		case DOTCLOCK:
-			if ((token = xf86getSubToken (&(ptr->ml_comment))) != NUMBER)
-				Error (NUMBER_MSG, "DotClock");
-			ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5);
-			had_dotclock = 1;
-			break;
-		case HTIMINGS:
-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
-				ptr->ml_hdisplay = val.num;
-			else
-				Error ("Horizontal display expected");
-
-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
-				ptr->ml_hsyncstart = val.num;
-			else
-				Error ("Horizontal sync start expected");
-
-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
-				ptr->ml_hsyncend = val.num;
-			else
-				Error ("Horizontal sync end expected");
-
-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
-				ptr->ml_htotal = val.num;
-			else
-				Error ("Horizontal total expected");
-			had_htimings = 1;
-			break;
-		case VTIMINGS:
-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
-				ptr->ml_vdisplay = val.num;
-			else
-				Error ("Vertical display expected");
-
-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
-				ptr->ml_vsyncstart = val.num;
-			else
-				Error ("Vertical sync start expected");
-
-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
-				ptr->ml_vsyncend = val.num;
-			else
-				Error ("Vertical sync end expected");
-
-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
-				ptr->ml_vtotal = val.num;
-			else
-				Error ("Vertical total expected");
-			had_vtimings = 1;
-			break;
-		case FLAGS:
-			token = xf86getSubToken (&(ptr->ml_comment));
-			if (token != STRING)
-				Error (QUOTE_MSG, "Flags");
-			while (token == STRING)
-			{
-				token2 = xf86getStringToken (TimingTab);
-				switch (token2)
-				{
-				case TT_INTERLACE:
-					ptr->ml_flags |= XF86CONF_INTERLACE;
-					break;
-				case TT_PHSYNC:
-					ptr->ml_flags |= XF86CONF_PHSYNC;
-					break;
-				case TT_NHSYNC:
-					ptr->ml_flags |= XF86CONF_NHSYNC;
-					break;
-				case TT_PVSYNC:
-					ptr->ml_flags |= XF86CONF_PVSYNC;
-					break;
-				case TT_NVSYNC:
-					ptr->ml_flags |= XF86CONF_NVSYNC;
-					break;
-				case TT_CSYNC:
-					ptr->ml_flags |= XF86CONF_CSYNC;
-					break;
-				case TT_PCSYNC:
-					ptr->ml_flags |= XF86CONF_PCSYNC;
-					break;
-				case TT_NCSYNC:
-					ptr->ml_flags |= XF86CONF_NCSYNC;
-					break;
-				case TT_DBLSCAN:
-					ptr->ml_flags |= XF86CONF_DBLSCAN;
-					break;
-				case EOF_TOKEN:
-					Error (UNEXPECTED_EOF_MSG);
-					break;
-				default:
-					Error ("Unknown flag string");
-					break;
-				}
-				token = xf86getSubToken (&(ptr->ml_comment));
-			}
-			xf86unGetToken (token);
-			break;
-		case HSKEW:
-			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-				Error ("Horizontal skew expected");
-			ptr->ml_flags |= XF86CONF_HSKEW;
-			ptr->ml_hskew = val.num;
-			break;
-		case VSCAN:
-			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
-				Error ("Vertical scan count expected");
-			ptr->ml_flags |= XF86CONF_VSCAN;
-			ptr->ml_vscan = val.num;
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error ("Unexepcted token in verbose \"Mode\" entry\n");
-		}
-	}
-	if (!had_dotclock)
-		Error ("the dotclock is missing");
-	if (!had_htimings)
-		Error ("the horizontal timings are missing");
-	if (!had_vtimings)
-		Error ("the vertical timings are missing");
+    int token, token2;
+    int had_dotclock = 0, had_htimings = 0, had_vtimings = 0;
+
+    parsePrologue(XF86ConfModeLinePtr, XF86ConfModeLineRec)
+
+        if (xf86getSubToken(&(ptr->ml_comment)) != STRING)
+        Error("Mode name expected");
+    ptr->ml_identifier = val.str;
+    while ((token = xf86getToken(ModeTab)) != ENDMODE) {
+        switch (token) {
+        case COMMENT:
+            ptr->ml_comment = xf86addComment(ptr->ml_comment, val.str);
+            break;
+        case DOTCLOCK:
+            if ((token = xf86getSubToken(&(ptr->ml_comment))) != NUMBER)
+                Error(NUMBER_MSG, "DotClock");
+            ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5);
+            had_dotclock = 1;
+            break;
+        case HTIMINGS:
+            if (xf86getSubToken(&(ptr->ml_comment)) == NUMBER)
+                ptr->ml_hdisplay = val.num;
+            else
+                Error("Horizontal display expected");
+
+            if (xf86getSubToken(&(ptr->ml_comment)) == NUMBER)
+                ptr->ml_hsyncstart = val.num;
+            else
+                Error("Horizontal sync start expected");
+
+            if (xf86getSubToken(&(ptr->ml_comment)) == NUMBER)
+                ptr->ml_hsyncend = val.num;
+            else
+                Error("Horizontal sync end expected");
+
+            if (xf86getSubToken(&(ptr->ml_comment)) == NUMBER)
+                ptr->ml_htotal = val.num;
+            else
+                Error("Horizontal total expected");
+            had_htimings = 1;
+            break;
+        case VTIMINGS:
+            if (xf86getSubToken(&(ptr->ml_comment)) == NUMBER)
+                ptr->ml_vdisplay = val.num;
+            else
+                Error("Vertical display expected");
+
+            if (xf86getSubToken(&(ptr->ml_comment)) == NUMBER)
+                ptr->ml_vsyncstart = val.num;
+            else
+                Error("Vertical sync start expected");
+
+            if (xf86getSubToken(&(ptr->ml_comment)) == NUMBER)
+                ptr->ml_vsyncend = val.num;
+            else
+                Error("Vertical sync end expected");
+
+            if (xf86getSubToken(&(ptr->ml_comment)) == NUMBER)
+                ptr->ml_vtotal = val.num;
+            else
+                Error("Vertical total expected");
+            had_vtimings = 1;
+            break;
+        case FLAGS:
+            token = xf86getSubToken(&(ptr->ml_comment));
+            if (token != STRING)
+                Error(QUOTE_MSG, "Flags");
+            while (token == STRING) {
+                token2 = xf86getStringToken(TimingTab);
+                switch (token2) {
+                case TT_INTERLACE:
+                    ptr->ml_flags |= XF86CONF_INTERLACE;
+                    break;
+                case TT_PHSYNC:
+                    ptr->ml_flags |= XF86CONF_PHSYNC;
+                    break;
+                case TT_NHSYNC:
+                    ptr->ml_flags |= XF86CONF_NHSYNC;
+                    break;
+                case TT_PVSYNC:
+                    ptr->ml_flags |= XF86CONF_PVSYNC;
+                    break;
+                case TT_NVSYNC:
+                    ptr->ml_flags |= XF86CONF_NVSYNC;
+                    break;
+                case TT_CSYNC:
+                    ptr->ml_flags |= XF86CONF_CSYNC;
+                    break;
+                case TT_PCSYNC:
+                    ptr->ml_flags |= XF86CONF_PCSYNC;
+                    break;
+                case TT_NCSYNC:
+                    ptr->ml_flags |= XF86CONF_NCSYNC;
+                    break;
+                case TT_DBLSCAN:
+                    ptr->ml_flags |= XF86CONF_DBLSCAN;
+                    break;
+                case EOF_TOKEN:
+                    Error(UNEXPECTED_EOF_MSG);
+                    break;
+                default:
+                    Error("Unknown flag string");
+                    break;
+                }
+                token = xf86getSubToken(&(ptr->ml_comment));
+            }
+            xf86unGetToken(token);
+            break;
+        case HSKEW:
+            if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+                Error("Horizontal skew expected");
+            ptr->ml_flags |= XF86CONF_HSKEW;
+            ptr->ml_hskew = val.num;
+            break;
+        case VSCAN:
+            if (xf86getSubToken(&(ptr->ml_comment)) != NUMBER)
+                Error("Vertical scan count expected");
+            ptr->ml_flags |= XF86CONF_VSCAN;
+            ptr->ml_vscan = val.num;
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error("Unexepcted token in verbose \"Mode\" entry\n");
+        }
+    }
+    if (!had_dotclock)
+        Error("the dotclock is missing");
+    if (!had_htimings)
+        Error("the horizontal timings are missing");
+    if (!had_vtimings)
+        Error("the vertical timings are missing");
 
 #ifdef DEBUG
-	printf ("Verbose Mode parsed\n");
+    printf("Verbose Mode parsed\n");
 #endif
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
@@ -414,484 +405,460 @@ xf86parseVerboseMode (void)
 #define CLEANUP xf86freeMonitorList
 
 XF86ConfMonitorPtr
-xf86parseMonitorSection (void)
+xf86parseMonitorSection(void)
 {
-	int has_ident = FALSE;
-	int token;
-	parsePrologue (XF86ConfMonitorPtr, XF86ConfMonitorRec)
-
-		while ((token = xf86getToken (MonitorTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->mon_comment = xf86addComment(ptr->mon_comment, val.str);
-			break;
-		case IDENTIFIER:
-			if (xf86getSubToken (&(ptr->mon_comment)) != STRING)
-				Error (QUOTE_MSG, "Identifier");
-			if (has_ident == TRUE)
-				Error (MULTIPLE_MSG, "Identifier");
-			ptr->mon_identifier = val.str;
-			has_ident = TRUE;
-			break;
-		case VENDOR:
-			if (xf86getSubToken (&(ptr->mon_comment)) != STRING)
-				Error (QUOTE_MSG, "Vendor");
-			ptr->mon_vendor = val.str;
-			break;
-		case MODEL:
-			if (xf86getSubToken (&(ptr->mon_comment)) != STRING)
-				Error (QUOTE_MSG, "ModelName");
-			ptr->mon_modelname = val.str;
-			break;
-		case MODE:
-			HANDLE_LIST (mon_modeline_lst, xf86parseVerboseMode,
-						 XF86ConfModeLinePtr);
-			break;
-		case MODELINE:
-			HANDLE_LIST (mon_modeline_lst, xf86parseModeLine,
-						 XF86ConfModeLinePtr);
-			break;
-		case DISPLAYSIZE:
-			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
-				Error (DISPLAYSIZE_MSG);
-			ptr->mon_width = val.realnum;
-			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
-				Error (DISPLAYSIZE_MSG);
-			ptr->mon_height = val.realnum;
-			break;
-
-		case HORIZSYNC:
-			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
-				Error (HORIZSYNC_MSG);
-			do {
-				if (ptr->mon_n_hsync >= CONF_MAX_HSYNC)
-					Error ("Sorry. Too many horizontal sync intervals.");
-				ptr->mon_hsync[ptr->mon_n_hsync].lo = val.realnum;
-				switch (token = xf86getSubToken (&(ptr->mon_comment)))
-				{
-					case COMMA:
-						ptr->mon_hsync[ptr->mon_n_hsync].hi =
-						ptr->mon_hsync[ptr->mon_n_hsync].lo;
-						break;
-					case DASH:
-						if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER ||
-						    (float)val.realnum < ptr->mon_hsync[ptr->mon_n_hsync].lo)
-							Error (HORIZSYNC_MSG);
-						ptr->mon_hsync[ptr->mon_n_hsync].hi = val.realnum;
-						if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA)
-							break;
-						ptr->mon_n_hsync++;
-						goto HorizDone;
-					default:
-						/* We cannot currently know if a '\n' was found,
-						 * or this is a real error
-						 */
-						ptr->mon_hsync[ptr->mon_n_hsync].hi =
-						ptr->mon_hsync[ptr->mon_n_hsync].lo;
-						ptr->mon_n_hsync++;
-						goto HorizDone;
-				}
-				ptr->mon_n_hsync++;
-			} while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER);
-HorizDone:
-			xf86unGetToken (token);
-			break;
-
-		case VERTREFRESH:
-			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
-				Error (VERTREFRESH_MSG);
-			do {
-				ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo = val.realnum;
-				switch (token = xf86getSubToken (&(ptr->mon_comment)))
-				{
-					case COMMA:
-						ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi =
-						ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo;
-						break;
-					case DASH:
-						if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER ||
-						    (float)val.realnum < ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo)
-							Error (VERTREFRESH_MSG);
-						ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi = val.realnum;
-						if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA)
-							break;
-						ptr->mon_n_vrefresh++;
-						goto VertDone;
-					default:
-						/* We cannot currently know if a '\n' was found,
-						 * or this is a real error
-						 */
-						ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi =
-						ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo;
-						ptr->mon_n_vrefresh++;
-						goto VertDone;
-				}
-				if (ptr->mon_n_vrefresh >= CONF_MAX_VREFRESH)
-					Error ("Sorry. Too many vertical refresh intervals.");
-				ptr->mon_n_vrefresh++;
-			} while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER);
-VertDone:
-			xf86unGetToken (token);
-			break;
-
-		case GAMMA:
-			if( xf86getSubToken (&(ptr->mon_comment)) != NUMBER )
-			{
-				Error (INVALID_GAMMA_MSG);
-			}
-			else
-			{
-				ptr->mon_gamma_red = ptr->mon_gamma_green =
-					ptr->mon_gamma_blue = val.realnum;
-				if( xf86getSubToken (&(ptr->mon_comment)) == NUMBER )
-				{
-					ptr->mon_gamma_green = val.realnum;
-					if( xf86getSubToken (&(ptr->mon_comment)) == NUMBER )
-					{
-						ptr->mon_gamma_blue = val.realnum;
-					}
-					else
-					{
-						Error (INVALID_GAMMA_MSG);
-					}
-				}
-				else
-					xf86unGetToken (token);
-			}
-			break;
-		case OPTION:
-			ptr->mon_option_lst = xf86parseOption(ptr->mon_option_lst);
-			break;
-		case USEMODES:
-		        {
-				XF86ConfModesLinkPtr mptr;
-
-				if ((token = xf86getSubToken (&(ptr->mon_comment))) != STRING)
-					Error (QUOTE_MSG, "UseModes");
-
-				/* add to the end of the list of modes sections 
-				   referenced here */
-				mptr = calloc (1, sizeof (XF86ConfModesLinkRec));
-				mptr->list.next = NULL;
-				mptr->ml_modes_str = val.str;
-				mptr->ml_modes = NULL;
-				ptr->mon_modes_sect_lst = (XF86ConfModesLinkPtr)
-					xf86addListItem((GenericListPtr)ptr->mon_modes_sect_lst,
-						    (GenericListPtr)mptr);
-			}
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ());
-			CLEANUP (ptr);
-			return NULL;
-			break;
-		}
-	}
-
-	if (!has_ident)
-		Error (NO_IDENT_MSG);
+    int has_ident = FALSE;
+    int token;
+
+    parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec)
+
+        while ((token = xf86getToken(MonitorTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->mon_comment = xf86addComment(ptr->mon_comment, val.str);
+            break;
+        case IDENTIFIER:
+            if (xf86getSubToken(&(ptr->mon_comment)) != STRING)
+                Error(QUOTE_MSG, "Identifier");
+            if (has_ident == TRUE)
+                Error(MULTIPLE_MSG, "Identifier");
+            ptr->mon_identifier = val.str;
+            has_ident = TRUE;
+            break;
+        case VENDOR:
+            if (xf86getSubToken(&(ptr->mon_comment)) != STRING)
+                Error(QUOTE_MSG, "Vendor");
+            ptr->mon_vendor = val.str;
+            break;
+        case MODEL:
+            if (xf86getSubToken(&(ptr->mon_comment)) != STRING)
+                Error(QUOTE_MSG, "ModelName");
+            ptr->mon_modelname = val.str;
+            break;
+        case MODE:
+            HANDLE_LIST(mon_modeline_lst, xf86parseVerboseMode,
+                        XF86ConfModeLinePtr);
+            break;
+        case MODELINE:
+            HANDLE_LIST(mon_modeline_lst, xf86parseModeLine,
+                        XF86ConfModeLinePtr);
+            break;
+        case DISPLAYSIZE:
+            if (xf86getSubToken(&(ptr->mon_comment)) != NUMBER)
+                Error(DISPLAYSIZE_MSG);
+            ptr->mon_width = val.realnum;
+            if (xf86getSubToken(&(ptr->mon_comment)) != NUMBER)
+                Error(DISPLAYSIZE_MSG);
+            ptr->mon_height = val.realnum;
+            break;
+
+        case HORIZSYNC:
+            if (xf86getSubToken(&(ptr->mon_comment)) != NUMBER)
+                Error(HORIZSYNC_MSG);
+            do {
+                if (ptr->mon_n_hsync >= CONF_MAX_HSYNC)
+                    Error("Sorry. Too many horizontal sync intervals.");
+                ptr->mon_hsync[ptr->mon_n_hsync].lo = val.realnum;
+                switch (token = xf86getSubToken(&(ptr->mon_comment))) {
+                case COMMA:
+                    ptr->mon_hsync[ptr->mon_n_hsync].hi =
+                        ptr->mon_hsync[ptr->mon_n_hsync].lo;
+                    break;
+                case DASH:
+                    if (xf86getSubToken(&(ptr->mon_comment)) != NUMBER ||
+                        (float) val.realnum <
+                        ptr->mon_hsync[ptr->mon_n_hsync].lo)
+                        Error(HORIZSYNC_MSG);
+                    ptr->mon_hsync[ptr->mon_n_hsync].hi = val.realnum;
+                    if ((token = xf86getSubToken(&(ptr->mon_comment))) == COMMA)
+                        break;
+                    ptr->mon_n_hsync++;
+                    goto HorizDone;
+                default:
+                    /* We cannot currently know if a '\n' was found,
+                     * or this is a real error
+                     */
+                    ptr->mon_hsync[ptr->mon_n_hsync].hi =
+                        ptr->mon_hsync[ptr->mon_n_hsync].lo;
+                    ptr->mon_n_hsync++;
+                    goto HorizDone;
+                }
+                ptr->mon_n_hsync++;
+            } while ((token = xf86getSubToken(&(ptr->mon_comment))) == NUMBER);
+ HorizDone:
+            xf86unGetToken(token);
+            break;
+
+        case VERTREFRESH:
+            if (xf86getSubToken(&(ptr->mon_comment)) != NUMBER)
+                Error(VERTREFRESH_MSG);
+            do {
+                ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo = val.realnum;
+                switch (token = xf86getSubToken(&(ptr->mon_comment))) {
+                case COMMA:
+                    ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi =
+                        ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo;
+                    break;
+                case DASH:
+                    if (xf86getSubToken(&(ptr->mon_comment)) != NUMBER ||
+                        (float) val.realnum <
+                        ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo)
+                        Error(VERTREFRESH_MSG);
+                    ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi = val.realnum;
+                    if ((token = xf86getSubToken(&(ptr->mon_comment))) == COMMA)
+                        break;
+                    ptr->mon_n_vrefresh++;
+                    goto VertDone;
+                default:
+                    /* We cannot currently know if a '\n' was found,
+                     * or this is a real error
+                     */
+                    ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi =
+                        ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo;
+                    ptr->mon_n_vrefresh++;
+                    goto VertDone;
+                }
+                if (ptr->mon_n_vrefresh >= CONF_MAX_VREFRESH)
+                    Error("Sorry. Too many vertical refresh intervals.");
+                ptr->mon_n_vrefresh++;
+            } while ((token = xf86getSubToken(&(ptr->mon_comment))) == NUMBER);
+ VertDone:
+            xf86unGetToken(token);
+            break;
+
+        case GAMMA:
+            if (xf86getSubToken(&(ptr->mon_comment)) != NUMBER) {
+                Error(INVALID_GAMMA_MSG);
+            }
+            else {
+                ptr->mon_gamma_red = ptr->mon_gamma_green =
+                    ptr->mon_gamma_blue = val.realnum;
+                if (xf86getSubToken(&(ptr->mon_comment)) == NUMBER) {
+                    ptr->mon_gamma_green = val.realnum;
+                    if (xf86getSubToken(&(ptr->mon_comment)) == NUMBER) {
+                        ptr->mon_gamma_blue = val.realnum;
+                    }
+                    else {
+                        Error(INVALID_GAMMA_MSG);
+                    }
+                }
+                else
+                    xf86unGetToken(token);
+            }
+            break;
+        case OPTION:
+            ptr->mon_option_lst = xf86parseOption(ptr->mon_option_lst);
+            break;
+        case USEMODES:
+        {
+            XF86ConfModesLinkPtr mptr;
+
+            if ((token = xf86getSubToken(&(ptr->mon_comment))) != STRING)
+                Error(QUOTE_MSG, "UseModes");
+
+            /* add to the end of the list of modes sections 
+               referenced here */
+            mptr = calloc(1, sizeof(XF86ConfModesLinkRec));
+            mptr->list.next = NULL;
+            mptr->ml_modes_str = val.str;
+            mptr->ml_modes = NULL;
+            ptr->mon_modes_sect_lst = (XF86ConfModesLinkPtr)
+                xf86addListItem((GenericListPtr) ptr->mon_modes_sect_lst,
+                                (GenericListPtr) mptr);
+        }
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            xf86parseError(INVALID_KEYWORD_MSG, xf86tokenString());
+            CLEANUP(ptr);
+            return NULL;
+            break;
+        }
+    }
+
+    if (!has_ident)
+        Error(NO_IDENT_MSG);
 
 #ifdef DEBUG
-	printf ("Monitor section parsed\n");
+    printf("Monitor section parsed\n");
 #endif
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 #define CLEANUP xf86freeModesList
 
 XF86ConfModesPtr
-xf86parseModesSection (void)
+xf86parseModesSection(void)
 {
-	int has_ident = FALSE;
-	int token;
-	parsePrologue (XF86ConfModesPtr, XF86ConfModesRec)
-
-	while ((token = xf86getToken (ModesTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->modes_comment = xf86addComment(ptr->modes_comment, val.str);
-			break;
-		case IDENTIFIER:
-			if (xf86getSubToken (&(ptr->modes_comment)) != STRING)
-				Error (QUOTE_MSG, "Identifier");
-			if (has_ident == TRUE)
-				Error (MULTIPLE_MSG, "Identifier");
-			ptr->modes_identifier = val.str;
-			has_ident = TRUE;
-			break;
-		case MODE:
-			HANDLE_LIST (mon_modeline_lst, xf86parseVerboseMode,
-						 XF86ConfModeLinePtr);
-			break;
-		case MODELINE:
-			HANDLE_LIST (mon_modeline_lst, xf86parseModeLine,
-						 XF86ConfModeLinePtr);
-			break;
-		default:
-			xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ());
-			CLEANUP (ptr);
-			return NULL;
-			break;
-		}
-	}
-
-	if (!has_ident)
-		Error (NO_IDENT_MSG);
+    int has_ident = FALSE;
+    int token;
+
+    parsePrologue(XF86ConfModesPtr, XF86ConfModesRec)
+
+        while ((token = xf86getToken(ModesTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->modes_comment = xf86addComment(ptr->modes_comment, val.str);
+            break;
+        case IDENTIFIER:
+            if (xf86getSubToken(&(ptr->modes_comment)) != STRING)
+                Error(QUOTE_MSG, "Identifier");
+            if (has_ident == TRUE)
+                Error(MULTIPLE_MSG, "Identifier");
+            ptr->modes_identifier = val.str;
+            has_ident = TRUE;
+            break;
+        case MODE:
+            HANDLE_LIST(mon_modeline_lst, xf86parseVerboseMode,
+                        XF86ConfModeLinePtr);
+            break;
+        case MODELINE:
+            HANDLE_LIST(mon_modeline_lst, xf86parseModeLine,
+                        XF86ConfModeLinePtr);
+            break;
+        default:
+            xf86parseError(INVALID_KEYWORD_MSG, xf86tokenString());
+            CLEANUP(ptr);
+            return NULL;
+            break;
+        }
+    }
+
+    if (!has_ident)
+        Error(NO_IDENT_MSG);
 
 #ifdef DEBUG
-	printf ("Modes section parsed\n");
+    printf("Modes section parsed\n");
 #endif
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
 void
-xf86printMonitorSection (FILE * cf, XF86ConfMonitorPtr ptr)
+xf86printMonitorSection(FILE * cf, XF86ConfMonitorPtr ptr)
 {
-	int i;
-	XF86ConfModeLinePtr mlptr;
-	XF86ConfModesLinkPtr mptr;
-
-	while (ptr)
-	{
-		mptr = ptr->mon_modes_sect_lst;
-		fprintf (cf, "Section \"Monitor\"\n");
-		if (ptr->mon_comment)
-			fprintf (cf, "%s", ptr->mon_comment);
-		if (ptr->mon_identifier)
-			fprintf (cf, "\tIdentifier   \"%s\"\n", ptr->mon_identifier);
-		if (ptr->mon_vendor)
-			fprintf (cf, "\tVendorName   \"%s\"\n", ptr->mon_vendor);
-		if (ptr->mon_modelname)
-			fprintf (cf, "\tModelName    \"%s\"\n", ptr->mon_modelname);
-		while (mptr) {
-			fprintf (cf, "\tUseModes     \"%s\"\n", mptr->ml_modes_str);
-			mptr = mptr->list.next;
-		}
-		if (ptr->mon_width)
-			fprintf (cf, "\tDisplaySize  %d\t%d\n",
-					 ptr->mon_width,
-					 ptr->mon_height);
-		for (i = 0; i < ptr->mon_n_hsync; i++)
-		{
-			fprintf (cf, "\tHorizSync    %2.1f - %2.1f\n",
-					 ptr->mon_hsync[i].lo,
-					 ptr->mon_hsync[i].hi);
-		}
-		for (i = 0; i < ptr->mon_n_vrefresh; i++)
-		{
-			fprintf (cf, "\tVertRefresh  %2.1f - %2.1f\n",
-					 ptr->mon_vrefresh[i].lo,
-					 ptr->mon_vrefresh[i].hi);
-		}
-		if (ptr->mon_gamma_red) {
-			if (ptr->mon_gamma_red == ptr->mon_gamma_green
-				&& ptr->mon_gamma_red == ptr->mon_gamma_blue)
-			{
-				fprintf (cf, "\tGamma        %.4g\n",
-					ptr->mon_gamma_red);
-			} else {
-				fprintf (cf, "\tGamma        %.4g %.4g %.4g\n",
-					ptr->mon_gamma_red,
-					ptr->mon_gamma_green,
-					ptr->mon_gamma_blue);
-			}
-		}
-		for (mlptr = ptr->mon_modeline_lst; mlptr; mlptr = mlptr->list.next)
-		{
-			fprintf (cf, "\tModeLine     \"%s\" %2.1f ",
-					 mlptr->ml_identifier, mlptr->ml_clock / 1000.0);
-			fprintf (cf, "%d %d %d %d %d %d %d %d",
-					 mlptr->ml_hdisplay, mlptr->ml_hsyncstart,
-					 mlptr->ml_hsyncend, mlptr->ml_htotal,
-					 mlptr->ml_vdisplay, mlptr->ml_vsyncstart,
-					 mlptr->ml_vsyncend, mlptr->ml_vtotal);
-			if (mlptr->ml_flags & XF86CONF_PHSYNC)
-				fprintf (cf, " +hsync");
-			if (mlptr->ml_flags & XF86CONF_NHSYNC)
-				fprintf (cf, " -hsync");
-			if (mlptr->ml_flags & XF86CONF_PVSYNC)
-				fprintf (cf, " +vsync");
-			if (mlptr->ml_flags & XF86CONF_NVSYNC)
-				fprintf (cf, " -vsync");
-			if (mlptr->ml_flags & XF86CONF_INTERLACE)
-				fprintf (cf, " interlace");
-			if (mlptr->ml_flags & XF86CONF_CSYNC)
-				fprintf (cf, " composite");
-			if (mlptr->ml_flags & XF86CONF_PCSYNC)
-				fprintf (cf, " +csync");
-			if (mlptr->ml_flags & XF86CONF_NCSYNC)
-				fprintf (cf, " -csync");
-			if (mlptr->ml_flags & XF86CONF_DBLSCAN)
-				fprintf (cf, " doublescan");
-			if (mlptr->ml_flags & XF86CONF_HSKEW)
-				fprintf (cf, " hskew %d", mlptr->ml_hskew);
-			if (mlptr->ml_flags & XF86CONF_BCAST)
-				fprintf (cf, " bcast");
-			fprintf (cf, "\n");
-		}
-		xf86printOptionList(cf, ptr->mon_option_lst, 1);
-		fprintf (cf, "EndSection\n\n");
-		ptr = ptr->list.next;
-	}
+    int i;
+    XF86ConfModeLinePtr mlptr;
+    XF86ConfModesLinkPtr mptr;
+
+    while (ptr) {
+        mptr = ptr->mon_modes_sect_lst;
+        fprintf(cf, "Section \"Monitor\"\n");
+        if (ptr->mon_comment)
+            fprintf(cf, "%s", ptr->mon_comment);
+        if (ptr->mon_identifier)
+            fprintf(cf, "\tIdentifier   \"%s\"\n", ptr->mon_identifier);
+        if (ptr->mon_vendor)
+            fprintf(cf, "\tVendorName   \"%s\"\n", ptr->mon_vendor);
+        if (ptr->mon_modelname)
+            fprintf(cf, "\tModelName    \"%s\"\n", ptr->mon_modelname);
+        while (mptr) {
+            fprintf(cf, "\tUseModes     \"%s\"\n", mptr->ml_modes_str);
+            mptr = mptr->list.next;
+        }
+        if (ptr->mon_width)
+            fprintf(cf, "\tDisplaySize  %d\t%d\n",
+                    ptr->mon_width, ptr->mon_height);
+        for (i = 0; i < ptr->mon_n_hsync; i++) {
+            fprintf(cf, "\tHorizSync    %2.1f - %2.1f\n",
+                    ptr->mon_hsync[i].lo, ptr->mon_hsync[i].hi);
+        }
+        for (i = 0; i < ptr->mon_n_vrefresh; i++) {
+            fprintf(cf, "\tVertRefresh  %2.1f - %2.1f\n",
+                    ptr->mon_vrefresh[i].lo, ptr->mon_vrefresh[i].hi);
+        }
+        if (ptr->mon_gamma_red) {
+            if (ptr->mon_gamma_red == ptr->mon_gamma_green
+                && ptr->mon_gamma_red == ptr->mon_gamma_blue) {
+                fprintf(cf, "\tGamma        %.4g\n", ptr->mon_gamma_red);
+            }
+            else {
+                fprintf(cf, "\tGamma        %.4g %.4g %.4g\n",
+                        ptr->mon_gamma_red,
+                        ptr->mon_gamma_green, ptr->mon_gamma_blue);
+            }
+        }
+        for (mlptr = ptr->mon_modeline_lst; mlptr; mlptr = mlptr->list.next) {
+            fprintf(cf, "\tModeLine     \"%s\" %2.1f ",
+                    mlptr->ml_identifier, mlptr->ml_clock / 1000.0);
+            fprintf(cf, "%d %d %d %d %d %d %d %d",
+                    mlptr->ml_hdisplay, mlptr->ml_hsyncstart,
+                    mlptr->ml_hsyncend, mlptr->ml_htotal,
+                    mlptr->ml_vdisplay, mlptr->ml_vsyncstart,
+                    mlptr->ml_vsyncend, mlptr->ml_vtotal);
+            if (mlptr->ml_flags & XF86CONF_PHSYNC)
+                fprintf(cf, " +hsync");
+            if (mlptr->ml_flags & XF86CONF_NHSYNC)
+                fprintf(cf, " -hsync");
+            if (mlptr->ml_flags & XF86CONF_PVSYNC)
+                fprintf(cf, " +vsync");
+            if (mlptr->ml_flags & XF86CONF_NVSYNC)
+                fprintf(cf, " -vsync");
+            if (mlptr->ml_flags & XF86CONF_INTERLACE)
+                fprintf(cf, " interlace");
+            if (mlptr->ml_flags & XF86CONF_CSYNC)
+                fprintf(cf, " composite");
+            if (mlptr->ml_flags & XF86CONF_PCSYNC)
+                fprintf(cf, " +csync");
+            if (mlptr->ml_flags & XF86CONF_NCSYNC)
+                fprintf(cf, " -csync");
+            if (mlptr->ml_flags & XF86CONF_DBLSCAN)
+                fprintf(cf, " doublescan");
+            if (mlptr->ml_flags & XF86CONF_HSKEW)
+                fprintf(cf, " hskew %d", mlptr->ml_hskew);
+            if (mlptr->ml_flags & XF86CONF_BCAST)
+                fprintf(cf, " bcast");
+            fprintf(cf, "\n");
+        }
+        xf86printOptionList(cf, ptr->mon_option_lst, 1);
+        fprintf(cf, "EndSection\n\n");
+        ptr = ptr->list.next;
+    }
 }
 
 void
-xf86printModesSection (FILE * cf, XF86ConfModesPtr ptr)
+xf86printModesSection(FILE * cf, XF86ConfModesPtr ptr)
 {
-	XF86ConfModeLinePtr mlptr;
-
-	while (ptr)
-	{
-		fprintf (cf, "Section \"Modes\"\n");
-		if (ptr->modes_comment)
-			fprintf (cf, "%s", ptr->modes_comment);
-		if (ptr->modes_identifier)
-			fprintf (cf, "\tIdentifier     \"%s\"\n", ptr->modes_identifier);
-		for (mlptr = ptr->mon_modeline_lst; mlptr; mlptr = mlptr->list.next)
-		{
-			fprintf (cf, "\tModeLine     \"%s\" %2.1f ",
-					 mlptr->ml_identifier, mlptr->ml_clock / 1000.0);
-			fprintf (cf, "%d %d %d %d %d %d %d %d",
-					 mlptr->ml_hdisplay, mlptr->ml_hsyncstart,
-					 mlptr->ml_hsyncend, mlptr->ml_htotal,
-					 mlptr->ml_vdisplay, mlptr->ml_vsyncstart,
-					 mlptr->ml_vsyncend, mlptr->ml_vtotal);
-			if (mlptr->ml_flags & XF86CONF_PHSYNC)
-				fprintf (cf, " +hsync");
-			if (mlptr->ml_flags & XF86CONF_NHSYNC)
-				fprintf (cf, " -hsync");
-			if (mlptr->ml_flags & XF86CONF_PVSYNC)
-				fprintf (cf, " +vsync");
-			if (mlptr->ml_flags & XF86CONF_NVSYNC)
-				fprintf (cf, " -vsync");
-			if (mlptr->ml_flags & XF86CONF_INTERLACE)
-				fprintf (cf, " interlace");
-			if (mlptr->ml_flags & XF86CONF_CSYNC)
-				fprintf (cf, " composite");
-			if (mlptr->ml_flags & XF86CONF_PCSYNC)
-				fprintf (cf, " +csync");
-			if (mlptr->ml_flags & XF86CONF_NCSYNC)
-				fprintf (cf, " -csync");
-			if (mlptr->ml_flags & XF86CONF_DBLSCAN)
-				fprintf (cf, " doublescan");
-			if (mlptr->ml_flags & XF86CONF_HSKEW)
-				fprintf (cf, " hskew %d", mlptr->ml_hskew);
-			if (mlptr->ml_flags & XF86CONF_VSCAN)
-				fprintf (cf, " vscan %d", mlptr->ml_vscan);
-			if (mlptr->ml_flags & XF86CONF_BCAST)
-				fprintf (cf, " bcast");
-			if (mlptr->ml_comment)
-				fprintf (cf, "%s", mlptr->ml_comment);
-			else
-				fprintf (cf, "\n");
-		}
-		fprintf (cf, "EndSection\n\n");
-		ptr = ptr->list.next;
-	}
+    XF86ConfModeLinePtr mlptr;
+
+    while (ptr) {
+        fprintf(cf, "Section \"Modes\"\n");
+        if (ptr->modes_comment)
+            fprintf(cf, "%s", ptr->modes_comment);
+        if (ptr->modes_identifier)
+            fprintf(cf, "\tIdentifier     \"%s\"\n", ptr->modes_identifier);
+        for (mlptr = ptr->mon_modeline_lst; mlptr; mlptr = mlptr->list.next) {
+            fprintf(cf, "\tModeLine     \"%s\" %2.1f ",
+                    mlptr->ml_identifier, mlptr->ml_clock / 1000.0);
+            fprintf(cf, "%d %d %d %d %d %d %d %d",
+                    mlptr->ml_hdisplay, mlptr->ml_hsyncstart,
+                    mlptr->ml_hsyncend, mlptr->ml_htotal,
+                    mlptr->ml_vdisplay, mlptr->ml_vsyncstart,
+                    mlptr->ml_vsyncend, mlptr->ml_vtotal);
+            if (mlptr->ml_flags & XF86CONF_PHSYNC)
+                fprintf(cf, " +hsync");
+            if (mlptr->ml_flags & XF86CONF_NHSYNC)
+                fprintf(cf, " -hsync");
+            if (mlptr->ml_flags & XF86CONF_PVSYNC)
+                fprintf(cf, " +vsync");
+            if (mlptr->ml_flags & XF86CONF_NVSYNC)
+                fprintf(cf, " -vsync");
+            if (mlptr->ml_flags & XF86CONF_INTERLACE)
+                fprintf(cf, " interlace");
+            if (mlptr->ml_flags & XF86CONF_CSYNC)
+                fprintf(cf, " composite");
+            if (mlptr->ml_flags & XF86CONF_PCSYNC)
+                fprintf(cf, " +csync");
+            if (mlptr->ml_flags & XF86CONF_NCSYNC)
+                fprintf(cf, " -csync");
+            if (mlptr->ml_flags & XF86CONF_DBLSCAN)
+                fprintf(cf, " doublescan");
+            if (mlptr->ml_flags & XF86CONF_HSKEW)
+                fprintf(cf, " hskew %d", mlptr->ml_hskew);
+            if (mlptr->ml_flags & XF86CONF_VSCAN)
+                fprintf(cf, " vscan %d", mlptr->ml_vscan);
+            if (mlptr->ml_flags & XF86CONF_BCAST)
+                fprintf(cf, " bcast");
+            if (mlptr->ml_comment)
+                fprintf(cf, "%s", mlptr->ml_comment);
+            else
+                fprintf(cf, "\n");
+        }
+        fprintf(cf, "EndSection\n\n");
+        ptr = ptr->list.next;
+    }
 }
 
 void
-xf86freeMonitorList (XF86ConfMonitorPtr ptr)
+xf86freeMonitorList(XF86ConfMonitorPtr ptr)
 {
-	XF86ConfMonitorPtr prev;
-
-	while (ptr)
-	{
-		TestFree (ptr->mon_identifier);
-		TestFree (ptr->mon_vendor);
-		TestFree (ptr->mon_modelname);
-		TestFree (ptr->mon_comment);
-		xf86optionListFree (ptr->mon_option_lst);
-		xf86freeModeLineList (ptr->mon_modeline_lst);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ConfMonitorPtr prev;
+
+    while (ptr) {
+        TestFree(ptr->mon_identifier);
+        TestFree(ptr->mon_vendor);
+        TestFree(ptr->mon_modelname);
+        TestFree(ptr->mon_comment);
+        xf86optionListFree(ptr->mon_option_lst);
+        xf86freeModeLineList(ptr->mon_modeline_lst);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 void
-xf86freeModesList (XF86ConfModesPtr ptr)
+xf86freeModesList(XF86ConfModesPtr ptr)
 {
-	XF86ConfModesPtr prev;
-
-	while (ptr)
-	{
-		TestFree (ptr->modes_identifier);
-		TestFree (ptr->modes_comment);
-		xf86freeModeLineList (ptr->mon_modeline_lst);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ConfModesPtr prev;
+
+    while (ptr) {
+        TestFree(ptr->modes_identifier);
+        TestFree(ptr->modes_comment);
+        xf86freeModeLineList(ptr->mon_modeline_lst);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 XF86ConfMonitorPtr
-xf86findMonitor (const char *ident, XF86ConfMonitorPtr p)
+xf86findMonitor(const char *ident, XF86ConfMonitorPtr p)
 {
-	while (p)
-	{
-		if (xf86nameCompare (ident, p->mon_identifier) == 0)
-			return p;
-
-		p = p->list.next;
-	}
-	return NULL;
+    while (p) {
+        if (xf86nameCompare(ident, p->mon_identifier) == 0)
+            return p;
+
+        p = p->list.next;
+    }
+    return NULL;
 }
 
 XF86ConfModesPtr
-xf86findModes (const char *ident, XF86ConfModesPtr p)
+xf86findModes(const char *ident, XF86ConfModesPtr p)
 {
-	while (p)
-	{
-		if (xf86nameCompare (ident, p->modes_identifier) == 0)
-			return p;
-
-		p = p->list.next;
-	}
-	return NULL;
+    while (p) {
+        if (xf86nameCompare(ident, p->modes_identifier) == 0)
+            return p;
+
+        p = p->list.next;
+    }
+    return NULL;
 }
 
 XF86ConfModeLinePtr
-xf86findModeLine (const char *ident, XF86ConfModeLinePtr p)
+xf86findModeLine(const char *ident, XF86ConfModeLinePtr p)
 {
-	while (p)
-	{
-		if (xf86nameCompare (ident, p->ml_identifier) == 0)
-			return p;
-
-		p = p->list.next;
-	}
-	return NULL;
+    while (p) {
+        if (xf86nameCompare(ident, p->ml_identifier) == 0)
+            return p;
+
+        p = p->list.next;
+    }
+    return NULL;
 }
 
 int
-xf86validateMonitor (XF86ConfigPtr p, XF86ConfScreenPtr screen)
+xf86validateMonitor(XF86ConfigPtr p, XF86ConfScreenPtr screen)
 {
-	XF86ConfMonitorPtr monitor = screen->scrn_monitor;
-	XF86ConfModesLinkPtr modeslnk = monitor->mon_modes_sect_lst;
-	XF86ConfModesPtr modes;
-	while(modeslnk)
-	{
-		modes = xf86findModes (modeslnk->ml_modes_str, p->conf_modes_lst);
-		if (!modes)
-		{
-			xf86validationError (UNDEFINED_MODES_MSG, 
-					     modeslnk->ml_modes_str, 
-					     screen->scrn_identifier);
-			return FALSE;
-		}
-		modeslnk->ml_modes = modes;
-		modeslnk = modeslnk->list.next;
-	}
-	return TRUE;
+    XF86ConfMonitorPtr monitor = screen->scrn_monitor;
+    XF86ConfModesLinkPtr modeslnk = monitor->mon_modes_sect_lst;
+    XF86ConfModesPtr modes;
+
+    while (modeslnk) {
+        modes = xf86findModes(modeslnk->ml_modes_str, p->conf_modes_lst);
+        if (!modes) {
+            xf86validationError(UNDEFINED_MODES_MSG,
+                                modeslnk->ml_modes_str,
+                                screen->scrn_identifier);
+            return FALSE;
+        }
+        modeslnk->ml_modes = modes;
+        modeslnk = modeslnk->list.next;
+    }
+    return TRUE;
 }
diff --git a/xorg-server/hw/xfree86/parser/Pointer.c b/xorg-server/hw/xfree86/parser/Pointer.c
index 4edbf74d9..cdbc09c1a 100644
--- a/xorg-server/hw/xfree86/parser/Pointer.c
+++ b/xorg-server/hw/xfree86/parser/Pointer.c
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -66,168 +65,161 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec PointerTab[] =
-{
-	{PROTOCOL, "protocol"},
-	{EMULATE3, "emulate3buttons"},
-	{EM3TIMEOUT, "emulate3timeout"},
-	{ENDSUBSECTION, "endsubsection"},
-	{ENDSECTION, "endsection"},
-	{PDEVICE, "device"},
-	{PDEVICE, "port"},
-	{BAUDRATE, "baudrate"},
-	{SAMPLERATE, "samplerate"},
-	{CLEARDTR, "cleardtr"},
-	{CLEARRTS, "clearrts"},
-	{CHORDMIDDLE, "chordmiddle"},
-	{PRESOLUTION, "resolution"},
-	{DEVICE_NAME, "devicename"},
-	{ALWAYSCORE, "alwayscore"},
-	{PBUTTONS, "buttons"},
-	{ZAXISMAPPING, "zaxismapping"},
-	{-1, ""},
+static xf86ConfigSymTabRec PointerTab[] = {
+    {PROTOCOL, "protocol"},
+    {EMULATE3, "emulate3buttons"},
+    {EM3TIMEOUT, "emulate3timeout"},
+    {ENDSUBSECTION, "endsubsection"},
+    {ENDSECTION, "endsection"},
+    {PDEVICE, "device"},
+    {PDEVICE, "port"},
+    {BAUDRATE, "baudrate"},
+    {SAMPLERATE, "samplerate"},
+    {CLEARDTR, "cleardtr"},
+    {CLEARRTS, "clearrts"},
+    {CHORDMIDDLE, "chordmiddle"},
+    {PRESOLUTION, "resolution"},
+    {DEVICE_NAME, "devicename"},
+    {ALWAYSCORE, "alwayscore"},
+    {PBUTTONS, "buttons"},
+    {ZAXISMAPPING, "zaxismapping"},
+    {-1, ""},
 };
 
-static xf86ConfigSymTabRec ZMapTab[] =
-{
-	{XAXIS, "x"},
-	{YAXIS, "y"},
-	{-1, ""},
+static xf86ConfigSymTabRec ZMapTab[] = {
+    {XAXIS, "x"},
+    {YAXIS, "y"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeInputList
 
 XF86ConfInputPtr
-xf86parsePointerSection (void)
+xf86parsePointerSection(void)
 {
-	char *s;
-	unsigned long val1;
-	int token;
-	parsePrologue (XF86ConfInputPtr, XF86ConfInputRec)
+    char *s;
+    unsigned long val1;
+    int token;
 
-	while ((token = xf86getToken (PointerTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->inp_comment = xf86addComment(ptr->inp_comment, val.str);
-			break;
-		case PROTOCOL:
-			if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
-				Error (QUOTE_MSG, "Protocol");
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Protocol"),
-												val.str);
-			break;
-		case PDEVICE:
-			if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
-				Error (QUOTE_MSG, "Device");
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Device"),
-												val.str);
-			break;
-		case EMULATE3:
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Emulate3Buttons"),
-												NULL);
-			break;
-		case EM3TIMEOUT:
-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
-				Error (POSITIVE_INT_MSG, "Emulate3Timeout");
-			s = xf86uLongToString(val.num);
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Emulate3Timeout"),
-												s);
-			break;
-		case CHORDMIDDLE:
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("ChordMiddle"),
-												NULL);
-			break;
-		case PBUTTONS:
-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
-				Error (POSITIVE_INT_MSG, "Buttons");
-			s = xf86uLongToString(val.num);
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Buttons"), s);
-			break;
-		case BAUDRATE:
-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
-				Error (POSITIVE_INT_MSG, "BaudRate");
-			s = xf86uLongToString(val.num);
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("BaudRate"), s);
-			break;
-		case SAMPLERATE:
-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
-				Error (POSITIVE_INT_MSG, "SampleRate");
-			s = xf86uLongToString(val.num);
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("SampleRate"), s);
-			break;
-		case PRESOLUTION:
-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
-				Error (POSITIVE_INT_MSG, "Resolution");
-			s = xf86uLongToString(val.num);
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("Resolution"), s);
-			break;
-		case CLEARDTR:
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("ClearDTR"), NULL);
-			break;
-		case CLEARRTS:
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("ClearRTS"), NULL);
-			break;
-		case ZAXISMAPPING:
-			switch (xf86getToken(ZMapTab)) {
-			case NUMBER:
-				if (val.num < 0)
-					Error (ZAXISMAPPING_MSG);
-				val1 = val.num;
-				if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) {
-					Error (ZAXISMAPPING_MSG);
-				}
-				if (asprintf(&s, "%lu %u", val1, val.num) == -1)
-				    s = NULL;
-				break;
-			case XAXIS:
-				s = strdup("x");
-				break;
-			case YAXIS:
-				s = strdup("y");
-				break;
-			default:
-				Error (ZAXISMAPPING_MSG);
-				break;
-			}
-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-												strdup("ZAxisMapping"),
-												s);
-			break;
-		case ALWAYSCORE:
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
+    parsePrologue(XF86ConfInputPtr, XF86ConfInputRec)
 
-	ptr->inp_identifier = strdup(CONF_IMPLICIT_POINTER);
-	ptr->inp_driver = strdup("mouse");
-	ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
-										strdup("CorePointer"), NULL);
+        while ((token = xf86getToken(PointerTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->inp_comment = xf86addComment(ptr->inp_comment, val.str);
+            break;
+        case PROTOCOL:
+            if (xf86getSubToken(&(ptr->inp_comment)) != STRING)
+                Error(QUOTE_MSG, "Protocol");
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Protocol"), val.str);
+            break;
+        case PDEVICE:
+            if (xf86getSubToken(&(ptr->inp_comment)) != STRING)
+                Error(QUOTE_MSG, "Device");
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Device"), val.str);
+            break;
+        case EMULATE3:
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Emulate3Buttons"),
+                                                   NULL);
+            break;
+        case EM3TIMEOUT:
+            if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
+                Error(POSITIVE_INT_MSG, "Emulate3Timeout");
+            s = xf86uLongToString(val.num);
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Emulate3Timeout"),
+                                                   s);
+            break;
+        case CHORDMIDDLE:
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("ChordMiddle"), NULL);
+            break;
+        case PBUTTONS:
+            if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
+                Error(POSITIVE_INT_MSG, "Buttons");
+            s = xf86uLongToString(val.num);
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Buttons"), s);
+            break;
+        case BAUDRATE:
+            if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
+                Error(POSITIVE_INT_MSG, "BaudRate");
+            s = xf86uLongToString(val.num);
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("BaudRate"), s);
+            break;
+        case SAMPLERATE:
+            if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
+                Error(POSITIVE_INT_MSG, "SampleRate");
+            s = xf86uLongToString(val.num);
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("SampleRate"), s);
+            break;
+        case PRESOLUTION:
+            if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
+                Error(POSITIVE_INT_MSG, "Resolution");
+            s = xf86uLongToString(val.num);
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("Resolution"), s);
+            break;
+        case CLEARDTR:
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("ClearDTR"), NULL);
+            break;
+        case CLEARRTS:
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("ClearRTS"), NULL);
+            break;
+        case ZAXISMAPPING:
+            switch (xf86getToken(ZMapTab)) {
+            case NUMBER:
+                if (val.num < 0)
+                    Error(ZAXISMAPPING_MSG);
+                val1 = val.num;
+                if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER ||
+                    val.num < 0) {
+                    Error(ZAXISMAPPING_MSG);
+                }
+                if (asprintf(&s, "%lu %u", val1, val.num) == -1)
+                    s = NULL;
+                break;
+            case XAXIS:
+                s = strdup("x");
+                break;
+            case YAXIS:
+                s = strdup("y");
+                break;
+            default:
+                Error(ZAXISMAPPING_MSG);
+                break;
+            }
+            ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                                   strdup("ZAxisMapping"), s);
+            break;
+        case ALWAYSCORE:
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
+
+    ptr->inp_identifier = strdup(CONF_IMPLICIT_POINTER);
+    ptr->inp_driver = strdup("mouse");
+    ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+                                           strdup("CorePointer"), NULL);
 
 #ifdef DEBUG
-	printf ("Pointer section parsed\n");
+    printf("Pointer section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
-
diff --git a/xorg-server/hw/xfree86/parser/Screen.c b/xorg-server/hw/xfree86/parser/Screen.c
index 2ca2c570d..71778d88d 100644
--- a/xorg-server/hw/xfree86/parser/Screen.c
+++ b/xorg-server/hw/xfree86/parser/Screen.c
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -65,505 +64,480 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec DisplayTab[] =
-{
-	{ENDSUBSECTION, "endsubsection"},
-	{MODES, "modes"},
-	{VIEWPORT, "viewport"},
-	{VIRTUAL, "virtual"},
-	{VISUAL, "visual"},
-	{BLACK_TOK, "black"},
-	{WHITE_TOK, "white"},
-	{DEPTH, "depth"},
-	{BPP, "fbbpp"},
-	{WEIGHT, "weight"},
-	{OPTION, "option"},
-	{-1, ""},
+static xf86ConfigSymTabRec DisplayTab[] = {
+    {ENDSUBSECTION, "endsubsection"},
+    {MODES, "modes"},
+    {VIEWPORT, "viewport"},
+    {VIRTUAL, "virtual"},
+    {VISUAL, "visual"},
+    {BLACK_TOK, "black"},
+    {WHITE_TOK, "white"},
+    {DEPTH, "depth"},
+    {BPP, "fbbpp"},
+    {WEIGHT, "weight"},
+    {OPTION, "option"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeDisplayList
 
 static XF86ConfDisplayPtr
-xf86parseDisplaySubSection (void)
+xf86parseDisplaySubSection(void)
 {
-	int token;
-	parsePrologue (XF86ConfDisplayPtr, XF86ConfDisplayRec)
-
-	ptr->disp_black.red = ptr->disp_black.green = ptr->disp_black.blue = -1;
-	ptr->disp_white.red = ptr->disp_white.green = ptr->disp_white.blue = -1;
-	ptr->disp_frameX0 = ptr->disp_frameY0 = -1;
-	while ((token = xf86getToken (DisplayTab)) != ENDSUBSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->disp_comment = xf86addComment(ptr->disp_comment, val.str);
-			break;
-		case VIEWPORT:
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (VIEWPORT_MSG);
-			ptr->disp_frameX0 = val.num;
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (VIEWPORT_MSG);
-			ptr->disp_frameY0 = val.num;
-			break;
-		case VIRTUAL:
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (VIRTUAL_MSG);
-			ptr->disp_virtualX = val.num;
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (VIRTUAL_MSG);
-			ptr->disp_virtualY = val.num;
-			break;
-		case DEPTH:
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (NUMBER_MSG, "Display");
-			ptr->disp_depth = val.num;
-			break;
-		case BPP:
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (NUMBER_MSG, "Display");
-			ptr->disp_bpp = val.num;
-			break;
-		case VISUAL:
-			if (xf86getSubToken (&(ptr->disp_comment)) != STRING)
-				Error (QUOTE_MSG, "Display");
-			ptr->disp_visual = val.str;
-			break;
-		case WEIGHT:
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (WEIGHT_MSG);
-			ptr->disp_weight.red = val.num;
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (WEIGHT_MSG);
-			ptr->disp_weight.green = val.num;
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (WEIGHT_MSG);
-			ptr->disp_weight.blue = val.num;
-			break;
-		case BLACK_TOK:
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (BLACK_MSG);
-			ptr->disp_black.red = val.num;
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (BLACK_MSG);
-			ptr->disp_black.green = val.num;
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (BLACK_MSG);
-			ptr->disp_black.blue = val.num;
-			break;
-		case WHITE_TOK:
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (WHITE_MSG);
-			ptr->disp_white.red = val.num;
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (WHITE_MSG);
-			ptr->disp_white.green = val.num;
-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
-				Error (WHITE_MSG);
-			ptr->disp_white.blue = val.num;
-			break;
-		case MODES:
-			{
-				XF86ModePtr mptr;
-
-				while ((token = xf86getSubTokenWithTab (&(ptr->disp_comment), DisplayTab)) == STRING)
-				{
-					mptr = calloc (1, sizeof (XF86ModeRec));
-					mptr->mode_name = val.str;
-					mptr->list.next = NULL;
-					ptr->disp_mode_lst = (XF86ModePtr)
-						xf86addListItem ((glp) ptr->disp_mode_lst, (glp) mptr);
-				}
-				xf86unGetToken (token);
-			}
-			break;
-		case OPTION:
-			ptr->disp_option_lst = xf86parseOption(ptr->disp_option_lst);
-			break;
-			
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
+    int token;
+
+    parsePrologue(XF86ConfDisplayPtr, XF86ConfDisplayRec)
+
+        ptr->disp_black.red = ptr->disp_black.green = ptr->disp_black.blue = -1;
+    ptr->disp_white.red = ptr->disp_white.green = ptr->disp_white.blue = -1;
+    ptr->disp_frameX0 = ptr->disp_frameY0 = -1;
+    while ((token = xf86getToken(DisplayTab)) != ENDSUBSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->disp_comment = xf86addComment(ptr->disp_comment, val.str);
+            break;
+        case VIEWPORT:
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(VIEWPORT_MSG);
+            ptr->disp_frameX0 = val.num;
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(VIEWPORT_MSG);
+            ptr->disp_frameY0 = val.num;
+            break;
+        case VIRTUAL:
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(VIRTUAL_MSG);
+            ptr->disp_virtualX = val.num;
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(VIRTUAL_MSG);
+            ptr->disp_virtualY = val.num;
+            break;
+        case DEPTH:
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(NUMBER_MSG, "Display");
+            ptr->disp_depth = val.num;
+            break;
+        case BPP:
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(NUMBER_MSG, "Display");
+            ptr->disp_bpp = val.num;
+            break;
+        case VISUAL:
+            if (xf86getSubToken(&(ptr->disp_comment)) != STRING)
+                Error(QUOTE_MSG, "Display");
+            ptr->disp_visual = val.str;
+            break;
+        case WEIGHT:
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(WEIGHT_MSG);
+            ptr->disp_weight.red = val.num;
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(WEIGHT_MSG);
+            ptr->disp_weight.green = val.num;
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(WEIGHT_MSG);
+            ptr->disp_weight.blue = val.num;
+            break;
+        case BLACK_TOK:
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(BLACK_MSG);
+            ptr->disp_black.red = val.num;
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(BLACK_MSG);
+            ptr->disp_black.green = val.num;
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(BLACK_MSG);
+            ptr->disp_black.blue = val.num;
+            break;
+        case WHITE_TOK:
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(WHITE_MSG);
+            ptr->disp_white.red = val.num;
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(WHITE_MSG);
+            ptr->disp_white.green = val.num;
+            if (xf86getSubToken(&(ptr->disp_comment)) != NUMBER)
+                Error(WHITE_MSG);
+            ptr->disp_white.blue = val.num;
+            break;
+        case MODES:
+        {
+            XF86ModePtr mptr;
+
+            while ((token =
+                    xf86getSubTokenWithTab(&(ptr->disp_comment),
+                                           DisplayTab)) == STRING) {
+                mptr = calloc(1, sizeof(XF86ModeRec));
+                mptr->mode_name = val.str;
+                mptr->list.next = NULL;
+                ptr->disp_mode_lst = (XF86ModePtr)
+                    xf86addListItem((glp) ptr->disp_mode_lst, (glp) mptr);
+            }
+            xf86unGetToken(token);
+        }
+            break;
+        case OPTION:
+            ptr->disp_option_lst = xf86parseOption(ptr->disp_option_lst);
+            break;
+
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
 
 #ifdef DEBUG
-	printf ("Display subsection parsed\n");
+    printf("Display subsection parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
-static xf86ConfigSymTabRec ScreenTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{IDENTIFIER, "identifier"},
-	{OBSDRIVER, "driver"},
-	{MDEVICE, "device"},
-	{MONITOR, "monitor"},
-	{VIDEOADAPTOR, "videoadaptor"},
-	{SCREENNO, "screenno"},
-	{SUBSECTION, "subsection"},
-	{DEFAULTDEPTH, "defaultcolordepth"},
-	{DEFAULTDEPTH, "defaultdepth"},
-	{DEFAULTBPP, "defaultbpp"},
-	{DEFAULTFBBPP, "defaultfbbpp"},
-	{VIRTUAL, "virtual"},
-	{OPTION, "option"},
-	{-1, ""},
+static xf86ConfigSymTabRec ScreenTab[] = {
+    {ENDSECTION, "endsection"},
+    {IDENTIFIER, "identifier"},
+    {OBSDRIVER, "driver"},
+    {MDEVICE, "device"},
+    {MONITOR, "monitor"},
+    {VIDEOADAPTOR, "videoadaptor"},
+    {SCREENNO, "screenno"},
+    {SUBSECTION, "subsection"},
+    {DEFAULTDEPTH, "defaultcolordepth"},
+    {DEFAULTDEPTH, "defaultdepth"},
+    {DEFAULTBPP, "defaultbpp"},
+    {DEFAULTFBBPP, "defaultfbbpp"},
+    {VIRTUAL, "virtual"},
+    {OPTION, "option"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeScreenList
 XF86ConfScreenPtr
-xf86parseScreenSection (void)
+xf86parseScreenSection(void)
 {
-	int has_ident = FALSE;
-	int has_driver= FALSE;
-	int token;
-
-	parsePrologue (XF86ConfScreenPtr, XF86ConfScreenRec)
-
-		while ((token = xf86getToken (ScreenTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->scrn_comment = xf86addComment(ptr->scrn_comment, val.str);
-			break;
-		case IDENTIFIER:
-			if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
-				Error (QUOTE_MSG, "Identifier");
-			ptr->scrn_identifier = val.str;
-			if (has_ident || has_driver)
-				Error (ONLY_ONE_MSG,"Identifier or Driver");
-			has_ident = TRUE;
-			break;
-		case OBSDRIVER:
-			if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
-				Error (QUOTE_MSG, "Driver");
-			ptr->scrn_obso_driver = val.str;
-			if (has_ident || has_driver)
-				Error (ONLY_ONE_MSG,"Identifier or Driver");
-			has_driver = TRUE;
-			break;
-		case DEFAULTDEPTH:
-			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
-				Error (NUMBER_MSG, "DefaultDepth");
-			ptr->scrn_defaultdepth = val.num;
-			break;
-		case DEFAULTBPP:
-			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
-				Error (NUMBER_MSG, "DefaultBPP");
-			ptr->scrn_defaultbpp = val.num;
-			break;
-		case DEFAULTFBBPP:
-			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
-				Error (NUMBER_MSG, "DefaultFbBPP");
-			ptr->scrn_defaultfbbpp = val.num;
-			break;
-		case MDEVICE:
-			if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
-				Error (QUOTE_MSG, "Device");
-			ptr->scrn_device_str = val.str;
-			break;
-		case MONITOR:
-			if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
-				Error (QUOTE_MSG, "Monitor");
-			ptr->scrn_monitor_str = val.str;
-			break;
-		case VIDEOADAPTOR:
-			{
-				XF86ConfAdaptorLinkPtr aptr;
-
-				if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
-					Error (QUOTE_MSG, "VideoAdaptor");
-
-				/* Don't allow duplicates */
-				for (aptr = ptr->scrn_adaptor_lst; aptr; 
-					aptr = (XF86ConfAdaptorLinkPtr) aptr->list.next)
-					if (xf86nameCompare (val.str, aptr->al_adaptor_str) == 0)
-						break;
-
-				if (aptr == NULL)
-				{
-					aptr = calloc (1, sizeof (XF86ConfAdaptorLinkRec));
-					aptr->list.next = NULL;
-					aptr->al_adaptor_str = val.str;
-					ptr->scrn_adaptor_lst = (XF86ConfAdaptorLinkPtr)
-						xf86addListItem ((glp) ptr->scrn_adaptor_lst, (glp) aptr);
-				}
-			}
-			break;
-		case VIRTUAL:
-			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
-				Error (VIRTUAL_MSG);
-			ptr->scrn_virtualX = val.num;
-			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
-				Error (VIRTUAL_MSG);
-			ptr->scrn_virtualY = val.num;
-			break;
-		case OPTION:
-			ptr->scrn_option_lst = xf86parseOption(ptr->scrn_option_lst);
-			break;
-		case SUBSECTION:
-			if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
-				Error (QUOTE_MSG, "SubSection");
-			{
-				free(val.str);
-				HANDLE_LIST (scrn_display_lst, xf86parseDisplaySubSection,
-							 XF86ConfDisplayPtr);
-			}
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
-
-	if (!has_ident && !has_driver)
-		Error (NO_IDENT_MSG);
+    int has_ident = FALSE;
+    int has_driver = FALSE;
+    int token;
+
+    parsePrologue(XF86ConfScreenPtr, XF86ConfScreenRec)
+
+        while ((token = xf86getToken(ScreenTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->scrn_comment = xf86addComment(ptr->scrn_comment, val.str);
+            break;
+        case IDENTIFIER:
+            if (xf86getSubToken(&(ptr->scrn_comment)) != STRING)
+                Error(QUOTE_MSG, "Identifier");
+            ptr->scrn_identifier = val.str;
+            if (has_ident || has_driver)
+                Error(ONLY_ONE_MSG, "Identifier or Driver");
+            has_ident = TRUE;
+            break;
+        case OBSDRIVER:
+            if (xf86getSubToken(&(ptr->scrn_comment)) != STRING)
+                Error(QUOTE_MSG, "Driver");
+            ptr->scrn_obso_driver = val.str;
+            if (has_ident || has_driver)
+                Error(ONLY_ONE_MSG, "Identifier or Driver");
+            has_driver = TRUE;
+            break;
+        case DEFAULTDEPTH:
+            if (xf86getSubToken(&(ptr->scrn_comment)) != NUMBER)
+                Error(NUMBER_MSG, "DefaultDepth");
+            ptr->scrn_defaultdepth = val.num;
+            break;
+        case DEFAULTBPP:
+            if (xf86getSubToken(&(ptr->scrn_comment)) != NUMBER)
+                Error(NUMBER_MSG, "DefaultBPP");
+            ptr->scrn_defaultbpp = val.num;
+            break;
+        case DEFAULTFBBPP:
+            if (xf86getSubToken(&(ptr->scrn_comment)) != NUMBER)
+                Error(NUMBER_MSG, "DefaultFbBPP");
+            ptr->scrn_defaultfbbpp = val.num;
+            break;
+        case MDEVICE:
+            if (xf86getSubToken(&(ptr->scrn_comment)) != STRING)
+                Error(QUOTE_MSG, "Device");
+            ptr->scrn_device_str = val.str;
+            break;
+        case MONITOR:
+            if (xf86getSubToken(&(ptr->scrn_comment)) != STRING)
+                Error(QUOTE_MSG, "Monitor");
+            ptr->scrn_monitor_str = val.str;
+            break;
+        case VIDEOADAPTOR:
+        {
+            XF86ConfAdaptorLinkPtr aptr;
+
+            if (xf86getSubToken(&(ptr->scrn_comment)) != STRING)
+                Error(QUOTE_MSG, "VideoAdaptor");
+
+            /* Don't allow duplicates */
+            for (aptr = ptr->scrn_adaptor_lst; aptr;
+                 aptr = (XF86ConfAdaptorLinkPtr) aptr->list.next)
+                if (xf86nameCompare(val.str, aptr->al_adaptor_str) == 0)
+                    break;
+
+            if (aptr == NULL) {
+                aptr = calloc(1, sizeof(XF86ConfAdaptorLinkRec));
+                aptr->list.next = NULL;
+                aptr->al_adaptor_str = val.str;
+                ptr->scrn_adaptor_lst = (XF86ConfAdaptorLinkPtr)
+                    xf86addListItem((glp) ptr->scrn_adaptor_lst, (glp) aptr);
+            }
+        }
+            break;
+        case VIRTUAL:
+            if (xf86getSubToken(&(ptr->scrn_comment)) != NUMBER)
+                Error(VIRTUAL_MSG);
+            ptr->scrn_virtualX = val.num;
+            if (xf86getSubToken(&(ptr->scrn_comment)) != NUMBER)
+                Error(VIRTUAL_MSG);
+            ptr->scrn_virtualY = val.num;
+            break;
+        case OPTION:
+            ptr->scrn_option_lst = xf86parseOption(ptr->scrn_option_lst);
+            break;
+        case SUBSECTION:
+            if (xf86getSubToken(&(ptr->scrn_comment)) != STRING)
+                Error(QUOTE_MSG, "SubSection");
+            {
+                free(val.str);
+                HANDLE_LIST(scrn_display_lst, xf86parseDisplaySubSection,
+                            XF86ConfDisplayPtr);
+            }
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
+
+    if (!has_ident && !has_driver)
+        Error(NO_IDENT_MSG);
 
 #ifdef DEBUG
-	printf ("Screen section parsed\n");
+    printf("Screen section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 void
-xf86printScreenSection (FILE * cf, XF86ConfScreenPtr ptr)
+xf86printScreenSection(FILE * cf, XF86ConfScreenPtr ptr)
 {
-	XF86ConfAdaptorLinkPtr aptr;
-	XF86ConfDisplayPtr dptr;
-	XF86ModePtr mptr;
-
-	while (ptr)
-	{
-		fprintf (cf, "Section \"Screen\"\n");
-		if (ptr->scrn_comment)
-			fprintf (cf, "%s", ptr->scrn_comment);
-		if (ptr->scrn_identifier)
-			fprintf (cf, "\tIdentifier \"%s\"\n", ptr->scrn_identifier);
-		if (ptr->scrn_obso_driver)
-			fprintf (cf, "\tDriver     \"%s\"\n", ptr->scrn_obso_driver);
-		if (ptr->scrn_device_str)
-			fprintf (cf, "\tDevice     \"%s\"\n", ptr->scrn_device_str);
-		if (ptr->scrn_monitor_str)
-			fprintf (cf, "\tMonitor    \"%s\"\n", ptr->scrn_monitor_str);
-		if (ptr->scrn_defaultdepth)
-			fprintf (cf, "\tDefaultDepth     %d\n",
-					 ptr->scrn_defaultdepth);
-		if (ptr->scrn_defaultbpp)
-			fprintf (cf, "\tDefaultBPP     %d\n",
-					 ptr->scrn_defaultbpp);
-		if (ptr->scrn_defaultfbbpp)
-			fprintf (cf, "\tDefaultFbBPP     %d\n",
-					 ptr->scrn_defaultfbbpp);
-		xf86printOptionList(cf, ptr->scrn_option_lst, 1);
-		for (aptr = ptr->scrn_adaptor_lst; aptr; aptr = aptr->list.next)
-		{
-			fprintf (cf, "\tVideoAdaptor \"%s\"\n", aptr->al_adaptor_str);
-		}
-		if (ptr->scrn_virtualX && ptr->scrn_virtualY)
-			fprintf (cf, "\tVirtual     %d %d\n",
-				 ptr->scrn_virtualX,
-				 ptr->scrn_virtualY);
-		for (dptr = ptr->scrn_display_lst; dptr; dptr = dptr->list.next)
-		{
-			fprintf (cf, "\tSubSection \"Display\"\n");
-			if (dptr->disp_comment)
-				fprintf (cf, "%s", dptr->disp_comment);
-			if (dptr->disp_frameX0 >= 0 || dptr->disp_frameY0 >= 0)
-			{
-				fprintf (cf, "\t\tViewport   %d %d\n",
-						 dptr->disp_frameX0, dptr->disp_frameY0);
-			}
-			if (dptr->disp_virtualX != 0 || dptr->disp_virtualY != 0)
-			{
-				fprintf (cf, "\t\tVirtual   %d %d\n",
-						 dptr->disp_virtualX, dptr->disp_virtualY);
-			}
-			if (dptr->disp_depth)
-			{
-				fprintf (cf, "\t\tDepth     %d\n", dptr->disp_depth);
-			}
-			if (dptr->disp_bpp)
-			{
-				fprintf (cf, "\t\tFbBPP     %d\n", dptr->disp_bpp);
-			}
-			if (dptr->disp_visual)
-			{
-				fprintf (cf, "\t\tVisual    \"%s\"\n", dptr->disp_visual);
-			}
-			if (dptr->disp_weight.red != 0)
-			{
-				fprintf (cf, "\t\tWeight    %d %d %d\n",
-					 dptr->disp_weight.red, dptr->disp_weight.green, dptr->disp_weight.blue);
-			}
-			if (dptr->disp_black.red != -1)
-			{
-				fprintf (cf, "\t\tBlack     0x%04x 0x%04x 0x%04x\n",
-					  dptr->disp_black.red, dptr->disp_black.green, dptr->disp_black.blue);
-			}
-			if (dptr->disp_white.red != -1)
-			{
-				fprintf (cf, "\t\tWhite     0x%04x 0x%04x 0x%04x\n",
-					  dptr->disp_white.red, dptr->disp_white.green, dptr->disp_white.blue);
-			}
-			if (dptr->disp_mode_lst)
-			{
-				fprintf (cf, "\t\tModes   ");
-			}
-			for (mptr = dptr->disp_mode_lst; mptr; mptr = mptr->list.next)
-			{
-				fprintf (cf, " \"%s\"", mptr->mode_name);
-			}
-			if (dptr->disp_mode_lst)
-			{
-				fprintf (cf, "\n");
-			}
-			xf86printOptionList(cf, dptr->disp_option_lst, 2);
-			fprintf (cf, "\tEndSubSection\n");
-		}
-		fprintf (cf, "EndSection\n\n");
-		ptr = ptr->list.next;
-	}
+    XF86ConfAdaptorLinkPtr aptr;
+    XF86ConfDisplayPtr dptr;
+    XF86ModePtr mptr;
+
+    while (ptr) {
+        fprintf(cf, "Section \"Screen\"\n");
+        if (ptr->scrn_comment)
+            fprintf(cf, "%s", ptr->scrn_comment);
+        if (ptr->scrn_identifier)
+            fprintf(cf, "\tIdentifier \"%s\"\n", ptr->scrn_identifier);
+        if (ptr->scrn_obso_driver)
+            fprintf(cf, "\tDriver     \"%s\"\n", ptr->scrn_obso_driver);
+        if (ptr->scrn_device_str)
+            fprintf(cf, "\tDevice     \"%s\"\n", ptr->scrn_device_str);
+        if (ptr->scrn_monitor_str)
+            fprintf(cf, "\tMonitor    \"%s\"\n", ptr->scrn_monitor_str);
+        if (ptr->scrn_defaultdepth)
+            fprintf(cf, "\tDefaultDepth     %d\n", ptr->scrn_defaultdepth);
+        if (ptr->scrn_defaultbpp)
+            fprintf(cf, "\tDefaultBPP     %d\n", ptr->scrn_defaultbpp);
+        if (ptr->scrn_defaultfbbpp)
+            fprintf(cf, "\tDefaultFbBPP     %d\n", ptr->scrn_defaultfbbpp);
+        xf86printOptionList(cf, ptr->scrn_option_lst, 1);
+        for (aptr = ptr->scrn_adaptor_lst; aptr; aptr = aptr->list.next) {
+            fprintf(cf, "\tVideoAdaptor \"%s\"\n", aptr->al_adaptor_str);
+        }
+        if (ptr->scrn_virtualX && ptr->scrn_virtualY)
+            fprintf(cf, "\tVirtual     %d %d\n",
+                    ptr->scrn_virtualX, ptr->scrn_virtualY);
+        for (dptr = ptr->scrn_display_lst; dptr; dptr = dptr->list.next) {
+            fprintf(cf, "\tSubSection \"Display\"\n");
+            if (dptr->disp_comment)
+                fprintf(cf, "%s", dptr->disp_comment);
+            if (dptr->disp_frameX0 >= 0 || dptr->disp_frameY0 >= 0) {
+                fprintf(cf, "\t\tViewport   %d %d\n",
+                        dptr->disp_frameX0, dptr->disp_frameY0);
+            }
+            if (dptr->disp_virtualX != 0 || dptr->disp_virtualY != 0) {
+                fprintf(cf, "\t\tVirtual   %d %d\n",
+                        dptr->disp_virtualX, dptr->disp_virtualY);
+            }
+            if (dptr->disp_depth) {
+                fprintf(cf, "\t\tDepth     %d\n", dptr->disp_depth);
+            }
+            if (dptr->disp_bpp) {
+                fprintf(cf, "\t\tFbBPP     %d\n", dptr->disp_bpp);
+            }
+            if (dptr->disp_visual) {
+                fprintf(cf, "\t\tVisual    \"%s\"\n", dptr->disp_visual);
+            }
+            if (dptr->disp_weight.red != 0) {
+                fprintf(cf, "\t\tWeight    %d %d %d\n",
+                        dptr->disp_weight.red, dptr->disp_weight.green,
+                        dptr->disp_weight.blue);
+            }
+            if (dptr->disp_black.red != -1) {
+                fprintf(cf, "\t\tBlack     0x%04x 0x%04x 0x%04x\n",
+                        dptr->disp_black.red, dptr->disp_black.green,
+                        dptr->disp_black.blue);
+            }
+            if (dptr->disp_white.red != -1) {
+                fprintf(cf, "\t\tWhite     0x%04x 0x%04x 0x%04x\n",
+                        dptr->disp_white.red, dptr->disp_white.green,
+                        dptr->disp_white.blue);
+            }
+            if (dptr->disp_mode_lst) {
+                fprintf(cf, "\t\tModes   ");
+            }
+            for (mptr = dptr->disp_mode_lst; mptr; mptr = mptr->list.next) {
+                fprintf(cf, " \"%s\"", mptr->mode_name);
+            }
+            if (dptr->disp_mode_lst) {
+                fprintf(cf, "\n");
+            }
+            xf86printOptionList(cf, dptr->disp_option_lst, 2);
+            fprintf(cf, "\tEndSubSection\n");
+        }
+        fprintf(cf, "EndSection\n\n");
+        ptr = ptr->list.next;
+    }
 
 }
 
 void
-xf86freeScreenList (XF86ConfScreenPtr ptr)
+xf86freeScreenList(XF86ConfScreenPtr ptr)
 {
-	XF86ConfScreenPtr prev;
-
-	while (ptr)
-	{
-		TestFree (ptr->scrn_identifier);
-		TestFree (ptr->scrn_monitor_str);
-		TestFree (ptr->scrn_device_str);
-		TestFree (ptr->scrn_comment);
-		xf86optionListFree (ptr->scrn_option_lst);
-		xf86freeAdaptorLinkList (ptr->scrn_adaptor_lst);
-		xf86freeDisplayList (ptr->scrn_display_lst);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ConfScreenPtr prev;
+
+    while (ptr) {
+        TestFree(ptr->scrn_identifier);
+        TestFree(ptr->scrn_monitor_str);
+        TestFree(ptr->scrn_device_str);
+        TestFree(ptr->scrn_comment);
+        xf86optionListFree(ptr->scrn_option_lst);
+        xf86freeAdaptorLinkList(ptr->scrn_adaptor_lst);
+        xf86freeDisplayList(ptr->scrn_display_lst);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 void
-xf86freeAdaptorLinkList (XF86ConfAdaptorLinkPtr ptr)
+xf86freeAdaptorLinkList(XF86ConfAdaptorLinkPtr ptr)
 {
-	XF86ConfAdaptorLinkPtr prev;
-
-	while (ptr)
-	{
-		TestFree (ptr->al_adaptor_str);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ConfAdaptorLinkPtr prev;
+
+    while (ptr) {
+        TestFree(ptr->al_adaptor_str);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 void
-xf86freeDisplayList (XF86ConfDisplayPtr ptr)
+xf86freeDisplayList(XF86ConfDisplayPtr ptr)
 {
-	XF86ConfDisplayPtr prev;
-
-	while (ptr)
-	{
-		xf86freeModeList (ptr->disp_mode_lst);
-		xf86optionListFree (ptr->disp_option_lst);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ConfDisplayPtr prev;
+
+    while (ptr) {
+        xf86freeModeList(ptr->disp_mode_lst);
+        xf86optionListFree(ptr->disp_option_lst);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 void
-xf86freeModeList (XF86ModePtr ptr)
+xf86freeModeList(XF86ModePtr ptr)
 {
-	XF86ModePtr prev;
-
-	while (ptr)
-	{
-		TestFree (ptr->mode_name);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ModePtr prev;
+
+    while (ptr) {
+        TestFree(ptr->mode_name);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 int
-xf86validateScreen (XF86ConfigPtr p)
+xf86validateScreen(XF86ConfigPtr p)
 {
-	XF86ConfScreenPtr screen = p->conf_screen_lst;
-	XF86ConfMonitorPtr monitor;
-	XF86ConfAdaptorLinkPtr adaptor;
-
-	while (screen)
-	{
-		if (screen->scrn_obso_driver && !screen->scrn_identifier)
-			screen->scrn_identifier = screen->scrn_obso_driver;
-
-		monitor = xf86findMonitor (screen->scrn_monitor_str, p->conf_monitor_lst);
-		if (screen->scrn_monitor_str)
-		{
-			if (monitor)
-			{
-				screen->scrn_monitor = monitor;
-				if (!xf86validateMonitor(p, screen))
-					return FALSE;
-			}
-		}
-
-		screen->scrn_device= xf86findDevice (screen->scrn_device_str, p->conf_device_lst);
-
-		adaptor = screen->scrn_adaptor_lst;
-		while (adaptor)
-		{
-			adaptor->al_adaptor = xf86findVideoAdaptor (adaptor->al_adaptor_str, p->conf_videoadaptor_lst);
-			if (!adaptor->al_adaptor)
-			{
-				xf86validationError (UNDEFINED_ADAPTOR_MSG, adaptor->al_adaptor_str, screen->scrn_identifier);
-				return FALSE;
-			}
-			else if (adaptor->al_adaptor->va_fwdref)
-			{
-				xf86validationError (ADAPTOR_REF_TWICE_MSG, adaptor->al_adaptor_str,
-						     adaptor->al_adaptor->va_fwdref);
-				return FALSE;
-			}
-
-			adaptor->al_adaptor->va_fwdref = strdup(screen->scrn_identifier);
-			adaptor = adaptor->list.next;
-		}
-
-		screen = screen->list.next;
-	}
-
-	return TRUE;
+    XF86ConfScreenPtr screen = p->conf_screen_lst;
+    XF86ConfMonitorPtr monitor;
+    XF86ConfAdaptorLinkPtr adaptor;
+
+    while (screen) {
+        if (screen->scrn_obso_driver && !screen->scrn_identifier)
+            screen->scrn_identifier = screen->scrn_obso_driver;
+
+        monitor =
+            xf86findMonitor(screen->scrn_monitor_str, p->conf_monitor_lst);
+        if (screen->scrn_monitor_str) {
+            if (monitor) {
+                screen->scrn_monitor = monitor;
+                if (!xf86validateMonitor(p, screen))
+                    return FALSE;
+            }
+        }
+
+        screen->scrn_device =
+            xf86findDevice(screen->scrn_device_str, p->conf_device_lst);
+
+        adaptor = screen->scrn_adaptor_lst;
+        while (adaptor) {
+            adaptor->al_adaptor =
+                xf86findVideoAdaptor(adaptor->al_adaptor_str,
+                                     p->conf_videoadaptor_lst);
+            if (!adaptor->al_adaptor) {
+                xf86validationError(UNDEFINED_ADAPTOR_MSG,
+                                    adaptor->al_adaptor_str,
+                                    screen->scrn_identifier);
+                return FALSE;
+            }
+            else if (adaptor->al_adaptor->va_fwdref) {
+                xf86validationError(ADAPTOR_REF_TWICE_MSG,
+                                    adaptor->al_adaptor_str,
+                                    adaptor->al_adaptor->va_fwdref);
+                return FALSE;
+            }
+
+            adaptor->al_adaptor->va_fwdref = strdup(screen->scrn_identifier);
+            adaptor = adaptor->list.next;
+        }
+
+        screen = screen->list.next;
+    }
+
+    return TRUE;
 }
 
 XF86ConfScreenPtr
-xf86findScreen (const char *ident, XF86ConfScreenPtr p)
+xf86findScreen(const char *ident, XF86ConfScreenPtr p)
 {
-	while (p)
-	{
-		if (xf86nameCompare (ident, p->scrn_identifier) == 0)
-			return p;
-
-		p = p->list.next;
-	}
-	return NULL;
-}
+    while (p) {
+        if (xf86nameCompare(ident, p->scrn_identifier) == 0)
+            return p;
 
+        p = p->list.next;
+    }
+    return NULL;
+}
diff --git a/xorg-server/hw/xfree86/parser/Vendor.c b/xorg-server/hw/xfree86/parser/Vendor.c
index d61f0a052..b4e2165b0 100644
--- a/xorg-server/hw/xfree86/parser/Vendor.c
+++ b/xorg-server/hw/xfree86/parser/Vendor.c
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -65,180 +64,173 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec VendorSubTab[] =
-{
-	{ENDSUBSECTION, "endsubsection"},
-	{IDENTIFIER, "identifier"},
-	{OPTION, "option"},
-	{-1, ""},
+static xf86ConfigSymTabRec VendorSubTab[] = {
+    {ENDSUBSECTION, "endsubsection"},
+    {IDENTIFIER, "identifier"},
+    {OPTION, "option"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeVendorSubList
 
 static XF86ConfVendSubPtr
-xf86parseVendorSubSection (void)
+xf86parseVendorSubSection(void)
 {
-	int has_ident = FALSE;
-	int token;
-	parsePrologue (XF86ConfVendSubPtr, XF86ConfVendSubRec)
-
-	while ((token = xf86getToken (VendorSubTab)) != ENDSUBSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->vs_comment = xf86addComment(ptr->vs_comment, val.str);
-			break;
-		case IDENTIFIER:
-			if (xf86getSubToken (&(ptr->vs_comment)))
-				Error (QUOTE_MSG, "Identifier");
-			if (has_ident == TRUE)
-				Error (MULTIPLE_MSG, "Identifier");
-			ptr->vs_identifier = val.str;
-			has_ident = TRUE;
-			break;
-		case OPTION:
-			ptr->vs_option_lst = xf86parseOption(ptr->vs_option_lst);
-			break;
-
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
+    int has_ident = FALSE;
+    int token;
+
+    parsePrologue(XF86ConfVendSubPtr, XF86ConfVendSubRec)
+
+        while ((token = xf86getToken(VendorSubTab)) != ENDSUBSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->vs_comment = xf86addComment(ptr->vs_comment, val.str);
+            break;
+        case IDENTIFIER:
+            if (xf86getSubToken(&(ptr->vs_comment)))
+                Error(QUOTE_MSG, "Identifier");
+            if (has_ident == TRUE)
+                Error(MULTIPLE_MSG, "Identifier");
+            ptr->vs_identifier = val.str;
+            has_ident = TRUE;
+            break;
+        case OPTION:
+            ptr->vs_option_lst = xf86parseOption(ptr->vs_option_lst);
+            break;
+
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
 
 #ifdef DEBUG
-	printf ("Vendor subsection parsed\n");
+    printf("Vendor subsection parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
-static xf86ConfigSymTabRec VendorTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{IDENTIFIER, "identifier"},
-	{OPTION, "option"},
-	{SUBSECTION, "subsection"},
-	{-1, ""},
+static xf86ConfigSymTabRec VendorTab[] = {
+    {ENDSECTION, "endsection"},
+    {IDENTIFIER, "identifier"},
+    {OPTION, "option"},
+    {SUBSECTION, "subsection"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeVendorList
 
 XF86ConfVendorPtr
-xf86parseVendorSection (void)
+xf86parseVendorSection(void)
 {
-	int has_ident = FALSE;
-	int token;
-	parsePrologue (XF86ConfVendorPtr, XF86ConfVendorRec)
-
-	while ((token = xf86getToken (VendorTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->vnd_comment = xf86addComment(ptr->vnd_comment, val.str);
-			break;
-		case IDENTIFIER:
-			if (xf86getSubToken (&(ptr->vnd_comment)) != STRING)
-				Error (QUOTE_MSG, "Identifier");
-			if (has_ident == TRUE)
-				Error (MULTIPLE_MSG, "Identifier");
-			ptr->vnd_identifier = val.str;
-			has_ident = TRUE;
-			break;
-		case OPTION:
-			ptr->vnd_option_lst = xf86parseOption(ptr->vnd_option_lst);
-			break;
-		case SUBSECTION:
-			if (xf86getSubToken (&(ptr->vnd_comment)) != STRING)
-				Error (QUOTE_MSG, "SubSection");
-			{
-				HANDLE_LIST (vnd_sub_lst, xf86parseVendorSubSection,
-							XF86ConfVendSubPtr);
-			}
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-
-	}
-
-	if (!has_ident)
-		Error (NO_IDENT_MSG);
+    int has_ident = FALSE;
+    int token;
+
+    parsePrologue(XF86ConfVendorPtr, XF86ConfVendorRec)
+
+        while ((token = xf86getToken(VendorTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->vnd_comment = xf86addComment(ptr->vnd_comment, val.str);
+            break;
+        case IDENTIFIER:
+            if (xf86getSubToken(&(ptr->vnd_comment)) != STRING)
+                Error(QUOTE_MSG, "Identifier");
+            if (has_ident == TRUE)
+                Error(MULTIPLE_MSG, "Identifier");
+            ptr->vnd_identifier = val.str;
+            has_ident = TRUE;
+            break;
+        case OPTION:
+            ptr->vnd_option_lst = xf86parseOption(ptr->vnd_option_lst);
+            break;
+        case SUBSECTION:
+            if (xf86getSubToken(&(ptr->vnd_comment)) != STRING)
+                Error(QUOTE_MSG, "SubSection");
+            {
+                HANDLE_LIST(vnd_sub_lst, xf86parseVendorSubSection,
+                            XF86ConfVendSubPtr);
+            }
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+
+    }
+
+    if (!has_ident)
+        Error(NO_IDENT_MSG);
 
 #ifdef DEBUG
-	printf ("Vendor section parsed\n");
+    printf("Vendor section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
 void
-xf86printVendorSection (FILE * cf, XF86ConfVendorPtr ptr)
+xf86printVendorSection(FILE * cf, XF86ConfVendorPtr ptr)
 {
-	XF86ConfVendSubPtr pptr;
-
-	while (ptr)
-	{
-		fprintf (cf, "Section \"Vendor\"\n");
-		if (ptr->vnd_comment)
-			fprintf (cf, "%s", ptr->vnd_comment);
-		if (ptr->vnd_identifier)
-			fprintf (cf, "\tIdentifier     \"%s\"\n", ptr->vnd_identifier);
-
-		xf86printOptionList(cf, ptr->vnd_option_lst, 1);
-		for (pptr = ptr->vnd_sub_lst; pptr; pptr = pptr->list.next)
-		{
-			fprintf (cf, "\tSubSection \"Vendor\"\n");
-			if (pptr->vs_comment)
-				fprintf (cf, "%s", pptr->vs_comment);
-			if (pptr->vs_identifier)
-				fprintf (cf, "\t\tIdentifier \"%s\"\n", pptr->vs_identifier);
-			xf86printOptionList(cf, pptr->vs_option_lst, 2);
-			fprintf (cf, "\tEndSubSection\n");
-		}
-		fprintf (cf, "EndSection\n\n");
-		ptr = ptr->list.next;
-	}
+    XF86ConfVendSubPtr pptr;
+
+    while (ptr) {
+        fprintf(cf, "Section \"Vendor\"\n");
+        if (ptr->vnd_comment)
+            fprintf(cf, "%s", ptr->vnd_comment);
+        if (ptr->vnd_identifier)
+            fprintf(cf, "\tIdentifier     \"%s\"\n", ptr->vnd_identifier);
+
+        xf86printOptionList(cf, ptr->vnd_option_lst, 1);
+        for (pptr = ptr->vnd_sub_lst; pptr; pptr = pptr->list.next) {
+            fprintf(cf, "\tSubSection \"Vendor\"\n");
+            if (pptr->vs_comment)
+                fprintf(cf, "%s", pptr->vs_comment);
+            if (pptr->vs_identifier)
+                fprintf(cf, "\t\tIdentifier \"%s\"\n", pptr->vs_identifier);
+            xf86printOptionList(cf, pptr->vs_option_lst, 2);
+            fprintf(cf, "\tEndSubSection\n");
+        }
+        fprintf(cf, "EndSection\n\n");
+        ptr = ptr->list.next;
+    }
 }
 
 void
-xf86freeVendorList (XF86ConfVendorPtr p)
+xf86freeVendorList(XF86ConfVendorPtr p)
 {
-	if (p == NULL)
-		return;
-	xf86freeVendorSubList (p->vnd_sub_lst);
-	TestFree (p->vnd_identifier);
-	TestFree (p->vnd_comment);
-	xf86optionListFree (p->vnd_option_lst);
-	free (p);
+    if (p == NULL)
+        return;
+    xf86freeVendorSubList(p->vnd_sub_lst);
+    TestFree(p->vnd_identifier);
+    TestFree(p->vnd_comment);
+    xf86optionListFree(p->vnd_option_lst);
+    free(p);
 }
 
 void
-xf86freeVendorSubList (XF86ConfVendSubPtr ptr)
+xf86freeVendorSubList(XF86ConfVendSubPtr ptr)
 {
-	XF86ConfVendSubPtr prev;
-
-	while (ptr)
-	{
-		TestFree (ptr->vs_identifier);
-		TestFree (ptr->vs_name);
-		TestFree (ptr->vs_comment);
-		xf86optionListFree (ptr->vs_option_lst);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    XF86ConfVendSubPtr prev;
+
+    while (ptr) {
+        TestFree(ptr->vs_identifier);
+        TestFree(ptr->vs_name);
+        TestFree(ptr->vs_comment);
+        xf86optionListFree(ptr->vs_option_lst);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
diff --git a/xorg-server/hw/xfree86/parser/Video.c b/xorg-server/hw/xfree86/parser/Video.c
index 19a5418b1..fc1f1e544 100644
--- a/xorg-server/hw/xfree86/parser/Video.c
+++ b/xorg-server/hw/xfree86/parser/Video.c
@@ -64,233 +64,223 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec VideoPortTab[] =
-{
-	{ENDSUBSECTION, "endsubsection"},
-	{IDENTIFIER, "identifier"},
-	{OPTION, "option"},
-	{-1, ""},
+static xf86ConfigSymTabRec VideoPortTab[] = {
+    {ENDSUBSECTION, "endsubsection"},
+    {IDENTIFIER, "identifier"},
+    {OPTION, "option"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeVideoPortList
 
 static void
-xf86freeVideoPortList (XF86ConfVideoPortPtr ptr)
+xf86freeVideoPortList(XF86ConfVideoPortPtr ptr)
 {
-	XF86ConfVideoPortPtr prev;
+    XF86ConfVideoPortPtr prev;
 
-	while (ptr)
-	{
-		TestFree (ptr->vp_identifier);
-		TestFree (ptr->vp_comment);
-		xf86optionListFree (ptr->vp_option_lst);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    while (ptr) {
+        TestFree(ptr->vp_identifier);
+        TestFree(ptr->vp_comment);
+        xf86optionListFree(ptr->vp_option_lst);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 static XF86ConfVideoPortPtr
-xf86parseVideoPortSubSection (void)
+xf86parseVideoPortSubSection(void)
 {
-	int has_ident = FALSE;
-	int token;
-	parsePrologue (XF86ConfVideoPortPtr, XF86ConfVideoPortRec)
+    int has_ident = FALSE;
+    int token;
+
+    parsePrologue(XF86ConfVideoPortPtr, XF86ConfVideoPortRec)
 
-	while ((token = xf86getToken (VideoPortTab)) != ENDSUBSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->vp_comment = xf86addComment(ptr->vp_comment, val.str);
-			break;
-		case IDENTIFIER:
-			if (xf86getSubToken (&(ptr->vp_comment)) != STRING)
-				Error (QUOTE_MSG, "Identifier");
-			if (has_ident == TRUE)
-				Error (MULTIPLE_MSG, "Identifier");
-			ptr->vp_identifier = val.str;
-			has_ident = TRUE;
-			break;
-		case OPTION:
-			ptr->vp_option_lst = xf86parseOption(ptr->vp_option_lst);
-			break;
+        while ((token = xf86getToken(VideoPortTab)) != ENDSUBSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->vp_comment = xf86addComment(ptr->vp_comment, val.str);
+            break;
+        case IDENTIFIER:
+            if (xf86getSubToken(&(ptr->vp_comment)) != STRING)
+                Error(QUOTE_MSG, "Identifier");
+            if (has_ident == TRUE)
+                Error(MULTIPLE_MSG, "Identifier");
+            ptr->vp_identifier = val.str;
+            has_ident = TRUE;
+            break;
+        case OPTION:
+            ptr->vp_option_lst = xf86parseOption(ptr->vp_option_lst);
+            break;
 
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
 
 #ifdef DEBUG
-	printf ("VideoPort subsection parsed\n");
+    printf("VideoPort subsection parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
-static xf86ConfigSymTabRec VideoAdaptorTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{IDENTIFIER, "identifier"},
-	{VENDOR, "vendorname"},
-	{BOARD, "boardname"},
-	{BUSID, "busid"},
-	{DRIVER, "driver"},
-	{OPTION, "option"},
-	{SUBSECTION, "subsection"},
-	{-1, ""},
+static xf86ConfigSymTabRec VideoAdaptorTab[] = {
+    {ENDSECTION, "endsection"},
+    {IDENTIFIER, "identifier"},
+    {VENDOR, "vendorname"},
+    {BOARD, "boardname"},
+    {BUSID, "busid"},
+    {DRIVER, "driver"},
+    {OPTION, "option"},
+    {SUBSECTION, "subsection"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeVideoAdaptorList
 
 XF86ConfVideoAdaptorPtr
-xf86parseVideoAdaptorSection (void)
+xf86parseVideoAdaptorSection(void)
 {
-	int has_ident = FALSE;
-	int token;
+    int has_ident = FALSE;
+    int token;
 
-	parsePrologue (XF86ConfVideoAdaptorPtr, XF86ConfVideoAdaptorRec)
+    parsePrologue(XF86ConfVideoAdaptorPtr, XF86ConfVideoAdaptorRec)
 
-	while ((token = xf86getToken (VideoAdaptorTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->va_comment = xf86addComment(ptr->va_comment, val.str);
-			break;
-		case IDENTIFIER:
-			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
-				Error (QUOTE_MSG, "Identifier");
-			ptr->va_identifier = val.str;
-			if (has_ident == TRUE)
-				Error (MULTIPLE_MSG, "Identifier");
-			has_ident = TRUE;
-			break;
-		case VENDOR:
-			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
-				Error (QUOTE_MSG, "Vendor");
-			ptr->va_vendor = val.str;
-			break;
-		case BOARD:
-			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
-				Error (QUOTE_MSG, "Board");
-			ptr->va_board = val.str;
-			break;
-		case BUSID:
-			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
-				Error (QUOTE_MSG, "BusID");
-			ptr->va_busid = val.str;
-			break;
-		case DRIVER:
-			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
-				Error (QUOTE_MSG, "Driver");
-			ptr->va_driver = val.str;
-			break;
-		case OPTION:
-			ptr->va_option_lst = xf86parseOption(ptr->va_option_lst);
-			break;
-		case SUBSECTION:
-			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
-				Error (QUOTE_MSG, "SubSection");
-			{
-				HANDLE_LIST (va_port_lst, xf86parseVideoPortSubSection,
-							 XF86ConfVideoPortPtr);
-			}
-			break;
+        while ((token = xf86getToken(VideoAdaptorTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->va_comment = xf86addComment(ptr->va_comment, val.str);
+            break;
+        case IDENTIFIER:
+            if (xf86getSubToken(&(ptr->va_comment)) != STRING)
+                Error(QUOTE_MSG, "Identifier");
+            ptr->va_identifier = val.str;
+            if (has_ident == TRUE)
+                Error(MULTIPLE_MSG, "Identifier");
+            has_ident = TRUE;
+            break;
+        case VENDOR:
+            if (xf86getSubToken(&(ptr->va_comment)) != STRING)
+                Error(QUOTE_MSG, "Vendor");
+            ptr->va_vendor = val.str;
+            break;
+        case BOARD:
+            if (xf86getSubToken(&(ptr->va_comment)) != STRING)
+                Error(QUOTE_MSG, "Board");
+            ptr->va_board = val.str;
+            break;
+        case BUSID:
+            if (xf86getSubToken(&(ptr->va_comment)) != STRING)
+                Error(QUOTE_MSG, "BusID");
+            ptr->va_busid = val.str;
+            break;
+        case DRIVER:
+            if (xf86getSubToken(&(ptr->va_comment)) != STRING)
+                Error(QUOTE_MSG, "Driver");
+            ptr->va_driver = val.str;
+            break;
+        case OPTION:
+            ptr->va_option_lst = xf86parseOption(ptr->va_option_lst);
+            break;
+        case SUBSECTION:
+            if (xf86getSubToken(&(ptr->va_comment)) != STRING)
+                Error(QUOTE_MSG, "SubSection");
+            {
+                HANDLE_LIST(va_port_lst, xf86parseVideoPortSubSection,
+                            XF86ConfVideoPortPtr);
+            }
+            break;
 
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
 
-	if (!has_ident)
-		Error (NO_IDENT_MSG);
+    if (!has_ident)
+        Error(NO_IDENT_MSG);
 
 #ifdef DEBUG
-	printf ("VideoAdaptor section parsed\n");
+    printf("VideoAdaptor section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 void
-xf86printVideoAdaptorSection (FILE * cf, XF86ConfVideoAdaptorPtr ptr)
+xf86printVideoAdaptorSection(FILE * cf, XF86ConfVideoAdaptorPtr ptr)
 {
-	XF86ConfVideoPortPtr pptr;
+    XF86ConfVideoPortPtr pptr;
 
-	while (ptr)
-	{
-		fprintf (cf, "Section \"VideoAdaptor\"\n");
-		if (ptr->va_comment)
-			fprintf (cf, "%s", ptr->va_comment);
-		if (ptr->va_identifier)
-			fprintf (cf, "\tIdentifier  \"%s\"\n", ptr->va_identifier);
-		if (ptr->va_vendor)
-			fprintf (cf, "\tVendorName  \"%s\"\n", ptr->va_vendor);
-		if (ptr->va_board)
-			fprintf (cf, "\tBoardName   \"%s\"\n", ptr->va_board);
-		if (ptr->va_busid)
-			fprintf (cf, "\tBusID       \"%s\"\n", ptr->va_busid);
-		if (ptr->va_driver)
-			fprintf (cf, "\tDriver      \"%s\"\n", ptr->va_driver);
-		xf86printOptionList(cf, ptr->va_option_lst, 1);
-		for (pptr = ptr->va_port_lst; pptr; pptr = pptr->list.next)
-		{
-			fprintf (cf, "\tSubSection \"VideoPort\"\n");
-			if (pptr->vp_comment)
-				fprintf (cf, "%s", pptr->vp_comment);
-			if (pptr->vp_identifier)
-				fprintf (cf, "\t\tIdentifier \"%s\"\n", pptr->vp_identifier);
-			xf86printOptionList(cf, pptr->vp_option_lst, 2);
-			fprintf (cf, "\tEndSubSection\n");
-		}
-		fprintf (cf, "EndSection\n\n");
-		ptr = ptr->list.next;
-	}
+    while (ptr) {
+        fprintf(cf, "Section \"VideoAdaptor\"\n");
+        if (ptr->va_comment)
+            fprintf(cf, "%s", ptr->va_comment);
+        if (ptr->va_identifier)
+            fprintf(cf, "\tIdentifier  \"%s\"\n", ptr->va_identifier);
+        if (ptr->va_vendor)
+            fprintf(cf, "\tVendorName  \"%s\"\n", ptr->va_vendor);
+        if (ptr->va_board)
+            fprintf(cf, "\tBoardName   \"%s\"\n", ptr->va_board);
+        if (ptr->va_busid)
+            fprintf(cf, "\tBusID       \"%s\"\n", ptr->va_busid);
+        if (ptr->va_driver)
+            fprintf(cf, "\tDriver      \"%s\"\n", ptr->va_driver);
+        xf86printOptionList(cf, ptr->va_option_lst, 1);
+        for (pptr = ptr->va_port_lst; pptr; pptr = pptr->list.next) {
+            fprintf(cf, "\tSubSection \"VideoPort\"\n");
+            if (pptr->vp_comment)
+                fprintf(cf, "%s", pptr->vp_comment);
+            if (pptr->vp_identifier)
+                fprintf(cf, "\t\tIdentifier \"%s\"\n", pptr->vp_identifier);
+            xf86printOptionList(cf, pptr->vp_option_lst, 2);
+            fprintf(cf, "\tEndSubSection\n");
+        }
+        fprintf(cf, "EndSection\n\n");
+        ptr = ptr->list.next;
+    }
 
 }
 
 void
-xf86freeVideoAdaptorList (XF86ConfVideoAdaptorPtr ptr)
+xf86freeVideoAdaptorList(XF86ConfVideoAdaptorPtr ptr)
 {
-	XF86ConfVideoAdaptorPtr prev;
+    XF86ConfVideoAdaptorPtr prev;
 
-	while (ptr)
-	{
-		TestFree (ptr->va_identifier);
-		TestFree (ptr->va_vendor);
-		TestFree (ptr->va_board);
-		TestFree (ptr->va_busid);
-		TestFree (ptr->va_driver);
-		TestFree (ptr->va_fwdref);
-		TestFree (ptr->va_comment);
-		xf86freeVideoPortList (ptr->va_port_lst);
-		xf86optionListFree (ptr->va_option_lst);
-		prev = ptr;
-		ptr = ptr->list.next;
-		free (prev);
-	}
+    while (ptr) {
+        TestFree(ptr->va_identifier);
+        TestFree(ptr->va_vendor);
+        TestFree(ptr->va_board);
+        TestFree(ptr->va_busid);
+        TestFree(ptr->va_driver);
+        TestFree(ptr->va_fwdref);
+        TestFree(ptr->va_comment);
+        xf86freeVideoPortList(ptr->va_port_lst);
+        xf86optionListFree(ptr->va_option_lst);
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
 }
 
 XF86ConfVideoAdaptorPtr
-xf86findVideoAdaptor (const char *ident, XF86ConfVideoAdaptorPtr p)
+xf86findVideoAdaptor(const char *ident, XF86ConfVideoAdaptorPtr p)
 {
-	while (p)
-	{
-		if (xf86nameCompare (ident, p->va_identifier) == 0)
-			return p;
+    while (p) {
+        if (xf86nameCompare(ident, p->va_identifier) == 0)
+            return p;
 
-		p = p->list.next;
-	}
-	return NULL;
+        p = p->list.next;
+    }
+    return NULL;
 }
diff --git a/xorg-server/hw/xfree86/parser/configProcs.h b/xorg-server/hw/xfree86/parser/configProcs.h
index d67acc698..1250f3922 100644
--- a/xorg-server/hw/xfree86/parser/configProcs.h
+++ b/xorg-server/hw/xfree86/parser/configProcs.h
@@ -32,82 +32,110 @@
 
 /* Device.c */
 XF86ConfDevicePtr xf86parseDeviceSection(void);
-void xf86printDeviceSection(FILE *cf, XF86ConfDevicePtr ptr);
+void xf86printDeviceSection(FILE * cf, XF86ConfDevicePtr ptr);
 void xf86freeDeviceList(XF86ConfDevicePtr ptr);
 int xf86validateDevice(XF86ConfigPtr p);
+
 /* Files.c */
 XF86ConfFilesPtr xf86parseFilesSection(void);
-void xf86printFileSection(FILE *cf, XF86ConfFilesPtr ptr);
+void xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr);
 void xf86freeFiles(XF86ConfFilesPtr p);
+
 /* Flags.c */
 XF86ConfFlagsPtr xf86parseFlagsSection(void);
-void xf86printServerFlagsSection(FILE *f, XF86ConfFlagsPtr flags);
+void xf86printServerFlagsSection(FILE * f, XF86ConfFlagsPtr flags);
 void xf86freeFlags(XF86ConfFlagsPtr flags);
+
 /* Input.c */
 XF86ConfInputPtr xf86parseInputSection(void);
-void xf86printInputSection(FILE *f, XF86ConfInputPtr ptr);
+void xf86printInputSection(FILE * f, XF86ConfInputPtr ptr);
 void xf86freeInputList(XF86ConfInputPtr ptr);
-int xf86validateInput (XF86ConfigPtr p);
+int xf86validateInput(XF86ConfigPtr p);
+
 /* InputClass.c */
 XF86ConfInputClassPtr xf86parseInputClassSection(void);
-void xf86printInputClassSection(FILE *f, XF86ConfInputClassPtr ptr);
+void xf86printInputClassSection(FILE * f, XF86ConfInputClassPtr ptr);
 void xf86freeInputClassList(XF86ConfInputClassPtr ptr);
+
 /* Layout.c */
 XF86ConfLayoutPtr xf86parseLayoutSection(void);
-void xf86printLayoutSection(FILE *cf, XF86ConfLayoutPtr ptr);
+void xf86printLayoutSection(FILE * cf, XF86ConfLayoutPtr ptr);
 void xf86freeLayoutList(XF86ConfLayoutPtr ptr);
 int xf86validateLayout(XF86ConfigPtr p);
+
 /* Module.c */
 XF86ConfModulePtr xf86parseModuleSection(void);
-void xf86printModuleSection(FILE *cf, XF86ConfModulePtr ptr);
-extern _X_EXPORT XF86LoadPtr xf86addNewLoadDirective(XF86LoadPtr head, char *name, int type, XF86OptionPtr opts);
+void xf86printModuleSection(FILE * cf, XF86ConfModulePtr ptr);
+extern _X_EXPORT XF86LoadPtr xf86addNewLoadDirective(XF86LoadPtr head,
+                                                     char *name, int type,
+                                                     XF86OptionPtr opts);
 void xf86freeModules(XF86ConfModulePtr ptr);
+
 /* Monitor.c */
 XF86ConfMonitorPtr xf86parseMonitorSection(void);
 XF86ConfModesPtr xf86parseModesSection(void);
-void xf86printMonitorSection(FILE *cf, XF86ConfMonitorPtr ptr);
-void xf86printModesSection(FILE *cf, XF86ConfModesPtr ptr);
+void xf86printMonitorSection(FILE * cf, XF86ConfMonitorPtr ptr);
+void xf86printModesSection(FILE * cf, XF86ConfModesPtr ptr);
 extern _X_EXPORT void xf86freeMonitorList(XF86ConfMonitorPtr ptr);
 void xf86freeModesList(XF86ConfModesPtr ptr);
 int xf86validateMonitor(XF86ConfigPtr p, XF86ConfScreenPtr screen);
+
 /* Pointer.c */
 XF86ConfInputPtr xf86parsePointerSection(void);
+
 /* Screen.c */
 XF86ConfScreenPtr xf86parseScreenSection(void);
-void xf86printScreenSection(FILE *cf, XF86ConfScreenPtr ptr);
+void xf86printScreenSection(FILE * cf, XF86ConfScreenPtr ptr);
 extern _X_EXPORT void xf86freeScreenList(XF86ConfScreenPtr ptr);
 void xf86freeAdaptorLinkList(XF86ConfAdaptorLinkPtr ptr);
 void xf86freeDisplayList(XF86ConfDisplayPtr ptr);
 void xf86freeModeList(XF86ModePtr ptr);
 int xf86validateScreen(XF86ConfigPtr p);
+
 /* Vendor.c */
 XF86ConfVendorPtr xf86parseVendorSection(void);
 void xf86freeVendorList(XF86ConfVendorPtr p);
 void xf86printVendorSection(FILE * cf, XF86ConfVendorPtr ptr);
-void xf86freeVendorSubList (XF86ConfVendSubPtr ptr);
+void xf86freeVendorSubList(XF86ConfVendSubPtr ptr);
+
 /* Video.c */
 XF86ConfVideoAdaptorPtr xf86parseVideoAdaptorSection(void);
-void xf86printVideoAdaptorSection(FILE *cf, XF86ConfVideoAdaptorPtr ptr);
+void xf86printVideoAdaptorSection(FILE * cf, XF86ConfVideoAdaptorPtr ptr);
 void xf86freeVideoAdaptorList(XF86ConfVideoAdaptorPtr ptr);
+
 /* scan.c */
-int xf86getToken(xf86ConfigSymTabRec *tab);
+int xf86getToken(xf86ConfigSymTabRec * tab);
 int xf86getSubToken(char **comment);
-int xf86getSubTokenWithTab(char **comment, xf86ConfigSymTabRec *tab);
+int xf86getSubTokenWithTab(char **comment, xf86ConfigSymTabRec * tab);
 void xf86unGetToken(int token);
 char *xf86tokenString(void);
-void xf86parseError(const char *format, ...) _X_ATTRIBUTE_PRINTF(1,2);
-void xf86validationError(const char *format, ...) _X_ATTRIBUTE_PRINTF(1,2);
-void xf86setSection(const char *section);
-int xf86getStringToken(xf86ConfigSymTabRec *tab);
+void
+xf86parseError(const char *format, ...)
+_X_ATTRIBUTE_PRINTF(1, 2);
+void
+xf86validationError(const char *format, ...)
+_X_ATTRIBUTE_PRINTF(1, 2);
+void
+xf86setSection(const char *section);
+int
+xf86getStringToken(xf86ConfigSymTabRec * tab);
+
 /* write.c */
 /* DRI.c */
-XF86ConfDRIPtr xf86parseDRISection (void);
-void xf86printDRISection (FILE * cf, XF86ConfDRIPtr ptr);
-void xf86freeDRI (XF86ConfDRIPtr ptr);
+XF86ConfDRIPtr
+xf86parseDRISection(void);
+void
+xf86printDRISection(FILE * cf, XF86ConfDRIPtr ptr);
+void
+xf86freeDRI(XF86ConfDRIPtr ptr);
+
 /* Extensions.c */
-XF86ConfExtensionsPtr xf86parseExtensionsSection (void);
-void xf86printExtensionsSection (FILE * cf, XF86ConfExtensionsPtr ptr);
-void xf86freeExtensions (XF86ConfExtensionsPtr ptr);
+XF86ConfExtensionsPtr
+xf86parseExtensionsSection(void);
+void
+xf86printExtensionsSection(FILE * cf, XF86ConfExtensionsPtr ptr);
+void
+xf86freeExtensions(XF86ConfExtensionsPtr ptr);
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
@@ -115,6 +143,8 @@ void xf86freeExtensions (XF86ConfExtensionsPtr ptr);
 
 #ifndef IN_XSERVER
 /* Externally provided functions */
-void ErrorF(const char *f, ...);
-void VErrorF(const char *f, va_list args);
+void
+ErrorF(const char *f, ...);
+void
+VErrorF(const char *f, va_list args);
 #endif
diff --git a/xorg-server/hw/xfree86/parser/read.c b/xorg-server/hw/xfree86/parser/read.c
index 715626c53..eef873e89 100644
--- a/xorg-server/hw/xfree86/parser/read.c
+++ b/xorg-server/hw/xfree86/parser/read.c
@@ -1,318 +1,292 @@
-/* 

- * 

- * Copyright (c) 1997  Metro Link Incorporated

- * 

- * 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 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 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- * 

- * Except as contained in this notice, the name of the Metro Link shall not be

- * used in advertising or otherwise to promote the sale, use or other dealings

- * in this Software without prior written authorization from Metro Link.

- * 

- */

-/*

- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.

- *

- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-

-/* View/edit this file with tab stops set to 4 */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Parser.h"

-#include "xf86tokens.h"

-#include "Configint.h"

-

-extern LexRec val;

-

-static xf86ConfigSymTabRec TopLevelTab[] =

-{

-	{SECTION, "section"},

-	{-1, ""},

-};

-

-#define CLEANUP xf86freeConfig

-

-/* 

- * This function resolves name references and reports errors if the named

- * objects cannot be found.

- */

-static int

-xf86validateConfig (XF86ConfigPtr p)

-{

-	if (!xf86validateScreen (p))

-		return FALSE;

-	if (!xf86validateInput (p))

-		return FALSE;

-	if (!xf86validateLayout (p))

-		return FALSE;

-

-	return TRUE;

-}

-

-XF86ConfigPtr

-xf86readConfigFile (void)

-{

-	int token;

-	XF86ConfigPtr ptr = NULL;

-

-	if ((ptr = calloc (1, sizeof (XF86ConfigRec))) == NULL)

-	{

-		return NULL;

-	}

-

-	while ((token = xf86getToken (TopLevelTab)) != EOF_TOKEN)

-	{

-		switch (token)

-		{

-		case COMMENT:

-			ptr->conf_comment = xf86addComment(ptr->conf_comment, val.str);

-			break;

-		case SECTION:

-			if (xf86getSubToken (&(ptr->conf_comment)) != STRING)

-			{

-				xf86parseError (QUOTE_MSG, "Section");

-				CLEANUP (ptr);

-				return NULL;

-			}

-			xf86setSection (val.str);

-			if (xf86nameCompare (val.str, "files") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_RETURN (conf_files, xf86parseFilesSection ());

-			}

-			else if (xf86nameCompare (val.str, "serverflags") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_RETURN (conf_flags, xf86parseFlagsSection ());

-			}

-			else if (xf86nameCompare (val.str, "pointer") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_LIST (conf_input_lst, xf86parsePointerSection,

-							 XF86ConfInputPtr);

-			}

-			else if (xf86nameCompare (val.str, "videoadaptor") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_LIST (conf_videoadaptor_lst, xf86parseVideoAdaptorSection,

-							 XF86ConfVideoAdaptorPtr);

-			}

-			else if (xf86nameCompare (val.str, "device") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_LIST (conf_device_lst, xf86parseDeviceSection,

-							 XF86ConfDevicePtr);

-			}

-			else if (xf86nameCompare (val.str, "monitor") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_LIST (conf_monitor_lst, xf86parseMonitorSection,

-							 XF86ConfMonitorPtr);

-			}

-			else if (xf86nameCompare (val.str, "modes") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_LIST (conf_modes_lst, xf86parseModesSection,

-							 XF86ConfModesPtr);

-			}

-			else if (xf86nameCompare (val.str, "screen") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_LIST (conf_screen_lst, xf86parseScreenSection,

-							 XF86ConfScreenPtr);

-			}

-			else if (xf86nameCompare(val.str, "inputdevice") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_LIST (conf_input_lst, xf86parseInputSection,

-							 XF86ConfInputPtr);

-			}

-			else if (xf86nameCompare(val.str, "inputclass") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_LIST (conf_inputclass_lst,

-						xf86parseInputClassSection,

-						XF86ConfInputClassPtr);

-			}

-			else if (xf86nameCompare (val.str, "module") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_RETURN (conf_modules, xf86parseModuleSection ());

-			}

-			else if (xf86nameCompare (val.str, "serverlayout") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_LIST (conf_layout_lst, xf86parseLayoutSection,

-							 XF86ConfLayoutPtr);

-			}

-			else if (xf86nameCompare (val.str, "vendor") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_LIST (conf_vendor_lst, xf86parseVendorSection,

-							 XF86ConfVendorPtr);

-			}

-			else if (xf86nameCompare (val.str, "dri") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_RETURN (conf_dri, xf86parseDRISection ());

-			}

-			else if (xf86nameCompare (val.str, "extensions") == 0)

-			{

-				free(val.str);

-				val.str = NULL;

-				HANDLE_RETURN (conf_extensions, xf86parseExtensionsSection ());

-			}

-			else

-			{

-				free(val.str);

-				val.str = NULL;

-				Error (INVALID_SECTION_MSG, xf86tokenString ());

-			}

-			break;

-		default:

-			free(val.str);

-			val.str = NULL;

-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());

-		}

-	}

-

-	if (xf86validateConfig (ptr))

-		return ptr;

-	else

-	{

-		CLEANUP (ptr);

-		return NULL;

-	}

-}

-

-#undef CLEANUP

-

-/* 

- * adds an item to the end of the linked list. Any record whose first field

- * is a GenericListRec can be cast to this type and used with this function.

- * A pointer to the head of the list is returned to handle the addition of

- * the first item.

- */

-GenericListPtr

-xf86addListItem (GenericListPtr head, GenericListPtr new)

-{

-	GenericListPtr p = head;

-	GenericListPtr last = NULL;

-

-	while (p)

-	{

-		last = p;

-		p = p->next;

-	}

-

-	if (last)

-	{

-		last->next = new;

-		return head;

-	}

-	else

-		return new;

-}

-

-/* 

- * Test if one chained list contains the other.

- * In this case both list have the same endpoint (provided they don't loop)

- */

-int

-xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2)

-{

-	GenericListPtr p = list_1;

-	GenericListPtr last_1 = NULL, last_2 = NULL;

-

-	while (p) {

-		last_1 = p;

-		p = p->next;

-	}

-

-	p = list_2;

-	while (p) {

-		last_2 = p;

-		p = p->next;

-	}

-

-	return (!(last_1 == last_2));

-}

-

-void

-xf86freeConfig (XF86ConfigPtr p)

-{

-	if (p == NULL)

-		return;

-

-	xf86freeFiles (p->conf_files);

-	xf86freeModules (p->conf_modules);

-	xf86freeFlags (p->conf_flags);

-	xf86freeMonitorList (p->conf_monitor_lst);

-	xf86freeModesList (p->conf_modes_lst);

-	xf86freeVideoAdaptorList (p->conf_videoadaptor_lst);

-	xf86freeDeviceList (p->conf_device_lst);

-	xf86freeScreenList (p->conf_screen_lst);

-	xf86freeLayoutList (p->conf_layout_lst);

-	xf86freeInputList (p->conf_input_lst);

-	xf86freeVendorList (p->conf_vendor_lst);

-	xf86freeDRI (p->conf_dri);

-	xf86freeExtensions (p->conf_extensions);

-	TestFree(p->conf_comment);

-

-	free (p);

-}

+/* 
+ * 
+ * Copyright (c) 1997  Metro Link Incorporated
+ * 
+ * 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 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 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of the Metro Link shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from Metro Link.
+ * 
+ */
+/*
+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+/* View/edit this file with tab stops set to 4 */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Parser.h"
+#include "xf86tokens.h"
+#include "Configint.h"
+
+extern LexRec val;
+
+static xf86ConfigSymTabRec TopLevelTab[] = {
+    {SECTION, "section"},
+    {-1, ""},
+};
+
+#define CLEANUP xf86freeConfig
+
+/* 
+ * This function resolves name references and reports errors if the named
+ * objects cannot be found.
+ */
+static int
+xf86validateConfig(XF86ConfigPtr p)
+{
+    if (!xf86validateScreen(p))
+        return FALSE;
+    if (!xf86validateInput(p))
+        return FALSE;
+    if (!xf86validateLayout(p))
+        return FALSE;
+
+    return TRUE;
+}
+
+XF86ConfigPtr
+xf86readConfigFile(void)
+{
+    int token;
+    XF86ConfigPtr ptr = NULL;
+
+    if ((ptr = calloc(1, sizeof(XF86ConfigRec))) == NULL) {
+        return NULL;
+    }
+
+    while ((token = xf86getToken(TopLevelTab)) != EOF_TOKEN) {
+        switch (token) {
+        case COMMENT:
+            ptr->conf_comment = xf86addComment(ptr->conf_comment, val.str);
+            break;
+        case SECTION:
+            if (xf86getSubToken(&(ptr->conf_comment)) != STRING) {
+                xf86parseError(QUOTE_MSG, "Section");
+                CLEANUP(ptr);
+                return NULL;
+            }
+            xf86setSection(val.str);
+            if (xf86nameCompare(val.str, "files") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_RETURN(conf_files, xf86parseFilesSection());
+            }
+            else if (xf86nameCompare(val.str, "serverflags") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_RETURN(conf_flags, xf86parseFlagsSection());
+            }
+            else if (xf86nameCompare(val.str, "pointer") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_LIST(conf_input_lst, xf86parsePointerSection,
+                            XF86ConfInputPtr);
+            }
+            else if (xf86nameCompare(val.str, "videoadaptor") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_LIST(conf_videoadaptor_lst, xf86parseVideoAdaptorSection,
+                            XF86ConfVideoAdaptorPtr);
+            }
+            else if (xf86nameCompare(val.str, "device") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_LIST(conf_device_lst, xf86parseDeviceSection,
+                            XF86ConfDevicePtr);
+            }
+            else if (xf86nameCompare(val.str, "monitor") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_LIST(conf_monitor_lst, xf86parseMonitorSection,
+                            XF86ConfMonitorPtr);
+            }
+            else if (xf86nameCompare(val.str, "modes") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_LIST(conf_modes_lst, xf86parseModesSection,
+                            XF86ConfModesPtr);
+            }
+            else if (xf86nameCompare(val.str, "screen") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_LIST(conf_screen_lst, xf86parseScreenSection,
+                            XF86ConfScreenPtr);
+            }
+            else if (xf86nameCompare(val.str, "inputdevice") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_LIST(conf_input_lst, xf86parseInputSection,
+                            XF86ConfInputPtr);
+            }
+            else if (xf86nameCompare(val.str, "inputclass") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_LIST(conf_inputclass_lst,
+                            xf86parseInputClassSection, XF86ConfInputClassPtr);
+            }
+            else if (xf86nameCompare(val.str, "module") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_RETURN(conf_modules, xf86parseModuleSection());
+            }
+            else if (xf86nameCompare(val.str, "serverlayout") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_LIST(conf_layout_lst, xf86parseLayoutSection,
+                            XF86ConfLayoutPtr);
+            }
+            else if (xf86nameCompare(val.str, "vendor") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_LIST(conf_vendor_lst, xf86parseVendorSection,
+                            XF86ConfVendorPtr);
+            }
+            else if (xf86nameCompare(val.str, "dri") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_RETURN(conf_dri, xf86parseDRISection());
+            }
+            else if (xf86nameCompare(val.str, "extensions") == 0) {
+                free(val.str);
+                val.str = NULL;
+                HANDLE_RETURN(conf_extensions, xf86parseExtensionsSection());
+            }
+            else {
+                free(val.str);
+                val.str = NULL;
+                Error(INVALID_SECTION_MSG, xf86tokenString());
+            }
+            break;
+        default:
+            free(val.str);
+            val.str = NULL;
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+        }
+    }
+
+    if (xf86validateConfig(ptr))
+        return ptr;
+    else {
+        CLEANUP(ptr);
+        return NULL;
+    }
+}
+
+#undef CLEANUP
+
+/* 
+ * adds an item to the end of the linked list. Any record whose first field
+ * is a GenericListRec can be cast to this type and used with this function.
+ * A pointer to the head of the list is returned to handle the addition of
+ * the first item.
+ */
+GenericListPtr
+xf86addListItem(GenericListPtr head, GenericListPtr new)
+{
+    GenericListPtr p = head;
+    GenericListPtr last = NULL;
+
+    while (p) {
+        last = p;
+        p = p->next;
+    }
+
+    if (last) {
+        last->next = new;
+        return head;
+    }
+    else
+        return new;
+}
+
+/* 
+ * Test if one chained list contains the other.
+ * In this case both list have the same endpoint (provided they don't loop)
+ */
+int
+xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2)
+{
+    GenericListPtr p = list_1;
+    GenericListPtr last_1 = NULL, last_2 = NULL;
+
+    while (p) {
+        last_1 = p;
+        p = p->next;
+    }
+
+    p = list_2;
+    while (p) {
+        last_2 = p;
+        p = p->next;
+    }
+
+    return (!(last_1 == last_2));
+}
+
+void
+xf86freeConfig(XF86ConfigPtr p)
+{
+    if (p == NULL)
+        return;
+
+    xf86freeFiles(p->conf_files);
+    xf86freeModules(p->conf_modules);
+    xf86freeFlags(p->conf_flags);
+    xf86freeMonitorList(p->conf_monitor_lst);
+    xf86freeModesList(p->conf_modes_lst);
+    xf86freeVideoAdaptorList(p->conf_videoadaptor_lst);
+    xf86freeDeviceList(p->conf_device_lst);
+    xf86freeScreenList(p->conf_screen_lst);
+    xf86freeLayoutList(p->conf_layout_lst);
+    xf86freeInputList(p->conf_input_lst);
+    xf86freeVendorList(p->conf_vendor_lst);
+    xf86freeDRI(p->conf_dri);
+    xf86freeExtensions(p->conf_extensions);
+    TestFree(p->conf_comment);
+
+    free(p);
+}
diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c
index 156bc299a..795da615f 100644
--- a/xorg-server/hw/xfree86/parser/scan.c
+++ b/xorg-server/hw/xfree86/parser/scan.c
@@ -51,7 +51,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -75,11 +74,11 @@
 #define _POSIX_SOURCE
 #include <limits.h>
 #undef _POSIX_SOURCE
-#endif /* _POSIX_SOURCE */
+#endif                          /* _POSIX_SOURCE */
 
 #if !defined(MAXHOSTNAMELEN)
 #define MAXHOSTNAMELEN 32
-#endif /* !MAXHOSTNAMELEN */
+#endif                          /* !MAXHOSTNAMELEN */
 
 /* For PATH_MAX */
 #include "misc.h"
@@ -90,22 +89,22 @@
 #define CONFIG_BUF_LEN     1024
 #define CONFIG_MAX_FILES   64
 
-static int StringToToken (const char *, xf86ConfigSymTabRec *);
+static int StringToToken(const char *, xf86ConfigSymTabRec *);
 
 static struct {
-	FILE *file;
-	char *path;
+    FILE *file;
+    char *path;
 } configFiles[CONFIG_MAX_FILES];
 static const char **builtinConfig = NULL;
 static int builtinIndex = 0;
-static int configPos = 0;		/* current readers position */
-static int configLineNo = 0;	/* linenumber */
-static char *configBuf, *configRBuf;	/* buffer for lines */
-static char *configSection = NULL;	/* name of current section being parsed */
-static int numFiles = 0;		/* number of config files */
-static int curFileIndex = 0;		/* index of current config file */
+static int configPos = 0;       /* current readers position */
+static int configLineNo = 0;    /* linenumber */
+static char *configBuf, *configRBuf;    /* buffer for lines */
+static char *configSection = NULL;      /* name of current section being parsed */
+static int numFiles = 0;        /* number of config files */
+static int curFileIndex = 0;    /* index of current config file */
 static int pushToken = LOCK_TOKEN;
-static int eol_seen = 0;		/* private state to handle comments */
+static int eol_seen = 0;        /* private state to handle comments */
 LexRec val;
 
 /*
@@ -119,123 +118,129 @@ LexRec val;
  *  support that.
  */
 
-static char*
+static char *
 xf86getNextLine(void)
 {
-	static int configBufLen = CONFIG_BUF_LEN;
-	char *tmpConfigBuf, *tmpConfigRBuf;
-	int c, i, pos = 0, eolFound = 0;
-	char *ret = NULL;
+    static int configBufLen = CONFIG_BUF_LEN;
+    char *tmpConfigBuf, *tmpConfigRBuf;
+    int c, i, pos = 0, eolFound = 0;
+    char *ret = NULL;
 
-	/*
-	 * reallocate the string if it was grown last time (i.e., is no
-	 * longer CONFIG_BUF_LEN); we malloc the new strings first, so
-	 * that if either of the mallocs fail, we can fall back on the
-	 * existing buffer allocations
-	 */
+    /*
+     * reallocate the string if it was grown last time (i.e., is no
+     * longer CONFIG_BUF_LEN); we malloc the new strings first, so
+     * that if either of the mallocs fail, we can fall back on the
+     * existing buffer allocations
+     */
 
-	if (configBufLen != CONFIG_BUF_LEN) {
+    if (configBufLen != CONFIG_BUF_LEN) {
 
-		tmpConfigBuf = malloc(CONFIG_BUF_LEN);
-		tmpConfigRBuf = malloc(CONFIG_BUF_LEN);
+        tmpConfigBuf = malloc(CONFIG_BUF_LEN);
+        tmpConfigRBuf = malloc(CONFIG_BUF_LEN);
 
-		if (!tmpConfigBuf || !tmpConfigRBuf) {
+        if (!tmpConfigBuf || !tmpConfigRBuf) {
 
-			/*
-			 * at least one of the mallocs failed; keep the old buffers
-			 * and free any partial allocations
-			 */
+            /*
+             * at least one of the mallocs failed; keep the old buffers
+             * and free any partial allocations
+             */
 
-			free(tmpConfigBuf);
-			free(tmpConfigRBuf);
+            free(tmpConfigBuf);
+            free(tmpConfigRBuf);
 
-		} else {
+        }
+        else {
 
-			/*
-			 * malloc succeeded; free the old buffers and use the new
-			 * buffers
-			 */
+            /*
+             * malloc succeeded; free the old buffers and use the new
+             * buffers
+             */
 
-			configBufLen = CONFIG_BUF_LEN;
+            configBufLen = CONFIG_BUF_LEN;
 
-			free(configBuf);
-			free(configRBuf);
+            free(configBuf);
+            free(configRBuf);
 
-			configBuf = tmpConfigBuf;
-			configRBuf = tmpConfigRBuf;
-		}
-	}
+            configBuf = tmpConfigBuf;
+            configRBuf = tmpConfigRBuf;
+        }
+    }
 
-	/* read in another block of chars */
+    /* read in another block of chars */
 
-	do {
-		ret = fgets(configBuf + pos, configBufLen - pos - 1,
-			    configFiles[curFileIndex].file);
+    do {
+        ret = fgets(configBuf + pos, configBufLen - pos - 1,
+                    configFiles[curFileIndex].file);
 
-		if (!ret) {
-			/*
-			 * if the file doesn't end in a newline, add one
-			 * and trigger another read
-			 */
-			if (pos != 0) {
-				strcpy(&configBuf[pos], "\n");
-				ret = configBuf;
-			} else
-				break;
-		}
+        if (!ret) {
+            /*
+             * if the file doesn't end in a newline, add one
+             * and trigger another read
+             */
+            if (pos != 0) {
+                strcpy(&configBuf[pos], "\n");
+                ret = configBuf;
+            }
+            else
+                break;
+        }
 
-		/* search for EOL in the new block of chars */
+        /* search for EOL in the new block of chars */
 
-		for (i = pos; i < (configBufLen - 1); i++) {
-			c = configBuf[i];
+        for (i = pos; i < (configBufLen - 1); i++) {
+            c = configBuf[i];
 
-			if (c == '\0') break;
+            if (c == '\0')
+                break;
 
-			if ((c == '\n') || (c == '\r')) {
-				eolFound = 1;
-				break;
-			}
-		}
+            if ((c == '\n') || (c == '\r')) {
+                eolFound = 1;
+                break;
+            }
+        }
 
-		/*
-		 * if we didn't find EOL, then grow the string and
-		 * read in more
-		 */
+        /*
+         * if we didn't find EOL, then grow the string and
+         * read in more
+         */
 
-		if (!eolFound) {
+        if (!eolFound) {
 
-			tmpConfigBuf = realloc(configBuf, configBufLen + CONFIG_BUF_LEN);
-			tmpConfigRBuf = realloc(configRBuf, configBufLen + CONFIG_BUF_LEN);
+            tmpConfigBuf = realloc(configBuf, configBufLen + CONFIG_BUF_LEN);
+            tmpConfigRBuf = realloc(configRBuf, configBufLen + CONFIG_BUF_LEN);
 
-			if (!tmpConfigBuf || !tmpConfigRBuf) {
+            if (!tmpConfigBuf || !tmpConfigRBuf) {
 
-				/*
-				 * at least one of the reallocations failed; use the
-				 * new allocation that succeeded, but we have to
-				 * fallback to the previous configBufLen size and use
-				 * the string we have, even though we don't have an
-				 * EOL
-				 */
+                /*
+                 * at least one of the reallocations failed; use the
+                 * new allocation that succeeded, but we have to
+                 * fallback to the previous configBufLen size and use
+                 * the string we have, even though we don't have an
+                 * EOL
+                 */
 
-				if (tmpConfigBuf) configBuf = tmpConfigBuf;
-				if (tmpConfigRBuf) configRBuf = tmpConfigRBuf;
+                if (tmpConfigBuf)
+                    configBuf = tmpConfigBuf;
+                if (tmpConfigRBuf)
+                    configRBuf = tmpConfigRBuf;
 
-				break;
+                break;
 
-			} else {
+            }
+            else {
 
-				/* reallocation succeeded */
+                /* reallocation succeeded */
 
-				configBuf = tmpConfigBuf;
-				configRBuf = tmpConfigRBuf;
-				pos = i;
-				configBufLen += CONFIG_BUF_LEN;
-			}
-		}
+                configBuf = tmpConfigBuf;
+                configRBuf = tmpConfigRBuf;
+                pos = i;
+                configBufLen += CONFIG_BUF_LEN;
+            }
+        }
 
-	} while (!eolFound);
+    } while (!eolFound);
 
-	return ret;
+    return ret;
 }
 
 /* 
@@ -244,295 +249,278 @@ xf86getNextLine(void)
  *      pushToken.
  */
 int
-xf86getToken (xf86ConfigSymTabRec * tab)
+xf86getToken(xf86ConfigSymTabRec * tab)
 {
-	int c, i;
-
-	/* 
-	 * First check whether pushToken has a different value than LOCK_TOKEN.
-	 * In this case rBuf[] contains a valid STRING/TOKEN/NUMBER. But in the
-	 * oth * case the next token must be read from the input.
-	 */
-	if (pushToken == EOF_TOKEN)
-		return EOF_TOKEN;
-	else if (pushToken == LOCK_TOKEN)
-	{
-		/*
-		 * eol_seen is only set for the first token after a newline.
-		 */
-		eol_seen = 0;
-
-		c = configBuf[configPos];
-
-		/* 
-		 * Get start of next Token. EOF is handled,
-		 * whitespaces are skipped. 
-		 */
-
-again:
-		if (!c)
-		{
-			char *ret;
-			if (numFiles > 0)
-				ret = xf86getNextLine();
-			else {
-				if (builtinConfig[builtinIndex] == NULL)
-					ret = NULL;
-				else {
-					strlcpy(configBuf,
-						builtinConfig[builtinIndex],
-						CONFIG_BUF_LEN);
-					ret = configBuf;
-					builtinIndex++;
-				}
-			}
-			if (ret == NULL)
-			{
-				/*
-				 * if necessary, move to the next file and
-				 * read the first line
-				 */
-				if (curFileIndex + 1 < numFiles) {
-					curFileIndex++;
-					configLineNo = 0;
-					goto again;
-				}
-				else
-					return pushToken = EOF_TOKEN;
-			}
-			configLineNo++;
-			configPos = 0;
-			eol_seen = 1;
-		}
-
-		i = 0;
-		for (;;) {
-			c = configBuf[configPos++];
-			configRBuf[i++] = c;
-			switch (c) {
-				case ' ':
-				case '\t':
-				case '\r':
-					continue;
-				case '\n':
-					i = 0;
-					continue;
-			}
-			break;
-		}
-		if (c == '\0')
-			goto again;
-
-		if (c == '#')
-		{
-			do
-			{
-				configRBuf[i++] = (c = configBuf[configPos++]);
-			}
-			while ((c != '\n') && (c != '\r') && (c != '\0'));
-			configRBuf[i] = '\0';
-			/* XXX no private copy.
-			 * Use xf86addComment when setting a comment.
-			 */
-			val.str = configRBuf;
-			return COMMENT;
-		}
-
-		/* GJA -- handle '-' and ','  * Be careful: "-hsync" is a keyword. */
-		else if ((c == ',') && !isalpha (configBuf[configPos]))
-		{
-			return COMMA;
-		}
-		else if ((c == '-') && !isalpha (configBuf[configPos]))
-		{
-			return DASH;
-		}
-
-		/* 
-		 * Numbers are returned immediately ...
-		 */
-		if (isdigit (c))
-		{
-			int base;
-
-			if (c == '0')
-				if ((configBuf[configPos] == 'x') ||
-					(configBuf[configPos] == 'X'))
-                                {
-					base = 16;
-                                        val.numType = PARSE_HEX;
-                                }
-				else
-                                {
-					base = 8;
-                                        val.numType = PARSE_OCTAL;
-                                }
-			else
-                        {
-				base = 10;
-                                val.numType = PARSE_DECIMAL;
-                        }
-
-			configRBuf[0] = c;
-			i = 1;
-			while (isdigit (c = configBuf[configPos++]) ||
-				   (c == '.') || (c == 'x') || (c == 'X') ||
-				   ((base == 16) && (((c >= 'a') && (c <= 'f')) ||
-									 ((c >= 'A') && (c <= 'F')))))
-				configRBuf[i++] = c;
-			configPos--;		/* GJA -- one too far */
-			configRBuf[i] = '\0';
-			val.num = strtoul (configRBuf, NULL, 0);
-			val.realnum = atof (configRBuf);
-			return NUMBER;
-		}
-
-		/* 
-		 * All Strings START with a \" ...
-		 */
-		else if (c == '\"')
-		{
-			i = -1;
-			do
-			{
-				configRBuf[++i] = (c = configBuf[configPos++]);
-			}
-			while ((c != '\"') && (c != '\n') && (c != '\r') && (c != '\0'));
-			configRBuf[i] = '\0';
-			val.str = malloc (strlen (configRBuf) + 1);
-			strcpy (val.str, configRBuf);	/* private copy ! */
-			return STRING;
-		}
-
-		/* 
-		 * ... and now we MUST have a valid token.  The search is
-		 * handled later along with the pushed tokens.
-		 */
-		else
-		{
-			configRBuf[0] = c;
-			i = 0;
-			do
-			{
-				configRBuf[++i] = (c = configBuf[configPos++]);
-			}
-			while ((c != ' ') && (c != '\t') && (c != '\n') && (c != '\r') && (c != '\0') && (c != '#'));
-			--configPos;
-			configRBuf[i] = '\0';
-			i = 0;
-		}
-
-	}
-	else
-	{
-
-		/* 
-		 * Here we deal with pushed tokens. Reinitialize pushToken again. If
-		 * the pushed token was NUMBER || STRING return them again ...
-		 */
-		int temp = pushToken;
-		pushToken = LOCK_TOKEN;
-
-		if (temp == COMMA || temp == DASH)
-			return temp;
-		if (temp == NUMBER || temp == STRING)
-			return temp;
-	}
-
-	/* 
-	 * Joop, at last we have to lookup the token ...
-	 */
-	if (tab)
-	{
-		i = 0;
-		while (tab[i].token != -1)
-			if (xf86nameCompare (configRBuf, tab[i].name) == 0)
-				return tab[i].token;
-			else
-				i++;
-	}
-
-	return ERROR_TOKEN;		/* Error catcher */
+    int c, i;
+
+    /* 
+     * First check whether pushToken has a different value than LOCK_TOKEN.
+     * In this case rBuf[] contains a valid STRING/TOKEN/NUMBER. But in the
+     * oth * case the next token must be read from the input.
+     */
+    if (pushToken == EOF_TOKEN)
+        return EOF_TOKEN;
+    else if (pushToken == LOCK_TOKEN) {
+        /*
+         * eol_seen is only set for the first token after a newline.
+         */
+        eol_seen = 0;
+
+        c = configBuf[configPos];
+
+        /* 
+         * Get start of next Token. EOF is handled,
+         * whitespaces are skipped. 
+         */
+
+ again:
+        if (!c) {
+            char *ret;
+
+            if (numFiles > 0)
+                ret = xf86getNextLine();
+            else {
+                if (builtinConfig[builtinIndex] == NULL)
+                    ret = NULL;
+                else {
+                    strlcpy(configBuf,
+                            builtinConfig[builtinIndex], CONFIG_BUF_LEN);
+                    ret = configBuf;
+                    builtinIndex++;
+                }
+            }
+            if (ret == NULL) {
+                /*
+                 * if necessary, move to the next file and
+                 * read the first line
+                 */
+                if (curFileIndex + 1 < numFiles) {
+                    curFileIndex++;
+                    configLineNo = 0;
+                    goto again;
+                }
+                else
+                    return pushToken = EOF_TOKEN;
+            }
+            configLineNo++;
+            configPos = 0;
+            eol_seen = 1;
+        }
+
+        i = 0;
+        for (;;) {
+            c = configBuf[configPos++];
+            configRBuf[i++] = c;
+            switch (c) {
+            case ' ':
+            case '\t':
+            case '\r':
+                continue;
+            case '\n':
+                i = 0;
+                continue;
+            }
+            break;
+        }
+        if (c == '\0')
+            goto again;
+
+        if (c == '#') {
+            do {
+                configRBuf[i++] = (c = configBuf[configPos++]);
+            }
+            while ((c != '\n') && (c != '\r') && (c != '\0'));
+            configRBuf[i] = '\0';
+            /* XXX no private copy.
+             * Use xf86addComment when setting a comment.
+             */
+            val.str = configRBuf;
+            return COMMENT;
+        }
+
+        /* GJA -- handle '-' and ','  * Be careful: "-hsync" is a keyword. */
+        else if ((c == ',') && !isalpha(configBuf[configPos])) {
+            return COMMA;
+        }
+        else if ((c == '-') && !isalpha(configBuf[configPos])) {
+            return DASH;
+        }
+
+        /* 
+         * Numbers are returned immediately ...
+         */
+        if (isdigit(c)) {
+            int base;
+
+            if (c == '0')
+                if ((configBuf[configPos] == 'x') ||
+                    (configBuf[configPos] == 'X')) {
+                    base = 16;
+                    val.numType = PARSE_HEX;
+                }
+                else {
+                    base = 8;
+                    val.numType = PARSE_OCTAL;
+                }
+            else {
+                base = 10;
+                val.numType = PARSE_DECIMAL;
+            }
+
+            configRBuf[0] = c;
+            i = 1;
+            while (isdigit(c = configBuf[configPos++]) ||
+                   (c == '.') || (c == 'x') || (c == 'X') ||
+                   ((base == 16) && (((c >= 'a') && (c <= 'f')) ||
+                                     ((c >= 'A') && (c <= 'F')))))
+                configRBuf[i++] = c;
+            configPos--;        /* GJA -- one too far */
+            configRBuf[i] = '\0';
+            val.num = strtoul(configRBuf, NULL, 0);
+            val.realnum = atof(configRBuf);
+            return NUMBER;
+        }
+
+        /* 
+         * All Strings START with a \" ...
+         */
+        else if (c == '\"') {
+            i = -1;
+            do {
+                configRBuf[++i] = (c = configBuf[configPos++]);
+            }
+            while ((c != '\"') && (c != '\n') && (c != '\r') && (c != '\0'));
+            configRBuf[i] = '\0';
+            val.str = malloc(strlen(configRBuf) + 1);
+            strcpy(val.str, configRBuf);        /* private copy ! */
+            return STRING;
+        }
+
+        /* 
+         * ... and now we MUST have a valid token.  The search is
+         * handled later along with the pushed tokens.
+         */
+        else {
+            configRBuf[0] = c;
+            i = 0;
+            do {
+                configRBuf[++i] = (c = configBuf[configPos++]);
+            }
+            while ((c != ' ') && (c != '\t') && (c != '\n') && (c != '\r') &&
+                   (c != '\0') && (c != '#'));
+            --configPos;
+            configRBuf[i] = '\0';
+            i = 0;
+        }
+
+    }
+    else {
+
+        /* 
+         * Here we deal with pushed tokens. Reinitialize pushToken again. If
+         * the pushed token was NUMBER || STRING return them again ...
+         */
+        int temp = pushToken;
+
+        pushToken = LOCK_TOKEN;
+
+        if (temp == COMMA || temp == DASH)
+            return temp;
+        if (temp == NUMBER || temp == STRING)
+            return temp;
+    }
+
+    /* 
+     * Joop, at last we have to lookup the token ...
+     */
+    if (tab) {
+        i = 0;
+        while (tab[i].token != -1)
+            if (xf86nameCompare(configRBuf, tab[i].name) == 0)
+                return tab[i].token;
+            else
+                i++;
+    }
+
+    return ERROR_TOKEN;         /* Error catcher */
 }
 
 int
-xf86getSubToken (char **comment)
+xf86getSubToken(char **comment)
 {
-	int token;
-
-	for (;;) {
-		token = xf86getToken(NULL);
-		if (token == COMMENT) {
-			if (comment)
-				*comment = xf86addComment(*comment, val.str);
-		}
-		else
-			return token;
-	}
-	/*NOTREACHED*/
-}
+    int token;
+
+    for (;;) {
+        token = xf86getToken(NULL);
+        if (token == COMMENT) {
+            if (comment)
+                *comment = xf86addComment(*comment, val.str);
+        }
+        else
+            return token;
+    }
+ /*NOTREACHED*/}
 
 int
-xf86getSubTokenWithTab (char **comment, xf86ConfigSymTabRec *tab)
+xf86getSubTokenWithTab(char **comment, xf86ConfigSymTabRec * tab)
 {
-	int token;
-
-	for (;;) {
-		token = xf86getToken(tab);
-		if (token == COMMENT) {
-			if (comment)
-				*comment = xf86addComment(*comment, val.str);
-		}
-		else
-			return token;
-	}
-	/*NOTREACHED*/
-}
+    int token;
+
+    for (;;) {
+        token = xf86getToken(tab);
+        if (token == COMMENT) {
+            if (comment)
+                *comment = xf86addComment(*comment, val.str);
+        }
+        else
+            return token;
+    }
+ /*NOTREACHED*/}
 
 void
-xf86unGetToken (int token)
+xf86unGetToken(int token)
 {
-	pushToken = token;
+    pushToken = token;
 }
 
 char *
-xf86tokenString (void)
+xf86tokenString(void)
 {
-	return configRBuf;
+    return configRBuf;
 }
 
 int
 xf86pathIsAbsolute(const char *path)
 {
-	if (path && path[0] == '/')
-		return 1;
-	return 0;
+    if (path && path[0] == '/')
+        return 1;
+    return 0;
 }
 
 /* A path is "safe" if it is relative and if it contains no ".." elements. */
 int
 xf86pathIsSafe(const char *path)
 {
-	if (xf86pathIsAbsolute(path))
-		return 0;
+    if (xf86pathIsAbsolute(path))
+        return 0;
 
-	/* Compare with ".." */
-	if (!strcmp(path, ".."))
-		return 0;
+    /* Compare with ".." */
+    if (!strcmp(path, ".."))
+        return 0;
 
-	/* Look for leading "../" */
-	if (!strncmp(path, "../", 3))
-		return 0;
+    /* Look for leading "../" */
+    if (!strncmp(path, "../", 3))
+        return 0;
 
-	/* Look for trailing "/.." */
-	if ((strlen(path) > 3) && !strcmp(path + strlen(path) - 3, "/.."))
-		return 0;
+    /* Look for trailing "/.." */
+    if ((strlen(path) > 3) && !strcmp(path + strlen(path) - 3, "/.."))
+        return 0;
 
-	/* Look for "/../" */
-	if (strstr(path, "/../"))
-		return 0;
+    /* Look for "/../" */
+    if (strstr(path, "/../"))
+        return 0;
 
-	return 1;
+    return 1;
 }
 
 /*
@@ -596,129 +584,136 @@ xf86pathIsSafe(const char *path)
 
 static char *
 DoSubstitution(const char *template, const char *cmdline, const char *projroot,
-				int *cmdlineUsed, int *envUsed,
-				const char *XConfigFile)
+               int *cmdlineUsed, int *envUsed, const char *XConfigFile)
 {
-	char *result;
-	int i, l;
-	static const char *env = NULL;
-	static char *hostname = NULL;
-
-	if (!template)
-		return NULL;
-
-	if (cmdlineUsed)
-		*cmdlineUsed = 0;
-	if (envUsed)
-		*envUsed = 0;
-
-	result = malloc(PATH_MAX + 1);
-	l = 0;
-	for (i = 0; template[i]; i++) {
-		if (template[i] != '%') {
-			result[l++] = template[i];
-			CHECK_LENGTH;
-		} else {
-			switch (template[++i]) {
-			case 'A':
-				if (cmdline && xf86pathIsAbsolute(cmdline)) {
-					APPEND_STR(cmdline);
-					if (cmdlineUsed)
-						*cmdlineUsed = 1;
-				} else
-					BAIL_OUT;
-				break;
-			case 'R':
-				if (cmdline && !xf86pathIsAbsolute(cmdline)) {
-					APPEND_STR(cmdline);
-					if (cmdlineUsed)
-						*cmdlineUsed = 1;
-				} else 
-					BAIL_OUT;
-				break;
-			case 'S':
-				if (cmdline && xf86pathIsSafe(cmdline)) {
-					APPEND_STR(cmdline);
-					if (cmdlineUsed)
-						*cmdlineUsed = 1;
-				} else 
-					BAIL_OUT;
-				break;
-			case 'X':
-				APPEND_STR(XConfigFile);
-				break;
-			case 'H':
-				if (!hostname) {
-					if ((hostname = malloc(MAXHOSTNAMELEN + 1))) {
-						if (gethostname(hostname, MAXHOSTNAMELEN) == 0) {
-							hostname[MAXHOSTNAMELEN] = '\0';
-						} else {
-							free(hostname);
-							hostname = NULL;
-						}
-					}
-				}
-				if (hostname)
-					APPEND_STR(hostname);
-				break;
-			case 'E':
-				if (!env)
-					env = getenv(XCONFENV);
-				if (env && xf86pathIsAbsolute(env)) {
-					APPEND_STR(env);
-					if (envUsed)
-						*envUsed = 1;
-				} else
-					BAIL_OUT;
-				break;
-			case 'F':
-				if (!env)
-					env = getenv(XCONFENV);
-				if (env && !xf86pathIsAbsolute(env)) {
-					APPEND_STR(env);
-					if (envUsed)
-						*envUsed = 1;
-				} else
-					BAIL_OUT;
-				break;
-			case 'G':
-				if (!env)
-					env = getenv(XCONFENV);
-				if (env && xf86pathIsSafe(env)) {
-					APPEND_STR(env);
-					if (envUsed)
-						*envUsed = 1;
-				} else
-					BAIL_OUT;
-				break;
-			case 'P':
-				if (projroot && xf86pathIsAbsolute(projroot))
-					APPEND_STR(projroot);
-				else
-					BAIL_OUT;
-				break;
-			case 'C':
-				APPEND_STR(SYSCONFDIR);
-				break;
-			case 'D':
-				APPEND_STR(DATADIR);
-				break;
-			case '%':
-				result[l++] = '%';
-				CHECK_LENGTH;
-				break;
-			default:
-				fprintf(stderr, "invalid escape %%%c found in path template\n",
-						template[i]);
-				BAIL_OUT;
-				break;
-			}
-		}
-	}
+    char *result;
+    int i, l;
+    static const char *env = NULL;
+    static char *hostname = NULL;
+
+    if (!template)
+        return NULL;
+
+    if (cmdlineUsed)
+        *cmdlineUsed = 0;
+    if (envUsed)
+        *envUsed = 0;
+
+    result = malloc(PATH_MAX + 1);
+    l = 0;
+    for (i = 0; template[i]; i++) {
+        if (template[i] != '%') {
+            result[l++] = template[i];
+            CHECK_LENGTH;
+        }
+        else {
+            switch (template[++i]) {
+            case 'A':
+                if (cmdline && xf86pathIsAbsolute(cmdline)) {
+                    APPEND_STR(cmdline);
+                    if (cmdlineUsed)
+                        *cmdlineUsed = 1;
+                }
+                else
+                    BAIL_OUT;
+                break;
+            case 'R':
+                if (cmdline && !xf86pathIsAbsolute(cmdline)) {
+                    APPEND_STR(cmdline);
+                    if (cmdlineUsed)
+                        *cmdlineUsed = 1;
+                }
+                else
+                    BAIL_OUT;
+                break;
+            case 'S':
+                if (cmdline && xf86pathIsSafe(cmdline)) {
+                    APPEND_STR(cmdline);
+                    if (cmdlineUsed)
+                        *cmdlineUsed = 1;
+                }
+                else
+                    BAIL_OUT;
+                break;
+            case 'X':
+                APPEND_STR(XConfigFile);
+                break;
+            case 'H':
+                if (!hostname) {
+                    if ((hostname = malloc(MAXHOSTNAMELEN + 1))) {
+                        if (gethostname(hostname, MAXHOSTNAMELEN) == 0) {
+                            hostname[MAXHOSTNAMELEN] = '\0';
+                        }
+                        else {
+                            free(hostname);
+                            hostname = NULL;
+                        }
+                    }
+                }
+                if (hostname)
+                    APPEND_STR(hostname);
+                break;
+            case 'E':
+                if (!env)
+                    env = getenv(XCONFENV);
+                if (env && xf86pathIsAbsolute(env)) {
+                    APPEND_STR(env);
+                    if (envUsed)
+                        *envUsed = 1;
+                }
+                else
+                    BAIL_OUT;
+                break;
+            case 'F':
+                if (!env)
+                    env = getenv(XCONFENV);
+                if (env && !xf86pathIsAbsolute(env)) {
+                    APPEND_STR(env);
+                    if (envUsed)
+                        *envUsed = 1;
+                }
+                else
+                    BAIL_OUT;
+                break;
+            case 'G':
+                if (!env)
+                    env = getenv(XCONFENV);
+                if (env && xf86pathIsSafe(env)) {
+                    APPEND_STR(env);
+                    if (envUsed)
+                        *envUsed = 1;
+                }
+                else
+                    BAIL_OUT;
+                break;
+            case 'P':
+                if (projroot && xf86pathIsAbsolute(projroot))
+                    APPEND_STR(projroot);
+                else
+                    BAIL_OUT;
+                break;
+            case 'C':
+                APPEND_STR(SYSCONFDIR);
+                break;
+            case 'D':
+                APPEND_STR(DATADIR);
+                break;
+            case '%':
+                result[l++] = '%';
+                CHECK_LENGTH;
+                break;
+            default:
+                fprintf(stderr, "invalid escape %%%c found in path template\n",
+                        template[i]);
+                BAIL_OUT;
+                break;
+            }
+        }
+    }
 #ifdef DEBUG
-	fprintf(stderr, "Converted `%s' to `%s'\n", template, result);
+    fprintf(stderr, "Converted `%s' to `%s'\n", template, result);
 #endif
-	return result;
+    return result;
 }
 
 /*
@@ -726,40 +721,40 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot,
  */
 static char *
 OpenConfigFile(const char *path, const char *cmdline, const char *projroot,
-	       const char *confname)
+               const char *confname)
 {
-	char *filepath = NULL;
-	char *pathcopy;
-	const char *template;
-	int cmdlineUsed = 0;
-	FILE *file = NULL;
-
-	pathcopy = strdup(path);
-	for (template = strtok(pathcopy, ","); template && !file;
-	     template = strtok(NULL, ",")) {
-		filepath = DoSubstitution(template, cmdline, projroot,
-					  &cmdlineUsed, NULL, confname);
-		if (!filepath)
-			continue;
-		if (cmdline && !cmdlineUsed) {
-			free(filepath);
-			filepath = NULL;
-			continue;
-		}
-		file = fopen(filepath, "r");
-		if (!file) {
-			free(filepath);
-			filepath = NULL;
-		}
-	}
-
-	free(pathcopy);
-	if (file) {
-		configFiles[numFiles].file = file;
-		configFiles[numFiles].path = strdup(filepath);
-		numFiles++;
-	}
-	return filepath;
+    char *filepath = NULL;
+    char *pathcopy;
+    const char *template;
+    int cmdlineUsed = 0;
+    FILE *file = NULL;
+
+    pathcopy = strdup(path);
+    for (template = strtok(pathcopy, ","); template && !file;
+         template = strtok(NULL, ",")) {
+        filepath = DoSubstitution(template, cmdline, projroot,
+                                  &cmdlineUsed, NULL, confname);
+        if (!filepath)
+            continue;
+        if (cmdline && !cmdlineUsed) {
+            free(filepath);
+            filepath = NULL;
+            continue;
+        }
+        file = fopen(filepath, "r");
+        if (!file) {
+            free(filepath);
+            filepath = NULL;
+        }
+    }
+
+    free(pathcopy);
+    if (file) {
+        configFiles[numFiles].file = file;
+        configFiles[numFiles].path = strdup(filepath);
+        numFiles++;
+    }
+    return filepath;
 }
 
 /*
@@ -769,56 +764,54 @@ OpenConfigFile(const char *path, const char *cmdline, const char *projroot,
 static int
 ConfigFilter(const struct dirent *de)
 {
-	const char *name = de->d_name;
-	size_t len;
-	size_t suflen = strlen(XCONFIGSUFFIX);
-
-	if (!name || name[0] == '.')
-		return 0;
-	len = strlen(name);
-	if(len <= suflen)
-		return 0;
-	if (strcmp(&name[len-suflen], XCONFIGSUFFIX) != 0)
-		return 0;
-	return 1;
+    const char *name = de->d_name;
+    size_t len;
+    size_t suflen = strlen(XCONFIGSUFFIX);
+
+    if (!name || name[0] == '.')
+        return 0;
+    len = strlen(name);
+    if (len <= suflen)
+        return 0;
+    if (strcmp(&name[len - suflen], XCONFIGSUFFIX) != 0)
+        return 0;
+    return 1;
 }
 
 static Bool
 AddConfigDirFiles(const char *dirpath, struct dirent **list, int num)
 {
-	int i;
-	Bool openedFile = FALSE;
-	Bool warnOnce = FALSE;
-
-	for (i = 0; i < num; i++) {
-		char *path;
-		FILE *file;
-
-		if (numFiles >= CONFIG_MAX_FILES) {
-			if (!warnOnce) {
-				ErrorF("Maximum number of configuration "
-				       "files opened\n");
-				warnOnce = TRUE;
-			}
-			continue;
-		}
-
-		path = malloc(PATH_MAX + 1);
-		snprintf(path, PATH_MAX + 1, "%s/%s", dirpath,
-			 list[i]->d_name);
-		file = fopen(path, "r");
-		if (!file) {
-			free(path);
-			continue;
-		}
-		openedFile = TRUE;
-
-		configFiles[numFiles].file = file;
-		configFiles[numFiles].path = path;
-		numFiles++;
-	}
-
-	return openedFile;
+    int i;
+    Bool openedFile = FALSE;
+    Bool warnOnce = FALSE;
+
+    for (i = 0; i < num; i++) {
+        char *path;
+        FILE *file;
+
+        if (numFiles >= CONFIG_MAX_FILES) {
+            if (!warnOnce) {
+                ErrorF("Maximum number of configuration " "files opened\n");
+                warnOnce = TRUE;
+            }
+            continue;
+        }
+
+        path = malloc(PATH_MAX + 1);
+        snprintf(path, PATH_MAX + 1, "%s/%s", dirpath, list[i]->d_name);
+        file = fopen(path, "r");
+        if (!file) {
+            free(path);
+            continue;
+        }
+        openedFile = TRUE;
+
+        configFiles[numFiles].file = file;
+        configFiles[numFiles].path = path;
+        numFiles++;
+    }
+
+    return openedFile;
 }
 
 /*
@@ -827,47 +820,47 @@ AddConfigDirFiles(const char *dirpath, struct dirent **list, int num)
  */
 static char *
 OpenConfigDir(const char *path, const char *cmdline, const char *projroot,
-	      const char *confname)
+              const char *confname)
 {
-	char *dirpath, *pathcopy;
-	const char *template;
-	Bool found = FALSE;
-	int cmdlineUsed = 0;
-
-	pathcopy = strdup(path);
-	for (template = strtok(pathcopy, ","); template && !found;
-	     template = strtok(NULL, ",")) {
-		struct dirent **list = NULL;
-		int num;
-
-		dirpath = DoSubstitution(template, cmdline, projroot,
-					 &cmdlineUsed, NULL, confname);
-		if (!dirpath)
-			continue;
-		if (cmdline && !cmdlineUsed) {
-			free(dirpath);
-			dirpath = NULL;
-			continue;
-		}
-
-		/* match files named *.conf */
-		num = scandir(dirpath, &list, ConfigFilter, alphasort);
-		if (num < 0) {
-			list = NULL;
-			num = 0;
-		}
-		found = AddConfigDirFiles(dirpath, list, num);
-		if (!found) {
-			free(dirpath);
-			dirpath = NULL;
-		}
-		while (num--)
-			free(list[num]);
-		free(list);
-	}
-
-	free(pathcopy);
-	return dirpath;
+    char *dirpath, *pathcopy;
+    const char *template;
+    Bool found = FALSE;
+    int cmdlineUsed = 0;
+
+    pathcopy = strdup(path);
+    for (template = strtok(pathcopy, ","); template && !found;
+         template = strtok(NULL, ",")) {
+        struct dirent **list = NULL;
+        int num;
+
+        dirpath = DoSubstitution(template, cmdline, projroot,
+                                 &cmdlineUsed, NULL, confname);
+        if (!dirpath)
+            continue;
+        if (cmdline && !cmdlineUsed) {
+            free(dirpath);
+            dirpath = NULL;
+            continue;
+        }
+
+        /* match files named *.conf */
+        num = scandir(dirpath, &list, ConfigFilter, alphasort);
+        if (num < 0) {
+            list = NULL;
+            num = 0;
+        }
+        found = AddConfigDirFiles(dirpath, list, num);
+        if (!found) {
+            free(dirpath);
+            dirpath = NULL;
+        }
+        while (num--)
+            free(list[num]);
+        free(list);
+    }
+
+    free(pathcopy);
+    return dirpath;
 }
 
 /*
@@ -876,14 +869,14 @@ OpenConfigDir(const char *path, const char *cmdline, const char *projroot,
 void
 xf86initConfigFiles(void)
 {
-	curFileIndex = 0;
-	configPos = 0;
-	configLineNo = 0;
-	pushToken = LOCK_TOKEN;
-
-	configBuf = malloc(CONFIG_BUF_LEN);
-	configRBuf = malloc(CONFIG_BUF_LEN);
-	configBuf[0] = '\0';	/* sanity ... */
+    curFileIndex = 0;
+    configPos = 0;
+    configLineNo = 0;
+    pushToken = LOCK_TOKEN;
+
+    configBuf = malloc(CONFIG_BUF_LEN);
+    configRBuf = malloc(CONFIG_BUF_LEN);
+    configBuf[0] = '\0';        /* sanity ... */
 }
 
 /*
@@ -922,13 +915,13 @@ xf86initConfigFiles(void)
 char *
 xf86openConfigFile(const char *path, const char *cmdline, const char *projroot)
 {
-	if (!path || !path[0])
-		path = DEFAULT_CONF_PATH;
-	if (!projroot || !projroot[0])
-		projroot = PROJECTROOT;
+    if (!path || !path[0])
+        path = DEFAULT_CONF_PATH;
+    if (!projroot || !projroot[0])
+        projroot = PROJECTROOT;
 
-	/* Search for a config file */
-	return OpenConfigFile(path, cmdline, projroot, XCONFIGFILE);
+    /* Search for a config file */
+    return OpenConfigFile(path, cmdline, projroot, XCONFIGFILE);
 }
 
 /*
@@ -949,82 +942,82 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot)
  */
 char *
 xf86openConfigDirFiles(const char *path, const char *cmdline,
-		       const char *projroot)
+                       const char *projroot)
 {
-	if (!path || !path[0])
-		path = DEFAULT_CONF_PATH;
-	if (!projroot || !projroot[0])
-		projroot = PROJECTROOT;
+    if (!path || !path[0])
+        path = DEFAULT_CONF_PATH;
+    if (!projroot || !projroot[0])
+        projroot = PROJECTROOT;
 
-	/* Search for the multiconf directory */
-	return OpenConfigDir(path, cmdline, projroot, XCONFIGDIR);
+    /* Search for the multiconf directory */
+    return OpenConfigDir(path, cmdline, projroot, XCONFIGDIR);
 }
 
 void
-xf86closeConfigFile (void)
+xf86closeConfigFile(void)
 {
-	int i;
-
-	free (configRBuf);
-	configRBuf = NULL;
-	free (configBuf);
-	configBuf = NULL;
-
-	if (numFiles == 0) {
-		builtinConfig = NULL;
-		builtinIndex = 0;
-	}
-	for (i = 0; i < numFiles; i++) {
-		fclose(configFiles[i].file);
-		configFiles[i].file = NULL;
-		free(configFiles[i].path);
-		configFiles[i].path = NULL;
-	}
-	numFiles = 0;
+    int i;
+
+    free(configRBuf);
+    configRBuf = NULL;
+    free(configBuf);
+    configBuf = NULL;
+
+    if (numFiles == 0) {
+        builtinConfig = NULL;
+        builtinIndex = 0;
+    }
+    for (i = 0; i < numFiles; i++) {
+        fclose(configFiles[i].file);
+        configFiles[i].file = NULL;
+        free(configFiles[i].path);
+        configFiles[i].path = NULL;
+    }
+    numFiles = 0;
 }
 
 void
 xf86setBuiltinConfig(const char *config[])
 {
-	builtinConfig = config;
+    builtinConfig = config;
 }
 
 void
-xf86parseError (const char *format,...)
+xf86parseError(const char *format, ...)
 {
-	va_list ap;
-	const char *filename = numFiles ? configFiles[curFileIndex].path
-					: "<builtin configuration>";
+    va_list ap;
+    const char *filename = numFiles ? configFiles[curFileIndex].path
+        : "<builtin configuration>";
 
-	ErrorF ("Parse error on line %d of section %s in file %s\n\t",
-		 configLineNo, configSection, filename);
-	va_start (ap, format);
-	VErrorF (format, ap);
-	va_end (ap);
+    ErrorF("Parse error on line %d of section %s in file %s\n\t",
+           configLineNo, configSection, filename);
+    va_start(ap, format);
+    VErrorF(format, ap);
+    va_end(ap);
 
-	ErrorF ("\n");
+    ErrorF("\n");
 }
 
 void
-xf86validationError (const char *format,...)
+xf86validationError(const char *format, ...)
 {
-	va_list ap;
-	const char *filename = numFiles ? configFiles[curFileIndex].path
-					: "<builtin configuration>";
+    va_list ap;
+    const char *filename = numFiles ? configFiles[curFileIndex].path
+        : "<builtin configuration>";
 
-	ErrorF ("Data incomplete in file %s\n\t", filename);
-	va_start (ap, format);
-	VErrorF (format, ap);
-	va_end (ap);
+    ErrorF("Data incomplete in file %s\n\t", filename);
+    va_start(ap, format);
+    VErrorF(format, ap);
+    va_end(ap);
 
-	ErrorF ("\n");
+    ErrorF("\n");
 }
 
 void
-xf86setSection (const char *section)
+xf86setSection(const char *section)
 {
-	free(configSection);
-	configSection = strdup(section);
+    free(configSection);
+    configSection = strdup(section);
 }
 
 /* 
@@ -1032,145 +1025,143 @@ xf86setSection (const char *section)
  *  Lookup a string if it is actually a token in disguise.
  */
 int
-xf86getStringToken (xf86ConfigSymTabRec * tab)
+xf86getStringToken(xf86ConfigSymTabRec * tab)
 {
-	return StringToToken (val.str, tab);
+    return StringToToken(val.str, tab);
 }
 
 static int
-StringToToken (const char *str, xf86ConfigSymTabRec * tab)
+StringToToken(const char *str, xf86ConfigSymTabRec * tab)
 {
-	int i;
-
-	for (i = 0; tab[i].token != -1; i++)
-	{
-		if (!xf86nameCompare (tab[i].name, str))
-			return tab[i].token;
-	}
-	return ERROR_TOKEN;
-}
+    int i;
 
+    for (i = 0; tab[i].token != -1; i++) {
+        if (!xf86nameCompare(tab[i].name, str))
+            return tab[i].token;
+    }
+    return ERROR_TOKEN;
+}
 
 /* 
  * Compare two names.  The characters '_', ' ', and '\t' are ignored
  * in the comparison.
  */
 int
-xf86nameCompare (const char *s1, const char *s2)
+xf86nameCompare(const char *s1, const char *s2)
 {
-	char c1, c2;
-
-	if (!s1 || *s1 == 0) {
-		if (!s2 || *s2 == 0)
-			return 0;
-		else
-			return 1;
-		}
-
-	while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
-		s1++;
-	while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
-		s2++;
-	c1 = (isupper (*s1) ? tolower (*s1) : *s1);
-	c2 = (isupper (*s2) ? tolower (*s2) : *s2);
-	while (c1 == c2)
-	{
-		if (c1 == '\0')
-			return 0;
-		s1++;
-		s2++;
-		while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
-			s1++;
-		while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
-			s2++;
-		c1 = (isupper (*s1) ? tolower (*s1) : *s1);
-		c2 = (isupper (*s2) ? tolower (*s2) : *s2);
-	}
-	return c1 - c2;
+    char c1, c2;
+
+    if (!s1 || *s1 == 0) {
+        if (!s2 || *s2 == 0)
+            return 0;
+        else
+            return 1;
+    }
+
+    while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
+        s1++;
+    while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
+        s2++;
+    c1 = (isupper(*s1) ? tolower(*s1) : *s1);
+    c2 = (isupper(*s2) ? tolower(*s2) : *s2);
+    while (c1 == c2) {
+        if (c1 == '\0')
+            return 0;
+        s1++;
+        s2++;
+        while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
+            s1++;
+        while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
+            s2++;
+        c1 = (isupper(*s1) ? tolower(*s1) : *s1);
+        c2 = (isupper(*s2) ? tolower(*s2) : *s2);
+    }
+    return c1 - c2;
 }
 
 char *
 xf86addComment(char *cur, char *add)
 {
-	char *str;
-	int len, curlen, iscomment, hasnewline = 0, insnewline, endnewline;
-
-	if (add == NULL || add[0] == '\0')
-		return cur;
-
-	if (cur) {
-		curlen = strlen(cur);
-		if (curlen)
-		    hasnewline = cur[curlen - 1] == '\n';
-		eol_seen = 0;
-	}
-	else
-		curlen = 0;
-
-	str = add;
-	iscomment = 0;
-	while (*str) {
-	    if (*str != ' ' && *str != '\t')
-		break;
-	    ++str;
-	}
-	iscomment = (*str == '#');
-
-	len = strlen(add);
-	endnewline = add[len - 1] == '\n';
-
-	insnewline = eol_seen || (curlen && !hasnewline);
-	if (insnewline)
-		len++;
-	if (!iscomment)
-		len++;
-	if (!endnewline)
-		len++;
-
-	/* Allocate + 1 char for '\0' terminator. */
-	str = realloc(cur, curlen + len + 1);
-	if (!str)
-		return cur;
-
-	cur = str;
-
-	if (insnewline)
-		cur[curlen++] = '\n';
-	if (!iscomment)
-		cur[curlen++] = '#';
-	strcpy(cur + curlen, add);
-	if (!endnewline)
-		strcat(cur, "\n");
-
-	return cur;
+    char *str;
+    int len, curlen, iscomment, hasnewline = 0, insnewline, endnewline;
+
+    if (add == NULL || add[0] == '\0')
+        return cur;
+
+    if (cur) {
+        curlen = strlen(cur);
+        if (curlen)
+            hasnewline = cur[curlen - 1] == '\n';
+        eol_seen = 0;
+    }
+    else
+        curlen = 0;
+
+    str = add;
+    iscomment = 0;
+    while (*str) {
+        if (*str != ' ' && *str != '\t')
+            break;
+        ++str;
+    }
+    iscomment = (*str == '#');
+
+    len = strlen(add);
+    endnewline = add[len - 1] == '\n';
+
+    insnewline = eol_seen || (curlen && !hasnewline);
+    if (insnewline)
+        len++;
+    if (!iscomment)
+        len++;
+    if (!endnewline)
+        len++;
+
+    /* Allocate + 1 char for '\0' terminator. */
+    str = realloc(cur, curlen + len + 1);
+    if (!str)
+        return cur;
+
+    cur = str;
+
+    if (insnewline)
+        cur[curlen++] = '\n';
+    if (!iscomment)
+        cur[curlen++] = '#';
+    strcpy(cur + curlen, add);
+    if (!endnewline)
+        strcat(cur, "\n");
+
+    return cur;
 }
 
 Bool
 xf86getBoolValue(Bool *val, const char *str)
 {
-	if (!val || !str)
-		return FALSE;
-	if (*str == '\0') {
-		*val = TRUE;
-	} else {
-		if (xf86nameCompare(str, "1") == 0)
-			*val = TRUE;
-		else if (xf86nameCompare(str, "on") == 0)
-			*val = TRUE;
-		else if (xf86nameCompare(str, "true") == 0)
-			*val = TRUE;
-		else if (xf86nameCompare(str, "yes") == 0)
-			*val = TRUE;
-		else if (xf86nameCompare(str, "0") == 0)
-			*val = FALSE;
-		else if (xf86nameCompare(str, "off") == 0)
-			*val = FALSE;
-		else if (xf86nameCompare(str, "false") == 0)
-			*val = FALSE;
-		else if (xf86nameCompare(str, "no") == 0)
-			*val = FALSE;
-		else
-			return FALSE;
-	}
-	return TRUE;
+    if (!val || !str)
+        return FALSE;
+    if (*str == '\0') {
+        *val = TRUE;
+    }
+    else {
+        if (xf86nameCompare(str, "1") == 0)
+            *val = TRUE;
+        else if (xf86nameCompare(str, "on") == 0)
+            *val = TRUE;
+        else if (xf86nameCompare(str, "true") == 0)
+            *val = TRUE;
+        else if (xf86nameCompare(str, "yes") == 0)
+            *val = TRUE;
+        else if (xf86nameCompare(str, "0") == 0)
+            *val = FALSE;
+        else if (xf86nameCompare(str, "off") == 0)
+            *val = FALSE;
+        else if (xf86nameCompare(str, "false") == 0)
+            *val = FALSE;
+        else if (xf86nameCompare(str, "no") == 0)
+            *val = FALSE;
+        else
+            return FALSE;
+    }
+    return TRUE;
 }
diff --git a/xorg-server/hw/xfree86/parser/write.c b/xorg-server/hw/xfree86/parser/write.c
index fe51ee7f5..c001c3d51 100644
--- a/xorg-server/hw/xfree86/parser/write.c
+++ b/xorg-server/hw/xfree86/parser/write.c
@@ -1,216 +1,205 @@
-/* 

- * Copyright (c) 1997  Metro Link Incorporated

- * 

- * 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 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 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- * 

- * Except as contained in this notice, the name of the Metro Link shall not be

- * used in advertising or otherwise to promote the sale, use or other dealings

- * in this Software without prior written authorization from Metro Link.

- * 

- */

-/*

- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.

- *

- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-

-/* View/edit this file with tab stops set to 4 */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Parser.h"

-#include "xf86tokens.h"

-#include "Configint.h"

-

-#include <unistd.h>

-#include <sys/types.h>

-#include <sys/wait.h>

-#include <signal.h>

-#include <errno.h>

-

-#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)

-#define HAS_SAVED_IDS_AND_SETEUID

-#endif

-#if defined(WIN32)

-#define HAS_NO_UIDS

-#endif

-

-#ifdef HAS_NO_UIDS

-#define doWriteConfigFile xf86writeConfigFile

-#define Local /**/

-#else

-#define Local static

-#endif

-

-Local int

-doWriteConfigFile (const char *filename, XF86ConfigPtr cptr)

-{

-	FILE *cf;

-

-	if ((cf = fopen (filename, "w")) == NULL)

-	{

-		return 0;

-	}

-

-	if (cptr->conf_comment)

-		fprintf (cf, "%s\n", cptr->conf_comment);

-

-	xf86printLayoutSection (cf, cptr->conf_layout_lst);

-

-	if (cptr->conf_files != NULL)

-	{

-		fprintf (cf, "Section \"Files\"\n");

-		xf86printFileSection (cf, cptr->conf_files);

-		fprintf (cf, "EndSection\n\n");

-	}

-

-	if (cptr->conf_modules != NULL)

-	{

-		fprintf (cf, "Section \"Module\"\n");

-		xf86printModuleSection (cf, cptr->conf_modules);

-		fprintf (cf, "EndSection\n\n");

-	}

-

-	xf86printVendorSection (cf, cptr->conf_vendor_lst);

-

-	xf86printServerFlagsSection (cf, cptr->conf_flags);

-

-	xf86printInputSection (cf, cptr->conf_input_lst);

-

-	xf86printInputClassSection (cf, cptr->conf_inputclass_lst);

-

-	xf86printVideoAdaptorSection (cf, cptr->conf_videoadaptor_lst);

-

-	xf86printModesSection (cf, cptr->conf_modes_lst);

-

-	xf86printMonitorSection (cf, cptr->conf_monitor_lst);

-

-	xf86printDeviceSection (cf, cptr->conf_device_lst);

-

-	xf86printScreenSection (cf, cptr->conf_screen_lst);

-

-	xf86printDRISection (cf, cptr->conf_dri);

-

-	xf86printExtensionsSection (cf, cptr->conf_extensions);

-

-	fclose(cf);

-	return 1;

-}

-

-#ifndef HAS_NO_UIDS

-

-int

-xf86writeConfigFile (const char *filename, XF86ConfigPtr cptr)

-{

-	int ret;

-

-#if !defined(HAS_SAVED_IDS_AND_SETEUID)

-	int pid, p;

-	int status;

-	void (*csig)(int);

-#else

-	int ruid, euid;

-#endif

-

-	if (getuid() != geteuid())

-	{

-

-#if !defined(HAS_SAVED_IDS_AND_SETEUID)

-		/* Need to fork to change ruid without loosing euid */

-		csig = signal(SIGCHLD, SIG_DFL);

-		switch ((pid = fork()))

-		{

-		case -1:

-			ErrorF("xf86writeConfigFile(): fork failed (%s)\n",

-					strerror(errno));

-			return 0;

-		case 0: /* child */

-			if (setuid(getuid()) == -1) 

-			    FatalError("xf86writeConfigFile(): "

-				"setuid failed(%s)\n", 

-				strerror(errno));

-			ret = doWriteConfigFile(filename, cptr);

-			exit(ret);

-			break;

-		default: /* parent */

-			do

-			{

-				p = waitpid(pid, &status, 0);

-			} while (p == -1 && errno == EINTR);

-		}

-		signal(SIGCHLD, csig);

-		if (p != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)

-			return 1;	/* success */

-		else

-			return 0;

-

-#else /* HAS_SAVED_IDS_AND_SETEUID */

-

-		ruid = getuid();

-		euid = geteuid();

-

-		if (seteuid(ruid) == -1)

-		{

-			ErrorF("xf86writeConfigFile(): seteuid(%d) failed (%s)\n",

-					ruid, strerror(errno));

-			return 0;

-		}

-		ret = doWriteConfigFile(filename, cptr);

-

-		if (seteuid(euid) == -1)

-		{

-			ErrorF("xf86writeConfigFile(): seteuid(%d) failed (%s)\n",

-					euid, strerror(errno));

-		}

-		return ret;

-

-#endif /* HAS_SAVED_IDS_AND_SETEUID */

-

-	}

-	else

-	{

-		return doWriteConfigFile(filename, cptr);

-	}

-}

-

-#endif /* !HAS_NO_UIDS */

+/* 
+ * Copyright (c) 1997  Metro Link Incorporated
+ * 
+ * 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 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 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of the Metro Link shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from Metro Link.
+ * 
+ */
+/*
+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+/* View/edit this file with tab stops set to 4 */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Parser.h"
+#include "xf86tokens.h"
+#include "Configint.h"
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <errno.h>
+
+#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
+#define HAS_SAVED_IDS_AND_SETEUID
+#endif
+#if defined(WIN32)
+#define HAS_NO_UIDS
+#endif
+
+#ifdef HAS_NO_UIDS
+#define doWriteConfigFile xf86writeConfigFile
+#define Local /**/
+#else
+#define Local static
+#endif
+
+Local int
+doWriteConfigFile(const char *filename, XF86ConfigPtr cptr)
+{
+    FILE *cf;
+
+    if ((cf = fopen(filename, "w")) == NULL) {
+        return 0;
+    }
+
+    if (cptr->conf_comment)
+        fprintf(cf, "%s\n", cptr->conf_comment);
+
+    xf86printLayoutSection(cf, cptr->conf_layout_lst);
+
+    if (cptr->conf_files != NULL) {
+        fprintf(cf, "Section \"Files\"\n");
+        xf86printFileSection(cf, cptr->conf_files);
+        fprintf(cf, "EndSection\n\n");
+    }
+
+    if (cptr->conf_modules != NULL) {
+        fprintf(cf, "Section \"Module\"\n");
+        xf86printModuleSection(cf, cptr->conf_modules);
+        fprintf(cf, "EndSection\n\n");
+    }
+
+    xf86printVendorSection(cf, cptr->conf_vendor_lst);
+
+    xf86printServerFlagsSection(cf, cptr->conf_flags);
+
+    xf86printInputSection(cf, cptr->conf_input_lst);
+
+    xf86printInputClassSection(cf, cptr->conf_inputclass_lst);
+
+    xf86printVideoAdaptorSection(cf, cptr->conf_videoadaptor_lst);
+
+    xf86printModesSection(cf, cptr->conf_modes_lst);
+
+    xf86printMonitorSection(cf, cptr->conf_monitor_lst);
+
+    xf86printDeviceSection(cf, cptr->conf_device_lst);
+
+    xf86printScreenSection(cf, cptr->conf_screen_lst);
+
+    xf86printDRISection(cf, cptr->conf_dri);
+
+    xf86printExtensionsSection(cf, cptr->conf_extensions);
+
+    fclose(cf);
+    return 1;
+}
+
+#ifndef HAS_NO_UIDS
+
+int
+xf86writeConfigFile(const char *filename, XF86ConfigPtr cptr)
+{
+    int ret;
+
+#if !defined(HAS_SAVED_IDS_AND_SETEUID)
+    int pid, p;
+    int status;
+    void (*csig) (int);
+#else
+    int ruid, euid;
+#endif
+
+    if (getuid() != geteuid()) {
+
+#if !defined(HAS_SAVED_IDS_AND_SETEUID)
+        /* Need to fork to change ruid without loosing euid */
+        csig = signal(SIGCHLD, SIG_DFL);
+        switch ((pid = fork())) {
+        case -1:
+            ErrorF("xf86writeConfigFile(): fork failed (%s)\n",
+                   strerror(errno));
+            return 0;
+        case 0:                /* child */
+            if (setuid(getuid()) == -1)
+                FatalError("xf86writeConfigFile(): "
+                           "setuid failed(%s)\n", strerror(errno));
+            ret = doWriteConfigFile(filename, cptr);
+            exit(ret);
+            break;
+        default:               /* parent */
+            do {
+                p = waitpid(pid, &status, 0);
+            } while (p == -1 && errno == EINTR);
+        }
+        signal(SIGCHLD, csig);
+        if (p != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)
+            return 1;           /* success */
+        else
+            return 0;
+
+#else                           /* HAS_SAVED_IDS_AND_SETEUID */
+
+        ruid = getuid();
+        euid = geteuid();
+
+        if (seteuid(ruid) == -1) {
+            ErrorF("xf86writeConfigFile(): seteuid(%d) failed (%s)\n",
+                   ruid, strerror(errno));
+            return 0;
+        }
+        ret = doWriteConfigFile(filename, cptr);
+
+        if (seteuid(euid) == -1) {
+            ErrorF("xf86writeConfigFile(): seteuid(%d) failed (%s)\n",
+                   euid, strerror(errno));
+        }
+        return ret;
+
+#endif                          /* HAS_SAVED_IDS_AND_SETEUID */
+
+    }
+    else {
+        return doWriteConfigFile(filename, cptr);
+    }
+}
+
+#endif                          /* !HAS_NO_UIDS */
diff --git a/xorg-server/hw/xfree86/parser/xf86Optrec.h b/xorg-server/hw/xfree86/parser/xf86Optrec.h
index b8e9d6192..ea0cb1329 100644
--- a/xorg-server/hw/xfree86/parser/xf86Optrec.h
+++ b/xorg-server/hw/xfree86/parser/xf86Optrec.h
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* 
  * This file contains the Option Record that is passed between the Parser,
  * and Module setup procs.
@@ -69,21 +68,26 @@
 
 #include <X11/Xfuncproto.h>
 
-extern _X_EXPORT XF86OptionPtr xf86addNewOption(XF86OptionPtr head, char *name, char *val);
+extern _X_EXPORT XF86OptionPtr xf86addNewOption(XF86OptionPtr head, char *name,
+                                                char *val);
 extern _X_EXPORT XF86OptionPtr xf86optionListDup(XF86OptionPtr opt);
 extern _X_EXPORT void xf86optionListFree(XF86OptionPtr opt);
 extern _X_EXPORT char *xf86optionName(XF86OptionPtr opt);
 extern _X_EXPORT char *xf86optionValue(XF86OptionPtr opt);
 extern _X_EXPORT XF86OptionPtr xf86newOption(char *name, char *value);
 extern _X_EXPORT XF86OptionPtr xf86nextOption(XF86OptionPtr list);
-extern _X_EXPORT XF86OptionPtr xf86findOption(XF86OptionPtr list, const char *name);
-extern _X_EXPORT const char *xf86findOptionValue(XF86OptionPtr list, const char *name);
-extern _X_EXPORT XF86OptionPtr xf86optionListCreate(const char **options, int count, int used);
-extern _X_EXPORT XF86OptionPtr xf86optionListMerge(XF86OptionPtr head, XF86OptionPtr tail);
-extern _X_EXPORT int xf86nameCompare (const char *s1, const char *s2);
+extern _X_EXPORT XF86OptionPtr xf86findOption(XF86OptionPtr list,
+                                              const char *name);
+extern _X_EXPORT const char *xf86findOptionValue(XF86OptionPtr list,
+                                                 const char *name);
+extern _X_EXPORT XF86OptionPtr xf86optionListCreate(const char **options,
+                                                    int count, int used);
+extern _X_EXPORT XF86OptionPtr xf86optionListMerge(XF86OptionPtr head,
+                                                   XF86OptionPtr tail);
+extern _X_EXPORT int xf86nameCompare(const char *s1, const char *s2);
 extern _X_EXPORT char *xf86uLongToString(unsigned long i);
 extern _X_EXPORT XF86OptionPtr xf86parseOption(XF86OptionPtr head);
-extern _X_EXPORT void xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs);
-
+extern _X_EXPORT void xf86printOptionList(FILE * fp, XF86OptionPtr list,
+                                          int tabs);
 
-#endif /* _xf86Optrec_h_ */
+#endif                          /* _xf86Optrec_h_ */
diff --git a/xorg-server/hw/xfree86/parser/xf86Parser.h b/xorg-server/hw/xfree86/parser/xf86Parser.h
index beac35404..e7210e811 100644
--- a/xorg-server/hw/xfree86/parser/xf86Parser.h
+++ b/xorg-server/hw/xfree86/parser/xf86Parser.h
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* 
  * This file contains the external interfaces for the XFree86 configuration
  * file parser.
@@ -70,39 +69,33 @@
 
 #define HAVE_PARSER_DECLS
 
-typedef struct
-{
-	char *file_logfile;
-	char *file_modulepath;
-	char *file_fontpath;
-	char *file_comment;
-	char *file_xkbdir;
-}
-XF86ConfFilesRec, *XF86ConfFilesPtr;
+typedef struct {
+    char *file_logfile;
+    char *file_modulepath;
+    char *file_fontpath;
+    char *file_comment;
+    char *file_xkbdir;
+} XF86ConfFilesRec, *XF86ConfFilesPtr;
 
 /* Values for load_type */
 #define XF86_LOAD_MODULE	0
 #define XF86_LOAD_DRIVER	1
 #define XF86_DISABLE_MODULE	2
 
-typedef struct
-{
-	GenericListRec list;
-	int load_type;
-	char *load_name;
-	XF86OptionPtr load_opt;
-	char *load_comment;
-        int ignore;
-}
-XF86LoadRec, *XF86LoadPtr;
-
-typedef struct
-{
-	XF86LoadPtr mod_load_lst;
+typedef struct {
+    GenericListRec list;
+    int load_type;
+    char *load_name;
+    XF86OptionPtr load_opt;
+    char *load_comment;
+    int ignore;
+} XF86LoadRec, *XF86LoadPtr;
+
+typedef struct {
+    XF86LoadPtr mod_load_lst;
     XF86LoadPtr mod_disable_lst;
-	char *mod_comment;
-}
-XF86ConfModuleRec, *XF86ConfModulePtr;
+    char *mod_comment;
+} XF86ConfModuleRec, *XF86ConfModulePtr;
 
 #define CONF_IMPLICIT_KEYBOARD	"Implicit Core Keyboard"
 
@@ -117,258 +110,220 @@ XF86ConfModuleRec, *XF86ConfModulePtr;
 #define XF86CONF_CSYNC     0x0040
 #define XF86CONF_PCSYNC    0x0080
 #define XF86CONF_NCSYNC    0x0100
-#define XF86CONF_HSKEW     0x0200	/* hskew provided */
+#define XF86CONF_HSKEW     0x0200       /* hskew provided */
 #define XF86CONF_BCAST     0x0400
 #define XF86CONF_VSCAN     0x1000
 
-typedef struct
-{
-	GenericListRec list;
-	char *ml_identifier;
-	int ml_clock;
-	int ml_hdisplay;
-	int ml_hsyncstart;
-	int ml_hsyncend;
-	int ml_htotal;
-	int ml_vdisplay;
-	int ml_vsyncstart;
-	int ml_vsyncend;
-	int ml_vtotal;
-	int ml_vscan;
-	int ml_flags;
-	int ml_hskew;
-	char *ml_comment;
-}
-XF86ConfModeLineRec, *XF86ConfModeLinePtr;
-
-typedef struct
-{
-	GenericListRec list;
-	char *vp_identifier;
-	XF86OptionPtr vp_option_lst;
-	char *vp_comment;
-}
-XF86ConfVideoPortRec, *XF86ConfVideoPortPtr;
-
-typedef struct
-{
-	GenericListRec list;
-	char *va_identifier;
-	char *va_vendor;
-	char *va_board;
-	char *va_busid;
-	char *va_driver;
-	XF86OptionPtr va_option_lst;
-	XF86ConfVideoPortPtr va_port_lst;
-	char *va_fwdref;
-	char *va_comment;
-}
-XF86ConfVideoAdaptorRec, *XF86ConfVideoAdaptorPtr;
+typedef struct {
+    GenericListRec list;
+    char *ml_identifier;
+    int ml_clock;
+    int ml_hdisplay;
+    int ml_hsyncstart;
+    int ml_hsyncend;
+    int ml_htotal;
+    int ml_vdisplay;
+    int ml_vsyncstart;
+    int ml_vsyncend;
+    int ml_vtotal;
+    int ml_vscan;
+    int ml_flags;
+    int ml_hskew;
+    char *ml_comment;
+} XF86ConfModeLineRec, *XF86ConfModeLinePtr;
+
+typedef struct {
+    GenericListRec list;
+    char *vp_identifier;
+    XF86OptionPtr vp_option_lst;
+    char *vp_comment;
+} XF86ConfVideoPortRec, *XF86ConfVideoPortPtr;
+
+typedef struct {
+    GenericListRec list;
+    char *va_identifier;
+    char *va_vendor;
+    char *va_board;
+    char *va_busid;
+    char *va_driver;
+    XF86OptionPtr va_option_lst;
+    XF86ConfVideoPortPtr va_port_lst;
+    char *va_fwdref;
+    char *va_comment;
+} XF86ConfVideoAdaptorRec, *XF86ConfVideoAdaptorPtr;
 
 #define CONF_MAX_HSYNC 8
 #define CONF_MAX_VREFRESH 8
 
-typedef struct
-{
-	float hi, lo;
-}
-parser_range;
-
-typedef struct
-{
-	int red, green, blue;
-}
-parser_rgb;
-
-typedef struct
-{
-	GenericListRec list;
-	char *modes_identifier;
-	XF86ConfModeLinePtr mon_modeline_lst;
-	char *modes_comment;
-}
-XF86ConfModesRec, *XF86ConfModesPtr;
-
-typedef struct
-{
-	GenericListRec list;
-	char *ml_modes_str;
-	XF86ConfModesPtr ml_modes;
-}
-XF86ConfModesLinkRec, *XF86ConfModesLinkPtr;
-
-typedef struct
-{
-	GenericListRec list;
-	char *mon_identifier;
-	char *mon_vendor;
-	char *mon_modelname;
-	int mon_width;				/* in mm */
-	int mon_height;				/* in mm */
-	XF86ConfModeLinePtr mon_modeline_lst;
-	int mon_n_hsync;
-	parser_range mon_hsync[CONF_MAX_HSYNC];
-	int mon_n_vrefresh;
-	parser_range mon_vrefresh[CONF_MAX_VREFRESH];
-	float mon_gamma_red;
-	float mon_gamma_green;
-	float mon_gamma_blue;
-	XF86OptionPtr mon_option_lst;
-	XF86ConfModesLinkPtr mon_modes_sect_lst;
-	char *mon_comment;
-}
-XF86ConfMonitorRec, *XF86ConfMonitorPtr;
+typedef struct {
+    float hi, lo;
+} parser_range;
+
+typedef struct {
+    int red, green, blue;
+} parser_rgb;
+
+typedef struct {
+    GenericListRec list;
+    char *modes_identifier;
+    XF86ConfModeLinePtr mon_modeline_lst;
+    char *modes_comment;
+} XF86ConfModesRec, *XF86ConfModesPtr;
+
+typedef struct {
+    GenericListRec list;
+    char *ml_modes_str;
+    XF86ConfModesPtr ml_modes;
+} XF86ConfModesLinkRec, *XF86ConfModesLinkPtr;
+
+typedef struct {
+    GenericListRec list;
+    char *mon_identifier;
+    char *mon_vendor;
+    char *mon_modelname;
+    int mon_width;              /* in mm */
+    int mon_height;             /* in mm */
+    XF86ConfModeLinePtr mon_modeline_lst;
+    int mon_n_hsync;
+    parser_range mon_hsync[CONF_MAX_HSYNC];
+    int mon_n_vrefresh;
+    parser_range mon_vrefresh[CONF_MAX_VREFRESH];
+    float mon_gamma_red;
+    float mon_gamma_green;
+    float mon_gamma_blue;
+    XF86OptionPtr mon_option_lst;
+    XF86ConfModesLinkPtr mon_modes_sect_lst;
+    char *mon_comment;
+} XF86ConfMonitorRec, *XF86ConfMonitorPtr;
 
 #define CONF_MAXDACSPEEDS 4
 #define CONF_MAXCLOCKS    128
 
-typedef struct
-{
-	GenericListRec list;
-	char *dev_identifier;
-	char *dev_vendor;
-	char *dev_board;
-	char *dev_chipset;
-	char *dev_busid;
-	char *dev_card;
-	char *dev_driver;
-	char *dev_ramdac;
-	int dev_dacSpeeds[CONF_MAXDACSPEEDS];
-	int dev_videoram;
-	int dev_textclockfreq;
-	unsigned long dev_bios_base;
-	unsigned long dev_mem_base;
-	unsigned long dev_io_base;
-	char *dev_clockchip;
-	int dev_clocks;
-	int dev_clock[CONF_MAXCLOCKS];
-	int dev_chipid;
-	int dev_chiprev;
-	int dev_irq;
-	int dev_screen;
-	XF86OptionPtr dev_option_lst;
-	char *dev_comment;
-}
-XF86ConfDeviceRec, *XF86ConfDevicePtr;
-
-typedef struct
-{
-	GenericListRec list;
-	char *mode_name;
-}
-XF86ModeRec, *XF86ModePtr;
-
-typedef struct
-{
-	GenericListRec list;
-	int disp_frameX0;
-	int disp_frameY0;
-	int disp_virtualX;
-	int disp_virtualY;
-	int disp_depth;
-	int disp_bpp;
-	char *disp_visual;
-	parser_rgb disp_weight;
-	parser_rgb disp_black;
-	parser_rgb disp_white;
-	XF86ModePtr disp_mode_lst;
-	XF86OptionPtr disp_option_lst;
-	char *disp_comment;
-}
-XF86ConfDisplayRec, *XF86ConfDisplayPtr;
-
-typedef struct
-{
-	XF86OptionPtr flg_option_lst;
-	char *flg_comment;
-}
-XF86ConfFlagsRec, *XF86ConfFlagsPtr;
-
-typedef struct
-{
-	GenericListRec list;
-	char *al_adaptor_str;
-	XF86ConfVideoAdaptorPtr al_adaptor;
-}
-XF86ConfAdaptorLinkRec, *XF86ConfAdaptorLinkPtr;
-
-typedef struct
-{
-	GenericListRec list;
-	char *scrn_identifier;
-	char *scrn_obso_driver;
-	int scrn_defaultdepth;
-	int scrn_defaultbpp;
-	int scrn_defaultfbbpp;
-	char *scrn_monitor_str;
-	XF86ConfMonitorPtr scrn_monitor;
-	char *scrn_device_str;
-	XF86ConfDevicePtr scrn_device;
-	XF86ConfAdaptorLinkPtr scrn_adaptor_lst;
-	XF86ConfDisplayPtr scrn_display_lst;
-	XF86OptionPtr scrn_option_lst;
-	char *scrn_comment;
-	int scrn_virtualX, scrn_virtualY;
-}
-XF86ConfScreenRec, *XF86ConfScreenPtr;
-
-typedef struct
-{
-	GenericListRec list;
-	char *inp_identifier;
-	char *inp_driver;
-	XF86OptionPtr inp_option_lst;
-	char *inp_comment;
-}
-XF86ConfInputRec, *XF86ConfInputPtr;
-
-typedef struct
-{
-	GenericListRec list;
-	XF86ConfInputPtr iref_inputdev;
-	char *iref_inputdev_str;
-	XF86OptionPtr iref_option_lst;
-}
-XF86ConfInputrefRec, *XF86ConfInputrefPtr;
-
-typedef struct
-{
-	Bool set;
-	Bool val;
-}
-xf86TriState;
-
-typedef struct
-{
-	struct xorg_list entry;
-	char **values;
-}
-xf86MatchGroup;
-
-typedef struct
-{
-	GenericListRec list;
-	char *identifier;
-	char *driver;
-	struct xorg_list match_product;
-	struct xorg_list match_vendor;
-	struct xorg_list match_device;
-	struct xorg_list match_os;
-	struct xorg_list match_pnpid;
-	struct xorg_list match_usbid;
-	struct xorg_list match_driver;
-	struct xorg_list match_tag;
-	struct xorg_list match_layout;
-	xf86TriState is_keyboard;
-	xf86TriState is_pointer;
-	xf86TriState is_joystick;
-	xf86TriState is_tablet;
-	xf86TriState is_touchpad;
-	xf86TriState is_touchscreen;
-	XF86OptionPtr option_lst;
-	char *comment;
-}
-XF86ConfInputClassRec, *XF86ConfInputClassPtr;
+typedef struct {
+    GenericListRec list;
+    char *dev_identifier;
+    char *dev_vendor;
+    char *dev_board;
+    char *dev_chipset;
+    char *dev_busid;
+    char *dev_card;
+    char *dev_driver;
+    char *dev_ramdac;
+    int dev_dacSpeeds[CONF_MAXDACSPEEDS];
+    int dev_videoram;
+    int dev_textclockfreq;
+    unsigned long dev_bios_base;
+    unsigned long dev_mem_base;
+    unsigned long dev_io_base;
+    char *dev_clockchip;
+    int dev_clocks;
+    int dev_clock[CONF_MAXCLOCKS];
+    int dev_chipid;
+    int dev_chiprev;
+    int dev_irq;
+    int dev_screen;
+    XF86OptionPtr dev_option_lst;
+    char *dev_comment;
+} XF86ConfDeviceRec, *XF86ConfDevicePtr;
+
+typedef struct {
+    GenericListRec list;
+    char *mode_name;
+} XF86ModeRec, *XF86ModePtr;
+
+typedef struct {
+    GenericListRec list;
+    int disp_frameX0;
+    int disp_frameY0;
+    int disp_virtualX;
+    int disp_virtualY;
+    int disp_depth;
+    int disp_bpp;
+    char *disp_visual;
+    parser_rgb disp_weight;
+    parser_rgb disp_black;
+    parser_rgb disp_white;
+    XF86ModePtr disp_mode_lst;
+    XF86OptionPtr disp_option_lst;
+    char *disp_comment;
+} XF86ConfDisplayRec, *XF86ConfDisplayPtr;
+
+typedef struct {
+    XF86OptionPtr flg_option_lst;
+    char *flg_comment;
+} XF86ConfFlagsRec, *XF86ConfFlagsPtr;
+
+typedef struct {
+    GenericListRec list;
+    char *al_adaptor_str;
+    XF86ConfVideoAdaptorPtr al_adaptor;
+} XF86ConfAdaptorLinkRec, *XF86ConfAdaptorLinkPtr;
+
+typedef struct {
+    GenericListRec list;
+    char *scrn_identifier;
+    char *scrn_obso_driver;
+    int scrn_defaultdepth;
+    int scrn_defaultbpp;
+    int scrn_defaultfbbpp;
+    char *scrn_monitor_str;
+    XF86ConfMonitorPtr scrn_monitor;
+    char *scrn_device_str;
+    XF86ConfDevicePtr scrn_device;
+    XF86ConfAdaptorLinkPtr scrn_adaptor_lst;
+    XF86ConfDisplayPtr scrn_display_lst;
+    XF86OptionPtr scrn_option_lst;
+    char *scrn_comment;
+    int scrn_virtualX, scrn_virtualY;
+} XF86ConfScreenRec, *XF86ConfScreenPtr;
+
+typedef struct {
+    GenericListRec list;
+    char *inp_identifier;
+    char *inp_driver;
+    XF86OptionPtr inp_option_lst;
+    char *inp_comment;
+} XF86ConfInputRec, *XF86ConfInputPtr;
+
+typedef struct {
+    GenericListRec list;
+    XF86ConfInputPtr iref_inputdev;
+    char *iref_inputdev_str;
+    XF86OptionPtr iref_option_lst;
+} XF86ConfInputrefRec, *XF86ConfInputrefPtr;
+
+typedef struct {
+    Bool set;
+    Bool val;
+} xf86TriState;
+
+typedef struct {
+    struct xorg_list entry;
+    char **values;
+} xf86MatchGroup;
+
+typedef struct {
+    GenericListRec list;
+    char *identifier;
+    char *driver;
+    struct xorg_list match_product;
+    struct xorg_list match_vendor;
+    struct xorg_list match_device;
+    struct xorg_list match_os;
+    struct xorg_list match_pnpid;
+    struct xorg_list match_usbid;
+    struct xorg_list match_driver;
+    struct xorg_list match_tag;
+    struct xorg_list match_layout;
+    xf86TriState is_keyboard;
+    xf86TriState is_pointer;
+    xf86TriState is_joystick;
+    xf86TriState is_tablet;
+    xf86TriState is_touchpad;
+    xf86TriState is_touchscreen;
+    XF86OptionPtr option_lst;
+    char *comment;
+} XF86ConfInputClassRec, *XF86ConfInputClassPtr;
 
 /* Values for adj_where */
 #define CONF_ADJ_OBSOLETE	-1
@@ -379,141 +334,135 @@ XF86ConfInputClassRec, *XF86ConfInputClassPtr;
 #define CONF_ADJ_BELOW		4
 #define CONF_ADJ_RELATIVE	5
 
-typedef struct
-{
-	GenericListRec list;
-	int adj_scrnum;
-	XF86ConfScreenPtr adj_screen;
-	char *adj_screen_str;
-	XF86ConfScreenPtr adj_top;
-	char *adj_top_str;
-	XF86ConfScreenPtr adj_bottom;
-	char *adj_bottom_str;
-	XF86ConfScreenPtr adj_left;
-	char *adj_left_str;
-	XF86ConfScreenPtr adj_right;
-	char *adj_right_str;
-	int adj_where;
-	int adj_x;
-	int adj_y;
-	char *adj_refscreen;
-}
-XF86ConfAdjacencyRec, *XF86ConfAdjacencyPtr;
-
-typedef struct
-{
-	GenericListRec list;
-	char *inactive_device_str;
-	XF86ConfDevicePtr inactive_device;
-}
-XF86ConfInactiveRec, *XF86ConfInactivePtr;
-
-typedef struct
-{
-	GenericListRec list;
-	char *lay_identifier;
-	XF86ConfAdjacencyPtr lay_adjacency_lst;
-	XF86ConfInactivePtr lay_inactive_lst;
-	XF86ConfInputrefPtr lay_input_lst;
-	XF86OptionPtr lay_option_lst;
-	char *lay_comment;
-}
-XF86ConfLayoutRec, *XF86ConfLayoutPtr;
-
-typedef struct 
-{ 
-	GenericListRec list; 
-	char *vs_name;
-	char *vs_identifier;
-	XF86OptionPtr vs_option_lst;
-	char *vs_comment;
-}
-XF86ConfVendSubRec, *XF86ConfVendSubPtr;
-
-typedef struct
-{
-	GenericListRec list;
-	char *vnd_identifier;
-	XF86OptionPtr vnd_option_lst;
-	XF86ConfVendSubPtr vnd_sub_lst;
-	char *vnd_comment;
-}
-XF86ConfVendorRec, *XF86ConfVendorPtr;
-
-typedef struct
-{
-	char *dri_group_name;
-	int dri_group;
-	int dri_mode;
-	char *dri_comment;
-}
-XF86ConfDRIRec, *XF86ConfDRIPtr;
-
-typedef struct
-{
-	XF86OptionPtr ext_option_lst;
-	char *extensions_comment;
-}
-XF86ConfExtensionsRec, *XF86ConfExtensionsPtr;
-
-typedef struct
-{
-	XF86ConfFilesPtr conf_files;
-	XF86ConfModulePtr conf_modules;
-	XF86ConfFlagsPtr conf_flags;
-	XF86ConfVideoAdaptorPtr conf_videoadaptor_lst;
-	XF86ConfModesPtr conf_modes_lst;
-	XF86ConfMonitorPtr conf_monitor_lst;
-	XF86ConfDevicePtr conf_device_lst;
-	XF86ConfScreenPtr conf_screen_lst;
-	XF86ConfInputPtr conf_input_lst;
-	XF86ConfInputClassPtr conf_inputclass_lst;
-	XF86ConfLayoutPtr conf_layout_lst;
-	XF86ConfVendorPtr conf_vendor_lst;
-	XF86ConfDRIPtr conf_dri;
-	XF86ConfExtensionsPtr conf_extensions;
-	char *conf_comment;
-}
-XF86ConfigRec, *XF86ConfigPtr;
-
-typedef struct
-{
-	int token;			/* id of the token */
-	const char *name;		/* pointer to the LOWERCASED name */
-}
-xf86ConfigSymTabRec, *xf86ConfigSymTabPtr;
+typedef struct {
+    GenericListRec list;
+    int adj_scrnum;
+    XF86ConfScreenPtr adj_screen;
+    char *adj_screen_str;
+    XF86ConfScreenPtr adj_top;
+    char *adj_top_str;
+    XF86ConfScreenPtr adj_bottom;
+    char *adj_bottom_str;
+    XF86ConfScreenPtr adj_left;
+    char *adj_left_str;
+    XF86ConfScreenPtr adj_right;
+    char *adj_right_str;
+    int adj_where;
+    int adj_x;
+    int adj_y;
+    char *adj_refscreen;
+} XF86ConfAdjacencyRec, *XF86ConfAdjacencyPtr;
+
+typedef struct {
+    GenericListRec list;
+    char *inactive_device_str;
+    XF86ConfDevicePtr inactive_device;
+} XF86ConfInactiveRec, *XF86ConfInactivePtr;
+
+typedef struct {
+    GenericListRec list;
+    char *lay_identifier;
+    XF86ConfAdjacencyPtr lay_adjacency_lst;
+    XF86ConfInactivePtr lay_inactive_lst;
+    XF86ConfInputrefPtr lay_input_lst;
+    XF86OptionPtr lay_option_lst;
+    char *lay_comment;
+} XF86ConfLayoutRec, *XF86ConfLayoutPtr;
+
+typedef struct {
+    GenericListRec list;
+    char *vs_name;
+    char *vs_identifier;
+    XF86OptionPtr vs_option_lst;
+    char *vs_comment;
+} XF86ConfVendSubRec, *XF86ConfVendSubPtr;
+
+typedef struct {
+    GenericListRec list;
+    char *vnd_identifier;
+    XF86OptionPtr vnd_option_lst;
+    XF86ConfVendSubPtr vnd_sub_lst;
+    char *vnd_comment;
+} XF86ConfVendorRec, *XF86ConfVendorPtr;
+
+typedef struct {
+    char *dri_group_name;
+    int dri_group;
+    int dri_mode;
+    char *dri_comment;
+} XF86ConfDRIRec, *XF86ConfDRIPtr;
+
+typedef struct {
+    XF86OptionPtr ext_option_lst;
+    char *extensions_comment;
+} XF86ConfExtensionsRec, *XF86ConfExtensionsPtr;
+
+typedef struct {
+    XF86ConfFilesPtr conf_files;
+    XF86ConfModulePtr conf_modules;
+    XF86ConfFlagsPtr conf_flags;
+    XF86ConfVideoAdaptorPtr conf_videoadaptor_lst;
+    XF86ConfModesPtr conf_modes_lst;
+    XF86ConfMonitorPtr conf_monitor_lst;
+    XF86ConfDevicePtr conf_device_lst;
+    XF86ConfScreenPtr conf_screen_lst;
+    XF86ConfInputPtr conf_input_lst;
+    XF86ConfInputClassPtr conf_inputclass_lst;
+    XF86ConfLayoutPtr conf_layout_lst;
+    XF86ConfVendorPtr conf_vendor_lst;
+    XF86ConfDRIPtr conf_dri;
+    XF86ConfExtensionsPtr conf_extensions;
+    char *conf_comment;
+} XF86ConfigRec, *XF86ConfigPtr;
+
+typedef struct {
+    int token;                  /* id of the token */
+    const char *name;           /* pointer to the LOWERCASED name */
+} xf86ConfigSymTabRec, *xf86ConfigSymTabPtr;
 
 /*
  * prototypes for public functions
  */
 extern void xf86initConfigFiles(void);
 extern char *xf86openConfigFile(const char *path, const char *cmdline,
-				const char *projroot);
+                                const char *projroot);
 extern char *xf86openConfigDirFiles(const char *path, const char *cmdline,
-				    const char *projroot);
+                                    const char *projroot);
 extern void xf86setBuiltinConfig(const char *config[]);
 extern XF86ConfigPtr xf86readConfigFile(void);
 extern void xf86closeConfigFile(void);
 extern void xf86freeConfig(XF86ConfigPtr p);
 extern int xf86writeConfigFile(const char *, XF86ConfigPtr);
-extern _X_EXPORT XF86ConfDevicePtr xf86findDevice(const char *ident, XF86ConfDevicePtr p);
-extern _X_EXPORT XF86ConfLayoutPtr xf86findLayout(const char *name, XF86ConfLayoutPtr list);
-extern _X_EXPORT XF86ConfMonitorPtr xf86findMonitor(const char *ident, XF86ConfMonitorPtr p);
-extern _X_EXPORT XF86ConfModesPtr xf86findModes(const char *ident, XF86ConfModesPtr p);
-extern _X_EXPORT XF86ConfModeLinePtr xf86findModeLine(const char *ident, XF86ConfModeLinePtr p);
-extern _X_EXPORT XF86ConfScreenPtr xf86findScreen(const char *ident, XF86ConfScreenPtr p);
-extern _X_EXPORT XF86ConfInputPtr xf86findInput(const char *ident, XF86ConfInputPtr p);
-extern _X_EXPORT XF86ConfInputPtr xf86findInputByDriver(const char *driver, XF86ConfInputPtr p);
+extern _X_EXPORT XF86ConfDevicePtr xf86findDevice(const char *ident,
+                                                  XF86ConfDevicePtr p);
+extern _X_EXPORT XF86ConfLayoutPtr xf86findLayout(const char *name,
+                                                  XF86ConfLayoutPtr list);
+extern _X_EXPORT XF86ConfMonitorPtr xf86findMonitor(const char *ident,
+                                                    XF86ConfMonitorPtr p);
+extern _X_EXPORT XF86ConfModesPtr xf86findModes(const char *ident,
+                                                XF86ConfModesPtr p);
+extern _X_EXPORT XF86ConfModeLinePtr xf86findModeLine(const char *ident,
+                                                      XF86ConfModeLinePtr p);
+extern _X_EXPORT XF86ConfScreenPtr xf86findScreen(const char *ident,
+                                                  XF86ConfScreenPtr p);
+extern _X_EXPORT XF86ConfInputPtr xf86findInput(const char *ident,
+                                                XF86ConfInputPtr p);
+extern _X_EXPORT XF86ConfInputPtr xf86findInputByDriver(const char *driver,
+                                                        XF86ConfInputPtr p);
 extern _X_EXPORT XF86ConfVideoAdaptorPtr xf86findVideoAdaptor(const char *ident,
-						XF86ConfVideoAdaptorPtr p);
-extern int xf86layoutAddInputDevices(XF86ConfigPtr config, XF86ConfLayoutPtr layout);
+                                                              XF86ConfVideoAdaptorPtr
+                                                              p);
+extern int xf86layoutAddInputDevices(XF86ConfigPtr config,
+                                     XF86ConfLayoutPtr layout);
 
-extern _X_EXPORT GenericListPtr xf86addListItem(GenericListPtr head, GenericListPtr c_new);
-extern _X_EXPORT int xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2);
+extern _X_EXPORT GenericListPtr xf86addListItem(GenericListPtr head,
+                                                GenericListPtr c_new);
+extern _X_EXPORT int xf86itemNotSublist(GenericListPtr list_1,
+                                        GenericListPtr list_2);
 
 extern _X_EXPORT int xf86pathIsAbsolute(const char *path);
 extern _X_EXPORT int xf86pathIsSafe(const char *path);
 extern _X_EXPORT char *xf86addComment(char *cur, char *add);
 extern _X_EXPORT Bool xf86getBoolValue(Bool *val, const char *str);
 
-#endif /* _xf86Parser_h_ */
+#endif                          /* _xf86Parser_h_ */
diff --git a/xorg-server/hw/xfree86/ramdac/BT.c b/xorg-server/hw/xfree86/ramdac/BT.c
index 5aa27a1f8..533344513 100644
--- a/xorg-server/hw/xfree86/ramdac/BT.c
+++ b/xorg-server/hw/xfree86/ramdac/BT.c
@@ -37,36 +37,37 @@
 
 void
 BTramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
-				    RamDacRegRecPtr ramdacReg)
+                RamDacRegRecPtr ramdacReg)
 {
-	int i;
-
-	/* Here we pass a short, so that we can evaluate a mask too */
-	/* So that the mask is the high byte and the data the low byte */
-	/* Just the command/status registers */
-	for (i=0x06;i<0x0A;i++) 
-	    (*ramdacPtr->WriteDAC)
-	        (pScrn, i, (ramdacReg->DacRegs[i] & 0xFF00) >> 8, 
-						ramdacReg->DacRegs[i]);
+    int i;
+
+    /* Here we pass a short, so that we can evaluate a mask too */
+    /* So that the mask is the high byte and the data the low byte */
+    /* Just the command/status registers */
+    for (i = 0x06; i < 0x0A; i++)
+        (*ramdacPtr->WriteDAC)
+            (pScrn, i, (ramdacReg->DacRegs[i] & 0xFF00) >> 8,
+             ramdacReg->DacRegs[i]);
 }
 
 void
-BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, 
-				 RamDacRegRecPtr ramdacReg)
+BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
+             RamDacRegRecPtr ramdacReg)
 {
-	int i;
-	
-	(*ramdacPtr->ReadAddress)(pScrn, 0); /* Start at index 0 */
-	for (i=0;i<768;i++)
-	    ramdacReg->DAC[i] = (*ramdacPtr->ReadData)(pScrn);
-
-	/* Just the command/status registers */
-	for (i=0x06;i<0x0A;i++)
-	    ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC)(pScrn, i);
+    int i;
+
+    (*ramdacPtr->ReadAddress) (pScrn, 0);       /* Start at index 0 */
+    for (i = 0; i < 768; i++)
+        ramdacReg->DAC[i] = (*ramdacPtr->ReadData) (pScrn);
+
+    /* Just the command/status registers */
+    for (i = 0x06; i < 0x0A; i++)
+        ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC) (pScrn, i);
 }
 
 RamDacHelperRecPtr
-BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/*, RamDacRecPtr ramdacPtr*/)
+BTramdacProbe(ScrnInfoPtr pScrn,
+              RamDacSupportedInfoRecPtr ramdacs /*, RamDacRecPtr ramdacPtr */ )
 {
     RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
     Bool RamDacIsSupported = FALSE;
@@ -75,65 +76,66 @@ BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/*, RamDacRecP
     int i, status, cmd0;
 
     /* Save COMMAND Register 0 */
-    cmd0 = (*ramdacPtr->ReadDAC)(pScrn, BT_COMMAND_REG_0);
+    cmd0 = (*ramdacPtr->ReadDAC) (pScrn, BT_COMMAND_REG_0);
     /* Ensure were going to access the STATUS Register on next read */
-    (*ramdacPtr->WriteDAC)(pScrn, BT_COMMAND_REG_0, 0x7F, 0x00);
+    (*ramdacPtr->WriteDAC) (pScrn, BT_COMMAND_REG_0, 0x7F, 0x00);
 
-    status = (*ramdacPtr->ReadDAC)(pScrn, BT_STATUS_REG);
+    status = (*ramdacPtr->ReadDAC) (pScrn, BT_STATUS_REG);
     switch (status) {
-	case 0x40:
-		BTramdac_ID = ATT20C504_RAMDAC;
-		break;
-	case 0xD0:
-		BTramdac_ID = ATT20C505_RAMDAC;
-		break;
-	default:
-		xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 
-			   "Unknown BT RAMDAC type (0x%x), assuming BT485\n",
-			   status);
-	case 0x80:
-	case 0x90:
-	case 0xA0:
-	case 0xB0:
-	case 0x28: 	/* This is for the DEC TGA - Questionable ? */
-		BTramdac_ID = BT485_RAMDAC;
-		break;
+    case 0x40:
+        BTramdac_ID = ATT20C504_RAMDAC;
+        break;
+    case 0xD0:
+        BTramdac_ID = ATT20C505_RAMDAC;
+        break;
+    default:
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+                   "Unknown BT RAMDAC type (0x%x), assuming BT485\n", status);
+    case 0x80:
+    case 0x90:
+    case 0xA0:
+    case 0xB0:
+    case 0x28:                 /* This is for the DEC TGA - Questionable ? */
+        BTramdac_ID = BT485_RAMDAC;
+        break;
     }
 
     /* Restore COMMAND Register 0 */
-    (*ramdacPtr->WriteDAC)(pScrn, BT_COMMAND_REG_0, 0x00, cmd0);
+    (*ramdacPtr->WriteDAC) (pScrn, BT_COMMAND_REG_0, 0x00, cmd0);
 
     if (BTramdac_ID == -1) {
-        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 
-		"Cannot determine BT RAMDAC type, aborting\n");
-	return NULL;
-    } else {
-        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 
-		"Attached RAMDAC is %s\n", BTramdacDeviceInfo[BTramdac_ID&0xFFFF].DeviceName);
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+                   "Cannot determine BT RAMDAC type, aborting\n");
+        return NULL;
+    }
+    else {
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+                   "Attached RAMDAC is %s\n",
+                   BTramdacDeviceInfo[BTramdac_ID & 0xFFFF].DeviceName);
     }
 
-    for (i=0;ramdacs[i].token != -1;i++) {
-	if (ramdacs[i].token == BTramdac_ID)
-	    RamDacIsSupported = TRUE;
+    for (i = 0; ramdacs[i].token != -1; i++) {
+        if (ramdacs[i].token == BTramdac_ID)
+            RamDacIsSupported = TRUE;
     }
 
     if (!RamDacIsSupported) {
-        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 
-		"This BT RAMDAC is NOT supported by this driver, aborting\n");
-	return NULL;
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+                   "This BT RAMDAC is NOT supported by this driver, aborting\n");
+        return NULL;
     }
 
     ramdacHelperPtr = RamDacHelperCreateInfoRec();
-    switch(BTramdac_ID) {
-	case BT485_RAMDAC:
-	    ramdacHelperPtr->SetBpp = BTramdacSetBpp;
-	    break;
+    switch (BTramdac_ID) {
+    case BT485_RAMDAC:
+        ramdacHelperPtr->SetBpp = BTramdacSetBpp;
+        break;
     }
     ramdacPtr->RamDacType = BTramdac_ID;
     ramdacHelperPtr->RamDacType = BTramdac_ID;
     ramdacHelperPtr->Save = BTramdacSave;
     ramdacHelperPtr->Restore = BTramdacRestore;
-	
+
     return ramdacHelperPtr;
 }
 
@@ -143,23 +145,23 @@ BTramdacSetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
     /* We need to deal with Direct Colour visuals for 8bpp and other
      * good stuff for colours */
     switch (pScrn->bitsPerPixel) {
-	case 32:
-	    ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x10;
-	    break;
-	case 24:
-	    ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x10;
-	    break;
-	case 16:
-	    ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x38;
-	    break;
-	case 15:
-	    ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x30;
-	    break;
-	case 8:
-	    ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x40;
-	    break;
-	case 4:
-	    ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x60;
-	    break;
+    case 32:
+        ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x10;
+        break;
+    case 24:
+        ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x10;
+        break;
+    case 16:
+        ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x38;
+        break;
+    case 15:
+        ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x30;
+        break;
+    case 8:
+        ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x40;
+        break;
+    case 4:
+        ramdacReg->DacRegs[BT_COMMAND_REG_1] = 0x60;
+        break;
     }
 }
diff --git a/xorg-server/hw/xfree86/ramdac/BT.h b/xorg-server/hw/xfree86/ramdac/BT.h
index 35d0bdbd9..6eeaf5db7 100644
--- a/xorg-server/hw/xfree86/ramdac/BT.h
+++ b/xorg-server/hw/xfree86/ramdac/BT.h
@@ -1,10 +1,15 @@
 
 #include "xf86RamDac.h"
 
-extern _X_EXPORT RamDacHelperRecPtr BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs);
-extern _X_EXPORT void BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec);
-extern _X_EXPORT void BTramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec);
-extern _X_EXPORT void BTramdacSetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec);
+extern _X_EXPORT RamDacHelperRecPtr BTramdacProbe(ScrnInfoPtr pScrn,
+                                                  RamDacSupportedInfoRecPtr
+                                                  ramdacs);
+extern _X_EXPORT void BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec,
+                                   RamDacRegRecPtr RamDacRegRec);
+extern _X_EXPORT void BTramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec,
+                                      RamDacRegRecPtr RamDacRegRec);
+extern _X_EXPORT void BTramdacSetBpp(ScrnInfoPtr pScrn,
+                                     RamDacRegRecPtr RamDacRegRec);
 
 #define ATT20C504_RAMDAC 	(VENDOR_BT << 16) | 0x00
 #define ATT20C505_RAMDAC 	(VENDOR_BT << 16) | 0x01
@@ -15,7 +20,7 @@ extern _X_EXPORT void BTramdacSetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRe
  */
 
 #define BT_WRITE_ADDR		0x00
-#define BT_RAMDAC_DATA		0x01	
+#define BT_RAMDAC_DATA		0x01
 #define BT_PIXEL_MASK		0x02
 #define BT_READ_ADDR		0x03
 #define BT_CURS_WR_ADDR		0x04
diff --git a/xorg-server/hw/xfree86/ramdac/IBM.c b/xorg-server/hw/xfree86/ramdac/IBM.c
index 3a477d7be..bc716231a 100644
--- a/xorg-server/hw/xfree86/ramdac/IBM.c
+++ b/xorg-server/hw/xfree86/ramdac/IBM.c
@@ -1,639 +1,643 @@
-/*

- * Copyright 1998 by Alan Hourihane, Wigan, England.

- *

- * 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 Alan Hourihane not be used in

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

- * specific, written prior permission.  Alan Hourihane makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL ALAN HOURIHANE 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.

- *

- * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>

- *

- * IBM RAMDAC routines.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include "xf86Cursor.h"

-

-#define INIT_IBM_RAMDAC_INFO

-#include "IBMPriv.h"

-#include "xf86RamDacPriv.h"

-

-#define INITIALFREQERR 100000

-

-unsigned long

-IBMramdac640CalculateMNPCForClock(

-    unsigned long RefClock,	/* In 100Hz units */

-    unsigned long ReqClock,	/* In 100Hz units */

-    char IsPixClock,	/* boolean, is this the pixel or the sys clock */

-    unsigned long MinClock,	/* Min VCO rating */

-    unsigned long MaxClock,	/* Max VCO rating */

-    unsigned long *rM,	/* M Out */

-    unsigned long *rN,	/* N Out */

-    unsigned long *rP,	/* Min P In, P Out */

-    unsigned long *rC	/* C Out */

-)

-{

-  unsigned long   M, N, P, iP = *rP;

-  unsigned long   IntRef, VCO, Clock;

-  long            freqErr, lowestFreqErr = INITIALFREQERR;

-  unsigned long   ActualClock = 0;

-

-  for (N = 0; N <= 63; N++)

-    {

-      IntRef = RefClock / (N + 1);

-      if (IntRef < 10000)

-	break;			/* IntRef needs to be >= 1MHz */

-      for (M = 2; M <= 127; M++)

-	{

-	  VCO = IntRef * (M + 1);

-	  if ((VCO < MinClock) || (VCO > MaxClock))

-	    continue;

-	  for (P = iP; P <= 4; P++)

-	    {

-	      if (P != 0)

-		Clock = (RefClock * (M + 1)) / ((N + 1) * 2 * P);

-	      else

-		Clock = (RefClock * (M + 1)) / (N + 1);

-

-	      freqErr = (Clock - ReqClock);

-

-	      if (freqErr < 0)

-		{

-		  /* PixelClock gets rounded up always so monitor reports

-		     correct frequency. */

-		  if (IsPixClock)

-		    continue;

-		  freqErr = -freqErr;

-		}

-

-	      if (freqErr < lowestFreqErr)

-		{

-		  *rM = M;

-		  *rN = N;

-		  *rP = P;

-		  *rC = (VCO <= 1280000 ? 1 : 2);

-		  ActualClock = Clock;

-

-		  lowestFreqErr = freqErr;

-		  /* Return if we found an exact match */

-		  if (freqErr == 0)

-		    return ActualClock;

-		}

-	    }

-	}

-    }

-

-  return ActualClock;

-}

-

-unsigned long

-IBMramdac526CalculateMNPCForClock(

-    unsigned long RefClock,	/* In 100Hz units */

-    unsigned long ReqClock,	/* In 100Hz units */

-    char IsPixClock,	/* boolean, is this the pixel or the sys clock */

-    unsigned long MinClock,	/* Min VCO rating */

-    unsigned long MaxClock,	/* Max VCO rating */

-    unsigned long *rM,	/* M Out */

-    unsigned long *rN,	/* N Out */

-    unsigned long *rP,	/* Min P In, P Out */

-    unsigned long *rC	/* C Out */

-)

-{

-  unsigned long   M, N, P, iP = *rP;

-  unsigned long   IntRef, VCO, Clock;

-  long            freqErr, lowestFreqErr = INITIALFREQERR;

-  unsigned long   ActualClock = 0;

-

-  for (N = 0; N <= 63; N++)

-    {

-      IntRef = RefClock / (N + 1);

-      if (IntRef < 10000)

-	break;			/* IntRef needs to be >= 1MHz */

-      for (M = 0; M <= 63; M++)

-	{

-	  VCO = IntRef * (M + 1);

-	  if ((VCO < MinClock) || (VCO > MaxClock))

-	    continue;

-	  for (P = iP; P <= 4; P++)

-	    {

-	      if (P)

-		Clock = (RefClock * (M + 1)) / ((N + 1) * 2 * P);

-	      else

-		Clock = VCO;

-

-	      freqErr = (Clock - ReqClock);

-

-	      if (freqErr < 0)

-		{

-		  /* PixelClock gets rounded up always so monitor reports

-		     correct frequency. */

-		  if (IsPixClock)

-		    continue;

-		  freqErr = -freqErr;

-		}

-

-	      if (freqErr < lowestFreqErr)

-		{

-		  *rM = M;

-		  *rN = N;

-		  *rP = P;

-		  *rC = (VCO <= 1280000 ? 1 : 2);

-		  ActualClock = Clock;

-

-		  lowestFreqErr = freqErr;

-		  /* Return if we found an exact match */

-		  if (freqErr == 0)

-		    return ActualClock;

-		}

-	    }

-	}

-    }

-

-  return ActualClock;

-}

-

-void

-IBMramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,

-				    RamDacRegRecPtr ramdacReg)

-{

-	int i, maxreg, dacreg;

-

-	switch (ramdacPtr->RamDacType) {

-	    case IBM640_RAMDAC:

-		maxreg = 0x300;

-		dacreg = 1024;

-		break;

-	    default:

-		maxreg = 0x100;

-		dacreg = 768;

-		break;

-	}

-

-	/* Here we pass a short, so that we can evaluate a mask too */

-	/* So that the mask is the high byte and the data the low byte */

-	for (i=0;i<maxreg;i++) 

-	    (*ramdacPtr->WriteDAC)

-	        (pScrn, i, (ramdacReg->DacRegs[i] & 0xFF00) >> 8, 

-						ramdacReg->DacRegs[i]);

-

-	(*ramdacPtr->WriteAddress)(pScrn, 0);

-	for (i=0;i<dacreg;i++)

-	    	(*ramdacPtr->WriteData)(pScrn, ramdacReg->DAC[i]);

-}

-

-void

-IBMramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, 

-				 RamDacRegRecPtr ramdacReg)

-{

-	int i, maxreg, dacreg;

-

-	switch (ramdacPtr->RamDacType) {

-	    case IBM640_RAMDAC:

-		maxreg = 0x300;

-		dacreg = 1024;

-		break;

-	    default:

-		maxreg = 0x100;

-		dacreg = 768;

-		break;

-	}

-	

-	(*ramdacPtr->ReadAddress)(pScrn, 0);

-	for (i=0;i<dacreg;i++)

-	    ramdacReg->DAC[i] = (*ramdacPtr->ReadData)(pScrn);

-

-	for (i=0;i<maxreg;i++) 

-	    ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC)(pScrn, i);

-}

-

-RamDacHelperRecPtr

-IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/* , RamDacRecPtr ramdacPtr*/)

-{

-    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-    RamDacHelperRecPtr ramdacHelperPtr = NULL;

-    Bool RamDacIsSupported = FALSE;

-    int IBMramdac_ID = -1;

-    int i;

-    unsigned char id, rev, id2, rev2;

-

-    /* read ID and revision */

-    rev = (*ramdacPtr->ReadDAC)(pScrn, IBMRGB_rev);

-    id = (*ramdacPtr->ReadDAC)(pScrn, IBMRGB_id);

-

-    /* check if ID and revision are read only */

-    (*ramdacPtr->WriteDAC)(pScrn, ~rev, 0, IBMRGB_rev);

-    (*ramdacPtr->WriteDAC)(pScrn, ~id, 0, IBMRGB_id);

-    rev2 = (*ramdacPtr->ReadDAC)(pScrn, IBMRGB_rev);

-    id2 = (*ramdacPtr->ReadDAC)(pScrn, IBMRGB_id);

-

-    switch (id) {

-	case 0x30:

-		if (rev == 0xc0) IBMramdac_ID = IBM624_RAMDAC;

-		if (rev == 0x80) IBMramdac_ID = IBM624DB_RAMDAC;

-		break;

-	case 0x12:

-		if (rev == 0x1c) IBMramdac_ID = IBM640_RAMDAC;

-		break;

-	case 0x01:

-		IBMramdac_ID = IBM525_RAMDAC;

-		break;

-	case 0x02:

-		if (rev == 0xf0) IBMramdac_ID = IBM524_RAMDAC;

-		if (rev == 0xe0) IBMramdac_ID = IBM524A_RAMDAC;

-		if (rev == 0xc0) IBMramdac_ID = IBM526_RAMDAC;

-		if (rev == 0x80) IBMramdac_ID = IBM526DB_RAMDAC;

-		break;

-    }

-

-    if (id == 1 || id == 2) {

-        if (id == id2 && rev == rev2) {		/* IBM RGB52x found */

-	    /* check for 128bit VRAM -> RGB528 */

-	    if (((*ramdacPtr->ReadDAC)(pScrn, IBMRGB_misc1) & 0x03) == 0x03) {

-	        IBMramdac_ID = IBM528_RAMDAC;	/* 128bit DAC found */

-	        if (rev == 0xe0)

-		    IBMramdac_ID = IBM528A_RAMDAC;

-	    }

-        }

-    }

-

-    (*ramdacPtr->WriteDAC)(pScrn, rev, 0, IBMRGB_rev);

-    (*ramdacPtr->WriteDAC)(pScrn, id, 0, IBMRGB_id);

-

-    if (IBMramdac_ID == -1) {

-        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 

-		"Cannot determine IBM RAMDAC type, aborting\n");

-	return NULL;

-    } else {

-        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 

-		"Attached RAMDAC is %s\n", IBMramdacDeviceInfo[IBMramdac_ID&0xFFFF].DeviceName);

-    }

-

-    for (i=0;ramdacs[i].token != -1;i++) {

-	if (ramdacs[i].token == IBMramdac_ID)

-	    RamDacIsSupported = TRUE;

-    }

-

-    if (!RamDacIsSupported) {

-        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 

-		"This IBM RAMDAC is NOT supported by this driver, aborting\n");

-	return NULL;

-    }

-

-    ramdacHelperPtr = RamDacHelperCreateInfoRec();

-    switch (IBMramdac_ID) {

-	case IBM526_RAMDAC:

-	case IBM526DB_RAMDAC:

- 	    ramdacHelperPtr->SetBpp = IBMramdac526SetBpp;

-    	    ramdacHelperPtr->HWCursorInit = IBMramdac526HWCursorInit;

-	    break;

-	case IBM640_RAMDAC:

- 	    ramdacHelperPtr->SetBpp = IBMramdac640SetBpp;

-    	    ramdacHelperPtr->HWCursorInit = IBMramdac640HWCursorInit;

-	    break;

-    }

-    ramdacPtr->RamDacType = IBMramdac_ID;

-    ramdacHelperPtr->RamDacType = IBMramdac_ID;

-    ramdacHelperPtr->Save = IBMramdacSave;

-    ramdacHelperPtr->Restore = IBMramdacRestore;

-

-    return ramdacHelperPtr;

-}

-

-void

-IBMramdac526SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)

-{

-    ramdacReg->DacRegs[IBMRGB_key_control] = 0x00; /* Disable Chroma Key */

-

-    switch (pScrn->bitsPerPixel) {

-	case 32:

-	    ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_32BPP;

-	    ramdacReg->DacRegs[IBMRGB_32bpp] = B32_DCOL_DIRECT;

-	    ramdacReg->DacRegs[IBMRGB_24bpp] = 0;

-	    ramdacReg->DacRegs[IBMRGB_16bpp] = 0;

-	    ramdacReg->DacRegs[IBMRGB_8bpp] = 0;

-	    if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {

-		ramdacReg->DacRegs[IBMRGB_key_control] = 0x01; /* Enable Key */

-		ramdacReg->DacRegs[IBMRGB_key] = 0xFF; 

-		ramdacReg->DacRegs[IBMRGB_key_mask] = 0xFF;

-	    }

-	    break;

-	case 24:

-	    ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_24BPP;

-	    ramdacReg->DacRegs[IBMRGB_32bpp] = 0;

-	    ramdacReg->DacRegs[IBMRGB_24bpp] = B24_DCOL_DIRECT;

-	    ramdacReg->DacRegs[IBMRGB_16bpp] = 0;

-	    ramdacReg->DacRegs[IBMRGB_8bpp] = 0;

-	    break;

-	case 16:

-	    if (pScrn->depth == 16) {

-	        ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_16BPP;

-	        ramdacReg->DacRegs[IBMRGB_32bpp] = 0;

-	        ramdacReg->DacRegs[IBMRGB_24bpp] = 0;

-	        ramdacReg->DacRegs[IBMRGB_16bpp] = B16_DCOL_DIRECT|B16_LINEAR |

-					           B16_CONTIGUOUS | B16_565;

-	        ramdacReg->DacRegs[IBMRGB_8bpp] = 0;

-	    } else {

-	        ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_16BPP;

-	        ramdacReg->DacRegs[IBMRGB_32bpp] = 0;

-	        ramdacReg->DacRegs[IBMRGB_24bpp] = 0;

-	        ramdacReg->DacRegs[IBMRGB_16bpp] = B16_DCOL_DIRECT|B16_LINEAR |

-					           B16_CONTIGUOUS | B16_555;

-	        ramdacReg->DacRegs[IBMRGB_8bpp] = 0;

-	    }

-	    break;

-	case 8:

-	    ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_8BPP;

-	    ramdacReg->DacRegs[IBMRGB_32bpp] = 0;

-	    ramdacReg->DacRegs[IBMRGB_24bpp] = 0;

-	    ramdacReg->DacRegs[IBMRGB_16bpp] = 0;

-	    ramdacReg->DacRegs[IBMRGB_8bpp] = B8_DCOL_INDIRECT;

-	    break;

-	case 4:

-	    ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_4BPP;

-	    ramdacReg->DacRegs[IBMRGB_32bpp] = 0;

-	    ramdacReg->DacRegs[IBMRGB_24bpp] = 0;

-	    ramdacReg->DacRegs[IBMRGB_16bpp] = 0;

-	    ramdacReg->DacRegs[IBMRGB_8bpp] = 0;

-    }

-}

-

-IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void) {

-    return IBMramdac526SetBpp;

-}

-

-void

-IBMramdac640SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)

-{

-    unsigned char bpp = 0x00;

-    unsigned char overlaybpp = 0x00;

-    unsigned char offset = 0x00;

-    unsigned char dispcont = 0x44;

-

-    ramdacReg->DacRegs[RGB640_SER_WID_03_00] = 0x00;

-    ramdacReg->DacRegs[RGB640_SER_WID_07_04] = 0x00;

-    ramdacReg->DacRegs[RGB640_DIAGS] = 0x07;

-

-    switch (pScrn->depth) {

-	case 8:

-	    ramdacReg->DacRegs[RGB640_SER_07_00] = 0x00; 

-	    ramdacReg->DacRegs[RGB640_SER_15_08] = 0x00;

-	    ramdacReg->DacRegs[RGB640_SER_23_16] = 0x00;

-	    ramdacReg->DacRegs[RGB640_SER_31_24] = 0x00;

-    	    ramdacReg->DacRegs[RGB640_SER_MODE] = IBM640_SER_16_1; /*16:1 Mux*/

-    	    ramdacReg->DacRegs[RGB640_MISC_CONF] = IBM640_PCLK_8; /* pll / 8 */

-	    bpp = 0x03;

-	    break;

-	case 15:

-	    ramdacReg->DacRegs[RGB640_SER_07_00] = 0x10;

-	    ramdacReg->DacRegs[RGB640_SER_15_08] = 0x11;

-	    ramdacReg->DacRegs[RGB640_SER_23_16] = 0x00;

-	    ramdacReg->DacRegs[RGB640_SER_31_24] = 0x00;

-    	    ramdacReg->DacRegs[RGB640_SER_MODE] = IBM640_SER_8_1; /* 8:1 Mux*/

-    	    ramdacReg->DacRegs[RGB640_MISC_CONF] = IBM640_PCLK_8; /* pll / 8 */

-	    bpp = 0x0E;

-	    break;

-	case 16:

-	    ramdacReg->DacRegs[RGB640_SER_07_00] = 0x10;

-	    ramdacReg->DacRegs[RGB640_SER_15_08] = 0x11;

-	    ramdacReg->DacRegs[RGB640_SER_23_16] = 0x00;

-	    ramdacReg->DacRegs[RGB640_SER_31_24] = 0x00;

-    	    ramdacReg->DacRegs[RGB640_SER_MODE] = IBM640_SER_8_1; /* 8:1 Mux*/

-    	    ramdacReg->DacRegs[RGB640_MISC_CONF] = IBM640_PCLK_8; /* pll / 8 */

-	    bpp = 0x05;

-	    break;

-	case 24:

-	    ramdacReg->DacRegs[RGB640_SER_07_00] = 0x30; 

-	    ramdacReg->DacRegs[RGB640_SER_15_08] = 0x31;

-	    ramdacReg->DacRegs[RGB640_SER_23_16] = 0x32;

-	    ramdacReg->DacRegs[RGB640_SER_31_24] = 0x33;

-    	    ramdacReg->DacRegs[RGB640_SER_MODE] = IBM640_SER_4_1; /* 4:1 Mux*/

-    	    ramdacReg->DacRegs[RGB640_MISC_CONF] = IBM640_PCLK_8; /* pll / 8 */

-	    bpp = 0x09;

-	    if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {

-		ramdacReg->DacRegs[RGB640_SER_WID_07_04] = 0x04;

-		ramdacReg->DacRegs[RGB640_CHROMA_KEY0] = 0xFF;

-		ramdacReg->DacRegs[RGB640_CHROMA_MASK0] = 0xFF;

-		offset = 0x04;

-		overlaybpp = 0x04;

-		dispcont = 0x48;

-	    }

-	    break;

-	case 30: /* 10 bit dac */

-	    ramdacReg->DacRegs[RGB640_SER_07_00] = 0x30; 

-	    ramdacReg->DacRegs[RGB640_SER_15_08] = 0x31;

-	    ramdacReg->DacRegs[RGB640_SER_23_16] = 0x32;

-	    ramdacReg->DacRegs[RGB640_SER_31_24] = 0x33;

-    	    ramdacReg->DacRegs[RGB640_SER_MODE] = IBM640_SER_4_1; /* 4:1 Mux*/

-    	    ramdacReg->DacRegs[RGB640_MISC_CONF] = IBM640_PSIZE10 | 

-						   IBM640_PCLK_8; /* pll / 8 */

-	    bpp = 0x0D;

-	    break;

-    }

-	

-    { 

-	int i;

-    	for (i=0x100;i<0x140;i+=4) {

-	    /* Initialize FrameBuffer Window Attribute Table */

-	    ramdacReg->DacRegs[i+0] = bpp;

-	    ramdacReg->DacRegs[i+1] = offset;

-	    ramdacReg->DacRegs[i+2] = 0x00;

-	    ramdacReg->DacRegs[i+3] = 0x00;

-	    /* Initialize Overlay Window Attribute Table */

-	    ramdacReg->DacRegs[i+0x100] = overlaybpp;

-	    ramdacReg->DacRegs[i+0x101] = 0x00;

-	    ramdacReg->DacRegs[i+0x102] = 0x00;

-	    ramdacReg->DacRegs[i+0x103] = dispcont;

-        }

-    }

-}

-

-static void 

-IBMramdac526ShowCursor(ScrnInfoPtr pScrn)

-{

-   RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-

-   /* Enable cursor - X11 mode */

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs, 0x00, 0x07);

-}

-

-static void 

-IBMramdac640ShowCursor(ScrnInfoPtr pScrn)

-{

-   RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-

-   /* Enable cursor - mode2 (x11 mode) */

-   (*ramdacPtr->WriteDAC)(pScrn, RGB640_CURSOR_CONTROL, 0x00, 0x0B);

-   (*ramdacPtr->WriteDAC)(pScrn, RGB640_CROSSHAIR_CONTROL, 0x00, 0x00);

-}

-

-static void

-IBMramdac526HideCursor(ScrnInfoPtr pScrn)

-{

-   RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-

-   /* Disable cursor - X11 mode */

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs, 0x00, 0x24);

-}

-

-static void

-IBMramdac640HideCursor(ScrnInfoPtr pScrn)

-{

-   RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-

-   /* Disable cursor - mode2 (x11 mode) */

-   (*ramdacPtr->WriteDAC)(pScrn, RGB640_CURSOR_CONTROL, 0x00, 0x08);

-}

-

-static void

-IBMramdac526SetCursorPosition(ScrnInfoPtr pScrn, int x, int y)

-{

-   RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-

-   x += 64;

-   y += 64;

-

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_hot_x, 0x00, 0x3f);

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_hot_y, 0x00, 0x3f);

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_xl, 0x00, x & 0xff);

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_xh, 0x00, (x>>8) & 0xf);

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_yl, 0x00, y & 0xff);

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_yh, 0x00, (y>>8) & 0xf);

-}

-

-static void

-IBMramdac640SetCursorPosition(ScrnInfoPtr pScrn, int x, int y)

-{

-   RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-

-   x += 64;

-   y += 64;

-

-   (*ramdacPtr->WriteDAC)(pScrn, RGB640_CURS_OFFSETX, 0x00, 0x3f);

-   (*ramdacPtr->WriteDAC)(pScrn, RGB640_CURS_OFFSETY, 0x00, 0x3f);

-   (*ramdacPtr->WriteDAC)(pScrn, RGB640_CURS_X_LOW, 0x00, x & 0xff);

-   (*ramdacPtr->WriteDAC)(pScrn, RGB640_CURS_X_HIGH, 0x00, (x>>8) & 0xf);

-   (*ramdacPtr->WriteDAC)(pScrn, RGB640_CURS_Y_LOW, 0x00, y & 0xff);

-   (*ramdacPtr->WriteDAC)(pScrn, RGB640_CURS_Y_HIGH, 0x00, (y>>8) & 0xf);

-}

-

-static void

-IBMramdac526SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)

-{

-   RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_col1_r, 0x00, bg >> 16);

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_col1_g, 0x00, bg >> 8);

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_col1_b, 0x00, bg);

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_col2_r, 0x00, fg >> 16);

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_col2_g, 0x00, fg >> 8);

-   (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_col2_b, 0x00, fg);

-}

-

-static void

-IBMramdac640SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)

-{

-   RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-  

-   (*ramdacPtr->WriteDAC)(pScrn, RGB640_CURS_COL0, 0x00, 0);

-   (*ramdacPtr->WriteData)(pScrn, fg>>16);

-   (*ramdacPtr->WriteData)(pScrn, fg>>8);

-   (*ramdacPtr->WriteData)(pScrn, fg);

-   (*ramdacPtr->WriteData)(pScrn, bg>>16);

-   (*ramdacPtr->WriteData)(pScrn, bg>>8);

-   (*ramdacPtr->WriteData)(pScrn, bg);

-   (*ramdacPtr->WriteData)(pScrn, fg>>16);

-   (*ramdacPtr->WriteData)(pScrn, fg>>8);

-   (*ramdacPtr->WriteData)(pScrn, fg);

-   (*ramdacPtr->WriteData)(pScrn, bg>>16);

-   (*ramdacPtr->WriteData)(pScrn, bg>>8);

-   (*ramdacPtr->WriteData)(pScrn, bg);

-}

-

-static void 

-IBMramdac526LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)

-{

-   RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-   int i;

-   /* 

-    * Output the cursor data.  The realize function has put the planes into

-    * their correct order, so we can just blast this out.

-    */

-   for (i = 0; i < 1024; i++)

-      (*ramdacPtr->WriteDAC)(pScrn, IBMRGB_curs_array + i, 0x00, (*src++));

-}

-

-static void 

-IBMramdac640LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)

-{

-   RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-   int i;

-   /* 

-    * Output the cursor data.  The realize function has put the planes into

-    * their correct order, so we can just blast this out.

-    */

-   for (i = 0; i < 1024; i++)

-      (*ramdacPtr->WriteDAC)(pScrn, RGB640_CURS_WRITE + i, 0x00, (*src++));

-}

-

-static Bool 

-IBMramdac526UseHWCursor(ScreenPtr pScr, CursorPtr pCurs)

-{

-    return TRUE;

-}

-

-static Bool 

-IBMramdac640UseHWCursor(ScreenPtr pScr, CursorPtr pCurs)

-{

-    return TRUE;

-}

-

-void

-IBMramdac526HWCursorInit(xf86CursorInfoPtr infoPtr)

-{

-    infoPtr->MaxWidth = 64;

-    infoPtr->MaxHeight = 64;

-    infoPtr->Flags = HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |

-		     HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |

-		     HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1;

-    infoPtr->SetCursorColors = IBMramdac526SetCursorColors;

-    infoPtr->SetCursorPosition = IBMramdac526SetCursorPosition;

-    infoPtr->LoadCursorImage = IBMramdac526LoadCursorImage;

-    infoPtr->HideCursor = IBMramdac526HideCursor;

-    infoPtr->ShowCursor = IBMramdac526ShowCursor;

-    infoPtr->UseHWCursor = IBMramdac526UseHWCursor;

-}

-

-void

-IBMramdac640HWCursorInit(xf86CursorInfoPtr infoPtr)

-{

-    infoPtr->MaxWidth = 64;

-    infoPtr->MaxHeight = 64;

-    infoPtr->Flags = HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |

-		     HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |

-		     HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1;

-    infoPtr->SetCursorColors = IBMramdac640SetCursorColors;

-    infoPtr->SetCursorPosition = IBMramdac640SetCursorPosition;

-    infoPtr->LoadCursorImage = IBMramdac640LoadCursorImage;

-    infoPtr->HideCursor = IBMramdac640HideCursor;

-    infoPtr->ShowCursor = IBMramdac640ShowCursor;

-    infoPtr->UseHWCursor = IBMramdac640UseHWCursor;

-}

+/*
+ * Copyright 1998 by Alan Hourihane, Wigan, England.
+ *
+ * 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 Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE 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.
+ *
+ * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
+ *
+ * IBM RAMDAC routines.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include "xf86Cursor.h"
+
+#define INIT_IBM_RAMDAC_INFO
+#include "IBMPriv.h"
+#include "xf86RamDacPriv.h"
+
+#define INITIALFREQERR 100000
+
+unsigned long
+IBMramdac640CalculateMNPCForClock(unsigned long RefClock,       /* In 100Hz units */
+                                  unsigned long ReqClock,       /* In 100Hz units */
+                                  char IsPixClock,      /* boolean, is this the pixel or the sys clock */
+                                  unsigned long MinClock,       /* Min VCO rating */
+                                  unsigned long MaxClock,       /* Max VCO rating */
+                                  unsigned long *rM,    /* M Out */
+                                  unsigned long *rN,    /* N Out */
+                                  unsigned long *rP,    /* Min P In, P Out */
+                                  unsigned long *rC     /* C Out */
+    )
+{
+    unsigned long M, N, P, iP = *rP;
+    unsigned long IntRef, VCO, Clock;
+    long freqErr, lowestFreqErr = INITIALFREQERR;
+    unsigned long ActualClock = 0;
+
+    for (N = 0; N <= 63; N++) {
+        IntRef = RefClock / (N + 1);
+        if (IntRef < 10000)
+            break;              /* IntRef needs to be >= 1MHz */
+        for (M = 2; M <= 127; M++) {
+            VCO = IntRef * (M + 1);
+            if ((VCO < MinClock) || (VCO > MaxClock))
+                continue;
+            for (P = iP; P <= 4; P++) {
+                if (P != 0)
+                    Clock = (RefClock * (M + 1)) / ((N + 1) * 2 * P);
+                else
+                    Clock = (RefClock * (M + 1)) / (N + 1);
+
+                freqErr = (Clock - ReqClock);
+
+                if (freqErr < 0) {
+                    /* PixelClock gets rounded up always so monitor reports
+                       correct frequency. */
+                    if (IsPixClock)
+                        continue;
+                    freqErr = -freqErr;
+                }
+
+                if (freqErr < lowestFreqErr) {
+                    *rM = M;
+                    *rN = N;
+                    *rP = P;
+                    *rC = (VCO <= 1280000 ? 1 : 2);
+                    ActualClock = Clock;
+
+                    lowestFreqErr = freqErr;
+                    /* Return if we found an exact match */
+                    if (freqErr == 0)
+                        return ActualClock;
+                }
+            }
+        }
+    }
+
+    return ActualClock;
+}
+
+unsigned long
+IBMramdac526CalculateMNPCForClock(unsigned long RefClock,       /* In 100Hz units */
+                                  unsigned long ReqClock,       /* In 100Hz units */
+                                  char IsPixClock,      /* boolean, is this the pixel or the sys clock */
+                                  unsigned long MinClock,       /* Min VCO rating */
+                                  unsigned long MaxClock,       /* Max VCO rating */
+                                  unsigned long *rM,    /* M Out */
+                                  unsigned long *rN,    /* N Out */
+                                  unsigned long *rP,    /* Min P In, P Out */
+                                  unsigned long *rC     /* C Out */
+    )
+{
+    unsigned long M, N, P, iP = *rP;
+    unsigned long IntRef, VCO, Clock;
+    long freqErr, lowestFreqErr = INITIALFREQERR;
+    unsigned long ActualClock = 0;
+
+    for (N = 0; N <= 63; N++) {
+        IntRef = RefClock / (N + 1);
+        if (IntRef < 10000)
+            break;              /* IntRef needs to be >= 1MHz */
+        for (M = 0; M <= 63; M++) {
+            VCO = IntRef * (M + 1);
+            if ((VCO < MinClock) || (VCO > MaxClock))
+                continue;
+            for (P = iP; P <= 4; P++) {
+                if (P)
+                    Clock = (RefClock * (M + 1)) / ((N + 1) * 2 * P);
+                else
+                    Clock = VCO;
+
+                freqErr = (Clock - ReqClock);
+
+                if (freqErr < 0) {
+                    /* PixelClock gets rounded up always so monitor reports
+                       correct frequency. */
+                    if (IsPixClock)
+                        continue;
+                    freqErr = -freqErr;
+                }
+
+                if (freqErr < lowestFreqErr) {
+                    *rM = M;
+                    *rN = N;
+                    *rP = P;
+                    *rC = (VCO <= 1280000 ? 1 : 2);
+                    ActualClock = Clock;
+
+                    lowestFreqErr = freqErr;
+                    /* Return if we found an exact match */
+                    if (freqErr == 0)
+                        return ActualClock;
+                }
+            }
+        }
+    }
+
+    return ActualClock;
+}
+
+void
+IBMramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
+                 RamDacRegRecPtr ramdacReg)
+{
+    int i, maxreg, dacreg;
+
+    switch (ramdacPtr->RamDacType) {
+    case IBM640_RAMDAC:
+        maxreg = 0x300;
+        dacreg = 1024;
+        break;
+    default:
+        maxreg = 0x100;
+        dacreg = 768;
+        break;
+    }
+
+    /* Here we pass a short, so that we can evaluate a mask too */
+    /* So that the mask is the high byte and the data the low byte */
+    for (i = 0; i < maxreg; i++)
+        (*ramdacPtr->WriteDAC)
+            (pScrn, i, (ramdacReg->DacRegs[i] & 0xFF00) >> 8,
+             ramdacReg->DacRegs[i]);
+
+    (*ramdacPtr->WriteAddress) (pScrn, 0);
+    for (i = 0; i < dacreg; i++)
+        (*ramdacPtr->WriteData) (pScrn, ramdacReg->DAC[i]);
+}
+
+void
+IBMramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
+              RamDacRegRecPtr ramdacReg)
+{
+    int i, maxreg, dacreg;
+
+    switch (ramdacPtr->RamDacType) {
+    case IBM640_RAMDAC:
+        maxreg = 0x300;
+        dacreg = 1024;
+        break;
+    default:
+        maxreg = 0x100;
+        dacreg = 768;
+        break;
+    }
+
+    (*ramdacPtr->ReadAddress) (pScrn, 0);
+    for (i = 0; i < dacreg; i++)
+        ramdacReg->DAC[i] = (*ramdacPtr->ReadData) (pScrn);
+
+    for (i = 0; i < maxreg; i++)
+        ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC) (pScrn, i);
+}
+
+RamDacHelperRecPtr
+IBMramdacProbe(ScrnInfoPtr pScrn,
+               RamDacSupportedInfoRecPtr ramdacs /* , RamDacRecPtr ramdacPtr */
+               )
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+    RamDacHelperRecPtr ramdacHelperPtr = NULL;
+    Bool RamDacIsSupported = FALSE;
+    int IBMramdac_ID = -1;
+    int i;
+    unsigned char id, rev, id2, rev2;
+
+    /* read ID and revision */
+    rev = (*ramdacPtr->ReadDAC) (pScrn, IBMRGB_rev);
+    id = (*ramdacPtr->ReadDAC) (pScrn, IBMRGB_id);
+
+    /* check if ID and revision are read only */
+    (*ramdacPtr->WriteDAC) (pScrn, ~rev, 0, IBMRGB_rev);
+    (*ramdacPtr->WriteDAC) (pScrn, ~id, 0, IBMRGB_id);
+    rev2 = (*ramdacPtr->ReadDAC) (pScrn, IBMRGB_rev);
+    id2 = (*ramdacPtr->ReadDAC) (pScrn, IBMRGB_id);
+
+    switch (id) {
+    case 0x30:
+        if (rev == 0xc0)
+            IBMramdac_ID = IBM624_RAMDAC;
+        if (rev == 0x80)
+            IBMramdac_ID = IBM624DB_RAMDAC;
+        break;
+    case 0x12:
+        if (rev == 0x1c)
+            IBMramdac_ID = IBM640_RAMDAC;
+        break;
+    case 0x01:
+        IBMramdac_ID = IBM525_RAMDAC;
+        break;
+    case 0x02:
+        if (rev == 0xf0)
+            IBMramdac_ID = IBM524_RAMDAC;
+        if (rev == 0xe0)
+            IBMramdac_ID = IBM524A_RAMDAC;
+        if (rev == 0xc0)
+            IBMramdac_ID = IBM526_RAMDAC;
+        if (rev == 0x80)
+            IBMramdac_ID = IBM526DB_RAMDAC;
+        break;
+    }
+
+    if (id == 1 || id == 2) {
+        if (id == id2 && rev == rev2) { /* IBM RGB52x found */
+            /* check for 128bit VRAM -> RGB528 */
+            if (((*ramdacPtr->ReadDAC) (pScrn, IBMRGB_misc1) & 0x03) == 0x03) {
+                IBMramdac_ID = IBM528_RAMDAC;   /* 128bit DAC found */
+                if (rev == 0xe0)
+                    IBMramdac_ID = IBM528A_RAMDAC;
+            }
+        }
+    }
+
+    (*ramdacPtr->WriteDAC) (pScrn, rev, 0, IBMRGB_rev);
+    (*ramdacPtr->WriteDAC) (pScrn, id, 0, IBMRGB_id);
+
+    if (IBMramdac_ID == -1) {
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+                   "Cannot determine IBM RAMDAC type, aborting\n");
+        return NULL;
+    }
+    else {
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+                   "Attached RAMDAC is %s\n",
+                   IBMramdacDeviceInfo[IBMramdac_ID & 0xFFFF].DeviceName);
+    }
+
+    for (i = 0; ramdacs[i].token != -1; i++) {
+        if (ramdacs[i].token == IBMramdac_ID)
+            RamDacIsSupported = TRUE;
+    }
+
+    if (!RamDacIsSupported) {
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+                   "This IBM RAMDAC is NOT supported by this driver, aborting\n");
+        return NULL;
+    }
+
+    ramdacHelperPtr = RamDacHelperCreateInfoRec();
+    switch (IBMramdac_ID) {
+    case IBM526_RAMDAC:
+    case IBM526DB_RAMDAC:
+        ramdacHelperPtr->SetBpp = IBMramdac526SetBpp;
+        ramdacHelperPtr->HWCursorInit = IBMramdac526HWCursorInit;
+        break;
+    case IBM640_RAMDAC:
+        ramdacHelperPtr->SetBpp = IBMramdac640SetBpp;
+        ramdacHelperPtr->HWCursorInit = IBMramdac640HWCursorInit;
+        break;
+    }
+    ramdacPtr->RamDacType = IBMramdac_ID;
+    ramdacHelperPtr->RamDacType = IBMramdac_ID;
+    ramdacHelperPtr->Save = IBMramdacSave;
+    ramdacHelperPtr->Restore = IBMramdacRestore;
+
+    return ramdacHelperPtr;
+}
+
+void
+IBMramdac526SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
+{
+    ramdacReg->DacRegs[IBMRGB_key_control] = 0x00;      /* Disable Chroma Key */
+
+    switch (pScrn->bitsPerPixel) {
+    case 32:
+        ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_32BPP;
+        ramdacReg->DacRegs[IBMRGB_32bpp] = B32_DCOL_DIRECT;
+        ramdacReg->DacRegs[IBMRGB_24bpp] = 0;
+        ramdacReg->DacRegs[IBMRGB_16bpp] = 0;
+        ramdacReg->DacRegs[IBMRGB_8bpp] = 0;
+        if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {
+            ramdacReg->DacRegs[IBMRGB_key_control] = 0x01;      /* Enable Key */
+            ramdacReg->DacRegs[IBMRGB_key] = 0xFF;
+            ramdacReg->DacRegs[IBMRGB_key_mask] = 0xFF;
+        }
+        break;
+    case 24:
+        ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_24BPP;
+        ramdacReg->DacRegs[IBMRGB_32bpp] = 0;
+        ramdacReg->DacRegs[IBMRGB_24bpp] = B24_DCOL_DIRECT;
+        ramdacReg->DacRegs[IBMRGB_16bpp] = 0;
+        ramdacReg->DacRegs[IBMRGB_8bpp] = 0;
+        break;
+    case 16:
+        if (pScrn->depth == 16) {
+            ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_16BPP;
+            ramdacReg->DacRegs[IBMRGB_32bpp] = 0;
+            ramdacReg->DacRegs[IBMRGB_24bpp] = 0;
+            ramdacReg->DacRegs[IBMRGB_16bpp] = B16_DCOL_DIRECT | B16_LINEAR |
+                B16_CONTIGUOUS | B16_565;
+            ramdacReg->DacRegs[IBMRGB_8bpp] = 0;
+        }
+        else {
+            ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_16BPP;
+            ramdacReg->DacRegs[IBMRGB_32bpp] = 0;
+            ramdacReg->DacRegs[IBMRGB_24bpp] = 0;
+            ramdacReg->DacRegs[IBMRGB_16bpp] = B16_DCOL_DIRECT | B16_LINEAR |
+                B16_CONTIGUOUS | B16_555;
+            ramdacReg->DacRegs[IBMRGB_8bpp] = 0;
+        }
+        break;
+    case 8:
+        ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_8BPP;
+        ramdacReg->DacRegs[IBMRGB_32bpp] = 0;
+        ramdacReg->DacRegs[IBMRGB_24bpp] = 0;
+        ramdacReg->DacRegs[IBMRGB_16bpp] = 0;
+        ramdacReg->DacRegs[IBMRGB_8bpp] = B8_DCOL_INDIRECT;
+        break;
+    case 4:
+        ramdacReg->DacRegs[IBMRGB_pix_fmt] = PIXEL_FORMAT_4BPP;
+        ramdacReg->DacRegs[IBMRGB_32bpp] = 0;
+        ramdacReg->DacRegs[IBMRGB_24bpp] = 0;
+        ramdacReg->DacRegs[IBMRGB_16bpp] = 0;
+        ramdacReg->DacRegs[IBMRGB_8bpp] = 0;
+    }
+}
+
+IBMramdac526SetBppProc *
+IBMramdac526SetBppWeak(void)
+{
+    return IBMramdac526SetBpp;
+}
+
+void
+IBMramdac640SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
+{
+    unsigned char bpp = 0x00;
+    unsigned char overlaybpp = 0x00;
+    unsigned char offset = 0x00;
+    unsigned char dispcont = 0x44;
+
+    ramdacReg->DacRegs[RGB640_SER_WID_03_00] = 0x00;
+    ramdacReg->DacRegs[RGB640_SER_WID_07_04] = 0x00;
+    ramdacReg->DacRegs[RGB640_DIAGS] = 0x07;
+
+    switch (pScrn->depth) {
+    case 8:
+        ramdacReg->DacRegs[RGB640_SER_07_00] = 0x00;
+        ramdacReg->DacRegs[RGB640_SER_15_08] = 0x00;
+        ramdacReg->DacRegs[RGB640_SER_23_16] = 0x00;
+        ramdacReg->DacRegs[RGB640_SER_31_24] = 0x00;
+        ramdacReg->DacRegs[RGB640_SER_MODE] = IBM640_SER_16_1;  /*16:1 Mux */
+        ramdacReg->DacRegs[RGB640_MISC_CONF] = IBM640_PCLK_8;   /* pll / 8 */
+        bpp = 0x03;
+        break;
+    case 15:
+        ramdacReg->DacRegs[RGB640_SER_07_00] = 0x10;
+        ramdacReg->DacRegs[RGB640_SER_15_08] = 0x11;
+        ramdacReg->DacRegs[RGB640_SER_23_16] = 0x00;
+        ramdacReg->DacRegs[RGB640_SER_31_24] = 0x00;
+        ramdacReg->DacRegs[RGB640_SER_MODE] = IBM640_SER_8_1;   /* 8:1 Mux */
+        ramdacReg->DacRegs[RGB640_MISC_CONF] = IBM640_PCLK_8;   /* pll / 8 */
+        bpp = 0x0E;
+        break;
+    case 16:
+        ramdacReg->DacRegs[RGB640_SER_07_00] = 0x10;
+        ramdacReg->DacRegs[RGB640_SER_15_08] = 0x11;
+        ramdacReg->DacRegs[RGB640_SER_23_16] = 0x00;
+        ramdacReg->DacRegs[RGB640_SER_31_24] = 0x00;
+        ramdacReg->DacRegs[RGB640_SER_MODE] = IBM640_SER_8_1;   /* 8:1 Mux */
+        ramdacReg->DacRegs[RGB640_MISC_CONF] = IBM640_PCLK_8;   /* pll / 8 */
+        bpp = 0x05;
+        break;
+    case 24:
+        ramdacReg->DacRegs[RGB640_SER_07_00] = 0x30;
+        ramdacReg->DacRegs[RGB640_SER_15_08] = 0x31;
+        ramdacReg->DacRegs[RGB640_SER_23_16] = 0x32;
+        ramdacReg->DacRegs[RGB640_SER_31_24] = 0x33;
+        ramdacReg->DacRegs[RGB640_SER_MODE] = IBM640_SER_4_1;   /* 4:1 Mux */
+        ramdacReg->DacRegs[RGB640_MISC_CONF] = IBM640_PCLK_8;   /* pll / 8 */
+        bpp = 0x09;
+        if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {
+            ramdacReg->DacRegs[RGB640_SER_WID_07_04] = 0x04;
+            ramdacReg->DacRegs[RGB640_CHROMA_KEY0] = 0xFF;
+            ramdacReg->DacRegs[RGB640_CHROMA_MASK0] = 0xFF;
+            offset = 0x04;
+            overlaybpp = 0x04;
+            dispcont = 0x48;
+        }
+        break;
+    case 30:                   /* 10 bit dac */
+        ramdacReg->DacRegs[RGB640_SER_07_00] = 0x30;
+        ramdacReg->DacRegs[RGB640_SER_15_08] = 0x31;
+        ramdacReg->DacRegs[RGB640_SER_23_16] = 0x32;
+        ramdacReg->DacRegs[RGB640_SER_31_24] = 0x33;
+        ramdacReg->DacRegs[RGB640_SER_MODE] = IBM640_SER_4_1;   /* 4:1 Mux */
+        ramdacReg->DacRegs[RGB640_MISC_CONF] = IBM640_PSIZE10 | IBM640_PCLK_8;  /* pll / 8 */
+        bpp = 0x0D;
+        break;
+    }
+
+    {
+        int i;
+
+        for (i = 0x100; i < 0x140; i += 4) {
+            /* Initialize FrameBuffer Window Attribute Table */
+            ramdacReg->DacRegs[i + 0] = bpp;
+            ramdacReg->DacRegs[i + 1] = offset;
+            ramdacReg->DacRegs[i + 2] = 0x00;
+            ramdacReg->DacRegs[i + 3] = 0x00;
+            /* Initialize Overlay Window Attribute Table */
+            ramdacReg->DacRegs[i + 0x100] = overlaybpp;
+            ramdacReg->DacRegs[i + 0x101] = 0x00;
+            ramdacReg->DacRegs[i + 0x102] = 0x00;
+            ramdacReg->DacRegs[i + 0x103] = dispcont;
+        }
+    }
+}
+
+static void
+IBMramdac526ShowCursor(ScrnInfoPtr pScrn)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    /* Enable cursor - X11 mode */
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs, 0x00, 0x07);
+}
+
+static void
+IBMramdac640ShowCursor(ScrnInfoPtr pScrn)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    /* Enable cursor - mode2 (x11 mode) */
+    (*ramdacPtr->WriteDAC) (pScrn, RGB640_CURSOR_CONTROL, 0x00, 0x0B);
+    (*ramdacPtr->WriteDAC) (pScrn, RGB640_CROSSHAIR_CONTROL, 0x00, 0x00);
+}
+
+static void
+IBMramdac526HideCursor(ScrnInfoPtr pScrn)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    /* Disable cursor - X11 mode */
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs, 0x00, 0x24);
+}
+
+static void
+IBMramdac640HideCursor(ScrnInfoPtr pScrn)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    /* Disable cursor - mode2 (x11 mode) */
+    (*ramdacPtr->WriteDAC) (pScrn, RGB640_CURSOR_CONTROL, 0x00, 0x08);
+}
+
+static void
+IBMramdac526SetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    x += 64;
+    y += 64;
+
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_hot_x, 0x00, 0x3f);
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_hot_y, 0x00, 0x3f);
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_xl, 0x00, x & 0xff);
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_xh, 0x00, (x >> 8) & 0xf);
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_yl, 0x00, y & 0xff);
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_yh, 0x00, (y >> 8) & 0xf);
+}
+
+static void
+IBMramdac640SetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    x += 64;
+    y += 64;
+
+    (*ramdacPtr->WriteDAC) (pScrn, RGB640_CURS_OFFSETX, 0x00, 0x3f);
+    (*ramdacPtr->WriteDAC) (pScrn, RGB640_CURS_OFFSETY, 0x00, 0x3f);
+    (*ramdacPtr->WriteDAC) (pScrn, RGB640_CURS_X_LOW, 0x00, x & 0xff);
+    (*ramdacPtr->WriteDAC) (pScrn, RGB640_CURS_X_HIGH, 0x00, (x >> 8) & 0xf);
+    (*ramdacPtr->WriteDAC) (pScrn, RGB640_CURS_Y_LOW, 0x00, y & 0xff);
+    (*ramdacPtr->WriteDAC) (pScrn, RGB640_CURS_Y_HIGH, 0x00, (y >> 8) & 0xf);
+}
+
+static void
+IBMramdac526SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_col1_r, 0x00, bg >> 16);
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_col1_g, 0x00, bg >> 8);
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_col1_b, 0x00, bg);
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_col2_r, 0x00, fg >> 16);
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_col2_g, 0x00, fg >> 8);
+    (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_col2_b, 0x00, fg);
+}
+
+static void
+IBMramdac640SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    (*ramdacPtr->WriteDAC) (pScrn, RGB640_CURS_COL0, 0x00, 0);
+    (*ramdacPtr->WriteData) (pScrn, fg >> 16);
+    (*ramdacPtr->WriteData) (pScrn, fg >> 8);
+    (*ramdacPtr->WriteData) (pScrn, fg);
+    (*ramdacPtr->WriteData) (pScrn, bg >> 16);
+    (*ramdacPtr->WriteData) (pScrn, bg >> 8);
+    (*ramdacPtr->WriteData) (pScrn, bg);
+    (*ramdacPtr->WriteData) (pScrn, fg >> 16);
+    (*ramdacPtr->WriteData) (pScrn, fg >> 8);
+    (*ramdacPtr->WriteData) (pScrn, fg);
+    (*ramdacPtr->WriteData) (pScrn, bg >> 16);
+    (*ramdacPtr->WriteData) (pScrn, bg >> 8);
+    (*ramdacPtr->WriteData) (pScrn, bg);
+}
+
+static void
+IBMramdac526LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+    int i;
+
+    /* 
+     * Output the cursor data.  The realize function has put the planes into
+     * their correct order, so we can just blast this out.
+     */
+    for (i = 0; i < 1024; i++)
+        (*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_array + i, 0x00, (*src++));
+}
+
+static void
+IBMramdac640LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+    int i;
+
+    /* 
+     * Output the cursor data.  The realize function has put the planes into
+     * their correct order, so we can just blast this out.
+     */
+    for (i = 0; i < 1024; i++)
+        (*ramdacPtr->WriteDAC) (pScrn, RGB640_CURS_WRITE + i, 0x00, (*src++));
+}
+
+static Bool
+IBMramdac526UseHWCursor(ScreenPtr pScr, CursorPtr pCurs)
+{
+    return TRUE;
+}
+
+static Bool
+IBMramdac640UseHWCursor(ScreenPtr pScr, CursorPtr pCurs)
+{
+    return TRUE;
+}
+
+void
+IBMramdac526HWCursorInit(xf86CursorInfoPtr infoPtr)
+{
+    infoPtr->MaxWidth = 64;
+    infoPtr->MaxHeight = 64;
+    infoPtr->Flags = HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
+        HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |
+        HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1;
+    infoPtr->SetCursorColors = IBMramdac526SetCursorColors;
+    infoPtr->SetCursorPosition = IBMramdac526SetCursorPosition;
+    infoPtr->LoadCursorImage = IBMramdac526LoadCursorImage;
+    infoPtr->HideCursor = IBMramdac526HideCursor;
+    infoPtr->ShowCursor = IBMramdac526ShowCursor;
+    infoPtr->UseHWCursor = IBMramdac526UseHWCursor;
+}
+
+void
+IBMramdac640HWCursorInit(xf86CursorInfoPtr infoPtr)
+{
+    infoPtr->MaxWidth = 64;
+    infoPtr->MaxHeight = 64;
+    infoPtr->Flags = HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
+        HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |
+        HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1;
+    infoPtr->SetCursorColors = IBMramdac640SetCursorColors;
+    infoPtr->SetCursorPosition = IBMramdac640SetCursorPosition;
+    infoPtr->LoadCursorImage = IBMramdac640LoadCursorImage;
+    infoPtr->HideCursor = IBMramdac640HideCursor;
+    infoPtr->ShowCursor = IBMramdac640ShowCursor;
+    infoPtr->UseHWCursor = IBMramdac640UseHWCursor;
+}
diff --git a/xorg-server/hw/xfree86/ramdac/IBM.h b/xorg-server/hw/xfree86/ramdac/IBM.h
index 6fa18b219..986be2f48 100644
--- a/xorg-server/hw/xfree86/ramdac/IBM.h
+++ b/xorg-server/hw/xfree86/ramdac/IBM.h
@@ -1,19 +1,54 @@
 
 #include <xf86RamDac.h>
 
-extern _X_EXPORT RamDacHelperRecPtr IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs);
-extern _X_EXPORT void IBMramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec);
-extern _X_EXPORT void IBMramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec);
-extern _X_EXPORT void IBMramdac526SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec);
-extern _X_EXPORT void IBMramdac640SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec);
-extern _X_EXPORT unsigned long IBMramdac526CalculateMNPCForClock(unsigned long RefClock,
-    unsigned long ReqClock, char IsPixClock, unsigned long MinClock,
-    unsigned long MaxClock, unsigned long *rM, unsigned long *rN,
-    unsigned long *rP, unsigned long *rC);
-extern _X_EXPORT unsigned long IBMramdac640CalculateMNPCForClock(unsigned long RefClock,
-    unsigned long ReqClock, char IsPixClock, unsigned long MinClock,
-    unsigned long MaxClock, unsigned long *rM, unsigned long *rN,
-    unsigned long *rP, unsigned long *rC);
+extern _X_EXPORT RamDacHelperRecPtr IBMramdacProbe(ScrnInfoPtr pScrn,
+                                                   RamDacSupportedInfoRecPtr
+                                                   ramdacs);
+extern _X_EXPORT void IBMramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec,
+                                    RamDacRegRecPtr RamDacRegRec);
+extern _X_EXPORT void IBMramdacRestore(ScrnInfoPtr pScrn,
+                                       RamDacRecPtr RamDacRec,
+                                       RamDacRegRecPtr RamDacRegRec);
+extern _X_EXPORT void IBMramdac526SetBpp(ScrnInfoPtr pScrn,
+                                         RamDacRegRecPtr RamDacRegRec);
+extern _X_EXPORT void IBMramdac640SetBpp(ScrnInfoPtr pScrn,
+                                         RamDacRegRecPtr RamDacRegRec);
+extern _X_EXPORT unsigned long IBMramdac526CalculateMNPCForClock(unsigned long
+                                                                 RefClock,
+                                                                 unsigned long
+                                                                 ReqClock,
+                                                                 char
+                                                                 IsPixClock,
+                                                                 unsigned long
+                                                                 MinClock,
+                                                                 unsigned long
+                                                                 MaxClock,
+                                                                 unsigned long
+                                                                 *rM,
+                                                                 unsigned long
+                                                                 *rN,
+                                                                 unsigned long
+                                                                 *rP,
+                                                                 unsigned long
+                                                                 *rC);
+extern _X_EXPORT unsigned long IBMramdac640CalculateMNPCForClock(unsigned long
+                                                                 RefClock,
+                                                                 unsigned long
+                                                                 ReqClock,
+                                                                 char
+                                                                 IsPixClock,
+                                                                 unsigned long
+                                                                 MinClock,
+                                                                 unsigned long
+                                                                 MaxClock,
+                                                                 unsigned long
+                                                                 *rM,
+                                                                 unsigned long
+                                                                 *rN,
+                                                                 unsigned long
+                                                                 *rP,
+                                                                 unsigned long
+                                                                 *rC);
 extern _X_EXPORT void IBMramdac526HWCursorInit(xf86CursorInfoPtr infoPtr);
 extern _X_EXPORT void IBMramdac640HWCursorInit(xf86CursorInfoPtr infoPtr);
 
@@ -46,7 +81,7 @@ extern _X_EXPORT IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void);
 #define IBMRGB_pwr_mgmt		0x05
 #define IBMRGB_dac_op		0x06
 #define IBMRGB_pal_ctrl		0x07
-#define IBMRGB_sysclk		0x08  /* not RGB525 */
+#define IBMRGB_sysclk		0x08    /* not RGB525 */
 #define IBMRGB_pix_fmt		0x0a
 #define IBMRGB_8bpp		0x0b
 #define IBMRGB_16bpp		0x0c
@@ -55,8 +90,8 @@ extern _X_EXPORT IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void);
 #define IBMRGB_pll_ctrl1	0x10
 #define IBMRGB_pll_ctrl2	0x11
 #define IBMRGB_pll_ref_div_fix	0x14
-#define IBMRGB_sysclk_ref_div	0x15  /* not RGB525 */
-#define IBMRGB_sysclk_vco_div	0x16  /* not RGB525 */
+#define IBMRGB_sysclk_ref_div	0x15    /* not RGB525 */
+#define IBMRGB_sysclk_vco_div	0x16    /* not RGB525 */
 /* #define IBMRGB_f0		0x20 */
 
 #define IBMRGB_sysclk_n		0x15
@@ -105,7 +140,7 @@ extern _X_EXPORT IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void);
 #define IBMRGB_misc1		0x70
 #define IBMRGB_misc2		0x71
 #define IBMRGB_misc3		0x72
-#define IBMRGB_misc4		0x73  /* not RGB525 */
+#define IBMRGB_misc4		0x73    /* not RGB525 */
 #define IBMRGB_key_control	0x78
 #define IBMRGB_dac_sense	0x82
 #define IBMRGB_misr_r		0x84
@@ -119,9 +154,7 @@ extern _X_EXPORT IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void);
 #define IBMRGB_vram_mask_3	0x93
 #define IBMRGB_curs_array	0x100
 
-
-
-/* Constants rgb525.h */  
+/* Constants rgb525.h */
 
 /* RGB525_REVISION_LEVEL */
 #define RGB525_PRODUCT_REV_LEVEL        0xf0
diff --git a/xorg-server/hw/xfree86/ramdac/TI.c b/xorg-server/hw/xfree86/ramdac/TI.c
index f189fed25..393b774d4 100644
--- a/xorg-server/hw/xfree86/ramdac/TI.c
+++ b/xorg-server/hw/xfree86/ramdac/TI.c
@@ -1,717 +1,725 @@
-/*

- * Copyright 1998 by Alan Hourihane, Wigan, England.

- *

- * 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 Alan Hourihane not be used in

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

- * specific, written prior permission.  Alan Hourihane makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL ALAN HOURIHANE 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.

- *

- * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>

- *

- * Modified from IBM.c to support TI RAMDAC routines 

- *   by Jens Owen, <jens@tungstengraphics.com>.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include "xf86Cursor.h"

-

-#define INIT_TI_RAMDAC_INFO

-#include "TIPriv.h"

-#include "xf86RamDacPriv.h"

-

-/* The following values are in kHz */

-#define TI_MIN_VCO_FREQ  110000

-#define TI_MAX_VCO_FREQ  220000

-

-unsigned long

-TIramdacCalculateMNPForClock(

-    unsigned long RefClock,	/* In 100Hz units */

-    unsigned long ReqClock,	/* In 100Hz units */

-    char IsPixClock,	/* boolean, is this the pixel or the sys clock */

-    unsigned long MinClock,	/* Min VCO rating */

-    unsigned long MaxClock,	/* Max VCO rating */

-    unsigned long *rM,	/* M Out */

-    unsigned long *rN,	/* N Out */

-    unsigned long *rP 	/* Min P In, P Out */

-)

-{

-    unsigned long   n, p;

-    unsigned long   best_m = 0, best_n = 0;

-    double          VCO, IntRef = (double)RefClock;

-    double          m_err, inc_m, calc_m;

-    unsigned long   ActualClock;

-

-    /* Make sure that MinClock <= ReqClock <= MaxClock */

-    if ( ReqClock < MinClock)

-	ReqClock = MinClock;

-    if ( ReqClock > MaxClock )

-	ReqClock = MaxClock;

-

-    /*

-     * ActualClock = VCO / 2 ^ p

-     * Choose p so that TI_MIN_VCO_FREQ <= VCO <= TI_MAX_VCO_FREQ

-     * Note that since TI_MAX_VCO_FREQ = 2 * TI_MIN_VCO_FREQ

-     * we don't have to bother checking for this maximum limit.

-     */

-    VCO = (double)ReqClock;

-    for ( p = 0; p < 3 && VCO < TI_MIN_VCO_FREQ; ( p )++ )

-	 VCO *= 2.0;

-

-    /*

-     * We avoid doing multiplications by ( 65 - n ),

-     * and add an increment instead - this keeps any error small.

-     */

-    inc_m = VCO / ( IntRef * 8.0 );

-

-    /* Initial value of calc_m for the loop */

-    calc_m = inc_m + inc_m + inc_m;

-

-    /* Initial amount of error for an integer - impossibly large */

-    m_err = 2.0;

-

-    /* Search for the closest INTEGER value of ( 65 - m ) */

-    for ( n = 3; n <= 25; ( n )++, calc_m += inc_m ) {

-

-	/* Ignore values of ( 65 - m ) which we can't use */

-	if ( calc_m < 3.0 || calc_m > 64.0 )

-	    continue;

-

-	/*

-	 * Pick the closest INTEGER (has smallest fractional part).

-	 * The optimizer should clean this up for us.

-	 */

-	if (( calc_m - ( int ) calc_m ) < m_err ) {

-	    m_err = calc_m - ( int ) calc_m;

-	    best_m = ( int ) calc_m;

-	    best_n = n;

-	}

-    }

-

-    /* 65 - ( 65 - x ) = x */

-    *rM = 65 - best_m;

-    *rN = 65 - best_n;

-    *rP = p;

-

-    /* Now all the calculations can be completed */

-    VCO = 8.0 * IntRef * best_m / best_n;

-    ActualClock = VCO / ( 1 << p );

-

-    DebugF( "f_out=%ld f_vco=%.1f n=%d m=%d p=%d\n",

-	    ActualClock, VCO, *rN, *rM, *rP);

-

-    return ActualClock;

-}

-

-void

-TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,

-				   RamDacRegRecPtr ramdacReg)

-{

-    int i;

-    unsigned long status;

-

-    /* Here we pass a short, so that we can evaluate a mask too

-     * So that the mask is the high byte and the data the low byte

-     * Order is important

-     */

-    TIRESTORE(TIDAC_latch_ctrl);

-    TIRESTORE(TIDAC_true_color_ctrl);

-    TIRESTORE(TIDAC_multiplex_ctrl);

-    TIRESTORE(TIDAC_clock_select);

-    TIRESTORE(TIDAC_palette_page);

-    TIRESTORE(TIDAC_general_ctrl);

-    TIRESTORE(TIDAC_misc_ctrl);

-	    /* 0x2A & 0x2B are reserved */

-    TIRESTORE(TIDAC_key_over_low);

-    TIRESTORE(TIDAC_key_over_high);

-    TIRESTORE(TIDAC_key_red_low);

-    TIRESTORE(TIDAC_key_red_high);

-    TIRESTORE(TIDAC_key_green_low);

-    TIRESTORE(TIDAC_key_green_high);

-    TIRESTORE(TIDAC_key_blue_low);

-    TIRESTORE(TIDAC_key_blue_high);

-    TIRESTORE(TIDAC_key_ctrl);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_clock_ctrl, 0, 0x30);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_clock_ctrl, 0, 0x38);

-    TIRESTORE(TIDAC_clock_ctrl);

-    TIRESTORE(TIDAC_sense_test);

-    TIRESTORE(TIDAC_ind_curs_ctrl);

-

-    /* only restore clocks if they were valid to begin with */

-

-    if (ramdacReg->DacRegs[TIDAC_PIXEL_VALID]) {

-    /* Reset pixel clock */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0, 0x3c);

-

-    /* Restore N, M & P values for pixel clocks */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0,

-					ramdacReg->DacRegs[TIDAC_PIXEL_N]);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0,

-					ramdacReg->DacRegs[TIDAC_PIXEL_M]);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0,

-					ramdacReg->DacRegs[TIDAC_PIXEL_P]);

-

-    /* wait for pixel clock to lock */

-    i = 1000000;

-    do {

-	status = (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_pixel_data);

-    } while ((!(status & 0x40)) && (--i));

-    if (!(status & 0x40)) {

-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 

-			"Pixel clock setup timed out\n");

-	return;

-    }

-    }

-

-    if (ramdacReg->DacRegs[TIDAC_LOOP_VALID]) {

-    /* Reset loop clock */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0, 0x70);

-

-    /* Restore N, M & P values for pixel clocks */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0,

-					ramdacReg->DacRegs[TIDAC_LOOP_N]);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0,

-					ramdacReg->DacRegs[TIDAC_LOOP_M]);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0,

-					ramdacReg->DacRegs[TIDAC_LOOP_P]);

-

-    /* wait for loop clock to lock */

-    i = 1000000;

-    do {

-        status = (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_loop_data);

-    } while ((!(status & 0x40)) && (--i));

-    if (!(status & 0x40)) {

-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 

-			"Loop clock setup timed out\n");

-	    return;

-    }

-    }

-

-    /* restore palette */

-    (*ramdacPtr->WriteAddress)(pScrn, 0);

-#ifndef NOT_DONE

-    for (i=0;i<768;i++)

-	(*ramdacPtr->WriteData)(pScrn, ramdacReg->DAC[i]);

-#else

-	(*ramdacPtr->WriteData)(pScrn, 0);

-	(*ramdacPtr->WriteData)(pScrn, 0);

-	(*ramdacPtr->WriteData)(pScrn, 0);

-    for (i=0;i<765;i++)

-	(*ramdacPtr->WriteData)(pScrn, 0xff);

-#endif

-}

-

-void

-TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, 

-				RamDacRegRecPtr ramdacReg)

-{

-    int i;

-

-    (*ramdacPtr->ReadAddress)(pScrn, 0);

-    for (i=0;i<768;i++)

-	ramdacReg->DAC[i] = (*ramdacPtr->ReadData)(pScrn);

-

-    /* Read back N,M and P values for pixel clock */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);

-    ramdacReg->DacRegs[TIDAC_PIXEL_N] = 

-			(*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_pixel_data);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x11);

-    ramdacReg->DacRegs[TIDAC_PIXEL_M] = 

-		    	(*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_pixel_data);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);

-    ramdacReg->DacRegs[TIDAC_PIXEL_P] = 

-		    (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_pixel_data);

-

-    /* Read back N,M and P values for loop clock */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);

-    ramdacReg->DacRegs[TIDAC_LOOP_N] = 

-		    (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_loop_data);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x11);

-    ramdacReg->DacRegs[TIDAC_LOOP_M] = 

-		    (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_loop_data);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);

-    ramdacReg->DacRegs[TIDAC_LOOP_P] = 

-		    (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_loop_data);

-

-    /* Order is important */

-    TISAVE(TIDAC_latch_ctrl);

-    TISAVE(TIDAC_true_color_ctrl);

-    TISAVE(TIDAC_multiplex_ctrl);

-    TISAVE(TIDAC_clock_select);

-    TISAVE(TIDAC_palette_page);

-    TISAVE(TIDAC_general_ctrl);

-    TISAVE(TIDAC_misc_ctrl);

-	    /* 0x2A & 0x2B are reserved */

-    TISAVE(TIDAC_key_over_low);

-    TISAVE(TIDAC_key_over_high);

-    TISAVE(TIDAC_key_red_low);

-    TISAVE(TIDAC_key_red_high);

-    TISAVE(TIDAC_key_green_low);

-    TISAVE(TIDAC_key_green_high);

-    TISAVE(TIDAC_key_blue_low);

-    TISAVE(TIDAC_key_blue_high);

-    TISAVE(TIDAC_key_ctrl);

-    TISAVE(TIDAC_clock_ctrl);

-    TISAVE(TIDAC_sense_test);

-    TISAVE(TIDAC_ind_curs_ctrl);

-}

-

-RamDacHelperRecPtr

-TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs)

-{

-    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-    RamDacHelperRecPtr ramdacHelperPtr = NULL;

-    Bool RamDacIsSupported = FALSE;

-    int TIramdac_ID = -1;

-    int i;

-    unsigned char id, rev, rev2, id2;

-

-    /* read ID and revision */

-    rev = (*ramdacPtr->ReadDAC)(pScrn, TIDAC_rev);

-    id = (*ramdacPtr->ReadDAC)(pScrn, TIDAC_id);

-

-    /* check if ID and revision are read only */

-    (*ramdacPtr->WriteDAC)(pScrn, ~rev, 0, TIDAC_rev);

-    (*ramdacPtr->WriteDAC)(pScrn, ~id, 0, TIDAC_id);

-    rev2 = (*ramdacPtr->ReadDAC)(pScrn, TIDAC_rev);

-    id2 = (*ramdacPtr->ReadDAC)(pScrn, TIDAC_id);

-

-    switch (id) {

-	case TIDAC_TVP_3030_ID:

-		if (id == id2 && rev == rev2)  /* check for READ ONLY */

-		    TIramdac_ID = TI3030_RAMDAC;

-		break;

-	case TIDAC_TVP_3026_ID:

-		if (id == id2 && rev == rev2)  /* check for READ ONLY */

-		    TIramdac_ID = TI3026_RAMDAC;

-		break;

-    }

-

-    (*ramdacPtr->WriteDAC)(pScrn, rev, 0, TIDAC_rev);

-    (*ramdacPtr->WriteDAC)(pScrn, id, 0, TIDAC_id);

-

-    if (TIramdac_ID == -1) {

-        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 

-		"Cannot determine TI RAMDAC type, aborting\n");

-	return NULL;

-    } else {

-        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 

-		"Attached RAMDAC is %s\n", TIramdacDeviceInfo[TIramdac_ID&0xFFFF].DeviceName);

-    }

-

-    for (i=0;ramdacs[i].token != -1;i++) {

-	if (ramdacs[i].token == TIramdac_ID)

-	    RamDacIsSupported = TRUE;

-    }

-

-    if (!RamDacIsSupported) {

-        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 

-		"This TI RAMDAC is NOT supported by this driver, aborting\n");

-	return NULL;

-    }

-

-    ramdacHelperPtr = RamDacHelperCreateInfoRec();

-    switch (TIramdac_ID) {

-	case TI3030_RAMDAC:

- 	    ramdacHelperPtr->SetBpp = TIramdac3030SetBpp;

-    	    ramdacHelperPtr->HWCursorInit = TIramdacHWCursorInit;

-	    break;

-	case TI3026_RAMDAC:

- 	    ramdacHelperPtr->SetBpp = TIramdac3026SetBpp;

-    	    ramdacHelperPtr->HWCursorInit = TIramdacHWCursorInit;

-	    break;

-    }

-    ramdacPtr->RamDacType = TIramdac_ID;

-    ramdacHelperPtr->RamDacType = TIramdac_ID;

-    ramdacHelperPtr->Save = TIramdacSave;

-    ramdacHelperPtr->Restore = TIramdacRestore;

-

-    return ramdacHelperPtr;

-}

-

-void

-TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)

-{

-    switch (pScrn->bitsPerPixel) {

-    case 32:

-	/* order is important */

-	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;

-	ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x46;

-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x5c;

-	ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;

-	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;

-	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;

-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x3C;

-	/* 0x2A & 0x2B are reserved */

-	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;

-	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;

-	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;

-	if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {

-	    ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x06;

-	    ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x3C;

-	    ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x01;

-	}

-	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;

-	break;

-    case 24:

-	/* order is important */

-	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;

-	ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x56;

-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x58;

-	ramdacReg->DacRegs[TIDAC_clock_select] = 0x25;

-	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;

-	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x00;

-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;

-	/* 0x2A & 0x2B are reserved */

-	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;

-	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;

-	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;

-	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;

-	break;

-    case 16:

-	/* order is important */

-#if 0

-	/* Matrox driver uses this */

-	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x07;

-#else

-	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;

-#endif

-	if (pScrn->depth == 16) {

-	    ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x45;

-	} else {

-	    ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x44;

-	}

-#if 0

-	/* Matrox driver uses this */

-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x50;

-	ramdacReg->DacRegs[TIDAC_clock_select] = 0x15;

-	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;

-	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x00;

-#else

-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x54;

-	ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;

-	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;

-	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;

-#endif

-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;

-	/* 0x2A & 0x2B are reserved */

-	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;

-	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;

-	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;

-	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;

-	break;

-    case 8:

-	/* order is important */

-	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;

-	ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x80;

-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x4c;

-	ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;

-	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;

-	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;

-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x1C;

-	/* 0x2A & 0x2B are reserved */

-	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0x00;

-	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;

-	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x00;

-	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;

-	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;

-	break;

-    }

-}

-

-void

-TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)

-{

-    switch (pScrn->bitsPerPixel) {

-    case 32:

-	/* order is important */

-	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;

-	ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x46;

-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x5D;

-	ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;

-	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;

-	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;

-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x3C;

-	/* 0x2A & 0x2B are reserved */

-	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;

-	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;

-	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;

-	if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {

-	    ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x06;

-	    ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x3C;

-	    ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x01;

-	}

-	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;

-	break;

-    case 24:

-	/* order is important */

-	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;

-	ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x56;

-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x58;

-	ramdacReg->DacRegs[TIDAC_clock_select] = 0x25;

-	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;

-	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x00;

-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;

-	/* 0x2A & 0x2B are reserved */

-	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;

-	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;

-	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;

-	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;

-	break;

-    case 16:

-	/* order is important */

-#if 0

-	/* Matrox driver uses this */

-	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x07;

-#else

-	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;

-#endif

-	if (pScrn->depth == 16) {

-	    ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x45;

-	} else {

-	    ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x44;

-	}

-#if 0

-	/* Matrox driver uses this */

-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x50;

-	ramdacReg->DacRegs[TIDAC_clock_select] = 0x15;

-	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;

-	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x00;

-#else

-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x55;

-	ramdacReg->DacRegs[TIDAC_clock_select] = 0x85;

-	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;

-	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;

-#endif

-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;

-	/* 0x2A & 0x2B are reserved */

-	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;

-	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;

-	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;

-	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;

-	break;

-    case 8:

-	/* order is important */

-	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;

-	ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x80;

-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x4d;

-	ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;

-	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;

-	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;

-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x1C;

-	/* 0x2A & 0x2B are reserved */

-	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;

-	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0x00;

-	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;

-	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x00;

-	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;

-	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;

-	break;

-    }

-}

-

-static void 

-TIramdacShowCursor(ScrnInfoPtr pScrn)

-{

-    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-

-    /* Enable cursor - X11 mode */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_ind_curs_ctrl, 0, 0x03);

-}

-

-static void

-TIramdacHideCursor(ScrnInfoPtr pScrn)

-{

-    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-

-    /* Disable cursor - X11 mode */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_ind_curs_ctrl, 0, 0x00);

-}

-

-static void

-TIramdacSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)

-{

-    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-

-    x += 64;

-    y += 64;

-

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_XLOW,  0, x & 0xff);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_XHIGH, 0, (x >> 8) & 0x0f);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_YLOW,  0, y & 0xff);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_YHIGH, 0, (y >> 8) & 0x0f);

-}

-

-static void

-TIramdacSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)

-{

-    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-

-    /* Background color */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_WRITE_ADDR, 0, 1);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_COLOR, 0, ((bg&0x00ff0000) >> 16));

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_COLOR, 0, ((bg&0x0000ff00) >>  8));

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_COLOR, 0,  (bg&0x000000ff)       );

-

-    /* Foreground color */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_WRITE_ADDR, 0, 2);

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_COLOR, 0, ((fg&0x00ff0000) >> 16));

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_COLOR, 0, ((fg&0x0000ff00) >>  8));

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_COLOR, 0,  (fg&0x000000ff)       );

-}

-

-static void 

-TIramdacLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)

-{

-    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

-    int i = 1024;

-

-    /* reset A9,A8 */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_ind_curs_ctrl, 0, 0x00); 

-    /* reset cursor RAM load address A7..A0 */

-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_INDEX, 0x00, 0x00); 

- 

-    while(i--) {

-	/* NOT_DONE: might need a delay here */

-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_RAM_DATA, 0, *(src++));

-    }

-}

-

-static Bool 

-TIramdacUseHWCursor(ScreenPtr pScr, CursorPtr pCurs)

-{

-    return TRUE;

-}

-

-void

-TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr)

-{

-    infoPtr->MaxWidth = 64;

-    infoPtr->MaxHeight = 64;

-    infoPtr->Flags = HARDWARE_CURSOR_BIT_ORDER_MSBFIRST |

-		     HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |

-		     HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED;

-    infoPtr->SetCursorColors = TIramdacSetCursorColors;

-    infoPtr->SetCursorPosition = TIramdacSetCursorPosition;

-    infoPtr->LoadCursorImage = TIramdacLoadCursorImage;

-    infoPtr->HideCursor = TIramdacHideCursor;

-    infoPtr->ShowCursor = TIramdacShowCursor;

-    infoPtr->UseHWCursor = TIramdacUseHWCursor;

-}

-

-void TIramdacLoadPalette(

-    ScrnInfoPtr pScrn, 

-    int numColors, 

-    int *indices,

-    LOCO *colors,

-    VisualPtr pVisual

-){

-    RamDacRecPtr hwp = RAMDACSCRPTR(pScrn);

-    int i, index, shift;

-

-    if (pScrn->depth == 16) {

-    for(i = 0; i < numColors; i++) {

-	index = indices[i];

-    	(*hwp->WriteAddress)(pScrn, index << 2);

-	(*hwp->WriteData)(pScrn, colors[index >> 1].red);

-	(*hwp->WriteData)(pScrn, colors[index].green);

-	(*hwp->WriteData)(pScrn, colors[index >> 1].blue);

-

-	if(index <= 31) {

-	    (*hwp->WriteAddress)(pScrn, index << 3);

-	    (*hwp->WriteData)(pScrn, colors[index].red);

-	    (*hwp->WriteData)(pScrn, colors[(index << 1) + 1].green);

-	    (*hwp->WriteData)(pScrn, colors[index].blue);

-	}

-    }

-} else {

-    shift = (pScrn->depth == 15) ? 3 : 0;

-

-    for(i = 0; i < numColors; i++) {

-	index = indices[i];

-    	(*hwp->WriteAddress)(pScrn, index << shift);

-	(*hwp->WriteData)(pScrn, colors[index].red);

-	(*hwp->WriteData)(pScrn, colors[index].green);

-	(*hwp->WriteData)(pScrn, colors[index].blue);

-    }

-}

-}

-

-TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void) {

-    return TIramdacLoadPalette;

-}

+/*
+ * Copyright 1998 by Alan Hourihane, Wigan, England.
+ *
+ * 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 Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE 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.
+ *
+ * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
+ *
+ * Modified from IBM.c to support TI RAMDAC routines 
+ *   by Jens Owen, <jens@tungstengraphics.com>.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include "xf86Cursor.h"
+
+#define INIT_TI_RAMDAC_INFO
+#include "TIPriv.h"
+#include "xf86RamDacPriv.h"
+
+/* The following values are in kHz */
+#define TI_MIN_VCO_FREQ  110000
+#define TI_MAX_VCO_FREQ  220000
+
+unsigned long
+TIramdacCalculateMNPForClock(unsigned long RefClock,    /* In 100Hz units */
+                             unsigned long ReqClock,    /* In 100Hz units */
+                             char IsPixClock,   /* boolean, is this the pixel or the sys clock */
+                             unsigned long MinClock,    /* Min VCO rating */
+                             unsigned long MaxClock,    /* Max VCO rating */
+                             unsigned long *rM, /* M Out */
+                             unsigned long *rN, /* N Out */
+                             unsigned long *rP  /* Min P In, P Out */
+    )
+{
+    unsigned long n, p;
+    unsigned long best_m = 0, best_n = 0;
+    double VCO, IntRef = (double) RefClock;
+    double m_err, inc_m, calc_m;
+    unsigned long ActualClock;
+
+    /* Make sure that MinClock <= ReqClock <= MaxClock */
+    if (ReqClock < MinClock)
+        ReqClock = MinClock;
+    if (ReqClock > MaxClock)
+        ReqClock = MaxClock;
+
+    /*
+     * ActualClock = VCO / 2 ^ p
+     * Choose p so that TI_MIN_VCO_FREQ <= VCO <= TI_MAX_VCO_FREQ
+     * Note that since TI_MAX_VCO_FREQ = 2 * TI_MIN_VCO_FREQ
+     * we don't have to bother checking for this maximum limit.
+     */
+    VCO = (double) ReqClock;
+    for (p = 0; p < 3 && VCO < TI_MIN_VCO_FREQ; (p)++)
+        VCO *= 2.0;
+
+    /*
+     * We avoid doing multiplications by ( 65 - n ),
+     * and add an increment instead - this keeps any error small.
+     */
+    inc_m = VCO / (IntRef * 8.0);
+
+    /* Initial value of calc_m for the loop */
+    calc_m = inc_m + inc_m + inc_m;
+
+    /* Initial amount of error for an integer - impossibly large */
+    m_err = 2.0;
+
+    /* Search for the closest INTEGER value of ( 65 - m ) */
+    for (n = 3; n <= 25; (n)++, calc_m += inc_m) {
+
+        /* Ignore values of ( 65 - m ) which we can't use */
+        if (calc_m < 3.0 || calc_m > 64.0)
+            continue;
+
+        /*
+         * Pick the closest INTEGER (has smallest fractional part).
+         * The optimizer should clean this up for us.
+         */
+        if ((calc_m - (int) calc_m) < m_err) {
+            m_err = calc_m - (int) calc_m;
+            best_m = (int) calc_m;
+            best_n = n;
+        }
+    }
+
+    /* 65 - ( 65 - x ) = x */
+    *rM = 65 - best_m;
+    *rN = 65 - best_n;
+    *rP = p;
+
+    /* Now all the calculations can be completed */
+    VCO = 8.0 * IntRef * best_m / best_n;
+    ActualClock = VCO / (1 << p);
+
+    DebugF("f_out=%ld f_vco=%.1f n=%d m=%d p=%d\n",
+           ActualClock, VCO, *rN, *rM, *rP);
+
+    return ActualClock;
+}
+
+void
+TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
+                RamDacRegRecPtr ramdacReg)
+{
+    int i;
+    unsigned long status;
+
+    /* Here we pass a short, so that we can evaluate a mask too
+     * So that the mask is the high byte and the data the low byte
+     * Order is important
+     */
+    TIRESTORE(TIDAC_latch_ctrl);
+    TIRESTORE(TIDAC_true_color_ctrl);
+    TIRESTORE(TIDAC_multiplex_ctrl);
+    TIRESTORE(TIDAC_clock_select);
+    TIRESTORE(TIDAC_palette_page);
+    TIRESTORE(TIDAC_general_ctrl);
+    TIRESTORE(TIDAC_misc_ctrl);
+    /* 0x2A & 0x2B are reserved */
+    TIRESTORE(TIDAC_key_over_low);
+    TIRESTORE(TIDAC_key_over_high);
+    TIRESTORE(TIDAC_key_red_low);
+    TIRESTORE(TIDAC_key_red_high);
+    TIRESTORE(TIDAC_key_green_low);
+    TIRESTORE(TIDAC_key_green_high);
+    TIRESTORE(TIDAC_key_blue_low);
+    TIRESTORE(TIDAC_key_blue_high);
+    TIRESTORE(TIDAC_key_ctrl);
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_clock_ctrl, 0, 0x30);
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_clock_ctrl, 0, 0x38);
+    TIRESTORE(TIDAC_clock_ctrl);
+    TIRESTORE(TIDAC_sense_test);
+    TIRESTORE(TIDAC_ind_curs_ctrl);
+
+    /* only restore clocks if they were valid to begin with */
+
+    if (ramdacReg->DacRegs[TIDAC_PIXEL_VALID]) {
+        /* Reset pixel clock */
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_addr, 0, 0x22);
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_pixel_data, 0, 0x3c);
+
+        /* Restore N, M & P values for pixel clocks */
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_addr, 0, 0);
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_pixel_data, 0,
+                                ramdacReg->DacRegs[TIDAC_PIXEL_N]);
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_pixel_data, 0,
+                                ramdacReg->DacRegs[TIDAC_PIXEL_M]);
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_pixel_data, 0,
+                                ramdacReg->DacRegs[TIDAC_PIXEL_P]);
+
+        /* wait for pixel clock to lock */
+        i = 1000000;
+        do {
+            status = (*ramdacPtr->ReadDAC) (pScrn, TIDAC_pll_pixel_data);
+        } while ((!(status & 0x40)) && (--i));
+        if (!(status & 0x40)) {
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                       "Pixel clock setup timed out\n");
+            return;
+        }
+    }
+
+    if (ramdacReg->DacRegs[TIDAC_LOOP_VALID]) {
+        /* Reset loop clock */
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_addr, 0, 0x22);
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_loop_data, 0, 0x70);
+
+        /* Restore N, M & P values for pixel clocks */
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_addr, 0, 0);
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_loop_data, 0,
+                                ramdacReg->DacRegs[TIDAC_LOOP_N]);
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_loop_data, 0,
+                                ramdacReg->DacRegs[TIDAC_LOOP_M]);
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_loop_data, 0,
+                                ramdacReg->DacRegs[TIDAC_LOOP_P]);
+
+        /* wait for loop clock to lock */
+        i = 1000000;
+        do {
+            status = (*ramdacPtr->ReadDAC) (pScrn, TIDAC_pll_loop_data);
+        } while ((!(status & 0x40)) && (--i));
+        if (!(status & 0x40)) {
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                       "Loop clock setup timed out\n");
+            return;
+        }
+    }
+
+    /* restore palette */
+    (*ramdacPtr->WriteAddress) (pScrn, 0);
+#ifndef NOT_DONE
+    for (i = 0; i < 768; i++)
+        (*ramdacPtr->WriteData) (pScrn, ramdacReg->DAC[i]);
+#else
+    (*ramdacPtr->WriteData) (pScrn, 0);
+    (*ramdacPtr->WriteData) (pScrn, 0);
+    (*ramdacPtr->WriteData) (pScrn, 0);
+    for (i = 0; i < 765; i++)
+        (*ramdacPtr->WriteData) (pScrn, 0xff);
+#endif
+}
+
+void
+TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
+             RamDacRegRecPtr ramdacReg)
+{
+    int i;
+
+    (*ramdacPtr->ReadAddress) (pScrn, 0);
+    for (i = 0; i < 768; i++)
+        ramdacReg->DAC[i] = (*ramdacPtr->ReadData) (pScrn);
+
+    /* Read back N,M and P values for pixel clock */
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_addr, 0, 0);
+    ramdacReg->DacRegs[TIDAC_PIXEL_N] =
+        (*ramdacPtr->ReadDAC) (pScrn, TIDAC_pll_pixel_data);
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_addr, 0, 0x11);
+    ramdacReg->DacRegs[TIDAC_PIXEL_M] =
+        (*ramdacPtr->ReadDAC) (pScrn, TIDAC_pll_pixel_data);
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_addr, 0, 0x22);
+    ramdacReg->DacRegs[TIDAC_PIXEL_P] =
+        (*ramdacPtr->ReadDAC) (pScrn, TIDAC_pll_pixel_data);
+
+    /* Read back N,M and P values for loop clock */
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_addr, 0, 0);
+    ramdacReg->DacRegs[TIDAC_LOOP_N] =
+        (*ramdacPtr->ReadDAC) (pScrn, TIDAC_pll_loop_data);
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_addr, 0, 0x11);
+    ramdacReg->DacRegs[TIDAC_LOOP_M] =
+        (*ramdacPtr->ReadDAC) (pScrn, TIDAC_pll_loop_data);
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_pll_addr, 0, 0x22);
+    ramdacReg->DacRegs[TIDAC_LOOP_P] =
+        (*ramdacPtr->ReadDAC) (pScrn, TIDAC_pll_loop_data);
+
+    /* Order is important */
+    TISAVE(TIDAC_latch_ctrl);
+    TISAVE(TIDAC_true_color_ctrl);
+    TISAVE(TIDAC_multiplex_ctrl);
+    TISAVE(TIDAC_clock_select);
+    TISAVE(TIDAC_palette_page);
+    TISAVE(TIDAC_general_ctrl);
+    TISAVE(TIDAC_misc_ctrl);
+    /* 0x2A & 0x2B are reserved */
+    TISAVE(TIDAC_key_over_low);
+    TISAVE(TIDAC_key_over_high);
+    TISAVE(TIDAC_key_red_low);
+    TISAVE(TIDAC_key_red_high);
+    TISAVE(TIDAC_key_green_low);
+    TISAVE(TIDAC_key_green_high);
+    TISAVE(TIDAC_key_blue_low);
+    TISAVE(TIDAC_key_blue_high);
+    TISAVE(TIDAC_key_ctrl);
+    TISAVE(TIDAC_clock_ctrl);
+    TISAVE(TIDAC_sense_test);
+    TISAVE(TIDAC_ind_curs_ctrl);
+}
+
+RamDacHelperRecPtr
+TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+    RamDacHelperRecPtr ramdacHelperPtr = NULL;
+    Bool RamDacIsSupported = FALSE;
+    int TIramdac_ID = -1;
+    int i;
+    unsigned char id, rev, rev2, id2;
+
+    /* read ID and revision */
+    rev = (*ramdacPtr->ReadDAC) (pScrn, TIDAC_rev);
+    id = (*ramdacPtr->ReadDAC) (pScrn, TIDAC_id);
+
+    /* check if ID and revision are read only */
+    (*ramdacPtr->WriteDAC) (pScrn, ~rev, 0, TIDAC_rev);
+    (*ramdacPtr->WriteDAC) (pScrn, ~id, 0, TIDAC_id);
+    rev2 = (*ramdacPtr->ReadDAC) (pScrn, TIDAC_rev);
+    id2 = (*ramdacPtr->ReadDAC) (pScrn, TIDAC_id);
+
+    switch (id) {
+    case TIDAC_TVP_3030_ID:
+        if (id == id2 && rev == rev2)   /* check for READ ONLY */
+            TIramdac_ID = TI3030_RAMDAC;
+        break;
+    case TIDAC_TVP_3026_ID:
+        if (id == id2 && rev == rev2)   /* check for READ ONLY */
+            TIramdac_ID = TI3026_RAMDAC;
+        break;
+    }
+
+    (*ramdacPtr->WriteDAC) (pScrn, rev, 0, TIDAC_rev);
+    (*ramdacPtr->WriteDAC) (pScrn, id, 0, TIDAC_id);
+
+    if (TIramdac_ID == -1) {
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+                   "Cannot determine TI RAMDAC type, aborting\n");
+        return NULL;
+    }
+    else {
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+                   "Attached RAMDAC is %s\n",
+                   TIramdacDeviceInfo[TIramdac_ID & 0xFFFF].DeviceName);
+    }
+
+    for (i = 0; ramdacs[i].token != -1; i++) {
+        if (ramdacs[i].token == TIramdac_ID)
+            RamDacIsSupported = TRUE;
+    }
+
+    if (!RamDacIsSupported) {
+        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+                   "This TI RAMDAC is NOT supported by this driver, aborting\n");
+        return NULL;
+    }
+
+    ramdacHelperPtr = RamDacHelperCreateInfoRec();
+    switch (TIramdac_ID) {
+    case TI3030_RAMDAC:
+        ramdacHelperPtr->SetBpp = TIramdac3030SetBpp;
+        ramdacHelperPtr->HWCursorInit = TIramdacHWCursorInit;
+        break;
+    case TI3026_RAMDAC:
+        ramdacHelperPtr->SetBpp = TIramdac3026SetBpp;
+        ramdacHelperPtr->HWCursorInit = TIramdacHWCursorInit;
+        break;
+    }
+    ramdacPtr->RamDacType = TIramdac_ID;
+    ramdacHelperPtr->RamDacType = TIramdac_ID;
+    ramdacHelperPtr->Save = TIramdacSave;
+    ramdacHelperPtr->Restore = TIramdacRestore;
+
+    return ramdacHelperPtr;
+}
+
+void
+TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
+{
+    switch (pScrn->bitsPerPixel) {
+    case 32:
+        /* order is important */
+        ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
+        ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x46;
+        ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x5c;
+        ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;
+        ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+        ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
+        ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x3C;
+        /* 0x2A & 0x2B are reserved */
+        ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+        ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;
+        ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+        if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {
+            ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x06;
+            ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x3C;
+            ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x01;
+        }
+        ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+        break;
+    case 24:
+        /* order is important */
+        ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
+        ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x56;
+        ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x58;
+        ramdacReg->DacRegs[TIDAC_clock_select] = 0x25;
+        ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+        ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x00;
+        ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;
+        /* 0x2A & 0x2B are reserved */
+        ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+        ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;
+        ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+        ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+        break;
+    case 16:
+        /* order is important */
+#if 0
+        /* Matrox driver uses this */
+        ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x07;
+#else
+        ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
+#endif
+        if (pScrn->depth == 16) {
+            ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x45;
+        }
+        else {
+            ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x44;
+        }
+#if 0
+        /* Matrox driver uses this */
+        ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x50;
+        ramdacReg->DacRegs[TIDAC_clock_select] = 0x15;
+        ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+        ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x00;
+#else
+        ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x54;
+        ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;
+        ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+        ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
+#endif
+        ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;
+        /* 0x2A & 0x2B are reserved */
+        ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+        ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;
+        ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+        ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+        break;
+    case 8:
+        /* order is important */
+        ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
+        ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x80;
+        ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x4c;
+        ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;
+        ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+        ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
+        ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x1C;
+        /* 0x2A & 0x2B are reserved */
+        ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_low] = 0x00;
+        ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+        ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x00;
+        ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+        ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+        break;
+    }
+}
+
+void
+TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
+{
+    switch (pScrn->bitsPerPixel) {
+    case 32:
+        /* order is important */
+        ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
+        ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x46;
+        ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x5D;
+        ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;
+        ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+        ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
+        ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x3C;
+        /* 0x2A & 0x2B are reserved */
+        ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+        ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;
+        ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+        if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {
+            ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x06;
+            ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x3C;
+            ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x01;
+        }
+        ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+        break;
+    case 24:
+        /* order is important */
+        ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
+        ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x56;
+        ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x58;
+        ramdacReg->DacRegs[TIDAC_clock_select] = 0x25;
+        ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+        ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x00;
+        ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;
+        /* 0x2A & 0x2B are reserved */
+        ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+        ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;
+        ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+        ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+        break;
+    case 16:
+        /* order is important */
+#if 0
+        /* Matrox driver uses this */
+        ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x07;
+#else
+        ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
+#endif
+        if (pScrn->depth == 16) {
+            ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x45;
+        }
+        else {
+            ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x44;
+        }
+#if 0
+        /* Matrox driver uses this */
+        ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x50;
+        ramdacReg->DacRegs[TIDAC_clock_select] = 0x15;
+        ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+        ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x00;
+#else
+        ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x55;
+        ramdacReg->DacRegs[TIDAC_clock_select] = 0x85;
+        ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+        ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
+#endif
+        ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;
+        /* 0x2A & 0x2B are reserved */
+        ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+        ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;
+        ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+        ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+        break;
+    case 8:
+        /* order is important */
+        ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
+        ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x80;
+        ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x4d;
+        ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;
+        ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+        ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
+        ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x1C;
+        /* 0x2A & 0x2B are reserved */
+        ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+        ramdacReg->DacRegs[TIDAC_key_blue_low] = 0x00;
+        ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+        ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x00;
+        ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+        ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+        break;
+    }
+}
+
+static void
+TIramdacShowCursor(ScrnInfoPtr pScrn)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    /* Enable cursor - X11 mode */
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_ind_curs_ctrl, 0, 0x03);
+}
+
+static void
+TIramdacHideCursor(ScrnInfoPtr pScrn)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    /* Disable cursor - X11 mode */
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_ind_curs_ctrl, 0, 0x00);
+}
+
+static void
+TIramdacSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    x += 64;
+    y += 64;
+
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_XLOW, 0, x & 0xff);
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_XHIGH, 0, (x >> 8) & 0x0f);
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_YLOW, 0, y & 0xff);
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_YHIGH, 0, (y >> 8) & 0x0f);
+}
+
+static void
+TIramdacSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+
+    /* Background color */
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_WRITE_ADDR, 0, 1);
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_COLOR, 0,
+                            ((bg & 0x00ff0000) >> 16));
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_COLOR, 0,
+                            ((bg & 0x0000ff00) >> 8));
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_COLOR, 0, (bg & 0x000000ff));
+
+    /* Foreground color */
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_WRITE_ADDR, 0, 2);
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_COLOR, 0,
+                            ((fg & 0x00ff0000) >> 16));
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_COLOR, 0,
+                            ((fg & 0x0000ff00) >> 8));
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_COLOR, 0, (fg & 0x000000ff));
+}
+
+static void
+TIramdacLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
+{
+    RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
+    int i = 1024;
+
+    /* reset A9,A8 */
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_ind_curs_ctrl, 0, 0x00);
+    /* reset cursor RAM load address A7..A0 */
+    (*ramdacPtr->WriteDAC) (pScrn, TIDAC_INDEX, 0x00, 0x00);
+
+    while (i--) {
+        /* NOT_DONE: might need a delay here */
+        (*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_RAM_DATA, 0, *(src++));
+    }
+}
+
+static Bool
+TIramdacUseHWCursor(ScreenPtr pScr, CursorPtr pCurs)
+{
+    return TRUE;
+}
+
+void
+TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr)
+{
+    infoPtr->MaxWidth = 64;
+    infoPtr->MaxHeight = 64;
+    infoPtr->Flags = HARDWARE_CURSOR_BIT_ORDER_MSBFIRST |
+        HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
+        HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED;
+    infoPtr->SetCursorColors = TIramdacSetCursorColors;
+    infoPtr->SetCursorPosition = TIramdacSetCursorPosition;
+    infoPtr->LoadCursorImage = TIramdacLoadCursorImage;
+    infoPtr->HideCursor = TIramdacHideCursor;
+    infoPtr->ShowCursor = TIramdacShowCursor;
+    infoPtr->UseHWCursor = TIramdacUseHWCursor;
+}
+
+void
+TIramdacLoadPalette(ScrnInfoPtr pScrn,
+                    int numColors,
+                    int *indices, LOCO * colors, VisualPtr pVisual)
+{
+    RamDacRecPtr hwp = RAMDACSCRPTR(pScrn);
+    int i, index, shift;
+
+    if (pScrn->depth == 16) {
+        for (i = 0; i < numColors; i++) {
+            index = indices[i];
+            (*hwp->WriteAddress) (pScrn, index << 2);
+            (*hwp->WriteData) (pScrn, colors[index >> 1].red);
+            (*hwp->WriteData) (pScrn, colors[index].green);
+            (*hwp->WriteData) (pScrn, colors[index >> 1].blue);
+
+            if (index <= 31) {
+                (*hwp->WriteAddress) (pScrn, index << 3);
+                (*hwp->WriteData) (pScrn, colors[index].red);
+                (*hwp->WriteData) (pScrn, colors[(index << 1) + 1].green);
+                (*hwp->WriteData) (pScrn, colors[index].blue);
+            }
+        }
+    }
+    else {
+        shift = (pScrn->depth == 15) ? 3 : 0;
+
+        for (i = 0; i < numColors; i++) {
+            index = indices[i];
+            (*hwp->WriteAddress) (pScrn, index << shift);
+            (*hwp->WriteData) (pScrn, colors[index].red);
+            (*hwp->WriteData) (pScrn, colors[index].green);
+            (*hwp->WriteData) (pScrn, colors[index].blue);
+        }
+    }
+}
+
+TIramdacLoadPaletteProc *
+TIramdacLoadPaletteWeak(void)
+{
+    return TIramdacLoadPalette;
+}
diff --git a/xorg-server/hw/xfree86/ramdac/TI.h b/xorg-server/hw/xfree86/ramdac/TI.h
index f5499f903..3969ee71d 100644
--- a/xorg-server/hw/xfree86/ramdac/TI.h
+++ b/xorg-server/hw/xfree86/ramdac/TI.h
@@ -1,21 +1,36 @@
 
 #include <xf86RamDac.h>
 
-extern _X_EXPORT unsigned long TIramdacCalculateMNPForClock(unsigned long RefClock,
-    unsigned long ReqClock, char IsPixClock, unsigned long MinClock,
-    unsigned long MaxClock, unsigned long *rM, unsigned long *rN,
-    unsigned long *rP);
-extern _X_EXPORT RamDacHelperRecPtr TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs);
-extern _X_EXPORT void TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec);
-extern _X_EXPORT void TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec);
-extern _X_EXPORT void TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec);
-extern _X_EXPORT void TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec);
+extern _X_EXPORT unsigned long TIramdacCalculateMNPForClock(unsigned long
+                                                            RefClock,
+                                                            unsigned long
+                                                            ReqClock,
+                                                            char IsPixClock,
+                                                            unsigned long
+                                                            MinClock,
+                                                            unsigned long
+                                                            MaxClock,
+                                                            unsigned long *rM,
+                                                            unsigned long *rN,
+                                                            unsigned long *rP);
+extern _X_EXPORT RamDacHelperRecPtr TIramdacProbe(ScrnInfoPtr pScrn,
+                                                  RamDacSupportedInfoRecPtr
+                                                  ramdacs);
+extern _X_EXPORT void TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec,
+                                   RamDacRegRecPtr RamDacRegRec);
+extern _X_EXPORT void TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec,
+                                      RamDacRegRecPtr RamDacRegRec);
+extern _X_EXPORT void TIramdac3026SetBpp(ScrnInfoPtr pScrn,
+                                         RamDacRegRecPtr RamDacRegRec);
+extern _X_EXPORT void TIramdac3030SetBpp(ScrnInfoPtr pScrn,
+                                         RamDacRegRecPtr RamDacRegRec);
 extern _X_EXPORT void TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr);
-extern _X_EXPORT void TIramdacLoadPalette( ScrnInfoPtr pScrn, int numColors, int *indices,
-    LOCO *colors, VisualPtr pVisual);
+extern _X_EXPORT void TIramdacLoadPalette(ScrnInfoPtr pScrn, int numColors,
+                                          int *indices, LOCO * colors,
+                                          VisualPtr pVisual);
 
 typedef void TIramdacLoadPaletteProc(ScrnInfoPtr, int, int *, LOCO *,
-    VisualPtr);
+                                     VisualPtr);
 extern _X_EXPORT TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void);
 
 #define TI3030_RAMDAC		(VENDOR_TI << 16) | 0x00
@@ -86,6 +101,6 @@ extern _X_EXPORT TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void);
 
 #define TIDAC_sw_reset		0xff
 
-/* Constants */  
+/* Constants */
 #define TIDAC_TVP_3026_ID       0x26
 #define TIDAC_TVP_3030_ID       0x30
diff --git a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
index 1e0f7e0b7..678d2be5c 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
+++ b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
@@ -30,46 +30,44 @@ static Bool xf86DeviceCursorInitialize(DeviceIntPtr, ScreenPtr);
 static void xf86DeviceCursorCleanup(DeviceIntPtr, ScreenPtr);
 
 static miPointerSpriteFuncRec xf86CursorSpriteFuncs = {
-   xf86CursorRealizeCursor,
-   xf86CursorUnrealizeCursor,
-   xf86CursorSetCursor,
-   xf86CursorMoveCursor,
-   xf86DeviceCursorInitialize,
-   xf86DeviceCursorCleanup
+    xf86CursorRealizeCursor,
+    xf86CursorUnrealizeCursor,
+    xf86CursorSetCursor,
+    xf86CursorMoveCursor,
+    xf86DeviceCursorInitialize,
+    xf86DeviceCursorCleanup
 };
 
 /* Screen functions */
 
 static void xf86CursorInstallColormap(ColormapPtr);
-static void xf86CursorRecolorCursor(DeviceIntPtr pDev, ScreenPtr, CursorPtr, Bool);
+static void xf86CursorRecolorCursor(DeviceIntPtr pDev, ScreenPtr, CursorPtr,
+                                    Bool);
 static Bool xf86CursorCloseScreen(int, ScreenPtr);
-static void xf86CursorQueryBestSize(int, unsigned short*, unsigned short*,
-				    ScreenPtr);
+static void xf86CursorQueryBestSize(int, unsigned short *, unsigned short *,
+                                    ScreenPtr);
 
 /* ScrnInfoRec functions */
 
 static void xf86CursorEnableDisableFBAccess(int, Bool);
-static Bool xf86CursorSwitchMode(int, DisplayModePtr,int);
+static Bool xf86CursorSwitchMode(int, DisplayModePtr, int);
 
 Bool
-xf86InitCursor(
-   ScreenPtr pScreen,
-   xf86CursorInfoPtr infoPtr
-)
+xf86InitCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     xf86CursorScreenPtr ScreenPriv;
     miPointerScreenPtr PointPriv;
 
     if (!xf86InitHardwareCursor(pScreen, infoPtr))
-	return FALSE;
+        return FALSE;
 
     if (!dixRegisterPrivateKey(&xf86CursorScreenKeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
 
     ScreenPriv = calloc(1, sizeof(xf86CursorScreenRec));
     if (!ScreenPriv)
-	return FALSE;
+        return FALSE;
 
     dixSetPrivate(&pScreen->devPrivates, xf86CursorScreenKey, ScreenPriv);
 
@@ -88,31 +86,31 @@ xf86InitCursor(
     pScreen->RecolorCursor = xf86CursorRecolorCursor;
 
     if ((infoPtr->pScrn->bitsPerPixel == 8) &&
-	!(infoPtr->Flags & HARDWARE_CURSOR_TRUECOLOR_AT_8BPP)) {
-	ScreenPriv->InstallColormap = pScreen->InstallColormap;
-	pScreen->InstallColormap = xf86CursorInstallColormap;
-	ScreenPriv->PalettedCursor = TRUE;
+        !(infoPtr->Flags & HARDWARE_CURSOR_TRUECOLOR_AT_8BPP)) {
+        ScreenPriv->InstallColormap = pScreen->InstallColormap;
+        pScreen->InstallColormap = xf86CursorInstallColormap;
+        ScreenPriv->PalettedCursor = TRUE;
     }
 
     PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
 
     ScreenPriv->showTransparent = PointPriv->showTransparent;
     if (infoPtr->Flags & HARDWARE_CURSOR_SHOW_TRANSPARENT)
-	PointPriv->showTransparent = TRUE;
+        PointPriv->showTransparent = TRUE;
     else
-	PointPriv->showTransparent = FALSE;
+        PointPriv->showTransparent = FALSE;
     ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;
     PointPriv->spriteFuncs = &xf86CursorSpriteFuncs;
 
     ScreenPriv->EnableDisableFBAccess = pScrn->EnableDisableFBAccess;
     ScreenPriv->SwitchMode = pScrn->SwitchMode;
-    
+
     ScreenPriv->ForceHWCursorCount = 0;
     ScreenPriv->HWCursorForced = FALSE;
 
     pScrn->EnableDisableFBAccess = xf86CursorEnableDisableFBAccess;
     if (pScrn->SwitchMode)
-	pScrn->SwitchMode = xf86CursorSwitchMode;
+        pScrn->SwitchMode = xf86CursorSwitchMode;
 
     return TRUE;
 }
@@ -123,22 +121,24 @@ static Bool
 xf86CursorCloseScreen(int i, ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, miPointerScreenKey);
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    miPointerScreenPtr PointPriv =
+        (miPointerScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                              miPointerScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
 
     if (ScreenPriv->isUp && pScrn->vtSema)
-	xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y);
+        xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y);
 
     if (ScreenPriv->CurrentCursor)
-	FreeCursor(ScreenPriv->CurrentCursor, None);
+        FreeCursor(ScreenPriv->CurrentCursor, None);
 
     pScreen->CloseScreen = ScreenPriv->CloseScreen;
     pScreen->QueryBestSize = ScreenPriv->QueryBestSize;
     pScreen->RecolorCursor = ScreenPriv->RecolorCursor;
     if (ScreenPriv->InstallColormap)
-	pScreen->InstallColormap = ScreenPriv->InstallColormap;
+        pScreen->InstallColormap = ScreenPriv->InstallColormap;
 
     PointPriv->spriteFuncs = ScreenPriv->spriteFuncs;
     PointPriv->showTransparent = ScreenPriv->showTransparent;
@@ -149,92 +149,90 @@ xf86CursorCloseScreen(int i, ScreenPtr pScreen)
     free(ScreenPriv->transparentData);
     free(ScreenPriv);
 
-    return (*pScreen->CloseScreen)(i, pScreen);
+    return (*pScreen->CloseScreen) (i, pScreen);
 }
 
 static void
-xf86CursorQueryBestSize(
-   int class,
-   unsigned short *width,
-   unsigned short *height,
-   ScreenPtr pScreen)
+xf86CursorQueryBestSize(int class,
+                        unsigned short *width,
+                        unsigned short *height, ScreenPtr pScreen)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
 
     if (class == CursorShape) {
-	if(*width > ScreenPriv->CursorInfoPtr->MaxWidth)
-	   *width = ScreenPriv->CursorInfoPtr->MaxWidth;
-	if(*height > ScreenPriv->CursorInfoPtr->MaxHeight)
-	   *height = ScreenPriv->CursorInfoPtr->MaxHeight;
-    } else
-	(*ScreenPriv->QueryBestSize)(class, width, height, pScreen);
+        if (*width > ScreenPriv->CursorInfoPtr->MaxWidth)
+            *width = ScreenPriv->CursorInfoPtr->MaxWidth;
+        if (*height > ScreenPriv->CursorInfoPtr->MaxHeight)
+            *height = ScreenPriv->CursorInfoPtr->MaxHeight;
+    }
+    else
+        (*ScreenPriv->QueryBestSize) (class, width, height, pScreen);
 }
 
 static void
 xf86CursorInstallColormap(ColormapPtr pMap)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pMap->pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pMap->pScreen->devPrivates,
+                                               xf86CursorScreenKey);
 
     ScreenPriv->pInstalledMap = pMap;
 
-    (*ScreenPriv->InstallColormap)(pMap);
+    (*ScreenPriv->InstallColormap) (pMap);
 }
 
 static void
-xf86CursorRecolorCursor(
-    DeviceIntPtr pDev,
-    ScreenPtr pScreen,
-    CursorPtr pCurs,
-    Bool displayed)
+xf86CursorRecolorCursor(DeviceIntPtr pDev,
+                        ScreenPtr pScreen, CursorPtr pCurs, Bool displayed)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
 
     if (!displayed)
-	return;
+        return;
 
     if (ScreenPriv->SWCursor)
-	(*ScreenPriv->RecolorCursor)(pDev, pScreen, pCurs, displayed);
+        (*ScreenPriv->RecolorCursor) (pDev, pScreen, pCurs, displayed);
     else
-	xf86RecolorCursor(pScreen, pCurs, displayed);
+        xf86RecolorCursor(pScreen, pCurs, displayed);
 }
 
 /***** ScrnInfoRec functions *********/
 
 static void
-xf86CursorEnableDisableFBAccess(
-    int index,
-    Bool enable)
+xf86CursorEnableDisableFBAccess(int index, Bool enable)
 {
     DeviceIntPtr pDev = inputInfo.pointer;
 
     ScreenPtr pScreen = screenInfo.screens[index];
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
 
     if (!enable && ScreenPriv->CurrentCursor != NullCursor) {
         CursorPtr currentCursor = ScreenPriv->CurrentCursor;
+
         xf86CursorSetCursor(pDev, pScreen, NullCursor, ScreenPriv->x,
-                ScreenPriv->y); 
+                            ScreenPriv->y);
         ScreenPriv->isUp = FALSE;
-	ScreenPriv->SWCursor = TRUE;
-	ScreenPriv->SavedCursor = currentCursor;
+        ScreenPriv->SWCursor = TRUE;
+        ScreenPriv->SavedCursor = currentCursor;
     }
 
     if (ScreenPriv->EnableDisableFBAccess)
-	(*ScreenPriv->EnableDisableFBAccess)(index, enable);
-
-    if (enable && ScreenPriv->SavedCursor)
-    {
-	/*
-	 * Re-set current cursor so drivers can react to FB access having been
-	 * temporarily disabled.
-	 */
-	xf86CursorSetCursor(pDev, pScreen, ScreenPriv->SavedCursor,
-			    ScreenPriv->x, ScreenPriv->y);
-	ScreenPriv->SavedCursor = NULL;
+        (*ScreenPriv->EnableDisableFBAccess) (index, enable);
+
+    if (enable && ScreenPriv->SavedCursor) {
+        /*
+         * Re-set current cursor so drivers can react to FB access having been
+         * temporarily disabled.
+         */
+        xf86CursorSetCursor(pDev, pScreen, ScreenPriv->SavedCursor,
+                            ScreenPriv->x, ScreenPriv->y);
+        ScreenPriv->SavedCursor = NULL;
     }
 }
 
@@ -243,15 +241,16 @@ xf86CursorSwitchMode(int index, DisplayModePtr mode, int flags)
 {
     Bool ret;
     ScreenPtr pScreen = screenInfo.screens[index];
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
 
     if (ScreenPriv->isUp) {
-	xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y);
-	ScreenPriv->isUp = FALSE;
+        xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y);
+        ScreenPriv->isUp = FALSE;
     }
 
-    ret = (*ScreenPriv->SwitchMode)(index, mode, flags);
+    ret = (*ScreenPriv->SwitchMode) (index, mode, flags);
 
     /*
      * Cannot restore cursor here because the new frame[XY][01] haven't been
@@ -259,7 +258,7 @@ xf86CursorSwitchMode(int index, DisplayModePtr mode, int flags)
      * ensure the cursor is repainted by miPointerWarpCursor().
      */
     ScreenPriv->CursorToRestore = ScreenPriv->CurrentCursor;
-    miPointerSetWaitForUpdate(pScreen, FALSE);	/* Force cursor repaint */
+    miPointerSetWaitForUpdate(pScreen, FALSE);  /* Force cursor repaint */
 
     return ret;
 }
@@ -269,90 +268,107 @@ xf86CursorSwitchMode(int index, DisplayModePtr mode, int flags)
 static Bool
 xf86CursorRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
 
     if (pCurs->refcnt <= 1)
-	dixSetScreenPrivate(&pCurs->devPrivates, CursorScreenKey, pScreen, NULL);
+        dixSetScreenPrivate(&pCurs->devPrivates, CursorScreenKey, pScreen,
+                            NULL);
 
-    return (*ScreenPriv->spriteFuncs->RealizeCursor)(pDev, pScreen, pCurs);
+    return (*ScreenPriv->spriteFuncs->RealizeCursor) (pDev, pScreen, pCurs);
 }
 
 static Bool
-xf86CursorUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, 
-                          CursorPtr pCurs)
+xf86CursorUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
 
     if (pCurs->refcnt <= 1) {
-	free(dixLookupScreenPrivate(&pCurs->devPrivates, CursorScreenKey, pScreen));
-	dixSetScreenPrivate(&pCurs->devPrivates, CursorScreenKey, pScreen, NULL);
+        free(dixLookupScreenPrivate
+             (&pCurs->devPrivates, CursorScreenKey, pScreen));
+        dixSetScreenPrivate(&pCurs->devPrivates, CursorScreenKey, pScreen,
+                            NULL);
     }
 
-    return (*ScreenPriv->spriteFuncs->UnrealizeCursor)(pDev, pScreen, pCurs);
+    return (*ScreenPriv->spriteFuncs->UnrealizeCursor) (pDev, pScreen, pCurs);
 }
 
 static void
-xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs, 
+xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
                     int x, int y)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
 
-    if (pCurs == NullCursor) {	/* means we're supposed to remove the cursor */
+    if (pCurs == NullCursor) {  /* means we're supposed to remove the cursor */
         if (ScreenPriv->SWCursor ||
             !(GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer))
-                (*ScreenPriv->spriteFuncs->SetCursor)(pDev, pScreen, NullCursor, x, y);
+            (*ScreenPriv->spriteFuncs->SetCursor) (pDev, pScreen, NullCursor, x,
+                                                   y);
         else if (ScreenPriv->isUp) {
             xf86SetCursor(pScreen, NullCursor, x, y);
             ScreenPriv->isUp = FALSE;
         }
-	if (ScreenPriv->CurrentCursor)
-	    FreeCursor(ScreenPriv->CurrentCursor, None);
+        if (ScreenPriv->CurrentCursor)
+            FreeCursor(ScreenPriv->CurrentCursor, None);
         ScreenPriv->CurrentCursor = NullCursor;
         return;
     }
 
     /* only update for VCP, otherwise we get cursor jumps when removing a
        sprite. The second cursor is never HW rendered anyway. */
-    if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer)
-    {
-	pCurs->refcnt++;
-	if (ScreenPriv->CurrentCursor)
-	    FreeCursor(ScreenPriv->CurrentCursor, None);
-	ScreenPriv->CurrentCursor = pCurs;
-	ScreenPriv->x = x;
-	ScreenPriv->y = y;
-	ScreenPriv->CursorToRestore = NULL;
-	ScreenPriv->HotX = pCurs->bits->xhot;
-	ScreenPriv->HotY = pCurs->bits->yhot;
+    if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer) {
+        pCurs->refcnt++;
+        if (ScreenPriv->CurrentCursor)
+            FreeCursor(ScreenPriv->CurrentCursor, None);
+        ScreenPriv->CurrentCursor = pCurs;
+        ScreenPriv->x = x;
+        ScreenPriv->y = y;
+        ScreenPriv->CursorToRestore = NULL;
+        ScreenPriv->HotX = pCurs->bits->xhot;
+        ScreenPriv->HotY = pCurs->bits->yhot;
 
         if (!infoPtr->pScrn->vtSema)
             ScreenPriv->SavedCursor = pCurs;
 
-	if (infoPtr->pScrn->vtSema && (ScreenPriv->ForceHWCursorCount || ((
+        if (infoPtr->pScrn->vtSema && (ScreenPriv->ForceHWCursorCount || ((
 #ifdef ARGB_CURSOR
-			    pCurs->bits->argb && infoPtr->UseHWCursorARGB &&
-			    (*infoPtr->UseHWCursorARGB) (pScreen, pCurs) ) || (
-			    pCurs->bits->argb == 0 &&
+                                                                              pCurs->
+                                                                              bits->
+                                                                              argb
+                                                                              &&
+                                                                              infoPtr->
+                                                                              UseHWCursorARGB
+                                                                              &&
+                                                                              (*infoPtr->
+                                                                               UseHWCursorARGB)
+                                                                              (pScreen,
+                                                                               pCurs))
+                                                                          ||
+                                                                          (pCurs->
+                                                                           bits->
+                                                                           argb
+                                                                           == 0
+                                                                           &&
 #endif
-			    (pCurs->bits->height <= infoPtr->MaxHeight) &&
-			    (pCurs->bits->width <= infoPtr->MaxWidth) &&
-                            (!infoPtr->UseHWCursor || (*infoPtr->UseHWCursor)(pScreen, pCurs))))))
-	{
+                                                                           (pCurs->bits->height <= infoPtr->MaxHeight) && (pCurs->bits->width <= infoPtr->MaxWidth) && (!infoPtr->UseHWCursor || (*infoPtr->UseHWCursor) (pScreen, pCurs)))))) {
 
-	    if (ScreenPriv->SWCursor)	/* remove the SW cursor */
-		(*ScreenPriv->spriteFuncs->SetCursor)(pDev, pScreen, NullCursor, x, y);
+            if (ScreenPriv->SWCursor)   /* remove the SW cursor */
+                (*ScreenPriv->spriteFuncs->SetCursor) (pDev, pScreen,
+                                                       NullCursor, x, y);
 
-	    xf86SetCursor(pScreen, pCurs, x, y);
-	    ScreenPriv->SWCursor = FALSE;
-	    ScreenPriv->isUp = TRUE;
+            xf86SetCursor(pScreen, pCurs, x, y);
+            ScreenPriv->SWCursor = FALSE;
+            ScreenPriv->isUp = TRUE;
 
-	    miPointerSetWaitForUpdate(pScreen, !infoPtr->pScrn->silkenMouse);
-	    return;
-	}
+            miPointerSetWaitForUpdate(pScreen, !infoPtr->pScrn->silkenMouse);
+            return;
+        }
 
         miPointerSetWaitForUpdate(pScreen, TRUE);
 
@@ -360,7 +376,8 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
             /* Remove the HW cursor, or make it transparent */
             if (infoPtr->Flags & HARDWARE_CURSOR_SHOW_TRANSPARENT) {
                 xf86SetTransparentCursor(pScreen);
-            } else {
+            }
+            else {
                 xf86SetCursor(pScreen, NullCursor, x, y);
                 ScreenPriv->isUp = FALSE;
             }
@@ -372,63 +389,61 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
     }
 
     if (pCurs->bits->emptyMask && !ScreenPriv->showTransparent)
-	pCurs = NullCursor;
+        pCurs = NullCursor;
 
-    (*ScreenPriv->spriteFuncs->SetCursor)(pDev, pScreen, pCurs, x, y);
+    (*ScreenPriv->spriteFuncs->SetCursor) (pDev, pScreen, pCurs, x, y);
 }
 
 static void
 xf86CursorMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
 
     /* only update coordinate state for first sprite, otherwise we get jumps
        when removing a sprite. The second sprite is never HW rendered anyway */
-    if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer)
-    {
-	ScreenPriv->x = x;
-	ScreenPriv->y = y;
+    if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer) {
+        ScreenPriv->x = x;
+        ScreenPriv->y = y;
 
         if (ScreenPriv->CursorToRestore)
-            xf86CursorSetCursor(pDev, pScreen, ScreenPriv->CursorToRestore, x, y);
+            xf86CursorSetCursor(pDev, pScreen, ScreenPriv->CursorToRestore, x,
+                                y);
         else if (ScreenPriv->SWCursor)
-            (*ScreenPriv->spriteFuncs->MoveCursor)(pDev, pScreen, x, y);
+            (*ScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y);
         else if (ScreenPriv->isUp)
             xf86MoveCursor(pScreen, x, y);
-    } else
-        (*ScreenPriv->spriteFuncs->MoveCursor)(pDev, pScreen, x, y);
+    }
+    else
+        (*ScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y);
 }
 
 void
-xf86ForceHWCursor (ScreenPtr pScreen, Bool on)
+xf86ForceHWCursor(ScreenPtr pScreen, Bool on)
 {
     DeviceIntPtr pDev = inputInfo.pointer;
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
-
-    if (on)
-    {
-	if (ScreenPriv->ForceHWCursorCount++ == 0)
-	{
-	    if (ScreenPriv->SWCursor && ScreenPriv->CurrentCursor)
-	    {
-		ScreenPriv->HWCursorForced = TRUE;
-		xf86CursorSetCursor (pDev, pScreen, ScreenPriv->CurrentCursor,
-				     ScreenPriv->x, ScreenPriv->y);
-	    }
-	    else
-		ScreenPriv->HWCursorForced = FALSE;
-	}
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
+
+    if (on) {
+        if (ScreenPriv->ForceHWCursorCount++ == 0) {
+            if (ScreenPriv->SWCursor && ScreenPriv->CurrentCursor) {
+                ScreenPriv->HWCursorForced = TRUE;
+                xf86CursorSetCursor(pDev, pScreen, ScreenPriv->CurrentCursor,
+                                    ScreenPriv->x, ScreenPriv->y);
+            }
+            else
+                ScreenPriv->HWCursorForced = FALSE;
+        }
     }
-    else
-    {
-	if (--ScreenPriv->ForceHWCursorCount == 0)
-	{
-	    if (ScreenPriv->HWCursorForced && ScreenPriv->CurrentCursor)
-		xf86CursorSetCursor (pDev, pScreen, ScreenPriv->CurrentCursor,
-				     ScreenPriv->x, ScreenPriv->y);
-	}
+    else {
+        if (--ScreenPriv->ForceHWCursorCount == 0) {
+            if (ScreenPriv->HWCursorForced && ScreenPriv->CurrentCursor)
+                xf86CursorSetCursor(pDev, pScreen, ScreenPriv->CurrentCursor,
+                                    ScreenPriv->x, ScreenPriv->y);
+        }
     }
 }
 
@@ -451,11 +466,12 @@ static Bool
 xf86DeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
 {
     int ret;
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-            &pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
 
     /* Init SW cursor */
-    ret = (*ScreenPriv->spriteFuncs->DeviceCursorInitialize)(pDev, pScreen);
+    ret = (*ScreenPriv->spriteFuncs->DeviceCursorInitialize) (pDev, pScreen);
 
     return ret;
 }
@@ -466,10 +482,10 @@ xf86DeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
 static void
 xf86DeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-            &pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
 
-   /* Clean up SW cursor */
-    (*ScreenPriv->spriteFuncs->DeviceCursorCleanup)(pDev, pScreen);
+    /* Clean up SW cursor */
+    (*ScreenPriv->spriteFuncs->DeviceCursorCleanup) (pDev, pScreen);
 }
-
diff --git a/xorg-server/hw/xfree86/ramdac/xf86Cursor.h b/xorg-server/hw/xfree86/ramdac/xf86Cursor.h
index 3f3618b59..5658e7b30 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86Cursor.h
+++ b/xorg-server/hw/xfree86/ramdac/xf86Cursor.h
@@ -10,13 +10,13 @@ typedef struct _xf86CursorInfoRec {
     int Flags;
     int MaxWidth;
     int MaxHeight;
-    void (*SetCursorColors)(ScrnInfoPtr pScrn, int bg, int fg);
-    void (*SetCursorPosition)(ScrnInfoPtr pScrn, int x, int y);
-    void (*LoadCursorImage)(ScrnInfoPtr pScrn, unsigned char *bits);
-    void (*HideCursor)(ScrnInfoPtr pScrn);
-    void (*ShowCursor)(ScrnInfoPtr pScrn);
-    unsigned char* (*RealizeCursor)(struct _xf86CursorInfoRec *, CursorPtr);
-    Bool (*UseHWCursor)(ScreenPtr, CursorPtr);
+    void (*SetCursorColors) (ScrnInfoPtr pScrn, int bg, int fg);
+    void (*SetCursorPosition) (ScrnInfoPtr pScrn, int x, int y);
+    void (*LoadCursorImage) (ScrnInfoPtr pScrn, unsigned char *bits);
+    void (*HideCursor) (ScrnInfoPtr pScrn);
+    void (*ShowCursor) (ScrnInfoPtr pScrn);
+    unsigned char *(*RealizeCursor) (struct _xf86CursorInfoRec *, CursorPtr);
+    Bool (*UseHWCursor) (ScreenPtr, CursorPtr);
 
 #ifdef ARGB_CURSOR
     Bool (*UseHWCursorARGB) (ScreenPtr, CursorPtr);
@@ -25,10 +25,11 @@ typedef struct _xf86CursorInfoRec {
 
 } xf86CursorInfoRec, *xf86CursorInfoPtr;
 
-extern _X_EXPORT Bool xf86InitCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr);
+extern _X_EXPORT Bool xf86InitCursor(ScreenPtr pScreen,
+                                     xf86CursorInfoPtr infoPtr);
 extern _X_EXPORT xf86CursorInfoPtr xf86CreateCursorInfoRec(void);
 extern _X_EXPORT void xf86DestroyCursorInfoRec(xf86CursorInfoPtr);
-extern _X_EXPORT void xf86ForceHWCursor (ScreenPtr pScreen, Bool on);
+extern _X_EXPORT void xf86ForceHWCursor(ScreenPtr pScreen, Bool on);
 
 #define HARDWARE_CURSOR_INVERT_MASK 			0x00000001
 #define HARDWARE_CURSOR_AND_SOURCE_WITH_MASK		0x00000002
@@ -48,4 +49,4 @@ extern _X_EXPORT void xf86ForceHWCursor (ScreenPtr pScreen, Bool on);
 #define HARDWARE_CURSOR_ARGB				0x00004000
 #endif
 
-#endif /* _XF86CURSOR_H */
+#endif                          /* _XF86CURSOR_H */
diff --git a/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c b/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c
index f9b09fc9a..95721490a 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c
+++ b/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c
@@ -39,18 +39,18 @@ static CARD64 xf86CARD64ReverseBits(CARD64 w);
 static CARD64
 xf86CARD64ReverseBits(CARD64 w)
 {
-  unsigned char *p = (unsigned char *)&w;
-
-  p[0] = byte_reversed[p[0]];
-  p[1] = byte_reversed[p[1]];
-  p[2] = byte_reversed[p[2]];
-  p[3] = byte_reversed[p[3]];
-  p[4] = byte_reversed[p[4]];
-  p[5] = byte_reversed[p[5]];
-  p[6] = byte_reversed[p[6]];
-  p[7] = byte_reversed[p[7]];
-
-  return w;
+    unsigned char *p = (unsigned char *) &w;
+
+    p[0] = byte_reversed[p[0]];
+    p[1] = byte_reversed[p[1]];
+    p[2] = byte_reversed[p[2]];
+    p[3] = byte_reversed[p[3]];
+    p[4] = byte_reversed[p[4]];
+    p[5] = byte_reversed[p[5]];
+    p[6] = byte_reversed[p[6]];
+    p[7] = byte_reversed[p[7]];
+
+    return w;
 }
 #endif
 
@@ -61,48 +61,48 @@ xf86CARD64ReverseBits(CARD64 w)
 #define CUR_LOG2_BITMAP_PAD LOG2_BITMAP_PAD
 #define REVERSE_BIT_ORDER(w) xf86ReverseBitOrder(w)
 
-#endif /* BITMAP_SCANLINE_PAD == 64 */
+#endif                          /* BITMAP_SCANLINE_PAD == 64 */
 
-static unsigned char* RealizeCursorInterleave0(xf86CursorInfoPtr, CursorPtr);
-static unsigned char* RealizeCursorInterleave1(xf86CursorInfoPtr, CursorPtr);
-static unsigned char* RealizeCursorInterleave8(xf86CursorInfoPtr, CursorPtr);
-static unsigned char* RealizeCursorInterleave16(xf86CursorInfoPtr, CursorPtr);
-static unsigned char* RealizeCursorInterleave32(xf86CursorInfoPtr, CursorPtr);
-static unsigned char* RealizeCursorInterleave64(xf86CursorInfoPtr, CursorPtr);
+static unsigned char *RealizeCursorInterleave0(xf86CursorInfoPtr, CursorPtr);
+static unsigned char *RealizeCursorInterleave1(xf86CursorInfoPtr, CursorPtr);
+static unsigned char *RealizeCursorInterleave8(xf86CursorInfoPtr, CursorPtr);
+static unsigned char *RealizeCursorInterleave16(xf86CursorInfoPtr, CursorPtr);
+static unsigned char *RealizeCursorInterleave32(xf86CursorInfoPtr, CursorPtr);
+static unsigned char *RealizeCursorInterleave64(xf86CursorInfoPtr, CursorPtr);
 
 Bool
 xf86InitHardwareCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr)
 {
     if ((infoPtr->MaxWidth <= 0) || (infoPtr->MaxHeight <= 0))
-	return FALSE;
+        return FALSE;
 
     /* These are required for now */
     if (!infoPtr->SetCursorPosition ||
-	!infoPtr->LoadCursorImage ||
-	!infoPtr->HideCursor ||
-	!infoPtr->ShowCursor ||
-	!infoPtr->SetCursorColors)
-	return FALSE;
+        !infoPtr->LoadCursorImage ||
+        !infoPtr->HideCursor ||
+        !infoPtr->ShowCursor || !infoPtr->SetCursorColors)
+        return FALSE;
 
     if (infoPtr->RealizeCursor) {
-	/* Don't overwrite a driver provided Realize Cursor function */
-    } else
-    if (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1 & infoPtr->Flags) {
-	infoPtr->RealizeCursor = RealizeCursorInterleave1;
-    } else
-    if (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8 & infoPtr->Flags) {
-	infoPtr->RealizeCursor = RealizeCursorInterleave8;
-    } else
-    if (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16 & infoPtr->Flags) {
-	infoPtr->RealizeCursor = RealizeCursorInterleave16;
-    } else
-    if (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32 & infoPtr->Flags) {
-	infoPtr->RealizeCursor = RealizeCursorInterleave32;
-    } else
-    if (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 & infoPtr->Flags) {
-	infoPtr->RealizeCursor = RealizeCursorInterleave64;
-    } else {    /* not interleaved */
-	infoPtr->RealizeCursor = RealizeCursorInterleave0;
+        /* Don't overwrite a driver provided Realize Cursor function */
+    }
+    else if (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1 & infoPtr->Flags) {
+        infoPtr->RealizeCursor = RealizeCursorInterleave1;
+    }
+    else if (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8 & infoPtr->Flags) {
+        infoPtr->RealizeCursor = RealizeCursorInterleave8;
+    }
+    else if (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16 & infoPtr->Flags) {
+        infoPtr->RealizeCursor = RealizeCursorInterleave16;
+    }
+    else if (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32 & infoPtr->Flags) {
+        infoPtr->RealizeCursor = RealizeCursorInterleave32;
+    }
+    else if (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 & infoPtr->Flags) {
+        infoPtr->RealizeCursor = RealizeCursorInterleave64;
+    }
+    else {                      /* not interleaved */
+        infoPtr->RealizeCursor = RealizeCursorInterleave0;
     }
 
     infoPtr->pScrn = xf86Screens[pScreen->myNum];
@@ -113,17 +113,19 @@ xf86InitHardwareCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr)
 void
 xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
     unsigned char *bits;
 
     if (pCurs == NullCursor) {
-	(*infoPtr->HideCursor)(infoPtr->pScrn);
-	return;
+        (*infoPtr->HideCursor) (infoPtr->pScrn);
+        return;
     }
 
-    bits = dixLookupScreenPrivate(&pCurs->devPrivates, CursorScreenKey, pScreen);
+    bits =
+        dixLookupScreenPrivate(&pCurs->devPrivates, CursorScreenKey, pScreen);
 
     x -= infoPtr->pScrn->frameX0 + ScreenPriv->HotX;
     y -= infoPtr->pScrn->frameY0 + ScreenPriv->HotY;
@@ -131,68 +133,72 @@ xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
 #ifdef ARGB_CURSOR
     if (!pCurs->bits->argb || !infoPtr->LoadCursorARGB)
 #endif
-    if (!bits) {
-	bits = (*infoPtr->RealizeCursor)(infoPtr, pCurs);
-	dixSetScreenPrivate(&pCurs->devPrivates, CursorScreenKey, pScreen, bits);
-    }
+        if (!bits) {
+            bits = (*infoPtr->RealizeCursor) (infoPtr, pCurs);
+            dixSetScreenPrivate(&pCurs->devPrivates, CursorScreenKey, pScreen,
+                                bits);
+        }
 
     if (!(infoPtr->Flags & HARDWARE_CURSOR_UPDATE_UNHIDDEN))
-	(*infoPtr->HideCursor)(infoPtr->pScrn);
+        (*infoPtr->HideCursor) (infoPtr->pScrn);
 
 #ifdef ARGB_CURSOR
     if (pCurs->bits->argb && infoPtr->LoadCursorARGB)
-	(*infoPtr->LoadCursorARGB) (infoPtr->pScrn, pCurs);
+        (*infoPtr->LoadCursorARGB) (infoPtr->pScrn, pCurs);
     else
 #endif
     if (bits)
-	(*infoPtr->LoadCursorImage)(infoPtr->pScrn, bits);
+        (*infoPtr->LoadCursorImage) (infoPtr->pScrn, bits);
 
     xf86RecolorCursor(pScreen, pCurs, 1);
 
-    (*infoPtr->SetCursorPosition)(infoPtr->pScrn, x, y);
+    (*infoPtr->SetCursorPosition) (infoPtr->pScrn, x, y);
 
-    (*infoPtr->ShowCursor)(infoPtr->pScrn);
+    (*infoPtr->ShowCursor) (infoPtr->pScrn);
 }
 
 void
 xf86SetTransparentCursor(ScreenPtr pScreen)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
 
     if (!ScreenPriv->transparentData)
-	ScreenPriv->transparentData =
-	    (*infoPtr->RealizeCursor)(infoPtr, NullCursor);
+        ScreenPriv->transparentData =
+            (*infoPtr->RealizeCursor) (infoPtr, NullCursor);
 
     if (!(infoPtr->Flags & HARDWARE_CURSOR_UPDATE_UNHIDDEN))
-	(*infoPtr->HideCursor)(infoPtr->pScrn);
+        (*infoPtr->HideCursor) (infoPtr->pScrn);
 
     if (ScreenPriv->transparentData)
-	(*infoPtr->LoadCursorImage)(infoPtr->pScrn,
-				    ScreenPriv->transparentData);
+        (*infoPtr->LoadCursorImage) (infoPtr->pScrn,
+                                     ScreenPriv->transparentData);
 
-    (*infoPtr->ShowCursor)(infoPtr->pScrn);
+    (*infoPtr->ShowCursor) (infoPtr->pScrn);
 }
 
 void
 xf86MoveCursor(ScreenPtr pScreen, int x, int y)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
 
     x -= infoPtr->pScrn->frameX0 + ScreenPriv->HotX;
     y -= infoPtr->pScrn->frameY0 + ScreenPriv->HotY;
 
-    (*infoPtr->SetCursorPosition)(infoPtr->pScrn, x, y);
+    (*infoPtr->SetCursorPosition) (infoPtr->pScrn, x, y);
 }
 
 void
 xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed)
 {
-    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
-	&pScreen->devPrivates, xf86CursorScreenKey);
+    xf86CursorScreenPtr ScreenPriv =
+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+                                               xf86CursorScreenKey);
     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
 
 #ifdef ARGB_CURSOR
@@ -203,38 +209,39 @@ xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed)
 #endif
 
     if (ScreenPriv->PalettedCursor) {
-	xColorItem sourceColor, maskColor;
-	ColormapPtr pmap = ScreenPriv->pInstalledMap;
-	
-	if (!pmap)
-	    return;
-
-	sourceColor.red = pCurs->foreRed;
-	sourceColor.green = pCurs->foreGreen;
-	sourceColor.blue = pCurs->foreBlue;
-	FakeAllocColor(pmap, &sourceColor);
-	maskColor.red = pCurs->backRed;
-	maskColor.green = pCurs->backGreen;
-	maskColor.blue = pCurs->backBlue;
-	FakeAllocColor(pmap, &maskColor);
-	FakeFreeColor(pmap, sourceColor.pixel);
-	FakeFreeColor(pmap, maskColor.pixel);
-	(*infoPtr->SetCursorColors)(infoPtr->pScrn,
-		maskColor.pixel, sourceColor.pixel);
-    } else {    /* Pass colors in 8-8-8 RGB format */
-	(*infoPtr->SetCursorColors)(infoPtr->pScrn,
-	    (pCurs->backBlue >> 8) |
-	    ((pCurs->backGreen >> 8) << 8) |
-	    ((pCurs->backRed >> 8) << 16),
-	    (pCurs->foreBlue >> 8) |
-	    ((pCurs->foreGreen >> 8) << 8) |
-	    ((pCurs->foreRed >> 8) << 16)
-	);
+        xColorItem sourceColor, maskColor;
+        ColormapPtr pmap = ScreenPriv->pInstalledMap;
+
+        if (!pmap)
+            return;
+
+        sourceColor.red = pCurs->foreRed;
+        sourceColor.green = pCurs->foreGreen;
+        sourceColor.blue = pCurs->foreBlue;
+        FakeAllocColor(pmap, &sourceColor);
+        maskColor.red = pCurs->backRed;
+        maskColor.green = pCurs->backGreen;
+        maskColor.blue = pCurs->backBlue;
+        FakeAllocColor(pmap, &maskColor);
+        FakeFreeColor(pmap, sourceColor.pixel);
+        FakeFreeColor(pmap, maskColor.pixel);
+        (*infoPtr->SetCursorColors) (infoPtr->pScrn,
+                                     maskColor.pixel, sourceColor.pixel);
+    }
+    else {                      /* Pass colors in 8-8-8 RGB format */
+        (*infoPtr->SetCursorColors) (infoPtr->pScrn,
+                                     (pCurs->backBlue >> 8) |
+                                     ((pCurs->backGreen >> 8) << 8) |
+                                     ((pCurs->backRed >> 8) << 16),
+                                     (pCurs->foreBlue >> 8) |
+                                     ((pCurs->foreGreen >> 8) << 8) |
+                                     ((pCurs->foreRed >> 8) << 16)
+            );
     }
 }
 
 /* These functions assume that MaxWidth is a multiple of 32 */
-static unsigned char*
+static unsigned char *
 RealizeCursorInterleave0(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
 {
 
@@ -243,75 +250,83 @@ RealizeCursorInterleave0(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
     unsigned char *mem;
     int size = (infoPtr->MaxWidth * infoPtr->MaxHeight) >> 2;
     int SrcPitch, DstPitch, Pitch, y, x;
+
     /* how many words are in the source or mask */
     int words = size / (CUR_BITMAP_SCANLINE_PAD / 4);
 
-
     if (!(mem = calloc(1, size)))
-	return NULL;
+        return NULL;
 
     if (pCurs == NullCursor) {
-	if (infoPtr->Flags & HARDWARE_CURSOR_INVERT_MASK) {
-	    DstM = (SCANLINE*)mem;
-	    if (!(infoPtr->Flags & HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK))
-		DstM += words;
-	    memset(DstM, -1, words * sizeof(SCANLINE));
-	}
-	return mem;
+        if (infoPtr->Flags & HARDWARE_CURSOR_INVERT_MASK) {
+            DstM = (SCANLINE *) mem;
+            if (!(infoPtr->Flags & HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK))
+                DstM += words;
+            memset(DstM, -1, words * sizeof(SCANLINE));
+        }
+        return mem;
     }
 
     /* SrcPitch == the number of scanlines wide the cursor image is */
     SrcPitch = (pCurs->bits->width + (BITMAP_SCANLINE_PAD - 1)) >>
-      CUR_LOG2_BITMAP_PAD;
+        CUR_LOG2_BITMAP_PAD;
 
     /* DstPitch is the width of the hw cursor in scanlines */
     DstPitch = infoPtr->MaxWidth >> CUR_LOG2_BITMAP_PAD;
     Pitch = SrcPitch < DstPitch ? SrcPitch : DstPitch;
 
-    SrcS = (SCANLINE*)pCurs->bits->source;
-    SrcM = (SCANLINE*)pCurs->bits->mask;
-    DstS = (SCANLINE*)mem;
+    SrcS = (SCANLINE *) pCurs->bits->source;
+    SrcM = (SCANLINE *) pCurs->bits->mask;
+    DstS = (SCANLINE *) mem;
     DstM = DstS + words;
 
     if (infoPtr->Flags & HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK) {
-	SCANLINE *tmp;
-	tmp = DstS; DstS = DstM; DstM = tmp;
+        SCANLINE *tmp;
+
+        tmp = DstS;
+        DstS = DstM;
+        DstM = tmp;
     }
 
     if (infoPtr->Flags & HARDWARE_CURSOR_AND_SOURCE_WITH_MASK) {
-	for(y = pCurs->bits->height, pSrc = DstS, pMsk = DstM;
-	    y--;
-	    pSrc+=DstPitch, pMsk+=DstPitch, SrcS+=SrcPitch, SrcM+=SrcPitch) {
-	    for(x = 0; x < Pitch; x++) {
-		pSrc[x] = SrcS[x] & SrcM[x];
-		pMsk[x] = SrcM[x];
-	    }
-	}
-    } else {
-	for(y = pCurs->bits->height, pSrc = DstS, pMsk = DstM;
-	    y--;
-	    pSrc+=DstPitch, pMsk+=DstPitch, SrcS+=SrcPitch, SrcM+=SrcPitch) {
-	    for(x = 0; x < Pitch; x++) {
-		pSrc[x] = SrcS[x];
-		pMsk[x] = SrcM[x];
-	    }
-	}
+        for (y = pCurs->bits->height, pSrc = DstS, pMsk = DstM;
+             y--;
+             pSrc += DstPitch, pMsk += DstPitch, SrcS += SrcPitch, SrcM +=
+             SrcPitch) {
+            for (x = 0; x < Pitch; x++) {
+                pSrc[x] = SrcS[x] & SrcM[x];
+                pMsk[x] = SrcM[x];
+            }
+        }
+    }
+    else {
+        for (y = pCurs->bits->height, pSrc = DstS, pMsk = DstM;
+             y--;
+             pSrc += DstPitch, pMsk += DstPitch, SrcS += SrcPitch, SrcM +=
+             SrcPitch) {
+            for (x = 0; x < Pitch; x++) {
+                pSrc[x] = SrcS[x];
+                pMsk[x] = SrcM[x];
+            }
+        }
     }
 
     if (infoPtr->Flags & HARDWARE_CURSOR_NIBBLE_SWAPPED) {
-	int count = size;
-	unsigned char* pntr1 = (unsigned char *)DstS;
-	unsigned char* pntr2 = (unsigned char *)DstM;
-	unsigned char a, b;
-	while (count) {
-
-	   a = *pntr1;
-	   b = *pntr2;
-	   *pntr1 = ((a & 0xF0) >> 4) | ((a & 0x0F) << 4);
-	   *pntr2 = ((b & 0xF0) >> 4) | ((b & 0x0F) << 4);
-	   pntr1++; pntr2++;
-	   count-=2;
-	}
+        int count = size;
+        unsigned char *pntr1 = (unsigned char *) DstS;
+        unsigned char *pntr2 = (unsigned char *) DstM;
+        unsigned char a, b;
+
+        while (count) {
+
+            a = *pntr1;
+            b = *pntr2;
+            *pntr1 = ((a & 0xF0) >> 4) | ((a & 0x0F) << 4);
+            *pntr2 = ((b & 0xF0) >> 4) | ((b & 0x0F) << 4);
+            pntr1++;
+            pntr2++;
+            count -= 2;
+        }
     }
 
     /*
@@ -319,29 +334,29 @@ RealizeCursorInterleave0(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
      * out entire source mask.
      */
     if (infoPtr->Flags & HARDWARE_CURSOR_INVERT_MASK) {
-	int count = words;
-	SCANLINE* pntr = DstM;
-	while (count--) {
-	   *pntr = ~(*pntr);
-	    pntr++;
-	}
+        int count = words;
+        SCANLINE *pntr = DstM;
+
+        while (count--) {
+            *pntr = ~(*pntr);
+            pntr++;
+        }
     }
 
     if (infoPtr->Flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) {
-	for(y = pCurs->bits->height, pSrc = DstS, pMsk = DstM;
-	    y--;
-	    pSrc+=DstPitch, pMsk+=DstPitch) {
-	    for(x = 0; x < Pitch; x++) {
-		pSrc[x] = REVERSE_BIT_ORDER(pSrc[x]);
-		pMsk[x] = REVERSE_BIT_ORDER(pMsk[x]);
-	    }
-	}
+        for (y = pCurs->bits->height, pSrc = DstS, pMsk = DstM;
+             y--; pSrc += DstPitch, pMsk += DstPitch) {
+            for (x = 0; x < Pitch; x++) {
+                pSrc[x] = REVERSE_BIT_ORDER(pSrc[x]);
+                pMsk[x] = REVERSE_BIT_ORDER(pMsk[x]);
+            }
+        }
     }
 
     return mem;
 }
 
-static unsigned char*
+static unsigned char *
 RealizeCursorInterleave1(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
 {
     unsigned char *DstS, *DstM;
@@ -352,30 +367,30 @@ RealizeCursorInterleave1(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
 
     /* Realize the cursor without interleaving */
     if (!(mem2 = RealizeCursorInterleave0(infoPtr, pCurs)))
-	return NULL;
+        return NULL;
 
     if (!(mem = calloc(1, size))) {
-	free(mem2);
-	return NULL;
+        free(mem2);
+        return NULL;
     }
 
-     /* 1 bit interleave */
+    /* 1 bit interleave */
     DstS = mem2;
     DstM = DstS + (size >> 1);
     pntr = mem;
     count = size;
     while (count) {
-	*pntr++ = ((*DstS&0x01)     ) | ((*DstM&0x01) << 1) |
-		  ((*DstS&0x02) << 1) | ((*DstM&0x02) << 2) |
-		  ((*DstS&0x04) << 2) | ((*DstM&0x04) << 3) |
-		  ((*DstS&0x08) << 3) | ((*DstM&0x08) << 4);
-	*pntr++ = ((*DstS&0x10) >> 4) | ((*DstM&0x10) >> 3) |
-		  ((*DstS&0x20) >> 3) | ((*DstM&0x20) >> 2) |
-		  ((*DstS&0x40) >> 2) | ((*DstM&0x40) >> 1) |
-		  ((*DstS&0x80) >> 1) | ((*DstM&0x80)     );
-	DstS++;
-	DstM++;
-	count-=2;
+        *pntr++ = ((*DstS & 0x01)) | ((*DstM & 0x01) << 1) |
+            ((*DstS & 0x02) << 1) | ((*DstM & 0x02) << 2) |
+            ((*DstS & 0x04) << 2) | ((*DstM & 0x04) << 3) |
+            ((*DstS & 0x08) << 3) | ((*DstM & 0x08) << 4);
+        *pntr++ = ((*DstS & 0x10) >> 4) | ((*DstM & 0x10) >> 3) |
+            ((*DstS & 0x20) >> 3) | ((*DstM & 0x20) >> 2) |
+            ((*DstS & 0x40) >> 2) | ((*DstM & 0x40) >> 1) |
+            ((*DstS & 0x80) >> 1) | ((*DstM & 0x80));
+        DstS++;
+        DstM++;
+        count -= 2;
     }
 
     /* Free the uninterleaved cursor */
@@ -384,7 +399,7 @@ RealizeCursorInterleave1(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
     return mem;
 }
 
-static unsigned char*
+static unsigned char *
 RealizeCursorInterleave8(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
 {
     unsigned char *DstS, *DstM;
@@ -395,11 +410,11 @@ RealizeCursorInterleave8(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
 
     /* Realize the cursor without interleaving */
     if (!(mem2 = RealizeCursorInterleave0(infoPtr, pCurs)))
-	return NULL;
+        return NULL;
 
     if (!(mem = calloc(1, size))) {
-	free(mem2);
-	return NULL;
+        free(mem2);
+        return NULL;
     }
 
     /* 8 bit interleave */
@@ -408,9 +423,9 @@ RealizeCursorInterleave8(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
     pntr = mem;
     count = size;
     while (count) {
-	*pntr++ = *DstS++;
-	*pntr++ = *DstM++;
-	count-=2;
+        *pntr++ = *DstS++;
+        *pntr++ = *DstM++;
+        count -= 2;
     }
 
     /* Free the uninterleaved cursor */
@@ -419,7 +434,7 @@ RealizeCursorInterleave8(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
     return mem;
 }
 
-static unsigned char*
+static unsigned char *
 RealizeCursorInterleave16(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
 {
     unsigned short *DstS, *DstM;
@@ -430,22 +445,22 @@ RealizeCursorInterleave16(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
 
     /* Realize the cursor without interleaving */
     if (!(mem2 = RealizeCursorInterleave0(infoPtr, pCurs)))
-	return NULL;
+        return NULL;
 
     if (!(mem = calloc(1, size))) {
-	free(mem2);
-	return NULL;
+        free(mem2);
+        return NULL;
     }
 
     /* 16 bit interleave */
-    DstS = (pointer)mem2;
+    DstS = (pointer) mem2;
     DstM = DstS + (size >> 2);
-    pntr = (pointer)mem;
+    pntr = (pointer) mem;
     count = (size >> 1);
     while (count) {
-	*pntr++ = *DstS++;
-	*pntr++ = *DstM++;
-	count-=2;
+        *pntr++ = *DstS++;
+        *pntr++ = *DstM++;
+        count -= 2;
     }
 
     /* Free the uninterleaved cursor */
@@ -454,7 +469,7 @@ RealizeCursorInterleave16(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
     return mem;
 }
 
-static unsigned char*
+static unsigned char *
 RealizeCursorInterleave32(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
 {
     CARD32 *DstS, *DstM;
@@ -465,22 +480,22 @@ RealizeCursorInterleave32(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
 
     /* Realize the cursor without interleaving */
     if (!(mem2 = RealizeCursorInterleave0(infoPtr, pCurs)))
-	return NULL;
+        return NULL;
 
     if (!(mem = calloc(1, size))) {
-	free(mem2);
-	return NULL;
+        free(mem2);
+        return NULL;
     }
 
     /* 32 bit interleave */
-    DstS = (pointer)mem2;
+    DstS = (pointer) mem2;
     DstM = DstS + (size >> 3);
-    pntr = (pointer)mem;
+    pntr = (pointer) mem;
     count = (size >> 2);
     while (count) {
-	*pntr++ = *DstS++;
-	*pntr++ = *DstM++;
-	count-=2;
+        *pntr++ = *DstS++;
+        *pntr++ = *DstM++;
+        count -= 2;
     }
 
     /* Free the uninterleaved cursor */
@@ -489,7 +504,7 @@ RealizeCursorInterleave32(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
     return mem;
 }
 
-static unsigned char*
+static unsigned char *
 RealizeCursorInterleave64(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
 {
     CARD32 *DstS, *DstM;
@@ -500,24 +515,24 @@ RealizeCursorInterleave64(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
 
     /* Realize the cursor without interleaving */
     if (!(mem2 = RealizeCursorInterleave0(infoPtr, pCurs)))
-	return NULL;
+        return NULL;
 
     if (!(mem = calloc(1, size))) {
-	free(mem2);
-	return NULL;
+        free(mem2);
+        return NULL;
     }
 
     /* 64 bit interleave */
-    DstS = (pointer)mem2;
+    DstS = (pointer) mem2;
     DstM = DstS + (size >> 3);
-    pntr = (pointer)mem;
+    pntr = (pointer) mem;
     count = (size >> 2);
     while (count) {
-	*pntr++ = *DstS++;
-	*pntr++ = *DstS++;
-	*pntr++ = *DstM++;
-	*pntr++ = *DstM++;
-	count-=4;
+        *pntr++ = *DstS++;
+        *pntr++ = *DstS++;
+        *pntr++ = *DstM++;
+        *pntr++ = *DstM++;
+        count -= 4;
     }
 
     /* Free the uninterleaved cursor */
diff --git a/xorg-server/hw/xfree86/ramdac/xf86RamDac.h b/xorg-server/hw/xfree86/ramdac/xf86RamDac.h
index 4a3900b93..50a659a22 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86RamDac.h
+++ b/xorg-server/hw/xfree86/ramdac/xf86RamDac.h
@@ -16,96 +16,63 @@ typedef struct _RamDacRegRec {
  * and they seem o.k 
  * Then we allocate 768 entries for the DAC too. IBM640 needs 1024 -FIXME
  */
-    unsigned short DacRegs[0x400];	/* register set */
-    unsigned char DAC[0x300];		/* colour map */
+    unsigned short DacRegs[0x400];      /* register set */
+    unsigned char DAC[0x300];   /* colour map */
     Bool Overlay;
 } RamDacRegRec, *RamDacRegRecPtr;
 
 typedef struct _RamDacHWRegRec {
-    RamDacRegRec	SavedReg;
-    RamDacRegRec	ModeReg;
+    RamDacRegRec SavedReg;
+    RamDacRegRec ModeReg;
 } RamDacHWRec, *RamDacHWRecPtr;
 
 typedef struct _RamDacRec {
     CARD32 RamDacType;
 
-    void (*LoadPalette)(
-	ScrnInfoPtr pScrn, 
-	int numColors, 
-	int *indices, 
-	LOCO *colors,
-	VisualPtr pVisual
-    );
-
-    unsigned char (*ReadDAC)(
-	ScrnInfoPtr pScrn,
-	CARD32
-    );
-
-    void (*WriteDAC)(
-	ScrnInfoPtr pScrn,
-	CARD32,
-	unsigned char,
-	unsigned char
-    );
-
-    void (*WriteAddress)(
-	ScrnInfoPtr pScrn,
-	CARD32
-    );
-
-    void (*WriteData)(
-	ScrnInfoPtr pScrn,
-	unsigned char
-    );
-
-    void (*ReadAddress)(
-	ScrnInfoPtr pScrn,
-	CARD32
-    );
-
-    unsigned char (*ReadData)(
-	ScrnInfoPtr pScrn
-    );
+    void (*LoadPalette) (ScrnInfoPtr pScrn,
+                         int numColors,
+                         int *indices, LOCO * colors, VisualPtr pVisual);
+
+    unsigned char (*ReadDAC) (ScrnInfoPtr pScrn, CARD32);
+
+    void (*WriteDAC) (ScrnInfoPtr pScrn, CARD32, unsigned char, unsigned char);
+
+    void (*WriteAddress) (ScrnInfoPtr pScrn, CARD32);
+
+    void (*WriteData) (ScrnInfoPtr pScrn, unsigned char);
+
+    void (*ReadAddress) (ScrnInfoPtr pScrn, CARD32);
+
+    unsigned char (*ReadData) (ScrnInfoPtr pScrn);
 } RamDacRec, *RamDacRecPtr;
 
 typedef struct _RamDacHelperRec {
     CARD32 RamDacType;
 
-    void (*Restore)(
-	ScrnInfoPtr pScrn,
-	RamDacRecPtr ramdacPtr,
-	RamDacRegRecPtr ramdacReg
-    );
-
-    void (*Save)(
-	ScrnInfoPtr pScrn,
-	RamDacRecPtr ramdacPtr,
-	RamDacRegRecPtr ramdacReg
-    );
-
-    void (*SetBpp)(
-	ScrnInfoPtr pScrn,
-	RamDacRegRecPtr ramdacReg
-    );
-
-    void (*HWCursorInit)(
-	xf86CursorInfoPtr infoPtr
-    );
+    void (*Restore) (ScrnInfoPtr pScrn,
+                     RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg);
+
+    void (*Save) (ScrnInfoPtr pScrn,
+                  RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg);
+
+    void (*SetBpp) (ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg);
+
+    void (*HWCursorInit) (xf86CursorInfoPtr infoPtr);
 } RamDacHelperRec, *RamDacHelperRecPtr;
 
 #define RAMDACHWPTR(p) ((RamDacHWRecPtr)((p)->privates[RamDacGetHWIndex()].ptr))
 
 typedef struct _RamdacScreenRec {
-    RamDacRecPtr	RamDacRec;
+    RamDacRecPtr RamDacRec;
 } RamDacScreenRec, *RamDacScreenRecPtr;
+
 #define RAMDACSCRPTR(p) ((RamDacScreenRecPtr)((p)->privates[RamDacGetScreenIndex()].ptr))->RamDacRec
 
 extern _X_EXPORT int RamDacHWPrivateIndex;
 extern _X_EXPORT int RamDacScreenPrivateIndex;
 
 typedef struct {
-    int		token;
+    int token;
 } RamDacSupportedInfoRec, *RamDacSupportedInfoRecPtr;
 
 extern _X_EXPORT RamDacRecPtr RamDacCreateInfoRec(void);
@@ -113,9 +80,9 @@ extern _X_EXPORT RamDacHelperRecPtr RamDacHelperCreateInfoRec(void);
 extern _X_EXPORT void RamDacDestroyInfoRec(RamDacRecPtr RamDacRec);
 extern _X_EXPORT void RamDacHelperDestroyInfoRec(RamDacHelperRecPtr RamDacRec);
 extern _X_EXPORT Bool RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec);
-extern _X_EXPORT Bool RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits,
-			   unsigned int flags);
+extern _X_EXPORT Bool RamDacHandleColormaps(ScreenPtr pScreen, int maxColors,
+                                            int sigRGBbits, unsigned int flags);
 extern _X_EXPORT void RamDacFreeRec(ScrnInfoPtr pScrn);
-extern _X_EXPORT int  RamDacGetHWIndex(void);
+extern _X_EXPORT int RamDacGetHWIndex(void);
 
-#endif /* _XF86RAMDAC_H */
+#endif                          /* _XF86RAMDAC_H */
diff --git a/xorg-server/hw/xfree86/sdksyms.sh b/xorg-server/hw/xfree86/sdksyms.sh
index 9034f3829..40ea7c8da 100644
--- a/xorg-server/hw/xfree86/sdksyms.sh
+++ b/xorg-server/hw/xfree86/sdksyms.sh
@@ -364,7 +364,7 @@ BEGIN {
 	# skip attribute, if any
 	while ($n ~ /^(__attribute__|__global)/ ||
 	    # skip modifiers, if any
-	    $n ~ /^\*?(unsigned|const|volatile|struct)$/ ||
+	    $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ ||
 	    # skip pointer
 	    $n ~ /^[a-zA-Z0-9_]*\*$/)
 	    n++;
@@ -395,6 +395,9 @@ BEGIN {
 	if ($n == "" || $n ~ /^\*+$/) {
 	    getline;
 	    n = 1;
+	    # indent may have inserted a blank link
+	    if ($0 == "")
+		getline;
 	}
 
 	# dont modify $0 or $n
diff --git a/xorg-server/hw/xfree86/shadowfb/sfbmodule.c b/xorg-server/hw/xfree86/shadowfb/sfbmodule.c
index ec37a1f8f..c20efc071 100644
--- a/xorg-server/hw/xfree86/shadowfb/sfbmodule.c
+++ b/xorg-server/hw/xfree86/shadowfb/sfbmodule.c
@@ -4,18 +4,17 @@
 
 #include "xf86Module.h"
 
-static XF86ModuleVersionInfo VersRec =
-{
-        "shadowfb",
-        MODULEVENDORSTRING,
-        MODINFOSTRING1,
-        MODINFOSTRING2,
-        XORG_VERSION_CURRENT,
-        1, 0, 0,
-        ABI_CLASS_ANSIC,                /* Only need the ansic layer */
-        ABI_ANSIC_VERSION,
-        MOD_CLASS_NONE,
-        {0,0,0,0}       /* signature, to be patched into the file by a tool */
+static XF86ModuleVersionInfo VersRec = {
+    "shadowfb",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_ANSIC,            /* Only need the ansic layer */
+    ABI_ANSIC_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}                /* signature, to be patched into the file by a tool */
 };
 
 _X_EXPORT XF86ModuleData shadowfbModuleData = { &VersRec, NULL, NULL };
diff --git a/xorg-server/hw/xfree86/shadowfb/shadow.c b/xorg-server/hw/xfree86/shadowfb/shadow.c
index 26b92b5d6..714dd141a 100644
--- a/xorg-server/hw/xfree86/shadowfb/shadow.c
+++ b/xorg-server/hw/xfree86/shadowfb/shadow.c
@@ -1,1681 +1,1641 @@
-/*

-   Copyright (C) 1999.  The XFree86 Project Inc.

-

-   Written by Mark Vojkovich (mvojkovi@ucsd.edu)

-

-   Pre-fb-write callbacks and RENDER support - Nolan Leake (nolan@vmware.com)

-*/

-

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "misc.h"

-#include "pixmapstr.h"

-#include "input.h"

-#include <X11/fonts/font.h>

-#include "mi.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "gcstruct.h"

-#include "dixfontstr.h"

-#include <X11/fonts/fontstruct.h>

-#include "xf86.h"

-#include "xf86str.h"

-#include "shadowfb.h"

-

-# include "picturestr.h"

-

-static Bool ShadowCloseScreen (int i, ScreenPtr pScreen);

-static void ShadowCopyWindow(

-    WindowPtr pWin,

-    DDXPointRec ptOldOrg,

-    RegionPtr prgn 

-);

-static Bool ShadowCreateGC(GCPtr pGC);

-

-static Bool ShadowEnterVT(int index, int flags);

-static void ShadowLeaveVT(int index, int flags);

-

-static void ShadowComposite(

-    CARD8 op,

-    PicturePtr pSrc,

-    PicturePtr pMask,

-    PicturePtr pDst,

-    INT16 xSrc,

-    INT16 ySrc,

-    INT16 xMask,

-    INT16 yMask,

-    INT16 xDst,

-    INT16 yDst,

-    CARD16 width,

-    CARD16 height

-);

-

-

-typedef struct {

-  ScrnInfoPtr 				pScrn;

-  RefreshAreaFuncPtr			preRefresh;

-  RefreshAreaFuncPtr                    postRefresh;

-  CloseScreenProcPtr			CloseScreen;

-  CopyWindowProcPtr			CopyWindow;

-  CreateGCProcPtr			CreateGC;

-  ModifyPixmapHeaderProcPtr		ModifyPixmapHeader;

-  CompositeProcPtr Composite;

-  Bool				(*EnterVT)(int, int);

-  void				(*LeaveVT)(int, int);

-  Bool				vtSema;

-} ShadowScreenRec, *ShadowScreenPtr;

-

-typedef struct {

-   GCOps   *ops;

-   GCFuncs *funcs;

-} ShadowGCRec, *ShadowGCPtr;

-

-static DevPrivateKeyRec ShadowScreenKeyRec;

-#define ShadowScreenKey (&ShadowScreenKeyRec)

-

-static DevPrivateKeyRec ShadowGCKeyRec;

-#define ShadowGCKey (&ShadowGCKeyRec)

-

-#define GET_SCREEN_PRIVATE(pScreen) \

-    (ShadowScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, ShadowScreenKey)

-#define GET_GC_PRIVATE(pGC) \

-    (ShadowGCPtr)dixLookupPrivate(&(pGC)->devPrivates, ShadowGCKey)

-

-#define SHADOW_GC_FUNC_PROLOGUE(pGC)\

-    ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);\

-    (pGC)->funcs = pGCPriv->funcs;\

-    if(pGCPriv->ops)\

-        (pGC)->ops = pGCPriv->ops

-

-#define SHADOW_GC_FUNC_EPILOGUE(pGC)\

-    pGCPriv->funcs = (pGC)->funcs;\

-    (pGC)->funcs = &ShadowGCFuncs;\

-    if(pGCPriv->ops) {\

-        pGCPriv->ops = (pGC)->ops;\

-        (pGC)->ops = &ShadowGCOps;\

-    }

-

-#define SHADOW_GC_OP_PROLOGUE(pGC)\

-    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pGC->pScreen); \

-    ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);\

-    GCFuncs *oldFuncs = pGC->funcs;\

-    pGC->funcs = pGCPriv->funcs;\

-    pGC->ops = pGCPriv->ops

-

-    

-#define SHADOW_GC_OP_EPILOGUE(pGC)\

-    pGCPriv->ops = pGC->ops;\

-    pGC->funcs = oldFuncs;\

-    pGC->ops   = &ShadowGCOps

-

-#define IS_VISIBLE(pWin) (pPriv->vtSema && \

-    (((WindowPtr)pWin)->visibility != VisibilityFullyObscured))

-

-#define TRIM_BOX(box, pGC) { \

-    BoxPtr extents = &pGC->pCompositeClip->extents;\

-    if(box.x1 < extents->x1) box.x1 = extents->x1; \

-    if(box.x2 > extents->x2) box.x2 = extents->x2; \

-    if(box.y1 < extents->y1) box.y1 = extents->y1; \

-    if(box.y2 > extents->y2) box.y2 = extents->y2; \

-    }

-

-#define TRANSLATE_BOX(box, pDraw) { \

-    box.x1 += pDraw->x; \

-    box.x2 += pDraw->x; \

-    box.y1 += pDraw->y; \

-    box.y2 += pDraw->y; \

-    }

-

-#define TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC) { \

-    TRANSLATE_BOX(box, pDraw); \

-    TRIM_BOX(box, pGC); \

-    }

-

-#define BOX_NOT_EMPTY(box) \

-    (((box.x2 - box.x1) > 0) && ((box.y2 - box.y1) > 0))

-

-

-

-Bool

-ShadowFBInit2 (

-    ScreenPtr		pScreen,

-    RefreshAreaFuncPtr  preRefreshArea,

-    RefreshAreaFuncPtr  postRefreshArea

-){

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    ShadowScreenPtr pPriv;

-    PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);

-

-    if(!preRefreshArea && !postRefreshArea) return FALSE;

-    

-    if (!dixRegisterPrivateKey(&ShadowScreenKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-

-    if(!dixRegisterPrivateKey(&ShadowGCKeyRec, PRIVATE_GC, sizeof(ShadowGCRec)))

-	return FALSE;

-

-    if(!(pPriv = (ShadowScreenPtr)malloc(sizeof(ShadowScreenRec))))

-	return FALSE;

-

-    dixSetPrivate(&pScreen->devPrivates, ShadowScreenKey, pPriv);

-

-    pPriv->pScrn = pScrn;

-    pPriv->preRefresh = preRefreshArea;

-    pPriv->postRefresh = postRefreshArea;

-    pPriv->vtSema = TRUE;

-

-    pPriv->CloseScreen = pScreen->CloseScreen;

-    pPriv->CopyWindow = pScreen->CopyWindow;

-    pPriv->CreateGC = pScreen->CreateGC;

-    pPriv->ModifyPixmapHeader = pScreen->ModifyPixmapHeader;

-

-    pPriv->EnterVT = pScrn->EnterVT;

-    pPriv->LeaveVT = pScrn->LeaveVT;

-

-    pScreen->CloseScreen = ShadowCloseScreen;

-    pScreen->CopyWindow = ShadowCopyWindow;

-    pScreen->CreateGC = ShadowCreateGC;

-

-    pScrn->EnterVT = ShadowEnterVT;

-    pScrn->LeaveVT = ShadowLeaveVT;

-

-    if(ps) {

-      pPriv->Composite = ps->Composite;

-      ps->Composite = ShadowComposite;

-    }

-

-    return TRUE;

-}

-

-Bool

-ShadowFBInit (

-    ScreenPtr		pScreen,

-    RefreshAreaFuncPtr  refreshArea

-){

-    return ShadowFBInit2(pScreen, NULL, refreshArea);

-}

-

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

-

-static Bool

-ShadowEnterVT(int index, int flags)

-{

-    ScrnInfoPtr pScrn = xf86Screens[index];

-    Bool ret;

-    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScrn->pScreen);

-

-    pScrn->EnterVT = pPriv->EnterVT;

-    ret = (*pPriv->EnterVT)(index, flags);

-    pPriv->EnterVT = pScrn->EnterVT;

-    pScrn->EnterVT = ShadowEnterVT;

-    if(ret) {

-	pPriv->vtSema = TRUE;

-        return TRUE;

-    }

-

-    return FALSE;

-}

-

-static void

-ShadowLeaveVT(int index, int flags)

-{

-    ScrnInfoPtr pScrn = xf86Screens[index];

-    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(xf86Screens[index]->pScreen);

-

-    pPriv->vtSema = FALSE;

-

-    pScrn->LeaveVT = pPriv->LeaveVT;

-    (*pPriv->LeaveVT)(index, flags);

-    pPriv->LeaveVT = pScrn->LeaveVT;

-    pScrn->LeaveVT = ShadowLeaveVT;

-}

-

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

-

-

-static Bool

-ShadowCloseScreen (int i, ScreenPtr pScreen)

-{

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);

-    PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);

-

-    pScreen->CloseScreen = pPriv->CloseScreen;

-    pScreen->CopyWindow = pPriv->CopyWindow;

-    pScreen->CreateGC = pPriv->CreateGC;

-    pScreen->ModifyPixmapHeader = pPriv->ModifyPixmapHeader;

-

-    pScrn->EnterVT = pPriv->EnterVT;

-    pScrn->LeaveVT = pPriv->LeaveVT;

-

-    if(ps) {

-        ps->Composite = pPriv->Composite;

-    }

-

-    free((pointer)pPriv);

-

-    return (*pScreen->CloseScreen) (i, pScreen);

-}

-

-static void 

-ShadowCopyWindow(

-   WindowPtr pWin,

-   DDXPointRec ptOldOrg,

-   RegionPtr prgn 

-){

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);

-    int num = 0;

-    RegionRec rgnDst;

-

-    if (pPriv->vtSema) {

-        RegionNull(&rgnDst);

-	RegionCopy(&rgnDst, prgn);

-        

-        RegionTranslate(&rgnDst,

-                         pWin->drawable.x - ptOldOrg.x,

-                         pWin->drawable.y - ptOldOrg.y);

-        RegionIntersect(&rgnDst, &pWin->borderClip, &rgnDst);

-        if ((num = RegionNumRects(&rgnDst))) {

-            if(pPriv->preRefresh)

-                (*pPriv->preRefresh)(pPriv->pScrn, num, RegionRects(&rgnDst));

-        } else {

-            RegionUninit(&rgnDst);

-        }

-    }

-    

-    pScreen->CopyWindow = pPriv->CopyWindow;

-    (*pScreen->CopyWindow) (pWin, ptOldOrg, prgn);

-    pScreen->CopyWindow = ShadowCopyWindow;

-    

-    if (num) {

-        if (pPriv->postRefresh)

-            (*pPriv->postRefresh)(pPriv->pScrn, num, RegionRects(&rgnDst));

-        RegionUninit(&rgnDst);

-    }

-}

-

-static void

-ShadowComposite(

-    CARD8 op,

-    PicturePtr pSrc,

-    PicturePtr pMask,

-    PicturePtr pDst,

-    INT16 xSrc,

-    INT16 ySrc,

-    INT16 xMask,

-    INT16 yMask,

-    INT16 xDst,

-    INT16 yDst,

-    CARD16 width,

-    CARD16 height

-){

-    ScreenPtr pScreen = pDst->pDrawable->pScreen;

-    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);

-    PictureScreenPtr ps = GetPictureScreen(pScreen);

-    BoxRec box;

-    BoxPtr extents;

-    Bool boxNotEmpty = FALSE;

-

-    if (pPriv->vtSema

-	&& pDst->pDrawable->type == DRAWABLE_WINDOW) {

-

-	box.x1 = pDst->pDrawable->x + xDst;

-	box.y1 = pDst->pDrawable->y + yDst;

-	box.x2 = box.x1 + width;

-	box.y2 = box.y1 + height;

-

-	extents = &pDst->pCompositeClip->extents;

-	if(box.x1 < extents->x1) box.x1 = extents->x1;

-	if(box.x2 > extents->x2) box.x2 = extents->x2;

-	if(box.y1 < extents->y1) box.y1 = extents->y1;

-	if(box.y2 > extents->y2) box.y2 = extents->y2;

-	

-	if (BOX_NOT_EMPTY(box)) {

-	    if (pPriv->preRefresh)

-		(*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-	    boxNotEmpty = TRUE;

-	}

-    }

-    

-    ps->Composite = pPriv->Composite;

-    (*ps->Composite)(op, pSrc, pMask, pDst, xSrc, ySrc,

-		     xMask, yMask, xDst, yDst, width, height);

-    ps->Composite = ShadowComposite;

-

-    if (pPriv->postRefresh && boxNotEmpty) {

-        (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-    }

-}

-

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

-

-static void ShadowValidateGC(GCPtr, unsigned long, DrawablePtr);

-static void ShadowChangeGC(GCPtr, unsigned long);

-static void ShadowCopyGC(GCPtr, unsigned long, GCPtr);

-static void ShadowDestroyGC(GCPtr);

-static void ShadowChangeClip(GCPtr, int, pointer, int);

-static void ShadowDestroyClip(GCPtr);

-static void ShadowCopyClip(GCPtr, GCPtr);

-

-GCFuncs ShadowGCFuncs = {

-    ShadowValidateGC, ShadowChangeGC, ShadowCopyGC, ShadowDestroyGC,

-    ShadowChangeClip, ShadowDestroyClip, ShadowCopyClip

-};

-

-

-extern GCOps ShadowGCOps;

-

-static Bool

-ShadowCreateGC(GCPtr pGC)

-{

-    ScreenPtr pScreen = pGC->pScreen;

-    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);

-    ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);

-    Bool ret;

-   

-    pScreen->CreateGC = pPriv->CreateGC;

-    if((ret = (*pScreen->CreateGC) (pGC))) {

-	pGCPriv->ops = NULL;

-	pGCPriv->funcs = pGC->funcs;

-	pGC->funcs = &ShadowGCFuncs;

-    }

-    pScreen->CreateGC = ShadowCreateGC;

-

-    return ret;

-}

-

-

-static void

-ShadowValidateGC(

-   GCPtr         pGC,

-   unsigned long changes,

-   DrawablePtr   pDraw 

-){

-    SHADOW_GC_FUNC_PROLOGUE (pGC);

-    (*pGC->funcs->ValidateGC)(pGC, changes, pDraw);

-    if(pDraw->type == DRAWABLE_WINDOW)

-	pGCPriv->ops = pGC->ops;  /* just so it's not NULL */

-    else 

-	pGCPriv->ops = NULL;

-    SHADOW_GC_FUNC_EPILOGUE (pGC);

-}

-

-

-static void

-ShadowDestroyGC(GCPtr pGC)

-{

-    SHADOW_GC_FUNC_PROLOGUE (pGC);

-    (*pGC->funcs->DestroyGC)(pGC);

-    SHADOW_GC_FUNC_EPILOGUE (pGC);

-}

-

-static void

-ShadowChangeGC (

-    GCPtr	    pGC,

-    unsigned long   mask

-){

-    SHADOW_GC_FUNC_PROLOGUE (pGC);

-    (*pGC->funcs->ChangeGC) (pGC, mask);

-    SHADOW_GC_FUNC_EPILOGUE (pGC);

-}

-

-static void

-ShadowCopyGC (

-    GCPtr	    pGCSrc, 

-    unsigned long   mask,

-    GCPtr	    pGCDst

-){

-    SHADOW_GC_FUNC_PROLOGUE (pGCDst);

-    (*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst);

-    SHADOW_GC_FUNC_EPILOGUE (pGCDst);

-}

-

-static void

-ShadowChangeClip (

-    GCPtr   pGC,

-    int		type,

-    pointer	pvalue,

-    int		nrects 

-){

-    SHADOW_GC_FUNC_PROLOGUE (pGC);

-    (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);

-    SHADOW_GC_FUNC_EPILOGUE (pGC);

-}

-

-static void

-ShadowCopyClip(GCPtr pgcDst, GCPtr pgcSrc)

-{

-    SHADOW_GC_FUNC_PROLOGUE (pgcDst);

-    (* pgcDst->funcs->CopyClip)(pgcDst, pgcSrc);

-    SHADOW_GC_FUNC_EPILOGUE (pgcDst);

-}

-

-static void

-ShadowDestroyClip(GCPtr pGC)

-{

-    SHADOW_GC_FUNC_PROLOGUE (pGC);

-    (* pGC->funcs->DestroyClip)(pGC);

-    SHADOW_GC_FUNC_EPILOGUE (pGC);

-}

-

-

-

-

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

-

-

-static void

-ShadowFillSpans(

-    DrawablePtr pDraw,

-    GC		*pGC,

-    int		nInit,	

-    DDXPointPtr pptInit,	

-    int 	*pwidthInit,		

-    int 	fSorted 

-){

-    SHADOW_GC_OP_PROLOGUE(pGC);    

-

-    if(IS_VISIBLE(pDraw) && nInit) {

-	DDXPointPtr ppt = pptInit;

-	int *pwidth = pwidthInit;

-	int i = nInit;

-	BoxRec box;

-        Bool boxNotEmpty = FALSE;

-

-	box.x1 = ppt->x;

-	box.x2 = box.x1 + *pwidth;

-	box.y2 = box.y1 = ppt->y;

-

-	while(--i) {

-	   ppt++;

-	   pwidth++;

-	   if(box.x1 > ppt->x) box.x1 = ppt->x;

-	   if(box.x2 < (ppt->x + *pwidth)) 

-		box.x2 = ppt->x + *pwidth;

-	   if(box.y1 > ppt->y) box.y1 = ppt->y;

-	   else if(box.y2 < ppt->y) box.y2 = ppt->y;

-	}

-

-	box.y2++;

-

-        if(!pGC->miTranslate) {

-           TRANSLATE_BOX(box, pDraw);

-        }

-        TRIM_BOX(box, pGC); 

-

-	if(BOX_NOT_EMPTY(box)) {

-            if(pPriv->preRefresh)

-                (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-            boxNotEmpty = TRUE;

-        }

-

-	(*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);

-

-        if(boxNotEmpty && pPriv->postRefresh)

-	   (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-    } else

-	(*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);

-

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-ShadowSetSpans(

-    DrawablePtr		pDraw,

-    GCPtr		pGC,

-    char		*pcharsrc,

-    DDXPointPtr 	pptInit,

-    int			*pwidthInit,

-    int			nspans,

-    int			fSorted 

-){

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && nspans) {

-	DDXPointPtr ppt = pptInit;

-	int *pwidth = pwidthInit;

-	int i = nspans;

-	BoxRec box;

-        Bool boxNotEmpty = FALSE;

-

-	box.x1 = ppt->x;

-	box.x2 = box.x1 + *pwidth;

-	box.y2 = box.y1 = ppt->y;

-

-	while(--i) {

-	   ppt++;

-	   pwidth++;

-	   if(box.x1 > ppt->x) box.x1 = ppt->x;

-	   if(box.x2 < (ppt->x + *pwidth)) 

-		box.x2 = ppt->x + *pwidth;

-	   if(box.y1 > ppt->y) box.y1 = ppt->y;

-	   else if(box.y2 < ppt->y) box.y2 = ppt->y;

-	}

-

-	box.y2++;

-

-        if(!pGC->miTranslate) {

-           TRANSLATE_BOX(box, pDraw);

-        }

-        TRIM_BOX(box, pGC);

-

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-	      (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-

-	(*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, pptInit, 

-				pwidthInit, nspans, fSorted);

-

-	if(boxNotEmpty && pPriv->postRefresh)

-	   (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-    } else

-	(*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, pptInit, 

-				pwidthInit, nspans, fSorted);

-

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-ShadowPutImage(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		depth, 

-    int x, int y, int w, int h,

-    int		leftPad,

-    int		format,

-    char 	*pImage 

-){

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-    

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw)) {

-	box.x1 = x + pDraw->x;

-	box.x2 = box.x1 + w;

-	box.y1 = y + pDraw->y;

-	box.y2 = box.y1 + h;

-

-	TRIM_BOX(box, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-	      (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-

-    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h, 

-		leftPad, format, pImage);

-                

-    if(boxNotEmpty && pPriv->postRefresh)

-        (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-    

-    SHADOW_GC_OP_EPILOGUE(pGC);

-

-}

-

-static RegionPtr

-ShadowCopyArea(

-    DrawablePtr pSrc,

-    DrawablePtr pDst,

-    GC *pGC,

-    int srcx, int srcy,

-    int width, int height,

-    int dstx, int dsty 

-){

-    RegionPtr ret;

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-    

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDst)) {

-	box.x1 = dstx + pDst->x;

-	box.x2 = box.x1 + width;

-	box.y1 = dsty + pDst->y;

-	box.y2 = box.y1 + height;

-

-	TRIM_BOX(box, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-	      (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-    

-    ret = (*pGC->ops->CopyArea)(pSrc, pDst,

-            pGC, srcx, srcy, width, height, dstx, dsty);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-        (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-    

-    SHADOW_GC_OP_EPILOGUE(pGC);

-

-    return ret;

-}

-

-static RegionPtr

-ShadowCopyPlane(

-    DrawablePtr	pSrc,

-    DrawablePtr	pDst,

-    GCPtr pGC,

-    int	srcx, int srcy,

-    int	width, int height,

-    int	dstx, int dsty,

-    unsigned long bitPlane 

-){

-    RegionPtr ret;

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-    

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDst)) {

-	box.x1 = dstx + pDst->x;

-	box.x2 = box.x1 + width;

-	box.y1 = dsty + pDst->y;

-	box.y2 = box.y1 + height;

-

-	TRIM_BOX(box, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-	      (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-    

-    ret = (*pGC->ops->CopyPlane)(pSrc, pDst,

-	       pGC, srcx, srcy, width, height, dstx, dsty, bitPlane);

-    

-    if(boxNotEmpty && pPriv->postRefresh)

-        (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-    

-    SHADOW_GC_OP_EPILOGUE(pGC);

-

-    return ret;

-}

-

-static void

-ShadowPolyPoint(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int mode,

-    int nptInit,

-    xPoint *pptInit 

-){

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-    

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && nptInit) {

-        xPoint *ppt = pptInit;

-        int npt = nptInit;

-

-	box.x2 = box.x1 = pptInit->x;

-	box.y2 = box.y1 = pptInit->y;

-

-	/* this could be slow if the points were spread out */

-

-	while(--npt) {

-	   ppt++;

-	   if(box.x1 > ppt->x) box.x1 = ppt->x;

-	   else if(box.x2 < ppt->x) box.x2 = ppt->x;

-	   if(box.y1 > ppt->y) box.y1 = ppt->y;

-	   else if(box.y2 < ppt->y) box.y2 = ppt->y;

-	}

-

-	box.x2++;

-	box.y2++;

-

-	TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-	      (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-    

-    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, nptInit, pptInit);

-    

-    if(boxNotEmpty && pPriv->postRefresh)

-        (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-ShadowPolylines(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		mode,		

-    int		nptInit,		

-    DDXPointPtr pptInit 

-){

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-    

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && nptInit) {

-        DDXPointPtr ppt = pptInit;

-        int npt = nptInit;

-	int extra = pGC->lineWidth >> 1;

-

-	box.x2 = box.x1 = pptInit->x;

-	box.y2 = box.y1 = pptInit->y;

-

-	if(npt > 1) {

-	   if(pGC->joinStyle == JoinMiter)

-		extra = 6 * pGC->lineWidth;

-	   else if(pGC->capStyle == CapProjecting)

-		extra = pGC->lineWidth;

-        }

-

-	if(mode == CoordModePrevious) {

-	   int x = box.x1;

-	   int y = box.y1;

-	   while(--npt) {

-		ppt++;

-		x += ppt->x;

-		y += ppt->y;

-		if(box.x1 > x) box.x1 = x;

-		else if(box.x2 < x) box.x2 = x;

-		if(box.y1 > y) box.y1 = y;

-		else if(box.y2 < y) box.y2 = y;

-	    }

-	} else {

-	   while(--npt) {

-		ppt++;

-		if(box.x1 > ppt->x) box.x1 = ppt->x;

-		else if(box.x2 < ppt->x) box.x2 = ppt->x;

-		if(box.y1 > ppt->y) box.y1 = ppt->y;

-		else if(box.y2 < ppt->y) box.y2 = ppt->y;

-	    }

-	}

-

-	box.x2++;

-	box.y2++;

-

-	if(extra) {

-	   box.x1 -= extra;

-	   box.x2 += extra;

-	   box.y1 -= extra;

-	   box.y2 += extra;

-        }

-

-	TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-	      (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-    

-    (*pGC->ops->Polylines)(pDraw, pGC, mode, nptInit, pptInit);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-       (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-static void 

-ShadowPolySegment(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		nsegInit,

-    xSegment	*pSegInit 

-){

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-   

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && nsegInit) {

-	int extra = pGC->lineWidth;

-        xSegment *pSeg = pSegInit;

-        int nseg = nsegInit;

-

-        if(pGC->capStyle != CapProjecting)	

-	   extra >>= 1;

-

-	if(pSeg->x2 > pSeg->x1) {

-	    box.x1 = pSeg->x1;

-	    box.x2 = pSeg->x2;

-	} else {

-	    box.x2 = pSeg->x1;

-	    box.x1 = pSeg->x2;

-	}

-

-	if(pSeg->y2 > pSeg->y1) {

-	    box.y1 = pSeg->y1;

-	    box.y2 = pSeg->y2;

-	} else {

-	    box.y2 = pSeg->y1;

-	    box.y1 = pSeg->y2;

-	}

-

-	while(--nseg) {

-	    pSeg++;

-	    if(pSeg->x2 > pSeg->x1) {

-		if(pSeg->x1 < box.x1) box.x1 = pSeg->x1;

-		if(pSeg->x2 > box.x2) box.x2 = pSeg->x2;

-	    } else {

-		if(pSeg->x2 < box.x1) box.x1 = pSeg->x2;

-		if(pSeg->x1 > box.x2) box.x2 = pSeg->x1;

-	    }

-	    if(pSeg->y2 > pSeg->y1) {

-		if(pSeg->y1 < box.y1) box.y1 = pSeg->y1;

-		if(pSeg->y2 > box.y2) box.y2 = pSeg->y2;

-	    } else {

-		if(pSeg->y2 < box.y1) box.y1 = pSeg->y2;

-		if(pSeg->y1 > box.y2) box.y2 = pSeg->y1;

-	    }

-	}

-

-	box.x2++;

-	box.y2++;

-

-	if(extra) {

-	   box.x1 -= extra;

-	   box.x2 += extra;

-	   box.y1 -= extra;

-	   box.y2 += extra;

-        }

-

-	TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-              (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-    

-    (*pGC->ops->PolySegment)(pDraw, pGC, nsegInit, pSegInit);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-       (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-ShadowPolyRectangle(

-    DrawablePtr  pDraw,

-    GCPtr        pGC,

-    int	         nRectsInit,

-    xRectangle  *pRectsInit 

-){

-    BoxRec box;

-    BoxPtr pBoxInit = NULL;

-    Bool boxNotEmpty = FALSE;

-    int num = 0;

-    

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && nRectsInit) {

-        xRectangle *pRects = pRectsInit;

-        int nRects = nRectsInit;

-

-	if(nRects >= 32) {

-	    int extra = pGC->lineWidth >> 1;

-

-	    box.x1 = pRects->x;

-	    box.x2 = box.x1 + pRects->width;

-	    box.y1 = pRects->y;

-	    box.y2 = box.y1 + pRects->height;

-

-	    while(--nRects) {

-		pRects++;

-		if(box.x1 > pRects->x) box.x1 = pRects->x;

-		if(box.x2 < (pRects->x + pRects->width))

-			box.x2 = pRects->x + pRects->width;

-		if(box.y1 > pRects->y) box.y1 = pRects->y;

-		if(box.y2 < (pRects->y + pRects->height))

-			box.y2 = pRects->y + pRects->height;

-	    }

-

-	    if(extra) {

-		box.x1 -= extra;

-		box.x2 += extra;

-		box.y1 -= extra;

-		box.y2 += extra;

-	    }

-

-	    box.x2++;

-	    box.y2++;

-

-	    TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);

-	    if(BOX_NOT_EMPTY(box)) {

-                if(pPriv->preRefresh)

-                   (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-                boxNotEmpty = TRUE;

-            }

-	} else {

-	    BoxPtr pbox;

-	    int offset1, offset2, offset3;

-

-	    offset2 = pGC->lineWidth;

-	    if(!offset2) offset2 = 1;

-	    offset1 = offset2 >> 1;

-	    offset3 = offset2 - offset1;

-

-	    pBoxInit = (BoxPtr)malloc(nRects * 4 * sizeof(BoxRec));

-	    pbox = pBoxInit;

-

-	    while(nRects--) {

-		pbox->x1 = pRects->x - offset1;

-		pbox->y1 = pRects->y - offset1;

-		pbox->x2 = pbox->x1 + pRects->width + offset2;

-		pbox->y2 = pbox->y1 + offset2;		

-		TRIM_AND_TRANSLATE_BOX((*pbox), pDraw, pGC);

-		if(BOX_NOT_EMPTY((*pbox))) {

-		   num++;

-		   pbox++;

-		}

-

-		pbox->x1 = pRects->x - offset1;

-		pbox->y1 = pRects->y + offset3;

-		pbox->x2 = pbox->x1 + offset2;

-		pbox->y2 = pbox->y1 + pRects->height - offset2;		

-		TRIM_AND_TRANSLATE_BOX((*pbox), pDraw, pGC);

-		if(BOX_NOT_EMPTY((*pbox))) {

-		   num++;

-		   pbox++;

-		}

-

-		pbox->x1 = pRects->x + pRects->width - offset1;

-		pbox->y1 = pRects->y + offset3;

-		pbox->x2 = pbox->x1 + offset2;

-		pbox->y2 = pbox->y1 + pRects->height - offset2;		

-		TRIM_AND_TRANSLATE_BOX((*pbox), pDraw, pGC);

-		if(BOX_NOT_EMPTY((*pbox))) {

-		   num++;

-		   pbox++;

-		}

-

-		pbox->x1 = pRects->x - offset1;

-		pbox->y1 = pRects->y + pRects->height - offset1;

-		pbox->x2 = pbox->x1 + pRects->width + offset2;

-		pbox->y2 = pbox->y1 + offset2;		

-		TRIM_AND_TRANSLATE_BOX((*pbox), pDraw, pGC);

-		if(BOX_NOT_EMPTY((*pbox))) {

-		   num++;

-		   pbox++;

-		}

-

-		pRects++;

-	    }

-	    

-	    if(num) {

-                if(pPriv->preRefresh)

-                    (*pPriv->preRefresh)(pPriv->pScrn, num, pBoxInit);

-            } else {

-                free(pBoxInit);

-            }                

-	}

-    }

-

-    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRectsInit, pRectsInit);

-

-    if(boxNotEmpty && pPriv->postRefresh) {

-       (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-    } else if(num) {

-       if(pPriv->postRefresh)

-          (*pPriv->postRefresh)(pPriv->pScrn, num, pBoxInit);

-       free(pBoxInit);

-    }

-    

-    SHADOW_GC_OP_EPILOGUE(pGC);

-

-}

-

-static void

-ShadowPolyArc(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		narcsInit,

-    xArc	*parcsInit 

-){

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-   

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && narcsInit) {

-        int narcs = narcsInit;

-        xArc *parcs = parcsInit;

-        int extra = pGC->lineWidth >> 1;

-

-	box.x1 = parcs->x;

-	box.x2 = box.x1 + parcs->width;

-	box.y1 = parcs->y;

-	box.y2 = box.y1 + parcs->height;

-

-	/* should I break these up instead ? */

-

-	while(--narcs) {

-	   parcs++;

-	   if(box.x1 > parcs->x) box.x1 = parcs->x;

-	   if(box.x2 < (parcs->x + parcs->width))

-		box.x2 = parcs->x + parcs->width;

-	   if(box.y1 > parcs->y) box.y1 = parcs->y;

-	   if(box.y2 < (parcs->y + parcs->height))

-		box.y2 = parcs->y + parcs->height;

-        }

-

-	if(extra) {

-	   box.x1 -= extra;

-	   box.x2 += extra;

-	   box.y1 -= extra;

-	   box.y2 += extra;

-        }

-

-	box.x2++;

-	box.y2++;

-

-	TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-              (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-    

-    (*pGC->ops->PolyArc)(pDraw, pGC, narcsInit, parcsInit);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-       (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-    

-    SHADOW_GC_OP_EPILOGUE(pGC);

-

-}

-

-static void

-ShadowFillPolygon(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		shape,

-    int		mode,

-    int		count,

-    DDXPointPtr	pptInit 

-){

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && (count > 2)) {

-	DDXPointPtr ppt = pptInit;

-	int i = count;

-	BoxRec box;

-        Bool boxNotEmpty = FALSE;

-

-	box.x2 = box.x1 = ppt->x;

-	box.y2 = box.y1 = ppt->y;

-

-	if(mode != CoordModeOrigin) {

-	   int x = box.x1;

-	   int y = box.y1;

-	   while(--i) {

-		ppt++;

-		x += ppt->x;

-		y += ppt->y;

-		if(box.x1 > x) box.x1 = x;

-		else if(box.x2 < x) box.x2 = x;

-		if(box.y1 > y) box.y1 = y;

-		else if(box.y2 < y) box.y2 = y;

-	    }

-	} else {

-	   while(--i) {

-		ppt++;

-		if(box.x1 > ppt->x) box.x1 = ppt->x;

-		else if(box.x2 < ppt->x) box.x2 = ppt->x;

-		if(box.y1 > ppt->y) box.y1 = ppt->y;

-		else if(box.y2 < ppt->y) box.y2 = ppt->y;

-	    }

-	}

-

-	box.x2++;

-	box.y2++;

-

-	TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-              (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-

-	(*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, pptInit);

-

-        if(boxNotEmpty && pPriv->postRefresh)

-           (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);        

-    } else

-	(*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, pptInit);

-

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-

-static void 

-ShadowPolyFillRect(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		nRectsInit, 

-    xRectangle	*pRectsInit 

-){

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && nRectsInit) {

-	BoxRec box;

-        Bool boxNotEmpty = FALSE;

-	xRectangle *pRects = pRectsInit;

-	int nRects = nRectsInit;

-

-	box.x1 = pRects->x;

-	box.x2 = box.x1 + pRects->width;

-	box.y1 = pRects->y;

-	box.y2 = box.y1 + pRects->height;

-

-	while(--nRects) {

-	    pRects++;

-	    if(box.x1 > pRects->x) box.x1 = pRects->x;

-	    if(box.x2 < (pRects->x + pRects->width))

-		box.x2 = pRects->x + pRects->width;

-	    if(box.y1 > pRects->y) box.y1 = pRects->y;

-	    if(box.y2 < (pRects->y + pRects->height))

-		box.y2 = pRects->y + pRects->height;

-	}

-

-	/* cfb messes with the pRectsInit so we have to do our

-	   calculations first */

-

-	TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-            if(pPriv->preRefresh)

-                (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-            boxNotEmpty = TRUE;

-        }

-

-	(*pGC->ops->PolyFillRect)(pDraw, pGC, nRectsInit, pRectsInit);

-

-        if(boxNotEmpty && pPriv->postRefresh)

-            (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-    } else

-	(*pGC->ops->PolyFillRect)(pDraw, pGC, nRectsInit, pRectsInit);

-

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-

-static void

-ShadowPolyFillArc(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		narcsInit,

-    xArc	*parcsInit 

-){

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-   

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && narcsInit) {

-        xArc *parcs = parcsInit;

-        int narcs = narcsInit;

-

-	box.x1 = parcs->x;

-	box.x2 = box.x1 + parcs->width;

-	box.y1 = parcs->y;

-	box.y2 = box.y1 + parcs->height;

-

-	/* should I break these up instead ? */

-

-	while(--narcs) {

-	   parcs++;

-	   if(box.x1 > parcs->x) box.x1 = parcs->x;

-	   if(box.x2 < (parcs->x + parcs->width))

-		box.x2 = parcs->x + parcs->width;

-	   if(box.y1 > parcs->y) box.y1 = parcs->y;

-	   if(box.y2 < (parcs->y + parcs->height))

-		box.y2 = parcs->y + parcs->height;

-        }

-

-	TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-              (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-

-    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcsInit, parcsInit);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-       (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);       

-    

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-ShadowTextExtent(FontPtr pFont, int count, char* chars,

-                 FontEncoding fontEncoding, BoxPtr box)

-{

-    unsigned long n, i;

-    int w;

-    CharInfoPtr charinfo[255];	/* encoding only has 1 byte for count */

-

-    GetGlyphs(pFont, (unsigned long)count, (unsigned char *)chars,

-	      fontEncoding, &n, charinfo);

-    w = 0;

-    for (i=0; i < n; i++) {

-        w += charinfo[i]->metrics.characterWidth;

-    }

-    if (i) {

-    	w += charinfo[i - 1]->metrics.rightSideBearing;

-    }

-    

-    box->x1 = 0;

-    if (n) {

-	if (charinfo[0]->metrics.leftSideBearing < 0) {

-            box->x1 = charinfo[0]->metrics.leftSideBearing;

-        }

-    }

-    box->x2 = w;

-    box->y1 = -FONTMAXBOUNDS(pFont,ascent);

-    box->y2 = FONTMAXBOUNDS(pFont,descent);

-}

-

-

-

-static void

-ShadowFontToBox(BoxPtr BB, DrawablePtr pDrawable, GCPtr pGC, int x, int y,

-                int count, char *chars, int wide)

-{

-    FontPtr pFont;

-

-    pFont = pGC->font;

-    if (pFont->info.constantWidth) {

-        int ascent, descent, left, right = 0;

-

-	ascent = max(pFont->info.fontAscent, pFont->info.maxbounds.ascent);

-	descent = max(pFont->info.fontDescent, pFont->info.maxbounds.descent);

-	left = pFont->info.maxbounds.leftSideBearing;

-	if (count > 0) {

-	    right = (count - 1) * pFont->info.maxbounds.characterWidth;

-	}

-	right += pFont->info.maxbounds.rightSideBearing;

-	BB->x1 =

-	    max(pDrawable->x + x - left,

-		RegionExtents(&((WindowPtr) pDrawable)->winSize)->x1);

-	BB->y1 =

-	    max(pDrawable->y + y - ascent,

-		RegionExtents(&((WindowPtr) pDrawable)->winSize)->y1);

-	BB->x2 =

-	    min(pDrawable->x + x + right,

-		RegionExtents(&((WindowPtr) pDrawable)->winSize)->x2);

-	BB->y2 =

-	    min(pDrawable->y + y + descent,

-		RegionExtents(&((WindowPtr) pDrawable)->winSize)->y2);

-    } else {

-    	ShadowTextExtent(pFont, count, chars, wide ? (FONTLASTROW(pFont) == 0)

-                         ? Linear16Bit : TwoD16Bit : Linear8Bit, BB);

-	BB->x1 =

-	    max(pDrawable->x + x + BB->x1,

-		RegionExtents(&((WindowPtr) pDrawable)->winSize)->x1);

-	BB->y1 =

-	    max(pDrawable->y + y + BB->y1,

-		RegionExtents(&((WindowPtr) pDrawable)->winSize)->y1);

-	BB->x2 =

-	    min(pDrawable->x + x + BB->x2,

-		RegionExtents(&((WindowPtr) pDrawable)->winSize)->x2);

-	BB->y2 =

-	    min(pDrawable->y + y + BB->y2,

-		RegionExtents(&((WindowPtr) pDrawable)->winSize)->y2);

-    }

-}

-

-static int

-ShadowPolyText8(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x, 

-    int 	y,

-    int 	count,

-    char	*chars 

-){

-    int width;

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-    

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw)) {

-        ShadowFontToBox(&box, pDraw, pGC, x, y, count, chars, 0);

-       

-        TRIM_BOX(box, pGC);

-        if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-              (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-    

-    width = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-       (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-    

-    SHADOW_GC_OP_EPILOGUE(pGC);

-

-    return width;

-}

-

-static int

-ShadowPolyText16(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x,

-    int		y,

-    int 	count,

-    unsigned short *chars 

-){

-    int width;

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw)) {

-        ShadowFontToBox(&box, pDraw, pGC, x, y, count, (char*)chars, 1);

-       

-        TRIM_BOX(box, pGC);

-        if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-              (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-

-    width = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-       (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-

-    SHADOW_GC_OP_EPILOGUE(pGC);

-

-    return width;

-}

-

-static void

-ShadowImageText8(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x, 

-    int		y,

-    int 	count,

-    char	*chars 

-){

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && count) {

-	int top, bot, Min, Max;

-

-	top = max(FONTMAXBOUNDS(pGC->font, ascent), FONTASCENT(pGC->font));

-	bot = max(FONTMAXBOUNDS(pGC->font, descent), FONTDESCENT(pGC->font));

-

-	Min = count * FONTMINBOUNDS(pGC->font, characterWidth);

-	if(Min > 0) Min = 0;

-	Max = count * FONTMAXBOUNDS(pGC->font, characterWidth);	

-	if(Max < 0) Max = 0;

-

-	/* ugh */

-	box.x1 = pDraw->x + x + Min +

-		FONTMINBOUNDS(pGC->font, leftSideBearing);

-	box.x2 = pDraw->x + x + Max + 

-		FONTMAXBOUNDS(pGC->font, rightSideBearing);

-

-	box.y1 = pDraw->y + y - top;

-	box.y2 = pDraw->y + y + bot;

-

-	TRIM_BOX(box, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-            if(pPriv->preRefresh) 

-               (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-            boxNotEmpty = TRUE;

-        }

-    }

-    

-    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-        (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-    

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-static void

-ShadowImageText16(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x,

-    int		y,

-    int 	count,

-    unsigned short *chars 

-){

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && count) {

-	int top, bot, Min, Max;

-

-	top = max(FONTMAXBOUNDS(pGC->font, ascent), FONTASCENT(pGC->font));

-	bot = max(FONTMAXBOUNDS(pGC->font, descent), FONTDESCENT(pGC->font));

-

-	Min = count * FONTMINBOUNDS(pGC->font, characterWidth);

-	if(Min > 0) Min = 0;

-	Max = count * FONTMAXBOUNDS(pGC->font, characterWidth);	

-	if(Max < 0) Max = 0;

-

-	/* ugh */

-	box.x1 = pDraw->x + x + Min +

-		FONTMINBOUNDS(pGC->font, leftSideBearing);

-	box.x2 = pDraw->x + x + Max + 

-		FONTMAXBOUNDS(pGC->font, rightSideBearing);

-

-	box.y1 = pDraw->y + y - top;

-	box.y2 = pDraw->y + y + bot;

-

-	TRIM_BOX(box, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-              (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-    

-    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-       (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);   

-    

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-

-static void

-ShadowImageGlyphBlt(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int x, int y,

-    unsigned int nglyphInit,

-    CharInfoPtr *ppciInit,

-    pointer pglyphBase 

-){

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && nglyphInit) {

-        CharInfoPtr *ppci = ppciInit;

-        unsigned int nglyph = nglyphInit;

-	int top, bot, width = 0;

-

-	top = max(FONTMAXBOUNDS(pGC->font, ascent), FONTASCENT(pGC->font));

-	bot = max(FONTMAXBOUNDS(pGC->font, descent), FONTDESCENT(pGC->font));

-

-	box.x1 = ppci[0]->metrics.leftSideBearing;

-	if(box.x1 > 0) box.x1 = 0;

-	box.x2 = ppci[nglyph - 1]->metrics.rightSideBearing - 

-		ppci[nglyph - 1]->metrics.characterWidth;

-	if(box.x2 < 0) box.x2 = 0;

-

-	box.x2 += pDraw->x + x;

-	box.x1 += pDraw->x + x;

-	   

-	while(nglyph--) {

-	    width += (*ppci)->metrics.characterWidth;

-	    ppci++;

-	}

-

-	if(width > 0) 

-	   box.x2 += width;

-	else 

-	   box.x1 += width;

-

-	box.y1 = pDraw->y + y - top;

-	box.y2 = pDraw->y + y + bot;

-

-	TRIM_BOX(box, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-              (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-

-    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, x, y, nglyphInit, 

-					ppciInit, pglyphBase);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-       (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-ShadowPolyGlyphBlt(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int x, int y,

-    unsigned int nglyphInit,

-    CharInfoPtr *ppciInit,

-    pointer pglyphBase 

-){

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw) && nglyphInit) {

-        CharInfoPtr *ppci = ppciInit;

-        unsigned int nglyph = nglyphInit;

-

-	/* ugh */

-	box.x1 = pDraw->x + x + ppci[0]->metrics.leftSideBearing;

-	box.x2 = pDraw->x + x + ppci[nglyph - 1]->metrics.rightSideBearing;

-

-	if(nglyph > 1) {

-	    int width = 0;

-

-	    while(--nglyph) { 

-		width += (*ppci)->metrics.characterWidth;

-		ppci++;

-	    }

-	

-	    if(width > 0) box.x2 += width;

-	    else box.x1 += width;

-	}

-

-	box.y1 = pDraw->y + y - FONTMAXBOUNDS(pGC->font, ascent);

-	box.y2 = pDraw->y + y + FONTMAXBOUNDS(pGC->font, descent);

-

-	TRIM_BOX(box, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-              (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-    

-    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, x, y, nglyphInit, 

-				ppciInit, pglyphBase);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-       (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-ShadowPushPixels(

-    GCPtr	pGC,

-    PixmapPtr	pBitMap,

-    DrawablePtr pDraw,

-    int	dx, int dy, int xOrg, int yOrg 

-){

-    BoxRec box;

-    Bool boxNotEmpty = FALSE;

-    

-    SHADOW_GC_OP_PROLOGUE(pGC);

-

-    if(IS_VISIBLE(pDraw)) {

-	box.x1 = xOrg;

-	box.y1 = yOrg;

-

-        if(!pGC->miTranslate) {

-           box.x1 += pDraw->x;          

-           box.y1 += pDraw->y;          

-        }

-

-	box.x2 = box.x1 + dx;

-	box.y2 = box.y1 + dy;

-

-	TRIM_BOX(box, pGC);

-	if(BOX_NOT_EMPTY(box)) {

-           if(pPriv->preRefresh)

-              (*pPriv->preRefresh)(pPriv->pScrn, 1, &box);

-           boxNotEmpty = TRUE;

-        }

-    }

-

-    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);

-

-    if(boxNotEmpty && pPriv->postRefresh)

-       (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);

-

-    SHADOW_GC_OP_EPILOGUE(pGC);

-}

-

-

-GCOps ShadowGCOps = {

-    ShadowFillSpans, ShadowSetSpans, 

-    ShadowPutImage, ShadowCopyArea, 

-    ShadowCopyPlane, ShadowPolyPoint, 

-    ShadowPolylines, ShadowPolySegment, 

-    ShadowPolyRectangle, ShadowPolyArc, 

-    ShadowFillPolygon, ShadowPolyFillRect, 

-    ShadowPolyFillArc, ShadowPolyText8, 

-    ShadowPolyText16, ShadowImageText8, 

-    ShadowImageText16, ShadowImageGlyphBlt, 

-    ShadowPolyGlyphBlt, ShadowPushPixels,

-};

-

+/*
+   Copyright (C) 1999.  The XFree86 Project Inc.
+
+   Written by Mark Vojkovich (mvojkovi@ucsd.edu)
+
+   Pre-fb-write callbacks and RENDER support - Nolan Leake (nolan@vmware.com)
+*/
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "misc.h"
+#include "pixmapstr.h"
+#include "input.h"
+#include <X11/fonts/font.h>
+#include "mi.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "gcstruct.h"
+#include "dixfontstr.h"
+#include <X11/fonts/fontstruct.h>
+#include "xf86.h"
+#include "xf86str.h"
+#include "shadowfb.h"
+
+#include "picturestr.h"
+
+static Bool ShadowCloseScreen(int i, ScreenPtr pScreen);
+static void ShadowCopyWindow(WindowPtr pWin,
+                             DDXPointRec ptOldOrg, RegionPtr prgn);
+static Bool ShadowCreateGC(GCPtr pGC);
+
+static Bool ShadowEnterVT(int index, int flags);
+static void ShadowLeaveVT(int index, int flags);
+
+static void ShadowComposite(CARD8 op,
+                            PicturePtr pSrc,
+                            PicturePtr pMask,
+                            PicturePtr pDst,
+                            INT16 xSrc,
+                            INT16 ySrc,
+                            INT16 xMask,
+                            INT16 yMask,
+                            INT16 xDst,
+                            INT16 yDst, CARD16 width, CARD16 height);
+
+typedef struct {
+    ScrnInfoPtr pScrn;
+    RefreshAreaFuncPtr preRefresh;
+    RefreshAreaFuncPtr postRefresh;
+    CloseScreenProcPtr CloseScreen;
+    CopyWindowProcPtr CopyWindow;
+    CreateGCProcPtr CreateGC;
+    ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
+    CompositeProcPtr Composite;
+    Bool (*EnterVT) (int, int);
+    void (*LeaveVT) (int, int);
+    Bool vtSema;
+} ShadowScreenRec, *ShadowScreenPtr;
+
+typedef struct {
+    GCOps *ops;
+    GCFuncs *funcs;
+} ShadowGCRec, *ShadowGCPtr;
+
+static DevPrivateKeyRec ShadowScreenKeyRec;
+
+#define ShadowScreenKey (&ShadowScreenKeyRec)
+
+static DevPrivateKeyRec ShadowGCKeyRec;
+
+#define ShadowGCKey (&ShadowGCKeyRec)
+
+#define GET_SCREEN_PRIVATE(pScreen) \
+    (ShadowScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, ShadowScreenKey)
+#define GET_GC_PRIVATE(pGC) \
+    (ShadowGCPtr)dixLookupPrivate(&(pGC)->devPrivates, ShadowGCKey)
+
+#define SHADOW_GC_FUNC_PROLOGUE(pGC)\
+    ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);\
+    (pGC)->funcs = pGCPriv->funcs;\
+    if(pGCPriv->ops)\
+        (pGC)->ops = pGCPriv->ops
+
+#define SHADOW_GC_FUNC_EPILOGUE(pGC)\
+    pGCPriv->funcs = (pGC)->funcs;\
+    (pGC)->funcs = &ShadowGCFuncs;\
+    if(pGCPriv->ops) {\
+        pGCPriv->ops = (pGC)->ops;\
+        (pGC)->ops = &ShadowGCOps;\
+    }
+
+#define SHADOW_GC_OP_PROLOGUE(pGC)\
+    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pGC->pScreen); \
+    ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);\
+    GCFuncs *oldFuncs = pGC->funcs;\
+    pGC->funcs = pGCPriv->funcs;\
+    pGC->ops = pGCPriv->ops
+
+#define SHADOW_GC_OP_EPILOGUE(pGC)\
+    pGCPriv->ops = pGC->ops;\
+    pGC->funcs = oldFuncs;\
+    pGC->ops   = &ShadowGCOps
+
+#define IS_VISIBLE(pWin) (pPriv->vtSema && \
+    (((WindowPtr)pWin)->visibility != VisibilityFullyObscured))
+
+#define TRIM_BOX(box, pGC) { \
+    BoxPtr extents = &pGC->pCompositeClip->extents;\
+    if(box.x1 < extents->x1) box.x1 = extents->x1; \
+    if(box.x2 > extents->x2) box.x2 = extents->x2; \
+    if(box.y1 < extents->y1) box.y1 = extents->y1; \
+    if(box.y2 > extents->y2) box.y2 = extents->y2; \
+    }
+
+#define TRANSLATE_BOX(box, pDraw) { \
+    box.x1 += pDraw->x; \
+    box.x2 += pDraw->x; \
+    box.y1 += pDraw->y; \
+    box.y2 += pDraw->y; \
+    }
+
+#define TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC) { \
+    TRANSLATE_BOX(box, pDraw); \
+    TRIM_BOX(box, pGC); \
+    }
+
+#define BOX_NOT_EMPTY(box) \
+    (((box.x2 - box.x1) > 0) && ((box.y2 - box.y1) > 0))
+
+Bool
+ShadowFBInit2(ScreenPtr pScreen,
+              RefreshAreaFuncPtr preRefreshArea,
+              RefreshAreaFuncPtr postRefreshArea)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    ShadowScreenPtr pPriv;
+    PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
+
+    if (!preRefreshArea && !postRefreshArea)
+        return FALSE;
+
+    if (!dixRegisterPrivateKey(&ShadowScreenKeyRec, PRIVATE_SCREEN, 0))
+        return FALSE;
+
+    if (!dixRegisterPrivateKey
+        (&ShadowGCKeyRec, PRIVATE_GC, sizeof(ShadowGCRec)))
+        return FALSE;
+
+    if (!(pPriv = (ShadowScreenPtr) malloc(sizeof(ShadowScreenRec))))
+        return FALSE;
+
+    dixSetPrivate(&pScreen->devPrivates, ShadowScreenKey, pPriv);
+
+    pPriv->pScrn = pScrn;
+    pPriv->preRefresh = preRefreshArea;
+    pPriv->postRefresh = postRefreshArea;
+    pPriv->vtSema = TRUE;
+
+    pPriv->CloseScreen = pScreen->CloseScreen;
+    pPriv->CopyWindow = pScreen->CopyWindow;
+    pPriv->CreateGC = pScreen->CreateGC;
+    pPriv->ModifyPixmapHeader = pScreen->ModifyPixmapHeader;
+
+    pPriv->EnterVT = pScrn->EnterVT;
+    pPriv->LeaveVT = pScrn->LeaveVT;
+
+    pScreen->CloseScreen = ShadowCloseScreen;
+    pScreen->CopyWindow = ShadowCopyWindow;
+    pScreen->CreateGC = ShadowCreateGC;
+
+    pScrn->EnterVT = ShadowEnterVT;
+    pScrn->LeaveVT = ShadowLeaveVT;
+
+    if (ps) {
+        pPriv->Composite = ps->Composite;
+        ps->Composite = ShadowComposite;
+    }
+
+    return TRUE;
+}
+
+Bool
+ShadowFBInit(ScreenPtr pScreen, RefreshAreaFuncPtr refreshArea)
+{
+    return ShadowFBInit2(pScreen, NULL, refreshArea);
+}
+
+/**********************************************************/
+
+static Bool
+ShadowEnterVT(int index, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[index];
+    Bool ret;
+    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScrn->pScreen);
+
+    pScrn->EnterVT = pPriv->EnterVT;
+    ret = (*pPriv->EnterVT) (index, flags);
+    pPriv->EnterVT = pScrn->EnterVT;
+    pScrn->EnterVT = ShadowEnterVT;
+    if (ret) {
+        pPriv->vtSema = TRUE;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static void
+ShadowLeaveVT(int index, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[index];
+    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(xf86Screens[index]->pScreen);
+
+    pPriv->vtSema = FALSE;
+
+    pScrn->LeaveVT = pPriv->LeaveVT;
+    (*pPriv->LeaveVT) (index, flags);
+    pPriv->LeaveVT = pScrn->LeaveVT;
+    pScrn->LeaveVT = ShadowLeaveVT;
+}
+
+/**********************************************************/
+
+static Bool
+ShadowCloseScreen(int i, ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);
+    PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
+
+    pScreen->CloseScreen = pPriv->CloseScreen;
+    pScreen->CopyWindow = pPriv->CopyWindow;
+    pScreen->CreateGC = pPriv->CreateGC;
+    pScreen->ModifyPixmapHeader = pPriv->ModifyPixmapHeader;
+
+    pScrn->EnterVT = pPriv->EnterVT;
+    pScrn->LeaveVT = pPriv->LeaveVT;
+
+    if (ps) {
+        ps->Composite = pPriv->Composite;
+    }
+
+    free((pointer) pPriv);
+
+    return (*pScreen->CloseScreen) (i, pScreen);
+}
+
+static void
+ShadowCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgn)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);
+    int num = 0;
+    RegionRec rgnDst;
+
+    if (pPriv->vtSema) {
+        RegionNull(&rgnDst);
+        RegionCopy(&rgnDst, prgn);
+
+        RegionTranslate(&rgnDst,
+                        pWin->drawable.x - ptOldOrg.x,
+                        pWin->drawable.y - ptOldOrg.y);
+        RegionIntersect(&rgnDst, &pWin->borderClip, &rgnDst);
+        if ((num = RegionNumRects(&rgnDst))) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, num, RegionRects(&rgnDst));
+        }
+        else {
+            RegionUninit(&rgnDst);
+        }
+    }
+
+    pScreen->CopyWindow = pPriv->CopyWindow;
+    (*pScreen->CopyWindow) (pWin, ptOldOrg, prgn);
+    pScreen->CopyWindow = ShadowCopyWindow;
+
+    if (num) {
+        if (pPriv->postRefresh)
+            (*pPriv->postRefresh) (pPriv->pScrn, num, RegionRects(&rgnDst));
+        RegionUninit(&rgnDst);
+    }
+}
+
+static void
+ShadowComposite(CARD8 op,
+                PicturePtr pSrc,
+                PicturePtr pMask,
+                PicturePtr pDst,
+                INT16 xSrc,
+                INT16 ySrc,
+                INT16 xMask,
+                INT16 yMask,
+                INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
+{
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);
+    PictureScreenPtr ps = GetPictureScreen(pScreen);
+    BoxRec box;
+    BoxPtr extents;
+    Bool boxNotEmpty = FALSE;
+
+    if (pPriv->vtSema && pDst->pDrawable->type == DRAWABLE_WINDOW) {
+
+        box.x1 = pDst->pDrawable->x + xDst;
+        box.y1 = pDst->pDrawable->y + yDst;
+        box.x2 = box.x1 + width;
+        box.y2 = box.y1 + height;
+
+        extents = &pDst->pCompositeClip->extents;
+        if (box.x1 < extents->x1)
+            box.x1 = extents->x1;
+        if (box.x2 > extents->x2)
+            box.x2 = extents->x2;
+        if (box.y1 < extents->y1)
+            box.y1 = extents->y1;
+        if (box.y2 > extents->y2)
+            box.y2 = extents->y2;
+
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    ps->Composite = pPriv->Composite;
+    (*ps->Composite) (op, pSrc, pMask, pDst, xSrc, ySrc,
+                      xMask, yMask, xDst, yDst, width, height);
+    ps->Composite = ShadowComposite;
+
+    if (pPriv->postRefresh && boxNotEmpty) {
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+    }
+}
+
+/**********************************************************/
+
+static void ShadowValidateGC(GCPtr, unsigned long, DrawablePtr);
+static void ShadowChangeGC(GCPtr, unsigned long);
+static void ShadowCopyGC(GCPtr, unsigned long, GCPtr);
+static void ShadowDestroyGC(GCPtr);
+static void ShadowChangeClip(GCPtr, int, pointer, int);
+static void ShadowDestroyClip(GCPtr);
+static void ShadowCopyClip(GCPtr, GCPtr);
+
+GCFuncs ShadowGCFuncs = {
+    ShadowValidateGC, ShadowChangeGC, ShadowCopyGC, ShadowDestroyGC,
+    ShadowChangeClip, ShadowDestroyClip, ShadowCopyClip
+};
+
+extern GCOps ShadowGCOps;
+
+static Bool
+ShadowCreateGC(GCPtr pGC)
+{
+    ScreenPtr pScreen = pGC->pScreen;
+    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);
+    ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);
+    Bool ret;
+
+    pScreen->CreateGC = pPriv->CreateGC;
+    if ((ret = (*pScreen->CreateGC) (pGC))) {
+        pGCPriv->ops = NULL;
+        pGCPriv->funcs = pGC->funcs;
+        pGC->funcs = &ShadowGCFuncs;
+    }
+    pScreen->CreateGC = ShadowCreateGC;
+
+    return ret;
+}
+
+static void
+ShadowValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
+{
+    SHADOW_GC_FUNC_PROLOGUE(pGC);
+    (*pGC->funcs->ValidateGC) (pGC, changes, pDraw);
+    if (pDraw->type == DRAWABLE_WINDOW)
+        pGCPriv->ops = pGC->ops;        /* just so it's not NULL */
+    else
+        pGCPriv->ops = NULL;
+    SHADOW_GC_FUNC_EPILOGUE(pGC);
+}
+
+static void
+ShadowDestroyGC(GCPtr pGC)
+{
+    SHADOW_GC_FUNC_PROLOGUE(pGC);
+    (*pGC->funcs->DestroyGC) (pGC);
+    SHADOW_GC_FUNC_EPILOGUE(pGC);
+}
+
+static void
+ShadowChangeGC(GCPtr pGC, unsigned long mask)
+{
+    SHADOW_GC_FUNC_PROLOGUE(pGC);
+    (*pGC->funcs->ChangeGC) (pGC, mask);
+    SHADOW_GC_FUNC_EPILOGUE(pGC);
+}
+
+static void
+ShadowCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
+{
+    SHADOW_GC_FUNC_PROLOGUE(pGCDst);
+    (*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst);
+    SHADOW_GC_FUNC_EPILOGUE(pGCDst);
+}
+
+static void
+ShadowChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+{
+    SHADOW_GC_FUNC_PROLOGUE(pGC);
+    (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
+    SHADOW_GC_FUNC_EPILOGUE(pGC);
+}
+
+static void
+ShadowCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
+{
+    SHADOW_GC_FUNC_PROLOGUE(pgcDst);
+    (*pgcDst->funcs->CopyClip) (pgcDst, pgcSrc);
+    SHADOW_GC_FUNC_EPILOGUE(pgcDst);
+}
+
+static void
+ShadowDestroyClip(GCPtr pGC)
+{
+    SHADOW_GC_FUNC_PROLOGUE(pGC);
+    (*pGC->funcs->DestroyClip) (pGC);
+    SHADOW_GC_FUNC_EPILOGUE(pGC);
+}
+
+/**********************************************************/
+
+static void
+ShadowFillSpans(DrawablePtr pDraw,
+                GC * pGC,
+                int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)
+{
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && nInit) {
+        DDXPointPtr ppt = pptInit;
+        int *pwidth = pwidthInit;
+        int i = nInit;
+        BoxRec box;
+        Bool boxNotEmpty = FALSE;
+
+        box.x1 = ppt->x;
+        box.x2 = box.x1 + *pwidth;
+        box.y2 = box.y1 = ppt->y;
+
+        while (--i) {
+            ppt++;
+            pwidth++;
+            if (box.x1 > ppt->x)
+                box.x1 = ppt->x;
+            if (box.x2 < (ppt->x + *pwidth))
+                box.x2 = ppt->x + *pwidth;
+            if (box.y1 > ppt->y)
+                box.y1 = ppt->y;
+            else if (box.y2 < ppt->y)
+                box.y2 = ppt->y;
+        }
+
+        box.y2++;
+
+        if (!pGC->miTranslate) {
+            TRANSLATE_BOX(box, pDraw);
+        }
+        TRIM_BOX(box, pGC);
+
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+
+        (*pGC->ops->FillSpans) (pDraw, pGC, nInit, pptInit, pwidthInit,
+                                fSorted);
+
+        if (boxNotEmpty && pPriv->postRefresh)
+            (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+    }
+    else
+        (*pGC->ops->FillSpans) (pDraw, pGC, nInit, pptInit, pwidthInit,
+                                fSorted);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowSetSpans(DrawablePtr pDraw,
+               GCPtr pGC,
+               char *pcharsrc,
+               DDXPointPtr pptInit, int *pwidthInit, int nspans, int fSorted)
+{
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && nspans) {
+        DDXPointPtr ppt = pptInit;
+        int *pwidth = pwidthInit;
+        int i = nspans;
+        BoxRec box;
+        Bool boxNotEmpty = FALSE;
+
+        box.x1 = ppt->x;
+        box.x2 = box.x1 + *pwidth;
+        box.y2 = box.y1 = ppt->y;
+
+        while (--i) {
+            ppt++;
+            pwidth++;
+            if (box.x1 > ppt->x)
+                box.x1 = ppt->x;
+            if (box.x2 < (ppt->x + *pwidth))
+                box.x2 = ppt->x + *pwidth;
+            if (box.y1 > ppt->y)
+                box.y1 = ppt->y;
+            else if (box.y2 < ppt->y)
+                box.y2 = ppt->y;
+        }
+
+        box.y2++;
+
+        if (!pGC->miTranslate) {
+            TRANSLATE_BOX(box, pDraw);
+        }
+        TRIM_BOX(box, pGC);
+
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+
+        (*pGC->ops->SetSpans) (pDraw, pGC, pcharsrc, pptInit,
+                               pwidthInit, nspans, fSorted);
+
+        if (boxNotEmpty && pPriv->postRefresh)
+            (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+    }
+    else
+        (*pGC->ops->SetSpans) (pDraw, pGC, pcharsrc, pptInit,
+                               pwidthInit, nspans, fSorted);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowPutImage(DrawablePtr pDraw,
+               GCPtr pGC,
+               int depth,
+               int x, int y, int w, int h,
+               int leftPad, int format, char *pImage)
+{
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw)) {
+        box.x1 = x + pDraw->x;
+        box.x2 = box.x1 + w;
+        box.y1 = y + pDraw->y;
+        box.y2 = box.y1 + h;
+
+        TRIM_BOX(box, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    (*pGC->ops->PutImage) (pDraw, pGC, depth, x, y, w, h,
+                           leftPad, format, pImage);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+
+}
+
+static RegionPtr
+ShadowCopyArea(DrawablePtr pSrc,
+               DrawablePtr pDst,
+               GC * pGC,
+               int srcx, int srcy, int width, int height, int dstx, int dsty)
+{
+    RegionPtr ret;
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDst)) {
+        box.x1 = dstx + pDst->x;
+        box.x2 = box.x1 + width;
+        box.y1 = dsty + pDst->y;
+        box.y2 = box.y1 + height;
+
+        TRIM_BOX(box, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    ret = (*pGC->ops->CopyArea) (pSrc, pDst,
+                                 pGC, srcx, srcy, width, height, dstx, dsty);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+
+    return ret;
+}
+
+static RegionPtr
+ShadowCopyPlane(DrawablePtr pSrc,
+                DrawablePtr pDst,
+                GCPtr pGC,
+                int srcx, int srcy,
+                int width, int height,
+                int dstx, int dsty, unsigned long bitPlane)
+{
+    RegionPtr ret;
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDst)) {
+        box.x1 = dstx + pDst->x;
+        box.x2 = box.x1 + width;
+        box.y1 = dsty + pDst->y;
+        box.y2 = box.y1 + height;
+
+        TRIM_BOX(box, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    ret = (*pGC->ops->CopyPlane) (pSrc, pDst,
+                                  pGC, srcx, srcy, width, height, dstx, dsty,
+                                  bitPlane);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+
+    return ret;
+}
+
+static void
+ShadowPolyPoint(DrawablePtr pDraw,
+                GCPtr pGC, int mode, int nptInit, xPoint * pptInit)
+{
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && nptInit) {
+        xPoint *ppt = pptInit;
+        int npt = nptInit;
+
+        box.x2 = box.x1 = pptInit->x;
+        box.y2 = box.y1 = pptInit->y;
+
+        /* this could be slow if the points were spread out */
+
+        while (--npt) {
+            ppt++;
+            if (box.x1 > ppt->x)
+                box.x1 = ppt->x;
+            else if (box.x2 < ppt->x)
+                box.x2 = ppt->x;
+            if (box.y1 > ppt->y)
+                box.y1 = ppt->y;
+            else if (box.y2 < ppt->y)
+                box.y2 = ppt->y;
+        }
+
+        box.x2++;
+        box.y2++;
+
+        TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    (*pGC->ops->PolyPoint) (pDraw, pGC, mode, nptInit, pptInit);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowPolylines(DrawablePtr pDraw,
+                GCPtr pGC, int mode, int nptInit, DDXPointPtr pptInit)
+{
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && nptInit) {
+        DDXPointPtr ppt = pptInit;
+        int npt = nptInit;
+        int extra = pGC->lineWidth >> 1;
+
+        box.x2 = box.x1 = pptInit->x;
+        box.y2 = box.y1 = pptInit->y;
+
+        if (npt > 1) {
+            if (pGC->joinStyle == JoinMiter)
+                extra = 6 * pGC->lineWidth;
+            else if (pGC->capStyle == CapProjecting)
+                extra = pGC->lineWidth;
+        }
+
+        if (mode == CoordModePrevious) {
+            int x = box.x1;
+            int y = box.y1;
+
+            while (--npt) {
+                ppt++;
+                x += ppt->x;
+                y += ppt->y;
+                if (box.x1 > x)
+                    box.x1 = x;
+                else if (box.x2 < x)
+                    box.x2 = x;
+                if (box.y1 > y)
+                    box.y1 = y;
+                else if (box.y2 < y)
+                    box.y2 = y;
+            }
+        }
+        else {
+            while (--npt) {
+                ppt++;
+                if (box.x1 > ppt->x)
+                    box.x1 = ppt->x;
+                else if (box.x2 < ppt->x)
+                    box.x2 = ppt->x;
+                if (box.y1 > ppt->y)
+                    box.y1 = ppt->y;
+                else if (box.y2 < ppt->y)
+                    box.y2 = ppt->y;
+            }
+        }
+
+        box.x2++;
+        box.y2++;
+
+        if (extra) {
+            box.x1 -= extra;
+            box.x2 += extra;
+            box.y1 -= extra;
+            box.y2 += extra;
+        }
+
+        TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    (*pGC->ops->Polylines) (pDraw, pGC, mode, nptInit, pptInit);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowPolySegment(DrawablePtr pDraw,
+                  GCPtr pGC, int nsegInit, xSegment * pSegInit)
+{
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && nsegInit) {
+        int extra = pGC->lineWidth;
+        xSegment *pSeg = pSegInit;
+        int nseg = nsegInit;
+
+        if (pGC->capStyle != CapProjecting)
+            extra >>= 1;
+
+        if (pSeg->x2 > pSeg->x1) {
+            box.x1 = pSeg->x1;
+            box.x2 = pSeg->x2;
+        }
+        else {
+            box.x2 = pSeg->x1;
+            box.x1 = pSeg->x2;
+        }
+
+        if (pSeg->y2 > pSeg->y1) {
+            box.y1 = pSeg->y1;
+            box.y2 = pSeg->y2;
+        }
+        else {
+            box.y2 = pSeg->y1;
+            box.y1 = pSeg->y2;
+        }
+
+        while (--nseg) {
+            pSeg++;
+            if (pSeg->x2 > pSeg->x1) {
+                if (pSeg->x1 < box.x1)
+                    box.x1 = pSeg->x1;
+                if (pSeg->x2 > box.x2)
+                    box.x2 = pSeg->x2;
+            }
+            else {
+                if (pSeg->x2 < box.x1)
+                    box.x1 = pSeg->x2;
+                if (pSeg->x1 > box.x2)
+                    box.x2 = pSeg->x1;
+            }
+            if (pSeg->y2 > pSeg->y1) {
+                if (pSeg->y1 < box.y1)
+                    box.y1 = pSeg->y1;
+                if (pSeg->y2 > box.y2)
+                    box.y2 = pSeg->y2;
+            }
+            else {
+                if (pSeg->y2 < box.y1)
+                    box.y1 = pSeg->y2;
+                if (pSeg->y1 > box.y2)
+                    box.y2 = pSeg->y1;
+            }
+        }
+
+        box.x2++;
+        box.y2++;
+
+        if (extra) {
+            box.x1 -= extra;
+            box.x2 += extra;
+            box.y1 -= extra;
+            box.y2 += extra;
+        }
+
+        TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    (*pGC->ops->PolySegment) (pDraw, pGC, nsegInit, pSegInit);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowPolyRectangle(DrawablePtr pDraw,
+                    GCPtr pGC, int nRectsInit, xRectangle *pRectsInit)
+{
+    BoxRec box;
+    BoxPtr pBoxInit = NULL;
+    Bool boxNotEmpty = FALSE;
+    int num = 0;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && nRectsInit) {
+        xRectangle *pRects = pRectsInit;
+        int nRects = nRectsInit;
+
+        if (nRects >= 32) {
+            int extra = pGC->lineWidth >> 1;
+
+            box.x1 = pRects->x;
+            box.x2 = box.x1 + pRects->width;
+            box.y1 = pRects->y;
+            box.y2 = box.y1 + pRects->height;
+
+            while (--nRects) {
+                pRects++;
+                if (box.x1 > pRects->x)
+                    box.x1 = pRects->x;
+                if (box.x2 < (pRects->x + pRects->width))
+                    box.x2 = pRects->x + pRects->width;
+                if (box.y1 > pRects->y)
+                    box.y1 = pRects->y;
+                if (box.y2 < (pRects->y + pRects->height))
+                    box.y2 = pRects->y + pRects->height;
+            }
+
+            if (extra) {
+                box.x1 -= extra;
+                box.x2 += extra;
+                box.y1 -= extra;
+                box.y2 += extra;
+            }
+
+            box.x2++;
+            box.y2++;
+
+            TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);
+            if (BOX_NOT_EMPTY(box)) {
+                if (pPriv->preRefresh)
+                    (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+                boxNotEmpty = TRUE;
+            }
+        }
+        else {
+            BoxPtr pbox;
+            int offset1, offset2, offset3;
+
+            offset2 = pGC->lineWidth;
+            if (!offset2)
+                offset2 = 1;
+            offset1 = offset2 >> 1;
+            offset3 = offset2 - offset1;
+
+            pBoxInit = (BoxPtr) malloc(nRects * 4 * sizeof(BoxRec));
+            pbox = pBoxInit;
+
+            while (nRects--) {
+                pbox->x1 = pRects->x - offset1;
+                pbox->y1 = pRects->y - offset1;
+                pbox->x2 = pbox->x1 + pRects->width + offset2;
+                pbox->y2 = pbox->y1 + offset2;
+                TRIM_AND_TRANSLATE_BOX((*pbox), pDraw, pGC);
+                if (BOX_NOT_EMPTY((*pbox))) {
+                    num++;
+                    pbox++;
+                }
+
+                pbox->x1 = pRects->x - offset1;
+                pbox->y1 = pRects->y + offset3;
+                pbox->x2 = pbox->x1 + offset2;
+                pbox->y2 = pbox->y1 + pRects->height - offset2;
+                TRIM_AND_TRANSLATE_BOX((*pbox), pDraw, pGC);
+                if (BOX_NOT_EMPTY((*pbox))) {
+                    num++;
+                    pbox++;
+                }
+
+                pbox->x1 = pRects->x + pRects->width - offset1;
+                pbox->y1 = pRects->y + offset3;
+                pbox->x2 = pbox->x1 + offset2;
+                pbox->y2 = pbox->y1 + pRects->height - offset2;
+                TRIM_AND_TRANSLATE_BOX((*pbox), pDraw, pGC);
+                if (BOX_NOT_EMPTY((*pbox))) {
+                    num++;
+                    pbox++;
+                }
+
+                pbox->x1 = pRects->x - offset1;
+                pbox->y1 = pRects->y + pRects->height - offset1;
+                pbox->x2 = pbox->x1 + pRects->width + offset2;
+                pbox->y2 = pbox->y1 + offset2;
+                TRIM_AND_TRANSLATE_BOX((*pbox), pDraw, pGC);
+                if (BOX_NOT_EMPTY((*pbox))) {
+                    num++;
+                    pbox++;
+                }
+
+                pRects++;
+            }
+
+            if (num) {
+                if (pPriv->preRefresh)
+                    (*pPriv->preRefresh) (pPriv->pScrn, num, pBoxInit);
+            }
+            else {
+                free(pBoxInit);
+            }
+        }
+    }
+
+    (*pGC->ops->PolyRectangle) (pDraw, pGC, nRectsInit, pRectsInit);
+
+    if (boxNotEmpty && pPriv->postRefresh) {
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+    }
+    else if (num) {
+        if (pPriv->postRefresh)
+            (*pPriv->postRefresh) (pPriv->pScrn, num, pBoxInit);
+        free(pBoxInit);
+    }
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+
+}
+
+static void
+ShadowPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcsInit, xArc * parcsInit)
+{
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && narcsInit) {
+        int narcs = narcsInit;
+        xArc *parcs = parcsInit;
+        int extra = pGC->lineWidth >> 1;
+
+        box.x1 = parcs->x;
+        box.x2 = box.x1 + parcs->width;
+        box.y1 = parcs->y;
+        box.y2 = box.y1 + parcs->height;
+
+        /* should I break these up instead ? */
+
+        while (--narcs) {
+            parcs++;
+            if (box.x1 > parcs->x)
+                box.x1 = parcs->x;
+            if (box.x2 < (parcs->x + parcs->width))
+                box.x2 = parcs->x + parcs->width;
+            if (box.y1 > parcs->y)
+                box.y1 = parcs->y;
+            if (box.y2 < (parcs->y + parcs->height))
+                box.y2 = parcs->y + parcs->height;
+        }
+
+        if (extra) {
+            box.x1 -= extra;
+            box.x2 += extra;
+            box.y1 -= extra;
+            box.y2 += extra;
+        }
+
+        box.x2++;
+        box.y2++;
+
+        TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    (*pGC->ops->PolyArc) (pDraw, pGC, narcsInit, parcsInit);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+
+}
+
+static void
+ShadowFillPolygon(DrawablePtr pDraw,
+                  GCPtr pGC,
+                  int shape, int mode, int count, DDXPointPtr pptInit)
+{
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && (count > 2)) {
+        DDXPointPtr ppt = pptInit;
+        int i = count;
+        BoxRec box;
+        Bool boxNotEmpty = FALSE;
+
+        box.x2 = box.x1 = ppt->x;
+        box.y2 = box.y1 = ppt->y;
+
+        if (mode != CoordModeOrigin) {
+            int x = box.x1;
+            int y = box.y1;
+
+            while (--i) {
+                ppt++;
+                x += ppt->x;
+                y += ppt->y;
+                if (box.x1 > x)
+                    box.x1 = x;
+                else if (box.x2 < x)
+                    box.x2 = x;
+                if (box.y1 > y)
+                    box.y1 = y;
+                else if (box.y2 < y)
+                    box.y2 = y;
+            }
+        }
+        else {
+            while (--i) {
+                ppt++;
+                if (box.x1 > ppt->x)
+                    box.x1 = ppt->x;
+                else if (box.x2 < ppt->x)
+                    box.x2 = ppt->x;
+                if (box.y1 > ppt->y)
+                    box.y1 = ppt->y;
+                else if (box.y2 < ppt->y)
+                    box.y2 = ppt->y;
+            }
+        }
+
+        box.x2++;
+        box.y2++;
+
+        TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+
+        (*pGC->ops->FillPolygon) (pDraw, pGC, shape, mode, count, pptInit);
+
+        if (boxNotEmpty && pPriv->postRefresh)
+            (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+    }
+    else
+        (*pGC->ops->FillPolygon) (pDraw, pGC, shape, mode, count, pptInit);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowPolyFillRect(DrawablePtr pDraw,
+                   GCPtr pGC, int nRectsInit, xRectangle *pRectsInit)
+{
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && nRectsInit) {
+        BoxRec box;
+        Bool boxNotEmpty = FALSE;
+        xRectangle *pRects = pRectsInit;
+        int nRects = nRectsInit;
+
+        box.x1 = pRects->x;
+        box.x2 = box.x1 + pRects->width;
+        box.y1 = pRects->y;
+        box.y2 = box.y1 + pRects->height;
+
+        while (--nRects) {
+            pRects++;
+            if (box.x1 > pRects->x)
+                box.x1 = pRects->x;
+            if (box.x2 < (pRects->x + pRects->width))
+                box.x2 = pRects->x + pRects->width;
+            if (box.y1 > pRects->y)
+                box.y1 = pRects->y;
+            if (box.y2 < (pRects->y + pRects->height))
+                box.y2 = pRects->y + pRects->height;
+        }
+
+        /* cfb messes with the pRectsInit so we have to do our
+           calculations first */
+
+        TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+
+        (*pGC->ops->PolyFillRect) (pDraw, pGC, nRectsInit, pRectsInit);
+
+        if (boxNotEmpty && pPriv->postRefresh)
+            (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+    }
+    else
+        (*pGC->ops->PolyFillRect) (pDraw, pGC, nRectsInit, pRectsInit);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcsInit, xArc * parcsInit)
+{
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && narcsInit) {
+        xArc *parcs = parcsInit;
+        int narcs = narcsInit;
+
+        box.x1 = parcs->x;
+        box.x2 = box.x1 + parcs->width;
+        box.y1 = parcs->y;
+        box.y2 = box.y1 + parcs->height;
+
+        /* should I break these up instead ? */
+
+        while (--narcs) {
+            parcs++;
+            if (box.x1 > parcs->x)
+                box.x1 = parcs->x;
+            if (box.x2 < (parcs->x + parcs->width))
+                box.x2 = parcs->x + parcs->width;
+            if (box.y1 > parcs->y)
+                box.y1 = parcs->y;
+            if (box.y2 < (parcs->y + parcs->height))
+                box.y2 = parcs->y + parcs->height;
+        }
+
+        TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    (*pGC->ops->PolyFillArc) (pDraw, pGC, narcsInit, parcsInit);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowTextExtent(FontPtr pFont, int count, char *chars,
+                 FontEncoding fontEncoding, BoxPtr box)
+{
+    unsigned long n, i;
+    int w;
+    CharInfoPtr charinfo[255];  /* encoding only has 1 byte for count */
+
+    GetGlyphs(pFont, (unsigned long) count, (unsigned char *) chars,
+              fontEncoding, &n, charinfo);
+    w = 0;
+    for (i = 0; i < n; i++) {
+        w += charinfo[i]->metrics.characterWidth;
+    }
+    if (i) {
+        w += charinfo[i - 1]->metrics.rightSideBearing;
+    }
+
+    box->x1 = 0;
+    if (n) {
+        if (charinfo[0]->metrics.leftSideBearing < 0) {
+            box->x1 = charinfo[0]->metrics.leftSideBearing;
+        }
+    }
+    box->x2 = w;
+    box->y1 = -FONTMAXBOUNDS(pFont, ascent);
+    box->y2 = FONTMAXBOUNDS(pFont, descent);
+}
+
+static void
+ShadowFontToBox(BoxPtr BB, DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+                int count, char *chars, int wide)
+{
+    FontPtr pFont;
+
+    pFont = pGC->font;
+    if (pFont->info.constantWidth) {
+        int ascent, descent, left, right = 0;
+
+        ascent = max(pFont->info.fontAscent, pFont->info.maxbounds.ascent);
+        descent = max(pFont->info.fontDescent, pFont->info.maxbounds.descent);
+        left = pFont->info.maxbounds.leftSideBearing;
+        if (count > 0) {
+            right = (count - 1) * pFont->info.maxbounds.characterWidth;
+        }
+        right += pFont->info.maxbounds.rightSideBearing;
+        BB->x1 =
+            max(pDrawable->x + x - left,
+                RegionExtents(&((WindowPtr) pDrawable)->winSize)->x1);
+        BB->y1 =
+            max(pDrawable->y + y - ascent,
+                RegionExtents(&((WindowPtr) pDrawable)->winSize)->y1);
+        BB->x2 =
+            min(pDrawable->x + x + right,
+                RegionExtents(&((WindowPtr) pDrawable)->winSize)->x2);
+        BB->y2 =
+            min(pDrawable->y + y + descent,
+                RegionExtents(&((WindowPtr) pDrawable)->winSize)->y2);
+    }
+    else {
+        ShadowTextExtent(pFont, count, chars, wide ? (FONTLASTROW(pFont) == 0)
+                         ? Linear16Bit : TwoD16Bit : Linear8Bit, BB);
+        BB->x1 =
+            max(pDrawable->x + x + BB->x1,
+                RegionExtents(&((WindowPtr) pDrawable)->winSize)->x1);
+        BB->y1 =
+            max(pDrawable->y + y + BB->y1,
+                RegionExtents(&((WindowPtr) pDrawable)->winSize)->y1);
+        BB->x2 =
+            min(pDrawable->x + x + BB->x2,
+                RegionExtents(&((WindowPtr) pDrawable)->winSize)->x2);
+        BB->y2 =
+            min(pDrawable->y + y + BB->y2,
+                RegionExtents(&((WindowPtr) pDrawable)->winSize)->y2);
+    }
+}
+
+static int
+ShadowPolyText8(DrawablePtr pDraw,
+                GCPtr pGC, int x, int y, int count, char *chars)
+{
+    int width;
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw)) {
+        ShadowFontToBox(&box, pDraw, pGC, x, y, count, chars, 0);
+
+        TRIM_BOX(box, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    width = (*pGC->ops->PolyText8) (pDraw, pGC, x, y, count, chars);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+
+    return width;
+}
+
+static int
+ShadowPolyText16(DrawablePtr pDraw,
+                 GCPtr pGC, int x, int y, int count, unsigned short *chars)
+{
+    int width;
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw)) {
+        ShadowFontToBox(&box, pDraw, pGC, x, y, count, (char *) chars, 1);
+
+        TRIM_BOX(box, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    width = (*pGC->ops->PolyText16) (pDraw, pGC, x, y, count, chars);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+
+    return width;
+}
+
+static void
+ShadowImageText8(DrawablePtr pDraw,
+                 GCPtr pGC, int x, int y, int count, char *chars)
+{
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && count) {
+        int top, bot, Min, Max;
+
+        top = max(FONTMAXBOUNDS(pGC->font, ascent), FONTASCENT(pGC->font));
+        bot = max(FONTMAXBOUNDS(pGC->font, descent), FONTDESCENT(pGC->font));
+
+        Min = count * FONTMINBOUNDS(pGC->font, characterWidth);
+        if (Min > 0)
+            Min = 0;
+        Max = count * FONTMAXBOUNDS(pGC->font, characterWidth);
+        if (Max < 0)
+            Max = 0;
+
+        /* ugh */
+        box.x1 = pDraw->x + x + Min + FONTMINBOUNDS(pGC->font, leftSideBearing);
+        box.x2 = pDraw->x + x + Max +
+            FONTMAXBOUNDS(pGC->font, rightSideBearing);
+
+        box.y1 = pDraw->y + y - top;
+        box.y2 = pDraw->y + y + bot;
+
+        TRIM_BOX(box, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    (*pGC->ops->ImageText8) (pDraw, pGC, x, y, count, chars);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowImageText16(DrawablePtr pDraw,
+                  GCPtr pGC, int x, int y, int count, unsigned short *chars)
+{
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && count) {
+        int top, bot, Min, Max;
+
+        top = max(FONTMAXBOUNDS(pGC->font, ascent), FONTASCENT(pGC->font));
+        bot = max(FONTMAXBOUNDS(pGC->font, descent), FONTDESCENT(pGC->font));
+
+        Min = count * FONTMINBOUNDS(pGC->font, characterWidth);
+        if (Min > 0)
+            Min = 0;
+        Max = count * FONTMAXBOUNDS(pGC->font, characterWidth);
+        if (Max < 0)
+            Max = 0;
+
+        /* ugh */
+        box.x1 = pDraw->x + x + Min + FONTMINBOUNDS(pGC->font, leftSideBearing);
+        box.x2 = pDraw->x + x + Max +
+            FONTMAXBOUNDS(pGC->font, rightSideBearing);
+
+        box.y1 = pDraw->y + y - top;
+        box.y2 = pDraw->y + y + bot;
+
+        TRIM_BOX(box, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    (*pGC->ops->ImageText16) (pDraw, pGC, x, y, count, chars);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowImageGlyphBlt(DrawablePtr pDraw,
+                    GCPtr pGC,
+                    int x, int y,
+                    unsigned int nglyphInit,
+                    CharInfoPtr * ppciInit, pointer pglyphBase)
+{
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && nglyphInit) {
+        CharInfoPtr *ppci = ppciInit;
+        unsigned int nglyph = nglyphInit;
+        int top, bot, width = 0;
+
+        top = max(FONTMAXBOUNDS(pGC->font, ascent), FONTASCENT(pGC->font));
+        bot = max(FONTMAXBOUNDS(pGC->font, descent), FONTDESCENT(pGC->font));
+
+        box.x1 = ppci[0]->metrics.leftSideBearing;
+        if (box.x1 > 0)
+            box.x1 = 0;
+        box.x2 = ppci[nglyph - 1]->metrics.rightSideBearing -
+            ppci[nglyph - 1]->metrics.characterWidth;
+        if (box.x2 < 0)
+            box.x2 = 0;
+
+        box.x2 += pDraw->x + x;
+        box.x1 += pDraw->x + x;
+
+        while (nglyph--) {
+            width += (*ppci)->metrics.characterWidth;
+            ppci++;
+        }
+
+        if (width > 0)
+            box.x2 += width;
+        else
+            box.x1 += width;
+
+        box.y1 = pDraw->y + y - top;
+        box.y2 = pDraw->y + y + bot;
+
+        TRIM_BOX(box, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    (*pGC->ops->ImageGlyphBlt) (pDraw, pGC, x, y, nglyphInit,
+                                ppciInit, pglyphBase);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowPolyGlyphBlt(DrawablePtr pDraw,
+                   GCPtr pGC,
+                   int x, int y,
+                   unsigned int nglyphInit,
+                   CharInfoPtr * ppciInit, pointer pglyphBase)
+{
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw) && nglyphInit) {
+        CharInfoPtr *ppci = ppciInit;
+        unsigned int nglyph = nglyphInit;
+
+        /* ugh */
+        box.x1 = pDraw->x + x + ppci[0]->metrics.leftSideBearing;
+        box.x2 = pDraw->x + x + ppci[nglyph - 1]->metrics.rightSideBearing;
+
+        if (nglyph > 1) {
+            int width = 0;
+
+            while (--nglyph) {
+                width += (*ppci)->metrics.characterWidth;
+                ppci++;
+            }
+
+            if (width > 0)
+                box.x2 += width;
+            else
+                box.x1 += width;
+        }
+
+        box.y1 = pDraw->y + y - FONTMAXBOUNDS(pGC->font, ascent);
+        box.y2 = pDraw->y + y + FONTMAXBOUNDS(pGC->font, descent);
+
+        TRIM_BOX(box, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    (*pGC->ops->PolyGlyphBlt) (pDraw, pGC, x, y, nglyphInit,
+                               ppciInit, pglyphBase);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+ShadowPushPixels(GCPtr pGC,
+                 PixmapPtr pBitMap,
+                 DrawablePtr pDraw, int dx, int dy, int xOrg, int yOrg)
+{
+    BoxRec box;
+    Bool boxNotEmpty = FALSE;
+
+    SHADOW_GC_OP_PROLOGUE(pGC);
+
+    if (IS_VISIBLE(pDraw)) {
+        box.x1 = xOrg;
+        box.y1 = yOrg;
+
+        if (!pGC->miTranslate) {
+            box.x1 += pDraw->x;
+            box.y1 += pDraw->y;
+        }
+
+        box.x2 = box.x1 + dx;
+        box.y2 = box.y1 + dy;
+
+        TRIM_BOX(box, pGC);
+        if (BOX_NOT_EMPTY(box)) {
+            if (pPriv->preRefresh)
+                (*pPriv->preRefresh) (pPriv->pScrn, 1, &box);
+            boxNotEmpty = TRUE;
+        }
+    }
+
+    (*pGC->ops->PushPixels) (pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
+
+    if (boxNotEmpty && pPriv->postRefresh)
+        (*pPriv->postRefresh) (pPriv->pScrn, 1, &box);
+
+    SHADOW_GC_OP_EPILOGUE(pGC);
+}
+
+GCOps ShadowGCOps = {
+    ShadowFillSpans, ShadowSetSpans,
+    ShadowPutImage, ShadowCopyArea,
+    ShadowCopyPlane, ShadowPolyPoint,
+    ShadowPolylines, ShadowPolySegment,
+    ShadowPolyRectangle, ShadowPolyArc,
+    ShadowFillPolygon, ShadowPolyFillRect,
+    ShadowPolyFillArc, ShadowPolyText8,
+    ShadowPolyText16, ShadowImageText8,
+    ShadowImageText16, ShadowImageGlyphBlt,
+    ShadowPolyGlyphBlt, ShadowPushPixels,
+};
diff --git a/xorg-server/hw/xfree86/shadowfb/shadowfb.h b/xorg-server/hw/xfree86/shadowfb/shadowfb.h
index 56e0e86fe..bcf59f9b2 100644
--- a/xorg-server/hw/xfree86/shadowfb/shadowfb.h
+++ b/xorg-server/hw/xfree86/shadowfb/shadowfb.h
@@ -9,7 +9,7 @@
  * the number of dirty rectangles, and a pointer to the first dirty rectangle
  * in the array.
  */
-typedef void (*RefreshAreaFuncPtr)(ScrnInfoPtr, int, BoxPtr);
+typedef void (*RefreshAreaFuncPtr) (ScrnInfoPtr, int, BoxPtr);
 
 /*
  * ShadowFBInit initializes the shadowfb subsystem.  refreshArea is a pointer
@@ -20,10 +20,7 @@ typedef void (*RefreshAreaFuncPtr)(ScrnInfoPtr, int, BoxPtr);
  * Returns FALSE in the event of an error.
  */
 extern _X_EXPORT Bool
-ShadowFBInit (
-    ScreenPtr		pScreen,
-    RefreshAreaFuncPtr  refreshArea
-);
+ ShadowFBInit(ScreenPtr pScreen, RefreshAreaFuncPtr refreshArea);
 
 /*
  * ShadowFBInit2 is a more featureful refinement of the original shadowfb.
@@ -34,10 +31,9 @@ ShadowFBInit (
  * Returns FALSE in the event of an error
  */
 extern _X_EXPORT Bool
-ShadowFBInit2 (
-    ScreenPtr		pScreen,
-    RefreshAreaFuncPtr  preRefreshArea,
-    RefreshAreaFuncPtr  postRefreshArea
-);
 
-#endif /* _SHADOWFB_H */
+ShadowFBInit2(ScreenPtr pScreen,
+              RefreshAreaFuncPtr preRefreshArea,
+              RefreshAreaFuncPtr postRefreshArea);
+
+#endif                          /* _SHADOWFB_H */
diff --git a/xorg-server/hw/xfree86/utils/cvt/cvt.c b/xorg-server/hw/xfree86/utils/cvt/cvt.c
index 0de5ffea4..9483964e0 100644
--- a/xorg-server/hw/xfree86/utils/cvt/cvt.c
+++ b/xorg-server/hw/xfree86/utils/cvt/cvt.c
@@ -30,6 +30,7 @@ void
 FatalError(const char *f, ...)
 {
     va_list args;
+
     va_start(args, f);
     vfprintf(stderr, f, args);
     va_end(args);
@@ -69,22 +70,21 @@ XNFcalloc(unsigned long n)
  */
 static Bool
 CVTCheckStandard(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
-                     Bool Verbose)
+                 Bool Verbose)
 {
-    Bool  IsCVT = TRUE;
+    Bool IsCVT = TRUE;
 
     if ((!(VDisplay % 3) && ((VDisplay * 4 / 3) == HDisplay)) ||
         (!(VDisplay % 9) && ((VDisplay * 16 / 9) == HDisplay)) ||
         (!(VDisplay % 10) && ((VDisplay * 16 / 10) == HDisplay)) ||
         (!(VDisplay % 4) && ((VDisplay * 5 / 4) == HDisplay)) ||
-        (!(VDisplay % 9) && ((VDisplay * 15 / 9) == HDisplay)))
-        ;
+        (!(VDisplay % 9) && ((VDisplay * 15 / 9) == HDisplay)));
     else {
         if (Verbose)
             fprintf(stderr, "Warning: Aspect Ratio is not CVT standard.\n");
         IsCVT = FALSE;
     }
-    
+
     if ((VRefresh != 50.0) && (VRefresh != 60.0) &&
         (VRefresh != 75.0) && (VRefresh != 85.0)) {
         if (Verbose)
@@ -92,11 +92,10 @@ CVTCheckStandard(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
                     "(50, 60, 75 or 85Hz).\n");
         IsCVT = FALSE;
     }
-    
+
     return IsCVT;
 }
 
-
 /*
  * I'm not documenting --interlaced for obvious reasons, even though I did
  * implement it. I also can't deny having looked at gtf here.
@@ -113,20 +112,21 @@ PrintUsage(char *Name)
             "(default: normal blanking).\n");
     fprintf(stderr, "            X : Desired horizontal resolution "
             "(multiple of 8, required).\n");
-    fprintf(stderr, "            Y : Desired vertical resolution (required).\n");
-    fprintf(stderr, "      refresh : Desired refresh rate (default: 60.0Hz).\n");
+    fprintf(stderr,
+            "            Y : Desired vertical resolution (required).\n");
+    fprintf(stderr,
+            "      refresh : Desired refresh rate (default: 60.0Hz).\n");
     fprintf(stderr, "\n");
 
     fprintf(stderr, "Calculates VESA CVT (Coordinated Video Timing) modelines"
-	    " for use with X.\n");
+            " for use with X.\n");
 }
 
-
 /*
  *
  */
 static void
-PrintComment(DisplayModeRec *Mode, Bool CVT, Bool Reduced)
+PrintComment(DisplayModeRec * Mode, Bool CVT, Bool Reduced)
 {
     printf("# %dx%d %.2f Hz ", Mode->HDisplay, Mode->VDisplay, Mode->VRefresh);
 
@@ -154,16 +154,16 @@ PrintComment(DisplayModeRec *Mode, Bool CVT, Bool Reduced)
             printf("-R");
 
         printf(") ");
-    } else
+    }
+    else
         printf("(CVT) ");
 
     printf("hsync: %.2f kHz; ", Mode->HSync);
-    printf("pclk: %.2f MHz", ((float ) Mode->Clock) / 1000.0);
+    printf("pclk: %.2f MHz", ((float) Mode->Clock) / 1000.0);
 
     printf("\n");
 }
 
-
 /*
  * Originally grabbed from xf86Mode.c.
  *
@@ -179,9 +179,9 @@ PrintModeline(DisplayModePtr Mode, int HDisplay, int VDisplay, float VRefresh,
     else
         printf("Modeline \"%dx%d_%.2f\"  ", HDisplay, VDisplay, VRefresh);
 
-    printf("%6.2f  %i %i %i %i  %i %i %i %i", Mode->Clock/1000., Mode->HDisplay,
-           Mode->HSyncStart, Mode->HSyncEnd, Mode->HTotal, Mode->VDisplay,
-           Mode->VSyncStart, Mode->VSyncEnd, Mode->VTotal);
+    printf("%6.2f  %i %i %i %i  %i %i %i %i", Mode->Clock / 1000.,
+           Mode->HDisplay, Mode->HSyncStart, Mode->HSyncEnd, Mode->HTotal,
+           Mode->VDisplay, Mode->VSyncStart, Mode->VSyncEnd, Mode->VTotal);
 
     if (Mode->Flags & V_INTERLACE)
         printf(" interlace");
@@ -197,19 +197,18 @@ PrintModeline(DisplayModePtr Mode, int HDisplay, int VDisplay, float VRefresh,
     printf("\n");
 }
 
-
 /*
  *
  */
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-    DisplayModeRec  *Mode;
-    int  HDisplay = 0, VDisplay = 0;
-    float  VRefresh = 0.0;
-    Bool  Reduced = FALSE, Verbose = FALSE, IsCVT;
-    Bool  Interlaced = FALSE;
-    int  n;
+    DisplayModeRec *Mode;
+    int HDisplay = 0, VDisplay = 0;
+    float VRefresh = 0.0;
+    Bool Reduced = FALSE, Verbose = FALSE, IsCVT;
+    Bool Interlaced = FALSE;
+    int n;
 
     if ((argc < 3) || (argc > 7)) {
         PrintUsage(argv[0]);
@@ -230,27 +229,28 @@ main (int argc, char *argv[])
         else if (!strcmp(argv[n], "-h") || !strcmp(argv[n], "--help")) {
             PrintUsage(argv[0]);
             return 0;
-        } else if (!HDisplay) {
+        }
+        else if (!HDisplay) {
             HDisplay = atoi(argv[n]);
-	    if (!HDisplay) {
-		PrintUsage(argv[0]);
-		return 1;
-	    }
-	}
+            if (!HDisplay) {
+                PrintUsage(argv[0]);
+                return 1;
+            }
+        }
         else if (!VDisplay) {
             VDisplay = atoi(argv[n]);
-	    if (!VDisplay) {
-		PrintUsage(argv[0]);
-		return 1;
-	    }
-	}
+            if (!VDisplay) {
+                PrintUsage(argv[0]);
+                return 1;
+            }
+        }
         else if (!VRefresh) {
             VRefresh = atof(argv[n]);
-	    if (!VRefresh) {
-		PrintUsage(argv[0]);
-		return 1;
-	    }
-	}
+            if (!VRefresh) {
+                PrintUsage(argv[0]);
+                return 1;
+            }
+        }
         else {
             PrintUsage(argv[0]);
             return 1;
@@ -273,13 +273,13 @@ main (int argc, char *argv[])
     }
 
     if (Reduced) {
-	if ((VRefresh / 60.0) != floor(VRefresh / 60.0)) {
-	    fprintf(stderr,
-		    "\nERROR: Multiple of 60Hz refresh rate required for "
-		    " reduced blanking.\n");
-	    PrintUsage(argv[0]);
-	    return 0;
-	}
+        if ((VRefresh / 60.0) != floor(VRefresh / 60.0)) {
+            fprintf(stderr,
+                    "\nERROR: Multiple of 60Hz refresh rate required for "
+                    " reduced blanking.\n");
+            PrintUsage(argv[0]);
+            return 0;
+        }
     }
 
     IsCVT = CVTCheckStandard(HDisplay, VDisplay, VRefresh, Reduced, Verbose);
@@ -288,6 +288,6 @@ main (int argc, char *argv[])
 
     PrintComment(Mode, IsCVT, Reduced);
     PrintModeline(Mode, HDisplay, VDisplay, VRefresh, Reduced);
-    
+
     return 0;
 }
diff --git a/xorg-server/hw/xfree86/utils/gtf/gtf.c b/xorg-server/hw/xfree86/utils/gtf/gtf.c
index 87fcb3f0e..15503bb35 100644
--- a/xorg-server/hw/xfree86/utils/gtf/gtf.c
+++ b/xorg-server/hw/xfree86/utils/gtf/gtf.c
@@ -104,7 +104,7 @@
  */
 
 #ifdef HAVE_XORG_CONFIG_H
-# include <xorg-config.h>
+#include <xorg-config.h>
 #endif
 
 #include <stdio.h>
@@ -128,38 +128,28 @@
 #define C_PRIME           (((C - J) * K/256.0) + J)
 #define M_PRIME           (K/256.0 * M)
 
-
 /* struct definitions */
 
-typedef struct __mode
-{
+typedef struct __mode {
     int hr, hss, hse, hfl;
     int vr, vss, vse, vfl;
     float pclk, h_freq, v_freq;
 } mode;
 
-
-typedef struct __options
-{
+typedef struct __options {
     int x, y;
     int xorgmode, fbmode;
     float v_freq;
 } options;
 
-
-
-
 /* prototypes */
 
 void print_value(int n, const char *name, float val);
-void print_xf86_mode (mode *m);
-void print_fb_mode (mode *m);
-mode *vert_refresh (int h_pixels, int v_lines, float freq,
-                    int interlaced, int margins);
-options *parse_command_line (int argc, char *argv[]);
-
-
-
+void print_xf86_mode(mode * m);
+void print_fb_mode(mode * m);
+mode *vert_refresh(int h_pixels, int v_lines, float freq,
+                   int interlaced, int margins);
+options *parse_command_line(int argc, char *argv[]);
 
 /*
  * print_value() - print the result of the named computation; this is
@@ -168,34 +158,31 @@ options *parse_command_line (int argc, char *argv[]);
 
 int global_verbose = 0;
 
-void print_value(int n, const char *name, float val)
+void
+print_value(int n, const char *name, float val)
 {
     if (global_verbose) {
         printf("%2d: %-27s: %15f\n", n, name, val);
     }
 }
 
-
-
 /* print_xf86_mode() - print the XServer modeline, given mode timings. */
 
-void print_xf86_mode (mode *m)
+void
+print_xf86_mode(mode * m)
 {
-    printf ("\n");
-    printf ("  # %dx%d @ %.2f Hz (GTF) hsync: %.2f kHz; pclk: %.2f MHz\n",
-            m->hr, m->vr, m->v_freq, m->h_freq, m->pclk);
-    
-    printf ("  Modeline \"%dx%d_%.2f\"  %.2f"
-            "  %d %d %d %d"
-            "  %d %d %d %d"
-            "  -HSync +Vsync\n\n",
-            m->hr, m->vr, m->v_freq, m->pclk,
-            m->hr, m->hss, m->hse, m->hfl,
-            m->vr, m->vss, m->vse, m->vfl);
-    
-}
+    printf("\n");
+    printf("  # %dx%d @ %.2f Hz (GTF) hsync: %.2f kHz; pclk: %.2f MHz\n",
+           m->hr, m->vr, m->v_freq, m->h_freq, m->pclk);
 
+    printf("  Modeline \"%dx%d_%.2f\"  %.2f"
+           "  %d %d %d %d"
+           "  %d %d %d %d"
+           "  -HSync +Vsync\n\n",
+           m->hr, m->vr, m->v_freq, m->pclk,
+           m->hr, m->hss, m->hse, m->hfl, m->vr, m->vss, m->vse, m->vfl);
 
+}
 
 /*
  * print_fb_mode() - print a mode description in fbset(8) format;
@@ -243,31 +230,26 @@ void print_xf86_mode (mode *m)
  * to edit the mode description after it's generated.
  */
 
-void print_fb_mode (mode *m)
+void
+print_fb_mode(mode * m)
 {
-    printf ("\n");
-    printf ("mode \"%dx%d %.2fHz 32bit (GTF)\"\n",
-            m->hr, m->vr, m->v_freq);
-    printf ("    # PCLK: %.2f MHz, H: %.2f kHz, V: %.2f Hz\n",
-            m->pclk, m->h_freq, m->v_freq);
-    printf ("    geometry %d %d %d %d 32\n",
-            m->hr, m->vr, m->hr, m->vr);
-    printf ("    timings %d %d %d %d %d %d %d\n",
-            (int) rint(1000000.0/m->pclk),/* pixclock in picoseconds */
-            m->hfl - m->hse,              /* left margin (in pixels) */
-            m->hss - m->hr,               /* right margin (in pixels) */
-            m->vfl - m->vse,              /* upper margin (in pixel lines) */
-            m->vss - m->vr,               /* lower margin (in pixel lines) */
-            m->hse - m->hss,              /* horizontal sync length (pixels) */
-            m->vse - m->vss);             /* vert sync length (pixel lines) */
-    printf ("    hsync low\n");
-    printf ("    vsync high\n");
-    printf ("endmode\n\n");
-    
-}
-
-
+    printf("\n");
+    printf("mode \"%dx%d %.2fHz 32bit (GTF)\"\n", m->hr, m->vr, m->v_freq);
+    printf("    # PCLK: %.2f MHz, H: %.2f kHz, V: %.2f Hz\n",
+           m->pclk, m->h_freq, m->v_freq);
+    printf("    geometry %d %d %d %d 32\n", m->hr, m->vr, m->hr, m->vr);
+    printf("    timings %d %d %d %d %d %d %d\n", (int) rint(1000000.0 / m->pclk),       /* pixclock in picoseconds */
+           m->hfl - m->hse,     /* left margin (in pixels) */
+           m->hss - m->hr,      /* right margin (in pixels) */
+           m->vfl - m->vse,     /* upper margin (in pixel lines) */
+           m->vss - m->vr,      /* lower margin (in pixel lines) */
+           m->hse - m->hss,     /* horizontal sync length (pixels) */
+           m->vse - m->vss);    /* vert sync length (pixel lines) */
+    printf("    hsync low\n");
+    printf("    vsync high\n");
+    printf("endmode\n\n");
 
+}
 
 /*
  * vert_refresh() - as defined by the GTF Timing Standard, compute the
@@ -282,8 +264,8 @@ void print_fb_mode (mode *m)
  * XServer of fbset mode descriptions, from what I can tell).
  */
 
-mode *vert_refresh (int h_pixels, int v_lines, float freq,
-                    int interlaced, int margins)
+mode *
+vert_refresh(int h_pixels, int v_lines, float freq, int interlaced, int margins)
 {
     float h_pixels_rnd;
     float v_lines_rnd;
@@ -312,9 +294,8 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
     float h_front_porch;
     float v_odd_front_porch_lines;
 
-    mode *m = (mode*) malloc (sizeof (mode));
-    
-    
+    mode *m = (mode *) malloc(sizeof(mode));
+
     /*  1. In order to give correct results, the number of horizontal
      *  pixels requested is first processed to ensure that it is divisible
      *  by the character size, by rounding it to the nearest character
@@ -322,12 +303,11 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
      *
      *  [H PIXELS RND] = ((ROUND([H PIXELS]/[CELL GRAN RND],0))*[CELLGRAN RND])
      */
-    
+
     h_pixels_rnd = rint((float) h_pixels / CELL_GRAN) * CELL_GRAN;
-    
+
     print_value(1, "[H PIXELS RND]", h_pixels_rnd);
 
-    
     /*  2. If interlace is requested, the number of vertical lines assumed
      *  by the calculation must be halved, as the computation calculates
      *  the number of vertical lines per field. In either case, the
@@ -338,12 +318,10 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
      */
 
     v_lines_rnd = interlaced ?
-            rint((float) v_lines) / 2.0 :
-            rint((float) v_lines);
-    
+        rint((float) v_lines) / 2.0 : rint((float) v_lines);
+
     print_value(2, "[V LINES RND]", v_lines_rnd);
-    
-    
+
     /*  3. Find the frame rate required:
      *
      *  [V FIELD RATE RQD] = IF([INT RQD?]="y", [I/P FREQ RQD]*2,
@@ -353,7 +331,6 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
     v_field_rate_rqd = interlaced ? (freq * 2.0) : (freq);
 
     print_value(3, "[V FIELD RATE RQD]", v_field_rate_rqd);
-    
 
     /*  4. Find number of lines in Top margin:
      *
@@ -365,7 +342,6 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
     top_margin = margins ? rint(MARGIN_PERCENT / 100.0 * v_lines_rnd) : (0.0);
 
     print_value(4, "[TOP MARGIN (LINES)]", top_margin);
-    
 
     /*  5. Find number of lines in Bottom margin:
      *
@@ -374,11 +350,11 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
      *          0)
      */
 
-    bottom_margin = margins ? rint(MARGIN_PERCENT/100.0 * v_lines_rnd) : (0.0);
+    bottom_margin =
+        margins ? rint(MARGIN_PERCENT / 100.0 * v_lines_rnd) : (0.0);
 
     print_value(5, "[BOT MARGIN (LINES)]", bottom_margin);
 
-    
     /*  6. If interlace is required, then set variable [INTERLACE]=0.5:
      *   
      *  [INTERLACE]=(IF([INT RQD?]="y",0.5,0))
@@ -387,7 +363,6 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
     interlace = interlaced ? 0.5 : 0.0;
 
     print_value(6, "[INTERLACE]", interlace);
-    
 
     /*  7. Estimate the Horizontal period
      *
@@ -396,34 +371,31 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
      *                     [MIN PORCH RND]+[INTERLACE]) * 1000000
      */
 
-    h_period_est = (((1.0/v_field_rate_rqd) - (MIN_VSYNC_PLUS_BP/1000000.0))
-                    / (v_lines_rnd + (2*top_margin) + MIN_PORCH + interlace)
+    h_period_est = (((1.0 / v_field_rate_rqd) - (MIN_VSYNC_PLUS_BP / 1000000.0))
+                    / (v_lines_rnd + (2 * top_margin) + MIN_PORCH + interlace)
                     * 1000000.0);
 
     print_value(7, "[H PERIOD EST]", h_period_est);
-    
 
     /*  8. Find the number of lines in V sync + back porch:
      *
      *  [V SYNC+BP] = ROUND(([MIN VSYNC+BP]/[H PERIOD EST]),0)
      */
 
-    vsync_plus_bp = rint(MIN_VSYNC_PLUS_BP/h_period_est);
+    vsync_plus_bp = rint(MIN_VSYNC_PLUS_BP / h_period_est);
 
     print_value(8, "[V SYNC+BP]", vsync_plus_bp);
-    
-    
+
     /*  9. Find the number of lines in V back porch alone:
      *
      *  [V BACK PORCH] = [V SYNC+BP] - [V SYNC RND]
      *
      *  XXX is "[V SYNC RND]" a typo? should be [V SYNC RQD]?
      */
-    
+
     v_back_porch = vsync_plus_bp - V_SYNC_RQD;
-    
+
     print_value(9, "[V BACK PORCH]", v_back_porch);
-    
 
     /*  10. Find the total number of lines in Vertical field period:
      *
@@ -434,9 +406,8 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
 
     total_v_lines = v_lines_rnd + top_margin + bottom_margin + vsync_plus_bp +
         interlace + MIN_PORCH;
-    
+
     print_value(10, "[TOTAL V LINES]", total_v_lines);
-    
 
     /*  11. Estimate the Vertical field frequency:
      *
@@ -444,9 +415,8 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
      */
 
     v_field_rate_est = 1.0 / h_period_est / total_v_lines * 1000000.0;
-    
+
     print_value(11, "[V FIELD RATE EST]", v_field_rate_est);
-    
 
     /*  12. Find the actual horizontal period:
      *
@@ -454,9 +424,8 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
      */
 
     h_period = h_period_est / (v_field_rate_rqd / v_field_rate_est);
-    
+
     print_value(12, "[H PERIOD]", h_period);
-    
 
     /*  13. Find the actual Vertical field frequency:
      *
@@ -466,7 +435,6 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
     v_field_rate = 1.0 / h_period / total_v_lines * 1000000.0;
 
     print_value(13, "[V FIELD RATE]", v_field_rate);
-    
 
     /*  14. Find the Vertical frame frequency:
      *
@@ -476,7 +444,6 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
     v_frame_rate = interlaced ? v_field_rate / 2.0 : v_field_rate;
 
     print_value(14, "[V FRAME RATE]", v_frame_rate);
-    
 
     /*  15. Find number of pixels in left margin:
      *
@@ -489,9 +456,8 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
     left_margin = margins ?
         rint(h_pixels_rnd * MARGIN_PERCENT / 100.0 / CELL_GRAN) * CELL_GRAN :
         0.0;
-    
+
     print_value(15, "[LEFT MARGIN (PIXELS)]", left_margin);
-    
 
     /*  16. Find number of pixels in right margin:
      *
@@ -500,13 +466,12 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
      *                   [CELL GRAN RND]),0)) * [CELL GRAN RND],
      *          0))
      */
-    
+
     right_margin = margins ?
         rint(h_pixels_rnd * MARGIN_PERCENT / 100.0 / CELL_GRAN) * CELL_GRAN :
         0.0;
-    
+
     print_value(16, "[RIGHT MARGIN (PIXELS)]", right_margin);
-    
 
     /*  17. Find total number of active pixels in image and left and right
      *  margins:
@@ -516,10 +481,9 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
      */
 
     total_active_pixels = h_pixels_rnd + left_margin + right_margin;
-    
+
     print_value(17, "[TOTAL ACTIVE PIXELS]", total_active_pixels);
-    
-    
+
     /*  18. Find the ideal blanking duty cycle from the blanking duty cycle
      *  equation:
      *
@@ -527,9 +491,8 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
      */
 
     ideal_duty_cycle = C_PRIME - (M_PRIME * h_period / 1000.0);
-    
+
     print_value(18, "[IDEAL DUTY CYCLE]", ideal_duty_cycle);
-    
 
     /*  19. Find the number of pixels in the blanking time to the nearest
      *  double character cell:
@@ -545,9 +508,8 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
                    ideal_duty_cycle /
                    (100.0 - ideal_duty_cycle) /
                    (2.0 * CELL_GRAN)) * (2.0 * CELL_GRAN);
-    
+
     print_value(19, "[H BLANK (PIXELS)]", h_blank);
-    
 
     /*  20. Find total number of pixels:
      *
@@ -555,19 +517,17 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
      */
 
     total_pixels = total_active_pixels + h_blank;
-    
+
     print_value(20, "[TOTAL PIXELS]", total_pixels);
-    
 
     /*  21. Find pixel clock frequency:
      *
      *  [PIXEL FREQ] = [TOTAL PIXELS] / [H PERIOD]
      */
-    
+
     pixel_freq = total_pixels / h_period;
-    
+
     print_value(21, "[PIXEL FREQ]", pixel_freq);
-    
 
     /*  22. Find horizontal frequency:
      *
@@ -575,28 +535,24 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
      */
 
     h_freq = 1000.0 / h_period;
-    
-    print_value(22, "[H FREQ]", h_freq);
-    
 
+    print_value(22, "[H FREQ]", h_freq);
 
     /* Stage 1 computations are now complete; I should really pass
        the results to another function and do the Stage 2
        computations, but I only need a few more values so I'll just
        append the computations here for now */
 
-    
-
     /*  17. Find the number of pixels in the horizontal sync period:
      *
      *  [H SYNC (PIXELS)] =(ROUND(([H SYNC%] / 100 * [TOTAL PIXELS] /
      *                             [CELL GRAN RND]),0))*[CELL GRAN RND]
      */
 
-    h_sync = rint(H_SYNC_PERCENT/100.0 * total_pixels / CELL_GRAN) * CELL_GRAN;
+    h_sync =
+        rint(H_SYNC_PERCENT / 100.0 * total_pixels / CELL_GRAN) * CELL_GRAN;
 
     print_value(17, "[H SYNC (PIXELS)]", h_sync);
-    
 
     /*  18. Find the number of pixels in the horizontal front porch period:
      *
@@ -606,136 +562,136 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq,
     h_front_porch = (h_blank / 2.0) - h_sync;
 
     print_value(18, "[H FRONT PORCH (PIXELS)]", h_front_porch);
-    
-    
+
     /*  36. Find the number of lines in the odd front porch period:
      *
      *  [V ODD FRONT PORCH(LINES)]=([MIN PORCH RND]+[INTERLACE])
      */
-    
+
     v_odd_front_porch_lines = MIN_PORCH + interlace;
-    
+
     print_value(36, "[V ODD FRONT PORCH(LINES)]", v_odd_front_porch_lines);
-    
 
     /* finally, pack the results in the mode struct */
-    
-    m->hr  = (int) (h_pixels_rnd);
+
+    m->hr = (int) (h_pixels_rnd);
     m->hss = (int) (h_pixels_rnd + h_front_porch);
     m->hse = (int) (h_pixels_rnd + h_front_porch + h_sync);
     m->hfl = (int) (total_pixels);
 
-    m->vr  = (int) (v_lines_rnd);
+    m->vr = (int) (v_lines_rnd);
     m->vss = (int) (v_lines_rnd + v_odd_front_porch_lines);
     m->vse = (int) (int) (v_lines_rnd + v_odd_front_porch_lines + V_SYNC_RQD);
     m->vfl = (int) (total_v_lines);
 
-    m->pclk   = pixel_freq;
+    m->pclk = pixel_freq;
     m->h_freq = h_freq;
     m->v_freq = freq;
 
     return m;
-    
-}
-
-
 
+}
 
 /*
  * parse_command_line() - parse the command line and return an
  * alloced structure containing the results.  On error print usage
  * and return NULL.
- */ 
+ */
 
-options *parse_command_line (int argc, char *argv[])
+options *
+parse_command_line(int argc, char *argv[])
 {
     int n;
 
-    options *o = (options *) calloc (1, sizeof (options));
+    options *o = (options *) calloc(1, sizeof(options));
 
-    if (argc < 4) goto bad_option;
+    if (argc < 4)
+        goto bad_option;
 
-    o->x = atoi (argv[1]);
-    o->y = atoi (argv[2]);
-    o->v_freq = atof (argv[3]);
+    o->x = atoi(argv[1]);
+    o->y = atoi(argv[2]);
+    o->v_freq = atof(argv[3]);
 
     /* XXX should check for errors in the above */
-    
+
     n = 4;
 
     while (n < argc) {
-        if ((strcmp (argv[n], "-v") == 0) ||
-            (strcmp (argv[n], "--verbose") == 0)) {
+        if ((strcmp(argv[n], "-v") == 0) || (strcmp(argv[n], "--verbose") == 0)) {
             global_verbose = 1;
-        } else if ((strcmp (argv[n], "-f") == 0) ||
-                   (strcmp (argv[n], "--fbmode") == 0)) {
+        }
+        else if ((strcmp(argv[n], "-f") == 0) ||
+                 (strcmp(argv[n], "--fbmode") == 0)) {
             o->fbmode = 1;
-        } else if ((strcmp (argv[n], "-x") == 0) ||
-		   (strcmp (argv[n], "--xorgmode") == 0) ||
-                   (strcmp (argv[n], "--xf86mode") == 0)) {
+        }
+        else if ((strcmp(argv[n], "-x") == 0) ||
+                 (strcmp(argv[n], "--xorgmode") == 0) ||
+                 (strcmp(argv[n], "--xf86mode") == 0)) {
             o->xorgmode = 1;
-        } else {
+        }
+        else {
             goto bad_option;
         }
-        
+
         n++;
     }
 
     /* if neither xorgmode nor fbmode were requested, default to
        xorgmode */
 
-    if (!o->fbmode && !o->xorgmode) o->xorgmode = 1;
-    
+    if (!o->fbmode && !o->xorgmode)
+        o->xorgmode = 1;
+
     return o;
-    
+
  bad_option:
 
-    fprintf (stderr, "\n");
-    fprintf (stderr, "usage: %s x y refresh [-v|--verbose] "
-             "[-f|--fbmode] [-x|--xorgmode]\n", argv[0]);
-
-    fprintf (stderr, "\n");
-    
-    fprintf (stderr, "            x : the desired horizontal "
-             "resolution (required)\n");
-    fprintf (stderr, "            y : the desired vertical "
-             "resolution (required)\n");
-    fprintf (stderr, "      refresh : the desired refresh "
-             "rate (required)\n");
-    fprintf (stderr, " -v|--verbose : enable verbose printouts "
-             "(traces each step of the computation)\n");
-    fprintf (stderr, "  -f|--fbmode : output an fbset(8)-style mode "
-             "description\n");
-    fprintf (stderr, " -x|--xorgmode : output an "__XSERVERNAME__"-style mode "
-             "description (this is the default\n"
-             "                if no mode description is requested)\n");
-    
-    fprintf (stderr, "\n");
-    
-    free (o);
-    return NULL;
+    fprintf(stderr, "\n");
+    fprintf(stderr, "usage: %s x y refresh [-v|--verbose] "
+            "[-f|--fbmode] [-x|--xorgmode]\n", argv[0]);
 
-}
+    fprintf(stderr, "\n");
 
+    fprintf(stderr, "            x : the desired horizontal "
+            "resolution (required)\n");
+    fprintf(stderr, "            y : the desired vertical "
+            "resolution (required)\n");
+    fprintf(stderr, "      refresh : the desired refresh " "rate (required)\n");
+    fprintf(stderr, " -v|--verbose : enable verbose printouts "
+            "(traces each step of the computation)\n");
+    fprintf(stderr, "  -f|--fbmode : output an fbset(8)-style mode "
+            "description\n");
+    fprintf(stderr, " -x|--xorgmode : output an " __XSERVERNAME__ "-style mode "
+            "description (this is the default\n"
+            "                if no mode description is requested)\n");
 
+    fprintf(stderr, "\n");
 
-int main (int argc, char *argv[])
+    free(o);
+    return NULL;
+
+}
+
+int
+main(int argc, char *argv[])
 {
     mode *m;
     options *o;
 
-    o = parse_command_line (argc, argv);
-    if (!o) exit (1);
-    
-    m = vert_refresh (o->x, o->y, o->v_freq, 0, 0);
-    if (!m) exit (1);
+    o = parse_command_line(argc, argv);
+    if (!o)
+        exit(1);
+
+    m = vert_refresh(o->x, o->y, o->v_freq, 0, 0);
+    if (!m)
+        exit(1);
 
     if (o->xorgmode)
         print_xf86_mode(m);
-    
+
     if (o->fbmode)
         print_fb_mode(m);
-    
+
     return 0;
-    
+
 }
diff --git a/xorg-server/hw/xfree86/vbe/vbe.c b/xorg-server/hw/xfree86/vbe/vbe.c
index 6ecca6858..bbb60e3a1 100644
--- a/xorg-server/hw/xfree86/vbe/vbe.c
+++ b/xorg-server/hw/xfree86/vbe/vbe.c
@@ -22,7 +22,7 @@
 #define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x)
 
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
-#define B_O16(x)  (x) 
+#define B_O16(x)  (x)
 #define B_O32(x)  (x)
 #else
 #define B_O16(x)  ((((x) & 0xff) << 8) | (((x) & 0xff) >> 8))
@@ -34,7 +34,7 @@
 #define FARP(p)		(((unsigned)(p & 0xffff0000) >> 12) | (p & 0xffff))
 #define R16(v)		((v) & 0xffff)
 
-static unsigned char * vbeReadEDID(vbeInfoPtr pVbe);
+static unsigned char *vbeReadEDID(vbeInfoPtr pVbe);
 static Bool vbeProbeDDC(vbeInfoPtr pVbe);
 
 static const char vbeVersionString[] = "VBE2";
@@ -56,85 +56,93 @@ VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags)
     vbeInfoPtr vip = NULL;
     int screen;
 
-    if (!pScrn) return NULL;
+    if (!pScrn)
+        return NULL;
     screen = pScrn->scrnIndex;
-    
+
     if (!pInt) {
-	if (!xf86LoadSubModule(pScrn, "int10"))
-	    goto error;
-
-	xf86DrvMsg(screen,X_INFO,"initializing int10\n");
-	pInt = xf86ExtendedInitInt10(entityIndex,Flags);
-	if (!pInt)
-	    goto error;
-	init_int10 = TRUE;
+        if (!xf86LoadSubModule(pScrn, "int10"))
+            goto error;
+
+        xf86DrvMsg(screen, X_INFO, "initializing int10\n");
+        pInt = xf86ExtendedInitInt10(entityIndex, Flags);
+        if (!pInt)
+            goto error;
+        init_int10 = TRUE;
     }
-    
-    page = xf86Int10AllocPages(pInt,1,&RealOff);
-    if (!page) goto error;
-    vbe = (vbeControllerInfoPtr) page;    
-    memcpy(vbe->VbeSignature,vbeVersionString,4);
+
+    page = xf86Int10AllocPages(pInt, 1, &RealOff);
+    if (!page)
+        goto error;
+    vbe = (vbeControllerInfoPtr) page;
+    memcpy(vbe->VbeSignature, vbeVersionString, 4);
 
     pInt->ax = 0x4F00;
     pInt->es = SEG_ADDR(RealOff);
     pInt->di = SEG_OFF(RealOff);
     pInt->num = 0x10;
-    
+
     xf86ExecX86int10(pInt);
 
     if ((pInt->ax & 0xff) != 0x4f) {
-	xf86DrvMsgVerb(screen,X_INFO,3,"VESA BIOS not detected\n");
-	goto error;
+        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA BIOS not detected\n");
+        goto error;
     }
-    
+
     switch (pInt->ax & 0xff00) {
     case 0:
-	xf86DrvMsg(screen,X_INFO,"VESA BIOS detected\n");
-	break;
+        xf86DrvMsg(screen, X_INFO, "VESA BIOS detected\n");
+        break;
     case 0x100:
-	xf86DrvMsg(screen,X_INFO,"VESA BIOS function failed\n");
-	goto error;
+        xf86DrvMsg(screen, X_INFO, "VESA BIOS function failed\n");
+        goto error;
     case 0x200:
-	xf86DrvMsg(screen,X_INFO,"VESA BIOS not supported\n");
-	goto error;
+        xf86DrvMsg(screen, X_INFO, "VESA BIOS not supported\n");
+        goto error;
     case 0x300:
-	xf86DrvMsg(screen,X_INFO,"VESA BIOS not supported in current mode\n");
-	goto error;
+        xf86DrvMsg(screen, X_INFO, "VESA BIOS not supported in current mode\n");
+        goto error;
     default:
-	xf86DrvMsg(screen,X_INFO,"Invalid\n");
-	goto error;
+        xf86DrvMsg(screen, X_INFO, "Invalid\n");
+        goto error;
     }
-    
+
     xf86DrvMsgVerb(screen, X_INFO, 4,
-		"VbeVersion is %d, OemStringPtr is 0x%08lx,\n"
-		"\tOemVendorNamePtr is 0x%08lx, OemProductNamePtr is 0x%08lx,\n"
-		"\tOemProductRevPtr is 0x%08lx\n",
-		vbe->VbeVersion, (unsigned long)vbe->OemStringPtr,
-		(unsigned long)vbe->OemVendorNamePtr,
-		(unsigned long)vbe->OemProductNamePtr,
-		(unsigned long)vbe->OemProductRevPtr);
-
-    xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE Version %i.%i\n",
-		   VERSION(vbe->VbeVersion));
-    xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE Total Mem: %i kB\n",
-		   vbe->TotalMem * 64);
-    xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE OEM: %s\n",
-		   (CARD8*)xf86int10Addr(pInt,L_ADD(vbe->OemStringPtr)));
-    
+                   "VbeVersion is %d, OemStringPtr is 0x%08lx,\n"
+                   "\tOemVendorNamePtr is 0x%08lx, OemProductNamePtr is 0x%08lx,\n"
+                   "\tOemProductRevPtr is 0x%08lx\n",
+                   vbe->VbeVersion, (unsigned long) vbe->OemStringPtr,
+                   (unsigned long) vbe->OemVendorNamePtr,
+                   (unsigned long) vbe->OemProductNamePtr,
+                   (unsigned long) vbe->OemProductRevPtr);
+
+    xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE Version %i.%i\n",
+                   VERSION(vbe->VbeVersion));
+    xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE Total Mem: %i kB\n",
+                   vbe->TotalMem * 64);
+    xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE OEM: %s\n",
+                   (CARD8 *) xf86int10Addr(pInt, L_ADD(vbe->OemStringPtr)));
+
     if (B_O16(vbe->VbeVersion) >= 0x200) {
-	xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE OEM Software Rev: %i.%i\n",
-		    VERSION(vbe->OemSoftwareRev));
-	if (vbe->OemVendorNamePtr)
-	    xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE OEM Vendor: %s\n",
-		    (CARD8*)xf86int10Addr(pInt,L_ADD(vbe->OemVendorNamePtr)));
-	if (vbe->OemProductNamePtr)
-	    xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE OEM Product: %s\n",
-		    (CARD8*)xf86int10Addr(pInt,L_ADD(vbe->OemProductNamePtr)));
-	if (vbe->OemProductRevPtr)
-	    xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE OEM Product Rev: %s\n",
-		    (CARD8*)xf86int10Addr(pInt,L_ADD(vbe->OemProductRevPtr)));
+        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE OEM Software Rev: %i.%i\n",
+                       VERSION(vbe->OemSoftwareRev));
+        if (vbe->OemVendorNamePtr)
+            xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE OEM Vendor: %s\n",
+                           (CARD8 *) xf86int10Addr(pInt,
+                                                   L_ADD(vbe->
+                                                         OemVendorNamePtr)));
+        if (vbe->OemProductNamePtr)
+            xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE OEM Product: %s\n",
+                           (CARD8 *) xf86int10Addr(pInt,
+                                                   L_ADD(vbe->
+                                                         OemProductNamePtr)));
+        if (vbe->OemProductRevPtr)
+            xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE OEM Product Rev: %s\n",
+                           (CARD8 *) xf86int10Addr(pInt,
+                                                   L_ADD(vbe->
+                                                         OemProductRevPtr)));
     }
-    vip = (vbeInfoPtr)xnfalloc(sizeof(vbeInfoRec));
+    vip = (vbeInfoPtr) xnfalloc(sizeof(vbeInfoRec));
     vip->version = B_O16(vbe->VbeVersion);
     vip->pInt10 = pInt;
     vip->ddc = DDC_UNCHECKED;
@@ -147,9 +155,9 @@ VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags)
 
  error:
     if (page)
-	xf86Int10FreePages(pInt, page, 1);
+        xf86Int10FreePages(pInt, page, 1);
     if (init_int10)
-	xf86FreeInt10(pInt);
+        xf86FreeInt10(pInt);
     return NULL;
 }
 
@@ -157,12 +165,12 @@ void
 vbeFree(vbeInfoPtr pVbe)
 {
     if (!pVbe)
-	return;
+        return;
 
-    xf86Int10FreePages(pVbe->pInt10,pVbe->memory,pVbe->num_pages);
+    xf86Int10FreePages(pVbe->pInt10, pVbe->memory, pVbe->num_pages);
     /* If we have initalized int10 we ought to free it, too */
-    if (pVbe->init_int10) 
-	xf86FreeInt10(pVbe->pInt10);
+    if (pVbe->init_int10)
+        xf86FreeInt10(pVbe->pInt10);
     free(pVbe);
     return;
 }
@@ -172,11 +180,11 @@ vbeProbeDDC(vbeInfoPtr pVbe)
 {
     const char *ddc_level;
     int screen = pVbe->pInt10->scrnIndex;
-    
+
     if (pVbe->ddc == DDC_NONE)
-	return FALSE;
+        return FALSE;
     if (pVbe->ddc != DDC_UNCHECKED)
-	return TRUE;
+        return TRUE;
 
     pVbe->pInt10->ax = 0x4F15;
     pVbe->pInt10->bx = 0;
@@ -188,61 +196,62 @@ vbeProbeDDC(vbeInfoPtr pVbe)
     xf86ExecX86int10(pVbe->pInt10);
 
     if ((pVbe->pInt10->ax & 0xff) != 0x4f) {
-        xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC not supported\n");
-	pVbe->ddc = DDC_NONE;
-	return FALSE;
+        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC not supported\n");
+        pVbe->ddc = DDC_NONE;
+        return FALSE;
     }
 
     switch ((pVbe->pInt10->ax >> 8) & 0xff) {
     case 0:
-	xf86DrvMsg(screen,X_INFO,"VESA VBE DDC supported\n");
-	switch (pVbe->pInt10->bx & 0x3) {
-	case 0:
-  	    ddc_level = " none"; 
-	    pVbe->ddc = DDC_NONE;
-	    break;
-	case 1:
-  	    ddc_level = " 1";
-	    pVbe->ddc = DDC_1;
-	    break;
-	case 2:
-  	    ddc_level = " 2"; 
-	    pVbe->ddc = DDC_2;
-	    break;
-	case 3:
-  	    ddc_level = " 1 + 2"; 
-	    pVbe->ddc = DDC_1_2;
-	    break;
-	default:
- 	    ddc_level = "";
-	    pVbe->ddc = DDC_NONE;
-	    break;
-	}
-  	xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC Level%s\n",ddc_level); 
-  	if (pVbe->pInt10->bx & 0x4) {
-    	    xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC Screen blanked" 
-    			"for data transfer\n"); 
-    	    pVbe->ddc_blank = TRUE;
-    	}  else
-    	    pVbe->ddc_blank = FALSE;
-	    
-  	xf86DrvMsgVerb(screen,X_INFO,3,
-		       "VESA VBE DDC transfer in appr. %x sec.\n", 
-		       (pVbe->pInt10->bx >> 8) & 0xff); 
+        xf86DrvMsg(screen, X_INFO, "VESA VBE DDC supported\n");
+        switch (pVbe->pInt10->bx & 0x3) {
+        case 0:
+            ddc_level = " none";
+            pVbe->ddc = DDC_NONE;
+            break;
+        case 1:
+            ddc_level = " 1";
+            pVbe->ddc = DDC_1;
+            break;
+        case 2:
+            ddc_level = " 2";
+            pVbe->ddc = DDC_2;
+            break;
+        case 3:
+            ddc_level = " 1 + 2";
+            pVbe->ddc = DDC_1_2;
+            break;
+        default:
+            ddc_level = "";
+            pVbe->ddc = DDC_NONE;
+            break;
+        }
+        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC Level%s\n", ddc_level);
+        if (pVbe->pInt10->bx & 0x4) {
+            xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC Screen blanked"
+                           "for data transfer\n");
+            pVbe->ddc_blank = TRUE;
+        }
+        else
+            pVbe->ddc_blank = FALSE;
+
+        xf86DrvMsgVerb(screen, X_INFO, 3,
+                       "VESA VBE DDC transfer in appr. %x sec.\n",
+                       (pVbe->pInt10->bx >> 8) & 0xff);
     }
-    
-    return TRUE; 
+
+    return TRUE;
 }
 
 typedef enum {
-  VBEOPT_NOVBE,
+    VBEOPT_NOVBE,
     VBEOPT_NODDC
 } VBEOpts;
 
 static const OptionInfoRec VBEOptions[] = {
-    { VBEOPT_NOVBE,	"NoVBE",	OPTV_BOOLEAN,	{0},	FALSE },
-    { VBEOPT_NODDC,	"NoDDC",	OPTV_BOOLEAN,	{0},	FALSE },
-    { -1,		NULL,		OPTV_NONE,	{0},	FALSE },
+    {VBEOPT_NOVBE, "NoVBE", OPTV_BOOLEAN, {0}, FALSE},
+    {VBEOPT_NODDC, "NoDDC", OPTV_BOOLEAN, {0}, FALSE},
+    {-1, NULL, OPTV_NONE, {0}, FALSE},
 };
 
 static unsigned char *
@@ -256,20 +265,23 @@ vbeReadEDID(vbeInfoPtr pVbe)
     int screen = pVbe->pInt10->scrnIndex;
     OptionInfoPtr options;
 
-    if (!page) return NULL;
+    if (!page)
+        return NULL;
 
     options = xnfalloc(sizeof(VBEOptions));
-    (void)memcpy(options, VBEOptions, sizeof(VBEOptions));
+    (void) memcpy(options, VBEOptions, sizeof(VBEOptions));
     xf86ProcessOptions(screen, xf86Screens[screen]->options, options);
     xf86GetOptValBool(options, VBEOPT_NOVBE, &novbe);
     xf86GetOptValBool(options, VBEOPT_NODDC, &noddc);
     free(options);
-    if (novbe || noddc) return NULL;
-    
-    if (!vbeProbeDDC(pVbe)) goto error;
+    if (novbe || noddc)
+        return NULL;
 
-    memset(page,0,sizeof(vbeInfoPtr));
-    strcpy(page,vbeVersionString);
+    if (!vbeProbeDDC(pVbe))
+        goto error;
+
+    memset(page, 0, sizeof(vbeInfoPtr));
+    strcpy(page, vbeVersionString);
 
     pVbe->pInt10->ax = 0x4F15;
     pVbe->pInt10->bx = 0x01;
@@ -282,24 +294,24 @@ vbeReadEDID(vbeInfoPtr pVbe)
     xf86ExecX86int10(pVbe->pInt10);
 
     if ((pVbe->pInt10->ax & 0xff) != 0x4f) {
-        xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC invalid\n");
-	goto error;
+        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC invalid\n");
+        goto error;
     }
     switch (pVbe->pInt10->ax & 0xff00) {
     case 0x0:
-	xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC read successfully\n");
-  	tmp = (unsigned char *)xnfalloc(128); 
-  	memcpy(tmp,page,128); 
-	break;
+        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC read successfully\n");
+        tmp = (unsigned char *) xnfalloc(128);
+        memcpy(tmp, page, 128);
+        break;
     case 0x100:
-	xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC read failed\n");	
-	break;
+        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC read failed\n");
+        break;
     default:
-	xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC unkown failure %i\n",
-		       pVbe->pInt10->ax & 0xff00);
-	break;
+        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC unkown failure %i\n",
+                       pVbe->pInt10->ax & 0xff00);
+        break;
     }
-    
+
  error:
     return tmp;
 }
@@ -307,26 +319,27 @@ vbeReadEDID(vbeInfoPtr pVbe)
 xf86MonPtr
 vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
 {
-    xf86MonPtr    pMonitor;
-    pointer       pModule;
+    xf86MonPtr pMonitor;
+    pointer pModule;
     unsigned char *DDC_data = NULL;
-    
-    if (!pVbe) return NULL;
+
+    if (!pVbe)
+        return NULL;
     if (pVbe->version < 0x200)
-	return NULL;
+        return NULL;
 
     if (!(pModule = pDDCModule)) {
-	pModule =
-	    xf86LoadSubModule(xf86Screens[pVbe->pInt10->scrnIndex], "ddc");
-	if (!pModule)
-	    return NULL;
+        pModule =
+            xf86LoadSubModule(xf86Screens[pVbe->pInt10->scrnIndex], "ddc");
+        if (!pModule)
+            return NULL;
     }
-        
+
     DDC_data = vbeReadEDID(pVbe);
 
-    if (!DDC_data) 
-	return NULL;
-    
+    if (!DDC_data)
+        return NULL;
+
     pMonitor = xf86InterpretEDID(pVbe->pInt10->scrnIndex, DDC_data);
 
     if (!pDDCModule)
@@ -348,20 +361,20 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
     memset(pVbe->memory, 0, sizeof(VbeInfoBlock));
 
     /*
-    Input:
-	AH    := 4Fh	Super VGA support
-	AL    := 00h	Return Super VGA information
-	ES:DI := Pointer to buffer
-
-    Output:
-	AX    := status
-	(All other registers are preserved)
+       Input:
+       AH    := 4Fh     Super VGA support
+       AL    := 00h     Return Super VGA information
+       ES:DI := Pointer to buffer
+
+       Output:
+       AX    := status
+       (All other registers are preserved)
      */
 
-    ((char*)pVbe->memory)[0] = 'V';
-    ((char*)pVbe->memory)[1] = 'B';
-    ((char*)pVbe->memory)[2] = 'E';
-    ((char*)pVbe->memory)[3] = '2';
+    ((char *) pVbe->memory)[0] = 'V';
+    ((char *) pVbe->memory)[1] = 'B';
+    ((char *) pVbe->memory)[2] = 'E';
+    ((char *) pVbe->memory)[3] = '2';
 
     pVbe->pInt10->num = 0x10;
     pVbe->pInt10->ax = 0x4f00;
@@ -370,102 +383,103 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
     xf86ExecX86int10(pVbe->pInt10);
 
     if (R16(pVbe->pInt10->ax) != 0x4f)
-	return NULL;
+        return NULL;
 
     block = calloc(sizeof(VbeInfoBlock), 1);
-    block->VESASignature[0] = ((char*)pVbe->memory)[0];
-    block->VESASignature[1] = ((char*)pVbe->memory)[1];
-    block->VESASignature[2] = ((char*)pVbe->memory)[2];
-    block->VESASignature[3] = ((char*)pVbe->memory)[3];
+    block->VESASignature[0] = ((char *) pVbe->memory)[0];
+    block->VESASignature[1] = ((char *) pVbe->memory)[1];
+    block->VESASignature[2] = ((char *) pVbe->memory)[2];
+    block->VESASignature[3] = ((char *) pVbe->memory)[3];
 
-    block->VESAVersion = *(CARD16*)(((char*)pVbe->memory) + 4);
-    major = (unsigned)block->VESAVersion >> 8;
+    block->VESAVersion = *(CARD16 *) (((char *) pVbe->memory) + 4);
+    major = (unsigned) block->VESAVersion >> 8;
 
-    pStr = GET_UNALIGNED2((((char*)pVbe->memory) + 6));
+    pStr = GET_UNALIGNED2((((char *) pVbe->memory) + 6));
     str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
     block->OEMStringPtr = strdup(str);
 
-    block->Capabilities[0] = ((char*)pVbe->memory)[10];
-    block->Capabilities[1] = ((char*)pVbe->memory)[11];
-    block->Capabilities[2] = ((char*)pVbe->memory)[12];
-    block->Capabilities[3] = ((char*)pVbe->memory)[13];
+    block->Capabilities[0] = ((char *) pVbe->memory)[10];
+    block->Capabilities[1] = ((char *) pVbe->memory)[11];
+    block->Capabilities[2] = ((char *) pVbe->memory)[12];
+    block->Capabilities[3] = ((char *) pVbe->memory)[13];
 
-    pModes = GET_UNALIGNED2((((char*)pVbe->memory) + 14));
+    pModes = GET_UNALIGNED2((((char *) pVbe->memory) + 14));
     modes = xf86int10Addr(pVbe->pInt10, FARP(pModes));
     i = 0;
     while (modes[i] != 0xffff)
-	i++;
+        i++;
     block->VideoModePtr = malloc(sizeof(CARD16) * (i + 1));
     memcpy(block->VideoModePtr, modes, sizeof(CARD16) * i);
     block->VideoModePtr[i] = 0xffff;
 
-    block->TotalMemory = *(CARD16*)(((char*)pVbe->memory) + 18);
+    block->TotalMemory = *(CARD16 *) (((char *) pVbe->memory) + 18);
 
     if (major < 2)
-	memcpy(&block->OemSoftwareRev, ((char*)pVbe->memory) + 20, 236);
+        memcpy(&block->OemSoftwareRev, ((char *) pVbe->memory) + 20, 236);
     else {
-	block->OemSoftwareRev = *(CARD16*)(((char*)pVbe->memory) + 20);
-	pStr = GET_UNALIGNED2((((char*)pVbe->memory) + 22));
-	str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
-	block->OemVendorNamePtr = strdup(str);
-	pStr = GET_UNALIGNED2((((char*)pVbe->memory) + 26));
-	str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
-	block->OemProductNamePtr = strdup(str);
-	pStr = GET_UNALIGNED2((((char*)pVbe->memory) + 30));
-	str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
-	block->OemProductRevPtr = strdup(str);
-	memcpy(&block->Reserved, ((char*)pVbe->memory) + 34, 222);
-	memcpy(&block->OemData, ((char*)pVbe->memory) + 256, 256);
+        block->OemSoftwareRev = *(CARD16 *) (((char *) pVbe->memory) + 20);
+        pStr = GET_UNALIGNED2((((char *) pVbe->memory) + 22));
+        str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
+        block->OemVendorNamePtr = strdup(str);
+        pStr = GET_UNALIGNED2((((char *) pVbe->memory) + 26));
+        str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
+        block->OemProductNamePtr = strdup(str);
+        pStr = GET_UNALIGNED2((((char *) pVbe->memory) + 30));
+        str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
+        block->OemProductRevPtr = strdup(str);
+        memcpy(&block->Reserved, ((char *) pVbe->memory) + 34, 222);
+        memcpy(&block->OemData, ((char *) pVbe->memory) + 256, 256);
     }
 
     return block;
 }
 
 void
-VBEFreeVBEInfo(VbeInfoBlock *block)
+VBEFreeVBEInfo(VbeInfoBlock * block)
 {
     free(block->OEMStringPtr);
     free(block->VideoModePtr);
-    if (((unsigned)block->VESAVersion >> 8) >= 2) {
-	free(block->OemVendorNamePtr);
-	free(block->OemProductNamePtr);
-	free(block->OemProductRevPtr);
+    if (((unsigned) block->VESAVersion >> 8) >= 2) {
+        free(block->OemVendorNamePtr);
+        free(block->OemProductNamePtr);
+        free(block->OemProductRevPtr);
     }
     free(block);
 }
 
 Bool
-VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *block)
+VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock * block)
 {
     /*
-    Input:
-	AH    := 4Fh	Super VGA support
-	AL    := 02h	Set Super VGA video mode
-	BX    := Video mode
-	    D0-D8  := Mode number
-	    D9-D10 := Reserved (must be 0)
-	    D11    := 0 Use current default refresh rate
-		   := 1 Use user specified CRTC values for refresh rate
-	    D12-13	Reserved for VBE/AF (must be 0)
-	    D14    := 0 Use windowed frame buffer model
-		   := 1 Use linear/flat frame buffer model
-	    D15    := 0 Clear video memory
-		   := 1 Don't clear video memory
-	ES:DI := Pointer to VbeCRTCInfoBlock structure
-
-    Output: AX = Status
-	(All other registers are preserved)
-    */
+       Input:
+       AH    := 4Fh     Super VGA support
+       AL    := 02h     Set Super VGA video mode
+       BX    := Video mode
+       D0-D8  := Mode number
+       D9-D10 := Reserved (must be 0)
+       D11    := 0 Use current default refresh rate
+       := 1 Use user specified CRTC values for refresh rate
+       D12-13   Reserved for VBE/AF (must be 0)
+       D14    := 0 Use windowed frame buffer model
+       := 1 Use linear/flat frame buffer model
+       D15    := 0 Clear video memory
+       := 1 Don't clear video memory
+       ES:DI := Pointer to VbeCRTCInfoBlock structure
+
+       Output: AX = Status
+       (All other registers are preserved)
+     */
     pVbe->pInt10->num = 0x10;
     pVbe->pInt10->ax = 0x4f02;
     pVbe->pInt10->bx = mode;
     if (block) {
-	pVbe->pInt10->bx |= 1 << 11;
-	memcpy(pVbe->memory, block, sizeof(VbeCRTCInfoBlock));
-	pVbe->pInt10->es = SEG_ADDR(pVbe->real_mode_base);
-	pVbe->pInt10->di = SEG_OFF(pVbe->real_mode_base);
-    } else
-	pVbe->pInt10->bx &= ~(1 << 11);
+        pVbe->pInt10->bx |= 1 << 11;
+        memcpy(pVbe->memory, block, sizeof(VbeCRTCInfoBlock));
+        pVbe->pInt10->es = SEG_ADDR(pVbe->real_mode_base);
+        pVbe->pInt10->di = SEG_OFF(pVbe->real_mode_base);
+    }
+    else
+        pVbe->pInt10->bx &= ~(1 << 11);
 
     xf86ExecX86int10(pVbe->pInt10);
 
@@ -476,24 +490,24 @@ Bool
 VBEGetVBEMode(vbeInfoPtr pVbe, int *mode)
 {
     /*
-    Input:
-	AH := 4Fh	Super VGA support
-	AL := 03h	Return current video mode
-
-    Output:
-	AX := Status
-	BX := Current video mode
-	(All other registers are preserved)
-    */
+       Input:
+       AH := 4Fh        Super VGA support
+       AL := 03h        Return current video mode
+
+       Output:
+       AX := Status
+       BX := Current video mode
+       (All other registers are preserved)
+     */
     pVbe->pInt10->num = 0x10;
     pVbe->pInt10->ax = 0x4f03;
 
     xf86ExecX86int10(pVbe->pInt10);
 
     if (R16(pVbe->pInt10->ax) == 0x4f) {
-	*mode = R16(pVbe->pInt10->bx);
+        *mode = R16(pVbe->pInt10->bx);
 
-	return TRUE;
+        return TRUE;
     }
 
     return FALSE;
@@ -507,16 +521,16 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
     memset(pVbe->memory, 0, sizeof(VbeModeInfoBlock));
 
     /*
-    Input:
-	AH    := 4Fh	Super VGA support
-	AL    := 01h	Return Super VGA mode information
-	CX    := 	Super VGA video mode
-			(mode number must be one of those returned by Function 0)
-	ES:DI := Pointer to buffer
-
-    Output:
-	AX    := status
-	(All other registers are preserved)
+       Input:
+       AH    := 4Fh     Super VGA support
+       AL    := 01h     Return Super VGA mode information
+       CX    :=         Super VGA video mode
+       (mode number must be one of those returned by Function 0)
+       ES:DI := Pointer to buffer
+
+       Output:
+       AX    := status
+       (All other registers are preserved)
      */
     pVbe->pInt10->num = 0x10;
     pVbe->pInt10->ax = 0x4f01;
@@ -525,116 +539,116 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
     pVbe->pInt10->di = SEG_OFF(pVbe->real_mode_base);
     xf86ExecX86int10(pVbe->pInt10);
     if (R16(pVbe->pInt10->ax) != 0x4f)
-	return NULL;
+        return NULL;
 
     block = malloc(sizeof(VbeModeInfoBlock));
     if (block)
-	memcpy(block, pVbe->memory, sizeof(*block));
+        memcpy(block, pVbe->memory, sizeof(*block));
 
     return block;
 }
 
 void
-VBEFreeModeInfo(VbeModeInfoBlock *block)
+VBEFreeModeInfo(VbeModeInfoBlock * block)
 {
     free(block);
 }
 
 Bool
-VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function, 
-	       pointer *memory, int *size, int *real_mode_pages)
+VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function,
+               pointer *memory, int *size, int *real_mode_pages)
 {
     /*
-    Input:
-	AH    := 4Fh	Super VGA support
-	AL    := 04h	Save/restore Super VGA video state
-	DL    := 00h	Return save/restore state buffer size
-	CX    := Requested states
-		D0 = Save/restore video hardware state
-		D1 = Save/restore video BIOS data state
-		D2 = Save/restore video DAC state
-		D3 = Save/restore Super VGA state
-
-    Output:
-	AX = Status
-	BX = Number of 64-byte blocks to hold the state buffer
-	(All other registers are preserved)
-
-
-    Input:
-	AH    := 4Fh	Super VGA support
-	AL    := 04h	Save/restore Super VGA video state
-	DL    := 01h	Save Super VGA video state
-	CX    := Requested states (see above)
-	ES:BX := Pointer to buffer
-
-    Output:
-	AX    := Status
-	(All other registers are preserved)
-
-
-    Input:
-	AH    := 4Fh	Super VGA support
-	AL    := 04h	Save/restore Super VGA video state
-	DL    := 02h	Restore Super VGA video state
-	CX    := Requested states (see above)
-	ES:BX := Pointer to buffer
-
-    Output:
-	AX     := Status
-	(All other registers are preserved)
+       Input:
+       AH    := 4Fh     Super VGA support
+       AL    := 04h     Save/restore Super VGA video state
+       DL    := 00h     Return save/restore state buffer size
+       CX    := Requested states
+       D0 = Save/restore video hardware state
+       D1 = Save/restore video BIOS data state
+       D2 = Save/restore video DAC state
+       D3 = Save/restore Super VGA state
+
+       Output:
+       AX = Status
+       BX = Number of 64-byte blocks to hold the state buffer
+       (All other registers are preserved)
+
+       Input:
+       AH    := 4Fh     Super VGA support
+       AL    := 04h     Save/restore Super VGA video state
+       DL    := 01h     Save Super VGA video state
+       CX    := Requested states (see above)
+       ES:BX := Pointer to buffer
+
+       Output:
+       AX    := Status
+       (All other registers are preserved)
+
+       Input:
+       AH    := 4Fh     Super VGA support
+       AL    := 04h     Save/restore Super VGA video state
+       DL    := 02h     Restore Super VGA video state
+       CX    := Requested states (see above)
+       ES:BX := Pointer to buffer
+
+       Output:
+       AX     := Status
+       (All other registers are preserved)
      */
 
     if ((pVbe->version & 0xff00) > 0x100) {
         int screen = pVbe->pInt10->scrnIndex;
-        if (function == MODE_QUERY ||
-	    (function == MODE_SAVE && !*memory)) {
-	    /* Query amount of memory to save state */
-
-	    pVbe->pInt10->num = 0x10;
-	    pVbe->pInt10->ax = 0x4f04;
-	    pVbe->pInt10->dx = 0;
-	    pVbe->pInt10->cx = 0x000f;
-	    xf86ExecX86int10(pVbe->pInt10);
-	    if (R16(pVbe->pInt10->ax) != 0x4f)
-	        return FALSE;
-
-	    if (function == MODE_SAVE) {
-	        int npages = (R16(pVbe->pInt10->bx) * 64) / 4096 + 1;
-		if ((*memory = xf86Int10AllocPages(pVbe->pInt10, npages,
-						   real_mode_pages)) == NULL) {
-		    xf86DrvMsg(screen, X_ERROR,
-			       "Cannot allocate memory to save SVGA state.\n");
-		    return FALSE;
-		}
-	    }
-	    *size = pVbe->pInt10->bx * 64;
-	}
-
-	/* Save/Restore Super VGA state */
-	if (function != MODE_QUERY) {
-	    
-	    if (!*memory) return FALSE;
-	    pVbe->pInt10->num = 0x10;
-	    pVbe->pInt10->ax = 0x4f04;
-	    switch (function) {
-	    case MODE_SAVE:
-	      pVbe->pInt10->dx = 1;
-	      break;
-	    case MODE_RESTORE:
-	      pVbe->pInt10->dx = 2;
-	      break;
-	    case MODE_QUERY:
-	      return FALSE;
-	    }
-	    pVbe->pInt10->cx = 0x000f;
-	    
-	    pVbe->pInt10->es = SEG_ADDR(*real_mode_pages);
-	    pVbe->pInt10->bx = SEG_OFF(*real_mode_pages);
-	    xf86ExecX86int10(pVbe->pInt10);
-	    return (R16(pVbe->pInt10->ax) == 0x4f);
-
-	}
+
+        if (function == MODE_QUERY || (function == MODE_SAVE && !*memory)) {
+            /* Query amount of memory to save state */
+
+            pVbe->pInt10->num = 0x10;
+            pVbe->pInt10->ax = 0x4f04;
+            pVbe->pInt10->dx = 0;
+            pVbe->pInt10->cx = 0x000f;
+            xf86ExecX86int10(pVbe->pInt10);
+            if (R16(pVbe->pInt10->ax) != 0x4f)
+                return FALSE;
+
+            if (function == MODE_SAVE) {
+                int npages = (R16(pVbe->pInt10->bx) * 64) / 4096 + 1;
+
+                if ((*memory = xf86Int10AllocPages(pVbe->pInt10, npages,
+                                                   real_mode_pages)) == NULL) {
+                    xf86DrvMsg(screen, X_ERROR,
+                               "Cannot allocate memory to save SVGA state.\n");
+                    return FALSE;
+                }
+            }
+            *size = pVbe->pInt10->bx * 64;
+        }
+
+        /* Save/Restore Super VGA state */
+        if (function != MODE_QUERY) {
+
+            if (!*memory)
+                return FALSE;
+            pVbe->pInt10->num = 0x10;
+            pVbe->pInt10->ax = 0x4f04;
+            switch (function) {
+            case MODE_SAVE:
+                pVbe->pInt10->dx = 1;
+                break;
+            case MODE_RESTORE:
+                pVbe->pInt10->dx = 2;
+                break;
+            case MODE_QUERY:
+                return FALSE;
+            }
+            pVbe->pInt10->cx = 0x000f;
+
+            pVbe->pInt10->es = SEG_ADDR(*real_mode_pages);
+            pVbe->pInt10->bx = SEG_OFF(*real_mode_pages);
+            xf86ExecX86int10(pVbe->pInt10);
+            return (R16(pVbe->pInt10->ax) == 0x4f);
+
+        }
     }
     return TRUE;
 }
@@ -643,11 +657,11 @@ Bool
 VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window)
 {
     /*
-    Input:
-	AH    := 4Fh	Super VGA support
-	AL    := 05h
+       Input:
+       AH    := 4Fh     Super VGA support
+       AL    := 05h
 
-    Output:
+       Output:
      */
     pVbe->pInt10->num = 0x10;
     pVbe->pInt10->ax = 0x4f05;
@@ -656,54 +670,54 @@ VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window)
     xf86ExecX86int10(pVbe->pInt10);
 
     if (R16(pVbe->pInt10->ax) != 0x4f)
-	return FALSE;
+        return FALSE;
 
     return TRUE;
 }
 
 Bool
 VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command,
-				int width, int *pixels, int *bytes, int *max)
+                               int width, int *pixels, int *bytes, int *max)
 {
     if (command < SCANWID_SET || command > SCANWID_GET_MAX)
-	return FALSE;
+        return FALSE;
 
     /*
-    Input:
-	AX := 4F06h VBE Set/Get Logical Scan Line Length
-	BL := 00h Set Scan Line Length in Pixels
-	   := 01h Get Scan Line Length
-	   := 02h Set Scan Line Length in Bytes
-	   := 03h Get Maximum Scan Line Length
-	CX := If BL=00h Desired Width in Pixels
-	      If BL=02h Desired Width in Bytes
-	      (Ignored for Get Functions)
-
-    Output:
-	AX := VBE Return Status
-	BX := Bytes Per Scan Line
-	CX := Actual Pixels Per Scan Line
-	      (truncated to nearest complete pixel)
-	DX := Maximum Number of Scan Lines
+       Input:
+       AX := 4F06h VBE Set/Get Logical Scan Line Length
+       BL := 00h Set Scan Line Length in Pixels
+       := 01h Get Scan Line Length
+       := 02h Set Scan Line Length in Bytes
+       := 03h Get Maximum Scan Line Length
+       CX := If BL=00h Desired Width in Pixels
+       If BL=02h Desired Width in Bytes
+       (Ignored for Get Functions)
+
+       Output:
+       AX := VBE Return Status
+       BX := Bytes Per Scan Line
+       CX := Actual Pixels Per Scan Line
+       (truncated to nearest complete pixel)
+       DX := Maximum Number of Scan Lines
      */
 
     pVbe->pInt10->num = 0x10;
     pVbe->pInt10->ax = 0x4f06;
     pVbe->pInt10->bx = command;
     if (command == SCANWID_SET || command == SCANWID_SET_BYTES)
-	pVbe->pInt10->cx = width;
+        pVbe->pInt10->cx = width;
     xf86ExecX86int10(pVbe->pInt10);
 
     if (R16(pVbe->pInt10->ax) != 0x4f)
-	return FALSE;
+        return FALSE;
 
     if (command == SCANWID_GET || command == SCANWID_GET_MAX) {
-	if (pixels)
-	    *pixels = R16(pVbe->pInt10->cx);
-	if (bytes)
-	    *bytes = R16(pVbe->pInt10->bx);
-	if (max)
-	    *max = R16(pVbe->pInt10->dx);
+        if (pixels)
+            *pixels = R16(pVbe->pInt10->cx);
+        if (bytes)
+            *bytes = R16(pVbe->pInt10->bx);
+        if (max)
+            *max = R16(pVbe->pInt10->dx);
     }
 
     return TRUE;
@@ -720,7 +734,7 @@ VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y, Bool wait_retrace)
     xf86ExecX86int10(pVbe->pInt10);
 
     if (R16(pVbe->pInt10->ax) != 0x4f)
-	return FALSE;
+        return FALSE;
 
     return TRUE;
 }
@@ -734,7 +748,7 @@ VBEGetDisplayStart(vbeInfoPtr pVbe, int *x, int *y)
     xf86ExecX86int10(pVbe->pInt10);
 
     if (R16(pVbe->pInt10->ax) != 0x4f)
-	return FALSE;
+        return FALSE;
 
     *x = pVbe->pInt10->cx;
     *y = pVbe->pInt10->dx;
@@ -746,82 +760,81 @@ int
 VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits)
 {
     /*
-    Input:
-	AX := 4F08h VBE Set/Get Palette Format
-	BL := 00h Set DAC Palette Format
-	   := 01h Get DAC Palette Format
-	BH := Desired bits of color per primary
-	      (Set DAC Palette Format only)
-
-    Output:
-	AX := VBE Return Status
-	BH := Current number of bits of color per primary
+       Input:
+       AX := 4F08h VBE Set/Get Palette Format
+       BL := 00h Set DAC Palette Format
+       := 01h Get DAC Palette Format
+       BH := Desired bits of color per primary
+       (Set DAC Palette Format only)
+
+       Output:
+       AX := VBE Return Status
+       BH := Current number of bits of color per primary
      */
 
     pVbe->pInt10->num = 0x10;
     pVbe->pInt10->ax = 0x4f08;
     if (!bits)
-	pVbe->pInt10->bx = 0x01;
-    else 
-	pVbe->pInt10->bx = (bits & 0x00ff) << 8;
+        pVbe->pInt10->bx = 0x01;
+    else
+        pVbe->pInt10->bx = (bits & 0x00ff) << 8;
     xf86ExecX86int10(pVbe->pInt10);
 
     if (R16(pVbe->pInt10->ax) != 0x4f)
-	return 0;
+        return 0;
 
     return (bits != 0 ? bits : (pVbe->pInt10->bx >> 8) & 0x00ff);
 }
 
 CARD32 *
 VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num,
-		      CARD32 *data, Bool secondary, Bool wait_retrace)
+                     CARD32 *data, Bool secondary, Bool wait_retrace)
 {
     /*
-    Input:
-    (16-bit)
-	AX    := 4F09h VBE Load/Unload Palette Data
-	BL    := 00h Set Palette Data
-	      := 01h Get Palette Data
-	      := 02h Set Secondary Palette Data
-	      := 03h Get Secondary Palette Data
-	      := 80h Set Palette Data during Vertical Retrace
-	CX    := Number of palette registers to update (to a maximum of 256)
-	DX    := First of the palette registers to update (start)
-	ES:DI := Table of palette values (see below for format)
-
-    Output:
-	AX    := VBE Return Status
-
-
-    Input:
-    (32-bit)
-	BL     := 00h Set Palette Data
-	       := 80h Set Palette Data during Vertical Retrace
-	CX     := Number of palette registers to update (to a maximum of 256)
-	DX     := First of the palette registers to update (start)
-	ES:EDI := Table of palette values (see below for format)
-	DS     := Selector for memory mapped registers
+       Input:
+       (16-bit)
+       AX    := 4F09h VBE Load/Unload Palette Data
+       BL    := 00h Set Palette Data
+       := 01h Get Palette Data
+       := 02h Set Secondary Palette Data
+       := 03h Get Secondary Palette Data
+       := 80h Set Palette Data during Vertical Retrace
+       CX    := Number of palette registers to update (to a maximum of 256)
+       DX    := First of the palette registers to update (start)
+       ES:DI := Table of palette values (see below for format)
+
+       Output:
+       AX    := VBE Return Status
+
+       Input:
+       (32-bit)
+       BL     := 00h Set Palette Data
+       := 80h Set Palette Data during Vertical Retrace
+       CX     := Number of palette registers to update (to a maximum of 256)
+       DX     := First of the palette registers to update (start)
+       ES:EDI := Table of palette values (see below for format)
+       DS     := Selector for memory mapped registers
      */
 
     pVbe->pInt10->num = 0x10;
     pVbe->pInt10->ax = 0x4f09;
     if (!secondary)
-	pVbe->pInt10->bx = set && wait_retrace ? 0x80 : set ? 0 : 1;
+        pVbe->pInt10->bx = set && wait_retrace ? 0x80 : set ? 0 : 1;
     else
-	pVbe->pInt10->bx = set ? 2 : 3;
+        pVbe->pInt10->bx = set ? 2 : 3;
     pVbe->pInt10->cx = num;
     pVbe->pInt10->dx = first;
     pVbe->pInt10->es = SEG_ADDR(pVbe->real_mode_base);
     pVbe->pInt10->di = SEG_OFF(pVbe->real_mode_base);
     if (set)
-	memcpy(pVbe->memory, data, num * sizeof(CARD32));
+        memcpy(pVbe->memory, data, num * sizeof(CARD32));
     xf86ExecX86int10(pVbe->pInt10);
 
     if (R16(pVbe->pInt10->ax) != 0x4f)
-	return NULL;
+        return NULL;
 
     if (set)
-	return data;
+        return data;
 
     data = malloc(num * sizeof(CARD32));
     memcpy(data, pVbe->memory, num * sizeof(CARD32));
@@ -835,17 +848,17 @@ VBEGetVBEpmi(vbeInfoPtr pVbe)
     VBEpmi *pmi;
 
     /*
-    Input:
-	AH    := 4Fh	Super VGA support
-	AL    := 0Ah	Protected Mode Interface
-	BL    := 00h	Return Protected Mode Table
-
-    Output:
-	AX    := Status
-	ES    := Real Mode Segment of Table
-	DI    := Offset of Table
-	CX    := Lenght of Table including protected mode code in bytes (for copying purposes)
-	(All other registers are preserved)
+       Input:
+       AH    := 4Fh     Super VGA support
+       AL    := 0Ah     Protected Mode Interface
+       BL    := 00h     Return Protected Mode Table
+
+       Output:
+       AX    := Status
+       ES    := Real Mode Segment of Table
+       DI    := Offset of Table
+       CX    := Lenght of Table including protected mode code in bytes (for copying purposes)
+       (All other registers are preserved)
      */
 
     pVbe->pInt10->num = 0x10;
@@ -855,7 +868,7 @@ VBEGetVBEpmi(vbeInfoPtr pVbe)
     xf86ExecX86int10(pVbe->pInt10);
 
     if (R16(pVbe->pInt10->ax) != 0x4f)
-	return NULL;
+        return NULL;
 
     pmi = malloc(sizeof(VBEpmi));
     pmi->seg_tbl = R16(pVbe->pInt10->es);
@@ -867,49 +880,49 @@ VBEGetVBEpmi(vbeInfoPtr pVbe)
 
 #if 0
 vbeModeInfoPtr
-VBEBuildVbeModeList(vbeInfoPtr pVbe, VbeInfoBlock *vbe)
+VBEBuildVbeModeList(vbeInfoPtr pVbe, VbeInfoBlock * vbe)
 {
     vbeModeInfoPtr ModeList = NULL;
 
     int i = 0;
+
     while (vbe->VideoModePtr[i] != 0xffff) {
-	vbeModeInfoPtr m;
-	VbeModeInfoBlock *mode;
-	int id = vbe->VideoModePtr[i++];
-	int bpp;
+        vbeModeInfoPtr m;
+        VbeModeInfoBlock *mode;
+        int id = vbe->VideoModePtr[i++];
+        int bpp;
 
-	if ((mode = VBEGetModeInfo(pVbe, id)) == NULL)
-	    continue;
+        if ((mode = VBEGetModeInfo(pVbe, id)) == NULL)
+            continue;
 
- 	bpp = mode->BitsPerPixel;
+        bpp = mode->BitsPerPixel;
 
-	m = xnfcalloc(sizeof(vbeModeInfoRec),1);
-	m->width = mode->XResolution;
-	m->height = mode->YResolution;
-	m->bpp = bpp;
-	m->n = id;
-	m->next = ModeList;
+        m = xnfcalloc(sizeof(vbeModeInfoRec), 1);
+        m->width = mode->XResolution;
+        m->height = mode->YResolution;
+        m->bpp = bpp;
+        m->n = id;
+        m->next = ModeList;
 
-	xf86DrvMsgVerb(pVbe->pInt10->scrnIndex, X_PROBED, 3,
-		       "BIOS reported VESA mode 0x%x: x:%i y:%i bpp:%i\n",
-		       m->n, m->width, m->height, m->bpp);
+        xf86DrvMsgVerb(pVbe->pInt10->scrnIndex, X_PROBED, 3,
+                       "BIOS reported VESA mode 0x%x: x:%i y:%i bpp:%i\n",
+                       m->n, m->width, m->height, m->bpp);
 
-	ModeList = m;
+        ModeList = m;
 
-	VBEFreeModeInfo(mode);
+        VBEFreeModeInfo(mode);
     }
     return ModeList;
 }
 
-unsigned short 
+unsigned short
 VBECalcVbeModeIndex(vbeModeInfoPtr m, DisplayModePtr mode, int bpp)
 {
     while (m) {
-	if (bpp == m->bpp 
-	    && mode->HDisplay == m->width 
-	    && mode->VDisplay == m->height)
-	    return m->n;
-	m = m->next;
+        if (bpp == m->bpp
+            && mode->HDisplay == m->width && mode->VDisplay == m->height)
+            return m->n;
+        m = m->next;
     }
     return 0;
 }
@@ -917,37 +930,37 @@ VBECalcVbeModeIndex(vbeModeInfoPtr m, DisplayModePtr mode, int bpp)
 
 void
 VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr,
-		  vbeSaveRestoreFunction function)
+                   vbeSaveRestoreFunction function)
 {
     Bool SaveSucc = FALSE;
 
     if (VBE_VERSION_MAJOR(pVbe->version) > 1
-	&& (function == MODE_SAVE || vbe_sr->pstate)) {
-	if (function == MODE_RESTORE)
-	    memcpy(vbe_sr->state, vbe_sr->pstate, vbe_sr->stateSize);
-	ErrorF("VBESaveRestore\n");
-	if ((VBESaveRestore(pVbe,function,
-			    (pointer)&vbe_sr->state,
-			    &vbe_sr->stateSize,&vbe_sr->statePage))) {
-	    if (function == MODE_SAVE) {
-		SaveSucc = TRUE;
-		vbe_sr->stateMode = -1; /* invalidate */
-		/* don't rely on the memory not being touched */
-		if (vbe_sr->pstate == NULL)
-		    vbe_sr->pstate = malloc(vbe_sr->stateSize);
-		memcpy(vbe_sr->pstate, vbe_sr->state, vbe_sr->stateSize);
-	    }
-	    ErrorF("VBESaveRestore done with success\n");
-	    return;
-	}
-	ErrorF("VBESaveRestore done\n");
-    } 
-    
+        && (function == MODE_SAVE || vbe_sr->pstate)) {
+        if (function == MODE_RESTORE)
+            memcpy(vbe_sr->state, vbe_sr->pstate, vbe_sr->stateSize);
+        ErrorF("VBESaveRestore\n");
+        if ((VBESaveRestore(pVbe, function,
+                            (pointer) &vbe_sr->state,
+                            &vbe_sr->stateSize, &vbe_sr->statePage))) {
+            if (function == MODE_SAVE) {
+                SaveSucc = TRUE;
+                vbe_sr->stateMode = -1; /* invalidate */
+                /* don't rely on the memory not being touched */
+                if (vbe_sr->pstate == NULL)
+                    vbe_sr->pstate = malloc(vbe_sr->stateSize);
+                memcpy(vbe_sr->pstate, vbe_sr->state, vbe_sr->stateSize);
+            }
+            ErrorF("VBESaveRestore done with success\n");
+            return;
+        }
+        ErrorF("VBESaveRestore done\n");
+    }
+
     if (function == MODE_SAVE && !SaveSucc)
-	    (void)VBEGetVBEMode(pVbe, &vbe_sr->stateMode);
-	
+        (void) VBEGetVBEMode(pVbe, &vbe_sr->stateMode);
+
     if (function == MODE_RESTORE && vbe_sr->stateMode != -1)
-	    VBESetVBEMode(pVbe, vbe_sr->stateMode, NULL);
+        VBESetVBEMode(pVbe, vbe_sr->stateMode, NULL);
 
 }
 
@@ -955,15 +968,15 @@ int
 VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int clock)
 {
     /*
-    Input:
-	AX := 4F0Bh VBE Get Pixel Clock
-	BL := 00h Get Pixel Clock
-	ECX := pixel clock in units of Hz
-        DX := mode number
-     
-    Output:
-	AX := VBE Return Status
-	ECX := Closest pixel clock
+       Input:
+       AX := 4F0Bh VBE Get Pixel Clock
+       BL := 00h Get Pixel Clock
+       ECX := pixel clock in units of Hz
+       DX := mode number
+
+       Output:
+       AX := VBE Return Status
+       ECX := Closest pixel clock
      */
 
     pVbe->pInt10->num = 0x10;
@@ -974,7 +987,7 @@ VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int clock)
     xf86ExecX86int10(pVbe->pInt10);
 
     if (R16(pVbe->pInt10->ax) != 0x4f)
-	return 0;
+        return 0;
 
     return pVbe->pInt10->cx;
 }
@@ -983,13 +996,13 @@ Bool
 VBEDPMSSet(vbeInfoPtr pVbe, int mode)
 {
     /*
-    Input:
-	AX := 4F10h DPMS
-	BL := 01h Set Display Power State
-	BH := requested power state
-     
-    Output:
-	AX := VBE Return Status
+       Input:
+       AX := 4F10h DPMS
+       BL := 01h Set Display Power State
+       BH := requested power state
+
+       Output:
+       AX := VBE Return Status
      */
 
     pVbe->pInt10->num = 0x10;
@@ -997,16 +1010,16 @@ VBEDPMSSet(vbeInfoPtr pVbe, int mode)
     pVbe->pInt10->bx = 0x01;
     switch (mode) {
     case DPMSModeOn:
-	break;
+        break;
     case DPMSModeStandby:
-	pVbe->pInt10->bx |= 0x100;
-	break;
+        pVbe->pInt10->bx |= 0x100;
+        break;
     case DPMSModeSuspend:
-	pVbe->pInt10->bx |= 0x200;
-	break;
+        pVbe->pInt10->bx |= 0x200;
+        break;
     case DPMSModeOff:
-	pVbe->pInt10->bx |= 0x400;
-	break;
+        pVbe->pInt10->bx |= 0x400;
+        break;
     }
     xf86ExecX86int10(pVbe->pInt10);
     return (R16(pVbe->pInt10->ax) == 0x4f);
@@ -1020,31 +1033,32 @@ VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data)
     const float PANEL_HZ = 60.0;
 
     if (!data)
-	return;
+        return;
 
     xf86DrvMsg(scrnIndex, X_INFO, "PanelID returned panel resolution %dx%d\n",
-	    data->hsize, data->vsize);
+               data->hsize, data->vsize);
 
     if (pScrn->monitor->nHsync || pScrn->monitor->nVrefresh)
-	return;
+        return;
 
     if (data->hsize < 320 || data->vsize < 240) {
-	xf86DrvMsg(scrnIndex, X_INFO, "...which I refuse to believe\n");
-	return;
+        xf86DrvMsg(scrnIndex, X_INFO, "...which I refuse to believe\n");
+        return;
     }
 
     mode = xf86CVTMode(data->hsize, data->vsize, PANEL_HZ, 1, 0);
 
     pScrn->monitor->nHsync = 1;
     pScrn->monitor->hsync[0].lo = 29.37;
-    pScrn->monitor->hsync[0].hi = (float)mode->Clock / (float)mode->HTotal;
+    pScrn->monitor->hsync[0].hi = (float) mode->Clock / (float) mode->HTotal;
     pScrn->monitor->nVrefresh = 1;
     pScrn->monitor->vrefresh[0].lo = 56.0;
     pScrn->monitor->vrefresh[0].hi =
-	(float)mode->Clock*1000.0 / (float)mode->HTotal / (float)mode->VTotal;
+        (float) mode->Clock * 1000.0 / (float) mode->HTotal /
+        (float) mode->VTotal;
 
     if (pScrn->monitor->vrefresh[0].hi < 59.47)
-	pScrn->monitor->vrefresh[0].hi = 59.47;
+        pScrn->monitor->vrefresh[0].hi = 59.47;
 
     free(mode);
 }
@@ -1068,25 +1082,27 @@ VBEReadPanelID(vbeInfoPtr pVbe)
     xf86ExecX86int10(pVbe->pInt10);
 
     if ((pVbe->pInt10->ax & 0xff) != 0x4f) {
-	xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID invalid\n");
-	goto error;
+        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE PanelID invalid\n");
+        goto error;
     }
 
     switch (pVbe->pInt10->ax & 0xff00) {
     case 0x0:
-	xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID read successfully\n");
-	tmp = xnfalloc(32); 
-	memcpy(tmp, page, 32); 
-	break;
+        xf86DrvMsgVerb(screen, X_INFO, 3,
+                       "VESA VBE PanelID read successfully\n");
+        tmp = xnfalloc(32);
+        memcpy(tmp, page, 32);
+        break;
     case 0x100:
-	xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID read failed\n");       
-	break;
+        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE PanelID read failed\n");
+        break;
     default:
-	xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID unknown failure %i\n",
-		       pVbe->pInt10->ax & 0xff00);
-	break;
+        xf86DrvMsgVerb(screen, X_INFO, 3,
+                       "VESA VBE PanelID unknown failure %i\n",
+                       pVbe->pInt10->ax & 0xff00);
+        break;
     }
 
-error:
+ error:
     return tmp;
 }
diff --git a/xorg-server/hw/xfree86/vbe/vbe.h b/xorg-server/hw/xfree86/vbe/vbe.h
index 5bb163df8..81be0ff40 100644
--- a/xorg-server/hw/xfree86/vbe/vbe.h
+++ b/xorg-server/hw/xfree86/vbe/vbe.h
@@ -1,341 +1,357 @@
-

-/*

- *                   XFree86 vbe module

- *               Copyright 2000 Egbert Eich

- *

- * The mode query/save/set/restore functions from the vesa driver 

- * have been moved here.

- * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)

- * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> 

- */

-

-#ifndef _VBE_H

-#define _VBE_H

-#include "xf86int10.h"

-#include "xf86DDC.h"

-

-typedef enum {

-    DDC_UNCHECKED,

-    DDC_NONE,

-    DDC_1,

-    DDC_2,

-    DDC_1_2

-}

-ddc_lvl;

-

-typedef struct {

-    xf86Int10InfoPtr pInt10;

-    int version;

-    pointer memory;

-    int real_mode_base;

-    int num_pages;

-    Bool init_int10;

-    ddc_lvl ddc;

-    Bool ddc_blank;

-} vbeInfoRec, *vbeInfoPtr;

-

-#define VBE_VERSION_MAJOR(x) *((CARD8*)(&x) + 1)

-#define VBE_VERSION_MINOR(x) (CARD8)(x)

-

-extern _X_EXPORT vbeInfoPtr VBEInit(xf86Int10InfoPtr pInt, int entityIndex);

-extern _X_EXPORT vbeInfoPtr VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags);

-extern _X_EXPORT void vbeFree(vbeInfoPtr pVbe);

-extern _X_EXPORT xf86MonPtr vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule);

-

-#pragma pack(1)

-

-typedef struct vbeControllerInfoBlock {

-    CARD8 VbeSignature[4];

-    CARD16 VbeVersion;

-    CARD32 OemStringPtr;

-    CARD8 Capabilities[4];

-    CARD32 VideoModePtr;

-    CARD16 TotalMem;

-    CARD16 OemSoftwareRev;

-    CARD32 OemVendorNamePtr;

-    CARD32 OemProductNamePtr;

-    CARD32 OemProductRevPtr;

-    CARD8  Scratch[222];

-    CARD8  OemData[256];

-} vbeControllerInfoRec, *vbeControllerInfoPtr;

-

-#if defined(__GNUC__) || defined(__USLC__) || defined(__SUNPRO_C)

-#pragma pack()	/* All GCC versions recognise this syntax */

-#else

-#pragma pack(0)

-#endif

-

-#if !( defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) )

-#define __attribute__(a)

-#endif

-

-typedef struct _VbeInfoBlock VbeInfoBlock;

-typedef struct _VbeModeInfoBlock VbeModeInfoBlock;

-typedef struct _VbeCRTCInfoBlock VbeCRTCInfoBlock;

-

-/*

- * INT 0

- */

-

-struct _VbeInfoBlock {

-    /* VESA 1.2 fields */

-    CARD8 VESASignature[4];		/* VESA */

-    CARD16 VESAVersion;			/* Higher byte major, lower byte minor */

-    /*CARD32*/char *OEMStringPtr;	/* Pointer to OEM string */

-    CARD8 Capabilities[4];		/* Capabilities of the video environment */

-

-    /*CARD32*/CARD16 *VideoModePtr;	/* pointer to supported Super VGA modes */

-

-    CARD16 TotalMemory;			/* Number of 64kb memory blocks on board */

-    /* if not VESA 2, 236 scratch bytes follow (256 bytes total size) */

-

-    /* VESA 2 fields */

-    CARD16 OemSoftwareRev;		/* VBE implementation Software revision */

-    /*CARD32*/char *OemVendorNamePtr;	/* Pointer to Vendor Name String */

-    /*CARD32*/char *OemProductNamePtr;	/* Pointer to Product Name String */

-    /*CARD32*/char *OemProductRevPtr;	/* Pointer to Product Revision String */

-    CARD8 Reserved[222];		/* Reserved for VBE implementation */

-    CARD8 OemData[256];			/* Data Area for OEM Strings */

-} __attribute__((packed));

-

-/* Return Super VGA Information */

-extern _X_EXPORT VbeInfoBlock *VBEGetVBEInfo(vbeInfoPtr pVbe);

-extern _X_EXPORT void VBEFreeVBEInfo(VbeInfoBlock *block);

-

-/*

- * INT 1

- */

-

-struct _VbeModeInfoBlock {

-    CARD16 ModeAttributes;		/* mode attributes */

-    CARD8 WinAAttributes;		/* window A attributes */

-    CARD8 WinBAttributes;		/* window B attributes */

-    CARD16 WinGranularity;		/* window granularity */

-    CARD16 WinSize;			/* window size */

-    CARD16 WinASegment;			/* window A start segment */

-    CARD16 WinBSegment;			/* window B start segment */

-    CARD32 WinFuncPtr;			/* real mode pointer to window function */

-    CARD16 BytesPerScanline;		/* bytes per scanline */

-

-    /* Mandatory information for VBE 1.2 and above */

-    CARD16 XResolution;			/* horizontal resolution in pixels or characters */

-    CARD16 YResolution;			/* vertical resolution in pixels or characters */

-    CARD8 XCharSize;			/* character cell width in pixels */

-    CARD8 YCharSize;			/* character cell height in pixels */

-    CARD8 NumberOfPlanes;		/* number of memory planes */

-    CARD8 BitsPerPixel;			/* bits per pixel */

-    CARD8 NumberOfBanks;		/* number of banks */

-    CARD8 MemoryModel;			/* memory model type */

-    CARD8 BankSize;			/* bank size in KB */

-    CARD8 NumberOfImages;		/* number of images */

-    CARD8 Reserved;	/* 1 */		/* reserved for page function */

-

-    /* Direct color fields (required for direct/6 and YUV/7 memory models) */

-    CARD8 RedMaskSize;			/* size of direct color red mask in bits */

-    CARD8 RedFieldPosition;		/* bit position of lsb of red mask */

-    CARD8 GreenMaskSize;		/* size of direct color green mask in bits */

-    CARD8 GreenFieldPosition;		/* bit position of lsb of green mask */

-    CARD8 BlueMaskSize;			/* size of direct color blue mask in bits */

-    CARD8 BlueFieldPosition;		/* bit position of lsb of blue mask */

-    CARD8 RsvdMaskSize;			/* size of direct color reserved mask in bits */

-    CARD8 RsvdFieldPosition;		/* bit position of lsb of reserved mask */

-    CARD8 DirectColorModeInfo;		/* direct color mode attributes */

-

-    /* Mandatory information for VBE 2.0 and above */

-    CARD32 PhysBasePtr;			/* physical address for flat memory frame buffer */

-    CARD32 Reserved32;	/* 0 */		/* Reserved - always set to 0 */

-    CARD16 Reserved16;	/* 0 */		/* Reserved - always set to 0 */

-

-    /* Mandatory information for VBE 3.0 and above */

-    CARD16 LinBytesPerScanLine;		/* bytes per scan line for linear modes */

-    CARD8 BnkNumberOfImagePages;	/* number of images for banked modes */

-    CARD8 LinNumberOfImagePages;	/* number of images for linear modes */

-    CARD8 LinRedMaskSize;		/* size of direct color red mask (linear modes) */

-    CARD8 LinRedFieldPosition;		/* bit position of lsb of red mask (linear modes) */

-    CARD8 LinGreenMaskSize;		/* size of direct color green mask (linear modes) */

-    CARD8 LinGreenFieldPosition;	/* bit position of lsb of green mask (linear modes) */

-    CARD8 LinBlueMaskSize;		/* size of direct color blue mask (linear modes) */

-    CARD8 LinBlueFieldPosition;		/* bit position of lsb of blue mask (linear modes) */

-    CARD8 LinRsvdMaskSize;		/* size of direct color reserved mask (linear modes) */

-    CARD8 LinRsvdFieldPosition;		/* bit position of lsb of reserved mask (linear modes) */

-    CARD32 MaxPixelClock;		/* maximum pixel clock (in Hz) for graphics mode */

-    CARD8 Reserved2[189];		/* remainder of VbeModeInfoBlock */

-} __attribute__((packed));

-

-/* Return VBE Mode Information */

-extern _X_EXPORT VbeModeInfoBlock *VBEGetModeInfo(vbeInfoPtr pVbe, int mode);

-extern _X_EXPORT void VBEFreeModeInfo(VbeModeInfoBlock *block);

-

-/*

- * INT2

- */

-

-#define CRTC_DBLSCAN	(1<<0)

-#define CRTC_INTERLACE	(1<<1)

-#define CRTC_NHSYNC	(1<<2)

-#define CRTC_NVSYNC	(1<<3)

-

-struct _VbeCRTCInfoBlock {

-    CARD16 HorizontalTotal;		/* Horizontal total in pixels */

-    CARD16 HorizontalSyncStart;		/* Horizontal sync start in pixels */

-    CARD16 HorizontalSyncEnd;		/* Horizontal sync end in pixels */

-    CARD16 VerticalTotal;		/* Vertical total in lines */

-    CARD16 VerticalSyncStart;		/* Vertical sync start in lines */

-    CARD16 VerticalSyncEnd;		/* Vertical sync end in lines */

-    CARD8 Flags;			/* Flags (Interlaced, Double Scan etc) */

-    CARD32 PixelClock;			/* Pixel clock in units of Hz */

-    CARD16 RefreshRate;			/* Refresh rate in units of 0.01 Hz */

-    CARD8 Reserved[40];			/* remainder of ModeInfoBlock */

-} __attribute__((packed));

-/* VbeCRTCInfoBlock is in the VESA 3.0 specs */

-

-extern _X_EXPORT Bool VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *crtc);

-

-/*

- * INT 3

- */

-

-extern _X_EXPORT Bool VBEGetVBEMode(vbeInfoPtr pVbe, int *mode);

-

-/*

- * INT 4

- */

-

-/* Save/Restore Super VGA video state */

-/* function values are (values stored in VESAPtr):

- *	0 := query & allocate amount of memory to save state

- *	1 := save state

- *	2 := restore state

- *

- *	function 0 called automatically if function 1 called without

- *	a previous call to function 0.

- */

-

-typedef enum {

-  MODE_QUERY,

-  MODE_SAVE,

-  MODE_RESTORE

-} vbeSaveRestoreFunction;

-

-extern _X_EXPORT Bool

-VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction fuction, 

-	       pointer *memory, int *size, int *real_mode_pages);

-

-/*

- * INT 5

- */

-

-extern _X_EXPORT Bool

-VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window);

-

-/*

- * INT 6

- */

-

-typedef enum {

-  SCANWID_SET,

-  SCANWID_GET,

-  SCANWID_SET_BYTES,

-  SCANWID_GET_MAX

-} vbeScanwidthCommand;

-

-#define VBESetLogicalScanline(pVbe, width)	\

-	VBESetGetLogicalScanlineLength(pVbe, SCANWID_SET, width, \

-					NULL, NULL, NULL)

-#define VBESetLogicalScanlineBytes(pVbe, width)	\

-	VBESetGetLogicalScanlineLength(pVbe, SCANWID_SET_BYTES, width, \

-					NULL, NULL, NULL)

-#define VBEGetLogicalScanline(pVbe, pixels, bytes, max)	\

-	VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET, 0, \

-					pixels, bytes, max)

-#define VBEGetMaxLogicalScanline(pVbe, pixels, bytes, max)	\

-	VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET_MAX, 0, \

-					pixels, bytes, max)

-extern _X_EXPORT Bool VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe,

-				    vbeScanwidthCommand command, int width,

-				     int *pixels, int *bytes, int *max);

-

-/*

- * INT 7

- */

-

-/* 16 bit code */

-extern _X_EXPORT Bool VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y, Bool wait_retrace);

-extern _X_EXPORT Bool VBEGetDisplayStart(vbeInfoPtr pVbe, int *x, int *y);

-

-/*

- * INT 8

- */

-

-/* if bits is 0, then it is a GET */

-extern _X_EXPORT int VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits);

-

-/*

- * INT 9

- */

-

-/*

- *  If getting a palette, the data argument is not used. It will return

- * the data.

- *  If setting a palette, it will return the pointer received on success,

- * NULL on failure.

- */

-extern _X_EXPORT CARD32 *VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num,

-			     CARD32 *data, Bool secondary, Bool wait_retrace);

-#define VBEFreePaletteData(data)	free(data)

-

-/*

- * INT A

- */

-

-typedef struct _VBEpmi {

-    int seg_tbl;

-    int tbl_off;

-    int tbl_len;

-} VBEpmi;

-

-extern _X_EXPORT VBEpmi *VBEGetVBEpmi(vbeInfoPtr pVbe);

-#define VESAFreeVBEpmi(pmi)	free(pmi)

-

-/* high level helper functions */

-

-typedef struct _vbeModeInfoRec {

-    int width;

-    int height;

-    int bpp;

-    int n;

-    struct _vbeModeInfoRec *next;

-} vbeModeInfoRec, *vbeModeInfoPtr;

-

-typedef struct {

-    CARD8 *state;

-    CARD8 *pstate;

-    int statePage;

-    int stateSize;

-    int stateMode;

-} vbeSaveRestoreRec, *vbeSaveRestorePtr;

-

-extern _X_EXPORT void

-VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr,

-		   vbeSaveRestoreFunction function);

-

-extern _X_EXPORT int VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int Clock);

-extern _X_EXPORT Bool VBEDPMSSet(vbeInfoPtr pVbe, int mode);

-

-struct vbePanelID {

-    short hsize;

-    short vsize;

-    short fptype;

-    char redbpp;

-    char greenbpp;

-    char bluebpp;

-    char reservedbpp;

-    int reserved_offscreen_mem_size;

-    int reserved_offscreen_mem_pointer;

-    char reserved[14];

-};

-

-extern _X_EXPORT void VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data);

-extern _X_EXPORT struct vbePanelID *VBEReadPanelID(vbeInfoPtr pVbe);

-

-#endif

+
+/*
+ *                   XFree86 vbe module
+ *               Copyright 2000 Egbert Eich
+ *
+ * The mode query/save/set/restore functions from the vesa driver 
+ * have been moved here.
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> 
+ */
+
+#ifndef _VBE_H
+#define _VBE_H
+#include "xf86int10.h"
+#include "xf86DDC.h"
+
+typedef enum {
+    DDC_UNCHECKED,
+    DDC_NONE,
+    DDC_1,
+    DDC_2,
+    DDC_1_2
+} ddc_lvl;
+
+typedef struct {
+    xf86Int10InfoPtr pInt10;
+    int version;
+    pointer memory;
+    int real_mode_base;
+    int num_pages;
+    Bool init_int10;
+    ddc_lvl ddc;
+    Bool ddc_blank;
+} vbeInfoRec, *vbeInfoPtr;
+
+#define VBE_VERSION_MAJOR(x) *((CARD8*)(&x) + 1)
+#define VBE_VERSION_MINOR(x) (CARD8)(x)
+
+extern _X_EXPORT vbeInfoPtr VBEInit(xf86Int10InfoPtr pInt, int entityIndex);
+extern _X_EXPORT vbeInfoPtr VBEExtendedInit(xf86Int10InfoPtr pInt,
+                                            int entityIndex, int Flags);
+extern _X_EXPORT void vbeFree(vbeInfoPtr pVbe);
+extern _X_EXPORT xf86MonPtr vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule);
+
+#pragma pack(1)
+
+typedef struct vbeControllerInfoBlock {
+    CARD8 VbeSignature[4];
+    CARD16 VbeVersion;
+    CARD32 OemStringPtr;
+    CARD8 Capabilities[4];
+    CARD32 VideoModePtr;
+    CARD16 TotalMem;
+    CARD16 OemSoftwareRev;
+    CARD32 OemVendorNamePtr;
+    CARD32 OemProductNamePtr;
+    CARD32 OemProductRevPtr;
+    CARD8 Scratch[222];
+    CARD8 OemData[256];
+} vbeControllerInfoRec, *vbeControllerInfoPtr;
+
+#if defined(__GNUC__) || defined(__USLC__) || defined(__SUNPRO_C)
+#pragma pack()                  /* All GCC versions recognise this syntax */
+#else
+#pragma pack(0)
+#endif
+
+#if !( defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) )
+#define __attribute__(a)
+#endif
+
+typedef struct _VbeInfoBlock VbeInfoBlock;
+typedef struct _VbeModeInfoBlock VbeModeInfoBlock;
+typedef struct _VbeCRTCInfoBlock VbeCRTCInfoBlock;
+
+/*
+ * INT 0
+ */
+
+struct _VbeInfoBlock {
+    /* VESA 1.2 fields */
+    CARD8 VESASignature[4];     /* VESA */
+    CARD16 VESAVersion;         /* Higher byte major, lower byte minor */
+                                        /*CARD32 */ char *OEMStringPtr;
+                                        /* Pointer to OEM string */
+    CARD8 Capabilities[4];      /* Capabilities of the video environment */
+
+                                        /*CARD32 */ CARD16 *VideoModePtr;
+                                        /* pointer to supported Super VGA modes */
+
+    CARD16 TotalMemory;         /* Number of 64kb memory blocks on board */
+    /* if not VESA 2, 236 scratch bytes follow (256 bytes total size) */
+
+    /* VESA 2 fields */
+    CARD16 OemSoftwareRev;      /* VBE implementation Software revision */
+                                        /*CARD32 */ char *OemVendorNamePtr;
+                                        /* Pointer to Vendor Name String */
+                                                /*CARD32 */ char *OemProductNamePtr;
+                                                /* Pointer to Product Name String */
+                                        /*CARD32 */ char *OemProductRevPtr;
+                                        /* Pointer to Product Revision String */
+    CARD8 Reserved[222];        /* Reserved for VBE implementation */
+    CARD8 OemData[256];         /* Data Area for OEM Strings */
+} __attribute__ ((packed));
+
+/* Return Super VGA Information */
+extern _X_EXPORT VbeInfoBlock *VBEGetVBEInfo(vbeInfoPtr pVbe);
+extern _X_EXPORT void VBEFreeVBEInfo(VbeInfoBlock * block);
+
+/*
+ * INT 1
+ */
+
+struct _VbeModeInfoBlock {
+    CARD16 ModeAttributes;      /* mode attributes */
+    CARD8 WinAAttributes;       /* window A attributes */
+    CARD8 WinBAttributes;       /* window B attributes */
+    CARD16 WinGranularity;      /* window granularity */
+    CARD16 WinSize;             /* window size */
+    CARD16 WinASegment;         /* window A start segment */
+    CARD16 WinBSegment;         /* window B start segment */
+    CARD32 WinFuncPtr;          /* real mode pointer to window function */
+    CARD16 BytesPerScanline;    /* bytes per scanline */
+
+    /* Mandatory information for VBE 1.2 and above */
+    CARD16 XResolution;         /* horizontal resolution in pixels or characters */
+    CARD16 YResolution;         /* vertical resolution in pixels or characters */
+    CARD8 XCharSize;            /* character cell width in pixels */
+    CARD8 YCharSize;            /* character cell height in pixels */
+    CARD8 NumberOfPlanes;       /* number of memory planes */
+    CARD8 BitsPerPixel;         /* bits per pixel */
+    CARD8 NumberOfBanks;        /* number of banks */
+    CARD8 MemoryModel;          /* memory model type */
+    CARD8 BankSize;             /* bank size in KB */
+    CARD8 NumberOfImages;       /* number of images */
+    CARD8 Reserved;             /* 1 *//* reserved for page function */
+
+    /* Direct color fields (required for direct/6 and YUV/7 memory models) */
+    CARD8 RedMaskSize;          /* size of direct color red mask in bits */
+    CARD8 RedFieldPosition;     /* bit position of lsb of red mask */
+    CARD8 GreenMaskSize;        /* size of direct color green mask in bits */
+    CARD8 GreenFieldPosition;   /* bit position of lsb of green mask */
+    CARD8 BlueMaskSize;         /* size of direct color blue mask in bits */
+    CARD8 BlueFieldPosition;    /* bit position of lsb of blue mask */
+    CARD8 RsvdMaskSize;         /* size of direct color reserved mask in bits */
+    CARD8 RsvdFieldPosition;    /* bit position of lsb of reserved mask */
+    CARD8 DirectColorModeInfo;  /* direct color mode attributes */
+
+    /* Mandatory information for VBE 2.0 and above */
+    CARD32 PhysBasePtr;         /* physical address for flat memory frame buffer */
+    CARD32 Reserved32;          /* 0 *//* Reserved - always set to 0 */
+    CARD16 Reserved16;          /* 0 *//* Reserved - always set to 0 */
+
+    /* Mandatory information for VBE 3.0 and above */
+    CARD16 LinBytesPerScanLine; /* bytes per scan line for linear modes */
+    CARD8 BnkNumberOfImagePages;        /* number of images for banked modes */
+    CARD8 LinNumberOfImagePages;        /* number of images for linear modes */
+    CARD8 LinRedMaskSize;       /* size of direct color red mask (linear modes) */
+    CARD8 LinRedFieldPosition;  /* bit position of lsb of red mask (linear modes) */
+    CARD8 LinGreenMaskSize;     /* size of direct color green mask (linear modes) */
+    CARD8 LinGreenFieldPosition;        /* bit position of lsb of green mask (linear modes) */
+    CARD8 LinBlueMaskSize;      /* size of direct color blue mask (linear modes) */
+    CARD8 LinBlueFieldPosition; /* bit position of lsb of blue mask (linear modes) */
+    CARD8 LinRsvdMaskSize;      /* size of direct color reserved mask (linear modes) */
+    CARD8 LinRsvdFieldPosition; /* bit position of lsb of reserved mask (linear modes) */
+    CARD32 MaxPixelClock;       /* maximum pixel clock (in Hz) for graphics mode */
+    CARD8 Reserved2[189];       /* remainder of VbeModeInfoBlock */
+} __attribute__ ((packed));
+
+/* Return VBE Mode Information */
+extern _X_EXPORT VbeModeInfoBlock *VBEGetModeInfo(vbeInfoPtr pVbe, int mode);
+extern _X_EXPORT void VBEFreeModeInfo(VbeModeInfoBlock * block);
+
+/*
+ * INT2
+ */
+
+#define CRTC_DBLSCAN	(1<<0)
+#define CRTC_INTERLACE	(1<<1)
+#define CRTC_NHSYNC	(1<<2)
+#define CRTC_NVSYNC	(1<<3)
+
+struct _VbeCRTCInfoBlock {
+    CARD16 HorizontalTotal;     /* Horizontal total in pixels */
+    CARD16 HorizontalSyncStart; /* Horizontal sync start in pixels */
+    CARD16 HorizontalSyncEnd;   /* Horizontal sync end in pixels */
+    CARD16 VerticalTotal;       /* Vertical total in lines */
+    CARD16 VerticalSyncStart;   /* Vertical sync start in lines */
+    CARD16 VerticalSyncEnd;     /* Vertical sync end in lines */
+    CARD8 Flags;                /* Flags (Interlaced, Double Scan etc) */
+    CARD32 PixelClock;          /* Pixel clock in units of Hz */
+    CARD16 RefreshRate;         /* Refresh rate in units of 0.01 Hz */
+    CARD8 Reserved[40];         /* remainder of ModeInfoBlock */
+} __attribute__ ((packed));
+
+/* VbeCRTCInfoBlock is in the VESA 3.0 specs */
+
+extern _X_EXPORT Bool VBESetVBEMode(vbeInfoPtr pVbe, int mode,
+                                    VbeCRTCInfoBlock * crtc);
+
+/*
+ * INT 3
+ */
+
+extern _X_EXPORT Bool VBEGetVBEMode(vbeInfoPtr pVbe, int *mode);
+
+/*
+ * INT 4
+ */
+
+/* Save/Restore Super VGA video state */
+/* function values are (values stored in VESAPtr):
+ *	0 := query & allocate amount of memory to save state
+ *	1 := save state
+ *	2 := restore state
+ *
+ *	function 0 called automatically if function 1 called without
+ *	a previous call to function 0.
+ */
+
+typedef enum {
+    MODE_QUERY,
+    MODE_SAVE,
+    MODE_RESTORE
+} vbeSaveRestoreFunction;
+
+extern _X_EXPORT Bool
+
+VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction fuction,
+               pointer *memory, int *size, int *real_mode_pages);
+
+/*
+ * INT 5
+ */
+
+extern _X_EXPORT Bool
+ VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window);
+
+/*
+ * INT 6
+ */
+
+typedef enum {
+    SCANWID_SET,
+    SCANWID_GET,
+    SCANWID_SET_BYTES,
+    SCANWID_GET_MAX
+} vbeScanwidthCommand;
+
+#define VBESetLogicalScanline(pVbe, width)	\
+	VBESetGetLogicalScanlineLength(pVbe, SCANWID_SET, width, \
+					NULL, NULL, NULL)
+#define VBESetLogicalScanlineBytes(pVbe, width)	\
+	VBESetGetLogicalScanlineLength(pVbe, SCANWID_SET_BYTES, width, \
+					NULL, NULL, NULL)
+#define VBEGetLogicalScanline(pVbe, pixels, bytes, max)	\
+	VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET, 0, \
+					pixels, bytes, max)
+#define VBEGetMaxLogicalScanline(pVbe, pixels, bytes, max)	\
+	VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET_MAX, 0, \
+					pixels, bytes, max)
+extern _X_EXPORT Bool VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe,
+                                                     vbeScanwidthCommand
+                                                     command, int width,
+                                                     int *pixels, int *bytes,
+                                                     int *max);
+
+/*
+ * INT 7
+ */
+
+/* 16 bit code */
+extern _X_EXPORT Bool VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y,
+                                         Bool wait_retrace);
+extern _X_EXPORT Bool VBEGetDisplayStart(vbeInfoPtr pVbe, int *x, int *y);
+
+/*
+ * INT 8
+ */
+
+/* if bits is 0, then it is a GET */
+extern _X_EXPORT int VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits);
+
+/*
+ * INT 9
+ */
+
+/*
+ *  If getting a palette, the data argument is not used. It will return
+ * the data.
+ *  If setting a palette, it will return the pointer received on success,
+ * NULL on failure.
+ */
+extern _X_EXPORT CARD32 *VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set,
+                                              int first, int num, CARD32 *data,
+                                              Bool secondary,
+                                              Bool wait_retrace);
+#define VBEFreePaletteData(data)	free(data)
+
+/*
+ * INT A
+ */
+
+typedef struct _VBEpmi {
+    int seg_tbl;
+    int tbl_off;
+    int tbl_len;
+} VBEpmi;
+
+extern _X_EXPORT VBEpmi *VBEGetVBEpmi(vbeInfoPtr pVbe);
+
+#define VESAFreeVBEpmi(pmi)	free(pmi)
+
+/* high level helper functions */
+
+typedef struct _vbeModeInfoRec {
+    int width;
+    int height;
+    int bpp;
+    int n;
+    struct _vbeModeInfoRec *next;
+} vbeModeInfoRec, *vbeModeInfoPtr;
+
+typedef struct {
+    CARD8 *state;
+    CARD8 *pstate;
+    int statePage;
+    int stateSize;
+    int stateMode;
+} vbeSaveRestoreRec, *vbeSaveRestorePtr;
+
+extern _X_EXPORT void
+
+VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr,
+                   vbeSaveRestoreFunction function);
+
+extern _X_EXPORT int VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int Clock);
+extern _X_EXPORT Bool VBEDPMSSet(vbeInfoPtr pVbe, int mode);
+
+struct vbePanelID {
+    short hsize;
+    short vsize;
+    short fptype;
+    char redbpp;
+    char greenbpp;
+    char bluebpp;
+    char reservedbpp;
+    int reserved_offscreen_mem_size;
+    int reserved_offscreen_mem_pointer;
+    char reserved[14];
+};
+
+extern _X_EXPORT void VBEInterpretPanelID(int scrnIndex,
+                                          struct vbePanelID *data);
+extern _X_EXPORT struct vbePanelID *VBEReadPanelID(vbeInfoPtr pVbe);
+
+#endif
diff --git a/xorg-server/hw/xfree86/vbe/vbeModes.c b/xorg-server/hw/xfree86/vbe/vbeModes.c
index 9ccbe6b51..415167d0e 100644
--- a/xorg-server/hw/xfree86/vbe/vbeModes.c
+++ b/xorg-server/hw/xfree86/vbe/vbeModes.c
@@ -1,451 +1,451 @@
-#define DEBUG_VERB 2

-/*

- * Copyright © 2002 David Dawes

- *

- * 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 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 AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of the author(s) shall

- * not be used in advertising or otherwise to promote the sale, use or other

- * dealings in this Software without prior written authorization from

- * the author(s).

- *

- * Authors: David Dawes <dawes@xfree86.org>

- *

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <stdio.h>

-#include <string.h>

-

-#include "xf86.h"

-#include "vbe.h"

-#include "vbeModes.h"

-

-static int

-GetDepthFlag(vbeInfoPtr pVbe, int id)

-{

-    VbeModeInfoBlock *mode;

-    int bpp;

-

-    if ((mode = VBEGetModeInfo(pVbe, id)) == NULL)

-	return 0;

-

-    if (VBE_MODE_USABLE(mode, 0)) {

-	int depth;

-

-	if (VBE_MODE_COLOR(mode)) {

-	    depth = mode->RedMaskSize + mode->GreenMaskSize +

-		    mode->BlueMaskSize;

-	} else {

-	    depth = 1;

-	}

-	bpp = mode->BitsPerPixel;

-	VBEFreeModeInfo(mode);

-	mode = NULL;

-	switch (depth) {

-	case 1:

-	    return V_DEPTH_1;

-	case 4:

-	    return V_DEPTH_4;

-	case 8:

-	    return V_DEPTH_8;

-	case 15:

-	    return V_DEPTH_15;

-	case 16:

-	    return V_DEPTH_16;

-	case 24:

-	    switch (bpp) {

-	    case 24:

-		return V_DEPTH_24_24;

-	    case 32:

-		return V_DEPTH_24_32;

-	    }

-	}

-    }

-    if (mode)

-	VBEFreeModeInfo(mode);

-    return 0;

-}

-

-/*

- * Find supported mode depths.

- */

-int

-VBEFindSupportedDepths(vbeInfoPtr pVbe, VbeInfoBlock *vbe, int *flags24,

-			int modeTypes)

-{

-    int i = 0;

-    int depths = 0;

-

-    if (modeTypes & V_MODETYPE_VBE) {

-	while (vbe->VideoModePtr[i] != 0xffff) {

-	    depths |= GetDepthFlag(pVbe, vbe->VideoModePtr[i++]);

-	}

-    }

-

-    /*

-     * XXX This possibly only works with VBE 3.0 and later.

-     */

-    if (modeTypes & V_MODETYPE_VGA) {

-	for (i = 0; i < 0x7F; i++) {

-	    depths |= GetDepthFlag(pVbe, i);

-	}

-    }

-

-    if (flags24) {

-	if (depths & V_DEPTH_24_24)

-	    *flags24 |= Support24bppFb;

-	if (depths & V_DEPTH_24_32)

-	    *flags24 |= Support32bppFb;

-    }

-

-    return depths;

-}

-

-static DisplayModePtr

-CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int id,

-	  int flags)

-{

-    CARD16 major;

-    VbeModeInfoBlock *mode;

-    DisplayModePtr pMode;

-    VbeModeInfoData *data;

-    Bool modeOK = FALSE;

-

-    major = (unsigned)(vbe->VESAVersion >> 8);

-

-    if ((mode = VBEGetModeInfo(pVbe, id)) == NULL)

-	return NULL;

-

-    /* Does the mode match the depth/bpp? */

-    /* Some BIOS's set BitsPerPixel to 15 instead of 16 for 15/16 */

-    if (VBE_MODE_USABLE(mode, flags) &&

-	((pScrn->bitsPerPixel == 1 && !VBE_MODE_COLOR(mode)) ||

-	 (mode->BitsPerPixel > 8 &&

-	  (mode->RedMaskSize + mode->GreenMaskSize +

-	   mode->BlueMaskSize) == pScrn->depth &&

-	  mode->BitsPerPixel == pScrn->bitsPerPixel) ||

-	 (mode->BitsPerPixel == 15 && pScrn->depth == 15) ||

-	 (mode->BitsPerPixel <= 8 &&

-	  mode->BitsPerPixel == pScrn->bitsPerPixel))) {

-	modeOK = TRUE;

-	xf86ErrorFVerb(DEBUG_VERB, "*");

-    }

-

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "Mode: %x (%dx%d)\n", id, mode->XResolution, mode->YResolution);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	ModeAttributes: 0x%x\n", mode->ModeAttributes);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	WinAAttributes: 0x%x\n", mode->WinAAttributes);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	WinBAttributes: 0x%x\n", mode->WinBAttributes);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	WinGranularity: %d\n", mode->WinGranularity);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	WinSize: %d\n", mode->WinSize);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	WinASegment: 0x%x\n", mode->WinASegment);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	WinBSegment: 0x%x\n", mode->WinBSegment);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	WinFuncPtr: 0x%lx\n", (unsigned long)mode->WinFuncPtr);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	BytesPerScanline: %d\n", mode->BytesPerScanline);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	XResolution: %d\n", mode->XResolution);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	YResolution: %d\n", mode->YResolution);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	XCharSize: %d\n", mode->XCharSize);

-    xf86ErrorFVerb(DEBUG_VERB,

-           "	YCharSize: %d\n", mode->YCharSize);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	NumberOfPlanes: %d\n", mode->NumberOfPlanes);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	BitsPerPixel: %d\n", mode->BitsPerPixel);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	NumberOfBanks: %d\n", mode->NumberOfBanks);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	MemoryModel: %d\n", mode->MemoryModel);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	BankSize: %d\n", mode->BankSize);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	NumberOfImages: %d\n", mode->NumberOfImages);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	RedMaskSize: %d\n", mode->RedMaskSize);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	RedFieldPosition: %d\n", mode->RedFieldPosition);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	GreenMaskSize: %d\n", mode->GreenMaskSize);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	GreenFieldPosition: %d\n", mode->GreenFieldPosition);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	BlueMaskSize: %d\n", mode->BlueMaskSize);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	BlueFieldPosition: %d\n", mode->BlueFieldPosition);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	RsvdMaskSize: %d\n", mode->RsvdMaskSize);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	RsvdFieldPosition: %d\n", mode->RsvdFieldPosition);

-    xf86ErrorFVerb(DEBUG_VERB,

-	    "	DirectColorModeInfo: %d\n", mode->DirectColorModeInfo);

-    if (major >= 2) {

-	xf86ErrorFVerb(DEBUG_VERB,

-		"	PhysBasePtr: 0x%lx\n",

-		(unsigned long)mode->PhysBasePtr);

-	if (major >= 3) {

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	LinBytesPerScanLine: %d\n", mode->LinBytesPerScanLine);

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	BnkNumberOfImagePages: %d\n", mode->BnkNumberOfImagePages);

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	LinNumberOfImagePages: %d\n", mode->LinNumberOfImagePages);

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	LinRedMaskSize: %d\n", mode->LinRedMaskSize);

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	LinRedFieldPosition: %d\n", mode->LinRedFieldPosition);

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	LinGreenMaskSize: %d\n", mode->LinGreenMaskSize);

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	LinGreenFieldPosition: %d\n", mode->LinGreenFieldPosition);

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	LinBlueMaskSize: %d\n", mode->LinBlueMaskSize);

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	LinBlueFieldPosition: %d\n", mode->LinBlueFieldPosition);

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	LinRsvdMaskSize: %d\n", mode->LinRsvdMaskSize);

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	LinRsvdFieldPosition: %d\n", mode->LinRsvdFieldPosition);

-	    xf86ErrorFVerb(DEBUG_VERB,

-		    "	MaxPixelClock: %ld\n", (unsigned long)mode->MaxPixelClock);

-	}

-    }

-

-    if (!modeOK) {

-	VBEFreeModeInfo(mode);

-	return NULL;

-    }

-    pMode = xnfcalloc(sizeof(DisplayModeRec), 1);

-

-    pMode->status = MODE_OK;

-    pMode->type = M_T_BUILTIN;

-

-    /* for adjust frame */

-    pMode->HDisplay = mode->XResolution;

-    pMode->VDisplay = mode->YResolution;

-

-    data = xnfcalloc(sizeof(VbeModeInfoData), 1);

-    data->mode = id;

-    data->data = mode;

-    pMode->PrivSize = sizeof(VbeModeInfoData);

-    pMode->Private = (INT32*)data;

-    pMode->next = NULL;

-    return pMode;

-}

-

-/*

- * Check the available BIOS modes, and extract those that match the

- * requirements into the modePool.  Note: modePool is a NULL-terminated

- * list.

- */

-

-DisplayModePtr

-VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe,

-	       int modeTypes)

-{

-    DisplayModePtr pMode, p = NULL, modePool = NULL;

-    int i = 0;

-

-    if (modeTypes & V_MODETYPE_VBE) {

-	while (vbe->VideoModePtr[i] != 0xffff) {

-	    int id = vbe->VideoModePtr[i++];

-

-	    if ((pMode = CheckMode(pScrn, pVbe, vbe, id, modeTypes)) != NULL) {

-		ModeStatus status = MODE_OK;

-

-		/* Check the mode against a specified virtual size (if any) */

-		if (pScrn->display->virtualX > 0 &&

-		    pMode->HDisplay > pScrn->display->virtualX) {

-		    status = MODE_VIRTUAL_X;

-		}

-		if (pScrn->display->virtualY > 0 &&

-		    pMode->VDisplay > pScrn->display->virtualY) {

-		    status = MODE_VIRTUAL_Y;

-		}

-		if (status != MODE_OK) {

-		     xf86DrvMsg(pScrn->scrnIndex, X_INFO,

-				"Not using mode \"%dx%d\" (%s)\n",

-				pMode->HDisplay, pMode->VDisplay,

-				xf86ModeStatusToString(status));

-		} else {

-		    if (p == NULL) {

-			modePool = pMode;

-		    } else {

-			p->next = pMode;

-		    }

-		    pMode->prev = NULL;

-		    p = pMode;

-		}

-	    }

-	}

-    }

-    if (modeTypes & V_MODETYPE_VGA) {

-	for (i = 0; i < 0x7F; i++) {

-	    if ((pMode = CheckMode(pScrn, pVbe, vbe, i, modeTypes)) != NULL) {

-		ModeStatus status = MODE_OK;

-

-		/* Check the mode against a specified virtual size (if any) */

-		if (pScrn->display->virtualX > 0 &&

-		    pMode->HDisplay > pScrn->display->virtualX) {

-		    status = MODE_VIRTUAL_X;

-		}

-		if (pScrn->display->virtualY > 0 &&

-		    pMode->VDisplay > pScrn->display->virtualY) {

-		    status = MODE_VIRTUAL_Y;

-		}

-		if (status != MODE_OK) {

-		     xf86DrvMsg(pScrn->scrnIndex, X_INFO,

-				"Not using mode \"%dx%d\" (%s)\n",

-				pMode->HDisplay, pMode->VDisplay,

-				xf86ModeStatusToString(status));

-		} else {

-		    if (p == NULL) {

-			modePool = pMode;

-		    } else {

-			p->next = pMode;

-		    }

-		    pMode->prev = NULL;

-		    p = pMode;

-		}

-	    }

-	}

-    }

-    return modePool;

-}

-

-void

-VBESetModeNames(DisplayModePtr pMode)

-{

-    if (!pMode)

-	return;

-

-    do {

-	if (!pMode->name) {

-	    /* Catch "bad" modes. */

-	    if (pMode->HDisplay > 10000 || pMode->HDisplay < 0 ||

-		pMode->VDisplay > 10000 || pMode->VDisplay < 0) {

-		pMode->name = strdup("BADMODE");

-	    } else {

-		XNFasprintf(&pMode->name, "%dx%d",

-			    pMode->HDisplay, pMode->VDisplay);

-	    }

-	}

-	pMode = pMode->next;

-    } while (pMode);

-}

-

-/*

- * Go through the monitor modes and selecting the best set of

- * parameters for each BIOS mode.  Note: This is only supported in

- * VBE version 3.0 or later.

- */

-void

-VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe)

-{

-    DisplayModePtr pMode;

-    VbeModeInfoData *data;

-

-    pMode = pScrn->modes;

-    do {

-	DisplayModePtr p, best = NULL;

-	ModeStatus status;

-

-	for (p = pScrn->monitor->Modes; p != NULL; p = p->next) {

-	    if ((p->HDisplay != pMode->HDisplay) ||

-		(p->VDisplay != pMode->VDisplay) ||

-		(p->Flags & (V_INTERLACE | V_DBLSCAN | V_CLKDIV2)))

-		continue;

-	    /* XXX could support the various V_ flags */

-	    status = xf86CheckModeForMonitor(p, pScrn->monitor);

-	    if (status != MODE_OK)

-		continue;

-	    if (!best || (p->Clock > best->Clock))

-		best = p;

-	}

-

-	if (best) {

-	    int clock;

-

-	    data = (VbeModeInfoData*)pMode->Private;

-	    pMode->HSync = (float)best->Clock * 1000.0 / best->HTotal + 0.5;

-	    pMode->VRefresh = pMode->HSync / best->VTotal + 0.5;

-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,

-		       "Attempting to use %dHz refresh for mode \"%s\" (%x)\n",

-		       (int)pMode->VRefresh, pMode->name, data->mode);

-	    data->block = calloc(sizeof(VbeCRTCInfoBlock), 1);

-	    data->block->HorizontalTotal = best->HTotal;

-	    data->block->HorizontalSyncStart = best->HSyncStart;

-	    data->block->HorizontalSyncEnd = best->HSyncEnd;

-	    data->block->VerticalTotal = best->VTotal;

-	    data->block->VerticalSyncStart = best->VSyncStart;

-	    data->block->VerticalSyncEnd = best->VSyncEnd;

-	    data->block->Flags = ((best->Flags & V_NHSYNC) ? CRTC_NHSYNC : 0) |

-				 ((best->Flags & V_NVSYNC) ? CRTC_NVSYNC : 0);

-	    data->block->PixelClock = best->Clock * 1000;

-	    /* XXX May not have this. */

-	    clock = VBEGetPixelClock(pVbe, data->mode, data->block->PixelClock);

-	    DebugF("Setting clock %.2fMHz, closest is %.2fMHz\n",

-		(double)data->block->PixelClock / 1000000.0, 

-		(double)clock / 1000000.0);

-	    if (clock)

-		data->block->PixelClock = clock;

-	    data->mode |= (1 << 11);

-	    data->block->RefreshRate = ((double)(data->block->PixelClock) /

-                       (double)(best->HTotal * best->VTotal)) * 100;

-	}

-	pMode = pMode->next;

-    } while (pMode != pScrn->modes);

-}

-

-/*

- * These wrappers are to allow (temporary) funtionality divergences.

- */

-int

-VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,

-		  char **modeNames, ClockRangePtr clockRanges,

-		  int *linePitches, int minPitch, int maxPitch, int pitchInc,

-		  int minHeight, int maxHeight, int virtualX, int virtualY,

-		  int apertureSize, LookupModeFlags strategy)

-{

-    return xf86ValidateModes(scrp, availModes, modeNames, clockRanges,

-			     linePitches, minPitch, maxPitch, pitchInc,

-			     minHeight, maxHeight, virtualX, virtualY,

-			     apertureSize, strategy);

-}

-

-void

-VBEPrintModes(ScrnInfoPtr scrp)

-{

-    xf86PrintModes(scrp);

-}

-

+#define DEBUG_VERB 2
+/*
+ * Copyright © 2002 David Dawes
+ *
+ * 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 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 AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the author(s) shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * the author(s).
+ *
+ * Authors: David Dawes <dawes@xfree86.org>
+ *
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#include "xf86.h"
+#include "vbe.h"
+#include "vbeModes.h"
+
+static int
+GetDepthFlag(vbeInfoPtr pVbe, int id)
+{
+    VbeModeInfoBlock *mode;
+    int bpp;
+
+    if ((mode = VBEGetModeInfo(pVbe, id)) == NULL)
+        return 0;
+
+    if (VBE_MODE_USABLE(mode, 0)) {
+        int depth;
+
+        if (VBE_MODE_COLOR(mode)) {
+            depth = mode->RedMaskSize + mode->GreenMaskSize +
+                mode->BlueMaskSize;
+        }
+        else {
+            depth = 1;
+        }
+        bpp = mode->BitsPerPixel;
+        VBEFreeModeInfo(mode);
+        mode = NULL;
+        switch (depth) {
+        case 1:
+            return V_DEPTH_1;
+        case 4:
+            return V_DEPTH_4;
+        case 8:
+            return V_DEPTH_8;
+        case 15:
+            return V_DEPTH_15;
+        case 16:
+            return V_DEPTH_16;
+        case 24:
+            switch (bpp) {
+            case 24:
+                return V_DEPTH_24_24;
+            case 32:
+                return V_DEPTH_24_32;
+            }
+        }
+    }
+    if (mode)
+        VBEFreeModeInfo(mode);
+    return 0;
+}
+
+/*
+ * Find supported mode depths.
+ */
+int
+VBEFindSupportedDepths(vbeInfoPtr pVbe, VbeInfoBlock * vbe, int *flags24,
+                       int modeTypes)
+{
+    int i = 0;
+    int depths = 0;
+
+    if (modeTypes & V_MODETYPE_VBE) {
+        while (vbe->VideoModePtr[i] != 0xffff) {
+            depths |= GetDepthFlag(pVbe, vbe->VideoModePtr[i++]);
+        }
+    }
+
+    /*
+     * XXX This possibly only works with VBE 3.0 and later.
+     */
+    if (modeTypes & V_MODETYPE_VGA) {
+        for (i = 0; i < 0x7F; i++) {
+            depths |= GetDepthFlag(pVbe, i);
+        }
+    }
+
+    if (flags24) {
+        if (depths & V_DEPTH_24_24)
+            *flags24 |= Support24bppFb;
+        if (depths & V_DEPTH_24_32)
+            *flags24 |= Support32bppFb;
+    }
+
+    return depths;
+}
+
+static DisplayModePtr
+CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock * vbe, int id,
+          int flags)
+{
+    CARD16 major;
+    VbeModeInfoBlock *mode;
+    DisplayModePtr pMode;
+    VbeModeInfoData *data;
+    Bool modeOK = FALSE;
+
+    major = (unsigned) (vbe->VESAVersion >> 8);
+
+    if ((mode = VBEGetModeInfo(pVbe, id)) == NULL)
+        return NULL;
+
+    /* Does the mode match the depth/bpp? */
+    /* Some BIOS's set BitsPerPixel to 15 instead of 16 for 15/16 */
+    if (VBE_MODE_USABLE(mode, flags) &&
+        ((pScrn->bitsPerPixel == 1 && !VBE_MODE_COLOR(mode)) ||
+         (mode->BitsPerPixel > 8 &&
+          (mode->RedMaskSize + mode->GreenMaskSize +
+           mode->BlueMaskSize) == pScrn->depth &&
+          mode->BitsPerPixel == pScrn->bitsPerPixel) ||
+         (mode->BitsPerPixel == 15 && pScrn->depth == 15) ||
+         (mode->BitsPerPixel <= 8 &&
+          mode->BitsPerPixel == pScrn->bitsPerPixel))) {
+        modeOK = TRUE;
+        xf86ErrorFVerb(DEBUG_VERB, "*");
+    }
+
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "Mode: %x (%dx%d)\n", id, mode->XResolution,
+                   mode->YResolution);
+    xf86ErrorFVerb(DEBUG_VERB, "	ModeAttributes: 0x%x\n",
+                   mode->ModeAttributes);
+    xf86ErrorFVerb(DEBUG_VERB, "	WinAAttributes: 0x%x\n",
+                   mode->WinAAttributes);
+    xf86ErrorFVerb(DEBUG_VERB, "	WinBAttributes: 0x%x\n",
+                   mode->WinBAttributes);
+    xf86ErrorFVerb(DEBUG_VERB, "	WinGranularity: %d\n",
+                   mode->WinGranularity);
+    xf86ErrorFVerb(DEBUG_VERB, "	WinSize: %d\n", mode->WinSize);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	WinASegment: 0x%x\n", mode->WinASegment);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	WinBSegment: 0x%x\n", mode->WinBSegment);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	WinFuncPtr: 0x%lx\n", (unsigned long) mode->WinFuncPtr);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	BytesPerScanline: %d\n", mode->BytesPerScanline);
+    xf86ErrorFVerb(DEBUG_VERB, "	XResolution: %d\n", mode->XResolution);
+    xf86ErrorFVerb(DEBUG_VERB, "	YResolution: %d\n", mode->YResolution);
+    xf86ErrorFVerb(DEBUG_VERB, "	XCharSize: %d\n", mode->XCharSize);
+    xf86ErrorFVerb(DEBUG_VERB, "	YCharSize: %d\n", mode->YCharSize);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	NumberOfPlanes: %d\n", mode->NumberOfPlanes);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	BitsPerPixel: %d\n", mode->BitsPerPixel);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	NumberOfBanks: %d\n", mode->NumberOfBanks);
+    xf86ErrorFVerb(DEBUG_VERB, "	MemoryModel: %d\n", mode->MemoryModel);
+    xf86ErrorFVerb(DEBUG_VERB, "	BankSize: %d\n", mode->BankSize);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	NumberOfImages: %d\n", mode->NumberOfImages);
+    xf86ErrorFVerb(DEBUG_VERB, "	RedMaskSize: %d\n", mode->RedMaskSize);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	RedFieldPosition: %d\n", mode->RedFieldPosition);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	GreenMaskSize: %d\n", mode->GreenMaskSize);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	GreenFieldPosition: %d\n", mode->GreenFieldPosition);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	BlueMaskSize: %d\n", mode->BlueMaskSize);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	BlueFieldPosition: %d\n", mode->BlueFieldPosition);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	RsvdMaskSize: %d\n", mode->RsvdMaskSize);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	RsvdFieldPosition: %d\n", mode->RsvdFieldPosition);
+    xf86ErrorFVerb(DEBUG_VERB,
+                   "	DirectColorModeInfo: %d\n", mode->DirectColorModeInfo);
+    if (major >= 2) {
+        xf86ErrorFVerb(DEBUG_VERB,
+                       "	PhysBasePtr: 0x%lx\n",
+                       (unsigned long) mode->PhysBasePtr);
+        if (major >= 3) {
+            xf86ErrorFVerb(DEBUG_VERB,
+                           "	LinBytesPerScanLine: %d\n",
+                           mode->LinBytesPerScanLine);
+            xf86ErrorFVerb(DEBUG_VERB, "	BnkNumberOfImagePages: %d\n",
+                           mode->BnkNumberOfImagePages);
+            xf86ErrorFVerb(DEBUG_VERB, "	LinNumberOfImagePages: %d\n",
+                           mode->LinNumberOfImagePages);
+            xf86ErrorFVerb(DEBUG_VERB, "	LinRedMaskSize: %d\n",
+                           mode->LinRedMaskSize);
+            xf86ErrorFVerb(DEBUG_VERB, "	LinRedFieldPosition: %d\n",
+                           mode->LinRedFieldPosition);
+            xf86ErrorFVerb(DEBUG_VERB, "	LinGreenMaskSize: %d\n",
+                           mode->LinGreenMaskSize);
+            xf86ErrorFVerb(DEBUG_VERB, "	LinGreenFieldPosition: %d\n",
+                           mode->LinGreenFieldPosition);
+            xf86ErrorFVerb(DEBUG_VERB, "	LinBlueMaskSize: %d\n",
+                           mode->LinBlueMaskSize);
+            xf86ErrorFVerb(DEBUG_VERB, "	LinBlueFieldPosition: %d\n",
+                           mode->LinBlueFieldPosition);
+            xf86ErrorFVerb(DEBUG_VERB, "	LinRsvdMaskSize: %d\n",
+                           mode->LinRsvdMaskSize);
+            xf86ErrorFVerb(DEBUG_VERB, "	LinRsvdFieldPosition: %d\n",
+                           mode->LinRsvdFieldPosition);
+            xf86ErrorFVerb(DEBUG_VERB, "	MaxPixelClock: %ld\n",
+                           (unsigned long) mode->MaxPixelClock);
+        }
+    }
+
+    if (!modeOK) {
+        VBEFreeModeInfo(mode);
+        return NULL;
+    }
+    pMode = xnfcalloc(sizeof(DisplayModeRec), 1);
+
+    pMode->status = MODE_OK;
+    pMode->type = M_T_BUILTIN;
+
+    /* for adjust frame */
+    pMode->HDisplay = mode->XResolution;
+    pMode->VDisplay = mode->YResolution;
+
+    data = xnfcalloc(sizeof(VbeModeInfoData), 1);
+    data->mode = id;
+    data->data = mode;
+    pMode->PrivSize = sizeof(VbeModeInfoData);
+    pMode->Private = (INT32 *) data;
+    pMode->next = NULL;
+    return pMode;
+}
+
+/*
+ * Check the available BIOS modes, and extract those that match the
+ * requirements into the modePool.  Note: modePool is a NULL-terminated
+ * list.
+ */
+
+DisplayModePtr
+VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock * vbe,
+               int modeTypes)
+{
+    DisplayModePtr pMode, p = NULL, modePool = NULL;
+    int i = 0;
+
+    if (modeTypes & V_MODETYPE_VBE) {
+        while (vbe->VideoModePtr[i] != 0xffff) {
+            int id = vbe->VideoModePtr[i++];
+
+            if ((pMode = CheckMode(pScrn, pVbe, vbe, id, modeTypes)) != NULL) {
+                ModeStatus status = MODE_OK;
+
+                /* Check the mode against a specified virtual size (if any) */
+                if (pScrn->display->virtualX > 0 &&
+                    pMode->HDisplay > pScrn->display->virtualX) {
+                    status = MODE_VIRTUAL_X;
+                }
+                if (pScrn->display->virtualY > 0 &&
+                    pMode->VDisplay > pScrn->display->virtualY) {
+                    status = MODE_VIRTUAL_Y;
+                }
+                if (status != MODE_OK) {
+                    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                               "Not using mode \"%dx%d\" (%s)\n",
+                               pMode->HDisplay, pMode->VDisplay,
+                               xf86ModeStatusToString(status));
+                }
+                else {
+                    if (p == NULL) {
+                        modePool = pMode;
+                    }
+                    else {
+                        p->next = pMode;
+                    }
+                    pMode->prev = NULL;
+                    p = pMode;
+                }
+            }
+        }
+    }
+    if (modeTypes & V_MODETYPE_VGA) {
+        for (i = 0; i < 0x7F; i++) {
+            if ((pMode = CheckMode(pScrn, pVbe, vbe, i, modeTypes)) != NULL) {
+                ModeStatus status = MODE_OK;
+
+                /* Check the mode against a specified virtual size (if any) */
+                if (pScrn->display->virtualX > 0 &&
+                    pMode->HDisplay > pScrn->display->virtualX) {
+                    status = MODE_VIRTUAL_X;
+                }
+                if (pScrn->display->virtualY > 0 &&
+                    pMode->VDisplay > pScrn->display->virtualY) {
+                    status = MODE_VIRTUAL_Y;
+                }
+                if (status != MODE_OK) {
+                    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                               "Not using mode \"%dx%d\" (%s)\n",
+                               pMode->HDisplay, pMode->VDisplay,
+                               xf86ModeStatusToString(status));
+                }
+                else {
+                    if (p == NULL) {
+                        modePool = pMode;
+                    }
+                    else {
+                        p->next = pMode;
+                    }
+                    pMode->prev = NULL;
+                    p = pMode;
+                }
+            }
+        }
+    }
+    return modePool;
+}
+
+void
+VBESetModeNames(DisplayModePtr pMode)
+{
+    if (!pMode)
+        return;
+
+    do {
+        if (!pMode->name) {
+            /* Catch "bad" modes. */
+            if (pMode->HDisplay > 10000 || pMode->HDisplay < 0 ||
+                pMode->VDisplay > 10000 || pMode->VDisplay < 0) {
+                pMode->name = strdup("BADMODE");
+            }
+            else {
+                XNFasprintf(&pMode->name, "%dx%d",
+                            pMode->HDisplay, pMode->VDisplay);
+            }
+        }
+        pMode = pMode->next;
+    } while (pMode);
+}
+
+/*
+ * Go through the monitor modes and selecting the best set of
+ * parameters for each BIOS mode.  Note: This is only supported in
+ * VBE version 3.0 or later.
+ */
+void
+VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe)
+{
+    DisplayModePtr pMode;
+    VbeModeInfoData *data;
+
+    pMode = pScrn->modes;
+    do {
+        DisplayModePtr p, best = NULL;
+        ModeStatus status;
+
+        for (p = pScrn->monitor->Modes; p != NULL; p = p->next) {
+            if ((p->HDisplay != pMode->HDisplay) ||
+                (p->VDisplay != pMode->VDisplay) ||
+                (p->Flags & (V_INTERLACE | V_DBLSCAN | V_CLKDIV2)))
+                continue;
+            /* XXX could support the various V_ flags */
+            status = xf86CheckModeForMonitor(p, pScrn->monitor);
+            if (status != MODE_OK)
+                continue;
+            if (!best || (p->Clock > best->Clock))
+                best = p;
+        }
+
+        if (best) {
+            int clock;
+
+            data = (VbeModeInfoData *) pMode->Private;
+            pMode->HSync = (float) best->Clock * 1000.0 / best->HTotal + 0.5;
+            pMode->VRefresh = pMode->HSync / best->VTotal + 0.5;
+            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                       "Attempting to use %dHz refresh for mode \"%s\" (%x)\n",
+                       (int) pMode->VRefresh, pMode->name, data->mode);
+            data->block = calloc(sizeof(VbeCRTCInfoBlock), 1);
+            data->block->HorizontalTotal = best->HTotal;
+            data->block->HorizontalSyncStart = best->HSyncStart;
+            data->block->HorizontalSyncEnd = best->HSyncEnd;
+            data->block->VerticalTotal = best->VTotal;
+            data->block->VerticalSyncStart = best->VSyncStart;
+            data->block->VerticalSyncEnd = best->VSyncEnd;
+            data->block->Flags = ((best->Flags & V_NHSYNC) ? CRTC_NHSYNC : 0) |
+                ((best->Flags & V_NVSYNC) ? CRTC_NVSYNC : 0);
+            data->block->PixelClock = best->Clock * 1000;
+            /* XXX May not have this. */
+            clock = VBEGetPixelClock(pVbe, data->mode, data->block->PixelClock);
+            DebugF("Setting clock %.2fMHz, closest is %.2fMHz\n",
+                   (double) data->block->PixelClock / 1000000.0,
+                   (double) clock / 1000000.0);
+            if (clock)
+                data->block->PixelClock = clock;
+            data->mode |= (1 << 11);
+            data->block->RefreshRate = ((double) (data->block->PixelClock) /
+                                        (double) (best->HTotal *
+                                                  best->VTotal)) * 100;
+        }
+        pMode = pMode->next;
+    } while (pMode != pScrn->modes);
+}
+
+/*
+ * These wrappers are to allow (temporary) funtionality divergences.
+ */
+int
+VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
+                 char **modeNames, ClockRangePtr clockRanges,
+                 int *linePitches, int minPitch, int maxPitch, int pitchInc,
+                 int minHeight, int maxHeight, int virtualX, int virtualY,
+                 int apertureSize, LookupModeFlags strategy)
+{
+    return xf86ValidateModes(scrp, availModes, modeNames, clockRanges,
+                             linePitches, minPitch, maxPitch, pitchInc,
+                             minHeight, maxHeight, virtualX, virtualY,
+                             apertureSize, strategy);
+}
+
+void
+VBEPrintModes(ScrnInfoPtr scrp)
+{
+    xf86PrintModes(scrp);
+}
diff --git a/xorg-server/hw/xfree86/vbe/vbeModes.h b/xorg-server/hw/xfree86/vbe/vbeModes.h
index 447798709..affd5b639 100644
--- a/xorg-server/hw/xfree86/vbe/vbeModes.h
+++ b/xorg-server/hw/xfree86/vbe/vbeModes.h
@@ -62,29 +62,33 @@ typedef struct _VbeModeInfoData {
 				 (f & V_MODETYPE_BAD)) && \
 				VBE_MODE_GRAPHICS(m) && \
 				(VBE_MODE_VGA(m) || VBE_MODE_LINEAR(m))
-				
+
 #define V_MODETYPE_VBE		0x01
 #define V_MODETYPE_VGA		0x02
 #define V_MODETYPE_BAD		0x04
 
-extern _X_EXPORT int VBEFindSupportedDepths(vbeInfoPtr pVbe, VbeInfoBlock *vbe,
-				  int *flags24, int modeTypes);
-extern _X_EXPORT DisplayModePtr VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe,
-					VbeInfoBlock *vbe, int modeTypes);
+extern _X_EXPORT int VBEFindSupportedDepths(vbeInfoPtr pVbe, VbeInfoBlock * vbe,
+                                            int *flags24, int modeTypes);
+extern _X_EXPORT DisplayModePtr VBEGetModePool(ScrnInfoPtr pScrn,
+                                               vbeInfoPtr pVbe,
+                                               VbeInfoBlock * vbe,
+                                               int modeTypes);
 extern _X_EXPORT void VBESetModeNames(DisplayModePtr pMode);
 extern _X_EXPORT void VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe);
 
-
 /*
  * Note: These are alternatives to the standard helpers.  They should
  * usually just wrap the standard helpers.
  */
-extern _X_EXPORT int VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
-			    char **modeNames, ClockRangePtr clockRanges,
-			    int *linePitches, int minPitch, int maxPitch,
-			    int pitchInc, int minHeight, int maxHeight,
-			    int virtualX, int virtualY, int apertureSize,
-			    LookupModeFlags strategy);
+extern _X_EXPORT int VBEValidateModes(ScrnInfoPtr scrp,
+                                      DisplayModePtr availModes,
+                                      char **modeNames,
+                                      ClockRangePtr clockRanges,
+                                      int *linePitches, int minPitch,
+                                      int maxPitch, int pitchInc, int minHeight,
+                                      int maxHeight, int virtualX, int virtualY,
+                                      int apertureSize,
+                                      LookupModeFlags strategy);
 extern _X_EXPORT void VBEPrintModes(ScrnInfoPtr scrp);
 
-#endif /* VBE_MODES_H */
+#endif                          /* VBE_MODES_H */
diff --git a/xorg-server/hw/xfree86/vbe/vbe_module.c b/xorg-server/hw/xfree86/vbe/vbe_module.c
index 5aba16f51..3fb86956e 100644
--- a/xorg-server/hw/xfree86/vbe/vbe_module.c
+++ b/xorg-server/hw/xfree86/vbe/vbe_module.c
@@ -1,23 +1,22 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include "xf86str.h"

-#include "vbe.h"

-

-static XF86ModuleVersionInfo vbeVersRec =

-{

-    "vbe",

-    MODULEVENDORSTRING,

-    MODINFOSTRING1,

-    MODINFOSTRING2,

-    XORG_VERSION_CURRENT,

-    1, 1, 0,

-    ABI_CLASS_VIDEODRV,		/* needs the video driver ABI */

-    ABI_VIDEODRV_VERSION,

-    MOD_CLASS_NONE,

-    {0,0,0,0}

-};

-

-_X_EXPORT XF86ModuleData vbeModuleData = { &vbeVersRec, NULL, NULL };

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86str.h"
+#include "vbe.h"
+
+static XF86ModuleVersionInfo vbeVersRec = {
+    "vbe",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 1, 0,
+    ABI_CLASS_VIDEODRV,         /* needs the video driver ABI */
+    ABI_VIDEODRV_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
+};
+
+_X_EXPORT XF86ModuleData vbeModuleData = { &vbeVersRec, NULL, NULL };
diff --git a/xorg-server/hw/xfree86/vgahw/vgaCmap.c b/xorg-server/hw/xfree86/vgahw/vgaCmap.c
index a65bb5e86..0cfabc5d6 100644
--- a/xorg-server/hw/xfree86/vgahw/vgaCmap.c
+++ b/xorg-server/hw/xfree86/vgahw/vgaCmap.c
@@ -1,301 +1,279 @@
-/*

- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.

- *

- * 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 Thomas Roell not be used in

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

- * specific, written prior permission.  Thomas Roell makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL THOMAS ROELL 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_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "windowstr.h"

-#include "compiler.h"

-#include "mipointer.h"

-#include "micmap.h"

-

-#include "xf86.h"

-#include "vgaHW.h"

-

-#include <X11/extensions/xf86dgaproto.h>

-#include "dgaproc.h"

-

-

-#define NOMAPYET        (ColormapPtr) 0

-

-int

-vgaListInstalledColormaps(pScreen, pmaps)

-     ScreenPtr	pScreen;

-     Colormap	*pmaps;

-{

-  /* By the time we are processing requests, we can guarantee that there

-   * is always a colormap installed */

-  

-  *pmaps = GetInstalledmiColormap(pScreen)->mid;

-  return 1;

-}

-

-int

-vgaGetInstalledColormaps(pScreen, pmaps)

-     ScreenPtr		pScreen;

-     ColormapPtr	*pmaps;

-{

-  /* By the time we are processing requests, we can guarantee that there

-   * is always a colormap installed */

-  

-  *pmaps = GetInstalledmiColormap(pScreen);

-  return 1;

-}

-

-int vgaCheckColorMap(ColormapPtr pmap)

-{

-  return (pmap != GetInstalledmiColormap(pmap->pScreen));

-}

-

-

-void

-vgaStoreColors(pmap, ndef, pdefs)

-     ColormapPtr	pmap;

-     int		ndef;

-     xColorItem	        *pdefs;

-{

-    int		i;

-    unsigned char *cmap, *tmp = NULL;

-    xColorItem	directDefs[256];

-    Bool          new_overscan = FALSE;

-    Bool	writeColormap;

-

-    /* This can get called before the ScrnInfoRec is installed so we

-       can't rely on getting it with XF86SCRNINFO() */

-    int scrnIndex = pmap->pScreen->myNum;

-    ScrnInfoPtr scrninfp = xf86Screens[scrnIndex];

-    vgaHWPtr hwp = VGAHWPTR(scrninfp);

-    

-    unsigned char overscan = hwp->ModeReg.Attribute[OVERSCAN];

-    unsigned char tmp_overscan = 0;

-

-    if (vgaCheckColorMap(pmap))

-        return;

-

-    if ((pmap->pVisual->class | DynamicClass) == DirectColor)

-    {

-        ndef = miExpandDirectColors (pmap, ndef, pdefs, directDefs);

-        pdefs = directDefs;

-    }

-    

-    writeColormap = scrninfp->vtSema;

-    if (DGAAvailable(scrnIndex))

-    {

-	writeColormap = writeColormap ||

-			(DGAGetDirectMode(scrnIndex) &&

-			 !(DGAGetFlags(scrnIndex) & XF86DGADirectColormap)) ||

-			(DGAGetFlags(scrnIndex) & XF86DGAHasColormap);

-    }

-

-    if (writeColormap)

-	hwp->enablePalette(hwp);

-

-    for(i = 0; i < ndef; i++)

-    {

-        if (pdefs[i].pixel == overscan)

-	{

-	    new_overscan = TRUE;

-	}

-        cmap = &(hwp->ModeReg.DAC[pdefs[i].pixel*3]);

-	if (scrninfp->rgbBits == 8) {

-            cmap[0] = pdefs[i].red   >> 8;

-            cmap[1] = pdefs[i].green >> 8;

-            cmap[2] = pdefs[i].blue  >> 8;

-        }

-        else {

-            cmap[0] = pdefs[i].red   >> 10;

-            cmap[1] = pdefs[i].green >> 10;

-            cmap[2] = pdefs[i].blue  >> 10;

-        }

-#if 0

-	if (clgd6225Lcd)

-	{

-		/* The LCD doesn't like white */

-		if (cmap[0] == 63) cmap[0]= 62;

-		if (cmap[1] == 63) cmap[1]= 62;

-		if (cmap[2] == 63) cmap[2]= 62;

-	}

-#endif

-

-        if (writeColormap)

-	{

-	    if (hwp->ShowOverscan && i == 255)

-		continue;

-	    hwp->writeDacWriteAddr(hwp, pdefs[i].pixel);

-	    DACDelay(hwp);

-	    hwp->writeDacData(hwp, cmap[0]);

-	    DACDelay(hwp);

-	    hwp->writeDacData(hwp, cmap[1]);

-	    DACDelay(hwp);

-	    hwp->writeDacData(hwp, cmap[2]);

-	    DACDelay(hwp);

-	}

-    }

-    if (new_overscan && !hwp->ShowOverscan)

-    {

-	new_overscan = FALSE;

-        for(i = 0; i < ndef; i++)

-        {

-            if (pdefs[i].pixel == overscan)

-	    {

-	        if ((pdefs[i].red != 0) || 

-	            (pdefs[i].green != 0) || 

-	            (pdefs[i].blue != 0))

-	        {

-	            new_overscan = TRUE;

-		    tmp_overscan = overscan;

-        	    tmp = &(hwp->ModeReg.DAC[pdefs[i].pixel*3]);

-	        }

-	        break;

-	    }

-        }

-        if (new_overscan)

-        {

-            /*

-             * Find a black pixel, or the nearest match.

-             */

-            for (i=255; i >= 0; i--)

-	    {

-                cmap = &(hwp->ModeReg.DAC[i*3]);

-	        if ((cmap[0] == 0) && (cmap[1] == 0) && (cmap[2] == 0))

-	        {

-	            overscan = i;

-	            break;

-	        }

-	        else

-	        {

-	            if ((cmap[0] < tmp[0]) && 

-		        (cmap[1] < tmp[1]) && (cmap[2] < tmp[2]))

-	            {

-		        tmp = cmap;

-		        tmp_overscan = i;

-	            }

-	        }

-	    }

-	    if (i < 0)

-	    {

-	        overscan = tmp_overscan;

-	    }

-	    hwp->ModeReg.Attribute[OVERSCAN] = overscan;

-            if (writeColormap)

-	    {

-	      hwp->writeAttr(hwp, OVERSCAN, overscan);

-	    }

-        }

-    }

-

-    if (writeColormap)

-	hwp->disablePalette(hwp);

-}

-

-

-void

-vgaInstallColormap(pmap)

-     ColormapPtr	pmap;

-{

-  ColormapPtr oldmap = GetInstalledmiColormap(pmap->pScreen);

-  int         entries;

-  Pixel *     ppix;

-  xrgb *      prgb;

-  xColorItem *defs;

-  int         i;

-

-

-  if (pmap == oldmap)

-    return;

-

-  if ((pmap->pVisual->class | DynamicClass) == DirectColor)

-    entries = (pmap->pVisual->redMask |

-	       pmap->pVisual->greenMask |

-	       pmap->pVisual->blueMask) + 1;

-  else

-    entries = pmap->pVisual->ColormapEntries;

-

-  ppix = (Pixel *)malloc( entries * sizeof(Pixel));

-  prgb = (xrgb *)malloc( entries * sizeof(xrgb));

-  defs = (xColorItem *)malloc(entries * sizeof(xColorItem));

-

-  if ( oldmap != NOMAPYET)

-    WalkTree( pmap->pScreen, TellLostMap, &oldmap->mid);

-

-  SetInstalledmiColormap(pmap->pScreen, pmap);

-

-  for ( i=0; i<entries; i++) ppix[i] = i;

-

-  QueryColors(pmap, entries, ppix, prgb, serverClient);

-

-  for ( i=0; i<entries; i++) /* convert xrgbs to xColorItems */

-    {

-      defs[i].pixel = ppix[i];

-      defs[i].red = prgb[i].red;

-      defs[i].green = prgb[i].green;

-      defs[i].blue = prgb[i].blue;

-      defs[i].flags =  DoRed|DoGreen|DoBlue;

-    }

-  pmap->pScreen->StoreColors(pmap, entries, defs);

-

-  WalkTree(pmap->pScreen, TellGainedMap, &pmap->mid);

-  

-  free(ppix);

-  free(prgb);

-  free(defs);

-}

-

-

-void

-vgaUninstallColormap(pmap)

-     ColormapPtr pmap;

-{

-

-  ColormapPtr defColormap;

-  

-  if ( pmap != GetInstalledmiColormap(pmap->pScreen))

-    return;

-

-  dixLookupResourceByType((pointer *)&defColormap, pmap->pScreen->defColormap,

-			  RT_COLORMAP, serverClient, DixInstallAccess);

-

-  if (defColormap == GetInstalledmiColormap(pmap->pScreen))

-    return;

-

-  (*pmap->pScreen->InstallColormap) (defColormap);

-}

-

-

-void

-vgaHandleColormaps(ScreenPtr pScreen, ScrnInfoPtr scrnp)

-{

-  if (scrnp->bitsPerPixel > 1) {

-     if (scrnp->bitsPerPixel <= 8) { /* For 8bpp SVGA and VGA16 */

-        pScreen->InstallColormap = vgaInstallColormap;

-        pScreen->UninstallColormap = vgaUninstallColormap;

-        pScreen->ListInstalledColormaps = vgaListInstalledColormaps;

-        pScreen->StoreColors = vgaStoreColors;

-    }

-  }

-}

-

+/*
+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+ *
+ * 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 Thomas Roell not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Thomas Roell makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THOMAS ROELL 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_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "windowstr.h"
+#include "compiler.h"
+#include "mipointer.h"
+#include "micmap.h"
+
+#include "xf86.h"
+#include "vgaHW.h"
+
+#include <X11/extensions/xf86dgaproto.h>
+#include "dgaproc.h"
+
+#define NOMAPYET        (ColormapPtr) 0
+
+int
+vgaListInstalledColormaps(pScreen, pmaps)
+ScreenPtr pScreen;
+Colormap *pmaps;
+{
+    /* By the time we are processing requests, we can guarantee that there
+     * is always a colormap installed */
+
+    *pmaps = GetInstalledmiColormap(pScreen)->mid;
+    return 1;
+}
+
+int
+vgaGetInstalledColormaps(pScreen, pmaps)
+ScreenPtr pScreen;
+ColormapPtr *pmaps;
+{
+    /* By the time we are processing requests, we can guarantee that there
+     * is always a colormap installed */
+
+    *pmaps = GetInstalledmiColormap(pScreen);
+    return 1;
+}
+
+int
+vgaCheckColorMap(ColormapPtr pmap)
+{
+    return (pmap != GetInstalledmiColormap(pmap->pScreen));
+}
+
+void
+vgaStoreColors(pmap, ndef, pdefs)
+ColormapPtr pmap;
+int ndef;
+xColorItem *pdefs;
+{
+    int i;
+    unsigned char *cmap, *tmp = NULL;
+    xColorItem directDefs[256];
+    Bool new_overscan = FALSE;
+    Bool writeColormap;
+
+    /* This can get called before the ScrnInfoRec is installed so we
+       can't rely on getting it with XF86SCRNINFO() */
+    int scrnIndex = pmap->pScreen->myNum;
+    ScrnInfoPtr scrninfp = xf86Screens[scrnIndex];
+    vgaHWPtr hwp = VGAHWPTR(scrninfp);
+
+    unsigned char overscan = hwp->ModeReg.Attribute[OVERSCAN];
+    unsigned char tmp_overscan = 0;
+
+    if (vgaCheckColorMap(pmap))
+        return;
+
+    if ((pmap->pVisual->class | DynamicClass) == DirectColor) {
+        ndef = miExpandDirectColors(pmap, ndef, pdefs, directDefs);
+        pdefs = directDefs;
+    }
+
+    writeColormap = scrninfp->vtSema;
+    if (DGAAvailable(scrnIndex)) {
+        writeColormap = writeColormap ||
+            (DGAGetDirectMode(scrnIndex) &&
+             !(DGAGetFlags(scrnIndex) & XF86DGADirectColormap)) ||
+            (DGAGetFlags(scrnIndex) & XF86DGAHasColormap);
+    }
+
+    if (writeColormap)
+        hwp->enablePalette(hwp);
+
+    for (i = 0; i < ndef; i++) {
+        if (pdefs[i].pixel == overscan) {
+            new_overscan = TRUE;
+        }
+        cmap = &(hwp->ModeReg.DAC[pdefs[i].pixel * 3]);
+        if (scrninfp->rgbBits == 8) {
+            cmap[0] = pdefs[i].red >> 8;
+            cmap[1] = pdefs[i].green >> 8;
+            cmap[2] = pdefs[i].blue >> 8;
+        }
+        else {
+            cmap[0] = pdefs[i].red >> 10;
+            cmap[1] = pdefs[i].green >> 10;
+            cmap[2] = pdefs[i].blue >> 10;
+        }
+#if 0
+        if (clgd6225Lcd) {
+            /* The LCD doesn't like white */
+            if (cmap[0] == 63)
+                cmap[0] = 62;
+            if (cmap[1] == 63)
+                cmap[1] = 62;
+            if (cmap[2] == 63)
+                cmap[2] = 62;
+        }
+#endif
+
+        if (writeColormap) {
+            if (hwp->ShowOverscan && i == 255)
+                continue;
+            hwp->writeDacWriteAddr(hwp, pdefs[i].pixel);
+            DACDelay(hwp);
+            hwp->writeDacData(hwp, cmap[0]);
+            DACDelay(hwp);
+            hwp->writeDacData(hwp, cmap[1]);
+            DACDelay(hwp);
+            hwp->writeDacData(hwp, cmap[2]);
+            DACDelay(hwp);
+        }
+    }
+    if (new_overscan && !hwp->ShowOverscan) {
+        new_overscan = FALSE;
+        for (i = 0; i < ndef; i++) {
+            if (pdefs[i].pixel == overscan) {
+                if ((pdefs[i].red != 0) ||
+                    (pdefs[i].green != 0) || (pdefs[i].blue != 0)) {
+                    new_overscan = TRUE;
+                    tmp_overscan = overscan;
+                    tmp = &(hwp->ModeReg.DAC[pdefs[i].pixel * 3]);
+                }
+                break;
+            }
+        }
+        if (new_overscan) {
+            /*
+             * Find a black pixel, or the nearest match.
+             */
+            for (i = 255; i >= 0; i--) {
+                cmap = &(hwp->ModeReg.DAC[i * 3]);
+                if ((cmap[0] == 0) && (cmap[1] == 0) && (cmap[2] == 0)) {
+                    overscan = i;
+                    break;
+                }
+                else {
+                    if ((cmap[0] < tmp[0]) &&
+                        (cmap[1] < tmp[1]) && (cmap[2] < tmp[2])) {
+                        tmp = cmap;
+                        tmp_overscan = i;
+                    }
+                }
+            }
+            if (i < 0) {
+                overscan = tmp_overscan;
+            }
+            hwp->ModeReg.Attribute[OVERSCAN] = overscan;
+            if (writeColormap) {
+                hwp->writeAttr(hwp, OVERSCAN, overscan);
+            }
+        }
+    }
+
+    if (writeColormap)
+        hwp->disablePalette(hwp);
+}
+
+void
+vgaInstallColormap(pmap)
+ColormapPtr pmap;
+{
+    ColormapPtr oldmap = GetInstalledmiColormap(pmap->pScreen);
+    int entries;
+    Pixel *ppix;
+    xrgb *prgb;
+    xColorItem *defs;
+    int i;
+
+    if (pmap == oldmap)
+        return;
+
+    if ((pmap->pVisual->class | DynamicClass) == DirectColor)
+        entries = (pmap->pVisual->redMask |
+                   pmap->pVisual->greenMask | pmap->pVisual->blueMask) + 1;
+    else
+        entries = pmap->pVisual->ColormapEntries;
+
+    ppix = (Pixel *) malloc(entries * sizeof(Pixel));
+    prgb = (xrgb *) malloc(entries * sizeof(xrgb));
+    defs = (xColorItem *) malloc(entries * sizeof(xColorItem));
+
+    if (oldmap != NOMAPYET)
+        WalkTree(pmap->pScreen, TellLostMap, &oldmap->mid);
+
+    SetInstalledmiColormap(pmap->pScreen, pmap);
+
+    for (i = 0; i < entries; i++)
+        ppix[i] = i;
+
+    QueryColors(pmap, entries, ppix, prgb, serverClient);
+
+    for (i = 0; i < entries; i++) {     /* convert xrgbs to xColorItems */
+        defs[i].pixel = ppix[i];
+        defs[i].red = prgb[i].red;
+        defs[i].green = prgb[i].green;
+        defs[i].blue = prgb[i].blue;
+        defs[i].flags = DoRed | DoGreen | DoBlue;
+    }
+    pmap->pScreen->StoreColors(pmap, entries, defs);
+
+    WalkTree(pmap->pScreen, TellGainedMap, &pmap->mid);
+
+    free(ppix);
+    free(prgb);
+    free(defs);
+}
+
+void
+vgaUninstallColormap(pmap)
+ColormapPtr pmap;
+{
+
+    ColormapPtr defColormap;
+
+    if (pmap != GetInstalledmiColormap(pmap->pScreen))
+        return;
+
+    dixLookupResourceByType((pointer *) &defColormap,
+                            pmap->pScreen->defColormap, RT_COLORMAP,
+                            serverClient, DixInstallAccess);
+
+    if (defColormap == GetInstalledmiColormap(pmap->pScreen))
+        return;
+
+    (*pmap->pScreen->InstallColormap) (defColormap);
+}
+
+void
+vgaHandleColormaps(ScreenPtr pScreen, ScrnInfoPtr scrnp)
+{
+    if (scrnp->bitsPerPixel > 1) {
+        if (scrnp->bitsPerPixel <= 8) { /* For 8bpp SVGA and VGA16 */
+            pScreen->InstallColormap = vgaInstallColormap;
+            pScreen->UninstallColormap = vgaUninstallColormap;
+            pScreen->ListInstalledColormaps = vgaListInstalledColormaps;
+            pScreen->StoreColors = vgaStoreColors;
+        }
+    }
+}
diff --git a/xorg-server/hw/xfree86/vgahw/vgaHW.c b/xorg-server/hw/xfree86/vgahw/vgaHW.c
index 4036a01f5..e044682c7 100644
--- a/xorg-server/hw/xfree86/vgahw/vgaHW.c
+++ b/xorg-server/hw/xfree86/vgahw/vgaHW.c
@@ -75,7 +75,6 @@
 #define BLACK_VALUE 0x00
 #define OVERSCAN_VALUE 0x01
 
-
 /* Use a private definition of this here */
 #undef VGAHWPTR
 #define VGAHWPTRLVAL(p) (p)->privates[vgaHWPrivateIndex].ptr
@@ -88,74 +87,73 @@ static int vgaHWPrivateIndex = -1;
 #ifdef NEED_SAVED_CMAP
 /* This default colourmap is used only when it can't be read from the VGA */
 
-static CARD8 defaultDAC[768] =
-{
-     0,  0,  0,    0,  0, 42,    0, 42,  0,    0, 42, 42,
-    42,  0,  0,   42,  0, 42,   42, 21,  0,   42, 42, 42,
-    21, 21, 21,   21, 21, 63,   21, 63, 21,   21, 63, 63,
-    63, 21, 21,   63, 21, 63,   63, 63, 21,   63, 63, 63,
-     0,  0,  0,    5,  5,  5,    8,  8,  8,   11, 11, 11,
-    14, 14, 14,   17, 17, 17,   20, 20, 20,   24, 24, 24,
-    28, 28, 28,   32, 32, 32,   36, 36, 36,   40, 40, 40,
-    45, 45, 45,   50, 50, 50,   56, 56, 56,   63, 63, 63,
-     0,  0, 63,   16,  0, 63,   31,  0, 63,   47,  0, 63,
-    63,  0, 63,   63,  0, 47,   63,  0, 31,   63,  0, 16,
-    63,  0,  0,   63, 16,  0,   63, 31,  0,   63, 47,  0,
-    63, 63,  0,   47, 63,  0,   31, 63,  0,   16, 63,  0,
-     0, 63,  0,    0, 63, 16,    0, 63, 31,    0, 63, 47,
-     0, 63, 63,    0, 47, 63,    0, 31, 63,    0, 16, 63,
-    31, 31, 63,   39, 31, 63,   47, 31, 63,   55, 31, 63,
-    63, 31, 63,   63, 31, 55,   63, 31, 47,   63, 31, 39,
-    63, 31, 31,   63, 39, 31,   63, 47, 31,   63, 55, 31,
-    63, 63, 31,   55, 63, 31,   47, 63, 31,   39, 63, 31,
-    31, 63, 31,   31, 63, 39,   31, 63, 47,   31, 63, 55,
-    31, 63, 63,   31, 55, 63,   31, 47, 63,   31, 39, 63,
-    45, 45, 63,   49, 45, 63,   54, 45, 63,   58, 45, 63,
-    63, 45, 63,   63, 45, 58,   63, 45, 54,   63, 45, 49,
-    63, 45, 45,   63, 49, 45,   63, 54, 45,   63, 58, 45,
-    63, 63, 45,   58, 63, 45,   54, 63, 45,   49, 63, 45,
-    45, 63, 45,   45, 63, 49,   45, 63, 54,   45, 63, 58,
-    45, 63, 63,   45, 58, 63,   45, 54, 63,   45, 49, 63,
-     0,  0, 28,    7,  0, 28,   14,  0, 28,   21,  0, 28,
-    28,  0, 28,   28,  0, 21,   28,  0, 14,   28,  0,  7,
-    28,  0,  0,   28,  7,  0,   28, 14,  0,   28, 21,  0,
-    28, 28,  0,   21, 28,  0,   14, 28,  0,    7, 28,  0,
-     0, 28,  0,    0, 28,  7,    0, 28, 14,    0, 28, 21,
-     0, 28, 28,    0, 21, 28,    0, 14, 28,    0,  7, 28,
-    14, 14, 28,   17, 14, 28,   21, 14, 28,   24, 14, 28,
-    28, 14, 28,   28, 14, 24,   28, 14, 21,   28, 14, 17,
-    28, 14, 14,   28, 17, 14,   28, 21, 14,   28, 24, 14,
-    28, 28, 14,   24, 28, 14,   21, 28, 14,   17, 28, 14,
-    14, 28, 14,   14, 28, 17,   14, 28, 21,   14, 28, 24,
-    14, 28, 28,   14, 24, 28,   14, 21, 28,   14, 17, 28,
-    20, 20, 28,   22, 20, 28,   24, 20, 28,   26, 20, 28,
-    28, 20, 28,   28, 20, 26,   28, 20, 24,   28, 20, 22,
-    28, 20, 20,   28, 22, 20,   28, 24, 20,   28, 26, 20,
-    28, 28, 20,   26, 28, 20,   24, 28, 20,   22, 28, 20,
-    20, 28, 20,   20, 28, 22,   20, 28, 24,   20, 28, 26,
-    20, 28, 28,   20, 26, 28,   20, 24, 28,   20, 22, 28,
-     0,  0, 16,    4,  0, 16,    8,  0, 16,   12,  0, 16,
-    16,  0, 16,   16,  0, 12,   16,  0,  8,   16,  0,  4,
-    16,  0,  0,   16,  4,  0,   16,  8,  0,   16, 12,  0,
-    16, 16,  0,   12, 16,  0,    8, 16,  0,    4, 16,  0,
-     0, 16,  0,    0, 16,  4,    0, 16,  8,    0, 16, 12,
-     0, 16, 16,    0, 12, 16,    0,  8, 16,    0,  4, 16,
-     8,  8, 16,   10,  8, 16,   12,  8, 16,   14,  8, 16,
-    16,  8, 16,   16,  8, 14,   16,  8, 12,   16,  8, 10,
-    16,  8,  8,   16, 10,  8,   16, 12,  8,   16, 14,  8,
-    16, 16,  8,   14, 16,  8,   12, 16,  8,   10, 16,  8,
-     8, 16,  8,    8, 16, 10,    8, 16, 12,    8, 16, 14,
-     8, 16, 16,    8, 14, 16,    8, 12, 16,    8, 10, 16,
-    11, 11, 16,   12, 11, 16,   13, 11, 16,   15, 11, 16,
-    16, 11, 16,   16, 11, 15,   16, 11, 13,   16, 11, 12,
-    16, 11, 11,   16, 12, 11,   16, 13, 11,   16, 15, 11,
-    16, 16, 11,   15, 16, 11,   13, 16, 11,   12, 16, 11,
-    11, 16, 11,   11, 16, 12,   11, 16, 13,   11, 16, 15,
-    11, 16, 16,   11, 15, 16,   11, 13, 16,   11, 12, 16,
-     0,  0,  0,    0,  0,  0,    0,  0,  0,    0,  0,  0,
-     0,  0,  0,    0,  0,  0,    0,  0,  0,    0,  0,  0,
+static CARD8 defaultDAC[768] = {
+    0, 0, 0, 0, 0, 42, 0, 42, 0, 0, 42, 42,
+    42, 0, 0, 42, 0, 42, 42, 21, 0, 42, 42, 42,
+    21, 21, 21, 21, 21, 63, 21, 63, 21, 21, 63, 63,
+    63, 21, 21, 63, 21, 63, 63, 63, 21, 63, 63, 63,
+    0, 0, 0, 5, 5, 5, 8, 8, 8, 11, 11, 11,
+    14, 14, 14, 17, 17, 17, 20, 20, 20, 24, 24, 24,
+    28, 28, 28, 32, 32, 32, 36, 36, 36, 40, 40, 40,
+    45, 45, 45, 50, 50, 50, 56, 56, 56, 63, 63, 63,
+    0, 0, 63, 16, 0, 63, 31, 0, 63, 47, 0, 63,
+    63, 0, 63, 63, 0, 47, 63, 0, 31, 63, 0, 16,
+    63, 0, 0, 63, 16, 0, 63, 31, 0, 63, 47, 0,
+    63, 63, 0, 47, 63, 0, 31, 63, 0, 16, 63, 0,
+    0, 63, 0, 0, 63, 16, 0, 63, 31, 0, 63, 47,
+    0, 63, 63, 0, 47, 63, 0, 31, 63, 0, 16, 63,
+    31, 31, 63, 39, 31, 63, 47, 31, 63, 55, 31, 63,
+    63, 31, 63, 63, 31, 55, 63, 31, 47, 63, 31, 39,
+    63, 31, 31, 63, 39, 31, 63, 47, 31, 63, 55, 31,
+    63, 63, 31, 55, 63, 31, 47, 63, 31, 39, 63, 31,
+    31, 63, 31, 31, 63, 39, 31, 63, 47, 31, 63, 55,
+    31, 63, 63, 31, 55, 63, 31, 47, 63, 31, 39, 63,
+    45, 45, 63, 49, 45, 63, 54, 45, 63, 58, 45, 63,
+    63, 45, 63, 63, 45, 58, 63, 45, 54, 63, 45, 49,
+    63, 45, 45, 63, 49, 45, 63, 54, 45, 63, 58, 45,
+    63, 63, 45, 58, 63, 45, 54, 63, 45, 49, 63, 45,
+    45, 63, 45, 45, 63, 49, 45, 63, 54, 45, 63, 58,
+    45, 63, 63, 45, 58, 63, 45, 54, 63, 45, 49, 63,
+    0, 0, 28, 7, 0, 28, 14, 0, 28, 21, 0, 28,
+    28, 0, 28, 28, 0, 21, 28, 0, 14, 28, 0, 7,
+    28, 0, 0, 28, 7, 0, 28, 14, 0, 28, 21, 0,
+    28, 28, 0, 21, 28, 0, 14, 28, 0, 7, 28, 0,
+    0, 28, 0, 0, 28, 7, 0, 28, 14, 0, 28, 21,
+    0, 28, 28, 0, 21, 28, 0, 14, 28, 0, 7, 28,
+    14, 14, 28, 17, 14, 28, 21, 14, 28, 24, 14, 28,
+    28, 14, 28, 28, 14, 24, 28, 14, 21, 28, 14, 17,
+    28, 14, 14, 28, 17, 14, 28, 21, 14, 28, 24, 14,
+    28, 28, 14, 24, 28, 14, 21, 28, 14, 17, 28, 14,
+    14, 28, 14, 14, 28, 17, 14, 28, 21, 14, 28, 24,
+    14, 28, 28, 14, 24, 28, 14, 21, 28, 14, 17, 28,
+    20, 20, 28, 22, 20, 28, 24, 20, 28, 26, 20, 28,
+    28, 20, 28, 28, 20, 26, 28, 20, 24, 28, 20, 22,
+    28, 20, 20, 28, 22, 20, 28, 24, 20, 28, 26, 20,
+    28, 28, 20, 26, 28, 20, 24, 28, 20, 22, 28, 20,
+    20, 28, 20, 20, 28, 22, 20, 28, 24, 20, 28, 26,
+    20, 28, 28, 20, 26, 28, 20, 24, 28, 20, 22, 28,
+    0, 0, 16, 4, 0, 16, 8, 0, 16, 12, 0, 16,
+    16, 0, 16, 16, 0, 12, 16, 0, 8, 16, 0, 4,
+    16, 0, 0, 16, 4, 0, 16, 8, 0, 16, 12, 0,
+    16, 16, 0, 12, 16, 0, 8, 16, 0, 4, 16, 0,
+    0, 16, 0, 0, 16, 4, 0, 16, 8, 0, 16, 12,
+    0, 16, 16, 0, 12, 16, 0, 8, 16, 0, 4, 16,
+    8, 8, 16, 10, 8, 16, 12, 8, 16, 14, 8, 16,
+    16, 8, 16, 16, 8, 14, 16, 8, 12, 16, 8, 10,
+    16, 8, 8, 16, 10, 8, 16, 12, 8, 16, 14, 8,
+    16, 16, 8, 14, 16, 8, 12, 16, 8, 10, 16, 8,
+    8, 16, 8, 8, 16, 10, 8, 16, 12, 8, 16, 14,
+    8, 16, 16, 8, 14, 16, 8, 12, 16, 8, 10, 16,
+    11, 11, 16, 12, 11, 16, 13, 11, 16, 15, 11, 16,
+    16, 11, 16, 16, 11, 15, 16, 11, 13, 16, 11, 12,
+    16, 11, 11, 16, 12, 11, 16, 13, 11, 16, 15, 11,
+    16, 16, 11, 15, 16, 11, 13, 16, 11, 12, 16, 11,
+    11, 16, 11, 11, 16, 12, 11, 16, 13, 11, 16, 15,
+    11, 16, 16, 11, 15, 16, 11, 13, 16, 11, 12, 16,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
-#endif /* NEED_SAVED_CMAP */
+#endif                          /* NEED_SAVED_CMAP */
 
 /*
  * Standard VGA versions of the register access functions.
@@ -223,16 +221,16 @@ stdReadFCR(vgaHWPtr hwp)
 static void
 stdWriteFCR(vgaHWPtr hwp, CARD8 value)
 {
-    pci_io_write8(hwp->io, hwp->IOBase + VGA_FEATURE_W_OFFSET,value);
+    pci_io_write8(hwp->io, hwp->IOBase + VGA_FEATURE_W_OFFSET, value);
 }
 
 static void
 stdWriteAttr(vgaHWPtr hwp, CARD8 index, CARD8 value)
 {
     if (hwp->paletteEnabled)
-	index &= ~0x20;
+        index &= ~0x20;
     else
-	index |= 0x20;
+        index |= 0x20;
 
     (void) pci_io_read8(hwp->io, hwp->IOBase + VGA_IN_STAT_1_OFFSET);
     pci_io_write8(hwp->io, VGA_ATTR_INDEX, index);
@@ -243,9 +241,9 @@ static CARD8
 stdReadAttr(vgaHWPtr hwp, CARD8 index)
 {
     if (hwp->paletteEnabled)
-	index &= ~0x20;
+        index &= ~0x20;
     else
-	index |= 0x20;
+        index |= 0x20;
 
     (void) pci_io_read8(hwp->io, hwp->IOBase + VGA_IN_STAT_1_OFFSET);
     pci_io_write8(hwp->io, VGA_ATTR_INDEX, index);
@@ -331,30 +329,30 @@ stdWriteEnable(vgaHWPtr hwp, CARD8 value)
 void
 vgaHWSetStdFuncs(vgaHWPtr hwp)
 {
-    hwp->writeCrtc		= stdWriteCrtc;
-    hwp->readCrtc		= stdReadCrtc;
-    hwp->writeGr		= stdWriteGr;
-    hwp->readGr			= stdReadGr;
-    hwp->readST00               = stdReadST00;
-    hwp->readST01               = stdReadST01;
-    hwp->readFCR                = stdReadFCR;
-    hwp->writeFCR               = stdWriteFCR;
-    hwp->writeAttr		= stdWriteAttr;
-    hwp->readAttr		= stdReadAttr;
-    hwp->writeSeq		= stdWriteSeq;
-    hwp->readSeq		= stdReadSeq;
-    hwp->writeMiscOut		= stdWriteMiscOut;
-    hwp->readMiscOut		= stdReadMiscOut;
-    hwp->enablePalette		= stdEnablePalette;
-    hwp->disablePalette		= stdDisablePalette;
-    hwp->writeDacMask		= stdWriteDacMask;
-    hwp->readDacMask		= stdReadDacMask;
-    hwp->writeDacWriteAddr	= stdWriteDacWriteAddr;
-    hwp->writeDacReadAddr	= stdWriteDacReadAddr;
-    hwp->writeDacData		= stdWriteDacData;
-    hwp->readDacData		= stdReadDacData;
-    hwp->readEnable		= stdReadEnable;
-    hwp->writeEnable		= stdWriteEnable;
+    hwp->writeCrtc = stdWriteCrtc;
+    hwp->readCrtc = stdReadCrtc;
+    hwp->writeGr = stdWriteGr;
+    hwp->readGr = stdReadGr;
+    hwp->readST00 = stdReadST00;
+    hwp->readST01 = stdReadST01;
+    hwp->readFCR = stdReadFCR;
+    hwp->writeFCR = stdWriteFCR;
+    hwp->writeAttr = stdWriteAttr;
+    hwp->readAttr = stdReadAttr;
+    hwp->writeSeq = stdWriteSeq;
+    hwp->readSeq = stdReadSeq;
+    hwp->writeMiscOut = stdWriteMiscOut;
+    hwp->readMiscOut = stdReadMiscOut;
+    hwp->enablePalette = stdEnablePalette;
+    hwp->disablePalette = stdDisablePalette;
+    hwp->writeDacMask = stdWriteDacMask;
+    hwp->readDacMask = stdReadDacMask;
+    hwp->writeDacWriteAddr = stdWriteDacWriteAddr;
+    hwp->writeDacReadAddr = stdWriteDacReadAddr;
+    hwp->writeDacData = stdWriteDacData;
+    hwp->readDacData = stdReadDacData;
+    hwp->readEnable = stdReadEnable;
+    hwp->writeEnable = stdWriteEnable;
 
     hwp->io = pci_legacy_open_io(hwp->dev, 0, 64 * 1024);
 }
@@ -431,16 +429,16 @@ mmioReadFCR(vgaHWPtr hwp)
 static void
 mmioWriteFCR(vgaHWPtr hwp, CARD8 value)
 {
-    moutb(hwp->IOBase + VGA_FEATURE_W_OFFSET,value);
+    moutb(hwp->IOBase + VGA_FEATURE_W_OFFSET, value);
 }
 
 static void
 mmioWriteAttr(vgaHWPtr hwp, CARD8 index, CARD8 value)
 {
     if (hwp->paletteEnabled)
-	index &= ~0x20;
+        index &= ~0x20;
     else
-	index |= 0x20;
+        index |= 0x20;
 
     (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
     moutb(VGA_ATTR_INDEX, index);
@@ -451,9 +449,9 @@ static CARD8
 mmioReadAttr(vgaHWPtr hwp, CARD8 index)
 {
     if (hwp->paletteEnabled)
-	index &= ~0x20;
+        index &= ~0x20;
     else
-	index |= 0x20;
+        index |= 0x20;
 
     (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
     moutb(VGA_ATTR_INDEX, index);
@@ -539,32 +537,32 @@ mmioWriteEnable(vgaHWPtr hwp, CARD8 value)
 void
 vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset)
 {
-    hwp->writeCrtc		= mmioWriteCrtc;
-    hwp->readCrtc		= mmioReadCrtc;
-    hwp->writeGr		= mmioWriteGr;
-    hwp->readGr			= mmioReadGr;
-    hwp->readST00               = mmioReadST00;
-    hwp->readST01               = mmioReadST01;
-    hwp->readFCR                = mmioReadFCR;
-    hwp->writeFCR               = mmioWriteFCR;
-    hwp->writeAttr		= mmioWriteAttr;
-    hwp->readAttr		= mmioReadAttr;
-    hwp->writeSeq		= mmioWriteSeq;
-    hwp->readSeq		= mmioReadSeq;
-    hwp->writeMiscOut		= mmioWriteMiscOut;
-    hwp->readMiscOut		= mmioReadMiscOut;
-    hwp->enablePalette		= mmioEnablePalette;
-    hwp->disablePalette		= mmioDisablePalette;
-    hwp->writeDacMask		= mmioWriteDacMask;
-    hwp->readDacMask		= mmioReadDacMask;
-    hwp->writeDacWriteAddr	= mmioWriteDacWriteAddr;
-    hwp->writeDacReadAddr	= mmioWriteDacReadAddr;
-    hwp->writeDacData		= mmioWriteDacData;
-    hwp->readDacData		= mmioReadDacData;
-    hwp->MMIOBase		= base;
-    hwp->MMIOOffset		= offset;
-    hwp->readEnable		= mmioReadEnable;
-    hwp->writeEnable		= mmioWriteEnable;
+    hwp->writeCrtc = mmioWriteCrtc;
+    hwp->readCrtc = mmioReadCrtc;
+    hwp->writeGr = mmioWriteGr;
+    hwp->readGr = mmioReadGr;
+    hwp->readST00 = mmioReadST00;
+    hwp->readST01 = mmioReadST01;
+    hwp->readFCR = mmioReadFCR;
+    hwp->writeFCR = mmioWriteFCR;
+    hwp->writeAttr = mmioWriteAttr;
+    hwp->readAttr = mmioReadAttr;
+    hwp->writeSeq = mmioWriteSeq;
+    hwp->readSeq = mmioReadSeq;
+    hwp->writeMiscOut = mmioWriteMiscOut;
+    hwp->readMiscOut = mmioReadMiscOut;
+    hwp->enablePalette = mmioEnablePalette;
+    hwp->disablePalette = mmioDisablePalette;
+    hwp->writeDacMask = mmioWriteDacMask;
+    hwp->readDacMask = mmioReadDacMask;
+    hwp->writeDacWriteAddr = mmioWriteDacWriteAddr;
+    hwp->writeDacReadAddr = mmioWriteDacReadAddr;
+    hwp->writeDacData = mmioWriteDacData;
+    hwp->readDacData = mmioReadDacData;
+    hwp->MMIOBase = base;
+    hwp->MMIOOffset = offset;
+    hwp->readEnable = mmioReadEnable;
+    hwp->writeEnable = mmioWriteEnable;
 }
 
 /*
@@ -575,38 +573,41 @@ vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset)
 void
 vgaHWProtect(ScrnInfoPtr pScrn, Bool on)
 {
-  vgaHWPtr hwp = VGAHWPTR(pScrn);
-  
-  unsigned char tmp;
-  
-  if (pScrn->vtSema) {
-    if (on) {
-      /*
-       * Turn off screen and disable sequencer.
-       */
-      tmp = hwp->readSeq(hwp, 0x01);
-
-      vgaHWSeqReset(hwp, TRUE);			/* start synchronous reset */
-      hwp->writeSeq(hwp, 0x01, tmp | 0x20);	/* disable the display */
-
-      hwp->enablePalette(hwp);
-    } else {
-      /*
-       * Reenable sequencer, then turn on screen.
-       */
-  
-      tmp = hwp->readSeq(hwp, 0x01);
-
-      hwp->writeSeq(hwp, 0x01, tmp & ~0x20);	/* reenable display */
-      vgaHWSeqReset(hwp, FALSE);		/* clear synchronousreset */
-
-      hwp->disablePalette(hwp);
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
+
+    unsigned char tmp;
+
+    if (pScrn->vtSema) {
+        if (on) {
+            /*
+             * Turn off screen and disable sequencer.
+             */
+            tmp = hwp->readSeq(hwp, 0x01);
+
+            vgaHWSeqReset(hwp, TRUE);   /* start synchronous reset */
+            hwp->writeSeq(hwp, 0x01, tmp | 0x20);       /* disable the display */
+
+            hwp->enablePalette(hwp);
+        }
+        else {
+            /*
+             * Reenable sequencer, then turn on screen.
+             */
+
+            tmp = hwp->readSeq(hwp, 0x01);
+
+            hwp->writeSeq(hwp, 0x01, tmp & ~0x20);      /* reenable display */
+            vgaHWSeqReset(hwp, FALSE);  /* clear synchronousreset */
+
+            hwp->disablePalette(hwp);
+        }
     }
-  }
 }
 
-vgaHWProtectProc *vgaHWProtectWeak(void) {
-  return vgaHWProtect;
+vgaHWProtectProc *
+vgaHWProtectWeak(void)
+{
+    return vgaHWProtect;
 }
 
 /*
@@ -616,25 +617,28 @@ vgaHWProtectProc *vgaHWProtectWeak(void) {
 void
 vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on)
 {
-  vgaHWPtr hwp = VGAHWPTR(pScrn);
-  unsigned char scrn;
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
+    unsigned char scrn;
 
-  scrn = hwp->readSeq(hwp, 0x01);
+    scrn = hwp->readSeq(hwp, 0x01);
 
-  if (on) {
-    scrn &= ~0x20;			/* enable screen */
-  } else {
-    scrn |= 0x20;			/* blank screen */
-  }
+    if (on) {
+        scrn &= ~0x20;          /* enable screen */
+    }
+    else {
+        scrn |= 0x20;           /* blank screen */
+    }
 
-  vgaHWSeqReset(hwp, TRUE);
-  hwp->writeSeq(hwp, 0x01, scrn);	/* change mode */
-  vgaHWSeqReset(hwp, FALSE);
+    vgaHWSeqReset(hwp, TRUE);
+    hwp->writeSeq(hwp, 0x01, scrn);     /* change mode */
+    vgaHWSeqReset(hwp, FALSE);
 }
 
-vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) {
-  return vgaHWBlankScreen;
-}  
+vgaHWBlankScreenProc *
+vgaHWBlankScreenWeak(void)
+{
+    return vgaHWBlankScreen;
+}
 
 /*
  * vgaHWSaveScreen -- blank the screen.
@@ -643,26 +647,25 @@ vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) {
 Bool
 vgaHWSaveScreen(ScreenPtr pScreen, int mode)
 {
-   ScrnInfoPtr pScrn = NULL;
-   Bool on;
+    ScrnInfoPtr pScrn = NULL;
+    Bool on;
 
-   if (pScreen != NULL)
-      pScrn = xf86Screens[pScreen->myNum];
+    if (pScreen != NULL)
+        pScrn = xf86Screens[pScreen->myNum];
 
-   on = xf86IsUnblank(mode);
+    on = xf86IsUnblank(mode);
 
 #if 0
-   if (on)
-      SetTimeSinceLastInputEvent();
+    if (on)
+        SetTimeSinceLastInputEvent();
 #endif
 
-   if ((pScrn != NULL) && pScrn->vtSema) {
-     vgaHWBlankScreen(pScrn, on);
-   }
-   return TRUE;
+    if ((pScrn != NULL) && pScrn->vtSema) {
+        vgaHWBlankScreen(pScrn, on);
+    }
+    return TRUE;
 }
 
-
 /*
  * vgaHWDPMSSet -- Sets VESA Display Power Management Signaling (DPMS) Mode
  *
@@ -674,42 +677,42 @@ vgaHWSaveScreen(ScreenPtr pScreen, int mode)
 void
 vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
 {
-  unsigned char seq1 = 0, crtc17 = 0;
-  vgaHWPtr hwp = VGAHWPTR(pScrn);
-
-  if (!pScrn->vtSema) return;
-
-  switch (PowerManagementMode) {
-  case DPMSModeOn:
-    /* Screen: On; HSync: On, VSync: On */
-    seq1 = 0x00;
-    crtc17 = 0x80;
-    break;
-  case DPMSModeStandby:
-    /* Screen: Off; HSync: Off, VSync: On -- Not Supported */
-    seq1 = 0x20;
-    crtc17 = 0x80;
-    break;
-  case DPMSModeSuspend:
-    /* Screen: Off; HSync: On, VSync: Off -- Not Supported */
-    seq1 = 0x20;
-    crtc17 = 0x80;
-    break;
-  case DPMSModeOff:
-    /* Screen: Off; HSync: Off, VSync: Off */
-    seq1 = 0x20;
-    crtc17 = 0x00;
-    break;
-  }
-  hwp->writeSeq(hwp, 0x00, 0x01);		/* Synchronous Reset */
-  seq1 |= hwp->readSeq(hwp, 0x01) & ~0x20;
-  hwp->writeSeq(hwp, 0x01, seq1);
-  crtc17 |= hwp->readCrtc(hwp, 0x17) & ~0x80;
-  usleep(10000);
-  hwp->writeCrtc(hwp, 0x17, crtc17);
-  hwp->writeSeq(hwp, 0x00, 0x03);		/* End Reset */
-}
+    unsigned char seq1 = 0, crtc17 = 0;
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
 
+    if (!pScrn->vtSema)
+        return;
+
+    switch (PowerManagementMode) {
+    case DPMSModeOn:
+        /* Screen: On; HSync: On, VSync: On */
+        seq1 = 0x00;
+        crtc17 = 0x80;
+        break;
+    case DPMSModeStandby:
+        /* Screen: Off; HSync: Off, VSync: On -- Not Supported */
+        seq1 = 0x20;
+        crtc17 = 0x80;
+        break;
+    case DPMSModeSuspend:
+        /* Screen: Off; HSync: On, VSync: Off -- Not Supported */
+        seq1 = 0x20;
+        crtc17 = 0x80;
+        break;
+    case DPMSModeOff:
+        /* Screen: Off; HSync: Off, VSync: Off */
+        seq1 = 0x20;
+        crtc17 = 0x00;
+        break;
+    }
+    hwp->writeSeq(hwp, 0x00, 0x01);     /* Synchronous Reset */
+    seq1 |= hwp->readSeq(hwp, 0x01) & ~0x20;
+    hwp->writeSeq(hwp, 0x01, seq1);
+    crtc17 |= hwp->readCrtc(hwp, 0x17) & ~0x80;
+    usleep(10000);
+    hwp->writeCrtc(hwp, 0x17, crtc17);
+    hwp->writeSeq(hwp, 0x00, 0x03);     /* End Reset */
+}
 
 /*
  * vgaHWSeqReset
@@ -719,13 +722,12 @@ vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
 void
 vgaHWSeqReset(vgaHWPtr hwp, Bool start)
 {
-  if (start)
-    hwp->writeSeq(hwp, 0x00, 0x01);		/* Synchronous Reset */
-  else
-    hwp->writeSeq(hwp, 0x00, 0x03);		/* End Reset */
+    if (start)
+        hwp->writeSeq(hwp, 0x00, 0x01); /* Synchronous Reset */
+    else
+        hwp->writeSeq(hwp, 0x00, 0x03); /* End Reset */
 }
 
-
 void
 vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore)
 {
@@ -737,15 +739,15 @@ vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore)
 
     /* If nothing to do, return now */
     if (!hwp->FontInfo1 && !hwp->FontInfo2 && !hwp->TextInfo)
-	return;
+        return;
 
     if (hwp->Base == NULL) {
-	doMap = TRUE;
-	if (!vgaHWMapMem(scrninfp)) {
-	    xf86DrvMsg(scrninfp->scrnIndex, X_ERROR,
-		       "vgaHWRestoreFonts: vgaHWMapMem() failed\n");
-	    return;
-	}
+        doMap = TRUE;
+        if (!vgaHWMapMem(scrninfp)) {
+            xf86DrvMsg(scrninfp->scrnIndex, X_ERROR,
+                       "vgaHWRestoreFonts: vgaHWMapMem() failed\n");
+            return;
+        }
     }
 
     /* save the registers that are needed here */
@@ -776,45 +778,45 @@ vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore)
      * BUG ALERT: The (S)VGA's segment-select register MUST be set correctly!
      */
 #if 0
-    hwp->writeAttr(hwp, 0x10, 0x01);	/* graphics mode */
+    hwp->writeAttr(hwp, 0x10, 0x01);    /* graphics mode */
 #endif
 
-    hwp->writeSeq(hwp, 0x04, 0x06);	/* enable plane graphics */
-    hwp->writeGr(hwp, 0x05, 0x00);	/* write mode 0, read mode 0 */
-    hwp->writeGr(hwp, 0x06, 0x05);	/* set graphics */
+    hwp->writeSeq(hwp, 0x04, 0x06);     /* enable plane graphics */
+    hwp->writeGr(hwp, 0x05, 0x00);      /* write mode 0, read mode 0 */
+    hwp->writeGr(hwp, 0x06, 0x05);      /* set graphics */
 
     if (scrninfp->depth == 4) {
-	/* GJA */
-	hwp->writeGr(hwp, 0x03, 0x00);	/* don't rotate, write unmodified */
-	hwp->writeGr(hwp, 0x08, 0xFF);	/* write all bits in a byte */
-	hwp->writeGr(hwp, 0x01, 0x00);	/* all planes come from CPU */
+        /* GJA */
+        hwp->writeGr(hwp, 0x03, 0x00);  /* don't rotate, write unmodified */
+        hwp->writeGr(hwp, 0x08, 0xFF);  /* write all bits in a byte */
+        hwp->writeGr(hwp, 0x01, 0x00);  /* all planes come from CPU */
     }
 
 #if SAVE_FONT1
     if (hwp->FontInfo1) {
-	hwp->writeSeq(hwp, 0x02, 0x04);	/* write to plane 2 */
-	hwp->writeGr(hwp, 0x04, 0x02);	/* read plane 2 */
-	slowbcopy_tobus(hwp->FontInfo1, hwp->Base, FONT_AMOUNT);
+        hwp->writeSeq(hwp, 0x02, 0x04); /* write to plane 2 */
+        hwp->writeGr(hwp, 0x04, 0x02);  /* read plane 2 */
+        slowbcopy_tobus(hwp->FontInfo1, hwp->Base, FONT_AMOUNT);
     }
 #endif
 
 #if SAVE_FONT2
     if (hwp->FontInfo2) {
-	hwp->writeSeq(hwp, 0x02, 0x08);	/* write to plane 3 */
-	hwp->writeGr(hwp, 0x04, 0x03);	/* read plane 3 */
-	slowbcopy_tobus(hwp->FontInfo2, hwp->Base, FONT_AMOUNT);
+        hwp->writeSeq(hwp, 0x02, 0x08); /* write to plane 3 */
+        hwp->writeGr(hwp, 0x04, 0x03);  /* read plane 3 */
+        slowbcopy_tobus(hwp->FontInfo2, hwp->Base, FONT_AMOUNT);
     }
 #endif
 
 #if SAVE_TEXT
     if (hwp->TextInfo) {
-	hwp->writeSeq(hwp, 0x02, 0x01);	/* write to plane 0 */
-	hwp->writeGr(hwp, 0x04, 0x00);	/* read plane 0 */
-	slowbcopy_tobus(hwp->TextInfo, hwp->Base, TEXT_AMOUNT);
-	hwp->writeSeq(hwp, 0x02, 0x02);	/* write to plane 1 */
-	hwp->writeGr(hwp, 0x04, 0x01);	/* read plane 1 */
-	slowbcopy_tobus((unsigned char *)hwp->TextInfo + TEXT_AMOUNT,
-			hwp->Base, TEXT_AMOUNT);
+        hwp->writeSeq(hwp, 0x02, 0x01); /* write to plane 0 */
+        hwp->writeGr(hwp, 0x04, 0x00);  /* read plane 0 */
+        slowbcopy_tobus(hwp->TextInfo, hwp->Base, TEXT_AMOUNT);
+        hwp->writeSeq(hwp, 0x02, 0x02); /* write to plane 1 */
+        hwp->writeGr(hwp, 0x04, 0x01);  /* read plane 1 */
+        slowbcopy_tobus((unsigned char *) hwp->TextInfo + TEXT_AMOUNT,
+                        hwp->Base, TEXT_AMOUNT);
     }
 #endif
 
@@ -834,12 +836,11 @@ vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore)
     hwp->IOBase = savedIOBase;
 
     if (doMap)
-	vgaHWUnmapMem(scrninfp);
+        vgaHWUnmapMem(scrninfp);
 
-#endif /* SAVE_TEXT || SAVE_FONT1 || SAVE_FONT2 */
+#endif                          /* SAVE_TEXT || SAVE_FONT1 || SAVE_FONT2 */
 }
 
-
 void
 vgaHWRestoreMode(ScrnInfoPtr scrninfp, vgaRegPtr restore)
 {
@@ -847,31 +848,30 @@ vgaHWRestoreMode(ScrnInfoPtr scrninfp, vgaRegPtr restore)
     int i;
 
     if (restore->MiscOutReg & 0x01)
-	hwp->IOBase = VGA_IOBASE_COLOR;
+        hwp->IOBase = VGA_IOBASE_COLOR;
     else
-	hwp->IOBase = VGA_IOBASE_MONO;
+        hwp->IOBase = VGA_IOBASE_MONO;
 
     hwp->writeMiscOut(hwp, restore->MiscOutReg);
 
     for (i = 1; i < restore->numSequencer; i++)
-	hwp->writeSeq(hwp, i, restore->Sequencer[i]);
-  
+        hwp->writeSeq(hwp, i, restore->Sequencer[i]);
+
     /* Ensure CRTC registers 0-7 are unlocked by clearing bit 7 of CRTC[17] */
     hwp->writeCrtc(hwp, 17, restore->CRTC[17] & ~0x80);
 
     for (i = 0; i < restore->numCRTC; i++)
-	hwp->writeCrtc(hwp, i, restore->CRTC[i]);
+        hwp->writeCrtc(hwp, i, restore->CRTC[i]);
 
     for (i = 0; i < restore->numGraphics; i++)
-	hwp->writeGr(hwp, i, restore->Graphics[i]);
+        hwp->writeGr(hwp, i, restore->Graphics[i]);
 
     hwp->enablePalette(hwp);
     for (i = 0; i < restore->numAttribute; i++)
-	hwp->writeAttr(hwp, i, restore->Attribute[i]);
+        hwp->writeAttr(hwp, i, restore->Attribute[i]);
     hwp->disablePalette(hwp);
 }
 
-
 void
 vgaHWRestoreColormap(ScrnInfoPtr scrninfp, vgaRegPtr restore)
 {
@@ -885,14 +885,13 @@ vgaHWRestoreColormap(ScrnInfoPtr scrninfp, vgaRegPtr restore)
     hwp->writeDacMask(hwp, 0xFF);
     hwp->writeDacWriteAddr(hwp, 0x00);
     for (i = 0; i < 768; i++) {
-	hwp->writeDacData(hwp, restore->DAC[i]);
-	DACDelay(hwp);
+        hwp->writeDacData(hwp, restore->DAC[i]);
+        DACDelay(hwp);
     }
 
     hwp->disablePalette(hwp);
 }
 
-
 /*
  * vgaHWRestore --
  *      restore the VGA state
@@ -902,13 +901,13 @@ void
 vgaHWRestore(ScrnInfoPtr scrninfp, vgaRegPtr restore, int flags)
 {
     if (flags & VGA_SR_MODE)
-	vgaHWRestoreMode(scrninfp, restore);
+        vgaHWRestoreMode(scrninfp, restore);
 
     if (flags & VGA_SR_FONTS)
-	vgaHWRestoreFonts(scrninfp, restore);
+        vgaHWRestoreFonts(scrninfp, restore);
 
     if (flags & VGA_SR_CMAP)
-	vgaHWRestoreColormap(scrninfp, restore);
+        vgaHWRestoreColormap(scrninfp, restore);
 }
 
 void
@@ -921,18 +920,18 @@ vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save)
     Bool doMap = FALSE;
 
     if (hwp->Base == NULL) {
-	doMap = TRUE;
-	if (!vgaHWMapMem(scrninfp)) {
-	    xf86DrvMsg(scrninfp->scrnIndex, X_ERROR,
-		       "vgaHWSaveFonts: vgaHWMapMem() failed\n");
-	    return;
-	}
+        doMap = TRUE;
+        if (!vgaHWMapMem(scrninfp)) {
+            xf86DrvMsg(scrninfp->scrnIndex, X_ERROR,
+                       "vgaHWSaveFonts: vgaHWMapMem() failed\n");
+            return;
+        }
     }
 
     /* If in graphics mode, don't save anything */
     attr10 = hwp->readAttr(hwp, 0x10);
     if (attr10 & 0x01)
-	return;
+        return;
 
     /* save the registers that are needed here */
     miscOut = hwp->readMiscOut(hwp);
@@ -950,7 +949,7 @@ vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save)
     hwp->writeMiscOut(hwp, miscOut | 0x01);
 
     vgaHWBlankScreen(scrninfp, FALSE);
-  
+
     /*
      * get the character sets, and text screen if required
      */
@@ -961,38 +960,39 @@ vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save)
      * BUG ALERT: The (S)VGA's segment-select register MUST be set correctly!
      */
 #if 0
-    hwp->writeAttr(hwp, 0x10, 0x01);	/* graphics mode */
+    hwp->writeAttr(hwp, 0x10, 0x01);    /* graphics mode */
 #endif
 
-    hwp->writeSeq(hwp, 0x04, 0x06);	/* enable plane graphics */
-    hwp->writeGr(hwp, 0x05, 0x00);	/* write mode 0, read mode 0 */
-    hwp->writeGr(hwp, 0x06, 0x05);	/* set graphics */
+    hwp->writeSeq(hwp, 0x04, 0x06);     /* enable plane graphics */
+    hwp->writeGr(hwp, 0x05, 0x00);      /* write mode 0, read mode 0 */
+    hwp->writeGr(hwp, 0x06, 0x05);      /* set graphics */
 
 #if SAVE_FONT1
     if (hwp->FontInfo1 || (hwp->FontInfo1 = malloc(FONT_AMOUNT))) {
-	hwp->writeSeq(hwp, 0x02, 0x04);	/* write to plane 2 */
-	hwp->writeGr(hwp, 0x04, 0x02);	/* read plane 2 */
-	slowbcopy_frombus(hwp->Base, hwp->FontInfo1, FONT_AMOUNT);
+        hwp->writeSeq(hwp, 0x02, 0x04); /* write to plane 2 */
+        hwp->writeGr(hwp, 0x04, 0x02);  /* read plane 2 */
+        slowbcopy_frombus(hwp->Base, hwp->FontInfo1, FONT_AMOUNT);
     }
-#endif /* SAVE_FONT1 */
+#endif                          /* SAVE_FONT1 */
 #if SAVE_FONT2
     if (hwp->FontInfo2 || (hwp->FontInfo2 = malloc(FONT_AMOUNT))) {
-	hwp->writeSeq(hwp, 0x02, 0x08);	/* write to plane 3 */
-	hwp->writeGr(hwp, 0x04, 0x03);	/* read plane 3 */
-	slowbcopy_frombus(hwp->Base, hwp->FontInfo2, FONT_AMOUNT);
+        hwp->writeSeq(hwp, 0x02, 0x08); /* write to plane 3 */
+        hwp->writeGr(hwp, 0x04, 0x03);  /* read plane 3 */
+        slowbcopy_frombus(hwp->Base, hwp->FontInfo2, FONT_AMOUNT);
     }
-#endif /* SAVE_FONT2 */
+#endif                          /* SAVE_FONT2 */
 #if SAVE_TEXT
     if (hwp->TextInfo || (hwp->TextInfo = malloc(2 * TEXT_AMOUNT))) {
-	hwp->writeSeq(hwp, 0x02, 0x01);	/* write to plane 0 */
-	hwp->writeGr(hwp, 0x04, 0x00);	/* read plane 0 */
-	slowbcopy_frombus(hwp->Base, hwp->TextInfo, TEXT_AMOUNT);
-	hwp->writeSeq(hwp, 0x02, 0x02);	/* write to plane 1 */
-	hwp->writeGr(hwp, 0x04, 0x01);	/* read plane 1 */
-	slowbcopy_frombus(hwp->Base,
-		(unsigned char *)hwp->TextInfo + TEXT_AMOUNT, TEXT_AMOUNT);
+        hwp->writeSeq(hwp, 0x02, 0x01); /* write to plane 0 */
+        hwp->writeGr(hwp, 0x04, 0x00);  /* read plane 0 */
+        slowbcopy_frombus(hwp->Base, hwp->TextInfo, TEXT_AMOUNT);
+        hwp->writeSeq(hwp, 0x02, 0x02); /* write to plane 1 */
+        hwp->writeGr(hwp, 0x04, 0x01);  /* read plane 1 */
+        slowbcopy_frombus(hwp->Base,
+                          (unsigned char *) hwp->TextInfo + TEXT_AMOUNT,
+                          TEXT_AMOUNT);
     }
-#endif /* SAVE_TEXT */
+#endif                          /* SAVE_TEXT */
 
     /* Restore clobbered registers */
     hwp->writeAttr(hwp, 0x10, attr10);
@@ -1007,9 +1007,9 @@ vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save)
     vgaHWBlankScreen(scrninfp, TRUE);
 
     if (doMap)
-	vgaHWUnmapMem(scrninfp);
+        vgaHWUnmapMem(scrninfp);
 
-#endif /* SAVE_TEXT || SAVE_FONT1 || SAVE_FONT2 */
+#endif                          /* SAVE_TEXT || SAVE_FONT1 || SAVE_FONT2 */
 }
 
 void
@@ -1020,34 +1020,33 @@ vgaHWSaveMode(ScrnInfoPtr scrninfp, vgaRegPtr save)
 
     save->MiscOutReg = hwp->readMiscOut(hwp);
     if (save->MiscOutReg & 0x01)
-	hwp->IOBase = VGA_IOBASE_COLOR;
+        hwp->IOBase = VGA_IOBASE_COLOR;
     else
-	hwp->IOBase = VGA_IOBASE_MONO;
+        hwp->IOBase = VGA_IOBASE_MONO;
 
     for (i = 0; i < save->numCRTC; i++) {
-	save->CRTC[i] = hwp->readCrtc(hwp, i);
-	DebugF("CRTC[0x%02x] = 0x%02x\n", i, save->CRTC[i]);
+        save->CRTC[i] = hwp->readCrtc(hwp, i);
+        DebugF("CRTC[0x%02x] = 0x%02x\n", i, save->CRTC[i]);
     }
 
     hwp->enablePalette(hwp);
     for (i = 0; i < save->numAttribute; i++) {
-	save->Attribute[i] = hwp->readAttr(hwp, i);
-	DebugF("Attribute[0x%02x] = 0x%02x\n", i, save->Attribute[i]);
+        save->Attribute[i] = hwp->readAttr(hwp, i);
+        DebugF("Attribute[0x%02x] = 0x%02x\n", i, save->Attribute[i]);
     }
     hwp->disablePalette(hwp);
 
     for (i = 0; i < save->numGraphics; i++) {
-	save->Graphics[i] = hwp->readGr(hwp, i);
-	DebugF("Graphics[0x%02x] = 0x%02x\n", i, save->Graphics[i]);
+        save->Graphics[i] = hwp->readGr(hwp, i);
+        DebugF("Graphics[0x%02x] = 0x%02x\n", i, save->Graphics[i]);
     }
 
     for (i = 1; i < save->numSequencer; i++) {
-	save->Sequencer[i] = hwp->readSeq(hwp, i);
-	DebugF("Sequencer[0x%02x] = 0x%02x\n", i, save->Sequencer[i]);
+        save->Sequencer[i] = hwp->readSeq(hwp, i);
+        DebugF("Sequencer[0x%02x] = 0x%02x\n", i, save->Sequencer[i]);
     }
 }
 
-
 void
 vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save)
 {
@@ -1067,7 +1066,7 @@ vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save)
 
     /* Only save it once */
     if (hwp->cmapSaved)
-	return;
+        return;
 
 #if 0
     hwp->enablePalette(hwp);
@@ -1080,17 +1079,17 @@ vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save)
      */
     hwp->writeDacReadAddr(hwp, 0x00);
     for (i = 0; i < 6; i++) {
-	save->DAC[i] = hwp->readDacData(hwp);
-	switch (i % 3) {
-	case 0:
-	    DebugF("DAC[0x%02x] = 0x%02x, ", i / 3, save->DAC[i]);
-	    break;
-	case 1:
-	    DebugF("0x%02x, ", save->DAC[i]);
-	    break;
-	case 2:
-	    DebugF("0x%02x\n", save->DAC[i]);
-	}
+        save->DAC[i] = hwp->readDacData(hwp);
+        switch (i % 3) {
+        case 0:
+            DebugF("DAC[0x%02x] = 0x%02x, ", i / 3, save->DAC[i]);
+            break;
+        case 1:
+            DebugF("0x%02x, ", save->DAC[i]);
+            break;
+        case 2:
+            DebugF("0x%02x\n", save->DAC[i]);
+        }
     }
 
     /*
@@ -1099,40 +1098,41 @@ vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save)
      */
     hwp->writeDacWriteAddr(hwp, 0x01);
     for (i = 3; i < 6; i++)
-	hwp->writeDacData(hwp, ~save->DAC[i] & DAC_TEST_MASK);
+        hwp->writeDacData(hwp, ~save->DAC[i] & DAC_TEST_MASK);
     hwp->writeDacReadAddr(hwp, 0x01);
     for (i = 3; i < 6; i++) {
-	if (hwp->readDacData(hwp) != (~save->DAC[i] & DAC_TEST_MASK))
-	    readError = TRUE;
+        if (hwp->readDacData(hwp) != (~save->DAC[i] & DAC_TEST_MASK))
+            readError = TRUE;
     }
     hwp->writeDacWriteAddr(hwp, 0x01);
     for (i = 3; i < 6; i++)
-	hwp->writeDacData(hwp, save->DAC[i]);
+        hwp->writeDacData(hwp, save->DAC[i]);
 
     if (readError) {
-	/*			 
-	 * save the default lookup table
-	 */
-	memmove(save->DAC, defaultDAC, 768);
-	xf86DrvMsg(scrninfp->scrnIndex, X_WARNING,
-	   "Cannot read colourmap from VGA.  Will restore with default\n");
-    } else {
-	/* save the colourmap */
-	hwp->writeDacReadAddr(hwp, 0x02);
-	for (i = 6; i < 768; i++) {
-	    save->DAC[i] = hwp->readDacData(hwp);
-	    DACDelay(hwp);
-	    switch (i % 3) {
-	    case 0:
-		DebugF("DAC[0x%02x] = 0x%02x, ", i / 3, save->DAC[i]);
-		break;
-	    case 1:
-		DebugF("0x%02x, ", save->DAC[i]);
-		break;
-	    case 2:
-		DebugF("0x%02x\n", save->DAC[i]);
-	    }
-	}
+        /*                       
+         * save the default lookup table
+         */
+        memmove(save->DAC, defaultDAC, 768);
+        xf86DrvMsg(scrninfp->scrnIndex, X_WARNING,
+                   "Cannot read colourmap from VGA.  Will restore with default\n");
+    }
+    else {
+        /* save the colourmap */
+        hwp->writeDacReadAddr(hwp, 0x02);
+        for (i = 6; i < 768; i++) {
+            save->DAC[i] = hwp->readDacData(hwp);
+            DACDelay(hwp);
+            switch (i % 3) {
+            case 0:
+                DebugF("DAC[0x%02x] = 0x%02x, ", i / 3, save->DAC[i]);
+                break;
+            case 1:
+                DebugF("0x%02x, ", save->DAC[i]);
+                break;
+            case 2:
+                DebugF("0x%02x\n", save->DAC[i]);
+            }
+        }
     }
 
     hwp->disablePalette(hwp);
@@ -1149,19 +1149,18 @@ void
 vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags)
 {
     if (save == NULL)
-	return;
+        return;
 
-   if (flags & VGA_SR_CMAP)
-	vgaHWSaveColormap(scrninfp, save);
+    if (flags & VGA_SR_CMAP)
+        vgaHWSaveColormap(scrninfp, save);
 
-   if (flags & VGA_SR_MODE)
-	vgaHWSaveMode(scrninfp, save);
+    if (flags & VGA_SR_MODE)
+        vgaHWSaveMode(scrninfp, save);
 
-   if (flags & VGA_SR_FONTS)
-	vgaHWSaveFonts(scrninfp, save);
+    if (flags & VGA_SR_FONTS)
+        vgaHWSaveFonts(scrninfp, save);
 }
 
-
 /*
  * vgaHWInit --
  *      Handle the initialization, etc. of a screen.
@@ -1171,7 +1170,7 @@ vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags)
 Bool
 vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
 {
-    unsigned int       i;
+    unsigned int i;
     vgaHWPtr hwp;
     vgaRegPtr regp;
     int depth = scrninfp->depth;
@@ -1180,37 +1179,38 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
      * make sure the vgaHWRec is allocated
      */
     if (!vgaHWGetHWRec(scrninfp))
-	return FALSE;
+        return FALSE;
     hwp = VGAHWPTR(scrninfp);
     regp = &hwp->ModeReg;
-    
+
     /*
      * compute correct Hsync & Vsync polarity 
      */
     if ((mode->Flags & (V_PHSYNC | V_NHSYNC))
-        && (mode->Flags & (V_PVSYNC | V_NVSYNC)))
-    {
+        && (mode->Flags & (V_PVSYNC | V_NVSYNC))) {
         regp->MiscOutReg = 0x23;
-        if (mode->Flags & V_NHSYNC) regp->MiscOutReg |= 0x40;
-        if (mode->Flags & V_NVSYNC) regp->MiscOutReg |= 0x80;
+        if (mode->Flags & V_NHSYNC)
+            regp->MiscOutReg |= 0x40;
+        if (mode->Flags & V_NVSYNC)
+            regp->MiscOutReg |= 0x80;
     }
-    else
-    {
+    else {
         int VDisplay = mode->VDisplay;
+
         if (mode->Flags & V_DBLSCAN)
             VDisplay *= 2;
         if (mode->VScan > 1)
             VDisplay *= mode->VScan;
-        if      (VDisplay < 400)
-            regp->MiscOutReg = 0xA3;		/* +hsync -vsync */
+        if (VDisplay < 400)
+            regp->MiscOutReg = 0xA3;    /* +hsync -vsync */
         else if (VDisplay < 480)
-            regp->MiscOutReg = 0x63;		/* -hsync +vsync */
+            regp->MiscOutReg = 0x63;    /* -hsync +vsync */
         else if (VDisplay < 768)
-            regp->MiscOutReg = 0xE3;		/* -hsync -vsync */
+            regp->MiscOutReg = 0xE3;    /* -hsync -vsync */
         else
-            regp->MiscOutReg = 0x23;		/* +hsync +vsync */
+            regp->MiscOutReg = 0x23;    /* +hsync +vsync */
     }
-    
+
     regp->MiscOutReg |= (mode->ClockIndex & 0x03) << 2;
 
     /*
@@ -1220,7 +1220,7 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
         regp->Sequencer[0] = 0x02;
     else
         regp->Sequencer[0] = 0x00;
-    if (mode->Flags & V_CLKDIV2) 
+    if (mode->Flags & V_CLKDIV2)
         regp->Sequencer[1] = 0x09;
     else
         regp->Sequencer[1] = 0x01;
@@ -1228,42 +1228,41 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
         regp->Sequencer[2] = 1 << BIT_PLANE;
     else
         regp->Sequencer[2] = 0x0F;
-    regp->Sequencer[3] = 0x00;                             /* Font select */
+    regp->Sequencer[3] = 0x00;  /* Font select */
     if (depth < 8)
-        regp->Sequencer[4] = 0x06;                             /* Misc */
+        regp->Sequencer[4] = 0x06;      /* Misc */
     else
-        regp->Sequencer[4] = 0x0E;                             /* Misc */
+        regp->Sequencer[4] = 0x0E;      /* Misc */
 
     /*
      * CRTC Controller
      */
-    regp->CRTC[0]  = (mode->CrtcHTotal >> 3) - 5;
-    regp->CRTC[1]  = (mode->CrtcHDisplay >> 3) - 1;
-    regp->CRTC[2]  = (mode->CrtcHBlankStart >> 3) - 1;
-    regp->CRTC[3]  = (((mode->CrtcHBlankEnd >> 3) - 1) & 0x1F) | 0x80;
+    regp->CRTC[0] = (mode->CrtcHTotal >> 3) - 5;
+    regp->CRTC[1] = (mode->CrtcHDisplay >> 3) - 1;
+    regp->CRTC[2] = (mode->CrtcHBlankStart >> 3) - 1;
+    regp->CRTC[3] = (((mode->CrtcHBlankEnd >> 3) - 1) & 0x1F) | 0x80;
     i = (((mode->CrtcHSkew << 2) + 0x10) & ~0x1F);
     if (i < 0x80)
-	regp->CRTC[3] |= i;
-    regp->CRTC[4]  = (mode->CrtcHSyncStart >> 3);
-    regp->CRTC[5]  = ((((mode->CrtcHBlankEnd >> 3) - 1) & 0x20) << 2)
-	| (((mode->CrtcHSyncEnd >> 3)) & 0x1F);
-    regp->CRTC[6]  = (mode->CrtcVTotal - 2) & 0xFF;
-    regp->CRTC[7]  = (((mode->CrtcVTotal - 2) & 0x100) >> 8)
-	| (((mode->CrtcVDisplay - 1) & 0x100) >> 7)
-	| ((mode->CrtcVSyncStart & 0x100) >> 6)
-	| (((mode->CrtcVBlankStart - 1) & 0x100) >> 5)
-	| 0x10
-	| (((mode->CrtcVTotal - 2) & 0x200)   >> 4)
-	| (((mode->CrtcVDisplay - 1) & 0x200) >> 3)
-	| ((mode->CrtcVSyncStart & 0x200) >> 2);
-    regp->CRTC[8]  = 0x00;
-    regp->CRTC[9]  = (((mode->CrtcVBlankStart - 1) & 0x200) >> 4) | 0x40;
+        regp->CRTC[3] |= i;
+    regp->CRTC[4] = (mode->CrtcHSyncStart >> 3);
+    regp->CRTC[5] = ((((mode->CrtcHBlankEnd >> 3) - 1) & 0x20) << 2)
+        | (((mode->CrtcHSyncEnd >> 3)) & 0x1F);
+    regp->CRTC[6] = (mode->CrtcVTotal - 2) & 0xFF;
+    regp->CRTC[7] = (((mode->CrtcVTotal - 2) & 0x100) >> 8)
+        | (((mode->CrtcVDisplay - 1) & 0x100) >> 7)
+        | ((mode->CrtcVSyncStart & 0x100) >> 6)
+        | (((mode->CrtcVBlankStart - 1) & 0x100) >> 5)
+        | 0x10 | (((mode->CrtcVTotal - 2) & 0x200) >> 4)
+        | (((mode->CrtcVDisplay - 1) & 0x200) >> 3)
+        | ((mode->CrtcVSyncStart & 0x200) >> 2);
+    regp->CRTC[8] = 0x00;
+    regp->CRTC[9] = (((mode->CrtcVBlankStart - 1) & 0x200) >> 4) | 0x40;
     if (mode->Flags & V_DBLSCAN)
-	regp->CRTC[9] |= 0x80;
+        regp->CRTC[9] |= 0x80;
     if (mode->VScan >= 32)
-	regp->CRTC[9] |= 0x1F;
+        regp->CRTC[9] |= 0x1F;
     else if (mode->VScan > 1)
-	regp->CRTC[9] |= mode->VScan - 1;
+        regp->CRTC[9] |= mode->VScan - 1;
     regp->CRTC[10] = 0x00;
     regp->CRTC[11] = 0x00;
     regp->CRTC[12] = 0x00;
@@ -1273,14 +1272,14 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
     regp->CRTC[16] = mode->CrtcVSyncStart & 0xFF;
     regp->CRTC[17] = (mode->CrtcVSyncEnd & 0x0F) | 0x20;
     regp->CRTC[18] = (mode->CrtcVDisplay - 1) & 0xFF;
-    regp->CRTC[19] = scrninfp->displayWidth >> 4;  /* just a guess */
+    regp->CRTC[19] = scrninfp->displayWidth >> 4;       /* just a guess */
     regp->CRTC[20] = 0x00;
-    regp->CRTC[21] = (mode->CrtcVBlankStart - 1) & 0xFF; 
+    regp->CRTC[21] = (mode->CrtcVBlankStart - 1) & 0xFF;
     regp->CRTC[22] = (mode->CrtcVBlankEnd - 1) & 0xFF;
     if (depth < 8)
-	regp->CRTC[23] = 0xE3;
+        regp->CRTC[23] = 0xE3;
     else
-	regp->CRTC[23] = 0xC3;
+        regp->CRTC[23] = 0xC3;
     regp->CRTC[24] = 0xFF;
 
     vgaHWHBlankKGA(mode, regp, 0, KGA_FIX_OVERSCAN | KGA_ENABLE_ON_ZERO);
@@ -1300,7 +1299,8 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
     if (depth == 1) {
         regp->Graphics[4] = BIT_PLANE;
         regp->Graphics[5] = 0x00;
-    } else {
+    }
+    else {
         regp->Graphics[4] = 0x00;
         if (depth == 4)
             regp->Graphics[5] = 0x02;
@@ -1310,32 +1310,33 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
     regp->Graphics[6] = 0x05;   /* only map 64k VGA memory !!!! */
     regp->Graphics[7] = 0x0F;
     regp->Graphics[8] = 0xFF;
-  
+
     if (depth == 1) {
         /* Initialise the Mono map according to which bit-plane gets used */
 
-	Bool flipPixels = xf86GetFlipPixels();
+        Bool flipPixels = xf86GetFlipPixels();
 
-        for (i=0; i<16; i++)
+        for (i = 0; i < 16; i++)
             if (((i & (1 << BIT_PLANE)) != 0) != flipPixels)
                 regp->Attribute[i] = WHITE_VALUE;
             else
                 regp->Attribute[i] = BLACK_VALUE;
 
-        regp->Attribute[16] = 0x01;  /* -VGA2- */ /* wrong for the ET4000 */
-	if (!hwp->ShowOverscan)
-            regp->Attribute[OVERSCAN] = OVERSCAN_VALUE;  /* -VGA2- */
-    } else {
-        regp->Attribute[0]  = 0x00; /* standard colormap translation */
-        regp->Attribute[1]  = 0x01;
-        regp->Attribute[2]  = 0x02;
-        regp->Attribute[3]  = 0x03;
-        regp->Attribute[4]  = 0x04;
-        regp->Attribute[5]  = 0x05;
-        regp->Attribute[6]  = 0x06;
-        regp->Attribute[7]  = 0x07;
-        regp->Attribute[8]  = 0x08;
-        regp->Attribute[9]  = 0x09;
+        regp->Attribute[16] = 0x01;     /* -VGA2- *//* wrong for the ET4000 */
+        if (!hwp->ShowOverscan)
+            regp->Attribute[OVERSCAN] = OVERSCAN_VALUE; /* -VGA2- */
+    }
+    else {
+        regp->Attribute[0] = 0x00;      /* standard colormap translation */
+        regp->Attribute[1] = 0x01;
+        regp->Attribute[2] = 0x02;
+        regp->Attribute[3] = 0x03;
+        regp->Attribute[4] = 0x04;
+        regp->Attribute[5] = 0x05;
+        regp->Attribute[6] = 0x06;
+        regp->Attribute[7] = 0x07;
+        regp->Attribute[8] = 0x08;
+        regp->Attribute[9] = 0x09;
         regp->Attribute[10] = 0x0A;
         regp->Attribute[11] = 0x0B;
         regp->Attribute[12] = 0x0C;
@@ -1389,36 +1390,37 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
      */
 
 CARD32
-vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, 
-	       unsigned int Flags)
+vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
+               unsigned int Flags)
 {
     int nExtBits = (nBits < 6) ? 0 : nBits - 6;
     CARD32 ExtBits;
     CARD32 ExtBitMask = ((1 << nExtBits) - 1) << 6;
 
-    regp->CRTC[3]  = (regp->CRTC[3] & ~0x1F) 
-                     | (((mode->CrtcHBlankEnd >> 3) - 1) & 0x1F);
-    regp->CRTC[5]  = (regp->CRTC[5] & ~0x80) 
-                     | ((((mode->CrtcHBlankEnd >> 3) - 1) & 0x20) << 2);
-    ExtBits        = ((mode->CrtcHBlankEnd >> 3) - 1) & ExtBitMask;
+    regp->CRTC[3] = (regp->CRTC[3] & ~0x1F)
+        | (((mode->CrtcHBlankEnd >> 3) - 1) & 0x1F);
+    regp->CRTC[5] = (regp->CRTC[5] & ~0x80)
+        | ((((mode->CrtcHBlankEnd >> 3) - 1) & 0x20) << 2);
+    ExtBits = ((mode->CrtcHBlankEnd >> 3) - 1) & ExtBitMask;
 
     /* First the horizontal case */
     if ((Flags & KGA_FIX_OVERSCAN)
-	&& ((mode->CrtcHBlankEnd >> 3) == (mode->CrtcHTotal >> 3)))
-    {
-	int i = (regp->CRTC[3] & 0x1F) 
-	    | ((regp->CRTC[5] & 0x80) >> 2)
-	    | ExtBits;
-	if (Flags & KGA_ENABLE_ON_ZERO) {
-	    if ((i-- > (((mode->CrtcHBlankStart >> 3) - 1) 
-		       & (0x3F | ExtBitMask)))
-	    && (mode->CrtcHBlankEnd == mode->CrtcHTotal))
-	    i = 0;
-	} else if (Flags & KGA_BE_TOT_DEC)
-	    i--;
-	regp->CRTC[3] = (regp->CRTC[3] & ~0x1F) | (i & 0x1F);
-	regp->CRTC[5] = (regp->CRTC[5] & ~0x80) | ((i << 2) & 0x80);
-	ExtBits = i & ExtBitMask;
+        && ((mode->CrtcHBlankEnd >> 3) == (mode->CrtcHTotal >> 3))) {
+        int i = (regp->CRTC[3] & 0x1F)
+            | ((regp->CRTC[5] & 0x80) >> 2)
+            | ExtBits;
+
+        if (Flags & KGA_ENABLE_ON_ZERO) {
+            if ((i-- > (((mode->CrtcHBlankStart >> 3) - 1)
+                        & (0x3F | ExtBitMask)))
+                && (mode->CrtcHBlankEnd == mode->CrtcHTotal))
+                i = 0;
+        }
+        else if (Flags & KGA_BE_TOT_DEC)
+            i--;
+        regp->CRTC[3] = (regp->CRTC[3] & ~0x1F) | (i & 0x1F);
+        regp->CRTC[5] = (regp->CRTC[5] & ~0x80) | ((i << 2) & 0x80);
+        ExtBits = i & ExtBitMask;
     }
     return ExtBits >> 6;
 }
@@ -1430,37 +1432,41 @@ vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
      * needs further investigation.
      */
 CARD32
-vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, 
-	       unsigned int Flags)
+vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
+               unsigned int Flags)
 {
     CARD32 ExtBits;
     CARD32 nExtBits = (nBits < 8) ? 0 : (nBits - 8);
     CARD32 ExtBitMask = ((1 << nExtBits) - 1) << 8;
+
     /* If width is not known nBits should be 0. In this 
      * case BitMask is set to 0 so we can check for it. */
     CARD32 BitMask = (nBits < 7) ? 0 : ((1 << nExtBits) - 1);
-    int VBlankStart = (mode->CrtcVBlankStart - 1) & 0xFF; 
+    int VBlankStart = (mode->CrtcVBlankStart - 1) & 0xFF;
+
     regp->CRTC[22] = (mode->CrtcVBlankEnd - 1) & 0xFF;
-    ExtBits        = (mode->CrtcVBlankEnd - 1) & ExtBitMask;
+    ExtBits = (mode->CrtcVBlankEnd - 1) & ExtBitMask;
 
-    if ((Flags & KGA_FIX_OVERSCAN) 
-	&& (mode->CrtcVBlankEnd == mode->CrtcVTotal))
-      /* Null top overscan */
+    if ((Flags & KGA_FIX_OVERSCAN)
+        && (mode->CrtcVBlankEnd == mode->CrtcVTotal))
+        /* Null top overscan */
     {
-	int i = regp->CRTC[22] | ExtBits;
-	if (Flags & KGA_ENABLE_ON_ZERO) {
-	    if (((BitMask && ((i & BitMask) > (VBlankStart & BitMask)))
-	     || ((i > VBlankStart)  &&  		/* 8-bit case */
-	    ((i & 0x7F) > (VBlankStart & 0x7F)))) &&	/* 7-bit case */
-	    !(regp->CRTC[9] & 0x9F))			/* 1 scanline/row */
-	    i = 0;
-	else
-	    i = (i - 1);
-	} else if (Flags & KGA_BE_TOT_DEC)
-	    i = (i - 1);
-
-	regp->CRTC[22] = i & 0xFF;
-	ExtBits = i & 0xFF00;
+        int i = regp->CRTC[22] | ExtBits;
+
+        if (Flags & KGA_ENABLE_ON_ZERO) {
+            if (((BitMask && ((i & BitMask) > (VBlankStart & BitMask)))
+                 || ((i > VBlankStart) &&       /* 8-bit case */
+                     ((i & 0x7F) > (VBlankStart & 0x7F)))) &&   /* 7-bit case */
+                !(regp->CRTC[9] & 0x9F))        /* 1 scanline/row */
+                i = 0;
+            else
+                i = (i - 1);
+        }
+        else if (Flags & KGA_BE_TOT_DEC)
+            i = (i - 1);
+
+        regp->CRTC[22] = i & 0xFF;
+        ExtBits = i & 0xFF00;
     }
     return ExtBits >> 8;
 }
@@ -1472,29 +1478,21 @@ static void
 vgaHWGetHWRecPrivate(void)
 {
     if (vgaHWPrivateIndex < 0)
-	vgaHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
+        vgaHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
     return;
 }
 
-
 static void
 vgaHWFreeRegs(vgaRegPtr regp)
 {
     free(regp->CRTC);
 
-    regp->CRTC =
-    regp->Sequencer =
-    regp->Graphics =
-    regp->Attribute = NULL;
+    regp->CRTC = regp->Sequencer = regp->Graphics = regp->Attribute = NULL;
 
     regp->numCRTC =
-    regp->numSequencer =
-    regp->numGraphics =
-    regp->numAttribute = 0;
+        regp->numSequencer = regp->numGraphics = regp->numAttribute = 0;
 }
 
-
-
 static Bool
 vgaHWAllocRegs(vgaRegPtr regp)
 {
@@ -1505,11 +1503,10 @@ vgaHWAllocRegs(vgaRegPtr regp)
         return FALSE;
 
     buf = calloc(regp->numCRTC +
-    		  regp->numSequencer +
-		  regp->numGraphics +
-		  regp->numAttribute, 1);
+                 regp->numSequencer +
+                 regp->numGraphics + regp->numAttribute, 1);
     if (!buf)
-    	return FALSE;
+        return FALSE;
 
     regp->CRTC = buf;
     regp->Sequencer = regp->CRTC + regp->numCRTC;
@@ -1519,7 +1516,6 @@ vgaHWAllocRegs(vgaRegPtr regp)
     return TRUE;
 }
 
-
 Bool
 vgaHWAllocDefaultRegs(vgaRegPtr regp)
 {
@@ -1531,10 +1527,9 @@ vgaHWAllocDefaultRegs(vgaRegPtr regp)
     return vgaHWAllocRegs(regp);
 }
 
-
 Bool
 vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer,
-		  int numGraphics, int numAttribute)
+                  int numGraphics, int numAttribute)
 {
 #define VGAHWMINNUM(regtype) \
 	((newMode.num##regtype < regp->num##regtype) ? \
@@ -1546,7 +1541,7 @@ vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer,
     vgaRegPtr regp;
 
     regp = &VGAHWPTR(scrp)->ModeReg;
-    memcpy (&newMode, regp, sizeof(vgaRegRec));
+    memcpy(&newMode, regp, sizeof(vgaRegRec));
 
     /* allocate space for new registers */
 
@@ -1556,10 +1551,10 @@ vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer,
     regp->numGraphics = numGraphics;
     regp->numAttribute = numAttribute;
     if (!vgaHWAllocRegs(regp))
-    	return FALSE;
+        return FALSE;
 
     regp = &VGAHWPTR(scrp)->SavedReg;
-    memcpy (&newSaved, regp, sizeof(vgaRegRec));
+    memcpy(&newSaved, regp, sizeof(vgaRegRec));
 
     regp = &newSaved;
     regp->numCRTC = numCRTC;
@@ -1568,7 +1563,7 @@ vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer,
     regp->numAttribute = numAttribute;
     if (!vgaHWAllocRegs(regp)) {
         vgaHWFreeRegs(&newMode);
-    	return FALSE;
+        return FALSE;
     }
 
     /* allocations succeeded, copy register data into new space */
@@ -1601,7 +1596,6 @@ vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer,
 #undef VGAHWCOPYREGSET
 }
 
-
 Bool
 vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src)
 {
@@ -1610,7 +1604,7 @@ vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src)
     memcpy(dst, src, sizeof(vgaRegRec));
 
     if (!vgaHWAllocRegs(dst))
-	return FALSE;
+        return FALSE;
 
     memcpy(dst->CRTC, src->CRTC, src->numCRTC);
     memcpy(dst->Sequencer, src->Sequencer, src->numSequencer);
@@ -1620,14 +1614,13 @@ vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src)
     return TRUE;
 }
 
-
 Bool
 vgaHWGetHWRec(ScrnInfoPtr scrp)
 {
     vgaRegPtr regp;
     vgaHWPtr hwp;
     int i;
-    
+
     /*
      * Let's make sure that the private exists and allocate one.
      */
@@ -1637,41 +1630,49 @@ vgaHWGetHWRec(ScrnInfoPtr scrp)
      * has already been done.
      */
     if (VGAHWPTR(scrp))
-	return TRUE;
+        return TRUE;
     hwp = VGAHWPTRLVAL(scrp) = xnfcalloc(sizeof(vgaHWRec), 1);
     regp = &VGAHWPTR(scrp)->ModeReg;
 
     if ((!vgaHWAllocDefaultRegs(&VGAHWPTR(scrp)->SavedReg)) ||
-    	(!vgaHWAllocDefaultRegs(&VGAHWPTR(scrp)->ModeReg))) {
+        (!vgaHWAllocDefaultRegs(&VGAHWPTR(scrp)->ModeReg))) {
         free(hwp);
-	return FALSE;
+        return FALSE;
     }
 
     if (scrp->bitsPerPixel == 1) {
-	rgb blackColour = scrp->display->blackColour,
-	    whiteColour = scrp->display->whiteColour;
-
-	if (blackColour.red   > 0x3F) blackColour.red   = 0x3F;
-	if (blackColour.green > 0x3F) blackColour.green = 0x3F;
-	if (blackColour.blue  > 0x3F) blackColour.blue  = 0x3F;
-
-	if (whiteColour.red   > 0x3F) whiteColour.red   = 0x3F;
-	if (whiteColour.green > 0x3F) whiteColour.green = 0x3F;
-	if (whiteColour.blue  > 0x3F) whiteColour.blue  = 0x3F;
-
-	if ((blackColour.red   == whiteColour.red  ) &&
-	    (blackColour.green == whiteColour.green) &&
-	    (blackColour.blue  == whiteColour.blue )) {
-	    blackColour.red   ^= 0x3F;
-	    blackColour.green ^= 0x3F;
-	    blackColour.blue  ^= 0x3F;
-	}
+        rgb blackColour = scrp->display->blackColour,
+            whiteColour = scrp->display->whiteColour;
+
+        if (blackColour.red > 0x3F)
+            blackColour.red = 0x3F;
+        if (blackColour.green > 0x3F)
+            blackColour.green = 0x3F;
+        if (blackColour.blue > 0x3F)
+            blackColour.blue = 0x3F;
+
+        if (whiteColour.red > 0x3F)
+            whiteColour.red = 0x3F;
+        if (whiteColour.green > 0x3F)
+            whiteColour.green = 0x3F;
+        if (whiteColour.blue > 0x3F)
+            whiteColour.blue = 0x3F;
+
+        if ((blackColour.red == whiteColour.red) &&
+            (blackColour.green == whiteColour.green) &&
+            (blackColour.blue == whiteColour.blue)) {
+            blackColour.red ^= 0x3F;
+            blackColour.green ^= 0x3F;
+            blackColour.blue ^= 0x3F;
+        }
 
         /*
          * initialize default colormap for monochrome
          */
-        for (i=0; i<3;   i++) regp->DAC[i] = 0x00;
-        for (i=3; i<768; i++) regp->DAC[i] = 0x3F;
+        for (i = 0; i < 3; i++)
+            regp->DAC[i] = 0x00;
+        for (i = 3; i < 768; i++)
+            regp->DAC[i] = 0x3F;
         i = BLACK_VALUE * 3;
         regp->DAC[i++] = blackColour.red;
         regp->DAC[i++] = blackColour.green;
@@ -1684,23 +1685,26 @@ vgaHWGetHWRec(ScrnInfoPtr scrp)
         regp->DAC[i++] = 0x00;
         regp->DAC[i++] = 0x00;
         regp->DAC[i] = 0x00;
-    } else {
-	/* Set all colours to black */
-        for (i=0; i<768; i++) regp->DAC[i] = 0x00;
+    }
+    else {
+        /* Set all colours to black */
+        for (i = 0; i < 768; i++)
+            regp->DAC[i] = 0x00;
         /* ... and the overscan */
         if (scrp->depth >= 4)
             regp->Attribute[OVERSCAN] = 0xFF;
     }
     if (xf86FindOption(scrp->confScreen->options, "ShowOverscan")) {
-	xf86MarkOptionUsedByName(scrp->confScreen->options, "ShowOverscan");
-	xf86DrvMsg(scrp->scrnIndex, X_CONFIG, "Showing overscan area\n");
-	regp->DAC[765] = 0x3F; 
-	regp->DAC[766] = 0x00; 
-	regp->DAC[767] = 0x3F; 
-	regp->Attribute[OVERSCAN] = 0xFF;
-	hwp->ShowOverscan = TRUE;
-    } else
-	hwp->ShowOverscan = FALSE;
+        xf86MarkOptionUsedByName(scrp->confScreen->options, "ShowOverscan");
+        xf86DrvMsg(scrp->scrnIndex, X_CONFIG, "Showing overscan area\n");
+        regp->DAC[765] = 0x3F;
+        regp->DAC[766] = 0x00;
+        regp->DAC[767] = 0x3F;
+        regp->Attribute[OVERSCAN] = 0xFF;
+        hwp->ShowOverscan = TRUE;
+    }
+    else
+        hwp->ShowOverscan = FALSE;
 
     hwp->paletteEnabled = FALSE;
     hwp->cmapSaved = FALSE;
@@ -1712,44 +1716,42 @@ vgaHWGetHWRec(ScrnInfoPtr scrp)
     return TRUE;
 }
 
-
 void
 vgaHWFreeHWRec(ScrnInfoPtr scrp)
 {
     if (vgaHWPrivateIndex >= 0) {
-	vgaHWPtr hwp = VGAHWPTR(scrp);
+        vgaHWPtr hwp = VGAHWPTR(scrp);
 
-	if (!hwp)
+        if (!hwp)
             return;
 
         pci_device_close_io(hwp->dev, hwp->io);
 
-	free(hwp->FontInfo1);
-	free(hwp->FontInfo2);
-	free(hwp->TextInfo);
+        free(hwp->FontInfo1);
+        free(hwp->FontInfo2);
+        free(hwp->TextInfo);
 
-	vgaHWFreeRegs (&hwp->ModeReg);
-	vgaHWFreeRegs (&hwp->SavedReg);
+        vgaHWFreeRegs(&hwp->ModeReg);
+        vgaHWFreeRegs(&hwp->SavedReg);
 
-	free(hwp);
-	VGAHWPTRLVAL(scrp) = NULL;
+        free(hwp);
+        VGAHWPTRLVAL(scrp) = NULL;
     }
 }
 
-
 Bool
 vgaHWMapMem(ScrnInfoPtr scrp)
 {
     vgaHWPtr hwp = VGAHWPTR(scrp);
-    
+
     if (hwp->Base)
-	return TRUE;
+        return TRUE;
 
     /* If not set, initialise with the defaults */
     if (hwp->MapSize == 0)
-	hwp->MapSize = VGA_DEFAULT_MEM_SIZE;
+        hwp->MapSize = VGA_DEFAULT_MEM_SIZE;
     if (hwp->MapPhys == 0)
-	hwp->MapPhys = VGA_DEFAULT_PHYS_ADDR;
+        hwp->MapPhys = VGA_DEFAULT_PHYS_ADDR;
 
     /*
      * Map as VIDMEM_MMIO_32BIT because WC
@@ -1758,19 +1760,19 @@ vgaHWMapMem(ScrnInfoPtr scrp)
      * for now.
      */
     DebugF("Mapping VGAMem\n");
-    pci_device_map_legacy(hwp->dev, hwp->MapPhys, hwp->MapSize, PCI_DEV_MAP_FLAG_WRITABLE, &hwp->Base);
+    pci_device_map_legacy(hwp->dev, hwp->MapPhys, hwp->MapSize,
+                          PCI_DEV_MAP_FLAG_WRITABLE, &hwp->Base);
     return hwp->Base != NULL;
 }
 
-
 void
 vgaHWUnmapMem(ScrnInfoPtr scrp)
 {
     vgaHWPtr hwp = VGAHWPTR(scrp);
 
     if (hwp->Base == NULL)
-	return;
-    
+        return;
+
     DebugF("Unmapping VGAMem\n");
     pci_device_unmap_legacy(hwp->dev, hwp->Base, hwp->MapSize);
     hwp->Base = NULL;
@@ -1782,17 +1784,15 @@ vgaHWGetIndex(void)
     return vgaHWPrivateIndex;
 }
 
-
 void
 vgaHWGetIOBase(vgaHWPtr hwp)
 {
     hwp->IOBase = (hwp->readMiscOut(hwp) & 0x01) ?
-				VGA_IOBASE_COLOR : VGA_IOBASE_MONO;
+        VGA_IOBASE_COLOR : VGA_IOBASE_MONO;
     xf86DrvMsgVerb(hwp->pScrn->scrnIndex, X_INFO, 3,
-	"vgaHWGetIOBase: hwp->IOBase is 0x%04x\n", hwp->IOBase);
+                   "vgaHWGetIOBase: hwp->IOBase is 0x%04x\n", hwp->IOBase);
 }
 
-
 void
 vgaHWLock(vgaHWPtr hwp)
 {
@@ -1804,87 +1804,82 @@ void
 vgaHWUnlock(vgaHWPtr hwp)
 {
     /* Unprotect CRTC[0-7] */
-     hwp->writeCrtc(hwp, 0x11, hwp->readCrtc(hwp, 0x11) & ~0x80);
+    hwp->writeCrtc(hwp, 0x11, hwp->readCrtc(hwp, 0x11) & ~0x80);
 }
 
-
 void
 vgaHWEnable(vgaHWPtr hwp)
 {
     hwp->writeEnable(hwp, hwp->readEnable(hwp) | 0x01);
 }
 
-
 void
 vgaHWDisable(vgaHWPtr hwp)
 {
     hwp->writeEnable(hwp, hwp->readEnable(hwp) & ~0x01);
 }
 
-
 static void
-vgaHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
-		 VisualPtr pVisual)
+vgaHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO * colors,
+                 VisualPtr pVisual)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     int i, index;
 
     for (i = 0; i < numColors; i++) {
-	index = indices[i];
-	hwp->writeDacWriteAddr(hwp, index);
-	DACDelay(hwp);
-	hwp->writeDacData(hwp, colors[index].red);
-	DACDelay(hwp);
-	hwp->writeDacData(hwp, colors[index].green);
-	DACDelay(hwp);
-	hwp->writeDacData(hwp, colors[index].blue);
-	DACDelay(hwp);
+        index = indices[i];
+        hwp->writeDacWriteAddr(hwp, index);
+        DACDelay(hwp);
+        hwp->writeDacData(hwp, colors[index].red);
+        DACDelay(hwp);
+        hwp->writeDacData(hwp, colors[index].green);
+        DACDelay(hwp);
+        hwp->writeDacData(hwp, colors[index].blue);
+        DACDelay(hwp);
     }
 
     /* This shouldn't be necessary, but we'll play safe. */
     hwp->disablePalette(hwp);
 }
 
-
 static void
 vgaHWSetOverscan(ScrnInfoPtr pScrn, int overscan)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
     if (overscan < 0 || overscan > 255)
-	return;
+        return;
 
     hwp->enablePalette(hwp);
     hwp->writeAttr(hwp, OVERSCAN, overscan);
 
 #ifdef DEBUGOVERSCAN
     {
-	int ov = hwp->readAttr(hwp, OVERSCAN);
-	int red, green, blue;
-
-	hwp->writeDacReadAddr(hwp, ov);
-	red = hwp->readDacData(hwp);
-	green = hwp->readDacData(hwp);
-	blue = hwp->readDacData(hwp);
-	ErrorF("Overscan index is 0x%02x, colours are #%02x%02x%02x\n",
-		ov, red, green, blue);
+        int ov = hwp->readAttr(hwp, OVERSCAN);
+        int red, green, blue;
+
+        hwp->writeDacReadAddr(hwp, ov);
+        red = hwp->readDacData(hwp);
+        green = hwp->readDacData(hwp);
+        blue = hwp->readDacData(hwp);
+        ErrorF("Overscan index is 0x%02x, colours are #%02x%02x%02x\n",
+               ov, red, green, blue);
     }
 #endif
 
     hwp->disablePalette(hwp);
 }
 
-
 Bool
 vgaHWHandleColormaps(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 
     if (pScrn->depth > 1 && pScrn->depth <= 8) {
-	return xf86HandleColormaps(pScreen, 1 << pScrn->depth,
-				   pScrn->rgbBits, vgaHWLoadPalette,
-				   pScrn->depth > 4 ? vgaHWSetOverscan : NULL,
-				   CMAP_RELOAD_ON_MODE_SWITCH);
+        return xf86HandleColormaps(pScreen, 1 << pScrn->depth,
+                                   pScrn->rgbBits, vgaHWLoadPalette,
+                                   pScrn->depth > 4 ? vgaHWSetOverscan : NULL,
+                                   CMAP_RELOAD_ON_MODE_SWITCH);
     }
     return TRUE;
 }
@@ -1923,57 +1918,60 @@ vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     unsigned char tmp;
-    struct _vgaDdcSave* save;
+    struct _vgaDdcSave *save;
+
     switch (speed) {
     case DDC_FAST:
-        
-        if (hwp->ddc != NULL) break;
-        hwp->ddc = xnfcalloc(sizeof(struct _vgaDdcSave),1);
-	save = (struct _vgaDdcSave *)hwp->ddc;
-      /* Lightpen register disable - allow access to cr10 & 11; just in case */
-	save->cr03 = hwp->readCrtc(hwp, 0x03); 
-	hwp->writeCrtc(hwp,0x03,(save->cr03 |0x80));
-	save->cr12 = hwp->readCrtc(hwp, 0x12); 
-	hwp->writeCrtc(hwp,0x12,DISPLAY_END);
-	save->cr15 = hwp->readCrtc(hwp, 0x15); 
-	hwp->writeCrtc(hwp,0x15,BLANK_START);
-	save->cr10 = hwp->readCrtc(hwp, 0x10); 
-	hwp->writeCrtc(hwp,0x10,SYNC_START);
-	save->cr11 = hwp->readCrtc(hwp, 0x11); 
-	/* unprotect group 1 registers; just in case ...*/
-	hwp->writeCrtc(hwp,0x11,((save->cr11 & 0x70) | SYNC_END));
-	save->cr16 = hwp->readCrtc(hwp, 0x16); 
-	hwp->writeCrtc(hwp,0x16,BLANK_END);
-	save->cr06 = hwp->readCrtc(hwp, 0x06); 
-	hwp->writeCrtc(hwp,0x06,V_TOTAL);
-	/* all values have less than 8 bit - mask out 9th and 10th bits */
-	save->cr09 = hwp->readCrtc(hwp, 0x09); 
-	hwp->writeCrtc(hwp,0x09,(save->cr09 &0xDF));
-	save->cr07 = hwp->readCrtc(hwp, 0x07); 
-	hwp->writeCrtc(hwp,0x07,(save->cr07 &0x10));
-	/* vsync polarity negativ & ensure a 25MHz clock */
-	save->msr = hwp->readMiscOut(hwp); 
-	hwp->writeMiscOut(hwp,((save->msr & 0xF3) | 0x80));
-	break;
+
+        if (hwp->ddc != NULL)
+            break;
+        hwp->ddc = xnfcalloc(sizeof(struct _vgaDdcSave), 1);
+        save = (struct _vgaDdcSave *) hwp->ddc;
+        /* Lightpen register disable - allow access to cr10 & 11; just in case */
+        save->cr03 = hwp->readCrtc(hwp, 0x03);
+        hwp->writeCrtc(hwp, 0x03, (save->cr03 | 0x80));
+        save->cr12 = hwp->readCrtc(hwp, 0x12);
+        hwp->writeCrtc(hwp, 0x12, DISPLAY_END);
+        save->cr15 = hwp->readCrtc(hwp, 0x15);
+        hwp->writeCrtc(hwp, 0x15, BLANK_START);
+        save->cr10 = hwp->readCrtc(hwp, 0x10);
+        hwp->writeCrtc(hwp, 0x10, SYNC_START);
+        save->cr11 = hwp->readCrtc(hwp, 0x11);
+        /* unprotect group 1 registers; just in case ... */
+        hwp->writeCrtc(hwp, 0x11, ((save->cr11 & 0x70) | SYNC_END));
+        save->cr16 = hwp->readCrtc(hwp, 0x16);
+        hwp->writeCrtc(hwp, 0x16, BLANK_END);
+        save->cr06 = hwp->readCrtc(hwp, 0x06);
+        hwp->writeCrtc(hwp, 0x06, V_TOTAL);
+        /* all values have less than 8 bit - mask out 9th and 10th bits */
+        save->cr09 = hwp->readCrtc(hwp, 0x09);
+        hwp->writeCrtc(hwp, 0x09, (save->cr09 & 0xDF));
+        save->cr07 = hwp->readCrtc(hwp, 0x07);
+        hwp->writeCrtc(hwp, 0x07, (save->cr07 & 0x10));
+        /* vsync polarity negativ & ensure a 25MHz clock */
+        save->msr = hwp->readMiscOut(hwp);
+        hwp->writeMiscOut(hwp, ((save->msr & 0xF3) | 0x80));
+        break;
     case DDC_SLOW:
-        if (hwp->ddc == NULL) break;
-	save = (struct _vgaDdcSave *)hwp->ddc;
-	hwp->writeMiscOut(hwp,save->msr);
-	hwp->writeCrtc(hwp,0x07,save->cr07);
-	tmp = hwp->readCrtc(hwp, 0x09);
-	hwp->writeCrtc(hwp,0x09,((save->cr09 & 0x20) | (tmp & 0xDF)));
-	hwp->writeCrtc(hwp,0x06,save->cr06);
-	hwp->writeCrtc(hwp,0x16,save->cr16);
-	hwp->writeCrtc(hwp,0x11,save->cr11);
-	hwp->writeCrtc(hwp,0x10,save->cr10);
-	hwp->writeCrtc(hwp,0x15,save->cr15);
-	hwp->writeCrtc(hwp,0x12,save->cr12);
-	hwp->writeCrtc(hwp,0x03,save->cr03);
-	free(save);
-	hwp->ddc = NULL;
-	break;
+        if (hwp->ddc == NULL)
+            break;
+        save = (struct _vgaDdcSave *) hwp->ddc;
+        hwp->writeMiscOut(hwp, save->msr);
+        hwp->writeCrtc(hwp, 0x07, save->cr07);
+        tmp = hwp->readCrtc(hwp, 0x09);
+        hwp->writeCrtc(hwp, 0x09, ((save->cr09 & 0x20) | (tmp & 0xDF)));
+        hwp->writeCrtc(hwp, 0x06, save->cr06);
+        hwp->writeCrtc(hwp, 0x16, save->cr16);
+        hwp->writeCrtc(hwp, 0x11, save->cr11);
+        hwp->writeCrtc(hwp, 0x10, save->cr10);
+        hwp->writeCrtc(hwp, 0x15, save->cr15);
+        hwp->writeCrtc(hwp, 0x12, save->cr12);
+        hwp->writeCrtc(hwp, 0x03, save->cr03);
+        free(save);
+        hwp->ddc = NULL;
+        break;
     default:
-	break;
+        break;
     }
 }
 
@@ -1983,7 +1981,8 @@ vgaHWddc1SetSpeedWeak(void)
     return vgaHWddc1SetSpeed;
 }
 
-SaveScreenProcPtr vgaHWSaveScreenWeak(void)
+SaveScreenProcPtr
+vgaHWSaveScreenWeak(void)
 {
     return vgaHWSaveScreen;
 }
@@ -1992,89 +1991,87 @@ SaveScreenProcPtr vgaHWSaveScreenWeak(void)
  * xf86GetClocks -- get the dot-clocks via a BIG BAD hack ...
  */
 void
-xf86GetClocks(ScrnInfoPtr pScrn, int num, Bool (*ClockFunc)(ScrnInfoPtr, int),
-	      void (*ProtectRegs)(ScrnInfoPtr, Bool),
-	      void (*BlankScreen)(ScrnInfoPtr, Bool), unsigned long vertsyncreg,
-	      int maskval, int knownclkindex, int knownclkvalue)
+xf86GetClocks(ScrnInfoPtr pScrn, int num, Bool (*ClockFunc) (ScrnInfoPtr, int),
+              void (*ProtectRegs) (ScrnInfoPtr, Bool),
+              void (*BlankScreen) (ScrnInfoPtr, Bool),
+              unsigned long vertsyncreg, int maskval, int knownclkindex,
+              int knownclkvalue)
 {
     register int status = vertsyncreg;
     unsigned long i, cnt, rcnt, sync;
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
     /* First save registers that get written on */
-    (*ClockFunc)(pScrn, CLK_REG_SAVE);
+    (*ClockFunc) (pScrn, CLK_REG_SAVE);
 
     if (num > MAXCLOCKS)
-	num = MAXCLOCKS;
-
-    for (i = 0; i < num; i++)
-    {
-	if (ProtectRegs)
-	    (*ProtectRegs)(pScrn, TRUE);
-	if (!(*ClockFunc)(pScrn, i))
-	{
-	    pScrn->clock[i] = -1;
-	    continue;
-	}
-	if (ProtectRegs)
-	    (*ProtectRegs)(pScrn, FALSE);
-	if (BlankScreen)
-	    (*BlankScreen)(pScrn, FALSE);
-
-	usleep(50000);     /* let VCO stabilise */
-
-	cnt  = 0;
-	sync = 200000;
-
-	while ((pci_io_read8(hwp->io, status) & maskval) == 0x00)
-	    if (sync-- == 0) goto finish;
-	/* Something appears to be happening, so reset sync count */
-	sync = 200000;
-	while ((pci_io_read8(hwp->io, status) & maskval) == maskval)
-	    if (sync-- == 0) goto finish;
-	/* Something appears to be happening, so reset sync count */
-	sync = 200000;
-	while ((pci_io_read8(hwp->io, status) & maskval) == 0x00)
-	    if (sync-- == 0) goto finish;
-
-	for (rcnt = 0; rcnt < 5; rcnt++)
-	{
-	    while (!(pci_io_read8(hwp->io, status) & maskval))
-		cnt++;
-	    while ((pci_io_read8(hwp->io, status) & maskval))
-		cnt++;
-	}
-
-finish:
-	pScrn->clock[i] = cnt ? cnt : -1;
-	if (BlankScreen)
-            (*BlankScreen)(pScrn, TRUE);
+        num = MAXCLOCKS;
+
+    for (i = 0; i < num; i++) {
+        if (ProtectRegs)
+            (*ProtectRegs) (pScrn, TRUE);
+        if (!(*ClockFunc) (pScrn, i)) {
+            pScrn->clock[i] = -1;
+            continue;
+        }
+        if (ProtectRegs)
+            (*ProtectRegs) (pScrn, FALSE);
+        if (BlankScreen)
+            (*BlankScreen) (pScrn, FALSE);
+
+        usleep(50000);          /* let VCO stabilise */
+
+        cnt = 0;
+        sync = 200000;
+
+        while ((pci_io_read8(hwp->io, status) & maskval) == 0x00)
+            if (sync-- == 0)
+                goto finish;
+        /* Something appears to be happening, so reset sync count */
+        sync = 200000;
+        while ((pci_io_read8(hwp->io, status) & maskval) == maskval)
+            if (sync-- == 0)
+                goto finish;
+        /* Something appears to be happening, so reset sync count */
+        sync = 200000;
+        while ((pci_io_read8(hwp->io, status) & maskval) == 0x00)
+            if (sync-- == 0)
+                goto finish;
+
+        for (rcnt = 0; rcnt < 5; rcnt++) {
+            while (!(pci_io_read8(hwp->io, status) & maskval))
+                cnt++;
+            while ((pci_io_read8(hwp->io, status) & maskval))
+                cnt++;
+        }
+
+ finish:
+        pScrn->clock[i] = cnt ? cnt : -1;
+        if (BlankScreen)
+            (*BlankScreen) (pScrn, TRUE);
     }
 
-    for (i = 0; i < num; i++)
-    {
-	if (i != knownclkindex)
-	{
-	    if (pScrn->clock[i] == -1)
-	    {
-		pScrn->clock[i] = 0;
-	    }
-	    else
-	    {
-		pScrn->clock[i] = (int)(0.5 +
-                    (((float)knownclkvalue) * pScrn->clock[knownclkindex]) /
-	            (pScrn->clock[i]));
-		/* Round to nearest 10KHz */
-		pScrn->clock[i] += 5;
-		pScrn->clock[i] /= 10;
-		pScrn->clock[i] *= 10;
-	    }
-	}
+    for (i = 0; i < num; i++) {
+        if (i != knownclkindex) {
+            if (pScrn->clock[i] == -1) {
+                pScrn->clock[i] = 0;
+            }
+            else {
+                pScrn->clock[i] = (int) (0.5 +
+                                         (((float) knownclkvalue) *
+                                          pScrn->clock[knownclkindex]) /
+                                         (pScrn->clock[i]));
+                /* Round to nearest 10KHz */
+                pScrn->clock[i] += 5;
+                pScrn->clock[i] /= 10;
+                pScrn->clock[i] *= 10;
+            }
+        }
     }
 
     pScrn->clock[knownclkindex] = knownclkvalue;
     pScrn->numClocks = num;
 
     /* Restore registers that were written on */
-    (*ClockFunc)(pScrn, CLK_REG_RESTORE);
+    (*ClockFunc) (pScrn, CLK_REG_RESTORE);
 }
diff --git a/xorg-server/hw/xfree86/vgahw/vgaHW.h b/xorg-server/hw/xfree86/vgahw/vgaHW.h
index d1ba9da89..937a8a507 100644
--- a/xorg-server/hw/xfree86/vgahw/vgaHW.h
+++ b/xorg-server/hw/xfree86/vgahw/vgaHW.h
@@ -1,5 +1,4 @@
 
-
 /*
  * Copyright (c) 1997,1998 The XFree86 Project, Inc.
  *
@@ -38,8 +37,8 @@ extern _X_EXPORT int vgaHWGetIndex(void);
 #define VGA_ATTR_INDEX		0x3C0
 #define VGA_ATTR_DATA_W		0x3C0
 #define VGA_ATTR_DATA_R		0x3C1
-#define VGA_IN_STAT_0		0x3C2		/* read */
-#define VGA_MISC_OUT_W		0x3C2		/* write */
+#define VGA_IN_STAT_0		0x3C2   /* read */
+#define VGA_MISC_OUT_W		0x3C2   /* write */
 #define VGA_ENABLE		0x3C3
 #define VGA_SEQ_INDEX		0x3C4
 #define VGA_SEQ_DATA		0x3C5
@@ -47,8 +46,8 @@ extern _X_EXPORT int vgaHWGetIndex(void);
 #define VGA_DAC_READ_ADDR	0x3C7
 #define VGA_DAC_WRITE_ADDR	0x3C8
 #define VGA_DAC_DATA		0x3C9
-#define VGA_FEATURE_R		0x3CA		/* read */
-#define VGA_MISC_OUT_R		0x3CC		/* read */
+#define VGA_FEATURE_R		0x3CA   /* read */
+#define VGA_MISC_OUT_R		0x3CC   /* read */
 #define VGA_GRAPH_INDEX		0x3CE
 #define VGA_GRAPH_DATA		0x3CF
 
@@ -57,8 +56,8 @@ extern _X_EXPORT int vgaHWGetIndex(void);
 
 #define VGA_CRTC_INDEX_OFFSET	0x04
 #define VGA_CRTC_DATA_OFFSET	0x05
-#define VGA_IN_STAT_1_OFFSET	0x0A		/* read */
-#define VGA_FEATURE_W_OFFSET	0x0A		/* write */
+#define VGA_IN_STAT_1_OFFSET	0x0A    /* read */
+#define VGA_FEATURE_W_OFFSET	0x0A    /* write */
 
 /* default number of VGA registers stored internally */
 #define VGA_NUM_CRTC 25
@@ -80,26 +79,25 @@ extern _X_EXPORT int vgaHWGetIndex(void);
  * vgaRegRec contains settings of standard VGA registers.
  */
 typedef struct {
-    unsigned char MiscOutReg;     /* */
-    unsigned char *CRTC;       /* Crtc Controller */
+    unsigned char MiscOutReg;   /* */
+    unsigned char *CRTC;        /* Crtc Controller */
     unsigned char *Sequencer;   /* Video Sequencer */
     unsigned char *Graphics;    /* Video Graphics */
-    unsigned char *Attribute;  /* Video Atribute */
-    unsigned char DAC[768];       /* Internal Colorlookuptable */
-    unsigned char numCRTC;	/* number of CRTC registers, def=VGA_NUM_CRTC */
-    unsigned char numSequencer;	/* number of seq registers, def=VGA_NUM_SEQ */
-    unsigned char numGraphics;	/* number of gfx registers, def=VGA_NUM_GFX */
-    unsigned char numAttribute;	/* number of attr registers, def=VGA_NUM_ATTR */
+    unsigned char *Attribute;   /* Video Atribute */
+    unsigned char DAC[768];     /* Internal Colorlookuptable */
+    unsigned char numCRTC;      /* number of CRTC registers, def=VGA_NUM_CRTC */
+    unsigned char numSequencer; /* number of seq registers, def=VGA_NUM_SEQ */
+    unsigned char numGraphics;  /* number of gfx registers, def=VGA_NUM_GFX */
+    unsigned char numAttribute; /* number of attr registers, def=VGA_NUM_ATTR */
 } vgaRegRec, *vgaRegPtr;
 
 typedef struct _vgaHWRec *vgaHWPtr;
 
-typedef void (*vgaHWWriteIndexProcPtr)(vgaHWPtr hwp, CARD8 indx, CARD8 value);
-typedef CARD8 (*vgaHWReadIndexProcPtr)(vgaHWPtr hwp, CARD8 indx);
-typedef void (*vgaHWWriteProcPtr)(vgaHWPtr hwp, CARD8 value);
-typedef CARD8 (*vgaHWReadProcPtr)(vgaHWPtr hwp);
-typedef void (*vgaHWMiscProcPtr)(vgaHWPtr hwp);
-
+typedef void (*vgaHWWriteIndexProcPtr) (vgaHWPtr hwp, CARD8 indx, CARD8 value);
+typedef CARD8 (*vgaHWReadIndexProcPtr) (vgaHWPtr hwp, CARD8 indx);
+typedef void (*vgaHWWriteProcPtr) (vgaHWPtr hwp, CARD8 value);
+typedef CARD8 (*vgaHWReadProcPtr) (vgaHWPtr hwp);
+typedef void (*vgaHWMiscProcPtr) (vgaHWPtr hwp);
 
 /*
  * vgaHWRec contains per-screen information required by the vgahw module.
@@ -109,64 +107,64 @@ typedef void (*vgaHWMiscProcPtr)(vgaHWPtr hwp);
  * via the first 17 attribute registers and not the main 8-bit palette.
  */
 typedef struct _vgaHWRec {
-    pointer			Base;		/* Address of "VGA" memory */
-    int				MapSize;	/* Size of "VGA" memory */
-    unsigned long		MapPhys;	/* phys location of VGA mem */
-    int				IOBase;		/* I/O Base address */
-    CARD8 * 			MMIOBase;	/* Pointer to MMIO start */
-    int				MMIOOffset;	/* base + offset + vgareg
-						   = mmioreg */
-    pointer			FontInfo1;	/* save area for fonts in
-							plane 2 */ 
-    pointer			FontInfo2;	/* save area for fonts in	
-							plane 3 */ 
-    pointer			TextInfo;	/* save area for text */ 
-    vgaRegRec			SavedReg;	/* saved registers */
-    vgaRegRec			ModeReg;	/* register settings for
-							current mode */
-    Bool			ShowOverscan;
-    Bool			paletteEnabled;
-    Bool			cmapSaved;
-    ScrnInfoPtr			pScrn;
-    vgaHWWriteIndexProcPtr	writeCrtc;
-    vgaHWReadIndexProcPtr	readCrtc;
-    vgaHWWriteIndexProcPtr	writeGr;
-    vgaHWReadIndexProcPtr	readGr;
-    vgaHWReadProcPtr            readST00;
-    vgaHWReadProcPtr            readST01;
-    vgaHWReadProcPtr            readFCR;
-    vgaHWWriteProcPtr           writeFCR;
-    vgaHWWriteIndexProcPtr	writeAttr;
-    vgaHWReadIndexProcPtr	readAttr;
-    vgaHWWriteIndexProcPtr	writeSeq;
-    vgaHWReadIndexProcPtr	readSeq;
-    vgaHWWriteProcPtr		writeMiscOut;
-    vgaHWReadProcPtr		readMiscOut;
-    vgaHWMiscProcPtr		enablePalette;
-    vgaHWMiscProcPtr		disablePalette;
-    vgaHWWriteProcPtr		writeDacMask;
-    vgaHWReadProcPtr		readDacMask;
-    vgaHWWriteProcPtr		writeDacWriteAddr;
-    vgaHWWriteProcPtr		writeDacReadAddr;
-    vgaHWWriteProcPtr		writeDacData;
-    vgaHWReadProcPtr		readDacData;
-    pointer                     ddc;
-    struct pci_io_handle        *io;
-    vgaHWReadProcPtr		readEnable;
-    vgaHWWriteProcPtr		writeEnable;
-    struct pci_device          *dev;
+    pointer Base;               /* Address of "VGA" memory */
+    int MapSize;                /* Size of "VGA" memory */
+    unsigned long MapPhys;      /* phys location of VGA mem */
+    int IOBase;                 /* I/O Base address */
+    CARD8 *MMIOBase;            /* Pointer to MMIO start */
+    int MMIOOffset;             /* base + offset + vgareg
+                                   = mmioreg */
+    pointer FontInfo1;          /* save area for fonts in
+                                   plane 2 */
+    pointer FontInfo2;          /* save area for fonts in       
+                                   plane 3 */
+    pointer TextInfo;           /* save area for text */
+    vgaRegRec SavedReg;         /* saved registers */
+    vgaRegRec ModeReg;          /* register settings for
+                                   current mode */
+    Bool ShowOverscan;
+    Bool paletteEnabled;
+    Bool cmapSaved;
+    ScrnInfoPtr pScrn;
+    vgaHWWriteIndexProcPtr writeCrtc;
+    vgaHWReadIndexProcPtr readCrtc;
+    vgaHWWriteIndexProcPtr writeGr;
+    vgaHWReadIndexProcPtr readGr;
+    vgaHWReadProcPtr readST00;
+    vgaHWReadProcPtr readST01;
+    vgaHWReadProcPtr readFCR;
+    vgaHWWriteProcPtr writeFCR;
+    vgaHWWriteIndexProcPtr writeAttr;
+    vgaHWReadIndexProcPtr readAttr;
+    vgaHWWriteIndexProcPtr writeSeq;
+    vgaHWReadIndexProcPtr readSeq;
+    vgaHWWriteProcPtr writeMiscOut;
+    vgaHWReadProcPtr readMiscOut;
+    vgaHWMiscProcPtr enablePalette;
+    vgaHWMiscProcPtr disablePalette;
+    vgaHWWriteProcPtr writeDacMask;
+    vgaHWReadProcPtr readDacMask;
+    vgaHWWriteProcPtr writeDacWriteAddr;
+    vgaHWWriteProcPtr writeDacReadAddr;
+    vgaHWWriteProcPtr writeDacData;
+    vgaHWReadProcPtr readDacData;
+    pointer ddc;
+    struct pci_io_handle *io;
+    vgaHWReadProcPtr readEnable;
+    vgaHWWriteProcPtr writeEnable;
+    struct pci_device *dev;
 } vgaHWRec;
 
 /* Some macros that VGA drivers can use in their ChipProbe() function */
-#define OVERSCAN 0x11		/* Index of OverScan register */
+#define OVERSCAN 0x11           /* Index of OverScan register */
 
 /* Flags that define how overscan correction should take place */
-#define KGA_FIX_OVERSCAN  1   /* overcan correction required */
-#define KGA_ENABLE_ON_ZERO 2  /* if possible enable display at beginning */
+#define KGA_FIX_OVERSCAN  1     /* overcan correction required */
+#define KGA_ENABLE_ON_ZERO 2    /* if possible enable display at beginning */
                               /* of next scanline/frame                  */
-#define KGA_BE_TOT_DEC 4      /* always fix problem by setting blank end */
-			      /* to total - 1                            */
-#define BIT_PLANE 3		/* Which plane we write to in mono mode */
+#define KGA_BE_TOT_DEC 4        /* always fix problem by setting blank end */
+                              /* to total - 1                            */
+#define BIT_PLANE 3             /* Which plane we write to in mono mode */
 #define BITS_PER_GUN 6
 #define COLORMAP_SIZE 256
 
@@ -191,17 +189,22 @@ extern _X_EXPORT Bool vgaHWSaveScreen(ScreenPtr pScreen, int mode);
 extern _X_EXPORT void vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on);
 extern _X_EXPORT vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void);
 extern _X_EXPORT void vgaHWSeqReset(vgaHWPtr hwp, Bool start);
-extern _X_EXPORT void vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore);
+extern _X_EXPORT void vgaHWRestoreFonts(ScrnInfoPtr scrninfp,
+                                        vgaRegPtr restore);
 extern _X_EXPORT void vgaHWRestoreMode(ScrnInfoPtr scrninfp, vgaRegPtr restore);
-extern _X_EXPORT void vgaHWRestoreColormap(ScrnInfoPtr scrninfp, vgaRegPtr restore);
-extern _X_EXPORT void vgaHWRestore(ScrnInfoPtr scrninfp, vgaRegPtr restore, int flags);
+extern _X_EXPORT void vgaHWRestoreColormap(ScrnInfoPtr scrninfp,
+                                           vgaRegPtr restore);
+extern _X_EXPORT void vgaHWRestore(ScrnInfoPtr scrninfp, vgaRegPtr restore,
+                                   int flags);
 extern _X_EXPORT void vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save);
 extern _X_EXPORT void vgaHWSaveMode(ScrnInfoPtr scrninfp, vgaRegPtr save);
 extern _X_EXPORT void vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save);
-extern _X_EXPORT void vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags);
+extern _X_EXPORT void vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save,
+                                int flags);
 extern _X_EXPORT Bool vgaHWInit(ScrnInfoPtr scrnp, DisplayModePtr mode);
-extern _X_EXPORT Bool vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer,
-                  	int numGraphics, int numAttribute);
+extern _X_EXPORT Bool vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC,
+                                        int numSequencer, int numGraphics,
+                                        int numAttribute);
 extern _X_EXPORT Bool vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src);
 extern _X_EXPORT Bool vgaHWGetHWRec(ScrnInfoPtr scrp);
 extern _X_EXPORT void vgaHWFreeHWRec(ScrnInfoPtr scrp);
@@ -212,22 +215,23 @@ extern _X_EXPORT void vgaHWLock(vgaHWPtr hwp);
 extern _X_EXPORT void vgaHWUnlock(vgaHWPtr hwp);
 extern _X_EXPORT void vgaHWEnable(vgaHWPtr hwp);
 extern _X_EXPORT void vgaHWDisable(vgaHWPtr hwp);
-extern _X_EXPORT void vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);
+extern _X_EXPORT void vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode,
+                                   int flags);
 extern _X_EXPORT Bool vgaHWHandleColormaps(ScreenPtr pScreen);
 extern _X_EXPORT void vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed);
-extern _X_EXPORT CARD32 vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
-	       unsigned int Flags);
-extern _X_EXPORT CARD32 vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
-	       unsigned int Flags);
+extern _X_EXPORT CARD32 vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp,
+                                       int nBits, unsigned int Flags);
+extern _X_EXPORT CARD32 vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp,
+                                       int nBits, unsigned int Flags);
 extern _X_EXPORT Bool vgaHWAllocDefaultRegs(vgaRegPtr regp);
 
 extern _X_EXPORT DDC1SetSpeedProc vgaHWddc1SetSpeedWeak(void);
 extern _X_EXPORT SaveScreenProcPtr vgaHWSaveScreenWeak(void);
 extern _X_EXPORT void xf86GetClocks(ScrnInfoPtr pScrn, int num,
-		   Bool (*ClockFunc)(ScrnInfoPtr, int),
-		   void (*ProtectRegs)(ScrnInfoPtr, Bool),
-		   void (*BlankScreen)(ScrnInfoPtr, Bool),
-		   unsigned long vertsyncreg, int maskval,
-		   int knownclkindex, int knownclkvalue);
+                                    Bool (*ClockFunc) (ScrnInfoPtr, int),
+                                    void (*ProtectRegs) (ScrnInfoPtr, Bool),
+                                    void (*BlankScreen) (ScrnInfoPtr, Bool),
+                                    unsigned long vertsyncreg, int maskval,
+                                    int knownclkindex, int knownclkvalue);
 
-#endif /* _VGAHW_H */
+#endif                          /* _VGAHW_H */
diff --git a/xorg-server/hw/xfree86/x86emu/debug.c b/xorg-server/hw/xfree86/x86emu/debug.c
index 6dea9c7bc..1a8d1d6c4 100644
--- a/xorg-server/hw/xfree86/x86emu/debug.c
+++ b/xorg-server/hw/xfree86/x86emu/debug.c
@@ -49,46 +49,51 @@
 
 #ifdef DEBUG
 
-static void     print_encoded_bytes (u16 s, u16 o);
-static void     print_decoded_instruction (void);
-static int      parse_line (char *s, int *ps, int *n);
-  
+static void print_encoded_bytes(u16 s, u16 o);
+static void print_decoded_instruction(void);
+static int parse_line(char *s, int *ps, int *n);
+
 /* should look something like debug's output. */
-void X86EMU_trace_regs (void)
+void
+X86EMU_trace_regs(void)
 {
-	if (DEBUG_TRACE()) {
-		x86emu_dump_regs();
+    if (DEBUG_TRACE()) {
+        x86emu_dump_regs();
     }
-	if (DEBUG_DECODE() && ! DEBUG_DECODE_NOPRINT()) {
-		printk("%04x:%04x ",M.x86.saved_cs, M.x86.saved_ip);
-		print_encoded_bytes( M.x86.saved_cs, M.x86.saved_ip);
-		print_decoded_instruction();
+    if (DEBUG_DECODE() && !DEBUG_DECODE_NOPRINT()) {
+        printk("%04x:%04x ", M.x86.saved_cs, M.x86.saved_ip);
+        print_encoded_bytes(M.x86.saved_cs, M.x86.saved_ip);
+        print_decoded_instruction();
     }
 }
 
-void X86EMU_trace_xregs (void)
+void
+X86EMU_trace_xregs(void)
 {
-	if (DEBUG_TRACE()) {
-		x86emu_dump_xregs();
+    if (DEBUG_TRACE()) {
+        x86emu_dump_xregs();
     }
 }
 
-void x86emu_just_disassemble (void)
+void
+x86emu_just_disassemble(void)
 {
     /*
      * This routine called if the flag DEBUG_DISASSEMBLE is set kind
      * of a hack!
      */
-	printk("%04x:%04x ",M.x86.saved_cs, M.x86.saved_ip);
-	print_encoded_bytes( M.x86.saved_cs, M.x86.saved_ip);
-	print_decoded_instruction();
+    printk("%04x:%04x ", M.x86.saved_cs, M.x86.saved_ip);
+    print_encoded_bytes(M.x86.saved_cs, M.x86.saved_ip);
+    print_decoded_instruction();
 }
 
-static void disassemble_forward (u16 seg, u16 off, int n)
+static void
+disassemble_forward(u16 seg, u16 off, int n)
 {
-	X86EMU_sysEnv tregs;
-	int i;
-	u8 op1;
+    X86EMU_sysEnv tregs;
+    int i;
+    u8 op1;
+
     /*
      * hack, hack, hack.  What we do is use the exact machinery set up
      * for execution, except that now there is an additional state
@@ -113,17 +118,17 @@ static void disassemble_forward (u16 seg, u16 off, int n)
      * This was done for an entirely different reason, but makes a
      * nice way to get the system to help debug codes.
      */
-	tregs = M;
+    tregs = M;
     tregs.x86.R_IP = off;
     tregs.x86.R_CS = seg;
-    
+
     /* reset the decoding buffers */
     tregs.x86.enc_str_pos = 0;
     tregs.x86.enc_pos = 0;
-    
+
     /* turn on the "disassemble only, no execute" flag */
     tregs.x86.debug |= DEBUG_DISASSEMBLE_F;
- 
+
     /* DUMP NEXT n instructions to screen in straight_line fashion */
     /*
      * This looks like the regular instruction fetch stream, except
@@ -132,299 +137,359 @@ static void disassemble_forward (u16 seg, u16 off, int n)
      * the instruction.  XXX --- CHECK THAT MEM IS NOT AFFECTED!!!
      * Note the use of a copy of the register structure...
      */
-    for (i=0; i<n; i++) {
-		op1 = (*sys_rdb)(((u32)M.x86.R_CS<<4) + (M.x86.R_IP++));
-		(x86emu_optab[op1])(op1);
+    for (i = 0; i < n; i++) {
+        op1 = (*sys_rdb) (((u32) M.x86.R_CS << 4) + (M.x86.R_IP++));
+        (x86emu_optab[op1]) (op1);
     }
     /* end major hack mode. */
 }
 
-void x86emu_check_ip_access (void)
+void
+x86emu_check_ip_access(void)
 {
     /* NULL as of now */
 }
 
-void x86emu_check_sp_access (void)
+void
+x86emu_check_sp_access(void)
 {
 }
 
-void x86emu_check_mem_access (u32 dummy)
+void
+x86emu_check_mem_access(u32 dummy)
 {
-	/*  check bounds, etc */
+    /*  check bounds, etc */
 }
 
-void x86emu_check_data_access (uint dummy1, uint dummy2)
+void
+x86emu_check_data_access(uint dummy1, uint dummy2)
 {
-	/*  check bounds, etc */
+    /*  check bounds, etc */
 }
 
-void x86emu_inc_decoded_inst_len (int x)
+void
+x86emu_inc_decoded_inst_len(int x)
 {
-	M.x86.enc_pos += x;
+    M.x86.enc_pos += x;
 }
 
-void x86emu_decode_printf (const char *x)
+void
+x86emu_decode_printf(const char *x)
 {
-	sprintf(M.x86.decoded_buf+M.x86.enc_str_pos,"%s",x);
-	M.x86.enc_str_pos += strlen(x);
+    sprintf(M.x86.decoded_buf + M.x86.enc_str_pos, "%s", x);
+    M.x86.enc_str_pos += strlen(x);
 }
 
-void x86emu_decode_printf2 (const char *x, int y)
+void
+x86emu_decode_printf2(const char *x, int y)
 {
-	char temp[100];
-	snprintf(temp,sizeof(temp),x,y);
-	sprintf(M.x86.decoded_buf+M.x86.enc_str_pos,"%s",temp);
-	M.x86.enc_str_pos += strlen(temp);
+    char temp[100];
+
+    snprintf(temp, sizeof(temp), x, y);
+    sprintf(M.x86.decoded_buf + M.x86.enc_str_pos, "%s", temp);
+    M.x86.enc_str_pos += strlen(temp);
 }
 
-void x86emu_end_instr (void)
+void
+x86emu_end_instr(void)
 {
-	M.x86.enc_str_pos = 0;
-	M.x86.enc_pos = 0;
+    M.x86.enc_str_pos = 0;
+    M.x86.enc_pos = 0;
 }
 
-static void print_encoded_bytes (u16 s, u16 o)
+static void
+print_encoded_bytes(u16 s, u16 o)
 {
     int i;
     char buf1[64];
-	for (i=0; i< M.x86.enc_pos; i++) {
-		sprintf(buf1+2*i,"%02x", fetch_data_byte_abs(s,o+i));
+
+    for (i = 0; i < M.x86.enc_pos; i++) {
+        sprintf(buf1 + 2 * i, "%02x", fetch_data_byte_abs(s, o + i));
     }
-	printk("%-20s",buf1);
+    printk("%-20s", buf1);
 }
 
-static void print_decoded_instruction (void)
+static void
+print_decoded_instruction(void)
 {
-	printk("%s", M.x86.decoded_buf);
+    printk("%s", M.x86.decoded_buf);
 }
 
-void x86emu_print_int_vect (u16 iv)
+void
+x86emu_print_int_vect(u16 iv)
 {
-	u16 seg,off;
+    u16 seg, off;
 
-	if (iv > 256) return;
-	seg   = fetch_data_word_abs(0,iv*4);
-	off   = fetch_data_word_abs(0,iv*4+2);
-	printk("%04x:%04x ", seg, off);
+    if (iv > 256)
+        return;
+    seg = fetch_data_word_abs(0, iv * 4);
+    off = fetch_data_word_abs(0, iv * 4 + 2);
+    printk("%04x:%04x ", seg, off);
 }
 
-void X86EMU_dump_memory (u16 seg, u16 off, u32 amt)
+void
+X86EMU_dump_memory(u16 seg, u16 off, u32 amt)
 {
-	u32 start = off & 0xfffffff0;
-	u32 end  = (off+16) & 0xfffffff0;
-	u32 i;
-	u32 current;
-
-	current = start;
-	while (end <= off + amt) {
-		printk("%04x:%04x ", seg, start);
-		for (i=start; i< off; i++)
-		  printk("   ");
-		for (       ; i< end; i++)
-		  printk("%02x ", fetch_data_byte_abs(seg,i));
-		printk("\n");
-		start = end;
-		end = start + 16;
-	}
+    u32 start = off & 0xfffffff0;
+    u32 end = (off + 16) & 0xfffffff0;
+    u32 i;
+    u32 current;
+
+    current = start;
+    while (end <= off + amt) {
+        printk("%04x:%04x ", seg, start);
+        for (i = start; i < off; i++)
+            printk("   ");
+        for (; i < end; i++)
+            printk("%02x ", fetch_data_byte_abs(seg, i));
+        printk("\n");
+        start = end;
+        end = start + 16;
+    }
 }
 
-void x86emu_single_step (void)
+void
+x86emu_single_step(void)
 {
     char s[1024];
     int ps[10];
     int ntok;
     int cmd;
     int done;
-		int segment;
+    int segment;
     int offset;
     static int breakpoint;
     static int noDecode = 1;
-    
+
     char *p;
 
-		if (DEBUG_BREAK()) {
-				if (M.x86.saved_ip != breakpoint) {
-						return;
-				} else {
- 	          M.x86.debug &= ~DEBUG_DECODE_NOPRINT_F;
-						M.x86.debug |= DEBUG_TRACE_F;
-						M.x86.debug &= ~DEBUG_BREAK_F;
-						print_decoded_instruction ();
-						X86EMU_trace_regs();
-				}
-		}
-    done=0;
-	offset = M.x86.saved_ip;
+    if (DEBUG_BREAK()) {
+        if (M.x86.saved_ip != breakpoint) {
+            return;
+        }
+        else {
+            M.x86.debug &= ~DEBUG_DECODE_NOPRINT_F;
+            M.x86.debug |= DEBUG_TRACE_F;
+            M.x86.debug &= ~DEBUG_BREAK_F;
+            print_decoded_instruction();
+            X86EMU_trace_regs();
+        }
+    }
+    done = 0;
+    offset = M.x86.saved_ip;
     while (!done) {
         printk("-");
         p = fgets(s, 1023, stdin);
         cmd = parse_line(s, ps, &ntok);
-        switch(cmd) {
-          case 'u':
-			disassemble_forward(M.x86.saved_cs,(u16)offset,10);
+        switch (cmd) {
+        case 'u':
+            disassemble_forward(M.x86.saved_cs, (u16) offset, 10);
             break;
-          case 'd':  
-							if (ntok == 2) {
-									segment = M.x86.saved_cs;
-									offset = ps[1];
-									X86EMU_dump_memory(segment,(u16)offset,16);
-									offset += 16;
-							} else if (ntok == 3) {
-									segment = ps[1];
-									offset = ps[2];
-									X86EMU_dump_memory(segment,(u16)offset,16);
-									offset += 16;
-							} else {
-									segment = M.x86.saved_cs;
-									X86EMU_dump_memory(segment,(u16)offset,16);
-									offset += 16;
-							}
+        case 'd':
+            if (ntok == 2) {
+                segment = M.x86.saved_cs;
+                offset = ps[1];
+                X86EMU_dump_memory(segment, (u16) offset, 16);
+                offset += 16;
+            }
+            else if (ntok == 3) {
+                segment = ps[1];
+                offset = ps[2];
+                X86EMU_dump_memory(segment, (u16) offset, 16);
+                offset += 16;
+            }
+            else {
+                segment = M.x86.saved_cs;
+                X86EMU_dump_memory(segment, (u16) offset, 16);
+                offset += 16;
+            }
             break;
-          case 'c':
-			M.x86.debug ^= DEBUG_TRACECALL_F;
+        case 'c':
+            M.x86.debug ^= DEBUG_TRACECALL_F;
             break;
-          case 's':
-			M.x86.debug ^= DEBUG_SVC_F | DEBUG_SYS_F | DEBUG_SYSINT_F;
+        case 's':
+            M.x86.debug ^= DEBUG_SVC_F | DEBUG_SYS_F | DEBUG_SYSINT_F;
             break;
-          case 'r':
-			X86EMU_trace_regs();
+        case 'r':
+            X86EMU_trace_regs();
             break;
-          case 'x':
-			X86EMU_trace_xregs();
+        case 'x':
+            X86EMU_trace_xregs();
             break;
-          case 'g':
+        case 'g':
             if (ntok == 2) {
                 breakpoint = ps[1];
-		if (noDecode) {
-		                M.x86.debug |= DEBUG_DECODE_NOPRINT_F;
-		} else {
-		                M.x86.debug &= ~DEBUG_DECODE_NOPRINT_F;
-		}
-		M.x86.debug &= ~DEBUG_TRACE_F;
-		M.x86.debug |= DEBUG_BREAK_F;
-		done = 1;
+                if (noDecode) {
+                    M.x86.debug |= DEBUG_DECODE_NOPRINT_F;
+                }
+                else {
+                    M.x86.debug &= ~DEBUG_DECODE_NOPRINT_F;
+                }
+                M.x86.debug &= ~DEBUG_TRACE_F;
+                M.x86.debug |= DEBUG_BREAK_F;
+                done = 1;
             }
             break;
-          case 'q':
-          M.x86.debug |= DEBUG_EXIT;
-          return;
-	  case 'P':
-	      noDecode = (noDecode)?0:1;
-	      printk("Toggled decoding to %s\n",(noDecode)?"FALSE":"TRUE");
-	      break;
-          case 't':
-	  case 0:
+        case 'q':
+            M.x86.debug |= DEBUG_EXIT;
+            return;
+        case 'P':
+            noDecode = (noDecode) ? 0 : 1;
+            printk("Toggled decoding to %s\n", (noDecode) ? "FALSE" : "TRUE");
+            break;
+        case 't':
+        case 0:
             done = 1;
             break;
-        }   
+        }
     }
 }
 
-int X86EMU_trace_on(void)
+int
+X86EMU_trace_on(void)
 {
-	return M.x86.debug |= DEBUG_STEP_F | DEBUG_DECODE_F | DEBUG_TRACE_F;
+    return M.x86.debug |= DEBUG_STEP_F | DEBUG_DECODE_F | DEBUG_TRACE_F;
 }
 
-int X86EMU_trace_off(void)
+int
+X86EMU_trace_off(void)
 {
-	return M.x86.debug &= ~(DEBUG_STEP_F | DEBUG_DECODE_F | DEBUG_TRACE_F);
+    return M.x86.debug &= ~(DEBUG_STEP_F | DEBUG_DECODE_F | DEBUG_TRACE_F);
 }
 
-static int parse_line (char *s, int *ps, int *n)
+static int
+parse_line(char *s, int *ps, int *n)
 {
     int cmd;
 
     *n = 0;
-    while(*s == ' ' || *s == '\t') s++;
+    while (*s == ' ' || *s == '\t')
+        s++;
     ps[*n] = *s;
     switch (*s) {
-      case '\n':
+    case '\n':
         *n += 1;
         return 0;
-      default:
+    default:
         cmd = *s;
         *n += 1;
     }
 
-	while (1) {
-		while (*s != ' ' && *s != '\t' && *s != '\n')  s++;
-		
-		if (*s == '\n')
-			return cmd;
-		
-		while(*s == ' ' || *s == '\t') s++;
-		
-		sscanf(s,"%x",&ps[*n]);
-		*n += 1;
-	}
+    while (1) {
+        while (*s != ' ' && *s != '\t' && *s != '\n')
+            s++;
+
+        if (*s == '\n')
+            return cmd;
+
+        while (*s == ' ' || *s == '\t')
+            s++;
+
+        sscanf(s, "%x", &ps[*n]);
+        *n += 1;
+    }
 }
 
-#endif /* DEBUG */
+#endif                          /* DEBUG */
 
-void x86emu_dump_regs (void)
+void
+x86emu_dump_regs(void)
 {
-	printk("\tAX=%04x  ", M.x86.R_AX );
-	printk("BX=%04x  ", M.x86.R_BX );
-	printk("CX=%04x  ", M.x86.R_CX );
-	printk("DX=%04x  ", M.x86.R_DX );
-	printk("SP=%04x  ", M.x86.R_SP );
-	printk("BP=%04x  ", M.x86.R_BP );
-	printk("SI=%04x  ", M.x86.R_SI );
-	printk("DI=%04x\n", M.x86.R_DI );
-	printk("\tDS=%04x  ", M.x86.R_DS );
-	printk("ES=%04x  ", M.x86.R_ES );
-	printk("SS=%04x  ", M.x86.R_SS );
-	printk("CS=%04x  ", M.x86.R_CS );
-	printk("IP=%04x   ", M.x86.R_IP );
-	if (ACCESS_FLAG(F_OF))    printk("OV ");     /* CHECKED... */
-	else                        printk("NV ");
-	if (ACCESS_FLAG(F_DF))    printk("DN ");
-	else                        printk("UP ");
-	if (ACCESS_FLAG(F_IF))    printk("EI ");
-	else                        printk("DI ");
-	if (ACCESS_FLAG(F_SF))    printk("NG ");
-	else                        printk("PL ");
-	if (ACCESS_FLAG(F_ZF))    printk("ZR ");
-	else                        printk("NZ ");
-	if (ACCESS_FLAG(F_AF))    printk("AC ");
-	else                        printk("NA ");
-	if (ACCESS_FLAG(F_PF))    printk("PE ");
-	else                        printk("PO ");
-	if (ACCESS_FLAG(F_CF))    printk("CY ");
-	else                        printk("NC ");
-	printk("\n");
+    printk("\tAX=%04x  ", M.x86.R_AX);
+    printk("BX=%04x  ", M.x86.R_BX);
+    printk("CX=%04x  ", M.x86.R_CX);
+    printk("DX=%04x  ", M.x86.R_DX);
+    printk("SP=%04x  ", M.x86.R_SP);
+    printk("BP=%04x  ", M.x86.R_BP);
+    printk("SI=%04x  ", M.x86.R_SI);
+    printk("DI=%04x\n", M.x86.R_DI);
+    printk("\tDS=%04x  ", M.x86.R_DS);
+    printk("ES=%04x  ", M.x86.R_ES);
+    printk("SS=%04x  ", M.x86.R_SS);
+    printk("CS=%04x  ", M.x86.R_CS);
+    printk("IP=%04x   ", M.x86.R_IP);
+    if (ACCESS_FLAG(F_OF))
+        printk("OV ");          /* CHECKED... */
+    else
+        printk("NV ");
+    if (ACCESS_FLAG(F_DF))
+        printk("DN ");
+    else
+        printk("UP ");
+    if (ACCESS_FLAG(F_IF))
+        printk("EI ");
+    else
+        printk("DI ");
+    if (ACCESS_FLAG(F_SF))
+        printk("NG ");
+    else
+        printk("PL ");
+    if (ACCESS_FLAG(F_ZF))
+        printk("ZR ");
+    else
+        printk("NZ ");
+    if (ACCESS_FLAG(F_AF))
+        printk("AC ");
+    else
+        printk("NA ");
+    if (ACCESS_FLAG(F_PF))
+        printk("PE ");
+    else
+        printk("PO ");
+    if (ACCESS_FLAG(F_CF))
+        printk("CY ");
+    else
+        printk("NC ");
+    printk("\n");
 }
 
-void x86emu_dump_xregs (void)
+void
+x86emu_dump_xregs(void)
 {
-	printk("\tEAX=%08x  ", M.x86.R_EAX );
-	printk("EBX=%08x  ", M.x86.R_EBX );
-	printk("ECX=%08x  ", M.x86.R_ECX );
-	printk("EDX=%08x  \n", M.x86.R_EDX );
-	printk("\tESP=%08x  ", M.x86.R_ESP );
-	printk("EBP=%08x  ", M.x86.R_EBP );
-	printk("ESI=%08x  ", M.x86.R_ESI );
-	printk("EDI=%08x\n", M.x86.R_EDI );
-	printk("\tDS=%04x  ", M.x86.R_DS );
-	printk("ES=%04x  ", M.x86.R_ES );
-	printk("SS=%04x  ", M.x86.R_SS );
-	printk("CS=%04x  ", M.x86.R_CS );
-	printk("EIP=%08x\n\t", M.x86.R_EIP );
-	if (ACCESS_FLAG(F_OF))    printk("OV ");     /* CHECKED... */
-	else                        printk("NV ");
-	if (ACCESS_FLAG(F_DF))    printk("DN ");
-	else                        printk("UP ");
-	if (ACCESS_FLAG(F_IF))    printk("EI ");
-	else                        printk("DI ");
-	if (ACCESS_FLAG(F_SF))    printk("NG ");
-	else                        printk("PL ");
-	if (ACCESS_FLAG(F_ZF))    printk("ZR ");
-	else                        printk("NZ ");
-	if (ACCESS_FLAG(F_AF))    printk("AC ");
-	else                        printk("NA ");
-	if (ACCESS_FLAG(F_PF))    printk("PE ");
-	else                        printk("PO ");
-	if (ACCESS_FLAG(F_CF))    printk("CY ");
-	else                        printk("NC ");
-	printk("\n");
+    printk("\tEAX=%08x  ", M.x86.R_EAX);
+    printk("EBX=%08x  ", M.x86.R_EBX);
+    printk("ECX=%08x  ", M.x86.R_ECX);
+    printk("EDX=%08x  \n", M.x86.R_EDX);
+    printk("\tESP=%08x  ", M.x86.R_ESP);
+    printk("EBP=%08x  ", M.x86.R_EBP);
+    printk("ESI=%08x  ", M.x86.R_ESI);
+    printk("EDI=%08x\n", M.x86.R_EDI);
+    printk("\tDS=%04x  ", M.x86.R_DS);
+    printk("ES=%04x  ", M.x86.R_ES);
+    printk("SS=%04x  ", M.x86.R_SS);
+    printk("CS=%04x  ", M.x86.R_CS);
+    printk("EIP=%08x\n\t", M.x86.R_EIP);
+    if (ACCESS_FLAG(F_OF))
+        printk("OV ");          /* CHECKED... */
+    else
+        printk("NV ");
+    if (ACCESS_FLAG(F_DF))
+        printk("DN ");
+    else
+        printk("UP ");
+    if (ACCESS_FLAG(F_IF))
+        printk("EI ");
+    else
+        printk("DI ");
+    if (ACCESS_FLAG(F_SF))
+        printk("NG ");
+    else
+        printk("PL ");
+    if (ACCESS_FLAG(F_ZF))
+        printk("ZR ");
+    else
+        printk("NZ ");
+    if (ACCESS_FLAG(F_AF))
+        printk("AC ");
+    else
+        printk("NA ");
+    if (ACCESS_FLAG(F_PF))
+        printk("PE ");
+    else
+        printk("PO ");
+    if (ACCESS_FLAG(F_CF))
+        printk("CY ");
+    else
+        printk("NC ");
+    printk("\n");
 }
diff --git a/xorg-server/hw/xfree86/x86emu/decode.c b/xorg-server/hw/xfree86/x86emu/decode.c
index 9339f4c7f..12f8fb84b 100644
--- a/xorg-server/hw/xfree86/x86emu/decode.c
+++ b/xorg-server/hw/xfree86/x86emu/decode.c
@@ -46,25 +46,27 @@
 REMARKS:
 Handles any pending asychronous interrupts.
 ****************************************************************************/
-static void x86emu_intr_handle(void)
+static void
+x86emu_intr_handle(void)
 {
-	u8	intno;
-
-	if (M.x86.intr & INTR_SYNCH) {
-		intno = M.x86.intno;
-		if (_X86EMU_intrTab[intno]) {
-			(*_X86EMU_intrTab[intno])(intno);
-		} else {
-			push_word((u16)M.x86.R_FLG);
-			CLEAR_FLAG(F_IF);
-			CLEAR_FLAG(F_TF);
-			push_word(M.x86.R_CS);
-			M.x86.R_CS = mem_access_word(intno * 4 + 2);
-			push_word(M.x86.R_IP);
-			M.x86.R_IP = mem_access_word(intno * 4);
-			M.x86.intr = 0;
-		}
-	}
+    u8 intno;
+
+    if (M.x86.intr & INTR_SYNCH) {
+        intno = M.x86.intno;
+        if (_X86EMU_intrTab[intno]) {
+            (*_X86EMU_intrTab[intno]) (intno);
+        }
+        else {
+            push_word((u16) M.x86.R_FLG);
+            CLEAR_FLAG(F_IF);
+            CLEAR_FLAG(F_TF);
+            push_word(M.x86.R_CS);
+            M.x86.R_CS = mem_access_word(intno * 4 + 2);
+            push_word(M.x86.R_IP);
+            M.x86.R_IP = mem_access_word(intno * 4);
+            M.x86.intr = 0;
+        }
+    }
 }
 
 /****************************************************************************
@@ -75,11 +77,11 @@ REMARKS:
 Raise the specified interrupt to be handled before the execution of the
 next instruction.
 ****************************************************************************/
-void x86emu_intr_raise(
-	u8 intrnum)
+void
+x86emu_intr_raise(u8 intrnum)
 {
-	M.x86.intno = intrnum;
-	M.x86.intr |= INTR_SYNCH;
+    M.x86.intno = intrnum;
+    M.x86.intr |= INTR_SYNCH;
 }
 
 /****************************************************************************
@@ -88,38 +90,39 @@ Main execution loop for the emulator. We return from here when the system
 halts, which is normally caused by a stack fault when we return from the
 original real mode call.
 ****************************************************************************/
-void X86EMU_exec(void)
+void
+X86EMU_exec(void)
 {
-	u8 op1;
-
-	M.x86.intr = 0;
-	DB(x86emu_end_instr();)
-
-    for (;;) {
-DB(		if (CHECK_IP_FETCH())
-		  x86emu_check_ip_access();)
-		/* If debugging, save the IP and CS values. */
-		SAVE_IP_CS(M.x86.R_CS, M.x86.R_IP);
-		INC_DECODED_INST_LEN(1);
-		if (M.x86.intr) {
-			if (M.x86.intr & INTR_HALTED) {
-DB(             if (M.x86.R_SP != 0) {
-                    printk("halted\n");
-                    X86EMU_trace_regs();
-                    }
-                else {
-                    if (M.x86.debug)
-                        printk("Service completed successfully\n");
-                    })
-				return;
+    u8 op1;
+
+    M.x86.intr = 0;
+    DB(x86emu_end_instr();
+        )
+
+        for (;;) {
+        DB(if (CHECK_IP_FETCH())
+           x86emu_check_ip_access();)
+            /* If debugging, save the IP and CS values. */
+            SAVE_IP_CS(M.x86.R_CS, M.x86.R_IP);
+        INC_DECODED_INST_LEN(1);
+        if (M.x86.intr) {
+            if (M.x86.intr & INTR_HALTED) {
+                DB(if (M.x86.R_SP != 0) {
+                   printk("halted\n"); X86EMU_trace_regs();}
+                   else {
+                   if (M.x86.debug)
+                   printk("Service completed successfully\n");}
+                )
+                    return;
             }
-			if (((M.x86.intr & INTR_SYNCH) && (M.x86.intno == 0 || M.x86.intno == 2)) ||
-				!ACCESS_FLAG(F_IF)) {
-				x86emu_intr_handle();
-			}
-		}
-		op1 = (*sys_rdb)(((u32)M.x86.R_CS << 4) + (M.x86.R_IP++));
-		(*x86emu_optab[op1])(op1);
+            if (((M.x86.intr & INTR_SYNCH) &&
+                 (M.x86.intno == 0 || M.x86.intno == 2)) ||
+                !ACCESS_FLAG(F_IF)) {
+                x86emu_intr_handle();
+            }
+        }
+        op1 = (*sys_rdb) (((u32) M.x86.R_CS << 4) + (M.x86.R_IP++));
+        (*x86emu_optab[op1]) (op1);
         if (M.x86.debug & DEBUG_EXIT) {
             M.x86.debug &= ~DEBUG_EXIT;
             return;
@@ -131,9 +134,10 @@ DB(             if (M.x86.R_SP != 0) {
 REMARKS:
 Halts the system by setting the halted system flag.
 ****************************************************************************/
-void X86EMU_halt_sys(void)
+void
+X86EMU_halt_sys(void)
 {
-	M.x86.intr |= INTR_HALTED;
+    M.x86.intr |= INTR_HALTED;
 }
 
 /****************************************************************************
@@ -148,19 +152,17 @@ next instruction.
 
 NOTE: Do not inline this function, as (*sys_rdb) is already inline!
 ****************************************************************************/
-void fetch_decode_modrm(
-	int *mod,
-	int *regh,
-	int *regl)
+void
+fetch_decode_modrm(int *mod, int *regh, int *regl)
 {
-	int fetched;
-
-DB(	if (CHECK_IP_FETCH())
-	  x86emu_check_ip_access();)
-	fetched = (*sys_rdb)(((u32)M.x86.R_CS << 4) + (M.x86.R_IP++));
-	INC_DECODED_INST_LEN(1);
-	*mod  = (fetched >> 6) & 0x03;
-	*regh = (fetched >> 3) & 0x07;
+    int fetched;
+
+    DB(if (CHECK_IP_FETCH())
+       x86emu_check_ip_access();)
+        fetched = (*sys_rdb) (((u32) M.x86.R_CS << 4) + (M.x86.R_IP++));
+    INC_DECODED_INST_LEN(1);
+    *mod = (fetched >> 6) & 0x03;
+    *regh = (fetched >> 3) & 0x07;
     *regl = (fetched >> 0) & 0x07;
 }
 
@@ -174,15 +176,16 @@ moves the instruction pointer to the next value.
 
 NOTE: Do not inline this function, as (*sys_rdb) is already inline!
 ****************************************************************************/
-u8 fetch_byte_imm(void)
+u8
+fetch_byte_imm(void)
 {
-	u8 fetched;
+    u8 fetched;
 
-DB(	if (CHECK_IP_FETCH())
-		x86emu_check_ip_access();)
-	fetched = (*sys_rdb)(((u32)M.x86.R_CS << 4) + (M.x86.R_IP++));
-	INC_DECODED_INST_LEN(1);
-	return fetched;
+    DB(if (CHECK_IP_FETCH())
+       x86emu_check_ip_access();)
+        fetched = (*sys_rdb) (((u32) M.x86.R_CS << 4) + (M.x86.R_IP++));
+    INC_DECODED_INST_LEN(1);
+    return fetched;
 }
 
 /****************************************************************************
@@ -195,16 +198,17 @@ moves the instruction pointer to the next value.
 
 NOTE: Do not inline this function, as (*sys_rdw) is already inline!
 ****************************************************************************/
-u16 fetch_word_imm(void)
+u16
+fetch_word_imm(void)
 {
-	u16	fetched;
-
-DB(	if (CHECK_IP_FETCH())
-		x86emu_check_ip_access();)
-	fetched = (*sys_rdw)(((u32)M.x86.R_CS << 4) + (M.x86.R_IP));
-	M.x86.R_IP += 2;
-	INC_DECODED_INST_LEN(2);
-	return fetched;
+    u16 fetched;
+
+    DB(if (CHECK_IP_FETCH())
+       x86emu_check_ip_access();)
+        fetched = (*sys_rdw) (((u32) M.x86.R_CS << 4) + (M.x86.R_IP));
+    M.x86.R_IP += 2;
+    INC_DECODED_INST_LEN(2);
+    return fetched;
 }
 
 /****************************************************************************
@@ -217,16 +221,17 @@ moves the instruction pointer to the next value.
 
 NOTE: Do not inline this function, as (*sys_rdw) is already inline!
 ****************************************************************************/
-u32 fetch_long_imm(void)
+u32
+fetch_long_imm(void)
 {
-	u32 fetched;
-
-DB(	if (CHECK_IP_FETCH())
-	  x86emu_check_ip_access();)
-	fetched = (*sys_rdl)(((u32)M.x86.R_CS << 4) + (M.x86.R_IP));
-	M.x86.R_IP += 4;
-	INC_DECODED_INST_LEN(4);
-	return fetched;
+    u32 fetched;
+
+    DB(if (CHECK_IP_FETCH())
+       x86emu_check_ip_access();)
+        fetched = (*sys_rdl) (((u32) M.x86.R_CS << 4) + (M.x86.R_IP));
+    M.x86.R_IP += 4;
+    INC_DECODED_INST_LEN(4);
+    return fetched;
 }
 
 /****************************************************************************
@@ -258,38 +263,39 @@ cpu-state-varible M.x86.mode. There are several potential states:
 
 Each of the above 7 items are handled with a bit in the mode field.
 ****************************************************************************/
-_INLINE u32 get_data_segment(void)
+_INLINE u32
+get_data_segment(void)
 {
 #define	GET_SEGMENT(segment)
-	switch (M.x86.mode & SYSMODE_SEGMASK) {
-	  case 0:					/* default case: use ds register */
-	  case SYSMODE_SEGOVR_DS:
-	  case SYSMODE_SEGOVR_DS | SYSMODE_SEG_DS_SS:
-		return  M.x86.R_DS;
-	  case SYSMODE_SEG_DS_SS:	/* non-overridden, use ss register */
-		return  M.x86.R_SS;
-	  case SYSMODE_SEGOVR_CS:
-	  case SYSMODE_SEGOVR_CS | SYSMODE_SEG_DS_SS:
-		return  M.x86.R_CS;
-	  case SYSMODE_SEGOVR_ES:
-	  case SYSMODE_SEGOVR_ES | SYSMODE_SEG_DS_SS:
-		return  M.x86.R_ES;
-	  case SYSMODE_SEGOVR_FS:
-	  case SYSMODE_SEGOVR_FS | SYSMODE_SEG_DS_SS:
-		return  M.x86.R_FS;
-	  case SYSMODE_SEGOVR_GS:
-	  case SYSMODE_SEGOVR_GS | SYSMODE_SEG_DS_SS:
-		return  M.x86.R_GS;
-	  case SYSMODE_SEGOVR_SS:
-	  case SYSMODE_SEGOVR_SS | SYSMODE_SEG_DS_SS:
-		return  M.x86.R_SS;
-	  default:
+    switch (M.x86.mode & SYSMODE_SEGMASK) {
+    case 0:                    /* default case: use ds register */
+    case SYSMODE_SEGOVR_DS:
+    case SYSMODE_SEGOVR_DS | SYSMODE_SEG_DS_SS:
+        return M.x86.R_DS;
+    case SYSMODE_SEG_DS_SS:    /* non-overridden, use ss register */
+        return M.x86.R_SS;
+    case SYSMODE_SEGOVR_CS:
+    case SYSMODE_SEGOVR_CS | SYSMODE_SEG_DS_SS:
+        return M.x86.R_CS;
+    case SYSMODE_SEGOVR_ES:
+    case SYSMODE_SEGOVR_ES | SYSMODE_SEG_DS_SS:
+        return M.x86.R_ES;
+    case SYSMODE_SEGOVR_FS:
+    case SYSMODE_SEGOVR_FS | SYSMODE_SEG_DS_SS:
+        return M.x86.R_FS;
+    case SYSMODE_SEGOVR_GS:
+    case SYSMODE_SEGOVR_GS | SYSMODE_SEG_DS_SS:
+        return M.x86.R_GS;
+    case SYSMODE_SEGOVR_SS:
+    case SYSMODE_SEGOVR_SS | SYSMODE_SEG_DS_SS:
+        return M.x86.R_SS;
+    default:
 #ifdef	DEBUG
-		printk("error: should not happen:  multiple overrides.\n");
+        printk("error: should not happen:  multiple overrides.\n");
 #endif
-		HALT_SYS();
-		return 0;
-	}
+        HALT_SYS();
+        return 0;
+    }
 }
 
 /****************************************************************************
@@ -301,14 +307,14 @@ Byte value read from the absolute memory location.
 
 NOTE: Do not inline this function as (*sys_rdX) is already inline!
 ****************************************************************************/
-u8 fetch_data_byte(
-	uint offset)
+u8
+fetch_data_byte(uint offset)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access((u16)get_data_segment(), offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access((u16) get_data_segment(), offset);
 #endif
-	return (*sys_rdb)((get_data_segment() << 4) + offset);
+    return (*sys_rdb) ((get_data_segment() << 4) + offset);
 }
 
 /****************************************************************************
@@ -320,14 +326,14 @@ Word value read from the absolute memory location.
 
 NOTE: Do not inline this function as (*sys_rdX) is already inline!
 ****************************************************************************/
-u16 fetch_data_word(
-	uint offset)
+u16
+fetch_data_word(uint offset)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access((u16)get_data_segment(), offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access((u16) get_data_segment(), offset);
 #endif
-	return (*sys_rdw)((get_data_segment() << 4) + offset);
+    return (*sys_rdw) ((get_data_segment() << 4) + offset);
 }
 
 /****************************************************************************
@@ -339,14 +345,14 @@ Long value read from the absolute memory location.
 
 NOTE: Do not inline this function as (*sys_rdX) is already inline!
 ****************************************************************************/
-u32 fetch_data_long(
-	uint offset)
+u32
+fetch_data_long(uint offset)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access((u16)get_data_segment(), offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access((u16) get_data_segment(), offset);
 #endif
-	return (*sys_rdl)((get_data_segment() << 4) + offset);
+    return (*sys_rdl) ((get_data_segment() << 4) + offset);
 }
 
 /****************************************************************************
@@ -359,15 +365,14 @@ Byte value read from the absolute memory location.
 
 NOTE: Do not inline this function as (*sys_rdX) is already inline!
 ****************************************************************************/
-u8 fetch_data_byte_abs(
-	uint segment,
-	uint offset)
+u8
+fetch_data_byte_abs(uint segment, uint offset)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access(segment, offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access(segment, offset);
 #endif
-	return (*sys_rdb)(((u32)segment << 4) + offset);
+    return (*sys_rdb) (((u32) segment << 4) + offset);
 }
 
 /****************************************************************************
@@ -380,15 +385,14 @@ Word value read from the absolute memory location.
 
 NOTE: Do not inline this function as (*sys_rdX) is already inline!
 ****************************************************************************/
-u16 fetch_data_word_abs(
-	uint segment,
-	uint offset)
+u16
+fetch_data_word_abs(uint segment, uint offset)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access(segment, offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access(segment, offset);
 #endif
-	return (*sys_rdw)(((u32)segment << 4) + offset);
+    return (*sys_rdw) (((u32) segment << 4) + offset);
 }
 
 /****************************************************************************
@@ -401,15 +405,14 @@ Long value read from the absolute memory location.
 
 NOTE: Do not inline this function as (*sys_rdX) is already inline!
 ****************************************************************************/
-u32 fetch_data_long_abs(
-	uint segment,
-	uint offset)
+u32
+fetch_data_long_abs(uint segment, uint offset)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access(segment, offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access(segment, offset);
 #endif
-	return (*sys_rdl)(((u32)segment << 4) + offset);
+    return (*sys_rdl) (((u32) segment << 4) + offset);
 }
 
 /****************************************************************************
@@ -423,15 +426,14 @@ the current 'default' segment, which may have been overridden.
 
 NOTE: Do not inline this function as (*sys_wrX) is already inline!
 ****************************************************************************/
-void store_data_byte(
-	uint offset,
-	u8 val)
+void
+store_data_byte(uint offset, u8 val)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access((u16)get_data_segment(), offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access((u16) get_data_segment(), offset);
 #endif
-	(*sys_wrb)((get_data_segment() << 4) + offset, val);
+    (*sys_wrb) ((get_data_segment() << 4) + offset, val);
 }
 
 /****************************************************************************
@@ -445,15 +447,14 @@ the current 'default' segment, which may have been overridden.
 
 NOTE: Do not inline this function as (*sys_wrX) is already inline!
 ****************************************************************************/
-void store_data_word(
-	uint offset,
-	u16 val)
+void
+store_data_word(uint offset, u16 val)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access((u16)get_data_segment(), offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access((u16) get_data_segment(), offset);
 #endif
-	(*sys_wrw)((get_data_segment() << 4) + offset, val);
+    (*sys_wrw) ((get_data_segment() << 4) + offset, val);
 }
 
 /****************************************************************************
@@ -467,15 +468,14 @@ the current 'default' segment, which may have been overridden.
 
 NOTE: Do not inline this function as (*sys_wrX) is already inline!
 ****************************************************************************/
-void store_data_long(
-	uint offset,
-	u32 val)
+void
+store_data_long(uint offset, u32 val)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access((u16)get_data_segment(), offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access((u16) get_data_segment(), offset);
 #endif
-	(*sys_wrl)((get_data_segment() << 4) + offset, val);
+    (*sys_wrl) ((get_data_segment() << 4) + offset, val);
 }
 
 /****************************************************************************
@@ -489,16 +489,14 @@ Writes a byte value to an absolute memory location.
 
 NOTE: Do not inline this function as (*sys_wrX) is already inline!
 ****************************************************************************/
-void store_data_byte_abs(
-	uint segment,
-	uint offset,
-	u8 val)
+void
+store_data_byte_abs(uint segment, uint offset, u8 val)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access(segment, offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access(segment, offset);
 #endif
-	(*sys_wrb)(((u32)segment << 4) + offset, val);
+    (*sys_wrb) (((u32) segment << 4) + offset, val);
 }
 
 /****************************************************************************
@@ -512,16 +510,14 @@ Writes a word value to an absolute memory location.
 
 NOTE: Do not inline this function as (*sys_wrX) is already inline!
 ****************************************************************************/
-void store_data_word_abs(
-	uint segment,
-	uint offset,
-	u16 val)
+void
+store_data_word_abs(uint segment, uint offset, u16 val)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access(segment, offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access(segment, offset);
 #endif
-	(*sys_wrw)(((u32)segment << 4) + offset, val);
+    (*sys_wrw) (((u32) segment << 4) + offset, val);
 }
 
 /****************************************************************************
@@ -535,16 +531,14 @@ Writes a long value to an absolute memory location.
 
 NOTE: Do not inline this function as (*sys_wrX) is already inline!
 ****************************************************************************/
-void store_data_long_abs(
-	uint segment,
-	uint offset,
-	u32 val)
+void
+store_data_long_abs(uint segment, uint offset, u32 val)
 {
 #ifdef DEBUG
-	if (CHECK_DATA_ACCESS())
-		x86emu_check_data_access(segment, offset);
+    if (CHECK_DATA_ACCESS())
+        x86emu_check_data_access(segment, offset);
 #endif
-	(*sys_wrl)(((u32)segment << 4) + offset, val);
+    (*sys_wrl) (((u32) segment << 4) + offset, val);
 }
 
 /****************************************************************************
@@ -558,37 +552,37 @@ REMARKS:
 Return a pointer to the register given by the R/RM field of the
 modrm byte, for byte operands. Also enables the decoding of instructions.
 ****************************************************************************/
-u8* decode_rm_byte_register(
-	int reg)
+u8 *
+decode_rm_byte_register(int reg)
 {
-	switch (reg) {
-      case 0:
-		DECODE_PRINTF("AL");
-		return &M.x86.R_AL;
-	  case 1:
-		DECODE_PRINTF("CL");
-		return &M.x86.R_CL;
-	  case 2:
-		DECODE_PRINTF("DL");
-		return &M.x86.R_DL;
-	  case 3:
-		DECODE_PRINTF("BL");
-		return &M.x86.R_BL;
-	  case 4:
-		DECODE_PRINTF("AH");
-		return &M.x86.R_AH;
-	  case 5:
-		DECODE_PRINTF("CH");
-		return &M.x86.R_CH;
-	  case 6:
-		DECODE_PRINTF("DH");
-		return &M.x86.R_DH;
-	  case 7:
-		DECODE_PRINTF("BH");
-		return &M.x86.R_BH;
-	}
-	HALT_SYS();
-	return NULL;                /* NOT REACHED OR REACHED ON ERROR */
+    switch (reg) {
+    case 0:
+        DECODE_PRINTF("AL");
+        return &M.x86.R_AL;
+    case 1:
+        DECODE_PRINTF("CL");
+        return &M.x86.R_CL;
+    case 2:
+        DECODE_PRINTF("DL");
+        return &M.x86.R_DL;
+    case 3:
+        DECODE_PRINTF("BL");
+        return &M.x86.R_BL;
+    case 4:
+        DECODE_PRINTF("AH");
+        return &M.x86.R_AH;
+    case 5:
+        DECODE_PRINTF("CH");
+        return &M.x86.R_CH;
+    case 6:
+        DECODE_PRINTF("DH");
+        return &M.x86.R_DH;
+    case 7:
+        DECODE_PRINTF("BH");
+        return &M.x86.R_BH;
+    }
+    HALT_SYS();
+    return NULL;                /* NOT REACHED OR REACHED ON ERROR */
 }
 
 /****************************************************************************
@@ -602,36 +596,36 @@ REMARKS:
 Return a pointer to the register given by the R/RM field of the
 modrm byte, for word operands.  Also enables the decoding of instructions.
 ****************************************************************************/
-u16* decode_rm_word_register(
-	int reg)
+u16 *
+decode_rm_word_register(int reg)
 {
-	switch (reg) {
-	  case 0:
-		DECODE_PRINTF("AX");
-		return &M.x86.R_AX;
-	  case 1:
-		DECODE_PRINTF("CX");
-		return &M.x86.R_CX;
-	  case 2:
-		DECODE_PRINTF("DX");
-		return &M.x86.R_DX;
-	  case 3:
-		DECODE_PRINTF("BX");
-		return &M.x86.R_BX;
-	  case 4:
-		DECODE_PRINTF("SP");
-		return &M.x86.R_SP;
-	  case 5:
-		DECODE_PRINTF("BP");
-		return &M.x86.R_BP;
-	  case 6:
-		DECODE_PRINTF("SI");
-		return &M.x86.R_SI;
-	  case 7:
-		DECODE_PRINTF("DI");
-		return &M.x86.R_DI;
-	}
-	HALT_SYS();
+    switch (reg) {
+    case 0:
+        DECODE_PRINTF("AX");
+        return &M.x86.R_AX;
+    case 1:
+        DECODE_PRINTF("CX");
+        return &M.x86.R_CX;
+    case 2:
+        DECODE_PRINTF("DX");
+        return &M.x86.R_DX;
+    case 3:
+        DECODE_PRINTF("BX");
+        return &M.x86.R_BX;
+    case 4:
+        DECODE_PRINTF("SP");
+        return &M.x86.R_SP;
+    case 5:
+        DECODE_PRINTF("BP");
+        return &M.x86.R_BP;
+    case 6:
+        DECODE_PRINTF("SI");
+        return &M.x86.R_SI;
+    case 7:
+        DECODE_PRINTF("DI");
+        return &M.x86.R_DI;
+    }
+    HALT_SYS();
     return NULL;                /* NOTREACHED OR REACHED ON ERROR */
 }
 
@@ -646,36 +640,36 @@ REMARKS:
 Return a pointer to the register given by the R/RM field of the
 modrm byte, for dword operands.  Also enables the decoding of instructions.
 ****************************************************************************/
-u32* decode_rm_long_register(
-	int reg)
+u32 *
+decode_rm_long_register(int reg)
 {
     switch (reg) {
-      case 0:
-		DECODE_PRINTF("EAX");
-		return &M.x86.R_EAX;
-	  case 1:
-		DECODE_PRINTF("ECX");
-		return &M.x86.R_ECX;
-	  case 2:
-		DECODE_PRINTF("EDX");
-		return &M.x86.R_EDX;
-	  case 3:
-		DECODE_PRINTF("EBX");
-		return &M.x86.R_EBX;
-	  case 4:
-		DECODE_PRINTF("ESP");
-		return &M.x86.R_ESP;
-	  case 5:
-		DECODE_PRINTF("EBP");
-		return &M.x86.R_EBP;
-	  case 6:
-		DECODE_PRINTF("ESI");
-		return &M.x86.R_ESI;
-	  case 7:
-		DECODE_PRINTF("EDI");
-		return &M.x86.R_EDI;
-	}
-	HALT_SYS();
+    case 0:
+        DECODE_PRINTF("EAX");
+        return &M.x86.R_EAX;
+    case 1:
+        DECODE_PRINTF("ECX");
+        return &M.x86.R_ECX;
+    case 2:
+        DECODE_PRINTF("EDX");
+        return &M.x86.R_EDX;
+    case 3:
+        DECODE_PRINTF("EBX");
+        return &M.x86.R_EBX;
+    case 4:
+        DECODE_PRINTF("ESP");
+        return &M.x86.R_ESP;
+    case 5:
+        DECODE_PRINTF("EBP");
+        return &M.x86.R_EBP;
+    case 6:
+        DECODE_PRINTF("ESI");
+        return &M.x86.R_ESI;
+    case 7:
+        DECODE_PRINTF("EDI");
+        return &M.x86.R_EDI;
+    }
+    HALT_SYS();
     return NULL;                /* NOTREACHED OR REACHED ON ERROR */
 }
 
@@ -691,126 +685,129 @@ Return a pointer to the register given by the R/RM field of the
 modrm byte, for word operands, modified from above for the weirdo
 special case of segreg operands.  Also enables the decoding of instructions.
 ****************************************************************************/
-u16* decode_rm_seg_register(
-	int reg)
+u16 *
+decode_rm_seg_register(int reg)
 {
-	switch (reg) {
-	  case 0:
-		DECODE_PRINTF("ES");
-		return &M.x86.R_ES;
-	  case 1:
-		DECODE_PRINTF("CS");
-		return &M.x86.R_CS;
-	  case 2:
-		DECODE_PRINTF("SS");
-		return &M.x86.R_SS;
-	  case 3:
-		DECODE_PRINTF("DS");
-		return &M.x86.R_DS;
-	  case 4:
-		DECODE_PRINTF("FS");
-		return &M.x86.R_FS;
-	  case 5:
-		DECODE_PRINTF("GS");
-		return &M.x86.R_GS;
-	  case 6:
-	  case 7:
-		DECODE_PRINTF("ILLEGAL SEGREG");
-		break;
-	}
-	HALT_SYS();
-	return NULL;                /* NOT REACHED OR REACHED ON ERROR */
+    switch (reg) {
+    case 0:
+        DECODE_PRINTF("ES");
+        return &M.x86.R_ES;
+    case 1:
+        DECODE_PRINTF("CS");
+        return &M.x86.R_CS;
+    case 2:
+        DECODE_PRINTF("SS");
+        return &M.x86.R_SS;
+    case 3:
+        DECODE_PRINTF("DS");
+        return &M.x86.R_DS;
+    case 4:
+        DECODE_PRINTF("FS");
+        return &M.x86.R_FS;
+    case 5:
+        DECODE_PRINTF("GS");
+        return &M.x86.R_GS;
+    case 6:
+    case 7:
+        DECODE_PRINTF("ILLEGAL SEGREG");
+        break;
+    }
+    HALT_SYS();
+    return NULL;                /* NOT REACHED OR REACHED ON ERROR */
 }
 
 /*
  *
  * return offset from the SIB Byte
  */
-u32 decode_sib_address(int sib, int mod)
+u32
+decode_sib_address(int sib, int mod)
 {
     u32 base = 0, i = 0, scale = 1;
 
-    switch(sib & 0x07) {
+    switch (sib & 0x07) {
     case 0:
-	DECODE_PRINTF("[EAX]");
-	base = M.x86.R_EAX;
-	break;
+        DECODE_PRINTF("[EAX]");
+        base = M.x86.R_EAX;
+        break;
     case 1:
-	DECODE_PRINTF("[ECX]");
-	base = M.x86.R_ECX;
-	break;
+        DECODE_PRINTF("[ECX]");
+        base = M.x86.R_ECX;
+        break;
     case 2:
-	DECODE_PRINTF("[EDX]");
-	base = M.x86.R_EDX;
-	break;
+        DECODE_PRINTF("[EDX]");
+        base = M.x86.R_EDX;
+        break;
     case 3:
-	DECODE_PRINTF("[EBX]");
-	base = M.x86.R_EBX;
-	break;
+        DECODE_PRINTF("[EBX]");
+        base = M.x86.R_EBX;
+        break;
     case 4:
-	DECODE_PRINTF("[ESP]");
-	base = M.x86.R_ESP;
-	M.x86.mode |= SYSMODE_SEG_DS_SS;
-	break;
+        DECODE_PRINTF("[ESP]");
+        base = M.x86.R_ESP;
+        M.x86.mode |= SYSMODE_SEG_DS_SS;
+        break;
     case 5:
-	if (mod == 0) {
-	    base = fetch_long_imm();
-	    DECODE_PRINTF2("%08x", base);
-	} else {
-	    DECODE_PRINTF("[EBP]");
-	    base = M.x86.R_ESP;
-	    M.x86.mode |= SYSMODE_SEG_DS_SS;
-	}
-	break;
+        if (mod == 0) {
+            base = fetch_long_imm();
+            DECODE_PRINTF2("%08x", base);
+        }
+        else {
+            DECODE_PRINTF("[EBP]");
+            base = M.x86.R_ESP;
+            M.x86.mode |= SYSMODE_SEG_DS_SS;
+        }
+        break;
     case 6:
-	DECODE_PRINTF("[ESI]");
-	base = M.x86.R_ESI;
-	break;
+        DECODE_PRINTF("[ESI]");
+        base = M.x86.R_ESI;
+        break;
     case 7:
-	DECODE_PRINTF("[EDI]");
-	base = M.x86.R_EDI;
-	break;
+        DECODE_PRINTF("[EDI]");
+        base = M.x86.R_EDI;
+        break;
     }
     switch ((sib >> 3) & 0x07) {
     case 0:
-	DECODE_PRINTF("[EAX");
-	i = M.x86.R_EAX;
-	break;
+        DECODE_PRINTF("[EAX");
+        i = M.x86.R_EAX;
+        break;
     case 1:
-	DECODE_PRINTF("[ECX");
-	i = M.x86.R_ECX;
-	break;
+        DECODE_PRINTF("[ECX");
+        i = M.x86.R_ECX;
+        break;
     case 2:
-	DECODE_PRINTF("[EDX");
-	i = M.x86.R_EDX;
-	break;
+        DECODE_PRINTF("[EDX");
+        i = M.x86.R_EDX;
+        break;
     case 3:
-	DECODE_PRINTF("[EBX");
-	i = M.x86.R_EBX;
-	break;
+        DECODE_PRINTF("[EBX");
+        i = M.x86.R_EBX;
+        break;
     case 4:
-	i = 0;
-	break;
+        i = 0;
+        break;
     case 5:
-	DECODE_PRINTF("[EBP");
-	i = M.x86.R_EBP;
-	break;
+        DECODE_PRINTF("[EBP");
+        i = M.x86.R_EBP;
+        break;
     case 6:
-	DECODE_PRINTF("[ESI");
-	i = M.x86.R_ESI;
-	break;
+        DECODE_PRINTF("[ESI");
+        i = M.x86.R_ESI;
+        break;
     case 7:
-	DECODE_PRINTF("[EDI");
-	i = M.x86.R_EDI;
-	break;
+        DECODE_PRINTF("[EDI");
+        i = M.x86.R_EDI;
+        break;
     }
     scale = 1 << ((sib >> 6) & 0x03);
     if (((sib >> 3) & 0x07) != 4) {
-	if (scale == 1) {
-	    DECODE_PRINTF("]");
-	} else {
-	    DECODE_PRINTF2("*%d]", scale);
-	}
+        if (scale == 1) {
+            DECODE_PRINTF("]");
+        }
+        else {
+            DECODE_PRINTF2("*%d]", scale);
+        }
     }
     return base + (i * scale);
 }
@@ -835,74 +832,75 @@ NOTE: 	The code which specifies the corresponding segment (ds vs ss)
 		if a SS access is needed, set this bit.  Otherwise, DS access
 		occurs (unless any of the segment override bits are set).
 ****************************************************************************/
-u32 decode_rm00_address(
-	int rm)
+u32
+decode_rm00_address(int rm)
 {
     u32 offset;
     int sib;
 
     if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
         /* 32-bit addressing */
-	switch (rm) {
-	  case 0:
-		DECODE_PRINTF("[EAX]");
-		return M.x86.R_EAX;
-	  case 1:
-		DECODE_PRINTF("[ECX]");
-		return M.x86.R_ECX;
-	  case 2:
-		DECODE_PRINTF("[EDX]");
-		return M.x86.R_EDX;
-	  case 3:
-		DECODE_PRINTF("[EBX]");
-		return M.x86.R_EBX;
-	  case 4:
-		sib = fetch_byte_imm();
-		return decode_sib_address(sib, 0);
-	  case 5:
-		offset = fetch_long_imm();
-		DECODE_PRINTF2("[%08x]", offset);
-		return offset;
-	  case 6:
-		DECODE_PRINTF("[ESI]");
-		return M.x86.R_ESI;
-	  case 7:
-		DECODE_PRINTF("[EDI]");
-		return M.x86.R_EDI;
-	}
-	HALT_SYS();
-    } else {
+        switch (rm) {
+        case 0:
+            DECODE_PRINTF("[EAX]");
+            return M.x86.R_EAX;
+        case 1:
+            DECODE_PRINTF("[ECX]");
+            return M.x86.R_ECX;
+        case 2:
+            DECODE_PRINTF("[EDX]");
+            return M.x86.R_EDX;
+        case 3:
+            DECODE_PRINTF("[EBX]");
+            return M.x86.R_EBX;
+        case 4:
+            sib = fetch_byte_imm();
+            return decode_sib_address(sib, 0);
+        case 5:
+            offset = fetch_long_imm();
+            DECODE_PRINTF2("[%08x]", offset);
+            return offset;
+        case 6:
+            DECODE_PRINTF("[ESI]");
+            return M.x86.R_ESI;
+        case 7:
+            DECODE_PRINTF("[EDI]");
+            return M.x86.R_EDI;
+        }
+        HALT_SYS();
+    }
+    else {
         /* 16-bit addressing */
-	switch (rm) {
-	  case 0:
-		DECODE_PRINTF("[BX+SI]");
+        switch (rm) {
+        case 0:
+            DECODE_PRINTF("[BX+SI]");
             return (M.x86.R_BX + M.x86.R_SI) & 0xffff;
-	  case 1:
-		DECODE_PRINTF("[BX+DI]");
+        case 1:
+            DECODE_PRINTF("[BX+DI]");
             return (M.x86.R_BX + M.x86.R_DI) & 0xffff;
-	  case 2:
-		DECODE_PRINTF("[BP+SI]");
-		M.x86.mode |= SYSMODE_SEG_DS_SS;
+        case 2:
+            DECODE_PRINTF("[BP+SI]");
+            M.x86.mode |= SYSMODE_SEG_DS_SS;
             return (M.x86.R_BP + M.x86.R_SI) & 0xffff;
-	  case 3:
-		DECODE_PRINTF("[BP+DI]");
-		M.x86.mode |= SYSMODE_SEG_DS_SS;
+        case 3:
+            DECODE_PRINTF("[BP+DI]");
+            M.x86.mode |= SYSMODE_SEG_DS_SS;
             return (M.x86.R_BP + M.x86.R_DI) & 0xffff;
-	  case 4:
-		DECODE_PRINTF("[SI]");
-		return M.x86.R_SI;
-	  case 5:
-		DECODE_PRINTF("[DI]");
-		return M.x86.R_DI;
-	  case 6:
-		offset = fetch_word_imm();
-		DECODE_PRINTF2("[%04x]", offset);
-		return offset;
-	  case 7:
-		DECODE_PRINTF("[BX]");
-		return M.x86.R_BX;
-	}
-	HALT_SYS();
+        case 4:
+            DECODE_PRINTF("[SI]");
+            return M.x86.R_SI;
+        case 5:
+            DECODE_PRINTF("[DI]");
+            return M.x86.R_DI;
+        case 6:
+            offset = fetch_word_imm();
+            DECODE_PRINTF2("[%04x]", offset);
+            return offset;
+        case 7:
+            DECODE_PRINTF("[BX]");
+            return M.x86.R_BX;
+        }
+        HALT_SYS();
     }
     return 0;
 }
@@ -918,79 +916,80 @@ REMARKS:
 Return the offset given by mod=01 addressing.  Also enables the
 decoding of instructions.
 ****************************************************************************/
-u32 decode_rm01_address(
-	int rm)
+u32
+decode_rm01_address(int rm)
 {
     int displacement = 0;
     int sib;
 
     /* Fetch disp8 if no SIB byte */
     if (!((M.x86.mode & SYSMODE_PREFIX_ADDR) && (rm == 4)))
-	displacement = (s8)fetch_byte_imm();
+        displacement = (s8) fetch_byte_imm();
 
     if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
         /* 32-bit addressing */
-	switch (rm) {
-	  case 0:
-		DECODE_PRINTF2("%d[EAX]", displacement);
-		return M.x86.R_EAX + displacement;
-	  case 1:
-		DECODE_PRINTF2("%d[ECX]", displacement);
-		return M.x86.R_ECX + displacement;
-	  case 2:
-		DECODE_PRINTF2("%d[EDX]", displacement);
-		return M.x86.R_EDX + displacement;
-	  case 3:
-		DECODE_PRINTF2("%d[EBX]", displacement);
-		return M.x86.R_EBX + displacement;
-	  case 4:
-		sib = fetch_byte_imm();
-		displacement = (s8)fetch_byte_imm();
-		DECODE_PRINTF2("%d", displacement);
-		return decode_sib_address(sib, 1) + displacement;
-	  case 5:
-		DECODE_PRINTF2("%d[EBP]", displacement);
-		return M.x86.R_EBP + displacement;
-	  case 6:
-		DECODE_PRINTF2("%d[ESI]", displacement);
-		return M.x86.R_ESI + displacement;
-	  case 7:
-		DECODE_PRINTF2("%d[EDI]", displacement);
-		return M.x86.R_EDI + displacement;
-	}
-	HALT_SYS();
-    } else {
+        switch (rm) {
+        case 0:
+            DECODE_PRINTF2("%d[EAX]", displacement);
+            return M.x86.R_EAX + displacement;
+        case 1:
+            DECODE_PRINTF2("%d[ECX]", displacement);
+            return M.x86.R_ECX + displacement;
+        case 2:
+            DECODE_PRINTF2("%d[EDX]", displacement);
+            return M.x86.R_EDX + displacement;
+        case 3:
+            DECODE_PRINTF2("%d[EBX]", displacement);
+            return M.x86.R_EBX + displacement;
+        case 4:
+            sib = fetch_byte_imm();
+            displacement = (s8) fetch_byte_imm();
+            DECODE_PRINTF2("%d", displacement);
+            return decode_sib_address(sib, 1) + displacement;
+        case 5:
+            DECODE_PRINTF2("%d[EBP]", displacement);
+            return M.x86.R_EBP + displacement;
+        case 6:
+            DECODE_PRINTF2("%d[ESI]", displacement);
+            return M.x86.R_ESI + displacement;
+        case 7:
+            DECODE_PRINTF2("%d[EDI]", displacement);
+            return M.x86.R_EDI + displacement;
+        }
+        HALT_SYS();
+    }
+    else {
         /* 16-bit addressing */
-	switch (rm) {
-	  case 0:
-		DECODE_PRINTF2("%d[BX+SI]", displacement);
+        switch (rm) {
+        case 0:
+            DECODE_PRINTF2("%d[BX+SI]", displacement);
             return (M.x86.R_BX + M.x86.R_SI + displacement) & 0xffff;
-	  case 1:
-		DECODE_PRINTF2("%d[BX+DI]", displacement);
+        case 1:
+            DECODE_PRINTF2("%d[BX+DI]", displacement);
             return (M.x86.R_BX + M.x86.R_DI + displacement) & 0xffff;
-	  case 2:
-		DECODE_PRINTF2("%d[BP+SI]", displacement);
-		M.x86.mode |= SYSMODE_SEG_DS_SS;
+        case 2:
+            DECODE_PRINTF2("%d[BP+SI]", displacement);
+            M.x86.mode |= SYSMODE_SEG_DS_SS;
             return (M.x86.R_BP + M.x86.R_SI + displacement) & 0xffff;
-	  case 3:
-		DECODE_PRINTF2("%d[BP+DI]", displacement);
-		M.x86.mode |= SYSMODE_SEG_DS_SS;
+        case 3:
+            DECODE_PRINTF2("%d[BP+DI]", displacement);
+            M.x86.mode |= SYSMODE_SEG_DS_SS;
             return (M.x86.R_BP + M.x86.R_DI + displacement) & 0xffff;
-	  case 4:
-		DECODE_PRINTF2("%d[SI]", displacement);
+        case 4:
+            DECODE_PRINTF2("%d[SI]", displacement);
             return (M.x86.R_SI + displacement) & 0xffff;
-	  case 5:
-		DECODE_PRINTF2("%d[DI]", displacement);
+        case 5:
+            DECODE_PRINTF2("%d[DI]", displacement);
             return (M.x86.R_DI + displacement) & 0xffff;
-	  case 6:
-		DECODE_PRINTF2("%d[BP]", displacement);
-		M.x86.mode |= SYSMODE_SEG_DS_SS;
+        case 6:
+            DECODE_PRINTF2("%d[BP]", displacement);
+            M.x86.mode |= SYSMODE_SEG_DS_SS;
             return (M.x86.R_BP + displacement) & 0xffff;
-	  case 7:
-		DECODE_PRINTF2("%d[BX]", displacement);
+        case 7:
+            DECODE_PRINTF2("%d[BX]", displacement);
             return (M.x86.R_BX + displacement) & 0xffff;
-	}
-	HALT_SYS();
+        }
+        HALT_SYS();
     }
     return 0;                   /* SHOULD NOT HAPPEN */
 }
@@ -1006,86 +1005,87 @@ REMARKS:
 Return the offset given by mod=10 addressing.  Also enables the
 decoding of instructions.
 ****************************************************************************/
-u32 decode_rm10_address(
-	int rm)
+u32
+decode_rm10_address(int rm)
 {
     u32 displacement = 0;
     int sib;
 
     /* Fetch disp16 if 16-bit addr mode */
     if (!(M.x86.mode & SYSMODE_PREFIX_ADDR))
-	displacement = (u16)fetch_word_imm();
+        displacement = (u16) fetch_word_imm();
     else {
-	/* Fetch disp32 if no SIB byte */
-	if (rm != 4)
-	    displacement = (u32)fetch_long_imm();
+        /* Fetch disp32 if no SIB byte */
+        if (rm != 4)
+            displacement = (u32) fetch_long_imm();
     }
 
     if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
         /* 32-bit addressing */
-      switch (rm) {
-	  case 0:
-		DECODE_PRINTF2("%08x[EAX]", displacement);
-		return M.x86.R_EAX + displacement;
-	  case 1:
-		DECODE_PRINTF2("%08x[ECX]", displacement);
-		return M.x86.R_ECX + displacement;
-	  case 2:
-		DECODE_PRINTF2("%08x[EDX]", displacement);
-		M.x86.mode |= SYSMODE_SEG_DS_SS;
-		return M.x86.R_EDX + displacement;
-	  case 3:
-		DECODE_PRINTF2("%08x[EBX]", displacement);
-		return M.x86.R_EBX + displacement;
-	  case 4:
-		sib = fetch_byte_imm();
-		displacement = (u32)fetch_long_imm();
-		DECODE_PRINTF2("%08x", displacement);
-		return decode_sib_address(sib, 2) + displacement;
-		break;
-	  case 5:
-		DECODE_PRINTF2("%08x[EBP]", displacement);
-		return M.x86.R_EBP + displacement;
-	  case 6:
-		DECODE_PRINTF2("%08x[ESI]", displacement);
-		return M.x86.R_ESI + displacement;
-	  case 7:
-		DECODE_PRINTF2("%08x[EDI]", displacement);
-		return M.x86.R_EDI + displacement;
-	}
-	HALT_SYS();
-    } else {
+        switch (rm) {
+        case 0:
+            DECODE_PRINTF2("%08x[EAX]", displacement);
+            return M.x86.R_EAX + displacement;
+        case 1:
+            DECODE_PRINTF2("%08x[ECX]", displacement);
+            return M.x86.R_ECX + displacement;
+        case 2:
+            DECODE_PRINTF2("%08x[EDX]", displacement);
+            M.x86.mode |= SYSMODE_SEG_DS_SS;
+            return M.x86.R_EDX + displacement;
+        case 3:
+            DECODE_PRINTF2("%08x[EBX]", displacement);
+            return M.x86.R_EBX + displacement;
+        case 4:
+            sib = fetch_byte_imm();
+            displacement = (u32) fetch_long_imm();
+            DECODE_PRINTF2("%08x", displacement);
+            return decode_sib_address(sib, 2) + displacement;
+            break;
+        case 5:
+            DECODE_PRINTF2("%08x[EBP]", displacement);
+            return M.x86.R_EBP + displacement;
+        case 6:
+            DECODE_PRINTF2("%08x[ESI]", displacement);
+            return M.x86.R_ESI + displacement;
+        case 7:
+            DECODE_PRINTF2("%08x[EDI]", displacement);
+            return M.x86.R_EDI + displacement;
+        }
+        HALT_SYS();
+    }
+    else {
         /* 16-bit addressing */
-      switch (rm) {
-	  case 0:
+        switch (rm) {
+        case 0:
             DECODE_PRINTF2("%04x[BX+SI]", displacement);
             return (M.x86.R_BX + M.x86.R_SI + displacement) & 0xffff;
-	  case 1:
+        case 1:
             DECODE_PRINTF2("%04x[BX+DI]", displacement);
             return (M.x86.R_BX + M.x86.R_DI + displacement) & 0xffff;
-	  case 2:
-		DECODE_PRINTF2("%04x[BP+SI]", displacement);
-		M.x86.mode |= SYSMODE_SEG_DS_SS;
+        case 2:
+            DECODE_PRINTF2("%04x[BP+SI]", displacement);
+            M.x86.mode |= SYSMODE_SEG_DS_SS;
             return (M.x86.R_BP + M.x86.R_SI + displacement) & 0xffff;
-	  case 3:
-		DECODE_PRINTF2("%04x[BP+DI]", displacement);
-		M.x86.mode |= SYSMODE_SEG_DS_SS;
+        case 3:
+            DECODE_PRINTF2("%04x[BP+DI]", displacement);
+            M.x86.mode |= SYSMODE_SEG_DS_SS;
             return (M.x86.R_BP + M.x86.R_DI + displacement) & 0xffff;
-	  case 4:
+        case 4:
             DECODE_PRINTF2("%04x[SI]", displacement);
             return (M.x86.R_SI + displacement) & 0xffff;
-	  case 5:
+        case 5:
             DECODE_PRINTF2("%04x[DI]", displacement);
             return (M.x86.R_DI + displacement) & 0xffff;
-	  case 6:
-		DECODE_PRINTF2("%04x[BP]", displacement);
-		M.x86.mode |= SYSMODE_SEG_DS_SS;
+        case 6:
+            DECODE_PRINTF2("%04x[BP]", displacement);
+            M.x86.mode |= SYSMODE_SEG_DS_SS;
             return (M.x86.R_BP + displacement) & 0xffff;
-	  case 7:
+        case 7:
             DECODE_PRINTF2("%04x[BX]", displacement);
             return (M.x86.R_BX + displacement) & 0xffff;
-	}
-	HALT_SYS();
+        }
+        HALT_SYS();
     }
     return 0;
     /*NOTREACHED */
diff --git a/xorg-server/hw/xfree86/x86emu/fpu.c b/xorg-server/hw/xfree86/x86emu/fpu.c
index fbc602da5..0dab05ce3 100644
--- a/xorg-server/hw/xfree86/x86emu/fpu.c
+++ b/xorg-server/hw/xfree86/x86emu/fpu.c
@@ -42,7 +42,8 @@
 /*----------------------------- Implementation ----------------------------*/
 
 /* opcode=0xd8 */
-void x86emuOp_esc_coprocess_d8(u8 X86EMU_UNUSED(op1))
+void
+x86emuOp_esc_coprocess_d8(u8 X86EMU_UNUSED(op1))
 {
     START_OF_INSTR();
     DECODE_PRINTF("ESC D8\n");
@@ -89,10 +90,11 @@ static const char *x86emu_fpu_op_d9_tab1[] = {
     "FRNDINT", "FSCALE", "ESC_D9", "ESC_D9",
 };
 
-#endif /* DEBUG */
+#endif                          /* DEBUG */
 
 /* opcode=0xd9 */
-void x86emuOp_esc_coprocess_d9(u8 X86EMU_UNUSED(op1))
+void
+x86emuOp_esc_coprocess_d9(u8 X86EMU_UNUSED(op1))
 {
     int mod, rl, rh;
     uint destoffset = 0;
@@ -103,56 +105,58 @@ void x86emuOp_esc_coprocess_d9(u8 X86EMU_UNUSED(op1))
 #ifdef DEBUG
     if (mod != 3) {
         DECODE_PRINTINSTR32(x86emu_fpu_op_d9_tab, mod, rh, rl);
-    } else {
+    }
+    else {
         DECODE_PRINTF(x86emu_fpu_op_d9_tab1[(rh << 3) + rl]);
     }
 #endif
     switch (mod) {
-      case 0:
+    case 0:
         destoffset = decode_rm00_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 1:
+    case 1:
         destoffset = decode_rm01_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 2:
+    case 2:
         destoffset = decode_rm10_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 3:                   /* register to register */
-		stkelem = (u8)rl;
-		if (rh < 4) {
-				DECODE_PRINTF2("ST(%d)\n", stkelem);
-		} else {
-				DECODE_PRINTF("\n");
-		}
+    case 3:                    /* register to register */
+        stkelem = (u8) rl;
+        if (rh < 4) {
+            DECODE_PRINTF2("ST(%d)\n", stkelem);
+        }
+        else {
+            DECODE_PRINTF("\n");
+        }
         break;
     }
 #ifdef X86EMU_FPU_PRESENT
     /* execute */
     switch (mod) {
-      case 3:
+    case 3:
         switch (rh) {
-          case 0:
+        case 0:
             x86emu_fpu_R_fld(X86EMU_FPU_STKTOP, stkelem);
             break;
-          case 1:
+        case 1:
             x86emu_fpu_R_fxch(X86EMU_FPU_STKTOP, stkelem);
             break;
-          case 2:
+        case 2:
             switch (rl) {
-              case 0:
+            case 0:
                 x86emu_fpu_R_nop();
                 break;
-              default:
+            default:
                 x86emu_fpu_illegal();
                 break;
             }
-          case 3:
+        case 3:
             x86emu_fpu_R_fstp(X86EMU_FPU_STKTOP, stkelem);
             break;
-          case 4:
+        case 4:
             switch (rl) {
             case 0:
                 x86emu_fpu_R_fchs(X86EMU_FPU_STKTOP);
@@ -173,126 +177,126 @@ void x86emuOp_esc_coprocess_d9(u8 X86EMU_UNUSED(op1))
             }
             break;
 
-          case 5:
+        case 5:
             switch (rl) {
-              case 0:
+            case 0:
                 x86emu_fpu_R_fld1(X86EMU_FPU_STKTOP);
                 break;
-              case 1:
+            case 1:
                 x86emu_fpu_R_fldl2t(X86EMU_FPU_STKTOP);
                 break;
-              case 2:
+            case 2:
                 x86emu_fpu_R_fldl2e(X86EMU_FPU_STKTOP);
                 break;
-              case 3:
+            case 3:
                 x86emu_fpu_R_fldpi(X86EMU_FPU_STKTOP);
                 break;
-              case 4:
+            case 4:
                 x86emu_fpu_R_fldlg2(X86EMU_FPU_STKTOP);
                 break;
-              case 5:
+            case 5:
                 x86emu_fpu_R_fldln2(X86EMU_FPU_STKTOP);
                 break;
-              case 6:
+            case 6:
                 x86emu_fpu_R_fldz(X86EMU_FPU_STKTOP);
                 break;
-              default:
+            default:
                 /* 7 */
                 x86emu_fpu_illegal();
                 break;
             }
             break;
 
-          case 6:
+        case 6:
             switch (rl) {
-              case 0:
+            case 0:
                 x86emu_fpu_R_f2xm1(X86EMU_FPU_STKTOP);
                 break;
-              case 1:
+            case 1:
                 x86emu_fpu_R_fyl2x(X86EMU_FPU_STKTOP);
                 break;
-              case 2:
+            case 2:
                 x86emu_fpu_R_fptan(X86EMU_FPU_STKTOP);
                 break;
-              case 3:
+            case 3:
                 x86emu_fpu_R_fpatan(X86EMU_FPU_STKTOP);
                 break;
-              case 4:
+            case 4:
                 x86emu_fpu_R_fxtract(X86EMU_FPU_STKTOP);
                 break;
-              case 5:
+            case 5:
                 x86emu_fpu_illegal();
                 break;
-              case 6:
+            case 6:
                 x86emu_fpu_R_decstp();
                 break;
-              case 7:
+            case 7:
                 x86emu_fpu_R_incstp();
                 break;
             }
             break;
 
-          case 7:
+        case 7:
             switch (rl) {
-              case 0:
+            case 0:
                 x86emu_fpu_R_fprem(X86EMU_FPU_STKTOP);
                 break;
-              case 1:
+            case 1:
                 x86emu_fpu_R_fyl2xp1(X86EMU_FPU_STKTOP);
                 break;
-              case 2:
+            case 2:
                 x86emu_fpu_R_fsqrt(X86EMU_FPU_STKTOP);
                 break;
-              case 3:
+            case 3:
                 x86emu_fpu_illegal();
                 break;
-              case 4:
+            case 4:
                 x86emu_fpu_R_frndint(X86EMU_FPU_STKTOP);
                 break;
-              case 5:
+            case 5:
                 x86emu_fpu_R_fscale(X86EMU_FPU_STKTOP);
                 break;
-              case 6:
-              case 7:
-              default:
+            case 6:
+            case 7:
+            default:
                 x86emu_fpu_illegal();
                 break;
             }
             break;
 
-          default:
+        default:
             switch (rh) {
-              case 0:
+            case 0:
                 x86emu_fpu_M_fld(X86EMU_FPU_FLOAT, destoffset);
                 break;
-              case 1:
+            case 1:
                 x86emu_fpu_illegal();
                 break;
-              case 2:
+            case 2:
                 x86emu_fpu_M_fst(X86EMU_FPU_FLOAT, destoffset);
                 break;
-              case 3:
+            case 3:
                 x86emu_fpu_M_fstp(X86EMU_FPU_FLOAT, destoffset);
                 break;
-              case 4:
+            case 4:
                 x86emu_fpu_M_fldenv(X86EMU_FPU_WORD, destoffset);
                 break;
-              case 5:
+            case 5:
                 x86emu_fpu_M_fldcw(X86EMU_FPU_WORD, destoffset);
                 break;
-              case 6:
+            case 6:
                 x86emu_fpu_M_fstenv(X86EMU_FPU_WORD, destoffset);
                 break;
-              case 7:
+            case 7:
                 x86emu_fpu_M_fstcw(X86EMU_FPU_WORD, destoffset);
                 break;
             }
         }
     }
 #else
-    (void)destoffset;
-    (void)stkelem;
-#endif /* X86EMU_FPU_PRESENT */
+    (void) destoffset;
+    (void) stkelem;
+#endif                          /* X86EMU_FPU_PRESENT */
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR_NO_TRACE();
 }
@@ -309,7 +313,7 @@ static const char *x86emu_fpu_op_da_tab[] = {
     "FICOMP\tDWORD PTR ",
     "FISUB\tDWORD PTR ", "FISUBR\tDWORD PTR ", "FIDIV\tDWORD PTR ",
     "FIDIVR\tDWORD PTR ",
-    
+
     "FIADD\tDWORD PTR ", "FIMUL\tDWORD PTR ", "FICOM\tDWORD PTR ",
     "FICOMP\tDWORD PTR ",
     "FISUB\tDWORD PTR ", "FISUBR\tDWORD PTR ", "FIDIV\tDWORD PTR ",
@@ -319,10 +323,11 @@ static const char *x86emu_fpu_op_da_tab[] = {
     "ESC_DA     ", "ESC_DA ", "ESC_DA   ", "ESC_DA ",
 };
 
-#endif /* DEBUG */
+#endif                          /* DEBUG */
 
 /* opcode=0xda */
-void x86emuOp_esc_coprocess_da(u8 X86EMU_UNUSED(op1))
+void
+x86emuOp_esc_coprocess_da(u8 X86EMU_UNUSED(op1))
 {
     int mod, rl, rh;
     uint destoffset = 0;
@@ -332,59 +337,59 @@ void x86emuOp_esc_coprocess_da(u8 X86EMU_UNUSED(op1))
     FETCH_DECODE_MODRM(mod, rh, rl);
     DECODE_PRINTINSTR32(x86emu_fpu_op_da_tab, mod, rh, rl);
     switch (mod) {
-      case 0:
+    case 0:
         destoffset = decode_rm00_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 1:
+    case 1:
         destoffset = decode_rm01_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 2:
+    case 2:
         destoffset = decode_rm10_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 3:           /* register to register */
-		stkelem = (u8)rl;
+    case 3:                    /* register to register */
+        stkelem = (u8) rl;
         DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
         break;
     }
 #ifdef X86EMU_FPU_PRESENT
     switch (mod) {
-      case 3:
+    case 3:
         x86emu_fpu_illegal();
         break;
-      default:
+    default:
         switch (rh) {
-          case 0:
+        case 0:
             x86emu_fpu_M_iadd(X86EMU_FPU_SHORT, destoffset);
             break;
-          case 1:
+        case 1:
             x86emu_fpu_M_imul(X86EMU_FPU_SHORT, destoffset);
             break;
-          case 2:
+        case 2:
             x86emu_fpu_M_icom(X86EMU_FPU_SHORT, destoffset);
             break;
-          case 3:
+        case 3:
             x86emu_fpu_M_icomp(X86EMU_FPU_SHORT, destoffset);
             break;
-          case 4:
+        case 4:
             x86emu_fpu_M_isub(X86EMU_FPU_SHORT, destoffset);
             break;
-          case 5:
+        case 5:
             x86emu_fpu_M_isubr(X86EMU_FPU_SHORT, destoffset);
             break;
-          case 6:
+        case 6:
             x86emu_fpu_M_idiv(X86EMU_FPU_SHORT, destoffset);
             break;
-          case 7:
+        case 7:
             x86emu_fpu_M_idivr(X86EMU_FPU_SHORT, destoffset);
             break;
         }
     }
 #else
-    (void)destoffset;
-    (void)stkelem;
+    (void) destoffset;
+    (void) stkelem;
 #endif
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR_NO_TRACE();
@@ -403,10 +408,11 @@ static const char *x86emu_fpu_op_db_tab[] = {
     "ESC_DB\t1C", "FLD\tTBYTE PTR ", "ESC_DB\t1E", "FSTP\tTBYTE PTR ",
 };
 
-#endif /* DEBUG */
+#endif                          /* DEBUG */
 
 /* opcode=0xdb */
-void x86emuOp_esc_coprocess_db(u8 X86EMU_UNUSED(op1))
+void
+x86emuOp_esc_coprocess_db(u8 X86EMU_UNUSED(op1))
 {
     int mod, rl, rh;
     uint destoffset = 0;
@@ -416,97 +422,99 @@ void x86emuOp_esc_coprocess_db(u8 X86EMU_UNUSED(op1))
 #ifdef DEBUG
     if (mod != 3) {
         DECODE_PRINTINSTR32(x86emu_fpu_op_db_tab, mod, rh, rl);
-    } else if (rh == 4) {       /* === 11 10 0 nnn */
+    }
+    else if (rh == 4) {         /* === 11 10 0 nnn */
         switch (rl) {
-          case 0:
+        case 0:
             DECODE_PRINTF("FENI\n");
             break;
-          case 1:
+        case 1:
             DECODE_PRINTF("FDISI\n");
             break;
-          case 2:
+        case 2:
             DECODE_PRINTF("FCLEX\n");
             break;
-          case 3:
+        case 3:
             DECODE_PRINTF("FINIT\n");
             break;
         }
-    } else {
+    }
+    else {
         DECODE_PRINTF2("ESC_DB %0x\n", (mod << 6) + (rh << 3) + (rl));
     }
-#endif /* DEBUG */
+#endif                          /* DEBUG */
     switch (mod) {
-      case 0:
+    case 0:
         destoffset = decode_rm00_address(rl);
         break;
-      case 1:
+    case 1:
         destoffset = decode_rm01_address(rl);
         break;
-      case 2:
+    case 2:
         destoffset = decode_rm10_address(rl);
         break;
-      case 3:                   /* register to register */
+    case 3:                    /* register to register */
         break;
     }
 #ifdef X86EMU_FPU_PRESENT
     /* execute */
     switch (mod) {
-      case 3:
+    case 3:
         switch (rh) {
-          case 4:
+        case 4:
             switch (rl) {
-              case 0:
+            case 0:
                 x86emu_fpu_R_feni();
                 break;
-              case 1:
+            case 1:
                 x86emu_fpu_R_fdisi();
                 break;
-              case 2:
+            case 2:
                 x86emu_fpu_R_fclex();
                 break;
-              case 3:
+            case 3:
                 x86emu_fpu_R_finit();
                 break;
-              default:
+            default:
                 x86emu_fpu_illegal();
                 break;
             }
             break;
-          default:
+        default:
             x86emu_fpu_illegal();
             break;
         }
         break;
-      default:
+    default:
         switch (rh) {
-          case 0:
+        case 0:
             x86emu_fpu_M_fild(X86EMU_FPU_SHORT, destoffset);
             break;
-          case 1:
+        case 1:
             x86emu_fpu_illegal();
             break;
-          case 2:
+        case 2:
             x86emu_fpu_M_fist(X86EMU_FPU_SHORT, destoffset);
             break;
-          case 3:
+        case 3:
             x86emu_fpu_M_fistp(X86EMU_FPU_SHORT, destoffset);
             break;
-          case 4:
+        case 4:
             x86emu_fpu_illegal();
             break;
-          case 5:
+        case 5:
             x86emu_fpu_M_fld(X86EMU_FPU_LDBL, destoffset);
             break;
-                      case 6:
+        case 6:
             x86emu_fpu_illegal();
             break;
-          case 7:
+        case 7:
             x86emu_fpu_M_fstp(X86EMU_FPU_LDBL, destoffset);
             break;
         }
     }
 #else
-    (void)destoffset;
+    (void) destoffset;
 #endif
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR_NO_TRACE();
@@ -532,10 +540,11 @@ static const char *x86emu_fpu_op_dc_tab[] = {
     "FADD\t", "FMUL\t", "FCOM\t", "FCOMP\t",
     "FSUBR\t", "FSUB\t", "FDIVR\t", "FDIV\t",
 };
-#endif /* DEBUG */
+#endif                          /* DEBUG */
 
 /* opcode=0xdc */
-void x86emuOp_esc_coprocess_dc(u8 X86EMU_UNUSED(op1))
+void
+x86emuOp_esc_coprocess_dc(u8 X86EMU_UNUSED(op1))
 {
     int mod, rl, rh;
     uint destoffset = 0;
@@ -545,85 +554,85 @@ void x86emuOp_esc_coprocess_dc(u8 X86EMU_UNUSED(op1))
     FETCH_DECODE_MODRM(mod, rh, rl);
     DECODE_PRINTINSTR32(x86emu_fpu_op_dc_tab, mod, rh, rl);
     switch (mod) {
-      case 0:
+    case 0:
         destoffset = decode_rm00_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 1:
+    case 1:
         destoffset = decode_rm01_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 2:
+    case 2:
         destoffset = decode_rm10_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 3:                   /* register to register */
-		stkelem = (u8)rl;
+    case 3:                    /* register to register */
+        stkelem = (u8) rl;
         DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
         break;
     }
 #ifdef X86EMU_FPU_PRESENT
     /* execute */
     switch (mod) {
-      case 3:
+    case 3:
         switch (rh) {
-          case 0:
+        case 0:
             x86emu_fpu_R_fadd(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 1:
+        case 1:
             x86emu_fpu_R_fmul(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 2:
+        case 2:
             x86emu_fpu_R_fcom(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 3:
+        case 3:
             x86emu_fpu_R_fcomp(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 4:
+        case 4:
             x86emu_fpu_R_fsubr(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 5:
+        case 5:
             x86emu_fpu_R_fsub(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 6:
+        case 6:
             x86emu_fpu_R_fdivr(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 7:
+        case 7:
             x86emu_fpu_R_fdiv(stkelem, X86EMU_FPU_STKTOP);
             break;
         }
         break;
-      default:
+    default:
         switch (rh) {
-          case 0:
+        case 0:
             x86emu_fpu_M_fadd(X86EMU_FPU_DOUBLE, destoffset);
             break;
-          case 1:
+        case 1:
             x86emu_fpu_M_fmul(X86EMU_FPU_DOUBLE, destoffset);
             break;
-          case 2:
+        case 2:
             x86emu_fpu_M_fcom(X86EMU_FPU_DOUBLE, destoffset);
             break;
-          case 3:
+        case 3:
             x86emu_fpu_M_fcomp(X86EMU_FPU_DOUBLE, destoffset);
             break;
-          case 4:
+        case 4:
             x86emu_fpu_M_fsub(X86EMU_FPU_DOUBLE, destoffset);
             break;
-          case 5:
+        case 5:
             x86emu_fpu_M_fsubr(X86EMU_FPU_DOUBLE, destoffset);
             break;
-          case 6:
+        case 6:
             x86emu_fpu_M_fdiv(X86EMU_FPU_DOUBLE, destoffset);
             break;
-          case 7:
+        case 7:
             x86emu_fpu_M_fdivr(X86EMU_FPU_DOUBLE, destoffset);
             break;
         }
     }
 #else
-    (void)destoffset;
-    (void)stkelem;
+    (void) destoffset;
+    (void) stkelem;
 #endif
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR_NO_TRACE();
@@ -645,10 +654,11 @@ static const char *x86emu_fpu_op_dd_tab[] = {
     "ESC_DD\t2C,", "ESC_DD\t2D,", "ESC_DD\t2E,", "ESC_DD\t2F,",
 };
 
-#endif /* DEBUG */
+#endif                          /* DEBUG */
 
 /* opcode=0xdd */
-void x86emuOp_esc_coprocess_dd(u8 X86EMU_UNUSED(op1))
+void
+x86emuOp_esc_coprocess_dd(u8 X86EMU_UNUSED(op1))
 {
     int mod, rl, rh;
     uint destoffset = 0;
@@ -658,75 +668,75 @@ void x86emuOp_esc_coprocess_dd(u8 X86EMU_UNUSED(op1))
     FETCH_DECODE_MODRM(mod, rh, rl);
     DECODE_PRINTINSTR32(x86emu_fpu_op_dd_tab, mod, rh, rl);
     switch (mod) {
-      case 0:
+    case 0:
         destoffset = decode_rm00_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 1:
+    case 1:
         destoffset = decode_rm01_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 2:
+    case 2:
         destoffset = decode_rm10_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 3:                   /* register to register */
-		stkelem = (u8)rl;
+    case 3:                    /* register to register */
+        stkelem = (u8) rl;
         DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
         break;
     }
 #ifdef X86EMU_FPU_PRESENT
     switch (mod) {
-      case 3:
+    case 3:
         switch (rh) {
-          case 0:
+        case 0:
             x86emu_fpu_R_ffree(stkelem);
             break;
-          case 1:
+        case 1:
             x86emu_fpu_R_fxch(stkelem);
             break;
-          case 2:
+        case 2:
             x86emu_fpu_R_fst(stkelem);  /* register version */
             break;
-          case 3:
+        case 3:
             x86emu_fpu_R_fstp(stkelem); /* register version */
             break;
-          default:
+        default:
             x86emu_fpu_illegal();
             break;
         }
         break;
-      default:
+    default:
         switch (rh) {
-          case 0:
+        case 0:
             x86emu_fpu_M_fld(X86EMU_FPU_DOUBLE, destoffset);
             break;
-          case 1:
+        case 1:
             x86emu_fpu_illegal();
             break;
-          case 2:
+        case 2:
             x86emu_fpu_M_fst(X86EMU_FPU_DOUBLE, destoffset);
             break;
-          case 3:
+        case 3:
             x86emu_fpu_M_fstp(X86EMU_FPU_DOUBLE, destoffset);
             break;
-          case 4:
+        case 4:
             x86emu_fpu_M_frstor(X86EMU_FPU_WORD, destoffset);
             break;
-          case 5:
+        case 5:
             x86emu_fpu_illegal();
             break;
-          case 6:
+        case 6:
             x86emu_fpu_M_fsave(X86EMU_FPU_WORD, destoffset);
             break;
-          case 7:
+        case 7:
             x86emu_fpu_M_fstsw(X86EMU_FPU_WORD, destoffset);
             break;
         }
     }
 #else
-    (void)destoffset;
-    (void)stkelem;
+    (void) destoffset;
+    (void) stkelem;
 #endif
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR_NO_TRACE();
@@ -734,8 +744,7 @@ void x86emuOp_esc_coprocess_dd(u8 X86EMU_UNUSED(op1))
 
 #ifdef DEBUG
 
-static const char *x86emu_fpu_op_de_tab[] =
-{
+static const char *x86emu_fpu_op_de_tab[] = {
     "FIADD\tWORD PTR ", "FIMUL\tWORD PTR ", "FICOM\tWORD PTR ",
     "FICOMP\tWORD PTR ",
     "FISUB\tWORD PTR ", "FISUBR\tWORD PTR ", "FIDIV\tWORD PTR ",
@@ -755,10 +764,11 @@ static const char *x86emu_fpu_op_de_tab[] =
     "FSUBRP\t", "FSUBP\t", "FDIVRP\t", "FDIVP\t",
 };
 
-#endif /* DEBUG */
+#endif                          /* DEBUG */
 
 /* opcode=0xde */
-void x86emuOp_esc_coprocess_de(u8 X86EMU_UNUSED(op1))
+void
+x86emuOp_esc_coprocess_de(u8 X86EMU_UNUSED(op1))
 {
     int mod, rl, rh;
     uint destoffset = 0;
@@ -768,87 +778,87 @@ void x86emuOp_esc_coprocess_de(u8 X86EMU_UNUSED(op1))
     FETCH_DECODE_MODRM(mod, rh, rl);
     DECODE_PRINTINSTR32(x86emu_fpu_op_de_tab, mod, rh, rl);
     switch (mod) {
-      case 0:
+    case 0:
         destoffset = decode_rm00_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 1:
+    case 1:
         destoffset = decode_rm01_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 2:
+    case 2:
         destoffset = decode_rm10_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 3:                   /* register to register */
-		stkelem = (u8)rl;
+    case 3:                    /* register to register */
+        stkelem = (u8) rl;
         DECODE_PRINTF2("\tST(%d),ST\n", stkelem);
         break;
     }
 #ifdef X86EMU_FPU_PRESENT
     switch (mod) {
-      case 3:
+    case 3:
         switch (rh) {
-          case 0:
+        case 0:
             x86emu_fpu_R_faddp(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 1:
+        case 1:
             x86emu_fpu_R_fmulp(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 2:
+        case 2:
             x86emu_fpu_R_fcomp(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 3:
+        case 3:
             if (stkelem == 1)
-              x86emu_fpu_R_fcompp(stkelem, X86EMU_FPU_STKTOP);
+                x86emu_fpu_R_fcompp(stkelem, X86EMU_FPU_STKTOP);
             else
-              x86emu_fpu_illegal();
+                x86emu_fpu_illegal();
             break;
-          case 4:
+        case 4:
             x86emu_fpu_R_fsubrp(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 5:
+        case 5:
             x86emu_fpu_R_fsubp(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 6:
+        case 6:
             x86emu_fpu_R_fdivrp(stkelem, X86EMU_FPU_STKTOP);
             break;
-          case 7:
+        case 7:
             x86emu_fpu_R_fdivp(stkelem, X86EMU_FPU_STKTOP);
             break;
         }
         break;
-      default:
+    default:
         switch (rh) {
-          case 0:
+        case 0:
             x86emu_fpu_M_fiadd(X86EMU_FPU_WORD, destoffset);
             break;
-          case 1:
+        case 1:
             x86emu_fpu_M_fimul(X86EMU_FPU_WORD, destoffset);
             break;
-          case 2:
+        case 2:
             x86emu_fpu_M_ficom(X86EMU_FPU_WORD, destoffset);
             break;
-          case 3:
+        case 3:
             x86emu_fpu_M_ficomp(X86EMU_FPU_WORD, destoffset);
             break;
-          case 4:
+        case 4:
             x86emu_fpu_M_fisub(X86EMU_FPU_WORD, destoffset);
             break;
-          case 5:
+        case 5:
             x86emu_fpu_M_fisubr(X86EMU_FPU_WORD, destoffset);
             break;
-          case 6:
+        case 6:
             x86emu_fpu_M_fidiv(X86EMU_FPU_WORD, destoffset);
             break;
-          case 7:
+        case 7:
             x86emu_fpu_M_fidivr(X86EMU_FPU_WORD, destoffset);
             break;
         }
     }
 #else
-    (void)destoffset;
-    (void)stkelem;
+    (void) destoffset;
+    (void) stkelem;
 #endif
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR_NO_TRACE();
@@ -877,10 +887,11 @@ static const char *x86emu_fpu_op_df_tab[] = {
     "ESC_DF\t3C,", "ESC_DF\t3D,", "ESC_DF\t3E,", "ESC_DF\t3F,"
 };
 
-#endif /* DEBUG */
+#endif                          /* DEBUG */
 
 /* opcode=0xdf */
-void x86emuOp_esc_coprocess_df(u8 X86EMU_UNUSED(op1))
+void
+x86emuOp_esc_coprocess_df(u8 X86EMU_UNUSED(op1))
 {
     int mod, rl, rh;
     uint destoffset = 0;
@@ -890,75 +901,75 @@ void x86emuOp_esc_coprocess_df(u8 X86EMU_UNUSED(op1))
     FETCH_DECODE_MODRM(mod, rh, rl);
     DECODE_PRINTINSTR32(x86emu_fpu_op_df_tab, mod, rh, rl);
     switch (mod) {
-      case 0:
+    case 0:
         destoffset = decode_rm00_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 1:
+    case 1:
         destoffset = decode_rm01_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 2:
+    case 2:
         destoffset = decode_rm10_address(rl);
         DECODE_PRINTF("\n");
         break;
-      case 3:                   /* register to register */
-		stkelem = (u8)rl;
+    case 3:                    /* register to register */
+        stkelem = (u8) rl;
         DECODE_PRINTF2("\tST(%d)\n", stkelem);
         break;
     }
 #ifdef X86EMU_FPU_PRESENT
     switch (mod) {
-      case 3:
+    case 3:
         switch (rh) {
-          case 0:
+        case 0:
             x86emu_fpu_R_ffree(stkelem);
             break;
-          case 1:
+        case 1:
             x86emu_fpu_R_fxch(stkelem);
             break;
-          case 2:
+        case 2:
             x86emu_fpu_R_fst(stkelem);  /* register version */
             break;
-          case 3:
+        case 3:
             x86emu_fpu_R_fstp(stkelem); /* register version */
             break;
-          default:
+        default:
             x86emu_fpu_illegal();
             break;
         }
         break;
-      default:
+    default:
         switch (rh) {
-          case 0:
+        case 0:
             x86emu_fpu_M_fild(X86EMU_FPU_WORD, destoffset);
             break;
-          case 1:
+        case 1:
             x86emu_fpu_illegal();
             break;
-          case 2:
+        case 2:
             x86emu_fpu_M_fist(X86EMU_FPU_WORD, destoffset);
             break;
-          case 3:
+        case 3:
             x86emu_fpu_M_fistp(X86EMU_FPU_WORD, destoffset);
             break;
-          case 4:
+        case 4:
             x86emu_fpu_M_fbld(X86EMU_FPU_BSD, destoffset);
             break;
-          case 5:
+        case 5:
             x86emu_fpu_M_fild(X86EMU_FPU_LONG, destoffset);
             break;
-          case 6:
+        case 6:
             x86emu_fpu_M_fbstp(X86EMU_FPU_BSD, destoffset);
             break;
-          case 7:
+        case 7:
             x86emu_fpu_M_fistp(X86EMU_FPU_LONG, destoffset);
             break;
         }
     }
 #else
-    (void)destoffset;
-    (void)stkelem;
+    (void) destoffset;
+    (void) stkelem;
 #endif
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR_NO_TRACE();
diff --git a/xorg-server/hw/xfree86/x86emu/ops.c b/xorg-server/hw/xfree86/x86emu/ops.c
index a55398275..76b83581f 100644
--- a/xorg-server/hw/xfree86/x86emu/ops.c
+++ b/xorg-server/hw/xfree86/x86emu/ops.c
@@ -1,11752 +1,12307 @@
-/****************************************************************************

-*

-*						Realmode X86 Emulator Library

-*

-*            	Copyright (C) 1996-1999 SciTech Software, Inc.

-* 				     Copyright (C) David Mosberger-Tang

-* 					   Copyright (C) 1999 Egbert Eich

-*

-*  ========================================================================

-*

-*  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 the authors not be used

-*  in advertising or publicity pertaining to distribution of the software

-*  without specific, written prior permission.  The authors makes no

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

-*  It is provided "as is" without express or implied warranty.

-*

-*  THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

-*  EVENT SHALL THE AUTHORS 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.

-*

-*  ========================================================================

-*

-* Language:		ANSI C

-* Environment:	Any

-* Developer:    Kendall Bennett

-*

-* Description:  This file includes subroutines to implement the decoding

-*               and emulation of all the x86 processor instructions.

-*

-* There are approximately 250 subroutines in here, which correspond

-* to the 256 byte-"opcodes" found on the 8086.  The table which

-* dispatches this is found in the files optab.[ch].

-*

-* Each opcode proc has a comment preceeding it which gives it's table

-* address.  Several opcodes are missing (undefined) in the table.

-*

-* Each proc includes information for decoding (DECODE_PRINTF and

-* DECODE_PRINTF2), debugging (TRACE_REGS, SINGLE_STEP), and misc

-* functions (START_OF_INSTR, END_OF_INSTR).

-*

-* Many of the procedures are *VERY* similar in coding.  This has

-* allowed for a very large amount of code to be generated in a fairly

-* short amount of time (i.e. cut, paste, and modify).  The result is

-* that much of the code below could have been folded into subroutines

-* for a large reduction in size of this file.  The downside would be

-* that there would be a penalty in execution speed.  The file could

-* also have been *MUCH* larger by inlining certain functions which

-* were called.  This could have resulted even faster execution.  The

-* prime directive I used to decide whether to inline the code or to

-* modularize it, was basically: 1) no unnecessary subroutine calls,

-* 2) no routines more than about 200 lines in size, and 3) modularize

-* any code that I might not get right the first time.  The fetch_*

-* subroutines fall into the latter category.  The The decode_* fall

-* into the second category.  The coding of the "switch(mod){ .... }"

-* in many of the subroutines below falls into the first category.

-* Especially, the coding of {add,and,or,sub,...}_{byte,word}

-* subroutines are an especially glaring case of the third guideline.

-* Since so much of the code is cloned from other modules (compare

-* opcode #00 to opcode #01), making the basic operations subroutine

-* calls is especially important; otherwise mistakes in coding an

-* "add" would represent a nightmare in maintenance.

-*

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

-

-#include "x86emu/x86emui.h"

-

-/*----------------------------- Implementation ----------------------------*/

-

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

-PARAMETERS:

-op1 - Instruction op code

-

-REMARKS:

-Handles illegal opcodes.

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

-static void x86emuOp_illegal_op(

-    u8 op1)

-{

-    START_OF_INSTR();

-    if (M.x86.R_SP != 0) {

-    DECODE_PRINTF("ILLEGAL X86 OPCODE\n");

-    TRACE_REGS();

-    DB( printk("%04x:%04x: %02X ILLEGAL X86 OPCODE!\n",

-        M.x86.R_CS, M.x86.R_IP-1,op1));

-    HALT_SYS();

-        }

-    else {

-        /* If we get here, it means the stack pointer is back to zero

-         * so we are just returning from an emulator service call

-         * so therte is no need to display an error message. We trap

-         * the emulator with an 0xF1 opcode to finish the service

-         * call.

-         */

-        X86EMU_halt_sys();

-        }

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x00

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

-static void x86emuOp_add_byte_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-    u8 *destreg, *srcreg;

-    u8 destval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("ADD\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = add_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = add_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = add_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = add_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x01

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

-static void x86emuOp_add_word_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("ADD\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = add_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = add_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = add_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = add_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = add_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = add_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = add_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = add_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x02

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

-static void x86emuOp_add_byte_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint srcoffset;

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("ADD\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = add_byte(*destreg, srcval);

-        break;

-    case 1:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = add_byte(*destreg, srcval);

-        break;

-    case 2:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = add_byte(*destreg, srcval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = add_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x03

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

-static void x86emuOp_add_word_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("ADD\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = add_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = add_word(*destreg, srcval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = add_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = add_word(*destreg, srcval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = add_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = add_word(*destreg, srcval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = add_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = add_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x04

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

-static void x86emuOp_add_byte_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("ADD\tAL,");

-    srcval = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    M.x86.R_AL = add_byte(M.x86.R_AL, srcval);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x05

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

-static void x86emuOp_add_word_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("ADD\tEAX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("ADD\tAX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = add_long(M.x86.R_EAX, srcval);

-    } else {

-        M.x86.R_AX = add_word(M.x86.R_AX, (u16)srcval);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x06

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

-static void x86emuOp_push_ES(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("PUSH\tES\n");

-    TRACE_AND_STEP();

-    push_word(M.x86.R_ES);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x07

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

-static void x86emuOp_pop_ES(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("POP\tES\n");

-    TRACE_AND_STEP();

-    M.x86.R_ES = pop_word();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x08

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

-static void x86emuOp_or_byte_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint destoffset;

-    u8 destval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("OR\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = or_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = or_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = or_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = or_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x09

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

-static void x86emuOp_or_word_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("OR\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = or_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = or_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = or_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = or_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = or_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = or_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = or_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = or_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x0a

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

-static void x86emuOp_or_byte_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint srcoffset;

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("OR\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = or_byte(*destreg, srcval);

-        break;

-    case 1:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = or_byte(*destreg, srcval);

-        break;

-    case 2:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = or_byte(*destreg, srcval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = or_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x0b

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

-static void x86emuOp_or_word_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("OR\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = or_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = or_word(*destreg, srcval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = or_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = or_word(*destreg, srcval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = or_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = or_word(*destreg, srcval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = or_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = or_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x0c

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

-static void x86emuOp_or_byte_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("OR\tAL,");

-    srcval = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    M.x86.R_AL = or_byte(M.x86.R_AL, srcval);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x0d

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

-static void x86emuOp_or_word_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("OR\tEAX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("OR\tAX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = or_long(M.x86.R_EAX, srcval);

-    } else {

-        M.x86.R_AX = or_word(M.x86.R_AX, (u16)srcval);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x0e

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

-static void x86emuOp_push_CS(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("PUSH\tCS\n");

-    TRACE_AND_STEP();

-    push_word(M.x86.R_CS);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x0f. Escape for two-byte opcode (286 or better)

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

-static void x86emuOp_two_byte(u8 X86EMU_UNUSED(op1))

-{

-    u8 op2 = (*sys_rdb)(((u32)M.x86.R_CS << 4) + (M.x86.R_IP++));

-    INC_DECODED_INST_LEN(1);

-    (*x86emu_optab2[op2])(op2);

-}

-

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

-REMARKS:

-Handles opcode 0x10

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

-static void x86emuOp_adc_byte_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint destoffset;

-    u8 destval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("ADC\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = adc_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = adc_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = adc_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = adc_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x11

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

-static void x86emuOp_adc_word_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("ADC\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = adc_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = adc_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = adc_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = adc_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = adc_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = adc_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = adc_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = adc_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x12

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

-static void x86emuOp_adc_byte_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint srcoffset;

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("ADC\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = adc_byte(*destreg, srcval);

-        break;

-    case 1:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = adc_byte(*destreg, srcval);

-        break;

-    case 2:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = adc_byte(*destreg, srcval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = adc_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x13

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

-static void x86emuOp_adc_word_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("ADC\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = adc_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = adc_word(*destreg, srcval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = adc_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = adc_word(*destreg, srcval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = adc_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = adc_word(*destreg, srcval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = adc_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = adc_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x14

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

-static void x86emuOp_adc_byte_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("ADC\tAL,");

-    srcval = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    M.x86.R_AL = adc_byte(M.x86.R_AL, srcval);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x15

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

-static void x86emuOp_adc_word_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("ADC\tEAX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("ADC\tAX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = adc_long(M.x86.R_EAX, srcval);

-    } else {

-        M.x86.R_AX = adc_word(M.x86.R_AX, (u16)srcval);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x16

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

-static void x86emuOp_push_SS(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("PUSH\tSS\n");

-    TRACE_AND_STEP();

-    push_word(M.x86.R_SS);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x17

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

-static void x86emuOp_pop_SS(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("POP\tSS\n");

-    TRACE_AND_STEP();

-    M.x86.R_SS = pop_word();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x18

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

-static void x86emuOp_sbb_byte_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint destoffset;

-    u8 destval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("SBB\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = sbb_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = sbb_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = sbb_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = sbb_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x19

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

-static void x86emuOp_sbb_word_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("SBB\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sbb_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sbb_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sbb_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sbb_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sbb_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sbb_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sbb_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sbb_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x1a

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

-static void x86emuOp_sbb_byte_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint srcoffset;

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("SBB\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = sbb_byte(*destreg, srcval);

-        break;

-    case 1:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = sbb_byte(*destreg, srcval);

-        break;

-    case 2:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = sbb_byte(*destreg, srcval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = sbb_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x1b

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

-static void x86emuOp_sbb_word_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("SBB\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sbb_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sbb_word(*destreg, srcval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sbb_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sbb_word(*destreg, srcval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sbb_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sbb_word(*destreg, srcval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sbb_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sbb_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x1c

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

-static void x86emuOp_sbb_byte_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("SBB\tAL,");

-    srcval = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    M.x86.R_AL = sbb_byte(M.x86.R_AL, srcval);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x1d

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

-static void x86emuOp_sbb_word_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("SBB\tEAX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("SBB\tAX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = sbb_long(M.x86.R_EAX, srcval);

-    } else {

-        M.x86.R_AX = sbb_word(M.x86.R_AX, (u16)srcval);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x1e

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

-static void x86emuOp_push_DS(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("PUSH\tDS\n");

-    TRACE_AND_STEP();

-    push_word(M.x86.R_DS);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x1f

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

-static void x86emuOp_pop_DS(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("POP\tDS\n");

-    TRACE_AND_STEP();

-    M.x86.R_DS = pop_word();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x20

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

-static void x86emuOp_and_byte_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint destoffset;

-    u8 destval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("AND\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = and_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = and_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = and_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = and_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x21

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

-static void x86emuOp_and_word_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("AND\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = and_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = and_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = and_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = and_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = and_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = and_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = and_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = and_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x22

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

-static void x86emuOp_and_byte_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint srcoffset;

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("AND\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = and_byte(*destreg, srcval);

-        break;

-    case 1:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = and_byte(*destreg, srcval);

-        break;

-    case 2:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = and_byte(*destreg, srcval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = and_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x23

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

-static void x86emuOp_and_word_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("AND\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = and_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = and_word(*destreg, srcval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = and_long(*destreg, srcval);

-            break;

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = and_word(*destreg, srcval);

-            break;

-        }

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = and_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = and_word(*destreg, srcval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = and_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = and_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x24

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

-static void x86emuOp_and_byte_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("AND\tAL,");

-    srcval = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    M.x86.R_AL = and_byte(M.x86.R_AL, srcval);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x25

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

-static void x86emuOp_and_word_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("AND\tEAX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("AND\tAX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = and_long(M.x86.R_EAX, srcval);

-    } else {

-        M.x86.R_AX = and_word(M.x86.R_AX, (u16)srcval);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x26

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

-static void x86emuOp_segovr_ES(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("ES:\n");

-    TRACE_AND_STEP();

-    M.x86.mode |= SYSMODE_SEGOVR_ES;

-    /*

-     * note the lack of DECODE_CLEAR_SEGOVR(r) since, here is one of 4

-     * opcode subroutines we do not want to do this.

-     */

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x27

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

-static void x86emuOp_daa(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("DAA\n");

-    TRACE_AND_STEP();

-    M.x86.R_AL = daa_byte(M.x86.R_AL);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x28

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

-static void x86emuOp_sub_byte_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint destoffset;

-    u8 destval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("SUB\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = sub_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = sub_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = sub_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = sub_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x29

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

-static void x86emuOp_sub_word_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("SUB\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sub_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sub_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sub_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sub_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sub_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = sub_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sub_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sub_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x2a

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

-static void x86emuOp_sub_byte_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint srcoffset;

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("SUB\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = sub_byte(*destreg, srcval);

-        break;

-    case 1:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = sub_byte(*destreg, srcval);

-        break;

-    case 2:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = sub_byte(*destreg, srcval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = sub_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x2b

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

-static void x86emuOp_sub_word_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("SUB\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sub_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sub_word(*destreg, srcval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sub_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sub_word(*destreg, srcval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sub_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sub_word(*destreg, srcval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sub_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = sub_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x2c

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

-static void x86emuOp_sub_byte_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("SUB\tAL,");

-    srcval = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    M.x86.R_AL = sub_byte(M.x86.R_AL, srcval);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x2d

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

-static void x86emuOp_sub_word_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("SUB\tEAX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("SUB\tAX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = sub_long(M.x86.R_EAX, srcval);

-    } else {

-        M.x86.R_AX = sub_word(M.x86.R_AX, (u16)srcval);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x2e

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

-static void x86emuOp_segovr_CS(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("CS:\n");

-    TRACE_AND_STEP();

-    M.x86.mode |= SYSMODE_SEGOVR_CS;

-    /* note no DECODE_CLEAR_SEGOVR here. */

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x2f

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

-static void x86emuOp_das(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("DAS\n");

-    TRACE_AND_STEP();

-    M.x86.R_AL = das_byte(M.x86.R_AL);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x30

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

-static void x86emuOp_xor_byte_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint destoffset;

-    u8 destval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("XOR\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = xor_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = xor_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = xor_byte(destval, *srcreg);

-        store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = xor_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x31

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

-static void x86emuOp_xor_word_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("XOR\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = xor_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = xor_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = xor_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = xor_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = xor_long(destval, *srcreg);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = xor_word(destval, *srcreg);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = xor_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = xor_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x32

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

-static void x86emuOp_xor_byte_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint srcoffset;

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("XOR\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = xor_byte(*destreg, srcval);

-        break;

-    case 1:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = xor_byte(*destreg, srcval);

-        break;

-    case 2:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = xor_byte(*destreg, srcval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = xor_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x33

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

-static void x86emuOp_xor_word_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("XOR\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = xor_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = xor_word(*destreg, srcval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = xor_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = xor_word(*destreg, srcval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = xor_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = xor_word(*destreg, srcval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = xor_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = xor_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x34

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

-static void x86emuOp_xor_byte_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("XOR\tAL,");

-    srcval = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    M.x86.R_AL = xor_byte(M.x86.R_AL, srcval);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x35

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

-static void x86emuOp_xor_word_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("XOR\tEAX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("XOR\tAX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = xor_long(M.x86.R_EAX, srcval);

-    } else {

-        M.x86.R_AX = xor_word(M.x86.R_AX, (u16)srcval);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x36

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

-static void x86emuOp_segovr_SS(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("SS:\n");

-    TRACE_AND_STEP();

-    M.x86.mode |= SYSMODE_SEGOVR_SS;

-    /* no DECODE_CLEAR_SEGOVR ! */

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x37

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

-static void x86emuOp_aaa(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("AAA\n");

-    TRACE_AND_STEP();

-    M.x86.R_AX = aaa_word(M.x86.R_AX);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x38

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

-static void x86emuOp_cmp_byte_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-    u8 *destreg, *srcreg;

-    u8 destval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("CMP\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        cmp_byte(destval, *srcreg);

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        cmp_byte(destval, *srcreg);

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        cmp_byte(destval, *srcreg);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        cmp_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x39

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

-static void x86emuOp_cmp_word_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("CMP\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_long(destval, *srcreg);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_word(destval, *srcreg);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_long(destval, *srcreg);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_word(destval, *srcreg);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_long(destval, *srcreg);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_word(destval, *srcreg);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x3a

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

-static void x86emuOp_cmp_byte_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint srcoffset;

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("CMP\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        cmp_byte(*destreg, srcval);

-        break;

-    case 1:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        cmp_byte(*destreg, srcval);

-        break;

-    case 2:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        cmp_byte(*destreg, srcval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        cmp_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x3b

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

-static void x86emuOp_cmp_word_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("CMP\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_word(*destreg, srcval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_word(*destreg, srcval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_long(*destreg, srcval);

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_word(*destreg, srcval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            cmp_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x3c

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

-static void x86emuOp_cmp_byte_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("CMP\tAL,");

-    srcval = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    cmp_byte(M.x86.R_AL, srcval);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x3d

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

-static void x86emuOp_cmp_word_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("CMP\tEAX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("CMP\tAX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        cmp_long(M.x86.R_EAX, srcval);

-    } else {

-        cmp_word(M.x86.R_AX, (u16)srcval);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x3e

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

-static void x86emuOp_segovr_DS(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("DS:\n");

-    TRACE_AND_STEP();

-    M.x86.mode |= SYSMODE_SEGOVR_DS;

-    /* NO DECODE_CLEAR_SEGOVR! */

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x3f

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

-static void x86emuOp_aas(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("AAS\n");

-    TRACE_AND_STEP();

-    M.x86.R_AX = aas_word(M.x86.R_AX);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x40

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

-static void x86emuOp_inc_AX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("INC\tEAX\n");

-    } else {

-        DECODE_PRINTF("INC\tAX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = inc_long(M.x86.R_EAX);

-    } else {

-        M.x86.R_AX = inc_word(M.x86.R_AX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x41

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

-static void x86emuOp_inc_CX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("INC\tECX\n");

-    } else {

-        DECODE_PRINTF("INC\tCX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ECX = inc_long(M.x86.R_ECX);

-    } else {

-        M.x86.R_CX = inc_word(M.x86.R_CX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x42

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

-static void x86emuOp_inc_DX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("INC\tEDX\n");

-    } else {

-        DECODE_PRINTF("INC\tDX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EDX = inc_long(M.x86.R_EDX);

-    } else {

-        M.x86.R_DX = inc_word(M.x86.R_DX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x43

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

-static void x86emuOp_inc_BX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("INC\tEBX\n");

-    } else {

-        DECODE_PRINTF("INC\tBX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EBX = inc_long(M.x86.R_EBX);

-    } else {

-        M.x86.R_BX = inc_word(M.x86.R_BX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x44

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

-static void x86emuOp_inc_SP(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("INC\tESP\n");

-    } else {

-        DECODE_PRINTF("INC\tSP\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ESP = inc_long(M.x86.R_ESP);

-    } else {

-        M.x86.R_SP = inc_word(M.x86.R_SP);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x45

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

-static void x86emuOp_inc_BP(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("INC\tEBP\n");

-    } else {

-        DECODE_PRINTF("INC\tBP\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EBP = inc_long(M.x86.R_EBP);

-    } else {

-        M.x86.R_BP = inc_word(M.x86.R_BP);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x46

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

-static void x86emuOp_inc_SI(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("INC\tESI\n");

-    } else {

-        DECODE_PRINTF("INC\tSI\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ESI = inc_long(M.x86.R_ESI);

-    } else {

-        M.x86.R_SI = inc_word(M.x86.R_SI);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x47

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

-static void x86emuOp_inc_DI(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("INC\tEDI\n");

-    } else {

-        DECODE_PRINTF("INC\tDI\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EDI = inc_long(M.x86.R_EDI);

-    } else {

-        M.x86.R_DI = inc_word(M.x86.R_DI);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x48

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

-static void x86emuOp_dec_AX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("DEC\tEAX\n");

-    } else {

-        DECODE_PRINTF("DEC\tAX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = dec_long(M.x86.R_EAX);

-    } else {

-        M.x86.R_AX = dec_word(M.x86.R_AX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x49

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

-static void x86emuOp_dec_CX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("DEC\tECX\n");

-    } else {

-        DECODE_PRINTF("DEC\tCX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ECX = dec_long(M.x86.R_ECX);

-    } else {

-        M.x86.R_CX = dec_word(M.x86.R_CX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x4a

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

-static void x86emuOp_dec_DX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("DEC\tEDX\n");

-    } else {

-        DECODE_PRINTF("DEC\tDX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EDX = dec_long(M.x86.R_EDX);

-    } else {

-        M.x86.R_DX = dec_word(M.x86.R_DX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x4b

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

-static void x86emuOp_dec_BX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("DEC\tEBX\n");

-    } else {

-        DECODE_PRINTF("DEC\tBX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EBX = dec_long(M.x86.R_EBX);

-    } else {

-        M.x86.R_BX = dec_word(M.x86.R_BX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x4c

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

-static void x86emuOp_dec_SP(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("DEC\tESP\n");

-    } else {

-        DECODE_PRINTF("DEC\tSP\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ESP = dec_long(M.x86.R_ESP);

-    } else {

-        M.x86.R_SP = dec_word(M.x86.R_SP);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x4d

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

-static void x86emuOp_dec_BP(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("DEC\tEBP\n");

-    } else {

-        DECODE_PRINTF("DEC\tBP\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EBP = dec_long(M.x86.R_EBP);

-    } else {

-        M.x86.R_BP = dec_word(M.x86.R_BP);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x4e

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

-static void x86emuOp_dec_SI(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("DEC\tESI\n");

-    } else {

-        DECODE_PRINTF("DEC\tSI\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ESI = dec_long(M.x86.R_ESI);

-    } else {

-        M.x86.R_SI = dec_word(M.x86.R_SI);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x4f

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

-static void x86emuOp_dec_DI(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("DEC\tEDI\n");

-    } else {

-        DECODE_PRINTF("DEC\tDI\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EDI = dec_long(M.x86.R_EDI);

-    } else {

-        M.x86.R_DI = dec_word(M.x86.R_DI);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x50

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

-static void x86emuOp_push_AX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("PUSH\tEAX\n");

-    } else {

-        DECODE_PRINTF("PUSH\tAX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        push_long(M.x86.R_EAX);

-    } else {

-        push_word(M.x86.R_AX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x51

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

-static void x86emuOp_push_CX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("PUSH\tECX\n");

-    } else {

-        DECODE_PRINTF("PUSH\tCX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        push_long(M.x86.R_ECX);

-    } else {

-        push_word(M.x86.R_CX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x52

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

-static void x86emuOp_push_DX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("PUSH\tEDX\n");

-    } else {

-        DECODE_PRINTF("PUSH\tDX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        push_long(M.x86.R_EDX);

-    } else {

-        push_word(M.x86.R_DX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x53

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

-static void x86emuOp_push_BX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("PUSH\tEBX\n");

-    } else {

-        DECODE_PRINTF("PUSH\tBX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        push_long(M.x86.R_EBX);

-    } else {

-        push_word(M.x86.R_BX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x54

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

-static void x86emuOp_push_SP(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("PUSH\tESP\n");

-    } else {

-        DECODE_PRINTF("PUSH\tSP\n");

-    }

-    TRACE_AND_STEP();

-	/* Always push (E)SP, since we are emulating an i386 and above

-	 * processor. This is necessary as some BIOS'es use this to check

-	 * what type of processor is in the system.

-	 */

-	if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-		push_long(M.x86.R_ESP);

-	} else {

-		push_word((u16)(M.x86.R_SP));

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x55

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

-static void x86emuOp_push_BP(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("PUSH\tEBP\n");

-    } else {

-        DECODE_PRINTF("PUSH\tBP\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        push_long(M.x86.R_EBP);

-    } else {

-        push_word(M.x86.R_BP);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x56

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

-static void x86emuOp_push_SI(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("PUSH\tESI\n");

-    } else {

-        DECODE_PRINTF("PUSH\tSI\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        push_long(M.x86.R_ESI);

-    } else {

-        push_word(M.x86.R_SI);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x57

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

-static void x86emuOp_push_DI(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("PUSH\tEDI\n");

-    } else {

-        DECODE_PRINTF("PUSH\tDI\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        push_long(M.x86.R_EDI);

-    } else {

-        push_word(M.x86.R_DI);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x58

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

-static void x86emuOp_pop_AX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("POP\tEAX\n");

-    } else {

-        DECODE_PRINTF("POP\tAX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = pop_long();

-    } else {

-        M.x86.R_AX = pop_word();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x59

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

-static void x86emuOp_pop_CX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("POP\tECX\n");

-    } else {

-        DECODE_PRINTF("POP\tCX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ECX = pop_long();

-    } else {

-        M.x86.R_CX = pop_word();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x5a

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

-static void x86emuOp_pop_DX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("POP\tEDX\n");

-    } else {

-        DECODE_PRINTF("POP\tDX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EDX = pop_long();

-    } else {

-        M.x86.R_DX = pop_word();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x5b

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

-static void x86emuOp_pop_BX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("POP\tEBX\n");

-    } else {

-        DECODE_PRINTF("POP\tBX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EBX = pop_long();

-    } else {

-        M.x86.R_BX = pop_word();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x5c

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

-static void x86emuOp_pop_SP(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("POP\tESP\n");

-    } else {

-        DECODE_PRINTF("POP\tSP\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ESP = pop_long();

-    } else {

-        M.x86.R_SP = pop_word();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x5d

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

-static void x86emuOp_pop_BP(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("POP\tEBP\n");

-    } else {

-        DECODE_PRINTF("POP\tBP\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EBP = pop_long();

-    } else {

-        M.x86.R_BP = pop_word();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x5e

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

-static void x86emuOp_pop_SI(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("POP\tESI\n");

-    } else {

-        DECODE_PRINTF("POP\tSI\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ESI = pop_long();

-    } else {

-        M.x86.R_SI = pop_word();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x5f

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

-static void x86emuOp_pop_DI(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("POP\tEDI\n");

-    } else {

-        DECODE_PRINTF("POP\tDI\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EDI = pop_long();

-    } else {

-        M.x86.R_DI = pop_word();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x60

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

-static void x86emuOp_push_all(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("PUSHAD\n");

-    } else {

-        DECODE_PRINTF("PUSHA\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        u32 old_sp = M.x86.R_ESP;

-

-        push_long(M.x86.R_EAX);

-        push_long(M.x86.R_ECX);

-        push_long(M.x86.R_EDX);

-        push_long(M.x86.R_EBX);

-        push_long(old_sp);

-        push_long(M.x86.R_EBP);

-        push_long(M.x86.R_ESI);

-        push_long(M.x86.R_EDI);

-    } else {

-        u16 old_sp = M.x86.R_SP;

-

-        push_word(M.x86.R_AX);

-        push_word(M.x86.R_CX);

-        push_word(M.x86.R_DX);

-        push_word(M.x86.R_BX);

-        push_word(old_sp);

-        push_word(M.x86.R_BP);

-        push_word(M.x86.R_SI);

-        push_word(M.x86.R_DI);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x61

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

-static void x86emuOp_pop_all(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("POPAD\n");

-    } else {

-        DECODE_PRINTF("POPA\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EDI = pop_long();

-        M.x86.R_ESI = pop_long();

-        M.x86.R_EBP = pop_long();

-        M.x86.R_ESP += 4;              /* skip ESP */

-        M.x86.R_EBX = pop_long();

-        M.x86.R_EDX = pop_long();

-        M.x86.R_ECX = pop_long();

-        M.x86.R_EAX = pop_long();

-    } else {

-        M.x86.R_DI = pop_word();

-        M.x86.R_SI = pop_word();

-        M.x86.R_BP = pop_word();

-        M.x86.R_SP += 2;               /* skip SP */

-        M.x86.R_BX = pop_word();

-        M.x86.R_DX = pop_word();

-        M.x86.R_CX = pop_word();

-        M.x86.R_AX = pop_word();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

-/*opcode 0x62   ILLEGAL OP, calls x86emuOp_illegal_op() */

-/*opcode 0x63   ILLEGAL OP, calls x86emuOp_illegal_op() */

-

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

-REMARKS:

-Handles opcode 0x64

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

-static void x86emuOp_segovr_FS(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("FS:\n");

-    TRACE_AND_STEP();

-    M.x86.mode |= SYSMODE_SEGOVR_FS;

-    /*

-     * note the lack of DECODE_CLEAR_SEGOVR(r) since, here is one of 4

-     * opcode subroutines we do not want to do this.

-     */

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x65

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

-static void x86emuOp_segovr_GS(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("GS:\n");

-    TRACE_AND_STEP();

-    M.x86.mode |= SYSMODE_SEGOVR_GS;

-    /*

-     * note the lack of DECODE_CLEAR_SEGOVR(r) since, here is one of 4

-     * opcode subroutines we do not want to do this.

-     */

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x66 - prefix for 32-bit register

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

-static void x86emuOp_prefix_data(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("DATA:\n");

-    TRACE_AND_STEP();

-    M.x86.mode |= SYSMODE_PREFIX_DATA;

-    /* note no DECODE_CLEAR_SEGOVR here. */

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x67 - prefix for 32-bit address

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

-static void x86emuOp_prefix_addr(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("ADDR:\n");

-    TRACE_AND_STEP();

-    M.x86.mode |= SYSMODE_PREFIX_ADDR;

-    /* note no DECODE_CLEAR_SEGOVR here. */

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x68

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

-static void x86emuOp_push_word_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 imm;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        imm = fetch_long_imm();

-    } else {

-        imm = fetch_word_imm();

-    }

-    DECODE_PRINTF2("PUSH\t%x\n", imm);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        push_long(imm);

-    } else {

-        push_word((u16)imm);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x69

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

-static void x86emuOp_imul_word_IMM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("IMUL\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-            u32 res_lo,res_hi;

-            s32 imm;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            imm = fetch_long_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);

-            if (res_hi != 0) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u32)res_lo;

-        } else {

-            u16 *destreg;

-            u16 srcval;

-            u32 res;

-            s16 imm;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            imm = fetch_word_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            res = (s16)srcval * (s16)imm;

-            if (res > 0xFFFF) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u16)res;

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-            u32 res_lo,res_hi;

-            s32 imm;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            imm = fetch_long_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);

-            if (res_hi != 0) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u32)res_lo;

-        } else {

-            u16 *destreg;

-            u16 srcval;

-            u32 res;

-            s16 imm;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            imm = fetch_word_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            res = (s16)srcval * (s16)imm;

-            if (res > 0xFFFF) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u16)res;

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-            u32 res_lo,res_hi;

-            s32 imm;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            imm = fetch_long_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);

-            if (res_hi != 0) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u32)res_lo;

-        } else {

-            u16 *destreg;

-            u16 srcval;

-            u32 res;

-            s16 imm;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            imm = fetch_word_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            res = (s16)srcval * (s16)imm;

-            if (res > 0xFFFF) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u16)res;

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-            u32 res_lo,res_hi;

-            s32 imm;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rl);

-            imm = fetch_long_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            imul_long_direct(&res_lo,&res_hi,(s32)*srcreg,(s32)imm);

-            if (res_hi != 0) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u32)res_lo;

-        } else {

-            u16 *destreg,*srcreg;

-            u32 res;

-            s16 imm;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rl);

-            imm = fetch_word_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            res = (s16)*srcreg * (s16)imm;

-            if (res > 0xFFFF) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u16)res;

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x6a

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

-static void x86emuOp_push_byte_IMM(u8 X86EMU_UNUSED(op1))

-{

-    s16 imm;

-

-    START_OF_INSTR();

-    imm = (s8)fetch_byte_imm();

-    DECODE_PRINTF2("PUSH\t%d\n", imm);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-	push_long((s32)imm);

-    } else {

-	push_word(imm);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x6b

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

-static void x86emuOp_imul_byte_IMM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint srcoffset;

-    s8  imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("IMUL\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-            u32 res_lo,res_hi;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            imm = fetch_byte_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);

-            if (res_hi != 0) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u32)res_lo;

-        } else {

-            u16 *destreg;

-            u16 srcval;

-            u32 res;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            imm = fetch_byte_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            res = (s16)srcval * (s16)imm;

-            if (res > 0xFFFF) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u16)res;

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-            u32 res_lo,res_hi;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            imm = fetch_byte_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);

-            if (res_hi != 0) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u32)res_lo;

-        } else {

-            u16 *destreg;

-            u16 srcval;

-            u32 res;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            imm = fetch_byte_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            res = (s16)srcval * (s16)imm;

-            if (res > 0xFFFF) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u16)res;

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-            u32 res_lo,res_hi;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            imm = fetch_byte_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            imul_long_direct(&res_lo,&res_hi,(s32)srcval,(s32)imm);

-            if (res_hi != 0) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u32)res_lo;

-        } else {

-            u16 *destreg;

-            u16 srcval;

-            u32 res;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            imm = fetch_byte_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            res = (s16)srcval * (s16)imm;

-            if (res > 0xFFFF) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u16)res;

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-            u32 res_lo,res_hi;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rl);

-            imm = fetch_byte_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            TRACE_AND_STEP();

-            imul_long_direct(&res_lo,&res_hi,(s32)*srcreg,(s32)imm);

-            if (res_hi != 0) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u32)res_lo;

-        } else {

-            u16 *destreg,*srcreg;

-            u32 res;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rl);

-            imm = fetch_byte_imm();

-            DECODE_PRINTF2(",%d\n", (s32)imm);

-            res = (s16)*srcreg * (s16)imm;

-            if (res > 0xFFFF) {

-                SET_FLAG(F_CF);

-                SET_FLAG(F_OF);

-            } else {

-                CLEAR_FLAG(F_CF);

-                CLEAR_FLAG(F_OF);

-            }

-            *destreg = (u16)res;

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x6c

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

-static void x86emuOp_ins_byte(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("INSB\n");

-    ins(1);

-    TRACE_AND_STEP();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x6d

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

-static void x86emuOp_ins_word(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("INSD\n");

-        ins(4);

-    } else {

-        DECODE_PRINTF("INSW\n");

-        ins(2);

-    }

-    TRACE_AND_STEP();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x6e

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

-static void x86emuOp_outs_byte(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("OUTSB\n");

-    outs(1);

-    TRACE_AND_STEP();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x6f

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

-static void x86emuOp_outs_word(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("OUTSD\n");

-        outs(4);

-    } else {

-        DECODE_PRINTF("OUTSW\n");

-        outs(2);

-    }

-    TRACE_AND_STEP();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x70

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

-static void x86emuOp_jump_near_O(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if overflow flag is set */

-    START_OF_INSTR();

-    DECODE_PRINTF("JO\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (ACCESS_FLAG(F_OF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x71

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

-static void x86emuOp_jump_near_NO(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if overflow is not set */

-    START_OF_INSTR();

-    DECODE_PRINTF("JNO\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (!ACCESS_FLAG(F_OF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x72

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

-static void x86emuOp_jump_near_B(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if carry flag is set. */

-    START_OF_INSTR();

-    DECODE_PRINTF("JB\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (ACCESS_FLAG(F_CF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x73

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

-static void x86emuOp_jump_near_NB(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if carry flag is clear. */

-    START_OF_INSTR();

-    DECODE_PRINTF("JNB\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (!ACCESS_FLAG(F_CF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x74

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

-static void x86emuOp_jump_near_Z(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if zero flag is set. */

-    START_OF_INSTR();

-    DECODE_PRINTF("JZ\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (ACCESS_FLAG(F_ZF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x75

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

-static void x86emuOp_jump_near_NZ(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if zero flag is clear. */

-    START_OF_INSTR();

-    DECODE_PRINTF("JNZ\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (!ACCESS_FLAG(F_ZF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x76

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

-static void x86emuOp_jump_near_BE(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if carry flag is set or if the zero

-       flag is set. */

-    START_OF_INSTR();

-    DECODE_PRINTF("JBE\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x77

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

-static void x86emuOp_jump_near_NBE(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if carry flag is clear and if the zero

-       flag is clear */

-    START_OF_INSTR();

-    DECODE_PRINTF("JNBE\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (!(ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF)))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x78

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

-static void x86emuOp_jump_near_S(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if sign flag is set */

-    START_OF_INSTR();

-    DECODE_PRINTF("JS\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (ACCESS_FLAG(F_SF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x79

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

-static void x86emuOp_jump_near_NS(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if sign flag is clear */

-    START_OF_INSTR();

-    DECODE_PRINTF("JNS\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (!ACCESS_FLAG(F_SF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x7a

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

-static void x86emuOp_jump_near_P(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if parity flag is set (even parity) */

-    START_OF_INSTR();

-    DECODE_PRINTF("JP\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (ACCESS_FLAG(F_PF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x7b

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

-static void x86emuOp_jump_near_NP(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-

-    /* jump to byte offset if parity flag is clear (odd parity) */

-    START_OF_INSTR();

-    DECODE_PRINTF("JNP\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (!ACCESS_FLAG(F_PF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x7c

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

-static void x86emuOp_jump_near_L(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-    int sf, of;

-

-    /* jump to byte offset if sign flag not equal to overflow flag. */

-    START_OF_INSTR();

-    DECODE_PRINTF("JL\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    sf = ACCESS_FLAG(F_SF) != 0;

-    of = ACCESS_FLAG(F_OF) != 0;

-    if (sf ^ of)

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x7d

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

-static void x86emuOp_jump_near_NL(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-    int sf, of;

-

-    /* jump to byte offset if sign flag not equal to overflow flag. */

-    START_OF_INSTR();

-    DECODE_PRINTF("JNL\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    sf = ACCESS_FLAG(F_SF) != 0;

-    of = ACCESS_FLAG(F_OF) != 0;

-    /* note: inverse of above, but using == instead of xor. */

-    if (sf == of)

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x7e

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

-static void x86emuOp_jump_near_LE(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-    int sf, of;

-

-    /* jump to byte offset if sign flag not equal to overflow flag

-       or the zero flag is set */

-    START_OF_INSTR();

-    DECODE_PRINTF("JLE\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    sf = ACCESS_FLAG(F_SF) != 0;

-    of = ACCESS_FLAG(F_OF) != 0;

-    if ((sf ^ of) || ACCESS_FLAG(F_ZF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x7f

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

-static void x86emuOp_jump_near_NLE(u8 X86EMU_UNUSED(op1))

-{

-    s8 offset;

-    u16 target;

-    int sf, of;

-

-    /* jump to byte offset if sign flag equal to overflow flag.

-       and the zero flag is clear */

-    START_OF_INSTR();

-    DECODE_PRINTF("JNLE\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + (s16)offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    sf = ACCESS_FLAG(F_SF) != 0;

-    of = ACCESS_FLAG(F_OF) != 0;

-    if ((sf == of) && !ACCESS_FLAG(F_ZF))

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

-static u8 (*opc80_byte_operation[])(u8 d, u8 s) =

-{

-    add_byte,           /* 00 */

-    or_byte,            /* 01 */

-    adc_byte,           /* 02 */

-    sbb_byte,           /* 03 */

-    and_byte,           /* 04 */

-    sub_byte,           /* 05 */

-    xor_byte,           /* 06 */

-    cmp_byte,           /* 07 */

-};

-

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

-REMARKS:

-Handles opcode 0x80

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

-static void x86emuOp_opc80_byte_RM_IMM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg;

-    uint destoffset;

-    u8 imm;

-    u8 destval;

-

-    /*

-     * Weirdo special case instruction format.  Part of the opcode

-     * held below in "RH".  Doubly nested case would result, except

-     * that the decoded instruction

-     */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the 

-           above test is done twice. */

-

-        switch (rh) {

-        case 0:

-            DECODE_PRINTF("ADD\t");

-            break;

-        case 1:

-            DECODE_PRINTF("OR\t");

-            break;

-        case 2:

-            DECODE_PRINTF("ADC\t");

-            break;

-        case 3:

-            DECODE_PRINTF("SBB\t");

-            break;

-        case 4:

-            DECODE_PRINTF("AND\t");

-            break;

-        case 5:

-            DECODE_PRINTF("SUB\t");

-            break;

-        case 6:

-            DECODE_PRINTF("XOR\t");

-            break;

-        case 7:

-            DECODE_PRINTF("CMP\t");

-            break;

-        }

-    }

-#endif

-    /* know operation, decode the mod byte to find the addressing

-       mode. */

-    switch (mod) {

-    case 0:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2("%x\n", imm);

-        TRACE_AND_STEP();

-        destval = (*opc80_byte_operation[rh]) (destval, imm);

-        if (rh != 7)

-            store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2("%x\n", imm);

-        TRACE_AND_STEP();

-        destval = (*opc80_byte_operation[rh]) (destval, imm);

-        if (rh != 7)

-            store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2("%x\n", imm);

-        TRACE_AND_STEP();

-        destval = (*opc80_byte_operation[rh]) (destval, imm);

-        if (rh != 7)

-            store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2("%x\n", imm);

-        TRACE_AND_STEP();

-        destval = (*opc80_byte_operation[rh]) (*destreg, imm);

-        if (rh != 7)

-            *destreg = destval;

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

-static u16 (*opc81_word_operation[])(u16 d, u16 s) =

-{

-    add_word,           /*00 */

-    or_word,            /*01 */

-    adc_word,           /*02 */

-    sbb_word,           /*03 */

-    and_word,           /*04 */

-    sub_word,           /*05 */

-    xor_word,           /*06 */

-    cmp_word,           /*07 */

-};

-

-static u32 (*opc81_long_operation[])(u32 d, u32 s) =

-{

-    add_long,           /*00 */

-    or_long,            /*01 */

-    adc_long,           /*02 */

-    sbb_long,           /*03 */

-    and_long,           /*04 */

-    sub_long,           /*05 */

-    xor_long,           /*06 */

-    cmp_long,           /*07 */

-};

-

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

-REMARKS:

-Handles opcode 0x81

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

-static void x86emuOp_opc81_word_RM_IMM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    /*

-     * Weirdo special case instruction format.  Part of the opcode

-     * held below in "RH".  Doubly nested case would result, except

-     * that the decoded instruction

-     */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the 

-           above test is done twice. */

-

-        switch (rh) {

-        case 0:

-            DECODE_PRINTF("ADD\t");

-            break;

-        case 1:

-            DECODE_PRINTF("OR\t");

-            break;

-        case 2:

-            DECODE_PRINTF("ADC\t");

-            break;

-        case 3:

-            DECODE_PRINTF("SBB\t");

-            break;

-        case 4:

-            DECODE_PRINTF("AND\t");

-            break;

-        case 5:

-            DECODE_PRINTF("SUB\t");

-            break;

-        case 6:

-            DECODE_PRINTF("XOR\t");

-            break;

-        case 7:

-            DECODE_PRINTF("CMP\t");

-            break;

-        }

-    }

-#endif

-    /*

-     * Know operation, decode the mod byte to find the addressing 

-     * mode.

-     */

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval,imm;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            imm = fetch_long_imm();

-            DECODE_PRINTF2("%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc81_long_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_long(destoffset, destval);

-        } else {

-            u16 destval,imm;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            imm = fetch_word_imm();

-            DECODE_PRINTF2("%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc81_word_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval,imm;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            imm = fetch_long_imm();

-            DECODE_PRINTF2("%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc81_long_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_long(destoffset, destval);

-        } else {

-            u16 destval,imm;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            imm = fetch_word_imm();

-            DECODE_PRINTF2("%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc81_word_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval,imm;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            imm = fetch_long_imm();

-            DECODE_PRINTF2("%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc81_long_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_long(destoffset, destval);

-        } else {

-            u16 destval,imm;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            imm = fetch_word_imm();

-            DECODE_PRINTF2("%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc81_word_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 destval,imm;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            imm = fetch_long_imm();

-            DECODE_PRINTF2("%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc81_long_operation[rh]) (*destreg, imm);

-            if (rh != 7)

-                *destreg = destval;

-        } else {

-            u16 *destreg;

-            u16 destval,imm;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            imm = fetch_word_imm();

-            DECODE_PRINTF2("%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc81_word_operation[rh]) (*destreg, imm);

-            if (rh != 7)

-                *destreg = destval;

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

-static u8 (*opc82_byte_operation[])(u8 s, u8 d) =

-{

-    add_byte,           /*00 */

-    or_byte,            /*01 *//*YYY UNUSED ???? */

-    adc_byte,           /*02 */

-    sbb_byte,           /*03 */

-    and_byte,           /*04 *//*YYY UNUSED ???? */

-    sub_byte,           /*05 */

-    xor_byte,           /*06 *//*YYY UNUSED ???? */

-    cmp_byte,           /*07 */

-};

-

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

-REMARKS:

-Handles opcode 0x82

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

-static void x86emuOp_opc82_byte_RM_IMM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg;

-    uint destoffset;

-    u8 imm;

-    u8 destval;

-

-    /*

-     * Weirdo special case instruction format.  Part of the opcode

-     * held below in "RH".  Doubly nested case would result, except

-     * that the decoded instruction Similar to opcode 81, except that

-     * the immediate byte is sign extended to a word length.

-     */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the 

-           above test is done twice. */

-        switch (rh) {

-        case 0:

-            DECODE_PRINTF("ADD\t");

-            break;

-        case 1:

-            DECODE_PRINTF("OR\t");

-            break;

-        case 2:

-            DECODE_PRINTF("ADC\t");

-            break;

-        case 3:

-            DECODE_PRINTF("SBB\t");

-            break;

-        case 4:

-            DECODE_PRINTF("AND\t");

-            break;

-        case 5:

-            DECODE_PRINTF("SUB\t");

-            break;

-        case 6:

-            DECODE_PRINTF("XOR\t");

-            break;

-        case 7:

-            DECODE_PRINTF("CMP\t");

-            break;

-        }

-    }

-#endif

-    /* know operation, decode the mod byte to find the addressing

-       mode. */

-    switch (mod) {

-    case 0:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm00_address(rl);

-        destval = fetch_data_byte(destoffset);

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2(",%x\n", imm);

-        TRACE_AND_STEP();

-        destval = (*opc82_byte_operation[rh]) (destval, imm);

-        if (rh != 7)

-            store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm01_address(rl);

-        destval = fetch_data_byte(destoffset);

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2(",%x\n", imm);

-        TRACE_AND_STEP();

-        destval = (*opc82_byte_operation[rh]) (destval, imm);

-        if (rh != 7)

-            store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm10_address(rl);

-        destval = fetch_data_byte(destoffset);

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2(",%x\n", imm);

-        TRACE_AND_STEP();

-        destval = (*opc82_byte_operation[rh]) (destval, imm);

-        if (rh != 7)

-            store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2(",%x\n", imm);

-        TRACE_AND_STEP();

-        destval = (*opc82_byte_operation[rh]) (*destreg, imm);

-        if (rh != 7)

-            *destreg = destval;

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

-static u16 (*opc83_word_operation[])(u16 s, u16 d) =

-{

-    add_word,           /*00 */

-    or_word,            /*01 *//*YYY UNUSED ???? */

-    adc_word,           /*02 */

-    sbb_word,           /*03 */

-    and_word,           /*04 *//*YYY UNUSED ???? */

-    sub_word,           /*05 */

-    xor_word,           /*06 *//*YYY UNUSED ???? */

-    cmp_word,           /*07 */

-};

-

-static u32 (*opc83_long_operation[])(u32 s, u32 d) =

-{

-    add_long,           /*00 */

-    or_long,            /*01 *//*YYY UNUSED ???? */

-    adc_long,           /*02 */

-    sbb_long,           /*03 */

-    and_long,           /*04 *//*YYY UNUSED ???? */

-    sub_long,           /*05 */

-    xor_long,           /*06 *//*YYY UNUSED ???? */

-    cmp_long,           /*07 */

-};

-

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

-REMARKS:

-Handles opcode 0x83

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

-static void x86emuOp_opc83_word_RM_IMM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    /*

-     * Weirdo special case instruction format.  Part of the opcode

-     * held below in "RH".  Doubly nested case would result, except

-     * that the decoded instruction Similar to opcode 81, except that

-     * the immediate byte is sign extended to a word length.

-     */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the 

-           above test is done twice. */

-       switch (rh) {

-        case 0:

-            DECODE_PRINTF("ADD\t");

-            break;

-        case 1:

-            DECODE_PRINTF("OR\t");

-            break;

-        case 2:

-            DECODE_PRINTF("ADC\t");

-            break;

-        case 3:

-            DECODE_PRINTF("SBB\t");

-            break;

-        case 4:

-            DECODE_PRINTF("AND\t");

-            break;

-        case 5:

-            DECODE_PRINTF("SUB\t");

-            break;

-        case 6:

-            DECODE_PRINTF("XOR\t");

-            break;

-        case 7:

-            DECODE_PRINTF("CMP\t");

-            break;

-        }

-    }

-#endif

-    /* know operation, decode the mod byte to find the addressing

-       mode. */

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval,imm;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            destval = fetch_data_long(destoffset);

-            imm = (s8) fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc83_long_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_long(destoffset, destval);

-        } else {

-            u16 destval,imm;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            destval = fetch_data_word(destoffset);

-            imm = (s8) fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc83_word_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval,imm;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            destval = fetch_data_long(destoffset);

-            imm = (s8) fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc83_long_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_long(destoffset, destval);

-        } else {

-            u16 destval,imm;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            destval = fetch_data_word(destoffset);

-            imm = (s8) fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc83_word_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval,imm;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm10_address(rl);

-            destval = fetch_data_long(destoffset);

-            imm = (s8) fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc83_long_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_long(destoffset, destval);

-        } else {

-            u16 destval,imm;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm10_address(rl);

-            destval = fetch_data_word(destoffset);

-            imm = (s8) fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc83_word_operation[rh]) (destval, imm);

-            if (rh != 7)

-                store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 destval,imm;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            imm = (s8) fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc83_long_operation[rh]) (*destreg, imm);

-            if (rh != 7)

-                *destreg = destval;

-        } else {

-            u16 *destreg;

-            u16 destval,imm;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            imm = (s8) fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            destval = (*opc83_word_operation[rh]) (*destreg, imm);

-            if (rh != 7)

-                *destreg = destval;

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x84

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

-static void x86emuOp_test_byte_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint destoffset;

-    u8 destval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("TEST\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        test_byte(destval, *srcreg);

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        test_byte(destval, *srcreg);

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        test_byte(destval, *srcreg);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        test_byte(*destreg, *srcreg);

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x85

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

-static void x86emuOp_test_word_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("TEST\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            test_long(destval, *srcreg);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            test_word(destval, *srcreg);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            test_long(destval, *srcreg);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            test_word(destval, *srcreg);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-            u32 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            test_long(destval, *srcreg);

-        } else {

-            u16 destval;

-            u16 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            test_word(destval, *srcreg);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            test_long(*destreg, *srcreg);

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            test_word(*destreg, *srcreg);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x86

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

-static void x86emuOp_xchg_byte_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint destoffset;

-    u8 destval;

-    u8 tmp;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("XCHG\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        tmp = *srcreg;

-        *srcreg = destval;

-        destval = tmp;

-        store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        tmp = *srcreg;

-        *srcreg = destval;

-        destval = tmp;

-        store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        destval = fetch_data_byte(destoffset);

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        tmp = *srcreg;

-        *srcreg = destval;

-        destval = tmp;

-        store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        tmp = *srcreg;

-        *srcreg = *destreg;

-        *destreg = tmp;

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x87

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

-static void x86emuOp_xchg_word_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("XCHG\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *srcreg;

-            u32 destval,tmp;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            tmp = *srcreg;

-            *srcreg = destval;

-            destval = tmp;

-            store_data_long(destoffset, destval);

-        } else {

-            u16 *srcreg;

-            u16 destval,tmp;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            tmp = *srcreg;

-            *srcreg = destval;

-            destval = tmp;

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *srcreg;

-            u32 destval,tmp;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            tmp = *srcreg;

-            *srcreg = destval;

-            destval = tmp;

-            store_data_long(destoffset, destval);

-        } else {

-            u16 *srcreg;

-            u16 destval,tmp;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            tmp = *srcreg;

-            *srcreg = destval;

-            destval = tmp;

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *srcreg;

-            u32 destval,tmp;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_long(destoffset);

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            tmp = *srcreg;

-            *srcreg = destval;

-            destval = tmp;

-            store_data_long(destoffset, destval);

-        } else {

-            u16 *srcreg;

-            u16 destval,tmp;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            destval = fetch_data_word(destoffset);

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            tmp = *srcreg;

-            *srcreg = destval;

-            destval = tmp;

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-            u32 tmp;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            tmp = *srcreg;

-            *srcreg = *destreg;

-            *destreg = tmp;

-        } else {

-            u16 *destreg,*srcreg;

-            u16 tmp;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            tmp = *srcreg;

-            *srcreg = *destreg;

-            *destreg = tmp;

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x88

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

-static void x86emuOp_mov_byte_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        store_data_byte(destoffset, *srcreg);

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        store_data_byte(destoffset, *srcreg);

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        store_data_byte(destoffset, *srcreg);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = *srcreg;

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x89

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

-static void x86emuOp_mov_word_RM_R(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u32 destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            store_data_long(destoffset, *srcreg);

-        } else {

-            u16 *srcreg;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            store_data_word(destoffset, *srcreg);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            store_data_long(destoffset, *srcreg);

-        } else {

-            u16 *srcreg;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            store_data_word(destoffset, *srcreg);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            store_data_long(destoffset, *srcreg);

-        } else {

-            u16 *srcreg;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            store_data_word(destoffset, *srcreg);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg,*srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = *srcreg;

-        } else {

-            u16 *destreg,*srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = *srcreg;

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x8a

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

-static void x86emuOp_mov_byte_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg, *srcreg;

-    uint srcoffset;

-    u8 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = srcval;

-        break;

-    case 1:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = srcval;

-        break;

-    case 2:

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        srcval = fetch_data_byte(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = srcval;

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = *srcreg;

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x8b

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

-static void x86emuOp_mov_word_R_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = srcval;

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm00_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = srcval;

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = srcval;

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm01_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = srcval;

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-            u32 srcval;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_long(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = srcval;

-        } else {

-            u16 *destreg;

-            u16 srcval;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcoffset = decode_rm10_address(rl);

-            srcval = fetch_data_word(srcoffset);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = srcval;

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg, *srcreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = *srcreg;

-        } else {

-            u16 *destreg, *srcreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            srcreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = *srcreg;

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x8c

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

-static void x86emuOp_mov_word_RM_SR(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u16 *destreg, *srcreg;

-    uint destoffset;

-    u16 destval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",");

-        srcreg = decode_rm_seg_register(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = *srcreg;

-        store_data_word(destoffset, destval);

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",");

-        srcreg = decode_rm_seg_register(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = *srcreg;

-        store_data_word(destoffset, destval);

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",");

-        srcreg = decode_rm_seg_register(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        destval = *srcreg;

-        store_data_word(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_WORD_REGISTER(rl);

-        DECODE_PRINTF(",");

-        srcreg = decode_rm_seg_register(rh);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = *srcreg;

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x8d

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

-static void x86emuOp_lea_word_R_M(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("LEA\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_ADDR) {

-            u32 *srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *srcreg = (u32)destoffset;

-        } else {

-            u16 *srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *srcreg = (u16)destoffset;

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_ADDR) {

-            u32 *srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *srcreg = (u32)destoffset;

-        } else {

-            u16 *srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *srcreg = (u16)destoffset;

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_ADDR) {

-            u32 *srcreg = DECODE_RM_LONG_REGISTER(rh);

-            DECODE_PRINTF(",");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *srcreg = (u32)destoffset;

-        } else {

-            u16 *srcreg = DECODE_RM_WORD_REGISTER(rh);

-            DECODE_PRINTF(",");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *srcreg = (u16)destoffset;

-        }

-        break;

-    case 3:                     /* register to register */

-        /* undefined.  Do nothing. */

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x8e

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

-static void x86emuOp_mov_word_SR_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u16 *destreg, *srcreg;

-    uint srcoffset;

-    u16 srcval;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        destreg = decode_rm_seg_register(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        srcval = fetch_data_word(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = srcval;

-        break;

-    case 1:

-        destreg = decode_rm_seg_register(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        srcval = fetch_data_word(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = srcval;

-        break;

-    case 2:

-        destreg = decode_rm_seg_register(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        srcval = fetch_data_word(srcoffset);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = srcval;

-        break;

-    case 3:                     /* register to register */

-        destreg = decode_rm_seg_register(rh);

-        DECODE_PRINTF(",");

-        srcreg = DECODE_RM_WORD_REGISTER(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *destreg = *srcreg;

-        break;

-    }

-    /*

-     * Clean up, and reset all the R_xSP pointers to the correct

-     * locations.  This is about 3x too much overhead (doing all the

-     * segreg ptrs when only one is needed, but this instruction

-     * *cannot* be that common, and this isn't too much work anyway.

-     */

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x8f

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

-static void x86emuOp_pop_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("POP\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    if (rh != 0) {

-        DECODE_PRINTF("ILLEGAL DECODE OF OPCODE 8F\n");

-        HALT_SYS();

-    }

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = pop_long();

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = pop_word();

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = pop_long();

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = pop_word();

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = pop_long();

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            destval = pop_word();

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = pop_long();

-        } else {

-            u16 *destreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = pop_word();

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x90

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

-static void x86emuOp_nop(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("NOP\n");

-    TRACE_AND_STEP();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x91

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

-static void x86emuOp_xchg_word_AX_CX(u8 X86EMU_UNUSED(op1))

-{

-    u32 tmp;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("XCHG\tEAX,ECX\n");

-    } else {

-        DECODE_PRINTF("XCHG\tAX,CX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        tmp = M.x86.R_EAX;

-        M.x86.R_EAX = M.x86.R_ECX;

-        M.x86.R_ECX = tmp;

-    } else {

-        tmp = M.x86.R_AX;

-        M.x86.R_AX = M.x86.R_CX;

-        M.x86.R_CX = (u16)tmp;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x92

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

-static void x86emuOp_xchg_word_AX_DX(u8 X86EMU_UNUSED(op1))

-{

-    u32 tmp;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("XCHG\tEAX,EDX\n");

-    } else {

-        DECODE_PRINTF("XCHG\tAX,DX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        tmp = M.x86.R_EAX;

-        M.x86.R_EAX = M.x86.R_EDX;

-        M.x86.R_EDX = tmp;

-    } else {

-        tmp = M.x86.R_AX;

-        M.x86.R_AX = M.x86.R_DX;

-        M.x86.R_DX = (u16)tmp;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x93

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

-static void x86emuOp_xchg_word_AX_BX(u8 X86EMU_UNUSED(op1))

-{

-    u32 tmp;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("XCHG\tEAX,EBX\n");

-    } else {

-        DECODE_PRINTF("XCHG\tAX,BX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        tmp = M.x86.R_EAX;

-        M.x86.R_EAX = M.x86.R_EBX;

-        M.x86.R_EBX = tmp;

-    } else {

-        tmp = M.x86.R_AX;

-        M.x86.R_AX = M.x86.R_BX;

-        M.x86.R_BX = (u16)tmp;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x94

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

-static void x86emuOp_xchg_word_AX_SP(u8 X86EMU_UNUSED(op1))

-{

-    u32 tmp;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("XCHG\tEAX,ESP\n");

-    } else {

-        DECODE_PRINTF("XCHG\tAX,SP\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        tmp = M.x86.R_EAX;

-        M.x86.R_EAX = M.x86.R_ESP;

-        M.x86.R_ESP = tmp;

-    } else {

-        tmp = M.x86.R_AX;

-        M.x86.R_AX = M.x86.R_SP;

-        M.x86.R_SP = (u16)tmp;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x95

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

-static void x86emuOp_xchg_word_AX_BP(u8 X86EMU_UNUSED(op1))

-{

-    u32 tmp;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("XCHG\tEAX,EBP\n");

-    } else {

-        DECODE_PRINTF("XCHG\tAX,BP\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        tmp = M.x86.R_EAX;

-        M.x86.R_EAX = M.x86.R_EBP;

-        M.x86.R_EBP = tmp;

-    } else {

-        tmp = M.x86.R_AX;

-        M.x86.R_AX = M.x86.R_BP;

-        M.x86.R_BP = (u16)tmp;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x96

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

-static void x86emuOp_xchg_word_AX_SI(u8 X86EMU_UNUSED(op1))

-{

-    u32 tmp;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("XCHG\tEAX,ESI\n");

-    } else {

-        DECODE_PRINTF("XCHG\tAX,SI\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        tmp = M.x86.R_EAX;

-        M.x86.R_EAX = M.x86.R_ESI;

-        M.x86.R_ESI = tmp;

-    } else {

-        tmp = M.x86.R_AX;

-        M.x86.R_AX = M.x86.R_SI;

-        M.x86.R_SI = (u16)tmp;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x97

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

-static void x86emuOp_xchg_word_AX_DI(u8 X86EMU_UNUSED(op1))

-{

-    u32 tmp;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("XCHG\tEAX,EDI\n");

-    } else {

-        DECODE_PRINTF("XCHG\tAX,DI\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        tmp = M.x86.R_EAX;

-        M.x86.R_EAX = M.x86.R_EDI;

-        M.x86.R_EDI = tmp;

-    } else {

-        tmp = M.x86.R_AX;

-        M.x86.R_AX = M.x86.R_DI;

-        M.x86.R_DI = (u16)tmp;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x98

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

-static void x86emuOp_cbw(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("CWDE\n");

-    } else {

-        DECODE_PRINTF("CBW\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        if (M.x86.R_AX & 0x8000) {

-            M.x86.R_EAX |= 0xffff0000;

-        } else {

-            M.x86.R_EAX &= 0x0000ffff;

-        }

-    } else {

-        if (M.x86.R_AL & 0x80) {

-            M.x86.R_AH = 0xff;

-        } else {

-            M.x86.R_AH = 0x0;

-        }

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x99

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

-static void x86emuOp_cwd(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("CDQ\n");

-    } else {

-        DECODE_PRINTF("CWD\n");

-    }

-    DECODE_PRINTF("CWD\n");

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        if (M.x86.R_EAX & 0x80000000) {

-            M.x86.R_EDX = 0xffffffff;

-        } else {

-            M.x86.R_EDX = 0x0;

-        }

-    } else {

-        if (M.x86.R_AX & 0x8000) {

-            M.x86.R_DX = 0xffff;

-        } else {

-            M.x86.R_DX = 0x0;

-        }

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x9a

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

-static void x86emuOp_call_far_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 farseg, faroff;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("CALL\t");

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-	faroff = fetch_long_imm();

-	farseg = fetch_word_imm();

-    } else {

-	faroff = fetch_word_imm();

-	farseg = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%04x:", farseg);

-    DECODE_PRINTF2("%04x\n", faroff);

-    CALL_TRACE(M.x86.saved_cs, M.x86.saved_ip, farseg, faroff, "FAR ");

-

-    /* XXX

-     * 

-     * Hooked interrupt vectors calling into our "BIOS" will cause

-     * problems unless all intersegment stuff is checked for BIOS

-     * access.  Check needed here.  For moment, let it alone.

-     */

-    TRACE_AND_STEP();

-    push_word(M.x86.R_CS);

-    M.x86.R_CS = farseg;

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-	push_long(M.x86.R_EIP);

-    } else {

-	push_word(M.x86.R_IP);

-    }

-    M.x86.R_EIP = faroff & 0xffff;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x9b

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

-static void x86emuOp_wait(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("WAIT");

-    TRACE_AND_STEP();

-    /* NADA.  */

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x9c

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

-static void x86emuOp_pushf_word(u8 X86EMU_UNUSED(op1))

-{

-    u32 flags;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("PUSHFD\n");

-    } else {

-        DECODE_PRINTF("PUSHF\n");

-    }

-    TRACE_AND_STEP();

-

-    /* clear out *all* bits not representing flags, and turn on real bits */

-    flags = (M.x86.R_EFLG & F_MSK) | F_ALWAYS_ON;

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        push_long(flags);

-    } else {

-        push_word((u16)flags);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x9d

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

-static void x86emuOp_popf_word(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("POPFD\n");

-    } else {

-        DECODE_PRINTF("POPF\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EFLG = pop_long();

-    } else {

-        M.x86.R_FLG = pop_word();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x9e

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

-static void x86emuOp_sahf(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("SAHF\n");

-    TRACE_AND_STEP();

-    /* clear the lower bits of the flag register */

-    M.x86.R_FLG &= 0xffffff00;

-    /* or in the AH register into the flags register */

-    M.x86.R_FLG |= M.x86.R_AH;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0x9f

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

-static void x86emuOp_lahf(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("LAHF\n");

-    TRACE_AND_STEP();

-	M.x86.R_AH = (u8)(M.x86.R_FLG & 0xff);

-    /*undocumented TC++ behavior??? Nope.  It's documented, but

-       you have too look real hard to notice it. */

-    M.x86.R_AH |= 0x2;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xa0

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

-static void x86emuOp_mov_AL_M_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u16 offset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\tAL,");

-    offset = fetch_word_imm();

-    DECODE_PRINTF2("[%04x]\n", offset);

-    TRACE_AND_STEP();

-    M.x86.R_AL = fetch_data_byte(offset);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xa1

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

-static void x86emuOp_mov_AX_M_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u16 offset;

-

-    START_OF_INSTR();

-    offset = fetch_word_imm();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF2("MOV\tEAX,[%04x]\n", offset);

-    } else {

-        DECODE_PRINTF2("MOV\tAX,[%04x]\n", offset);

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = fetch_data_long(offset);

-    } else {

-        M.x86.R_AX = fetch_data_word(offset);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xa2

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

-static void x86emuOp_mov_M_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u16 offset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\t");

-    offset = fetch_word_imm();

-    DECODE_PRINTF2("[%04x],AL\n", offset);

-    TRACE_AND_STEP();

-    store_data_byte(offset, M.x86.R_AL);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xa3

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

-static void x86emuOp_mov_M_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u16 offset;

-

-    START_OF_INSTR();

-    offset = fetch_word_imm();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF2("MOV\t[%04x],EAX\n", offset);

-    } else {

-        DECODE_PRINTF2("MOV\t[%04x],AX\n", offset);

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        store_data_long(offset, M.x86.R_EAX);

-    } else {

-        store_data_word(offset, M.x86.R_AX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xa4

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

-static void x86emuOp_movs_byte(u8 X86EMU_UNUSED(op1))

-{

-    u8  val;

-    u32 count;

-    int inc;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOVS\tBYTE\n");

-    if (ACCESS_FLAG(F_DF))   /* down */

-        inc = -1;

-    else

-        inc = 1;

-    TRACE_AND_STEP();

-    count = 1;

-    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {

-        /* dont care whether REPE or REPNE */

-        /* move them until CX is ZERO. */

-        count = M.x86.R_CX;

-        M.x86.R_CX = 0;

-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);

-    }

-    while (count--) {

-        val = fetch_data_byte(M.x86.R_SI);

-        store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, val);

-        M.x86.R_SI += inc;

-        M.x86.R_DI += inc;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xa5

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

-static void x86emuOp_movs_word(u8 X86EMU_UNUSED(op1))

-{

-    u32 val;

-    int inc;

-    u32 count;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("MOVS\tDWORD\n");

-        if (ACCESS_FLAG(F_DF))      /* down */

-            inc = -4;

-        else

-            inc = 4;

-    } else {

-        DECODE_PRINTF("MOVS\tWORD\n");

-        if (ACCESS_FLAG(F_DF))      /* down */

-            inc = -2;

-        else

-            inc = 2;

-    }

-    TRACE_AND_STEP();

-    count = 1;

-    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {

-        /* dont care whether REPE or REPNE */

-        /* move them until CX is ZERO. */

-        count = M.x86.R_CX;

-        M.x86.R_CX = 0;

-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);

-    }

-    while (count--) {

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            val = fetch_data_long(M.x86.R_SI);

-            store_data_long_abs(M.x86.R_ES, M.x86.R_DI, val);

-        } else {

-            val = fetch_data_word(M.x86.R_SI);

-            store_data_word_abs(M.x86.R_ES, M.x86.R_DI, (u16)val);

-        }

-        M.x86.R_SI += inc;

-        M.x86.R_DI += inc;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xa6

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

-static void x86emuOp_cmps_byte(u8 X86EMU_UNUSED(op1))

-{

-    s8 val1, val2;

-    int inc;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("CMPS\tBYTE\n");

-    TRACE_AND_STEP();

-    if (ACCESS_FLAG(F_DF))   /* down */

-        inc = -1;

-    else

-        inc = 1;

-

-    if (M.x86.mode & SYSMODE_PREFIX_REPE) {

-        /* REPE  */

-        /* move them until CX is ZERO. */

-        while (M.x86.R_CX != 0) {

-            val1 = fetch_data_byte(M.x86.R_SI);

-            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);

-                     cmp_byte(val1, val2);

-            M.x86.R_CX -= 1;

-            M.x86.R_SI += inc;

-            M.x86.R_DI += inc;

-            if (ACCESS_FLAG(F_ZF) == 0)

-                break;

-        }

-        M.x86.mode &= ~SYSMODE_PREFIX_REPE;

-    } else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {

-        /* REPNE  */

-        /* move them until CX is ZERO. */

-        while (M.x86.R_CX != 0) {

-            val1 = fetch_data_byte(M.x86.R_SI);

-            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);

-            cmp_byte(val1, val2);

-            M.x86.R_CX -= 1;

-            M.x86.R_SI += inc;

-            M.x86.R_DI += inc;

-            if (ACCESS_FLAG(F_ZF))

-                break;          /* zero flag set means equal */

-        }

-        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;

-    } else {

-        val1 = fetch_data_byte(M.x86.R_SI);

-        val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);

-        cmp_byte(val1, val2);

-        M.x86.R_SI += inc;

-        M.x86.R_DI += inc;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xa7

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

-static void x86emuOp_cmps_word(u8 X86EMU_UNUSED(op1))

-{

-    u32 val1,val2;

-    int inc;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("CMPS\tDWORD\n");

-        if (ACCESS_FLAG(F_DF))   /* down */

-            inc = -4;

-        else

-            inc = 4;

-    } else {

-        DECODE_PRINTF("CMPS\tWORD\n");

-        if (ACCESS_FLAG(F_DF))   /* down */

-            inc = -2;

-        else

-            inc = 2;

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_REPE) {

-        /* REPE  */

-        /* move them until CX is ZERO. */

-        while (M.x86.R_CX != 0) {

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                val1 = fetch_data_long(M.x86.R_SI);

-                val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);

-                cmp_long(val1, val2);

-            } else {

-                val1 = fetch_data_word(M.x86.R_SI);

-                val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);

-                cmp_word((u16)val1, (u16)val2);

-            }

-            M.x86.R_CX -= 1;

-            M.x86.R_SI += inc;

-            M.x86.R_DI += inc;

-            if (ACCESS_FLAG(F_ZF) == 0)

-                break;

-        }

-        M.x86.mode &= ~SYSMODE_PREFIX_REPE;

-    } else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {

-        /* REPNE  */

-        /* move them until CX is ZERO. */

-        while (M.x86.R_CX != 0) {

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                val1 = fetch_data_long(M.x86.R_SI);

-                val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);

-                cmp_long(val1, val2);

-            } else {

-                val1 = fetch_data_word(M.x86.R_SI);

-                val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);

-                cmp_word((u16)val1, (u16)val2);

-            }

-            M.x86.R_CX -= 1;

-            M.x86.R_SI += inc;

-            M.x86.R_DI += inc;

-            if (ACCESS_FLAG(F_ZF))

-                break;          /* zero flag set means equal */

-        }

-        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;

-    } else {

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            val1 = fetch_data_long(M.x86.R_SI);

-            val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);

-            cmp_long(val1, val2);

-        } else {

-            val1 = fetch_data_word(M.x86.R_SI);

-            val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);

-            cmp_word((u16)val1, (u16)val2);

-        }

-        M.x86.R_SI += inc;

-        M.x86.R_DI += inc;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xa8

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

-static void x86emuOp_test_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    int imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("TEST\tAL,");

-    imm = fetch_byte_imm();

-    DECODE_PRINTF2("%04x\n", imm);

-    TRACE_AND_STEP();

-	test_byte(M.x86.R_AL, (u8)imm);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xa9

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

-static void x86emuOp_test_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("TEST\tEAX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("TEST\tAX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        test_long(M.x86.R_EAX, srcval);

-    } else {

-        test_word(M.x86.R_AX, (u16)srcval);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xaa

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

-static void x86emuOp_stos_byte(u8 X86EMU_UNUSED(op1))

-{

-    int inc;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("STOS\tBYTE\n");

-    if (ACCESS_FLAG(F_DF))   /* down */

-        inc = -1;

-    else

-        inc = 1;

-    TRACE_AND_STEP();

-    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {

-        /* dont care whether REPE or REPNE */

-        /* move them until CX is ZERO. */

-        while (M.x86.R_CX != 0) {

-            store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AL);

-            M.x86.R_CX -= 1;

-            M.x86.R_DI += inc;

-        }

-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);

-    } else {

-        store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AL);

-        M.x86.R_DI += inc;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xab

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

-static void x86emuOp_stos_word(u8 X86EMU_UNUSED(op1))

-{

-    int inc;

-    u32 count;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("STOS\tDWORD\n");

-        if (ACCESS_FLAG(F_DF))   /* down */

-            inc = -4;

-        else

-            inc = 4;

-    } else {

-        DECODE_PRINTF("STOS\tWORD\n");

-        if (ACCESS_FLAG(F_DF))   /* down */

-            inc = -2;

-        else

-            inc = 2;

-    }

-    TRACE_AND_STEP();

-    count = 1;

-    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {

-        /* dont care whether REPE or REPNE */

-        /* move them until CX is ZERO. */

-        count = M.x86.R_CX;

-        M.x86.R_CX = 0;

-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);

-    }

-    while (count--) {

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            store_data_long_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_EAX);

-        } else {

-            store_data_word_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AX);

-        }

-        M.x86.R_DI += inc;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xac

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

-static void x86emuOp_lods_byte(u8 X86EMU_UNUSED(op1))

-{

-    int inc;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("LODS\tBYTE\n");

-    TRACE_AND_STEP();

-    if (ACCESS_FLAG(F_DF))   /* down */

-        inc = -1;

-    else

-        inc = 1;

-    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {

-        /* dont care whether REPE or REPNE */

-        /* move them until CX is ZERO. */

-        while (M.x86.R_CX != 0) {

-            M.x86.R_AL = fetch_data_byte(M.x86.R_SI);

-            M.x86.R_CX -= 1;

-            M.x86.R_SI += inc;

-        }

-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);

-    } else {

-        M.x86.R_AL = fetch_data_byte(M.x86.R_SI);

-        M.x86.R_SI += inc;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xad

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

-static void x86emuOp_lods_word(u8 X86EMU_UNUSED(op1))

-{

-    int inc;

-    u32 count;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("LODS\tDWORD\n");

-        if (ACCESS_FLAG(F_DF))   /* down */

-            inc = -4;

-        else

-            inc = 4;

-    } else {

-        DECODE_PRINTF("LODS\tWORD\n");

-        if (ACCESS_FLAG(F_DF))   /* down */

-            inc = -2;

-        else

-            inc = 2;

-    }

-    TRACE_AND_STEP();

-    count = 1;

-    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {

-        /* dont care whether REPE or REPNE */

-        /* move them until CX is ZERO. */

-        count = M.x86.R_CX;

-        M.x86.R_CX = 0;

-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);

-    }

-    while (count--) {

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            M.x86.R_EAX = fetch_data_long(M.x86.R_SI);

-        } else {

-            M.x86.R_AX = fetch_data_word(M.x86.R_SI);

-        }

-        M.x86.R_SI += inc;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xae

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

-static void x86emuOp_scas_byte(u8 X86EMU_UNUSED(op1))

-{

-    s8 val2;

-    int inc;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("SCAS\tBYTE\n");

-    TRACE_AND_STEP();

-    if (ACCESS_FLAG(F_DF))   /* down */

-        inc = -1;

-    else

-        inc = 1;

-    if (M.x86.mode & SYSMODE_PREFIX_REPE) {

-        /* REPE  */

-        /* move them until CX is ZERO. */

-        while (M.x86.R_CX != 0) {

-            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);

-            cmp_byte(M.x86.R_AL, val2);

-            M.x86.R_CX -= 1;

-            M.x86.R_DI += inc;

-            if (ACCESS_FLAG(F_ZF) == 0)

-                break;

-        }

-        M.x86.mode &= ~SYSMODE_PREFIX_REPE;

-    } else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {

-        /* REPNE  */

-        /* move them until CX is ZERO. */

-        while (M.x86.R_CX != 0) {

-            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);

-            cmp_byte(M.x86.R_AL, val2);

-            M.x86.R_CX -= 1;

-            M.x86.R_DI += inc;

-            if (ACCESS_FLAG(F_ZF))

-                break;          /* zero flag set means equal */

-        }

-        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;

-    } else {

-        val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);

-        cmp_byte(M.x86.R_AL, val2);

-        M.x86.R_DI += inc;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xaf

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

-static void x86emuOp_scas_word(u8 X86EMU_UNUSED(op1))

-{

-    int inc;

-    u32 val;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("SCAS\tDWORD\n");

-        if (ACCESS_FLAG(F_DF))   /* down */

-            inc = -4;

-        else

-            inc = 4;

-    } else {

-        DECODE_PRINTF("SCAS\tWORD\n");

-        if (ACCESS_FLAG(F_DF))   /* down */

-            inc = -2;

-        else

-            inc = 2;

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_REPE) {

-        /* REPE  */

-        /* move them until CX is ZERO. */

-        while (M.x86.R_CX != 0) {

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);

-                cmp_long(M.x86.R_EAX, val);

-            } else {

-                val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);

-                cmp_word(M.x86.R_AX, (u16)val);

-            }

-            M.x86.R_CX -= 1;

-            M.x86.R_DI += inc;

-            if (ACCESS_FLAG(F_ZF) == 0)

-                break;

-        }

-        M.x86.mode &= ~SYSMODE_PREFIX_REPE;

-    } else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {

-        /* REPNE  */

-        /* move them until CX is ZERO. */

-        while (M.x86.R_CX != 0) {

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);

-                cmp_long(M.x86.R_EAX, val);

-            } else {

-                val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);

-                cmp_word(M.x86.R_AX, (u16)val);

-            }

-            M.x86.R_CX -= 1;

-            M.x86.R_DI += inc;

-            if (ACCESS_FLAG(F_ZF))

-                break;          /* zero flag set means equal */

-        }

-        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;

-    } else {

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);

-            cmp_long(M.x86.R_EAX, val);

-        } else {

-            val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);

-            cmp_word(M.x86.R_AX, (u16)val);

-        }

-        M.x86.R_DI += inc;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xb0

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

-static void x86emuOp_mov_byte_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\tAL,");

-    imm = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", imm);

-    TRACE_AND_STEP();

-    M.x86.R_AL = imm;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xb1

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

-static void x86emuOp_mov_byte_CL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\tCL,");

-    imm = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", imm);

-    TRACE_AND_STEP();

-    M.x86.R_CL = imm;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xb2

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

-static void x86emuOp_mov_byte_DL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\tDL,");

-    imm = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", imm);

-    TRACE_AND_STEP();

-    M.x86.R_DL = imm;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xb3

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

-static void x86emuOp_mov_byte_BL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\tBL,");

-    imm = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", imm);

-    TRACE_AND_STEP();

-    M.x86.R_BL = imm;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xb4

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

-static void x86emuOp_mov_byte_AH_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\tAH,");

-    imm = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", imm);

-    TRACE_AND_STEP();

-    M.x86.R_AH = imm;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xb5

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

-static void x86emuOp_mov_byte_CH_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\tCH,");

-    imm = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", imm);

-    TRACE_AND_STEP();

-    M.x86.R_CH = imm;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xb6

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

-static void x86emuOp_mov_byte_DH_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\tDH,");

-    imm = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", imm);

-    TRACE_AND_STEP();

-    M.x86.R_DH = imm;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xb7

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

-static void x86emuOp_mov_byte_BH_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\tBH,");

-    imm = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", imm);

-    TRACE_AND_STEP();

-    M.x86.R_BH = imm;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xb8

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

-static void x86emuOp_mov_word_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("MOV\tEAX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("MOV\tAX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = srcval;

-    } else {

-        M.x86.R_AX = (u16)srcval;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xb9

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

-static void x86emuOp_mov_word_CX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("MOV\tECX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("MOV\tCX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ECX = srcval;

-    } else {

-        M.x86.R_CX = (u16)srcval;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xba

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

-static void x86emuOp_mov_word_DX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("MOV\tEDX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("MOV\tDX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EDX = srcval;

-    } else {

-        M.x86.R_DX = (u16)srcval;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xbb

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

-static void x86emuOp_mov_word_BX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("MOV\tEBX,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("MOV\tBX,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EBX = srcval;

-    } else {

-        M.x86.R_BX = (u16)srcval;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xbc

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

-static void x86emuOp_mov_word_SP_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("MOV\tESP,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("MOV\tSP,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ESP = srcval;

-    } else {

-        M.x86.R_SP = (u16)srcval;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xbd

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

-static void x86emuOp_mov_word_BP_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("MOV\tEBP,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("MOV\tBP,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EBP = srcval;

-    } else {

-        M.x86.R_BP = (u16)srcval;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xbe

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

-static void x86emuOp_mov_word_SI_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("MOV\tESI,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("MOV\tSI,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_ESI = srcval;

-    } else {

-        M.x86.R_SI = (u16)srcval;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xbf

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

-static void x86emuOp_mov_word_DI_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 srcval;

-

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("MOV\tEDI,");

-        srcval = fetch_long_imm();

-    } else {

-        DECODE_PRINTF("MOV\tDI,");

-        srcval = fetch_word_imm();

-    }

-    DECODE_PRINTF2("%x\n", srcval);

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EDI = srcval;

-    } else {

-        M.x86.R_DI = (u16)srcval;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

-/* used by opcodes c0, d0, and d2. */

-static u8(*opcD0_byte_operation[])(u8 d, u8 s) =

-{

-    rol_byte,

-    ror_byte,

-    rcl_byte,

-    rcr_byte,

-    shl_byte,

-    shr_byte,

-    shl_byte,           /* sal_byte === shl_byte  by definition */

-    sar_byte,

-};

-

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

-REMARKS:

-Handles opcode 0xc0

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

-static void x86emuOp_opcC0_byte_RM_MEM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg;

-    uint destoffset;

-    u8 destval;

-    u8 amt;

-

-    /*

-     * Yet another weirdo special case instruction format.  Part of

-     * the opcode held below in "RH".  Doubly nested case would

-     * result, except that the decoded instruction

-     */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the 

-           above test is done twice. */

-

-        switch (rh) {

-        case 0:

-            DECODE_PRINTF("ROL\t");

-            break;

-        case 1:

-            DECODE_PRINTF("ROR\t");

-            break;

-        case 2:

-            DECODE_PRINTF("RCL\t");

-            break;

-        case 3:

-            DECODE_PRINTF("RCR\t");

-            break;

-        case 4:

-            DECODE_PRINTF("SHL\t");

-            break;

-        case 5:

-            DECODE_PRINTF("SHR\t");

-            break;

-        case 6:

-            DECODE_PRINTF("SAL\t");

-            break;

-        case 7:

-            DECODE_PRINTF("SAR\t");

-            break;

-        }

-    }

-#endif

-    /* know operation, decode the mod byte to find the addressing

-       mode. */

-    switch (mod) {

-    case 0:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm00_address(rl);

-        amt = fetch_byte_imm();

-        DECODE_PRINTF2(",%x\n", amt);

-        destval = fetch_data_byte(destoffset);

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (destval, amt);

-        store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm01_address(rl);

-        amt = fetch_byte_imm();

-        DECODE_PRINTF2(",%x\n", amt);

-        destval = fetch_data_byte(destoffset);

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (destval, amt);

-        store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm10_address(rl);

-        amt = fetch_byte_imm();

-        DECODE_PRINTF2(",%x\n", amt);

-        destval = fetch_data_byte(destoffset);

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (destval, amt);

-        store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        amt = fetch_byte_imm();

-        DECODE_PRINTF2(",%x\n", amt);

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (*destreg, amt);

-        *destreg = destval;

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

-/* used by opcodes c1, d1, and d3. */

-static u16(*opcD1_word_operation[])(u16 s, u8 d) =

-{

-    rol_word,

-    ror_word,

-    rcl_word,

-    rcr_word,

-    shl_word,

-    shr_word,

-    shl_word,           /* sal_byte === shl_byte  by definition */

-    sar_word,

-};

-

-/* used by opcodes c1, d1, and d3. */

-static u32 (*opcD1_long_operation[])(u32 s, u8 d) =

-{

-    rol_long,

-    ror_long,

-    rcl_long,

-    rcr_long,

-    shl_long,

-    shr_long,

-    shl_long,           /* sal_byte === shl_byte  by definition */

-    sar_long,

-};

-

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

-REMARKS:

-Handles opcode 0xc1

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

-static void x86emuOp_opcC1_word_RM_MEM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-    u8 amt;

-

-    /*

-     * Yet another weirdo special case instruction format.  Part of

-     * the opcode held below in "RH".  Doubly nested case would

-     * result, except that the decoded instruction

-     */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the 

-           above test is done twice. */

-

-        switch (rh) {

-        case 0:

-            DECODE_PRINTF("ROL\t");

-            break;

-        case 1:

-            DECODE_PRINTF("ROR\t");

-            break;

-        case 2:

-            DECODE_PRINTF("RCL\t");

-            break;

-        case 3:

-            DECODE_PRINTF("RCR\t");

-            break;

-        case 4:

-            DECODE_PRINTF("SHL\t");

-            break;

-        case 5:

-            DECODE_PRINTF("SHR\t");

-            break;

-        case 6:

-            DECODE_PRINTF("SAL\t");

-            break;

-        case 7:

-            DECODE_PRINTF("SAR\t");

-            break;

-        }

-    }

-#endif

-    /* know operation, decode the mod byte to find the addressing

-       mode. */

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            amt = fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", amt);

-            destval = fetch_data_long(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_long_operation[rh]) (destval, amt);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            amt = fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", amt);

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_word_operation[rh]) (destval, amt);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            amt = fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", amt);

-            destval = fetch_data_long(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_long_operation[rh]) (destval, amt);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            amt = fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", amt);

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_word_operation[rh]) (destval, amt);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm10_address(rl);

-            amt = fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", amt);

-            destval = fetch_data_long(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_long_operation[rh]) (destval, amt);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm10_address(rl);

-            amt = fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", amt);

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_word_operation[rh]) (destval, amt);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            amt = fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", amt);

-            TRACE_AND_STEP();

-            *destreg = (*opcD1_long_operation[rh]) (*destreg, amt);

-        } else {

-            u16 *destreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            amt = fetch_byte_imm();

-            DECODE_PRINTF2(",%x\n", amt);

-            TRACE_AND_STEP();

-            *destreg = (*opcD1_word_operation[rh]) (*destreg, amt);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xc2

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

-static void x86emuOp_ret_near_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u16 imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("RET\t");

-    imm = fetch_word_imm();

-    DECODE_PRINTF2("%x\n", imm);

-	RETURN_TRACE("RET",M.x86.saved_cs,M.x86.saved_ip);

-	TRACE_AND_STEP();

-    M.x86.R_IP = pop_word();

-    M.x86.R_SP += imm;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xc3

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

-static void x86emuOp_ret_near(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("RET\n");

-	RETURN_TRACE("RET",M.x86.saved_cs,M.x86.saved_ip);

-	TRACE_AND_STEP();

-    M.x86.R_IP = pop_word();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xc4

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

-static void x86emuOp_les_R_IMM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rh, rl;

-    u16 *dstreg;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("LES\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        dstreg = DECODE_RM_WORD_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *dstreg = fetch_data_word(srcoffset);

-        M.x86.R_ES = fetch_data_word(srcoffset + 2);

-        break;

-    case 1:

-        dstreg = DECODE_RM_WORD_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *dstreg = fetch_data_word(srcoffset);

-        M.x86.R_ES = fetch_data_word(srcoffset + 2);

-        break;

-    case 2:

-        dstreg = DECODE_RM_WORD_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *dstreg = fetch_data_word(srcoffset);

-        M.x86.R_ES = fetch_data_word(srcoffset + 2);

-        break;

-    case 3:                     /* register to register */

-        /* UNDEFINED! */

-        TRACE_AND_STEP();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xc5

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

-static void x86emuOp_lds_R_IMM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rh, rl;

-    u16 *dstreg;

-    uint srcoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("LDS\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:

-        dstreg = DECODE_RM_WORD_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm00_address(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *dstreg = fetch_data_word(srcoffset);

-        M.x86.R_DS = fetch_data_word(srcoffset + 2);

-        break;

-    case 1:

-        dstreg = DECODE_RM_WORD_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm01_address(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *dstreg = fetch_data_word(srcoffset);

-        M.x86.R_DS = fetch_data_word(srcoffset + 2);

-        break;

-    case 2:

-        dstreg = DECODE_RM_WORD_REGISTER(rh);

-        DECODE_PRINTF(",");

-        srcoffset = decode_rm10_address(rl);

-        DECODE_PRINTF("\n");

-        TRACE_AND_STEP();

-        *dstreg = fetch_data_word(srcoffset);

-        M.x86.R_DS = fetch_data_word(srcoffset + 2);

-        break;

-    case 3:                     /* register to register */

-        /* UNDEFINED! */

-        TRACE_AND_STEP();

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xc6

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

-static void x86emuOp_mov_byte_RM_IMM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg;

-    uint destoffset;

-    u8 imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    if (rh != 0) {

-        DECODE_PRINTF("ILLEGAL DECODE OF OPCODE c6\n");

-        HALT_SYS();

-    }

-    switch (mod) {

-    case 0:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm00_address(rl);

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2(",%2x\n", imm);

-        TRACE_AND_STEP();

-        store_data_byte(destoffset, imm);

-        break;

-    case 1:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm01_address(rl);

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2(",%2x\n", imm);

-        TRACE_AND_STEP();

-        store_data_byte(destoffset, imm);

-        break;

-    case 2:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm10_address(rl);

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2(",%2x\n", imm);

-        TRACE_AND_STEP();

-        store_data_byte(destoffset, imm);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        imm = fetch_byte_imm();

-        DECODE_PRINTF2(",%2x\n", imm);

-        TRACE_AND_STEP();

-        *destreg = imm;

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xc7

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

-static void x86emuOp_mov_word_RM_IMM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("MOV\t");

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    if (rh != 0) {

-        DECODE_PRINTF("ILLEGAL DECODE OF OPCODE 8F\n");

-        HALT_SYS();

-    }

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 imm;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            imm = fetch_long_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            store_data_long(destoffset, imm);

-        } else {

-            u16 imm;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            imm = fetch_word_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            store_data_word(destoffset, imm);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 imm;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            imm = fetch_long_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            store_data_long(destoffset, imm);

-        } else {

-            u16 imm;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            imm = fetch_word_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            store_data_word(destoffset, imm);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 imm;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm10_address(rl);

-            imm = fetch_long_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            store_data_long(destoffset, imm);

-        } else {

-            u16 imm;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm10_address(rl);

-            imm = fetch_word_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            store_data_word(destoffset, imm);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-			u32 *destreg;

-			u32 imm;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            imm = fetch_long_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            *destreg = imm;

-        } else {

-			u16 *destreg;

-			u16 imm;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            imm = fetch_word_imm();

-            DECODE_PRINTF2(",%x\n", imm);

-            TRACE_AND_STEP();

-            *destreg = imm;

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xc8

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

-static void x86emuOp_enter(u8 X86EMU_UNUSED(op1))

-{

-    u16 local,frame_pointer;

-    u8  nesting;

-    int i;

-

-    START_OF_INSTR();

-    local = fetch_word_imm();

-    nesting = fetch_byte_imm();

-    DECODE_PRINTF2("ENTER %x\n", local);

-    DECODE_PRINTF2(",%x\n", nesting);

-    TRACE_AND_STEP();

-    push_word(M.x86.R_BP);

-    frame_pointer = M.x86.R_SP;

-    if (nesting > 0) {

-        for (i = 1; i < nesting; i++) {

-            M.x86.R_BP -= 2;

-            push_word(fetch_data_word_abs(M.x86.R_SS, M.x86.R_BP));

-            }

-        push_word(frame_pointer);

-        }

-    M.x86.R_BP = frame_pointer;

-    M.x86.R_SP = (u16)(M.x86.R_SP - local);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xc9

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

-static void x86emuOp_leave(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("LEAVE\n");

-    TRACE_AND_STEP();

-    M.x86.R_SP = M.x86.R_BP;

-    M.x86.R_BP = pop_word();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xca

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

-static void x86emuOp_ret_far_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u16 imm;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("RETF\t");

-    imm = fetch_word_imm();

-    DECODE_PRINTF2("%x\n", imm);

-	RETURN_TRACE("RETF",M.x86.saved_cs,M.x86.saved_ip);

-	TRACE_AND_STEP();

-    M.x86.R_IP = pop_word();

-    M.x86.R_CS = pop_word();

-    M.x86.R_SP += imm;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xcb

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

-static void x86emuOp_ret_far(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("RETF\n");

-	RETURN_TRACE("RETF",M.x86.saved_cs,M.x86.saved_ip);

-	TRACE_AND_STEP();

-    M.x86.R_IP = pop_word();

-    M.x86.R_CS = pop_word();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xcc

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

-static void x86emuOp_int3(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("INT 3\n");

-    TRACE_AND_STEP();

-    if (_X86EMU_intrTab[3]) {

-	(*_X86EMU_intrTab[3])(3);

-    } else {

-        push_word((u16)M.x86.R_FLG);

-        CLEAR_FLAG(F_IF);

-        CLEAR_FLAG(F_TF);

-        push_word(M.x86.R_CS);

-        M.x86.R_CS = mem_access_word(3 * 4 + 2);

-        push_word(M.x86.R_IP);

-        M.x86.R_IP = mem_access_word(3 * 4);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xcd

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

-static void x86emuOp_int_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 intnum;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("INT\t");

-    intnum = fetch_byte_imm();

-    DECODE_PRINTF2("%x\n", intnum);

-    TRACE_AND_STEP();

-    if (_X86EMU_intrTab[intnum]) {

-	(*_X86EMU_intrTab[intnum])(intnum);

-    } else {

-        push_word((u16)M.x86.R_FLG);

-        CLEAR_FLAG(F_IF);

-        CLEAR_FLAG(F_TF);

-        push_word(M.x86.R_CS);

-        M.x86.R_CS = mem_access_word(intnum * 4 + 2);

-        push_word(M.x86.R_IP);

-        M.x86.R_IP = mem_access_word(intnum * 4);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xce

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

-static void x86emuOp_into(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("INTO\n");

-    TRACE_AND_STEP();

-    if (ACCESS_FLAG(F_OF)) {

-	if (_X86EMU_intrTab[4]) {

-	    (*_X86EMU_intrTab[4])(4);

-        } else {

-            push_word((u16)M.x86.R_FLG);

-            CLEAR_FLAG(F_IF);

-            CLEAR_FLAG(F_TF);

-            push_word(M.x86.R_CS);

-            M.x86.R_CS = mem_access_word(4 * 4 + 2);

-            push_word(M.x86.R_IP);

-            M.x86.R_IP = mem_access_word(4 * 4);

-        }

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xcf

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

-static void x86emuOp_iret(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("IRET\n");

-

-    TRACE_AND_STEP();

-

-    M.x86.R_IP = pop_word();

-    M.x86.R_CS = pop_word();

-    M.x86.R_FLG = pop_word();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xd0

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

-static void x86emuOp_opcD0_byte_RM_1(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg;

-    uint destoffset;

-    u8 destval;

-

-    /*

-     * Yet another weirdo special case instruction format.  Part of

-     * the opcode held below in "RH".  Doubly nested case would

-     * result, except that the decoded instruction

-     */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the

-           above test is done twice. */

-        switch (rh) {

-        case 0:

-            DECODE_PRINTF("ROL\t");

-            break;

-        case 1:

-            DECODE_PRINTF("ROR\t");

-            break;

-        case 2:

-            DECODE_PRINTF("RCL\t");

-            break;

-        case 3:

-            DECODE_PRINTF("RCR\t");

-            break;

-        case 4:

-            DECODE_PRINTF("SHL\t");

-            break;

-        case 5:

-            DECODE_PRINTF("SHR\t");

-            break;

-        case 6:

-            DECODE_PRINTF("SAL\t");

-            break;

-        case 7:

-            DECODE_PRINTF("SAR\t");

-            break;

-        }

-    }

-#endif

-    /* know operation, decode the mod byte to find the addressing

-       mode. */

-    switch (mod) {

-    case 0:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",1\n");

-        destval = fetch_data_byte(destoffset);

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (destval, 1);

-        store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",1\n");

-        destval = fetch_data_byte(destoffset);

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (destval, 1);

-        store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",1\n");

-        destval = fetch_data_byte(destoffset);

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (destval, 1);

-        store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",1\n");

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (*destreg, 1);

-        *destreg = destval;

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xd1

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

-static void x86emuOp_opcD1_word_RM_1(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    /*

-     * Yet another weirdo special case instruction format.  Part of

-     * the opcode held below in "RH".  Doubly nested case would

-     * result, except that the decoded instruction

-     */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the

-           above test is done twice. */

-        switch (rh) {

-        case 0:

-            DECODE_PRINTF("ROL\t");

-            break;

-        case 1:

-            DECODE_PRINTF("ROR\t");

-            break;

-        case 2:

-            DECODE_PRINTF("RCL\t");

-            break;

-        case 3:

-            DECODE_PRINTF("RCR\t");

-            break;

-        case 4:

-            DECODE_PRINTF("SHL\t");

-            break;

-        case 5:

-            DECODE_PRINTF("SHR\t");

-            break;

-        case 6:

-            DECODE_PRINTF("SAL\t");

-            break;

-        case 7:

-            DECODE_PRINTF("SAR\t");

-            break;

-        }

-    }

-#endif

-    /* know operation, decode the mod byte to find the addressing

-       mode. */

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",1\n");

-            destval = fetch_data_long(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_long_operation[rh]) (destval, 1);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",1\n");

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_word_operation[rh]) (destval, 1);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",1\n");

-            destval = fetch_data_long(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_long_operation[rh]) (destval, 1);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",1\n");

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_word_operation[rh]) (destval, 1);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",1\n");

-            destval = fetch_data_long(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_long_operation[rh]) (destval, 1);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            DECODE_PRINTF("BYTE PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",1\n");

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_word_operation[rh]) (destval, 1);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-			u32 destval;

-			u32 *destreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",1\n");

-            TRACE_AND_STEP();

-            destval = (*opcD1_long_operation[rh]) (*destreg, 1);

-            *destreg = destval;

-        } else {

-			u16 destval;

-			u16 *destreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",1\n");

-            TRACE_AND_STEP();

-            destval = (*opcD1_word_operation[rh]) (*destreg, 1);

-            *destreg = destval;

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xd2

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

-static void x86emuOp_opcD2_byte_RM_CL(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg;

-    uint destoffset;

-    u8 destval;

-    u8 amt;

-

-    /*

-     * Yet another weirdo special case instruction format.  Part of

-     * the opcode held below in "RH".  Doubly nested case would

-     * result, except that the decoded instruction

-     */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the 

-           above test is done twice. */

-        switch (rh) {

-        case 0:

-            DECODE_PRINTF("ROL\t");

-            break;

-        case 1:

-            DECODE_PRINTF("ROR\t");

-            break;

-        case 2:

-            DECODE_PRINTF("RCL\t");

-            break;

-        case 3:

-            DECODE_PRINTF("RCR\t");

-            break;

-        case 4:

-            DECODE_PRINTF("SHL\t");

-            break;

-        case 5:

-            DECODE_PRINTF("SHR\t");

-            break;

-        case 6:

-            DECODE_PRINTF("SAL\t");

-            break;

-        case 7:

-            DECODE_PRINTF("SAR\t");

-            break;

-        }

-    }

-#endif

-    /* know operation, decode the mod byte to find the addressing

-       mode. */

-    amt = M.x86.R_CL;

-    switch (mod) {

-    case 0:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF(",CL\n");

-        destval = fetch_data_byte(destoffset);

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (destval, amt);

-        store_data_byte(destoffset, destval);

-        break;

-    case 1:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF(",CL\n");

-        destval = fetch_data_byte(destoffset);

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (destval, amt);

-        store_data_byte(destoffset, destval);

-        break;

-    case 2:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF(",CL\n");

-        destval = fetch_data_byte(destoffset);

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (destval, amt);

-        store_data_byte(destoffset, destval);

-        break;

-    case 3:                     /* register to register */

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF(",CL\n");

-        TRACE_AND_STEP();

-        destval = (*opcD0_byte_operation[rh]) (*destreg, amt);

-        *destreg = destval;

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xd3

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

-static void x86emuOp_opcD3_word_RM_CL(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-    u8 amt;

-

-    /*

-     * Yet another weirdo special case instruction format.  Part of

-     * the opcode held below in "RH".  Doubly nested case would

-     * result, except that the decoded instruction

-     */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the 

-           above test is done twice. */

-        switch (rh) {

-        case 0:

-            DECODE_PRINTF("ROL\t");

-            break;

-        case 1:

-            DECODE_PRINTF("ROR\t");

-            break;

-        case 2:

-            DECODE_PRINTF("RCL\t");

-            break;

-        case 3:

-            DECODE_PRINTF("RCR\t");

-            break;

-        case 4:

-            DECODE_PRINTF("SHL\t");

-            break;

-        case 5:

-            DECODE_PRINTF("SHR\t");

-            break;

-        case 6:

-            DECODE_PRINTF("SAL\t");

-            break;

-        case 7:

-            DECODE_PRINTF("SAR\t");

-            break;

-        }

-    }

-#endif

-    /* know operation, decode the mod byte to find the addressing

-       mode. */

-    amt = M.x86.R_CL;

-    switch (mod) {

-    case 0:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",CL\n");

-            destval = fetch_data_long(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_long_operation[rh]) (destval, amt);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",CL\n");

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_word_operation[rh]) (destval, amt);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 1:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",CL\n");

-            destval = fetch_data_long(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_long_operation[rh]) (destval, amt);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",CL\n");

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_word_operation[rh]) (destval, amt);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 2:

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 destval;

-

-            DECODE_PRINTF("DWORD PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",CL\n");

-            destval = fetch_data_long(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_long_operation[rh]) (destval, amt);

-            store_data_long(destoffset, destval);

-        } else {

-            u16 destval;

-

-            DECODE_PRINTF("WORD PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",CL\n");

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            destval = (*opcD1_word_operation[rh]) (destval, amt);

-            store_data_word(destoffset, destval);

-        }

-        break;

-    case 3:                     /* register to register */

-        if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-            u32 *destreg;

-

-            destreg = DECODE_RM_LONG_REGISTER(rl);

-            DECODE_PRINTF(",CL\n");

-            TRACE_AND_STEP();

-            *destreg = (*opcD1_long_operation[rh]) (*destreg, amt);

-        } else {

-            u16 *destreg;

-

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF(",CL\n");

-            TRACE_AND_STEP();

-            *destreg = (*opcD1_word_operation[rh]) (*destreg, amt);

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xd4

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

-static void x86emuOp_aam(u8 X86EMU_UNUSED(op1))

-{

-    u8 a;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("AAM\n");

-    a = fetch_byte_imm();      /* this is a stupid encoding. */

-    if (a != 10) {

-	/* fix: add base decoding

-	   aam_word(u8 val, int base a) */

-        DECODE_PRINTF("ERROR DECODING AAM\n");

-        TRACE_REGS();

-        HALT_SYS();

-    }

-    TRACE_AND_STEP();

-    /* note the type change here --- returning AL and AH in AX. */

-    M.x86.R_AX = aam_word(M.x86.R_AL);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xd5

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

-static void x86emuOp_aad(u8 X86EMU_UNUSED(op1))

-{

-    u8 a;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("AAD\n");

-    a = fetch_byte_imm();

-    if (a != 10) {

-	/* fix: add base decoding

-	   aad_word(u16 val, int base a) */

-        DECODE_PRINTF("ERROR DECODING AAM\n");

-        TRACE_REGS();

-        HALT_SYS();

-    }

-    TRACE_AND_STEP();

-    M.x86.R_AX = aad_word(M.x86.R_AX);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

-/* opcode 0xd6 ILLEGAL OPCODE */

-

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

-REMARKS:

-Handles opcode 0xd7

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

-static void x86emuOp_xlat(u8 X86EMU_UNUSED(op1))

-{

-    u16 addr;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("XLAT\n");

-    TRACE_AND_STEP();

-	addr = (u16)(M.x86.R_BX + (u8)M.x86.R_AL);

-    M.x86.R_AL = fetch_data_byte(addr);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

-/* instuctions  D8 .. DF are in i87_ops.c */

-

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

-REMARKS:

-Handles opcode 0xe0

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

-static void x86emuOp_loopne(u8 X86EMU_UNUSED(op1))

-{

-    s16 ip;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("LOOPNE\t");

-    ip = (s8) fetch_byte_imm();

-    ip += (s16) M.x86.R_IP;

-    DECODE_PRINTF2("%04x\n", ip);

-    TRACE_AND_STEP();

-    M.x86.R_CX -= 1;

-    if (M.x86.R_CX != 0 && !ACCESS_FLAG(F_ZF))      /* CX != 0 and !ZF */

-        M.x86.R_IP = ip;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xe1

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

-static void x86emuOp_loope(u8 X86EMU_UNUSED(op1))

-{

-    s16 ip;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("LOOPE\t");

-    ip = (s8) fetch_byte_imm();

-    ip += (s16) M.x86.R_IP;

-    DECODE_PRINTF2("%04x\n", ip);

-    TRACE_AND_STEP();

-    M.x86.R_CX -= 1;

-    if (M.x86.R_CX != 0 && ACCESS_FLAG(F_ZF))       /* CX != 0 and ZF */

-        M.x86.R_IP = ip;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xe2

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

-static void x86emuOp_loop(u8 X86EMU_UNUSED(op1))

-{

-    s16 ip;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("LOOP\t");

-    ip = (s8) fetch_byte_imm();

-    ip += (s16) M.x86.R_IP;

-    DECODE_PRINTF2("%04x\n", ip);

-    TRACE_AND_STEP();

-    M.x86.R_CX -= 1;

-    if (M.x86.R_CX != 0)

-        M.x86.R_IP = ip;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xe3

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

-static void x86emuOp_jcxz(u8 X86EMU_UNUSED(op1))

-{

-    u16 target;

-    s8  offset;

-

-    /* jump to byte offset if overflow flag is set */

-    START_OF_INSTR();

-    DECODE_PRINTF("JCXZ\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    if (M.x86.R_CX == 0)

-        M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xe4

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

-static void x86emuOp_in_byte_AL_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 port;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("IN\t");

-	port = (u8) fetch_byte_imm();

-    DECODE_PRINTF2("%x,AL\n", port);

-    TRACE_AND_STEP();

-    M.x86.R_AL = (*sys_inb)(port);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xe5

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

-static void x86emuOp_in_word_AX_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u8 port;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("IN\t");

-	port = (u8) fetch_byte_imm();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF2("EAX,%x\n", port);

-    } else {

-        DECODE_PRINTF2("AX,%x\n", port);

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = (*sys_inl)(port);

-    } else {

-        M.x86.R_AX = (*sys_inw)(port);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xe6

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

-static void x86emuOp_out_byte_IMM_AL(u8 X86EMU_UNUSED(op1))

-{

-    u8 port;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("OUT\t");

-	port = (u8) fetch_byte_imm();

-    DECODE_PRINTF2("%x,AL\n", port);

-    TRACE_AND_STEP();

-    (*sys_outb)(port, M.x86.R_AL);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xe7

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

-static void x86emuOp_out_word_IMM_AX(u8 X86EMU_UNUSED(op1))

-{

-    u8 port;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("OUT\t");

-	port = (u8) fetch_byte_imm();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF2("%x,EAX\n", port);

-    } else {

-        DECODE_PRINTF2("%x,AX\n", port);

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        (*sys_outl)(port, M.x86.R_EAX);

-    } else {

-        (*sys_outw)(port, M.x86.R_AX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xe8

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

-static void x86emuOp_call_near_IMM(u8 X86EMU_UNUSED(op1))

-{

-    s16 ip16;

-    s32 ip32;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("CALL\t");

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-	ip32 = (s32) fetch_long_imm();

-	ip32 += (s16) M.x86.R_IP;    /* CHECK SIGN */

-	DECODE_PRINTF2("%04x\n", (u16)ip32);

-	CALL_TRACE(M.x86.saved_cs, M.x86.saved_ip, M.x86.R_CS, ip32, "");

-    } else {

-	ip16 = (s16) fetch_word_imm();

-	ip16 += (s16) M.x86.R_IP;    /* CHECK SIGN */

-	DECODE_PRINTF2("%04x\n", (u16)ip16);

-	CALL_TRACE(M.x86.saved_cs, M.x86.saved_ip, M.x86.R_CS, ip16, "");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-	push_long(M.x86.R_EIP);

-	M.x86.R_EIP = ip32 & 0xffff;

-    } else {

-	push_word(M.x86.R_IP);

-	M.x86.R_EIP = ip16;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xe9

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

-static void x86emuOp_jump_near_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u32 ip;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("JMP\t");

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-	ip = (u32)fetch_long_imm();

-	ip += (u32)M.x86.R_EIP;

-	DECODE_PRINTF2("%08x\n", (u32)ip);

-	TRACE_AND_STEP();

-	M.x86.R_EIP = (u32)ip;

-    } else {

-	ip = (s16)fetch_word_imm();

-	ip += (s16)M.x86.R_IP;

-	DECODE_PRINTF2("%04x\n", (u16)ip);

-	TRACE_AND_STEP();

-	M.x86.R_IP = (u16)ip;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xea

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

-static void x86emuOp_jump_far_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u16 cs;

-    u32 ip;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("JMP\tFAR ");

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-	ip = fetch_long_imm();

-    } else {

-	ip = fetch_word_imm();

-    }

-    cs = fetch_word_imm();

-    DECODE_PRINTF2("%04x:", cs);

-    DECODE_PRINTF2("%04x\n", ip);

-    TRACE_AND_STEP();

-    M.x86.R_EIP = ip & 0xffff;

-    M.x86.R_CS = cs;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xeb

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

-static void x86emuOp_jump_byte_IMM(u8 X86EMU_UNUSED(op1))

-{

-    u16 target;

-    s8 offset;

-

-    START_OF_INSTR();

-    DECODE_PRINTF("JMP\t");

-    offset = (s8)fetch_byte_imm();

-    target = (u16)(M.x86.R_IP + offset);

-    DECODE_PRINTF2("%x\n", target);

-    TRACE_AND_STEP();

-    M.x86.R_IP = target;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xec

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

-static void x86emuOp_in_byte_AL_DX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("IN\tAL,DX\n");

-    TRACE_AND_STEP();

-    M.x86.R_AL = (*sys_inb)(M.x86.R_DX);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xed

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

-static void x86emuOp_in_word_AX_DX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("IN\tEAX,DX\n");

-    } else {

-        DECODE_PRINTF("IN\tAX,DX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        M.x86.R_EAX = (*sys_inl)(M.x86.R_DX);

-    } else {

-        M.x86.R_AX = (*sys_inw)(M.x86.R_DX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xee

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

-static void x86emuOp_out_byte_DX_AL(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("OUT\tDX,AL\n");

-    TRACE_AND_STEP();

-    (*sys_outb)(M.x86.R_DX, M.x86.R_AL);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xef

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

-static void x86emuOp_out_word_DX_AX(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        DECODE_PRINTF("OUT\tDX,EAX\n");

-    } else {

-        DECODE_PRINTF("OUT\tDX,AX\n");

-    }

-    TRACE_AND_STEP();

-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-        (*sys_outl)(M.x86.R_DX, M.x86.R_EAX);

-    } else {

-        (*sys_outw)(M.x86.R_DX, M.x86.R_AX);

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xf0

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

-static void x86emuOp_lock(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("LOCK:\n");

-    TRACE_AND_STEP();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

-/*opcode 0xf1 ILLEGAL OPERATION */

-

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

-REMARKS:

-Handles opcode 0xf2

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

-static void x86emuOp_repne(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("REPNE\n");

-    TRACE_AND_STEP();

-    M.x86.mode |= SYSMODE_PREFIX_REPNE;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xf3

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

-static void x86emuOp_repe(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("REPE\n");

-    TRACE_AND_STEP();

-    M.x86.mode |= SYSMODE_PREFIX_REPE;

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xf4

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

-static void x86emuOp_halt(u8 X86EMU_UNUSED(op1))

-{

-    START_OF_INSTR();

-    DECODE_PRINTF("HALT\n");

-    TRACE_AND_STEP();

-    HALT_SYS();

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xf5

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

-static void x86emuOp_cmc(u8 X86EMU_UNUSED(op1))

-{

-    /* complement the carry flag. */

-    START_OF_INSTR();

-    DECODE_PRINTF("CMC\n");

-    TRACE_AND_STEP();

-    TOGGLE_FLAG(F_CF);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xf6

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

-static void x86emuOp_opcF6_byte_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    u8 *destreg;

-    uint destoffset;

-    u8 destval, srcval;

-

-    /* long, drawn out code follows.  Double switch for a total

-       of 32 cases.  */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:                     /* mod=00 */

-        switch (rh) {

-        case 0:         /* test byte imm */

-            DECODE_PRINTF("TEST\tBYTE PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF(",");

-            srcval = fetch_byte_imm();

-            DECODE_PRINTF2("%02x\n", srcval);

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            test_byte(destval, srcval);

-            break;

-        case 1:

-            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");

-            HALT_SYS();

-            break;

-        case 2:

-            DECODE_PRINTF("NOT\tBYTE PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = not_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        case 3:

-            DECODE_PRINTF("NEG\tBYTE PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = neg_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        case 4:

-            DECODE_PRINTF("MUL\tBYTE PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            mul_byte(destval);

-            break;

-        case 5:

-            DECODE_PRINTF("IMUL\tBYTE PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            imul_byte(destval);

-            break;

-        case 6:

-            DECODE_PRINTF("DIV\tBYTE PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            div_byte(destval);

-            break;

-        case 7:

-            DECODE_PRINTF("IDIV\tBYTE PTR ");

-            destoffset = decode_rm00_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            idiv_byte(destval);

-            break;

-        }

-        break;                  /* end mod==00 */

-    case 1:                     /* mod=01 */

-        switch (rh) {

-        case 0:         /* test byte imm */

-            DECODE_PRINTF("TEST\tBYTE PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF(",");

-            srcval = fetch_byte_imm();

-            DECODE_PRINTF2("%02x\n", srcval);

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            test_byte(destval, srcval);

-            break;

-        case 1:

-            DECODE_PRINTF("ILLEGAL OP MOD=01 RH=01 OP=F6\n");

-            HALT_SYS();

-            break;

-        case 2:

-            DECODE_PRINTF("NOT\tBYTE PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = not_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        case 3:

-            DECODE_PRINTF("NEG\tBYTE PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = neg_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        case 4:

-            DECODE_PRINTF("MUL\tBYTE PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            mul_byte(destval);

-            break;

-        case 5:

-            DECODE_PRINTF("IMUL\tBYTE PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            imul_byte(destval);

-            break;

-        case 6:

-            DECODE_PRINTF("DIV\tBYTE PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            div_byte(destval);

-            break;

-        case 7:

-            DECODE_PRINTF("IDIV\tBYTE PTR ");

-            destoffset = decode_rm01_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            idiv_byte(destval);

-            break;

-        }

-        break;                  /* end mod==01 */

-    case 2:                     /* mod=10 */

-        switch (rh) {

-        case 0:         /* test byte imm */

-            DECODE_PRINTF("TEST\tBYTE PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF(",");

-            srcval = fetch_byte_imm();

-            DECODE_PRINTF2("%02x\n", srcval);

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            test_byte(destval, srcval);

-            break;

-        case 1:

-            DECODE_PRINTF("ILLEGAL OP MOD=10 RH=01 OP=F6\n");

-            HALT_SYS();

-            break;

-        case 2:

-            DECODE_PRINTF("NOT\tBYTE PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = not_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        case 3:

-            DECODE_PRINTF("NEG\tBYTE PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = neg_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        case 4:

-            DECODE_PRINTF("MUL\tBYTE PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            mul_byte(destval);

-            break;

-        case 5:

-            DECODE_PRINTF("IMUL\tBYTE PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            imul_byte(destval);

-            break;

-        case 6:

-            DECODE_PRINTF("DIV\tBYTE PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            div_byte(destval);

-            break;

-        case 7:

-            DECODE_PRINTF("IDIV\tBYTE PTR ");

-            destoffset = decode_rm10_address(rl);

-            DECODE_PRINTF("\n");

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            idiv_byte(destval);

-            break;

-        }

-        break;                  /* end mod==10 */

-    case 3:                     /* mod=11 */

-        switch (rh) {

-        case 0:         /* test byte imm */

-            DECODE_PRINTF("TEST\t");

-            destreg = DECODE_RM_BYTE_REGISTER(rl);

-            DECODE_PRINTF(",");

-            srcval = fetch_byte_imm();

-            DECODE_PRINTF2("%02x\n", srcval);

-            TRACE_AND_STEP();

-            test_byte(*destreg, srcval);

-            break;

-        case 1:

-            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");

-            HALT_SYS();

-            break;

-        case 2:

-            DECODE_PRINTF("NOT\t");

-            destreg = DECODE_RM_BYTE_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = not_byte(*destreg);

-            break;

-        case 3:

-            DECODE_PRINTF("NEG\t");

-            destreg = DECODE_RM_BYTE_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            *destreg = neg_byte(*destreg);

-            break;

-        case 4:

-            DECODE_PRINTF("MUL\t");

-            destreg = DECODE_RM_BYTE_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            mul_byte(*destreg);      /*!!!  */

-            break;

-        case 5:

-            DECODE_PRINTF("IMUL\t");

-            destreg = DECODE_RM_BYTE_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            imul_byte(*destreg);

-            break;

-        case 6:

-            DECODE_PRINTF("DIV\t");

-            destreg = DECODE_RM_BYTE_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            div_byte(*destreg);

-            break;

-        case 7:

-            DECODE_PRINTF("IDIV\t");

-            destreg = DECODE_RM_BYTE_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            idiv_byte(*destreg);

-            break;

-        }

-        break;                  /* end mod==11 */

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xf7

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

-static void x86emuOp_opcF7_word_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rl, rh;

-    uint destoffset;

-

-    /* long, drawn out code follows.  Double switch for a total

-       of 32 cases.  */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-    switch (mod) {

-    case 0:                     /* mod=00 */

-        switch (rh) {

-        case 0:         /* test word imm */

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval,srcval;

-

-                DECODE_PRINTF("TEST\tDWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF(",");

-                srcval = fetch_long_imm();

-                DECODE_PRINTF2("%x\n", srcval);

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                test_long(destval, srcval);

-            } else {

-                u16 destval,srcval;

-

-                DECODE_PRINTF("TEST\tWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF(",");

-                srcval = fetch_word_imm();

-                DECODE_PRINTF2("%x\n", srcval);

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                test_word(destval, srcval);

-            }

-            break;

-        case 1:

-            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F7\n");

-            HALT_SYS();

-            break;

-        case 2:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("NOT\tDWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = not_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("NOT\tWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = not_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 3:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("NEG\tDWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = neg_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("NEG\tWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = neg_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 4:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("MUL\tDWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                mul_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("MUL\tWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                mul_word(destval);

-            }

-            break;

-        case 5:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("IMUL\tDWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                imul_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("IMUL\tWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                imul_word(destval);

-            }

-            break;

-        case 6:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("DIV\tDWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                div_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("DIV\tWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                div_word(destval);

-            }

-            break;

-        case 7:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("IDIV\tDWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                idiv_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("IDIV\tWORD PTR ");

-                destoffset = decode_rm00_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                idiv_word(destval);

-            }

-            break;

-        }

-        break;                  /* end mod==00 */

-    case 1:                     /* mod=01 */

-        switch (rh) {

-        case 0:         /* test word imm */

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval,srcval;

-

-                DECODE_PRINTF("TEST\tDWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF(",");

-                srcval = fetch_long_imm();

-                DECODE_PRINTF2("%x\n", srcval);

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                test_long(destval, srcval);

-            } else {

-                u16 destval,srcval;

-

-                DECODE_PRINTF("TEST\tWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF(",");

-                srcval = fetch_word_imm();

-                DECODE_PRINTF2("%x\n", srcval);

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                test_word(destval, srcval);

-            }

-            break;

-        case 1:

-            DECODE_PRINTF("ILLEGAL OP MOD=01 RH=01 OP=F6\n");

-            HALT_SYS();

-            break;

-        case 2:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("NOT\tDWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = not_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("NOT\tWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = not_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 3:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("NEG\tDWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = neg_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("NEG\tWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = neg_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 4:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("MUL\tDWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                mul_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("MUL\tWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                mul_word(destval);

-            }

-            break;

-        case 5:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("IMUL\tDWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                imul_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("IMUL\tWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                imul_word(destval);

-            }

-            break;

-        case 6:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("DIV\tDWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                div_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("DIV\tWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                div_word(destval);

-            }

-            break;

-        case 7:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("IDIV\tDWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                idiv_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("IDIV\tWORD PTR ");

-                destoffset = decode_rm01_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                idiv_word(destval);

-            }

-            break;

-        }

-        break;                  /* end mod==01 */

-    case 2:                     /* mod=10 */

-        switch (rh) {

-        case 0:         /* test word imm */

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval,srcval;

-

-                DECODE_PRINTF("TEST\tDWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF(",");

-                srcval = fetch_long_imm();

-                DECODE_PRINTF2("%x\n", srcval);

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                test_long(destval, srcval);

-            } else {

-                u16 destval,srcval;

-

-                DECODE_PRINTF("TEST\tWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF(",");

-                srcval = fetch_word_imm();

-                DECODE_PRINTF2("%x\n", srcval);

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                test_word(destval, srcval);

-            }

-            break;

-        case 1:

-            DECODE_PRINTF("ILLEGAL OP MOD=10 RH=01 OP=F6\n");

-            HALT_SYS();

-            break;

-        case 2:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("NOT\tDWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = not_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("NOT\tWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = not_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 3:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("NEG\tDWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = neg_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("NEG\tWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = neg_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 4:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("MUL\tDWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                mul_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("MUL\tWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                mul_word(destval);

-            }

-            break;

-        case 5:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("IMUL\tDWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                imul_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("IMUL\tWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                imul_word(destval);

-            }

-            break;

-        case 6:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("DIV\tDWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                div_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("DIV\tWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                div_word(destval);

-            }

-            break;

-        case 7:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                DECODE_PRINTF("IDIV\tDWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                idiv_long(destval);

-            } else {

-                u16 destval;

-

-                DECODE_PRINTF("IDIV\tWORD PTR ");

-                destoffset = decode_rm10_address(rl);

-                DECODE_PRINTF("\n");

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                idiv_word(destval);

-            }

-            break;

-        }

-        break;                  /* end mod==10 */

-    case 3:                     /* mod=11 */

-        switch (rh) {

-        case 0:         /* test word imm */

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 *destreg;

-                u32 srcval;

-

-                DECODE_PRINTF("TEST\t");

-                destreg = DECODE_RM_LONG_REGISTER(rl);

-                DECODE_PRINTF(",");

-                srcval = fetch_long_imm();

-                DECODE_PRINTF2("%x\n", srcval);

-                TRACE_AND_STEP();

-                test_long(*destreg, srcval);

-            } else {

-                u16 *destreg;

-                u16 srcval;

-

-                DECODE_PRINTF("TEST\t");

-                destreg = DECODE_RM_WORD_REGISTER(rl);

-                DECODE_PRINTF(",");

-                srcval = fetch_word_imm();

-                DECODE_PRINTF2("%x\n", srcval);

-                TRACE_AND_STEP();

-                test_word(*destreg, srcval);

-            }

-            break;

-        case 1:

-            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");

-            HALT_SYS();

-            break;

-        case 2:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 *destreg;

-

-                DECODE_PRINTF("NOT\t");

-                destreg = DECODE_RM_LONG_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                *destreg = not_long(*destreg);

-            } else {

-                u16 *destreg;

-

-                DECODE_PRINTF("NOT\t");

-                destreg = DECODE_RM_WORD_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                *destreg = not_word(*destreg);

-            }

-            break;

-        case 3:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 *destreg;

-

-                DECODE_PRINTF("NEG\t");

-                destreg = DECODE_RM_LONG_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                *destreg = neg_long(*destreg);

-            } else {

-                u16 *destreg;

-

-                DECODE_PRINTF("NEG\t");

-                destreg = DECODE_RM_WORD_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                *destreg = neg_word(*destreg);

-            }

-            break;

-        case 4:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 *destreg;

-

-                DECODE_PRINTF("MUL\t");

-                destreg = DECODE_RM_LONG_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                mul_long(*destreg);      /*!!!  */

-            } else {

-                u16 *destreg;

-

-                DECODE_PRINTF("MUL\t");

-                destreg = DECODE_RM_WORD_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                mul_word(*destreg);      /*!!!  */

-            }

-            break;

-        case 5:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 *destreg;

-

-                DECODE_PRINTF("IMUL\t");

-                destreg = DECODE_RM_LONG_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                imul_long(*destreg);

-            } else {

-                u16 *destreg;

-

-                DECODE_PRINTF("IMUL\t");

-                destreg = DECODE_RM_WORD_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                imul_word(*destreg);

-            }

-            break;

-        case 6:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 *destreg;

-

-                DECODE_PRINTF("DIV\t");

-                destreg = DECODE_RM_LONG_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                div_long(*destreg);

-            } else {

-                u16 *destreg;

-

-                DECODE_PRINTF("DIV\t");

-                destreg = DECODE_RM_WORD_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                div_word(*destreg);

-            }

-            break;

-        case 7:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 *destreg;

-

-                DECODE_PRINTF("IDIV\t");

-                destreg = DECODE_RM_LONG_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                idiv_long(*destreg);

-            } else {

-                u16 *destreg;

-

-                DECODE_PRINTF("IDIV\t");

-                destreg = DECODE_RM_WORD_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                idiv_word(*destreg);

-            }

-            break;

-        }

-        break;                  /* end mod==11 */

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xf8

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

-static void x86emuOp_clc(u8 X86EMU_UNUSED(op1))

-{

-    /* clear the carry flag. */

-    START_OF_INSTR();

-    DECODE_PRINTF("CLC\n");

-    TRACE_AND_STEP();

-    CLEAR_FLAG(F_CF);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xf9

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

-static void x86emuOp_stc(u8 X86EMU_UNUSED(op1))

-{

-    /* set the carry flag. */

-    START_OF_INSTR();

-    DECODE_PRINTF("STC\n");

-    TRACE_AND_STEP();

-    SET_FLAG(F_CF);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xfa

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

-static void x86emuOp_cli(u8 X86EMU_UNUSED(op1))

-{

-    /* clear interrupts. */

-    START_OF_INSTR();

-    DECODE_PRINTF("CLI\n");

-    TRACE_AND_STEP();

-    CLEAR_FLAG(F_IF);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xfb

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

-static void x86emuOp_sti(u8 X86EMU_UNUSED(op1))

-{

-    /* enable  interrupts. */

-    START_OF_INSTR();

-    DECODE_PRINTF("STI\n");

-    TRACE_AND_STEP();

-    SET_FLAG(F_IF);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xfc

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

-static void x86emuOp_cld(u8 X86EMU_UNUSED(op1))

-{

-    /* clear interrupts. */

-    START_OF_INSTR();

-    DECODE_PRINTF("CLD\n");

-    TRACE_AND_STEP();

-    CLEAR_FLAG(F_DF);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xfd

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

-static void x86emuOp_std(u8 X86EMU_UNUSED(op1))

-{

-    /* clear interrupts. */

-    START_OF_INSTR();

-    DECODE_PRINTF("STD\n");

-    TRACE_AND_STEP();

-    SET_FLAG(F_DF);

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xfe

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

-static void x86emuOp_opcFE_byte_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rh, rl;

-    u8 destval;

-    uint destoffset;

-    u8 *destreg;

-

-    /* Yet another special case instruction. */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the 

-           above test is done twice. */

-

-        switch (rh) {

-        case 0:

-            DECODE_PRINTF("INC\t");

-            break;

-        case 1:

-            DECODE_PRINTF("DEC\t");

-            break;

-        case 2:

-        case 3:

-        case 4:

-        case 5:

-        case 6:

-        case 7:

-            DECODE_PRINTF2("ILLEGAL OP MAJOR OP 0xFE MINOR OP %x \n", mod);

-            HALT_SYS();

-            break;

-        }

-    }

-#endif

-    switch (mod) {

-    case 0:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF("\n");

-        switch (rh) {

-        case 0:         /* inc word ptr ... */

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = inc_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        case 1:         /* dec word ptr ... */

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = dec_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        }

-        break;

-    case 1:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF("\n");

-        switch (rh) {

-        case 0:

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = inc_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        case 1:

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = dec_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        }

-        break;

-    case 2:

-        DECODE_PRINTF("BYTE PTR ");

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF("\n");

-        switch (rh) {

-        case 0:

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = inc_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        case 1:

-            destval = fetch_data_byte(destoffset);

-            TRACE_AND_STEP();

-            destval = dec_byte(destval);

-            store_data_byte(destoffset, destval);

-            break;

-        }

-        break;

-    case 3:

-        destreg = DECODE_RM_BYTE_REGISTER(rl);

-        DECODE_PRINTF("\n");

-        switch (rh) {

-        case 0:

-            TRACE_AND_STEP();

-            *destreg = inc_byte(*destreg);

-            break;

-        case 1:

-            TRACE_AND_STEP();

-            *destreg = dec_byte(*destreg);

-            break;

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

-REMARKS:

-Handles opcode 0xff

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

-static void x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))

-{

-    int mod, rh, rl;

-    uint destoffset = 0;

-	u16 *destreg;

-	u16 destval,destval2;

-

-    /* Yet another special case instruction. */

-    START_OF_INSTR();

-    FETCH_DECODE_MODRM(mod, rh, rl);

-#ifdef DEBUG

-    if (DEBUG_DECODE()) {

-        /* XXX DECODE_PRINTF may be changed to something more

-           general, so that it is important to leave the strings

-           in the same format, even though the result is that the

-           above test is done twice. */

-

-        switch (rh) {

-        case 0:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                DECODE_PRINTF("INC\tDWORD PTR ");

-            } else {

-                DECODE_PRINTF("INC\tWORD PTR ");

-            }

-            break;

-        case 1:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                DECODE_PRINTF("DEC\tDWORD PTR ");

-            } else {

-                DECODE_PRINTF("DEC\tWORD PTR ");

-            }

-            break;

-        case 2:

-            DECODE_PRINTF("CALL\t");

-            break;

-        case 3:

-            DECODE_PRINTF("CALL\tFAR ");

-            break;

-        case 4:

-            DECODE_PRINTF("JMP\t");

-            break;

-        case 5:

-            DECODE_PRINTF("JMP\tFAR ");

-            break;

-        case 6:

-            DECODE_PRINTF("PUSH\t");

-            break;

-        case 7:

-            DECODE_PRINTF("ILLEGAL DECODING OF OPCODE FF\t");

-            HALT_SYS();

-            break;

-        }

-    }

-#endif

-    switch (mod) {

-    case 0:

-        destoffset = decode_rm00_address(rl);

-        DECODE_PRINTF("\n");

-        switch (rh) {

-        case 0:         /* inc word ptr ... */

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = inc_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = inc_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 1:         /* dec word ptr ... */

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = dec_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = dec_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 2:         /* call word ptr ... */

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            push_word(M.x86.R_IP);

-            M.x86.R_IP = destval;

-            break;

-        case 3:         /* call far ptr ... */

-            destval = fetch_data_word(destoffset);

-            destval2 = fetch_data_word(destoffset + 2);

-            TRACE_AND_STEP();

-            push_word(M.x86.R_CS);

-            M.x86.R_CS = destval2;

-            push_word(M.x86.R_IP);

-            M.x86.R_IP = destval;

-            break;

-        case 4:         /* jmp word ptr ... */

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            M.x86.R_IP = destval;

-            break;

-        case 5:         /* jmp far ptr ... */

-            destval = fetch_data_word(destoffset);

-            destval2 = fetch_data_word(destoffset + 2);

-            TRACE_AND_STEP();

-            M.x86.R_IP = destval;

-            M.x86.R_CS = destval2;

-            break;

-        case 6:         /*  push word ptr ... */

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                push_long(destval);

-            } else {

-                u16 destval;

-

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                push_word(destval);

-            }

-            break;

-        }

-        break;

-    case 1:

-        destoffset = decode_rm01_address(rl);

-        DECODE_PRINTF("\n");

-        switch (rh) {

-        case 0:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = inc_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = inc_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 1:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = dec_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = dec_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 2:         /* call word ptr ... */

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            push_word(M.x86.R_IP);

-            M.x86.R_IP = destval;

-            break;

-        case 3:         /* call far ptr ... */

-            destval = fetch_data_word(destoffset);

-            destval2 = fetch_data_word(destoffset + 2);

-            TRACE_AND_STEP();

-            push_word(M.x86.R_CS);

-            M.x86.R_CS = destval2;

-            push_word(M.x86.R_IP);

-            M.x86.R_IP = destval;

-            break;

-        case 4:         /* jmp word ptr ... */

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            M.x86.R_IP = destval;

-            break;

-        case 5:         /* jmp far ptr ... */

-            destval = fetch_data_word(destoffset);

-            destval2 = fetch_data_word(destoffset + 2);

-            TRACE_AND_STEP();

-            M.x86.R_IP = destval;

-            M.x86.R_CS = destval2;

-            break;

-        case 6:         /*  push word ptr ... */

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                push_long(destval);

-            } else {

-                u16 destval;

-

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                push_word(destval);

-            }

-            break;

-        }

-        break;

-    case 2:

-        destoffset = decode_rm10_address(rl);

-        DECODE_PRINTF("\n");

-        switch (rh) {

-        case 0:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = inc_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = inc_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 1:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                destval = dec_long(destval);

-                store_data_long(destoffset, destval);

-            } else {

-                u16 destval;

-

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                destval = dec_word(destval);

-                store_data_word(destoffset, destval);

-            }

-            break;

-        case 2:         /* call word ptr ... */

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            push_word(M.x86.R_IP);

-            M.x86.R_IP = destval;

-            break;

-        case 3:         /* call far ptr ... */

-            destval = fetch_data_word(destoffset);

-            destval2 = fetch_data_word(destoffset + 2);

-            TRACE_AND_STEP();

-            push_word(M.x86.R_CS);

-            M.x86.R_CS = destval2;

-            push_word(M.x86.R_IP);

-            M.x86.R_IP = destval;

-            break;

-        case 4:         /* jmp word ptr ... */

-            destval = fetch_data_word(destoffset);

-            TRACE_AND_STEP();

-            M.x86.R_IP = destval;

-            break;

-        case 5:         /* jmp far ptr ... */

-            destval = fetch_data_word(destoffset);

-            destval2 = fetch_data_word(destoffset + 2);

-            TRACE_AND_STEP();

-            M.x86.R_IP = destval;

-            M.x86.R_CS = destval2;

-            break;

-        case 6:         /*  push word ptr ... */

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 destval;

-

-                destval = fetch_data_long(destoffset);

-                TRACE_AND_STEP();

-                push_long(destval);

-            } else {

-                u16 destval;

-

-                destval = fetch_data_word(destoffset);

-                TRACE_AND_STEP();

-                push_word(destval);

-            }

-            break;

-        }

-        break;

-    case 3:

-        switch (rh) {

-        case 0:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 *destreg;

-

-                destreg = DECODE_RM_LONG_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                *destreg = inc_long(*destreg);

-            } else {

-                u16 *destreg;

-

-                destreg = DECODE_RM_WORD_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                *destreg = inc_word(*destreg);

-            }

-            break;

-        case 1:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 *destreg;

-

-                destreg = DECODE_RM_LONG_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                *destreg = dec_long(*destreg);

-            } else {

-                u16 *destreg;

-

-                destreg = DECODE_RM_WORD_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                *destreg = dec_word(*destreg);

-            }

-            break;

-        case 2:         /* call word ptr ... */

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            push_word(M.x86.R_IP);

-            M.x86.R_IP = *destreg;

-            break;

-        case 3:         /* jmp far ptr ... */

-            DECODE_PRINTF("OPERATION UNDEFINED 0XFF \n");

-            TRACE_AND_STEP();

-            HALT_SYS();

-            break;

-

-        case 4:         /* jmp  ... */

-            destreg = DECODE_RM_WORD_REGISTER(rl);

-            DECODE_PRINTF("\n");

-            TRACE_AND_STEP();

-            M.x86.R_IP = (u16) (*destreg);

-            break;

-        case 5:         /* jmp far ptr ... */

-            DECODE_PRINTF("OPERATION UNDEFINED 0XFF \n");

-            TRACE_AND_STEP();

-            HALT_SYS();

-            break;

-        case 6:

-            if (M.x86.mode & SYSMODE_PREFIX_DATA) {

-                u32 *destreg;

-

-                destreg = DECODE_RM_LONG_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                push_long(*destreg);

-            } else {

-                u16 *destreg;

-

-                destreg = DECODE_RM_WORD_REGISTER(rl);

-                DECODE_PRINTF("\n");

-                TRACE_AND_STEP();

-                push_word(*destreg);

-            }

-            break;

-        }

-        break;

-    }

-    DECODE_CLEAR_SEGOVR();

-    END_OF_INSTR();

-}

-

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

- * Single byte operation code table:

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

-void (*x86emu_optab[256])(u8) =

-{

-/*  0x00 */ x86emuOp_add_byte_RM_R,

-/*  0x01 */ x86emuOp_add_word_RM_R,

-/*  0x02 */ x86emuOp_add_byte_R_RM,

-/*  0x03 */ x86emuOp_add_word_R_RM,

-/*  0x04 */ x86emuOp_add_byte_AL_IMM,

-/*  0x05 */ x86emuOp_add_word_AX_IMM,

-/*  0x06 */ x86emuOp_push_ES,

-/*  0x07 */ x86emuOp_pop_ES,

-

-/*  0x08 */ x86emuOp_or_byte_RM_R,

-/*  0x09 */ x86emuOp_or_word_RM_R,

-/*  0x0a */ x86emuOp_or_byte_R_RM,

-/*  0x0b */ x86emuOp_or_word_R_RM,

-/*  0x0c */ x86emuOp_or_byte_AL_IMM,

-/*  0x0d */ x86emuOp_or_word_AX_IMM,

-/*  0x0e */ x86emuOp_push_CS,

-/*  0x0f */ x86emuOp_two_byte,

-

-/*  0x10 */ x86emuOp_adc_byte_RM_R,

-/*  0x11 */ x86emuOp_adc_word_RM_R,

-/*  0x12 */ x86emuOp_adc_byte_R_RM,

-/*  0x13 */ x86emuOp_adc_word_R_RM,

-/*  0x14 */ x86emuOp_adc_byte_AL_IMM,

-/*  0x15 */ x86emuOp_adc_word_AX_IMM,

-/*  0x16 */ x86emuOp_push_SS,

-/*  0x17 */ x86emuOp_pop_SS,

-

-/*  0x18 */ x86emuOp_sbb_byte_RM_R,

-/*  0x19 */ x86emuOp_sbb_word_RM_R,

-/*  0x1a */ x86emuOp_sbb_byte_R_RM,

-/*  0x1b */ x86emuOp_sbb_word_R_RM,

-/*  0x1c */ x86emuOp_sbb_byte_AL_IMM,

-/*  0x1d */ x86emuOp_sbb_word_AX_IMM,

-/*  0x1e */ x86emuOp_push_DS,

-/*  0x1f */ x86emuOp_pop_DS,

-

-/*  0x20 */ x86emuOp_and_byte_RM_R,

-/*  0x21 */ x86emuOp_and_word_RM_R,

-/*  0x22 */ x86emuOp_and_byte_R_RM,

-/*  0x23 */ x86emuOp_and_word_R_RM,

-/*  0x24 */ x86emuOp_and_byte_AL_IMM,

-/*  0x25 */ x86emuOp_and_word_AX_IMM,

-/*  0x26 */ x86emuOp_segovr_ES,

-/*  0x27 */ x86emuOp_daa,

-

-/*  0x28 */ x86emuOp_sub_byte_RM_R,

-/*  0x29 */ x86emuOp_sub_word_RM_R,

-/*  0x2a */ x86emuOp_sub_byte_R_RM,

-/*  0x2b */ x86emuOp_sub_word_R_RM,

-/*  0x2c */ x86emuOp_sub_byte_AL_IMM,

-/*  0x2d */ x86emuOp_sub_word_AX_IMM,

-/*  0x2e */ x86emuOp_segovr_CS,

-/*  0x2f */ x86emuOp_das,

-

-/*  0x30 */ x86emuOp_xor_byte_RM_R,

-/*  0x31 */ x86emuOp_xor_word_RM_R,

-/*  0x32 */ x86emuOp_xor_byte_R_RM,

-/*  0x33 */ x86emuOp_xor_word_R_RM,

-/*  0x34 */ x86emuOp_xor_byte_AL_IMM,

-/*  0x35 */ x86emuOp_xor_word_AX_IMM,

-/*  0x36 */ x86emuOp_segovr_SS,

-/*  0x37 */ x86emuOp_aaa,

-

-/*  0x38 */ x86emuOp_cmp_byte_RM_R,

-/*  0x39 */ x86emuOp_cmp_word_RM_R,

-/*  0x3a */ x86emuOp_cmp_byte_R_RM,

-/*  0x3b */ x86emuOp_cmp_word_R_RM,

-/*  0x3c */ x86emuOp_cmp_byte_AL_IMM,

-/*  0x3d */ x86emuOp_cmp_word_AX_IMM,

-/*  0x3e */ x86emuOp_segovr_DS,

-/*  0x3f */ x86emuOp_aas,

-

-/*  0x40 */ x86emuOp_inc_AX,

-/*  0x41 */ x86emuOp_inc_CX,

-/*  0x42 */ x86emuOp_inc_DX,

-/*  0x43 */ x86emuOp_inc_BX,

-/*  0x44 */ x86emuOp_inc_SP,

-/*  0x45 */ x86emuOp_inc_BP,

-/*  0x46 */ x86emuOp_inc_SI,

-/*  0x47 */ x86emuOp_inc_DI,

-

-/*  0x48 */ x86emuOp_dec_AX,

-/*  0x49 */ x86emuOp_dec_CX,

-/*  0x4a */ x86emuOp_dec_DX,

-/*  0x4b */ x86emuOp_dec_BX,

-/*  0x4c */ x86emuOp_dec_SP,

-/*  0x4d */ x86emuOp_dec_BP,

-/*  0x4e */ x86emuOp_dec_SI,

-/*  0x4f */ x86emuOp_dec_DI,

-

-/*  0x50 */ x86emuOp_push_AX,

-/*  0x51 */ x86emuOp_push_CX,

-/*  0x52 */ x86emuOp_push_DX,

-/*  0x53 */ x86emuOp_push_BX,

-/*  0x54 */ x86emuOp_push_SP,

-/*  0x55 */ x86emuOp_push_BP,

-/*  0x56 */ x86emuOp_push_SI,

-/*  0x57 */ x86emuOp_push_DI,

-

-/*  0x58 */ x86emuOp_pop_AX,

-/*  0x59 */ x86emuOp_pop_CX,

-/*  0x5a */ x86emuOp_pop_DX,

-/*  0x5b */ x86emuOp_pop_BX,

-/*  0x5c */ x86emuOp_pop_SP,

-/*  0x5d */ x86emuOp_pop_BP,

-/*  0x5e */ x86emuOp_pop_SI,

-/*  0x5f */ x86emuOp_pop_DI,

-

-/*  0x60 */ x86emuOp_push_all,

-/*  0x61 */ x86emuOp_pop_all,

-/*  0x62 */ x86emuOp_illegal_op,   /* bound */

-/*  0x63 */ x86emuOp_illegal_op,   /* arpl */

-/*  0x64 */ x86emuOp_segovr_FS,

-/*  0x65 */ x86emuOp_segovr_GS,

-/*  0x66 */ x86emuOp_prefix_data,

-/*  0x67 */ x86emuOp_prefix_addr,

-

-/*  0x68 */ x86emuOp_push_word_IMM,

-/*  0x69 */ x86emuOp_imul_word_IMM,

-/*  0x6a */ x86emuOp_push_byte_IMM,

-/*  0x6b */ x86emuOp_imul_byte_IMM,

-/*  0x6c */ x86emuOp_ins_byte,

-/*  0x6d */ x86emuOp_ins_word,

-/*  0x6e */ x86emuOp_outs_byte,

-/*  0x6f */ x86emuOp_outs_word,

-

-/*  0x70 */ x86emuOp_jump_near_O,

-/*  0x71 */ x86emuOp_jump_near_NO,

-/*  0x72 */ x86emuOp_jump_near_B,

-/*  0x73 */ x86emuOp_jump_near_NB,

-/*  0x74 */ x86emuOp_jump_near_Z,

-/*  0x75 */ x86emuOp_jump_near_NZ,

-/*  0x76 */ x86emuOp_jump_near_BE,

-/*  0x77 */ x86emuOp_jump_near_NBE,

-

-/*  0x78 */ x86emuOp_jump_near_S,

-/*  0x79 */ x86emuOp_jump_near_NS,

-/*  0x7a */ x86emuOp_jump_near_P,

-/*  0x7b */ x86emuOp_jump_near_NP,

-/*  0x7c */ x86emuOp_jump_near_L,

-/*  0x7d */ x86emuOp_jump_near_NL,

-/*  0x7e */ x86emuOp_jump_near_LE,

-/*  0x7f */ x86emuOp_jump_near_NLE,

-

-/*  0x80 */ x86emuOp_opc80_byte_RM_IMM,

-/*  0x81 */ x86emuOp_opc81_word_RM_IMM,

-/*  0x82 */ x86emuOp_opc82_byte_RM_IMM,

-/*  0x83 */ x86emuOp_opc83_word_RM_IMM,

-/*  0x84 */ x86emuOp_test_byte_RM_R,

-/*  0x85 */ x86emuOp_test_word_RM_R,

-/*  0x86 */ x86emuOp_xchg_byte_RM_R,

-/*  0x87 */ x86emuOp_xchg_word_RM_R,

-

-/*  0x88 */ x86emuOp_mov_byte_RM_R,

-/*  0x89 */ x86emuOp_mov_word_RM_R,

-/*  0x8a */ x86emuOp_mov_byte_R_RM,

-/*  0x8b */ x86emuOp_mov_word_R_RM,

-/*  0x8c */ x86emuOp_mov_word_RM_SR,

-/*  0x8d */ x86emuOp_lea_word_R_M,

-/*  0x8e */ x86emuOp_mov_word_SR_RM,

-/*  0x8f */ x86emuOp_pop_RM,

-

-/*  0x90 */ x86emuOp_nop,

-/*  0x91 */ x86emuOp_xchg_word_AX_CX,

-/*  0x92 */ x86emuOp_xchg_word_AX_DX,

-/*  0x93 */ x86emuOp_xchg_word_AX_BX,

-/*  0x94 */ x86emuOp_xchg_word_AX_SP,

-/*  0x95 */ x86emuOp_xchg_word_AX_BP,

-/*  0x96 */ x86emuOp_xchg_word_AX_SI,

-/*  0x97 */ x86emuOp_xchg_word_AX_DI,

-

-/*  0x98 */ x86emuOp_cbw,

-/*  0x99 */ x86emuOp_cwd,

-/*  0x9a */ x86emuOp_call_far_IMM,

-/*  0x9b */ x86emuOp_wait,

-/*  0x9c */ x86emuOp_pushf_word,

-/*  0x9d */ x86emuOp_popf_word,

-/*  0x9e */ x86emuOp_sahf,

-/*  0x9f */ x86emuOp_lahf,

-

-/*  0xa0 */ x86emuOp_mov_AL_M_IMM,

-/*  0xa1 */ x86emuOp_mov_AX_M_IMM,

-/*  0xa2 */ x86emuOp_mov_M_AL_IMM,

-/*  0xa3 */ x86emuOp_mov_M_AX_IMM,

-/*  0xa4 */ x86emuOp_movs_byte,

-/*  0xa5 */ x86emuOp_movs_word,

-/*  0xa6 */ x86emuOp_cmps_byte,

-/*  0xa7 */ x86emuOp_cmps_word,

-/*  0xa8 */ x86emuOp_test_AL_IMM,

-/*  0xa9 */ x86emuOp_test_AX_IMM,

-/*  0xaa */ x86emuOp_stos_byte,

-/*  0xab */ x86emuOp_stos_word,

-/*  0xac */ x86emuOp_lods_byte,

-/*  0xad */ x86emuOp_lods_word,

-/*  0xac */ x86emuOp_scas_byte,

-/*  0xad */ x86emuOp_scas_word,

-

-

-/*  0xb0 */ x86emuOp_mov_byte_AL_IMM,

-/*  0xb1 */ x86emuOp_mov_byte_CL_IMM,

-/*  0xb2 */ x86emuOp_mov_byte_DL_IMM,

-/*  0xb3 */ x86emuOp_mov_byte_BL_IMM,

-/*  0xb4 */ x86emuOp_mov_byte_AH_IMM,

-/*  0xb5 */ x86emuOp_mov_byte_CH_IMM,

-/*  0xb6 */ x86emuOp_mov_byte_DH_IMM,

-/*  0xb7 */ x86emuOp_mov_byte_BH_IMM,

-

-/*  0xb8 */ x86emuOp_mov_word_AX_IMM,

-/*  0xb9 */ x86emuOp_mov_word_CX_IMM,

-/*  0xba */ x86emuOp_mov_word_DX_IMM,

-/*  0xbb */ x86emuOp_mov_word_BX_IMM,

-/*  0xbc */ x86emuOp_mov_word_SP_IMM,

-/*  0xbd */ x86emuOp_mov_word_BP_IMM,

-/*  0xbe */ x86emuOp_mov_word_SI_IMM,

-/*  0xbf */ x86emuOp_mov_word_DI_IMM,

-

-/*  0xc0 */ x86emuOp_opcC0_byte_RM_MEM,

-/*  0xc1 */ x86emuOp_opcC1_word_RM_MEM,

-/*  0xc2 */ x86emuOp_ret_near_IMM,

-/*  0xc3 */ x86emuOp_ret_near,

-/*  0xc4 */ x86emuOp_les_R_IMM,

-/*  0xc5 */ x86emuOp_lds_R_IMM,

-/*  0xc6 */ x86emuOp_mov_byte_RM_IMM,

-/*  0xc7 */ x86emuOp_mov_word_RM_IMM,

-/*  0xc8 */ x86emuOp_enter,

-/*  0xc9 */ x86emuOp_leave,

-/*  0xca */ x86emuOp_ret_far_IMM,

-/*  0xcb */ x86emuOp_ret_far,

-/*  0xcc */ x86emuOp_int3,

-/*  0xcd */ x86emuOp_int_IMM,

-/*  0xce */ x86emuOp_into,

-/*  0xcf */ x86emuOp_iret,

-

-/*  0xd0 */ x86emuOp_opcD0_byte_RM_1,

-/*  0xd1 */ x86emuOp_opcD1_word_RM_1,

-/*  0xd2 */ x86emuOp_opcD2_byte_RM_CL,

-/*  0xd3 */ x86emuOp_opcD3_word_RM_CL,

-/*  0xd4 */ x86emuOp_aam,

-/*  0xd5 */ x86emuOp_aad,

-/*  0xd6 */ x86emuOp_illegal_op,   /* Undocumented SETALC instruction */

-/*  0xd7 */ x86emuOp_xlat,

-/*  0xd8 */ x86emuOp_esc_coprocess_d8,

-/*  0xd9 */ x86emuOp_esc_coprocess_d9,

-/*  0xda */ x86emuOp_esc_coprocess_da,

-/*  0xdb */ x86emuOp_esc_coprocess_db,

-/*  0xdc */ x86emuOp_esc_coprocess_dc,

-/*  0xdd */ x86emuOp_esc_coprocess_dd,

-/*  0xde */ x86emuOp_esc_coprocess_de,

-/*  0xdf */ x86emuOp_esc_coprocess_df,

-

-/*  0xe0 */ x86emuOp_loopne,

-/*  0xe1 */ x86emuOp_loope,

-/*  0xe2 */ x86emuOp_loop,

-/*  0xe3 */ x86emuOp_jcxz,

-/*  0xe4 */ x86emuOp_in_byte_AL_IMM,

-/*  0xe5 */ x86emuOp_in_word_AX_IMM,

-/*  0xe6 */ x86emuOp_out_byte_IMM_AL,

-/*  0xe7 */ x86emuOp_out_word_IMM_AX,

-

-/*  0xe8 */ x86emuOp_call_near_IMM,

-/*  0xe9 */ x86emuOp_jump_near_IMM,

-/*  0xea */ x86emuOp_jump_far_IMM,

-/*  0xeb */ x86emuOp_jump_byte_IMM,

-/*  0xec */ x86emuOp_in_byte_AL_DX,

-/*  0xed */ x86emuOp_in_word_AX_DX,

-/*  0xee */ x86emuOp_out_byte_DX_AL,

-/*  0xef */ x86emuOp_out_word_DX_AX,

-

-/*  0xf0 */ x86emuOp_lock,

-/*  0xf1 */ x86emuOp_illegal_op,

-/*  0xf2 */ x86emuOp_repne,

-/*  0xf3 */ x86emuOp_repe,

-/*  0xf4 */ x86emuOp_halt,

-/*  0xf5 */ x86emuOp_cmc,

-/*  0xf6 */ x86emuOp_opcF6_byte_RM,

-/*  0xf7 */ x86emuOp_opcF7_word_RM,

-

-/*  0xf8 */ x86emuOp_clc,

-/*  0xf9 */ x86emuOp_stc,

-/*  0xfa */ x86emuOp_cli,

-/*  0xfb */ x86emuOp_sti,

-/*  0xfc */ x86emuOp_cld,

-/*  0xfd */ x86emuOp_std,

-/*  0xfe */ x86emuOp_opcFE_byte_RM,

-/*  0xff */ x86emuOp_opcFF_word_RM,

-};

+/****************************************************************************
+*
+*						Realmode X86 Emulator Library
+*
+*            	Copyright (C) 1996-1999 SciTech Software, Inc.
+* 				     Copyright (C) David Mosberger-Tang
+* 					   Copyright (C) 1999 Egbert Eich
+*
+*  ========================================================================
+*
+*  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 the authors not be used
+*  in advertising or publicity pertaining to distribution of the software
+*  without specific, written prior permission.  The authors makes no
+*  representations about the suitability of this software for any purpose.
+*  It is provided "as is" without express or implied warranty.
+*
+*  THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+*  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+*  EVENT SHALL THE AUTHORS 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.
+*
+*  ========================================================================
+*
+* Language:		ANSI C
+* Environment:	Any
+* Developer:    Kendall Bennett
+*
+* Description:  This file includes subroutines to implement the decoding
+*               and emulation of all the x86 processor instructions.
+*
+* There are approximately 250 subroutines in here, which correspond
+* to the 256 byte-"opcodes" found on the 8086.  The table which
+* dispatches this is found in the files optab.[ch].
+*
+* Each opcode proc has a comment preceeding it which gives it's table
+* address.  Several opcodes are missing (undefined) in the table.
+*
+* Each proc includes information for decoding (DECODE_PRINTF and
+* DECODE_PRINTF2), debugging (TRACE_REGS, SINGLE_STEP), and misc
+* functions (START_OF_INSTR, END_OF_INSTR).
+*
+* Many of the procedures are *VERY* similar in coding.  This has
+* allowed for a very large amount of code to be generated in a fairly
+* short amount of time (i.e. cut, paste, and modify).  The result is
+* that much of the code below could have been folded into subroutines
+* for a large reduction in size of this file.  The downside would be
+* that there would be a penalty in execution speed.  The file could
+* also have been *MUCH* larger by inlining certain functions which
+* were called.  This could have resulted even faster execution.  The
+* prime directive I used to decide whether to inline the code or to
+* modularize it, was basically: 1) no unnecessary subroutine calls,
+* 2) no routines more than about 200 lines in size, and 3) modularize
+* any code that I might not get right the first time.  The fetch_*
+* subroutines fall into the latter category.  The The decode_* fall
+* into the second category.  The coding of the "switch(mod){ .... }"
+* in many of the subroutines below falls into the first category.
+* Especially, the coding of {add,and,or,sub,...}_{byte,word}
+* subroutines are an especially glaring case of the third guideline.
+* Since so much of the code is cloned from other modules (compare
+* opcode #00 to opcode #01), making the basic operations subroutine
+* calls is especially important; otherwise mistakes in coding an
+* "add" would represent a nightmare in maintenance.
+*
+****************************************************************************/
+
+#include "x86emu/x86emui.h"
+
+/*----------------------------- Implementation ----------------------------*/
+
+/****************************************************************************
+PARAMETERS:
+op1 - Instruction op code
+
+REMARKS:
+Handles illegal opcodes.
+****************************************************************************/
+static void
+x86emuOp_illegal_op(u8 op1)
+{
+    START_OF_INSTR();
+    if (M.x86.R_SP != 0) {
+        DECODE_PRINTF("ILLEGAL X86 OPCODE\n");
+        TRACE_REGS();
+        DB(printk("%04x:%04x: %02X ILLEGAL X86 OPCODE!\n",
+                  M.x86.R_CS, M.x86.R_IP - 1, op1));
+        HALT_SYS();
+    }
+    else {
+        /* If we get here, it means the stack pointer is back to zero
+         * so we are just returning from an emulator service call
+         * so therte is no need to display an error message. We trap
+         * the emulator with an 0xF1 opcode to finish the service
+         * call.
+         */
+        X86EMU_halt_sys();
+    }
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x00
+****************************************************************************/
+static void
+x86emuOp_add_byte_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+    u8 *destreg, *srcreg;
+    u8 destval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("ADD\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = add_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = add_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = add_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = add_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x01
+****************************************************************************/
+static void
+x86emuOp_add_word_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("ADD\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = add_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = add_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = add_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = add_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = add_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = add_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = add_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = add_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x02
+****************************************************************************/
+static void
+x86emuOp_add_byte_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint srcoffset;
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("ADD\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = add_byte(*destreg, srcval);
+        break;
+    case 1:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = add_byte(*destreg, srcval);
+        break;
+    case 2:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = add_byte(*destreg, srcval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = add_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x03
+****************************************************************************/
+static void
+x86emuOp_add_word_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("ADD\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = add_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = add_word(*destreg, srcval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = add_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = add_word(*destreg, srcval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = add_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = add_word(*destreg, srcval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = add_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = add_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x04
+****************************************************************************/
+static void
+x86emuOp_add_byte_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("ADD\tAL,");
+    srcval = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    M.x86.R_AL = add_byte(M.x86.R_AL, srcval);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x05
+****************************************************************************/
+static void
+x86emuOp_add_word_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("ADD\tEAX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("ADD\tAX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = add_long(M.x86.R_EAX, srcval);
+    }
+    else {
+        M.x86.R_AX = add_word(M.x86.R_AX, (u16) srcval);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x06
+****************************************************************************/
+static void
+x86emuOp_push_ES(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("PUSH\tES\n");
+    TRACE_AND_STEP();
+    push_word(M.x86.R_ES);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x07
+****************************************************************************/
+static void
+x86emuOp_pop_ES(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("POP\tES\n");
+    TRACE_AND_STEP();
+    M.x86.R_ES = pop_word();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x08
+****************************************************************************/
+static void
+x86emuOp_or_byte_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint destoffset;
+    u8 destval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("OR\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = or_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = or_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = or_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = or_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x09
+****************************************************************************/
+static void
+x86emuOp_or_word_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("OR\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = or_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = or_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = or_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = or_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = or_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = or_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = or_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = or_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x0a
+****************************************************************************/
+static void
+x86emuOp_or_byte_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint srcoffset;
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("OR\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = or_byte(*destreg, srcval);
+        break;
+    case 1:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = or_byte(*destreg, srcval);
+        break;
+    case 2:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = or_byte(*destreg, srcval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = or_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x0b
+****************************************************************************/
+static void
+x86emuOp_or_word_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("OR\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = or_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = or_word(*destreg, srcval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = or_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = or_word(*destreg, srcval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = or_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = or_word(*destreg, srcval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = or_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = or_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x0c
+****************************************************************************/
+static void
+x86emuOp_or_byte_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("OR\tAL,");
+    srcval = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    M.x86.R_AL = or_byte(M.x86.R_AL, srcval);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x0d
+****************************************************************************/
+static void
+x86emuOp_or_word_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("OR\tEAX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("OR\tAX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = or_long(M.x86.R_EAX, srcval);
+    }
+    else {
+        M.x86.R_AX = or_word(M.x86.R_AX, (u16) srcval);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x0e
+****************************************************************************/
+static void
+x86emuOp_push_CS(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("PUSH\tCS\n");
+    TRACE_AND_STEP();
+    push_word(M.x86.R_CS);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x0f. Escape for two-byte opcode (286 or better)
+****************************************************************************/
+static void
+x86emuOp_two_byte(u8 X86EMU_UNUSED(op1))
+{
+    u8 op2 = (*sys_rdb) (((u32) M.x86.R_CS << 4) + (M.x86.R_IP++));
+
+    INC_DECODED_INST_LEN(1);
+    (*x86emu_optab2[op2]) (op2);
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x10
+****************************************************************************/
+static void
+x86emuOp_adc_byte_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint destoffset;
+    u8 destval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("ADC\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = adc_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = adc_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = adc_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = adc_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x11
+****************************************************************************/
+static void
+x86emuOp_adc_word_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("ADC\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = adc_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = adc_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = adc_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = adc_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = adc_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = adc_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = adc_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = adc_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x12
+****************************************************************************/
+static void
+x86emuOp_adc_byte_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint srcoffset;
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("ADC\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = adc_byte(*destreg, srcval);
+        break;
+    case 1:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = adc_byte(*destreg, srcval);
+        break;
+    case 2:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = adc_byte(*destreg, srcval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = adc_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x13
+****************************************************************************/
+static void
+x86emuOp_adc_word_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("ADC\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = adc_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = adc_word(*destreg, srcval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = adc_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = adc_word(*destreg, srcval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = adc_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = adc_word(*destreg, srcval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = adc_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = adc_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x14
+****************************************************************************/
+static void
+x86emuOp_adc_byte_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("ADC\tAL,");
+    srcval = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    M.x86.R_AL = adc_byte(M.x86.R_AL, srcval);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x15
+****************************************************************************/
+static void
+x86emuOp_adc_word_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("ADC\tEAX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("ADC\tAX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = adc_long(M.x86.R_EAX, srcval);
+    }
+    else {
+        M.x86.R_AX = adc_word(M.x86.R_AX, (u16) srcval);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x16
+****************************************************************************/
+static void
+x86emuOp_push_SS(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("PUSH\tSS\n");
+    TRACE_AND_STEP();
+    push_word(M.x86.R_SS);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x17
+****************************************************************************/
+static void
+x86emuOp_pop_SS(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("POP\tSS\n");
+    TRACE_AND_STEP();
+    M.x86.R_SS = pop_word();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x18
+****************************************************************************/
+static void
+x86emuOp_sbb_byte_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint destoffset;
+    u8 destval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("SBB\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = sbb_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = sbb_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = sbb_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = sbb_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x19
+****************************************************************************/
+static void
+x86emuOp_sbb_word_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("SBB\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sbb_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sbb_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sbb_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sbb_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sbb_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sbb_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sbb_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sbb_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x1a
+****************************************************************************/
+static void
+x86emuOp_sbb_byte_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint srcoffset;
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("SBB\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = sbb_byte(*destreg, srcval);
+        break;
+    case 1:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = sbb_byte(*destreg, srcval);
+        break;
+    case 2:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = sbb_byte(*destreg, srcval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = sbb_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x1b
+****************************************************************************/
+static void
+x86emuOp_sbb_word_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("SBB\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sbb_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sbb_word(*destreg, srcval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sbb_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sbb_word(*destreg, srcval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sbb_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sbb_word(*destreg, srcval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sbb_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sbb_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x1c
+****************************************************************************/
+static void
+x86emuOp_sbb_byte_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("SBB\tAL,");
+    srcval = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    M.x86.R_AL = sbb_byte(M.x86.R_AL, srcval);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x1d
+****************************************************************************/
+static void
+x86emuOp_sbb_word_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("SBB\tEAX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("SBB\tAX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = sbb_long(M.x86.R_EAX, srcval);
+    }
+    else {
+        M.x86.R_AX = sbb_word(M.x86.R_AX, (u16) srcval);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x1e
+****************************************************************************/
+static void
+x86emuOp_push_DS(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("PUSH\tDS\n");
+    TRACE_AND_STEP();
+    push_word(M.x86.R_DS);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x1f
+****************************************************************************/
+static void
+x86emuOp_pop_DS(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("POP\tDS\n");
+    TRACE_AND_STEP();
+    M.x86.R_DS = pop_word();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x20
+****************************************************************************/
+static void
+x86emuOp_and_byte_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint destoffset;
+    u8 destval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("AND\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = and_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = and_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = and_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = and_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x21
+****************************************************************************/
+static void
+x86emuOp_and_word_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("AND\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = and_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = and_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = and_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = and_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = and_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = and_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = and_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = and_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x22
+****************************************************************************/
+static void
+x86emuOp_and_byte_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint srcoffset;
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("AND\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = and_byte(*destreg, srcval);
+        break;
+    case 1:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = and_byte(*destreg, srcval);
+        break;
+    case 2:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = and_byte(*destreg, srcval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = and_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x23
+****************************************************************************/
+static void
+x86emuOp_and_word_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("AND\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = and_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = and_word(*destreg, srcval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = and_long(*destreg, srcval);
+            break;
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = and_word(*destreg, srcval);
+            break;
+        }
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = and_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = and_word(*destreg, srcval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = and_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = and_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x24
+****************************************************************************/
+static void
+x86emuOp_and_byte_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("AND\tAL,");
+    srcval = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    M.x86.R_AL = and_byte(M.x86.R_AL, srcval);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x25
+****************************************************************************/
+static void
+x86emuOp_and_word_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("AND\tEAX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("AND\tAX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = and_long(M.x86.R_EAX, srcval);
+    }
+    else {
+        M.x86.R_AX = and_word(M.x86.R_AX, (u16) srcval);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x26
+****************************************************************************/
+static void
+x86emuOp_segovr_ES(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("ES:\n");
+    TRACE_AND_STEP();
+    M.x86.mode |= SYSMODE_SEGOVR_ES;
+    /*
+     * note the lack of DECODE_CLEAR_SEGOVR(r) since, here is one of 4
+     * opcode subroutines we do not want to do this.
+     */
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x27
+****************************************************************************/
+static void
+x86emuOp_daa(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("DAA\n");
+    TRACE_AND_STEP();
+    M.x86.R_AL = daa_byte(M.x86.R_AL);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x28
+****************************************************************************/
+static void
+x86emuOp_sub_byte_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint destoffset;
+    u8 destval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("SUB\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = sub_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = sub_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = sub_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = sub_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x29
+****************************************************************************/
+static void
+x86emuOp_sub_word_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("SUB\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sub_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sub_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sub_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sub_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sub_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = sub_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sub_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sub_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x2a
+****************************************************************************/
+static void
+x86emuOp_sub_byte_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint srcoffset;
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("SUB\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = sub_byte(*destreg, srcval);
+        break;
+    case 1:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = sub_byte(*destreg, srcval);
+        break;
+    case 2:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = sub_byte(*destreg, srcval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = sub_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x2b
+****************************************************************************/
+static void
+x86emuOp_sub_word_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("SUB\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sub_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sub_word(*destreg, srcval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sub_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sub_word(*destreg, srcval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sub_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sub_word(*destreg, srcval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sub_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = sub_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x2c
+****************************************************************************/
+static void
+x86emuOp_sub_byte_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("SUB\tAL,");
+    srcval = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    M.x86.R_AL = sub_byte(M.x86.R_AL, srcval);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x2d
+****************************************************************************/
+static void
+x86emuOp_sub_word_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("SUB\tEAX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("SUB\tAX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = sub_long(M.x86.R_EAX, srcval);
+    }
+    else {
+        M.x86.R_AX = sub_word(M.x86.R_AX, (u16) srcval);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x2e
+****************************************************************************/
+static void
+x86emuOp_segovr_CS(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("CS:\n");
+    TRACE_AND_STEP();
+    M.x86.mode |= SYSMODE_SEGOVR_CS;
+    /* note no DECODE_CLEAR_SEGOVR here. */
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x2f
+****************************************************************************/
+static void
+x86emuOp_das(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("DAS\n");
+    TRACE_AND_STEP();
+    M.x86.R_AL = das_byte(M.x86.R_AL);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x30
+****************************************************************************/
+static void
+x86emuOp_xor_byte_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint destoffset;
+    u8 destval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("XOR\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = xor_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = xor_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = xor_byte(destval, *srcreg);
+        store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = xor_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x31
+****************************************************************************/
+static void
+x86emuOp_xor_word_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("XOR\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = xor_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = xor_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = xor_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = xor_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = xor_long(destval, *srcreg);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = xor_word(destval, *srcreg);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = xor_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = xor_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x32
+****************************************************************************/
+static void
+x86emuOp_xor_byte_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint srcoffset;
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("XOR\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = xor_byte(*destreg, srcval);
+        break;
+    case 1:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = xor_byte(*destreg, srcval);
+        break;
+    case 2:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = xor_byte(*destreg, srcval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = xor_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x33
+****************************************************************************/
+static void
+x86emuOp_xor_word_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("XOR\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = xor_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = xor_word(*destreg, srcval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = xor_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = xor_word(*destreg, srcval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = xor_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = xor_word(*destreg, srcval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = xor_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = xor_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x34
+****************************************************************************/
+static void
+x86emuOp_xor_byte_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("XOR\tAL,");
+    srcval = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    M.x86.R_AL = xor_byte(M.x86.R_AL, srcval);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x35
+****************************************************************************/
+static void
+x86emuOp_xor_word_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("XOR\tEAX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("XOR\tAX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = xor_long(M.x86.R_EAX, srcval);
+    }
+    else {
+        M.x86.R_AX = xor_word(M.x86.R_AX, (u16) srcval);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x36
+****************************************************************************/
+static void
+x86emuOp_segovr_SS(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("SS:\n");
+    TRACE_AND_STEP();
+    M.x86.mode |= SYSMODE_SEGOVR_SS;
+    /* no DECODE_CLEAR_SEGOVR ! */
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x37
+****************************************************************************/
+static void
+x86emuOp_aaa(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("AAA\n");
+    TRACE_AND_STEP();
+    M.x86.R_AX = aaa_word(M.x86.R_AX);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x38
+****************************************************************************/
+static void
+x86emuOp_cmp_byte_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+    u8 *destreg, *srcreg;
+    u8 destval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("CMP\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        cmp_byte(destval, *srcreg);
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        cmp_byte(destval, *srcreg);
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        cmp_byte(destval, *srcreg);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        cmp_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x39
+****************************************************************************/
+static void
+x86emuOp_cmp_word_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("CMP\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_long(destval, *srcreg);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_word(destval, *srcreg);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_long(destval, *srcreg);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_word(destval, *srcreg);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_long(destval, *srcreg);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_word(destval, *srcreg);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x3a
+****************************************************************************/
+static void
+x86emuOp_cmp_byte_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint srcoffset;
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("CMP\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        cmp_byte(*destreg, srcval);
+        break;
+    case 1:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        cmp_byte(*destreg, srcval);
+        break;
+    case 2:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        cmp_byte(*destreg, srcval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        cmp_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x3b
+****************************************************************************/
+static void
+x86emuOp_cmp_word_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("CMP\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_word(*destreg, srcval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_word(*destreg, srcval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_long(*destreg, srcval);
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_word(*destreg, srcval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            cmp_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x3c
+****************************************************************************/
+static void
+x86emuOp_cmp_byte_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("CMP\tAL,");
+    srcval = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    cmp_byte(M.x86.R_AL, srcval);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x3d
+****************************************************************************/
+static void
+x86emuOp_cmp_word_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("CMP\tEAX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("CMP\tAX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        cmp_long(M.x86.R_EAX, srcval);
+    }
+    else {
+        cmp_word(M.x86.R_AX, (u16) srcval);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x3e
+****************************************************************************/
+static void
+x86emuOp_segovr_DS(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("DS:\n");
+    TRACE_AND_STEP();
+    M.x86.mode |= SYSMODE_SEGOVR_DS;
+    /* NO DECODE_CLEAR_SEGOVR! */
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x3f
+****************************************************************************/
+static void
+x86emuOp_aas(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("AAS\n");
+    TRACE_AND_STEP();
+    M.x86.R_AX = aas_word(M.x86.R_AX);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x40
+****************************************************************************/
+static void
+x86emuOp_inc_AX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("INC\tEAX\n");
+    }
+    else {
+        DECODE_PRINTF("INC\tAX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = inc_long(M.x86.R_EAX);
+    }
+    else {
+        M.x86.R_AX = inc_word(M.x86.R_AX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x41
+****************************************************************************/
+static void
+x86emuOp_inc_CX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("INC\tECX\n");
+    }
+    else {
+        DECODE_PRINTF("INC\tCX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ECX = inc_long(M.x86.R_ECX);
+    }
+    else {
+        M.x86.R_CX = inc_word(M.x86.R_CX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x42
+****************************************************************************/
+static void
+x86emuOp_inc_DX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("INC\tEDX\n");
+    }
+    else {
+        DECODE_PRINTF("INC\tDX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EDX = inc_long(M.x86.R_EDX);
+    }
+    else {
+        M.x86.R_DX = inc_word(M.x86.R_DX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x43
+****************************************************************************/
+static void
+x86emuOp_inc_BX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("INC\tEBX\n");
+    }
+    else {
+        DECODE_PRINTF("INC\tBX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EBX = inc_long(M.x86.R_EBX);
+    }
+    else {
+        M.x86.R_BX = inc_word(M.x86.R_BX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x44
+****************************************************************************/
+static void
+x86emuOp_inc_SP(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("INC\tESP\n");
+    }
+    else {
+        DECODE_PRINTF("INC\tSP\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ESP = inc_long(M.x86.R_ESP);
+    }
+    else {
+        M.x86.R_SP = inc_word(M.x86.R_SP);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x45
+****************************************************************************/
+static void
+x86emuOp_inc_BP(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("INC\tEBP\n");
+    }
+    else {
+        DECODE_PRINTF("INC\tBP\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EBP = inc_long(M.x86.R_EBP);
+    }
+    else {
+        M.x86.R_BP = inc_word(M.x86.R_BP);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x46
+****************************************************************************/
+static void
+x86emuOp_inc_SI(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("INC\tESI\n");
+    }
+    else {
+        DECODE_PRINTF("INC\tSI\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ESI = inc_long(M.x86.R_ESI);
+    }
+    else {
+        M.x86.R_SI = inc_word(M.x86.R_SI);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x47
+****************************************************************************/
+static void
+x86emuOp_inc_DI(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("INC\tEDI\n");
+    }
+    else {
+        DECODE_PRINTF("INC\tDI\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EDI = inc_long(M.x86.R_EDI);
+    }
+    else {
+        M.x86.R_DI = inc_word(M.x86.R_DI);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x48
+****************************************************************************/
+static void
+x86emuOp_dec_AX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("DEC\tEAX\n");
+    }
+    else {
+        DECODE_PRINTF("DEC\tAX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = dec_long(M.x86.R_EAX);
+    }
+    else {
+        M.x86.R_AX = dec_word(M.x86.R_AX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x49
+****************************************************************************/
+static void
+x86emuOp_dec_CX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("DEC\tECX\n");
+    }
+    else {
+        DECODE_PRINTF("DEC\tCX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ECX = dec_long(M.x86.R_ECX);
+    }
+    else {
+        M.x86.R_CX = dec_word(M.x86.R_CX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x4a
+****************************************************************************/
+static void
+x86emuOp_dec_DX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("DEC\tEDX\n");
+    }
+    else {
+        DECODE_PRINTF("DEC\tDX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EDX = dec_long(M.x86.R_EDX);
+    }
+    else {
+        M.x86.R_DX = dec_word(M.x86.R_DX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x4b
+****************************************************************************/
+static void
+x86emuOp_dec_BX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("DEC\tEBX\n");
+    }
+    else {
+        DECODE_PRINTF("DEC\tBX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EBX = dec_long(M.x86.R_EBX);
+    }
+    else {
+        M.x86.R_BX = dec_word(M.x86.R_BX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x4c
+****************************************************************************/
+static void
+x86emuOp_dec_SP(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("DEC\tESP\n");
+    }
+    else {
+        DECODE_PRINTF("DEC\tSP\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ESP = dec_long(M.x86.R_ESP);
+    }
+    else {
+        M.x86.R_SP = dec_word(M.x86.R_SP);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x4d
+****************************************************************************/
+static void
+x86emuOp_dec_BP(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("DEC\tEBP\n");
+    }
+    else {
+        DECODE_PRINTF("DEC\tBP\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EBP = dec_long(M.x86.R_EBP);
+    }
+    else {
+        M.x86.R_BP = dec_word(M.x86.R_BP);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x4e
+****************************************************************************/
+static void
+x86emuOp_dec_SI(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("DEC\tESI\n");
+    }
+    else {
+        DECODE_PRINTF("DEC\tSI\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ESI = dec_long(M.x86.R_ESI);
+    }
+    else {
+        M.x86.R_SI = dec_word(M.x86.R_SI);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x4f
+****************************************************************************/
+static void
+x86emuOp_dec_DI(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("DEC\tEDI\n");
+    }
+    else {
+        DECODE_PRINTF("DEC\tDI\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EDI = dec_long(M.x86.R_EDI);
+    }
+    else {
+        M.x86.R_DI = dec_word(M.x86.R_DI);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x50
+****************************************************************************/
+static void
+x86emuOp_push_AX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("PUSH\tEAX\n");
+    }
+    else {
+        DECODE_PRINTF("PUSH\tAX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(M.x86.R_EAX);
+    }
+    else {
+        push_word(M.x86.R_AX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x51
+****************************************************************************/
+static void
+x86emuOp_push_CX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("PUSH\tECX\n");
+    }
+    else {
+        DECODE_PRINTF("PUSH\tCX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(M.x86.R_ECX);
+    }
+    else {
+        push_word(M.x86.R_CX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x52
+****************************************************************************/
+static void
+x86emuOp_push_DX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("PUSH\tEDX\n");
+    }
+    else {
+        DECODE_PRINTF("PUSH\tDX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(M.x86.R_EDX);
+    }
+    else {
+        push_word(M.x86.R_DX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x53
+****************************************************************************/
+static void
+x86emuOp_push_BX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("PUSH\tEBX\n");
+    }
+    else {
+        DECODE_PRINTF("PUSH\tBX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(M.x86.R_EBX);
+    }
+    else {
+        push_word(M.x86.R_BX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x54
+****************************************************************************/
+static void
+x86emuOp_push_SP(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("PUSH\tESP\n");
+    }
+    else {
+        DECODE_PRINTF("PUSH\tSP\n");
+    }
+    TRACE_AND_STEP();
+    /* Always push (E)SP, since we are emulating an i386 and above
+     * processor. This is necessary as some BIOS'es use this to check
+     * what type of processor is in the system.
+     */
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(M.x86.R_ESP);
+    }
+    else {
+        push_word((u16) (M.x86.R_SP));
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x55
+****************************************************************************/
+static void
+x86emuOp_push_BP(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("PUSH\tEBP\n");
+    }
+    else {
+        DECODE_PRINTF("PUSH\tBP\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(M.x86.R_EBP);
+    }
+    else {
+        push_word(M.x86.R_BP);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x56
+****************************************************************************/
+static void
+x86emuOp_push_SI(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("PUSH\tESI\n");
+    }
+    else {
+        DECODE_PRINTF("PUSH\tSI\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(M.x86.R_ESI);
+    }
+    else {
+        push_word(M.x86.R_SI);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x57
+****************************************************************************/
+static void
+x86emuOp_push_DI(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("PUSH\tEDI\n");
+    }
+    else {
+        DECODE_PRINTF("PUSH\tDI\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(M.x86.R_EDI);
+    }
+    else {
+        push_word(M.x86.R_DI);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x58
+****************************************************************************/
+static void
+x86emuOp_pop_AX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("POP\tEAX\n");
+    }
+    else {
+        DECODE_PRINTF("POP\tAX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = pop_long();
+    }
+    else {
+        M.x86.R_AX = pop_word();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x59
+****************************************************************************/
+static void
+x86emuOp_pop_CX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("POP\tECX\n");
+    }
+    else {
+        DECODE_PRINTF("POP\tCX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ECX = pop_long();
+    }
+    else {
+        M.x86.R_CX = pop_word();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x5a
+****************************************************************************/
+static void
+x86emuOp_pop_DX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("POP\tEDX\n");
+    }
+    else {
+        DECODE_PRINTF("POP\tDX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EDX = pop_long();
+    }
+    else {
+        M.x86.R_DX = pop_word();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x5b
+****************************************************************************/
+static void
+x86emuOp_pop_BX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("POP\tEBX\n");
+    }
+    else {
+        DECODE_PRINTF("POP\tBX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EBX = pop_long();
+    }
+    else {
+        M.x86.R_BX = pop_word();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x5c
+****************************************************************************/
+static void
+x86emuOp_pop_SP(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("POP\tESP\n");
+    }
+    else {
+        DECODE_PRINTF("POP\tSP\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ESP = pop_long();
+    }
+    else {
+        M.x86.R_SP = pop_word();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x5d
+****************************************************************************/
+static void
+x86emuOp_pop_BP(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("POP\tEBP\n");
+    }
+    else {
+        DECODE_PRINTF("POP\tBP\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EBP = pop_long();
+    }
+    else {
+        M.x86.R_BP = pop_word();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x5e
+****************************************************************************/
+static void
+x86emuOp_pop_SI(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("POP\tESI\n");
+    }
+    else {
+        DECODE_PRINTF("POP\tSI\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ESI = pop_long();
+    }
+    else {
+        M.x86.R_SI = pop_word();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x5f
+****************************************************************************/
+static void
+x86emuOp_pop_DI(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("POP\tEDI\n");
+    }
+    else {
+        DECODE_PRINTF("POP\tDI\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EDI = pop_long();
+    }
+    else {
+        M.x86.R_DI = pop_word();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x60
+****************************************************************************/
+static void
+x86emuOp_push_all(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("PUSHAD\n");
+    }
+    else {
+        DECODE_PRINTF("PUSHA\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        u32 old_sp = M.x86.R_ESP;
+
+        push_long(M.x86.R_EAX);
+        push_long(M.x86.R_ECX);
+        push_long(M.x86.R_EDX);
+        push_long(M.x86.R_EBX);
+        push_long(old_sp);
+        push_long(M.x86.R_EBP);
+        push_long(M.x86.R_ESI);
+        push_long(M.x86.R_EDI);
+    }
+    else {
+        u16 old_sp = M.x86.R_SP;
+
+        push_word(M.x86.R_AX);
+        push_word(M.x86.R_CX);
+        push_word(M.x86.R_DX);
+        push_word(M.x86.R_BX);
+        push_word(old_sp);
+        push_word(M.x86.R_BP);
+        push_word(M.x86.R_SI);
+        push_word(M.x86.R_DI);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x61
+****************************************************************************/
+static void
+x86emuOp_pop_all(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("POPAD\n");
+    }
+    else {
+        DECODE_PRINTF("POPA\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EDI = pop_long();
+        M.x86.R_ESI = pop_long();
+        M.x86.R_EBP = pop_long();
+        M.x86.R_ESP += 4;       /* skip ESP */
+        M.x86.R_EBX = pop_long();
+        M.x86.R_EDX = pop_long();
+        M.x86.R_ECX = pop_long();
+        M.x86.R_EAX = pop_long();
+    }
+    else {
+        M.x86.R_DI = pop_word();
+        M.x86.R_SI = pop_word();
+        M.x86.R_BP = pop_word();
+        M.x86.R_SP += 2;        /* skip SP */
+        M.x86.R_BX = pop_word();
+        M.x86.R_DX = pop_word();
+        M.x86.R_CX = pop_word();
+        M.x86.R_AX = pop_word();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/*opcode 0x62   ILLEGAL OP, calls x86emuOp_illegal_op() */
+/*opcode 0x63   ILLEGAL OP, calls x86emuOp_illegal_op() */
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x64
+****************************************************************************/
+static void
+x86emuOp_segovr_FS(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("FS:\n");
+    TRACE_AND_STEP();
+    M.x86.mode |= SYSMODE_SEGOVR_FS;
+    /*
+     * note the lack of DECODE_CLEAR_SEGOVR(r) since, here is one of 4
+     * opcode subroutines we do not want to do this.
+     */
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x65
+****************************************************************************/
+static void
+x86emuOp_segovr_GS(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("GS:\n");
+    TRACE_AND_STEP();
+    M.x86.mode |= SYSMODE_SEGOVR_GS;
+    /*
+     * note the lack of DECODE_CLEAR_SEGOVR(r) since, here is one of 4
+     * opcode subroutines we do not want to do this.
+     */
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x66 - prefix for 32-bit register
+****************************************************************************/
+static void
+x86emuOp_prefix_data(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("DATA:\n");
+    TRACE_AND_STEP();
+    M.x86.mode |= SYSMODE_PREFIX_DATA;
+    /* note no DECODE_CLEAR_SEGOVR here. */
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x67 - prefix for 32-bit address
+****************************************************************************/
+static void
+x86emuOp_prefix_addr(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("ADDR:\n");
+    TRACE_AND_STEP();
+    M.x86.mode |= SYSMODE_PREFIX_ADDR;
+    /* note no DECODE_CLEAR_SEGOVR here. */
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x68
+****************************************************************************/
+static void
+x86emuOp_push_word_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 imm;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        imm = fetch_long_imm();
+    }
+    else {
+        imm = fetch_word_imm();
+    }
+    DECODE_PRINTF2("PUSH\t%x\n", imm);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(imm);
+    }
+    else {
+        push_word((u16) imm);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x69
+****************************************************************************/
+static void
+x86emuOp_imul_word_IMM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("IMUL\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+            u32 res_lo, res_hi;
+            s32 imm;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            imm = fetch_long_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            imul_long_direct(&res_lo, &res_hi, (s32) srcval, (s32) imm);
+            if (res_hi != 0) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u32) res_lo;
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+            u32 res;
+            s16 imm;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            imm = fetch_word_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            res = (s16) srcval *(s16) imm;
+
+            if (res > 0xFFFF) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u16) res;
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+            u32 res_lo, res_hi;
+            s32 imm;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            imm = fetch_long_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            imul_long_direct(&res_lo, &res_hi, (s32) srcval, (s32) imm);
+            if (res_hi != 0) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u32) res_lo;
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+            u32 res;
+            s16 imm;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            imm = fetch_word_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            res = (s16) srcval *(s16) imm;
+
+            if (res > 0xFFFF) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u16) res;
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+            u32 res_lo, res_hi;
+            s32 imm;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            imm = fetch_long_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            imul_long_direct(&res_lo, &res_hi, (s32) srcval, (s32) imm);
+            if (res_hi != 0) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u32) res_lo;
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+            u32 res;
+            s16 imm;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            imm = fetch_word_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            res = (s16) srcval *(s16) imm;
+
+            if (res > 0xFFFF) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u16) res;
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+            u32 res_lo, res_hi;
+            s32 imm;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            imm = fetch_long_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            imul_long_direct(&res_lo, &res_hi, (s32) * srcreg, (s32) imm);
+            if (res_hi != 0) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u32) res_lo;
+        }
+        else {
+            u16 *destreg, *srcreg;
+            u32 res;
+            s16 imm;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            imm = fetch_word_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            res = (s16) * srcreg * (s16) imm;
+            if (res > 0xFFFF) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u16) res;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x6a
+****************************************************************************/
+static void
+x86emuOp_push_byte_IMM(u8 X86EMU_UNUSED(op1))
+{
+    s16 imm;
+
+    START_OF_INSTR();
+    imm = (s8) fetch_byte_imm();
+    DECODE_PRINTF2("PUSH\t%d\n", imm);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long((s32) imm);
+    }
+    else {
+        push_word(imm);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x6b
+****************************************************************************/
+static void
+x86emuOp_imul_byte_IMM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+    s8 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("IMUL\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+            u32 res_lo, res_hi;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            imm = fetch_byte_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            imul_long_direct(&res_lo, &res_hi, (s32) srcval, (s32) imm);
+            if (res_hi != 0) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u32) res_lo;
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+            u32 res;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            imm = fetch_byte_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            res = (s16) srcval *(s16) imm;
+
+            if (res > 0xFFFF) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u16) res;
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+            u32 res_lo, res_hi;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            imm = fetch_byte_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            imul_long_direct(&res_lo, &res_hi, (s32) srcval, (s32) imm);
+            if (res_hi != 0) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u32) res_lo;
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+            u32 res;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            imm = fetch_byte_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            res = (s16) srcval *(s16) imm;
+
+            if (res > 0xFFFF) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u16) res;
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+            u32 res_lo, res_hi;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            imm = fetch_byte_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            imul_long_direct(&res_lo, &res_hi, (s32) srcval, (s32) imm);
+            if (res_hi != 0) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u32) res_lo;
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+            u32 res;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            imm = fetch_byte_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            res = (s16) srcval *(s16) imm;
+
+            if (res > 0xFFFF) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u16) res;
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+            u32 res_lo, res_hi;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            imm = fetch_byte_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            TRACE_AND_STEP();
+            imul_long_direct(&res_lo, &res_hi, (s32) * srcreg, (s32) imm);
+            if (res_hi != 0) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u32) res_lo;
+        }
+        else {
+            u16 *destreg, *srcreg;
+            u32 res;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            imm = fetch_byte_imm();
+            DECODE_PRINTF2(",%d\n", (s32) imm);
+            res = (s16) * srcreg * (s16) imm;
+            if (res > 0xFFFF) {
+                SET_FLAG(F_CF);
+                SET_FLAG(F_OF);
+            }
+            else {
+                CLEAR_FLAG(F_CF);
+                CLEAR_FLAG(F_OF);
+            }
+            *destreg = (u16) res;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x6c
+****************************************************************************/
+static void
+x86emuOp_ins_byte(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("INSB\n");
+    ins(1);
+    TRACE_AND_STEP();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x6d
+****************************************************************************/
+static void
+x86emuOp_ins_word(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("INSD\n");
+        ins(4);
+    }
+    else {
+        DECODE_PRINTF("INSW\n");
+        ins(2);
+    }
+    TRACE_AND_STEP();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x6e
+****************************************************************************/
+static void
+x86emuOp_outs_byte(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("OUTSB\n");
+    outs(1);
+    TRACE_AND_STEP();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x6f
+****************************************************************************/
+static void
+x86emuOp_outs_word(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("OUTSD\n");
+        outs(4);
+    }
+    else {
+        DECODE_PRINTF("OUTSW\n");
+        outs(2);
+    }
+    TRACE_AND_STEP();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x70
+****************************************************************************/
+static void
+x86emuOp_jump_near_O(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if overflow flag is set */
+    START_OF_INSTR();
+    DECODE_PRINTF("JO\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (ACCESS_FLAG(F_OF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x71
+****************************************************************************/
+static void
+x86emuOp_jump_near_NO(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if overflow is not set */
+    START_OF_INSTR();
+    DECODE_PRINTF("JNO\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (!ACCESS_FLAG(F_OF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x72
+****************************************************************************/
+static void
+x86emuOp_jump_near_B(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if carry flag is set. */
+    START_OF_INSTR();
+    DECODE_PRINTF("JB\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (ACCESS_FLAG(F_CF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x73
+****************************************************************************/
+static void
+x86emuOp_jump_near_NB(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if carry flag is clear. */
+    START_OF_INSTR();
+    DECODE_PRINTF("JNB\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (!ACCESS_FLAG(F_CF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x74
+****************************************************************************/
+static void
+x86emuOp_jump_near_Z(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if zero flag is set. */
+    START_OF_INSTR();
+    DECODE_PRINTF("JZ\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (ACCESS_FLAG(F_ZF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x75
+****************************************************************************/
+static void
+x86emuOp_jump_near_NZ(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if zero flag is clear. */
+    START_OF_INSTR();
+    DECODE_PRINTF("JNZ\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (!ACCESS_FLAG(F_ZF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x76
+****************************************************************************/
+static void
+x86emuOp_jump_near_BE(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if carry flag is set or if the zero
+       flag is set. */
+    START_OF_INSTR();
+    DECODE_PRINTF("JBE\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x77
+****************************************************************************/
+static void
+x86emuOp_jump_near_NBE(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if carry flag is clear and if the zero
+       flag is clear */
+    START_OF_INSTR();
+    DECODE_PRINTF("JNBE\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (!(ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF)))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x78
+****************************************************************************/
+static void
+x86emuOp_jump_near_S(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if sign flag is set */
+    START_OF_INSTR();
+    DECODE_PRINTF("JS\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (ACCESS_FLAG(F_SF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x79
+****************************************************************************/
+static void
+x86emuOp_jump_near_NS(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if sign flag is clear */
+    START_OF_INSTR();
+    DECODE_PRINTF("JNS\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (!ACCESS_FLAG(F_SF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x7a
+****************************************************************************/
+static void
+x86emuOp_jump_near_P(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if parity flag is set (even parity) */
+    START_OF_INSTR();
+    DECODE_PRINTF("JP\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (ACCESS_FLAG(F_PF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x7b
+****************************************************************************/
+static void
+x86emuOp_jump_near_NP(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+
+    /* jump to byte offset if parity flag is clear (odd parity) */
+    START_OF_INSTR();
+    DECODE_PRINTF("JNP\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (!ACCESS_FLAG(F_PF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x7c
+****************************************************************************/
+static void
+x86emuOp_jump_near_L(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+    int sf, of;
+
+    /* jump to byte offset if sign flag not equal to overflow flag. */
+    START_OF_INSTR();
+    DECODE_PRINTF("JL\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    sf = ACCESS_FLAG(F_SF) != 0;
+    of = ACCESS_FLAG(F_OF) != 0;
+    if (sf ^ of)
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x7d
+****************************************************************************/
+static void
+x86emuOp_jump_near_NL(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+    int sf, of;
+
+    /* jump to byte offset if sign flag not equal to overflow flag. */
+    START_OF_INSTR();
+    DECODE_PRINTF("JNL\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    sf = ACCESS_FLAG(F_SF) != 0;
+    of = ACCESS_FLAG(F_OF) != 0;
+    /* note: inverse of above, but using == instead of xor. */
+    if (sf == of)
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x7e
+****************************************************************************/
+static void
+x86emuOp_jump_near_LE(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+    int sf, of;
+
+    /* jump to byte offset if sign flag not equal to overflow flag
+       or the zero flag is set */
+    START_OF_INSTR();
+    DECODE_PRINTF("JLE\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    sf = ACCESS_FLAG(F_SF) != 0;
+    of = ACCESS_FLAG(F_OF) != 0;
+    if ((sf ^ of) || ACCESS_FLAG(F_ZF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x7f
+****************************************************************************/
+static void
+x86emuOp_jump_near_NLE(u8 X86EMU_UNUSED(op1))
+{
+    s8 offset;
+    u16 target;
+    int sf, of;
+
+    /* jump to byte offset if sign flag equal to overflow flag.
+       and the zero flag is clear */
+    START_OF_INSTR();
+    DECODE_PRINTF("JNLE\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + (s16) offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    sf = ACCESS_FLAG(F_SF) != 0;
+    of = ACCESS_FLAG(F_OF) != 0;
+    if ((sf == of) && !ACCESS_FLAG(F_ZF))
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+static u8(*opc80_byte_operation[]) (u8 d, u8 s) = {
+    add_byte,                   /* 00 */
+        or_byte,                /* 01 */
+        adc_byte,               /* 02 */
+        sbb_byte,               /* 03 */
+        and_byte,               /* 04 */
+        sub_byte,               /* 05 */
+        xor_byte,               /* 06 */
+        cmp_byte,               /* 07 */
+};
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x80
+****************************************************************************/
+static void
+x86emuOp_opc80_byte_RM_IMM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg;
+    uint destoffset;
+    u8 imm;
+    u8 destval;
+
+    /*
+     * Weirdo special case instruction format.  Part of the opcode
+     * held below in "RH".  Doubly nested case would result, except
+     * that the decoded instruction
+     */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the 
+           above test is done twice. */
+
+        switch (rh) {
+        case 0:
+            DECODE_PRINTF("ADD\t");
+            break;
+        case 1:
+            DECODE_PRINTF("OR\t");
+            break;
+        case 2:
+            DECODE_PRINTF("ADC\t");
+            break;
+        case 3:
+            DECODE_PRINTF("SBB\t");
+            break;
+        case 4:
+            DECODE_PRINTF("AND\t");
+            break;
+        case 5:
+            DECODE_PRINTF("SUB\t");
+            break;
+        case 6:
+            DECODE_PRINTF("XOR\t");
+            break;
+        case 7:
+            DECODE_PRINTF("CMP\t");
+            break;
+        }
+    }
+#endif
+    /* know operation, decode the mod byte to find the addressing
+       mode. */
+    switch (mod) {
+    case 0:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2("%x\n", imm);
+        TRACE_AND_STEP();
+        destval = (*opc80_byte_operation[rh]) (destval, imm);
+        if (rh != 7)
+            store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2("%x\n", imm);
+        TRACE_AND_STEP();
+        destval = (*opc80_byte_operation[rh]) (destval, imm);
+        if (rh != 7)
+            store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2("%x\n", imm);
+        TRACE_AND_STEP();
+        destval = (*opc80_byte_operation[rh]) (destval, imm);
+        if (rh != 7)
+            store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2("%x\n", imm);
+        TRACE_AND_STEP();
+        destval = (*opc80_byte_operation[rh]) (*destreg, imm);
+        if (rh != 7)
+            *destreg = destval;
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+static u16(*opc81_word_operation[]) (u16 d, u16 s) = {
+    add_word,                   /*00 */
+        or_word,                /*01 */
+        adc_word,               /*02 */
+        sbb_word,               /*03 */
+        and_word,               /*04 */
+        sub_word,               /*05 */
+        xor_word,               /*06 */
+        cmp_word,               /*07 */
+};
+
+static u32(*opc81_long_operation[]) (u32 d, u32 s) = {
+    add_long,                   /*00 */
+        or_long,                /*01 */
+        adc_long,               /*02 */
+        sbb_long,               /*03 */
+        and_long,               /*04 */
+        sub_long,               /*05 */
+        xor_long,               /*06 */
+        cmp_long,               /*07 */
+};
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x81
+****************************************************************************/
+static void
+x86emuOp_opc81_word_RM_IMM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    /*
+     * Weirdo special case instruction format.  Part of the opcode
+     * held below in "RH".  Doubly nested case would result, except
+     * that the decoded instruction
+     */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the 
+           above test is done twice. */
+
+        switch (rh) {
+        case 0:
+            DECODE_PRINTF("ADD\t");
+            break;
+        case 1:
+            DECODE_PRINTF("OR\t");
+            break;
+        case 2:
+            DECODE_PRINTF("ADC\t");
+            break;
+        case 3:
+            DECODE_PRINTF("SBB\t");
+            break;
+        case 4:
+            DECODE_PRINTF("AND\t");
+            break;
+        case 5:
+            DECODE_PRINTF("SUB\t");
+            break;
+        case 6:
+            DECODE_PRINTF("XOR\t");
+            break;
+        case 7:
+            DECODE_PRINTF("CMP\t");
+            break;
+        }
+    }
+#endif
+    /*
+     * Know operation, decode the mod byte to find the addressing 
+     * mode.
+     */
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval, imm;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            imm = fetch_long_imm();
+            DECODE_PRINTF2("%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc81_long_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval, imm;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            imm = fetch_word_imm();
+            DECODE_PRINTF2("%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc81_word_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval, imm;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            imm = fetch_long_imm();
+            DECODE_PRINTF2("%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc81_long_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval, imm;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            imm = fetch_word_imm();
+            DECODE_PRINTF2("%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc81_word_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval, imm;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            imm = fetch_long_imm();
+            DECODE_PRINTF2("%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc81_long_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval, imm;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            imm = fetch_word_imm();
+            DECODE_PRINTF2("%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc81_word_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 destval, imm;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            imm = fetch_long_imm();
+            DECODE_PRINTF2("%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc81_long_operation[rh]) (*destreg, imm);
+            if (rh != 7)
+                *destreg = destval;
+        }
+        else {
+            u16 *destreg;
+            u16 destval, imm;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            imm = fetch_word_imm();
+            DECODE_PRINTF2("%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc81_word_operation[rh]) (*destreg, imm);
+            if (rh != 7)
+                *destreg = destval;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+static u8(*opc82_byte_operation[]) (u8 s, u8 d) = {
+    add_byte,                   /*00 */
+        or_byte,                /*01 *//*YYY UNUSED ???? */
+        adc_byte,               /*02 */
+        sbb_byte,               /*03 */
+        and_byte,               /*04 *//*YYY UNUSED ???? */
+        sub_byte,               /*05 */
+        xor_byte,               /*06 *//*YYY UNUSED ???? */
+        cmp_byte,               /*07 */
+};
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x82
+****************************************************************************/
+static void
+x86emuOp_opc82_byte_RM_IMM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg;
+    uint destoffset;
+    u8 imm;
+    u8 destval;
+
+    /*
+     * Weirdo special case instruction format.  Part of the opcode
+     * held below in "RH".  Doubly nested case would result, except
+     * that the decoded instruction Similar to opcode 81, except that
+     * the immediate byte is sign extended to a word length.
+     */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the 
+           above test is done twice. */
+        switch (rh) {
+        case 0:
+            DECODE_PRINTF("ADD\t");
+            break;
+        case 1:
+            DECODE_PRINTF("OR\t");
+            break;
+        case 2:
+            DECODE_PRINTF("ADC\t");
+            break;
+        case 3:
+            DECODE_PRINTF("SBB\t");
+            break;
+        case 4:
+            DECODE_PRINTF("AND\t");
+            break;
+        case 5:
+            DECODE_PRINTF("SUB\t");
+            break;
+        case 6:
+            DECODE_PRINTF("XOR\t");
+            break;
+        case 7:
+            DECODE_PRINTF("CMP\t");
+            break;
+        }
+    }
+#endif
+    /* know operation, decode the mod byte to find the addressing
+       mode. */
+    switch (mod) {
+    case 0:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm00_address(rl);
+        destval = fetch_data_byte(destoffset);
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2(",%x\n", imm);
+        TRACE_AND_STEP();
+        destval = (*opc82_byte_operation[rh]) (destval, imm);
+        if (rh != 7)
+            store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm01_address(rl);
+        destval = fetch_data_byte(destoffset);
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2(",%x\n", imm);
+        TRACE_AND_STEP();
+        destval = (*opc82_byte_operation[rh]) (destval, imm);
+        if (rh != 7)
+            store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm10_address(rl);
+        destval = fetch_data_byte(destoffset);
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2(",%x\n", imm);
+        TRACE_AND_STEP();
+        destval = (*opc82_byte_operation[rh]) (destval, imm);
+        if (rh != 7)
+            store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2(",%x\n", imm);
+        TRACE_AND_STEP();
+        destval = (*opc82_byte_operation[rh]) (*destreg, imm);
+        if (rh != 7)
+            *destreg = destval;
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+static u16(*opc83_word_operation[]) (u16 s, u16 d) = {
+    add_word,                   /*00 */
+        or_word,                /*01 *//*YYY UNUSED ???? */
+        adc_word,               /*02 */
+        sbb_word,               /*03 */
+        and_word,               /*04 *//*YYY UNUSED ???? */
+        sub_word,               /*05 */
+        xor_word,               /*06 *//*YYY UNUSED ???? */
+        cmp_word,               /*07 */
+};
+
+static u32(*opc83_long_operation[]) (u32 s, u32 d) = {
+    add_long,                   /*00 */
+        or_long,                /*01 *//*YYY UNUSED ???? */
+        adc_long,               /*02 */
+        sbb_long,               /*03 */
+        and_long,               /*04 *//*YYY UNUSED ???? */
+        sub_long,               /*05 */
+        xor_long,               /*06 *//*YYY UNUSED ???? */
+        cmp_long,               /*07 */
+};
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x83
+****************************************************************************/
+static void
+x86emuOp_opc83_word_RM_IMM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    /*
+     * Weirdo special case instruction format.  Part of the opcode
+     * held below in "RH".  Doubly nested case would result, except
+     * that the decoded instruction Similar to opcode 81, except that
+     * the immediate byte is sign extended to a word length.
+     */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the 
+           above test is done twice. */
+        switch (rh) {
+        case 0:
+            DECODE_PRINTF("ADD\t");
+            break;
+        case 1:
+            DECODE_PRINTF("OR\t");
+            break;
+        case 2:
+            DECODE_PRINTF("ADC\t");
+            break;
+        case 3:
+            DECODE_PRINTF("SBB\t");
+            break;
+        case 4:
+            DECODE_PRINTF("AND\t");
+            break;
+        case 5:
+            DECODE_PRINTF("SUB\t");
+            break;
+        case 6:
+            DECODE_PRINTF("XOR\t");
+            break;
+        case 7:
+            DECODE_PRINTF("CMP\t");
+            break;
+        }
+    }
+#endif
+    /* know operation, decode the mod byte to find the addressing
+       mode. */
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval, imm;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            destval = fetch_data_long(destoffset);
+            imm = (s8) fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc83_long_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval, imm;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            destval = fetch_data_word(destoffset);
+            imm = (s8) fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc83_word_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval, imm;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            destval = fetch_data_long(destoffset);
+            imm = (s8) fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc83_long_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval, imm;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            destval = fetch_data_word(destoffset);
+            imm = (s8) fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc83_word_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval, imm;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm10_address(rl);
+            destval = fetch_data_long(destoffset);
+            imm = (s8) fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc83_long_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval, imm;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm10_address(rl);
+            destval = fetch_data_word(destoffset);
+            imm = (s8) fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc83_word_operation[rh]) (destval, imm);
+            if (rh != 7)
+                store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 destval, imm;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            imm = (s8) fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc83_long_operation[rh]) (*destreg, imm);
+            if (rh != 7)
+                *destreg = destval;
+        }
+        else {
+            u16 *destreg;
+            u16 destval, imm;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            imm = (s8) fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            destval = (*opc83_word_operation[rh]) (*destreg, imm);
+            if (rh != 7)
+                *destreg = destval;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x84
+****************************************************************************/
+static void
+x86emuOp_test_byte_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint destoffset;
+    u8 destval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("TEST\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        test_byte(destval, *srcreg);
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        test_byte(destval, *srcreg);
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        test_byte(destval, *srcreg);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        test_byte(*destreg, *srcreg);
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x85
+****************************************************************************/
+static void
+x86emuOp_test_word_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("TEST\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            test_long(destval, *srcreg);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            test_word(destval, *srcreg);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            test_long(destval, *srcreg);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            test_word(destval, *srcreg);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            test_long(destval, *srcreg);
+        }
+        else {
+            u16 destval;
+            u16 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            test_word(destval, *srcreg);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            test_long(*destreg, *srcreg);
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            test_word(*destreg, *srcreg);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x86
+****************************************************************************/
+static void
+x86emuOp_xchg_byte_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint destoffset;
+    u8 destval;
+    u8 tmp;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("XCHG\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        tmp = *srcreg;
+        *srcreg = destval;
+        destval = tmp;
+        store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        tmp = *srcreg;
+        *srcreg = destval;
+        destval = tmp;
+        store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        destval = fetch_data_byte(destoffset);
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        tmp = *srcreg;
+        *srcreg = destval;
+        destval = tmp;
+        store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        tmp = *srcreg;
+        *srcreg = *destreg;
+        *destreg = tmp;
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x87
+****************************************************************************/
+static void
+x86emuOp_xchg_word_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("XCHG\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *srcreg;
+            u32 destval, tmp;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            tmp = *srcreg;
+            *srcreg = destval;
+            destval = tmp;
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 *srcreg;
+            u16 destval, tmp;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            tmp = *srcreg;
+            *srcreg = destval;
+            destval = tmp;
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *srcreg;
+            u32 destval, tmp;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            tmp = *srcreg;
+            *srcreg = destval;
+            destval = tmp;
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 *srcreg;
+            u16 destval, tmp;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            tmp = *srcreg;
+            *srcreg = destval;
+            destval = tmp;
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *srcreg;
+            u32 destval, tmp;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_long(destoffset);
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            tmp = *srcreg;
+            *srcreg = destval;
+            destval = tmp;
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 *srcreg;
+            u16 destval, tmp;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            destval = fetch_data_word(destoffset);
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            tmp = *srcreg;
+            *srcreg = destval;
+            destval = tmp;
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+            u32 tmp;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            tmp = *srcreg;
+            *srcreg = *destreg;
+            *destreg = tmp;
+        }
+        else {
+            u16 *destreg, *srcreg;
+            u16 tmp;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            tmp = *srcreg;
+            *srcreg = *destreg;
+            *destreg = tmp;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x88
+****************************************************************************/
+static void
+x86emuOp_mov_byte_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        store_data_byte(destoffset, *srcreg);
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        store_data_byte(destoffset, *srcreg);
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        store_data_byte(destoffset, *srcreg);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = *srcreg;
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x89
+****************************************************************************/
+static void
+x86emuOp_mov_word_RM_R(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u32 destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            store_data_long(destoffset, *srcreg);
+        }
+        else {
+            u16 *srcreg;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            store_data_word(destoffset, *srcreg);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            store_data_long(destoffset, *srcreg);
+        }
+        else {
+            u16 *srcreg;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            store_data_word(destoffset, *srcreg);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            store_data_long(destoffset, *srcreg);
+        }
+        else {
+            u16 *srcreg;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            store_data_word(destoffset, *srcreg);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = *srcreg;
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = *srcreg;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x8a
+****************************************************************************/
+static void
+x86emuOp_mov_byte_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg, *srcreg;
+    uint srcoffset;
+    u8 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = srcval;
+        break;
+    case 1:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = srcval;
+        break;
+    case 2:
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        srcval = fetch_data_byte(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = srcval;
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = *srcreg;
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x8b
+****************************************************************************/
+static void
+x86emuOp_mov_word_R_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = srcval;
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm00_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = srcval;
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = srcval;
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm01_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = srcval;
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 srcval;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_long(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = srcval;
+        }
+        else {
+            u16 *destreg;
+            u16 srcval;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcoffset = decode_rm10_address(rl);
+            srcval = fetch_data_word(srcoffset);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = srcval;
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg, *srcreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = *srcreg;
+        }
+        else {
+            u16 *destreg, *srcreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rh);
+            DECODE_PRINTF(",");
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = *srcreg;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x8c
+****************************************************************************/
+static void
+x86emuOp_mov_word_RM_SR(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u16 *destreg, *srcreg;
+    uint destoffset;
+    u16 destval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",");
+        srcreg = decode_rm_seg_register(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = *srcreg;
+        store_data_word(destoffset, destval);
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",");
+        srcreg = decode_rm_seg_register(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = *srcreg;
+        store_data_word(destoffset, destval);
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",");
+        srcreg = decode_rm_seg_register(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        destval = *srcreg;
+        store_data_word(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_WORD_REGISTER(rl);
+        DECODE_PRINTF(",");
+        srcreg = decode_rm_seg_register(rh);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = *srcreg;
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x8d
+****************************************************************************/
+static void
+x86emuOp_lea_word_R_M(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("LEA\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
+            u32 *srcreg = DECODE_RM_LONG_REGISTER(rh);
+
+            DECODE_PRINTF(",");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *srcreg = (u32) destoffset;
+        }
+        else {
+            u16 *srcreg = DECODE_RM_WORD_REGISTER(rh);
+
+            DECODE_PRINTF(",");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *srcreg = (u16) destoffset;
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
+            u32 *srcreg = DECODE_RM_LONG_REGISTER(rh);
+
+            DECODE_PRINTF(",");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *srcreg = (u32) destoffset;
+        }
+        else {
+            u16 *srcreg = DECODE_RM_WORD_REGISTER(rh);
+
+            DECODE_PRINTF(",");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *srcreg = (u16) destoffset;
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
+            u32 *srcreg = DECODE_RM_LONG_REGISTER(rh);
+
+            DECODE_PRINTF(",");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *srcreg = (u32) destoffset;
+        }
+        else {
+            u16 *srcreg = DECODE_RM_WORD_REGISTER(rh);
+
+            DECODE_PRINTF(",");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *srcreg = (u16) destoffset;
+        }
+        break;
+    case 3:                    /* register to register */
+        /* undefined.  Do nothing. */
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x8e
+****************************************************************************/
+static void
+x86emuOp_mov_word_SR_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u16 *destreg, *srcreg;
+    uint srcoffset;
+    u16 srcval;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        destreg = decode_rm_seg_register(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        srcval = fetch_data_word(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = srcval;
+        break;
+    case 1:
+        destreg = decode_rm_seg_register(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        srcval = fetch_data_word(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = srcval;
+        break;
+    case 2:
+        destreg = decode_rm_seg_register(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        srcval = fetch_data_word(srcoffset);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = srcval;
+        break;
+    case 3:                    /* register to register */
+        destreg = decode_rm_seg_register(rh);
+        DECODE_PRINTF(",");
+        srcreg = DECODE_RM_WORD_REGISTER(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *destreg = *srcreg;
+        break;
+    }
+    /*
+     * Clean up, and reset all the R_xSP pointers to the correct
+     * locations.  This is about 3x too much overhead (doing all the
+     * segreg ptrs when only one is needed, but this instruction
+     * *cannot* be that common, and this isn't too much work anyway.
+     */
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x8f
+****************************************************************************/
+static void
+x86emuOp_pop_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("POP\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    if (rh != 0) {
+        DECODE_PRINTF("ILLEGAL DECODE OF OPCODE 8F\n");
+        HALT_SYS();
+    }
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = pop_long();
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = pop_word();
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = pop_long();
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = pop_word();
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = pop_long();
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            destval = pop_word();
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = pop_long();
+        }
+        else {
+            u16 *destreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = pop_word();
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x90
+****************************************************************************/
+static void
+x86emuOp_nop(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("NOP\n");
+    TRACE_AND_STEP();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x91
+****************************************************************************/
+static void
+x86emuOp_xchg_word_AX_CX(u8 X86EMU_UNUSED(op1))
+{
+    u32 tmp;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("XCHG\tEAX,ECX\n");
+    }
+    else {
+        DECODE_PRINTF("XCHG\tAX,CX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        tmp = M.x86.R_EAX;
+        M.x86.R_EAX = M.x86.R_ECX;
+        M.x86.R_ECX = tmp;
+    }
+    else {
+        tmp = M.x86.R_AX;
+        M.x86.R_AX = M.x86.R_CX;
+        M.x86.R_CX = (u16) tmp;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x92
+****************************************************************************/
+static void
+x86emuOp_xchg_word_AX_DX(u8 X86EMU_UNUSED(op1))
+{
+    u32 tmp;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("XCHG\tEAX,EDX\n");
+    }
+    else {
+        DECODE_PRINTF("XCHG\tAX,DX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        tmp = M.x86.R_EAX;
+        M.x86.R_EAX = M.x86.R_EDX;
+        M.x86.R_EDX = tmp;
+    }
+    else {
+        tmp = M.x86.R_AX;
+        M.x86.R_AX = M.x86.R_DX;
+        M.x86.R_DX = (u16) tmp;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x93
+****************************************************************************/
+static void
+x86emuOp_xchg_word_AX_BX(u8 X86EMU_UNUSED(op1))
+{
+    u32 tmp;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("XCHG\tEAX,EBX\n");
+    }
+    else {
+        DECODE_PRINTF("XCHG\tAX,BX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        tmp = M.x86.R_EAX;
+        M.x86.R_EAX = M.x86.R_EBX;
+        M.x86.R_EBX = tmp;
+    }
+    else {
+        tmp = M.x86.R_AX;
+        M.x86.R_AX = M.x86.R_BX;
+        M.x86.R_BX = (u16) tmp;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x94
+****************************************************************************/
+static void
+x86emuOp_xchg_word_AX_SP(u8 X86EMU_UNUSED(op1))
+{
+    u32 tmp;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("XCHG\tEAX,ESP\n");
+    }
+    else {
+        DECODE_PRINTF("XCHG\tAX,SP\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        tmp = M.x86.R_EAX;
+        M.x86.R_EAX = M.x86.R_ESP;
+        M.x86.R_ESP = tmp;
+    }
+    else {
+        tmp = M.x86.R_AX;
+        M.x86.R_AX = M.x86.R_SP;
+        M.x86.R_SP = (u16) tmp;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x95
+****************************************************************************/
+static void
+x86emuOp_xchg_word_AX_BP(u8 X86EMU_UNUSED(op1))
+{
+    u32 tmp;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("XCHG\tEAX,EBP\n");
+    }
+    else {
+        DECODE_PRINTF("XCHG\tAX,BP\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        tmp = M.x86.R_EAX;
+        M.x86.R_EAX = M.x86.R_EBP;
+        M.x86.R_EBP = tmp;
+    }
+    else {
+        tmp = M.x86.R_AX;
+        M.x86.R_AX = M.x86.R_BP;
+        M.x86.R_BP = (u16) tmp;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x96
+****************************************************************************/
+static void
+x86emuOp_xchg_word_AX_SI(u8 X86EMU_UNUSED(op1))
+{
+    u32 tmp;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("XCHG\tEAX,ESI\n");
+    }
+    else {
+        DECODE_PRINTF("XCHG\tAX,SI\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        tmp = M.x86.R_EAX;
+        M.x86.R_EAX = M.x86.R_ESI;
+        M.x86.R_ESI = tmp;
+    }
+    else {
+        tmp = M.x86.R_AX;
+        M.x86.R_AX = M.x86.R_SI;
+        M.x86.R_SI = (u16) tmp;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x97
+****************************************************************************/
+static void
+x86emuOp_xchg_word_AX_DI(u8 X86EMU_UNUSED(op1))
+{
+    u32 tmp;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("XCHG\tEAX,EDI\n");
+    }
+    else {
+        DECODE_PRINTF("XCHG\tAX,DI\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        tmp = M.x86.R_EAX;
+        M.x86.R_EAX = M.x86.R_EDI;
+        M.x86.R_EDI = tmp;
+    }
+    else {
+        tmp = M.x86.R_AX;
+        M.x86.R_AX = M.x86.R_DI;
+        M.x86.R_DI = (u16) tmp;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x98
+****************************************************************************/
+static void
+x86emuOp_cbw(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("CWDE\n");
+    }
+    else {
+        DECODE_PRINTF("CBW\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        if (M.x86.R_AX & 0x8000) {
+            M.x86.R_EAX |= 0xffff0000;
+        }
+        else {
+            M.x86.R_EAX &= 0x0000ffff;
+        }
+    }
+    else {
+        if (M.x86.R_AL & 0x80) {
+            M.x86.R_AH = 0xff;
+        }
+        else {
+            M.x86.R_AH = 0x0;
+        }
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x99
+****************************************************************************/
+static void
+x86emuOp_cwd(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("CDQ\n");
+    }
+    else {
+        DECODE_PRINTF("CWD\n");
+    }
+    DECODE_PRINTF("CWD\n");
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        if (M.x86.R_EAX & 0x80000000) {
+            M.x86.R_EDX = 0xffffffff;
+        }
+        else {
+            M.x86.R_EDX = 0x0;
+        }
+    }
+    else {
+        if (M.x86.R_AX & 0x8000) {
+            M.x86.R_DX = 0xffff;
+        }
+        else {
+            M.x86.R_DX = 0x0;
+        }
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x9a
+****************************************************************************/
+static void
+x86emuOp_call_far_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 farseg, faroff;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("CALL\t");
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        faroff = fetch_long_imm();
+        farseg = fetch_word_imm();
+    }
+    else {
+        faroff = fetch_word_imm();
+        farseg = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%04x:", farseg);
+    DECODE_PRINTF2("%04x\n", faroff);
+    CALL_TRACE(M.x86.saved_cs, M.x86.saved_ip, farseg, faroff, "FAR ");
+
+    /* XXX
+     * 
+     * Hooked interrupt vectors calling into our "BIOS" will cause
+     * problems unless all intersegment stuff is checked for BIOS
+     * access.  Check needed here.  For moment, let it alone.
+     */
+    TRACE_AND_STEP();
+    push_word(M.x86.R_CS);
+    M.x86.R_CS = farseg;
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(M.x86.R_EIP);
+    }
+    else {
+        push_word(M.x86.R_IP);
+    }
+    M.x86.R_EIP = faroff & 0xffff;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x9b
+****************************************************************************/
+static void
+x86emuOp_wait(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("WAIT");
+    TRACE_AND_STEP();
+    /* NADA.  */
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x9c
+****************************************************************************/
+static void
+x86emuOp_pushf_word(u8 X86EMU_UNUSED(op1))
+{
+    u32 flags;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("PUSHFD\n");
+    }
+    else {
+        DECODE_PRINTF("PUSHF\n");
+    }
+    TRACE_AND_STEP();
+
+    /* clear out *all* bits not representing flags, and turn on real bits */
+    flags = (M.x86.R_EFLG & F_MSK) | F_ALWAYS_ON;
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(flags);
+    }
+    else {
+        push_word((u16) flags);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x9d
+****************************************************************************/
+static void
+x86emuOp_popf_word(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("POPFD\n");
+    }
+    else {
+        DECODE_PRINTF("POPF\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EFLG = pop_long();
+    }
+    else {
+        M.x86.R_FLG = pop_word();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x9e
+****************************************************************************/
+static void
+x86emuOp_sahf(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("SAHF\n");
+    TRACE_AND_STEP();
+    /* clear the lower bits of the flag register */
+    M.x86.R_FLG &= 0xffffff00;
+    /* or in the AH register into the flags register */
+    M.x86.R_FLG |= M.x86.R_AH;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0x9f
+****************************************************************************/
+static void
+x86emuOp_lahf(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("LAHF\n");
+    TRACE_AND_STEP();
+    M.x86.R_AH = (u8) (M.x86.R_FLG & 0xff);
+    /*undocumented TC++ behavior??? Nope.  It's documented, but
+       you have too look real hard to notice it. */
+    M.x86.R_AH |= 0x2;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xa0
+****************************************************************************/
+static void
+x86emuOp_mov_AL_M_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u16 offset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\tAL,");
+    offset = fetch_word_imm();
+    DECODE_PRINTF2("[%04x]\n", offset);
+    TRACE_AND_STEP();
+    M.x86.R_AL = fetch_data_byte(offset);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xa1
+****************************************************************************/
+static void
+x86emuOp_mov_AX_M_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u16 offset;
+
+    START_OF_INSTR();
+    offset = fetch_word_imm();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF2("MOV\tEAX,[%04x]\n", offset);
+    }
+    else {
+        DECODE_PRINTF2("MOV\tAX,[%04x]\n", offset);
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = fetch_data_long(offset);
+    }
+    else {
+        M.x86.R_AX = fetch_data_word(offset);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xa2
+****************************************************************************/
+static void
+x86emuOp_mov_M_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u16 offset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\t");
+    offset = fetch_word_imm();
+    DECODE_PRINTF2("[%04x],AL\n", offset);
+    TRACE_AND_STEP();
+    store_data_byte(offset, M.x86.R_AL);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xa3
+****************************************************************************/
+static void
+x86emuOp_mov_M_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u16 offset;
+
+    START_OF_INSTR();
+    offset = fetch_word_imm();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF2("MOV\t[%04x],EAX\n", offset);
+    }
+    else {
+        DECODE_PRINTF2("MOV\t[%04x],AX\n", offset);
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        store_data_long(offset, M.x86.R_EAX);
+    }
+    else {
+        store_data_word(offset, M.x86.R_AX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xa4
+****************************************************************************/
+static void
+x86emuOp_movs_byte(u8 X86EMU_UNUSED(op1))
+{
+    u8 val;
+    u32 count;
+    int inc;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOVS\tBYTE\n");
+    if (ACCESS_FLAG(F_DF))      /* down */
+        inc = -1;
+    else
+        inc = 1;
+    TRACE_AND_STEP();
+    count = 1;
+    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
+        /* dont care whether REPE or REPNE */
+        /* move them until CX is ZERO. */
+        count = M.x86.R_CX;
+        M.x86.R_CX = 0;
+        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+    }
+    while (count--) {
+        val = fetch_data_byte(M.x86.R_SI);
+        store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, val);
+        M.x86.R_SI += inc;
+        M.x86.R_DI += inc;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xa5
+****************************************************************************/
+static void
+x86emuOp_movs_word(u8 X86EMU_UNUSED(op1))
+{
+    u32 val;
+    int inc;
+    u32 count;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("MOVS\tDWORD\n");
+        if (ACCESS_FLAG(F_DF))  /* down */
+            inc = -4;
+        else
+            inc = 4;
+    }
+    else {
+        DECODE_PRINTF("MOVS\tWORD\n");
+        if (ACCESS_FLAG(F_DF))  /* down */
+            inc = -2;
+        else
+            inc = 2;
+    }
+    TRACE_AND_STEP();
+    count = 1;
+    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
+        /* dont care whether REPE or REPNE */
+        /* move them until CX is ZERO. */
+        count = M.x86.R_CX;
+        M.x86.R_CX = 0;
+        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+    }
+    while (count--) {
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            val = fetch_data_long(M.x86.R_SI);
+            store_data_long_abs(M.x86.R_ES, M.x86.R_DI, val);
+        }
+        else {
+            val = fetch_data_word(M.x86.R_SI);
+            store_data_word_abs(M.x86.R_ES, M.x86.R_DI, (u16) val);
+        }
+        M.x86.R_SI += inc;
+        M.x86.R_DI += inc;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xa6
+****************************************************************************/
+static void
+x86emuOp_cmps_byte(u8 X86EMU_UNUSED(op1))
+{
+    s8 val1, val2;
+    int inc;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("CMPS\tBYTE\n");
+    TRACE_AND_STEP();
+    if (ACCESS_FLAG(F_DF))      /* down */
+        inc = -1;
+    else
+        inc = 1;
+
+    if (M.x86.mode & SYSMODE_PREFIX_REPE) {
+        /* REPE  */
+        /* move them until CX is ZERO. */
+        while (M.x86.R_CX != 0) {
+            val1 = fetch_data_byte(M.x86.R_SI);
+            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+            cmp_byte(val1, val2);
+            M.x86.R_CX -= 1;
+            M.x86.R_SI += inc;
+            M.x86.R_DI += inc;
+            if (ACCESS_FLAG(F_ZF) == 0)
+                break;
+        }
+        M.x86.mode &= ~SYSMODE_PREFIX_REPE;
+    }
+    else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {
+        /* REPNE  */
+        /* move them until CX is ZERO. */
+        while (M.x86.R_CX != 0) {
+            val1 = fetch_data_byte(M.x86.R_SI);
+            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+            cmp_byte(val1, val2);
+            M.x86.R_CX -= 1;
+            M.x86.R_SI += inc;
+            M.x86.R_DI += inc;
+            if (ACCESS_FLAG(F_ZF))
+                break;          /* zero flag set means equal */
+        }
+        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
+    }
+    else {
+        val1 = fetch_data_byte(M.x86.R_SI);
+        val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+        cmp_byte(val1, val2);
+        M.x86.R_SI += inc;
+        M.x86.R_DI += inc;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xa7
+****************************************************************************/
+static void
+x86emuOp_cmps_word(u8 X86EMU_UNUSED(op1))
+{
+    u32 val1, val2;
+    int inc;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("CMPS\tDWORD\n");
+        if (ACCESS_FLAG(F_DF))  /* down */
+            inc = -4;
+        else
+            inc = 4;
+    }
+    else {
+        DECODE_PRINTF("CMPS\tWORD\n");
+        if (ACCESS_FLAG(F_DF))  /* down */
+            inc = -2;
+        else
+            inc = 2;
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_REPE) {
+        /* REPE  */
+        /* move them until CX is ZERO. */
+        while (M.x86.R_CX != 0) {
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                val1 = fetch_data_long(M.x86.R_SI);
+                val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+                cmp_long(val1, val2);
+            }
+            else {
+                val1 = fetch_data_word(M.x86.R_SI);
+                val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+                cmp_word((u16) val1, (u16) val2);
+            }
+            M.x86.R_CX -= 1;
+            M.x86.R_SI += inc;
+            M.x86.R_DI += inc;
+            if (ACCESS_FLAG(F_ZF) == 0)
+                break;
+        }
+        M.x86.mode &= ~SYSMODE_PREFIX_REPE;
+    }
+    else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {
+        /* REPNE  */
+        /* move them until CX is ZERO. */
+        while (M.x86.R_CX != 0) {
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                val1 = fetch_data_long(M.x86.R_SI);
+                val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+                cmp_long(val1, val2);
+            }
+            else {
+                val1 = fetch_data_word(M.x86.R_SI);
+                val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+                cmp_word((u16) val1, (u16) val2);
+            }
+            M.x86.R_CX -= 1;
+            M.x86.R_SI += inc;
+            M.x86.R_DI += inc;
+            if (ACCESS_FLAG(F_ZF))
+                break;          /* zero flag set means equal */
+        }
+        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
+    }
+    else {
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            val1 = fetch_data_long(M.x86.R_SI);
+            val2 = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+            cmp_long(val1, val2);
+        }
+        else {
+            val1 = fetch_data_word(M.x86.R_SI);
+            val2 = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+            cmp_word((u16) val1, (u16) val2);
+        }
+        M.x86.R_SI += inc;
+        M.x86.R_DI += inc;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xa8
+****************************************************************************/
+static void
+x86emuOp_test_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    int imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("TEST\tAL,");
+    imm = fetch_byte_imm();
+    DECODE_PRINTF2("%04x\n", imm);
+    TRACE_AND_STEP();
+    test_byte(M.x86.R_AL, (u8) imm);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xa9
+****************************************************************************/
+static void
+x86emuOp_test_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("TEST\tEAX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("TEST\tAX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        test_long(M.x86.R_EAX, srcval);
+    }
+    else {
+        test_word(M.x86.R_AX, (u16) srcval);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xaa
+****************************************************************************/
+static void
+x86emuOp_stos_byte(u8 X86EMU_UNUSED(op1))
+{
+    int inc;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("STOS\tBYTE\n");
+    if (ACCESS_FLAG(F_DF))      /* down */
+        inc = -1;
+    else
+        inc = 1;
+    TRACE_AND_STEP();
+    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
+        /* dont care whether REPE or REPNE */
+        /* move them until CX is ZERO. */
+        while (M.x86.R_CX != 0) {
+            store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AL);
+            M.x86.R_CX -= 1;
+            M.x86.R_DI += inc;
+        }
+        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+    }
+    else {
+        store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AL);
+        M.x86.R_DI += inc;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xab
+****************************************************************************/
+static void
+x86emuOp_stos_word(u8 X86EMU_UNUSED(op1))
+{
+    int inc;
+    u32 count;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("STOS\tDWORD\n");
+        if (ACCESS_FLAG(F_DF))  /* down */
+            inc = -4;
+        else
+            inc = 4;
+    }
+    else {
+        DECODE_PRINTF("STOS\tWORD\n");
+        if (ACCESS_FLAG(F_DF))  /* down */
+            inc = -2;
+        else
+            inc = 2;
+    }
+    TRACE_AND_STEP();
+    count = 1;
+    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
+        /* dont care whether REPE or REPNE */
+        /* move them until CX is ZERO. */
+        count = M.x86.R_CX;
+        M.x86.R_CX = 0;
+        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+    }
+    while (count--) {
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            store_data_long_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_EAX);
+        }
+        else {
+            store_data_word_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AX);
+        }
+        M.x86.R_DI += inc;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xac
+****************************************************************************/
+static void
+x86emuOp_lods_byte(u8 X86EMU_UNUSED(op1))
+{
+    int inc;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("LODS\tBYTE\n");
+    TRACE_AND_STEP();
+    if (ACCESS_FLAG(F_DF))      /* down */
+        inc = -1;
+    else
+        inc = 1;
+    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
+        /* dont care whether REPE or REPNE */
+        /* move them until CX is ZERO. */
+        while (M.x86.R_CX != 0) {
+            M.x86.R_AL = fetch_data_byte(M.x86.R_SI);
+            M.x86.R_CX -= 1;
+            M.x86.R_SI += inc;
+        }
+        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+    }
+    else {
+        M.x86.R_AL = fetch_data_byte(M.x86.R_SI);
+        M.x86.R_SI += inc;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xad
+****************************************************************************/
+static void
+x86emuOp_lods_word(u8 X86EMU_UNUSED(op1))
+{
+    int inc;
+    u32 count;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("LODS\tDWORD\n");
+        if (ACCESS_FLAG(F_DF))  /* down */
+            inc = -4;
+        else
+            inc = 4;
+    }
+    else {
+        DECODE_PRINTF("LODS\tWORD\n");
+        if (ACCESS_FLAG(F_DF))  /* down */
+            inc = -2;
+        else
+            inc = 2;
+    }
+    TRACE_AND_STEP();
+    count = 1;
+    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
+        /* dont care whether REPE or REPNE */
+        /* move them until CX is ZERO. */
+        count = M.x86.R_CX;
+        M.x86.R_CX = 0;
+        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+    }
+    while (count--) {
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            M.x86.R_EAX = fetch_data_long(M.x86.R_SI);
+        }
+        else {
+            M.x86.R_AX = fetch_data_word(M.x86.R_SI);
+        }
+        M.x86.R_SI += inc;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xae
+****************************************************************************/
+static void
+x86emuOp_scas_byte(u8 X86EMU_UNUSED(op1))
+{
+    s8 val2;
+    int inc;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("SCAS\tBYTE\n");
+    TRACE_AND_STEP();
+    if (ACCESS_FLAG(F_DF))      /* down */
+        inc = -1;
+    else
+        inc = 1;
+    if (M.x86.mode & SYSMODE_PREFIX_REPE) {
+        /* REPE  */
+        /* move them until CX is ZERO. */
+        while (M.x86.R_CX != 0) {
+            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+            cmp_byte(M.x86.R_AL, val2);
+            M.x86.R_CX -= 1;
+            M.x86.R_DI += inc;
+            if (ACCESS_FLAG(F_ZF) == 0)
+                break;
+        }
+        M.x86.mode &= ~SYSMODE_PREFIX_REPE;
+    }
+    else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {
+        /* REPNE  */
+        /* move them until CX is ZERO. */
+        while (M.x86.R_CX != 0) {
+            val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+            cmp_byte(M.x86.R_AL, val2);
+            M.x86.R_CX -= 1;
+            M.x86.R_DI += inc;
+            if (ACCESS_FLAG(F_ZF))
+                break;          /* zero flag set means equal */
+        }
+        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
+    }
+    else {
+        val2 = fetch_data_byte_abs(M.x86.R_ES, M.x86.R_DI);
+        cmp_byte(M.x86.R_AL, val2);
+        M.x86.R_DI += inc;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xaf
+****************************************************************************/
+static void
+x86emuOp_scas_word(u8 X86EMU_UNUSED(op1))
+{
+    int inc;
+    u32 val;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("SCAS\tDWORD\n");
+        if (ACCESS_FLAG(F_DF))  /* down */
+            inc = -4;
+        else
+            inc = 4;
+    }
+    else {
+        DECODE_PRINTF("SCAS\tWORD\n");
+        if (ACCESS_FLAG(F_DF))  /* down */
+            inc = -2;
+        else
+            inc = 2;
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_REPE) {
+        /* REPE  */
+        /* move them until CX is ZERO. */
+        while (M.x86.R_CX != 0) {
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+                cmp_long(M.x86.R_EAX, val);
+            }
+            else {
+                val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+                cmp_word(M.x86.R_AX, (u16) val);
+            }
+            M.x86.R_CX -= 1;
+            M.x86.R_DI += inc;
+            if (ACCESS_FLAG(F_ZF) == 0)
+                break;
+        }
+        M.x86.mode &= ~SYSMODE_PREFIX_REPE;
+    }
+    else if (M.x86.mode & SYSMODE_PREFIX_REPNE) {
+        /* REPNE  */
+        /* move them until CX is ZERO. */
+        while (M.x86.R_CX != 0) {
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+                cmp_long(M.x86.R_EAX, val);
+            }
+            else {
+                val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+                cmp_word(M.x86.R_AX, (u16) val);
+            }
+            M.x86.R_CX -= 1;
+            M.x86.R_DI += inc;
+            if (ACCESS_FLAG(F_ZF))
+                break;          /* zero flag set means equal */
+        }
+        M.x86.mode &= ~SYSMODE_PREFIX_REPNE;
+    }
+    else {
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            val = fetch_data_long_abs(M.x86.R_ES, M.x86.R_DI);
+            cmp_long(M.x86.R_EAX, val);
+        }
+        else {
+            val = fetch_data_word_abs(M.x86.R_ES, M.x86.R_DI);
+            cmp_word(M.x86.R_AX, (u16) val);
+        }
+        M.x86.R_DI += inc;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xb0
+****************************************************************************/
+static void
+x86emuOp_mov_byte_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\tAL,");
+    imm = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", imm);
+    TRACE_AND_STEP();
+    M.x86.R_AL = imm;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xb1
+****************************************************************************/
+static void
+x86emuOp_mov_byte_CL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\tCL,");
+    imm = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", imm);
+    TRACE_AND_STEP();
+    M.x86.R_CL = imm;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xb2
+****************************************************************************/
+static void
+x86emuOp_mov_byte_DL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\tDL,");
+    imm = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", imm);
+    TRACE_AND_STEP();
+    M.x86.R_DL = imm;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xb3
+****************************************************************************/
+static void
+x86emuOp_mov_byte_BL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\tBL,");
+    imm = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", imm);
+    TRACE_AND_STEP();
+    M.x86.R_BL = imm;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xb4
+****************************************************************************/
+static void
+x86emuOp_mov_byte_AH_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\tAH,");
+    imm = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", imm);
+    TRACE_AND_STEP();
+    M.x86.R_AH = imm;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xb5
+****************************************************************************/
+static void
+x86emuOp_mov_byte_CH_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\tCH,");
+    imm = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", imm);
+    TRACE_AND_STEP();
+    M.x86.R_CH = imm;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xb6
+****************************************************************************/
+static void
+x86emuOp_mov_byte_DH_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\tDH,");
+    imm = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", imm);
+    TRACE_AND_STEP();
+    M.x86.R_DH = imm;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xb7
+****************************************************************************/
+static void
+x86emuOp_mov_byte_BH_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\tBH,");
+    imm = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", imm);
+    TRACE_AND_STEP();
+    M.x86.R_BH = imm;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xb8
+****************************************************************************/
+static void
+x86emuOp_mov_word_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("MOV\tEAX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("MOV\tAX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = srcval;
+    }
+    else {
+        M.x86.R_AX = (u16) srcval;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xb9
+****************************************************************************/
+static void
+x86emuOp_mov_word_CX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("MOV\tECX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("MOV\tCX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ECX = srcval;
+    }
+    else {
+        M.x86.R_CX = (u16) srcval;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xba
+****************************************************************************/
+static void
+x86emuOp_mov_word_DX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("MOV\tEDX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("MOV\tDX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EDX = srcval;
+    }
+    else {
+        M.x86.R_DX = (u16) srcval;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xbb
+****************************************************************************/
+static void
+x86emuOp_mov_word_BX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("MOV\tEBX,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("MOV\tBX,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EBX = srcval;
+    }
+    else {
+        M.x86.R_BX = (u16) srcval;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xbc
+****************************************************************************/
+static void
+x86emuOp_mov_word_SP_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("MOV\tESP,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("MOV\tSP,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ESP = srcval;
+    }
+    else {
+        M.x86.R_SP = (u16) srcval;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xbd
+****************************************************************************/
+static void
+x86emuOp_mov_word_BP_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("MOV\tEBP,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("MOV\tBP,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EBP = srcval;
+    }
+    else {
+        M.x86.R_BP = (u16) srcval;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xbe
+****************************************************************************/
+static void
+x86emuOp_mov_word_SI_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("MOV\tESI,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("MOV\tSI,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_ESI = srcval;
+    }
+    else {
+        M.x86.R_SI = (u16) srcval;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xbf
+****************************************************************************/
+static void
+x86emuOp_mov_word_DI_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 srcval;
+
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("MOV\tEDI,");
+        srcval = fetch_long_imm();
+    }
+    else {
+        DECODE_PRINTF("MOV\tDI,");
+        srcval = fetch_word_imm();
+    }
+    DECODE_PRINTF2("%x\n", srcval);
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EDI = srcval;
+    }
+    else {
+        M.x86.R_DI = (u16) srcval;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/* used by opcodes c0, d0, and d2. */
+static u8(*opcD0_byte_operation[]) (u8 d, u8 s) = {
+    rol_byte, ror_byte, rcl_byte, rcr_byte, shl_byte, shr_byte, shl_byte,       /* sal_byte === shl_byte  by definition */
+sar_byte,};
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xc0
+****************************************************************************/
+static void
+x86emuOp_opcC0_byte_RM_MEM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg;
+    uint destoffset;
+    u8 destval;
+    u8 amt;
+
+    /*
+     * Yet another weirdo special case instruction format.  Part of
+     * the opcode held below in "RH".  Doubly nested case would
+     * result, except that the decoded instruction
+     */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the 
+           above test is done twice. */
+
+        switch (rh) {
+        case 0:
+            DECODE_PRINTF("ROL\t");
+            break;
+        case 1:
+            DECODE_PRINTF("ROR\t");
+            break;
+        case 2:
+            DECODE_PRINTF("RCL\t");
+            break;
+        case 3:
+            DECODE_PRINTF("RCR\t");
+            break;
+        case 4:
+            DECODE_PRINTF("SHL\t");
+            break;
+        case 5:
+            DECODE_PRINTF("SHR\t");
+            break;
+        case 6:
+            DECODE_PRINTF("SAL\t");
+            break;
+        case 7:
+            DECODE_PRINTF("SAR\t");
+            break;
+        }
+    }
+#endif
+    /* know operation, decode the mod byte to find the addressing
+       mode. */
+    switch (mod) {
+    case 0:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm00_address(rl);
+        amt = fetch_byte_imm();
+        DECODE_PRINTF2(",%x\n", amt);
+        destval = fetch_data_byte(destoffset);
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (destval, amt);
+        store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm01_address(rl);
+        amt = fetch_byte_imm();
+        DECODE_PRINTF2(",%x\n", amt);
+        destval = fetch_data_byte(destoffset);
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (destval, amt);
+        store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm10_address(rl);
+        amt = fetch_byte_imm();
+        DECODE_PRINTF2(",%x\n", amt);
+        destval = fetch_data_byte(destoffset);
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (destval, amt);
+        store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        amt = fetch_byte_imm();
+        DECODE_PRINTF2(",%x\n", amt);
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (*destreg, amt);
+        *destreg = destval;
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/* used by opcodes c1, d1, and d3. */
+static u16(*opcD1_word_operation[]) (u16 s, u8 d) = {
+    rol_word, ror_word, rcl_word, rcr_word, shl_word, shr_word, shl_word,       /* sal_byte === shl_byte  by definition */
+sar_word,};
+
+/* used by opcodes c1, d1, and d3. */
+static u32(*opcD1_long_operation[]) (u32 s, u8 d) = {
+    rol_long, ror_long, rcl_long, rcr_long, shl_long, shr_long, shl_long,       /* sal_byte === shl_byte  by definition */
+sar_long,};
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xc1
+****************************************************************************/
+static void
+x86emuOp_opcC1_word_RM_MEM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+    u8 amt;
+
+    /*
+     * Yet another weirdo special case instruction format.  Part of
+     * the opcode held below in "RH".  Doubly nested case would
+     * result, except that the decoded instruction
+     */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the 
+           above test is done twice. */
+
+        switch (rh) {
+        case 0:
+            DECODE_PRINTF("ROL\t");
+            break;
+        case 1:
+            DECODE_PRINTF("ROR\t");
+            break;
+        case 2:
+            DECODE_PRINTF("RCL\t");
+            break;
+        case 3:
+            DECODE_PRINTF("RCR\t");
+            break;
+        case 4:
+            DECODE_PRINTF("SHL\t");
+            break;
+        case 5:
+            DECODE_PRINTF("SHR\t");
+            break;
+        case 6:
+            DECODE_PRINTF("SAL\t");
+            break;
+        case 7:
+            DECODE_PRINTF("SAR\t");
+            break;
+        }
+    }
+#endif
+    /* know operation, decode the mod byte to find the addressing
+       mode. */
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            amt = fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", amt);
+            destval = fetch_data_long(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_long_operation[rh]) (destval, amt);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            amt = fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", amt);
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_word_operation[rh]) (destval, amt);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            amt = fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", amt);
+            destval = fetch_data_long(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_long_operation[rh]) (destval, amt);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            amt = fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", amt);
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_word_operation[rh]) (destval, amt);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm10_address(rl);
+            amt = fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", amt);
+            destval = fetch_data_long(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_long_operation[rh]) (destval, amt);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm10_address(rl);
+            amt = fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", amt);
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_word_operation[rh]) (destval, amt);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            amt = fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", amt);
+            TRACE_AND_STEP();
+            *destreg = (*opcD1_long_operation[rh]) (*destreg, amt);
+        }
+        else {
+            u16 *destreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            amt = fetch_byte_imm();
+            DECODE_PRINTF2(",%x\n", amt);
+            TRACE_AND_STEP();
+            *destreg = (*opcD1_word_operation[rh]) (*destreg, amt);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xc2
+****************************************************************************/
+static void
+x86emuOp_ret_near_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u16 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("RET\t");
+    imm = fetch_word_imm();
+    DECODE_PRINTF2("%x\n", imm);
+    RETURN_TRACE("RET", M.x86.saved_cs, M.x86.saved_ip);
+    TRACE_AND_STEP();
+    M.x86.R_IP = pop_word();
+    M.x86.R_SP += imm;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xc3
+****************************************************************************/
+static void
+x86emuOp_ret_near(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("RET\n");
+    RETURN_TRACE("RET", M.x86.saved_cs, M.x86.saved_ip);
+    TRACE_AND_STEP();
+    M.x86.R_IP = pop_word();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xc4
+****************************************************************************/
+static void
+x86emuOp_les_R_IMM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rh, rl;
+    u16 *dstreg;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("LES\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        dstreg = DECODE_RM_WORD_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *dstreg = fetch_data_word(srcoffset);
+        M.x86.R_ES = fetch_data_word(srcoffset + 2);
+        break;
+    case 1:
+        dstreg = DECODE_RM_WORD_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *dstreg = fetch_data_word(srcoffset);
+        M.x86.R_ES = fetch_data_word(srcoffset + 2);
+        break;
+    case 2:
+        dstreg = DECODE_RM_WORD_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *dstreg = fetch_data_word(srcoffset);
+        M.x86.R_ES = fetch_data_word(srcoffset + 2);
+        break;
+    case 3:                    /* register to register */
+        /* UNDEFINED! */
+        TRACE_AND_STEP();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xc5
+****************************************************************************/
+static void
+x86emuOp_lds_R_IMM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rh, rl;
+    u16 *dstreg;
+    uint srcoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("LDS\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        dstreg = DECODE_RM_WORD_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm00_address(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *dstreg = fetch_data_word(srcoffset);
+        M.x86.R_DS = fetch_data_word(srcoffset + 2);
+        break;
+    case 1:
+        dstreg = DECODE_RM_WORD_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm01_address(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *dstreg = fetch_data_word(srcoffset);
+        M.x86.R_DS = fetch_data_word(srcoffset + 2);
+        break;
+    case 2:
+        dstreg = DECODE_RM_WORD_REGISTER(rh);
+        DECODE_PRINTF(",");
+        srcoffset = decode_rm10_address(rl);
+        DECODE_PRINTF("\n");
+        TRACE_AND_STEP();
+        *dstreg = fetch_data_word(srcoffset);
+        M.x86.R_DS = fetch_data_word(srcoffset + 2);
+        break;
+    case 3:                    /* register to register */
+        /* UNDEFINED! */
+        TRACE_AND_STEP();
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xc6
+****************************************************************************/
+static void
+x86emuOp_mov_byte_RM_IMM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg;
+    uint destoffset;
+    u8 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    if (rh != 0) {
+        DECODE_PRINTF("ILLEGAL DECODE OF OPCODE c6\n");
+        HALT_SYS();
+    }
+    switch (mod) {
+    case 0:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm00_address(rl);
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2(",%2x\n", imm);
+        TRACE_AND_STEP();
+        store_data_byte(destoffset, imm);
+        break;
+    case 1:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm01_address(rl);
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2(",%2x\n", imm);
+        TRACE_AND_STEP();
+        store_data_byte(destoffset, imm);
+        break;
+    case 2:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm10_address(rl);
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2(",%2x\n", imm);
+        TRACE_AND_STEP();
+        store_data_byte(destoffset, imm);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        imm = fetch_byte_imm();
+        DECODE_PRINTF2(",%2x\n", imm);
+        TRACE_AND_STEP();
+        *destreg = imm;
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xc7
+****************************************************************************/
+static void
+x86emuOp_mov_word_RM_IMM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("MOV\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    if (rh != 0) {
+        DECODE_PRINTF("ILLEGAL DECODE OF OPCODE 8F\n");
+        HALT_SYS();
+    }
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 imm;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            imm = fetch_long_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            store_data_long(destoffset, imm);
+        }
+        else {
+            u16 imm;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            imm = fetch_word_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            store_data_word(destoffset, imm);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 imm;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            imm = fetch_long_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            store_data_long(destoffset, imm);
+        }
+        else {
+            u16 imm;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            imm = fetch_word_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            store_data_word(destoffset, imm);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 imm;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm10_address(rl);
+            imm = fetch_long_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            store_data_long(destoffset, imm);
+        }
+        else {
+            u16 imm;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm10_address(rl);
+            imm = fetch_word_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            store_data_word(destoffset, imm);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+            u32 imm;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            imm = fetch_long_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            *destreg = imm;
+        }
+        else {
+            u16 *destreg;
+            u16 imm;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            imm = fetch_word_imm();
+            DECODE_PRINTF2(",%x\n", imm);
+            TRACE_AND_STEP();
+            *destreg = imm;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xc8
+****************************************************************************/
+static void
+x86emuOp_enter(u8 X86EMU_UNUSED(op1))
+{
+    u16 local, frame_pointer;
+    u8 nesting;
+    int i;
+
+    START_OF_INSTR();
+    local = fetch_word_imm();
+    nesting = fetch_byte_imm();
+    DECODE_PRINTF2("ENTER %x\n", local);
+    DECODE_PRINTF2(",%x\n", nesting);
+    TRACE_AND_STEP();
+    push_word(M.x86.R_BP);
+    frame_pointer = M.x86.R_SP;
+    if (nesting > 0) {
+        for (i = 1; i < nesting; i++) {
+            M.x86.R_BP -= 2;
+            push_word(fetch_data_word_abs(M.x86.R_SS, M.x86.R_BP));
+        }
+        push_word(frame_pointer);
+    }
+    M.x86.R_BP = frame_pointer;
+    M.x86.R_SP = (u16) (M.x86.R_SP - local);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xc9
+****************************************************************************/
+static void
+x86emuOp_leave(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("LEAVE\n");
+    TRACE_AND_STEP();
+    M.x86.R_SP = M.x86.R_BP;
+    M.x86.R_BP = pop_word();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xca
+****************************************************************************/
+static void
+x86emuOp_ret_far_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u16 imm;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("RETF\t");
+    imm = fetch_word_imm();
+    DECODE_PRINTF2("%x\n", imm);
+    RETURN_TRACE("RETF", M.x86.saved_cs, M.x86.saved_ip);
+    TRACE_AND_STEP();
+    M.x86.R_IP = pop_word();
+    M.x86.R_CS = pop_word();
+    M.x86.R_SP += imm;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xcb
+****************************************************************************/
+static void
+x86emuOp_ret_far(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("RETF\n");
+    RETURN_TRACE("RETF", M.x86.saved_cs, M.x86.saved_ip);
+    TRACE_AND_STEP();
+    M.x86.R_IP = pop_word();
+    M.x86.R_CS = pop_word();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xcc
+****************************************************************************/
+static void
+x86emuOp_int3(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("INT 3\n");
+    TRACE_AND_STEP();
+    if (_X86EMU_intrTab[3]) {
+        (*_X86EMU_intrTab[3]) (3);
+    }
+    else {
+        push_word((u16) M.x86.R_FLG);
+        CLEAR_FLAG(F_IF);
+        CLEAR_FLAG(F_TF);
+        push_word(M.x86.R_CS);
+        M.x86.R_CS = mem_access_word(3 * 4 + 2);
+        push_word(M.x86.R_IP);
+        M.x86.R_IP = mem_access_word(3 * 4);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xcd
+****************************************************************************/
+static void
+x86emuOp_int_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 intnum;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("INT\t");
+    intnum = fetch_byte_imm();
+    DECODE_PRINTF2("%x\n", intnum);
+    TRACE_AND_STEP();
+    if (_X86EMU_intrTab[intnum]) {
+        (*_X86EMU_intrTab[intnum]) (intnum);
+    }
+    else {
+        push_word((u16) M.x86.R_FLG);
+        CLEAR_FLAG(F_IF);
+        CLEAR_FLAG(F_TF);
+        push_word(M.x86.R_CS);
+        M.x86.R_CS = mem_access_word(intnum * 4 + 2);
+        push_word(M.x86.R_IP);
+        M.x86.R_IP = mem_access_word(intnum * 4);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xce
+****************************************************************************/
+static void
+x86emuOp_into(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("INTO\n");
+    TRACE_AND_STEP();
+    if (ACCESS_FLAG(F_OF)) {
+        if (_X86EMU_intrTab[4]) {
+            (*_X86EMU_intrTab[4]) (4);
+        }
+        else {
+            push_word((u16) M.x86.R_FLG);
+            CLEAR_FLAG(F_IF);
+            CLEAR_FLAG(F_TF);
+            push_word(M.x86.R_CS);
+            M.x86.R_CS = mem_access_word(4 * 4 + 2);
+            push_word(M.x86.R_IP);
+            M.x86.R_IP = mem_access_word(4 * 4);
+        }
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xcf
+****************************************************************************/
+static void
+x86emuOp_iret(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("IRET\n");
+
+    TRACE_AND_STEP();
+
+    M.x86.R_IP = pop_word();
+    M.x86.R_CS = pop_word();
+    M.x86.R_FLG = pop_word();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xd0
+****************************************************************************/
+static void
+x86emuOp_opcD0_byte_RM_1(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg;
+    uint destoffset;
+    u8 destval;
+
+    /*
+     * Yet another weirdo special case instruction format.  Part of
+     * the opcode held below in "RH".  Doubly nested case would
+     * result, except that the decoded instruction
+     */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the
+           above test is done twice. */
+        switch (rh) {
+        case 0:
+            DECODE_PRINTF("ROL\t");
+            break;
+        case 1:
+            DECODE_PRINTF("ROR\t");
+            break;
+        case 2:
+            DECODE_PRINTF("RCL\t");
+            break;
+        case 3:
+            DECODE_PRINTF("RCR\t");
+            break;
+        case 4:
+            DECODE_PRINTF("SHL\t");
+            break;
+        case 5:
+            DECODE_PRINTF("SHR\t");
+            break;
+        case 6:
+            DECODE_PRINTF("SAL\t");
+            break;
+        case 7:
+            DECODE_PRINTF("SAR\t");
+            break;
+        }
+    }
+#endif
+    /* know operation, decode the mod byte to find the addressing
+       mode. */
+    switch (mod) {
+    case 0:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",1\n");
+        destval = fetch_data_byte(destoffset);
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (destval, 1);
+        store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",1\n");
+        destval = fetch_data_byte(destoffset);
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (destval, 1);
+        store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",1\n");
+        destval = fetch_data_byte(destoffset);
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (destval, 1);
+        store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",1\n");
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (*destreg, 1);
+        *destreg = destval;
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xd1
+****************************************************************************/
+static void
+x86emuOp_opcD1_word_RM_1(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    /*
+     * Yet another weirdo special case instruction format.  Part of
+     * the opcode held below in "RH".  Doubly nested case would
+     * result, except that the decoded instruction
+     */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the
+           above test is done twice. */
+        switch (rh) {
+        case 0:
+            DECODE_PRINTF("ROL\t");
+            break;
+        case 1:
+            DECODE_PRINTF("ROR\t");
+            break;
+        case 2:
+            DECODE_PRINTF("RCL\t");
+            break;
+        case 3:
+            DECODE_PRINTF("RCR\t");
+            break;
+        case 4:
+            DECODE_PRINTF("SHL\t");
+            break;
+        case 5:
+            DECODE_PRINTF("SHR\t");
+            break;
+        case 6:
+            DECODE_PRINTF("SAL\t");
+            break;
+        case 7:
+            DECODE_PRINTF("SAR\t");
+            break;
+        }
+    }
+#endif
+    /* know operation, decode the mod byte to find the addressing
+       mode. */
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",1\n");
+            destval = fetch_data_long(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_long_operation[rh]) (destval, 1);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",1\n");
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_word_operation[rh]) (destval, 1);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",1\n");
+            destval = fetch_data_long(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_long_operation[rh]) (destval, 1);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",1\n");
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_word_operation[rh]) (destval, 1);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",1\n");
+            destval = fetch_data_long(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_long_operation[rh]) (destval, 1);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            DECODE_PRINTF("BYTE PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",1\n");
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_word_operation[rh]) (destval, 1);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+            u32 *destreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",1\n");
+            TRACE_AND_STEP();
+            destval = (*opcD1_long_operation[rh]) (*destreg, 1);
+            *destreg = destval;
+        }
+        else {
+            u16 destval;
+            u16 *destreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",1\n");
+            TRACE_AND_STEP();
+            destval = (*opcD1_word_operation[rh]) (*destreg, 1);
+            *destreg = destval;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xd2
+****************************************************************************/
+static void
+x86emuOp_opcD2_byte_RM_CL(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg;
+    uint destoffset;
+    u8 destval;
+    u8 amt;
+
+    /*
+     * Yet another weirdo special case instruction format.  Part of
+     * the opcode held below in "RH".  Doubly nested case would
+     * result, except that the decoded instruction
+     */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the 
+           above test is done twice. */
+        switch (rh) {
+        case 0:
+            DECODE_PRINTF("ROL\t");
+            break;
+        case 1:
+            DECODE_PRINTF("ROR\t");
+            break;
+        case 2:
+            DECODE_PRINTF("RCL\t");
+            break;
+        case 3:
+            DECODE_PRINTF("RCR\t");
+            break;
+        case 4:
+            DECODE_PRINTF("SHL\t");
+            break;
+        case 5:
+            DECODE_PRINTF("SHR\t");
+            break;
+        case 6:
+            DECODE_PRINTF("SAL\t");
+            break;
+        case 7:
+            DECODE_PRINTF("SAR\t");
+            break;
+        }
+    }
+#endif
+    /* know operation, decode the mod byte to find the addressing
+       mode. */
+    amt = M.x86.R_CL;
+    switch (mod) {
+    case 0:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF(",CL\n");
+        destval = fetch_data_byte(destoffset);
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (destval, amt);
+        store_data_byte(destoffset, destval);
+        break;
+    case 1:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF(",CL\n");
+        destval = fetch_data_byte(destoffset);
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (destval, amt);
+        store_data_byte(destoffset, destval);
+        break;
+    case 2:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF(",CL\n");
+        destval = fetch_data_byte(destoffset);
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (destval, amt);
+        store_data_byte(destoffset, destval);
+        break;
+    case 3:                    /* register to register */
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF(",CL\n");
+        TRACE_AND_STEP();
+        destval = (*opcD0_byte_operation[rh]) (*destreg, amt);
+        *destreg = destval;
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xd3
+****************************************************************************/
+static void
+x86emuOp_opcD3_word_RM_CL(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+    u8 amt;
+
+    /*
+     * Yet another weirdo special case instruction format.  Part of
+     * the opcode held below in "RH".  Doubly nested case would
+     * result, except that the decoded instruction
+     */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the 
+           above test is done twice. */
+        switch (rh) {
+        case 0:
+            DECODE_PRINTF("ROL\t");
+            break;
+        case 1:
+            DECODE_PRINTF("ROR\t");
+            break;
+        case 2:
+            DECODE_PRINTF("RCL\t");
+            break;
+        case 3:
+            DECODE_PRINTF("RCR\t");
+            break;
+        case 4:
+            DECODE_PRINTF("SHL\t");
+            break;
+        case 5:
+            DECODE_PRINTF("SHR\t");
+            break;
+        case 6:
+            DECODE_PRINTF("SAL\t");
+            break;
+        case 7:
+            DECODE_PRINTF("SAR\t");
+            break;
+        }
+    }
+#endif
+    /* know operation, decode the mod byte to find the addressing
+       mode. */
+    amt = M.x86.R_CL;
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",CL\n");
+            destval = fetch_data_long(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_long_operation[rh]) (destval, amt);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",CL\n");
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_word_operation[rh]) (destval, amt);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",CL\n");
+            destval = fetch_data_long(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_long_operation[rh]) (destval, amt);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",CL\n");
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_word_operation[rh]) (destval, amt);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 destval;
+
+            DECODE_PRINTF("DWORD PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",CL\n");
+            destval = fetch_data_long(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_long_operation[rh]) (destval, amt);
+            store_data_long(destoffset, destval);
+        }
+        else {
+            u16 destval;
+
+            DECODE_PRINTF("WORD PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",CL\n");
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            destval = (*opcD1_word_operation[rh]) (destval, amt);
+            store_data_word(destoffset, destval);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *destreg;
+
+            destreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",CL\n");
+            TRACE_AND_STEP();
+            *destreg = (*opcD1_long_operation[rh]) (*destreg, amt);
+        }
+        else {
+            u16 *destreg;
+
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",CL\n");
+            TRACE_AND_STEP();
+            *destreg = (*opcD1_word_operation[rh]) (*destreg, amt);
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xd4
+****************************************************************************/
+static void
+x86emuOp_aam(u8 X86EMU_UNUSED(op1))
+{
+    u8 a;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("AAM\n");
+    a = fetch_byte_imm();       /* this is a stupid encoding. */
+    if (a != 10) {
+        /* fix: add base decoding
+           aam_word(u8 val, int base a) */
+        DECODE_PRINTF("ERROR DECODING AAM\n");
+        TRACE_REGS();
+        HALT_SYS();
+    }
+    TRACE_AND_STEP();
+    /* note the type change here --- returning AL and AH in AX. */
+    M.x86.R_AX = aam_word(M.x86.R_AL);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xd5
+****************************************************************************/
+static void
+x86emuOp_aad(u8 X86EMU_UNUSED(op1))
+{
+    u8 a;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("AAD\n");
+    a = fetch_byte_imm();
+    if (a != 10) {
+        /* fix: add base decoding
+           aad_word(u16 val, int base a) */
+        DECODE_PRINTF("ERROR DECODING AAM\n");
+        TRACE_REGS();
+        HALT_SYS();
+    }
+    TRACE_AND_STEP();
+    M.x86.R_AX = aad_word(M.x86.R_AX);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/* opcode 0xd6 ILLEGAL OPCODE */
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xd7
+****************************************************************************/
+static void
+x86emuOp_xlat(u8 X86EMU_UNUSED(op1))
+{
+    u16 addr;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("XLAT\n");
+    TRACE_AND_STEP();
+    addr = (u16) (M.x86.R_BX + (u8) M.x86.R_AL);
+    M.x86.R_AL = fetch_data_byte(addr);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/* instuctions  D8 .. DF are in i87_ops.c */
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xe0
+****************************************************************************/
+static void
+x86emuOp_loopne(u8 X86EMU_UNUSED(op1))
+{
+    s16 ip;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("LOOPNE\t");
+    ip = (s8) fetch_byte_imm();
+    ip += (s16) M.x86.R_IP;
+    DECODE_PRINTF2("%04x\n", ip);
+    TRACE_AND_STEP();
+    M.x86.R_CX -= 1;
+    if (M.x86.R_CX != 0 && !ACCESS_FLAG(F_ZF))  /* CX != 0 and !ZF */
+        M.x86.R_IP = ip;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xe1
+****************************************************************************/
+static void
+x86emuOp_loope(u8 X86EMU_UNUSED(op1))
+{
+    s16 ip;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("LOOPE\t");
+    ip = (s8) fetch_byte_imm();
+    ip += (s16) M.x86.R_IP;
+    DECODE_PRINTF2("%04x\n", ip);
+    TRACE_AND_STEP();
+    M.x86.R_CX -= 1;
+    if (M.x86.R_CX != 0 && ACCESS_FLAG(F_ZF))   /* CX != 0 and ZF */
+        M.x86.R_IP = ip;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xe2
+****************************************************************************/
+static void
+x86emuOp_loop(u8 X86EMU_UNUSED(op1))
+{
+    s16 ip;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("LOOP\t");
+    ip = (s8) fetch_byte_imm();
+    ip += (s16) M.x86.R_IP;
+    DECODE_PRINTF2("%04x\n", ip);
+    TRACE_AND_STEP();
+    M.x86.R_CX -= 1;
+    if (M.x86.R_CX != 0)
+        M.x86.R_IP = ip;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xe3
+****************************************************************************/
+static void
+x86emuOp_jcxz(u8 X86EMU_UNUSED(op1))
+{
+    u16 target;
+    s8 offset;
+
+    /* jump to byte offset if overflow flag is set */
+    START_OF_INSTR();
+    DECODE_PRINTF("JCXZ\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    if (M.x86.R_CX == 0)
+        M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xe4
+****************************************************************************/
+static void
+x86emuOp_in_byte_AL_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 port;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("IN\t");
+    port = (u8) fetch_byte_imm();
+    DECODE_PRINTF2("%x,AL\n", port);
+    TRACE_AND_STEP();
+    M.x86.R_AL = (*sys_inb) (port);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xe5
+****************************************************************************/
+static void
+x86emuOp_in_word_AX_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u8 port;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("IN\t");
+    port = (u8) fetch_byte_imm();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF2("EAX,%x\n", port);
+    }
+    else {
+        DECODE_PRINTF2("AX,%x\n", port);
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = (*sys_inl) (port);
+    }
+    else {
+        M.x86.R_AX = (*sys_inw) (port);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xe6
+****************************************************************************/
+static void
+x86emuOp_out_byte_IMM_AL(u8 X86EMU_UNUSED(op1))
+{
+    u8 port;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("OUT\t");
+    port = (u8) fetch_byte_imm();
+    DECODE_PRINTF2("%x,AL\n", port);
+    TRACE_AND_STEP();
+    (*sys_outb) (port, M.x86.R_AL);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xe7
+****************************************************************************/
+static void
+x86emuOp_out_word_IMM_AX(u8 X86EMU_UNUSED(op1))
+{
+    u8 port;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("OUT\t");
+    port = (u8) fetch_byte_imm();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF2("%x,EAX\n", port);
+    }
+    else {
+        DECODE_PRINTF2("%x,AX\n", port);
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        (*sys_outl) (port, M.x86.R_EAX);
+    }
+    else {
+        (*sys_outw) (port, M.x86.R_AX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xe8
+****************************************************************************/
+static void
+x86emuOp_call_near_IMM(u8 X86EMU_UNUSED(op1))
+{
+    s16 ip16;
+    s32 ip32;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("CALL\t");
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        ip32 = (s32) fetch_long_imm();
+        ip32 += (s16) M.x86.R_IP;       /* CHECK SIGN */
+        DECODE_PRINTF2("%04x\n", (u16) ip32);
+        CALL_TRACE(M.x86.saved_cs, M.x86.saved_ip, M.x86.R_CS, ip32, "");
+    }
+    else {
+        ip16 = (s16) fetch_word_imm();
+        ip16 += (s16) M.x86.R_IP;       /* CHECK SIGN */
+        DECODE_PRINTF2("%04x\n", (u16) ip16);
+        CALL_TRACE(M.x86.saved_cs, M.x86.saved_ip, M.x86.R_CS, ip16, "");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        push_long(M.x86.R_EIP);
+        M.x86.R_EIP = ip32 & 0xffff;
+    }
+    else {
+        push_word(M.x86.R_IP);
+        M.x86.R_EIP = ip16;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xe9
+****************************************************************************/
+static void
+x86emuOp_jump_near_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u32 ip;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("JMP\t");
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        ip = (u32) fetch_long_imm();
+        ip += (u32) M.x86.R_EIP;
+        DECODE_PRINTF2("%08x\n", (u32) ip);
+        TRACE_AND_STEP();
+        M.x86.R_EIP = (u32) ip;
+    }
+    else {
+        ip = (s16) fetch_word_imm();
+        ip += (s16) M.x86.R_IP;
+        DECODE_PRINTF2("%04x\n", (u16) ip);
+        TRACE_AND_STEP();
+        M.x86.R_IP = (u16) ip;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xea
+****************************************************************************/
+static void
+x86emuOp_jump_far_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u16 cs;
+    u32 ip;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("JMP\tFAR ");
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        ip = fetch_long_imm();
+    }
+    else {
+        ip = fetch_word_imm();
+    }
+    cs = fetch_word_imm();
+    DECODE_PRINTF2("%04x:", cs);
+    DECODE_PRINTF2("%04x\n", ip);
+    TRACE_AND_STEP();
+    M.x86.R_EIP = ip & 0xffff;
+    M.x86.R_CS = cs;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xeb
+****************************************************************************/
+static void
+x86emuOp_jump_byte_IMM(u8 X86EMU_UNUSED(op1))
+{
+    u16 target;
+    s8 offset;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("JMP\t");
+    offset = (s8) fetch_byte_imm();
+    target = (u16) (M.x86.R_IP + offset);
+    DECODE_PRINTF2("%x\n", target);
+    TRACE_AND_STEP();
+    M.x86.R_IP = target;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xec
+****************************************************************************/
+static void
+x86emuOp_in_byte_AL_DX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("IN\tAL,DX\n");
+    TRACE_AND_STEP();
+    M.x86.R_AL = (*sys_inb) (M.x86.R_DX);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xed
+****************************************************************************/
+static void
+x86emuOp_in_word_AX_DX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("IN\tEAX,DX\n");
+    }
+    else {
+        DECODE_PRINTF("IN\tAX,DX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        M.x86.R_EAX = (*sys_inl) (M.x86.R_DX);
+    }
+    else {
+        M.x86.R_AX = (*sys_inw) (M.x86.R_DX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xee
+****************************************************************************/
+static void
+x86emuOp_out_byte_DX_AL(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("OUT\tDX,AL\n");
+    TRACE_AND_STEP();
+    (*sys_outb) (M.x86.R_DX, M.x86.R_AL);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xef
+****************************************************************************/
+static void
+x86emuOp_out_word_DX_AX(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        DECODE_PRINTF("OUT\tDX,EAX\n");
+    }
+    else {
+        DECODE_PRINTF("OUT\tDX,AX\n");
+    }
+    TRACE_AND_STEP();
+    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+        (*sys_outl) (M.x86.R_DX, M.x86.R_EAX);
+    }
+    else {
+        (*sys_outw) (M.x86.R_DX, M.x86.R_AX);
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xf0
+****************************************************************************/
+static void
+x86emuOp_lock(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("LOCK:\n");
+    TRACE_AND_STEP();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/*opcode 0xf1 ILLEGAL OPERATION */
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xf2
+****************************************************************************/
+static void
+x86emuOp_repne(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("REPNE\n");
+    TRACE_AND_STEP();
+    M.x86.mode |= SYSMODE_PREFIX_REPNE;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xf3
+****************************************************************************/
+static void
+x86emuOp_repe(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("REPE\n");
+    TRACE_AND_STEP();
+    M.x86.mode |= SYSMODE_PREFIX_REPE;
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xf4
+****************************************************************************/
+static void
+x86emuOp_halt(u8 X86EMU_UNUSED(op1))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("HALT\n");
+    TRACE_AND_STEP();
+    HALT_SYS();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xf5
+****************************************************************************/
+static void
+x86emuOp_cmc(u8 X86EMU_UNUSED(op1))
+{
+    /* complement the carry flag. */
+    START_OF_INSTR();
+    DECODE_PRINTF("CMC\n");
+    TRACE_AND_STEP();
+    TOGGLE_FLAG(F_CF);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xf6
+****************************************************************************/
+static void
+x86emuOp_opcF6_byte_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    u8 *destreg;
+    uint destoffset;
+    u8 destval, srcval;
+
+    /* long, drawn out code follows.  Double switch for a total
+       of 32 cases.  */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:                    /* mod=00 */
+        switch (rh) {
+        case 0:                /* test byte imm */
+            DECODE_PRINTF("TEST\tBYTE PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            srcval = fetch_byte_imm();
+            DECODE_PRINTF2("%02x\n", srcval);
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            test_byte(destval, srcval);
+            break;
+        case 1:
+            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");
+            HALT_SYS();
+            break;
+        case 2:
+            DECODE_PRINTF("NOT\tBYTE PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = not_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        case 3:
+            DECODE_PRINTF("NEG\tBYTE PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = neg_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        case 4:
+            DECODE_PRINTF("MUL\tBYTE PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            mul_byte(destval);
+            break;
+        case 5:
+            DECODE_PRINTF("IMUL\tBYTE PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            imul_byte(destval);
+            break;
+        case 6:
+            DECODE_PRINTF("DIV\tBYTE PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            div_byte(destval);
+            break;
+        case 7:
+            DECODE_PRINTF("IDIV\tBYTE PTR ");
+            destoffset = decode_rm00_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            idiv_byte(destval);
+            break;
+        }
+        break;                  /* end mod==00 */
+    case 1:                    /* mod=01 */
+        switch (rh) {
+        case 0:                /* test byte imm */
+            DECODE_PRINTF("TEST\tBYTE PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            srcval = fetch_byte_imm();
+            DECODE_PRINTF2("%02x\n", srcval);
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            test_byte(destval, srcval);
+            break;
+        case 1:
+            DECODE_PRINTF("ILLEGAL OP MOD=01 RH=01 OP=F6\n");
+            HALT_SYS();
+            break;
+        case 2:
+            DECODE_PRINTF("NOT\tBYTE PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = not_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        case 3:
+            DECODE_PRINTF("NEG\tBYTE PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = neg_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        case 4:
+            DECODE_PRINTF("MUL\tBYTE PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            mul_byte(destval);
+            break;
+        case 5:
+            DECODE_PRINTF("IMUL\tBYTE PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            imul_byte(destval);
+            break;
+        case 6:
+            DECODE_PRINTF("DIV\tBYTE PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            div_byte(destval);
+            break;
+        case 7:
+            DECODE_PRINTF("IDIV\tBYTE PTR ");
+            destoffset = decode_rm01_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            idiv_byte(destval);
+            break;
+        }
+        break;                  /* end mod==01 */
+    case 2:                    /* mod=10 */
+        switch (rh) {
+        case 0:                /* test byte imm */
+            DECODE_PRINTF("TEST\tBYTE PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            srcval = fetch_byte_imm();
+            DECODE_PRINTF2("%02x\n", srcval);
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            test_byte(destval, srcval);
+            break;
+        case 1:
+            DECODE_PRINTF("ILLEGAL OP MOD=10 RH=01 OP=F6\n");
+            HALT_SYS();
+            break;
+        case 2:
+            DECODE_PRINTF("NOT\tBYTE PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = not_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        case 3:
+            DECODE_PRINTF("NEG\tBYTE PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = neg_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        case 4:
+            DECODE_PRINTF("MUL\tBYTE PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            mul_byte(destval);
+            break;
+        case 5:
+            DECODE_PRINTF("IMUL\tBYTE PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            imul_byte(destval);
+            break;
+        case 6:
+            DECODE_PRINTF("DIV\tBYTE PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            div_byte(destval);
+            break;
+        case 7:
+            DECODE_PRINTF("IDIV\tBYTE PTR ");
+            destoffset = decode_rm10_address(rl);
+            DECODE_PRINTF("\n");
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            idiv_byte(destval);
+            break;
+        }
+        break;                  /* end mod==10 */
+    case 3:                    /* mod=11 */
+        switch (rh) {
+        case 0:                /* test byte imm */
+            DECODE_PRINTF("TEST\t");
+            destreg = DECODE_RM_BYTE_REGISTER(rl);
+            DECODE_PRINTF(",");
+            srcval = fetch_byte_imm();
+            DECODE_PRINTF2("%02x\n", srcval);
+            TRACE_AND_STEP();
+            test_byte(*destreg, srcval);
+            break;
+        case 1:
+            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");
+            HALT_SYS();
+            break;
+        case 2:
+            DECODE_PRINTF("NOT\t");
+            destreg = DECODE_RM_BYTE_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = not_byte(*destreg);
+            break;
+        case 3:
+            DECODE_PRINTF("NEG\t");
+            destreg = DECODE_RM_BYTE_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            *destreg = neg_byte(*destreg);
+            break;
+        case 4:
+            DECODE_PRINTF("MUL\t");
+            destreg = DECODE_RM_BYTE_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            mul_byte(*destreg); /*!!!  */
+            break;
+        case 5:
+            DECODE_PRINTF("IMUL\t");
+            destreg = DECODE_RM_BYTE_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            imul_byte(*destreg);
+            break;
+        case 6:
+            DECODE_PRINTF("DIV\t");
+            destreg = DECODE_RM_BYTE_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            div_byte(*destreg);
+            break;
+        case 7:
+            DECODE_PRINTF("IDIV\t");
+            destreg = DECODE_RM_BYTE_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            idiv_byte(*destreg);
+            break;
+        }
+        break;                  /* end mod==11 */
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xf7
+****************************************************************************/
+static void
+x86emuOp_opcF7_word_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rl, rh;
+    uint destoffset;
+
+    /* long, drawn out code follows.  Double switch for a total
+       of 32 cases.  */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:                    /* mod=00 */
+        switch (rh) {
+        case 0:                /* test word imm */
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval, srcval;
+
+                DECODE_PRINTF("TEST\tDWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF(",");
+                srcval = fetch_long_imm();
+                DECODE_PRINTF2("%x\n", srcval);
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                test_long(destval, srcval);
+            }
+            else {
+                u16 destval, srcval;
+
+                DECODE_PRINTF("TEST\tWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF(",");
+                srcval = fetch_word_imm();
+                DECODE_PRINTF2("%x\n", srcval);
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                test_word(destval, srcval);
+            }
+            break;
+        case 1:
+            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F7\n");
+            HALT_SYS();
+            break;
+        case 2:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("NOT\tDWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = not_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("NOT\tWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = not_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 3:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("NEG\tDWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = neg_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("NEG\tWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = neg_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 4:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("MUL\tDWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                mul_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("MUL\tWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                mul_word(destval);
+            }
+            break;
+        case 5:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("IMUL\tDWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                imul_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("IMUL\tWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                imul_word(destval);
+            }
+            break;
+        case 6:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("DIV\tDWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                div_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("DIV\tWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                div_word(destval);
+            }
+            break;
+        case 7:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("IDIV\tDWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                idiv_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("IDIV\tWORD PTR ");
+                destoffset = decode_rm00_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                idiv_word(destval);
+            }
+            break;
+        }
+        break;                  /* end mod==00 */
+    case 1:                    /* mod=01 */
+        switch (rh) {
+        case 0:                /* test word imm */
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval, srcval;
+
+                DECODE_PRINTF("TEST\tDWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF(",");
+                srcval = fetch_long_imm();
+                DECODE_PRINTF2("%x\n", srcval);
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                test_long(destval, srcval);
+            }
+            else {
+                u16 destval, srcval;
+
+                DECODE_PRINTF("TEST\tWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF(",");
+                srcval = fetch_word_imm();
+                DECODE_PRINTF2("%x\n", srcval);
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                test_word(destval, srcval);
+            }
+            break;
+        case 1:
+            DECODE_PRINTF("ILLEGAL OP MOD=01 RH=01 OP=F6\n");
+            HALT_SYS();
+            break;
+        case 2:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("NOT\tDWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = not_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("NOT\tWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = not_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 3:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("NEG\tDWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = neg_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("NEG\tWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = neg_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 4:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("MUL\tDWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                mul_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("MUL\tWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                mul_word(destval);
+            }
+            break;
+        case 5:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("IMUL\tDWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                imul_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("IMUL\tWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                imul_word(destval);
+            }
+            break;
+        case 6:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("DIV\tDWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                div_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("DIV\tWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                div_word(destval);
+            }
+            break;
+        case 7:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("IDIV\tDWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                idiv_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("IDIV\tWORD PTR ");
+                destoffset = decode_rm01_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                idiv_word(destval);
+            }
+            break;
+        }
+        break;                  /* end mod==01 */
+    case 2:                    /* mod=10 */
+        switch (rh) {
+        case 0:                /* test word imm */
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval, srcval;
+
+                DECODE_PRINTF("TEST\tDWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF(",");
+                srcval = fetch_long_imm();
+                DECODE_PRINTF2("%x\n", srcval);
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                test_long(destval, srcval);
+            }
+            else {
+                u16 destval, srcval;
+
+                DECODE_PRINTF("TEST\tWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF(",");
+                srcval = fetch_word_imm();
+                DECODE_PRINTF2("%x\n", srcval);
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                test_word(destval, srcval);
+            }
+            break;
+        case 1:
+            DECODE_PRINTF("ILLEGAL OP MOD=10 RH=01 OP=F6\n");
+            HALT_SYS();
+            break;
+        case 2:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("NOT\tDWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = not_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("NOT\tWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = not_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 3:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("NEG\tDWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = neg_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("NEG\tWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = neg_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 4:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("MUL\tDWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                mul_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("MUL\tWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                mul_word(destval);
+            }
+            break;
+        case 5:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("IMUL\tDWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                imul_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("IMUL\tWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                imul_word(destval);
+            }
+            break;
+        case 6:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("DIV\tDWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                div_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("DIV\tWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                div_word(destval);
+            }
+            break;
+        case 7:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                DECODE_PRINTF("IDIV\tDWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                idiv_long(destval);
+            }
+            else {
+                u16 destval;
+
+                DECODE_PRINTF("IDIV\tWORD PTR ");
+                destoffset = decode_rm10_address(rl);
+                DECODE_PRINTF("\n");
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                idiv_word(destval);
+            }
+            break;
+        }
+        break;                  /* end mod==10 */
+    case 3:                    /* mod=11 */
+        switch (rh) {
+        case 0:                /* test word imm */
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 *destreg;
+                u32 srcval;
+
+                DECODE_PRINTF("TEST\t");
+                destreg = DECODE_RM_LONG_REGISTER(rl);
+                DECODE_PRINTF(",");
+                srcval = fetch_long_imm();
+                DECODE_PRINTF2("%x\n", srcval);
+                TRACE_AND_STEP();
+                test_long(*destreg, srcval);
+            }
+            else {
+                u16 *destreg;
+                u16 srcval;
+
+                DECODE_PRINTF("TEST\t");
+                destreg = DECODE_RM_WORD_REGISTER(rl);
+                DECODE_PRINTF(",");
+                srcval = fetch_word_imm();
+                DECODE_PRINTF2("%x\n", srcval);
+                TRACE_AND_STEP();
+                test_word(*destreg, srcval);
+            }
+            break;
+        case 1:
+            DECODE_PRINTF("ILLEGAL OP MOD=00 RH=01 OP=F6\n");
+            HALT_SYS();
+            break;
+        case 2:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 *destreg;
+
+                DECODE_PRINTF("NOT\t");
+                destreg = DECODE_RM_LONG_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                *destreg = not_long(*destreg);
+            }
+            else {
+                u16 *destreg;
+
+                DECODE_PRINTF("NOT\t");
+                destreg = DECODE_RM_WORD_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                *destreg = not_word(*destreg);
+            }
+            break;
+        case 3:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 *destreg;
+
+                DECODE_PRINTF("NEG\t");
+                destreg = DECODE_RM_LONG_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                *destreg = neg_long(*destreg);
+            }
+            else {
+                u16 *destreg;
+
+                DECODE_PRINTF("NEG\t");
+                destreg = DECODE_RM_WORD_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                *destreg = neg_word(*destreg);
+            }
+            break;
+        case 4:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 *destreg;
+
+                DECODE_PRINTF("MUL\t");
+                destreg = DECODE_RM_LONG_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                mul_long(*destreg);     /*!!!  */
+            }
+            else {
+                u16 *destreg;
+
+                DECODE_PRINTF("MUL\t");
+                destreg = DECODE_RM_WORD_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                mul_word(*destreg);     /*!!!  */
+            }
+            break;
+        case 5:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 *destreg;
+
+                DECODE_PRINTF("IMUL\t");
+                destreg = DECODE_RM_LONG_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                imul_long(*destreg);
+            }
+            else {
+                u16 *destreg;
+
+                DECODE_PRINTF("IMUL\t");
+                destreg = DECODE_RM_WORD_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                imul_word(*destreg);
+            }
+            break;
+        case 6:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 *destreg;
+
+                DECODE_PRINTF("DIV\t");
+                destreg = DECODE_RM_LONG_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                div_long(*destreg);
+            }
+            else {
+                u16 *destreg;
+
+                DECODE_PRINTF("DIV\t");
+                destreg = DECODE_RM_WORD_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                div_word(*destreg);
+            }
+            break;
+        case 7:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 *destreg;
+
+                DECODE_PRINTF("IDIV\t");
+                destreg = DECODE_RM_LONG_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                idiv_long(*destreg);
+            }
+            else {
+                u16 *destreg;
+
+                DECODE_PRINTF("IDIV\t");
+                destreg = DECODE_RM_WORD_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                idiv_word(*destreg);
+            }
+            break;
+        }
+        break;                  /* end mod==11 */
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xf8
+****************************************************************************/
+static void
+x86emuOp_clc(u8 X86EMU_UNUSED(op1))
+{
+    /* clear the carry flag. */
+    START_OF_INSTR();
+    DECODE_PRINTF("CLC\n");
+    TRACE_AND_STEP();
+    CLEAR_FLAG(F_CF);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xf9
+****************************************************************************/
+static void
+x86emuOp_stc(u8 X86EMU_UNUSED(op1))
+{
+    /* set the carry flag. */
+    START_OF_INSTR();
+    DECODE_PRINTF("STC\n");
+    TRACE_AND_STEP();
+    SET_FLAG(F_CF);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xfa
+****************************************************************************/
+static void
+x86emuOp_cli(u8 X86EMU_UNUSED(op1))
+{
+    /* clear interrupts. */
+    START_OF_INSTR();
+    DECODE_PRINTF("CLI\n");
+    TRACE_AND_STEP();
+    CLEAR_FLAG(F_IF);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xfb
+****************************************************************************/
+static void
+x86emuOp_sti(u8 X86EMU_UNUSED(op1))
+{
+    /* enable  interrupts. */
+    START_OF_INSTR();
+    DECODE_PRINTF("STI\n");
+    TRACE_AND_STEP();
+    SET_FLAG(F_IF);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xfc
+****************************************************************************/
+static void
+x86emuOp_cld(u8 X86EMU_UNUSED(op1))
+{
+    /* clear interrupts. */
+    START_OF_INSTR();
+    DECODE_PRINTF("CLD\n");
+    TRACE_AND_STEP();
+    CLEAR_FLAG(F_DF);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xfd
+****************************************************************************/
+static void
+x86emuOp_std(u8 X86EMU_UNUSED(op1))
+{
+    /* clear interrupts. */
+    START_OF_INSTR();
+    DECODE_PRINTF("STD\n");
+    TRACE_AND_STEP();
+    SET_FLAG(F_DF);
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xfe
+****************************************************************************/
+static void
+x86emuOp_opcFE_byte_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rh, rl;
+    u8 destval;
+    uint destoffset;
+    u8 *destreg;
+
+    /* Yet another special case instruction. */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the 
+           above test is done twice. */
+
+        switch (rh) {
+        case 0:
+            DECODE_PRINTF("INC\t");
+            break;
+        case 1:
+            DECODE_PRINTF("DEC\t");
+            break;
+        case 2:
+        case 3:
+        case 4:
+        case 5:
+        case 6:
+        case 7:
+            DECODE_PRINTF2("ILLEGAL OP MAJOR OP 0xFE MINOR OP %x \n", mod);
+            HALT_SYS();
+            break;
+        }
+    }
+#endif
+    switch (mod) {
+    case 0:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF("\n");
+        switch (rh) {
+        case 0:                /* inc word ptr ... */
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = inc_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        case 1:                /* dec word ptr ... */
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = dec_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        }
+        break;
+    case 1:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF("\n");
+        switch (rh) {
+        case 0:
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = inc_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        case 1:
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = dec_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        }
+        break;
+    case 2:
+        DECODE_PRINTF("BYTE PTR ");
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF("\n");
+        switch (rh) {
+        case 0:
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = inc_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        case 1:
+            destval = fetch_data_byte(destoffset);
+            TRACE_AND_STEP();
+            destval = dec_byte(destval);
+            store_data_byte(destoffset, destval);
+            break;
+        }
+        break;
+    case 3:
+        destreg = DECODE_RM_BYTE_REGISTER(rl);
+        DECODE_PRINTF("\n");
+        switch (rh) {
+        case 0:
+            TRACE_AND_STEP();
+            *destreg = inc_byte(*destreg);
+            break;
+        case 1:
+            TRACE_AND_STEP();
+            *destreg = dec_byte(*destreg);
+            break;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
+Handles opcode 0xff
+****************************************************************************/
+static void
+x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
+{
+    int mod, rh, rl;
+    uint destoffset = 0;
+    u16 *destreg;
+    u16 destval, destval2;
+
+    /* Yet another special case instruction. */
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+#ifdef DEBUG
+    if (DEBUG_DECODE()) {
+        /* XXX DECODE_PRINTF may be changed to something more
+           general, so that it is important to leave the strings
+           in the same format, even though the result is that the
+           above test is done twice. */
+
+        switch (rh) {
+        case 0:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                DECODE_PRINTF("INC\tDWORD PTR ");
+            }
+            else {
+                DECODE_PRINTF("INC\tWORD PTR ");
+            }
+            break;
+        case 1:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                DECODE_PRINTF("DEC\tDWORD PTR ");
+            }
+            else {
+                DECODE_PRINTF("DEC\tWORD PTR ");
+            }
+            break;
+        case 2:
+            DECODE_PRINTF("CALL\t");
+            break;
+        case 3:
+            DECODE_PRINTF("CALL\tFAR ");
+            break;
+        case 4:
+            DECODE_PRINTF("JMP\t");
+            break;
+        case 5:
+            DECODE_PRINTF("JMP\tFAR ");
+            break;
+        case 6:
+            DECODE_PRINTF("PUSH\t");
+            break;
+        case 7:
+            DECODE_PRINTF("ILLEGAL DECODING OF OPCODE FF\t");
+            HALT_SYS();
+            break;
+        }
+    }
+#endif
+    switch (mod) {
+    case 0:
+        destoffset = decode_rm00_address(rl);
+        DECODE_PRINTF("\n");
+        switch (rh) {
+        case 0:                /* inc word ptr ... */
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = inc_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = inc_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 1:                /* dec word ptr ... */
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = dec_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = dec_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 2:                /* call word ptr ... */
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            push_word(M.x86.R_IP);
+            M.x86.R_IP = destval;
+            break;
+        case 3:                /* call far ptr ... */
+            destval = fetch_data_word(destoffset);
+            destval2 = fetch_data_word(destoffset + 2);
+            TRACE_AND_STEP();
+            push_word(M.x86.R_CS);
+            M.x86.R_CS = destval2;
+            push_word(M.x86.R_IP);
+            M.x86.R_IP = destval;
+            break;
+        case 4:                /* jmp word ptr ... */
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            M.x86.R_IP = destval;
+            break;
+        case 5:                /* jmp far ptr ... */
+            destval = fetch_data_word(destoffset);
+            destval2 = fetch_data_word(destoffset + 2);
+            TRACE_AND_STEP();
+            M.x86.R_IP = destval;
+            M.x86.R_CS = destval2;
+            break;
+        case 6:                /*  push word ptr ... */
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                push_long(destval);
+            }
+            else {
+                u16 destval;
+
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                push_word(destval);
+            }
+            break;
+        }
+        break;
+    case 1:
+        destoffset = decode_rm01_address(rl);
+        DECODE_PRINTF("\n");
+        switch (rh) {
+        case 0:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = inc_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = inc_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 1:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = dec_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = dec_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 2:                /* call word ptr ... */
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            push_word(M.x86.R_IP);
+            M.x86.R_IP = destval;
+            break;
+        case 3:                /* call far ptr ... */
+            destval = fetch_data_word(destoffset);
+            destval2 = fetch_data_word(destoffset + 2);
+            TRACE_AND_STEP();
+            push_word(M.x86.R_CS);
+            M.x86.R_CS = destval2;
+            push_word(M.x86.R_IP);
+            M.x86.R_IP = destval;
+            break;
+        case 4:                /* jmp word ptr ... */
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            M.x86.R_IP = destval;
+            break;
+        case 5:                /* jmp far ptr ... */
+            destval = fetch_data_word(destoffset);
+            destval2 = fetch_data_word(destoffset + 2);
+            TRACE_AND_STEP();
+            M.x86.R_IP = destval;
+            M.x86.R_CS = destval2;
+            break;
+        case 6:                /*  push word ptr ... */
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                push_long(destval);
+            }
+            else {
+                u16 destval;
+
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                push_word(destval);
+            }
+            break;
+        }
+        break;
+    case 2:
+        destoffset = decode_rm10_address(rl);
+        DECODE_PRINTF("\n");
+        switch (rh) {
+        case 0:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = inc_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = inc_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 1:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                destval = dec_long(destval);
+                store_data_long(destoffset, destval);
+            }
+            else {
+                u16 destval;
+
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                destval = dec_word(destval);
+                store_data_word(destoffset, destval);
+            }
+            break;
+        case 2:                /* call word ptr ... */
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            push_word(M.x86.R_IP);
+            M.x86.R_IP = destval;
+            break;
+        case 3:                /* call far ptr ... */
+            destval = fetch_data_word(destoffset);
+            destval2 = fetch_data_word(destoffset + 2);
+            TRACE_AND_STEP();
+            push_word(M.x86.R_CS);
+            M.x86.R_CS = destval2;
+            push_word(M.x86.R_IP);
+            M.x86.R_IP = destval;
+            break;
+        case 4:                /* jmp word ptr ... */
+            destval = fetch_data_word(destoffset);
+            TRACE_AND_STEP();
+            M.x86.R_IP = destval;
+            break;
+        case 5:                /* jmp far ptr ... */
+            destval = fetch_data_word(destoffset);
+            destval2 = fetch_data_word(destoffset + 2);
+            TRACE_AND_STEP();
+            M.x86.R_IP = destval;
+            M.x86.R_CS = destval2;
+            break;
+        case 6:                /*  push word ptr ... */
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 destval;
+
+                destval = fetch_data_long(destoffset);
+                TRACE_AND_STEP();
+                push_long(destval);
+            }
+            else {
+                u16 destval;
+
+                destval = fetch_data_word(destoffset);
+                TRACE_AND_STEP();
+                push_word(destval);
+            }
+            break;
+        }
+        break;
+    case 3:
+        switch (rh) {
+        case 0:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 *destreg;
+
+                destreg = DECODE_RM_LONG_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                *destreg = inc_long(*destreg);
+            }
+            else {
+                u16 *destreg;
+
+                destreg = DECODE_RM_WORD_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                *destreg = inc_word(*destreg);
+            }
+            break;
+        case 1:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 *destreg;
+
+                destreg = DECODE_RM_LONG_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                *destreg = dec_long(*destreg);
+            }
+            else {
+                u16 *destreg;
+
+                destreg = DECODE_RM_WORD_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                *destreg = dec_word(*destreg);
+            }
+            break;
+        case 2:                /* call word ptr ... */
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            push_word(M.x86.R_IP);
+            M.x86.R_IP = *destreg;
+            break;
+        case 3:                /* jmp far ptr ... */
+            DECODE_PRINTF("OPERATION UNDEFINED 0XFF \n");
+            TRACE_AND_STEP();
+            HALT_SYS();
+            break;
+
+        case 4:                /* jmp  ... */
+            destreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF("\n");
+            TRACE_AND_STEP();
+            M.x86.R_IP = (u16) (*destreg);
+            break;
+        case 5:                /* jmp far ptr ... */
+            DECODE_PRINTF("OPERATION UNDEFINED 0XFF \n");
+            TRACE_AND_STEP();
+            HALT_SYS();
+            break;
+        case 6:
+            if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+                u32 *destreg;
+
+                destreg = DECODE_RM_LONG_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                push_long(*destreg);
+            }
+            else {
+                u16 *destreg;
+
+                destreg = DECODE_RM_WORD_REGISTER(rl);
+                DECODE_PRINTF("\n");
+                TRACE_AND_STEP();
+                push_word(*destreg);
+            }
+            break;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/***************************************************************************
+ * Single byte operation code table:
+ **************************************************************************/
+void (*x86emu_optab[256]) (u8) = {
+/*  0x00 */ x86emuOp_add_byte_RM_R,
+/*  0x01 */ x86emuOp_add_word_RM_R,
+/*  0x02 */ x86emuOp_add_byte_R_RM,
+/*  0x03 */ x86emuOp_add_word_R_RM,
+/*  0x04 */ x86emuOp_add_byte_AL_IMM,
+/*  0x05 */ x86emuOp_add_word_AX_IMM,
+/*  0x06 */ x86emuOp_push_ES,
+/*  0x07 */ x86emuOp_pop_ES,
+/*  0x08 */ x86emuOp_or_byte_RM_R,
+/*  0x09 */ x86emuOp_or_word_RM_R,
+/*  0x0a */ x86emuOp_or_byte_R_RM,
+/*  0x0b */ x86emuOp_or_word_R_RM,
+/*  0x0c */ x86emuOp_or_byte_AL_IMM,
+/*  0x0d */ x86emuOp_or_word_AX_IMM,
+/*  0x0e */ x86emuOp_push_CS,
+/*  0x0f */ x86emuOp_two_byte,
+/*  0x10 */ x86emuOp_adc_byte_RM_R,
+/*  0x11 */ x86emuOp_adc_word_RM_R,
+/*  0x12 */ x86emuOp_adc_byte_R_RM,
+/*  0x13 */ x86emuOp_adc_word_R_RM,
+/*  0x14 */ x86emuOp_adc_byte_AL_IMM,
+/*  0x15 */ x86emuOp_adc_word_AX_IMM,
+/*  0x16 */ x86emuOp_push_SS,
+/*  0x17 */ x86emuOp_pop_SS,
+/*  0x18 */ x86emuOp_sbb_byte_RM_R,
+/*  0x19 */ x86emuOp_sbb_word_RM_R,
+/*  0x1a */ x86emuOp_sbb_byte_R_RM,
+/*  0x1b */ x86emuOp_sbb_word_R_RM,
+/*  0x1c */ x86emuOp_sbb_byte_AL_IMM,
+/*  0x1d */ x86emuOp_sbb_word_AX_IMM,
+/*  0x1e */ x86emuOp_push_DS,
+/*  0x1f */ x86emuOp_pop_DS,
+/*  0x20 */ x86emuOp_and_byte_RM_R,
+/*  0x21 */ x86emuOp_and_word_RM_R,
+/*  0x22 */ x86emuOp_and_byte_R_RM,
+/*  0x23 */ x86emuOp_and_word_R_RM,
+/*  0x24 */ x86emuOp_and_byte_AL_IMM,
+/*  0x25 */ x86emuOp_and_word_AX_IMM,
+/*  0x26 */ x86emuOp_segovr_ES,
+/*  0x27 */ x86emuOp_daa,
+/*  0x28 */ x86emuOp_sub_byte_RM_R,
+/*  0x29 */ x86emuOp_sub_word_RM_R,
+/*  0x2a */ x86emuOp_sub_byte_R_RM,
+/*  0x2b */ x86emuOp_sub_word_R_RM,
+/*  0x2c */ x86emuOp_sub_byte_AL_IMM,
+/*  0x2d */ x86emuOp_sub_word_AX_IMM,
+/*  0x2e */ x86emuOp_segovr_CS,
+/*  0x2f */ x86emuOp_das,
+/*  0x30 */ x86emuOp_xor_byte_RM_R,
+/*  0x31 */ x86emuOp_xor_word_RM_R,
+/*  0x32 */ x86emuOp_xor_byte_R_RM,
+/*  0x33 */ x86emuOp_xor_word_R_RM,
+/*  0x34 */ x86emuOp_xor_byte_AL_IMM,
+/*  0x35 */ x86emuOp_xor_word_AX_IMM,
+/*  0x36 */ x86emuOp_segovr_SS,
+/*  0x37 */ x86emuOp_aaa,
+/*  0x38 */ x86emuOp_cmp_byte_RM_R,
+/*  0x39 */ x86emuOp_cmp_word_RM_R,
+/*  0x3a */ x86emuOp_cmp_byte_R_RM,
+/*  0x3b */ x86emuOp_cmp_word_R_RM,
+/*  0x3c */ x86emuOp_cmp_byte_AL_IMM,
+/*  0x3d */ x86emuOp_cmp_word_AX_IMM,
+/*  0x3e */ x86emuOp_segovr_DS,
+/*  0x3f */ x86emuOp_aas,
+/*  0x40 */ x86emuOp_inc_AX,
+/*  0x41 */ x86emuOp_inc_CX,
+/*  0x42 */ x86emuOp_inc_DX,
+/*  0x43 */ x86emuOp_inc_BX,
+/*  0x44 */ x86emuOp_inc_SP,
+/*  0x45 */ x86emuOp_inc_BP,
+/*  0x46 */ x86emuOp_inc_SI,
+/*  0x47 */ x86emuOp_inc_DI,
+/*  0x48 */ x86emuOp_dec_AX,
+/*  0x49 */ x86emuOp_dec_CX,
+/*  0x4a */ x86emuOp_dec_DX,
+/*  0x4b */ x86emuOp_dec_BX,
+/*  0x4c */ x86emuOp_dec_SP,
+/*  0x4d */ x86emuOp_dec_BP,
+/*  0x4e */ x86emuOp_dec_SI,
+/*  0x4f */ x86emuOp_dec_DI,
+/*  0x50 */ x86emuOp_push_AX,
+/*  0x51 */ x86emuOp_push_CX,
+/*  0x52 */ x86emuOp_push_DX,
+/*  0x53 */ x86emuOp_push_BX,
+/*  0x54 */ x86emuOp_push_SP,
+/*  0x55 */ x86emuOp_push_BP,
+/*  0x56 */ x86emuOp_push_SI,
+/*  0x57 */ x86emuOp_push_DI,
+/*  0x58 */ x86emuOp_pop_AX,
+/*  0x59 */ x86emuOp_pop_CX,
+/*  0x5a */ x86emuOp_pop_DX,
+/*  0x5b */ x86emuOp_pop_BX,
+/*  0x5c */ x86emuOp_pop_SP,
+/*  0x5d */ x86emuOp_pop_BP,
+/*  0x5e */ x86emuOp_pop_SI,
+/*  0x5f */ x86emuOp_pop_DI,
+/*  0x60 */ x86emuOp_push_all,
+/*  0x61 */ x86emuOp_pop_all,
+                                                /*  0x62 */ x86emuOp_illegal_op,
+                                                /* bound */
+                                                /*  0x63 */ x86emuOp_illegal_op,
+                                                /* arpl */
+/*  0x64 */ x86emuOp_segovr_FS,
+/*  0x65 */ x86emuOp_segovr_GS,
+/*  0x66 */ x86emuOp_prefix_data,
+/*  0x67 */ x86emuOp_prefix_addr,
+/*  0x68 */ x86emuOp_push_word_IMM,
+/*  0x69 */ x86emuOp_imul_word_IMM,
+/*  0x6a */ x86emuOp_push_byte_IMM,
+/*  0x6b */ x86emuOp_imul_byte_IMM,
+/*  0x6c */ x86emuOp_ins_byte,
+/*  0x6d */ x86emuOp_ins_word,
+/*  0x6e */ x86emuOp_outs_byte,
+/*  0x6f */ x86emuOp_outs_word,
+/*  0x70 */ x86emuOp_jump_near_O,
+/*  0x71 */ x86emuOp_jump_near_NO,
+/*  0x72 */ x86emuOp_jump_near_B,
+/*  0x73 */ x86emuOp_jump_near_NB,
+/*  0x74 */ x86emuOp_jump_near_Z,
+/*  0x75 */ x86emuOp_jump_near_NZ,
+/*  0x76 */ x86emuOp_jump_near_BE,
+/*  0x77 */ x86emuOp_jump_near_NBE,
+/*  0x78 */ x86emuOp_jump_near_S,
+/*  0x79 */ x86emuOp_jump_near_NS,
+/*  0x7a */ x86emuOp_jump_near_P,
+/*  0x7b */ x86emuOp_jump_near_NP,
+/*  0x7c */ x86emuOp_jump_near_L,
+/*  0x7d */ x86emuOp_jump_near_NL,
+/*  0x7e */ x86emuOp_jump_near_LE,
+/*  0x7f */ x86emuOp_jump_near_NLE,
+/*  0x80 */ x86emuOp_opc80_byte_RM_IMM,
+/*  0x81 */ x86emuOp_opc81_word_RM_IMM,
+/*  0x82 */ x86emuOp_opc82_byte_RM_IMM,
+/*  0x83 */ x86emuOp_opc83_word_RM_IMM,
+/*  0x84 */ x86emuOp_test_byte_RM_R,
+/*  0x85 */ x86emuOp_test_word_RM_R,
+/*  0x86 */ x86emuOp_xchg_byte_RM_R,
+/*  0x87 */ x86emuOp_xchg_word_RM_R,
+/*  0x88 */ x86emuOp_mov_byte_RM_R,
+/*  0x89 */ x86emuOp_mov_word_RM_R,
+/*  0x8a */ x86emuOp_mov_byte_R_RM,
+/*  0x8b */ x86emuOp_mov_word_R_RM,
+/*  0x8c */ x86emuOp_mov_word_RM_SR,
+/*  0x8d */ x86emuOp_lea_word_R_M,
+/*  0x8e */ x86emuOp_mov_word_SR_RM,
+/*  0x8f */ x86emuOp_pop_RM,
+/*  0x90 */ x86emuOp_nop,
+/*  0x91 */ x86emuOp_xchg_word_AX_CX,
+/*  0x92 */ x86emuOp_xchg_word_AX_DX,
+/*  0x93 */ x86emuOp_xchg_word_AX_BX,
+/*  0x94 */ x86emuOp_xchg_word_AX_SP,
+/*  0x95 */ x86emuOp_xchg_word_AX_BP,
+/*  0x96 */ x86emuOp_xchg_word_AX_SI,
+/*  0x97 */ x86emuOp_xchg_word_AX_DI,
+/*  0x98 */ x86emuOp_cbw,
+/*  0x99 */ x86emuOp_cwd,
+/*  0x9a */ x86emuOp_call_far_IMM,
+/*  0x9b */ x86emuOp_wait,
+/*  0x9c */ x86emuOp_pushf_word,
+/*  0x9d */ x86emuOp_popf_word,
+/*  0x9e */ x86emuOp_sahf,
+/*  0x9f */ x86emuOp_lahf,
+/*  0xa0 */ x86emuOp_mov_AL_M_IMM,
+/*  0xa1 */ x86emuOp_mov_AX_M_IMM,
+/*  0xa2 */ x86emuOp_mov_M_AL_IMM,
+/*  0xa3 */ x86emuOp_mov_M_AX_IMM,
+/*  0xa4 */ x86emuOp_movs_byte,
+/*  0xa5 */ x86emuOp_movs_word,
+/*  0xa6 */ x86emuOp_cmps_byte,
+/*  0xa7 */ x86emuOp_cmps_word,
+/*  0xa8 */ x86emuOp_test_AL_IMM,
+/*  0xa9 */ x86emuOp_test_AX_IMM,
+/*  0xaa */ x86emuOp_stos_byte,
+/*  0xab */ x86emuOp_stos_word,
+/*  0xac */ x86emuOp_lods_byte,
+/*  0xad */ x86emuOp_lods_word,
+/*  0xac */ x86emuOp_scas_byte,
+/*  0xad */ x86emuOp_scas_word,
+/*  0xb0 */ x86emuOp_mov_byte_AL_IMM,
+/*  0xb1 */ x86emuOp_mov_byte_CL_IMM,
+/*  0xb2 */ x86emuOp_mov_byte_DL_IMM,
+/*  0xb3 */ x86emuOp_mov_byte_BL_IMM,
+/*  0xb4 */ x86emuOp_mov_byte_AH_IMM,
+/*  0xb5 */ x86emuOp_mov_byte_CH_IMM,
+/*  0xb6 */ x86emuOp_mov_byte_DH_IMM,
+/*  0xb7 */ x86emuOp_mov_byte_BH_IMM,
+/*  0xb8 */ x86emuOp_mov_word_AX_IMM,
+/*  0xb9 */ x86emuOp_mov_word_CX_IMM,
+/*  0xba */ x86emuOp_mov_word_DX_IMM,
+/*  0xbb */ x86emuOp_mov_word_BX_IMM,
+/*  0xbc */ x86emuOp_mov_word_SP_IMM,
+/*  0xbd */ x86emuOp_mov_word_BP_IMM,
+/*  0xbe */ x86emuOp_mov_word_SI_IMM,
+/*  0xbf */ x86emuOp_mov_word_DI_IMM,
+/*  0xc0 */ x86emuOp_opcC0_byte_RM_MEM,
+/*  0xc1 */ x86emuOp_opcC1_word_RM_MEM,
+/*  0xc2 */ x86emuOp_ret_near_IMM,
+/*  0xc3 */ x86emuOp_ret_near,
+/*  0xc4 */ x86emuOp_les_R_IMM,
+/*  0xc5 */ x86emuOp_lds_R_IMM,
+/*  0xc6 */ x86emuOp_mov_byte_RM_IMM,
+/*  0xc7 */ x86emuOp_mov_word_RM_IMM,
+/*  0xc8 */ x86emuOp_enter,
+/*  0xc9 */ x86emuOp_leave,
+/*  0xca */ x86emuOp_ret_far_IMM,
+/*  0xcb */ x86emuOp_ret_far,
+/*  0xcc */ x86emuOp_int3,
+/*  0xcd */ x86emuOp_int_IMM,
+/*  0xce */ x86emuOp_into,
+/*  0xcf */ x86emuOp_iret,
+/*  0xd0 */ x86emuOp_opcD0_byte_RM_1,
+/*  0xd1 */ x86emuOp_opcD1_word_RM_1,
+/*  0xd2 */ x86emuOp_opcD2_byte_RM_CL,
+/*  0xd3 */ x86emuOp_opcD3_word_RM_CL,
+/*  0xd4 */ x86emuOp_aam,
+/*  0xd5 */ x86emuOp_aad,
+                                                /*  0xd6 */ x86emuOp_illegal_op,
+                                                /* Undocumented SETALC instruction */
+/*  0xd7 */ x86emuOp_xlat,
+/*  0xd8 */ x86emuOp_esc_coprocess_d8,
+/*  0xd9 */ x86emuOp_esc_coprocess_d9,
+/*  0xda */ x86emuOp_esc_coprocess_da,
+/*  0xdb */ x86emuOp_esc_coprocess_db,
+/*  0xdc */ x86emuOp_esc_coprocess_dc,
+/*  0xdd */ x86emuOp_esc_coprocess_dd,
+/*  0xde */ x86emuOp_esc_coprocess_de,
+/*  0xdf */ x86emuOp_esc_coprocess_df,
+/*  0xe0 */ x86emuOp_loopne,
+/*  0xe1 */ x86emuOp_loope,
+/*  0xe2 */ x86emuOp_loop,
+/*  0xe3 */ x86emuOp_jcxz,
+/*  0xe4 */ x86emuOp_in_byte_AL_IMM,
+/*  0xe5 */ x86emuOp_in_word_AX_IMM,
+/*  0xe6 */ x86emuOp_out_byte_IMM_AL,
+/*  0xe7 */ x86emuOp_out_word_IMM_AX,
+/*  0xe8 */ x86emuOp_call_near_IMM,
+/*  0xe9 */ x86emuOp_jump_near_IMM,
+/*  0xea */ x86emuOp_jump_far_IMM,
+/*  0xeb */ x86emuOp_jump_byte_IMM,
+/*  0xec */ x86emuOp_in_byte_AL_DX,
+/*  0xed */ x86emuOp_in_word_AX_DX,
+/*  0xee */ x86emuOp_out_byte_DX_AL,
+/*  0xef */ x86emuOp_out_word_DX_AX,
+/*  0xf0 */ x86emuOp_lock,
+/*  0xf1 */ x86emuOp_illegal_op,
+/*  0xf2 */ x86emuOp_repne,
+/*  0xf3 */ x86emuOp_repe,
+/*  0xf4 */ x86emuOp_halt,
+/*  0xf5 */ x86emuOp_cmc,
+/*  0xf6 */ x86emuOp_opcF6_byte_RM,
+/*  0xf7 */ x86emuOp_opcF7_word_RM,
+/*  0xf8 */ x86emuOp_clc,
+/*  0xf9 */ x86emuOp_stc,
+/*  0xfa */ x86emuOp_cli,
+/*  0xfb */ x86emuOp_sti,
+/*  0xfc */ x86emuOp_cld,
+/*  0xfd */ x86emuOp_std,
+/*  0xfe */ x86emuOp_opcFE_byte_RM,
+/*  0xff */ x86emuOp_opcFF_word_RM,
+};
diff --git a/xorg-server/hw/xfree86/x86emu/ops2.c b/xorg-server/hw/xfree86/x86emu/ops2.c
index 501d5fcb2..5ed2bf68d 100644
--- a/xorg-server/hw/xfree86/x86emu/ops2.c
+++ b/xorg-server/hw/xfree86/x86emu/ops2.c
@@ -55,14 +55,14 @@ op1 - Instruction op code
 REMARKS:
 Handles illegal opcodes.
 ****************************************************************************/
-static void x86emuOp2_illegal_op(
-	u8 op2)
+static void
+x86emuOp2_illegal_op(u8 op2)
 {
-	START_OF_INSTR();
-	DECODE_PRINTF("ILLEGAL EXTENDED X86 OPCODE\n");
-	TRACE_REGS();
-	printk("%04x:%04x: %02X ILLEGAL EXTENDED X86 OPCODE!\n",
-		M.x86.R_CS, M.x86.R_IP-2,op2);
+    START_OF_INSTR();
+    DECODE_PRINTF("ILLEGAL EXTENDED X86 OPCODE\n");
+    TRACE_REGS();
+    printk("%04x:%04x: %02X ILLEGAL EXTENDED X86 OPCODE!\n",
+           M.x86.R_CS, M.x86.R_IP - 2, op2);
     HALT_SYS();
     END_OF_INSTR();
 }
@@ -73,7 +73,8 @@ static void x86emuOp2_illegal_op(
 REMARKS:
 Handles opcode 0x0f,0x31
 ****************************************************************************/
-static void x86emuOp2_rdtsc(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_rdtsc(u8 X86EMU_UNUSED(op2))
 {
 #ifdef __HAS_LONG_LONG__
     static u64 counter = 0;
@@ -107,7 +108,8 @@ static void x86emuOp2_rdtsc(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0x80-0x8F
 ****************************************************************************/
-static void x86emuOp2_long_jump(u8 op2)
+static void
+x86emuOp2_long_jump(u8 op2)
 {
     s32 target;
     const char *name = NULL;
@@ -116,81 +118,81 @@ static void x86emuOp2_long_jump(u8 op2)
     /* conditional jump to word offset. */
     START_OF_INSTR();
     switch (op2) {
-      case 0x80:
+    case 0x80:
         name = "JO\t";
-        cond =  ACCESS_FLAG(F_OF);
+        cond = ACCESS_FLAG(F_OF);
         break;
-      case 0x81:
+    case 0x81:
         name = "JNO\t";
         cond = !ACCESS_FLAG(F_OF);
         break;
-      case 0x82:
+    case 0x82:
         name = "JB\t";
         cond = ACCESS_FLAG(F_CF);
         break;
-      case 0x83:
+    case 0x83:
         name = "JNB\t";
         cond = !ACCESS_FLAG(F_CF);
         break;
-      case 0x84:
+    case 0x84:
         name = "JZ\t";
         cond = ACCESS_FLAG(F_ZF);
         break;
-      case 0x85:
+    case 0x85:
         name = "JNZ\t";
         cond = !ACCESS_FLAG(F_ZF);
         break;
-      case 0x86:
+    case 0x86:
         name = "JBE\t";
         cond = ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF);
         break;
-      case 0x87:
+    case 0x87:
         name = "JNBE\t";
         cond = !(ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF));
         break;
-      case 0x88:
+    case 0x88:
         name = "JS\t";
         cond = ACCESS_FLAG(F_SF);
         break;
-      case 0x89:
+    case 0x89:
         name = "JNS\t";
         cond = !ACCESS_FLAG(F_SF);
         break;
-      case 0x8a:
+    case 0x8a:
         name = "JP\t";
         cond = ACCESS_FLAG(F_PF);
         break;
-      case 0x8b:
+    case 0x8b:
         name = "JNP\t";
         cond = !ACCESS_FLAG(F_PF);
         break;
-      case 0x8c:
+    case 0x8c:
         name = "JL\t";
         cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
         break;
-      case 0x8d:
+    case 0x8d:
         name = "JNL\t";
         cond = !(xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)));
         break;
-      case 0x8e:
+    case 0x8e:
         name = "JLE\t";
         cond = (xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
                 ACCESS_FLAG(F_ZF));
         break;
-      case 0x8f:
+    case 0x8f:
         name = "JNLE\t";
         cond = !(xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
                  ACCESS_FLAG(F_ZF));
         break;
     }
     DECODE_PRINTF(name);
-    (void)name;
+    (void) name;
     target = (s16) fetch_word_imm();
     target += (s16) M.x86.R_IP;
     DECODE_PRINTF2("%04x\n", target);
     TRACE_AND_STEP();
     if (cond)
-        M.x86.R_IP = (u16)target;
+        M.x86.R_IP = (u16) target;
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
 }
@@ -199,85 +201,86 @@ static void x86emuOp2_long_jump(u8 op2)
 REMARKS:
 Handles opcode 0x0f,0x90-0x9F
 ****************************************************************************/
-static void x86emuOp2_set_byte(u8 op2)
+static void
+x86emuOp2_set_byte(u8 op2)
 {
     int mod, rl, rh;
     uint destoffset;
-    u8  *destreg;
+    u8 *destreg;
     const char *name = NULL;
     int cond = 0;
 
     START_OF_INSTR();
     switch (op2) {
-      case 0x90:
+    case 0x90:
         name = "SETO\t";
-        cond =  ACCESS_FLAG(F_OF);
+        cond = ACCESS_FLAG(F_OF);
         break;
-      case 0x91:
+    case 0x91:
         name = "SETNO\t";
         cond = !ACCESS_FLAG(F_OF);
         break;
-      case 0x92:
+    case 0x92:
         name = "SETB\t";
         cond = ACCESS_FLAG(F_CF);
         break;
-      case 0x93:
+    case 0x93:
         name = "SETNB\t";
         cond = !ACCESS_FLAG(F_CF);
         break;
-      case 0x94:
+    case 0x94:
         name = "SETZ\t";
         cond = ACCESS_FLAG(F_ZF);
         break;
-      case 0x95:
+    case 0x95:
         name = "SETNZ\t";
         cond = !ACCESS_FLAG(F_ZF);
         break;
-      case 0x96:
+    case 0x96:
         name = "SETBE\t";
         cond = ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF);
         break;
-      case 0x97:
+    case 0x97:
         name = "SETNBE\t";
         cond = !(ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF));
         break;
-      case 0x98:
+    case 0x98:
         name = "SETS\t";
         cond = ACCESS_FLAG(F_SF);
         break;
-      case 0x99:
+    case 0x99:
         name = "SETNS\t";
         cond = !ACCESS_FLAG(F_SF);
         break;
-      case 0x9a:
+    case 0x9a:
         name = "SETP\t";
         cond = ACCESS_FLAG(F_PF);
         break;
-      case 0x9b:
+    case 0x9b:
         name = "SETNP\t";
         cond = !ACCESS_FLAG(F_PF);
         break;
-      case 0x9c:
+    case 0x9c:
         name = "SETL\t";
         cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
         break;
-      case 0x9d:
+    case 0x9d:
         name = "SETNL\t";
         cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
         break;
-      case 0x9e:
+    case 0x9e:
         name = "SETLE\t";
         cond = (xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
                 ACCESS_FLAG(F_ZF));
         break;
-      case 0x9f:
+    case 0x9f:
         name = "SETNLE\t";
         cond = !(xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
                  ACCESS_FLAG(F_ZF));
         break;
     }
     DECODE_PRINTF(name);
-    (void)name;
+    (void) name;
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (mod) {
     case 0:
@@ -295,7 +298,7 @@ static void x86emuOp2_set_byte(u8 op2)
         TRACE_AND_STEP();
         store_data_byte(destoffset, cond ? 0x01 : 0x00);
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         destreg = DECODE_RM_BYTE_REGISTER(rl);
         TRACE_AND_STEP();
         *destreg = cond ? 0x01 : 0x00;
@@ -309,7 +312,8 @@ static void x86emuOp2_set_byte(u8 op2)
 REMARKS:
 Handles opcode 0x0f,0xa0
 ****************************************************************************/
-static void x86emuOp2_push_FS(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_push_FS(u8 X86EMU_UNUSED(op2))
 {
     START_OF_INSTR();
     DECODE_PRINTF("PUSH\tFS\n");
@@ -323,7 +327,8 @@ static void x86emuOp2_push_FS(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xa1
 ****************************************************************************/
-static void x86emuOp2_pop_FS(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_pop_FS(u8 X86EMU_UNUSED(op2))
 {
     START_OF_INSTR();
     DECODE_PRINTF("POP\tFS\n");
@@ -337,7 +342,8 @@ static void x86emuOp2_pop_FS(u8 X86EMU_UNUSED(op2))
 REMARKS: CPUID takes EAX/ECX as inputs, writes EAX/EBX/ECX/EDX as output
 Handles opcode 0x0f,0xa2
 ****************************************************************************/
-static void x86emuOp2_cpuid(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_cpuid(u8 X86EMU_UNUSED(op2))
 {
     START_OF_INSTR();
     DECODE_PRINTF("CPUID\n");
@@ -351,11 +357,12 @@ static void x86emuOp2_cpuid(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xa3
 ****************************************************************************/
-static void x86emuOp2_bt_R(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_bt_R(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint srcoffset;
-    int bit,disp;
+    int bit, disp;
 
     START_OF_INSTR();
     DECODE_PRINTF("BT\t");
@@ -371,10 +378,11 @@ static void x86emuOp2_bt_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
-        } else {
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
+            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit), F_CF);
+        }
+        else {
             u16 srcval;
             u16 *shiftreg;
 
@@ -383,9 +391,9 @@ static void x86emuOp2_bt_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_WORD_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit), F_CF);
         }
         break;
     case 1:
@@ -398,10 +406,11 @@ static void x86emuOp2_bt_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
-        } else {
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
+            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit), F_CF);
+        }
+        else {
             u16 srcval;
             u16 *shiftreg;
 
@@ -410,9 +419,9 @@ static void x86emuOp2_bt_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_WORD_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit), F_CF);
         }
         break;
     case 2:
@@ -425,10 +434,11 @@ static void x86emuOp2_bt_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
-        } else {
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
+            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit), F_CF);
+        }
+        else {
             u16 srcval;
             u16 *shiftreg;
 
@@ -437,30 +447,31 @@ static void x86emuOp2_bt_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_WORD_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
-            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit),F_CF);
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            CONDITIONAL_SET_FLAG(srcval & (0x1 << bit), F_CF);
         }
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *srcreg,*shiftreg;
+            u32 *srcreg, *shiftreg;
 
             srcreg = DECODE_RM_LONG_REGISTER(rl);
             DECODE_PRINTF(",");
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0x1F;
-            CONDITIONAL_SET_FLAG(*srcreg & (0x1 << bit),F_CF);
-        } else {
-            u16 *srcreg,*shiftreg;
+            CONDITIONAL_SET_FLAG(*srcreg & (0x1 << bit), F_CF);
+        }
+        else {
+            u16 *srcreg, *shiftreg;
 
             srcreg = DECODE_RM_WORD_REGISTER(rl);
             DECODE_PRINTF(",");
             shiftreg = DECODE_RM_WORD_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0xF;
-            CONDITIONAL_SET_FLAG(*srcreg & (0x1 << bit),F_CF);
+            CONDITIONAL_SET_FLAG(*srcreg & (0x1 << bit), F_CF);
         }
         break;
     }
@@ -472,11 +483,12 @@ static void x86emuOp2_bt_R(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xa4
 ****************************************************************************/
-static void x86emuOp2_shld_IMM(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_shld_IMM(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint destoffset;
-	u8 shift;
+    u8 shift;
 
     START_OF_INSTR();
     DECODE_PRINTF("SHLD\t");
@@ -495,9 +507,10 @@ static void x86emuOp2_shld_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,shift);
+            destval = shld_long(destval, *shiftreg, shift);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -509,7 +522,7 @@ static void x86emuOp2_shld_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,shift);
+            destval = shld_word(destval, *shiftreg, shift);
             store_data_word(destoffset, destval);
         }
         break;
@@ -526,9 +539,10 @@ static void x86emuOp2_shld_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,shift);
+            destval = shld_long(destval, *shiftreg, shift);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -540,7 +554,7 @@ static void x86emuOp2_shld_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,shift);
+            destval = shld_word(destval, *shiftreg, shift);
             store_data_word(destoffset, destval);
         }
         break;
@@ -557,9 +571,10 @@ static void x86emuOp2_shld_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,shift);
+            destval = shld_long(destval, *shiftreg, shift);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -571,13 +586,13 @@ static void x86emuOp2_shld_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,shift);
+            destval = shld_word(destval, *shiftreg, shift);
             store_data_word(destoffset, destval);
         }
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*shiftreg;
+            u32 *destreg, *shiftreg;
 
             destreg = DECODE_RM_LONG_REGISTER(rl);
             DECODE_PRINTF(",");
@@ -586,9 +601,10 @@ static void x86emuOp2_shld_IMM(u8 X86EMU_UNUSED(op2))
             shift = fetch_byte_imm();
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
-            *destreg = shld_long(*destreg,*shiftreg,shift);
-        } else {
-            u16 *destreg,*shiftreg;
+            *destreg = shld_long(*destreg, *shiftreg, shift);
+        }
+        else {
+            u16 *destreg, *shiftreg;
 
             destreg = DECODE_RM_WORD_REGISTER(rl);
             DECODE_PRINTF(",");
@@ -597,7 +613,7 @@ static void x86emuOp2_shld_IMM(u8 X86EMU_UNUSED(op2))
             shift = fetch_byte_imm();
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
-            *destreg = shld_word(*destreg,*shiftreg,shift);
+            *destreg = shld_word(*destreg, *shiftreg, shift);
         }
         break;
     }
@@ -609,7 +625,8 @@ static void x86emuOp2_shld_IMM(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xa5
 ****************************************************************************/
-static void x86emuOp2_shld_CL(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_shld_CL(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint destoffset;
@@ -629,9 +646,10 @@ static void x86emuOp2_shld_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,M.x86.R_CL);
+            destval = shld_long(destval, *shiftreg, M.x86.R_CL);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -641,7 +659,7 @@ static void x86emuOp2_shld_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,M.x86.R_CL);
+            destval = shld_word(destval, *shiftreg, M.x86.R_CL);
             store_data_word(destoffset, destval);
         }
         break;
@@ -656,9 +674,10 @@ static void x86emuOp2_shld_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,M.x86.R_CL);
+            destval = shld_long(destval, *shiftreg, M.x86.R_CL);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -668,7 +687,7 @@ static void x86emuOp2_shld_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,M.x86.R_CL);
+            destval = shld_word(destval, *shiftreg, M.x86.R_CL);
             store_data_word(destoffset, destval);
         }
         break;
@@ -683,9 +702,10 @@ static void x86emuOp2_shld_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shld_long(destval,*shiftreg,M.x86.R_CL);
+            destval = shld_long(destval, *shiftreg, M.x86.R_CL);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -695,29 +715,30 @@ static void x86emuOp2_shld_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shld_word(destval,*shiftreg,M.x86.R_CL);
+            destval = shld_word(destval, *shiftreg, M.x86.R_CL);
             store_data_word(destoffset, destval);
         }
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*shiftreg;
+            u32 *destreg, *shiftreg;
 
             destreg = DECODE_RM_LONG_REGISTER(rl);
             DECODE_PRINTF(",");
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
-            *destreg = shld_long(*destreg,*shiftreg,M.x86.R_CL);
-        } else {
-            u16 *destreg,*shiftreg;
+            *destreg = shld_long(*destreg, *shiftreg, M.x86.R_CL);
+        }
+        else {
+            u16 *destreg, *shiftreg;
 
             destreg = DECODE_RM_WORD_REGISTER(rl);
             DECODE_PRINTF(",");
             shiftreg = DECODE_RM_WORD_REGISTER(rh);
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
-            *destreg = shld_word(*destreg,*shiftreg,M.x86.R_CL);
+            *destreg = shld_word(*destreg, *shiftreg, M.x86.R_CL);
         }
         break;
     }
@@ -729,7 +750,8 @@ static void x86emuOp2_shld_CL(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xa8
 ****************************************************************************/
-static void x86emuOp2_push_GS(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_push_GS(u8 X86EMU_UNUSED(op2))
 {
     START_OF_INSTR();
     DECODE_PRINTF("PUSH\tGS\n");
@@ -743,7 +765,8 @@ static void x86emuOp2_push_GS(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xa9
 ****************************************************************************/
-static void x86emuOp2_pop_GS(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_pop_GS(u8 X86EMU_UNUSED(op2))
 {
     START_OF_INSTR();
     DECODE_PRINTF("POP\tGS\n");
@@ -757,11 +780,12 @@ static void x86emuOp2_pop_GS(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xab
 ****************************************************************************/
-static void x86emuOp2_bts_R(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_bts_R(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint srcoffset;
-    int bit,disp;
+    int bit, disp;
 
     START_OF_INSTR();
     DECODE_PRINTF("BTS\t");
@@ -769,7 +793,7 @@ static void x86emuOp2_bts_R(u8 X86EMU_UNUSED(op2))
     switch (mod) {
     case 0:
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
+            u32 srcval, mask;
             u32 *shiftreg;
 
             srcoffset = decode_rm00_address(rl);
@@ -777,13 +801,14 @@ static void x86emuOp2_bts_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
             mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval | mask);
-        } else {
-            u16 srcval,mask;
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_long(srcoffset + disp, srcval | mask);
+        }
+        else {
+            u16 srcval, mask;
             u16 *shiftreg;
 
             srcoffset = decode_rm00_address(rl);
@@ -791,16 +816,16 @@ static void x86emuOp2_bts_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_WORD_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
-			mask = (u16)(0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_word(srcoffset+disp, srcval | mask);
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_word(srcoffset + disp, srcval | mask);
         }
         break;
     case 1:
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
+            u32 srcval, mask;
             u32 *shiftreg;
 
             srcoffset = decode_rm01_address(rl);
@@ -808,13 +833,14 @@ static void x86emuOp2_bts_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
             mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval | mask);
-        } else {
-            u16 srcval,mask;
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_long(srcoffset + disp, srcval | mask);
+        }
+        else {
+            u16 srcval, mask;
             u16 *shiftreg;
 
             srcoffset = decode_rm01_address(rl);
@@ -822,16 +848,16 @@ static void x86emuOp2_bts_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_WORD_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
-			mask = (u16)(0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_word(srcoffset+disp, srcval | mask);
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_word(srcoffset + disp, srcval | mask);
         }
         break;
     case 2:
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
+            u32 srcval, mask;
             u32 *shiftreg;
 
             srcoffset = decode_rm10_address(rl);
@@ -839,51 +865,53 @@ static void x86emuOp2_bts_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
             mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval | mask);
-        } else {
-            u16 srcval,mask;
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_long(srcoffset + disp, srcval | mask);
+        }
+        else {
+            u16 srcval, mask;
             u16 *shiftreg;
 
-			srcoffset = decode_rm10_address(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_WORD_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0xF;
-			disp = (s16)*shiftreg >> 4;
-			srcval = fetch_data_word(srcoffset+disp);
-			mask = (u16)(0x1 << bit);
-			CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-			store_data_word(srcoffset+disp, srcval | mask);
-		}
-		break;
-	case 3:                     /* register to register */
-		if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-			u32 *srcreg,*shiftreg;
-			u32 mask;
-
-			srcreg = DECODE_RM_LONG_REGISTER(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_LONG_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0x1F;
-			mask = (0x1 << bit);
-			CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
-			*srcreg |= mask;
-		} else {
-			u16 *srcreg,*shiftreg;
-			u16 mask;
-
-			srcreg = DECODE_RM_WORD_REGISTER(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_WORD_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0xF;
-			mask = (u16)(0x1 << bit);
-            CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
+            srcoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0xF;
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_word(srcoffset + disp, srcval | mask);
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *srcreg, *shiftreg;
+            u32 mask;
+
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0x1F;
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(*srcreg & mask, F_CF);
+            *srcreg |= mask;
+        }
+        else {
+            u16 *srcreg, *shiftreg;
+            u16 mask;
+
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0xF;
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(*srcreg & mask, F_CF);
             *srcreg |= mask;
         }
         break;
@@ -896,11 +924,12 @@ static void x86emuOp2_bts_R(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xac
 ****************************************************************************/
-static void x86emuOp2_shrd_IMM(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_shrd_IMM(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint destoffset;
-	u8 shift;
+    u8 shift;
 
     START_OF_INSTR();
     DECODE_PRINTF("SHLD\t");
@@ -919,9 +948,10 @@ static void x86emuOp2_shrd_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,shift);
+            destval = shrd_long(destval, *shiftreg, shift);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -933,7 +963,7 @@ static void x86emuOp2_shrd_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,shift);
+            destval = shrd_word(destval, *shiftreg, shift);
             store_data_word(destoffset, destval);
         }
         break;
@@ -950,9 +980,10 @@ static void x86emuOp2_shrd_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,shift);
+            destval = shrd_long(destval, *shiftreg, shift);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -964,7 +995,7 @@ static void x86emuOp2_shrd_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,shift);
+            destval = shrd_word(destval, *shiftreg, shift);
             store_data_word(destoffset, destval);
         }
         break;
@@ -981,9 +1012,10 @@ static void x86emuOp2_shrd_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,shift);
+            destval = shrd_long(destval, *shiftreg, shift);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -995,13 +1027,13 @@ static void x86emuOp2_shrd_IMM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,shift);
+            destval = shrd_word(destval, *shiftreg, shift);
             store_data_word(destoffset, destval);
         }
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*shiftreg;
+            u32 *destreg, *shiftreg;
 
             destreg = DECODE_RM_LONG_REGISTER(rl);
             DECODE_PRINTF(",");
@@ -1010,9 +1042,10 @@ static void x86emuOp2_shrd_IMM(u8 X86EMU_UNUSED(op2))
             shift = fetch_byte_imm();
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
-            *destreg = shrd_long(*destreg,*shiftreg,shift);
-        } else {
-            u16 *destreg,*shiftreg;
+            *destreg = shrd_long(*destreg, *shiftreg, shift);
+        }
+        else {
+            u16 *destreg, *shiftreg;
 
             destreg = DECODE_RM_WORD_REGISTER(rl);
             DECODE_PRINTF(",");
@@ -1021,7 +1054,7 @@ static void x86emuOp2_shrd_IMM(u8 X86EMU_UNUSED(op2))
             shift = fetch_byte_imm();
             DECODE_PRINTF2("%d\n", shift);
             TRACE_AND_STEP();
-            *destreg = shrd_word(*destreg,*shiftreg,shift);
+            *destreg = shrd_word(*destreg, *shiftreg, shift);
         }
         break;
     }
@@ -1033,7 +1066,8 @@ static void x86emuOp2_shrd_IMM(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xad
 ****************************************************************************/
-static void x86emuOp2_shrd_CL(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_shrd_CL(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint destoffset;
@@ -1053,9 +1087,10 @@ static void x86emuOp2_shrd_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,M.x86.R_CL);
+            destval = shrd_long(destval, *shiftreg, M.x86.R_CL);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -1065,7 +1100,7 @@ static void x86emuOp2_shrd_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,M.x86.R_CL);
+            destval = shrd_word(destval, *shiftreg, M.x86.R_CL);
             store_data_word(destoffset, destval);
         }
         break;
@@ -1080,9 +1115,10 @@ static void x86emuOp2_shrd_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,M.x86.R_CL);
+            destval = shrd_long(destval, *shiftreg, M.x86.R_CL);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -1092,7 +1128,7 @@ static void x86emuOp2_shrd_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,M.x86.R_CL);
+            destval = shrd_word(destval, *shiftreg, M.x86.R_CL);
             store_data_word(destoffset, destval);
         }
         break;
@@ -1107,9 +1143,10 @@ static void x86emuOp2_shrd_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_long(destoffset);
-            destval = shrd_long(destval,*shiftreg,M.x86.R_CL);
+            destval = shrd_long(destval, *shiftreg, M.x86.R_CL);
             store_data_long(destoffset, destval);
-        } else {
+        }
+        else {
             u16 destval;
             u16 *shiftreg;
 
@@ -1119,29 +1156,30 @@ static void x86emuOp2_shrd_CL(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
             destval = fetch_data_word(destoffset);
-            destval = shrd_word(destval,*shiftreg,M.x86.R_CL);
+            destval = shrd_word(destval, *shiftreg, M.x86.R_CL);
             store_data_word(destoffset, destval);
         }
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*shiftreg;
+            u32 *destreg, *shiftreg;
 
             destreg = DECODE_RM_LONG_REGISTER(rl);
             DECODE_PRINTF(",");
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
-            *destreg = shrd_long(*destreg,*shiftreg,M.x86.R_CL);
-        } else {
-            u16 *destreg,*shiftreg;
+            *destreg = shrd_long(*destreg, *shiftreg, M.x86.R_CL);
+        }
+        else {
+            u16 *destreg, *shiftreg;
 
             destreg = DECODE_RM_WORD_REGISTER(rl);
             DECODE_PRINTF(",");
             shiftreg = DECODE_RM_WORD_REGISTER(rh);
             DECODE_PRINTF(",CL\n");
             TRACE_AND_STEP();
-            *destreg = shrd_word(*destreg,*shiftreg,M.x86.R_CL);
+            *destreg = shrd_word(*destreg, *shiftreg, M.x86.R_CL);
         }
         break;
     }
@@ -1153,7 +1191,8 @@ static void x86emuOp2_shrd_CL(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xaf
 ****************************************************************************/
-static void x86emuOp2_imul_R_RM(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_imul_R_RM(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint srcoffset;
@@ -1166,23 +1205,25 @@ static void x86emuOp2_imul_R_RM(u8 X86EMU_UNUSED(op2))
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
             u32 *destreg;
             u32 srcval;
-            u32 res_lo,res_hi;
+            u32 res_lo, res_hi;
 
             destreg = DECODE_RM_LONG_REGISTER(rh);
             DECODE_PRINTF(",");
             srcoffset = decode_rm00_address(rl);
             srcval = fetch_data_long(srcoffset);
             TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)srcval);
+            imul_long_direct(&res_lo, &res_hi, (s32) * destreg, (s32) srcval);
             if (res_hi != 0) {
                 SET_FLAG(F_CF);
                 SET_FLAG(F_OF);
-            } else {
+            }
+            else {
                 CLEAR_FLAG(F_CF);
                 CLEAR_FLAG(F_OF);
             }
-            *destreg = (u32)res_lo;
-        } else {
+            *destreg = (u32) res_lo;
+        }
+        else {
             u16 *destreg;
             u16 srcval;
             u32 res;
@@ -1192,38 +1233,41 @@ static void x86emuOp2_imul_R_RM(u8 X86EMU_UNUSED(op2))
             srcoffset = decode_rm00_address(rl);
             srcval = fetch_data_word(srcoffset);
             TRACE_AND_STEP();
-            res = (s16)*destreg * (s16)srcval;
+            res = (s16) * destreg * (s16) srcval;
             if (res > 0xFFFF) {
                 SET_FLAG(F_CF);
                 SET_FLAG(F_OF);
-            } else {
+            }
+            else {
                 CLEAR_FLAG(F_CF);
                 CLEAR_FLAG(F_OF);
             }
-            *destreg = (u16)res;
+            *destreg = (u16) res;
         }
         break;
     case 1:
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
             u32 *destreg;
             u32 srcval;
-            u32 res_lo,res_hi;
+            u32 res_lo, res_hi;
 
             destreg = DECODE_RM_LONG_REGISTER(rh);
             DECODE_PRINTF(",");
             srcoffset = decode_rm01_address(rl);
             srcval = fetch_data_long(srcoffset);
             TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)srcval);
+            imul_long_direct(&res_lo, &res_hi, (s32) * destreg, (s32) srcval);
             if (res_hi != 0) {
                 SET_FLAG(F_CF);
                 SET_FLAG(F_OF);
-            } else {
+            }
+            else {
                 CLEAR_FLAG(F_CF);
                 CLEAR_FLAG(F_OF);
             }
-            *destreg = (u32)res_lo;
-        } else {
+            *destreg = (u32) res_lo;
+        }
+        else {
             u16 *destreg;
             u16 srcval;
             u32 res;
@@ -1233,38 +1277,41 @@ static void x86emuOp2_imul_R_RM(u8 X86EMU_UNUSED(op2))
             srcoffset = decode_rm01_address(rl);
             srcval = fetch_data_word(srcoffset);
             TRACE_AND_STEP();
-            res = (s16)*destreg * (s16)srcval;
+            res = (s16) * destreg * (s16) srcval;
             if (res > 0xFFFF) {
                 SET_FLAG(F_CF);
                 SET_FLAG(F_OF);
-            } else {
+            }
+            else {
                 CLEAR_FLAG(F_CF);
                 CLEAR_FLAG(F_OF);
             }
-            *destreg = (u16)res;
+            *destreg = (u16) res;
         }
         break;
     case 2:
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
             u32 *destreg;
             u32 srcval;
-            u32 res_lo,res_hi;
+            u32 res_lo, res_hi;
 
             destreg = DECODE_RM_LONG_REGISTER(rh);
             DECODE_PRINTF(",");
             srcoffset = decode_rm10_address(rl);
             srcval = fetch_data_long(srcoffset);
             TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)srcval);
+            imul_long_direct(&res_lo, &res_hi, (s32) * destreg, (s32) srcval);
             if (res_hi != 0) {
                 SET_FLAG(F_CF);
                 SET_FLAG(F_OF);
-            } else {
+            }
+            else {
                 CLEAR_FLAG(F_CF);
                 CLEAR_FLAG(F_OF);
             }
-            *destreg = (u32)res_lo;
-        } else {
+            *destreg = (u32) res_lo;
+        }
+        else {
             u16 *destreg;
             u16 srcval;
             u32 res;
@@ -1274,51 +1321,55 @@ static void x86emuOp2_imul_R_RM(u8 X86EMU_UNUSED(op2))
             srcoffset = decode_rm10_address(rl);
             srcval = fetch_data_word(srcoffset);
             TRACE_AND_STEP();
-            res = (s16)*destreg * (s16)srcval;
+            res = (s16) * destreg * (s16) srcval;
             if (res > 0xFFFF) {
                 SET_FLAG(F_CF);
                 SET_FLAG(F_OF);
-            } else {
+            }
+            else {
                 CLEAR_FLAG(F_CF);
                 CLEAR_FLAG(F_OF);
             }
-            *destreg = (u16)res;
+            *destreg = (u16) res;
         }
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 *destreg,*srcreg;
-            u32 res_lo,res_hi;
+            u32 *destreg, *srcreg;
+            u32 res_lo, res_hi;
 
             destreg = DECODE_RM_LONG_REGISTER(rh);
             DECODE_PRINTF(",");
             srcreg = DECODE_RM_LONG_REGISTER(rl);
             TRACE_AND_STEP();
-            imul_long_direct(&res_lo,&res_hi,(s32)*destreg,(s32)*srcreg);
+            imul_long_direct(&res_lo, &res_hi, (s32) * destreg, (s32) * srcreg);
             if (res_hi != 0) {
                 SET_FLAG(F_CF);
                 SET_FLAG(F_OF);
-            } else {
+            }
+            else {
                 CLEAR_FLAG(F_CF);
                 CLEAR_FLAG(F_OF);
             }
-            *destreg = (u32)res_lo;
-        } else {
-            u16 *destreg,*srcreg;
+            *destreg = (u32) res_lo;
+        }
+        else {
+            u16 *destreg, *srcreg;
             u32 res;
 
             destreg = DECODE_RM_WORD_REGISTER(rh);
             DECODE_PRINTF(",");
             srcreg = DECODE_RM_WORD_REGISTER(rl);
-            res = (s16)*destreg * (s16)*srcreg;
+            res = (s16) * destreg * (s16) * srcreg;
             if (res > 0xFFFF) {
                 SET_FLAG(F_CF);
                 SET_FLAG(F_OF);
-            } else {
+            }
+            else {
                 CLEAR_FLAG(F_CF);
                 CLEAR_FLAG(F_OF);
             }
-            *destreg = (u16)res;
+            *destreg = (u16) res;
         }
         break;
     }
@@ -1330,9 +1381,10 @@ static void x86emuOp2_imul_R_RM(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xb2
 ****************************************************************************/
-static void x86emuOp2_lss_R_IMM(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_lss_R_IMM(u8 X86EMU_UNUSED(op2))
 {
-	int mod, rh, rl;
+    int mod, rh, rl;
     u16 *dstreg;
     uint srcoffset;
 
@@ -1367,7 +1419,7 @@ static void x86emuOp2_lss_R_IMM(u8 X86EMU_UNUSED(op2))
         *dstreg = fetch_data_word(srcoffset);
         M.x86.R_SS = fetch_data_word(srcoffset + 2);
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         /* UNDEFINED! */
         TRACE_AND_STEP();
     }
@@ -1379,148 +1431,154 @@ static void x86emuOp2_lss_R_IMM(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xb3
 ****************************************************************************/
-static void x86emuOp2_btr_R(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_btr_R(u8 X86EMU_UNUSED(op2))
 {
-	int mod, rl, rh;
-	uint srcoffset;
-	int bit,disp;
-
-	START_OF_INSTR();
-	DECODE_PRINTF("BTR\t");
-	FETCH_DECODE_MODRM(mod, rh, rl);
-	switch (mod) {
-	case 0:
-		if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-			u32 srcval,mask;
-			u32 *shiftreg;
-
-			srcoffset = decode_rm00_address(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_LONG_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0x1F;
-			disp = (s16)*shiftreg >> 5;
-			srcval = fetch_data_long(srcoffset+disp);
-			mask = (0x1 << bit);
-			CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-			store_data_long(srcoffset+disp, srcval & ~mask);
-		} else {
-			u16 srcval,mask;
-			u16 *shiftreg;
-
-			srcoffset = decode_rm00_address(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_WORD_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0xF;
-			disp = (s16)*shiftreg >> 4;
-			srcval = fetch_data_word(srcoffset+disp);
-			mask = (u16)(0x1 << bit);
-			CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-			store_data_word(srcoffset+disp, (u16)(srcval & ~mask));
-		}
-		break;
-	case 1:
-		if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-			u32 srcval,mask;
-			u32 *shiftreg;
-
-			srcoffset = decode_rm01_address(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_LONG_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0x1F;
-			disp = (s16)*shiftreg >> 5;
-			srcval = fetch_data_long(srcoffset+disp);
-			mask = (0x1 << bit);
-			CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-			store_data_long(srcoffset+disp, srcval & ~mask);
-		} else {
-			u16 srcval,mask;
-			u16 *shiftreg;
-
-			srcoffset = decode_rm01_address(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_WORD_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0xF;
-			disp = (s16)*shiftreg >> 4;
-			srcval = fetch_data_word(srcoffset+disp);
-			mask = (u16)(0x1 << bit);
-			CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-			store_data_word(srcoffset+disp, (u16)(srcval & ~mask));
-		}
-		break;
-	case 2:
-		if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-			u32 srcval,mask;
-			u32 *shiftreg;
-
-			srcoffset = decode_rm10_address(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_LONG_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0x1F;
-			disp = (s16)*shiftreg >> 5;
-			srcval = fetch_data_long(srcoffset+disp);
-			mask = (0x1 << bit);
-			CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-			store_data_long(srcoffset+disp, srcval & ~mask);
-		} else {
-			u16 srcval,mask;
-			u16 *shiftreg;
-
-			srcoffset = decode_rm10_address(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_WORD_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0xF;
-			disp = (s16)*shiftreg >> 4;
-			srcval = fetch_data_word(srcoffset+disp);
-			mask = (u16)(0x1 << bit);
-			CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-			store_data_word(srcoffset+disp, (u16)(srcval & ~mask));
-		}
-		break;
-	case 3:                     /* register to register */
-		if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-			u32 *srcreg,*shiftreg;
-			u32 mask;
-
-			srcreg = DECODE_RM_LONG_REGISTER(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_LONG_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0x1F;
-			mask = (0x1 << bit);
-			CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
-			*srcreg &= ~mask;
-		} else {
-			u16 *srcreg,*shiftreg;
-			u16 mask;
-
-			srcreg = DECODE_RM_WORD_REGISTER(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_WORD_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0xF;
-			mask = (u16)(0x1 << bit);
-			CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
-			*srcreg &= ~mask;
-		}
-		break;
-	}
-	DECODE_CLEAR_SEGOVR();
-	END_OF_INSTR();
+    int mod, rl, rh;
+    uint srcoffset;
+    int bit, disp;
+
+    START_OF_INSTR();
+    DECODE_PRINTF("BTR\t");
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, mask;
+            u32 *shiftreg;
+
+            srcoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0x1F;
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_long(srcoffset + disp, srcval & ~mask);
+        }
+        else {
+            u16 srcval, mask;
+            u16 *shiftreg;
+
+            srcoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0xF;
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_word(srcoffset + disp, (u16) (srcval & ~mask));
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, mask;
+            u32 *shiftreg;
+
+            srcoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0x1F;
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_long(srcoffset + disp, srcval & ~mask);
+        }
+        else {
+            u16 srcval, mask;
+            u16 *shiftreg;
+
+            srcoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0xF;
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_word(srcoffset + disp, (u16) (srcval & ~mask));
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, mask;
+            u32 *shiftreg;
+
+            srcoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0x1F;
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_long(srcoffset + disp, srcval & ~mask);
+        }
+        else {
+            u16 srcval, mask;
+            u16 *shiftreg;
+
+            srcoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0xF;
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_word(srcoffset + disp, (u16) (srcval & ~mask));
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *srcreg, *shiftreg;
+            u32 mask;
+
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0x1F;
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(*srcreg & mask, F_CF);
+            *srcreg &= ~mask;
+        }
+        else {
+            u16 *srcreg, *shiftreg;
+            u16 mask;
+
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0xF;
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(*srcreg & mask, F_CF);
+            *srcreg &= ~mask;
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
 }
 
 /****************************************************************************
 REMARKS:
 Handles opcode 0x0f,0xb4
 ****************************************************************************/
-static void x86emuOp2_lfs_R_IMM(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_lfs_R_IMM(u8 X86EMU_UNUSED(op2))
 {
-	int mod, rh, rl;
+    int mod, rh, rl;
     u16 *dstreg;
     uint srcoffset;
 
@@ -1555,7 +1613,7 @@ static void x86emuOp2_lfs_R_IMM(u8 X86EMU_UNUSED(op2))
         *dstreg = fetch_data_word(srcoffset);
         M.x86.R_FS = fetch_data_word(srcoffset + 2);
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         /* UNDEFINED! */
         TRACE_AND_STEP();
     }
@@ -1567,9 +1625,10 @@ static void x86emuOp2_lfs_R_IMM(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xb5
 ****************************************************************************/
-static void x86emuOp2_lgs_R_IMM(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_lgs_R_IMM(u8 X86EMU_UNUSED(op2))
 {
-	int mod, rh, rl;
+    int mod, rh, rl;
     u16 *dstreg;
     uint srcoffset;
 
@@ -1604,7 +1663,7 @@ static void x86emuOp2_lgs_R_IMM(u8 X86EMU_UNUSED(op2))
         *dstreg = fetch_data_word(srcoffset);
         M.x86.R_GS = fetch_data_word(srcoffset + 2);
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         /* UNDEFINED! */
         TRACE_AND_STEP();
     }
@@ -1616,7 +1675,8 @@ static void x86emuOp2_lgs_R_IMM(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xb6
 ****************************************************************************/
-static void x86emuOp2_movzx_byte_R_RM(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_movzx_byte_R_RM(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint srcoffset;
@@ -1637,7 +1697,8 @@ static void x86emuOp2_movzx_byte_R_RM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
             *destreg = srcval;
-        } else {
+        }
+        else {
             u16 *destreg;
             u16 srcval;
 
@@ -1662,7 +1723,8 @@ static void x86emuOp2_movzx_byte_R_RM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
             *destreg = srcval;
-        } else {
+        }
+        else {
             u16 *destreg;
             u16 srcval;
 
@@ -1687,7 +1749,8 @@ static void x86emuOp2_movzx_byte_R_RM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
             *destreg = srcval;
-        } else {
+        }
+        else {
             u16 *destreg;
             u16 srcval;
 
@@ -1700,10 +1763,10 @@ static void x86emuOp2_movzx_byte_R_RM(u8 X86EMU_UNUSED(op2))
             *destreg = srcval;
         }
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
             u32 *destreg;
-            u8  *srcreg;
+            u8 *srcreg;
 
             destreg = DECODE_RM_LONG_REGISTER(rh);
             DECODE_PRINTF(",");
@@ -1711,9 +1774,10 @@ static void x86emuOp2_movzx_byte_R_RM(u8 X86EMU_UNUSED(op2))
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
             *destreg = *srcreg;
-        } else {
+        }
+        else {
             u16 *destreg;
-            u8  *srcreg;
+            u8 *srcreg;
 
             destreg = DECODE_RM_WORD_REGISTER(rh);
             DECODE_PRINTF(",");
@@ -1732,7 +1796,8 @@ static void x86emuOp2_movzx_byte_R_RM(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xb7
 ****************************************************************************/
-static void x86emuOp2_movzx_word_R_RM(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_movzx_word_R_RM(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint srcoffset;
@@ -1771,7 +1836,7 @@ static void x86emuOp2_movzx_word_R_RM(u8 X86EMU_UNUSED(op2))
         TRACE_AND_STEP();
         *destreg = srcval;
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         destreg = DECODE_RM_LONG_REGISTER(rh);
         DECODE_PRINTF(",");
         srcreg = DECODE_RM_WORD_REGISTER(rl);
@@ -1788,7 +1853,8 @@ static void x86emuOp2_movzx_word_R_RM(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xba
 ****************************************************************************/
-static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint srcoffset;
@@ -1798,23 +1864,23 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2))
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (rh) {
     case 4:
-	DECODE_PRINTF("BT\t");
-	break;
+        DECODE_PRINTF("BT\t");
+        break;
     case 5:
-	DECODE_PRINTF("BTS\t");
-	break;
+        DECODE_PRINTF("BTS\t");
+        break;
     case 6:
-	DECODE_PRINTF("BTR\t");
-	break;
+        DECODE_PRINTF("BTR\t");
+        break;
     case 7:
-	DECODE_PRINTF("BTC\t");
-	break;
+        DECODE_PRINTF("BTC\t");
+        break;
     default:
-	DECODE_PRINTF("ILLEGAL EXTENDED X86 OPCODE\n");
-	TRACE_REGS();
-	printk("%04x:%04x: %02X%02X ILLEGAL EXTENDED X86 OPCODE EXTENSION!\n",
-		M.x86.R_CS, M.x86.R_IP-3,op2, (mod<<6)|(rh<<3)|rl);
-	HALT_SYS();
+        DECODE_PRINTF("ILLEGAL EXTENDED X86 OPCODE\n");
+        TRACE_REGS();
+        printk("%04x:%04x: %02X%02X ILLEGAL EXTENDED X86 OPCODE EXTENSION!\n",
+               M.x86.R_CS, M.x86.R_IP - 3, op2, (mod << 6) | (rh << 3) | rl);
+        HALT_SYS();
     }
     switch (mod) {
     case 0:
@@ -1828,22 +1894,23 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2))
             TRACE_AND_STEP();
             bit = shift & 0x1F;
             srcval = fetch_data_long(srcoffset);
-	    mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-	    switch (rh) {
-	    case 5:
-		store_data_long(srcoffset, srcval | mask);
-		break;
-	    case 6:
-		store_data_long(srcoffset, srcval & ~mask);
-		break;
-	    case 7:
-		store_data_long(srcoffset, srcval ^ mask);
-		break;
-	    default:
-		break;
-	    }
-        } else {
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            switch (rh) {
+            case 5:
+                store_data_long(srcoffset, srcval | mask);
+                break;
+            case 6:
+                store_data_long(srcoffset, srcval & ~mask);
+                break;
+            case 7:
+                store_data_long(srcoffset, srcval ^ mask);
+                break;
+            default:
+                break;
+            }
+        }
+        else {
             u16 srcval, mask;
             u8 shift;
 
@@ -1853,21 +1920,21 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2))
             TRACE_AND_STEP();
             bit = shift & 0xF;
             srcval = fetch_data_word(srcoffset);
-	    mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-	    switch (rh) {
-	    case 5:
-		store_data_word(srcoffset, srcval | mask);
-		break;
-	    case 6:
-		store_data_word(srcoffset, srcval & ~mask);
-		break;
-	    case 7:
-		store_data_word(srcoffset, srcval ^ mask);
-		break;
-	    default:
-		break;
-	    }
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            switch (rh) {
+            case 5:
+                store_data_word(srcoffset, srcval | mask);
+                break;
+            case 6:
+                store_data_word(srcoffset, srcval & ~mask);
+                break;
+            case 7:
+                store_data_word(srcoffset, srcval ^ mask);
+                break;
+            default:
+                break;
+            }
         }
         break;
     case 1:
@@ -1881,22 +1948,23 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2))
             TRACE_AND_STEP();
             bit = shift & 0x1F;
             srcval = fetch_data_long(srcoffset);
-	    mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-	    switch (rh) {
-	    case 5:
-		store_data_long(srcoffset, srcval | mask);
-		break;
-	    case 6:
-		store_data_long(srcoffset, srcval & ~mask);
-		break;
-	    case 7:
-		store_data_long(srcoffset, srcval ^ mask);
-		break;
-	    default:
-		break;
-	    }
-        } else {
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            switch (rh) {
+            case 5:
+                store_data_long(srcoffset, srcval | mask);
+                break;
+            case 6:
+                store_data_long(srcoffset, srcval & ~mask);
+                break;
+            case 7:
+                store_data_long(srcoffset, srcval ^ mask);
+                break;
+            default:
+                break;
+            }
+        }
+        else {
             u16 srcval, mask;
             u8 shift;
 
@@ -1906,21 +1974,21 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2))
             TRACE_AND_STEP();
             bit = shift & 0xF;
             srcval = fetch_data_word(srcoffset);
-	    mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-	    switch (rh) {
-	    case 5:
-		store_data_word(srcoffset, srcval | mask);
-		break;
-	    case 6:
-		store_data_word(srcoffset, srcval & ~mask);
-		break;
-	    case 7:
-		store_data_word(srcoffset, srcval ^ mask);
-		break;
-	    default:
-		break;
-	    }
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            switch (rh) {
+            case 5:
+                store_data_word(srcoffset, srcval | mask);
+                break;
+            case 6:
+                store_data_word(srcoffset, srcval & ~mask);
+                break;
+            case 7:
+                store_data_word(srcoffset, srcval ^ mask);
+                break;
+            default:
+                break;
+            }
         }
         break;
     case 2:
@@ -1934,22 +2002,23 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2))
             TRACE_AND_STEP();
             bit = shift & 0x1F;
             srcval = fetch_data_long(srcoffset);
-	    mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-	    switch (rh) {
-	    case 5:
-		store_data_long(srcoffset, srcval | mask);
-		break;
-	    case 6:
-		store_data_long(srcoffset, srcval & ~mask);
-		break;
-	    case 7:
-		store_data_long(srcoffset, srcval ^ mask);
-		break;
-	    default:
-		break;
-	    }
-        } else {
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            switch (rh) {
+            case 5:
+                store_data_long(srcoffset, srcval | mask);
+                break;
+            case 6:
+                store_data_long(srcoffset, srcval & ~mask);
+                break;
+            case 7:
+                store_data_long(srcoffset, srcval ^ mask);
+                break;
+            default:
+                break;
+            }
+        }
+        else {
             u16 srcval, mask;
             u8 shift;
 
@@ -1959,74 +2028,75 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2))
             TRACE_AND_STEP();
             bit = shift & 0xF;
             srcval = fetch_data_word(srcoffset);
-	    mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-	    switch (rh) {
-	    case 5:
-		store_data_word(srcoffset, srcval | mask);
-		break;
-	    case 6:
-		store_data_word(srcoffset, srcval & ~mask);
-		break;
-	    case 7:
-		store_data_word(srcoffset, srcval ^ mask);
-		break;
-	    default:
-		break;
-	    }
-        }
-        break;
-    case 3:                     /* register to register */
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            switch (rh) {
+            case 5:
+                store_data_word(srcoffset, srcval | mask);
+                break;
+            case 6:
+                store_data_word(srcoffset, srcval & ~mask);
+                break;
+            case 7:
+                store_data_word(srcoffset, srcval ^ mask);
+                break;
+            default:
+                break;
+            }
+        }
+        break;
+    case 3:                    /* register to register */
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
             u32 *srcreg;
-	    u32 mask;
-	    u8 shift;
+            u32 mask;
+            u8 shift;
 
             srcreg = DECODE_RM_LONG_REGISTER(rl);
             DECODE_PRINTF(",");
             shift = fetch_byte_imm();
             TRACE_AND_STEP();
             bit = shift & 0x1F;
-	    mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
-	    switch (rh) {
-	    case 5:
-		*srcreg |= mask;
-		break;
-	    case 6:
-		*srcreg &= ~mask;
-		break;
-	    case 7:
-		*srcreg ^= mask;
-		break;
-	    default:
-		break;
-	    }
-        } else {
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(*srcreg & mask, F_CF);
+            switch (rh) {
+            case 5:
+                *srcreg |= mask;
+                break;
+            case 6:
+                *srcreg &= ~mask;
+                break;
+            case 7:
+                *srcreg ^= mask;
+                break;
+            default:
+                break;
+            }
+        }
+        else {
             u16 *srcreg;
-	    u16 mask;
-	    u8 shift;
+            u16 mask;
+            u8 shift;
 
             srcreg = DECODE_RM_WORD_REGISTER(rl);
             DECODE_PRINTF(",");
             shift = fetch_byte_imm();
             TRACE_AND_STEP();
             bit = shift & 0xF;
-	    mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
-	    switch (rh) {
-	    case 5:
-		*srcreg |= mask;
-		break;
-	    case 6:
-		*srcreg &= ~mask;
-		break;
-	    case 7:
-		*srcreg ^= mask;
-		break;
-	    default:
-		break;
-	    }
+            mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(*srcreg & mask, F_CF);
+            switch (rh) {
+            case 5:
+                *srcreg |= mask;
+                break;
+            case 6:
+                *srcreg &= ~mask;
+                break;
+            case 7:
+                *srcreg ^= mask;
+                break;
+            default:
+                break;
+            }
         }
         break;
     }
@@ -2038,11 +2108,12 @@ static void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xbb
 ****************************************************************************/
-static void x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint srcoffset;
-    int bit,disp;
+    int bit, disp;
 
     START_OF_INSTR();
     DECODE_PRINTF("BTC\t");
@@ -2050,7 +2121,7 @@ static void x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
     switch (mod) {
     case 0:
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
+            u32 srcval, mask;
             u32 *shiftreg;
 
             srcoffset = decode_rm00_address(rl);
@@ -2058,13 +2129,14 @@ static void x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
             mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval ^ mask);
-        } else {
-            u16 srcval,mask;
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_long(srcoffset + disp, srcval ^ mask);
+        }
+        else {
+            u16 srcval, mask;
             u16 *shiftreg;
 
             srcoffset = decode_rm00_address(rl);
@@ -2072,16 +2144,16 @@ static void x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_WORD_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
-			mask = (u16)(0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-			store_data_word(srcoffset+disp, (u16)(srcval ^ mask));
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_word(srcoffset + disp, (u16) (srcval ^ mask));
         }
         break;
     case 1:
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
+            u32 srcval, mask;
             u32 *shiftreg;
 
             srcoffset = decode_rm01_address(rl);
@@ -2089,13 +2161,14 @@ static void x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
             mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval ^ mask);
-        } else {
-            u16 srcval,mask;
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_long(srcoffset + disp, srcval ^ mask);
+        }
+        else {
+            u16 srcval, mask;
             u16 *shiftreg;
 
             srcoffset = decode_rm01_address(rl);
@@ -2103,16 +2176,16 @@ static void x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_WORD_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
-			mask = (u16)(0x1 << bit);
-			CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-			store_data_word(srcoffset+disp, (u16)(srcval ^ mask));
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_word(srcoffset + disp, (u16) (srcval ^ mask));
         }
         break;
     case 2:
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-            u32 srcval,mask;
+            u32 srcval, mask;
             u32 *shiftreg;
 
             srcoffset = decode_rm10_address(rl);
@@ -2120,13 +2193,14 @@ static void x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_LONG_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0x1F;
-            disp = (s16)*shiftreg >> 5;
-            srcval = fetch_data_long(srcoffset+disp);
+            disp = (s16) * shiftreg >> 5;
+            srcval = fetch_data_long(srcoffset + disp);
             mask = (0x1 << bit);
-            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-            store_data_long(srcoffset+disp, srcval ^ mask);
-        } else {
-            u16 srcval,mask;
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_long(srcoffset + disp, srcval ^ mask);
+        }
+        else {
+            u16 srcval, mask;
             u16 *shiftreg;
 
             srcoffset = decode_rm10_address(rl);
@@ -2134,16 +2208,16 @@ static void x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
             shiftreg = DECODE_RM_WORD_REGISTER(rh);
             TRACE_AND_STEP();
             bit = *shiftreg & 0xF;
-            disp = (s16)*shiftreg >> 4;
-            srcval = fetch_data_word(srcoffset+disp);
-			mask = (u16)(0x1 << bit);
-			CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
-			store_data_word(srcoffset+disp, (u16)(srcval ^ mask));
+            disp = (s16) * shiftreg >> 4;
+            srcval = fetch_data_word(srcoffset + disp);
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask, F_CF);
+            store_data_word(srcoffset + disp, (u16) (srcval ^ mask));
         }
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-			u32 *srcreg,*shiftreg;
+            u32 *srcreg, *shiftreg;
             u32 mask;
 
             srcreg = DECODE_RM_LONG_REGISTER(rl);
@@ -2152,19 +2226,20 @@ static void x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
             TRACE_AND_STEP();
             bit = *shiftreg & 0x1F;
             mask = (0x1 << bit);
-			CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
-			*srcreg ^= mask;
-		} else {
-			u16 *srcreg,*shiftreg;
-			u16 mask;
-
-			srcreg = DECODE_RM_WORD_REGISTER(rl);
-			DECODE_PRINTF(",");
-			shiftreg = DECODE_RM_WORD_REGISTER(rh);
-			TRACE_AND_STEP();
-			bit = *shiftreg & 0xF;
-			mask = (u16)(0x1 << bit);
-            CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
+            CONDITIONAL_SET_FLAG(*srcreg & mask, F_CF);
+            *srcreg ^= mask;
+        }
+        else {
+            u16 *srcreg, *shiftreg;
+            u16 mask;
+
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            shiftreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            bit = *shiftreg & 0xF;
+            mask = (u16) (0x1 << bit);
+            CONDITIONAL_SET_FLAG(*srcreg & mask, F_CF);
             *srcreg ^= mask;
         }
         break;
@@ -2177,7 +2252,8 @@ static void x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xbc
 ****************************************************************************/
-static void x86emuOp2_bsf(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_bsf(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint srcoffset;
@@ -2185,105 +2261,117 @@ static void x86emuOp2_bsf(u8 X86EMU_UNUSED(op2))
     START_OF_INSTR();
     DECODE_PRINTF("BSF\t");
     FETCH_DECODE_MODRM(mod, rh, rl);
-    switch(mod) {
+    switch (mod) {
     case 0:
-	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-	    u32 srcval, *dstreg;
-
-	    srcoffset = decode_rm00_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_LONG_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_long(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 0; *dstreg < 32; (*dstreg)++)
-		if ((srcval >> *dstreg) & 1) break;
-	} else {
-	    u16 srcval, *dstreg;
-
-	    srcoffset = decode_rm00_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_WORD_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_word(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 0; *dstreg < 16; (*dstreg)++)
-		if ((srcval >> *dstreg) & 1) break;
-	}
-	break;
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, *dstreg;
+
+            srcoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_long(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 0; *dstreg < 32; (*dstreg)++)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        else {
+            u16 srcval, *dstreg;
+
+            srcoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_word(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 0; *dstreg < 16; (*dstreg)++)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        break;
     case 1:
-	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-	    u32 srcval, *dstreg;
-
-	    srcoffset = decode_rm01_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_LONG_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_long(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 0; *dstreg < 32; (*dstreg)++)
-		if ((srcval >> *dstreg) & 1) break;
-	} else {
-	    u16 srcval, *dstreg;
-
-	    srcoffset = decode_rm01_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_WORD_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_word(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 0; *dstreg < 16; (*dstreg)++)
-		if ((srcval >> *dstreg) & 1) break;
-	}
-	break;
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, *dstreg;
+
+            srcoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_long(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 0; *dstreg < 32; (*dstreg)++)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        else {
+            u16 srcval, *dstreg;
+
+            srcoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_word(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 0; *dstreg < 16; (*dstreg)++)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        break;
     case 2:
-	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-	    u32 srcval, *dstreg;
-
-	    srcoffset = decode_rm10_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_LONG_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_long(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 0; *dstreg < 32; (*dstreg)++)
-		if ((srcval >> *dstreg) & 1) break;
-	} else {
-	    u16 srcval, *dstreg;
-
-	    srcoffset = decode_rm10_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_WORD_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_word(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 0; *dstreg < 16; (*dstreg)++)
-		if ((srcval >> *dstreg) & 1) break;
-	}
-	break;
-    case 3:				/* register to register */
-	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-	    u32 srcval, *dstreg;
-
-	    srcval = *DECODE_RM_LONG_REGISTER(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_LONG_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 0; *dstreg < 32; (*dstreg)++)
-		if ((srcval >> *dstreg) & 1) break;
-	} else {
-	    u16 srcval, *dstreg;
-
-	    srcval = *DECODE_RM_WORD_REGISTER(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_WORD_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 0; *dstreg < 16; (*dstreg)++)
-		if ((srcval >> *dstreg) & 1) break;
-	}
-	break;
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, *dstreg;
+
+            srcoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_long(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 0; *dstreg < 32; (*dstreg)++)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        else {
+            u16 srcval, *dstreg;
+
+            srcoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_word(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 0; *dstreg < 16; (*dstreg)++)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, *dstreg;
+
+            srcval = *DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 0; *dstreg < 32; (*dstreg)++)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        else {
+            u16 srcval, *dstreg;
+
+            srcval = *DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 0; *dstreg < 16; (*dstreg)++)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2293,7 +2381,8 @@ static void x86emuOp2_bsf(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xbd
 ****************************************************************************/
-static void x86emuOp2_bsr(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_bsr(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint srcoffset;
@@ -2301,105 +2390,117 @@ static void x86emuOp2_bsr(u8 X86EMU_UNUSED(op2))
     START_OF_INSTR();
     DECODE_PRINTF("BSR\t");
     FETCH_DECODE_MODRM(mod, rh, rl);
-    switch(mod) {
+    switch (mod) {
     case 0:
-	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-	    u32 srcval, *dstreg;
-
-	    srcoffset = decode_rm00_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_LONG_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_long(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 31; *dstreg > 0; (*dstreg)--)
-		if ((srcval >> *dstreg) & 1) break;
-	} else {
-	    u16 srcval, *dstreg;
-
-	    srcoffset = decode_rm00_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_WORD_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_word(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 15; *dstreg > 0; (*dstreg)--)
-		if ((srcval >> *dstreg) & 1) break;
-	}
-	break;
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, *dstreg;
+
+            srcoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_long(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 31; *dstreg > 0; (*dstreg)--)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        else {
+            u16 srcval, *dstreg;
+
+            srcoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_word(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 15; *dstreg > 0; (*dstreg)--)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        break;
     case 1:
-	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-	    u32 srcval, *dstreg;
-
-	    srcoffset = decode_rm01_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_LONG_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_long(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 31; *dstreg > 0; (*dstreg)--)
-		if ((srcval >> *dstreg) & 1) break;
-	} else {
-	    u16 srcval, *dstreg;
-
-	    srcoffset = decode_rm01_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_WORD_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_word(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 15; *dstreg > 0; (*dstreg)--)
-		if ((srcval >> *dstreg) & 1) break;
-	}
-	break;
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, *dstreg;
+
+            srcoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_long(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 31; *dstreg > 0; (*dstreg)--)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        else {
+            u16 srcval, *dstreg;
+
+            srcoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_word(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 15; *dstreg > 0; (*dstreg)--)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        break;
     case 2:
-	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-	    u32 srcval, *dstreg;
-
-	    srcoffset = decode_rm10_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_LONG_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_long(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 31; *dstreg > 0; (*dstreg)--)
-		if ((srcval >> *dstreg) & 1) break;
-	} else {
-	    u16 srcval, *dstreg;
-
-	    srcoffset = decode_rm10_address(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_WORD_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    srcval = fetch_data_word(srcoffset);
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 15; *dstreg > 0; (*dstreg)--)
-		if ((srcval >> *dstreg) & 1) break;
-	}
-	break;
-    case 3:				/* register to register */
-	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-	    u32 srcval, *dstreg;
-
-	    srcval = *DECODE_RM_LONG_REGISTER(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_LONG_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 31; *dstreg > 0; (*dstreg)--)
-		if ((srcval >> *dstreg) & 1) break;
-	} else {
-	    u16 srcval, *dstreg;
-
-	    srcval = *DECODE_RM_WORD_REGISTER(rl);
-	    DECODE_PRINTF(",");
-	    dstreg = DECODE_RM_WORD_REGISTER(rh);
-	    TRACE_AND_STEP();
-	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
-	    for(*dstreg = 15; *dstreg > 0; (*dstreg)--)
-		if ((srcval >> *dstreg) & 1) break;
-	}
-	break;
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, *dstreg;
+
+            srcoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_long(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 31; *dstreg > 0; (*dstreg)--)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        else {
+            u16 srcval, *dstreg;
+
+            srcoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            srcval = fetch_data_word(srcoffset);
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 15; *dstreg > 0; (*dstreg)--)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        break;
+    case 3:                    /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, *dstreg;
+
+            srcval = *DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_LONG_REGISTER(rh);
+            TRACE_AND_STEP();
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 31; *dstreg > 0; (*dstreg)--)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        else {
+            u16 srcval, *dstreg;
+
+            srcval = *DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            dstreg = DECODE_RM_WORD_REGISTER(rh);
+            TRACE_AND_STEP();
+            CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
+            for (*dstreg = 15; *dstreg > 0; (*dstreg)--)
+                if ((srcval >> *dstreg) & 1)
+                    break;
+        }
+        break;
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -2409,7 +2510,8 @@ static void x86emuOp2_bsr(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xbe
 ****************************************************************************/
-static void x86emuOp2_movsx_byte_R_RM(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_movsx_byte_R_RM(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint srcoffset;
@@ -2426,18 +2528,19 @@ static void x86emuOp2_movsx_byte_R_RM(u8 X86EMU_UNUSED(op2))
             destreg = DECODE_RM_LONG_REGISTER(rh);
             DECODE_PRINTF(",");
             srcoffset = decode_rm00_address(rl);
-            srcval = (s32)((s8)fetch_data_byte(srcoffset));
+            srcval = (s32) ((s8) fetch_data_byte(srcoffset));
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
             *destreg = srcval;
-        } else {
+        }
+        else {
             u16 *destreg;
             u16 srcval;
 
             destreg = DECODE_RM_WORD_REGISTER(rh);
             DECODE_PRINTF(",");
             srcoffset = decode_rm00_address(rl);
-            srcval = (s16)((s8)fetch_data_byte(srcoffset));
+            srcval = (s16) ((s8) fetch_data_byte(srcoffset));
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
             *destreg = srcval;
@@ -2451,18 +2554,19 @@ static void x86emuOp2_movsx_byte_R_RM(u8 X86EMU_UNUSED(op2))
             destreg = DECODE_RM_LONG_REGISTER(rh);
             DECODE_PRINTF(",");
             srcoffset = decode_rm01_address(rl);
-            srcval = (s32)((s8)fetch_data_byte(srcoffset));
+            srcval = (s32) ((s8) fetch_data_byte(srcoffset));
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
             *destreg = srcval;
-        } else {
+        }
+        else {
             u16 *destreg;
             u16 srcval;
 
             destreg = DECODE_RM_WORD_REGISTER(rh);
             DECODE_PRINTF(",");
             srcoffset = decode_rm01_address(rl);
-            srcval = (s16)((s8)fetch_data_byte(srcoffset));
+            srcval = (s16) ((s8) fetch_data_byte(srcoffset));
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
             *destreg = srcval;
@@ -2476,44 +2580,46 @@ static void x86emuOp2_movsx_byte_R_RM(u8 X86EMU_UNUSED(op2))
             destreg = DECODE_RM_LONG_REGISTER(rh);
             DECODE_PRINTF(",");
             srcoffset = decode_rm10_address(rl);
-            srcval = (s32)((s8)fetch_data_byte(srcoffset));
+            srcval = (s32) ((s8) fetch_data_byte(srcoffset));
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
             *destreg = srcval;
-        } else {
+        }
+        else {
             u16 *destreg;
             u16 srcval;
 
             destreg = DECODE_RM_WORD_REGISTER(rh);
             DECODE_PRINTF(",");
             srcoffset = decode_rm10_address(rl);
-            srcval = (s16)((s8)fetch_data_byte(srcoffset));
+            srcval = (s16) ((s8) fetch_data_byte(srcoffset));
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
             *destreg = srcval;
         }
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         if (M.x86.mode & SYSMODE_PREFIX_DATA) {
             u32 *destreg;
-            u8  *srcreg;
+            u8 *srcreg;
 
             destreg = DECODE_RM_LONG_REGISTER(rh);
             DECODE_PRINTF(",");
             srcreg = DECODE_RM_BYTE_REGISTER(rl);
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
-            *destreg = (s32)((s8)*srcreg);
-        } else {
+            *destreg = (s32) ((s8) * srcreg);
+        }
+        else {
             u16 *destreg;
-            u8  *srcreg;
+            u8 *srcreg;
 
             destreg = DECODE_RM_WORD_REGISTER(rh);
             DECODE_PRINTF(",");
             srcreg = DECODE_RM_BYTE_REGISTER(rl);
             DECODE_PRINTF("\n");
             TRACE_AND_STEP();
-            *destreg = (s16)((s8)*srcreg);
+            *destreg = (s16) ((s8) * srcreg);
         }
         break;
     }
@@ -2525,7 +2631,8 @@ static void x86emuOp2_movsx_byte_R_RM(u8 X86EMU_UNUSED(op2))
 REMARKS:
 Handles opcode 0x0f,0xbf
 ****************************************************************************/
-static void x86emuOp2_movsx_word_R_RM(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_movsx_word_R_RM(u8 X86EMU_UNUSED(op2))
 {
     int mod, rl, rh;
     uint srcoffset;
@@ -2541,7 +2648,7 @@ static void x86emuOp2_movsx_word_R_RM(u8 X86EMU_UNUSED(op2))
         destreg = DECODE_RM_LONG_REGISTER(rh);
         DECODE_PRINTF(",");
         srcoffset = decode_rm00_address(rl);
-        srcval = (s32)((s16)fetch_data_word(srcoffset));
+        srcval = (s32) ((s16) fetch_data_word(srcoffset));
         DECODE_PRINTF("\n");
         TRACE_AND_STEP();
         *destreg = srcval;
@@ -2550,7 +2657,7 @@ static void x86emuOp2_movsx_word_R_RM(u8 X86EMU_UNUSED(op2))
         destreg = DECODE_RM_LONG_REGISTER(rh);
         DECODE_PRINTF(",");
         srcoffset = decode_rm01_address(rl);
-        srcval = (s32)((s16)fetch_data_word(srcoffset));
+        srcval = (s32) ((s16) fetch_data_word(srcoffset));
         DECODE_PRINTF("\n");
         TRACE_AND_STEP();
         *destreg = srcval;
@@ -2559,18 +2666,18 @@ static void x86emuOp2_movsx_word_R_RM(u8 X86EMU_UNUSED(op2))
         destreg = DECODE_RM_LONG_REGISTER(rh);
         DECODE_PRINTF(",");
         srcoffset = decode_rm10_address(rl);
-        srcval = (s32)((s16)fetch_data_word(srcoffset));
+        srcval = (s32) ((s16) fetch_data_word(srcoffset));
         DECODE_PRINTF("\n");
         TRACE_AND_STEP();
         *destreg = srcval;
         break;
-    case 3:                     /* register to register */
+    case 3:                    /* register to register */
         destreg = DECODE_RM_LONG_REGISTER(rh);
         DECODE_PRINTF(",");
         srcreg = DECODE_RM_WORD_REGISTER(rl);
         DECODE_PRINTF("\n");
         TRACE_AND_STEP();
-        *destreg = (s32)((s16)*srcreg);
+        *destreg = (s32) ((s16) * srcreg);
         break;
     }
     DECODE_CLEAR_SEGOVR();
@@ -2578,40 +2685,41 @@ static void x86emuOp2_movsx_word_R_RM(u8 X86EMU_UNUSED(op2))
 }
 
 /* Handles opcodes 0xc8-0xcf */
-static void x86emuOp2_bswap(u8 X86EMU_UNUSED(op2))
+static void
+x86emuOp2_bswap(u8 X86EMU_UNUSED(op2))
 {
     START_OF_INSTR();
     DECODE_PRINTF("BSWAP\n");
     TRACE_AND_STEP();
 
     switch (op2) {
-	case 0xc8:
-	    M.x86.R_EAX = bswap_32(M.x86.R_EAX);
-	    break;
-	case 0xc9:
-	    M.x86.R_ECX = bswap_32(M.x86.R_ECX);
-	    break;
-	case 0xca:
-	    M.x86.R_EDX = bswap_32(M.x86.R_EDX);
-	    break;
-	case 0xcb:
-	    M.x86.R_EBX = bswap_32(M.x86.R_EBX);
-	    break;
-	case 0xcc:
-	    M.x86.R_ESP = bswap_32(M.x86.R_ESP);
-	    break;
-	case 0xcd:
-	    M.x86.R_EBP = bswap_32(M.x86.R_EBP);
-	    break;
-	case 0xce:
-	    M.x86.R_ESI = bswap_32(M.x86.R_ESI);
-	    break;
-	case 0xcf:
-	    M.x86.R_EDI = bswap_32(M.x86.R_EDI);
-	    break;
-	default:
-	    /* can't happen */
-	    break;
+    case 0xc8:
+        M.x86.R_EAX = bswap_32(M.x86.R_EAX);
+        break;
+    case 0xc9:
+        M.x86.R_ECX = bswap_32(M.x86.R_ECX);
+        break;
+    case 0xca:
+        M.x86.R_EDX = bswap_32(M.x86.R_EDX);
+        break;
+    case 0xcb:
+        M.x86.R_EBX = bswap_32(M.x86.R_EBX);
+        break;
+    case 0xcc:
+        M.x86.R_ESP = bswap_32(M.x86.R_ESP);
+        break;
+    case 0xcd:
+        M.x86.R_EBP = bswap_32(M.x86.R_EBP);
+        break;
+    case 0xce:
+        M.x86.R_ESI = bswap_32(M.x86.R_ESI);
+        break;
+    case 0xcf:
+        M.x86.R_EDI = bswap_32(M.x86.R_EDI);
+        break;
+    default:
+        /* can't happen */
+        break;
     }
 
     DECODE_CLEAR_SEGOVR();
@@ -2621,25 +2729,32 @@ static void x86emuOp2_bswap(u8 X86EMU_UNUSED(op2))
 /***************************************************************************
  * Double byte operation code table:
  **************************************************************************/
-void (*x86emu_optab2[256])(u8) =
-{
-/*  0x00 */ x86emuOp2_illegal_op,  /* Group F (ring 0 PM)      */
-/*  0x01 */ x86emuOp2_illegal_op,  /* Group G (ring 0 PM)      */
-/*  0x02 */ x86emuOp2_illegal_op,  /* lar (ring 0 PM)          */
-/*  0x03 */ x86emuOp2_illegal_op,  /* lsl (ring 0 PM)          */
+void (*x86emu_optab2[256]) (u8) = {
+                                        /*  0x00 */ x86emuOp2_illegal_op,
+                                        /* Group F (ring 0 PM)      */
+                                                /*  0x01 */ x86emuOp2_illegal_op,
+                                                /* Group G (ring 0 PM)      */
+                                                /*  0x02 */ x86emuOp2_illegal_op,
+                                                /* lar (ring 0 PM)          */
+                                                /*  0x03 */ x86emuOp2_illegal_op,
+                                                /* lsl (ring 0 PM)          */
 /*  0x04 */ x86emuOp2_illegal_op,
-/*  0x05 */ x86emuOp2_illegal_op,  /* loadall (undocumented)   */
-/*  0x06 */ x86emuOp2_illegal_op,  /* clts (ring 0 PM)         */
-/*  0x07 */ x86emuOp2_illegal_op,  /* loadall (undocumented)   */
-/*  0x08 */ x86emuOp2_illegal_op,  /* invd (ring 0 PM)         */
-/*  0x09 */ x86emuOp2_illegal_op,  /* wbinvd (ring 0 PM)       */
+                                                /*  0x05 */ x86emuOp2_illegal_op,
+                                                /* loadall (undocumented)   */
+                                                /*  0x06 */ x86emuOp2_illegal_op,
+                                                /* clts (ring 0 PM)         */
+                                                /*  0x07 */ x86emuOp2_illegal_op,
+                                                /* loadall (undocumented)   */
+                                                /*  0x08 */ x86emuOp2_illegal_op,
+                                                /* invd (ring 0 PM)         */
+                                                /*  0x09 */ x86emuOp2_illegal_op,
+                                                /* wbinvd (ring 0 PM)       */
 /*  0x0a */ x86emuOp2_illegal_op,
 /*  0x0b */ x86emuOp2_illegal_op,
 /*  0x0c */ x86emuOp2_illegal_op,
 /*  0x0d */ x86emuOp2_illegal_op,
 /*  0x0e */ x86emuOp2_illegal_op,
 /*  0x0f */ x86emuOp2_illegal_op,
-
 /*  0x10 */ x86emuOp2_illegal_op,
 /*  0x11 */ x86emuOp2_illegal_op,
 /*  0x12 */ x86emuOp2_illegal_op,
@@ -2656,14 +2771,19 @@ void (*x86emu_optab2[256])(u8) =
 /*  0x1d */ x86emuOp2_illegal_op,
 /*  0x1e */ x86emuOp2_illegal_op,
 /*  0x1f */ x86emuOp2_illegal_op,
-
-/*  0x20 */ x86emuOp2_illegal_op,  /* mov reg32,creg (ring 0 PM) */
-/*  0x21 */ x86emuOp2_illegal_op,  /* mov reg32,dreg (ring 0 PM) */
-/*  0x22 */ x86emuOp2_illegal_op,  /* mov creg,reg32 (ring 0 PM) */
-/*  0x23 */ x86emuOp2_illegal_op,  /* mov dreg,reg32 (ring 0 PM) */
-/*  0x24 */ x86emuOp2_illegal_op,  /* mov reg32,treg (ring 0 PM) */
+                                                /*  0x20 */ x86emuOp2_illegal_op,
+                                                /* mov reg32,creg (ring 0 PM) */
+                                                /*  0x21 */ x86emuOp2_illegal_op,
+                                                /* mov reg32,dreg (ring 0 PM) */
+                                                /*  0x22 */ x86emuOp2_illegal_op,
+                                                /* mov creg,reg32 (ring 0 PM) */
+                                                /*  0x23 */ x86emuOp2_illegal_op,
+                                                /* mov dreg,reg32 (ring 0 PM) */
+                                                /*  0x24 */ x86emuOp2_illegal_op,
+                                                /* mov reg32,treg (ring 0 PM) */
 /*  0x25 */ x86emuOp2_illegal_op,
-/*  0x26 */ x86emuOp2_illegal_op,  /* mov treg,reg32 (ring 0 PM) */
+                                                /*  0x26 */ x86emuOp2_illegal_op,
+                                                /* mov treg,reg32 (ring 0 PM) */
 /*  0x27 */ x86emuOp2_illegal_op,
 /*  0x28 */ x86emuOp2_illegal_op,
 /*  0x29 */ x86emuOp2_illegal_op,
@@ -2673,7 +2793,6 @@ void (*x86emu_optab2[256])(u8) =
 /*  0x2d */ x86emuOp2_illegal_op,
 /*  0x2e */ x86emuOp2_illegal_op,
 /*  0x2f */ x86emuOp2_illegal_op,
-
 /*  0x30 */ x86emuOp2_illegal_op,
 /*  0x31 */ x86emuOp2_rdtsc,
 /*  0x32 */ x86emuOp2_illegal_op,
@@ -2690,7 +2809,6 @@ void (*x86emu_optab2[256])(u8) =
 /*  0x3d */ x86emuOp2_illegal_op,
 /*  0x3e */ x86emuOp2_illegal_op,
 /*  0x3f */ x86emuOp2_illegal_op,
-
 /*  0x40 */ x86emuOp2_illegal_op,
 /*  0x41 */ x86emuOp2_illegal_op,
 /*  0x42 */ x86emuOp2_illegal_op,
@@ -2707,7 +2825,6 @@ void (*x86emu_optab2[256])(u8) =
 /*  0x4d */ x86emuOp2_illegal_op,
 /*  0x4e */ x86emuOp2_illegal_op,
 /*  0x4f */ x86emuOp2_illegal_op,
-
 /*  0x50 */ x86emuOp2_illegal_op,
 /*  0x51 */ x86emuOp2_illegal_op,
 /*  0x52 */ x86emuOp2_illegal_op,
@@ -2724,7 +2841,6 @@ void (*x86emu_optab2[256])(u8) =
 /*  0x5d */ x86emuOp2_illegal_op,
 /*  0x5e */ x86emuOp2_illegal_op,
 /*  0x5f */ x86emuOp2_illegal_op,
-
 /*  0x60 */ x86emuOp2_illegal_op,
 /*  0x61 */ x86emuOp2_illegal_op,
 /*  0x62 */ x86emuOp2_illegal_op,
@@ -2741,7 +2857,6 @@ void (*x86emu_optab2[256])(u8) =
 /*  0x6d */ x86emuOp2_illegal_op,
 /*  0x6e */ x86emuOp2_illegal_op,
 /*  0x6f */ x86emuOp2_illegal_op,
-
 /*  0x70 */ x86emuOp2_illegal_op,
 /*  0x71 */ x86emuOp2_illegal_op,
 /*  0x72 */ x86emuOp2_illegal_op,
@@ -2758,7 +2873,6 @@ void (*x86emu_optab2[256])(u8) =
 /*  0x7d */ x86emuOp2_illegal_op,
 /*  0x7e */ x86emuOp2_illegal_op,
 /*  0x7f */ x86emuOp2_illegal_op,
-
 /*  0x80 */ x86emuOp2_long_jump,
 /*  0x81 */ x86emuOp2_long_jump,
 /*  0x82 */ x86emuOp2_long_jump,
@@ -2775,7 +2889,6 @@ void (*x86emu_optab2[256])(u8) =
 /*  0x8d */ x86emuOp2_long_jump,
 /*  0x8e */ x86emuOp2_long_jump,
 /*  0x8f */ x86emuOp2_long_jump,
-
 /*  0x90 */ x86emuOp2_set_byte,
 /*  0x91 */ x86emuOp2_set_byte,
 /*  0x92 */ x86emuOp2_set_byte,
@@ -2792,7 +2905,6 @@ void (*x86emu_optab2[256])(u8) =
 /*  0x9d */ x86emuOp2_set_byte,
 /*  0x9e */ x86emuOp2_set_byte,
 /*  0x9f */ x86emuOp2_set_byte,
-
 /*  0xa0 */ x86emuOp2_push_FS,
 /*  0xa1 */ x86emuOp2_pop_FS,
 /*  0xa2 */ x86emuOp2_cpuid,
@@ -2809,9 +2921,10 @@ void (*x86emu_optab2[256])(u8) =
 /*  0xad */ x86emuOp2_shrd_CL,
 /*  0xae */ x86emuOp2_illegal_op,
 /*  0xaf */ x86emuOp2_imul_R_RM,
-
-/*  0xb0 */ x86emuOp2_illegal_op,  /* TODO: cmpxchg */
-/*  0xb1 */ x86emuOp2_illegal_op,  /* TODO: cmpxchg */
+                                                /*  0xb0 */ x86emuOp2_illegal_op,
+                                                /* TODO: cmpxchg */
+                                                /*  0xb1 */ x86emuOp2_illegal_op,
+                                                /* TODO: cmpxchg */
 /*  0xb2 */ x86emuOp2_lss_R_IMM,
 /*  0xb3 */ x86emuOp2_btr_R,
 /*  0xb4 */ x86emuOp2_lfs_R_IMM,
@@ -2826,9 +2939,10 @@ void (*x86emu_optab2[256])(u8) =
 /*  0xbd */ x86emuOp2_bsr,
 /*  0xbe */ x86emuOp2_movsx_byte_R_RM,
 /*  0xbf */ x86emuOp2_movsx_word_R_RM,
-
-/*  0xc0 */ x86emuOp2_illegal_op,  /* TODO: xadd */
-/*  0xc1 */ x86emuOp2_illegal_op,  /* TODO: xadd */
+                                                /*  0xc0 */ x86emuOp2_illegal_op,
+                                                /* TODO: xadd */
+                                                /*  0xc1 */ x86emuOp2_illegal_op,
+                                                /* TODO: xadd */
 /*  0xc2 */ x86emuOp2_illegal_op,
 /*  0xc3 */ x86emuOp2_illegal_op,
 /*  0xc4 */ x86emuOp2_illegal_op,
@@ -2843,7 +2957,6 @@ void (*x86emu_optab2[256])(u8) =
 /*  0xcd */ x86emuOp2_bswap,
 /*  0xce */ x86emuOp2_bswap,
 /*  0xcf */ x86emuOp2_bswap,
-
 /*  0xd0 */ x86emuOp2_illegal_op,
 /*  0xd1 */ x86emuOp2_illegal_op,
 /*  0xd2 */ x86emuOp2_illegal_op,
@@ -2860,7 +2973,6 @@ void (*x86emu_optab2[256])(u8) =
 /*  0xdd */ x86emuOp2_illegal_op,
 /*  0xde */ x86emuOp2_illegal_op,
 /*  0xdf */ x86emuOp2_illegal_op,
-
 /*  0xe0 */ x86emuOp2_illegal_op,
 /*  0xe1 */ x86emuOp2_illegal_op,
 /*  0xe2 */ x86emuOp2_illegal_op,
@@ -2877,7 +2989,6 @@ void (*x86emu_optab2[256])(u8) =
 /*  0xed */ x86emuOp2_illegal_op,
 /*  0xee */ x86emuOp2_illegal_op,
 /*  0xef */ x86emuOp2_illegal_op,
-
 /*  0xf0 */ x86emuOp2_illegal_op,
 /*  0xf1 */ x86emuOp2_illegal_op,
 /*  0xf2 */ x86emuOp2_illegal_op,
diff --git a/xorg-server/hw/xfree86/x86emu/prim_ops.c b/xorg-server/hw/xfree86/x86emu/prim_ops.c
index 4a6ac5deb..24f76b47f 100644
--- a/xorg-server/hw/xfree86/x86emu/prim_ops.c
+++ b/xorg-server/hw/xfree86/x86emu/prim_ops.c
@@ -103,23 +103,22 @@
 #include "x86emu/x86emui.h"
 
 #if defined(__GNUC__)
-# if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__amd64__)
-#  include "x86emu/prim_x86_gcc.h"
-# endif
+#if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__amd64__)
+#include "x86emu/prim_x86_gcc.h"
+#endif
 #endif
 
 /*------------------------- Global Variables ------------------------------*/
 
-static u32 x86emu_parity_tab[8] =
-{
-	0x96696996,
-	0x69969669,
-	0x69969669,
-	0x96696996,
-	0x69969669,
-	0x96696996,
-	0x96696996,
-	0x69969669,
+static u32 x86emu_parity_tab[8] = {
+    0x96696996,
+    0x69969669,
+    0x69969669,
+    0x96696996,
+    0x69969669,
+    0x96696996,
+    0x96696996,
+    0x69969669,
 };
 
 #define PARITY(x)   (((x86emu_parity_tab[(x) / 32] >> ((x) % 32)) & 1) == 0)
@@ -131,88 +130,96 @@ static u32 x86emu_parity_tab[8] =
 REMARKS:
 Implements the AAA instruction and side effects.
 ****************************************************************************/
-u16 aaa_word(u16 d)
+u16
+aaa_word(u16 d)
 {
-	u16	res;
-	if ((d & 0xf) > 0x9 || ACCESS_FLAG(F_AF)) {
-		d += 0x6;
-		d += 0x100;
-		SET_FLAG(F_AF);
-		SET_FLAG(F_CF);
-	} else {
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_AF);
-	}
-	res = (u16)(d & 0xFF0F);
-	CLEAR_FLAG(F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-	return res;
+    u16 res;
+
+    if ((d & 0xf) > 0x9 || ACCESS_FLAG(F_AF)) {
+        d += 0x6;
+        d += 0x100;
+        SET_FLAG(F_AF);
+        SET_FLAG(F_CF);
+    }
+    else {
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_AF);
+    }
+    res = (u16) (d & 0xFF0F);
+    CLEAR_FLAG(F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the AAA instruction and side effects.
 ****************************************************************************/
-u16 aas_word(u16 d)
+u16
+aas_word(u16 d)
 {
-	u16	res;
-	if ((d & 0xf) > 0x9 || ACCESS_FLAG(F_AF)) {
-		d -= 0x6;
-		d -= 0x100;
-		SET_FLAG(F_AF);
-		SET_FLAG(F_CF);
-	} else {
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_AF);
-	}
-	res = (u16)(d & 0xFF0F);
-	CLEAR_FLAG(F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-	return res;
+    u16 res;
+
+    if ((d & 0xf) > 0x9 || ACCESS_FLAG(F_AF)) {
+        d -= 0x6;
+        d -= 0x100;
+        SET_FLAG(F_AF);
+        SET_FLAG(F_CF);
+    }
+    else {
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_AF);
+    }
+    res = (u16) (d & 0xFF0F);
+    CLEAR_FLAG(F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the AAD instruction and side effects.
 ****************************************************************************/
-u16 aad_word(u16 d)
+u16
+aad_word(u16 d)
 {
-	u16 l;
-	u8 hb, lb;
+    u16 l;
+    u8 hb, lb;
 
-	hb = (u8)((d >> 8) & 0xff);
-	lb = (u8)((d & 0xff));
-	l = (u16)((lb + 10 * hb) & 0xFF);
+    hb = (u8) ((d >> 8) & 0xff);
+    lb = (u8) ((d & 0xff));
+    l = (u16) ((lb + 10 * hb) & 0xFF);
 
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	CLEAR_FLAG(F_OF);
-	CONDITIONAL_SET_FLAG(l & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG(l == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(l & 0xff), F_PF);
-	return l;
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    CLEAR_FLAG(F_OF);
+    CONDITIONAL_SET_FLAG(l & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG(l == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(l & 0xff), F_PF);
+    return l;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the AAM instruction and side effects.
 ****************************************************************************/
-u16 aam_word(u8 d)
+u16
+aam_word(u8 d)
 {
     u16 h, l;
 
-	h = (u16)(d / 10);
-	l = (u16)(d % 10);
-	l |= (u16)(h << 8);
+    h = (u16) (d / 10);
+    l = (u16) (d % 10);
+    l |= (u16) (h << 8);
 
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	CLEAR_FLAG(F_OF);
-	CONDITIONAL_SET_FLAG(l & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG(l == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(l & 0xff), F_PF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    CLEAR_FLAG(F_OF);
+    CONDITIONAL_SET_FLAG(l & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG(l == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(l & 0xff), F_PF);
     return l;
 }
 
@@ -220,155 +227,161 @@ u16 aam_word(u8 d)
 REMARKS:
 Implements the ADC instruction and side effects.
 ****************************************************************************/
-u8 adc_byte(u8 d, u8 s)
+u8
+adc_byte(u8 d, u8 s)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 cc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 cc;
 
-	if (ACCESS_FLAG(F_CF))
-		res = 1 + d + s;
-	else
-		res = d + s;
+    if (ACCESS_FLAG(F_CF))
+        res = 1 + d + s;
+    else
+        res = d + s;
 
-	CONDITIONAL_SET_FLAG(res & 0x100, F_CF);
-	CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CONDITIONAL_SET_FLAG(res & 0x100, F_CF);
+    CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the carry chain  SEE NOTE AT TOP. */
-	cc = (s & d) | ((~res) & (s | d));
-	CONDITIONAL_SET_FLAG(XOR2(cc >> 6), F_OF);
-	CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
-	return (u8)res;
+    /* calculate the carry chain  SEE NOTE AT TOP. */
+    cc = (s & d) | ((~res) & (s | d));
+    CONDITIONAL_SET_FLAG(XOR2(cc >> 6), F_OF);
+    CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the ADC instruction and side effects.
 ****************************************************************************/
-u16 adc_word(u16 d, u16 s)
+u16
+adc_word(u16 d, u16 s)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 cc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 cc;
 
-	if (ACCESS_FLAG(F_CF))
-		res = 1 + d + s;
-	else
-		res = d + s;
+    if (ACCESS_FLAG(F_CF))
+        res = 1 + d + s;
+    else
+        res = d + s;
 
-	CONDITIONAL_SET_FLAG(res & 0x10000, F_CF);
-	CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CONDITIONAL_SET_FLAG(res & 0x10000, F_CF);
+    CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the carry chain  SEE NOTE AT TOP. */
-	cc = (s & d) | ((~res) & (s | d));
-	CONDITIONAL_SET_FLAG(XOR2(cc >> 14), F_OF);
-	CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
-	return (u16)res;
+    /* calculate the carry chain  SEE NOTE AT TOP. */
+    cc = (s & d) | ((~res) & (s | d));
+    CONDITIONAL_SET_FLAG(XOR2(cc >> 14), F_OF);
+    CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the ADC instruction and side effects.
 ****************************************************************************/
-u32 adc_long(u32 d, u32 s)
+u32
+adc_long(u32 d, u32 s)
 {
-	register u32 lo;	/* all operands in native machine order */
-	register u32 hi;
-	register u32 res;
-	register u32 cc;
+    register u32 lo;            /* all operands in native machine order */
+    register u32 hi;
+    register u32 res;
+    register u32 cc;
 
-	if (ACCESS_FLAG(F_CF)) {
-		lo = 1 + (d & 0xFFFF) + (s & 0xFFFF);
-		res = 1 + d + s;
-		}
-	else {
-		lo = (d & 0xFFFF) + (s & 0xFFFF);
-		res = d + s;
-		}
-	hi = (lo >> 16) + (d >> 16) + (s >> 16);
+    if (ACCESS_FLAG(F_CF)) {
+        lo = 1 + (d & 0xFFFF) + (s & 0xFFFF);
+        res = 1 + d + s;
+    }
+    else {
+        lo = (d & 0xFFFF) + (s & 0xFFFF);
+        res = d + s;
+    }
+    hi = (lo >> 16) + (d >> 16) + (s >> 16);
 
-	CONDITIONAL_SET_FLAG(hi & 0x10000, F_CF);
-	CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CONDITIONAL_SET_FLAG(hi & 0x10000, F_CF);
+    CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the carry chain  SEE NOTE AT TOP. */
-	cc = (s & d) | ((~res) & (s | d));
-	CONDITIONAL_SET_FLAG(XOR2(cc >> 30), F_OF);
-	CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
-	return res;
+    /* calculate the carry chain  SEE NOTE AT TOP. */
+    cc = (s & d) | ((~res) & (s | d));
+    CONDITIONAL_SET_FLAG(XOR2(cc >> 30), F_OF);
+    CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the ADD instruction and side effects.
 ****************************************************************************/
-u8 add_byte(u8 d, u8 s)
+u8
+add_byte(u8 d, u8 s)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 cc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 cc;
 
-	res = d + s;
-	CONDITIONAL_SET_FLAG(res & 0x100, F_CF);
-	CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    res = d + s;
+    CONDITIONAL_SET_FLAG(res & 0x100, F_CF);
+    CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the carry chain  SEE NOTE AT TOP. */
-	cc = (s & d) | ((~res) & (s | d));
-	CONDITIONAL_SET_FLAG(XOR2(cc >> 6), F_OF);
-	CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
-	return (u8)res;
+    /* calculate the carry chain  SEE NOTE AT TOP. */
+    cc = (s & d) | ((~res) & (s | d));
+    CONDITIONAL_SET_FLAG(XOR2(cc >> 6), F_OF);
+    CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the ADD instruction and side effects.
 ****************************************************************************/
-u16 add_word(u16 d, u16 s)
+u16
+add_word(u16 d, u16 s)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 cc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 cc;
 
-	res = d + s;
-	CONDITIONAL_SET_FLAG(res & 0x10000, F_CF);
-	CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    res = d + s;
+    CONDITIONAL_SET_FLAG(res & 0x10000, F_CF);
+    CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the carry chain  SEE NOTE AT TOP. */
-	cc = (s & d) | ((~res) & (s | d));
-	CONDITIONAL_SET_FLAG(XOR2(cc >> 14), F_OF);
-	CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
-	return (u16)res;
+    /* calculate the carry chain  SEE NOTE AT TOP. */
+    cc = (s & d) | ((~res) & (s | d));
+    CONDITIONAL_SET_FLAG(XOR2(cc >> 14), F_OF);
+    CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the ADD instruction and side effects.
 ****************************************************************************/
-u32 add_long(u32 d, u32 s)
+u32
+add_long(u32 d, u32 s)
 {
-	register u32 lo;	/* all operands in native machine order */
-	register u32 hi;
-	register u32 res;
-	register u32 cc;
+    register u32 lo;            /* all operands in native machine order */
+    register u32 hi;
+    register u32 res;
+    register u32 cc;
 
-	lo = (d & 0xFFFF) + (s & 0xFFFF);
-	res = d + s;
-	hi = (lo >> 16) + (d >> 16) + (s >> 16);
+    lo = (d & 0xFFFF) + (s & 0xFFFF);
+    res = d + s;
+    hi = (lo >> 16) + (d >> 16) + (s >> 16);
 
-	CONDITIONAL_SET_FLAG(hi & 0x10000, F_CF);
-	CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CONDITIONAL_SET_FLAG(hi & 0x10000, F_CF);
+    CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
     /* calculate the carry chain  SEE NOTE AT TOP. */
     cc = (s & d) | ((~res) & (s | d));
-	CONDITIONAL_SET_FLAG(XOR2(cc >> 30), F_OF);
-	CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
+    CONDITIONAL_SET_FLAG(XOR2(cc >> 30), F_OF);
+    CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
 
     return res;
 }
@@ -377,39 +390,41 @@ u32 add_long(u32 d, u32 s)
 REMARKS:
 Implements the AND instruction and side effects.
 ****************************************************************************/
-u8 and_byte(u8 d, u8 s)
+u8
+and_byte(u8 d, u8 s)
 {
-	register u8 res;    /* all operands in native machine order */
+    register u8 res;            /* all operands in native machine order */
 
-	res = d & s;
+    res = d & s;
 
-	/* set the flags  */
-	CLEAR_FLAG(F_OF);
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res), F_PF);
-	return res;
+    /* set the flags  */
+    CLEAR_FLAG(F_OF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res), F_PF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the AND instruction and side effects.
 ****************************************************************************/
-u16 and_word(u16 d, u16 s)
+u16
+and_word(u16 d, u16 s)
 {
-    register u16 res;   /* all operands in native machine order */
+    register u16 res;           /* all operands in native machine order */
 
     res = d & s;
 
     /* set the flags  */
-	CLEAR_FLAG(F_OF);
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CLEAR_FLAG(F_OF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
     return res;
 }
 
@@ -417,433 +432,456 @@ u16 and_word(u16 d, u16 s)
 REMARKS:
 Implements the AND instruction and side effects.
 ****************************************************************************/
-u32 and_long(u32 d, u32 s)
+u32
+and_long(u32 d, u32 s)
 {
-	register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
 
-	res = d & s;
+    res = d & s;
 
-	/* set the flags  */
-	CLEAR_FLAG(F_OF);
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-	return res;
+    /* set the flags  */
+    CLEAR_FLAG(F_OF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the CMP instruction and side effects.
 ****************************************************************************/
-u8 cmp_byte(u8 d, u8 s)
+u8
+cmp_byte(u8 d, u8 s)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 bc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 bc;
 
-	res = d - s;
-	CLEAR_FLAG(F_CF);
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    res = d - s;
+    CLEAR_FLAG(F_CF);
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the borrow chain.  See note at top */
-	bc = (res & (~d | s)) | (~d & s);
-	CONDITIONAL_SET_FLAG(bc & 0x80, F_CF);
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return d;
+    /* calculate the borrow chain.  See note at top */
+    bc = (res & (~d | s)) | (~d & s);
+    CONDITIONAL_SET_FLAG(bc & 0x80, F_CF);
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return d;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the CMP instruction and side effects.
 ****************************************************************************/
-u16 cmp_word(u16 d, u16 s)
+u16
+cmp_word(u16 d, u16 s)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 bc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 bc;
 
-	res = d - s;
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    res = d - s;
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the borrow chain.  See note at top */
+    /* calculate the borrow chain.  See note at top */
     bc = (res & (~d | s)) | (~d & s);
-	CONDITIONAL_SET_FLAG(bc & 0x8000, F_CF);
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return d;
+    CONDITIONAL_SET_FLAG(bc & 0x8000, F_CF);
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return d;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the CMP instruction and side effects.
 ****************************************************************************/
-u32 cmp_long(u32 d, u32 s)
+u32
+cmp_long(u32 d, u32 s)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 bc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 bc;
 
-	res = d - s;
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    res = d - s;
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the borrow chain.  See note at top */
-	bc = (res & (~d | s)) | (~d & s);
-	CONDITIONAL_SET_FLAG(bc & 0x80000000, F_CF);
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return d;
+    /* calculate the borrow chain.  See note at top */
+    bc = (res & (~d | s)) | (~d & s);
+    CONDITIONAL_SET_FLAG(bc & 0x80000000, F_CF);
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return d;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the DAA instruction and side effects.
 ****************************************************************************/
-u8 daa_byte(u8 d)
+u8
+daa_byte(u8 d)
 {
-	u32 res = d;
-	if ((d & 0xf) > 9 || ACCESS_FLAG(F_AF)) {
-		res += 6;
-		SET_FLAG(F_AF);
-	}
-	if (res > 0x9F || ACCESS_FLAG(F_CF)) {
-		res += 0x60;
-		SET_FLAG(F_CF);
-	}
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xFF) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-	return (u8)res;
+    u32 res = d;
+
+    if ((d & 0xf) > 9 || ACCESS_FLAG(F_AF)) {
+        res += 6;
+        SET_FLAG(F_AF);
+    }
+    if (res > 0x9F || ACCESS_FLAG(F_CF)) {
+        res += 0x60;
+        SET_FLAG(F_CF);
+    }
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xFF) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the DAS instruction and side effects.
 ****************************************************************************/
-u8 das_byte(u8 d)
+u8
+das_byte(u8 d)
 {
-	if ((d & 0xf) > 9 || ACCESS_FLAG(F_AF)) {
-		d -= 6;
-		SET_FLAG(F_AF);
-	}
-	if (d > 0x9F || ACCESS_FLAG(F_CF)) {
-		d -= 0x60;
-		SET_FLAG(F_CF);
-	}
-	CONDITIONAL_SET_FLAG(d & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG(d == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(d & 0xff), F_PF);
-	return d;
+    if ((d & 0xf) > 9 || ACCESS_FLAG(F_AF)) {
+        d -= 6;
+        SET_FLAG(F_AF);
+    }
+    if (d > 0x9F || ACCESS_FLAG(F_CF)) {
+        d -= 0x60;
+        SET_FLAG(F_CF);
+    }
+    CONDITIONAL_SET_FLAG(d & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG(d == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(d & 0xff), F_PF);
+    return d;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the DEC instruction and side effects.
 ****************************************************************************/
-u8 dec_byte(u8 d)
+u8
+dec_byte(u8 d)
 {
-    register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
     register u32 bc;
 
     res = d - 1;
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the borrow chain.  See note at top */
-	/* based on sub_byte, uses s==1.  */
-	bc = (res & (~d | 1)) | (~d & 1);
-	/* carry flag unchanged */
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return (u8)res;
+    /* calculate the borrow chain.  See note at top */
+    /* based on sub_byte, uses s==1.  */
+    bc = (res & (~d | 1)) | (~d & 1);
+    /* carry flag unchanged */
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the DEC instruction and side effects.
 ****************************************************************************/
-u16 dec_word(u16 d)
+u16
+dec_word(u16 d)
 {
-    register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
     register u32 bc;
 
     res = d - 1;
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
     /* calculate the borrow chain.  See note at top */
     /* based on the sub_byte routine, with s==1 */
     bc = (res & (~d | 1)) | (~d & 1);
     /* carry flag unchanged */
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return (u16)res;
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the DEC instruction and side effects.
 ****************************************************************************/
-u32 dec_long(u32 d)
+u32
+dec_long(u32 d)
 {
-    register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
     register u32 bc;
 
     res = d - 1;
 
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
     /* calculate the borrow chain.  See note at top */
-	bc = (res & (~d | 1)) | (~d & 1);
-	/* carry flag unchanged */
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return res;
+    bc = (res & (~d | 1)) | (~d & 1);
+    /* carry flag unchanged */
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the INC instruction and side effects.
 ****************************************************************************/
-u8 inc_byte(u8 d)
+u8
+inc_byte(u8 d)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 cc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 cc;
 
-	res = d + 1;
-	CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    res = d + 1;
+    CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the carry chain  SEE NOTE AT TOP. */
-	cc = ((1 & d) | (~res)) & (1 | d);
-	CONDITIONAL_SET_FLAG(XOR2(cc >> 6), F_OF);
-	CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
-	return (u8)res;
+    /* calculate the carry chain  SEE NOTE AT TOP. */
+    cc = ((1 & d) | (~res)) & (1 | d);
+    CONDITIONAL_SET_FLAG(XOR2(cc >> 6), F_OF);
+    CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the INC instruction and side effects.
 ****************************************************************************/
-u16 inc_word(u16 d)
+u16
+inc_word(u16 d)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 cc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 cc;
 
-	res = d + 1;
-	CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    res = d + 1;
+    CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the carry chain  SEE NOTE AT TOP. */
-	cc = (1 & d) | ((~res) & (1 | d));
-	CONDITIONAL_SET_FLAG(XOR2(cc >> 14), F_OF);
-	CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
-	return (u16)res;
+    /* calculate the carry chain  SEE NOTE AT TOP. */
+    cc = (1 & d) | ((~res) & (1 | d));
+    CONDITIONAL_SET_FLAG(XOR2(cc >> 14), F_OF);
+    CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the INC instruction and side effects.
 ****************************************************************************/
-u32 inc_long(u32 d)
+u32
+inc_long(u32 d)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 cc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 cc;
 
-	res = d + 1;
-	CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    res = d + 1;
+    CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the carry chain  SEE NOTE AT TOP. */
-	cc = (1 & d) | ((~res) & (1 | d));
-	CONDITIONAL_SET_FLAG(XOR2(cc >> 30), F_OF);
-	CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
-	return res;
+    /* calculate the carry chain  SEE NOTE AT TOP. */
+    cc = (1 & d) | ((~res) & (1 | d));
+    CONDITIONAL_SET_FLAG(XOR2(cc >> 30), F_OF);
+    CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the OR instruction and side effects.
 ****************************************************************************/
-u8 or_byte(u8 d, u8 s)
+u8
+or_byte(u8 d, u8 s)
 {
-	register u8 res;    /* all operands in native machine order */
+    register u8 res;            /* all operands in native machine order */
 
-	res = d | s;
-	CLEAR_FLAG(F_OF);
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res), F_PF);
-	return res;
+    res = d | s;
+    CLEAR_FLAG(F_OF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res), F_PF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the OR instruction and side effects.
 ****************************************************************************/
-u16 or_word(u16 d, u16 s)
+u16
+or_word(u16 d, u16 s)
 {
-	register u16 res;   /* all operands in native machine order */
+    register u16 res;           /* all operands in native machine order */
 
-	res = d | s;
-	/* set the carry flag to be bit 8 */
-	CLEAR_FLAG(F_OF);
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-	return res;
+    res = d | s;
+    /* set the carry flag to be bit 8 */
+    CLEAR_FLAG(F_OF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the OR instruction and side effects.
 ****************************************************************************/
-u32 or_long(u32 d, u32 s)
+u32
+or_long(u32 d, u32 s)
 {
-	register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
 
-	res = d | s;
+    res = d | s;
 
-	/* set the carry flag to be bit 8 */
-	CLEAR_FLAG(F_OF);
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-	return res;
+    /* set the carry flag to be bit 8 */
+    CLEAR_FLAG(F_OF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the OR instruction and side effects.
 ****************************************************************************/
-u8 neg_byte(u8 s)
+u8
+neg_byte(u8 s)
 {
     register u8 res;
     register u8 bc;
 
-	CONDITIONAL_SET_FLAG(s != 0, F_CF);
-	res = (u8)-s;
-	CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res), F_PF);
-	/* calculate the borrow chain --- modified such that d=0.
-	   substitutiing d=0 into     bc= res&(~d|s)|(~d&s);
-	   (the one used for sub) and simplifying, since ~d=0xff...,
-	   ~d|s == 0xffff..., and res&0xfff... == res.  Similarly
-	   ~d&s == s.  So the simplified result is: */
-	bc = res | s;
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return res;
+    CONDITIONAL_SET_FLAG(s != 0, F_CF);
+    res = (u8) - s;
+    CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res), F_PF);
+    /* calculate the borrow chain --- modified such that d=0.
+       substitutiing d=0 into     bc= res&(~d|s)|(~d&s);
+       (the one used for sub) and simplifying, since ~d=0xff...,
+       ~d|s == 0xffff..., and res&0xfff... == res.  Similarly
+       ~d&s == s.  So the simplified result is: */
+    bc = res | s;
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the OR instruction and side effects.
 ****************************************************************************/
-u16 neg_word(u16 s)
-{
-	register u16 res;
-	register u16 bc;
-
-	CONDITIONAL_SET_FLAG(s != 0, F_CF);
-	res = (u16)-s;
-	CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-
-	/* calculate the borrow chain --- modified such that d=0.
-	   substitutiing d=0 into     bc= res&(~d|s)|(~d&s);
-	   (the one used for sub) and simplifying, since ~d=0xff...,
-	   ~d|s == 0xffff..., and res&0xfff... == res.  Similarly
-	   ~d&s == s.  So the simplified result is: */
-	bc = res | s;
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return res;
+u16
+neg_word(u16 s)
+{
+    register u16 res;
+    register u16 bc;
+
+    CONDITIONAL_SET_FLAG(s != 0, F_CF);
+    res = (u16) - s;
+    CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+
+    /* calculate the borrow chain --- modified such that d=0.
+       substitutiing d=0 into     bc= res&(~d|s)|(~d&s);
+       (the one used for sub) and simplifying, since ~d=0xff...,
+       ~d|s == 0xffff..., and res&0xfff... == res.  Similarly
+       ~d&s == s.  So the simplified result is: */
+    bc = res | s;
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the OR instruction and side effects.
 ****************************************************************************/
-u32 neg_long(u32 s)
+u32
+neg_long(u32 s)
 {
-	register u32 res;
-	register u32 bc;
-
-	CONDITIONAL_SET_FLAG(s != 0, F_CF);
-	res = (u32)-s;
-	CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    register u32 res;
+    register u32 bc;
 
-	/* calculate the borrow chain --- modified such that d=0.
-	   substitutiing d=0 into     bc= res&(~d|s)|(~d&s);
-	   (the one used for sub) and simplifying, since ~d=0xff...,
-	   ~d|s == 0xffff..., and res&0xfff... == res.  Similarly
-	   ~d&s == s.  So the simplified result is: */
-	bc = res | s;
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return res;
+    CONDITIONAL_SET_FLAG(s != 0, F_CF);
+    res = (u32) - s;
+    CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+
+    /* calculate the borrow chain --- modified such that d=0.
+       substitutiing d=0 into     bc= res&(~d|s)|(~d&s);
+       (the one used for sub) and simplifying, since ~d=0xff...,
+       ~d|s == 0xffff..., and res&0xfff... == res.  Similarly
+       ~d&s == s.  So the simplified result is: */
+    bc = res | s;
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the NOT instruction and side effects.
 ****************************************************************************/
-u8 not_byte(u8 s)
+u8
+not_byte(u8 s)
 {
-	return ~s;
+    return ~s;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the NOT instruction and side effects.
 ****************************************************************************/
-u16 not_word(u16 s)
+u16
+not_word(u16 s)
 {
-	return ~s;
+    return ~s;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the NOT instruction and side effects.
 ****************************************************************************/
-u32 not_long(u32 s)
+u32
+not_long(u32 s)
 {
-	return ~s;
+    return ~s;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the RCL instruction and side effects.
 ****************************************************************************/
-u8 rcl_byte(u8 d, u8 s)
+u8
+rcl_byte(u8 d, u8 s)
 {
     register unsigned int res, cnt, mask, cf;
 
     /* s is the rotate distance.  It varies from 0 - 8. */
-	/* have
+    /* have
 
        CF  B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0 
 
@@ -867,9 +905,9 @@ u8 rcl_byte(u8 d, u8 s)
        2) B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_0
        3) B_(n-1) <- cf
        4) B_(n-2) .. B_0 <-  b_7 .. b_(8-(n-1))
-	 */
-	res = d;
-	if ((cnt = s % 9) != 0) {
+     */
+    res = d;
+    if ((cnt = s % 9) != 0) {
         /* extract the new CARRY FLAG. */
         /* CF <-  b_(8-n)             */
         cf = (d >> (8 - cnt)) & 0x1;
@@ -878,7 +916,7 @@ u8 rcl_byte(u8 d, u8 s)
            into the range B_7 .. B_cnt */
         /* B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_0  */
         /* note that the right hand side done by the mask */
-		res = (d << cnt) & 0xff;
+        res = (d << cnt) & 0xff;
 
         /* now the high stuff which rotated around 
            into the positions B_cnt-2 .. B_0 */
@@ -890,81 +928,81 @@ u8 rcl_byte(u8 d, u8 s)
         res |= (d >> (9 - cnt)) & mask;
 
         /* if the carry flag was set, or it in.  */
-		if (ACCESS_FLAG(F_CF)) {     /* carry flag is set */
+        if (ACCESS_FLAG(F_CF)) {        /* carry flag is set */
             /*  B_(n-1) <- cf */
             res |= 1 << (cnt - 1);
         }
         /* set the new carry flag, based on the variable "cf" */
-		CONDITIONAL_SET_FLAG(cf, F_CF);
+        CONDITIONAL_SET_FLAG(cf, F_CF);
         /* OVERFLOW is set *IFF* cnt==1, then it is the 
            xor of CF and the most significant bit.  Blecck. */
         /* parenthesized this expression since it appears to
            be causing OF to be misset */
-        CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 6) & 0x2)),
-							 F_OF);
+        CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 6) & 0x2)), F_OF);
 
     }
-	return (u8)res;
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the RCL instruction and side effects.
 ****************************************************************************/
-u16 rcl_word(u16 d, u8 s)
+u16
+rcl_word(u16 d, u8 s)
 {
-	register unsigned int res, cnt, mask, cf;
+    register unsigned int res, cnt, mask, cf;
 
-	res = d;
-	if ((cnt = s % 17) != 0) {
-		cf = (d >> (16 - cnt)) & 0x1;
-		res = (d << cnt) & 0xffff;
-		mask = (1 << (cnt - 1)) - 1;
-		res |= (d >> (17 - cnt)) & mask;
-		if (ACCESS_FLAG(F_CF)) {
-			res |= 1 << (cnt - 1);
-		}
-		CONDITIONAL_SET_FLAG(cf, F_CF);
-		CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 14) & 0x2)),
-							 F_OF);
-	}
-	return (u16)res;
+    res = d;
+    if ((cnt = s % 17) != 0) {
+        cf = (d >> (16 - cnt)) & 0x1;
+        res = (d << cnt) & 0xffff;
+        mask = (1 << (cnt - 1)) - 1;
+        res |= (d >> (17 - cnt)) & mask;
+        if (ACCESS_FLAG(F_CF)) {
+            res |= 1 << (cnt - 1);
+        }
+        CONDITIONAL_SET_FLAG(cf, F_CF);
+        CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 14) & 0x2)), F_OF);
+    }
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the RCL instruction and side effects.
 ****************************************************************************/
-u32 rcl_long(u32 d, u8 s)
+u32
+rcl_long(u32 d, u8 s)
 {
-	register u32 res, cnt, mask, cf;
+    register u32 res, cnt, mask, cf;
 
-	res = d;
-	if ((cnt = s % 33) != 0) {
-		cf = (d >> (32 - cnt)) & 0x1;
-		res = (d << cnt) & 0xffffffff;
-		mask = (1 << (cnt - 1)) - 1;
-		res |= (d >> (33 - cnt)) & mask;
-		if (ACCESS_FLAG(F_CF)) {     /* carry flag is set */
-			res |= 1 << (cnt - 1);
-		}
-		CONDITIONAL_SET_FLAG(cf, F_CF);
-		CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 30) & 0x2)),
-							 F_OF);
-	}
-	return res;
+    res = d;
+    if ((cnt = s % 33) != 0) {
+        cf = (d >> (32 - cnt)) & 0x1;
+        res = (d << cnt) & 0xffffffff;
+        mask = (1 << (cnt - 1)) - 1;
+        res |= (d >> (33 - cnt)) & mask;
+        if (ACCESS_FLAG(F_CF)) {        /* carry flag is set */
+            res |= 1 << (cnt - 1);
+        }
+        CONDITIONAL_SET_FLAG(cf, F_CF);
+        CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 30) & 0x2)), F_OF);
+    }
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the RCR instruction and side effects.
 ****************************************************************************/
-u8 rcr_byte(u8 d, u8 s)
+u8
+rcr_byte(u8 d, u8 s)
 {
-	u32	res, cnt;
-	u32	mask, cf, ocf = 0;
+    u32 res, cnt;
+    u32 mask, cf, ocf = 0;
 
-	/* rotate right through carry */
+    /* rotate right through carry */
     /* 
        s is the rotate distance.  It varies from 0 - 8.
        d is the byte object rotated.  
@@ -985,9 +1023,9 @@ u8 rcr_byte(u8 d, u8 s)
        2) B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n)
        3) B_(8-n) <- cf
        4) B_(7) .. B_(8-(n-1)) <-  b_(n-2) .. b_(0)
-	 */
-	res = d;
-	if ((cnt = s % 9) != 0) {
+     */
+    res = d;
+    if ((cnt = s % 9) != 0) {
         /* extract the new CARRY FLAG. */
         /* CF <-  b_(n-1)              */
         if (cnt == 1) {
@@ -996,11 +1034,12 @@ u8 rcr_byte(u8 d, u8 s)
                0 if flag not set
                non-zero if flag is set.
                doing access_flag(..) != 0 casts that into either 
-			   0..1 in any representation of the flags register
+               0..1 in any representation of the flags register
                (i.e. packed bit array or unpacked.)
              */
-			ocf = ACCESS_FLAG(F_CF) != 0;
-        } else
+            ocf = ACCESS_FLAG(F_CF) != 0;
+        }
+        else
             cf = (d >> (cnt - 1)) & 0x1;
 
         /* B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_n  */
@@ -1022,93 +1061,95 @@ u8 rcr_byte(u8 d, u8 s)
         res |= (d << (9 - cnt));
 
         /* if the carry flag was set, or it in.  */
-		if (ACCESS_FLAG(F_CF)) {     /* carry flag is set */
+        if (ACCESS_FLAG(F_CF)) {        /* carry flag is set */
             /*  B_(8-n) <- cf */
             res |= 1 << (8 - cnt);
         }
         /* set the new carry flag, based on the variable "cf" */
-		CONDITIONAL_SET_FLAG(cf, F_CF);
+        CONDITIONAL_SET_FLAG(cf, F_CF);
         /* OVERFLOW is set *IFF* cnt==1, then it is the 
            xor of CF and the most significant bit.  Blecck. */
         /* parenthesized... */
-		if (cnt == 1) {
-			CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 6) & 0x2)),
-								 F_OF);
-		}
-	}
-	return (u8)res;
+        if (cnt == 1) {
+            CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 6) & 0x2)), F_OF);
+        }
+    }
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the RCR instruction and side effects.
 ****************************************************************************/
-u16 rcr_word(u16 d, u8 s)
+u16
+rcr_word(u16 d, u8 s)
 {
-	u32 res, cnt;
-	u32	mask, cf, ocf = 0;
+    u32 res, cnt;
+    u32 mask, cf, ocf = 0;
 
-	/* rotate right through carry */
-	res = d;
-	if ((cnt = s % 17) != 0) {
-		if (cnt == 1) {
-			cf = d & 0x1;
-			ocf = ACCESS_FLAG(F_CF) != 0;
-		} else
-			cf = (d >> (cnt - 1)) & 0x1;
-		mask = (1 << (16 - cnt)) - 1;
-		res = (d >> cnt) & mask;
-		res |= (d << (17 - cnt));
-		if (ACCESS_FLAG(F_CF)) {
-			res |= 1 << (16 - cnt);
-		}
-		CONDITIONAL_SET_FLAG(cf, F_CF);
-		if (cnt == 1) {
-			CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 14) & 0x2)),
-								 F_OF);
-		}
-	}
-	return (u16)res;
+    /* rotate right through carry */
+    res = d;
+    if ((cnt = s % 17) != 0) {
+        if (cnt == 1) {
+            cf = d & 0x1;
+            ocf = ACCESS_FLAG(F_CF) != 0;
+        }
+        else
+            cf = (d >> (cnt - 1)) & 0x1;
+        mask = (1 << (16 - cnt)) - 1;
+        res = (d >> cnt) & mask;
+        res |= (d << (17 - cnt));
+        if (ACCESS_FLAG(F_CF)) {
+            res |= 1 << (16 - cnt);
+        }
+        CONDITIONAL_SET_FLAG(cf, F_CF);
+        if (cnt == 1) {
+            CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 14) & 0x2)), F_OF);
+        }
+    }
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the RCR instruction and side effects.
 ****************************************************************************/
-u32 rcr_long(u32 d, u8 s)
-{
-	u32 res, cnt;
-	u32 mask, cf, ocf = 0;
-
-	/* rotate right through carry */
-	res = d;
-	if ((cnt = s % 33) != 0) {
-		if (cnt == 1) {
-			cf = d & 0x1;
-			ocf = ACCESS_FLAG(F_CF) != 0;
-		} else
-			cf = (d >> (cnt - 1)) & 0x1;
-		mask = (1 << (32 - cnt)) - 1;
-		res = (d >> cnt) & mask;
-		if (cnt != 1)
-			res |= (d << (33 - cnt));
-		if (ACCESS_FLAG(F_CF)) {     /* carry flag is set */
-			res |= 1 << (32 - cnt);
-		}
-		CONDITIONAL_SET_FLAG(cf, F_CF);
-		if (cnt == 1) {
-			CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 30) & 0x2)),
-								 F_OF);
-		}
-	}
-	return res;
+u32
+rcr_long(u32 d, u8 s)
+{
+    u32 res, cnt;
+    u32 mask, cf, ocf = 0;
+
+    /* rotate right through carry */
+    res = d;
+    if ((cnt = s % 33) != 0) {
+        if (cnt == 1) {
+            cf = d & 0x1;
+            ocf = ACCESS_FLAG(F_CF) != 0;
+        }
+        else
+            cf = (d >> (cnt - 1)) & 0x1;
+        mask = (1 << (32 - cnt)) - 1;
+        res = (d >> cnt) & mask;
+        if (cnt != 1)
+            res |= (d << (33 - cnt));
+        if (ACCESS_FLAG(F_CF)) {        /* carry flag is set */
+            res |= 1 << (32 - cnt);
+        }
+        CONDITIONAL_SET_FLAG(cf, F_CF);
+        if (cnt == 1) {
+            CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 30) & 0x2)), F_OF);
+        }
+    }
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the ROL instruction and side effects.
 ****************************************************************************/
-u8 rol_byte(u8 d, u8 s)
+u8
+rol_byte(u8 d, u8 s)
 {
     register unsigned int res, cnt, mask;
 
@@ -1127,87 +1168,90 @@ u8 rol_byte(u8 d, u8 s)
        IF n > 0 
        1) B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_(0)
        2) B_(n-1) .. B_(0) <-  b_(7) .. b_(8-n)
-	 */
+     */
     res = d;
-	if ((cnt = s % 8) != 0) {
-		/* B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_(0) */
-		res = (d << cnt);
+    if ((cnt = s % 8) != 0) {
+        /* B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_(0) */
+        res = (d << cnt);
 
-		/* B_(n-1) .. B_(0) <-  b_(7) .. b_(8-n) */
-		mask = (1 << cnt) - 1;
-		res |= (d >> (8 - cnt)) & mask;
+        /* B_(n-1) .. B_(0) <-  b_(7) .. b_(8-n) */
+        mask = (1 << cnt) - 1;
+        res |= (d >> (8 - cnt)) & mask;
 
-		/* set the new carry flag, Note that it is the low order
-		   bit of the result!!!                               */
-		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-		/* OVERFLOW is set *IFF* s==1, then it is the
-		   xor of CF and the most significant bit.  Blecck. */
-		CONDITIONAL_SET_FLAG(s == 1 &&
-							 XOR2((res & 0x1) + ((res >> 6) & 0x2)),
-							 F_OF);
-	} if (s != 0) {
-		/* set the new carry flag, Note that it is the low order
-		   bit of the result!!!                               */
-		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-	}
-	return (u8)res;
+        /* set the new carry flag, Note that it is the low order
+           bit of the result!!!                               */
+        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+        /* OVERFLOW is set *IFF* s==1, then it is the
+           xor of CF and the most significant bit.  Blecck. */
+        CONDITIONAL_SET_FLAG(s == 1 &&
+                             XOR2((res & 0x1) + ((res >> 6) & 0x2)), F_OF);
+    }
+    if (s != 0) {
+        /* set the new carry flag, Note that it is the low order
+           bit of the result!!!                               */
+        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+    }
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the ROL instruction and side effects.
 ****************************************************************************/
-u16 rol_word(u16 d, u8 s)
+u16
+rol_word(u16 d, u8 s)
 {
     register unsigned int res, cnt, mask;
 
-	res = d;
-	if ((cnt = s % 16) != 0) {
-		res = (d << cnt);
-		mask = (1 << cnt) - 1;
-		res |= (d >> (16 - cnt)) & mask;
-		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-		CONDITIONAL_SET_FLAG(s == 1 &&
-							 XOR2((res & 0x1) + ((res >> 14) & 0x2)),
-							 F_OF);
-	} if (s != 0) {
-		/* set the new carry flag, Note that it is the low order
-		   bit of the result!!!                               */
-		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-	}
-	return (u16)res;
+    res = d;
+    if ((cnt = s % 16) != 0) {
+        res = (d << cnt);
+        mask = (1 << cnt) - 1;
+        res |= (d >> (16 - cnt)) & mask;
+        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+        CONDITIONAL_SET_FLAG(s == 1 &&
+                             XOR2((res & 0x1) + ((res >> 14) & 0x2)), F_OF);
+    }
+    if (s != 0) {
+        /* set the new carry flag, Note that it is the low order
+           bit of the result!!!                               */
+        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+    }
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the ROL instruction and side effects.
 ****************************************************************************/
-u32 rol_long(u32 d, u8 s)
+u32
+rol_long(u32 d, u8 s)
 {
     register u32 res, cnt, mask;
 
-	res = d;
-	if ((cnt = s % 32) != 0) {
-		res = (d << cnt);
-		mask = (1 << cnt) - 1;
-		res |= (d >> (32 - cnt)) & mask;
-		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-		CONDITIONAL_SET_FLAG(s == 1 &&
-							 XOR2((res & 0x1) + ((res >> 30) & 0x2)),
-							 F_OF);
-	} if (s != 0) {
-		/* set the new carry flag, Note that it is the low order
-		   bit of the result!!!                               */
-		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-	}
-	return res;
+    res = d;
+    if ((cnt = s % 32) != 0) {
+        res = (d << cnt);
+        mask = (1 << cnt) - 1;
+        res |= (d >> (32 - cnt)) & mask;
+        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+        CONDITIONAL_SET_FLAG(s == 1 &&
+                             XOR2((res & 0x1) + ((res >> 30) & 0x2)), F_OF);
+    }
+    if (s != 0) {
+        /* set the new carry flag, Note that it is the low order
+           bit of the result!!!                               */
+        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+    }
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the ROR instruction and side effects.
 ****************************************************************************/
-u8 ror_byte(u8 d, u8 s)
+u8
+ror_byte(u8 d, u8 s)
 {
     register unsigned int res, cnt, mask;
 
@@ -1225,9 +1269,9 @@ u8 ror_byte(u8 d, u8 s)
        IF n > 0 
        1) B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n)
        2) B_(7) .. B_(8-n) <-  b_(n-1) .. b_(0)
-	 */
-	res = d;
-	if ((cnt = s % 8) != 0) {           /* not a typo, do nada if cnt==0 */
+     */
+    res = d;
+    if ((cnt = s % 8) != 0) {   /* not a typo, do nada if cnt==0 */
         /* B_(7) .. B_(8-n) <-  b_(n-1) .. b_(0) */
         res = (d << (8 - cnt));
 
@@ -1237,291 +1281,317 @@ u8 ror_byte(u8 d, u8 s)
 
         /* set the new carry flag, Note that it is the low order 
            bit of the result!!!                               */
-		CONDITIONAL_SET_FLAG(res & 0x80, F_CF);
-		/* OVERFLOW is set *IFF* s==1, then it is the
+        CONDITIONAL_SET_FLAG(res & 0x80, F_CF);
+        /* OVERFLOW is set *IFF* s==1, then it is the
            xor of the two most significant bits.  Blecck. */
-		CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 6), F_OF);
-	} else if (s != 0) {
-		/* set the new carry flag, Note that it is the low order
-		   bit of the result!!!                               */
-		CONDITIONAL_SET_FLAG(res & 0x80, F_CF);
-	}
-	return (u8)res;
+        CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 6), F_OF);
+    }
+    else if (s != 0) {
+        /* set the new carry flag, Note that it is the low order
+           bit of the result!!!                               */
+        CONDITIONAL_SET_FLAG(res & 0x80, F_CF);
+    }
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the ROR instruction and side effects.
 ****************************************************************************/
-u16 ror_word(u16 d, u8 s)
+u16
+ror_word(u16 d, u8 s)
 {
     register unsigned int res, cnt, mask;
 
-	res = d;
-	if ((cnt = s % 16) != 0) {
-		res = (d << (16 - cnt));
-		mask = (1 << (16 - cnt)) - 1;
-		res |= (d >> (cnt)) & mask;
-		CONDITIONAL_SET_FLAG(res & 0x8000, F_CF);
-		CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 14), F_OF);
-	} else if (s != 0) {
-		/* set the new carry flag, Note that it is the low order
-		   bit of the result!!!                               */
-		CONDITIONAL_SET_FLAG(res & 0x8000, F_CF);
-	}
-	return (u16)res;
+    res = d;
+    if ((cnt = s % 16) != 0) {
+        res = (d << (16 - cnt));
+        mask = (1 << (16 - cnt)) - 1;
+        res |= (d >> (cnt)) & mask;
+        CONDITIONAL_SET_FLAG(res & 0x8000, F_CF);
+        CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 14), F_OF);
+    }
+    else if (s != 0) {
+        /* set the new carry flag, Note that it is the low order
+           bit of the result!!!                               */
+        CONDITIONAL_SET_FLAG(res & 0x8000, F_CF);
+    }
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the ROR instruction and side effects.
 ****************************************************************************/
-u32 ror_long(u32 d, u8 s)
+u32
+ror_long(u32 d, u8 s)
 {
-	register u32 res, cnt, mask;
+    register u32 res, cnt, mask;
 
-	res = d;
-	if ((cnt = s % 32) != 0) {
-		res = (d << (32 - cnt));
-		mask = (1 << (32 - cnt)) - 1;
-		res |= (d >> (cnt)) & mask;
-		CONDITIONAL_SET_FLAG(res & 0x80000000, F_CF);
-		CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 30), F_OF);
-	} else if (s != 0) {
-		/* set the new carry flag, Note that it is the low order
-		   bit of the result!!!                               */
-		CONDITIONAL_SET_FLAG(res & 0x80000000, F_CF);
-	}
-	return res;
+    res = d;
+    if ((cnt = s % 32) != 0) {
+        res = (d << (32 - cnt));
+        mask = (1 << (32 - cnt)) - 1;
+        res |= (d >> (cnt)) & mask;
+        CONDITIONAL_SET_FLAG(res & 0x80000000, F_CF);
+        CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 30), F_OF);
+    }
+    else if (s != 0) {
+        /* set the new carry flag, Note that it is the low order
+           bit of the result!!!                               */
+        CONDITIONAL_SET_FLAG(res & 0x80000000, F_CF);
+    }
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SHL instruction and side effects.
 ****************************************************************************/
-u8 shl_byte(u8 d, u8 s)
+u8
+shl_byte(u8 d, u8 s)
 {
-	unsigned int cnt, res, cf;
-
-	if (s < 8) {
-		cnt = s % 8;
+    unsigned int cnt, res, cf;
 
-		/* last bit shifted out goes into carry flag */
-		if (cnt > 0) {
-			res = d << cnt;
-			cf = d & (1 << (8 - cnt));
-			CONDITIONAL_SET_FLAG(cf, F_CF);
-			CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
-			CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-			CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-		} else {
-			res = (u8) d;
-		}
+    if (s < 8) {
+        cnt = s % 8;
+
+        /* last bit shifted out goes into carry flag */
+        if (cnt > 0) {
+            res = d << cnt;
+            cf = d & (1 << (8 - cnt));
+            CONDITIONAL_SET_FLAG(cf, F_CF);
+            CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
+            CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+            CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+        }
+        else {
+            res = (u8) d;
+        }
 
-		if (cnt == 1) {
-			/* Needs simplification. */
-			CONDITIONAL_SET_FLAG(
-									(((res & 0x80) == 0x80) ^
-									 (ACCESS_FLAG(F_CF) != 0)),
-			/* was (M.x86.R_FLG&F_CF)==F_CF)), */
-									F_OF);
-		} else {
-			CLEAR_FLAG(F_OF);
-		}
-	} else {
-		res = 0;
-		CONDITIONAL_SET_FLAG((d << (s-1)) & 0x80, F_CF);
-		CLEAR_FLAG(F_OF);
-		CLEAR_FLAG(F_SF);
-		SET_FLAG(F_PF);
-		SET_FLAG(F_ZF);
+        if (cnt == 1) {
+            /* Needs simplification. */
+            CONDITIONAL_SET_FLAG((((res & 0x80) == 0x80) ^
+                                  (ACCESS_FLAG(F_CF) != 0)),
+                                 /* was (M.x86.R_FLG&F_CF)==F_CF)), */
+                                 F_OF);
+        }
+        else {
+            CLEAR_FLAG(F_OF);
+        }
     }
-	return (u8)res;
+    else {
+        res = 0;
+        CONDITIONAL_SET_FLAG((d << (s - 1)) & 0x80, F_CF);
+        CLEAR_FLAG(F_OF);
+        CLEAR_FLAG(F_SF);
+        SET_FLAG(F_PF);
+        SET_FLAG(F_ZF);
+    }
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SHL instruction and side effects.
 ****************************************************************************/
-u16 shl_word(u16 d, u8 s)
+u16
+shl_word(u16 d, u8 s)
 {
     unsigned int cnt, res, cf;
 
-	if (s < 16) {
-		cnt = s % 16;
-		if (cnt > 0) {
-			res = d << cnt;
-			cf = d & (1 << (16 - cnt));
-			CONDITIONAL_SET_FLAG(cf, F_CF);
-			CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-			CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-			CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-		} else {
-			res = (u16) d;
-		}
-
-		if (cnt == 1) {
-			CONDITIONAL_SET_FLAG(
-									(((res & 0x8000) == 0x8000) ^
-									 (ACCESS_FLAG(F_CF) != 0)),
-									F_OF);
-        } else {
-			CLEAR_FLAG(F_OF);
-        }
-    } else {
-		res = 0;
-		CONDITIONAL_SET_FLAG((d << (s-1)) & 0x8000, F_CF);
-		CLEAR_FLAG(F_OF);
-		CLEAR_FLAG(F_SF);
-		SET_FLAG(F_PF);
-		SET_FLAG(F_ZF);
-	}
-	return (u16)res;
+    if (s < 16) {
+        cnt = s % 16;
+        if (cnt > 0) {
+            res = d << cnt;
+            cf = d & (1 << (16 - cnt));
+            CONDITIONAL_SET_FLAG(cf, F_CF);
+            CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+            CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+            CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+        }
+        else {
+            res = (u16) d;
+        }
+
+        if (cnt == 1) {
+            CONDITIONAL_SET_FLAG((((res & 0x8000) == 0x8000) ^
+                                  (ACCESS_FLAG(F_CF) != 0)), F_OF);
+        }
+        else {
+            CLEAR_FLAG(F_OF);
+        }
+    }
+    else {
+        res = 0;
+        CONDITIONAL_SET_FLAG((d << (s - 1)) & 0x8000, F_CF);
+        CLEAR_FLAG(F_OF);
+        CLEAR_FLAG(F_SF);
+        SET_FLAG(F_PF);
+        SET_FLAG(F_ZF);
+    }
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SHL instruction and side effects.
 ****************************************************************************/
-u32 shl_long(u32 d, u8 s)
-{
-	unsigned int cnt, res, cf;
-
-	if (s < 32) {
-		cnt = s % 32;
-		if (cnt > 0) {
-			res = d << cnt;
-			cf = d & (1 << (32 - cnt));
-			CONDITIONAL_SET_FLAG(cf, F_CF);
-			CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-			CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-			CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-		} else {
-			res = d;
-		}
-		if (cnt == 1) {
-			CONDITIONAL_SET_FLAG((((res & 0x80000000) == 0x80000000) ^
-								  (ACCESS_FLAG(F_CF) != 0)), F_OF);
-		} else {
-			CLEAR_FLAG(F_OF);
-		}
-	} else {
-		res = 0;
-		CONDITIONAL_SET_FLAG((d << (s-1)) & 0x80000000, F_CF);
-		CLEAR_FLAG(F_OF);
-		CLEAR_FLAG(F_SF);
-		SET_FLAG(F_PF);
-		SET_FLAG(F_ZF);
-	}
-	return res;
+u32
+shl_long(u32 d, u8 s)
+{
+    unsigned int cnt, res, cf;
+
+    if (s < 32) {
+        cnt = s % 32;
+        if (cnt > 0) {
+            res = d << cnt;
+            cf = d & (1 << (32 - cnt));
+            CONDITIONAL_SET_FLAG(cf, F_CF);
+            CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+            CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+            CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+        }
+        else {
+            res = d;
+        }
+        if (cnt == 1) {
+            CONDITIONAL_SET_FLAG((((res & 0x80000000) == 0x80000000) ^
+                                  (ACCESS_FLAG(F_CF) != 0)), F_OF);
+        }
+        else {
+            CLEAR_FLAG(F_OF);
+        }
+    }
+    else {
+        res = 0;
+        CONDITIONAL_SET_FLAG((d << (s - 1)) & 0x80000000, F_CF);
+        CLEAR_FLAG(F_OF);
+        CLEAR_FLAG(F_SF);
+        SET_FLAG(F_PF);
+        SET_FLAG(F_ZF);
+    }
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SHR instruction and side effects.
 ****************************************************************************/
-u8 shr_byte(u8 d, u8 s)
-{
-	unsigned int cnt, res, cf;
-
-	if (s < 8) {
-		cnt = s % 8;
-		if (cnt > 0) {
-			cf = d & (1 << (cnt - 1));
-			res = d >> cnt;
-			CONDITIONAL_SET_FLAG(cf, F_CF);
-			CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
-			CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-			CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-		} else {
-			res = (u8) d;
-		}
-
-		if (cnt == 1) {
-			CONDITIONAL_SET_FLAG(XOR2(res >> 6), F_OF);
-		} else {
-			CLEAR_FLAG(F_OF);
-		}
-	} else {
-		res = 0;
-		CONDITIONAL_SET_FLAG((d >> (s-1)) & 0x1, F_CF);
-		CLEAR_FLAG(F_OF);
-		CLEAR_FLAG(F_SF);
-		SET_FLAG(F_PF);
-		SET_FLAG(F_ZF);
-	}
-	return (u8)res;
+u8
+shr_byte(u8 d, u8 s)
+{
+    unsigned int cnt, res, cf;
+
+    if (s < 8) {
+        cnt = s % 8;
+        if (cnt > 0) {
+            cf = d & (1 << (cnt - 1));
+            res = d >> cnt;
+            CONDITIONAL_SET_FLAG(cf, F_CF);
+            CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
+            CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+            CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+        }
+        else {
+            res = (u8) d;
+        }
+
+        if (cnt == 1) {
+            CONDITIONAL_SET_FLAG(XOR2(res >> 6), F_OF);
+        }
+        else {
+            CLEAR_FLAG(F_OF);
+        }
+    }
+    else {
+        res = 0;
+        CONDITIONAL_SET_FLAG((d >> (s - 1)) & 0x1, F_CF);
+        CLEAR_FLAG(F_OF);
+        CLEAR_FLAG(F_SF);
+        SET_FLAG(F_PF);
+        SET_FLAG(F_ZF);
+    }
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SHR instruction and side effects.
 ****************************************************************************/
-u16 shr_word(u16 d, u8 s)
+u16
+shr_word(u16 d, u8 s)
 {
-	unsigned int cnt, res, cf;
+    unsigned int cnt, res, cf;
 
-	if (s < 16) {
-		cnt = s % 16;
-		if (cnt > 0) {
-			cf = d & (1 << (cnt - 1));
-			res = d >> cnt;
-			CONDITIONAL_SET_FLAG(cf, F_CF);
-			CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-			CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-			CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-		} else {
-			res = d;
-		}
+    if (s < 16) {
+        cnt = s % 16;
+        if (cnt > 0) {
+            cf = d & (1 << (cnt - 1));
+            res = d >> cnt;
+            CONDITIONAL_SET_FLAG(cf, F_CF);
+            CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+            CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+            CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+        }
+        else {
+            res = d;
+        }
 
-		if (cnt == 1) {
-			CONDITIONAL_SET_FLAG(XOR2(res >> 14), F_OF);
-        } else {
-			CLEAR_FLAG(F_OF);
+        if (cnt == 1) {
+            CONDITIONAL_SET_FLAG(XOR2(res >> 14), F_OF);
         }
-	} else {
-		res = 0;
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_OF);
-		SET_FLAG(F_ZF);
-		CLEAR_FLAG(F_SF);
-		CLEAR_FLAG(F_PF);
+        else {
+            CLEAR_FLAG(F_OF);
+        }
+    }
+    else {
+        res = 0;
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_OF);
+        SET_FLAG(F_ZF);
+        CLEAR_FLAG(F_SF);
+        CLEAR_FLAG(F_PF);
     }
-	return (u16)res;
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SHR instruction and side effects.
 ****************************************************************************/
-u32 shr_long(u32 d, u8 s)
+u32
+shr_long(u32 d, u8 s)
 {
-	unsigned int cnt, res, cf;
+    unsigned int cnt, res, cf;
 
-	if (s < 32) {
-		cnt = s % 32;
-		if (cnt > 0) {
-			cf = d & (1 << (cnt - 1));
-			res = d >> cnt;
-			CONDITIONAL_SET_FLAG(cf, F_CF);
-			CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-			CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-			CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-        } else {
+    if (s < 32) {
+        cnt = s % 32;
+        if (cnt > 0) {
+            cf = d & (1 << (cnt - 1));
+            res = d >> cnt;
+            CONDITIONAL_SET_FLAG(cf, F_CF);
+            CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+            CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+            CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+        }
+        else {
             res = d;
         }
         if (cnt == 1) {
-			CONDITIONAL_SET_FLAG(XOR2(res >> 30), F_OF);
-        } else {
-			CLEAR_FLAG(F_OF);
+            CONDITIONAL_SET_FLAG(XOR2(res >> 30), F_OF);
+        }
+        else {
+            CLEAR_FLAG(F_OF);
         }
-    } else {
+    }
+    else {
         res = 0;
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_OF);
-		SET_FLAG(F_ZF);
-		CLEAR_FLAG(F_SF);
-		CLEAR_FLAG(F_PF);
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_OF);
+        SET_FLAG(F_ZF);
+        CLEAR_FLAG(F_SF);
+        CLEAR_FLAG(F_PF);
     }
     return res;
 }
@@ -1530,592 +1600,634 @@ u32 shr_long(u32 d, u8 s)
 REMARKS:
 Implements the SAR instruction and side effects.
 ****************************************************************************/
-u8 sar_byte(u8 d, u8 s)
+u8
+sar_byte(u8 d, u8 s)
 {
-	unsigned int cnt, res, cf, mask, sf;
+    unsigned int cnt, res, cf, mask, sf;
 
-	res = d;
-	sf = d & 0x80;
+    res = d;
+    sf = d & 0x80;
     cnt = s % 8;
-	if (cnt > 0 && cnt < 8) {
-		mask = (1 << (8 - cnt)) - 1;
-		cf = d & (1 << (cnt - 1));
-		res = (d >> cnt) & mask;
-		CONDITIONAL_SET_FLAG(cf, F_CF);
-		if (sf) {
-			res |= ~mask;
-		}
-		CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
-		CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-		CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-    } else if (cnt >= 8) {
+    if (cnt > 0 && cnt < 8) {
+        mask = (1 << (8 - cnt)) - 1;
+        cf = d & (1 << (cnt - 1));
+        res = (d >> cnt) & mask;
+        CONDITIONAL_SET_FLAG(cf, F_CF);
+        if (sf) {
+            res |= ~mask;
+        }
+        CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
+        CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+        CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    }
+    else if (cnt >= 8) {
         if (sf) {
             res = 0xff;
-			SET_FLAG(F_CF);
-			CLEAR_FLAG(F_ZF);
-			SET_FLAG(F_SF);
-			SET_FLAG(F_PF);
-		} else {
-			res = 0;
-			CLEAR_FLAG(F_CF);
-			SET_FLAG(F_ZF);
-			CLEAR_FLAG(F_SF);
-			CLEAR_FLAG(F_PF);
-		}
-	}
-	return (u8)res;
+            SET_FLAG(F_CF);
+            CLEAR_FLAG(F_ZF);
+            SET_FLAG(F_SF);
+            SET_FLAG(F_PF);
+        }
+        else {
+            res = 0;
+            CLEAR_FLAG(F_CF);
+            SET_FLAG(F_ZF);
+            CLEAR_FLAG(F_SF);
+            CLEAR_FLAG(F_PF);
+        }
+    }
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SAR instruction and side effects.
 ****************************************************************************/
-u16 sar_word(u16 d, u8 s)
+u16
+sar_word(u16 d, u8 s)
 {
     unsigned int cnt, res, cf, mask, sf;
 
     sf = d & 0x8000;
     cnt = s % 16;
-	res = d;
-	if (cnt > 0 && cnt < 16) {
+    res = d;
+    if (cnt > 0 && cnt < 16) {
         mask = (1 << (16 - cnt)) - 1;
         cf = d & (1 << (cnt - 1));
         res = (d >> cnt) & mask;
-		CONDITIONAL_SET_FLAG(cf, F_CF);
+        CONDITIONAL_SET_FLAG(cf, F_CF);
         if (sf) {
             res |= ~mask;
         }
-		CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-		CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-		CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-    } else if (cnt >= 16) {
+        CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+        CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+        CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    }
+    else if (cnt >= 16) {
         if (sf) {
             res = 0xffff;
-			SET_FLAG(F_CF);
-			CLEAR_FLAG(F_ZF);
-			SET_FLAG(F_SF);
-			SET_FLAG(F_PF);
-        } else {
+            SET_FLAG(F_CF);
+            CLEAR_FLAG(F_ZF);
+            SET_FLAG(F_SF);
+            SET_FLAG(F_PF);
+        }
+        else {
             res = 0;
-			CLEAR_FLAG(F_CF);
-			SET_FLAG(F_ZF);
-			CLEAR_FLAG(F_SF);
-			CLEAR_FLAG(F_PF);
+            CLEAR_FLAG(F_CF);
+            SET_FLAG(F_ZF);
+            CLEAR_FLAG(F_SF);
+            CLEAR_FLAG(F_PF);
         }
     }
-	return (u16)res;
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SAR instruction and side effects.
 ****************************************************************************/
-u32 sar_long(u32 d, u8 s)
+u32
+sar_long(u32 d, u8 s)
 {
     u32 cnt, res, cf, mask, sf;
 
     sf = d & 0x80000000;
     cnt = s % 32;
-	res = d;
-	if (cnt > 0 && cnt < 32) {
+    res = d;
+    if (cnt > 0 && cnt < 32) {
         mask = (1 << (32 - cnt)) - 1;
-		cf = d & (1 << (cnt - 1));
+        cf = d & (1 << (cnt - 1));
         res = (d >> cnt) & mask;
-		CONDITIONAL_SET_FLAG(cf, F_CF);
+        CONDITIONAL_SET_FLAG(cf, F_CF);
         if (sf) {
             res |= ~mask;
         }
-		CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-		CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-		CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-    } else if (cnt >= 32) {
+        CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+        CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+        CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    }
+    else if (cnt >= 32) {
         if (sf) {
             res = 0xffffffff;
-			SET_FLAG(F_CF);
-			CLEAR_FLAG(F_ZF);
-			SET_FLAG(F_SF);
-			SET_FLAG(F_PF);
-		} else {
-			res = 0;
-			CLEAR_FLAG(F_CF);
-			SET_FLAG(F_ZF);
-			CLEAR_FLAG(F_SF);
-			CLEAR_FLAG(F_PF);
-		}
-	}
-	return res;
+            SET_FLAG(F_CF);
+            CLEAR_FLAG(F_ZF);
+            SET_FLAG(F_SF);
+            SET_FLAG(F_PF);
+        }
+        else {
+            res = 0;
+            CLEAR_FLAG(F_CF);
+            SET_FLAG(F_ZF);
+            CLEAR_FLAG(F_SF);
+            CLEAR_FLAG(F_PF);
+        }
+    }
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SHLD instruction and side effects.
 ****************************************************************************/
-u16 shld_word (u16 d, u16 fill, u8 s)
-{
-	unsigned int cnt, res, cf;
-
-	if (s < 16) {
-		cnt = s % 16;
-		if (cnt > 0) {
-			res = (d << cnt) | (fill >> (16-cnt));
-			cf = d & (1 << (16 - cnt));
-			CONDITIONAL_SET_FLAG(cf, F_CF);
-			CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-			CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-			CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-		} else {
-			res = d;
-		}
-		if (cnt == 1) {
-			CONDITIONAL_SET_FLAG((((res & 0x8000) == 0x8000) ^
-								  (ACCESS_FLAG(F_CF) != 0)), F_OF);
-		} else {
-			CLEAR_FLAG(F_OF);
-		}
-	} else {
-		res = 0;
-		CONDITIONAL_SET_FLAG((d << (s-1)) & 0x8000, F_CF);
-		CLEAR_FLAG(F_OF);
-		CLEAR_FLAG(F_SF);
-		SET_FLAG(F_PF);
-		SET_FLAG(F_ZF);
-	}
-	return (u16)res;
+u16
+shld_word(u16 d, u16 fill, u8 s)
+{
+    unsigned int cnt, res, cf;
+
+    if (s < 16) {
+        cnt = s % 16;
+        if (cnt > 0) {
+            res = (d << cnt) | (fill >> (16 - cnt));
+            cf = d & (1 << (16 - cnt));
+            CONDITIONAL_SET_FLAG(cf, F_CF);
+            CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+            CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+            CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+        }
+        else {
+            res = d;
+        }
+        if (cnt == 1) {
+            CONDITIONAL_SET_FLAG((((res & 0x8000) == 0x8000) ^
+                                  (ACCESS_FLAG(F_CF) != 0)), F_OF);
+        }
+        else {
+            CLEAR_FLAG(F_OF);
+        }
+    }
+    else {
+        res = 0;
+        CONDITIONAL_SET_FLAG((d << (s - 1)) & 0x8000, F_CF);
+        CLEAR_FLAG(F_OF);
+        CLEAR_FLAG(F_SF);
+        SET_FLAG(F_PF);
+        SET_FLAG(F_ZF);
+    }
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SHLD instruction and side effects.
 ****************************************************************************/
-u32 shld_long (u32 d, u32 fill, u8 s)
-{
-	unsigned int cnt, res, cf;
-
-	if (s < 32) {
-		cnt = s % 32;
-		if (cnt > 0) {
-			res = (d << cnt) | (fill >> (32-cnt));
-			cf = d & (1 << (32 - cnt));
-			CONDITIONAL_SET_FLAG(cf, F_CF);
-			CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-			CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-			CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-		} else {
-			res = d;
-		}
-		if (cnt == 1) {
-			CONDITIONAL_SET_FLAG((((res & 0x80000000) == 0x80000000) ^
-								  (ACCESS_FLAG(F_CF) != 0)), F_OF);
-		} else {
-			CLEAR_FLAG(F_OF);
-		}
-	} else {
-		res = 0;
-		CONDITIONAL_SET_FLAG((d << (s-1)) & 0x80000000, F_CF);
-		CLEAR_FLAG(F_OF);
-		CLEAR_FLAG(F_SF);
-		SET_FLAG(F_PF);
-		SET_FLAG(F_ZF);
-	}
-	return res;
+u32
+shld_long(u32 d, u32 fill, u8 s)
+{
+    unsigned int cnt, res, cf;
+
+    if (s < 32) {
+        cnt = s % 32;
+        if (cnt > 0) {
+            res = (d << cnt) | (fill >> (32 - cnt));
+            cf = d & (1 << (32 - cnt));
+            CONDITIONAL_SET_FLAG(cf, F_CF);
+            CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+            CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+            CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+        }
+        else {
+            res = d;
+        }
+        if (cnt == 1) {
+            CONDITIONAL_SET_FLAG((((res & 0x80000000) == 0x80000000) ^
+                                  (ACCESS_FLAG(F_CF) != 0)), F_OF);
+        }
+        else {
+            CLEAR_FLAG(F_OF);
+        }
+    }
+    else {
+        res = 0;
+        CONDITIONAL_SET_FLAG((d << (s - 1)) & 0x80000000, F_CF);
+        CLEAR_FLAG(F_OF);
+        CLEAR_FLAG(F_SF);
+        SET_FLAG(F_PF);
+        SET_FLAG(F_ZF);
+    }
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SHRD instruction and side effects.
 ****************************************************************************/
-u16 shrd_word (u16 d, u16 fill, u8 s)
+u16
+shrd_word(u16 d, u16 fill, u8 s)
 {
-	unsigned int cnt, res, cf;
+    unsigned int cnt, res, cf;
 
-	if (s < 16) {
-		cnt = s % 16;
-		if (cnt > 0) {
-			cf = d & (1 << (cnt - 1));
-			res = (d >> cnt) | (fill << (16 - cnt));
-			CONDITIONAL_SET_FLAG(cf, F_CF);
-			CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-			CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-			CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-		} else {
-			res = d;
-		}
+    if (s < 16) {
+        cnt = s % 16;
+        if (cnt > 0) {
+            cf = d & (1 << (cnt - 1));
+            res = (d >> cnt) | (fill << (16 - cnt));
+            CONDITIONAL_SET_FLAG(cf, F_CF);
+            CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+            CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+            CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+        }
+        else {
+            res = d;
+        }
 
-		if (cnt == 1) {
-			CONDITIONAL_SET_FLAG(XOR2(res >> 14), F_OF);
-        } else {
-			CLEAR_FLAG(F_OF);
+        if (cnt == 1) {
+            CONDITIONAL_SET_FLAG(XOR2(res >> 14), F_OF);
+        }
+        else {
+            CLEAR_FLAG(F_OF);
         }
-	} else {
-		res = 0;
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_OF);
-		SET_FLAG(F_ZF);
-		CLEAR_FLAG(F_SF);
-		CLEAR_FLAG(F_PF);
     }
-	return (u16)res;
+    else {
+        res = 0;
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_OF);
+        SET_FLAG(F_ZF);
+        CLEAR_FLAG(F_SF);
+        CLEAR_FLAG(F_PF);
+    }
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SHRD instruction and side effects.
 ****************************************************************************/
-u32 shrd_long (u32 d, u32 fill, u8 s)
+u32
+shrd_long(u32 d, u32 fill, u8 s)
 {
-	unsigned int cnt, res, cf;
+    unsigned int cnt, res, cf;
 
-	if (s < 32) {
-		cnt = s % 32;
-		if (cnt > 0) {
-			cf = d & (1 << (cnt - 1));
-			res = (d >> cnt) | (fill << (32 - cnt));
-			CONDITIONAL_SET_FLAG(cf, F_CF);
-			CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-			CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-			CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-		} else {
-			res = d;
-		}
-		if (cnt == 1) {
-			CONDITIONAL_SET_FLAG(XOR2(res >> 30), F_OF);
-        } else {
-			CLEAR_FLAG(F_OF);
+    if (s < 32) {
+        cnt = s % 32;
+        if (cnt > 0) {
+            cf = d & (1 << (cnt - 1));
+            res = (d >> cnt) | (fill << (32 - cnt));
+            CONDITIONAL_SET_FLAG(cf, F_CF);
+            CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+            CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+            CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
         }
-	} else {
-		res = 0;
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_OF);
-		SET_FLAG(F_ZF);
-		CLEAR_FLAG(F_SF);
-		CLEAR_FLAG(F_PF);
+        else {
+            res = d;
+        }
+        if (cnt == 1) {
+            CONDITIONAL_SET_FLAG(XOR2(res >> 30), F_OF);
+        }
+        else {
+            CLEAR_FLAG(F_OF);
+        }
+    }
+    else {
+        res = 0;
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_OF);
+        SET_FLAG(F_ZF);
+        CLEAR_FLAG(F_SF);
+        CLEAR_FLAG(F_PF);
     }
-	return res;
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SBB instruction and side effects.
 ****************************************************************************/
-u8 sbb_byte(u8 d, u8 s)
+u8
+sbb_byte(u8 d, u8 s)
 {
-    register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
     register u32 bc;
 
-	if (ACCESS_FLAG(F_CF))
-		res = d - s - 1;
-	else
-		res = d - s;
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    if (ACCESS_FLAG(F_CF))
+        res = d - s - 1;
+    else
+        res = d - s;
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the borrow chain.  See note at top */
-	bc = (res & (~d | s)) | (~d & s);
-	CONDITIONAL_SET_FLAG(bc & 0x80, F_CF);
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return (u8)res;
+    /* calculate the borrow chain.  See note at top */
+    bc = (res & (~d | s)) | (~d & s);
+    CONDITIONAL_SET_FLAG(bc & 0x80, F_CF);
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SBB instruction and side effects.
 ****************************************************************************/
-u16 sbb_word(u16 d, u16 s)
+u16
+sbb_word(u16 d, u16 s)
 {
-    register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
     register u32 bc;
 
-	if (ACCESS_FLAG(F_CF))
+    if (ACCESS_FLAG(F_CF))
         res = d - s - 1;
     else
         res = d - s;
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the borrow chain.  See note at top */
-	bc = (res & (~d | s)) | (~d & s);
-	CONDITIONAL_SET_FLAG(bc & 0x8000, F_CF);
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return (u16)res;
+    /* calculate the borrow chain.  See note at top */
+    bc = (res & (~d | s)) | (~d & s);
+    CONDITIONAL_SET_FLAG(bc & 0x8000, F_CF);
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SBB instruction and side effects.
 ****************************************************************************/
-u32 sbb_long(u32 d, u32 s)
+u32
+sbb_long(u32 d, u32 s)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 bc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 bc;
 
-	if (ACCESS_FLAG(F_CF))
+    if (ACCESS_FLAG(F_CF))
         res = d - s - 1;
     else
         res = d - s;
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the borrow chain.  See note at top */
-	bc = (res & (~d | s)) | (~d & s);
-	CONDITIONAL_SET_FLAG(bc & 0x80000000, F_CF);
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return res;
+    /* calculate the borrow chain.  See note at top */
+    bc = (res & (~d | s)) | (~d & s);
+    CONDITIONAL_SET_FLAG(bc & 0x80000000, F_CF);
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SUB instruction and side effects.
 ****************************************************************************/
-u8 sub_byte(u8 d, u8 s)
+u8
+sub_byte(u8 d, u8 s)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 bc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 bc;
 
-	res = d - s;
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    res = d - s;
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the borrow chain.  See note at top */
-	bc = (res & (~d | s)) | (~d & s);
-	CONDITIONAL_SET_FLAG(bc & 0x80, F_CF);
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return (u8)res;
+    /* calculate the borrow chain.  See note at top */
+    bc = (res & (~d | s)) | (~d & s);
+    CONDITIONAL_SET_FLAG(bc & 0x80, F_CF);
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return (u8) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SUB instruction and side effects.
 ****************************************************************************/
-u16 sub_word(u16 d, u16 s)
+u16
+sub_word(u16 d, u16 s)
 {
-    register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
     register u32 bc;
 
     res = d - s;
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the borrow chain.  See note at top */
-	bc = (res & (~d | s)) | (~d & s);
-	CONDITIONAL_SET_FLAG(bc & 0x8000, F_CF);
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return (u16)res;
+    /* calculate the borrow chain.  See note at top */
+    bc = (res & (~d | s)) | (~d & s);
+    CONDITIONAL_SET_FLAG(bc & 0x8000, F_CF);
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return (u16) res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SUB instruction and side effects.
 ****************************************************************************/
-u32 sub_long(u32 d, u32 s)
+u32
+sub_long(u32 d, u32 s)
 {
-	register u32 res;   /* all operands in native machine order */
-	register u32 bc;
+    register u32 res;           /* all operands in native machine order */
+    register u32 bc;
 
-	res = d - s;
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    res = d - s;
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
 
-	/* calculate the borrow chain.  See note at top */
-	bc = (res & (~d | s)) | (~d & s);
-	CONDITIONAL_SET_FLAG(bc & 0x80000000, F_CF);
-	CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
-	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-	return res;
+    /* calculate the borrow chain.  See note at top */
+    bc = (res & (~d | s)) | (~d & s);
+    CONDITIONAL_SET_FLAG(bc & 0x80000000, F_CF);
+    CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
+    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the TEST instruction and side effects.
 ****************************************************************************/
-void test_byte(u8 d, u8 s)
+void
+test_byte(u8 d, u8 s)
 {
-    register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
 
     res = d & s;
 
-	CLEAR_FLAG(F_OF);
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CLEAR_FLAG(F_OF);
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
     /* AF == dont care */
-	CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_CF);
 }
 
 /****************************************************************************
 REMARKS:
 Implements the TEST instruction and side effects.
 ****************************************************************************/
-void test_word(u16 d, u16 s)
+void
+test_word(u16 d, u16 s)
 {
-	register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
 
-	res = d & s;
+    res = d & s;
 
-	CLEAR_FLAG(F_OF);
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-	/* AF == dont care */
-	CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_OF);
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    /* AF == dont care */
+    CLEAR_FLAG(F_CF);
 }
 
 /****************************************************************************
 REMARKS:
 Implements the TEST instruction and side effects.
 ****************************************************************************/
-void test_long(u32 d, u32 s)
+void
+test_long(u32 d, u32 s)
 {
-	register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
 
-	res = d & s;
+    res = d & s;
 
-	CLEAR_FLAG(F_OF);
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-	/* AF == dont care */
-	CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_OF);
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    /* AF == dont care */
+    CLEAR_FLAG(F_CF);
 }
 
 /****************************************************************************
 REMARKS:
 Implements the XOR instruction and side effects.
 ****************************************************************************/
-u8 xor_byte(u8 d, u8 s)
+u8
+xor_byte(u8 d, u8 s)
 {
-	register u8 res;    /* all operands in native machine order */
+    register u8 res;            /* all operands in native machine order */
 
-	res = d ^ s;
-	CLEAR_FLAG(F_OF);
-	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res), F_PF);
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	return res;
+    res = d ^ s;
+    CLEAR_FLAG(F_OF);
+    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res), F_PF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the XOR instruction and side effects.
 ****************************************************************************/
-u16 xor_word(u16 d, u16 s)
+u16
+xor_word(u16 d, u16 s)
 {
-	register u16 res;   /* all operands in native machine order */
+    register u16 res;           /* all operands in native machine order */
 
-	res = d ^ s;
-	CLEAR_FLAG(F_OF);
-	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	return res;
+    res = d ^ s;
+    CLEAR_FLAG(F_OF);
+    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the XOR instruction and side effects.
 ****************************************************************************/
-u32 xor_long(u32 d, u32 s)
+u32
+xor_long(u32 d, u32 s)
 {
-	register u32 res;   /* all operands in native machine order */
+    register u32 res;           /* all operands in native machine order */
 
-	res = d ^ s;
-	CLEAR_FLAG(F_OF);
-	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	return res;
+    res = d ^ s;
+    CLEAR_FLAG(F_OF);
+    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the IMUL instruction and side effects.
 ****************************************************************************/
-void imul_byte(u8 s)
+void
+imul_byte(u8 s)
 {
-	s16 res = (s16)((s8)M.x86.R_AL * (s8)s);
+    s16 res = (s16) ((s8) M.x86.R_AL * (s8) s);
 
-	M.x86.R_AX = res;
-	if (((M.x86.R_AL & 0x80) == 0 && M.x86.R_AH == 0x00) ||
-		((M.x86.R_AL & 0x80) != 0 && M.x86.R_AH == 0xFF)) {
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_OF);
-	} else {
-		SET_FLAG(F_CF);
-		SET_FLAG(F_OF);
-	}
+    M.x86.R_AX = res;
+    if (((M.x86.R_AL & 0x80) == 0 && M.x86.R_AH == 0x00) ||
+        ((M.x86.R_AL & 0x80) != 0 && M.x86.R_AH == 0xFF)) {
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_OF);
+    }
+    else {
+        SET_FLAG(F_CF);
+        SET_FLAG(F_OF);
+    }
 }
 
 /****************************************************************************
 REMARKS:
 Implements the IMUL instruction and side effects.
 ****************************************************************************/
-void imul_word(u16 s)
+void
+imul_word(u16 s)
 {
-	s32 res = (s16)M.x86.R_AX * (s16)s;
+    s32 res = (s16) M.x86.R_AX * (s16) s;
 
-	M.x86.R_AX = (u16)res;
-	M.x86.R_DX = (u16)(res >> 16);
-	if (((M.x86.R_AX & 0x8000) == 0 && M.x86.R_DX == 0x00) ||
-		((M.x86.R_AX & 0x8000) != 0 && M.x86.R_DX == 0xFF)) {
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_OF);
-	} else {
-		SET_FLAG(F_CF);
-		SET_FLAG(F_OF);
-	}
+    M.x86.R_AX = (u16) res;
+    M.x86.R_DX = (u16) (res >> 16);
+    if (((M.x86.R_AX & 0x8000) == 0 && M.x86.R_DX == 0x00) ||
+        ((M.x86.R_AX & 0x8000) != 0 && M.x86.R_DX == 0xFF)) {
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_OF);
+    }
+    else {
+        SET_FLAG(F_CF);
+        SET_FLAG(F_OF);
+    }
 }
 
 /****************************************************************************
 REMARKS:
 Implements the IMUL instruction and side effects.
 ****************************************************************************/
-void imul_long_direct(u32 *res_lo, u32* res_hi,u32 d, u32 s)
+void
+imul_long_direct(u32 * res_lo, u32 * res_hi, u32 d, u32 s)
 {
 #ifdef	__HAS_LONG_LONG__
-	s64 res = (s64)(s32)d * (s32)s;
+    s64 res = (s64) (s32) d * (s32) s;
 
-	*res_lo = (u32)res;
-	*res_hi = (u32)(res >> 32);
+    *res_lo = (u32) res;
+    *res_hi = (u32) (res >> 32);
 #else
-	u32	d_lo,d_hi,d_sign;
-	u32	s_lo,s_hi,s_sign;
-	u32	rlo_lo,rlo_hi,rhi_lo;
-
-	if ((d_sign = d & 0x80000000) != 0)
-		d = -d;
-	d_lo = d & 0xFFFF;
-	d_hi = d >> 16;
-	if ((s_sign = s & 0x80000000) != 0)
-		s = -s;
-	s_lo = s & 0xFFFF;
-	s_hi = s >> 16;
-	rlo_lo = d_lo * s_lo;
-	rlo_hi = (d_hi * s_lo + d_lo * s_hi) + (rlo_lo >> 16);
-	rhi_lo = d_hi * s_hi + (rlo_hi >> 16);
-	*res_lo = (rlo_hi << 16) | (rlo_lo & 0xFFFF);
-	*res_hi = rhi_lo;
-	if (d_sign != s_sign) {
-		d = ~*res_lo;
-		s = (((d & 0xFFFF) + 1) >> 16) + (d >> 16);
-		*res_lo = ~*res_lo+1;
-		*res_hi = ~*res_hi+(s >> 16);
-		}
+    u32 d_lo, d_hi, d_sign;
+    u32 s_lo, s_hi, s_sign;
+    u32 rlo_lo, rlo_hi, rhi_lo;
+
+    if ((d_sign = d & 0x80000000) != 0)
+        d = -d;
+    d_lo = d & 0xFFFF;
+    d_hi = d >> 16;
+    if ((s_sign = s & 0x80000000) != 0)
+        s = -s;
+    s_lo = s & 0xFFFF;
+    s_hi = s >> 16;
+    rlo_lo = d_lo * s_lo;
+    rlo_hi = (d_hi * s_lo + d_lo * s_hi) + (rlo_lo >> 16);
+    rhi_lo = d_hi * s_hi + (rlo_hi >> 16);
+    *res_lo = (rlo_hi << 16) | (rlo_lo & 0xFFFF);
+    *res_hi = rhi_lo;
+    if (d_sign != s_sign) {
+        d = ~*res_lo;
+        s = (((d & 0xFFFF) + 1) >> 16) + (d >> 16);
+        *res_lo = ~*res_lo + 1;
+        *res_hi = ~*res_hi + (s >> 16);
+    }
 #endif
 }
 
@@ -2123,53 +2235,59 @@ void imul_long_direct(u32 *res_lo, u32* res_hi,u32 d, u32 s)
 REMARKS:
 Implements the IMUL instruction and side effects.
 ****************************************************************************/
-void imul_long(u32 s)
+void
+imul_long(u32 s)
 {
-	imul_long_direct(&M.x86.R_EAX,&M.x86.R_EDX,M.x86.R_EAX,s);
-	if (((M.x86.R_EAX & 0x80000000) == 0 && M.x86.R_EDX == 0x00) ||
-		((M.x86.R_EAX & 0x80000000) != 0 && M.x86.R_EDX == 0xFF)) {
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_OF);
-	} else {
-		SET_FLAG(F_CF);
-		SET_FLAG(F_OF);
-	}
+    imul_long_direct(&M.x86.R_EAX, &M.x86.R_EDX, M.x86.R_EAX, s);
+    if (((M.x86.R_EAX & 0x80000000) == 0 && M.x86.R_EDX == 0x00) ||
+        ((M.x86.R_EAX & 0x80000000) != 0 && M.x86.R_EDX == 0xFF)) {
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_OF);
+    }
+    else {
+        SET_FLAG(F_CF);
+        SET_FLAG(F_OF);
+    }
 }
 
 /****************************************************************************
 REMARKS:
 Implements the MUL instruction and side effects.
 ****************************************************************************/
-void mul_byte(u8 s)
+void
+mul_byte(u8 s)
 {
-	u16 res = (u16)(M.x86.R_AL * s);
+    u16 res = (u16) (M.x86.R_AL * s);
 
-	M.x86.R_AX = res;
-	if (M.x86.R_AH == 0) {
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_OF);
-	} else {
-		SET_FLAG(F_CF);
-		SET_FLAG(F_OF);
-	}
+    M.x86.R_AX = res;
+    if (M.x86.R_AH == 0) {
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_OF);
+    }
+    else {
+        SET_FLAG(F_CF);
+        SET_FLAG(F_OF);
+    }
 }
 
 /****************************************************************************
 REMARKS:
 Implements the MUL instruction and side effects.
 ****************************************************************************/
-void mul_word(u16 s)
+void
+mul_word(u16 s)
 {
-	u32 res = M.x86.R_AX * s;
+    u32 res = M.x86.R_AX * s;
 
-	M.x86.R_AX = (u16)res;
-	M.x86.R_DX = (u16)(res >> 16);
-	if (M.x86.R_DX == 0) {
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_OF);
-    } else {
-		SET_FLAG(F_CF);
-		SET_FLAG(F_OF);
+    M.x86.R_AX = (u16) res;
+    M.x86.R_DX = (u16) (res >> 16);
+    if (M.x86.R_DX == 0) {
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_OF);
+    }
+    else {
+        SET_FLAG(F_CF);
+        SET_FLAG(F_OF);
     }
 }
 
@@ -2177,36 +2295,38 @@ void mul_word(u16 s)
 REMARKS:
 Implements the MUL instruction and side effects.
 ****************************************************************************/
-void mul_long(u32 s)
+void
+mul_long(u32 s)
 {
 #ifdef	__HAS_LONG_LONG__
-	u64 res = (u64)M.x86.R_EAX * s;
+    u64 res = (u64) M.x86.R_EAX * s;
 
-	M.x86.R_EAX = (u32)res;
-	M.x86.R_EDX = (u32)(res >> 32);
+    M.x86.R_EAX = (u32) res;
+    M.x86.R_EDX = (u32) (res >> 32);
 #else
-	u32	a,a_lo,a_hi;
-	u32	s_lo,s_hi;
-	u32	rlo_lo,rlo_hi,rhi_lo;
-
-	a = M.x86.R_EAX;
-	a_lo = a & 0xFFFF;
-	a_hi = a >> 16;
-	s_lo = s & 0xFFFF;
-	s_hi = s >> 16;
-	rlo_lo = a_lo * s_lo;
-	rlo_hi = (a_hi * s_lo + a_lo * s_hi) + (rlo_lo >> 16);
-	rhi_lo = a_hi * s_hi + (rlo_hi >> 16);
-	M.x86.R_EAX = (rlo_hi << 16) | (rlo_lo & 0xFFFF);
-	M.x86.R_EDX = rhi_lo;
+    u32 a, a_lo, a_hi;
+    u32 s_lo, s_hi;
+    u32 rlo_lo, rlo_hi, rhi_lo;
+
+    a = M.x86.R_EAX;
+    a_lo = a & 0xFFFF;
+    a_hi = a >> 16;
+    s_lo = s & 0xFFFF;
+    s_hi = s >> 16;
+    rlo_lo = a_lo * s_lo;
+    rlo_hi = (a_hi * s_lo + a_lo * s_hi) + (rlo_lo >> 16);
+    rhi_lo = a_hi * s_hi + (rlo_hi >> 16);
+    M.x86.R_EAX = (rlo_hi << 16) | (rlo_lo & 0xFFFF);
+    M.x86.R_EDX = rhi_lo;
 #endif
 
-	if (M.x86.R_EDX == 0) {
-		CLEAR_FLAG(F_CF);
-		CLEAR_FLAG(F_OF);
-	} else {
-		SET_FLAG(F_CF);
-		SET_FLAG(F_OF);
+    if (M.x86.R_EDX == 0) {
+        CLEAR_FLAG(F_CF);
+        CLEAR_FLAG(F_OF);
+    }
+    else {
+        SET_FLAG(F_CF);
+        SET_FLAG(F_OF);
     }
 }
 
@@ -2214,309 +2334,319 @@ void mul_long(u32 s)
 REMARKS:
 Implements the IDIV instruction and side effects.
 ****************************************************************************/
-void idiv_byte(u8 s)
+void
+idiv_byte(u8 s)
 {
     s32 dvd, div, mod;
 
-	dvd = (s16)M.x86.R_AX;
-	if (s == 0) {
-		x86emu_intr_raise(0);
+    dvd = (s16) M.x86.R_AX;
+    if (s == 0) {
+        x86emu_intr_raise(0);
+        return;
+    }
+    div = dvd / (s8) s;
+    mod = dvd % (s8) s;
+    if (abs(div) > 0x7f) {
+        x86emu_intr_raise(0);
         return;
-	}
-	div = dvd / (s8)s;
-	mod = dvd % (s8)s;
-	if (abs(div) > 0x7f) {
-		x86emu_intr_raise(0);
-		return;
-	}
-	M.x86.R_AL = (s8) div;
-	M.x86.R_AH = (s8) mod;
+    }
+    M.x86.R_AL = (s8) div;
+    M.x86.R_AH = (s8) mod;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the IDIV instruction and side effects.
 ****************************************************************************/
-void idiv_word(u16 s)
+void
+idiv_word(u16 s)
 {
-	s32 dvd, div, mod;
+    s32 dvd, div, mod;
 
-	dvd = (((s32)M.x86.R_DX) << 16) | M.x86.R_AX;
-	if (s == 0) {
-		x86emu_intr_raise(0);
-		return;
-	}
-	div = dvd / (s16)s;
-	mod = dvd % (s16)s;
-	if (abs(div) > 0x7fff) {
-		x86emu_intr_raise(0);
-		return;
-	}
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_SF);
-	CONDITIONAL_SET_FLAG(div == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(mod & 0xff), F_PF);
+    dvd = (((s32) M.x86.R_DX) << 16) | M.x86.R_AX;
+    if (s == 0) {
+        x86emu_intr_raise(0);
+        return;
+    }
+    div = dvd / (s16) s;
+    mod = dvd % (s16) s;
+    if (abs(div) > 0x7fff) {
+        x86emu_intr_raise(0);
+        return;
+    }
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_SF);
+    CONDITIONAL_SET_FLAG(div == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(mod & 0xff), F_PF);
 
-	M.x86.R_AX = (u16)div;
-	M.x86.R_DX = (u16)mod;
+    M.x86.R_AX = (u16) div;
+    M.x86.R_DX = (u16) mod;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the IDIV instruction and side effects.
 ****************************************************************************/
-void idiv_long(u32 s)
+void
+idiv_long(u32 s)
 {
 #ifdef	__HAS_LONG_LONG__
-	s64 dvd, div, mod;
-
-	dvd = (((s64)M.x86.R_EDX) << 32) | M.x86.R_EAX;
-	if (s == 0) {
-		x86emu_intr_raise(0);
-		return;
-	}
-	div = dvd / (s32)s;
-	mod = dvd % (s32)s;
-	if (abs(div) > 0x7fffffff) {
-		x86emu_intr_raise(0);
-		return;
-	}
+    s64 dvd, div, mod;
+
+    dvd = (((s64) M.x86.R_EDX) << 32) | M.x86.R_EAX;
+    if (s == 0) {
+        x86emu_intr_raise(0);
+        return;
+    }
+    div = dvd / (s32) s;
+    mod = dvd % (s32) s;
+    if (abs(div) > 0x7fffffff) {
+        x86emu_intr_raise(0);
+        return;
+    }
 #else
-	s32 div = 0, mod;
-	s32 h_dvd = M.x86.R_EDX;
-	u32 l_dvd = M.x86.R_EAX;
-	u32 abs_s = s & 0x7FFFFFFF;
-	u32 abs_h_dvd = h_dvd & 0x7FFFFFFF;
-	u32 h_s = abs_s >> 1;
-	u32 l_s = abs_s << 31;
-	int counter = 31;
-	int carry;
-
-	if (s == 0) {
-		x86emu_intr_raise(0);
-		return;
-	}
-	do {
-		div <<= 1;
-		carry = (l_dvd >= l_s) ? 0 : 1;
-		
-		if (abs_h_dvd < (h_s + carry)) {
-			h_s >>= 1;
-			l_s = abs_s << (--counter);
-			continue;
-		} else {
-			abs_h_dvd -= (h_s + carry);
-			l_dvd = carry ? ((0xFFFFFFFF - l_s) + l_dvd + 1)
-				: (l_dvd - l_s);
-			h_s >>= 1;
-			l_s = abs_s << (--counter);
-			div |= 1;
-			continue;
-		}
-		
-	} while (counter > -1);
-	/* overflow */
-	if (abs_h_dvd || (l_dvd > abs_s)) {
-		x86emu_intr_raise(0);
-		return;
-	}
-	/* sign */
-	div |= ((h_dvd & 0x10000000) ^ (s & 0x10000000));
-	mod = l_dvd;
+    s32 div = 0, mod;
+    s32 h_dvd = M.x86.R_EDX;
+    u32 l_dvd = M.x86.R_EAX;
+    u32 abs_s = s & 0x7FFFFFFF;
+    u32 abs_h_dvd = h_dvd & 0x7FFFFFFF;
+    u32 h_s = abs_s >> 1;
+    u32 l_s = abs_s << 31;
+    int counter = 31;
+    int carry;
+
+    if (s == 0) {
+        x86emu_intr_raise(0);
+        return;
+    }
+    do {
+        div <<= 1;
+        carry = (l_dvd >= l_s) ? 0 : 1;
+
+        if (abs_h_dvd < (h_s + carry)) {
+            h_s >>= 1;
+            l_s = abs_s << (--counter);
+            continue;
+        }
+        else {
+            abs_h_dvd -= (h_s + carry);
+            l_dvd = carry ? ((0xFFFFFFFF - l_s) + l_dvd + 1)
+                : (l_dvd - l_s);
+            h_s >>= 1;
+            l_s = abs_s << (--counter);
+            div |= 1;
+            continue;
+        }
+
+    } while (counter > -1);
+    /* overflow */
+    if (abs_h_dvd || (l_dvd > abs_s)) {
+        x86emu_intr_raise(0);
+        return;
+    }
+    /* sign */
+    div |= ((h_dvd & 0x10000000) ^ (s & 0x10000000));
+    mod = l_dvd;
 
 #endif
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	CLEAR_FLAG(F_SF);
-	SET_FLAG(F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(mod & 0xff), F_PF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    CLEAR_FLAG(F_SF);
+    SET_FLAG(F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(mod & 0xff), F_PF);
 
-	M.x86.R_EAX = (u32)div;
-	M.x86.R_EDX = (u32)mod;
+    M.x86.R_EAX = (u32) div;
+    M.x86.R_EDX = (u32) mod;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the DIV instruction and side effects.
 ****************************************************************************/
-void div_byte(u8 s)
+void
+div_byte(u8 s)
 {
-	u32 dvd, div, mod;
+    u32 dvd, div, mod;
 
-	dvd = M.x86.R_AX;
+    dvd = M.x86.R_AX;
     if (s == 0) {
-		x86emu_intr_raise(0);
+        x86emu_intr_raise(0);
         return;
     }
-	div = dvd / (u8)s;
-	mod = dvd % (u8)s;
-	if (abs(div) > 0xff) {
-		x86emu_intr_raise(0);
+    div = dvd / (u8) s;
+    mod = dvd % (u8) s;
+    if (abs(div) > 0xff) {
+        x86emu_intr_raise(0);
         return;
-	}
-	M.x86.R_AL = (u8)div;
-	M.x86.R_AH = (u8)mod;
+    }
+    M.x86.R_AL = (u8) div;
+    M.x86.R_AH = (u8) mod;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the DIV instruction and side effects.
 ****************************************************************************/
-void div_word(u16 s)
+void
+div_word(u16 s)
 {
-	u32 dvd, div, mod;
+    u32 dvd, div, mod;
 
-	dvd = (((u32)M.x86.R_DX) << 16) | M.x86.R_AX;
-	if (s == 0) {
-		x86emu_intr_raise(0);
+    dvd = (((u32) M.x86.R_DX) << 16) | M.x86.R_AX;
+    if (s == 0) {
+        x86emu_intr_raise(0);
         return;
     }
-	div = dvd / (u16)s;
-	mod = dvd % (u16)s;
-	if (abs(div) > 0xffff) {
-		x86emu_intr_raise(0);
-		return;
-	}
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_SF);
-	CONDITIONAL_SET_FLAG(div == 0, F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(mod & 0xff), F_PF);
+    div = dvd / (u16) s;
+    mod = dvd % (u16) s;
+    if (abs(div) > 0xffff) {
+        x86emu_intr_raise(0);
+        return;
+    }
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_SF);
+    CONDITIONAL_SET_FLAG(div == 0, F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(mod & 0xff), F_PF);
 
-	M.x86.R_AX = (u16)div;
-	M.x86.R_DX = (u16)mod;
+    M.x86.R_AX = (u16) div;
+    M.x86.R_DX = (u16) mod;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the DIV instruction and side effects.
 ****************************************************************************/
-void div_long(u32 s)
+void
+div_long(u32 s)
 {
 #ifdef	__HAS_LONG_LONG__
-	u64 dvd, div, mod;
-
-	dvd = (((u64)M.x86.R_EDX) << 32) | M.x86.R_EAX;
-	if (s == 0) {
-		x86emu_intr_raise(0);
-		return;
-	}
-	div = dvd / (u32)s;
-	mod = dvd % (u32)s;
-	if (abs(div) > 0xffffffff) {
-		x86emu_intr_raise(0);
-		return;
-	}
+    u64 dvd, div, mod;
+
+    dvd = (((u64) M.x86.R_EDX) << 32) | M.x86.R_EAX;
+    if (s == 0) {
+        x86emu_intr_raise(0);
+        return;
+    }
+    div = dvd / (u32) s;
+    mod = dvd % (u32) s;
+    if (abs(div) > 0xffffffff) {
+        x86emu_intr_raise(0);
+        return;
+    }
 #else
-	s32 div = 0, mod;
-	s32 h_dvd = M.x86.R_EDX;
-	u32 l_dvd = M.x86.R_EAX;
-
-	u32 h_s = s;
-	u32 l_s = 0;
-	int counter = 32;
-	int carry;
-		
-	if (s == 0) {
-		x86emu_intr_raise(0);
-		return;
-	}
-	do {
-		div <<= 1;
-		carry = (l_dvd >= l_s) ? 0 : 1;
-		
-		if (h_dvd < (h_s + carry)) {
-			h_s >>= 1;
-			l_s = s << (--counter);
-			continue;
-		} else {
-			h_dvd -= (h_s + carry);
-			l_dvd = carry ? ((0xFFFFFFFF - l_s) + l_dvd + 1)
-				: (l_dvd - l_s);
-			h_s >>= 1;
-			l_s = s << (--counter);
-			div |= 1;
-			continue;
-		}
-		
-	} while (counter > -1);
-	/* overflow */
-	if (h_dvd || (l_dvd > s)) {
-		x86emu_intr_raise(0);
-		return;
-	}
-	mod = l_dvd;
+    s32 div = 0, mod;
+    s32 h_dvd = M.x86.R_EDX;
+    u32 l_dvd = M.x86.R_EAX;
+
+    u32 h_s = s;
+    u32 l_s = 0;
+    int counter = 32;
+    int carry;
+
+    if (s == 0) {
+        x86emu_intr_raise(0);
+        return;
+    }
+    do {
+        div <<= 1;
+        carry = (l_dvd >= l_s) ? 0 : 1;
+
+        if (h_dvd < (h_s + carry)) {
+            h_s >>= 1;
+            l_s = s << (--counter);
+            continue;
+        }
+        else {
+            h_dvd -= (h_s + carry);
+            l_dvd = carry ? ((0xFFFFFFFF - l_s) + l_dvd + 1)
+                : (l_dvd - l_s);
+            h_s >>= 1;
+            l_s = s << (--counter);
+            div |= 1;
+            continue;
+        }
+
+    } while (counter > -1);
+    /* overflow */
+    if (h_dvd || (l_dvd > s)) {
+        x86emu_intr_raise(0);
+        return;
+    }
+    mod = l_dvd;
 #endif
-	CLEAR_FLAG(F_CF);
-	CLEAR_FLAG(F_AF);
-	CLEAR_FLAG(F_SF);
-	SET_FLAG(F_ZF);
-	CONDITIONAL_SET_FLAG(PARITY(mod & 0xff), F_PF);
+    CLEAR_FLAG(F_CF);
+    CLEAR_FLAG(F_AF);
+    CLEAR_FLAG(F_SF);
+    SET_FLAG(F_ZF);
+    CONDITIONAL_SET_FLAG(PARITY(mod & 0xff), F_PF);
 
-	M.x86.R_EAX = (u32)div;
-	M.x86.R_EDX = (u32)mod;
+    M.x86.R_EAX = (u32) div;
+    M.x86.R_EDX = (u32) mod;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the IN string instruction and side effects.
 ****************************************************************************/
-void ins(int size)
+void
+ins(int size)
 {
-	int inc = size;
+    int inc = size;
 
-	if (ACCESS_FLAG(F_DF)) {
-		inc = -size;
-	}
-	if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
+    if (ACCESS_FLAG(F_DF)) {
+        inc = -size;
+    }
+    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
         /* dont care whether REPE or REPNE */
         /* in until CX is ZERO. */
-		u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ?
-					 M.x86.R_ECX : M.x86.R_CX);
+        u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ?
+                     M.x86.R_ECX : M.x86.R_CX);
         switch (size) {
-          case 1:
+        case 1:
             while (count--) {
-				store_data_byte_abs(M.x86.R_ES, M.x86.R_DI,
-									(*sys_inb)(M.x86.R_DX));
-				M.x86.R_DI += inc;
+                store_data_byte_abs(M.x86.R_ES, M.x86.R_DI,
+                                    (*sys_inb) (M.x86.R_DX));
+                M.x86.R_DI += inc;
             }
             break;
 
-          case 2:
+        case 2:
             while (count--) {
-				store_data_word_abs(M.x86.R_ES, M.x86.R_DI,
-									(*sys_inw)(M.x86.R_DX));
-				M.x86.R_DI += inc;
+                store_data_word_abs(M.x86.R_ES, M.x86.R_DI,
+                                    (*sys_inw) (M.x86.R_DX));
+                M.x86.R_DI += inc;
             }
             break;
-          case 4:
+        case 4:
             while (count--) {
-				store_data_long_abs(M.x86.R_ES, M.x86.R_DI,
-									(*sys_inl)(M.x86.R_DX));
-				M.x86.R_DI += inc;
+                store_data_long_abs(M.x86.R_ES, M.x86.R_DI,
+                                    (*sys_inl) (M.x86.R_DX));
+                M.x86.R_DI += inc;
                 break;
             }
         }
-		M.x86.R_CX = 0;
-		if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-			M.x86.R_ECX = 0;
+        M.x86.R_CX = 0;
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            M.x86.R_ECX = 0;
         }
-		M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
-    } else {
+        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+    }
+    else {
         switch (size) {
-          case 1:
-			store_data_byte_abs(M.x86.R_ES, M.x86.R_DI,
-								(*sys_inb)(M.x86.R_DX));
+        case 1:
+            store_data_byte_abs(M.x86.R_ES, M.x86.R_DI,
+                                (*sys_inb) (M.x86.R_DX));
             break;
-          case 2:
-			store_data_word_abs(M.x86.R_ES, M.x86.R_DI,
-								(*sys_inw)(M.x86.R_DX));
+        case 2:
+            store_data_word_abs(M.x86.R_ES, M.x86.R_DI,
+                                (*sys_inw) (M.x86.R_DX));
             break;
-          case 4:
-			store_data_long_abs(M.x86.R_ES, M.x86.R_DI,
-								(*sys_inl)(M.x86.R_DX));
+        case 4:
+            store_data_long_abs(M.x86.R_ES, M.x86.R_DI,
+                                (*sys_inl) (M.x86.R_DX));
             break;
         }
-		M.x86.R_DI += inc;
+        M.x86.R_DI += inc;
     }
 }
 
@@ -2524,63 +2654,65 @@ void ins(int size)
 REMARKS:
 Implements the OUT string instruction and side effects.
 ****************************************************************************/
-void outs(int size)
+void
+outs(int size)
 {
     int inc = size;
 
-	if (ACCESS_FLAG(F_DF)) {
+    if (ACCESS_FLAG(F_DF)) {
         inc = -size;
     }
-	if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
+    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
         /* dont care whether REPE or REPNE */
         /* out until CX is ZERO. */
-		u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ?
-					 M.x86.R_ECX : M.x86.R_CX);
+        u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ?
+                     M.x86.R_ECX : M.x86.R_CX);
         switch (size) {
-          case 1:
+        case 1:
             while (count--) {
-				(*sys_outb)(M.x86.R_DX,
-						 fetch_data_byte_abs(M.x86.R_ES, M.x86.R_SI));
-				M.x86.R_SI += inc;
+                (*sys_outb) (M.x86.R_DX,
+                             fetch_data_byte_abs(M.x86.R_ES, M.x86.R_SI));
+                M.x86.R_SI += inc;
             }
             break;
 
-          case 2:
+        case 2:
             while (count--) {
-				(*sys_outw)(M.x86.R_DX,
-						 fetch_data_word_abs(M.x86.R_ES, M.x86.R_SI));
-				M.x86.R_SI += inc;
+                (*sys_outw) (M.x86.R_DX,
+                             fetch_data_word_abs(M.x86.R_ES, M.x86.R_SI));
+                M.x86.R_SI += inc;
             }
             break;
-          case 4:
+        case 4:
             while (count--) {
-				(*sys_outl)(M.x86.R_DX,
-						 fetch_data_long_abs(M.x86.R_ES, M.x86.R_SI));
-				M.x86.R_SI += inc;
+                (*sys_outl) (M.x86.R_DX,
+                             fetch_data_long_abs(M.x86.R_ES, M.x86.R_SI));
+                M.x86.R_SI += inc;
                 break;
             }
         }
-		M.x86.R_CX = 0;
-		if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-			M.x86.R_ECX = 0;
+        M.x86.R_CX = 0;
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            M.x86.R_ECX = 0;
         }
-		M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
-    } else {
+        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+    }
+    else {
         switch (size) {
-          case 1:
-			(*sys_outb)(M.x86.R_DX,
-					 fetch_data_byte_abs(M.x86.R_ES, M.x86.R_SI));
+        case 1:
+            (*sys_outb) (M.x86.R_DX,
+                         fetch_data_byte_abs(M.x86.R_ES, M.x86.R_SI));
             break;
-          case 2:
-			(*sys_outw)(M.x86.R_DX,
-					 fetch_data_word_abs(M.x86.R_ES, M.x86.R_SI));
+        case 2:
+            (*sys_outw) (M.x86.R_DX,
+                         fetch_data_word_abs(M.x86.R_ES, M.x86.R_SI));
             break;
-          case 4:
-			(*sys_outl)(M.x86.R_DX,
-					 fetch_data_long_abs(M.x86.R_ES, M.x86.R_SI));
+        case 4:
+            (*sys_outl) (M.x86.R_DX,
+                         fetch_data_long_abs(M.x86.R_ES, M.x86.R_SI));
             break;
         }
-		M.x86.R_SI += inc;
+        M.x86.R_SI += inc;
     }
 }
 
@@ -2591,11 +2723,12 @@ addr	- Address to fetch word from
 REMARKS:
 Fetches a word from emulator memory using an absolute address.
 ****************************************************************************/
-u16 mem_access_word(int addr)
+u16
+mem_access_word(int addr)
 {
-DB(	if (CHECK_MEM_ACCESS())
-	  x86emu_check_mem_access(addr);)
-	return (*sys_rdw)(addr);
+    DB(if (CHECK_MEM_ACCESS())
+       x86emu_check_mem_access(addr);)
+        return (*sys_rdw) (addr);
 }
 
 /****************************************************************************
@@ -2604,12 +2737,13 @@ Pushes a word onto the stack.
 
 NOTE: Do not inline this, as (*sys_wrX) is already inline!
 ****************************************************************************/
-void push_word(u16 w)
+void
+push_word(u16 w)
 {
-DB(	if (CHECK_SP_ACCESS())
-	  x86emu_check_sp_access();)
-	M.x86.R_SP -= 2;
-	(*sys_wrw)(((u32)M.x86.R_SS << 4)  + M.x86.R_SP, w);
+    DB(if (CHECK_SP_ACCESS())
+       x86emu_check_sp_access();)
+        M.x86.R_SP -= 2;
+    (*sys_wrw) (((u32) M.x86.R_SS << 4) + M.x86.R_SP, w);
 }
 
 /****************************************************************************
@@ -2618,12 +2752,13 @@ Pushes a long onto the stack.
 
 NOTE: Do not inline this, as (*sys_wrX) is already inline!
 ****************************************************************************/
-void push_long(u32 w)
+void
+push_long(u32 w)
 {
-DB(	if (CHECK_SP_ACCESS())
-	  x86emu_check_sp_access();)
-	M.x86.R_SP -= 4;
-	(*sys_wrl)(((u32)M.x86.R_SS << 4)  + M.x86.R_SP, w);
+    DB(if (CHECK_SP_ACCESS())
+       x86emu_check_sp_access();)
+        M.x86.R_SP -= 4;
+    (*sys_wrl) (((u32) M.x86.R_SS << 4) + M.x86.R_SP, w);
 }
 
 /****************************************************************************
@@ -2632,15 +2767,16 @@ Pops a word from the stack.
 
 NOTE: Do not inline this, as (*sys_rdX) is already inline!
 ****************************************************************************/
-u16 pop_word(void)
+u16
+pop_word(void)
 {
-	register u16 res;
+    register u16 res;
 
-DB(	if (CHECK_SP_ACCESS())
-	  x86emu_check_sp_access();)
-	res = (*sys_rdw)(((u32)M.x86.R_SS << 4)  + M.x86.R_SP);
-	M.x86.R_SP += 2;
-	return res;
+    DB(if (CHECK_SP_ACCESS())
+       x86emu_check_sp_access();)
+        res = (*sys_rdw) (((u32) M.x86.R_SS << 4) + M.x86.R_SP);
+    M.x86.R_SP += 2;
+    return res;
 }
 
 /****************************************************************************
@@ -2649,14 +2785,15 @@ Pops a long from the stack.
 
 NOTE: Do not inline this, as (*sys_rdX) is already inline!
 ****************************************************************************/
-u32 pop_long(void)
+u32
+pop_long(void)
 {
     register u32 res;
 
-DB(	if (CHECK_SP_ACCESS())
-	  x86emu_check_sp_access();)
-	res = (*sys_rdl)(((u32)M.x86.R_SS << 4)  + M.x86.R_SP);
-	M.x86.R_SP += 4;
+    DB(if (CHECK_SP_ACCESS())
+       x86emu_check_sp_access();)
+        res = (*sys_rdl) (((u32) M.x86.R_SS << 4) + M.x86.R_SP);
+    M.x86.R_SP += 4;
     return res;
 }
 
@@ -2664,7 +2801,8 @@ DB(	if (CHECK_SP_ACCESS())
 REMARKS:
 CPUID takes EAX/ECX as inputs, writes EAX/EBX/ECX/EDX as output
 ****************************************************************************/
-void cpuid (void)
+void
+cpuid(void)
 {
     u32 feature = M.x86.R_EAX;
 
@@ -2674,15 +2812,15 @@ void cpuid (void)
      * first two features, and the results of those are sanitized.
      */
     if (feature <= 1)
-	hw_cpuid(&M.x86.R_EAX, &M.x86.R_EBX, &M.x86.R_ECX, &M.x86.R_EDX);
+        hw_cpuid(&M.x86.R_EAX, &M.x86.R_EBX, &M.x86.R_ECX, &M.x86.R_EDX);
 #endif
 
     switch (feature) {
     case 0:
         /* Regardless if we have real data from the hardware, the emulator
-	 * will only support upto feature 1, which we set in register EAX.
-	 * Registers EBX:EDX:ECX contain a string identifying the CPU.
-	 */
+         * will only support upto feature 1, which we set in register EAX.
+         * Registers EBX:EDX:ECX contain a string identifying the CPU.
+         */
         M.x86.R_EAX = 1;
 #ifndef X86EMU_HAS_HW_CPUID
         /* EBX:EDX:ECX = "GenuineIntel" */
@@ -2694,24 +2832,24 @@ void cpuid (void)
     case 1:
 #ifndef X86EMU_HAS_HW_CPUID
         /* If we don't have x86 compatible hardware, we return values from an
-	 * Intel 486dx4; which was one of the first processors to have CPUID.
-	 */
+         * Intel 486dx4; which was one of the first processors to have CPUID.
+         */
         M.x86.R_EAX = 0x00000480;
         M.x86.R_EBX = 0x00000000;
         M.x86.R_ECX = 0x00000000;
-        M.x86.R_EDX = 0x00000002;	/* VME */
+        M.x86.R_EDX = 0x00000002;       /* VME */
 #else
         /* In the case that we have hardware CPUID instruction, we make sure
-	 * that the features reported are limited to TSC and VME.
-	 */
+         * that the features reported are limited to TSC and VME.
+         */
         M.x86.R_EDX &= 0x00000012;
 #endif
         break;
     default:
         /* Finally, we don't support any additional features.  Most CPUs
-	 * return all zeros when queried for invalid or unsupported feature
-	 * numbers.
-	 */
+         * return all zeros when queried for invalid or unsupported feature
+         * numbers.
+         */
         M.x86.R_EAX = 0;
         M.x86.R_EBX = 0;
         M.x86.R_ECX = 0;
@@ -2719,4 +2857,3 @@ void cpuid (void)
         break;
     }
 }
-
diff --git a/xorg-server/hw/xfree86/x86emu/sys.c b/xorg-server/hw/xfree86/x86emu/sys.c
index f389767f1..c514ddeea 100644
--- a/xorg-server/hw/xfree86/x86emu/sys.c
+++ b/xorg-server/hw/xfree86/x86emu/sys.c
@@ -47,101 +47,131 @@
 #include "x86emu/prim_ops.h"
 #ifndef NO_SYS_HEADERS
 #include <string.h>
-#endif                                                                                           
+#endif
 
-#  ifdef __GNUC__
+#ifdef __GNUC__
 
 /* Define some packed structures to use with unaligned accesses */
 
-struct __una_u64 { u64 x __attribute__((packed)); };
-struct __una_u32 { u32 x __attribute__((packed)); };
-struct __una_u16 { u16 x __attribute__((packed)); };
+struct __una_u64 {
+    u64 x __attribute__ ((packed));
+};
+struct __una_u32 {
+    u32 x __attribute__ ((packed));
+};
+struct __una_u16 {
+    u16 x __attribute__ ((packed));
+};
 
 /* Elemental unaligned loads */
 
-static __inline__ u64 ldq_u(u64 *p)
+static __inline__ u64
+ldq_u(u64 * p)
 {
-	const struct __una_u64 *ptr = (const struct __una_u64 *) p;
-	return ptr->x;
+    const struct __una_u64 *ptr = (const struct __una_u64 *) p;
+
+    return ptr->x;
 }
 
-static __inline__ u32 ldl_u(u32 *p)
+static __inline__ u32
+ldl_u(u32 * p)
 {
-	const struct __una_u32 *ptr = (const struct __una_u32 *) p;
-	return ptr->x;
+    const struct __una_u32 *ptr = (const struct __una_u32 *) p;
+
+    return ptr->x;
 }
 
-static __inline__ u16 ldw_u(u16 *p)
+static __inline__ u16
+ldw_u(u16 * p)
 {
-	const struct __una_u16 *ptr = (const struct __una_u16 *) p;
-	return ptr->x;
+    const struct __una_u16 *ptr = (const struct __una_u16 *) p;
+
+    return ptr->x;
 }
 
 /* Elemental unaligned stores */
 
-static __inline__ void stq_u(u64 val, u64 *p)
+static __inline__ void
+stq_u(u64 val, u64 * p)
 {
-	struct __una_u64 *ptr = (struct __una_u64 *) p;
-	ptr->x = val;
+    struct __una_u64 *ptr = (struct __una_u64 *) p;
+
+    ptr->x = val;
 }
 
-static __inline__ void stl_u(u32 val, u32 *p)
+static __inline__ void
+stl_u(u32 val, u32 * p)
 {
-	struct __una_u32 *ptr = (struct __una_u32 *) p;
-	ptr->x = val;
+    struct __una_u32 *ptr = (struct __una_u32 *) p;
+
+    ptr->x = val;
 }
 
-static __inline__ void stw_u(u16 val, u16 *p)
+static __inline__ void
+stw_u(u16 val, u16 * p)
 {
-	struct __una_u16 *ptr = (struct __una_u16 *) p;
-	ptr->x = val;
+    struct __una_u16 *ptr = (struct __una_u16 *) p;
+
+    ptr->x = val;
 }
-#  else /* !__GNUC__ */
+#else                           /* !__GNUC__ */
 
-static __inline__ u64 ldq_u(u64 *p)
+static __inline__ u64
+ldq_u(u64 * p)
 {
-	u64 ret;
-	memmove(&ret, p, sizeof(*p));
-	return ret;
+    u64 ret;
+
+    memmove(&ret, p, sizeof(*p));
+    return ret;
 }
 
-static __inline__ u32 ldl_u(u32 *p)
+static __inline__ u32
+ldl_u(u32 * p)
 {
-	u32 ret;
-	memmove(&ret, p, sizeof(*p));
-	return ret;
+    u32 ret;
+
+    memmove(&ret, p, sizeof(*p));
+    return ret;
 }
 
-static __inline__ u16 ldw_u(u16 *p)
+static __inline__ u16
+ldw_u(u16 * p)
 {
-	u16 ret;
-	memmove(&ret, p, sizeof(*p));
-	return ret;
+    u16 ret;
+
+    memmove(&ret, p, sizeof(*p));
+    return ret;
 }
 
-static __inline__ void stq_u(u64 val, u64 *p)
+static __inline__ void
+stq_u(u64 val, u64 * p)
 {
-	u64 tmp = val;
-	memmove(p, &tmp, sizeof(*p));
+    u64 tmp = val;
+
+    memmove(p, &tmp, sizeof(*p));
 }
 
-static __inline__ void stl_u(u32 val, u32 *p)
+static __inline__ void
+stl_u(u32 val, u32 * p)
 {
-	u32 tmp = val;
-	memmove(p, &tmp, sizeof(*p));
+    u32 tmp = val;
+
+    memmove(p, &tmp, sizeof(*p));
 }
 
-static __inline__ void stw_u(u16 val, u16 *p)
+static __inline__ void
+stw_u(u16 val, u16 * p)
 {
-	u16 tmp = val;
-	memmove(p, &tmp, sizeof(*p));
+    u16 tmp = val;
+
+    memmove(p, &tmp, sizeof(*p));
 }
 
-#  endif /* __GNUC__ */
+#endif                          /* __GNUC__ */
 /*------------------------- Global Variables ------------------------------*/
 
-X86EMU_sysEnv		_X86EMU_env;		/* Global emulator machine state */
-X86EMU_intrFuncs	_X86EMU_intrTab[256];
+X86EMU_sysEnv _X86EMU_env;      /* Global emulator machine state */
+X86EMU_intrFuncs _X86EMU_intrTab[256];
 
 /*----------------------------- Implementation ----------------------------*/
 
@@ -155,19 +185,20 @@ Byte value read from emulator memory.
 REMARKS:
 Reads a byte value from the emulator memory. 
 ****************************************************************************/
-u8 X86API rdb(
-    u32 addr)
+u8 X86API
+rdb(u32 addr)
 {
-	u8 val;
-
-	if (addr > M.mem_size - 1) {
-		DB(printk("mem_read: address %#lx out of range!\n", addr);)
-		HALT_SYS();
-		}
-	val = *(u8*)(M.mem_base + addr);
-DB(	if (DEBUG_MEM_TRACE())
-		printk("%#08x 1 -> %#x\n", addr, val);)
-	return val;
+    u8 val;
+
+    if (addr > M.mem_size - 1) {
+        DB(printk("mem_read: address %#lx out of range!\n", addr);
+            )
+            HALT_SYS();
+    }
+    val = *(u8 *) (M.mem_base + addr);
+    DB(if (DEBUG_MEM_TRACE())
+       printk("%#08x 1 -> %#x\n", addr, val);)
+        return val;
 }
 
 /****************************************************************************
@@ -180,26 +211,27 @@ Word value read from emulator memory.
 REMARKS:
 Reads a word value from the emulator memory.
 ****************************************************************************/
-u16 X86API rdw(
-	u32 addr)
+u16 X86API
+rdw(u32 addr)
 {
-	u16 val = 0;
+    u16 val = 0;
 
-	if (addr > M.mem_size - 2) {
-		DB(printk("mem_read: address %#lx out of range!\n", addr);)
-		HALT_SYS();
-		}
+    if (addr > M.mem_size - 2) {
+        DB(printk("mem_read: address %#lx out of range!\n", addr);
+            )
+            HALT_SYS();
+    }
 #ifdef __BIG_ENDIAN__
-	if (addr & 0x1) {
-		val = (*(u8*)(M.mem_base + addr) |
-			  (*(u8*)(M.mem_base + addr + 1) << 8));
-		}
-	else
+    if (addr & 0x1) {
+        val = (*(u8 *) (M.mem_base + addr) |
+               (*(u8 *) (M.mem_base + addr + 1) << 8));
+    }
+    else
 #endif
-		val = ldw_u((u16*)(M.mem_base + addr));
-		DB(	if (DEBUG_MEM_TRACE())
-		printk("%#08x 2 -> %#x\n", addr, val);)
-    return val;
+        val = ldw_u((u16 *) (M.mem_base + addr));
+    DB(if (DEBUG_MEM_TRACE())
+       printk("%#08x 2 -> %#x\n", addr, val);)
+        return val;
 }
 
 /****************************************************************************
@@ -211,28 +243,29 @@ Long value read from emulator memory.
 REMARKS:
 Reads a long value from the emulator memory. 
 ****************************************************************************/
-u32 X86API rdl(
-	u32 addr)
+u32 X86API
+rdl(u32 addr)
 {
-	u32 val = 0;
+    u32 val = 0;
 
-	if (addr > M.mem_size - 4) {
-		DB(printk("mem_read: address %#lx out of range!\n", addr);)
-		HALT_SYS();
-		}
+    if (addr > M.mem_size - 4) {
+        DB(printk("mem_read: address %#lx out of range!\n", addr);
+            )
+            HALT_SYS();
+    }
 #ifdef __BIG_ENDIAN__
-	if (addr & 0x3) {
-		val = (*(u8*)(M.mem_base + addr + 0) |
-			  (*(u8*)(M.mem_base + addr + 1) << 8) |
-			  (*(u8*)(M.mem_base + addr + 2) << 16) |
-			  (*(u8*)(M.mem_base + addr + 3) << 24));
-		}
-	else
+    if (addr & 0x3) {
+        val = (*(u8 *) (M.mem_base + addr + 0) |
+               (*(u8 *) (M.mem_base + addr + 1) << 8) |
+               (*(u8 *) (M.mem_base + addr + 2) << 16) |
+               (*(u8 *) (M.mem_base + addr + 3) << 24));
+    }
+    else
 #endif
-		val = ldl_u((u32*)(M.mem_base + addr));
-DB(	if (DEBUG_MEM_TRACE())
-		printk("%#08x 4 -> %#x\n", addr, val);)
-	return val;
+        val = ldl_u((u32 *) (M.mem_base + addr));
+    DB(if (DEBUG_MEM_TRACE())
+       printk("%#08x 4 -> %#x\n", addr, val);)
+        return val;
 }
 
 /****************************************************************************
@@ -243,17 +276,17 @@ val		- Value to store
 REMARKS:
 Writes a byte value to emulator memory.
 ****************************************************************************/
-void X86API wrb(
-	u32 addr,
-	u8 val)
+void X86API
+wrb(u32 addr, u8 val)
 {
-DB(	if (DEBUG_MEM_TRACE())
-		printk("%#08x 1 <- %#x\n", addr, val);)
-    if (addr > M.mem_size - 1) {
-		DB(printk("mem_write: address %#lx out of range!\n", addr);)
-		HALT_SYS();
-		}
-	*(u8*)(M.mem_base + addr) = val;
+    DB(if (DEBUG_MEM_TRACE())
+       printk("%#08x 1 <- %#x\n", addr, val);)
+        if (addr > M.mem_size - 1) {
+            DB(printk("mem_write: address %#lx out of range!\n", addr);
+                )
+                HALT_SYS();
+        }
+    *(u8 *) (M.mem_base + addr) = val;
 }
 
 /****************************************************************************
@@ -264,24 +297,24 @@ val		- Value to store
 REMARKS:
 Writes a word value to emulator memory.
 ****************************************************************************/
-void X86API wrw(
-	u32 addr,
-	u16 val)
+void X86API
+wrw(u32 addr, u16 val)
 {
-DB(	if (DEBUG_MEM_TRACE())
-		printk("%#08x 2 <- %#x\n", addr, val);)
-	if (addr > M.mem_size - 2) {
-		DB(printk("mem_write: address %#lx out of range!\n", addr);)
-		HALT_SYS();
-		}
+    DB(if (DEBUG_MEM_TRACE())
+       printk("%#08x 2 <- %#x\n", addr, val);)
+        if (addr > M.mem_size - 2) {
+            DB(printk("mem_write: address %#lx out of range!\n", addr);
+                )
+                HALT_SYS();
+        }
 #ifdef __BIG_ENDIAN__
-	if (addr & 0x1) {
-		*(u8*)(M.mem_base + addr + 0) = (val >> 0) & 0xff;
-		*(u8*)(M.mem_base + addr + 1) = (val >> 8) & 0xff;
-		}
-	else
+    if (addr & 0x1) {
+        *(u8 *) (M.mem_base + addr + 0) = (val >> 0) & 0xff;
+        *(u8 *) (M.mem_base + addr + 1) = (val >> 8) & 0xff;
+    }
+    else
 #endif
-	 stw_u(val,(u16*)(M.mem_base + addr));
+        stw_u(val, (u16 *) (M.mem_base + addr));
 }
 
 /****************************************************************************
@@ -292,26 +325,26 @@ val		- Value to store
 REMARKS:
 Writes a long value to emulator memory. 
 ****************************************************************************/
-void X86API wrl(
-	u32 addr,
-	u32 val)
+void X86API
+wrl(u32 addr, u32 val)
 {
-DB(	if (DEBUG_MEM_TRACE())
-		printk("%#08x 4 <- %#x\n", addr, val);)
-	if (addr > M.mem_size - 4) {
-		DB(printk("mem_write: address %#lx out of range!\n", addr);)
-		HALT_SYS();
-		}
+    DB(if (DEBUG_MEM_TRACE())
+       printk("%#08x 4 <- %#x\n", addr, val);)
+        if (addr > M.mem_size - 4) {
+            DB(printk("mem_write: address %#lx out of range!\n", addr);
+                )
+                HALT_SYS();
+        }
 #ifdef __BIG_ENDIAN__
-	if (addr & 0x1) {
-		*(u8*)(M.mem_base + addr + 0) = (val >>  0) & 0xff;
-		*(u8*)(M.mem_base + addr + 1) = (val >>  8) & 0xff;
-		*(u8*)(M.mem_base + addr + 2) = (val >> 16) & 0xff;
-		*(u8*)(M.mem_base + addr + 3) = (val >> 24) & 0xff;
-		}
-	else
+    if (addr & 0x1) {
+        *(u8 *) (M.mem_base + addr + 0) = (val >> 0) & 0xff;
+        *(u8 *) (M.mem_base + addr + 1) = (val >> 8) & 0xff;
+        *(u8 *) (M.mem_base + addr + 2) = (val >> 16) & 0xff;
+        *(u8 *) (M.mem_base + addr + 3) = (val >> 24) & 0xff;
+    }
+    else
 #endif
-	 stl_u(val,(u32*)(M.mem_base + addr));
+        stl_u(val, (u32 *) (M.mem_base + addr));
 }
 
 /****************************************************************************
@@ -322,12 +355,12 @@ RETURN:
 REMARKS:
 Default PIO byte read function. Doesn't perform real inb.
 ****************************************************************************/
-static u8 X86API p_inb(
-	X86EMU_pioAddr addr)
+static u8 X86API
+p_inb(X86EMU_pioAddr addr)
 {
-DB(	if (DEBUG_IO_TRACE())
-		printk("inb %#04x \n", addr);)
-	return 0;
+    DB(if (DEBUG_IO_TRACE())
+       printk("inb %#04x \n", addr);)
+        return 0;
 }
 
 /****************************************************************************
@@ -338,12 +371,12 @@ RETURN:
 REMARKS:
 Default PIO word read function. Doesn't perform real inw.
 ****************************************************************************/
-static u16 X86API p_inw(
-	X86EMU_pioAddr addr)
+static u16 X86API
+p_inw(X86EMU_pioAddr addr)
 {
-DB(	if (DEBUG_IO_TRACE())
-		printk("inw %#04x \n", addr);)
-	return 0;
+    DB(if (DEBUG_IO_TRACE())
+       printk("inw %#04x \n", addr);)
+        return 0;
 }
 
 /****************************************************************************
@@ -354,12 +387,12 @@ RETURN:
 REMARKS:
 Default PIO long read function. Doesn't perform real inl.
 ****************************************************************************/
-static u32 X86API p_inl(
-	X86EMU_pioAddr addr)
+static u32 X86API
+p_inl(X86EMU_pioAddr addr)
 {
-DB(	if (DEBUG_IO_TRACE())
-		printk("inl %#04x \n", addr);)
-	return 0;
+    DB(if (DEBUG_IO_TRACE())
+       printk("inl %#04x \n", addr);)
+        return 0;
 }
 
 /****************************************************************************
@@ -369,13 +402,12 @@ val     - Value to store
 REMARKS:
 Default PIO byte write function. Doesn't perform real outb.
 ****************************************************************************/
-static void X86API p_outb(
-	X86EMU_pioAddr addr,
-	u8 val)
+static void X86API
+p_outb(X86EMU_pioAddr addr, u8 val)
 {
-DB(	if (DEBUG_IO_TRACE())
-		printk("outb %#02x -> %#04x \n", val, addr);)
-    return;
+    DB(if (DEBUG_IO_TRACE())
+       printk("outb %#02x -> %#04x \n", val, addr);)
+        return;
 }
 
 /****************************************************************************
@@ -385,13 +417,12 @@ val     - Value to store
 REMARKS:
 Default PIO word write function. Doesn't perform real outw.
 ****************************************************************************/
-static void X86API p_outw(
-	X86EMU_pioAddr addr,
-	u16 val)
+static void X86API
+p_outw(X86EMU_pioAddr addr, u16 val)
 {
-DB(	if (DEBUG_IO_TRACE())
-		printk("outw %#04x -> %#04x \n", val, addr);)
-	return;
+    DB(if (DEBUG_IO_TRACE())
+       printk("outw %#04x -> %#04x \n", val, addr);)
+        return;
 }
 
 /****************************************************************************
@@ -401,29 +432,29 @@ val     - Value to store
 REMARKS:
 Default PIO ;ong write function. Doesn't perform real outl.
 ****************************************************************************/
-static void X86API p_outl(
-	X86EMU_pioAddr addr,
-	u32 val)
+static void X86API
+p_outl(X86EMU_pioAddr addr, u32 val)
 {
-DB(	if (DEBUG_IO_TRACE())
-		printk("outl %#08x -> %#04x \n", val, addr);)
-    return;
+    DB(if (DEBUG_IO_TRACE())
+       printk("outl %#08x -> %#04x \n", val, addr);)
+        return;
 }
 
 /*------------------------- Global Variables ------------------------------*/
 
-u8  	(X86APIP sys_rdb)(u32 addr) 			            = rdb;
-u16 	(X86APIP sys_rdw)(u32 addr) 			            = rdw;
-u32 	(X86APIP sys_rdl)(u32 addr) 			            = rdl;
-void 	(X86APIP sys_wrb)(u32 addr,u8 val) 		            = wrb;
-void 	(X86APIP sys_wrw)(u32 addr,u16 val) 	            = wrw;
-void 	(X86APIP sys_wrl)(u32 addr,u32 val) 	            = wrl;
-u8  	(X86APIP sys_inb)(X86EMU_pioAddr addr)	            = p_inb;
-u16 	(X86APIP sys_inw)(X86EMU_pioAddr addr)	            = p_inw;
-u32 	(X86APIP sys_inl)(X86EMU_pioAddr addr)              = p_inl;
-void 	(X86APIP sys_outb)(X86EMU_pioAddr addr, u8 val) 	= p_outb;
-void 	(X86APIP sys_outw)(X86EMU_pioAddr addr, u16 val)	= p_outw;
-void 	(X86APIP sys_outl)(X86EMU_pioAddr addr, u32 val)	= p_outl;
+u8(X86APIP sys_rdb) (u32 addr) = rdb;
+u16(X86APIP sys_rdw) (u32 addr) = rdw;
+u32(X86APIP sys_rdl) (u32 addr) = rdl;
+void (X86APIP sys_wrb) (u32 addr, u8 val) = wrb;
+void (X86APIP sys_wrw) (u32 addr, u16 val) = wrw;
+void (X86APIP sys_wrl) (u32 addr, u32 val) = wrl;
+
+u8(X86APIP sys_inb) (X86EMU_pioAddr addr) = p_inb;
+u16(X86APIP sys_inw) (X86EMU_pioAddr addr) = p_inw;
+u32(X86APIP sys_inl) (X86EMU_pioAddr addr) = p_inl;
+void (X86APIP sys_outb) (X86EMU_pioAddr addr, u8 val) = p_outb;
+void (X86APIP sys_outw) (X86EMU_pioAddr addr, u16 val) = p_outw;
+void (X86APIP sys_outl) (X86EMU_pioAddr addr, u32 val) = p_outl;
 
 /*----------------------------- Setup -------------------------------------*/
 
@@ -436,8 +467,8 @@ This function is used to set the pointers to functions which access
 memory space, allowing the user application to override these functions
 and hook them out as necessary for their application.
 ****************************************************************************/
-void X86EMU_setupMemFuncs(
-	X86EMU_memFuncs *funcs)
+void
+X86EMU_setupMemFuncs(X86EMU_memFuncs * funcs)
 {
     sys_rdb = funcs->rdb;
     sys_rdw = funcs->rdw;
@@ -456,8 +487,8 @@ This function is used to set the pointers to functions which access
 I/O space, allowing the user application to override these functions
 and hook them out as necessary for their application.
 ****************************************************************************/
-void X86EMU_setupPioFuncs(
-	X86EMU_pioFuncs *funcs)
+void
+X86EMU_setupPioFuncs(X86EMU_pioFuncs * funcs)
 {
     sys_inb = funcs->inb;
     sys_inw = funcs->inw;
@@ -480,17 +511,17 @@ in the emulator via the interrupt vector table. This allows the application
 to get control when the code being emulated executes specific software
 interrupts.
 ****************************************************************************/
-void X86EMU_setupIntrFuncs(
-	X86EMU_intrFuncs funcs[])
+void
+X86EMU_setupIntrFuncs(X86EMU_intrFuncs funcs[])
 {
     int i;
-    
-	for (i=0; i < 256; i++)
-		_X86EMU_intrTab[i] = NULL;
-	if (funcs) {
-		for (i = 0; i < 256; i++)
-			_X86EMU_intrTab[i] = funcs[i];
-		}
+
+    for (i = 0; i < 256; i++)
+        _X86EMU_intrTab[i] = NULL;
+    if (funcs) {
+        for (i = 0; i < 256; i++)
+            _X86EMU_intrTab[i] = funcs[i];
+    }
 }
 
 /****************************************************************************
@@ -505,15 +536,15 @@ so that the code in the emulator will continue processing the software
 interrupt as per normal. This essentially allows system code to actively
 hook and handle certain software interrupts as necessary.
 ****************************************************************************/
-void X86EMU_prepareForInt(
-	int num)
+void
+X86EMU_prepareForInt(int num)
 {
-    push_word((u16)M.x86.R_FLG);
+    push_word((u16) M.x86.R_FLG);
     CLEAR_FLAG(F_IF);
     CLEAR_FLAG(F_TF);
     push_word(M.x86.R_CS);
     M.x86.R_CS = mem_access_word(num * 4 + 2);
     push_word(M.x86.R_IP);
     M.x86.R_IP = mem_access_word(num * 4);
-	M.x86.intr = 0;
+    M.x86.intr = 0;
 }
diff --git a/xorg-server/hw/xfree86/x86emu/validate.c b/xorg-server/hw/xfree86/x86emu/validate.c
index b8c4d12d1..4c36e1df5 100644
--- a/xorg-server/hw/xfree86/x86emu/validate.c
+++ b/xorg-server/hw/xfree86/x86emu/validate.c
@@ -591,58 +591,62 @@
         printk("passed\n");                                                 \
 }
 
-void printk(const char *fmt, ...)
+void
+printk(const char *fmt, ...)
 {
     va_list argptr;
+
     va_start(argptr, fmt);
     vfprintf(stdout, fmt, argptr);
     fflush(stdout);
     va_end(argptr);
 }
 
-char * print_flags(char *buf,ulong flags)
+char *
+print_flags(char *buf, ulong flags)
 {
     char *separator = "";
 
     buf[0] = 0;
     if (flags & F_CF) {
-        strcat(buf,separator);
-        strcat(buf,"CF");
+        strcat(buf, separator);
+        strcat(buf, "CF");
         separator = ",";
-        }
+    }
     if (flags & F_PF) {
-        strcat(buf,separator);
-        strcat(buf,"PF");
+        strcat(buf, separator);
+        strcat(buf, "PF");
         separator = ",";
-        }
+    }
     if (flags & F_AF) {
-        strcat(buf,separator);
-        strcat(buf,"AF");
+        strcat(buf, separator);
+        strcat(buf, "AF");
         separator = ",";
-        }
+    }
     if (flags & F_ZF) {
-        strcat(buf,separator);
-        strcat(buf,"ZF");
+        strcat(buf, separator);
+        strcat(buf, "ZF");
         separator = ",";
-        }
+    }
     if (flags & F_SF) {
-        strcat(buf,separator);
-        strcat(buf,"SF");
+        strcat(buf, separator);
+        strcat(buf, "SF");
         separator = ",";
-        }
+    }
     if (flags & F_OF) {
-        strcat(buf,separator);
-        strcat(buf,"OF");
+        strcat(buf, separator);
+        strcat(buf, "OF");
         separator = ",";
-        }
+    }
     if (separator[0] == 0)
-        strcpy(buf,"None");
+        strcpy(buf, "None");
     return buf;
 }
 
-int main(int argc)
+int
+main(int argc)
 {
-    ulong   def_flags;
+    ulong def_flags;
     int trace = false;
 
     if (argc > 1)
diff --git a/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h b/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
index 4c850a1bd..646ec9def 100644
--- a/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
+++ b/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
@@ -49,31 +49,29 @@
 #if defined(__PIC__) && defined(__i386__)
 
 #define X86EMU_HAS_HW_CPUID 1
-static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d)
+static inline void
+hw_cpuid(u32 * a, u32 * b, u32 * c, u32 * d)
 {
-    __asm__ __volatile__ ("pushl %%ebx      \n\t"
-                          "cpuid            \n\t"
-                          "movl %%ebx, %1   \n\t"
-                          "popl %%ebx       \n\t"
-                          : "=a" (*a), "=r" (*b),
-                            "=c" (*c), "=d" (*d)
-                          : "a" (*a), "c" (*c)
-                          : "cc");
+    __asm__ __volatile__("pushl %%ebx      \n\t"
+                         "cpuid            \n\t"
+                         "movl %%ebx, %1   \n\t"
+                         "popl %%ebx       \n\t":"=a"(*a), "=r"(*b),
+                         "=c"(*c), "=d"(*d)
+                         :"a"(*a), "c"(*c)
+                         :"cc");
 }
 
-#else /* ! (__PIC__ && __i386__) */
+#else                           /* ! (__PIC__ && __i386__) */
 
 #define x86EMU_HAS_HW_CPUID 1
-static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d)
+static inline void
+hw_cpuid(u32 * a, u32 * b, u32 * c, u32 * d)
 {
-    __asm__ __volatile__ ("cpuid"
-                          : "=a" (*a), "=b" (*b),
-                            "=c" (*c), "=d" (*d)
-                          : "a" (*a), "c" (*c)
-                          : "cc");
+    __asm__ __volatile__("cpuid":"=a"(*a), "=b"(*b), "=c"(*c), "=d"(*d)
+                         :"a"(*a), "c"(*c)
+                         :"cc");
 }
 
-#endif /* __PIC__ && __i386__ */
+#endif                          /* __PIC__ && __i386__ */
 
-
-#endif /* __X86EMU_PRIM_X86_GCC_H */
+#endif                          /* __X86EMU_PRIM_X86_GCC_H */
diff --git a/xorg-server/hw/xfree86/xaa/xaa.h b/xorg-server/hw/xfree86/xaa/xaa.h
index 6e5a2389a..b530037c9 100644
--- a/xorg-server/hw/xfree86/xaa/xaa.h
+++ b/xorg-server/hw/xfree86/xaa/xaa.h
@@ -1,1394 +1,1038 @@
-

-#ifndef _XAA_H

-#define _XAA_H

-

-#define XAA_VERSION_MAJOR   1

-#define XAA_VERSION_MINOR   2

-#define XAA_VERSION_RELEASE 1

-

-/*

-

-   ******** OPERATION SPECIFIC FLAGS *********

-

-   **** solid/dashed line flags ****

- 

----------               --------

-23           LINE_PATTERN_LSBFIRST_MSBJUSTIFIED

-22           LINE_PATTERN_LSBFIRST_LSBJUSTIFIED

-21           LINE_PATTERN_MSBFIRST_MSBJUSTIFIED

-20           LINE_PATTERN_MSBFIRST_LSBJUSTIFIED

-19           LINE_PATTERN_POWER_OF_2_ONLY

-18           LINE_LIMIT_COORDS

-17                         .

-16                         .

----------               -------

-

-   **** screen to screen copy flags ****

-

----------               --------

-23           ONLY_LEFT_TO_RIGHT_BITBLT

-22           ONLY_TWO_BITBLT_DIRECTIONS

-21                         .

-20                         .

-19                         .

-18                         .

-17                         .

-16                         .

----------               -------

-

-   ****  clipping flags ****

-

----------               --------

-23                         .

-22           HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND

-21           HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY

-20           HARDWARE_CLIP_MONO_8x8_FILL

-19           HARDWARE_CLIP_COLOR_8x8_FILL    

-18           HARDWARE_CLIP_SOLID_FILL

-17           HARDWARE_CLIP_DASHED_LINE

-16           HARDWARE_CLIP_SOLID_LINE

----------               -------

-

-

-   ****  hardware pattern flags ****

-

----------               --------

-23                         .

-22                         .

-21           HARDWARE_PATTERN_SCREEN_ORIGIN

-20                         .

-19                         .

-18                         .

-17           HARDWARE_PATTERN_PROGRAMMED_ORIGIN

-16           HARDWARE_PATTERN_PROGRAMMED_BITS

----------               -------

-

-   ****  write pixmap flags ****

-

----------               --------

-23                         .

-22                         .

-21                         .

-20                         .

-19                         .

-18                         .

-17                         .

-16           CONVERT_32BPP_TO_24BPP

----------               -------

-

-

-   ******** GENERIC FLAGS *********

-

----------               -------

-15           SYNC_AFTER_COLOR_EXPAND

-14           CPU_TRANSFER_PAD_QWORD

-13                         .

-12           LEFT_EDGE_CLIPPING_NEGATIVE_X

-11	     LEFT_EDGE_CLIPPING

-10	     CPU_TRANSFER_BASE_FIXED

- 9           BIT_ORDER_IN_BYTE_MSBFIRST           

- 8           TRANSPARENCY_GXCOPY_ONLY

----------               -------

- 7           NO_TRANSPARENCY

- 6           TRANSPARENCY_ONLY

- 5           ROP_NEEDS_SOURCE

- 4           TRIPLE_BITS_24BPP

- 3           RGB_EQUAL

- 2           NO_PLANEMASK

- 1           NO_GXCOPY

- 0           GXCOPY_ONLY

----------               -------

-

-

-*/

-

-#include "gcstruct.h"

-#include "pixmapstr.h"

-#include "xf86str.h"

-#include "regionstr.h"

-#include "xf86fbman.h"

-

-#include "picturestr.h"

-

-/* Flags */

-#define PIXMAP_CACHE			0x00000001

-#define MICROSOFT_ZERO_LINE_BIAS	0x00000002

-#define OFFSCREEN_PIXMAPS		0x00000004

-#define LINEAR_FRAMEBUFFER		0x00000008

-

-

-/* GC fg, bg, and planemask restrictions */

-#define GXCOPY_ONLY			0x00000001

-#define NO_GXCOPY			0x00000002

-#define NO_PLANEMASK			0x00000004

-#define RGB_EQUAL			0x00000008

-#define TRIPLE_BITS_24BPP		0x00000010

-#define ROP_NEEDS_SOURCE		0x00000020

-

-/* transparency restrictions */

-#define TRANSPARENCY_ONLY		0x00000040

-#define NO_TRANSPARENCY			0x00000080

-#define TRANSPARENCY_GXCOPY_ONLY     	0x00000100

-

-/* bit order restrictions */

-#define BIT_ORDER_IN_BYTE_MSBFIRST	0x00000200

-#define BIT_ORDER_IN_BYTE_LSBFIRST	0x00000000

-

-/* transfer base restriction */

-#define CPU_TRANSFER_BASE_FIXED		0x00000400

-

-/* skipleft restrictions */

-#define LEFT_EDGE_CLIPPING		0x00000800

-#define LEFT_EDGE_CLIPPING_NEGATIVE_X	0x00001000

-

-/* data padding */

-#define CPU_TRANSFER_PAD_DWORD		0x00000000

-#define CPU_TRANSFER_PAD_QWORD		0x00004000

-#define SCANLINE_PAD_DWORD		0x00000000

-

-#define SYNC_AFTER_COLOR_EXPAND		0x00008000

-#define SYNC_AFTER_IMAGE_WRITE		SYNC_AFTER_COLOR_EXPAND

-

-/* hardware pattern */

-#define HARDWARE_PATTERN_PROGRAMMED_BITS	0x00010000

-#define HARDWARE_PATTERN_PROGRAMMED_ORIGIN	0x00020000

-#define HARDWARE_PATTERN_SCREEN_ORIGIN		0x00200000

-

-/* copyarea flags */

-#define ONLY_TWO_BITBLT_DIRECTIONS	0x00400000

-#define ONLY_LEFT_TO_RIGHT_BITBLT	0x00800000

-

-/* line flags */

-#define LINE_PATTERN_LSBFIRST_MSBJUSTIFIED	0x00800000

-#define LINE_PATTERN_LSBFIRST_LSBJUSTIFIED	0x00400000

-#define LINE_PATTERN_MSBFIRST_MSBJUSTIFIED	0x00200000

-#define LINE_PATTERN_MSBFIRST_LSBJUSTIFIED	0x00100000

-#define LINE_PATTERN_POWER_OF_2_ONLY		0x00080000

-#define LINE_LIMIT_COORDS			0x00040000

-

-/* clipping flags */

-#define HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND	0x00400000

-#define HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY		0x00200000

-#define HARDWARE_CLIP_MONO_8x8_FILL			0x00100000

-#define HARDWARE_CLIP_COLOR_8x8_FILL			0x00080000

-#define HARDWARE_CLIP_SOLID_FILL			0x00040000

-#define HARDWARE_CLIP_DASHED_LINE			0x00020000

-#define HARDWARE_CLIP_SOLID_LINE			0x00010000

-

-#define HARDWARE_CLIP_LINE				0x00000000

-

-

-/* image write flags */

-#define CONVERT_32BPP_TO_24BPP			0x00010000

-

-/* pixmap cache flags */

-#define CACHE_MONO_8x8			0x00000001

-#define CACHE_COLOR_8x8			0x00000002

-#define DO_NOT_BLIT_STIPPLES		0x00000004

-#define DO_NOT_TILE_MONO_DATA		0x00000008	

-#define DO_NOT_TILE_COLOR_DATA		0x00000010

-

-

-#define DEGREES_0	0

-#define DEGREES_90	1

-#define DEGREES_180	2

-#define DEGREES_270	3

-

-#define OMIT_LAST	1

-

-/* render flags */

-

-#define XAA_RENDER_POWER_OF_2_TILE_ONLY	0x00000008

-#define XAA_RENDER_NO_SRC_ALPHA		0x00000004

-#define XAA_RENDER_IMPRECISE_ONLY	0x00000002	

-#define XAA_RENDER_NO_TILE		0x00000001		

-

-#define XAA_RENDER_REPEAT		0x00000001

-

-typedef void (* ValidateGCProcPtr)(

-   GCPtr         pGC,

-   unsigned long changes,

-   DrawablePtr   pDraw

-);

-

-typedef struct {

-    unsigned char *bits;

-    int width;

-    int height;

-    int yoff;

-    int srcwidth;

-    int start;

-    int end;

-} NonTEGlyphInfo, *NonTEGlyphPtr;

-

-

-typedef struct {

-   int x;

-   int y;

-   int w;

-   int h;

-   int orig_w;

-   int orig_h;

-   unsigned long serialNumber;

-   int pat0;

-   int pat1;

-   int fg;

-   int bg;

-   int trans_color;

-   DDXPointPtr offsets;

-   DevUnion devPrivate;

-} XAACacheInfoRec, *XAACacheInfoPtr;

-

-

-typedef struct _PixmapLink {

-  PixmapPtr pPix;

-  struct _PixmapLink *next;

-  FBAreaPtr area;

-} PixmapLink, *PixmapLinkPtr;

-

-typedef struct _XAAInfoRec {

-   ScrnInfoPtr pScrn;

-   int Flags;

-

-   void (*Sync)(

-	ScrnInfoPtr pScrn

-   );

-   

-   /* Restore Accel State is a driver callback that is used

-    * when another screen on the same device has been active.

-    * This allows multihead on a single device to work.

-    * If The entityProp has IS_SHARED_ACCEL defined then this

-    * function is required.

-    */

-   

-   void (*RestoreAccelState)(

-	ScrnInfoPtr pScrn

-   );

-

-   /***************** Low Level *****************/

-

-/* Blits */

-   void (*SetupForScreenToScreenCopy)(

-	ScrnInfoPtr pScrn,

-	int xdir, int ydir,

-	int rop,

-	unsigned int planemask,

-	int trans_color

-   );

-   int ScreenToScreenCopyFlags;

-

-   void (*SubsequentScreenToScreenCopy)(

-	ScrnInfoPtr pScrn,

-	int xsrc, int ysrc,

-	int xdst, int ydst,

-	int w, int h

-   );

-

-   

-/* Solid fills */

-   void (*SetupForSolidFill)(

-	ScrnInfoPtr pScrn,

-	int color,

-	int rop,

-	unsigned int planemask

-   );    

-   int SolidFillFlags;  

-

-   void (*SubsequentSolidFillRect)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h

-   );    

-

-   void (*SubsequentSolidFillTrap)(

-	ScrnInfoPtr pScrn,

-	int y, int h, 

-	int left, int dxL, int dyL, int eL,

-	int right, int dxR, int dyR, int eR

-   );

-

-

-/* Solid lines */

-

-   void (*SetupForSolidLine)(

-	ScrnInfoPtr pScrn,

-	int color,

-	int rop,

-	unsigned int planemask

-   );    

-   int SolidLineFlags;  

-

-   void (*SubsequentSolidTwoPointLine)(

-	ScrnInfoPtr pScrn,

-	int xa, int ya, int xb, int yb, int flags

-   );   

-

-   void (*SubsequentSolidBresenhamLine)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int absmaj, int absmin, int err, int len, int octant

-   );   

-   int SolidBresenhamLineErrorTermBits;

-

-   void (*SubsequentSolidHorVertLine)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int len, int dir

-   );   

-

-/* Dashed lines */

-

-   void (*SetupForDashedLine)(

-	ScrnInfoPtr pScrn,

-	int fg, int bg,

-	int rop,

-	unsigned int planemask,

-	int length,

-	unsigned char *pattern

-   );    

-   int DashedLineFlags; 

-   int DashPatternMaxLength; 

-

-   void (*SubsequentDashedTwoPointLine)(

-	ScrnInfoPtr pScrn,

-	int xa, int ya, int xb, int yb, int flags, int phase

-   );   

-

-   void (*SubsequentDashedBresenhamLine)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int absmaj, int absmin, int err, int len, int flags,

-	int phase

-   );   

-   int DashedBresenhamLineErrorTermBits;

-

-/* Clipper */

-

-   void (*SetClippingRectangle) (

-	ScrnInfoPtr pScrn,

-	int left, int top, int right, int bottom

-   );

-   int ClippingFlags;

-

-   void (*DisableClipping)(ScrnInfoPtr pScrn);

-

-/* 8x8 mono pattern fills */

-   void (*SetupForMono8x8PatternFill)(

-	ScrnInfoPtr pScrn,

-	int patx, int paty,

-	int fg, int bg,

-	int rop,

-	unsigned int planemask

-   );

-   int Mono8x8PatternFillFlags; 

-

-   void (*SubsequentMono8x8PatternFillRect)(

-	ScrnInfoPtr pScrn,

-	int patx, int paty,

-	int x, int y, int w, int h

-   );

-

-   void (*SubsequentMono8x8PatternFillTrap)(

-	ScrnInfoPtr pScrn,

-        int patx, int paty,

-	int y, int h, 

-	int left, int dxL, int dyL, int eL,

-	int right, int dxR, int dyR, int eR

-   );

-

-/* 8x8 color pattern fills */

-

-   void (*SetupForColor8x8PatternFill)(

-	ScrnInfoPtr pScrn,

-	int patx, int paty,

-	int rop,

-	unsigned int planemask,

-	int transparency_color

-   );

-   int Color8x8PatternFillFlags; 

-

-   void (*SubsequentColor8x8PatternFillRect)(

-	ScrnInfoPtr pScrn,

-	int patx, int paty,

-	int x, int y, int w, int h

-   );

-

-   void (*SubsequentColor8x8PatternFillTrap)(

-	ScrnInfoPtr pScrn,

-        int patx, int paty,

-	int y, int h, 

-	int left, int dxL, int dyL, int eL,

-	int right, int dxR, int dyR, int eR

-   );

-

-

-/* Color expansion */

-

-   void (*SetupForCPUToScreenColorExpandFill)(

-	ScrnInfoPtr pScrn,

-	int fg, int bg,

-	int rop,

-	unsigned int planemask

-   );     

-   int CPUToScreenColorExpandFillFlags;  

-

-   void (*SubsequentCPUToScreenColorExpandFill)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h,

-	int skipleft

-   );

-

-   unsigned char *ColorExpandBase;

-   int ColorExpandRange;

-

-

-/* Scanline color expansion  */

-

-   void (*SetupForScanlineCPUToScreenColorExpandFill)(

-	ScrnInfoPtr pScrn,

-	int fg, int bg,

-	int rop,

-	unsigned int planemask

-   );  

-   int ScanlineCPUToScreenColorExpandFillFlags;

-

-   void (*SubsequentScanlineCPUToScreenColorExpandFill)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h,

-	int skipleft

-   );

-

-   void (*SubsequentColorExpandScanline)(

-	ScrnInfoPtr pScrn,

-	int bufno

-   );

-

-   int NumScanlineColorExpandBuffers;

-   unsigned char **ScanlineColorExpandBuffers;

-

-/* Screen to screen color expansion */

-

-   void (*SetupForScreenToScreenColorExpandFill) (

-	ScrnInfoPtr pScrn,

-	int fg, int bg,

-	int rop,

-	unsigned int planemask

-   );

-   int ScreenToScreenColorExpandFillFlags;

-

-   void (*SubsequentScreenToScreenColorExpandFill)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h,

-	int srcx, int srcy, int skipleft

-   );

-   

-

-/*  Image transfers */

-

-   void (*SetupForImageWrite)(

-	ScrnInfoPtr pScrn,

-	int rop,

-	unsigned int planemask,

-	int transparency_color,

-	int bpp, int depth

-   );

-   int ImageWriteFlags;

-

-   void (*SubsequentImageWriteRect)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h,

-	int skipleft

-   );

-   unsigned char *ImageWriteBase;

-   int ImageWriteRange;

-	

-/*  Scanline Image transfers */

-

-   void (*SetupForScanlineImageWrite)(

-	ScrnInfoPtr pScrn,

-	int rop,

-	unsigned int planemask,

-	int transparency_color,

-	int bpp, int depth

-   );

-   int ScanlineImageWriteFlags;

-

-   void (*SubsequentScanlineImageWriteRect)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h,

-	int skipleft

-   );

-

-   void (*SubsequentImageWriteScanline) (

-	ScrnInfoPtr pScrn,

-	int bufno

-   );

-   

-   int NumScanlineImageWriteBuffers;

-   unsigned char **ScanlineImageWriteBuffers;

-

-  /* Image Reads - OBSOLETE AND NOT USED */

-

-   void (*SetupForImageRead) (

-	ScrnInfoPtr pScrn,

-	int bpp, int depth

-   );

-   int ImageReadFlags;

-

-   unsigned char *ImageReadBase;

-   int ImageReadRange;

-

-   void (*SubsequentImageReadRect)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h

-   );  

-

-

-   /***************** Mid Level *****************/

-   void (*ScreenToScreenBitBlt)(

-	ScrnInfoPtr pScrn,

-	int nbox,

-	DDXPointPtr pptSrc,

-        BoxPtr pbox,

-	int xdir, int ydir,

-	int alu,

-	unsigned int planmask

-   );

-   int ScreenToScreenBitBltFlags;

-

-   void (*WriteBitmap) (

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h,

-	unsigned char *src,

-    	int srcwidth,

-    	int skipleft,

-	int fg, int bg,

-	int rop,

-	unsigned int planemask

-   );

-   int WriteBitmapFlags;

-

-   void (*FillSolidRects)(

-	ScrnInfoPtr pScrn,

-	int fg, int rop,

-        unsigned int planemask,

-	int nBox,

-	BoxPtr pBox 

-   );

-   int FillSolidRectsFlags;

-

-   void (*FillMono8x8PatternRects)(

-	ScrnInfoPtr pScrn,

-	int fg, int bg, int rop,

-        unsigned int planemask,

-	int nBox,

-	BoxPtr pBox, 

-	int pat0, int pat1,

-	int xorg, int yorg

-   );

-   int FillMono8x8PatternRectsFlags;

-

-   void (*FillColor8x8PatternRects)(

-	ScrnInfoPtr pScrn,

-	int rop,

-        unsigned int planemask,

-	int nBox,

-	BoxPtr pBox,

-	int xorg, int yorg,

-	XAACacheInfoPtr pCache

-   );

-   int FillColor8x8PatternRectsFlags;

-

-   void (*FillCacheBltRects)(

-	ScrnInfoPtr pScrn,

-	int rop,

-        unsigned int planemask,

-	int nBox,

-	BoxPtr pBox,

-	int xorg, int yorg,

-	XAACacheInfoPtr pCache

-   );

-   int FillCacheBltRectsFlags;

-

-   void (*FillColorExpandRects)(

-	ScrnInfoPtr pScrn,

-	int fg, int bg, int rop,

-        unsigned int planemask,

-	int nBox,

-	BoxPtr pBox,

-	int xorg, int yorg,

-	PixmapPtr pPix

-   );

-   int FillColorExpandRectsFlags;

-

-   void (*FillCacheExpandRects)(

-	ScrnInfoPtr pScrn,

-	int fg, int bg, int rop,

-	unsigned int planemask,

-	int nBox,

-	BoxPtr pBox,

-	int xorg, int yorg,

-	PixmapPtr pPix

-   );

-   int FillCacheExpandRectsFlags;

-

-   void (*FillImageWriteRects)(

-	ScrnInfoPtr pScrn,

-	int rop,

-	unsigned int planemask,

-	int nBox,

-	BoxPtr pBox,

-	int xorg, int yorg,

-	PixmapPtr pPix

-   );

-   int FillImageWriteRectsFlags;

-   

-

-   void (*FillSolidSpans)(

-	ScrnInfoPtr pScrn,

-	int fg, int rop,

-        unsigned int planemask,

-	int n,

-	DDXPointPtr points,

-	int *widths,

-	int fSorted 

-   );

-   int FillSolidSpansFlags;

-

-   void (*FillMono8x8PatternSpans)(

-	ScrnInfoPtr pScrn,

-	int fg, int bg, int rop,

-        unsigned int planemask,

-	int n,

-	DDXPointPtr points,

-	int *widths,

-	int fSorted, 

-	int pat0, int pat1,

-	int xorg, int yorg

-   );

-   int FillMono8x8PatternSpansFlags;

-

-   void (*FillColor8x8PatternSpans)(

-	ScrnInfoPtr pScrn,

-	int rop,

-        unsigned int planemask,

-	int n,

-	DDXPointPtr points,

-	int *widths,

-	int fSorted,

-	XAACacheInfoPtr pCache,

-	int xorg, int yorg

-   );

-   int FillColor8x8PatternSpansFlags;

-

-   void (*FillCacheBltSpans)(

-	ScrnInfoPtr pScrn,

-	int rop,

-        unsigned int planemask,

-	int n,

-	DDXPointPtr points,

-	int *widths,

-	int fSorted,

-	XAACacheInfoPtr pCache,

-	int xorg, int yorg

-   );

-   int FillCacheBltSpansFlags;

-

-   void (*FillColorExpandSpans)(

-	ScrnInfoPtr pScrn,

-	int fg, int bg, int rop,

-        unsigned int planemask,

-	int n,

-	DDXPointPtr points,

-	int *widths,

-	int fSorted,

-	int xorg, int yorg,

-	PixmapPtr pPix

-   );

-   int FillColorExpandSpansFlags;

-

-   void (*FillCacheExpandSpans)(

-	ScrnInfoPtr pScrn,

-	int fg, int bg, int rop,

-	unsigned int planemask,

-	int n,

-	DDXPointPtr ppt,

-	int *pwidth,

-	int fSorted,

-	int xorg, int yorg,

-	PixmapPtr pPix

-   );

-   int FillCacheExpandSpansFlags;

-

-   void (*TEGlyphRenderer)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h, int skipleft, int startline, 

-	unsigned int **glyphs, int glyphWidth,

-	int fg, int bg, int rop, unsigned planemask

-   );

-   int TEGlyphRendererFlags;

-

-   void (*NonTEGlyphRenderer)(

-	ScrnInfoPtr pScrn,

-	int x, int y, int n,

-	NonTEGlyphPtr glyphs,

-	BoxPtr pbox,

-	int fg, int rop,

-	unsigned int planemask

-   );

-   int NonTEGlyphRendererFlags;

-

-   void (*WritePixmap) (

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h,

-	unsigned char *src,

-    	int srcwidth,

-	int rop,

-	unsigned int planemask,

-	int transparency_color,

-	int bpp, int depth

-   );

-   int WritePixmapFlags;

-

-   void (*ReadPixmap) (

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h,

-	unsigned char *dst,	

-	int dstwidth,

-	int bpp, int depth

-   );

-   int ReadPixmapFlags;

-

-   /***************** GC Level *****************/

-   RegionPtr (*CopyArea)(

-	DrawablePtr pSrcDrawable,

-	DrawablePtr pDstDrawable,

-	GC *pGC,

-	int srcx, int srcy,

-	int width, int height,

-	int dstx, int dsty

-   );

-   int CopyAreaFlags;

-

-   RegionPtr (*CopyPlane)(

-	DrawablePtr pSrc,

-	DrawablePtr pDst,

-	GCPtr pGC,

-	int srcx, int srcy,

-	int width, int height,

-	int dstx, int dsty,

-	unsigned long bitPlane

-   );

-   int CopyPlaneFlags;

-

-   void (*PushPixelsSolid) (

-	GCPtr	pGC,

-	PixmapPtr pBitMap,

-	DrawablePtr pDrawable,

-	int dx, int dy, 

-	int xOrg, int yOrg

-   );

-   int PushPixelsFlags; 

-

-   /** PolyFillRect **/

-

-   void (*PolyFillRectSolid)(

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int nrectFill, 	

-	xRectangle *prectInit

-   );  

-   int PolyFillRectSolidFlags;

-

-   void (*PolyFillRectStippled)(

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int nrectFill, 	

-	xRectangle *prectInit

-   );  

-   int PolyFillRectStippledFlags;

-

-   void (*PolyFillRectOpaqueStippled)(

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int nrectFill, 	

-	xRectangle *prectInit

-   );  

-   int PolyFillRectOpaqueStippledFlags;

-

-   void (*PolyFillRectTiled)(

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int nrectFill, 	

-	xRectangle *prectInit

-   );  

-   int PolyFillRectTiledFlags;

-

-   /** FillSpans **/   

-

-   void (*FillSpansSolid)(

-	DrawablePtr	pDraw,

-	GCPtr		pGC,

-	int		nInit,

-	DDXPointPtr 	ppt,

-	int		*pwidth,

-	int		fSorted 

-   );

-   int FillSpansSolidFlags;

-

-   void (*FillSpansStippled)(

-	DrawablePtr	pDraw,

-	GCPtr		pGC,

-	int		nInit,

-	DDXPointPtr 	ppt,

-	int		*pwidth,

-	int		fSorted 

-   );

-   int FillSpansStippledFlags;

-

-   void (*FillSpansOpaqueStippled)(

-	DrawablePtr	pDraw,

-	GCPtr		pGC,

-	int		nInit,

-	DDXPointPtr 	ppt,

-	int		*pwidth,

-	int		fSorted 

-   );

-   int FillSpansOpaqueStippledFlags;

-

-   void (*FillSpansTiled)(

-	DrawablePtr	pDraw,

-	GCPtr		pGC,

-	int		nInit,

-	DDXPointPtr 	ppt,

-	int		*pwidth,

-	int		fSorted 

-   );

-   int FillSpansTiledFlags;

-

-   int (*PolyText8TE) (

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int x, int y,

-	int count,

-	char *chars

-   );

-   int PolyText8TEFlags;

-

-   int (*PolyText16TE) (

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int x, int y,

-	int count,

-	unsigned short *chars

-   );

-   int PolyText16TEFlags;

-

-   void (*ImageText8TE) (

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int x, int y,

-	int count,

-	char *chars

-   );

-   int ImageText8TEFlags;

-

-   void (*ImageText16TE) (

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int x, int y,

-	int count,

-	unsigned short *chars

-   );

-   int ImageText16TEFlags;

-

-   void (*ImageGlyphBltTE) (

-	DrawablePtr pDrawable,

-	GCPtr pGC,

-	int xInit, int yInit,

-	unsigned int nglyph,

-	CharInfoPtr *ppci,

-	pointer pglyphBase 

-   );

-   int ImageGlyphBltTEFlags;

-

-   void (*PolyGlyphBltTE) (

-	DrawablePtr pDrawable,

-	GCPtr pGC,

-	int xInit, int yInit,

-	unsigned int nglyph,

-	CharInfoPtr *ppci,

-	pointer pglyphBase 

-   );

-   int PolyGlyphBltTEFlags;

-

-   int (*PolyText8NonTE) (

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int x, int y,

-	int count,

-	char *chars

-   );

-   int PolyText8NonTEFlags;

-

-   int (*PolyText16NonTE) (

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int x, int y,

-	int count,

-	unsigned short *chars

-   );

-   int PolyText16NonTEFlags;

-

-   void (*ImageText8NonTE) (

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int x, int y,

-	int count,

-	char *chars

-   );

-   int ImageText8NonTEFlags;

-

-   void (*ImageText16NonTE) (

-	DrawablePtr pDraw,

-	GCPtr pGC,

-	int x, int y,

-	int count,

-	unsigned short *chars

-   );

-   int ImageText16NonTEFlags;

-

-   void (*ImageGlyphBltNonTE) (

-	DrawablePtr pDrawable,

-	GCPtr pGC,

-	int xInit, int yInit,

-	unsigned int nglyph,

-	CharInfoPtr *ppci,

-	pointer pglyphBase 

-   );

-   int ImageGlyphBltNonTEFlags;

-

-   void (*PolyGlyphBltNonTE) (

-	DrawablePtr pDrawable,

-	GCPtr pGC,

-	int xInit, int yInit,

-	unsigned int nglyph,

-	CharInfoPtr *ppci,

-	pointer pglyphBase 

-   );

-   int PolyGlyphBltNonTEFlags;

-

-   void (*PolyRectangleThinSolid)(

-	DrawablePtr  pDrawable,

-	GCPtr        pGC,    

-	int	     nRectsInit,

-	xRectangle  *pRectsInit 

-   );

-   int PolyRectangleThinSolidFlags;

-

-   void (*PolylinesWideSolid)(

-	DrawablePtr	pDrawable,

-	GCPtr		pGC,

-	int		mode,

-	int 		npt,

-	DDXPointPtr pPts

-   );

-   int PolylinesWideSolidFlags;

-

-   void (*PolylinesThinSolid)(

-	DrawablePtr	pDrawable,

-	GCPtr		pGC,

-	int		mode,

-	int 		npt,

-	DDXPointPtr pPts

-   );

-   int PolylinesThinSolidFlags;

-

-   void (*PolySegmentThinSolid)(

-	DrawablePtr	pDrawable,

-	GCPtr		pGC,

-	int		nseg,

-	xSegment	*pSeg

-   );

-   int PolySegmentThinSolidFlags;

-

-   void (*PolylinesThinDashed)(

-	DrawablePtr	pDrawable,

-	GCPtr		pGC,

-	int		mode,

-	int 		npt,

-	DDXPointPtr pPts

-   );

-   int PolylinesThinDashedFlags;

-

-   void (*PolySegmentThinDashed)(

-	DrawablePtr	pDrawable,

-	GCPtr		pGC,

-	int		nseg,

-	xSegment	*pSeg

-   );

-   int PolySegmentThinDashedFlags;

-

-   void (*FillPolygonSolid)(

-	DrawablePtr	pDrawable,

-	GCPtr		pGC,

-	int		shape,

-	int		mode,

-	int		count,

-	DDXPointPtr	ptsIn 

-   );

-   int FillPolygonSolidFlags;

-

-   void (*FillPolygonStippled)(

-	DrawablePtr	pDrawable,

-	GCPtr		pGC,

-	int		shape,

-	int		mode,

-	int		count,

-	DDXPointPtr	ptsIn 

-   );

-   int FillPolygonStippledFlags;

-

-   void (*FillPolygonOpaqueStippled)(

-	DrawablePtr	pDrawable,

-	GCPtr		pGC,

-	int		shape,

-	int		mode,

-	int		count,

-	DDXPointPtr	ptsIn 

-   );

-   int FillPolygonOpaqueStippledFlags;

-

-   void (*FillPolygonTiled)(

-	DrawablePtr	pDrawable,

-	GCPtr		pGC,

-	int		shape,

-	int		mode,

-	int		count,

-	DDXPointPtr	ptsIn 

-   );

-   int FillPolygonTiledFlags;

-

-   void (*PolyFillArcSolid)(

-	DrawablePtr	pDraw,

-	GCPtr		pGC,

-	int		narcs,

-	xArc		*parcs

-   );

-   int PolyFillArcSolidFlags;

-

-   void (*PutImage)(

-	DrawablePtr pDraw,

-	GCPtr       pGC,

-	int         depth, 

-	int	    x, 

-	int         y, 

-	int	    w, 

-	int	    h,

-	int         leftPad,

-	int         format,

-	char        *pImage

-   );

-   int PutImageFlags;

-   

-   /* Validation masks */

-

-   unsigned long FillSpansMask;

-   ValidateGCProcPtr ValidateFillSpans;

-   unsigned long SetSpansMask;

-   ValidateGCProcPtr ValidateSetSpans;

-   unsigned long PutImageMask;

-   ValidateGCProcPtr ValidatePutImage;

-   unsigned long CopyAreaMask;

-   ValidateGCProcPtr ValidateCopyArea;

-   unsigned long CopyPlaneMask;

-   ValidateGCProcPtr ValidateCopyPlane;

-   unsigned long PolyPointMask;

-   ValidateGCProcPtr ValidatePolyPoint;

-   unsigned long PolylinesMask;

-   ValidateGCProcPtr ValidatePolylines;

-   unsigned long PolySegmentMask;

-   ValidateGCProcPtr ValidatePolySegment;

-   unsigned long PolyRectangleMask;

-   ValidateGCProcPtr ValidatePolyRectangle;

-   unsigned long PolyArcMask;

-   ValidateGCProcPtr ValidatePolyArc;

-   unsigned long FillPolygonMask;

-   ValidateGCProcPtr ValidateFillPolygon;

-   unsigned long PolyFillRectMask;

-   ValidateGCProcPtr ValidatePolyFillRect;

-   unsigned long PolyFillArcMask;

-   ValidateGCProcPtr ValidatePolyFillArc;

-   unsigned long PolyText8Mask;

-   ValidateGCProcPtr ValidatePolyText8;

-   unsigned long PolyText16Mask;

-   ValidateGCProcPtr ValidatePolyText16;

-   unsigned long ImageText8Mask;

-   ValidateGCProcPtr ValidateImageText8;

-   unsigned long ImageText16Mask;

-   ValidateGCProcPtr ValidateImageText16;

-   unsigned long PolyGlyphBltMask;

-   ValidateGCProcPtr ValidatePolyGlyphBlt;

-   unsigned long ImageGlyphBltMask;

-   ValidateGCProcPtr ValidateImageGlyphBlt;

-   unsigned long PushPixelsMask;

-   ValidateGCProcPtr ValidatePushPixels;

-

-   void (*ComputeDash)(GCPtr pGC);

-

-   /* Pixmap Cache */

-

-   int  PixmapCacheFlags;

-   Bool UsingPixmapCache;

-   Bool CanDoMono8x8;

-   Bool CanDoColor8x8;

-

-   void (*InitPixmapCache)(

-	ScreenPtr pScreen, 

-	RegionPtr areas,

-	pointer data

-   );

-   void (*ClosePixmapCache)(

-	ScreenPtr pScreen

-   );

-

-   int (*StippledFillChooser)(GCPtr pGC);

-   int (*OpaqueStippledFillChooser)(GCPtr pGC);

-   int (*TiledFillChooser)(GCPtr pGC);

-

-   int  CachePixelGranularity;

-   int  MaxCacheableTileWidth;

-   int  MaxCacheableTileHeight;

-   int  MaxCacheableStippleWidth;

-   int  MaxCacheableStippleHeight;

-

-   XAACacheInfoPtr (*CacheTile)(

-	ScrnInfoPtr Scrn, PixmapPtr pPix

-   );

-   XAACacheInfoPtr (*CacheStipple)(

-	ScrnInfoPtr Scrn, PixmapPtr pPix, 

-	int fg, int bg

-   );

-   XAACacheInfoPtr (*CacheMonoStipple)(

-	ScrnInfoPtr Scrn, PixmapPtr pPix

-   );

-   XAACacheInfoPtr (*CacheMono8x8Pattern)(

-	ScrnInfoPtr Scrn, int pat0, int pat1

-   );

-   XAACacheInfoPtr (*CacheColor8x8Pattern)(

-	ScrnInfoPtr Scrn, PixmapPtr pPix, 

-	int fg, int bg

-   );

-

-

-   int MonoPatternPitch;

-   int CacheWidthMono8x8Pattern;

-   int CacheHeightMono8x8Pattern;

-

-   int ColorPatternPitch;

-   int CacheWidthColor8x8Pattern;

-   int CacheHeightColor8x8Pattern;

-

-   int CacheColorExpandDensity;

-

-   void (*WriteBitmapToCache) (

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h,

-	unsigned char *src,

-    	int srcwidth,

-	int fg, int bg

-   );

-   void (*WritePixmapToCache) (

-	ScrnInfoPtr pScrn,

-	int x, int y, int w, int h,

-	unsigned char *src,

-    	int srcwidth,

-	int bpp, int depth

-   );

-   void (*WriteMono8x8PatternToCache)(

-	ScrnInfoPtr pScrn, 

-	XAACacheInfoPtr pCache

-   );

-   void (*WriteColor8x8PatternToCache)(

-	ScrnInfoPtr pScrn, 

-	PixmapPtr pPix, 

-	XAACacheInfoPtr pCache

-   );

-   

-   char* PixmapCachePrivate;

-

-   /* Miscellaneous */

-

-   GC ScratchGC;

-   int PreAllocSize;

-   unsigned char *PreAllocMem;

-

-   CharInfoPtr CharInfo[255];

-   NonTEGlyphInfo GlyphInfo[255];

-

-   unsigned int FullPlanemask; /* deprecated */

-

-   PixmapLinkPtr OffscreenPixmaps;

-   int maxOffPixWidth;

-   int maxOffPixHeight;   

-

-   XAACacheInfoRec ScratchCacheInfoRec;

-

-   BoxPtr ClipBox;

-

-   Bool NeedToSync;

-

-   char *dgaSaves;

-

-   /* These can be supplied to override the defaults */

-

-   GetImageProcPtr GetImage;

-   GetSpansProcPtr GetSpans;

-   CopyWindowProcPtr CopyWindow;

-

-   unsigned int offscreenDepths;

-   Bool offscreenDepthsInitialized;

-

-   CARD32 FullPlanemasks[32];

-

-   Bool (*Composite) (

-   	CARD8      op,

-        PicturePtr pSrc,

-        PicturePtr pMask,

-        PicturePtr pDst,

-        INT16      xSrc,

-        INT16      ySrc,

-        INT16      xMask,

-        INT16      yMask,

-        INT16      xDst,

-        INT16      yDst,

-        CARD16     width,

-        CARD16     height

-   );

-

-   Bool (*Glyphs) (

-        CARD8         op,

-        PicturePtr    pSrc,

-        PicturePtr    pDst,

-        PictFormatPtr maskFormat,

-        INT16         xSrc,

-        INT16         ySrc,

-        int           nlist,

-        GlyphListPtr  list,

-        GlyphPtr      *glyphs

-   );

-

-   /* The old SetupForCPUToScreenAlphaTexture function is no longer used because

-    * it doesn't pass in enough information to write a conforming

-    * implementation.  See SetupForCPUToScreenAlphaTexture2.

-    */

-   Bool (*SetupForCPUToScreenAlphaTexture) (

-	ScrnInfoPtr	pScrn,

-	int		op,

-	CARD16		red,

-	CARD16		green,

-	CARD16		blue,

-	CARD16		alpha,

-	int		alphaType,

-	CARD8		*alphaPtr,

-	int		alphaPitch,

-	int		width,

-	int		height,

-	int		flags

-   );

-   void (*SubsequentCPUToScreenAlphaTexture) (

-	ScrnInfoPtr	pScrn,

-	int		dstx,

-	int		dsty,

-	int		srcx,

-	int		srcy,

-	int		width,

-	int		height

-   );

-   int CPUToScreenAlphaTextureFlags;

-   CARD32 * CPUToScreenAlphaTextureFormats;

-

-   /* The old SetupForCPUToScreenTexture function is no longer used because

-    * it doesn't pass in enough information to write a conforming

-    * implementation.  See SetupForCPUToScreenTexture2.

-    */

-   Bool (*SetupForCPUToScreenTexture) (

-	ScrnInfoPtr	pScrn,

-	int		op,

-	int		texType,

-	CARD8		*texPtr,

-	int		texPitch,

-	int		width,

-	int		height,

-	int		flags

-   );

-   void (*SubsequentCPUToScreenTexture) (

-	ScrnInfoPtr	pScrn,

-	int		dstx,

-	int		dsty,

-	int		srcx,

-	int		srcy,

-	int		width,

-	int		height

-   );

-   int CPUToScreenTextureFlags;

-   CARD32 * CPUToScreenTextureFormats;

-

-

-   /* these were added for 4.3.0 */

-   BoxRec SolidLineLimits;

-   BoxRec DashedLineLimits;

-

-   /* These were added for X.Org 6.8.0 */

-   Bool (*SetupForCPUToScreenAlphaTexture2) (

-	ScrnInfoPtr	pScrn,

-	int		op,

-	CARD16		red,

-	CARD16		green,

-	CARD16		blue,

-	CARD16		alpha,

-	CARD32		maskFormat,

-	CARD32		dstFormat,

-	CARD8		*alphaPtr,

-	int		alphaPitch,

-	int		width,

-	int		height,

-	int		flags

-   );

-   CARD32 *CPUToScreenAlphaTextureDstFormats;

-

-   Bool (*SetupForCPUToScreenTexture2) (

-	ScrnInfoPtr	pScrn,

-	int		op,

-	CARD32		srcFormat,

-	CARD32		dstFormat,

-	CARD8		*texPtr,

-	int		texPitch,

-	int		width,

-	int		height,

-	int		flags

-   );

-   CARD32 *CPUToScreenTextureDstFormats;

-} XAAInfoRec, *XAAInfoRecPtr;

-

-#define SET_SYNC_FLAG(infoRec)	(infoRec)->NeedToSync = TRUE

-

-

-extern _X_EXPORT Bool

-XAAInit(

-    ScreenPtr pScreen,

-    XAAInfoRecPtr infoRec

-);

-

-extern _X_EXPORT XAAInfoRecPtr XAACreateInfoRec(void);

-

-extern _X_EXPORT void

-XAADestroyInfoRec(

-    XAAInfoRecPtr infoRec

-);

-

-typedef void (*DepthChangeFuncPtr) (ScrnInfoPtr pScrn, int depth);

-

-extern _X_EXPORT Bool

-XAAInitDualFramebufferOverlay(

-   ScreenPtr pScreen, 

-   DepthChangeFuncPtr callback

-);

-

-#endif /* _XAA_H */

+
+#ifndef _XAA_H
+#define _XAA_H
+
+#define XAA_VERSION_MAJOR   1
+#define XAA_VERSION_MINOR   2
+#define XAA_VERSION_RELEASE 1
+
+/*
+
+   ******** OPERATION SPECIFIC FLAGS *********
+
+   **** solid/dashed line flags ****
+ 
+---------               --------
+23           LINE_PATTERN_LSBFIRST_MSBJUSTIFIED
+22           LINE_PATTERN_LSBFIRST_LSBJUSTIFIED
+21           LINE_PATTERN_MSBFIRST_MSBJUSTIFIED
+20           LINE_PATTERN_MSBFIRST_LSBJUSTIFIED
+19           LINE_PATTERN_POWER_OF_2_ONLY
+18           LINE_LIMIT_COORDS
+17                         .
+16                         .
+---------               -------
+
+   **** screen to screen copy flags ****
+
+---------               --------
+23           ONLY_LEFT_TO_RIGHT_BITBLT
+22           ONLY_TWO_BITBLT_DIRECTIONS
+21                         .
+20                         .
+19                         .
+18                         .
+17                         .
+16                         .
+---------               -------
+
+   ****  clipping flags ****
+
+---------               --------
+23                         .
+22           HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND
+21           HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY
+20           HARDWARE_CLIP_MONO_8x8_FILL
+19           HARDWARE_CLIP_COLOR_8x8_FILL    
+18           HARDWARE_CLIP_SOLID_FILL
+17           HARDWARE_CLIP_DASHED_LINE
+16           HARDWARE_CLIP_SOLID_LINE
+---------               -------
+
+   ****  hardware pattern flags ****
+
+---------               --------
+23                         .
+22                         .
+21           HARDWARE_PATTERN_SCREEN_ORIGIN
+20                         .
+19                         .
+18                         .
+17           HARDWARE_PATTERN_PROGRAMMED_ORIGIN
+16           HARDWARE_PATTERN_PROGRAMMED_BITS
+---------               -------
+
+   ****  write pixmap flags ****
+
+---------               --------
+23                         .
+22                         .
+21                         .
+20                         .
+19                         .
+18                         .
+17                         .
+16           CONVERT_32BPP_TO_24BPP
+---------               -------
+
+   ******** GENERIC FLAGS *********
+
+---------               -------
+15           SYNC_AFTER_COLOR_EXPAND
+14           CPU_TRANSFER_PAD_QWORD
+13                         .
+12           LEFT_EDGE_CLIPPING_NEGATIVE_X
+11	     LEFT_EDGE_CLIPPING
+10	     CPU_TRANSFER_BASE_FIXED
+ 9           BIT_ORDER_IN_BYTE_MSBFIRST           
+ 8           TRANSPARENCY_GXCOPY_ONLY
+---------               -------
+ 7           NO_TRANSPARENCY
+ 6           TRANSPARENCY_ONLY
+ 5           ROP_NEEDS_SOURCE
+ 4           TRIPLE_BITS_24BPP
+ 3           RGB_EQUAL
+ 2           NO_PLANEMASK
+ 1           NO_GXCOPY
+ 0           GXCOPY_ONLY
+---------               -------
+
+
+*/
+
+#include "gcstruct.h"
+#include "pixmapstr.h"
+#include "xf86str.h"
+#include "regionstr.h"
+#include "xf86fbman.h"
+
+#include "picturestr.h"
+
+/* Flags */
+#define PIXMAP_CACHE			0x00000001
+#define MICROSOFT_ZERO_LINE_BIAS	0x00000002
+#define OFFSCREEN_PIXMAPS		0x00000004
+#define LINEAR_FRAMEBUFFER		0x00000008
+
+/* GC fg, bg, and planemask restrictions */
+#define GXCOPY_ONLY			0x00000001
+#define NO_GXCOPY			0x00000002
+#define NO_PLANEMASK			0x00000004
+#define RGB_EQUAL			0x00000008
+#define TRIPLE_BITS_24BPP		0x00000010
+#define ROP_NEEDS_SOURCE		0x00000020
+
+/* transparency restrictions */
+#define TRANSPARENCY_ONLY		0x00000040
+#define NO_TRANSPARENCY			0x00000080
+#define TRANSPARENCY_GXCOPY_ONLY     	0x00000100
+
+/* bit order restrictions */
+#define BIT_ORDER_IN_BYTE_MSBFIRST	0x00000200
+#define BIT_ORDER_IN_BYTE_LSBFIRST	0x00000000
+
+/* transfer base restriction */
+#define CPU_TRANSFER_BASE_FIXED		0x00000400
+
+/* skipleft restrictions */
+#define LEFT_EDGE_CLIPPING		0x00000800
+#define LEFT_EDGE_CLIPPING_NEGATIVE_X	0x00001000
+
+/* data padding */
+#define CPU_TRANSFER_PAD_DWORD		0x00000000
+#define CPU_TRANSFER_PAD_QWORD		0x00004000
+#define SCANLINE_PAD_DWORD		0x00000000
+
+#define SYNC_AFTER_COLOR_EXPAND		0x00008000
+#define SYNC_AFTER_IMAGE_WRITE		SYNC_AFTER_COLOR_EXPAND
+
+/* hardware pattern */
+#define HARDWARE_PATTERN_PROGRAMMED_BITS	0x00010000
+#define HARDWARE_PATTERN_PROGRAMMED_ORIGIN	0x00020000
+#define HARDWARE_PATTERN_SCREEN_ORIGIN		0x00200000
+
+/* copyarea flags */
+#define ONLY_TWO_BITBLT_DIRECTIONS	0x00400000
+#define ONLY_LEFT_TO_RIGHT_BITBLT	0x00800000
+
+/* line flags */
+#define LINE_PATTERN_LSBFIRST_MSBJUSTIFIED	0x00800000
+#define LINE_PATTERN_LSBFIRST_LSBJUSTIFIED	0x00400000
+#define LINE_PATTERN_MSBFIRST_MSBJUSTIFIED	0x00200000
+#define LINE_PATTERN_MSBFIRST_LSBJUSTIFIED	0x00100000
+#define LINE_PATTERN_POWER_OF_2_ONLY		0x00080000
+#define LINE_LIMIT_COORDS			0x00040000
+
+/* clipping flags */
+#define HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND	0x00400000
+#define HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY		0x00200000
+#define HARDWARE_CLIP_MONO_8x8_FILL			0x00100000
+#define HARDWARE_CLIP_COLOR_8x8_FILL			0x00080000
+#define HARDWARE_CLIP_SOLID_FILL			0x00040000
+#define HARDWARE_CLIP_DASHED_LINE			0x00020000
+#define HARDWARE_CLIP_SOLID_LINE			0x00010000
+
+#define HARDWARE_CLIP_LINE				0x00000000
+
+/* image write flags */
+#define CONVERT_32BPP_TO_24BPP			0x00010000
+
+/* pixmap cache flags */
+#define CACHE_MONO_8x8			0x00000001
+#define CACHE_COLOR_8x8			0x00000002
+#define DO_NOT_BLIT_STIPPLES		0x00000004
+#define DO_NOT_TILE_MONO_DATA		0x00000008
+#define DO_NOT_TILE_COLOR_DATA		0x00000010
+
+#define DEGREES_0	0
+#define DEGREES_90	1
+#define DEGREES_180	2
+#define DEGREES_270	3
+
+#define OMIT_LAST	1
+
+/* render flags */
+
+#define XAA_RENDER_POWER_OF_2_TILE_ONLY	0x00000008
+#define XAA_RENDER_NO_SRC_ALPHA		0x00000004
+#define XAA_RENDER_IMPRECISE_ONLY	0x00000002
+#define XAA_RENDER_NO_TILE		0x00000001
+
+#define XAA_RENDER_REPEAT		0x00000001
+
+typedef void (*ValidateGCProcPtr) (GCPtr pGC,
+                                   unsigned long changes, DrawablePtr pDraw);
+
+typedef struct {
+    unsigned char *bits;
+    int width;
+    int height;
+    int yoff;
+    int srcwidth;
+    int start;
+    int end;
+} NonTEGlyphInfo, *NonTEGlyphPtr;
+
+typedef struct {
+    int x;
+    int y;
+    int w;
+    int h;
+    int orig_w;
+    int orig_h;
+    unsigned long serialNumber;
+    int pat0;
+    int pat1;
+    int fg;
+    int bg;
+    int trans_color;
+    DDXPointPtr offsets;
+    DevUnion devPrivate;
+} XAACacheInfoRec, *XAACacheInfoPtr;
+
+typedef struct _PixmapLink {
+    PixmapPtr pPix;
+    struct _PixmapLink *next;
+    FBAreaPtr area;
+} PixmapLink, *PixmapLinkPtr;
+
+typedef struct _XAAInfoRec {
+    ScrnInfoPtr pScrn;
+    int Flags;
+
+    void (*Sync) (ScrnInfoPtr pScrn);
+
+    /* Restore Accel State is a driver callback that is used
+     * when another screen on the same device has been active.
+     * This allows multihead on a single device to work.
+     * If The entityProp has IS_SHARED_ACCEL defined then this
+     * function is required.
+     */
+
+    void (*RestoreAccelState) (ScrnInfoPtr pScrn);
+
+   /***************** Low Level *****************/
+
+/* Blits */
+    void (*SetupForScreenToScreenCopy) (ScrnInfoPtr pScrn,
+                                        int xdir, int ydir,
+                                        int rop,
+                                        unsigned int planemask,
+                                        int trans_color);
+    int ScreenToScreenCopyFlags;
+
+    void (*SubsequentScreenToScreenCopy) (ScrnInfoPtr pScrn,
+                                          int xsrc, int ysrc,
+                                          int xdst, int ydst, int w, int h);
+
+/* Solid fills */
+    void (*SetupForSolidFill) (ScrnInfoPtr pScrn,
+                               int color, int rop, unsigned int planemask);
+    int SolidFillFlags;
+
+    void (*SubsequentSolidFillRect) (ScrnInfoPtr pScrn,
+                                     int x, int y, int w, int h);
+
+    void (*SubsequentSolidFillTrap) (ScrnInfoPtr pScrn,
+                                     int y, int h,
+                                     int left, int dxL, int dyL, int eL,
+                                     int right, int dxR, int dyR, int eR);
+
+/* Solid lines */
+
+    void (*SetupForSolidLine) (ScrnInfoPtr pScrn,
+                               int color, int rop, unsigned int planemask);
+    int SolidLineFlags;
+
+    void (*SubsequentSolidTwoPointLine) (ScrnInfoPtr pScrn,
+                                         int xa, int ya, int xb, int yb,
+                                         int flags);
+
+    void (*SubsequentSolidBresenhamLine) (ScrnInfoPtr pScrn,
+                                          int x, int y, int absmaj, int absmin,
+                                          int err, int len, int octant);
+    int SolidBresenhamLineErrorTermBits;
+
+    void (*SubsequentSolidHorVertLine) (ScrnInfoPtr pScrn,
+                                        int x, int y, int len, int dir);
+
+/* Dashed lines */
+
+    void (*SetupForDashedLine) (ScrnInfoPtr pScrn,
+                                int fg, int bg,
+                                int rop,
+                                unsigned int planemask,
+                                int length, unsigned char *pattern);
+    int DashedLineFlags;
+    int DashPatternMaxLength;
+
+    void (*SubsequentDashedTwoPointLine) (ScrnInfoPtr pScrn,
+                                          int xa, int ya, int xb, int yb,
+                                          int flags, int phase);
+
+    void (*SubsequentDashedBresenhamLine) (ScrnInfoPtr pScrn,
+                                           int x, int y, int absmaj, int absmin,
+                                           int err, int len, int flags,
+                                           int phase);
+    int DashedBresenhamLineErrorTermBits;
+
+/* Clipper */
+
+    void (*SetClippingRectangle) (ScrnInfoPtr pScrn,
+                                  int left, int top, int right, int bottom);
+    int ClippingFlags;
+
+    void (*DisableClipping) (ScrnInfoPtr pScrn);
+
+/* 8x8 mono pattern fills */
+    void (*SetupForMono8x8PatternFill) (ScrnInfoPtr pScrn,
+                                        int patx, int paty,
+                                        int fg, int bg,
+                                        int rop, unsigned int planemask);
+    int Mono8x8PatternFillFlags;
+
+    void (*SubsequentMono8x8PatternFillRect) (ScrnInfoPtr pScrn,
+                                              int patx, int paty,
+                                              int x, int y, int w, int h);
+
+    void (*SubsequentMono8x8PatternFillTrap) (ScrnInfoPtr pScrn,
+                                              int patx, int paty,
+                                              int y, int h,
+                                              int left, int dxL, int dyL,
+                                              int eL, int right, int dxR,
+                                              int dyR, int eR);
+
+/* 8x8 color pattern fills */
+
+    void (*SetupForColor8x8PatternFill) (ScrnInfoPtr pScrn,
+                                         int patx, int paty,
+                                         int rop,
+                                         unsigned int planemask,
+                                         int transparency_color);
+    int Color8x8PatternFillFlags;
+
+    void (*SubsequentColor8x8PatternFillRect) (ScrnInfoPtr pScrn,
+                                               int patx, int paty,
+                                               int x, int y, int w, int h);
+
+    void (*SubsequentColor8x8PatternFillTrap) (ScrnInfoPtr pScrn,
+                                               int patx, int paty,
+                                               int y, int h,
+                                               int left, int dxL, int dyL,
+                                               int eL, int right, int dxR,
+                                               int dyR, int eR);
+
+/* Color expansion */
+
+    void (*SetupForCPUToScreenColorExpandFill) (ScrnInfoPtr pScrn,
+                                                int fg, int bg,
+                                                int rop,
+                                                unsigned int planemask);
+    int CPUToScreenColorExpandFillFlags;
+
+    void (*SubsequentCPUToScreenColorExpandFill) (ScrnInfoPtr pScrn,
+                                                  int x, int y, int w, int h,
+                                                  int skipleft);
+
+    unsigned char *ColorExpandBase;
+    int ColorExpandRange;
+
+/* Scanline color expansion  */
+
+    void (*SetupForScanlineCPUToScreenColorExpandFill) (ScrnInfoPtr pScrn,
+                                                        int fg, int bg,
+                                                        int rop,
+                                                        unsigned int planemask);
+    int ScanlineCPUToScreenColorExpandFillFlags;
+
+    void (*SubsequentScanlineCPUToScreenColorExpandFill) (ScrnInfoPtr pScrn,
+                                                          int x, int y, int w,
+                                                          int h, int skipleft);
+
+    void (*SubsequentColorExpandScanline) (ScrnInfoPtr pScrn, int bufno);
+
+    int NumScanlineColorExpandBuffers;
+    unsigned char **ScanlineColorExpandBuffers;
+
+/* Screen to screen color expansion */
+
+    void (*SetupForScreenToScreenColorExpandFill) (ScrnInfoPtr pScrn,
+                                                   int fg, int bg,
+                                                   int rop,
+                                                   unsigned int planemask);
+    int ScreenToScreenColorExpandFillFlags;
+
+    void (*SubsequentScreenToScreenColorExpandFill) (ScrnInfoPtr pScrn,
+                                                     int x, int y, int w, int h,
+                                                     int srcx, int srcy,
+                                                     int skipleft);
+
+/*  Image transfers */
+
+    void (*SetupForImageWrite) (ScrnInfoPtr pScrn,
+                                int rop,
+                                unsigned int planemask,
+                                int transparency_color, int bpp, int depth);
+    int ImageWriteFlags;
+
+    void (*SubsequentImageWriteRect) (ScrnInfoPtr pScrn,
+                                      int x, int y, int w, int h, int skipleft);
+    unsigned char *ImageWriteBase;
+    int ImageWriteRange;
+
+/*  Scanline Image transfers */
+
+    void (*SetupForScanlineImageWrite) (ScrnInfoPtr pScrn,
+                                        int rop,
+                                        unsigned int planemask,
+                                        int transparency_color,
+                                        int bpp, int depth);
+    int ScanlineImageWriteFlags;
+
+    void (*SubsequentScanlineImageWriteRect) (ScrnInfoPtr pScrn,
+                                              int x, int y, int w, int h,
+                                              int skipleft);
+
+    void (*SubsequentImageWriteScanline) (ScrnInfoPtr pScrn, int bufno);
+
+    int NumScanlineImageWriteBuffers;
+    unsigned char **ScanlineImageWriteBuffers;
+
+    /* Image Reads - OBSOLETE AND NOT USED */
+
+    void (*SetupForImageRead) (ScrnInfoPtr pScrn, int bpp, int depth);
+    int ImageReadFlags;
+
+    unsigned char *ImageReadBase;
+    int ImageReadRange;
+
+    void (*SubsequentImageReadRect) (ScrnInfoPtr pScrn,
+                                     int x, int y, int w, int h);
+
+   /***************** Mid Level *****************/
+    void (*ScreenToScreenBitBlt) (ScrnInfoPtr pScrn,
+                                  int nbox,
+                                  DDXPointPtr pptSrc,
+                                  BoxPtr pbox,
+                                  int xdir, int ydir,
+                                  int alu, unsigned int planmask);
+    int ScreenToScreenBitBltFlags;
+
+    void (*WriteBitmap) (ScrnInfoPtr pScrn,
+                         int x, int y, int w, int h,
+                         unsigned char *src,
+                         int srcwidth,
+                         int skipleft,
+                         int fg, int bg, int rop, unsigned int planemask);
+    int WriteBitmapFlags;
+
+    void (*FillSolidRects) (ScrnInfoPtr pScrn,
+                            int fg, int rop,
+                            unsigned int planemask, int nBox, BoxPtr pBox);
+    int FillSolidRectsFlags;
+
+    void (*FillMono8x8PatternRects) (ScrnInfoPtr pScrn,
+                                     int fg, int bg, int rop,
+                                     unsigned int planemask,
+                                     int nBox,
+                                     BoxPtr pBox,
+                                     int pat0, int pat1, int xorg, int yorg);
+    int FillMono8x8PatternRectsFlags;
+
+    void (*FillColor8x8PatternRects) (ScrnInfoPtr pScrn,
+                                      int rop,
+                                      unsigned int planemask,
+                                      int nBox,
+                                      BoxPtr pBox,
+                                      int xorg, int yorg,
+                                      XAACacheInfoPtr pCache);
+    int FillColor8x8PatternRectsFlags;
+
+    void (*FillCacheBltRects) (ScrnInfoPtr pScrn,
+                               int rop,
+                               unsigned int planemask,
+                               int nBox,
+                               BoxPtr pBox,
+                               int xorg, int yorg, XAACacheInfoPtr pCache);
+    int FillCacheBltRectsFlags;
+
+    void (*FillColorExpandRects) (ScrnInfoPtr pScrn,
+                                  int fg, int bg, int rop,
+                                  unsigned int planemask,
+                                  int nBox,
+                                  BoxPtr pBox,
+                                  int xorg, int yorg, PixmapPtr pPix);
+    int FillColorExpandRectsFlags;
+
+    void (*FillCacheExpandRects) (ScrnInfoPtr pScrn,
+                                  int fg, int bg, int rop,
+                                  unsigned int planemask,
+                                  int nBox,
+                                  BoxPtr pBox,
+                                  int xorg, int yorg, PixmapPtr pPix);
+    int FillCacheExpandRectsFlags;
+
+    void (*FillImageWriteRects) (ScrnInfoPtr pScrn,
+                                 int rop,
+                                 unsigned int planemask,
+                                 int nBox,
+                                 BoxPtr pBox,
+                                 int xorg, int yorg, PixmapPtr pPix);
+    int FillImageWriteRectsFlags;
+
+    void (*FillSolidSpans) (ScrnInfoPtr pScrn,
+                            int fg, int rop,
+                            unsigned int planemask,
+                            int n,
+                            DDXPointPtr points, int *widths, int fSorted);
+    int FillSolidSpansFlags;
+
+    void (*FillMono8x8PatternSpans) (ScrnInfoPtr pScrn,
+                                     int fg, int bg, int rop,
+                                     unsigned int planemask,
+                                     int n,
+                                     DDXPointPtr points,
+                                     int *widths,
+                                     int fSorted,
+                                     int pat0, int pat1, int xorg, int yorg);
+    int FillMono8x8PatternSpansFlags;
+
+    void (*FillColor8x8PatternSpans) (ScrnInfoPtr pScrn,
+                                      int rop,
+                                      unsigned int planemask,
+                                      int n,
+                                      DDXPointPtr points,
+                                      int *widths,
+                                      int fSorted,
+                                      XAACacheInfoPtr pCache,
+                                      int xorg, int yorg);
+    int FillColor8x8PatternSpansFlags;
+
+    void (*FillCacheBltSpans) (ScrnInfoPtr pScrn,
+                               int rop,
+                               unsigned int planemask,
+                               int n,
+                               DDXPointPtr points,
+                               int *widths,
+                               int fSorted,
+                               XAACacheInfoPtr pCache, int xorg, int yorg);
+    int FillCacheBltSpansFlags;
+
+    void (*FillColorExpandSpans) (ScrnInfoPtr pScrn,
+                                  int fg, int bg, int rop,
+                                  unsigned int planemask,
+                                  int n,
+                                  DDXPointPtr points,
+                                  int *widths,
+                                  int fSorted,
+                                  int xorg, int yorg, PixmapPtr pPix);
+    int FillColorExpandSpansFlags;
+
+    void (*FillCacheExpandSpans) (ScrnInfoPtr pScrn,
+                                  int fg, int bg, int rop,
+                                  unsigned int planemask,
+                                  int n,
+                                  DDXPointPtr ppt,
+                                  int *pwidth,
+                                  int fSorted,
+                                  int xorg, int yorg, PixmapPtr pPix);
+    int FillCacheExpandSpansFlags;
+
+    void (*TEGlyphRenderer) (ScrnInfoPtr pScrn,
+                             int x, int y, int w, int h, int skipleft,
+                             int startline, unsigned int **glyphs,
+                             int glyphWidth, int fg, int bg, int rop,
+                             unsigned planemask);
+    int TEGlyphRendererFlags;
+
+    void (*NonTEGlyphRenderer) (ScrnInfoPtr pScrn,
+                                int x, int y, int n,
+                                NonTEGlyphPtr glyphs,
+                                BoxPtr pbox,
+                                int fg, int rop, unsigned int planemask);
+    int NonTEGlyphRendererFlags;
+
+    void (*WritePixmap) (ScrnInfoPtr pScrn,
+                         int x, int y, int w, int h,
+                         unsigned char *src,
+                         int srcwidth,
+                         int rop,
+                         unsigned int planemask,
+                         int transparency_color, int bpp, int depth);
+    int WritePixmapFlags;
+
+    void (*ReadPixmap) (ScrnInfoPtr pScrn,
+                        int x, int y, int w, int h,
+                        unsigned char *dst, int dstwidth, int bpp, int depth);
+    int ReadPixmapFlags;
+
+   /***************** GC Level *****************/
+    RegionPtr (*CopyArea) (DrawablePtr pSrcDrawable,
+                           DrawablePtr pDstDrawable,
+                           GC * pGC,
+                           int srcx, int srcy,
+                           int width, int height, int dstx, int dsty);
+    int CopyAreaFlags;
+
+    RegionPtr (*CopyPlane) (DrawablePtr pSrc,
+                            DrawablePtr pDst,
+                            GCPtr pGC,
+                            int srcx, int srcy,
+                            int width, int height,
+                            int dstx, int dsty, unsigned long bitPlane);
+    int CopyPlaneFlags;
+
+    void (*PushPixelsSolid) (GCPtr pGC,
+                             PixmapPtr pBitMap,
+                             DrawablePtr pDrawable,
+                             int dx, int dy, int xOrg, int yOrg);
+    int PushPixelsFlags;
+
+   /** PolyFillRect **/
+
+    void (*PolyFillRectSolid) (DrawablePtr pDraw,
+                               GCPtr pGC, int nrectFill, xRectangle *prectInit);
+    int PolyFillRectSolidFlags;
+
+    void (*PolyFillRectStippled) (DrawablePtr pDraw,
+                                  GCPtr pGC,
+                                  int nrectFill, xRectangle *prectInit);
+    int PolyFillRectStippledFlags;
+
+    void (*PolyFillRectOpaqueStippled) (DrawablePtr pDraw,
+                                        GCPtr pGC,
+                                        int nrectFill, xRectangle *prectInit);
+    int PolyFillRectOpaqueStippledFlags;
+
+    void (*PolyFillRectTiled) (DrawablePtr pDraw,
+                               GCPtr pGC, int nrectFill, xRectangle *prectInit);
+    int PolyFillRectTiledFlags;
+
+   /** FillSpans **/
+
+    void (*FillSpansSolid) (DrawablePtr pDraw,
+                            GCPtr pGC,
+                            int nInit,
+                            DDXPointPtr ppt, int *pwidth, int fSorted);
+    int FillSpansSolidFlags;
+
+    void (*FillSpansStippled) (DrawablePtr pDraw,
+                               GCPtr pGC,
+                               int nInit,
+                               DDXPointPtr ppt, int *pwidth, int fSorted);
+    int FillSpansStippledFlags;
+
+    void (*FillSpansOpaqueStippled) (DrawablePtr pDraw,
+                                     GCPtr pGC,
+                                     int nInit,
+                                     DDXPointPtr ppt, int *pwidth, int fSorted);
+    int FillSpansOpaqueStippledFlags;
+
+    void (*FillSpansTiled) (DrawablePtr pDraw,
+                            GCPtr pGC,
+                            int nInit,
+                            DDXPointPtr ppt, int *pwidth, int fSorted);
+    int FillSpansTiledFlags;
+
+    int (*PolyText8TE) (DrawablePtr pDraw,
+                        GCPtr pGC, int x, int y, int count, char *chars);
+    int PolyText8TEFlags;
+
+    int (*PolyText16TE) (DrawablePtr pDraw,
+                         GCPtr pGC,
+                         int x, int y, int count, unsigned short *chars);
+    int PolyText16TEFlags;
+
+    void (*ImageText8TE) (DrawablePtr pDraw,
+                          GCPtr pGC, int x, int y, int count, char *chars);
+    int ImageText8TEFlags;
+
+    void (*ImageText16TE) (DrawablePtr pDraw,
+                           GCPtr pGC,
+                           int x, int y, int count, unsigned short *chars);
+    int ImageText16TEFlags;
+
+    void (*ImageGlyphBltTE) (DrawablePtr pDrawable,
+                             GCPtr pGC,
+                             int xInit, int yInit,
+                             unsigned int nglyph,
+                             CharInfoPtr * ppci, pointer pglyphBase);
+    int ImageGlyphBltTEFlags;
+
+    void (*PolyGlyphBltTE) (DrawablePtr pDrawable,
+                            GCPtr pGC,
+                            int xInit, int yInit,
+                            unsigned int nglyph,
+                            CharInfoPtr * ppci, pointer pglyphBase);
+    int PolyGlyphBltTEFlags;
+
+    int (*PolyText8NonTE) (DrawablePtr pDraw,
+                           GCPtr pGC, int x, int y, int count, char *chars);
+    int PolyText8NonTEFlags;
+
+    int (*PolyText16NonTE) (DrawablePtr pDraw,
+                            GCPtr pGC,
+                            int x, int y, int count, unsigned short *chars);
+    int PolyText16NonTEFlags;
+
+    void (*ImageText8NonTE) (DrawablePtr pDraw,
+                             GCPtr pGC, int x, int y, int count, char *chars);
+    int ImageText8NonTEFlags;
+
+    void (*ImageText16NonTE) (DrawablePtr pDraw,
+                              GCPtr pGC,
+                              int x, int y, int count, unsigned short *chars);
+    int ImageText16NonTEFlags;
+
+    void (*ImageGlyphBltNonTE) (DrawablePtr pDrawable,
+                                GCPtr pGC,
+                                int xInit, int yInit,
+                                unsigned int nglyph,
+                                CharInfoPtr * ppci, pointer pglyphBase);
+    int ImageGlyphBltNonTEFlags;
+
+    void (*PolyGlyphBltNonTE) (DrawablePtr pDrawable,
+                               GCPtr pGC,
+                               int xInit, int yInit,
+                               unsigned int nglyph,
+                               CharInfoPtr * ppci, pointer pglyphBase);
+    int PolyGlyphBltNonTEFlags;
+
+    void (*PolyRectangleThinSolid) (DrawablePtr pDrawable,
+                                    GCPtr pGC,
+                                    int nRectsInit, xRectangle *pRectsInit);
+    int PolyRectangleThinSolidFlags;
+
+    void (*PolylinesWideSolid) (DrawablePtr pDrawable,
+                                GCPtr pGC, int mode, int npt, DDXPointPtr pPts);
+    int PolylinesWideSolidFlags;
+
+    void (*PolylinesThinSolid) (DrawablePtr pDrawable,
+                                GCPtr pGC, int mode, int npt, DDXPointPtr pPts);
+    int PolylinesThinSolidFlags;
+
+    void (*PolySegmentThinSolid) (DrawablePtr pDrawable,
+                                  GCPtr pGC, int nseg, xSegment * pSeg);
+    int PolySegmentThinSolidFlags;
+
+    void (*PolylinesThinDashed) (DrawablePtr pDrawable,
+                                 GCPtr pGC,
+                                 int mode, int npt, DDXPointPtr pPts);
+    int PolylinesThinDashedFlags;
+
+    void (*PolySegmentThinDashed) (DrawablePtr pDrawable,
+                                   GCPtr pGC, int nseg, xSegment * pSeg);
+    int PolySegmentThinDashedFlags;
+
+    void (*FillPolygonSolid) (DrawablePtr pDrawable,
+                              GCPtr pGC,
+                              int shape,
+                              int mode, int count, DDXPointPtr ptsIn);
+    int FillPolygonSolidFlags;
+
+    void (*FillPolygonStippled) (DrawablePtr pDrawable,
+                                 GCPtr pGC,
+                                 int shape,
+                                 int mode, int count, DDXPointPtr ptsIn);
+    int FillPolygonStippledFlags;
+
+    void (*FillPolygonOpaqueStippled) (DrawablePtr pDrawable,
+                                       GCPtr pGC,
+                                       int shape,
+                                       int mode, int count, DDXPointPtr ptsIn);
+    int FillPolygonOpaqueStippledFlags;
+
+    void (*FillPolygonTiled) (DrawablePtr pDrawable,
+                              GCPtr pGC,
+                              int shape,
+                              int mode, int count, DDXPointPtr ptsIn);
+    int FillPolygonTiledFlags;
+
+    void (*PolyFillArcSolid) (DrawablePtr pDraw,
+                              GCPtr pGC, int narcs, xArc * parcs);
+    int PolyFillArcSolidFlags;
+
+    void (*PutImage) (DrawablePtr pDraw,
+                      GCPtr pGC,
+                      int depth,
+                      int x,
+                      int y,
+                      int w, int h, int leftPad, int format, char *pImage);
+    int PutImageFlags;
+
+    /* Validation masks */
+
+    unsigned long FillSpansMask;
+    ValidateGCProcPtr ValidateFillSpans;
+    unsigned long SetSpansMask;
+    ValidateGCProcPtr ValidateSetSpans;
+    unsigned long PutImageMask;
+    ValidateGCProcPtr ValidatePutImage;
+    unsigned long CopyAreaMask;
+    ValidateGCProcPtr ValidateCopyArea;
+    unsigned long CopyPlaneMask;
+    ValidateGCProcPtr ValidateCopyPlane;
+    unsigned long PolyPointMask;
+    ValidateGCProcPtr ValidatePolyPoint;
+    unsigned long PolylinesMask;
+    ValidateGCProcPtr ValidatePolylines;
+    unsigned long PolySegmentMask;
+    ValidateGCProcPtr ValidatePolySegment;
+    unsigned long PolyRectangleMask;
+    ValidateGCProcPtr ValidatePolyRectangle;
+    unsigned long PolyArcMask;
+    ValidateGCProcPtr ValidatePolyArc;
+    unsigned long FillPolygonMask;
+    ValidateGCProcPtr ValidateFillPolygon;
+    unsigned long PolyFillRectMask;
+    ValidateGCProcPtr ValidatePolyFillRect;
+    unsigned long PolyFillArcMask;
+    ValidateGCProcPtr ValidatePolyFillArc;
+    unsigned long PolyText8Mask;
+    ValidateGCProcPtr ValidatePolyText8;
+    unsigned long PolyText16Mask;
+    ValidateGCProcPtr ValidatePolyText16;
+    unsigned long ImageText8Mask;
+    ValidateGCProcPtr ValidateImageText8;
+    unsigned long ImageText16Mask;
+    ValidateGCProcPtr ValidateImageText16;
+    unsigned long PolyGlyphBltMask;
+    ValidateGCProcPtr ValidatePolyGlyphBlt;
+    unsigned long ImageGlyphBltMask;
+    ValidateGCProcPtr ValidateImageGlyphBlt;
+    unsigned long PushPixelsMask;
+    ValidateGCProcPtr ValidatePushPixels;
+
+    void (*ComputeDash) (GCPtr pGC);
+
+    /* Pixmap Cache */
+
+    int PixmapCacheFlags;
+    Bool UsingPixmapCache;
+    Bool CanDoMono8x8;
+    Bool CanDoColor8x8;
+
+    void (*InitPixmapCache) (ScreenPtr pScreen, RegionPtr areas, pointer data);
+    void (*ClosePixmapCache) (ScreenPtr pScreen);
+
+    int (*StippledFillChooser) (GCPtr pGC);
+    int (*OpaqueStippledFillChooser) (GCPtr pGC);
+    int (*TiledFillChooser) (GCPtr pGC);
+
+    int CachePixelGranularity;
+    int MaxCacheableTileWidth;
+    int MaxCacheableTileHeight;
+    int MaxCacheableStippleWidth;
+    int MaxCacheableStippleHeight;
+
+     XAACacheInfoPtr(*CacheTile) (ScrnInfoPtr Scrn, PixmapPtr pPix);
+     XAACacheInfoPtr(*CacheStipple) (ScrnInfoPtr Scrn, PixmapPtr pPix,
+                                     int fg, int bg);
+     XAACacheInfoPtr(*CacheMonoStipple) (ScrnInfoPtr Scrn, PixmapPtr pPix);
+     XAACacheInfoPtr(*CacheMono8x8Pattern) (ScrnInfoPtr Scrn, int pat0,
+                                            int pat1);
+     XAACacheInfoPtr(*CacheColor8x8Pattern) (ScrnInfoPtr Scrn, PixmapPtr pPix,
+                                             int fg, int bg);
+
+    int MonoPatternPitch;
+    int CacheWidthMono8x8Pattern;
+    int CacheHeightMono8x8Pattern;
+
+    int ColorPatternPitch;
+    int CacheWidthColor8x8Pattern;
+    int CacheHeightColor8x8Pattern;
+
+    int CacheColorExpandDensity;
+
+    void (*WriteBitmapToCache) (ScrnInfoPtr pScrn,
+                                int x, int y, int w, int h,
+                                unsigned char *src,
+                                int srcwidth, int fg, int bg);
+    void (*WritePixmapToCache) (ScrnInfoPtr pScrn,
+                                int x, int y, int w, int h,
+                                unsigned char *src,
+                                int srcwidth, int bpp, int depth);
+    void (*WriteMono8x8PatternToCache) (ScrnInfoPtr pScrn,
+                                        XAACacheInfoPtr pCache);
+    void (*WriteColor8x8PatternToCache) (ScrnInfoPtr pScrn,
+                                         PixmapPtr pPix,
+                                         XAACacheInfoPtr pCache);
+
+    char *PixmapCachePrivate;
+
+    /* Miscellaneous */
+
+    GC ScratchGC;
+    int PreAllocSize;
+    unsigned char *PreAllocMem;
+
+    CharInfoPtr CharInfo[255];
+    NonTEGlyphInfo GlyphInfo[255];
+
+    unsigned int FullPlanemask; /* deprecated */
+
+    PixmapLinkPtr OffscreenPixmaps;
+    int maxOffPixWidth;
+    int maxOffPixHeight;
+
+    XAACacheInfoRec ScratchCacheInfoRec;
+
+    BoxPtr ClipBox;
+
+    Bool NeedToSync;
+
+    char *dgaSaves;
+
+    /* These can be supplied to override the defaults */
+
+    GetImageProcPtr GetImage;
+    GetSpansProcPtr GetSpans;
+    CopyWindowProcPtr CopyWindow;
+
+    unsigned int offscreenDepths;
+    Bool offscreenDepthsInitialized;
+
+    CARD32 FullPlanemasks[32];
+
+    Bool (*Composite) (CARD8 op,
+                       PicturePtr pSrc,
+                       PicturePtr pMask,
+                       PicturePtr pDst,
+                       INT16 xSrc,
+                       INT16 ySrc,
+                       INT16 xMask,
+                       INT16 yMask,
+                       INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
+
+    Bool (*Glyphs) (CARD8 op,
+                    PicturePtr pSrc,
+                    PicturePtr pDst,
+                    PictFormatPtr maskFormat,
+                    INT16 xSrc,
+                    INT16 ySrc,
+                    int nlist, GlyphListPtr list, GlyphPtr * glyphs);
+
+    /* The old SetupForCPUToScreenAlphaTexture function is no longer used because
+     * it doesn't pass in enough information to write a conforming
+     * implementation.  See SetupForCPUToScreenAlphaTexture2.
+     */
+    Bool (*SetupForCPUToScreenAlphaTexture) (ScrnInfoPtr pScrn,
+                                             int op,
+                                             CARD16 red,
+                                             CARD16 green,
+                                             CARD16 blue,
+                                             CARD16 alpha,
+                                             int alphaType,
+                                             CARD8 *alphaPtr,
+                                             int alphaPitch,
+                                             int width, int height, int flags);
+    void (*SubsequentCPUToScreenAlphaTexture) (ScrnInfoPtr pScrn,
+                                               int dstx,
+                                               int dsty,
+                                               int srcx,
+                                               int srcy, int width, int height);
+    int CPUToScreenAlphaTextureFlags;
+    CARD32 *CPUToScreenAlphaTextureFormats;
+
+    /* The old SetupForCPUToScreenTexture function is no longer used because
+     * it doesn't pass in enough information to write a conforming
+     * implementation.  See SetupForCPUToScreenTexture2.
+     */
+    Bool (*SetupForCPUToScreenTexture) (ScrnInfoPtr pScrn,
+                                        int op,
+                                        int texType,
+                                        CARD8 *texPtr,
+                                        int texPitch,
+                                        int width, int height, int flags);
+    void (*SubsequentCPUToScreenTexture) (ScrnInfoPtr pScrn,
+                                          int dstx,
+                                          int dsty,
+                                          int srcx,
+                                          int srcy, int width, int height);
+    int CPUToScreenTextureFlags;
+    CARD32 *CPUToScreenTextureFormats;
+
+    /* these were added for 4.3.0 */
+    BoxRec SolidLineLimits;
+    BoxRec DashedLineLimits;
+
+    /* These were added for X.Org 6.8.0 */
+    Bool (*SetupForCPUToScreenAlphaTexture2) (ScrnInfoPtr pScrn,
+                                              int op,
+                                              CARD16 red,
+                                              CARD16 green,
+                                              CARD16 blue,
+                                              CARD16 alpha,
+                                              CARD32 maskFormat,
+                                              CARD32 dstFormat,
+                                              CARD8 *alphaPtr,
+                                              int alphaPitch,
+                                              int width, int height, int flags);
+    CARD32 *CPUToScreenAlphaTextureDstFormats;
+
+    Bool (*SetupForCPUToScreenTexture2) (ScrnInfoPtr pScrn,
+                                         int op,
+                                         CARD32 srcFormat,
+                                         CARD32 dstFormat,
+                                         CARD8 *texPtr,
+                                         int texPitch,
+                                         int width, int height, int flags);
+    CARD32 *CPUToScreenTextureDstFormats;
+} XAAInfoRec, *XAAInfoRecPtr;
+
+#define SET_SYNC_FLAG(infoRec)	(infoRec)->NeedToSync = TRUE
+
+extern _X_EXPORT Bool
+ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec);
+
+extern _X_EXPORT XAAInfoRecPtr XAACreateInfoRec(void);
+
+extern _X_EXPORT void
+ XAADestroyInfoRec(XAAInfoRecPtr infoRec);
+
+typedef void (*DepthChangeFuncPtr) (ScrnInfoPtr pScrn, int depth);
+
+extern _X_EXPORT Bool
+ XAAInitDualFramebufferOverlay(ScreenPtr pScreen, DepthChangeFuncPtr callback);
+
+#endif                          /* _XAA_H */
diff --git a/xorg-server/hw/xfree86/xaa/xaaBitBlt.c b/xorg-server/hw/xfree86/xaa/xaaBitBlt.c
index 126a4ee65..c1595c497 100644
--- a/xorg-server/hw/xfree86/xaa/xaaBitBlt.c
+++ b/xorg-server/hw/xfree86/xaa/xaaBitBlt.c
@@ -1,221 +1,229 @@
-

-/* 

-   This is a lighter version of cfbBitBlt.  We calculate the boxes

-   when accelerating pixmap->screen and screen->screen copies. 

-   We also pass the GC to the doBitBlt function so that it has access

-   to the fg and bg so CopyPlane can use this. 

-*/

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "mi.h"

-#include "pixmapstr.h"

-#include "gcstruct.h"

-#include "windowstr.h"

-#include "xaalocal.h"

-

-

-RegionPtr

-XAABitBlt(

-    DrawablePtr pSrcDrawable,

-    DrawablePtr pDstDrawable,

-    GC *pGC,

-    int srcx, int srcy,

-    int width, int height,

-    int dstx, int dsty,

-    void (*doBitBlt)(DrawablePtr, DrawablePtr, GCPtr, RegionPtr, DDXPointPtr),

-    unsigned long bitPlane )

-{

-

-    RegionPtr prgnSrcClip = NULL; /* may be a new region, or just a copy */

-    RegionPtr prgnExposed;

-    Bool freeSrcClip = FALSE;

-    RegionRec rgnDst;

-    DDXPointPtr pptSrc, ppt;

-    DDXPointRec origDest;

-    BoxPtr pbox;

-    BoxRec fastBox;

-    int i, dx, dy, numRects;

-    xRectangle origSource;

-    int fastClip = 0;		/* for fast clipping with pixmap source */

-    int fastExpose = 0;		/* for fast exposures with pixmap source */

-

-    origSource.x = srcx;

-    origSource.y = srcy;

-    origSource.width = width;

-    origSource.height = height;

-    origDest.x = dstx;

-    origDest.y = dsty;

-

-    if (pSrcDrawable->pScreen->SourceValidate) {

-	(*pSrcDrawable->pScreen->SourceValidate) (

-			pSrcDrawable, srcx, srcy, width, height,

-			pGC->subWindowMode);

-    }

-

-    srcx += pSrcDrawable->x;

-    srcy += pSrcDrawable->y;

-

-    /* clip the source */

-    if (pSrcDrawable->type == DRAWABLE_PIXMAP) {

-	if ((pSrcDrawable == pDstDrawable) && (pGC->clientClipType == CT_NONE))

-	    prgnSrcClip = pGC->pCompositeClip;

-	else

-	    fastClip = 1;

-    } else {	/* Window */

-	if (pGC->subWindowMode == IncludeInferiors) {

-	    if (!((WindowPtr) pSrcDrawable)->parent) {

-		/*

-		 * special case bitblt from root window in

-		 * IncludeInferiors mode; just like from a pixmap

-		 */

-		fastClip = 1;

-	    } else if ((pSrcDrawable == pDstDrawable) &&

-		(pGC->clientClipType == CT_NONE)) {

-		prgnSrcClip = pGC->pCompositeClip;

-	    } else {

-		prgnSrcClip = NotClippedByChildren((WindowPtr)pSrcDrawable);

-		freeSrcClip = TRUE;

-	    }

-	} else {

-	    prgnSrcClip = &((WindowPtr)pSrcDrawable)->clipList;

-	}

-    }

-

-    fastBox.x1 = srcx;

-    fastBox.y1 = srcy;

-    fastBox.x2 = srcx + width;

-    fastBox.y2 = srcy + height;

-

-    /* Don't create a source region if we are doing a fast clip */

-    if (fastClip) {

-	fastExpose = 1;

-	/*

-	 * clip the source; if regions extend beyond the source size,

- 	 * make sure exposure events get sent

-	 */

-	if (fastBox.x1 < pSrcDrawable->x) {

-	    fastBox.x1 = pSrcDrawable->x;

-	    fastExpose = 0;

-	} 

-	if (fastBox.y1 < pSrcDrawable->y) {

-	    fastBox.y1 = pSrcDrawable->y;

-	    fastExpose = 0;

-	}

-	if (fastBox.x2 > pSrcDrawable->x + (int) pSrcDrawable->width) {

-	    fastBox.x2 = pSrcDrawable->x + (int) pSrcDrawable->width;

-	    fastExpose = 0;

-	}

-	if (fastBox.y2 > pSrcDrawable->y + (int) pSrcDrawable->height) {

-	    fastBox.y2 = pSrcDrawable->y + (int) pSrcDrawable->height;

-	    fastExpose = 0;

-	}

-    } else {

-	RegionInit(&rgnDst, &fastBox, 1);

-	RegionIntersect(&rgnDst, &rgnDst, prgnSrcClip);

-    }

-

-    dstx += pDstDrawable->x;

-    dsty += pDstDrawable->y;

-

-    if (pDstDrawable->type == DRAWABLE_WINDOW) {

-	if (!((WindowPtr)pDstDrawable)->realized) {

-	    if (!fastClip)

-		RegionUninit(&rgnDst);

-	    if (freeSrcClip)

-		RegionDestroy(prgnSrcClip);

-	    return NULL;

-	}

-    }

-

-    dx = srcx - dstx;

-    dy = srcy - dsty;

-

-    /* Translate and clip the dst to the destination composite clip */

-    if (fastClip) {

-	RegionPtr cclip;

-

-        /* Translate the region directly */

-        fastBox.x1 -= dx;

-        fastBox.x2 -= dx;

-        fastBox.y1 -= dy;

-        fastBox.y2 -= dy;

-

-	/* If the destination composite clip is one rectangle we can

-	   do the clip directly.  Otherwise we have to create a full

-	   blown region and call intersect */

-

-	cclip = pGC->pCompositeClip;

-        if (RegionNumRects(cclip) == 1) {

-	    BoxPtr pBox = RegionRects(cclip);

-

-	    if (fastBox.x1 < pBox->x1) fastBox.x1 = pBox->x1;

-	    if (fastBox.x2 > pBox->x2) fastBox.x2 = pBox->x2;

-	    if (fastBox.y1 < pBox->y1) fastBox.y1 = pBox->y1;

-	    if (fastBox.y2 > pBox->y2) fastBox.y2 = pBox->y2;

-

-	    /* Check to see if the region is empty */

-	    if (fastBox.x1 >= fastBox.x2 || fastBox.y1 >= fastBox.y2) {

-		RegionNull(&rgnDst);

-	    } else {

-		RegionInit(&rgnDst, &fastBox, 1);

-	    }

-	} else {

-	    /* We must turn off fastClip now, since we must create

-	       a full blown region.  It is intersected with the

-	       composite clip below. */

-	    fastClip = 0;

-	    RegionInit(&rgnDst, &fastBox,1);

-	}

-    } else {

-        RegionTranslate(&rgnDst, -dx, -dy);

-    }

-

-    if (!fastClip) {

-	RegionIntersect(&rgnDst, &rgnDst,

-				 pGC->pCompositeClip);

-    }

-

-    /* Do bit blitting */

-    numRects = RegionNumRects(&rgnDst);

-    if (numRects && width && height) {

-	if(!(pptSrc = (DDXPointPtr)malloc(numRects *

-						  sizeof(DDXPointRec)))) {

-	    RegionUninit(&rgnDst);

-	    if (freeSrcClip)

-		RegionDestroy(prgnSrcClip);

-	    return NULL;

-	}

-	pbox = RegionRects(&rgnDst);

-	ppt = pptSrc;

-	for (i = numRects; --i >= 0; pbox++, ppt++) {

-	    ppt->x = pbox->x1 + dx;

-	    ppt->y = pbox->y1 + dy;

-	}

-

-	(*doBitBlt) (pSrcDrawable, pDstDrawable, pGC, &rgnDst, pptSrc);

-	free(pptSrc);

-    }

-

-    prgnExposed = NULL;

-    if (pGC->fExpose) {

-        /* Pixmap sources generate a NoExposed (we return NULL to do this) */

-        if (!fastExpose)

-	    prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC,

-				  origSource.x, origSource.y,

-				  (int)origSource.width,

-				  (int)origSource.height,

-				  origDest.x, origDest.y, bitPlane);

-    }

-    RegionUninit(&rgnDst);

-    if (freeSrcClip)

-	RegionDestroy(prgnSrcClip);

-    return prgnExposed;

-}

+
+/* 
+   This is a lighter version of cfbBitBlt.  We calculate the boxes
+   when accelerating pixmap->screen and screen->screen copies. 
+   We also pass the GC to the doBitBlt function so that it has access
+   to the fg and bg so CopyPlane can use this. 
+*/
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "mi.h"
+#include "pixmapstr.h"
+#include "gcstruct.h"
+#include "windowstr.h"
+#include "xaalocal.h"
+
+RegionPtr
+XAABitBlt(DrawablePtr pSrcDrawable,
+          DrawablePtr pDstDrawable,
+          GC * pGC,
+          int srcx, int srcy,
+          int width, int height,
+          int dstx, int dsty,
+          void (*doBitBlt) (DrawablePtr, DrawablePtr, GCPtr, RegionPtr,
+                            DDXPointPtr), unsigned long bitPlane)
+{
+
+    RegionPtr prgnSrcClip = NULL;       /* may be a new region, or just a copy */
+    RegionPtr prgnExposed;
+    Bool freeSrcClip = FALSE;
+    RegionRec rgnDst;
+    DDXPointPtr pptSrc, ppt;
+    DDXPointRec origDest;
+    BoxPtr pbox;
+    BoxRec fastBox;
+    int i, dx, dy, numRects;
+    xRectangle origSource;
+    int fastClip = 0;           /* for fast clipping with pixmap source */
+    int fastExpose = 0;         /* for fast exposures with pixmap source */
+
+    origSource.x = srcx;
+    origSource.y = srcy;
+    origSource.width = width;
+    origSource.height = height;
+    origDest.x = dstx;
+    origDest.y = dsty;
+
+    if (pSrcDrawable->pScreen->SourceValidate) {
+        (*pSrcDrawable->pScreen->SourceValidate) (pSrcDrawable, srcx, srcy,
+                                                  width, height,
+                                                  pGC->subWindowMode);
+    }
+
+    srcx += pSrcDrawable->x;
+    srcy += pSrcDrawable->y;
+
+    /* clip the source */
+    if (pSrcDrawable->type == DRAWABLE_PIXMAP) {
+        if ((pSrcDrawable == pDstDrawable) && (pGC->clientClipType == CT_NONE))
+            prgnSrcClip = pGC->pCompositeClip;
+        else
+            fastClip = 1;
+    }
+    else {                      /* Window */
+        if (pGC->subWindowMode == IncludeInferiors) {
+            if (!((WindowPtr) pSrcDrawable)->parent) {
+                /*
+                 * special case bitblt from root window in
+                 * IncludeInferiors mode; just like from a pixmap
+                 */
+                fastClip = 1;
+            }
+            else if ((pSrcDrawable == pDstDrawable) &&
+                     (pGC->clientClipType == CT_NONE)) {
+                prgnSrcClip = pGC->pCompositeClip;
+            }
+            else {
+                prgnSrcClip = NotClippedByChildren((WindowPtr) pSrcDrawable);
+                freeSrcClip = TRUE;
+            }
+        }
+        else {
+            prgnSrcClip = &((WindowPtr) pSrcDrawable)->clipList;
+        }
+    }
+
+    fastBox.x1 = srcx;
+    fastBox.y1 = srcy;
+    fastBox.x2 = srcx + width;
+    fastBox.y2 = srcy + height;
+
+    /* Don't create a source region if we are doing a fast clip */
+    if (fastClip) {
+        fastExpose = 1;
+        /*
+         * clip the source; if regions extend beyond the source size,
+         * make sure exposure events get sent
+         */
+        if (fastBox.x1 < pSrcDrawable->x) {
+            fastBox.x1 = pSrcDrawable->x;
+            fastExpose = 0;
+        }
+        if (fastBox.y1 < pSrcDrawable->y) {
+            fastBox.y1 = pSrcDrawable->y;
+            fastExpose = 0;
+        }
+        if (fastBox.x2 > pSrcDrawable->x + (int) pSrcDrawable->width) {
+            fastBox.x2 = pSrcDrawable->x + (int) pSrcDrawable->width;
+            fastExpose = 0;
+        }
+        if (fastBox.y2 > pSrcDrawable->y + (int) pSrcDrawable->height) {
+            fastBox.y2 = pSrcDrawable->y + (int) pSrcDrawable->height;
+            fastExpose = 0;
+        }
+    }
+    else {
+        RegionInit(&rgnDst, &fastBox, 1);
+        RegionIntersect(&rgnDst, &rgnDst, prgnSrcClip);
+    }
+
+    dstx += pDstDrawable->x;
+    dsty += pDstDrawable->y;
+
+    if (pDstDrawable->type == DRAWABLE_WINDOW) {
+        if (!((WindowPtr) pDstDrawable)->realized) {
+            if (!fastClip)
+                RegionUninit(&rgnDst);
+            if (freeSrcClip)
+                RegionDestroy(prgnSrcClip);
+            return NULL;
+        }
+    }
+
+    dx = srcx - dstx;
+    dy = srcy - dsty;
+
+    /* Translate and clip the dst to the destination composite clip */
+    if (fastClip) {
+        RegionPtr cclip;
+
+        /* Translate the region directly */
+        fastBox.x1 -= dx;
+        fastBox.x2 -= dx;
+        fastBox.y1 -= dy;
+        fastBox.y2 -= dy;
+
+        /* If the destination composite clip is one rectangle we can
+           do the clip directly.  Otherwise we have to create a full
+           blown region and call intersect */
+
+        cclip = pGC->pCompositeClip;
+        if (RegionNumRects(cclip) == 1) {
+            BoxPtr pBox = RegionRects(cclip);
+
+            if (fastBox.x1 < pBox->x1)
+                fastBox.x1 = pBox->x1;
+            if (fastBox.x2 > pBox->x2)
+                fastBox.x2 = pBox->x2;
+            if (fastBox.y1 < pBox->y1)
+                fastBox.y1 = pBox->y1;
+            if (fastBox.y2 > pBox->y2)
+                fastBox.y2 = pBox->y2;
+
+            /* Check to see if the region is empty */
+            if (fastBox.x1 >= fastBox.x2 || fastBox.y1 >= fastBox.y2) {
+                RegionNull(&rgnDst);
+            }
+            else {
+                RegionInit(&rgnDst, &fastBox, 1);
+            }
+        }
+        else {
+            /* We must turn off fastClip now, since we must create
+               a full blown region.  It is intersected with the
+               composite clip below. */
+            fastClip = 0;
+            RegionInit(&rgnDst, &fastBox, 1);
+        }
+    }
+    else {
+        RegionTranslate(&rgnDst, -dx, -dy);
+    }
+
+    if (!fastClip) {
+        RegionIntersect(&rgnDst, &rgnDst, pGC->pCompositeClip);
+    }
+
+    /* Do bit blitting */
+    numRects = RegionNumRects(&rgnDst);
+    if (numRects && width && height) {
+        if (!(pptSrc = (DDXPointPtr) malloc(numRects * sizeof(DDXPointRec)))) {
+            RegionUninit(&rgnDst);
+            if (freeSrcClip)
+                RegionDestroy(prgnSrcClip);
+            return NULL;
+        }
+        pbox = RegionRects(&rgnDst);
+        ppt = pptSrc;
+        for (i = numRects; --i >= 0; pbox++, ppt++) {
+            ppt->x = pbox->x1 + dx;
+            ppt->y = pbox->y1 + dy;
+        }
+
+        (*doBitBlt) (pSrcDrawable, pDstDrawable, pGC, &rgnDst, pptSrc);
+        free(pptSrc);
+    }
+
+    prgnExposed = NULL;
+    if (pGC->fExpose) {
+        /* Pixmap sources generate a NoExposed (we return NULL to do this) */
+        if (!fastExpose)
+            prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC,
+                                            origSource.x, origSource.y,
+                                            (int) origSource.width,
+                                            (int) origSource.height,
+                                            origDest.x, origDest.y, bitPlane);
+    }
+    RegionUninit(&rgnDst);
+    if (freeSrcClip)
+        RegionDestroy(prgnSrcClip);
+    return prgnExposed;
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaBitmap.c b/xorg-server/hw/xfree86/xaa/xaaBitmap.c
index f7ae78d3f..45d5a09be 100644
--- a/xorg-server/hw/xfree86/xaa/xaaBitmap.c
+++ b/xorg-server/hw/xfree86/xaa/xaaBitmap.c
@@ -1,5 +1,4 @@
 
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -9,241 +8,236 @@
 #include "xaacexp.h"
 #include "xf86.h"
 
-
 /********** byte swapping ***************/
 
-
 #ifdef FIXEDBASE
-# define DEST(i)	*dest
-# define RETURN(i)	return(dest)
+#define DEST(i)	*dest
+#define RETURN(i)	return(dest)
 #else
-# define DEST(i)	dest[i]
-# define RETURN(i)	return(dest + i)
+#define DEST(i)	dest[i]
+#define RETURN(i)	return(dest + i)
 #endif
 
 #ifdef MSBFIRST
-# define SOURCE(i)	SWAP_BITS_IN_BYTES(src[i])
+#define SOURCE(i)	SWAP_BITS_IN_BYTES(src[i])
 #else
-# define SOURCE(i)	src[i]
+#define SOURCE(i)	src[i]
 #endif
 
-
-typedef CARD32 *(* BitmapScanlineProcPtr)(CARD32 *, CARD32 *, int, int);
+typedef CARD32 *(*BitmapScanlineProcPtr) (CARD32 *, CARD32 *, int, int);
 
 #ifdef TRIPLE_BITS
-static CARD32*
-BitmapScanline(
-   CARD32 *src, CARD32 *base,
-   int count, int skipleft )
+static CARD32 *
+BitmapScanline(CARD32 *src, CARD32 *base, int count, int skipleft)
 {
-     CARD32 bits;
-
-     while(count >= 3) {
-	bits = *src;
-	WRITE_BITS3(bits);
-	src++;
-	count -= 3;
-     }
-     if (count == 2) {
-	bits = *src;
-	WRITE_BITS2(bits);
-     } else if (count == 1) {
-	bits = *src;
-	WRITE_BITS1(bits);
-     }
-     
-     return base;
+    CARD32 bits;
+
+    while (count >= 3) {
+        bits = *src;
+        WRITE_BITS3(bits);
+        src++;
+        count -= 3;
+    }
+    if (count == 2) {
+        bits = *src;
+        WRITE_BITS2(bits);
+    }
+    else if (count == 1) {
+        bits = *src;
+        WRITE_BITS1(bits);
+    }
+
+    return base;
 }
 
-static CARD32*
-BitmapScanline_Inverted(
-   CARD32 *src, CARD32 *base,
-   int count, int skipleft )
+static CARD32 *
+BitmapScanline_Inverted(CARD32 *src, CARD32 *base, int count, int skipleft)
 {
-     CARD32 bits;
-
-     while(count >= 3) {
-	bits = ~(*src);
-	WRITE_BITS3(bits);
-	src++;
-	count -= 3;
-     }
-     if (count == 2) {
-	bits = ~(*src);
-	WRITE_BITS2(bits);
-     } else if (count == 1) {
-	bits = ~(*src);
-	WRITE_BITS1(bits);
-     }
-     
-     return base;
-}
+    CARD32 bits;
 
+    while (count >= 3) {
+        bits = ~(*src);
+        WRITE_BITS3(bits);
+        src++;
+        count -= 3;
+    }
+    if (count == 2) {
+        bits = ~(*src);
+        WRITE_BITS2(bits);
+    }
+    else if (count == 1) {
+        bits = ~(*src);
+        WRITE_BITS1(bits);
+    }
 
-static CARD32*
-BitmapScanline_Shifted(
-   CARD32 *src, CARD32 *base,
-   int count, int skipleft )
+    return base;
+}
+
+static CARD32 *
+BitmapScanline_Shifted(CARD32 *src, CARD32 *base, int count, int skipleft)
 {
-     CARD32 bits;
-
-     while(count >= 3) {
-	bits = SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft));
-	WRITE_BITS3(bits);
-	src++;
-	count -= 3;
-     }
-     if (count == 2) {
-	bits = SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft));
-	WRITE_BITS2(bits);
-     } else if (count == 1) {
-	bits = SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft));
-	WRITE_BITS1(bits);
-     }
-     
-     return base;
+    CARD32 bits;
+
+    while (count >= 3) {
+        bits = SHIFT_R(*src, skipleft) | SHIFT_L(*(src + 1), (32 - skipleft));
+        WRITE_BITS3(bits);
+        src++;
+        count -= 3;
+    }
+    if (count == 2) {
+        bits = SHIFT_R(*src, skipleft) | SHIFT_L(*(src + 1), (32 - skipleft));
+        WRITE_BITS2(bits);
+    }
+    else if (count == 1) {
+        bits = SHIFT_R(*src, skipleft) | SHIFT_L(*(src + 1), (32 - skipleft));
+        WRITE_BITS1(bits);
+    }
+
+    return base;
 }
 
-static CARD32*
-BitmapScanline_Shifted_Inverted(
-   CARD32 *src, CARD32 *base,
-   int count, int skipleft )
+static CARD32 *
+BitmapScanline_Shifted_Inverted(CARD32 *src, CARD32 *base,
+                                int count, int skipleft)
 {
-     CARD32 bits;
-
-     while(count >= 3) {
-	bits = ~(SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft)));
-	WRITE_BITS3(bits);
-	src++;
-	count -= 3;
-     }
-     if (count == 2) {
-	bits = ~(SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft)));
-	WRITE_BITS2(bits);
-     } else if (count == 1) {
-	bits = ~(SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft)));
-	WRITE_BITS1(bits);
-     }
-     
-     return base;
+    CARD32 bits;
+
+    while (count >= 3) {
+        bits =
+            ~(SHIFT_R(*src, skipleft) | SHIFT_L(*(src + 1), (32 - skipleft)));
+        WRITE_BITS3(bits);
+        src++;
+        count -= 3;
+    }
+    if (count == 2) {
+        bits =
+            ~(SHIFT_R(*src, skipleft) | SHIFT_L(*(src + 1), (32 - skipleft)));
+        WRITE_BITS2(bits);
+    }
+    else if (count == 1) {
+        bits =
+            ~(SHIFT_R(*src, skipleft) | SHIFT_L(*(src + 1), (32 - skipleft)));
+        WRITE_BITS1(bits);
+    }
+
+    return base;
 }
 
 #define BitmapScanline_Shifted_Careful BitmapScanline_Shifted
 #define BitmapScanline_Shifted_Inverted_Careful BitmapScanline_Shifted_Inverted
 
 #else
-static CARD32*
-BitmapScanline(
-   CARD32 *src, CARD32 *dest,
-   int count, int skipleft )
+static CARD32 *
+BitmapScanline(CARD32 *src, CARD32 *dest, int count, int skipleft)
 {
-   while(count >= 4) {
-	DEST(0) = SOURCE(0);
-	DEST(1) = SOURCE(1);
-	DEST(2) = SOURCE(2);
-	DEST(3) = SOURCE(3);
-	count -= 4;
-	src += 4;
+    while (count >= 4) {
+        DEST(0) = SOURCE(0);
+        DEST(1) = SOURCE(1);
+        DEST(2) = SOURCE(2);
+        DEST(3) = SOURCE(3);
+        count -= 4;
+        src += 4;
 #ifndef FIXEDBASE
-	dest += 4;
+        dest += 4;
 #endif
-   }
-   
-   if(!count) return dest;
-   DEST(0) = SOURCE(0);
-   if(count == 1) RETURN(1);
-   DEST(1) = SOURCE(1);
-   if(count == 2) RETURN(2);
-   DEST(2) = SOURCE(2);
-   RETURN(3);
+    }
+
+    if (!count)
+        return dest;
+    DEST(0) = SOURCE(0);
+    if (count == 1)
+        RETURN(1);
+    DEST(1) = SOURCE(1);
+    if (count == 2)
+        RETURN(2);
+    DEST(2) = SOURCE(2);
+    RETURN(3);
 }
 
-static CARD32*
-BitmapScanline_Inverted(
-   CARD32 *src, CARD32 *dest,
-   int count, int skipleft )
+static CARD32 *
+BitmapScanline_Inverted(CARD32 *src, CARD32 *dest, int count, int skipleft)
 {
-   while(count >= 4) {
-	DEST(0) = ~SOURCE(0);
-	DEST(1) = ~SOURCE(1);
-	DEST(2) = ~SOURCE(2);
-	DEST(3) = ~SOURCE(3);
-	count -= 4;
-	src += 4;
+    while (count >= 4) {
+        DEST(0) = ~SOURCE(0);
+        DEST(1) = ~SOURCE(1);
+        DEST(2) = ~SOURCE(2);
+        DEST(3) = ~SOURCE(3);
+        count -= 4;
+        src += 4;
 #ifndef FIXEDBASE
-	dest += 4;
+        dest += 4;
 #endif
-   }
-   
-   if(!count) return dest;
-   DEST(0) = ~SOURCE(0);
-   if(count == 1) RETURN(1);
-   DEST(1) = ~SOURCE(1);
-   if(count == 2) RETURN(2);
-   DEST(2) = ~SOURCE(2);
-   RETURN(3);
-}
+    }
 
+    if (!count)
+        return dest;
+    DEST(0) = ~SOURCE(0);
+    if (count == 1)
+        RETURN(1);
+    DEST(1) = ~SOURCE(1);
+    if (count == 2)
+        RETURN(2);
+    DEST(2) = ~SOURCE(2);
+    RETURN(3);
+}
 
-static CARD32*
-BitmapScanline_Shifted(
-   CARD32 *bits, CARD32 *base,
-   int count, int skipleft )
+static CARD32 *
+BitmapScanline_Shifted(CARD32 *bits, CARD32 *base, int count, int skipleft)
 {
-     while(count--) {
-	register CARD32 tmp = SHIFT_R(*bits,skipleft) | 
-			      SHIFT_L(*(bits + 1),(32 - skipleft));
-	WRITE_BITS(tmp);
-	bits++;
-     }
-     return base;
+    while (count--) {
+        register CARD32 tmp = SHIFT_R(*bits, skipleft) |
+            SHIFT_L(*(bits + 1), (32 - skipleft));
+        WRITE_BITS(tmp);
+        bits++;
+    }
+    return base;
 }
 
-static CARD32*
-BitmapScanline_Shifted_Inverted(
-   CARD32 *bits, CARD32 *base,
-   int count, int skipleft )
+static CARD32 *
+BitmapScanline_Shifted_Inverted(CARD32 *bits, CARD32 *base,
+                                int count, int skipleft)
 {
-     while(count--) {
-	register CARD32 tmp = ~(SHIFT_R(*bits,skipleft) | 
-				SHIFT_L(*(bits + 1),(32 - skipleft)));
-	WRITE_BITS(tmp);
-	bits++;
-     }
-     return base;
+    while (count--) {
+        register CARD32 tmp = ~(SHIFT_R(*bits, skipleft) |
+                                SHIFT_L(*(bits + 1), (32 - skipleft)));
+        WRITE_BITS(tmp);
+        bits++;
+    }
+    return base;
 }
 
-static CARD32*
-BitmapScanline_Shifted_Careful(
-   CARD32 *bits, CARD32 *base,
-   int count, int skipleft )
+static CARD32 *
+BitmapScanline_Shifted_Careful(CARD32 *bits, CARD32 *base,
+                               int count, int skipleft)
 {
-     register CARD32 tmp;
-     while(--count) {
- 	tmp = SHIFT_R(*bits,skipleft) | SHIFT_L(*(bits + 1),(32 - skipleft));
-	WRITE_BITS(tmp);
-	bits++;
-     }
-     tmp = SHIFT_R(*bits,skipleft);
-     WRITE_BITS(tmp);
-
-     return base;
+    register CARD32 tmp;
+
+    while (--count) {
+        tmp = SHIFT_R(*bits, skipleft) | SHIFT_L(*(bits + 1), (32 - skipleft));
+        WRITE_BITS(tmp);
+        bits++;
+    }
+    tmp = SHIFT_R(*bits, skipleft);
+    WRITE_BITS(tmp);
+
+    return base;
 }
 
-static CARD32*
-BitmapScanline_Shifted_Inverted_Careful(
-   CARD32 *bits, CARD32 *base,
-   int count, int skipleft )
+static CARD32 *
+BitmapScanline_Shifted_Inverted_Careful(CARD32 *bits, CARD32 *base,
+                                        int count, int skipleft)
 {
-     register CARD32 tmp;
-     while(--count) {
-	tmp = ~(SHIFT_R(*bits,skipleft) | SHIFT_L(*(bits + 1),(32 - skipleft)));
-	WRITE_BITS(tmp);
-	bits++;
-     }
-     tmp = ~(SHIFT_R(*bits,skipleft));
-     WRITE_BITS(tmp);
-     return base;
+    register CARD32 tmp;
+
+    while (--count) {
+        tmp =
+            ~(SHIFT_R(*bits, skipleft) | SHIFT_L(*(bits + 1), (32 - skipleft)));
+        WRITE_BITS(tmp);
+        bits++;
+    }
+    tmp = ~(SHIFT_R(*bits, skipleft));
+    WRITE_BITS(tmp);
+    return base;
 }
 
 #endif
@@ -253,26 +247,23 @@ BitmapScanline_Shifted_Inverted_Careful(
     the fill in two passes, inverting the source on the second pass.  
     For GXcopy we can fill the backing rectangle as a solid rect and
     avoid the invert.
-*/ 
+*/
 
 void
 #ifdef TRIPLE_BITS
-EXPNAME(XAAWriteBitmapColorExpand3)(
+ EXPNAME(XAAWriteBitmapColorExpand3) (
 #else
-EXPNAME(XAAWriteBitmapColorExpand)(
+ EXPNAME(XAAWriteBitmapColorExpand) (
 #endif
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int H,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-)
-{
+                                        ScrnInfoPtr pScrn,
+                                        int x, int y, int w, int H,
+                                        unsigned char *src,
+                                        int srcwidth,
+                                        int skipleft,
+                                        int fg, int bg,
+                                        int rop, unsigned int planemask) {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
-    CARD32* base;
+    CARD32 *base;
     unsigned char *srcp = src;
     int SecondPassColor = -1;
     int shift = 0, dwords;
@@ -282,44 +273,49 @@ EXPNAME(XAAWriteBitmapColorExpand)(
     int h = H;
 
 #ifdef TRIPLE_BITS
-    if((bg != -1) && 
-	((infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) ||
-	((infoRec->CPUToScreenColorExpandFillFlags & RGB_EQUAL) && 
-	(!CHECK_RGB_EQUAL(bg))))) {
+    if ((bg != -1) &&
+        ((infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) ||
+         ((infoRec->CPUToScreenColorExpandFillFlags & RGB_EQUAL) &&
+          (!CHECK_RGB_EQUAL(bg))))) {
 #else
-    if((bg != -1) && 
-	(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
+    if ((bg != -1) &&
+        (infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
 #endif
-	if((rop == GXcopy) && infoRec->SetupForSolidFill) {
-    	    (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);
-            (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
-	} else SecondPassColor = bg;
-	bg = -1;
+        if ((rop == GXcopy) && infoRec->SetupForSolidFill) {
+            (*infoRec->SetupForSolidFill) (pScrn, bg, rop, planemask);
+            (*infoRec->SubsequentSolidFillRect) (pScrn, x, y, w, h);
+        }
+        else
+            SecondPassColor = bg;
+        bg = -1;
     }
 
 #ifdef TRIPLE_BITS
-    if(skipleft) {
+    if (skipleft) {
 #else
-    if(skipleft && 
-	(!(infoRec->CPUToScreenColorExpandFillFlags & LEFT_EDGE_CLIPPING) || 
-	(!(infoRec->CPUToScreenColorExpandFillFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) && 
-		(skipleft > x)))) {
+    if (skipleft &&
+        (!(infoRec->CPUToScreenColorExpandFillFlags & LEFT_EDGE_CLIPPING) ||
+         (!(infoRec->
+            CPUToScreenColorExpandFillFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) &&
+          (skipleft > x)))) {
 #endif
-	if((skipleft + ((w + 31) & ~31)) > ((skipleft + w + 31) & ~31)) {
-	    /* don't read past the end */
-	    firstFunc = BitmapScanline_Shifted_Careful;
- 	    secondFunc = BitmapScanline_Shifted_Inverted_Careful;
-	} else {
-	    firstFunc = BitmapScanline_Shifted;
- 	    secondFunc = BitmapScanline_Shifted_Inverted;
-	}
-	shift = skipleft;
-	skipleft = 0;
-    } else {
-	firstFunc = BitmapScanline;
- 	secondFunc = BitmapScanline_Inverted;
-	w += skipleft;
-	x -= skipleft;
+        if ((skipleft + ((w + 31) & ~31)) > ((skipleft + w + 31) & ~31)) {
+            /* don't read past the end */
+            firstFunc = BitmapScanline_Shifted_Careful;
+            secondFunc = BitmapScanline_Shifted_Inverted_Careful;
+        }
+        else {
+            firstFunc = BitmapScanline_Shifted;
+            secondFunc = BitmapScanline_Shifted_Inverted;
+        }
+        shift = skipleft;
+        skipleft = 0;
+    }
+    else {
+        firstFunc = BitmapScanline;
+        secondFunc = BitmapScanline_Inverted;
+        w += skipleft;
+        x -= skipleft;
     }
 
 #ifdef TRIPLE_BITS
@@ -328,69 +324,68 @@ EXPNAME(XAAWriteBitmapColorExpand)(
     dwords = (w + 31) >> 5;
 #endif
 
-SECOND_PASS:
+ SECOND_PASS:
 
-    flag = (infoRec->CPUToScreenColorExpandFillFlags 
-	     & CPU_TRANSFER_PAD_QWORD) && ((dwords * h) & 0x01);
-    (*infoRec->SetupForCPUToScreenColorExpandFill)(
-					pScrn, fg, bg, rop, planemask);
-    (*infoRec->SubsequentCPUToScreenColorExpandFill)(
-					pScrn, x, y, w, h, skipleft);
+    flag = (infoRec->CPUToScreenColorExpandFillFlags
+            & CPU_TRANSFER_PAD_QWORD) && ((dwords * h) & 0x01);
+    (*infoRec->SetupForCPUToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                    planemask);
+    (*infoRec->SubsequentCPUToScreenColorExpandFill) (pScrn, x, y, w, h,
+                                                      skipleft);
 
-    base = (CARD32*)infoRec->ColorExpandBase;
+    base = (CARD32 *) infoRec->ColorExpandBase;
 
 #ifndef FIXEDBASE
-    if((dwords * h) <= infoRec->ColorExpandRange)
-	while(h--) {
-	    base = (*firstFunc)((CARD32*)srcp, base, dwords, shift);
-	    srcp += srcwidth;
-    	}
+    if ((dwords * h) <= infoRec->ColorExpandRange)
+        while (h--) {
+            base = (*firstFunc) ((CARD32 *) srcp, base, dwords, shift);
+            srcp += srcwidth;
+        }
     else
 #endif
-	while(h--) {
-	    (*firstFunc)((CARD32*)srcp, base, dwords, shift);
-	    srcp += srcwidth;
-	}
-
-    if(flag){
-        base = (CARD32*)infoRec->ColorExpandBase;
-	base[0] = 0x00000000;
+        while (h--) {
+            (*firstFunc) ((CARD32 *) srcp, base, dwords, shift);
+            srcp += srcwidth;
+        }
+
+    if (flag) {
+        base = (CARD32 *) infoRec->ColorExpandBase;
+        base[0] = 0x00000000;
     }
 
-    if(SecondPassColor != -1) {
-	h = H; /* Reset height */
-	fg = SecondPassColor;
-	SecondPassColor = -1;
-	firstFunc = secondFunc;
-	srcp = src;
-	goto SECOND_PASS;
+    if (SecondPassColor != -1) {
+        h = H;                  /* Reset height */
+        fg = SecondPassColor;
+        SecondPassColor = -1;
+        firstFunc = secondFunc;
+        srcp = src;
+        goto SECOND_PASS;
     }
 
-    if(infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND) 
-	(*infoRec->Sync)(pScrn);
-    else SET_SYNC_FLAG(infoRec);
+    if (infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND)
+        (*infoRec->Sync) (pScrn);
+    else
+        SET_SYNC_FLAG(infoRec);
 }
 
 #ifndef FIXEDBASE
 
 void
 #ifdef TRIPLE_BITS
-EXPNAME(XAAWriteBitmapScanlineColorExpand3)(
+ EXPNAME(XAAWriteBitmapScanlineColorExpand3) (
 #else
-EXPNAME(XAAWriteBitmapScanlineColorExpand)(
+ EXPNAME(XAAWriteBitmapScanlineColorExpand) (
 #endif
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-)
-{
+                                                ScrnInfoPtr pScrn,
+                                                int x, int y, int w, int h,
+                                                unsigned char *src,
+                                                int srcwidth,
+                                                int skipleft,
+                                                int fg, int bg,
+                                                int rop,
+                                                unsigned int planemask) {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
-    CARD32* base;
+    CARD32 *base;
     unsigned char *srcp = src;
     int SecondPassColor = -1;
     int shift = 0, dwords, bufferNo;
@@ -398,45 +393,50 @@ EXPNAME(XAAWriteBitmapScanlineColorExpand)(
     BitmapScanlineProcPtr secondFunc;
 
 #ifdef TRIPLE_BITS
-    if((bg != -1) &&
-	((infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) 
-	|| ((infoRec->ScanlineCPUToScreenColorExpandFillFlags & RGB_EQUAL) && 
-	(!CHECK_RGB_EQUAL(bg))))) {
+    if ((bg != -1) &&
+        ((infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)
+         || ((infoRec->ScanlineCPUToScreenColorExpandFillFlags & RGB_EQUAL) &&
+             (!CHECK_RGB_EQUAL(bg))))) {
 #else
-    if((bg != -1) && 
-	(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)){
+    if ((bg != -1) &&
+        (infoRec->
+         ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
 #endif
-	if((rop == GXcopy) && infoRec->SetupForSolidFill) {
-    	    (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);
-            (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
-	} else SecondPassColor = bg;
-	bg = -1;
+        if ((rop == GXcopy) && infoRec->SetupForSolidFill) {
+            (*infoRec->SetupForSolidFill) (pScrn, bg, rop, planemask);
+            (*infoRec->SubsequentSolidFillRect) (pScrn, x, y, w, h);
+        }
+        else
+            SecondPassColor = bg;
+        bg = -1;
     }
 
 #ifdef TRIPLE_BITS
-    if(skipleft) {
+    if (skipleft) {
 #else
-    if(skipleft && 
-	(!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
-		LEFT_EDGE_CLIPPING) || 
-	(!(infoRec->ScanlineCPUToScreenColorExpandFillFlags &
-		 LEFT_EDGE_CLIPPING_NEGATIVE_X) && (skipleft > x)))) {
+    if (skipleft &&
+        (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+           LEFT_EDGE_CLIPPING) ||
+         (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+            LEFT_EDGE_CLIPPING_NEGATIVE_X) && (skipleft > x)))) {
 #endif
-	if((skipleft + ((w + 31) & ~31)) > ((skipleft + w + 31) & ~31)) {
-	    /* don't read past the end */
-	    firstFunc = BitmapScanline_Shifted_Careful;
- 	    secondFunc = BitmapScanline_Shifted_Inverted_Careful;
-	} else {
-	    firstFunc = BitmapScanline_Shifted;
- 	    secondFunc = BitmapScanline_Shifted_Inverted;
-	}
-	shift = skipleft;
-	skipleft = 0;
-    } else {
-	firstFunc = BitmapScanline;
- 	secondFunc = BitmapScanline_Inverted;
-	w += skipleft;
-	x -= skipleft;
+        if ((skipleft + ((w + 31) & ~31)) > ((skipleft + w + 31) & ~31)) {
+            /* don't read past the end */
+            firstFunc = BitmapScanline_Shifted_Careful;
+            secondFunc = BitmapScanline_Shifted_Inverted_Careful;
+        }
+        else {
+            firstFunc = BitmapScanline_Shifted;
+            secondFunc = BitmapScanline_Shifted_Inverted;
+        }
+        shift = skipleft;
+        skipleft = 0;
+    }
+    else {
+        firstFunc = BitmapScanline;
+        secondFunc = BitmapScanline_Inverted;
+        w += skipleft;
+        x -= skipleft;
     }
 
 #ifdef TRIPLE_BITS
@@ -445,29 +445,30 @@ EXPNAME(XAAWriteBitmapScanlineColorExpand)(
     dwords = (w + 31) >> 5;
 #endif
 
-SECOND_PASS:
+ SECOND_PASS:
 
-    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill)(pScrn, fg, bg, rop, planemask);
-    (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)(
-					pScrn, x, y, w, h, skipleft);
+    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                            planemask);
+    (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill) (pScrn, x, y, w, h,
+                                                              skipleft);
 
     bufferNo = 0;
 
-    while(h--) {
-	base = (CARD32*)infoRec->ScanlineColorExpandBuffers[bufferNo];
-	(*firstFunc)((CARD32*)srcp, base, dwords, shift);
-	(*infoRec->SubsequentColorExpandScanline)(pScrn, bufferNo++);
-	srcp += srcwidth;
-	if(bufferNo >= infoRec->NumScanlineColorExpandBuffers)
-	    bufferNo = 0;
+    while (h--) {
+        base = (CARD32 *) infoRec->ScanlineColorExpandBuffers[bufferNo];
+        (*firstFunc) ((CARD32 *) srcp, base, dwords, shift);
+        (*infoRec->SubsequentColorExpandScanline) (pScrn, bufferNo++);
+        srcp += srcwidth;
+        if (bufferNo >= infoRec->NumScanlineColorExpandBuffers)
+            bufferNo = 0;
     }
 
-    if(SecondPassColor != -1) {
-	fg = SecondPassColor;
-	SecondPassColor = -1;
-	firstFunc = secondFunc;
-	srcp = src;
-	goto SECOND_PASS;
+    if (SecondPassColor != -1) {
+        fg = SecondPassColor;
+        SecondPassColor = -1;
+        firstFunc = secondFunc;
+        srcp = src;
+        goto SECOND_PASS;
     }
 
     SET_SYNC_FLAG(infoRec);
diff --git a/xorg-server/hw/xfree86/xaa/xaaCpyArea.c b/xorg-server/hw/xfree86/xaa/xaaCpyArea.c
index 5e594633d..0b11b810e 100644
--- a/xorg-server/hw/xfree86/xaa/xaaCpyArea.c
+++ b/xorg-server/hw/xfree86/xaa/xaaCpyArea.c
@@ -1,387 +1,409 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "migc.h"

-#include "gcstruct.h"

-#include "pixmapstr.h"

-

-/*

-  Written mostly by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).

- */

-

-

-RegionPtr

-XAACopyArea(

-    DrawablePtr pSrcDrawable,

-    DrawablePtr pDstDrawable,

-    GC *pGC,

-    int srcx, int srcy,

-    int width, int height,

-    int dstx, int dsty )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-

-    if(pDstDrawable->type == DRAWABLE_WINDOW) {

-	if((pSrcDrawable->type == DRAWABLE_WINDOW) ||

-		IS_OFFSCREEN_PIXMAP(pSrcDrawable)){

-	    if(infoRec->ScreenToScreenBitBlt &&

-	     CHECK_ROP(pGC,infoRec->ScreenToScreenBitBltFlags) &&

-	     CHECK_ROPSRC(pGC,infoRec->ScreenToScreenBitBltFlags) &&

-	     CHECK_PLANEMASK(pGC,infoRec->ScreenToScreenBitBltFlags))

-            return (XAABitBlt( pSrcDrawable, pDstDrawable,

-		pGC, srcx, srcy, width, height, dstx, dsty,

-		XAADoBitBlt, 0L));

-	} else {

-	    if(infoRec->WritePixmap &&

-	     ((pDstDrawable->bitsPerPixel == pSrcDrawable->bitsPerPixel) ||

-		((pDstDrawable->bitsPerPixel == 24) &&  

-		(pSrcDrawable->bitsPerPixel == 32) &&

-		(infoRec->WritePixmapFlags & CONVERT_32BPP_TO_24BPP))) &&

-	     CHECK_ROP(pGC,infoRec->WritePixmapFlags) &&

-	     CHECK_ROPSRC(pGC,infoRec->WritePixmapFlags) &&

-	     CHECK_PLANEMASK(pGC,infoRec->WritePixmapFlags) &&

-	     CHECK_NO_GXCOPY(pGC,infoRec->WritePixmapFlags)) 

-            return (XAABitBlt( pSrcDrawable, pDstDrawable,

-		pGC, srcx, srcy, width, height, dstx, dsty,

-		XAADoImageWrite, 0L));

-	}

-    } else if(IS_OFFSCREEN_PIXMAP(pDstDrawable)){

-	if((pSrcDrawable->type == DRAWABLE_WINDOW) ||

-		IS_OFFSCREEN_PIXMAP(pSrcDrawable)){

-	    if(infoRec->ScreenToScreenBitBlt &&

-	     CHECK_ROP(pGC,infoRec->ScreenToScreenBitBltFlags) &&

-	     CHECK_ROPSRC(pGC,infoRec->ScreenToScreenBitBltFlags) &&

-	     CHECK_PLANEMASK(pGC,infoRec->ScreenToScreenBitBltFlags))

-            return (XAABitBlt( pSrcDrawable, pDstDrawable,

-		pGC, srcx, srcy, width, height, dstx, dsty,

-		XAADoBitBlt, 0L));

-	}

-    }

-

-    return (XAAFallbackOps.CopyArea(pSrcDrawable, pDstDrawable, pGC,

-   	    srcx, srcy, width, height, dstx, dsty));

-}

-

-

-void

-XAADoBitBlt(

-    DrawablePtr	    pSrc, 

-    DrawablePtr	    pDst,

-    GC		    *pGC,

-    RegionPtr	    prgnDst,

-    DDXPointPtr	    pptSrc )

-{

-    int nbox, careful;

-    BoxPtr pbox, pboxTmp, pboxNext, pboxBase, pboxNew1, pboxNew2;

-    DDXPointPtr pptTmp, pptNew1, pptNew2;

-    int xdir, ydir;

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-

-    /* XXX we have to err on the side of safety when both are windows,

-     * because we don't know if IncludeInferiors is being used.

-     */

-    careful = ((pSrc == pDst) ||

-               ((pSrc->type == DRAWABLE_WINDOW) &&

-                (pDst->type == DRAWABLE_WINDOW)));

-

-    pbox = RegionRects(prgnDst);

-    nbox = RegionNumRects(prgnDst);

-

-    pboxNew1 = NULL;

-    pptNew1 = NULL;

-    pboxNew2 = NULL;

-    pptNew2 = NULL;

-    if (careful && (pptSrc->y < pbox->y1)) {

-        /* walk source botttom to top */

-	ydir = -1;

-

-	if (nbox > 1) {

-	    /* keep ordering in each band, reverse order of bands */

-	    pboxNew1 = (BoxPtr)malloc(sizeof(BoxRec) * nbox);

-	    if(!pboxNew1)

-		return;

-	    pptNew1 = (DDXPointPtr)malloc(sizeof(DDXPointRec) * nbox);

-	    if(!pptNew1) {

-	        free(pboxNew1);

-	        return;

-	    }

-	    pboxBase = pboxNext = pbox+nbox-1;

-	    while (pboxBase >= pbox) {

-	        while ((pboxNext >= pbox) &&

-		       (pboxBase->y1 == pboxNext->y1))

-		    pboxNext--;

-	        pboxTmp = pboxNext+1;

-	        pptTmp = pptSrc + (pboxTmp - pbox);

-	        while (pboxTmp <= pboxBase) {

-		    *pboxNew1++ = *pboxTmp++;

-		    *pptNew1++ = *pptTmp++;

-	        }

-	        pboxBase = pboxNext;

-	    }

-	    pboxNew1 -= nbox;

-	    pbox = pboxNew1;

-	    pptNew1 -= nbox;

-	    pptSrc = pptNew1;

-        }

-    } else {

-	/* walk source top to bottom */

-	ydir = 1;

-    }

-

-    if (careful && (pptSrc->x < pbox->x1)) {

-	/* walk source right to left */

-        xdir = -1;

-

-	if (nbox > 1) {

-	    /* reverse order of rects in each band */

-	    pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec) * nbox);

-	    pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec) * nbox);

-	    if(!pboxNew2 || !pptNew2) {

-		free(pptNew2);

-		free(pboxNew2);

-		if (pboxNew1) {

-		    free(pptNew1);

-		    free(pboxNew1);

-		}

-	        return;

-	    }

-	    pboxBase = pboxNext = pbox;

-	    while (pboxBase < pbox+nbox) {

-	        while ((pboxNext < pbox+nbox) &&

-		       (pboxNext->y1 == pboxBase->y1))

-		    pboxNext++;

-	        pboxTmp = pboxNext;

-	        pptTmp = pptSrc + (pboxTmp - pbox);

-	        while (pboxTmp != pboxBase) {

-		    *pboxNew2++ = *--pboxTmp;

-		    *pptNew2++ = *--pptTmp;

-	        }

-	        pboxBase = pboxNext;

-	    }

-	    pboxNew2 -= nbox;

-	    pbox = pboxNew2;

-	    pptNew2 -= nbox;

-	    pptSrc = pptNew2;

-	}

-    } else {

-	/* walk source left to right */

-        xdir = 1;

-    }

-

-    (*infoRec->ScreenToScreenBitBlt)(infoRec->pScrn, nbox, pptSrc, pbox, 

-	xdir, ydir, pGC->alu, pGC->planemask);

- 

-    if (pboxNew2) {

-	free(pptNew2);

-	free(pboxNew2);

-    }

-    if (pboxNew1) {

-	free(pptNew1);

-	free(pboxNew1);

-    }

-

-}

-

-void

-XAADoImageWrite(

-    DrawablePtr	    pSrc, 

-    DrawablePtr	    pDst,

-    GC		    *pGC,

-    RegionPtr	    prgnDst,

-    DDXPointPtr	    pptSrc )

-{

-    int srcwidth;

-    unsigned char* psrcBase;			/* start of image */

-    unsigned char* srcPntr;			/* index into the image */

-    BoxPtr pbox = RegionRects(prgnDst);

-    int nbox = RegionNumRects(prgnDst);

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    int Bpp = pSrc->bitsPerPixel >> 3; 

-

-    psrcBase = (unsigned char *)((PixmapPtr)pSrc)->devPrivate.ptr;

-    srcwidth = (int)((PixmapPtr)pSrc)->devKind;

-

-    for(; nbox; pbox++, pptSrc++, nbox--) {

-        srcPntr = psrcBase + (pptSrc->y * srcwidth) + (pptSrc->x * Bpp);

-

-	(*infoRec->WritePixmap)(infoRec->pScrn, pbox->x1, pbox->y1, 

-		pbox->x2 - pbox->x1, pbox->y2 - pbox->y1, srcPntr, srcwidth,

-		pGC->alu, pGC->planemask, -1, pSrc->bitsPerPixel, pSrc->depth);

-    }

-}

-

-

-void

-XAADoImageRead(

-    DrawablePtr	    pSrc, 

-    DrawablePtr	    pDst,

-    GC		    *pGC,

-    RegionPtr	    prgnDst,

-    DDXPointPtr	    pptSrc )

-{

-    int dstwidth;

-    unsigned char* pdstBase;			/* start of image */

-    unsigned char* dstPntr;			/* index into the image */

-    BoxPtr pbox = RegionRects(prgnDst);

-    int nbox = RegionNumRects(prgnDst);

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    int Bpp = pSrc->bitsPerPixel >> 3;  /* wouldn't get here unless both

-                                           src and dst have same bpp */

-

-    pdstBase = (unsigned char *)((PixmapPtr)pDst)->devPrivate.ptr;

-    dstwidth = (int)((PixmapPtr)pDst)->devKind;

-

-    for(; nbox; pbox++, pptSrc++, nbox--) {

-        dstPntr = pdstBase + (pbox->y1 * dstwidth) + (pbox->x1 * Bpp);

-

-	(*infoRec->ReadPixmap)(infoRec->pScrn, pptSrc->x, pptSrc->y, 

-		pbox->x2 - pbox->x1, pbox->y2 - pbox->y1, dstPntr, dstwidth,

-		pSrc->bitsPerPixel, pSrc->depth);

-    }

-}

-

-

-void

-XAAScreenToScreenBitBlt(

-    ScrnInfoPtr pScrn,

-    int nbox,

-    DDXPointPtr pptSrc,

-    BoxPtr pbox,

-    int xdir, int ydir,

-    int alu,

-    unsigned int planemask )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int dirsetup;

-

-    if ((!(infoRec->CopyAreaFlags & ONLY_TWO_BITBLT_DIRECTIONS)

-    || (xdir == ydir)) &&

-    (!(infoRec->CopyAreaFlags & ONLY_LEFT_TO_RIGHT_BITBLT)

-    || (xdir == 1))) {

-        (*infoRec->SetupForScreenToScreenCopy)(pScrn,

-            xdir, ydir, alu, planemask, -1);

-        for (; nbox; pbox++, pptSrc++, nbox--)

-            (*infoRec->SubsequentScreenToScreenCopy)(pScrn,pptSrc->x, pptSrc->y,

-                pbox->x1, pbox->y1, pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);

-        SET_SYNC_FLAG(infoRec);

-        return;

-    }

-

-   if (infoRec->CopyAreaFlags & ONLY_LEFT_TO_RIGHT_BITBLT) {

-        /*

-         * This is the case of a chip that only supports xdir = 1,

-         * with ydir = 1 or ydir = -1, but we have xdir = -1.

-         */

-        (*infoRec->SetupForScreenToScreenCopy)(pScrn,

-            1, ydir, alu, planemask, -1);

-        for (; nbox; pbox++, pptSrc++, nbox--)

-            if (pptSrc->y != pbox->y1 || pptSrc->x >= pbox->x1)

-                /* No problem. Do a xdir = 1 blit instead. */

-                (*infoRec->SubsequentScreenToScreenCopy)(pScrn,

-                    pptSrc->x, pptSrc->y, pbox->x1, pbox->y1,

-                    pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);

-            else 

-            {

-                /*

-                 * This is the difficult case. Needs striping into

-                 * non-overlapping horizontal chunks.

-                 */

-                int stripeWidth, w, fullStripes, extra, i;

-                stripeWidth = 16;

-                w = pbox->x2 - pbox->x1;

-                if (pbox->x1 - pptSrc->x < stripeWidth)

-                    stripeWidth = pbox->x1 - pptSrc->x;

-                fullStripes = w / stripeWidth;

-                extra = w % stripeWidth;

-

-                /* First, take care of the little bit on the far right */

-                if (extra)

-                    (*infoRec->SubsequentScreenToScreenCopy)(pScrn,

-                        pptSrc->x + fullStripes * stripeWidth, pptSrc->y,

-                        pbox->x1 + fullStripes * stripeWidth, pbox->y1,

-                        extra, pbox->y2 - pbox->y1);

-

-                /* Now, take care of the rest of the blit */

-                for (i = fullStripes - 1; i >= 0; i--)

-                    (*infoRec->SubsequentScreenToScreenCopy)(pScrn,

-                        pptSrc->x + i * stripeWidth, pptSrc->y,

-                        pbox->x1 + i * stripeWidth, pbox->y1,

-                        stripeWidth, pbox->y2 - pbox->y1);

-            }

-        SET_SYNC_FLAG(infoRec);

-        return;

-    }

-

-    /*

-     * Now the case of a chip that only supports xdir = ydir = 1 or

-     * xdir = ydir = -1, but we have xdir != ydir.

-     */

-    dirsetup = 0;	/* No direction set up yet. */

-    for (; nbox; pbox++, pptSrc++, nbox--) {

-        if (xdir == 1 && pptSrc->y != pbox->y1) {

-            /* Do a xdir = ydir = -1 blit instead. */

-            if (dirsetup != -1) {

-                (*infoRec->SetupForScreenToScreenCopy)(pScrn,

-                    -1, -1, alu, planemask, -1);

-                dirsetup = -1;

-            }

-            (*infoRec->SubsequentScreenToScreenCopy)(pScrn,pptSrc->x, pptSrc->y,

-                pbox->x1, pbox->y1, pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);

-        }

-        else if (xdir == -1 && pptSrc->y != pbox->y1) {

-            /* Do a xdir = ydir = 1 blit instead. */

-            if (dirsetup != 1) {

-                (*infoRec->SetupForScreenToScreenCopy)(pScrn,

-                    1, 1, alu, planemask, -1);

-                dirsetup = 1;

-            }

-            (*infoRec->SubsequentScreenToScreenCopy)(pScrn,pptSrc->x, pptSrc->y,

-                pbox->x1, pbox->y1, pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);

-        }

-        else

-            if (xdir == 1) {

-                /*

-                 * xdir = 1, ydir = -1.

-                 * Perform line-by-line xdir = ydir = 1 blits, going up.

-                 */

-                int i;

-                if (dirsetup != 1) {

-                    (*infoRec->SetupForScreenToScreenCopy)(pScrn,

-                        1, 1, alu, planemask, -1);

-                    dirsetup = 1;

-                }

-                for (i = pbox->y2 - pbox->y1 - 1; i >= 0; i--)

-                    (*infoRec->SubsequentScreenToScreenCopy)(pScrn,

-                        pptSrc->x, pptSrc->y + i, pbox->x1, pbox->y1 + i,

-                        pbox->x2 - pbox->x1, 1);

-            }

-            else {

-                /*

-                 * xdir = -1, ydir = 1.

-                 * Perform line-by-line xdir = ydir = -1 blits, going down.

-                 */

-                int i;

-                if (dirsetup != -1) {

-                    (*infoRec->SetupForScreenToScreenCopy)(pScrn,

-                        -1, -1, alu, planemask, -1);

-                    dirsetup = -1;

-                }

-                for (i = 0; i < pbox->y2 - pbox->y1; i++)

-                    (*infoRec->SubsequentScreenToScreenCopy)(pScrn,

-                        pptSrc->x, pptSrc->y + i, pbox->x1, pbox->y1 + i,

-                        pbox->x2 - pbox->x1, 1);

-            }

-    } /* next box */

-    SET_SYNC_FLAG(infoRec);

-}

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "migc.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+
+/*
+  Written mostly by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).
+ */
+
+RegionPtr
+XAACopyArea(DrawablePtr pSrcDrawable,
+            DrawablePtr pDstDrawable,
+            GC * pGC,
+            int srcx, int srcy, int width, int height, int dstx, int dsty)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    if (pDstDrawable->type == DRAWABLE_WINDOW) {
+        if ((pSrcDrawable->type == DRAWABLE_WINDOW) ||
+            IS_OFFSCREEN_PIXMAP(pSrcDrawable)) {
+            if (infoRec->ScreenToScreenBitBlt &&
+                CHECK_ROP(pGC, infoRec->ScreenToScreenBitBltFlags) &&
+                CHECK_ROPSRC(pGC, infoRec->ScreenToScreenBitBltFlags) &&
+                CHECK_PLANEMASK(pGC, infoRec->ScreenToScreenBitBltFlags))
+                return (XAABitBlt(pSrcDrawable, pDstDrawable,
+                                  pGC, srcx, srcy, width, height, dstx, dsty,
+                                  XAADoBitBlt, 0L));
+        }
+        else {
+            if (infoRec->WritePixmap &&
+                ((pDstDrawable->bitsPerPixel == pSrcDrawable->bitsPerPixel) ||
+                 ((pDstDrawable->bitsPerPixel == 24) &&
+                  (pSrcDrawable->bitsPerPixel == 32) &&
+                  (infoRec->WritePixmapFlags & CONVERT_32BPP_TO_24BPP))) &&
+                CHECK_ROP(pGC, infoRec->WritePixmapFlags) &&
+                CHECK_ROPSRC(pGC, infoRec->WritePixmapFlags) &&
+                CHECK_PLANEMASK(pGC, infoRec->WritePixmapFlags) &&
+                CHECK_NO_GXCOPY(pGC, infoRec->WritePixmapFlags))
+                return (XAABitBlt(pSrcDrawable, pDstDrawable,
+                                  pGC, srcx, srcy, width, height, dstx, dsty,
+                                  XAADoImageWrite, 0L));
+        }
+    }
+    else if (IS_OFFSCREEN_PIXMAP(pDstDrawable)) {
+        if ((pSrcDrawable->type == DRAWABLE_WINDOW) ||
+            IS_OFFSCREEN_PIXMAP(pSrcDrawable)) {
+            if (infoRec->ScreenToScreenBitBlt &&
+                CHECK_ROP(pGC, infoRec->ScreenToScreenBitBltFlags) &&
+                CHECK_ROPSRC(pGC, infoRec->ScreenToScreenBitBltFlags) &&
+                CHECK_PLANEMASK(pGC, infoRec->ScreenToScreenBitBltFlags))
+                return (XAABitBlt(pSrcDrawable, pDstDrawable,
+                                  pGC, srcx, srcy, width, height, dstx, dsty,
+                                  XAADoBitBlt, 0L));
+        }
+    }
+
+    return (XAAFallbackOps.CopyArea(pSrcDrawable, pDstDrawable, pGC,
+                                    srcx, srcy, width, height, dstx, dsty));
+}
+
+void
+XAADoBitBlt(DrawablePtr pSrc,
+            DrawablePtr pDst, GC * pGC, RegionPtr prgnDst, DDXPointPtr pptSrc)
+{
+    int nbox, careful;
+    BoxPtr pbox, pboxTmp, pboxNext, pboxBase, pboxNew1, pboxNew2;
+    DDXPointPtr pptTmp, pptNew1, pptNew2;
+    int xdir, ydir;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    /* XXX we have to err on the side of safety when both are windows,
+     * because we don't know if IncludeInferiors is being used.
+     */
+    careful = ((pSrc == pDst) ||
+               ((pSrc->type == DRAWABLE_WINDOW) &&
+                (pDst->type == DRAWABLE_WINDOW)));
+
+    pbox = RegionRects(prgnDst);
+    nbox = RegionNumRects(prgnDst);
+
+    pboxNew1 = NULL;
+    pptNew1 = NULL;
+    pboxNew2 = NULL;
+    pptNew2 = NULL;
+    if (careful && (pptSrc->y < pbox->y1)) {
+        /* walk source botttom to top */
+        ydir = -1;
+
+        if (nbox > 1) {
+            /* keep ordering in each band, reverse order of bands */
+            pboxNew1 = (BoxPtr) malloc(sizeof(BoxRec) * nbox);
+            if (!pboxNew1)
+                return;
+            pptNew1 = (DDXPointPtr) malloc(sizeof(DDXPointRec) * nbox);
+            if (!pptNew1) {
+                free(pboxNew1);
+                return;
+            }
+            pboxBase = pboxNext = pbox + nbox - 1;
+            while (pboxBase >= pbox) {
+                while ((pboxNext >= pbox) && (pboxBase->y1 == pboxNext->y1))
+                    pboxNext--;
+                pboxTmp = pboxNext + 1;
+                pptTmp = pptSrc + (pboxTmp - pbox);
+                while (pboxTmp <= pboxBase) {
+                    *pboxNew1++ = *pboxTmp++;
+                    *pptNew1++ = *pptTmp++;
+                }
+                pboxBase = pboxNext;
+            }
+            pboxNew1 -= nbox;
+            pbox = pboxNew1;
+            pptNew1 -= nbox;
+            pptSrc = pptNew1;
+        }
+    }
+    else {
+        /* walk source top to bottom */
+        ydir = 1;
+    }
+
+    if (careful && (pptSrc->x < pbox->x1)) {
+        /* walk source right to left */
+        xdir = -1;
+
+        if (nbox > 1) {
+            /* reverse order of rects in each band */
+            pboxNew2 = (BoxPtr) malloc(sizeof(BoxRec) * nbox);
+            pptNew2 = (DDXPointPtr) malloc(sizeof(DDXPointRec) * nbox);
+            if (!pboxNew2 || !pptNew2) {
+                free(pptNew2);
+                free(pboxNew2);
+                if (pboxNew1) {
+                    free(pptNew1);
+                    free(pboxNew1);
+                }
+                return;
+            }
+            pboxBase = pboxNext = pbox;
+            while (pboxBase < pbox + nbox) {
+                while ((pboxNext < pbox + nbox) &&
+                       (pboxNext->y1 == pboxBase->y1))
+                    pboxNext++;
+                pboxTmp = pboxNext;
+                pptTmp = pptSrc + (pboxTmp - pbox);
+                while (pboxTmp != pboxBase) {
+                    *pboxNew2++ = *--pboxTmp;
+                    *pptNew2++ = *--pptTmp;
+                }
+                pboxBase = pboxNext;
+            }
+            pboxNew2 -= nbox;
+            pbox = pboxNew2;
+            pptNew2 -= nbox;
+            pptSrc = pptNew2;
+        }
+    }
+    else {
+        /* walk source left to right */
+        xdir = 1;
+    }
+
+    (*infoRec->ScreenToScreenBitBlt) (infoRec->pScrn, nbox, pptSrc, pbox,
+                                      xdir, ydir, pGC->alu, pGC->planemask);
+
+    if (pboxNew2) {
+        free(pptNew2);
+        free(pboxNew2);
+    }
+    if (pboxNew1) {
+        free(pptNew1);
+        free(pboxNew1);
+    }
+
+}
+
+void
+XAADoImageWrite(DrawablePtr pSrc,
+                DrawablePtr pDst,
+                GC * pGC, RegionPtr prgnDst, DDXPointPtr pptSrc)
+{
+    int srcwidth;
+    unsigned char *psrcBase;    /* start of image */
+    unsigned char *srcPntr;     /* index into the image */
+    BoxPtr pbox = RegionRects(prgnDst);
+    int nbox = RegionNumRects(prgnDst);
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int Bpp = pSrc->bitsPerPixel >> 3;
+
+    psrcBase = (unsigned char *) ((PixmapPtr) pSrc)->devPrivate.ptr;
+    srcwidth = (int) ((PixmapPtr) pSrc)->devKind;
+
+    for (; nbox; pbox++, pptSrc++, nbox--) {
+        srcPntr = psrcBase + (pptSrc->y * srcwidth) + (pptSrc->x * Bpp);
+
+        (*infoRec->WritePixmap) (infoRec->pScrn, pbox->x1, pbox->y1,
+                                 pbox->x2 - pbox->x1, pbox->y2 - pbox->y1,
+                                 srcPntr, srcwidth, pGC->alu, pGC->planemask,
+                                 -1, pSrc->bitsPerPixel, pSrc->depth);
+    }
+}
+
+void
+XAADoImageRead(DrawablePtr pSrc,
+               DrawablePtr pDst,
+               GC * pGC, RegionPtr prgnDst, DDXPointPtr pptSrc)
+{
+    int dstwidth;
+    unsigned char *pdstBase;    /* start of image */
+    unsigned char *dstPntr;     /* index into the image */
+    BoxPtr pbox = RegionRects(prgnDst);
+    int nbox = RegionNumRects(prgnDst);
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int Bpp = pSrc->bitsPerPixel >> 3;  /* wouldn't get here unless both
+                                           src and dst have same bpp */
+
+    pdstBase = (unsigned char *) ((PixmapPtr) pDst)->devPrivate.ptr;
+    dstwidth = (int) ((PixmapPtr) pDst)->devKind;
+
+    for (; nbox; pbox++, pptSrc++, nbox--) {
+        dstPntr = pdstBase + (pbox->y1 * dstwidth) + (pbox->x1 * Bpp);
+
+        (*infoRec->ReadPixmap) (infoRec->pScrn, pptSrc->x, pptSrc->y,
+                                pbox->x2 - pbox->x1, pbox->y2 - pbox->y1,
+                                dstPntr, dstwidth, pSrc->bitsPerPixel,
+                                pSrc->depth);
+    }
+}
+
+void
+XAAScreenToScreenBitBlt(ScrnInfoPtr pScrn,
+                        int nbox,
+                        DDXPointPtr pptSrc,
+                        BoxPtr pbox,
+                        int xdir, int ydir, int alu, unsigned int planemask)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int dirsetup;
+
+    if ((!(infoRec->CopyAreaFlags & ONLY_TWO_BITBLT_DIRECTIONS)
+         || (xdir == ydir)) &&
+        (!(infoRec->CopyAreaFlags & ONLY_LEFT_TO_RIGHT_BITBLT)
+         || (xdir == 1))) {
+        (*infoRec->SetupForScreenToScreenCopy) (pScrn,
+                                                xdir, ydir, alu, planemask, -1);
+        for (; nbox; pbox++, pptSrc++, nbox--)
+            (*infoRec->SubsequentScreenToScreenCopy) (pScrn, pptSrc->x,
+                                                      pptSrc->y, pbox->x1,
+                                                      pbox->y1,
+                                                      pbox->x2 - pbox->x1,
+                                                      pbox->y2 - pbox->y1);
+        SET_SYNC_FLAG(infoRec);
+        return;
+    }
+
+    if (infoRec->CopyAreaFlags & ONLY_LEFT_TO_RIGHT_BITBLT) {
+        /*
+         * This is the case of a chip that only supports xdir = 1,
+         * with ydir = 1 or ydir = -1, but we have xdir = -1.
+         */
+        (*infoRec->SetupForScreenToScreenCopy) (pScrn,
+                                                1, ydir, alu, planemask, -1);
+        for (; nbox; pbox++, pptSrc++, nbox--)
+            if (pptSrc->y != pbox->y1 || pptSrc->x >= pbox->x1)
+                /* No problem. Do a xdir = 1 blit instead. */
+                (*infoRec->SubsequentScreenToScreenCopy) (pScrn,
+                                                          pptSrc->x, pptSrc->y,
+                                                          pbox->x1, pbox->y1,
+                                                          pbox->x2 - pbox->x1,
+                                                          pbox->y2 - pbox->y1);
+            else {
+                /*
+                 * This is the difficult case. Needs striping into
+                 * non-overlapping horizontal chunks.
+                 */
+                int stripeWidth, w, fullStripes, extra, i;
+
+                stripeWidth = 16;
+                w = pbox->x2 - pbox->x1;
+                if (pbox->x1 - pptSrc->x < stripeWidth)
+                    stripeWidth = pbox->x1 - pptSrc->x;
+                fullStripes = w / stripeWidth;
+                extra = w % stripeWidth;
+
+                /* First, take care of the little bit on the far right */
+                if (extra)
+                    (*infoRec->SubsequentScreenToScreenCopy) (pScrn,
+                                                              pptSrc->x +
+                                                              fullStripes *
+                                                              stripeWidth,
+                                                              pptSrc->y,
+                                                              pbox->x1 +
+                                                              fullStripes *
+                                                              stripeWidth,
+                                                              pbox->y1, extra,
+                                                              pbox->y2 -
+                                                              pbox->y1);
+
+                /* Now, take care of the rest of the blit */
+                for (i = fullStripes - 1; i >= 0; i--)
+                    (*infoRec->SubsequentScreenToScreenCopy) (pScrn,
+                                                              pptSrc->x +
+                                                              i * stripeWidth,
+                                                              pptSrc->y,
+                                                              pbox->x1 +
+                                                              i * stripeWidth,
+                                                              pbox->y1,
+                                                              stripeWidth,
+                                                              pbox->y2 -
+                                                              pbox->y1);
+            }
+        SET_SYNC_FLAG(infoRec);
+        return;
+    }
+
+    /*
+     * Now the case of a chip that only supports xdir = ydir = 1 or
+     * xdir = ydir = -1, but we have xdir != ydir.
+     */
+    dirsetup = 0;               /* No direction set up yet. */
+    for (; nbox; pbox++, pptSrc++, nbox--) {
+        if (xdir == 1 && pptSrc->y != pbox->y1) {
+            /* Do a xdir = ydir = -1 blit instead. */
+            if (dirsetup != -1) {
+                (*infoRec->SetupForScreenToScreenCopy) (pScrn,
+                                                        -1, -1, alu, planemask,
+                                                        -1);
+                dirsetup = -1;
+            }
+            (*infoRec->SubsequentScreenToScreenCopy) (pScrn, pptSrc->x,
+                                                      pptSrc->y, pbox->x1,
+                                                      pbox->y1,
+                                                      pbox->x2 - pbox->x1,
+                                                      pbox->y2 - pbox->y1);
+        }
+        else if (xdir == -1 && pptSrc->y != pbox->y1) {
+            /* Do a xdir = ydir = 1 blit instead. */
+            if (dirsetup != 1) {
+                (*infoRec->SetupForScreenToScreenCopy) (pScrn,
+                                                        1, 1, alu, planemask,
+                                                        -1);
+                dirsetup = 1;
+            }
+            (*infoRec->SubsequentScreenToScreenCopy) (pScrn, pptSrc->x,
+                                                      pptSrc->y, pbox->x1,
+                                                      pbox->y1,
+                                                      pbox->x2 - pbox->x1,
+                                                      pbox->y2 - pbox->y1);
+        }
+        else if (xdir == 1) {
+            /*
+             * xdir = 1, ydir = -1.
+             * Perform line-by-line xdir = ydir = 1 blits, going up.
+             */
+            int i;
+
+            if (dirsetup != 1) {
+                (*infoRec->SetupForScreenToScreenCopy) (pScrn,
+                                                        1, 1, alu, planemask,
+                                                        -1);
+                dirsetup = 1;
+            }
+            for (i = pbox->y2 - pbox->y1 - 1; i >= 0; i--)
+                (*infoRec->SubsequentScreenToScreenCopy) (pScrn,
+                                                          pptSrc->x,
+                                                          pptSrc->y + i,
+                                                          pbox->x1,
+                                                          pbox->y1 + i,
+                                                          pbox->x2 - pbox->x1,
+                                                          1);
+        }
+        else {
+            /*
+             * xdir = -1, ydir = 1.
+             * Perform line-by-line xdir = ydir = -1 blits, going down.
+             */
+            int i;
+
+            if (dirsetup != -1) {
+                (*infoRec->SetupForScreenToScreenCopy) (pScrn,
+                                                        -1, -1, alu, planemask,
+                                                        -1);
+                dirsetup = -1;
+            }
+            for (i = 0; i < pbox->y2 - pbox->y1; i++)
+                (*infoRec->SubsequentScreenToScreenCopy) (pScrn,
+                                                          pptSrc->x,
+                                                          pptSrc->y + i,
+                                                          pbox->x1,
+                                                          pbox->y1 + i,
+                                                          pbox->x2 - pbox->x1,
+                                                          1);
+        }
+    }                           /* next box */
+    SET_SYNC_FLAG(infoRec);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaCpyPlane.c b/xorg-server/hw/xfree86/xaa/xaaCpyPlane.c
index 2d036c936..b9197e41f 100644
--- a/xorg-server/hw/xfree86/xaa/xaaCpyPlane.c
+++ b/xorg-server/hw/xfree86/xaa/xaaCpyPlane.c
@@ -1,208 +1,204 @@
-

-/*

-   A CopyPlane function that handles bitmap->screen copies and

-   sends anything else to the Fallback.

-

-   Also, a PushPixels for solid fill styles.

-

-   Written by Mark Vojkovich (markv@valinux.com)

-

-*/

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <string.h>

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-#include "servermd.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "mi.h"

-#include "pixmapstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaawrap.h"

-

-static void XAACopyPlane1toNColorExpand(DrawablePtr pSrc, DrawablePtr pDst,

-					GCPtr pGC, RegionPtr rgnDst,

-					DDXPointPtr pptSrc);

-static void XAACopyPlaneNtoNColorExpand(DrawablePtr pSrc, DrawablePtr pDst,

-					GCPtr pGC, RegionPtr rgnDst,

-					DDXPointPtr pptSrc);

-

-

-static unsigned long TmpBitPlane; 

-

-RegionPtr

-XAACopyPlaneColorExpansion(

-    DrawablePtr	pSrc,

-    DrawablePtr	pDst,

-    GCPtr pGC,

-    int	srcx, int srcy,

-    int	width, int height,

-    int	dstx, int dsty,

-    unsigned long bitPlane 

-){

-    if((pSrc->type == DRAWABLE_PIXMAP) && !XAA_DEPTH_BUG(pGC)) {

-	if(pSrc->bitsPerPixel == 1) {

-	   return(XAABitBlt(pSrc, pDst, pGC, srcx, srcy,

-			width, height, dstx, dsty, 

-			XAACopyPlane1toNColorExpand, bitPlane));

-	} else if(bitPlane < (1 << pDst->depth)){

-	   TmpBitPlane = bitPlane;

-	   return(XAABitBlt(pSrc, pDst, pGC, srcx, srcy,

-			width, height, dstx, dsty, 

-			XAACopyPlaneNtoNColorExpand, bitPlane));

-	}

-    }

-

-    return (XAAFallbackOps.CopyPlane(pSrc, pDst, pGC, srcx, srcy, 

-			width, height, dstx, dsty, bitPlane));

-}

-

-

-static void 

-XAACopyPlane1toNColorExpand(

-    DrawablePtr   pSrc, 

-    DrawablePtr	  pDst,

-    GCPtr	  pGC,

-    RegionPtr     rgnDst,

-    DDXPointPtr   pptSrc )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    BoxPtr pbox = RegionRects(rgnDst);

-    int numrects = RegionNumRects(rgnDst);

-    unsigned char *src = ((PixmapPtr)pSrc)->devPrivate.ptr;

-    int srcwidth = ((PixmapPtr)pSrc)->devKind; 

-    

-    while(numrects--) {	

-	(*infoRec->WriteBitmap)(infoRec->pScrn, pbox->x1, pbox->y1, 

-		pbox->x2 - pbox->x1, pbox->y2 - pbox->y1, 

-		src + (srcwidth * pptSrc->y) + ((pptSrc->x >> 5) << 2), 

-		srcwidth, pptSrc->x & 31, 

-		pGC->fgPixel, pGC->bgPixel, pGC->alu, pGC->planemask);

-	pbox++; pptSrc++;

-    }

-}

-

-

-static void 

-XAACopyPlaneNtoNColorExpand(

-    DrawablePtr   pSrc, 

-    DrawablePtr	  pDst,

-    GCPtr	  pGC,

-    RegionPtr     rgnDst,

-    DDXPointPtr   pptSrc 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    BoxPtr pbox = RegionRects(rgnDst);

-    int numrects = RegionNumRects(rgnDst);

-    unsigned char *src = ((PixmapPtr)pSrc)->devPrivate.ptr;

-    unsigned char *data, *srcPtr, *dataPtr;

-    int srcwidth = ((PixmapPtr)pSrc)->devKind; 

-    int pitch, width, height, h, i, index, offset;

-    int Bpp = pSrc->bitsPerPixel >> 3;

-    unsigned long mask = TmpBitPlane;

-

-    if(TmpBitPlane < (1 << 8)) {

-	offset = 0;

-    } else if(TmpBitPlane < (1 << 16)) {

-	offset = 1;

-	mask >>= 8;

-    } else if(TmpBitPlane < (1 << 24)) {

-	offset = 2;

-	mask >>= 16;

-    } else {

-	offset = 3;

-	mask >>= 24;

-    }

-

-    if(IS_OFFSCREEN_PIXMAP(pSrc))

-	SYNC_CHECK(pSrc);

-    

-    while(numrects--) {	

-	width = pbox->x2 - pbox->x1;

-	h = height = pbox->y2 - pbox->y1;

-	pitch = BitmapBytePad(width);

-

-	if(!(data = calloc(height, pitch)))

-	   goto ALLOC_FAILED;

-

-	dataPtr = data;

-        srcPtr = ((pptSrc->y) * srcwidth) + src + 

-                        ((pptSrc->x) * Bpp) + offset;

-

-	while(h--) {

-	    for(i = index = 0; i < width; i++, index += Bpp) {

-	       if(mask & srcPtr[index])

-		  dataPtr[i >> 3] |= (1 << (i & 7));

-	    }

-	    dataPtr += pitch;

-	    srcPtr += srcwidth;

-	}

-

-	(*infoRec->WriteBitmap)(infoRec->pScrn, 

-		pbox->x1, pbox->y1, width, height, data, pitch, 0, 

-		pGC->fgPixel, pGC->bgPixel, pGC->alu, pGC->planemask);

-	

-	free(data);

-

-ALLOC_FAILED:

-

-	pbox++; pptSrc++;

-    }

-}

-

-void

-XAAPushPixelsSolidColorExpansion(

-    GCPtr	pGC,

-    PixmapPtr	pBitMap,

-    DrawablePtr pDraw,

-    int	dx, int dy, 

-    int xOrg, int yOrg )

-{

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   int MaxBoxes = RegionNumRects(pGC->pCompositeClip);

-   BoxPtr	pbox, pClipBoxes;

-   int		nboxes, srcx, srcy;

-   xRectangle TheRect;

-   unsigned char *src = pBitMap->devPrivate.ptr;

-   int srcwidth = pBitMap->devKind;

-

-   if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-   TheRect.x = xOrg;

-   TheRect.y = yOrg;

-   TheRect.width = dx;

-   TheRect.height = dy; 

-

-   if(MaxBoxes > (infoRec->PreAllocSize/sizeof(BoxRec))) {

-	pClipBoxes = malloc(MaxBoxes * sizeof(BoxRec));

-	if(!pClipBoxes) return;	

-   } else pClipBoxes = (BoxPtr)infoRec->PreAllocMem;

-

-   nboxes = XAAGetRectClipBoxes(pGC, pClipBoxes, 1, &TheRect);

-   pbox = pClipBoxes;

-

-   while(nboxes--) {

-	srcx = pbox->x1 - xOrg;

-	srcy = pbox->y1 - yOrg;

- 	(*infoRec->WriteBitmap)(infoRec->pScrn, pbox->x1, pbox->y1, 

-		pbox->x2 - pbox->x1, pbox->y2 - pbox->y1, 

-		src + (srcwidth * srcy) + ((srcx >> 5) << 2), 

-		srcwidth, srcx & 31, 

-		pGC->fgPixel, -1, pGC->alu, pGC->planemask);

-	pbox++;

-   }

-

-    if(pClipBoxes != (BoxPtr)infoRec->PreAllocMem)

-	free(pClipBoxes);

-}

-

+
+/*
+   A CopyPlane function that handles bitmap->screen copies and
+   sends anything else to the Fallback.
+
+   Also, a PushPixels for solid fill styles.
+
+   Written by Mark Vojkovich (markv@valinux.com)
+
+*/
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <string.h>
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "servermd.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "mi.h"
+#include "pixmapstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaawrap.h"
+
+static void XAACopyPlane1toNColorExpand(DrawablePtr pSrc, DrawablePtr pDst,
+                                        GCPtr pGC, RegionPtr rgnDst,
+                                        DDXPointPtr pptSrc);
+static void XAACopyPlaneNtoNColorExpand(DrawablePtr pSrc, DrawablePtr pDst,
+                                        GCPtr pGC, RegionPtr rgnDst,
+                                        DDXPointPtr pptSrc);
+
+static unsigned long TmpBitPlane;
+
+RegionPtr
+XAACopyPlaneColorExpansion(DrawablePtr pSrc,
+                           DrawablePtr pDst,
+                           GCPtr pGC,
+                           int srcx, int srcy,
+                           int width, int height,
+                           int dstx, int dsty, unsigned long bitPlane)
+{
+    if ((pSrc->type == DRAWABLE_PIXMAP) && !XAA_DEPTH_BUG(pGC)) {
+        if (pSrc->bitsPerPixel == 1) {
+            return (XAABitBlt(pSrc, pDst, pGC, srcx, srcy,
+                              width, height, dstx, dsty,
+                              XAACopyPlane1toNColorExpand, bitPlane));
+        }
+        else if (bitPlane < (1 << pDst->depth)) {
+            TmpBitPlane = bitPlane;
+            return (XAABitBlt(pSrc, pDst, pGC, srcx, srcy,
+                              width, height, dstx, dsty,
+                              XAACopyPlaneNtoNColorExpand, bitPlane));
+        }
+    }
+
+    return (XAAFallbackOps.CopyPlane(pSrc, pDst, pGC, srcx, srcy,
+                                     width, height, dstx, dsty, bitPlane));
+}
+
+static void
+XAACopyPlane1toNColorExpand(DrawablePtr pSrc,
+                            DrawablePtr pDst,
+                            GCPtr pGC, RegionPtr rgnDst, DDXPointPtr pptSrc)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    BoxPtr pbox = RegionRects(rgnDst);
+    int numrects = RegionNumRects(rgnDst);
+    unsigned char *src = ((PixmapPtr) pSrc)->devPrivate.ptr;
+    int srcwidth = ((PixmapPtr) pSrc)->devKind;
+
+    while (numrects--) {
+        (*infoRec->WriteBitmap) (infoRec->pScrn, pbox->x1, pbox->y1,
+                                 pbox->x2 - pbox->x1, pbox->y2 - pbox->y1,
+                                 src + (srcwidth * pptSrc->y) +
+                                 ((pptSrc->x >> 5) << 2), srcwidth,
+                                 pptSrc->x & 31, pGC->fgPixel, pGC->bgPixel,
+                                 pGC->alu, pGC->planemask);
+        pbox++;
+        pptSrc++;
+    }
+}
+
+static void
+XAACopyPlaneNtoNColorExpand(DrawablePtr pSrc,
+                            DrawablePtr pDst,
+                            GCPtr pGC, RegionPtr rgnDst, DDXPointPtr pptSrc)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    BoxPtr pbox = RegionRects(rgnDst);
+    int numrects = RegionNumRects(rgnDst);
+    unsigned char *src = ((PixmapPtr) pSrc)->devPrivate.ptr;
+    unsigned char *data, *srcPtr, *dataPtr;
+    int srcwidth = ((PixmapPtr) pSrc)->devKind;
+    int pitch, width, height, h, i, index, offset;
+    int Bpp = pSrc->bitsPerPixel >> 3;
+    unsigned long mask = TmpBitPlane;
+
+    if (TmpBitPlane < (1 << 8)) {
+        offset = 0;
+    }
+    else if (TmpBitPlane < (1 << 16)) {
+        offset = 1;
+        mask >>= 8;
+    }
+    else if (TmpBitPlane < (1 << 24)) {
+        offset = 2;
+        mask >>= 16;
+    }
+    else {
+        offset = 3;
+        mask >>= 24;
+    }
+
+    if (IS_OFFSCREEN_PIXMAP(pSrc))
+        SYNC_CHECK(pSrc);
+
+    while (numrects--) {
+        width = pbox->x2 - pbox->x1;
+        h = height = pbox->y2 - pbox->y1;
+        pitch = BitmapBytePad(width);
+
+        if (!(data = calloc(height, pitch)))
+            goto ALLOC_FAILED;
+
+        dataPtr = data;
+        srcPtr = ((pptSrc->y) * srcwidth) + src + ((pptSrc->x) * Bpp) + offset;
+
+        while (h--) {
+            for (i = index = 0; i < width; i++, index += Bpp) {
+                if (mask & srcPtr[index])
+                    dataPtr[i >> 3] |= (1 << (i & 7));
+            }
+            dataPtr += pitch;
+            srcPtr += srcwidth;
+        }
+
+        (*infoRec->WriteBitmap) (infoRec->pScrn,
+                                 pbox->x1, pbox->y1, width, height, data, pitch,
+                                 0, pGC->fgPixel, pGC->bgPixel, pGC->alu,
+                                 pGC->planemask);
+
+        free(data);
+
+ ALLOC_FAILED:
+
+        pbox++;
+        pptSrc++;
+    }
+}
+
+void
+XAAPushPixelsSolidColorExpansion(GCPtr pGC,
+                                 PixmapPtr pBitMap,
+                                 DrawablePtr pDraw,
+                                 int dx, int dy, int xOrg, int yOrg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int MaxBoxes = RegionNumRects(pGC->pCompositeClip);
+    BoxPtr pbox, pClipBoxes;
+    int nboxes, srcx, srcy;
+    xRectangle TheRect;
+    unsigned char *src = pBitMap->devPrivate.ptr;
+    int srcwidth = pBitMap->devKind;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    TheRect.x = xOrg;
+    TheRect.y = yOrg;
+    TheRect.width = dx;
+    TheRect.height = dy;
+
+    if (MaxBoxes > (infoRec->PreAllocSize / sizeof(BoxRec))) {
+        pClipBoxes = malloc(MaxBoxes * sizeof(BoxRec));
+        if (!pClipBoxes)
+            return;
+    }
+    else
+        pClipBoxes = (BoxPtr) infoRec->PreAllocMem;
+
+    nboxes = XAAGetRectClipBoxes(pGC, pClipBoxes, 1, &TheRect);
+    pbox = pClipBoxes;
+
+    while (nboxes--) {
+        srcx = pbox->x1 - xOrg;
+        srcy = pbox->y1 - yOrg;
+        (*infoRec->WriteBitmap) (infoRec->pScrn, pbox->x1, pbox->y1,
+                                 pbox->x2 - pbox->x1, pbox->y2 - pbox->y1,
+                                 src + (srcwidth * srcy) + ((srcx >> 5) << 2),
+                                 srcwidth, srcx & 31,
+                                 pGC->fgPixel, -1, pGC->alu, pGC->planemask);
+        pbox++;
+    }
+
+    if (pClipBoxes != (BoxPtr) infoRec->PreAllocMem)
+        free(pClipBoxes);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaCpyWin.c b/xorg-server/hw/xfree86/xaa/xaaCpyWin.c
index d8608b095..e851f4a37 100644
--- a/xorg-server/hw/xfree86/xaa/xaaCpyWin.c
+++ b/xorg-server/hw/xfree86/xaa/xaaCpyWin.c
@@ -1,82 +1,78 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "gcstruct.h"

-#include "pixmapstr.h"

-#include "xaawrap.h"

-

-/*

-    Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).

-*/

-

-void

-XAACopyWindow(

-    WindowPtr pWin,

-    DDXPointRec ptOldOrg,

-    RegionPtr prgnSrc )

-{

-    DDXPointPtr pptSrc, ppt;

-    RegionRec rgnDst;

-    BoxPtr pbox;

-    int dx, dy, nbox;

-    WindowPtr pwinRoot;

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    XAAInfoRecPtr infoRec = 

-	GET_XAAINFORECPTR_FROM_DRAWABLE((&pWin->drawable));

-

-    if (!infoRec->pScrn->vtSema || !infoRec->ScreenToScreenBitBlt) { 

-	XAA_SCREEN_PROLOGUE (pScreen, CopyWindow);

-	if(infoRec->pScrn->vtSema && infoRec->NeedToSync) {

-	    (*infoRec->Sync)(infoRec->pScrn);

-	    infoRec->NeedToSync = FALSE;

-	}

-        (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);

-	XAA_SCREEN_EPILOGUE (pScreen, CopyWindow, XAACopyWindow);

-    	return;

-    }

-

-    pwinRoot = pScreen->root;

-

-    RegionNull(&rgnDst);

-

-    dx = ptOldOrg.x - pWin->drawable.x;

-    dy = ptOldOrg.y - pWin->drawable.y;

-    RegionTranslate(prgnSrc, -dx, -dy);

-    RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc);

-

-    pbox = RegionRects(&rgnDst);

-    nbox = RegionNumRects(&rgnDst);

-    if(!nbox || 

-      !(pptSrc = (DDXPointPtr )malloc(nbox * sizeof(DDXPointRec)))) {

-	RegionUninit(&rgnDst);

-	return;

-    }

-    ppt = pptSrc;

-

-    while(nbox--) {

-	ppt->x = pbox->x1 + dx;

-	ppt->y = pbox->y1 + dy;

-	ppt++; pbox++;

-    }

-    

-    infoRec->ScratchGC.planemask = ~0L;

-    infoRec->ScratchGC.alu = GXcopy;

-

-    XAADoBitBlt((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot,

-        		&(infoRec->ScratchGC), &rgnDst, pptSrc);

-

-    free(pptSrc);

-    RegionUninit(&rgnDst);

-}

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+#include "xaawrap.h"
+
+/*
+    Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).
+*/
+
+void
+XAACopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+{
+    DDXPointPtr pptSrc, ppt;
+    RegionRec rgnDst;
+    BoxPtr pbox;
+    int dx, dy, nbox;
+    WindowPtr pwinRoot;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_DRAWABLE((&pWin->drawable));
+
+    if (!infoRec->pScrn->vtSema || !infoRec->ScreenToScreenBitBlt) {
+        XAA_SCREEN_PROLOGUE(pScreen, CopyWindow);
+        if (infoRec->pScrn->vtSema && infoRec->NeedToSync) {
+            (*infoRec->Sync) (infoRec->pScrn);
+            infoRec->NeedToSync = FALSE;
+        }
+        (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);
+        XAA_SCREEN_EPILOGUE(pScreen, CopyWindow, XAACopyWindow);
+        return;
+    }
+
+    pwinRoot = pScreen->root;
+
+    RegionNull(&rgnDst);
+
+    dx = ptOldOrg.x - pWin->drawable.x;
+    dy = ptOldOrg.y - pWin->drawable.y;
+    RegionTranslate(prgnSrc, -dx, -dy);
+    RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc);
+
+    pbox = RegionRects(&rgnDst);
+    nbox = RegionNumRects(&rgnDst);
+    if (!nbox || !(pptSrc = (DDXPointPtr) malloc(nbox * sizeof(DDXPointRec)))) {
+        RegionUninit(&rgnDst);
+        return;
+    }
+    ppt = pptSrc;
+
+    while (nbox--) {
+        ppt->x = pbox->x1 + dx;
+        ppt->y = pbox->y1 + dy;
+        ppt++;
+        pbox++;
+    }
+
+    infoRec->ScratchGC.planemask = ~0L;
+    infoRec->ScratchGC.alu = GXcopy;
+
+    XAADoBitBlt((DrawablePtr) pwinRoot, (DrawablePtr) pwinRoot,
+                &(infoRec->ScratchGC), &rgnDst, pptSrc);
+
+    free(pptSrc);
+    RegionUninit(&rgnDst);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaDashLine.c b/xorg-server/hw/xfree86/xaa/xaaDashLine.c
index adae2e583..c7e52cd0b 100644
--- a/xorg-server/hw/xfree86/xaa/xaaDashLine.c
+++ b/xorg-server/hw/xfree86/xaa/xaaDashLine.c
@@ -1,334 +1,353 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <stdlib.h>

-

-#include <X11/X.h>

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "miline.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-

-

-void

-#ifdef POLYSEGMENT

-XAAPolySegmentDashed(

-    DrawablePtr	pDrawable,

-    GCPtr	pGC,

-    int		nseg,

-    xSegment	*pSeg

-#else

-XAAPolyLinesDashed(

-    DrawablePtr pDrawable,

-    GCPtr	pGC,

-    int		mode,		/* Origin or Previous */

-    int		npt,		/* number of points */

-    DDXPointPtr pptInit

-#endif

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    XAAGCPtr   pGCPriv = (XAAGCPtr)dixLookupPrivate(&pGC->devPrivates,

-						    XAAGetGCKey());

-    BoxPtr pboxInit = RegionRects(pGC->pCompositeClip);

-    int nboxInit = RegionNumRects(pGC->pCompositeClip);

-    unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);

-    int xorg = pDrawable->x;

-    int yorg = pDrawable->y;

-    int nbox;

-    BoxPtr pbox;

-#ifndef POLYSEGMENT

-    DDXPointPtr ppt;

-#endif

-    unsigned int oc1, oc2;

-    int dmin, dmaj, e, octant;

-    int x1, x2, y1, y2, tmp, len, offset;

-    int PatternLength, PatternOffset;

-

-    if(!nboxInit)

-	return;

-

-    if (infoRec->DashedLineFlags & LINE_LIMIT_COORDS) {

-	int minValX = infoRec->DashedLineLimits.x1;

-	int maxValX = infoRec->DashedLineLimits.x2;

-	int minValY = infoRec->DashedLineLimits.y1;

-	int maxValY = infoRec->DashedLineLimits.y2;

-#ifdef POLYSEGMENT

-	int n = nseg;

-	xSegment *s = pSeg;

-

-	while (n--)

-#else

-	int n = npt;

-	int xorgtmp = xorg;

-	int yorgtmp = yorg;

-

-	ppt = pptInit;

-	x2 = ppt->x + xorgtmp;

-	y2 = ppt->y + yorgtmp;

-	while (--n)

-#endif

-	{

-#ifdef POLYSEGMENT

-	    x1 = s->x1 + xorg;

-	    y1 = s->y1 + yorg;

-	    x2 = s->x2 + xorg;

-	    y2 = s->y2 + yorg;

-	    s++;

-#else

-	    x1 = x2;

-	    y1 = y2;

-	    ++ppt;

-	    if (mode == CoordModePrevious) {

-		xorgtmp = x1;

-		yorgtmp = y1;

-	    }

-	    x2 = ppt->x + xorgtmp;

-	    y2 = ppt->y + yorgtmp;

-#endif

-	    if (x1 > maxValX || x1 < minValX ||

-		x2 > maxValX || x2 < minValX ||

-		y1 > maxValY || y1 < minValY ||

-		y2 > maxValY || y2 < minValY) {

-#ifdef POLYSEGMENT

-		XAAFallbackOps.PolySegment(pDrawable, pGC, nseg, pSeg);

-#else

-		XAAFallbackOps.Polylines(pDrawable, pGC, mode, npt, pptInit);

-#endif

-		return;

-	    }

-	}

-    }

-

-    PatternLength = pGCPriv->DashLength; 

-    PatternOffset = pGC->dashOffset % PatternLength;

-

-    (*infoRec->SetupForDashedLine)(infoRec->pScrn, pGC->fgPixel,

-		(pGC->lineStyle == LineDoubleDash) ? pGC->bgPixel : -1,

-		pGC->alu, pGC->planemask, PatternLength, pGCPriv->DashPattern);

-

-

-#ifdef POLYSEGMENT

-    while (nseg--)

-#else

-    ppt = pptInit;

-    x2 = ppt->x + xorg;

-    y2 = ppt->y + yorg;

-    while(--npt)

-#endif

-    {

-	nbox = nboxInit;

-	pbox = pboxInit;

-

-#ifdef POLYSEGMENT

-	x1 = pSeg->x1 + xorg;	

-	y1 = pSeg->y1 + yorg;

-	x2 = pSeg->x2 + xorg;	

-	y2 = pSeg->y2 + yorg;

-	pSeg++;

-#else

-	x1 = x2; 

-	y1 = y2;

-	++ppt;

-	if (mode == CoordModePrevious) {

-	    xorg = x1; 

-	    yorg = y1;

-	}

-	x2 = ppt->x + xorg; 

-	y2 = ppt->y + yorg;

-#endif

-

-

-	if (infoRec->SubsequentDashedBresenhamLine) {

-	    if((dmaj = x2 - x1) < 0) {

-		dmaj = -dmaj;

-		octant = XDECREASING;

-	    } else octant = 0;		   

-

-	    if((dmin = y2 - y1) < 0) {

-		dmin = -dmin;

-		octant |= YDECREASING;

-	    }	

-	

-	    if(dmin >= dmaj){

-		tmp = dmin; dmin = dmaj; dmaj = tmp;

-		octant |= YMAJOR;

-	    }

-

-	    e = -dmaj - ((bias >> octant) & 1);

-	    len = dmaj;

-	    dmin <<= 1;

-	    dmaj <<= 1;

-	} else {	/* Muffle compiler */

-	    dmin = dmaj = e = octant = len = 0;

-	}

-

-	while(nbox--) {

-	    oc1 = oc2 = 0;

-	    OUTCODES(oc1, x1, y1, pbox);

-	    OUTCODES(oc2, x2, y2, pbox);

-	    if (!(oc1 | oc2)) {   /* uncliped */

-		if(infoRec->SubsequentDashedTwoPointLine) {

-		   (*infoRec->SubsequentDashedTwoPointLine)(

-				infoRec->pScrn, x1, y1, x2, y2, 

-#ifdef POLYSEGMENT

-			    	(pGC->capStyle != CapNotLast) ? 0 :

-#endif

-				OMIT_LAST, PatternOffset);

-		} else {

-		    (*infoRec->SubsequentDashedBresenhamLine)(

-				infoRec->pScrn, x1, y1, dmaj, dmin, e, 

-#ifdef POLYSEGMENT

-			    	(pGC->capStyle != CapNotLast) ? (len+1) :

-#endif

-			    	len, octant, PatternOffset);

-		}

-		break;

-	    } else if (oc1 & oc2) { /* completely clipped */

-		pbox++;

-	    } else if (infoRec->ClippingFlags & HARDWARE_CLIP_DASHED_LINE) {

-		(*infoRec->SetClippingRectangle)(infoRec->pScrn,

-			pbox->x1, pbox->y1, pbox->x2 - 1, pbox->y2 - 1);

-

-		if(infoRec->SubsequentDashedBresenhamLine) {

-		    (*infoRec->SubsequentDashedBresenhamLine)(

-				infoRec->pScrn, x1, y1, dmaj, dmin, e, 

-#ifdef POLYSEGMENT

-			    	(pGC->capStyle != CapNotLast) ? (len+1) :

-#endif

-			    	len, octant, PatternOffset);

-		} else {

-			(*infoRec->SubsequentDashedTwoPointLine)(

-				infoRec->pScrn, x1, y1, x2, y2, 

-#ifdef POLYSEGMENT

-			    	(pGC->capStyle != CapNotLast) ? 0 :

-#endif

-				OMIT_LAST, PatternOffset

-			);

-		}

-		(*infoRec->DisableClipping)(infoRec->pScrn);

-		pbox++;

-	    } else {

-		int new_x1 = x1, new_y1 = y1, new_x2 = x2, new_y2 = y2;

-		int clip1 = 0, clip2 = 0;

-		int err, adx, ady;

-		    

-		if(octant & YMAJOR) {

-		    ady = dmaj >> 1;

-		    adx = dmin >> 1;

-		} else {

-		    ady = dmin >> 1;

-		    adx = dmaj >> 1;

-		}

-

-		if (miZeroClipLine(pbox->x1, pbox->y1, 

-				       pbox->x2 - 1, pbox->y2 - 1,

-				       &new_x1, &new_y1, &new_x2, &new_y2,

-				       adx, ady, &clip1, &clip2,

-				       octant, bias, oc1, oc2) == -1)

-		{

-		    pbox++;

-		    continue;

-		}

-

-		if (octant & YMAJOR)

-		    len = abs(new_y2 - new_y1);

-		else

-		    len = abs(new_x2 - new_x1);

-#ifdef POLYSEGMENT

-		if (clip2 != 0 || pGC->capStyle != CapNotLast)

-		    len++;

-#else

-		len += (clip2 != 0);

-#endif

-		if (len) {

-		    int abserr, clipdx, clipdy;

-			/* unwind bresenham error term to first point */

-		    if (clip1) {

-			clipdx = abs(new_x1 - x1);

-			clipdy = abs(new_y1 - y1);

-

-			if (octant & YMAJOR)

-			    err = e + clipdy*dmin - clipdx*dmaj;

-			else

-			    err = e + clipdx*dmin - clipdy*dmaj;

-		    } else

-			err = e;

-

-#define range infoRec->DashedBresenhamLineErrorTermBits

-		    abserr = abs(err);			    

-		    while((abserr & range) || 

-			  (dmaj & range) ||

-			  (dmin & range)) {

-			dmin >>= 1;

-			dmaj >>= 1;

-			abserr >>= 1;

-			err /= 2;

-		    }

-

-		    if(octant & YMAJOR)

-			offset = abs(new_y1 - y1);

-		    else 

-			offset = abs(new_x1 - x1);

-

-		    offset += PatternOffset;

-		    offset %= PatternLength;

-

-		    (*infoRec->SubsequentDashedBresenhamLine)(

-				infoRec->pScrn, new_x1, new_y1,

-				dmaj, dmin, err, len, octant, offset);

-		}

-		pbox++;

-	    }

-	} /* while (nbox--) */

-#ifndef POLYSEGMENT

-	len = abs(y2 - y1);

-	tmp = abs(x2 - x1);

-	PatternOffset += (len > tmp) ? len : tmp;

-	PatternOffset %= PatternLength;

-#endif

-    } /* while (nline--) */

-

-#ifndef POLYSEGMENT

-    /* paint the last point if the end style isn't CapNotLast.

-       (Assume that a projecting, butt, or round cap that is one

-        pixel wide is the same as the single pixel of the endpoint.)

-    */

-

-    if ((pGC->capStyle != CapNotLast) &&

-	((ppt->x + xorg != pptInit->x + pDrawable->x) ||

-	 (ppt->y + yorg != pptInit->y + pDrawable->y) ||

-	 (ppt == pptInit + 1)))

-    {

-	nbox = nboxInit;

-	pbox = pboxInit;

-	while (nbox--) {

-	    if ((x2 >= pbox->x1) && (y2 >= pbox->y1) &&

-		(x2 <  pbox->x2) && (y2 <  pbox->y2))

-	    {

-		if(infoRec->SubsequentDashedTwoPointLine) {

-			(*infoRec->SubsequentDashedTwoPointLine)(

-				infoRec->pScrn, x2, y2, x2, y2, 0,

-				PatternOffset);

-		} else {

-			(*infoRec->SubsequentDashedBresenhamLine)(

-				infoRec->pScrn, x2, y2, 2, 0, -1, 

-				1, 0, PatternOffset);

-		}

-		break;

-	    } else

-		pbox++;

-	}

-    }

-#endif

-

-    SET_SYNC_FLAG(infoRec);

-}

-

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include <X11/X.h>
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "miline.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+
+void
+#ifdef POLYSEGMENT
+ XAAPolySegmentDashed(DrawablePtr pDrawable,
+                      GCPtr pGC, int nseg, xSegment * pSeg
+#else
+XAAPolyLinesDashed(DrawablePtr pDrawable, GCPtr pGC, int mode,  /* Origin or Previous */
+                   int npt,     /* number of points */
+                   DDXPointPtr pptInit
+#endif
+    )
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAAGCPtr pGCPriv = (XAAGCPtr) dixLookupPrivate(&pGC->devPrivates,
+                                                   XAAGetGCKey());
+    BoxPtr pboxInit = RegionRects(pGC->pCompositeClip);
+    int nboxInit = RegionNumRects(pGC->pCompositeClip);
+    unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);
+    int xorg = pDrawable->x;
+    int yorg = pDrawable->y;
+    int nbox;
+    BoxPtr pbox;
+
+#ifndef POLYSEGMENT
+    DDXPointPtr ppt;
+#endif
+    unsigned int oc1, oc2;
+    int dmin, dmaj, e, octant;
+    int x1, x2, y1, y2, tmp, len, offset;
+    int PatternLength, PatternOffset;
+
+    if (!nboxInit)
+        return;
+
+    if (infoRec->DashedLineFlags & LINE_LIMIT_COORDS) {
+        int minValX = infoRec->DashedLineLimits.x1;
+        int maxValX = infoRec->DashedLineLimits.x2;
+        int minValY = infoRec->DashedLineLimits.y1;
+        int maxValY = infoRec->DashedLineLimits.y2;
+
+#ifdef POLYSEGMENT
+        int n = nseg;
+        xSegment *s = pSeg;
+
+        while (n--)
+#else
+        int n = npt;
+        int xorgtmp = xorg;
+        int yorgtmp = yorg;
+
+        ppt = pptInit;
+        x2 = ppt->x + xorgtmp;
+        y2 = ppt->y + yorgtmp;
+        while (--n)
+#endif
+        {
+#ifdef POLYSEGMENT
+            x1 = s->x1 + xorg;
+            y1 = s->y1 + yorg;
+            x2 = s->x2 + xorg;
+            y2 = s->y2 + yorg;
+            s++;
+#else
+            x1 = x2;
+            y1 = y2;
+            ++ppt;
+            if (mode == CoordModePrevious) {
+                xorgtmp = x1;
+                yorgtmp = y1;
+            }
+            x2 = ppt->x + xorgtmp;
+            y2 = ppt->y + yorgtmp;
+#endif
+            if (x1 > maxValX || x1 < minValX ||
+                x2 > maxValX || x2 < minValX ||
+                y1 > maxValY || y1 < minValY || y2 > maxValY || y2 < minValY) {
+#ifdef POLYSEGMENT
+                XAAFallbackOps.PolySegment(pDrawable, pGC, nseg, pSeg);
+#else
+                XAAFallbackOps.Polylines(pDrawable, pGC, mode, npt, pptInit);
+#endif
+                return;
+            }
+        }
+    }
+
+    PatternLength = pGCPriv->DashLength;
+    PatternOffset = pGC->dashOffset % PatternLength;
+
+    (*infoRec->SetupForDashedLine) (infoRec->pScrn, pGC->fgPixel,
+                                    (pGC->lineStyle ==
+                                     LineDoubleDash) ? pGC->bgPixel : -1,
+                                    pGC->alu, pGC->planemask, PatternLength,
+                                    pGCPriv->DashPattern);
+
+#ifdef POLYSEGMENT
+    while (nseg--)
+#else
+    ppt = pptInit;
+    x2 = ppt->x + xorg;
+    y2 = ppt->y + yorg;
+    while (--npt)
+#endif
+    {
+        nbox = nboxInit;
+        pbox = pboxInit;
+
+#ifdef POLYSEGMENT
+        x1 = pSeg->x1 + xorg;
+        y1 = pSeg->y1 + yorg;
+        x2 = pSeg->x2 + xorg;
+        y2 = pSeg->y2 + yorg;
+        pSeg++;
+#else
+        x1 = x2;
+        y1 = y2;
+        ++ppt;
+        if (mode == CoordModePrevious) {
+            xorg = x1;
+            yorg = y1;
+        }
+        x2 = ppt->x + xorg;
+        y2 = ppt->y + yorg;
+#endif
+
+        if (infoRec->SubsequentDashedBresenhamLine) {
+            if ((dmaj = x2 - x1) < 0) {
+                dmaj = -dmaj;
+                octant = XDECREASING;
+            }
+            else
+                octant = 0;
+
+            if ((dmin = y2 - y1) < 0) {
+                dmin = -dmin;
+                octant |= YDECREASING;
+            }
+
+            if (dmin >= dmaj) {
+                tmp = dmin;
+                dmin = dmaj;
+                dmaj = tmp;
+                octant |= YMAJOR;
+            }
+
+            e = -dmaj - ((bias >> octant) & 1);
+            len = dmaj;
+            dmin <<= 1;
+            dmaj <<= 1;
+        }
+        else {                  /* Muffle compiler */
+            dmin = dmaj = e = octant = len = 0;
+        }
+
+        while (nbox--) {
+            oc1 = oc2 = 0;
+            OUTCODES(oc1, x1, y1, pbox);
+            OUTCODES(oc2, x2, y2, pbox);
+            if (!(oc1 | oc2)) { /* uncliped */
+                if (infoRec->SubsequentDashedTwoPointLine) {
+                    (*infoRec->SubsequentDashedTwoPointLine) (infoRec->pScrn,
+                                                              x1, y1, x2, y2,
+#ifdef POLYSEGMENT
+                                                              (pGC->capStyle !=
+                                                               CapNotLast) ? 0 :
+#endif
+                                                              OMIT_LAST,
+                                                              PatternOffset);
+                }
+                else {
+                    (*infoRec->SubsequentDashedBresenhamLine) (infoRec->pScrn,
+                                                               x1, y1, dmaj,
+                                                               dmin, e,
+#ifdef POLYSEGMENT
+                                                               (pGC->capStyle !=
+                                                                CapNotLast)
+                                                               ? (len + 1) :
+#endif
+                                                               len, octant,
+                                                               PatternOffset);
+                }
+                break;
+            }
+            else if (oc1 & oc2) {       /* completely clipped */
+                pbox++;
+            }
+            else if (infoRec->ClippingFlags & HARDWARE_CLIP_DASHED_LINE) {
+                (*infoRec->SetClippingRectangle) (infoRec->pScrn,
+                                                  pbox->x1, pbox->y1,
+                                                  pbox->x2 - 1, pbox->y2 - 1);
+
+                if (infoRec->SubsequentDashedBresenhamLine) {
+                    (*infoRec->SubsequentDashedBresenhamLine) (infoRec->pScrn,
+                                                               x1, y1, dmaj,
+                                                               dmin, e,
+#ifdef POLYSEGMENT
+                                                               (pGC->capStyle !=
+                                                                CapNotLast)
+                                                               ? (len + 1) :
+#endif
+                                                               len, octant,
+                                                               PatternOffset);
+                }
+                else {
+                    (*infoRec->SubsequentDashedTwoPointLine) (infoRec->pScrn,
+                                                              x1, y1, x2, y2,
+#ifdef POLYSEGMENT
+                                                              (pGC->capStyle !=
+                                                               CapNotLast) ? 0 :
+#endif
+                                                              OMIT_LAST,
+                                                              PatternOffset);
+                }
+                (*infoRec->DisableClipping) (infoRec->pScrn);
+                pbox++;
+            }
+            else {
+                int new_x1 = x1, new_y1 = y1, new_x2 = x2, new_y2 = y2;
+                int clip1 = 0, clip2 = 0;
+                int err, adx, ady;
+
+                if (octant & YMAJOR) {
+                    ady = dmaj >> 1;
+                    adx = dmin >> 1;
+                }
+                else {
+                    ady = dmin >> 1;
+                    adx = dmaj >> 1;
+                }
+
+                if (miZeroClipLine(pbox->x1, pbox->y1,
+                                   pbox->x2 - 1, pbox->y2 - 1,
+                                   &new_x1, &new_y1, &new_x2, &new_y2,
+                                   adx, ady, &clip1, &clip2,
+                                   octant, bias, oc1, oc2) == -1) {
+                    pbox++;
+                    continue;
+                }
+
+                if (octant & YMAJOR)
+                    len = abs(new_y2 - new_y1);
+                else
+                    len = abs(new_x2 - new_x1);
+#ifdef POLYSEGMENT
+                if (clip2 != 0 || pGC->capStyle != CapNotLast)
+                    len++;
+#else
+                len += (clip2 != 0);
+#endif
+                if (len) {
+                    int abserr, clipdx, clipdy;
+
+                    /* unwind bresenham error term to first point */
+                    if (clip1) {
+                        clipdx = abs(new_x1 - x1);
+                        clipdy = abs(new_y1 - y1);
+
+                        if (octant & YMAJOR)
+                            err = e + clipdy * dmin - clipdx * dmaj;
+                        else
+                            err = e + clipdx * dmin - clipdy * dmaj;
+                    }
+                    else
+                        err = e;
+
+#define range infoRec->DashedBresenhamLineErrorTermBits
+                    abserr = abs(err);
+                    while ((abserr & range) || (dmaj & range) || (dmin & range)) {
+                        dmin >>= 1;
+                        dmaj >>= 1;
+                        abserr >>= 1;
+                        err /= 2;
+                    }
+
+                    if (octant & YMAJOR)
+                        offset = abs(new_y1 - y1);
+                    else
+                        offset = abs(new_x1 - x1);
+
+                    offset += PatternOffset;
+                    offset %= PatternLength;
+
+                    (*infoRec->SubsequentDashedBresenhamLine) (infoRec->pScrn,
+                                                               new_x1, new_y1,
+                                                               dmaj, dmin, err,
+                                                               len, octant,
+                                                               offset);
+                }
+                pbox++;
+            }
+        }                       /* while (nbox--) */
+#ifndef POLYSEGMENT
+        len = abs(y2 - y1);
+        tmp = abs(x2 - x1);
+        PatternOffset += (len > tmp) ? len : tmp;
+        PatternOffset %= PatternLength;
+#endif
+    }                           /* while (nline--) */
+
+#ifndef POLYSEGMENT
+    /* paint the last point if the end style isn't CapNotLast.
+       (Assume that a projecting, butt, or round cap that is one
+       pixel wide is the same as the single pixel of the endpoint.)
+     */
+
+    if ((pGC->capStyle != CapNotLast) &&
+        ((ppt->x + xorg != pptInit->x + pDrawable->x) ||
+         (ppt->y + yorg != pptInit->y + pDrawable->y) ||
+         (ppt == pptInit + 1))) {
+        nbox = nboxInit;
+        pbox = pboxInit;
+        while (nbox--) {
+            if ((x2 >= pbox->x1) && (y2 >= pbox->y1) &&
+                (x2 < pbox->x2) && (y2 < pbox->y2)) {
+                if (infoRec->SubsequentDashedTwoPointLine) {
+                    (*infoRec->SubsequentDashedTwoPointLine) (infoRec->pScrn,
+                                                              x2, y2, x2, y2, 0,
+                                                              PatternOffset);
+                }
+                else {
+                    (*infoRec->SubsequentDashedBresenhamLine) (infoRec->pScrn,
+                                                               x2, y2, 2, 0, -1,
+                                                               1, 0,
+                                                               PatternOffset);
+                }
+                break;
+            }
+            else
+                pbox++;
+        }
+    }
+#endif
+
+    SET_SYNC_FLAG(infoRec);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaFallback.c b/xorg-server/hw/xfree86/xaa/xaaFallback.c
index 744fd0a21..f7604ef90 100644
--- a/xorg-server/hw/xfree86/xaa/xaaFallback.c
+++ b/xorg-server/hw/xfree86/xaa/xaaFallback.c
@@ -1,351 +1,281 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "gcstruct.h"

-#include "pixmapstr.h"

-#include "xaawrap.h"

-

-

-

-static void

-XAAFillSpansFallback(

-    DrawablePtr pDraw,

-    GC		*pGC,

-    int		nInit,	

-    DDXPointPtr pptInit,	

-    int *pwidthInit,		

-    int fSorted )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-XAASetSpansFallback(

-    DrawablePtr		pDraw,

-    GCPtr		pGC,

-    char		*pcharsrc,

-    register DDXPointPtr ppt,

-    int			*pwidth,

-    int			nspans,

-    int			fSorted )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-XAAPutImageFallback(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		depth, 

-    int x, int y, int w, int h,

-    int		leftPad,

-    int		format,

-    char 	*pImage )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h, 

-		leftPad, format, pImage);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-static RegionPtr

-XAACopyAreaFallback(

-    DrawablePtr pSrc,

-    DrawablePtr pDst,

-    GC *pGC,

-    int srcx, int srcy,

-    int width, int height,

-    int dstx, int dsty )

-{

-    RegionPtr ret;

-

-    XAA_GC_OP_PROLOGUE(pGC);

-    if((pSrc->type == DRAWABLE_WINDOW) || (pDst->type == DRAWABLE_WINDOW) ||

-	IS_OFFSCREEN_PIXMAP(pSrc) || IS_OFFSCREEN_PIXMAP(pDst)) {

-	SYNC_CHECK(pGC);

-    }

-    ret = (*pGC->ops->CopyArea)(pSrc, pDst,

-            pGC, srcx, srcy, width, height, dstx, dsty);

-    XAA_GC_OP_EPILOGUE(pGC);

-    return ret;

-}

-

-static RegionPtr

-XAACopyPlaneFallback(

-    DrawablePtr	pSrc,

-    DrawablePtr	pDst,

-    GCPtr pGC,

-    int	srcx, int srcy,

-    int	width, int height,

-    int	dstx, int dsty,

-    unsigned long bitPlane )

-{

-    RegionPtr ret;

-

-    XAA_GC_OP_PROLOGUE(pGC);

-    if((pSrc->type == DRAWABLE_WINDOW) || (pDst->type == DRAWABLE_WINDOW) ||

-	IS_OFFSCREEN_PIXMAP(pSrc) || IS_OFFSCREEN_PIXMAP(pDst)) {

-	SYNC_CHECK(pGC);

-    }

-    ret = (*pGC->ops->CopyPlane)(pSrc, pDst,

-	       pGC, srcx, srcy, width, height, dstx, dsty, bitPlane);

-    XAA_GC_OP_EPILOGUE(pGC);

-    return ret;

-}

-

-static void

-XAAPolyPointFallback(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int mode,

-    int npt,

-    xPoint *pptInit )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, npt, pptInit);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-

-static void

-XAAPolylinesFallback(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		mode,		

-    int		npt,		

-    DDXPointPtr pptInit )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->Polylines)(pDraw, pGC, mode, npt, pptInit);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-static void 

-XAAPolySegmentFallback(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		nseg,

-    xSegment	*pSeg )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->PolySegment)(pDraw, pGC, nseg, pSeg);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-XAAPolyRectangleFallback(

-    DrawablePtr  pDraw,

-    GCPtr        pGC,

-    int	         nRectsInit,

-    xRectangle  *pRectsInit )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRectsInit, pRectsInit);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-XAAPolyArcFallback(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		narcs,

-    xArc	*parcs )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->PolyArc)(pDraw, pGC, narcs, parcs);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-XAAFillPolygonFallback(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		shape,

-    int		mode,

-    int		count,

-    DDXPointPtr	ptsIn )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-

-static void 

-XAAPolyFillRectFallback(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		nrectFill, 

-    xRectangle	*prectInit )  

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->PolyFillRect)(pDraw, pGC, nrectFill, prectInit);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-

-static void

-XAAPolyFillArcFallback(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		narcs,

-    xArc	*parcs )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcs, parcs);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-static int

-XAAPolyText8Fallback(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x, 

-    int 	y,

-    int 	count,

-    char	*chars )

-{

-    int ret;

-

-    XAA_GC_OP_PROLOGUE(pGC);

-    SYNC_CHECK(pGC);

-    ret = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);

-    XAA_GC_OP_EPILOGUE(pGC);

-    return ret;

-}

-

-static int

-XAAPolyText16Fallback(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x,

-    int		y,

-    int 	count,

-    unsigned short *chars )

-{

-    int ret;

-

-    XAA_GC_OP_PROLOGUE(pGC);

-    SYNC_CHECK(pGC);

-    ret = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);

-    XAA_GC_OP_EPILOGUE(pGC);

-    return ret;

-}

-

-static void

-XAAImageText8Fallback(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x, 

-    int		y,

-    int 	count,

-    char	*chars )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-XAAImageText16Fallback(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x,

-    int		y,

-    int 	count,

-    unsigned short *chars )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-

-static void

-XAAImageGlyphBltFallback(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int xInit, int yInit,

-    unsigned int nglyph,

-    CharInfoPtr *ppci,

-    pointer pglyphBase )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, xInit, yInit, nglyph, ppci, pglyphBase);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-XAAPolyGlyphBltFallback(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int xInit, int yInit,

-    unsigned int nglyph,

-    CharInfoPtr *ppci,

-    pointer pglyphBase )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, xInit, yInit, nglyph, ppci, pglyphBase);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-static void

-XAAPushPixelsFallback(

-    GCPtr	pGC,

-    PixmapPtr	pBitMap,

-    DrawablePtr pDraw,

-    int	dx, int dy, int xOrg, int yOrg )

-{

-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

-    SYNC_CHECK(pGC);

-    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);

-    XAA_GC_OP_EPILOGUE(pGC);

-}

-

-GCOps XAAFallbackOps = {

-    XAAFillSpansFallback, XAASetSpansFallback, 

-    XAAPutImageFallback, XAACopyAreaFallback, 

-    XAACopyPlaneFallback, XAAPolyPointFallback, 

-    XAAPolylinesFallback, XAAPolySegmentFallback, 

-    XAAPolyRectangleFallback, XAAPolyArcFallback, 

-    XAAFillPolygonFallback, XAAPolyFillRectFallback, 

-    XAAPolyFillArcFallback, XAAPolyText8Fallback, 

-    XAAPolyText16Fallback, XAAImageText8Fallback, 

-    XAAImageText16Fallback, XAAImageGlyphBltFallback, 

-    XAAPolyGlyphBltFallback, XAAPushPixelsFallback,

-};

-

-GCOps *XAAGetFallbackOps(void)

-{

-    return &XAAFallbackOps;

-}

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+#include "xaawrap.h"
+
+static void
+XAAFillSpansFallback(DrawablePtr pDraw,
+                     GC * pGC,
+                     int nInit,
+                     DDXPointPtr pptInit, int *pwidthInit, int fSorted)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->FillSpans) (pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAASetSpansFallback(DrawablePtr pDraw,
+                    GCPtr pGC,
+                    char *pcharsrc,
+                    register DDXPointPtr ppt,
+                    int *pwidth, int nspans, int fSorted)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->SetSpans) (pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAPutImageFallback(DrawablePtr pDraw,
+                    GCPtr pGC,
+                    int depth,
+                    int x, int y, int w, int h,
+                    int leftPad, int format, char *pImage)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->PutImage) (pDraw, pGC, depth, x, y, w, h,
+                           leftPad, format, pImage);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static RegionPtr
+XAACopyAreaFallback(DrawablePtr pSrc,
+                    DrawablePtr pDst,
+                    GC * pGC,
+                    int srcx, int srcy,
+                    int width, int height, int dstx, int dsty)
+{
+    RegionPtr ret;
+
+    XAA_GC_OP_PROLOGUE(pGC);
+    if ((pSrc->type == DRAWABLE_WINDOW) || (pDst->type == DRAWABLE_WINDOW) ||
+        IS_OFFSCREEN_PIXMAP(pSrc) || IS_OFFSCREEN_PIXMAP(pDst)) {
+        SYNC_CHECK(pGC);
+    }
+    ret = (*pGC->ops->CopyArea) (pSrc, pDst,
+                                 pGC, srcx, srcy, width, height, dstx, dsty);
+    XAA_GC_OP_EPILOGUE(pGC);
+    return ret;
+}
+
+static RegionPtr
+XAACopyPlaneFallback(DrawablePtr pSrc,
+                     DrawablePtr pDst,
+                     GCPtr pGC,
+                     int srcx, int srcy,
+                     int width, int height,
+                     int dstx, int dsty, unsigned long bitPlane)
+{
+    RegionPtr ret;
+
+    XAA_GC_OP_PROLOGUE(pGC);
+    if ((pSrc->type == DRAWABLE_WINDOW) || (pDst->type == DRAWABLE_WINDOW) ||
+        IS_OFFSCREEN_PIXMAP(pSrc) || IS_OFFSCREEN_PIXMAP(pDst)) {
+        SYNC_CHECK(pGC);
+    }
+    ret = (*pGC->ops->CopyPlane) (pSrc, pDst,
+                                  pGC, srcx, srcy, width, height, dstx, dsty,
+                                  bitPlane);
+    XAA_GC_OP_EPILOGUE(pGC);
+    return ret;
+}
+
+static void
+XAAPolyPointFallback(DrawablePtr pDraw,
+                     GCPtr pGC, int mode, int npt, xPoint * pptInit)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->PolyPoint) (pDraw, pGC, mode, npt, pptInit);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAPolylinesFallback(DrawablePtr pDraw,
+                     GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->Polylines) (pDraw, pGC, mode, npt, pptInit);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAPolySegmentFallback(DrawablePtr pDraw, GCPtr pGC, int nseg, xSegment * pSeg)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->PolySegment) (pDraw, pGC, nseg, pSeg);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAPolyRectangleFallback(DrawablePtr pDraw,
+                         GCPtr pGC, int nRectsInit, xRectangle *pRectsInit)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->PolyRectangle) (pDraw, pGC, nRectsInit, pRectsInit);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAPolyArcFallback(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->PolyArc) (pDraw, pGC, narcs, parcs);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAFillPolygonFallback(DrawablePtr pDraw,
+                       GCPtr pGC,
+                       int shape, int mode, int count, DDXPointPtr ptsIn)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->FillPolygon) (pDraw, pGC, shape, mode, count, ptsIn);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAPolyFillRectFallback(DrawablePtr pDraw,
+                        GCPtr pGC, int nrectFill, xRectangle *prectInit)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->PolyFillRect) (pDraw, pGC, nrectFill, prectInit);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAPolyFillArcFallback(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->PolyFillArc) (pDraw, pGC, narcs, parcs);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static int
+XAAPolyText8Fallback(DrawablePtr pDraw,
+                     GCPtr pGC, int x, int y, int count, char *chars)
+{
+    int ret;
+
+    XAA_GC_OP_PROLOGUE(pGC);
+    SYNC_CHECK(pGC);
+    ret = (*pGC->ops->PolyText8) (pDraw, pGC, x, y, count, chars);
+    XAA_GC_OP_EPILOGUE(pGC);
+    return ret;
+}
+
+static int
+XAAPolyText16Fallback(DrawablePtr pDraw,
+                      GCPtr pGC, int x, int y, int count, unsigned short *chars)
+{
+    int ret;
+
+    XAA_GC_OP_PROLOGUE(pGC);
+    SYNC_CHECK(pGC);
+    ret = (*pGC->ops->PolyText16) (pDraw, pGC, x, y, count, chars);
+    XAA_GC_OP_EPILOGUE(pGC);
+    return ret;
+}
+
+static void
+XAAImageText8Fallback(DrawablePtr pDraw,
+                      GCPtr pGC, int x, int y, int count, char *chars)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->ImageText8) (pDraw, pGC, x, y, count, chars);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAImageText16Fallback(DrawablePtr pDraw,
+                       GCPtr pGC,
+                       int x, int y, int count, unsigned short *chars)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->ImageText16) (pDraw, pGC, x, y, count, chars);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAImageGlyphBltFallback(DrawablePtr pDraw,
+                         GCPtr pGC,
+                         int xInit, int yInit,
+                         unsigned int nglyph,
+                         CharInfoPtr * ppci, pointer pglyphBase)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->ImageGlyphBlt) (pDraw, pGC, xInit, yInit, nglyph, ppci,
+                                pglyphBase);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAPolyGlyphBltFallback(DrawablePtr pDraw,
+                        GCPtr pGC,
+                        int xInit, int yInit,
+                        unsigned int nglyph,
+                        CharInfoPtr * ppci, pointer pglyphBase)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->PolyGlyphBlt) (pDraw, pGC, xInit, yInit, nglyph, ppci,
+                               pglyphBase);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+static void
+XAAPushPixelsFallback(GCPtr pGC,
+                      PixmapPtr pBitMap,
+                      DrawablePtr pDraw, int dx, int dy, int xOrg, int yOrg)
+{
+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
+    SYNC_CHECK(pGC);
+    (*pGC->ops->PushPixels) (pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
+    XAA_GC_OP_EPILOGUE(pGC);
+}
+
+GCOps XAAFallbackOps = {
+    XAAFillSpansFallback, XAASetSpansFallback,
+    XAAPutImageFallback, XAACopyAreaFallback,
+    XAACopyPlaneFallback, XAAPolyPointFallback,
+    XAAPolylinesFallback, XAAPolySegmentFallback,
+    XAAPolyRectangleFallback, XAAPolyArcFallback,
+    XAAFillPolygonFallback, XAAPolyFillRectFallback,
+    XAAPolyFillArcFallback, XAAPolyText8Fallback,
+    XAAPolyText16Fallback, XAAImageText8Fallback,
+    XAAImageText16Fallback, XAAImageGlyphBltFallback,
+    XAAPolyGlyphBltFallback, XAAPushPixelsFallback,
+};
+
+GCOps *
+XAAGetFallbackOps(void)
+{
+    return &XAAFallbackOps;
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaFillArc.c b/xorg-server/hw/xfree86/xaa/xaaFillArc.c
index 824d2af1d..fb7e7201f 100644
--- a/xorg-server/hw/xfree86/xaa/xaaFillArc.c
+++ b/xorg-server/hw/xfree86/xaa/xaaFillArc.c
@@ -1,213 +1,202 @@
-/*

- * Copyright 1996  The XFree86 Project

- *

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

- * HARM HANEMAAYER 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.

- * 

- * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).

- */

- 

-/*

- * Filled solid arcs, based on cfbfillarc.c.

- *

- * Fill arc using calls to low-level span fill. Because the math for

- * each span can be done concurrently with the drawing of the span

- * with a graphics coprocessor operation, this is faster than just

- * using miPolyFillArc, which first calculates all the spans and then

- * calls FillSpans.

- *

- * Clipped arcs are dispatched to FillSpans.

- */

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <limits.h>

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "mifillarc.h"

-#include "mi.h"

-

-/*

- * This is based on the integer-math versions from mi. Perhaps on a

- * Pentium, the floating-point (double)-math version is faster.

- */

-

-static void

-XAAFillEllipseSolid(DrawablePtr pDraw, GCPtr pGC, xArc *arc)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    register int x, y, e;

-    int yk, xk, ym, xm, dx, dy, xorg, yorg;

-    int slw;

-    miFillArcRec info;

-

-    (*infoRec->SetupForSolidFill)(infoRec->pScrn, pGC->fgPixel, pGC->alu,

-		pGC->planemask);

-

-    miFillArcSetup(arc, &info);

-    MIFILLARCSETUP();

-    if (pGC->miTranslate)

-    {

-	xorg += pDraw->x;

-	yorg += pDraw->y;

-    }

-    while (y > 0)

-    {

-	MIFILLARCSTEP(slw);

-	if (slw > 0) {

-	    (*infoRec->SubsequentSolidFillRect)(infoRec->pScrn, xorg - x,

-		    yorg - y, slw, 1);

-            if (miFillArcLower(slw))

-		(*infoRec->SubsequentSolidFillRect)(infoRec->pScrn,

-			xorg - x, yorg + y + dy, slw, 1);

-	}

-    }

-

-    SET_SYNC_FLAG(infoRec);

-}

-

-

-#define ADDSPAN(l,r) \

-    if (r >= l) \

-	(*infoRec->SubsequentSolidFillRect)( \

-	    infoRec->pScrn, l, ya, r - l + 1, 1);

-

-#define ADDSLICESPANS(flip) \

-    if (!flip) \

-    { \

-	ADDSPAN(xl, xr); \

-    } \

-    else \

-    { \

-	xc = xorg - x; \

-	ADDSPAN(xc, xr); \

-	xc += slw - 1; \

-	ADDSPAN(xl, xc); \

-    }

-

-static void

-XAAFillArcSliceSolid(DrawablePtr pDraw, GCPtr pGC, xArc *arc)

-{ 

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    int yk, xk, ym, xm, dx, dy, xorg, yorg, slw;

-    register int x, y, e;

-    miFillArcRec info;

-    miArcSliceRec slice;

-    int ya, xl, xr, xc;

-

-    (*infoRec->SetupForSolidFill)(infoRec->pScrn, pGC->fgPixel, pGC->alu,

-        pGC->planemask);

-

-    miFillArcSetup(arc, &info);

-    miFillArcSliceSetup(arc, &slice, pGC);

-    MIFILLARCSETUP();

-    slw = arc->height;

-    if (slice.flip_top || slice.flip_bot)

-	slw += (arc->height >> 1) + 1;

-    if (pGC->miTranslate)

-    {

-	xorg += pDraw->x;

-	yorg += pDraw->y;

-	slice.edge1.x += pDraw->x;

-	slice.edge2.x += pDraw->x;

-    }

-    while (y > 0)

-    {

-	MIFILLARCSTEP(slw);

-	MIARCSLICESTEP(slice.edge1);

-	MIARCSLICESTEP(slice.edge2);

-	if (miFillSliceUpper(slice))

-	{

-	    ya = yorg - y;

-	    MIARCSLICEUPPER(xl, xr, slice, slw);

-	    

-	    ADDSLICESPANS(slice.flip_top);

-	}

-	if (miFillSliceLower(slice))

-	{

-	    ya = yorg + y + dy;

-	    MIARCSLICELOWER(xl, xr, slice, slw);

-	    ADDSLICESPANS(slice.flip_bot);

-	}

-    }

-

-    SET_SYNC_FLAG(infoRec);

-}

-

-

-void

-XAAPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)

-{

-    register xArc *arc;

-    register int i;

-    int x2, y2;

-    BoxRec box;

-    RegionPtr cclip;

-

-    cclip = pGC->pCompositeClip;

-

-    if(!RegionNumRects(cclip))

-	return;

-

-    for (arc = parcs, i = narcs; --i >= 0; arc++)

-    {

-	if (miFillArcEmpty(arc))

-	    continue;

-	if (miCanFillArc(arc))

-	{

-	    box.x1 = arc->x + pDraw->x;

-	    box.y1 = arc->y + pDraw->y;

- 	    /*

- 	     * Because box.x2 and box.y2 get truncated to 16 bits, and the

- 	     * RECT_IN_REGION test treats the resulting number as a signed

- 	     * integer, the RECT_IN_REGION test alone can go the wrong way.

- 	     * This can result in a server crash because the rendering

- 	     * routines in this file deal directly with cpu addresses

- 	     * of pixels to be stored, and do not clip or otherwise check

- 	     * that all such addresses are within their respective pixmaps.

- 	     * So we only allow the RECT_IN_REGION test to be used for

- 	     * values that can be expressed correctly in a signed short.

- 	     */

- 	    x2 = box.x1 + (int)arc->width + 1;

- 	    box.x2 = x2;

- 	    y2 = box.y1 + (int)arc->height + 1;

- 	    box.y2 = y2;

- 	    if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&

-		    (RegionContainsRect(cclip, &box) == rgnIN) )

-	    {

-		if ((arc->angle2 >= FULLCIRCLE) ||

-		    (arc->angle2 <= -FULLCIRCLE))

-		    XAAFillEllipseSolid(pDraw, pGC, arc);

-		else

-		    XAAFillArcSliceSolid(pDraw, pGC, arc);

-		continue;

-	    }

-	}

-	miPolyFillArc(pDraw, pGC, 1, arc);

-    }

-}

+/*
+ * Copyright 1996  The XFree86 Project
+ *
+ * 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 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 
+ * HARM HANEMAAYER 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.
+ * 
+ * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).
+ */
+
+/*
+ * Filled solid arcs, based on cfbfillarc.c.
+ *
+ * Fill arc using calls to low-level span fill. Because the math for
+ * each span can be done concurrently with the drawing of the span
+ * with a graphics coprocessor operation, this is faster than just
+ * using miPolyFillArc, which first calculates all the spans and then
+ * calls FillSpans.
+ *
+ * Clipped arcs are dispatched to FillSpans.
+ */
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <limits.h>
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "mifillarc.h"
+#include "mi.h"
+
+/*
+ * This is based on the integer-math versions from mi. Perhaps on a
+ * Pentium, the floating-point (double)-math version is faster.
+ */
+
+static void
+XAAFillEllipseSolid(DrawablePtr pDraw, GCPtr pGC, xArc * arc)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    register int x, y, e;
+    int yk, xk, ym, xm, dx, dy, xorg, yorg;
+    int slw;
+    miFillArcRec info;
+
+    (*infoRec->SetupForSolidFill) (infoRec->pScrn, pGC->fgPixel, pGC->alu,
+                                   pGC->planemask);
+
+    miFillArcSetup(arc, &info);
+    MIFILLARCSETUP();
+    if (pGC->miTranslate) {
+        xorg += pDraw->x;
+        yorg += pDraw->y;
+    }
+    while (y > 0) {
+        MIFILLARCSTEP(slw);
+        if (slw > 0) {
+            (*infoRec->SubsequentSolidFillRect) (infoRec->pScrn, xorg - x,
+                                                 yorg - y, slw, 1);
+            if (miFillArcLower(slw))
+                (*infoRec->SubsequentSolidFillRect) (infoRec->pScrn,
+                                                     xorg - x, yorg + y + dy,
+                                                     slw, 1);
+        }
+    }
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+#define ADDSPAN(l,r) \
+    if (r >= l) \
+	(*infoRec->SubsequentSolidFillRect)( \
+	    infoRec->pScrn, l, ya, r - l + 1, 1);
+
+#define ADDSLICESPANS(flip) \
+    if (!flip) \
+    { \
+	ADDSPAN(xl, xr); \
+    } \
+    else \
+    { \
+	xc = xorg - x; \
+	ADDSPAN(xc, xr); \
+	xc += slw - 1; \
+	ADDSPAN(xl, xc); \
+    }
+
+static void
+XAAFillArcSliceSolid(DrawablePtr pDraw, GCPtr pGC, xArc * arc)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int yk, xk, ym, xm, dx, dy, xorg, yorg, slw;
+    register int x, y, e;
+    miFillArcRec info;
+    miArcSliceRec slice;
+    int ya, xl, xr, xc;
+
+    (*infoRec->SetupForSolidFill) (infoRec->pScrn, pGC->fgPixel, pGC->alu,
+                                   pGC->planemask);
+
+    miFillArcSetup(arc, &info);
+    miFillArcSliceSetup(arc, &slice, pGC);
+    MIFILLARCSETUP();
+    slw = arc->height;
+    if (slice.flip_top || slice.flip_bot)
+        slw += (arc->height >> 1) + 1;
+    if (pGC->miTranslate) {
+        xorg += pDraw->x;
+        yorg += pDraw->y;
+        slice.edge1.x += pDraw->x;
+        slice.edge2.x += pDraw->x;
+    }
+    while (y > 0) {
+        MIFILLARCSTEP(slw);
+        MIARCSLICESTEP(slice.edge1);
+        MIARCSLICESTEP(slice.edge2);
+        if (miFillSliceUpper(slice)) {
+            ya = yorg - y;
+            MIARCSLICEUPPER(xl, xr, slice, slw);
+
+            ADDSLICESPANS(slice.flip_top);
+        }
+        if (miFillSliceLower(slice)) {
+            ya = yorg + y + dy;
+            MIARCSLICELOWER(xl, xr, slice, slw);
+            ADDSLICESPANS(slice.flip_bot);
+        }
+    }
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+void
+XAAPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs)
+{
+    register xArc *arc;
+    register int i;
+    int x2, y2;
+    BoxRec box;
+    RegionPtr cclip;
+
+    cclip = pGC->pCompositeClip;
+
+    if (!RegionNumRects(cclip))
+        return;
+
+    for (arc = parcs, i = narcs; --i >= 0; arc++) {
+        if (miFillArcEmpty(arc))
+            continue;
+        if (miCanFillArc(arc)) {
+            box.x1 = arc->x + pDraw->x;
+            box.y1 = arc->y + pDraw->y;
+            /*
+             * Because box.x2 and box.y2 get truncated to 16 bits, and the
+             * RECT_IN_REGION test treats the resulting number as a signed
+             * integer, the RECT_IN_REGION test alone can go the wrong way.
+             * This can result in a server crash because the rendering
+             * routines in this file deal directly with cpu addresses
+             * of pixels to be stored, and do not clip or otherwise check
+             * that all such addresses are within their respective pixmaps.
+             * So we only allow the RECT_IN_REGION test to be used for
+             * values that can be expressed correctly in a signed short.
+             */
+            x2 = box.x1 + (int) arc->width + 1;
+            box.x2 = x2;
+            y2 = box.y1 + (int) arc->height + 1;
+            box.y2 = y2;
+            if ((x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&
+                (RegionContainsRect(cclip, &box) == rgnIN)) {
+                if ((arc->angle2 >= FULLCIRCLE) || (arc->angle2 <= -FULLCIRCLE))
+                    XAAFillEllipseSolid(pDraw, pGC, arc);
+                else
+                    XAAFillArcSliceSolid(pDraw, pGC, arc);
+                continue;
+            }
+        }
+        miPolyFillArc(pDraw, pGC, 1, arc);
+    }
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaFillPoly.c b/xorg-server/hw/xfree86/xaa/xaaFillPoly.c
index b8347b336..0cdedf57e 100644
--- a/xorg-server/hw/xfree86/xaa/xaaFillPoly.c
+++ b/xorg-server/hw/xfree86/xaa/xaaFillPoly.c
@@ -1,962 +1,991 @@
-

-/*

- * Copyright 1996  The XFree86 Project

- *

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

- * HARM HANEMAAYER 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.

- * 

- */

- 

-/*

- * Written by Mark Vojkovich.  Loosly based on an original version

- * written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net) which

- * only did solid rectangles and didn't have trapezoid support.

- *

- */

-

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "xf86str.h"

-#include "mi.h"

-#include "micoord.h"

-

-#include "xaa.h"

-#include "xaalocal.h"

-

-#define POLY_USE_MI		0

-#define POLY_FULLY_CLIPPED	1

-#define POLY_IS_EASY		2

-

-

-#define Setup(c,x,vertex,dx,dy,e,sign,step,DX) {\

-    x = intToX(vertex); \

-    if ((dy = intToY(c) - y)) { \

-    	DX = dx = intToX(c) - x; \

-	step = 0; \

-    	if (dx >= 0) \

-    	{ \

-	    e = 0; \

-	    sign = 1; \

-	    if (dx >= dy) {\

-	    	step = dx / dy; \

-	    	dx %= dy; \

-	    } \

-    	} \

-    	else \

-    	{ \

-	    e = 1 - dy; \

-	    sign = -1; \

-	    dx = -dx; \

-	    if (dx >= dy) { \

-		step = - (dx / dy); \

-		dx %= dy; \

-	    } \

-    	} \

-    } \

-    x += origin; \

-    vertex = c; \

-}

-

-#define Step(x,dx,dy,e,sign,step) {\

-    x += step; \

-    if ((e += dx) > 0) \

-    { \

-	x += sign; \

-	e -= dy; \

-    } \

-}

-

-#define FixError(x, dx, dy, e, sign, step, h)	{	\

-	   e += (h) * dx;				\

-	   x += (h) * step;				\

-	   if(e > 0) {					\

-		x += e * sign/dy;			\

-		e %= dy;				\

-	   	if(e) {					\

-		   x += sign;				\

-		   e -= dy;				\

-		}					\

-	   } 	 					\

-}

-

-

-/*

-   XAAIsEasyPoly -

-

-   Checks CoordModeOrigin one rect polygons to see if we need

-   to use Mi.

-   Returns: POLY_USE_MI, POLY_FULLY_CLIPPED or POLY_IS_EASY

-	as well as the pointer to the "top" point and the y

-	extents.

-*/

-

-int

-XAAIsEasyPolygon(

-   DDXPointPtr ptsIn,

-   int count, 

-   BoxPtr extents,

-   int origin,		

-   DDXPointPtr *topPoint, 	/* return */

-   int *topY, int *bottomY,	/* return */

-   int shape

-){

-    int c = 0, vertex1, vertex2;

-

-    *topY = 32767;

-    *bottomY = 0;

-

-    origin -= (origin & 0x8000) << 1;

-    vertex1 = extents->x1 - origin;

-    vertex2 = extents->x2 - origin /* - 0x00010001 */;

-                     /* I think this was an error in cfb ^ */

-

-    if (shape == Convex) {

-    	while (count--) {

-	    c = *((int*)ptsIn);

-	    if (((c - vertex1) | (vertex2 - c)) & 0x80008000)

-		return POLY_USE_MI;

-

-	    c = intToY(c);

-	    if (c < *topY) {

-	    	*topY = c;

-	    	*topPoint = ptsIn;

-	    }

-	    ptsIn++;

-	    if (c > *bottomY) *bottomY = c;

-    	}

-    } else {

-	int yFlip = 0;

-	int dx2, dx1, x1, x2;

-

-	x2 = x1 = -1;

-	dx2 = dx1 = 1;

-

-    	while (count--) {

-	    c = *((int*)ptsIn);

-	    if (((c - vertex1) | (vertex2 - c)) & 0x80008000)

-		return POLY_USE_MI;

-	    c = intToY(c);

-	    if (c < *topY) {

-	    	*topY = c;

-	    	*topPoint = ptsIn;

-	    }

-	    ptsIn++;

-	    if (c > *bottomY) *bottomY = c;

-	    if (c == x1)

-		continue;

-	    if (dx1 > 0) {

-		if (x2 < 0) x2 = c;

-		else	    dx2 = dx1 = (c - x1) >> 31;

-	    } else if ((c - x1) >> 31 != dx1) {

-		dx1 = ~dx1;

-		yFlip++;

-	    }

-	    x1 = c;

-       	}

-	x1 = (x2 - c) >> 31;

-	if (x1 != dx1) yFlip++;

-	if (x1 != dx2) yFlip++;

-	if (yFlip != 2) {

-	   if(*topY == *bottomY)

-		return POLY_FULLY_CLIPPED;

-	   else

-		return POLY_USE_MI;

-	}

-    }

-    if (*topY == *bottomY)

-	return POLY_FULLY_CLIPPED;

-

-    return POLY_IS_EASY;

-}

-

-void

-XAAFillPolygonSolid(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		shape,

-    int		mode,

-    int		count,

-    DDXPointPtr	ptsIn 

-){

-    XAAInfoRecPtr   infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    int    	    origin, vertex1, vertex2;

-    int		    *vertex1p, *vertex2p, *endp;

-    int		    x1 = 0, x2 = 0;

-    int 	    dx1 = 0, dx2 = 0, dy1 = 0, dy2 = 0;

-    int		    DX1 = 0, DX2 = 0, e1 = 0, e2 = 0;

-    int		    step1 = 0, step2 = 0, sign1 = 0, sign2 = 0;

-    int		    c, y, maxy, h, yoffset;

-    DDXPointPtr	    topPoint;

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    if (mode == CoordModePrevious) {

-	register DDXPointPtr ppt = ptsIn + 1;

-

-	for (origin = 1; origin < count; origin++, ppt++) {

-	    ppt->x += (ppt-1)->x;

-	    ppt->y += (ppt-1)->y;

-	}

-        mode = CoordModeOrigin;

-    }

-    

-    if (RegionNumRects(pGC->pCompositeClip) != 1) {

-	miFillPolygon (pDraw, pGC, shape, mode, count, ptsIn);

-	return;

-    }

-

-    origin = coordToInt(pDraw->x, pDraw->y);

-

-    switch( XAAIsEasyPolygon(ptsIn, count, &pGC->pCompositeClip->extents, 

-		origin, &topPoint, &y, &maxy, shape) ) {

-    case POLY_USE_MI: 

-	miFillPolygon (pDraw, pGC, shape, mode, count, ptsIn);

-    case POLY_FULLY_CLIPPED: 

-	return;

-    }

-

-    endp = (int*)ptsIn + count;

-    vertex2p = vertex1p = (int *)topPoint;

-    origin = pDraw->x;

-    yoffset = pDraw->y;

-    vertex2 = vertex1 = *vertex2p++;

-    if (vertex2p == endp)

-	vertex2p = (int *) ptsIn;

-

-    (*infoRec->SetupForSolidFill)(infoRec->pScrn, pGC->fgPixel, pGC->alu,

-        pGC->planemask);

-

-    while(1) {

-	if (y == intToY(vertex1)) {

-	    do {

-	    	if (vertex1p == (int *) ptsIn)

-		    vertex1p = endp;

-	    	c = *--vertex1p;

-	    	Setup (c,x1,vertex1,dx1,dy1,e1,sign1,step1,DX1)

-	    } while (y >= intToY(vertex1));

-	    h = dy1;

-	} else {

-	    Step(x1,dx1,dy1,e1,sign1,step1)

-	    h = intToY(vertex1) - y;

-	}

-	if (y == intToY(vertex2)) {

-	    do {

-	    	c = *vertex2p++;

-	    	if (vertex2p == endp)

-		    vertex2p = (int *) ptsIn;

-	    	Setup (c,x2,vertex2,dx2,dy2,e2,sign2,step2,DX2)

-	    } while (y >= intToY(vertex2));

-	    if (dy2 < h)

-		h = dy2;

-	} else {

-	    Step(x2,dx2,dy2,e2,sign2,step2)

-	    if ((c = (intToY(vertex2) - y)) < h)

-		h = c;

-	}

-

-	/* fill spans for this segment */

-        if(DX1 | DX2) {

-      	  if(infoRec->SubsequentSolidFillTrap && (h > 6)) {

-	     if(x1 == x2) {

-		while(x1 == x2) {

-	     	   y++;

-	    	   if (!--h) break;

-	    	   Step(x1,dx1,dy1,e1,sign1,step1)

-	    	   Step(x2,dx2,dy2,e2,sign2,step2)

-		}

-		if(y == maxy) break;

-    		if(!h) continue;

-	     }

-

-             if(x1 < x2)

- 	     	(*infoRec->SubsequentSolidFillTrap)(infoRec->pScrn,

-					y + yoffset, h,

-					x1, DX1, dy1, e1, 

-					x2 - 1, DX2, dy2, e2);

-	     else

- 	     	(*infoRec->SubsequentSolidFillTrap)(infoRec->pScrn,

-					y + yoffset, h,

-					x2, DX2, dy2, e2, 

-					x1 - 1, DX1, dy1, e1);

-	     y += h;	

-             if(--h) {

-	     	FixError(x1,dx1,dy1,e1,sign1,step1,h);

-	     	FixError(x2,dx2,dy2,e2,sign2,step2,h);

-		h = 0;

-	     }  	

-	  } else {

-	     while(1) {

-	    	if (x2 > x1)

-	            (*infoRec->SubsequentSolidFillRect)(infoRec->pScrn,

-	            		x1, y + yoffset, x2 - x1, 1);

-	        else if (x1 > x2)

-	            (*infoRec->SubsequentSolidFillRect)(infoRec->pScrn,

-	                    x2, y + yoffset, x1 - x2, 1);

-	     	y++;

-	    	if (!--h) break;

-	    	Step(x1,dx1,dy1,e1,sign1,step1)

-	    	Step(x2,dx2,dy2,e2,sign2,step2)

-	     }

-	  }

-	} else {

-	    if (x2 > x1)

-	        (*infoRec->SubsequentSolidFillRect)(infoRec->pScrn,

-	            x1, y + yoffset, x2 - x1, h);

-	    else if (x1 > x2)

-	        (*infoRec->SubsequentSolidFillRect)(infoRec->pScrn,

-	                x2, y + yoffset, x1 - x2, h);

-

-	    y += h;

-	    h = 0;

-        } 

-	if (y == maxy) break;

-    }

-    SET_SYNC_FLAG(infoRec);

-}

-

-

-

-

-void

-XAAFillPolygonHelper(

-    ScrnInfoPtr pScrn,

-    DDXPointPtr	ptsIn,

-    int 	count,

-    DDXPointPtr topPoint,

-    int 	y,

-    int		maxy,

-    int		origin,

-    RectFuncPtr RectFunc,

-    TrapFuncPtr TrapFunc,

-    int 	xorg,

-    int		yorg,

-    XAACacheInfoPtr pCache

-){

-    int		    *vertex1p, *vertex2p, *endp;

-    int		    vertex1, vertex2;

-    int		    x1 = 0, x2 = 0;

-    int		    dx1 = 0, dx2 = 0, dy1 = 0, dy2 = 0;

-    int		    DX1 = 0, DX2 = 0, e1 = 0, e2 = 0;

-    int		    step1 = 0, step2 = 0, sign1 = 0, sign2 = 0;

-    int		    c, h, yoffset;

-

-

-    endp = (int*)ptsIn + count;

-    vertex2p = vertex1p = (int *)topPoint;

-    yoffset = intToY(origin);

-    origin = intToX(origin);

-    vertex2 = vertex1 = *vertex2p++;

-    if (vertex2p == endp)

-	vertex2p = (int *)ptsIn;

-

-    while(1) {

-	if (y == intToY(vertex1)) {

-	    do {

-	    	if (vertex1p == (int *) ptsIn)

-		    vertex1p = endp;

-	    	c = *--vertex1p;

-	    	Setup (c,x1,vertex1,dx1,dy1,e1,sign1,step1,DX1)

-	    } while (y >= intToY(vertex1));

-	    h = dy1;

-	} else {

-	    Step(x1,dx1,dy1,e1,sign1,step1)

-	    h = intToY(vertex1) - y;

-	}

-	if (y == intToY(vertex2)) {

-	    do {

-	    	c = *vertex2p++;

-	    	if (vertex2p == endp)

-		    vertex2p = (int *) ptsIn;

-	    	Setup (c,x2,vertex2,dx2,dy2,e2,sign2,step2,DX2)

-	    } while (y >= intToY(vertex2));

-	    if (dy2 < h)

-		h = dy2;

-	} else {

-	    Step(x2,dx2,dy2,e2,sign2,step2)

-	    if ((c = (intToY(vertex2) - y)) < h)

-		h = c;

-	}

-

-	/* fill spans for this segment */

-        if(DX1 | DX2) {

-      	  if(TrapFunc && (h > 6)) {

-	     if(x1 == x2) {

-		while(x1 == x2) {

-	     	   y++;

-	    	   if (!--h) break;

-	    	   Step(x1,dx1,dy1,e1,sign1,step1)

-	    	   Step(x2,dx2,dy2,e2,sign2,step2)

-		}

-		if(y == maxy) break;

-    		if(!h) continue;

-	     }

-

-             if(x1 < x2)

- 	     	(*TrapFunc)(pScrn, y + yoffset, h,

-				x1, DX1, dy1, e1, 

-				x2 - 1, DX2, dy2, e2, xorg, yorg, pCache);

-	     else

- 	     	(*TrapFunc)(pScrn, y + yoffset, h,

-				x2, DX2, dy2, e2, 

-				x1 - 1, DX1, dy1, e1, xorg, yorg, pCache);

-	     y += h;	

-             if(--h) {

-	     	FixError(x1,dx1,dy1,e1,sign1,step1,h);

-	     	FixError(x2,dx2,dy2,e2,sign2,step2,h);

-		h = 0;

-	     }  	

-	  } else {

-	     while(1) {

-	    	if (x2 > x1)

-	            (*RectFunc)(pScrn,

-	            	x1, y + yoffset, x2 - x1, 1, xorg, yorg, pCache);

-	        else if (x1 > x2)

-	            (*RectFunc)(pScrn,

-	                    x2, y + yoffset, x1 - x2, 1, xorg, yorg, pCache);

-	     	y++;

-	    	if (!--h) break;

-	    	Step(x1,dx1,dy1,e1,sign1,step1)

-	    	Step(x2,dx2,dy2,e2,sign2,step2)

-	     }

-	  }

-	} else {

-	    if (x2 > x1)

-	        (*RectFunc)(pScrn,

-	            x1, y + yoffset, x2 - x1, h, xorg, yorg, pCache);

-	    else if (x1 > x2)

-	        (*RectFunc)(pScrn,

-	                x2, y + yoffset, x1 - x2, h, xorg, yorg, pCache);

-

-	    y += h;

-	    h = 0;

-        } 

-	if (y == maxy) break;

-    }

-}

-

-        /*****************\

-	|  Solid Helpers  |

-	\*****************/

-

-static void

-SolidTrapHelper(

-   ScrnInfoPtr pScrn,

-   int y, int h,

-   int x1, int dx1, int dy1, int e1,

-   int x2, int dx2, int dy2, int e2,

-   int xorg, int yorg,

-   XAACacheInfoPtr pCache

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-    (*infoRec->SubsequentSolidFillTrap) (pScrn, 

-		y, h, x1, dx1, dy1, e1, x2, dx2, dy2, e2);

-}

-

-static void

-SolidRectHelper (

-   ScrnInfoPtr pScrn,

-   int x, int y, int w, int h,

-   int xorg, int yorg,   

-   XAACacheInfoPtr pCache

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-    (*infoRec->SubsequentSolidFillRect) (pScrn, x, y, w, h);

-}

-

-

-	/*********************\

-	|  Mono 8x8 Patterns  |

-	\*********************/

-

-static void

-Mono8x8PatternTrapHelper_ScreenOrigin(

-   ScrnInfoPtr pScrn,

-   int y, int h,

-   int x1, int dx1, int dy1, int e1,

-   int x2, int dx2, int dy2, int e2,

-   int xorg, int yorg,

-   XAACacheInfoPtr pCache

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-    (*infoRec->SubsequentMono8x8PatternFillTrap) (pScrn, xorg, yorg,

-		y, h, x1, dx1, dy1, e1, x2, dx2, dy2, e2);

-}

-

-static void

-Mono8x8PatternRectHelper_ScreenOrigin (

-   ScrnInfoPtr pScrn,

-   int x, int y, int w, int h,

-   int xorg, int yorg,   

-   XAACacheInfoPtr pCache

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-    (*infoRec->SubsequentMono8x8PatternFillRect) (pScrn, xorg, yorg,

-						x, y, w, h);

-}

-

-static void

-Mono8x8PatternRectHelper (

-   ScrnInfoPtr pScrn,

-   int x, int y, int w, int h,

-   int xorg, int yorg,   

-   XAACacheInfoPtr pCache

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-    xorg = (x - xorg) & 0x07;

-    yorg = (y - yorg) & 0x07;

-

-    if(!(infoRec->Mono8x8PatternFillFlags & 		

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	if(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_BITS) {

-		int patx = pCache->pat0; 

-		int paty = pCache->pat1;

-		XAARotateMonoPattern(&patx, &paty, xorg, yorg,

-				(infoRec->Mono8x8PatternFillFlags & 		

-				BIT_ORDER_IN_BYTE_MSBFIRST));

-		xorg = patx; yorg = paty;

-	} else {

-		int slot = (yorg << 3) + xorg;

-	    	xorg = pCache->x + pCache->offsets[slot].x;

-	    	yorg = pCache->y + pCache->offsets[slot].y;

-	}

-     }

-

-

-    (*infoRec->SubsequentMono8x8PatternFillRect) (pScrn, xorg, yorg,

-						x, y, w, h);

-}

-

-

-

-	/****************\

-	|  Cache Expand  |

-	\****************/

-

-

-static void

-CacheExpandRectHelper (

-   ScrnInfoPtr pScrn,

-   int X, int Y, int Width, int Height,

-   int xorg, int yorg,   

-   XAACacheInfoPtr pCache

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int x, phaseY, phaseX, skipleft, w, blit_w, blit_h;

-    int cacheWidth;

-

-    cacheWidth = (pCache->w * pScrn->bitsPerPixel) / 

-	infoRec->CacheColorExpandDensity;

-

-    phaseY = (Y - yorg) % pCache->orig_h;

-    if(phaseY < 0) phaseY += pCache->orig_h;

-    phaseX = (X - xorg) % pCache->orig_w;

-    if(phaseX < 0) phaseX += pCache->orig_w;

-	

-    while(1) {

-	w = Width; skipleft = phaseX; x = X;

-	blit_h = pCache->h - phaseY;

-	if(blit_h > Height) blit_h = Height;

-	

-	while(1) {

-		blit_w = cacheWidth - skipleft;

-		if(blit_w > w) blit_w = w;

-		(*infoRec->SubsequentScreenToScreenColorExpandFill)(

-			pScrn, x, Y, blit_w, blit_h,

-			pCache->x, pCache->y + phaseY, skipleft);

-		w -= blit_w;

-		if(!w) break;

-		x += blit_w;

-		skipleft = (skipleft + blit_w) % pCache->orig_w;

-	}

-	Height -= blit_h;

-	if(!Height) break;

-	Y += blit_h;

-	phaseY = (phaseY + blit_h) % pCache->orig_h;

-    }

-}

-

-

-

-	/**************\

-	|  Cache Blit  |

-	\**************/

-

-

-static void

-CacheBltRectHelper (

-   ScrnInfoPtr pScrn,

-   int X, int Y, int Width, int Height,

-   int xorg, int yorg,   

-   XAACacheInfoPtr pCache

-){

-     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-     int x, phaseY, phaseX, skipleft, w, blit_w, blit_h;

-

-     phaseY = (Y - yorg) % pCache->orig_h;

-     if(phaseY < 0) phaseY += pCache->orig_h;

-     phaseX = (X - xorg) % pCache->orig_w;

-     if(phaseX < 0) phaseX += pCache->orig_w;

-

-     while(1) {

-	w = Width; skipleft = phaseX; x = X;

-	blit_h = pCache->h - phaseY;

-	if(blit_h > Height) blit_h = Height;

-	

-	while(1) {

-	    blit_w = pCache->w - skipleft;

-	    if(blit_w > w) blit_w = w;

-	    (*infoRec->SubsequentScreenToScreenCopy)(pScrn,

-			pCache->x + skipleft, pCache->y + phaseY,

-			x, Y, blit_w, blit_h);

-	    w -= blit_w;

-	    if(!w) break;

-	    x += blit_w;

-	    skipleft = (skipleft + blit_w) % pCache->orig_w;

-	}

-	Height -= blit_h;

-	if(!Height) break;

-	Y += blit_h;

-	phaseY = (phaseY + blit_h) % pCache->orig_h;

-     }	

-}

-

-

-	/**********************\

-	|   Stippled Polygons  |

-	\**********************/

-

-

-void

-XAAFillPolygonStippled(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		shape,

-    int		mode,

-    int		count,

-    DDXPointPtr	ptsIn 

-){

-    XAAInfoRecPtr   infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    XAAPixmapPtr    pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);

-    int    	    origin, type, patx, paty, fg, bg;

-    int		    y, maxy, xorg, yorg;

-    DDXPointPtr	    topPoint;

-    XAACacheInfoPtr pCache = NULL;

-    RectFuncPtr	    RectFunc = NULL;

-    TrapFuncPtr	    TrapFunc = NULL;

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    if (mode == CoordModePrevious) {

-	register DDXPointPtr ppt = ptsIn + 1;

-

-	for (origin = 1; origin < count; origin++, ppt++) {

-	    ppt->x += (ppt-1)->x;

-	    ppt->y += (ppt-1)->y;

-	}

-        mode = CoordModeOrigin;

-    }

-    

-    if (RegionNumRects(pGC->pCompositeClip) != 1) {

-	miFillPolygon (pDraw, pGC, shape, mode, count, ptsIn);

-	return;

-    }

-

-

-    if(pGC->fillStyle == FillStippled) {

-    	type = (*infoRec->StippledFillChooser)(pGC);

-	fg = pGC->fgPixel;  bg = -1;

-    } else {

-    	type = (*infoRec->OpaqueStippledFillChooser)(pGC);

-	fg = pGC->fgPixel;  bg = pGC->bgPixel;

-    }

-

-

-    if(!type) {

-	(*XAAFallbackOps.FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);

-	return;

-    }

-	

-    if((type == DO_COLOR_EXPAND) || (type == DO_COLOR_8x8)) {

-	miFillPolygon (pDraw, pGC, shape, mode, count, ptsIn);

-	return;

-    }

-

-    origin = pDraw->x;

-

-    switch( XAAIsEasyPolygon(ptsIn, count, &pGC->pCompositeClip->extents,

-		 origin, &topPoint, &y, &maxy, shape) ) {

-    case POLY_USE_MI: 

-	miFillPolygon (pDraw, pGC, shape, mode, count, ptsIn);

-    case POLY_FULLY_CLIPPED: 

-	return;

-    }

-

-    xorg = (pDraw->x + pGC->patOrg.x);

-    yorg = (pDraw->y + pGC->patOrg.y);

-

-

-    if((fg == bg) && (bg != -1) && infoRec->SetupForSolidFill) {

-

-	(*infoRec->SetupForSolidFill)(infoRec->pScrn, fg,

-				pGC->alu, pGC->planemask);

-

-	RectFunc = SolidRectHelper;

-        TrapFunc = infoRec->SubsequentSolidFillTrap ? SolidTrapHelper : NULL;

-    } else

-    switch(type) {

-	case DO_MONO_8x8:

-	    patx = pPriv->pattern0; paty = pPriv->pattern1;

-	    if(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_SCREEN_ORIGIN) {

-		xorg = (-xorg) & 0x07; yorg = (-yorg) & 0x07;

-		if(infoRec->Mono8x8PatternFillFlags & 

-					HARDWARE_PATTERN_PROGRAMMED_BITS) {

-		    if(!(infoRec->Mono8x8PatternFillFlags & 		

-					HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {

-		        XAARotateMonoPattern(&patx, &paty, xorg, yorg,

-				(infoRec->Mono8x8PatternFillFlags & 		

-				BIT_ORDER_IN_BYTE_MSBFIRST));

-		        xorg = patx; yorg = paty;

-		    }

-	        } else {

-		    XAACacheInfoPtr pCache = (*infoRec->CacheMono8x8Pattern)(

-					infoRec->pScrn, patx, paty);

-		    patx = pCache->x;  paty = pCache->y;

-		    if(!(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-			int slot = (yorg << 3) + xorg;

-			patx += pCache->offsets[slot].x;

-			paty += pCache->offsets[slot].y;

-			xorg = patx;  yorg = paty;

-		    }

-	        }	

-		RectFunc = Mono8x8PatternRectHelper_ScreenOrigin;

-		if(infoRec->SubsequentMono8x8PatternFillTrap)

-		    TrapFunc = Mono8x8PatternTrapHelper_ScreenOrigin;

-	    } else {  /* !HARDWARE_PATTERN_SCREEN_ORIGIN */

-		if(!(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_BITS)){

-		    pCache = (*infoRec->CacheMono8x8Pattern)(

-					infoRec->pScrn, patx, paty);

-		    patx = pCache->x;  paty = pCache->y;

-	    	} else {

-                    pCache = &(infoRec->ScratchCacheInfoRec);

-                    pCache->pat0 = patx;

-                    pCache->pat1 = paty;

-                }

-		RectFunc = Mono8x8PatternRectHelper;

-       	    }

-

-	    (*infoRec->SetupForMono8x8PatternFill)(infoRec->pScrn, 

-				patx, paty, fg, bg, pGC->alu, pGC->planemask);

-	    break;

-	case DO_CACHE_EXPAND:

-	    pCache = (*infoRec->CacheMonoStipple)(infoRec->pScrn, pGC->stipple);

-

-	    (*infoRec->SetupForScreenToScreenColorExpandFill)(

-		infoRec->pScrn, fg, bg, pGC->alu, pGC->planemask);

-

-	    RectFunc = CacheExpandRectHelper;

-	    break;

-	case DO_CACHE_BLT:

-	    pCache = (*infoRec->CacheStipple)(infoRec->pScrn, pGC->stipple, 

-							fg, bg);

-	    (*infoRec->SetupForScreenToScreenCopy)(infoRec->pScrn, 1, 1, 

-		pGC->alu, pGC->planemask, pCache->trans_color);

-

-	    RectFunc = CacheBltRectHelper;

-	    break;

-	default:

-	    return;

-    }

-        

-

-    XAAFillPolygonHelper(infoRec->pScrn, ptsIn, count, topPoint, 

-		y, maxy, origin, RectFunc, TrapFunc, xorg, yorg, pCache);

-

-    SET_SYNC_FLAG(infoRec);	

-}

-

-

-

-

-	/*******************\

-	|   Tiled Polygons  |

-	\*******************/

-

-

-void

-XAAFillPolygonTiled(

-    DrawablePtr	pDraw,

-    GCPtr	pGC,

-    int		shape,

-    int		mode,

-    int		count,

-    DDXPointPtr	ptsIn 

-){

-    XAAInfoRecPtr   infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    XAAPixmapPtr    pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);

-    int    	    origin, type, patx, paty;

-    int		    y, maxy, xorg, yorg;

-    DDXPointPtr	    topPoint;

-    XAACacheInfoPtr pCache = NULL;

-    RectFuncPtr	    RectFunc = NULL;

-    TrapFuncPtr	    TrapFunc = NULL;

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    if (mode == CoordModePrevious) {

-	register DDXPointPtr ppt = ptsIn + 1;

-

-	for (origin = 1; origin < count; origin++, ppt++) {

-	    ppt->x += (ppt-1)->x;

-	    ppt->y += (ppt-1)->y;

-	}

-        mode = CoordModeOrigin;

-    }

-    

-    if (RegionNumRects(pGC->pCompositeClip) != 1) {

-	miFillPolygon (pDraw, pGC, shape, mode, count, ptsIn);

-	return;

-    }

-

-

-    type = (*infoRec->TiledFillChooser)(pGC);

-

-    if(!type || (type == DO_IMAGE_WRITE)) {

-	(*XAAFallbackOps.FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);

-	return;

-    }

-	

-    if(type == DO_COLOR_8x8) {

-	miFillPolygon (pDraw, pGC, shape, mode, count, ptsIn);

-	return;

-    }

-

-    origin = pDraw->x;

-

-    switch( XAAIsEasyPolygon(ptsIn, count, &pGC->pCompositeClip->extents,

-		 origin, &topPoint, &y, &maxy, shape) ) {

-    case POLY_USE_MI: 

-	miFillPolygon (pDraw, pGC, shape, mode, count, ptsIn);

-    case POLY_FULLY_CLIPPED: 

-	return;

-    }

-

-    xorg = (pDraw->x + pGC->patOrg.x);

-    yorg = (pDraw->y + pGC->patOrg.y);

-

-    switch(type) {

-	case DO_MONO_8x8:

-	    patx = pPriv->pattern0; paty = pPriv->pattern1;

-	    if(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_SCREEN_ORIGIN) {

-		xorg = (-xorg) & 0x07; yorg = (-yorg) & 0x07;

-		if(infoRec->Mono8x8PatternFillFlags & 

-					HARDWARE_PATTERN_PROGRAMMED_BITS) {

-		    if(!(infoRec->Mono8x8PatternFillFlags & 		

-					HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {

-		        XAARotateMonoPattern(&patx, &paty, xorg, yorg,

-				(infoRec->Mono8x8PatternFillFlags & 		

-				BIT_ORDER_IN_BYTE_MSBFIRST));

-		        xorg = patx; yorg = paty;

-		    }

-	        } else {

-		    XAACacheInfoPtr pCache = (*infoRec->CacheMono8x8Pattern)(

-					infoRec->pScrn, patx, paty);

-		    patx = pCache->x;  paty = pCache->y;

-		    if(!(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-			int slot = (yorg << 3) + xorg;

-			patx += pCache->offsets[slot].x;

-			paty += pCache->offsets[slot].y;

-			xorg = patx;  yorg = paty;

-		    }

-	        }	

-		RectFunc = Mono8x8PatternRectHelper_ScreenOrigin;

-		if(infoRec->SubsequentMono8x8PatternFillTrap)

-		    TrapFunc = Mono8x8PatternTrapHelper_ScreenOrigin;

-	    } else {  /* !HARDWARE_PATTERN_SCREEN_ORIGIN */

-		if(!(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_BITS)){

-		    pCache = (*infoRec->CacheMono8x8Pattern)(

-					infoRec->pScrn, patx, paty);

-		    patx = pCache->x;  paty = pCache->y;

-	    	}

-		else {

-		  pCache = &(infoRec->ScratchCacheInfoRec);

-		  pCache->pat0 = patx;

-		  pCache->pat1 = paty;

-		}

-		RectFunc = Mono8x8PatternRectHelper;

-       	    }

-

-	    (*infoRec->SetupForMono8x8PatternFill)(infoRec->pScrn, 

-		 patx, paty, pPriv->fg, pPriv->bg, pGC->alu, pGC->planemask);

-	    break;

-	case DO_CACHE_BLT:

-            pCache = (*infoRec->CacheTile)(infoRec->pScrn, pGC->tile.pixmap);

-	    (*infoRec->SetupForScreenToScreenCopy)(infoRec->pScrn, 1, 1, 

-		pGC->alu, pGC->planemask, -1);

-

-	    RectFunc = CacheBltRectHelper;

-	    break;

-	case DO_PIXMAP_COPY:

-	    pCache = &(infoRec->ScratchCacheInfoRec);

-	    pCache->x = pPriv->offscreenArea->box.x1;

-	    pCache->y = pPriv->offscreenArea->box.y1;

-	    pCache->w = pCache->orig_w = 

-		pPriv->offscreenArea->box.x2 - pCache->x;

-	    pCache->h = pCache->orig_h = 

-		pPriv->offscreenArea->box.y2 - pCache->y;

-

-	    (*infoRec->SetupForScreenToScreenCopy)(infoRec->pScrn, 1, 1, 

-		pGC->alu, pGC->planemask, -1);

-

-	    RectFunc = CacheBltRectHelper;

-	    break;

-	default:

-	    return;

-    }

-

-    XAAFillPolygonHelper(infoRec->pScrn, ptsIn, count, topPoint, 

-		y, maxy, origin, RectFunc, TrapFunc, xorg, yorg, pCache);

-

-    SET_SYNC_FLAG(infoRec);	

-}

-

-

+
+/*
+ * Copyright 1996  The XFree86 Project
+ *
+ * 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 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 
+ * HARM HANEMAAYER 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.
+ * 
+ */
+
+/*
+ * Written by Mark Vojkovich.  Loosly based on an original version
+ * written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net) which
+ * only did solid rectangles and didn't have trapezoid support.
+ *
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "xf86str.h"
+#include "mi.h"
+#include "micoord.h"
+
+#include "xaa.h"
+#include "xaalocal.h"
+
+#define POLY_USE_MI		0
+#define POLY_FULLY_CLIPPED	1
+#define POLY_IS_EASY		2
+
+#define Setup(c,x,vertex,dx,dy,e,sign,step,DX) {\
+    x = intToX(vertex); \
+    if ((dy = intToY(c) - y)) { \
+    	DX = dx = intToX(c) - x; \
+	step = 0; \
+    	if (dx >= 0) \
+    	{ \
+	    e = 0; \
+	    sign = 1; \
+	    if (dx >= dy) {\
+	    	step = dx / dy; \
+	    	dx %= dy; \
+	    } \
+    	} \
+    	else \
+    	{ \
+	    e = 1 - dy; \
+	    sign = -1; \
+	    dx = -dx; \
+	    if (dx >= dy) { \
+		step = - (dx / dy); \
+		dx %= dy; \
+	    } \
+    	} \
+    } \
+    x += origin; \
+    vertex = c; \
+}
+
+#define Step(x,dx,dy,e,sign,step) {\
+    x += step; \
+    if ((e += dx) > 0) \
+    { \
+	x += sign; \
+	e -= dy; \
+    } \
+}
+
+#define FixError(x, dx, dy, e, sign, step, h)	{	\
+	   e += (h) * dx;				\
+	   x += (h) * step;				\
+	   if(e > 0) {					\
+		x += e * sign/dy;			\
+		e %= dy;				\
+	   	if(e) {					\
+		   x += sign;				\
+		   e -= dy;				\
+		}					\
+	   } 	 					\
+}
+
+/*
+   XAAIsEasyPoly -
+
+   Checks CoordModeOrigin one rect polygons to see if we need
+   to use Mi.
+   Returns: POLY_USE_MI, POLY_FULLY_CLIPPED or POLY_IS_EASY
+	as well as the pointer to the "top" point and the y
+	extents.
+*/
+
+int
+XAAIsEasyPolygon(DDXPointPtr ptsIn, int count, BoxPtr extents, int origin, DDXPointPtr * topPoint,      /* return */
+                 int *topY, int *bottomY,       /* return */
+                 int shape)
+{
+    int c = 0, vertex1, vertex2;
+
+    *topY = 32767;
+    *bottomY = 0;
+
+    origin -= (origin & 0x8000) << 1;
+    vertex1 = extents->x1 - origin;
+    vertex2 = extents->x2 - origin /* - 0x00010001 */ ;
+    /* I think this was an error in cfb ^ */
+
+    if (shape == Convex) {
+        while (count--) {
+            c = *((int *) ptsIn);
+            if (((c - vertex1) | (vertex2 - c)) & 0x80008000)
+                return POLY_USE_MI;
+
+            c = intToY(c);
+            if (c < *topY) {
+                *topY = c;
+                *topPoint = ptsIn;
+            }
+            ptsIn++;
+            if (c > *bottomY)
+                *bottomY = c;
+        }
+    }
+    else {
+        int yFlip = 0;
+        int dx2, dx1, x1, x2;
+
+        x2 = x1 = -1;
+        dx2 = dx1 = 1;
+
+        while (count--) {
+            c = *((int *) ptsIn);
+            if (((c - vertex1) | (vertex2 - c)) & 0x80008000)
+                return POLY_USE_MI;
+            c = intToY(c);
+            if (c < *topY) {
+                *topY = c;
+                *topPoint = ptsIn;
+            }
+            ptsIn++;
+            if (c > *bottomY)
+                *bottomY = c;
+            if (c == x1)
+                continue;
+            if (dx1 > 0) {
+                if (x2 < 0)
+                    x2 = c;
+                else
+                    dx2 = dx1 = (c - x1) >> 31;
+            }
+            else if ((c - x1) >> 31 != dx1) {
+                dx1 = ~dx1;
+                yFlip++;
+            }
+            x1 = c;
+        }
+        x1 = (x2 - c) >> 31;
+        if (x1 != dx1)
+            yFlip++;
+        if (x1 != dx2)
+            yFlip++;
+        if (yFlip != 2) {
+            if (*topY == *bottomY)
+                return POLY_FULLY_CLIPPED;
+            else
+                return POLY_USE_MI;
+        }
+    }
+    if (*topY == *bottomY)
+        return POLY_FULLY_CLIPPED;
+
+    return POLY_IS_EASY;
+}
+
+void
+XAAFillPolygonSolid(DrawablePtr pDraw,
+                    GCPtr pGC,
+                    int shape, int mode, int count, DDXPointPtr ptsIn)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int origin, vertex1, vertex2;
+    int *vertex1p, *vertex2p, *endp;
+    int x1 = 0, x2 = 0;
+    int dx1 = 0, dx2 = 0, dy1 = 0, dy2 = 0;
+    int DX1 = 0, DX2 = 0, e1 = 0, e2 = 0;
+    int step1 = 0, step2 = 0, sign1 = 0, sign2 = 0;
+    int c, y, maxy, h, yoffset;
+    DDXPointPtr topPoint;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    if (mode == CoordModePrevious) {
+        register DDXPointPtr ppt = ptsIn + 1;
+
+        for (origin = 1; origin < count; origin++, ppt++) {
+            ppt->x += (ppt - 1)->x;
+            ppt->y += (ppt - 1)->y;
+        }
+        mode = CoordModeOrigin;
+    }
+
+    if (RegionNumRects(pGC->pCompositeClip) != 1) {
+        miFillPolygon(pDraw, pGC, shape, mode, count, ptsIn);
+        return;
+    }
+
+    origin = coordToInt(pDraw->x, pDraw->y);
+
+    switch (XAAIsEasyPolygon(ptsIn, count, &pGC->pCompositeClip->extents,
+                             origin, &topPoint, &y, &maxy, shape)) {
+    case POLY_USE_MI:
+        miFillPolygon(pDraw, pGC, shape, mode, count, ptsIn);
+    case POLY_FULLY_CLIPPED:
+        return;
+    }
+
+    endp = (int *) ptsIn + count;
+    vertex2p = vertex1p = (int *) topPoint;
+    origin = pDraw->x;
+    yoffset = pDraw->y;
+    vertex2 = vertex1 = *vertex2p++;
+    if (vertex2p == endp)
+        vertex2p = (int *) ptsIn;
+
+    (*infoRec->SetupForSolidFill) (infoRec->pScrn, pGC->fgPixel, pGC->alu,
+                                   pGC->planemask);
+
+    while (1) {
+        if (y == intToY(vertex1)) {
+            do {
+                if (vertex1p == (int *) ptsIn)
+                    vertex1p = endp;
+                c = *--vertex1p;
+                Setup(c, x1, vertex1, dx1, dy1, e1, sign1, step1, DX1)
+            } while (y >= intToY(vertex1));
+            h = dy1;
+        }
+        else {
+            Step(x1, dx1, dy1, e1, sign1, step1)
+                h = intToY(vertex1) - y;
+        }
+        if (y == intToY(vertex2)) {
+            do {
+                c = *vertex2p++;
+                if (vertex2p == endp)
+                    vertex2p = (int *) ptsIn;
+                Setup(c, x2, vertex2, dx2, dy2, e2, sign2, step2, DX2)
+            } while (y >= intToY(vertex2));
+            if (dy2 < h)
+                h = dy2;
+        }
+        else {
+            Step(x2, dx2, dy2, e2, sign2, step2)
+                if ((c = (intToY(vertex2) - y)) < h)
+                h = c;
+        }
+
+        /* fill spans for this segment */
+        if (DX1 | DX2) {
+            if (infoRec->SubsequentSolidFillTrap && (h > 6)) {
+                if (x1 == x2) {
+                    while (x1 == x2) {
+                        y++;
+                        if (!--h)
+                            break;
+                        Step(x1, dx1, dy1, e1, sign1, step1)
+                            Step(x2, dx2, dy2, e2, sign2, step2)
+                    }
+                    if (y == maxy)
+                        break;
+                    if (!h)
+                        continue;
+                }
+
+                if (x1 < x2)
+                    (*infoRec->SubsequentSolidFillTrap) (infoRec->pScrn,
+                                                         y + yoffset, h,
+                                                         x1, DX1, dy1, e1,
+                                                         x2 - 1, DX2, dy2, e2);
+                else
+                    (*infoRec->SubsequentSolidFillTrap) (infoRec->pScrn,
+                                                         y + yoffset, h,
+                                                         x2, DX2, dy2, e2,
+                                                         x1 - 1, DX1, dy1, e1);
+                y += h;
+                if (--h) {
+                    FixError(x1, dx1, dy1, e1, sign1, step1, h);
+                    FixError(x2, dx2, dy2, e2, sign2, step2, h);
+                    h = 0;
+                }
+            }
+            else {
+                while (1) {
+                    if (x2 > x1)
+                        (*infoRec->SubsequentSolidFillRect) (infoRec->pScrn,
+                                                             x1, y + yoffset,
+                                                             x2 - x1, 1);
+                    else if (x1 > x2)
+                        (*infoRec->SubsequentSolidFillRect) (infoRec->pScrn,
+                                                             x2, y + yoffset,
+                                                             x1 - x2, 1);
+                    y++;
+                    if (!--h)
+                        break;
+                    Step(x1, dx1, dy1, e1, sign1, step1)
+                        Step(x2, dx2, dy2, e2, sign2, step2)
+                }
+            }
+        }
+        else {
+            if (x2 > x1)
+                (*infoRec->SubsequentSolidFillRect) (infoRec->pScrn,
+                                                     x1, y + yoffset, x2 - x1,
+                                                     h);
+            else if (x1 > x2)
+                (*infoRec->SubsequentSolidFillRect) (infoRec->pScrn,
+                                                     x2, y + yoffset, x1 - x2,
+                                                     h);
+
+            y += h;
+            h = 0;
+        }
+        if (y == maxy)
+            break;
+    }
+    SET_SYNC_FLAG(infoRec);
+}
+
+void
+XAAFillPolygonHelper(ScrnInfoPtr pScrn,
+                     DDXPointPtr ptsIn,
+                     int count,
+                     DDXPointPtr topPoint,
+                     int y,
+                     int maxy,
+                     int origin,
+                     RectFuncPtr RectFunc,
+                     TrapFuncPtr TrapFunc,
+                     int xorg, int yorg, XAACacheInfoPtr pCache)
+{
+    int *vertex1p, *vertex2p, *endp;
+    int vertex1, vertex2;
+    int x1 = 0, x2 = 0;
+    int dx1 = 0, dx2 = 0, dy1 = 0, dy2 = 0;
+    int DX1 = 0, DX2 = 0, e1 = 0, e2 = 0;
+    int step1 = 0, step2 = 0, sign1 = 0, sign2 = 0;
+    int c, h, yoffset;
+
+    endp = (int *) ptsIn + count;
+    vertex2p = vertex1p = (int *) topPoint;
+    yoffset = intToY(origin);
+    origin = intToX(origin);
+    vertex2 = vertex1 = *vertex2p++;
+    if (vertex2p == endp)
+        vertex2p = (int *) ptsIn;
+
+    while (1) {
+        if (y == intToY(vertex1)) {
+            do {
+                if (vertex1p == (int *) ptsIn)
+                    vertex1p = endp;
+                c = *--vertex1p;
+                Setup(c, x1, vertex1, dx1, dy1, e1, sign1, step1, DX1)
+            } while (y >= intToY(vertex1));
+            h = dy1;
+        }
+        else {
+            Step(x1, dx1, dy1, e1, sign1, step1)
+                h = intToY(vertex1) - y;
+        }
+        if (y == intToY(vertex2)) {
+            do {
+                c = *vertex2p++;
+                if (vertex2p == endp)
+                    vertex2p = (int *) ptsIn;
+                Setup(c, x2, vertex2, dx2, dy2, e2, sign2, step2, DX2)
+            } while (y >= intToY(vertex2));
+            if (dy2 < h)
+                h = dy2;
+        }
+        else {
+            Step(x2, dx2, dy2, e2, sign2, step2)
+                if ((c = (intToY(vertex2) - y)) < h)
+                h = c;
+        }
+
+        /* fill spans for this segment */
+        if (DX1 | DX2) {
+            if (TrapFunc && (h > 6)) {
+                if (x1 == x2) {
+                    while (x1 == x2) {
+                        y++;
+                        if (!--h)
+                            break;
+                        Step(x1, dx1, dy1, e1, sign1, step1)
+                            Step(x2, dx2, dy2, e2, sign2, step2)
+                    }
+                    if (y == maxy)
+                        break;
+                    if (!h)
+                        continue;
+                }
+
+                if (x1 < x2)
+                    (*TrapFunc) (pScrn, y + yoffset, h,
+                                 x1, DX1, dy1, e1,
+                                 x2 - 1, DX2, dy2, e2, xorg, yorg, pCache);
+                else
+                    (*TrapFunc) (pScrn, y + yoffset, h,
+                                 x2, DX2, dy2, e2,
+                                 x1 - 1, DX1, dy1, e1, xorg, yorg, pCache);
+                y += h;
+                if (--h) {
+                    FixError(x1, dx1, dy1, e1, sign1, step1, h);
+                    FixError(x2, dx2, dy2, e2, sign2, step2, h);
+                    h = 0;
+                }
+            }
+            else {
+                while (1) {
+                    if (x2 > x1)
+                        (*RectFunc) (pScrn,
+                                     x1, y + yoffset, x2 - x1, 1, xorg, yorg,
+                                     pCache);
+                    else if (x1 > x2)
+                        (*RectFunc) (pScrn,
+                                     x2, y + yoffset, x1 - x2, 1, xorg, yorg,
+                                     pCache);
+                    y++;
+                    if (!--h)
+                        break;
+                    Step(x1, dx1, dy1, e1, sign1, step1)
+                        Step(x2, dx2, dy2, e2, sign2, step2)
+                }
+            }
+        }
+        else {
+            if (x2 > x1)
+                (*RectFunc) (pScrn,
+                             x1, y + yoffset, x2 - x1, h, xorg, yorg, pCache);
+            else if (x1 > x2)
+                (*RectFunc) (pScrn,
+                             x2, y + yoffset, x1 - x2, h, xorg, yorg, pCache);
+
+            y += h;
+            h = 0;
+        }
+        if (y == maxy)
+            break;
+    }
+}
+
+        /*****************\
+	|  Solid Helpers  |
+	\*****************/
+
+static void
+SolidTrapHelper(ScrnInfoPtr pScrn,
+                int y, int h,
+                int x1, int dx1, int dy1, int e1,
+                int x2, int dx2, int dy2, int e2,
+                int xorg, int yorg, XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    (*infoRec->SubsequentSolidFillTrap) (pScrn,
+                                         y, h, x1, dx1, dy1, e1, x2, dx2, dy2,
+                                         e2);
+}
+
+static void
+SolidRectHelper(ScrnInfoPtr pScrn,
+                int x, int y, int w, int h,
+                int xorg, int yorg, XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    (*infoRec->SubsequentSolidFillRect) (pScrn, x, y, w, h);
+}
+
+        /*********************\
+	|  Mono 8x8 Patterns  |
+	\*********************/
+
+static void
+Mono8x8PatternTrapHelper_ScreenOrigin(ScrnInfoPtr pScrn,
+                                      int y, int h,
+                                      int x1, int dx1, int dy1, int e1,
+                                      int x2, int dx2, int dy2, int e2,
+                                      int xorg, int yorg,
+                                      XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    (*infoRec->SubsequentMono8x8PatternFillTrap) (pScrn, xorg, yorg,
+                                                  y, h, x1, dx1, dy1, e1, x2,
+                                                  dx2, dy2, e2);
+}
+
+static void
+Mono8x8PatternRectHelper_ScreenOrigin(ScrnInfoPtr pScrn,
+                                      int x, int y, int w, int h,
+                                      int xorg, int yorg,
+                                      XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    (*infoRec->SubsequentMono8x8PatternFillRect) (pScrn, xorg, yorg,
+                                                  x, y, w, h);
+}
+
+static void
+Mono8x8PatternRectHelper(ScrnInfoPtr pScrn,
+                         int x, int y, int w, int h,
+                         int xorg, int yorg, XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    xorg = (x - xorg) & 0x07;
+    yorg = (y - yorg) & 0x07;
+
+    if (!(infoRec->Mono8x8PatternFillFlags &
+          HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+        if (infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS) {
+            int patx = pCache->pat0;
+            int paty = pCache->pat1;
+
+            XAARotateMonoPattern(&patx, &paty, xorg, yorg,
+                                 (infoRec->Mono8x8PatternFillFlags &
+                                  BIT_ORDER_IN_BYTE_MSBFIRST));
+            xorg = patx;
+            yorg = paty;
+        }
+        else {
+            int slot = (yorg << 3) + xorg;
+
+            xorg = pCache->x + pCache->offsets[slot].x;
+            yorg = pCache->y + pCache->offsets[slot].y;
+        }
+    }
+
+    (*infoRec->SubsequentMono8x8PatternFillRect) (pScrn, xorg, yorg,
+                                                  x, y, w, h);
+}
+
+        /****************\
+	|  Cache Expand  |
+	\****************/
+
+static void
+CacheExpandRectHelper(ScrnInfoPtr pScrn,
+                      int X, int Y, int Width, int Height,
+                      int xorg, int yorg, XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int x, phaseY, phaseX, skipleft, w, blit_w, blit_h;
+    int cacheWidth;
+
+    cacheWidth = (pCache->w * pScrn->bitsPerPixel) /
+        infoRec->CacheColorExpandDensity;
+
+    phaseY = (Y - yorg) % pCache->orig_h;
+    if (phaseY < 0)
+        phaseY += pCache->orig_h;
+    phaseX = (X - xorg) % pCache->orig_w;
+    if (phaseX < 0)
+        phaseX += pCache->orig_w;
+
+    while (1) {
+        w = Width;
+        skipleft = phaseX;
+        x = X;
+        blit_h = pCache->h - phaseY;
+        if (blit_h > Height)
+            blit_h = Height;
+
+        while (1) {
+            blit_w = cacheWidth - skipleft;
+            if (blit_w > w)
+                blit_w = w;
+            (*infoRec->SubsequentScreenToScreenColorExpandFill) (pScrn, x, Y,
+                                                                 blit_w, blit_h,
+                                                                 pCache->x,
+                                                                 pCache->y +
+                                                                 phaseY,
+                                                                 skipleft);
+            w -= blit_w;
+            if (!w)
+                break;
+            x += blit_w;
+            skipleft = (skipleft + blit_w) % pCache->orig_w;
+        }
+        Height -= blit_h;
+        if (!Height)
+            break;
+        Y += blit_h;
+        phaseY = (phaseY + blit_h) % pCache->orig_h;
+    }
+}
+
+        /**************\
+	|  Cache Blit  |
+	\**************/
+
+static void
+CacheBltRectHelper(ScrnInfoPtr pScrn,
+                   int X, int Y, int Width, int Height,
+                   int xorg, int yorg, XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int x, phaseY, phaseX, skipleft, w, blit_w, blit_h;
+
+    phaseY = (Y - yorg) % pCache->orig_h;
+    if (phaseY < 0)
+        phaseY += pCache->orig_h;
+    phaseX = (X - xorg) % pCache->orig_w;
+    if (phaseX < 0)
+        phaseX += pCache->orig_w;
+
+    while (1) {
+        w = Width;
+        skipleft = phaseX;
+        x = X;
+        blit_h = pCache->h - phaseY;
+        if (blit_h > Height)
+            blit_h = Height;
+
+        while (1) {
+            blit_w = pCache->w - skipleft;
+            if (blit_w > w)
+                blit_w = w;
+            (*infoRec->SubsequentScreenToScreenCopy) (pScrn,
+                                                      pCache->x + skipleft,
+                                                      pCache->y + phaseY, x, Y,
+                                                      blit_w, blit_h);
+            w -= blit_w;
+            if (!w)
+                break;
+            x += blit_w;
+            skipleft = (skipleft + blit_w) % pCache->orig_w;
+        }
+        Height -= blit_h;
+        if (!Height)
+            break;
+        Y += blit_h;
+        phaseY = (phaseY + blit_h) % pCache->orig_h;
+    }
+}
+
+        /**********************\
+	|   Stippled Polygons  |
+	\**********************/
+
+void
+XAAFillPolygonStippled(DrawablePtr pDraw,
+                       GCPtr pGC,
+                       int shape, int mode, int count, DDXPointPtr ptsIn)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);
+    int origin, type, patx, paty, fg, bg;
+    int y, maxy, xorg, yorg;
+    DDXPointPtr topPoint;
+    XAACacheInfoPtr pCache = NULL;
+    RectFuncPtr RectFunc = NULL;
+    TrapFuncPtr TrapFunc = NULL;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    if (mode == CoordModePrevious) {
+        register DDXPointPtr ppt = ptsIn + 1;
+
+        for (origin = 1; origin < count; origin++, ppt++) {
+            ppt->x += (ppt - 1)->x;
+            ppt->y += (ppt - 1)->y;
+        }
+        mode = CoordModeOrigin;
+    }
+
+    if (RegionNumRects(pGC->pCompositeClip) != 1) {
+        miFillPolygon(pDraw, pGC, shape, mode, count, ptsIn);
+        return;
+    }
+
+    if (pGC->fillStyle == FillStippled) {
+        type = (*infoRec->StippledFillChooser) (pGC);
+        fg = pGC->fgPixel;
+        bg = -1;
+    }
+    else {
+        type = (*infoRec->OpaqueStippledFillChooser) (pGC);
+        fg = pGC->fgPixel;
+        bg = pGC->bgPixel;
+    }
+
+    if (!type) {
+        (*XAAFallbackOps.FillPolygon) (pDraw, pGC, shape, mode, count, ptsIn);
+        return;
+    }
+
+    if ((type == DO_COLOR_EXPAND) || (type == DO_COLOR_8x8)) {
+        miFillPolygon(pDraw, pGC, shape, mode, count, ptsIn);
+        return;
+    }
+
+    origin = pDraw->x;
+
+    switch (XAAIsEasyPolygon(ptsIn, count, &pGC->pCompositeClip->extents,
+                             origin, &topPoint, &y, &maxy, shape)) {
+    case POLY_USE_MI:
+        miFillPolygon(pDraw, pGC, shape, mode, count, ptsIn);
+    case POLY_FULLY_CLIPPED:
+        return;
+    }
+
+    xorg = (pDraw->x + pGC->patOrg.x);
+    yorg = (pDraw->y + pGC->patOrg.y);
+
+    if ((fg == bg) && (bg != -1) && infoRec->SetupForSolidFill) {
+
+        (*infoRec->SetupForSolidFill) (infoRec->pScrn, fg,
+                                       pGC->alu, pGC->planemask);
+
+        RectFunc = SolidRectHelper;
+        TrapFunc = infoRec->SubsequentSolidFillTrap ? SolidTrapHelper : NULL;
+    }
+    else
+        switch (type) {
+        case DO_MONO_8x8:
+            patx = pPriv->pattern0;
+            paty = pPriv->pattern1;
+            if (infoRec->Mono8x8PatternFillFlags &
+                HARDWARE_PATTERN_SCREEN_ORIGIN) {
+                xorg = (-xorg) & 0x07;
+                yorg = (-yorg) & 0x07;
+                if (infoRec->Mono8x8PatternFillFlags &
+                    HARDWARE_PATTERN_PROGRAMMED_BITS) {
+                    if (!(infoRec->Mono8x8PatternFillFlags &
+                          HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+                        XAARotateMonoPattern(&patx, &paty, xorg, yorg,
+                                             (infoRec->Mono8x8PatternFillFlags &
+                                              BIT_ORDER_IN_BYTE_MSBFIRST));
+                        xorg = patx;
+                        yorg = paty;
+                    }
+                }
+                else {
+                    XAACacheInfoPtr pCache =
+                        (*infoRec->CacheMono8x8Pattern) (infoRec->pScrn, patx,
+                                                         paty);
+                    patx = pCache->x;
+                    paty = pCache->y;
+                    if (!(infoRec->Mono8x8PatternFillFlags &
+                          HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+                        int slot = (yorg << 3) + xorg;
+
+                        patx += pCache->offsets[slot].x;
+                        paty += pCache->offsets[slot].y;
+                        xorg = patx;
+                        yorg = paty;
+                    }
+                }
+                RectFunc = Mono8x8PatternRectHelper_ScreenOrigin;
+                if (infoRec->SubsequentMono8x8PatternFillTrap)
+                    TrapFunc = Mono8x8PatternTrapHelper_ScreenOrigin;
+            }
+            else {              /* !HARDWARE_PATTERN_SCREEN_ORIGIN */
+                if (!(infoRec->Mono8x8PatternFillFlags &
+                      HARDWARE_PATTERN_PROGRAMMED_BITS)) {
+                    pCache =
+                        (*infoRec->CacheMono8x8Pattern) (infoRec->pScrn, patx,
+                                                         paty);
+                    patx = pCache->x;
+                    paty = pCache->y;
+                }
+                else {
+                    pCache = &(infoRec->ScratchCacheInfoRec);
+                    pCache->pat0 = patx;
+                    pCache->pat1 = paty;
+                }
+                RectFunc = Mono8x8PatternRectHelper;
+            }
+
+            (*infoRec->SetupForMono8x8PatternFill) (infoRec->pScrn,
+                                                    patx, paty, fg, bg,
+                                                    pGC->alu, pGC->planemask);
+            break;
+        case DO_CACHE_EXPAND:
+            pCache =
+                (*infoRec->CacheMonoStipple) (infoRec->pScrn, pGC->stipple);
+
+            (*infoRec->SetupForScreenToScreenColorExpandFill) (infoRec->pScrn,
+                                                               fg, bg, pGC->alu,
+                                                               pGC->planemask);
+
+            RectFunc = CacheExpandRectHelper;
+            break;
+        case DO_CACHE_BLT:
+            pCache = (*infoRec->CacheStipple) (infoRec->pScrn, pGC->stipple,
+                                               fg, bg);
+            (*infoRec->SetupForScreenToScreenCopy) (infoRec->pScrn, 1, 1,
+                                                    pGC->alu, pGC->planemask,
+                                                    pCache->trans_color);
+
+            RectFunc = CacheBltRectHelper;
+            break;
+        default:
+            return;
+        }
+
+    XAAFillPolygonHelper(infoRec->pScrn, ptsIn, count, topPoint,
+                         y, maxy, origin, RectFunc, TrapFunc, xorg, yorg,
+                         pCache);
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+        /*******************\
+	|   Tiled Polygons  |
+	\*******************/
+
+void
+XAAFillPolygonTiled(DrawablePtr pDraw,
+                    GCPtr pGC,
+                    int shape, int mode, int count, DDXPointPtr ptsIn)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
+    int origin, type, patx, paty;
+    int y, maxy, xorg, yorg;
+    DDXPointPtr topPoint;
+    XAACacheInfoPtr pCache = NULL;
+    RectFuncPtr RectFunc = NULL;
+    TrapFuncPtr TrapFunc = NULL;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    if (mode == CoordModePrevious) {
+        register DDXPointPtr ppt = ptsIn + 1;
+
+        for (origin = 1; origin < count; origin++, ppt++) {
+            ppt->x += (ppt - 1)->x;
+            ppt->y += (ppt - 1)->y;
+        }
+        mode = CoordModeOrigin;
+    }
+
+    if (RegionNumRects(pGC->pCompositeClip) != 1) {
+        miFillPolygon(pDraw, pGC, shape, mode, count, ptsIn);
+        return;
+    }
+
+    type = (*infoRec->TiledFillChooser) (pGC);
+
+    if (!type || (type == DO_IMAGE_WRITE)) {
+        (*XAAFallbackOps.FillPolygon) (pDraw, pGC, shape, mode, count, ptsIn);
+        return;
+    }
+
+    if (type == DO_COLOR_8x8) {
+        miFillPolygon(pDraw, pGC, shape, mode, count, ptsIn);
+        return;
+    }
+
+    origin = pDraw->x;
+
+    switch (XAAIsEasyPolygon(ptsIn, count, &pGC->pCompositeClip->extents,
+                             origin, &topPoint, &y, &maxy, shape)) {
+    case POLY_USE_MI:
+        miFillPolygon(pDraw, pGC, shape, mode, count, ptsIn);
+    case POLY_FULLY_CLIPPED:
+        return;
+    }
+
+    xorg = (pDraw->x + pGC->patOrg.x);
+    yorg = (pDraw->y + pGC->patOrg.y);
+
+    switch (type) {
+    case DO_MONO_8x8:
+        patx = pPriv->pattern0;
+        paty = pPriv->pattern1;
+        if (infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_SCREEN_ORIGIN) {
+            xorg = (-xorg) & 0x07;
+            yorg = (-yorg) & 0x07;
+            if (infoRec->Mono8x8PatternFillFlags &
+                HARDWARE_PATTERN_PROGRAMMED_BITS) {
+                if (!(infoRec->Mono8x8PatternFillFlags &
+                      HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+                    XAARotateMonoPattern(&patx, &paty, xorg, yorg,
+                                         (infoRec->Mono8x8PatternFillFlags &
+                                          BIT_ORDER_IN_BYTE_MSBFIRST));
+                    xorg = patx;
+                    yorg = paty;
+                }
+            }
+            else {
+                XAACacheInfoPtr pCache =
+                    (*infoRec->CacheMono8x8Pattern) (infoRec->pScrn, patx,
+                                                     paty);
+                patx = pCache->x;
+                paty = pCache->y;
+                if (!(infoRec->Mono8x8PatternFillFlags &
+                      HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+                    int slot = (yorg << 3) + xorg;
+
+                    patx += pCache->offsets[slot].x;
+                    paty += pCache->offsets[slot].y;
+                    xorg = patx;
+                    yorg = paty;
+                }
+            }
+            RectFunc = Mono8x8PatternRectHelper_ScreenOrigin;
+            if (infoRec->SubsequentMono8x8PatternFillTrap)
+                TrapFunc = Mono8x8PatternTrapHelper_ScreenOrigin;
+        }
+        else {                  /* !HARDWARE_PATTERN_SCREEN_ORIGIN */
+            if (!(infoRec->Mono8x8PatternFillFlags &
+                  HARDWARE_PATTERN_PROGRAMMED_BITS)) {
+                pCache =
+                    (*infoRec->CacheMono8x8Pattern) (infoRec->pScrn, patx,
+                                                     paty);
+                patx = pCache->x;
+                paty = pCache->y;
+            }
+            else {
+                pCache = &(infoRec->ScratchCacheInfoRec);
+                pCache->pat0 = patx;
+                pCache->pat1 = paty;
+            }
+            RectFunc = Mono8x8PatternRectHelper;
+        }
+
+        (*infoRec->SetupForMono8x8PatternFill) (infoRec->pScrn,
+                                                patx, paty, pPriv->fg,
+                                                pPriv->bg, pGC->alu,
+                                                pGC->planemask);
+        break;
+    case DO_CACHE_BLT:
+        pCache = (*infoRec->CacheTile) (infoRec->pScrn, pGC->tile.pixmap);
+        (*infoRec->SetupForScreenToScreenCopy) (infoRec->pScrn, 1, 1,
+                                                pGC->alu, pGC->planemask, -1);
+
+        RectFunc = CacheBltRectHelper;
+        break;
+    case DO_PIXMAP_COPY:
+        pCache = &(infoRec->ScratchCacheInfoRec);
+        pCache->x = pPriv->offscreenArea->box.x1;
+        pCache->y = pPriv->offscreenArea->box.y1;
+        pCache->w = pCache->orig_w = pPriv->offscreenArea->box.x2 - pCache->x;
+        pCache->h = pCache->orig_h = pPriv->offscreenArea->box.y2 - pCache->y;
+
+        (*infoRec->SetupForScreenToScreenCopy) (infoRec->pScrn, 1, 1,
+                                                pGC->alu, pGC->planemask, -1);
+
+        RectFunc = CacheBltRectHelper;
+        break;
+    default:
+        return;
+    }
+
+    XAAFillPolygonHelper(infoRec->pScrn, ptsIn, count, topPoint,
+                         y, maxy, origin, RectFunc, TrapFunc, xorg, yorg,
+                         pCache);
+
+    SET_SYNC_FLAG(infoRec);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaFillRect.c b/xorg-server/hw/xfree86/xaa/xaaFillRect.c
index 724ff37a2..ec0fb9df7 100644
--- a/xorg-server/hw/xfree86/xaa/xaaFillRect.c
+++ b/xorg-server/hw/xfree86/xaa/xaaFillRect.c
@@ -1,1095 +1,1101 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-

-

-static void XAARenderSolidRects(GCPtr, int, BoxPtr, int, int);

-static void XAARenderColor8x8Rects(GCPtr, int, BoxPtr, int, int);

-static void XAARenderMono8x8Rects(GCPtr, int, BoxPtr, int, int);

-static void XAARenderColorExpandRects(GCPtr, int, BoxPtr, int, int);

-static void XAARenderCacheExpandRects(GCPtr, int, BoxPtr, int, int);

-static void XAARenderCacheBltRects(GCPtr, int, BoxPtr, int, int);

-static void XAARenderImageWriteRects(GCPtr, int, BoxPtr, int, int);

-static void XAARenderPixmapCopyRects(GCPtr, int, BoxPtr, int, int);

-

-void

-XAAPolyFillRect(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int		nrectFill, 	/* number of rectangles to fill */

-    xRectangle	*prectInit   	/* Pointer to first rectangle to fill */

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    int		xorg = pDraw->x;

-    int		yorg = pDraw->y;

-    int		type = 0;

-    ClipAndRenderRectsFunc function;

-

-    if((nrectFill <= 0) || !pGC->planemask)

-        return;

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    switch(pGC->fillStyle) {

-    case FillSolid:

-	type = DO_SOLID;

-	break;

-    case FillStippled:

-	type = (*infoRec->StippledFillChooser)(pGC);

-	break;

-    case FillOpaqueStippled:

-	if((pGC->fgPixel == pGC->bgPixel) && infoRec->FillSolidRects &&

-                CHECK_PLANEMASK(pGC,infoRec->FillSolidRectsFlags) &&

-                CHECK_ROP(pGC,infoRec->FillSolidRectsFlags) &&

-                CHECK_ROPSRC(pGC,infoRec->FillSolidRectsFlags) &&

-                CHECK_FG(pGC,infoRec->FillSolidRectsFlags))

-	    type = DO_SOLID;

-	else

-	    type = (*infoRec->OpaqueStippledFillChooser)(pGC);

-	break;

-    case FillTiled:

-	type = (*infoRec->TiledFillChooser)(pGC);

-	break;

-    }

-

-    switch(type) {

-    case DO_SOLID:

-	function = XAARenderSolidRects;	

-	break;	

-    case DO_COLOR_8x8:

-	function = XAARenderColor8x8Rects;	

-	break;	

-    case DO_MONO_8x8:

-	function = XAARenderMono8x8Rects;	

-	break;	

-    case DO_CACHE_BLT:

-	function = XAARenderCacheBltRects;	

-	break;	

-    case DO_COLOR_EXPAND:

-	function = XAARenderColorExpandRects;	

-	break;	

-    case DO_CACHE_EXPAND:

-	function = XAARenderCacheExpandRects;	

-	break;	

-    case DO_IMAGE_WRITE:

-	function = XAARenderImageWriteRects;	

-	break;	

-    case DO_PIXMAP_COPY:

-	function = XAARenderPixmapCopyRects;	

-	break;	

-    default:

-	(*XAAFallbackOps.PolyFillRect)(pDraw, pGC, nrectFill, prectInit);

-	return;

-    }

-

-    if(xorg | yorg) {

-	int n = nrectFill;

-	xRectangle *prect = prectInit;

-

-	while(n--) {

-	    prect->x += xorg;

-	    prect->y += yorg;

-	    prect++;

-	}

-    }

-

-    

-    XAAClipAndRenderRects(pGC, function, nrectFill, prectInit, xorg, yorg);

-}

-

-

-

-	/*********************\

-	|     Solid Rects     |

-	\*********************/

-

-static void

-XAARenderSolidRects(

-   GCPtr pGC,

-   int nboxes,

-   BoxPtr pClipBoxes,

-   int xorg, int yorg

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-

-   (*infoRec->FillSolidRects) (infoRec->pScrn, 

-               pGC->fgPixel, pGC->alu, pGC->planemask, nboxes, pClipBoxes);

-}

-

-

-	/************************\

-	|     Mono 8x8 Rects     |

-	\************************/

-

-static void

-XAARenderMono8x8Rects(

-   GCPtr pGC,

-   int nboxes,

-   BoxPtr pClipBoxes,

-   int xorg, int yorg

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   XAAPixmapPtr pPriv;

-   int fg, bg;

-

-   switch(pGC->fillStyle) {

-   case FillStippled:

-      pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);

-      fg = pGC->fgPixel;  bg = -1;

-      break;

-   case FillOpaqueStippled:

-      pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);

-      fg = pGC->fgPixel;  bg = pGC->bgPixel;

-      break;

-   case FillTiled:

-      pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);

-      fg = pPriv->fg;  bg = pPriv->bg;

-      break;

-   default:	/* Muffle compiler */

-      pPriv = NULL;	/* Kaboom */

-      fg = -1;  bg = -1;

-      break;

-   }

-

-   (*infoRec->FillMono8x8PatternRects) (infoRec->pScrn, 

-                fg, bg, pGC->alu, pGC->planemask, 

-                nboxes, pClipBoxes, pPriv->pattern0, pPriv->pattern1, 

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y));

-}

-

-	/*************************\

-	|     Color 8x8 Rects     |

-	\*************************/

-

-static void

-XAARenderColor8x8Rects(

-   GCPtr pGC,

-   int nboxes,

-   BoxPtr pClipBoxes,

-   int xorg, int yorg

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   XAACacheInfoPtr pCache;

-   PixmapPtr pPix;

-   int fg, bg;

-

-   switch(pGC->fillStyle) {

-   case FillStippled:

-      pPix = pGC->stipple;

-      fg = pGC->fgPixel;  bg = -1;

-      break;

-   case FillOpaqueStippled:

-      pPix = pGC->stipple;

-      fg = pGC->fgPixel;  bg = pGC->bgPixel;

-      break;

-   case FillTiled:

-      pPix = pGC->tile.pixmap;

-      fg = -1;  bg = -1;

-      break;

-   default:	/* Muffle compiler */

-      pPix = NULL;

-      fg = -1;  bg = -1;

-      break;

-   }

-

-   pCache = (*infoRec->CacheColor8x8Pattern)(infoRec->pScrn, pPix, fg, bg);

-   (*infoRec->FillColor8x8PatternRects) (infoRec->pScrn,

-                pGC->alu, pGC->planemask, nboxes, pClipBoxes, 

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y), pCache);

-}

-

-

-	/****************************\

-	|     Color Expand Rects     |

-	\****************************/

-

-static void

-XAARenderColorExpandRects(

-   GCPtr pGC,

-   int nboxes,

-   BoxPtr pClipBoxes,

-   int xorg, int yorg

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   int fg, bg;

-

-   switch(pGC->fillStyle) {

-   case FillStippled:

-      fg = pGC->fgPixel;  bg = -1;

-      break;

-   case FillOpaqueStippled:

-      fg = pGC->fgPixel;  bg = pGC->bgPixel;

-      break;

-   default:	/* Muffle compiler */

-      fg = -1;  bg = -1;

-      break;

-   }

-

-   (*infoRec->FillColorExpandRects) (infoRec->pScrn, fg, bg, 

-                pGC->alu, pGC->planemask, nboxes, pClipBoxes, 

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y),

-		pGC->stipple);

-}

-

-

-	/*************************\

-	|     Cache Blt Rects     |

-	\*************************/

-

-static void

-XAARenderCacheBltRects(

-   GCPtr pGC,

-   int nboxes,

-   BoxPtr pClipBoxes,

-   int xorg, int yorg

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   XAACacheInfoPtr pCache;

-

-   switch(pGC->fillStyle) {

-   case FillStippled:

-      pCache = (*infoRec->CacheStipple)(infoRec->pScrn, pGC->stipple, 

-					pGC->fgPixel, -1);

-      break;

-   case FillOpaqueStippled:

-      pCache = (*infoRec->CacheStipple)(infoRec->pScrn, pGC->stipple, 

-					pGC->fgPixel, pGC->bgPixel);

-      break;

-   case FillTiled:

-      pCache = (*infoRec->CacheTile)(infoRec->pScrn, pGC->tile.pixmap);

-      break;

-   default:	/* Muffle compiler */

-      pCache = NULL;

-      break;

-   }

-

-   (*infoRec->FillCacheBltRects) (infoRec->pScrn, pGC->alu, 

-                pGC->planemask, nboxes, pClipBoxes, 

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y), pCache);

-}

-

-

-	/****************************\

-	|     Cache Expand Rects     |

-	\****************************/

-

-static void

-XAARenderCacheExpandRects(

-   GCPtr pGC,

-   int nboxes,

-   BoxPtr pClipBoxes,

-   int xorg, int yorg

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   int fg, bg;

-

-   switch(pGC->fillStyle) {

-   case FillStippled:

-      fg = pGC->fgPixel;  bg = -1;

-      break;

-   case FillOpaqueStippled:

-      fg = pGC->fgPixel;  bg = pGC->bgPixel;

-      break;

-   default:	/* Muffle compiler */

-      fg = -1;  bg = -1;

-      break;

-   }

-

-   (*infoRec->FillCacheExpandRects) (infoRec->pScrn, fg, bg,

-                pGC->alu, pGC->planemask, nboxes, pClipBoxes, 

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y), 

-                pGC->stipple);

-}

-

-

-

-	/***************************\

-	|     Image Write Rects     |

-	\***************************/

-

-static void

-XAARenderImageWriteRects(

-   GCPtr pGC,

-   int nboxes,

-   BoxPtr pClipBoxes,

-   int xorg, int yorg

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-

-   (*infoRec->FillImageWriteRects) (infoRec->pScrn, pGC->alu, 

-                pGC->planemask, nboxes, pClipBoxes, 

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y),

-                pGC->tile.pixmap);

-}

-

-

-

-	/***************************\

-	|     Pixmap Copy Rects     |

-	\***************************/

-

-static void

-XAARenderPixmapCopyRects(

-   GCPtr pGC,

-   int nboxes,

-   BoxPtr pClipBoxes,

-   int xorg, int yorg

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   XAACacheInfoPtr pCache = &(infoRec->ScratchCacheInfoRec);

-   XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);

-

-   pCache->x = pPriv->offscreenArea->box.x1;

-   pCache->y = pPriv->offscreenArea->box.y1;

-   pCache->w = pCache->orig_w = 

-		pPriv->offscreenArea->box.x2 - pCache->x;

-   pCache->h = pCache->orig_h = 

-		pPriv->offscreenArea->box.y2 - pCache->y;

-   pCache->trans_color = -1;

-

-   (*infoRec->FillCacheBltRects) (infoRec->pScrn, pGC->alu, 

-                pGC->planemask, nboxes, pClipBoxes, 

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y), 

-                pCache);

-}

-

-

-

-	/************\

-	|   Solid    |

-	\************/

-

-void

-XAAFillSolidRects(

-    ScrnInfoPtr pScrn,

-    int	fg, int rop,

-    unsigned int planemask,

-    int		nBox, 		/* number of rectangles to fill */

-    BoxPtr	pBox  		/* Pointer to first rectangle to fill */

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-    (*infoRec->SetupForSolidFill)(pScrn, fg, rop, planemask);

-     while(nBox--) {

-        (*infoRec->SubsequentSolidFillRect)(pScrn, pBox->x1, pBox->y1,

- 			pBox->x2 - pBox->x1, pBox->y2 - pBox->y1);

-	pBox++;

-     }

-     SET_SYNC_FLAG(infoRec);

-}

-

-

-

-

-	/*********************\

-	|  8x8 Mono Patterns  |

-	\*********************/

-

-

-void

-XAAFillMono8x8PatternRectsScreenOrigin(

-    ScrnInfoPtr pScrn,

-    int	fg, int bg, int rop,

-    unsigned int planemask,

-    int	nBox,

-    BoxPtr pBox,

-    int pattern0, int pattern1,

-    int xorigin, int yorigin

-)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int patx = pattern0, paty = pattern1;

-    int xorg = (-xorigin) & 0x07;

-    int yorg = (-yorigin) & 0x07;

-

-

-    if(infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS) {

-   	if(!(infoRec->Mono8x8PatternFillFlags & 		

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	    XAARotateMonoPattern(&patx, &paty, xorg, yorg,

-				(infoRec->Mono8x8PatternFillFlags &

-				 BIT_ORDER_IN_BYTE_MSBFIRST));

-	    xorg = patx; yorg = paty;

-        }

-    } else {

-	XAACacheInfoPtr pCache =

-		(*infoRec->CacheMono8x8Pattern)(pScrn, pattern0, pattern1);

-	patx = pCache->x;  paty = pCache->y;

-   	if(!(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	    int slot = (yorg << 3) + xorg;

-	    patx += pCache->offsets[slot].x;

-	    paty += pCache->offsets[slot].y;

-	    xorg = patx;  yorg = paty;

-	}	

-    }

-

-    (*infoRec->SetupForMono8x8PatternFill)(pScrn, patx, paty,

-					fg, bg, rop, planemask);

-

-     while(nBox--) {

-        (*infoRec->SubsequentMono8x8PatternFillRect)(pScrn, 

-			xorg, yorg, pBox->x1, pBox->y1,

- 			pBox->x2 - pBox->x1, pBox->y2 - pBox->y1);

-	pBox++;

-     }

-     SET_SYNC_FLAG(infoRec);

-}

-

-void

-XAAFillMono8x8PatternRects(

-    ScrnInfoPtr pScrn,

-    int	fg, int bg, int rop,

-    unsigned int planemask,

-    int	nBox,

-    BoxPtr pBox,

-    int pattern0, int pattern1,

-    int xorigin, int yorigin

-)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int patx = pattern0, paty = pattern1;

-    int xorg, yorg;

-    XAACacheInfoPtr pCache = NULL;

-

-

-    if(!(infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS)){

-	pCache = (*infoRec->CacheMono8x8Pattern)(pScrn, pattern0, pattern1);

-	patx = pCache->x;  paty = pCache->y;

-    }

-

-

-    (*infoRec->SetupForMono8x8PatternFill)(pScrn, patx, paty,

-					fg, bg, rop, planemask);

-

-

-     while(nBox--) {

-	xorg = (pBox->x1 - xorigin) & 0x07;

-	yorg = (pBox->y1 - yorigin) & 0x07;

-

-   	if(!(infoRec->Mono8x8PatternFillFlags & 		

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	    if(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_BITS) {

-		patx = pattern0; paty = pattern1;

-		XAARotateMonoPattern(&patx, &paty, xorg, yorg,

-				(infoRec->Mono8x8PatternFillFlags & 		

-				BIT_ORDER_IN_BYTE_MSBFIRST));

-		xorg = patx; yorg = paty;

-	    } else {

-		int slot = (yorg << 3) + xorg;

-	    	xorg = patx + pCache->offsets[slot].x;

-	    	yorg = paty + pCache->offsets[slot].y;

-	    }

-        }

-

-        (*infoRec->SubsequentMono8x8PatternFillRect)(pScrn, 

-			xorg, yorg, pBox->x1, pBox->y1,

- 			pBox->x2 - pBox->x1, pBox->y2 - pBox->y1);

-	pBox++;

-     }

-

-     SET_SYNC_FLAG(infoRec);

-}

-

-

-	/**********************\

-	|  8x8 Color Patterns  |

-	\**********************/

-

-

-void

-XAAFillColor8x8PatternRectsScreenOrigin(

-   ScrnInfoPtr pScrn,

-   int rop,

-   unsigned int planemask,

-   int nBox,

-   BoxPtr pBox,

-   int xorigin, int yorigin,

-   XAACacheInfoPtr pCache

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int patx = pCache->x, paty = pCache->y;

-    int xorg = (-xorigin) & 0x07;

-    int yorg = (-yorigin) & 0x07;

-

-    if(!(infoRec->Color8x8PatternFillFlags & 

-					HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	int slot = (yorg << 3) + xorg;

-	paty += pCache->offsets[slot].y;

-	patx += pCache->offsets[slot].x;

-	xorg = patx;  yorg = paty;

-    }	

-

-    (*infoRec->SetupForColor8x8PatternFill)(pScrn, patx, paty,

-			 rop, planemask, pCache->trans_color);

-

-    while(nBox--) {

-        (*infoRec->SubsequentColor8x8PatternFillRect)(pScrn, 

-			xorg, yorg, pBox->x1, pBox->y1,

- 			pBox->x2 - pBox->x1, pBox->y2 - pBox->y1);

-	pBox++;

-    }

-    SET_SYNC_FLAG(infoRec);

-}

-

-void

-XAAFillColor8x8PatternRects(

-   ScrnInfoPtr pScrn,

-   int rop,

-   unsigned int planemask,

-   int nBox,

-   BoxPtr pBox,

-   int xorigin, int yorigin,

-   XAACacheInfoPtr pCache

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int xorg, yorg;

-

-    (*infoRec->SetupForColor8x8PatternFill)(pScrn, pCache->x, pCache->y,

-			 rop, planemask, pCache->trans_color);

-

-     while(nBox--) {

-	xorg = (pBox->x1 - xorigin) & 0x07;

-	yorg = (pBox->y1 - yorigin) & 0x07;

-

-   	if(!(infoRec->Color8x8PatternFillFlags & 		

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	    int slot = (yorg << 3) + xorg;

-	    yorg = pCache->y + pCache->offsets[slot].y;

-	    xorg = pCache->x + pCache->offsets[slot].x;

-        }

-

-        (*infoRec->SubsequentColor8x8PatternFillRect)(pScrn, 

-			xorg, yorg, pBox->x1, pBox->y1,

- 			pBox->x2 - pBox->x1, pBox->y2 - pBox->y1);

-	pBox++;

-     }

-

-     SET_SYNC_FLAG(infoRec);

-}

-

-

-	/***************\

-	|  Cache Blits  |

-	\***************/

-

-void

-XAAFillCacheBltRects(

-   ScrnInfoPtr pScrn,

-   int rop,

-   unsigned int planemask,

-   int nBox,

-   BoxPtr pBox,

-   int xorg, int yorg,

-   XAACacheInfoPtr pCache

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int x, y, phaseY, phaseX, skipleft, height, width, w, blit_w, blit_h;

-

-    (*infoRec->SetupForScreenToScreenCopy)(pScrn, 1, 1, rop, planemask,

-		pCache->trans_color);

-

-    while(nBox--) {

-	y = pBox->y1;

-	phaseY = (y - yorg) % pCache->orig_h;

-	if(phaseY < 0) phaseY += pCache->orig_h;

-	phaseX = (pBox->x1 - xorg) % pCache->orig_w;

-	if(phaseX < 0) phaseX += pCache->orig_w;

-	height = pBox->y2 - y;

-	width = pBox->x2 - pBox->x1;

-	

-#if 0

-	if (rop == GXcopy) {

-	    while(1) {

-		w = width; skipleft = phaseX; x = pBox->x1;

-		blit_h = pCache->h - phaseY;

-		if(blit_h > height) blit_h = height;

-	

-		while(1) {

-		    blit_w = pCache->w - skipleft;

-		    if(blit_w > w) blit_w = w;

-		    (*infoRec->SubsequentScreenToScreenCopy)(pScrn,

-			pCache->x + skipleft, pCache->y + phaseY,

-			x, y, blit_w, blit_h);

-		    w -= blit_w;

-		    if(!w) break;

-		    x += blit_w;

-		    skipleft = (skipleft + blit_w) % pCache->orig_w;

-		    if(blit_w >= pCache->orig_w) break;

-		}

-

-		/* Expand horizontally */

-		if (w) {

-		    skipleft -= phaseX;

-		    if (skipleft < 0) skipleft += pCache->orig_w;

-		    blit_w = x - pBox->x1 - skipleft;

-		    while(w) {

-			if (blit_w > w) blit_w = w;

-			(*infoRec->SubsequentScreenToScreenCopy)(pScrn,

-			    pBox->x1 + skipleft, y, x, y, blit_w, blit_h);

-			w -= blit_w;

-			x += blit_w;

-			blit_w <<= 1;

-		    }

-		}

-

-		height -= blit_h;

-		if(!height) break;

-		y += blit_h;

-		phaseY = (phaseY + blit_h) % pCache->orig_h;

-		if(blit_h >= pCache->orig_h) break;

-	    }

-

-	    /* Expand vertically */

-	    if (height) {

-		blit_w = pBox->x2 - pBox->x1;

-		phaseY -= (pBox->y1 - yorg) % pCache->orig_h;

-		if (phaseY < 0) phaseY += pCache->orig_h;

-		blit_h = y - pBox->y1  - phaseY;

-		while(height) {

-		    if (blit_h > height) blit_h = height;

-		    (*infoRec->SubsequentScreenToScreenCopy)(pScrn, pBox->x1,

-			pBox->y1 + phaseY, pBox->x1, y, blit_w, blit_h);

-		    height -= blit_h;

-		    y += blit_h;

-		    blit_h <<= 1;

-		}

-	    }

-	} else 

-#endif

-	{

-	    while(1) {

-		w = width; skipleft = phaseX; x = pBox->x1;

-		blit_h = pCache->h - phaseY;

-		if(blit_h > height) blit_h = height;

-	

-		while(1) {

-		    blit_w = pCache->w - skipleft;

-		    if(blit_w > w) blit_w = w;

-		    (*infoRec->SubsequentScreenToScreenCopy)(pScrn,

-			pCache->x + skipleft, pCache->y + phaseY,

-			x, y, blit_w, blit_h);

-		    w -= blit_w;

-		    if(!w) break;

-		    x += blit_w;

-		    skipleft = (skipleft + blit_w) % pCache->orig_w;

-		}

-		height -= blit_h;

-		if(!height) break;

-		y += blit_h;

-		phaseY = (phaseY + blit_h) % pCache->orig_h;

-	    }

-	}

-	pBox++;

-    }

-    

-    SET_SYNC_FLAG(infoRec);

-}

-

-

-

-

-	/*******************\

-	|  Cache Expansion  |

-	\*******************/

-

-

-

-void

-XAAFillCacheExpandRects(

-   ScrnInfoPtr pScrn,

-   int fg, int bg, int rop,

-   unsigned int planemask,

-   int nBox,

-   BoxPtr pBox,

-   int xorg, int yorg,

-   PixmapPtr pPix

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int x, y, phaseY, phaseX, skipleft, height, width, w, blit_w, blit_h;

-    int cacheWidth;

-    XAACacheInfoPtr pCache;

-

-    pCache = (*infoRec->CacheMonoStipple)(pScrn, pPix);

-

-    cacheWidth = (pCache->w * pScrn->bitsPerPixel) / 

-	infoRec->CacheColorExpandDensity;

-

-    (*infoRec->SetupForScreenToScreenColorExpandFill)(pScrn, fg, bg, rop, 

-							planemask);

-

-    while(nBox--) {

-	y = pBox->y1;

-	phaseY = (y - yorg) % pCache->orig_h;

-	if(phaseY < 0) phaseY += pCache->orig_h;

-	phaseX = (pBox->x1 - xorg) % pCache->orig_w;

-	if(phaseX < 0) phaseX += pCache->orig_w;

-	height = pBox->y2 - y;

-	width = pBox->x2 - pBox->x1;

-	

-	while(1) {

-	    w = width; skipleft = phaseX; x = pBox->x1;

-	    blit_h = pCache->h - phaseY;

-	    if(blit_h > height) blit_h = height;

-	

-	    while(1) {

-		blit_w = cacheWidth - skipleft;

-		if(blit_w > w) blit_w = w;

-		(*infoRec->SubsequentScreenToScreenColorExpandFill)(

-			pScrn, x, y, blit_w, blit_h,

-			pCache->x, pCache->y + phaseY, skipleft);

-		w -= blit_w;

-		if(!w) break;

-		x += blit_w;

-		skipleft = (skipleft + blit_w) % pCache->orig_w;

-	    }

-	    height -= blit_h;

-	    if(!height) break;

-	    y += blit_h;

-	    phaseY = (phaseY + blit_h) % pCache->orig_h;

-	}

-	pBox++;

-    }

-    

-    SET_SYNC_FLAG(infoRec);

-}

-

-

-	/******************\

-	|   Image Writes   |

-	\******************/

-

-

-

-/*  This requires all LEFT_EDGE clipping.  You get too many problems

-    with reading past the edge of the pattern otherwise */

-

-static void

-WriteColumn(

-    ScrnInfoPtr pScrn,

-    unsigned char *pSrc,

-    int x, int y, int w, int h,

-    int xoff, int yoff,

-    int pHeight,

-    int srcwidth,

-    int Bpp

-) {

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    unsigned char *src;

-    Bool PlusOne = FALSE;

-    int skipleft, dwords;

-

-    pSrc += (Bpp * xoff);

-   

-    if((skipleft = (long)pSrc & 0x03L)) {

-        if(Bpp == 3)

-           skipleft = 4 - skipleft;

-        else

-           skipleft /= Bpp;

-

-        x -= skipleft;       

-        w += skipleft;

-        

-        if(Bpp == 3)

-           pSrc -= 3 * skipleft;  

-        else   /* is this Alpha friendly ? */

-           pSrc = (unsigned char*)((long)pSrc & ~0x03L);     

-    }

-

-    src = pSrc + (yoff * srcwidth);

-

-    dwords = bytes_to_int32(w * Bpp);

-

-    if((infoRec->ImageWriteFlags & CPU_TRANSFER_PAD_QWORD) && 

-                                                ((dwords * h) & 0x01)) {

-        PlusOne = TRUE;

-    } 

-

-    (*infoRec->SubsequentImageWriteRect)(pScrn, x, y, w, h, skipleft);

-

-    if(dwords > infoRec->ImageWriteRange) {

-        while(h--) {

-            XAAMoveDWORDS_FixedBase((CARD32*)infoRec->ImageWriteBase,

-                (CARD32*)src, dwords);

-            src += srcwidth;

-	    yoff++;

-	    if(yoff >= pHeight) {

-		yoff = 0;

-		src = pSrc;

-	    }

-        }

-    } else {

-        if(srcwidth == (dwords << 2)) {

-           int maxLines = infoRec->ImageWriteRange/dwords;

-	   int step;

-

-	   while(h) {

-		step = pHeight - yoff;

-		if(step > maxLines) step = maxLines;

-		if(step > h) step = h;

-

-                XAAMoveDWORDS((CARD32*)infoRec->ImageWriteBase,

-                        (CARD32*)src, dwords * step);

-

-                src += (srcwidth * step);

-		yoff += step;

-		if(yoff >= pHeight) {

-		    yoff = 0;

-		    src = pSrc;

-		}

-                h -= step;		

-	   }

-        } else {

-            while(h--) {

-                XAAMoveDWORDS((CARD32*)infoRec->ImageWriteBase,

-                        (CARD32*)src, dwords);

-                src += srcwidth;

-		yoff++;

-		if(yoff >= pHeight) {

-		    yoff = 0;

-		    src = pSrc;

-		}

-            }

-        }

-    }

-

-    if(PlusOne) {

-        CARD32* base = (CARD32*)infoRec->ImageWriteBase;

-        *base = 0x00000000;

-    }

-}

-

-void

-XAAFillImageWriteRects(

-    ScrnInfoPtr pScrn,

-    int rop,

-    unsigned int planemask,

-    int nBox,

-    BoxPtr pBox,

-    int xorg, int yorg,

-    PixmapPtr pPix

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int x, phaseY, phaseX, height, width, blit_w;

-    int pHeight = pPix->drawable.height;

-    int pWidth = pPix->drawable.width;

-    int Bpp = pPix->drawable.bitsPerPixel >> 3;

-    int srcwidth = pPix->devKind;

-

-    (*infoRec->SetupForImageWrite)(pScrn, rop, planemask, -1,

-		pPix->drawable.bitsPerPixel, pPix->drawable.depth);

-

-    while(nBox--) {

-	x = pBox->x1;

-	phaseY = (pBox->y1 - yorg) % pHeight;

-	if(phaseY < 0) phaseY += pHeight;

-	phaseX = (x - xorg) % pWidth;

-	if(phaseX < 0) phaseX += pWidth;

-	height = pBox->y2 - pBox->y1;

-	width = pBox->x2 - x;

-	

-	while(1) {

-	    blit_w = pWidth - phaseX;

-	    if(blit_w > width) blit_w = width;

-

-	    WriteColumn(pScrn, pPix->devPrivate.ptr, x, pBox->y1, 

-		blit_w, height, phaseX, phaseY, pHeight, srcwidth, Bpp);

-

-	    width -= blit_w;

-	    if(!width) break;

-	    x += blit_w;

-	    phaseX = (phaseX + blit_w) % pWidth;

-	}

-	pBox++;

-    }

-

-    if(infoRec->ImageWriteFlags & SYNC_AFTER_IMAGE_WRITE)

-        (*infoRec->Sync)(pScrn);

-    else SET_SYNC_FLAG(infoRec);

-}

-

-

-	/*************\

-	|  Utilities  |

-	\*************/

-

-

-void

-XAAClipAndRenderRects(

-   GCPtr pGC, 

-   ClipAndRenderRectsFunc BoxFunc, 

-   int nrectFill, 

-   xRectangle *prect, 

-   int xorg, int yorg

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    int 	Right, Bottom, MaxBoxes;

-    BoxPtr 	pextent, pboxClipped, pboxClippedBase;

-

-    MaxBoxes = infoRec->PreAllocSize/sizeof(BoxRec);  

-    pboxClippedBase = (BoxPtr)infoRec->PreAllocMem;

-    pboxClipped = pboxClippedBase;

-

-    if (RegionNumRects(pGC->pCompositeClip) == 1) {

-	pextent = RegionRects(pGC->pCompositeClip);

-    	while (nrectFill--) {

-	    pboxClipped->x1 = max(pextent->x1, prect->x);

-	    pboxClipped->y1 = max(pextent->y1, prect->y);

-

-	    Right = (int)prect->x + (int)prect->width;

-	    pboxClipped->x2 = min(pextent->x2, Right);

-    

-	    Bottom = (int)prect->y + (int)prect->height;

-	    pboxClipped->y2 = min(pextent->y2, Bottom);

-

-	    prect++;

-	    if ((pboxClipped->x1 < pboxClipped->x2) &&

-		(pboxClipped->y1 < pboxClipped->y2)) {

-		pboxClipped++;

-		if(pboxClipped >= (pboxClippedBase + MaxBoxes)) {

-		    (*BoxFunc)(pGC, MaxBoxes, pboxClippedBase, xorg, yorg); 

-		    pboxClipped = pboxClippedBase;

-		}

-	    }

-    	}

-    } else {

-	pextent = RegionExtents(pGC->pCompositeClip);

-    	while (nrectFill--) {

-	    int n;

-	    BoxRec box, *pbox;

-   

-	    box.x1 = max(pextent->x1, prect->x);

-   	    box.y1 = max(pextent->y1, prect->y);

-     

-	    Right = (int)prect->x + (int)prect->width;

-	    box.x2 = min(pextent->x2, Right);

-  

-	    Bottom = (int)prect->y + (int)prect->height;

-	    box.y2 = min(pextent->y2, Bottom);

-    

-	    prect++;

-    

-	    if ((box.x1 >= box.x2) || (box.y1 >= box.y2))

-	    	continue;

-    

-	    n = RegionNumRects (pGC->pCompositeClip);

-	    pbox = RegionRects(pGC->pCompositeClip);

-    

-	    /* clip the rectangle to each box in the clip region

-	       this is logically equivalent to calling Intersect()

-	    */

-	    while(n--) {

-		pboxClipped->x1 = max(box.x1, pbox->x1);

-		pboxClipped->y1 = max(box.y1, pbox->y1);

-		pboxClipped->x2 = min(box.x2, pbox->x2);

-		pboxClipped->y2 = min(box.y2, pbox->y2);

-		pbox++;

-

-		/* see if clipping left anything */

-		if(pboxClipped->x1 < pboxClipped->x2 && 

-		   pboxClipped->y1 < pboxClipped->y2) {

-		    pboxClipped++;

-		    if(pboxClipped >= (pboxClippedBase + MaxBoxes)) {

-			(*BoxFunc)(pGC, MaxBoxes, pboxClippedBase, xorg, yorg); 

-			pboxClipped = pboxClippedBase;

-		    }

-		}

-	    }

-    	}

-    }

-

-    if(pboxClipped != pboxClippedBase)

-	(*BoxFunc)(pGC, pboxClipped - pboxClippedBase, pboxClippedBase, 

-					xorg, yorg); 

-}

-

-

-int

-XAAGetRectClipBoxes(

-    GCPtr pGC,

-    BoxPtr pboxClippedBase,

-    int nrectFill,

-    xRectangle *prectInit

-){

-    int 	Right, Bottom;

-    BoxPtr 	pextent, pboxClipped = pboxClippedBase;

-    xRectangle	*prect = prectInit;

-    RegionPtr   prgnClip = pGC->pCompositeClip;

-

-    if (RegionNumRects(prgnClip) == 1) {

-	pextent = RegionRects(prgnClip);

-    	while (nrectFill--) {

-	    pboxClipped->x1 = max(pextent->x1, prect->x);

-	    pboxClipped->y1 = max(pextent->y1, prect->y);

-

-	    Right = (int)prect->x + (int)prect->width;

-	    pboxClipped->x2 = min(pextent->x2, Right);

-    

-	    Bottom = (int)prect->y + (int)prect->height;

-	    pboxClipped->y2 = min(pextent->y2, Bottom);

-

-	    prect++;

-	    if ((pboxClipped->x1 < pboxClipped->x2) &&

-		(pboxClipped->y1 < pboxClipped->y2)) {

-		pboxClipped++;

-	    }

-    	}

-    } else {

-	pextent = RegionExtents(prgnClip);

-    	while (nrectFill--) {

-	    int n;

-	    BoxRec box, *pbox;

-   

-	    box.x1 = max(pextent->x1, prect->x);

-   	    box.y1 = max(pextent->y1, prect->y);

-     

-	    Right = (int)prect->x + (int)prect->width;

-	    box.x2 = min(pextent->x2, Right);

-  

-	    Bottom = (int)prect->y + (int)prect->height;

-	    box.y2 = min(pextent->y2, Bottom);

-    

-	    prect++;

-    

-	    if ((box.x1 >= box.x2) || (box.y1 >= box.y2))

-	    	continue;

-    

-	    n = RegionNumRects (prgnClip);

-	    pbox = RegionRects(prgnClip);

-    

-	    /* clip the rectangle to each box in the clip region

-	       this is logically equivalent to calling Intersect()

-	    */

-	    while(n--) {

-		pboxClipped->x1 = max(box.x1, pbox->x1);

-		pboxClipped->y1 = max(box.y1, pbox->y1);

-		pboxClipped->x2 = min(box.x2, pbox->x2);

-		pboxClipped->y2 = min(box.y2, pbox->y2);

-		pbox++;

-

-		/* see if clipping left anything */

-		if(pboxClipped->x1 < pboxClipped->x2 && 

-		   pboxClipped->y1 < pboxClipped->y2) {

-		    pboxClipped++;

-		}

-	    }

-    	}

-    }

-

-    return pboxClipped - pboxClippedBase;

-}

-

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+
+static void XAARenderSolidRects(GCPtr, int, BoxPtr, int, int);
+static void XAARenderColor8x8Rects(GCPtr, int, BoxPtr, int, int);
+static void XAARenderMono8x8Rects(GCPtr, int, BoxPtr, int, int);
+static void XAARenderColorExpandRects(GCPtr, int, BoxPtr, int, int);
+static void XAARenderCacheExpandRects(GCPtr, int, BoxPtr, int, int);
+static void XAARenderCacheBltRects(GCPtr, int, BoxPtr, int, int);
+static void XAARenderImageWriteRects(GCPtr, int, BoxPtr, int, int);
+static void XAARenderPixmapCopyRects(GCPtr, int, BoxPtr, int, int);
+
+void
+XAAPolyFillRect(DrawablePtr pDraw, GCPtr pGC, int nrectFill,    /* number of rectangles to fill */
+                xRectangle *prectInit   /* Pointer to first rectangle to fill */
+    )
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int xorg = pDraw->x;
+    int yorg = pDraw->y;
+    int type = 0;
+    ClipAndRenderRectsFunc function;
+
+    if ((nrectFill <= 0) || !pGC->planemask)
+        return;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    switch (pGC->fillStyle) {
+    case FillSolid:
+        type = DO_SOLID;
+        break;
+    case FillStippled:
+        type = (*infoRec->StippledFillChooser) (pGC);
+        break;
+    case FillOpaqueStippled:
+        if ((pGC->fgPixel == pGC->bgPixel) && infoRec->FillSolidRects &&
+            CHECK_PLANEMASK(pGC, infoRec->FillSolidRectsFlags) &&
+            CHECK_ROP(pGC, infoRec->FillSolidRectsFlags) &&
+            CHECK_ROPSRC(pGC, infoRec->FillSolidRectsFlags) &&
+            CHECK_FG(pGC, infoRec->FillSolidRectsFlags))
+            type = DO_SOLID;
+        else
+            type = (*infoRec->OpaqueStippledFillChooser) (pGC);
+        break;
+    case FillTiled:
+        type = (*infoRec->TiledFillChooser) (pGC);
+        break;
+    }
+
+    switch (type) {
+    case DO_SOLID:
+        function = XAARenderSolidRects;
+        break;
+    case DO_COLOR_8x8:
+        function = XAARenderColor8x8Rects;
+        break;
+    case DO_MONO_8x8:
+        function = XAARenderMono8x8Rects;
+        break;
+    case DO_CACHE_BLT:
+        function = XAARenderCacheBltRects;
+        break;
+    case DO_COLOR_EXPAND:
+        function = XAARenderColorExpandRects;
+        break;
+    case DO_CACHE_EXPAND:
+        function = XAARenderCacheExpandRects;
+        break;
+    case DO_IMAGE_WRITE:
+        function = XAARenderImageWriteRects;
+        break;
+    case DO_PIXMAP_COPY:
+        function = XAARenderPixmapCopyRects;
+        break;
+    default:
+        (*XAAFallbackOps.PolyFillRect) (pDraw, pGC, nrectFill, prectInit);
+        return;
+    }
+
+    if (xorg | yorg) {
+        int n = nrectFill;
+        xRectangle *prect = prectInit;
+
+        while (n--) {
+            prect->x += xorg;
+            prect->y += yorg;
+            prect++;
+        }
+    }
+
+    XAAClipAndRenderRects(pGC, function, nrectFill, prectInit, xorg, yorg);
+}
+
+        /*********************\
+	|     Solid Rects     |
+	\*********************/
+
+static void
+XAARenderSolidRects(GCPtr pGC,
+                    int nboxes, BoxPtr pClipBoxes, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    (*infoRec->FillSolidRects) (infoRec->pScrn,
+                                pGC->fgPixel, pGC->alu, pGC->planemask, nboxes,
+                                pClipBoxes);
+}
+
+        /************************\
+	|     Mono 8x8 Rects     |
+	\************************/
+
+static void
+XAARenderMono8x8Rects(GCPtr pGC,
+                      int nboxes, BoxPtr pClipBoxes, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAAPixmapPtr pPriv;
+    int fg, bg;
+
+    switch (pGC->fillStyle) {
+    case FillStippled:
+        pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);
+        fg = pGC->fgPixel;
+        bg = -1;
+        break;
+    case FillOpaqueStippled:
+        pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);
+        fg = pGC->fgPixel;
+        bg = pGC->bgPixel;
+        break;
+    case FillTiled:
+        pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
+        fg = pPriv->fg;
+        bg = pPriv->bg;
+        break;
+    default:                   /* Muffle compiler */
+        pPriv = NULL;           /* Kaboom */
+        fg = -1;
+        bg = -1;
+        break;
+    }
+
+    (*infoRec->FillMono8x8PatternRects) (infoRec->pScrn,
+                                         fg, bg, pGC->alu, pGC->planemask,
+                                         nboxes, pClipBoxes, pPriv->pattern0,
+                                         pPriv->pattern1,
+                                         (xorg + pGC->patOrg.x),
+                                         (yorg + pGC->patOrg.y));
+}
+
+        /*************************\
+	|     Color 8x8 Rects     |
+	\*************************/
+
+static void
+XAARenderColor8x8Rects(GCPtr pGC,
+                       int nboxes, BoxPtr pClipBoxes, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAACacheInfoPtr pCache;
+    PixmapPtr pPix;
+    int fg, bg;
+
+    switch (pGC->fillStyle) {
+    case FillStippled:
+        pPix = pGC->stipple;
+        fg = pGC->fgPixel;
+        bg = -1;
+        break;
+    case FillOpaqueStippled:
+        pPix = pGC->stipple;
+        fg = pGC->fgPixel;
+        bg = pGC->bgPixel;
+        break;
+    case FillTiled:
+        pPix = pGC->tile.pixmap;
+        fg = -1;
+        bg = -1;
+        break;
+    default:                   /* Muffle compiler */
+        pPix = NULL;
+        fg = -1;
+        bg = -1;
+        break;
+    }
+
+    pCache = (*infoRec->CacheColor8x8Pattern) (infoRec->pScrn, pPix, fg, bg);
+    (*infoRec->FillColor8x8PatternRects) (infoRec->pScrn,
+                                          pGC->alu, pGC->planemask, nboxes,
+                                          pClipBoxes, (xorg + pGC->patOrg.x),
+                                          (yorg + pGC->patOrg.y), pCache);
+}
+
+        /****************************\
+	|     Color Expand Rects     |
+	\****************************/
+
+static void
+XAARenderColorExpandRects(GCPtr pGC,
+                          int nboxes, BoxPtr pClipBoxes, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int fg, bg;
+
+    switch (pGC->fillStyle) {
+    case FillStippled:
+        fg = pGC->fgPixel;
+        bg = -1;
+        break;
+    case FillOpaqueStippled:
+        fg = pGC->fgPixel;
+        bg = pGC->bgPixel;
+        break;
+    default:                   /* Muffle compiler */
+        fg = -1;
+        bg = -1;
+        break;
+    }
+
+    (*infoRec->FillColorExpandRects) (infoRec->pScrn, fg, bg,
+                                      pGC->alu, pGC->planemask, nboxes,
+                                      pClipBoxes, (xorg + pGC->patOrg.x),
+                                      (yorg + pGC->patOrg.y), pGC->stipple);
+}
+
+        /*************************\
+	|     Cache Blt Rects     |
+	\*************************/
+
+static void
+XAARenderCacheBltRects(GCPtr pGC,
+                       int nboxes, BoxPtr pClipBoxes, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAACacheInfoPtr pCache;
+
+    switch (pGC->fillStyle) {
+    case FillStippled:
+        pCache = (*infoRec->CacheStipple) (infoRec->pScrn, pGC->stipple,
+                                           pGC->fgPixel, -1);
+        break;
+    case FillOpaqueStippled:
+        pCache = (*infoRec->CacheStipple) (infoRec->pScrn, pGC->stipple,
+                                           pGC->fgPixel, pGC->bgPixel);
+        break;
+    case FillTiled:
+        pCache = (*infoRec->CacheTile) (infoRec->pScrn, pGC->tile.pixmap);
+        break;
+    default:                   /* Muffle compiler */
+        pCache = NULL;
+        break;
+    }
+
+    (*infoRec->FillCacheBltRects) (infoRec->pScrn, pGC->alu,
+                                   pGC->planemask, nboxes, pClipBoxes,
+                                   (xorg + pGC->patOrg.x),
+                                   (yorg + pGC->patOrg.y), pCache);
+}
+
+        /****************************\
+	|     Cache Expand Rects     |
+	\****************************/
+
+static void
+XAARenderCacheExpandRects(GCPtr pGC,
+                          int nboxes, BoxPtr pClipBoxes, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int fg, bg;
+
+    switch (pGC->fillStyle) {
+    case FillStippled:
+        fg = pGC->fgPixel;
+        bg = -1;
+        break;
+    case FillOpaqueStippled:
+        fg = pGC->fgPixel;
+        bg = pGC->bgPixel;
+        break;
+    default:                   /* Muffle compiler */
+        fg = -1;
+        bg = -1;
+        break;
+    }
+
+    (*infoRec->FillCacheExpandRects) (infoRec->pScrn, fg, bg,
+                                      pGC->alu, pGC->planemask, nboxes,
+                                      pClipBoxes, (xorg + pGC->patOrg.x),
+                                      (yorg + pGC->patOrg.y), pGC->stipple);
+}
+
+        /***************************\
+	|     Image Write Rects     |
+	\***************************/
+
+static void
+XAARenderImageWriteRects(GCPtr pGC,
+                         int nboxes, BoxPtr pClipBoxes, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    (*infoRec->FillImageWriteRects) (infoRec->pScrn, pGC->alu,
+                                     pGC->planemask, nboxes, pClipBoxes,
+                                     (xorg + pGC->patOrg.x),
+                                     (yorg + pGC->patOrg.y), pGC->tile.pixmap);
+}
+
+        /***************************\
+	|     Pixmap Copy Rects     |
+	\***************************/
+
+static void
+XAARenderPixmapCopyRects(GCPtr pGC,
+                         int nboxes, BoxPtr pClipBoxes, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAACacheInfoPtr pCache = &(infoRec->ScratchCacheInfoRec);
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
+
+    pCache->x = pPriv->offscreenArea->box.x1;
+    pCache->y = pPriv->offscreenArea->box.y1;
+    pCache->w = pCache->orig_w = pPriv->offscreenArea->box.x2 - pCache->x;
+    pCache->h = pCache->orig_h = pPriv->offscreenArea->box.y2 - pCache->y;
+    pCache->trans_color = -1;
+
+    (*infoRec->FillCacheBltRects) (infoRec->pScrn, pGC->alu,
+                                   pGC->planemask, nboxes, pClipBoxes,
+                                   (xorg + pGC->patOrg.x),
+                                   (yorg + pGC->patOrg.y), pCache);
+}
+
+        /************\
+	|   Solid    |
+	\************/
+
+void
+XAAFillSolidRects(ScrnInfoPtr pScrn, int fg, int rop, unsigned int planemask, int nBox, /* number of rectangles to fill */
+                  BoxPtr pBox   /* Pointer to first rectangle to fill */
+    )
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    (*infoRec->SetupForSolidFill) (pScrn, fg, rop, planemask);
+    while (nBox--) {
+        (*infoRec->SubsequentSolidFillRect) (pScrn, pBox->x1, pBox->y1,
+                                             pBox->x2 - pBox->x1,
+                                             pBox->y2 - pBox->y1);
+        pBox++;
+    }
+    SET_SYNC_FLAG(infoRec);
+}
+
+        /*********************\
+	|  8x8 Mono Patterns  |
+	\*********************/
+
+void
+XAAFillMono8x8PatternRectsScreenOrigin(ScrnInfoPtr pScrn,
+                                       int fg, int bg, int rop,
+                                       unsigned int planemask,
+                                       int nBox,
+                                       BoxPtr pBox,
+                                       int pattern0, int pattern1,
+                                       int xorigin, int yorigin)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int patx = pattern0, paty = pattern1;
+    int xorg = (-xorigin) & 0x07;
+    int yorg = (-yorigin) & 0x07;
+
+    if (infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS) {
+        if (!(infoRec->Mono8x8PatternFillFlags &
+              HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+            XAARotateMonoPattern(&patx, &paty, xorg, yorg,
+                                 (infoRec->Mono8x8PatternFillFlags &
+                                  BIT_ORDER_IN_BYTE_MSBFIRST));
+            xorg = patx;
+            yorg = paty;
+        }
+    }
+    else {
+        XAACacheInfoPtr pCache =
+            (*infoRec->CacheMono8x8Pattern) (pScrn, pattern0, pattern1);
+        patx = pCache->x;
+        paty = pCache->y;
+        if (!(infoRec->Mono8x8PatternFillFlags &
+              HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+            int slot = (yorg << 3) + xorg;
+
+            patx += pCache->offsets[slot].x;
+            paty += pCache->offsets[slot].y;
+            xorg = patx;
+            yorg = paty;
+        }
+    }
+
+    (*infoRec->SetupForMono8x8PatternFill) (pScrn, patx, paty,
+                                            fg, bg, rop, planemask);
+
+    while (nBox--) {
+        (*infoRec->SubsequentMono8x8PatternFillRect) (pScrn,
+                                                      xorg, yorg, pBox->x1,
+                                                      pBox->y1,
+                                                      pBox->x2 - pBox->x1,
+                                                      pBox->y2 - pBox->y1);
+        pBox++;
+    }
+    SET_SYNC_FLAG(infoRec);
+}
+
+void
+XAAFillMono8x8PatternRects(ScrnInfoPtr pScrn,
+                           int fg, int bg, int rop,
+                           unsigned int planemask,
+                           int nBox,
+                           BoxPtr pBox,
+                           int pattern0, int pattern1, int xorigin, int yorigin)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int patx = pattern0, paty = pattern1;
+    int xorg, yorg;
+    XAACacheInfoPtr pCache = NULL;
+
+    if (!(infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS)) {
+        pCache = (*infoRec->CacheMono8x8Pattern) (pScrn, pattern0, pattern1);
+        patx = pCache->x;
+        paty = pCache->y;
+    }
+
+    (*infoRec->SetupForMono8x8PatternFill) (pScrn, patx, paty,
+                                            fg, bg, rop, planemask);
+
+    while (nBox--) {
+        xorg = (pBox->x1 - xorigin) & 0x07;
+        yorg = (pBox->y1 - yorigin) & 0x07;
+
+        if (!(infoRec->Mono8x8PatternFillFlags &
+              HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+            if (infoRec->Mono8x8PatternFillFlags &
+                HARDWARE_PATTERN_PROGRAMMED_BITS) {
+                patx = pattern0;
+                paty = pattern1;
+                XAARotateMonoPattern(&patx, &paty, xorg, yorg,
+                                     (infoRec->Mono8x8PatternFillFlags &
+                                      BIT_ORDER_IN_BYTE_MSBFIRST));
+                xorg = patx;
+                yorg = paty;
+            }
+            else {
+                int slot = (yorg << 3) + xorg;
+
+                xorg = patx + pCache->offsets[slot].x;
+                yorg = paty + pCache->offsets[slot].y;
+            }
+        }
+
+        (*infoRec->SubsequentMono8x8PatternFillRect) (pScrn,
+                                                      xorg, yorg, pBox->x1,
+                                                      pBox->y1,
+                                                      pBox->x2 - pBox->x1,
+                                                      pBox->y2 - pBox->y1);
+        pBox++;
+    }
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+        /**********************\
+	|  8x8 Color Patterns  |
+	\**********************/
+
+void
+XAAFillColor8x8PatternRectsScreenOrigin(ScrnInfoPtr pScrn,
+                                        int rop,
+                                        unsigned int planemask,
+                                        int nBox,
+                                        BoxPtr pBox,
+                                        int xorigin, int yorigin,
+                                        XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int patx = pCache->x, paty = pCache->y;
+    int xorg = (-xorigin) & 0x07;
+    int yorg = (-yorigin) & 0x07;
+
+    if (!(infoRec->Color8x8PatternFillFlags &
+          HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+        int slot = (yorg << 3) + xorg;
+
+        paty += pCache->offsets[slot].y;
+        patx += pCache->offsets[slot].x;
+        xorg = patx;
+        yorg = paty;
+    }
+
+    (*infoRec->SetupForColor8x8PatternFill) (pScrn, patx, paty,
+                                             rop, planemask,
+                                             pCache->trans_color);
+
+    while (nBox--) {
+        (*infoRec->SubsequentColor8x8PatternFillRect) (pScrn,
+                                                       xorg, yorg, pBox->x1,
+                                                       pBox->y1,
+                                                       pBox->x2 - pBox->x1,
+                                                       pBox->y2 - pBox->y1);
+        pBox++;
+    }
+    SET_SYNC_FLAG(infoRec);
+}
+
+void
+XAAFillColor8x8PatternRects(ScrnInfoPtr pScrn,
+                            int rop,
+                            unsigned int planemask,
+                            int nBox,
+                            BoxPtr pBox,
+                            int xorigin, int yorigin, XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int xorg, yorg;
+
+    (*infoRec->SetupForColor8x8PatternFill) (pScrn, pCache->x, pCache->y,
+                                             rop, planemask,
+                                             pCache->trans_color);
+
+    while (nBox--) {
+        xorg = (pBox->x1 - xorigin) & 0x07;
+        yorg = (pBox->y1 - yorigin) & 0x07;
+
+        if (!(infoRec->Color8x8PatternFillFlags &
+              HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+            int slot = (yorg << 3) + xorg;
+
+            yorg = pCache->y + pCache->offsets[slot].y;
+            xorg = pCache->x + pCache->offsets[slot].x;
+        }
+
+        (*infoRec->SubsequentColor8x8PatternFillRect) (pScrn,
+                                                       xorg, yorg, pBox->x1,
+                                                       pBox->y1,
+                                                       pBox->x2 - pBox->x1,
+                                                       pBox->y2 - pBox->y1);
+        pBox++;
+    }
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+        /***************\
+	|  Cache Blits  |
+	\***************/
+
+void
+XAAFillCacheBltRects(ScrnInfoPtr pScrn,
+                     int rop,
+                     unsigned int planemask,
+                     int nBox,
+                     BoxPtr pBox, int xorg, int yorg, XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int x, y, phaseY, phaseX, skipleft, height, width, w, blit_w, blit_h;
+
+    (*infoRec->SetupForScreenToScreenCopy) (pScrn, 1, 1, rop, planemask,
+                                            pCache->trans_color);
+
+    while (nBox--) {
+        y = pBox->y1;
+        phaseY = (y - yorg) % pCache->orig_h;
+        if (phaseY < 0)
+            phaseY += pCache->orig_h;
+        phaseX = (pBox->x1 - xorg) % pCache->orig_w;
+        if (phaseX < 0)
+            phaseX += pCache->orig_w;
+        height = pBox->y2 - y;
+        width = pBox->x2 - pBox->x1;
+
+#if 0
+        if (rop == GXcopy) {
+            while (1) {
+                w = width;
+                skipleft = phaseX;
+                x = pBox->x1;
+                blit_h = pCache->h - phaseY;
+                if (blit_h > height)
+                    blit_h = height;
+
+                while (1) {
+                    blit_w = pCache->w - skipleft;
+                    if (blit_w > w)
+                        blit_w = w;
+                    (*infoRec->SubsequentScreenToScreenCopy) (pScrn,
+                                                              pCache->x +
+                                                              skipleft,
+                                                              pCache->y +
+                                                              phaseY, x, y,
+                                                              blit_w, blit_h);
+                    w -= blit_w;
+                    if (!w)
+                        break;
+                    x += blit_w;
+                    skipleft = (skipleft + blit_w) % pCache->orig_w;
+                    if (blit_w >= pCache->orig_w)
+                        break;
+                }
+
+                /* Expand horizontally */
+                if (w) {
+                    skipleft -= phaseX;
+                    if (skipleft < 0)
+                        skipleft += pCache->orig_w;
+                    blit_w = x - pBox->x1 - skipleft;
+                    while (w) {
+                        if (blit_w > w)
+                            blit_w = w;
+                        (*infoRec->SubsequentScreenToScreenCopy) (pScrn,
+                                                                  pBox->x1 +
+                                                                  skipleft, y,
+                                                                  x, y, blit_w,
+                                                                  blit_h);
+                        w -= blit_w;
+                        x += blit_w;
+                        blit_w <<= 1;
+                    }
+                }
+
+                height -= blit_h;
+                if (!height)
+                    break;
+                y += blit_h;
+                phaseY = (phaseY + blit_h) % pCache->orig_h;
+                if (blit_h >= pCache->orig_h)
+                    break;
+            }
+
+            /* Expand vertically */
+            if (height) {
+                blit_w = pBox->x2 - pBox->x1;
+                phaseY -= (pBox->y1 - yorg) % pCache->orig_h;
+                if (phaseY < 0)
+                    phaseY += pCache->orig_h;
+                blit_h = y - pBox->y1 - phaseY;
+                while (height) {
+                    if (blit_h > height)
+                        blit_h = height;
+                    (*infoRec->SubsequentScreenToScreenCopy) (pScrn, pBox->x1,
+                                                              pBox->y1 + phaseY,
+                                                              pBox->x1, y,
+                                                              blit_w, blit_h);
+                    height -= blit_h;
+                    y += blit_h;
+                    blit_h <<= 1;
+                }
+            }
+        }
+        else
+#endif
+        {
+            while (1) {
+                w = width;
+                skipleft = phaseX;
+                x = pBox->x1;
+                blit_h = pCache->h - phaseY;
+                if (blit_h > height)
+                    blit_h = height;
+
+                while (1) {
+                    blit_w = pCache->w - skipleft;
+                    if (blit_w > w)
+                        blit_w = w;
+                    (*infoRec->SubsequentScreenToScreenCopy) (pScrn,
+                                                              pCache->x +
+                                                              skipleft,
+                                                              pCache->y +
+                                                              phaseY, x, y,
+                                                              blit_w, blit_h);
+                    w -= blit_w;
+                    if (!w)
+                        break;
+                    x += blit_w;
+                    skipleft = (skipleft + blit_w) % pCache->orig_w;
+                }
+                height -= blit_h;
+                if (!height)
+                    break;
+                y += blit_h;
+                phaseY = (phaseY + blit_h) % pCache->orig_h;
+            }
+        }
+        pBox++;
+    }
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+        /*******************\
+	|  Cache Expansion  |
+	\*******************/
+
+void
+XAAFillCacheExpandRects(ScrnInfoPtr pScrn,
+                        int fg, int bg, int rop,
+                        unsigned int planemask,
+                        int nBox,
+                        BoxPtr pBox, int xorg, int yorg, PixmapPtr pPix)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int x, y, phaseY, phaseX, skipleft, height, width, w, blit_w, blit_h;
+    int cacheWidth;
+    XAACacheInfoPtr pCache;
+
+    pCache = (*infoRec->CacheMonoStipple) (pScrn, pPix);
+
+    cacheWidth = (pCache->w * pScrn->bitsPerPixel) /
+        infoRec->CacheColorExpandDensity;
+
+    (*infoRec->SetupForScreenToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                       planemask);
+
+    while (nBox--) {
+        y = pBox->y1;
+        phaseY = (y - yorg) % pCache->orig_h;
+        if (phaseY < 0)
+            phaseY += pCache->orig_h;
+        phaseX = (pBox->x1 - xorg) % pCache->orig_w;
+        if (phaseX < 0)
+            phaseX += pCache->orig_w;
+        height = pBox->y2 - y;
+        width = pBox->x2 - pBox->x1;
+
+        while (1) {
+            w = width;
+            skipleft = phaseX;
+            x = pBox->x1;
+            blit_h = pCache->h - phaseY;
+            if (blit_h > height)
+                blit_h = height;
+
+            while (1) {
+                blit_w = cacheWidth - skipleft;
+                if (blit_w > w)
+                    blit_w = w;
+                (*infoRec->SubsequentScreenToScreenColorExpandFill) (pScrn, x,
+                                                                     y, blit_w,
+                                                                     blit_h,
+                                                                     pCache->x,
+                                                                     pCache->y +
+                                                                     phaseY,
+                                                                     skipleft);
+                w -= blit_w;
+                if (!w)
+                    break;
+                x += blit_w;
+                skipleft = (skipleft + blit_w) % pCache->orig_w;
+            }
+            height -= blit_h;
+            if (!height)
+                break;
+            y += blit_h;
+            phaseY = (phaseY + blit_h) % pCache->orig_h;
+        }
+        pBox++;
+    }
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+        /******************\
+	|   Image Writes   |
+	\******************/
+
+/*  This requires all LEFT_EDGE clipping.  You get too many problems
+    with reading past the edge of the pattern otherwise */
+
+static void
+WriteColumn(ScrnInfoPtr pScrn,
+            unsigned char *pSrc,
+            int x, int y, int w, int h,
+            int xoff, int yoff, int pHeight, int srcwidth, int Bpp)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    unsigned char *src;
+    Bool PlusOne = FALSE;
+    int skipleft, dwords;
+
+    pSrc += (Bpp * xoff);
+
+    if ((skipleft = (long) pSrc & 0x03L)) {
+        if (Bpp == 3)
+            skipleft = 4 - skipleft;
+        else
+            skipleft /= Bpp;
+
+        x -= skipleft;
+        w += skipleft;
+
+        if (Bpp == 3)
+            pSrc -= 3 * skipleft;
+        else                    /* is this Alpha friendly ? */
+            pSrc = (unsigned char *) ((long) pSrc & ~0x03L);
+    }
+
+    src = pSrc + (yoff * srcwidth);
+
+    dwords = bytes_to_int32(w * Bpp);
+
+    if ((infoRec->ImageWriteFlags & CPU_TRANSFER_PAD_QWORD) &&
+        ((dwords * h) & 0x01)) {
+        PlusOne = TRUE;
+    }
+
+    (*infoRec->SubsequentImageWriteRect) (pScrn, x, y, w, h, skipleft);
+
+    if (dwords > infoRec->ImageWriteRange) {
+        while (h--) {
+            XAAMoveDWORDS_FixedBase((CARD32 *) infoRec->ImageWriteBase,
+                                    (CARD32 *) src, dwords);
+            src += srcwidth;
+            yoff++;
+            if (yoff >= pHeight) {
+                yoff = 0;
+                src = pSrc;
+            }
+        }
+    }
+    else {
+        if (srcwidth == (dwords << 2)) {
+            int maxLines = infoRec->ImageWriteRange / dwords;
+            int step;
+
+            while (h) {
+                step = pHeight - yoff;
+                if (step > maxLines)
+                    step = maxLines;
+                if (step > h)
+                    step = h;
+
+                XAAMoveDWORDS((CARD32 *) infoRec->ImageWriteBase,
+                              (CARD32 *) src, dwords * step);
+
+                src += (srcwidth * step);
+                yoff += step;
+                if (yoff >= pHeight) {
+                    yoff = 0;
+                    src = pSrc;
+                }
+                h -= step;
+            }
+        }
+        else {
+            while (h--) {
+                XAAMoveDWORDS((CARD32 *) infoRec->ImageWriteBase,
+                              (CARD32 *) src, dwords);
+                src += srcwidth;
+                yoff++;
+                if (yoff >= pHeight) {
+                    yoff = 0;
+                    src = pSrc;
+                }
+            }
+        }
+    }
+
+    if (PlusOne) {
+        CARD32 *base = (CARD32 *) infoRec->ImageWriteBase;
+
+        *base = 0x00000000;
+    }
+}
+
+void
+XAAFillImageWriteRects(ScrnInfoPtr pScrn,
+                       int rop,
+                       unsigned int planemask,
+                       int nBox,
+                       BoxPtr pBox, int xorg, int yorg, PixmapPtr pPix)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int x, phaseY, phaseX, height, width, blit_w;
+    int pHeight = pPix->drawable.height;
+    int pWidth = pPix->drawable.width;
+    int Bpp = pPix->drawable.bitsPerPixel >> 3;
+    int srcwidth = pPix->devKind;
+
+    (*infoRec->SetupForImageWrite) (pScrn, rop, planemask, -1,
+                                    pPix->drawable.bitsPerPixel,
+                                    pPix->drawable.depth);
+
+    while (nBox--) {
+        x = pBox->x1;
+        phaseY = (pBox->y1 - yorg) % pHeight;
+        if (phaseY < 0)
+            phaseY += pHeight;
+        phaseX = (x - xorg) % pWidth;
+        if (phaseX < 0)
+            phaseX += pWidth;
+        height = pBox->y2 - pBox->y1;
+        width = pBox->x2 - x;
+
+        while (1) {
+            blit_w = pWidth - phaseX;
+            if (blit_w > width)
+                blit_w = width;
+
+            WriteColumn(pScrn, pPix->devPrivate.ptr, x, pBox->y1,
+                        blit_w, height, phaseX, phaseY, pHeight, srcwidth, Bpp);
+
+            width -= blit_w;
+            if (!width)
+                break;
+            x += blit_w;
+            phaseX = (phaseX + blit_w) % pWidth;
+        }
+        pBox++;
+    }
+
+    if (infoRec->ImageWriteFlags & SYNC_AFTER_IMAGE_WRITE)
+        (*infoRec->Sync) (pScrn);
+    else
+        SET_SYNC_FLAG(infoRec);
+}
+
+        /*************\
+	|  Utilities  |
+	\*************/
+
+void
+XAAClipAndRenderRects(GCPtr pGC,
+                      ClipAndRenderRectsFunc BoxFunc,
+                      int nrectFill, xRectangle *prect, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int Right, Bottom, MaxBoxes;
+    BoxPtr pextent, pboxClipped, pboxClippedBase;
+
+    MaxBoxes = infoRec->PreAllocSize / sizeof(BoxRec);
+    pboxClippedBase = (BoxPtr) infoRec->PreAllocMem;
+    pboxClipped = pboxClippedBase;
+
+    if (RegionNumRects(pGC->pCompositeClip) == 1) {
+        pextent = RegionRects(pGC->pCompositeClip);
+        while (nrectFill--) {
+            pboxClipped->x1 = max(pextent->x1, prect->x);
+            pboxClipped->y1 = max(pextent->y1, prect->y);
+
+            Right = (int) prect->x + (int) prect->width;
+            pboxClipped->x2 = min(pextent->x2, Right);
+
+            Bottom = (int) prect->y + (int) prect->height;
+            pboxClipped->y2 = min(pextent->y2, Bottom);
+
+            prect++;
+            if ((pboxClipped->x1 < pboxClipped->x2) &&
+                (pboxClipped->y1 < pboxClipped->y2)) {
+                pboxClipped++;
+                if (pboxClipped >= (pboxClippedBase + MaxBoxes)) {
+                    (*BoxFunc) (pGC, MaxBoxes, pboxClippedBase, xorg, yorg);
+                    pboxClipped = pboxClippedBase;
+                }
+            }
+        }
+    }
+    else {
+        pextent = RegionExtents(pGC->pCompositeClip);
+        while (nrectFill--) {
+            int n;
+            BoxRec box, *pbox;
+
+            box.x1 = max(pextent->x1, prect->x);
+            box.y1 = max(pextent->y1, prect->y);
+
+            Right = (int) prect->x + (int) prect->width;
+            box.x2 = min(pextent->x2, Right);
+
+            Bottom = (int) prect->y + (int) prect->height;
+            box.y2 = min(pextent->y2, Bottom);
+
+            prect++;
+
+            if ((box.x1 >= box.x2) || (box.y1 >= box.y2))
+                continue;
+
+            n = RegionNumRects(pGC->pCompositeClip);
+            pbox = RegionRects(pGC->pCompositeClip);
+
+            /* clip the rectangle to each box in the clip region
+               this is logically equivalent to calling Intersect()
+             */
+            while (n--) {
+                pboxClipped->x1 = max(box.x1, pbox->x1);
+                pboxClipped->y1 = max(box.y1, pbox->y1);
+                pboxClipped->x2 = min(box.x2, pbox->x2);
+                pboxClipped->y2 = min(box.y2, pbox->y2);
+                pbox++;
+
+                /* see if clipping left anything */
+                if (pboxClipped->x1 < pboxClipped->x2 &&
+                    pboxClipped->y1 < pboxClipped->y2) {
+                    pboxClipped++;
+                    if (pboxClipped >= (pboxClippedBase + MaxBoxes)) {
+                        (*BoxFunc) (pGC, MaxBoxes, pboxClippedBase, xorg, yorg);
+                        pboxClipped = pboxClippedBase;
+                    }
+                }
+            }
+        }
+    }
+
+    if (pboxClipped != pboxClippedBase)
+        (*BoxFunc) (pGC, pboxClipped - pboxClippedBase, pboxClippedBase,
+                    xorg, yorg);
+}
+
+int
+XAAGetRectClipBoxes(GCPtr pGC,
+                    BoxPtr pboxClippedBase,
+                    int nrectFill, xRectangle *prectInit)
+{
+    int Right, Bottom;
+    BoxPtr pextent, pboxClipped = pboxClippedBase;
+    xRectangle *prect = prectInit;
+    RegionPtr prgnClip = pGC->pCompositeClip;
+
+    if (RegionNumRects(prgnClip) == 1) {
+        pextent = RegionRects(prgnClip);
+        while (nrectFill--) {
+            pboxClipped->x1 = max(pextent->x1, prect->x);
+            pboxClipped->y1 = max(pextent->y1, prect->y);
+
+            Right = (int) prect->x + (int) prect->width;
+            pboxClipped->x2 = min(pextent->x2, Right);
+
+            Bottom = (int) prect->y + (int) prect->height;
+            pboxClipped->y2 = min(pextent->y2, Bottom);
+
+            prect++;
+            if ((pboxClipped->x1 < pboxClipped->x2) &&
+                (pboxClipped->y1 < pboxClipped->y2)) {
+                pboxClipped++;
+            }
+        }
+    }
+    else {
+        pextent = RegionExtents(prgnClip);
+        while (nrectFill--) {
+            int n;
+            BoxRec box, *pbox;
+
+            box.x1 = max(pextent->x1, prect->x);
+            box.y1 = max(pextent->y1, prect->y);
+
+            Right = (int) prect->x + (int) prect->width;
+            box.x2 = min(pextent->x2, Right);
+
+            Bottom = (int) prect->y + (int) prect->height;
+            box.y2 = min(pextent->y2, Bottom);
+
+            prect++;
+
+            if ((box.x1 >= box.x2) || (box.y1 >= box.y2))
+                continue;
+
+            n = RegionNumRects(prgnClip);
+            pbox = RegionRects(prgnClip);
+
+            /* clip the rectangle to each box in the clip region
+               this is logically equivalent to calling Intersect()
+             */
+            while (n--) {
+                pboxClipped->x1 = max(box.x1, pbox->x1);
+                pboxClipped->y1 = max(box.y1, pbox->y1);
+                pboxClipped->x2 = min(box.x2, pbox->x2);
+                pboxClipped->y2 = min(box.y2, pbox->y2);
+                pbox++;
+
+                /* see if clipping left anything */
+                if (pboxClipped->x1 < pboxClipped->x2 &&
+                    pboxClipped->y1 < pboxClipped->y2) {
+                    pboxClipped++;
+                }
+            }
+        }
+    }
+
+    return pboxClipped - pboxClippedBase;
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaGC.c b/xorg-server/hw/xfree86/xaa/xaaGC.c
index 1bc35d9f3..d55f1e445 100644
--- a/xorg-server/hw/xfree86/xaa/xaaGC.c
+++ b/xorg-server/hw/xfree86/xaa/xaaGC.c
@@ -37,614 +37,528 @@ extern GCOps XAAPixmapOps;
 Bool
 XAACreateGC(GCPtr pGC)
 {
-    ScreenPtr    pScreen = pGC->pScreen;
-    XAAGCPtr     pGCPriv = (XAAGCPtr)dixLookupPrivate(&pGC->devPrivates,
-						      XAAGetGCKey());
-    Bool         ret;
-
-    XAA_SCREEN_PROLOGUE(pScreen,CreateGC);
-
-    if((ret = (*pScreen->CreateGC)(pGC))) {	
-	pGCPriv->wrapOps = NULL;
-	pGCPriv->wrapFuncs = pGC->funcs;
-	pGCPriv->XAAOps = &XAAFallbackOps;
-	pGC->funcs = &XAAGCFuncs;
+    ScreenPtr pScreen = pGC->pScreen;
+    XAAGCPtr pGCPriv = (XAAGCPtr) dixLookupPrivate(&pGC->devPrivates,
+                                                   XAAGetGCKey());
+    Bool ret;
+
+    XAA_SCREEN_PROLOGUE(pScreen, CreateGC);
+
+    if ((ret = (*pScreen->CreateGC) (pGC))) {
+        pGCPriv->wrapOps = NULL;
+        pGCPriv->wrapFuncs = pGC->funcs;
+        pGCPriv->XAAOps = &XAAFallbackOps;
+        pGC->funcs = &XAAGCFuncs;
     }
- 
-    XAA_SCREEN_EPILOGUE(pScreen,CreateGC,XAACreateGC);
+
+    XAA_SCREEN_EPILOGUE(pScreen, CreateGC, XAACreateGC);
 
     return ret;
 }
 
-
 static void
-XAAValidateGC(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw 
-){
+XAAValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
+{
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
     XAA_GC_FUNC_PROLOGUE(pGC);
 
-    (*pGC->funcs->ValidateGC)(pGC, changes, pDraw);
+    (*pGC->funcs->ValidateGC) (pGC, changes, pDraw);
 
-    if((changes & GCPlaneMask) &&
-       ((pGC->planemask & infoRec->FullPlanemasks[pGC->depth - 1]) == 
-	 infoRec->FullPlanemasks[pGC->depth - 1]))
-    {	
-	pGC->planemask = ~0;
+    if ((changes & GCPlaneMask) &&
+        ((pGC->planemask & infoRec->FullPlanemasks[pGC->depth - 1]) ==
+         infoRec->FullPlanemasks[pGC->depth - 1])) {
+        pGC->planemask = ~0;
     }
 
-    if(pGC->depth != 32) {
-	/* 0xffffffff is reserved for transparency */
-	if(pGC->bgPixel == 0xffffffff)
-	    pGC->bgPixel = 0x7fffffff;
-	if(pGC->fgPixel == 0xffffffff)
-	    pGC->fgPixel = 0x7fffffff;
+    if (pGC->depth != 32) {
+        /* 0xffffffff is reserved for transparency */
+        if (pGC->bgPixel == 0xffffffff)
+            pGC->bgPixel = 0x7fffffff;
+        if (pGC->fgPixel == 0xffffffff)
+            pGC->fgPixel = 0x7fffffff;
     }
 
-    if((pDraw->type == DRAWABLE_PIXMAP) && !IS_OFFSCREEN_PIXMAP(pDraw)){
-	pGCPriv->flags = OPS_ARE_PIXMAP;
+    if ((pDraw->type == DRAWABLE_PIXMAP) && !IS_OFFSCREEN_PIXMAP(pDraw)) {
+        pGCPriv->flags = OPS_ARE_PIXMAP;
         pGCPriv->changes |= changes;
 
-	/* make sure we're not using videomemory pixmaps to render
-	   onto system memory drawables */
+        /* make sure we're not using videomemory pixmaps to render
+           onto system memory drawables */
 
-	if((pGC->fillStyle == FillTiled) && 
-	    IS_OFFSCREEN_PIXMAP(pGC->tile.pixmap) &&
-	    !OFFSCREEN_PIXMAP_LOCKED(pGC->tile.pixmap)) {
+        if ((pGC->fillStyle == FillTiled) &&
+            IS_OFFSCREEN_PIXMAP(pGC->tile.pixmap) &&
+            !OFFSCREEN_PIXMAP_LOCKED(pGC->tile.pixmap)) {
 
-	    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
-	    FBAreaPtr area = pPriv->offscreenArea;
+            XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
+            FBAreaPtr area = pPriv->offscreenArea;
 
-	    XAARemoveAreaCallback(area); /* clobbers pPriv->offscreenArea */
-	    xf86FreeOffscreenArea(area);
-	}
-    } 
-    else if(!infoRec->pScrn->vtSema && (pDraw->type == DRAWABLE_WINDOW)) {
-	pGCPriv->flags = 0;
+            XAARemoveAreaCallback(area);        /* clobbers pPriv->offscreenArea */
+            xf86FreeOffscreenArea(area);
+        }
+    }
+    else if (!infoRec->pScrn->vtSema && (pDraw->type == DRAWABLE_WINDOW)) {
+        pGCPriv->flags = 0;
         pGCPriv->changes |= changes;
     }
     else {
-	if(!(pGCPriv->flags & OPS_ARE_ACCEL)) {	
-	    changes |= pGCPriv->changes;
-	    pGCPriv->changes = 0;
-	}
-	pGCPriv->flags = OPS_ARE_ACCEL;
+        if (!(pGCPriv->flags & OPS_ARE_ACCEL)) {
+            changes |= pGCPriv->changes;
+            pGCPriv->changes = 0;
+        }
+        pGCPriv->flags = OPS_ARE_ACCEL;
 
 #if 1
-	/* Ugh.  If we can't use the blitter on offscreen pixmaps used
-	   as tiles, then we need to move them out as cfb can't handle
-	   tiles with non-zero origins */
+        /* Ugh.  If we can't use the blitter on offscreen pixmaps used
+           as tiles, then we need to move them out as cfb can't handle
+           tiles with non-zero origins */
 
-	if((pGC->fillStyle == FillTiled) && 
-	    IS_OFFSCREEN_PIXMAP(pGC->tile.pixmap) &&
-	    (DO_PIXMAP_COPY != (*infoRec->TiledFillChooser)(pGC))) {
+        if ((pGC->fillStyle == FillTiled) &&
+            IS_OFFSCREEN_PIXMAP(pGC->tile.pixmap) &&
+            (DO_PIXMAP_COPY != (*infoRec->TiledFillChooser) (pGC))) {
 
-	    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
-	    FBAreaPtr area = pPriv->offscreenArea;
+            XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
+            FBAreaPtr area = pPriv->offscreenArea;
 
-	    XAARemoveAreaCallback(area); /* clobbers pPriv->offscreenArea */
-	    xf86FreeOffscreenArea(area);
-	}
+            XAARemoveAreaCallback(area);        /* clobbers pPriv->offscreenArea */
+            xf86FreeOffscreenArea(area);
+        }
 #endif
     }
 
     XAA_GC_FUNC_EPILOGUE(pGC);
 
-    if(!(pGCPriv->flags & OPS_ARE_ACCEL)) return;
+    if (!(pGCPriv->flags & OPS_ARE_ACCEL))
+        return;
+
+    if ((changes & GCTile) && !pGC->tileIsPixel && pGC->tile.pixmap) {
+        XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
 
-    if((changes & GCTile) && !pGC->tileIsPixel && pGC->tile.pixmap){
-	XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
-		
-	if(pixPriv->flags & DIRTY) {
-	    pixPriv->flags &= ~(DIRTY | REDUCIBILITY_MASK);
-	    pGC->tile.pixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
-	}
+        if (pixPriv->flags & DIRTY) {
+            pixPriv->flags &= ~(DIRTY | REDUCIBILITY_MASK);
+            pGC->tile.pixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+        }
     }
-    if((changes & GCStipple) && pGC->stipple){
-	XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);
-		
-	if(pixPriv->flags & DIRTY) {
-	    pixPriv->flags &= ~(DIRTY | REDUCIBILITY_MASK);
-	    pGC->stipple->drawable.serialNumber = NEXT_SERIAL_NUMBER;
-	}
+    if ((changes & GCStipple) && pGC->stipple) {
+        XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);
+
+        if (pixPriv->flags & DIRTY) {
+            pixPriv->flags &= ~(DIRTY | REDUCIBILITY_MASK);
+            pGC->stipple->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+        }
     }
 
     /* If our Ops are still the default ones we need to allocate new ones */
-    if(pGC->ops == &XAAFallbackOps) {
-	if(!(pGCPriv->XAAOps = malloc(sizeof(GCOps)))) {
-	    pGCPriv->XAAOps = &XAAFallbackOps;
-	    return;
-	}
-	/* make a modifiable copy of the default ops */
-	memcpy(pGCPriv->XAAOps, &XAAFallbackOps, sizeof(GCOps));
-	pGC->ops = pGCPriv->XAAOps;
-	changes = ~0;
+    if (pGC->ops == &XAAFallbackOps) {
+        if (!(pGCPriv->XAAOps = malloc(sizeof(GCOps)))) {
+            pGCPriv->XAAOps = &XAAFallbackOps;
+            return;
+        }
+        /* make a modifiable copy of the default ops */
+        memcpy(pGCPriv->XAAOps, &XAAFallbackOps, sizeof(GCOps));
+        pGC->ops = pGCPriv->XAAOps;
+        changes = ~0;
     }
 
-    if(!changes) return;
+    if (!changes)
+        return;
 
-    if((changes & GCDashList) && infoRec->ComputeDash)
-	infoRec->ComputeDash(pGC);
+    if ((changes & GCDashList) && infoRec->ComputeDash)
+        infoRec->ComputeDash(pGC);
 
-    if(changes & infoRec->FillSpansMask)
-	(*infoRec->ValidateFillSpans)(pGC, changes, pDraw); 	
+    if (changes & infoRec->FillSpansMask)
+        (*infoRec->ValidateFillSpans) (pGC, changes, pDraw);
 
-    if(changes & infoRec->SetSpansMask)
-	(*infoRec->ValidateSetSpans)(pGC, changes, pDraw); 	
+    if (changes & infoRec->SetSpansMask)
+        (*infoRec->ValidateSetSpans) (pGC, changes, pDraw);
 
-    if(changes & infoRec->PutImageMask)
-	(*infoRec->ValidatePutImage)(pGC, changes, pDraw); 	
+    if (changes & infoRec->PutImageMask)
+        (*infoRec->ValidatePutImage) (pGC, changes, pDraw);
 
-    if(changes & infoRec->CopyAreaMask)
-	(*infoRec->ValidateCopyArea)(pGC, changes, pDraw); 	
+    if (changes & infoRec->CopyAreaMask)
+        (*infoRec->ValidateCopyArea) (pGC, changes, pDraw);
 
-    if(changes & infoRec->CopyPlaneMask)
-	(*infoRec->ValidateCopyPlane)(pGC, changes, pDraw); 	
+    if (changes & infoRec->CopyPlaneMask)
+        (*infoRec->ValidateCopyPlane) (pGC, changes, pDraw);
 
-    if(changes & infoRec->PolyPointMask)
-	(*infoRec->ValidatePolyPoint)(pGC, changes, pDraw); 	
+    if (changes & infoRec->PolyPointMask)
+        (*infoRec->ValidatePolyPoint) (pGC, changes, pDraw);
 
-    if(changes & infoRec->PolylinesMask)
-	(*infoRec->ValidatePolylines)(pGC, changes, pDraw); 	
+    if (changes & infoRec->PolylinesMask)
+        (*infoRec->ValidatePolylines) (pGC, changes, pDraw);
 
-    if(changes & infoRec->PolySegmentMask)
-	(*infoRec->ValidatePolySegment)(pGC, changes, pDraw); 	
+    if (changes & infoRec->PolySegmentMask)
+        (*infoRec->ValidatePolySegment) (pGC, changes, pDraw);
 
-    if(changes & infoRec->PolyRectangleMask)
-	(*infoRec->ValidatePolyRectangle)(pGC, changes, pDraw); 	
+    if (changes & infoRec->PolyRectangleMask)
+        (*infoRec->ValidatePolyRectangle) (pGC, changes, pDraw);
 
-    if(changes & infoRec->PolyArcMask)
-	(*infoRec->ValidatePolyArc)(pGC, changes, pDraw); 	
+    if (changes & infoRec->PolyArcMask)
+        (*infoRec->ValidatePolyArc) (pGC, changes, pDraw);
 
-    if(changes & infoRec->FillPolygonMask)
-	(*infoRec->ValidateFillPolygon)(pGC, changes, pDraw); 	
+    if (changes & infoRec->FillPolygonMask)
+        (*infoRec->ValidateFillPolygon) (pGC, changes, pDraw);
 
-    if(changes & infoRec->PolyFillRectMask)
-	(*infoRec->ValidatePolyFillRect)(pGC, changes, pDraw); 	
- 
-    if(changes & infoRec->PolyFillArcMask)
-	(*infoRec->ValidatePolyFillArc)(pGC, changes, pDraw); 	
+    if (changes & infoRec->PolyFillRectMask)
+        (*infoRec->ValidatePolyFillRect) (pGC, changes, pDraw);
 
-    if(changes & infoRec->PolyGlyphBltMask)
-	(*infoRec->ValidatePolyGlyphBlt)(pGC, changes, pDraw);
+    if (changes & infoRec->PolyFillArcMask)
+        (*infoRec->ValidatePolyFillArc) (pGC, changes, pDraw);
 
-    if(changes & infoRec->ImageGlyphBltMask)
-	(*infoRec->ValidateImageGlyphBlt)(pGC, changes, pDraw);
+    if (changes & infoRec->PolyGlyphBltMask)
+        (*infoRec->ValidatePolyGlyphBlt) (pGC, changes, pDraw);
 
-    if(changes & infoRec->PolyText8Mask)
-	(*infoRec->ValidatePolyText8)(pGC, changes, pDraw);
-    
-    if(changes & infoRec->PolyText16Mask)
-	(*infoRec->ValidatePolyText16)(pGC, changes, pDraw);
+    if (changes & infoRec->ImageGlyphBltMask)
+        (*infoRec->ValidateImageGlyphBlt) (pGC, changes, pDraw);
 
-    if(changes & infoRec->ImageText8Mask)
-	(*infoRec->ValidateImageText8)(pGC, changes, pDraw);
-    
-    if(changes & infoRec->ImageText16Mask)
-	(*infoRec->ValidateImageText16)(pGC, changes, pDraw);
- 
-    if(changes & infoRec->PushPixelsMask) 
-	(*infoRec->ValidatePushPixels)(pGC, changes, pDraw); 	
-}
+    if (changes & infoRec->PolyText8Mask)
+        (*infoRec->ValidatePolyText8) (pGC, changes, pDraw);
 
+    if (changes & infoRec->PolyText16Mask)
+        (*infoRec->ValidatePolyText16) (pGC, changes, pDraw);
+
+    if (changes & infoRec->ImageText8Mask)
+        (*infoRec->ValidateImageText8) (pGC, changes, pDraw);
+
+    if (changes & infoRec->ImageText16Mask)
+        (*infoRec->ValidateImageText16) (pGC, changes, pDraw);
+
+    if (changes & infoRec->PushPixelsMask)
+        (*infoRec->ValidatePushPixels) (pGC, changes, pDraw);
+}
 
 static void
 XAADestroyGC(GCPtr pGC)
 {
-    XAA_GC_FUNC_PROLOGUE (pGC);
-     
-    if(pGCPriv->XAAOps != &XAAFallbackOps)
-	free(pGCPriv->XAAOps);
+    XAA_GC_FUNC_PROLOGUE(pGC);
+
+    if (pGCPriv->XAAOps != &XAAFallbackOps)
+        free(pGCPriv->XAAOps);
 
     free(pGCPriv->DashPattern);
     pGCPriv->flags = 0;
 
-    (*pGC->funcs->DestroyGC)(pGC);
-    XAA_GC_FUNC_EPILOGUE (pGC);
+    (*pGC->funcs->DestroyGC) (pGC);
+    XAA_GC_FUNC_EPILOGUE(pGC);
 }
 
 static void
-XAAChangeGC (
-    GCPtr	    pGC,
-    unsigned long   mask
-)
+XAAChangeGC(GCPtr pGC, unsigned long mask)
 {
-    XAA_GC_FUNC_PROLOGUE (pGC);
+    XAA_GC_FUNC_PROLOGUE(pGC);
     (*pGC->funcs->ChangeGC) (pGC, mask);
-    XAA_GC_FUNC_EPILOGUE (pGC);
+    XAA_GC_FUNC_EPILOGUE(pGC);
 
-   /* we have to assume that shared memory pixmaps are dirty 
-      because we can't wrap all operations on them */
+    /* we have to assume that shared memory pixmaps are dirty 
+       because we can't wrap all operations on them */
 
-    if((mask & GCTile) && !pGC->tileIsPixel &&
-	PIXMAP_IS_SHARED(pGC->tile.pixmap))
-    {
-	XAAPixmapPtr pPixPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
-	pPixPriv->flags |= DIRTY;
+    if ((mask & GCTile) && !pGC->tileIsPixel &&
+        PIXMAP_IS_SHARED(pGC->tile.pixmap)) {
+        XAAPixmapPtr pPixPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
+
+        pPixPriv->flags |= DIRTY;
     }
 
-    if((mask & GCStipple) && PIXMAP_IS_SHARED(pGC->stipple)){
-	XAAPixmapPtr pPixPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);
-	pPixPriv->flags |= DIRTY;
+    if ((mask & GCStipple) && PIXMAP_IS_SHARED(pGC->stipple)) {
+        XAAPixmapPtr pPixPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);
+
+        pPixPriv->flags |= DIRTY;
     }
 }
 
 static void
-XAACopyGC (
-    GCPtr	    pGCSrc, 
-    unsigned long   mask,
-    GCPtr	    pGCDst)
+XAACopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
 {
-    XAA_GC_FUNC_PROLOGUE (pGCDst);
+    XAA_GC_FUNC_PROLOGUE(pGCDst);
     (*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst);
-    XAA_GC_FUNC_EPILOGUE (pGCDst);
+    XAA_GC_FUNC_EPILOGUE(pGCDst);
 }
+
 static void
-XAAChangeClip (
-    GCPtr   pGC,
-    int		type,
-    pointer	pvalue,
-    int		nrects )
+XAAChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
 {
-    XAA_GC_FUNC_PROLOGUE (pGC);
+    XAA_GC_FUNC_PROLOGUE(pGC);
     (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
-    XAA_GC_FUNC_EPILOGUE (pGC);
+    XAA_GC_FUNC_EPILOGUE(pGC);
 }
 
 static void
 XAACopyClip(GCPtr pgcDst, GCPtr pgcSrc)
 {
-    XAA_GC_FUNC_PROLOGUE (pgcDst);
-    (* pgcDst->funcs->CopyClip)(pgcDst, pgcSrc);
-    XAA_GC_FUNC_EPILOGUE (pgcDst);
+    XAA_GC_FUNC_PROLOGUE(pgcDst);
+    (*pgcDst->funcs->CopyClip) (pgcDst, pgcSrc);
+    XAA_GC_FUNC_EPILOGUE(pgcDst);
 }
 
 static void
 XAADestroyClip(GCPtr pGC)
 {
-    XAA_GC_FUNC_PROLOGUE (pGC);
-    (* pGC->funcs->DestroyClip)(pGC);
-    XAA_GC_FUNC_EPILOGUE (pGC);
+    XAA_GC_FUNC_PROLOGUE(pGC);
+    (*pGC->funcs->DestroyClip) (pGC);
+    XAA_GC_FUNC_EPILOGUE(pGC);
 }
- 
-/**** Pixmap Wrappers ****/
-
 
+/**** Pixmap Wrappers ****/
 
 static void
-XAAFillSpansPixmap(
-    DrawablePtr pDraw,
-    GC		*pGC,
-    int		nInit,	
-    DDXPointPtr pptInit,	
-    int *pwidthInit,		
-    int fSorted 
-){
-    XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);    
-    (*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);
+XAAFillSpansPixmap(DrawablePtr pDraw,
+                   GC * pGC,
+                   int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)
+{
+    XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
+    (*pGC->ops->FillSpans) (pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
 static void
-XAASetSpansPixmap(
-    DrawablePtr		pDraw,
-    GCPtr		pGC,
-    char		*pcharsrc,
-    register DDXPointPtr ppt,
-    int			*pwidth,
-    int			nspans,
-    int			fSorted 
-){
+XAASetSpansPixmap(DrawablePtr pDraw,
+                  GCPtr pGC,
+                  char *pcharsrc,
+                  register DDXPointPtr ppt,
+                  int *pwidth, int nspans, int fSorted)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);
+    (*pGC->ops->SetSpans) (pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
 static void
-XAAPutImagePixmap(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		depth, 
-    int x, int y, int w, int h,
-    int		leftPad,
-    int		format,
-    char 	*pImage 
-){
+XAAPutImagePixmap(DrawablePtr pDraw,
+                  GCPtr pGC,
+                  int depth,
+                  int x, int y, int w, int h,
+                  int leftPad, int format, char *pImage)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h, 
-		leftPad, format, pImage);
+    (*pGC->ops->PutImage) (pDraw, pGC, depth, x, y, w, h,
+                           leftPad, format, pImage);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
 static RegionPtr
-XAACopyAreaPixmap(
-    DrawablePtr pSrc,
-    DrawablePtr pDst,
-    GC *pGC,
-    int srcx, int srcy,
-    int width, int height,
-    int dstx, int dsty 
-){
+XAACopyAreaPixmap(DrawablePtr pSrc,
+                  DrawablePtr pDst,
+                  GC * pGC,
+                  int srcx, int srcy, int width, int height, int dstx, int dsty)
+{
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
     RegionPtr ret;
 
-    if(infoRec->pScrn->vtSema && 
-	((pSrc->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pSrc))) 
-    {
-	if(infoRec->ReadPixmap && (pGC->alu == GXcopy) &&
-           (pSrc->bitsPerPixel == pDst->bitsPerPixel) &&
-          ((pGC->planemask & infoRec->FullPlanemasks[pSrc->depth - 1])
-              == infoRec->FullPlanemasks[pSrc->depth - 1]))
-        {
-            XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pDst));
-	    pixPriv->flags |= DIRTY; 
-
-            return (XAABitBlt( pSrc, pDst, pGC,
-                srcx, srcy, width, height, dstx, dsty,
-                XAADoImageRead, 0L));
-        } else
-	if(infoRec->NeedToSync) {
-	   (*infoRec->Sync)(infoRec->pScrn);
-	    infoRec->NeedToSync = FALSE;
-	}
-    }    
+    if (infoRec->pScrn->vtSema &&
+        ((pSrc->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pSrc))) {
+        if (infoRec->ReadPixmap && (pGC->alu == GXcopy) &&
+            (pSrc->bitsPerPixel == pDst->bitsPerPixel) &&
+            ((pGC->planemask & infoRec->FullPlanemasks[pSrc->depth - 1])
+             == infoRec->FullPlanemasks[pSrc->depth - 1])) {
+            XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE((PixmapPtr) (pDst));
+
+            pixPriv->flags |= DIRTY;
+
+            return (XAABitBlt(pSrc, pDst, pGC,
+                              srcx, srcy, width, height, dstx, dsty,
+                              XAADoImageRead, 0L));
+        }
+        else if (infoRec->NeedToSync) {
+            (*infoRec->Sync) (infoRec->pScrn);
+            infoRec->NeedToSync = FALSE;
+        }
+    }
 
     {
-	XAA_PIXMAP_OP_PROLOGUE(pGC, pDst);
-	ret = (*pGC->ops->CopyArea)(pSrc, pDst,
-            pGC, srcx, srcy, width, height, dstx, dsty);
-	XAA_PIXMAP_OP_EPILOGUE(pGC);
+        XAA_PIXMAP_OP_PROLOGUE(pGC, pDst);
+        ret = (*pGC->ops->CopyArea) (pSrc, pDst,
+                                     pGC, srcx, srcy, width, height, dstx,
+                                     dsty);
+        XAA_PIXMAP_OP_EPILOGUE(pGC);
     }
     return ret;
 }
 
 static RegionPtr
-XAACopyPlanePixmap(
-    DrawablePtr	pSrc,
-    DrawablePtr	pDst,
-    GCPtr pGC,
-    int	srcx, int srcy,
-    int	width, int height,
-    int	dstx, int dsty,
-    unsigned long bitPlane 
-){
+XAACopyPlanePixmap(DrawablePtr pSrc,
+                   DrawablePtr pDst,
+                   GCPtr pGC,
+                   int srcx, int srcy,
+                   int width, int height,
+                   int dstx, int dsty, unsigned long bitPlane)
+{
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
     RegionPtr ret;
 
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDst);
 
-    if(infoRec->pScrn->vtSema && 
-	((pSrc->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pSrc))){
-	if(infoRec->NeedToSync) {
-	   (*infoRec->Sync)(infoRec->pScrn);
-	    infoRec->NeedToSync = FALSE;
-	}
-    }    
+    if (infoRec->pScrn->vtSema &&
+        ((pSrc->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pSrc))) {
+        if (infoRec->NeedToSync) {
+            (*infoRec->Sync) (infoRec->pScrn);
+            infoRec->NeedToSync = FALSE;
+        }
+    }
 
-    ret = (*pGC->ops->CopyPlane)(pSrc, pDst,
-	       pGC, srcx, srcy, width, height, dstx, dsty, bitPlane);
+    ret = (*pGC->ops->CopyPlane) (pSrc, pDst,
+                                  pGC, srcx, srcy, width, height, dstx, dsty,
+                                  bitPlane);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
     return ret;
 }
 
 static void
-XAAPolyPointPixmap(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int mode,
-    int npt,
-    xPoint *pptInit 
-){
+XAAPolyPointPixmap(DrawablePtr pDraw,
+                   GCPtr pGC, int mode, int npt, xPoint * pptInit)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, npt, pptInit);
+    (*pGC->ops->PolyPoint) (pDraw, pGC, mode, npt, pptInit);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
-
 static void
-XAAPolylinesPixmap(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		mode,		
-    int		npt,		
-    DDXPointPtr pptInit 
-){
+XAAPolylinesPixmap(DrawablePtr pDraw,
+                   GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->Polylines)(pDraw, pGC, mode, npt, pptInit);
+    (*pGC->ops->Polylines) (pDraw, pGC, mode, npt, pptInit);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
-static void 
-XAAPolySegmentPixmap(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		nseg,
-    xSegment	*pSeg 
-){
+static void
+XAAPolySegmentPixmap(DrawablePtr pDraw, GCPtr pGC, int nseg, xSegment * pSeg)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolySegment)(pDraw, pGC, nseg, pSeg);
+    (*pGC->ops->PolySegment) (pDraw, pGC, nseg, pSeg);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
 static void
-XAAPolyRectanglePixmap(
-    DrawablePtr  pDraw,
-    GCPtr        pGC,
-    int	         nRectsInit,
-    xRectangle  *pRectsInit 
-){
+XAAPolyRectanglePixmap(DrawablePtr pDraw,
+                       GCPtr pGC, int nRectsInit, xRectangle *pRectsInit)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRectsInit, pRectsInit);
+    (*pGC->ops->PolyRectangle) (pDraw, pGC, nRectsInit, pRectsInit);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
 static void
-XAAPolyArcPixmap(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		narcs,
-    xArc	*parcs 
-){
+XAAPolyArcPixmap(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyArc)(pDraw, pGC, narcs, parcs);
+    (*pGC->ops->PolyArc) (pDraw, pGC, narcs, parcs);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
 static void
-XAAFillPolygonPixmap(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		shape,
-    int		mode,
-    int		count,
-    DDXPointPtr	ptsIn 
-){
+XAAFillPolygonPixmap(DrawablePtr pDraw,
+                     GCPtr pGC,
+                     int shape, int mode, int count, DDXPointPtr ptsIn)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);
+    (*pGC->ops->FillPolygon) (pDraw, pGC, shape, mode, count, ptsIn);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
-
-static void 
-XAAPolyFillRectPixmap(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		nrectFill, 
-    xRectangle	*prectInit 
-){
+static void
+XAAPolyFillRectPixmap(DrawablePtr pDraw,
+                      GCPtr pGC, int nrectFill, xRectangle *prectInit)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyFillRect)(pDraw, pGC, nrectFill, prectInit);
+    (*pGC->ops->PolyFillRect) (pDraw, pGC, nrectFill, prectInit);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
-
 static void
-XAAPolyFillArcPixmap(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		narcs,
-    xArc	*parcs 
-){
+XAAPolyFillArcPixmap(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcs, parcs);
+    (*pGC->ops->PolyFillArc) (pDraw, pGC, narcs, parcs);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
 static int
-XAAPolyText8Pixmap(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x, 
-    int 	y,
-    int 	count,
-    char	*chars 
-){
+XAAPolyText8Pixmap(DrawablePtr pDraw,
+                   GCPtr pGC, int x, int y, int count, char *chars)
+{
     int ret;
 
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    ret = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);
+    ret = (*pGC->ops->PolyText8) (pDraw, pGC, x, y, count, chars);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
     return ret;
 }
 
 static int
-XAAPolyText16Pixmap(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x,
-    int		y,
-    int 	count,
-    unsigned short *chars 
-){
+XAAPolyText16Pixmap(DrawablePtr pDraw,
+                    GCPtr pGC, int x, int y, int count, unsigned short *chars)
+{
     int ret;
 
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    ret = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);
+    ret = (*pGC->ops->PolyText16) (pDraw, pGC, x, y, count, chars);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
     return ret;
 }
 
 static void
-XAAImageText8Pixmap(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x, 
-    int		y,
-    int 	count,
-    char	*chars 
-){
+XAAImageText8Pixmap(DrawablePtr pDraw,
+                    GCPtr pGC, int x, int y, int count, char *chars)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);
+    (*pGC->ops->ImageText8) (pDraw, pGC, x, y, count, chars);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
+
 static void
-XAAImageText16Pixmap(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x,
-    int		y,
-    int 	count,
-    unsigned short *chars 
-){
+XAAImageText16Pixmap(DrawablePtr pDraw,
+                     GCPtr pGC, int x, int y, int count, unsigned short *chars)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);
+    (*pGC->ops->ImageText16) (pDraw, pGC, x, y, count, chars);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
-
 static void
-XAAImageGlyphBltPixmap(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int xInit, int yInit,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase 
-){
+XAAImageGlyphBltPixmap(DrawablePtr pDraw,
+                       GCPtr pGC,
+                       int xInit, int yInit,
+                       unsigned int nglyph,
+                       CharInfoPtr * ppci, pointer pglyphBase)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, xInit, yInit, nglyph, 
-					ppci, pglyphBase);
+    (*pGC->ops->ImageGlyphBlt) (pDraw, pGC, xInit, yInit, nglyph,
+                                ppci, pglyphBase);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
 static void
-XAAPolyGlyphBltPixmap(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int xInit, int yInit,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase 
-){
+XAAPolyGlyphBltPixmap(DrawablePtr pDraw,
+                      GCPtr pGC,
+                      int xInit, int yInit,
+                      unsigned int nglyph,
+                      CharInfoPtr * ppci, pointer pglyphBase)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, xInit, yInit, nglyph, 
-				ppci, pglyphBase);
+    (*pGC->ops->PolyGlyphBlt) (pDraw, pGC, xInit, yInit, nglyph,
+                               ppci, pglyphBase);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
 static void
-XAAPushPixelsPixmap(
-    GCPtr	pGC,
-    PixmapPtr	pBitMap,
-    DrawablePtr pDraw,
-    int	dx, int dy, int xOrg, int yOrg 
-){
+XAAPushPixelsPixmap(GCPtr pGC,
+                    PixmapPtr pBitMap,
+                    DrawablePtr pDraw, int dx, int dy, int xOrg, int yOrg)
+{
     XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
+    (*pGC->ops->PushPixels) (pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
     XAA_PIXMAP_OP_EPILOGUE(pGC);
 }
 
 GCOps XAAPixmapOps = {
-    XAAFillSpansPixmap, XAASetSpansPixmap, 
-    XAAPutImagePixmap, XAACopyAreaPixmap, 
-    XAACopyPlanePixmap, XAAPolyPointPixmap, 
-    XAAPolylinesPixmap, XAAPolySegmentPixmap, 
-    XAAPolyRectanglePixmap, XAAPolyArcPixmap, 
-    XAAFillPolygonPixmap, XAAPolyFillRectPixmap, 
-    XAAPolyFillArcPixmap, XAAPolyText8Pixmap, 
-    XAAPolyText16Pixmap, XAAImageText8Pixmap, 
-    XAAImageText16Pixmap, XAAImageGlyphBltPixmap, 
+    XAAFillSpansPixmap, XAASetSpansPixmap,
+    XAAPutImagePixmap, XAACopyAreaPixmap,
+    XAACopyPlanePixmap, XAAPolyPointPixmap,
+    XAAPolylinesPixmap, XAAPolySegmentPixmap,
+    XAAPolyRectanglePixmap, XAAPolyArcPixmap,
+    XAAFillPolygonPixmap, XAAPolyFillRectPixmap,
+    XAAPolyFillArcPixmap, XAAPolyText8Pixmap,
+    XAAPolyText16Pixmap, XAAImageText8Pixmap,
+    XAAImageText16Pixmap, XAAImageGlyphBltPixmap,
     XAAPolyGlyphBltPixmap, XAAPushPixelsPixmap,
 };
diff --git a/xorg-server/hw/xfree86/xaa/xaaGCmisc.c b/xorg-server/hw/xfree86/xaa/xaaGCmisc.c
index 5823cc064..ca69aae74 100644
--- a/xorg-server/hw/xfree86/xaa/xaaGCmisc.c
+++ b/xorg-server/hw/xfree86/xaa/xaaGCmisc.c
@@ -20,162 +20,149 @@
 #include "pixmapstr.h"
 
 void
-XAAValidateCopyArea(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw )
+XAAValidateCopyArea(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
 {
-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
-
-   if(infoRec->CopyArea &&
-	CHECK_PLANEMASK(pGC,infoRec->CopyAreaFlags) &&
-	CHECK_ROP(pGC,infoRec->CopyAreaFlags) &&
-	CHECK_ROPSRC(pGC,infoRec->CopyAreaFlags)
-	)
-	pGC->ops->CopyArea = infoRec->CopyArea;
-   else
-	pGC->ops->CopyArea = XAAFallbackOps.CopyArea;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    if (infoRec->CopyArea &&
+        CHECK_PLANEMASK(pGC, infoRec->CopyAreaFlags) &&
+        CHECK_ROP(pGC, infoRec->CopyAreaFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->CopyAreaFlags)
+        )
+        pGC->ops->CopyArea = infoRec->CopyArea;
+    else
+        pGC->ops->CopyArea = XAAFallbackOps.CopyArea;
 }
 
 void
-XAAValidatePutImage(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw )
+XAAValidatePutImage(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
 {
-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
-
-   if(infoRec->PutImage &&
-	CHECK_PLANEMASK(pGC,infoRec->PutImageFlags) &&
-	CHECK_ROP(pGC,infoRec->PutImageFlags) &&
-	CHECK_ROPSRC(pGC,infoRec->PutImageFlags) &&
-	CHECK_COLORS(pGC,infoRec->PutImageFlags)
-	)
-	pGC->ops->PutImage = infoRec->PutImage;
-   else
-	pGC->ops->PutImage = XAAFallbackOps.PutImage;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    if (infoRec->PutImage &&
+        CHECK_PLANEMASK(pGC, infoRec->PutImageFlags) &&
+        CHECK_ROP(pGC, infoRec->PutImageFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->PutImageFlags) &&
+        CHECK_COLORS(pGC, infoRec->PutImageFlags)
+        )
+        pGC->ops->PutImage = infoRec->PutImage;
+    else
+        pGC->ops->PutImage = XAAFallbackOps.PutImage;
 }
 
 void
-XAAValidateCopyPlane(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw )
+XAAValidateCopyPlane(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
 {
-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
-
-   if(infoRec->CopyPlane &&
-	CHECK_PLANEMASK(pGC,infoRec->CopyPlaneFlags) &&
-	CHECK_ROP(pGC,infoRec->CopyPlaneFlags) &&
-	CHECK_ROPSRC(pGC,infoRec->CopyPlaneFlags) &&
-	CHECK_COLORS(pGC,infoRec->CopyPlaneFlags)
-	)
-	pGC->ops->CopyPlane = infoRec->CopyPlane;
-   else
-	pGC->ops->CopyPlane = XAAFallbackOps.CopyPlane;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    if (infoRec->CopyPlane &&
+        CHECK_PLANEMASK(pGC, infoRec->CopyPlaneFlags) &&
+        CHECK_ROP(pGC, infoRec->CopyPlaneFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->CopyPlaneFlags) &&
+        CHECK_COLORS(pGC, infoRec->CopyPlaneFlags)
+        )
+        pGC->ops->CopyPlane = infoRec->CopyPlane;
+    else
+        pGC->ops->CopyPlane = XAAFallbackOps.CopyPlane;
 }
 
 void
-XAAValidatePushPixels(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw )
+XAAValidatePushPixels(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
 {
-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
-
-   if(infoRec->PushPixelsSolid &&
-	(pGC->fillStyle == FillSolid) &&
-	CHECK_PLANEMASK(pGC,infoRec->PushPixelsFlags) &&
-	CHECK_ROP(pGC,infoRec->PushPixelsFlags) &&
-	CHECK_ROPSRC(pGC,infoRec->PushPixelsFlags) &&
-	CHECK_FG(pGC,infoRec->PushPixelsFlags) &&
-	(!(infoRec->PushPixelsFlags & TRANSPARENCY_GXCOPY_ONLY) ||
-	  (pGC->alu == GXcopy))
-	)
-	pGC->ops->PushPixels = infoRec->PushPixelsSolid;
-   else
-	pGC->ops->PushPixels = XAAFallbackOps.PushPixels;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    if (infoRec->PushPixelsSolid &&
+        (pGC->fillStyle == FillSolid) &&
+        CHECK_PLANEMASK(pGC, infoRec->PushPixelsFlags) &&
+        CHECK_ROP(pGC, infoRec->PushPixelsFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->PushPixelsFlags) &&
+        CHECK_FG(pGC, infoRec->PushPixelsFlags) &&
+        (!(infoRec->PushPixelsFlags & TRANSPARENCY_GXCOPY_ONLY) ||
+         (pGC->alu == GXcopy))
+        )
+        pGC->ops->PushPixels = infoRec->PushPixelsSolid;
+    else
+        pGC->ops->PushPixels = XAAFallbackOps.PushPixels;
 
 }
 
-
 /* We make the assumption that the FillSpans, PolyFillRect, FillPolygon
    and PolyFillArc functions are linked in a way that they all have 
    the same rop/color/planemask restrictions. If the driver provides 
    a GC level replacement for these, it will need to supply a new 
    Validate functions if it breaks this assumption */
 
-
 void
-XAAValidateFillSpans(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw )
+XAAValidateFillSpans(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
 {
-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
-
-   if(pGC->fillStyle != FillTiled) changes &= ~GCTile;
-   if((pGC->fillStyle == FillTiled) || (pGC->fillStyle == FillSolid)) 
-	changes &= ~GCStipple;
-   if(!changes) return;
-   
-
-   pGC->ops->FillSpans = XAAFallbackOps.FillSpans;
-   pGC->ops->PolyFillRect = XAAFallbackOps.PolyFillRect;
-   pGC->ops->FillPolygon = XAAFallbackOps.FillPolygon;
-   pGC->ops->PolyFillArc = XAAFallbackOps.PolyFillArc;
-
-   switch(pGC->fillStyle){
-   case FillSolid:
-	if(infoRec->FillSpansSolid &&
-		CHECK_PLANEMASK(pGC,infoRec->FillSpansSolidFlags) &&
-		CHECK_ROP(pGC,infoRec->FillSpansSolidFlags) &&
-		CHECK_ROPSRC(pGC,infoRec->FillSpansSolidFlags) &&
-		CHECK_FG(pGC,infoRec->FillSpansSolidFlags)
-		) {
-	     pGC->ops->FillSpans = infoRec->FillSpansSolid;
-	     pGC->ops->PolyFillRect = infoRec->PolyFillRectSolid;
-	     pGC->ops->FillPolygon = infoRec->FillPolygonSolid;
-	     pGC->ops->PolyFillArc = infoRec->PolyFillArcSolid;
-	}
-	break;
-    	/* The [Stippled/OpaqueStippled/Tiled]FillChooser 
-		functions do the validating */
-   case FillStippled:
-	if(infoRec->FillSpansStippled) {
-	     pGC->ops->FillSpans = infoRec->FillSpansStippled;
-	     pGC->ops->PolyFillRect = infoRec->PolyFillRectStippled;
-	     if(infoRec->FillPolygonStippled)
-	         pGC->ops->FillPolygon = infoRec->FillPolygonStippled;
-	     else pGC->ops->FillPolygon = miFillPolygon;
-	     pGC->ops->PolyFillArc = miPolyFillArc;
-	}
-	break;
-   case FillOpaqueStippled:
-	if(infoRec->FillSpansOpaqueStippled) {
-	     pGC->ops->FillSpans = infoRec->FillSpansOpaqueStippled;
-	     pGC->ops->PolyFillRect = infoRec->PolyFillRectOpaqueStippled;
-	     if(infoRec->FillPolygonOpaqueStippled)
-	         pGC->ops->FillPolygon = infoRec->FillPolygonOpaqueStippled;
-	     else pGC->ops->FillPolygon = miFillPolygon;
-	     pGC->ops->PolyFillArc = miPolyFillArc;
-	}
-	break;
-   case FillTiled:
-	if(infoRec->FillSpansTiled) {
-	     pGC->ops->FillSpans = infoRec->FillSpansTiled;
-	     pGC->ops->PolyFillRect = infoRec->PolyFillRectTiled;
-	     if(infoRec->FillPolygonTiled)
-	         pGC->ops->FillPolygon = infoRec->FillPolygonTiled;
-	     else pGC->ops->FillPolygon = miFillPolygon;
-	     pGC->ops->PolyFillArc = miPolyFillArc;
-	}
-	break;
-   default: return;
-   }
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    if (pGC->fillStyle != FillTiled)
+        changes &= ~GCTile;
+    if ((pGC->fillStyle == FillTiled) || (pGC->fillStyle == FillSolid))
+        changes &= ~GCStipple;
+    if (!changes)
+        return;
+
+    pGC->ops->FillSpans = XAAFallbackOps.FillSpans;
+    pGC->ops->PolyFillRect = XAAFallbackOps.PolyFillRect;
+    pGC->ops->FillPolygon = XAAFallbackOps.FillPolygon;
+    pGC->ops->PolyFillArc = XAAFallbackOps.PolyFillArc;
+
+    switch (pGC->fillStyle) {
+    case FillSolid:
+        if (infoRec->FillSpansSolid &&
+            CHECK_PLANEMASK(pGC, infoRec->FillSpansSolidFlags) &&
+            CHECK_ROP(pGC, infoRec->FillSpansSolidFlags) &&
+            CHECK_ROPSRC(pGC, infoRec->FillSpansSolidFlags) &&
+            CHECK_FG(pGC, infoRec->FillSpansSolidFlags)
+            ) {
+            pGC->ops->FillSpans = infoRec->FillSpansSolid;
+            pGC->ops->PolyFillRect = infoRec->PolyFillRectSolid;
+            pGC->ops->FillPolygon = infoRec->FillPolygonSolid;
+            pGC->ops->PolyFillArc = infoRec->PolyFillArcSolid;
+        }
+        break;
+        /* The [Stippled/OpaqueStippled/Tiled]FillChooser 
+           functions do the validating */
+    case FillStippled:
+        if (infoRec->FillSpansStippled) {
+            pGC->ops->FillSpans = infoRec->FillSpansStippled;
+            pGC->ops->PolyFillRect = infoRec->PolyFillRectStippled;
+            if (infoRec->FillPolygonStippled)
+                pGC->ops->FillPolygon = infoRec->FillPolygonStippled;
+            else
+                pGC->ops->FillPolygon = miFillPolygon;
+            pGC->ops->PolyFillArc = miPolyFillArc;
+        }
+        break;
+    case FillOpaqueStippled:
+        if (infoRec->FillSpansOpaqueStippled) {
+            pGC->ops->FillSpans = infoRec->FillSpansOpaqueStippled;
+            pGC->ops->PolyFillRect = infoRec->PolyFillRectOpaqueStippled;
+            if (infoRec->FillPolygonOpaqueStippled)
+                pGC->ops->FillPolygon = infoRec->FillPolygonOpaqueStippled;
+            else
+                pGC->ops->FillPolygon = miFillPolygon;
+            pGC->ops->PolyFillArc = miPolyFillArc;
+        }
+        break;
+    case FillTiled:
+        if (infoRec->FillSpansTiled) {
+            pGC->ops->FillSpans = infoRec->FillSpansTiled;
+            pGC->ops->PolyFillRect = infoRec->PolyFillRectTiled;
+            if (infoRec->FillPolygonTiled)
+                pGC->ops->FillPolygon = infoRec->FillPolygonTiled;
+            else
+                pGC->ops->FillPolygon = miFillPolygon;
+            pGC->ops->PolyFillArc = miPolyFillArc;
+        }
+        break;
+    default:
+        return;
+    }
 }
 
-
 /* We make the assumption that these Text8/16 and GlyphBlt functions
    are linked in a way that they all have the same rop/color/planemask
    restrictions. If the driver provides a GC level replacement for
@@ -183,247 +170,243 @@ XAAValidateFillSpans(
    this assumption */
 
 void
-XAAValidatePolyGlyphBlt(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw )
+XAAValidatePolyGlyphBlt(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
 {
-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
-   Bool BigFont = FALSE;
-
-   pGC->ops->PolyText8 = XAAFallbackOps.PolyText8;
-   pGC->ops->PolyText16 = XAAFallbackOps.PolyText16;
-   pGC->ops->PolyGlyphBlt = XAAFallbackOps.PolyGlyphBlt;
-
-   if(!pGC->font) return;
-   if(pGC->fillStyle != FillSolid) return;
-
-   if((FONTMAXBOUNDS(pGC->font, rightSideBearing) - 
-	FONTMINBOUNDS(pGC->font, leftSideBearing) > 32))
-	BigFont = TRUE;
-
-   /* no funny business */
-   if((FONTMINBOUNDS(pGC->font, characterWidth) <= 0) ||
-	((FONTASCENT(pGC->font) + FONTDESCENT(pGC->font)) <= 0))
-	return;
-
-   /* Check for TE Fonts */
-   if(!TERMINALFONT(pGC->font) || BigFont) {
-	if(infoRec->PolyGlyphBltNonTE &&
-	    CHECK_PLANEMASK(pGC,infoRec->PolyGlyphBltNonTEFlags) &&
-	    CHECK_ROP(pGC,infoRec->PolyGlyphBltNonTEFlags) &&
-	    CHECK_ROPSRC(pGC,infoRec->PolyGlyphBltNonTEFlags) &&
-	    CHECK_FG(pGC,infoRec->PolyGlyphBltNonTEFlags) &&
-	    (!(infoRec->PolyGlyphBltNonTEFlags & TRANSPARENCY_GXCOPY_ONLY) ||
-	  	(pGC->alu == GXcopy))
-	) {
-	    pGC->ops->PolyText8 = infoRec->PolyText8NonTE; 
-	    pGC->ops->PolyText16 = infoRec->PolyText16NonTE;
-	    pGC->ops->PolyGlyphBlt = infoRec->PolyGlyphBltNonTE;
-	}
-   } else {
-	if(infoRec->PolyGlyphBltTE &&
-	    CHECK_PLANEMASK(pGC,infoRec->PolyGlyphBltTEFlags) &&
-	    CHECK_ROP(pGC,infoRec->PolyGlyphBltTEFlags) &&
-	    CHECK_ROPSRC(pGC,infoRec->PolyGlyphBltNonTEFlags) &&
-	    CHECK_FG(pGC,infoRec->PolyGlyphBltTEFlags) &&
-	    (!(infoRec->PolyGlyphBltTEFlags & TRANSPARENCY_GXCOPY_ONLY) ||
-	  	(pGC->alu == GXcopy))
-	) {
-	    pGC->ops->PolyText8 = infoRec->PolyText8TE;
-	    pGC->ops->PolyText16 = infoRec->PolyText16TE;
-	    pGC->ops->PolyGlyphBlt = infoRec->PolyGlyphBltTE;
-	}
-   }
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    Bool BigFont = FALSE;
+
+    pGC->ops->PolyText8 = XAAFallbackOps.PolyText8;
+    pGC->ops->PolyText16 = XAAFallbackOps.PolyText16;
+    pGC->ops->PolyGlyphBlt = XAAFallbackOps.PolyGlyphBlt;
+
+    if (!pGC->font)
+        return;
+    if (pGC->fillStyle != FillSolid)
+        return;
+
+    if ((FONTMAXBOUNDS(pGC->font, rightSideBearing) -
+         FONTMINBOUNDS(pGC->font, leftSideBearing) > 32))
+        BigFont = TRUE;
+
+    /* no funny business */
+    if ((FONTMINBOUNDS(pGC->font, characterWidth) <= 0) ||
+        ((FONTASCENT(pGC->font) + FONTDESCENT(pGC->font)) <= 0))
+        return;
+
+    /* Check for TE Fonts */
+    if (!TERMINALFONT(pGC->font) || BigFont) {
+        if (infoRec->PolyGlyphBltNonTE &&
+            CHECK_PLANEMASK(pGC, infoRec->PolyGlyphBltNonTEFlags) &&
+            CHECK_ROP(pGC, infoRec->PolyGlyphBltNonTEFlags) &&
+            CHECK_ROPSRC(pGC, infoRec->PolyGlyphBltNonTEFlags) &&
+            CHECK_FG(pGC, infoRec->PolyGlyphBltNonTEFlags) &&
+            (!(infoRec->PolyGlyphBltNonTEFlags & TRANSPARENCY_GXCOPY_ONLY) ||
+             (pGC->alu == GXcopy))
+            ) {
+            pGC->ops->PolyText8 = infoRec->PolyText8NonTE;
+            pGC->ops->PolyText16 = infoRec->PolyText16NonTE;
+            pGC->ops->PolyGlyphBlt = infoRec->PolyGlyphBltNonTE;
+        }
+    }
+    else {
+        if (infoRec->PolyGlyphBltTE &&
+            CHECK_PLANEMASK(pGC, infoRec->PolyGlyphBltTEFlags) &&
+            CHECK_ROP(pGC, infoRec->PolyGlyphBltTEFlags) &&
+            CHECK_ROPSRC(pGC, infoRec->PolyGlyphBltNonTEFlags) &&
+            CHECK_FG(pGC, infoRec->PolyGlyphBltTEFlags) &&
+            (!(infoRec->PolyGlyphBltTEFlags & TRANSPARENCY_GXCOPY_ONLY) ||
+             (pGC->alu == GXcopy))
+            ) {
+            pGC->ops->PolyText8 = infoRec->PolyText8TE;
+            pGC->ops->PolyText16 = infoRec->PolyText16TE;
+            pGC->ops->PolyGlyphBlt = infoRec->PolyGlyphBltTE;
+        }
+    }
 }
 
 void
-XAAValidateImageGlyphBlt(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw )
+XAAValidateImageGlyphBlt(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
 {
-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
-   Bool BigFont = FALSE;
-
-   pGC->ops->ImageText8 = XAAFallbackOps.ImageText8;
-   pGC->ops->ImageText16 = XAAFallbackOps.ImageText16;
-   pGC->ops->ImageGlyphBlt = XAAFallbackOps.ImageGlyphBlt;
-
-   if(!pGC->font) return;
-
-   if((FONTMAXBOUNDS(pGC->font, rightSideBearing) - 
-	FONTMINBOUNDS(pGC->font, leftSideBearing) > 32))
-	BigFont = TRUE;
-
-   /* no funny business */
-   if((FONTMINBOUNDS(pGC->font, characterWidth) <= 0) ||
-	((FONTASCENT(pGC->font) + FONTDESCENT(pGC->font)) <= 0))
-	return;
-
-
-   /* Check for TE Fonts */
-   if(!TERMINALFONT(pGC->font) || BigFont || (pGC->depth == 32)) {
-	if(infoRec->ImageGlyphBltNonTE &&
-		CHECK_PLANEMASK(pGC,infoRec->ImageGlyphBltNonTEFlags) &&
-		CHECK_FG(pGC,infoRec->ImageGlyphBltNonTEFlags) &&
-	   infoRec->SetupForSolidFill &&
-		CHECK_PLANEMASK(pGC,infoRec->SolidFillFlags) &&
-		CHECK_BG(pGC,infoRec->SolidFillFlags))
-	{
-		pGC->ops->ImageText8 = infoRec->ImageText8NonTE;
-		pGC->ops->ImageText16 = infoRec->ImageText16NonTE;
-		pGC->ops->ImageGlyphBlt = infoRec->ImageGlyphBltNonTE;
-	}
-   } else if(infoRec->ImageGlyphBltTE &&
-	     CHECK_PLANEMASK(pGC,infoRec->ImageGlyphBltTEFlags)){
-	if(!(infoRec->ImageGlyphBltTEFlags & TRANSPARENCY_ONLY) &&  
-		CHECK_COLORS(pGC,infoRec->ImageGlyphBltTEFlags))
-	{
-		pGC->ops->ImageText8 = infoRec->ImageText8TE;
-		pGC->ops->ImageText16 = infoRec->ImageText16TE;
-		pGC->ops->ImageGlyphBlt = infoRec->ImageGlyphBltTE;
-	} else {
-	   if(CHECK_FG(pGC,infoRec->ImageGlyphBltTEFlags) &&
-	      infoRec->SetupForSolidFill &&
-	      CHECK_PLANEMASK(pGC,infoRec->SolidFillFlags) &&
-	      CHECK_BG(pGC,infoRec->SolidFillFlags)) 
-	   {
-		pGC->ops->ImageText8 = infoRec->ImageText8TE;
-		pGC->ops->ImageText16 = infoRec->ImageText16TE;
-		pGC->ops->ImageGlyphBlt = infoRec->ImageGlyphBltTE;
-	   }
-	}
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    Bool BigFont = FALSE;
+
+    pGC->ops->ImageText8 = XAAFallbackOps.ImageText8;
+    pGC->ops->ImageText16 = XAAFallbackOps.ImageText16;
+    pGC->ops->ImageGlyphBlt = XAAFallbackOps.ImageGlyphBlt;
+
+    if (!pGC->font)
+        return;
+
+    if ((FONTMAXBOUNDS(pGC->font, rightSideBearing) -
+         FONTMINBOUNDS(pGC->font, leftSideBearing) > 32))
+        BigFont = TRUE;
+
+    /* no funny business */
+    if ((FONTMINBOUNDS(pGC->font, characterWidth) <= 0) ||
+        ((FONTASCENT(pGC->font) + FONTDESCENT(pGC->font)) <= 0))
+        return;
+
+    /* Check for TE Fonts */
+    if (!TERMINALFONT(pGC->font) || BigFont || (pGC->depth == 32)) {
+        if (infoRec->ImageGlyphBltNonTE &&
+            CHECK_PLANEMASK(pGC, infoRec->ImageGlyphBltNonTEFlags) &&
+            CHECK_FG(pGC, infoRec->ImageGlyphBltNonTEFlags) &&
+            infoRec->SetupForSolidFill &&
+            CHECK_PLANEMASK(pGC, infoRec->SolidFillFlags) &&
+            CHECK_BG(pGC, infoRec->SolidFillFlags)) {
+            pGC->ops->ImageText8 = infoRec->ImageText8NonTE;
+            pGC->ops->ImageText16 = infoRec->ImageText16NonTE;
+            pGC->ops->ImageGlyphBlt = infoRec->ImageGlyphBltNonTE;
+        }
+    }
+    else if (infoRec->ImageGlyphBltTE &&
+             CHECK_PLANEMASK(pGC, infoRec->ImageGlyphBltTEFlags)) {
+        if (!(infoRec->ImageGlyphBltTEFlags & TRANSPARENCY_ONLY) &&
+            CHECK_COLORS(pGC, infoRec->ImageGlyphBltTEFlags)) {
+            pGC->ops->ImageText8 = infoRec->ImageText8TE;
+            pGC->ops->ImageText16 = infoRec->ImageText16TE;
+            pGC->ops->ImageGlyphBlt = infoRec->ImageGlyphBltTE;
+        }
+        else {
+            if (CHECK_FG(pGC, infoRec->ImageGlyphBltTEFlags) &&
+                infoRec->SetupForSolidFill &&
+                CHECK_PLANEMASK(pGC, infoRec->SolidFillFlags) &&
+                CHECK_BG(pGC, infoRec->SolidFillFlags)) {
+                pGC->ops->ImageText8 = infoRec->ImageText8TE;
+                pGC->ops->ImageText16 = infoRec->ImageText16TE;
+                pGC->ops->ImageGlyphBlt = infoRec->ImageGlyphBltTE;
+            }
+        }
     }
 }
 
-
 void
-XAAValidatePolylines(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw )
+XAAValidatePolylines(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
 {
-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
-   XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&pGC->devPrivates,
-						 XAAGetGCKey());
-
-   if(pGC->lineStyle == LineSolid) changes &= ~GCDashList;
-   if(!changes) return;
-
-   pGC->ops->PolySegment = XAAFallbackOps.PolySegment;
-   pGC->ops->Polylines = XAAFallbackOps.Polylines;
-   pGC->ops->PolyRectangle = XAAFallbackOps.PolyRectangle;
-   pGC->ops->PolyArc = XAAFallbackOps.PolyArc;
-
-   if((pGC->ops->FillSpans != XAAFallbackOps.FillSpans) &&
-	(pGC->lineWidth > 0)){
-	
-	pGC->ops->PolyArc = miPolyArc;	
-	pGC->ops->PolySegment = miPolySegment;	
-	pGC->ops->PolyRectangle = miPolyRectangle;
-	if(pGC->lineStyle == LineSolid)
-	    pGC->ops->Polylines = miWideLine;
-	else
-	    pGC->ops->Polylines = miWideDash;
-   }
-
-   if((pGC->lineWidth == 0) && (pGC->fillStyle == FillSolid)) {
-
-	if(pGC->lineStyle == LineSolid) {
-
-	   if(infoRec->PolyRectangleThinSolid &&
-		CHECK_PLANEMASK(pGC,infoRec->PolyRectangleThinSolidFlags) &&
-		CHECK_ROP(pGC,infoRec->PolyRectangleThinSolidFlags) &&
-		CHECK_ROPSRC(pGC,infoRec->PolyRectangleThinSolidFlags) &&
-		CHECK_FG(pGC,infoRec->PolyRectangleThinSolidFlags)) {
-
-		pGC->ops->PolyRectangle = infoRec->PolyRectangleThinSolid;
-	   }
-
-	   if(infoRec->PolySegmentThinSolid &&
-		CHECK_PLANEMASK(pGC,infoRec->PolySegmentThinSolidFlags) &&
-		CHECK_ROP(pGC,infoRec->PolySegmentThinSolidFlags) &&
-		CHECK_ROPSRC(pGC,infoRec->PolySegmentThinSolidFlags) &&
-		CHECK_FG(pGC,infoRec->PolySegmentThinSolidFlags)) {
-
-		pGC->ops->PolySegment = infoRec->PolySegmentThinSolid;
-	   }
-
-	   if(infoRec->PolylinesThinSolid &&
-		CHECK_PLANEMASK(pGC,infoRec->PolylinesThinSolidFlags) &&
-		CHECK_ROP(pGC,infoRec->PolylinesThinSolidFlags) &&
-		CHECK_ROPSRC(pGC,infoRec->PolylinesThinSolidFlags) &&
-		CHECK_FG(pGC,infoRec->PolylinesThinSolidFlags)) {
-
-		pGC->ops->Polylines = infoRec->PolylinesThinSolid;
-	    }
-	} else if((pGC->lineStyle == LineOnOffDash) && pGCPriv->DashPattern){
-
-	   if(infoRec->PolySegmentThinDashed &&
-		!(infoRec->PolySegmentThinDashedFlags & NO_TRANSPARENCY) &&
-		((pGC->alu == GXcopy) || !(infoRec->PolySegmentThinDashedFlags &
-					TRANSPARENCY_GXCOPY_ONLY)) &&
-		CHECK_PLANEMASK(pGC,infoRec->PolySegmentThinDashedFlags) &&
-		CHECK_ROP(pGC,infoRec->PolySegmentThinDashedFlags) &&
-		CHECK_ROPSRC(pGC,infoRec->PolySegmentThinDashedFlags) &&
-		CHECK_FG(pGC,infoRec->PolySegmentThinDashedFlags)) {
-
-		pGC->ops->PolySegment = infoRec->PolySegmentThinDashed;
-	   }
-
-	   if(infoRec->PolylinesThinDashed &&
-		!(infoRec->PolylinesThinDashedFlags & NO_TRANSPARENCY) &&
-		((pGC->alu == GXcopy) || !(infoRec->PolylinesThinDashedFlags &
-					TRANSPARENCY_GXCOPY_ONLY)) &&
-		CHECK_PLANEMASK(pGC,infoRec->PolylinesThinDashedFlags) &&
-		CHECK_ROP(pGC,infoRec->PolylinesThinDashedFlags) &&
-		CHECK_ROPSRC(pGC,infoRec->PolylinesThinDashedFlags) &&
-		CHECK_FG(pGC,infoRec->PolylinesThinDashedFlags)) {
-
-		pGC->ops->Polylines = infoRec->PolylinesThinDashed;
-	    }
-
-	   if(pGC->ops->Polylines != XAAFallbackOps.Polylines)
-		pGC->ops->PolyRectangle = miPolyRectangle;
-
-	} else if(pGCPriv->DashPattern && (pGC->depth != 32)) { 
-           /* LineDoubleDash */
-	   if(infoRec->PolySegmentThinDashed &&
-		!(infoRec->PolySegmentThinDashedFlags & TRANSPARENCY_ONLY) &&
-		CHECK_PLANEMASK(pGC,infoRec->PolySegmentThinDashedFlags) &&
-		CHECK_ROP(pGC,infoRec->PolySegmentThinDashedFlags) &&
-		CHECK_ROPSRC(pGC,infoRec->PolySegmentThinDashedFlags) &&
-		CHECK_COLORS(pGC,infoRec->PolySegmentThinDashedFlags)) {
-
-		pGC->ops->PolySegment = infoRec->PolySegmentThinDashed;
-	   }
-
-	   if(infoRec->PolylinesThinDashed &&
-		!(infoRec->PolylinesThinDashedFlags & TRANSPARENCY_ONLY) &&
-		CHECK_PLANEMASK(pGC,infoRec->PolylinesThinDashedFlags) &&
-		CHECK_ROP(pGC,infoRec->PolylinesThinDashedFlags) &&
-		CHECK_ROPSRC(pGC,infoRec->PolylinesThinDashedFlags) &&
-		CHECK_COLORS(pGC,infoRec->PolylinesThinDashedFlags)) {
-
-		pGC->ops->Polylines = infoRec->PolylinesThinDashed;
-	    }
-
-	   if(pGC->ops->Polylines != XAAFallbackOps.Polylines)
-		pGC->ops->PolyRectangle = miPolyRectangle;
-
-	}
-   }
-
-   if(infoRec->PolylinesWideSolid &&
-	(pGC->lineWidth > 0) &&
-	(pGC->fillStyle == FillSolid) &&
-	(pGC->lineStyle == LineSolid) &&
-	CHECK_PLANEMASK(pGC,infoRec->PolylinesWideSolidFlags) &&
-	CHECK_ROP(pGC,infoRec->PolylinesWideSolidFlags) &&
-	CHECK_ROPSRC(pGC,infoRec->PolylinesWideSolidFlags) &&
-	CHECK_FG(pGC,infoRec->PolylinesWideSolidFlags)) {
-
-	pGC->ops->Polylines = infoRec->PolylinesWideSolid;
-   } 
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAAGCPtr pGCPriv = (XAAGCPtr) dixLookupPrivate(&pGC->devPrivates,
+                                                   XAAGetGCKey());
+
+    if (pGC->lineStyle == LineSolid)
+        changes &= ~GCDashList;
+    if (!changes)
+        return;
+
+    pGC->ops->PolySegment = XAAFallbackOps.PolySegment;
+    pGC->ops->Polylines = XAAFallbackOps.Polylines;
+    pGC->ops->PolyRectangle = XAAFallbackOps.PolyRectangle;
+    pGC->ops->PolyArc = XAAFallbackOps.PolyArc;
+
+    if ((pGC->ops->FillSpans != XAAFallbackOps.FillSpans) &&
+        (pGC->lineWidth > 0)) {
+
+        pGC->ops->PolyArc = miPolyArc;
+        pGC->ops->PolySegment = miPolySegment;
+        pGC->ops->PolyRectangle = miPolyRectangle;
+        if (pGC->lineStyle == LineSolid)
+            pGC->ops->Polylines = miWideLine;
+        else
+            pGC->ops->Polylines = miWideDash;
+    }
+
+    if ((pGC->lineWidth == 0) && (pGC->fillStyle == FillSolid)) {
+
+        if (pGC->lineStyle == LineSolid) {
+
+            if (infoRec->PolyRectangleThinSolid &&
+                CHECK_PLANEMASK(pGC, infoRec->PolyRectangleThinSolidFlags) &&
+                CHECK_ROP(pGC, infoRec->PolyRectangleThinSolidFlags) &&
+                CHECK_ROPSRC(pGC, infoRec->PolyRectangleThinSolidFlags) &&
+                CHECK_FG(pGC, infoRec->PolyRectangleThinSolidFlags)) {
+
+                pGC->ops->PolyRectangle = infoRec->PolyRectangleThinSolid;
+            }
+
+            if (infoRec->PolySegmentThinSolid &&
+                CHECK_PLANEMASK(pGC, infoRec->PolySegmentThinSolidFlags) &&
+                CHECK_ROP(pGC, infoRec->PolySegmentThinSolidFlags) &&
+                CHECK_ROPSRC(pGC, infoRec->PolySegmentThinSolidFlags) &&
+                CHECK_FG(pGC, infoRec->PolySegmentThinSolidFlags)) {
+
+                pGC->ops->PolySegment = infoRec->PolySegmentThinSolid;
+            }
+
+            if (infoRec->PolylinesThinSolid &&
+                CHECK_PLANEMASK(pGC, infoRec->PolylinesThinSolidFlags) &&
+                CHECK_ROP(pGC, infoRec->PolylinesThinSolidFlags) &&
+                CHECK_ROPSRC(pGC, infoRec->PolylinesThinSolidFlags) &&
+                CHECK_FG(pGC, infoRec->PolylinesThinSolidFlags)) {
+
+                pGC->ops->Polylines = infoRec->PolylinesThinSolid;
+            }
+        }
+        else if ((pGC->lineStyle == LineOnOffDash) && pGCPriv->DashPattern) {
+
+            if (infoRec->PolySegmentThinDashed &&
+                !(infoRec->PolySegmentThinDashedFlags & NO_TRANSPARENCY) &&
+                ((pGC->alu == GXcopy) || !(infoRec->PolySegmentThinDashedFlags &
+                                           TRANSPARENCY_GXCOPY_ONLY)) &&
+                CHECK_PLANEMASK(pGC, infoRec->PolySegmentThinDashedFlags) &&
+                CHECK_ROP(pGC, infoRec->PolySegmentThinDashedFlags) &&
+                CHECK_ROPSRC(pGC, infoRec->PolySegmentThinDashedFlags) &&
+                CHECK_FG(pGC, infoRec->PolySegmentThinDashedFlags)) {
+
+                pGC->ops->PolySegment = infoRec->PolySegmentThinDashed;
+            }
+
+            if (infoRec->PolylinesThinDashed &&
+                !(infoRec->PolylinesThinDashedFlags & NO_TRANSPARENCY) &&
+                ((pGC->alu == GXcopy) || !(infoRec->PolylinesThinDashedFlags &
+                                           TRANSPARENCY_GXCOPY_ONLY)) &&
+                CHECK_PLANEMASK(pGC, infoRec->PolylinesThinDashedFlags) &&
+                CHECK_ROP(pGC, infoRec->PolylinesThinDashedFlags) &&
+                CHECK_ROPSRC(pGC, infoRec->PolylinesThinDashedFlags) &&
+                CHECK_FG(pGC, infoRec->PolylinesThinDashedFlags)) {
+
+                pGC->ops->Polylines = infoRec->PolylinesThinDashed;
+            }
+
+            if (pGC->ops->Polylines != XAAFallbackOps.Polylines)
+                pGC->ops->PolyRectangle = miPolyRectangle;
+
+        }
+        else if (pGCPriv->DashPattern && (pGC->depth != 32)) {
+            /* LineDoubleDash */
+            if (infoRec->PolySegmentThinDashed &&
+                !(infoRec->PolySegmentThinDashedFlags & TRANSPARENCY_ONLY) &&
+                CHECK_PLANEMASK(pGC, infoRec->PolySegmentThinDashedFlags) &&
+                CHECK_ROP(pGC, infoRec->PolySegmentThinDashedFlags) &&
+                CHECK_ROPSRC(pGC, infoRec->PolySegmentThinDashedFlags) &&
+                CHECK_COLORS(pGC, infoRec->PolySegmentThinDashedFlags)) {
+
+                pGC->ops->PolySegment = infoRec->PolySegmentThinDashed;
+            }
+
+            if (infoRec->PolylinesThinDashed &&
+                !(infoRec->PolylinesThinDashedFlags & TRANSPARENCY_ONLY) &&
+                CHECK_PLANEMASK(pGC, infoRec->PolylinesThinDashedFlags) &&
+                CHECK_ROP(pGC, infoRec->PolylinesThinDashedFlags) &&
+                CHECK_ROPSRC(pGC, infoRec->PolylinesThinDashedFlags) &&
+                CHECK_COLORS(pGC, infoRec->PolylinesThinDashedFlags)) {
+
+                pGC->ops->Polylines = infoRec->PolylinesThinDashed;
+            }
+
+            if (pGC->ops->Polylines != XAAFallbackOps.Polylines)
+                pGC->ops->PolyRectangle = miPolyRectangle;
+
+        }
+    }
+
+    if (infoRec->PolylinesWideSolid &&
+        (pGC->lineWidth > 0) &&
+        (pGC->fillStyle == FillSolid) &&
+        (pGC->lineStyle == LineSolid) &&
+        CHECK_PLANEMASK(pGC, infoRec->PolylinesWideSolidFlags) &&
+        CHECK_ROP(pGC, infoRec->PolylinesWideSolidFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->PolylinesWideSolidFlags) &&
+        CHECK_FG(pGC, infoRec->PolylinesWideSolidFlags)) {
+
+        pGC->ops->Polylines = infoRec->PolylinesWideSolid;
+    }
 }
diff --git a/xorg-server/hw/xfree86/xaa/xaaImage.c b/xorg-server/hw/xfree86/xaa/xaaImage.c
index 1967c5e0e..4457c9efa 100644
--- a/xorg-server/hw/xfree86/xaa/xaaImage.c
+++ b/xorg-server/hw/xfree86/xaa/xaaImage.c
@@ -1,521 +1,534 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-#include "servermd.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "mi.h"

-#include "pixmapstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-

-void XAAMoveDWORDS_FixedBase(

-   register CARD32* dest,

-   register CARD32* src,

-   register int dwords )

-{

-     while(dwords & ~0x03) {

-	 *dest = *src;

-	 *dest = *(src + 1);

-	 *dest = *(src + 2);

-	 *dest = *(src + 3);	

-	 dwords -= 4;

-	 src += 4;

-     }

-

-     if(!dwords) return;

-     *dest = *src;

-     if(dwords == 1) return;

-     *dest = *(src + 1);

-     if(dwords == 2) return;

-     *dest = *(src + 2);

-}

-

-void XAAMoveDWORDS(

-   register CARD32* dest,

-   register CARD32* src,

-   register int dwords )

-{

-     while(dwords & ~0x03) {

-	*dest = *src;

-	*(dest + 1) = *(src + 1);

-	*(dest + 2) = *(src + 2);

-	*(dest + 3) = *(src + 3);

-	src += 4;

-	dest += 4;

-	dwords -= 4;

-     }	

-     if(!dwords) return;

-     *dest = *src;

-     if(dwords == 1) return;

-     *(dest + 1) = *(src + 1);

-     if(dwords == 2) return;

-     *(dest + 2) = *(src + 2);

-}

-

-void XAAMoveDWORDS_FixedSrc(

-   register CARD32* dest,

-   register CARD32* src,

-   register int dwords )

-{

-     while(dwords & ~0x03) {

-	*dest = *src;

-	*(dest + 1) = *src;

-	*(dest + 2) = *src;

-	*(dest + 3) = *src;

-	dest += 4;

-	dwords -= 4;

-     }	

-     if(!dwords) return;

-     *dest = *src;

-     if(dwords == 1) return;

-     *(dest + 1) = *src;

-     if(dwords == 2) return;

-     *(dest + 2) = *src;

-}

-

-static void

-XAAWritePixmap32To24(

-   ScrnInfoPtr pScrn,

-   int x, int y, int w, int h,

-   unsigned char *srcInit,	

-   int srcwidth,	/* bytes */

-   int rop,

-   unsigned int planemask,

-   int trans

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int count, dwords = bytes_to_int32(w * 3);

-    CARD32 *src, *dst;

-    Bool PlusOne = FALSE;

-

-    if((infoRec->ImageWriteFlags & CPU_TRANSFER_PAD_QWORD) && 

-					((dwords * h) & 0x01)) {

-	PlusOne = TRUE;

-    }

-

-    (*infoRec->SetupForImageWrite)(pScrn, rop, planemask, trans, 24, 24);

-    (*infoRec->SubsequentImageWriteRect)(pScrn, x, y, w, h, 0);

-  

-    if(dwords > infoRec->ImageWriteRange) {

-	dst = (CARD32*)infoRec->ImageWriteBase;

-	while(h--) {

-	    src = (CARD32*)srcInit;

-  	    count = w;

-

-	    while(count >= 4) {

-		*dst = (src[0] & 0x00ffffff) | (src[1] << 24);

-		*dst = ((src[1] >> 8) & 0x0000ffff) | (src[2] << 16);

-		*dst = ((src[2] >> 16) & 0x000000ff) | (src[3] << 8);

-		src += 4;

-		count -= 4;

-	    }

-	    switch(count) {

-	    case 0:	break;

-	    case 1:	*dst = src[0];

-			break;

-	    case 2:	*dst = (src[0] & 0x00ffffff) | (src[1] << 24);

-			*dst = src[1] >> 8;

-			break;

-	    default:	*dst = (src[0] & 0x00ffffff) | (src[1] << 24);

-			*dst = ((src[1] >> 8) & 0x0000ffff) | (src[2] << 16);

-			*dst = src[2] >> 16;

-			break;

-	    }

-	    srcInit += srcwidth;

-	}

-    } else {

-	while(h--) {

-	    dst = (CARD32*)infoRec->ImageWriteBase;

-	    src = (CARD32*)srcInit;

-  	    count = w;

-

-	    while(count >= 4) {

-		dst[0] = (src[0] & 0x00ffffff) | (src[1] << 24);

-		dst[1] = ((src[1] >> 8) & 0x0000ffff) | (src[2] << 16);

-		dst[2] = ((src[2] >> 16) & 0x000000ff) | (src[3] << 8);

-		dst += 3;

-		src += 4;

-		count -= 4;

-	    }

-	    switch(count) {

-	    case 0:	break;

-	    case 1:	dst[0] = src[0];

-			break;

-	    case 2:	dst[0] = (src[0] & 0x00ffffff) | (src[1] << 24);

-			dst[1] = src[1] >> 8;

-			break;

-	    default:	dst[0] = (src[0] & 0x00ffffff) | (src[1] << 24);

-			dst[1] = ((src[1] >> 8) & 0x0000ffff) | (src[2] << 16);

-			dst[2] = src[2] >> 16;

-			break;

-	    }

-	    srcInit += srcwidth;

-	}

-    }

-

-    if(PlusOne) {

-	CARD32* base = (CARD32*)infoRec->ImageWriteBase;

-	*base = 0x00000000;

-    }

-

-    if(infoRec->ImageWriteFlags & SYNC_AFTER_IMAGE_WRITE)

-	(*infoRec->Sync)(pScrn);

-    else SET_SYNC_FLAG(infoRec);

-

-}

-

-void

-XAAWritePixmap (

-   ScrnInfoPtr pScrn,

-   int x, int y, int w, int h,

-   unsigned char *src,	

-   int srcwidth,	/* bytes */

-   int rop,

-   unsigned int planemask,

-   int trans,

-   int bpp, int depth

-){

-    XAAInfoRecPtr infoRec;

-    int dwords, skipleft, Bpp; 

-    Bool beCareful, PlusOne;

-

-    if((bpp == 32) && (pScrn->bitsPerPixel == 24)) {

-	XAAWritePixmap32To24(pScrn, x, y, w, h, src, srcwidth, 

-						rop, planemask, trans);	

-	return;

-    }

-

-    infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    beCareful = PlusOne = FALSE;

-    Bpp = bpp >> 3;

-

-    if((skipleft = (long)src & 0x03L)) {

-	if(!(infoRec->ImageWriteFlags & LEFT_EDGE_CLIPPING)) {

-	   skipleft = 0;

-	   beCareful = TRUE;

-	   goto BAD_ALIGNMENT;

-	}

-

-	if(Bpp == 3)

-	   skipleft = 4 - skipleft;

-	else

-	   skipleft /= Bpp;

-

-	if((x < skipleft) && !(infoRec->ImageWriteFlags &

-				 LEFT_EDGE_CLIPPING_NEGATIVE_X)) {

-	   skipleft = 0;

-	   beCareful = TRUE;

-	   goto BAD_ALIGNMENT;

-	}

-

-	x -= skipleft;	     

-	w += skipleft;

-	

-	if(Bpp == 3)

-	   src -= 3 * skipleft;  

-	else   /* is this Alpha friendly ? */

-	   src = (unsigned char*)((long)src & ~0x03L);     

-    }

-

-BAD_ALIGNMENT:

-

-    dwords = bytes_to_int32(w * Bpp);

-

-    if((infoRec->ImageWriteFlags & CPU_TRANSFER_PAD_QWORD) && 

-						((dwords * h) & 0x01)) {

-	PlusOne = TRUE;

-    } 

-		

-	

-    (*infoRec->SetupForImageWrite)(pScrn, rop, planemask, trans, bpp, depth);

-    (*infoRec->SubsequentImageWriteRect)(pScrn, x, y, w, h, skipleft);

-

-    if(beCareful) {

-	/* in cases with bad alignment we have to be careful not

-	   to read beyond the end of the source */

-	if(((x * Bpp) + (dwords << 2)) > srcwidth) h--;

-	else beCareful = FALSE;

-    }

-

-    if(dwords > infoRec->ImageWriteRange) {

-	while(h--) {

-	    XAAMoveDWORDS_FixedBase((CARD32*)infoRec->ImageWriteBase,

-		(CARD32*)src, dwords);

-	    src += srcwidth;

-	}

-	if(beCareful) {

-	   int shift = ((long)src & 0x03L) << 3;

-	   if(--dwords)

-		XAAMoveDWORDS_FixedBase((CARD32*)infoRec->ImageWriteBase,

-			(CARD32*)src, dwords);

-	   src = (unsigned char*)((long)(src + (dwords << 2)) & ~0x03L);

-	   *((CARD32*)infoRec->ImageWriteBase) = *((CARD32*)src) >> shift;

-	}

-    } else {

-	if(srcwidth == (dwords << 2)) {

-	   int decrement = infoRec->ImageWriteRange/dwords;

-

-	   while(h > decrement) {

-		XAAMoveDWORDS((CARD32*)infoRec->ImageWriteBase,

-	 		(CARD32*)src, dwords * decrement);

-		src += (srcwidth * decrement);

-		h -= decrement;

-	   }

-	   if(h) {

-		XAAMoveDWORDS((CARD32*)infoRec->ImageWriteBase,

-	 		(CARD32*)src, dwords * h);

-		if(beCareful) src += (srcwidth * h);

-	   }

-	} else {

-	    while(h--) {

-		XAAMoveDWORDS((CARD32*)infoRec->ImageWriteBase,

-	 		(CARD32*)src, dwords);

-		src += srcwidth;

-	    }

-	}

-

-	if(beCareful) {

-	    int shift = ((long)src & 0x03L) << 3;

-	    if(--dwords)

-		XAAMoveDWORDS((CARD32*)infoRec->ImageWriteBase,

-					(CARD32*)src, dwords);

-	    src = (unsigned char*)((long)(src + (dwords << 2)) & ~0x03L);

-     

-	    ((CARD32*)infoRec->ImageWriteBase)[dwords] = 

-			*((CARD32*)src) >> shift;

-	}

-    }

-

-    if(PlusOne) {

-	CARD32* base = (CARD32*)infoRec->ImageWriteBase;

-	*base = 0x00000000;

-    }

-

-    if(infoRec->ImageWriteFlags & SYNC_AFTER_IMAGE_WRITE)

-	(*infoRec->Sync)(pScrn);

-    else SET_SYNC_FLAG(infoRec);

-}

-

-

-void

-XAAWritePixmapScanline (

-   ScrnInfoPtr pScrn,

-   int x, int y, int w, int h,

-   unsigned char *src,	

-   int srcwidth,	/* bytes */

-   int rop,

-   unsigned int planemask,

-   int trans,

-   int bpp, int depth

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int dwords, skipleft, bufferNo = 0, Bpp = bpp >> 3; 

-    Bool beCareful = FALSE;

-    CARD32* base;

-

-    if((skipleft = (long)src & 0x03L)) {

-	if(!(infoRec->ScanlineImageWriteFlags & LEFT_EDGE_CLIPPING)) {

-	   skipleft = 0;

-	   beCareful = TRUE;

-	   goto BAD_ALIGNMENT;

-	}

-

-	if(Bpp == 3)

-	   skipleft = 4 - skipleft;

-	else

-	   skipleft /= Bpp;

-

-	if((x < skipleft) && !(infoRec->ScanlineImageWriteFlags &

-				 LEFT_EDGE_CLIPPING_NEGATIVE_X)) {

-	   skipleft = 0;

-	   beCareful = TRUE;

-	   goto BAD_ALIGNMENT;

-	}

-

-	x -= skipleft;	     

-	w += skipleft;

-	

-	if(Bpp == 3)

-	   src -= 3 * skipleft;  

-	else

-	   src = (unsigned char*)((long)src & ~0x03L);     

-    }

-

-BAD_ALIGNMENT:

-

-    dwords = bytes_to_int32(w * Bpp);

-

-    (*infoRec->SetupForScanlineImageWrite)(

-				pScrn, rop, planemask, trans, bpp, depth);

-    (*infoRec->SubsequentScanlineImageWriteRect)(pScrn, x, y, w, h, skipleft);

-

-    if(beCareful) {

-	/* in cases with bad alignment we have to be careful not

-	   to read beyond the end of the source */

-	if(((x * Bpp) + (dwords << 2)) > srcwidth) h--;

-	else beCareful = FALSE;

-    }

-

-    while(h--) {

-	base = (CARD32*)infoRec->ScanlineImageWriteBuffers[bufferNo];

-	XAAMoveDWORDS(base, (CARD32*)src, dwords);

-	(*infoRec->SubsequentImageWriteScanline)(pScrn, bufferNo++);

-	src += srcwidth;

-	if(bufferNo >= infoRec->NumScanlineImageWriteBuffers)

-	    bufferNo = 0;

-    }

-

-    if(beCareful) {

-	int shift = ((long)src & 0x03L) << 3;

-	base = (CARD32*)infoRec->ScanlineImageWriteBuffers[bufferNo];

-	if(--dwords)

-	    XAAMoveDWORDS(base,(CARD32*)src, dwords);

-	src = (unsigned char*)((long)(src + (dwords << 2)) & ~0x03L);

-     

-	base[dwords] = *((CARD32*)src) >> shift;

-	(*infoRec->SubsequentImageWriteScanline)(pScrn, bufferNo);

-    }

-

-    SET_SYNC_FLAG(infoRec);

-}

-

-

-void

-XAAPutImage(

-    DrawablePtr pDraw,

-    GCPtr       pGC,

-    int         depth, 

-    int 	x, 

-    int		y, 

-    int		w, 

-    int		h,

-    int         leftPad,

-    int         format,

-    char        *pImage

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    int bpp = BitsPerPixel(depth);

-    Bool depthBug = FALSE;

-    if(!w || !h) return;

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    depthBug = XAA_DEPTH_BUG(pGC);

-

-    if(((format == ZPixmap) && infoRec->WritePixmap &&

-	     ((pDraw->bitsPerPixel == bpp) ||

-		((pDraw->bitsPerPixel == 24) &&  (bpp == 32) &&

-		(infoRec->WritePixmapFlags & CONVERT_32BPP_TO_24BPP))) &&

-	     CHECK_ROP(pGC,infoRec->WritePixmapFlags) &&

-	     CHECK_ROPSRC(pGC,infoRec->WritePixmapFlags) &&

-	     CHECK_PLANEMASK(pGC,infoRec->WritePixmapFlags) &&

-	     CHECK_NO_GXCOPY(pGC,infoRec->WritePixmapFlags)) ||

-       ((format == XYBitmap) && !depthBug && infoRec->WriteBitmap &&

-	     CHECK_ROP(pGC,infoRec->WriteBitmapFlags) &&

-	     CHECK_ROPSRC(pGC,infoRec->WriteBitmapFlags) &&

-	     CHECK_PLANEMASK(pGC,infoRec->WriteBitmapFlags) &&

-	     CHECK_COLORS(pGC,infoRec->WriteBitmapFlags) &&

-	     !(infoRec->WriteBitmapFlags & TRANSPARENCY_ONLY)) ||

-       ((format == XYPixmap) && !depthBug && infoRec->WriteBitmap &&

-	     CHECK_ROP(pGC,infoRec->WriteBitmapFlags) &&

-	     CHECK_ROPSRC(pGC,infoRec->WriteBitmapFlags) &&

-	     !(infoRec->WriteBitmapFlags & NO_PLANEMASK) &&

-	     !(infoRec->WriteBitmapFlags & TRANSPARENCY_ONLY))){

-

-	int MaxBoxes = RegionNumRects(pGC->pCompositeClip);

-	BoxPtr pbox, pClipBoxes;

-	int nboxes, srcx, srcy, srcwidth;

-	xRectangle TheRect;

-

-	TheRect.x = pDraw->x + x;

-	TheRect.y = pDraw->y + y;

-	TheRect.width = w;

-	TheRect.height = h; 

-

-	if(MaxBoxes > (infoRec->PreAllocSize/sizeof(BoxRec))) {

-	    pClipBoxes = malloc(MaxBoxes * sizeof(BoxRec));

-	    if(!pClipBoxes) return;	

-	} else pClipBoxes = (BoxPtr)infoRec->PreAllocMem;

-

-	nboxes = XAAGetRectClipBoxes(pGC, pClipBoxes, 1, &TheRect);

-	pbox = pClipBoxes;

-

-	if(format == XYBitmap) {

-	    srcwidth = BitmapBytePad(leftPad + w);

-	    while(nboxes--) {

-		srcx = pbox->x1 - TheRect.x + leftPad;

-		srcy = pbox->y1 - TheRect.y;

-		(*infoRec->WriteBitmap)(infoRec->pScrn, pbox->x1, pbox->y1, 

-			pbox->x2 - pbox->x1, pbox->y2 - pbox->y1, 

-			(unsigned char*)pImage + 

-				(srcwidth * srcy) + ((srcx >> 5) << 2), 

-			srcwidth, srcx & 31, pGC->fgPixel, pGC->bgPixel,

-	 		pGC->alu, pGC->planemask);

-		pbox++;

-	    }

-        } else if(format == ZPixmap) {

-	    int Bpp = bpp >> 3;

-	    srcwidth = PixmapBytePad(leftPad + w, depth);

-	    while(nboxes--) {

-		srcx = pbox->x1 - TheRect.x + leftPad;

-		srcy = pbox->y1 - TheRect.y;

-		(*infoRec->WritePixmap)(infoRec->pScrn, pbox->x1, pbox->y1, 

-			pbox->x2 - pbox->x1, pbox->y2 - pbox->y1, 

-			(unsigned char*)pImage + 

-				(srcwidth * srcy) + (srcx * Bpp), 

-			srcwidth, pGC->alu, pGC->planemask, -1, 

-			Bpp << 3, depth);

-		pbox++;

-	    }

-	} else { /* XYPixmap */

-	    int depth = pGC->depth;

-	    int numBox, increment;

-	    unsigned long i, mask;

-	    BoxPtr pntBox;

-	    

-	    srcwidth = BitmapBytePad(w + leftPad);

-	    increment = h * srcwidth;

- 	    i = 1 << (depth - 1);

-	    mask = ~0;

-

-	    if((infoRec->pScrn->overlayFlags & OVERLAY_8_32_PLANAR) &&

-							 (pGC->depth == 8)){

-		i = 0x80000000;  mask = 0xff000000;

-	    }

-

-	    for(; i & mask; i >>= 1, pImage += increment) {

-		if(i & pGC->planemask) {

-		    pntBox = pbox;

-		    numBox = nboxes;

-		    while(numBox--) {

-			srcx = pntBox->x1 - TheRect.x + leftPad;

-			srcy = pntBox->y1 - TheRect.y;

-			(*infoRec->WriteBitmap)(infoRec->pScrn, 

-				pntBox->x1, pntBox->y1, 

-				pntBox->x2 - pntBox->x1, 

-				pntBox->y2 - pntBox->y1, 

-				(unsigned char*)pImage + 

-				(srcwidth * srcy) + ((srcx >> 5) << 2), 

-				srcwidth, srcx & 31, ~0, 0, pGC->alu, i);

-			pntBox++;

-	    	    }

-		}

-	    }

-

-	}

-

-	if(pClipBoxes != (BoxPtr)infoRec->PreAllocMem)

-	    free(pClipBoxes);

-    } else 

-	XAAFallbackOps.PutImage(pDraw, pGC, depth, x, y, w, h, leftPad, 

-				format, pImage);

-}

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "servermd.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "mi.h"
+#include "pixmapstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+
+void
+XAAMoveDWORDS_FixedBase(register CARD32 *dest,
+                        register CARD32 *src, register int dwords)
+{
+    while (dwords & ~0x03) {
+        *dest = *src;
+        *dest = *(src + 1);
+        *dest = *(src + 2);
+        *dest = *(src + 3);
+        dwords -= 4;
+        src += 4;
+    }
+
+    if (!dwords)
+        return;
+    *dest = *src;
+    if (dwords == 1)
+        return;
+    *dest = *(src + 1);
+    if (dwords == 2)
+        return;
+    *dest = *(src + 2);
+}
+
+void
+XAAMoveDWORDS(register CARD32 *dest, register CARD32 *src, register int dwords)
+{
+    while (dwords & ~0x03) {
+        *dest = *src;
+        *(dest + 1) = *(src + 1);
+        *(dest + 2) = *(src + 2);
+        *(dest + 3) = *(src + 3);
+        src += 4;
+        dest += 4;
+        dwords -= 4;
+    }
+    if (!dwords)
+        return;
+    *dest = *src;
+    if (dwords == 1)
+        return;
+    *(dest + 1) = *(src + 1);
+    if (dwords == 2)
+        return;
+    *(dest + 2) = *(src + 2);
+}
+
+void
+XAAMoveDWORDS_FixedSrc(register CARD32 *dest,
+                       register CARD32 *src, register int dwords)
+{
+    while (dwords & ~0x03) {
+        *dest = *src;
+        *(dest + 1) = *src;
+        *(dest + 2) = *src;
+        *(dest + 3) = *src;
+        dest += 4;
+        dwords -= 4;
+    }
+    if (!dwords)
+        return;
+    *dest = *src;
+    if (dwords == 1)
+        return;
+    *(dest + 1) = *src;
+    if (dwords == 2)
+        return;
+    *(dest + 2) = *src;
+}
+
+static void
+XAAWritePixmap32To24(ScrnInfoPtr pScrn, int x, int y, int w, int h, unsigned char *srcInit, int srcwidth,       /* bytes */
+                     int rop, unsigned int planemask, int trans)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int count, dwords = bytes_to_int32(w * 3);
+    CARD32 *src, *dst;
+    Bool PlusOne = FALSE;
+
+    if ((infoRec->ImageWriteFlags & CPU_TRANSFER_PAD_QWORD) &&
+        ((dwords * h) & 0x01)) {
+        PlusOne = TRUE;
+    }
+
+    (*infoRec->SetupForImageWrite) (pScrn, rop, planemask, trans, 24, 24);
+    (*infoRec->SubsequentImageWriteRect) (pScrn, x, y, w, h, 0);
+
+    if (dwords > infoRec->ImageWriteRange) {
+        dst = (CARD32 *) infoRec->ImageWriteBase;
+        while (h--) {
+            src = (CARD32 *) srcInit;
+            count = w;
+
+            while (count >= 4) {
+                *dst = (src[0] & 0x00ffffff) | (src[1] << 24);
+                *dst = ((src[1] >> 8) & 0x0000ffff) | (src[2] << 16);
+                *dst = ((src[2] >> 16) & 0x000000ff) | (src[3] << 8);
+                src += 4;
+                count -= 4;
+            }
+            switch (count) {
+            case 0:
+                break;
+            case 1:
+                *dst = src[0];
+                break;
+            case 2:
+                *dst = (src[0] & 0x00ffffff) | (src[1] << 24);
+                *dst = src[1] >> 8;
+                break;
+            default:
+                *dst = (src[0] & 0x00ffffff) | (src[1] << 24);
+                *dst = ((src[1] >> 8) & 0x0000ffff) | (src[2] << 16);
+                *dst = src[2] >> 16;
+                break;
+            }
+            srcInit += srcwidth;
+        }
+    }
+    else {
+        while (h--) {
+            dst = (CARD32 *) infoRec->ImageWriteBase;
+            src = (CARD32 *) srcInit;
+            count = w;
+
+            while (count >= 4) {
+                dst[0] = (src[0] & 0x00ffffff) | (src[1] << 24);
+                dst[1] = ((src[1] >> 8) & 0x0000ffff) | (src[2] << 16);
+                dst[2] = ((src[2] >> 16) & 0x000000ff) | (src[3] << 8);
+                dst += 3;
+                src += 4;
+                count -= 4;
+            }
+            switch (count) {
+            case 0:
+                break;
+            case 1:
+                dst[0] = src[0];
+                break;
+            case 2:
+                dst[0] = (src[0] & 0x00ffffff) | (src[1] << 24);
+                dst[1] = src[1] >> 8;
+                break;
+            default:
+                dst[0] = (src[0] & 0x00ffffff) | (src[1] << 24);
+                dst[1] = ((src[1] >> 8) & 0x0000ffff) | (src[2] << 16);
+                dst[2] = src[2] >> 16;
+                break;
+            }
+            srcInit += srcwidth;
+        }
+    }
+
+    if (PlusOne) {
+        CARD32 *base = (CARD32 *) infoRec->ImageWriteBase;
+
+        *base = 0x00000000;
+    }
+
+    if (infoRec->ImageWriteFlags & SYNC_AFTER_IMAGE_WRITE)
+        (*infoRec->Sync) (pScrn);
+    else
+        SET_SYNC_FLAG(infoRec);
+
+}
+
+void
+XAAWritePixmap(ScrnInfoPtr pScrn, int x, int y, int w, int h, unsigned char *src, int srcwidth, /* bytes */
+               int rop, unsigned int planemask, int trans, int bpp, int depth)
+{
+    XAAInfoRecPtr infoRec;
+    int dwords, skipleft, Bpp;
+    Bool beCareful, PlusOne;
+
+    if ((bpp == 32) && (pScrn->bitsPerPixel == 24)) {
+        XAAWritePixmap32To24(pScrn, x, y, w, h, src, srcwidth,
+                             rop, planemask, trans);
+        return;
+    }
+
+    infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    beCareful = PlusOne = FALSE;
+    Bpp = bpp >> 3;
+
+    if ((skipleft = (long) src & 0x03L)) {
+        if (!(infoRec->ImageWriteFlags & LEFT_EDGE_CLIPPING)) {
+            skipleft = 0;
+            beCareful = TRUE;
+            goto BAD_ALIGNMENT;
+        }
+
+        if (Bpp == 3)
+            skipleft = 4 - skipleft;
+        else
+            skipleft /= Bpp;
+
+        if ((x < skipleft) && !(infoRec->ImageWriteFlags &
+                                LEFT_EDGE_CLIPPING_NEGATIVE_X)) {
+            skipleft = 0;
+            beCareful = TRUE;
+            goto BAD_ALIGNMENT;
+        }
+
+        x -= skipleft;
+        w += skipleft;
+
+        if (Bpp == 3)
+            src -= 3 * skipleft;
+        else                    /* is this Alpha friendly ? */
+            src = (unsigned char *) ((long) src & ~0x03L);
+    }
+
+ BAD_ALIGNMENT:
+
+    dwords = bytes_to_int32(w * Bpp);
+
+    if ((infoRec->ImageWriteFlags & CPU_TRANSFER_PAD_QWORD) &&
+        ((dwords * h) & 0x01)) {
+        PlusOne = TRUE;
+    }
+
+    (*infoRec->SetupForImageWrite) (pScrn, rop, planemask, trans, bpp, depth);
+    (*infoRec->SubsequentImageWriteRect) (pScrn, x, y, w, h, skipleft);
+
+    if (beCareful) {
+        /* in cases with bad alignment we have to be careful not
+           to read beyond the end of the source */
+        if (((x * Bpp) + (dwords << 2)) > srcwidth)
+            h--;
+        else
+            beCareful = FALSE;
+    }
+
+    if (dwords > infoRec->ImageWriteRange) {
+        while (h--) {
+            XAAMoveDWORDS_FixedBase((CARD32 *) infoRec->ImageWriteBase,
+                                    (CARD32 *) src, dwords);
+            src += srcwidth;
+        }
+        if (beCareful) {
+            int shift = ((long) src & 0x03L) << 3;
+
+            if (--dwords)
+                XAAMoveDWORDS_FixedBase((CARD32 *) infoRec->ImageWriteBase,
+                                        (CARD32 *) src, dwords);
+            src = (unsigned char *) ((long) (src + (dwords << 2)) & ~0x03L);
+            *((CARD32 *) infoRec->ImageWriteBase) = *((CARD32 *) src) >> shift;
+        }
+    }
+    else {
+        if (srcwidth == (dwords << 2)) {
+            int decrement = infoRec->ImageWriteRange / dwords;
+
+            while (h > decrement) {
+                XAAMoveDWORDS((CARD32 *) infoRec->ImageWriteBase,
+                              (CARD32 *) src, dwords * decrement);
+                src += (srcwidth * decrement);
+                h -= decrement;
+            }
+            if (h) {
+                XAAMoveDWORDS((CARD32 *) infoRec->ImageWriteBase,
+                              (CARD32 *) src, dwords * h);
+                if (beCareful)
+                    src += (srcwidth * h);
+            }
+        }
+        else {
+            while (h--) {
+                XAAMoveDWORDS((CARD32 *) infoRec->ImageWriteBase,
+                              (CARD32 *) src, dwords);
+                src += srcwidth;
+            }
+        }
+
+        if (beCareful) {
+            int shift = ((long) src & 0x03L) << 3;
+
+            if (--dwords)
+                XAAMoveDWORDS((CARD32 *) infoRec->ImageWriteBase,
+                              (CARD32 *) src, dwords);
+            src = (unsigned char *) ((long) (src + (dwords << 2)) & ~0x03L);
+
+            ((CARD32 *) infoRec->ImageWriteBase)[dwords] =
+                *((CARD32 *) src) >> shift;
+        }
+    }
+
+    if (PlusOne) {
+        CARD32 *base = (CARD32 *) infoRec->ImageWriteBase;
+
+        *base = 0x00000000;
+    }
+
+    if (infoRec->ImageWriteFlags & SYNC_AFTER_IMAGE_WRITE)
+        (*infoRec->Sync) (pScrn);
+    else
+        SET_SYNC_FLAG(infoRec);
+}
+
+void
+XAAWritePixmapScanline(ScrnInfoPtr pScrn, int x, int y, int w, int h, unsigned char *src, int srcwidth, /* bytes */
+                       int rop,
+                       unsigned int planemask, int trans, int bpp, int depth)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int dwords, skipleft, bufferNo = 0, Bpp = bpp >> 3;
+    Bool beCareful = FALSE;
+    CARD32 *base;
+
+    if ((skipleft = (long) src & 0x03L)) {
+        if (!(infoRec->ScanlineImageWriteFlags & LEFT_EDGE_CLIPPING)) {
+            skipleft = 0;
+            beCareful = TRUE;
+            goto BAD_ALIGNMENT;
+        }
+
+        if (Bpp == 3)
+            skipleft = 4 - skipleft;
+        else
+            skipleft /= Bpp;
+
+        if ((x < skipleft) && !(infoRec->ScanlineImageWriteFlags &
+                                LEFT_EDGE_CLIPPING_NEGATIVE_X)) {
+            skipleft = 0;
+            beCareful = TRUE;
+            goto BAD_ALIGNMENT;
+        }
+
+        x -= skipleft;
+        w += skipleft;
+
+        if (Bpp == 3)
+            src -= 3 * skipleft;
+        else
+            src = (unsigned char *) ((long) src & ~0x03L);
+    }
+
+ BAD_ALIGNMENT:
+
+    dwords = bytes_to_int32(w * Bpp);
+
+    (*infoRec->SetupForScanlineImageWrite) (pScrn, rop, planemask, trans, bpp,
+                                            depth);
+    (*infoRec->SubsequentScanlineImageWriteRect) (pScrn, x, y, w, h, skipleft);
+
+    if (beCareful) {
+        /* in cases with bad alignment we have to be careful not
+           to read beyond the end of the source */
+        if (((x * Bpp) + (dwords << 2)) > srcwidth)
+            h--;
+        else
+            beCareful = FALSE;
+    }
+
+    while (h--) {
+        base = (CARD32 *) infoRec->ScanlineImageWriteBuffers[bufferNo];
+        XAAMoveDWORDS(base, (CARD32 *) src, dwords);
+        (*infoRec->SubsequentImageWriteScanline) (pScrn, bufferNo++);
+        src += srcwidth;
+        if (bufferNo >= infoRec->NumScanlineImageWriteBuffers)
+            bufferNo = 0;
+    }
+
+    if (beCareful) {
+        int shift = ((long) src & 0x03L) << 3;
+
+        base = (CARD32 *) infoRec->ScanlineImageWriteBuffers[bufferNo];
+        if (--dwords)
+            XAAMoveDWORDS(base, (CARD32 *) src, dwords);
+        src = (unsigned char *) ((long) (src + (dwords << 2)) & ~0x03L);
+
+        base[dwords] = *((CARD32 *) src) >> shift;
+        (*infoRec->SubsequentImageWriteScanline) (pScrn, bufferNo);
+    }
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+void
+XAAPutImage(DrawablePtr pDraw,
+            GCPtr pGC,
+            int depth,
+            int x, int y, int w, int h, int leftPad, int format, char *pImage)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int bpp = BitsPerPixel(depth);
+    Bool depthBug = FALSE;
+
+    if (!w || !h)
+        return;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    depthBug = XAA_DEPTH_BUG(pGC);
+
+    if (((format == ZPixmap) && infoRec->WritePixmap &&
+         ((pDraw->bitsPerPixel == bpp) ||
+          ((pDraw->bitsPerPixel == 24) && (bpp == 32) &&
+           (infoRec->WritePixmapFlags & CONVERT_32BPP_TO_24BPP))) &&
+         CHECK_ROP(pGC, infoRec->WritePixmapFlags) &&
+         CHECK_ROPSRC(pGC, infoRec->WritePixmapFlags) &&
+         CHECK_PLANEMASK(pGC, infoRec->WritePixmapFlags) &&
+         CHECK_NO_GXCOPY(pGC, infoRec->WritePixmapFlags)) ||
+        ((format == XYBitmap) && !depthBug && infoRec->WriteBitmap &&
+         CHECK_ROP(pGC, infoRec->WriteBitmapFlags) &&
+         CHECK_ROPSRC(pGC, infoRec->WriteBitmapFlags) &&
+         CHECK_PLANEMASK(pGC, infoRec->WriteBitmapFlags) &&
+         CHECK_COLORS(pGC, infoRec->WriteBitmapFlags) &&
+         !(infoRec->WriteBitmapFlags & TRANSPARENCY_ONLY)) ||
+        ((format == XYPixmap) && !depthBug && infoRec->WriteBitmap &&
+         CHECK_ROP(pGC, infoRec->WriteBitmapFlags) &&
+         CHECK_ROPSRC(pGC, infoRec->WriteBitmapFlags) &&
+         !(infoRec->WriteBitmapFlags & NO_PLANEMASK) &&
+         !(infoRec->WriteBitmapFlags & TRANSPARENCY_ONLY))) {
+
+        int MaxBoxes = RegionNumRects(pGC->pCompositeClip);
+        BoxPtr pbox, pClipBoxes;
+        int nboxes, srcx, srcy, srcwidth;
+        xRectangle TheRect;
+
+        TheRect.x = pDraw->x + x;
+        TheRect.y = pDraw->y + y;
+        TheRect.width = w;
+        TheRect.height = h;
+
+        if (MaxBoxes > (infoRec->PreAllocSize / sizeof(BoxRec))) {
+            pClipBoxes = malloc(MaxBoxes * sizeof(BoxRec));
+            if (!pClipBoxes)
+                return;
+        }
+        else
+            pClipBoxes = (BoxPtr) infoRec->PreAllocMem;
+
+        nboxes = XAAGetRectClipBoxes(pGC, pClipBoxes, 1, &TheRect);
+        pbox = pClipBoxes;
+
+        if (format == XYBitmap) {
+            srcwidth = BitmapBytePad(leftPad + w);
+            while (nboxes--) {
+                srcx = pbox->x1 - TheRect.x + leftPad;
+                srcy = pbox->y1 - TheRect.y;
+                (*infoRec->WriteBitmap) (infoRec->pScrn, pbox->x1, pbox->y1,
+                                         pbox->x2 - pbox->x1,
+                                         pbox->y2 - pbox->y1,
+                                         (unsigned char *) pImage +
+                                         (srcwidth * srcy) + ((srcx >> 5) << 2),
+                                         srcwidth, srcx & 31, pGC->fgPixel,
+                                         pGC->bgPixel, pGC->alu,
+                                         pGC->planemask);
+                pbox++;
+            }
+        }
+        else if (format == ZPixmap) {
+            int Bpp = bpp >> 3;
+
+            srcwidth = PixmapBytePad(leftPad + w, depth);
+            while (nboxes--) {
+                srcx = pbox->x1 - TheRect.x + leftPad;
+                srcy = pbox->y1 - TheRect.y;
+                (*infoRec->WritePixmap) (infoRec->pScrn, pbox->x1, pbox->y1,
+                                         pbox->x2 - pbox->x1,
+                                         pbox->y2 - pbox->y1,
+                                         (unsigned char *) pImage +
+                                         (srcwidth * srcy) + (srcx * Bpp),
+                                         srcwidth, pGC->alu, pGC->planemask, -1,
+                                         Bpp << 3, depth);
+                pbox++;
+            }
+        }
+        else {                  /* XYPixmap */
+            int depth = pGC->depth;
+            int numBox, increment;
+            unsigned long i, mask;
+            BoxPtr pntBox;
+
+            srcwidth = BitmapBytePad(w + leftPad);
+            increment = h * srcwidth;
+            i = 1 << (depth - 1);
+            mask = ~0;
+
+            if ((infoRec->pScrn->overlayFlags & OVERLAY_8_32_PLANAR) &&
+                (pGC->depth == 8)) {
+                i = 0x80000000;
+                mask = 0xff000000;
+            }
+
+            for (; i & mask; i >>= 1, pImage += increment) {
+                if (i & pGC->planemask) {
+                    pntBox = pbox;
+                    numBox = nboxes;
+                    while (numBox--) {
+                        srcx = pntBox->x1 - TheRect.x + leftPad;
+                        srcy = pntBox->y1 - TheRect.y;
+                        (*infoRec->WriteBitmap) (infoRec->pScrn,
+                                                 pntBox->x1, pntBox->y1,
+                                                 pntBox->x2 - pntBox->x1,
+                                                 pntBox->y2 - pntBox->y1,
+                                                 (unsigned char *) pImage +
+                                                 (srcwidth * srcy) +
+                                                 ((srcx >> 5) << 2), srcwidth,
+                                                 srcx & 31, ~0, 0, pGC->alu, i);
+                        pntBox++;
+                    }
+                }
+            }
+
+        }
+
+        if (pClipBoxes != (BoxPtr) infoRec->PreAllocMem)
+            free(pClipBoxes);
+    }
+    else
+        XAAFallbackOps.PutImage(pDraw, pGC, depth, x, y, w, h, leftPad,
+                                format, pImage);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaInit.c b/xorg-server/hw/xfree86/xaa/xaaInit.c
index ff1dd3d8b..661fa90ab 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInit.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInit.c
@@ -1,635 +1,637 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "windowstr.h"

-#include "xf86str.h"

-#include "mi.h"

-#include "miline.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaawrap.h"

-#include "xf86fbman.h"

-#include "servermd.h"

-#ifdef COMPOSITE

-#include "cw.h"

-#endif

-

-#define MAX_PREALLOC_MEM	65536	/* MUST be >= 1024 */

-

-#define MIN_OFFPIX_SIZE		(320*200)

-

-static Bool XAACloseScreen(int i, ScreenPtr pScreen);

-static void XAAGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,

-			unsigned int format, unsigned long planemask,

-			char *pdstLine);

-static void XAAGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,

-			int *pwidth, int nspans, char *pdstStart);

-static PixmapPtr XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth,

-				 unsigned usage_hint);

-static Bool XAADestroyPixmap(PixmapPtr pPixmap);

-static Bool XAAEnterVT (int index, int flags);

-static void XAALeaveVT (int index, int flags);

-static int  XAASetDGAMode(int index, int num, DGADevicePtr devRet);

-static void XAAEnableDisableFBAccess (int index, Bool enable);

-static Bool XAAChangeWindowAttributes (WindowPtr pWin, unsigned long mask);

-

-static DevPrivateKeyRec XAAScreenKeyRec;

-#define XAAScreenKey (&XAAScreenKeyRec)

-static DevPrivateKeyRec XAAGCKeyRec;

-#define XAAGCKey (&XAAGCKeyRec)

-static DevPrivateKeyRec XAAPixmapKeyRec;

-#define XAAPixmapKey (&XAAPixmapKeyRec)

-

-DevPrivateKey XAAGetScreenKey(void) {

-    return XAAScreenKey;

-}

-

-DevPrivateKey XAAGetGCKey(void) {

-    return XAAGCKey;

-}

-

-DevPrivateKey XAAGetPixmapKey(void) {

-    return XAAPixmapKey;

-}

-

-/* temp kludge */

-static Bool SwitchedOut = FALSE;

-

-XAAInfoRecPtr

-XAACreateInfoRec(void)

-{

-    XAAInfoRecPtr infoRec;

-

-    infoRec = calloc(1, sizeof(XAAInfoRec));

-    if(infoRec)

-	infoRec->CachePixelGranularity = -1;

-

-    return infoRec;

-}

-

-void

-XAADestroyInfoRec(XAAInfoRecPtr infoRec)

-{

-    if(!infoRec) return;

-

-    if(infoRec->ClosePixmapCache)

-	(*infoRec->ClosePixmapCache)(infoRec->pScrn->pScreen);

-   

-    free(infoRec->PreAllocMem);

-

-    free(infoRec->PixmapCachePrivate);

-

-    free(infoRec);

-}

-

-

-Bool

-XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)

-{

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    XAAScreenPtr pScreenPriv;

-    int i;

-    PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);

-

-    /* Return successfully if no acceleration wanted */

-    if (!infoRec)

-	return TRUE;

-    

-    if (!dixRegisterPrivateKey(&XAAGCKeyRec, PRIVATE_GC, sizeof(XAAGCRec)))

-	return FALSE;

-

-    if (!dixRegisterPrivateKey(&XAAPixmapKeyRec, PRIVATE_PIXMAP, sizeof(XAAPixmapRec)))

-	return FALSE;

-

-    if (!dixRegisterPrivateKey(&XAAScreenKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-

-    if (!(pScreenPriv = malloc(sizeof(XAAScreenRec))))

-	return FALSE;

-

-    dixSetPrivate(&pScreen->devPrivates, XAAScreenKey, pScreenPriv);

-

-    if(!xf86FBManagerRunning(pScreen))

-	infoRec->Flags &= ~(PIXMAP_CACHE | OFFSCREEN_PIXMAPS);

-    if(!(infoRec->Flags & LINEAR_FRAMEBUFFER))

-	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;

-   

-    if(!infoRec->FullPlanemask) { /* for backwards compatibility */

-	infoRec->FullPlanemask =  (1 << pScrn->depth) - 1;

-	infoRec->FullPlanemasks[pScrn->depth - 1] = infoRec->FullPlanemask;

-    }

-

-    for(i = 0; i < 32; i++) {

-	if(!infoRec->FullPlanemasks[i]) /* keep any set by caller */

-	    infoRec->FullPlanemasks[i] = (1 << (i+1)) - 1;	

-    }

-

-    if(!XAAInitAccel(pScreen, infoRec)) return FALSE;

-    pScreenPriv->AccelInfoRec = infoRec;

-    infoRec->ScratchGC.pScreen = pScreen;

-

-    

-    if(!infoRec->GetImage)

-	infoRec->GetImage = XAAGetImage;

-    if(!infoRec->GetSpans)

-	infoRec->GetSpans = XAAGetSpans;

-    if(!infoRec->CopyWindow)

-	infoRec->CopyWindow = XAACopyWindow;

-

-    pScreenPriv->CreateGC = pScreen->CreateGC;

-    pScreen->CreateGC = XAACreateGC;

-    pScreenPriv->CloseScreen = pScreen->CloseScreen;

-    pScreen->CloseScreen = XAACloseScreen;

-    pScreenPriv->GetImage = pScreen->GetImage;

-    pScreen->GetImage = infoRec->GetImage;

-    pScreenPriv->GetSpans = pScreen->GetSpans;

-    pScreen->GetSpans = infoRec->GetSpans;

-    pScreenPriv->CopyWindow = pScreen->CopyWindow;

-    pScreen->CopyWindow = infoRec->CopyWindow;

-    pScreenPriv->CreatePixmap = pScreen->CreatePixmap;

-    pScreen->CreatePixmap = XAACreatePixmap;

-    pScreenPriv->DestroyPixmap = pScreen->DestroyPixmap;

-    pScreen->DestroyPixmap = XAADestroyPixmap;

-    pScreenPriv->ChangeWindowAttributes = pScreen->ChangeWindowAttributes;

-    pScreen->ChangeWindowAttributes = XAAChangeWindowAttributes;

-

-    pScreenPriv->EnterVT = pScrn->EnterVT;

-    pScrn->EnterVT = XAAEnterVT; 

-    pScreenPriv->LeaveVT = pScrn->LeaveVT;

-    pScrn->LeaveVT = XAALeaveVT;

-    pScreenPriv->SetDGAMode = pScrn->SetDGAMode;

-    pScrn->SetDGAMode = XAASetDGAMode;

-    pScreenPriv->EnableDisableFBAccess = pScrn->EnableDisableFBAccess;

-    pScrn->EnableDisableFBAccess = XAAEnableDisableFBAccess;

-

-    pScreenPriv->WindowExposures = pScreen->WindowExposures;

-    if (ps)

-    {

-	pScreenPriv->Composite = ps->Composite;

-	ps->Composite = XAAComposite;

-	pScreenPriv->Glyphs = ps->Glyphs;

-	ps->Glyphs = XAAGlyphs;

-    }

-    if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR)

-        XAASetupOverlay8_32Planar(pScreen);

-

-    infoRec->PreAllocMem = malloc(MAX_PREALLOC_MEM);

-    if(infoRec->PreAllocMem)

-    	infoRec->PreAllocSize = MAX_PREALLOC_MEM;

-

-    if(infoRec->Flags & PIXMAP_CACHE) 

-	xf86RegisterFreeBoxCallback(pScreen, infoRec->InitPixmapCache,

-						(pointer)infoRec);

-

-    if(infoRec->Flags & MICROSOFT_ZERO_LINE_BIAS)

-	miSetZeroLineBias(pScreen, OCTANT1 | OCTANT2 | OCTANT3 | OCTANT4);

-

-#ifdef COMPOSITE

-    /* Initialize the composite wrapper.  This needs to happen after the

-     * wrapping above (so it comes before us), but before all other extensions,

-     * so it doesn't confuse them. (particularly damage).

-     */

-    miInitializeCompositeWrapper(pScreen);

-#endif

-

-    return TRUE;

-}

-

-

-

-static Bool

-XAACloseScreen (int i, ScreenPtr pScreen)

-{

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    XAAScreenPtr pScreenPriv = 

-	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);

-

-    pScrn->EnterVT = pScreenPriv->EnterVT; 

-    pScrn->LeaveVT = pScreenPriv->LeaveVT; 

-    pScrn->EnableDisableFBAccess = pScreenPriv->EnableDisableFBAccess;

-   

-    pScreen->CreateGC = pScreenPriv->CreateGC;

-    pScreen->CloseScreen = pScreenPriv->CloseScreen;

-    pScreen->GetImage = pScreenPriv->GetImage;

-    pScreen->GetSpans = pScreenPriv->GetSpans;

-    pScreen->CopyWindow = pScreenPriv->CopyWindow;

-    pScreen->WindowExposures = pScreenPriv->WindowExposures;

-    pScreen->CreatePixmap = pScreenPriv->CreatePixmap;

-    pScreen->DestroyPixmap = pScreenPriv->DestroyPixmap;

-    pScreen->ChangeWindowAttributes = pScreenPriv->ChangeWindowAttributes;

-

-    /* We leave it up to the client to free the XAAInfoRec */

-

-    free((pointer) pScreenPriv);

-

-    return (*pScreen->CloseScreen) (i, pScreen);

-}

-

-static void

-XAAGetImage (

-    DrawablePtr pDraw,

-    int	sx, int sy, int w, int h,

-    unsigned int    format,

-    unsigned long   planemask,

-    char	    *pdstLine 

-)

-{

-    ScreenPtr pScreen = pDraw->pScreen;

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    ScrnInfoPtr pScrn = infoRec->pScrn;

-

-    if(pScrn->vtSema && 

-	((pDraw->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pDraw))) 

-    {

-	if(infoRec->ReadPixmap && (format == ZPixmap) && 

-	   ((planemask & infoRec->FullPlanemasks[pDraw->depth - 1]) == 

-                           infoRec->FullPlanemasks[pDraw->depth - 1]) &&

-	   (pDraw->bitsPerPixel == BitsPerPixel(pDraw->depth)))

-	{

-	    (*infoRec->ReadPixmap)(pScrn, 

-		   sx + pDraw->x, sy + pDraw->y, w, h,

-		   (unsigned char *)pdstLine,

-		   PixmapBytePad(w, pDraw->depth), 

-		   pDraw->bitsPerPixel, pDraw->depth);

-	    return;

-	}

-	SYNC_CHECK(pDraw);

-    }

-

-    XAA_SCREEN_PROLOGUE (pScreen, GetImage);

-    (*pScreen->GetImage) (pDraw, sx, sy, w, h, format, planemask, pdstLine);

-    XAA_SCREEN_EPILOGUE (pScreen, GetImage, XAAGetImage);

-}

-

-static void

-XAAGetSpans (

-    DrawablePtr pDraw,

-    int		wMax,

-    DDXPointPtr	ppt,

-    int		*pwidth,

-    int		nspans,

-    char	*pdstStart

-)

-{

-    ScreenPtr pScreen = pDraw->pScreen;

-    XAA_SCREEN_PROLOGUE (pScreen, GetSpans);

-    if(xf86Screens[pScreen->myNum]->vtSema && 

-	((pDraw->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pDraw))) {

-	SYNC_CHECK(pDraw);

-    }

-    (*pScreen->GetSpans) (pDraw, wMax, ppt, pwidth, nspans, pdstStart);

-    XAA_SCREEN_EPILOGUE (pScreen, GetSpans, XAAGetSpans);

-}

-

-

-static int

-XAAPixmapBPP (ScreenPtr pScreen, int depth)

-{

-    PixmapPtr	pPix;

-    int		bpp;

-    DestroyPixmapProcPtr    destroyPixmap;

-    

-    XAA_SCREEN_PROLOGUE (pScreen, CreatePixmap);

-    pPix = (*pScreen->CreatePixmap) (pScreen, 1, 1, depth,

-				     CREATE_PIXMAP_USAGE_SCRATCH);

-    XAA_SCREEN_EPILOGUE (pScreen, CreatePixmap, XAACreatePixmap);

-    if (!pPix)

-	return 0;

-    bpp = pPix->drawable.bitsPerPixel;

-    destroyPixmap = pScreen->DestroyPixmap;

-    XAA_SCREEN_PROLOGUE (pScreen, DestroyPixmap);

-    (*pScreen->DestroyPixmap) (pPix);

-    XAA_SCREEN_EPILOGUE (pScreen, DestroyPixmap, destroyPixmap);

-    return bpp;

-}

-

-static void

-XAAInitializeOffscreenDepths (ScreenPtr pScreen)

-{

-    XAAInfoRecPtr   infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    ScrnInfoPtr	    pScrn = xf86Screens[pScreen->myNum];

-    int		    d, dep;

-    

-    infoRec->offscreenDepthsInitialized = TRUE;

-    infoRec->offscreenDepths = 0;

-    if (infoRec->Flags & OFFSCREEN_PIXMAPS) {

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

-	    dep = pScreen->allowedDepths[d].depth;

-	    if (XAAPixmapBPP (pScreen, dep) == pScrn->bitsPerPixel)

-		infoRec->offscreenDepths |= (1 << (dep - 1));

-	}

-    }

-}

-

-static PixmapPtr 

-XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    XAAPixmapPtr pPriv;

-    PixmapPtr pPix = NULL;

-    int size = w * h;

-

-    if (w > 32767 || h > 32767)

-	return NullPixmap;

-    

-    if (!infoRec->offscreenDepthsInitialized)

-	XAAInitializeOffscreenDepths (pScreen);

-

-    if(pScrn->vtSema &&

-	(usage_hint != CREATE_PIXMAP_USAGE_GLYPH_PICTURE) &&

-	(infoRec->offscreenDepths & (1 << (depth - 1))) &&

-	(size >= MIN_OFFPIX_SIZE) && !SwitchedOut &&

-	(!infoRec->maxOffPixWidth || (w <= infoRec->maxOffPixWidth)) &&

-	(!infoRec->maxOffPixHeight || (h <= infoRec->maxOffPixHeight)) )

-    {

-        PixmapLinkPtr pLink;

-	PixmapPtr pScreenPix;

-        FBAreaPtr area;

-        int gran = 0;

-

-	switch(pScrn->bitsPerPixel) {

-        case 24: 

-        case 8:  gran = 4;  break;

-        case 16: gran = 2;  break;

-        case 32: gran = 1;  break;

-        default: break;

-        }

-

-        if(BITMAP_SCANLINE_PAD == 64)

-           gran *= 2;

-

-        if(!(area = xf86AllocateOffscreenArea(pScreen, w, h, gran, 0,

-                                XAARemoveAreaCallback, NULL))) {

-	    goto BAILOUT;

-	}

-

-        if(!(pLink = malloc(sizeof(PixmapLink)))) {

-            xf86FreeOffscreenArea(area);

-	    goto BAILOUT;

-	}

-

-	XAA_SCREEN_PROLOGUE (pScreen, CreatePixmap);

-	pPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, depth, usage_hint);

-	XAA_SCREEN_EPILOGUE (pScreen, CreatePixmap, XAACreatePixmap);

-

-	if (!pPix) {

-	    free(pLink);

-            xf86FreeOffscreenArea(area);

-	    goto BAILOUT;

-	}

-	

-	pScreenPix = (*pScreen->GetScreenPixmap)(pScreen);

-

-	pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);

-	pPix->drawable.x = area->box.x1;

-	pPix->drawable.y = area->box.y1;

-	pPix->drawable.width = w;

-	pPix->drawable.height = h;

-	pPix->drawable.bitsPerPixel = pScrn->bitsPerPixel;

-	pPix->devKind = pScreenPix->devKind;

-	pPix->devPrivate.ptr = pScreenPix->devPrivate.ptr;

-	area->devPrivate.ptr = pPix;

-

-	pPriv->flags = OFFSCREEN;

-	pPriv->offscreenArea = area;

- 	pPriv->freeData = FALSE;

-	    

-	pLink->next = infoRec->OffscreenPixmaps;

-	pLink->pPix = pPix;

-	infoRec->OffscreenPixmaps = pLink;

-	return pPix;

-    }

-BAILOUT:

-    XAA_SCREEN_PROLOGUE (pScreen, CreatePixmap);

-    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);

-    XAA_SCREEN_EPILOGUE (pScreen, CreatePixmap, XAACreatePixmap);

-

-    if(pPix) {

-       pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);

-       pPriv->flags = 0;

-       pPriv->offscreenArea = NULL;

-       pPriv->freeData = FALSE;

-       if(!w || !h) /* either scratch or shared memory */

-	    pPriv->flags |= SHARED_PIXMAP;

-    }

-

-    return pPix;

-}

-

-static Bool 

-XAADestroyPixmap(PixmapPtr pPix)

-{

-    ScreenPtr pScreen = pPix->drawable.pScreen;

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);

-    Bool ret;

-

-    if(pPix->refcnt == 1) {

-        if(pPriv->flags & OFFSCREEN) {

-	    if(pPriv->flags & DGA_PIXMAP)

-	        free(pPriv->offscreenArea);

-            else {

-	        FBAreaPtr area = pPriv->offscreenArea;

-		PixmapLinkPtr pLink = infoRec->OffscreenPixmaps;

-	        PixmapLinkPtr prev = NULL;

-

-		while(pLink->pPix != pPix) {

-		    prev = pLink;

-		    pLink = pLink->next;

-		}

-

-	        if(prev) prev->next = pLink->next;

-		else infoRec->OffscreenPixmaps = pLink->next;

-

-	        if(!area) area = pLink->area;

-

-	        xf86FreeOffscreenArea(area);

-	        pPriv->offscreenArea = NULL;

-	        free(pLink);

-	    } 

-        }

-

-        if(pPriv->freeData) { /* pixmaps that were once in video ram */

-	    free(pPix->devPrivate.ptr);

-	    pPix->devPrivate.ptr = NULL;

-	}

-    }

-    

-    XAA_SCREEN_PROLOGUE (pScreen, DestroyPixmap);

-    ret = (*pScreen->DestroyPixmap) (pPix);

-    XAA_SCREEN_EPILOGUE (pScreen, DestroyPixmap, XAADestroyPixmap);

- 

-    return ret;

-}

-

-static Bool

-XAAChangeWindowAttributes (WindowPtr pWin, unsigned long mask)

-{

-   ScreenPtr pScreen = pWin->drawable.pScreen;

-   Bool ret;

-

-   XAA_SCREEN_PROLOGUE (pScreen, ChangeWindowAttributes);

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

-   XAA_SCREEN_EPILOGUE (pScreen, ChangeWindowAttributes, XAAChangeWindowAttributes);

-

-   /* we have to assume that shared memory pixmaps are dirty

-      because we can't wrap operations on them */

-

-   if((mask & CWBackPixmap) && (pWin->backgroundState == BackgroundPixmap) &&

-      PIXMAP_IS_SHARED(pWin->background.pixmap))

-   {

-        XAAPixmapPtr pPixPriv = XAA_GET_PIXMAP_PRIVATE(pWin->background.pixmap);

-	pPixPriv->flags |= DIRTY;

-   }

-   if((mask & CWBorderPixmap) && !(pWin->borderIsPixel) &&

-      PIXMAP_IS_SHARED(pWin->border.pixmap))

-   {

-        XAAPixmapPtr pPixPriv = XAA_GET_PIXMAP_PRIVATE(pWin->border.pixmap);

-        pPixPriv->flags |= DIRTY;

-   }

-

-   return ret;

-}

-

-

-

-/*  These two aren't really needed for anything */

-

-static Bool 

-XAAEnterVT(int index, int flags)

-{

-    ScrnInfoPtr pScrn = xf86Screens[index];

-    Bool ret;

-    ScreenPtr pScreen = screenInfo.screens[index];

-    XAAScreenPtr pScreenPriv = 

-	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);

-

-    pScrn->EnterVT = pScreenPriv->EnterVT;

-    ret = ((*pScreenPriv->EnterVT)(index, flags));

-    pScreenPriv->EnterVT = pScrn->EnterVT;

-    pScrn->EnterVT = XAAEnterVT;

-    return ret;

-}

-

-static void 

-XAALeaveVT(int index, int flags)

-{

-    ScrnInfoPtr pScrn = xf86Screens[index];

-    ScreenPtr pScreen = screenInfo.screens[index];

-    XAAScreenPtr pScreenPriv = 

-	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);

-    XAAInfoRecPtr infoRec = pScreenPriv->AccelInfoRec;

-

-    if(infoRec->NeedToSync) {

-        (*infoRec->Sync)(infoRec->pScrn);

-        infoRec->NeedToSync = FALSE;

-    }

-

-    pScrn->LeaveVT = pScreenPriv->LeaveVT;

-    (*pScreenPriv->LeaveVT)(index, flags);

-    pScreenPriv->LeaveVT = pScrn->LeaveVT;

-    pScrn->LeaveVT = XAALeaveVT;

-}

-

-typedef struct {

-   Bool UsingPixmapCache;

-   Bool CanDoColor8x8;

-   Bool CanDoMono8x8;

-} SavedCacheState, *SavedCacheStatePtr;

-

-static int  

-XAASetDGAMode(int index, int num, DGADevicePtr devRet)

-{

-    ScreenPtr pScreen = screenInfo.screens[index];

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    XAAScreenPtr pScreenPriv = 

-	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);

-    int ret;

-

-    if (!num && infoRec->dgaSaves) { /* restore old pixmap cache state */

-	SavedCacheStatePtr state = (SavedCacheStatePtr)infoRec->dgaSaves;

-	

-	infoRec->UsingPixmapCache = state->UsingPixmapCache;	

-	infoRec->CanDoColor8x8 = state->CanDoColor8x8;	

-	infoRec->CanDoMono8x8 = state->CanDoMono8x8;

-	free(infoRec->dgaSaves);

-	infoRec->dgaSaves = NULL;

-    }

-

-    ret = (*pScreenPriv->SetDGAMode)(index, num, devRet);

-    if(ret != Success) return ret;

-

-    if(num && devRet->pPix) {  /* accelerate this pixmap */

-	XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(devRet->pPix);

-	FBAreaPtr area;

-

-	if((area = malloc(sizeof(FBArea)))) {

-	    area->pScreen = pScreen;

-	    area->box.x1 = 0;

-	    area->box.x2 = 0;

-	    area->box.y1 = devRet->mode->pixmapWidth;

-	    area->box.y2 = devRet->mode->pixmapHeight;

-	    area->granularity = 0;

-	    area->MoveAreaCallback = 0;

-	    area->RemoveAreaCallback = 0;

-	    area->devPrivate.ptr = 0;	

-

-	    pixPriv->flags |= OFFSCREEN | DGA_PIXMAP;

-	    pixPriv->offscreenArea = area;

-

-	    if(!infoRec->dgaSaves) { /* save pixmap cache state */

-		SavedCacheStatePtr state = malloc(sizeof(SavedCacheState));

-	

-		state->UsingPixmapCache = infoRec->UsingPixmapCache;	

-		state->CanDoColor8x8 = infoRec->CanDoColor8x8;	

-		state->CanDoMono8x8 = infoRec->CanDoMono8x8;	

-		infoRec->dgaSaves = (char*)state;

-

-		infoRec->UsingPixmapCache = FALSE;

-		if(infoRec->PixmapCacheFlags & CACHE_MONO_8x8)

-		    infoRec->CanDoMono8x8 = FALSE;

-		if(infoRec->PixmapCacheFlags & CACHE_COLOR_8x8)

-		    infoRec->CanDoColor8x8 = FALSE;

-	    }

-	}

-    }

-

-    return ret;

-}

-

-

-

-static void

-XAAEnableDisableFBAccess (int index, Bool enable)

-{

-    ScreenPtr pScreen = screenInfo.screens[index];

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    XAAScreenPtr pScreenPriv = 

-	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);

-

-    if(!enable) {

-	if((infoRec->Flags & OFFSCREEN_PIXMAPS) && (infoRec->OffscreenPixmaps))

-	    XAAMoveOutOffscreenPixmaps(pScreen);

-	if(infoRec->Flags & PIXMAP_CACHE)

-	    XAAInvalidatePixmapCache(pScreen);

-	SwitchedOut = TRUE;

-    }

-

-    (*pScreenPriv->EnableDisableFBAccess)(index, enable);

-

-    if(enable) {

-	if((infoRec->Flags & OFFSCREEN_PIXMAPS) && (infoRec->OffscreenPixmaps))

-	    XAAMoveInOffscreenPixmaps(pScreen);

-	SwitchedOut = FALSE;

-    }

-}

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "windowstr.h"
+#include "xf86str.h"
+#include "mi.h"
+#include "miline.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaawrap.h"
+#include "xf86fbman.h"
+#include "servermd.h"
+#ifdef COMPOSITE
+#include "cw.h"
+#endif
+
+#define MAX_PREALLOC_MEM	65536   /* MUST be >= 1024 */
+
+#define MIN_OFFPIX_SIZE		(320*200)
+
+static Bool XAACloseScreen(int i, ScreenPtr pScreen);
+static void XAAGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
+                        unsigned int format, unsigned long planemask,
+                        char *pdstLine);
+static void XAAGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
+                        int *pwidth, int nspans, char *pdstStart);
+static PixmapPtr XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
+                                 unsigned usage_hint);
+static Bool XAADestroyPixmap(PixmapPtr pPixmap);
+static Bool XAAEnterVT(int index, int flags);
+static void XAALeaveVT(int index, int flags);
+static int XAASetDGAMode(int index, int num, DGADevicePtr devRet);
+static void XAAEnableDisableFBAccess(int index, Bool enable);
+static Bool XAAChangeWindowAttributes(WindowPtr pWin, unsigned long mask);
+
+static DevPrivateKeyRec XAAScreenKeyRec;
+
+#define XAAScreenKey (&XAAScreenKeyRec)
+static DevPrivateKeyRec XAAGCKeyRec;
+
+#define XAAGCKey (&XAAGCKeyRec)
+static DevPrivateKeyRec XAAPixmapKeyRec;
+
+#define XAAPixmapKey (&XAAPixmapKeyRec)
+
+DevPrivateKey
+XAAGetScreenKey(void)
+{
+    return XAAScreenKey;
+}
+
+DevPrivateKey
+XAAGetGCKey(void)
+{
+    return XAAGCKey;
+}
+
+DevPrivateKey
+XAAGetPixmapKey(void)
+{
+    return XAAPixmapKey;
+}
+
+/* temp kludge */
+static Bool SwitchedOut = FALSE;
+
+XAAInfoRecPtr
+XAACreateInfoRec(void)
+{
+    XAAInfoRecPtr infoRec;
+
+    infoRec = calloc(1, sizeof(XAAInfoRec));
+    if (infoRec)
+        infoRec->CachePixelGranularity = -1;
+
+    return infoRec;
+}
+
+void
+XAADestroyInfoRec(XAAInfoRecPtr infoRec)
+{
+    if (!infoRec)
+        return;
+
+    if (infoRec->ClosePixmapCache)
+        (*infoRec->ClosePixmapCache) (infoRec->pScrn->pScreen);
+
+    free(infoRec->PreAllocMem);
+
+    free(infoRec->PixmapCachePrivate);
+
+    free(infoRec);
+}
+
+Bool
+XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    XAAScreenPtr pScreenPriv;
+    int i;
+    PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
+
+    /* Return successfully if no acceleration wanted */
+    if (!infoRec)
+        return TRUE;
+
+    if (!dixRegisterPrivateKey(&XAAGCKeyRec, PRIVATE_GC, sizeof(XAAGCRec)))
+        return FALSE;
+
+    if (!dixRegisterPrivateKey
+        (&XAAPixmapKeyRec, PRIVATE_PIXMAP, sizeof(XAAPixmapRec)))
+        return FALSE;
+
+    if (!dixRegisterPrivateKey(&XAAScreenKeyRec, PRIVATE_SCREEN, 0))
+        return FALSE;
+
+    if (!(pScreenPriv = malloc(sizeof(XAAScreenRec))))
+        return FALSE;
+
+    dixSetPrivate(&pScreen->devPrivates, XAAScreenKey, pScreenPriv);
+
+    if (!xf86FBManagerRunning(pScreen))
+        infoRec->Flags &= ~(PIXMAP_CACHE | OFFSCREEN_PIXMAPS);
+    if (!(infoRec->Flags & LINEAR_FRAMEBUFFER))
+        infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
+
+    if (!infoRec->FullPlanemask) {      /* for backwards compatibility */
+        infoRec->FullPlanemask = (1 << pScrn->depth) - 1;
+        infoRec->FullPlanemasks[pScrn->depth - 1] = infoRec->FullPlanemask;
+    }
+
+    for (i = 0; i < 32; i++) {
+        if (!infoRec->FullPlanemasks[i])        /* keep any set by caller */
+            infoRec->FullPlanemasks[i] = (1 << (i + 1)) - 1;
+    }
+
+    if (!XAAInitAccel(pScreen, infoRec))
+        return FALSE;
+    pScreenPriv->AccelInfoRec = infoRec;
+    infoRec->ScratchGC.pScreen = pScreen;
+
+    if (!infoRec->GetImage)
+        infoRec->GetImage = XAAGetImage;
+    if (!infoRec->GetSpans)
+        infoRec->GetSpans = XAAGetSpans;
+    if (!infoRec->CopyWindow)
+        infoRec->CopyWindow = XAACopyWindow;
+
+    pScreenPriv->CreateGC = pScreen->CreateGC;
+    pScreen->CreateGC = XAACreateGC;
+    pScreenPriv->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = XAACloseScreen;
+    pScreenPriv->GetImage = pScreen->GetImage;
+    pScreen->GetImage = infoRec->GetImage;
+    pScreenPriv->GetSpans = pScreen->GetSpans;
+    pScreen->GetSpans = infoRec->GetSpans;
+    pScreenPriv->CopyWindow = pScreen->CopyWindow;
+    pScreen->CopyWindow = infoRec->CopyWindow;
+    pScreenPriv->CreatePixmap = pScreen->CreatePixmap;
+    pScreen->CreatePixmap = XAACreatePixmap;
+    pScreenPriv->DestroyPixmap = pScreen->DestroyPixmap;
+    pScreen->DestroyPixmap = XAADestroyPixmap;
+    pScreenPriv->ChangeWindowAttributes = pScreen->ChangeWindowAttributes;
+    pScreen->ChangeWindowAttributes = XAAChangeWindowAttributes;
+
+    pScreenPriv->EnterVT = pScrn->EnterVT;
+    pScrn->EnterVT = XAAEnterVT;
+    pScreenPriv->LeaveVT = pScrn->LeaveVT;
+    pScrn->LeaveVT = XAALeaveVT;
+    pScreenPriv->SetDGAMode = pScrn->SetDGAMode;
+    pScrn->SetDGAMode = XAASetDGAMode;
+    pScreenPriv->EnableDisableFBAccess = pScrn->EnableDisableFBAccess;
+    pScrn->EnableDisableFBAccess = XAAEnableDisableFBAccess;
+
+    pScreenPriv->WindowExposures = pScreen->WindowExposures;
+    if (ps) {
+        pScreenPriv->Composite = ps->Composite;
+        ps->Composite = XAAComposite;
+        pScreenPriv->Glyphs = ps->Glyphs;
+        ps->Glyphs = XAAGlyphs;
+    }
+    if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR)
+        XAASetupOverlay8_32Planar(pScreen);
+
+    infoRec->PreAllocMem = malloc(MAX_PREALLOC_MEM);
+    if (infoRec->PreAllocMem)
+        infoRec->PreAllocSize = MAX_PREALLOC_MEM;
+
+    if (infoRec->Flags & PIXMAP_CACHE)
+        xf86RegisterFreeBoxCallback(pScreen, infoRec->InitPixmapCache,
+                                    (pointer) infoRec);
+
+    if (infoRec->Flags & MICROSOFT_ZERO_LINE_BIAS)
+        miSetZeroLineBias(pScreen, OCTANT1 | OCTANT2 | OCTANT3 | OCTANT4);
+
+#ifdef COMPOSITE
+    /* Initialize the composite wrapper.  This needs to happen after the
+     * wrapping above (so it comes before us), but before all other extensions,
+     * so it doesn't confuse them. (particularly damage).
+     */
+    miInitializeCompositeWrapper(pScreen);
+#endif
+
+    return TRUE;
+}
+
+static Bool
+XAACloseScreen(int i, ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    XAAScreenPtr pScreenPriv =
+        (XAAScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
+
+    pScrn->EnterVT = pScreenPriv->EnterVT;
+    pScrn->LeaveVT = pScreenPriv->LeaveVT;
+    pScrn->EnableDisableFBAccess = pScreenPriv->EnableDisableFBAccess;
+
+    pScreen->CreateGC = pScreenPriv->CreateGC;
+    pScreen->CloseScreen = pScreenPriv->CloseScreen;
+    pScreen->GetImage = pScreenPriv->GetImage;
+    pScreen->GetSpans = pScreenPriv->GetSpans;
+    pScreen->CopyWindow = pScreenPriv->CopyWindow;
+    pScreen->WindowExposures = pScreenPriv->WindowExposures;
+    pScreen->CreatePixmap = pScreenPriv->CreatePixmap;
+    pScreen->DestroyPixmap = pScreenPriv->DestroyPixmap;
+    pScreen->ChangeWindowAttributes = pScreenPriv->ChangeWindowAttributes;
+
+    /* We leave it up to the client to free the XAAInfoRec */
+
+    free((pointer) pScreenPriv);
+
+    return (*pScreen->CloseScreen) (i, pScreen);
+}
+
+static void
+XAAGetImage(DrawablePtr pDraw,
+            int sx, int sy, int w, int h,
+            unsigned int format, unsigned long planemask, char *pdstLine)
+{
+    ScreenPtr pScreen = pDraw->pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    ScrnInfoPtr pScrn = infoRec->pScrn;
+
+    if (pScrn->vtSema &&
+        ((pDraw->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pDraw))) {
+        if (infoRec->ReadPixmap && (format == ZPixmap) &&
+            ((planemask & infoRec->FullPlanemasks[pDraw->depth - 1]) ==
+             infoRec->FullPlanemasks[pDraw->depth - 1]) &&
+            (pDraw->bitsPerPixel == BitsPerPixel(pDraw->depth))) {
+            (*infoRec->ReadPixmap) (pScrn,
+                                    sx + pDraw->x, sy + pDraw->y, w, h,
+                                    (unsigned char *) pdstLine,
+                                    PixmapBytePad(w, pDraw->depth),
+                                    pDraw->bitsPerPixel, pDraw->depth);
+            return;
+        }
+        SYNC_CHECK(pDraw);
+    }
+
+    XAA_SCREEN_PROLOGUE(pScreen, GetImage);
+    (*pScreen->GetImage) (pDraw, sx, sy, w, h, format, planemask, pdstLine);
+    XAA_SCREEN_EPILOGUE(pScreen, GetImage, XAAGetImage);
+}
+
+static void
+XAAGetSpans(DrawablePtr pDraw,
+            int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)
+{
+    ScreenPtr pScreen = pDraw->pScreen;
+
+    XAA_SCREEN_PROLOGUE(pScreen, GetSpans);
+    if (xf86Screens[pScreen->myNum]->vtSema &&
+        ((pDraw->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pDraw))) {
+        SYNC_CHECK(pDraw);
+    }
+    (*pScreen->GetSpans) (pDraw, wMax, ppt, pwidth, nspans, pdstStart);
+    XAA_SCREEN_EPILOGUE(pScreen, GetSpans, XAAGetSpans);
+}
+
+static int
+XAAPixmapBPP(ScreenPtr pScreen, int depth)
+{
+    PixmapPtr pPix;
+    int bpp;
+    DestroyPixmapProcPtr destroyPixmap;
+
+    XAA_SCREEN_PROLOGUE(pScreen, CreatePixmap);
+    pPix = (*pScreen->CreatePixmap) (pScreen, 1, 1, depth,
+                                     CREATE_PIXMAP_USAGE_SCRATCH);
+    XAA_SCREEN_EPILOGUE(pScreen, CreatePixmap, XAACreatePixmap);
+    if (!pPix)
+        return 0;
+    bpp = pPix->drawable.bitsPerPixel;
+    destroyPixmap = pScreen->DestroyPixmap;
+    XAA_SCREEN_PROLOGUE(pScreen, DestroyPixmap);
+    (*pScreen->DestroyPixmap) (pPix);
+    XAA_SCREEN_EPILOGUE(pScreen, DestroyPixmap, destroyPixmap);
+    return bpp;
+}
+
+static void
+XAAInitializeOffscreenDepths(ScreenPtr pScreen)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    int d, dep;
+
+    infoRec->offscreenDepthsInitialized = TRUE;
+    infoRec->offscreenDepths = 0;
+    if (infoRec->Flags & OFFSCREEN_PIXMAPS) {
+        for (d = 0; d < pScreen->numDepths; d++) {
+            dep = pScreen->allowedDepths[d].depth;
+            if (XAAPixmapBPP(pScreen, dep) == pScrn->bitsPerPixel)
+                infoRec->offscreenDepths |= (1 << (dep - 1));
+        }
+    }
+}
+
+static PixmapPtr
+XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    XAAPixmapPtr pPriv;
+    PixmapPtr pPix = NULL;
+    int size = w * h;
+
+    if (w > 32767 || h > 32767)
+        return NullPixmap;
+
+    if (!infoRec->offscreenDepthsInitialized)
+        XAAInitializeOffscreenDepths(pScreen);
+
+    if (pScrn->vtSema &&
+        (usage_hint != CREATE_PIXMAP_USAGE_GLYPH_PICTURE) &&
+        (infoRec->offscreenDepths & (1 << (depth - 1))) &&
+        (size >= MIN_OFFPIX_SIZE) && !SwitchedOut &&
+        (!infoRec->maxOffPixWidth || (w <= infoRec->maxOffPixWidth)) &&
+        (!infoRec->maxOffPixHeight || (h <= infoRec->maxOffPixHeight))) {
+        PixmapLinkPtr pLink;
+        PixmapPtr pScreenPix;
+        FBAreaPtr area;
+        int gran = 0;
+
+        switch (pScrn->bitsPerPixel) {
+        case 24:
+        case 8:
+            gran = 4;
+            break;
+        case 16:
+            gran = 2;
+            break;
+        case 32:
+            gran = 1;
+            break;
+        default:
+            break;
+        }
+
+        if (BITMAP_SCANLINE_PAD == 64)
+            gran *= 2;
+
+        if (!(area = xf86AllocateOffscreenArea(pScreen, w, h, gran, 0,
+                                               XAARemoveAreaCallback, NULL))) {
+            goto BAILOUT;
+        }
+
+        if (!(pLink = malloc(sizeof(PixmapLink)))) {
+            xf86FreeOffscreenArea(area);
+            goto BAILOUT;
+        }
+
+        XAA_SCREEN_PROLOGUE(pScreen, CreatePixmap);
+        pPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, depth, usage_hint);
+        XAA_SCREEN_EPILOGUE(pScreen, CreatePixmap, XAACreatePixmap);
+
+        if (!pPix) {
+            free(pLink);
+            xf86FreeOffscreenArea(area);
+            goto BAILOUT;
+        }
+
+        pScreenPix = (*pScreen->GetScreenPixmap) (pScreen);
+
+        pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);
+        pPix->drawable.x = area->box.x1;
+        pPix->drawable.y = area->box.y1;
+        pPix->drawable.width = w;
+        pPix->drawable.height = h;
+        pPix->drawable.bitsPerPixel = pScrn->bitsPerPixel;
+        pPix->devKind = pScreenPix->devKind;
+        pPix->devPrivate.ptr = pScreenPix->devPrivate.ptr;
+        area->devPrivate.ptr = pPix;
+
+        pPriv->flags = OFFSCREEN;
+        pPriv->offscreenArea = area;
+        pPriv->freeData = FALSE;
+
+        pLink->next = infoRec->OffscreenPixmaps;
+        pLink->pPix = pPix;
+        infoRec->OffscreenPixmaps = pLink;
+        return pPix;
+    }
+ BAILOUT:
+    XAA_SCREEN_PROLOGUE(pScreen, CreatePixmap);
+    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);
+    XAA_SCREEN_EPILOGUE(pScreen, CreatePixmap, XAACreatePixmap);
+
+    if (pPix) {
+        pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);
+        pPriv->flags = 0;
+        pPriv->offscreenArea = NULL;
+        pPriv->freeData = FALSE;
+        if (!w || !h)           /* either scratch or shared memory */
+            pPriv->flags |= SHARED_PIXMAP;
+    }
+
+    return pPix;
+}
+
+static Bool
+XAADestroyPixmap(PixmapPtr pPix)
+{
+    ScreenPtr pScreen = pPix->drawable.pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);
+    Bool ret;
+
+    if (pPix->refcnt == 1) {
+        if (pPriv->flags & OFFSCREEN) {
+            if (pPriv->flags & DGA_PIXMAP)
+                free(pPriv->offscreenArea);
+            else {
+                FBAreaPtr area = pPriv->offscreenArea;
+                PixmapLinkPtr pLink = infoRec->OffscreenPixmaps;
+                PixmapLinkPtr prev = NULL;
+
+                while (pLink->pPix != pPix) {
+                    prev = pLink;
+                    pLink = pLink->next;
+                }
+
+                if (prev)
+                    prev->next = pLink->next;
+                else
+                    infoRec->OffscreenPixmaps = pLink->next;
+
+                if (!area)
+                    area = pLink->area;
+
+                xf86FreeOffscreenArea(area);
+                pPriv->offscreenArea = NULL;
+                free(pLink);
+            }
+        }
+
+        if (pPriv->freeData) {  /* pixmaps that were once in video ram */
+            free(pPix->devPrivate.ptr);
+            pPix->devPrivate.ptr = NULL;
+        }
+    }
+
+    XAA_SCREEN_PROLOGUE(pScreen, DestroyPixmap);
+    ret = (*pScreen->DestroyPixmap) (pPix);
+    XAA_SCREEN_EPILOGUE(pScreen, DestroyPixmap, XAADestroyPixmap);
+
+    return ret;
+}
+
+static Bool
+XAAChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    Bool ret;
+
+    XAA_SCREEN_PROLOGUE(pScreen, ChangeWindowAttributes);
+    ret = (*pScreen->ChangeWindowAttributes) (pWin, mask);
+    XAA_SCREEN_EPILOGUE(pScreen, ChangeWindowAttributes,
+                        XAAChangeWindowAttributes);
+
+    /* we have to assume that shared memory pixmaps are dirty
+       because we can't wrap operations on them */
+
+    if ((mask & CWBackPixmap) && (pWin->backgroundState == BackgroundPixmap) &&
+        PIXMAP_IS_SHARED(pWin->background.pixmap)) {
+        XAAPixmapPtr pPixPriv = XAA_GET_PIXMAP_PRIVATE(pWin->background.pixmap);
+
+        pPixPriv->flags |= DIRTY;
+    }
+    if ((mask & CWBorderPixmap) && !(pWin->borderIsPixel) &&
+        PIXMAP_IS_SHARED(pWin->border.pixmap)) {
+        XAAPixmapPtr pPixPriv = XAA_GET_PIXMAP_PRIVATE(pWin->border.pixmap);
+
+        pPixPriv->flags |= DIRTY;
+    }
+
+    return ret;
+}
+
+/*  These two aren't really needed for anything */
+
+static Bool
+XAAEnterVT(int index, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[index];
+    Bool ret;
+    ScreenPtr pScreen = screenInfo.screens[index];
+    XAAScreenPtr pScreenPriv =
+        (XAAScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
+
+    pScrn->EnterVT = pScreenPriv->EnterVT;
+    ret = ((*pScreenPriv->EnterVT) (index, flags));
+    pScreenPriv->EnterVT = pScrn->EnterVT;
+    pScrn->EnterVT = XAAEnterVT;
+    return ret;
+}
+
+static void
+XAALeaveVT(int index, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[index];
+    ScreenPtr pScreen = screenInfo.screens[index];
+    XAAScreenPtr pScreenPriv =
+        (XAAScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
+    XAAInfoRecPtr infoRec = pScreenPriv->AccelInfoRec;
+
+    if (infoRec->NeedToSync) {
+        (*infoRec->Sync) (infoRec->pScrn);
+        infoRec->NeedToSync = FALSE;
+    }
+
+    pScrn->LeaveVT = pScreenPriv->LeaveVT;
+    (*pScreenPriv->LeaveVT) (index, flags);
+    pScreenPriv->LeaveVT = pScrn->LeaveVT;
+    pScrn->LeaveVT = XAALeaveVT;
+}
+
+typedef struct {
+    Bool UsingPixmapCache;
+    Bool CanDoColor8x8;
+    Bool CanDoMono8x8;
+} SavedCacheState, *SavedCacheStatePtr;
+
+static int
+XAASetDGAMode(int index, int num, DGADevicePtr devRet)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    XAAScreenPtr pScreenPriv =
+        (XAAScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
+    int ret;
+
+    if (!num && infoRec->dgaSaves) {    /* restore old pixmap cache state */
+        SavedCacheStatePtr state = (SavedCacheStatePtr) infoRec->dgaSaves;
+
+        infoRec->UsingPixmapCache = state->UsingPixmapCache;
+        infoRec->CanDoColor8x8 = state->CanDoColor8x8;
+        infoRec->CanDoMono8x8 = state->CanDoMono8x8;
+        free(infoRec->dgaSaves);
+        infoRec->dgaSaves = NULL;
+    }
+
+    ret = (*pScreenPriv->SetDGAMode) (index, num, devRet);
+    if (ret != Success)
+        return ret;
+
+    if (num && devRet->pPix) {  /* accelerate this pixmap */
+        XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(devRet->pPix);
+        FBAreaPtr area;
+
+        if ((area = malloc(sizeof(FBArea)))) {
+            area->pScreen = pScreen;
+            area->box.x1 = 0;
+            area->box.x2 = 0;
+            area->box.y1 = devRet->mode->pixmapWidth;
+            area->box.y2 = devRet->mode->pixmapHeight;
+            area->granularity = 0;
+            area->MoveAreaCallback = 0;
+            area->RemoveAreaCallback = 0;
+            area->devPrivate.ptr = 0;
+
+            pixPriv->flags |= OFFSCREEN | DGA_PIXMAP;
+            pixPriv->offscreenArea = area;
+
+            if (!infoRec->dgaSaves) {   /* save pixmap cache state */
+                SavedCacheStatePtr state = malloc(sizeof(SavedCacheState));
+
+                state->UsingPixmapCache = infoRec->UsingPixmapCache;
+                state->CanDoColor8x8 = infoRec->CanDoColor8x8;
+                state->CanDoMono8x8 = infoRec->CanDoMono8x8;
+                infoRec->dgaSaves = (char *) state;
+
+                infoRec->UsingPixmapCache = FALSE;
+                if (infoRec->PixmapCacheFlags & CACHE_MONO_8x8)
+                    infoRec->CanDoMono8x8 = FALSE;
+                if (infoRec->PixmapCacheFlags & CACHE_COLOR_8x8)
+                    infoRec->CanDoColor8x8 = FALSE;
+            }
+        }
+    }
+
+    return ret;
+}
+
+static void
+XAAEnableDisableFBAccess(int index, Bool enable)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    XAAScreenPtr pScreenPriv =
+        (XAAScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
+
+    if (!enable) {
+        if ((infoRec->Flags & OFFSCREEN_PIXMAPS) && (infoRec->OffscreenPixmaps))
+            XAAMoveOutOffscreenPixmaps(pScreen);
+        if (infoRec->Flags & PIXMAP_CACHE)
+            XAAInvalidatePixmapCache(pScreen);
+        SwitchedOut = TRUE;
+    }
+
+    (*pScreenPriv->EnableDisableFBAccess) (index, enable);
+
+    if (enable) {
+        if ((infoRec->Flags & OFFSCREEN_PIXMAPS) && (infoRec->OffscreenPixmaps))
+            XAAMoveInOffscreenPixmaps(pScreen);
+        SwitchedOut = FALSE;
+    }
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaInitAccel.c b/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
index d24599d48..2a85a1996 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
@@ -1,1498 +1,1571 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <string.h>

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xf86fbman.h"

-#include "servermd.h"

-

-/*

- * XAA Config options

- */

-

-typedef enum {

-    XAAOPT_SCREEN_TO_SCREEN_COPY,

-    XAAOPT_SOLID_FILL_RECT,

-    XAAOPT_SOLID_FILL_TRAP,

-    XAAOPT_SOLID_TWO_POINT_LINE,

-    XAAOPT_SOLID_BRESENHAM_LINE,

-    XAAOPT_SOLID_HORVERT_LINE,

-    XAAOPT_DASHED_TWO_POINT_LINE,

-    XAAOPT_DASHED_BRESENHAM_LINE,

-    XAAOPT_MONO_8x8_PATTERN_FILL_RECT,

-    XAAOPT_MONO_8x8_PATTERN_FILL_TRAP,

-    XAAOPT_COL_8x8_PATTERN_FILL_RECT,

-    XAAOPT_COL_8x8_PATTERN_FILL_TRAP,

-    XAAOPT_CPU_TO_SCREEN_COL_EXP_FILL,

-    XAAOPT_SCANLINE_CPU_TO_SCREEN_COL_EXP_FILL,

-    XAAOPT_SCREEN_TO_SCREEN_COL_EXP_FILL,

-    XAAOPT_IMAGE_WRITE_RECT,

-    XAAOPT_SCANLINE_IMAGE_WRITE_RECT,

-    XAAOPT_WRITE_BITMAP,

-    XAAOPT_WRITE_PIXMAP,

-    XAAOPT_PIXMAP_CACHE,

-    XAAOPT_OFFSCREEN_PIXMAPS,

-    XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE

-} XAAOpts;

-

-static const OptionInfoRec XAAOptions[] = {

-    {XAAOPT_SCREEN_TO_SCREEN_COPY,	"XaaNoScreenToScreenCopy",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_SOLID_FILL_RECT,		"XaaNoSolidFillRect",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_SOLID_FILL_TRAP,		"XaaNoSolidFillTrap",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_SOLID_TWO_POINT_LINE,	"XaaNoSolidTwoPointLine",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_SOLID_BRESENHAM_LINE,	"XaaNoSolidBresenhamLine",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_SOLID_HORVERT_LINE,		"XaaNoSolidHorVertLine",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_DASHED_TWO_POINT_LINE,	"XaaNoDashedTwoPointLine",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_DASHED_BRESENHAM_LINE,	"XaaNoDashedBresenhamLine",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_MONO_8x8_PATTERN_FILL_RECT,	"XaaNoMono8x8PatternFillRect",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_MONO_8x8_PATTERN_FILL_TRAP,	"XaaNoMono8x8PatternFillTrap",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_COL_8x8_PATTERN_FILL_RECT,	"XaaNoColor8x8PatternFillRect",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_COL_8x8_PATTERN_FILL_TRAP,	"XaaNoColor8x8PatternFillTrap",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_CPU_TO_SCREEN_COL_EXP_FILL,	"XaaNoCPUToScreenColorExpandFill",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_SCANLINE_CPU_TO_SCREEN_COL_EXP_FILL,"XaaNoScanlineCPUToScreenColorExpandFill",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_SCREEN_TO_SCREEN_COL_EXP_FILL,	"XaaNoScreenToScreenColorExpandFill",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_IMAGE_WRITE_RECT,		"XaaNoImageWriteRect",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_SCANLINE_IMAGE_WRITE_RECT,	"XaaNoScanlineImageWriteRect",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_WRITE_BITMAP,		"XaaNoWriteBitmap",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_WRITE_PIXMAP,		"XaaNoWritePixmap",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_PIXMAP_CACHE,		"XaaNoPixmapCache",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_OFFSCREEN_PIXMAPS,		"XaaNoOffscreenPixmaps",

-				OPTV_BOOLEAN,	{0}, FALSE },

-    {XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, "XaaOffscreenPixmaps",

-				OPTV_BOOLEAN,   {0}, FALSE },

-    { -1,				NULL,

-				OPTV_NONE,	{0}, FALSE }

-};

-

-static XF86ModuleVersionInfo xaaVersRec =

-{

-	"xaa",

-	MODULEVENDORSTRING,

-	MODINFOSTRING1,

-	MODINFOSTRING2,

-	XORG_VERSION_CURRENT,

-	XAA_VERSION_MAJOR,

-	XAA_VERSION_MINOR,

-	XAA_VERSION_RELEASE,

-	ABI_CLASS_VIDEODRV,		/* requires the video driver ABI */

-	ABI_VIDEODRV_VERSION,

-	MOD_CLASS_NONE,

-	{0,0,0,0}

-};

-

-_X_EXPORT XF86ModuleData xaaModuleData = { &xaaVersRec, NULL, NULL };

-

-Bool

-XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)

-{

-    int index = pScreen->myNum;

-    ScrnInfoPtr pScrn = xf86Screens[index];

-    Bool HaveScreenToScreenCopy = FALSE;

-    Bool HaveColorExpansion = FALSE;

-    Bool HaveScanlineColorExpansion = FALSE;

-    Bool HaveSolidFillRect = FALSE;

-    Bool HaveMono8x8PatternFillRect = FALSE;

-    Bool HaveColor8x8PatternFillRect = FALSE;

-    Bool HaveSolidFillTrap = FALSE;

-    Bool HaveMono8x8PatternFillTrap = FALSE;

-    Bool HaveColor8x8PatternFillTrap = FALSE;

-    Bool HaveSolidTwoPointLine = FALSE;

-    Bool HaveSolidBresenhamLine = FALSE;

-    Bool HaveSolidHorVertLine = FALSE;

-    Bool HaveDashedTwoPointLine = FALSE;

-    Bool HaveDashedBresenhamLine = FALSE;

-    Bool HaveImageWriteRect = FALSE;

-    Bool HaveScanlineImageWriteRect = FALSE;

-    Bool HaveScreenToScreenColorExpandFill = FALSE;

-    OptionInfoPtr options;

-    int is_shared = 0;

-    int i;

-

-    options = xnfalloc(sizeof(XAAOptions));

-    (void)memcpy(options, XAAOptions, sizeof(XAAOptions));

-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);

-

-    infoRec->pScrn = pScrn;

-    infoRec->NeedToSync = FALSE;

-

-    /* must have a Sync function */

-    if(!infoRec->Sync) return FALSE;

-    for(i = 0; i < pScrn->numEntities; i++) {

-        if(xf86IsEntityShared(pScrn->entityList[i])) is_shared = 1;

-    }

-   

-    /* If this PCI entity has IS_SHARED_ACCEL set in entityProp

-     * then a RestoreAccelState function is required

-     */

-    if(!infoRec->RestoreAccelState && is_shared) return FALSE;

-

-    if(infoRec->RestoreAccelState) {

-        if(!XAAInitStateWrap(pScreen, infoRec)) return FALSE;

-    }

-   

-    if (serverGeneration == 1)

-	xf86DrvMsg(index, X_INFO, 

-		"Using XFree86 Acceleration Architecture (XAA)\n");

-

-

-    /************** Low Level *************/

-

-    if(!infoRec->SetClippingRectangle || !infoRec->DisableClipping) {

-	infoRec->ClippingFlags = 0;

-	infoRec->SetClippingRectangle = NULL;

-	infoRec->DisableClipping = NULL;

-    }

-

-    /**** CopyArea ****/

-

-    if(infoRec->SetupForScreenToScreenCopy &&

-       infoRec->SubsequentScreenToScreenCopy &&

-       !xf86ReturnOptValBool(options, XAAOPT_SCREEN_TO_SCREEN_COPY, FALSE)) {

-	HaveScreenToScreenCopy = TRUE;

-    } else {

-	infoRec->ScreenToScreenCopyFlags = 0;

-	infoRec->SetupForScreenToScreenCopy = NULL;

-	infoRec->SubsequentScreenToScreenCopy = NULL;

-    }

-

-    /**** Solid Filled Rects ****/

-

-    if(infoRec->SetupForSolidFill && infoRec->SubsequentSolidFillRect &&

-       !xf86ReturnOptValBool(options, XAAOPT_SOLID_FILL_RECT, FALSE)) {

-		HaveSolidFillRect = TRUE;

-	if(infoRec->SubsequentSolidFillTrap &&

-	   !xf86ReturnOptValBool(options, XAAOPT_SOLID_FILL_TRAP, FALSE))

-		HaveSolidFillTrap = TRUE;

-	else

-		infoRec->SubsequentSolidFillTrap = NULL;

-    } else {

-	infoRec->SolidFillFlags = 0;

-	infoRec->SetupForSolidFill = NULL;

-	infoRec->SubsequentSolidFillRect = NULL;

-	infoRec->SubsequentSolidFillTrap = NULL;

-    }

-

-    /**** Solid lines ****/

-

-    if(infoRec->SetupForSolidLine) {

-	if(infoRec->SubsequentSolidTwoPointLine &&

-		!xf86ReturnOptValBool(options,

-		                      XAAOPT_SOLID_TWO_POINT_LINE, FALSE))

-	    HaveSolidTwoPointLine = TRUE;

-	if(infoRec->SubsequentSolidBresenhamLine &&

-		!xf86ReturnOptValBool(options, XAAOPT_SOLID_BRESENHAM_LINE, FALSE)) {

-	    HaveSolidBresenhamLine = TRUE;

-

-	    if(infoRec->SolidBresenhamLineErrorTermBits)

-		infoRec->SolidBresenhamLineErrorTermBits = 

-			~((1 << infoRec->SolidBresenhamLineErrorTermBits) - 1);

-	}

-

-	if(infoRec->SubsequentSolidHorVertLine &&

-		!xf86ReturnOptValBool(options,

-		                      XAAOPT_SOLID_HORVERT_LINE, FALSE))

-	    HaveSolidHorVertLine = TRUE;

-	else if(HaveSolidTwoPointLine) {

-	    infoRec->SubsequentSolidHorVertLine = 

-			XAASolidHorVertLineAsTwoPoint;

-	    HaveSolidHorVertLine = TRUE;

-	} else if(HaveSolidBresenhamLine) {

-	    infoRec->SubsequentSolidHorVertLine = 

-			XAASolidHorVertLineAsBresenham;

-	    HaveSolidHorVertLine = TRUE;

-	}

-    }

-

-    /* XXX Should this also check for XAAOPT_SOLID_HORVERT_LINE? */

-    if (!HaveSolidTwoPointLine &&

-	!HaveSolidBresenhamLine &&

-	!HaveSolidHorVertLine &&

-	HaveSolidFillRect) {

-	infoRec->SetupForSolidLine = infoRec->SetupForSolidFill;

-	infoRec->SubsequentSolidHorVertLine = XAASolidHorVertLineAsRects;

-	infoRec->SolidLineFlags = infoRec->SolidFillFlags;

-	HaveSolidHorVertLine = TRUE;

-    }

-

-    if (!HaveSolidTwoPointLine)

-	infoRec->SubsequentSolidTwoPointLine = NULL;

-    if (!HaveSolidBresenhamLine)

-	infoRec->SubsequentSolidBresenhamLine = NULL;

-    if (!HaveSolidHorVertLine)

-	infoRec->SubsequentSolidHorVertLine = NULL;

-

-    /* Disable all if nothing left over */

-    if (!HaveSolidTwoPointLine &&

-	!HaveSolidBresenhamLine &&

-	!HaveSolidHorVertLine) {

-	infoRec->SolidLineFlags = 0;

-	infoRec->SetupForSolidLine = NULL;

-    }

-

-    /**** 8x8 Mono Pattern Filled Rects ****/

-

-   if(infoRec->SetupForMono8x8PatternFill &&

-		infoRec->SubsequentMono8x8PatternFillRect &&

-		!xf86ReturnOptValBool(options,

-		                      XAAOPT_MONO_8x8_PATTERN_FILL_RECT,

-		                      FALSE)) {

-	HaveMono8x8PatternFillRect = TRUE;

-	if(infoRec->SubsequentMono8x8PatternFillTrap &&

-		!xf86ReturnOptValBool(options,

-		                      XAAOPT_MONO_8x8_PATTERN_FILL_TRAP,

-		                      FALSE))

-		HaveMono8x8PatternFillTrap = TRUE;

-

-        if(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_BITS) {

-	    infoRec->CanDoMono8x8 = TRUE;

-	} else {	/* others require caching */

-           int min_pitch;

-	   infoRec->PixmapCacheFlags |= CACHE_MONO_8x8;

-

-	   switch(pScrn->bitsPerPixel) {

-	   case 32: min_pitch = 2; break;

-	   case 24: min_pitch = 3; break;

-	   case 16: min_pitch = 4; break;

-	   default: min_pitch = 8; break;

-	   }

- 

-           if(min_pitch > infoRec->MonoPatternPitch)

-		infoRec->MonoPatternPitch = min_pitch;

-

-	   if(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN) {

-		if(!infoRec->CacheWidthMono8x8Pattern ||

-		   !infoRec->CacheHeightMono8x8Pattern) {

-			infoRec->CacheWidthMono8x8Pattern = 

-						infoRec->MonoPatternPitch;

-			infoRec->CacheHeightMono8x8Pattern = 1;

-		}

-	   } else {

-		int numPerLine = 128/infoRec->MonoPatternPitch;

-

-		if(!infoRec->CacheWidthMono8x8Pattern ||

-		   !infoRec->CacheHeightMono8x8Pattern) {

-			infoRec->CacheWidthMono8x8Pattern = 

-				numPerLine * infoRec->MonoPatternPitch;

-			infoRec->CacheHeightMono8x8Pattern = 

-				(64 + numPerLine - 1)/numPerLine;

-		}

-	   }

-	}

-   } else {

-	infoRec->Mono8x8PatternFillFlags = 0;

-	infoRec->SetupForMono8x8PatternFill = NULL;

-	infoRec->SubsequentMono8x8PatternFillRect = NULL;

-   }

-

-    /**** Dashed lines ****/

-

-    if(infoRec->SetupForDashedLine && infoRec->DashPatternMaxLength) {

-	if(infoRec->SubsequentDashedTwoPointLine &&

-		!xf86ReturnOptValBool(options, XAAOPT_DASHED_TWO_POINT_LINE,

-		                      FALSE))

-	    HaveDashedTwoPointLine = TRUE;

-	if(infoRec->SubsequentDashedBresenhamLine &&

-		!xf86ReturnOptValBool(options, XAAOPT_DASHED_BRESENHAM_LINE,

-		                      FALSE)) {

-	    HaveDashedBresenhamLine = TRUE;

-

-	    if(infoRec->DashedBresenhamLineErrorTermBits)

-		infoRec->DashedBresenhamLineErrorTermBits = 

-			~((1 << infoRec->DashedBresenhamLineErrorTermBits) - 1);

-	}

-    }

-

-    if (!HaveDashedTwoPointLine)

-	infoRec->SubsequentDashedTwoPointLine = NULL;

-    if (!HaveDashedBresenhamLine)

-	infoRec->SubsequentDashedBresenhamLine = NULL;

-

-    /* Disable all if nothing left over */

-    if (!HaveDashedTwoPointLine && !HaveDashedBresenhamLine) {

-	infoRec->DashedLineFlags = 0;

-	infoRec->SetupForDashedLine = NULL;

-    }

-

-    /**** 8x8 Color Pattern Filled Rects ****/

-

-   if(infoRec->SetupForColor8x8PatternFill &&

-      infoRec->SubsequentColor8x8PatternFillRect &&

-      !xf86ReturnOptValBool(options, XAAOPT_COL_8x8_PATTERN_FILL_RECT, FALSE)) {

-	HaveColor8x8PatternFillRect = TRUE;

-	if(infoRec->SubsequentColor8x8PatternFillTrap &&

-	   !xf86ReturnOptValBool(options, XAAOPT_COL_8x8_PATTERN_FILL_TRAP,

-	                         FALSE))

-		HaveColor8x8PatternFillTrap = TRUE;

-	else

-		infoRec->SubsequentColor8x8PatternFillTrap = NULL;

-

-	infoRec->PixmapCacheFlags |= CACHE_COLOR_8x8;

-

-	if(infoRec->Color8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN) {

-	    if(!infoRec->CacheWidthColor8x8Pattern ||

-	       !infoRec->CacheHeightColor8x8Pattern) {

-		infoRec->CacheWidthColor8x8Pattern = 64;

-		infoRec->CacheHeightColor8x8Pattern = 1;

-	    }

-	} else {

-	    if(!infoRec->CacheWidthColor8x8Pattern ||

-	       !infoRec->CacheHeightColor8x8Pattern) {

-		infoRec->CacheWidthColor8x8Pattern = 128;

-		infoRec->CacheHeightColor8x8Pattern = 8;

-	    }

-	}

-   } else {

-	infoRec->Color8x8PatternFillFlags = 0;

-	infoRec->SetupForColor8x8PatternFill = NULL;

-	infoRec->SubsequentColor8x8PatternFillRect = NULL;

-	infoRec->SubsequentColor8x8PatternFillTrap = NULL;

-   }

-

-    /**** Color Expansion ****/

-

-    if(infoRec->SetupForCPUToScreenColorExpandFill && 

-	infoRec->ColorExpandBase &&

-       	infoRec->SubsequentCPUToScreenColorExpandFill &&

-        !xf86ReturnOptValBool(options, XAAOPT_CPU_TO_SCREEN_COL_EXP_FILL,

-	                      FALSE)) {

-	int dwordsNeeded = pScrn->virtualX;

-

-	infoRec->ColorExpandRange >>= 2;	/* convert to DWORDS */

-	HaveColorExpansion = TRUE;	   

-

-	if(infoRec->CPUToScreenColorExpandFillFlags & 

-				LEFT_EDGE_CLIPPING_NEGATIVE_X)

-	    dwordsNeeded += 31;

-	dwordsNeeded = (dwordsNeeded + 31) >> 5;

-	if(dwordsNeeded > infoRec->ColorExpandRange)

-	   infoRec->CPUToScreenColorExpandFillFlags |= CPU_TRANSFER_BASE_FIXED;	

-    } else {

-	infoRec->CPUToScreenColorExpandFillFlags = 0;

-	infoRec->SetupForCPUToScreenColorExpandFill = NULL;

-	infoRec->SubsequentCPUToScreenColorExpandFill = NULL;

-    } 

-

-    /**** Scanline Color Expansion ****/

-  

-    if(infoRec->SetupForScanlineCPUToScreenColorExpandFill &&

-       infoRec->SubsequentScanlineCPUToScreenColorExpandFill &&

-       infoRec->SubsequentColorExpandScanline &&

-       infoRec->ScanlineColorExpandBuffers && 

-       (infoRec->NumScanlineColorExpandBuffers > 0) &&

-       !xf86ReturnOptValBool(options,

-                             XAAOPT_SCANLINE_CPU_TO_SCREEN_COL_EXP_FILL,

-                             FALSE)) {

-	HaveScanlineColorExpansion = TRUE;

-    } else {

-	infoRec->ScanlineCPUToScreenColorExpandFillFlags = 0;

-	infoRec->SetupForScanlineCPUToScreenColorExpandFill = NULL;

-	infoRec->SubsequentScanlineCPUToScreenColorExpandFill = NULL;

-	infoRec->SubsequentColorExpandScanline = NULL;

-    }

-

-    /**** Screen to Screen Color Expansion ****/

-

-    if(infoRec->SetupForScreenToScreenColorExpandFill &&

-       infoRec->SubsequentScreenToScreenColorExpandFill &&

-       !xf86ReturnOptValBool(options, XAAOPT_SCREEN_TO_SCREEN_COL_EXP_FILL,

-                             FALSE)) {

-	HaveScreenToScreenColorExpandFill = TRUE;

-	if (!infoRec->CacheColorExpandDensity)

-	    infoRec->CacheColorExpandDensity = 1;

-    } else {

-	infoRec->ScreenToScreenColorExpandFillFlags = 0;

-	infoRec->SetupForScreenToScreenColorExpandFill = NULL;

-	infoRec->SubsequentScreenToScreenColorExpandFill = NULL;

-    }

-    

-    /**** Image Writes ****/

-

-    if(infoRec->SetupForImageWrite && infoRec->ImageWriteBase &&

-       infoRec->SubsequentImageWriteRect &&

-       !xf86ReturnOptValBool(options, XAAOPT_IMAGE_WRITE_RECT, FALSE)) {

-

-	infoRec->ImageWriteRange >>= 2;	/* convert to DWORDS */

-	if(infoRec->ImageWriteFlags & CPU_TRANSFER_BASE_FIXED)

-	   infoRec->ImageWriteRange = 0;

-	HaveImageWriteRect = TRUE;	

-    } else {

-	infoRec->ImageWriteFlags = 0;

-	infoRec->SetupForImageWrite = NULL;

-	infoRec->SubsequentImageWriteRect = NULL;

-    } 

-

-    /**** Scanline Image Writes ****/

-  

-    if(infoRec->SetupForScanlineImageWrite &&

-       infoRec->SubsequentScanlineImageWriteRect &&

-       infoRec->SubsequentImageWriteScanline &&

-       infoRec->ScanlineImageWriteBuffers && 

-       (infoRec->NumScanlineImageWriteBuffers > 0) &&

-       !xf86ReturnOptValBool(options, XAAOPT_SCANLINE_IMAGE_WRITE_RECT,

-                             FALSE)) {

-	HaveScanlineImageWriteRect = TRUE;

-    } else {

-	infoRec->ScanlineImageWriteFlags = 0;

-	infoRec->SetupForScanlineImageWrite = NULL;

-	infoRec->SubsequentScanlineImageWriteRect = NULL;

-	infoRec->SubsequentImageWriteScanline = NULL;

-    }

-

-#ifndef __i386__

-   /* XAA makes some unaligned accesses when clipping is not available */

-#  define CLIP_FLAGS (LEFT_EDGE_CLIPPING | LEFT_EDGE_CLIPPING_NEGATIVE_X)

-   if(HaveImageWriteRect &&

-      ((infoRec->ImageWriteFlags & CLIP_FLAGS) != CLIP_FLAGS))

-   {

-        HaveImageWriteRect = FALSE;

-   }

-   if(HaveScanlineImageWriteRect &&

-      ((infoRec->ScanlineImageWriteFlags & CLIP_FLAGS) != CLIP_FLAGS))

-   {

-        HaveScanlineImageWriteRect = FALSE;

-   }

-#endif

-

-    if (serverGeneration == 1) {

-	if(HaveScreenToScreenCopy)

-	    xf86ErrorF("\tScreen to screen bit blits\n");

-	if(HaveSolidFillRect)

-	    xf86ErrorF("\tSolid filled rectangles\n");

-	if(HaveSolidFillTrap)

-	    xf86ErrorF("\tSolid filled trapezoids\n");

-	if(HaveMono8x8PatternFillRect)

-	    xf86ErrorF("\t8x8 mono pattern filled rectangles\n");

-	if(HaveMono8x8PatternFillTrap)

-	    xf86ErrorF("\t8x8 mono pattern filled trapezoids\n");

-	if(HaveColor8x8PatternFillRect)

-	    xf86ErrorF("\t8x8 color pattern filled rectangles\n");

-	if(HaveColor8x8PatternFillTrap)

-	    xf86ErrorF("\t8x8 color pattern filled trapezoids\n");

-

-	if(HaveColorExpansion)

-	    xf86ErrorF("\tCPU to Screen color expansion\n");

-	else if(HaveScanlineColorExpansion)

-	    xf86ErrorF("\tIndirect CPU to Screen color expansion\n");

-

-	if(HaveScreenToScreenColorExpandFill)

-	    xf86ErrorF("\tScreen to Screen color expansion\n");

-

-	if(HaveSolidTwoPointLine || HaveSolidBresenhamLine)

-	    xf86ErrorF("\tSolid Lines\n");

-	else if(HaveSolidHorVertLine)

-	    xf86ErrorF("\tSolid Horizontal and Vertical Lines\n");

-

-	if(HaveDashedTwoPointLine || HaveDashedBresenhamLine)

-	    xf86ErrorF("\tDashed Lines\n");

-

-	if(HaveImageWriteRect)

-	    xf86ErrorF("\tImage Writes\n");

-	else if(HaveScanlineImageWriteRect)

-	    xf86ErrorF("\tScanline Image Writes\n");

-

-    }

-

-#define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)

-

-    if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&

-		xf86ReturnOptValBool(options,

-				     XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE,

-				     FALSE))

-    {

-	XAAMSG("\tOffscreen Pixmaps\n");

-    } else {

-	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;

-    }

-

-

-    /************** Mid Level *************/

-

-    /**** ScreenToScreenBitBlt ****/

-

-    if(infoRec->ScreenToScreenBitBlt) {

-	XAAMSG("\tDriver provided ScreenToScreenBitBlt replacement\n");

-    } else if(HaveScreenToScreenCopy) {

-	infoRec->ScreenToScreenBitBlt = XAAScreenToScreenBitBlt;

-	infoRec->ScreenToScreenBitBltFlags = infoRec->ScreenToScreenCopyFlags;

-    }

-

-    /**** FillSolidRects ****/

-

-    if(infoRec->FillSolidRects) {

-	XAAMSG("\tDriver provided FillSolidRects replacement\n");

-    } else if(HaveSolidFillRect) {

-	infoRec->FillSolidRects = XAAFillSolidRects;

-	infoRec->FillSolidRectsFlags = infoRec->SolidFillFlags;

-    }

-

-    /**** FillSolidSpans ****/

-

-    if(infoRec->FillSolidSpans) {

-	XAAMSG("\tDriver provided FillSolidSpans replacement\n");

-    } else if(HaveSolidFillRect) {

-	infoRec->FillSolidSpans = XAAFillSolidSpans;

-	infoRec->FillSolidSpansFlags = infoRec->SolidFillFlags;

-    }

-

-    /**** FillMono8x8PatternRects ****/

-

-    if(infoRec->FillMono8x8PatternRects) {

-	XAAMSG("\tDriver provided FillMono8x8PatternRects replacement\n");

-    } else if(HaveMono8x8PatternFillRect) {

-	infoRec->FillMono8x8PatternRects = 

-	  (infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_SCREEN_ORIGIN) ?

-	  XAAFillMono8x8PatternRectsScreenOrigin :

-	  XAAFillMono8x8PatternRects; 

-

-	infoRec->FillMono8x8PatternRectsFlags = 

-			infoRec->Mono8x8PatternFillFlags;      

-    }

-

-    /**** FillMono8x8PatternSpans ****/

-

-    if(infoRec->FillMono8x8PatternSpans) {

-	XAAMSG("\tDriver provided FillMono8x8PatternSpans replacement\n");

-    } else if(HaveMono8x8PatternFillRect) {

-	infoRec->FillMono8x8PatternSpans = 

-	  (infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_SCREEN_ORIGIN) ?

-	  XAAFillMono8x8PatternSpansScreenOrigin:

-	  XAAFillMono8x8PatternSpans; 

-

-	infoRec->FillMono8x8PatternSpansFlags = 

-		infoRec->Mono8x8PatternFillFlags;      

-    }

-

-    /**** FillColor8x8Rects ****/

-

-    if(infoRec->FillColor8x8PatternRects) {

-	XAAMSG("\tDriver provided FillColor8x8PatternRects replacement\n");

-    } else if(HaveColor8x8PatternFillRect) {

-	infoRec->FillColor8x8PatternRects = 

-	  (infoRec->Color8x8PatternFillFlags & HARDWARE_PATTERN_SCREEN_ORIGIN) ?

-	  XAAFillColor8x8PatternRectsScreenOrigin :

-	  XAAFillColor8x8PatternRects; 

-

-	infoRec->FillColor8x8PatternRectsFlags = 

-			infoRec->Color8x8PatternFillFlags;      

-    }

-

-    /**** FillColor8x8Spans ****/

-

-    if(infoRec->FillColor8x8PatternSpans) {

-	XAAMSG("\tDriver provided FillColor8x8PatternSpans replacement\n");

-    } else if(HaveColor8x8PatternFillRect) {

-	infoRec->FillColor8x8PatternSpans = 

-	  (infoRec->Color8x8PatternFillFlags & HARDWARE_PATTERN_SCREEN_ORIGIN) ?

-	  XAAFillColor8x8PatternSpansScreenOrigin:

-	  XAAFillColor8x8PatternSpans; 

-

-	infoRec->FillColor8x8PatternSpansFlags = 

-		infoRec->Color8x8PatternFillFlags;      

-    }

-

-    /**** FillCacheBltRects ****/

-

-    if(infoRec->FillCacheBltRects) {

-	XAAMSG("\tDriver provided FillCacheBltRects replacement\n");

-    } else if(HaveScreenToScreenCopy) {

-	infoRec->FillCacheBltRects = XAAFillCacheBltRects;

-	infoRec->FillCacheBltRectsFlags = infoRec->ScreenToScreenCopyFlags;     

-    }

-

-    /**** FillCacheBltSpans ****/

-

-    if(infoRec->FillCacheBltSpans) {

-	XAAMSG("\tDriver provided FillCacheBltSpans replacement\n");

-    } else if(HaveScreenToScreenCopy) {

-	infoRec->FillCacheBltSpans = XAAFillCacheBltSpans;

-	infoRec->FillCacheBltSpansFlags = infoRec->ScreenToScreenCopyFlags;     

-    }

-

-    /**** FillCacheExpandRects ****/

-

-    if(infoRec->FillCacheExpandRects) {

-	XAAMSG("\tDriver provided FillCacheExpandRects replacement\n");

-    } else if(HaveScreenToScreenColorExpandFill) {

-	infoRec->FillCacheExpandRects = XAAFillCacheExpandRects;

-	infoRec->FillCacheExpandRectsFlags = 

-		infoRec->ScreenToScreenColorExpandFillFlags;     

-    }

-   	

-    /**** FillCacheExpandSpans ****/

-

-    if(infoRec->FillCacheExpandSpans) {

-	XAAMSG("\tDriver provided FillCacheExpandSpans replacement\n");

-    } else if(HaveScreenToScreenColorExpandFill) {

-	infoRec->FillCacheExpandSpans = XAAFillCacheExpandSpans;

-	infoRec->FillCacheExpandSpansFlags = 

-		infoRec->ScreenToScreenColorExpandFillFlags;     

-    }

-

-    /**** FillColorExpandRects ****/

-

-    if(infoRec->FillColorExpandRects) {

-	XAAMSG("\tDriver provided FillColorExpandRects replacement\n");

-    } else if(HaveColorExpansion) {

-	if (infoRec->CPUToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) {

-	    if(infoRec->CPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST) {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->FillColorExpandRects = 

-			XAAFillColorExpandRects3MSBFirstFixedBase;

-		else

-		    infoRec->FillColorExpandRects = 

-			XAAFillColorExpandRects3MSBFirst;

-	    } else {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->FillColorExpandRects = 

-			XAAFillColorExpandRects3LSBFirstFixedBase;

-		else

-		    infoRec->FillColorExpandRects = 

-			XAAFillColorExpandRects3LSBFirst;

-	    }

-	} else {

-	    if(infoRec->CPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST) {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->FillColorExpandRects = 

-			XAAFillColorExpandRectsMSBFirstFixedBase;

-		else

-		    infoRec->FillColorExpandRects = 

-				XAAFillColorExpandRectsMSBFirst;

-	    } else {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->FillColorExpandRects = 

-			XAAFillColorExpandRectsLSBFirstFixedBase;

-		else

-		    infoRec->FillColorExpandRects = 

-			XAAFillColorExpandRectsLSBFirst;

-	    }

-	}

-	infoRec->FillColorExpandRectsFlags = 

-	    infoRec->CPUToScreenColorExpandFillFlags;

-    } else if(HaveScanlineColorExpansion) {

-	if (infoRec->ScanlineCPUToScreenColorExpandFillFlags & 

-					TRIPLE_BITS_24BPP) {

-	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST)

-		infoRec->FillColorExpandRects = 

-		    XAAFillScanlineColorExpandRects3MSBFirst;

-	    else

-		infoRec->FillColorExpandRects = 

-		    XAAFillScanlineColorExpandRects3LSBFirst;

-	} else {

-	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST)

-		infoRec->FillColorExpandRects = 

-		    XAAFillScanlineColorExpandRectsMSBFirst;

-	    else

-		infoRec->FillColorExpandRects = 

-		    XAAFillScanlineColorExpandRectsLSBFirst;

-	}

-	infoRec->FillColorExpandRectsFlags =

-	    infoRec->ScanlineCPUToScreenColorExpandFillFlags;

-    }

-

-    /**** FillColorExpandSpans ****/

-

-    if(infoRec->FillColorExpandSpans) {

-	XAAMSG("\tDriver provided FillColorExpandSpans replacement\n");

-    } else if(HaveColorExpansion) {

-	if (infoRec->CPUToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) {

-	    if(infoRec->CPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST) {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->FillColorExpandSpans = 

-			XAAFillColorExpandSpans3MSBFirstFixedBase;

-		else

-		    infoRec->FillColorExpandSpans = 

-			XAAFillColorExpandSpans3MSBFirst;

-	    } else {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->FillColorExpandSpans = 

-			XAAFillColorExpandSpans3LSBFirstFixedBase;

-		else

-		    infoRec->FillColorExpandSpans = 

-			XAAFillColorExpandSpans3LSBFirst;

-	    }

-	} else {

-	    if(infoRec->CPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST) {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->FillColorExpandSpans = 

-			XAAFillColorExpandSpansMSBFirstFixedBase;

-		else

-		    infoRec->FillColorExpandSpans = 

-				XAAFillColorExpandSpansMSBFirst;

-	    } else {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->FillColorExpandSpans = 

-			XAAFillColorExpandSpansLSBFirstFixedBase;

-		else

-		    infoRec->FillColorExpandSpans = 

-			XAAFillColorExpandSpansLSBFirst;

-	    }

-	}

-	infoRec->FillColorExpandSpansFlags = 

-	    infoRec->CPUToScreenColorExpandFillFlags;

-    } else if(HaveScanlineColorExpansion) {

-	if (infoRec->ScanlineCPUToScreenColorExpandFillFlags & 

-					TRIPLE_BITS_24BPP) {

-	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST)

-		infoRec->FillColorExpandSpans = 

-		    XAAFillScanlineColorExpandSpans3MSBFirst;

-	    else

-		infoRec->FillColorExpandSpans = 

-		    XAAFillScanlineColorExpandSpans3LSBFirst;

-	} else {

-	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST)

-		infoRec->FillColorExpandSpans = 

-		    XAAFillScanlineColorExpandSpansMSBFirst;

-	    else

-		infoRec->FillColorExpandSpans = 

-		    XAAFillScanlineColorExpandSpansLSBFirst;

-	}

-	infoRec->FillColorExpandSpansFlags =

-	    infoRec->ScanlineCPUToScreenColorExpandFillFlags;

-    }

-

-    /**** FillImageWriteRects ****/

-

-    if(infoRec->FillImageWriteRects) {

-	XAAMSG("\tDriver provided FillImageWriteRects replacement\n");

-    } else if(HaveImageWriteRect && 

-		(infoRec->ImageWriteFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) &&

-		(infoRec->ImageWriteFlags & LEFT_EDGE_CLIPPING)) {

-	infoRec->FillImageWriteRects = XAAFillImageWriteRects;

-	infoRec->FillImageWriteRectsFlags = infoRec->ImageWriteFlags;     

-    }

-

-    /**** WriteBitmap ****/

-

-    if(infoRec->WriteBitmap && 

-      !xf86ReturnOptValBool(options, XAAOPT_WRITE_BITMAP, FALSE)) {

-	XAAMSG("\tDriver provided WriteBitmap replacement\n");

-    } else if(HaveColorExpansion) {

-	if (infoRec->CPUToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) {

-	    if(infoRec->CPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST) {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->WriteBitmap = 

-			XAAWriteBitmapColorExpand3MSBFirstFixedBase;

-		else

-		    infoRec->WriteBitmap = XAAWriteBitmapColorExpand3MSBFirst;

-	    } else {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->WriteBitmap = 

-			XAAWriteBitmapColorExpand3LSBFirstFixedBase;

-		else

-		    infoRec->WriteBitmap = XAAWriteBitmapColorExpand3LSBFirst;

-	    }

-	} else {

-	    if(infoRec->CPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST) {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->WriteBitmap = 

-			XAAWriteBitmapColorExpandMSBFirstFixedBase;

-		else

-		    infoRec->WriteBitmap = XAAWriteBitmapColorExpandMSBFirst;

-	    } else {

-		if(infoRec->CPUToScreenColorExpandFillFlags & 

-					CPU_TRANSFER_BASE_FIXED)

-		    infoRec->WriteBitmap = 

-			XAAWriteBitmapColorExpandLSBFirstFixedBase;

-		else

-		    infoRec->WriteBitmap = XAAWriteBitmapColorExpandLSBFirst;

-	    }

-	}

-	infoRec->WriteBitmapFlags = infoRec->CPUToScreenColorExpandFillFlags;

-    } else if(HaveScanlineColorExpansion) {

-	if (infoRec->ScanlineCPUToScreenColorExpandFillFlags &

-					TRIPLE_BITS_24BPP) {

-	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST)

-		infoRec->WriteBitmap = 

-		    XAAWriteBitmapScanlineColorExpand3MSBFirst;

-	    else

-		infoRec->WriteBitmap = 

-		    XAAWriteBitmapScanlineColorExpand3LSBFirst;

-	} else {

-	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 

-					BIT_ORDER_IN_BYTE_MSBFIRST)

-		infoRec->WriteBitmap = 

-		    XAAWriteBitmapScanlineColorExpandMSBFirst;

-	    else

-		infoRec->WriteBitmap = 

-		    XAAWriteBitmapScanlineColorExpandLSBFirst;

-	}

-	infoRec->WriteBitmapFlags =

-		infoRec->ScanlineCPUToScreenColorExpandFillFlags;

-    } else

-	infoRec->WriteBitmap = NULL;

-

-    /**** TE Glyphs ****/

-

-    if (infoRec->TEGlyphRenderer) {

-	XAAMSG("\tDriver provided TEGlyphRenderer replacement\n");

-    } else if (HaveColorExpansion) {

-	infoRec->TEGlyphRendererFlags =

-	    infoRec->CPUToScreenColorExpandFillFlags;

-

-	if (infoRec->TEGlyphRendererFlags & TRIPLE_BITS_24BPP) {

-	    if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {

-		if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)

-		    infoRec->TEGlyphRenderer =

-			XAATEGlyphRenderer3MSBFirstFixedBase;

-		else

-		    infoRec->TEGlyphRenderer = XAATEGlyphRenderer3MSBFirst;

-	    } else {

-		if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)

-		    infoRec->TEGlyphRenderer =

-			XAATEGlyphRenderer3LSBFirstFixedBase;

-		else

-		    infoRec->TEGlyphRenderer = XAATEGlyphRenderer3LSBFirst;

-	    }

-

-	    if (!HaveSolidFillRect &&

-		(infoRec->TEGlyphRendererFlags & RGB_EQUAL)) {

-		infoRec->TEGlyphRendererFlags &= ~RGB_EQUAL;

-		XAAMSG("WARNING:  TEGlyphRenderer cannot support RGB_EQUAL"

-		       " without solid fills\n");

-	    }

-	} else {

-	    if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {

-		if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)

-		    infoRec->TEGlyphRenderer =

-			XAATEGlyphRendererMSBFirstFixedBase;

-		else

-		    infoRec->TEGlyphRenderer = XAATEGlyphRendererMSBFirst;

-	    } else {

-		if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)

-		    infoRec->TEGlyphRenderer =

-			XAATEGlyphRendererLSBFirstFixedBase;

-		else

-		    infoRec->TEGlyphRenderer = XAATEGlyphRendererLSBFirst;

-	    }

-	}

-

-	if (!HaveSolidFillRect &&

-	    (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {

-	    infoRec->TEGlyphRendererFlags &= ~TRANSPARENCY_ONLY;

-	    XAAMSG("WARNING:  TEGlyphRenderer cannot support TRANPARENCY_ONLY"

-		   " without solid fills\n");

-	}

-

-    } else if (HaveScanlineColorExpansion) {

-	infoRec->TEGlyphRendererFlags =

-	    infoRec->ScanlineCPUToScreenColorExpandFillFlags;

-

-	if (infoRec->TEGlyphRendererFlags & TRIPLE_BITS_24BPP) {

-	    if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST)

-		infoRec->TEGlyphRenderer = XAATEGlyphRendererScanline3MSBFirst;

-	    else

-		infoRec->TEGlyphRenderer = XAATEGlyphRendererScanline3LSBFirst;

-

-	    if (!HaveSolidFillRect &&

-		(infoRec->TEGlyphRendererFlags & RGB_EQUAL)) {

-		infoRec->TEGlyphRendererFlags &= ~RGB_EQUAL;

-		XAAMSG("WARNING:  TEGlyphRenderer cannot support RGB_EQUAL"

-		       " without solid fills\n");

-	    }

-	} else {

-	    if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST)

-		infoRec->TEGlyphRenderer = XAATEGlyphRendererScanlineMSBFirst;

-	    else

-		infoRec->TEGlyphRenderer = XAATEGlyphRendererScanlineLSBFirst;

-	}

-

-	if (!HaveSolidFillRect &&

-	    (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {

-	    infoRec->TEGlyphRendererFlags &= ~TRANSPARENCY_ONLY;

-	    XAAMSG("WARNING:  TEGlyphRenderer cannot support TRANPARENCY_ONLY"

-		   " without solid fills\n");

-	}

-    }

-

-    /**** NonTE Glyphs ****/

-

-    if(infoRec->NonTEGlyphRenderer) {

-	XAAMSG("\tDriver provided NonTEGlyphRenderer replacement\n");

-    } else if(infoRec->WriteBitmap && 

-	!(infoRec->WriteBitmapFlags & NO_TRANSPARENCY)) {

-	infoRec->NonTEGlyphRenderer = XAANonTEGlyphRenderer;

-	infoRec->NonTEGlyphRendererFlags = infoRec->WriteBitmapFlags;

-    }

-

-    /**** WritePixmap ****/

-

-    if(infoRec->WritePixmap &&

-      !xf86ReturnOptValBool(options, XAAOPT_WRITE_PIXMAP, FALSE)) {

-	XAAMSG("\tDriver provided WritePixmap replacement\n");

-    } else if(HaveImageWriteRect) {

-	infoRec->WritePixmap = XAAWritePixmap;

-	infoRec->WritePixmapFlags = 

-		infoRec->ImageWriteFlags | CONVERT_32BPP_TO_24BPP;

-    } else if(HaveScanlineImageWriteRect) {

-	infoRec->WritePixmap = XAAWritePixmapScanline;

-	infoRec->WritePixmapFlags = infoRec->ScanlineImageWriteFlags;

-    } else

-	infoRec->WritePixmap = NULL;

-

-    /**** ReadPixmap ****/

-

-    if(infoRec->ReadPixmap) {

-	XAAMSG("\tDriver provided ReadPixmap replacement\n");

-    } 

-

-

-    /************** GC Level *************/

-

-    /**** CopyArea ****/

-

-    if(infoRec->CopyArea) {

-	XAAMSG("\tDriver provided GC level CopyArea replacement\n");

-    } else if(infoRec->ScreenToScreenBitBlt) {

-	infoRec->CopyArea = XAACopyArea;

-	infoRec->CopyAreaFlags = infoRec->ScreenToScreenBitBltFlags;

-

-	/* most GC level primitives use one mid-level primitive so

-	   the GC level primitive gets the mid-level primitive flag

-	   and we use that at GC validation time.  But CopyArea uses

-	   more than one mid-level primitive so we have to essentially

-	   do a GC validation every time that primitive is used.

-	   The CopyAreaFlags would only be used for filtering out the

-	   common denominators.  Here we assume that if you don't do

-	   ScreenToScreenBitBlt you aren't going to do the others.

-	   We also assume that ScreenToScreenBitBlt has the least

-	   restrictions. */

-    }

-

-    if(infoRec->CopyPlane) {

-	XAAMSG("\tDriver provided GC level CopyPlane replacement\n");

-    } else if(infoRec->WriteBitmap && 

-		!(infoRec->WriteBitmapFlags & TRANSPARENCY_ONLY)) {

-	infoRec->CopyPlane = XAACopyPlaneColorExpansion;

-	infoRec->CopyPlaneFlags = infoRec->WriteBitmapFlags;

-    }

-

-    if(infoRec->PushPixelsSolid) {

-	XAAMSG("\tDriver provided GC level PushPixelsSolid replacement\n");

-    } else if(infoRec->WriteBitmap &&

-		!(infoRec->WriteBitmapFlags & NO_TRANSPARENCY)) {

-	infoRec->PushPixelsSolid = XAAPushPixelsSolidColorExpansion;

-	infoRec->PushPixelsFlags = infoRec->WriteBitmapFlags;

-    }

-

-    if(infoRec->FillSolidRects) {

-	if(!infoRec->PolyFillRectSolid) {

-	    infoRec->PolyFillRectSolid = XAAPolyFillRect;

-	    infoRec->PolyFillRectSolidFlags = infoRec->FillSolidRectsFlags;

-	}

-    }

-    if(infoRec->FillSolidSpans) {

-	if(!infoRec->FillSpansSolid) {

-	    infoRec->FillSpansSolid = XAAFillSpans;

-	    infoRec->FillSpansSolidFlags = infoRec->FillSolidSpansFlags;

-	}

-    }

-

-    if(infoRec->FillMono8x8PatternRects || infoRec->FillColor8x8PatternRects ||

-	infoRec->FillCacheBltRects || infoRec->FillColorExpandRects ||

-	infoRec->FillCacheExpandRects) {

-	if(!infoRec->PolyFillRectStippled) {

-

-	    infoRec->PolyFillRectStippled = XAAPolyFillRect;

-	    infoRec->PolyFillRectStippledFlags = 0;

-	}

-    }

-

-    if(infoRec->FillMono8x8PatternSpans || infoRec->FillColor8x8PatternSpans ||

-	infoRec->FillCacheBltSpans || infoRec->FillColorExpandSpans ||

-	infoRec->FillCacheExpandSpans) {

-	if(!infoRec->FillSpansStippled) {

-

-	    infoRec->FillSpansStippled = XAAFillSpans;

-	    infoRec->FillSpansStippledFlags = 0;

-	}

-    }

-

-    if(infoRec->FillMono8x8PatternRects || infoRec->FillColor8x8PatternRects ||

-	infoRec->FillCacheBltRects || infoRec->FillColorExpandRects ||

-	infoRec->FillCacheExpandRects) {

-	if(!infoRec->PolyFillRectOpaqueStippled) {

-

-	    infoRec->PolyFillRectOpaqueStippled = XAAPolyFillRect;

-	    infoRec->PolyFillRectOpaqueStippledFlags = 0;

-	}

-    }

-

-    if(infoRec->FillMono8x8PatternSpans || infoRec->FillColor8x8PatternSpans ||

-	infoRec->FillCacheBltSpans || infoRec->FillColorExpandSpans ||

-	infoRec->FillCacheExpandSpans) {

-	if(!infoRec->FillSpansOpaqueStippled) {

-

-	    infoRec->FillSpansOpaqueStippled = XAAFillSpans;

-	    infoRec->FillSpansOpaqueStippledFlags = 0;

-	}

-    }

-

-    if(infoRec->FillMono8x8PatternRects || infoRec->FillColor8x8PatternRects ||

-	infoRec->FillCacheBltRects || infoRec->FillImageWriteRects) {

-	if(!infoRec->PolyFillRectTiled) {

-

-	    infoRec->PolyFillRectTiled = XAAPolyFillRect;

-	    infoRec->PolyFillRectTiledFlags = 0;

-	}

-    }

-

-    if(infoRec->FillMono8x8PatternSpans || infoRec->FillColor8x8PatternSpans ||

-	infoRec->FillCacheBltSpans) {

-	if(!infoRec->FillSpansTiled) {

-

-	    infoRec->FillSpansTiled = XAAFillSpans;

-	    infoRec->FillSpansTiledFlags = 0;

-	}

-    }

-

-    if(infoRec->TEGlyphRenderer &&

-	!(infoRec->TEGlyphRendererFlags & NO_TRANSPARENCY)) {

-

-	if(!infoRec->PolyText8TE) {

-	    infoRec->PolyText8TE = XAAPolyText8TEColorExpansion;

-	    infoRec->PolyText8TEFlags = infoRec->TEGlyphRendererFlags;

-	}

-

-	if(!infoRec->PolyText16TE) {

-	    infoRec->PolyText16TE = XAAPolyText16TEColorExpansion;

-	    infoRec->PolyText16TEFlags = infoRec->TEGlyphRendererFlags;

-	}

-

-	if(!infoRec->PolyGlyphBltTE) {

-	    infoRec->PolyGlyphBltTE = XAAPolyGlyphBltTEColorExpansion;

-	    infoRec->PolyGlyphBltTEFlags = infoRec->TEGlyphRendererFlags;

-	}

-    }

-

-    if(infoRec->TEGlyphRenderer &&

-	!(infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {

-

-	if(!infoRec->ImageText8TE) {

-	    infoRec->ImageText8TE = XAAImageText8TEColorExpansion;

-	    infoRec->ImageText8TEFlags = infoRec->TEGlyphRendererFlags;

-	}

-

-	if(!infoRec->ImageText16TE) {

-	    infoRec->ImageText16TE = XAAImageText16TEColorExpansion;

-	    infoRec->ImageText16TEFlags = infoRec->TEGlyphRendererFlags;

-	}

-

-	if(!infoRec->ImageGlyphBltTE) {

-	    infoRec->ImageGlyphBltTE = XAAImageGlyphBltTEColorExpansion;

-	    infoRec->ImageGlyphBltTEFlags = infoRec->TEGlyphRendererFlags;

-	}

-    }

-

-    if(infoRec->NonTEGlyphRenderer) {

-	if(!infoRec->PolyText8NonTE) {

-	    infoRec->PolyText8NonTE = XAAPolyText8NonTEColorExpansion;

-	    infoRec->PolyText8NonTEFlags = infoRec->NonTEGlyphRendererFlags;

-	}

-

-	if(!infoRec->PolyText16NonTE) {

-	    infoRec->PolyText16NonTE = XAAPolyText16NonTEColorExpansion;

-	    infoRec->PolyText16NonTEFlags = infoRec->NonTEGlyphRendererFlags;

-	}

-	if(!infoRec->PolyGlyphBltNonTE) {

-	    infoRec->PolyGlyphBltNonTE = XAAPolyGlyphBltNonTEColorExpansion;

-	    infoRec->PolyGlyphBltNonTEFlags = infoRec->NonTEGlyphRendererFlags;

-	}

-    }

-

-    if(infoRec->NonTEGlyphRenderer && HaveSolidFillRect) {

-	if(!infoRec->ImageText8NonTE) {

-	    infoRec->ImageText8NonTE = XAAImageText8NonTEColorExpansion;

-	    infoRec->ImageText8NonTEFlags = infoRec->NonTEGlyphRendererFlags;

-	}

-

-	if(!infoRec->ImageText16NonTE) {

-	    infoRec->ImageText16NonTE = XAAImageText16NonTEColorExpansion;

-	    infoRec->ImageText16NonTEFlags = infoRec->NonTEGlyphRendererFlags;

-	}

-

-	if(!infoRec->ImageGlyphBltNonTE) {

-	    infoRec->ImageGlyphBltNonTE = XAAImageGlyphBltNonTEColorExpansion;

-	    infoRec->ImageGlyphBltNonTEFlags = infoRec->NonTEGlyphRendererFlags;

-	}

-    }

-

-    if(!infoRec->PolyRectangleThinSolid && HaveSolidHorVertLine) {

-	infoRec->PolyRectangleThinSolid = XAAPolyRectangleThinSolid;

-	infoRec->PolyRectangleThinSolidFlags = infoRec->SolidLineFlags;

-    }

-

-    if(!infoRec->FillPolygonSolid && HaveSolidFillRect) {

-	infoRec->FillPolygonSolid = XAAFillPolygonSolid;

-	infoRec->FillPolygonSolidFlags = infoRec->SolidFillFlags;

-    }

-

-    if(!infoRec->FillPolygonStippled && (HaveMono8x8PatternFillRect || 	

-	HaveScreenToScreenColorExpandFill || HaveScreenToScreenCopy)) {

-	infoRec->FillPolygonStippled = XAAFillPolygonStippled;

-	infoRec->FillPolygonStippledFlags = infoRec->SolidFillFlags;

-    }

-

-    if(!infoRec->FillPolygonOpaqueStippled && (HaveMono8x8PatternFillRect || 	

-	HaveScreenToScreenColorExpandFill || HaveScreenToScreenCopy)) {

-	infoRec->FillPolygonOpaqueStippled = XAAFillPolygonStippled;

-	infoRec->FillPolygonOpaqueStippledFlags = infoRec->SolidFillFlags;

-    }

-

-    if(!infoRec->FillPolygonTiled && (HaveMono8x8PatternFillRect || 	

-	HaveScreenToScreenColorExpandFill || HaveScreenToScreenCopy)) {

-	infoRec->FillPolygonTiled = XAAFillPolygonTiled;

-	infoRec->FillPolygonTiledFlags = infoRec->SolidFillFlags;

-    }

-

-

-    if(!infoRec->PolyFillArcSolid && HaveSolidFillRect) {

-	infoRec->PolyFillArcSolid = XAAPolyFillArcSolid;

-	infoRec->PolyFillArcSolidFlags = infoRec->SolidFillFlags;

-    }

-

-    if(!infoRec->PolylinesWideSolid && HaveSolidFillRect) {

-	infoRec->PolylinesWideSolid = XAAPolylinesWideSolid;

-	infoRec->PolylinesWideSolidFlags = 

-			infoRec->SolidFillFlags | GXCOPY_ONLY;

-    }

-

-    if(!infoRec->PutImage && (infoRec->WritePixmap || 

-	(infoRec->WriteBitmap && 

-			!(infoRec->WriteBitmapFlags & TRANSPARENCY_ONLY)))) {

-	infoRec->PutImage = XAAPutImage;

-

-	/* See comment for CopyArea above.  But here we make fewer 

-	   assumptions.  The driver can provide the PutImageFlags if

-	   it wants too */

-    }

-

-    if(HaveSolidHorVertLine && 

-      (HaveSolidBresenhamLine || (HaveSolidTwoPointLine && 

-		(infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_LINE)))){

-	if(!infoRec->PolylinesThinSolid) {

-	   infoRec->PolylinesThinSolid = XAAPolyLines;

-	   infoRec->PolylinesThinSolidFlags = infoRec->SolidLineFlags;

-	}

-	if(!infoRec->PolySegmentThinSolid) {

-	   infoRec->PolySegmentThinSolid = XAAPolySegment;

-	   infoRec->PolySegmentThinSolidFlags = infoRec->SolidLineFlags;

-	}

-    }

-

-    if(HaveDashedBresenhamLine || (HaveDashedTwoPointLine && 

-		(infoRec->ClippingFlags & HARDWARE_CLIP_DASHED_LINE))){

-	if(!infoRec->PolylinesThinDashed) {

-	   infoRec->PolylinesThinDashed = XAAPolyLinesDashed;

-	   infoRec->PolylinesThinDashedFlags = infoRec->DashedLineFlags;

-	}

-	if(!infoRec->PolySegmentThinDashed) {

-	   infoRec->PolySegmentThinDashed = XAAPolySegmentDashed;

-	   infoRec->PolySegmentThinDashedFlags = infoRec->DashedLineFlags;

-	}

-    }

-

-    if(infoRec->PolylinesThinDashed || infoRec->PolySegmentThinDashed) {

-	if(!infoRec->ComputeDash)

-	   infoRec->ComputeDash = XAAComputeDash;

-    }

-

-    {

-	Bool haveTexture = infoRec->CPUToScreenTextureFormats &&

-			   infoRec->CPUToScreenTextureDstFormats &&

-	                   infoRec->SetupForCPUToScreenTexture2 &&

-	                   infoRec->SubsequentCPUToScreenTexture;

-        Bool haveAlphaTexture = infoRec->CPUToScreenAlphaTextureFormats &&

-                                infoRec->CPUToScreenAlphaTextureDstFormats &&

-                                infoRec->SetupForCPUToScreenAlphaTexture2 &&

-                                infoRec->SubsequentCPUToScreenAlphaTexture;

-

-	if(!infoRec->Composite && (haveTexture || haveAlphaTexture)) 

-	    infoRec->Composite = XAADoComposite;

-

-	if(!infoRec->Glyphs && infoRec->WriteBitmap &&

-	   !(infoRec->WriteBitmapFlags & NO_TRANSPARENCY)) 

-        {

-            infoRec->Glyphs = XAADoGlyphs;

-        }	

-    }

-

-    /************  Validation Functions **************/

-

-    if(!infoRec->ValidateCopyArea && infoRec->CopyArea) {

-	infoRec->CopyAreaMask = GCWhenForced;

-	if((infoRec->CopyAreaFlags & GXCOPY_ONLY) ||

-		(infoRec->CopyAreaFlags & ROP_NEEDS_SOURCE))

-	    infoRec->CopyAreaMask |= GCFunction;

-	if(infoRec->CopyAreaFlags & NO_PLANEMASK)

-	    infoRec->CopyAreaMask |= GCPlaneMask;

-	infoRec->ValidateCopyArea = XAAValidateCopyArea;

-    }

-

-    if(!infoRec->ValidateCopyPlane && infoRec->CopyPlane) {

-	infoRec->CopyPlaneMask = GCWhenForced;

-	if((infoRec->CopyPlaneFlags & GXCOPY_ONLY) ||

-		(infoRec->CopyPlaneFlags & ROP_NEEDS_SOURCE))

-	    infoRec->CopyPlaneMask |= GCFunction;

-	if(infoRec->CopyPlaneFlags & NO_PLANEMASK)

-	    infoRec->CopyPlaneMask |= GCPlaneMask;

-	if(infoRec->CopyPlaneFlags & RGB_EQUAL)

-	    infoRec->CopyPlaneMask |= GCForeground | GCBackground;

-	infoRec->ValidateCopyPlane = XAAValidateCopyPlane;

-    }

-

-    if(!infoRec->ValidatePutImage && infoRec->PutImage) {

-	infoRec->PutImageMask = GCWhenForced;

-	if((infoRec->PutImageFlags & GXCOPY_ONLY) ||

-		(infoRec->PutImageFlags & ROP_NEEDS_SOURCE))

-	    infoRec->PutImageMask |= GCFunction;

-	if(infoRec->PutImageFlags & NO_PLANEMASK)

-	    infoRec->PutImageMask |= GCPlaneMask;

-	if(infoRec->PutImageFlags & RGB_EQUAL)

-	    infoRec->PutImageMask |= GCForeground | GCBackground;

-	infoRec->ValidatePutImage = XAAValidatePutImage;

-    }

-

-

-    if(!infoRec->ValidatePushPixels && infoRec->PushPixelsSolid) {

-	infoRec->PushPixelsMask = GCFillStyle;

-	if((infoRec->PushPixelsFlags & GXCOPY_ONLY) ||

-		(infoRec->PushPixelsFlags & ROP_NEEDS_SOURCE) ||

-		(infoRec->PushPixelsFlags & TRANSPARENCY_GXCOPY_ONLY))

-	    infoRec->PushPixelsMask |= GCFunction;

-	if(infoRec->PushPixelsFlags & NO_PLANEMASK)

-	    infoRec->PushPixelsMask |= GCPlaneMask;

-	if(infoRec->PushPixelsFlags & RGB_EQUAL)

-	    infoRec->PushPixelsMask |= GCForeground;

-	infoRec->ValidatePushPixels = XAAValidatePushPixels;

-    } 

-

-    /* By default XAA assumes the FillSpans, PolyFillRects, FillPolygon

-	and PolyFillArcs have the same restrictions.  If you supply GC 

-	level replacements for any of these and alter this relationship 

-	you may need to supply replacement validation routines */

-

-    if(!infoRec->ValidateFillSpans && 

-	(infoRec->FillSpansSolid || infoRec->FillSpansStippled ||

-	infoRec->FillSpansOpaqueStippled || infoRec->FillSpansTiled)) {

-

-        int compositeFlags = 	infoRec->FillSpansSolidFlags |

-				infoRec->FillSpansStippledFlags |

-				infoRec->FillSpansOpaqueStippledFlags |

-				infoRec->FillSpansTiledFlags;

-

-	infoRec->FillSpansMask = GCFillStyle | GCTile | GCStipple;

-

-	if((compositeFlags & GXCOPY_ONLY) ||

-		(compositeFlags & ROP_NEEDS_SOURCE))

-	    infoRec->FillSpansMask |= GCFunction;

-	if(compositeFlags & NO_PLANEMASK)

-	    infoRec->FillSpansMask |= GCPlaneMask;

-	if(compositeFlags & RGB_EQUAL)

-	    infoRec->FillSpansMask |= GCForeground;

-	infoRec->ValidateFillSpans = XAAValidateFillSpans;

-    }

-

-    /* By default XAA only provides Validations for the GlyphBlt

-	functions and not the text higher up. This is because the

-	Text8/16 and GlyphBlt are linked.  If you break this linkage,

-	you may need to have the driver supply its own Validation

-	routines */

- 

-    if(!infoRec->ValidatePolyGlyphBlt && 

-	(infoRec->PolyGlyphBltTE || infoRec->PolyGlyphBltNonTE)) {

-        int compositeFlags = 	infoRec->PolyGlyphBltTEFlags |

-				infoRec->PolyGlyphBltNonTEFlags;

- 

-	infoRec->PolyGlyphBltMask = GCFillStyle | GCFont;

-	if((compositeFlags & GXCOPY_ONLY) ||

-		(compositeFlags & ROP_NEEDS_SOURCE) ||

-		(infoRec->PolyGlyphBltNonTEFlags & TRANSPARENCY_GXCOPY_ONLY))

-	    infoRec->PolyGlyphBltMask |= GCFunction;

-	if(compositeFlags & NO_PLANEMASK)

-	    infoRec->PolyGlyphBltMask |= GCPlaneMask;

-	if(compositeFlags & RGB_EQUAL)

-	    infoRec->PolyGlyphBltMask |= GCForeground;

-	infoRec->ValidatePolyGlyphBlt = XAAValidatePolyGlyphBlt;

-    }

-

-    if(!infoRec->ValidateImageGlyphBlt && 

-	(infoRec->ImageGlyphBltTE || infoRec->ImageGlyphBltNonTE)) {

-        int compositeFlags = 	infoRec->ImageGlyphBltTEFlags |	

-				infoRec->ImageGlyphBltNonTEFlags;

-

-        if(infoRec->ImageGlyphBltNonTE)

-	    compositeFlags |= infoRec->SolidFillFlags;

-

-	infoRec->ImageGlyphBltMask = GCFont;

-	if(compositeFlags & NO_PLANEMASK)

-	    infoRec->ImageGlyphBltMask |= GCPlaneMask;

-	if(compositeFlags & RGB_EQUAL)

-	    infoRec->ImageGlyphBltMask |= GCForeground | GCBackground;

-	infoRec->ValidateImageGlyphBlt = XAAValidateImageGlyphBlt;

-    }

-

-    /* By default XAA only provides a Validation function for the 

-	Polylines and does segments and polylines at the same time */

-

-    if(!infoRec->ValidatePolylines && infoRec->ValidateFillSpans) {

-	int compositeFlags = 	infoRec->PolyRectangleThinSolidFlags |

-				infoRec->PolylinesWideSolidFlags |

-				infoRec->PolylinesThinSolidFlags |

-				infoRec->PolySegmentThinSolidFlags |

-				infoRec->PolySegmentThinDashedFlags |

-				infoRec->PolylinesThinDashedFlags;

-

-	infoRec->ValidatePolylines = XAAValidatePolylines;

-	infoRec->PolylinesMask = 

-		infoRec->FillSpansMask | GCLineStyle | GCLineWidth;

-

-	if(infoRec->PolySegmentThinDashed || infoRec->PolylinesThinDashed) 

-	    infoRec->PolylinesMask |= GCDashList;

-	if(compositeFlags & NO_PLANEMASK)

-	    infoRec->PolylinesMask |= GCPlaneMask;

-	if((compositeFlags & GXCOPY_ONLY) ||

-		(compositeFlags & ROP_NEEDS_SOURCE))

-	    infoRec->PolylinesMask |= GCFunction;

-	if(compositeFlags & RGB_EQUAL)

-	    infoRec->PolylinesMask |= GCForeground;

-    }

-

-

-    /**** Fill choosers ****/

-

-    if(!infoRec->StippledFillChooser)

-	infoRec->StippledFillChooser = XAAStippledFillChooser;

-    

-    if(!infoRec->OpaqueStippledFillChooser)

-	infoRec->OpaqueStippledFillChooser = XAAOpaqueStippledFillChooser;

-

-    if(!infoRec->TiledFillChooser)

-	infoRec->TiledFillChooser = XAATiledFillChooser;

-

-

-    /**** Setup the pixmap cache ****/

-

-    if(infoRec->WriteBitmapToCache) {}

-    else if(infoRec->WriteBitmap && 

-	!(infoRec->WriteBitmapFlags & TRANSPARENCY_ONLY))

-	infoRec->WriteBitmapToCache = XAAWriteBitmapToCache;

-    else if(infoRec->Flags & LINEAR_FRAMEBUFFER)

-	infoRec->WriteBitmapToCache = XAAWriteBitmapToCacheLinear;

-    else

-	infoRec->PixmapCacheFlags |= DO_NOT_BLIT_STIPPLES;

-

-    if(infoRec->WritePixmapToCache) {}

-    else if(infoRec->WritePixmap && !(infoRec->WritePixmapFlags & NO_GXCOPY))

-	infoRec->WritePixmapToCache = XAAWritePixmapToCache;

-    else if(infoRec->Flags & LINEAR_FRAMEBUFFER)

-	infoRec->WritePixmapToCache = XAAWritePixmapToCacheLinear;

-    else

-	infoRec->Flags &= ~PIXMAP_CACHE;

-

-    if (xf86ReturnOptValBool(options, XAAOPT_PIXMAP_CACHE, FALSE))

-	infoRec->Flags &= ~PIXMAP_CACHE;

-

-    if(infoRec->WriteMono8x8PatternToCache) {}

-    else if(infoRec->PixmapCacheFlags & CACHE_MONO_8x8) {

-	if(infoRec->WritePixmapToCache)

-	  infoRec->WriteMono8x8PatternToCache = XAAWriteMono8x8PatternToCache;

-	else

-	   infoRec->PixmapCacheFlags &= ~CACHE_MONO_8x8;

-    }

-

-    if(infoRec->WriteColor8x8PatternToCache) {}

-    else if(infoRec->PixmapCacheFlags & CACHE_COLOR_8x8) {

-	if(infoRec->WritePixmapToCache && infoRec->WriteBitmapToCache)

-	  infoRec->WriteColor8x8PatternToCache = XAAWriteColor8x8PatternToCache;

-	else

-	   infoRec->PixmapCacheFlags &= ~CACHE_COLOR_8x8;

-    }

-

-    if(infoRec->CachePixelGranularity < 0) {

-	switch(pScrn->bitsPerPixel) {

-	case 24:

-	case 8:  infoRec->CachePixelGranularity = 4;  break;

-	case 16: infoRec->CachePixelGranularity = 2;  break;

-	case 32: infoRec->CachePixelGranularity = 1;  break;

-	default: break;

-	}

-

-	if(BITMAP_SCANLINE_PAD == 64)

-	    infoRec->CachePixelGranularity *= 2;

-    }

-

-    free(options);

-

-    if(!infoRec->CacheTile && infoRec->WritePixmapToCache)

-	infoRec->CacheTile = XAACacheTile;

-    if(!infoRec->CacheMonoStipple && infoRec->WritePixmapToCache)

-	infoRec->CacheMonoStipple = XAACacheMonoStipple;

-    if(!infoRec->CacheStipple && infoRec->WriteBitmapToCache)

-	infoRec->CacheStipple = XAACacheStipple;

-    if(!infoRec->CacheMono8x8Pattern && infoRec->WriteMono8x8PatternToCache)

-	infoRec->CacheMono8x8Pattern = XAACacheMono8x8Pattern;

-    if(!infoRec->CacheColor8x8Pattern && infoRec->WriteColor8x8PatternToCache)

-	infoRec->CacheColor8x8Pattern = XAACacheColor8x8Pattern;

-

-    if((infoRec->Flags & PIXMAP_CACHE) && !infoRec->InitPixmapCache) {

-	infoRec->InitPixmapCache = XAAInitPixmapCache;

-	infoRec->ClosePixmapCache = XAAClosePixmapCache;

-    }

-    

-    return TRUE;

-}

+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <string.h>
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xf86fbman.h"
+#include "servermd.h"
+
+/*
+ * XAA Config options
+ */
+
+typedef enum {
+    XAAOPT_SCREEN_TO_SCREEN_COPY,
+    XAAOPT_SOLID_FILL_RECT,
+    XAAOPT_SOLID_FILL_TRAP,
+    XAAOPT_SOLID_TWO_POINT_LINE,
+    XAAOPT_SOLID_BRESENHAM_LINE,
+    XAAOPT_SOLID_HORVERT_LINE,
+    XAAOPT_DASHED_TWO_POINT_LINE,
+    XAAOPT_DASHED_BRESENHAM_LINE,
+    XAAOPT_MONO_8x8_PATTERN_FILL_RECT,
+    XAAOPT_MONO_8x8_PATTERN_FILL_TRAP,
+    XAAOPT_COL_8x8_PATTERN_FILL_RECT,
+    XAAOPT_COL_8x8_PATTERN_FILL_TRAP,
+    XAAOPT_CPU_TO_SCREEN_COL_EXP_FILL,
+    XAAOPT_SCANLINE_CPU_TO_SCREEN_COL_EXP_FILL,
+    XAAOPT_SCREEN_TO_SCREEN_COL_EXP_FILL,
+    XAAOPT_IMAGE_WRITE_RECT,
+    XAAOPT_SCANLINE_IMAGE_WRITE_RECT,
+    XAAOPT_WRITE_BITMAP,
+    XAAOPT_WRITE_PIXMAP,
+    XAAOPT_PIXMAP_CACHE,
+    XAAOPT_OFFSCREEN_PIXMAPS,
+    XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE
+} XAAOpts;
+
+static const OptionInfoRec XAAOptions[] = {
+    {XAAOPT_SCREEN_TO_SCREEN_COPY, "XaaNoScreenToScreenCopy",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_SOLID_FILL_RECT, "XaaNoSolidFillRect",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_SOLID_FILL_TRAP, "XaaNoSolidFillTrap",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_SOLID_TWO_POINT_LINE, "XaaNoSolidTwoPointLine",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_SOLID_BRESENHAM_LINE, "XaaNoSolidBresenhamLine",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_SOLID_HORVERT_LINE, "XaaNoSolidHorVertLine",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_DASHED_TWO_POINT_LINE, "XaaNoDashedTwoPointLine",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_DASHED_BRESENHAM_LINE, "XaaNoDashedBresenhamLine",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_MONO_8x8_PATTERN_FILL_RECT, "XaaNoMono8x8PatternFillRect",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_MONO_8x8_PATTERN_FILL_TRAP, "XaaNoMono8x8PatternFillTrap",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_COL_8x8_PATTERN_FILL_RECT, "XaaNoColor8x8PatternFillRect",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_COL_8x8_PATTERN_FILL_TRAP, "XaaNoColor8x8PatternFillTrap",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_CPU_TO_SCREEN_COL_EXP_FILL, "XaaNoCPUToScreenColorExpandFill",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_SCANLINE_CPU_TO_SCREEN_COL_EXP_FILL,
+     "XaaNoScanlineCPUToScreenColorExpandFill",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_SCREEN_TO_SCREEN_COL_EXP_FILL, "XaaNoScreenToScreenColorExpandFill",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_IMAGE_WRITE_RECT, "XaaNoImageWriteRect",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_SCANLINE_IMAGE_WRITE_RECT, "XaaNoScanlineImageWriteRect",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_WRITE_BITMAP, "XaaNoWriteBitmap",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_WRITE_PIXMAP, "XaaNoWritePixmap",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_PIXMAP_CACHE, "XaaNoPixmapCache",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_OFFSCREEN_PIXMAPS, "XaaNoOffscreenPixmaps",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, "XaaOffscreenPixmaps",
+     OPTV_BOOLEAN, {0}, FALSE},
+    {-1, NULL,
+     OPTV_NONE, {0}, FALSE}
+};
+
+static XF86ModuleVersionInfo xaaVersRec = {
+    "xaa",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    XAA_VERSION_MAJOR,
+    XAA_VERSION_MINOR,
+    XAA_VERSION_RELEASE,
+    ABI_CLASS_VIDEODRV,         /* requires the video driver ABI */
+    ABI_VIDEODRV_VERSION,
+    MOD_CLASS_NONE,
+    {0, 0, 0, 0}
+};
+
+_X_EXPORT XF86ModuleData xaaModuleData = { &xaaVersRec, NULL, NULL };
+
+Bool
+XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
+{
+    int index = pScreen->myNum;
+    ScrnInfoPtr pScrn = xf86Screens[index];
+    Bool HaveScreenToScreenCopy = FALSE;
+    Bool HaveColorExpansion = FALSE;
+    Bool HaveScanlineColorExpansion = FALSE;
+    Bool HaveSolidFillRect = FALSE;
+    Bool HaveMono8x8PatternFillRect = FALSE;
+    Bool HaveColor8x8PatternFillRect = FALSE;
+    Bool HaveSolidFillTrap = FALSE;
+    Bool HaveMono8x8PatternFillTrap = FALSE;
+    Bool HaveColor8x8PatternFillTrap = FALSE;
+    Bool HaveSolidTwoPointLine = FALSE;
+    Bool HaveSolidBresenhamLine = FALSE;
+    Bool HaveSolidHorVertLine = FALSE;
+    Bool HaveDashedTwoPointLine = FALSE;
+    Bool HaveDashedBresenhamLine = FALSE;
+    Bool HaveImageWriteRect = FALSE;
+    Bool HaveScanlineImageWriteRect = FALSE;
+    Bool HaveScreenToScreenColorExpandFill = FALSE;
+    OptionInfoPtr options;
+    int is_shared = 0;
+    int i;
+
+    options = xnfalloc(sizeof(XAAOptions));
+    (void) memcpy(options, XAAOptions, sizeof(XAAOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
+
+    infoRec->pScrn = pScrn;
+    infoRec->NeedToSync = FALSE;
+
+    /* must have a Sync function */
+    if (!infoRec->Sync)
+        return FALSE;
+    for (i = 0; i < pScrn->numEntities; i++) {
+        if (xf86IsEntityShared(pScrn->entityList[i]))
+            is_shared = 1;
+    }
+
+    /* If this PCI entity has IS_SHARED_ACCEL set in entityProp
+     * then a RestoreAccelState function is required
+     */
+    if (!infoRec->RestoreAccelState && is_shared)
+        return FALSE;
+
+    if (infoRec->RestoreAccelState) {
+        if (!XAAInitStateWrap(pScreen, infoRec))
+            return FALSE;
+    }
+
+    if (serverGeneration == 1)
+        xf86DrvMsg(index, X_INFO,
+                   "Using XFree86 Acceleration Architecture (XAA)\n");
+
+    /************** Low Level *************/
+
+    if (!infoRec->SetClippingRectangle || !infoRec->DisableClipping) {
+        infoRec->ClippingFlags = 0;
+        infoRec->SetClippingRectangle = NULL;
+        infoRec->DisableClipping = NULL;
+    }
+
+    /**** CopyArea ****/
+
+    if (infoRec->SetupForScreenToScreenCopy &&
+        infoRec->SubsequentScreenToScreenCopy &&
+        !xf86ReturnOptValBool(options, XAAOPT_SCREEN_TO_SCREEN_COPY, FALSE)) {
+        HaveScreenToScreenCopy = TRUE;
+    }
+    else {
+        infoRec->ScreenToScreenCopyFlags = 0;
+        infoRec->SetupForScreenToScreenCopy = NULL;
+        infoRec->SubsequentScreenToScreenCopy = NULL;
+    }
+
+    /**** Solid Filled Rects ****/
+
+    if (infoRec->SetupForSolidFill && infoRec->SubsequentSolidFillRect &&
+        !xf86ReturnOptValBool(options, XAAOPT_SOLID_FILL_RECT, FALSE)) {
+        HaveSolidFillRect = TRUE;
+        if (infoRec->SubsequentSolidFillTrap &&
+            !xf86ReturnOptValBool(options, XAAOPT_SOLID_FILL_TRAP, FALSE))
+            HaveSolidFillTrap = TRUE;
+        else
+            infoRec->SubsequentSolidFillTrap = NULL;
+    }
+    else {
+        infoRec->SolidFillFlags = 0;
+        infoRec->SetupForSolidFill = NULL;
+        infoRec->SubsequentSolidFillRect = NULL;
+        infoRec->SubsequentSolidFillTrap = NULL;
+    }
+
+    /**** Solid lines ****/
+
+    if (infoRec->SetupForSolidLine) {
+        if (infoRec->SubsequentSolidTwoPointLine &&
+            !xf86ReturnOptValBool(options, XAAOPT_SOLID_TWO_POINT_LINE, FALSE))
+            HaveSolidTwoPointLine = TRUE;
+        if (infoRec->SubsequentSolidBresenhamLine &&
+            !xf86ReturnOptValBool(options, XAAOPT_SOLID_BRESENHAM_LINE,
+                                  FALSE)) {
+            HaveSolidBresenhamLine = TRUE;
+
+            if (infoRec->SolidBresenhamLineErrorTermBits)
+                infoRec->SolidBresenhamLineErrorTermBits =
+                    ~((1 << infoRec->SolidBresenhamLineErrorTermBits) - 1);
+        }
+
+        if (infoRec->SubsequentSolidHorVertLine &&
+            !xf86ReturnOptValBool(options, XAAOPT_SOLID_HORVERT_LINE, FALSE))
+            HaveSolidHorVertLine = TRUE;
+        else if (HaveSolidTwoPointLine) {
+            infoRec->SubsequentSolidHorVertLine = XAASolidHorVertLineAsTwoPoint;
+            HaveSolidHorVertLine = TRUE;
+        }
+        else if (HaveSolidBresenhamLine) {
+            infoRec->SubsequentSolidHorVertLine =
+                XAASolidHorVertLineAsBresenham;
+            HaveSolidHorVertLine = TRUE;
+        }
+    }
+
+    /* XXX Should this also check for XAAOPT_SOLID_HORVERT_LINE? */
+    if (!HaveSolidTwoPointLine &&
+        !HaveSolidBresenhamLine && !HaveSolidHorVertLine && HaveSolidFillRect) {
+        infoRec->SetupForSolidLine = infoRec->SetupForSolidFill;
+        infoRec->SubsequentSolidHorVertLine = XAASolidHorVertLineAsRects;
+        infoRec->SolidLineFlags = infoRec->SolidFillFlags;
+        HaveSolidHorVertLine = TRUE;
+    }
+
+    if (!HaveSolidTwoPointLine)
+        infoRec->SubsequentSolidTwoPointLine = NULL;
+    if (!HaveSolidBresenhamLine)
+        infoRec->SubsequentSolidBresenhamLine = NULL;
+    if (!HaveSolidHorVertLine)
+        infoRec->SubsequentSolidHorVertLine = NULL;
+
+    /* Disable all if nothing left over */
+    if (!HaveSolidTwoPointLine &&
+        !HaveSolidBresenhamLine && !HaveSolidHorVertLine) {
+        infoRec->SolidLineFlags = 0;
+        infoRec->SetupForSolidLine = NULL;
+    }
+
+    /**** 8x8 Mono Pattern Filled Rects ****/
+
+    if (infoRec->SetupForMono8x8PatternFill &&
+        infoRec->SubsequentMono8x8PatternFillRect &&
+        !xf86ReturnOptValBool(options,
+                              XAAOPT_MONO_8x8_PATTERN_FILL_RECT, FALSE)) {
+        HaveMono8x8PatternFillRect = TRUE;
+        if (infoRec->SubsequentMono8x8PatternFillTrap &&
+            !xf86ReturnOptValBool(options,
+                                  XAAOPT_MONO_8x8_PATTERN_FILL_TRAP, FALSE))
+            HaveMono8x8PatternFillTrap = TRUE;
+
+        if (infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS) {
+            infoRec->CanDoMono8x8 = TRUE;
+        }
+        else {                  /* others require caching */
+            int min_pitch;
+
+            infoRec->PixmapCacheFlags |= CACHE_MONO_8x8;
+
+            switch (pScrn->bitsPerPixel) {
+            case 32:
+                min_pitch = 2;
+                break;
+            case 24:
+                min_pitch = 3;
+                break;
+            case 16:
+                min_pitch = 4;
+                break;
+            default:
+                min_pitch = 8;
+                break;
+            }
+
+            if (min_pitch > infoRec->MonoPatternPitch)
+                infoRec->MonoPatternPitch = min_pitch;
+
+            if (infoRec->Mono8x8PatternFillFlags &
+                HARDWARE_PATTERN_PROGRAMMED_ORIGIN) {
+                if (!infoRec->CacheWidthMono8x8Pattern ||
+                    !infoRec->CacheHeightMono8x8Pattern) {
+                    infoRec->CacheWidthMono8x8Pattern =
+                        infoRec->MonoPatternPitch;
+                    infoRec->CacheHeightMono8x8Pattern = 1;
+                }
+            }
+            else {
+                int numPerLine = 128 / infoRec->MonoPatternPitch;
+
+                if (!infoRec->CacheWidthMono8x8Pattern ||
+                    !infoRec->CacheHeightMono8x8Pattern) {
+                    infoRec->CacheWidthMono8x8Pattern =
+                        numPerLine * infoRec->MonoPatternPitch;
+                    infoRec->CacheHeightMono8x8Pattern =
+                        (64 + numPerLine - 1) / numPerLine;
+                }
+            }
+        }
+    }
+    else {
+        infoRec->Mono8x8PatternFillFlags = 0;
+        infoRec->SetupForMono8x8PatternFill = NULL;
+        infoRec->SubsequentMono8x8PatternFillRect = NULL;
+    }
+
+    /**** Dashed lines ****/
+
+    if (infoRec->SetupForDashedLine && infoRec->DashPatternMaxLength) {
+        if (infoRec->SubsequentDashedTwoPointLine &&
+            !xf86ReturnOptValBool(options, XAAOPT_DASHED_TWO_POINT_LINE, FALSE))
+            HaveDashedTwoPointLine = TRUE;
+        if (infoRec->SubsequentDashedBresenhamLine &&
+            !xf86ReturnOptValBool(options, XAAOPT_DASHED_BRESENHAM_LINE,
+                                  FALSE)) {
+            HaveDashedBresenhamLine = TRUE;
+
+            if (infoRec->DashedBresenhamLineErrorTermBits)
+                infoRec->DashedBresenhamLineErrorTermBits =
+                    ~((1 << infoRec->DashedBresenhamLineErrorTermBits) - 1);
+        }
+    }
+
+    if (!HaveDashedTwoPointLine)
+        infoRec->SubsequentDashedTwoPointLine = NULL;
+    if (!HaveDashedBresenhamLine)
+        infoRec->SubsequentDashedBresenhamLine = NULL;
+
+    /* Disable all if nothing left over */
+    if (!HaveDashedTwoPointLine && !HaveDashedBresenhamLine) {
+        infoRec->DashedLineFlags = 0;
+        infoRec->SetupForDashedLine = NULL;
+    }
+
+    /**** 8x8 Color Pattern Filled Rects ****/
+
+    if (infoRec->SetupForColor8x8PatternFill &&
+        infoRec->SubsequentColor8x8PatternFillRect &&
+        !xf86ReturnOptValBool(options, XAAOPT_COL_8x8_PATTERN_FILL_RECT,
+                              FALSE)) {
+        HaveColor8x8PatternFillRect = TRUE;
+        if (infoRec->SubsequentColor8x8PatternFillTrap &&
+            !xf86ReturnOptValBool(options, XAAOPT_COL_8x8_PATTERN_FILL_TRAP,
+                                  FALSE))
+            HaveColor8x8PatternFillTrap = TRUE;
+        else
+            infoRec->SubsequentColor8x8PatternFillTrap = NULL;
+
+        infoRec->PixmapCacheFlags |= CACHE_COLOR_8x8;
+
+        if (infoRec->Color8x8PatternFillFlags &
+            HARDWARE_PATTERN_PROGRAMMED_ORIGIN) {
+            if (!infoRec->CacheWidthColor8x8Pattern ||
+                !infoRec->CacheHeightColor8x8Pattern) {
+                infoRec->CacheWidthColor8x8Pattern = 64;
+                infoRec->CacheHeightColor8x8Pattern = 1;
+            }
+        }
+        else {
+            if (!infoRec->CacheWidthColor8x8Pattern ||
+                !infoRec->CacheHeightColor8x8Pattern) {
+                infoRec->CacheWidthColor8x8Pattern = 128;
+                infoRec->CacheHeightColor8x8Pattern = 8;
+            }
+        }
+    }
+    else {
+        infoRec->Color8x8PatternFillFlags = 0;
+        infoRec->SetupForColor8x8PatternFill = NULL;
+        infoRec->SubsequentColor8x8PatternFillRect = NULL;
+        infoRec->SubsequentColor8x8PatternFillTrap = NULL;
+    }
+
+    /**** Color Expansion ****/
+
+    if (infoRec->SetupForCPUToScreenColorExpandFill &&
+        infoRec->ColorExpandBase &&
+        infoRec->SubsequentCPUToScreenColorExpandFill &&
+        !xf86ReturnOptValBool(options, XAAOPT_CPU_TO_SCREEN_COL_EXP_FILL,
+                              FALSE)) {
+        int dwordsNeeded = pScrn->virtualX;
+
+        infoRec->ColorExpandRange >>= 2;        /* convert to DWORDS */
+        HaveColorExpansion = TRUE;
+
+        if (infoRec->CPUToScreenColorExpandFillFlags &
+            LEFT_EDGE_CLIPPING_NEGATIVE_X)
+            dwordsNeeded += 31;
+        dwordsNeeded = (dwordsNeeded + 31) >> 5;
+        if (dwordsNeeded > infoRec->ColorExpandRange)
+            infoRec->CPUToScreenColorExpandFillFlags |= CPU_TRANSFER_BASE_FIXED;
+    }
+    else {
+        infoRec->CPUToScreenColorExpandFillFlags = 0;
+        infoRec->SetupForCPUToScreenColorExpandFill = NULL;
+        infoRec->SubsequentCPUToScreenColorExpandFill = NULL;
+    }
+
+    /**** Scanline Color Expansion ****/
+
+    if (infoRec->SetupForScanlineCPUToScreenColorExpandFill &&
+        infoRec->SubsequentScanlineCPUToScreenColorExpandFill &&
+        infoRec->SubsequentColorExpandScanline &&
+        infoRec->ScanlineColorExpandBuffers &&
+        (infoRec->NumScanlineColorExpandBuffers > 0) &&
+        !xf86ReturnOptValBool(options,
+                              XAAOPT_SCANLINE_CPU_TO_SCREEN_COL_EXP_FILL,
+                              FALSE)) {
+        HaveScanlineColorExpansion = TRUE;
+    }
+    else {
+        infoRec->ScanlineCPUToScreenColorExpandFillFlags = 0;
+        infoRec->SetupForScanlineCPUToScreenColorExpandFill = NULL;
+        infoRec->SubsequentScanlineCPUToScreenColorExpandFill = NULL;
+        infoRec->SubsequentColorExpandScanline = NULL;
+    }
+
+    /**** Screen to Screen Color Expansion ****/
+
+    if (infoRec->SetupForScreenToScreenColorExpandFill &&
+        infoRec->SubsequentScreenToScreenColorExpandFill &&
+        !xf86ReturnOptValBool(options, XAAOPT_SCREEN_TO_SCREEN_COL_EXP_FILL,
+                              FALSE)) {
+        HaveScreenToScreenColorExpandFill = TRUE;
+        if (!infoRec->CacheColorExpandDensity)
+            infoRec->CacheColorExpandDensity = 1;
+    }
+    else {
+        infoRec->ScreenToScreenColorExpandFillFlags = 0;
+        infoRec->SetupForScreenToScreenColorExpandFill = NULL;
+        infoRec->SubsequentScreenToScreenColorExpandFill = NULL;
+    }
+
+    /**** Image Writes ****/
+
+    if (infoRec->SetupForImageWrite && infoRec->ImageWriteBase &&
+        infoRec->SubsequentImageWriteRect &&
+        !xf86ReturnOptValBool(options, XAAOPT_IMAGE_WRITE_RECT, FALSE)) {
+
+        infoRec->ImageWriteRange >>= 2; /* convert to DWORDS */
+        if (infoRec->ImageWriteFlags & CPU_TRANSFER_BASE_FIXED)
+            infoRec->ImageWriteRange = 0;
+        HaveImageWriteRect = TRUE;
+    }
+    else {
+        infoRec->ImageWriteFlags = 0;
+        infoRec->SetupForImageWrite = NULL;
+        infoRec->SubsequentImageWriteRect = NULL;
+    }
+
+    /**** Scanline Image Writes ****/
+
+    if (infoRec->SetupForScanlineImageWrite &&
+        infoRec->SubsequentScanlineImageWriteRect &&
+        infoRec->SubsequentImageWriteScanline &&
+        infoRec->ScanlineImageWriteBuffers &&
+        (infoRec->NumScanlineImageWriteBuffers > 0) &&
+        !xf86ReturnOptValBool(options, XAAOPT_SCANLINE_IMAGE_WRITE_RECT,
+                              FALSE)) {
+        HaveScanlineImageWriteRect = TRUE;
+    }
+    else {
+        infoRec->ScanlineImageWriteFlags = 0;
+        infoRec->SetupForScanlineImageWrite = NULL;
+        infoRec->SubsequentScanlineImageWriteRect = NULL;
+        infoRec->SubsequentImageWriteScanline = NULL;
+    }
+
+#ifndef __i386__
+    /* XAA makes some unaligned accesses when clipping is not available */
+#define CLIP_FLAGS (LEFT_EDGE_CLIPPING | LEFT_EDGE_CLIPPING_NEGATIVE_X)
+    if (HaveImageWriteRect &&
+        ((infoRec->ImageWriteFlags & CLIP_FLAGS) != CLIP_FLAGS)) {
+        HaveImageWriteRect = FALSE;
+    }
+    if (HaveScanlineImageWriteRect &&
+        ((infoRec->ScanlineImageWriteFlags & CLIP_FLAGS) != CLIP_FLAGS)) {
+        HaveScanlineImageWriteRect = FALSE;
+    }
+#endif
+
+    if (serverGeneration == 1) {
+        if (HaveScreenToScreenCopy)
+            xf86ErrorF("\tScreen to screen bit blits\n");
+        if (HaveSolidFillRect)
+            xf86ErrorF("\tSolid filled rectangles\n");
+        if (HaveSolidFillTrap)
+            xf86ErrorF("\tSolid filled trapezoids\n");
+        if (HaveMono8x8PatternFillRect)
+            xf86ErrorF("\t8x8 mono pattern filled rectangles\n");
+        if (HaveMono8x8PatternFillTrap)
+            xf86ErrorF("\t8x8 mono pattern filled trapezoids\n");
+        if (HaveColor8x8PatternFillRect)
+            xf86ErrorF("\t8x8 color pattern filled rectangles\n");
+        if (HaveColor8x8PatternFillTrap)
+            xf86ErrorF("\t8x8 color pattern filled trapezoids\n");
+
+        if (HaveColorExpansion)
+            xf86ErrorF("\tCPU to Screen color expansion\n");
+        else if (HaveScanlineColorExpansion)
+            xf86ErrorF("\tIndirect CPU to Screen color expansion\n");
+
+        if (HaveScreenToScreenColorExpandFill)
+            xf86ErrorF("\tScreen to Screen color expansion\n");
+
+        if (HaveSolidTwoPointLine || HaveSolidBresenhamLine)
+            xf86ErrorF("\tSolid Lines\n");
+        else if (HaveSolidHorVertLine)
+            xf86ErrorF("\tSolid Horizontal and Vertical Lines\n");
+
+        if (HaveDashedTwoPointLine || HaveDashedBresenhamLine)
+            xf86ErrorF("\tDashed Lines\n");
+
+        if (HaveImageWriteRect)
+            xf86ErrorF("\tImage Writes\n");
+        else if (HaveScanlineImageWriteRect)
+            xf86ErrorF("\tScanline Image Writes\n");
+
+    }
+
+#define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
+
+    if ((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
+        xf86ReturnOptValBool(options,
+                             XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, FALSE)) {
+        XAAMSG("\tOffscreen Pixmaps\n");
+    }
+    else {
+        infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
+    }
+
+    /************** Mid Level *************/
+
+    /**** ScreenToScreenBitBlt ****/
+
+    if (infoRec->ScreenToScreenBitBlt) {
+        XAAMSG("\tDriver provided ScreenToScreenBitBlt replacement\n");
+    }
+    else if (HaveScreenToScreenCopy) {
+        infoRec->ScreenToScreenBitBlt = XAAScreenToScreenBitBlt;
+        infoRec->ScreenToScreenBitBltFlags = infoRec->ScreenToScreenCopyFlags;
+    }
+
+    /**** FillSolidRects ****/
+
+    if (infoRec->FillSolidRects) {
+        XAAMSG("\tDriver provided FillSolidRects replacement\n");
+    }
+    else if (HaveSolidFillRect) {
+        infoRec->FillSolidRects = XAAFillSolidRects;
+        infoRec->FillSolidRectsFlags = infoRec->SolidFillFlags;
+    }
+
+    /**** FillSolidSpans ****/
+
+    if (infoRec->FillSolidSpans) {
+        XAAMSG("\tDriver provided FillSolidSpans replacement\n");
+    }
+    else if (HaveSolidFillRect) {
+        infoRec->FillSolidSpans = XAAFillSolidSpans;
+        infoRec->FillSolidSpansFlags = infoRec->SolidFillFlags;
+    }
+
+    /**** FillMono8x8PatternRects ****/
+
+    if (infoRec->FillMono8x8PatternRects) {
+        XAAMSG("\tDriver provided FillMono8x8PatternRects replacement\n");
+    }
+    else if (HaveMono8x8PatternFillRect) {
+        infoRec->FillMono8x8PatternRects =
+            (infoRec->
+             Mono8x8PatternFillFlags & HARDWARE_PATTERN_SCREEN_ORIGIN) ?
+            XAAFillMono8x8PatternRectsScreenOrigin : XAAFillMono8x8PatternRects;
+
+        infoRec->FillMono8x8PatternRectsFlags =
+            infoRec->Mono8x8PatternFillFlags;
+    }
+
+    /**** FillMono8x8PatternSpans ****/
+
+    if (infoRec->FillMono8x8PatternSpans) {
+        XAAMSG("\tDriver provided FillMono8x8PatternSpans replacement\n");
+    }
+    else if (HaveMono8x8PatternFillRect) {
+        infoRec->FillMono8x8PatternSpans =
+            (infoRec->
+             Mono8x8PatternFillFlags & HARDWARE_PATTERN_SCREEN_ORIGIN) ?
+            XAAFillMono8x8PatternSpansScreenOrigin : XAAFillMono8x8PatternSpans;
+
+        infoRec->FillMono8x8PatternSpansFlags =
+            infoRec->Mono8x8PatternFillFlags;
+    }
+
+    /**** FillColor8x8Rects ****/
+
+    if (infoRec->FillColor8x8PatternRects) {
+        XAAMSG("\tDriver provided FillColor8x8PatternRects replacement\n");
+    }
+    else if (HaveColor8x8PatternFillRect) {
+        infoRec->FillColor8x8PatternRects =
+            (infoRec->
+             Color8x8PatternFillFlags & HARDWARE_PATTERN_SCREEN_ORIGIN) ?
+            XAAFillColor8x8PatternRectsScreenOrigin :
+            XAAFillColor8x8PatternRects;
+
+        infoRec->FillColor8x8PatternRectsFlags =
+            infoRec->Color8x8PatternFillFlags;
+    }
+
+    /**** FillColor8x8Spans ****/
+
+    if (infoRec->FillColor8x8PatternSpans) {
+        XAAMSG("\tDriver provided FillColor8x8PatternSpans replacement\n");
+    }
+    else if (HaveColor8x8PatternFillRect) {
+        infoRec->FillColor8x8PatternSpans =
+            (infoRec->
+             Color8x8PatternFillFlags & HARDWARE_PATTERN_SCREEN_ORIGIN) ?
+            XAAFillColor8x8PatternSpansScreenOrigin :
+            XAAFillColor8x8PatternSpans;
+
+        infoRec->FillColor8x8PatternSpansFlags =
+            infoRec->Color8x8PatternFillFlags;
+    }
+
+    /**** FillCacheBltRects ****/
+
+    if (infoRec->FillCacheBltRects) {
+        XAAMSG("\tDriver provided FillCacheBltRects replacement\n");
+    }
+    else if (HaveScreenToScreenCopy) {
+        infoRec->FillCacheBltRects = XAAFillCacheBltRects;
+        infoRec->FillCacheBltRectsFlags = infoRec->ScreenToScreenCopyFlags;
+    }
+
+    /**** FillCacheBltSpans ****/
+
+    if (infoRec->FillCacheBltSpans) {
+        XAAMSG("\tDriver provided FillCacheBltSpans replacement\n");
+    }
+    else if (HaveScreenToScreenCopy) {
+        infoRec->FillCacheBltSpans = XAAFillCacheBltSpans;
+        infoRec->FillCacheBltSpansFlags = infoRec->ScreenToScreenCopyFlags;
+    }
+
+    /**** FillCacheExpandRects ****/
+
+    if (infoRec->FillCacheExpandRects) {
+        XAAMSG("\tDriver provided FillCacheExpandRects replacement\n");
+    }
+    else if (HaveScreenToScreenColorExpandFill) {
+        infoRec->FillCacheExpandRects = XAAFillCacheExpandRects;
+        infoRec->FillCacheExpandRectsFlags =
+            infoRec->ScreenToScreenColorExpandFillFlags;
+    }
+
+    /**** FillCacheExpandSpans ****/
+
+    if (infoRec->FillCacheExpandSpans) {
+        XAAMSG("\tDriver provided FillCacheExpandSpans replacement\n");
+    }
+    else if (HaveScreenToScreenColorExpandFill) {
+        infoRec->FillCacheExpandSpans = XAAFillCacheExpandSpans;
+        infoRec->FillCacheExpandSpansFlags =
+            infoRec->ScreenToScreenColorExpandFillFlags;
+    }
+
+    /**** FillColorExpandRects ****/
+
+    if (infoRec->FillColorExpandRects) {
+        XAAMSG("\tDriver provided FillColorExpandRects replacement\n");
+    }
+    else if (HaveColorExpansion) {
+        if (infoRec->CPUToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) {
+            if (infoRec->CPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST) {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->FillColorExpandRects =
+                        XAAFillColorExpandRects3MSBFirstFixedBase;
+                else
+                    infoRec->FillColorExpandRects =
+                        XAAFillColorExpandRects3MSBFirst;
+            }
+            else {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->FillColorExpandRects =
+                        XAAFillColorExpandRects3LSBFirstFixedBase;
+                else
+                    infoRec->FillColorExpandRects =
+                        XAAFillColorExpandRects3LSBFirst;
+            }
+        }
+        else {
+            if (infoRec->CPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST) {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->FillColorExpandRects =
+                        XAAFillColorExpandRectsMSBFirstFixedBase;
+                else
+                    infoRec->FillColorExpandRects =
+                        XAAFillColorExpandRectsMSBFirst;
+            }
+            else {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->FillColorExpandRects =
+                        XAAFillColorExpandRectsLSBFirstFixedBase;
+                else
+                    infoRec->FillColorExpandRects =
+                        XAAFillColorExpandRectsLSBFirst;
+            }
+        }
+        infoRec->FillColorExpandRectsFlags =
+            infoRec->CPUToScreenColorExpandFillFlags;
+    }
+    else if (HaveScanlineColorExpansion) {
+        if (infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+            TRIPLE_BITS_24BPP) {
+            if (infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST)
+                infoRec->FillColorExpandRects =
+                    XAAFillScanlineColorExpandRects3MSBFirst;
+            else
+                infoRec->FillColorExpandRects =
+                    XAAFillScanlineColorExpandRects3LSBFirst;
+        }
+        else {
+            if (infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST)
+                infoRec->FillColorExpandRects =
+                    XAAFillScanlineColorExpandRectsMSBFirst;
+            else
+                infoRec->FillColorExpandRects =
+                    XAAFillScanlineColorExpandRectsLSBFirst;
+        }
+        infoRec->FillColorExpandRectsFlags =
+            infoRec->ScanlineCPUToScreenColorExpandFillFlags;
+    }
+
+    /**** FillColorExpandSpans ****/
+
+    if (infoRec->FillColorExpandSpans) {
+        XAAMSG("\tDriver provided FillColorExpandSpans replacement\n");
+    }
+    else if (HaveColorExpansion) {
+        if (infoRec->CPUToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) {
+            if (infoRec->CPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST) {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->FillColorExpandSpans =
+                        XAAFillColorExpandSpans3MSBFirstFixedBase;
+                else
+                    infoRec->FillColorExpandSpans =
+                        XAAFillColorExpandSpans3MSBFirst;
+            }
+            else {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->FillColorExpandSpans =
+                        XAAFillColorExpandSpans3LSBFirstFixedBase;
+                else
+                    infoRec->FillColorExpandSpans =
+                        XAAFillColorExpandSpans3LSBFirst;
+            }
+        }
+        else {
+            if (infoRec->CPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST) {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->FillColorExpandSpans =
+                        XAAFillColorExpandSpansMSBFirstFixedBase;
+                else
+                    infoRec->FillColorExpandSpans =
+                        XAAFillColorExpandSpansMSBFirst;
+            }
+            else {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->FillColorExpandSpans =
+                        XAAFillColorExpandSpansLSBFirstFixedBase;
+                else
+                    infoRec->FillColorExpandSpans =
+                        XAAFillColorExpandSpansLSBFirst;
+            }
+        }
+        infoRec->FillColorExpandSpansFlags =
+            infoRec->CPUToScreenColorExpandFillFlags;
+    }
+    else if (HaveScanlineColorExpansion) {
+        if (infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+            TRIPLE_BITS_24BPP) {
+            if (infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST)
+                infoRec->FillColorExpandSpans =
+                    XAAFillScanlineColorExpandSpans3MSBFirst;
+            else
+                infoRec->FillColorExpandSpans =
+                    XAAFillScanlineColorExpandSpans3LSBFirst;
+        }
+        else {
+            if (infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST)
+                infoRec->FillColorExpandSpans =
+                    XAAFillScanlineColorExpandSpansMSBFirst;
+            else
+                infoRec->FillColorExpandSpans =
+                    XAAFillScanlineColorExpandSpansLSBFirst;
+        }
+        infoRec->FillColorExpandSpansFlags =
+            infoRec->ScanlineCPUToScreenColorExpandFillFlags;
+    }
+
+    /**** FillImageWriteRects ****/
+
+    if (infoRec->FillImageWriteRects) {
+        XAAMSG("\tDriver provided FillImageWriteRects replacement\n");
+    }
+    else if (HaveImageWriteRect &&
+             (infoRec->ImageWriteFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) &&
+             (infoRec->ImageWriteFlags & LEFT_EDGE_CLIPPING)) {
+        infoRec->FillImageWriteRects = XAAFillImageWriteRects;
+        infoRec->FillImageWriteRectsFlags = infoRec->ImageWriteFlags;
+    }
+
+    /**** WriteBitmap ****/
+
+    if (infoRec->WriteBitmap &&
+        !xf86ReturnOptValBool(options, XAAOPT_WRITE_BITMAP, FALSE)) {
+        XAAMSG("\tDriver provided WriteBitmap replacement\n");
+    }
+    else if (HaveColorExpansion) {
+        if (infoRec->CPUToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) {
+            if (infoRec->CPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST) {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->WriteBitmap =
+                        XAAWriteBitmapColorExpand3MSBFirstFixedBase;
+                else
+                    infoRec->WriteBitmap = XAAWriteBitmapColorExpand3MSBFirst;
+            }
+            else {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->WriteBitmap =
+                        XAAWriteBitmapColorExpand3LSBFirstFixedBase;
+                else
+                    infoRec->WriteBitmap = XAAWriteBitmapColorExpand3LSBFirst;
+            }
+        }
+        else {
+            if (infoRec->CPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST) {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->WriteBitmap =
+                        XAAWriteBitmapColorExpandMSBFirstFixedBase;
+                else
+                    infoRec->WriteBitmap = XAAWriteBitmapColorExpandMSBFirst;
+            }
+            else {
+                if (infoRec->CPUToScreenColorExpandFillFlags &
+                    CPU_TRANSFER_BASE_FIXED)
+                    infoRec->WriteBitmap =
+                        XAAWriteBitmapColorExpandLSBFirstFixedBase;
+                else
+                    infoRec->WriteBitmap = XAAWriteBitmapColorExpandLSBFirst;
+            }
+        }
+        infoRec->WriteBitmapFlags = infoRec->CPUToScreenColorExpandFillFlags;
+    }
+    else if (HaveScanlineColorExpansion) {
+        if (infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+            TRIPLE_BITS_24BPP) {
+            if (infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST)
+                infoRec->WriteBitmap =
+                    XAAWriteBitmapScanlineColorExpand3MSBFirst;
+            else
+                infoRec->WriteBitmap =
+                    XAAWriteBitmapScanlineColorExpand3LSBFirst;
+        }
+        else {
+            if (infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+                BIT_ORDER_IN_BYTE_MSBFIRST)
+                infoRec->WriteBitmap =
+                    XAAWriteBitmapScanlineColorExpandMSBFirst;
+            else
+                infoRec->WriteBitmap =
+                    XAAWriteBitmapScanlineColorExpandLSBFirst;
+        }
+        infoRec->WriteBitmapFlags =
+            infoRec->ScanlineCPUToScreenColorExpandFillFlags;
+    }
+    else
+        infoRec->WriteBitmap = NULL;
+
+    /**** TE Glyphs ****/
+
+    if (infoRec->TEGlyphRenderer) {
+        XAAMSG("\tDriver provided TEGlyphRenderer replacement\n");
+    }
+    else if (HaveColorExpansion) {
+        infoRec->TEGlyphRendererFlags =
+            infoRec->CPUToScreenColorExpandFillFlags;
+
+        if (infoRec->TEGlyphRendererFlags & TRIPLE_BITS_24BPP) {
+            if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {
+                if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)
+                    infoRec->TEGlyphRenderer =
+                        XAATEGlyphRenderer3MSBFirstFixedBase;
+                else
+                    infoRec->TEGlyphRenderer = XAATEGlyphRenderer3MSBFirst;
+            }
+            else {
+                if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)
+                    infoRec->TEGlyphRenderer =
+                        XAATEGlyphRenderer3LSBFirstFixedBase;
+                else
+                    infoRec->TEGlyphRenderer = XAATEGlyphRenderer3LSBFirst;
+            }
+
+            if (!HaveSolidFillRect &&
+                (infoRec->TEGlyphRendererFlags & RGB_EQUAL)) {
+                infoRec->TEGlyphRendererFlags &= ~RGB_EQUAL;
+                XAAMSG("WARNING:  TEGlyphRenderer cannot support RGB_EQUAL"
+                       " without solid fills\n");
+            }
+        }
+        else {
+            if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {
+                if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)
+                    infoRec->TEGlyphRenderer =
+                        XAATEGlyphRendererMSBFirstFixedBase;
+                else
+                    infoRec->TEGlyphRenderer = XAATEGlyphRendererMSBFirst;
+            }
+            else {
+                if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)
+                    infoRec->TEGlyphRenderer =
+                        XAATEGlyphRendererLSBFirstFixedBase;
+                else
+                    infoRec->TEGlyphRenderer = XAATEGlyphRendererLSBFirst;
+            }
+        }
+
+        if (!HaveSolidFillRect &&
+            (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {
+            infoRec->TEGlyphRendererFlags &= ~TRANSPARENCY_ONLY;
+            XAAMSG("WARNING:  TEGlyphRenderer cannot support TRANPARENCY_ONLY"
+                   " without solid fills\n");
+        }
+
+    }
+    else if (HaveScanlineColorExpansion) {
+        infoRec->TEGlyphRendererFlags =
+            infoRec->ScanlineCPUToScreenColorExpandFillFlags;
+
+        if (infoRec->TEGlyphRendererFlags & TRIPLE_BITS_24BPP) {
+            if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST)
+                infoRec->TEGlyphRenderer = XAATEGlyphRendererScanline3MSBFirst;
+            else
+                infoRec->TEGlyphRenderer = XAATEGlyphRendererScanline3LSBFirst;
+
+            if (!HaveSolidFillRect &&
+                (infoRec->TEGlyphRendererFlags & RGB_EQUAL)) {
+                infoRec->TEGlyphRendererFlags &= ~RGB_EQUAL;
+                XAAMSG("WARNING:  TEGlyphRenderer cannot support RGB_EQUAL"
+                       " without solid fills\n");
+            }
+        }
+        else {
+            if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST)
+                infoRec->TEGlyphRenderer = XAATEGlyphRendererScanlineMSBFirst;
+            else
+                infoRec->TEGlyphRenderer = XAATEGlyphRendererScanlineLSBFirst;
+        }
+
+        if (!HaveSolidFillRect &&
+            (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {
+            infoRec->TEGlyphRendererFlags &= ~TRANSPARENCY_ONLY;
+            XAAMSG("WARNING:  TEGlyphRenderer cannot support TRANPARENCY_ONLY"
+                   " without solid fills\n");
+        }
+    }
+
+    /**** NonTE Glyphs ****/
+
+    if (infoRec->NonTEGlyphRenderer) {
+        XAAMSG("\tDriver provided NonTEGlyphRenderer replacement\n");
+    }
+    else if (infoRec->WriteBitmap &&
+             !(infoRec->WriteBitmapFlags & NO_TRANSPARENCY)) {
+        infoRec->NonTEGlyphRenderer = XAANonTEGlyphRenderer;
+        infoRec->NonTEGlyphRendererFlags = infoRec->WriteBitmapFlags;
+    }
+
+    /**** WritePixmap ****/
+
+    if (infoRec->WritePixmap &&
+        !xf86ReturnOptValBool(options, XAAOPT_WRITE_PIXMAP, FALSE)) {
+        XAAMSG("\tDriver provided WritePixmap replacement\n");
+    }
+    else if (HaveImageWriteRect) {
+        infoRec->WritePixmap = XAAWritePixmap;
+        infoRec->WritePixmapFlags =
+            infoRec->ImageWriteFlags | CONVERT_32BPP_TO_24BPP;
+    }
+    else if (HaveScanlineImageWriteRect) {
+        infoRec->WritePixmap = XAAWritePixmapScanline;
+        infoRec->WritePixmapFlags = infoRec->ScanlineImageWriteFlags;
+    }
+    else
+        infoRec->WritePixmap = NULL;
+
+    /**** ReadPixmap ****/
+
+    if (infoRec->ReadPixmap) {
+        XAAMSG("\tDriver provided ReadPixmap replacement\n");
+    }
+
+    /************** GC Level *************/
+
+    /**** CopyArea ****/
+
+    if (infoRec->CopyArea) {
+        XAAMSG("\tDriver provided GC level CopyArea replacement\n");
+    }
+    else if (infoRec->ScreenToScreenBitBlt) {
+        infoRec->CopyArea = XAACopyArea;
+        infoRec->CopyAreaFlags = infoRec->ScreenToScreenBitBltFlags;
+
+        /* most GC level primitives use one mid-level primitive so
+           the GC level primitive gets the mid-level primitive flag
+           and we use that at GC validation time.  But CopyArea uses
+           more than one mid-level primitive so we have to essentially
+           do a GC validation every time that primitive is used.
+           The CopyAreaFlags would only be used for filtering out the
+           common denominators.  Here we assume that if you don't do
+           ScreenToScreenBitBlt you aren't going to do the others.
+           We also assume that ScreenToScreenBitBlt has the least
+           restrictions. */
+    }
+
+    if (infoRec->CopyPlane) {
+        XAAMSG("\tDriver provided GC level CopyPlane replacement\n");
+    }
+    else if (infoRec->WriteBitmap &&
+             !(infoRec->WriteBitmapFlags & TRANSPARENCY_ONLY)) {
+        infoRec->CopyPlane = XAACopyPlaneColorExpansion;
+        infoRec->CopyPlaneFlags = infoRec->WriteBitmapFlags;
+    }
+
+    if (infoRec->PushPixelsSolid) {
+        XAAMSG("\tDriver provided GC level PushPixelsSolid replacement\n");
+    }
+    else if (infoRec->WriteBitmap &&
+             !(infoRec->WriteBitmapFlags & NO_TRANSPARENCY)) {
+        infoRec->PushPixelsSolid = XAAPushPixelsSolidColorExpansion;
+        infoRec->PushPixelsFlags = infoRec->WriteBitmapFlags;
+    }
+
+    if (infoRec->FillSolidRects) {
+        if (!infoRec->PolyFillRectSolid) {
+            infoRec->PolyFillRectSolid = XAAPolyFillRect;
+            infoRec->PolyFillRectSolidFlags = infoRec->FillSolidRectsFlags;
+        }
+    }
+    if (infoRec->FillSolidSpans) {
+        if (!infoRec->FillSpansSolid) {
+            infoRec->FillSpansSolid = XAAFillSpans;
+            infoRec->FillSpansSolidFlags = infoRec->FillSolidSpansFlags;
+        }
+    }
+
+    if (infoRec->FillMono8x8PatternRects || infoRec->FillColor8x8PatternRects ||
+        infoRec->FillCacheBltRects || infoRec->FillColorExpandRects ||
+        infoRec->FillCacheExpandRects) {
+        if (!infoRec->PolyFillRectStippled) {
+
+            infoRec->PolyFillRectStippled = XAAPolyFillRect;
+            infoRec->PolyFillRectStippledFlags = 0;
+        }
+    }
+
+    if (infoRec->FillMono8x8PatternSpans || infoRec->FillColor8x8PatternSpans ||
+        infoRec->FillCacheBltSpans || infoRec->FillColorExpandSpans ||
+        infoRec->FillCacheExpandSpans) {
+        if (!infoRec->FillSpansStippled) {
+
+            infoRec->FillSpansStippled = XAAFillSpans;
+            infoRec->FillSpansStippledFlags = 0;
+        }
+    }
+
+    if (infoRec->FillMono8x8PatternRects || infoRec->FillColor8x8PatternRects ||
+        infoRec->FillCacheBltRects || infoRec->FillColorExpandRects ||
+        infoRec->FillCacheExpandRects) {
+        if (!infoRec->PolyFillRectOpaqueStippled) {
+
+            infoRec->PolyFillRectOpaqueStippled = XAAPolyFillRect;
+            infoRec->PolyFillRectOpaqueStippledFlags = 0;
+        }
+    }
+
+    if (infoRec->FillMono8x8PatternSpans || infoRec->FillColor8x8PatternSpans ||
+        infoRec->FillCacheBltSpans || infoRec->FillColorExpandSpans ||
+        infoRec->FillCacheExpandSpans) {
+        if (!infoRec->FillSpansOpaqueStippled) {
+
+            infoRec->FillSpansOpaqueStippled = XAAFillSpans;
+            infoRec->FillSpansOpaqueStippledFlags = 0;
+        }
+    }
+
+    if (infoRec->FillMono8x8PatternRects || infoRec->FillColor8x8PatternRects ||
+        infoRec->FillCacheBltRects || infoRec->FillImageWriteRects) {
+        if (!infoRec->PolyFillRectTiled) {
+
+            infoRec->PolyFillRectTiled = XAAPolyFillRect;
+            infoRec->PolyFillRectTiledFlags = 0;
+        }
+    }
+
+    if (infoRec->FillMono8x8PatternSpans || infoRec->FillColor8x8PatternSpans ||
+        infoRec->FillCacheBltSpans) {
+        if (!infoRec->FillSpansTiled) {
+
+            infoRec->FillSpansTiled = XAAFillSpans;
+            infoRec->FillSpansTiledFlags = 0;
+        }
+    }
+
+    if (infoRec->TEGlyphRenderer &&
+        !(infoRec->TEGlyphRendererFlags & NO_TRANSPARENCY)) {
+
+        if (!infoRec->PolyText8TE) {
+            infoRec->PolyText8TE = XAAPolyText8TEColorExpansion;
+            infoRec->PolyText8TEFlags = infoRec->TEGlyphRendererFlags;
+        }
+
+        if (!infoRec->PolyText16TE) {
+            infoRec->PolyText16TE = XAAPolyText16TEColorExpansion;
+            infoRec->PolyText16TEFlags = infoRec->TEGlyphRendererFlags;
+        }
+
+        if (!infoRec->PolyGlyphBltTE) {
+            infoRec->PolyGlyphBltTE = XAAPolyGlyphBltTEColorExpansion;
+            infoRec->PolyGlyphBltTEFlags = infoRec->TEGlyphRendererFlags;
+        }
+    }
+
+    if (infoRec->TEGlyphRenderer &&
+        !(infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {
+
+        if (!infoRec->ImageText8TE) {
+            infoRec->ImageText8TE = XAAImageText8TEColorExpansion;
+            infoRec->ImageText8TEFlags = infoRec->TEGlyphRendererFlags;
+        }
+
+        if (!infoRec->ImageText16TE) {
+            infoRec->ImageText16TE = XAAImageText16TEColorExpansion;
+            infoRec->ImageText16TEFlags = infoRec->TEGlyphRendererFlags;
+        }
+
+        if (!infoRec->ImageGlyphBltTE) {
+            infoRec->ImageGlyphBltTE = XAAImageGlyphBltTEColorExpansion;
+            infoRec->ImageGlyphBltTEFlags = infoRec->TEGlyphRendererFlags;
+        }
+    }
+
+    if (infoRec->NonTEGlyphRenderer) {
+        if (!infoRec->PolyText8NonTE) {
+            infoRec->PolyText8NonTE = XAAPolyText8NonTEColorExpansion;
+            infoRec->PolyText8NonTEFlags = infoRec->NonTEGlyphRendererFlags;
+        }
+
+        if (!infoRec->PolyText16NonTE) {
+            infoRec->PolyText16NonTE = XAAPolyText16NonTEColorExpansion;
+            infoRec->PolyText16NonTEFlags = infoRec->NonTEGlyphRendererFlags;
+        }
+        if (!infoRec->PolyGlyphBltNonTE) {
+            infoRec->PolyGlyphBltNonTE = XAAPolyGlyphBltNonTEColorExpansion;
+            infoRec->PolyGlyphBltNonTEFlags = infoRec->NonTEGlyphRendererFlags;
+        }
+    }
+
+    if (infoRec->NonTEGlyphRenderer && HaveSolidFillRect) {
+        if (!infoRec->ImageText8NonTE) {
+            infoRec->ImageText8NonTE = XAAImageText8NonTEColorExpansion;
+            infoRec->ImageText8NonTEFlags = infoRec->NonTEGlyphRendererFlags;
+        }
+
+        if (!infoRec->ImageText16NonTE) {
+            infoRec->ImageText16NonTE = XAAImageText16NonTEColorExpansion;
+            infoRec->ImageText16NonTEFlags = infoRec->NonTEGlyphRendererFlags;
+        }
+
+        if (!infoRec->ImageGlyphBltNonTE) {
+            infoRec->ImageGlyphBltNonTE = XAAImageGlyphBltNonTEColorExpansion;
+            infoRec->ImageGlyphBltNonTEFlags = infoRec->NonTEGlyphRendererFlags;
+        }
+    }
+
+    if (!infoRec->PolyRectangleThinSolid && HaveSolidHorVertLine) {
+        infoRec->PolyRectangleThinSolid = XAAPolyRectangleThinSolid;
+        infoRec->PolyRectangleThinSolidFlags = infoRec->SolidLineFlags;
+    }
+
+    if (!infoRec->FillPolygonSolid && HaveSolidFillRect) {
+        infoRec->FillPolygonSolid = XAAFillPolygonSolid;
+        infoRec->FillPolygonSolidFlags = infoRec->SolidFillFlags;
+    }
+
+    if (!infoRec->FillPolygonStippled && (HaveMono8x8PatternFillRect ||
+                                          HaveScreenToScreenColorExpandFill ||
+                                          HaveScreenToScreenCopy)) {
+        infoRec->FillPolygonStippled = XAAFillPolygonStippled;
+        infoRec->FillPolygonStippledFlags = infoRec->SolidFillFlags;
+    }
+
+    if (!infoRec->FillPolygonOpaqueStippled && (HaveMono8x8PatternFillRect ||
+                                                HaveScreenToScreenColorExpandFill
+                                                || HaveScreenToScreenCopy)) {
+        infoRec->FillPolygonOpaqueStippled = XAAFillPolygonStippled;
+        infoRec->FillPolygonOpaqueStippledFlags = infoRec->SolidFillFlags;
+    }
+
+    if (!infoRec->FillPolygonTiled && (HaveMono8x8PatternFillRect ||
+                                       HaveScreenToScreenColorExpandFill ||
+                                       HaveScreenToScreenCopy)) {
+        infoRec->FillPolygonTiled = XAAFillPolygonTiled;
+        infoRec->FillPolygonTiledFlags = infoRec->SolidFillFlags;
+    }
+
+    if (!infoRec->PolyFillArcSolid && HaveSolidFillRect) {
+        infoRec->PolyFillArcSolid = XAAPolyFillArcSolid;
+        infoRec->PolyFillArcSolidFlags = infoRec->SolidFillFlags;
+    }
+
+    if (!infoRec->PolylinesWideSolid && HaveSolidFillRect) {
+        infoRec->PolylinesWideSolid = XAAPolylinesWideSolid;
+        infoRec->PolylinesWideSolidFlags =
+            infoRec->SolidFillFlags | GXCOPY_ONLY;
+    }
+
+    if (!infoRec->PutImage && (infoRec->WritePixmap ||
+                               (infoRec->WriteBitmap &&
+                                !(infoRec->
+                                  WriteBitmapFlags & TRANSPARENCY_ONLY)))) {
+        infoRec->PutImage = XAAPutImage;
+
+        /* See comment for CopyArea above.  But here we make fewer 
+           assumptions.  The driver can provide the PutImageFlags if
+           it wants too */
+    }
+
+    if (HaveSolidHorVertLine &&
+        (HaveSolidBresenhamLine || (HaveSolidTwoPointLine &&
+                                    (infoRec->
+                                     ClippingFlags &
+                                     HARDWARE_CLIP_SOLID_LINE)))) {
+        if (!infoRec->PolylinesThinSolid) {
+            infoRec->PolylinesThinSolid = XAAPolyLines;
+            infoRec->PolylinesThinSolidFlags = infoRec->SolidLineFlags;
+        }
+        if (!infoRec->PolySegmentThinSolid) {
+            infoRec->PolySegmentThinSolid = XAAPolySegment;
+            infoRec->PolySegmentThinSolidFlags = infoRec->SolidLineFlags;
+        }
+    }
+
+    if (HaveDashedBresenhamLine || (HaveDashedTwoPointLine &&
+                                    (infoRec->
+                                     ClippingFlags &
+                                     HARDWARE_CLIP_DASHED_LINE))) {
+        if (!infoRec->PolylinesThinDashed) {
+            infoRec->PolylinesThinDashed = XAAPolyLinesDashed;
+            infoRec->PolylinesThinDashedFlags = infoRec->DashedLineFlags;
+        }
+        if (!infoRec->PolySegmentThinDashed) {
+            infoRec->PolySegmentThinDashed = XAAPolySegmentDashed;
+            infoRec->PolySegmentThinDashedFlags = infoRec->DashedLineFlags;
+        }
+    }
+
+    if (infoRec->PolylinesThinDashed || infoRec->PolySegmentThinDashed) {
+        if (!infoRec->ComputeDash)
+            infoRec->ComputeDash = XAAComputeDash;
+    }
+
+    {
+        Bool haveTexture = infoRec->CPUToScreenTextureFormats &&
+            infoRec->CPUToScreenTextureDstFormats &&
+            infoRec->SetupForCPUToScreenTexture2 &&
+            infoRec->SubsequentCPUToScreenTexture;
+        Bool haveAlphaTexture = infoRec->CPUToScreenAlphaTextureFormats &&
+            infoRec->CPUToScreenAlphaTextureDstFormats &&
+            infoRec->SetupForCPUToScreenAlphaTexture2 &&
+            infoRec->SubsequentCPUToScreenAlphaTexture;
+
+        if (!infoRec->Composite && (haveTexture || haveAlphaTexture))
+            infoRec->Composite = XAADoComposite;
+
+        if (!infoRec->Glyphs && infoRec->WriteBitmap &&
+            !(infoRec->WriteBitmapFlags & NO_TRANSPARENCY)) {
+            infoRec->Glyphs = XAADoGlyphs;
+        }
+    }
+
+    /************  Validation Functions **************/
+
+    if (!infoRec->ValidateCopyArea && infoRec->CopyArea) {
+        infoRec->CopyAreaMask = GCWhenForced;
+        if ((infoRec->CopyAreaFlags & GXCOPY_ONLY) ||
+            (infoRec->CopyAreaFlags & ROP_NEEDS_SOURCE))
+            infoRec->CopyAreaMask |= GCFunction;
+        if (infoRec->CopyAreaFlags & NO_PLANEMASK)
+            infoRec->CopyAreaMask |= GCPlaneMask;
+        infoRec->ValidateCopyArea = XAAValidateCopyArea;
+    }
+
+    if (!infoRec->ValidateCopyPlane && infoRec->CopyPlane) {
+        infoRec->CopyPlaneMask = GCWhenForced;
+        if ((infoRec->CopyPlaneFlags & GXCOPY_ONLY) ||
+            (infoRec->CopyPlaneFlags & ROP_NEEDS_SOURCE))
+            infoRec->CopyPlaneMask |= GCFunction;
+        if (infoRec->CopyPlaneFlags & NO_PLANEMASK)
+            infoRec->CopyPlaneMask |= GCPlaneMask;
+        if (infoRec->CopyPlaneFlags & RGB_EQUAL)
+            infoRec->CopyPlaneMask |= GCForeground | GCBackground;
+        infoRec->ValidateCopyPlane = XAAValidateCopyPlane;
+    }
+
+    if (!infoRec->ValidatePutImage && infoRec->PutImage) {
+        infoRec->PutImageMask = GCWhenForced;
+        if ((infoRec->PutImageFlags & GXCOPY_ONLY) ||
+            (infoRec->PutImageFlags & ROP_NEEDS_SOURCE))
+            infoRec->PutImageMask |= GCFunction;
+        if (infoRec->PutImageFlags & NO_PLANEMASK)
+            infoRec->PutImageMask |= GCPlaneMask;
+        if (infoRec->PutImageFlags & RGB_EQUAL)
+            infoRec->PutImageMask |= GCForeground | GCBackground;
+        infoRec->ValidatePutImage = XAAValidatePutImage;
+    }
+
+    if (!infoRec->ValidatePushPixels && infoRec->PushPixelsSolid) {
+        infoRec->PushPixelsMask = GCFillStyle;
+        if ((infoRec->PushPixelsFlags & GXCOPY_ONLY) ||
+            (infoRec->PushPixelsFlags & ROP_NEEDS_SOURCE) ||
+            (infoRec->PushPixelsFlags & TRANSPARENCY_GXCOPY_ONLY))
+            infoRec->PushPixelsMask |= GCFunction;
+        if (infoRec->PushPixelsFlags & NO_PLANEMASK)
+            infoRec->PushPixelsMask |= GCPlaneMask;
+        if (infoRec->PushPixelsFlags & RGB_EQUAL)
+            infoRec->PushPixelsMask |= GCForeground;
+        infoRec->ValidatePushPixels = XAAValidatePushPixels;
+    }
+
+    /* By default XAA assumes the FillSpans, PolyFillRects, FillPolygon
+       and PolyFillArcs have the same restrictions.  If you supply GC 
+       level replacements for any of these and alter this relationship 
+       you may need to supply replacement validation routines */
+
+    if (!infoRec->ValidateFillSpans &&
+        (infoRec->FillSpansSolid || infoRec->FillSpansStippled ||
+         infoRec->FillSpansOpaqueStippled || infoRec->FillSpansTiled)) {
+
+        int compositeFlags = infoRec->FillSpansSolidFlags |
+            infoRec->FillSpansStippledFlags |
+            infoRec->FillSpansOpaqueStippledFlags |
+            infoRec->FillSpansTiledFlags;
+
+        infoRec->FillSpansMask = GCFillStyle | GCTile | GCStipple;
+
+        if ((compositeFlags & GXCOPY_ONLY) ||
+            (compositeFlags & ROP_NEEDS_SOURCE))
+            infoRec->FillSpansMask |= GCFunction;
+        if (compositeFlags & NO_PLANEMASK)
+            infoRec->FillSpansMask |= GCPlaneMask;
+        if (compositeFlags & RGB_EQUAL)
+            infoRec->FillSpansMask |= GCForeground;
+        infoRec->ValidateFillSpans = XAAValidateFillSpans;
+    }
+
+    /* By default XAA only provides Validations for the GlyphBlt
+       functions and not the text higher up. This is because the
+       Text8/16 and GlyphBlt are linked.  If you break this linkage,
+       you may need to have the driver supply its own Validation
+       routines */
+
+    if (!infoRec->ValidatePolyGlyphBlt &&
+        (infoRec->PolyGlyphBltTE || infoRec->PolyGlyphBltNonTE)) {
+        int compositeFlags = infoRec->PolyGlyphBltTEFlags |
+            infoRec->PolyGlyphBltNonTEFlags;
+
+        infoRec->PolyGlyphBltMask = GCFillStyle | GCFont;
+        if ((compositeFlags & GXCOPY_ONLY) ||
+            (compositeFlags & ROP_NEEDS_SOURCE) ||
+            (infoRec->PolyGlyphBltNonTEFlags & TRANSPARENCY_GXCOPY_ONLY))
+            infoRec->PolyGlyphBltMask |= GCFunction;
+        if (compositeFlags & NO_PLANEMASK)
+            infoRec->PolyGlyphBltMask |= GCPlaneMask;
+        if (compositeFlags & RGB_EQUAL)
+            infoRec->PolyGlyphBltMask |= GCForeground;
+        infoRec->ValidatePolyGlyphBlt = XAAValidatePolyGlyphBlt;
+    }
+
+    if (!infoRec->ValidateImageGlyphBlt &&
+        (infoRec->ImageGlyphBltTE || infoRec->ImageGlyphBltNonTE)) {
+        int compositeFlags = infoRec->ImageGlyphBltTEFlags |
+            infoRec->ImageGlyphBltNonTEFlags;
+
+        if (infoRec->ImageGlyphBltNonTE)
+            compositeFlags |= infoRec->SolidFillFlags;
+
+        infoRec->ImageGlyphBltMask = GCFont;
+        if (compositeFlags & NO_PLANEMASK)
+            infoRec->ImageGlyphBltMask |= GCPlaneMask;
+        if (compositeFlags & RGB_EQUAL)
+            infoRec->ImageGlyphBltMask |= GCForeground | GCBackground;
+        infoRec->ValidateImageGlyphBlt = XAAValidateImageGlyphBlt;
+    }
+
+    /* By default XAA only provides a Validation function for the 
+       Polylines and does segments and polylines at the same time */
+
+    if (!infoRec->ValidatePolylines && infoRec->ValidateFillSpans) {
+        int compositeFlags = infoRec->PolyRectangleThinSolidFlags |
+            infoRec->PolylinesWideSolidFlags |
+            infoRec->PolylinesThinSolidFlags |
+            infoRec->PolySegmentThinSolidFlags |
+            infoRec->PolySegmentThinDashedFlags |
+            infoRec->PolylinesThinDashedFlags;
+
+        infoRec->ValidatePolylines = XAAValidatePolylines;
+        infoRec->PolylinesMask =
+            infoRec->FillSpansMask | GCLineStyle | GCLineWidth;
+
+        if (infoRec->PolySegmentThinDashed || infoRec->PolylinesThinDashed)
+            infoRec->PolylinesMask |= GCDashList;
+        if (compositeFlags & NO_PLANEMASK)
+            infoRec->PolylinesMask |= GCPlaneMask;
+        if ((compositeFlags & GXCOPY_ONLY) ||
+            (compositeFlags & ROP_NEEDS_SOURCE))
+            infoRec->PolylinesMask |= GCFunction;
+        if (compositeFlags & RGB_EQUAL)
+            infoRec->PolylinesMask |= GCForeground;
+    }
+
+    /**** Fill choosers ****/
+
+    if (!infoRec->StippledFillChooser)
+        infoRec->StippledFillChooser = XAAStippledFillChooser;
+
+    if (!infoRec->OpaqueStippledFillChooser)
+        infoRec->OpaqueStippledFillChooser = XAAOpaqueStippledFillChooser;
+
+    if (!infoRec->TiledFillChooser)
+        infoRec->TiledFillChooser = XAATiledFillChooser;
+
+    /**** Setup the pixmap cache ****/
+
+    if (infoRec->WriteBitmapToCache) {
+    }
+    else if (infoRec->WriteBitmap &&
+             !(infoRec->WriteBitmapFlags & TRANSPARENCY_ONLY))
+        infoRec->WriteBitmapToCache = XAAWriteBitmapToCache;
+    else if (infoRec->Flags & LINEAR_FRAMEBUFFER)
+        infoRec->WriteBitmapToCache = XAAWriteBitmapToCacheLinear;
+    else
+        infoRec->PixmapCacheFlags |= DO_NOT_BLIT_STIPPLES;
+
+    if (infoRec->WritePixmapToCache) {
+    }
+    else if (infoRec->WritePixmap && !(infoRec->WritePixmapFlags & NO_GXCOPY))
+        infoRec->WritePixmapToCache = XAAWritePixmapToCache;
+    else if (infoRec->Flags & LINEAR_FRAMEBUFFER)
+        infoRec->WritePixmapToCache = XAAWritePixmapToCacheLinear;
+    else
+        infoRec->Flags &= ~PIXMAP_CACHE;
+
+    if (xf86ReturnOptValBool(options, XAAOPT_PIXMAP_CACHE, FALSE))
+        infoRec->Flags &= ~PIXMAP_CACHE;
+
+    if (infoRec->WriteMono8x8PatternToCache) {
+    }
+    else if (infoRec->PixmapCacheFlags & CACHE_MONO_8x8) {
+        if (infoRec->WritePixmapToCache)
+            infoRec->WriteMono8x8PatternToCache = XAAWriteMono8x8PatternToCache;
+        else
+            infoRec->PixmapCacheFlags &= ~CACHE_MONO_8x8;
+    }
+
+    if (infoRec->WriteColor8x8PatternToCache) {
+    }
+    else if (infoRec->PixmapCacheFlags & CACHE_COLOR_8x8) {
+        if (infoRec->WritePixmapToCache && infoRec->WriteBitmapToCache)
+            infoRec->WriteColor8x8PatternToCache =
+                XAAWriteColor8x8PatternToCache;
+        else
+            infoRec->PixmapCacheFlags &= ~CACHE_COLOR_8x8;
+    }
+
+    if (infoRec->CachePixelGranularity < 0) {
+        switch (pScrn->bitsPerPixel) {
+        case 24:
+        case 8:
+            infoRec->CachePixelGranularity = 4;
+            break;
+        case 16:
+            infoRec->CachePixelGranularity = 2;
+            break;
+        case 32:
+            infoRec->CachePixelGranularity = 1;
+            break;
+        default:
+            break;
+        }
+
+        if (BITMAP_SCANLINE_PAD == 64)
+            infoRec->CachePixelGranularity *= 2;
+    }
+
+    free(options);
+
+    if (!infoRec->CacheTile && infoRec->WritePixmapToCache)
+        infoRec->CacheTile = XAACacheTile;
+    if (!infoRec->CacheMonoStipple && infoRec->WritePixmapToCache)
+        infoRec->CacheMonoStipple = XAACacheMonoStipple;
+    if (!infoRec->CacheStipple && infoRec->WriteBitmapToCache)
+        infoRec->CacheStipple = XAACacheStipple;
+    if (!infoRec->CacheMono8x8Pattern && infoRec->WriteMono8x8PatternToCache)
+        infoRec->CacheMono8x8Pattern = XAACacheMono8x8Pattern;
+    if (!infoRec->CacheColor8x8Pattern && infoRec->WriteColor8x8PatternToCache)
+        infoRec->CacheColor8x8Pattern = XAACacheColor8x8Pattern;
+
+    if ((infoRec->Flags & PIXMAP_CACHE) && !infoRec->InitPixmapCache) {
+        infoRec->InitPixmapCache = XAAInitPixmapCache;
+        infoRec->ClosePixmapCache = XAAClosePixmapCache;
+    }
+
+    return TRUE;
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaLine.c b/xorg-server/hw/xfree86/xaa/xaaLine.c
index d94f1f4e0..d7c60975e 100644
--- a/xorg-server/hw/xfree86/xaa/xaaLine.c
+++ b/xorg-server/hw/xfree86/xaa/xaaLine.c
@@ -1,394 +1,422 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <stdlib.h>

-

-#include <X11/X.h>

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "miline.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-

-

-void

-#ifdef POLYSEGMENT

-XAAPolySegment(

-    DrawablePtr	pDrawable,

-    GCPtr	pGC,

-    int		nseg,

-    xSegment	*pSeg

-#else

-XAAPolyLines(

-    DrawablePtr pDrawable,

-    GCPtr	pGC,

-    int		mode,		/* Origin or Previous */

-    int		npt,		/* number of points */

-    DDXPointPtr pptInit

-#endif

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    BoxPtr pboxInit = RegionRects(pGC->pCompositeClip);

-    int nboxInit = RegionNumRects(pGC->pCompositeClip);

-    unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);

-    int xorg = pDrawable->x;

-    int yorg = pDrawable->y;

-    int nbox;

-    BoxPtr pbox;

-#ifndef POLYSEGMENT

-    DDXPointPtr ppt;

-#endif

-    int x1, x2, y1, y2, tmp, len;

-

-    if(!nboxInit)

-	return;

-

-    if (infoRec->SolidLineFlags & LINE_LIMIT_COORDS) {

-	int minValX = infoRec->SolidLineLimits.x1;

-	int maxValX = infoRec->SolidLineLimits.x2;

-	int minValY = infoRec->SolidLineLimits.y1;

-	int maxValY = infoRec->SolidLineLimits.y2;

-#ifdef POLYSEGMENT

-	int n = nseg;

-	xSegment *s = pSeg;

-

-	while (n--)

-#else

-	int n = npt;

-	int xorgtmp = xorg;

-	int yorgtmp = yorg;

-

-	ppt = pptInit;

-	x2 = ppt->x + xorgtmp;

-	y2 = ppt->y + yorgtmp;

-	while (--n)

-#endif

-	{

-#ifdef POLYSEGMENT

-	    x1 = s->x1 + xorg;

-	    y1 = s->y1 + yorg;

-	    x2 = s->x2 + xorg;

-	    y2 = s->y2 + yorg;

-	    s++;

-#else

-	    x1 = x2;

-	    y1 = y2;

-	    ++ppt;

-	    if (mode == CoordModePrevious) {

-		xorgtmp = x1;

-		yorgtmp = y1;

-	    }

-	    x2 = ppt->x + xorgtmp;

-	    y2 = ppt->y + yorgtmp;

-#endif

-	    if (x1 > maxValX || x1 < minValX ||

-		x2 > maxValX || x2 < minValX ||

-		y1 > maxValY || y1 < minValY ||

-		y2 > maxValY || y2 < minValY) {

-#ifdef POLYSEGMENT

-		XAAFallbackOps.PolySegment(pDrawable, pGC, nseg, pSeg);

-#else

-		XAAFallbackOps.Polylines(pDrawable, pGC, mode, npt, pptInit);

-#endif

-		return;

-	    }

-	}

-    }

-

-    (*infoRec->SetupForSolidLine)(infoRec->pScrn, pGC->fgPixel,

-					pGC->alu, pGC->planemask);

-

-#ifdef POLYSEGMENT

-    while (nseg--)

-#else

-    ppt = pptInit;

-    x2 = ppt->x + xorg;

-    y2 = ppt->y + yorg;

-    while(--npt)

-#endif

-    {

-	nbox = nboxInit;

-	pbox = pboxInit;

-

-#ifdef POLYSEGMENT

-	x1 = pSeg->x1 + xorg;	

-	y1 = pSeg->y1 + yorg;

-	x2 = pSeg->x2 + xorg;	

-	y2 = pSeg->y2 + yorg;

-	pSeg++;

-#else

-	x1 = x2; 

-	y1 = y2;

-	++ppt;

-	if (mode == CoordModePrevious) {

-	    xorg = x1; 

-	    yorg = y1;

-	}

-	x2 = ppt->x + xorg; 

-	y2 = ppt->y + yorg;

-#endif

-

-	if (x1 == x2) { /* vertical line */

-	    /* make the line go top to bottom of screen, keeping

-	       endpoint semantics

-	    */

-	    if (y1 > y2) {

-		tmp = y2; 

-		y2 = y1 + 1; 

-		y1 = tmp + 1;

-#ifdef POLYSEGMENT

-		if (pGC->capStyle != CapNotLast) y1--;

-#endif

-	    }

-#ifdef POLYSEGMENT

-	    else if (pGC->capStyle != CapNotLast) y2++;

-#endif

-	    /* get to first band that might contain part of line */

-	    while(nbox && (pbox->y2 <= y1)) {

-		pbox++;

-		nbox--;

-	    }

-

-	   /* stop when lower edge of box is beyond end of line */

-	    while(nbox && (y2 >= pbox->y1)) {

-		if ((x1 >= pbox->x1) && (x1 < pbox->x2)) {

-		    tmp = max(y1, pbox->y1);

-		    len = min(y2, pbox->y2) - tmp;

-		    if (len) (*infoRec->SubsequentSolidHorVertLine)(

-				infoRec->pScrn, x1, tmp, len, DEGREES_270);

-		}

-		nbox--;

-		pbox++;

-	    }

-#ifndef POLYSEGMENT

-	    y2 = ppt->y + yorg;

-#endif

-	} else if (y1 == y2) { /* horizontal line */

-	/* force line from left to right, keeping endpoint semantics */

-	    if (x1 > x2) {

-		tmp = x2; 

-		x2 = x1 + 1; 

-		x1 = tmp + 1;

-#ifdef POLYSEGMENT

-		if (pGC->capStyle != CapNotLast)  x1--;

-#endif

-	    }

-#ifdef POLYSEGMENT

-	    else if (pGC->capStyle != CapNotLast) x2++;

-#endif

-

-	    /* find the correct band */

-	    while(nbox && (pbox->y2 <= y1)) {

-		pbox++;

-		nbox--;

-	    }

-

-	    /* try to draw the line, if we haven't gone beyond it */

-	    if (nbox && (pbox->y1 <= y1)) {

-		int orig_y = pbox->y1;

-		/* when we leave this band, we're done */

-		while(nbox && (orig_y == pbox->y1)) {

-		    if (pbox->x2 <= x1) {

-			/* skip boxes until one might contain start point */

-			nbox--;

-			pbox++;

-			continue;

-		    }

-

-		    /* stop if left of box is beyond right of line */

-		    if (pbox->x1 >= x2) {

-			nbox = 0;

-			break;

-		    }

-

-		    tmp = max(x1, pbox->x1);

-		    len = min(x2, pbox->x2) - tmp;

-		    if (len) (*infoRec->SubsequentSolidHorVertLine)(

-				infoRec->pScrn, tmp, y1, len, DEGREES_0);

-		    nbox--;

-		    pbox++;

-		}

-	    }

-#ifndef POLYSEGMENT

-	    x2 = ppt->x + xorg;

-#endif

-	} else{ /* sloped line */

-	    unsigned int oc1, oc2;

-	    int dmin, dmaj, e, octant;

-

-	    if (infoRec->SubsequentSolidBresenhamLine) {

-	        if((dmaj = x2 - x1) < 0) {

-		   dmaj = -dmaj;

-		   octant = XDECREASING;

-		} else octant = 0;		   

-

-	        if((dmin = y2 - y1) < 0) {

-		   dmin = -dmin;

-		   octant |= YDECREASING;

-		}	

-	

-		if(dmin >= dmaj){

-		    tmp = dmin; dmin = dmaj; dmaj = tmp;

-		    octant |= YMAJOR;

-		}

-

-		e = -dmaj - ((bias >> octant) & 1);

-		len = dmaj;

-		dmin <<= 1;

-		dmaj <<= 1;

-	    } else {	/* Muffle compiler */

-		dmin = dmaj = e = octant = len = 0;

-	    }

-

-	    while(nbox--) {

-		oc1 = oc2 = 0;

-		OUTCODES(oc1, x1, y1, pbox);

-		OUTCODES(oc2, x2, y2, pbox);

-		if (!(oc1 | oc2)) {   /* unclipped */

-		    if(infoRec->SubsequentSolidTwoPointLine) {

-			(*infoRec->SubsequentSolidTwoPointLine)(

-				infoRec->pScrn, x1, y1, x2, y2, 

-#ifdef POLYSEGMENT

-			    	(pGC->capStyle != CapNotLast) ? 0 :

-#endif

-				OMIT_LAST

-			);

-		    } else {

-			(*infoRec->SubsequentSolidBresenhamLine)(

-				infoRec->pScrn, x1, y1, dmaj, dmin, e, 

-#ifdef POLYSEGMENT

-			    	(pGC->capStyle != CapNotLast) ? (len+1) :

-#endif

-			    	len, octant);

-		    }

-		    break;

-		} else if (oc1 & oc2) { /* completely clipped */

-		    pbox++;

-		} else if (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_LINE) {

-		    (*infoRec->SetClippingRectangle)(infoRec->pScrn,

-			pbox->x1, pbox->y1, pbox->x2 - 1, pbox->y2 - 1);

-

-		    if(infoRec->SubsequentSolidBresenhamLine) {

-			(*infoRec->SubsequentSolidBresenhamLine)(

-				infoRec->pScrn, x1, y1, dmaj, dmin, e, 

-#ifdef POLYSEGMENT

-			    	(pGC->capStyle != CapNotLast) ? (len+1) :

-#endif

-			    	len, octant);

-		    } else {

-			(*infoRec->SubsequentSolidTwoPointLine)(

-				infoRec->pScrn, x1, y1, x2, y2, 

-#ifdef POLYSEGMENT

-			    	(pGC->capStyle != CapNotLast) ? 0 :

-#endif

-				OMIT_LAST

-			);

-		    }

-		    (*infoRec->DisableClipping)(infoRec->pScrn);

-		    pbox++;

-		} else {

-		    int new_x1 = x1, new_y1 = y1, new_x2 = x2, new_y2 = y2;

-		    int clip1 = 0, clip2 = 0;

-		    int err, adx, ady;

-		    

-		    if(octant & YMAJOR) {

-			ady = dmaj >> 1;

-			adx = dmin >> 1;

-		    } else {

-			ady = dmin >> 1;

-			adx = dmaj >> 1;

-		    }

-

-		    if (miZeroClipLine(pbox->x1, pbox->y1, 

-				       pbox->x2 - 1, pbox->y2 - 1,

-				       &new_x1, &new_y1, &new_x2, &new_y2,

-				       adx, ady, &clip1, &clip2,

-				       octant, bias, oc1, oc2) == -1)

-		    {

-			pbox++;

-			continue;

-		    }

-

-		    if (octant & YMAJOR)

-			len = abs(new_y2 - new_y1);

-		    else

-			len = abs(new_x2 - new_x1);

-#ifdef POLYSEGMENT

-		    if (clip2 != 0 || pGC->capStyle != CapNotLast)

-			len++;

-#else

-		    len += (clip2 != 0);

-#endif

-		    if (len) {

-		    	int abserr, clipdx, clipdy;

-			/* unwind bresenham error term to first point */

-			if (clip1) {

-			    clipdx = abs(new_x1 - x1);

-			    clipdy = abs(new_y1 - y1);

-

-			    if (octant & YMAJOR)

-				err = e + clipdy*dmin - clipdx*dmaj;

-			    else

-				err = e + clipdx*dmin - clipdy*dmaj;

-			} else

-			    err = e;

-

-#define range infoRec->SolidBresenhamLineErrorTermBits

-			abserr = abs(err);			    

-			while((abserr & range) || 

-			      (dmaj & range) ||

-			      (dmin & range)) {

-				dmin >>= 1;

-				dmaj >>= 1;

-				abserr >>= 1;

-				err /= 2;

-			}

-

-			(*infoRec->SubsequentSolidBresenhamLine)(

-				infoRec->pScrn, new_x1, new_y1,

-				dmaj, dmin, err, len, octant);

-		    }

-		    pbox++;

-		}

-	    } /* while (nbox--) */

-	} /* sloped line */

-    } /* while (nline--) */

-

-#ifndef POLYSEGMENT

-    /* paint the last point if the end style isn't CapNotLast.

-       (Assume that a projecting, butt, or round cap that is one

-        pixel wide is the same as the single pixel of the endpoint.)

-    */

-

-    if ((pGC->capStyle != CapNotLast) &&

-	((ppt->x + xorg != pptInit->x + pDrawable->x) ||

-	 (ppt->y + yorg != pptInit->y + pDrawable->y) ||

-	 (ppt == pptInit + 1)))

-    {

-	nbox = nboxInit;

-	pbox = pboxInit;

-	while (nbox--)

-	{

-	    if ((x2 >= pbox->x1) && (y2 >= pbox->y1) &&

-		(x2 <  pbox->x2) && (y2 <  pbox->y2))

-	    {

-		(*infoRec->SubsequentSolidHorVertLine)(

-			infoRec->pScrn, x2, y2, 1, DEGREES_0);

-		break;

-	    }

-	    else

-		pbox++;

-	}

-    }

-#endif

-

-    SET_SYNC_FLAG(infoRec);

-}

-

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include <X11/X.h>
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "miline.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+
+void
+#ifdef POLYSEGMENT
+ XAAPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pSeg
+#else
+XAAPolyLines(DrawablePtr pDrawable, GCPtr pGC, int mode,        /* Origin or Previous */
+             int npt,           /* number of points */
+             DDXPointPtr pptInit
+#endif
+    )
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    BoxPtr pboxInit = RegionRects(pGC->pCompositeClip);
+    int nboxInit = RegionNumRects(pGC->pCompositeClip);
+    unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);
+    int xorg = pDrawable->x;
+    int yorg = pDrawable->y;
+    int nbox;
+    BoxPtr pbox;
+
+#ifndef POLYSEGMENT
+    DDXPointPtr ppt;
+#endif
+    int x1, x2, y1, y2, tmp, len;
+
+    if (!nboxInit)
+        return;
+
+    if (infoRec->SolidLineFlags & LINE_LIMIT_COORDS) {
+        int minValX = infoRec->SolidLineLimits.x1;
+        int maxValX = infoRec->SolidLineLimits.x2;
+        int minValY = infoRec->SolidLineLimits.y1;
+        int maxValY = infoRec->SolidLineLimits.y2;
+
+#ifdef POLYSEGMENT
+        int n = nseg;
+        xSegment *s = pSeg;
+
+        while (n--)
+#else
+        int n = npt;
+        int xorgtmp = xorg;
+        int yorgtmp = yorg;
+
+        ppt = pptInit;
+        x2 = ppt->x + xorgtmp;
+        y2 = ppt->y + yorgtmp;
+        while (--n)
+#endif
+        {
+#ifdef POLYSEGMENT
+            x1 = s->x1 + xorg;
+            y1 = s->y1 + yorg;
+            x2 = s->x2 + xorg;
+            y2 = s->y2 + yorg;
+            s++;
+#else
+            x1 = x2;
+            y1 = y2;
+            ++ppt;
+            if (mode == CoordModePrevious) {
+                xorgtmp = x1;
+                yorgtmp = y1;
+            }
+            x2 = ppt->x + xorgtmp;
+            y2 = ppt->y + yorgtmp;
+#endif
+            if (x1 > maxValX || x1 < minValX ||
+                x2 > maxValX || x2 < minValX ||
+                y1 > maxValY || y1 < minValY || y2 > maxValY || y2 < minValY) {
+#ifdef POLYSEGMENT
+                XAAFallbackOps.PolySegment(pDrawable, pGC, nseg, pSeg);
+#else
+                XAAFallbackOps.Polylines(pDrawable, pGC, mode, npt, pptInit);
+#endif
+                return;
+            }
+        }
+    }
+
+    (*infoRec->SetupForSolidLine) (infoRec->pScrn, pGC->fgPixel,
+                                   pGC->alu, pGC->planemask);
+
+#ifdef POLYSEGMENT
+    while (nseg--)
+#else
+    ppt = pptInit;
+    x2 = ppt->x + xorg;
+    y2 = ppt->y + yorg;
+    while (--npt)
+#endif
+    {
+        nbox = nboxInit;
+        pbox = pboxInit;
+
+#ifdef POLYSEGMENT
+        x1 = pSeg->x1 + xorg;
+        y1 = pSeg->y1 + yorg;
+        x2 = pSeg->x2 + xorg;
+        y2 = pSeg->y2 + yorg;
+        pSeg++;
+#else
+        x1 = x2;
+        y1 = y2;
+        ++ppt;
+        if (mode == CoordModePrevious) {
+            xorg = x1;
+            yorg = y1;
+        }
+        x2 = ppt->x + xorg;
+        y2 = ppt->y + yorg;
+#endif
+
+        if (x1 == x2) {         /* vertical line */
+            /* make the line go top to bottom of screen, keeping
+               endpoint semantics
+             */
+            if (y1 > y2) {
+                tmp = y2;
+                y2 = y1 + 1;
+                y1 = tmp + 1;
+#ifdef POLYSEGMENT
+                if (pGC->capStyle != CapNotLast)
+                    y1--;
+#endif
+            }
+#ifdef POLYSEGMENT
+            else if (pGC->capStyle != CapNotLast)
+                y2++;
+#endif
+            /* get to first band that might contain part of line */
+            while (nbox && (pbox->y2 <= y1)) {
+                pbox++;
+                nbox--;
+            }
+
+            /* stop when lower edge of box is beyond end of line */
+            while (nbox && (y2 >= pbox->y1)) {
+                if ((x1 >= pbox->x1) && (x1 < pbox->x2)) {
+                    tmp = max(y1, pbox->y1);
+                    len = min(y2, pbox->y2) - tmp;
+                    if (len)
+                        (*infoRec->SubsequentSolidHorVertLine) (infoRec->pScrn,
+                                                                x1, tmp, len,
+                                                                DEGREES_270);
+                }
+                nbox--;
+                pbox++;
+            }
+#ifndef POLYSEGMENT
+            y2 = ppt->y + yorg;
+#endif
+        }
+        else if (y1 == y2) {    /* horizontal line */
+            /* force line from left to right, keeping endpoint semantics */
+            if (x1 > x2) {
+                tmp = x2;
+                x2 = x1 + 1;
+                x1 = tmp + 1;
+#ifdef POLYSEGMENT
+                if (pGC->capStyle != CapNotLast)
+                    x1--;
+#endif
+            }
+#ifdef POLYSEGMENT
+            else if (pGC->capStyle != CapNotLast)
+                x2++;
+#endif
+
+            /* find the correct band */
+            while (nbox && (pbox->y2 <= y1)) {
+                pbox++;
+                nbox--;
+            }
+
+            /* try to draw the line, if we haven't gone beyond it */
+            if (nbox && (pbox->y1 <= y1)) {
+                int orig_y = pbox->y1;
+
+                /* when we leave this band, we're done */
+                while (nbox && (orig_y == pbox->y1)) {
+                    if (pbox->x2 <= x1) {
+                        /* skip boxes until one might contain start point */
+                        nbox--;
+                        pbox++;
+                        continue;
+                    }
+
+                    /* stop if left of box is beyond right of line */
+                    if (pbox->x1 >= x2) {
+                        nbox = 0;
+                        break;
+                    }
+
+                    tmp = max(x1, pbox->x1);
+                    len = min(x2, pbox->x2) - tmp;
+                    if (len)
+                        (*infoRec->SubsequentSolidHorVertLine) (infoRec->pScrn,
+                                                                tmp, y1, len,
+                                                                DEGREES_0);
+                    nbox--;
+                    pbox++;
+                }
+            }
+#ifndef POLYSEGMENT
+            x2 = ppt->x + xorg;
+#endif
+        }
+        else {                  /* sloped line */
+            unsigned int oc1, oc2;
+            int dmin, dmaj, e, octant;
+
+            if (infoRec->SubsequentSolidBresenhamLine) {
+                if ((dmaj = x2 - x1) < 0) {
+                    dmaj = -dmaj;
+                    octant = XDECREASING;
+                }
+                else
+                    octant = 0;
+
+                if ((dmin = y2 - y1) < 0) {
+                    dmin = -dmin;
+                    octant |= YDECREASING;
+                }
+
+                if (dmin >= dmaj) {
+                    tmp = dmin;
+                    dmin = dmaj;
+                    dmaj = tmp;
+                    octant |= YMAJOR;
+                }
+
+                e = -dmaj - ((bias >> octant) & 1);
+                len = dmaj;
+                dmin <<= 1;
+                dmaj <<= 1;
+            }
+            else {              /* Muffle compiler */
+                dmin = dmaj = e = octant = len = 0;
+            }
+
+            while (nbox--) {
+                oc1 = oc2 = 0;
+                OUTCODES(oc1, x1, y1, pbox);
+                OUTCODES(oc2, x2, y2, pbox);
+                if (!(oc1 | oc2)) {     /* unclipped */
+                    if (infoRec->SubsequentSolidTwoPointLine) {
+                        (*infoRec->SubsequentSolidTwoPointLine) (infoRec->pScrn,
+                                                                 x1, y1, x2, y2,
+#ifdef POLYSEGMENT
+                                                                 (pGC->
+                                                                  capStyle !=
+                                                                  CapNotLast) ?
+                                                                 0 :
+#endif
+                                                                 OMIT_LAST);
+                    }
+                    else {
+                        (*infoRec->SubsequentSolidBresenhamLine) (infoRec->
+                                                                  pScrn, x1, y1,
+                                                                  dmaj, dmin, e,
+#ifdef POLYSEGMENT
+                                                                  (pGC->
+                                                                   capStyle !=
+                                                                   CapNotLast)
+                                                                  ? (len + 1) :
+#endif
+                                                                  len, octant);
+                    }
+                    break;
+                }
+                else if (oc1 & oc2) {   /* completely clipped */
+                    pbox++;
+                }
+                else if (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_LINE) {
+                    (*infoRec->SetClippingRectangle) (infoRec->pScrn,
+                                                      pbox->x1, pbox->y1,
+                                                      pbox->x2 - 1,
+                                                      pbox->y2 - 1);
+
+                    if (infoRec->SubsequentSolidBresenhamLine) {
+                        (*infoRec->SubsequentSolidBresenhamLine) (infoRec->
+                                                                  pScrn, x1, y1,
+                                                                  dmaj, dmin, e,
+#ifdef POLYSEGMENT
+                                                                  (pGC->
+                                                                   capStyle !=
+                                                                   CapNotLast)
+                                                                  ? (len + 1) :
+#endif
+                                                                  len, octant);
+                    }
+                    else {
+                        (*infoRec->SubsequentSolidTwoPointLine) (infoRec->pScrn,
+                                                                 x1, y1, x2, y2,
+#ifdef POLYSEGMENT
+                                                                 (pGC->
+                                                                  capStyle !=
+                                                                  CapNotLast) ?
+                                                                 0 :
+#endif
+                                                                 OMIT_LAST);
+                    }
+                    (*infoRec->DisableClipping) (infoRec->pScrn);
+                    pbox++;
+                }
+                else {
+                    int new_x1 = x1, new_y1 = y1, new_x2 = x2, new_y2 = y2;
+                    int clip1 = 0, clip2 = 0;
+                    int err, adx, ady;
+
+                    if (octant & YMAJOR) {
+                        ady = dmaj >> 1;
+                        adx = dmin >> 1;
+                    }
+                    else {
+                        ady = dmin >> 1;
+                        adx = dmaj >> 1;
+                    }
+
+                    if (miZeroClipLine(pbox->x1, pbox->y1,
+                                       pbox->x2 - 1, pbox->y2 - 1,
+                                       &new_x1, &new_y1, &new_x2, &new_y2,
+                                       adx, ady, &clip1, &clip2,
+                                       octant, bias, oc1, oc2) == -1) {
+                        pbox++;
+                        continue;
+                    }
+
+                    if (octant & YMAJOR)
+                        len = abs(new_y2 - new_y1);
+                    else
+                        len = abs(new_x2 - new_x1);
+#ifdef POLYSEGMENT
+                    if (clip2 != 0 || pGC->capStyle != CapNotLast)
+                        len++;
+#else
+                    len += (clip2 != 0);
+#endif
+                    if (len) {
+                        int abserr, clipdx, clipdy;
+
+                        /* unwind bresenham error term to first point */
+                        if (clip1) {
+                            clipdx = abs(new_x1 - x1);
+                            clipdy = abs(new_y1 - y1);
+
+                            if (octant & YMAJOR)
+                                err = e + clipdy * dmin - clipdx * dmaj;
+                            else
+                                err = e + clipdx * dmin - clipdy * dmaj;
+                        }
+                        else
+                            err = e;
+
+#define range infoRec->SolidBresenhamLineErrorTermBits
+                        abserr = abs(err);
+                        while ((abserr & range) ||
+                               (dmaj & range) || (dmin & range)) {
+                            dmin >>= 1;
+                            dmaj >>= 1;
+                            abserr >>= 1;
+                            err /= 2;
+                        }
+
+                        (*infoRec->SubsequentSolidBresenhamLine) (infoRec->
+                                                                  pScrn, new_x1,
+                                                                  new_y1, dmaj,
+                                                                  dmin, err,
+                                                                  len, octant);
+                    }
+                    pbox++;
+                }
+            }                   /* while (nbox--) */
+        }                       /* sloped line */
+    }                           /* while (nline--) */
+
+#ifndef POLYSEGMENT
+    /* paint the last point if the end style isn't CapNotLast.
+       (Assume that a projecting, butt, or round cap that is one
+       pixel wide is the same as the single pixel of the endpoint.)
+     */
+
+    if ((pGC->capStyle != CapNotLast) &&
+        ((ppt->x + xorg != pptInit->x + pDrawable->x) ||
+         (ppt->y + yorg != pptInit->y + pDrawable->y) ||
+         (ppt == pptInit + 1))) {
+        nbox = nboxInit;
+        pbox = pboxInit;
+        while (nbox--) {
+            if ((x2 >= pbox->x1) && (y2 >= pbox->y1) &&
+                (x2 < pbox->x2) && (y2 < pbox->y2)) {
+                (*infoRec->SubsequentSolidHorVertLine) (infoRec->pScrn, x2, y2,
+                                                        1, DEGREES_0);
+                break;
+            }
+            else
+                pbox++;
+        }
+    }
+#endif
+
+    SET_SYNC_FLAG(infoRec);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaLineMisc.c b/xorg-server/hw/xfree86/xaa/xaaLineMisc.c
index 44048674e..4379778f6 100644
--- a/xorg-server/hw/xfree86/xaa/xaaLineMisc.c
+++ b/xorg-server/hw/xfree86/xaa/xaaLineMisc.c
@@ -1,150 +1,149 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "miline.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-   

-

-void

-XAASolidHorVertLineAsRects(

-   ScrnInfoPtr pScrn,

-   int x, int y, int len, int dir

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-    if(dir == DEGREES_0) 

-	(*infoRec->SubsequentSolidFillRect)(pScrn, x, y, len, 1);

-    else

-	(*infoRec->SubsequentSolidFillRect)(pScrn, x, y, 1, len);

-}

-   

-

-void

-XAASolidHorVertLineAsTwoPoint(

-   ScrnInfoPtr pScrn,

-   int x, int y, int len, int dir

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-    len--;

-

-    if(dir == DEGREES_0) 

-	(*infoRec->SubsequentSolidTwoPointLine)(pScrn, x, y, x + len, y, 0);

-    else

-	(*infoRec->SubsequentSolidTwoPointLine)(pScrn, x, y, x, y + len, 0);

-}

-   

-void

-XAASolidHorVertLineAsBresenham(

-   ScrnInfoPtr pScrn,

-   int x, int y, int len, int dir

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-    if(dir == DEGREES_0) 

-	(*infoRec->SubsequentSolidBresenhamLine)(

-		pScrn, x, y, len << 1, 0, -len, len, 0);

-    else

-	(*infoRec->SubsequentSolidBresenhamLine)(

-		pScrn, x, y, len << 1, 0, -len, len, YMAJOR);

-}

-

-

-void

-XAAComputeDash(GCPtr pGC)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    XAAGCPtr   pGCPriv = (XAAGCPtr)dixLookupPrivate(&pGC->devPrivates,

-						    XAAGetGCKey());

-    Bool EvenDash = (pGC->numInDashList & 0x01) ? FALSE : TRUE;

-    int PatternLength = 0;

-    unsigned char* DashPtr = (unsigned char*)pGC->dash;

-    CARD32 *ptr;

-    int count = pGC->numInDashList; 

-    int shift, value, direction;

-    Bool set;

-

-    free(pGCPriv->DashPattern);

-

-    pGCPriv->DashPattern = NULL;

-    pGCPriv->DashLength = 0; 

- 

-    while(count--) 

-	PatternLength += *(DashPtr++);

-

-    if(!EvenDash)

-	PatternLength <<= 1;

-

-    if(PatternLength > infoRec->DashPatternMaxLength) 

-	return;

-

-    if((infoRec->DashedLineFlags & LINE_PATTERN_POWER_OF_2_ONLY) && 

-				(PatternLength & (PatternLength - 1)))

-	return;

-

-    pGCPriv->DashPattern = calloc((PatternLength + 31) >> 5, 4);

-    if(!pGCPriv->DashPattern) return;

-    pGCPriv->DashLength = PatternLength;

-

-    if(infoRec->DashedLineFlags & (LINE_PATTERN_LSBFIRST_MSBJUSTIFIED |

- 	 	 		   LINE_PATTERN_LSBFIRST_LSBJUSTIFIED)) {

-	direction = 1;

-	set = TRUE;

-	DashPtr = (unsigned char*)pGC->dash;

-    } else {

-	direction = -1;

-	set = FALSE;

-	DashPtr = (unsigned char*)pGC->dash + pGC->numInDashList - 1;

-    }

-

-    if(infoRec->DashedLineFlags & (LINE_PATTERN_LSBFIRST_MSBJUSTIFIED |

- 	 	 		   LINE_PATTERN_MSBFIRST_MSBJUSTIFIED))

-	shift = 32 - (PatternLength & 31);

-    else

-	shift = 0;

-

-    ptr = (CARD32*)(pGCPriv->DashPattern);

-

-CONCATENATE:

-

-    count = pGC->numInDashList;

-

-    while(count--) {

-	value = *DashPtr;

-	DashPtr += direction;

-	while(value) {

-	    if(value < (32 - shift)) {

-		if(set) *ptr |= XAAShiftMasks[value] << shift;

-		shift += value;

-		break;

-	     } else {

-		if(set) *ptr |= ~0L << shift;

-		value -= (32 - shift);

-		shift = 0;

-		ptr++;

-	     }

-	}

-	if(set) set = FALSE;

-	else set = TRUE;

-    }

-

-    if(!EvenDash) {

-	EvenDash = TRUE;

-	if(infoRec->DashedLineFlags & (LINE_PATTERN_LSBFIRST_MSBJUSTIFIED |

-				       LINE_PATTERN_LSBFIRST_LSBJUSTIFIED))

-	   DashPtr = (unsigned char*)pGC->dash;

-	else

-	   DashPtr = (unsigned char*)pGC->dash + pGC->numInDashList;

-	goto CONCATENATE;

-    }

-}

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "miline.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+
+void
+XAASolidHorVertLineAsRects(ScrnInfoPtr pScrn, int x, int y, int len, int dir)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    if (dir == DEGREES_0)
+        (*infoRec->SubsequentSolidFillRect) (pScrn, x, y, len, 1);
+    else
+        (*infoRec->SubsequentSolidFillRect) (pScrn, x, y, 1, len);
+}
+
+void
+XAASolidHorVertLineAsTwoPoint(ScrnInfoPtr pScrn, int x, int y, int len, int dir)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    len--;
+
+    if (dir == DEGREES_0)
+        (*infoRec->SubsequentSolidTwoPointLine) (pScrn, x, y, x + len, y, 0);
+    else
+        (*infoRec->SubsequentSolidTwoPointLine) (pScrn, x, y, x, y + len, 0);
+}
+
+void
+XAASolidHorVertLineAsBresenham(ScrnInfoPtr pScrn,
+                               int x, int y, int len, int dir)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    if (dir == DEGREES_0)
+        (*infoRec->SubsequentSolidBresenhamLine) (pScrn, x, y, len << 1, 0,
+                                                  -len, len, 0);
+    else
+        (*infoRec->SubsequentSolidBresenhamLine) (pScrn, x, y, len << 1, 0,
+                                                  -len, len, YMAJOR);
+}
+
+void
+XAAComputeDash(GCPtr pGC)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAAGCPtr pGCPriv = (XAAGCPtr) dixLookupPrivate(&pGC->devPrivates,
+                                                   XAAGetGCKey());
+    Bool EvenDash = (pGC->numInDashList & 0x01) ? FALSE : TRUE;
+    int PatternLength = 0;
+    unsigned char *DashPtr = (unsigned char *) pGC->dash;
+    CARD32 *ptr;
+    int count = pGC->numInDashList;
+    int shift, value, direction;
+    Bool set;
+
+    free(pGCPriv->DashPattern);
+
+    pGCPriv->DashPattern = NULL;
+    pGCPriv->DashLength = 0;
+
+    while (count--)
+        PatternLength += *(DashPtr++);
+
+    if (!EvenDash)
+        PatternLength <<= 1;
+
+    if (PatternLength > infoRec->DashPatternMaxLength)
+        return;
+
+    if ((infoRec->DashedLineFlags & LINE_PATTERN_POWER_OF_2_ONLY) &&
+        (PatternLength & (PatternLength - 1)))
+        return;
+
+    pGCPriv->DashPattern = calloc((PatternLength + 31) >> 5, 4);
+    if (!pGCPriv->DashPattern)
+        return;
+    pGCPriv->DashLength = PatternLength;
+
+    if (infoRec->DashedLineFlags & (LINE_PATTERN_LSBFIRST_MSBJUSTIFIED |
+                                    LINE_PATTERN_LSBFIRST_LSBJUSTIFIED)) {
+        direction = 1;
+        set = TRUE;
+        DashPtr = (unsigned char *) pGC->dash;
+    }
+    else {
+        direction = -1;
+        set = FALSE;
+        DashPtr = (unsigned char *) pGC->dash + pGC->numInDashList - 1;
+    }
+
+    if (infoRec->DashedLineFlags & (LINE_PATTERN_LSBFIRST_MSBJUSTIFIED |
+                                    LINE_PATTERN_MSBFIRST_MSBJUSTIFIED))
+        shift = 32 - (PatternLength & 31);
+    else
+        shift = 0;
+
+    ptr = (CARD32 *) (pGCPriv->DashPattern);
+
+ CONCATENATE:
+
+    count = pGC->numInDashList;
+
+    while (count--) {
+        value = *DashPtr;
+        DashPtr += direction;
+        while (value) {
+            if (value < (32 - shift)) {
+                if (set)
+                    *ptr |= XAAShiftMasks[value] << shift;
+                shift += value;
+                break;
+            }
+            else {
+                if (set)
+                    *ptr |= ~0L << shift;
+                value -= (32 - shift);
+                shift = 0;
+                ptr++;
+            }
+        }
+        if (set)
+            set = FALSE;
+        else
+            set = TRUE;
+    }
+
+    if (!EvenDash) {
+        EvenDash = TRUE;
+        if (infoRec->DashedLineFlags & (LINE_PATTERN_LSBFIRST_MSBJUSTIFIED |
+                                        LINE_PATTERN_LSBFIRST_LSBJUSTIFIED))
+            DashPtr = (unsigned char *) pGC->dash;
+        else
+            DashPtr = (unsigned char *) pGC->dash + pGC->numInDashList;
+        goto CONCATENATE;
+    }
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c b/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c
index 7431ba2a0..bfe7f9a09 100644
--- a/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c
+++ b/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c
@@ -1,5 +1,4 @@
 
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -39,52 +38,52 @@
 
 void
 #ifdef TRIPLE_BITS
-EXPNAME(XAANonTEGlyphRenderer3)(
+ EXPNAME(XAANonTEGlyphRenderer3) (
 #else
-EXPNAME(XAANonTEGlyphRenderer)(
+ EXPNAME(XAANonTEGlyphRenderer) (
 #endif
-    ScrnInfoPtr pScrn,
-    int xText, int wText, 
-    int y, int h, int skipleft, int startline, 
-    NonTEGlyphInfo *glyphp,
-    int fg, int rop,
-    unsigned int planemask )
-{
+                                    ScrnInfoPtr pScrn,
+                                    int xText, int wText,
+                                    int y, int h, int skipleft, int startline,
+                                    NonTEGlyphInfo * glyphp,
+                                    int fg, int rop, unsigned int planemask) {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
-    CARD32* base = (CARD32*)infoRec->ColorExpandBase;
+    CARD32 *base = (CARD32 *) infoRec->ColorExpandBase;
+
 #ifdef TRIPLE_BITS
     int dwords = ((3 * wText + 31) >> 5) * h;
 #else
     int dwords = ((wText + 31) >> 5) * h;
 #endif
 
-    (*infoRec->SetupForCPUToScreenColorExpandFill)(
-					pScrn, fg, -1, rop, planemask);
-    (*infoRec->SubsequentCPUToScreenColorExpandFill)(
-					pScrn, xText, y, wText, h, 0);
+    (*infoRec->SetupForCPUToScreenColorExpandFill) (pScrn, fg, -1, rop,
+                                                    planemask);
+    (*infoRec->SubsequentCPUToScreenColorExpandFill) (pScrn, xText, y, wText, h,
+                                                      0);
 
 #ifndef FIXEDBASE
 #ifdef TRIPLE_BITS
-    if((((3 * wText + 31) >> 5) * h) <= infoRec->ColorExpandRange)
+    if ((((3 * wText + 31) >> 5) * h) <= infoRec->ColorExpandRange)
 #else
-    if((((wText + 31) >> 5) * h) <= infoRec->ColorExpandRange)
+    if ((((wText + 31) >> 5) * h) <= infoRec->ColorExpandRange)
 #endif
-	while(h--) 
-	    base = NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
+        while (h--)
+            base = NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
     else
 #endif
-	while(h--)
-	    NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
+        while (h--)
+            NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
 
-    if((infoRec->CPUToScreenColorExpandFillFlags & CPU_TRANSFER_PAD_QWORD) &&
-			(dwords & 1)) {
-	base = (CARD32*)infoRec->ColorExpandBase;
-	base[0] = 0x00000000;
+    if ((infoRec->CPUToScreenColorExpandFillFlags & CPU_TRANSFER_PAD_QWORD) &&
+        (dwords & 1)) {
+        base = (CARD32 *) infoRec->ColorExpandBase;
+        base[0] = 0x00000000;
     }
 
-    if(infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND) 
-	(*infoRec->Sync)(pScrn);
-    else SET_SYNC_FLAG(infoRec);
+    if (infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND)
+        (*infoRec->Sync) (pScrn);
+    else
+        SET_SYNC_FLAG(infoRec);
 }
 
 #ifndef FIXEDBASE
@@ -92,32 +91,31 @@ EXPNAME(XAANonTEGlyphRenderer)(
 
 void
 #ifdef TRIPLE_BITS
-EXPNAME(XAANonTEGlyphRendererScanline3)(
+ EXPNAME(XAANonTEGlyphRendererScanline3) (
 #else
-EXPNAME(XAANonTEGlyphRendererScanline)(
+ EXPNAME(XAANonTEGlyphRendererScanline) (
 #endif
-    ScrnInfoPtr pScrn,
-    int xText, int wText, 
-    int y, int h, int skipleft, int startline, 
-    NonTEGlyphInfo *glyphp,
-    int fg, int rop,
-    unsigned int planemask )
-{
+                                            ScrnInfoPtr pScrn,
+                                            int xText, int wText,
+                                            int y, int h, int skipleft,
+                                            int startline,
+                                            NonTEGlyphInfo * glyphp, int fg,
+                                            int rop, unsigned int planemask) {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     int bufferNo = 0;
-    CARD32* base;
-
-    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill)(
-				pScrn, fg, -1, rop, planemask);
-    (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)(
-				pScrn, xText, y, wText, h, 0);
-
-    while(h--) {
-	base = (CARD32*)infoRec->ScanlineColorExpandBuffers[bufferNo];
-	NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
-	(*infoRec->SubsequentColorExpandScanline)(pScrn, bufferNo++);
-	if(bufferNo >= infoRec->NumScanlineColorExpandBuffers)
-	    bufferNo = 0;
+    CARD32 *base;
+
+    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill) (pScrn, fg, -1, rop,
+                                                            planemask);
+    (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill) (pScrn, xText, y,
+                                                              wText, h, 0);
+
+    while (h--) {
+        base = (CARD32 *) infoRec->ScanlineColorExpandBuffers[bufferNo];
+        NonTEGlyphFunc(base, glyphp, startline++, wText, skipleft);
+        (*infoRec->SubsequentColorExpandScanline) (pScrn, bufferNo++);
+        if (bufferNo >= infoRec->NumScanlineColorExpandBuffers)
+            bufferNo = 0;
     }
 
     SET_SYNC_FLAG(infoRec);
@@ -131,70 +129,64 @@ EXPNAME(XAANonTEGlyphRendererScanline)(
 
 ********************************************************************/
 
-
-CARD32* 
-NonTEGlyphFunc(
-    CARD32 *base,
-    NonTEGlyphInfo *glyphp,
-    int line, int TotalWidth, int skipleft )
+CARD32 *
+NonTEGlyphFunc(CARD32 *base,
+               NonTEGlyphInfo * glyphp, int line, int TotalWidth, int skipleft)
 {
     CARD32 bits = 0;
-    int shift = glyphp->width; 
+    int shift = glyphp->width;
 
-    if(skipleft) {
-	if((line >= glyphp->firstline) && (line <= glyphp->lastline))
+    if (skipleft) {
+        if ((line >= glyphp->firstline) && (line <= glyphp->lastline))
             bits = SHIFT_R(glyphp->bitsp[line], skipleft);
-	shift -= skipleft;
-    } else if((line >= glyphp->firstline) && (line <= glyphp->lastline))
-            bits =  glyphp->bitsp[line];
- 
-
-    while(TotalWidth > 32) {
-	while(shift < 32) {
-	    glyphp++;
-	    if((line >= glyphp->firstline) && (line <= glyphp->lastline)) 
-		bits |= SHIFT_L(glyphp->bitsp[line],shift);
-	    shift += glyphp->width;	
-	}
+        shift -= skipleft;
+    }
+    else if ((line >= glyphp->firstline) && (line <= glyphp->lastline))
+        bits = glyphp->bitsp[line];
+
+    while (TotalWidth > 32) {
+        while (shift < 32) {
+            glyphp++;
+            if ((line >= glyphp->firstline) && (line <= glyphp->lastline))
+                bits |= SHIFT_L(glyphp->bitsp[line], shift);
+            shift += glyphp->width;
+        }
 #ifdef TRIPLE_BITS
-	WRITE_BITS3(bits);
+        WRITE_BITS3(bits);
 #else
-	WRITE_BITS(bits);
+        WRITE_BITS(bits);
 #endif
-	shift &= 31;
-	if(shift && 
-	 (line >= glyphp->firstline) && (line <= glyphp->lastline)) 
-           bits = SHIFT_R(glyphp->bitsp[line], glyphp->width - shift);
-	else bits = 0;
-	TotalWidth -= 32;
+        shift &= 31;
+        if (shift && (line >= glyphp->firstline) && (line <= glyphp->lastline))
+            bits = SHIFT_R(glyphp->bitsp[line], glyphp->width - shift);
+        else
+            bits = 0;
+        TotalWidth -= 32;
     }
 
-    if(TotalWidth) {
-	TotalWidth -= shift;
-	while(TotalWidth > 0) {
-	     glyphp++;
-	     if((line >= glyphp->firstline) && (line <= glyphp->lastline)) 
-		bits |= SHIFT_L(glyphp->bitsp[line], shift);
-	     shift += glyphp->width;
-	     TotalWidth -= glyphp->width;
-	}
+    if (TotalWidth) {
+        TotalWidth -= shift;
+        while (TotalWidth > 0) {
+            glyphp++;
+            if ((line >= glyphp->firstline) && (line <= glyphp->lastline))
+                bits |= SHIFT_L(glyphp->bitsp[line], shift);
+            shift += glyphp->width;
+            TotalWidth -= glyphp->width;
+        }
 #ifdef TRIPLE_BITS
-	if (shift >= 22) {
-	    WRITE_BITS3(bits);
-	} else if (shift >= 11) {
-	    WRITE_BITS2(bits);
-	} else {
-	    WRITE_BITS1(bits);
-	}
+        if (shift >= 22) {
+            WRITE_BITS3(bits);
+        }
+        else if (shift >= 11) {
+            WRITE_BITS2(bits);
+        }
+        else {
+            WRITE_BITS1(bits);
+        }
 #else
-	WRITE_BITS(bits);
+        WRITE_BITS(bits);
 #endif
     }
 
-  
     return base;
 }
-
-
-
-
diff --git a/xorg-server/hw/xfree86/xaa/xaaNonTEText.c b/xorg-server/hw/xfree86/xaa/xaaNonTEText.c
index 519bda0e7..35b43912b 100644
--- a/xorg-server/hw/xfree86/xaa/xaaNonTEText.c
+++ b/xorg-server/hw/xfree86/xaa/xaaNonTEText.c
@@ -1,591 +1,591 @@
-

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

-

-   In this file we have GC level replacements for PolyText8/16,

-   ImageText8/16, ImageGlyphBlt and PolyGlyphBlt for NonTE (proportional) 

-   fonts. The idea is that everything in this file is device independent.

-   The mentioned GCOps are merely wrappers for the 

-   PolyGlyphBltNonTEColorExpansion and ImageGlyphBltNonTEColorExpansion

-   functions which calculate the boxes containing arbitrarily clipped 

-   text and passes them to the NonTEGlyphRenderer which will usually 

-   be a lower level XAA function which renders these clipped glyphs using

-   the basic color expansion functions exported by the chipset driver.

-   The NonTEGlyphRenderer itself may optionally be driver supplied to

-   facilitate work-arounds/optimizations at a higher level than usual.

-

-   Written by Mark Vojkovich (mvojkovi@ucsd.edu)

-

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

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <string.h>

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include <X11/fonts/font.h>

-#include "scrnintstr.h"

-#include "dixfontstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaacexp.h"

-#include "xaalocal.h"

-#include "gcstruct.h"

-#include "pixmapstr.h"

-

-

-static void ImageGlyphBltNonTEColorExpansion(ScrnInfoPtr pScrn,

-				int xInit, int yInit, FontPtr font,

-				int fg, int bg, unsigned planemask,

-				RegionPtr cclip, int nglyph,

-				unsigned char* gBase, CharInfoPtr *ppci);

-static int PolyGlyphBltNonTEColorExpansion(ScrnInfoPtr pScrn,

-				int xInit, int yInit, FontPtr font,

-				int fg, int rop, unsigned planemask,

-				RegionPtr cclip, int nglyph,

-				unsigned char* gBase, CharInfoPtr *ppci);

-

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

-

-   GC level replacements for PolyText8/16 and ImageText8/16

-   for NonTE fonts when using color expansion.

-

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

-

-

-int

-XAAPolyText8NonTEColorExpansion(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x, 

-    int 	y,

-    int 	count,

-    char	*chars )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    unsigned long n;

-    int width = 0;

-

-    (*pGC->font->get_glyphs)(pGC->font, (unsigned long)count, 

-		(unsigned char *)chars, Linear8Bit, &n, infoRec->CharInfo);

-

-    if(n) {

-	width = PolyGlyphBltNonTEColorExpansion( infoRec->pScrn, 

-		x + pDraw->x, y + pDraw->y, pGC->font, 

-		pGC->fgPixel, pGC->alu, pGC->planemask, 

-		pGC->pCompositeClip, n, FONTGLYPHS(pGC->font),

- 		infoRec->CharInfo);

-    }

-

-    return x + width;

-}

-

-

-int

-XAAPolyText16NonTEColorExpansion(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x, 

-    int		y,

-    int		count,

-    unsigned short *chars )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    unsigned long n;

-    int width = 0;

-

-    (*pGC->font->get_glyphs)(

-		pGC->font, (unsigned long)count, (unsigned char *)chars,

-		(FONTLASTROW(pGC->font) == 0) ? Linear16Bit : TwoD16Bit,

-		&n, infoRec->CharInfo);

-

-    if(n) {

-	width = PolyGlyphBltNonTEColorExpansion( infoRec->pScrn, 

-		x + pDraw->x, y + pDraw->y, pGC->font, 

-		pGC->fgPixel, pGC->alu, pGC->planemask, 

-		pGC->pCompositeClip, n, FONTGLYPHS(pGC->font),

-		infoRec->CharInfo);

-    }

-

-    return x + width;

-}

-

-

-void

-XAAImageText8NonTEColorExpansion(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x, 

-    int		y,

-    int		count,

-    char	*chars 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    unsigned long n;

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    (*pGC->font->get_glyphs)(pGC->font, (unsigned long)count, 

-		(unsigned char *)chars, Linear8Bit, &n, infoRec->CharInfo);

-

-    if(n) ImageGlyphBltNonTEColorExpansion(

-	infoRec->pScrn, x + pDraw->x, y + pDraw->y,

-	pGC->font, pGC->fgPixel, pGC->bgPixel, pGC->planemask, 

-	pGC->pCompositeClip, n, FONTGLYPHS(pGC->font), infoRec->CharInfo);

-}

-

-

-void

-XAAImageText16NonTEColorExpansion(

-    DrawablePtr pDraw,

-    GCPtr	pGC,

-    int		x, 

-    int		y,

-    int		count,

-    unsigned short *chars 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    unsigned long n;

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    (*pGC->font->get_glyphs)(

-		pGC->font, (unsigned long)count, (unsigned char *)chars,

-		(FONTLASTROW(pGC->font) == 0) ? Linear16Bit : TwoD16Bit,

-		&n, infoRec->CharInfo);

-

-    if(n) ImageGlyphBltNonTEColorExpansion(

-	infoRec->pScrn, x + pDraw->x, y + pDraw->y,

-	pGC->font, pGC->fgPixel, pGC->bgPixel, pGC->planemask, 

-	pGC->pCompositeClip, n, FONTGLYPHS(pGC->font), infoRec->CharInfo);

-}

-

-

-

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

-

-   GC level replacements for ImageGlyphBlt and PolyGlyphBlt for

-   NonTE fonts when using color expansion.

-

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

-

-

-void

-XAAImageGlyphBltNonTEColorExpansion(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int xInit, int yInit,

-    unsigned int nglyph,

-    CharInfoPtr *ppci,      /* array of character info */

-    pointer pglyphBase	       /* start of array of glyphs */

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    ImageGlyphBltNonTEColorExpansion(

-	infoRec->pScrn, xInit + pDraw->x, yInit + pDraw->y,

-	pGC->font, pGC->fgPixel, pGC->bgPixel, pGC->planemask, 

-	pGC->pCompositeClip, nglyph, (unsigned char*)pglyphBase, ppci);

-}

-

-void

-XAAPolyGlyphBltNonTEColorExpansion(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int xInit, int yInit,

-    unsigned int nglyph,

-    CharInfoPtr *ppci,      /* array of character info */

-    pointer pglyphBase	       /* start of array of glyphs */

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    PolyGlyphBltNonTEColorExpansion(

-	infoRec->pScrn, xInit + pDraw->x, yInit + pDraw->y,

-	pGC->font, pGC->fgPixel, pGC->alu, pGC->planemask, 

-	pGC->pCompositeClip, nglyph, (unsigned char*)pglyphBase, ppci);

-}

-

-

-

-

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

-

-   ImageGlyphBltNonTEColorExpansion -

-   PolyGlyphBltNonTEColorExpansion -

-

-   These guys compute the clipped pieces of text and send it to

-   the lower-level function which will handle acceleration of 

-   arbitrarily clipped text.

-  

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

-

-

-

-static int

-CollectCharacterInfo(

-    NonTEGlyphPtr glyphs,

-    unsigned int nglyph,

-    CharInfoPtr *ppci,

-    FontPtr pfont

-){

-   int i, w = 0;

-   

-   for(i = 0; i < nglyph; i++, ppci++, glyphs++) {

-	glyphs->bits = (unsigned char*)((*ppci)->bits);

-	glyphs->start = w + (*ppci)->metrics.leftSideBearing;

-	glyphs->end = w + (*ppci)->metrics.rightSideBearing;

-	glyphs->yoff = (*ppci)->metrics.ascent;

-	glyphs->height = glyphs->yoff + (*ppci)->metrics.descent;

-	glyphs->srcwidth = PADGLYPHWIDTHBYTES(glyphs->end - glyphs->start);

-	w += (*ppci)->metrics.characterWidth;

-   }

-   return w;

-}

-

-

-static void

-PolyGlyphBltAsSingleBitmap (

-   ScrnInfoPtr pScrn,

-   int nglyph,

-   FontPtr font,

-   int xInit,

-   int yInit,

-   int nbox,

-   BoxPtr pbox,

-   int fg,

-   int rop,

-   unsigned planemask

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    CARD32 *block, *pntr, *bits;

-    int pitch, topLine, botLine, top, bot, height;

-    int Left, Right, Top, Bottom;

-    int LeftEdge, RightEdge;

-    int bitPitch, shift, size, i, skippix;

-    NonTEGlyphPtr glyphs = infoRec->GlyphInfo;

-    Bool extra;

-	

-    Left = xInit + infoRec->GlyphInfo[0].start;

-    Right = xInit + infoRec->GlyphInfo[nglyph - 1].end;

-    Top = yInit - FONTMAXBOUNDS(font,ascent);

-    Bottom = yInit + FONTMAXBOUNDS(font,descent);

-

-    /* get into the first band that may contain part of our string */

-    while(nbox && (Top >= pbox->y2)) {

-	pbox++; nbox--;

-    }

-

-    if(!nbox) return;

-

-    pitch = (Right - Left + 31) >> 5;

-    size = (pitch << 2) * (Bottom - Top);

-    block = calloc(1, size);

-

-    topLine = 10000; botLine = -10000;

-

-    while(nglyph--) {

-	top = -glyphs->yoff;

-	bot = top + glyphs->height;

-	if(top < topLine) topLine = top;

-	if(bot > botLine) botLine = bot;

-	skippix = glyphs->start - infoRec->GlyphInfo[0].start;

-	bits = (CARD32*)glyphs->bits;

-	bitPitch = glyphs->srcwidth >> 2;

-	pntr = block + ((FONTMAXBOUNDS(font,ascent) + top) * pitch) +

-				(skippix >> 5);

-	shift = skippix & 31;

-	extra = ((shift + glyphs->end - glyphs->start) > 32);

-

-	for(i = top; i < bot; i++) {

-	    *pntr |= SHIFT_L(*bits, shift);

-	    if(extra)

-		*(pntr + 1) |= SHIFT_R(*bits,32 - shift);

-	    pntr += pitch;

-	    bits += bitPitch;

-	}

-

-	glyphs++;

-    }

-

-    pntr = block + ((FONTMAXBOUNDS(font,ascent) + topLine) * pitch);

-

-    Top = yInit + topLine;

-    Bottom = yInit + botLine;

-

-    while(nbox && (Top >= pbox->y2)) {

-	pbox++; nbox--;

-    }

-

-    while(nbox && (Bottom > pbox->y1)) {

-	LeftEdge = max(Left, pbox->x1);

-	RightEdge = min(Right, pbox->x2);

-

-	if(RightEdge > LeftEdge) {

-	    skippix = LeftEdge - Left;

-	    topLine = max(Top, pbox->y1);

-	    botLine = min(Bottom, pbox->y2);	

-	    height = botLine - topLine;

-

-	    if(height > 0) 

-	       (*infoRec->WriteBitmap)(pScrn, LeftEdge, topLine, 

-			RightEdge - LeftEdge, height,

-			(unsigned char*)(pntr + ((topLine - Top) * pitch) +

-				(skippix >> 5)),

-			pitch << 2, skippix & 31, fg, -1, rop, planemask);

-	}

-

-	nbox--; pbox++;

-    }

-

-    free(block);

-}

-

-static void

-ImageGlyphBltNonTEColorExpansion(

-   ScrnInfoPtr pScrn,

-   int xInit, int yInit,

-   FontPtr font,

-   int fg, int bg,

-   unsigned planemask,

-   RegionPtr cclip,

-   int nglyph,

-   unsigned char* gBase,

-   CharInfoPtr *ppci 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int skippix, skipglyph, width, n, i;

-    int Left, Right, Top, Bottom;

-    int LeftEdge, RightEdge, ytop, ybot;

-    int nbox = RegionNumRects(cclip);

-    BoxPtr pbox = RegionRects(cclip);

-    Bool AlreadySetup = FALSE;

-

-    width = CollectCharacterInfo(infoRec->GlyphInfo, nglyph, ppci, font);

-

-    /* find our backing rectangle dimensions */

-    Left = xInit;

-    Right = Left + width;

-    Top = yInit - FONTASCENT(font);

-    Bottom = yInit + FONTDESCENT(font);

-

-    /* get into the first band that may contain part of our box */

-    while(nbox && (Top >= pbox->y2)) {

-	pbox++; nbox--;

-    }

-

-    while(nbox && (Bottom >= pbox->y1)) {

-	/* handle backing rect first */

-	LeftEdge = max(Left, pbox->x1);

-	RightEdge = min(Right, pbox->x2);

-	if(RightEdge > LeftEdge) {	    

-	    ytop = max(Top, pbox->y1);

-	    ybot = min(Bottom, pbox->y2);

-

-	    if(ybot > ytop) {

-		if(!AlreadySetup) {

-		   (*infoRec->SetupForSolidFill)(pScrn, bg, GXcopy, planemask);

-		   AlreadySetup = TRUE;

-		}

-		(*infoRec->SubsequentSolidFillRect)(pScrn, 

-			LeftEdge, ytop, RightEdge - LeftEdge, ybot - ytop);

-	    }

-	}

-	nbox--; pbox++;

-    }

- 

-    nbox = RegionNumRects(cclip);

-    pbox = RegionRects(cclip);

-

-    if(infoRec->WriteBitmap && (nglyph > 1) && 

-			((FONTMAXBOUNDS(font, rightSideBearing) - 

-          		FONTMINBOUNDS(font, leftSideBearing)) <= 32)) 

-   {

-	PolyGlyphBltAsSingleBitmap(pScrn, nglyph, font, 

-				xInit, yInit, nbox, pbox,

-				fg, GXcopy, planemask);

-

-	return;

-    }

-

-    /* compute an approximate but covering bounding box */

-    Left = xInit + infoRec->GlyphInfo[0].start;

-    Right = xInit + infoRec->GlyphInfo[nglyph - 1].end;

-    Top = yInit - FONTMAXBOUNDS(font,ascent);

-    Bottom = yInit + FONTMAXBOUNDS(font,descent);

-

-    /* get into the first band that may contain part of our box */

-    while(nbox && (Top >= pbox->y2)) {

-	pbox++; nbox--;

-    }

-

-    /* stop when the lower edge of the box is beyond our string */

-    while(nbox && (Bottom >= pbox->y1)) {

-	LeftEdge = max(Left, pbox->x1);

-	RightEdge = min(Right, pbox->x2);

-

-	if(RightEdge > LeftEdge) { /* we're possibly drawing something */

-	    ytop = max(Top, pbox->y1);

-	    ybot = min(Bottom, pbox->y2);

-	    if(ybot > ytop) {

-		skippix = LeftEdge - xInit;

-		skipglyph = 0;

-		while(skippix >= infoRec->GlyphInfo[skipglyph].end)

-		   skipglyph++;

-

-		skippix = RightEdge - xInit;

-		n = 0; i = skipglyph;

-		while((i < nglyph) && (skippix > infoRec->GlyphInfo[i].start)) {

-		    i++; n++;

-		}

-

-		if(n) (*infoRec->NonTEGlyphRenderer)(pScrn,

-			xInit, yInit, n, infoRec->GlyphInfo + skipglyph, 

-			pbox, fg, GXcopy, planemask); 

-	    }

-	}

-

-	nbox--; pbox++;

-    }

-}

-

-

-static int

-PolyGlyphBltNonTEColorExpansion(

-   ScrnInfoPtr pScrn,

-   int xInit, int yInit,

-   FontPtr font,

-   int fg, int rop,

-   unsigned planemask,

-   RegionPtr cclip,

-   int nglyph,

-   unsigned char* gBase,

-   CharInfoPtr *ppci 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int skippix, skipglyph, width, n, i;

-    int Left, Right, Top, Bottom;

-    int LeftEdge, RightEdge;

-    int nbox = RegionNumRects(cclip);

-    BoxPtr pbox = RegionRects(cclip);

-

-    width = CollectCharacterInfo(infoRec->GlyphInfo, nglyph, ppci, font);

-

-    if(!nbox)

-	return width;

-

-    if((infoRec->WriteBitmap) && (rop == GXcopy) && (nglyph > 1) &&

-	((FONTMAXBOUNDS(font, rightSideBearing) - 

-          FONTMINBOUNDS(font, leftSideBearing)) <= 32)) {

-

-	 PolyGlyphBltAsSingleBitmap(pScrn, nglyph, font, 

-				xInit, yInit, nbox, pbox,

-				fg, rop, planemask);

-

-	return width;

-    }

-

-    /* compute an approximate but covering bounding box */

-    Left = xInit + infoRec->GlyphInfo[0].start;

-    Right = xInit + infoRec->GlyphInfo[nglyph - 1].end;

-    Top = yInit - FONTMAXBOUNDS(font,ascent);

-    Bottom = yInit + FONTMAXBOUNDS(font,descent);

-

-    /* get into the first band that may contain part of our string */

-    while(nbox && (Top >= pbox->y2)) {

-	pbox++; nbox--;

-    }

-

-    /* stop when the lower edge of the box is beyond our string */

-    while(nbox && (Bottom >= pbox->y1)) {

-	LeftEdge = max(Left, pbox->x1);

-	RightEdge = min(Right, pbox->x2);

-

-	if(RightEdge > LeftEdge) { /* we're possibly drawing something */

-

-	    skippix = LeftEdge - xInit;

-	    skipglyph = 0;

-	    while(skippix >= infoRec->GlyphInfo[skipglyph].end)

-		skipglyph++;

-

-	    skippix = RightEdge - xInit;

-	    n = 0; i = skipglyph;

-	    while((i < nglyph) && (skippix > infoRec->GlyphInfo[i].start)) {

-		i++; n++;

-	    }

-

-	    if(n) (*infoRec->NonTEGlyphRenderer)(pScrn,

-			xInit, yInit, n, infoRec->GlyphInfo + skipglyph, 

-			pbox, fg, rop, planemask); 

-	}

-

-	nbox--; pbox++;

-    }

-    return width;

-}

-

-

-/* It is possible that the none of the glyphs passed to the 

-   NonTEGlyphRenderer will be drawn.  This function being called

-   indicates that part of the text string's bounding box is visible

-   but not necessarily that any of the characters are visible */

-

-void XAANonTEGlyphRenderer(

-   ScrnInfoPtr pScrn,

-   int x, int y, int n,

-   NonTEGlyphPtr glyphs,

-   BoxPtr pbox,

-   int fg, int rop,

-   unsigned int planemask

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int x1, x2, y1, y2, i, w, h, skipleft, skiptop;

-    unsigned char *src;

-

-    for(i = 0; i < n; i++, glyphs++) {

-	x1 = x + glyphs->start;

-	x2 = x + glyphs->end;

-	y1 = y - glyphs->yoff;

-	y2 = y1 + glyphs->height;

-

-	if(y1 < pbox->y1) {

-	    skiptop = pbox->y1 - y1;

-	    y1 = pbox->y1;

-	} else skiptop = 0;

-	if(y2 > pbox->y2) y2 = pbox->y2;

-	h = y2 - y1;

-	if(h <= 0) continue;

-

-	if(x1 < pbox->x1) {

-	    skipleft = pbox->x1 - x1;

-	    x1 = pbox->x1;

-	} else skipleft = 0;

-	if(x2 > pbox->x2) x2 = pbox->x2;

-

-	w = x2 - x1;

-

-	if(w > 0) {

-	    src = glyphs->bits + (skiptop * glyphs->srcwidth);

-

-	    if(skipleft) {

-		src += (skipleft >> 5) << 2;

-		skipleft &= 31;

-	    }

-

-	    (*infoRec->WriteBitmap)(pScrn, x1, y1, w, h, src,

-			glyphs->srcwidth, skipleft, fg, -1, rop, planemask);

-	}

-    }  

-

-}

+
+/********************************************************************
+
+   In this file we have GC level replacements for PolyText8/16,
+   ImageText8/16, ImageGlyphBlt and PolyGlyphBlt for NonTE (proportional) 
+   fonts. The idea is that everything in this file is device independent.
+   The mentioned GCOps are merely wrappers for the 
+   PolyGlyphBltNonTEColorExpansion and ImageGlyphBltNonTEColorExpansion
+   functions which calculate the boxes containing arbitrarily clipped 
+   text and passes them to the NonTEGlyphRenderer which will usually 
+   be a lower level XAA function which renders these clipped glyphs using
+   the basic color expansion functions exported by the chipset driver.
+   The NonTEGlyphRenderer itself may optionally be driver supplied to
+   facilitate work-arounds/optimizations at a higher level than usual.
+
+   Written by Mark Vojkovich (mvojkovi@ucsd.edu)
+
+********************************************************************/
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <string.h>
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include <X11/fonts/font.h>
+#include "scrnintstr.h"
+#include "dixfontstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaacexp.h"
+#include "xaalocal.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+
+static void ImageGlyphBltNonTEColorExpansion(ScrnInfoPtr pScrn,
+                                             int xInit, int yInit, FontPtr font,
+                                             int fg, int bg, unsigned planemask,
+                                             RegionPtr cclip, int nglyph,
+                                             unsigned char *gBase,
+                                             CharInfoPtr * ppci);
+static int PolyGlyphBltNonTEColorExpansion(ScrnInfoPtr pScrn, int xInit,
+                                           int yInit, FontPtr font, int fg,
+                                           int rop, unsigned planemask,
+                                           RegionPtr cclip, int nglyph,
+                                           unsigned char *gBase,
+                                           CharInfoPtr * ppci);
+
+/********************************************************************
+
+   GC level replacements for PolyText8/16 and ImageText8/16
+   for NonTE fonts when using color expansion.
+
+********************************************************************/
+
+int
+XAAPolyText8NonTEColorExpansion(DrawablePtr pDraw,
+                                GCPtr pGC, int x, int y, int count, char *chars)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    unsigned long n;
+    int width = 0;
+
+    (*pGC->font->get_glyphs) (pGC->font, (unsigned long) count,
+                              (unsigned char *) chars, Linear8Bit, &n,
+                              infoRec->CharInfo);
+
+    if (n) {
+        width = PolyGlyphBltNonTEColorExpansion(infoRec->pScrn,
+                                                x + pDraw->x, y + pDraw->y,
+                                                pGC->font, pGC->fgPixel,
+                                                pGC->alu, pGC->planemask,
+                                                pGC->pCompositeClip, n,
+                                                FONTGLYPHS(pGC->font),
+                                                infoRec->CharInfo);
+    }
+
+    return x + width;
+}
+
+int
+XAAPolyText16NonTEColorExpansion(DrawablePtr pDraw,
+                                 GCPtr pGC,
+                                 int x, int y, int count, unsigned short *chars)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    unsigned long n;
+    int width = 0;
+
+    (*pGC->font->get_glyphs) (pGC->font, (unsigned long) count,
+                              (unsigned char *) chars,
+                              (FONTLASTROW(pGC->font) ==
+                               0) ? Linear16Bit : TwoD16Bit, &n,
+                              infoRec->CharInfo);
+
+    if (n) {
+        width = PolyGlyphBltNonTEColorExpansion(infoRec->pScrn,
+                                                x + pDraw->x, y + pDraw->y,
+                                                pGC->font, pGC->fgPixel,
+                                                pGC->alu, pGC->planemask,
+                                                pGC->pCompositeClip, n,
+                                                FONTGLYPHS(pGC->font),
+                                                infoRec->CharInfo);
+    }
+
+    return x + width;
+}
+
+void
+XAAImageText8NonTEColorExpansion(DrawablePtr pDraw,
+                                 GCPtr pGC,
+                                 int x, int y, int count, char *chars)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    unsigned long n;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    (*pGC->font->get_glyphs) (pGC->font, (unsigned long) count,
+                              (unsigned char *) chars, Linear8Bit, &n,
+                              infoRec->CharInfo);
+
+    if (n)
+        ImageGlyphBltNonTEColorExpansion(infoRec->pScrn, x + pDraw->x,
+                                         y + pDraw->y, pGC->font, pGC->fgPixel,
+                                         pGC->bgPixel, pGC->planemask,
+                                         pGC->pCompositeClip, n,
+                                         FONTGLYPHS(pGC->font),
+                                         infoRec->CharInfo);
+}
+
+void
+XAAImageText16NonTEColorExpansion(DrawablePtr pDraw,
+                                  GCPtr pGC,
+                                  int x,
+                                  int y, int count, unsigned short *chars)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    unsigned long n;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    (*pGC->font->get_glyphs) (pGC->font, (unsigned long) count,
+                              (unsigned char *) chars,
+                              (FONTLASTROW(pGC->font) ==
+                               0) ? Linear16Bit : TwoD16Bit, &n,
+                              infoRec->CharInfo);
+
+    if (n)
+        ImageGlyphBltNonTEColorExpansion(infoRec->pScrn, x + pDraw->x,
+                                         y + pDraw->y, pGC->font, pGC->fgPixel,
+                                         pGC->bgPixel, pGC->planemask,
+                                         pGC->pCompositeClip, n,
+                                         FONTGLYPHS(pGC->font),
+                                         infoRec->CharInfo);
+}
+
+/********************************************************************
+
+   GC level replacements for ImageGlyphBlt and PolyGlyphBlt for
+   NonTE fonts when using color expansion.
+
+********************************************************************/
+
+void
+XAAImageGlyphBltNonTEColorExpansion(DrawablePtr pDraw, GCPtr pGC, int xInit, int yInit, unsigned int nglyph, CharInfoPtr * ppci,        /* array of character info */
+                                    pointer pglyphBase  /* start of array of glyphs */
+    )
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    ImageGlyphBltNonTEColorExpansion(infoRec->pScrn, xInit + pDraw->x,
+                                     yInit + pDraw->y, pGC->font, pGC->fgPixel,
+                                     pGC->bgPixel, pGC->planemask,
+                                     pGC->pCompositeClip, nglyph,
+                                     (unsigned char *) pglyphBase, ppci);
+}
+
+void
+XAAPolyGlyphBltNonTEColorExpansion(DrawablePtr pDraw, GCPtr pGC, int xInit, int yInit, unsigned int nglyph, CharInfoPtr * ppci, /* array of character info */
+                                   pointer pglyphBase   /* start of array of glyphs */
+    )
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    PolyGlyphBltNonTEColorExpansion(infoRec->pScrn, xInit + pDraw->x,
+                                    yInit + pDraw->y, pGC->font, pGC->fgPixel,
+                                    pGC->alu, pGC->planemask,
+                                    pGC->pCompositeClip, nglyph,
+                                    (unsigned char *) pglyphBase, ppci);
+}
+
+/********************************************************************
+
+   ImageGlyphBltNonTEColorExpansion -
+   PolyGlyphBltNonTEColorExpansion -
+
+   These guys compute the clipped pieces of text and send it to
+   the lower-level function which will handle acceleration of 
+   arbitrarily clipped text.
+  
+********************************************************************/
+
+static int
+CollectCharacterInfo(NonTEGlyphPtr glyphs,
+                     unsigned int nglyph, CharInfoPtr * ppci, FontPtr pfont)
+{
+    int i, w = 0;
+
+    for (i = 0; i < nglyph; i++, ppci++, glyphs++) {
+        glyphs->bits = (unsigned char *) ((*ppci)->bits);
+        glyphs->start = w + (*ppci)->metrics.leftSideBearing;
+        glyphs->end = w + (*ppci)->metrics.rightSideBearing;
+        glyphs->yoff = (*ppci)->metrics.ascent;
+        glyphs->height = glyphs->yoff + (*ppci)->metrics.descent;
+        glyphs->srcwidth = PADGLYPHWIDTHBYTES(glyphs->end - glyphs->start);
+        w += (*ppci)->metrics.characterWidth;
+    }
+    return w;
+}
+
+static void
+PolyGlyphBltAsSingleBitmap(ScrnInfoPtr pScrn,
+                           int nglyph,
+                           FontPtr font,
+                           int xInit,
+                           int yInit,
+                           int nbox,
+                           BoxPtr pbox, int fg, int rop, unsigned planemask)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    CARD32 *block, *pntr, *bits;
+    int pitch, topLine, botLine, top, bot, height;
+    int Left, Right, Top, Bottom;
+    int LeftEdge, RightEdge;
+    int bitPitch, shift, size, i, skippix;
+    NonTEGlyphPtr glyphs = infoRec->GlyphInfo;
+    Bool extra;
+
+    Left = xInit + infoRec->GlyphInfo[0].start;
+    Right = xInit + infoRec->GlyphInfo[nglyph - 1].end;
+    Top = yInit - FONTMAXBOUNDS(font, ascent);
+    Bottom = yInit + FONTMAXBOUNDS(font, descent);
+
+    /* get into the first band that may contain part of our string */
+    while (nbox && (Top >= pbox->y2)) {
+        pbox++;
+        nbox--;
+    }
+
+    if (!nbox)
+        return;
+
+    pitch = (Right - Left + 31) >> 5;
+    size = (pitch << 2) * (Bottom - Top);
+    block = calloc(1, size);
+
+    topLine = 10000;
+    botLine = -10000;
+
+    while (nglyph--) {
+        top = -glyphs->yoff;
+        bot = top + glyphs->height;
+        if (top < topLine)
+            topLine = top;
+        if (bot > botLine)
+            botLine = bot;
+        skippix = glyphs->start - infoRec->GlyphInfo[0].start;
+        bits = (CARD32 *) glyphs->bits;
+        bitPitch = glyphs->srcwidth >> 2;
+        pntr = block + ((FONTMAXBOUNDS(font, ascent) + top) * pitch) +
+            (skippix >> 5);
+        shift = skippix & 31;
+        extra = ((shift + glyphs->end - glyphs->start) > 32);
+
+        for (i = top; i < bot; i++) {
+            *pntr |= SHIFT_L(*bits, shift);
+            if (extra)
+                *(pntr + 1) |= SHIFT_R(*bits, 32 - shift);
+            pntr += pitch;
+            bits += bitPitch;
+        }
+
+        glyphs++;
+    }
+
+    pntr = block + ((FONTMAXBOUNDS(font, ascent) + topLine) * pitch);
+
+    Top = yInit + topLine;
+    Bottom = yInit + botLine;
+
+    while (nbox && (Top >= pbox->y2)) {
+        pbox++;
+        nbox--;
+    }
+
+    while (nbox && (Bottom > pbox->y1)) {
+        LeftEdge = max(Left, pbox->x1);
+        RightEdge = min(Right, pbox->x2);
+
+        if (RightEdge > LeftEdge) {
+            skippix = LeftEdge - Left;
+            topLine = max(Top, pbox->y1);
+            botLine = min(Bottom, pbox->y2);
+            height = botLine - topLine;
+
+            if (height > 0)
+                (*infoRec->WriteBitmap) (pScrn, LeftEdge, topLine,
+                                         RightEdge - LeftEdge, height,
+                                         (unsigned char *) (pntr +
+                                                            ((topLine -
+                                                              Top) * pitch) +
+                                                            (skippix >> 5)),
+                                         pitch << 2, skippix & 31, fg, -1, rop,
+                                         planemask);
+        }
+
+        nbox--;
+        pbox++;
+    }
+
+    free(block);
+}
+
+static void
+ImageGlyphBltNonTEColorExpansion(ScrnInfoPtr pScrn,
+                                 int xInit, int yInit,
+                                 FontPtr font,
+                                 int fg, int bg,
+                                 unsigned planemask,
+                                 RegionPtr cclip,
+                                 int nglyph,
+                                 unsigned char *gBase, CharInfoPtr * ppci)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int skippix, skipglyph, width, n, i;
+    int Left, Right, Top, Bottom;
+    int LeftEdge, RightEdge, ytop, ybot;
+    int nbox = RegionNumRects(cclip);
+    BoxPtr pbox = RegionRects(cclip);
+    Bool AlreadySetup = FALSE;
+
+    width = CollectCharacterInfo(infoRec->GlyphInfo, nglyph, ppci, font);
+
+    /* find our backing rectangle dimensions */
+    Left = xInit;
+    Right = Left + width;
+    Top = yInit - FONTASCENT(font);
+    Bottom = yInit + FONTDESCENT(font);
+
+    /* get into the first band that may contain part of our box */
+    while (nbox && (Top >= pbox->y2)) {
+        pbox++;
+        nbox--;
+    }
+
+    while (nbox && (Bottom >= pbox->y1)) {
+        /* handle backing rect first */
+        LeftEdge = max(Left, pbox->x1);
+        RightEdge = min(Right, pbox->x2);
+        if (RightEdge > LeftEdge) {
+            ytop = max(Top, pbox->y1);
+            ybot = min(Bottom, pbox->y2);
+
+            if (ybot > ytop) {
+                if (!AlreadySetup) {
+                    (*infoRec->SetupForSolidFill) (pScrn, bg, GXcopy,
+                                                   planemask);
+                    AlreadySetup = TRUE;
+                }
+                (*infoRec->SubsequentSolidFillRect) (pScrn,
+                                                     LeftEdge, ytop,
+                                                     RightEdge - LeftEdge,
+                                                     ybot - ytop);
+            }
+        }
+        nbox--;
+        pbox++;
+    }
+
+    nbox = RegionNumRects(cclip);
+    pbox = RegionRects(cclip);
+
+    if (infoRec->WriteBitmap && (nglyph > 1) &&
+        ((FONTMAXBOUNDS(font, rightSideBearing) -
+          FONTMINBOUNDS(font, leftSideBearing)) <= 32)) {
+        PolyGlyphBltAsSingleBitmap(pScrn, nglyph, font,
+                                   xInit, yInit, nbox, pbox,
+                                   fg, GXcopy, planemask);
+
+        return;
+    }
+
+    /* compute an approximate but covering bounding box */
+    Left = xInit + infoRec->GlyphInfo[0].start;
+    Right = xInit + infoRec->GlyphInfo[nglyph - 1].end;
+    Top = yInit - FONTMAXBOUNDS(font, ascent);
+    Bottom = yInit + FONTMAXBOUNDS(font, descent);
+
+    /* get into the first band that may contain part of our box */
+    while (nbox && (Top >= pbox->y2)) {
+        pbox++;
+        nbox--;
+    }
+
+    /* stop when the lower edge of the box is beyond our string */
+    while (nbox && (Bottom >= pbox->y1)) {
+        LeftEdge = max(Left, pbox->x1);
+        RightEdge = min(Right, pbox->x2);
+
+        if (RightEdge > LeftEdge) {     /* we're possibly drawing something */
+            ytop = max(Top, pbox->y1);
+            ybot = min(Bottom, pbox->y2);
+            if (ybot > ytop) {
+                skippix = LeftEdge - xInit;
+                skipglyph = 0;
+                while (skippix >= infoRec->GlyphInfo[skipglyph].end)
+                    skipglyph++;
+
+                skippix = RightEdge - xInit;
+                n = 0;
+                i = skipglyph;
+                while ((i < nglyph) && (skippix > infoRec->GlyphInfo[i].start)) {
+                    i++;
+                    n++;
+                }
+
+                if (n)
+                    (*infoRec->NonTEGlyphRenderer) (pScrn,
+                                                    xInit, yInit, n,
+                                                    infoRec->GlyphInfo +
+                                                    skipglyph, pbox, fg, GXcopy,
+                                                    planemask);
+            }
+        }
+
+        nbox--;
+        pbox++;
+    }
+}
+
+static int
+PolyGlyphBltNonTEColorExpansion(ScrnInfoPtr pScrn,
+                                int xInit, int yInit,
+                                FontPtr font,
+                                int fg, int rop,
+                                unsigned planemask,
+                                RegionPtr cclip,
+                                int nglyph,
+                                unsigned char *gBase, CharInfoPtr * ppci)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int skippix, skipglyph, width, n, i;
+    int Left, Right, Top, Bottom;
+    int LeftEdge, RightEdge;
+    int nbox = RegionNumRects(cclip);
+    BoxPtr pbox = RegionRects(cclip);
+
+    width = CollectCharacterInfo(infoRec->GlyphInfo, nglyph, ppci, font);
+
+    if (!nbox)
+        return width;
+
+    if ((infoRec->WriteBitmap) && (rop == GXcopy) && (nglyph > 1) &&
+        ((FONTMAXBOUNDS(font, rightSideBearing) -
+          FONTMINBOUNDS(font, leftSideBearing)) <= 32)) {
+
+        PolyGlyphBltAsSingleBitmap(pScrn, nglyph, font,
+                                   xInit, yInit, nbox, pbox,
+                                   fg, rop, planemask);
+
+        return width;
+    }
+
+    /* compute an approximate but covering bounding box */
+    Left = xInit + infoRec->GlyphInfo[0].start;
+    Right = xInit + infoRec->GlyphInfo[nglyph - 1].end;
+    Top = yInit - FONTMAXBOUNDS(font, ascent);
+    Bottom = yInit + FONTMAXBOUNDS(font, descent);
+
+    /* get into the first band that may contain part of our string */
+    while (nbox && (Top >= pbox->y2)) {
+        pbox++;
+        nbox--;
+    }
+
+    /* stop when the lower edge of the box is beyond our string */
+    while (nbox && (Bottom >= pbox->y1)) {
+        LeftEdge = max(Left, pbox->x1);
+        RightEdge = min(Right, pbox->x2);
+
+        if (RightEdge > LeftEdge) {     /* we're possibly drawing something */
+
+            skippix = LeftEdge - xInit;
+            skipglyph = 0;
+            while (skippix >= infoRec->GlyphInfo[skipglyph].end)
+                skipglyph++;
+
+            skippix = RightEdge - xInit;
+            n = 0;
+            i = skipglyph;
+            while ((i < nglyph) && (skippix > infoRec->GlyphInfo[i].start)) {
+                i++;
+                n++;
+            }
+
+            if (n)
+                (*infoRec->NonTEGlyphRenderer) (pScrn,
+                                                xInit, yInit, n,
+                                                infoRec->GlyphInfo + skipglyph,
+                                                pbox, fg, rop, planemask);
+        }
+
+        nbox--;
+        pbox++;
+    }
+    return width;
+}
+
+/* It is possible that the none of the glyphs passed to the 
+   NonTEGlyphRenderer will be drawn.  This function being called
+   indicates that part of the text string's bounding box is visible
+   but not necessarily that any of the characters are visible */
+
+void
+XAANonTEGlyphRenderer(ScrnInfoPtr pScrn,
+                      int x, int y, int n,
+                      NonTEGlyphPtr glyphs,
+                      BoxPtr pbox, int fg, int rop, unsigned int planemask)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int x1, x2, y1, y2, i, w, h, skipleft, skiptop;
+    unsigned char *src;
+
+    for (i = 0; i < n; i++, glyphs++) {
+        x1 = x + glyphs->start;
+        x2 = x + glyphs->end;
+        y1 = y - glyphs->yoff;
+        y2 = y1 + glyphs->height;
+
+        if (y1 < pbox->y1) {
+            skiptop = pbox->y1 - y1;
+            y1 = pbox->y1;
+        }
+        else
+            skiptop = 0;
+        if (y2 > pbox->y2)
+            y2 = pbox->y2;
+        h = y2 - y1;
+        if (h <= 0)
+            continue;
+
+        if (x1 < pbox->x1) {
+            skipleft = pbox->x1 - x1;
+            x1 = pbox->x1;
+        }
+        else
+            skipleft = 0;
+        if (x2 > pbox->x2)
+            x2 = pbox->x2;
+
+        w = x2 - x1;
+
+        if (w > 0) {
+            src = glyphs->bits + (skiptop * glyphs->srcwidth);
+
+            if (skipleft) {
+                src += (skipleft >> 5) << 2;
+                skipleft &= 31;
+            }
+
+            (*infoRec->WriteBitmap) (pScrn, x1, y1, w, h, src,
+                                     glyphs->srcwidth, skipleft, fg, -1, rop,
+                                     planemask);
+        }
+    }
+
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaOffscreen.c b/xorg-server/hw/xfree86/xaa/xaaOffscreen.c
index 41be2b491..7d89fc17a 100644
--- a/xorg-server/hw/xfree86/xaa/xaaOffscreen.c
+++ b/xorg-server/hw/xfree86/xaa/xaaOffscreen.c
@@ -1,162 +1,163 @@
-

-/*

-   Copyright (c) 1999 -  The XFree86 Project Inc.

-

-   Written by Mark Vojkovich

-

-*/ 

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "windowstr.h"

-#include "xf86str.h"

-#include "mi.h"

-#include "miline.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaawrap.h"

-#include "xf86fbman.h"

-#include "servermd.h"

-

-void

-XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    PixmapLinkPtr pLink = infoRec->OffscreenPixmaps;

-    XAAPixmapPtr pPriv;

-    

-    while(pLink) {

-	pPriv = XAA_GET_PIXMAP_PRIVATE(pLink->pPix);

-	pLink->area = pPriv->offscreenArea;

-	XAAMoveOutOffscreenPixmap(pLink->pPix);	

-	pLink = pLink->next;

-    }    

-}

-

-

-

-void

-XAAMoveInOffscreenPixmaps(ScreenPtr pScreen)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    PixmapLinkPtr pLink = infoRec->OffscreenPixmaps;

-    PixmapPtr pPix, pScreenPix, tmpPix;

-    pointer data;

-    XAAPixmapPtr pPriv;

-    GCPtr pGC;

-    FBAreaPtr area;

-

-    pScreenPix = (*pScreen->GetScreenPixmap)(pScreen);

-

-    while(pLink) {

-	pPix = pLink->pPix;

-    	pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);

-	area = pLink->area;

-

-	data = pPix->devPrivate.ptr;

-	tmpPix = GetScratchPixmapHeader(pScreen, 

-		pPix->drawable.width, pPix->drawable.height, 

-		pPix->drawable.depth, pPix->drawable.bitsPerPixel, 

-		pPix->devKind, data);

-

-	pPriv->freeData = FALSE;

-

-	pPix->drawable.x = area->box.x1;

-	pPix->drawable.y = area->box.y1;

-	pPix->devKind = pScreenPix->devKind;

-	pPix->devPrivate.ptr = pScreenPix->devPrivate.ptr;

-	pPix->drawable.bitsPerPixel = infoRec->pScrn->bitsPerPixel;

-	pPix->drawable.serialNumber = NEXT_SERIAL_NUMBER;

-

-	if(!tmpPix) {

-	    pPriv->offscreenArea = area;

-	    free(data);

-	    pLink = pLink->next;

-	    continue;

-	}

-	

-	pGC = GetScratchGC(pPix->drawable.depth, pScreen);

-	ValidateGC((DrawablePtr)pPix, pGC);

-

-	(*pGC->ops->CopyArea)((DrawablePtr)tmpPix, (DrawablePtr)pPix, pGC, 

-		0, 0, pPix->drawable.width, pPix->drawable.height, 0, 0);	

-

-	free(data);

-	tmpPix->devPrivate.ptr = NULL;

-

-	FreeScratchGC(pGC);

-	FreeScratchPixmapHeader(tmpPix);

-

-	pPriv->offscreenArea = area;

-	pLink->area = NULL;

-	pLink = pLink->next;

-    }    

-}

-

-

-void

-XAARemoveAreaCallback(FBAreaPtr area)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(area->pScreen);

-    PixmapPtr pPix = (PixmapPtr)area->devPrivate.ptr;

-    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);

-

-    XAAMoveOutOffscreenPixmap(pPix);

-

-    pPriv->flags &= ~OFFSCREEN;	

-

-    DELIST_OFFSCREEN_PIXMAP(pPix);

-}

-

-void

-XAAMoveOutOffscreenPixmap(PixmapPtr pPix) 

-{

-    ScreenPtr pScreen = pPix->drawable.pScreen;

-    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);

-    int width, height, devKind, bitsPerPixel;

-    PixmapPtr tmpPix;

-    unsigned char *data;

-    GCPtr pGC;

-

-    width = pPix->drawable.width;

-    height = pPix->drawable.height;

-    bitsPerPixel = pPix->drawable.bitsPerPixel;

-

-    devKind = BitmapBytePad(width * bitsPerPixel);

-    if(!(data = malloc(devKind * height)))

-	FatalError("Out of memory\n");

-

-    tmpPix = GetScratchPixmapHeader(pScreen, width, height, 

-		pPix->drawable.depth, bitsPerPixel, devKind, data);

-    if(!tmpPix) {

-	free(data);

-	FatalError("Out of memory\n");

-    }

-

-    pGC = GetScratchGC(pPix->drawable.depth, pScreen);

-    ValidateGC((DrawablePtr)tmpPix, pGC);

-

-    (*pGC->ops->CopyArea)((DrawablePtr)pPix, (DrawablePtr)tmpPix,

-		pGC, 0, 0, width, height, 0, 0);	

-

-    FreeScratchGC(pGC);

-    FreeScratchPixmapHeader(tmpPix);

-

-    pPix->drawable.x = 0;

-    pPix->drawable.y = 0;

-    pPix->devKind = devKind;

-    pPix->devPrivate.ptr = data;

-    pPix->drawable.serialNumber = NEXT_SERIAL_NUMBER;

-

-    pPriv->offscreenArea = NULL;

-    pPriv->freeData = TRUE;

-}

+
+/*
+   Copyright (c) 1999 -  The XFree86 Project Inc.
+
+   Written by Mark Vojkovich
+
+*/
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "windowstr.h"
+#include "xf86str.h"
+#include "mi.h"
+#include "miline.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaawrap.h"
+#include "xf86fbman.h"
+#include "servermd.h"
+
+void
+XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    PixmapLinkPtr pLink = infoRec->OffscreenPixmaps;
+    XAAPixmapPtr pPriv;
+
+    while (pLink) {
+        pPriv = XAA_GET_PIXMAP_PRIVATE(pLink->pPix);
+        pLink->area = pPriv->offscreenArea;
+        XAAMoveOutOffscreenPixmap(pLink->pPix);
+        pLink = pLink->next;
+    }
+}
+
+void
+XAAMoveInOffscreenPixmaps(ScreenPtr pScreen)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    PixmapLinkPtr pLink = infoRec->OffscreenPixmaps;
+    PixmapPtr pPix, pScreenPix, tmpPix;
+    pointer data;
+    XAAPixmapPtr pPriv;
+    GCPtr pGC;
+    FBAreaPtr area;
+
+    pScreenPix = (*pScreen->GetScreenPixmap) (pScreen);
+
+    while (pLink) {
+        pPix = pLink->pPix;
+        pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);
+        area = pLink->area;
+
+        data = pPix->devPrivate.ptr;
+        tmpPix = GetScratchPixmapHeader(pScreen,
+                                        pPix->drawable.width,
+                                        pPix->drawable.height,
+                                        pPix->drawable.depth,
+                                        pPix->drawable.bitsPerPixel,
+                                        pPix->devKind, data);
+
+        pPriv->freeData = FALSE;
+
+        pPix->drawable.x = area->box.x1;
+        pPix->drawable.y = area->box.y1;
+        pPix->devKind = pScreenPix->devKind;
+        pPix->devPrivate.ptr = pScreenPix->devPrivate.ptr;
+        pPix->drawable.bitsPerPixel = infoRec->pScrn->bitsPerPixel;
+        pPix->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+
+        if (!tmpPix) {
+            pPriv->offscreenArea = area;
+            free(data);
+            pLink = pLink->next;
+            continue;
+        }
+
+        pGC = GetScratchGC(pPix->drawable.depth, pScreen);
+        ValidateGC((DrawablePtr) pPix, pGC);
+
+        (*pGC->ops->CopyArea) ((DrawablePtr) tmpPix, (DrawablePtr) pPix, pGC,
+                               0, 0, pPix->drawable.width,
+                               pPix->drawable.height, 0, 0);
+
+        free(data);
+        tmpPix->devPrivate.ptr = NULL;
+
+        FreeScratchGC(pGC);
+        FreeScratchPixmapHeader(tmpPix);
+
+        pPriv->offscreenArea = area;
+        pLink->area = NULL;
+        pLink = pLink->next;
+    }
+}
+
+void
+XAARemoveAreaCallback(FBAreaPtr area)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(area->pScreen);
+    PixmapPtr pPix = (PixmapPtr) area->devPrivate.ptr;
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);
+
+    XAAMoveOutOffscreenPixmap(pPix);
+
+    pPriv->flags &= ~OFFSCREEN;
+
+    DELIST_OFFSCREEN_PIXMAP(pPix);
+}
+
+void
+XAAMoveOutOffscreenPixmap(PixmapPtr pPix)
+{
+    ScreenPtr pScreen = pPix->drawable.pScreen;
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);
+    int width, height, devKind, bitsPerPixel;
+    PixmapPtr tmpPix;
+    unsigned char *data;
+    GCPtr pGC;
+
+    width = pPix->drawable.width;
+    height = pPix->drawable.height;
+    bitsPerPixel = pPix->drawable.bitsPerPixel;
+
+    devKind = BitmapBytePad(width * bitsPerPixel);
+    if (!(data = malloc(devKind * height)))
+        FatalError("Out of memory\n");
+
+    tmpPix = GetScratchPixmapHeader(pScreen, width, height,
+                                    pPix->drawable.depth, bitsPerPixel, devKind,
+                                    data);
+    if (!tmpPix) {
+        free(data);
+        FatalError("Out of memory\n");
+    }
+
+    pGC = GetScratchGC(pPix->drawable.depth, pScreen);
+    ValidateGC((DrawablePtr) tmpPix, pGC);
+
+    (*pGC->ops->CopyArea) ((DrawablePtr) pPix, (DrawablePtr) tmpPix,
+                           pGC, 0, 0, width, height, 0, 0);
+
+    FreeScratchGC(pGC);
+    FreeScratchPixmapHeader(tmpPix);
+
+    pPix->drawable.x = 0;
+    pPix->drawable.y = 0;
+    pPix->devKind = devKind;
+    pPix->devPrivate.ptr = data;
+    pPix->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+
+    pPriv->offscreenArea = NULL;
+    pPriv->freeData = TRUE;
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaOverlay.c b/xorg-server/hw/xfree86/xaa/xaaOverlay.c
index 176a2d891..25d18da96 100644
--- a/xorg-server/hw/xfree86/xaa/xaaOverlay.c
+++ b/xorg-server/hw/xfree86/xaa/xaaOverlay.c
@@ -1,129 +1,122 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaawrap.h"

-#include "gcstruct.h"

-#include "pixmapstr.h"

-#include "mioverlay.h"

-

-#ifdef PANORAMIX

-#include "panoramiX.h"

-#include "panoramiXsrv.h"

-#endif

-

-static void

-XAACopyWindow8_32(

-    WindowPtr pWin,

-    DDXPointRec ptOldOrg,

-    RegionPtr prgnSrc

-){

-    DDXPointPtr pptSrc, ppt;

-    RegionRec rgnDst;

-    BoxPtr pbox;

-    int dx, dy, nbox;

-    WindowPtr pwinRoot;

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    XAAInfoRecPtr infoRec = 

-	GET_XAAINFORECPTR_FROM_DRAWABLE((&pWin->drawable));

-    Bool doUnderlay = miOverlayCopyUnderlay(pScreen);

-    RegionPtr borderClip = &pWin->borderClip;

-    Bool freeReg = FALSE;

-

-    if (!infoRec->pScrn->vtSema || !infoRec->ScreenToScreenBitBlt ||

-	(infoRec->ScreenToScreenBitBltFlags & NO_PLANEMASK)) 

-    { 

-	XAA_SCREEN_PROLOGUE (pScreen, CopyWindow);

-	if(infoRec->pScrn->vtSema && infoRec->NeedToSync) {

-	    (*infoRec->Sync)(infoRec->pScrn);

-	    infoRec->NeedToSync = FALSE;

-	}

-        (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);

-	XAA_SCREEN_EPILOGUE (pScreen, CopyWindow, XAACopyWindow8_32);

-    	return;

-    }

-

-    pwinRoot = pScreen->root;

-

-    if(doUnderlay)

-	freeReg = miOverlayCollectUnderlayRegions(pWin, &borderClip);

-

-    RegionNull(&rgnDst);

-

-    dx = ptOldOrg.x - pWin->drawable.x;

-    dy = ptOldOrg.y - pWin->drawable.y;

-    RegionTranslate(prgnSrc, -dx, -dy);

-    RegionIntersect(&rgnDst, borderClip, prgnSrc);

-

-    pbox = RegionRects(&rgnDst);

-    nbox = RegionNumRects(&rgnDst);

-    if(!nbox || 

-      !(pptSrc = (DDXPointPtr )malloc(nbox * sizeof(DDXPointRec)))) {

-	RegionUninit(&rgnDst);

-	return;

-    }

-    ppt = pptSrc;

-

-    while(nbox--) {

-	ppt->x = pbox->x1 + dx;

-	ppt->y = pbox->y1 + dy;

-	ppt++; pbox++;

-    }

-    

-    infoRec->ScratchGC.planemask = doUnderlay ? 0x00ffffff : 0xff000000;

-    infoRec->ScratchGC.alu = GXcopy;

-

-    XAADoBitBlt((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot,

-        		&(infoRec->ScratchGC), &rgnDst, pptSrc);

-

-    free(pptSrc);

-    RegionUninit(&rgnDst);

-    if(freeReg) 

-	RegionDestroy(borderClip);

-}

-

-static void

-XAASetColorKey8_32(

-    ScreenPtr pScreen,

-    int nbox,

-    BoxPtr pbox

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    ScrnInfoPtr pScrn = infoRec->pScrn;

-

-    /* I'm counting on writes being clipped away while switched away.

-       If this isn't going to be true then I need to be wrapping instead. */

-    if(!infoRec->pScrn->vtSema) return;

-

-    (*infoRec->FillSolidRects)(pScrn, pScrn->colorKey << 24, GXcopy, 

-					0xff000000, nbox, pbox);

-  

-    SET_SYNC_FLAG(infoRec);

-}

-

-void

-XAASetupOverlay8_32Planar(ScreenPtr pScreen)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    int i;

-

-    pScreen->CopyWindow = XAACopyWindow8_32;

-

-    if(!(infoRec->FillSolidRectsFlags & NO_PLANEMASK))

-	miOverlaySetTransFunction(pScreen, XAASetColorKey8_32);

-

-    infoRec->FullPlanemask = ~0;

-    for(i = 0; i < 32; i++) /* haven't thought about this much */

-	infoRec->FullPlanemasks[i] = ~0;

-}

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaawrap.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+#include "mioverlay.h"
+
+#ifdef PANORAMIX
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
+#endif
+
+static void
+XAACopyWindow8_32(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+{
+    DDXPointPtr pptSrc, ppt;
+    RegionRec rgnDst;
+    BoxPtr pbox;
+    int dx, dy, nbox;
+    WindowPtr pwinRoot;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_DRAWABLE((&pWin->drawable));
+    Bool doUnderlay = miOverlayCopyUnderlay(pScreen);
+    RegionPtr borderClip = &pWin->borderClip;
+    Bool freeReg = FALSE;
+
+    if (!infoRec->pScrn->vtSema || !infoRec->ScreenToScreenBitBlt ||
+        (infoRec->ScreenToScreenBitBltFlags & NO_PLANEMASK)) {
+        XAA_SCREEN_PROLOGUE(pScreen, CopyWindow);
+        if (infoRec->pScrn->vtSema && infoRec->NeedToSync) {
+            (*infoRec->Sync) (infoRec->pScrn);
+            infoRec->NeedToSync = FALSE;
+        }
+        (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);
+        XAA_SCREEN_EPILOGUE(pScreen, CopyWindow, XAACopyWindow8_32);
+        return;
+    }
+
+    pwinRoot = pScreen->root;
+
+    if (doUnderlay)
+        freeReg = miOverlayCollectUnderlayRegions(pWin, &borderClip);
+
+    RegionNull(&rgnDst);
+
+    dx = ptOldOrg.x - pWin->drawable.x;
+    dy = ptOldOrg.y - pWin->drawable.y;
+    RegionTranslate(prgnSrc, -dx, -dy);
+    RegionIntersect(&rgnDst, borderClip, prgnSrc);
+
+    pbox = RegionRects(&rgnDst);
+    nbox = RegionNumRects(&rgnDst);
+    if (!nbox || !(pptSrc = (DDXPointPtr) malloc(nbox * sizeof(DDXPointRec)))) {
+        RegionUninit(&rgnDst);
+        return;
+    }
+    ppt = pptSrc;
+
+    while (nbox--) {
+        ppt->x = pbox->x1 + dx;
+        ppt->y = pbox->y1 + dy;
+        ppt++;
+        pbox++;
+    }
+
+    infoRec->ScratchGC.planemask = doUnderlay ? 0x00ffffff : 0xff000000;
+    infoRec->ScratchGC.alu = GXcopy;
+
+    XAADoBitBlt((DrawablePtr) pwinRoot, (DrawablePtr) pwinRoot,
+                &(infoRec->ScratchGC), &rgnDst, pptSrc);
+
+    free(pptSrc);
+    RegionUninit(&rgnDst);
+    if (freeReg)
+        RegionDestroy(borderClip);
+}
+
+static void
+XAASetColorKey8_32(ScreenPtr pScreen, int nbox, BoxPtr pbox)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    ScrnInfoPtr pScrn = infoRec->pScrn;
+
+    /* I'm counting on writes being clipped away while switched away.
+       If this isn't going to be true then I need to be wrapping instead. */
+    if (!infoRec->pScrn->vtSema)
+        return;
+
+    (*infoRec->FillSolidRects) (pScrn, pScrn->colorKey << 24, GXcopy,
+                                0xff000000, nbox, pbox);
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+void
+XAASetupOverlay8_32Planar(ScreenPtr pScreen)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    int i;
+
+    pScreen->CopyWindow = XAACopyWindow8_32;
+
+    if (!(infoRec->FillSolidRectsFlags & NO_PLANEMASK))
+        miOverlaySetTransFunction(pScreen, XAASetColorKey8_32);
+
+    infoRec->FullPlanemask = ~0;
+    for (i = 0; i < 32; i++)    /* haven't thought about this much */
+        infoRec->FullPlanemasks[i] = ~0;
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaOverlayDF.c b/xorg-server/hw/xfree86/xaa/xaaOverlayDF.c
index 309ec9fa4..5918f65a3 100644
--- a/xorg-server/hw/xfree86/xaa/xaaOverlayDF.c
+++ b/xorg-server/hw/xfree86/xaa/xaaOverlayDF.c
@@ -1,1053 +1,906 @@
-/*

-   Copyright (c) 1999 - The XFree86 Project Inc.

-

-   Written by Mark Vojkovich

-*/

-

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "windowstr.h"

-#include "xf86str.h"

-#include "mi.h"

-#include "miline.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaawrap.h"

-#include "servermd.h"

-

-/* Screen funcs */

-

-static void XAAOverCopyWindow(WindowPtr, DDXPointRec, RegionPtr);

-static void XAAOverWindowExposures(WindowPtr, RegionPtr, RegionPtr);

-

-static int XAAOverStippledFillChooser(GCPtr);

-static int XAAOverOpaqueStippledFillChooser(GCPtr);

-static int XAAOverTiledFillChooser(GCPtr);

-

-/* GC funcs */

-

-static RegionPtr XAAOverCopyArea(DrawablePtr, DrawablePtr, GC *,

-			int, int, int, int, int, int);

-static RegionPtr XAAOverCopyPlane(DrawablePtr, DrawablePtr, GCPtr,

-			int, int, int, int, int, int, unsigned long);

-static void XAAOverPushPixelsSolid(GCPtr, PixmapPtr, DrawablePtr, int, 

-			int, int, int);

-static void XAAOverPolyFillRectSolid(DrawablePtr, GCPtr, int, xRectangle*);

-static void XAAOverPolyFillRectStippled(DrawablePtr, GCPtr, int, xRectangle*);

-static void XAAOverPolyFillRectOpaqueStippled(DrawablePtr, GCPtr, 

-			int, xRectangle*);

-static void XAAOverPolyFillRectTiled(DrawablePtr, GCPtr, int, xRectangle*);

-static void XAAOverFillSpansSolid(DrawablePtr, GCPtr, int, DDXPointPtr, 

-			int*, int);

-static void XAAOverFillSpansStippled(DrawablePtr, GCPtr, int, DDXPointPtr, 

-			int*, int);

-static void XAAOverFillSpansOpaqueStippled(DrawablePtr, GCPtr, int, 

-			DDXPointPtr, int*, int);

-static void XAAOverFillSpansTiled(DrawablePtr, GCPtr, int, DDXPointPtr, 

-			int*, int);

-static int XAAOverPolyText8TE(DrawablePtr, GCPtr, int, int, int, char *);

-static int XAAOverPolyText16TE(DrawablePtr, GCPtr, int, int, int, 

-			unsigned short*);

-static void XAAOverImageText8TE(DrawablePtr, GCPtr, int, int, int, char*);

-static void XAAOverImageText16TE(DrawablePtr, GCPtr, int, int, int, 

-			unsigned short*);

-static void XAAOverImageGlyphBltTE(DrawablePtr, GCPtr, int, int, 

-			unsigned int, CharInfoPtr*, pointer);

-static void XAAOverPolyGlyphBltTE(DrawablePtr, GCPtr, int, int, 

-			unsigned int, CharInfoPtr*, pointer);

-static int XAAOverPolyText8NonTE(DrawablePtr, GCPtr, int, int, int, char*);

-static int XAAOverPolyText16NonTE(DrawablePtr, GCPtr, int, int, int, 

-			unsigned short*);

-static void XAAOverImageText8NonTE(DrawablePtr, GCPtr, int, int, int, char*);

-static void XAAOverImageText16NonTE(DrawablePtr, GCPtr, int, int, int, 

-			unsigned short*);

-static void XAAOverImageGlyphBltNonTE(DrawablePtr, GCPtr, int, int, 

-			unsigned int, CharInfoPtr *, pointer);

-static void XAAOverPolyGlyphBltNonTE(DrawablePtr, GCPtr, int, int, 

-			unsigned int, CharInfoPtr *, pointer);

-static void XAAOverPolyRectangleThinSolid(DrawablePtr, GCPtr, int, xRectangle*);

-static void XAAOverPolylinesWideSolid(DrawablePtr, GCPtr, int, int, 

-			DDXPointPtr);

-static void XAAOverPolylinesThinSolid(DrawablePtr, GCPtr, int, int, 

-			DDXPointPtr);

-static void XAAOverPolySegmentThinSolid(DrawablePtr, GCPtr, int, xSegment*);

-static void XAAOverPolylinesThinDashed(DrawablePtr, GCPtr, int, int, 

-			DDXPointPtr);

-static void XAAOverPolySegmentThinDashed(DrawablePtr, GCPtr, int, xSegment*);

-static void XAAOverFillPolygonSolid(DrawablePtr, GCPtr, int, int, int, 

-			DDXPointPtr);

-static void XAAOverFillPolygonStippled(DrawablePtr, GCPtr, int, int, int,

-			DDXPointPtr);

-static void XAAOverFillPolygonOpaqueStippled(DrawablePtr, GCPtr, int, int, int, 

-			DDXPointPtr);

-static void XAAOverFillPolygonTiled(DrawablePtr, GCPtr, int, int, int, 

-			DDXPointPtr);

-static void XAAOverPolyFillArcSolid(DrawablePtr, GCPtr, int, xArc*);

-static void XAAOverPutImage(DrawablePtr, GCPtr, int, int, int, int, int, 

-			int, int, char*);

-

-

-typedef struct {

-   ScrnInfoPtr		pScrn;

-   DepthChangeFuncPtr	callback;

-   int			currentDepth;

-/* GC funcs */

-   RegionPtr (*CopyArea)(DrawablePtr, DrawablePtr, GC *,

-			int, int, int, int, int, int);

-   RegionPtr (*CopyPlane)(DrawablePtr, DrawablePtr, GCPtr,

-			int, int, int, int, int, int, unsigned long);

-   void (*PushPixelsSolid)(GCPtr, PixmapPtr, DrawablePtr, int, int, int, int);

-   void (*PolyFillRectSolid)(DrawablePtr, GCPtr, int, xRectangle*);

-   void (*PolyFillRectStippled)(DrawablePtr, GCPtr, int, xRectangle*);

-   void (*PolyFillRectOpaqueStippled)(DrawablePtr, GCPtr, int, xRectangle*);

-   void (*PolyFillRectTiled)(DrawablePtr, GCPtr, int, xRectangle*);

-   void (*FillSpansSolid)(DrawablePtr, GCPtr, int, DDXPointPtr, int*, int);

-   void (*FillSpansStippled)(DrawablePtr, GCPtr, int, DDXPointPtr, int*, int);

-   void (*FillSpansOpaqueStippled)(DrawablePtr,GCPtr,int,DDXPointPtr,int*,int);

-   void (*FillSpansTiled)(DrawablePtr, GCPtr, int, DDXPointPtr, int*, int);

-   int (*PolyText8TE)(DrawablePtr, GCPtr, int, int, int, char *);

-   int (*PolyText16TE)(DrawablePtr, GCPtr, int, int, int, unsigned short*);

-   void (*ImageText8TE)(DrawablePtr, GCPtr, int, int, int, char*);

-   void (*ImageText16TE)(DrawablePtr, GCPtr, int, int, int, unsigned short*);

-   void (*ImageGlyphBltTE)(DrawablePtr, GCPtr, int, int, unsigned int,

-			CharInfoPtr*, pointer);

-   void (*PolyGlyphBltTE)(DrawablePtr, GCPtr, int, int, unsigned int,

-			CharInfoPtr*, pointer);

-   int (*PolyText8NonTE)(DrawablePtr, GCPtr, int, int, int, char*);

-   int (*PolyText16NonTE)(DrawablePtr, GCPtr, int, int, int, unsigned short*);

-   void (*ImageText8NonTE)(DrawablePtr, GCPtr, int, int, int, char*);

-   void (*ImageText16NonTE)(DrawablePtr, GCPtr, int, int, int, unsigned short*);

-   void (*ImageGlyphBltNonTE)(DrawablePtr, GCPtr, int, int, unsigned int,

-			CharInfoPtr *, pointer);

-   void (*PolyGlyphBltNonTE)(DrawablePtr, GCPtr, int, int, unsigned int,

-			CharInfoPtr *, pointer);

-   void (*PolyRectangleThinSolid)(DrawablePtr, GCPtr, int, xRectangle*);

-   void (*PolylinesWideSolid)(DrawablePtr, GCPtr, int, int, DDXPointPtr);

-

-   void (*PolylinesThinSolid)(DrawablePtr, GCPtr, int, int, DDXPointPtr);

-   void (*PolySegmentThinSolid)(DrawablePtr, GCPtr, int, xSegment*);

-   void (*PolylinesThinDashed)(DrawablePtr, GCPtr, int, int, DDXPointPtr);

-   void (*PolySegmentThinDashed)(DrawablePtr, GCPtr, int, xSegment*);

-   void (*FillPolygonSolid)(DrawablePtr, GCPtr, int, int, int, DDXPointPtr);

-   void (*FillPolygonStippled)(DrawablePtr, GCPtr, int, int, int, DDXPointPtr);

-   void (*FillPolygonOpaqueStippled)(DrawablePtr, GCPtr, int, int, int, 

-			DDXPointPtr);

-   void (*FillPolygonTiled)(DrawablePtr, GCPtr, int, int, int, DDXPointPtr);

-   void (*PolyFillArcSolid)(DrawablePtr, GCPtr, int, xArc*);

-   void (*PutImage)(DrawablePtr, GCPtr, int, int, int, int, int, int, 

-			int, char*);

-   int (*StippledFillChooser)(GCPtr);

-   int (*OpaqueStippledFillChooser)(GCPtr);

-   int (*TiledFillChooser)(GCPtr);

-} XAAOverlayRec, *XAAOverlayPtr;

-

-static DevPrivateKeyRec XAAOverlayKeyRec;

-#define XAAOverlayKey (&XAAOverlayKeyRec)

-

-#define GET_OVERLAY_PRIV(pScreen) \

-    (XAAOverlayPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAOverlayKey)

-

-#define SWITCH_DEPTH(d) \

-   if(pOverPriv->currentDepth != d) { \

-	(*pOverPriv->callback)(pOverPriv->pScrn, d); \

-	pOverPriv->currentDepth = d; \

-   }

-

-

-Bool

-XAAInitDualFramebufferOverlay(

-    ScreenPtr pScreen, 

-    DepthChangeFuncPtr callback

-){

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    XAAOverlayPtr pOverPriv;

-

-    if (!dixRegisterPrivateKey(&XAAOverlayKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-

-    if(!(pOverPriv = malloc(sizeof(XAAOverlayRec))))

-	return FALSE;

-

-    dixSetPrivate(&pScreen->devPrivates, XAAOverlayKey, pOverPriv);

-

-    pOverPriv->pScrn = pScrn;

-    pOverPriv->callback = callback;

-    pOverPriv->currentDepth = -1;

-

-    /* Overwrite key screen functions.  The XAA core will clean up */

-

-    pScreen->CopyWindow = XAAOverCopyWindow;

-    pScreen->WindowExposures = XAAOverWindowExposures;

-

-    pOverPriv->StippledFillChooser = infoRec->StippledFillChooser;

-    pOverPriv->OpaqueStippledFillChooser = infoRec->OpaqueStippledFillChooser;

-    pOverPriv->TiledFillChooser = infoRec->TiledFillChooser;

-

-    infoRec->StippledFillChooser = XAAOverStippledFillChooser;

-    infoRec->OpaqueStippledFillChooser = XAAOverOpaqueStippledFillChooser;

-    infoRec->TiledFillChooser = XAAOverTiledFillChooser;

-

-    /* wrap all XAA GC rendering */

-

-    pOverPriv->CopyArea = infoRec->CopyArea;

-    pOverPriv->CopyPlane = infoRec->CopyPlane;

-    pOverPriv->PushPixelsSolid = infoRec->PushPixelsSolid;

-    pOverPriv->PolyFillRectSolid = infoRec->PolyFillRectSolid;

-    pOverPriv->PolyFillRectStippled = infoRec->PolyFillRectStippled;

-    pOverPriv->PolyFillRectOpaqueStippled = infoRec->PolyFillRectOpaqueStippled;

-    pOverPriv->PolyFillRectTiled = infoRec->PolyFillRectTiled;

-    pOverPriv->FillSpansSolid = infoRec->FillSpansSolid;

-    pOverPriv->FillSpansStippled = infoRec->FillSpansStippled;

-    pOverPriv->FillSpansOpaqueStippled = infoRec->FillSpansOpaqueStippled;

-    pOverPriv->FillSpansTiled = infoRec->FillSpansTiled;

-    pOverPriv->PolyText8TE = infoRec->PolyText8TE;

-    pOverPriv->PolyText16TE = infoRec->PolyText16TE;

-    pOverPriv->ImageText8TE = infoRec->ImageText8TE;

-    pOverPriv->ImageText16TE = infoRec->ImageText16TE;

-    pOverPriv->ImageGlyphBltTE = infoRec->ImageGlyphBltTE;

-    pOverPriv->PolyGlyphBltTE = infoRec->PolyGlyphBltTE;

-    pOverPriv->PolyText8NonTE = infoRec->PolyText8NonTE;

-    pOverPriv->PolyText16NonTE = infoRec->PolyText16NonTE;

-    pOverPriv->ImageText8NonTE = infoRec->ImageText8NonTE;

-    pOverPriv->ImageText16NonTE = infoRec->ImageText16NonTE;

-    pOverPriv->ImageGlyphBltNonTE = infoRec->ImageGlyphBltNonTE;

-    pOverPriv->PolyGlyphBltNonTE = infoRec->PolyGlyphBltNonTE;

-    pOverPriv->PolyRectangleThinSolid = infoRec->PolyRectangleThinSolid;

-    pOverPriv->PolylinesWideSolid = infoRec->PolylinesWideSolid;

-    pOverPriv->PolylinesThinSolid = infoRec->PolylinesThinSolid;

-    pOverPriv->PolySegmentThinSolid = infoRec->PolySegmentThinSolid;

-    pOverPriv->PolylinesThinDashed = infoRec->PolylinesThinDashed;

-    pOverPriv->PolySegmentThinDashed = infoRec->PolySegmentThinDashed;

-    pOverPriv->FillPolygonSolid = infoRec->FillPolygonSolid;

-    pOverPriv->FillPolygonStippled = infoRec->FillPolygonStippled;

-    pOverPriv->FillPolygonOpaqueStippled = infoRec->FillPolygonOpaqueStippled;

-    pOverPriv->FillPolygonTiled = infoRec->FillPolygonTiled;

-    pOverPriv->PolyFillArcSolid = infoRec->PolyFillArcSolid;

-    pOverPriv->PutImage = infoRec->PutImage;

-

-

-    if(infoRec->CopyArea)

-	infoRec->CopyArea = XAAOverCopyArea;

-    if(infoRec->CopyPlane)

-	infoRec->CopyPlane = XAAOverCopyPlane;

-    if(infoRec->PushPixelsSolid)

-	infoRec->PushPixelsSolid = XAAOverPushPixelsSolid;

-    if(infoRec->PolyFillRectSolid)

-	infoRec->PolyFillRectSolid = XAAOverPolyFillRectSolid;

-    if(infoRec->PolyFillRectStippled)

-	infoRec->PolyFillRectStippled = XAAOverPolyFillRectStippled;

-    if(infoRec->PolyFillRectOpaqueStippled)

-	infoRec->PolyFillRectOpaqueStippled = XAAOverPolyFillRectOpaqueStippled;

-    if(infoRec->PolyFillRectTiled)

-	infoRec->PolyFillRectTiled = XAAOverPolyFillRectTiled;

-    if(infoRec->FillSpansSolid)

-	infoRec->FillSpansSolid = XAAOverFillSpansSolid;

-    if(infoRec->FillSpansStippled)

-	infoRec->FillSpansStippled = XAAOverFillSpansStippled;

-    if(infoRec->FillSpansOpaqueStippled)

-	infoRec->FillSpansOpaqueStippled = XAAOverFillSpansOpaqueStippled;

-    if(infoRec->FillSpansTiled)

-	infoRec->FillSpansTiled = XAAOverFillSpansTiled;

-    if(infoRec->PolyText8TE)

-	infoRec->PolyText8TE = XAAOverPolyText8TE;

-    if(infoRec->PolyText16TE)

-	infoRec->PolyText16TE = XAAOverPolyText16TE;

-    if(infoRec->ImageText8TE)

-	infoRec->ImageText8TE = XAAOverImageText8TE;

-    if(infoRec->ImageText16TE)

-	infoRec->ImageText16TE = XAAOverImageText16TE;

-    if(infoRec->ImageGlyphBltTE)

-	infoRec->ImageGlyphBltTE = XAAOverImageGlyphBltTE;

-    if(infoRec->PolyGlyphBltTE)

-	infoRec->PolyGlyphBltTE = XAAOverPolyGlyphBltTE;

-    if(infoRec->PolyText8NonTE)

-	infoRec->PolyText8NonTE = XAAOverPolyText8NonTE;

-    if(infoRec->PolyText16NonTE)

-	infoRec->PolyText16NonTE = XAAOverPolyText16NonTE;

-    if(infoRec->ImageText8NonTE)

-	infoRec->ImageText8NonTE = XAAOverImageText8NonTE;

-    if(infoRec->ImageText16NonTE)

-	infoRec->ImageText16NonTE = XAAOverImageText16NonTE;

-    if(infoRec->ImageGlyphBltNonTE)

-	infoRec->ImageGlyphBltNonTE = XAAOverImageGlyphBltNonTE;

-    if(infoRec->PolyGlyphBltNonTE)

-	infoRec->PolyGlyphBltNonTE = XAAOverPolyGlyphBltNonTE;

-    if(infoRec->PolyRectangleThinSolid)

-	infoRec->PolyRectangleThinSolid = XAAOverPolyRectangleThinSolid;

-    if(infoRec->PolylinesWideSolid)

-	infoRec->PolylinesWideSolid = XAAOverPolylinesWideSolid;

-    if(infoRec->PolylinesThinSolid)

-	infoRec->PolylinesThinSolid = XAAOverPolylinesThinSolid;

-    if(infoRec->PolySegmentThinSolid)

-	infoRec->PolySegmentThinSolid = XAAOverPolySegmentThinSolid;

-    if(infoRec->PolylinesThinDashed)

-	infoRec->PolylinesThinDashed = XAAOverPolylinesThinDashed;

-    if(infoRec->PolySegmentThinDashed)

-	infoRec->PolySegmentThinDashed = XAAOverPolySegmentThinDashed;

-    if(infoRec->FillPolygonSolid)

-	infoRec->FillPolygonSolid = XAAOverFillPolygonSolid;

-    if(infoRec->FillPolygonStippled)

-	infoRec->FillPolygonStippled = XAAOverFillPolygonStippled;

-    if(infoRec->FillPolygonOpaqueStippled)

-	infoRec->FillPolygonOpaqueStippled = XAAOverFillPolygonOpaqueStippled;

-    if(infoRec->FillPolygonTiled)

-	infoRec->FillPolygonTiled = XAAOverFillPolygonTiled;

-    if(infoRec->PolyFillArcSolid)

-	infoRec->PolyFillArcSolid = XAAOverPolyFillArcSolid;

-    if(infoRec->PutImage)

-	infoRec->PutImage = XAAOverPutImage;

-

-    return TRUE;

-}

-

-/***********************  Screen functions ************************/

-

-void

-XAAOverCopyWindow(

-    WindowPtr pWin,

-    DDXPointRec ptOldOrg,

-    RegionPtr prgnSrc

-){

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pScreen);

-    ScrnInfoPtr pScrn = infoRec->pScrn;

-    DDXPointPtr ppt, pptSrc;

-    RegionRec rgnDst;

-    BoxPtr pbox;

-    int i, nbox, dx, dy;

-    WindowPtr pRoot = pScreen->root;

-

-

-    if (!pScrn->vtSema || !infoRec->ScreenToScreenBitBlt) { 

-	XAA_SCREEN_PROLOGUE (pScreen, CopyWindow);

-	if(pScrn->vtSema && infoRec->NeedToSync) {

-	    (*infoRec->Sync)(pScrn);

-	    infoRec->NeedToSync = FALSE;

-	}

-        (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);

-	XAA_SCREEN_EPILOGUE (pScreen, CopyWindow, XAAOverCopyWindow);

-    	return;

-    }

-

-    infoRec->ScratchGC.alu = GXcopy;

-    infoRec->ScratchGC.planemask = ~0;

-

-    RegionNull(&rgnDst);

-

-    dx = ptOldOrg.x - pWin->drawable.x;

-    dy = ptOldOrg.y - pWin->drawable.y;

-    RegionTranslate(prgnSrc, -dx, -dy);

-    RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc);

-

-    nbox = RegionNumRects(&rgnDst);

-    if(nbox &&

-	(pptSrc = (DDXPointPtr )malloc(nbox * sizeof(DDXPointRec)))) {

-

-	pbox = RegionRects(&rgnDst);

-	for (i = nbox, ppt = pptSrc; i--; ppt++, pbox++) {

-	    ppt->x = pbox->x1 + dx;

-	    ppt->y = pbox->y1 + dy;

-	}

-

-	SWITCH_DEPTH(8);

-	XAADoBitBlt((DrawablePtr)pRoot, (DrawablePtr)pRoot,

-        		&(infoRec->ScratchGC), &rgnDst, pptSrc);

-

-	if(pWin->drawable.bitsPerPixel != 8) {

-	    SWITCH_DEPTH(pScrn->depth);

-	    XAADoBitBlt((DrawablePtr)pRoot, (DrawablePtr)pRoot,

-        		&(infoRec->ScratchGC), &rgnDst, pptSrc);

-	}

-

-	free(pptSrc);

-    }

-

-    RegionUninit(&rgnDst);

-

-    if(pWin->drawable.depth == 8) {

-      RegionNull(&rgnDst);

-      miSegregateChildren(pWin, &rgnDst, pScrn->depth);

-      if(RegionNotEmpty(&rgnDst)) {

-	RegionIntersect(&rgnDst, &rgnDst, prgnSrc);

-	nbox = RegionNumRects(&rgnDst);

-	if(nbox &&

-	  (pptSrc = (DDXPointPtr )malloc(nbox * sizeof(DDXPointRec)))){

-

-	    pbox = RegionRects(&rgnDst);

-	    for (i = nbox, ppt = pptSrc; i--; ppt++, pbox++) {

-		ppt->x = pbox->x1 + dx;

-		ppt->y = pbox->y1 + dy;

-	    }

-

-	    SWITCH_DEPTH(pScrn->depth);

-	    XAADoBitBlt((DrawablePtr)pRoot, (DrawablePtr)pRoot,

-        		&(infoRec->ScratchGC), &rgnDst, pptSrc);

-	    free(pptSrc);

-	}

-      }

-      RegionUninit(&rgnDst);

-    }

-}

-

-

-void

-XAAOverWindowExposures(

-   WindowPtr pWin,

-   RegionPtr pReg,

-   RegionPtr pOtherReg

-){

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-

-    if((pWin->drawable.bitsPerPixel != 8) && infoRec->pScrn->vtSema) {

-	if(RegionNumRects(pReg) && infoRec->FillSolidRects) {

-	    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pScreen);

-

-	    SWITCH_DEPTH(8);

-	    (*infoRec->FillSolidRects)(infoRec->pScrn, 

-		infoRec->pScrn->colorKey, GXcopy, ~0,

-			RegionNumRects(pReg), RegionRects(pReg));

-	    miWindowExposures(pWin, pReg, pOtherReg);

-	    return;

-	} else if(infoRec->NeedToSync) {

-            (*infoRec->Sync)(infoRec->pScrn);

-            infoRec->NeedToSync = FALSE;

-	}

-    } 

-

-    XAA_SCREEN_PROLOGUE (pScreen, WindowExposures);

-    (*pScreen->WindowExposures) (pWin, pReg, pOtherReg);

-    XAA_SCREEN_EPILOGUE(pScreen, WindowExposures, XAAOverWindowExposures);

-}

-

-/*********************  Choosers *************************/

-

-static int 

-XAAOverStippledFillChooser(GCPtr pGC)

-{

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-    int ret;

-

-    ret = (*pOverPriv->StippledFillChooser)(pGC);

-    

-    if((pGC->depth == 8) && 

-	((ret == DO_COLOR_8x8) || (ret == DO_CACHE_BLT))) {

-	ret = 0;

-    }

-

-    return ret;

-}

-

-static int 

-XAAOverOpaqueStippledFillChooser(GCPtr pGC)

-{

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-    int ret;

-

-    ret = (*pOverPriv->OpaqueStippledFillChooser)(pGC);

-    

-    if((pGC->depth == 8) && 

-	((ret == DO_COLOR_8x8) || (ret == DO_CACHE_BLT))) {

-	ret = 0;

-    }

-

-    return ret;

-}

-

-static int 

-XAAOverTiledFillChooser(GCPtr pGC)

-{

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-    int ret;

-

-    ret = (*pOverPriv->TiledFillChooser)(pGC);

-    

-    if((pGC->depth == 8) && 

-	((ret == DO_COLOR_8x8) || (ret == DO_CACHE_BLT))) {

-	ret = 0;

-    }

-

-    return ret;

-}

-

-

-/**************************** GC Functions **************************/

-

-static RegionPtr 

-XAAOverCopyArea(

-   DrawablePtr pSrc,

-   DrawablePtr pDst,

-   GC *pGC,

-   int srcx, int srcy,

-   int width, int height,

-   int dstx, int dsty

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    return (*pOverPriv->CopyArea)(pSrc, pDst, 

-		pGC, srcx, srcy, width, height, dstx, dsty);

-}

-

-static RegionPtr 

-XAAOverCopyPlane(

-   DrawablePtr pSrc,

-   DrawablePtr pDst,

-   GCPtr pGC,

-   int srcx, int srcy,

-   int width, int height,

-   int dstx, int dsty,

-   unsigned long bitPlane

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    return (*pOverPriv->CopyPlane)(pSrc, pDst,

-	       pGC, srcx, srcy, width, height, dstx, dsty, bitPlane);

-

-}

-

-static void 

-XAAOverPushPixelsSolid(

-   GCPtr pGC,

-   PixmapPtr pBitMap,

-   DrawablePtr pDraw,

-   int dx, int dy, 

-   int xOrg, int yOrg

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PushPixelsSolid)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);

-}

-

-

-

-static void 

-XAAOverPolyFillRectSolid(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int nrectFill, 	

-   xRectangle *prectInit

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolyFillRectSolid)(pDraw, pGC, nrectFill, prectInit);

-}  

-

-static void 

-XAAOverPolyFillRectStippled(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int nrectFill, 	

-   xRectangle *prectInit

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolyFillRectStippled)(pDraw, pGC, nrectFill, prectInit);

-}  

-

-

-static void 

-XAAOverPolyFillRectOpaqueStippled(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int nrectFill, 	

-   xRectangle *prectInit

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolyFillRectOpaqueStippled)(pDraw, pGC, nrectFill, prectInit);

-}  

-

-static void 

-XAAOverPolyFillRectTiled(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int nrectFill, 	

-   xRectangle *prectInit

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolyFillRectTiled)(pDraw, pGC, nrectFill, prectInit);

-}  

-

-

-static void 

-XAAOverFillSpansSolid(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		nInit,

-   DDXPointPtr 	ppt,

-   int		*pwidth,

-   int		fSorted 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->FillSpansSolid)(

-		pDraw, pGC, nInit, ppt, pwidth, fSorted);

-}

-

-

-static void 

-XAAOverFillSpansStippled(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		nInit,

-   DDXPointPtr 	ppt,

-   int		*pwidth,

-   int		fSorted 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->FillSpansStippled)(pDraw, pGC, nInit, ppt, pwidth, fSorted);

-}

-

-static void 

-XAAOverFillSpansOpaqueStippled(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		nInit,

-   DDXPointPtr 	ppt,

-   int		*pwidth,

-   int		fSorted 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->FillSpansOpaqueStippled)(

-		pDraw, pGC, nInit, ppt, pwidth, fSorted);

-}

-

-

-static void 

-XAAOverFillSpansTiled(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		nInit,

-   DDXPointPtr 	ppt,

-   int		*pwidth,

-   int		fSorted 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->FillSpansTiled)(pDraw, pGC, nInit, ppt, pwidth, fSorted);

-}

-

-static int 

-XAAOverPolyText8TE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int x, int y,

-   int count,

-   char *chars

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    return (*pOverPriv->PolyText8TE)(pDraw, pGC, x, y, count, chars);

-}

-

-

-static int

-XAAOverPolyText16TE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int x, int y,

-   int count,

-   unsigned short *chars

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    return (*pOverPriv->PolyText16TE)(pDraw, pGC, x, y, count, chars);

-}

-

-

-static void 

-XAAOverImageText8TE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int x, int y,

-   int count,

-   char *chars

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->ImageText8TE)(pDraw, pGC, x, y, count, chars);

-}

-

-

-static void 

-XAAOverImageText16TE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int x, int y,

-   int count,

-   unsigned short *chars

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->ImageText16TE)(pDraw, pGC, x, y, count, chars);

-}

-

-static void 

-XAAOverImageGlyphBltTE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int xInit, int yInit,

-   unsigned int nglyph,

-   CharInfoPtr *ppci,

-   pointer pglyphBase 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->ImageGlyphBltTE)(

-	pDraw, pGC, xInit, yInit, nglyph, ppci, pglyphBase);

-}

-

-static void 

-XAAOverPolyGlyphBltTE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int xInit, int yInit,

-   unsigned int nglyph,

-   CharInfoPtr *ppci,

-   pointer pglyphBase 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolyGlyphBltTE)(

-	pDraw, pGC, xInit, yInit, nglyph, ppci, pglyphBase);

-}

-

-static int 

-XAAOverPolyText8NonTE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int x, int y,

-   int count,

-   char *chars

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    return (*pOverPriv->PolyText8NonTE)(pDraw, pGC, x, y, count, chars);

-}

-

-

-static int 

-XAAOverPolyText16NonTE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int x, int y,

-   int count,

-   unsigned short *chars

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    return (*pOverPriv->PolyText16NonTE)(pDraw, pGC, x, y, count, chars);

-}

-

-static void 

-XAAOverImageText8NonTE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int x, int y,

-   int count,

-   char *chars

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->ImageText8NonTE)(pDraw, pGC, x, y, count, chars);

-}

-

-static void 

-XAAOverImageText16NonTE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int x, int y,

-   int count,

-   unsigned short *chars

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->ImageText16NonTE)(pDraw, pGC, x, y, count, chars);

-}

-

-

-static void 

-XAAOverImageGlyphBltNonTE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int xInit, int yInit,

-   unsigned int nglyph,

-   CharInfoPtr *ppci,

-   pointer pglyphBase 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->ImageGlyphBltNonTE)(

-		pDraw, pGC, xInit, yInit, nglyph, ppci, pglyphBase);

-}

-

-static void 

-XAAOverPolyGlyphBltNonTE(

-   DrawablePtr pDraw,

-   GCPtr pGC,

-   int xInit, int yInit,

-   unsigned int nglyph,

-   CharInfoPtr *ppci,

-   pointer pglyphBase 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolyGlyphBltNonTE)(

-		pDraw, pGC, xInit, yInit, nglyph, ppci, pglyphBase);

-}

-

-static void 

-XAAOverPolyRectangleThinSolid(

-   DrawablePtr  pDraw,

-   GCPtr        pGC,    

-   int	    	nRectsInit,

-   xRectangle  *pRectsInit 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolyRectangleThinSolid)(pDraw, pGC, nRectsInit, pRectsInit);

-}

-

-

-

-static void 

-XAAOverPolylinesWideSolid(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		mode,

-   int 		npt,

-   DDXPointPtr pPts

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolylinesWideSolid)(pDraw, pGC, mode, npt, pPts);

-}

-

-

-static void 

-XAAOverPolylinesThinSolid(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		mode,

-   int 		npt,

-   DDXPointPtr pPts

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolylinesThinSolid)(pDraw, pGC, mode, npt, pPts);

-}

-

-static void 

-XAAOverPolySegmentThinSolid(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		nseg,

-   xSegment	*pSeg

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolySegmentThinSolid)(pDraw, pGC, nseg, pSeg);

-}

-

-static void 

-XAAOverPolylinesThinDashed(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		mode,

-   int 		npt,

-   DDXPointPtr pPts

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolylinesThinDashed)(pDraw, pGC, mode, npt, pPts);

-}

-

-static void 

-XAAOverPolySegmentThinDashed(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		nseg,

-   xSegment	*pSeg

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolySegmentThinDashed)(pDraw, pGC, nseg, pSeg);

-}

-

-

-static void 

-XAAOverFillPolygonSolid(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		shape,

-   int		mode,

-   int		count,

-   DDXPointPtr	ptsIn 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->FillPolygonSolid)(pDraw, pGC, shape, mode, count, ptsIn);

-}

-

-static void 

-XAAOverFillPolygonStippled(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		shape,

-   int		mode,

-   int		count,

-   DDXPointPtr	ptsIn 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->FillPolygonStippled)(pDraw, pGC, shape, mode, count, ptsIn);

-}

-

-

-static void 

-XAAOverFillPolygonOpaqueStippled(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		shape,

-   int		mode,

-   int		count,

-   DDXPointPtr	ptsIn 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->FillPolygonOpaqueStippled)(

-			pDraw, pGC, shape, mode, count, ptsIn);

-}

-

-static void 

-XAAOverFillPolygonTiled(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		shape,

-   int		mode,

-   int		count,

-   DDXPointPtr	ptsIn 

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->FillPolygonTiled)(pDraw, pGC, shape, mode, count, ptsIn);

-}

-

-

-static void 

-XAAOverPolyFillArcSolid(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		narcs,

-   xArc		*parcs

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PolyFillArcSolid)(pDraw, pGC, narcs, parcs);

-}

-

-

-static void 

-XAAOverPutImage(

-   DrawablePtr	pDraw,

-   GCPtr	pGC,

-   int		depth, 

-   int		x, 

-   int		y, 

-   int		w, 

-   int		h,

-   int		leftPad,

-   int		format,

-   char		*pImage

-){

-    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);

-

-    SWITCH_DEPTH(pGC->depth);

-

-    (*pOverPriv->PutImage)(pDraw, pGC, depth, x, y, w, h, 

-				leftPad, format, pImage);

-}

-

+/*
+   Copyright (c) 1999 - The XFree86 Project Inc.
+
+   Written by Mark Vojkovich
+*/
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "windowstr.h"
+#include "xf86str.h"
+#include "mi.h"
+#include "miline.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaawrap.h"
+#include "servermd.h"
+
+/* Screen funcs */
+
+static void XAAOverCopyWindow(WindowPtr, DDXPointRec, RegionPtr);
+static void XAAOverWindowExposures(WindowPtr, RegionPtr, RegionPtr);
+
+static int XAAOverStippledFillChooser(GCPtr);
+static int XAAOverOpaqueStippledFillChooser(GCPtr);
+static int XAAOverTiledFillChooser(GCPtr);
+
+/* GC funcs */
+
+static RegionPtr XAAOverCopyArea(DrawablePtr, DrawablePtr, GC *,
+                                 int, int, int, int, int, int);
+static RegionPtr XAAOverCopyPlane(DrawablePtr, DrawablePtr, GCPtr,
+                                  int, int, int, int, int, int, unsigned long);
+static void XAAOverPushPixelsSolid(GCPtr, PixmapPtr, DrawablePtr, int,
+                                   int, int, int);
+static void XAAOverPolyFillRectSolid(DrawablePtr, GCPtr, int, xRectangle *);
+static void XAAOverPolyFillRectStippled(DrawablePtr, GCPtr, int, xRectangle *);
+static void XAAOverPolyFillRectOpaqueStippled(DrawablePtr, GCPtr,
+                                              int, xRectangle *);
+static void XAAOverPolyFillRectTiled(DrawablePtr, GCPtr, int, xRectangle *);
+static void XAAOverFillSpansSolid(DrawablePtr, GCPtr, int, DDXPointPtr,
+                                  int *, int);
+static void XAAOverFillSpansStippled(DrawablePtr, GCPtr, int, DDXPointPtr,
+                                     int *, int);
+static void XAAOverFillSpansOpaqueStippled(DrawablePtr, GCPtr, int,
+                                           DDXPointPtr, int *, int);
+static void XAAOverFillSpansTiled(DrawablePtr, GCPtr, int, DDXPointPtr,
+                                  int *, int);
+static int XAAOverPolyText8TE(DrawablePtr, GCPtr, int, int, int, char *);
+static int XAAOverPolyText16TE(DrawablePtr, GCPtr, int, int, int,
+                               unsigned short *);
+static void XAAOverImageText8TE(DrawablePtr, GCPtr, int, int, int, char *);
+static void XAAOverImageText16TE(DrawablePtr, GCPtr, int, int, int,
+                                 unsigned short *);
+static void XAAOverImageGlyphBltTE(DrawablePtr, GCPtr, int, int,
+                                   unsigned int, CharInfoPtr *, pointer);
+static void XAAOverPolyGlyphBltTE(DrawablePtr, GCPtr, int, int,
+                                  unsigned int, CharInfoPtr *, pointer);
+static int XAAOverPolyText8NonTE(DrawablePtr, GCPtr, int, int, int, char *);
+static int XAAOverPolyText16NonTE(DrawablePtr, GCPtr, int, int, int,
+                                  unsigned short *);
+static void XAAOverImageText8NonTE(DrawablePtr, GCPtr, int, int, int, char *);
+static void XAAOverImageText16NonTE(DrawablePtr, GCPtr, int, int, int,
+                                    unsigned short *);
+static void XAAOverImageGlyphBltNonTE(DrawablePtr, GCPtr, int, int,
+                                      unsigned int, CharInfoPtr *, pointer);
+static void XAAOverPolyGlyphBltNonTE(DrawablePtr, GCPtr, int, int,
+                                     unsigned int, CharInfoPtr *, pointer);
+static void XAAOverPolyRectangleThinSolid(DrawablePtr, GCPtr, int,
+                                          xRectangle *);
+static void XAAOverPolylinesWideSolid(DrawablePtr, GCPtr, int, int,
+                                      DDXPointPtr);
+static void XAAOverPolylinesThinSolid(DrawablePtr, GCPtr, int, int,
+                                      DDXPointPtr);
+static void XAAOverPolySegmentThinSolid(DrawablePtr, GCPtr, int, xSegment *);
+static void XAAOverPolylinesThinDashed(DrawablePtr, GCPtr, int, int,
+                                       DDXPointPtr);
+static void XAAOverPolySegmentThinDashed(DrawablePtr, GCPtr, int, xSegment *);
+static void XAAOverFillPolygonSolid(DrawablePtr, GCPtr, int, int, int,
+                                    DDXPointPtr);
+static void XAAOverFillPolygonStippled(DrawablePtr, GCPtr, int, int, int,
+                                       DDXPointPtr);
+static void XAAOverFillPolygonOpaqueStippled(DrawablePtr, GCPtr, int, int, int,
+                                             DDXPointPtr);
+static void XAAOverFillPolygonTiled(DrawablePtr, GCPtr, int, int, int,
+                                    DDXPointPtr);
+static void XAAOverPolyFillArcSolid(DrawablePtr, GCPtr, int, xArc *);
+static void XAAOverPutImage(DrawablePtr, GCPtr, int, int, int, int, int,
+                            int, int, char *);
+
+typedef struct {
+    ScrnInfoPtr pScrn;
+    DepthChangeFuncPtr callback;
+    int currentDepth;
+/* GC funcs */
+    RegionPtr (*CopyArea) (DrawablePtr, DrawablePtr, GC *,
+                           int, int, int, int, int, int);
+    RegionPtr (*CopyPlane) (DrawablePtr, DrawablePtr, GCPtr,
+                            int, int, int, int, int, int, unsigned long);
+    void (*PushPixelsSolid) (GCPtr, PixmapPtr, DrawablePtr, int, int, int, int);
+    void (*PolyFillRectSolid) (DrawablePtr, GCPtr, int, xRectangle *);
+    void (*PolyFillRectStippled) (DrawablePtr, GCPtr, int, xRectangle *);
+    void (*PolyFillRectOpaqueStippled) (DrawablePtr, GCPtr, int, xRectangle *);
+    void (*PolyFillRectTiled) (DrawablePtr, GCPtr, int, xRectangle *);
+    void (*FillSpansSolid) (DrawablePtr, GCPtr, int, DDXPointPtr, int *, int);
+    void (*FillSpansStippled) (DrawablePtr, GCPtr, int, DDXPointPtr, int *,
+                               int);
+    void (*FillSpansOpaqueStippled) (DrawablePtr, GCPtr, int, DDXPointPtr,
+                                     int *, int);
+    void (*FillSpansTiled) (DrawablePtr, GCPtr, int, DDXPointPtr, int *, int);
+    int (*PolyText8TE) (DrawablePtr, GCPtr, int, int, int, char *);
+    int (*PolyText16TE) (DrawablePtr, GCPtr, int, int, int, unsigned short *);
+    void (*ImageText8TE) (DrawablePtr, GCPtr, int, int, int, char *);
+    void (*ImageText16TE) (DrawablePtr, GCPtr, int, int, int, unsigned short *);
+    void (*ImageGlyphBltTE) (DrawablePtr, GCPtr, int, int, unsigned int,
+                             CharInfoPtr *, pointer);
+    void (*PolyGlyphBltTE) (DrawablePtr, GCPtr, int, int, unsigned int,
+                            CharInfoPtr *, pointer);
+    int (*PolyText8NonTE) (DrawablePtr, GCPtr, int, int, int, char *);
+    int (*PolyText16NonTE) (DrawablePtr, GCPtr, int, int, int,
+                            unsigned short *);
+    void (*ImageText8NonTE) (DrawablePtr, GCPtr, int, int, int, char *);
+    void (*ImageText16NonTE) (DrawablePtr, GCPtr, int, int, int,
+                              unsigned short *);
+    void (*ImageGlyphBltNonTE) (DrawablePtr, GCPtr, int, int, unsigned int,
+                                CharInfoPtr *, pointer);
+    void (*PolyGlyphBltNonTE) (DrawablePtr, GCPtr, int, int, unsigned int,
+                               CharInfoPtr *, pointer);
+    void (*PolyRectangleThinSolid) (DrawablePtr, GCPtr, int, xRectangle *);
+    void (*PolylinesWideSolid) (DrawablePtr, GCPtr, int, int, DDXPointPtr);
+
+    void (*PolylinesThinSolid) (DrawablePtr, GCPtr, int, int, DDXPointPtr);
+    void (*PolySegmentThinSolid) (DrawablePtr, GCPtr, int, xSegment *);
+    void (*PolylinesThinDashed) (DrawablePtr, GCPtr, int, int, DDXPointPtr);
+    void (*PolySegmentThinDashed) (DrawablePtr, GCPtr, int, xSegment *);
+    void (*FillPolygonSolid) (DrawablePtr, GCPtr, int, int, int, DDXPointPtr);
+    void (*FillPolygonStippled) (DrawablePtr, GCPtr, int, int, int,
+                                 DDXPointPtr);
+    void (*FillPolygonOpaqueStippled) (DrawablePtr, GCPtr, int, int, int,
+                                       DDXPointPtr);
+    void (*FillPolygonTiled) (DrawablePtr, GCPtr, int, int, int, DDXPointPtr);
+    void (*PolyFillArcSolid) (DrawablePtr, GCPtr, int, xArc *);
+    void (*PutImage) (DrawablePtr, GCPtr, int, int, int, int, int, int,
+                      int, char *);
+    int (*StippledFillChooser) (GCPtr);
+    int (*OpaqueStippledFillChooser) (GCPtr);
+    int (*TiledFillChooser) (GCPtr);
+} XAAOverlayRec, *XAAOverlayPtr;
+
+static DevPrivateKeyRec XAAOverlayKeyRec;
+
+#define XAAOverlayKey (&XAAOverlayKeyRec)
+
+#define GET_OVERLAY_PRIV(pScreen) \
+    (XAAOverlayPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAOverlayKey)
+
+#define SWITCH_DEPTH(d) \
+   if(pOverPriv->currentDepth != d) { \
+	(*pOverPriv->callback)(pOverPriv->pScrn, d); \
+	pOverPriv->currentDepth = d; \
+   }
+
+Bool
+XAAInitDualFramebufferOverlay(ScreenPtr pScreen, DepthChangeFuncPtr callback)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    XAAOverlayPtr pOverPriv;
+
+    if (!dixRegisterPrivateKey(&XAAOverlayKeyRec, PRIVATE_SCREEN, 0))
+        return FALSE;
+
+    if (!(pOverPriv = malloc(sizeof(XAAOverlayRec))))
+        return FALSE;
+
+    dixSetPrivate(&pScreen->devPrivates, XAAOverlayKey, pOverPriv);
+
+    pOverPriv->pScrn = pScrn;
+    pOverPriv->callback = callback;
+    pOverPriv->currentDepth = -1;
+
+    /* Overwrite key screen functions.  The XAA core will clean up */
+
+    pScreen->CopyWindow = XAAOverCopyWindow;
+    pScreen->WindowExposures = XAAOverWindowExposures;
+
+    pOverPriv->StippledFillChooser = infoRec->StippledFillChooser;
+    pOverPriv->OpaqueStippledFillChooser = infoRec->OpaqueStippledFillChooser;
+    pOverPriv->TiledFillChooser = infoRec->TiledFillChooser;
+
+    infoRec->StippledFillChooser = XAAOverStippledFillChooser;
+    infoRec->OpaqueStippledFillChooser = XAAOverOpaqueStippledFillChooser;
+    infoRec->TiledFillChooser = XAAOverTiledFillChooser;
+
+    /* wrap all XAA GC rendering */
+
+    pOverPriv->CopyArea = infoRec->CopyArea;
+    pOverPriv->CopyPlane = infoRec->CopyPlane;
+    pOverPriv->PushPixelsSolid = infoRec->PushPixelsSolid;
+    pOverPriv->PolyFillRectSolid = infoRec->PolyFillRectSolid;
+    pOverPriv->PolyFillRectStippled = infoRec->PolyFillRectStippled;
+    pOverPriv->PolyFillRectOpaqueStippled = infoRec->PolyFillRectOpaqueStippled;
+    pOverPriv->PolyFillRectTiled = infoRec->PolyFillRectTiled;
+    pOverPriv->FillSpansSolid = infoRec->FillSpansSolid;
+    pOverPriv->FillSpansStippled = infoRec->FillSpansStippled;
+    pOverPriv->FillSpansOpaqueStippled = infoRec->FillSpansOpaqueStippled;
+    pOverPriv->FillSpansTiled = infoRec->FillSpansTiled;
+    pOverPriv->PolyText8TE = infoRec->PolyText8TE;
+    pOverPriv->PolyText16TE = infoRec->PolyText16TE;
+    pOverPriv->ImageText8TE = infoRec->ImageText8TE;
+    pOverPriv->ImageText16TE = infoRec->ImageText16TE;
+    pOverPriv->ImageGlyphBltTE = infoRec->ImageGlyphBltTE;
+    pOverPriv->PolyGlyphBltTE = infoRec->PolyGlyphBltTE;
+    pOverPriv->PolyText8NonTE = infoRec->PolyText8NonTE;
+    pOverPriv->PolyText16NonTE = infoRec->PolyText16NonTE;
+    pOverPriv->ImageText8NonTE = infoRec->ImageText8NonTE;
+    pOverPriv->ImageText16NonTE = infoRec->ImageText16NonTE;
+    pOverPriv->ImageGlyphBltNonTE = infoRec->ImageGlyphBltNonTE;
+    pOverPriv->PolyGlyphBltNonTE = infoRec->PolyGlyphBltNonTE;
+    pOverPriv->PolyRectangleThinSolid = infoRec->PolyRectangleThinSolid;
+    pOverPriv->PolylinesWideSolid = infoRec->PolylinesWideSolid;
+    pOverPriv->PolylinesThinSolid = infoRec->PolylinesThinSolid;
+    pOverPriv->PolySegmentThinSolid = infoRec->PolySegmentThinSolid;
+    pOverPriv->PolylinesThinDashed = infoRec->PolylinesThinDashed;
+    pOverPriv->PolySegmentThinDashed = infoRec->PolySegmentThinDashed;
+    pOverPriv->FillPolygonSolid = infoRec->FillPolygonSolid;
+    pOverPriv->FillPolygonStippled = infoRec->FillPolygonStippled;
+    pOverPriv->FillPolygonOpaqueStippled = infoRec->FillPolygonOpaqueStippled;
+    pOverPriv->FillPolygonTiled = infoRec->FillPolygonTiled;
+    pOverPriv->PolyFillArcSolid = infoRec->PolyFillArcSolid;
+    pOverPriv->PutImage = infoRec->PutImage;
+
+    if (infoRec->CopyArea)
+        infoRec->CopyArea = XAAOverCopyArea;
+    if (infoRec->CopyPlane)
+        infoRec->CopyPlane = XAAOverCopyPlane;
+    if (infoRec->PushPixelsSolid)
+        infoRec->PushPixelsSolid = XAAOverPushPixelsSolid;
+    if (infoRec->PolyFillRectSolid)
+        infoRec->PolyFillRectSolid = XAAOverPolyFillRectSolid;
+    if (infoRec->PolyFillRectStippled)
+        infoRec->PolyFillRectStippled = XAAOverPolyFillRectStippled;
+    if (infoRec->PolyFillRectOpaqueStippled)
+        infoRec->PolyFillRectOpaqueStippled = XAAOverPolyFillRectOpaqueStippled;
+    if (infoRec->PolyFillRectTiled)
+        infoRec->PolyFillRectTiled = XAAOverPolyFillRectTiled;
+    if (infoRec->FillSpansSolid)
+        infoRec->FillSpansSolid = XAAOverFillSpansSolid;
+    if (infoRec->FillSpansStippled)
+        infoRec->FillSpansStippled = XAAOverFillSpansStippled;
+    if (infoRec->FillSpansOpaqueStippled)
+        infoRec->FillSpansOpaqueStippled = XAAOverFillSpansOpaqueStippled;
+    if (infoRec->FillSpansTiled)
+        infoRec->FillSpansTiled = XAAOverFillSpansTiled;
+    if (infoRec->PolyText8TE)
+        infoRec->PolyText8TE = XAAOverPolyText8TE;
+    if (infoRec->PolyText16TE)
+        infoRec->PolyText16TE = XAAOverPolyText16TE;
+    if (infoRec->ImageText8TE)
+        infoRec->ImageText8TE = XAAOverImageText8TE;
+    if (infoRec->ImageText16TE)
+        infoRec->ImageText16TE = XAAOverImageText16TE;
+    if (infoRec->ImageGlyphBltTE)
+        infoRec->ImageGlyphBltTE = XAAOverImageGlyphBltTE;
+    if (infoRec->PolyGlyphBltTE)
+        infoRec->PolyGlyphBltTE = XAAOverPolyGlyphBltTE;
+    if (infoRec->PolyText8NonTE)
+        infoRec->PolyText8NonTE = XAAOverPolyText8NonTE;
+    if (infoRec->PolyText16NonTE)
+        infoRec->PolyText16NonTE = XAAOverPolyText16NonTE;
+    if (infoRec->ImageText8NonTE)
+        infoRec->ImageText8NonTE = XAAOverImageText8NonTE;
+    if (infoRec->ImageText16NonTE)
+        infoRec->ImageText16NonTE = XAAOverImageText16NonTE;
+    if (infoRec->ImageGlyphBltNonTE)
+        infoRec->ImageGlyphBltNonTE = XAAOverImageGlyphBltNonTE;
+    if (infoRec->PolyGlyphBltNonTE)
+        infoRec->PolyGlyphBltNonTE = XAAOverPolyGlyphBltNonTE;
+    if (infoRec->PolyRectangleThinSolid)
+        infoRec->PolyRectangleThinSolid = XAAOverPolyRectangleThinSolid;
+    if (infoRec->PolylinesWideSolid)
+        infoRec->PolylinesWideSolid = XAAOverPolylinesWideSolid;
+    if (infoRec->PolylinesThinSolid)
+        infoRec->PolylinesThinSolid = XAAOverPolylinesThinSolid;
+    if (infoRec->PolySegmentThinSolid)
+        infoRec->PolySegmentThinSolid = XAAOverPolySegmentThinSolid;
+    if (infoRec->PolylinesThinDashed)
+        infoRec->PolylinesThinDashed = XAAOverPolylinesThinDashed;
+    if (infoRec->PolySegmentThinDashed)
+        infoRec->PolySegmentThinDashed = XAAOverPolySegmentThinDashed;
+    if (infoRec->FillPolygonSolid)
+        infoRec->FillPolygonSolid = XAAOverFillPolygonSolid;
+    if (infoRec->FillPolygonStippled)
+        infoRec->FillPolygonStippled = XAAOverFillPolygonStippled;
+    if (infoRec->FillPolygonOpaqueStippled)
+        infoRec->FillPolygonOpaqueStippled = XAAOverFillPolygonOpaqueStippled;
+    if (infoRec->FillPolygonTiled)
+        infoRec->FillPolygonTiled = XAAOverFillPolygonTiled;
+    if (infoRec->PolyFillArcSolid)
+        infoRec->PolyFillArcSolid = XAAOverPolyFillArcSolid;
+    if (infoRec->PutImage)
+        infoRec->PutImage = XAAOverPutImage;
+
+    return TRUE;
+}
+
+/***********************  Screen functions ************************/
+
+void
+XAAOverCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pScreen);
+    ScrnInfoPtr pScrn = infoRec->pScrn;
+    DDXPointPtr ppt, pptSrc;
+    RegionRec rgnDst;
+    BoxPtr pbox;
+    int i, nbox, dx, dy;
+    WindowPtr pRoot = pScreen->root;
+
+    if (!pScrn->vtSema || !infoRec->ScreenToScreenBitBlt) {
+        XAA_SCREEN_PROLOGUE(pScreen, CopyWindow);
+        if (pScrn->vtSema && infoRec->NeedToSync) {
+            (*infoRec->Sync) (pScrn);
+            infoRec->NeedToSync = FALSE;
+        }
+        (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);
+        XAA_SCREEN_EPILOGUE(pScreen, CopyWindow, XAAOverCopyWindow);
+        return;
+    }
+
+    infoRec->ScratchGC.alu = GXcopy;
+    infoRec->ScratchGC.planemask = ~0;
+
+    RegionNull(&rgnDst);
+
+    dx = ptOldOrg.x - pWin->drawable.x;
+    dy = ptOldOrg.y - pWin->drawable.y;
+    RegionTranslate(prgnSrc, -dx, -dy);
+    RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc);
+
+    nbox = RegionNumRects(&rgnDst);
+    if (nbox && (pptSrc = (DDXPointPtr) malloc(nbox * sizeof(DDXPointRec)))) {
+
+        pbox = RegionRects(&rgnDst);
+        for (i = nbox, ppt = pptSrc; i--; ppt++, pbox++) {
+            ppt->x = pbox->x1 + dx;
+            ppt->y = pbox->y1 + dy;
+        }
+
+        SWITCH_DEPTH(8);
+        XAADoBitBlt((DrawablePtr) pRoot, (DrawablePtr) pRoot,
+                    &(infoRec->ScratchGC), &rgnDst, pptSrc);
+
+        if (pWin->drawable.bitsPerPixel != 8) {
+            SWITCH_DEPTH(pScrn->depth);
+            XAADoBitBlt((DrawablePtr) pRoot, (DrawablePtr) pRoot,
+                        &(infoRec->ScratchGC), &rgnDst, pptSrc);
+        }
+
+        free(pptSrc);
+    }
+
+    RegionUninit(&rgnDst);
+
+    if (pWin->drawable.depth == 8) {
+        RegionNull(&rgnDst);
+        miSegregateChildren(pWin, &rgnDst, pScrn->depth);
+        if (RegionNotEmpty(&rgnDst)) {
+            RegionIntersect(&rgnDst, &rgnDst, prgnSrc);
+            nbox = RegionNumRects(&rgnDst);
+            if (nbox &&
+                (pptSrc = (DDXPointPtr) malloc(nbox * sizeof(DDXPointRec)))) {
+
+                pbox = RegionRects(&rgnDst);
+                for (i = nbox, ppt = pptSrc; i--; ppt++, pbox++) {
+                    ppt->x = pbox->x1 + dx;
+                    ppt->y = pbox->y1 + dy;
+                }
+
+                SWITCH_DEPTH(pScrn->depth);
+                XAADoBitBlt((DrawablePtr) pRoot, (DrawablePtr) pRoot,
+                            &(infoRec->ScratchGC), &rgnDst, pptSrc);
+                free(pptSrc);
+            }
+        }
+        RegionUninit(&rgnDst);
+    }
+}
+
+void
+XAAOverWindowExposures(WindowPtr pWin, RegionPtr pReg, RegionPtr pOtherReg)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+
+    if ((pWin->drawable.bitsPerPixel != 8) && infoRec->pScrn->vtSema) {
+        if (RegionNumRects(pReg) && infoRec->FillSolidRects) {
+            XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pScreen);
+
+            SWITCH_DEPTH(8);
+            (*infoRec->FillSolidRects) (infoRec->pScrn,
+                                        infoRec->pScrn->colorKey, GXcopy, ~0,
+                                        RegionNumRects(pReg),
+                                        RegionRects(pReg));
+            miWindowExposures(pWin, pReg, pOtherReg);
+            return;
+        }
+        else if (infoRec->NeedToSync) {
+            (*infoRec->Sync) (infoRec->pScrn);
+            infoRec->NeedToSync = FALSE;
+        }
+    }
+
+    XAA_SCREEN_PROLOGUE(pScreen, WindowExposures);
+    (*pScreen->WindowExposures) (pWin, pReg, pOtherReg);
+    XAA_SCREEN_EPILOGUE(pScreen, WindowExposures, XAAOverWindowExposures);
+}
+
+/*********************  Choosers *************************/
+
+static int
+XAAOverStippledFillChooser(GCPtr pGC)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+    int ret;
+
+    ret = (*pOverPriv->StippledFillChooser) (pGC);
+
+    if ((pGC->depth == 8) && ((ret == DO_COLOR_8x8) || (ret == DO_CACHE_BLT))) {
+        ret = 0;
+    }
+
+    return ret;
+}
+
+static int
+XAAOverOpaqueStippledFillChooser(GCPtr pGC)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+    int ret;
+
+    ret = (*pOverPriv->OpaqueStippledFillChooser) (pGC);
+
+    if ((pGC->depth == 8) && ((ret == DO_COLOR_8x8) || (ret == DO_CACHE_BLT))) {
+        ret = 0;
+    }
+
+    return ret;
+}
+
+static int
+XAAOverTiledFillChooser(GCPtr pGC)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+    int ret;
+
+    ret = (*pOverPriv->TiledFillChooser) (pGC);
+
+    if ((pGC->depth == 8) && ((ret == DO_COLOR_8x8) || (ret == DO_CACHE_BLT))) {
+        ret = 0;
+    }
+
+    return ret;
+}
+
+/**************************** GC Functions **************************/
+
+static RegionPtr
+XAAOverCopyArea(DrawablePtr pSrc,
+                DrawablePtr pDst,
+                GC * pGC,
+                int srcx, int srcy, int width, int height, int dstx, int dsty)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    return (*pOverPriv->CopyArea) (pSrc, pDst,
+                                   pGC, srcx, srcy, width, height, dstx, dsty);
+}
+
+static RegionPtr
+XAAOverCopyPlane(DrawablePtr pSrc,
+                 DrawablePtr pDst,
+                 GCPtr pGC,
+                 int srcx, int srcy,
+                 int width, int height,
+                 int dstx, int dsty, unsigned long bitPlane)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    return (*pOverPriv->CopyPlane) (pSrc, pDst,
+                                    pGC, srcx, srcy, width, height, dstx, dsty,
+                                    bitPlane);
+
+}
+
+static void
+XAAOverPushPixelsSolid(GCPtr pGC,
+                       PixmapPtr pBitMap,
+                       DrawablePtr pDraw, int dx, int dy, int xOrg, int yOrg)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PushPixelsSolid) (pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
+}
+
+static void
+XAAOverPolyFillRectSolid(DrawablePtr pDraw,
+                         GCPtr pGC, int nrectFill, xRectangle *prectInit)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolyFillRectSolid) (pDraw, pGC, nrectFill, prectInit);
+}
+
+static void
+XAAOverPolyFillRectStippled(DrawablePtr pDraw,
+                            GCPtr pGC, int nrectFill, xRectangle *prectInit)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolyFillRectStippled) (pDraw, pGC, nrectFill, prectInit);
+}
+
+static void
+XAAOverPolyFillRectOpaqueStippled(DrawablePtr pDraw,
+                                  GCPtr pGC,
+                                  int nrectFill, xRectangle *prectInit)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolyFillRectOpaqueStippled) (pDraw, pGC, nrectFill, prectInit);
+}
+
+static void
+XAAOverPolyFillRectTiled(DrawablePtr pDraw,
+                         GCPtr pGC, int nrectFill, xRectangle *prectInit)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolyFillRectTiled) (pDraw, pGC, nrectFill, prectInit);
+}
+
+static void
+XAAOverFillSpansSolid(DrawablePtr pDraw,
+                      GCPtr pGC,
+                      int nInit, DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->FillSpansSolid) (pDraw, pGC, nInit, ppt, pwidth, fSorted);
+}
+
+static void
+XAAOverFillSpansStippled(DrawablePtr pDraw,
+                         GCPtr pGC,
+                         int nInit, DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->FillSpansStippled) (pDraw, pGC, nInit, ppt, pwidth, fSorted);
+}
+
+static void
+XAAOverFillSpansOpaqueStippled(DrawablePtr pDraw,
+                               GCPtr pGC,
+                               int nInit,
+                               DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->FillSpansOpaqueStippled) (pDraw, pGC, nInit, ppt, pwidth,
+                                           fSorted);
+}
+
+static void
+XAAOverFillSpansTiled(DrawablePtr pDraw,
+                      GCPtr pGC,
+                      int nInit, DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->FillSpansTiled) (pDraw, pGC, nInit, ppt, pwidth, fSorted);
+}
+
+static int
+XAAOverPolyText8TE(DrawablePtr pDraw,
+                   GCPtr pGC, int x, int y, int count, char *chars)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    return (*pOverPriv->PolyText8TE) (pDraw, pGC, x, y, count, chars);
+}
+
+static int
+XAAOverPolyText16TE(DrawablePtr pDraw,
+                    GCPtr pGC, int x, int y, int count, unsigned short *chars)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    return (*pOverPriv->PolyText16TE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAOverImageText8TE(DrawablePtr pDraw,
+                    GCPtr pGC, int x, int y, int count, char *chars)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->ImageText8TE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAOverImageText16TE(DrawablePtr pDraw,
+                     GCPtr pGC, int x, int y, int count, unsigned short *chars)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->ImageText16TE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAOverImageGlyphBltTE(DrawablePtr pDraw,
+                       GCPtr pGC,
+                       int xInit, int yInit,
+                       unsigned int nglyph,
+                       CharInfoPtr * ppci, pointer pglyphBase)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->ImageGlyphBltTE) (pDraw, pGC, xInit, yInit, nglyph, ppci,
+                                   pglyphBase);
+}
+
+static void
+XAAOverPolyGlyphBltTE(DrawablePtr pDraw,
+                      GCPtr pGC,
+                      int xInit, int yInit,
+                      unsigned int nglyph,
+                      CharInfoPtr * ppci, pointer pglyphBase)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolyGlyphBltTE) (pDraw, pGC, xInit, yInit, nglyph, ppci,
+                                  pglyphBase);
+}
+
+static int
+XAAOverPolyText8NonTE(DrawablePtr pDraw,
+                      GCPtr pGC, int x, int y, int count, char *chars)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    return (*pOverPriv->PolyText8NonTE) (pDraw, pGC, x, y, count, chars);
+}
+
+static int
+XAAOverPolyText16NonTE(DrawablePtr pDraw,
+                       GCPtr pGC,
+                       int x, int y, int count, unsigned short *chars)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    return (*pOverPriv->PolyText16NonTE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAOverImageText8NonTE(DrawablePtr pDraw,
+                       GCPtr pGC, int x, int y, int count, char *chars)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->ImageText8NonTE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAOverImageText16NonTE(DrawablePtr pDraw,
+                        GCPtr pGC,
+                        int x, int y, int count, unsigned short *chars)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->ImageText16NonTE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAOverImageGlyphBltNonTE(DrawablePtr pDraw,
+                          GCPtr pGC,
+                          int xInit, int yInit,
+                          unsigned int nglyph,
+                          CharInfoPtr * ppci, pointer pglyphBase)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->ImageGlyphBltNonTE) (pDraw, pGC, xInit, yInit, nglyph, ppci,
+                                      pglyphBase);
+}
+
+static void
+XAAOverPolyGlyphBltNonTE(DrawablePtr pDraw,
+                         GCPtr pGC,
+                         int xInit, int yInit,
+                         unsigned int nglyph,
+                         CharInfoPtr * ppci, pointer pglyphBase)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolyGlyphBltNonTE) (pDraw, pGC, xInit, yInit, nglyph, ppci,
+                                     pglyphBase);
+}
+
+static void
+XAAOverPolyRectangleThinSolid(DrawablePtr pDraw,
+                              GCPtr pGC, int nRectsInit, xRectangle *pRectsInit)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolyRectangleThinSolid) (pDraw, pGC, nRectsInit, pRectsInit);
+}
+
+static void
+XAAOverPolylinesWideSolid(DrawablePtr pDraw,
+                          GCPtr pGC, int mode, int npt, DDXPointPtr pPts)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolylinesWideSolid) (pDraw, pGC, mode, npt, pPts);
+}
+
+static void
+XAAOverPolylinesThinSolid(DrawablePtr pDraw,
+                          GCPtr pGC, int mode, int npt, DDXPointPtr pPts)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolylinesThinSolid) (pDraw, pGC, mode, npt, pPts);
+}
+
+static void
+XAAOverPolySegmentThinSolid(DrawablePtr pDraw,
+                            GCPtr pGC, int nseg, xSegment * pSeg)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolySegmentThinSolid) (pDraw, pGC, nseg, pSeg);
+}
+
+static void
+XAAOverPolylinesThinDashed(DrawablePtr pDraw,
+                           GCPtr pGC, int mode, int npt, DDXPointPtr pPts)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolylinesThinDashed) (pDraw, pGC, mode, npt, pPts);
+}
+
+static void
+XAAOverPolySegmentThinDashed(DrawablePtr pDraw,
+                             GCPtr pGC, int nseg, xSegment * pSeg)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolySegmentThinDashed) (pDraw, pGC, nseg, pSeg);
+}
+
+static void
+XAAOverFillPolygonSolid(DrawablePtr pDraw,
+                        GCPtr pGC,
+                        int shape, int mode, int count, DDXPointPtr ptsIn)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->FillPolygonSolid) (pDraw, pGC, shape, mode, count, ptsIn);
+}
+
+static void
+XAAOverFillPolygonStippled(DrawablePtr pDraw,
+                           GCPtr pGC,
+                           int shape, int mode, int count, DDXPointPtr ptsIn)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->FillPolygonStippled) (pDraw, pGC, shape, mode, count, ptsIn);
+}
+
+static void
+XAAOverFillPolygonOpaqueStippled(DrawablePtr pDraw,
+                                 GCPtr pGC,
+                                 int shape,
+                                 int mode, int count, DDXPointPtr ptsIn)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->FillPolygonOpaqueStippled) (pDraw, pGC, shape, mode, count,
+                                             ptsIn);
+}
+
+static void
+XAAOverFillPolygonTiled(DrawablePtr pDraw,
+                        GCPtr pGC,
+                        int shape, int mode, int count, DDXPointPtr ptsIn)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->FillPolygonTiled) (pDraw, pGC, shape, mode, count, ptsIn);
+}
+
+static void
+XAAOverPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PolyFillArcSolid) (pDraw, pGC, narcs, parcs);
+}
+
+static void
+XAAOverPutImage(DrawablePtr pDraw,
+                GCPtr pGC,
+                int depth,
+                int x,
+                int y, int w, int h, int leftPad, int format, char *pImage)
+{
+    XAAOverlayPtr pOverPriv = GET_OVERLAY_PRIV(pGC->pScreen);
+
+    SWITCH_DEPTH(pGC->depth);
+
+    (*pOverPriv->PutImage) (pDraw, pGC, depth, x, y, w, h,
+                            leftPad, format, pImage);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaPCache.c b/xorg-server/hw/xfree86/xaa/xaaPCache.c
index ff3f9ef56..02c0cd498 100644
--- a/xorg-server/hw/xfree86/xaa/xaaPCache.c
+++ b/xorg-server/hw/xfree86/xaa/xaaPCache.c
@@ -1,2374 +1,2527 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <string.h>

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "gc.h"

-#include "mi.h"

-#include "pixmapstr.h"

-#include "windowstr.h"

-#include "regionstr.h"

-#include "servermd.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaacexp.h"

-#include "xaalocal.h"

-#include "xaawrap.h"

-

-#define MAX_COLOR	32

-#define MAX_MONO	32

-#define MAX_8		32

-#define MAX_128		32

-#define MAX_256		32

-#define MAX_512		16

-

-static int CacheInitIndex = -1;

-#define CACHEINIT(p) ((p)->privates[CacheInitIndex].val)

-	

-

-typedef struct _CacheLink {

-   int x;

-   int y;

-   int w;

-   int h;

-   struct _CacheLink *next;

-} CacheLink, *CacheLinkPtr;

-

-

-static void

-TransferList(CacheLinkPtr list, XAACacheInfoPtr array, int num)

-{

-   while(num--) {

-	array->x = list->x;

-	array->y = list->y;

- 	array->w = list->w;

-	array->h = list->h;

-	array->serialNumber = 0;

-	array->fg = array->bg = -1;

-	list = list->next;

-	array++;

-  }

-}

-

-

-

-static CacheLinkPtr 

-Enlist(CacheLinkPtr link, int x, int y, int w, int h)

-{

-    CacheLinkPtr newLink;

-

-    newLink = malloc(sizeof(CacheLink));

-    newLink->next = link;

-    newLink->x = x; newLink->y = y;

-    newLink->w = w; newLink->h = h;	

-    return newLink;

-}

-

-

-

-static CacheLinkPtr

-Delist(CacheLinkPtr link) {

-    CacheLinkPtr ret = NULL;

-

-    if(link) {

-	ret = link->next;

-	free(link);

-    }    

-    return ret;

-}

-

-

-

-static void

-FreeList(CacheLinkPtr link) {

-    CacheLinkPtr tmp;

-

-    while(link) {

-	tmp = link;

-	link = link->next;

-	free(tmp);

-    }

-}

-

-

-

-static CacheLinkPtr

-QuadLinks(CacheLinkPtr big, CacheLinkPtr little) 

-{

-    /* CAUTION: This doesn't free big */

-    int w1, w2, h1, h2;

-

-    while(big) {

-	w1 = big->w >> 1;	

-	w2 = big->w - w1;

-	h1 = big->h >> 1;	

-	h2 = big->h - h1;

-

-	little = Enlist(little, big->x, big->y, w1, h1);

-	little = Enlist(little, big->x + w1, big->y, w2, h1);

-	little = Enlist(little, big->x, big->y + h1, w1, h2);

-	little = Enlist(little, big->x + w1, big->y + h1, w2, h2);

-

-	big = big->next;

-    }     

-    return little;

-}

-

-

-static void

-SubdivideList(CacheLinkPtr *large, CacheLinkPtr *small)

-{

-   CacheLinkPtr big = *large;

-   CacheLinkPtr little = *small;

-   int size = big->w >> 1;

-

-   little = Enlist(little, big->x, big->y, size, size);

-   little = Enlist(little, big->x + size, big->y, size, size);

-   little = Enlist(little, big->x, big->y + size, size, size);

-   little = Enlist(little, big->x + size, big->y + size, size, size);

-   *small = little;

-   big = Delist(big);

-   *large = big;

-}

-

-static void

-FreePixmapCachePrivate(XAAPixmapCachePrivatePtr pPriv)

-{

-    if(!pPriv) return;

-

-    free(pPriv->Info512);

-    free(pPriv->Info256);

-    free(pPriv->Info128);

-    free(pPriv->InfoColor);

-    free(pPriv->InfoMono);

-    free(pPriv->InfoPartial);

-     

-    free(pPriv);

-}

-

-void

-XAAClosePixmapCache(ScreenPtr pScreen)

-{

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-  

-   if(infoRec->PixmapCachePrivate)

-	FreePixmapCachePrivate(

-		(XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate);

-

-   infoRec->PixmapCachePrivate = NULL;

-}

-

-

-

-static CacheLinkPtr

-ThinOutPartials(

-   CacheLinkPtr ListPartial, 

-   int *num, int *maxw, int *maxh

-) { 

-/* This guy's job is to get at least 4 big slots out of a list of fragments */

-

-   CacheLinkPtr List64, List32, List16, List8, pCur, next, ListKeepers;

-   int Num64, Num32, Num16, Num8, NumKeepers;

-   int w, h;

-

-   List64 = List32 = List16 = List8 = ListKeepers = NULL;

-   Num64 = Num32 = Num16 = Num8 = NumKeepers = 0;

-   w = h = 0;

-

-   /* We sort partials by how large a square tile they can cache.

-	If a partial can't store a 64x64, 32x32, 16x16 or 8x8 tile,

-	we free it.  */

-

-   pCur = ListPartial;

-   while(pCur) {

-	next = pCur->next;

-	if((pCur->w >= 64) && (pCur->h >= 64)) {

-	    pCur->next = List64; List64 = pCur;

-	    Num64++;

-	} else

-	if((pCur->w >= 32) && (pCur->h >= 32)) {

-	    pCur->next = List32; List32 = pCur;

-	    Num32++;

-	} else

-	if((pCur->w >= 16) && (pCur->h >= 16)) {

-	    pCur->next = List16; List16 = pCur;

-	    Num16++;

-	} else

-	if((pCur->w >= 8) && (pCur->h >= 8)) {

-	    pCur->next = List8; List8 = pCur;

-	    Num8++;

-	} else {

-	   free(pCur);

-	}

-

-	pCur = next;

-   }

-

-   /* We save all the tiles from the largest bin that we can get

-	at least 4 of.  If there are too few of a bigger slot, we

-	cut it in fourths to make smaller slots. */

-

-   if(Num64 >= 4) {

-	ListKeepers = List64; List64 = NULL;

-	NumKeepers = Num64;

-	goto GOT_EM;

-   } else if(Num64) {

-	List32 = QuadLinks(List64, List32);

-	Num32 += Num64 * 4;

-	Num64 = 0;

-   }

- 

-   if(Num32 >= 4) {

-	ListKeepers = List32; List32 = NULL;

-	NumKeepers = Num32;

-	goto GOT_EM;

-   } else if(Num32) {

-	List16 = QuadLinks(List32, List16);

-	Num16 += Num32 * 4;

-	Num32 = 0;

-   }

-

-   if(Num16 >= 4) {

-	ListKeepers = List16; List16 = NULL;

-	NumKeepers = Num16;

-	goto GOT_EM;

-   } else if(Num16) {

-	List8 = QuadLinks(List16, List8);

-	Num8 += Num16 * 4;

-	Num16 = 0;

-   }

-

-   if(Num8 >= 4) {

-	ListKeepers = List8; List8 = NULL;

-	NumKeepers = Num8;

-	goto GOT_EM;

-   } 

-

-GOT_EM:

-

-   /* Free the ones we aren't using */

-	

-   if(List64) FreeList(List64);

-   if(List32) FreeList(List32);

-   if(List16) FreeList(List16);

-   if(List8) FreeList(List8);

-

-  

-   /* Enlarge the slots if we can */

-

-   if(ListKeepers) {

-	CacheLinkPtr pLink = ListKeepers;

-	w = h = 128;

-	

-	while(pLink) {

-	   if(pLink->w < w) w = pLink->w;

-	   if(pLink->h < h) h = pLink->h;

-	   pLink = pLink->next;

-	}

-   } 

-

-   *maxw = w;

-   *maxh = h;

-   *num = NumKeepers;

-   return ListKeepers;

-}

-

-static void

-ConvertColorToMono(

-   CacheLinkPtr *ColorList, 

-   int ColorW, int ColorH,

-   CacheLinkPtr *MonoList, 

-   int MonoW, int MonoH

-){

-   int x, y, w;

-

-   x = (*ColorList)->x; y = (*ColorList)->y;

-   *ColorList = Delist(*ColorList);

-  

-   while(ColorH) {

-	ColorH -= MonoH;

-	for(w = 0; w <= (ColorW - MonoW); w += MonoW)

-	     *MonoList = Enlist(*MonoList, x + w, y + ColorH, MonoW, MonoH);

-   }   

-}

-

-static void

-ConvertAllPartialsTo8x8(

-   int *NumMono, int *NumColor,

-   CacheLinkPtr ListPartial,

-   CacheLinkPtr *ListMono,

-   CacheLinkPtr *ListColor,

-   XAAInfoRecPtr infoRec 

-){

-/* This guy extracts as many 8x8 slots as it can out of fragments */

-

-   int ColorH = infoRec->CacheHeightColor8x8Pattern;

-   int ColorW = infoRec->CacheWidthColor8x8Pattern;

-   int MonoH = infoRec->CacheHeightMono8x8Pattern;

-   int MonoW = infoRec->CacheWidthMono8x8Pattern;

-   int x, y, w, Height, Width;

-   Bool DoColor = (infoRec->PixmapCacheFlags & CACHE_COLOR_8x8);

-   Bool DoMono  = (infoRec->PixmapCacheFlags & CACHE_MONO_8x8);

-   CacheLinkPtr pLink = ListPartial;

-   CacheLinkPtr MonoList = *ListMono, ColorList = *ListColor;

-

-   if(DoColor && DoMono) { 

-	/* we assume color patterns take more space than color ones */

-	if(MonoH > ColorH) ColorH = MonoH;

-	if(MonoW > ColorW) ColorW = MonoW;

-   }

-

-   /* Break up the area into as many Color and Mono slots as we can */

-

-   while(pLink) {

-	Height = pLink->h;

-	Width = pLink->w;

-	x = pLink->x;

-	y = pLink->y;

-

-	if(DoColor) {

-	   while(Height >= ColorH) {		

-		Height -= ColorH;

-		for(w = 0; w <= (Width - ColorW); w += ColorW) {

-		    ColorList = Enlist(

-			ColorList, x + w, y + Height, ColorW, ColorH);

-		    (*NumColor)++;

-		}

-	   }

-	}

- 

-        if(DoMono && (Height >= MonoH)) {

-	   while(Height >= MonoH) {		

-		Height -= MonoH;

-		for(w = 0; w <= (Width - MonoW); w += MonoW) {

-		    MonoList = Enlist(

-			MonoList, x + w, y + Height, MonoW, MonoH);

-		    (*NumMono)++;

-		}

-	   }

-	}

-

-	pLink = pLink->next;

-   }

-

-

-   *ListMono = MonoList;

-   *ListColor = ColorList;

-   FreeList(ListPartial);

-}

-

-

-static CacheLinkPtr

-ExtractOneThatFits(CacheLinkPtr *initList, int w, int h)

-{

-     CacheLinkPtr list = *initList;

-     CacheLinkPtr prev = NULL;

-

-     while(list) { 

-	if((list->w >= w) && (list->h >= h)) 

-	    break;

-	prev = list;

-	list = list->next;

-     }

-

-     if(list) {

-	if(prev) 

-	   prev->next = list->next;

-	else

-	   *initList = list->next;

-

-	list->next = NULL;

-     }

-

-     return list;     

-}

-

-

-static CacheLinkPtr

-ConvertSomePartialsTo8x8(

-   int *NumMono, int *NumColor, int *NumPartial,

-   CacheLinkPtr ListPartial,

-   CacheLinkPtr *ListMono,

-   CacheLinkPtr *ListColor,

-   int *maxw, int *maxh,

-   XAAInfoRecPtr infoRec 

-){

-/* This guy tries to get 4 of each type of 8x8 slot requested out of

-   a list of fragments all while trying to retain some big fragments

-   for the cache blits */

-

-   int ColorH = infoRec->CacheHeightColor8x8Pattern;

-   int ColorW = infoRec->CacheWidthColor8x8Pattern;

-   int MonoH = infoRec->CacheHeightMono8x8Pattern;

-   int MonoW = infoRec->CacheWidthMono8x8Pattern;

-   Bool DoColor = (infoRec->PixmapCacheFlags & CACHE_COLOR_8x8);

-   Bool DoMono  = (infoRec->PixmapCacheFlags & CACHE_MONO_8x8);

-   CacheLinkPtr List64, List32, List16, List8, pCur, next, ListKeepers;

-   CacheLinkPtr MonoList = *ListMono, ColorList = *ListColor;

-   int Num64, Num32, Num16, Num8, NumKeepers;

-   int w, h, Width, Height;

-   int MonosPerColor = 1;

-

-   if(DoColor && DoMono) { 

-	/* we assume color patterns take more space than color ones */

-	if(MonoH > ColorH) ColorH = MonoH;

-	if(MonoW > ColorW) ColorW = MonoW;

-	MonosPerColor = (ColorH/MonoH) * (ColorW/MonoW);

-   }

-

-   List64 = List32 = List16 = List8 = ListKeepers = MonoList = ColorList = NULL;

-   Num64 = Num32 = Num16 = Num8 = NumKeepers = 0;

-   Width = Height = 0;

-

-   /* We sort partials by how large a square tile they can cache.

-      We make 8x8 patterns from the leftovers if we can. */

-

-   pCur = ListPartial;

-   while(pCur) {

-	next = pCur->next;

-	if((pCur->w >= 64) && (pCur->h >= 64)) {

-	    pCur->next = List64; List64 = pCur;

-	    Num64++;

-	} else

-	if((pCur->w >= 32) && (pCur->h >= 32)) {

-	    pCur->next = List32; List32 = pCur;

-	    Num32++;

-	} else

-	if((pCur->w >= 16) && (pCur->h >= 16)) {

-	    pCur->next = List16; List16 = pCur;

-	    Num16++;

-	} else

-	if((pCur->w >= 8) && (pCur->h >= 8)) {

-	    pCur->next = List8; List8 = pCur;

-	    Num8++;

-	} else {

-	   h = pCur->h;

-	   if(DoColor && (pCur->w >= ColorW) && (h >= ColorH)) {

-		while(h >= ColorH) {

-		    h -= ColorH;

-		    for(w = 0; w <= (pCur->w - ColorW); w += ColorW) {

-			ColorList = Enlist( ColorList,

-			    pCur->x + w, pCur->y + h, ColorW, ColorH);

-			(*NumColor)++;

-		    }	

-		}

-	   }	

-	   if(DoMono && (pCur->w >= MonoW) && (h >= MonoH)) {

-		while(h >= MonoH) {

-		    h -= MonoH;

-		    for(w = 0; w <= (pCur->w - MonoW); w += MonoW) {

-			MonoList = Enlist( MonoList,

-			    pCur->x + w, pCur->y + h, MonoW, MonoH);

-			(*NumMono)++;

-		    }	

-		}

-	   }	

-	   free(pCur);

-	}

-

-	pCur = next;

-   }

-

-   /* Try to extract at least 4 of each type of 8x8 slot that we need */

-

-   if(DoColor) {

-	CacheLinkPtr theOne;

-	while(*NumColor < 4) {

-	    theOne = NULL;

-	    if(Num8) {

-		if((theOne = ExtractOneThatFits(&List8, ColorW, ColorH))) 

-			Num8--;

-	    }

-	    if(Num16 && !theOne) { 

-		if((theOne = ExtractOneThatFits(&List16, ColorW, ColorH))) 

-			Num16--;

-	    }

-	    if(Num32 && !theOne) {

-		if((theOne = ExtractOneThatFits(&List32, ColorW, ColorH)))

-			Num32--;

-	    }

-	    if(Num64 && !theOne) {

-		if((theOne = ExtractOneThatFits(&List64, ColorW, ColorH)))

-			Num64--;

-	    }

-

-	    if(!theOne) break;

-

-		

-	    ConvertAllPartialsTo8x8(NumMono, NumColor, theOne, 

-			&MonoList, &ColorList, infoRec);

-

-	    if(DoMono) {

-		while(*NumColor && (*NumMono < 4)) {

-	    	     ConvertColorToMono(&ColorList, ColorW, ColorH,

-				&MonoList, MonoW, MonoH);

-		      (*NumColor)--; *NumMono += MonosPerColor;

-		}

-	    }

-	}

-   }

-

-   if(DoMono) {

-	CacheLinkPtr theOne;

-	while(*NumMono < 4) {

-	    theOne = NULL;

-	    if(Num8) {

-		if((theOne = ExtractOneThatFits(&List8, MonoW, MonoH))) 

-			Num8--;

-	    }

-	    if(Num16 && !theOne) { 

-		if((theOne = ExtractOneThatFits(&List16, MonoW, MonoH))) 

-			Num16--;

-	    }

-	    if(Num32 && !theOne) {

-		if((theOne = ExtractOneThatFits(&List32, MonoW, MonoH)))

-			Num32--;

-	    }

-	    if(Num64 && !theOne) {

-		if((theOne = ExtractOneThatFits(&List64, MonoW, MonoH)))

-			Num64--;

-	    }

-

-	    if(!theOne) break;

-		

-	    ConvertAllPartialsTo8x8(NumMono, NumColor, theOne, 

-			&MonoList, &ColorList, infoRec);

-	}

-   }

-

-   /* We save all the tiles from the largest bin that we can get

-	at least 4 of.  If there are too few of a bigger slot, we

-	cut it in fourths to make smaller slots. */

-

-   if(Num64 >= 4) {

-	ListKeepers = List64; List64 = NULL;

-	NumKeepers = Num64;

-	goto GOT_EM;

-   } else if(Num64) {

-	List32 = QuadLinks(List64, List32);

-	Num32 += Num64 * 4;

-	Num64 = 0;

-   }

- 

-   if(Num32 >= 4) {

-	ListKeepers = List32; List32 = NULL;

-	NumKeepers = Num32;

-	goto GOT_EM;

-   } else if(Num32) {

-	List16 = QuadLinks(List32, List16);

-	Num16 += Num32 * 4;

-	Num32 = 0;

-   }

-

-   if(Num16 >= 4) {

-	ListKeepers = List16; List16 = NULL;

-	NumKeepers = Num16;

-	goto GOT_EM;

-   } else if(Num16) {

-	List8 = QuadLinks(List16, List8);

-	Num8 += Num16 * 4;

-	Num16 = 0;

-   }

-

-   if(Num8 >= 4) {

-	ListKeepers = List8; List8 = NULL;

-	NumKeepers = Num8;

-	goto GOT_EM;

-   } 

-

-GOT_EM:

-

-   /* Free the ones we aren't using */

-	

-   if(List64) 

-	ConvertAllPartialsTo8x8(NumMono, NumColor, List64, 

-			&MonoList, &ColorList, infoRec);

-   if(List32) 

-	ConvertAllPartialsTo8x8(NumMono, NumColor, List32, 

-			&MonoList, &ColorList, infoRec);

-   if(List16) 

-	ConvertAllPartialsTo8x8(NumMono, NumColor, List16, 

-			&MonoList, &ColorList, infoRec);

-   if(List8) 

-	ConvertAllPartialsTo8x8(NumMono, NumColor, List8, 

-			&MonoList, &ColorList, infoRec);

-

- 

-   /* Enlarge the slots if we can */

-

-   if(ListKeepers) {

-	CacheLinkPtr pLink = ListKeepers;

-	Width = Height = 128;

-	

-	while(pLink) {

-	   if(pLink->w < Width) Width = pLink->w;

-	   if(pLink->h < Height) Height = pLink->h;

-	   pLink = pLink->next;

-	}

-   } 

-

-   *ListMono = MonoList;

-   *ListColor = ColorList;

-   *maxw = Width;

-   *maxh = Height;

-   *NumPartial = NumKeepers;

-   return ListKeepers;

-}

-

-

-void

-XAAInitPixmapCache(	

-    ScreenPtr pScreen, 

-    RegionPtr areas,

-    pointer data

-) {

-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-   XAAInfoRecPtr infoRec = (XAAInfoRecPtr)data;

-   XAAPixmapCachePrivatePtr pCachePriv;

-   BoxPtr pBox = RegionRects(areas);

-   int nBox = RegionNumRects(areas);

-   int Num512, Num256, Num128, NumPartial, NumColor, NumMono;

-   int Target512, Target256;

-   CacheLinkPtr List512, List256, List128, ListPartial, ListColor, ListMono;

-   int x, y, w, h, ntotal, granularity, width, height, i;

-   int MaxPartialWidth, MaxPartialHeight;

-

-   infoRec->MaxCacheableTileWidth = 0;

-   infoRec->MaxCacheableTileHeight = 0;

-   infoRec->MaxCacheableStippleHeight = 0;

-   infoRec->MaxCacheableStippleWidth = 0;

-   infoRec->UsingPixmapCache = FALSE;

-

-

-   if(!nBox || !pBox || !(infoRec->Flags & PIXMAP_CACHE))

-	return;

-

-   /* Allocate a persistent per-screen init flag to control messages */

-   if (CacheInitIndex < 0)

-	CacheInitIndex = xf86AllocateScrnInfoPrivateIndex();

-

-   /* free the old private data if it exists */

-   if(infoRec->PixmapCachePrivate) {

-	FreePixmapCachePrivate(

-		(XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate);

-	infoRec->PixmapCachePrivate = NULL;

-   }

-

-   Num512 = Num256 = Num128 = NumPartial = NumMono = NumColor = 0;

-   List512 = List256 = List128 = ListPartial = ListMono = ListColor = NULL;

-   granularity = infoRec->CachePixelGranularity;

-   if(granularity <= 1) granularity = 0;

-

-   /* go through the boxes and break it into as many pieces as we can fit */

-

-   while(nBox--) {

-	x = pBox->x1;

-	if(granularity) {

-	    int tmp = x % granularity;

-	    if(tmp) x += (granularity - tmp);

-	}

-	width = pBox->x2 - x;

-        if(width <= 0) {pBox++; continue;}

-

-	y = pBox->y1;

-        height = pBox->y2 - y;

-

-        for(h = 0; h <= (height - 512); h += 512) {

-	    for(w = 0; w <= (width - 512); w += 512) {

-		List512 = Enlist(List512, x + w, y + h, 512, 512);

-		Num512++;	

-	    }

-	    for(; w <= (width - 256); w += 256) {

-		List256 = Enlist(List256, x + w, y + h, 256, 256);

-		List256 = Enlist(List256, x + w, y + h + 256, 256, 256);

-		Num256 += 2;

-	    }

-	    for(; w <= (width - 128); w += 128) {

-		List128 = Enlist(List128, x + w, y + h, 128, 128);

-		List128 = Enlist(List128, x + w, y + h + 128, 128, 128);

-		List128 = Enlist(List128, x + w, y + h + 256, 128, 128);

-		List128 = Enlist(List128, x + w, y + h + 384, 128, 128);

-		Num128 += 4;

-	    }

-	    if(w < width) {

-		int d = width - w;

-		ListPartial = Enlist(ListPartial, x + w, y + h, d, 128);

-		ListPartial = Enlist(ListPartial, x + w, y + h + 128, d, 128);

-		ListPartial = Enlist(ListPartial, x + w, y + h + 256, d, 128);

-		ListPartial = Enlist(ListPartial, x + w, y + h + 384, d, 128);

-		NumPartial += 4;

-            }

-	}

-        for(; h <= (height - 256); h += 256) {

-	    for(w = 0; w <= (width - 256); w += 256) {

-		List256 = Enlist(List256, x + w, y + h, 256, 256);

-		Num256++;

-	    }

-	    for(; w <= (width - 128); w += 128) {

-		List128 = Enlist(List128, x + w, y + h, 128, 128);

-		List128 = Enlist(List128, x + w, y + h + 128, 128, 128);

-		Num128 += 2;

-	    }

-	    if(w < width) {

-		int d = width - w;

-		ListPartial = Enlist(ListPartial, x + w, y + h, d, 128);

-		ListPartial = Enlist(ListPartial, x + w, y + h + 128, d, 128);

-		NumPartial += 2;

-            }

-        }

-        for(; h <= (height - 128); h += 128) {

-	    for(w = 0; w <= (width - 128); w += 128) {

-		List128 = Enlist(List128, x + w, y + h, 128, 128);

-		Num128++;

-	    }

-	    if(w < width) {

-		ListPartial = Enlist(

-			ListPartial, x + w, y + h, width - w, 128);

-		NumPartial++;

-            }

-        }

-        if(h < height) {

-	    int d = height - h;

-	    for(w = 0; w <= (width - 128); w += 128) {

-		ListPartial = Enlist(ListPartial, x + w, y + h, 128, d);

-		NumPartial++;

-	    }

-	    if(w < width) {

-		ListPartial = Enlist(ListPartial, x + w, y + h, width - w, d);

-		NumPartial++;

-            }

-        }

-	pBox++;

-   }

-

-

-/* 

-   by this point we've carved the space into as many 512x512, 256x256

-	and 128x128 blocks as we could fit.  We will then break larger

-	blocks into smaller ones if we need to.  The rules are as follows:

-

-     512x512 -

-	1) Don't take up more than half the memory.

-	2) Don't bother if you can't get at least four.

-	3) Don't make more than MAX_512.

-	4) Don't have any of there are no 256x256s.

-

-     256x256 -

-	1) Don't take up more than a quarter of the memory enless there

-		aren't any 512x512s.  Then we can take up to half.

-	2) Don't bother if you can't get at least four.

-	3) Don't make more than MAX_256.

-

-     128x128 -

-	1) Don't make more than MAX_128.

-

-     We don't bother with the partial blocks unless we can use them

-     for 8x8 pattern fills or we are short on larger blocks.

-

-*/

-

-    ntotal = Num128 + (Num256<<2) + (Num512<<4);   

-	

-    Target512 = ntotal >> 5;

-    if(Target512 < 4) Target512 = 0;

-    if(!Target512) Target256 = ntotal >> 3;

-    else Target256 = ntotal >> 4;

-    if(Target256 < 4) Target256 = 0;

-

-    if(Num512 && Num256 < 4) {

-	while(Num512 && Num256 < Target256) {

-	   SubdivideList(&List512, &List256);

-	   Num256 += 4; Num512--;

-	}

-    }

-

-    if(!Num512) { /* no room */

-    } else if((Num512 < 4) || (!Target512)) {

-	while(Num512) {

-	   SubdivideList(&List512, &List256);

-	   Num256 += 4; Num512--;

-	}

-    } else if((Num512 > MAX_512) || (Num512 > Target512)){

-	while(Num512 > MAX_512) {

-	   SubdivideList(&List512, &List256);

-	   Num256 += 4; Num512--;

-	}

-	while(Num512 > Target512) {

-	    if(Num256 < MAX_256) {

-		SubdivideList(&List512, &List256);

-		Num256 += 4; Num512--;

-	    } else break;

-	}

-    }

-

-    if(!Num256) { /* no room */

-    } else if((Num256 < 4) || (!Target256)) {

-	while(Num256) {

-	   SubdivideList(&List256, &List128);

-	   Num128 += 4; Num256--;

-	}

-    } else if((Num256 > MAX_256) || (Num256 > Target256)) {

-	while(Num256 > MAX_256) {

-	   SubdivideList(&List256, &List128);

-	   Num128 += 4; Num256--;

-	}

-	while(Num256 > Target256) {

-	    if(Num128 < MAX_128) {

-		SubdivideList(&List256, &List128);

-		Num128 += 4; Num256--;

-	    } else break;

-	}

-    } 

-

-    if(Num128 && ((Num128 < 4) || (Num128 > MAX_128))) {

-	CacheLinkPtr next;

-	int max = (Num128 > MAX_128) ? MAX_128 : 0;

-

-	/*

-	 * Note: next is set in this way to work around a code generation

-	 * bug in gcc 2.7.2.3.

-	 */

-	next = List128->next;

-	while(Num128 > max) {

-	   List128->next = ListPartial;	

-	   ListPartial = List128;

-	   if((List128 = next))

-		next = List128->next;

-	   NumPartial++; Num128--;

-	}

-    }

-

-    MaxPartialHeight = MaxPartialWidth = 0;

-

-    /* at this point we have as many 512x512 and 256x256 slots as we

-	want but may have an excess of 128x128 slots.  We still need

-	to find out if we need 8x8 slots.  We take these from the

-	partials if we have them.  Otherwise, we break some 128x128's */

-

-    if(!(infoRec->PixmapCacheFlags & (CACHE_MONO_8x8 | CACHE_COLOR_8x8))) {

-	if(NumPartial) {

-	    if(Num128) { /* don't bother with partials */

-		FreeList(ListPartial);	

-		NumPartial = 0; ListPartial = NULL;

-	    } else {

-	   /* We have no big slots.  Weed out the unusable partials */

-		ListPartial = ThinOutPartials(ListPartial, &NumPartial,

-			&MaxPartialWidth, &MaxPartialHeight);

-	    }

-	}

-    } else {

-	int MonosPerColor = 1;

-	int ColorH = infoRec->CacheHeightColor8x8Pattern;

-	int ColorW = infoRec->CacheWidthColor8x8Pattern;

-	int MonoH = infoRec->CacheHeightMono8x8Pattern;

-	int MonoW = infoRec->CacheWidthMono8x8Pattern;

-	Bool DoColor = (infoRec->PixmapCacheFlags & CACHE_COLOR_8x8);

-	Bool DoMono  = (infoRec->PixmapCacheFlags & CACHE_MONO_8x8);

-

-	if(DoColor) infoRec->CanDoColor8x8 = FALSE;

-	if(DoMono) infoRec->CanDoMono8x8 = FALSE;

-	

-	if(DoColor && DoMono) { 

-	    /* we assume color patterns take more space than color ones */

-	    if(MonoH > ColorH) ColorH = MonoH;

-	    if(MonoW > ColorW) ColorW = MonoW;

-	    MonosPerColor = (ColorH/MonoH) * (ColorW/MonoW);

-	}

-

-	if(Num128) {

-	    if(NumPartial) { /* use all for 8x8 slots */

-		ConvertAllPartialsTo8x8(&NumMono, &NumColor, 

-			ListPartial, &ListMono, &ListColor, infoRec);

-		NumPartial = 0; ListPartial = NULL;

-	    } 

-

-		/* Get some 8x8 slots from the 128 slots */

-	    while((Num128 > 4) && 

-		      ((NumMono < MAX_MONO) && (NumColor < MAX_COLOR))) {

-		CacheLinkPtr tmp = NULL;

-

-		tmp = Enlist(tmp, List128->x, List128->y, 

-					List128->w, List128->h);

-		List128 = Delist(List128);

-		Num128--;

-

-		ConvertAllPartialsTo8x8(&NumMono, &NumColor, 

-				tmp, &ListMono, &ListColor, infoRec);

-	    }

-	} else if(NumPartial) {

-	/* We have share partials between 8x8 slots and tiles. */

-	    ListPartial = ConvertSomePartialsTo8x8(&NumMono, &NumColor, 	

-			&NumPartial, ListPartial, &ListMono, &ListColor, 

-			&MaxPartialWidth, &MaxPartialHeight, infoRec);

-        }

-

-	

-	if(DoMono && DoColor) {

-	    if(NumColor && ((NumColor > MAX_COLOR) || (NumColor < 4))) {

-		int max = (NumColor > MAX_COLOR) ? MAX_COLOR : 0;

-

-		while(NumColor > max) {

-		    ConvertColorToMono(&ListColor, ColorW, ColorH,

-					&ListMono, MonoW, MonoH);

-		    NumColor--; NumMono += MonosPerColor;

-		}

-	    }

-

-	    /* favor Mono slots over Color ones */

-	    while((NumColor > 4) && (NumMono < MAX_MONO)) {

-	        ConvertColorToMono(&ListColor, ColorW, ColorH,

-				&ListMono, MonoW, MonoH);

-	        NumColor--; NumMono += MonosPerColor;

-	    }

-	}

-

-	if(NumMono && ((NumMono > MAX_MONO) || (NumMono < 4))) {

-	    int max = (NumMono > MAX_MONO) ? MAX_MONO : 0;

-

-	    while(NumMono > max) {

-		ListMono = Delist(ListMono);

-		NumMono--;

-	    }

-	}

-	if(NumColor && ((NumColor > MAX_COLOR) || (NumColor < 4))) {

-	    int max = (NumColor > MAX_COLOR) ? MAX_COLOR : 0;

-

-	    while(NumColor > max) {

-		ListColor = Delist(ListColor);

-		NumColor--;

-	    }

-	}

-    }

-

-

-    pCachePriv = calloc(1,sizeof(XAAPixmapCachePrivate));

-    if(!pCachePriv) {

-	if(Num512) FreeList(List512);

-	if(Num256) FreeList(List256);

-	if(Num128) FreeList(List128);

-	if(NumPartial) FreeList(ListPartial);

-	if(NumColor) FreeList(ListColor);

-	if(NumMono) FreeList(ListMono);

-	return;

-    }

-

-    infoRec->PixmapCachePrivate = (char*)pCachePriv;

-

-    if(Num512) {

-	pCachePriv->Info512 = calloc(Num512,sizeof(XAACacheInfoRec));

-	if(!pCachePriv->Info512) Num512 = 0;

-	if(Num512) TransferList(List512, pCachePriv->Info512, Num512);

-	FreeList(List512);

-    	pCachePriv->Num512x512 = Num512;

-    }

-    if(Num256) {

-	pCachePriv->Info256 = calloc(Num256, sizeof(XAACacheInfoRec));

-	if(!pCachePriv->Info256) Num256 = 0;

-	if(Num256) TransferList(List256, pCachePriv->Info256, Num256);

-	FreeList(List256);

-    	pCachePriv->Num256x256 = Num256;

-    }

-    if(Num128) {

-	pCachePriv->Info128 = calloc(Num128, sizeof(XAACacheInfoRec));

-	if(!pCachePriv->Info128) Num128 = 0;

-	if(Num128) TransferList(List128, pCachePriv->Info128, Num128);

-	FreeList(List128);

-    	pCachePriv->Num128x128 = Num128;

-    }

-

-    if(NumPartial) {

-	pCachePriv->InfoPartial = calloc(NumPartial, sizeof(XAACacheInfoRec));

-	if(!pCachePriv->InfoPartial) NumPartial = 0;

-	if(NumPartial) 

-	    TransferList(ListPartial, pCachePriv->InfoPartial, NumPartial);

-	FreeList(ListPartial);

-    	pCachePriv->NumPartial = NumPartial;

-    }

-

-    if(NumColor) {

-	pCachePriv->InfoColor = calloc(NumColor, sizeof(XAACacheInfoRec));

-	if(!pCachePriv->InfoColor) NumColor = 0;

-	if(NumColor) TransferList(ListColor, pCachePriv->InfoColor, NumColor);

-	FreeList(ListColor);

-    	pCachePriv->NumColor = NumColor;

-    }

-

-    if(NumMono) {

-	pCachePriv->InfoMono = calloc(NumMono, sizeof(XAACacheInfoRec));

-	if(!pCachePriv->InfoMono) NumMono = 0;

-	if(NumMono) TransferList(ListMono, pCachePriv->InfoMono, NumMono);

-	FreeList(ListMono);

-    	pCachePriv->NumMono = NumMono;

-    }

-

-

-    if(NumPartial) {

-	infoRec->MaxCacheableTileWidth = MaxPartialWidth;

-	infoRec->MaxCacheableTileHeight = MaxPartialHeight;

-    }

-    if(Num128) 

-	infoRec->MaxCacheableTileWidth = infoRec->MaxCacheableTileHeight = 128;

-    if(Num256) 

-	infoRec->MaxCacheableTileWidth = infoRec->MaxCacheableTileHeight = 256;

-    if(Num512) 

-	infoRec->MaxCacheableTileWidth = infoRec->MaxCacheableTileHeight = 512;

-

-     

-    infoRec->MaxCacheableStippleHeight = infoRec->MaxCacheableTileHeight;

-    infoRec->MaxCacheableStippleWidth = 

-		infoRec->MaxCacheableTileWidth * pScrn->bitsPerPixel;

-    if(infoRec->ScreenToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) 

-	infoRec->MaxCacheableStippleWidth /= 3;

-

-    if(NumMono)  {

-        if(!(infoRec->Mono8x8PatternFillFlags & 

-		(HARDWARE_PATTERN_PROGRAMMED_ORIGIN | 

-		 HARDWARE_PATTERN_PROGRAMMED_BITS))) {

-	    int numPerLine = 

-		  infoRec->CacheWidthMono8x8Pattern/infoRec->MonoPatternPitch;

-

-	    for(i = 0; i < 64; i++) { 

-		pCachePriv->MonoOffsets[i].y = i/numPerLine;

-		pCachePriv->MonoOffsets[i].x = (i % numPerLine) *

-					infoRec->MonoPatternPitch;

-	    }

-	}

-	infoRec->CanDoMono8x8 = TRUE;

-    }

-    if(NumColor) {

-	if(!(infoRec->Color8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {

-

-	   for(i = 0; i < 64; i++) { 

-		pCachePriv->ColorOffsets[i].y = i & 0x07;

-		pCachePriv->ColorOffsets[i].x = i & ~0x07;

-	   }

-	}

-	infoRec->CanDoColor8x8 = TRUE;

-    }

-

-    if(!CACHEINIT(pScrn)) {

-	xf86ErrorF("\tSetting up tile and stipple cache:\n");

-	if(NumPartial) 

-	   xf86ErrorF("\t\t%i %ix%i slots\n", 

-		NumPartial, MaxPartialWidth, MaxPartialHeight);

-	if(Num128) xf86ErrorF("\t\t%i 128x128 slots\n", Num128);

-	if(Num256) xf86ErrorF("\t\t%i 256x256 slots\n", Num256);

-	if(Num512) xf86ErrorF("\t\t%i 512x512 slots\n", Num512);

-	if(NumColor) xf86ErrorF("\t\t%i 8x8 color pattern slots\n", NumColor);

-	if(NumMono) xf86ErrorF("\t\t%i 8x8 color expansion slots\n", NumMono);

-    } 

-

-    if(!(NumPartial | Num128 | Num256 | Num512 | NumColor | NumMono)) {

-	if(!CACHEINIT(pScrn))

-	   xf86ErrorF("\t\tNot enough video memory for pixmap cache\n");

-    } else infoRec->UsingPixmapCache = TRUE;

-

-    CACHEINIT(pScrn) = 1;

-}

-

-#if X_BYTE_ORDER == X_BIG_ENDIAN

-static CARD32 StippleMasks[4] = {

-   0x80808080,

-   0xC0C0C0C0,

-   0x00000000,

-   0xF0F0F0F0

-};

-#else

-static CARD32 StippleMasks[4] = {

-   0x01010101,

-   0x03030303,

-   0x00000000,

-   0x0F0F0F0F

-};

-#endif

-

-Bool

-XAACheckStippleReducibility(PixmapPtr pPixmap)

-{

-    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap);

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_DRAWABLE(&pPixmap->drawable);

-    CARD32 *IntPtr = (CARD32*)pPixmap->devPrivate.ptr;

-    int w = pPixmap->drawable.width;

-    int h = pPixmap->drawable.height;

-    int i;

-    CARD32 bits[8];

-    CARD32 mask = SHIFT_R(0xFFFFFFFF,24);

-

-    pPriv->flags |= REDUCIBILITY_CHECKED | REDUCIBLE_TO_2_COLOR;

-    pPriv->flags &= ~REDUCIBLE_TO_8x8;

-

-    if((w > 32) || (h > 32) || (w & (w - 1)) || (h & (h - 1))) 

-	return FALSE;

-

-    i = (h > 8) ? 8 : h;

-

-    switch(w) {

-    case 32:

- 	while(i--) {

-	   bits[i] = IntPtr[i] & mask;

-	    if(	(bits[i] != SHIFT_R((IntPtr[i] & SHIFT_L(mask, 8)), 8)) ||

-		(bits[i] != SHIFT_R((IntPtr[i] & SHIFT_L(mask,16)),16)) ||

-		(bits[i] != SHIFT_R((IntPtr[i] & SHIFT_L(mask,24)),24)))

-	    	return FALSE; 

-	}

-	break;

-    case 16:

-	while(i--) {

-	   bits[i] = IntPtr[i] & mask;

-	    if(bits[i] != ((IntPtr[i] & SHIFT_R(SHIFT_L(mask,8),8))))

-	    	return FALSE; 

-	}

-	break;

-    default: 

-	while(i--)

-	   bits[i] = IntPtr[i] & mask;

-	break;

-    }    

-

-    switch(h) {

-	case 32: 

-	    if(	(IntPtr[8]  != IntPtr[16]) || (IntPtr[9]  != IntPtr[17]) ||

-	    	(IntPtr[10] != IntPtr[18]) || (IntPtr[11] != IntPtr[19]) ||

-	    	(IntPtr[12] != IntPtr[20]) || (IntPtr[13] != IntPtr[21]) ||

-	    	(IntPtr[14] != IntPtr[22]) || (IntPtr[15] != IntPtr[23]) ||

-		(IntPtr[16] != IntPtr[24]) || (IntPtr[17] != IntPtr[25]) ||

-	    	(IntPtr[18] != IntPtr[26]) || (IntPtr[19] != IntPtr[27]) ||

-	    	(IntPtr[20] != IntPtr[28]) || (IntPtr[21] != IntPtr[29]) ||

-	    	(IntPtr[22] != IntPtr[30]) || (IntPtr[23] != IntPtr[31]))

-		return FALSE;

-	    /* fall through */

-	case 16:

-	    if(	(IntPtr[0] != IntPtr[8])  || (IntPtr[1] != IntPtr[9])  ||

-	    	(IntPtr[2] != IntPtr[10]) || (IntPtr[3] != IntPtr[11]) ||

-	    	(IntPtr[4] != IntPtr[12]) || (IntPtr[5] != IntPtr[13]) ||

-	    	(IntPtr[6] != IntPtr[14]) || (IntPtr[7] != IntPtr[15]))

-		return FALSE;

-	case 8: break;

-	case 1:	bits[1] = bits[0];

-	case 2: bits[2] = bits[0];	bits[3] = bits[1];

-	case 4: bits[4] = bits[0];	bits[5] = bits[1];

-		bits[6] = bits[2];	bits[7] = bits[3];

-	     	break;

-    }

-	

-    pPriv->flags |= REDUCIBLE_TO_8x8;

-

-    pPriv->pattern0 = bits[0] | SHIFT_L(bits[1],8) | SHIFT_L(bits[2],16) | SHIFT_L(bits[3],24);

-    pPriv->pattern1 = bits[4] | SHIFT_L(bits[5],8) | SHIFT_L(bits[6],16) | SHIFT_L(bits[7],24);

- 

-    if(w < 8) {

-	pPriv->pattern0 &= StippleMasks[w - 1];

-	pPriv->pattern1 &= StippleMasks[w - 1];

-

-	switch(w) {

-	case 1: pPriv->pattern0 |= SHIFT_L(pPriv->pattern0,1);

-		pPriv->pattern1 |= SHIFT_L(pPriv->pattern1,1);

-	case 2:	pPriv->pattern0 |= SHIFT_L(pPriv->pattern0,2);

-		pPriv->pattern1 |= SHIFT_L(pPriv->pattern1,2);

-	case 4:	pPriv->pattern0 |= SHIFT_L(pPriv->pattern0,4);

-		pPriv->pattern1 |= SHIFT_L(pPriv->pattern1,4);

-	}

-    }

-

-    if(infoRec->Mono8x8PatternFillFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {

-	pPriv->pattern0 = SWAP_BITS_IN_BYTES(pPriv->pattern0);

-	pPriv->pattern1 = SWAP_BITS_IN_BYTES(pPriv->pattern1);

-    }

-

-

-    return TRUE;

-}

-

-

-Bool

-XAACheckTileReducibility(PixmapPtr pPixmap, Bool checkMono)

-{

-    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap);

-    CARD32 *IntPtr;

-    int w = pPixmap->drawable.width;

-    int h = pPixmap->drawable.height;

-    int pitch = pPixmap->devKind >> 2;

-    int dwords, i, j;

-

-    pPriv->flags |= REDUCIBILITY_CHECKED;

-    pPriv->flags &= ~(REDUCIBILITY_CHECKED | REDUCIBLE_TO_2_COLOR);

-

-    if((w > 32) || (h > 32) || (w & (w - 1)) || (h & (h - 1))) 

-	return FALSE;

-

-    dwords = ((w * pPixmap->drawable.bitsPerPixel) + 31) >> 5;

-    i = (h > 8) ? 8 : h;

-

-

-    if(w > 8) {

-	IntPtr = (CARD32*)pPixmap->devPrivate.ptr;

-	switch(pPixmap->drawable.bitsPerPixel) {

-	case 8:

-	    while(i--) {

-		for(j = 2; j < dwords; j++)

-		    if(IntPtr[j] != IntPtr[j & 0x01])

-			return FALSE;

-		IntPtr += pitch;

-	     }

-	     break;

-	case 16:

-	    while(i--) {

-		for(j = 4; j < dwords; j++)

-		    if(IntPtr[j] != IntPtr[j & 0x03])

-			return FALSE;

-		IntPtr += pitch;

-	     }

-	     break;

-	case 24:

-	    while(i--) {

-		for(j = 6; j < dwords; j++)

-		    if(IntPtr[j] != IntPtr[j % 6])

-			return FALSE;

-		IntPtr += pitch;

-	     }

-	     break;

-	case 32:

-	    while(i--) {

-		for(j = 8; j < dwords; j++)

-		    if(IntPtr[j] != IntPtr[j & 0x07])

-			return FALSE;

-		IntPtr += pitch;

-	     }

-	     break;

-	default:  return FALSE;

-	}

-

-    }

-

-

-    if(h == 32) {

-	CARD32 *IntPtr2, *IntPtr3, *IntPtr4;

- 	i = 8;

-	IntPtr = (CARD32*)pPixmap->devPrivate.ptr;

-    	IntPtr2 = IntPtr + (pitch << 3);

-  	IntPtr3 = IntPtr2 + (pitch << 3);

-  	IntPtr4 = IntPtr3 + (pitch << 3);

-	while(i--) {

-	    for(j = 0; j < dwords; j++)

-		if((IntPtr[j] != IntPtr2[j]) || (IntPtr[j] != IntPtr3[j]) ||

-		    (IntPtr[j] != IntPtr4[j]))

-			return FALSE;

-	    IntPtr += pitch;

-	    IntPtr2 += pitch;

-	    IntPtr3 += pitch;

-	    IntPtr4 += pitch;

-	}

-    } else if (h == 16) {

-        CARD32 *IntPtr2;

-	i = 8;

-	IntPtr = (CARD32*)pPixmap->devPrivate.ptr;

-   	IntPtr2 = IntPtr + (pitch << 3);

-	while(i--) {

-	    for(j = 0; j < dwords; j++)

-		if(IntPtr[j] != IntPtr2[j])

-			return FALSE;

-	    IntPtr += pitch;

-	    IntPtr2 += pitch;

-	}

-    }

-	

-    pPriv->flags |= REDUCIBLE_TO_8x8;

-

-    if(checkMono) {

-   	XAAInfoRecPtr infoRec = 

-		GET_XAAINFORECPTR_FROM_DRAWABLE(&pPixmap->drawable);

-	unsigned char bits[8];

-	int fg, bg = -1, x, y;

- 

-	i = (h > 8) ? 8 : h;

-	j = (w > 8) ? 8 : w;

-

-	if(pPixmap->drawable.bitsPerPixel == 8) {

-	    unsigned char *srcp = pPixmap->devPrivate.ptr;

-	    fg = srcp[0];

-	    pitch = pPixmap->devKind;

-	    for(y = 0; y < i; y++) {

-		bits[y] = 0;

-		for(x = 0; x < j; x++) {

-		   if(srcp[x] != fg) {

-			if(bg == -1) bg = srcp[x];

-			else if(bg != srcp[x]) return TRUE;

-		   } else bits[y] |= 1 << x;

-		}

-		srcp += pitch;

-	    }

-	} else if(pPixmap->drawable.bitsPerPixel == 16) {

-	    unsigned short *srcp = (unsigned short*)pPixmap->devPrivate.ptr;

-	    fg = srcp[0];

-	    pitch = pPixmap->devKind >> 1;

-	    for(y = 0; y < i; y++) {

-		bits[y] = 0;

-		for(x = 0; x < j; x++) {

-		   if(srcp[x] != fg) {

-			if(bg == -1) bg = srcp[x];

-			else if(bg != srcp[x]) return TRUE;

-		   } else bits[y] |= 1 << x;

-		}

-		srcp += pitch;

-	    }

-	} else if(pPixmap->drawable.bitsPerPixel == 24) {

-	    CARD32 val;

-	    unsigned char *srcp = pPixmap->devPrivate.ptr;

-	    fg = *((CARD32*)srcp) & 0x00FFFFFF;

-	    pitch = pPixmap->devKind;

-	    j *= 3;

-	    for(y = 0; y < i; y++) {

-		bits[y] = 0;

-		for(x = 0; x < j; x+=3) {

-		   val = *((CARD32*)(srcp+x)) & 0x00FFFFFF;

-		   if(val != fg) {

-			if(bg == -1) bg = val;

-			else if(bg != val) 

-				return TRUE;

-		   } else bits[y] |= 1 << (x/3);

-		}

-		srcp += pitch;

-	    }

-	} else if(pPixmap->drawable.bitsPerPixel == 32) {

-	    IntPtr = (CARD32*)pPixmap->devPrivate.ptr;

-	    fg = IntPtr[0];

-	    for(y = 0; y < i; y++) {

-		bits[y] = 0;

-		for(x = 0; x < j; x++) {

-		   if(IntPtr[x] != fg) {

-			if(bg == -1) bg = IntPtr[x];

-			else if(bg != IntPtr[x]) return TRUE;

-		   } else bits[y] |= 1 << x;

-		}

-		IntPtr += pitch;

-	    }

-	} else return TRUE;

-

-        pPriv->fg = fg;

-	if(bg == -1) pPriv->bg = fg;

-        else pPriv->bg = bg;

-   

-   	if(h < 8) {

-	   switch(h) {

-		case 1:	bits[1] = bits[0];

-		case 2: bits[2] = bits[0];	bits[3] = bits[1];

-		case 4: bits[4] = bits[0];	bits[5] = bits[1];

-			bits[6] = bits[2];	bits[7] = bits[3];

-			break;

-	   }

-    	}

-

-	pPriv->pattern0 = 

-		bits[0] | (bits[1]<<8) | (bits[2]<<16) | (bits[3]<<24);

-	pPriv->pattern1 = 

-		bits[4] | (bits[5]<<8) | (bits[6]<<16) | (bits[7]<<24);

- 

-	if(w < 8) {

-	   switch(w) {

-	   case 1: 	pPriv->pattern0 |= (pPriv->pattern0 << 1);

-			pPriv->pattern1 |= (pPriv->pattern1 << 1);

-	   case 2:	pPriv->pattern0 |= (pPriv->pattern0 << 2);

-			pPriv->pattern1 |= (pPriv->pattern1 << 2);

-	   case 4:	pPriv->pattern0 |= (pPriv->pattern0 << 4);

-			pPriv->pattern1 |= (pPriv->pattern1 << 4);

-	   }

-	}

-	pPriv->flags |= REDUCIBLE_TO_2_COLOR;

-

-	if(infoRec->Mono8x8PatternFillFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {

-	    pPriv->pattern0 = SWAP_BITS_IN_BYTES(pPriv->pattern0);

-	    pPriv->pattern1 = SWAP_BITS_IN_BYTES(pPriv->pattern1);

-	}

-

-    }

-

-    return TRUE;

-}

-

-

-void XAATileCache(

-   ScrnInfoPtr pScrn, 

-   XAACacheInfoPtr pCache,

-   int w, int h

-) {

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-   (*infoRec->SetupForScreenToScreenCopy)(pScrn, 1, 1, GXcopy, ~0, -1);

-

-   while((w << 1) <= pCache->w) {

-	(*infoRec->SubsequentScreenToScreenCopy)(pScrn, pCache->x, pCache->y,

-		pCache->x + w, pCache->y, w, h);

-	w <<= 1;

-   }

-   if(w != pCache->w) {

-	(*infoRec->SubsequentScreenToScreenCopy)(pScrn, pCache->x, pCache->y,

-		pCache->x + w, pCache->y, pCache->w - w, h);

-	w = pCache->w;

-   }

-

-   while((h << 1) <= pCache->h) {

-	(*infoRec->SubsequentScreenToScreenCopy)(pScrn, pCache->x, pCache->y,

-		pCache->x, pCache->y + h, w, h);

-	h <<= 1;

-   }

-   if(h != pCache->h) {

-	(*infoRec->SubsequentScreenToScreenCopy)(pScrn, pCache->x, pCache->y,

-		pCache->x, pCache->y + h, w, pCache->h - h);

-   }

-   SET_SYNC_FLAG(infoRec);

-}

-

-XAACacheInfoPtr

-XAACacheTile(ScrnInfoPtr pScrn, PixmapPtr pPix)

-{

-   int w = pPix->drawable.width;

-   int h = pPix->drawable.height;

-   int size = max(w, h);

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-   XAAPixmapCachePrivatePtr pCachePriv = 

-	(XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate;

-   XAACacheInfoPtr pCache, cacheRoot = NULL;

-   int i, max = 0;

-   int *current;

-

-   if(size <= 128) {

-	if(pCachePriv->Info128) {

-	    cacheRoot = pCachePriv->Info128; 

-	    max = pCachePriv->Num128x128;

-	    current = &pCachePriv->Current128;

-	} else {     

-	    cacheRoot = pCachePriv->InfoPartial;

-	    max = pCachePriv->NumPartial;

-	    current = &pCachePriv->CurrentPartial;

-	}

-   } else if(size <= 256) {

-	cacheRoot = pCachePriv->Info256;      

-	max = pCachePriv->Num256x256;

-	current = &pCachePriv->Current256;

-   } else if(size <= 512) {

-	cacheRoot = pCachePriv->Info512;      

-	max = pCachePriv->Num512x512;

-	current = &pCachePriv->Current512;

-   } else { /* something's wrong */ 

-	ErrorF("Something's wrong in XAACacheTile()\n");

-	return pCachePriv->Info128; 

-   }

-

-   pCache = cacheRoot;

-

-   /* lets look for it */

-   for(i = 0; i < max; i++, pCache++) {

-	if(pCache->serialNumber == pPix->drawable.serialNumber) {

-	    pCache->trans_color = -1;

-	    return pCache;

-	}

-   }

-

-   pCache = &cacheRoot[(*current)++];

-   if(*current >= max) *current = 0;

-

-   pCache->serialNumber = pPix->drawable.serialNumber;

-   pCache->trans_color = pCache->bg = pCache->fg = -1;

-   pCache->orig_w = w;  pCache->orig_h = h;

-   (*infoRec->WritePixmapToCache)(

-	pScrn, pCache->x, pCache->y, w, h, pPix->devPrivate.ptr,

-	pPix->devKind, pPix->drawable.bitsPerPixel, pPix->drawable.depth);

-   if(!(infoRec->PixmapCacheFlags & DO_NOT_TILE_COLOR_DATA) && 

-	((w != pCache->w) || (h != pCache->h)))

-	XAATileCache(pScrn, pCache, w, h);

-

-   return pCache;

-}

-

-XAACacheInfoPtr

-XAACacheMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)

-{

-   int w = pPix->drawable.width;

-   int h = pPix->drawable.height;

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-   XAAPixmapCachePrivatePtr pCachePriv = 

-	(XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate;

-   XAACacheInfoPtr pCache, cacheRoot = NULL;

-   int i, max = 0, funcNo, pad, dwords, bpp = pScrn->bitsPerPixel;

-   int *current;

-   StippleScanlineProcPtr StippleFunc;

-   unsigned char *data, *srcPtr, *dstPtr;

-

-   if((h <= 128) && (w <= 128 * bpp)) {

-	if(pCachePriv->Info128) {

-	    cacheRoot = pCachePriv->Info128; 

-	    max = pCachePriv->Num128x128;

-	    current = &pCachePriv->Current128;

-	} else {     

-	    cacheRoot = pCachePriv->InfoPartial;

-	    max = pCachePriv->NumPartial;

-	    current = &pCachePriv->CurrentPartial;

-	}

-   } else if((h <= 256) && (w <= 256 * bpp)){

-	cacheRoot = pCachePriv->Info256;      

-	max = pCachePriv->Num256x256;

-	current = &pCachePriv->Current256;

-   } else if((h <= 512) && (w <= 526 * bpp)){

-	cacheRoot = pCachePriv->Info512;      

-	max = pCachePriv->Num512x512;

-	current = &pCachePriv->Current512;

-   } else { /* something's wrong */ 

-	ErrorF("Something's wrong in XAACacheMonoStipple()\n");

-	return pCachePriv->Info128; 

-   }

-

-   pCache = cacheRoot;

-

-   /* lets look for it */

-   for(i = 0; i < max; i++, pCache++) {

-	if((pCache->serialNumber == pPix->drawable.serialNumber) &&

-	    (pCache->fg == -1) && (pCache->bg == -1)) {

-	    pCache->trans_color = -1;

-	    return pCache;

-	}

-   }

-

-   pCache = &cacheRoot[(*current)++];

-   if(*current >= max) *current = 0;

-

-   pCache->serialNumber = pPix->drawable.serialNumber;

-   pCache->trans_color = pCache->bg = pCache->fg = -1;

-   pCache->orig_w = w;  pCache->orig_h = h;

-

-   if(w <= 32) {

-        if(w & (w - 1))	funcNo = 1;

-        else    	funcNo = 0;

-   } else 		funcNo = 2;

-

-   pad = BitmapBytePad(pCache->w * bpp);

-   dwords = bytes_to_int32(pad);

-   dstPtr = data = (unsigned char*)malloc(pad * pCache->h);

-   srcPtr = (unsigned char*)pPix->devPrivate.ptr;

-

-   if(infoRec->ScreenToScreenColorExpandFillFlags & BIT_ORDER_IN_BYTE_MSBFIRST)

-	StippleFunc = XAAStippleScanlineFuncMSBFirst[funcNo];

-   else

-	StippleFunc = XAAStippleScanlineFuncLSBFirst[funcNo];

-

-   /* don't bother generating more than we'll ever use */

-   max = ((pScrn->displayWidth + w - 1) + 31) >> 5;

-   if(dwords > max)

-	dwords = max;

-

-   for(i = 0; i < h; i++) {

-	(*StippleFunc)((CARD32*)dstPtr, (CARD32*)srcPtr, 0, w, dwords);

-	srcPtr += pPix->devKind;

-	dstPtr += pad;

-   }

-

-   while((h<<1) <= pCache->h) {

-	memcpy(data + (pad * h), data, pad * h);

-	h <<= 1;

-   }

- 

-   if(h < pCache->h)   

-	memcpy(data + (pad * h), data, pad * (pCache->h - h));

-

-   (*infoRec->WritePixmapToCache)(

-	pScrn, pCache->x, pCache->y, pCache->w, pCache->h, data,

-	pad, bpp, pScrn->depth);

-

-   free(data);

-

-   return pCache;

-}

-

-XAACacheInfoPtr

-XAACachePlanarMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)

-{

-   int w = pPix->drawable.width;

-   int h = pPix->drawable.height;

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-   XAAPixmapCachePrivatePtr pCachePriv = 

-	(XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate;

-   XAACacheInfoPtr pCache, cacheRoot = NULL;

-   int i, max = 0;

-   int *current;

-

-   if((h <= 128) && (w <= 128)) {

-	if(pCachePriv->Info128) {

-	    cacheRoot = pCachePriv->Info128; 

-	    max = pCachePriv->Num128x128;

-	    current = &pCachePriv->Current128;

-	} else {     

-	    cacheRoot = pCachePriv->InfoPartial;

-	    max = pCachePriv->NumPartial;

-	    current = &pCachePriv->CurrentPartial;

-	}

-   } else if((h <= 256) && (w <= 256)){

-	cacheRoot = pCachePriv->Info256;      

-	max = pCachePriv->Num256x256;

-	current = &pCachePriv->Current256;

-   } else if((h <= 512) && (w <= 526)){

-	cacheRoot = pCachePriv->Info512;      

-	max = pCachePriv->Num512x512;

-	current = &pCachePriv->Current512;

-   } else { /* something's wrong */ 

-	ErrorF("Something's wrong in XAACachePlanarMonoStipple()\n");

-	return pCachePriv->Info128; 

-   }

-

-   pCache = cacheRoot;

-

-   /* lets look for it */

-   for(i = 0; i < max; i++, pCache++) {

-	if((pCache->serialNumber == pPix->drawable.serialNumber) &&

-	    (pCache->fg == -1) && (pCache->bg == -1)) {

-	    pCache->trans_color = -1;

-	    return pCache;

-	}

-   }

-

-   pCache = &cacheRoot[(*current)++];

-   if(*current >= max) *current = 0;

-

-   pCache->serialNumber = pPix->drawable.serialNumber;

-   pCache->trans_color = pCache->bg = pCache->fg = -1;

-   pCache->orig_w = w;  pCache->orig_h = h;

-

-   /* Plane 0 holds the stipple. Plane 1 holds the inverted stipple */

-   (*infoRec->WriteBitmapToCache)(pScrn, pCache->x, pCache->y, 

-	pPix->drawable.width, pPix->drawable.height, pPix->devPrivate.ptr,

-	pPix->devKind, 1, 2);

-   if(!(infoRec->PixmapCacheFlags & DO_NOT_TILE_MONO_DATA) && 

-	((w != pCache->w) || (h != pCache->h)))

-	XAATileCache(pScrn, pCache, w, h);

-

-   return pCache;

-}

-

-XAACachePlanarMonoStippleProc

-XAAGetCachePlanarMonoStipple(void)

-{

-    return XAACachePlanarMonoStipple;

-}

-

-XAACacheInfoPtr

-XAACacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg)

-{

-   int w = pPix->drawable.width;

-   int h = pPix->drawable.height;

-   int size = max(w, h);

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-   XAAPixmapCachePrivatePtr pCachePriv = 

-	(XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate;

-   XAACacheInfoPtr pCache, cacheRoot = NULL;

-   int i, max = 0;

-   int *current;

-

-   if(size <= 128) {

-	if(pCachePriv->Info128) {

-	    cacheRoot = pCachePriv->Info128; 

-	    max = pCachePriv->Num128x128;

-	    current = &pCachePriv->Current128;

-	} else {     

-	    cacheRoot = pCachePriv->InfoPartial;

-	    max = pCachePriv->NumPartial;

-	    current = &pCachePriv->CurrentPartial;

-	}

-   } else if(size <= 256) {

-	cacheRoot = pCachePriv->Info256;      

-	max = pCachePriv->Num256x256;

-	current = &pCachePriv->Current256;

-   } else if(size <= 512) {

-	cacheRoot = pCachePriv->Info512;      

-	max = pCachePriv->Num512x512;

-	current = &pCachePriv->Current512;

-   } else { /* something's wrong */

-	ErrorF("Something's wrong in XAACacheStipple()\n");

-	return pCachePriv->Info128; 

-   }

-

-   pCache = cacheRoot;

-   /* lets look for it */

-   if(bg == -1)

-	for(i = 0; i < max; i++, pCache++) {

-	    if((pCache->serialNumber == pPix->drawable.serialNumber) &&

-		(fg == pCache->fg) && (pCache->fg != pCache->bg)) {

-		pCache->trans_color = pCache->bg;

-		return pCache;

-	     }

-	}

-   else

-	for(i = 0; i < max; i++, pCache++) {

-	    if((pCache->serialNumber == pPix->drawable.serialNumber) &&

-		(fg == pCache->fg) && (bg == pCache->bg)) {

-		pCache->trans_color = -1;

-		return pCache;

-	     }

-	}

-

-   pCache = &cacheRoot[(*current)++];

-   if(*current >= max) *current = 0;

-

-   pCache->serialNumber = pPix->drawable.serialNumber;

-   pCache->fg = fg;

-   if(bg == -1)

-	pCache->trans_color = bg = fg ^ 1;

-   else

-	pCache->trans_color = -1;

-   pCache->bg = bg;

-

-   pCache->orig_w = w;  pCache->orig_h = h;

-   (*infoRec->WriteBitmapToCache)(pScrn, pCache->x, pCache->y, 

-	pPix->drawable.width, pPix->drawable.height, pPix->devPrivate.ptr,

-	pPix->devKind, fg, bg);

-   if(!(infoRec->PixmapCacheFlags & DO_NOT_TILE_COLOR_DATA) && 

-	((w != pCache->w) || (h != pCache->h)))

-	XAATileCache(pScrn, pCache, w, h);

-

-   return pCache;

-}

-

-

-

-XAACacheInfoPtr

-XAACacheMono8x8Pattern(ScrnInfoPtr pScrn, int pat0, int pat1)

-{

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-   XAAPixmapCachePrivatePtr pCachePriv = 

-	(XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate;

-   XAACacheInfoPtr pCache = pCachePriv->InfoMono;

-   int i;

-

-   for(i = 0; i < pCachePriv->NumMono; i++, pCache++) {

-    	if(pCache->serialNumber && 

-	   (pCache->pat0 == pat0) && (pCache->pat1 == pat1))

-		return pCache;

-   }

-

-   /* OK, let's cache it */

-   pCache = &pCachePriv->InfoMono[pCachePriv->CurrentMono++]; 

-   if(pCachePriv->CurrentMono >= pCachePriv->NumMono) 

-	pCachePriv->CurrentMono = 0;

-

-   pCache->serialNumber = 1; /* we don't care since we do lookups by pattern */

-   pCache->pat0 = pat0;

-   pCache->pat1 = pat1;

-

-   (*infoRec->WriteMono8x8PatternToCache)(pScrn, pCache);

-

-   return pCache;

-}

-

-

-

-XAACacheInfoPtr

-XAACacheColor8x8Pattern(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg)

-{

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-   XAAPixmapCachePrivatePtr pCachePriv = 

-	(XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate;

-   XAACacheInfoPtr pCache = pCachePriv->InfoColor;

-   XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(pPix);

-   int i;

-

-   if(!(pixPriv->flags & REDUCIBLE_TO_2_COLOR)) {

-	for(i = 0; i < pCachePriv->NumColor; i++, pCache++) {

-	     if(pCache->serialNumber == pPix->drawable.serialNumber) {

-		pCache->trans_color = -1;

-		return pCache;	

-	     }

-	}

-	pCache = &pCachePriv->InfoColor[pCachePriv->CurrentColor++]; 

-	if(pCachePriv->CurrentColor >= pCachePriv->NumColor) 

-		pCachePriv->CurrentColor = 0;

-

-	pCache->serialNumber = pPix->drawable.serialNumber;

-	pCache->trans_color = pCache->fg = pCache->bg = -1;

-   } else {

-	int pat0 = pixPriv->pattern0;

-	int pat1 = pixPriv->pattern1;

-

-	if(fg == -1) { /* it's a tile */

-	   fg = pixPriv->fg; bg = pixPriv->bg;

-	}

-

-	if(bg == -1) { /* stipple */

-	    for(i = 0; i < pCachePriv->NumColor; i++, pCache++) {

-		if(pCache->serialNumber &&

-		   (pCache->pat0 == pat0) && (pCache->pat1 == pat1) &&

-		   (pCache->fg == fg) && (pCache->bg != fg)) {

-		   pCache->trans_color = pCache->bg;

-		   return pCache;	

-		}

-	    }

-	} else {  /* opaque stipple */

-	    for(i = 0; i < pCachePriv->NumColor; i++, pCache++) {

-		if(pCache->serialNumber &&

-		   (pCache->pat0 == pat0) && (pCache->pat1 == pat1) &&

-		   (pCache->fg == fg) && (pCache->bg == bg)) {

-		   pCache->trans_color = -1;

-		   return pCache;	

-		}

-	    }

-	}

-	pCache = &pCachePriv->InfoColor[pCachePriv->CurrentColor++]; 

-	if(pCachePriv->CurrentColor >= pCachePriv->NumColor) 

-		pCachePriv->CurrentColor = 0;

-

-        if(bg == -1)

-	    pCache->trans_color = bg = fg ^ 1;

-	else

-	    pCache->trans_color = -1;

-

-	pCache->pat0 = pat0; pCache->pat1 = pat1;

-	pCache->fg = fg; pCache->bg = bg;

-	pCache->serialNumber = 1;

-   }

-

-   (*infoRec->WriteColor8x8PatternToCache)(pScrn, pPix, pCache);

-

-   return pCache;

-}

-

-

-void

-XAAWriteBitmapToCache(

-   ScrnInfoPtr pScrn,

-   int x, int y, int w, int h,

-   unsigned char *src,

-   int srcwidth,

-   int fg, int bg

-) {

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-   (*infoRec->WriteBitmap)(pScrn, x, y, w, h, src, srcwidth, 

-					0, fg, bg, GXcopy, ~0);

-}

-

-void

-XAAWriteBitmapToCacheLinear(

-   ScrnInfoPtr pScrn,

-   int x, int y, int w, int h,

-   unsigned char *src,

-   int srcwidth,

-   int fg, int bg

-){

-   ScreenPtr pScreen = pScrn->pScreen;

-   PixmapPtr pScreenPix, pDstPix;

-   ChangeGCVal gcvals[2];

-   GCPtr pGC;

-

-   pScreenPix = (*pScreen->GetScreenPixmap)(pScreen);

-

-   pDstPix = GetScratchPixmapHeader(pScreen, pScreenPix->drawable.width, 

-					y + h, pScreenPix->drawable.depth, 

-					pScreenPix->drawable.bitsPerPixel, 

-					pScreenPix->devKind,

-					pScreenPix->devPrivate.ptr);

-   

-   pGC = GetScratchGC(pScreenPix->drawable.depth, pScreen);

-   gcvals[0].val = fg;

-   gcvals[1].val = bg;

-   ChangeGC(NullClient, pGC, GCForeground | GCBackground, gcvals);

-   ValidateGC((DrawablePtr)pDstPix, pGC);

-

-   /* We've unwrapped already so these ops miss a sync */

-   SYNC_CHECK(pScrn);

-

-   (*pGC->ops->PutImage)((DrawablePtr)pDstPix, pGC, 1, x, y, w, h, 0,

-						XYBitmap, (pointer)src);

-

-   FreeScratchGC(pGC);

-   FreeScratchPixmapHeader(pDstPix);

-}

-

-

-void

-XAAWritePixmapToCache(

-   ScrnInfoPtr pScrn,

-   int x, int y, int w, int h,

-   unsigned char *src,

-   int srcwidth,

-   int bpp, int depth

-) {

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-   (*infoRec->WritePixmap)(pScrn, x, y, w, h, src, srcwidth,

-				GXcopy, ~0, -1, bpp, depth);

-}

-

-

-

-void

-XAAWritePixmapToCacheLinear(

-   ScrnInfoPtr pScrn,

-   int x, int y, int w, int h,

-   unsigned char *src,

-   int srcwidth,

-   int bpp, int depth

-){

-   ScreenPtr pScreen = pScrn->pScreen;

-   PixmapPtr pScreenPix, pDstPix;

-   GCPtr pGC;

-

-   pScreenPix = (*pScreen->GetScreenPixmap)(pScreen);

-

-   pDstPix = GetScratchPixmapHeader(pScreen, x + w, y + h, 

-					depth, bpp, pScreenPix->devKind,

-					pScreenPix->devPrivate.ptr);

-   

-   pGC = GetScratchGC(depth, pScreen);

-   ValidateGC((DrawablePtr)pDstPix, pGC);

-

-   /* We've unwrapped already so these ops miss a sync */

-   SYNC_CHECK(pScrn);

-

-   if(bpp == BitsPerPixel(depth))

-	(*pGC->ops->PutImage)((DrawablePtr)pDstPix, pGC, depth, x, y, w, 

-					h, 0, ZPixmap, (pointer)src);

-   else {

-	PixmapPtr pSrcPix;

-

-	pSrcPix = GetScratchPixmapHeader(pScreen, w, h, depth, bpp,

-					srcwidth, (pointer)src);

-	

-	(*pGC->ops->CopyArea)((DrawablePtr)pSrcPix, (DrawablePtr)pDstPix,

-					pGC, 0, 0, w, h, x, y);

-		

-	FreeScratchPixmapHeader(pSrcPix);

-   }

-

-   FreeScratchGC(pGC);

-   FreeScratchPixmapHeader(pDstPix);

-}

-

-

-void

-XAAWriteMono8x8PatternToCache(

-   ScrnInfoPtr pScrn, 

-   XAACacheInfoPtr pCache

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-   XAAPixmapCachePrivatePtr pCachePriv = 

-	(XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate;

-   unsigned char *data;

-   int pad, Bpp = (pScrn->bitsPerPixel >> 3);

-   

-   pCache->offsets = pCachePriv->MonoOffsets;

-

-   pad = BitmapBytePad(pCache->w * pScrn->bitsPerPixel);

-

-   data = (unsigned char*)malloc(pad * pCache->h);

-   if(!data) return;

-

-   if(infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_ORIGIN) {

-	CARD32* ptr = (CARD32*)data;

-	ptr[0] = pCache->pat0;  ptr[1] = pCache->pat1;

-   } else {

-	CARD32 *ptr;

-	DDXPointPtr pPoint = pCache->offsets;

-	int patx, paty, i;

-

-	for(i = 0; i < 64; i++, pPoint++) {

-	     patx = pCache->pat0; paty = pCache->pat1;

-	     XAARotateMonoPattern(&patx, &paty, i & 0x07, i >> 3,

-				(infoRec->Mono8x8PatternFillFlags & 		

-				BIT_ORDER_IN_BYTE_MSBFIRST));

-	     ptr = (CARD32*)(data + (pad * pPoint->y) + (Bpp * pPoint->x));

-	     ptr[0] = patx;  ptr[1] = paty;

-	}

-   }

-

-   (*infoRec->WritePixmapToCache)(pScrn, pCache->x, pCache->y, 

-	pCache->w, pCache->h, data, pad, pScrn->bitsPerPixel, pScrn->depth);

-

-   free(data);

-}

-

-void

-XAAWriteColor8x8PatternToCache(

-   ScrnInfoPtr pScrn, 

-   PixmapPtr pPix, 

-   XAACacheInfoPtr pCache

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-   XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(pPix);

-   XAAPixmapCachePrivatePtr pCachePriv = 

-	(XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate;

-   int pad, i, w, h, nw, nh, Bpp;

-   unsigned char *data, *srcPtr, *dstPtr;

-

-   pCache->offsets = pCachePriv->ColorOffsets;

-

-   if(pixPriv->flags & REDUCIBLE_TO_2_COLOR) {

-	CARD32* ptr;

-	pad = BitmapBytePad(pCache->w);

-	data = (unsigned char*)malloc(pad * pCache->h);

-	if(!data) return;

-

-	if(infoRec->Color8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN) {

-	     ptr = (CARD32*)data;

-	     ptr[0] = pCache->pat0; ptr[1] = pCache->pat1;

-	} else {

-	   int patx, paty;

-	

-	   ptr = (CARD32*)data;

-	   ptr[0] = ptr[2] = pCache->pat0;  ptr[1] = ptr[3] = pCache->pat1;

-	   for(i = 1; i < 8; i++) {

-		patx = pCache->pat0; paty = pCache->pat1;

-		XAARotateMonoPattern(&patx, &paty, i, 0,

-				(infoRec->Mono8x8PatternFillFlags & 		

-				BIT_ORDER_IN_BYTE_MSBFIRST));

-		ptr = (CARD32*)(data + (pad * i));

-		ptr[0] = ptr[2] = patx;  ptr[1] = ptr[3] = paty;

-	   }

-	}

-

-	(*infoRec->WriteBitmapToCache)(pScrn, pCache->x, pCache->y, 

-		pCache->w, pCache->h, data, pad, pCache->fg, pCache->bg);

-

-        free(data);

-	return;

-   } 

-

-   Bpp = pScrn->bitsPerPixel >> 3;

-   h = min(8,pPix->drawable.height);

-   w = min(8,pPix->drawable.width);

-   pad = BitmapBytePad(pCache->w * pScrn->bitsPerPixel);

-

-   data = (unsigned char*)malloc(pad * pCache->h);

-   if(!data) return;

-

-   /* Write and expand horizontally. */

-   for (i = h, dstPtr = data, srcPtr = pPix->devPrivate.ptr; i--; 

-	srcPtr += pPix->devKind, dstPtr += pScrn->bitsPerPixel) {

-         nw = w;

-         memcpy(dstPtr, srcPtr, w * Bpp);

-         while (nw != 8) {

-            memcpy(dstPtr + (nw * Bpp), dstPtr, nw * Bpp);

-            nw <<= 1;

-         }

-   }

-   nh = h;

-   /* Expand vertically. */

-   while (nh != 8) {

-        memcpy(data + (nh*pScrn->bitsPerPixel), data, nh*pScrn->bitsPerPixel);

-        nh <<= 1;

-   }

-

-   if(!(infoRec->Color8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	int j;

-        unsigned char *ptr = data + (128 * Bpp);

-

-	memcpy(data + (64 * Bpp), data, 64 * Bpp);

-	for(i = 1; i < 8; i++, ptr += (128 * Bpp)) {

-	   for(j = 0; j < 8; j++) {

-		memcpy(ptr + (j * 8) * Bpp, data + (j * 8 + i) * Bpp,

-			(8 - i) * Bpp);

-		memcpy(ptr + (j * 8 + 8 - i) * Bpp, data + j * 8 * Bpp, i*Bpp);

-	   }

-	   memcpy(ptr + (64 * Bpp), ptr, 64 * Bpp);

-	}

-   }

-

-   (*infoRec->WritePixmapToCache)(pScrn, pCache->x, pCache->y, 

-	pCache->w, pCache->h, data, pad, pScrn->bitsPerPixel, pScrn->depth);

-

-   free(data);

-}

-

-

-

-int

-XAAStippledFillChooser(GCPtr pGC)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    PixmapPtr pPixmap = pGC->stipple;

-    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap);

-

-    if(!(pPriv->flags & REDUCIBILITY_CHECKED) &&

-	(infoRec->CanDoMono8x8 || infoRec->CanDoColor8x8)) {

-	XAACheckStippleReducibility(pPixmap);

-    }

-

-

-    if(pPriv->flags & REDUCIBLE_TO_8x8) {

-	if(infoRec->CanDoMono8x8 && 

-	   !(infoRec->FillMono8x8PatternSpansFlags & NO_TRANSPARENCY) && 

-	   ((pGC->alu == GXcopy) || !(infoRec->FillMono8x8PatternSpansFlags & 

-		TRANSPARENCY_GXCOPY_ONLY)) &&

-	   CHECK_ROP(pGC,infoRec->FillMono8x8PatternSpansFlags) &&

-	   CHECK_ROPSRC(pGC,infoRec->FillMono8x8PatternSpansFlags) &&

-	   CHECK_FG(pGC,infoRec->FillMono8x8PatternSpansFlags) &&

-	   CHECK_PLANEMASK(pGC,infoRec->FillMono8x8PatternSpansFlags)) {

-

-	      return DO_MONO_8x8;

-	}

-

-	if(infoRec->CanDoColor8x8 && 

-	   !(infoRec->FillColor8x8PatternSpansFlags & NO_TRANSPARENCY) && 

-	   ((pGC->alu == GXcopy) || !(infoRec->FillColor8x8PatternSpansFlags &

-		TRANSPARENCY_GXCOPY_ONLY)) &&

-	   CHECK_ROP(pGC,infoRec->FillColor8x8PatternSpansFlags) &&

-	   CHECK_ROPSRC(pGC,infoRec->FillColor8x8PatternSpansFlags) &&

-	   CHECK_PLANEMASK(pGC,infoRec->FillColor8x8PatternSpansFlags)) {

-

-	      return DO_COLOR_8x8;

-	}

-    }

-

-    if(infoRec->UsingPixmapCache && infoRec->FillCacheExpandSpans && 

-	(pPixmap->drawable.height <= infoRec->MaxCacheableStippleHeight) &&

-	(pPixmap->drawable.width <= infoRec->MaxCacheableStippleWidth /

-	 infoRec->CacheColorExpandDensity) &&

-	!(infoRec->FillCacheExpandSpansFlags & NO_TRANSPARENCY) && 

-	((pGC->alu == GXcopy) || !(infoRec->FillCacheExpandSpansFlags & 

-		TRANSPARENCY_GXCOPY_ONLY)) &&

-	CHECK_ROP(pGC,infoRec->FillCacheExpandSpansFlags) &&

-	CHECK_ROPSRC(pGC,infoRec->FillCacheExpandSpansFlags) &&

-	CHECK_FG(pGC,infoRec->FillCacheExpandSpansFlags) &&

-	CHECK_PLANEMASK(pGC,infoRec->FillCacheExpandSpansFlags)) {

-

-	      return DO_CACHE_EXPAND;

-    }

-

-

-    if(infoRec->UsingPixmapCache && 

-	!(infoRec->PixmapCacheFlags & DO_NOT_BLIT_STIPPLES) && 

-	infoRec->FillCacheBltSpans && 

-	(pPixmap->drawable.height <= infoRec->MaxCacheableTileHeight) &&

-	(pPixmap->drawable.width <= infoRec->MaxCacheableTileWidth) &&

-	!(infoRec->FillCacheBltSpansFlags & NO_TRANSPARENCY) && 

-	((pGC->alu == GXcopy) || !(infoRec->FillCacheBltSpansFlags & 

-		TRANSPARENCY_GXCOPY_ONLY)) &&

-	CHECK_ROP(pGC,infoRec->FillCacheBltSpansFlags) &&

-	CHECK_ROPSRC(pGC,infoRec->FillCacheBltSpansFlags) &&

-	CHECK_PLANEMASK(pGC,infoRec->FillCacheBltSpansFlags)) {

-

-	      return DO_CACHE_BLT;

-    }

-

-    if(infoRec->FillColorExpandSpans && 

-	!(infoRec->FillColorExpandSpansFlags & NO_TRANSPARENCY) && 

-	((pGC->alu == GXcopy) || !(infoRec->FillColorExpandSpansFlags & 

-		TRANSPARENCY_GXCOPY_ONLY)) &&

-	CHECK_ROP(pGC,infoRec->FillColorExpandSpansFlags) &&

-	CHECK_ROPSRC(pGC,infoRec->FillColorExpandSpansFlags) &&

-	CHECK_FG(pGC,infoRec->FillColorExpandSpansFlags) &&

-	CHECK_PLANEMASK(pGC,infoRec->FillColorExpandSpansFlags)) {

-

-	      return DO_COLOR_EXPAND;

-    }

-

-    return 0;

-}

-

-

-int

-XAAOpaqueStippledFillChooser(GCPtr pGC)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    PixmapPtr pPixmap = pGC->stipple;

-    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap);

-

-    if(XAA_DEPTH_BUG(pGC))

-	 return 0;

-

-    if(!(pPriv->flags & REDUCIBILITY_CHECKED) &&

-	(infoRec->CanDoMono8x8 || infoRec->CanDoColor8x8)) {

-	XAACheckStippleReducibility(pPixmap);

-    }

-

-    if(pPriv->flags & REDUCIBLE_TO_8x8) {

-	if(infoRec->CanDoMono8x8 && 

-	   !(infoRec->FillMono8x8PatternSpansFlags & TRANSPARENCY_ONLY) && 

-	   CHECK_ROP(pGC,infoRec->FillMono8x8PatternSpansFlags) &&

-	   CHECK_ROPSRC(pGC,infoRec->FillMono8x8PatternSpansFlags) &&

-	   CHECK_COLORS(pGC,infoRec->FillMono8x8PatternSpansFlags) &&

-	   CHECK_PLANEMASK(pGC,infoRec->FillMono8x8PatternSpansFlags)) {

-

-	      return DO_MONO_8x8;

-	}

-

-	if(infoRec->CanDoColor8x8 && 

-	   CHECK_ROP(pGC,infoRec->FillColor8x8PatternSpansFlags) &&

-	   CHECK_ROPSRC(pGC,infoRec->FillColor8x8PatternSpansFlags) &&

-	   CHECK_PLANEMASK(pGC,infoRec->FillColor8x8PatternSpansFlags)) {

-

-	      return DO_COLOR_8x8;

-	}

-    }

-

-    if(infoRec->UsingPixmapCache && infoRec->FillCacheExpandSpans && 

-	(pPixmap->drawable.height <= infoRec->MaxCacheableStippleHeight) &&

-	(pPixmap->drawable.width <= infoRec->MaxCacheableStippleWidth /

-	 infoRec->CacheColorExpandDensity) &&

-	!(infoRec->FillCacheExpandSpansFlags & TRANSPARENCY_ONLY) && 

-	CHECK_ROP(pGC,infoRec->FillCacheExpandSpansFlags) &&

-	CHECK_ROPSRC(pGC,infoRec->FillCacheExpandSpansFlags) &&

-	CHECK_COLORS(pGC,infoRec->FillCacheExpandSpansFlags) &&

-	CHECK_PLANEMASK(pGC,infoRec->FillCacheExpandSpansFlags)) {

-

-	      return DO_CACHE_EXPAND;

-    } 

-

-    if(infoRec->UsingPixmapCache &&

-	!(infoRec->PixmapCacheFlags & DO_NOT_BLIT_STIPPLES) && 

-	infoRec->FillCacheBltSpans && 

-	(pPixmap->drawable.height <= infoRec->MaxCacheableTileHeight) &&

-	(pPixmap->drawable.width <= infoRec->MaxCacheableTileWidth) &&

-	CHECK_ROP(pGC,infoRec->FillCacheBltSpansFlags) &&

-	CHECK_ROPSRC(pGC,infoRec->FillCacheBltSpansFlags) &&

-	CHECK_PLANEMASK(pGC,infoRec->FillCacheBltSpansFlags)) {

-

-	      return DO_CACHE_BLT;

-    } 

-

-    if(infoRec->FillColorExpandSpans && 

-	!(infoRec->FillColorExpandSpansFlags & TRANSPARENCY_ONLY) && 

-	CHECK_ROP(pGC,infoRec->FillColorExpandSpansFlags) &&

-	CHECK_ROPSRC(pGC,infoRec->FillColorExpandSpansFlags) &&

-	CHECK_COLORS(pGC,infoRec->FillColorExpandSpansFlags) &&

-	CHECK_PLANEMASK(pGC,infoRec->FillColorExpandSpansFlags)) {

-

-	      return DO_COLOR_EXPAND;

-    }

-

-    return 0;

-}

-

-

-

-int

-XAATiledFillChooser(GCPtr pGC)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    PixmapPtr pPixmap = pGC->tile.pixmap;

-    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap);

-

-    if(IS_OFFSCREEN_PIXMAP(pPixmap) && infoRec->FillCacheBltSpans &&

-	CHECK_ROP(pGC,infoRec->FillCacheBltSpansFlags) &&

-	CHECK_ROPSRC(pGC,infoRec->FillCacheBltSpansFlags) &&

-	CHECK_PLANEMASK(pGC,infoRec->FillCacheBltSpansFlags)) {

-

-	return DO_PIXMAP_COPY;

-    }

-

-    if(!(pPriv->flags & REDUCIBILITY_CHECKED) &&

-	(infoRec->CanDoMono8x8 || infoRec->CanDoColor8x8)) {

-	XAACheckTileReducibility(pPixmap,infoRec->CanDoMono8x8);

-    }

-

-    if(pPriv->flags & REDUCIBLE_TO_8x8) {

-	if((pPriv->flags & REDUCIBLE_TO_2_COLOR) && infoRec->CanDoMono8x8 && 

-	   !(infoRec->FillMono8x8PatternSpansFlags & TRANSPARENCY_ONLY) && 

-	   CHECK_ROP(pGC,infoRec->FillMono8x8PatternSpansFlags) &&

-	   CHECK_ROPSRC(pGC,infoRec->FillMono8x8PatternSpansFlags) &&

-	   (!(infoRec->FillMono8x8PatternSpansFlags & RGB_EQUAL) || 

-		(CHECK_RGB_EQUAL(pPriv->fg) && CHECK_RGB_EQUAL(pPriv->bg))) &&

-	   CHECK_PLANEMASK(pGC,infoRec->FillMono8x8PatternSpansFlags)) {

-

-	      return DO_MONO_8x8;

-	}

-

-	if(infoRec->CanDoColor8x8 && 

-	   CHECK_ROP(pGC,infoRec->FillColor8x8PatternSpansFlags) &&

-	   CHECK_ROPSRC(pGC,infoRec->FillColor8x8PatternSpansFlags) &&

-	   CHECK_PLANEMASK(pGC,infoRec->FillColor8x8PatternSpansFlags)) {

-

-	      return DO_COLOR_8x8;

-	}

-    }

-

-    if(infoRec->UsingPixmapCache && infoRec->FillCacheBltSpans && 

-	(pPixmap->drawable.height <= infoRec->MaxCacheableTileHeight) &&

-	(pPixmap->drawable.width <= infoRec->MaxCacheableTileWidth) &&

-	CHECK_ROP(pGC,infoRec->FillCacheBltSpansFlags) &&

-	CHECK_ROPSRC(pGC,infoRec->FillCacheBltSpansFlags) &&

-	CHECK_PLANEMASK(pGC,infoRec->FillCacheBltSpansFlags)) {

-

-	      return DO_CACHE_BLT;

-    }

-

-    if(infoRec->FillImageWriteRects && 

-	CHECK_NO_GXCOPY(pGC,infoRec->FillImageWriteRectsFlags) &&

-	CHECK_ROP(pGC,infoRec->FillImageWriteRectsFlags) &&

-	CHECK_ROPSRC(pGC,infoRec->FillImageWriteRectsFlags) &&

-	CHECK_PLANEMASK(pGC,infoRec->FillImageWriteRectsFlags)) {

-

-	      return DO_IMAGE_WRITE;

-    }

-

-    return 0;

-}

-

-

-static int RotateMasksX[8] = {

-   0xFFFFFFFF, 0x7F7F7F7F, 0x3F3F3F3F, 0x1F1F1F1F,

-   0x0F0F0F0F, 0x07070707, 0x03030303, 0x01010101

-};

-

-static int RotateMasksY[4] = {

-   0xFFFFFFFF, 0x00FFFFFF, 0x0000FFFF, 0x000000FF

-};

-

-void

-XAARotateMonoPattern(

-    int *pat0, int *pat1,

-    int xorg, int yorg,

-    Bool msbfirst

-){

-    int tmp, mask;    

-

-    if(xorg) {

-	if(msbfirst) xorg = 8 - xorg;

-	mask = RotateMasksX[xorg];

-	*pat0 = ((*pat0 >> xorg) & mask) | ((*pat0 << (8 - xorg)) & ~mask);

-	*pat1 = ((*pat1 >> xorg) & mask) | ((*pat1 << (8 - xorg)) & ~mask);

-    } 

-    if(yorg >= 4) {

-	tmp = *pat0; *pat0 = *pat1; *pat1 = tmp;

-	yorg -= 4;

-    }

-    if(yorg) {

-	mask = RotateMasksY[yorg];

-	yorg <<= 3;

-	tmp = *pat0;

-	*pat0 = ((*pat0 >> yorg) & mask) | ((*pat1 << (32 - yorg)) & ~mask);  

-	*pat1 = ((*pat1 >> yorg) & mask) | ((tmp << (32 - yorg)) & ~mask);

-    }

-}

-

-

-

-void

-XAAInvalidatePixmapCache(ScreenPtr pScreen)

-{

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-   XAAPixmapCachePrivatePtr pCachePriv = 

-	(XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate;

-   int i;

-

-   if(!pCachePriv) return;

-

-   for(i = 0; i < pCachePriv->Num512x512; i++) 

-	(pCachePriv->Info512)[i].serialNumber = 0;

-   for(i = 0; i < pCachePriv->Num256x256; i++) 

-	(pCachePriv->Info256)[i].serialNumber = 0;

-   for(i = 0; i < pCachePriv->Num128x128; i++) 

-	(pCachePriv->Info128)[i].serialNumber = 0;

-   for(i = 0; i < pCachePriv->NumPartial; i++) 

-	(pCachePriv->InfoPartial)[i].serialNumber = 0;

-   for(i = 0; i < pCachePriv->NumMono; i++) 

-	(pCachePriv->InfoMono)[i].serialNumber = 0;

-   for(i = 0; i < pCachePriv->NumColor; i++) 

-	(pCachePriv->InfoColor)[i].serialNumber = 0;

-}

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <string.h>
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "gc.h"
+#include "mi.h"
+#include "pixmapstr.h"
+#include "windowstr.h"
+#include "regionstr.h"
+#include "servermd.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaacexp.h"
+#include "xaalocal.h"
+#include "xaawrap.h"
+
+#define MAX_COLOR	32
+#define MAX_MONO	32
+#define MAX_8		32
+#define MAX_128		32
+#define MAX_256		32
+#define MAX_512		16
+
+static int CacheInitIndex = -1;
+
+#define CACHEINIT(p) ((p)->privates[CacheInitIndex].val)
+
+typedef struct _CacheLink {
+    int x;
+    int y;
+    int w;
+    int h;
+    struct _CacheLink *next;
+} CacheLink, *CacheLinkPtr;
+
+static void
+TransferList(CacheLinkPtr list, XAACacheInfoPtr array, int num)
+{
+    while (num--) {
+        array->x = list->x;
+        array->y = list->y;
+        array->w = list->w;
+        array->h = list->h;
+        array->serialNumber = 0;
+        array->fg = array->bg = -1;
+        list = list->next;
+        array++;
+    }
+}
+
+static CacheLinkPtr
+Enlist(CacheLinkPtr link, int x, int y, int w, int h)
+{
+    CacheLinkPtr newLink;
+
+    newLink = malloc(sizeof(CacheLink));
+    newLink->next = link;
+    newLink->x = x;
+    newLink->y = y;
+    newLink->w = w;
+    newLink->h = h;
+    return newLink;
+}
+
+static CacheLinkPtr
+Delist(CacheLinkPtr link)
+{
+    CacheLinkPtr ret = NULL;
+
+    if (link) {
+        ret = link->next;
+        free(link);
+    }
+    return ret;
+}
+
+static void
+FreeList(CacheLinkPtr link)
+{
+    CacheLinkPtr tmp;
+
+    while (link) {
+        tmp = link;
+        link = link->next;
+        free(tmp);
+    }
+}
+
+static CacheLinkPtr
+QuadLinks(CacheLinkPtr big, CacheLinkPtr little)
+{
+    /* CAUTION: This doesn't free big */
+    int w1, w2, h1, h2;
+
+    while (big) {
+        w1 = big->w >> 1;
+        w2 = big->w - w1;
+        h1 = big->h >> 1;
+        h2 = big->h - h1;
+
+        little = Enlist(little, big->x, big->y, w1, h1);
+        little = Enlist(little, big->x + w1, big->y, w2, h1);
+        little = Enlist(little, big->x, big->y + h1, w1, h2);
+        little = Enlist(little, big->x + w1, big->y + h1, w2, h2);
+
+        big = big->next;
+    }
+    return little;
+}
+
+static void
+SubdivideList(CacheLinkPtr * large, CacheLinkPtr * small)
+{
+    CacheLinkPtr big = *large;
+    CacheLinkPtr little = *small;
+    int size = big->w >> 1;
+
+    little = Enlist(little, big->x, big->y, size, size);
+    little = Enlist(little, big->x + size, big->y, size, size);
+    little = Enlist(little, big->x, big->y + size, size, size);
+    little = Enlist(little, big->x + size, big->y + size, size, size);
+    *small = little;
+    big = Delist(big);
+    *large = big;
+}
+
+static void
+FreePixmapCachePrivate(XAAPixmapCachePrivatePtr pPriv)
+{
+    if (!pPriv)
+        return;
+
+    free(pPriv->Info512);
+    free(pPriv->Info256);
+    free(pPriv->Info128);
+    free(pPriv->InfoColor);
+    free(pPriv->InfoMono);
+    free(pPriv->InfoPartial);
+
+    free(pPriv);
+}
+
+void
+XAAClosePixmapCache(ScreenPtr pScreen)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+
+    if (infoRec->PixmapCachePrivate)
+        FreePixmapCachePrivate((XAAPixmapCachePrivatePtr) infoRec->
+                               PixmapCachePrivate);
+
+    infoRec->PixmapCachePrivate = NULL;
+}
+
+static CacheLinkPtr
+ThinOutPartials(CacheLinkPtr ListPartial, int *num, int *maxw, int *maxh)
+{
+/* This guy's job is to get at least 4 big slots out of a list of fragments */
+
+    CacheLinkPtr List64, List32, List16, List8, pCur, next, ListKeepers;
+    int Num64, Num32, Num16, Num8, NumKeepers;
+    int w, h;
+
+    List64 = List32 = List16 = List8 = ListKeepers = NULL;
+    Num64 = Num32 = Num16 = Num8 = NumKeepers = 0;
+    w = h = 0;
+
+    /* We sort partials by how large a square tile they can cache.
+       If a partial can't store a 64x64, 32x32, 16x16 or 8x8 tile,
+       we free it.  */
+
+    pCur = ListPartial;
+    while (pCur) {
+        next = pCur->next;
+        if ((pCur->w >= 64) && (pCur->h >= 64)) {
+            pCur->next = List64;
+            List64 = pCur;
+            Num64++;
+        }
+        else if ((pCur->w >= 32) && (pCur->h >= 32)) {
+            pCur->next = List32;
+            List32 = pCur;
+            Num32++;
+        }
+        else if ((pCur->w >= 16) && (pCur->h >= 16)) {
+            pCur->next = List16;
+            List16 = pCur;
+            Num16++;
+        }
+        else if ((pCur->w >= 8) && (pCur->h >= 8)) {
+            pCur->next = List8;
+            List8 = pCur;
+            Num8++;
+        }
+        else {
+            free(pCur);
+        }
+
+        pCur = next;
+    }
+
+    /* We save all the tiles from the largest bin that we can get
+       at least 4 of.  If there are too few of a bigger slot, we
+       cut it in fourths to make smaller slots. */
+
+    if (Num64 >= 4) {
+        ListKeepers = List64;
+        List64 = NULL;
+        NumKeepers = Num64;
+        goto GOT_EM;
+    }
+    else if (Num64) {
+        List32 = QuadLinks(List64, List32);
+        Num32 += Num64 * 4;
+        Num64 = 0;
+    }
+
+    if (Num32 >= 4) {
+        ListKeepers = List32;
+        List32 = NULL;
+        NumKeepers = Num32;
+        goto GOT_EM;
+    }
+    else if (Num32) {
+        List16 = QuadLinks(List32, List16);
+        Num16 += Num32 * 4;
+        Num32 = 0;
+    }
+
+    if (Num16 >= 4) {
+        ListKeepers = List16;
+        List16 = NULL;
+        NumKeepers = Num16;
+        goto GOT_EM;
+    }
+    else if (Num16) {
+        List8 = QuadLinks(List16, List8);
+        Num8 += Num16 * 4;
+        Num16 = 0;
+    }
+
+    if (Num8 >= 4) {
+        ListKeepers = List8;
+        List8 = NULL;
+        NumKeepers = Num8;
+        goto GOT_EM;
+    }
+
+ GOT_EM:
+
+    /* Free the ones we aren't using */
+
+    if (List64)
+        FreeList(List64);
+    if (List32)
+        FreeList(List32);
+    if (List16)
+        FreeList(List16);
+    if (List8)
+        FreeList(List8);
+
+    /* Enlarge the slots if we can */
+
+    if (ListKeepers) {
+        CacheLinkPtr pLink = ListKeepers;
+
+        w = h = 128;
+
+        while (pLink) {
+            if (pLink->w < w)
+                w = pLink->w;
+            if (pLink->h < h)
+                h = pLink->h;
+            pLink = pLink->next;
+        }
+    }
+
+    *maxw = w;
+    *maxh = h;
+    *num = NumKeepers;
+    return ListKeepers;
+}
+
+static void
+ConvertColorToMono(CacheLinkPtr * ColorList,
+                   int ColorW, int ColorH,
+                   CacheLinkPtr * MonoList, int MonoW, int MonoH)
+{
+    int x, y, w;
+
+    x = (*ColorList)->x;
+    y = (*ColorList)->y;
+    *ColorList = Delist(*ColorList);
+
+    while (ColorH) {
+        ColorH -= MonoH;
+        for (w = 0; w <= (ColorW - MonoW); w += MonoW)
+            *MonoList = Enlist(*MonoList, x + w, y + ColorH, MonoW, MonoH);
+    }
+}
+
+static void
+ConvertAllPartialsTo8x8(int *NumMono, int *NumColor,
+                        CacheLinkPtr ListPartial,
+                        CacheLinkPtr * ListMono,
+                        CacheLinkPtr * ListColor, XAAInfoRecPtr infoRec)
+{
+/* This guy extracts as many 8x8 slots as it can out of fragments */
+
+    int ColorH = infoRec->CacheHeightColor8x8Pattern;
+    int ColorW = infoRec->CacheWidthColor8x8Pattern;
+    int MonoH = infoRec->CacheHeightMono8x8Pattern;
+    int MonoW = infoRec->CacheWidthMono8x8Pattern;
+    int x, y, w, Height, Width;
+    Bool DoColor = (infoRec->PixmapCacheFlags & CACHE_COLOR_8x8);
+    Bool DoMono = (infoRec->PixmapCacheFlags & CACHE_MONO_8x8);
+    CacheLinkPtr pLink = ListPartial;
+    CacheLinkPtr MonoList = *ListMono, ColorList = *ListColor;
+
+    if (DoColor && DoMono) {
+        /* we assume color patterns take more space than color ones */
+        if (MonoH > ColorH)
+            ColorH = MonoH;
+        if (MonoW > ColorW)
+            ColorW = MonoW;
+    }
+
+    /* Break up the area into as many Color and Mono slots as we can */
+
+    while (pLink) {
+        Height = pLink->h;
+        Width = pLink->w;
+        x = pLink->x;
+        y = pLink->y;
+
+        if (DoColor) {
+            while (Height >= ColorH) {
+                Height -= ColorH;
+                for (w = 0; w <= (Width - ColorW); w += ColorW) {
+                    ColorList =
+                        Enlist(ColorList, x + w, y + Height, ColorW, ColorH);
+                    (*NumColor)++;
+                }
+            }
+        }
+
+        if (DoMono && (Height >= MonoH)) {
+            while (Height >= MonoH) {
+                Height -= MonoH;
+                for (w = 0; w <= (Width - MonoW); w += MonoW) {
+                    MonoList =
+                        Enlist(MonoList, x + w, y + Height, MonoW, MonoH);
+                    (*NumMono)++;
+                }
+            }
+        }
+
+        pLink = pLink->next;
+    }
+
+    *ListMono = MonoList;
+    *ListColor = ColorList;
+    FreeList(ListPartial);
+}
+
+static CacheLinkPtr
+ExtractOneThatFits(CacheLinkPtr * initList, int w, int h)
+{
+    CacheLinkPtr list = *initList;
+    CacheLinkPtr prev = NULL;
+
+    while (list) {
+        if ((list->w >= w) && (list->h >= h))
+            break;
+        prev = list;
+        list = list->next;
+    }
+
+    if (list) {
+        if (prev)
+            prev->next = list->next;
+        else
+            *initList = list->next;
+
+        list->next = NULL;
+    }
+
+    return list;
+}
+
+static CacheLinkPtr
+ConvertSomePartialsTo8x8(int *NumMono, int *NumColor, int *NumPartial,
+                         CacheLinkPtr ListPartial,
+                         CacheLinkPtr * ListMono,
+                         CacheLinkPtr * ListColor,
+                         int *maxw, int *maxh, XAAInfoRecPtr infoRec)
+{
+/* This guy tries to get 4 of each type of 8x8 slot requested out of
+   a list of fragments all while trying to retain some big fragments
+   for the cache blits */
+
+    int ColorH = infoRec->CacheHeightColor8x8Pattern;
+    int ColorW = infoRec->CacheWidthColor8x8Pattern;
+    int MonoH = infoRec->CacheHeightMono8x8Pattern;
+    int MonoW = infoRec->CacheWidthMono8x8Pattern;
+    Bool DoColor = (infoRec->PixmapCacheFlags & CACHE_COLOR_8x8);
+    Bool DoMono = (infoRec->PixmapCacheFlags & CACHE_MONO_8x8);
+    CacheLinkPtr List64, List32, List16, List8, pCur, next, ListKeepers;
+    CacheLinkPtr MonoList = *ListMono, ColorList = *ListColor;
+    int Num64, Num32, Num16, Num8, NumKeepers;
+    int w, h, Width, Height;
+    int MonosPerColor = 1;
+
+    if (DoColor && DoMono) {
+        /* we assume color patterns take more space than color ones */
+        if (MonoH > ColorH)
+            ColorH = MonoH;
+        if (MonoW > ColorW)
+            ColorW = MonoW;
+        MonosPerColor = (ColorH / MonoH) * (ColorW / MonoW);
+    }
+
+    List64 = List32 = List16 = List8 = ListKeepers = MonoList = ColorList =
+        NULL;
+    Num64 = Num32 = Num16 = Num8 = NumKeepers = 0;
+    Width = Height = 0;
+
+    /* We sort partials by how large a square tile they can cache.
+       We make 8x8 patterns from the leftovers if we can. */
+
+    pCur = ListPartial;
+    while (pCur) {
+        next = pCur->next;
+        if ((pCur->w >= 64) && (pCur->h >= 64)) {
+            pCur->next = List64;
+            List64 = pCur;
+            Num64++;
+        }
+        else if ((pCur->w >= 32) && (pCur->h >= 32)) {
+            pCur->next = List32;
+            List32 = pCur;
+            Num32++;
+        }
+        else if ((pCur->w >= 16) && (pCur->h >= 16)) {
+            pCur->next = List16;
+            List16 = pCur;
+            Num16++;
+        }
+        else if ((pCur->w >= 8) && (pCur->h >= 8)) {
+            pCur->next = List8;
+            List8 = pCur;
+            Num8++;
+        }
+        else {
+            h = pCur->h;
+            if (DoColor && (pCur->w >= ColorW) && (h >= ColorH)) {
+                while (h >= ColorH) {
+                    h -= ColorH;
+                    for (w = 0; w <= (pCur->w - ColorW); w += ColorW) {
+                        ColorList = Enlist(ColorList,
+                                           pCur->x + w, pCur->y + h, ColorW,
+                                           ColorH);
+                        (*NumColor)++;
+                    }
+                }
+            }
+            if (DoMono && (pCur->w >= MonoW) && (h >= MonoH)) {
+                while (h >= MonoH) {
+                    h -= MonoH;
+                    for (w = 0; w <= (pCur->w - MonoW); w += MonoW) {
+                        MonoList = Enlist(MonoList,
+                                          pCur->x + w, pCur->y + h, MonoW,
+                                          MonoH);
+                        (*NumMono)++;
+                    }
+                }
+            }
+            free(pCur);
+        }
+
+        pCur = next;
+    }
+
+    /* Try to extract at least 4 of each type of 8x8 slot that we need */
+
+    if (DoColor) {
+        CacheLinkPtr theOne;
+
+        while (*NumColor < 4) {
+            theOne = NULL;
+            if (Num8) {
+                if ((theOne = ExtractOneThatFits(&List8, ColorW, ColorH)))
+                    Num8--;
+            }
+            if (Num16 && !theOne) {
+                if ((theOne = ExtractOneThatFits(&List16, ColorW, ColorH)))
+                    Num16--;
+            }
+            if (Num32 && !theOne) {
+                if ((theOne = ExtractOneThatFits(&List32, ColorW, ColorH)))
+                    Num32--;
+            }
+            if (Num64 && !theOne) {
+                if ((theOne = ExtractOneThatFits(&List64, ColorW, ColorH)))
+                    Num64--;
+            }
+
+            if (!theOne)
+                break;
+
+            ConvertAllPartialsTo8x8(NumMono, NumColor, theOne,
+                                    &MonoList, &ColorList, infoRec);
+
+            if (DoMono) {
+                while (*NumColor && (*NumMono < 4)) {
+                    ConvertColorToMono(&ColorList, ColorW, ColorH,
+                                       &MonoList, MonoW, MonoH);
+                    (*NumColor)--;
+                    *NumMono += MonosPerColor;
+                }
+            }
+        }
+    }
+
+    if (DoMono) {
+        CacheLinkPtr theOne;
+
+        while (*NumMono < 4) {
+            theOne = NULL;
+            if (Num8) {
+                if ((theOne = ExtractOneThatFits(&List8, MonoW, MonoH)))
+                    Num8--;
+            }
+            if (Num16 && !theOne) {
+                if ((theOne = ExtractOneThatFits(&List16, MonoW, MonoH)))
+                    Num16--;
+            }
+            if (Num32 && !theOne) {
+                if ((theOne = ExtractOneThatFits(&List32, MonoW, MonoH)))
+                    Num32--;
+            }
+            if (Num64 && !theOne) {
+                if ((theOne = ExtractOneThatFits(&List64, MonoW, MonoH)))
+                    Num64--;
+            }
+
+            if (!theOne)
+                break;
+
+            ConvertAllPartialsTo8x8(NumMono, NumColor, theOne,
+                                    &MonoList, &ColorList, infoRec);
+        }
+    }
+
+    /* We save all the tiles from the largest bin that we can get
+       at least 4 of.  If there are too few of a bigger slot, we
+       cut it in fourths to make smaller slots. */
+
+    if (Num64 >= 4) {
+        ListKeepers = List64;
+        List64 = NULL;
+        NumKeepers = Num64;
+        goto GOT_EM;
+    }
+    else if (Num64) {
+        List32 = QuadLinks(List64, List32);
+        Num32 += Num64 * 4;
+        Num64 = 0;
+    }
+
+    if (Num32 >= 4) {
+        ListKeepers = List32;
+        List32 = NULL;
+        NumKeepers = Num32;
+        goto GOT_EM;
+    }
+    else if (Num32) {
+        List16 = QuadLinks(List32, List16);
+        Num16 += Num32 * 4;
+        Num32 = 0;
+    }
+
+    if (Num16 >= 4) {
+        ListKeepers = List16;
+        List16 = NULL;
+        NumKeepers = Num16;
+        goto GOT_EM;
+    }
+    else if (Num16) {
+        List8 = QuadLinks(List16, List8);
+        Num8 += Num16 * 4;
+        Num16 = 0;
+    }
+
+    if (Num8 >= 4) {
+        ListKeepers = List8;
+        List8 = NULL;
+        NumKeepers = Num8;
+        goto GOT_EM;
+    }
+
+ GOT_EM:
+
+    /* Free the ones we aren't using */
+
+    if (List64)
+        ConvertAllPartialsTo8x8(NumMono, NumColor, List64,
+                                &MonoList, &ColorList, infoRec);
+    if (List32)
+        ConvertAllPartialsTo8x8(NumMono, NumColor, List32,
+                                &MonoList, &ColorList, infoRec);
+    if (List16)
+        ConvertAllPartialsTo8x8(NumMono, NumColor, List16,
+                                &MonoList, &ColorList, infoRec);
+    if (List8)
+        ConvertAllPartialsTo8x8(NumMono, NumColor, List8,
+                                &MonoList, &ColorList, infoRec);
+
+    /* Enlarge the slots if we can */
+
+    if (ListKeepers) {
+        CacheLinkPtr pLink = ListKeepers;
+
+        Width = Height = 128;
+
+        while (pLink) {
+            if (pLink->w < Width)
+                Width = pLink->w;
+            if (pLink->h < Height)
+                Height = pLink->h;
+            pLink = pLink->next;
+        }
+    }
+
+    *ListMono = MonoList;
+    *ListColor = ColorList;
+    *maxw = Width;
+    *maxh = Height;
+    *NumPartial = NumKeepers;
+    return ListKeepers;
+}
+
+void
+XAAInitPixmapCache(ScreenPtr pScreen, RegionPtr areas, pointer data)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    XAAInfoRecPtr infoRec = (XAAInfoRecPtr) data;
+    XAAPixmapCachePrivatePtr pCachePriv;
+    BoxPtr pBox = RegionRects(areas);
+    int nBox = RegionNumRects(areas);
+    int Num512, Num256, Num128, NumPartial, NumColor, NumMono;
+    int Target512, Target256;
+    CacheLinkPtr List512, List256, List128, ListPartial, ListColor, ListMono;
+    int x, y, w, h, ntotal, granularity, width, height, i;
+    int MaxPartialWidth, MaxPartialHeight;
+
+    infoRec->MaxCacheableTileWidth = 0;
+    infoRec->MaxCacheableTileHeight = 0;
+    infoRec->MaxCacheableStippleHeight = 0;
+    infoRec->MaxCacheableStippleWidth = 0;
+    infoRec->UsingPixmapCache = FALSE;
+
+    if (!nBox || !pBox || !(infoRec->Flags & PIXMAP_CACHE))
+        return;
+
+    /* Allocate a persistent per-screen init flag to control messages */
+    if (CacheInitIndex < 0)
+        CacheInitIndex = xf86AllocateScrnInfoPrivateIndex();
+
+    /* free the old private data if it exists */
+    if (infoRec->PixmapCachePrivate) {
+        FreePixmapCachePrivate((XAAPixmapCachePrivatePtr) infoRec->
+                               PixmapCachePrivate);
+        infoRec->PixmapCachePrivate = NULL;
+    }
+
+    Num512 = Num256 = Num128 = NumPartial = NumMono = NumColor = 0;
+    List512 = List256 = List128 = ListPartial = ListMono = ListColor = NULL;
+    granularity = infoRec->CachePixelGranularity;
+    if (granularity <= 1)
+        granularity = 0;
+
+    /* go through the boxes and break it into as many pieces as we can fit */
+
+    while (nBox--) {
+        x = pBox->x1;
+        if (granularity) {
+            int tmp = x % granularity;
+
+            if (tmp)
+                x += (granularity - tmp);
+        }
+        width = pBox->x2 - x;
+        if (width <= 0) {
+            pBox++;
+            continue;
+        }
+
+        y = pBox->y1;
+        height = pBox->y2 - y;
+
+        for (h = 0; h <= (height - 512); h += 512) {
+            for (w = 0; w <= (width - 512); w += 512) {
+                List512 = Enlist(List512, x + w, y + h, 512, 512);
+                Num512++;
+            }
+            for (; w <= (width - 256); w += 256) {
+                List256 = Enlist(List256, x + w, y + h, 256, 256);
+                List256 = Enlist(List256, x + w, y + h + 256, 256, 256);
+                Num256 += 2;
+            }
+            for (; w <= (width - 128); w += 128) {
+                List128 = Enlist(List128, x + w, y + h, 128, 128);
+                List128 = Enlist(List128, x + w, y + h + 128, 128, 128);
+                List128 = Enlist(List128, x + w, y + h + 256, 128, 128);
+                List128 = Enlist(List128, x + w, y + h + 384, 128, 128);
+                Num128 += 4;
+            }
+            if (w < width) {
+                int d = width - w;
+
+                ListPartial = Enlist(ListPartial, x + w, y + h, d, 128);
+                ListPartial = Enlist(ListPartial, x + w, y + h + 128, d, 128);
+                ListPartial = Enlist(ListPartial, x + w, y + h + 256, d, 128);
+                ListPartial = Enlist(ListPartial, x + w, y + h + 384, d, 128);
+                NumPartial += 4;
+            }
+        }
+        for (; h <= (height - 256); h += 256) {
+            for (w = 0; w <= (width - 256); w += 256) {
+                List256 = Enlist(List256, x + w, y + h, 256, 256);
+                Num256++;
+            }
+            for (; w <= (width - 128); w += 128) {
+                List128 = Enlist(List128, x + w, y + h, 128, 128);
+                List128 = Enlist(List128, x + w, y + h + 128, 128, 128);
+                Num128 += 2;
+            }
+            if (w < width) {
+                int d = width - w;
+
+                ListPartial = Enlist(ListPartial, x + w, y + h, d, 128);
+                ListPartial = Enlist(ListPartial, x + w, y + h + 128, d, 128);
+                NumPartial += 2;
+            }
+        }
+        for (; h <= (height - 128); h += 128) {
+            for (w = 0; w <= (width - 128); w += 128) {
+                List128 = Enlist(List128, x + w, y + h, 128, 128);
+                Num128++;
+            }
+            if (w < width) {
+                ListPartial = Enlist(ListPartial, x + w, y + h, width - w, 128);
+                NumPartial++;
+            }
+        }
+        if (h < height) {
+            int d = height - h;
+
+            for (w = 0; w <= (width - 128); w += 128) {
+                ListPartial = Enlist(ListPartial, x + w, y + h, 128, d);
+                NumPartial++;
+            }
+            if (w < width) {
+                ListPartial = Enlist(ListPartial, x + w, y + h, width - w, d);
+                NumPartial++;
+            }
+        }
+        pBox++;
+    }
+
+/* 
+   by this point we've carved the space into as many 512x512, 256x256
+	and 128x128 blocks as we could fit.  We will then break larger
+	blocks into smaller ones if we need to.  The rules are as follows:
+
+     512x512 -
+	1) Don't take up more than half the memory.
+	2) Don't bother if you can't get at least four.
+	3) Don't make more than MAX_512.
+	4) Don't have any of there are no 256x256s.
+
+     256x256 -
+	1) Don't take up more than a quarter of the memory enless there
+		aren't any 512x512s.  Then we can take up to half.
+	2) Don't bother if you can't get at least four.
+	3) Don't make more than MAX_256.
+
+     128x128 -
+	1) Don't make more than MAX_128.
+
+     We don't bother with the partial blocks unless we can use them
+     for 8x8 pattern fills or we are short on larger blocks.
+
+*/
+
+    ntotal = Num128 + (Num256 << 2) + (Num512 << 4);
+
+    Target512 = ntotal >> 5;
+    if (Target512 < 4)
+        Target512 = 0;
+    if (!Target512)
+        Target256 = ntotal >> 3;
+    else
+        Target256 = ntotal >> 4;
+    if (Target256 < 4)
+        Target256 = 0;
+
+    if (Num512 && Num256 < 4) {
+        while (Num512 && Num256 < Target256) {
+            SubdivideList(&List512, &List256);
+            Num256 += 4;
+            Num512--;
+        }
+    }
+
+    if (!Num512) {              /* no room */
+    }
+    else if ((Num512 < 4) || (!Target512)) {
+        while (Num512) {
+            SubdivideList(&List512, &List256);
+            Num256 += 4;
+            Num512--;
+        }
+    }
+    else if ((Num512 > MAX_512) || (Num512 > Target512)) {
+        while (Num512 > MAX_512) {
+            SubdivideList(&List512, &List256);
+            Num256 += 4;
+            Num512--;
+        }
+        while (Num512 > Target512) {
+            if (Num256 < MAX_256) {
+                SubdivideList(&List512, &List256);
+                Num256 += 4;
+                Num512--;
+            }
+            else
+                break;
+        }
+    }
+
+    if (!Num256) {              /* no room */
+    }
+    else if ((Num256 < 4) || (!Target256)) {
+        while (Num256) {
+            SubdivideList(&List256, &List128);
+            Num128 += 4;
+            Num256--;
+        }
+    }
+    else if ((Num256 > MAX_256) || (Num256 > Target256)) {
+        while (Num256 > MAX_256) {
+            SubdivideList(&List256, &List128);
+            Num128 += 4;
+            Num256--;
+        }
+        while (Num256 > Target256) {
+            if (Num128 < MAX_128) {
+                SubdivideList(&List256, &List128);
+                Num128 += 4;
+                Num256--;
+            }
+            else
+                break;
+        }
+    }
+
+    if (Num128 && ((Num128 < 4) || (Num128 > MAX_128))) {
+        CacheLinkPtr next;
+        int max = (Num128 > MAX_128) ? MAX_128 : 0;
+
+        /*
+         * Note: next is set in this way to work around a code generation
+         * bug in gcc 2.7.2.3.
+         */
+        next = List128->next;
+        while (Num128 > max) {
+            List128->next = ListPartial;
+            ListPartial = List128;
+            if ((List128 = next))
+                next = List128->next;
+            NumPartial++;
+            Num128--;
+        }
+    }
+
+    MaxPartialHeight = MaxPartialWidth = 0;
+
+    /* at this point we have as many 512x512 and 256x256 slots as we
+       want but may have an excess of 128x128 slots.  We still need
+       to find out if we need 8x8 slots.  We take these from the
+       partials if we have them.  Otherwise, we break some 128x128's */
+
+    if (!(infoRec->PixmapCacheFlags & (CACHE_MONO_8x8 | CACHE_COLOR_8x8))) {
+        if (NumPartial) {
+            if (Num128) {       /* don't bother with partials */
+                FreeList(ListPartial);
+                NumPartial = 0;
+                ListPartial = NULL;
+            }
+            else {
+                /* We have no big slots.  Weed out the unusable partials */
+                ListPartial = ThinOutPartials(ListPartial, &NumPartial,
+                                              &MaxPartialWidth,
+                                              &MaxPartialHeight);
+            }
+        }
+    }
+    else {
+        int MonosPerColor = 1;
+        int ColorH = infoRec->CacheHeightColor8x8Pattern;
+        int ColorW = infoRec->CacheWidthColor8x8Pattern;
+        int MonoH = infoRec->CacheHeightMono8x8Pattern;
+        int MonoW = infoRec->CacheWidthMono8x8Pattern;
+        Bool DoColor = (infoRec->PixmapCacheFlags & CACHE_COLOR_8x8);
+        Bool DoMono = (infoRec->PixmapCacheFlags & CACHE_MONO_8x8);
+
+        if (DoColor)
+            infoRec->CanDoColor8x8 = FALSE;
+        if (DoMono)
+            infoRec->CanDoMono8x8 = FALSE;
+
+        if (DoColor && DoMono) {
+            /* we assume color patterns take more space than color ones */
+            if (MonoH > ColorH)
+                ColorH = MonoH;
+            if (MonoW > ColorW)
+                ColorW = MonoW;
+            MonosPerColor = (ColorH / MonoH) * (ColorW / MonoW);
+        }
+
+        if (Num128) {
+            if (NumPartial) {   /* use all for 8x8 slots */
+                ConvertAllPartialsTo8x8(&NumMono, &NumColor,
+                                        ListPartial, &ListMono, &ListColor,
+                                        infoRec);
+                NumPartial = 0;
+                ListPartial = NULL;
+            }
+
+            /* Get some 8x8 slots from the 128 slots */
+            while ((Num128 > 4) &&
+                   ((NumMono < MAX_MONO) && (NumColor < MAX_COLOR))) {
+                CacheLinkPtr tmp = NULL;
+
+                tmp = Enlist(tmp, List128->x, List128->y,
+                             List128->w, List128->h);
+                List128 = Delist(List128);
+                Num128--;
+
+                ConvertAllPartialsTo8x8(&NumMono, &NumColor,
+                                        tmp, &ListMono, &ListColor, infoRec);
+            }
+        }
+        else if (NumPartial) {
+            /* We have share partials between 8x8 slots and tiles. */
+            ListPartial = ConvertSomePartialsTo8x8(&NumMono, &NumColor,
+                                                   &NumPartial, ListPartial,
+                                                   &ListMono, &ListColor,
+                                                   &MaxPartialWidth,
+                                                   &MaxPartialHeight, infoRec);
+        }
+
+        if (DoMono && DoColor) {
+            if (NumColor && ((NumColor > MAX_COLOR) || (NumColor < 4))) {
+                int max = (NumColor > MAX_COLOR) ? MAX_COLOR : 0;
+
+                while (NumColor > max) {
+                    ConvertColorToMono(&ListColor, ColorW, ColorH,
+                                       &ListMono, MonoW, MonoH);
+                    NumColor--;
+                    NumMono += MonosPerColor;
+                }
+            }
+
+            /* favor Mono slots over Color ones */
+            while ((NumColor > 4) && (NumMono < MAX_MONO)) {
+                ConvertColorToMono(&ListColor, ColorW, ColorH,
+                                   &ListMono, MonoW, MonoH);
+                NumColor--;
+                NumMono += MonosPerColor;
+            }
+        }
+
+        if (NumMono && ((NumMono > MAX_MONO) || (NumMono < 4))) {
+            int max = (NumMono > MAX_MONO) ? MAX_MONO : 0;
+
+            while (NumMono > max) {
+                ListMono = Delist(ListMono);
+                NumMono--;
+            }
+        }
+        if (NumColor && ((NumColor > MAX_COLOR) || (NumColor < 4))) {
+            int max = (NumColor > MAX_COLOR) ? MAX_COLOR : 0;
+
+            while (NumColor > max) {
+                ListColor = Delist(ListColor);
+                NumColor--;
+            }
+        }
+    }
+
+    pCachePriv = calloc(1, sizeof(XAAPixmapCachePrivate));
+    if (!pCachePriv) {
+        if (Num512)
+            FreeList(List512);
+        if (Num256)
+            FreeList(List256);
+        if (Num128)
+            FreeList(List128);
+        if (NumPartial)
+            FreeList(ListPartial);
+        if (NumColor)
+            FreeList(ListColor);
+        if (NumMono)
+            FreeList(ListMono);
+        return;
+    }
+
+    infoRec->PixmapCachePrivate = (char *) pCachePriv;
+
+    if (Num512) {
+        pCachePriv->Info512 = calloc(Num512, sizeof(XAACacheInfoRec));
+        if (!pCachePriv->Info512)
+            Num512 = 0;
+        if (Num512)
+            TransferList(List512, pCachePriv->Info512, Num512);
+        FreeList(List512);
+        pCachePriv->Num512x512 = Num512;
+    }
+    if (Num256) {
+        pCachePriv->Info256 = calloc(Num256, sizeof(XAACacheInfoRec));
+        if (!pCachePriv->Info256)
+            Num256 = 0;
+        if (Num256)
+            TransferList(List256, pCachePriv->Info256, Num256);
+        FreeList(List256);
+        pCachePriv->Num256x256 = Num256;
+    }
+    if (Num128) {
+        pCachePriv->Info128 = calloc(Num128, sizeof(XAACacheInfoRec));
+        if (!pCachePriv->Info128)
+            Num128 = 0;
+        if (Num128)
+            TransferList(List128, pCachePriv->Info128, Num128);
+        FreeList(List128);
+        pCachePriv->Num128x128 = Num128;
+    }
+
+    if (NumPartial) {
+        pCachePriv->InfoPartial = calloc(NumPartial, sizeof(XAACacheInfoRec));
+        if (!pCachePriv->InfoPartial)
+            NumPartial = 0;
+        if (NumPartial)
+            TransferList(ListPartial, pCachePriv->InfoPartial, NumPartial);
+        FreeList(ListPartial);
+        pCachePriv->NumPartial = NumPartial;
+    }
+
+    if (NumColor) {
+        pCachePriv->InfoColor = calloc(NumColor, sizeof(XAACacheInfoRec));
+        if (!pCachePriv->InfoColor)
+            NumColor = 0;
+        if (NumColor)
+            TransferList(ListColor, pCachePriv->InfoColor, NumColor);
+        FreeList(ListColor);
+        pCachePriv->NumColor = NumColor;
+    }
+
+    if (NumMono) {
+        pCachePriv->InfoMono = calloc(NumMono, sizeof(XAACacheInfoRec));
+        if (!pCachePriv->InfoMono)
+            NumMono = 0;
+        if (NumMono)
+            TransferList(ListMono, pCachePriv->InfoMono, NumMono);
+        FreeList(ListMono);
+        pCachePriv->NumMono = NumMono;
+    }
+
+    if (NumPartial) {
+        infoRec->MaxCacheableTileWidth = MaxPartialWidth;
+        infoRec->MaxCacheableTileHeight = MaxPartialHeight;
+    }
+    if (Num128)
+        infoRec->MaxCacheableTileWidth = infoRec->MaxCacheableTileHeight = 128;
+    if (Num256)
+        infoRec->MaxCacheableTileWidth = infoRec->MaxCacheableTileHeight = 256;
+    if (Num512)
+        infoRec->MaxCacheableTileWidth = infoRec->MaxCacheableTileHeight = 512;
+
+    infoRec->MaxCacheableStippleHeight = infoRec->MaxCacheableTileHeight;
+    infoRec->MaxCacheableStippleWidth =
+        infoRec->MaxCacheableTileWidth * pScrn->bitsPerPixel;
+    if (infoRec->ScreenToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP)
+        infoRec->MaxCacheableStippleWidth /= 3;
+
+    if (NumMono) {
+        if (!(infoRec->Mono8x8PatternFillFlags &
+              (HARDWARE_PATTERN_PROGRAMMED_ORIGIN |
+               HARDWARE_PATTERN_PROGRAMMED_BITS))) {
+            int numPerLine =
+                infoRec->CacheWidthMono8x8Pattern / infoRec->MonoPatternPitch;
+
+            for (i = 0; i < 64; i++) {
+                pCachePriv->MonoOffsets[i].y = i / numPerLine;
+                pCachePriv->MonoOffsets[i].x = (i % numPerLine) *
+                    infoRec->MonoPatternPitch;
+            }
+        }
+        infoRec->CanDoMono8x8 = TRUE;
+    }
+    if (NumColor) {
+        if (!(infoRec->Color8x8PatternFillFlags &
+              HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+
+            for (i = 0; i < 64; i++) {
+                pCachePriv->ColorOffsets[i].y = i & 0x07;
+                pCachePriv->ColorOffsets[i].x = i & ~0x07;
+            }
+        }
+        infoRec->CanDoColor8x8 = TRUE;
+    }
+
+    if (!CACHEINIT(pScrn)) {
+        xf86ErrorF("\tSetting up tile and stipple cache:\n");
+        if (NumPartial)
+            xf86ErrorF("\t\t%i %ix%i slots\n",
+                       NumPartial, MaxPartialWidth, MaxPartialHeight);
+        if (Num128)
+            xf86ErrorF("\t\t%i 128x128 slots\n", Num128);
+        if (Num256)
+            xf86ErrorF("\t\t%i 256x256 slots\n", Num256);
+        if (Num512)
+            xf86ErrorF("\t\t%i 512x512 slots\n", Num512);
+        if (NumColor)
+            xf86ErrorF("\t\t%i 8x8 color pattern slots\n", NumColor);
+        if (NumMono)
+            xf86ErrorF("\t\t%i 8x8 color expansion slots\n", NumMono);
+    }
+
+    if (!(NumPartial | Num128 | Num256 | Num512 | NumColor | NumMono)) {
+        if (!CACHEINIT(pScrn))
+            xf86ErrorF("\t\tNot enough video memory for pixmap cache\n");
+    }
+    else
+        infoRec->UsingPixmapCache = TRUE;
+
+    CACHEINIT(pScrn) = 1;
+}
+
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+static CARD32 StippleMasks[4] = {
+    0x80808080,
+    0xC0C0C0C0,
+    0x00000000,
+    0xF0F0F0F0
+};
+#else
+static CARD32 StippleMasks[4] = {
+    0x01010101,
+    0x03030303,
+    0x00000000,
+    0x0F0F0F0F
+};
+#endif
+
+Bool
+XAACheckStippleReducibility(PixmapPtr pPixmap)
+{
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap);
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_DRAWABLE(&pPixmap->drawable);
+    CARD32 *IntPtr = (CARD32 *) pPixmap->devPrivate.ptr;
+    int w = pPixmap->drawable.width;
+    int h = pPixmap->drawable.height;
+    int i;
+    CARD32 bits[8];
+    CARD32 mask = SHIFT_R(0xFFFFFFFF, 24);
+
+    pPriv->flags |= REDUCIBILITY_CHECKED | REDUCIBLE_TO_2_COLOR;
+    pPriv->flags &= ~REDUCIBLE_TO_8x8;
+
+    if ((w > 32) || (h > 32) || (w & (w - 1)) || (h & (h - 1)))
+        return FALSE;
+
+    i = (h > 8) ? 8 : h;
+
+    switch (w) {
+    case 32:
+        while (i--) {
+            bits[i] = IntPtr[i] & mask;
+            if ((bits[i] != SHIFT_R((IntPtr[i] & SHIFT_L(mask, 8)), 8)) ||
+                (bits[i] != SHIFT_R((IntPtr[i] & SHIFT_L(mask, 16)), 16)) ||
+                (bits[i] != SHIFT_R((IntPtr[i] & SHIFT_L(mask, 24)), 24)))
+                return FALSE;
+        }
+        break;
+    case 16:
+        while (i--) {
+            bits[i] = IntPtr[i] & mask;
+            if (bits[i] != ((IntPtr[i] & SHIFT_R(SHIFT_L(mask, 8), 8))))
+                return FALSE;
+        }
+        break;
+    default:
+        while (i--)
+            bits[i] = IntPtr[i] & mask;
+        break;
+    }
+
+    switch (h) {
+    case 32:
+        if ((IntPtr[8] != IntPtr[16]) || (IntPtr[9] != IntPtr[17]) ||
+            (IntPtr[10] != IntPtr[18]) || (IntPtr[11] != IntPtr[19]) ||
+            (IntPtr[12] != IntPtr[20]) || (IntPtr[13] != IntPtr[21]) ||
+            (IntPtr[14] != IntPtr[22]) || (IntPtr[15] != IntPtr[23]) ||
+            (IntPtr[16] != IntPtr[24]) || (IntPtr[17] != IntPtr[25]) ||
+            (IntPtr[18] != IntPtr[26]) || (IntPtr[19] != IntPtr[27]) ||
+            (IntPtr[20] != IntPtr[28]) || (IntPtr[21] != IntPtr[29]) ||
+            (IntPtr[22] != IntPtr[30]) || (IntPtr[23] != IntPtr[31]))
+            return FALSE;
+        /* fall through */
+    case 16:
+        if ((IntPtr[0] != IntPtr[8]) || (IntPtr[1] != IntPtr[9]) ||
+            (IntPtr[2] != IntPtr[10]) || (IntPtr[3] != IntPtr[11]) ||
+            (IntPtr[4] != IntPtr[12]) || (IntPtr[5] != IntPtr[13]) ||
+            (IntPtr[6] != IntPtr[14]) || (IntPtr[7] != IntPtr[15]))
+            return FALSE;
+    case 8:
+        break;
+    case 1:
+        bits[1] = bits[0];
+    case 2:
+        bits[2] = bits[0];
+        bits[3] = bits[1];
+    case 4:
+        bits[4] = bits[0];
+        bits[5] = bits[1];
+        bits[6] = bits[2];
+        bits[7] = bits[3];
+        break;
+    }
+
+    pPriv->flags |= REDUCIBLE_TO_8x8;
+
+    pPriv->pattern0 =
+        bits[0] | SHIFT_L(bits[1], 8) | SHIFT_L(bits[2], 16) | SHIFT_L(bits[3],
+                                                                       24);
+    pPriv->pattern1 =
+        bits[4] | SHIFT_L(bits[5], 8) | SHIFT_L(bits[6], 16) | SHIFT_L(bits[7],
+                                                                       24);
+
+    if (w < 8) {
+        pPriv->pattern0 &= StippleMasks[w - 1];
+        pPriv->pattern1 &= StippleMasks[w - 1];
+
+        switch (w) {
+        case 1:
+            pPriv->pattern0 |= SHIFT_L(pPriv->pattern0, 1);
+            pPriv->pattern1 |= SHIFT_L(pPriv->pattern1, 1);
+        case 2:
+            pPriv->pattern0 |= SHIFT_L(pPriv->pattern0, 2);
+            pPriv->pattern1 |= SHIFT_L(pPriv->pattern1, 2);
+        case 4:
+            pPriv->pattern0 |= SHIFT_L(pPriv->pattern0, 4);
+            pPriv->pattern1 |= SHIFT_L(pPriv->pattern1, 4);
+        }
+    }
+
+    if (infoRec->Mono8x8PatternFillFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {
+        pPriv->pattern0 = SWAP_BITS_IN_BYTES(pPriv->pattern0);
+        pPriv->pattern1 = SWAP_BITS_IN_BYTES(pPriv->pattern1);
+    }
+
+    return TRUE;
+}
+
+Bool
+XAACheckTileReducibility(PixmapPtr pPixmap, Bool checkMono)
+{
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap);
+    CARD32 *IntPtr;
+    int w = pPixmap->drawable.width;
+    int h = pPixmap->drawable.height;
+    int pitch = pPixmap->devKind >> 2;
+    int dwords, i, j;
+
+    pPriv->flags |= REDUCIBILITY_CHECKED;
+    pPriv->flags &= ~(REDUCIBILITY_CHECKED | REDUCIBLE_TO_2_COLOR);
+
+    if ((w > 32) || (h > 32) || (w & (w - 1)) || (h & (h - 1)))
+        return FALSE;
+
+    dwords = ((w * pPixmap->drawable.bitsPerPixel) + 31) >> 5;
+    i = (h > 8) ? 8 : h;
+
+    if (w > 8) {
+        IntPtr = (CARD32 *) pPixmap->devPrivate.ptr;
+        switch (pPixmap->drawable.bitsPerPixel) {
+        case 8:
+            while (i--) {
+                for (j = 2; j < dwords; j++)
+                    if (IntPtr[j] != IntPtr[j & 0x01])
+                        return FALSE;
+                IntPtr += pitch;
+            }
+            break;
+        case 16:
+            while (i--) {
+                for (j = 4; j < dwords; j++)
+                    if (IntPtr[j] != IntPtr[j & 0x03])
+                        return FALSE;
+                IntPtr += pitch;
+            }
+            break;
+        case 24:
+            while (i--) {
+                for (j = 6; j < dwords; j++)
+                    if (IntPtr[j] != IntPtr[j % 6])
+                        return FALSE;
+                IntPtr += pitch;
+            }
+            break;
+        case 32:
+            while (i--) {
+                for (j = 8; j < dwords; j++)
+                    if (IntPtr[j] != IntPtr[j & 0x07])
+                        return FALSE;
+                IntPtr += pitch;
+            }
+            break;
+        default:
+            return FALSE;
+        }
+
+    }
+
+    if (h == 32) {
+        CARD32 *IntPtr2, *IntPtr3, *IntPtr4;
+
+        i = 8;
+        IntPtr = (CARD32 *) pPixmap->devPrivate.ptr;
+        IntPtr2 = IntPtr + (pitch << 3);
+        IntPtr3 = IntPtr2 + (pitch << 3);
+        IntPtr4 = IntPtr3 + (pitch << 3);
+        while (i--) {
+            for (j = 0; j < dwords; j++)
+                if ((IntPtr[j] != IntPtr2[j]) || (IntPtr[j] != IntPtr3[j]) ||
+                    (IntPtr[j] != IntPtr4[j]))
+                    return FALSE;
+            IntPtr += pitch;
+            IntPtr2 += pitch;
+            IntPtr3 += pitch;
+            IntPtr4 += pitch;
+        }
+    }
+    else if (h == 16) {
+        CARD32 *IntPtr2;
+
+        i = 8;
+        IntPtr = (CARD32 *) pPixmap->devPrivate.ptr;
+        IntPtr2 = IntPtr + (pitch << 3);
+        while (i--) {
+            for (j = 0; j < dwords; j++)
+                if (IntPtr[j] != IntPtr2[j])
+                    return FALSE;
+            IntPtr += pitch;
+            IntPtr2 += pitch;
+        }
+    }
+
+    pPriv->flags |= REDUCIBLE_TO_8x8;
+
+    if (checkMono) {
+        XAAInfoRecPtr infoRec =
+            GET_XAAINFORECPTR_FROM_DRAWABLE(&pPixmap->drawable);
+        unsigned char bits[8];
+        int fg, bg = -1, x, y;
+
+        i = (h > 8) ? 8 : h;
+        j = (w > 8) ? 8 : w;
+
+        if (pPixmap->drawable.bitsPerPixel == 8) {
+            unsigned char *srcp = pPixmap->devPrivate.ptr;
+
+            fg = srcp[0];
+            pitch = pPixmap->devKind;
+            for (y = 0; y < i; y++) {
+                bits[y] = 0;
+                for (x = 0; x < j; x++) {
+                    if (srcp[x] != fg) {
+                        if (bg == -1)
+                            bg = srcp[x];
+                        else if (bg != srcp[x])
+                            return TRUE;
+                    }
+                    else
+                        bits[y] |= 1 << x;
+                }
+                srcp += pitch;
+            }
+        }
+        else if (pPixmap->drawable.bitsPerPixel == 16) {
+            unsigned short *srcp = (unsigned short *) pPixmap->devPrivate.ptr;
+
+            fg = srcp[0];
+            pitch = pPixmap->devKind >> 1;
+            for (y = 0; y < i; y++) {
+                bits[y] = 0;
+                for (x = 0; x < j; x++) {
+                    if (srcp[x] != fg) {
+                        if (bg == -1)
+                            bg = srcp[x];
+                        else if (bg != srcp[x])
+                            return TRUE;
+                    }
+                    else
+                        bits[y] |= 1 << x;
+                }
+                srcp += pitch;
+            }
+        }
+        else if (pPixmap->drawable.bitsPerPixel == 24) {
+            CARD32 val;
+            unsigned char *srcp = pPixmap->devPrivate.ptr;
+
+            fg = *((CARD32 *) srcp) & 0x00FFFFFF;
+            pitch = pPixmap->devKind;
+            j *= 3;
+            for (y = 0; y < i; y++) {
+                bits[y] = 0;
+                for (x = 0; x < j; x += 3) {
+                    val = *((CARD32 *) (srcp + x)) & 0x00FFFFFF;
+                    if (val != fg) {
+                        if (bg == -1)
+                            bg = val;
+                        else if (bg != val)
+                            return TRUE;
+                    }
+                    else
+                        bits[y] |= 1 << (x / 3);
+                }
+                srcp += pitch;
+            }
+        }
+        else if (pPixmap->drawable.bitsPerPixel == 32) {
+            IntPtr = (CARD32 *) pPixmap->devPrivate.ptr;
+            fg = IntPtr[0];
+            for (y = 0; y < i; y++) {
+                bits[y] = 0;
+                for (x = 0; x < j; x++) {
+                    if (IntPtr[x] != fg) {
+                        if (bg == -1)
+                            bg = IntPtr[x];
+                        else if (bg != IntPtr[x])
+                            return TRUE;
+                    }
+                    else
+                        bits[y] |= 1 << x;
+                }
+                IntPtr += pitch;
+            }
+        }
+        else
+            return TRUE;
+
+        pPriv->fg = fg;
+        if (bg == -1)
+            pPriv->bg = fg;
+        else
+            pPriv->bg = bg;
+
+        if (h < 8) {
+            switch (h) {
+            case 1:
+                bits[1] = bits[0];
+            case 2:
+                bits[2] = bits[0];
+                bits[3] = bits[1];
+            case 4:
+                bits[4] = bits[0];
+                bits[5] = bits[1];
+                bits[6] = bits[2];
+                bits[7] = bits[3];
+                break;
+            }
+        }
+
+        pPriv->pattern0 =
+            bits[0] | (bits[1] << 8) | (bits[2] << 16) | (bits[3] << 24);
+        pPriv->pattern1 =
+            bits[4] | (bits[5] << 8) | (bits[6] << 16) | (bits[7] << 24);
+
+        if (w < 8) {
+            switch (w) {
+            case 1:
+                pPriv->pattern0 |= (pPriv->pattern0 << 1);
+                pPriv->pattern1 |= (pPriv->pattern1 << 1);
+            case 2:
+                pPriv->pattern0 |= (pPriv->pattern0 << 2);
+                pPriv->pattern1 |= (pPriv->pattern1 << 2);
+            case 4:
+                pPriv->pattern0 |= (pPriv->pattern0 << 4);
+                pPriv->pattern1 |= (pPriv->pattern1 << 4);
+            }
+        }
+        pPriv->flags |= REDUCIBLE_TO_2_COLOR;
+
+        if (infoRec->Mono8x8PatternFillFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {
+            pPriv->pattern0 = SWAP_BITS_IN_BYTES(pPriv->pattern0);
+            pPriv->pattern1 = SWAP_BITS_IN_BYTES(pPriv->pattern1);
+        }
+
+    }
+
+    return TRUE;
+}
+
+void
+XAATileCache(ScrnInfoPtr pScrn, XAACacheInfoPtr pCache, int w, int h)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    (*infoRec->SetupForScreenToScreenCopy) (pScrn, 1, 1, GXcopy, ~0, -1);
+
+    while ((w << 1) <= pCache->w) {
+        (*infoRec->SubsequentScreenToScreenCopy) (pScrn, pCache->x, pCache->y,
+                                                  pCache->x + w, pCache->y, w,
+                                                  h);
+        w <<= 1;
+    }
+    if (w != pCache->w) {
+        (*infoRec->SubsequentScreenToScreenCopy) (pScrn, pCache->x, pCache->y,
+                                                  pCache->x + w, pCache->y,
+                                                  pCache->w - w, h);
+        w = pCache->w;
+    }
+
+    while ((h << 1) <= pCache->h) {
+        (*infoRec->SubsequentScreenToScreenCopy) (pScrn, pCache->x, pCache->y,
+                                                  pCache->x, pCache->y + h, w,
+                                                  h);
+        h <<= 1;
+    }
+    if (h != pCache->h) {
+        (*infoRec->SubsequentScreenToScreenCopy) (pScrn, pCache->x, pCache->y,
+                                                  pCache->x, pCache->y + h, w,
+                                                  pCache->h - h);
+    }
+    SET_SYNC_FLAG(infoRec);
+}
+
+XAACacheInfoPtr
+XAACacheTile(ScrnInfoPtr pScrn, PixmapPtr pPix)
+{
+    int w = pPix->drawable.width;
+    int h = pPix->drawable.height;
+    int size = max(w, h);
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    XAAPixmapCachePrivatePtr pCachePriv =
+        (XAAPixmapCachePrivatePtr) infoRec->PixmapCachePrivate;
+    XAACacheInfoPtr pCache, cacheRoot = NULL;
+    int i, max = 0;
+    int *current;
+
+    if (size <= 128) {
+        if (pCachePriv->Info128) {
+            cacheRoot = pCachePriv->Info128;
+            max = pCachePriv->Num128x128;
+            current = &pCachePriv->Current128;
+        }
+        else {
+            cacheRoot = pCachePriv->InfoPartial;
+            max = pCachePriv->NumPartial;
+            current = &pCachePriv->CurrentPartial;
+        }
+    }
+    else if (size <= 256) {
+        cacheRoot = pCachePriv->Info256;
+        max = pCachePriv->Num256x256;
+        current = &pCachePriv->Current256;
+    }
+    else if (size <= 512) {
+        cacheRoot = pCachePriv->Info512;
+        max = pCachePriv->Num512x512;
+        current = &pCachePriv->Current512;
+    }
+    else {                      /* something's wrong */
+        ErrorF("Something's wrong in XAACacheTile()\n");
+        return pCachePriv->Info128;
+    }
+
+    pCache = cacheRoot;
+
+    /* lets look for it */
+    for (i = 0; i < max; i++, pCache++) {
+        if (pCache->serialNumber == pPix->drawable.serialNumber) {
+            pCache->trans_color = -1;
+            return pCache;
+        }
+    }
+
+    pCache = &cacheRoot[(*current)++];
+    if (*current >= max)
+        *current = 0;
+
+    pCache->serialNumber = pPix->drawable.serialNumber;
+    pCache->trans_color = pCache->bg = pCache->fg = -1;
+    pCache->orig_w = w;
+    pCache->orig_h = h;
+    (*infoRec->WritePixmapToCache) (pScrn, pCache->x, pCache->y, w, h,
+                                    pPix->devPrivate.ptr, pPix->devKind,
+                                    pPix->drawable.bitsPerPixel,
+                                    pPix->drawable.depth);
+    if (!(infoRec->PixmapCacheFlags & DO_NOT_TILE_COLOR_DATA) &&
+        ((w != pCache->w) || (h != pCache->h)))
+        XAATileCache(pScrn, pCache, w, h);
+
+    return pCache;
+}
+
+XAACacheInfoPtr
+XAACacheMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)
+{
+    int w = pPix->drawable.width;
+    int h = pPix->drawable.height;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    XAAPixmapCachePrivatePtr pCachePriv =
+        (XAAPixmapCachePrivatePtr) infoRec->PixmapCachePrivate;
+    XAACacheInfoPtr pCache, cacheRoot = NULL;
+    int i, max = 0, funcNo, pad, dwords, bpp = pScrn->bitsPerPixel;
+    int *current;
+    StippleScanlineProcPtr StippleFunc;
+    unsigned char *data, *srcPtr, *dstPtr;
+
+    if ((h <= 128) && (w <= 128 * bpp)) {
+        if (pCachePriv->Info128) {
+            cacheRoot = pCachePriv->Info128;
+            max = pCachePriv->Num128x128;
+            current = &pCachePriv->Current128;
+        }
+        else {
+            cacheRoot = pCachePriv->InfoPartial;
+            max = pCachePriv->NumPartial;
+            current = &pCachePriv->CurrentPartial;
+        }
+    }
+    else if ((h <= 256) && (w <= 256 * bpp)) {
+        cacheRoot = pCachePriv->Info256;
+        max = pCachePriv->Num256x256;
+        current = &pCachePriv->Current256;
+    }
+    else if ((h <= 512) && (w <= 526 * bpp)) {
+        cacheRoot = pCachePriv->Info512;
+        max = pCachePriv->Num512x512;
+        current = &pCachePriv->Current512;
+    }
+    else {                      /* something's wrong */
+        ErrorF("Something's wrong in XAACacheMonoStipple()\n");
+        return pCachePriv->Info128;
+    }
+
+    pCache = cacheRoot;
+
+    /* lets look for it */
+    for (i = 0; i < max; i++, pCache++) {
+        if ((pCache->serialNumber == pPix->drawable.serialNumber) &&
+            (pCache->fg == -1) && (pCache->bg == -1)) {
+            pCache->trans_color = -1;
+            return pCache;
+        }
+    }
+
+    pCache = &cacheRoot[(*current)++];
+    if (*current >= max)
+        *current = 0;
+
+    pCache->serialNumber = pPix->drawable.serialNumber;
+    pCache->trans_color = pCache->bg = pCache->fg = -1;
+    pCache->orig_w = w;
+    pCache->orig_h = h;
+
+    if (w <= 32) {
+        if (w & (w - 1))
+            funcNo = 1;
+        else
+            funcNo = 0;
+    }
+    else
+        funcNo = 2;
+
+    pad = BitmapBytePad(pCache->w * bpp);
+    dwords = bytes_to_int32(pad);
+    dstPtr = data = (unsigned char *) malloc(pad * pCache->h);
+    srcPtr = (unsigned char *) pPix->devPrivate.ptr;
+
+    if (infoRec->
+        ScreenToScreenColorExpandFillFlags & BIT_ORDER_IN_BYTE_MSBFIRST)
+        StippleFunc = XAAStippleScanlineFuncMSBFirst[funcNo];
+    else
+        StippleFunc = XAAStippleScanlineFuncLSBFirst[funcNo];
+
+    /* don't bother generating more than we'll ever use */
+    max = ((pScrn->displayWidth + w - 1) + 31) >> 5;
+    if (dwords > max)
+        dwords = max;
+
+    for (i = 0; i < h; i++) {
+        (*StippleFunc) ((CARD32 *) dstPtr, (CARD32 *) srcPtr, 0, w, dwords);
+        srcPtr += pPix->devKind;
+        dstPtr += pad;
+    }
+
+    while ((h << 1) <= pCache->h) {
+        memcpy(data + (pad * h), data, pad * h);
+        h <<= 1;
+    }
+
+    if (h < pCache->h)
+        memcpy(data + (pad * h), data, pad * (pCache->h - h));
+
+    (*infoRec->WritePixmapToCache) (pScrn, pCache->x, pCache->y, pCache->w,
+                                    pCache->h, data, pad, bpp, pScrn->depth);
+
+    free(data);
+
+    return pCache;
+}
+
+XAACacheInfoPtr
+XAACachePlanarMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)
+{
+    int w = pPix->drawable.width;
+    int h = pPix->drawable.height;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    XAAPixmapCachePrivatePtr pCachePriv =
+        (XAAPixmapCachePrivatePtr) infoRec->PixmapCachePrivate;
+    XAACacheInfoPtr pCache, cacheRoot = NULL;
+    int i, max = 0;
+    int *current;
+
+    if ((h <= 128) && (w <= 128)) {
+        if (pCachePriv->Info128) {
+            cacheRoot = pCachePriv->Info128;
+            max = pCachePriv->Num128x128;
+            current = &pCachePriv->Current128;
+        }
+        else {
+            cacheRoot = pCachePriv->InfoPartial;
+            max = pCachePriv->NumPartial;
+            current = &pCachePriv->CurrentPartial;
+        }
+    }
+    else if ((h <= 256) && (w <= 256)) {
+        cacheRoot = pCachePriv->Info256;
+        max = pCachePriv->Num256x256;
+        current = &pCachePriv->Current256;
+    }
+    else if ((h <= 512) && (w <= 526)) {
+        cacheRoot = pCachePriv->Info512;
+        max = pCachePriv->Num512x512;
+        current = &pCachePriv->Current512;
+    }
+    else {                      /* something's wrong */
+        ErrorF("Something's wrong in XAACachePlanarMonoStipple()\n");
+        return pCachePriv->Info128;
+    }
+
+    pCache = cacheRoot;
+
+    /* lets look for it */
+    for (i = 0; i < max; i++, pCache++) {
+        if ((pCache->serialNumber == pPix->drawable.serialNumber) &&
+            (pCache->fg == -1) && (pCache->bg == -1)) {
+            pCache->trans_color = -1;
+            return pCache;
+        }
+    }
+
+    pCache = &cacheRoot[(*current)++];
+    if (*current >= max)
+        *current = 0;
+
+    pCache->serialNumber = pPix->drawable.serialNumber;
+    pCache->trans_color = pCache->bg = pCache->fg = -1;
+    pCache->orig_w = w;
+    pCache->orig_h = h;
+
+    /* Plane 0 holds the stipple. Plane 1 holds the inverted stipple */
+    (*infoRec->WriteBitmapToCache) (pScrn, pCache->x, pCache->y,
+                                    pPix->drawable.width, pPix->drawable.height,
+                                    pPix->devPrivate.ptr, pPix->devKind, 1, 2);
+    if (!(infoRec->PixmapCacheFlags & DO_NOT_TILE_MONO_DATA) &&
+        ((w != pCache->w) || (h != pCache->h)))
+        XAATileCache(pScrn, pCache, w, h);
+
+    return pCache;
+}
+
+XAACachePlanarMonoStippleProc
+XAAGetCachePlanarMonoStipple(void)
+{
+    return XAACachePlanarMonoStipple;
+}
+
+XAACacheInfoPtr
+XAACacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg)
+{
+    int w = pPix->drawable.width;
+    int h = pPix->drawable.height;
+    int size = max(w, h);
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    XAAPixmapCachePrivatePtr pCachePriv =
+        (XAAPixmapCachePrivatePtr) infoRec->PixmapCachePrivate;
+    XAACacheInfoPtr pCache, cacheRoot = NULL;
+    int i, max = 0;
+    int *current;
+
+    if (size <= 128) {
+        if (pCachePriv->Info128) {
+            cacheRoot = pCachePriv->Info128;
+            max = pCachePriv->Num128x128;
+            current = &pCachePriv->Current128;
+        }
+        else {
+            cacheRoot = pCachePriv->InfoPartial;
+            max = pCachePriv->NumPartial;
+            current = &pCachePriv->CurrentPartial;
+        }
+    }
+    else if (size <= 256) {
+        cacheRoot = pCachePriv->Info256;
+        max = pCachePriv->Num256x256;
+        current = &pCachePriv->Current256;
+    }
+    else if (size <= 512) {
+        cacheRoot = pCachePriv->Info512;
+        max = pCachePriv->Num512x512;
+        current = &pCachePriv->Current512;
+    }
+    else {                      /* something's wrong */
+        ErrorF("Something's wrong in XAACacheStipple()\n");
+        return pCachePriv->Info128;
+    }
+
+    pCache = cacheRoot;
+    /* lets look for it */
+    if (bg == -1)
+        for (i = 0; i < max; i++, pCache++) {
+            if ((pCache->serialNumber == pPix->drawable.serialNumber) &&
+                (fg == pCache->fg) && (pCache->fg != pCache->bg)) {
+                pCache->trans_color = pCache->bg;
+                return pCache;
+            }
+        }
+    else
+        for (i = 0; i < max; i++, pCache++) {
+            if ((pCache->serialNumber == pPix->drawable.serialNumber) &&
+                (fg == pCache->fg) && (bg == pCache->bg)) {
+                pCache->trans_color = -1;
+                return pCache;
+            }
+        }
+
+    pCache = &cacheRoot[(*current)++];
+    if (*current >= max)
+        *current = 0;
+
+    pCache->serialNumber = pPix->drawable.serialNumber;
+    pCache->fg = fg;
+    if (bg == -1)
+        pCache->trans_color = bg = fg ^ 1;
+    else
+        pCache->trans_color = -1;
+    pCache->bg = bg;
+
+    pCache->orig_w = w;
+    pCache->orig_h = h;
+    (*infoRec->WriteBitmapToCache) (pScrn, pCache->x, pCache->y,
+                                    pPix->drawable.width, pPix->drawable.height,
+                                    pPix->devPrivate.ptr, pPix->devKind, fg,
+                                    bg);
+    if (!(infoRec->PixmapCacheFlags & DO_NOT_TILE_COLOR_DATA) &&
+        ((w != pCache->w) || (h != pCache->h)))
+        XAATileCache(pScrn, pCache, w, h);
+
+    return pCache;
+}
+
+XAACacheInfoPtr
+XAACacheMono8x8Pattern(ScrnInfoPtr pScrn, int pat0, int pat1)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    XAAPixmapCachePrivatePtr pCachePriv =
+        (XAAPixmapCachePrivatePtr) infoRec->PixmapCachePrivate;
+    XAACacheInfoPtr pCache = pCachePriv->InfoMono;
+    int i;
+
+    for (i = 0; i < pCachePriv->NumMono; i++, pCache++) {
+        if (pCache->serialNumber &&
+            (pCache->pat0 == pat0) && (pCache->pat1 == pat1))
+            return pCache;
+    }
+
+    /* OK, let's cache it */
+    pCache = &pCachePriv->InfoMono[pCachePriv->CurrentMono++];
+    if (pCachePriv->CurrentMono >= pCachePriv->NumMono)
+        pCachePriv->CurrentMono = 0;
+
+    pCache->serialNumber = 1;   /* we don't care since we do lookups by pattern */
+    pCache->pat0 = pat0;
+    pCache->pat1 = pat1;
+
+    (*infoRec->WriteMono8x8PatternToCache) (pScrn, pCache);
+
+    return pCache;
+}
+
+XAACacheInfoPtr
+XAACacheColor8x8Pattern(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    XAAPixmapCachePrivatePtr pCachePriv =
+        (XAAPixmapCachePrivatePtr) infoRec->PixmapCachePrivate;
+    XAACacheInfoPtr pCache = pCachePriv->InfoColor;
+    XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(pPix);
+    int i;
+
+    if (!(pixPriv->flags & REDUCIBLE_TO_2_COLOR)) {
+        for (i = 0; i < pCachePriv->NumColor; i++, pCache++) {
+            if (pCache->serialNumber == pPix->drawable.serialNumber) {
+                pCache->trans_color = -1;
+                return pCache;
+            }
+        }
+        pCache = &pCachePriv->InfoColor[pCachePriv->CurrentColor++];
+        if (pCachePriv->CurrentColor >= pCachePriv->NumColor)
+            pCachePriv->CurrentColor = 0;
+
+        pCache->serialNumber = pPix->drawable.serialNumber;
+        pCache->trans_color = pCache->fg = pCache->bg = -1;
+    }
+    else {
+        int pat0 = pixPriv->pattern0;
+        int pat1 = pixPriv->pattern1;
+
+        if (fg == -1) {         /* it's a tile */
+            fg = pixPriv->fg;
+            bg = pixPriv->bg;
+        }
+
+        if (bg == -1) {         /* stipple */
+            for (i = 0; i < pCachePriv->NumColor; i++, pCache++) {
+                if (pCache->serialNumber &&
+                    (pCache->pat0 == pat0) && (pCache->pat1 == pat1) &&
+                    (pCache->fg == fg) && (pCache->bg != fg)) {
+                    pCache->trans_color = pCache->bg;
+                    return pCache;
+                }
+            }
+        }
+        else {                  /* opaque stipple */
+            for (i = 0; i < pCachePriv->NumColor; i++, pCache++) {
+                if (pCache->serialNumber &&
+                    (pCache->pat0 == pat0) && (pCache->pat1 == pat1) &&
+                    (pCache->fg == fg) && (pCache->bg == bg)) {
+                    pCache->trans_color = -1;
+                    return pCache;
+                }
+            }
+        }
+        pCache = &pCachePriv->InfoColor[pCachePriv->CurrentColor++];
+        if (pCachePriv->CurrentColor >= pCachePriv->NumColor)
+            pCachePriv->CurrentColor = 0;
+
+        if (bg == -1)
+            pCache->trans_color = bg = fg ^ 1;
+        else
+            pCache->trans_color = -1;
+
+        pCache->pat0 = pat0;
+        pCache->pat1 = pat1;
+        pCache->fg = fg;
+        pCache->bg = bg;
+        pCache->serialNumber = 1;
+    }
+
+    (*infoRec->WriteColor8x8PatternToCache) (pScrn, pPix, pCache);
+
+    return pCache;
+}
+
+void
+XAAWriteBitmapToCache(ScrnInfoPtr pScrn,
+                      int x, int y, int w, int h,
+                      unsigned char *src, int srcwidth, int fg, int bg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    (*infoRec->WriteBitmap) (pScrn, x, y, w, h, src, srcwidth,
+                             0, fg, bg, GXcopy, ~0);
+}
+
+void
+XAAWriteBitmapToCacheLinear(ScrnInfoPtr pScrn,
+                            int x, int y, int w, int h,
+                            unsigned char *src, int srcwidth, int fg, int bg)
+{
+    ScreenPtr pScreen = pScrn->pScreen;
+    PixmapPtr pScreenPix, pDstPix;
+    ChangeGCVal gcvals[2];
+    GCPtr pGC;
+
+    pScreenPix = (*pScreen->GetScreenPixmap) (pScreen);
+
+    pDstPix = GetScratchPixmapHeader(pScreen, pScreenPix->drawable.width,
+                                     y + h, pScreenPix->drawable.depth,
+                                     pScreenPix->drawable.bitsPerPixel,
+                                     pScreenPix->devKind,
+                                     pScreenPix->devPrivate.ptr);
+
+    pGC = GetScratchGC(pScreenPix->drawable.depth, pScreen);
+    gcvals[0].val = fg;
+    gcvals[1].val = bg;
+    ChangeGC(NullClient, pGC, GCForeground | GCBackground, gcvals);
+    ValidateGC((DrawablePtr) pDstPix, pGC);
+
+    /* We've unwrapped already so these ops miss a sync */
+    SYNC_CHECK(pScrn);
+
+    (*pGC->ops->PutImage) ((DrawablePtr) pDstPix, pGC, 1, x, y, w, h, 0,
+                           XYBitmap, (pointer) src);
+
+    FreeScratchGC(pGC);
+    FreeScratchPixmapHeader(pDstPix);
+}
+
+void
+XAAWritePixmapToCache(ScrnInfoPtr pScrn,
+                      int x, int y, int w, int h,
+                      unsigned char *src, int srcwidth, int bpp, int depth)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    (*infoRec->WritePixmap) (pScrn, x, y, w, h, src, srcwidth,
+                             GXcopy, ~0, -1, bpp, depth);
+}
+
+void
+XAAWritePixmapToCacheLinear(ScrnInfoPtr pScrn,
+                            int x, int y, int w, int h,
+                            unsigned char *src,
+                            int srcwidth, int bpp, int depth)
+{
+    ScreenPtr pScreen = pScrn->pScreen;
+    PixmapPtr pScreenPix, pDstPix;
+    GCPtr pGC;
+
+    pScreenPix = (*pScreen->GetScreenPixmap) (pScreen);
+
+    pDstPix = GetScratchPixmapHeader(pScreen, x + w, y + h,
+                                     depth, bpp, pScreenPix->devKind,
+                                     pScreenPix->devPrivate.ptr);
+
+    pGC = GetScratchGC(depth, pScreen);
+    ValidateGC((DrawablePtr) pDstPix, pGC);
+
+    /* We've unwrapped already so these ops miss a sync */
+    SYNC_CHECK(pScrn);
+
+    if (bpp == BitsPerPixel(depth))
+        (*pGC->ops->PutImage) ((DrawablePtr) pDstPix, pGC, depth, x, y, w,
+                               h, 0, ZPixmap, (pointer) src);
+    else {
+        PixmapPtr pSrcPix;
+
+        pSrcPix = GetScratchPixmapHeader(pScreen, w, h, depth, bpp,
+                                         srcwidth, (pointer) src);
+
+        (*pGC->ops->CopyArea) ((DrawablePtr) pSrcPix, (DrawablePtr) pDstPix,
+                               pGC, 0, 0, w, h, x, y);
+
+        FreeScratchPixmapHeader(pSrcPix);
+    }
+
+    FreeScratchGC(pGC);
+    FreeScratchPixmapHeader(pDstPix);
+}
+
+void
+XAAWriteMono8x8PatternToCache(ScrnInfoPtr pScrn, XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    XAAPixmapCachePrivatePtr pCachePriv =
+        (XAAPixmapCachePrivatePtr) infoRec->PixmapCachePrivate;
+    unsigned char *data;
+    int pad, Bpp = (pScrn->bitsPerPixel >> 3);
+
+    pCache->offsets = pCachePriv->MonoOffsets;
+
+    pad = BitmapBytePad(pCache->w * pScrn->bitsPerPixel);
+
+    data = (unsigned char *) malloc(pad * pCache->h);
+    if (!data)
+        return;
+
+    if (infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_ORIGIN) {
+        CARD32 *ptr = (CARD32 *) data;
+
+        ptr[0] = pCache->pat0;
+        ptr[1] = pCache->pat1;
+    }
+    else {
+        CARD32 *ptr;
+        DDXPointPtr pPoint = pCache->offsets;
+        int patx, paty, i;
+
+        for (i = 0; i < 64; i++, pPoint++) {
+            patx = pCache->pat0;
+            paty = pCache->pat1;
+            XAARotateMonoPattern(&patx, &paty, i & 0x07, i >> 3,
+                                 (infoRec->Mono8x8PatternFillFlags &
+                                  BIT_ORDER_IN_BYTE_MSBFIRST));
+            ptr = (CARD32 *) (data + (pad * pPoint->y) + (Bpp * pPoint->x));
+            ptr[0] = patx;
+            ptr[1] = paty;
+        }
+    }
+
+    (*infoRec->WritePixmapToCache) (pScrn, pCache->x, pCache->y,
+                                    pCache->w, pCache->h, data, pad,
+                                    pScrn->bitsPerPixel, pScrn->depth);
+
+    free(data);
+}
+
+void
+XAAWriteColor8x8PatternToCache(ScrnInfoPtr pScrn,
+                               PixmapPtr pPix, XAACacheInfoPtr pCache)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(pPix);
+    XAAPixmapCachePrivatePtr pCachePriv =
+        (XAAPixmapCachePrivatePtr) infoRec->PixmapCachePrivate;
+    int pad, i, w, h, nw, nh, Bpp;
+    unsigned char *data, *srcPtr, *dstPtr;
+
+    pCache->offsets = pCachePriv->ColorOffsets;
+
+    if (pixPriv->flags & REDUCIBLE_TO_2_COLOR) {
+        CARD32 *ptr;
+
+        pad = BitmapBytePad(pCache->w);
+        data = (unsigned char *) malloc(pad * pCache->h);
+        if (!data)
+            return;
+
+        if (infoRec->Color8x8PatternFillFlags &
+            HARDWARE_PATTERN_PROGRAMMED_ORIGIN) {
+            ptr = (CARD32 *) data;
+            ptr[0] = pCache->pat0;
+            ptr[1] = pCache->pat1;
+        }
+        else {
+            int patx, paty;
+
+            ptr = (CARD32 *) data;
+            ptr[0] = ptr[2] = pCache->pat0;
+            ptr[1] = ptr[3] = pCache->pat1;
+            for (i = 1; i < 8; i++) {
+                patx = pCache->pat0;
+                paty = pCache->pat1;
+                XAARotateMonoPattern(&patx, &paty, i, 0,
+                                     (infoRec->Mono8x8PatternFillFlags &
+                                      BIT_ORDER_IN_BYTE_MSBFIRST));
+                ptr = (CARD32 *) (data + (pad * i));
+                ptr[0] = ptr[2] = patx;
+                ptr[1] = ptr[3] = paty;
+            }
+        }
+
+        (*infoRec->WriteBitmapToCache) (pScrn, pCache->x, pCache->y,
+                                        pCache->w, pCache->h, data, pad,
+                                        pCache->fg, pCache->bg);
+
+        free(data);
+        return;
+    }
+
+    Bpp = pScrn->bitsPerPixel >> 3;
+    h = min(8, pPix->drawable.height);
+    w = min(8, pPix->drawable.width);
+    pad = BitmapBytePad(pCache->w * pScrn->bitsPerPixel);
+
+    data = (unsigned char *) malloc(pad * pCache->h);
+    if (!data)
+        return;
+
+    /* Write and expand horizontally. */
+    for (i = h, dstPtr = data, srcPtr = pPix->devPrivate.ptr; i--;
+         srcPtr += pPix->devKind, dstPtr += pScrn->bitsPerPixel) {
+        nw = w;
+        memcpy(dstPtr, srcPtr, w * Bpp);
+        while (nw != 8) {
+            memcpy(dstPtr + (nw * Bpp), dstPtr, nw * Bpp);
+            nw <<= 1;
+        }
+    }
+    nh = h;
+    /* Expand vertically. */
+    while (nh != 8) {
+        memcpy(data + (nh * pScrn->bitsPerPixel), data,
+               nh * pScrn->bitsPerPixel);
+        nh <<= 1;
+    }
+
+    if (!(infoRec->Color8x8PatternFillFlags &
+          HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+        int j;
+        unsigned char *ptr = data + (128 * Bpp);
+
+        memcpy(data + (64 * Bpp), data, 64 * Bpp);
+        for (i = 1; i < 8; i++, ptr += (128 * Bpp)) {
+            for (j = 0; j < 8; j++) {
+                memcpy(ptr + (j * 8) * Bpp, data + (j * 8 + i) * Bpp,
+                       (8 - i) * Bpp);
+                memcpy(ptr + (j * 8 + 8 - i) * Bpp, data + j * 8 * Bpp,
+                       i * Bpp);
+            }
+            memcpy(ptr + (64 * Bpp), ptr, 64 * Bpp);
+        }
+    }
+
+    (*infoRec->WritePixmapToCache) (pScrn, pCache->x, pCache->y,
+                                    pCache->w, pCache->h, data, pad,
+                                    pScrn->bitsPerPixel, pScrn->depth);
+
+    free(data);
+}
+
+int
+XAAStippledFillChooser(GCPtr pGC)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    PixmapPtr pPixmap = pGC->stipple;
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap);
+
+    if (!(pPriv->flags & REDUCIBILITY_CHECKED) &&
+        (infoRec->CanDoMono8x8 || infoRec->CanDoColor8x8)) {
+        XAACheckStippleReducibility(pPixmap);
+    }
+
+    if (pPriv->flags & REDUCIBLE_TO_8x8) {
+        if (infoRec->CanDoMono8x8 &&
+            !(infoRec->FillMono8x8PatternSpansFlags & NO_TRANSPARENCY) &&
+            ((pGC->alu == GXcopy) || !(infoRec->FillMono8x8PatternSpansFlags &
+                                       TRANSPARENCY_GXCOPY_ONLY)) &&
+            CHECK_ROP(pGC, infoRec->FillMono8x8PatternSpansFlags) &&
+            CHECK_ROPSRC(pGC, infoRec->FillMono8x8PatternSpansFlags) &&
+            CHECK_FG(pGC, infoRec->FillMono8x8PatternSpansFlags) &&
+            CHECK_PLANEMASK(pGC, infoRec->FillMono8x8PatternSpansFlags)) {
+
+            return DO_MONO_8x8;
+        }
+
+        if (infoRec->CanDoColor8x8 &&
+            !(infoRec->FillColor8x8PatternSpansFlags & NO_TRANSPARENCY) &&
+            ((pGC->alu == GXcopy) || !(infoRec->FillColor8x8PatternSpansFlags &
+                                       TRANSPARENCY_GXCOPY_ONLY)) &&
+            CHECK_ROP(pGC, infoRec->FillColor8x8PatternSpansFlags) &&
+            CHECK_ROPSRC(pGC, infoRec->FillColor8x8PatternSpansFlags) &&
+            CHECK_PLANEMASK(pGC, infoRec->FillColor8x8PatternSpansFlags)) {
+
+            return DO_COLOR_8x8;
+        }
+    }
+
+    if (infoRec->UsingPixmapCache && infoRec->FillCacheExpandSpans &&
+        (pPixmap->drawable.height <= infoRec->MaxCacheableStippleHeight) &&
+        (pPixmap->drawable.width <= infoRec->MaxCacheableStippleWidth /
+         infoRec->CacheColorExpandDensity) &&
+        !(infoRec->FillCacheExpandSpansFlags & NO_TRANSPARENCY) &&
+        ((pGC->alu == GXcopy) || !(infoRec->FillCacheExpandSpansFlags &
+                                   TRANSPARENCY_GXCOPY_ONLY)) &&
+        CHECK_ROP(pGC, infoRec->FillCacheExpandSpansFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->FillCacheExpandSpansFlags) &&
+        CHECK_FG(pGC, infoRec->FillCacheExpandSpansFlags) &&
+        CHECK_PLANEMASK(pGC, infoRec->FillCacheExpandSpansFlags)) {
+
+        return DO_CACHE_EXPAND;
+    }
+
+    if (infoRec->UsingPixmapCache &&
+        !(infoRec->PixmapCacheFlags & DO_NOT_BLIT_STIPPLES) &&
+        infoRec->FillCacheBltSpans &&
+        (pPixmap->drawable.height <= infoRec->MaxCacheableTileHeight) &&
+        (pPixmap->drawable.width <= infoRec->MaxCacheableTileWidth) &&
+        !(infoRec->FillCacheBltSpansFlags & NO_TRANSPARENCY) &&
+        ((pGC->alu == GXcopy) || !(infoRec->FillCacheBltSpansFlags &
+                                   TRANSPARENCY_GXCOPY_ONLY)) &&
+        CHECK_ROP(pGC, infoRec->FillCacheBltSpansFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->FillCacheBltSpansFlags) &&
+        CHECK_PLANEMASK(pGC, infoRec->FillCacheBltSpansFlags)) {
+
+        return DO_CACHE_BLT;
+    }
+
+    if (infoRec->FillColorExpandSpans &&
+        !(infoRec->FillColorExpandSpansFlags & NO_TRANSPARENCY) &&
+        ((pGC->alu == GXcopy) || !(infoRec->FillColorExpandSpansFlags &
+                                   TRANSPARENCY_GXCOPY_ONLY)) &&
+        CHECK_ROP(pGC, infoRec->FillColorExpandSpansFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->FillColorExpandSpansFlags) &&
+        CHECK_FG(pGC, infoRec->FillColorExpandSpansFlags) &&
+        CHECK_PLANEMASK(pGC, infoRec->FillColorExpandSpansFlags)) {
+
+        return DO_COLOR_EXPAND;
+    }
+
+    return 0;
+}
+
+int
+XAAOpaqueStippledFillChooser(GCPtr pGC)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    PixmapPtr pPixmap = pGC->stipple;
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap);
+
+    if (XAA_DEPTH_BUG(pGC))
+        return 0;
+
+    if (!(pPriv->flags & REDUCIBILITY_CHECKED) &&
+        (infoRec->CanDoMono8x8 || infoRec->CanDoColor8x8)) {
+        XAACheckStippleReducibility(pPixmap);
+    }
+
+    if (pPriv->flags & REDUCIBLE_TO_8x8) {
+        if (infoRec->CanDoMono8x8 &&
+            !(infoRec->FillMono8x8PatternSpansFlags & TRANSPARENCY_ONLY) &&
+            CHECK_ROP(pGC, infoRec->FillMono8x8PatternSpansFlags) &&
+            CHECK_ROPSRC(pGC, infoRec->FillMono8x8PatternSpansFlags) &&
+            CHECK_COLORS(pGC, infoRec->FillMono8x8PatternSpansFlags) &&
+            CHECK_PLANEMASK(pGC, infoRec->FillMono8x8PatternSpansFlags)) {
+
+            return DO_MONO_8x8;
+        }
+
+        if (infoRec->CanDoColor8x8 &&
+            CHECK_ROP(pGC, infoRec->FillColor8x8PatternSpansFlags) &&
+            CHECK_ROPSRC(pGC, infoRec->FillColor8x8PatternSpansFlags) &&
+            CHECK_PLANEMASK(pGC, infoRec->FillColor8x8PatternSpansFlags)) {
+
+            return DO_COLOR_8x8;
+        }
+    }
+
+    if (infoRec->UsingPixmapCache && infoRec->FillCacheExpandSpans &&
+        (pPixmap->drawable.height <= infoRec->MaxCacheableStippleHeight) &&
+        (pPixmap->drawable.width <= infoRec->MaxCacheableStippleWidth /
+         infoRec->CacheColorExpandDensity) &&
+        !(infoRec->FillCacheExpandSpansFlags & TRANSPARENCY_ONLY) &&
+        CHECK_ROP(pGC, infoRec->FillCacheExpandSpansFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->FillCacheExpandSpansFlags) &&
+        CHECK_COLORS(pGC, infoRec->FillCacheExpandSpansFlags) &&
+        CHECK_PLANEMASK(pGC, infoRec->FillCacheExpandSpansFlags)) {
+
+        return DO_CACHE_EXPAND;
+    }
+
+    if (infoRec->UsingPixmapCache &&
+        !(infoRec->PixmapCacheFlags & DO_NOT_BLIT_STIPPLES) &&
+        infoRec->FillCacheBltSpans &&
+        (pPixmap->drawable.height <= infoRec->MaxCacheableTileHeight) &&
+        (pPixmap->drawable.width <= infoRec->MaxCacheableTileWidth) &&
+        CHECK_ROP(pGC, infoRec->FillCacheBltSpansFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->FillCacheBltSpansFlags) &&
+        CHECK_PLANEMASK(pGC, infoRec->FillCacheBltSpansFlags)) {
+
+        return DO_CACHE_BLT;
+    }
+
+    if (infoRec->FillColorExpandSpans &&
+        !(infoRec->FillColorExpandSpansFlags & TRANSPARENCY_ONLY) &&
+        CHECK_ROP(pGC, infoRec->FillColorExpandSpansFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->FillColorExpandSpansFlags) &&
+        CHECK_COLORS(pGC, infoRec->FillColorExpandSpansFlags) &&
+        CHECK_PLANEMASK(pGC, infoRec->FillColorExpandSpansFlags)) {
+
+        return DO_COLOR_EXPAND;
+    }
+
+    return 0;
+}
+
+int
+XAATiledFillChooser(GCPtr pGC)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    PixmapPtr pPixmap = pGC->tile.pixmap;
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap);
+
+    if (IS_OFFSCREEN_PIXMAP(pPixmap) && infoRec->FillCacheBltSpans &&
+        CHECK_ROP(pGC, infoRec->FillCacheBltSpansFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->FillCacheBltSpansFlags) &&
+        CHECK_PLANEMASK(pGC, infoRec->FillCacheBltSpansFlags)) {
+
+        return DO_PIXMAP_COPY;
+    }
+
+    if (!(pPriv->flags & REDUCIBILITY_CHECKED) &&
+        (infoRec->CanDoMono8x8 || infoRec->CanDoColor8x8)) {
+        XAACheckTileReducibility(pPixmap, infoRec->CanDoMono8x8);
+    }
+
+    if (pPriv->flags & REDUCIBLE_TO_8x8) {
+        if ((pPriv->flags & REDUCIBLE_TO_2_COLOR) && infoRec->CanDoMono8x8 &&
+            !(infoRec->FillMono8x8PatternSpansFlags & TRANSPARENCY_ONLY) &&
+            CHECK_ROP(pGC, infoRec->FillMono8x8PatternSpansFlags) &&
+            CHECK_ROPSRC(pGC, infoRec->FillMono8x8PatternSpansFlags) &&
+            (!(infoRec->FillMono8x8PatternSpansFlags & RGB_EQUAL) ||
+             (CHECK_RGB_EQUAL(pPriv->fg) && CHECK_RGB_EQUAL(pPriv->bg))) &&
+            CHECK_PLANEMASK(pGC, infoRec->FillMono8x8PatternSpansFlags)) {
+
+            return DO_MONO_8x8;
+        }
+
+        if (infoRec->CanDoColor8x8 &&
+            CHECK_ROP(pGC, infoRec->FillColor8x8PatternSpansFlags) &&
+            CHECK_ROPSRC(pGC, infoRec->FillColor8x8PatternSpansFlags) &&
+            CHECK_PLANEMASK(pGC, infoRec->FillColor8x8PatternSpansFlags)) {
+
+            return DO_COLOR_8x8;
+        }
+    }
+
+    if (infoRec->UsingPixmapCache && infoRec->FillCacheBltSpans &&
+        (pPixmap->drawable.height <= infoRec->MaxCacheableTileHeight) &&
+        (pPixmap->drawable.width <= infoRec->MaxCacheableTileWidth) &&
+        CHECK_ROP(pGC, infoRec->FillCacheBltSpansFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->FillCacheBltSpansFlags) &&
+        CHECK_PLANEMASK(pGC, infoRec->FillCacheBltSpansFlags)) {
+
+        return DO_CACHE_BLT;
+    }
+
+    if (infoRec->FillImageWriteRects &&
+        CHECK_NO_GXCOPY(pGC, infoRec->FillImageWriteRectsFlags) &&
+        CHECK_ROP(pGC, infoRec->FillImageWriteRectsFlags) &&
+        CHECK_ROPSRC(pGC, infoRec->FillImageWriteRectsFlags) &&
+        CHECK_PLANEMASK(pGC, infoRec->FillImageWriteRectsFlags)) {
+
+        return DO_IMAGE_WRITE;
+    }
+
+    return 0;
+}
+
+static int RotateMasksX[8] = {
+    0xFFFFFFFF, 0x7F7F7F7F, 0x3F3F3F3F, 0x1F1F1F1F,
+    0x0F0F0F0F, 0x07070707, 0x03030303, 0x01010101
+};
+
+static int RotateMasksY[4] = {
+    0xFFFFFFFF, 0x00FFFFFF, 0x0000FFFF, 0x000000FF
+};
+
+void
+XAARotateMonoPattern(int *pat0, int *pat1, int xorg, int yorg, Bool msbfirst)
+{
+    int tmp, mask;
+
+    if (xorg) {
+        if (msbfirst)
+            xorg = 8 - xorg;
+        mask = RotateMasksX[xorg];
+        *pat0 = ((*pat0 >> xorg) & mask) | ((*pat0 << (8 - xorg)) & ~mask);
+        *pat1 = ((*pat1 >> xorg) & mask) | ((*pat1 << (8 - xorg)) & ~mask);
+    }
+    if (yorg >= 4) {
+        tmp = *pat0;
+        *pat0 = *pat1;
+        *pat1 = tmp;
+        yorg -= 4;
+    }
+    if (yorg) {
+        mask = RotateMasksY[yorg];
+        yorg <<= 3;
+        tmp = *pat0;
+        *pat0 = ((*pat0 >> yorg) & mask) | ((*pat1 << (32 - yorg)) & ~mask);
+        *pat1 = ((*pat1 >> yorg) & mask) | ((tmp << (32 - yorg)) & ~mask);
+    }
+}
+
+void
+XAAInvalidatePixmapCache(ScreenPtr pScreen)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    XAAPixmapCachePrivatePtr pCachePriv =
+        (XAAPixmapCachePrivatePtr) infoRec->PixmapCachePrivate;
+    int i;
+
+    if (!pCachePriv)
+        return;
+
+    for (i = 0; i < pCachePriv->Num512x512; i++)
+        (pCachePriv->Info512)[i].serialNumber = 0;
+    for (i = 0; i < pCachePriv->Num256x256; i++)
+        (pCachePriv->Info256)[i].serialNumber = 0;
+    for (i = 0; i < pCachePriv->Num128x128; i++)
+        (pCachePriv->Info128)[i].serialNumber = 0;
+    for (i = 0; i < pCachePriv->NumPartial; i++)
+        (pCachePriv->InfoPartial)[i].serialNumber = 0;
+    for (i = 0; i < pCachePriv->NumMono; i++)
+        (pCachePriv->InfoMono)[i].serialNumber = 0;
+    for (i = 0; i < pCachePriv->NumColor; i++)
+        (pCachePriv->InfoColor)[i].serialNumber = 0;
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaPict.c b/xorg-server/hw/xfree86/xaa/xaaPict.c
index 1ad75835b..0721768ed 100644
--- a/xorg-server/hw/xfree86/xaa/xaaPict.c
+++ b/xorg-server/hw/xfree86/xaa/xaaPict.c
@@ -1,655 +1,654 @@
-/*

- *

- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.

- *

- * 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_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <string.h>

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "windowstr.h"

-#include "xf86str.h"

-#include "mi.h"

-#include "picturestr.h"

-#include "glyphstr.h"

-#include "picture.h"

-#include "mipict.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaawrap.h"

-#include "xaacexp.h"

-#include "xf86fbman.h"

-#include "servermd.h"

-

-Bool

-XAAGetPixelFromRGBA (

-    CARD32 *pixel,

-    CARD16 red,

-    CARD16 green,

-    CARD16 blue,

-    CARD16 alpha,

-    CARD32 format

-){

-    int rbits, bbits, gbits, abits;

-    int rshift, bshift, gshift, ashift;

-

-    *pixel = 0;

-

-    if(!PICT_FORMAT_COLOR(format))

-    	return FALSE;

-	

-    rbits = PICT_FORMAT_R(format);

-    gbits = PICT_FORMAT_G(format);

-    bbits = PICT_FORMAT_B(format);

-    abits = PICT_FORMAT_A(format);

-    

-    if(PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {

-        bshift = 0;

-        gshift = bbits;

-	rshift = gshift + gbits;

-	ashift = rshift + rbits;

-    } else if(PICT_FORMAT_TYPE(format) == PICT_TYPE_ABGR) {

-        rshift = 0;

-	gshift = rbits;

-	bshift = gshift + gbits;

-	ashift = bshift + bbits;

-    } else if(PICT_FORMAT_TYPE(format) == PICT_TYPE_BGRA) {

-	bshift = PICT_FORMAT_BPP(format) - bbits;

-	gshift = bshift - gbits;

-	rshift = gshift - rbits;

-	ashift = 0;

-    } else

-	return FALSE;

-    

-    *pixel |=  ( blue >> (16 - bbits)) << bshift;

-    *pixel |=  (  red >> (16 - rbits)) << rshift;

-    *pixel |=  (green >> (16 - gbits)) << gshift;

-    *pixel |=  (alpha >> (16 - abits)) << ashift;

-

-    return TRUE;

-}

-

-

-Bool

-XAAGetRGBAFromPixel(

-    CARD32 pixel,

-    CARD16 *red,

-    CARD16 *green,

-    CARD16 *blue,

-    CARD16 *alpha,

-    CARD32 format

-){

-    int rbits, bbits, gbits, abits;

-    int rshift, bshift, gshift, ashift;

-    

-    if(!PICT_FORMAT_COLOR(format))

-    	return FALSE;

-	

-    rbits = PICT_FORMAT_R(format);

-    gbits = PICT_FORMAT_G(format);

-    bbits = PICT_FORMAT_B(format);

-    abits = PICT_FORMAT_A(format);

-    

-    if(PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {

-        bshift = 0;

-        gshift = bbits;

-	rshift = gshift + gbits;

-	ashift = rshift + rbits;

-    } else if(PICT_FORMAT_TYPE(format) == PICT_TYPE_ABGR) {

-        rshift = 0;

-	gshift = rbits;

-	bshift = gshift + gbits;

-	ashift = bshift + bbits;

-    } else if(PICT_FORMAT_TYPE(format) == PICT_TYPE_BGRA) {

-	bshift = PICT_FORMAT_BPP(format) - bbits;

-	gshift = bshift - gbits;

-	rshift = gshift - rbits;

-	ashift = 0;

-    } else

-	return FALSE;

- 

-    *red = ((pixel >> rshift ) & ((1 << rbits) - 1)) << (16 - rbits);

-    while(rbits < 16) {

-       *red |= *red >> rbits;

-       rbits <<= 1;

-    }

-    

-    *green = ((pixel >> gshift ) & ((1 << gbits) - 1)) << (16 - gbits);

-    while(gbits < 16) {

-       *green |= *green >> gbits;

-       gbits <<= 1;

-    }

-        

-    *blue = ((pixel >> bshift ) & ((1 << bbits) - 1)) << (16 - bbits);

-    while(bbits < 16) {

-       *blue |= *blue >> bbits;

-       bbits <<= 1;

-    }  

-    

-    if(abits) {

-       *alpha = ((pixel >> ashift ) & ((1 << abits) - 1)) << (16 - abits);

-       while(abits < 16) {

-          *alpha |= *alpha >> abits;

-          abits <<= 1;

-       }     

-    } else *alpha = 0xffff;

-      

-    return TRUE;

-}

-

-/* 8:8:8 + PICT_a8 -> 8:8:8:8 texture */

-

-void

-XAA_888_plus_PICT_a8_to_8888 (

-    CARD32 color,

-    CARD8  *alphaPtr,   /* in bytes */

-    int    alphaPitch,

-    CARD32  *dstPtr,

-    int    dstPitch,	/* in dwords */

-    int    width,

-    int    height

-){

-    int x;

-

-    color &= 0x00ffffff;

-

-    while(height--) {

-	for(x = 0; x < width; x++)

-	   dstPtr[x] = color | (alphaPtr[x] << 24);

-	dstPtr += dstPitch;

-	alphaPtr += alphaPitch;

-    } 

-}

-

-#define DRAWABLE_IS_ON_CARD(pDraw) \

-    (pDraw->type == DRAWABLE_WINDOW || \

-     (pDraw->type == DRAWABLE_PIXMAP && IS_OFFSCREEN_PIXMAP(pDraw)))

-

-Bool

-XAADoComposite (

-    CARD8      op,

-    PicturePtr pSrc,

-    PicturePtr pMask,

-    PicturePtr pDst,

-    INT16      xSrc,

-    INT16      ySrc,

-    INT16      xMask,

-    INT16      yMask,

-    INT16      xDst,

-    INT16      yDst,

-    CARD16     width,

-    CARD16     height

-){

-    ScreenPtr pScreen = pDst->pDrawable->pScreen;

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    RegionRec region;

-    CARD32 *formats, *dstformats;

-    int flags = 0;

-    BoxPtr pbox;

-    int nbox, w, h;

-

-    if(!RegionNumRects(pDst->pCompositeClip))

-        return TRUE;

-

-    if(!infoRec->pScrn->vtSema || !DRAWABLE_IS_ON_CARD(pDst->pDrawable))

-	return FALSE;

-

-    if(DRAWABLE_IS_ON_CARD(pSrc->pDrawable))

-	return FALSE;

-

-    if (pSrc->transform || (pMask && pMask->transform))

-	return FALSE;

-

-    if (pDst->alphaMap || pSrc->alphaMap || (pMask && pMask->alphaMap))

-	return FALSE;

-

-    if ((pSrc->repeat && pSrc->repeatType != RepeatNormal) ||

-	(pMask && pMask->repeat && pMask->repeatType != RepeatNormal))

-    {

-	return FALSE;

-    }

-

-    xDst += pDst->pDrawable->x;

-    yDst += pDst->pDrawable->y;

-    xSrc += pSrc->pDrawable->x;

-    ySrc += pSrc->pDrawable->y;

-

-    if(pMask) {

-	if(pMask->componentAlpha)

-	    return FALSE;

- 

-	/* for now we only do it if there is a 1x1 (solid) source */

-

-	if((pSrc->pDrawable->width == 1) && (pSrc->pDrawable->height == 1)) {

-	   CARD16 red, green, blue, alpha;

-           CARD32 pixel =

-                *((CARD32*)(((PixmapPtr)(pSrc->pDrawable))->devPrivate.ptr));

-

-	   if(!XAAGetRGBAFromPixel(pixel,&red,&green,&blue,&alpha,pSrc->format))

-		return FALSE;

-

-	   xMask += pMask->pDrawable->x;

-	   yMask += pMask->pDrawable->y;	

-		

-	   /* pull out color expandable operations here */

-	   if((pMask->format == PICT_a1) && (alpha == 0xffff) &&

-	       (op == PictOpOver) && infoRec->WriteBitmap && !pMask->repeat &&

-	       !(infoRec->WriteBitmapFlags & NO_TRANSPARENCY) &&

-	       (!(infoRec->WriteBitmapFlags & RGB_EQUAL) || 

-	         ((red == green) && (green == blue))))

-	   {

-	        PixmapPtr pPix = (PixmapPtr)(pMask->pDrawable);

-		int skipleft;

-		        

-	  	if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst,

-                                   xSrc, ySrc, xMask, yMask, xDst, yDst,

-                                   width, height))

-		      return TRUE;

-		      

-		nbox = RegionNumRects(&region);

-		pbox = RegionRects(&region);

-		

-	        if(!nbox)

-		    return TRUE;	

-		    

-	        XAAGetPixelFromRGBA(&pixel, red, green, blue, 0, pDst->format);

-		    

-	   	xMask -= xDst;

-	   	yMask -= yDst;

-

-	   	while(nbox--) {

-		    skipleft = pbox->x1 + xMask;

-		    

-	            (*infoRec->WriteBitmap)(infoRec->pScrn,

-			        pbox->x1, pbox->y1, 

-			        pbox->x2 - pbox->x1, pbox->y2 - pbox->y1,

-			        (unsigned char*)(pPix->devPrivate.ptr) + 

-				  (pPix->devKind * (pbox->y1 + yMask)) + 

-			          ((skipleft >> 3) & ~3), pPix->devKind, 

-				skipleft & 31, pixel, -1, GXcopy, ~0);

-	            pbox++;

-	   	}

-				  

-		/* WriteBitmap sets the Sync flag */		  

-	        RegionUninit(&region);

-		return TRUE;

-	  }

-

-	  formats = infoRec->CPUToScreenAlphaTextureFormats;

-	  dstformats = infoRec->CPUToScreenAlphaTextureDstFormats;

-	  if(!formats || !dstformats)

-		return FALSE;

-

-	  w = pMask->pDrawable->width;

-	  h = pMask->pDrawable->height;

-

-	  if(pMask->repeat) {

-	      if((infoRec->CPUToScreenAlphaTextureFlags & XAA_RENDER_NO_TILE) ||

-		   ((infoRec->CPUToScreenAlphaTextureFlags & 

-                                   XAA_RENDER_POWER_OF_2_TILE_ONLY) && 

-				((h & (h - 1)) || (w & (w - 1)))))

-	      {

-		 return FALSE;

-	      }

-	      flags |= XAA_RENDER_REPEAT;

-	  } 

-

-	  if((alpha != 0xffff) &&

-              (infoRec->CPUToScreenAlphaTextureFlags & XAA_RENDER_NO_SRC_ALPHA))

-		return FALSE;

-

-	  while(*formats != pMask->format) {

-		if(!(*formats)) return FALSE;

-		formats++;

-          }

-	  while(*dstformats != pDst->format) {

-		if(!(*dstformats))

-		    return FALSE;

-		dstformats++;

-          }

-

-	  if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst,

-                                   xSrc, ySrc, xMask, yMask, xDst, yDst,

-                                   width, height))

-		return TRUE;

-

-	  nbox = RegionNumRects(&region);

-	  pbox = RegionRects(&region);

-	     

-	  if(!nbox) {

-                RegionUninit(&region);

-		return TRUE;

-	  }

-

-	  if(!(infoRec->SetupForCPUToScreenAlphaTexture2)(infoRec->pScrn,

-			op, red, green, blue, alpha, pMask->format,

-			pDst->format,

-			((PixmapPtr)(pMask->pDrawable))->devPrivate.ptr,

-			((PixmapPtr)(pMask->pDrawable))->devKind, 

-			w, h, flags))

-	  {

-                RegionUninit(&region);

-		return FALSE;

-	  }

-

-	   xMask -= xDst;

-	   yMask -= yDst;

-	

-	   while(nbox--) {

-	      (*infoRec->SubsequentCPUToScreenAlphaTexture)(infoRec->pScrn,

-			pbox->x1, pbox->y1, 

-			pbox->x1 + xMask, pbox->y1 + yMask,

-			pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);

-	      pbox++;

-	   }

-

-	   SET_SYNC_FLAG(infoRec);

-	   RegionUninit(&region);

-	   return TRUE;

-	}

-    } else {

-	formats = infoRec->CPUToScreenTextureFormats;

-	dstformats = infoRec->CPUToScreenTextureDstFormats;

-	if(!formats || !dstformats)

-	    return FALSE;

-

-        w = pSrc->pDrawable->width;

-        h = pSrc->pDrawable->height;

-

-        if(pSrc->repeat) {

-              if((infoRec->CPUToScreenTextureFlags & XAA_RENDER_NO_TILE) ||

-                   ((infoRec->CPUToScreenTextureFlags &

-                                   XAA_RENDER_POWER_OF_2_TILE_ONLY) &&

-                                ((h & (h - 1)) || (w & (w - 1)))))

-              {

-                 return FALSE;

-              }

-              flags |= XAA_RENDER_REPEAT;

-        }

-

-	while(*formats != pSrc->format) {

-	    if(!(*formats)) return FALSE;

-	    formats++;

-	}

-	while(*dstformats != pDst->format) {

-	    if(!(*dstformats))

-		return FALSE;

-	    dstformats++;

-	}

-

-	if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst,

-                                   xSrc, ySrc, xMask, yMask, xDst, yDst,

-                                   width, height))

-		return TRUE;

-

-	nbox = RegionNumRects(&region);

-	pbox = RegionRects(&region);

-	     

-        if(!nbox) {

-             RegionUninit(&region);

-             return TRUE;

-        }

-

-	if(!(infoRec->SetupForCPUToScreenTexture2)(infoRec->pScrn,

-			op, pSrc->format, pDst->format, 

-			((PixmapPtr)(pSrc->pDrawable))->devPrivate.ptr,

-			((PixmapPtr)(pSrc->pDrawable))->devKind, 

-			w, h, flags))

-        {

-              RegionUninit(&region);

-              return FALSE;

-        }

-

-

-	xSrc -= xDst;

-	ySrc -= yDst;

-	

-	while(nbox--) {

-	    (*infoRec->SubsequentCPUToScreenTexture)(infoRec->pScrn,

-			pbox->x1, pbox->y1, 

-			pbox->x1 + xSrc, pbox->y1 + ySrc,

-			pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);

-	    pbox++;

-	 }

-

-	SET_SYNC_FLAG(infoRec);

-	RegionUninit(&region);

-	return TRUE;

-    }

-

-

-    return FALSE;

-}

-

-static void

-XAACompositeSrcCopy (PicturePtr pSrc,

-		     PicturePtr pDst,

-		     INT16      xSrc,

-		     INT16      ySrc,

-		     INT16      xDst,

-		     INT16      yDst,

-		     CARD16     width,

-		     CARD16     height)

-{

-    ScreenPtr	pScreen = pDst->pDrawable->pScreen;

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    int i, nbox;

-    int xoff, yoff;

-    BoxPtr pbox;

-    DDXPointPtr pptSrc;

-    RegionRec region;

-

-    xDst += pDst->pDrawable->x;

-    yDst += pDst->pDrawable->y;

-    xSrc += pSrc->pDrawable->x;

-    ySrc += pSrc->pDrawable->y;

-

-    if (!miComputeCompositeRegion (&region, pSrc, NULL, pDst,

-				   xSrc, ySrc, 0, 0, xDst, yDst,

-				   width, height))

-	return;

-

-    nbox = RegionNumRects(&region);

-    pbox = RegionRects(&region);

-

-    if(!nbox) {

-	RegionUninit(&region);

-	return;

-    }

-    pptSrc = malloc(sizeof(DDXPointRec) * nbox);

-    if (!pptSrc) {

-	RegionUninit(&region);

-	return;

-    }

-    xoff = xSrc - xDst;

-    yoff = ySrc - yDst;

-    for (i = 0; i < nbox; i++) {

-	pptSrc[i].x = pbox[i].x1 + xoff;

-	pptSrc[i].y = pbox[i].y1 + yoff; 

-    }

-

-    infoRec->ScratchGC.planemask = ~0L;

-    infoRec->ScratchGC.alu = GXcopy;

-

-    XAADoBitBlt(pSrc->pDrawable, pDst->pDrawable, &infoRec->ScratchGC, &region,

-		pptSrc);

-

-    free(pptSrc);

-    RegionUninit(&region);

-    return;

-}

-

-void

-XAAComposite (CARD8      op,

-	      PicturePtr pSrc,

-	      PicturePtr pMask,

-	      PicturePtr pDst,

-	      INT16      xSrc,

-	      INT16      ySrc,

-	      INT16      xMask,

-	      INT16      yMask,

-	      INT16      xDst,

-	      INT16      yDst,

-	      CARD16     width,

-	      CARD16     height)

-{

-    ScreenPtr	pScreen = pDst->pDrawable->pScreen;

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    XAA_RENDER_PROLOGUE(pScreen, Composite);

-

-    if(!pMask && infoRec->pScrn->vtSema &&

-       infoRec->ScreenToScreenBitBlt &&

-       pSrc->pDrawable &&

-       DRAWABLE_IS_ON_CARD(pSrc->pDrawable) &&

-       DRAWABLE_IS_ON_CARD(pDst->pDrawable) &&

-       !pSrc->transform &&

-       (!pSrc->repeat || (xSrc >= 0 && ySrc >= 0 &&

-			  xSrc+width<=pSrc->pDrawable->width &&

-			  ySrc+height<=pSrc->pDrawable->height)) &&

-       ((op == PictOpSrc &&

-	 ((pSrc->format==pDst->format) ||

-	  (pSrc->format==PICT_a8r8g8b8 && pDst->format==PICT_x8r8g8b8) ||

-	  (pSrc->format==PICT_a8b8g8r8 && pDst->format==PICT_x8b8g8r8))) ||

-	(op == PictOpOver && !pSrc->alphaMap && !pDst->alphaMap &&

-	 pSrc->format==pDst->format &&

-	 (pSrc->format==PICT_x8r8g8b8 || pSrc->format==PICT_x8b8g8r8))))

-    {

-	XAACompositeSrcCopy(pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height);

-    } else if(!pSrc->pDrawable || (pMask && !pMask->pDrawable) ||

-              !infoRec->Composite ||

-              !(*infoRec->Composite)(op, pSrc, pMask, pDst,

-                                     xSrc, ySrc, xMask, yMask, xDst, yDst,

-                                     width, height))

-    {

-        if(infoRec->pScrn->vtSema &&

-           ((pSrc->pDrawable &&

-             (pSrc->pDrawable->type == DRAWABLE_WINDOW || IS_OFFSCREEN_PIXMAP(pSrc->pDrawable))) ||

-            pDst->pDrawable->type == DRAWABLE_WINDOW || IS_OFFSCREEN_PIXMAP(pDst->pDrawable))) {

-            SYNC_CHECK(pDst->pDrawable);

-        }

-        (*GetPictureScreen(pScreen)->Composite) (op,

-		       pSrc,

-		       pMask,

-		       pDst,

-		       xSrc,

-		       ySrc,

-		       xMask,

-		       yMask,

-		       xDst,

-		       yDst,

-		       width,

-		       height);    

-    }

-

-    if(pDst->pDrawable->type == DRAWABLE_PIXMAP)

-	(XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pDst->pDrawable)))->flags |= DIRTY;

-

-    XAA_RENDER_EPILOGUE(pScreen, Composite, XAAComposite);

-}

-

-Bool

-XAADoGlyphs (CARD8         op,

-	   PicturePtr    pSrc,

-	   PicturePtr    pDst,

-	   PictFormatPtr maskFormat,

-	   INT16         xSrc,

-	   INT16         ySrc,

-	   int           nlist,

-	   GlyphListPtr  list,

-	   GlyphPtr      *glyphs)

-{

-    ScreenPtr	pScreen = pDst->pDrawable->pScreen;

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-

-    if(!RegionNumRects(pDst->pCompositeClip))

-	return TRUE;

-

-    if(!infoRec->pScrn->vtSema || 

-      ((pDst->pDrawable->type != DRAWABLE_WINDOW) &&

-	!IS_OFFSCREEN_PIXMAP(pDst->pDrawable)))

-	return FALSE;

-

-    if((pSrc->pDrawable->type != DRAWABLE_PIXMAP) ||

-        IS_OFFSCREEN_PIXMAP(pSrc->pDrawable))

-        return FALSE;

-

-    /*

-     * If it looks like we have a chance of being able to draw these

-     * glyphs with an accelerated Composite, do that now to avoid

-     * unneeded and costly syncs.

-     */

-    if(maskFormat) {

-        if(!infoRec->CPUToScreenAlphaTextureFormats)

-            return FALSE;

-    } else {

-        if(!infoRec->CPUToScreenTextureFormats)

-            return FALSE;

-    }

-

-    miGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);

-

-    return TRUE;

-}	   

-	 

-	

-void

-XAAGlyphs (CARD8         op,

-	   PicturePtr    pSrc,

-	   PicturePtr    pDst,

-	   PictFormatPtr maskFormat,

-	   INT16         xSrc,

-	   INT16         ySrc,

-	   int           nlist,

-	   GlyphListPtr  list,

-	   GlyphPtr      *glyphs)

-{

-    ScreenPtr	pScreen = pDst->pDrawable->pScreen;

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    XAA_RENDER_PROLOGUE(pScreen, Glyphs);

-

-    if(!pSrc->pDrawable || !infoRec->Glyphs ||

-       !(*infoRec->Glyphs)(op, pSrc, pDst, maskFormat,

-                           xSrc, ySrc, nlist, list, glyphs))

-    {

-        if(infoRec->pScrn->vtSema &&

-           ((pSrc->pDrawable &&

-             (pSrc->pDrawable->type == DRAWABLE_WINDOW || IS_OFFSCREEN_PIXMAP(pSrc->pDrawable))) ||

-            pDst->pDrawable->type == DRAWABLE_WINDOW || IS_OFFSCREEN_PIXMAP(pDst->pDrawable))) {

-            SYNC_CHECK(pDst->pDrawable);

-        }

-       (*GetPictureScreen(pScreen)->Glyphs) (op, pSrc, pDst, maskFormat,

-					  xSrc, ySrc, nlist, list, glyphs);

-    }

-

-    if(pDst->pDrawable->type == DRAWABLE_PIXMAP)

-	(XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pDst->pDrawable)))->flags |= DIRTY;

-

-    XAA_RENDER_EPILOGUE(pScreen, Glyphs, XAAGlyphs);

-}

+/*
+ *
+ * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+ *
+ * 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_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <string.h>
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "windowstr.h"
+#include "xf86str.h"
+#include "mi.h"
+#include "picturestr.h"
+#include "glyphstr.h"
+#include "picture.h"
+#include "mipict.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaawrap.h"
+#include "xaacexp.h"
+#include "xf86fbman.h"
+#include "servermd.h"
+
+Bool
+XAAGetPixelFromRGBA(CARD32 *pixel,
+                    CARD16 red,
+                    CARD16 green, CARD16 blue, CARD16 alpha, CARD32 format)
+{
+    int rbits, bbits, gbits, abits;
+    int rshift, bshift, gshift, ashift;
+
+    *pixel = 0;
+
+    if (!PICT_FORMAT_COLOR(format))
+        return FALSE;
+
+    rbits = PICT_FORMAT_R(format);
+    gbits = PICT_FORMAT_G(format);
+    bbits = PICT_FORMAT_B(format);
+    abits = PICT_FORMAT_A(format);
+
+    if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
+        bshift = 0;
+        gshift = bbits;
+        rshift = gshift + gbits;
+        ashift = rshift + rbits;
+    }
+    else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ABGR) {
+        rshift = 0;
+        gshift = rbits;
+        bshift = gshift + gbits;
+        ashift = bshift + bbits;
+    }
+    else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_BGRA) {
+        bshift = PICT_FORMAT_BPP(format) - bbits;
+        gshift = bshift - gbits;
+        rshift = gshift - rbits;
+        ashift = 0;
+    }
+    else
+        return FALSE;
+
+    *pixel |= (blue >> (16 - bbits)) << bshift;
+    *pixel |= (red >> (16 - rbits)) << rshift;
+    *pixel |= (green >> (16 - gbits)) << gshift;
+    *pixel |= (alpha >> (16 - abits)) << ashift;
+
+    return TRUE;
+}
+
+Bool
+XAAGetRGBAFromPixel(CARD32 pixel,
+                    CARD16 *red,
+                    CARD16 *green, CARD16 *blue, CARD16 *alpha, CARD32 format)
+{
+    int rbits, bbits, gbits, abits;
+    int rshift, bshift, gshift, ashift;
+
+    if (!PICT_FORMAT_COLOR(format))
+        return FALSE;
+
+    rbits = PICT_FORMAT_R(format);
+    gbits = PICT_FORMAT_G(format);
+    bbits = PICT_FORMAT_B(format);
+    abits = PICT_FORMAT_A(format);
+
+    if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
+        bshift = 0;
+        gshift = bbits;
+        rshift = gshift + gbits;
+        ashift = rshift + rbits;
+    }
+    else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ABGR) {
+        rshift = 0;
+        gshift = rbits;
+        bshift = gshift + gbits;
+        ashift = bshift + bbits;
+    }
+    else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_BGRA) {
+        bshift = PICT_FORMAT_BPP(format) - bbits;
+        gshift = bshift - gbits;
+        rshift = gshift - rbits;
+        ashift = 0;
+    }
+    else
+        return FALSE;
+
+    *red = ((pixel >> rshift) & ((1 << rbits) - 1)) << (16 - rbits);
+    while (rbits < 16) {
+        *red |= *red >> rbits;
+        rbits <<= 1;
+    }
+
+    *green = ((pixel >> gshift) & ((1 << gbits) - 1)) << (16 - gbits);
+    while (gbits < 16) {
+        *green |= *green >> gbits;
+        gbits <<= 1;
+    }
+
+    *blue = ((pixel >> bshift) & ((1 << bbits) - 1)) << (16 - bbits);
+    while (bbits < 16) {
+        *blue |= *blue >> bbits;
+        bbits <<= 1;
+    }
+
+    if (abits) {
+        *alpha = ((pixel >> ashift) & ((1 << abits) - 1)) << (16 - abits);
+        while (abits < 16) {
+            *alpha |= *alpha >> abits;
+            abits <<= 1;
+        }
+    }
+    else
+        *alpha = 0xffff;
+
+    return TRUE;
+}
+
+/* 8:8:8 + PICT_a8 -> 8:8:8:8 texture */
+
+void
+XAA_888_plus_PICT_a8_to_8888(CARD32 color, CARD8 *alphaPtr,     /* in bytes */
+                             int alphaPitch, CARD32 *dstPtr, int dstPitch,      /* in dwords */
+                             int width, int height)
+{
+    int x;
+
+    color &= 0x00ffffff;
+
+    while (height--) {
+        for (x = 0; x < width; x++)
+            dstPtr[x] = color | (alphaPtr[x] << 24);
+        dstPtr += dstPitch;
+        alphaPtr += alphaPitch;
+    }
+}
+
+#define DRAWABLE_IS_ON_CARD(pDraw) \
+    (pDraw->type == DRAWABLE_WINDOW || \
+     (pDraw->type == DRAWABLE_PIXMAP && IS_OFFSCREEN_PIXMAP(pDraw)))
+
+Bool
+XAADoComposite(CARD8 op,
+               PicturePtr pSrc,
+               PicturePtr pMask,
+               PicturePtr pDst,
+               INT16 xSrc,
+               INT16 ySrc,
+               INT16 xMask,
+               INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
+{
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    RegionRec region;
+    CARD32 *formats, *dstformats;
+    int flags = 0;
+    BoxPtr pbox;
+    int nbox, w, h;
+
+    if (!RegionNumRects(pDst->pCompositeClip))
+        return TRUE;
+
+    if (!infoRec->pScrn->vtSema || !DRAWABLE_IS_ON_CARD(pDst->pDrawable))
+        return FALSE;
+
+    if (DRAWABLE_IS_ON_CARD(pSrc->pDrawable))
+        return FALSE;
+
+    if (pSrc->transform || (pMask && pMask->transform))
+        return FALSE;
+
+    if (pDst->alphaMap || pSrc->alphaMap || (pMask && pMask->alphaMap))
+        return FALSE;
+
+    if ((pSrc->repeat && pSrc->repeatType != RepeatNormal) ||
+        (pMask && pMask->repeat && pMask->repeatType != RepeatNormal)) {
+        return FALSE;
+    }
+
+    xDst += pDst->pDrawable->x;
+    yDst += pDst->pDrawable->y;
+    xSrc += pSrc->pDrawable->x;
+    ySrc += pSrc->pDrawable->y;
+
+    if (pMask) {
+        if (pMask->componentAlpha)
+            return FALSE;
+
+        /* for now we only do it if there is a 1x1 (solid) source */
+
+        if ((pSrc->pDrawable->width == 1) && (pSrc->pDrawable->height == 1)) {
+            CARD16 red, green, blue, alpha;
+            CARD32 pixel =
+                *((CARD32 *) (((PixmapPtr) (pSrc->pDrawable))->devPrivate.ptr));
+
+            if (!XAAGetRGBAFromPixel
+                (pixel, &red, &green, &blue, &alpha, pSrc->format))
+                return FALSE;
+
+            xMask += pMask->pDrawable->x;
+            yMask += pMask->pDrawable->y;
+
+            /* pull out color expandable operations here */
+            if ((pMask->format == PICT_a1) && (alpha == 0xffff) &&
+                (op == PictOpOver) && infoRec->WriteBitmap && !pMask->repeat &&
+                !(infoRec->WriteBitmapFlags & NO_TRANSPARENCY) &&
+                (!(infoRec->WriteBitmapFlags & RGB_EQUAL) ||
+                 ((red == green) && (green == blue)))) {
+                PixmapPtr pPix = (PixmapPtr) (pMask->pDrawable);
+                int skipleft;
+
+                if (!miComputeCompositeRegion(&region, pSrc, pMask, pDst,
+                                              xSrc, ySrc, xMask, yMask, xDst,
+                                              yDst, width, height))
+                    return TRUE;
+
+                nbox = RegionNumRects(&region);
+                pbox = RegionRects(&region);
+
+                if (!nbox)
+                    return TRUE;
+
+                XAAGetPixelFromRGBA(&pixel, red, green, blue, 0, pDst->format);
+
+                xMask -= xDst;
+                yMask -= yDst;
+
+                while (nbox--) {
+                    skipleft = pbox->x1 + xMask;
+
+                    (*infoRec->WriteBitmap) (infoRec->pScrn,
+                                             pbox->x1, pbox->y1,
+                                             pbox->x2 - pbox->x1,
+                                             pbox->y2 - pbox->y1,
+                                             (unsigned char *) (pPix->
+                                                                devPrivate.
+                                                                ptr) +
+                                             (pPix->devKind *
+                                              (pbox->y1 + yMask)) +
+                                             ((skipleft >> 3) & ~3),
+                                             pPix->devKind, skipleft & 31,
+                                             pixel, -1, GXcopy, ~0);
+                    pbox++;
+                }
+
+                /* WriteBitmap sets the Sync flag */
+                RegionUninit(&region);
+                return TRUE;
+            }
+
+            formats = infoRec->CPUToScreenAlphaTextureFormats;
+            dstformats = infoRec->CPUToScreenAlphaTextureDstFormats;
+            if (!formats || !dstformats)
+                return FALSE;
+
+            w = pMask->pDrawable->width;
+            h = pMask->pDrawable->height;
+
+            if (pMask->repeat) {
+                if ((infoRec->CPUToScreenAlphaTextureFlags & XAA_RENDER_NO_TILE)
+                    ||
+                    ((infoRec->
+                      CPUToScreenAlphaTextureFlags &
+                      XAA_RENDER_POWER_OF_2_TILE_ONLY) && ((h & (h - 1)) ||
+                                                           (w & (w - 1))))) {
+                    return FALSE;
+                }
+                flags |= XAA_RENDER_REPEAT;
+            }
+
+            if ((alpha != 0xffff) &&
+                (infoRec->
+                 CPUToScreenAlphaTextureFlags & XAA_RENDER_NO_SRC_ALPHA))
+                return FALSE;
+
+            while (*formats != pMask->format) {
+                if (!(*formats))
+                    return FALSE;
+                formats++;
+            }
+            while (*dstformats != pDst->format) {
+                if (!(*dstformats))
+                    return FALSE;
+                dstformats++;
+            }
+
+            if (!miComputeCompositeRegion(&region, pSrc, pMask, pDst,
+                                          xSrc, ySrc, xMask, yMask, xDst, yDst,
+                                          width, height))
+                return TRUE;
+
+            nbox = RegionNumRects(&region);
+            pbox = RegionRects(&region);
+
+            if (!nbox) {
+                RegionUninit(&region);
+                return TRUE;
+            }
+
+            if (!(infoRec->SetupForCPUToScreenAlphaTexture2) (infoRec->pScrn,
+                                                              op, red, green,
+                                                              blue, alpha,
+                                                              pMask->format,
+                                                              pDst->format,
+                                                              ((PixmapPtr)
+                                                               (pMask->
+                                                                pDrawable))->
+                                                              devPrivate.ptr,
+                                                              ((PixmapPtr)
+                                                               (pMask->
+                                                                pDrawable))->
+                                                              devKind, w, h,
+                                                              flags)) {
+                RegionUninit(&region);
+                return FALSE;
+            }
+
+            xMask -= xDst;
+            yMask -= yDst;
+
+            while (nbox--) {
+                (*infoRec->SubsequentCPUToScreenAlphaTexture) (infoRec->pScrn,
+                                                               pbox->x1,
+                                                               pbox->y1,
+                                                               pbox->x1 + xMask,
+                                                               pbox->y1 + yMask,
+                                                               pbox->x2 -
+                                                               pbox->x1,
+                                                               pbox->y2 -
+                                                               pbox->y1);
+                pbox++;
+            }
+
+            SET_SYNC_FLAG(infoRec);
+            RegionUninit(&region);
+            return TRUE;
+        }
+    }
+    else {
+        formats = infoRec->CPUToScreenTextureFormats;
+        dstformats = infoRec->CPUToScreenTextureDstFormats;
+        if (!formats || !dstformats)
+            return FALSE;
+
+        w = pSrc->pDrawable->width;
+        h = pSrc->pDrawable->height;
+
+        if (pSrc->repeat) {
+            if ((infoRec->CPUToScreenTextureFlags & XAA_RENDER_NO_TILE) ||
+                ((infoRec->CPUToScreenTextureFlags &
+                  XAA_RENDER_POWER_OF_2_TILE_ONLY) &&
+                 ((h & (h - 1)) || (w & (w - 1))))) {
+                return FALSE;
+            }
+            flags |= XAA_RENDER_REPEAT;
+        }
+
+        while (*formats != pSrc->format) {
+            if (!(*formats))
+                return FALSE;
+            formats++;
+        }
+        while (*dstformats != pDst->format) {
+            if (!(*dstformats))
+                return FALSE;
+            dstformats++;
+        }
+
+        if (!miComputeCompositeRegion(&region, pSrc, pMask, pDst,
+                                      xSrc, ySrc, xMask, yMask, xDst, yDst,
+                                      width, height))
+            return TRUE;
+
+        nbox = RegionNumRects(&region);
+        pbox = RegionRects(&region);
+
+        if (!nbox) {
+            RegionUninit(&region);
+            return TRUE;
+        }
+
+        if (!(infoRec->SetupForCPUToScreenTexture2) (infoRec->pScrn,
+                                                     op, pSrc->format,
+                                                     pDst->format,
+                                                     ((PixmapPtr)
+                                                      (pSrc->pDrawable))->
+                                                     devPrivate.ptr,
+                                                     ((PixmapPtr)
+                                                      (pSrc->pDrawable))->
+                                                     devKind, w, h, flags)) {
+            RegionUninit(&region);
+            return FALSE;
+        }
+
+        xSrc -= xDst;
+        ySrc -= yDst;
+
+        while (nbox--) {
+            (*infoRec->SubsequentCPUToScreenTexture) (infoRec->pScrn,
+                                                      pbox->x1, pbox->y1,
+                                                      pbox->x1 + xSrc,
+                                                      pbox->y1 + ySrc,
+                                                      pbox->x2 - pbox->x1,
+                                                      pbox->y2 - pbox->y1);
+            pbox++;
+        }
+
+        SET_SYNC_FLAG(infoRec);
+        RegionUninit(&region);
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static void
+XAACompositeSrcCopy(PicturePtr pSrc,
+                    PicturePtr pDst,
+                    INT16 xSrc,
+                    INT16 ySrc,
+                    INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
+{
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    int i, nbox;
+    int xoff, yoff;
+    BoxPtr pbox;
+    DDXPointPtr pptSrc;
+    RegionRec region;
+
+    xDst += pDst->pDrawable->x;
+    yDst += pDst->pDrawable->y;
+    xSrc += pSrc->pDrawable->x;
+    ySrc += pSrc->pDrawable->y;
+
+    if (!miComputeCompositeRegion(&region, pSrc, NULL, pDst,
+                                  xSrc, ySrc, 0, 0, xDst, yDst, width, height))
+        return;
+
+    nbox = RegionNumRects(&region);
+    pbox = RegionRects(&region);
+
+    if (!nbox) {
+        RegionUninit(&region);
+        return;
+    }
+    pptSrc = malloc(sizeof(DDXPointRec) * nbox);
+    if (!pptSrc) {
+        RegionUninit(&region);
+        return;
+    }
+    xoff = xSrc - xDst;
+    yoff = ySrc - yDst;
+    for (i = 0; i < nbox; i++) {
+        pptSrc[i].x = pbox[i].x1 + xoff;
+        pptSrc[i].y = pbox[i].y1 + yoff;
+    }
+
+    infoRec->ScratchGC.planemask = ~0L;
+    infoRec->ScratchGC.alu = GXcopy;
+
+    XAADoBitBlt(pSrc->pDrawable, pDst->pDrawable, &infoRec->ScratchGC, &region,
+                pptSrc);
+
+    free(pptSrc);
+    RegionUninit(&region);
+    return;
+}
+
+void
+XAAComposite(CARD8 op,
+             PicturePtr pSrc,
+             PicturePtr pMask,
+             PicturePtr pDst,
+             INT16 xSrc,
+             INT16 ySrc,
+             INT16 xMask,
+             INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
+{
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+
+    XAA_RENDER_PROLOGUE(pScreen, Composite);
+
+    if (!pMask && infoRec->pScrn->vtSema &&
+        infoRec->ScreenToScreenBitBlt &&
+        pSrc->pDrawable &&
+        DRAWABLE_IS_ON_CARD(pSrc->pDrawable) &&
+        DRAWABLE_IS_ON_CARD(pDst->pDrawable) &&
+        !pSrc->transform &&
+        (!pSrc->repeat || (xSrc >= 0 && ySrc >= 0 &&
+                           xSrc + width <= pSrc->pDrawable->width &&
+                           ySrc + height <= pSrc->pDrawable->height)) &&
+        ((op == PictOpSrc &&
+          ((pSrc->format == pDst->format) ||
+           (pSrc->format == PICT_a8r8g8b8 && pDst->format == PICT_x8r8g8b8) ||
+           (pSrc->format == PICT_a8b8g8r8 && pDst->format == PICT_x8b8g8r8))) ||
+         (op == PictOpOver && !pSrc->alphaMap && !pDst->alphaMap &&
+          pSrc->format == pDst->format &&
+          (pSrc->format == PICT_x8r8g8b8 || pSrc->format == PICT_x8b8g8r8)))) {
+        XAACompositeSrcCopy(pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height);
+    }
+    else if (!pSrc->pDrawable || (pMask && !pMask->pDrawable) ||
+             !infoRec->Composite ||
+             !(*infoRec->Composite) (op, pSrc, pMask, pDst,
+                                     xSrc, ySrc, xMask, yMask, xDst, yDst,
+                                     width, height)) {
+        if (infoRec->pScrn->vtSema &&
+            ((pSrc->pDrawable &&
+              (pSrc->pDrawable->type == DRAWABLE_WINDOW ||
+               IS_OFFSCREEN_PIXMAP(pSrc->pDrawable))) ||
+             pDst->pDrawable->type == DRAWABLE_WINDOW ||
+             IS_OFFSCREEN_PIXMAP(pDst->pDrawable))) {
+            SYNC_CHECK(pDst->pDrawable);
+        }
+        (*GetPictureScreen(pScreen)->Composite) (op,
+                                                 pSrc,
+                                                 pMask,
+                                                 pDst,
+                                                 xSrc,
+                                                 ySrc,
+                                                 xMask,
+                                                 yMask,
+                                                 xDst, yDst, width, height);
+    }
+
+    if (pDst->pDrawable->type == DRAWABLE_PIXMAP)
+        (XAA_GET_PIXMAP_PRIVATE((PixmapPtr) (pDst->pDrawable)))->flags |= DIRTY;
+
+    XAA_RENDER_EPILOGUE(pScreen, Composite, XAAComposite);
+}
+
+Bool
+XAADoGlyphs(CARD8 op,
+            PicturePtr pSrc,
+            PicturePtr pDst,
+            PictFormatPtr maskFormat,
+            INT16 xSrc,
+            INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr * glyphs)
+{
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+
+    if (!RegionNumRects(pDst->pCompositeClip))
+        return TRUE;
+
+    if (!infoRec->pScrn->vtSema ||
+        ((pDst->pDrawable->type != DRAWABLE_WINDOW) &&
+         !IS_OFFSCREEN_PIXMAP(pDst->pDrawable)))
+        return FALSE;
+
+    if ((pSrc->pDrawable->type != DRAWABLE_PIXMAP) ||
+        IS_OFFSCREEN_PIXMAP(pSrc->pDrawable))
+        return FALSE;
+
+    /*
+     * If it looks like we have a chance of being able to draw these
+     * glyphs with an accelerated Composite, do that now to avoid
+     * unneeded and costly syncs.
+     */
+    if (maskFormat) {
+        if (!infoRec->CPUToScreenAlphaTextureFormats)
+            return FALSE;
+    }
+    else {
+        if (!infoRec->CPUToScreenTextureFormats)
+            return FALSE;
+    }
+
+    miGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
+
+    return TRUE;
+}
+
+void
+XAAGlyphs(CARD8 op,
+          PicturePtr pSrc,
+          PicturePtr pDst,
+          PictFormatPtr maskFormat,
+          INT16 xSrc,
+          INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr * glyphs)
+{
+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+
+    XAA_RENDER_PROLOGUE(pScreen, Glyphs);
+
+    if (!pSrc->pDrawable || !infoRec->Glyphs ||
+        !(*infoRec->Glyphs) (op, pSrc, pDst, maskFormat,
+                             xSrc, ySrc, nlist, list, glyphs)) {
+        if (infoRec->pScrn->vtSema &&
+            ((pSrc->pDrawable &&
+              (pSrc->pDrawable->type == DRAWABLE_WINDOW ||
+               IS_OFFSCREEN_PIXMAP(pSrc->pDrawable))) ||
+             pDst->pDrawable->type == DRAWABLE_WINDOW ||
+             IS_OFFSCREEN_PIXMAP(pDst->pDrawable))) {
+            SYNC_CHECK(pDst->pDrawable);
+        }
+        (*GetPictureScreen(pScreen)->Glyphs) (op, pSrc, pDst, maskFormat,
+                                              xSrc, ySrc, nlist, list, glyphs);
+    }
+
+    if (pDst->pDrawable->type == DRAWABLE_PIXMAP)
+        (XAA_GET_PIXMAP_PRIVATE((PixmapPtr) (pDst->pDrawable)))->flags |= DIRTY;
+
+    XAA_RENDER_EPILOGUE(pScreen, Glyphs, XAAGlyphs);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaROP.c b/xorg-server/hw/xfree86/xaa/xaaROP.c
index 155daa4ee..3b6ec9385 100644
--- a/xorg-server/hw/xfree86/xaa/xaaROP.c
+++ b/xorg-server/hw/xfree86/xaa/xaaROP.c
@@ -13,104 +13,102 @@
 #include "xaa.h"
 #include "xaalocal.h"
 
-
-int XAACopyROP[16] =
-{
-   ROP_0,               /* GXclear */
-   ROP_DSa,             /* GXand */
-   ROP_SDna,            /* GXandReverse */
-   ROP_S,               /* GXcopy */
-   ROP_DSna,            /* GXandInverted */
-   ROP_D,               /* GXnoop */
-   ROP_DSx,             /* GXxor */
-   ROP_DSo,             /* GXor */
-   ROP_DSon,            /* GXnor */
-   ROP_DSxn,            /* GXequiv */
-   ROP_Dn,              /* GXinvert*/
-   ROP_SDno,            /* GXorReverse */
-   ROP_Sn,              /* GXcopyInverted */
-   ROP_DSno,            /* GXorInverted */
-   ROP_DSan,            /* GXnand */
-   ROP_1                /* GXset */
+int XAACopyROP[16] = {
+    ROP_0,                      /* GXclear */
+    ROP_DSa,                    /* GXand */
+    ROP_SDna,                   /* GXandReverse */
+    ROP_S,                      /* GXcopy */
+    ROP_DSna,                   /* GXandInverted */
+    ROP_D,                      /* GXnoop */
+    ROP_DSx,                    /* GXxor */
+    ROP_DSo,                    /* GXor */
+    ROP_DSon,                   /* GXnor */
+    ROP_DSxn,                   /* GXequiv */
+    ROP_Dn,                     /* GXinvert */
+    ROP_SDno,                   /* GXorReverse */
+    ROP_Sn,                     /* GXcopyInverted */
+    ROP_DSno,                   /* GXorInverted */
+    ROP_DSan,                   /* GXnand */
+    ROP_1                       /* GXset */
 };
 
-int XAACopyROP_PM[16] =
-{
-   ROP_0,		/* not used */
-   ROP_DSPnoa,
-   ROP_DPSnaon,
-   ROP_DPSDxax,
-   ROP_DPSana,
-   ROP_D,		/* not used */
-   ROP_DPSax,
-   ROP_DPSao,
-   ROP_DPSaon,
-   ROP_DPSaxn,
-   ROP_Dn,		/* not used */
-   ROP_DPSanan,
-   ROP_PSDPxox,		/* is that correct ? */
-   ROP_DPSnao,
-   ROP_DSPnoan,
-   ROP_1		/* not used */
+int XAACopyROP_PM[16] = {
+    ROP_0,                      /* not used */
+    ROP_DSPnoa,
+    ROP_DPSnaon,
+    ROP_DPSDxax,
+    ROP_DPSana,
+    ROP_D,                      /* not used */
+    ROP_DPSax,
+    ROP_DPSao,
+    ROP_DPSaon,
+    ROP_DPSaxn,
+    ROP_Dn,                     /* not used */
+    ROP_DPSanan,
+    ROP_PSDPxox,                /* is that correct ? */
+    ROP_DPSnao,
+    ROP_DSPnoan,
+    ROP_1                       /* not used */
 };
 
-
-int XAAPatternROP[16]=
-{
-   ROP_0,
-   ROP_DPa,
-   ROP_PDna,
-   ROP_P,
-   ROP_DPna,
-   ROP_D,
-   ROP_DPx,
-   ROP_DPo,
-   ROP_DPon,
-   ROP_PDxn,
-   ROP_Dn,
-   ROP_PDno,
-   ROP_Pn,
-   ROP_DPno,
-   ROP_DPan,
-   ROP_1
+int XAAPatternROP[16] = {
+    ROP_0,
+    ROP_DPa,
+    ROP_PDna,
+    ROP_P,
+    ROP_DPna,
+    ROP_D,
+    ROP_DPx,
+    ROP_DPo,
+    ROP_DPon,
+    ROP_PDxn,
+    ROP_Dn,
+    ROP_PDno,
+    ROP_Pn,
+    ROP_DPno,
+    ROP_DPan,
+    ROP_1
 };
 
-int XAAPatternROP_PM[16] =
-{
-   ROP_DPna,
-   ROP_DPSnoa,
-   ROP_DSPnaon,
-   ROP_DSPDxax,
-   ROP_DPSana,
-   ROP_D,
-   ROP_DPSax,
-   ROP_DPSao,
-   ROP_DPSaon,
-   ROP_DPSaxn,
-   ROP_DPx,
-   ROP_DPSanan, 
-   ROP_SPDSxox,		/* is that correct ? */
-   ROP_DSPnao,
-   ROP_DPSnoan,
-   ROP_DPo
+int XAAPatternROP_PM[16] = {
+    ROP_DPna,
+    ROP_DPSnoa,
+    ROP_DSPnaon,
+    ROP_DSPDxax,
+    ROP_DPSana,
+    ROP_D,
+    ROP_DPSax,
+    ROP_DPSao,
+    ROP_DPSaon,
+    ROP_DPSaxn,
+    ROP_DPx,
+    ROP_DPSanan,
+    ROP_SPDSxox,                /* is that correct ? */
+    ROP_DSPnao,
+    ROP_DPSnoan,
+    ROP_DPo
 };
 
-int XAAGetCopyROP(int i)
+int
+XAAGetCopyROP(int i)
 {
     return XAACopyROP[i];
 }
 
-int XAAGetCopyROP_PM(int i)
+int
+XAAGetCopyROP_PM(int i)
 {
     return XAACopyROP_PM[i];
 }
 
-int XAAGetPatternROP(int i)
+int
+XAAGetPatternROP(int i)
 {
     return XAAPatternROP[i];
 }
 
-int XAAGetPatternROP_PM(int i)
+int
+XAAGetPatternROP_PM(int i)
 {
     return XAAPatternROP_PM[i];
 }
@@ -120,65 +118,65 @@ XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop)
 {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     int ret = 0;
-    
+
     pm &= infoRec->FullPlanemasks[pScrn->depth - 1];
 
-    if(pm == infoRec->FullPlanemasks[pScrn->depth - 1]) {
-	if(!NO_SRC_ROP(*rop)) 
-	   ret |= ROP_PAT;
-	*rop = XAAPatternROP[*rop];
-    } else {	
-	switch(*rop) {
-	case GXnoop:
-	    break;
-	case GXset:
-	case GXclear:
-	case GXinvert:
-	    ret |= ROP_PAT;
-	    *fg = pm;
-	    if(*bg != -1)
-		*bg = pm;
-	    break;
-	default:
-	    ret |= ROP_PAT | ROP_SRC;
-	    break;
-	}
-	*rop = XAAPatternROP_PM[*rop];
+    if (pm == infoRec->FullPlanemasks[pScrn->depth - 1]) {
+        if (!NO_SRC_ROP(*rop))
+            ret |= ROP_PAT;
+        *rop = XAAPatternROP[*rop];
+    }
+    else {
+        switch (*rop) {
+        case GXnoop:
+            break;
+        case GXset:
+        case GXclear:
+        case GXinvert:
+            ret |= ROP_PAT;
+            *fg = pm;
+            if (*bg != -1)
+                *bg = pm;
+            break;
+        default:
+            ret |= ROP_PAT | ROP_SRC;
+            break;
+        }
+        *rop = XAAPatternROP_PM[*rop];
     }
 
     return ret;
 }
 
-
 int
 XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop)
 {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     int ret = 0;
-    
+
     pm &= infoRec->FullPlanemasks[pScrn->depth - 1];
 
-    if(pm == infoRec->FullPlanemasks[pScrn->depth - 1]) {
-	if(!NO_SRC_ROP(*rop)) 
-	   ret |= ROP_PAT;
-	*rop = XAAPatternROP[*rop];
-    } else {	
-	switch(*rop) {
-	case GXnoop:
-	    break;
-	case GXset:
-	case GXclear:
-	case GXinvert:
-	    ret |= ROP_PAT;
-	    *fg = pm;
-	    break;
-	default:
-	    ret |= ROP_PAT | ROP_SRC;
-	    break;
-	}
-	*rop = XAAPatternROP_PM[*rop];
+    if (pm == infoRec->FullPlanemasks[pScrn->depth - 1]) {
+        if (!NO_SRC_ROP(*rop))
+            ret |= ROP_PAT;
+        *rop = XAAPatternROP[*rop];
+    }
+    else {
+        switch (*rop) {
+        case GXnoop:
+            break;
+        case GXset:
+        case GXclear:
+        case GXinvert:
+            ret |= ROP_PAT;
+            *fg = pm;
+            break;
+        default:
+            ret |= ROP_PAT | ROP_SRC;
+            break;
+        }
+        *rop = XAAPatternROP_PM[*rop];
     }
 
     return ret;
 }
-
diff --git a/xorg-server/hw/xfree86/xaa/xaaRect.c b/xorg-server/hw/xfree86/xaa/xaaRect.c
index 988dbf608..002090085 100644
--- a/xorg-server/hw/xfree86/xaa/xaaRect.c
+++ b/xorg-server/hw/xfree86/xaa/xaaRect.c
@@ -1,136 +1,121 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-

-/*

-   Much of this file based on code by 

-	Harm Hanemaayer (H.Hanemaayer@inter.nl.net).

-*/

-

-

-void

-XAAPolyRectangleThinSolid(

-    DrawablePtr  pDrawable,

-    GCPtr        pGC,    

-    int	         nRectsInit,

-    xRectangle  *pRectsInit )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    int         nClipRects;     /* number of clip rectangles */

-    BoxPtr      pClipRects;     /* points to the list of clip rects */

-    int         xOrigin;        /* Drawables x origin */

-    int         yOrigin;        /* Drawables x origin */

-    xRectangle *pRect;          /* list of rects */

-    int         nRects;         /* running count of number of rects */

-    int         origX1, origY1; /* original rectangle's U/L corner */

-    int         origX2, origY2; /* original rectangle's L/R corner */

-    int         clippedX1;      /* clipped rectangle's left x */

-    int         clippedY1;      /* clipped rectangle's top y */

-    int         clippedX2;      /* clipped rectangle's right x */

-    int         clippedY2;      /* clipped rectangle's bottom y */

-    int         clipXMin;       /* upper left corner of clip rect */

-    int         clipYMin;       /* upper left corner of clip rect */

-    int         clipXMax;       /* lower right corner of clip rect */

-    int         clipYMax;       /* lower right corner of clip rect */

-    int         width, height;  /* width and height of rect */

-

-    nClipRects = RegionNumRects(pGC->pCompositeClip);

-    pClipRects = RegionRects(pGC->pCompositeClip);

-

-    if(!nClipRects) return;

-

-    xOrigin = pDrawable->x;

-    yOrigin = pDrawable->y;

-

-

-    (*infoRec->SetupForSolidLine)(infoRec->pScrn, 

-			pGC->fgPixel, pGC->alu, pGC->planemask);

-

-

-    for ( ; nClipRects > 0; 

-	  nClipRects--, pClipRects++ )

-    {

-        clipYMin = pClipRects->y1;

-        clipYMax = pClipRects->y2 - 1;

-        clipXMin = pClipRects->x1;

-        clipXMax = pClipRects->x2 - 1;

-

-	for (pRect = pRectsInit, nRects = nRectsInit; 

-	     nRects > 0; 

-	     nRects--, pRect++ )

-        {

-	    /* translate rectangle data over to the drawable */

-            origX1 = pRect->x + xOrigin; 

-	    origY1 = pRect->y + yOrigin;

-            origX2 = origX1 + pRect->width; 

-	    origY2 = origY1 + pRect->height; 

-

-	    /* reject entire rectangle if completely outside clip rect */

-	    if ((origX1 > clipXMax) || (origX2 < clipXMin) ||

-		(origY1 > clipYMax) || (origY2 < clipYMin))

-	        continue;

-

-	    /* clip the rectangle */

-	    clippedX1 = max (origX1, clipXMin);

-	    clippedX2 = min (origX2, clipXMax);

-	    clippedY1 = max (origY1, clipYMin);

-	    clippedY2 = min (origY2, clipYMax);

-

-	    width = clippedX2 - clippedX1 + 1;

-

-	    if (origY1 >= clipYMin) {

-		(*infoRec->SubsequentSolidHorVertLine)(infoRec->pScrn,

-			clippedX1, clippedY1, width, DEGREES_0);

-

-		/* don't overwrite corner */

-		clippedY1++;

-	    }

-

-	    if ((origY2 <= clipYMax) && (origY1 != origY2)) {

-		(*infoRec->SubsequentSolidHorVertLine)(infoRec->pScrn,

-			clippedX1, clippedY2, width, DEGREES_0);

-

-		/* don't overwrite corner */

-		clippedY2--; 

-	    }

-

-	    if (clippedY2 < clippedY1) continue;

-

-	    height = clippedY2 - clippedY1 + 1;

-

-	    /* draw vertical edges using lines if not clipped out */

-            if (origX1 >= clipXMin) 

-		(*infoRec->SubsequentSolidHorVertLine)(infoRec->pScrn,

-			clippedX1, clippedY1, height, DEGREES_270);

-

-            if ((origX2 <= clipXMax) && (origX2 != origX1))

-		(*infoRec->SubsequentSolidHorVertLine)(infoRec->pScrn,

-			clippedX2, clippedY1, height, DEGREES_270);

-	}

-    }

-

-    SET_SYNC_FLAG(infoRec);

-} 

-

-

-

-

-

-

-

-

-

-

-

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+
+/*
+   Much of this file based on code by 
+	Harm Hanemaayer (H.Hanemaayer@inter.nl.net).
+*/
+
+void
+XAAPolyRectangleThinSolid(DrawablePtr pDrawable,
+                          GCPtr pGC, int nRectsInit, xRectangle *pRectsInit)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int nClipRects;             /* number of clip rectangles */
+    BoxPtr pClipRects;          /* points to the list of clip rects */
+    int xOrigin;                /* Drawables x origin */
+    int yOrigin;                /* Drawables x origin */
+    xRectangle *pRect;          /* list of rects */
+    int nRects;                 /* running count of number of rects */
+    int origX1, origY1;         /* original rectangle's U/L corner */
+    int origX2, origY2;         /* original rectangle's L/R corner */
+    int clippedX1;              /* clipped rectangle's left x */
+    int clippedY1;              /* clipped rectangle's top y */
+    int clippedX2;              /* clipped rectangle's right x */
+    int clippedY2;              /* clipped rectangle's bottom y */
+    int clipXMin;               /* upper left corner of clip rect */
+    int clipYMin;               /* upper left corner of clip rect */
+    int clipXMax;               /* lower right corner of clip rect */
+    int clipYMax;               /* lower right corner of clip rect */
+    int width, height;          /* width and height of rect */
+
+    nClipRects = RegionNumRects(pGC->pCompositeClip);
+    pClipRects = RegionRects(pGC->pCompositeClip);
+
+    if (!nClipRects)
+        return;
+
+    xOrigin = pDrawable->x;
+    yOrigin = pDrawable->y;
+
+    (*infoRec->SetupForSolidLine) (infoRec->pScrn,
+                                   pGC->fgPixel, pGC->alu, pGC->planemask);
+
+    for (; nClipRects > 0; nClipRects--, pClipRects++) {
+        clipYMin = pClipRects->y1;
+        clipYMax = pClipRects->y2 - 1;
+        clipXMin = pClipRects->x1;
+        clipXMax = pClipRects->x2 - 1;
+
+        for (pRect = pRectsInit, nRects = nRectsInit;
+             nRects > 0; nRects--, pRect++) {
+            /* translate rectangle data over to the drawable */
+            origX1 = pRect->x + xOrigin;
+            origY1 = pRect->y + yOrigin;
+            origX2 = origX1 + pRect->width;
+            origY2 = origY1 + pRect->height;
+
+            /* reject entire rectangle if completely outside clip rect */
+            if ((origX1 > clipXMax) || (origX2 < clipXMin) ||
+                (origY1 > clipYMax) || (origY2 < clipYMin))
+                continue;
+
+            /* clip the rectangle */
+            clippedX1 = max(origX1, clipXMin);
+            clippedX2 = min(origX2, clipXMax);
+            clippedY1 = max(origY1, clipYMin);
+            clippedY2 = min(origY2, clipYMax);
+
+            width = clippedX2 - clippedX1 + 1;
+
+            if (origY1 >= clipYMin) {
+                (*infoRec->SubsequentSolidHorVertLine) (infoRec->pScrn,
+                                                        clippedX1, clippedY1,
+                                                        width, DEGREES_0);
+
+                /* don't overwrite corner */
+                clippedY1++;
+            }
+
+            if ((origY2 <= clipYMax) && (origY1 != origY2)) {
+                (*infoRec->SubsequentSolidHorVertLine) (infoRec->pScrn,
+                                                        clippedX1, clippedY2,
+                                                        width, DEGREES_0);
+
+                /* don't overwrite corner */
+                clippedY2--;
+            }
+
+            if (clippedY2 < clippedY1)
+                continue;
+
+            height = clippedY2 - clippedY1 + 1;
+
+            /* draw vertical edges using lines if not clipped out */
+            if (origX1 >= clipXMin)
+                (*infoRec->SubsequentSolidHorVertLine) (infoRec->pScrn,
+                                                        clippedX1, clippedY1,
+                                                        height, DEGREES_270);
+
+            if ((origX2 <= clipXMax) && (origX2 != origX1))
+                (*infoRec->SubsequentSolidHorVertLine) (infoRec->pScrn,
+                                                        clippedX2, clippedY1,
+                                                        height, DEGREES_270);
+        }
+    }
+
+    SET_SYNC_FLAG(infoRec);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaSpans.c b/xorg-server/hw/xfree86/xaa/xaaSpans.c
index 1e6ef3a18..f03452a46 100644
--- a/xorg-server/hw/xfree86/xaa/xaaSpans.c
+++ b/xorg-server/hw/xfree86/xaa/xaaSpans.c
@@ -1,882 +1,876 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "xf86str.h"

-#include "mi.h"

-#include "mispans.h"

-#include "xaa.h"

-#include "xaalocal.h"

-

-

-static void XAARenderSolidSpans(

-	GCPtr, int, DDXPointPtr, int*, int, int, int);

-static void XAARenderColor8x8Spans(

-	GCPtr, int, DDXPointPtr, int*, int, int, int);

-static void XAARenderMono8x8Spans(

-	GCPtr, int, DDXPointPtr, int*, int, int, int);

-static void XAARenderCacheBltSpans(

-	GCPtr, int, DDXPointPtr, int*, int, int, int);

-static void XAARenderColorExpandSpans(

-	GCPtr, int, DDXPointPtr, int*, int, int, int);

-static void XAARenderCacheExpandSpans(

-	GCPtr, int, DDXPointPtr, int*, int, int, int);

-static void XAARenderPixmapCopySpans(

-	GCPtr, int, DDXPointPtr, int*, int, int, int);

-

-void

-XAAFillSpans(

-    DrawablePtr pDraw,

-    GC		*pGC,

-    int		nInit,		/* number of spans to fill */

-    DDXPointPtr pptInit,	/* pointer to list of start points */

-    int *pwidthInit,		/* pointer to list of n widths */

-    int fSorted 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    int type = 0;

-    ClipAndRenderSpansFunc function;

-    Bool fastClip = FALSE;

-

-    if((nInit <= 0) || !pGC->planemask)

-        return;

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    switch(pGC->fillStyle) {

-    case FillSolid:

-	type = DO_SOLID;

-	break;

-    case FillStippled:

-	type = (*infoRec->StippledFillChooser)(pGC);

-	break;

-    case FillOpaqueStippled:

-	if((pGC->fgPixel == pGC->bgPixel) && infoRec->FillSpansSolid &&

-                CHECK_PLANEMASK(pGC,infoRec->FillSpansSolidFlags) &&

-                CHECK_ROP(pGC,infoRec->FillSpansSolidFlags) &&

-                CHECK_ROPSRC(pGC,infoRec->FillSpansSolidFlags) &&

-                CHECK_FG(pGC,infoRec->FillSpansSolidFlags))

-	    type = DO_SOLID;

-	else

-	    type = (*infoRec->OpaqueStippledFillChooser)(pGC);

-	break;

-    case FillTiled:

-	type = (*infoRec->TiledFillChooser)(pGC);

-	break;

-    }

-

-    switch(type) {

-    case DO_SOLID:

-	function = XAARenderSolidSpans;	

-	if(infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL) 

-		fastClip = TRUE; 

-	break;	

-    case DO_COLOR_8x8:

-	function = XAARenderColor8x8Spans;	

-	if(infoRec->ClippingFlags & HARDWARE_CLIP_COLOR_8x8_FILL) 

-		fastClip = TRUE; 

-	break;	

-    case DO_MONO_8x8:

-	function = XAARenderMono8x8Spans;	

-	if(infoRec->ClippingFlags & HARDWARE_CLIP_MONO_8x8_FILL) 

-		fastClip = TRUE; 

-	break;	

-    case DO_CACHE_BLT:

-	function = XAARenderCacheBltSpans;	

-	if(infoRec->ClippingFlags & HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY)

-		fastClip = TRUE; 

-	break;	

-    case DO_COLOR_EXPAND:

-	function = XAARenderColorExpandSpans;	

-	break;	

-    case DO_CACHE_EXPAND:

-	function = XAARenderCacheExpandSpans;	

-	if(infoRec->ClippingFlags & 

-			HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND) 

-		fastClip = TRUE; 

-	break;	

-    case DO_PIXMAP_COPY:

-	function = XAARenderPixmapCopySpans;	

-	if(infoRec->ClippingFlags & HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY)

-		fastClip = TRUE; 

-	break;	

-    case DO_IMAGE_WRITE:

-    default:

-	(*XAAFallbackOps.FillSpans)(pDraw, pGC, nInit, pptInit,

-				pwidthInit, fSorted);

-	return;

-    }

-

-

-    if((nInit < 10) || (RegionNumRects(pGC->pCompositeClip) != 1))

-	fastClip = FALSE;

-

-    if(fastClip) {

-	infoRec->ClipBox = &pGC->pCompositeClip->extents;

-	(*function)(pGC, nInit, pptInit, pwidthInit, fSorted, 

-					pDraw->x, pDraw->y);

-	infoRec->ClipBox = NULL;

-    } else

-	XAAClipAndRenderSpans(pGC, pptInit, pwidthInit, nInit, fSorted,

-					function, pDraw->x, pDraw->y);

-}

-

-

-	/*********************\

-	|     Solid Spans     |

-	\*********************/

-

-

-static void

-XAARenderSolidSpans(

-    GCPtr pGC,

-    int	n,

-    DDXPointPtr ppt,

-    int *pwidth,

-    int fSorted,

-    int xorg, int yorg 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-

-    (*infoRec->FillSolidSpans) (infoRec->pScrn, pGC->fgPixel, 

-		pGC->alu, pGC->planemask, n, ppt, pwidth, fSorted);    

-}

-

-

-	/************************\

-	|     Mono 8x8 Spans     |

-	\************************/

-

-

-static void

-XAARenderMono8x8Spans(

-    GCPtr pGC,

-    int	n,

-    DDXPointPtr ppt,

-    int *pwidth,

-    int fSorted,

-    int xorg, int yorg 

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   XAAPixmapPtr pPriv;

-   int fg, bg;

-

-   switch(pGC->fillStyle) {

-   case FillStippled:

-      pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);

-      fg = pGC->fgPixel;  bg = -1;

-      break;

-   case FillOpaqueStippled:

-      pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);

-      fg = pGC->fgPixel;  bg = pGC->bgPixel;

-      break;

-   case FillTiled:

-      pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);

-      fg = pPriv->fg;  bg = pPriv->bg;

-      break;

-   default:	/* Muffle compiler */

-      pPriv = NULL;	/* Kaboom */

-      fg = -1;  bg = -1;

-      break;

-   }

-

-   (*infoRec->FillMono8x8PatternSpans) (infoRec->pScrn, 

-                fg, bg, pGC->alu, pGC->planemask, 

-                n, ppt, pwidth, fSorted, pPriv->pattern0, pPriv->pattern1, 

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y));	  

-}

-

-

-	/*************************\

-	|     Color 8x8 Spans     |

-	\*************************/

-

-

-static void

-XAARenderColor8x8Spans(

-    GCPtr pGC,

-    int	n,

-    DDXPointPtr ppt,

-    int *pwidth,

-    int fSorted,

-    int xorg, int yorg 

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   XAACacheInfoPtr pCache;

-   PixmapPtr pPix;

-   int fg, bg;

-

-   switch(pGC->fillStyle) {

-   case FillStippled:

-      pPix = pGC->stipple;

-      fg = pGC->fgPixel;  bg = -1;

-      break;

-   case FillOpaqueStippled:

-      pPix = pGC->stipple;

-      fg = pGC->fgPixel;  bg = pGC->bgPixel;

-      break;

-   case FillTiled:

-      pPix = pGC->tile.pixmap;

-      fg = -1;  bg = -1;

-      break;

-   default:	/* Muffle compiler */

-      pPix = NULL;

-      fg = -1;  bg = -1;

-      break;

-   }

-

-   pCache = (*infoRec->CacheColor8x8Pattern)(infoRec->pScrn, pPix, fg, bg);

-

-   (*infoRec->FillColor8x8PatternSpans) (infoRec->pScrn, 

-                pGC->alu, pGC->planemask, n, ppt, pwidth, fSorted, pCache,

-                (yorg + pGC->patOrg.x), (xorg + pGC->patOrg.y));

-}

-

-

-	/****************************\

-	|     Color Expand Spans     |

-	\****************************/

-

-

-static void

-XAARenderColorExpandSpans(

-    GCPtr pGC,

-    int	n,

-    DDXPointPtr ppt,

-    int *pwidth,

-    int fSorted,

-    int xorg, int yorg 

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   int fg, bg;

-

-   switch(pGC->fillStyle) {

-   case FillStippled:

-      fg = pGC->fgPixel;  bg = -1;

-      break;

-   case FillOpaqueStippled:

-      fg = pGC->fgPixel;  bg = pGC->bgPixel;

-      break;

-   default:	/* Muffle compiler */

-      fg = -1;  bg = -1;

-      break;

-   }

-

-   (*infoRec->FillColorExpandSpans) (infoRec->pScrn, fg, bg,

-                pGC->alu, pGC->planemask, n, ppt, pwidth, fSorted,

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y),

-                pGC->stipple); 

-

-}

-

-

-	/*************************\

-	|     Cache Blt Spans     |

-	\*************************/

-

-

-static void

-XAARenderCacheBltSpans(

-    GCPtr pGC,

-    int	n,

-    DDXPointPtr ppt,

-    int *pwidth,

-    int fSorted,

-    int xorg, int yorg 

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   XAACacheInfoPtr pCache;

-

-   switch(pGC->fillStyle) {

-   case FillStippled:

-      pCache = (*infoRec->CacheStipple)(infoRec->pScrn, pGC->stipple, 

-					pGC->fgPixel, -1);

-      break;

-   case FillOpaqueStippled:

-      pCache = (*infoRec->CacheStipple)(infoRec->pScrn, pGC->stipple, 

-					pGC->fgPixel, pGC->bgPixel);

-      break;

-   case FillTiled:

-      pCache = (*infoRec->CacheTile)(infoRec->pScrn, pGC->tile.pixmap);

-      break;

-   default:	/* Muffle compiler */

-      pCache = NULL;

-      break;

-   }

-

-   (*infoRec->FillCacheBltSpans) (infoRec->pScrn, 

-                pGC->alu, pGC->planemask, n, ppt, pwidth, fSorted, pCache, 

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y));

-

-}

-

-

-	/****************************\

-	|     Cache Expand Spans     |

-	\****************************/

-

-

-static void

-XAARenderCacheExpandSpans(

-    GCPtr pGC,

-    int	n,

-    DDXPointPtr ppt,

-    int *pwidth,

-    int fSorted,

-    int xorg, int yorg 

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   int fg, bg;

-

-   switch(pGC->fillStyle) {

-   case FillStippled:

-      fg = pGC->fgPixel;  bg = -1;

-      break;

-   case FillOpaqueStippled:

-      fg = pGC->fgPixel;  bg = pGC->bgPixel;

-      break;

-   default:	/* Muffle compiler */

-      fg = -1;  bg = -1;

-      break;

-   }

-

-   (*infoRec->FillCacheExpandSpans) (infoRec->pScrn, fg, bg,

-                pGC->alu, pGC->planemask, n, ppt, pwidth, fSorted,

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y),

-                pGC->stipple); 

-}

-

-

-	/***************************\

-	|     Pixmap Copy Spans     |

-	\***************************/

-

-

-static void

-XAARenderPixmapCopySpans(

-    GCPtr pGC,

-    int	n,

-    DDXPointPtr ppt,

-    int *pwidth,

-    int fSorted,

-    int xorg, int yorg 

-){

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-   XAACacheInfoPtr pCache = &(infoRec->ScratchCacheInfoRec);

-   XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);

-

-   pCache->x = pPriv->offscreenArea->box.x1;

-   pCache->y = pPriv->offscreenArea->box.y1;

-   pCache->w = pCache->orig_w = 

-		pPriv->offscreenArea->box.x2 - pCache->x;

-   pCache->h = pCache->orig_h = 

-		pPriv->offscreenArea->box.y2 - pCache->y;

-   pCache->trans_color = -1;

-

-   (*infoRec->FillCacheBltSpans) (infoRec->pScrn, 

-                pGC->alu, pGC->planemask, n, ppt, pwidth, fSorted, pCache, 

-                (xorg + pGC->patOrg.x), (yorg + pGC->patOrg.y));

-}

-

-

-

-

-

-	/****************\

-	|     Solid      |

-	\****************/

-

-

-void

-XAAFillSolidSpans(

-   ScrnInfoPtr pScrn,

-   int fg, int rop,

-   unsigned int planemask,

-   int n,

-   DDXPointPtr ppt,

-   int *pwidth, int fSorted 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-

-    (*infoRec->SetupForSolidFill)(pScrn, fg, rop, planemask);

-

-    if(infoRec->ClipBox)

-	(*infoRec->SetClippingRectangle)(infoRec->pScrn,

-		infoRec->ClipBox->x1, infoRec->ClipBox->y1, 

-		infoRec->ClipBox->x2 - 1, infoRec->ClipBox->y2 - 1);

-

-    while(n--) {

-	if (*pwidth > 0)

-            (*infoRec->SubsequentSolidFillRect)(pScrn, ppt->x, ppt->y, 

-								*pwidth, 1);

-	ppt++; pwidth++;

-    }

-

-    if(infoRec->ClipBox)

-	(*infoRec->DisableClipping)(infoRec->pScrn);

-

-    SET_SYNC_FLAG(infoRec);

-}

-

-	/***************\

-	|   Mono 8x8    |

-	\***************/

-

-

-void

-XAAFillMono8x8PatternSpansScreenOrigin(

-   ScrnInfoPtr pScrn,

-   int fg, int bg, int rop,

-   unsigned int planemask,

-   int n,

-   DDXPointPtr ppt,

-   int *pwidth, int fSorted,

-   int pattern0, int pattern1,

-   int xorigin, int yorigin 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int patx = pattern0, paty = pattern1;

-    int xorg = (-xorigin) & 0x07;

-    int yorg = (-yorigin) & 0x07;

-

-

-    if(infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS) {

-   	if(!(infoRec->Mono8x8PatternFillFlags & 		

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	    XAARotateMonoPattern(&patx, &paty, xorg, yorg,

-				(infoRec->Mono8x8PatternFillFlags & 		

-				BIT_ORDER_IN_BYTE_MSBFIRST));

-	    xorg = patx; yorg = paty;

-        }

-    } else {

-	XAACacheInfoPtr pCache =

-		(*infoRec->CacheMono8x8Pattern)(pScrn, pattern0, pattern1);

-	patx = pCache->x;  paty = pCache->y;

-   	if(!(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	    int slot = (yorg << 3) + xorg;

-	    patx += pCache->offsets[slot].x;

-	    paty += pCache->offsets[slot].y;

-	    xorg = patx;  yorg = paty;

-	}	

-    }

-

-    (*infoRec->SetupForMono8x8PatternFill)(pScrn, patx, paty,

-	fg, bg, rop, planemask);

-

-    if(infoRec->ClipBox)

-	(*infoRec->SetClippingRectangle)(infoRec->pScrn,

-		infoRec->ClipBox->x1, infoRec->ClipBox->y1, 

-		infoRec->ClipBox->x2 - 1, infoRec->ClipBox->y2 - 1);

-

-     while(n--) {

-        (*infoRec->SubsequentMono8x8PatternFillRect)(pScrn, 

-			xorg, yorg, ppt->x, ppt->y, *pwidth, 1);

-	ppt++; pwidth++;

-     }

-

-     if(infoRec->ClipBox)

-	(*infoRec->DisableClipping)(infoRec->pScrn);

-

-     SET_SYNC_FLAG(infoRec);

-}

-

-

-void

-XAAFillMono8x8PatternSpans(

-   ScrnInfoPtr pScrn,

-   int fg, int bg, int rop,

-   unsigned int planemask,

-   int n,

-   DDXPointPtr ppt,

-   int *pwidth, int fSorted,

-   int pattern0, int pattern1,

-   int xorigin, int yorigin 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int patx = pattern0, paty = pattern1;

-    int xorg, yorg, slot;

-    XAACacheInfoPtr pCache = NULL;

-

-

-    if(!(infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS)){

-	pCache = (*infoRec->CacheMono8x8Pattern)(pScrn, pattern0, pattern1);

-	patx = pCache->x;  paty = pCache->y;

-    }

-

-    (*infoRec->SetupForMono8x8PatternFill)(pScrn, patx, paty,

-					fg, bg, rop, planemask);

-

-    if(infoRec->ClipBox)

-	(*infoRec->SetClippingRectangle)(infoRec->pScrn,

-		infoRec->ClipBox->x1, infoRec->ClipBox->y1, 

-		infoRec->ClipBox->x2 - 1, infoRec->ClipBox->y2 - 1);

-

-     while(n--) {

-	xorg = (ppt->x - xorigin) & 0x07;

-	yorg = (ppt->y - yorigin) & 0x07;

-

-   	if(!(infoRec->Mono8x8PatternFillFlags & 		

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	    if(infoRec->Mono8x8PatternFillFlags & 

-				HARDWARE_PATTERN_PROGRAMMED_BITS) {

-		patx = pattern0; paty = pattern1;

-		XAARotateMonoPattern(&patx, &paty, xorg, yorg,

-				(infoRec->Mono8x8PatternFillFlags & 		

-				BIT_ORDER_IN_BYTE_MSBFIRST));

-		xorg = patx; yorg = paty;

-	    } else {

-		slot = (yorg << 3) + xorg;

-	    	xorg = patx + pCache->offsets[slot].x;

-	    	yorg = paty + pCache->offsets[slot].y;

-	    }

-        }

-

-        (*infoRec->SubsequentMono8x8PatternFillRect)(pScrn, 

-			xorg, yorg, ppt->x, ppt->y, *pwidth, 1);

-	ppt++; pwidth++;

-     }

-

-     if(infoRec->ClipBox)

-	(*infoRec->DisableClipping)(infoRec->pScrn);

-

-     SET_SYNC_FLAG(infoRec);

-}

-

-

-

-	/****************\

-	|   Color 8x8    |

-	\****************/

-

-

-void

-XAAFillColor8x8PatternSpansScreenOrigin(

-   ScrnInfoPtr pScrn,

-   int rop,

-   unsigned int planemask,

-   int n,

-   DDXPointPtr ppt,

-   int *pwidth, int fSorted,

-   XAACacheInfoPtr pCache,

-   int xorigin, int yorigin 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int patx = pCache->x, paty = pCache->y;

-    int xorg = (-xorigin) & 0x07;

-    int yorg = (-yorigin) & 0x07;

-

-

-    if(!(infoRec->Color8x8PatternFillFlags & 

-					HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	int slot = (yorg << 3) + xorg;

-	paty += pCache->offsets[slot].y;

-	patx += pCache->offsets[slot].x;

-	xorg = patx;  yorg = paty;

-    }	

-

-    (*infoRec->SetupForColor8x8PatternFill)(pScrn, patx, paty,

-			 rop, planemask, pCache->trans_color);

-

-    if(infoRec->ClipBox)

-	(*infoRec->SetClippingRectangle)(infoRec->pScrn,

-		infoRec->ClipBox->x1, infoRec->ClipBox->y1, 

-		infoRec->ClipBox->x2 - 1, infoRec->ClipBox->y2 - 1);

-

-     while(n--) {

-        (*infoRec->SubsequentColor8x8PatternFillRect)(pScrn, 

-			xorg, yorg, ppt->x, ppt->y, *pwidth, 1);

-	ppt++; pwidth++;

-     }

- 

-    if(infoRec->ClipBox)

-	(*infoRec->DisableClipping)(infoRec->pScrn);

-

-     SET_SYNC_FLAG(infoRec);

-}

-

-

-void

-XAAFillColor8x8PatternSpans(

-   ScrnInfoPtr pScrn,

-   int rop,

-   unsigned int planemask,

-   int n,

-   DDXPointPtr ppt,

-   int *pwidth, int fSorted,

-   XAACacheInfoPtr pCache,

-   int xorigin, int yorigin 

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int xorg, yorg, slot;

-

-    (*infoRec->SetupForColor8x8PatternFill)(pScrn, pCache->x, pCache->y,

-			 rop, planemask, pCache->trans_color);

-

-    if(infoRec->ClipBox)

-	(*infoRec->SetClippingRectangle)(infoRec->pScrn,

-		infoRec->ClipBox->x1, infoRec->ClipBox->y1, 

-		infoRec->ClipBox->x2 - 1, infoRec->ClipBox->y2 - 1);

-

-     while(n--) {

-	xorg = (ppt->x - xorigin) & 0x07;

-	yorg = (ppt->y - yorigin) & 0x07;

-

-   	if(!(infoRec->Color8x8PatternFillFlags & 		

-				HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){

-	    slot = (yorg << 3) + xorg;

-	    yorg = pCache->y + pCache->offsets[slot].y;

-	    xorg = pCache->x + pCache->offsets[slot].x;

-        }

-

-        (*infoRec->SubsequentColor8x8PatternFillRect)(pScrn, 

-			xorg, yorg, ppt->x, ppt->y, *pwidth, 1);

-	ppt++; pwidth++;

-     }

-

-     if(infoRec->ClipBox)

-	(*infoRec->DisableClipping)(infoRec->pScrn);

-

-     SET_SYNC_FLAG(infoRec);

-}

-

-	/*****************\

-	|   Cache Blit    |

-	\*****************/

-

-

-void

-XAAFillCacheBltSpans(

-   ScrnInfoPtr pScrn,

-   int rop,

-   unsigned int planemask,

-   int n,

-   DDXPointPtr ppt,

-   int *pwidth,

-   int fSorted,

-   XAACacheInfoPtr pCache,

-   int xorg, int yorg

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int x, w, phaseX, phaseY, blit_w;  

-

-    (*infoRec->SetupForScreenToScreenCopy)(pScrn, 1, 1, rop, planemask,

-		pCache->trans_color);

-

-    if(infoRec->ClipBox)

-	(*infoRec->SetClippingRectangle)(infoRec->pScrn,

-		infoRec->ClipBox->x1, infoRec->ClipBox->y1, 

-		infoRec->ClipBox->x2 - 1, infoRec->ClipBox->y2 - 1);

-

-     while(n--) {

-	x = ppt->x;

-	w = *pwidth; 

-	phaseX = (x - xorg) % pCache->orig_w;

-	if(phaseX < 0) phaseX += pCache->orig_w;

-	phaseY = (ppt->y - yorg) % pCache->orig_h;

-	if(phaseY < 0) phaseY += pCache->orig_h;

-

-	while(1) {

-	    blit_w = pCache->w - phaseX;

-	    if(blit_w > w) blit_w = w;

-

-            (*infoRec->SubsequentScreenToScreenCopy)(pScrn, 

-		pCache->x + phaseX, pCache->y + phaseY,

-		x, ppt->y, blit_w, 1);

-

-	    w -= blit_w;

-	    if(!w) break;

-	    x += blit_w;

-	    phaseX = (phaseX + blit_w) % pCache->orig_w;

-	}

-	ppt++; pwidth++;

-     }

-

-     if(infoRec->ClipBox)

-	(*infoRec->DisableClipping)(infoRec->pScrn);

-

-     SET_SYNC_FLAG(infoRec);

-}

-

-

-	/****************\

-	|  Cache Expand  |

-	\****************/

-

-

-void

-XAAFillCacheExpandSpans(

-   ScrnInfoPtr pScrn,

-   int fg, int bg, int rop,

-   unsigned int planemask,

-   int n,

-   DDXPointPtr ppt,

-   int *pwidth,

-   int fSorted,

-   int xorg, int yorg,

-   PixmapPtr pPix

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int x, w, phaseX, phaseY, blit_w, cacheWidth;  

-    XAACacheInfoPtr pCache;

-

-    pCache = (*infoRec->CacheMonoStipple)(pScrn, pPix);

-

-    cacheWidth = (pCache->w * pScrn->bitsPerPixel) / 

-	infoRec->CacheColorExpandDensity;

-

-    (*infoRec->SetupForScreenToScreenColorExpandFill)(pScrn, fg, bg, rop, 

-							planemask);

-

-    if(infoRec->ClipBox)

-	(*infoRec->SetClippingRectangle)(infoRec->pScrn,

-		infoRec->ClipBox->x1, infoRec->ClipBox->y1, 

-		infoRec->ClipBox->x2 - 1, infoRec->ClipBox->y2 - 1);

-

-     while(n--) {

-	x = ppt->x;

-	w = *pwidth; 

-	phaseX = (x - xorg) % pCache->orig_w;

-	if(phaseX < 0) phaseX += pCache->orig_w;

-	phaseY = (ppt->y - yorg) % pCache->orig_h;

-	if(phaseY < 0) phaseY += pCache->orig_h;

-

-	while(1) {

-	    blit_w = cacheWidth - phaseX;

-	    if(blit_w > w) blit_w = w;

-

-	    (*infoRec->SubsequentScreenToScreenColorExpandFill)(

-			pScrn, x, ppt->y, blit_w, 1,

-			pCache->x, pCache->y + phaseY, phaseX);

-

-	    w -= blit_w;

-	    if(!w) break;

-	    x += blit_w;

-	    phaseX = (phaseX + blit_w) % pCache->orig_w;

-	}

-	ppt++; pwidth++;

-     }

-

-     if(infoRec->ClipBox)

-	(*infoRec->DisableClipping)(infoRec->pScrn);

-

-     SET_SYNC_FLAG(infoRec);

-}

-

-

-

-void

-XAAClipAndRenderSpans(

-    GCPtr pGC, 

-    DDXPointPtr	ppt,

-    int		*pwidth,

-    int		nspans,

-    int		fSorted,

-    ClipAndRenderSpansFunc func,

-    int 	xorg,

-    int		yorg

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    DDXPointPtr pptNew, pptBase;

-    int	*pwidthBase, *pwidthNew;

-    int	Right, numRects, MaxBoxes;

-

-    MaxBoxes = infoRec->PreAllocSize/(sizeof(DDXPointRec) + sizeof(int));

-    pptBase = (DDXPointRec*)infoRec->PreAllocMem;

-    pwidthBase = (int*)(&pptBase[MaxBoxes]);

-

-    pptNew = pptBase;

-    pwidthNew = pwidthBase;

-

-    numRects = RegionNumRects(pGC->pCompositeClip);

-

-    if(numRects == 1) {

-        BoxPtr pextent = RegionRects(pGC->pCompositeClip);

-	    

-	while(nspans--) {

-	    if ((pextent->y1 <= ppt->y) && (ppt->y < pextent->y2)) {

-		pptNew->x = max(pextent->x1, ppt->x);

-		Right = ppt->x + *pwidth; 

-		*pwidthNew = min(pextent->x2, Right) - pptNew->x;

-

-		if (*pwidthNew > 0) {

-		    pptNew->y = ppt->y;

-		    pptNew++;

-		    pwidthNew++;

-

-		    if(pptNew >= (pptBase + MaxBoxes)) {

-			(*func)(pGC, MaxBoxes, pptBase, pwidthBase, fSorted, 	

-								xorg, yorg);

-			pptNew = pptBase;

-			pwidthNew = pwidthBase;

-		    }

-		}

-	    }

-	    ppt++;

-	    pwidth++;

-	}

-    } else if (numRects) {

-	BoxPtr	pbox;

-	int nbox;

-

-	while(nspans--) {

-	    nbox = numRects;

-	    pbox = RegionRects(pGC->pCompositeClip);

-

-	    /* find the first band */

-	    while(nbox && (pbox->y2 <= ppt->y)) {

-		pbox++;

-		nbox--;

-	    }

-

-	    if(nbox && (pbox->y1 <= ppt->y)) {

-		int orig_y = pbox->y1;

-		Right = ppt->x + *pwidth;

-		while(nbox && (orig_y == pbox->y1)) {

-		    if(pbox->x2 <= ppt->x) {

-			nbox--;

-			pbox++;

-			continue;

-		    }

-

-		    if(pbox->x1 >= Right) {

-			nbox = 0;

-			break;

-		    }

-

-		    pptNew->x = max(pbox->x1, ppt->x);

-		    *pwidthNew = min(pbox->x2, Right) - pptNew->x;

-		    if(*pwidthNew > 0) {

-			pptNew->y = ppt->y;

-			pptNew++;

-			pwidthNew++;

-

-			if(pptNew >= (pptBase + MaxBoxes)) {

-			    (*func)(pGC, MaxBoxes, pptBase, pwidthBase, 

-							fSorted, xorg, yorg);

-			    pptNew = pptBase;

-			    pwidthNew = pwidthBase;

-			}

-		    }

-		    pbox++;

-		    nbox--;

-		}

-	    }

-	    ppt++;

-	    pwidth++;

-	}

-    }

-

-    if(pptNew != pptBase)

-	(*func)(pGC, pptNew - pptBase, pptBase, pwidthBase, fSorted, 

-						xorg, yorg);

-}

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "xf86str.h"
+#include "mi.h"
+#include "mispans.h"
+#include "xaa.h"
+#include "xaalocal.h"
+
+static void XAARenderSolidSpans(GCPtr, int, DDXPointPtr, int *, int, int, int);
+static void XAARenderColor8x8Spans(GCPtr, int, DDXPointPtr, int *, int, int,
+                                   int);
+static void XAARenderMono8x8Spans(GCPtr, int, DDXPointPtr, int *, int, int,
+                                  int);
+static void XAARenderCacheBltSpans(GCPtr, int, DDXPointPtr, int *, int, int,
+                                   int);
+static void XAARenderColorExpandSpans(GCPtr, int, DDXPointPtr, int *, int, int,
+                                      int);
+static void XAARenderCacheExpandSpans(GCPtr, int, DDXPointPtr, int *, int, int,
+                                      int);
+static void XAARenderPixmapCopySpans(GCPtr, int, DDXPointPtr, int *, int, int,
+                                     int);
+
+void
+XAAFillSpans(DrawablePtr pDraw, GC * pGC, int nInit,    /* number of spans to fill */
+             DDXPointPtr pptInit,       /* pointer to list of start points */
+             int *pwidthInit,   /* pointer to list of n widths */
+             int fSorted)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int type = 0;
+    ClipAndRenderSpansFunc function;
+    Bool fastClip = FALSE;
+
+    if ((nInit <= 0) || !pGC->planemask)
+        return;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    switch (pGC->fillStyle) {
+    case FillSolid:
+        type = DO_SOLID;
+        break;
+    case FillStippled:
+        type = (*infoRec->StippledFillChooser) (pGC);
+        break;
+    case FillOpaqueStippled:
+        if ((pGC->fgPixel == pGC->bgPixel) && infoRec->FillSpansSolid &&
+            CHECK_PLANEMASK(pGC, infoRec->FillSpansSolidFlags) &&
+            CHECK_ROP(pGC, infoRec->FillSpansSolidFlags) &&
+            CHECK_ROPSRC(pGC, infoRec->FillSpansSolidFlags) &&
+            CHECK_FG(pGC, infoRec->FillSpansSolidFlags))
+            type = DO_SOLID;
+        else
+            type = (*infoRec->OpaqueStippledFillChooser) (pGC);
+        break;
+    case FillTiled:
+        type = (*infoRec->TiledFillChooser) (pGC);
+        break;
+    }
+
+    switch (type) {
+    case DO_SOLID:
+        function = XAARenderSolidSpans;
+        if (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL)
+            fastClip = TRUE;
+        break;
+    case DO_COLOR_8x8:
+        function = XAARenderColor8x8Spans;
+        if (infoRec->ClippingFlags & HARDWARE_CLIP_COLOR_8x8_FILL)
+            fastClip = TRUE;
+        break;
+    case DO_MONO_8x8:
+        function = XAARenderMono8x8Spans;
+        if (infoRec->ClippingFlags & HARDWARE_CLIP_MONO_8x8_FILL)
+            fastClip = TRUE;
+        break;
+    case DO_CACHE_BLT:
+        function = XAARenderCacheBltSpans;
+        if (infoRec->ClippingFlags & HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY)
+            fastClip = TRUE;
+        break;
+    case DO_COLOR_EXPAND:
+        function = XAARenderColorExpandSpans;
+        break;
+    case DO_CACHE_EXPAND:
+        function = XAARenderCacheExpandSpans;
+        if (infoRec->ClippingFlags &
+            HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND)
+            fastClip = TRUE;
+        break;
+    case DO_PIXMAP_COPY:
+        function = XAARenderPixmapCopySpans;
+        if (infoRec->ClippingFlags & HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY)
+            fastClip = TRUE;
+        break;
+    case DO_IMAGE_WRITE:
+    default:
+        (*XAAFallbackOps.FillSpans) (pDraw, pGC, nInit, pptInit,
+                                     pwidthInit, fSorted);
+        return;
+    }
+
+    if ((nInit < 10) || (RegionNumRects(pGC->pCompositeClip) != 1))
+        fastClip = FALSE;
+
+    if (fastClip) {
+        infoRec->ClipBox = &pGC->pCompositeClip->extents;
+        (*function) (pGC, nInit, pptInit, pwidthInit, fSorted,
+                     pDraw->x, pDraw->y);
+        infoRec->ClipBox = NULL;
+    }
+    else
+        XAAClipAndRenderSpans(pGC, pptInit, pwidthInit, nInit, fSorted,
+                              function, pDraw->x, pDraw->y);
+}
+
+        /*********************\
+	|     Solid Spans     |
+	\*********************/
+
+static void
+XAARenderSolidSpans(GCPtr pGC,
+                    int n,
+                    DDXPointPtr ppt,
+                    int *pwidth, int fSorted, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    (*infoRec->FillSolidSpans) (infoRec->pScrn, pGC->fgPixel,
+                                pGC->alu, pGC->planemask, n, ppt, pwidth,
+                                fSorted);
+}
+
+        /************************\
+	|     Mono 8x8 Spans     |
+	\************************/
+
+static void
+XAARenderMono8x8Spans(GCPtr pGC,
+                      int n,
+                      DDXPointPtr ppt,
+                      int *pwidth, int fSorted, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAAPixmapPtr pPriv;
+    int fg, bg;
+
+    switch (pGC->fillStyle) {
+    case FillStippled:
+        pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);
+        fg = pGC->fgPixel;
+        bg = -1;
+        break;
+    case FillOpaqueStippled:
+        pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->stipple);
+        fg = pGC->fgPixel;
+        bg = pGC->bgPixel;
+        break;
+    case FillTiled:
+        pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
+        fg = pPriv->fg;
+        bg = pPriv->bg;
+        break;
+    default:                   /* Muffle compiler */
+        pPriv = NULL;           /* Kaboom */
+        fg = -1;
+        bg = -1;
+        break;
+    }
+
+    (*infoRec->FillMono8x8PatternSpans) (infoRec->pScrn,
+                                         fg, bg, pGC->alu, pGC->planemask,
+                                         n, ppt, pwidth, fSorted,
+                                         pPriv->pattern0, pPriv->pattern1,
+                                         (xorg + pGC->patOrg.x),
+                                         (yorg + pGC->patOrg.y));
+}
+
+        /*************************\
+	|     Color 8x8 Spans     |
+	\*************************/
+
+static void
+XAARenderColor8x8Spans(GCPtr pGC,
+                       int n,
+                       DDXPointPtr ppt,
+                       int *pwidth, int fSorted, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAACacheInfoPtr pCache;
+    PixmapPtr pPix;
+    int fg, bg;
+
+    switch (pGC->fillStyle) {
+    case FillStippled:
+        pPix = pGC->stipple;
+        fg = pGC->fgPixel;
+        bg = -1;
+        break;
+    case FillOpaqueStippled:
+        pPix = pGC->stipple;
+        fg = pGC->fgPixel;
+        bg = pGC->bgPixel;
+        break;
+    case FillTiled:
+        pPix = pGC->tile.pixmap;
+        fg = -1;
+        bg = -1;
+        break;
+    default:                   /* Muffle compiler */
+        pPix = NULL;
+        fg = -1;
+        bg = -1;
+        break;
+    }
+
+    pCache = (*infoRec->CacheColor8x8Pattern) (infoRec->pScrn, pPix, fg, bg);
+
+    (*infoRec->FillColor8x8PatternSpans) (infoRec->pScrn,
+                                          pGC->alu, pGC->planemask, n, ppt,
+                                          pwidth, fSorted, pCache,
+                                          (yorg + pGC->patOrg.x),
+                                          (xorg + pGC->patOrg.y));
+}
+
+        /****************************\
+	|     Color Expand Spans     |
+	\****************************/
+
+static void
+XAARenderColorExpandSpans(GCPtr pGC,
+                          int n,
+                          DDXPointPtr ppt,
+                          int *pwidth, int fSorted, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int fg, bg;
+
+    switch (pGC->fillStyle) {
+    case FillStippled:
+        fg = pGC->fgPixel;
+        bg = -1;
+        break;
+    case FillOpaqueStippled:
+        fg = pGC->fgPixel;
+        bg = pGC->bgPixel;
+        break;
+    default:                   /* Muffle compiler */
+        fg = -1;
+        bg = -1;
+        break;
+    }
+
+    (*infoRec->FillColorExpandSpans) (infoRec->pScrn, fg, bg,
+                                      pGC->alu, pGC->planemask, n, ppt, pwidth,
+                                      fSorted, (xorg + pGC->patOrg.x),
+                                      (yorg + pGC->patOrg.y), pGC->stipple);
+
+}
+
+        /*************************\
+	|     Cache Blt Spans     |
+	\*************************/
+
+static void
+XAARenderCacheBltSpans(GCPtr pGC,
+                       int n,
+                       DDXPointPtr ppt,
+                       int *pwidth, int fSorted, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAACacheInfoPtr pCache;
+
+    switch (pGC->fillStyle) {
+    case FillStippled:
+        pCache = (*infoRec->CacheStipple) (infoRec->pScrn, pGC->stipple,
+                                           pGC->fgPixel, -1);
+        break;
+    case FillOpaqueStippled:
+        pCache = (*infoRec->CacheStipple) (infoRec->pScrn, pGC->stipple,
+                                           pGC->fgPixel, pGC->bgPixel);
+        break;
+    case FillTiled:
+        pCache = (*infoRec->CacheTile) (infoRec->pScrn, pGC->tile.pixmap);
+        break;
+    default:                   /* Muffle compiler */
+        pCache = NULL;
+        break;
+    }
+
+    (*infoRec->FillCacheBltSpans) (infoRec->pScrn,
+                                   pGC->alu, pGC->planemask, n, ppt, pwidth,
+                                   fSorted, pCache, (xorg + pGC->patOrg.x),
+                                   (yorg + pGC->patOrg.y));
+
+}
+
+        /****************************\
+	|     Cache Expand Spans     |
+	\****************************/
+
+static void
+XAARenderCacheExpandSpans(GCPtr pGC,
+                          int n,
+                          DDXPointPtr ppt,
+                          int *pwidth, int fSorted, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int fg, bg;
+
+    switch (pGC->fillStyle) {
+    case FillStippled:
+        fg = pGC->fgPixel;
+        bg = -1;
+        break;
+    case FillOpaqueStippled:
+        fg = pGC->fgPixel;
+        bg = pGC->bgPixel;
+        break;
+    default:                   /* Muffle compiler */
+        fg = -1;
+        bg = -1;
+        break;
+    }
+
+    (*infoRec->FillCacheExpandSpans) (infoRec->pScrn, fg, bg,
+                                      pGC->alu, pGC->planemask, n, ppt, pwidth,
+                                      fSorted, (xorg + pGC->patOrg.x),
+                                      (yorg + pGC->patOrg.y), pGC->stipple);
+}
+
+        /***************************\
+	|     Pixmap Copy Spans     |
+	\***************************/
+
+static void
+XAARenderPixmapCopySpans(GCPtr pGC,
+                         int n,
+                         DDXPointPtr ppt,
+                         int *pwidth, int fSorted, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    XAACacheInfoPtr pCache = &(infoRec->ScratchCacheInfoRec);
+    XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
+
+    pCache->x = pPriv->offscreenArea->box.x1;
+    pCache->y = pPriv->offscreenArea->box.y1;
+    pCache->w = pCache->orig_w = pPriv->offscreenArea->box.x2 - pCache->x;
+    pCache->h = pCache->orig_h = pPriv->offscreenArea->box.y2 - pCache->y;
+    pCache->trans_color = -1;
+
+    (*infoRec->FillCacheBltSpans) (infoRec->pScrn,
+                                   pGC->alu, pGC->planemask, n, ppt, pwidth,
+                                   fSorted, pCache, (xorg + pGC->patOrg.x),
+                                   (yorg + pGC->patOrg.y));
+}
+
+        /****************\
+	|     Solid      |
+	\****************/
+
+void
+XAAFillSolidSpans(ScrnInfoPtr pScrn,
+                  int fg, int rop,
+                  unsigned int planemask,
+                  int n, DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+
+    (*infoRec->SetupForSolidFill) (pScrn, fg, rop, planemask);
+
+    if (infoRec->ClipBox)
+        (*infoRec->SetClippingRectangle) (infoRec->pScrn,
+                                          infoRec->ClipBox->x1,
+                                          infoRec->ClipBox->y1,
+                                          infoRec->ClipBox->x2 - 1,
+                                          infoRec->ClipBox->y2 - 1);
+
+    while (n--) {
+        if (*pwidth > 0)
+            (*infoRec->SubsequentSolidFillRect) (pScrn, ppt->x, ppt->y,
+                                                 *pwidth, 1);
+        ppt++;
+        pwidth++;
+    }
+
+    if (infoRec->ClipBox)
+        (*infoRec->DisableClipping) (infoRec->pScrn);
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+        /***************\
+	|   Mono 8x8    |
+	\***************/
+
+void
+XAAFillMono8x8PatternSpansScreenOrigin(ScrnInfoPtr pScrn,
+                                       int fg, int bg, int rop,
+                                       unsigned int planemask,
+                                       int n,
+                                       DDXPointPtr ppt,
+                                       int *pwidth, int fSorted,
+                                       int pattern0, int pattern1,
+                                       int xorigin, int yorigin)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int patx = pattern0, paty = pattern1;
+    int xorg = (-xorigin) & 0x07;
+    int yorg = (-yorigin) & 0x07;
+
+    if (infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS) {
+        if (!(infoRec->Mono8x8PatternFillFlags &
+              HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+            XAARotateMonoPattern(&patx, &paty, xorg, yorg,
+                                 (infoRec->Mono8x8PatternFillFlags &
+                                  BIT_ORDER_IN_BYTE_MSBFIRST));
+            xorg = patx;
+            yorg = paty;
+        }
+    }
+    else {
+        XAACacheInfoPtr pCache =
+            (*infoRec->CacheMono8x8Pattern) (pScrn, pattern0, pattern1);
+        patx = pCache->x;
+        paty = pCache->y;
+        if (!(infoRec->Mono8x8PatternFillFlags &
+              HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+            int slot = (yorg << 3) + xorg;
+
+            patx += pCache->offsets[slot].x;
+            paty += pCache->offsets[slot].y;
+            xorg = patx;
+            yorg = paty;
+        }
+    }
+
+    (*infoRec->SetupForMono8x8PatternFill) (pScrn, patx, paty,
+                                            fg, bg, rop, planemask);
+
+    if (infoRec->ClipBox)
+        (*infoRec->SetClippingRectangle) (infoRec->pScrn,
+                                          infoRec->ClipBox->x1,
+                                          infoRec->ClipBox->y1,
+                                          infoRec->ClipBox->x2 - 1,
+                                          infoRec->ClipBox->y2 - 1);
+
+    while (n--) {
+        (*infoRec->SubsequentMono8x8PatternFillRect) (pScrn,
+                                                      xorg, yorg, ppt->x,
+                                                      ppt->y, *pwidth, 1);
+        ppt++;
+        pwidth++;
+    }
+
+    if (infoRec->ClipBox)
+        (*infoRec->DisableClipping) (infoRec->pScrn);
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+void
+XAAFillMono8x8PatternSpans(ScrnInfoPtr pScrn,
+                           int fg, int bg, int rop,
+                           unsigned int planemask,
+                           int n,
+                           DDXPointPtr ppt,
+                           int *pwidth, int fSorted,
+                           int pattern0, int pattern1, int xorigin, int yorigin)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int patx = pattern0, paty = pattern1;
+    int xorg, yorg, slot;
+    XAACacheInfoPtr pCache = NULL;
+
+    if (!(infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS)) {
+        pCache = (*infoRec->CacheMono8x8Pattern) (pScrn, pattern0, pattern1);
+        patx = pCache->x;
+        paty = pCache->y;
+    }
+
+    (*infoRec->SetupForMono8x8PatternFill) (pScrn, patx, paty,
+                                            fg, bg, rop, planemask);
+
+    if (infoRec->ClipBox)
+        (*infoRec->SetClippingRectangle) (infoRec->pScrn,
+                                          infoRec->ClipBox->x1,
+                                          infoRec->ClipBox->y1,
+                                          infoRec->ClipBox->x2 - 1,
+                                          infoRec->ClipBox->y2 - 1);
+
+    while (n--) {
+        xorg = (ppt->x - xorigin) & 0x07;
+        yorg = (ppt->y - yorigin) & 0x07;
+
+        if (!(infoRec->Mono8x8PatternFillFlags &
+              HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+            if (infoRec->Mono8x8PatternFillFlags &
+                HARDWARE_PATTERN_PROGRAMMED_BITS) {
+                patx = pattern0;
+                paty = pattern1;
+                XAARotateMonoPattern(&patx, &paty, xorg, yorg,
+                                     (infoRec->Mono8x8PatternFillFlags &
+                                      BIT_ORDER_IN_BYTE_MSBFIRST));
+                xorg = patx;
+                yorg = paty;
+            }
+            else {
+                slot = (yorg << 3) + xorg;
+                xorg = patx + pCache->offsets[slot].x;
+                yorg = paty + pCache->offsets[slot].y;
+            }
+        }
+
+        (*infoRec->SubsequentMono8x8PatternFillRect) (pScrn,
+                                                      xorg, yorg, ppt->x,
+                                                      ppt->y, *pwidth, 1);
+        ppt++;
+        pwidth++;
+    }
+
+    if (infoRec->ClipBox)
+        (*infoRec->DisableClipping) (infoRec->pScrn);
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+        /****************\
+	|   Color 8x8    |
+	\****************/
+
+void
+XAAFillColor8x8PatternSpansScreenOrigin(ScrnInfoPtr pScrn,
+                                        int rop,
+                                        unsigned int planemask,
+                                        int n,
+                                        DDXPointPtr ppt,
+                                        int *pwidth, int fSorted,
+                                        XAACacheInfoPtr pCache,
+                                        int xorigin, int yorigin)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int patx = pCache->x, paty = pCache->y;
+    int xorg = (-xorigin) & 0x07;
+    int yorg = (-yorigin) & 0x07;
+
+    if (!(infoRec->Color8x8PatternFillFlags &
+          HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+        int slot = (yorg << 3) + xorg;
+
+        paty += pCache->offsets[slot].y;
+        patx += pCache->offsets[slot].x;
+        xorg = patx;
+        yorg = paty;
+    }
+
+    (*infoRec->SetupForColor8x8PatternFill) (pScrn, patx, paty,
+                                             rop, planemask,
+                                             pCache->trans_color);
+
+    if (infoRec->ClipBox)
+        (*infoRec->SetClippingRectangle) (infoRec->pScrn,
+                                          infoRec->ClipBox->x1,
+                                          infoRec->ClipBox->y1,
+                                          infoRec->ClipBox->x2 - 1,
+                                          infoRec->ClipBox->y2 - 1);
+
+    while (n--) {
+        (*infoRec->SubsequentColor8x8PatternFillRect) (pScrn,
+                                                       xorg, yorg, ppt->x,
+                                                       ppt->y, *pwidth, 1);
+        ppt++;
+        pwidth++;
+    }
+
+    if (infoRec->ClipBox)
+        (*infoRec->DisableClipping) (infoRec->pScrn);
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+void
+XAAFillColor8x8PatternSpans(ScrnInfoPtr pScrn,
+                            int rop,
+                            unsigned int planemask,
+                            int n,
+                            DDXPointPtr ppt,
+                            int *pwidth, int fSorted,
+                            XAACacheInfoPtr pCache, int xorigin, int yorigin)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int xorg, yorg, slot;
+
+    (*infoRec->SetupForColor8x8PatternFill) (pScrn, pCache->x, pCache->y,
+                                             rop, planemask,
+                                             pCache->trans_color);
+
+    if (infoRec->ClipBox)
+        (*infoRec->SetClippingRectangle) (infoRec->pScrn,
+                                          infoRec->ClipBox->x1,
+                                          infoRec->ClipBox->y1,
+                                          infoRec->ClipBox->x2 - 1,
+                                          infoRec->ClipBox->y2 - 1);
+
+    while (n--) {
+        xorg = (ppt->x - xorigin) & 0x07;
+        yorg = (ppt->y - yorigin) & 0x07;
+
+        if (!(infoRec->Color8x8PatternFillFlags &
+              HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) {
+            slot = (yorg << 3) + xorg;
+            yorg = pCache->y + pCache->offsets[slot].y;
+            xorg = pCache->x + pCache->offsets[slot].x;
+        }
+
+        (*infoRec->SubsequentColor8x8PatternFillRect) (pScrn,
+                                                       xorg, yorg, ppt->x,
+                                                       ppt->y, *pwidth, 1);
+        ppt++;
+        pwidth++;
+    }
+
+    if (infoRec->ClipBox)
+        (*infoRec->DisableClipping) (infoRec->pScrn);
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+        /*****************\
+	|   Cache Blit    |
+	\*****************/
+
+void
+XAAFillCacheBltSpans(ScrnInfoPtr pScrn,
+                     int rop,
+                     unsigned int planemask,
+                     int n,
+                     DDXPointPtr ppt,
+                     int *pwidth,
+                     int fSorted, XAACacheInfoPtr pCache, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int x, w, phaseX, phaseY, blit_w;
+
+    (*infoRec->SetupForScreenToScreenCopy) (pScrn, 1, 1, rop, planemask,
+                                            pCache->trans_color);
+
+    if (infoRec->ClipBox)
+        (*infoRec->SetClippingRectangle) (infoRec->pScrn,
+                                          infoRec->ClipBox->x1,
+                                          infoRec->ClipBox->y1,
+                                          infoRec->ClipBox->x2 - 1,
+                                          infoRec->ClipBox->y2 - 1);
+
+    while (n--) {
+        x = ppt->x;
+        w = *pwidth;
+        phaseX = (x - xorg) % pCache->orig_w;
+        if (phaseX < 0)
+            phaseX += pCache->orig_w;
+        phaseY = (ppt->y - yorg) % pCache->orig_h;
+        if (phaseY < 0)
+            phaseY += pCache->orig_h;
+
+        while (1) {
+            blit_w = pCache->w - phaseX;
+            if (blit_w > w)
+                blit_w = w;
+
+            (*infoRec->SubsequentScreenToScreenCopy) (pScrn,
+                                                      pCache->x + phaseX,
+                                                      pCache->y + phaseY, x,
+                                                      ppt->y, blit_w, 1);
+
+            w -= blit_w;
+            if (!w)
+                break;
+            x += blit_w;
+            phaseX = (phaseX + blit_w) % pCache->orig_w;
+        }
+        ppt++;
+        pwidth++;
+    }
+
+    if (infoRec->ClipBox)
+        (*infoRec->DisableClipping) (infoRec->pScrn);
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+        /****************\
+	|  Cache Expand  |
+	\****************/
+
+void
+XAAFillCacheExpandSpans(ScrnInfoPtr pScrn,
+                        int fg, int bg, int rop,
+                        unsigned int planemask,
+                        int n,
+                        DDXPointPtr ppt,
+                        int *pwidth,
+                        int fSorted, int xorg, int yorg, PixmapPtr pPix)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int x, w, phaseX, phaseY, blit_w, cacheWidth;
+    XAACacheInfoPtr pCache;
+
+    pCache = (*infoRec->CacheMonoStipple) (pScrn, pPix);
+
+    cacheWidth = (pCache->w * pScrn->bitsPerPixel) /
+        infoRec->CacheColorExpandDensity;
+
+    (*infoRec->SetupForScreenToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                       planemask);
+
+    if (infoRec->ClipBox)
+        (*infoRec->SetClippingRectangle) (infoRec->pScrn,
+                                          infoRec->ClipBox->x1,
+                                          infoRec->ClipBox->y1,
+                                          infoRec->ClipBox->x2 - 1,
+                                          infoRec->ClipBox->y2 - 1);
+
+    while (n--) {
+        x = ppt->x;
+        w = *pwidth;
+        phaseX = (x - xorg) % pCache->orig_w;
+        if (phaseX < 0)
+            phaseX += pCache->orig_w;
+        phaseY = (ppt->y - yorg) % pCache->orig_h;
+        if (phaseY < 0)
+            phaseY += pCache->orig_h;
+
+        while (1) {
+            blit_w = cacheWidth - phaseX;
+            if (blit_w > w)
+                blit_w = w;
+
+            (*infoRec->SubsequentScreenToScreenColorExpandFill) (pScrn, x,
+                                                                 ppt->y, blit_w,
+                                                                 1, pCache->x,
+                                                                 pCache->y +
+                                                                 phaseY,
+                                                                 phaseX);
+
+            w -= blit_w;
+            if (!w)
+                break;
+            x += blit_w;
+            phaseX = (phaseX + blit_w) % pCache->orig_w;
+        }
+        ppt++;
+        pwidth++;
+    }
+
+    if (infoRec->ClipBox)
+        (*infoRec->DisableClipping) (infoRec->pScrn);
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+void
+XAAClipAndRenderSpans(GCPtr pGC,
+                      DDXPointPtr ppt,
+                      int *pwidth,
+                      int nspans,
+                      int fSorted,
+                      ClipAndRenderSpansFunc func, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    DDXPointPtr pptNew, pptBase;
+    int *pwidthBase, *pwidthNew;
+    int Right, numRects, MaxBoxes;
+
+    MaxBoxes = infoRec->PreAllocSize / (sizeof(DDXPointRec) + sizeof(int));
+    pptBase = (DDXPointRec *) infoRec->PreAllocMem;
+    pwidthBase = (int *) (&pptBase[MaxBoxes]);
+
+    pptNew = pptBase;
+    pwidthNew = pwidthBase;
+
+    numRects = RegionNumRects(pGC->pCompositeClip);
+
+    if (numRects == 1) {
+        BoxPtr pextent = RegionRects(pGC->pCompositeClip);
+
+        while (nspans--) {
+            if ((pextent->y1 <= ppt->y) && (ppt->y < pextent->y2)) {
+                pptNew->x = max(pextent->x1, ppt->x);
+                Right = ppt->x + *pwidth;
+                *pwidthNew = min(pextent->x2, Right) - pptNew->x;
+
+                if (*pwidthNew > 0) {
+                    pptNew->y = ppt->y;
+                    pptNew++;
+                    pwidthNew++;
+
+                    if (pptNew >= (pptBase + MaxBoxes)) {
+                        (*func) (pGC, MaxBoxes, pptBase, pwidthBase, fSorted,
+                                 xorg, yorg);
+                        pptNew = pptBase;
+                        pwidthNew = pwidthBase;
+                    }
+                }
+            }
+            ppt++;
+            pwidth++;
+        }
+    }
+    else if (numRects) {
+        BoxPtr pbox;
+        int nbox;
+
+        while (nspans--) {
+            nbox = numRects;
+            pbox = RegionRects(pGC->pCompositeClip);
+
+            /* find the first band */
+            while (nbox && (pbox->y2 <= ppt->y)) {
+                pbox++;
+                nbox--;
+            }
+
+            if (nbox && (pbox->y1 <= ppt->y)) {
+                int orig_y = pbox->y1;
+
+                Right = ppt->x + *pwidth;
+                while (nbox && (orig_y == pbox->y1)) {
+                    if (pbox->x2 <= ppt->x) {
+                        nbox--;
+                        pbox++;
+                        continue;
+                    }
+
+                    if (pbox->x1 >= Right) {
+                        nbox = 0;
+                        break;
+                    }
+
+                    pptNew->x = max(pbox->x1, ppt->x);
+                    *pwidthNew = min(pbox->x2, Right) - pptNew->x;
+                    if (*pwidthNew > 0) {
+                        pptNew->y = ppt->y;
+                        pptNew++;
+                        pwidthNew++;
+
+                        if (pptNew >= (pptBase + MaxBoxes)) {
+                            (*func) (pGC, MaxBoxes, pptBase, pwidthBase,
+                                     fSorted, xorg, yorg);
+                            pptNew = pptBase;
+                            pwidthNew = pwidthBase;
+                        }
+                    }
+                    pbox++;
+                    nbox--;
+                }
+            }
+            ppt++;
+            pwidth++;
+        }
+    }
+
+    if (pptNew != pptBase)
+        (*func) (pGC, pptNew - pptBase, pptBase, pwidthBase, fSorted,
+                 xorg, yorg);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaStateChange.c b/xorg-server/hw/xfree86/xaa/xaaStateChange.c
index 4eb15125b..0218cb57c 100644
--- a/xorg-server/hw/xfree86/xaa/xaaStateChange.c
+++ b/xorg-server/hw/xfree86/xaa/xaaStateChange.c
@@ -1,1627 +1,1665 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "windowstr.h"

-#include "xf86str.h"

-#include "mi.h"

-#include "miline.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaawrap.h"

-#include "servermd.h"

-

-#define XAA_STATE_WRAP(func) do {\

-if(infoRec->func) { \

-   pStatePriv->func = infoRec->func;\

-   infoRec->func = XAAStateWrap##func;\

-}} while(0)

-

-/* Wrap all XAA functions and allocate our private structure.

- */

-

-typedef struct _XAAStateWrapRec {

-   ScrnInfoPtr pScrn;   

-   void (*RestoreAccelState)(ScrnInfoPtr pScrn);

-   void (*Sync)(ScrnInfoPtr pScrn);

-   void (*SetupForScreenToScreenCopy)(ScrnInfoPtr pScrn, int xdir, int ydir,

-				      int rop, unsigned int planemask, 

-				      int trans_color);

-   void (*SetupForSolidFill)(ScrnInfoPtr pScrn, int color, int rop, 

-			     unsigned int planemask);

-   void (*SetupForSolidLine)(ScrnInfoPtr pScrn,int color,int rop,

-			     unsigned int planemask);

-   void (*SetupForDashedLine)(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-			      unsigned int planemask, int length,

-			      unsigned char *pattern);

-   void (*SetClippingRectangle) (ScrnInfoPtr pScrn, int left, int top, 

-				 int right, int bottom);

-   void (*DisableClipping)(ScrnInfoPtr pScrn);

-   void (*SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,

-				      int fg, int bg, int rop, 

-				      unsigned int planemask);

-   void (*SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,

-				       int rop, unsigned int planemask,

-				       int transparency_color);

-   void (*SetupForCPUToScreenColorExpandFill)(ScrnInfoPtr pScrn, int fg, 

-					      int bg, int rop,

-					      unsigned int planemask);

-   void (*SetupForScanlineCPUToScreenColorExpandFill)(ScrnInfoPtr pScrn,

-						      int fg, int bg, int rop,

-						      unsigned int planemask);

-   void (*SetupForScreenToScreenColorExpandFill) (ScrnInfoPtr pScrn,

-						  int fg, int bg, int rop,

-						  unsigned int planemask);

-   void (*SetupForImageWrite)(ScrnInfoPtr pScrn, int rop, 

-			      unsigned int planemask, int transparency_color,

-			      int bpp, int depth);

-   void (*SetupForScanlineImageWrite)(ScrnInfoPtr pScrn, int rop, 

-				      unsigned int planemask,

-				      int transparency_color,

-				      int bpp, int depth);

-   void (*SetupForImageRead) (ScrnInfoPtr pScrn, int bpp, int depth);

-   void (*ScreenToScreenBitBlt)(ScrnInfoPtr pScrn, int nbox,

-				DDXPointPtr pptSrc, BoxPtr pbox, int xdir, 

-				int ydir, int alu, unsigned int planmask);

-   void (*WriteBitmap) (ScrnInfoPtr pScrn, int x, int y, int w, int h,

-			unsigned char *src, int srcwidth, int skipleft,

-			int fg, int bg, int rop, unsigned int planemask);

-   void (*FillSolidRects)(ScrnInfoPtr pScrn, int fg, int rop,

-			  unsigned int planemask, int nBox, BoxPtr pBox);

-   void (*FillMono8x8PatternRects)(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-				   unsigned int planemask, int nBox, 

-				   BoxPtr pBox, int pat0, int pat1,

-				   int xorg, int yorg);

-   void (*FillColor8x8PatternRects)(ScrnInfoPtr pScrn, int rop,

-				    unsigned int planemask, int nBox,

-				    BoxPtr pBox, int xorg, int yorg,

-				    XAACacheInfoPtr pCache);

-   void (*FillCacheBltRects)(ScrnInfoPtr pScrn, int rop, 

-			     unsigned int planemask, int nBox, BoxPtr pBox,

-			     int xorg, int yorg, XAACacheInfoPtr pCache);

-   void (*FillColorExpandRects)(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-				unsigned int planemask, int nBox,

-				BoxPtr pBox, int xorg, int yorg, 

-				PixmapPtr pPix);

-   void (*FillCacheExpandRects)(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-				unsigned int planemask, int nBox, BoxPtr pBox,

-				int xorg, int yorg, PixmapPtr pPix);

-   void (*FillImageWriteRects)(ScrnInfoPtr pScrn, int rop,

-			       unsigned int planemask, int nBox, BoxPtr pBox,

-			       int xorg, int yorg, PixmapPtr pPix);

-   void (*FillSolidSpans)(ScrnInfoPtr pScrn, int fg, int rop,

-			  unsigned int planemask, int n, DDXPointPtr points,

-			  int *widths, int fSorted);

-   void (*FillMono8x8PatternSpans)(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-				   unsigned int planemask, int n,

-				   DDXPointPtr points, int *widths,

-				   int fSorted, int pat0, int pat1,

-				   int xorg, int yorg);

-   void (*FillColor8x8PatternSpans)(ScrnInfoPtr pScrn, int rop,

-				    unsigned int planemask, int n,

-				    DDXPointPtr points, int *widths,

-				    int fSorted, XAACacheInfoPtr pCache,

-				    int xorg, int yorg);

-   void (*FillCacheBltSpans)(ScrnInfoPtr pScrn, int rop,

-			     unsigned int planemask, int n, DDXPointPtr points,

-			     int *widths, int fSorted, XAACacheInfoPtr pCache,

-			     int xorg, int yorg);

-   void (*FillColorExpandSpans)(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-				unsigned int planemask, int n,

-				DDXPointPtr points, int *widths, int fSorted,

-				int xorg, int yorg, PixmapPtr pPix);

-   void (*FillCacheExpandSpans)(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-				unsigned int planemask, int n, DDXPointPtr ppt,

-				int *pwidth, int fSorted, int xorg, int yorg,

-				PixmapPtr pPix);

-   void (*TEGlyphRenderer)(ScrnInfoPtr pScrn, int x, int y, int w, int h, 

-			   int skipleft, int startline, unsigned int **glyphs,

-			   int glyphWidth, int fg, int bg, int rop, 

-			   unsigned planemask);

-   void (*NonTEGlyphRenderer)(ScrnInfoPtr pScrn, int x, int y, int n,

-			      NonTEGlyphPtr glyphs, BoxPtr pbox,

-			      int fg, int rop, unsigned int planemask);

-   void (*WritePixmap) (ScrnInfoPtr pScrn, int x, int y, int w, int h,

-			unsigned char *src, int srcwidth, int rop,

-			unsigned int planemask, int transparency_color,

-			int bpp, int depth);

-   void (*ReadPixmap) (ScrnInfoPtr pScrn, int x, int y, int w, int h,

-		       unsigned char *dst, int dstwidth, int bpp, int depth);

-   RegionPtr (*CopyArea)(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,

-			 GC *pGC, int srcx, int srcy, int width, int height,

-			 int dstx, int dsty);

-   RegionPtr (*CopyPlane)(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,

-			  int srcx, int srcy, int width, int height, int dstx,

-			  int dsty, unsigned long bitPlane);

-   void (*PushPixelsSolid) (GCPtr pGC, PixmapPtr pBitMap,

-			    DrawablePtr pDrawable, int dx, int dy, int xOrg, 

-			    int yOrg);

-   void (*PolyFillRectSolid)(DrawablePtr pDraw, GCPtr pGC, int nrectFill,

-			     xRectangle *prectInit);

-   void (*PolyFillRectStippled)(DrawablePtr pDraw, GCPtr pGC, int nrectFill,

-				xRectangle *prectInit);

-   void (*PolyFillRectOpaqueStippled)(DrawablePtr pDraw, GCPtr pGC,

-				      int nrectFill, xRectangle *prectInit);

-   void (*PolyFillRectTiled)(DrawablePtr pDraw, GCPtr pGC, int nrectFill,

-			     xRectangle *prectInit);

-   void (*FillSpansSolid)(DrawablePtr pDraw, GCPtr pGC, int nInit,

-			  DDXPointPtr ppt, int *pwidth, int fSorted);

-   void (*FillSpansStippled)(DrawablePtr pDraw, GCPtr pGC, int nInit,

-			     DDXPointPtr ppt, int *pwidth, int fSorted);

-   void (*FillSpansOpaqueStippled)(DrawablePtr pDraw, GCPtr pGC, int nInit, 

-				   DDXPointPtr ppt, int *pwidth, int fSorted);

-   void (*FillSpansTiled)(DrawablePtr pDraw, GCPtr pGC, int nInit, 

-			  DDXPointPtr ppt, int *pwidth, int fSorted);

-   int (*PolyText8TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,

-		       char *chars);

-   int (*PolyText16TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,

-			unsigned short *chars);

-   void (*ImageText8TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,

-			 char *chars);

-   void (*ImageText16TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,

-			  int count, unsigned short *chars);

-   void (*ImageGlyphBltTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit, 

-			    int yInit, unsigned int nglyph, CharInfoPtr *ppci,

-			    pointer pglyphBase);

-   void (*PolyGlyphBltTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit, 

-			   int yInit, unsigned int nglyph, CharInfoPtr *ppci,

-			   pointer pglyphBase);

-   int (*PolyText8NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,

-			  int count, char *chars);

-   int (*PolyText16NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y, 

-			   int count, unsigned short *chars);

-   void (*ImageText8NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,

-			    int count, char *chars);

-   void (*ImageText16NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,

-			     int count, unsigned short *chars);

-   void (*ImageGlyphBltNonTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit, 

-			       int yInit, unsigned int nglyph,

-			       CharInfoPtr *ppci, pointer pglyphBase);

-   void (*PolyGlyphBltNonTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit, 

-			      int yInit, unsigned int nglyph,

-			      CharInfoPtr *ppci, pointer pglyphBase);

-   void (*PolyRectangleThinSolid)(DrawablePtr pDrawable,GCPtr pGC,

-				  int nRectsInit, xRectangle *pRectsInit);

-   void (*PolylinesWideSolid)(DrawablePtr pDrawable, GCPtr pGC, int mode, 

-			      int npt, DDXPointPtr pPts);

-   void (*PolylinesThinSolid)(DrawablePtr pDrawable, GCPtr pGC, int mode, 

-			      int npt, DDXPointPtr pPts);

-   void (*PolySegmentThinSolid)(DrawablePtr pDrawable, GCPtr pGC, int nseg,

-				xSegment *pSeg);

-   void (*PolylinesThinDashed)(DrawablePtr pDrawable, GCPtr pGC, int mode, 

-			       int npt, DDXPointPtr pPts);

-   void (*PolySegmentThinDashed)(DrawablePtr pDrawable, GCPtr pGC, int nseg,

-				 xSegment *pSeg);

-   void (*FillPolygonSolid)(DrawablePtr pDrawable, GCPtr pGC, int shape,

-			    int mode, int count, DDXPointPtr ptsIn);

-   void (*FillPolygonStippled)(DrawablePtr pDrawable, GCPtr pGC, int shape,

-			       int mode, int count, DDXPointPtr ptsIn);

-   void (*FillPolygonOpaqueStippled)(DrawablePtr pDrawable, GCPtr pGC,

-				     int shape, int mode, int count,

-				     DDXPointPtr ptsIn);

-   void (*FillPolygonTiled)(DrawablePtr pDrawable, GCPtr pGC, int shape, 

-			    int mode, int count, DDXPointPtr ptsIn);

-   void (*PolyFillArcSolid)(DrawablePtr pDraw, GCPtr pGC, int narcs, 

-			    xArc *parcs);

-   void (*PutImage)(DrawablePtr pDraw, GCPtr pGC, int depth, int x, int y, 

-		    int w, int h, int leftPad, int format, char *pImage);

-   ValidateGCProcPtr ValidateFillSpans;

-   ValidateGCProcPtr ValidateSetSpans;

-   ValidateGCProcPtr ValidatePutImage;

-   ValidateGCProcPtr ValidateCopyArea;

-   ValidateGCProcPtr ValidateCopyPlane;

-   ValidateGCProcPtr ValidatePolyPoint;

-   ValidateGCProcPtr ValidatePolylines;

-   ValidateGCProcPtr ValidatePolySegment;

-   ValidateGCProcPtr ValidatePolyRectangle;

-   ValidateGCProcPtr ValidatePolyArc;

-   ValidateGCProcPtr ValidateFillPolygon;

-   ValidateGCProcPtr ValidatePolyFillRect;

-   ValidateGCProcPtr ValidatePolyFillArc;

-   ValidateGCProcPtr ValidatePolyText8;

-   ValidateGCProcPtr ValidatePolyText16;

-   ValidateGCProcPtr ValidateImageText8;

-   ValidateGCProcPtr ValidateImageText16;

-   ValidateGCProcPtr ValidatePolyGlyphBlt;

-   ValidateGCProcPtr ValidateImageGlyphBlt;

-   ValidateGCProcPtr ValidatePushPixels;

-   void (*ComputeDash)(GCPtr pGC);

-   void (*InitPixmapCache)(ScreenPtr pScreen, RegionPtr areas, pointer data);

-   void (*ClosePixmapCache)(ScreenPtr pScreen);

-   int (*StippledFillChooser)(GCPtr pGC);

-   int (*OpaqueStippledFillChooser)(GCPtr pGC);

-   int (*TiledFillChooser)(GCPtr pGC);

-   XAACacheInfoPtr (*CacheTile)(ScrnInfoPtr Scrn, PixmapPtr pPix);

-   XAACacheInfoPtr (*CacheStipple)(ScrnInfoPtr Scrn, PixmapPtr pPix, int fg, 

-				   int bg);

-   XAACacheInfoPtr (*CacheMonoStipple)(ScrnInfoPtr Scrn, PixmapPtr pPix);

-   XAACacheInfoPtr (*CacheMono8x8Pattern)(ScrnInfoPtr Scrn, int pat0, 

-					  int pat1);

-   XAACacheInfoPtr (*CacheColor8x8Pattern)(ScrnInfoPtr Scrn, PixmapPtr pPix, 

-					   int fg, int bg);

-   void (*WriteBitmapToCache) (ScrnInfoPtr pScrn, int x, int y, int w, int h,

-			       unsigned char *src, int srcwidth, int fg, 

-			       int bg);

-   void (*WritePixmapToCache) (ScrnInfoPtr pScrn, int x, int y, int w, int h,

-			       unsigned char *src, int srcwidth, int bpp, 

-			       int depth);

-   void (*WriteMono8x8PatternToCache)(ScrnInfoPtr pScrn, 

-				      XAACacheInfoPtr pCache);

-   void (*WriteColor8x8PatternToCache)(ScrnInfoPtr pScrn, PixmapPtr pPix, 

-				       XAACacheInfoPtr pCache);

-   GetImageProcPtr GetImage;

-   GetSpansProcPtr GetSpans;

-   CopyWindowProcPtr CopyWindow;

-   Bool (*SetupForCPUToScreenAlphaTexture2)(ScrnInfoPtr pScrn, int op,

-                                           CARD16 red, CARD16 green,

-                                           CARD16 blue, CARD16 alpha,

-					   CARD32 maskFormat, CARD32 dstFormat,

-                                           CARD8 *alphaPtr, int alphaPitch,

-					   int width, int height, int flags);

-   Bool (*SetupForCPUToScreenTexture2)(ScrnInfoPtr pScrn, int op,

-                                      CARD32 srcFormat, CARD32 dstFormat,

-                                      CARD8 *texPtr, int texPitch,

-                                      int width, int height, int flags);

-} XAAStateWrapRec, *XAAStateWrapPtr;

-

-static DevPrivateKeyRec XAAStateKeyRec;

-#define XAAStateKey (&XAAStateKeyRec)

-

-/* Wrap functions start here */

-#define GET_STATEPRIV_GC(pGC)   XAAStateWrapPtr pStatePriv =\

-(XAAStateWrapPtr)dixLookupPrivate(&(pGC)->pScreen->devPrivates, XAAStateKey)

-

-#define GET_STATEPRIV_SCREEN(pScreen)   XAAStateWrapPtr pStatePriv =\

-(XAAStateWrapPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAStateKey)

-

-#define GET_STATEPRIV_PSCRN(pScrn)   XAAStateWrapPtr pStatePriv =\

-(XAAStateWrapPtr)dixLookupPrivate(&(pScrn)->pScreen->devPrivates, XAAStateKey)

-

-#define STATE_CHECK_SP(pStatePriv) {\

-	ScrnInfoPtr pScrn = pStatePriv->pScrn;\

-	int i = 0;\

-	int need_change = 0;\

-	while(i < pScrn->numEntities) {\

-		if(xf86IsEntityShared(pScrn->entityList[i]) &&\

-		   xf86GetLastScrnFlag(pScrn->entityList[i]) != pScrn->scrnIndex) {\

-			need_change = 1;\

-			xf86SetLastScrnFlag(pScrn->entityList[i],\

-					    pScrn->scrnIndex);\

-		}\

-		i++;\

-	}\

-	if(need_change == 1) (*pStatePriv->RestoreAccelState)(pScrn);\

-}

-

-#define STATE_CHECK_PSCRN(pScrn) {\

-	int i = 0;\

-	int need_change = 0;\

-	while(i < pScrn->numEntities) {\

-		if(xf86IsEntityShared(pScrn->entityList[i]) &&\

-		   xf86GetLastScrnFlag(pScrn->entityList[i]) != pScrn->scrnIndex) {\

-			need_change = 1;\

-			xf86SetLastScrnFlag(pScrn->entityList[i],\

-					    pScrn->scrnIndex);\

-		}\

-		i++;\

-	}\

-	if(need_change == 1) (*pStatePriv->RestoreAccelState)(pScrn);\

-}

-

-static void XAAStateWrapSync(ScrnInfoPtr pScrn)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-   

-   (*pStatePriv->Sync)(pScrn);

-}

-

-static void XAAStateWrapSetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, int ydir,

-						   int rop, unsigned int planemask, 

-						   int trans_color)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-   

-   (*pStatePriv->SetupForScreenToScreenCopy)(pScrn, xdir, ydir, rop, planemask, 

-					     trans_color);

-}

-

-static void XAAStateWrapSetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop, 

-					  unsigned int planemask)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-   

-   (*pStatePriv->SetupForSolidFill)(pScrn, color, rop, planemask);

-}

-

-static void XAAStateWrapSetupForSolidLine(ScrnInfoPtr pScrn,int color,int rop,

-					  unsigned int planemask)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->SetupForSolidLine)(pScrn, color, rop, planemask);

-}

-

-static void XAAStateWrapSetupForDashedLine(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-					   unsigned int planemask, int length,

-					   unsigned char *pattern)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->SetupForDashedLine)(pScrn, fg, bg, rop, planemask, length, pattern);

-}

-

-static void XAAStateWrapSetClippingRectangle(ScrnInfoPtr pScrn, int left, int top, 

-					     int right, int bottom)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->SetClippingRectangle)(pScrn, left, top, right, bottom);

-}

-

-static void XAAStateWrapDisableClipping(ScrnInfoPtr pScrn)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->DisableClipping)(pScrn);

-}

-

-static void XAAStateWrapSetupForMono8x8PatternFill(ScrnInfoPtr pScrn, int patx, int paty,

-						   int fg, int bg, int rop, 

-						   unsigned int planemask)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->SetupForMono8x8PatternFill)(pScrn, patx, paty, fg, bg, rop, planemask);

-}

-

-static void XAAStateWrapSetupForColor8x8PatternFill(ScrnInfoPtr pScrn, int patx, int paty,

-						    int rop, unsigned int planemask,

-						    int transparency_color)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->SetupForColor8x8PatternFill)(pScrn, patx, paty, rop, planemask, 

-					      transparency_color);

-}

-

-static void XAAStateWrapSetupForCPUToScreenColorExpandFill(ScrnInfoPtr pScrn, int fg, 

-							   int bg, int rop,

-							   unsigned int planemask)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->SetupForCPUToScreenColorExpandFill)(pScrn, fg, bg, rop, planemask);

-}

-

-static void XAAStateWrapSetupForScanlineCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,

-								   int fg, int bg, 

-								   int rop,

-								   unsigned int planemask)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->SetupForScanlineCPUToScreenColorExpandFill)(pScrn, fg, bg, rop,

-							     planemask);

-}

-

-static void XAAStateWrapSetupForScreenToScreenColorExpandFill(ScrnInfoPtr pScrn,

-							      int fg, int bg, int rop,

-							      unsigned int planemask)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->SetupForScreenToScreenColorExpandFill)(pScrn, fg, bg, rop, planemask);

-}

-

-static void XAAStateWrapSetupForImageWrite(ScrnInfoPtr pScrn, int rop, 

-					   unsigned int planemask, int transparency_color,

-					   int bpp, int depth)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->SetupForImageWrite)(pScrn, rop, planemask, transparency_color, bpp, 

-				     depth);

-}

-

-static void XAAStateWrapSetupForScanlineImageWrite(ScrnInfoPtr pScrn, int rop, 

-						   unsigned int planemask,

-						   int transparency_color,

-						   int bpp, int depth)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->SetupForScanlineImageWrite)(pScrn, rop, planemask, transparency_color, 

-					     bpp, depth);

-}

-

-static void XAAStateWrapSetupForImageRead(ScrnInfoPtr pScrn, int bpp, int depth)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->SetupForImageRead)(pScrn, bpp, depth);

-}

-

-static void XAAStateWrapScreenToScreenBitBlt(ScrnInfoPtr pScrn, int nbox,

-					     DDXPointPtr pptSrc, BoxPtr pbox, int xdir, 

-					     int ydir, int alu, unsigned int planmask)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->ScreenToScreenBitBlt)(pScrn, nbox,

-				       pptSrc, pbox, xdir, 

-				       ydir, alu, planmask);

-}

-

-static void XAAStateWrapWriteBitmap(ScrnInfoPtr pScrn, int x, int y, int w, int h,

-				    unsigned char *src, int srcwidth, int skipleft,

-				    int fg, int bg, int rop, unsigned int planemask)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->WriteBitmap)(pScrn, x, y, w, h,

-			      src, srcwidth, skipleft,

-			      fg, bg, rop, planemask);

-}

-

-static void XAAStateWrapFillSolidRects(ScrnInfoPtr pScrn, int fg, int rop,

-				       unsigned int planemask, int nBox, BoxPtr pBox)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillSolidRects)(pScrn, fg, rop,

-				 planemask, nBox, pBox);

-}

-

-static void XAAStateWrapFillMono8x8PatternRects(ScrnInfoPtr pScrn, int fg, int bg, 

-						int rop, unsigned int planemask, int nBox,

-						BoxPtr pBox, int pat0, int pat1,

-						int xorg, int yorg)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillMono8x8PatternRects)(pScrn, fg, bg, 

-					  rop, planemask, nBox,

-					  pBox, pat0, pat1,

-					  xorg, yorg);

-}

-

-static void XAAStateWrapFillColor8x8PatternRects(ScrnInfoPtr pScrn, int rop,

-						 unsigned int planemask, int nBox,

-						 BoxPtr pBox, int xorg, int yorg,

-						 XAACacheInfoPtr pCache)

-{ 

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillColor8x8PatternRects)(pScrn, rop,

-					   planemask, nBox,

-					   pBox, xorg, yorg,

-					   pCache);

-}

-

-static void XAAStateWrapFillCacheBltRects(ScrnInfoPtr pScrn, int rop, 

-					  unsigned int planemask, int nBox, BoxPtr pBox,

-					  int xorg, int yorg, XAACacheInfoPtr pCache)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillCacheBltRects)(pScrn, rop, 

-				    planemask, nBox, pBox,

-				    xorg, yorg, pCache);

-}

-

-static void XAAStateWrapFillColorExpandRects(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-					     unsigned int planemask, int nBox,

-					     BoxPtr pBox, int xorg, int yorg, 

-					     PixmapPtr pPix)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillColorExpandRects)(pScrn, fg, bg, rop,

-				       planemask, nBox,

-				       pBox, xorg, yorg, 

-				       pPix);

-}

-

-static void XAAStateWrapFillCacheExpandRects(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-					     unsigned int planemask, int nBox, 

-					     BoxPtr pBox, int xorg, int yorg, 

-					     PixmapPtr pPix)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillCacheExpandRects)(pScrn, fg, bg, rop,

-				       planemask, nBox, 

-				       pBox, xorg, yorg, 

-				       pPix);

-}

-

-static void XAAStateWrapFillImageWriteRects(ScrnInfoPtr pScrn, int rop,

-					    unsigned int planemask, int nBox, BoxPtr pBox,

-					    int xorg, int yorg, PixmapPtr pPix)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillImageWriteRects)(pScrn, rop,

-				      planemask, nBox, pBox,

-				      xorg, yorg, pPix);

-}

-

-static void XAAStateWrapFillSolidSpans(ScrnInfoPtr pScrn, int fg, int rop,

-				       unsigned int planemask, int n, DDXPointPtr points,

-				       int *widths, int fSorted)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillSolidSpans)(pScrn, fg, rop,

-				 planemask, n, points,

-				 widths, fSorted);

-}

-

-static void XAAStateWrapFillMono8x8PatternSpans(ScrnInfoPtr pScrn, int fg, int bg, 

-						int rop, unsigned int planemask, int n,

-						DDXPointPtr points, int *widths,

-						int fSorted, int pat0, int pat1,

-						int xorg, int yorg)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillMono8x8PatternSpans)(pScrn, fg, bg, 

-					  rop, planemask, n,

-					  points, widths,

-					  fSorted, pat0, pat1,

-					  xorg, yorg);

-}

-

-static void XAAStateWrapFillColor8x8PatternSpans(ScrnInfoPtr pScrn, int rop,

-						 unsigned int planemask, int n,

-						 DDXPointPtr points, int *widths,

-						 int fSorted, XAACacheInfoPtr pCache,

-						 int xorg, int yorg)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillColor8x8PatternSpans)(pScrn, rop,

-					   planemask, n,

-					   points, widths,

-					   fSorted, pCache,

-					   xorg, yorg);

-}

-

-static void XAAStateWrapFillCacheBltSpans(ScrnInfoPtr pScrn, int rop,

-					  unsigned int planemask, int n, 

-					  DDXPointPtr points, int *widths, 

-					  int fSorted, XAACacheInfoPtr pCache,

-					  int xorg, int yorg)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillCacheBltSpans)(pScrn, rop,

-				    planemask, n, 

-				    points, widths, 

-				    fSorted, pCache,

-				    xorg, yorg);

-}

-

-static void XAAStateWrapFillColorExpandSpans(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-					     unsigned int planemask, int n,

-					     DDXPointPtr points, int *widths, int fSorted,

-					     int xorg, int yorg, PixmapPtr pPix)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillColorExpandSpans)(pScrn, fg, bg, rop,

-				       planemask, n,

-				       points, widths, fSorted,

-				       xorg, yorg, pPix);

-}

-

-static void XAAStateWrapFillCacheExpandSpans(ScrnInfoPtr pScrn, int fg, int bg, int rop,

-					     unsigned int planemask, int n, 

-					     DDXPointPtr ppt, int *pwidth, int fSorted, 

-					     int xorg, int yorg, PixmapPtr pPix)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->FillCacheExpandSpans)(pScrn, fg, bg, rop,

-				       planemask, n, 

-				       ppt, pwidth, fSorted, 

-				       xorg, yorg, pPix);

-}

-

-static void XAAStateWrapTEGlyphRenderer(ScrnInfoPtr pScrn, int x, int y, int w, int h, 

-					int skipleft, int startline, 

-					unsigned int **glyphs,

-					int glyphWidth, int fg, int bg, int rop, 

-					unsigned planemask)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->TEGlyphRenderer)(pScrn, x, y, w, h, 

-				  skipleft, startline, 

-				  glyphs,

-				  glyphWidth, fg, bg, rop, 

-				  planemask);

-}

-

-static void XAAStateWrapNonTEGlyphRenderer(ScrnInfoPtr pScrn, int x, int y, int n,

-					   NonTEGlyphPtr glyphs, BoxPtr pbox,

-					   int fg, int rop, unsigned int planemask)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->NonTEGlyphRenderer)(pScrn, x, y, n,

-				     glyphs, pbox,

-				     fg, rop, planemask);

-}

-

-static void XAAStateWrapWritePixmap(ScrnInfoPtr pScrn, int x, int y, int w, int h,

-				    unsigned char *src, int srcwidth, int rop,

-				    unsigned int planemask, int transparency_color,

-				    int bpp, int depth)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->WritePixmap)(pScrn, x, y, w, h,

-			      src, srcwidth, rop,

-			      planemask, transparency_color,

-			      bpp, depth);

-}

-

-static void XAAStateWrapReadPixmap(ScrnInfoPtr pScrn, int x, int y, int w, int h,

-				   unsigned char *dst, int dstwidth, int bpp, int depth)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->ReadPixmap)(pScrn, x, y, w, h,

-			     dst, dstwidth, bpp, depth);

-}

-

-static RegionPtr XAAStateWrapCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,

-				      GC *pGC, int srcx, int srcy, int width, int height,

-				      int dstx, int dsty)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   return (*pStatePriv->CopyArea)(pSrcDrawable, pDstDrawable,

-				  pGC, srcx, srcy, width, height,

-				  dstx, dsty);

-}

-

-static RegionPtr XAAStateWrapCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,

-				       int srcx, int srcy, int width, int height, 

-				       int dstx, int dsty, unsigned long bitPlane)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   return (*pStatePriv->CopyPlane)(pSrc, pDst, pGC,

-				   srcx, srcy, width, height, 

-				   dstx, dsty, bitPlane);

-}

-

-static void XAAStateWrapPushPixelsSolid(GCPtr pGC, PixmapPtr pBitMap,

-					DrawablePtr pDrawable, int dx, int dy, int xOrg, 

-					int yOrg)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PushPixelsSolid)(pGC, pBitMap,

-				  pDrawable, dx, dy, xOrg, 

-				  yOrg);

-}

-

-static void XAAStateWrapPolyFillRectSolid(DrawablePtr pDraw, GCPtr pGC, int nrectFill,

-					  xRectangle *prectInit)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolyFillRectSolid)(pDraw, pGC, nrectFill,

-				    prectInit);

-}

-

-static void XAAStateWrapPolyFillRectStippled(DrawablePtr pDraw, GCPtr pGC, int nrectFill,

-					     xRectangle *prectInit)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolyFillRectStippled)(pDraw, pGC, nrectFill,

-				       prectInit);

-}

-

-static void XAAStateWrapPolyFillRectOpaqueStippled(DrawablePtr pDraw, GCPtr pGC,

-						   int nrectFill, xRectangle *prectInit)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolyFillRectOpaqueStippled)(pDraw, pGC,

-					     nrectFill, prectInit);

-}

-

-static void XAAStateWrapPolyFillRectTiled(DrawablePtr pDraw, GCPtr pGC, int nrectFill,

-					  xRectangle *prectInit)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolyFillRectTiled)(pDraw, pGC, nrectFill,

-				    prectInit);

-}

-

-static void XAAStateWrapFillSpansSolid(DrawablePtr pDraw, GCPtr pGC, int nInit,

-				       DDXPointPtr ppt, int *pwidth, int fSorted)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->FillSpansSolid)(pDraw, pGC, nInit,

-				 ppt, pwidth, fSorted);

-}

-

-static void XAAStateWrapFillSpansStippled(DrawablePtr pDraw, GCPtr pGC, int nInit,

-					  DDXPointPtr ppt, int *pwidth, int fSorted)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->FillSpansStippled)(pDraw, pGC, nInit,

-				    ppt, pwidth, fSorted);

-}

-

-static void XAAStateWrapFillSpansOpaqueStippled(DrawablePtr pDraw, GCPtr pGC, int nInit, 

-						DDXPointPtr ppt, int *pwidth, int fSorted)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->FillSpansOpaqueStippled)(pDraw, pGC, nInit, 

-					  ppt, pwidth, fSorted);

-}

-

-static void XAAStateWrapFillSpansTiled(DrawablePtr pDraw, GCPtr pGC, int nInit, 

-				       DDXPointPtr ppt, int *pwidth, int fSorted)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->FillSpansTiled)(pDraw, pGC, nInit, 

-				 ppt, pwidth, fSorted);

-}

-

-static int XAAStateWrapPolyText8TE(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,

-				   char *chars)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   return (*pStatePriv->PolyText8TE)(pDraw, pGC, x, y, count,

-				     chars);

-}

-

-static int XAAStateWrapPolyText16TE(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,

-				    unsigned short *chars)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   return (*pStatePriv->PolyText16TE)(pDraw, pGC, x, y, count,

-				      chars);

-}

-

-static void XAAStateWrapImageText8TE(DrawablePtr pDraw, GCPtr pGC, int x, int y, 

-				     int count, char *chars)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ImageText8TE)(pDraw, pGC, x, y, 

-			       count, chars);

-}

-

-static void XAAStateWrapImageText16TE(DrawablePtr pDraw, GCPtr pGC, int x, int y,

-				      int count, unsigned short *chars)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ImageText16TE)(pDraw, pGC, x, y,

-				count, chars);

-}

-

-static void XAAStateWrapImageGlyphBltTE(DrawablePtr pDrawable, GCPtr pGC, int xInit, 

-					int yInit, unsigned int nglyph, CharInfoPtr *ppci,

-					pointer pglyphBase)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ImageGlyphBltTE)(pDrawable, pGC, xInit, 

-				  yInit, nglyph, ppci,

-				  pglyphBase);

-}

-

-static void XAAStateWrapPolyGlyphBltTE(DrawablePtr pDrawable, GCPtr pGC, int xInit, 

-				       int yInit, unsigned int nglyph, CharInfoPtr *ppci,

-				       pointer pglyphBase)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolyGlyphBltTE)(pDrawable, pGC, xInit, 

-				 yInit, nglyph, ppci,

-				 pglyphBase);

-}

-

-static int XAAStateWrapPolyText8NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,

-				      int count, char *chars)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   return (*pStatePriv->PolyText8NonTE)(pDraw, pGC, x, y,

-					count, chars);

-}

-

-static int XAAStateWrapPolyText16NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,

-				       int count, unsigned short *chars)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   return (*pStatePriv->PolyText16NonTE)(pDraw, pGC, x, y,

-					 count, chars);

-}

-

-static void XAAStateWrapImageText8NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,

-					int count, char *chars)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ImageText8NonTE)(pDraw, pGC, x, y,

-				  count, chars);

-}

-

-static void XAAStateWrapImageText16NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,

-					 int count, unsigned short *chars)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ImageText16NonTE)(pDraw, pGC, x, y,

-				   count, chars);

-}

-

-static void XAAStateWrapImageGlyphBltNonTE(DrawablePtr pDrawable, GCPtr pGC, int xInit,

-					   int yInit, unsigned int nglyph,

-					   CharInfoPtr *ppci, pointer pglyphBase)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ImageGlyphBltNonTE)(pDrawable, pGC, xInit,

-				     yInit, nglyph,

-				     ppci, pglyphBase);

-}

-

-static void XAAStateWrapPolyGlyphBltNonTE(DrawablePtr pDrawable, GCPtr pGC, int xInit,

-					  int yInit, unsigned int nglyph,

-					  CharInfoPtr *ppci, pointer pglyphBase)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolyGlyphBltNonTE)(pDrawable, pGC, xInit,

-				    yInit, nglyph,

-				    ppci, pglyphBase);

-}

-

-static void XAAStateWrapPolyRectangleThinSolid(DrawablePtr pDrawable,GCPtr pGC,

-					       int nRectsInit, xRectangle *pRectsInit)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolyRectangleThinSolid)(pDrawable, pGC,

-					 nRectsInit, pRectsInit);

-}

-

-static void XAAStateWrapPolylinesWideSolid(DrawablePtr pDrawable, GCPtr pGC, int mode,

-					   int npt, DDXPointPtr pPts)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolylinesWideSolid)(pDrawable, pGC, mode,

-				     npt, pPts);

-}

-

-static void XAAStateWrapPolylinesThinSolid(DrawablePtr pDrawable, GCPtr pGC, int mode, 

-					   int npt, DDXPointPtr pPts)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolylinesThinSolid)(pDrawable, pGC, mode, 

-				     npt, pPts);

-}

-

-static void XAAStateWrapPolySegmentThinSolid(DrawablePtr pDrawable, GCPtr pGC, int nseg,

-					     xSegment *pSeg)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolySegmentThinSolid)(pDrawable, pGC, nseg,

-				       pSeg);

-}

-

-static void XAAStateWrapPolylinesThinDashed(DrawablePtr pDrawable, GCPtr pGC, int mode, 

-					    int npt, DDXPointPtr pPts)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolylinesThinDashed)(pDrawable, pGC, mode, 

-				      npt, pPts);

-}

-

-static void XAAStateWrapPolySegmentThinDashed(DrawablePtr pDrawable, GCPtr pGC, int nseg,

-					      xSegment *pSeg)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolySegmentThinDashed)(pDrawable, pGC, nseg,

-					pSeg);

-}

-

-static void XAAStateWrapFillPolygonSolid(DrawablePtr pDrawable, GCPtr pGC, int shape,

-					 int mode, int count, DDXPointPtr ptsIn)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->FillPolygonSolid)(pDrawable, pGC, shape,

-				   mode, count, ptsIn);

-}

-

-static void XAAStateWrapFillPolygonStippled(DrawablePtr pDrawable, GCPtr pGC, int shape,

-					    int mode, int count, DDXPointPtr ptsIn)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->FillPolygonStippled)(pDrawable, pGC, shape,

-				      mode, count, ptsIn);

-}

-

-static void XAAStateWrapFillPolygonOpaqueStippled(DrawablePtr pDrawable, GCPtr pGC,

-						  int shape, int mode, int count,

-						  DDXPointPtr ptsIn)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->FillPolygonOpaqueStippled)(pDrawable, pGC,

-					    shape, mode, count,

-					    ptsIn);

-}

-

-static void XAAStateWrapFillPolygonTiled(DrawablePtr pDrawable, GCPtr pGC, int shape,

-					 int mode, int count, DDXPointPtr ptsIn)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->FillPolygonTiled)(pDrawable, pGC, shape,

-				   mode, count, ptsIn);

-}

-

-static void XAAStateWrapPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs,

-					 xArc *parcs)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PolyFillArcSolid)(pDraw, pGC, narcs,

-				   parcs);

-}

-

-static void XAAStateWrapPutImage(DrawablePtr pDraw, GCPtr pGC, int depth, int x, int y, 

-				 int w, int h, int leftPad, int format, char *pImage)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->PutImage)(pDraw, pGC, depth, x, y, 

-			   w, h, leftPad, format, pImage);

-}

-

-static void XAAStateWrapValidateFillSpans(GCPtr pGC, unsigned long changes, 

-					  DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidateFillSpans)(pGC, changes,

-				    pDraw);

-}

-

-static void XAAStateWrapValidateSetSpans(GCPtr pGC, unsigned long changes, 

-					 DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidateSetSpans)(pGC, changes,

-				   pDraw);

-}

-

-static void XAAStateWrapValidatePutImage(GCPtr pGC, unsigned long changes,

-					 DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePutImage)(pGC, changes,

-				   pDraw);

-}

-

-static void XAAStateWrapValidateCopyArea(GCPtr pGC, unsigned long changes,

-					 DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidateCopyArea)(pGC, changes,

-				   pDraw);

-}

-

-static void XAAStateWrapValidateCopyPlane(GCPtr pGC, unsigned long changes,

-					  DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidateCopyPlane)(pGC, changes,

-				    pDraw);

-}

-

-static void XAAStateWrapValidatePolyPoint(GCPtr pGC, unsigned long changes, 

-					  DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePolyPoint)(pGC, changes,

-				    pDraw);

-}

-

-static void XAAStateWrapValidatePolylines(GCPtr pGC, unsigned long changes,

-					  DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePolylines)(pGC, changes,

-				    pDraw);

-}

-

-static void XAAStateWrapValidatePolySegment(GCPtr pGC, unsigned long changes, 

-					    DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePolySegment)(pGC, changes,

-				      pDraw);

-}

-

-static void XAAStateWrapValidatePolyRectangle(GCPtr pGC, unsigned long changes, 

-					      DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePolyRectangle)(pGC, changes,

-					pDraw);

-}

-

-static void XAAStateWrapValidatePolyArc(GCPtr pGC, unsigned long changes,

-					DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePolyArc)(pGC, changes,

-				  pDraw);

-}

-

-static void XAAStateWrapValidateFillPolygon(GCPtr pGC, unsigned long changes,

-					    DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidateFillPolygon)(pGC, changes,

-				      pDraw);

-}

-

-static void XAAStateWrapValidatePolyFillRect(GCPtr pGC, unsigned long changes,

-					     DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePolyFillRect)(pGC, changes,

-				       pDraw);

-}

-

-static void XAAStateWrapValidatePolyFillArc(GCPtr pGC, unsigned long changes,

-					    DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePolyFillArc)(pGC, changes,

-				      pDraw);

-}

-

-static void XAAStateWrapValidatePolyText8(GCPtr pGC, unsigned long changes,

-					  DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePolyText8)(pGC, changes,

-				    pDraw);

-}

-

-static void XAAStateWrapValidatePolyText16(GCPtr pGC, unsigned long changes, 

-					   DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePolyText16)(pGC, changes, 

-				     pDraw);

-}

-

-static void XAAStateWrapValidateImageText8(GCPtr pGC, unsigned long changes, 

-					   DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidateImageText8)(pGC, changes, 

-				     pDraw);

-}

-

-static void XAAStateWrapValidateImageText16(GCPtr pGC, unsigned long changes, 

-					    DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidateImageText16)(pGC, changes, 

-				      pDraw);

-}

-

-static void XAAStateWrapValidatePolyGlyphBlt(GCPtr pGC, unsigned long changes, 

-					     DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePolyGlyphBlt)(pGC, changes, 

-				       pDraw);

-}

-

-static void XAAStateWrapValidateImageGlyphBlt(GCPtr pGC, unsigned long changes, 

-					      DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-   (*pStatePriv->ValidateImageGlyphBlt)(pGC, changes, 

-					pDraw);

-}

-

-static void XAAStateWrapValidatePushPixels(GCPtr pGC, unsigned long changes,

-					   DrawablePtr pDraw)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ValidatePushPixels)(pGC, changes,

-				     pDraw);

-}

-

-static void XAAStateWrapComputeDash(GCPtr pGC)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ComputeDash)(pGC);

-}

-

-static void XAAStateWrapInitPixmapCache(ScreenPtr pScreen, RegionPtr areas,

-					pointer data)

-{

-   GET_STATEPRIV_SCREEN(pScreen);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->InitPixmapCache)(pScreen, areas,

-				  data);

-}

-

-static void XAAStateWrapClosePixmapCache(ScreenPtr pScreen)

-{

-   GET_STATEPRIV_SCREEN(pScreen);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->ClosePixmapCache)(pScreen);

-}

-

-static int XAAStateWrapStippledFillChooser(GCPtr pGC)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   return (*pStatePriv->StippledFillChooser)(pGC);

-}

-

-static int XAAStateWrapOpaqueStippledFillChooser(GCPtr pGC)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   return (*pStatePriv->OpaqueStippledFillChooser)(pGC);

-}

-

-static int XAAStateWrapTiledFillChooser(GCPtr pGC)

-{

-   GET_STATEPRIV_GC(pGC);

-   STATE_CHECK_SP(pStatePriv);

-

-   return (*pStatePriv->TiledFillChooser)(pGC);

-}

-

-static XAACacheInfoPtr XAAStateWrapCacheTile(ScrnInfoPtr pScrn, PixmapPtr pPix)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   return (*pStatePriv->CacheTile)(pScrn, pPix);

-}

-

-static XAACacheInfoPtr XAAStateWrapCacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, 

-						int bg)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   return (*pStatePriv->CacheStipple)(pScrn, pPix, fg, 

-				      bg);

-}

-

-static XAACacheInfoPtr XAAStateWrapCacheMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   return (*pStatePriv->CacheMonoStipple)(pScrn, pPix);

-}

-

-static XAACacheInfoPtr XAAStateWrapCacheMono8x8Pattern(ScrnInfoPtr pScrn, int pat0,

-						       int pat1)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   return (*pStatePriv->CacheMono8x8Pattern)(pScrn, pat0,

-					     pat1);

-}

-

-static XAACacheInfoPtr XAAStateWrapCacheColor8x8Pattern(ScrnInfoPtr pScrn, PixmapPtr pPix,

-							int fg, int bg)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   return (*pStatePriv->CacheColor8x8Pattern)(pScrn, pPix,

-					      fg, bg);

-}

-

-static void XAAStateWrapWriteBitmapToCache(ScrnInfoPtr pScrn, int x, int y, int w, int h,

-					   unsigned char *src, int srcwidth, int fg, 

-					   int bg)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->WriteBitmapToCache)(pScrn, x, y, w, h,

-				     src, srcwidth, fg, 

-				     bg);

-}

-

-static void XAAStateWrapWritePixmapToCache(ScrnInfoPtr pScrn, int x, int y, int w, int h,

-					   unsigned char *src, int srcwidth, int bpp, 

-					   int depth)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->WritePixmapToCache)(pScrn, x, y, w, h,

-				     src, srcwidth, bpp, 

-				     depth);

-}

-

-static void XAAStateWrapWriteMono8x8PatternToCache(ScrnInfoPtr pScrn, 

-						   XAACacheInfoPtr pCache)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->WriteMono8x8PatternToCache)(pScrn, 

-					     pCache);

-}

-

-static void XAAStateWrapWriteColor8x8PatternToCache(ScrnInfoPtr pScrn, PixmapPtr pPix, 

-						    XAACacheInfoPtr pCache)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   (*pStatePriv->WriteColor8x8PatternToCache)(pScrn, pPix, 

-					      pCache);

-}

-

-static void XAAStateWrapGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,

-				 unsigned int format,unsigned long planeMask, 

-				 char *pdstLine)

-{

-   GET_STATEPRIV_SCREEN(pDrawable->pScreen);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->GetImage)(pDrawable, sx, sy, w, h,

-			   format, planeMask, 

-			   pdstLine);

-}

-

-static void XAAStateWrapGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,

-				 int *pwidth, int nspans, char *pdstStart)

-{

-   GET_STATEPRIV_SCREEN(pDrawable->pScreen);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->GetSpans)(pDrawable, wMax, ppt,

-			   pwidth, nspans, pdstStart);

-}

-

-static void XAAStateWrapCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, 

-				   RegionPtr prgnSrc)

-{

-   GET_STATEPRIV_SCREEN(pWindow->drawable.pScreen);

-   STATE_CHECK_SP(pStatePriv);

-

-   (*pStatePriv->CopyWindow)(pWindow, ptOldOrg, 

-			     prgnSrc);

-}

-

-static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture2(ScrnInfoPtr pScrn,

-                                                         int op, CARD16 red,

-                                                         CARD16 green,

-                                                         CARD16 blue,

-                                                         CARD16 alpha,

-							 CARD32 srcFormat,

-							 CARD32 dstFormat,

-                                                         CARD8 *alphaPtr,

-                                                         int alphaPitch,

-                                                         int width, int height,

-                                                         int flags)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   return (*pStatePriv->SetupForCPUToScreenAlphaTexture2)(pScrn, op, red, green,

-                                                         blue, alpha, srcFormat,

-							 dstFormat, alphaPtr,

-							 alphaPitch, width,

-							 height, flags);

-}

-

-static Bool XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op,

-                                                    CARD32 srcFormat,

-						    CARD32 dstFormat,

-						    CARD8 *texPtr, int texPitch,

-                                                    int width, int height,

-                                                    int flags)

-{

-   GET_STATEPRIV_PSCRN(pScrn);

-   STATE_CHECK_PSCRN(pScrn);

-

-   return (*pStatePriv->SetupForCPUToScreenTexture2)(pScrn, op, srcFormat,

-                                                    dstFormat, texPtr, texPitch,

-						    width, height, flags);

-}

-

-/* Setup Function */

-Bool

-XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec)

-{

-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-   XAAStateWrapPtr pStatePriv;

-   int i = 0;

-   

-   if (!dixRegisterPrivateKey(&XAAStateKeyRec, PRIVATE_SCREEN, 0)) return FALSE;

-   if(!(pStatePriv = malloc(sizeof(XAAStateWrapRec)))) return FALSE;

-   dixSetPrivate(&pScreen->devPrivates, XAAStateKey, pStatePriv);

-   pStatePriv->RestoreAccelState = infoRec->RestoreAccelState;

-   pStatePriv->pScrn = pScrn;

-   

-   /* Initialize the last screen to -1 so whenever an accel function

-    * is called the proper state is setup

-    */

-   while(i < pScrn->numEntities) {

-      xf86SetLastScrnFlag(pScrn->entityList[i], -1);

-      i++;

-   }

-/* Do the wrapping */

-   XAA_STATE_WRAP(Sync);

-   XAA_STATE_WRAP(SetupForScreenToScreenCopy);

-   XAA_STATE_WRAP(SetupForSolidFill);

-   XAA_STATE_WRAP(SetupForSolidLine);

-   XAA_STATE_WRAP(SetupForDashedLine);

-   XAA_STATE_WRAP(SetClippingRectangle);

-   XAA_STATE_WRAP(DisableClipping);

-   XAA_STATE_WRAP(SetupForMono8x8PatternFill);

-   XAA_STATE_WRAP(SetupForColor8x8PatternFill);

-   XAA_STATE_WRAP(SetupForCPUToScreenColorExpandFill);

-   XAA_STATE_WRAP(SetupForScanlineCPUToScreenColorExpandFill);

-   XAA_STATE_WRAP(SetupForScreenToScreenColorExpandFill);

-   XAA_STATE_WRAP(SetupForImageWrite);

-   XAA_STATE_WRAP(SetupForScanlineImageWrite);

-   XAA_STATE_WRAP(SetupForImageRead);

-   XAA_STATE_WRAP(ScreenToScreenBitBlt);

-   XAA_STATE_WRAP(WriteBitmap);

-   XAA_STATE_WRAP(FillSolidRects);

-   XAA_STATE_WRAP(FillMono8x8PatternRects);

-   XAA_STATE_WRAP(FillColor8x8PatternRects);

-   XAA_STATE_WRAP(FillCacheBltRects);

-   XAA_STATE_WRAP(FillColorExpandRects);

-   XAA_STATE_WRAP(FillCacheExpandRects);

-   XAA_STATE_WRAP(FillImageWriteRects);

-   XAA_STATE_WRAP(FillSolidSpans);

-   XAA_STATE_WRAP(FillMono8x8PatternSpans);

-   XAA_STATE_WRAP(FillColor8x8PatternSpans);

-   XAA_STATE_WRAP(FillCacheBltSpans);

-   XAA_STATE_WRAP(FillColorExpandSpans);

-   XAA_STATE_WRAP(FillCacheExpandSpans);

-   XAA_STATE_WRAP(TEGlyphRenderer);

-   XAA_STATE_WRAP(NonTEGlyphRenderer);

-   XAA_STATE_WRAP(WritePixmap);

-   XAA_STATE_WRAP(ReadPixmap);

-   XAA_STATE_WRAP(CopyArea);

-   XAA_STATE_WRAP(CopyPlane);

-   XAA_STATE_WRAP(PushPixelsSolid);

-   XAA_STATE_WRAP(PolyFillRectSolid);

-   XAA_STATE_WRAP(PolyFillRectStippled);

-   XAA_STATE_WRAP(PolyFillRectOpaqueStippled);

-   XAA_STATE_WRAP(PolyFillRectTiled);

-   XAA_STATE_WRAP(FillSpansSolid);

-   XAA_STATE_WRAP(FillSpansStippled);

-   XAA_STATE_WRAP(FillSpansOpaqueStippled);

-   XAA_STATE_WRAP(FillSpansTiled);

-   XAA_STATE_WRAP(PolyText8TE);

-   XAA_STATE_WRAP(PolyText16TE);

-   XAA_STATE_WRAP(ImageText8TE);

-   XAA_STATE_WRAP(ImageText16TE);

-   XAA_STATE_WRAP(ImageGlyphBltTE);

-   XAA_STATE_WRAP(PolyGlyphBltTE);

-   XAA_STATE_WRAP(PolyText8NonTE);

-   XAA_STATE_WRAP(PolyText16NonTE);

-   XAA_STATE_WRAP(ImageText8NonTE);

-   XAA_STATE_WRAP(ImageText16NonTE);

-   XAA_STATE_WRAP(ImageGlyphBltNonTE);

-   XAA_STATE_WRAP(PolyGlyphBltNonTE);

-   XAA_STATE_WRAP(PolyRectangleThinSolid);

-   XAA_STATE_WRAP(PolylinesWideSolid);

-   XAA_STATE_WRAP(PolylinesThinSolid);

-   XAA_STATE_WRAP(PolySegmentThinSolid);

-   XAA_STATE_WRAP(PolylinesThinDashed);

-   XAA_STATE_WRAP(PolySegmentThinDashed);

-   XAA_STATE_WRAP(FillPolygonSolid);

-   XAA_STATE_WRAP(FillPolygonStippled);

-   XAA_STATE_WRAP(FillPolygonOpaqueStippled);

-   XAA_STATE_WRAP(FillPolygonTiled);

-   XAA_STATE_WRAP(PolyFillArcSolid);

-   XAA_STATE_WRAP(PutImage);

-   XAA_STATE_WRAP(ValidateFillSpans);

-   XAA_STATE_WRAP(ValidateSetSpans);

-   XAA_STATE_WRAP(ValidatePutImage);

-   XAA_STATE_WRAP(ValidateCopyArea);

-   XAA_STATE_WRAP(ValidateCopyPlane);

-   XAA_STATE_WRAP(ValidatePolyPoint);

-   XAA_STATE_WRAP(ValidatePolylines);

-   XAA_STATE_WRAP(ValidatePolySegment);

-   XAA_STATE_WRAP(ValidatePolyRectangle);

-   XAA_STATE_WRAP(ValidatePolyArc);

-   XAA_STATE_WRAP(ValidateFillPolygon);

-   XAA_STATE_WRAP(ValidatePolyFillRect);

-   XAA_STATE_WRAP(ValidatePolyFillArc);

-   XAA_STATE_WRAP(ValidatePolyText8);

-   XAA_STATE_WRAP(ValidatePolyText16);

-   XAA_STATE_WRAP(ValidateImageText8);

-   XAA_STATE_WRAP(ValidateImageText16);

-   XAA_STATE_WRAP(ValidatePolyGlyphBlt);

-   XAA_STATE_WRAP(ValidateImageGlyphBlt);

-   XAA_STATE_WRAP(ValidatePushPixels);

-   XAA_STATE_WRAP(ComputeDash);

-   XAA_STATE_WRAP(InitPixmapCache);

-   XAA_STATE_WRAP(ClosePixmapCache);

-   XAA_STATE_WRAP(StippledFillChooser);

-   XAA_STATE_WRAP(OpaqueStippledFillChooser);

-   XAA_STATE_WRAP(TiledFillChooser);

-   XAA_STATE_WRAP(CacheTile);

-   XAA_STATE_WRAP(CacheStipple);

-   XAA_STATE_WRAP(CacheMonoStipple);

-   XAA_STATE_WRAP(CacheMono8x8Pattern);

-   XAA_STATE_WRAP(CacheColor8x8Pattern);

-   XAA_STATE_WRAP(WriteBitmapToCache);

-   XAA_STATE_WRAP(WritePixmapToCache);

-   XAA_STATE_WRAP(WriteMono8x8PatternToCache);

-   XAA_STATE_WRAP(WriteColor8x8PatternToCache);

-   XAA_STATE_WRAP(GetImage);

-   XAA_STATE_WRAP(GetSpans);

-   XAA_STATE_WRAP(CopyWindow);

-   XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture2);

-   XAA_STATE_WRAP(SetupForCPUToScreenTexture2);

-   return TRUE;

-}

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "windowstr.h"
+#include "xf86str.h"
+#include "mi.h"
+#include "miline.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaawrap.h"
+#include "servermd.h"
+
+#define XAA_STATE_WRAP(func) do {\
+if(infoRec->func) { \
+   pStatePriv->func = infoRec->func;\
+   infoRec->func = XAAStateWrap##func;\
+}} while(0)
+
+/* Wrap all XAA functions and allocate our private structure.
+ */
+
+typedef struct _XAAStateWrapRec {
+    ScrnInfoPtr pScrn;
+    void (*RestoreAccelState) (ScrnInfoPtr pScrn);
+    void (*Sync) (ScrnInfoPtr pScrn);
+    void (*SetupForScreenToScreenCopy) (ScrnInfoPtr pScrn, int xdir, int ydir,
+                                        int rop, unsigned int planemask,
+                                        int trans_color);
+    void (*SetupForSolidFill) (ScrnInfoPtr pScrn, int color, int rop,
+                               unsigned int planemask);
+    void (*SetupForSolidLine) (ScrnInfoPtr pScrn, int color, int rop,
+                               unsigned int planemask);
+    void (*SetupForDashedLine) (ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                                unsigned int planemask, int length,
+                                unsigned char *pattern);
+    void (*SetClippingRectangle) (ScrnInfoPtr pScrn, int left, int top,
+                                  int right, int bottom);
+    void (*DisableClipping) (ScrnInfoPtr pScrn);
+    void (*SetupForMono8x8PatternFill) (ScrnInfoPtr pScrn, int patx, int paty,
+                                        int fg, int bg, int rop,
+                                        unsigned int planemask);
+    void (*SetupForColor8x8PatternFill) (ScrnInfoPtr pScrn, int patx, int paty,
+                                         int rop, unsigned int planemask,
+                                         int transparency_color);
+    void (*SetupForCPUToScreenColorExpandFill) (ScrnInfoPtr pScrn, int fg,
+                                                int bg, int rop,
+                                                unsigned int planemask);
+    void (*SetupForScanlineCPUToScreenColorExpandFill) (ScrnInfoPtr pScrn,
+                                                        int fg, int bg, int rop,
+                                                        unsigned int planemask);
+    void (*SetupForScreenToScreenColorExpandFill) (ScrnInfoPtr pScrn,
+                                                   int fg, int bg, int rop,
+                                                   unsigned int planemask);
+    void (*SetupForImageWrite) (ScrnInfoPtr pScrn, int rop,
+                                unsigned int planemask, int transparency_color,
+                                int bpp, int depth);
+    void (*SetupForScanlineImageWrite) (ScrnInfoPtr pScrn, int rop,
+                                        unsigned int planemask,
+                                        int transparency_color,
+                                        int bpp, int depth);
+    void (*SetupForImageRead) (ScrnInfoPtr pScrn, int bpp, int depth);
+    void (*ScreenToScreenBitBlt) (ScrnInfoPtr pScrn, int nbox,
+                                  DDXPointPtr pptSrc, BoxPtr pbox, int xdir,
+                                  int ydir, int alu, unsigned int planmask);
+    void (*WriteBitmap) (ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                         unsigned char *src, int srcwidth, int skipleft,
+                         int fg, int bg, int rop, unsigned int planemask);
+    void (*FillSolidRects) (ScrnInfoPtr pScrn, int fg, int rop,
+                            unsigned int planemask, int nBox, BoxPtr pBox);
+    void (*FillMono8x8PatternRects) (ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                                     unsigned int planemask, int nBox,
+                                     BoxPtr pBox, int pat0, int pat1,
+                                     int xorg, int yorg);
+    void (*FillColor8x8PatternRects) (ScrnInfoPtr pScrn, int rop,
+                                      unsigned int planemask, int nBox,
+                                      BoxPtr pBox, int xorg, int yorg,
+                                      XAACacheInfoPtr pCache);
+    void (*FillCacheBltRects) (ScrnInfoPtr pScrn, int rop,
+                               unsigned int planemask, int nBox, BoxPtr pBox,
+                               int xorg, int yorg, XAACacheInfoPtr pCache);
+    void (*FillColorExpandRects) (ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                                  unsigned int planemask, int nBox,
+                                  BoxPtr pBox, int xorg, int yorg,
+                                  PixmapPtr pPix);
+    void (*FillCacheExpandRects) (ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                                  unsigned int planemask, int nBox, BoxPtr pBox,
+                                  int xorg, int yorg, PixmapPtr pPix);
+    void (*FillImageWriteRects) (ScrnInfoPtr pScrn, int rop,
+                                 unsigned int planemask, int nBox, BoxPtr pBox,
+                                 int xorg, int yorg, PixmapPtr pPix);
+    void (*FillSolidSpans) (ScrnInfoPtr pScrn, int fg, int rop,
+                            unsigned int planemask, int n, DDXPointPtr points,
+                            int *widths, int fSorted);
+    void (*FillMono8x8PatternSpans) (ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                                     unsigned int planemask, int n,
+                                     DDXPointPtr points, int *widths,
+                                     int fSorted, int pat0, int pat1,
+                                     int xorg, int yorg);
+    void (*FillColor8x8PatternSpans) (ScrnInfoPtr pScrn, int rop,
+                                      unsigned int planemask, int n,
+                                      DDXPointPtr points, int *widths,
+                                      int fSorted, XAACacheInfoPtr pCache,
+                                      int xorg, int yorg);
+    void (*FillCacheBltSpans) (ScrnInfoPtr pScrn, int rop,
+                               unsigned int planemask, int n,
+                               DDXPointPtr points, int *widths, int fSorted,
+                               XAACacheInfoPtr pCache, int xorg, int yorg);
+    void (*FillColorExpandSpans) (ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                                  unsigned int planemask, int n,
+                                  DDXPointPtr points, int *widths, int fSorted,
+                                  int xorg, int yorg, PixmapPtr pPix);
+    void (*FillCacheExpandSpans) (ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                                  unsigned int planemask, int n,
+                                  DDXPointPtr ppt, int *pwidth, int fSorted,
+                                  int xorg, int yorg, PixmapPtr pPix);
+    void (*TEGlyphRenderer) (ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                             int skipleft, int startline, unsigned int **glyphs,
+                             int glyphWidth, int fg, int bg, int rop,
+                             unsigned planemask);
+    void (*NonTEGlyphRenderer) (ScrnInfoPtr pScrn, int x, int y, int n,
+                                NonTEGlyphPtr glyphs, BoxPtr pbox, int fg,
+                                int rop, unsigned int planemask);
+    void (*WritePixmap) (ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                         unsigned char *src, int srcwidth, int rop,
+                         unsigned int planemask, int transparency_color,
+                         int bpp, int depth);
+    void (*ReadPixmap) (ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                        unsigned char *dst, int dstwidth, int bpp, int depth);
+    RegionPtr (*CopyArea) (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+                           GC * pGC, int srcx, int srcy, int width, int height,
+                           int dstx, int dsty);
+    RegionPtr (*CopyPlane) (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+                            int srcx, int srcy, int width, int height, int dstx,
+                            int dsty, unsigned long bitPlane);
+    void (*PushPixelsSolid) (GCPtr pGC, PixmapPtr pBitMap,
+                             DrawablePtr pDrawable, int dx, int dy, int xOrg,
+                             int yOrg);
+    void (*PolyFillRectSolid) (DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+                               xRectangle *prectInit);
+    void (*PolyFillRectStippled) (DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+                                  xRectangle *prectInit);
+    void (*PolyFillRectOpaqueStippled) (DrawablePtr pDraw, GCPtr pGC,
+                                        int nrectFill, xRectangle *prectInit);
+    void (*PolyFillRectTiled) (DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+                               xRectangle *prectInit);
+    void (*FillSpansSolid) (DrawablePtr pDraw, GCPtr pGC, int nInit,
+                            DDXPointPtr ppt, int *pwidth, int fSorted);
+    void (*FillSpansStippled) (DrawablePtr pDraw, GCPtr pGC, int nInit,
+                               DDXPointPtr ppt, int *pwidth, int fSorted);
+    void (*FillSpansOpaqueStippled) (DrawablePtr pDraw, GCPtr pGC, int nInit,
+                                     DDXPointPtr ppt, int *pwidth, int fSorted);
+    void (*FillSpansTiled) (DrawablePtr pDraw, GCPtr pGC, int nInit,
+                            DDXPointPtr ppt, int *pwidth, int fSorted);
+    int (*PolyText8TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,
+                        char *chars);
+    int (*PolyText16TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,
+                         unsigned short *chars);
+    void (*ImageText8TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,
+                          char *chars);
+    void (*ImageText16TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                           int count, unsigned short *chars);
+    void (*ImageGlyphBltTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit,
+                             int yInit, unsigned int nglyph, CharInfoPtr * ppci,
+                             pointer pglyphBase);
+    void (*PolyGlyphBltTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit,
+                            int yInit, unsigned int nglyph, CharInfoPtr * ppci,
+                            pointer pglyphBase);
+    int (*PolyText8NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                           int count, char *chars);
+    int (*PolyText16NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                            int count, unsigned short *chars);
+    void (*ImageText8NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                             int count, char *chars);
+    void (*ImageText16NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                              int count, unsigned short *chars);
+    void (*ImageGlyphBltNonTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit,
+                                int yInit, unsigned int nglyph,
+                                CharInfoPtr * ppci, pointer pglyphBase);
+    void (*PolyGlyphBltNonTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit,
+                               int yInit, unsigned int nglyph,
+                               CharInfoPtr * ppci, pointer pglyphBase);
+    void (*PolyRectangleThinSolid) (DrawablePtr pDrawable, GCPtr pGC,
+                                    int nRectsInit, xRectangle *pRectsInit);
+    void (*PolylinesWideSolid) (DrawablePtr pDrawable, GCPtr pGC, int mode,
+                                int npt, DDXPointPtr pPts);
+    void (*PolylinesThinSolid) (DrawablePtr pDrawable, GCPtr pGC, int mode,
+                                int npt, DDXPointPtr pPts);
+    void (*PolySegmentThinSolid) (DrawablePtr pDrawable, GCPtr pGC, int nseg,
+                                  xSegment * pSeg);
+    void (*PolylinesThinDashed) (DrawablePtr pDrawable, GCPtr pGC, int mode,
+                                 int npt, DDXPointPtr pPts);
+    void (*PolySegmentThinDashed) (DrawablePtr pDrawable, GCPtr pGC, int nseg,
+                                   xSegment * pSeg);
+    void (*FillPolygonSolid) (DrawablePtr pDrawable, GCPtr pGC, int shape,
+                              int mode, int count, DDXPointPtr ptsIn);
+    void (*FillPolygonStippled) (DrawablePtr pDrawable, GCPtr pGC, int shape,
+                                 int mode, int count, DDXPointPtr ptsIn);
+    void (*FillPolygonOpaqueStippled) (DrawablePtr pDrawable, GCPtr pGC,
+                                       int shape, int mode, int count,
+                                       DDXPointPtr ptsIn);
+    void (*FillPolygonTiled) (DrawablePtr pDrawable, GCPtr pGC, int shape,
+                              int mode, int count, DDXPointPtr ptsIn);
+    void (*PolyFillArcSolid) (DrawablePtr pDraw, GCPtr pGC, int narcs,
+                              xArc * parcs);
+    void (*PutImage) (DrawablePtr pDraw, GCPtr pGC, int depth, int x, int y,
+                      int w, int h, int leftPad, int format, char *pImage);
+    ValidateGCProcPtr ValidateFillSpans;
+    ValidateGCProcPtr ValidateSetSpans;
+    ValidateGCProcPtr ValidatePutImage;
+    ValidateGCProcPtr ValidateCopyArea;
+    ValidateGCProcPtr ValidateCopyPlane;
+    ValidateGCProcPtr ValidatePolyPoint;
+    ValidateGCProcPtr ValidatePolylines;
+    ValidateGCProcPtr ValidatePolySegment;
+    ValidateGCProcPtr ValidatePolyRectangle;
+    ValidateGCProcPtr ValidatePolyArc;
+    ValidateGCProcPtr ValidateFillPolygon;
+    ValidateGCProcPtr ValidatePolyFillRect;
+    ValidateGCProcPtr ValidatePolyFillArc;
+    ValidateGCProcPtr ValidatePolyText8;
+    ValidateGCProcPtr ValidatePolyText16;
+    ValidateGCProcPtr ValidateImageText8;
+    ValidateGCProcPtr ValidateImageText16;
+    ValidateGCProcPtr ValidatePolyGlyphBlt;
+    ValidateGCProcPtr ValidateImageGlyphBlt;
+    ValidateGCProcPtr ValidatePushPixels;
+    void (*ComputeDash) (GCPtr pGC);
+    void (*InitPixmapCache) (ScreenPtr pScreen, RegionPtr areas, pointer data);
+    void (*ClosePixmapCache) (ScreenPtr pScreen);
+    int (*StippledFillChooser) (GCPtr pGC);
+    int (*OpaqueStippledFillChooser) (GCPtr pGC);
+    int (*TiledFillChooser) (GCPtr pGC);
+     XAACacheInfoPtr(*CacheTile) (ScrnInfoPtr Scrn, PixmapPtr pPix);
+     XAACacheInfoPtr(*CacheStipple) (ScrnInfoPtr Scrn, PixmapPtr pPix, int fg,
+                                     int bg);
+     XAACacheInfoPtr(*CacheMonoStipple) (ScrnInfoPtr Scrn, PixmapPtr pPix);
+     XAACacheInfoPtr(*CacheMono8x8Pattern) (ScrnInfoPtr Scrn, int pat0,
+                                            int pat1);
+     XAACacheInfoPtr(*CacheColor8x8Pattern) (ScrnInfoPtr Scrn, PixmapPtr pPix,
+                                             int fg, int bg);
+    void (*WriteBitmapToCache) (ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                                unsigned char *src, int srcwidth, int fg,
+                                int bg);
+    void (*WritePixmapToCache) (ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                                unsigned char *src, int srcwidth, int bpp,
+                                int depth);
+    void (*WriteMono8x8PatternToCache) (ScrnInfoPtr pScrn,
+                                        XAACacheInfoPtr pCache);
+    void (*WriteColor8x8PatternToCache) (ScrnInfoPtr pScrn, PixmapPtr pPix,
+                                         XAACacheInfoPtr pCache);
+    GetImageProcPtr GetImage;
+    GetSpansProcPtr GetSpans;
+    CopyWindowProcPtr CopyWindow;
+    Bool (*SetupForCPUToScreenAlphaTexture2) (ScrnInfoPtr pScrn, int op,
+                                              CARD16 red, CARD16 green,
+                                              CARD16 blue, CARD16 alpha,
+                                              CARD32 maskFormat,
+                                              CARD32 dstFormat, CARD8 *alphaPtr,
+                                              int alphaPitch, int width,
+                                              int height, int flags);
+    Bool (*SetupForCPUToScreenTexture2) (ScrnInfoPtr pScrn, int op,
+                                         CARD32 srcFormat, CARD32 dstFormat,
+                                         CARD8 *texPtr, int texPitch, int width,
+                                         int height, int flags);
+} XAAStateWrapRec, *XAAStateWrapPtr;
+
+static DevPrivateKeyRec XAAStateKeyRec;
+
+#define XAAStateKey (&XAAStateKeyRec)
+
+/* Wrap functions start here */
+#define GET_STATEPRIV_GC(pGC)   XAAStateWrapPtr pStatePriv =\
+(XAAStateWrapPtr)dixLookupPrivate(&(pGC)->pScreen->devPrivates, XAAStateKey)
+
+#define GET_STATEPRIV_SCREEN(pScreen)   XAAStateWrapPtr pStatePriv =\
+(XAAStateWrapPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAStateKey)
+
+#define GET_STATEPRIV_PSCRN(pScrn)   XAAStateWrapPtr pStatePriv =\
+(XAAStateWrapPtr)dixLookupPrivate(&(pScrn)->pScreen->devPrivates, XAAStateKey)
+
+#define STATE_CHECK_SP(pStatePriv) {\
+	ScrnInfoPtr pScrn = pStatePriv->pScrn;\
+	int i = 0;\
+	int need_change = 0;\
+	while(i < pScrn->numEntities) {\
+		if(xf86IsEntityShared(pScrn->entityList[i]) &&\
+		   xf86GetLastScrnFlag(pScrn->entityList[i]) != pScrn->scrnIndex) {\
+			need_change = 1;\
+			xf86SetLastScrnFlag(pScrn->entityList[i],\
+					    pScrn->scrnIndex);\
+		}\
+		i++;\
+	}\
+	if(need_change == 1) (*pStatePriv->RestoreAccelState)(pScrn);\
+}
+
+#define STATE_CHECK_PSCRN(pScrn) {\
+	int i = 0;\
+	int need_change = 0;\
+	while(i < pScrn->numEntities) {\
+		if(xf86IsEntityShared(pScrn->entityList[i]) &&\
+		   xf86GetLastScrnFlag(pScrn->entityList[i]) != pScrn->scrnIndex) {\
+			need_change = 1;\
+			xf86SetLastScrnFlag(pScrn->entityList[i],\
+					    pScrn->scrnIndex);\
+		}\
+		i++;\
+	}\
+	if(need_change == 1) (*pStatePriv->RestoreAccelState)(pScrn);\
+}
+
+static void
+XAAStateWrapSync(ScrnInfoPtr pScrn)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->Sync) (pScrn);
+}
+
+static void
+XAAStateWrapSetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, int ydir,
+                                       int rop, unsigned int planemask,
+                                       int trans_color)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForScreenToScreenCopy) (pScrn, xdir, ydir, rop,
+                                               planemask, trans_color);
+}
+
+static void
+XAAStateWrapSetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop,
+                              unsigned int planemask)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForSolidFill) (pScrn, color, rop, planemask);
+}
+
+static void
+XAAStateWrapSetupForSolidLine(ScrnInfoPtr pScrn, int color, int rop,
+                              unsigned int planemask)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForSolidLine) (pScrn, color, rop, planemask);
+}
+
+static void
+XAAStateWrapSetupForDashedLine(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                               unsigned int planemask, int length,
+                               unsigned char *pattern)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForDashedLine) (pScrn, fg, bg, rop, planemask, length,
+                                       pattern);
+}
+
+static void
+XAAStateWrapSetClippingRectangle(ScrnInfoPtr pScrn, int left, int top,
+                                 int right, int bottom)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetClippingRectangle) (pScrn, left, top, right, bottom);
+}
+
+static void
+XAAStateWrapDisableClipping(ScrnInfoPtr pScrn)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->DisableClipping) (pScrn);
+}
+
+static void
+XAAStateWrapSetupForMono8x8PatternFill(ScrnInfoPtr pScrn, int patx, int paty,
+                                       int fg, int bg, int rop,
+                                       unsigned int planemask)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForMono8x8PatternFill) (pScrn, patx, paty, fg, bg, rop,
+                                               planemask);
+}
+
+static void
+XAAStateWrapSetupForColor8x8PatternFill(ScrnInfoPtr pScrn, int patx, int paty,
+                                        int rop, unsigned int planemask,
+                                        int transparency_color)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForColor8x8PatternFill) (pScrn, patx, paty, rop,
+                                                planemask, transparency_color);
+}
+
+static void
+XAAStateWrapSetupForCPUToScreenColorExpandFill(ScrnInfoPtr pScrn, int fg,
+                                               int bg, int rop,
+                                               unsigned int planemask)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForCPUToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                       planemask);
+}
+
+static void
+XAAStateWrapSetupForScanlineCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
+                                                       int fg, int bg,
+                                                       int rop,
+                                                       unsigned int planemask)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForScanlineCPUToScreenColorExpandFill) (pScrn, fg, bg,
+                                                               rop, planemask);
+}
+
+static void
+XAAStateWrapSetupForScreenToScreenColorExpandFill(ScrnInfoPtr pScrn,
+                                                  int fg, int bg, int rop,
+                                                  unsigned int planemask)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForScreenToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                          planemask);
+}
+
+static void
+XAAStateWrapSetupForImageWrite(ScrnInfoPtr pScrn, int rop,
+                               unsigned int planemask, int transparency_color,
+                               int bpp, int depth)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForImageWrite) (pScrn, rop, planemask,
+                                       transparency_color, bpp, depth);
+}
+
+static void
+XAAStateWrapSetupForScanlineImageWrite(ScrnInfoPtr pScrn, int rop,
+                                       unsigned int planemask,
+                                       int transparency_color,
+                                       int bpp, int depth)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForScanlineImageWrite) (pScrn, rop, planemask,
+                                               transparency_color, bpp, depth);
+}
+
+static void
+XAAStateWrapSetupForImageRead(ScrnInfoPtr pScrn, int bpp, int depth)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->SetupForImageRead) (pScrn, bpp, depth);
+}
+
+static void
+XAAStateWrapScreenToScreenBitBlt(ScrnInfoPtr pScrn, int nbox,
+                                 DDXPointPtr pptSrc, BoxPtr pbox, int xdir,
+                                 int ydir, int alu, unsigned int planmask)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->ScreenToScreenBitBlt) (pScrn, nbox,
+                                         pptSrc, pbox, xdir,
+                                         ydir, alu, planmask);
+}
+
+static void
+XAAStateWrapWriteBitmap(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                        unsigned char *src, int srcwidth, int skipleft,
+                        int fg, int bg, int rop, unsigned int planemask)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->WriteBitmap) (pScrn, x, y, w, h,
+                                src, srcwidth, skipleft,
+                                fg, bg, rop, planemask);
+}
+
+static void
+XAAStateWrapFillSolidRects(ScrnInfoPtr pScrn, int fg, int rop,
+                           unsigned int planemask, int nBox, BoxPtr pBox)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillSolidRects) (pScrn, fg, rop, planemask, nBox, pBox);
+}
+
+static void
+XAAStateWrapFillMono8x8PatternRects(ScrnInfoPtr pScrn, int fg, int bg,
+                                    int rop, unsigned int planemask, int nBox,
+                                    BoxPtr pBox, int pat0, int pat1,
+                                    int xorg, int yorg)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillMono8x8PatternRects) (pScrn, fg, bg,
+                                            rop, planemask, nBox,
+                                            pBox, pat0, pat1, xorg, yorg);
+}
+
+static void
+XAAStateWrapFillColor8x8PatternRects(ScrnInfoPtr pScrn, int rop,
+                                     unsigned int planemask, int nBox,
+                                     BoxPtr pBox, int xorg, int yorg,
+                                     XAACacheInfoPtr pCache)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillColor8x8PatternRects) (pScrn, rop,
+                                             planemask, nBox,
+                                             pBox, xorg, yorg, pCache);
+}
+
+static void
+XAAStateWrapFillCacheBltRects(ScrnInfoPtr pScrn, int rop,
+                              unsigned int planemask, int nBox, BoxPtr pBox,
+                              int xorg, int yorg, XAACacheInfoPtr pCache)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillCacheBltRects) (pScrn, rop,
+                                      planemask, nBox, pBox,
+                                      xorg, yorg, pCache);
+}
+
+static void
+XAAStateWrapFillColorExpandRects(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                                 unsigned int planemask, int nBox,
+                                 BoxPtr pBox, int xorg, int yorg,
+                                 PixmapPtr pPix)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillColorExpandRects) (pScrn, fg, bg, rop,
+                                         planemask, nBox,
+                                         pBox, xorg, yorg, pPix);
+}
+
+static void
+XAAStateWrapFillCacheExpandRects(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                                 unsigned int planemask, int nBox,
+                                 BoxPtr pBox, int xorg, int yorg,
+                                 PixmapPtr pPix)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillCacheExpandRects) (pScrn, fg, bg, rop,
+                                         planemask, nBox,
+                                         pBox, xorg, yorg, pPix);
+}
+
+static void
+XAAStateWrapFillImageWriteRects(ScrnInfoPtr pScrn, int rop,
+                                unsigned int planemask, int nBox, BoxPtr pBox,
+                                int xorg, int yorg, PixmapPtr pPix)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillImageWriteRects) (pScrn, rop,
+                                        planemask, nBox, pBox,
+                                        xorg, yorg, pPix);
+}
+
+static void
+XAAStateWrapFillSolidSpans(ScrnInfoPtr pScrn, int fg, int rop,
+                           unsigned int planemask, int n, DDXPointPtr points,
+                           int *widths, int fSorted)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillSolidSpans) (pScrn, fg, rop,
+                                   planemask, n, points, widths, fSorted);
+}
+
+static void
+XAAStateWrapFillMono8x8PatternSpans(ScrnInfoPtr pScrn, int fg, int bg,
+                                    int rop, unsigned int planemask, int n,
+                                    DDXPointPtr points, int *widths,
+                                    int fSorted, int pat0, int pat1,
+                                    int xorg, int yorg)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillMono8x8PatternSpans) (pScrn, fg, bg,
+                                            rop, planemask, n,
+                                            points, widths,
+                                            fSorted, pat0, pat1, xorg, yorg);
+}
+
+static void
+XAAStateWrapFillColor8x8PatternSpans(ScrnInfoPtr pScrn, int rop,
+                                     unsigned int planemask, int n,
+                                     DDXPointPtr points, int *widths,
+                                     int fSorted, XAACacheInfoPtr pCache,
+                                     int xorg, int yorg)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillColor8x8PatternSpans) (pScrn, rop,
+                                             planemask, n,
+                                             points, widths,
+                                             fSorted, pCache, xorg, yorg);
+}
+
+static void
+XAAStateWrapFillCacheBltSpans(ScrnInfoPtr pScrn, int rop,
+                              unsigned int planemask, int n,
+                              DDXPointPtr points, int *widths,
+                              int fSorted, XAACacheInfoPtr pCache,
+                              int xorg, int yorg)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillCacheBltSpans) (pScrn, rop,
+                                      planemask, n,
+                                      points, widths,
+                                      fSorted, pCache, xorg, yorg);
+}
+
+static void
+XAAStateWrapFillColorExpandSpans(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                                 unsigned int planemask, int n,
+                                 DDXPointPtr points, int *widths, int fSorted,
+                                 int xorg, int yorg, PixmapPtr pPix)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillColorExpandSpans) (pScrn, fg, bg, rop,
+                                         planemask, n,
+                                         points, widths, fSorted,
+                                         xorg, yorg, pPix);
+}
+
+static void
+XAAStateWrapFillCacheExpandSpans(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+                                 unsigned int planemask, int n,
+                                 DDXPointPtr ppt, int *pwidth, int fSorted,
+                                 int xorg, int yorg, PixmapPtr pPix)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->FillCacheExpandSpans) (pScrn, fg, bg, rop,
+                                         planemask, n,
+                                         ppt, pwidth, fSorted,
+                                         xorg, yorg, pPix);
+}
+
+static void
+XAAStateWrapTEGlyphRenderer(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                            int skipleft, int startline,
+                            unsigned int **glyphs,
+                            int glyphWidth, int fg, int bg, int rop,
+                            unsigned planemask)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->TEGlyphRenderer) (pScrn, x, y, w, h,
+                                    skipleft, startline,
+                                    glyphs, glyphWidth, fg, bg, rop, planemask);
+}
+
+static void
+XAAStateWrapNonTEGlyphRenderer(ScrnInfoPtr pScrn, int x, int y, int n,
+                               NonTEGlyphPtr glyphs, BoxPtr pbox,
+                               int fg, int rop, unsigned int planemask)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->NonTEGlyphRenderer) (pScrn, x, y, n,
+                                       glyphs, pbox, fg, rop, planemask);
+}
+
+static void
+XAAStateWrapWritePixmap(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                        unsigned char *src, int srcwidth, int rop,
+                        unsigned int planemask, int transparency_color,
+                        int bpp, int depth)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->WritePixmap) (pScrn, x, y, w, h,
+                                src, srcwidth, rop,
+                                planemask, transparency_color, bpp, depth);
+}
+
+static void
+XAAStateWrapReadPixmap(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                       unsigned char *dst, int dstwidth, int bpp, int depth)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->ReadPixmap) (pScrn, x, y, w, h, dst, dstwidth, bpp, depth);
+}
+
+static RegionPtr
+XAAStateWrapCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+                     GC * pGC, int srcx, int srcy, int width, int height,
+                     int dstx, int dsty)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    return (*pStatePriv->CopyArea) (pSrcDrawable, pDstDrawable,
+                                    pGC, srcx, srcy, width, height, dstx, dsty);
+}
+
+static RegionPtr
+XAAStateWrapCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+                      int srcx, int srcy, int width, int height,
+                      int dstx, int dsty, unsigned long bitPlane)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    return (*pStatePriv->CopyPlane) (pSrc, pDst, pGC,
+                                     srcx, srcy, width, height,
+                                     dstx, dsty, bitPlane);
+}
+
+static void
+XAAStateWrapPushPixelsSolid(GCPtr pGC, PixmapPtr pBitMap,
+                            DrawablePtr pDrawable, int dx, int dy, int xOrg,
+                            int yOrg)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PushPixelsSolid) (pGC, pBitMap,
+                                    pDrawable, dx, dy, xOrg, yOrg);
+}
+
+static void
+XAAStateWrapPolyFillRectSolid(DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+                              xRectangle *prectInit)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolyFillRectSolid) (pDraw, pGC, nrectFill, prectInit);
+}
+
+static void
+XAAStateWrapPolyFillRectStippled(DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+                                 xRectangle *prectInit)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolyFillRectStippled) (pDraw, pGC, nrectFill, prectInit);
+}
+
+static void
+XAAStateWrapPolyFillRectOpaqueStippled(DrawablePtr pDraw, GCPtr pGC,
+                                       int nrectFill, xRectangle *prectInit)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolyFillRectOpaqueStippled) (pDraw, pGC,
+                                               nrectFill, prectInit);
+}
+
+static void
+XAAStateWrapPolyFillRectTiled(DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+                              xRectangle *prectInit)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolyFillRectTiled) (pDraw, pGC, nrectFill, prectInit);
+}
+
+static void
+XAAStateWrapFillSpansSolid(DrawablePtr pDraw, GCPtr pGC, int nInit,
+                           DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->FillSpansSolid) (pDraw, pGC, nInit, ppt, pwidth, fSorted);
+}
+
+static void
+XAAStateWrapFillSpansStippled(DrawablePtr pDraw, GCPtr pGC, int nInit,
+                              DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->FillSpansStippled) (pDraw, pGC, nInit, ppt, pwidth, fSorted);
+}
+
+static void
+XAAStateWrapFillSpansOpaqueStippled(DrawablePtr pDraw, GCPtr pGC, int nInit,
+                                    DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->FillSpansOpaqueStippled) (pDraw, pGC, nInit,
+                                            ppt, pwidth, fSorted);
+}
+
+static void
+XAAStateWrapFillSpansTiled(DrawablePtr pDraw, GCPtr pGC, int nInit,
+                           DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->FillSpansTiled) (pDraw, pGC, nInit, ppt, pwidth, fSorted);
+}
+
+static int
+XAAStateWrapPolyText8TE(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,
+                        char *chars)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    return (*pStatePriv->PolyText8TE) (pDraw, pGC, x, y, count, chars);
+}
+
+static int
+XAAStateWrapPolyText16TE(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,
+                         unsigned short *chars)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    return (*pStatePriv->PolyText16TE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAStateWrapImageText8TE(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                         int count, char *chars)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ImageText8TE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAStateWrapImageText16TE(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                          int count, unsigned short *chars)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ImageText16TE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAStateWrapImageGlyphBltTE(DrawablePtr pDrawable, GCPtr pGC, int xInit,
+                            int yInit, unsigned int nglyph, CharInfoPtr * ppci,
+                            pointer pglyphBase)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ImageGlyphBltTE) (pDrawable, pGC, xInit,
+                                    yInit, nglyph, ppci, pglyphBase);
+}
+
+static void
+XAAStateWrapPolyGlyphBltTE(DrawablePtr pDrawable, GCPtr pGC, int xInit,
+                           int yInit, unsigned int nglyph, CharInfoPtr * ppci,
+                           pointer pglyphBase)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolyGlyphBltTE) (pDrawable, pGC, xInit,
+                                   yInit, nglyph, ppci, pglyphBase);
+}
+
+static int
+XAAStateWrapPolyText8NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                           int count, char *chars)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    return (*pStatePriv->PolyText8NonTE) (pDraw, pGC, x, y, count, chars);
+}
+
+static int
+XAAStateWrapPolyText16NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                            int count, unsigned short *chars)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    return (*pStatePriv->PolyText16NonTE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAStateWrapImageText8NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                            int count, char *chars)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ImageText8NonTE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAStateWrapImageText16NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+                             int count, unsigned short *chars)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ImageText16NonTE) (pDraw, pGC, x, y, count, chars);
+}
+
+static void
+XAAStateWrapImageGlyphBltNonTE(DrawablePtr pDrawable, GCPtr pGC, int xInit,
+                               int yInit, unsigned int nglyph,
+                               CharInfoPtr * ppci, pointer pglyphBase)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ImageGlyphBltNonTE) (pDrawable, pGC, xInit,
+                                       yInit, nglyph, ppci, pglyphBase);
+}
+
+static void
+XAAStateWrapPolyGlyphBltNonTE(DrawablePtr pDrawable, GCPtr pGC, int xInit,
+                              int yInit, unsigned int nglyph,
+                              CharInfoPtr * ppci, pointer pglyphBase)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolyGlyphBltNonTE) (pDrawable, pGC, xInit,
+                                      yInit, nglyph, ppci, pglyphBase);
+}
+
+static void
+XAAStateWrapPolyRectangleThinSolid(DrawablePtr pDrawable, GCPtr pGC,
+                                   int nRectsInit, xRectangle *pRectsInit)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolyRectangleThinSolid) (pDrawable, pGC,
+                                           nRectsInit, pRectsInit);
+}
+
+static void
+XAAStateWrapPolylinesWideSolid(DrawablePtr pDrawable, GCPtr pGC, int mode,
+                               int npt, DDXPointPtr pPts)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolylinesWideSolid) (pDrawable, pGC, mode, npt, pPts);
+}
+
+static void
+XAAStateWrapPolylinesThinSolid(DrawablePtr pDrawable, GCPtr pGC, int mode,
+                               int npt, DDXPointPtr pPts)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolylinesThinSolid) (pDrawable, pGC, mode, npt, pPts);
+}
+
+static void
+XAAStateWrapPolySegmentThinSolid(DrawablePtr pDrawable, GCPtr pGC, int nseg,
+                                 xSegment * pSeg)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolySegmentThinSolid) (pDrawable, pGC, nseg, pSeg);
+}
+
+static void
+XAAStateWrapPolylinesThinDashed(DrawablePtr pDrawable, GCPtr pGC, int mode,
+                                int npt, DDXPointPtr pPts)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolylinesThinDashed) (pDrawable, pGC, mode, npt, pPts);
+}
+
+static void
+XAAStateWrapPolySegmentThinDashed(DrawablePtr pDrawable, GCPtr pGC, int nseg,
+                                  xSegment * pSeg)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolySegmentThinDashed) (pDrawable, pGC, nseg, pSeg);
+}
+
+static void
+XAAStateWrapFillPolygonSolid(DrawablePtr pDrawable, GCPtr pGC, int shape,
+                             int mode, int count, DDXPointPtr ptsIn)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->FillPolygonSolid) (pDrawable, pGC, shape, mode, count, ptsIn);
+}
+
+static void
+XAAStateWrapFillPolygonStippled(DrawablePtr pDrawable, GCPtr pGC, int shape,
+                                int mode, int count, DDXPointPtr ptsIn)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->FillPolygonStippled) (pDrawable, pGC, shape,
+                                        mode, count, ptsIn);
+}
+
+static void
+XAAStateWrapFillPolygonOpaqueStippled(DrawablePtr pDrawable, GCPtr pGC,
+                                      int shape, int mode, int count,
+                                      DDXPointPtr ptsIn)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->FillPolygonOpaqueStippled) (pDrawable, pGC,
+                                              shape, mode, count, ptsIn);
+}
+
+static void
+XAAStateWrapFillPolygonTiled(DrawablePtr pDrawable, GCPtr pGC, int shape,
+                             int mode, int count, DDXPointPtr ptsIn)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->FillPolygonTiled) (pDrawable, pGC, shape, mode, count, ptsIn);
+}
+
+static void
+XAAStateWrapPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs,
+                             xArc * parcs)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PolyFillArcSolid) (pDraw, pGC, narcs, parcs);
+}
+
+static void
+XAAStateWrapPutImage(DrawablePtr pDraw, GCPtr pGC, int depth, int x, int y,
+                     int w, int h, int leftPad, int format, char *pImage)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->PutImage) (pDraw, pGC, depth, x, y,
+                             w, h, leftPad, format, pImage);
+}
+
+static void
+XAAStateWrapValidateFillSpans(GCPtr pGC, unsigned long changes,
+                              DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidateFillSpans) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidateSetSpans(GCPtr pGC, unsigned long changes,
+                             DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidateSetSpans) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePutImage(GCPtr pGC, unsigned long changes,
+                             DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePutImage) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidateCopyArea(GCPtr pGC, unsigned long changes,
+                             DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidateCopyArea) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidateCopyPlane(GCPtr pGC, unsigned long changes,
+                              DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidateCopyPlane) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePolyPoint(GCPtr pGC, unsigned long changes,
+                              DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePolyPoint) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePolylines(GCPtr pGC, unsigned long changes,
+                              DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePolylines) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePolySegment(GCPtr pGC, unsigned long changes,
+                                DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePolySegment) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePolyRectangle(GCPtr pGC, unsigned long changes,
+                                  DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePolyRectangle) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePolyArc(GCPtr pGC, unsigned long changes, DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePolyArc) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidateFillPolygon(GCPtr pGC, unsigned long changes,
+                                DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidateFillPolygon) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePolyFillRect(GCPtr pGC, unsigned long changes,
+                                 DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePolyFillRect) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePolyFillArc(GCPtr pGC, unsigned long changes,
+                                DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePolyFillArc) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePolyText8(GCPtr pGC, unsigned long changes,
+                              DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePolyText8) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePolyText16(GCPtr pGC, unsigned long changes,
+                               DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePolyText16) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidateImageText8(GCPtr pGC, unsigned long changes,
+                               DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidateImageText8) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidateImageText16(GCPtr pGC, unsigned long changes,
+                                DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidateImageText16) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePolyGlyphBlt(GCPtr pGC, unsigned long changes,
+                                 DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePolyGlyphBlt) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidateImageGlyphBlt(GCPtr pGC, unsigned long changes,
+                                  DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+    (*pStatePriv->ValidateImageGlyphBlt) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapValidatePushPixels(GCPtr pGC, unsigned long changes,
+                               DrawablePtr pDraw)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ValidatePushPixels) (pGC, changes, pDraw);
+}
+
+static void
+XAAStateWrapComputeDash(GCPtr pGC)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ComputeDash) (pGC);
+}
+
+static void
+XAAStateWrapInitPixmapCache(ScreenPtr pScreen, RegionPtr areas, pointer data)
+{
+    GET_STATEPRIV_SCREEN(pScreen);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->InitPixmapCache) (pScreen, areas, data);
+}
+
+static void
+XAAStateWrapClosePixmapCache(ScreenPtr pScreen)
+{
+    GET_STATEPRIV_SCREEN(pScreen);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->ClosePixmapCache) (pScreen);
+}
+
+static int
+XAAStateWrapStippledFillChooser(GCPtr pGC)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    return (*pStatePriv->StippledFillChooser) (pGC);
+}
+
+static int
+XAAStateWrapOpaqueStippledFillChooser(GCPtr pGC)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    return (*pStatePriv->OpaqueStippledFillChooser) (pGC);
+}
+
+static int
+XAAStateWrapTiledFillChooser(GCPtr pGC)
+{
+    GET_STATEPRIV_GC(pGC);
+    STATE_CHECK_SP(pStatePriv);
+
+    return (*pStatePriv->TiledFillChooser) (pGC);
+}
+
+static XAACacheInfoPtr
+XAAStateWrapCacheTile(ScrnInfoPtr pScrn, PixmapPtr pPix)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    return (*pStatePriv->CacheTile) (pScrn, pPix);
+}
+
+static XAACacheInfoPtr
+XAAStateWrapCacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    return (*pStatePriv->CacheStipple) (pScrn, pPix, fg, bg);
+}
+
+static XAACacheInfoPtr
+XAAStateWrapCacheMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    return (*pStatePriv->CacheMonoStipple) (pScrn, pPix);
+}
+
+static XAACacheInfoPtr
+XAAStateWrapCacheMono8x8Pattern(ScrnInfoPtr pScrn, int pat0, int pat1)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    return (*pStatePriv->CacheMono8x8Pattern) (pScrn, pat0, pat1);
+}
+
+static XAACacheInfoPtr
+XAAStateWrapCacheColor8x8Pattern(ScrnInfoPtr pScrn, PixmapPtr pPix,
+                                 int fg, int bg)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    return (*pStatePriv->CacheColor8x8Pattern) (pScrn, pPix, fg, bg);
+}
+
+static void
+XAAStateWrapWriteBitmapToCache(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                               unsigned char *src, int srcwidth, int fg, int bg)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->WriteBitmapToCache) (pScrn, x, y, w, h,
+                                       src, srcwidth, fg, bg);
+}
+
+static void
+XAAStateWrapWritePixmapToCache(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+                               unsigned char *src, int srcwidth, int bpp,
+                               int depth)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->WritePixmapToCache) (pScrn, x, y, w, h,
+                                       src, srcwidth, bpp, depth);
+}
+
+static void
+XAAStateWrapWriteMono8x8PatternToCache(ScrnInfoPtr pScrn,
+                                       XAACacheInfoPtr pCache)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->WriteMono8x8PatternToCache) (pScrn, pCache);
+}
+
+static void
+XAAStateWrapWriteColor8x8PatternToCache(ScrnInfoPtr pScrn, PixmapPtr pPix,
+                                        XAACacheInfoPtr pCache)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    (*pStatePriv->WriteColor8x8PatternToCache) (pScrn, pPix, pCache);
+}
+
+static void
+XAAStateWrapGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
+                     unsigned int format, unsigned long planeMask,
+                     char *pdstLine)
+{
+    GET_STATEPRIV_SCREEN(pDrawable->pScreen);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->GetImage) (pDrawable, sx, sy, w, h,
+                             format, planeMask, pdstLine);
+}
+
+static void
+XAAStateWrapGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
+                     int *pwidth, int nspans, char *pdstStart)
+{
+    GET_STATEPRIV_SCREEN(pDrawable->pScreen);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
+}
+
+static void
+XAAStateWrapCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,
+                       RegionPtr prgnSrc)
+{
+    GET_STATEPRIV_SCREEN(pWindow->drawable.pScreen);
+    STATE_CHECK_SP(pStatePriv);
+
+    (*pStatePriv->CopyWindow) (pWindow, ptOldOrg, prgnSrc);
+}
+
+static Bool
+XAAStateWrapSetupForCPUToScreenAlphaTexture2(ScrnInfoPtr pScrn,
+                                             int op, CARD16 red,
+                                             CARD16 green,
+                                             CARD16 blue,
+                                             CARD16 alpha,
+                                             CARD32 srcFormat,
+                                             CARD32 dstFormat,
+                                             CARD8 *alphaPtr,
+                                             int alphaPitch,
+                                             int width, int height, int flags)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    return (*pStatePriv->SetupForCPUToScreenAlphaTexture2) (pScrn, op, red,
+                                                            green, blue, alpha,
+                                                            srcFormat,
+                                                            dstFormat, alphaPtr,
+                                                            alphaPitch, width,
+                                                            height, flags);
+}
+
+static Bool
+XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op,
+                                        CARD32 srcFormat,
+                                        CARD32 dstFormat,
+                                        CARD8 *texPtr, int texPitch,
+                                        int width, int height, int flags)
+{
+    GET_STATEPRIV_PSCRN(pScrn);
+    STATE_CHECK_PSCRN(pScrn);
+
+    return (*pStatePriv->SetupForCPUToScreenTexture2) (pScrn, op, srcFormat,
+                                                       dstFormat, texPtr,
+                                                       texPitch, width, height,
+                                                       flags);
+}
+
+/* Setup Function */
+Bool
+XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    XAAStateWrapPtr pStatePriv;
+    int i = 0;
+
+    if (!dixRegisterPrivateKey(&XAAStateKeyRec, PRIVATE_SCREEN, 0))
+        return FALSE;
+    if (!(pStatePriv = malloc(sizeof(XAAStateWrapRec))))
+        return FALSE;
+    dixSetPrivate(&pScreen->devPrivates, XAAStateKey, pStatePriv);
+    pStatePriv->RestoreAccelState = infoRec->RestoreAccelState;
+    pStatePriv->pScrn = pScrn;
+
+    /* Initialize the last screen to -1 so whenever an accel function
+     * is called the proper state is setup
+     */
+    while (i < pScrn->numEntities) {
+        xf86SetLastScrnFlag(pScrn->entityList[i], -1);
+        i++;
+    }
+/* Do the wrapping */
+    XAA_STATE_WRAP(Sync);
+    XAA_STATE_WRAP(SetupForScreenToScreenCopy);
+    XAA_STATE_WRAP(SetupForSolidFill);
+    XAA_STATE_WRAP(SetupForSolidLine);
+    XAA_STATE_WRAP(SetupForDashedLine);
+    XAA_STATE_WRAP(SetClippingRectangle);
+    XAA_STATE_WRAP(DisableClipping);
+    XAA_STATE_WRAP(SetupForMono8x8PatternFill);
+    XAA_STATE_WRAP(SetupForColor8x8PatternFill);
+    XAA_STATE_WRAP(SetupForCPUToScreenColorExpandFill);
+    XAA_STATE_WRAP(SetupForScanlineCPUToScreenColorExpandFill);
+    XAA_STATE_WRAP(SetupForScreenToScreenColorExpandFill);
+    XAA_STATE_WRAP(SetupForImageWrite);
+    XAA_STATE_WRAP(SetupForScanlineImageWrite);
+    XAA_STATE_WRAP(SetupForImageRead);
+    XAA_STATE_WRAP(ScreenToScreenBitBlt);
+    XAA_STATE_WRAP(WriteBitmap);
+    XAA_STATE_WRAP(FillSolidRects);
+    XAA_STATE_WRAP(FillMono8x8PatternRects);
+    XAA_STATE_WRAP(FillColor8x8PatternRects);
+    XAA_STATE_WRAP(FillCacheBltRects);
+    XAA_STATE_WRAP(FillColorExpandRects);
+    XAA_STATE_WRAP(FillCacheExpandRects);
+    XAA_STATE_WRAP(FillImageWriteRects);
+    XAA_STATE_WRAP(FillSolidSpans);
+    XAA_STATE_WRAP(FillMono8x8PatternSpans);
+    XAA_STATE_WRAP(FillColor8x8PatternSpans);
+    XAA_STATE_WRAP(FillCacheBltSpans);
+    XAA_STATE_WRAP(FillColorExpandSpans);
+    XAA_STATE_WRAP(FillCacheExpandSpans);
+    XAA_STATE_WRAP(TEGlyphRenderer);
+    XAA_STATE_WRAP(NonTEGlyphRenderer);
+    XAA_STATE_WRAP(WritePixmap);
+    XAA_STATE_WRAP(ReadPixmap);
+    XAA_STATE_WRAP(CopyArea);
+    XAA_STATE_WRAP(CopyPlane);
+    XAA_STATE_WRAP(PushPixelsSolid);
+    XAA_STATE_WRAP(PolyFillRectSolid);
+    XAA_STATE_WRAP(PolyFillRectStippled);
+    XAA_STATE_WRAP(PolyFillRectOpaqueStippled);
+    XAA_STATE_WRAP(PolyFillRectTiled);
+    XAA_STATE_WRAP(FillSpansSolid);
+    XAA_STATE_WRAP(FillSpansStippled);
+    XAA_STATE_WRAP(FillSpansOpaqueStippled);
+    XAA_STATE_WRAP(FillSpansTiled);
+    XAA_STATE_WRAP(PolyText8TE);
+    XAA_STATE_WRAP(PolyText16TE);
+    XAA_STATE_WRAP(ImageText8TE);
+    XAA_STATE_WRAP(ImageText16TE);
+    XAA_STATE_WRAP(ImageGlyphBltTE);
+    XAA_STATE_WRAP(PolyGlyphBltTE);
+    XAA_STATE_WRAP(PolyText8NonTE);
+    XAA_STATE_WRAP(PolyText16NonTE);
+    XAA_STATE_WRAP(ImageText8NonTE);
+    XAA_STATE_WRAP(ImageText16NonTE);
+    XAA_STATE_WRAP(ImageGlyphBltNonTE);
+    XAA_STATE_WRAP(PolyGlyphBltNonTE);
+    XAA_STATE_WRAP(PolyRectangleThinSolid);
+    XAA_STATE_WRAP(PolylinesWideSolid);
+    XAA_STATE_WRAP(PolylinesThinSolid);
+    XAA_STATE_WRAP(PolySegmentThinSolid);
+    XAA_STATE_WRAP(PolylinesThinDashed);
+    XAA_STATE_WRAP(PolySegmentThinDashed);
+    XAA_STATE_WRAP(FillPolygonSolid);
+    XAA_STATE_WRAP(FillPolygonStippled);
+    XAA_STATE_WRAP(FillPolygonOpaqueStippled);
+    XAA_STATE_WRAP(FillPolygonTiled);
+    XAA_STATE_WRAP(PolyFillArcSolid);
+    XAA_STATE_WRAP(PutImage);
+    XAA_STATE_WRAP(ValidateFillSpans);
+    XAA_STATE_WRAP(ValidateSetSpans);
+    XAA_STATE_WRAP(ValidatePutImage);
+    XAA_STATE_WRAP(ValidateCopyArea);
+    XAA_STATE_WRAP(ValidateCopyPlane);
+    XAA_STATE_WRAP(ValidatePolyPoint);
+    XAA_STATE_WRAP(ValidatePolylines);
+    XAA_STATE_WRAP(ValidatePolySegment);
+    XAA_STATE_WRAP(ValidatePolyRectangle);
+    XAA_STATE_WRAP(ValidatePolyArc);
+    XAA_STATE_WRAP(ValidateFillPolygon);
+    XAA_STATE_WRAP(ValidatePolyFillRect);
+    XAA_STATE_WRAP(ValidatePolyFillArc);
+    XAA_STATE_WRAP(ValidatePolyText8);
+    XAA_STATE_WRAP(ValidatePolyText16);
+    XAA_STATE_WRAP(ValidateImageText8);
+    XAA_STATE_WRAP(ValidateImageText16);
+    XAA_STATE_WRAP(ValidatePolyGlyphBlt);
+    XAA_STATE_WRAP(ValidateImageGlyphBlt);
+    XAA_STATE_WRAP(ValidatePushPixels);
+    XAA_STATE_WRAP(ComputeDash);
+    XAA_STATE_WRAP(InitPixmapCache);
+    XAA_STATE_WRAP(ClosePixmapCache);
+    XAA_STATE_WRAP(StippledFillChooser);
+    XAA_STATE_WRAP(OpaqueStippledFillChooser);
+    XAA_STATE_WRAP(TiledFillChooser);
+    XAA_STATE_WRAP(CacheTile);
+    XAA_STATE_WRAP(CacheStipple);
+    XAA_STATE_WRAP(CacheMonoStipple);
+    XAA_STATE_WRAP(CacheMono8x8Pattern);
+    XAA_STATE_WRAP(CacheColor8x8Pattern);
+    XAA_STATE_WRAP(WriteBitmapToCache);
+    XAA_STATE_WRAP(WritePixmapToCache);
+    XAA_STATE_WRAP(WriteMono8x8PatternToCache);
+    XAA_STATE_WRAP(WriteColor8x8PatternToCache);
+    XAA_STATE_WRAP(GetImage);
+    XAA_STATE_WRAP(GetSpans);
+    XAA_STATE_WRAP(CopyWindow);
+    XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture2);
+    XAA_STATE_WRAP(SetupForCPUToScreenTexture2);
+    return TRUE;
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaStipple.c b/xorg-server/hw/xfree86/xaa/xaaStipple.c
index c1d6f8ab4..fc74e3988 100644
--- a/xorg-server/hw/xfree86/xaa/xaaStipple.c
+++ b/xorg-server/hw/xfree86/xaa/xaaStipple.c
@@ -8,12 +8,12 @@
 #include "xaacexp.h"
 #include "xf86.h"
 
-static CARD32* StipplePowerOfTwo(CARD32*, CARD32*, int, int, int);
-static CARD32* StipplePowerOfTwo_Inverted(CARD32*, CARD32*, int, int, int);
-static CARD32* StippleUpTo32(CARD32*, CARD32*, int, int, int);
-static CARD32* StippleUpTo32_Inverted(CARD32*, CARD32*, int, int, int);
-static CARD32* StippleOver32(CARD32*, CARD32*, int, int, int);
-static CARD32* StippleOver32_Inverted(CARD32*, CARD32*, int, int, int);
+static CARD32 *StipplePowerOfTwo(CARD32 *, CARD32 *, int, int, int);
+static CARD32 *StipplePowerOfTwo_Inverted(CARD32 *, CARD32 *, int, int, int);
+static CARD32 *StippleUpTo32(CARD32 *, CARD32 *, int, int, int);
+static CARD32 *StippleUpTo32_Inverted(CARD32 *, CARD32 *, int, int, int);
+static CARD32 *StippleOver32(CARD32 *, CARD32 *, int, int, int);
+static CARD32 *StippleOver32_Inverted(CARD32 *, CARD32 *, int, int, int);
 
 #ifdef TRIPLE_BITS
 #define stipple_scanline_func EXPNAME(XAAStippleScanlineFunc3)
@@ -24,27 +24,28 @@ static CARD32* StippleOver32_Inverted(CARD32*, CARD32*, int, int, int);
 #endif
 
 StippleScanlineProcPtr stipple_scanline_func[6] = {
-   StipplePowerOfTwo,
-   StippleUpTo32,
-   StippleOver32,
-   StipplePowerOfTwo_Inverted,
-   StippleUpTo32_Inverted,
-   StippleOver32_Inverted
+    StipplePowerOfTwo,
+    StippleUpTo32,
+    StippleOver32,
+    StipplePowerOfTwo_Inverted,
+    StippleUpTo32_Inverted,
+    StippleOver32_Inverted
 };
 
-StippleScanlineProcPtr *stipple_get_scanline_func(void) {
-   return stipple_scanline_func;
+StippleScanlineProcPtr *
+stipple_get_scanline_func(void)
+{
+    return stipple_scanline_func;
 }
 
 #ifdef FIXEDBASE
-# define DEST(i)	*dest
-# define RETURN(i)	return(dest)
+#define DEST(i)	*dest
+#define RETURN(i)	return(dest)
 #else
-# define DEST(i)	dest[i]
-# define RETURN(i)	return(dest + i)
+#define DEST(i)	dest[i]
+#define RETURN(i)	return(dest + i)
 #endif
 
-
 /* TRIPLE_BITS pattern expansion */
 #ifdef TRIPLE_BITS
 #define EXPAND_PAT \
@@ -80,45 +81,42 @@ StippleScanlineProcPtr *stipple_get_scanline_func(void) {
 #endif
 #endif
 
-
 #if !defined(FIXEDBASE) && !defined(MSBFIRST) && !defined(TRIPLE_BITS)
 
 unsigned int XAAShiftMasks[32] = {
-  /* gcc is rather pedantic about SHIFT_R(0xFFFFFFFF,32) */
-          0x00000000    , SHIFT_R(0xFFFFFFFF,31),
-  SHIFT_R(0xFFFFFFFF,30), SHIFT_R(0xFFFFFFFF,29),
-  SHIFT_R(0xFFFFFFFF,28), SHIFT_R(0xFFFFFFFF,27),
-  SHIFT_R(0xFFFFFFFF,26), SHIFT_R(0xFFFFFFFF,25),
-  SHIFT_R(0xFFFFFFFF,24), SHIFT_R(0xFFFFFFFF,23),
-  SHIFT_R(0xFFFFFFFF,22), SHIFT_R(0xFFFFFFFF,21),
-  SHIFT_R(0xFFFFFFFF,20), SHIFT_R(0xFFFFFFFF,19),
-  SHIFT_R(0xFFFFFFFF,18), SHIFT_R(0xFFFFFFFF,17),
-  SHIFT_R(0xFFFFFFFF,16), SHIFT_R(0xFFFFFFFF,15),
-  SHIFT_R(0xFFFFFFFF,14), SHIFT_R(0xFFFFFFFF,13),
-  SHIFT_R(0xFFFFFFFF,12), SHIFT_R(0xFFFFFFFF,11),
-  SHIFT_R(0xFFFFFFFF,10), SHIFT_R(0xFFFFFFFF,9),
-  SHIFT_R(0xFFFFFFFF,8),  SHIFT_R(0xFFFFFFFF,7),
-  SHIFT_R(0xFFFFFFFF,6),  SHIFT_R(0xFFFFFFFF,5),
-  SHIFT_R(0xFFFFFFFF,4),  SHIFT_R(0xFFFFFFFF,3),
-  SHIFT_R(0xFFFFFFFF,2),  SHIFT_R(0xFFFFFFFF,1)
+    /* gcc is rather pedantic about SHIFT_R(0xFFFFFFFF,32) */
+    0x00000000, SHIFT_R(0xFFFFFFFF, 31),
+    SHIFT_R(0xFFFFFFFF, 30), SHIFT_R(0xFFFFFFFF, 29),
+    SHIFT_R(0xFFFFFFFF, 28), SHIFT_R(0xFFFFFFFF, 27),
+    SHIFT_R(0xFFFFFFFF, 26), SHIFT_R(0xFFFFFFFF, 25),
+    SHIFT_R(0xFFFFFFFF, 24), SHIFT_R(0xFFFFFFFF, 23),
+    SHIFT_R(0xFFFFFFFF, 22), SHIFT_R(0xFFFFFFFF, 21),
+    SHIFT_R(0xFFFFFFFF, 20), SHIFT_R(0xFFFFFFFF, 19),
+    SHIFT_R(0xFFFFFFFF, 18), SHIFT_R(0xFFFFFFFF, 17),
+    SHIFT_R(0xFFFFFFFF, 16), SHIFT_R(0xFFFFFFFF, 15),
+    SHIFT_R(0xFFFFFFFF, 14), SHIFT_R(0xFFFFFFFF, 13),
+    SHIFT_R(0xFFFFFFFF, 12), SHIFT_R(0xFFFFFFFF, 11),
+    SHIFT_R(0xFFFFFFFF, 10), SHIFT_R(0xFFFFFFFF, 9),
+    SHIFT_R(0xFFFFFFFF, 8), SHIFT_R(0xFFFFFFFF, 7),
+    SHIFT_R(0xFFFFFFFF, 6), SHIFT_R(0xFFFFFFFF, 5),
+    SHIFT_R(0xFFFFFFFF, 4), SHIFT_R(0xFFFFFFFF, 3),
+    SHIFT_R(0xFFFFFFFF, 2), SHIFT_R(0xFFFFFFFF, 1)
 };
 
 #endif
 
 void
 #ifdef TRIPLE_BITS
-EXPNAME(XAAFillColorExpandRects3)(
+ EXPNAME(XAAFillColorExpandRects3) (
 #else
-EXPNAME(XAAFillColorExpandRects)(
+ EXPNAME(XAAFillColorExpandRects) (
 #endif
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-){
+                                      ScrnInfoPtr pScrn,
+                                      int fg, int bg, int rop,
+                                      unsigned int planemask,
+                                      int nBox,
+                                      BoxPtr pBox,
+                                      int xorg, int yorg, PixmapPtr pPix) {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     CARD32 *base;
     Bool TwoPass = FALSE, FirstPass = TRUE;
@@ -127,136 +125,145 @@ EXPNAME(XAAFillColorExpandRects)(
     int stippleheight = pPix->drawable.height;
     int srcwidth = pPix->devKind;
     int dwords, srcy, srcx, funcNo = 2, h;
-    unsigned char *src = (unsigned char*)pPix->devPrivate.ptr;
+    unsigned char *src = (unsigned char *) pPix->devPrivate.ptr;
     unsigned char *srcp;
     int flag;
 
-    if(stipplewidth <= 32) {
-	if(stipplewidth & (stipplewidth - 1))	
-	  funcNo = 1;
-	else	
-	  funcNo = 0;
-    } 
+    if (stipplewidth <= 32) {
+        if (stipplewidth & (stipplewidth - 1))
+            funcNo = 1;
+        else
+            funcNo = 0;
+    }
     StippleFunc = stipple_scanline_func[funcNo];
     SecondFunc = stipple_scanline_func[funcNo];
     FirstFunc = stipple_scanline_func[funcNo + 3];
 
 #ifdef TRIPLE_BITS
-    if((bg == -1) || 
-	(!(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) &&
-	(!(infoRec->CPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
-	(CHECK_RGB_EQUAL(bg))))) {
+    if ((bg == -1) ||
+        (!(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) &&
+         (!(infoRec->CPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
+          (CHECK_RGB_EQUAL(bg))))) {
 #else
-    if((bg == -1) || 
-	!(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
+    if ((bg == -1) ||
+        !(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
 #endif
-	/* one pass */
-    } else if((rop == GXcopy) && infoRec->FillSolidRects) {
-	/* one pass but we fill background rects first */
-	(*infoRec->FillSolidRects)(pScrn, bg, rop, planemask, nBox, pBox);
-	bg = -1;
-    } else {
-	/* gotta do two passes */
-	TwoPass = TRUE;
+        /* one pass */
+    }
+    else if ((rop == GXcopy) && infoRec->FillSolidRects) {
+        /* one pass but we fill background rects first */
+        (*infoRec->FillSolidRects) (pScrn, bg, rop, planemask, nBox, pBox);
+        bg = -1;
+    }
+    else {
+        /* gotta do two passes */
+        TwoPass = TRUE;
     }
 
-    if(!TwoPass)
-	(*infoRec->SetupForCPUToScreenColorExpandFill)(
-					pScrn, fg, bg, rop, planemask);
+    if (!TwoPass)
+        (*infoRec->SetupForCPUToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                        planemask);
 
-    while(nBox--) {
+    while (nBox--) {
 #ifdef TRIPLE_BITS
-	dwords = (3 * (pBox->x2 - pBox->x1) + 31) >> 5;
+        dwords = (3 * (pBox->x2 - pBox->x1) + 31) >> 5;
 #else
-	dwords = (pBox->x2 - pBox->x1 + 31) >> 5;
+        dwords = (pBox->x2 - pBox->x1 + 31) >> 5;
 #endif
 
-SECOND_PASS:
-	if(TwoPass) {
-	    (*infoRec->SetupForCPUToScreenColorExpandFill)(pScrn, 
-			(FirstPass) ? bg : fg, -1, rop, planemask);
-	    StippleFunc = (FirstPass) ? FirstFunc : SecondFunc;
-	}
+ SECOND_PASS:
+        if (TwoPass) {
+            (*infoRec->SetupForCPUToScreenColorExpandFill) (pScrn,
+                                                            (FirstPass) ? bg :
+                                                            fg, -1, rop,
+                                                            planemask);
+            StippleFunc = (FirstPass) ? FirstFunc : SecondFunc;
+        }
+
+        h = pBox->y2 - pBox->y1;
+        flag = (infoRec->CPUToScreenColorExpandFillFlags
+                & CPU_TRANSFER_PAD_QWORD) && ((dwords * h) & 0x01);
 
-	h = pBox->y2 - pBox->y1;
-	flag = (infoRec->CPUToScreenColorExpandFillFlags 
-		& CPU_TRANSFER_PAD_QWORD) && ((dwords * h) & 0x01);
+        (*infoRec->SubsequentCPUToScreenColorExpandFill) (pScrn, pBox->x1,
+                                                          pBox->y1,
+                                                          pBox->x2 - pBox->x1,
+                                                          h, 0);
 
-        (*infoRec->SubsequentCPUToScreenColorExpandFill)(
-			pScrn, pBox->x1, pBox->y1,
- 			pBox->x2 - pBox->x1, h, 0);
+        base = (CARD32 *) infoRec->ColorExpandBase;
 
-	base = (CARD32*)infoRec->ColorExpandBase;
+        srcy = (pBox->y1 - yorg) % stippleheight;
+        if (srcy < 0)
+            srcy += stippleheight;
+        srcx = (pBox->x1 - xorg) % stipplewidth;
+        if (srcx < 0)
+            srcx += stipplewidth;
 
-	srcy = (pBox->y1 - yorg) % stippleheight;
-	if(srcy < 0) srcy += stippleheight;
-	srcx = (pBox->x1 - xorg) % stipplewidth;
-	if(srcx < 0) srcx += stipplewidth;
+        srcp = (srcwidth * srcy) + src;
 
-	srcp = (srcwidth * srcy) + src;
-	
 #ifndef FIXEDBASE
-	if((dwords * h) <= infoRec->ColorExpandRange) {
-	   while(h--) {
-		base = (*StippleFunc)(
-			base, (CARD32*)srcp, srcx, stipplewidth, dwords);
-		srcy++;
-		srcp += srcwidth;
-		if (srcy >= stippleheight) {
-		   srcy = 0;
-		   srcp = src;
-		}
-	   }
-	} else
+        if ((dwords * h) <= infoRec->ColorExpandRange) {
+            while (h--) {
+                base =
+                    (*StippleFunc) (base, (CARD32 *) srcp, srcx, stipplewidth,
+                                    dwords);
+                srcy++;
+                srcp += srcwidth;
+                if (srcy >= stippleheight) {
+                    srcy = 0;
+                    srcp = src;
+                }
+            }
+        }
+        else
 #endif
-	   while(h--) {
-		(*StippleFunc)(base, (CARD32*)srcp, srcx, stipplewidth, dwords);
-		srcy++;
-		srcp += srcwidth;
-		if (srcy >= stippleheight) {
-		   srcy = 0;
-		   srcp = src;
-		}
-	   }
-    
-	  if (flag) {
-	      base = (CARD32*)infoRec->ColorExpandBase;
-	      base[0] = 0x00000000;
-	  }
-
-	if(TwoPass) {
-	   if(FirstPass) {
-		FirstPass = FALSE;
-		goto SECOND_PASS;
-	   } else FirstPass = TRUE;
-	}
-
-	pBox++;
-     }
-
-    if(infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND) 
-	(*infoRec->Sync)(pScrn);
-    else SET_SYNC_FLAG(infoRec);
-}
+            while (h--) {
+                (*StippleFunc) (base, (CARD32 *) srcp, srcx, stipplewidth,
+                                dwords);
+                srcy++;
+                srcp += srcwidth;
+                if (srcy >= stippleheight) {
+                    srcy = 0;
+                    srcp = src;
+                }
+            }
+
+        if (flag) {
+            base = (CARD32 *) infoRec->ColorExpandBase;
+            base[0] = 0x00000000;
+        }
 
+        if (TwoPass) {
+            if (FirstPass) {
+                FirstPass = FALSE;
+                goto SECOND_PASS;
+            }
+            else
+                FirstPass = TRUE;
+        }
 
+        pBox++;
+    }
+
+    if (infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND)
+        (*infoRec->Sync) (pScrn);
+    else
+        SET_SYNC_FLAG(infoRec);
+}
 
 void
 #ifdef TRIPLE_BITS
-EXPNAME(XAAFillColorExpandSpans3)(
+ EXPNAME(XAAFillColorExpandSpans3) (
 #else
-EXPNAME(XAAFillColorExpandSpans)(
+ EXPNAME(XAAFillColorExpandSpans) (
 #endif
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-){
+                                      ScrnInfoPtr pScrn,
+                                      int fg, int bg, int rop,
+                                      unsigned int planemask,
+                                      int n,
+                                      DDXPointPtr ppt,
+                                      int *pwidth,
+                                      int fSorted,
+                                      int xorg, int yorg, PixmapPtr pPix) {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     CARD32 *base;
     Bool TwoPass = FALSE, FirstPass = TRUE;
@@ -266,106 +273,114 @@ EXPNAME(XAAFillColorExpandSpans)(
     int dwords, srcy, srcx, funcNo = 2;
     unsigned char *srcp;
 
-    if(stipplewidth <= 32) {
-	if(stipplewidth & (stipplewidth - 1))	
-	  funcNo = 1;
-	else	
-	  funcNo = 0;
-    } 
+    if (stipplewidth <= 32) {
+        if (stipplewidth & (stipplewidth - 1))
+            funcNo = 1;
+        else
+            funcNo = 0;
+    }
     StippleFunc = stipple_scanline_func[funcNo];
     SecondFunc = stipple_scanline_func[funcNo];
     FirstFunc = stipple_scanline_func[funcNo + 3];
 
 #ifdef TRIPLE_BITS
-    if((bg == -1) || 
-	(!(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) &&
-	(!(infoRec->CPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
-	(CHECK_RGB_EQUAL(bg))))) {
+    if ((bg == -1) ||
+        (!(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) &&
+         (!(infoRec->CPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
+          (CHECK_RGB_EQUAL(bg))))) {
 #else
-    if((bg == -1) || 
-	!(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
+    if ((bg == -1) ||
+        !(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
 #endif
-	/* one pass */
-    } else if((rop == GXcopy) && infoRec->FillSolidSpans) {
-	/* one pass but we fill background rects first */
-	(*infoRec->FillSolidSpans)(
-		pScrn, bg, rop, planemask, n, ppt, pwidth, fSorted);
-	bg = -1;
-    } else {
-	/* gotta do two passes */
-	TwoPass = TRUE;
-    }
-
-    if(!TwoPass)
-	(*infoRec->SetupForCPUToScreenColorExpandFill)(
-				pScrn, fg, bg, rop, planemask);
-
-    while(n--) {
+        /* one pass */
+    }
+    else if ((rop == GXcopy) && infoRec->FillSolidSpans) {
+        /* one pass but we fill background rects first */
+        (*infoRec->FillSolidSpans) (pScrn, bg, rop, planemask, n, ppt, pwidth,
+                                    fSorted);
+        bg = -1;
+    }
+    else {
+        /* gotta do two passes */
+        TwoPass = TRUE;
+    }
+
+    if (!TwoPass)
+        (*infoRec->SetupForCPUToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                        planemask);
+
+    while (n--) {
 #ifdef TRIPLE_BITS
-	dwords = (3 * *pwidth + 31) >> 5;
+        dwords = (3 * *pwidth + 31) >> 5;
 #else
-	dwords = (*pwidth + 31) >> 5;
+        dwords = (*pwidth + 31) >> 5;
 #endif
 
-	srcy = (ppt->y - yorg) % stippleheight;
-	if(srcy < 0) srcy += stippleheight;
-	srcx = (ppt->x - xorg) % stipplewidth;
-	if(srcx < 0) srcx += stipplewidth;
-
-	srcp = (pPix->devKind * srcy) + (unsigned char*)pPix->devPrivate.ptr;
-
-SECOND_PASS:
-	if(TwoPass) {
-	    (*infoRec->SetupForCPUToScreenColorExpandFill)(pScrn, 
-			(FirstPass) ? bg : fg, -1, rop, planemask);
-	    StippleFunc = (FirstPass) ? FirstFunc : SecondFunc;
-	}
-
-        (*infoRec->SubsequentCPUToScreenColorExpandFill)(pScrn, ppt->x, ppt->y,
- 			*pwidth, 1, 0);
-
-	base = (CARD32*)infoRec->ColorExpandBase;
-
-	(*StippleFunc)(base, (CARD32*)srcp, srcx, stipplewidth, dwords);
-    
-	if((infoRec->CPUToScreenColorExpandFillFlags & CPU_TRANSFER_PAD_QWORD) 
-			&& (dwords & 0x01)) {
-	    base = (CARD32*)infoRec->ColorExpandBase;
-	    base[0] = 0x00000000;
-    	}
-
-	if(TwoPass) {
-	   if(FirstPass) {
-		FirstPass = FALSE;
-		goto SECOND_PASS;
-	   } else FirstPass = TRUE;
-	}
-
-	ppt++; pwidth++;
-     }
-
-    if(infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND) 
-	(*infoRec->Sync)(pScrn);
-    else SET_SYNC_FLAG(infoRec);
-}
+        srcy = (ppt->y - yorg) % stippleheight;
+        if (srcy < 0)
+            srcy += stippleheight;
+        srcx = (ppt->x - xorg) % stipplewidth;
+        if (srcx < 0)
+            srcx += stipplewidth;
+
+        srcp = (pPix->devKind * srcy) + (unsigned char *) pPix->devPrivate.ptr;
+
+ SECOND_PASS:
+        if (TwoPass) {
+            (*infoRec->SetupForCPUToScreenColorExpandFill) (pScrn,
+                                                            (FirstPass) ? bg :
+                                                            fg, -1, rop,
+                                                            planemask);
+            StippleFunc = (FirstPass) ? FirstFunc : SecondFunc;
+        }
+
+        (*infoRec->SubsequentCPUToScreenColorExpandFill) (pScrn, ppt->x, ppt->y,
+                                                          *pwidth, 1, 0);
+
+        base = (CARD32 *) infoRec->ColorExpandBase;
+
+        (*StippleFunc) (base, (CARD32 *) srcp, srcx, stipplewidth, dwords);
+
+        if ((infoRec->CPUToScreenColorExpandFillFlags & CPU_TRANSFER_PAD_QWORD)
+            && (dwords & 0x01)) {
+            base = (CARD32 *) infoRec->ColorExpandBase;
+            base[0] = 0x00000000;
+        }
+
+        if (TwoPass) {
+            if (FirstPass) {
+                FirstPass = FALSE;
+                goto SECOND_PASS;
+            }
+            else
+                FirstPass = TRUE;
+        }
 
+        ppt++;
+        pwidth++;
+    }
+
+    if (infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND)
+        (*infoRec->Sync) (pScrn);
+    else
+        SET_SYNC_FLAG(infoRec);
+}
 
 #ifndef FIXEDBASE
 
 void
 #ifdef TRIPLE_BITS
-EXPNAME(XAAFillScanlineColorExpandRects3)(
+ EXPNAME(XAAFillScanlineColorExpandRects3) (
 #else
-EXPNAME(XAAFillScanlineColorExpandRects)(
+ EXPNAME(XAAFillScanlineColorExpandRects) (
 #endif
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-){
+                                              ScrnInfoPtr pScrn,
+                                              int fg, int bg, int rop,
+                                              unsigned int planemask,
+                                              int nBox,
+                                              BoxPtr pBox,
+                                              int xorg, int yorg,
+                                              PixmapPtr pPix) {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     CARD32 *base;
     Bool TwoPass = FALSE, FirstPass = TRUE;
@@ -377,110 +392,123 @@ EXPNAME(XAAFillScanlineColorExpandRects)(
     unsigned char *src = pPix->devPrivate.ptr;
     unsigned char *srcp;
 
-    if(stipplewidth <= 32) {
-	if(stipplewidth & (stipplewidth - 1))	
-	  funcNo = 1;
-	else	
-	  funcNo = 0;
-    } 
+    if (stipplewidth <= 32) {
+        if (stipplewidth & (stipplewidth - 1))
+            funcNo = 1;
+        else
+            funcNo = 0;
+    }
     StippleFunc = stipple_scanline_func[funcNo];
     SecondFunc = stipple_scanline_func[funcNo];
     FirstFunc = stipple_scanline_func[funcNo + 3];
 
 #ifdef TRIPLE_BITS
-    if((bg == -1) || 
-      (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) &&
-      (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
-      (CHECK_RGB_EQUAL(bg))))) {
+    if ((bg == -1) ||
+        (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)
+         && (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
+             (CHECK_RGB_EQUAL(bg))))) {
 #else
-    if((bg == -1) || 
-      !(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
+    if ((bg == -1) ||
+        !(infoRec->
+          ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
 #endif
-	/* one pass */
-    } else if((rop == GXcopy) && infoRec->FillSolidRects) {
-	/* one pass but we fill background rects first */
-	(*infoRec->FillSolidRects)(pScrn, bg, rop, planemask, nBox, pBox);
-	bg = -1;
-    } else {
-	/* gotta do two passes */
-	TwoPass = TRUE;
+        /* one pass */
+    }
+    else if ((rop == GXcopy) && infoRec->FillSolidRects) {
+        /* one pass but we fill background rects first */
+        (*infoRec->FillSolidRects) (pScrn, bg, rop, planemask, nBox, pBox);
+        bg = -1;
+    }
+    else {
+        /* gotta do two passes */
+        TwoPass = TRUE;
     }
 
-    if(!TwoPass)
-	(*infoRec->SetupForScanlineCPUToScreenColorExpandFill)(
-				pScrn, fg, bg, rop, planemask);
+    if (!TwoPass)
+        (*infoRec->SetupForScanlineCPUToScreenColorExpandFill) (pScrn, fg, bg,
+                                                                rop, planemask);
 
-    while(nBox--) {
+    while (nBox--) {
 #ifdef TRIPLE_BITS
-	dwords = (3 * (pBox->x2 - pBox->x1) + 31) >> 5;
+        dwords = (3 * (pBox->x2 - pBox->x1) + 31) >> 5;
 #else
-	dwords = (pBox->x2 - pBox->x1 + 31) >> 5;
+        dwords = (pBox->x2 - pBox->x1 + 31) >> 5;
 #endif
 
-SECOND_PASS:
-	if(TwoPass) {
-	    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill)(pScrn, 
-			(FirstPass) ? bg : fg, -1, rop, planemask);
-	    StippleFunc = (FirstPass) ? FirstFunc : SecondFunc;
-	}
-
-	h = pBox->y2 - pBox->y1;
-
-        (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)(
-		pScrn, pBox->x1, pBox->y1, pBox->x2 - pBox->x1, h, 0);
-
-	bufferNo = 0;
-
-	srcy = (pBox->y1 - yorg) % stippleheight;
-	if(srcy < 0) srcy += stippleheight;
-	srcx = (pBox->x1 - xorg) % stipplewidth;
-	if(srcx < 0) srcx += stipplewidth;
-
-	srcp = (srcwidth * srcy) + src;
-
-	while(h--) {
-   	    base = (CARD32*)infoRec->ScanlineColorExpandBuffers[bufferNo];
-	    (*StippleFunc)(base, (CARD32*)srcp, srcx, stipplewidth, dwords);
-	    (*infoRec->SubsequentColorExpandScanline)(pScrn, bufferNo++);
-	    if(bufferNo >= infoRec->NumScanlineColorExpandBuffers)
-		bufferNo = 0;
-	    srcy++;
-	    srcp += srcwidth;
-	    if (srcy >= stippleheight) {
-		srcy = 0;
-		srcp = src;
-	    }
-	}
-    
-	if(TwoPass) {
-	   if(FirstPass) {
-		FirstPass = FALSE;
-		goto SECOND_PASS;
-	   } else FirstPass = TRUE;
-	}
-
-	pBox++;
-     }
-
-     SET_SYNC_FLAG(infoRec);
+ SECOND_PASS:
+        if (TwoPass) {
+            (*infoRec->SetupForScanlineCPUToScreenColorExpandFill) (pScrn,
+                                                                    (FirstPass)
+                                                                    ? bg : fg,
+                                                                    -1, rop,
+                                                                    planemask);
+            StippleFunc = (FirstPass) ? FirstFunc : SecondFunc;
+        }
+
+        h = pBox->y2 - pBox->y1;
+
+        (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill) (pScrn,
+                                                                  pBox->x1,
+                                                                  pBox->y1,
+                                                                  pBox->x2 -
+                                                                  pBox->x1, h,
+                                                                  0);
+
+        bufferNo = 0;
+
+        srcy = (pBox->y1 - yorg) % stippleheight;
+        if (srcy < 0)
+            srcy += stippleheight;
+        srcx = (pBox->x1 - xorg) % stipplewidth;
+        if (srcx < 0)
+            srcx += stipplewidth;
+
+        srcp = (srcwidth * srcy) + src;
+
+        while (h--) {
+            base = (CARD32 *) infoRec->ScanlineColorExpandBuffers[bufferNo];
+            (*StippleFunc) (base, (CARD32 *) srcp, srcx, stipplewidth, dwords);
+            (*infoRec->SubsequentColorExpandScanline) (pScrn, bufferNo++);
+            if (bufferNo >= infoRec->NumScanlineColorExpandBuffers)
+                bufferNo = 0;
+            srcy++;
+            srcp += srcwidth;
+            if (srcy >= stippleheight) {
+                srcy = 0;
+                srcp = src;
+            }
+        }
+
+        if (TwoPass) {
+            if (FirstPass) {
+                FirstPass = FALSE;
+                goto SECOND_PASS;
+            }
+            else
+                FirstPass = TRUE;
+        }
+
+        pBox++;
+    }
+
+    SET_SYNC_FLAG(infoRec);
 }
 
 void
 #ifdef TRIPLE_BITS
-EXPNAME(XAAFillScanlineColorExpandSpans3)(
+ EXPNAME(XAAFillScanlineColorExpandSpans3) (
 #else
-EXPNAME(XAAFillScanlineColorExpandSpans)(
+ EXPNAME(XAAFillScanlineColorExpandSpans) (
 #endif
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-){
+                                              ScrnInfoPtr pScrn,
+                                              int fg, int bg, int rop,
+                                              unsigned int planemask,
+                                              int n,
+                                              DDXPointPtr ppt,
+                                              int *pwidth,
+                                              int fSorted,
+                                              int xorg, int yorg,
+                                              PixmapPtr pPix) {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     CARD32 *base;
     Bool TwoPass = FALSE, FirstPass = TRUE;
@@ -490,377 +518,398 @@ EXPNAME(XAAFillScanlineColorExpandSpans)(
     int dwords, srcy, srcx, funcNo = 2;
     unsigned char *srcp;
 
-    if(stipplewidth <= 32) {
-	if(stipplewidth & (stipplewidth - 1))	
-	  funcNo = 1;
-	else	
-	  funcNo = 0;
-    } 
+    if (stipplewidth <= 32) {
+        if (stipplewidth & (stipplewidth - 1))
+            funcNo = 1;
+        else
+            funcNo = 0;
+    }
     StippleFunc = stipple_scanline_func[funcNo];
     SecondFunc = stipple_scanline_func[funcNo];
     FirstFunc = stipple_scanline_func[funcNo + 3];
 
 #ifdef TRIPLE_BITS
-    if((bg == -1) || 
-      (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) &&
-      (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
-      (CHECK_RGB_EQUAL(bg))))) {
+    if ((bg == -1) ||
+        (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)
+         && (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
+             (CHECK_RGB_EQUAL(bg))))) {
 #else
-    if((bg == -1) || 
-      !(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
+    if ((bg == -1) ||
+        !(infoRec->
+          ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
 #endif
-	/* one pass */
-    } else if((rop == GXcopy) && infoRec->FillSolidSpans) {
-	/* one pass but we fill background rects first */
-	(*infoRec->FillSolidSpans)(
-		pScrn, bg, rop, planemask, n, ppt, pwidth, fSorted);
-	bg = -1;
-    } else {
-	/* gotta do two passes */
-	TwoPass = TRUE;
+        /* one pass */
+    }
+    else if ((rop == GXcopy) && infoRec->FillSolidSpans) {
+        /* one pass but we fill background rects first */
+        (*infoRec->FillSolidSpans) (pScrn, bg, rop, planemask, n, ppt, pwidth,
+                                    fSorted);
+        bg = -1;
+    }
+    else {
+        /* gotta do two passes */
+        TwoPass = TRUE;
     }
 
-    if(!TwoPass)
-	(*infoRec->SetupForScanlineCPUToScreenColorExpandFill)(
-				pScrn, fg, bg, rop, planemask);
-
+    if (!TwoPass)
+        (*infoRec->SetupForScanlineCPUToScreenColorExpandFill) (pScrn, fg, bg,
+                                                                rop, planemask);
 
-    while(n--) {
+    while (n--) {
 #ifdef TRIPLE_BITS
-	dwords = (3 * *pwidth + 31) >> 5;
+        dwords = (3 * *pwidth + 31) >> 5;
 #else
-	dwords = (*pwidth + 31) >> 5;
+        dwords = (*pwidth + 31) >> 5;
 #endif
 
-	srcy = (ppt->y - yorg) % stippleheight;
-	if(srcy < 0) srcy += stippleheight;
-	srcx = (ppt->x - xorg) % stipplewidth;
-	if(srcx < 0) srcx += stipplewidth;
-
-	srcp = (pPix->devKind * srcy) + (unsigned char*)pPix->devPrivate.ptr;
+        srcy = (ppt->y - yorg) % stippleheight;
+        if (srcy < 0)
+            srcy += stippleheight;
+        srcx = (ppt->x - xorg) % stipplewidth;
+        if (srcx < 0)
+            srcx += stipplewidth;
+
+        srcp = (pPix->devKind * srcy) + (unsigned char *) pPix->devPrivate.ptr;
+
+ SECOND_PASS:
+        if (TwoPass) {
+            (*infoRec->SetupForScanlineCPUToScreenColorExpandFill) (pScrn,
+                                                                    (FirstPass)
+                                                                    ? bg : fg,
+                                                                    -1, rop,
+                                                                    planemask);
+            StippleFunc = (FirstPass) ? FirstFunc : SecondFunc;
+        }
 
-SECOND_PASS:
-	if(TwoPass) {
-	    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill)(pScrn, 
-			(FirstPass) ? bg : fg, -1, rop, planemask);
-	    StippleFunc = (FirstPass) ? FirstFunc : SecondFunc;
-	}
+        (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill) (pScrn, ppt->x,
+                                                                  ppt->y,
+                                                                  *pwidth, 1,
+                                                                  0);
 
-        (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)(
-				pScrn, ppt->x, ppt->y, *pwidth, 1, 0);
+        base = (CARD32 *) infoRec->ScanlineColorExpandBuffers[0];
 
-	base = (CARD32*)infoRec->ScanlineColorExpandBuffers[0];
+        (*StippleFunc) (base, (CARD32 *) srcp, srcx, stipplewidth, dwords);
+        (*infoRec->SubsequentColorExpandScanline) (pScrn, 0);
 
-	(*StippleFunc)(base, (CARD32*)srcp, srcx, stipplewidth, dwords);
-	(*infoRec->SubsequentColorExpandScanline)(pScrn, 0);
-    
-	if(TwoPass) {
-	   if(FirstPass) {
-		FirstPass = FALSE;
-		goto SECOND_PASS;
-	   } else FirstPass = TRUE;
-	}
+        if (TwoPass) {
+            if (FirstPass) {
+                FirstPass = FALSE;
+                goto SECOND_PASS;
+            }
+            else
+                FirstPass = TRUE;
+        }
 
-	ppt++; pwidth++;
-     }
+        ppt++;
+        pwidth++;
+    }
 
-     SET_SYNC_FLAG(infoRec);
+    SET_SYNC_FLAG(infoRec);
 }
 
 #endif
 
 static CARD32 *
-StipplePowerOfTwo(
-   CARD32* dest, CARD32* src, 
-   int shift, int width, int dwords
-){
+StipplePowerOfTwo(CARD32 *dest, CARD32 *src, int shift, int width, int dwords)
+{
     CARD32 pat = *src;
-    if(width < 32) {
-	pat &= XAAShiftMasks[width];
-	while(width < 32) {
-	    pat |= SHIFT_L(pat,width);
-	    width <<= 1;
-	}
+
+    if (width < 32) {
+        pat &= XAAShiftMasks[width];
+        while (width < 32) {
+            pat |= SHIFT_L(pat, width);
+            width <<= 1;
+        }
     }
-   
-    if(shift)
-	pat = SHIFT_R(pat,shift) | SHIFT_L(pat,32 - shift);
+
+    if (shift)
+        pat = SHIFT_R(pat, shift) | SHIFT_L(pat, 32 - shift);
 
 #ifdef MSBFIRST
-    pat = SWAP_BITS_IN_BYTES(pat);    
+    pat = SWAP_BITS_IN_BYTES(pat);
 #endif
 
 #ifdef TRIPLE_BITS
     {
-	EXPAND_PAT;
-
-	while(dwords >= 3) {
-	    WRITE_PAT3;
-	    dwords -= 3;
-	}
-	if (dwords == 2) {
-	    WRITE_PAT2;
-	} else if (dwords == 1) {
-	    WRITE_PAT1;
-	}
-
-	return dest;
-    }
-#else /* TRIPLE_BITS */
-   while(dwords >= 4) {
-	DEST(0) = pat;
-	DEST(1) = pat;
-	DEST(2) = pat;
-	DEST(3) = pat;
-	dwords -= 4;
+        EXPAND_PAT;
+
+        while (dwords >= 3) {
+            WRITE_PAT3;
+            dwords -= 3;
+        }
+        if (dwords == 2) {
+            WRITE_PAT2;
+        }
+        else if (dwords == 1) {
+            WRITE_PAT1;
+        }
+
+        return dest;
+    }
+#else                           /* TRIPLE_BITS */
+    while (dwords >= 4) {
+        DEST(0) = pat;
+        DEST(1) = pat;
+        DEST(2) = pat;
+        DEST(3) = pat;
+        dwords -= 4;
 #ifndef FIXEDBASE
-	dest += 4;
+        dest += 4;
 #endif
-   }
-   
-   if(!dwords) return dest;
-   DEST(0) = pat;
-   if(dwords == 1) RETURN(1);
-   DEST(1) = pat;
-   if(dwords == 2) RETURN(2);
-   DEST(2) = pat;
-   RETURN(3);
-#endif /* TRIPLE_BITS */
+    }
+
+    if (!dwords)
+        return dest;
+    DEST(0) = pat;
+    if (dwords == 1)
+        RETURN(1);
+    DEST(1) = pat;
+    if (dwords == 2)
+        RETURN(2);
+    DEST(2) = pat;
+    RETURN(3);
+#endif                          /* TRIPLE_BITS */
 }
 
 static CARD32 *
-StipplePowerOfTwo_Inverted(
-   CARD32* dest, CARD32* src, 
-   int shift, int width, int dwords
-){
+StipplePowerOfTwo_Inverted(CARD32 *dest, CARD32 *src,
+                           int shift, int width, int dwords)
+{
     CARD32 pat = *src;
-    if(width < 32) {
-	pat &= XAAShiftMasks[width];
-	while(width < 32) {
-	    pat |= SHIFT_L(pat,width);
-	    width <<= 1;
-	}
+
+    if (width < 32) {
+        pat &= XAAShiftMasks[width];
+        while (width < 32) {
+            pat |= SHIFT_L(pat, width);
+            width <<= 1;
+        }
     }
-   
-    if(shift)
-	pat = SHIFT_R(pat,shift) | SHIFT_L(pat,32 - shift);
+
+    if (shift)
+        pat = SHIFT_R(pat, shift) | SHIFT_L(pat, 32 - shift);
 
 #ifdef MSBFIRST
-    pat = SWAP_BITS_IN_BYTES(pat);    
+    pat = SWAP_BITS_IN_BYTES(pat);
 #endif
 
-   pat = ~pat;
+    pat = ~pat;
 
 #ifdef TRIPLE_BITS
     {
-	EXPAND_PAT;
-
-	while(dwords >= 3) {
-	    WRITE_PAT3;
-	    dwords -= 3;
-	}
-	if (dwords == 2) {
-	    WRITE_PAT2;
-	} else if (dwords == 1) {
-	    WRITE_PAT1;
-	}
-
-	return dest;
-    }
-#else /* TRIPLE_BITS */
-   while(dwords >= 4) {
-	DEST(0) = pat;
-	DEST(1) = pat;
-	DEST(2) = pat;
-	DEST(3) = pat;
-	dwords -= 4;
+        EXPAND_PAT;
+
+        while (dwords >= 3) {
+            WRITE_PAT3;
+            dwords -= 3;
+        }
+        if (dwords == 2) {
+            WRITE_PAT2;
+        }
+        else if (dwords == 1) {
+            WRITE_PAT1;
+        }
+
+        return dest;
+    }
+#else                           /* TRIPLE_BITS */
+    while (dwords >= 4) {
+        DEST(0) = pat;
+        DEST(1) = pat;
+        DEST(2) = pat;
+        DEST(3) = pat;
+        dwords -= 4;
 #ifndef FIXEDBASE
-	dest += 4;
+        dest += 4;
 #endif
-   }
-   
-   if(!dwords) return dest;
-   DEST(0) = pat;
-   if(dwords == 1) RETURN(1);
-   DEST(1) = pat;
-   if(dwords == 2) RETURN(2);
-   DEST(2) = pat;
-   RETURN(3);
-#endif /* TRIPLE_BITS */
-}
+    }
 
+    if (!dwords)
+        return dest;
+    DEST(0) = pat;
+    if (dwords == 1)
+        RETURN(1);
+    DEST(1) = pat;
+    if (dwords == 2)
+        RETURN(2);
+    DEST(2) = pat;
+    RETURN(3);
+#endif                          /* TRIPLE_BITS */
+}
 
 static CARD32 *
-StippleUpTo32(
-   CARD32* base, CARD32* src, 
-   int shift, int width, int dwords
-){
+StippleUpTo32(CARD32 *base, CARD32 *src, int shift, int width, int dwords)
+{
     CARD32 pat = *src & XAAShiftMasks[width];
 
-    while(width <= 15) {
-	pat |= SHIFT_L(pat,width);
-	width <<= 1;
+    while (width <= 15) {
+        pat |= SHIFT_L(pat, width);
+        width <<= 1;
     }
-    pat |= SHIFT_L(pat,width);
+    pat |= SHIFT_L(pat, width);
+
+    while (dwords--) {
+        CARD32 bits = SHIFT_R(pat, shift) | SHIFT_L(pat, width - shift);
 
-    while(dwords--) {
-	CARD32 bits = SHIFT_R(pat,shift) | SHIFT_L(pat,width-shift);
 #ifdef TRIPLE_BITS
-	if(dwords >= 2) {
-	    WRITE_BITS3(bits);
-	    dwords -= 2;
-	} else if(dwords > 0) {
-	    WRITE_BITS2(bits);
-	    dwords--;
-	} else {
-	    WRITE_BITS1(bits);
-	}
+        if (dwords >= 2) {
+            WRITE_BITS3(bits);
+            dwords -= 2;
+        }
+        else if (dwords > 0) {
+            WRITE_BITS2(bits);
+            dwords--;
+        }
+        else {
+            WRITE_BITS1(bits);
+        }
 #else
-	WRITE_BITS(bits);
+        WRITE_BITS(bits);
 #endif
 
-	shift += 32;
-	shift %= width;
+        shift += 32;
+        shift %= width;
     }
     return base;
 }
 
-
 static CARD32 *
-StippleUpTo32_Inverted(
-   CARD32* base, CARD32* src, 
-   int shift, int width, int dwords
-){
+StippleUpTo32_Inverted(CARD32 *base, CARD32 *src,
+                       int shift, int width, int dwords)
+{
     CARD32 pat = *src & XAAShiftMasks[width];
 
-    while(width <= 15) {
-	pat |= SHIFT_L(pat,width);
-	width <<= 1;
+    while (width <= 15) {
+        pat |= SHIFT_L(pat, width);
+        width <<= 1;
     }
-    pat |= SHIFT_L(pat,width);
+    pat |= SHIFT_L(pat, width);
+
+    while (dwords--) {
+        CARD32 bits = ~(SHIFT_R(pat, shift) | SHIFT_L(pat, width - shift));
 
-    while(dwords--) {
-	CARD32 bits = ~(SHIFT_R(pat,shift) | SHIFT_L(pat,width-shift));
 #ifdef TRIPLE_BITS
-	if(dwords >= 2) {
-	    WRITE_BITS3(bits);
-	    dwords -= 2;
-	} else if(dwords > 0) {
-	    WRITE_BITS2(bits);
-	    dwords--;
-	} else {
-	    WRITE_BITS1(bits);
-	}
+        if (dwords >= 2) {
+            WRITE_BITS3(bits);
+            dwords -= 2;
+        }
+        else if (dwords > 0) {
+            WRITE_BITS2(bits);
+            dwords--;
+        }
+        else {
+            WRITE_BITS1(bits);
+        }
 #else
-	WRITE_BITS(bits);
+        WRITE_BITS(bits);
 #endif
 
-	shift += 32;
-	shift %= width;
+        shift += 32;
+        shift %= width;
     }
     return base;
 }
 
-
 static CARD32 *
-StippleOver32(
-   CARD32* base, CARD32* src, 
-   int offset, int width, int dwords
-){
-   CARD32* srcp;
-   CARD32 bits;
-   int bitsleft, shift, usable;   
-
-   while(dwords--) {
+StippleOver32(CARD32 *base, CARD32 *src, int offset, int width, int dwords)
+{
+    CARD32 *srcp;
+    CARD32 bits;
+    int bitsleft, shift, usable;
+
+    while (dwords--) {
         bitsleft = width - offset;
         srcp = src + (offset >> 5);
         shift = offset & 31;
         usable = 32 - shift;
 
-        if(bitsleft < 32) {
-            if(bitsleft <= usable) {
-                 bits = SHIFT_L(*src,bitsleft) | 
-                       (SHIFT_R(*srcp,shift) & XAAShiftMasks[bitsleft]);
-            } else {
-                 bits = SHIFT_L(*src,bitsleft) |
-                       (SHIFT_L(srcp[1],usable) & XAAShiftMasks[bitsleft]) |
-                       (SHIFT_R(*srcp,shift) & XAAShiftMasks[usable]);
+        if (bitsleft < 32) {
+            if (bitsleft <= usable) {
+                bits = SHIFT_L(*src, bitsleft) |
+                    (SHIFT_R(*srcp, shift) & XAAShiftMasks[bitsleft]);
+            }
+            else {
+                bits = SHIFT_L(*src, bitsleft) |
+                    (SHIFT_L(srcp[1], usable) & XAAShiftMasks[bitsleft]) |
+                    (SHIFT_R(*srcp, shift) & XAAShiftMasks[usable]);
             }
         }
-        else if(shift)
-            bits = SHIFT_R(*srcp,shift) | SHIFT_L(srcp[1],usable);
+        else if (shift)
+            bits = SHIFT_R(*srcp, shift) | SHIFT_L(srcp[1], usable);
         else
             bits = *srcp;
 
 #ifdef TRIPLE_BITS
-	if(dwords >= 2) {
-	    WRITE_BITS3(bits);
-	    dwords -= 2;
-	} else if(dwords > 0) {
-	    WRITE_BITS2(bits);
-	    dwords--;
-	} else {
-	    WRITE_BITS1(bits);
-	}
+        if (dwords >= 2) {
+            WRITE_BITS3(bits);
+            dwords -= 2;
+        }
+        else if (dwords > 0) {
+            WRITE_BITS2(bits);
+            dwords--;
+        }
+        else {
+            WRITE_BITS1(bits);
+        }
 #else
-	WRITE_BITS(bits);
+        WRITE_BITS(bits);
 #endif
 
-	offset += 32;
-	offset %= width;
-   }
-   return base;
+        offset += 32;
+        offset %= width;
+    }
+    return base;
 }
 
-
 static CARD32 *
-StippleOver32_Inverted(
-   CARD32* base, CARD32* src, 
-   int offset, int width, int dwords
-){
-   CARD32* srcp;
-   CARD32 bits;
-   int bitsleft, shift, usable;
-
-   while(dwords--) {
+StippleOver32_Inverted(CARD32 *base, CARD32 *src,
+                       int offset, int width, int dwords)
+{
+    CARD32 *srcp;
+    CARD32 bits;
+    int bitsleft, shift, usable;
+
+    while (dwords--) {
         bitsleft = width - offset;
         srcp = src + (offset >> 5);
         shift = offset & 31;
         usable = 32 - shift;
 
-        if(bitsleft < 32) {
-            if(bitsleft <= usable) {
-                 bits = SHIFT_L(*src,bitsleft) |
-                       (SHIFT_R(*srcp,shift) & XAAShiftMasks[bitsleft]);
-            } else {
-                 bits = SHIFT_L(*src,bitsleft) |
-                       (SHIFT_L(srcp[1],usable) & XAAShiftMasks[bitsleft]) |
-                       (SHIFT_R(*srcp,shift) & XAAShiftMasks[usable]);
+        if (bitsleft < 32) {
+            if (bitsleft <= usable) {
+                bits = SHIFT_L(*src, bitsleft) |
+                    (SHIFT_R(*srcp, shift) & XAAShiftMasks[bitsleft]);
+            }
+            else {
+                bits = SHIFT_L(*src, bitsleft) |
+                    (SHIFT_L(srcp[1], usable) & XAAShiftMasks[bitsleft]) |
+                    (SHIFT_R(*srcp, shift) & XAAShiftMasks[usable]);
             }
         }
-        else if(shift)
-            bits = SHIFT_R(*srcp,shift) | SHIFT_L(srcp[1],usable);
+        else if (shift)
+            bits = SHIFT_R(*srcp, shift) | SHIFT_L(srcp[1], usable);
         else
             bits = *srcp;
 
-	bits = ~bits;
+        bits = ~bits;
 
 #ifdef TRIPLE_BITS
-	if(dwords >= 2) {
-	    WRITE_BITS3(bits);
-	    dwords -= 2;
-	} else if(dwords > 0) {
-	    WRITE_BITS2(bits);
-	    dwords--;
-	} else {
-	    WRITE_BITS1(bits);
-	}
+        if (dwords >= 2) {
+            WRITE_BITS3(bits);
+            dwords -= 2;
+        }
+        else if (dwords > 0) {
+            WRITE_BITS2(bits);
+            dwords--;
+        }
+        else {
+            WRITE_BITS1(bits);
+        }
 #else
-	WRITE_BITS(bits);
+        WRITE_BITS(bits);
 #endif
 
-	offset += 32;
-	offset %= width;
-   }
-   return base;
+        offset += 32;
+        offset %= width;
+    }
+    return base;
 }
diff --git a/xorg-server/hw/xfree86/xaa/xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/xaaTEGlyph.c
index 049bb2cb3..2926c1df2 100644
--- a/xorg-server/hw/xfree86/xaa/xaaTEGlyph.c
+++ b/xorg-server/hw/xfree86/xaa/xaaTEGlyph.c
@@ -1,1077 +1,1083 @@
-

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaacexp.h"

-#include "xf86.h"

-

-/* scanline function for TRIPLE_BITS_24BPP */

-static CARD32 *DrawTextScanline3(CARD32 *base, CARD32 *mem, int width);

-

-/* Loop unrolled functions for common font widths */

-static CARD32 *DrawTETextScanlineGeneric(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-static CARD32 *DrawTETextScanlineWidth7(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-static CARD32 *DrawTETextScanlineWidth10(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-static CARD32 *DrawTETextScanlineWidth12(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-static CARD32 *DrawTETextScanlineWidth14(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-static CARD32 *DrawTETextScanlineWidth16(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-static CARD32 *DrawTETextScanlineWidth18(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-static CARD32 *DrawTETextScanlineWidth24(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-

-

-#ifdef USEASSEMBLER

-# ifdef FIXEDBASE

-#  ifdef MSBFIRST

-CARD32 *DrawTETextScanlineWidth6PMSBFirstFixedBase(CARD32 *base,

-		unsigned int **glyphp, int line, int width, int glyphwidth);

-CARD32 *DrawTETextScanlineWidth8PMSBFirstFixedBase(CARD32 *base,

-		unsigned int **glyphp, int line, int width, int glyphwidth);

-CARD32 *DrawTETextScanlineWidth9PMSBFirstFixedBase(CARD32 *base,

-		unsigned int **glyphp, int line, int width, int glyphwidth);

-#  else

-CARD32 *DrawTETextScanlineWidth6PLSBFirstFixedBase(CARD32 *base,

-		unsigned int **glyphp, int line, int width, int glyphwidth);

-CARD32 *DrawTETextScanlineWidth8PLSBFirstFixedBase(CARD32 *base,

-		unsigned int **glyphp, int line, int width, int glyphwidth);

-CARD32 *DrawTETextScanlineWidth9PLSBFirstFixedBase(CARD32 *base,

-		unsigned int **glyphp, int line, int width, int glyphwidth);

-#  endif

-# else

-#  ifdef MSBFIRST

-CARD32 *DrawTETextScanlineWidth6PMSBFirst(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-CARD32 *DrawTETextScanlineWidth8PMSBFirst(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-CARD32 *DrawTETextScanlineWidth9PMSBFirst(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-#  else

-CARD32 *DrawTETextScanlineWidth6PLSBFirst(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-CARD32 *DrawTETextScanlineWidth8PLSBFirst(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-CARD32 *DrawTETextScanlineWidth9PLSBFirst(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-#  endif

-# endif

-#else

-static CARD32 *DrawTETextScanlineWidth6(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-static CARD32 *DrawTETextScanlineWidth8(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-static CARD32 *DrawTETextScanlineWidth9(CARD32 *base, unsigned int **glyphp,

-					int line, int width, int glyphwidth);

-#endif

-

-#define glyph_scanline_func EXPNAME(XAAGlyphScanlineFunc)

-#define glyph_get_scanline_func EXPNAME(XAAGetGlyphScanlineFunc)

-

-

-GlyphScanlineFuncPtr glyph_scanline_func[32] = {

-   DrawTETextScanlineGeneric, DrawTETextScanlineGeneric,  

-   DrawTETextScanlineGeneric, DrawTETextScanlineGeneric,

-   DrawTETextScanlineGeneric, 

-#ifdef USEASSEMBLER

-# ifdef FIXEDBASE

-#  ifdef MSBFIRST

-   DrawTETextScanlineWidth6PMSBFirstFixedBase, 

-   DrawTETextScanlineWidth7, 

-   DrawTETextScanlineWidth8PMSBFirstFixedBase, 

-   DrawTETextScanlineWidth9PMSBFirstFixedBase, 

-#  else

-   DrawTETextScanlineWidth6PLSBFirstFixedBase, 

-   DrawTETextScanlineWidth7, 

-   DrawTETextScanlineWidth8PLSBFirstFixedBase, 

-   DrawTETextScanlineWidth9PLSBFirstFixedBase, 

-#  endif

-# else

-#  ifdef MSBFIRST

-   DrawTETextScanlineWidth6PMSBFirst, 

-   DrawTETextScanlineWidth7, 

-   DrawTETextScanlineWidth8PMSBFirst, 

-   DrawTETextScanlineWidth9PMSBFirst, 

-#  else

-   DrawTETextScanlineWidth6PLSBFirst, 

-   DrawTETextScanlineWidth7, 

-   DrawTETextScanlineWidth8PLSBFirst, 

-   DrawTETextScanlineWidth9PLSBFirst, 

-#  endif

-# endif

-#else

-   DrawTETextScanlineWidth6, DrawTETextScanlineWidth7, 

-   DrawTETextScanlineWidth8, DrawTETextScanlineWidth9, 

-#endif

-   DrawTETextScanlineWidth10, 

-   DrawTETextScanlineGeneric, DrawTETextScanlineWidth12,

-   DrawTETextScanlineGeneric, DrawTETextScanlineWidth14, 

-   DrawTETextScanlineGeneric, DrawTETextScanlineWidth16,

-   DrawTETextScanlineGeneric, DrawTETextScanlineWidth18, 

-   DrawTETextScanlineGeneric, DrawTETextScanlineGeneric,

-   DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, 

-   DrawTETextScanlineGeneric, DrawTETextScanlineWidth24,

-   DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, 

-   DrawTETextScanlineGeneric, DrawTETextScanlineGeneric,

-   DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, 

-   DrawTETextScanlineGeneric, DrawTETextScanlineGeneric

-};

-

-GlyphScanlineFuncPtr *glyph_get_scanline_func(void) {

-   return glyph_scanline_func;

-}

-

-

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

-

-   Here we have TEGlyphRenders for a bunch of different color

-   expansion types.  The driver may provide its own renderer, but

-   this is the default one which renders using lower-level primitives

-   exported by the chipset driver.

-

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

-

-/* This gets built for MSBFIRST or LSBFIRST with FIXEDBASE or not.

-	A total of 4 versions */

-

-void

-EXPNAME(XAATEGlyphRenderer)(

-    ScrnInfoPtr pScrn,

-    int x, int y, int w, int h, int skipleft, int startline, 

-    unsigned int **glyphs, int glyphWidth,

-    int fg, int bg, int rop, unsigned planemask

-)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    CARD32* base;

-    GlyphScanlineFuncPtr GlyphFunc = glyph_scanline_func[glyphWidth - 1];

-    int dwords = 0;

-

-    if((bg != -1) && (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {

-    	(*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);

-        (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);

-	bg = -1;

-    }

-

-    (*infoRec->SetupForCPUToScreenColorExpandFill)(

-				pScrn, fg, bg, rop, planemask);

-

-    if(skipleft && 

-	 (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING) || 

-	 (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) && 

-		(skipleft > x)))) {

-	    /* draw the first character only */

-

-	    int count = h, line = startline;

-            int width = glyphWidth - skipleft;

-

-	    if(width > w) width = w;

-

-            (*infoRec->SubsequentCPUToScreenColorExpandFill)(

-						pScrn, x, y, width, h, 0);

-

-	    base = (CARD32*)infoRec->ColorExpandBase;

-

-	    while(count--) {

-		register CARD32 tmp = SHIFT_R(glyphs[0][line++],skipleft);

-		WRITE_BITS(tmp);

-	    }

-    

-	    w -= width;

-	    if((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&

-			((((width + 31) >> 5) * h) & 1)) {

-		base = (CARD32*)infoRec->ColorExpandBase;

-		base[0] = 0x00000000;

-	    }

-	    if(!w) goto THE_END;

-	    glyphs++;

-            x += width;

-	    skipleft = 0;	/* nicely aligned again */

-    } 

-

-    w += skipleft;

-    x -= skipleft;

-    dwords = ((w + 31) >> 5) * h;

-

-    (*infoRec->SubsequentCPUToScreenColorExpandFill)(

-				pScrn, x, y, w, h, skipleft);

-

-    base = (CARD32*)infoRec->ColorExpandBase;

-

-#ifndef FIXEDBASE

-    if((((w + 31) >> 5) * h) <= infoRec->ColorExpandRange)

-	while(h--) {

-	    base = (*GlyphFunc)(base, glyphs, startline++, w, glyphWidth);

-	}

-    else

-#endif

-	while(h--) {

-	    (*GlyphFunc)(base, glyphs, startline++, w, glyphWidth);

-	}

-

-    if((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&

-			(dwords & 1)) {

-	base = (CARD32*)infoRec->ColorExpandBase;

-	base[0] = 0x00000000;

-    }

-

-THE_END:

-

-    if(infoRec->TEGlyphRendererFlags & SYNC_AFTER_COLOR_EXPAND) 

-	(*infoRec->Sync)(pScrn);

-    else SET_SYNC_FLAG(infoRec);

-}

-

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

- 

-   This is the GlyphRenderer for TRIPLE_BITS_24BPP. It renders to a buffer

-   with the non FIXEDBASE LSB_FIRST code before tripling, and possibly

-   reversing the bits and sending them to the screen

-

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

-

-void

-EXPNAME(XAATEGlyphRenderer3)(

-    ScrnInfoPtr pScrn,

-    int x, int y, int w, int h, int skipleft, int startline, 

-    unsigned int **glyphs, int glyphWidth,

-    int fg, int bg, int rop, unsigned planemask

-)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    CARD32 *base, *mem;

-    GlyphScanlineFuncPtr GlyphFunc = XAAGlyphScanlineFuncLSBFirst[glyphWidth - 1];

-    int dwords = 0;

-

-    if((bg != -1) && 

-	((infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY) ||

-	((infoRec->TEGlyphRendererFlags & RGB_EQUAL) && 

-	(!CHECK_RGB_EQUAL(bg))))) {

-    	(*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);

-        (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);

-	bg = -1;

-    }

-

-    (*infoRec->SetupForCPUToScreenColorExpandFill)(

-					pScrn, fg, bg, rop, planemask);

-

-    if(skipleft) {

-	    /* draw the first character only */

-

-	    int count = h, line = startline;

-            int width = glyphWidth - skipleft;

-	    CARD32 bits;

-

-	    if(width > w) width = w;

-            (*infoRec->SubsequentCPUToScreenColorExpandFill)(

-					pScrn, x, y, width, h, 0);

-

-	    base = (CARD32*)infoRec->ColorExpandBase;

-

-	    while(count--) {	

-		bits = SHIFT_R(glyphs[0][line++],skipleft);

-	        if (width >= 22) {

-		    WRITE_BITS3(bits);

-	        } else if (width >= 11) {

-		    WRITE_BITS2(bits);

-		} else {

-		    WRITE_BITS1(bits);

-		}

-	    }

-

-	    w -= width;

-	    if((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&

-			((((3 * width + 31) >> 5) * h) & 1)) {

-		base = (CARD32*)infoRec->ColorExpandBase;

-		base[0] = 0x00000000;

-	    }

-	    if(!w) goto THE_END;

-	    glyphs++;

-            x += width;

-	    skipleft = 0;	/* nicely aligned again */

-    } 

-

-    dwords = ((3 * w + 31) >> 5) * h;

-    mem = (CARD32*)malloc(((w + 31) >> 3) * sizeof(char));

-    if (!mem) return;

-

-    (*infoRec->SubsequentCPUToScreenColorExpandFill)(pScrn, x, y, w, h, 0);

-

-    base = (CARD32*)infoRec->ColorExpandBase;

-

-# ifndef FIXEDBASE

-    if((((3 * w + 31) >> 5) * h) <= infoRec->ColorExpandRange)

-	while(h--) {

-	    (*GlyphFunc)(mem, glyphs, startline++, w, glyphWidth);

-	    base = DrawTextScanline3(base, mem, w);

-	}

-    else

-# endif

-	while(h--) {

-	    (*GlyphFunc)(mem, glyphs, startline++, w, glyphWidth);

-	    DrawTextScanline3(base, mem, w);

-	}

-

-    free(mem);

-

-    if((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&

-			(dwords & 1)) {

-	base = (CARD32*)infoRec->ColorExpandBase;

-	base[0] = 0x00000000;

-    }

-

-THE_END:

-

-    if(infoRec->TEGlyphRendererFlags & SYNC_AFTER_COLOR_EXPAND) 

-	(*infoRec->Sync)(pScrn);

-    else SET_SYNC_FLAG(infoRec);

-}

-

-

-#ifndef FIXEDBASE

-/*  Scanline version of above gets built for LSBFIRST and MSBFIRST */

-

-void

-EXPNAME(XAATEGlyphRendererScanline)(

-    ScrnInfoPtr pScrn,

-    int x, int y, int w, int h, int skipleft, int startline, 

-    unsigned int **glyphs, int glyphWidth,

-    int fg, int bg, int rop, unsigned planemask

-)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int bufferNo;

-    CARD32* base;

-    GlyphScanlineFuncPtr GlyphFunc = glyph_scanline_func[glyphWidth - 1];

-

-    if((bg != -1) && (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {

-    	(*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);

-        (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);

-	bg = -1;

-    }

-

-    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill)(

-				pScrn, fg, bg, rop, planemask);

-

-    if(skipleft && 

-	(!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING) || 

-	(!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) &&

-	(skipleft > x)))) {

-	/* draw the first character only */

-

-	int count = h, line = startline;

-	int width = glyphWidth - skipleft;

-

-	if(width > w) width = w;

-

-        (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)(

-					pScrn, x, y, width, h, 0);

-

-	bufferNo = 0;

-

-	while(count--) {	

-	    register CARD32 tmp = SHIFT_R(glyphs[0][line++],skipleft);

-	    base = (CARD32*)infoRec->ScanlineColorExpandBuffers[bufferNo];

-	    WRITE_BITS(tmp);

-	    (*infoRec->SubsequentColorExpandScanline)(pScrn, bufferNo++);

-	    if(bufferNo >= infoRec->NumScanlineColorExpandBuffers)

-	    	bufferNo = 0;

-	}

-

-	w -= width;

-	if(!w) goto THE_END;

-	glyphs++;

-	x += width;

-	skipleft = 0;	/* nicely aligned again */

-    } 

-

-    w += skipleft;

-    x -= skipleft;

-

-    (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)(	

-				pScrn, x, y, w, h, skipleft);

-

-    bufferNo = 0;

-

-    while(h--) {

-	base = (CARD32*)infoRec->ScanlineColorExpandBuffers[bufferNo];

-	(*GlyphFunc)(base, glyphs, startline++, w, glyphWidth);

-	(*infoRec->SubsequentColorExpandScanline)(pScrn, bufferNo++);

-	if(bufferNo >= infoRec->NumScanlineColorExpandBuffers)

-	    bufferNo = 0;

-    }

-

-THE_END:

-

-    SET_SYNC_FLAG(infoRec);

-}

-

-void

-EXPNAME(XAATEGlyphRendererScanline3)(

-    ScrnInfoPtr pScrn,

-    int x, int y, int w, int h, int skipleft, int startline, 

-    unsigned int **glyphs, int glyphWidth,

-    int fg, int bg, int rop, unsigned planemask

-)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int bufferNo;

-    CARD32 *base, *mem;

-    GlyphScanlineFuncPtr GlyphFunc = XAAGlyphScanlineFuncLSBFirst[glyphWidth - 1];

-

-    if((bg != -1) && 

-	((infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY) ||

-	((infoRec->TEGlyphRendererFlags & RGB_EQUAL) && 

-	(!CHECK_RGB_EQUAL(bg))))) {

-    	(*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);

-        (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);

-	bg = -1;

-    }

-

-    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill)(

-					pScrn, fg, bg, rop, planemask);

-

-    if(skipleft) {

-	/* draw the first character only */

-

-	int count = h, line = startline;

-	int width = glyphWidth - skipleft;

-	CARD32 bits;

-	

-	if(width > w) width = w;

-

-        (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)(

-					pScrn, x, y, width, h, 0);

-

-	bufferNo = 0;

-

-	while(count--) {	

-	    base = (CARD32*)infoRec->ScanlineColorExpandBuffers[bufferNo];

-	    bits = SHIFT_R(glyphs[0][line++],skipleft);

-	    if (width >= 22) {

-		WRITE_BITS3(bits);

-	    } else if (width >= 11) {

-		WRITE_BITS2(bits);

-	    } else {

-		WRITE_BITS1(bits);

-	    }

-	    (*infoRec->SubsequentColorExpandScanline)(pScrn, bufferNo++);

-	    if(bufferNo >= infoRec->NumScanlineColorExpandBuffers)

-	    	bufferNo = 0;

-	}

-

-	w -= width;

-	if(!w) goto THE_END;

-	glyphs++;

-	x += width;

-	skipleft = 0;	/* nicely aligned again */

-    } 

-

-    w += skipleft;

-    x -= skipleft;

-    mem = (CARD32*)malloc(((w + 31) >> 3) * sizeof(char));

-    if (!mem) return;

-

-   (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)(	

-				pScrn, x, y, w, h, skipleft);

-

-    bufferNo = 0;

-

-    while(h--) {

-	base = (CARD32*)infoRec->ScanlineColorExpandBuffers[bufferNo];

-	(*GlyphFunc)(mem, glyphs, startline++, w, glyphWidth);

-	DrawTextScanline3(base, mem, w);

-	(*infoRec->SubsequentColorExpandScanline)(pScrn, bufferNo++);

-	if(bufferNo >= infoRec->NumScanlineColorExpandBuffers)

-	    bufferNo = 0;

-    }

-

-    free(mem);

-    

-THE_END:

-

-    SET_SYNC_FLAG(infoRec);

-}

-

-#endif

-

-

-

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

-

-   TRIPLE_BITS_24BPP scanline rendering code.

-

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

-

-

-

-static CARD32*

-DrawTextScanline3(

-    CARD32 *base,

-    CARD32 *mem,

-    int width )

-{

-

-    while(width > 32) {

-	WRITE_BITS3(*mem);

-	mem++;

-	width -= 32;

-    }

-    if(width) {

-	if (width >= 22) {

-	    WRITE_BITS3(*mem);

-	} else if (width >= 11) {

-	    WRITE_BITS2(*mem);

-	} else {

-	    WRITE_BITS1(*mem);

-	}

-    }

-

-    return base;

-}

-

-

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

-

-   Generic TE scanline rendering code.

-

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

-

-

-

-static CARD32*

-DrawTETextScanlineGeneric(

-    CARD32 *base,

-    unsigned int **glyphp,

-    int line, int width, int glyphwidth )

-{

-    CARD32 bits = (*glyphp)[line];

-    int shift = glyphwidth; 

-

-    while(width > 32) {

-	while(shift < 32) {

-	   glyphp++;

-           bits |= SHIFT_L((*glyphp)[line], shift);

-	   shift += glyphwidth;

-	}

-	WRITE_BITS(bits);

-	shift &= 31;

-	if(shift) 

-            bits = SHIFT_R((*glyphp)[line],(glyphwidth - shift));

-	else bits = 0;

-	width -= 32;

-    }

-

-    if(width) {

-	width -= shift;

-	while(width > 0) {

-	   glyphp++;

-           bits |= SHIFT_L((*glyphp)[line],shift);

-	   shift += glyphwidth;

-	   width -= glyphwidth;

-	}

-	WRITE_BITS(bits);

-    }

-

-    return base;

-}

-

-

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

-

-   Loop unrolled TE font scanline rendering code

-

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

-

-

-#ifndef USEASSEMBLER

-static CARD32* 

-DrawTETextScanlineWidth6(

-    CARD32 *base,

-    unsigned int **glyphp,

-    int line, int width, int glyphwidth )

-{

-    while (1) {

-	unsigned int bits;

-        bits =  glyphp[0][line];

-        bits |= SHIFT_L(glyphp[1][line],6);

-        bits |= SHIFT_L(glyphp[2][line],12);

-        bits |= SHIFT_L(glyphp[3][line],18);

-        bits |= SHIFT_L(glyphp[4][line],24);

-        bits |= SHIFT_L(glyphp[5][line],30);

-        WRITE_IN_BITORDER(base, 0, bits);

-	CHECKRETURN(1);

-        bits =  SHIFT_R(glyphp[5][line],2);

-        bits |= SHIFT_L(glyphp[6][line],4);

-        bits |= SHIFT_L(glyphp[7][line],10);

-        bits |= SHIFT_L(glyphp[8][line],16);

-        bits |= SHIFT_L(glyphp[9][line],22);

-        bits |= SHIFT_L(glyphp[10][line],28);

-        WRITE_IN_BITORDER(base, 1, bits);

-	CHECKRETURN(2);

-        bits =  SHIFT_R(glyphp[10][line],4);

-        bits |= SHIFT_L(glyphp[11][line],2);

-        bits |= SHIFT_L(glyphp[12][line],8);

-        bits |= SHIFT_L(glyphp[13][line],14);

-        bits |= SHIFT_L(glyphp[14][line],20);

-        bits |= SHIFT_L(glyphp[15][line],26);

-        WRITE_IN_BITORDER(base, 2, bits);

-	CHECKRETURN(3);

-#ifndef FIXEDBASE

-        base += 3;

-#endif

-	width -= 96;

-        glyphp += 16;

-    }

-    return base;

-}

-#endif

-

-static CARD32*

-DrawTETextScanlineWidth7(

-    CARD32 *base,

-    unsigned int **glyphp,

-    int line, int width, int glyphwidth )

-{

-    while (1) {

-        unsigned int bits;

-        bits = glyphp[0][line];

-        bits |= SHIFT_L(glyphp[1][line],7);

-        bits |= SHIFT_L(glyphp[2][line],14);

-        bits |= SHIFT_L(glyphp[3][line],21);

-        bits |= SHIFT_L(glyphp[4][line],28);

-        WRITE_IN_BITORDER(base, 0, bits);

-	CHECKRETURN(1);	

-        bits = SHIFT_R(glyphp[4][line],4);

-        bits |= SHIFT_L(glyphp[5][line],3);

-        bits |= SHIFT_L(glyphp[6][line],10);

-        bits |= SHIFT_L(glyphp[7][line],17);

-        bits |= SHIFT_L(glyphp[8][line],24);

-        bits |= SHIFT_L(glyphp[9][line],31);

-        WRITE_IN_BITORDER(base, 1, bits);

-	CHECKRETURN(2);	

-        bits =  SHIFT_R(glyphp[9][line],1);

-        bits |= SHIFT_L(glyphp[10][line],6);

-        bits |= SHIFT_L(glyphp[11][line],13);

-        bits |= SHIFT_L(glyphp[12][line],20);

-        bits |= SHIFT_L(glyphp[13][line],27);

-        WRITE_IN_BITORDER(base, 2, bits);

-	CHECKRETURN(3);	

-        bits = SHIFT_R(glyphp[13][line],5);

-        bits |= SHIFT_L(glyphp[14][line],2);

-        bits |= SHIFT_L(glyphp[15][line],9);

-        bits |= SHIFT_L(glyphp[16][line],16);

-        bits |= SHIFT_L(glyphp[17][line],23);

-        bits |= SHIFT_L(glyphp[18][line],30);

-        WRITE_IN_BITORDER(base, 3, bits);

-	CHECKRETURN(4);	

-        bits = SHIFT_R(glyphp[18][line],2);

-        bits |= SHIFT_L(glyphp[19][line],5);

-        bits |= SHIFT_L(glyphp[20][line],12);

-        bits |= SHIFT_L(glyphp[21][line],19);

-        bits |= SHIFT_L(glyphp[22][line],26);

-        WRITE_IN_BITORDER(base, 4, bits);

-	CHECKRETURN(5);	

-        bits = SHIFT_R(glyphp[22][line],6);

-        bits |= SHIFT_L(glyphp[23][line],1);

-        bits |= SHIFT_L(glyphp[24][line],8);

-        bits |= SHIFT_L(glyphp[25][line],15);

-        bits |= SHIFT_L(glyphp[26][line],22);

-        bits |= SHIFT_L(glyphp[27][line],29);

-        WRITE_IN_BITORDER(base, 5, bits);

-	CHECKRETURN(6);	

-        bits = SHIFT_R(glyphp[27][line],3);

-        bits |= SHIFT_L(glyphp[28][line],4);

-        bits |= SHIFT_L(glyphp[29][line],11);

-        bits |= SHIFT_L(glyphp[30][line],18);

-        bits |= SHIFT_L(glyphp[31][line],25);

-        WRITE_IN_BITORDER(base, 6, bits);

-	CHECKRETURN(7);	

-#ifndef FIXEDBASE

-        base += 7;

-#endif

-        width -= 224;

-        glyphp += 32;

-    }

-    return base;

-}

-

-

-#ifndef USEASSEMBLER

-static CARD32* 

-DrawTETextScanlineWidth8(

-    CARD32 *base,

-    unsigned int **glyphp,

-    int line, int width, int glyphwidth )

-{

-    while (1) {

-        unsigned int bits;

-        bits = glyphp[0][line];

-        bits |= SHIFT_L(glyphp[1][line],8);

-        bits |= SHIFT_L(glyphp[2][line],16);

-        bits |= SHIFT_L(glyphp[3][line],24);

-        WRITE_IN_BITORDER(base, 0, bits);

-	CHECKRETURN(1);

-        bits = glyphp[4][line];

-        bits |= SHIFT_L(glyphp[5][line],8);

-        bits |= SHIFT_L(glyphp[6][line],16);

-        bits |= SHIFT_L(glyphp[7][line],24);

-        WRITE_IN_BITORDER(base, 1, bits);

-	CHECKRETURN(2);

-#ifndef FIXEDBASE

-        base += 2;

-#endif

-	width -= 64;

-        glyphp += 8;

-    }

-    return base;

-}

-#endif

-

-#ifndef USEASSEMBLER

-static CARD32* 

-DrawTETextScanlineWidth9(

-    CARD32 *base,

-    unsigned int **glyphp,

-    int line, int width, int glyphwidth )

-{

-    while (1) {

-        unsigned int bits;

-        bits = glyphp[0][line];

-        bits |= SHIFT_L(glyphp[1][line],9);

-        bits |= SHIFT_L(glyphp[2][line],18);

-        bits |= SHIFT_L(glyphp[3][line],27);

-        WRITE_IN_BITORDER(base, 0, bits);

-	CHECKRETURN(1);	

-        bits = SHIFT_R(glyphp[3][line],5);

-        bits |= SHIFT_L(glyphp[4][line],4);

-        bits |= SHIFT_L(glyphp[5][line],13);

-        bits |= SHIFT_L(glyphp[6][line],22);

-        bits |= SHIFT_L(glyphp[7][line],31);

-        WRITE_IN_BITORDER(base, 1, bits);

-	CHECKRETURN(2);	

-        bits = SHIFT_R(glyphp[7][line],1);

-        bits |= SHIFT_L(glyphp[8][line],8);

-        bits |= SHIFT_L(glyphp[9][line],17);

-        bits |= SHIFT_L(glyphp[10][line],26);

-        WRITE_IN_BITORDER(base, 2, bits);

-	CHECKRETURN(3);	

-        bits = SHIFT_R(glyphp[10][line],6);

-        bits |= SHIFT_L(glyphp[11][line],3);

-        bits |= SHIFT_L(glyphp[12][line],12);

-        bits |= SHIFT_L(glyphp[13][line],21);

-        bits |= SHIFT_L(glyphp[14][line],30);

-        WRITE_IN_BITORDER(base, 3, bits);

-	CHECKRETURN(4);	

-        bits = SHIFT_R(glyphp[14][line],2);

-        bits |= SHIFT_L(glyphp[15][line],7);

-        bits |= SHIFT_L(glyphp[16][line],16);

-        bits |= SHIFT_L(glyphp[17][line],25);

-        WRITE_IN_BITORDER(base, 4, bits);

-	CHECKRETURN(5);	

-        bits = SHIFT_R(glyphp[17][line],7);

-        bits |= SHIFT_L(glyphp[18][line],2);

-        bits |= SHIFT_L(glyphp[19][line],11);

-        bits |= SHIFT_L(glyphp[20][line],20);

-        bits |= SHIFT_L(glyphp[21][line],29);

-        WRITE_IN_BITORDER(base, 5, bits);

-	CHECKRETURN(6);	

-        bits = SHIFT_R(glyphp[21][line],3);

-        bits |= SHIFT_L(glyphp[22][line],6);

-        bits |= SHIFT_L(glyphp[23][line],15);

-        bits |= SHIFT_L(glyphp[24][line],24);

-        WRITE_IN_BITORDER(base, 6, bits);

-	CHECKRETURN(7);	

-        bits = SHIFT_R(glyphp[24][line],8);

-        bits |= SHIFT_L(glyphp[25][line],1);

-        bits |= SHIFT_L(glyphp[26][line],10);

-        bits |= SHIFT_L(glyphp[27][line],19);

-        bits |= SHIFT_L(glyphp[28][line],28);

-        WRITE_IN_BITORDER(base, 7, bits);

-	CHECKRETURN(8);	

-        bits = SHIFT_R(glyphp[28][line],4);

-        bits |= SHIFT_L(glyphp[29][line],5);

-        bits |= SHIFT_L(glyphp[30][line],14);

-        bits |= SHIFT_L(glyphp[31][line],23);

-        WRITE_IN_BITORDER(base, 8, bits);

-	CHECKRETURN(9);	

-#ifndef FIXEDBASE

-        base += 9;

-#endif

-        width -= 288;

-        glyphp += 32;

-    }

-    return base;

-}

-#endif

-

-static CARD32* 

-DrawTETextScanlineWidth10(

-    CARD32 *base,

-    unsigned int **glyphp,

-    int line, int width, int glyphwidth )

-{

-    while (1) {

-        unsigned int bits;

-        bits = glyphp[0][line];

-        bits |= SHIFT_L(glyphp[1][line],10);

-        bits |= SHIFT_L(glyphp[2][line],20);

-        bits |= SHIFT_L(glyphp[3][line],30);

-        WRITE_IN_BITORDER(base, 0, bits);

-	CHECKRETURN(1);	

-        bits = SHIFT_R(glyphp[3][line],2);

-        bits |= SHIFT_L(glyphp[4][line],8);

-        bits |= SHIFT_L(glyphp[5][line],18);

-        bits |= SHIFT_L(glyphp[6][line],28);

-        WRITE_IN_BITORDER(base, 1, bits);

-	CHECKRETURN(2);	

-        bits = SHIFT_R(glyphp[6][line],4);

-        bits |= SHIFT_L(glyphp[7][line],6);

-        bits |= SHIFT_L(glyphp[8][line],16);

-        bits |= SHIFT_L(glyphp[9][line],26);

-        WRITE_IN_BITORDER(base, 2, bits);

-	CHECKRETURN(3);	

-        bits =  SHIFT_R(glyphp[9][line],6);

-        bits |= SHIFT_L(glyphp[10][line],4);

-        bits |= SHIFT_L(glyphp[11][line],14);

-        bits |= SHIFT_L(glyphp[12][line],24);

-        WRITE_IN_BITORDER(base, 3, bits);

-	CHECKRETURN(4);	

-        bits = SHIFT_R(glyphp[12][line],8);

-        bits |= SHIFT_L(glyphp[13][line],2);

-        bits |= SHIFT_L(glyphp[14][line],12);

-        bits |= SHIFT_L(glyphp[15][line],22);

-        WRITE_IN_BITORDER(base, 4, bits);

-	CHECKRETURN(5);	

-#ifndef FIXEDBASE

-        base += 5;

-#endif

-        width -= 160;

-        glyphp += 16;

-    }

-    return base;

-}

-

-static CARD32* 

-DrawTETextScanlineWidth12(

-    CARD32 *base,

-    unsigned int **glyphp,

-    int line, int width, int glyphwidth )

-{

-    while (1) {

-        unsigned int bits;

-        bits = glyphp[0][line];

-        bits |= SHIFT_L(glyphp[1][line],12);

-        bits |= SHIFT_L(glyphp[2][line],24);

-        WRITE_IN_BITORDER(base, 0, bits);

-	CHECKRETURN(1);	

-        bits = SHIFT_R(glyphp[2][line],8);

-        bits |= SHIFT_L(glyphp[3][line],4);

-        bits |= SHIFT_L(glyphp[4][line],16);

-        bits |= SHIFT_L(glyphp[5][line],28);

-        WRITE_IN_BITORDER(base, 1, bits);

-	CHECKRETURN(2);	

-        bits = SHIFT_R(glyphp[5][line],4);

-        bits |= SHIFT_L(glyphp[6][line],8);

-        bits |= SHIFT_L(glyphp[7][line],20);

-        WRITE_IN_BITORDER(base, 2, bits);

-	CHECKRETURN(3);	

-#ifndef FIXEDBASE

-        base += 3;

-#endif

-        width -= 96;

-        glyphp += 8;

-    }

-    return base;

-}

-

-

-

-static CARD32* 

-DrawTETextScanlineWidth14(

-    CARD32 *base,

-    unsigned int **glyphp,

-    int line, int width, int glyphwidth )

-{

-    while (1) {

-        unsigned int bits;

-        bits = glyphp[0][line];

-        bits |= SHIFT_L(glyphp[1][line],14);

-        bits |= SHIFT_L(glyphp[2][line],28);

-        WRITE_IN_BITORDER(base, 0, bits);

-	CHECKRETURN(1);	

-        bits = SHIFT_R(glyphp[2][line],4);

-        bits |= SHIFT_L(glyphp[3][line],10);

-        bits |= SHIFT_L(glyphp[4][line],24);

-        WRITE_IN_BITORDER(base, 1, bits);

-	CHECKRETURN(2);	

-        bits = SHIFT_R(glyphp[4][line],8);

-        bits |= SHIFT_L(glyphp[5][line],6);

-        bits |= SHIFT_L(glyphp[6][line],20);

-        WRITE_IN_BITORDER(base, 2, bits);

-	CHECKRETURN(3);	

-        bits = SHIFT_R(glyphp[6][line],12);

-        bits |= SHIFT_L(glyphp[7][line],2);

-        bits |= SHIFT_L(glyphp[8][line],16);

-        bits |= SHIFT_L(glyphp[9][line],30);

-        WRITE_IN_BITORDER(base, 3, bits);

-	CHECKRETURN(4);	

-        bits = SHIFT_R(glyphp[9][line],2);

-        bits |= SHIFT_L(glyphp[10][line],12);

-        bits |= SHIFT_L(glyphp[11][line],26);

-        WRITE_IN_BITORDER(base, 4, bits);

-	CHECKRETURN(5);	

-        bits = SHIFT_R(glyphp[11][line],6);

-        bits |= SHIFT_L(glyphp[12][line],8);

-        bits |= SHIFT_L(glyphp[13][line],22);

-        WRITE_IN_BITORDER(base, 5, bits);

-	CHECKRETURN(6);	

-        bits = SHIFT_R(glyphp[13][line],10);

-        bits |= SHIFT_L(glyphp[14][line],4);

-        bits |= SHIFT_L(glyphp[15][line],18);

-        WRITE_IN_BITORDER(base, 6, bits);

-	CHECKRETURN(7);	

-#ifndef FIXEDBASE

-        base += 7;

-#endif

-        width -= 224;

-        glyphp += 16;

-    }

-    return base;

-}

-

-

-static CARD32* 

-DrawTETextScanlineWidth16(

-    CARD32 *base,

-    unsigned int **glyphp,

-    int line, int width, int glyphwidth )

-{

-    while (1) {

-        unsigned int bits;

-        bits = glyphp[0][line];

-        bits |= SHIFT_L(glyphp[1][line],16);

-        WRITE_IN_BITORDER(base, 0, bits);

-	CHECKRETURN(1);	

-        bits = glyphp[2][line];

-        bits |= SHIFT_L(glyphp[3][line],16);

-        WRITE_IN_BITORDER(base, 1, bits);

-	CHECKRETURN(2);	

-        bits = glyphp[4][line];

-        bits |= SHIFT_L(glyphp[5][line],16);

-        WRITE_IN_BITORDER(base, 2, bits);

-	CHECKRETURN(3);	

-        bits = glyphp[6][line];

-        bits |= SHIFT_L(glyphp[7][line],16);

-        WRITE_IN_BITORDER(base, 3, bits);

-	CHECKRETURN(4);	

-#ifndef FIXEDBASE

-        base += 4;

-#endif

-        width -= 128;	    

-        glyphp += 8;

-    }

-    return base;

-}

-

-

-

-static CARD32* 

-DrawTETextScanlineWidth18(

-    CARD32 *base,

-    unsigned int **glyphp,

-    int line, int width, int glyphwidth )

-{

-    while (1) {

-        unsigned int bits;

-        bits = glyphp[0][line];

-        bits |= SHIFT_L(glyphp[1][line],18);

-        WRITE_IN_BITORDER(base, 0, bits);

-	CHECKRETURN(1);	

-        bits = SHIFT_R(glyphp[1][line],14);

-        bits |= SHIFT_L(glyphp[2][line],4);

-        bits |= SHIFT_L(glyphp[3][line],22);

-        WRITE_IN_BITORDER(base, 1, bits);

-	CHECKRETURN(2);	

-        bits = SHIFT_R(glyphp[3][line],10);

-        bits |= SHIFT_L(glyphp[4][line],8);

-        bits |= SHIFT_L(glyphp[5][line],26);

-        WRITE_IN_BITORDER(base, 2, bits);

-	CHECKRETURN(3);	

-        bits = SHIFT_R(glyphp[5][line],6);

-        bits |= SHIFT_L(glyphp[6][line],12);

-        bits |= SHIFT_L(glyphp[7][line],30);

-        WRITE_IN_BITORDER(base, 3, bits);

-	CHECKRETURN(4);	

-        bits = SHIFT_R(glyphp[7][line],2);

-        bits |= SHIFT_L(glyphp[8][line],16);

-        WRITE_IN_BITORDER(base, 4, bits);

-	CHECKRETURN(5);	

-        bits = SHIFT_R(glyphp[8][line],16);

-        bits |= SHIFT_L(glyphp[9][line],2);

-        bits |= SHIFT_L(glyphp[10][line],20);

-        WRITE_IN_BITORDER(base, 5, bits);

-	CHECKRETURN(6);	

-        bits = SHIFT_R(glyphp[10][line],12);

-        bits |= SHIFT_L(glyphp[11][line],6);

-        bits |= SHIFT_L(glyphp[12][line],24);

-        WRITE_IN_BITORDER(base, 6, bits);

-	CHECKRETURN(7);	

-        bits = SHIFT_R(glyphp[12][line],8);

-        bits |= SHIFT_L(glyphp[13][line],10);

-        bits |= SHIFT_L(glyphp[14][line],28);

-        WRITE_IN_BITORDER(base, 7, bits);

-	CHECKRETURN(8);	

-        bits = SHIFT_R(glyphp[14][line],4);

-        bits |= SHIFT_L(glyphp[15][line],14);

-        WRITE_IN_BITORDER(base, 8, bits);

-	CHECKRETURN(9);	

-#ifndef FIXEDBASE

-        base += 9;

-#endif

-        width -= 288;

-        glyphp += 16;

-    }

-    return base;

-}

-

-

-static CARD32* 

-DrawTETextScanlineWidth24(

-    CARD32 *base,

-    unsigned int **glyphp,

-    int line, int width, int glyphwidth )

-{

-    while (1) {

-        unsigned int bits;

-        bits = glyphp[0][line];

-        bits |= SHIFT_L(glyphp[1][line],24);

-        WRITE_IN_BITORDER(base, 0, bits);

-	CHECKRETURN(1);	

-        bits = SHIFT_R(glyphp[1][line],8);

-        bits |= SHIFT_L(glyphp[2][line],16);

-        WRITE_IN_BITORDER(base, 1, bits);

-	CHECKRETURN(2);	

-        bits = SHIFT_R(glyphp[2][line],16);

-        bits |= SHIFT_L(glyphp[3][line],8);

-        WRITE_IN_BITORDER(base, 2, bits);

-	CHECKRETURN(3);	

-#ifndef FIXEDBASE

-        base += 3;

-#endif

-        width -= 96;

-        glyphp += 4;

-    }

-    return base;

-}

-

-

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaacexp.h"
+#include "xf86.h"
+
+/* scanline function for TRIPLE_BITS_24BPP */
+static CARD32 *DrawTextScanline3(CARD32 *base, CARD32 *mem, int width);
+
+/* Loop unrolled functions for common font widths */
+static CARD32 *DrawTETextScanlineGeneric(CARD32 *base, unsigned int **glyphp,
+                                         int line, int width, int glyphwidth);
+static CARD32 *DrawTETextScanlineWidth7(CARD32 *base, unsigned int **glyphp,
+                                        int line, int width, int glyphwidth);
+static CARD32 *DrawTETextScanlineWidth10(CARD32 *base, unsigned int **glyphp,
+                                         int line, int width, int glyphwidth);
+static CARD32 *DrawTETextScanlineWidth12(CARD32 *base, unsigned int **glyphp,
+                                         int line, int width, int glyphwidth);
+static CARD32 *DrawTETextScanlineWidth14(CARD32 *base, unsigned int **glyphp,
+                                         int line, int width, int glyphwidth);
+static CARD32 *DrawTETextScanlineWidth16(CARD32 *base, unsigned int **glyphp,
+                                         int line, int width, int glyphwidth);
+static CARD32 *DrawTETextScanlineWidth18(CARD32 *base, unsigned int **glyphp,
+                                         int line, int width, int glyphwidth);
+static CARD32 *DrawTETextScanlineWidth24(CARD32 *base, unsigned int **glyphp,
+                                         int line, int width, int glyphwidth);
+
+#ifdef USEASSEMBLER
+#ifdef FIXEDBASE
+#ifdef MSBFIRST
+CARD32 *DrawTETextScanlineWidth6PMSBFirstFixedBase(CARD32 *base,
+                                                   unsigned int **glyphp,
+                                                   int line, int width,
+                                                   int glyphwidth);
+CARD32 *DrawTETextScanlineWidth8PMSBFirstFixedBase(CARD32 *base,
+                                                   unsigned int **glyphp,
+                                                   int line, int width,
+                                                   int glyphwidth);
+CARD32 *DrawTETextScanlineWidth9PMSBFirstFixedBase(CARD32 *base,
+                                                   unsigned int **glyphp,
+                                                   int line, int width,
+                                                   int glyphwidth);
+#else
+CARD32 *DrawTETextScanlineWidth6PLSBFirstFixedBase(CARD32 *base,
+                                                   unsigned int **glyphp,
+                                                   int line, int width,
+                                                   int glyphwidth);
+CARD32 *DrawTETextScanlineWidth8PLSBFirstFixedBase(CARD32 *base,
+                                                   unsigned int **glyphp,
+                                                   int line, int width,
+                                                   int glyphwidth);
+CARD32 *DrawTETextScanlineWidth9PLSBFirstFixedBase(CARD32 *base,
+                                                   unsigned int **glyphp,
+                                                   int line, int width,
+                                                   int glyphwidth);
+#endif
+#else
+#ifdef MSBFIRST
+CARD32 *DrawTETextScanlineWidth6PMSBFirst(CARD32 *base, unsigned int **glyphp,
+                                          int line, int width, int glyphwidth);
+CARD32 *DrawTETextScanlineWidth8PMSBFirst(CARD32 *base, unsigned int **glyphp,
+                                          int line, int width, int glyphwidth);
+CARD32 *DrawTETextScanlineWidth9PMSBFirst(CARD32 *base, unsigned int **glyphp,
+                                          int line, int width, int glyphwidth);
+#else
+CARD32 *DrawTETextScanlineWidth6PLSBFirst(CARD32 *base, unsigned int **glyphp,
+                                          int line, int width, int glyphwidth);
+CARD32 *DrawTETextScanlineWidth8PLSBFirst(CARD32 *base, unsigned int **glyphp,
+                                          int line, int width, int glyphwidth);
+CARD32 *DrawTETextScanlineWidth9PLSBFirst(CARD32 *base, unsigned int **glyphp,
+                                          int line, int width, int glyphwidth);
+#endif
+#endif
+#else
+static CARD32 *DrawTETextScanlineWidth6(CARD32 *base, unsigned int **glyphp,
+                                        int line, int width, int glyphwidth);
+static CARD32 *DrawTETextScanlineWidth8(CARD32 *base, unsigned int **glyphp,
+                                        int line, int width, int glyphwidth);
+static CARD32 *DrawTETextScanlineWidth9(CARD32 *base, unsigned int **glyphp,
+                                        int line, int width, int glyphwidth);
+#endif
+
+#define glyph_scanline_func EXPNAME(XAAGlyphScanlineFunc)
+#define glyph_get_scanline_func EXPNAME(XAAGetGlyphScanlineFunc)
+
+GlyphScanlineFuncPtr glyph_scanline_func[32] = {
+    DrawTETextScanlineGeneric, DrawTETextScanlineGeneric,
+    DrawTETextScanlineGeneric, DrawTETextScanlineGeneric,
+    DrawTETextScanlineGeneric,
+#ifdef USEASSEMBLER
+#ifdef FIXEDBASE
+#ifdef MSBFIRST
+    DrawTETextScanlineWidth6PMSBFirstFixedBase,
+    DrawTETextScanlineWidth7,
+    DrawTETextScanlineWidth8PMSBFirstFixedBase,
+    DrawTETextScanlineWidth9PMSBFirstFixedBase,
+#else
+    DrawTETextScanlineWidth6PLSBFirstFixedBase,
+    DrawTETextScanlineWidth7,
+    DrawTETextScanlineWidth8PLSBFirstFixedBase,
+    DrawTETextScanlineWidth9PLSBFirstFixedBase,
+#endif
+#else
+#ifdef MSBFIRST
+    DrawTETextScanlineWidth6PMSBFirst,
+    DrawTETextScanlineWidth7,
+    DrawTETextScanlineWidth8PMSBFirst,
+    DrawTETextScanlineWidth9PMSBFirst,
+#else
+    DrawTETextScanlineWidth6PLSBFirst,
+    DrawTETextScanlineWidth7,
+    DrawTETextScanlineWidth8PLSBFirst,
+    DrawTETextScanlineWidth9PLSBFirst,
+#endif
+#endif
+#else
+    DrawTETextScanlineWidth6, DrawTETextScanlineWidth7,
+    DrawTETextScanlineWidth8, DrawTETextScanlineWidth9,
+#endif
+    DrawTETextScanlineWidth10,
+    DrawTETextScanlineGeneric, DrawTETextScanlineWidth12,
+    DrawTETextScanlineGeneric, DrawTETextScanlineWidth14,
+    DrawTETextScanlineGeneric, DrawTETextScanlineWidth16,
+    DrawTETextScanlineGeneric, DrawTETextScanlineWidth18,
+    DrawTETextScanlineGeneric, DrawTETextScanlineGeneric,
+    DrawTETextScanlineGeneric, DrawTETextScanlineGeneric,
+    DrawTETextScanlineGeneric, DrawTETextScanlineWidth24,
+    DrawTETextScanlineGeneric, DrawTETextScanlineGeneric,
+    DrawTETextScanlineGeneric, DrawTETextScanlineGeneric,
+    DrawTETextScanlineGeneric, DrawTETextScanlineGeneric,
+    DrawTETextScanlineGeneric, DrawTETextScanlineGeneric
+};
+
+GlyphScanlineFuncPtr *
+glyph_get_scanline_func(void)
+{
+    return glyph_scanline_func;
+}
+
+/********************************************************************
+
+   Here we have TEGlyphRenders for a bunch of different color
+   expansion types.  The driver may provide its own renderer, but
+   this is the default one which renders using lower-level primitives
+   exported by the chipset driver.
+
+********************************************************************/
+
+/* This gets built for MSBFIRST or LSBFIRST with FIXEDBASE or not.
+	A total of 4 versions */
+
+void
+
+EXPNAME(XAATEGlyphRenderer) (ScrnInfoPtr pScrn,
+                             int x, int y, int w, int h, int skipleft,
+                             int startline, unsigned int **glyphs,
+                             int glyphWidth, int fg, int bg, int rop,
+                             unsigned planemask) {
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    CARD32 *base;
+    GlyphScanlineFuncPtr GlyphFunc = glyph_scanline_func[glyphWidth - 1];
+    int dwords = 0;
+
+    if ((bg != -1) && (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {
+        (*infoRec->SetupForSolidFill) (pScrn, bg, rop, planemask);
+        (*infoRec->SubsequentSolidFillRect) (pScrn, x, y, w, h);
+        bg = -1;
+    }
+
+    (*infoRec->SetupForCPUToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                    planemask);
+
+    if (skipleft &&
+        (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING) ||
+         (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) &&
+          (skipleft > x)))) {
+        /* draw the first character only */
+
+        int count = h, line = startline;
+        int width = glyphWidth - skipleft;
+
+        if (width > w)
+            width = w;
+
+        (*infoRec->SubsequentCPUToScreenColorExpandFill) (pScrn, x, y, width, h,
+                                                          0);
+
+        base = (CARD32 *) infoRec->ColorExpandBase;
+
+        while (count--) {
+            register CARD32 tmp = SHIFT_R(glyphs[0][line++], skipleft);
+
+            WRITE_BITS(tmp);
+        }
+
+        w -= width;
+        if ((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&
+            ((((width + 31) >> 5) * h) & 1)) {
+            base = (CARD32 *) infoRec->ColorExpandBase;
+            base[0] = 0x00000000;
+        }
+        if (!w)
+            goto THE_END;
+        glyphs++;
+        x += width;
+        skipleft = 0;           /* nicely aligned again */
+    }
+
+    w += skipleft;
+    x -= skipleft;
+    dwords = ((w + 31) >> 5) * h;
+
+    (*infoRec->SubsequentCPUToScreenColorExpandFill) (pScrn, x, y, w, h,
+                                                      skipleft);
+
+    base = (CARD32 *) infoRec->ColorExpandBase;
+
+#ifndef FIXEDBASE
+    if ((((w + 31) >> 5) * h) <= infoRec->ColorExpandRange)
+        while (h--) {
+            base = (*GlyphFunc) (base, glyphs, startline++, w, glyphWidth);
+        }
+    else
+#endif
+        while (h--) {
+            (*GlyphFunc) (base, glyphs, startline++, w, glyphWidth);
+        }
+
+    if ((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&
+        (dwords & 1)) {
+        base = (CARD32 *) infoRec->ColorExpandBase;
+        base[0] = 0x00000000;
+    }
+
+ THE_END:
+
+    if (infoRec->TEGlyphRendererFlags & SYNC_AFTER_COLOR_EXPAND)
+        (*infoRec->Sync) (pScrn);
+    else
+        SET_SYNC_FLAG(infoRec);
+}
+
+/********************************************************************
+ 
+   This is the GlyphRenderer for TRIPLE_BITS_24BPP. It renders to a buffer
+   with the non FIXEDBASE LSB_FIRST code before tripling, and possibly
+   reversing the bits and sending them to the screen
+
+********************************************************************/
+
+void
+
+EXPNAME(XAATEGlyphRenderer3) (ScrnInfoPtr pScrn,
+                              int x, int y, int w, int h, int skipleft,
+                              int startline, unsigned int **glyphs,
+                              int glyphWidth, int fg, int bg, int rop,
+                              unsigned planemask) {
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    CARD32 *base, *mem;
+    GlyphScanlineFuncPtr GlyphFunc =
+        XAAGlyphScanlineFuncLSBFirst[glyphWidth - 1];
+    int dwords = 0;
+
+    if ((bg != -1) &&
+        ((infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY) ||
+         ((infoRec->TEGlyphRendererFlags & RGB_EQUAL) &&
+          (!CHECK_RGB_EQUAL(bg))))) {
+        (*infoRec->SetupForSolidFill) (pScrn, bg, rop, planemask);
+        (*infoRec->SubsequentSolidFillRect) (pScrn, x, y, w, h);
+        bg = -1;
+    }
+
+    (*infoRec->SetupForCPUToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                    planemask);
+
+    if (skipleft) {
+        /* draw the first character only */
+
+        int count = h, line = startline;
+        int width = glyphWidth - skipleft;
+        CARD32 bits;
+
+        if (width > w)
+            width = w;
+        (*infoRec->SubsequentCPUToScreenColorExpandFill) (pScrn, x, y, width, h,
+                                                          0);
+
+        base = (CARD32 *) infoRec->ColorExpandBase;
+
+        while (count--) {
+            bits = SHIFT_R(glyphs[0][line++], skipleft);
+            if (width >= 22) {
+                WRITE_BITS3(bits);
+            }
+            else if (width >= 11) {
+                WRITE_BITS2(bits);
+            }
+            else {
+                WRITE_BITS1(bits);
+            }
+        }
+
+        w -= width;
+        if ((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&
+            ((((3 * width + 31) >> 5) * h) & 1)) {
+            base = (CARD32 *) infoRec->ColorExpandBase;
+            base[0] = 0x00000000;
+        }
+        if (!w)
+            goto THE_END;
+        glyphs++;
+        x += width;
+        skipleft = 0;           /* nicely aligned again */
+    }
+
+    dwords = ((3 * w + 31) >> 5) * h;
+    mem = (CARD32 *) malloc(((w + 31) >> 3) * sizeof(char));
+    if (!mem)
+        return;
+
+    (*infoRec->SubsequentCPUToScreenColorExpandFill) (pScrn, x, y, w, h, 0);
+
+    base = (CARD32 *) infoRec->ColorExpandBase;
+
+#ifndef FIXEDBASE
+    if ((((3 * w + 31) >> 5) * h) <= infoRec->ColorExpandRange)
+        while (h--) {
+            (*GlyphFunc) (mem, glyphs, startline++, w, glyphWidth);
+            base = DrawTextScanline3(base, mem, w);
+        }
+    else
+#endif
+        while (h--) {
+            (*GlyphFunc) (mem, glyphs, startline++, w, glyphWidth);
+            DrawTextScanline3(base, mem, w);
+        }
+
+    free(mem);
+
+    if ((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&
+        (dwords & 1)) {
+        base = (CARD32 *) infoRec->ColorExpandBase;
+        base[0] = 0x00000000;
+    }
+
+ THE_END:
+
+    if (infoRec->TEGlyphRendererFlags & SYNC_AFTER_COLOR_EXPAND)
+        (*infoRec->Sync) (pScrn);
+    else
+        SET_SYNC_FLAG(infoRec);
+}
+
+#ifndef FIXEDBASE
+/*  Scanline version of above gets built for LSBFIRST and MSBFIRST */
+
+void
+
+EXPNAME(XAATEGlyphRendererScanline) (ScrnInfoPtr pScrn,
+                                     int x, int y, int w, int h, int skipleft,
+                                     int startline, unsigned int **glyphs,
+                                     int glyphWidth, int fg, int bg, int rop,
+                                     unsigned planemask) {
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int bufferNo;
+    CARD32 *base;
+    GlyphScanlineFuncPtr GlyphFunc = glyph_scanline_func[glyphWidth - 1];
+
+    if ((bg != -1) && (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {
+        (*infoRec->SetupForSolidFill) (pScrn, bg, rop, planemask);
+        (*infoRec->SubsequentSolidFillRect) (pScrn, x, y, w, h);
+        bg = -1;
+    }
+
+    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                            planemask);
+
+    if (skipleft &&
+        (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING) ||
+         (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) &&
+          (skipleft > x)))) {
+        /* draw the first character only */
+
+        int count = h, line = startline;
+        int width = glyphWidth - skipleft;
+
+        if (width > w)
+            width = w;
+
+        (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill) (pScrn, x, y,
+                                                                  width, h, 0);
+
+        bufferNo = 0;
+
+        while (count--) {
+            register CARD32 tmp = SHIFT_R(glyphs[0][line++], skipleft);
+
+            base = (CARD32 *) infoRec->ScanlineColorExpandBuffers[bufferNo];
+            WRITE_BITS(tmp);
+            (*infoRec->SubsequentColorExpandScanline) (pScrn, bufferNo++);
+            if (bufferNo >= infoRec->NumScanlineColorExpandBuffers)
+                bufferNo = 0;
+        }
+
+        w -= width;
+        if (!w)
+            goto THE_END;
+        glyphs++;
+        x += width;
+        skipleft = 0;           /* nicely aligned again */
+    }
+
+    w += skipleft;
+    x -= skipleft;
+
+    (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill) (pScrn, x, y, w, h,
+                                                              skipleft);
+
+    bufferNo = 0;
+
+    while (h--) {
+        base = (CARD32 *) infoRec->ScanlineColorExpandBuffers[bufferNo];
+        (*GlyphFunc) (base, glyphs, startline++, w, glyphWidth);
+        (*infoRec->SubsequentColorExpandScanline) (pScrn, bufferNo++);
+        if (bufferNo >= infoRec->NumScanlineColorExpandBuffers)
+            bufferNo = 0;
+    }
+
+ THE_END:
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+void
+
+EXPNAME(XAATEGlyphRendererScanline3) (ScrnInfoPtr pScrn,
+                                      int x, int y, int w, int h, int skipleft,
+                                      int startline, unsigned int **glyphs,
+                                      int glyphWidth, int fg, int bg, int rop,
+                                      unsigned planemask) {
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int bufferNo;
+    CARD32 *base, *mem;
+    GlyphScanlineFuncPtr GlyphFunc =
+        XAAGlyphScanlineFuncLSBFirst[glyphWidth - 1];
+
+    if ((bg != -1) &&
+        ((infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY) ||
+         ((infoRec->TEGlyphRendererFlags & RGB_EQUAL) &&
+          (!CHECK_RGB_EQUAL(bg))))) {
+        (*infoRec->SetupForSolidFill) (pScrn, bg, rop, planemask);
+        (*infoRec->SubsequentSolidFillRect) (pScrn, x, y, w, h);
+        bg = -1;
+    }
+
+    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill) (pScrn, fg, bg, rop,
+                                                            planemask);
+
+    if (skipleft) {
+        /* draw the first character only */
+
+        int count = h, line = startline;
+        int width = glyphWidth - skipleft;
+        CARD32 bits;
+
+        if (width > w)
+            width = w;
+
+        (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill) (pScrn, x, y,
+                                                                  width, h, 0);
+
+        bufferNo = 0;
+
+        while (count--) {
+            base = (CARD32 *) infoRec->ScanlineColorExpandBuffers[bufferNo];
+            bits = SHIFT_R(glyphs[0][line++], skipleft);
+            if (width >= 22) {
+                WRITE_BITS3(bits);
+            }
+            else if (width >= 11) {
+                WRITE_BITS2(bits);
+            }
+            else {
+                WRITE_BITS1(bits);
+            }
+            (*infoRec->SubsequentColorExpandScanline) (pScrn, bufferNo++);
+            if (bufferNo >= infoRec->NumScanlineColorExpandBuffers)
+                bufferNo = 0;
+        }
+
+        w -= width;
+        if (!w)
+            goto THE_END;
+        glyphs++;
+        x += width;
+        skipleft = 0;           /* nicely aligned again */
+    }
+
+    w += skipleft;
+    x -= skipleft;
+    mem = (CARD32 *) malloc(((w + 31) >> 3) * sizeof(char));
+    if (!mem)
+        return;
+
+    (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill) (pScrn, x, y, w, h,
+                                                              skipleft);
+
+    bufferNo = 0;
+
+    while (h--) {
+        base = (CARD32 *) infoRec->ScanlineColorExpandBuffers[bufferNo];
+        (*GlyphFunc) (mem, glyphs, startline++, w, glyphWidth);
+        DrawTextScanline3(base, mem, w);
+        (*infoRec->SubsequentColorExpandScanline) (pScrn, bufferNo++);
+        if (bufferNo >= infoRec->NumScanlineColorExpandBuffers)
+            bufferNo = 0;
+    }
+
+    free(mem);
+
+ THE_END:
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+#endif
+
+/********************************************************************
+
+   TRIPLE_BITS_24BPP scanline rendering code.
+
+********************************************************************/
+
+static CARD32 *
+DrawTextScanline3(CARD32 *base, CARD32 *mem, int width)
+{
+
+    while (width > 32) {
+        WRITE_BITS3(*mem);
+        mem++;
+        width -= 32;
+    }
+    if (width) {
+        if (width >= 22) {
+            WRITE_BITS3(*mem);
+        }
+        else if (width >= 11) {
+            WRITE_BITS2(*mem);
+        }
+        else {
+            WRITE_BITS1(*mem);
+        }
+    }
+
+    return base;
+}
+
+/********************************************************************
+
+   Generic TE scanline rendering code.
+
+********************************************************************/
+
+static CARD32 *
+DrawTETextScanlineGeneric(CARD32 *base,
+                          unsigned int **glyphp,
+                          int line, int width, int glyphwidth)
+{
+    CARD32 bits = (*glyphp)[line];
+    int shift = glyphwidth;
+
+    while (width > 32) {
+        while (shift < 32) {
+            glyphp++;
+            bits |= SHIFT_L((*glyphp)[line], shift);
+            shift += glyphwidth;
+        }
+        WRITE_BITS(bits);
+        shift &= 31;
+        if (shift)
+            bits = SHIFT_R((*glyphp)[line], (glyphwidth - shift));
+        else
+            bits = 0;
+        width -= 32;
+    }
+
+    if (width) {
+        width -= shift;
+        while (width > 0) {
+            glyphp++;
+            bits |= SHIFT_L((*glyphp)[line], shift);
+            shift += glyphwidth;
+            width -= glyphwidth;
+        }
+        WRITE_BITS(bits);
+    }
+
+    return base;
+}
+
+/********************************************************************
+
+   Loop unrolled TE font scanline rendering code
+
+********************************************************************/
+
+#ifndef USEASSEMBLER
+static CARD32 *
+DrawTETextScanlineWidth6(CARD32 *base,
+                         unsigned int **glyphp,
+                         int line, int width, int glyphwidth)
+{
+    while (1) {
+        unsigned int bits;
+
+        bits = glyphp[0][line];
+        bits |= SHIFT_L(glyphp[1][line], 6);
+        bits |= SHIFT_L(glyphp[2][line], 12);
+        bits |= SHIFT_L(glyphp[3][line], 18);
+        bits |= SHIFT_L(glyphp[4][line], 24);
+        bits |= SHIFT_L(glyphp[5][line], 30);
+        WRITE_IN_BITORDER(base, 0, bits);
+        CHECKRETURN(1);
+        bits = SHIFT_R(glyphp[5][line], 2);
+        bits |= SHIFT_L(glyphp[6][line], 4);
+        bits |= SHIFT_L(glyphp[7][line], 10);
+        bits |= SHIFT_L(glyphp[8][line], 16);
+        bits |= SHIFT_L(glyphp[9][line], 22);
+        bits |= SHIFT_L(glyphp[10][line], 28);
+        WRITE_IN_BITORDER(base, 1, bits);
+        CHECKRETURN(2);
+        bits = SHIFT_R(glyphp[10][line], 4);
+        bits |= SHIFT_L(glyphp[11][line], 2);
+        bits |= SHIFT_L(glyphp[12][line], 8);
+        bits |= SHIFT_L(glyphp[13][line], 14);
+        bits |= SHIFT_L(glyphp[14][line], 20);
+        bits |= SHIFT_L(glyphp[15][line], 26);
+        WRITE_IN_BITORDER(base, 2, bits);
+        CHECKRETURN(3);
+#ifndef FIXEDBASE
+        base += 3;
+#endif
+        width -= 96;
+        glyphp += 16;
+    }
+    return base;
+}
+#endif
+
+static CARD32 *
+DrawTETextScanlineWidth7(CARD32 *base,
+                         unsigned int **glyphp,
+                         int line, int width, int glyphwidth)
+{
+    while (1) {
+        unsigned int bits;
+
+        bits = glyphp[0][line];
+        bits |= SHIFT_L(glyphp[1][line], 7);
+        bits |= SHIFT_L(glyphp[2][line], 14);
+        bits |= SHIFT_L(glyphp[3][line], 21);
+        bits |= SHIFT_L(glyphp[4][line], 28);
+        WRITE_IN_BITORDER(base, 0, bits);
+        CHECKRETURN(1);
+        bits = SHIFT_R(glyphp[4][line], 4);
+        bits |= SHIFT_L(glyphp[5][line], 3);
+        bits |= SHIFT_L(glyphp[6][line], 10);
+        bits |= SHIFT_L(glyphp[7][line], 17);
+        bits |= SHIFT_L(glyphp[8][line], 24);
+        bits |= SHIFT_L(glyphp[9][line], 31);
+        WRITE_IN_BITORDER(base, 1, bits);
+        CHECKRETURN(2);
+        bits = SHIFT_R(glyphp[9][line], 1);
+        bits |= SHIFT_L(glyphp[10][line], 6);
+        bits |= SHIFT_L(glyphp[11][line], 13);
+        bits |= SHIFT_L(glyphp[12][line], 20);
+        bits |= SHIFT_L(glyphp[13][line], 27);
+        WRITE_IN_BITORDER(base, 2, bits);
+        CHECKRETURN(3);
+        bits = SHIFT_R(glyphp[13][line], 5);
+        bits |= SHIFT_L(glyphp[14][line], 2);
+        bits |= SHIFT_L(glyphp[15][line], 9);
+        bits |= SHIFT_L(glyphp[16][line], 16);
+        bits |= SHIFT_L(glyphp[17][line], 23);
+        bits |= SHIFT_L(glyphp[18][line], 30);
+        WRITE_IN_BITORDER(base, 3, bits);
+        CHECKRETURN(4);
+        bits = SHIFT_R(glyphp[18][line], 2);
+        bits |= SHIFT_L(glyphp[19][line], 5);
+        bits |= SHIFT_L(glyphp[20][line], 12);
+        bits |= SHIFT_L(glyphp[21][line], 19);
+        bits |= SHIFT_L(glyphp[22][line], 26);
+        WRITE_IN_BITORDER(base, 4, bits);
+        CHECKRETURN(5);
+        bits = SHIFT_R(glyphp[22][line], 6);
+        bits |= SHIFT_L(glyphp[23][line], 1);
+        bits |= SHIFT_L(glyphp[24][line], 8);
+        bits |= SHIFT_L(glyphp[25][line], 15);
+        bits |= SHIFT_L(glyphp[26][line], 22);
+        bits |= SHIFT_L(glyphp[27][line], 29);
+        WRITE_IN_BITORDER(base, 5, bits);
+        CHECKRETURN(6);
+        bits = SHIFT_R(glyphp[27][line], 3);
+        bits |= SHIFT_L(glyphp[28][line], 4);
+        bits |= SHIFT_L(glyphp[29][line], 11);
+        bits |= SHIFT_L(glyphp[30][line], 18);
+        bits |= SHIFT_L(glyphp[31][line], 25);
+        WRITE_IN_BITORDER(base, 6, bits);
+        CHECKRETURN(7);
+#ifndef FIXEDBASE
+        base += 7;
+#endif
+        width -= 224;
+        glyphp += 32;
+    }
+    return base;
+}
+
+#ifndef USEASSEMBLER
+static CARD32 *
+DrawTETextScanlineWidth8(CARD32 *base,
+                         unsigned int **glyphp,
+                         int line, int width, int glyphwidth)
+{
+    while (1) {
+        unsigned int bits;
+
+        bits = glyphp[0][line];
+        bits |= SHIFT_L(glyphp[1][line], 8);
+        bits |= SHIFT_L(glyphp[2][line], 16);
+        bits |= SHIFT_L(glyphp[3][line], 24);
+        WRITE_IN_BITORDER(base, 0, bits);
+        CHECKRETURN(1);
+        bits = glyphp[4][line];
+        bits |= SHIFT_L(glyphp[5][line], 8);
+        bits |= SHIFT_L(glyphp[6][line], 16);
+        bits |= SHIFT_L(glyphp[7][line], 24);
+        WRITE_IN_BITORDER(base, 1, bits);
+        CHECKRETURN(2);
+#ifndef FIXEDBASE
+        base += 2;
+#endif
+        width -= 64;
+        glyphp += 8;
+    }
+    return base;
+}
+#endif
+
+#ifndef USEASSEMBLER
+static CARD32 *
+DrawTETextScanlineWidth9(CARD32 *base,
+                         unsigned int **glyphp,
+                         int line, int width, int glyphwidth)
+{
+    while (1) {
+        unsigned int bits;
+
+        bits = glyphp[0][line];
+        bits |= SHIFT_L(glyphp[1][line], 9);
+        bits |= SHIFT_L(glyphp[2][line], 18);
+        bits |= SHIFT_L(glyphp[3][line], 27);
+        WRITE_IN_BITORDER(base, 0, bits);
+        CHECKRETURN(1);
+        bits = SHIFT_R(glyphp[3][line], 5);
+        bits |= SHIFT_L(glyphp[4][line], 4);
+        bits |= SHIFT_L(glyphp[5][line], 13);
+        bits |= SHIFT_L(glyphp[6][line], 22);
+        bits |= SHIFT_L(glyphp[7][line], 31);
+        WRITE_IN_BITORDER(base, 1, bits);
+        CHECKRETURN(2);
+        bits = SHIFT_R(glyphp[7][line], 1);
+        bits |= SHIFT_L(glyphp[8][line], 8);
+        bits |= SHIFT_L(glyphp[9][line], 17);
+        bits |= SHIFT_L(glyphp[10][line], 26);
+        WRITE_IN_BITORDER(base, 2, bits);
+        CHECKRETURN(3);
+        bits = SHIFT_R(glyphp[10][line], 6);
+        bits |= SHIFT_L(glyphp[11][line], 3);
+        bits |= SHIFT_L(glyphp[12][line], 12);
+        bits |= SHIFT_L(glyphp[13][line], 21);
+        bits |= SHIFT_L(glyphp[14][line], 30);
+        WRITE_IN_BITORDER(base, 3, bits);
+        CHECKRETURN(4);
+        bits = SHIFT_R(glyphp[14][line], 2);
+        bits |= SHIFT_L(glyphp[15][line], 7);
+        bits |= SHIFT_L(glyphp[16][line], 16);
+        bits |= SHIFT_L(glyphp[17][line], 25);
+        WRITE_IN_BITORDER(base, 4, bits);
+        CHECKRETURN(5);
+        bits = SHIFT_R(glyphp[17][line], 7);
+        bits |= SHIFT_L(glyphp[18][line], 2);
+        bits |= SHIFT_L(glyphp[19][line], 11);
+        bits |= SHIFT_L(glyphp[20][line], 20);
+        bits |= SHIFT_L(glyphp[21][line], 29);
+        WRITE_IN_BITORDER(base, 5, bits);
+        CHECKRETURN(6);
+        bits = SHIFT_R(glyphp[21][line], 3);
+        bits |= SHIFT_L(glyphp[22][line], 6);
+        bits |= SHIFT_L(glyphp[23][line], 15);
+        bits |= SHIFT_L(glyphp[24][line], 24);
+        WRITE_IN_BITORDER(base, 6, bits);
+        CHECKRETURN(7);
+        bits = SHIFT_R(glyphp[24][line], 8);
+        bits |= SHIFT_L(glyphp[25][line], 1);
+        bits |= SHIFT_L(glyphp[26][line], 10);
+        bits |= SHIFT_L(glyphp[27][line], 19);
+        bits |= SHIFT_L(glyphp[28][line], 28);
+        WRITE_IN_BITORDER(base, 7, bits);
+        CHECKRETURN(8);
+        bits = SHIFT_R(glyphp[28][line], 4);
+        bits |= SHIFT_L(glyphp[29][line], 5);
+        bits |= SHIFT_L(glyphp[30][line], 14);
+        bits |= SHIFT_L(glyphp[31][line], 23);
+        WRITE_IN_BITORDER(base, 8, bits);
+        CHECKRETURN(9);
+#ifndef FIXEDBASE
+        base += 9;
+#endif
+        width -= 288;
+        glyphp += 32;
+    }
+    return base;
+}
+#endif
+
+static CARD32 *
+DrawTETextScanlineWidth10(CARD32 *base,
+                          unsigned int **glyphp,
+                          int line, int width, int glyphwidth)
+{
+    while (1) {
+        unsigned int bits;
+
+        bits = glyphp[0][line];
+        bits |= SHIFT_L(glyphp[1][line], 10);
+        bits |= SHIFT_L(glyphp[2][line], 20);
+        bits |= SHIFT_L(glyphp[3][line], 30);
+        WRITE_IN_BITORDER(base, 0, bits);
+        CHECKRETURN(1);
+        bits = SHIFT_R(glyphp[3][line], 2);
+        bits |= SHIFT_L(glyphp[4][line], 8);
+        bits |= SHIFT_L(glyphp[5][line], 18);
+        bits |= SHIFT_L(glyphp[6][line], 28);
+        WRITE_IN_BITORDER(base, 1, bits);
+        CHECKRETURN(2);
+        bits = SHIFT_R(glyphp[6][line], 4);
+        bits |= SHIFT_L(glyphp[7][line], 6);
+        bits |= SHIFT_L(glyphp[8][line], 16);
+        bits |= SHIFT_L(glyphp[9][line], 26);
+        WRITE_IN_BITORDER(base, 2, bits);
+        CHECKRETURN(3);
+        bits = SHIFT_R(glyphp[9][line], 6);
+        bits |= SHIFT_L(glyphp[10][line], 4);
+        bits |= SHIFT_L(glyphp[11][line], 14);
+        bits |= SHIFT_L(glyphp[12][line], 24);
+        WRITE_IN_BITORDER(base, 3, bits);
+        CHECKRETURN(4);
+        bits = SHIFT_R(glyphp[12][line], 8);
+        bits |= SHIFT_L(glyphp[13][line], 2);
+        bits |= SHIFT_L(glyphp[14][line], 12);
+        bits |= SHIFT_L(glyphp[15][line], 22);
+        WRITE_IN_BITORDER(base, 4, bits);
+        CHECKRETURN(5);
+#ifndef FIXEDBASE
+        base += 5;
+#endif
+        width -= 160;
+        glyphp += 16;
+    }
+    return base;
+}
+
+static CARD32 *
+DrawTETextScanlineWidth12(CARD32 *base,
+                          unsigned int **glyphp,
+                          int line, int width, int glyphwidth)
+{
+    while (1) {
+        unsigned int bits;
+
+        bits = glyphp[0][line];
+        bits |= SHIFT_L(glyphp[1][line], 12);
+        bits |= SHIFT_L(glyphp[2][line], 24);
+        WRITE_IN_BITORDER(base, 0, bits);
+        CHECKRETURN(1);
+        bits = SHIFT_R(glyphp[2][line], 8);
+        bits |= SHIFT_L(glyphp[3][line], 4);
+        bits |= SHIFT_L(glyphp[4][line], 16);
+        bits |= SHIFT_L(glyphp[5][line], 28);
+        WRITE_IN_BITORDER(base, 1, bits);
+        CHECKRETURN(2);
+        bits = SHIFT_R(glyphp[5][line], 4);
+        bits |= SHIFT_L(glyphp[6][line], 8);
+        bits |= SHIFT_L(glyphp[7][line], 20);
+        WRITE_IN_BITORDER(base, 2, bits);
+        CHECKRETURN(3);
+#ifndef FIXEDBASE
+        base += 3;
+#endif
+        width -= 96;
+        glyphp += 8;
+    }
+    return base;
+}
+
+static CARD32 *
+DrawTETextScanlineWidth14(CARD32 *base,
+                          unsigned int **glyphp,
+                          int line, int width, int glyphwidth)
+{
+    while (1) {
+        unsigned int bits;
+
+        bits = glyphp[0][line];
+        bits |= SHIFT_L(glyphp[1][line], 14);
+        bits |= SHIFT_L(glyphp[2][line], 28);
+        WRITE_IN_BITORDER(base, 0, bits);
+        CHECKRETURN(1);
+        bits = SHIFT_R(glyphp[2][line], 4);
+        bits |= SHIFT_L(glyphp[3][line], 10);
+        bits |= SHIFT_L(glyphp[4][line], 24);
+        WRITE_IN_BITORDER(base, 1, bits);
+        CHECKRETURN(2);
+        bits = SHIFT_R(glyphp[4][line], 8);
+        bits |= SHIFT_L(glyphp[5][line], 6);
+        bits |= SHIFT_L(glyphp[6][line], 20);
+        WRITE_IN_BITORDER(base, 2, bits);
+        CHECKRETURN(3);
+        bits = SHIFT_R(glyphp[6][line], 12);
+        bits |= SHIFT_L(glyphp[7][line], 2);
+        bits |= SHIFT_L(glyphp[8][line], 16);
+        bits |= SHIFT_L(glyphp[9][line], 30);
+        WRITE_IN_BITORDER(base, 3, bits);
+        CHECKRETURN(4);
+        bits = SHIFT_R(glyphp[9][line], 2);
+        bits |= SHIFT_L(glyphp[10][line], 12);
+        bits |= SHIFT_L(glyphp[11][line], 26);
+        WRITE_IN_BITORDER(base, 4, bits);
+        CHECKRETURN(5);
+        bits = SHIFT_R(glyphp[11][line], 6);
+        bits |= SHIFT_L(glyphp[12][line], 8);
+        bits |= SHIFT_L(glyphp[13][line], 22);
+        WRITE_IN_BITORDER(base, 5, bits);
+        CHECKRETURN(6);
+        bits = SHIFT_R(glyphp[13][line], 10);
+        bits |= SHIFT_L(glyphp[14][line], 4);
+        bits |= SHIFT_L(glyphp[15][line], 18);
+        WRITE_IN_BITORDER(base, 6, bits);
+        CHECKRETURN(7);
+#ifndef FIXEDBASE
+        base += 7;
+#endif
+        width -= 224;
+        glyphp += 16;
+    }
+    return base;
+}
+
+static CARD32 *
+DrawTETextScanlineWidth16(CARD32 *base,
+                          unsigned int **glyphp,
+                          int line, int width, int glyphwidth)
+{
+    while (1) {
+        unsigned int bits;
+
+        bits = glyphp[0][line];
+        bits |= SHIFT_L(glyphp[1][line], 16);
+        WRITE_IN_BITORDER(base, 0, bits);
+        CHECKRETURN(1);
+        bits = glyphp[2][line];
+        bits |= SHIFT_L(glyphp[3][line], 16);
+        WRITE_IN_BITORDER(base, 1, bits);
+        CHECKRETURN(2);
+        bits = glyphp[4][line];
+        bits |= SHIFT_L(glyphp[5][line], 16);
+        WRITE_IN_BITORDER(base, 2, bits);
+        CHECKRETURN(3);
+        bits = glyphp[6][line];
+        bits |= SHIFT_L(glyphp[7][line], 16);
+        WRITE_IN_BITORDER(base, 3, bits);
+        CHECKRETURN(4);
+#ifndef FIXEDBASE
+        base += 4;
+#endif
+        width -= 128;
+        glyphp += 8;
+    }
+    return base;
+}
+
+static CARD32 *
+DrawTETextScanlineWidth18(CARD32 *base,
+                          unsigned int **glyphp,
+                          int line, int width, int glyphwidth)
+{
+    while (1) {
+        unsigned int bits;
+
+        bits = glyphp[0][line];
+        bits |= SHIFT_L(glyphp[1][line], 18);
+        WRITE_IN_BITORDER(base, 0, bits);
+        CHECKRETURN(1);
+        bits = SHIFT_R(glyphp[1][line], 14);
+        bits |= SHIFT_L(glyphp[2][line], 4);
+        bits |= SHIFT_L(glyphp[3][line], 22);
+        WRITE_IN_BITORDER(base, 1, bits);
+        CHECKRETURN(2);
+        bits = SHIFT_R(glyphp[3][line], 10);
+        bits |= SHIFT_L(glyphp[4][line], 8);
+        bits |= SHIFT_L(glyphp[5][line], 26);
+        WRITE_IN_BITORDER(base, 2, bits);
+        CHECKRETURN(3);
+        bits = SHIFT_R(glyphp[5][line], 6);
+        bits |= SHIFT_L(glyphp[6][line], 12);
+        bits |= SHIFT_L(glyphp[7][line], 30);
+        WRITE_IN_BITORDER(base, 3, bits);
+        CHECKRETURN(4);
+        bits = SHIFT_R(glyphp[7][line], 2);
+        bits |= SHIFT_L(glyphp[8][line], 16);
+        WRITE_IN_BITORDER(base, 4, bits);
+        CHECKRETURN(5);
+        bits = SHIFT_R(glyphp[8][line], 16);
+        bits |= SHIFT_L(glyphp[9][line], 2);
+        bits |= SHIFT_L(glyphp[10][line], 20);
+        WRITE_IN_BITORDER(base, 5, bits);
+        CHECKRETURN(6);
+        bits = SHIFT_R(glyphp[10][line], 12);
+        bits |= SHIFT_L(glyphp[11][line], 6);
+        bits |= SHIFT_L(glyphp[12][line], 24);
+        WRITE_IN_BITORDER(base, 6, bits);
+        CHECKRETURN(7);
+        bits = SHIFT_R(glyphp[12][line], 8);
+        bits |= SHIFT_L(glyphp[13][line], 10);
+        bits |= SHIFT_L(glyphp[14][line], 28);
+        WRITE_IN_BITORDER(base, 7, bits);
+        CHECKRETURN(8);
+        bits = SHIFT_R(glyphp[14][line], 4);
+        bits |= SHIFT_L(glyphp[15][line], 14);
+        WRITE_IN_BITORDER(base, 8, bits);
+        CHECKRETURN(9);
+#ifndef FIXEDBASE
+        base += 9;
+#endif
+        width -= 288;
+        glyphp += 16;
+    }
+    return base;
+}
+
+static CARD32 *
+DrawTETextScanlineWidth24(CARD32 *base,
+                          unsigned int **glyphp,
+                          int line, int width, int glyphwidth)
+{
+    while (1) {
+        unsigned int bits;
+
+        bits = glyphp[0][line];
+        bits |= SHIFT_L(glyphp[1][line], 24);
+        WRITE_IN_BITORDER(base, 0, bits);
+        CHECKRETURN(1);
+        bits = SHIFT_R(glyphp[1][line], 8);
+        bits |= SHIFT_L(glyphp[2][line], 16);
+        WRITE_IN_BITORDER(base, 1, bits);
+        CHECKRETURN(2);
+        bits = SHIFT_R(glyphp[2][line], 16);
+        bits |= SHIFT_L(glyphp[3][line], 8);
+        WRITE_IN_BITORDER(base, 2, bits);
+        CHECKRETURN(3);
+#ifndef FIXEDBASE
+        base += 3;
+#endif
+        width -= 96;
+        glyphp += 4;
+    }
+    return base;
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaTEText.c b/xorg-server/hw/xfree86/xaa/xaaTEText.c
index 2cc5fc1e6..a5ef44768 100644
--- a/xorg-server/hw/xfree86/xaa/xaaTEText.c
+++ b/xorg-server/hw/xfree86/xaa/xaaTEText.c
@@ -1,311 +1,295 @@
-

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

-

-   In this file we have GC level replacements for PolyText8/16,

-   ImageText8/16, ImageGlyphBlt and PolyGlyphBlt for TE (fixed) fonts.

-   The idea is that everything in this file is device independent.

-   The mentioned GCOps are merely wrappers for XAAGlyphBltTEColorExpansion

-   which calculates the boxes containing arbitrarily clipped text

-   and passes them to the TEGlyphRenderer which will usually be a lower 

-   level XAA function which renders these clipped glyphs using

-   the basic color expansion functions exported by the chipset driver.

-   The TEGlyphRenderer itself may optionally be driver supplied to

-   facilitate work-arounds/optimizations at a higher level than usual.

-

-   v1.0 - Mark Vojkovich (mvojkovi@ucsd.edu)

-

-

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

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include <X11/fonts/font.h>

-#include "scrnintstr.h"

-#include "dixfontstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "gcstruct.h"

-#include "pixmapstr.h"

-

-

-static void XAAGlyphBltTEColorExpansion(ScrnInfoPtr pScrn, int xInit,

-			int yInit, FontPtr font, int fg, int bg, int rop,

-			unsigned int planemask, RegionPtr cclip, int nglyph,

-			unsigned char* gBase, CharInfoPtr *ppci);

-

-

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

-

-   GC level replacements for PolyText8/16 and ImageText8/16

-   for TE fonts when using color expansion.

-

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

-

-

-int

-XAAPolyText8TEColorExpansion(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int	x, int y,

-    int count,

-    char *chars )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    unsigned long n;

-

-    (*pGC->font->get_glyphs)(pGC->font, (unsigned long)count, 

-		(unsigned char *)chars, Linear8Bit, &n, infoRec->CharInfo);

-

-    /* we have divorced XAAGlyphBltTEColorExpansion from the drawable */

-    if(n) XAAGlyphBltTEColorExpansion(

-	infoRec->pScrn, x + pDraw->x, y + pDraw->y,

-	pGC->font, pGC->fgPixel, -1, pGC->alu, pGC->planemask, 

-	pGC->pCompositeClip, n, FONTGLYPHS(pGC->font), infoRec->CharInfo);

-

-    return (x + (n * FONTMAXBOUNDS(pGC->font, characterWidth)));

-}

-

-

-int

-XAAPolyText16TEColorExpansion(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int	x, int y,

-    int count,

-    unsigned short *chars )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    unsigned long n;

-

-    (*pGC->font->get_glyphs)(

-		pGC->font, (unsigned long)count, (unsigned char *)chars,

-		(FONTLASTROW(pGC->font) == 0) ? Linear16Bit : TwoD16Bit,

-		&n, infoRec->CharInfo);

-

-    if(n) XAAGlyphBltTEColorExpansion(

-	infoRec->pScrn, x + pDraw->x, y + pDraw->y,

-	pGC->font, pGC->fgPixel, -1, pGC->alu, pGC->planemask, 

-	pGC->pCompositeClip, n, FONTGLYPHS(pGC->font), infoRec->CharInfo);

-

-    return (x + (n * FONTMAXBOUNDS(pGC->font, characterWidth)));

-}

-

-

-void

-XAAImageText8TEColorExpansion(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int	x, int y,

-    int count,

-    char *chars )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    unsigned long n;

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    (*pGC->font->get_glyphs)(pGC->font, (unsigned long)count, 

-		(unsigned char *)chars, Linear8Bit, &n, infoRec->CharInfo);

-

-    if(n) XAAGlyphBltTEColorExpansion(

-	infoRec->pScrn, x + pDraw->x, y + pDraw->y,

-	pGC->font, pGC->fgPixel, pGC->bgPixel, GXcopy, pGC->planemask, 

-	pGC->pCompositeClip, n, FONTGLYPHS(pGC->font), infoRec->CharInfo);

-}

-

-

-void

-XAAImageText16TEColorExpansion(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int	x, int y,

-    int count,

-    unsigned short *chars )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    unsigned long n;

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    (*pGC->font->get_glyphs)(

-	      pGC->font, (unsigned long)count, (unsigned char *)chars,

-	      (FONTLASTROW(pGC->font) == 0) ? Linear16Bit : TwoD16Bit,

-	      &n, infoRec->CharInfo);

-

-    if(n) XAAGlyphBltTEColorExpansion(

-	infoRec->pScrn, x + pDraw->x, y + pDraw->y,

-	pGC->font, pGC->fgPixel, pGC->bgPixel, GXcopy, pGC->planemask, 

-	pGC->pCompositeClip, n, FONTGLYPHS(pGC->font), infoRec->CharInfo);

-}

-

-

-

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

-

-   GC level replacements for ImageGlyphBlt and PolyGlyphBlt for

-   TE fonts when using color expansion.

-

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

-

-

-void

-XAAImageGlyphBltTEColorExpansion(

-    DrawablePtr pDrawable,

-    GCPtr pGC,

-    int xInit, int yInit,

-    unsigned int nglyph,

-    CharInfoPtr *ppci,

-    pointer pglyphBase )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    XAAGlyphBltTEColorExpansion(

-	infoRec->pScrn, xInit + pDrawable->x, yInit + pDrawable->y,

-	pGC->font, pGC->fgPixel, pGC->bgPixel, GXcopy, pGC->planemask, 

-	pGC->pCompositeClip, nglyph, (unsigned char*)pglyphBase, ppci);

-}

-

-void

-XAAPolyGlyphBltTEColorExpansion(

-    DrawablePtr pDrawable,

-    GCPtr pGC,

-    int xInit, int yInit,

-    unsigned int nglyph,

-    CharInfoPtr *ppci,

-    pointer pglyphBase )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    XAAGlyphBltTEColorExpansion(

-	infoRec->pScrn, xInit + pDrawable->x, yInit + pDrawable->y,

-	pGC->font, pGC->fgPixel, -1, pGC->alu, pGC->planemask, 

-	pGC->pCompositeClip, nglyph, (unsigned char*)pglyphBase, ppci);

-}

-

-

-

-

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

-

-   XAAGlyphBltTEColorExpansion -

-

-   This guy computes the clipped pieces of text and sends it to

-   the lower-level function which will handle acceleration of 

-   arbitrarily clipped text.

-  

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

-

-

-static void

-XAAGlyphBltTEColorExpansion(

-   ScrnInfoPtr pScrn,

-   int xInit, int yInit,

-   FontPtr font,

-   int fg, int bg,

-   int rop,

-   unsigned int planemask,

-   RegionPtr cclip,

-   int nglyph,

-   unsigned char* gBase,

-   CharInfoPtr *ppci )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-    int skippix, skipglyphs;

-    int Left, Right, Top, Bottom;

-    int LeftEdge, RightEdge, ytop, ybot;

-    int nbox = RegionNumRects(cclip);

-    BoxPtr pbox = RegionRects(cclip);

-    unsigned int **glyphs = NULL; 

-    int glyphWidth = FONTMAXBOUNDS(font, characterWidth);

-

-    /* find the size of the box */

-    Left = xInit;

-    Right = Left + (glyphWidth * nglyph);

-    Top = yInit - FONTASCENT(font);

-    Bottom =  yInit + FONTDESCENT(font);

-

-    /* get into the first band that may contain part of our string */

-    while(nbox && (Top >= pbox->y2)) {

-	pbox++; nbox--;

-    }

-

-    /* stop when the lower edge of the box is beyond our string */

-    while(nbox && (Bottom > pbox->y1)) {

-	LeftEdge = max(Left, pbox->x1);

-	RightEdge = min(Right, pbox->x2);

-

-	if(RightEdge > LeftEdge) {	/* we have something to draw */

-	    unsigned int *fallbackBits = NULL;

-	    ytop = max(Top, pbox->y1);

-	    ybot = min(Bottom, pbox->y2);

-	    

-	    if((skippix = LeftEdge - Left)) {

-		skipglyphs = skippix/glyphWidth;

-		skippix %= glyphWidth;

-	    } else skipglyphs = 0;

-

-	    if(!glyphs) {

-		int count;

-		glyphs = (unsigned int**)(infoRec->PreAllocMem);

-

-		for(count = 0; count < nglyph; count++) {

- 			glyphs[count] = (unsigned int*) 

-				FONTGLYPHBITS(gBase,*ppci++);

-			if (!glyphs[count]) {

-			    /* Glyphs with NULL bits do exist in the wild.

-			       Replace with blank bits in that case */

-			    

-			    if (!fallbackBits) {

-				int fontHeight = Bottom - Top + 1;

-				fallbackBits = calloc(glyphWidth * fontHeight, 1);

-				if (!fallbackBits)

-				    return;

-			    }

-			    glyphs[count] = fallbackBits;

-			}

-		}

-

-		/* our new unrolled TE code only writes DWORDS at a time 

-		   so it can read up to 6 characters past the last one 

-		   we're displaying */

-		glyphs[count + 0] = glyphs[0];

-		glyphs[count + 1] = glyphs[0];

-		glyphs[count + 2] = glyphs[0];

-		glyphs[count + 3] = glyphs[0];

-		glyphs[count + 4] = glyphs[0];

-		glyphs[count + 5] = glyphs[0];

-	    }

-

-    /* x, y, w, h, skipleft, skiptop, glyphp, glyphWidth, fg, bg, rop, pm */

-

-	    (*infoRec->TEGlyphRenderer)( pScrn, 

-		LeftEdge, ytop, RightEdge - LeftEdge, ybot - ytop, 

-		skippix, ytop - Top, glyphs + skipglyphs, glyphWidth, 

-		fg, bg, rop, planemask);

-

-	    free(fallbackBits);

-	}

-

-	nbox--; pbox++;

-    }

-}

-

-

-

-

+
+/********************************************************************
+
+   In this file we have GC level replacements for PolyText8/16,
+   ImageText8/16, ImageGlyphBlt and PolyGlyphBlt for TE (fixed) fonts.
+   The idea is that everything in this file is device independent.
+   The mentioned GCOps are merely wrappers for XAAGlyphBltTEColorExpansion
+   which calculates the boxes containing arbitrarily clipped text
+   and passes them to the TEGlyphRenderer which will usually be a lower 
+   level XAA function which renders these clipped glyphs using
+   the basic color expansion functions exported by the chipset driver.
+   The TEGlyphRenderer itself may optionally be driver supplied to
+   facilitate work-arounds/optimizations at a higher level than usual.
+
+   v1.0 - Mark Vojkovich (mvojkovi@ucsd.edu)
+
+********************************************************************/
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include <X11/fonts/font.h>
+#include "scrnintstr.h"
+#include "dixfontstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+
+static void XAAGlyphBltTEColorExpansion(ScrnInfoPtr pScrn, int xInit,
+                                        int yInit, FontPtr font, int fg, int bg,
+                                        int rop, unsigned int planemask,
+                                        RegionPtr cclip, int nglyph,
+                                        unsigned char *gBase,
+                                        CharInfoPtr * ppci);
+
+/********************************************************************
+
+   GC level replacements for PolyText8/16 and ImageText8/16
+   for TE fonts when using color expansion.
+
+********************************************************************/
+
+int
+XAAPolyText8TEColorExpansion(DrawablePtr pDraw,
+                             GCPtr pGC, int x, int y, int count, char *chars)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    unsigned long n;
+
+    (*pGC->font->get_glyphs) (pGC->font, (unsigned long) count,
+                              (unsigned char *) chars, Linear8Bit, &n,
+                              infoRec->CharInfo);
+
+    /* we have divorced XAAGlyphBltTEColorExpansion from the drawable */
+    if (n)
+        XAAGlyphBltTEColorExpansion(infoRec->pScrn, x + pDraw->x, y + pDraw->y,
+                                    pGC->font, pGC->fgPixel, -1, pGC->alu,
+                                    pGC->planemask, pGC->pCompositeClip, n,
+                                    FONTGLYPHS(pGC->font), infoRec->CharInfo);
+
+    return (x + (n * FONTMAXBOUNDS(pGC->font, characterWidth)));
+}
+
+int
+XAAPolyText16TEColorExpansion(DrawablePtr pDraw,
+                              GCPtr pGC,
+                              int x, int y, int count, unsigned short *chars)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    unsigned long n;
+
+    (*pGC->font->get_glyphs) (pGC->font, (unsigned long) count,
+                              (unsigned char *) chars,
+                              (FONTLASTROW(pGC->font) ==
+                               0) ? Linear16Bit : TwoD16Bit, &n,
+                              infoRec->CharInfo);
+
+    if (n)
+        XAAGlyphBltTEColorExpansion(infoRec->pScrn, x + pDraw->x, y + pDraw->y,
+                                    pGC->font, pGC->fgPixel, -1, pGC->alu,
+                                    pGC->planemask, pGC->pCompositeClip, n,
+                                    FONTGLYPHS(pGC->font), infoRec->CharInfo);
+
+    return (x + (n * FONTMAXBOUNDS(pGC->font, characterWidth)));
+}
+
+void
+XAAImageText8TEColorExpansion(DrawablePtr pDraw,
+                              GCPtr pGC, int x, int y, int count, char *chars)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    unsigned long n;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    (*pGC->font->get_glyphs) (pGC->font, (unsigned long) count,
+                              (unsigned char *) chars, Linear8Bit, &n,
+                              infoRec->CharInfo);
+
+    if (n)
+        XAAGlyphBltTEColorExpansion(infoRec->pScrn, x + pDraw->x, y + pDraw->y,
+                                    pGC->font, pGC->fgPixel, pGC->bgPixel,
+                                    GXcopy, pGC->planemask, pGC->pCompositeClip,
+                                    n, FONTGLYPHS(pGC->font),
+                                    infoRec->CharInfo);
+}
+
+void
+XAAImageText16TEColorExpansion(DrawablePtr pDraw,
+                               GCPtr pGC,
+                               int x, int y, int count, unsigned short *chars)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    unsigned long n;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    (*pGC->font->get_glyphs) (pGC->font, (unsigned long) count,
+                              (unsigned char *) chars,
+                              (FONTLASTROW(pGC->font) ==
+                               0) ? Linear16Bit : TwoD16Bit, &n,
+                              infoRec->CharInfo);
+
+    if (n)
+        XAAGlyphBltTEColorExpansion(infoRec->pScrn, x + pDraw->x, y + pDraw->y,
+                                    pGC->font, pGC->fgPixel, pGC->bgPixel,
+                                    GXcopy, pGC->planemask, pGC->pCompositeClip,
+                                    n, FONTGLYPHS(pGC->font),
+                                    infoRec->CharInfo);
+}
+
+/********************************************************************
+
+   GC level replacements for ImageGlyphBlt and PolyGlyphBlt for
+   TE fonts when using color expansion.
+
+********************************************************************/
+
+void
+XAAImageGlyphBltTEColorExpansion(DrawablePtr pDrawable,
+                                 GCPtr pGC,
+                                 int xInit, int yInit,
+                                 unsigned int nglyph,
+                                 CharInfoPtr * ppci, pointer pglyphBase)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    XAAGlyphBltTEColorExpansion(infoRec->pScrn, xInit + pDrawable->x,
+                                yInit + pDrawable->y, pGC->font, pGC->fgPixel,
+                                pGC->bgPixel, GXcopy, pGC->planemask,
+                                pGC->pCompositeClip, nglyph,
+                                (unsigned char *) pglyphBase, ppci);
+}
+
+void
+XAAPolyGlyphBltTEColorExpansion(DrawablePtr pDrawable,
+                                GCPtr pGC,
+                                int xInit, int yInit,
+                                unsigned int nglyph,
+                                CharInfoPtr * ppci, pointer pglyphBase)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    XAAGlyphBltTEColorExpansion(infoRec->pScrn, xInit + pDrawable->x,
+                                yInit + pDrawable->y, pGC->font, pGC->fgPixel,
+                                -1, pGC->alu, pGC->planemask,
+                                pGC->pCompositeClip, nglyph,
+                                (unsigned char *) pglyphBase, ppci);
+}
+
+/********************************************************************
+
+   XAAGlyphBltTEColorExpansion -
+
+   This guy computes the clipped pieces of text and sends it to
+   the lower-level function which will handle acceleration of 
+   arbitrarily clipped text.
+  
+********************************************************************/
+
+static void
+XAAGlyphBltTEColorExpansion(ScrnInfoPtr pScrn,
+                            int xInit, int yInit,
+                            FontPtr font,
+                            int fg, int bg,
+                            int rop,
+                            unsigned int planemask,
+                            RegionPtr cclip,
+                            int nglyph,
+                            unsigned char *gBase, CharInfoPtr * ppci)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    int skippix, skipglyphs;
+    int Left, Right, Top, Bottom;
+    int LeftEdge, RightEdge, ytop, ybot;
+    int nbox = RegionNumRects(cclip);
+    BoxPtr pbox = RegionRects(cclip);
+    unsigned int **glyphs = NULL;
+    int glyphWidth = FONTMAXBOUNDS(font, characterWidth);
+
+    /* find the size of the box */
+    Left = xInit;
+    Right = Left + (glyphWidth * nglyph);
+    Top = yInit - FONTASCENT(font);
+    Bottom = yInit + FONTDESCENT(font);
+
+    /* get into the first band that may contain part of our string */
+    while (nbox && (Top >= pbox->y2)) {
+        pbox++;
+        nbox--;
+    }
+
+    /* stop when the lower edge of the box is beyond our string */
+    while (nbox && (Bottom > pbox->y1)) {
+        LeftEdge = max(Left, pbox->x1);
+        RightEdge = min(Right, pbox->x2);
+
+        if (RightEdge > LeftEdge) {     /* we have something to draw */
+            unsigned int *fallbackBits = NULL;
+
+            ytop = max(Top, pbox->y1);
+            ybot = min(Bottom, pbox->y2);
+
+            if ((skippix = LeftEdge - Left)) {
+                skipglyphs = skippix / glyphWidth;
+                skippix %= glyphWidth;
+            }
+            else
+                skipglyphs = 0;
+
+            if (!glyphs) {
+                int count;
+
+                glyphs = (unsigned int **) (infoRec->PreAllocMem);
+
+                for (count = 0; count < nglyph; count++) {
+                    glyphs[count] = (unsigned int *)
+                        FONTGLYPHBITS(gBase, *ppci++);
+                    if (!glyphs[count]) {
+                        /* Glyphs with NULL bits do exist in the wild.
+                           Replace with blank bits in that case */
+
+                        if (!fallbackBits) {
+                            int fontHeight = Bottom - Top + 1;
+
+                            fallbackBits = calloc(glyphWidth * fontHeight, 1);
+                            if (!fallbackBits)
+                                return;
+                        }
+                        glyphs[count] = fallbackBits;
+                    }
+                }
+
+                /* our new unrolled TE code only writes DWORDS at a time 
+                   so it can read up to 6 characters past the last one 
+                   we're displaying */
+                glyphs[count + 0] = glyphs[0];
+                glyphs[count + 1] = glyphs[0];
+                glyphs[count + 2] = glyphs[0];
+                glyphs[count + 3] = glyphs[0];
+                glyphs[count + 4] = glyphs[0];
+                glyphs[count + 5] = glyphs[0];
+            }
+
+            /* x, y, w, h, skipleft, skiptop, glyphp, glyphWidth, fg, bg, rop, pm */
+
+            (*infoRec->TEGlyphRenderer) (pScrn,
+                                         LeftEdge, ytop, RightEdge - LeftEdge,
+                                         ybot - ytop, skippix, ytop - Top,
+                                         glyphs + skipglyphs, glyphWidth, fg,
+                                         bg, rop, planemask);
+
+            free(fallbackBits);
+        }
+
+        nbox--;
+        pbox++;
+    }
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaaTables.c b/xorg-server/hw/xfree86/xaa/xaaTables.c
index dbeb4a269..35641da59 100644
--- a/xorg-server/hw/xfree86/xaa/xaaTables.c
+++ b/xorg-server/hw/xfree86/xaa/xaaTables.c
@@ -9,40 +9,71 @@
  * bit order within a byte.
  */
 
-unsigned int byte_expand3[256] =
-{
-    0x000000, 0x000007, 0x000038, 0x00003F, 0x0001C0, 0x0001C7, 0x0001F8, 0x0001FF,
-    0x000E00, 0x000E07, 0x000E38, 0x000E3F, 0x000FC0, 0x000FC7, 0x000FF8, 0x000FFF,
-    0x007000, 0x007007, 0x007038, 0x00703F, 0x0071C0, 0x0071C7, 0x0071F8, 0x0071FF,
-    0x007E00, 0x007E07, 0x007E38, 0x007E3F, 0x007FC0, 0x007FC7, 0x007FF8, 0x007FFF,
-    0x038000, 0x038007, 0x038038, 0x03803F, 0x0381C0, 0x0381C7, 0x0381F8, 0x0381FF,
-    0x038E00, 0x038E07, 0x038E38, 0x038E3F, 0x038FC0, 0x038FC7, 0x038FF8, 0x038FFF,
-    0x03F000, 0x03F007, 0x03F038, 0x03F03F, 0x03F1C0, 0x03F1C7, 0x03F1F8, 0x03F1FF,
-    0x03FE00, 0x03FE07, 0x03FE38, 0x03FE3F, 0x03FFC0, 0x03FFC7, 0x03FFF8, 0x03FFFF,
-    0x1C0000, 0x1C0007, 0x1C0038, 0x1C003F, 0x1C01C0, 0x1C01C7, 0x1C01F8, 0x1C01FF,
-    0x1C0E00, 0x1C0E07, 0x1C0E38, 0x1C0E3F, 0x1C0FC0, 0x1C0FC7, 0x1C0FF8, 0x1C0FFF,
-    0x1C7000, 0x1C7007, 0x1C7038, 0x1C703F, 0x1C71C0, 0x1C71C7, 0x1C71F8, 0x1C71FF,
-    0x1C7E00, 0x1C7E07, 0x1C7E38, 0x1C7E3F, 0x1C7FC0, 0x1C7FC7, 0x1C7FF8, 0x1C7FFF,
-    0x1F8000, 0x1F8007, 0x1F8038, 0x1F803F, 0x1F81C0, 0x1F81C7, 0x1F81F8, 0x1F81FF,
-    0x1F8E00, 0x1F8E07, 0x1F8E38, 0x1F8E3F, 0x1F8FC0, 0x1F8FC7, 0x1F8FF8, 0x1F8FFF,
-    0x1FF000, 0x1FF007, 0x1FF038, 0x1FF03F, 0x1FF1C0, 0x1FF1C7, 0x1FF1F8, 0x1FF1FF,
-    0x1FFE00, 0x1FFE07, 0x1FFE38, 0x1FFE3F, 0x1FFFC0, 0x1FFFC7, 0x1FFFF8, 0x1FFFFF,
-    0xE00000, 0xE00007, 0xE00038, 0xE0003F, 0xE001C0, 0xE001C7, 0xE001F8, 0xE001FF,
-    0xE00E00, 0xE00E07, 0xE00E38, 0xE00E3F, 0xE00FC0, 0xE00FC7, 0xE00FF8, 0xE00FFF,
-    0xE07000, 0xE07007, 0xE07038, 0xE0703F, 0xE071C0, 0xE071C7, 0xE071F8, 0xE071FF,
-    0xE07E00, 0xE07E07, 0xE07E38, 0xE07E3F, 0xE07FC0, 0xE07FC7, 0xE07FF8, 0xE07FFF,
-    0xE38000, 0xE38007, 0xE38038, 0xE3803F, 0xE381C0, 0xE381C7, 0xE381F8, 0xE381FF,
-    0xE38E00, 0xE38E07, 0xE38E38, 0xE38E3F, 0xE38FC0, 0xE38FC7, 0xE38FF8, 0xE38FFF,
-    0xE3F000, 0xE3F007, 0xE3F038, 0xE3F03F, 0xE3F1C0, 0xE3F1C7, 0xE3F1F8, 0xE3F1FF,
-    0xE3FE00, 0xE3FE07, 0xE3FE38, 0xE3FE3F, 0xE3FFC0, 0xE3FFC7, 0xE3FFF8, 0xE3FFFF,
-    0xFC0000, 0xFC0007, 0xFC0038, 0xFC003F, 0xFC01C0, 0xFC01C7, 0xFC01F8, 0xFC01FF,
-    0xFC0E00, 0xFC0E07, 0xFC0E38, 0xFC0E3F, 0xFC0FC0, 0xFC0FC7, 0xFC0FF8, 0xFC0FFF,
-    0xFC7000, 0xFC7007, 0xFC7038, 0xFC703F, 0xFC71C0, 0xFC71C7, 0xFC71F8, 0xFC71FF,
-    0xFC7E00, 0xFC7E07, 0xFC7E38, 0xFC7E3F, 0xFC7FC0, 0xFC7FC7, 0xFC7FF8, 0xFC7FFF,
-    0xFF8000, 0xFF8007, 0xFF8038, 0xFF803F, 0xFF81C0, 0xFF81C7, 0xFF81F8, 0xFF81FF,
-    0xFF8E00, 0xFF8E07, 0xFF8E38, 0xFF8E3F, 0xFF8FC0, 0xFF8FC7, 0xFF8FF8, 0xFF8FFF,
-    0xFFF000, 0xFFF007, 0xFFF038, 0xFFF03F, 0xFFF1C0, 0xFFF1C7, 0xFFF1F8, 0xFFF1FF,
-    0xFFFE00, 0xFFFE07, 0xFFFE38, 0xFFFE3F, 0xFFFFC0, 0xFFFFC7, 0xFFFFF8, 0xFFFFFF
+unsigned int byte_expand3[256] = {
+    0x000000, 0x000007, 0x000038, 0x00003F, 0x0001C0, 0x0001C7, 0x0001F8,
+        0x0001FF,
+    0x000E00, 0x000E07, 0x000E38, 0x000E3F, 0x000FC0, 0x000FC7, 0x000FF8,
+        0x000FFF,
+    0x007000, 0x007007, 0x007038, 0x00703F, 0x0071C0, 0x0071C7, 0x0071F8,
+        0x0071FF,
+    0x007E00, 0x007E07, 0x007E38, 0x007E3F, 0x007FC0, 0x007FC7, 0x007FF8,
+        0x007FFF,
+    0x038000, 0x038007, 0x038038, 0x03803F, 0x0381C0, 0x0381C7, 0x0381F8,
+        0x0381FF,
+    0x038E00, 0x038E07, 0x038E38, 0x038E3F, 0x038FC0, 0x038FC7, 0x038FF8,
+        0x038FFF,
+    0x03F000, 0x03F007, 0x03F038, 0x03F03F, 0x03F1C0, 0x03F1C7, 0x03F1F8,
+        0x03F1FF,
+    0x03FE00, 0x03FE07, 0x03FE38, 0x03FE3F, 0x03FFC0, 0x03FFC7, 0x03FFF8,
+        0x03FFFF,
+    0x1C0000, 0x1C0007, 0x1C0038, 0x1C003F, 0x1C01C0, 0x1C01C7, 0x1C01F8,
+        0x1C01FF,
+    0x1C0E00, 0x1C0E07, 0x1C0E38, 0x1C0E3F, 0x1C0FC0, 0x1C0FC7, 0x1C0FF8,
+        0x1C0FFF,
+    0x1C7000, 0x1C7007, 0x1C7038, 0x1C703F, 0x1C71C0, 0x1C71C7, 0x1C71F8,
+        0x1C71FF,
+    0x1C7E00, 0x1C7E07, 0x1C7E38, 0x1C7E3F, 0x1C7FC0, 0x1C7FC7, 0x1C7FF8,
+        0x1C7FFF,
+    0x1F8000, 0x1F8007, 0x1F8038, 0x1F803F, 0x1F81C0, 0x1F81C7, 0x1F81F8,
+        0x1F81FF,
+    0x1F8E00, 0x1F8E07, 0x1F8E38, 0x1F8E3F, 0x1F8FC0, 0x1F8FC7, 0x1F8FF8,
+        0x1F8FFF,
+    0x1FF000, 0x1FF007, 0x1FF038, 0x1FF03F, 0x1FF1C0, 0x1FF1C7, 0x1FF1F8,
+        0x1FF1FF,
+    0x1FFE00, 0x1FFE07, 0x1FFE38, 0x1FFE3F, 0x1FFFC0, 0x1FFFC7, 0x1FFFF8,
+        0x1FFFFF,
+    0xE00000, 0xE00007, 0xE00038, 0xE0003F, 0xE001C0, 0xE001C7, 0xE001F8,
+        0xE001FF,
+    0xE00E00, 0xE00E07, 0xE00E38, 0xE00E3F, 0xE00FC0, 0xE00FC7, 0xE00FF8,
+        0xE00FFF,
+    0xE07000, 0xE07007, 0xE07038, 0xE0703F, 0xE071C0, 0xE071C7, 0xE071F8,
+        0xE071FF,
+    0xE07E00, 0xE07E07, 0xE07E38, 0xE07E3F, 0xE07FC0, 0xE07FC7, 0xE07FF8,
+        0xE07FFF,
+    0xE38000, 0xE38007, 0xE38038, 0xE3803F, 0xE381C0, 0xE381C7, 0xE381F8,
+        0xE381FF,
+    0xE38E00, 0xE38E07, 0xE38E38, 0xE38E3F, 0xE38FC0, 0xE38FC7, 0xE38FF8,
+        0xE38FFF,
+    0xE3F000, 0xE3F007, 0xE3F038, 0xE3F03F, 0xE3F1C0, 0xE3F1C7, 0xE3F1F8,
+        0xE3F1FF,
+    0xE3FE00, 0xE3FE07, 0xE3FE38, 0xE3FE3F, 0xE3FFC0, 0xE3FFC7, 0xE3FFF8,
+        0xE3FFFF,
+    0xFC0000, 0xFC0007, 0xFC0038, 0xFC003F, 0xFC01C0, 0xFC01C7, 0xFC01F8,
+        0xFC01FF,
+    0xFC0E00, 0xFC0E07, 0xFC0E38, 0xFC0E3F, 0xFC0FC0, 0xFC0FC7, 0xFC0FF8,
+        0xFC0FFF,
+    0xFC7000, 0xFC7007, 0xFC7038, 0xFC703F, 0xFC71C0, 0xFC71C7, 0xFC71F8,
+        0xFC71FF,
+    0xFC7E00, 0xFC7E07, 0xFC7E38, 0xFC7E3F, 0xFC7FC0, 0xFC7FC7, 0xFC7FF8,
+        0xFC7FFF,
+    0xFF8000, 0xFF8007, 0xFF8038, 0xFF803F, 0xFF81C0, 0xFF81C7, 0xFF81F8,
+        0xFF81FF,
+    0xFF8E00, 0xFF8E07, 0xFF8E38, 0xFF8E3F, 0xFF8FC0, 0xFF8FC7, 0xFF8FF8,
+        0xFF8FFF,
+    0xFFF000, 0xFFF007, 0xFFF038, 0xFFF03F, 0xFFF1C0, 0xFFF1C7, 0xFFF1F8,
+        0xFFF1FF,
+    0xFFFE00, 0xFFFE07, 0xFFFE38, 0xFFFE3F, 0xFFFFC0, 0xFFFFC7, 0xFFFFF8,
+        0xFFFFFF
 };
 
 /*
@@ -53,38 +84,69 @@ unsigned int byte_expand3[256] =
  * byte.
  */
 
-unsigned int byte_reversed_expand3[256] =
-{
-    0x000000, 0x0000E0, 0x00001C, 0x0000FC, 0x008003, 0x0080E3, 0x00801F, 0x0080FF,
-    0x007000, 0x0070E0, 0x00701C, 0x0070FC, 0x00F003, 0x00F0E3, 0x00F01F, 0x00F0FF,
-    0x000E00, 0x000EE0, 0x000E1C, 0x000EFC, 0x008E03, 0x008EE3, 0x008E1F, 0x008EFF,
-    0x007E00, 0x007EE0, 0x007E1C, 0x007EFC, 0x00FE03, 0x00FEE3, 0x00FE1F, 0x00FEFF,
-    0xC00100, 0xC001E0, 0xC0011C, 0xC001FC, 0xC08103, 0xC081E3, 0xC0811F, 0xC081FF,
-    0xC07100, 0xC071E0, 0xC0711C, 0xC071FC, 0xC0F103, 0xC0F1E3, 0xC0F11F, 0xC0F1FF,
-    0xC00F00, 0xC00FE0, 0xC00F1C, 0xC00FFC, 0xC08F03, 0xC08FE3, 0xC08F1F, 0xC08FFF,
-    0xC07F00, 0xC07FE0, 0xC07F1C, 0xC07FFC, 0xC0FF03, 0xC0FFE3, 0xC0FF1F, 0xC0FFFF,
-    0x380000, 0x3800E0, 0x38001C, 0x3800FC, 0x388003, 0x3880E3, 0x38801F, 0x3880FF,
-    0x387000, 0x3870E0, 0x38701C, 0x3870FC, 0x38F003, 0x38F0E3, 0x38F01F, 0x38F0FF,
-    0x380E00, 0x380EE0, 0x380E1C, 0x380EFC, 0x388E03, 0x388EE3, 0x388E1F, 0x388EFF,
-    0x387E00, 0x387EE0, 0x387E1C, 0x387EFC, 0x38FE03, 0x38FEE3, 0x38FE1F, 0x38FEFF,
-    0xF80100, 0xF801E0, 0xF8011C, 0xF801FC, 0xF88103, 0xF881E3, 0xF8811F, 0xF881FF,
-    0xF87100, 0xF871E0, 0xF8711C, 0xF871FC, 0xF8F103, 0xF8F1E3, 0xF8F11F, 0xF8F1FF,
-    0xF80F00, 0xF80FE0, 0xF80F1C, 0xF80FFC, 0xF88F03, 0xF88FE3, 0xF88F1F, 0xF88FFF,
-    0xF87F00, 0xF87FE0, 0xF87F1C, 0xF87FFC, 0xF8FF03, 0xF8FFE3, 0xF8FF1F, 0xF8FFFF,
-    0x070000, 0x0700E0, 0x07001C, 0x0700FC, 0x078003, 0x0780E3, 0x07801F, 0x0780FF,
-    0x077000, 0x0770E0, 0x07701C, 0x0770FC, 0x07F003, 0x07F0E3, 0x07F01F, 0x07F0FF,
-    0x070E00, 0x070EE0, 0x070E1C, 0x070EFC, 0x078E03, 0x078EE3, 0x078E1F, 0x078EFF,
-    0x077E00, 0x077EE0, 0x077E1C, 0x077EFC, 0x07FE03, 0x07FEE3, 0x07FE1F, 0x07FEFF,
-    0xC70100, 0xC701E0, 0xC7011C, 0xC701FC, 0xC78103, 0xC781E3, 0xC7811F, 0xC781FF,
-    0xC77100, 0xC771E0, 0xC7711C, 0xC771FC, 0xC7F103, 0xC7F1E3, 0xC7F11F, 0xC7F1FF,
-    0xC70F00, 0xC70FE0, 0xC70F1C, 0xC70FFC, 0xC78F03, 0xC78FE3, 0xC78F1F, 0xC78FFF,
-    0xC77F00, 0xC77FE0, 0xC77F1C, 0xC77FFC, 0xC7FF03, 0xC7FFE3, 0xC7FF1F, 0xC7FFFF,
-    0x3F0000, 0x3F00E0, 0x3F001C, 0x3F00FC, 0x3F8003, 0x3F80E3, 0x3F801F, 0x3F80FF,
-    0x3F7000, 0x3F70E0, 0x3F701C, 0x3F70FC, 0x3FF003, 0x3FF0E3, 0x3FF01F, 0x3FF0FF,
-    0x3F0E00, 0x3F0EE0, 0x3F0E1C, 0x3F0EFC, 0x3F8E03, 0x3F8EE3, 0x3F8E1F, 0x3F8EFF,
-    0x3F7E00, 0x3F7EE0, 0x3F7E1C, 0x3F7EFC, 0x3FFE03, 0x3FFEE3, 0x3FFE1F, 0x3FFEFF,
-    0xFF0100, 0xFF01E0, 0xFF011C, 0xFF01FC, 0xFF8103, 0xFF81E3, 0xFF811F, 0xFF81FF,
-    0xFF7100, 0xFF71E0, 0xFF711C, 0xFF71FC, 0xFFF103, 0xFFF1E3, 0xFFF11F, 0xFFF1FF,
-    0xFF0F00, 0xFF0FE0, 0xFF0F1C, 0xFF0FFC, 0xFF8F03, 0xFF8FE3, 0xFF8F1F, 0xFF8FFF,
-    0xFF7F00, 0xFF7FE0, 0xFF7F1C, 0xFF7FFC, 0xFFFF03, 0xFFFFE3, 0xFFFF1F, 0xFFFFFF, 
+unsigned int byte_reversed_expand3[256] = {
+    0x000000, 0x0000E0, 0x00001C, 0x0000FC, 0x008003, 0x0080E3, 0x00801F,
+        0x0080FF,
+    0x007000, 0x0070E0, 0x00701C, 0x0070FC, 0x00F003, 0x00F0E3, 0x00F01F,
+        0x00F0FF,
+    0x000E00, 0x000EE0, 0x000E1C, 0x000EFC, 0x008E03, 0x008EE3, 0x008E1F,
+        0x008EFF,
+    0x007E00, 0x007EE0, 0x007E1C, 0x007EFC, 0x00FE03, 0x00FEE3, 0x00FE1F,
+        0x00FEFF,
+    0xC00100, 0xC001E0, 0xC0011C, 0xC001FC, 0xC08103, 0xC081E3, 0xC0811F,
+        0xC081FF,
+    0xC07100, 0xC071E0, 0xC0711C, 0xC071FC, 0xC0F103, 0xC0F1E3, 0xC0F11F,
+        0xC0F1FF,
+    0xC00F00, 0xC00FE0, 0xC00F1C, 0xC00FFC, 0xC08F03, 0xC08FE3, 0xC08F1F,
+        0xC08FFF,
+    0xC07F00, 0xC07FE0, 0xC07F1C, 0xC07FFC, 0xC0FF03, 0xC0FFE3, 0xC0FF1F,
+        0xC0FFFF,
+    0x380000, 0x3800E0, 0x38001C, 0x3800FC, 0x388003, 0x3880E3, 0x38801F,
+        0x3880FF,
+    0x387000, 0x3870E0, 0x38701C, 0x3870FC, 0x38F003, 0x38F0E3, 0x38F01F,
+        0x38F0FF,
+    0x380E00, 0x380EE0, 0x380E1C, 0x380EFC, 0x388E03, 0x388EE3, 0x388E1F,
+        0x388EFF,
+    0x387E00, 0x387EE0, 0x387E1C, 0x387EFC, 0x38FE03, 0x38FEE3, 0x38FE1F,
+        0x38FEFF,
+    0xF80100, 0xF801E0, 0xF8011C, 0xF801FC, 0xF88103, 0xF881E3, 0xF8811F,
+        0xF881FF,
+    0xF87100, 0xF871E0, 0xF8711C, 0xF871FC, 0xF8F103, 0xF8F1E3, 0xF8F11F,
+        0xF8F1FF,
+    0xF80F00, 0xF80FE0, 0xF80F1C, 0xF80FFC, 0xF88F03, 0xF88FE3, 0xF88F1F,
+        0xF88FFF,
+    0xF87F00, 0xF87FE0, 0xF87F1C, 0xF87FFC, 0xF8FF03, 0xF8FFE3, 0xF8FF1F,
+        0xF8FFFF,
+    0x070000, 0x0700E0, 0x07001C, 0x0700FC, 0x078003, 0x0780E3, 0x07801F,
+        0x0780FF,
+    0x077000, 0x0770E0, 0x07701C, 0x0770FC, 0x07F003, 0x07F0E3, 0x07F01F,
+        0x07F0FF,
+    0x070E00, 0x070EE0, 0x070E1C, 0x070EFC, 0x078E03, 0x078EE3, 0x078E1F,
+        0x078EFF,
+    0x077E00, 0x077EE0, 0x077E1C, 0x077EFC, 0x07FE03, 0x07FEE3, 0x07FE1F,
+        0x07FEFF,
+    0xC70100, 0xC701E0, 0xC7011C, 0xC701FC, 0xC78103, 0xC781E3, 0xC7811F,
+        0xC781FF,
+    0xC77100, 0xC771E0, 0xC7711C, 0xC771FC, 0xC7F103, 0xC7F1E3, 0xC7F11F,
+        0xC7F1FF,
+    0xC70F00, 0xC70FE0, 0xC70F1C, 0xC70FFC, 0xC78F03, 0xC78FE3, 0xC78F1F,
+        0xC78FFF,
+    0xC77F00, 0xC77FE0, 0xC77F1C, 0xC77FFC, 0xC7FF03, 0xC7FFE3, 0xC7FF1F,
+        0xC7FFFF,
+    0x3F0000, 0x3F00E0, 0x3F001C, 0x3F00FC, 0x3F8003, 0x3F80E3, 0x3F801F,
+        0x3F80FF,
+    0x3F7000, 0x3F70E0, 0x3F701C, 0x3F70FC, 0x3FF003, 0x3FF0E3, 0x3FF01F,
+        0x3FF0FF,
+    0x3F0E00, 0x3F0EE0, 0x3F0E1C, 0x3F0EFC, 0x3F8E03, 0x3F8EE3, 0x3F8E1F,
+        0x3F8EFF,
+    0x3F7E00, 0x3F7EE0, 0x3F7E1C, 0x3F7EFC, 0x3FFE03, 0x3FFEE3, 0x3FFE1F,
+        0x3FFEFF,
+    0xFF0100, 0xFF01E0, 0xFF011C, 0xFF01FC, 0xFF8103, 0xFF81E3, 0xFF811F,
+        0xFF81FF,
+    0xFF7100, 0xFF71E0, 0xFF711C, 0xFF71FC, 0xFFF103, 0xFFF1E3, 0xFFF11F,
+        0xFFF1FF,
+    0xFF0F00, 0xFF0FE0, 0xFF0F1C, 0xFF0FFC, 0xFF8F03, 0xFF8FE3, 0xFF8F1F,
+        0xFF8FFF,
+    0xFF7F00, 0xFF7FE0, 0xFF7F1C, 0xFF7FFC, 0xFFFF03, 0xFFFFE3, 0xFFFF1F,
+        0xFFFFFF,
 };
diff --git a/xorg-server/hw/xfree86/xaa/xaaWideLine.c b/xorg-server/hw/xfree86/xaa/xaaWideLine.c
index f73e04f17..b8a53c1c8 100644
--- a/xorg-server/hw/xfree86/xaa/xaaWideLine.c
+++ b/xorg-server/hw/xfree86/xaa/xaaWideLine.c
@@ -1,921 +1,924 @@
-/*

-

-XAAPolylinesWideSolid does not maintain a span list and subsequently does

-not follow the "touch-each-pixel-once" rules for wide lines and arcs.

-This means it can only be used in the case where we have

-miSpansEasyRop(pGC->alu).  Since we clip spans on the fly, we

-limited usage of this function to one rect situations. This

-function is used only for solid lines. 

-

-  Adapted from miWideLine by Mark Vojkovich (mvojkovi@ucsd.edu)

-Original mi code written by Keith Packard.

-

-*/

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <math.h>

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "windowstr.h"

-#include "gcstruct.h"

-#include "regionstr.h"

-#include "miwideline.h"

-#include "mi.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-

-#define DRAW_POINT(pScrn, x, y) \

-  if(hardClip) (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, 1, 1); \

-  else XAAPointHelper(pScrn, x, y)

-

-#define FILL_RECT(pScrn, x, y, w, h) \

-  if(hardClip) (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h); \

-  else XAAFillRectHelper(pScrn, x, y, w, h)

-

-#define FILL_SPAN(pScrn, x, y, w) \

-  if(hardClip) (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, 1); \

-  else XAASpanHelper(pScrn, x, y, w)

-

-

-#define CLIPSTEPEDGE(edgey,edge,edgeleft) \

-    if (ybase == edgey) { \

-	if (edgeleft) { \

-	    if (edge->x > xcl) \

-		xcl = edge->x; \

-	} else { \

-	    if (edge->x < xcr) \

-		xcr = edge->x; \

-	} \

-	edgey++; \

-	edge->x += edge->stepx; \

-	edge->e += edge->dx; \

-	if (edge->e > 0) { \

-	    edge->x += edge->signdx; \

-	    edge->e -= edge->dy; \

-	} \

-    }

-

-static void 

-XAAPointHelper(ScrnInfoPtr pScrn, int x, int y)

-{

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-   BoxPtr extents = infoRec->ClipBox;

-

-   if((x >= extents->x1) && (x < extents->x2) &&

-	(y >= extents->y1) && (y < extents->y2))

-	(*infoRec->SubsequentSolidFillRect)(pScrn, x, y, 1, 1);

-}

-

-static void 

-XAAFillRectHelper(ScrnInfoPtr pScrn, int x1, int y1, int dx, int dy)

-{

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-   BoxPtr extents = infoRec->ClipBox;

-   int x2 = x1 + dx;

-   int y2 = y1 + dy;

-	

-   if(x1 < extents->x1) x1 = extents->x1;

-   if(x2 >= extents->x2) x2 = extents->x2;

-   if((dx = x2 - x1)<1) return;

-   if(y1 < extents->y1) y1 = extents->y1;

-   if(y2 >= extents->y2) y2 = extents->y2;

-   if((dy = y2 - y1)<1) return;

-

-   (*infoRec->SubsequentSolidFillRect)(pScrn, x1, y1, dx, dy);

-}

-

-

-static void 

-XAASpanHelper(ScrnInfoPtr pScrn, int x1, int y, int width)

-{

-   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

-   BoxPtr extents = infoRec->ClipBox;

-    int x2;

-

-    if((y < extents->y1) || (y >= extents->y2)) return;

-

-    x2 = x1 + width;

-    if(x1 < extents->x1) x1 = extents->x1;

-    if(x2 > extents->x2) x2 = extents->x2;

-    width = x2 - x1;	

-

-    if(width > 0)	

- 	(*infoRec->SubsequentSolidFillRect)(pScrn, x1, y, width, 1);

-

-}

-

-#define FixError(x, dx, dy, e, sign, step, h)	{	\

-	   e += (h) * dx;				\

-	   x += (h) * step;				\

-	   if(e > 0) {					\

-		x += e * sign/dy;			\

-		e %= dy;				\

-	   	if(e) {					\

-		   x += sign;				\

-		   e -= dy;				\

-		}					\

-	   } 	 					\

-}

-

-

-static void

-XAAFillPolyHelper (

-    GCPtr	pGC,

-    int		y,			/* start y coordinate */

-    int		overall_height,		/* height of entire segment */

-    PolyEdgePtr	left, PolyEdgePtr right,

-    int	left_count, int right_count )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    BoxPtr extents = infoRec->ClipBox;

-    int left_x, left_e, left_stepx, left_signdx, left_dy, left_dx;

-    int right_x, right_e, right_stepx, right_signdx, right_dy, right_dx;

-    int	height, left_height, right_height;

-    int	xorg;

-    Bool hardClip;

-

-    if((y >= extents->y2) || ((y + overall_height) <= extents->y1))

-	return;

-

-    /* Muffle compiler */

-    left_x = left_e = left_stepx = left_signdx = left_dy = left_dx = 0;

-    right_x = right_e = right_stepx = right_signdx = right_dy = right_dx = 0;

-

-    left_height = right_height = 0;

-    xorg = 0;

-

-    hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);

-    

-    while ((left_count || left_height) && (right_count || right_height)) {

-  	if (!left_height && left_count) { 

-	    left_height = left->height; 

-	    left_x = left->x + xorg; 

-	    left_stepx = left->stepx; 

-	    left_signdx = left->signdx; 

-	    left_e = left->e; 

-	    left_dy = left->dy; 

-	    left_dx = left->dx; 

-	    left_count--; 

-	    left++;

-	}

-	if (!right_height && right_count) { 

-	    right_height = right->height; 

-	    right_x = right->x + xorg + 1; 

-	    right_stepx = right->stepx; 

-	    right_signdx = right->signdx; 

-	    right_e = right->e; 

-	    right_dy = right->dy; 

-	    right_dx = right->dx; 

-	    right_count--; 

-	    right++; 

-	}

-

-	height = (left_height > right_height) ? right_height : left_height;

-

-	left_height -= height;

-	right_height -= height;

-

-	if(hardClip && infoRec->SubsequentSolidFillTrap && (height > 6)) {

-	    int right_DX, left_DX;

-

-    	    right_DX = (right_dx * right_signdx) + (right_stepx * right_dy);

-	    left_DX = (left_dx * left_signdx) + (left_stepx * left_dy);

-

-	    (*infoRec->SubsequentSolidFillTrap)(infoRec->pScrn, y, height, 

-			left_x, left_DX, left_dy, left_e, 

-			right_x - 1, right_DX, right_dy, right_e);

-

-	    FixError(left_x, left_dx, left_dy, left_e, left_signdx, 

-			left_stepx, height);

-	    FixError(right_x, right_dx, right_dy, right_e, right_signdx,

-			right_stepx, height);

-	    y += height;

-	    continue;

-	}

-

-	while (height--) {

-	    if(right_x > left_x) {

-		FILL_SPAN(infoRec->pScrn, left_x, y, right_x - left_x);

-	    }

-    	    y++;

-    	

- 	    left_x += left_stepx; 

-	    left_e += left_dx; 

-	    if (left_e > 0) { 

-		left_x += left_signdx; 

-		left_e -= left_dy; 

-	    }

-	    right_x += right_stepx; 

-	    right_e += right_dx; 

-	    if (right_e > 0) { 

-		right_x += right_signdx; 

-		right_e -= right_dy; 

-	    }

-

-	}

-    }

-}

-

-

-

-static void

-XAAWideSegment (

-    GCPtr pGC,

-    int  x1, int y1, int x2, int y2,

-    Bool projectLeft, Bool projectRight,

-    LineFacePtr leftFace, LineFacePtr rightFace )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    double	l, L, r;

-    double	xa, ya;

-    double	projectXoff, projectYoff;

-    double	k;

-    double	maxy;

-    int		x, y;

-    int		dx, dy;

-    int		finaly;

-    PolyEdgePtr left, right;

-    PolyEdgePtr	top, bottom;

-    int		lefty, righty, topy, bottomy;

-    int		signdx;

-    PolyEdgeRec	lefts[2], rights[2];

-    LineFacePtr	tface;

-    int		lw = pGC->lineWidth;

-    Bool	hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);

-

-    /* draw top-to-bottom always */

-    if ((y2 < y1) || ((y2 == y1) && (x2 < x1))) {

-	x = x1;

-	x1 = x2;

-	x2 = x;

-

-	y = y1;

-	y1 = y2;

-	y2 = y;

-

-	x = projectLeft;

-	projectLeft = projectRight;

-	projectRight = x;

-

-	tface = leftFace;

-	leftFace = rightFace;

-	rightFace = tface;

-    }

-

-    dy = y2 - y1;

-    signdx = 1;

-    dx = x2 - x1;

-    if (dx < 0)

-	signdx = -1;

-

-    leftFace->x = x1;

-    leftFace->y = y1;

-    leftFace->dx = dx;

-    leftFace->dy = dy;

-

-    rightFace->x = x2;

-    rightFace->y = y2;

-    rightFace->dx = -dx;

-    rightFace->dy = -dy;

-

-    if (!dy) {

-	rightFace->xa = 0;

-	rightFace->ya = (double) lw / 2.0;

-	rightFace->k = -(double) (lw * dx) / 2.0;

-	leftFace->xa = 0;

-	leftFace->ya = -rightFace->ya;

-	leftFace->k = rightFace->k;

-	x = x1;

-	if (projectLeft)

-	    x -= (lw >> 1);

-	y = y1 - (lw >> 1);

-	dx = x2 - x;

-	if (projectRight)

-	    dx += ((lw + 1) >> 1);

-	dy = lw;

-	FILL_RECT(infoRec->pScrn, x, y, dx, dy);	

-    } else if (!dx) {

-	leftFace->xa =  (double) lw / 2.0;

-	leftFace->ya = 0;

-	leftFace->k = (double) (lw * dy) / 2.0;

-	rightFace->xa = -leftFace->xa;

-	rightFace->ya = 0;

-	rightFace->k = leftFace->k;

-	y = y1;

-	if (projectLeft)

-	    y -= lw >> 1;

-	x = x1 - (lw >> 1);

-	dy = y2 - y;

-	if (projectRight)

-	    dy += ((lw + 1) >> 1);

-	dx = lw;

- 	FILL_RECT(infoRec->pScrn, x, y, dx, dy);

-    } else {

-    	l = ((double) lw) / 2.0;

-    	L = sqrt((double)(dx*dx + dy*dy));

-

-	if (dx < 0) {

-	    right = &rights[1];

-	    left = &lefts[0];

-	    top = &rights[0];

-	    bottom = &lefts[1];

-	} else {

-	    right = &rights[0];

-	    left = &lefts[1];

-	    top = &lefts[0];

-	    bottom = &rights[1];

-	}

-	r = l / L;

-

-	/* coord of upper bound at integral y */

-	ya = -r * dx;

-	xa = r * dy;

-

-	projectXoff = -ya;

-	projectYoff = xa;

-

-    	/* xa * dy - ya * dx */

-	k = l * L;

-

-	leftFace->xa = xa;

-	leftFace->ya = ya;

-	leftFace->k = k;

-	rightFace->xa = -xa;

-	rightFace->ya = -ya;

-	rightFace->k = k;

-

-	if (projectLeft)

-	    righty = miPolyBuildEdge (xa - projectXoff, ya - projectYoff,

-				      k, dx, dy, x1, y1, 0, right);

-	else

-	    righty = miPolyBuildEdge (xa, ya,

-				      k, dx, dy, x1, y1, 0, right);

-

-	/* coord of lower bound at integral y */

-	ya = -ya;

-	xa = -xa;

-

-	/* xa * dy - ya * dx */

-	k = - k;

-

-	if (projectLeft)

-	    lefty = miPolyBuildEdge (xa - projectXoff, ya - projectYoff,

-				     k, dx, dy, x1, y1, 1, left);

-	else

-	    lefty = miPolyBuildEdge (xa, ya,

-				     k, dx, dy, x1, y1, 1, left);

-

-	/* coord of top face at integral y */

-

-	if (signdx > 0) {

-	    ya = -ya;

-	    xa = -xa;

-	}

-

-	if (projectLeft) {

-	    double xap = xa - projectXoff;

-	    double yap = ya - projectYoff;

-	    topy = miPolyBuildEdge (xap, yap, xap * dx + yap * dy,

-				    -dy, dx, x1, y1, dx > 0, top);

-	}

-	else

-	    topy = miPolyBuildEdge(xa, ya, 0.0, 

-					-dy, dx, x1, y1, dx > 0, top);

-

-		/* coord of bottom face at integral y */

-

-	if (projectRight) {

-	    double xap = xa + projectXoff;

-	    double yap = ya + projectYoff;

-	    bottomy = miPolyBuildEdge (xap, yap, xap * dx + yap * dy,

-				       -dy, dx, x2, y2, dx < 0, bottom);

-	    maxy = -ya + projectYoff;

-	} else {

-	    bottomy = miPolyBuildEdge (xa, ya, 0.0,

-					-dy, dx, x2, y2, dx < 0, bottom);

-	    maxy = -ya;

-	}

-

-	finaly = ICEIL (maxy) + y2;

-

-	if (dx < 0) {

-	    left->height = bottomy - lefty;

-	    right->height = finaly - righty;

-	    top->height = righty - topy;

-	} else {

-	    right->height =  bottomy - righty;

-	    left->height = finaly - lefty;

-	    top->height = lefty - topy;

-	}

-	bottom->height = finaly - bottomy;

-	XAAFillPolyHelper (pGC, topy, 

-		bottom->height + bottomy - topy, lefts, rights, 2, 2);

-    }

-}

-

-

-static void

-XAALineArcI (GCPtr pGC, int xorg, int yorg)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    int x, y, e, ex;

-    int slw = pGC->lineWidth;

-    Bool hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);

-

-    y = (slw >> 1) + 1;

-    if (slw & 1)

-	e = - ((y << 2) + 3);

-    else

-	e = - (y << 3);

-    ex = -4;

-    x = 0;

-    while (y) {

-	e += (y << 3) - 4;

-	while (e >= 0) {

-	    x++;

-	    e += (ex = -((x << 3) + 4));

-	}

-	y--;

-	slw = (x << 1) + 1;

-	if ((e == ex) && (slw > 1))

-	    slw--;

-	    

-	FILL_SPAN(infoRec->pScrn, xorg - x, yorg - y, slw);

-

-	if ((y != 0) && ((slw > 1) || (e != ex))) {	

-	    FILL_SPAN(infoRec->pScrn, xorg - x, yorg + y, slw);

-	}

-    }

-}

-

-

-static void

-XAALineArcD (

-    GCPtr	    pGC,

-    double	    xorg,

-    double	    yorg,

-    PolyEdgePtr	    edge1, 

-    int		    edgey1,

-    Bool	    edgeleft1,

-    PolyEdgePtr	    edge2,

-    int		    edgey2,

-    Bool	    edgeleft2 )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    double radius, x0, y0, el, er, yk, xlk, xrk, k;

-    int xbase, ybase, y, boty, xl, xr, xcl, xcr;

-    int ymin, ymax;

-    Bool edge1IsMin, edge2IsMin;

-    int ymin1, ymin2;

-    Bool hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);

-

-

-    xbase = floor(xorg);

-    x0 = xorg - xbase;

-    ybase = ICEIL (yorg);

-    y0 = yorg - ybase;

-

-    xlk = x0 + x0 + 1.0;

-    xrk = x0 + x0 - 1.0;

-    yk = y0 + y0 - 1.0;

-    radius = ((double)pGC->lineWidth) / 2.0;

-    y = floor(radius - y0 + 1.0);

-    ybase -= y;

-    ymin = ybase;

-    ymax = 65536;

-    edge1IsMin = FALSE;

-    ymin1 = edgey1;

-    if (edge1->dy >= 0) {

-    	if (!edge1->dy) {

-	    if (edgeleft1)

-	    	edge1IsMin = TRUE;

-	    else

-	    	ymax = edgey1;

-	    edgey1 = 65536;

-    	} else if ((edge1->signdx < 0) == edgeleft1)

-	    	edge1IsMin = TRUE;

-    }

-    edge2IsMin = FALSE;

-    ymin2 = edgey2;

-    if (edge2->dy >= 0) {

-    	if (!edge2->dy) {

-	    if (edgeleft2)

-	    	edge2IsMin = TRUE;

-	    else

-	    	ymax = edgey2;

-	    edgey2 = 65536;

-    	} else if ((edge2->signdx < 0) == edgeleft2)

-	    	edge2IsMin = TRUE;

-    }

-    if (edge1IsMin) {

-	ymin = ymin1;

-	if (edge2IsMin && (ymin1 > ymin2))

-	    ymin = ymin2;

-    } else if (edge2IsMin)

-	ymin = ymin2;

-    el = radius * radius - ((y + y0) * (y + y0)) - (x0 * x0);

-    er = el + xrk;

-    xl = 1;

-    xr = 0;

-    if (x0 < 0.5) {

-	xl = 0;

-	el -= xlk;

-    }

-    boty = (y0 < -0.5) ? 1 : 0;

-    if (ybase + y - boty > ymax)

-	boty = ymax - ybase - y;

-    while (y > boty) {

-	k = (y << 1) + yk;

-	er += k;

-	while (er > 0.0) {

-	    xr++;

-	    er += xrk - (xr << 1);

-	}

-	el += k;

-	while (el >= 0.0) {

-	    xl--;

-	    el += (xl << 1) - xlk;

-	}

-	y--;

-	ybase++;

-	if (ybase < ymin)

-	    continue;

-	xcl = xl + xbase;

-	xcr = xr + xbase;

-	CLIPSTEPEDGE(edgey1, edge1, edgeleft1);

-	CLIPSTEPEDGE(edgey2, edge2, edgeleft2);

-	if(xcr >= xcl) {

-	    FILL_SPAN(infoRec->pScrn, xcl, ybase, xcr - xcl + 1);

-	}

-    }

-    er = xrk - (xr << 1) - er;

-    el = (xl << 1) - xlk - el;

-    boty = floor(-y0 - radius + 1.0);

-    if (ybase + y - boty > ymax)

-	boty = ymax - ybase - y;

-    while (y > boty) {

-	k = (y << 1) + yk;

-	er -= k;

-	while ((er >= 0.0) && (xr >= 0)) {

-	    xr--;

-	    er += xrk - (xr << 1);

-	}

-	el -= k;

-	while ((el > 0.0) && (xl <= 0)) {

-	    xl++;

-	    el += (xl << 1) - xlk;

-	}

-	y--;

-	ybase++;

-	if (ybase < ymin)

-	    continue;

-	xcl = xl + xbase;

-	xcr = xr + xbase;

-	CLIPSTEPEDGE(edgey1, edge1, edgeleft1);

-	CLIPSTEPEDGE(edgey2, edge2, edgeleft2);

-	if(xcr >= xcl) {

-	    FILL_SPAN(infoRec->pScrn, xcl, ybase, xcr - xcl + 1);

-	}

-    }

-}

-

-

-static void

-XAALineArc (

-    GCPtr  pGC,

-    LineFacePtr leftFace,

-    LineFacePtr rightFace,

-    double	xorg,

-    double	yorg,

-    Bool	isInt )

-{

-    int xorgi, yorgi;

-    PolyEdgeRec	edge1, edge2;

-    int		edgey1, edgey2;

-    Bool	edgeleft1, edgeleft2;

-

-    if (isInt) {

-	xorgi = leftFace ? leftFace->x : rightFace->x;

-	yorgi = leftFace ? leftFace->y : rightFace->y;

-    } else {	/* Muffle compiler */

-        xorgi = yorgi = 0;

-    }

-    edgey1 = 65536;

-    edgey2 = 65536;

-    edge1.x = 0; /* not used, keep memory checkers happy */

-    edge1.dy = -1;

-    edge2.x = 0; /* not used, keep memory checkers happy */

-    edge2.dy = -1;

-    edgeleft1 = FALSE;

-    edgeleft2 = FALSE;

-

-    if ((pGC->lineWidth > 2) &&

-	((pGC->capStyle == CapRound && pGC->joinStyle != JoinRound) ||

-	 (pGC->joinStyle == JoinRound && pGC->capStyle == CapButt))) {

-	if (isInt) {

-	    xorg = (double) xorgi;

-	    yorg = (double) yorgi;

-	}

-

-	if (leftFace && rightFace) 

-	    miRoundJoinClip (leftFace, rightFace, &edge1, &edge2,

-			     &edgey1, &edgey2, &edgeleft1, &edgeleft2);

-	else if (leftFace)

-	    edgey1 = miRoundCapClip (leftFace, isInt, &edge1, &edgeleft1);

-	else if (rightFace)

-	    edgey2 = miRoundCapClip (rightFace, isInt, &edge2, &edgeleft2);

-

-	isInt = FALSE;

-    }

-

-    if (isInt) {

-	if(pGC->lineWidth == 1) {

-	    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-	    Bool hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);

-	    DRAW_POINT(infoRec->pScrn, xorgi, yorgi);

-	} else

-	    XAALineArcI(pGC, xorgi, yorgi);

-    } else

-	XAALineArcD(pGC, xorg, yorg, &edge1, edgey1, edgeleft1,

-		       &edge2, edgey2, edgeleft2);

-

-}

-

-

-static void

-XAALineJoin (

-    GCPtr	    pGC,

-    LineFacePtr     pLeft,

-    LineFacePtr     pRight )

-{

-    double	    mx = 0, my = 0;

-    double	    denom = 0;

-    PolyVertexRec   vertices[4];

-    PolySlopeRec    slopes[4];

-    int		    edgecount;

-    PolyEdgeRec	    left[4], right[4];

-    int		    nleft, nright;

-    int		    y, height;

-    int		    swapslopes;

-    int		    joinStyle = pGC->joinStyle;

-    int		    lw = pGC->lineWidth;

-

-    if (lw == 1) {

-	/* Lines going in the same direction have no join */

-	if ((pLeft->dx >= 0) == (pRight->dx <= 0))

-	    return;

-	if (joinStyle != JoinRound) {

-    	    denom = - pLeft->dx * (double)pRight->dy + pRight->dx *

- 					(double)pLeft->dy;

-    	    if (denom == 0.0)

-	    	return;	/* no join to draw */

-	}

-	if (joinStyle != JoinMiter) {

-	    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-	    Bool hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);

-	    DRAW_POINT(infoRec->pScrn, pLeft->x, pLeft->y);	

-	    return;

-	}

-    } else {

-    	if (joinStyle == JoinRound) {

-	    XAALineArc(pGC, pLeft, pRight,(double)0.0, (double)0.0, TRUE);

-	    return;

-    	}

-    	denom = - pLeft->dx * (double)pRight->dy + pRight->dx * 

-				(double)pLeft->dy;

-    	if (denom == 0.0)

-	    return;	/* no join to draw */

-    }

-

-    swapslopes = 0;

-    if (denom > 0) {

-	pLeft->xa = -pLeft->xa;

-	pLeft->ya = -pLeft->ya;

-	pLeft->dx = -pLeft->dx;

-	pLeft->dy = -pLeft->dy;

-    } else {

-	swapslopes = 1;

-	pRight->xa = -pRight->xa;

-	pRight->ya = -pRight->ya;

-	pRight->dx = -pRight->dx;

-	pRight->dy = -pRight->dy;

-    }

-

-    vertices[0].x = pRight->xa;

-    vertices[0].y = pRight->ya;

-    slopes[0].dx = -pRight->dy;

-    slopes[0].dy =  pRight->dx;

-    slopes[0].k = 0;

-

-    vertices[1].x = 0;

-    vertices[1].y = 0;

-    slopes[1].dx =  pLeft->dy;

-    slopes[1].dy = -pLeft->dx;

-    slopes[1].k = 0;

-

-    vertices[2].x = pLeft->xa;

-    vertices[2].y = pLeft->ya;

-

-    if (joinStyle == JoinMiter) {

-    	my = (pLeft->dy  * (pRight->xa * pRight->dy - pRight->ya * pRight->dx) -

-              pRight->dy * (pLeft->xa  * pLeft->dy  - pLeft->ya  * pLeft->dx ))/

-	      denom;

-    	if (pLeft->dy != 0) 

-	    mx = pLeft->xa + (my - pLeft->ya) *

-			    (double) pLeft->dx / (double) pLeft->dy;

-    	else

-	    mx = pRight->xa + (my - pRight->ya) *

-			    (double) pRight->dx / (double) pRight->dy;

-    	

-	/* check miter limit */

-	if ((mx * mx + my * my) * 4 > SQSECANT * lw * lw)

-	    joinStyle = JoinBevel;

-    }

-

-    if (joinStyle == JoinMiter) {

-	slopes[2].dx = pLeft->dx;

-	slopes[2].dy = pLeft->dy;

-	slopes[2].k =  pLeft->k;

-	if (swapslopes) {

-	    slopes[2].dx = -slopes[2].dx;

-	    slopes[2].dy = -slopes[2].dy;

-	    slopes[2].k  = -slopes[2].k;

-	}

-	vertices[3].x = mx;

-	vertices[3].y = my;

-	slopes[3].dx = pRight->dx;

-	slopes[3].dy = pRight->dy;

-	slopes[3].k  = pRight->k;

-	if (swapslopes) {

-	    slopes[3].dx = -slopes[3].dx;

-	    slopes[3].dy = -slopes[3].dy;

-	    slopes[3].k  = -slopes[3].k;

-	}

-	edgecount = 4;

-    } else {

-	double	scale, dx, dy, adx, ady;

-

-	adx = dx = pRight->xa - pLeft->xa;

-	ady = dy = pRight->ya - pLeft->ya;

-	if (adx < 0)

-	    adx = -adx;

-	if (ady < 0)

-	    ady = -ady;

-	scale = ady;

-	if (adx > ady)

-	    scale = adx;

-	slopes[2].dx = (dx * 65536) / scale;

-	slopes[2].dy = (dy * 65536) / scale;

-	slopes[2].k = ((pLeft->xa + pRight->xa) * slopes[2].dy -

-		       (pLeft->ya + pRight->ya) * slopes[2].dx) / 2.0;

-	edgecount = 3;

-    }

-

-    y = miPolyBuildPoly (vertices, slopes, edgecount, pLeft->x, pLeft->y,

-		   left, right, &nleft, &nright, &height);

-    XAAFillPolyHelper(pGC, y, height, left, right, nleft, nright);

-}

-

-

-void

-XAAPolylinesWideSolid (

-   DrawablePtr  pDrawable,

-   GCPtr        pGC,

-   int          mode,

-   int          npt,

-   DDXPointPtr  pPts )

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);

-    int		    x1, y1, x2, y2;

-    Bool	    projectLeft, projectRight;

-    LineFaceRec	    leftFace, rightFace, prevRightFace, firstFace;

-    int    	    first = TRUE;

-    Bool	    somethingDrawn = FALSE;

-    Bool	    selfJoin = FALSE;

-    int		    xorg = pDrawable->x;

-    int		    yorg = pDrawable->y;

-    Bool	    hardClip = FALSE;

-

-    if(!RegionNumRects(pGC->pCompositeClip))

-	return;

-

-    if(RegionNumRects(pGC->pCompositeClip) != 1) {

-	miWideLine(pDrawable, pGC, mode, npt, pPts);

-	return;

-    }

-

-    x2 = pPts->x;

-    y2 = pPts->y;

-    if (npt > 1) {

-    	if (mode == CoordModePrevious) {

-	    int nptTmp;

-	    register DDXPointPtr pPtsTmp;

-    

-	    x1 = x2;

-	    y1 = y2;

-	    nptTmp = npt;

-	    pPtsTmp = pPts + 1;

-	    while (--nptTmp) {

-	    	x1 += pPtsTmp->x;

-	    	y1 += pPtsTmp->y;

-	    	++pPtsTmp;

-	    }

-	    if ((x2 == x1) && (y2 == y1))

-	    	selfJoin = TRUE;

-    	} else if ((x2 == pPts[npt-1].x) && (y2 == pPts[npt-1].y)) 

-	    selfJoin = TRUE;

-    }

-

-    projectLeft = ((pGC->capStyle == CapProjecting) && !selfJoin);

-    projectRight = FALSE;

-

-    (*infoRec->SetupForSolidFill)(infoRec->pScrn, pGC->fgPixel, pGC->alu, 

-						pGC->planemask);

-

-    infoRec->ClipBox = &pGC->pCompositeClip->extents;

-

-    if(infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL) {

-	hardClip = TRUE;

-	(*infoRec->SetClippingRectangle)(infoRec->pScrn,

-              infoRec->ClipBox->x1, infoRec->ClipBox->y1, 

-              infoRec->ClipBox->x2 - 1, infoRec->ClipBox->y2 - 1);		

-    }

-

-    x2 += xorg;

-    y2 += yorg;

-    while (--npt) {

-	x1 = x2;

-	y1 = y2;

-	++pPts;

-	x2 = pPts->x;

-	y2 = pPts->y;

-	if (mode == CoordModePrevious) {

-	    x2 += x1;

-	    y2 += y1;

-	} else {

-	    x2 += xorg;

-	    y2 += yorg;

-	}

-	if ((x1 != x2) || (y1 != y2)) {

-	    somethingDrawn = TRUE;

-	    if ((npt == 1) && (pGC->capStyle == CapProjecting) && !selfJoin)

-	    	projectRight = TRUE;

-	    XAAWideSegment(pGC, x1, y1, x2, y2,

-		       	   projectLeft, projectRight, &leftFace, &rightFace);

-	    if (first) {

-	    	if (selfJoin)

-		    firstFace = leftFace;

-	    	else if (pGC->capStyle == CapRound) {

-		    if (pGC->lineWidth == 1) {

-			DRAW_POINT(infoRec->pScrn, x1, y1);

-		    } else

-		        XAALineArc(pGC,&leftFace, (LineFacePtr) NULL,

- 			       	   (double)0.0, (double)0.0,TRUE);

-		}

-	    } else 

-	    	XAALineJoin (pGC, &leftFace, &prevRightFace);

-

-	    prevRightFace = rightFace;

-	    first = FALSE;

-	    projectLeft = FALSE;

-	}

-	if (npt == 1 && somethingDrawn) {

-	    if (selfJoin)

-		XAALineJoin (pGC, &firstFace, &rightFace);

-	    else if (pGC->capStyle == CapRound) {

-		if (pGC->lineWidth == 1) {

-		    DRAW_POINT(infoRec->pScrn, x2, y2);

-		} else

-		    XAALineArc (pGC, (LineFacePtr) NULL, &rightFace,

-			       (double)0.0, (double)0.0,TRUE);

-	    }

-	}

-    }

-    /* handle crock where all points are coincedent */

-    if (!somethingDrawn) {

-	projectLeft = (pGC->capStyle == CapProjecting);

-	XAAWideSegment (pGC, x2, y2, x2, y2, projectLeft, projectLeft,

-		       &leftFace, &rightFace);

-	if (pGC->capStyle == CapRound) {

-	    XAALineArc (pGC, &leftFace, (LineFacePtr) NULL,

-		       (double)0.0, (double)0.0, TRUE);

-	    rightFace.dx = -1;	/* sleezy hack to make it work */

-	    XAALineArc (pGC, (LineFacePtr) NULL, &rightFace,

- 		       (double)0.0, (double)0.0, TRUE);

-	}

-   }

-

-   infoRec->ClipBox = NULL;

-   if(hardClip)

-	(*infoRec->DisableClipping)(infoRec->pScrn);

-

-   SET_SYNC_FLAG(infoRec);

-}

+/*
+
+XAAPolylinesWideSolid does not maintain a span list and subsequently does
+not follow the "touch-each-pixel-once" rules for wide lines and arcs.
+This means it can only be used in the case where we have
+miSpansEasyRop(pGC->alu).  Since we clip spans on the fly, we
+limited usage of this function to one rect situations. This
+function is used only for solid lines. 
+
+  Adapted from miWideLine by Mark Vojkovich (mvojkovi@ucsd.edu)
+Original mi code written by Keith Packard.
+
+*/
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <math.h>
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "windowstr.h"
+#include "gcstruct.h"
+#include "regionstr.h"
+#include "miwideline.h"
+#include "mi.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+
+#define DRAW_POINT(pScrn, x, y) \
+  if(hardClip) (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, 1, 1); \
+  else XAAPointHelper(pScrn, x, y)
+
+#define FILL_RECT(pScrn, x, y, w, h) \
+  if(hardClip) (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h); \
+  else XAAFillRectHelper(pScrn, x, y, w, h)
+
+#define FILL_SPAN(pScrn, x, y, w) \
+  if(hardClip) (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, 1); \
+  else XAASpanHelper(pScrn, x, y, w)
+
+#define CLIPSTEPEDGE(edgey,edge,edgeleft) \
+    if (ybase == edgey) { \
+	if (edgeleft) { \
+	    if (edge->x > xcl) \
+		xcl = edge->x; \
+	} else { \
+	    if (edge->x < xcr) \
+		xcr = edge->x; \
+	} \
+	edgey++; \
+	edge->x += edge->stepx; \
+	edge->e += edge->dx; \
+	if (edge->e > 0) { \
+	    edge->x += edge->signdx; \
+	    edge->e -= edge->dy; \
+	} \
+    }
+
+static void
+XAAPointHelper(ScrnInfoPtr pScrn, int x, int y)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    BoxPtr extents = infoRec->ClipBox;
+
+    if ((x >= extents->x1) && (x < extents->x2) &&
+        (y >= extents->y1) && (y < extents->y2))
+        (*infoRec->SubsequentSolidFillRect) (pScrn, x, y, 1, 1);
+}
+
+static void
+XAAFillRectHelper(ScrnInfoPtr pScrn, int x1, int y1, int dx, int dy)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    BoxPtr extents = infoRec->ClipBox;
+    int x2 = x1 + dx;
+    int y2 = y1 + dy;
+
+    if (x1 < extents->x1)
+        x1 = extents->x1;
+    if (x2 >= extents->x2)
+        x2 = extents->x2;
+    if ((dx = x2 - x1) < 1)
+        return;
+    if (y1 < extents->y1)
+        y1 = extents->y1;
+    if (y2 >= extents->y2)
+        y2 = extents->y2;
+    if ((dy = y2 - y1) < 1)
+        return;
+
+    (*infoRec->SubsequentSolidFillRect) (pScrn, x1, y1, dx, dy);
+}
+
+static void
+XAASpanHelper(ScrnInfoPtr pScrn, int x1, int y, int width)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    BoxPtr extents = infoRec->ClipBox;
+    int x2;
+
+    if ((y < extents->y1) || (y >= extents->y2))
+        return;
+
+    x2 = x1 + width;
+    if (x1 < extents->x1)
+        x1 = extents->x1;
+    if (x2 > extents->x2)
+        x2 = extents->x2;
+    width = x2 - x1;
+
+    if (width > 0)
+        (*infoRec->SubsequentSolidFillRect) (pScrn, x1, y, width, 1);
+
+}
+
+#define FixError(x, dx, dy, e, sign, step, h)	{	\
+	   e += (h) * dx;				\
+	   x += (h) * step;				\
+	   if(e > 0) {					\
+		x += e * sign/dy;			\
+		e %= dy;				\
+	   	if(e) {					\
+		   x += sign;				\
+		   e -= dy;				\
+		}					\
+	   } 	 					\
+}
+
+static void
+XAAFillPolyHelper(GCPtr pGC, int y,     /* start y coordinate */
+                  int overall_height,   /* height of entire segment */
+                  PolyEdgePtr left, PolyEdgePtr right,
+                  int left_count, int right_count)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    BoxPtr extents = infoRec->ClipBox;
+    int left_x, left_e, left_stepx, left_signdx, left_dy, left_dx;
+    int right_x, right_e, right_stepx, right_signdx, right_dy, right_dx;
+    int height, left_height, right_height;
+    int xorg;
+    Bool hardClip;
+
+    if ((y >= extents->y2) || ((y + overall_height) <= extents->y1))
+        return;
+
+    /* Muffle compiler */
+    left_x = left_e = left_stepx = left_signdx = left_dy = left_dx = 0;
+    right_x = right_e = right_stepx = right_signdx = right_dy = right_dx = 0;
+
+    left_height = right_height = 0;
+    xorg = 0;
+
+    hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);
+
+    while ((left_count || left_height) && (right_count || right_height)) {
+        if (!left_height && left_count) {
+            left_height = left->height;
+            left_x = left->x + xorg;
+            left_stepx = left->stepx;
+            left_signdx = left->signdx;
+            left_e = left->e;
+            left_dy = left->dy;
+            left_dx = left->dx;
+            left_count--;
+            left++;
+        }
+        if (!right_height && right_count) {
+            right_height = right->height;
+            right_x = right->x + xorg + 1;
+            right_stepx = right->stepx;
+            right_signdx = right->signdx;
+            right_e = right->e;
+            right_dy = right->dy;
+            right_dx = right->dx;
+            right_count--;
+            right++;
+        }
+
+        height = (left_height > right_height) ? right_height : left_height;
+
+        left_height -= height;
+        right_height -= height;
+
+        if (hardClip && infoRec->SubsequentSolidFillTrap && (height > 6)) {
+            int right_DX, left_DX;
+
+            right_DX = (right_dx * right_signdx) + (right_stepx * right_dy);
+            left_DX = (left_dx * left_signdx) + (left_stepx * left_dy);
+
+            (*infoRec->SubsequentSolidFillTrap) (infoRec->pScrn, y, height,
+                                                 left_x, left_DX, left_dy,
+                                                 left_e, right_x - 1, right_DX,
+                                                 right_dy, right_e);
+
+            FixError(left_x, left_dx, left_dy, left_e, left_signdx,
+                     left_stepx, height);
+            FixError(right_x, right_dx, right_dy, right_e, right_signdx,
+                     right_stepx, height);
+            y += height;
+            continue;
+        }
+
+        while (height--) {
+            if (right_x > left_x) {
+                FILL_SPAN(infoRec->pScrn, left_x, y, right_x - left_x);
+            }
+            y++;
+
+            left_x += left_stepx;
+            left_e += left_dx;
+            if (left_e > 0) {
+                left_x += left_signdx;
+                left_e -= left_dy;
+            }
+            right_x += right_stepx;
+            right_e += right_dx;
+            if (right_e > 0) {
+                right_x += right_signdx;
+                right_e -= right_dy;
+            }
+
+        }
+    }
+}
+
+static void
+XAAWideSegment(GCPtr pGC,
+               int x1, int y1, int x2, int y2,
+               Bool projectLeft, Bool projectRight,
+               LineFacePtr leftFace, LineFacePtr rightFace)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    double l, L, r;
+    double xa, ya;
+    double projectXoff, projectYoff;
+    double k;
+    double maxy;
+    int x, y;
+    int dx, dy;
+    int finaly;
+    PolyEdgePtr left, right;
+    PolyEdgePtr top, bottom;
+    int lefty, righty, topy, bottomy;
+    int signdx;
+    PolyEdgeRec lefts[2], rights[2];
+    LineFacePtr tface;
+    int lw = pGC->lineWidth;
+    Bool hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);
+
+    /* draw top-to-bottom always */
+    if ((y2 < y1) || ((y2 == y1) && (x2 < x1))) {
+        x = x1;
+        x1 = x2;
+        x2 = x;
+
+        y = y1;
+        y1 = y2;
+        y2 = y;
+
+        x = projectLeft;
+        projectLeft = projectRight;
+        projectRight = x;
+
+        tface = leftFace;
+        leftFace = rightFace;
+        rightFace = tface;
+    }
+
+    dy = y2 - y1;
+    signdx = 1;
+    dx = x2 - x1;
+    if (dx < 0)
+        signdx = -1;
+
+    leftFace->x = x1;
+    leftFace->y = y1;
+    leftFace->dx = dx;
+    leftFace->dy = dy;
+
+    rightFace->x = x2;
+    rightFace->y = y2;
+    rightFace->dx = -dx;
+    rightFace->dy = -dy;
+
+    if (!dy) {
+        rightFace->xa = 0;
+        rightFace->ya = (double) lw / 2.0;
+        rightFace->k = -(double) (lw * dx) / 2.0;
+        leftFace->xa = 0;
+        leftFace->ya = -rightFace->ya;
+        leftFace->k = rightFace->k;
+        x = x1;
+        if (projectLeft)
+            x -= (lw >> 1);
+        y = y1 - (lw >> 1);
+        dx = x2 - x;
+        if (projectRight)
+            dx += ((lw + 1) >> 1);
+        dy = lw;
+        FILL_RECT(infoRec->pScrn, x, y, dx, dy);
+    }
+    else if (!dx) {
+        leftFace->xa = (double) lw / 2.0;
+        leftFace->ya = 0;
+        leftFace->k = (double) (lw * dy) / 2.0;
+        rightFace->xa = -leftFace->xa;
+        rightFace->ya = 0;
+        rightFace->k = leftFace->k;
+        y = y1;
+        if (projectLeft)
+            y -= lw >> 1;
+        x = x1 - (lw >> 1);
+        dy = y2 - y;
+        if (projectRight)
+            dy += ((lw + 1) >> 1);
+        dx = lw;
+        FILL_RECT(infoRec->pScrn, x, y, dx, dy);
+    }
+    else {
+        l = ((double) lw) / 2.0;
+        L = sqrt((double) (dx * dx + dy * dy));
+
+        if (dx < 0) {
+            right = &rights[1];
+            left = &lefts[0];
+            top = &rights[0];
+            bottom = &lefts[1];
+        }
+        else {
+            right = &rights[0];
+            left = &lefts[1];
+            top = &lefts[0];
+            bottom = &rights[1];
+        }
+        r = l / L;
+
+        /* coord of upper bound at integral y */
+        ya = -r * dx;
+        xa = r * dy;
+
+        projectXoff = -ya;
+        projectYoff = xa;
+
+        /* xa * dy - ya * dx */
+        k = l * L;
+
+        leftFace->xa = xa;
+        leftFace->ya = ya;
+        leftFace->k = k;
+        rightFace->xa = -xa;
+        rightFace->ya = -ya;
+        rightFace->k = k;
+
+        if (projectLeft)
+            righty = miPolyBuildEdge(xa - projectXoff, ya - projectYoff,
+                                     k, dx, dy, x1, y1, 0, right);
+        else
+            righty = miPolyBuildEdge(xa, ya, k, dx, dy, x1, y1, 0, right);
+
+        /* coord of lower bound at integral y */
+        ya = -ya;
+        xa = -xa;
+
+        /* xa * dy - ya * dx */
+        k = -k;
+
+        if (projectLeft)
+            lefty = miPolyBuildEdge(xa - projectXoff, ya - projectYoff,
+                                    k, dx, dy, x1, y1, 1, left);
+        else
+            lefty = miPolyBuildEdge(xa, ya, k, dx, dy, x1, y1, 1, left);
+
+        /* coord of top face at integral y */
+
+        if (signdx > 0) {
+            ya = -ya;
+            xa = -xa;
+        }
+
+        if (projectLeft) {
+            double xap = xa - projectXoff;
+            double yap = ya - projectYoff;
+
+            topy = miPolyBuildEdge(xap, yap, xap * dx + yap * dy,
+                                   -dy, dx, x1, y1, dx > 0, top);
+        }
+        else
+            topy = miPolyBuildEdge(xa, ya, 0.0, -dy, dx, x1, y1, dx > 0, top);
+
+        /* coord of bottom face at integral y */
+
+        if (projectRight) {
+            double xap = xa + projectXoff;
+            double yap = ya + projectYoff;
+
+            bottomy = miPolyBuildEdge(xap, yap, xap * dx + yap * dy,
+                                      -dy, dx, x2, y2, dx < 0, bottom);
+            maxy = -ya + projectYoff;
+        }
+        else {
+            bottomy = miPolyBuildEdge(xa, ya, 0.0,
+                                      -dy, dx, x2, y2, dx < 0, bottom);
+            maxy = -ya;
+        }
+
+        finaly = ICEIL(maxy) + y2;
+
+        if (dx < 0) {
+            left->height = bottomy - lefty;
+            right->height = finaly - righty;
+            top->height = righty - topy;
+        }
+        else {
+            right->height = bottomy - righty;
+            left->height = finaly - lefty;
+            top->height = lefty - topy;
+        }
+        bottom->height = finaly - bottomy;
+        XAAFillPolyHelper(pGC, topy,
+                          bottom->height + bottomy - topy, lefts, rights, 2, 2);
+    }
+}
+
+static void
+XAALineArcI(GCPtr pGC, int xorg, int yorg)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int x, y, e, ex;
+    int slw = pGC->lineWidth;
+    Bool hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);
+
+    y = (slw >> 1) + 1;
+    if (slw & 1)
+        e = -((y << 2) + 3);
+    else
+        e = -(y << 3);
+    ex = -4;
+    x = 0;
+    while (y) {
+        e += (y << 3) - 4;
+        while (e >= 0) {
+            x++;
+            e += (ex = -((x << 3) + 4));
+        }
+        y--;
+        slw = (x << 1) + 1;
+        if ((e == ex) && (slw > 1))
+            slw--;
+
+        FILL_SPAN(infoRec->pScrn, xorg - x, yorg - y, slw);
+
+        if ((y != 0) && ((slw > 1) || (e != ex))) {
+            FILL_SPAN(infoRec->pScrn, xorg - x, yorg + y, slw);
+        }
+    }
+}
+
+static void
+XAALineArcD(GCPtr pGC,
+            double xorg,
+            double yorg,
+            PolyEdgePtr edge1,
+            int edgey1,
+            Bool edgeleft1, PolyEdgePtr edge2, int edgey2, Bool edgeleft2)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    double radius, x0, y0, el, er, yk, xlk, xrk, k;
+    int xbase, ybase, y, boty, xl, xr, xcl, xcr;
+    int ymin, ymax;
+    Bool edge1IsMin, edge2IsMin;
+    int ymin1, ymin2;
+    Bool hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);
+
+    xbase = floor(xorg);
+    x0 = xorg - xbase;
+    ybase = ICEIL(yorg);
+    y0 = yorg - ybase;
+
+    xlk = x0 + x0 + 1.0;
+    xrk = x0 + x0 - 1.0;
+    yk = y0 + y0 - 1.0;
+    radius = ((double) pGC->lineWidth) / 2.0;
+    y = floor(radius - y0 + 1.0);
+    ybase -= y;
+    ymin = ybase;
+    ymax = 65536;
+    edge1IsMin = FALSE;
+    ymin1 = edgey1;
+    if (edge1->dy >= 0) {
+        if (!edge1->dy) {
+            if (edgeleft1)
+                edge1IsMin = TRUE;
+            else
+                ymax = edgey1;
+            edgey1 = 65536;
+        }
+        else if ((edge1->signdx < 0) == edgeleft1)
+            edge1IsMin = TRUE;
+    }
+    edge2IsMin = FALSE;
+    ymin2 = edgey2;
+    if (edge2->dy >= 0) {
+        if (!edge2->dy) {
+            if (edgeleft2)
+                edge2IsMin = TRUE;
+            else
+                ymax = edgey2;
+            edgey2 = 65536;
+        }
+        else if ((edge2->signdx < 0) == edgeleft2)
+            edge2IsMin = TRUE;
+    }
+    if (edge1IsMin) {
+        ymin = ymin1;
+        if (edge2IsMin && (ymin1 > ymin2))
+            ymin = ymin2;
+    }
+    else if (edge2IsMin)
+        ymin = ymin2;
+    el = radius * radius - ((y + y0) * (y + y0)) - (x0 * x0);
+    er = el + xrk;
+    xl = 1;
+    xr = 0;
+    if (x0 < 0.5) {
+        xl = 0;
+        el -= xlk;
+    }
+    boty = (y0 < -0.5) ? 1 : 0;
+    if (ybase + y - boty > ymax)
+        boty = ymax - ybase - y;
+    while (y > boty) {
+        k = (y << 1) + yk;
+        er += k;
+        while (er > 0.0) {
+            xr++;
+            er += xrk - (xr << 1);
+        }
+        el += k;
+        while (el >= 0.0) {
+            xl--;
+            el += (xl << 1) - xlk;
+        }
+        y--;
+        ybase++;
+        if (ybase < ymin)
+            continue;
+        xcl = xl + xbase;
+        xcr = xr + xbase;
+        CLIPSTEPEDGE(edgey1, edge1, edgeleft1);
+        CLIPSTEPEDGE(edgey2, edge2, edgeleft2);
+        if (xcr >= xcl) {
+            FILL_SPAN(infoRec->pScrn, xcl, ybase, xcr - xcl + 1);
+        }
+    }
+    er = xrk - (xr << 1) - er;
+    el = (xl << 1) - xlk - el;
+    boty = floor(-y0 - radius + 1.0);
+    if (ybase + y - boty > ymax)
+        boty = ymax - ybase - y;
+    while (y > boty) {
+        k = (y << 1) + yk;
+        er -= k;
+        while ((er >= 0.0) && (xr >= 0)) {
+            xr--;
+            er += xrk - (xr << 1);
+        }
+        el -= k;
+        while ((el > 0.0) && (xl <= 0)) {
+            xl++;
+            el += (xl << 1) - xlk;
+        }
+        y--;
+        ybase++;
+        if (ybase < ymin)
+            continue;
+        xcl = xl + xbase;
+        xcr = xr + xbase;
+        CLIPSTEPEDGE(edgey1, edge1, edgeleft1);
+        CLIPSTEPEDGE(edgey2, edge2, edgeleft2);
+        if (xcr >= xcl) {
+            FILL_SPAN(infoRec->pScrn, xcl, ybase, xcr - xcl + 1);
+        }
+    }
+}
+
+static void
+XAALineArc(GCPtr pGC,
+           LineFacePtr leftFace,
+           LineFacePtr rightFace, double xorg, double yorg, Bool isInt)
+{
+    int xorgi, yorgi;
+    PolyEdgeRec edge1, edge2;
+    int edgey1, edgey2;
+    Bool edgeleft1, edgeleft2;
+
+    if (isInt) {
+        xorgi = leftFace ? leftFace->x : rightFace->x;
+        yorgi = leftFace ? leftFace->y : rightFace->y;
+    }
+    else {                      /* Muffle compiler */
+        xorgi = yorgi = 0;
+    }
+    edgey1 = 65536;
+    edgey2 = 65536;
+    edge1.x = 0;                /* not used, keep memory checkers happy */
+    edge1.dy = -1;
+    edge2.x = 0;                /* not used, keep memory checkers happy */
+    edge2.dy = -1;
+    edgeleft1 = FALSE;
+    edgeleft2 = FALSE;
+
+    if ((pGC->lineWidth > 2) &&
+        ((pGC->capStyle == CapRound && pGC->joinStyle != JoinRound) ||
+         (pGC->joinStyle == JoinRound && pGC->capStyle == CapButt))) {
+        if (isInt) {
+            xorg = (double) xorgi;
+            yorg = (double) yorgi;
+        }
+
+        if (leftFace && rightFace)
+            miRoundJoinClip(leftFace, rightFace, &edge1, &edge2,
+                            &edgey1, &edgey2, &edgeleft1, &edgeleft2);
+        else if (leftFace)
+            edgey1 = miRoundCapClip(leftFace, isInt, &edge1, &edgeleft1);
+        else if (rightFace)
+            edgey2 = miRoundCapClip(rightFace, isInt, &edge2, &edgeleft2);
+
+        isInt = FALSE;
+    }
+
+    if (isInt) {
+        if (pGC->lineWidth == 1) {
+            XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+            Bool hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);
+
+            DRAW_POINT(infoRec->pScrn, xorgi, yorgi);
+        }
+        else
+            XAALineArcI(pGC, xorgi, yorgi);
+    }
+    else
+        XAALineArcD(pGC, xorg, yorg, &edge1, edgey1, edgeleft1,
+                    &edge2, edgey2, edgeleft2);
+
+}
+
+static void
+XAALineJoin(GCPtr pGC, LineFacePtr pLeft, LineFacePtr pRight)
+{
+    double mx = 0, my = 0;
+    double denom = 0;
+    PolyVertexRec vertices[4];
+    PolySlopeRec slopes[4];
+    int edgecount;
+    PolyEdgeRec left[4], right[4];
+    int nleft, nright;
+    int y, height;
+    int swapslopes;
+    int joinStyle = pGC->joinStyle;
+    int lw = pGC->lineWidth;
+
+    if (lw == 1) {
+        /* Lines going in the same direction have no join */
+        if ((pLeft->dx >= 0) == (pRight->dx <= 0))
+            return;
+        if (joinStyle != JoinRound) {
+            denom = -pLeft->dx * (double) pRight->dy + pRight->dx *
+                (double) pLeft->dy;
+            if (denom == 0.0)
+                return;         /* no join to draw */
+        }
+        if (joinStyle != JoinMiter) {
+            XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+            Bool hardClip = (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL);
+
+            DRAW_POINT(infoRec->pScrn, pLeft->x, pLeft->y);
+            return;
+        }
+    }
+    else {
+        if (joinStyle == JoinRound) {
+            XAALineArc(pGC, pLeft, pRight, (double) 0.0, (double) 0.0, TRUE);
+            return;
+        }
+        denom = -pLeft->dx * (double) pRight->dy + pRight->dx *
+            (double) pLeft->dy;
+        if (denom == 0.0)
+            return;             /* no join to draw */
+    }
+
+    swapslopes = 0;
+    if (denom > 0) {
+        pLeft->xa = -pLeft->xa;
+        pLeft->ya = -pLeft->ya;
+        pLeft->dx = -pLeft->dx;
+        pLeft->dy = -pLeft->dy;
+    }
+    else {
+        swapslopes = 1;
+        pRight->xa = -pRight->xa;
+        pRight->ya = -pRight->ya;
+        pRight->dx = -pRight->dx;
+        pRight->dy = -pRight->dy;
+    }
+
+    vertices[0].x = pRight->xa;
+    vertices[0].y = pRight->ya;
+    slopes[0].dx = -pRight->dy;
+    slopes[0].dy = pRight->dx;
+    slopes[0].k = 0;
+
+    vertices[1].x = 0;
+    vertices[1].y = 0;
+    slopes[1].dx = pLeft->dy;
+    slopes[1].dy = -pLeft->dx;
+    slopes[1].k = 0;
+
+    vertices[2].x = pLeft->xa;
+    vertices[2].y = pLeft->ya;
+
+    if (joinStyle == JoinMiter) {
+        my = (pLeft->dy * (pRight->xa * pRight->dy - pRight->ya * pRight->dx) -
+              pRight->dy * (pLeft->xa * pLeft->dy - pLeft->ya * pLeft->dx)) /
+            denom;
+        if (pLeft->dy != 0)
+            mx = pLeft->xa + (my - pLeft->ya) *
+                (double) pLeft->dx / (double) pLeft->dy;
+        else
+            mx = pRight->xa + (my - pRight->ya) *
+                (double) pRight->dx / (double) pRight->dy;
+
+        /* check miter limit */
+        if ((mx * mx + my * my) * 4 > SQSECANT * lw * lw)
+            joinStyle = JoinBevel;
+    }
+
+    if (joinStyle == JoinMiter) {
+        slopes[2].dx = pLeft->dx;
+        slopes[2].dy = pLeft->dy;
+        slopes[2].k = pLeft->k;
+        if (swapslopes) {
+            slopes[2].dx = -slopes[2].dx;
+            slopes[2].dy = -slopes[2].dy;
+            slopes[2].k = -slopes[2].k;
+        }
+        vertices[3].x = mx;
+        vertices[3].y = my;
+        slopes[3].dx = pRight->dx;
+        slopes[3].dy = pRight->dy;
+        slopes[3].k = pRight->k;
+        if (swapslopes) {
+            slopes[3].dx = -slopes[3].dx;
+            slopes[3].dy = -slopes[3].dy;
+            slopes[3].k = -slopes[3].k;
+        }
+        edgecount = 4;
+    }
+    else {
+        double scale, dx, dy, adx, ady;
+
+        adx = dx = pRight->xa - pLeft->xa;
+        ady = dy = pRight->ya - pLeft->ya;
+        if (adx < 0)
+            adx = -adx;
+        if (ady < 0)
+            ady = -ady;
+        scale = ady;
+        if (adx > ady)
+            scale = adx;
+        slopes[2].dx = (dx * 65536) / scale;
+        slopes[2].dy = (dy * 65536) / scale;
+        slopes[2].k = ((pLeft->xa + pRight->xa) * slopes[2].dy -
+                       (pLeft->ya + pRight->ya) * slopes[2].dx) / 2.0;
+        edgecount = 3;
+    }
+
+    y = miPolyBuildPoly(vertices, slopes, edgecount, pLeft->x, pLeft->y,
+                        left, right, &nleft, &nright, &height);
+    XAAFillPolyHelper(pGC, y, height, left, right, nleft, nright);
+}
+
+void
+XAAPolylinesWideSolid(DrawablePtr pDrawable,
+                      GCPtr pGC, int mode, int npt, DDXPointPtr pPts)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int x1, y1, x2, y2;
+    Bool projectLeft, projectRight;
+    LineFaceRec leftFace, rightFace, prevRightFace, firstFace;
+    int first = TRUE;
+    Bool somethingDrawn = FALSE;
+    Bool selfJoin = FALSE;
+    int xorg = pDrawable->x;
+    int yorg = pDrawable->y;
+    Bool hardClip = FALSE;
+
+    if (!RegionNumRects(pGC->pCompositeClip))
+        return;
+
+    if (RegionNumRects(pGC->pCompositeClip) != 1) {
+        miWideLine(pDrawable, pGC, mode, npt, pPts);
+        return;
+    }
+
+    x2 = pPts->x;
+    y2 = pPts->y;
+    if (npt > 1) {
+        if (mode == CoordModePrevious) {
+            int nptTmp;
+            register DDXPointPtr pPtsTmp;
+
+            x1 = x2;
+            y1 = y2;
+            nptTmp = npt;
+            pPtsTmp = pPts + 1;
+            while (--nptTmp) {
+                x1 += pPtsTmp->x;
+                y1 += pPtsTmp->y;
+                ++pPtsTmp;
+            }
+            if ((x2 == x1) && (y2 == y1))
+                selfJoin = TRUE;
+        }
+        else if ((x2 == pPts[npt - 1].x) && (y2 == pPts[npt - 1].y))
+            selfJoin = TRUE;
+    }
+
+    projectLeft = ((pGC->capStyle == CapProjecting) && !selfJoin);
+    projectRight = FALSE;
+
+    (*infoRec->SetupForSolidFill) (infoRec->pScrn, pGC->fgPixel, pGC->alu,
+                                   pGC->planemask);
+
+    infoRec->ClipBox = &pGC->pCompositeClip->extents;
+
+    if (infoRec->ClippingFlags & HARDWARE_CLIP_SOLID_FILL) {
+        hardClip = TRUE;
+        (*infoRec->SetClippingRectangle) (infoRec->pScrn,
+                                          infoRec->ClipBox->x1,
+                                          infoRec->ClipBox->y1,
+                                          infoRec->ClipBox->x2 - 1,
+                                          infoRec->ClipBox->y2 - 1);
+    }
+
+    x2 += xorg;
+    y2 += yorg;
+    while (--npt) {
+        x1 = x2;
+        y1 = y2;
+        ++pPts;
+        x2 = pPts->x;
+        y2 = pPts->y;
+        if (mode == CoordModePrevious) {
+            x2 += x1;
+            y2 += y1;
+        }
+        else {
+            x2 += xorg;
+            y2 += yorg;
+        }
+        if ((x1 != x2) || (y1 != y2)) {
+            somethingDrawn = TRUE;
+            if ((npt == 1) && (pGC->capStyle == CapProjecting) && !selfJoin)
+                projectRight = TRUE;
+            XAAWideSegment(pGC, x1, y1, x2, y2,
+                           projectLeft, projectRight, &leftFace, &rightFace);
+            if (first) {
+                if (selfJoin)
+                    firstFace = leftFace;
+                else if (pGC->capStyle == CapRound) {
+                    if (pGC->lineWidth == 1) {
+                        DRAW_POINT(infoRec->pScrn, x1, y1);
+                    }
+                    else
+                        XAALineArc(pGC, &leftFace, (LineFacePtr) NULL,
+                                   (double) 0.0, (double) 0.0, TRUE);
+                }
+            }
+            else
+                XAALineJoin(pGC, &leftFace, &prevRightFace);
+
+            prevRightFace = rightFace;
+            first = FALSE;
+            projectLeft = FALSE;
+        }
+        if (npt == 1 && somethingDrawn) {
+            if (selfJoin)
+                XAALineJoin(pGC, &firstFace, &rightFace);
+            else if (pGC->capStyle == CapRound) {
+                if (pGC->lineWidth == 1) {
+                    DRAW_POINT(infoRec->pScrn, x2, y2);
+                }
+                else
+                    XAALineArc(pGC, (LineFacePtr) NULL, &rightFace,
+                               (double) 0.0, (double) 0.0, TRUE);
+            }
+        }
+    }
+    /* handle crock where all points are coincedent */
+    if (!somethingDrawn) {
+        projectLeft = (pGC->capStyle == CapProjecting);
+        XAAWideSegment(pGC, x2, y2, x2, y2, projectLeft, projectLeft,
+                       &leftFace, &rightFace);
+        if (pGC->capStyle == CapRound) {
+            XAALineArc(pGC, &leftFace, (LineFacePtr) NULL,
+                       (double) 0.0, (double) 0.0, TRUE);
+            rightFace.dx = -1;  /* sleezy hack to make it work */
+            XAALineArc(pGC, (LineFacePtr) NULL, &rightFace,
+                       (double) 0.0, (double) 0.0, TRUE);
+        }
+    }
+
+    infoRec->ClipBox = NULL;
+    if (hardClip)
+        (*infoRec->DisableClipping) (infoRec->pScrn);
+
+    SET_SYNC_FLAG(infoRec);
+}
diff --git a/xorg-server/hw/xfree86/xaa/xaalocal.h b/xorg-server/hw/xfree86/xaa/xaalocal.h
index 0780fb133..c028ef033 100644
--- a/xorg-server/hw/xfree86/xaa/xaalocal.h
+++ b/xorg-server/hw/xfree86/xaa/xaalocal.h
@@ -8,7 +8,6 @@
 
 /* This file is very unorganized ! */
 
-
 #include "gcstruct.h"
 #include "regionstr.h"
 #include "xf86fbman.h"
@@ -27,49 +26,44 @@
 #define DO_PIXMAP_COPY		0x00000007
 #define DO_SOLID		0x00000008
 
+typedef CARD32 *(*GlyphScanlineFuncPtr) (CARD32 *base, unsigned int **glyphp,
+                                         int line, int nglyph, int width);
 
-typedef CARD32 * (*GlyphScanlineFuncPtr)(
-    CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width
-);
-
-typedef CARD32 *(*StippleScanlineProcPtr)(CARD32*, CARD32*, int, int, int); 
+typedef CARD32 *(*StippleScanlineProcPtr) (CARD32 *, CARD32 *, int, int, int);
 
 typedef void (*RectFuncPtr) (ScrnInfoPtr, int, int, int, int, int, int,
-					  XAACacheInfoPtr);
+                             XAACacheInfoPtr);
 typedef void (*TrapFuncPtr) (ScrnInfoPtr, int, int, int, int, int, int,
-					  int, int, int, int, int, int,
-					  XAACacheInfoPtr);
-
-
+                             int, int, int, int, int, int, XAACacheInfoPtr);
 
 typedef struct _XAAScreen {
-   CreateGCProcPtr 		CreateGC;
-   CloseScreenProcPtr 		CloseScreen;
-   GetImageProcPtr 		GetImage;
-   GetSpansProcPtr 		GetSpans;
-   CopyWindowProcPtr 		CopyWindow;
-   WindowExposuresProcPtr	WindowExposures;
-   CreatePixmapProcPtr 		CreatePixmap;
-   DestroyPixmapProcPtr 	DestroyPixmap;
-   ChangeWindowAttributesProcPtr ChangeWindowAttributes;
-   XAAInfoRecPtr 		AccelInfoRec;
-   Bool                		(*EnterVT)(int, int);
-   void                		(*LeaveVT)(int, int);
-   int				(*SetDGAMode)(int, int, DGADevicePtr);
-   void				(*EnableDisableFBAccess)(int, Bool);
-    CompositeProcPtr            Composite;
-    GlyphsProcPtr               Glyphs;
+    CreateGCProcPtr CreateGC;
+    CloseScreenProcPtr CloseScreen;
+    GetImageProcPtr GetImage;
+    GetSpansProcPtr GetSpans;
+    CopyWindowProcPtr CopyWindow;
+    WindowExposuresProcPtr WindowExposures;
+    CreatePixmapProcPtr CreatePixmap;
+    DestroyPixmapProcPtr DestroyPixmap;
+    ChangeWindowAttributesProcPtr ChangeWindowAttributes;
+    XAAInfoRecPtr AccelInfoRec;
+    Bool (*EnterVT) (int, int);
+    void (*LeaveVT) (int, int);
+    int (*SetDGAMode) (int, int, DGADevicePtr);
+    void (*EnableDisableFBAccess) (int, Bool);
+    CompositeProcPtr Composite;
+    GlyphsProcPtr Glyphs;
 } XAAScreenRec, *XAAScreenPtr;
 
 #define	OPS_ARE_PIXMAP		0x00000001
 #define OPS_ARE_ACCEL		0x00000002
 
 typedef struct _XAAGC {
-    GCOps 	*wrapOps;
-    GCFuncs 	*wrapFuncs;
-    GCOps 	*XAAOps;
-    int		DashLength;
-    unsigned char* DashPattern;
+    GCOps *wrapOps;
+    GCFuncs *wrapFuncs;
+    GCOps *XAAOps;
+    int DashLength;
+    unsigned char *DashPattern;
     unsigned long changes;
     unsigned long flags;
 } XAAGCRec, *XAAGCPtr;
@@ -91,1416 +85,1126 @@ typedef struct _XAAPixmap {
     CARD32 pattern0;
     CARD32 pattern1;
     int fg;
-    int bg;    
+    int bg;
     FBAreaPtr offscreenArea;
     Bool freeData;
 } XAAPixmapRec, *XAAPixmapPtr;
 
-
 extern _X_EXPORT Bool
-XAACreateGC(
-    GCPtr pGC
-);
+ XAACreateGC(GCPtr pGC);
 
 extern _X_EXPORT Bool
-XAAInitAccel(
-    ScreenPtr pScreen, 
-    XAAInfoRecPtr infoRec
-);
+ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec);
 
 extern _X_EXPORT RegionPtr
-XAABitBlt(
-    DrawablePtr pSrcDrawable,
-    DrawablePtr pDstDrawable,
-    GC *pGC,
-    int srcx,
-    int srcy,
-    int width,
-    int height,
-    int dstx,
-    int dsty,
-    void (*doBitBlt)(DrawablePtr, DrawablePtr, GCPtr, RegionPtr, DDXPointPtr),
-    unsigned long bitPlane
-);
-
-extern _X_EXPORT void
-XAAScreenToScreenBitBlt(
-    ScrnInfoPtr pScrn,
-    int nbox,
-    DDXPointPtr pptSrc,
-    BoxPtr pbox,
-    int xdir, 
-    int ydir,
-    int alu,
-    unsigned int planemask
-);
-
-extern _X_EXPORT void
-XAADoBitBlt(
-    DrawablePtr	    pSrc, 
-    DrawablePtr     pDst,
-    GC		    *pGC,
-    RegionPtr	    prgnDst,
-    DDXPointPtr	    pptSrc
-);
-
-extern _X_EXPORT void
-XAADoImageWrite(
-    DrawablePtr	    pSrc, 
-    DrawablePtr     pDst,
-    GC		    *pGC,
-    RegionPtr	    prgnDst,
-    DDXPointPtr	    pptSrc
-);
-
-extern _X_EXPORT void
-XAADoImageRead(
-    DrawablePtr     pSrc,
-    DrawablePtr     pDst,
-    GC              *pGC,
-    RegionPtr       prgnDst,
-    DDXPointPtr     pptSrc
-);
-
-extern _X_EXPORT void
-XAACopyWindow(
-    WindowPtr pWin,
-    DDXPointRec ptOldOrg,
-    RegionPtr prgnSrc
-);
 
+XAABitBlt(DrawablePtr pSrcDrawable,
+          DrawablePtr pDstDrawable,
+          GC * pGC,
+          int srcx,
+          int srcy,
+          int width,
+          int height,
+          int dstx,
+          int dsty,
+          void (*doBitBlt) (DrawablePtr, DrawablePtr, GCPtr, RegionPtr,
+                            DDXPointPtr), unsigned long bitPlane);
 
-extern _X_EXPORT RegionPtr
-XAACopyArea(
-    DrawablePtr pSrcDrawable,
-    DrawablePtr pDstDrawable,
-    GC *pGC,
-    int srcx, 
-    int srcy,
-    int width, 
-    int height,
-    int dstx, 
-    int dsty
-);
+extern _X_EXPORT void
+
+XAAScreenToScreenBitBlt(ScrnInfoPtr pScrn,
+                        int nbox,
+                        DDXPointPtr pptSrc,
+                        BoxPtr pbox,
+                        int xdir, int ydir, int alu, unsigned int planemask);
 
 extern _X_EXPORT void
-XAAValidateCopyArea(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw
-);
+
+XAADoBitBlt(DrawablePtr pSrc,
+            DrawablePtr pDst, GC * pGC, RegionPtr prgnDst, DDXPointPtr pptSrc);
+
+extern _X_EXPORT void
+
+XAADoImageWrite(DrawablePtr pSrc,
+                DrawablePtr pDst,
+                GC * pGC, RegionPtr prgnDst, DDXPointPtr pptSrc);
+
+extern _X_EXPORT void
+
+XAADoImageRead(DrawablePtr pSrc,
+               DrawablePtr pDst,
+               GC * pGC, RegionPtr prgnDst, DDXPointPtr pptSrc);
+
+extern _X_EXPORT void
+ XAACopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
+
+extern _X_EXPORT RegionPtr
+
+XAACopyArea(DrawablePtr pSrcDrawable,
+            DrawablePtr pDstDrawable,
+            GC * pGC,
+            int srcx, int srcy, int width, int height, int dstx, int dsty);
 
 extern _X_EXPORT void
-XAAValidatePutImage(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw 
-);
+ XAAValidateCopyArea(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);
 
 extern _X_EXPORT void
-XAAValidateCopyPlane(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw
-);
+ XAAValidatePutImage(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);
 
 extern _X_EXPORT void
-XAAValidatePushPixels(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw
-);
+ XAAValidateCopyPlane(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);
 
 extern _X_EXPORT void
-XAAValidateFillSpans(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw
-);
+ XAAValidatePushPixels(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);
 
 extern _X_EXPORT void
-XAAValidatePolyGlyphBlt(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw
-);
+ XAAValidateFillSpans(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);
 
 extern _X_EXPORT void
-XAAValidateImageGlyphBlt(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw
-);
+ XAAValidatePolyGlyphBlt(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);
 
 extern _X_EXPORT void
-XAAValidatePolylines(
-   GCPtr         pGC,
-   unsigned long changes,
-   DrawablePtr   pDraw
-);
+ XAAValidateImageGlyphBlt(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);
 
+extern _X_EXPORT void
+ XAAValidatePolylines(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);
 
 extern _X_EXPORT RegionPtr
-XAACopyPlaneColorExpansion(
-    DrawablePtr		pSrc,
-    DrawablePtr		pDst,
-    GCPtr		pGC,
-    int			srcx, 
-    int			srcy,
-    int			width, 
-    int			height,
-    int			dstx, 
-    int			dsty,
-    unsigned long	bitPlane
-);
-
-
-extern _X_EXPORT void
-XAAPushPixelsSolidColorExpansion(
-    GCPtr	pGC,
-    PixmapPtr	pBitMap,
-    DrawablePtr pDrawable,
-    int		dx, 
-    int		dy, 
-    int		xOrg, 
-    int		yOrg
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapColorExpandMSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapColorExpand3MSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapColorExpandMSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapColorExpand3MSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapColorExpandLSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapColorExpand3LSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapColorExpandLSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapColorExpand3LSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-
-extern _X_EXPORT void
-XAAWriteBitmapScanlineColorExpandMSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapScanlineColorExpand3MSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapScanlineColorExpandMSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapScanlineColorExpand3MSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapScanlineColorExpandLSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapScanlineColorExpand3LSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapScanlineColorExpandLSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapScanlineColorExpand3LSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
-    unsigned char *src,
-    int srcwidth,
-    int skipleft,
-    int fg, int bg,
-    int rop,
-    unsigned int planemask 
-);
-
-extern _X_EXPORT void
-XAAWritePixmap (
-   ScrnInfoPtr pScrn,
-   int x, int y, int w, int h,
-   unsigned char *src,
-   int srcwidth,
-   int rop,
-   unsigned int planemask,
-   int transparency_color,
-   int bpp, int depth
-);
-
-extern _X_EXPORT void
-XAAWritePixmapScanline (
-   ScrnInfoPtr pScrn,
-   int x, int y, int w, int h,
-   unsigned char *src,
-   int srcwidth,
-   int rop,
-   unsigned int planemask,
-   int transparency_color,
-   int bpp, int depth
-);
-
-typedef void (*ClipAndRenderRectsFunc)(GCPtr, int, BoxPtr, int, int); 
-
-
-extern _X_EXPORT void
-XAAClipAndRenderRects(
-   GCPtr pGC, 
-   ClipAndRenderRectsFunc func, 
-   int nrectFill, 
-   xRectangle *prectInit, 
-   int xorg, int yorg
-);
-
-
-typedef void (*ClipAndRenderSpansFunc)(GCPtr, int, DDXPointPtr, int*, 
-							int, int, int);
-
-extern _X_EXPORT void
-XAAClipAndRenderSpans(
-    GCPtr pGC, 
-    DDXPointPtr	ppt,
-    int		*pwidth,
-    int		nspans,
-    int		fSorted,
-    ClipAndRenderSpansFunc func,
-    int 	xorg,
-    int		yorg
-);
-
-
-extern _X_EXPORT void
-XAAFillSolidRects(
-    ScrnInfoPtr pScrn,
-    int fg, int rop,
-    unsigned int planemask,
-    int		nBox,
-    BoxPtr	pBox 
-);
-
-extern _X_EXPORT void
-XAAFillMono8x8PatternRects(
-    ScrnInfoPtr pScrn,
-    int	fg, int bg, int rop,
-    unsigned int planemask,
-    int	nBox,
-    BoxPtr pBox,
-    int pat0, int pat1,
-    int xorg, int yorg
-);
-
-extern _X_EXPORT void
-XAAFillMono8x8PatternRectsScreenOrigin(
-    ScrnInfoPtr pScrn,
-    int	fg, int bg, int rop,
-    unsigned int planemask,
-    int	nBox,
-    BoxPtr pBox,
-    int pat0, int pat1,
-    int xorg, int yorg
-);
-
-
-extern _X_EXPORT void
-XAAFillColor8x8PatternRectsScreenOrigin(
-   ScrnInfoPtr pScrn,
-   int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorigin, int yorigin,
-   XAACacheInfoPtr pCache
-);
-
-extern _X_EXPORT void
-XAAFillColor8x8PatternRects(
-   ScrnInfoPtr pScrn,
-   int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorigin, int yorigin,
-   XAACacheInfoPtr pCache
-);
-
-extern _X_EXPORT void
-XAAFillCacheBltRects(
-   ScrnInfoPtr pScrn,
-   int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   XAACacheInfoPtr pCache
-);
-
-extern _X_EXPORT void
-XAAFillCacheExpandRects(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillImageWriteRects(
-    ScrnInfoPtr pScrn,
-    int rop,
-    unsigned int planemask,
-    int nBox,
-    BoxPtr pBox,
-    int xorg, int yorg,
-    PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAPolyFillRect(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int	nrectFill,
-    xRectangle *prectInit
-);
-
-
-extern _X_EXPORT void
-XAATEGlyphRendererMSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
-
-extern _X_EXPORT void
-XAATEGlyphRenderer3MSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
-
-extern _X_EXPORT void
-XAATEGlyphRendererMSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
 
-extern _X_EXPORT void
-XAATEGlyphRenderer3MSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
+XAACopyPlaneColorExpansion(DrawablePtr pSrc,
+                           DrawablePtr pDst,
+                           GCPtr pGC,
+                           int srcx,
+                           int srcy,
+                           int width,
+                           int height,
+                           int dstx, int dsty, unsigned long bitPlane);
+
+extern _X_EXPORT void
+
+XAAPushPixelsSolidColorExpansion(GCPtr pGC,
+                                 PixmapPtr pBitMap,
+                                 DrawablePtr pDrawable,
+                                 int dx, int dy, int xOrg, int yOrg);
+
+extern _X_EXPORT void
+
+XAAWriteBitmapColorExpandMSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                           int x, int y, int w, int h,
+                                           unsigned char *src,
+                                           int srcwidth,
+                                           int skipleft,
+                                           int fg, int bg,
+                                           int rop, unsigned int planemask);
+
+extern _X_EXPORT void
+
+XAAWriteBitmapColorExpand3MSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                            int x, int y, int w, int h,
+                                            unsigned char *src,
+                                            int srcwidth,
+                                            int skipleft,
+                                            int fg, int bg,
+                                            int rop, unsigned int planemask);
+
+extern _X_EXPORT void
+
+XAAWriteBitmapColorExpandMSBFirst(ScrnInfoPtr pScrn,
+                                  int x, int y, int w, int h,
+                                  unsigned char *src,
+                                  int srcwidth,
+                                  int skipleft,
+                                  int fg, int bg,
+                                  int rop, unsigned int planemask);
+
+extern _X_EXPORT void
+
+XAAWriteBitmapColorExpand3MSBFirst(ScrnInfoPtr pScrn,
+                                   int x, int y, int w, int h,
+                                   unsigned char *src,
+                                   int srcwidth,
+                                   int skipleft,
+                                   int fg, int bg,
+                                   int rop, unsigned int planemask);
+
+extern _X_EXPORT void
+
+XAAWriteBitmapColorExpandLSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                           int x, int y, int w, int h,
+                                           unsigned char *src,
+                                           int srcwidth,
+                                           int skipleft,
+                                           int fg, int bg,
+                                           int rop, unsigned int planemask);
+
+extern _X_EXPORT void
+
+XAAWriteBitmapColorExpand3LSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                            int x, int y, int w, int h,
+                                            unsigned char *src,
+                                            int srcwidth,
+                                            int skipleft,
+                                            int fg, int bg,
+                                            int rop, unsigned int planemask);
+
+extern _X_EXPORT void
+
+XAAWriteBitmapColorExpandLSBFirst(ScrnInfoPtr pScrn,
+                                  int x, int y, int w, int h,
+                                  unsigned char *src,
+                                  int srcwidth,
+                                  int skipleft,
+                                  int fg, int bg,
+                                  int rop, unsigned int planemask);
+
+extern _X_EXPORT void
+
+XAAWriteBitmapColorExpand3LSBFirst(ScrnInfoPtr pScrn,
+                                   int x, int y, int w, int h,
+                                   unsigned char *src,
+                                   int srcwidth,
+                                   int skipleft,
+                                   int fg, int bg,
+                                   int rop, unsigned int planemask);
+
+extern _X_EXPORT void
+
+XAAWriteBitmapScanlineColorExpandMSBFirst(ScrnInfoPtr pScrn,
+                                          int x, int y, int w, int h,
+                                          unsigned char *src,
+                                          int srcwidth,
+                                          int skipleft,
+                                          int fg, int bg,
+                                          int rop, unsigned int planemask);
+
+extern _X_EXPORT void
+
+XAAWriteBitmapScanlineColorExpand3MSBFirst(ScrnInfoPtr pScrn,
+                                           int x, int y, int w, int h,
+                                           unsigned char *src,
+                                           int srcwidth,
+                                           int skipleft,
+                                           int fg, int bg,
+                                           int rop, unsigned int planemask);
+
+extern _X_EXPORT void
+
+XAAWriteBitmapScanlineColorExpandMSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                                   int x, int y, int w, int h,
+                                                   unsigned char *src,
+                                                   int srcwidth,
+                                                   int skipleft,
+                                                   int fg, int bg,
+                                                   int rop,
+                                                   unsigned int planemask);
 
 extern _X_EXPORT void
-XAATEGlyphRendererLSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
-
-
+
+XAAWriteBitmapScanlineColorExpand3MSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                                    int x, int y, int w, int h,
+                                                    unsigned char *src,
+                                                    int srcwidth,
+                                                    int skipleft,
+                                                    int fg, int bg,
+                                                    int rop,
+                                                    unsigned int planemask);
+
 extern _X_EXPORT void
-XAATEGlyphRenderer3LSBFirstFixedBase (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
-
+
+XAAWriteBitmapScanlineColorExpandLSBFirst(ScrnInfoPtr pScrn,
+                                          int x, int y, int w, int h,
+                                          unsigned char *src,
+                                          int srcwidth,
+                                          int skipleft,
+                                          int fg, int bg,
+                                          int rop, unsigned int planemask);
+
 extern _X_EXPORT void
-XAATEGlyphRendererLSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
+
+XAAWriteBitmapScanlineColorExpand3LSBFirst(ScrnInfoPtr pScrn,
+                                           int x, int y, int w, int h,
+                                           unsigned char *src,
+                                           int srcwidth,
+                                           int skipleft,
+                                           int fg, int bg,
+                                           int rop, unsigned int planemask);
 
 extern _X_EXPORT void
-XAATEGlyphRenderer3LSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
 
+XAAWriteBitmapScanlineColorExpandLSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                                   int x, int y, int w, int h,
+                                                   unsigned char *src,
+                                                   int srcwidth,
+                                                   int skipleft,
+                                                   int fg, int bg,
+                                                   int rop,
+                                                   unsigned int planemask);
 
 extern _X_EXPORT void
-XAATEGlyphRendererScanlineMSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
+
+XAAWriteBitmapScanlineColorExpand3LSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                                    int x, int y, int w, int h,
+                                                    unsigned char *src,
+                                                    int srcwidth,
+                                                    int skipleft,
+                                                    int fg, int bg,
+                                                    int rop,
+                                                    unsigned int planemask);
 
 extern _X_EXPORT void
-XAATEGlyphRendererScanline3MSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
+
+XAAWritePixmap(ScrnInfoPtr pScrn,
+               int x, int y, int w, int h,
+               unsigned char *src,
+               int srcwidth,
+               int rop,
+               unsigned int planemask,
+               int transparency_color, int bpp, int depth);
 
 extern _X_EXPORT void
-XAATEGlyphRendererScanlineLSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
+
+XAAWritePixmapScanline(ScrnInfoPtr pScrn,
+                       int x, int y, int w, int h,
+                       unsigned char *src,
+                       int srcwidth,
+                       int rop,
+                       unsigned int planemask,
+                       int transparency_color, int bpp, int depth);
+
+typedef void (*ClipAndRenderRectsFunc) (GCPtr, int, BoxPtr, int, int);
 
 extern _X_EXPORT void
-XAATEGlyphRendererScanline3LSBFirst (
-    ScrnInfoPtr pScrn,
-    int x, int y, int w, int h, int skipleft, int startline, 
-    unsigned int **glyphs, int glyphWidth,
-    int fg, int bg, int rop, unsigned planemask
-);
 
+XAAClipAndRenderRects(GCPtr pGC,
+                      ClipAndRenderRectsFunc func,
+                      int nrectFill, xRectangle *prectInit, int xorg, int yorg);
 
-extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncMSBFirstFixedBase[32])(
-   CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width
-);
+typedef void (*ClipAndRenderSpansFunc) (GCPtr, int, DDXPointPtr, int *,
+                                        int, int, int);
 
-extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncMSBFirst[32])(
-   CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width
-);
+extern _X_EXPORT void
 
-extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncLSBFirstFixedBase[32])(
-   CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width
-);
+XAAClipAndRenderSpans(GCPtr pGC,
+                      DDXPointPtr ppt,
+                      int *pwidth,
+                      int nspans,
+                      int fSorted,
+                      ClipAndRenderSpansFunc func, int xorg, int yorg);
 
-extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncLSBFirst[32])(
-   CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width
-);
+extern _X_EXPORT void
+
+XAAFillSolidRects(ScrnInfoPtr pScrn,
+                  int fg, int rop,
+                  unsigned int planemask, int nBox, BoxPtr pBox);
+
+extern _X_EXPORT void
+
+XAAFillMono8x8PatternRects(ScrnInfoPtr pScrn,
+                           int fg, int bg, int rop,
+                           unsigned int planemask,
+                           int nBox,
+                           BoxPtr pBox, int pat0, int pat1, int xorg, int yorg);
 
-extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirstFixedBase(void);
+extern _X_EXPORT void
+
+XAAFillMono8x8PatternRectsScreenOrigin(ScrnInfoPtr pScrn,
+                                       int fg, int bg, int rop,
+                                       unsigned int planemask,
+                                       int nBox,
+                                       BoxPtr pBox,
+                                       int pat0, int pat1, int xorg, int yorg);
+
+extern _X_EXPORT void
+
+XAAFillColor8x8PatternRectsScreenOrigin(ScrnInfoPtr pScrn,
+                                        int rop,
+                                        unsigned int planemask,
+                                        int nBox,
+                                        BoxPtr pBox,
+                                        int xorigin, int yorigin,
+                                        XAACacheInfoPtr pCache);
+
+extern _X_EXPORT void
+
+XAAFillColor8x8PatternRects(ScrnInfoPtr pScrn,
+                            int rop,
+                            unsigned int planemask,
+                            int nBox,
+                            BoxPtr pBox,
+                            int xorigin, int yorigin, XAACacheInfoPtr pCache);
+
+extern _X_EXPORT void
+
+XAAFillCacheBltRects(ScrnInfoPtr pScrn,
+                     int rop,
+                     unsigned int planemask,
+                     int nBox,
+                     BoxPtr pBox, int xorg, int yorg, XAACacheInfoPtr pCache);
+
+extern _X_EXPORT void
+
+XAAFillCacheExpandRects(ScrnInfoPtr pScrn,
+                        int fg, int bg, int rop,
+                        unsigned int planemask,
+                        int nBox,
+                        BoxPtr pBox, int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillImageWriteRects(ScrnInfoPtr pScrn,
+                       int rop,
+                       unsigned int planemask,
+                       int nBox,
+                       BoxPtr pBox, int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAPolyFillRect(DrawablePtr pDraw,
+                GCPtr pGC, int nrectFill, xRectangle *prectInit);
+
+extern _X_EXPORT void
+
+XAATEGlyphRendererMSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                    int x, int y, int w, int h, int skipleft,
+                                    int startline, unsigned int **glyphs,
+                                    int glyphWidth, int fg, int bg, int rop,
+                                    unsigned planemask);
+
+extern _X_EXPORT void
+
+XAATEGlyphRenderer3MSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                     int x, int y, int w, int h, int skipleft,
+                                     int startline, unsigned int **glyphs,
+                                     int glyphWidth, int fg, int bg, int rop,
+                                     unsigned planemask);
+
+extern _X_EXPORT void
+
+XAATEGlyphRendererMSBFirst(ScrnInfoPtr pScrn,
+                           int x, int y, int w, int h, int skipleft,
+                           int startline, unsigned int **glyphs, int glyphWidth,
+                           int fg, int bg, int rop, unsigned planemask);
+
+extern _X_EXPORT void
+
+XAATEGlyphRenderer3MSBFirst(ScrnInfoPtr pScrn,
+                            int x, int y, int w, int h, int skipleft,
+                            int startline, unsigned int **glyphs,
+                            int glyphWidth, int fg, int bg, int rop,
+                            unsigned planemask);
+
+extern _X_EXPORT void
+
+XAATEGlyphRendererLSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                    int x, int y, int w, int h, int skipleft,
+                                    int startline, unsigned int **glyphs,
+                                    int glyphWidth, int fg, int bg, int rop,
+                                    unsigned planemask);
+
+extern _X_EXPORT void
+
+XAATEGlyphRenderer3LSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                     int x, int y, int w, int h, int skipleft,
+                                     int startline, unsigned int **glyphs,
+                                     int glyphWidth, int fg, int bg, int rop,
+                                     unsigned planemask);
+
+extern _X_EXPORT void
+
+XAATEGlyphRendererLSBFirst(ScrnInfoPtr pScrn,
+                           int x, int y, int w, int h, int skipleft,
+                           int startline, unsigned int **glyphs, int glyphWidth,
+                           int fg, int bg, int rop, unsigned planemask);
+
+extern _X_EXPORT void
+
+XAATEGlyphRenderer3LSBFirst(ScrnInfoPtr pScrn,
+                            int x, int y, int w, int h, int skipleft,
+                            int startline, unsigned int **glyphs,
+                            int glyphWidth, int fg, int bg, int rop,
+                            unsigned planemask);
+
+extern _X_EXPORT void
+
+XAATEGlyphRendererScanlineMSBFirst(ScrnInfoPtr pScrn,
+                                   int x, int y, int w, int h, int skipleft,
+                                   int startline, unsigned int **glyphs,
+                                   int glyphWidth, int fg, int bg, int rop,
+                                   unsigned planemask);
+
+extern _X_EXPORT void
+
+XAATEGlyphRendererScanline3MSBFirst(ScrnInfoPtr pScrn,
+                                    int x, int y, int w, int h, int skipleft,
+                                    int startline, unsigned int **glyphs,
+                                    int glyphWidth, int fg, int bg, int rop,
+                                    unsigned planemask);
+
+extern _X_EXPORT void
+
+XAATEGlyphRendererScanlineLSBFirst(ScrnInfoPtr pScrn,
+                                   int x, int y, int w, int h, int skipleft,
+                                   int startline, unsigned int **glyphs,
+                                   int glyphWidth, int fg, int bg, int rop,
+                                   unsigned planemask);
+
+extern _X_EXPORT void
+
+XAATEGlyphRendererScanline3LSBFirst(ScrnInfoPtr pScrn,
+                                    int x, int y, int w, int h, int skipleft,
+                                    int startline, unsigned int **glyphs,
+                                    int glyphWidth, int fg, int bg, int rop,
+                                    unsigned planemask);
+
+extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncMSBFirstFixedBase[32]) (CARD32
+                                                                       *base,
+                                                                       unsigned
+                                                                       int
+                                                                       **glyphp,
+                                                                       int line,
+                                                                       int
+                                                                       nglyph,
+                                                                       int
+                                                                       width);
+
+extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncMSBFirst[32]) (CARD32 *base,
+                                                              unsigned int
+                                                              **glyphp,
+                                                              int line,
+                                                              int nglyph,
+                                                              int width);
+
+extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncLSBFirstFixedBase[32]) (CARD32
+                                                                       *base,
+                                                                       unsigned
+                                                                       int
+                                                                       **glyphp,
+                                                                       int line,
+                                                                       int
+                                                                       nglyph,
+                                                                       int
+                                                                       width);
+
+extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncLSBFirst[32]) (CARD32 *base,
+                                                              unsigned int
+                                                              **glyphp,
+                                                              int line,
+                                                              int nglyph,
+                                                              int width);
+
+extern _X_EXPORT GlyphScanlineFuncPtr
+    *XAAGetGlyphScanlineFuncMSBFirstFixedBase(void);
 extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirst(void);
-extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirstFixedBase(void);
+extern _X_EXPORT GlyphScanlineFuncPtr
+    *XAAGetGlyphScanlineFuncLSBFirstFixedBase(void);
 extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirst(void);
 
 extern _X_EXPORT void
-XAAFillColorExpandRectsLSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandRects3LSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandRectsLSBFirstFixedBase(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandRects3LSBFirstFixedBase(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandRectsMSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandRects3MSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandRectsMSBFirstFixedBase(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandRects3MSBFirstFixedBase(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillScanlineColorExpandRectsLSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillScanlineColorExpandRects3LSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillScanlineColorExpandRectsMSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillScanlineColorExpandRects3MSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int nBox,
-   BoxPtr pBox,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandSpansLSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandSpans3LSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandSpansLSBFirstFixedBase(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandSpans3LSBFirstFixedBase(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandSpansMSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandSpans3MSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandSpansMSBFirstFixedBase(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillColorExpandSpans3MSBFirstFixedBase(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillScanlineColorExpandSpansLSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillScanlineColorExpandSpans3LSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAPutImage(
-    DrawablePtr pDraw,
-    GCPtr       pGC,
-    int         depth, 
-    int 	x, 
-    int		y, 
-    int		w, 
-    int		h,
-    int         leftPad,
-    int         format,
-    char        *pImage
-);
-
-extern _X_EXPORT void
-XAAFillScanlineColorExpandSpansMSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillScanlineColorExpandSpans3MSBFirst(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-
-extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncMSBFirstFixedBase[6])(
-   CARD32* base, CARD32* src, int offset, int width, int dwords
-);
-
-extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncMSBFirst[6])(
-   CARD32* base, CARD32* src, int offset, int width, int dwords
-);
-
-extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncLSBFirstFixedBase[6])(
-   CARD32* base, CARD32* src, int offset, int width, int dwords
-);
-
-extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncLSBFirst[6])(
-   CARD32* base, CARD32* src, int offset, int width, int dwords
-);
-
-extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirstFixedBase(void);
-extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirst(void);
-extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirstFixedBase(void);
-extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirst(void);
-extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3MSBFirstFixedBase(void);
-extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3MSBFirst(void);
-extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3LSBFirstFixedBase(void);
-extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3LSBFirst(void);
+
+XAAFillColorExpandRectsLSBFirst(ScrnInfoPtr pScrn,
+                                int fg, int bg, int rop,
+                                unsigned int planemask,
+                                int nBox,
+                                BoxPtr pBox,
+                                int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandRects3LSBFirst(ScrnInfoPtr pScrn,
+                                 int fg, int bg, int rop,
+                                 unsigned int planemask,
+                                 int nBox,
+                                 BoxPtr pBox,
+                                 int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandRectsLSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                         int fg, int bg, int rop,
+                                         unsigned int planemask,
+                                         int nBox,
+                                         BoxPtr pBox,
+                                         int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandRects3LSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                          int fg, int bg, int rop,
+                                          unsigned int planemask,
+                                          int nBox,
+                                          BoxPtr pBox,
+                                          int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandRectsMSBFirst(ScrnInfoPtr pScrn,
+                                int fg, int bg, int rop,
+                                unsigned int planemask,
+                                int nBox,
+                                BoxPtr pBox,
+                                int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandRects3MSBFirst(ScrnInfoPtr pScrn,
+                                 int fg, int bg, int rop,
+                                 unsigned int planemask,
+                                 int nBox,
+                                 BoxPtr pBox,
+                                 int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandRectsMSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                         int fg, int bg, int rop,
+                                         unsigned int planemask,
+                                         int nBox,
+                                         BoxPtr pBox,
+                                         int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandRects3MSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                          int fg, int bg, int rop,
+                                          unsigned int planemask,
+                                          int nBox,
+                                          BoxPtr pBox,
+                                          int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillScanlineColorExpandRectsLSBFirst(ScrnInfoPtr pScrn,
+                                        int fg, int bg, int rop,
+                                        unsigned int planemask,
+                                        int nBox,
+                                        BoxPtr pBox,
+                                        int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillScanlineColorExpandRects3LSBFirst(ScrnInfoPtr pScrn,
+                                         int fg, int bg, int rop,
+                                         unsigned int planemask,
+                                         int nBox,
+                                         BoxPtr pBox,
+                                         int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillScanlineColorExpandRectsMSBFirst(ScrnInfoPtr pScrn,
+                                        int fg, int bg, int rop,
+                                        unsigned int planemask,
+                                        int nBox,
+                                        BoxPtr pBox,
+                                        int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillScanlineColorExpandRects3MSBFirst(ScrnInfoPtr pScrn,
+                                         int fg, int bg, int rop,
+                                         unsigned int planemask,
+                                         int nBox,
+                                         BoxPtr pBox,
+                                         int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandSpansLSBFirst(ScrnInfoPtr pScrn,
+                                int fg, int bg, int rop,
+                                unsigned int planemask,
+                                int n,
+                                DDXPointPtr ppt,
+                                int *pwidth,
+                                int fSorted,
+                                int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandSpans3LSBFirst(ScrnInfoPtr pScrn,
+                                 int fg, int bg, int rop,
+                                 unsigned int planemask,
+                                 int n,
+                                 DDXPointPtr ppt,
+                                 int *pwidth,
+                                 int fSorted,
+                                 int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandSpansLSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                         int fg, int bg, int rop,
+                                         unsigned int planemask,
+                                         int n,
+                                         DDXPointPtr ppt,
+                                         int *pwidth,
+                                         int fSorted,
+                                         int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandSpans3LSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                          int fg, int bg, int rop,
+                                          unsigned int planemask,
+                                          int n,
+                                          DDXPointPtr ppt,
+                                          int *pwidth,
+                                          int fSorted,
+                                          int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandSpansMSBFirst(ScrnInfoPtr pScrn,
+                                int fg, int bg, int rop,
+                                unsigned int planemask,
+                                int n,
+                                DDXPointPtr ppt,
+                                int *pwidth,
+                                int fSorted,
+                                int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandSpans3MSBFirst(ScrnInfoPtr pScrn,
+                                 int fg, int bg, int rop,
+                                 unsigned int planemask,
+                                 int n,
+                                 DDXPointPtr ppt,
+                                 int *pwidth,
+                                 int fSorted,
+                                 int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandSpansMSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                         int fg, int bg, int rop,
+                                         unsigned int planemask,
+                                         int n,
+                                         DDXPointPtr ppt,
+                                         int *pwidth,
+                                         int fSorted,
+                                         int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillColorExpandSpans3MSBFirstFixedBase(ScrnInfoPtr pScrn,
+                                          int fg, int bg, int rop,
+                                          unsigned int planemask,
+                                          int n,
+                                          DDXPointPtr ppt,
+                                          int *pwidth,
+                                          int fSorted,
+                                          int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillScanlineColorExpandSpansLSBFirst(ScrnInfoPtr pScrn,
+                                        int fg, int bg, int rop,
+                                        unsigned int planemask,
+                                        int n,
+                                        DDXPointPtr ppt,
+                                        int *pwidth,
+                                        int fSorted,
+                                        int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillScanlineColorExpandSpans3LSBFirst(ScrnInfoPtr pScrn,
+                                         int fg, int bg, int rop,
+                                         unsigned int planemask,
+                                         int n,
+                                         DDXPointPtr ppt,
+                                         int *pwidth,
+                                         int fSorted,
+                                         int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAPutImage(DrawablePtr pDraw,
+            GCPtr pGC,
+            int depth,
+            int x, int y, int w, int h, int leftPad, int format, char *pImage);
+
+extern _X_EXPORT void
+
+XAAFillScanlineColorExpandSpansMSBFirst(ScrnInfoPtr pScrn,
+                                        int fg, int bg, int rop,
+                                        unsigned int planemask,
+                                        int n,
+                                        DDXPointPtr ppt,
+                                        int *pwidth,
+                                        int fSorted,
+                                        int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillScanlineColorExpandSpans3MSBFirst(ScrnInfoPtr pScrn,
+                                         int fg, int bg, int rop,
+                                         unsigned int planemask,
+                                         int n,
+                                         DDXPointPtr ppt,
+                                         int *pwidth,
+                                         int fSorted,
+                                         int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncMSBFirstFixedBase[6]) (CARD32
+                                                                        *base,
+                                                                        CARD32
+                                                                        *src,
+                                                                        int
+                                                                        offset,
+                                                                        int
+                                                                        width,
+                                                                        int
+                                                                        dwords);
+
+extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncMSBFirst[6]) (CARD32 *base,
+                                                               CARD32 *src,
+                                                               int offset,
+                                                               int width,
+                                                               int dwords);
+
+extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncLSBFirstFixedBase[6]) (CARD32
+                                                                        *base,
+                                                                        CARD32
+                                                                        *src,
+                                                                        int
+                                                                        offset,
+                                                                        int
+                                                                        width,
+                                                                        int
+                                                                        dwords);
+
+extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncLSBFirst[6]) (CARD32 *base,
+                                                               CARD32 *src,
+                                                               int offset,
+                                                               int width,
+                                                               int dwords);
+
+extern _X_EXPORT StippleScanlineProcPtr
+    *XAAGetStippleScanlineFuncMSBFirstFixedBase(void);
+extern _X_EXPORT StippleScanlineProcPtr
+    *XAAGetStippleScanlineFuncMSBFirst(void);
+extern _X_EXPORT StippleScanlineProcPtr
+    *XAAGetStippleScanlineFuncLSBFirstFixedBase(void);
+extern _X_EXPORT StippleScanlineProcPtr
+    *XAAGetStippleScanlineFuncLSBFirst(void);
+extern _X_EXPORT StippleScanlineProcPtr
+    *XAAGetStippleScanlineFunc3MSBFirstFixedBase(void);
+extern _X_EXPORT StippleScanlineProcPtr
+    *XAAGetStippleScanlineFunc3MSBFirst(void);
+extern _X_EXPORT StippleScanlineProcPtr
+    *XAAGetStippleScanlineFunc3LSBFirstFixedBase(void);
+extern _X_EXPORT StippleScanlineProcPtr
+    *XAAGetStippleScanlineFunc3LSBFirst(void);
 
 extern _X_EXPORT int
-XAAPolyText8TEColorExpansion(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int	x, int y,
-    int count,
-    char *chars
-);
+
+XAAPolyText8TEColorExpansion(DrawablePtr pDraw,
+                             GCPtr pGC, int x, int y, int count, char *chars);
 
 extern _X_EXPORT int
-XAAPolyText16TEColorExpansion(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int	x, int y,
-    int count,
-    unsigned short *chars
-);
-
-extern _X_EXPORT void
-XAAImageText8TEColorExpansion(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int	x, int y,
-    int count,
-    char *chars
-);
-
-extern _X_EXPORT void
-XAAImageText16TEColorExpansion(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int	x, int y,
-    int count,
-    unsigned short *chars
-);
-
-extern _X_EXPORT void
-XAAImageGlyphBltTEColorExpansion(
-    DrawablePtr pDrawable,
-    GCPtr pGC,
-    int xInit, int yInit,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase
-);
-
-extern _X_EXPORT void
-XAAPolyGlyphBltTEColorExpansion(
-    DrawablePtr pDrawable,
-    GCPtr pGC,
-    int xInit, int yInit,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase
-);
 
+XAAPolyText16TEColorExpansion(DrawablePtr pDraw,
+                              GCPtr pGC,
+                              int x, int y, int count, unsigned short *chars);
+
+extern _X_EXPORT void
+
+XAAImageText8TEColorExpansion(DrawablePtr pDraw,
+                              GCPtr pGC, int x, int y, int count, char *chars);
+
+extern _X_EXPORT void
+
+XAAImageText16TEColorExpansion(DrawablePtr pDraw,
+                               GCPtr pGC,
+                               int x, int y, int count, unsigned short *chars);
+
+extern _X_EXPORT void
+
+XAAImageGlyphBltTEColorExpansion(DrawablePtr pDrawable,
+                                 GCPtr pGC,
+                                 int xInit, int yInit,
+                                 unsigned int nglyph,
+                                 CharInfoPtr * ppci, pointer pglyphBase);
+
+extern _X_EXPORT void
+
+XAAPolyGlyphBltTEColorExpansion(DrawablePtr pDrawable,
+                                GCPtr pGC,
+                                int xInit, int yInit,
+                                unsigned int nglyph,
+                                CharInfoPtr * ppci, pointer pglyphBase);
 
 extern _X_EXPORT int
-XAAPolyText8NonTEColorExpansion(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int	x, int y,
-    int count,
-    char *chars
-);
+
+XAAPolyText8NonTEColorExpansion(DrawablePtr pDraw,
+                                GCPtr pGC,
+                                int x, int y, int count, char *chars);
 
 extern _X_EXPORT int
-XAAPolyText16NonTEColorExpansion(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int	x, int y,
-    int count,
-    unsigned short *chars
-);
-
-extern _X_EXPORT void
-XAAImageText8NonTEColorExpansion(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int	x, int y,
-    int count,
-    char *chars
-);
-
-extern _X_EXPORT void
-XAAImageText16NonTEColorExpansion(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int	x, int y,
-    int count,
-    unsigned short *chars
-);
-
-extern _X_EXPORT void
-XAAImageGlyphBltNonTEColorExpansion(
-    DrawablePtr pDrawable,
-    GCPtr pGC,
-    int xInit, int yInit,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase
-);
-
-extern _X_EXPORT void
-XAAPolyGlyphBltNonTEColorExpansion(
-    DrawablePtr pDrawable,
-    GCPtr pGC,
-    int xInit, int yInit,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase
-);
-
-
-extern _X_EXPORT void XAANonTEGlyphRenderer(
-   ScrnInfoPtr pScrn,
-   int x, int y, int n,
-   NonTEGlyphPtr glyphs,
-   BoxPtr pbox,
-   int fg, int rop,
-   unsigned int planemask
-);
-
-extern _X_EXPORT void
-XAAFillSolidSpans(
-   ScrnInfoPtr pScrn,
-   int fg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth, int fSorted 
-);
-
-extern _X_EXPORT void
-XAAFillMono8x8PatternSpans(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth, int fSorted,
-   int patx, int paty,
-   int xorg, int yorg 
-);
-
-extern _X_EXPORT void
-XAAFillMono8x8PatternSpansScreenOrigin(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth, int fSorted,
-   int patx, int paty,
-   int xorg, int yorg 
-);
-
-extern _X_EXPORT void
-XAAFillColor8x8PatternSpansScreenOrigin(
-   ScrnInfoPtr pScrn,
-   int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth, int fSorted,
-   XAACacheInfoPtr,
-   int xorigin, int yorigin 
-);
-
-extern _X_EXPORT void
-XAAFillColor8x8PatternSpans(
-   ScrnInfoPtr pScrn,
-   int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth, int fSorted,
-   XAACacheInfoPtr,
-   int xorigin, int yorigin 
-);
-
-extern _X_EXPORT void
-XAAFillCacheBltSpans(
-   ScrnInfoPtr pScrn,
-   int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr points,
-   int *widths,
-   int fSorted,
-   XAACacheInfoPtr pCache,
-   int xorg, int yorg
-);
-
-extern _X_EXPORT void
-XAAFillCacheExpandSpans(
-   ScrnInfoPtr pScrn,
-   int fg, int bg, int rop,
-   unsigned int planemask,
-   int n,
-   DDXPointPtr ppt,
-   int *pwidth,
-   int fSorted,
-   int xorg, int yorg,
-   PixmapPtr pPix
-);
-
-extern _X_EXPORT void
-XAAFillSpans(
-    DrawablePtr pDrawable,
-    GC		*pGC,
-    int		nInit,
-    DDXPointPtr pptInit,
-    int *pwidth,
-    int fSorted 
-);
-
-
-extern _X_EXPORT void
-XAAInitPixmapCache(
-    ScreenPtr pScreen, 
-    RegionPtr areas,
-    pointer data
-);
-
-extern _X_EXPORT void
-XAAWriteBitmapToCache(
-   ScrnInfoPtr pScrn,
-   int x, int y, int w, int h,
-   unsigned char *src,
-   int srcwidth,
-   int fg, int bg
-);
- 
-extern _X_EXPORT void
-XAAWriteBitmapToCacheLinear(
-   ScrnInfoPtr pScrn,
-   int x, int y, int w, int h,
-   unsigned char *src,
-   int srcwidth,
-   int fg, int bg
-);
-
-extern _X_EXPORT void
-XAAWritePixmapToCache(
-   ScrnInfoPtr pScrn,
-   int x, int y, int w, int h,
-   unsigned char *src,
-   int srcwidth,
-   int bpp, int depth
-);
-
-extern _X_EXPORT void
-XAAWritePixmapToCacheLinear(
-   ScrnInfoPtr pScrn,
-   int x, int y, int w, int h,
-   unsigned char *src,
-   int srcwidth,
-   int bpp, int depth
-);
-
-extern _X_EXPORT void
-XAASolidHorVertLineAsRects(
-   ScrnInfoPtr pScrn,
-   int x, int y, int len, int dir
-);
-
-extern _X_EXPORT void
-XAASolidHorVertLineAsTwoPoint(
-   ScrnInfoPtr pScrn,
-   int x, int y, int len, int dir
-);
-
-extern _X_EXPORT void
-XAASolidHorVertLineAsBresenham(
-   ScrnInfoPtr pScrn,
-   int x, int y, int len, int dir
-);
-
+
+XAAPolyText16NonTEColorExpansion(DrawablePtr pDraw,
+                                 GCPtr pGC,
+                                 int x, int y,
+                                 int count, unsigned short *chars);
+
+extern _X_EXPORT void
+
+XAAImageText8NonTEColorExpansion(DrawablePtr pDraw,
+                                 GCPtr pGC,
+                                 int x, int y, int count, char *chars);
+
+extern _X_EXPORT void
+
+XAAImageText16NonTEColorExpansion(DrawablePtr pDraw,
+                                  GCPtr pGC,
+                                  int x, int y,
+                                  int count, unsigned short *chars);
+
+extern _X_EXPORT void
+
+XAAImageGlyphBltNonTEColorExpansion(DrawablePtr pDrawable,
+                                    GCPtr pGC,
+                                    int xInit, int yInit,
+                                    unsigned int nglyph,
+                                    CharInfoPtr * ppci, pointer pglyphBase);
+
+extern _X_EXPORT void
+
+XAAPolyGlyphBltNonTEColorExpansion(DrawablePtr pDrawable,
+                                   GCPtr pGC,
+                                   int xInit, int yInit,
+                                   unsigned int nglyph,
+                                   CharInfoPtr * ppci, pointer pglyphBase);
+
+extern _X_EXPORT void XAANonTEGlyphRenderer(ScrnInfoPtr pScrn,
+                                            int x, int y, int n,
+                                            NonTEGlyphPtr glyphs,
+                                            BoxPtr pbox,
+                                            int fg, int rop,
+                                            unsigned int planemask);
+
+extern _X_EXPORT void
+
+XAAFillSolidSpans(ScrnInfoPtr pScrn,
+                  int fg, int rop,
+                  unsigned int planemask,
+                  int n, DDXPointPtr ppt, int *pwidth, int fSorted);
+
+extern _X_EXPORT void
+
+XAAFillMono8x8PatternSpans(ScrnInfoPtr pScrn,
+                           int fg, int bg, int rop,
+                           unsigned int planemask,
+                           int n,
+                           DDXPointPtr ppt,
+                           int *pwidth, int fSorted,
+                           int patx, int paty, int xorg, int yorg);
+
+extern _X_EXPORT void
+
+XAAFillMono8x8PatternSpansScreenOrigin(ScrnInfoPtr pScrn,
+                                       int fg, int bg, int rop,
+                                       unsigned int planemask,
+                                       int n,
+                                       DDXPointPtr ppt,
+                                       int *pwidth, int fSorted,
+                                       int patx, int paty, int xorg, int yorg);
+
+extern _X_EXPORT void
+
+XAAFillColor8x8PatternSpansScreenOrigin(ScrnInfoPtr pScrn,
+                                        int rop,
+                                        unsigned int planemask,
+                                        int n,
+                                        DDXPointPtr ppt,
+                                        int *pwidth, int fSorted,
+                                        XAACacheInfoPtr,
+                                        int xorigin, int yorigin);
+
+extern _X_EXPORT void
+
+XAAFillColor8x8PatternSpans(ScrnInfoPtr pScrn,
+                            int rop,
+                            unsigned int planemask,
+                            int n,
+                            DDXPointPtr ppt,
+                            int *pwidth, int fSorted,
+                            XAACacheInfoPtr, int xorigin, int yorigin);
+
+extern _X_EXPORT void
+
+XAAFillCacheBltSpans(ScrnInfoPtr pScrn,
+                     int rop,
+                     unsigned int planemask,
+                     int n,
+                     DDXPointPtr points,
+                     int *widths,
+                     int fSorted, XAACacheInfoPtr pCache, int xorg, int yorg);
+
+extern _X_EXPORT void
+
+XAAFillCacheExpandSpans(ScrnInfoPtr pScrn,
+                        int fg, int bg, int rop,
+                        unsigned int planemask,
+                        int n,
+                        DDXPointPtr ppt,
+                        int *pwidth,
+                        int fSorted, int xorg, int yorg, PixmapPtr pPix);
+
+extern _X_EXPORT void
+
+XAAFillSpans(DrawablePtr pDrawable,
+             GC * pGC,
+             int nInit, DDXPointPtr pptInit, int *pwidth, int fSorted);
+
+extern _X_EXPORT void
+ XAAInitPixmapCache(ScreenPtr pScreen, RegionPtr areas, pointer data);
 
 extern _X_EXPORT void
-XAAPolyRectangleThinSolid(
-    DrawablePtr  pDrawable,
-    GCPtr        pGC,    
-    int	         nRectsInit,
-    xRectangle  *pRectsInit 
-);
 
+XAAWriteBitmapToCache(ScrnInfoPtr pScrn,
+                      int x, int y, int w, int h,
+                      unsigned char *src, int srcwidth, int fg, int bg);
 
 extern _X_EXPORT void
-XAAPolylinesWideSolid (
-   DrawablePtr	pDrawable,
-   GCPtr	pGC,
-   int		mode,
-   int 		npt,
-   DDXPointPtr	pPts
-);
+
+XAAWriteBitmapToCacheLinear(ScrnInfoPtr pScrn,
+                            int x, int y, int w, int h,
+                            unsigned char *src, int srcwidth, int fg, int bg);
+
+extern _X_EXPORT void
+
+XAAWritePixmapToCache(ScrnInfoPtr pScrn,
+                      int x, int y, int w, int h,
+                      unsigned char *src, int srcwidth, int bpp, int depth);
+
+extern _X_EXPORT void
+
+XAAWritePixmapToCacheLinear(ScrnInfoPtr pScrn,
+                            int x, int y, int w, int h,
+                            unsigned char *src,
+                            int srcwidth, int bpp, int depth);
 
 extern _X_EXPORT void
-XAAFillPolygonSolid(
-    DrawablePtr	pDrawable,
-    GCPtr	pGC,
-    int		shape,
-    int		mode,
-    int		count,
-    DDXPointPtr	ptsIn 
-);
+ XAASolidHorVertLineAsRects(ScrnInfoPtr pScrn, int x, int y, int len, int dir);
+
+extern _X_EXPORT void
+
+XAASolidHorVertLineAsTwoPoint(ScrnInfoPtr pScrn,
+                              int x, int y, int len, int dir);
+
+extern _X_EXPORT void
+
+XAASolidHorVertLineAsBresenham(ScrnInfoPtr pScrn,
+                               int x, int y, int len, int dir);
+
+extern _X_EXPORT void
+
+XAAPolyRectangleThinSolid(DrawablePtr pDrawable,
+                          GCPtr pGC, int nRectsInit, xRectangle *pRectsInit);
+
+extern _X_EXPORT void
+
+XAAPolylinesWideSolid(DrawablePtr pDrawable,
+                      GCPtr pGC, int mode, int npt, DDXPointPtr pPts);
 
 extern _X_EXPORT void
-XAAFillPolygonStippled(
-    DrawablePtr	pDrawable,
-    GCPtr	pGC,
-    int		shape,
-    int		mode,
-    int		count,
-    DDXPointPtr	ptsIn 
-);
 
+XAAFillPolygonSolid(DrawablePtr pDrawable,
+                    GCPtr pGC,
+                    int shape, int mode, int count, DDXPointPtr ptsIn);
 
 extern _X_EXPORT void
-XAAFillPolygonTiled(
-    DrawablePtr	pDrawable,
-    GCPtr	pGC,
-    int		shape,
-    int		mode,
-    int		count,
-    DDXPointPtr	ptsIn 
-);
 
+XAAFillPolygonStippled(DrawablePtr pDrawable,
+                       GCPtr pGC,
+                       int shape, int mode, int count, DDXPointPtr ptsIn);
+
+extern _X_EXPORT void
+
+XAAFillPolygonTiled(DrawablePtr pDrawable,
+                    GCPtr pGC,
+                    int shape, int mode, int count, DDXPointPtr ptsIn);
 
 extern _X_EXPORT int
-XAAIsEasyPolygon(
-   DDXPointPtr ptsIn,
-   int count, 
-   BoxPtr extents,
-   int origin,		
-   DDXPointPtr *topPoint, 
-   int *topY, int *bottomY,
-   int shape
-);
-
-extern _X_EXPORT void
-XAAFillPolygonHelper(
-    ScrnInfoPtr pScrn,
-    DDXPointPtr	ptsIn,
-    int 	count,
-    DDXPointPtr topPoint,
-    int 	y,
-    int		maxy,
-    int		origin,
-    RectFuncPtr RectFunc,
-    TrapFuncPtr TrapFunc,
-    int 	xorg,
-    int		yorg,
-    XAACacheInfoPtr pCache
-);
-
-extern _X_EXPORT void
-XAAPolySegment(
-    DrawablePtr	pDrawable,
-    GCPtr	pGC,
-    int		nseg,
-    xSegment	*pSeg
-);
-
-extern _X_EXPORT void
-XAAPolyLines(
-    DrawablePtr pDrawable,
-    GCPtr	pGC,
-    int		mode,
-    int		npt,
-    DDXPointPtr pptInit
-);
-
-extern _X_EXPORT void
-XAAPolySegmentDashed(
-    DrawablePtr	pDrawable,
-    GCPtr	pGC,
-    int		nseg,
-    xSegment	*pSeg
-);
-
-extern _X_EXPORT void
-XAAPolyLinesDashed(
-    DrawablePtr pDrawable,
-    GCPtr	pGC,
-    int		mode,
-    int		npt,
-    DDXPointPtr pptInit
-);
-
-
-extern _X_EXPORT void
-XAAWriteMono8x8PatternToCache(ScrnInfoPtr pScrn, XAACacheInfoPtr pCache);
-
-extern _X_EXPORT void
-XAAWriteColor8x8PatternToCache(
-   ScrnInfoPtr pScrn, 
-   PixmapPtr pPix, 
-   XAACacheInfoPtr pCache
-);
-
-extern _X_EXPORT void
-XAARotateMonoPattern(
-    int *pat0, int *pat1,
-    int xoffset, int yoffset,
-    Bool msbfirst
-);
+
+XAAIsEasyPolygon(DDXPointPtr ptsIn,
+                 int count,
+                 BoxPtr extents,
+                 int origin,
+                 DDXPointPtr * topPoint, int *topY, int *bottomY, int shape);
+
+extern _X_EXPORT void
+
+XAAFillPolygonHelper(ScrnInfoPtr pScrn,
+                     DDXPointPtr ptsIn,
+                     int count,
+                     DDXPointPtr topPoint,
+                     int y,
+                     int maxy,
+                     int origin,
+                     RectFuncPtr RectFunc,
+                     TrapFuncPtr TrapFunc,
+                     int xorg, int yorg, XAACacheInfoPtr pCache);
+
+extern _X_EXPORT void
+ XAAPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pSeg);
+
+extern _X_EXPORT void
+
+XAAPolyLines(DrawablePtr pDrawable,
+             GCPtr pGC, int mode, int npt, DDXPointPtr pptInit);
+
+extern _X_EXPORT void
+
+XAAPolySegmentDashed(DrawablePtr pDrawable,
+                     GCPtr pGC, int nseg, xSegment * pSeg);
+
+extern _X_EXPORT void
+
+XAAPolyLinesDashed(DrawablePtr pDrawable,
+                   GCPtr pGC, int mode, int npt, DDXPointPtr pptInit);
+
+extern _X_EXPORT void
+ XAAWriteMono8x8PatternToCache(ScrnInfoPtr pScrn, XAACacheInfoPtr pCache);
+
+extern _X_EXPORT void
+
+XAAWriteColor8x8PatternToCache(ScrnInfoPtr pScrn,
+                               PixmapPtr pPix, XAACacheInfoPtr pCache);
+
+extern _X_EXPORT void
+
+XAARotateMonoPattern(int *pat0, int *pat1,
+                     int xoffset, int yoffset, Bool msbfirst);
 
 extern _X_EXPORT void XAAComputeDash(GCPtr pGC);
 
-extern _X_EXPORT void XAAMoveDWORDS_FixedBase(
-   register CARD32* dest,
-   register CARD32* src,
-   register int dwords 
-);
+extern _X_EXPORT void XAAMoveDWORDS_FixedBase(register CARD32 *dest,
+                                              register CARD32 *src,
+                                              register int dwords);
 
-extern _X_EXPORT void XAAMoveDWORDS_FixedSrc(
-   register CARD32* dest,
-   register CARD32* src,
-   register int dwords 
-);
+extern _X_EXPORT void XAAMoveDWORDS_FixedSrc(register CARD32 *dest,
+                                             register CARD32 *src,
+                                             register int dwords);
 
-extern _X_EXPORT void XAAMoveDWORDS(
-   register CARD32* dest,
-   register CARD32* src,
-   register int dwords 
-);
+extern _X_EXPORT void XAAMoveDWORDS(register CARD32 *dest,
+                                    register CARD32 *src, register int dwords);
 
 extern _X_EXPORT int
-XAAGetRectClipBoxes(
-    GCPtr pGC,
-    BoxPtr pboxClippedBase,
-    int nrectFill,
-    xRectangle *prectInit
-);
+
+XAAGetRectClipBoxes(GCPtr pGC,
+                    BoxPtr pboxClippedBase,
+                    int nrectFill, xRectangle *prectInit);
 
 extern _X_EXPORT void
-XAASetupOverlay8_32Planar(ScreenPtr);
+ XAASetupOverlay8_32Planar(ScreenPtr);
 
 extern _X_EXPORT void
-XAAPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs);
- 
-extern _X_EXPORT XAACacheInfoPtr
-XAACacheTile(ScrnInfoPtr Scrn, PixmapPtr pPix);
+ XAAPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
+
+extern _X_EXPORT XAACacheInfoPtr XAACacheTile(ScrnInfoPtr Scrn, PixmapPtr pPix);
 
 extern _X_EXPORT XAACacheInfoPtr
 XAACacheMonoStipple(ScrnInfoPtr Scrn, PixmapPtr pPix);
@@ -1508,8 +1212,10 @@ XAACacheMonoStipple(ScrnInfoPtr Scrn, PixmapPtr pPix);
 extern _X_EXPORT XAACacheInfoPtr
 XAACachePlanarMonoStipple(ScrnInfoPtr Scrn, PixmapPtr pPix);
 
-typedef XAACacheInfoPtr (*XAACachePlanarMonoStippleProc)(ScrnInfoPtr, PixmapPtr);
-extern _X_EXPORT XAACachePlanarMonoStippleProc XAAGetCachePlanarMonoStipple(void);
+typedef XAACacheInfoPtr(*XAACachePlanarMonoStippleProc) (ScrnInfoPtr,
+                                                         PixmapPtr);
+extern _X_EXPORT XAACachePlanarMonoStippleProc
+XAAGetCachePlanarMonoStipple(void);
 
 extern _X_EXPORT XAACacheInfoPtr
 XAACacheStipple(ScrnInfoPtr Scrn, PixmapPtr pPix, int fg, int bg);
@@ -1521,13 +1227,14 @@ extern _X_EXPORT XAACacheInfoPtr
 XAACacheColor8x8Pattern(ScrnInfoPtr Scrn, PixmapPtr pPix, int fg, int bg);
 
 extern _X_EXPORT void
-XAATileCache(ScrnInfoPtr pScrn, XAACacheInfoPtr pCache, int w, int h);
- 
+ XAATileCache(ScrnInfoPtr pScrn, XAACacheInfoPtr pCache, int w, int h);
+
 extern _X_EXPORT void XAAClosePixmapCache(ScreenPtr pScreen);
 void XAAInvalidatePixmapCache(ScreenPtr pScreen);
 
 extern _X_EXPORT Bool XAACheckStippleReducibility(PixmapPtr pPixmap);
-extern _X_EXPORT Bool XAACheckTileReducibility(PixmapPtr pPixmap, Bool checkMono);
+extern _X_EXPORT Bool XAACheckTileReducibility(PixmapPtr pPixmap,
+                                               Bool checkMono);
 
 extern _X_EXPORT int XAAStippledFillChooser(GCPtr pGC);
 extern _X_EXPORT int XAAOpaqueStippledFillChooser(GCPtr pGC);
@@ -1537,94 +1244,67 @@ extern _X_EXPORT void XAAMoveInOffscreenPixmaps(ScreenPtr pScreen);
 extern _X_EXPORT void XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen);
 extern _X_EXPORT void XAARemoveAreaCallback(FBAreaPtr area);
 extern _X_EXPORT void XAAMoveOutOffscreenPixmap(PixmapPtr pPix);
-extern _X_EXPORT Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec);
+extern _X_EXPORT Bool XAAInitStateWrap(ScreenPtr pScreen,
+                                       XAAInfoRecPtr infoRec);
 
 extern _X_EXPORT void
-XAAComposite (CARD8      op,
-	      PicturePtr pSrc,
-	      PicturePtr pMask,
-	      PicturePtr pDst,
-	      INT16      xSrc,
-	      INT16      ySrc,
-	      INT16      xMask,
-	      INT16      yMask,
-	      INT16      xDst,
-	      INT16      yDst,
-	      CARD16     width,
-	      CARD16     height);
 
+XAAComposite(CARD8 op,
+             PicturePtr pSrc,
+             PicturePtr pMask,
+             PicturePtr pDst,
+             INT16 xSrc,
+             INT16 ySrc,
+             INT16 xMask,
+             INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
 
 extern _X_EXPORT Bool
-XAADoComposite (CARD8      op,
-              PicturePtr pSrc,
-              PicturePtr pMask,
-              PicturePtr pDst,
-              INT16      xSrc,
-              INT16      ySrc,
-              INT16      xMask,
-              INT16      yMask,
-              INT16      xDst,
-              INT16      yDst,
-              CARD16     width,
-              CARD16     height);
-
-
-extern _X_EXPORT void
-XAAGlyphs (CARD8         op,
-	   PicturePtr    pSrc,
-	   PicturePtr    pDst,
-	   PictFormatPtr maskFormat,
-	   INT16         xSrc,
-	   INT16         ySrc,
-	   int           nlist,
-	   GlyphListPtr  list,
-	   GlyphPtr      *glyphs);
 
-extern _X_EXPORT Bool
-XAADoGlyphs (CARD8         op,
-           PicturePtr    pSrc,
-           PicturePtr    pDst,
-           PictFormatPtr maskFormat,
-           INT16         xSrc,
-           INT16         ySrc,
-           int           nlist,
-           GlyphListPtr  list,
-           GlyphPtr      *glyphs);
+XAADoComposite(CARD8 op,
+               PicturePtr pSrc,
+               PicturePtr pMask,
+               PicturePtr pDst,
+               INT16 xSrc,
+               INT16 ySrc,
+               INT16 xMask,
+               INT16 yMask,
+               INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
 
+extern _X_EXPORT void
 
+XAAGlyphs(CARD8 op,
+          PicturePtr pSrc,
+          PicturePtr pDst,
+          PictFormatPtr maskFormat,
+          INT16 xSrc,
+          INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr * glyphs);
+
+extern _X_EXPORT Bool
+
+XAADoGlyphs(CARD8 op,
+            PicturePtr pSrc,
+            PicturePtr pDst,
+            PictFormatPtr maskFormat,
+            INT16 xSrc,
+            INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr * glyphs);
 
 /* helpers */
 extern _X_EXPORT void
-XAA_888_plus_PICT_a8_to_8888 (
-    CARD32 color,
-    CARD8  *alphaPtr,   /* in bytes */
-    int    alphaPitch,
-    CARD32  *dstPtr,
-    int    dstPitch,	/* in dwords */
-    int    width,
-    int    height
-);
+ XAA_888_plus_PICT_a8_to_8888(CARD32 color, CARD8 *alphaPtr,    /* in bytes */
+                              int alphaPitch, CARD32 *dstPtr, int dstPitch,     /* in dwords */
+                              int width, int height);
 
 extern _X_EXPORT Bool
-XAAGetRGBAFromPixel(
-    CARD32 pixel,
-    CARD16 *red,
-    CARD16 *green,
-    CARD16 *blue,
-    CARD16 *alpha,
-    CARD32 format
-);
 
+XAAGetRGBAFromPixel(CARD32 pixel,
+                    CARD16 *red,
+                    CARD16 *green, CARD16 *blue, CARD16 *alpha, CARD32 format);
 
 extern _X_EXPORT Bool
-XAAGetPixelFromRGBA (
-    CARD32 *pixel,
-    CARD16 red,
-    CARD16 green,
-    CARD16 blue,
-    CARD16 alpha,
-    CARD32 format
-);
+
+XAAGetPixelFromRGBA(CARD32 *pixel,
+                    CARD16 red,
+                    CARD16 green, CARD16 blue, CARD16 alpha, CARD32 format);
 
 /* XXX should be static */
 extern _X_EXPORT GCOps XAAFallbackOps;
@@ -1694,7 +1374,7 @@ extern _X_EXPORT CARD32 XAAReverseBitOrder(CARD32 data);
 	((pGC->planemask & infoRec->FullPlanemask) != infoRec->FullPlanemask))
 
 #define IS_OFFSCREEN_PIXMAP(pPix)\
-        ((XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pPix)))->offscreenArea)	
+        ((XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pPix)))->offscreenArea)
 
 #define PIXMAP_IS_SHARED(pPix)\
         ((XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pPix)))->flags & SHARED_PIXMAP)
@@ -1719,7 +1399,6 @@ extern _X_EXPORT CARD32 XAAReverseBitOrder(CARD32 data);
 	    _prev = _pLink; \
 	    _pLink = _pLink->next; \
         }}
-	
 
 #define SWAP_BITS_IN_BYTES(v) \
  (((0x01010101 & (v)) << 7) | ((0x02020202 & (v)) << 5) | \
@@ -1733,27 +1412,26 @@ extern _X_EXPORT CARD32 XAAReverseBitOrder(CARD32 data);
  */
 
 typedef struct {
-   int Num512x512;
-   int Current512;
-   XAACacheInfoPtr Info512;
-   int Num256x256;
-   int Current256;
-   XAACacheInfoPtr Info256;
-   int Num128x128;
-   int Current128;
-   XAACacheInfoPtr Info128;
-   int NumMono;
-   int CurrentMono;
-   XAACacheInfoPtr InfoMono;
-   int NumColor;
-   int CurrentColor;
-   XAACacheInfoPtr InfoColor;
-   int NumPartial;
-   int CurrentPartial;
-   XAACacheInfoPtr InfoPartial;
-   DDXPointRec MonoOffsets[64];
-   DDXPointRec ColorOffsets[64];
+    int Num512x512;
+    int Current512;
+    XAACacheInfoPtr Info512;
+    int Num256x256;
+    int Current256;
+    XAACacheInfoPtr Info256;
+    int Num128x128;
+    int Current128;
+    XAACacheInfoPtr Info128;
+    int NumMono;
+    int CurrentMono;
+    XAACacheInfoPtr InfoMono;
+    int NumColor;
+    int CurrentColor;
+    XAACacheInfoPtr InfoColor;
+    int NumPartial;
+    int CurrentPartial;
+    XAACacheInfoPtr InfoPartial;
+    DDXPointRec MonoOffsets[64];
+    DDXPointRec ColorOffsets[64];
 } XAAPixmapCachePrivate, *XAAPixmapCachePrivatePtr;
 
-
-#endif /* _XAALOCAL_H */
+#endif                          /* _XAALOCAL_H */
diff --git a/xorg-server/hw/xfree86/xaa/xaarop.h b/xorg-server/hw/xfree86/xaa/xaarop.h
index edfd75aec..f2acde075 100644
--- a/xorg-server/hw/xfree86/xaa/xaarop.h
+++ b/xorg-server/hw/xfree86/xaa/xaarop.h
@@ -8,7 +8,6 @@
 	MS triadic raster op.  The function will return which components 
 	(S-P) need to be enabled.  
 
-
    int XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop)
 
 	For use with 8x8 opaque pattern fills.  You give it the foreground, 	
@@ -17,7 +16,6 @@
 	appropriate MS triadic raster op.  The function will return which 
 	components (S-P) need to be enabled.  
 
-
 	   ROP_PAT - Means to enable 8x8 mono patterns (all bits 
 		     set for solid patterns).  Set the foreground and
 		     background as returned by the function.  
@@ -294,8 +292,10 @@
 #define NO_SRC_ROP(rop) \
    ((rop == GXnoop) || (rop == GXset) || (rop == GXclear) || (rop == GXinvert))
 
-extern _X_EXPORT int XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop);
-extern _X_EXPORT int XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop);
+extern _X_EXPORT int XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm,
+                                     int *rop);
+extern _X_EXPORT int XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg,
+                                       int pm, int *rop);
 
 /* XXX These four should be static, but it breaks the 6.7.0 ABI. */
 extern _X_EXPORT int XAACopyROP[16];
@@ -308,4 +308,4 @@ extern _X_EXPORT int XAAGetCopyROP_PM(int i);
 extern _X_EXPORT int XAAGetPatternROP(int i);
 extern _X_EXPORT int XAAGetPatternROP_PM(int i);
 
-#endif /* _XAAROP_H */
+#endif                          /* _XAAROP_H */
diff --git a/xorg-server/hw/xnest/Args.c b/xorg-server/hw/xnest/Args.c
index cdc831133..21faf2e3a 100644
--- a/xorg-server/hw/xnest/Args.c
+++ b/xorg-server/hw/xnest/Args.c
@@ -29,162 +29,164 @@ is" without express or implied warranty.
 #include "Display.h"
 #include "Args.h"
 
-char *xnestDisplayName = NULL;        
+char *xnestDisplayName = NULL;
 Bool xnestSynchronize = False;
 Bool xnestFullGeneration = False;
-int xnestDefaultClass;                
+int xnestDefaultClass;
 Bool xnestUserDefaultClass = False;
 int xnestDefaultDepth;
 Bool xnestUserDefaultDepth = False;
 Bool xnestSoftwareScreenSaver = False;
-int xnestX;                    
-int xnestY;                    
+int xnestX;
+int xnestY;
 unsigned int xnestWidth;
 unsigned int xnestHeight;
 int xnestUserGeometry = 0;
-int xnestBorderWidth; 
+int xnestBorderWidth;
 Bool xnestUserBorderWidth = False;
-char *xnestWindowName = NULL;        
+char *xnestWindowName = NULL;
 int xnestNumScreens = 0;
 Bool xnestDoDirectColormaps = False;
 Window xnestParentWindow = 0;
 
 int
-ddxProcessArgument (int argc, char *argv[], int i)
+ddxProcessArgument(int argc, char *argv[], int i)
 {
-  if (!strcmp(argv[i], "-display")) {
-    if (++i < argc) {
-      xnestDisplayName = argv[i];
-      return 2;
+    if (!strcmp(argv[i], "-display")) {
+        if (++i < argc) {
+            xnestDisplayName = argv[i];
+            return 2;
+        }
+        return 0;
     }
-    return 0;
-  }
-  if (!strcmp(argv[i], "-sync")) {
-    xnestSynchronize = True;
-    return 1;
-  }
-  if (!strcmp(argv[i], "-full")) {
-    xnestFullGeneration = True;
-    return 1;
-  }
-  if (!strcmp(argv[i], "-class")) {
-    if (++i < argc) {
-      if (!strcmp(argv[i], "StaticGray")) {
-	xnestDefaultClass = StaticGray;
-	xnestUserDefaultClass = True;
-	return 2;
-      }
-      else if (!strcmp(argv[i], "GrayScale")) {
-	xnestDefaultClass = GrayScale;
-	xnestUserDefaultClass = True;
-	return 2;
-      }
-      else if (!strcmp(argv[i], "StaticColor")) {
-	xnestDefaultClass = StaticColor;
-	xnestUserDefaultClass = True;
-	return 2;
-      }
-      else if (!strcmp(argv[i], "PseudoColor")) {
-	xnestDefaultClass = PseudoColor;
-	xnestUserDefaultClass = True;
-	return 2;
-      }
-      else if (!strcmp(argv[i], "TrueColor")) {
-	xnestDefaultClass = TrueColor;
-	xnestUserDefaultClass = True;
-	return 2;
-      }
-      else if (!strcmp(argv[i], "DirectColor")) {
-	xnestDefaultClass = DirectColor;
-	xnestUserDefaultClass = True;
-	return 2;
-      }
+    if (!strcmp(argv[i], "-sync")) {
+        xnestSynchronize = True;
+        return 1;
     }
-    return 0;
-  }
-  if (!strcmp(argv[i], "-cc")) {
-    if (++i < argc && sscanf(argv[i], "%i", &xnestDefaultClass) == 1) {
-      if (xnestDefaultClass >= 0 && xnestDefaultClass <= 5) {
-	xnestUserDefaultClass = True;
-	/* lex the OS layer process it as well, so return 0 */
-      }
+    if (!strcmp(argv[i], "-full")) {
+        xnestFullGeneration = True;
+        return 1;
     }
-    return 0;
-  }
-  if (!strcmp(argv[i], "-depth")) {
-    if (++i < argc && sscanf(argv[i], "%i", &xnestDefaultDepth) == 1) {
-      if (xnestDefaultDepth > 0) {
-	xnestUserDefaultDepth = True;
-	return 2;
-      }
+    if (!strcmp(argv[i], "-class")) {
+        if (++i < argc) {
+            if (!strcmp(argv[i], "StaticGray")) {
+                xnestDefaultClass = StaticGray;
+                xnestUserDefaultClass = True;
+                return 2;
+            }
+            else if (!strcmp(argv[i], "GrayScale")) {
+                xnestDefaultClass = GrayScale;
+                xnestUserDefaultClass = True;
+                return 2;
+            }
+            else if (!strcmp(argv[i], "StaticColor")) {
+                xnestDefaultClass = StaticColor;
+                xnestUserDefaultClass = True;
+                return 2;
+            }
+            else if (!strcmp(argv[i], "PseudoColor")) {
+                xnestDefaultClass = PseudoColor;
+                xnestUserDefaultClass = True;
+                return 2;
+            }
+            else if (!strcmp(argv[i], "TrueColor")) {
+                xnestDefaultClass = TrueColor;
+                xnestUserDefaultClass = True;
+                return 2;
+            }
+            else if (!strcmp(argv[i], "DirectColor")) {
+                xnestDefaultClass = DirectColor;
+                xnestUserDefaultClass = True;
+                return 2;
+            }
+        }
+        return 0;
     }
-    return 0;
-  }
-  if (!strcmp(argv[i], "-sss")) {
-    xnestSoftwareScreenSaver = True;
-    return 1;
-  }
-  if (!strcmp(argv[i], "-geometry")) {
-    if (++i < argc) {
-      xnestUserGeometry = XParseGeometry(argv[i],
-					 &xnestX, &xnestY,
-					 &xnestWidth, &xnestHeight);
-      if (xnestUserGeometry) return 2;
+    if (!strcmp(argv[i], "-cc")) {
+        if (++i < argc && sscanf(argv[i], "%i", &xnestDefaultClass) == 1) {
+            if (xnestDefaultClass >= 0 && xnestDefaultClass <= 5) {
+                xnestUserDefaultClass = True;
+                /* lex the OS layer process it as well, so return 0 */
+            }
+        }
+        return 0;
     }
-    return 0;
-  }
-  if (!strcmp(argv[i], "-bw")) {
-    if (++i < argc && sscanf(argv[i], "%i", &xnestBorderWidth) == 1) {
-      if (xnestBorderWidth >= 0) {
-	xnestUserBorderWidth = True;
-	return 2;
-      }
+    if (!strcmp(argv[i], "-depth")) {
+        if (++i < argc && sscanf(argv[i], "%i", &xnestDefaultDepth) == 1) {
+            if (xnestDefaultDepth > 0) {
+                xnestUserDefaultDepth = True;
+                return 2;
+            }
+        }
+        return 0;
     }
-    return 0;
-  }
-  if (!strcmp(argv[i], "-name")) {
-    if (++i < argc) {
-      xnestWindowName = argv[i];
-      return 2;
+    if (!strcmp(argv[i], "-sss")) {
+        xnestSoftwareScreenSaver = True;
+        return 1;
     }
-    return 0;
-  }
-  if (!strcmp(argv[i], "-scrns")) {
-    if (++i < argc && sscanf(argv[i], "%i", &xnestNumScreens) == 1) {
-      if (xnestNumScreens > 0) {
-	if (xnestNumScreens > MAXSCREENS) {
-	  ErrorF("Maximum number of screens is %d.\n", MAXSCREENS);
-	  xnestNumScreens = MAXSCREENS;
-	}
-	return 2;
-      }
+    if (!strcmp(argv[i], "-geometry")) {
+        if (++i < argc) {
+            xnestUserGeometry = XParseGeometry(argv[i],
+                                               &xnestX, &xnestY,
+                                               &xnestWidth, &xnestHeight);
+            if (xnestUserGeometry)
+                return 2;
+        }
+        return 0;
     }
-    return 0;
-  }
-  if (!strcmp(argv[i], "-install")) {
-    xnestDoDirectColormaps = True;
-    return 1;
-  }
-  if (!strcmp(argv[i], "-parent")) {
-    if (++i < argc) {
-      xnestParentWindow = (XID) strtol (argv[i], (char**)NULL, 0);
-      return 2;
+    if (!strcmp(argv[i], "-bw")) {
+        if (++i < argc && sscanf(argv[i], "%i", &xnestBorderWidth) == 1) {
+            if (xnestBorderWidth >= 0) {
+                xnestUserBorderWidth = True;
+                return 2;
+            }
+        }
+        return 0;
+    }
+    if (!strcmp(argv[i], "-name")) {
+        if (++i < argc) {
+            xnestWindowName = argv[i];
+            return 2;
+        }
+        return 0;
+    }
+    if (!strcmp(argv[i], "-scrns")) {
+        if (++i < argc && sscanf(argv[i], "%i", &xnestNumScreens) == 1) {
+            if (xnestNumScreens > 0) {
+                if (xnestNumScreens > MAXSCREENS) {
+                    ErrorF("Maximum number of screens is %d.\n", MAXSCREENS);
+                    xnestNumScreens = MAXSCREENS;
+                }
+                return 2;
+            }
+        }
+        return 0;
     }
-  }
-  return 0;
+    if (!strcmp(argv[i], "-install")) {
+        xnestDoDirectColormaps = True;
+        return 1;
+    }
+    if (!strcmp(argv[i], "-parent")) {
+        if (++i < argc) {
+            xnestParentWindow = (XID) strtol(argv[i], (char **) NULL, 0);
+            return 2;
+        }
+    }
+    return 0;
 }
 
-void ddxUseMsg(void)
+void
+ddxUseMsg(void)
 {
-  ErrorF("-display string        display name of the real server\n");
-  ErrorF("-sync                  sinchronize with the real server\n");
-  ErrorF("-full                  utilize full regeneration\n");
-  ErrorF("-class string          default visual class\n");
-  ErrorF("-depth int             default depth\n");
-  ErrorF("-sss                   use software screen saver\n");
-  ErrorF("-geometry WxH+X+Y      window size and position\n");
-  ErrorF("-bw int                window border width\n");
-  ErrorF("-name string           window name\n");
-  ErrorF("-scrns int             number of screens to generate\n");
-  ErrorF("-install               instal colormaps directly\n");
+    ErrorF("-display string        display name of the real server\n");
+    ErrorF("-sync                  sinchronize with the real server\n");
+    ErrorF("-full                  utilize full regeneration\n");
+    ErrorF("-class string          default visual class\n");
+    ErrorF("-depth int             default depth\n");
+    ErrorF("-sss                   use software screen saver\n");
+    ErrorF("-geometry WxH+X+Y      window size and position\n");
+    ErrorF("-bw int                window border width\n");
+    ErrorF("-name string           window name\n");
+    ErrorF("-scrns int             number of screens to generate\n");
+    ErrorF("-install               instal colormaps directly\n");
 }
diff --git a/xorg-server/hw/xnest/Color.c b/xorg-server/hw/xnest/Color.c
index 2548f9495..7ef137d59 100644
--- a/xorg-server/hw/xnest/Color.c
+++ b/xorg-server/hw/xnest/Color.c
@@ -1,495 +1,493 @@
-/*

-

-Copyright 1993 by Davor Matic

-

-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.  Davor Matic makes no representations about

-the suitability of this software for any purpose.  It is provided "as

-is" without express or implied warranty.

-

-*/

-

-#ifdef HAVE_XNEST_CONFIG_H

-#include <xnest-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "scrnintstr.h"

-#include "window.h"

-#include "windowstr.h"

-#include "colormapst.h"

-#include "resource.h"

-

-#include "Xnest.h"

-

-

-#include "Display.h"

-#include "Screen.h"

-#include "Color.h"

-#include "Visual.h"

-#include "XNWindow.h"

-#include "Args.h"

-

-DevPrivateKeyRec xnestColormapPrivateKeyRec;

-

-static DevPrivateKeyRec cmapScrPrivateKeyRec;

-#define cmapScrPrivateKey (&cmapScrPrivateKeyRec)

-

-#define GetInstalledColormap(s) ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, cmapScrPrivateKey))

-#define SetInstalledColormap(s,c) (dixSetPrivate(&(s)->devPrivates, cmapScrPrivateKey, c))

-

-Bool

-xnestCreateColormap(ColormapPtr pCmap)

-{

-  VisualPtr pVisual;

-  XColor *colors;

-  int i, ncolors;

-  Pixel red, green, blue;

-  Pixel redInc, greenInc, blueInc;

-

-  pVisual = pCmap->pVisual;

-  ncolors = pVisual->ColormapEntries;

-

-  xnestColormapPriv(pCmap)->colormap = 

-    XCreateColormap(xnestDisplay,

-		    xnestDefaultWindows[pCmap->pScreen->myNum],

-		    xnestVisual(pVisual),

-		    (pVisual->class & DynamicClass) ? 

-		    AllocAll : AllocNone);

- 

-  

-  switch (pVisual->class) {

-  case StaticGray: /* read only */

-    colors = (XColor *)malloc(ncolors * sizeof(XColor));

-    for (i = 0; i < ncolors; i++)

-      colors[i].pixel = i;

-    XQueryColors(xnestDisplay, xnestColormap(pCmap), colors, ncolors);

-    for (i = 0; i < ncolors; i++) {

-      pCmap->red[i].co.local.red = colors[i].red;

-      pCmap->red[i].co.local.green = colors[i].red;

-      pCmap->red[i].co.local.blue = colors[i].red;

-    }

-    free(colors);

-    break;

-

-  case StaticColor: /* read only */

-    colors = (XColor *)malloc(ncolors * sizeof(XColor));

-    for (i = 0; i < ncolors; i++)

-      colors[i].pixel = i;

-    XQueryColors(xnestDisplay, xnestColormap(pCmap), colors, ncolors);

-    for (i = 0; i < ncolors; i++) {

-      pCmap->red[i].co.local.red = colors[i].red;

-      pCmap->red[i].co.local.green = colors[i].green;

-      pCmap->red[i].co.local.blue = colors[i].blue;

-    }

-    free(colors);

-    break;

-    

-  case TrueColor: /* read only */

-    colors = (XColor *)malloc(ncolors * sizeof(XColor));

-    red = green = blue = 0L;

-    redInc = lowbit(pVisual->redMask);

-    greenInc = lowbit(pVisual->greenMask);

-    blueInc = lowbit(pVisual->blueMask);

-    for (i = 0; i < ncolors; i++) {

-      colors[i].pixel = red | green | blue;

-      red += redInc;

-      if (red > pVisual->redMask) red = 0L;

-      green += greenInc;

-      if (green > pVisual->greenMask) green = 0L;

-      blue += blueInc;

-      if (blue > pVisual->blueMask) blue = 0L;

-    }

-    XQueryColors(xnestDisplay, xnestColormap(pCmap), colors, ncolors);

-    for (i = 0; i < ncolors; i++) {

-      pCmap->red[i].co.local.red = colors[i].red;

-      pCmap->green[i].co.local.green = colors[i].green;

-      pCmap->blue[i].co.local.blue = colors[i].blue;

-    }

-    free(colors);

-    break;

-    

-  case GrayScale: /* read and write */

-    break;

-

-  case PseudoColor: /* read and write */

-    break;

-

-  case DirectColor: /* read and write */

-    break;

-  }

-  

-  return True;

-}

-

-void

-xnestDestroyColormap(ColormapPtr pCmap)

-{

-  XFreeColormap(xnestDisplay, xnestColormap(pCmap));

-}

-

-#define SEARCH_PREDICATE \

-  (xnestWindow(pWin) != None && wColormap(pWin) == icws->cmapIDs[i])

-

-static int

-xnestCountInstalledColormapWindows(WindowPtr pWin, pointer ptr)

-{

-  xnestInstalledColormapWindows *icws = (xnestInstalledColormapWindows *)ptr;

-  int i;

-  

-  for (i = 0; i < icws->numCmapIDs; i++)

-    if (SEARCH_PREDICATE) {

-      icws->numWindows++;

-      return WT_DONTWALKCHILDREN;

-    }

-  

-  return WT_WALKCHILDREN;

-}

-

-static int

-xnestGetInstalledColormapWindows(WindowPtr pWin, pointer ptr)

-{

-  xnestInstalledColormapWindows *icws = (xnestInstalledColormapWindows *)ptr;

-  int i;

-  

-  for (i = 0; i < icws->numCmapIDs; i++)

-    if (SEARCH_PREDICATE) {

-      icws->windows[icws->index++] = xnestWindow(pWin);

-      return WT_DONTWALKCHILDREN;

-    }

-  

-  return WT_WALKCHILDREN;

-}

-

-static Window *xnestOldInstalledColormapWindows = NULL;

-static int xnestNumOldInstalledColormapWindows = 0;

-

-static Bool

-xnestSameInstalledColormapWindows(Window *windows, int numWindows)

-{

-  if (xnestNumOldInstalledColormapWindows != numWindows) 

-    return False;

-

-  if (xnestOldInstalledColormapWindows == windows) 

-    return True;

-

-  if (xnestOldInstalledColormapWindows == NULL || windows == NULL) 

-    return False;

-

-  if (memcmp(xnestOldInstalledColormapWindows, windows, 

-	   numWindows * sizeof(Window))) 

-    return False;

-

-  return True;

-}

-

-void

-xnestSetInstalledColormapWindows(ScreenPtr pScreen)

-{

-  xnestInstalledColormapWindows icws;

-  int numWindows;

-  

-  icws.cmapIDs = (Colormap *)malloc(pScreen->maxInstalledCmaps *

-				    sizeof(Colormap));

-  icws.numCmapIDs = xnestListInstalledColormaps(pScreen, icws.cmapIDs);

-  icws.numWindows = 0;

-  WalkTree(pScreen, xnestCountInstalledColormapWindows, (pointer)&icws);

-  if (icws.numWindows) {

-    icws.windows = (Window *)malloc((icws.numWindows + 1) * sizeof(Window));

-    icws.index = 0;

-    WalkTree(pScreen, xnestGetInstalledColormapWindows, (pointer)&icws);

-    icws.windows[icws.numWindows] = xnestDefaultWindows[pScreen->myNum];

-    numWindows = icws.numWindows + 1;

-  }

-  else {

-    icws.windows = NULL;

-    numWindows = 0;

-  }

-  

-  free(icws.cmapIDs);

-  

-  if (!xnestSameInstalledColormapWindows(icws.windows, icws.numWindows)) {

-    free(xnestOldInstalledColormapWindows);

-

-#ifdef _XSERVER64

-    {

-      int i;

-      Window64 *windows = (Window64 *)malloc(numWindows * sizeof(Window64));

-

-      for(i = 0; i < numWindows; ++i)

-	  windows[i] = icws.windows[i];

-      XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],

-			    windows, numWindows);

-      free(windows);

-    }

-#else

-    XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],

-			  icws.windows, numWindows);

-#endif

-

-    xnestOldInstalledColormapWindows = icws.windows;

-    xnestNumOldInstalledColormapWindows = icws.numWindows;

-

-#ifdef DUMB_WINDOW_MANAGERS

-    /* 

-      This code is for dumb window managers.

-      This will only work with default local visual colormaps.

-      */

-    if (icws.numWindows)

-      {

-	WindowPtr pWin;

-	Visual *visual;

-	ColormapPtr pCmap;

-

-	pWin = xnestWindowPtr(icws.windows[0]);

-	visual = xnestVisualFromID(pScreen, wVisual(pWin));

-	

-	if (visual == xnestDefaultVisual(pScreen))

-	    dixLookupResourceByType((pointer *)&pCmap, wColormap(pWin),

-				    RT_COLORMAP, serverClient, DixUseAccess);

-	else

-	    dixLookupResourceByType((pointer *)&pCmap, pScreen->defColormap,

-				    RT_COLORMAP, serverClient, DixUseAccess);

-	

-	XSetWindowColormap(xnestDisplay, 

-			   xnestDefaultWindows[pScreen->myNum],

-			   xnestColormap(pCmap));

-      }

-#endif /* DUMB_WINDOW_MANAGERS */

-  }

-  else

-    free(icws.windows);

-}

-

-void

-xnestSetScreenSaverColormapWindow(ScreenPtr pScreen)

-{

-  free(xnestOldInstalledColormapWindows);

-  

-#ifdef _XSERVER64

-  {

-    Window64 window;

-

-    window = xnestScreenSaverWindows[pScreen->myNum];

-    XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],

-			  &window, 1);

-    xnestScreenSaverWindows[pScreen->myNum] = window;

-  }

-#else

-  XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],

-			&xnestScreenSaverWindows[pScreen->myNum], 1);

-#endif /* _XSERVER64 */

-  

-  xnestOldInstalledColormapWindows = NULL;

-  xnestNumOldInstalledColormapWindows = 0;

-

-  xnestDirectUninstallColormaps(pScreen);

-}

-

-void

-xnestDirectInstallColormaps(ScreenPtr pScreen)

-{

-  int i, n;

-  Colormap pCmapIDs[MAXCMAPS];

-  

-  if (!xnestDoDirectColormaps) return;

-

-  n = (*pScreen->ListInstalledColormaps)(pScreen, pCmapIDs);

-

-  for (i = 0; i < n; i++) {

-    ColormapPtr pCmap;

-    

-    dixLookupResourceByType((pointer *)&pCmap, pCmapIDs[i], RT_COLORMAP,

-			    serverClient, DixInstallAccess);

-    if (pCmap)

-      XInstallColormap(xnestDisplay, xnestColormap(pCmap));

-  }

-}

-

-void

-xnestDirectUninstallColormaps(ScreenPtr pScreen)

-{

-  int i, n;

-  Colormap pCmapIDs[MAXCMAPS];

-

-  if (!xnestDoDirectColormaps) return;

-

-  n = (*pScreen->ListInstalledColormaps)(pScreen, pCmapIDs);

-

-  for (i = 0; i < n; i++) {

-    ColormapPtr pCmap;

-    

-    dixLookupResourceByType((pointer *)&pCmap, pCmapIDs[i], RT_COLORMAP,

-			    serverClient, DixUninstallAccess);

-    if (pCmap)

-      XUninstallColormap(xnestDisplay, xnestColormap(pCmap));

-  }

-}

-

-void

-xnestInstallColormap(ColormapPtr pCmap)

-{

-  ColormapPtr pOldCmap = GetInstalledColormap(pCmap->pScreen);

-  

-  if(pCmap != pOldCmap)

-    {

-      xnestDirectUninstallColormaps(pCmap->pScreen);

-

-      /* Uninstall pInstalledMap. Notify all interested parties. */

-      if(pOldCmap != (ColormapPtr)None)

-	WalkTree(pCmap->pScreen, TellLostMap, (pointer)&pOldCmap->mid);

-      

-      SetInstalledColormap(pCmap->pScreen, pCmap);

-      WalkTree(pCmap->pScreen, TellGainedMap, (pointer)&pCmap->mid);

-      

-      xnestSetInstalledColormapWindows(pCmap->pScreen);

-      xnestDirectInstallColormaps(pCmap->pScreen);

-    }

-}

-

-void

-xnestUninstallColormap(ColormapPtr pCmap)

-{

-  ColormapPtr pCurCmap = GetInstalledColormap(pCmap->pScreen);

-  

-  if(pCmap == pCurCmap)

-    {

-      if (pCmap->mid != pCmap->pScreen->defColormap)

-        {

-	  dixLookupResourceByType((pointer *)&pCurCmap,

-				  pCmap->pScreen->defColormap,

-				  RT_COLORMAP,

-				  serverClient, DixInstallAccess);

-	  (*pCmap->pScreen->InstallColormap)(pCurCmap);

-        }

-    }

-}

-

-static Bool xnestInstalledDefaultColormap = False;

-

-int

-xnestListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapIDs)

-{

-  if (xnestInstalledDefaultColormap) {

-    *pCmapIDs = GetInstalledColormap(pScreen)->mid;

-    return 1;

-  }

-  else

-    return 0;

-}

-

-void

-xnestStoreColors(ColormapPtr pCmap, int nColors, xColorItem *pColors)

-{

-  if (pCmap->pVisual->class & DynamicClass)

-#ifdef _XSERVER64

-  {

-    int i;

-    XColor *pColors64 = (XColor *)malloc(nColors * sizeof(XColor) );

-

-    for(i = 0; i < nColors; ++i)

-    {

-      pColors64[i].pixel = pColors[i].pixel;

-      pColors64[i].red = pColors[i].red;

-      pColors64[i].green = pColors[i].green;

-      pColors64[i].blue = pColors[i].blue;

-      pColors64[i].flags = pColors[i].flags;

-    }

-    XStoreColors(xnestDisplay, xnestColormap(pCmap), pColors64, nColors);

-    free(pColors64);

-  }

-#else

-    XStoreColors(xnestDisplay, xnestColormap(pCmap),

-		 (XColor *)pColors, nColors);

-#endif

-}

-

-void

-xnestResolveColor(unsigned short *pRed, unsigned short *pGreen,

-		  unsigned short *pBlue, VisualPtr pVisual)

-{

-  int shift;

-  unsigned int lim;

-  

-  shift = 16 - pVisual->bitsPerRGBValue;

-  lim = (1 << pVisual->bitsPerRGBValue) - 1;

-

-  if ((pVisual->class == PseudoColor) || (pVisual->class == DirectColor))

-    {

-      /* rescale to rgb bits */

-      *pRed = ((*pRed >> shift) * 65535) / lim;

-      *pGreen = ((*pGreen >> shift) * 65535) / lim;

-      *pBlue = ((*pBlue >> shift) * 65535) / lim;

-    }

-  else if (pVisual->class == GrayScale)

-    {

-      /* rescale to gray then rgb bits */

-      *pRed = (30L * *pRed + 59L * *pGreen + 11L * *pBlue) / 100;

-      *pBlue = *pGreen = *pRed = ((*pRed >> shift) * 65535) / lim;

-    }

-  else if (pVisual->class == StaticGray)

-    {

-      unsigned int limg;

- 

-      limg = pVisual->ColormapEntries - 1;

-      /* rescale to gray then [0..limg] then [0..65535] then rgb bits */

-      *pRed = (30L * *pRed + 59L * *pGreen + 11L * *pBlue) / 100;

-      *pRed = ((((*pRed * (limg + 1))) >> 16) * 65535) / limg;

-      *pBlue = *pGreen = *pRed = ((*pRed >> shift) * 65535) / lim;

-    }

-  else

-    {

-      unsigned limr, limg, limb;

-      

-      limr = pVisual->redMask >> pVisual->offsetRed;

-      limg = pVisual->greenMask >> pVisual->offsetGreen;

-      limb = pVisual->blueMask >> pVisual->offsetBlue;

-      /* rescale to [0..limN] then [0..65535] then rgb bits */

-      *pRed = ((((((*pRed * (limr + 1)) >> 16) *

-		  65535) / limr) >> shift) * 65535) / lim;

-      *pGreen = ((((((*pGreen * (limg + 1)) >> 16) *

-		    65535) / limg) >> shift) * 65535) / lim;

-      *pBlue = ((((((*pBlue * (limb + 1)) >> 16) *

-		   65535) / limb) >> shift) * 65535) / lim;

-    }

-}

-

-Bool

-xnestCreateDefaultColormap(ScreenPtr pScreen)

-{

-  VisualPtr   pVisual;

-  ColormapPtr pCmap;

-  unsigned short zero = 0, ones = 0xFFFF;  

-  Pixel wp, bp;

-

-  if (!dixRegisterPrivateKey(&cmapScrPrivateKeyRec, PRIVATE_SCREEN, 0))

-      return FALSE;

-

-  for (pVisual = pScreen->visuals;

-       pVisual->vid != pScreen->rootVisual;

-       pVisual++);

-

-  if (CreateColormap(pScreen->defColormap, pScreen, pVisual, &pCmap,

-		     (pVisual->class & DynamicClass) ? AllocNone : AllocAll, 0)

-      != Success)

-    return False;

-

-  wp = pScreen->whitePixel;

-  bp = pScreen->blackPixel;

-  if ((AllocColor(pCmap, &ones, &ones, &ones, &wp, 0) !=

-       Success) ||

-      (AllocColor(pCmap, &zero, &zero, &zero, &bp, 0) !=

-       Success))

-    return FALSE;

-  pScreen->whitePixel = wp;

-  pScreen->blackPixel = bp;

-  (*pScreen->InstallColormap)(pCmap);

-

-  xnestInstalledDefaultColormap = True;

-

-  return True;

-}

+/*
+
+Copyright 1993 by Davor Matic
+
+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.  Davor Matic makes no representations about
+the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+*/
+
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "scrnintstr.h"
+#include "window.h"
+#include "windowstr.h"
+#include "colormapst.h"
+#include "resource.h"
+
+#include "Xnest.h"
+
+#include "Display.h"
+#include "Screen.h"
+#include "Color.h"
+#include "Visual.h"
+#include "XNWindow.h"
+#include "Args.h"
+
+DevPrivateKeyRec xnestColormapPrivateKeyRec;
+
+static DevPrivateKeyRec cmapScrPrivateKeyRec;
+
+#define cmapScrPrivateKey (&cmapScrPrivateKeyRec)
+
+#define GetInstalledColormap(s) ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, cmapScrPrivateKey))
+#define SetInstalledColormap(s,c) (dixSetPrivate(&(s)->devPrivates, cmapScrPrivateKey, c))
+
+Bool
+xnestCreateColormap(ColormapPtr pCmap)
+{
+    VisualPtr pVisual;
+    XColor *colors;
+    int i, ncolors;
+    Pixel red, green, blue;
+    Pixel redInc, greenInc, blueInc;
+
+    pVisual = pCmap->pVisual;
+    ncolors = pVisual->ColormapEntries;
+
+    xnestColormapPriv(pCmap)->colormap =
+        XCreateColormap(xnestDisplay,
+                        xnestDefaultWindows[pCmap->pScreen->myNum],
+                        xnestVisual(pVisual),
+                        (pVisual->class & DynamicClass) ? AllocAll : AllocNone);
+
+    switch (pVisual->class) {
+    case StaticGray:           /* read only */
+        colors = (XColor *) malloc(ncolors * sizeof(XColor));
+        for (i = 0; i < ncolors; i++)
+            colors[i].pixel = i;
+        XQueryColors(xnestDisplay, xnestColormap(pCmap), colors, ncolors);
+        for (i = 0; i < ncolors; i++) {
+            pCmap->red[i].co.local.red = colors[i].red;
+            pCmap->red[i].co.local.green = colors[i].red;
+            pCmap->red[i].co.local.blue = colors[i].red;
+        }
+        free(colors);
+        break;
+
+    case StaticColor:          /* read only */
+        colors = (XColor *) malloc(ncolors * sizeof(XColor));
+        for (i = 0; i < ncolors; i++)
+            colors[i].pixel = i;
+        XQueryColors(xnestDisplay, xnestColormap(pCmap), colors, ncolors);
+        for (i = 0; i < ncolors; i++) {
+            pCmap->red[i].co.local.red = colors[i].red;
+            pCmap->red[i].co.local.green = colors[i].green;
+            pCmap->red[i].co.local.blue = colors[i].blue;
+        }
+        free(colors);
+        break;
+
+    case TrueColor:            /* read only */
+        colors = (XColor *) malloc(ncolors * sizeof(XColor));
+        red = green = blue = 0L;
+        redInc = lowbit(pVisual->redMask);
+        greenInc = lowbit(pVisual->greenMask);
+        blueInc = lowbit(pVisual->blueMask);
+        for (i = 0; i < ncolors; i++) {
+            colors[i].pixel = red | green | blue;
+            red += redInc;
+            if (red > pVisual->redMask)
+                red = 0L;
+            green += greenInc;
+            if (green > pVisual->greenMask)
+                green = 0L;
+            blue += blueInc;
+            if (blue > pVisual->blueMask)
+                blue = 0L;
+        }
+        XQueryColors(xnestDisplay, xnestColormap(pCmap), colors, ncolors);
+        for (i = 0; i < ncolors; i++) {
+            pCmap->red[i].co.local.red = colors[i].red;
+            pCmap->green[i].co.local.green = colors[i].green;
+            pCmap->blue[i].co.local.blue = colors[i].blue;
+        }
+        free(colors);
+        break;
+
+    case GrayScale:            /* read and write */
+        break;
+
+    case PseudoColor:          /* read and write */
+        break;
+
+    case DirectColor:          /* read and write */
+        break;
+    }
+
+    return True;
+}
+
+void
+xnestDestroyColormap(ColormapPtr pCmap)
+{
+    XFreeColormap(xnestDisplay, xnestColormap(pCmap));
+}
+
+#define SEARCH_PREDICATE \
+  (xnestWindow(pWin) != None && wColormap(pWin) == icws->cmapIDs[i])
+
+static int
+xnestCountInstalledColormapWindows(WindowPtr pWin, pointer ptr)
+{
+    xnestInstalledColormapWindows *icws = (xnestInstalledColormapWindows *) ptr;
+    int i;
+
+    for (i = 0; i < icws->numCmapIDs; i++)
+        if (SEARCH_PREDICATE) {
+            icws->numWindows++;
+            return WT_DONTWALKCHILDREN;
+        }
+
+    return WT_WALKCHILDREN;
+}
+
+static int
+xnestGetInstalledColormapWindows(WindowPtr pWin, pointer ptr)
+{
+    xnestInstalledColormapWindows *icws = (xnestInstalledColormapWindows *) ptr;
+    int i;
+
+    for (i = 0; i < icws->numCmapIDs; i++)
+        if (SEARCH_PREDICATE) {
+            icws->windows[icws->index++] = xnestWindow(pWin);
+            return WT_DONTWALKCHILDREN;
+        }
+
+    return WT_WALKCHILDREN;
+}
+
+static Window *xnestOldInstalledColormapWindows = NULL;
+static int xnestNumOldInstalledColormapWindows = 0;
+
+static Bool
+xnestSameInstalledColormapWindows(Window *windows, int numWindows)
+{
+    if (xnestNumOldInstalledColormapWindows != numWindows)
+        return False;
+
+    if (xnestOldInstalledColormapWindows == windows)
+        return True;
+
+    if (xnestOldInstalledColormapWindows == NULL || windows == NULL)
+        return False;
+
+    if (memcmp(xnestOldInstalledColormapWindows, windows,
+               numWindows * sizeof(Window)))
+        return False;
+
+    return True;
+}
+
+void
+xnestSetInstalledColormapWindows(ScreenPtr pScreen)
+{
+    xnestInstalledColormapWindows icws;
+    int numWindows;
+
+    icws.cmapIDs = (Colormap *) malloc(pScreen->maxInstalledCmaps *
+                                       sizeof(Colormap));
+    icws.numCmapIDs = xnestListInstalledColormaps(pScreen, icws.cmapIDs);
+    icws.numWindows = 0;
+    WalkTree(pScreen, xnestCountInstalledColormapWindows, (pointer) &icws);
+    if (icws.numWindows) {
+        icws.windows =
+            (Window *) malloc((icws.numWindows + 1) * sizeof(Window));
+        icws.index = 0;
+        WalkTree(pScreen, xnestGetInstalledColormapWindows, (pointer) &icws);
+        icws.windows[icws.numWindows] = xnestDefaultWindows[pScreen->myNum];
+        numWindows = icws.numWindows + 1;
+    }
+    else {
+        icws.windows = NULL;
+        numWindows = 0;
+    }
+
+    free(icws.cmapIDs);
+
+    if (!xnestSameInstalledColormapWindows(icws.windows, icws.numWindows)) {
+        free(xnestOldInstalledColormapWindows);
+
+#ifdef _XSERVER64
+        {
+            int i;
+            Window64 *windows =
+                (Window64 *) malloc(numWindows * sizeof(Window64));
+
+            for (i = 0; i < numWindows; ++i)
+                windows[i] = icws.windows[i];
+            XSetWMColormapWindows(xnestDisplay,
+                                  xnestDefaultWindows[pScreen->myNum], windows,
+                                  numWindows);
+            free(windows);
+        }
+#else
+        XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],
+                              icws.windows, numWindows);
+#endif
+
+        xnestOldInstalledColormapWindows = icws.windows;
+        xnestNumOldInstalledColormapWindows = icws.numWindows;
+
+#ifdef DUMB_WINDOW_MANAGERS
+        /* 
+           This code is for dumb window managers.
+           This will only work with default local visual colormaps.
+         */
+        if (icws.numWindows) {
+            WindowPtr pWin;
+            Visual *visual;
+            ColormapPtr pCmap;
+
+            pWin = xnestWindowPtr(icws.windows[0]);
+            visual = xnestVisualFromID(pScreen, wVisual(pWin));
+
+            if (visual == xnestDefaultVisual(pScreen))
+                dixLookupResourceByType((pointer *) &pCmap, wColormap(pWin),
+                                        RT_COLORMAP, serverClient,
+                                        DixUseAccess);
+            else
+                dixLookupResourceByType((pointer *) &pCmap,
+                                        pScreen->defColormap, RT_COLORMAP,
+                                        serverClient, DixUseAccess);
+
+            XSetWindowColormap(xnestDisplay,
+                               xnestDefaultWindows[pScreen->myNum],
+                               xnestColormap(pCmap));
+        }
+#endif                          /* DUMB_WINDOW_MANAGERS */
+    }
+    else
+        free(icws.windows);
+}
+
+void
+xnestSetScreenSaverColormapWindow(ScreenPtr pScreen)
+{
+    free(xnestOldInstalledColormapWindows);
+
+#ifdef _XSERVER64
+    {
+        Window64 window;
+
+        window = xnestScreenSaverWindows[pScreen->myNum];
+        XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],
+                              &window, 1);
+        xnestScreenSaverWindows[pScreen->myNum] = window;
+    }
+#else
+    XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],
+                          &xnestScreenSaverWindows[pScreen->myNum], 1);
+#endif                          /* _XSERVER64 */
+
+    xnestOldInstalledColormapWindows = NULL;
+    xnestNumOldInstalledColormapWindows = 0;
+
+    xnestDirectUninstallColormaps(pScreen);
+}
+
+void
+xnestDirectInstallColormaps(ScreenPtr pScreen)
+{
+    int i, n;
+    Colormap pCmapIDs[MAXCMAPS];
+
+    if (!xnestDoDirectColormaps)
+        return;
+
+    n = (*pScreen->ListInstalledColormaps) (pScreen, pCmapIDs);
+
+    for (i = 0; i < n; i++) {
+        ColormapPtr pCmap;
+
+        dixLookupResourceByType((pointer *) &pCmap, pCmapIDs[i], RT_COLORMAP,
+                                serverClient, DixInstallAccess);
+        if (pCmap)
+            XInstallColormap(xnestDisplay, xnestColormap(pCmap));
+    }
+}
+
+void
+xnestDirectUninstallColormaps(ScreenPtr pScreen)
+{
+    int i, n;
+    Colormap pCmapIDs[MAXCMAPS];
+
+    if (!xnestDoDirectColormaps)
+        return;
+
+    n = (*pScreen->ListInstalledColormaps) (pScreen, pCmapIDs);
+
+    for (i = 0; i < n; i++) {
+        ColormapPtr pCmap;
+
+        dixLookupResourceByType((pointer *) &pCmap, pCmapIDs[i], RT_COLORMAP,
+                                serverClient, DixUninstallAccess);
+        if (pCmap)
+            XUninstallColormap(xnestDisplay, xnestColormap(pCmap));
+    }
+}
+
+void
+xnestInstallColormap(ColormapPtr pCmap)
+{
+    ColormapPtr pOldCmap = GetInstalledColormap(pCmap->pScreen);
+
+    if (pCmap != pOldCmap) {
+        xnestDirectUninstallColormaps(pCmap->pScreen);
+
+        /* Uninstall pInstalledMap. Notify all interested parties. */
+        if (pOldCmap != (ColormapPtr) None)
+            WalkTree(pCmap->pScreen, TellLostMap, (pointer) &pOldCmap->mid);
+
+        SetInstalledColormap(pCmap->pScreen, pCmap);
+        WalkTree(pCmap->pScreen, TellGainedMap, (pointer) &pCmap->mid);
+
+        xnestSetInstalledColormapWindows(pCmap->pScreen);
+        xnestDirectInstallColormaps(pCmap->pScreen);
+    }
+}
+
+void
+xnestUninstallColormap(ColormapPtr pCmap)
+{
+    ColormapPtr pCurCmap = GetInstalledColormap(pCmap->pScreen);
+
+    if (pCmap == pCurCmap) {
+        if (pCmap->mid != pCmap->pScreen->defColormap) {
+            dixLookupResourceByType((pointer *) &pCurCmap,
+                                    pCmap->pScreen->defColormap,
+                                    RT_COLORMAP,
+                                    serverClient, DixInstallAccess);
+            (*pCmap->pScreen->InstallColormap) (pCurCmap);
+        }
+    }
+}
+
+static Bool xnestInstalledDefaultColormap = False;
+
+int
+xnestListInstalledColormaps(ScreenPtr pScreen, Colormap * pCmapIDs)
+{
+    if (xnestInstalledDefaultColormap) {
+        *pCmapIDs = GetInstalledColormap(pScreen)->mid;
+        return 1;
+    }
+    else
+        return 0;
+}
+
+void
+xnestStoreColors(ColormapPtr pCmap, int nColors, xColorItem * pColors)
+{
+    if (pCmap->pVisual->class & DynamicClass)
+#ifdef _XSERVER64
+    {
+        int i;
+        XColor *pColors64 = (XColor *) malloc(nColors * sizeof(XColor));
+
+        for (i = 0; i < nColors; ++i) {
+            pColors64[i].pixel = pColors[i].pixel;
+            pColors64[i].red = pColors[i].red;
+            pColors64[i].green = pColors[i].green;
+            pColors64[i].blue = pColors[i].blue;
+            pColors64[i].flags = pColors[i].flags;
+        }
+        XStoreColors(xnestDisplay, xnestColormap(pCmap), pColors64, nColors);
+        free(pColors64);
+    }
+#else
+        XStoreColors(xnestDisplay, xnestColormap(pCmap),
+                     (XColor *) pColors, nColors);
+#endif
+}
+
+void
+xnestResolveColor(unsigned short *pRed, unsigned short *pGreen,
+                  unsigned short *pBlue, VisualPtr pVisual)
+{
+    int shift;
+    unsigned int lim;
+
+    shift = 16 - pVisual->bitsPerRGBValue;
+    lim = (1 << pVisual->bitsPerRGBValue) - 1;
+
+    if ((pVisual->class == PseudoColor) || (pVisual->class == DirectColor)) {
+        /* rescale to rgb bits */
+        *pRed = ((*pRed >> shift) * 65535) / lim;
+        *pGreen = ((*pGreen >> shift) * 65535) / lim;
+        *pBlue = ((*pBlue >> shift) * 65535) / lim;
+    }
+    else if (pVisual->class == GrayScale) {
+        /* rescale to gray then rgb bits */
+        *pRed = (30L * *pRed + 59L * *pGreen + 11L * *pBlue) / 100;
+        *pBlue = *pGreen = *pRed = ((*pRed >> shift) * 65535) / lim;
+    }
+    else if (pVisual->class == StaticGray) {
+        unsigned int limg;
+
+        limg = pVisual->ColormapEntries - 1;
+        /* rescale to gray then [0..limg] then [0..65535] then rgb bits */
+        *pRed = (30L * *pRed + 59L * *pGreen + 11L * *pBlue) / 100;
+        *pRed = ((((*pRed * (limg + 1))) >> 16) * 65535) / limg;
+        *pBlue = *pGreen = *pRed = ((*pRed >> shift) * 65535) / lim;
+    }
+    else {
+        unsigned limr, limg, limb;
+
+        limr = pVisual->redMask >> pVisual->offsetRed;
+        limg = pVisual->greenMask >> pVisual->offsetGreen;
+        limb = pVisual->blueMask >> pVisual->offsetBlue;
+        /* rescale to [0..limN] then [0..65535] then rgb bits */
+        *pRed = ((((((*pRed * (limr + 1)) >> 16) *
+                    65535) / limr) >> shift) * 65535) / lim;
+        *pGreen = ((((((*pGreen * (limg + 1)) >> 16) *
+                      65535) / limg) >> shift) * 65535) / lim;
+        *pBlue = ((((((*pBlue * (limb + 1)) >> 16) *
+                     65535) / limb) >> shift) * 65535) / lim;
+    }
+}
+
+Bool
+xnestCreateDefaultColormap(ScreenPtr pScreen)
+{
+    VisualPtr pVisual;
+    ColormapPtr pCmap;
+    unsigned short zero = 0, ones = 0xFFFF;
+    Pixel wp, bp;
+
+    if (!dixRegisterPrivateKey(&cmapScrPrivateKeyRec, PRIVATE_SCREEN, 0))
+        return FALSE;
+
+    for (pVisual = pScreen->visuals;
+         pVisual->vid != pScreen->rootVisual; pVisual++);
+
+    if (CreateColormap(pScreen->defColormap, pScreen, pVisual, &pCmap,
+                       (pVisual->class & DynamicClass) ? AllocNone : AllocAll,
+                       0)
+        != Success)
+        return False;
+
+    wp = pScreen->whitePixel;
+    bp = pScreen->blackPixel;
+    if ((AllocColor(pCmap, &ones, &ones, &ones, &wp, 0) !=
+         Success) ||
+        (AllocColor(pCmap, &zero, &zero, &zero, &bp, 0) != Success))
+        return FALSE;
+    pScreen->whitePixel = wp;
+    pScreen->blackPixel = bp;
+    (*pScreen->InstallColormap) (pCmap);
+
+    xnestInstalledDefaultColormap = True;
+
+    return True;
+}
diff --git a/xorg-server/hw/xnest/Cursor.c b/xorg-server/hw/xnest/Cursor.c
index f35517abb..285e10ebf 100644
--- a/xorg-server/hw/xnest/Cursor.c
+++ b/xorg-server/hw/xnest/Cursor.c
@@ -1,182 +1,173 @@
-/*

-

-Copyright 1993 by Davor Matic

-

-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.  Davor Matic makes no representations about

-the suitability of this software for any purpose.  It is provided "as

-is" without express or implied warranty.

-

-*/

-

-#ifdef HAVE_XNEST_CONFIG_H

-#include <xnest-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "screenint.h"

-#include "input.h"

-#include "misc.h"

-#include "cursor.h"

-#include "cursorstr.h"

-#include "scrnintstr.h"

-#include "servermd.h"

-#include "mipointrst.h"

-

-#include "Xnest.h"

-

-#include "Display.h"

-#include "Screen.h"

-#include "XNCursor.h"

-#include "Visual.h"

-#include "Keyboard.h"

-#include "Args.h"

-

-xnestCursorFuncRec xnestCursorFuncs = {NULL};

-

-Bool

-xnestRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

-{

-  XImage *ximage;

-  Pixmap source, mask;

-  XColor fg_color, bg_color;

-  unsigned long valuemask;

-  XGCValues values;

-

-  valuemask = GCFunction | 

-              GCPlaneMask | 

-	      GCForeground |

-	      GCBackground |

-	      GCClipMask;

-

-  values.function = GXcopy;

-  values.plane_mask = AllPlanes;

-  values.foreground = 1L;

-  values.background = 0L;

-  values.clip_mask = None;

-

-  XChangeGC(xnestDisplay, xnestBitmapGC, valuemask, &values);

-

-  source = XCreatePixmap(xnestDisplay, 

-			 xnestDefaultWindows[pScreen->myNum],

-			 pCursor->bits->width,

-			 pCursor->bits->height,

-			 1);

-  

-  mask   = XCreatePixmap(xnestDisplay, 

-			 xnestDefaultWindows[pScreen->myNum],

-			 pCursor->bits->width,

-			 pCursor->bits->height,

-			 1);

-  

-  ximage = XCreateImage(xnestDisplay, 

-			xnestDefaultVisual(pScreen),

-			1, XYBitmap, 0, 

-			(char *)pCursor->bits->source,

-			pCursor->bits->width,

-			pCursor->bits->height,

-			BitmapPad(xnestDisplay), 0);

-  

-  XPutImage(xnestDisplay, source, xnestBitmapGC, ximage,

-	    0, 0, 0, 0, pCursor->bits->width, pCursor->bits->height);

-  

-  XFree(ximage);

-  

-  ximage = XCreateImage(xnestDisplay, 

-			xnestDefaultVisual(pScreen),

-			1, XYBitmap, 0, 

-			(char *)pCursor->bits->mask,

-			pCursor->bits->width,

-			pCursor->bits->height,

-			BitmapPad(xnestDisplay), 0);

-  

-  XPutImage(xnestDisplay, mask, xnestBitmapGC, ximage,

-	    0, 0, 0, 0, pCursor->bits->width, pCursor->bits->height);

-  

-  XFree(ximage);

-  

-  fg_color.red = pCursor->foreRed;

-  fg_color.green = pCursor->foreGreen;

-  fg_color.blue = pCursor->foreBlue;

-  

-  bg_color.red = pCursor->backRed;

-  bg_color.green = pCursor->backGreen;

-  bg_color.blue = pCursor->backBlue;

-

-  xnestSetCursorPriv(pCursor, pScreen, malloc(sizeof(xnestPrivCursor)));

-  xnestCursor(pCursor, pScreen) = 

-    XCreatePixmapCursor(xnestDisplay, source, mask, &fg_color, &bg_color,

-			pCursor->bits->xhot, pCursor->bits->yhot);

-  

-  XFreePixmap(xnestDisplay, source);

-  XFreePixmap(xnestDisplay, mask);

-  

-  return True;

-}

-

-Bool

-xnestUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

-{

-  XFreeCursor(xnestDisplay, xnestCursor(pCursor, pScreen));

-  free(xnestGetCursorPriv(pCursor, pScreen));

-  return True;

-}

-

-void

-xnestRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool displayed)

-{

-  XColor fg_color, bg_color;

-  

-  fg_color.red = pCursor->foreRed;

-  fg_color.green = pCursor->foreGreen;

-  fg_color.blue = pCursor->foreBlue;

-  

-  bg_color.red = pCursor->backRed;

-  bg_color.green = pCursor->backGreen;

-  bg_color.blue = pCursor->backBlue;

-  

-  XRecolorCursor(xnestDisplay, 

-		 xnestCursor(pCursor, pScreen),

-		 &fg_color, &bg_color);

-}

-

-void xnestSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)

-{

-    if (pCursor)

-    {

-	XDefineCursor(xnestDisplay, 

-		      xnestDefaultWindows[pScreen->myNum], 

-		      xnestCursor(pCursor, pScreen));

-    }

-}

-

-void

-xnestMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

-{

-}

-

-Bool

-xnestDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)

-{

-    xnestCursorFuncPtr pScreenPriv;

-

-    pScreenPriv = (xnestCursorFuncPtr)

-            dixLookupPrivate(&pScreen->devPrivates, xnestCursorScreenKey);

-

-    return pScreenPriv->spriteFuncs->DeviceCursorInitialize(pDev, pScreen);

-}

-

-void

-xnestDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)

-{

-    xnestCursorFuncPtr pScreenPriv;

-

-    pScreenPriv = (xnestCursorFuncPtr)

-            dixLookupPrivate(&pScreen->devPrivates, xnestCursorScreenKey);

-

-    pScreenPriv->spriteFuncs->DeviceCursorCleanup(pDev, pScreen);

-}

+/*
+
+Copyright 1993 by Davor Matic
+
+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.  Davor Matic makes no representations about
+the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+*/
+
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "screenint.h"
+#include "input.h"
+#include "misc.h"
+#include "cursor.h"
+#include "cursorstr.h"
+#include "scrnintstr.h"
+#include "servermd.h"
+#include "mipointrst.h"
+
+#include "Xnest.h"
+
+#include "Display.h"
+#include "Screen.h"
+#include "XNCursor.h"
+#include "Visual.h"
+#include "Keyboard.h"
+#include "Args.h"
+
+xnestCursorFuncRec xnestCursorFuncs = { NULL };
+
+Bool
+xnestRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
+{
+    XImage *ximage;
+    Pixmap source, mask;
+    XColor fg_color, bg_color;
+    unsigned long valuemask;
+    XGCValues values;
+
+    valuemask = GCFunction |
+        GCPlaneMask | GCForeground | GCBackground | GCClipMask;
+
+    values.function = GXcopy;
+    values.plane_mask = AllPlanes;
+    values.foreground = 1L;
+    values.background = 0L;
+    values.clip_mask = None;
+
+    XChangeGC(xnestDisplay, xnestBitmapGC, valuemask, &values);
+
+    source = XCreatePixmap(xnestDisplay,
+                           xnestDefaultWindows[pScreen->myNum],
+                           pCursor->bits->width, pCursor->bits->height, 1);
+
+    mask = XCreatePixmap(xnestDisplay,
+                         xnestDefaultWindows[pScreen->myNum],
+                         pCursor->bits->width, pCursor->bits->height, 1);
+
+    ximage = XCreateImage(xnestDisplay,
+                          xnestDefaultVisual(pScreen),
+                          1, XYBitmap, 0,
+                          (char *) pCursor->bits->source,
+                          pCursor->bits->width,
+                          pCursor->bits->height, BitmapPad(xnestDisplay), 0);
+
+    XPutImage(xnestDisplay, source, xnestBitmapGC, ximage,
+              0, 0, 0, 0, pCursor->bits->width, pCursor->bits->height);
+
+    XFree(ximage);
+
+    ximage = XCreateImage(xnestDisplay,
+                          xnestDefaultVisual(pScreen),
+                          1, XYBitmap, 0,
+                          (char *) pCursor->bits->mask,
+                          pCursor->bits->width,
+                          pCursor->bits->height, BitmapPad(xnestDisplay), 0);
+
+    XPutImage(xnestDisplay, mask, xnestBitmapGC, ximage,
+              0, 0, 0, 0, pCursor->bits->width, pCursor->bits->height);
+
+    XFree(ximage);
+
+    fg_color.red = pCursor->foreRed;
+    fg_color.green = pCursor->foreGreen;
+    fg_color.blue = pCursor->foreBlue;
+
+    bg_color.red = pCursor->backRed;
+    bg_color.green = pCursor->backGreen;
+    bg_color.blue = pCursor->backBlue;
+
+    xnestSetCursorPriv(pCursor, pScreen, malloc(sizeof(xnestPrivCursor)));
+    xnestCursor(pCursor, pScreen) =
+        XCreatePixmapCursor(xnestDisplay, source, mask, &fg_color, &bg_color,
+                            pCursor->bits->xhot, pCursor->bits->yhot);
+
+    XFreePixmap(xnestDisplay, source);
+    XFreePixmap(xnestDisplay, mask);
+
+    return True;
+}
+
+Bool
+xnestUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
+{
+    XFreeCursor(xnestDisplay, xnestCursor(pCursor, pScreen));
+    free(xnestGetCursorPriv(pCursor, pScreen));
+    return True;
+}
+
+void
+xnestRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool displayed)
+{
+    XColor fg_color, bg_color;
+
+    fg_color.red = pCursor->foreRed;
+    fg_color.green = pCursor->foreGreen;
+    fg_color.blue = pCursor->foreBlue;
+
+    bg_color.red = pCursor->backRed;
+    bg_color.green = pCursor->backGreen;
+    bg_color.blue = pCursor->backBlue;
+
+    XRecolorCursor(xnestDisplay,
+                   xnestCursor(pCursor, pScreen), &fg_color, &bg_color);
+}
+
+void
+xnestSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x,
+               int y)
+{
+    if (pCursor) {
+        XDefineCursor(xnestDisplay,
+                      xnestDefaultWindows[pScreen->myNum],
+                      xnestCursor(pCursor, pScreen));
+    }
+}
+
+void
+xnestMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+}
+
+Bool
+xnestDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
+{
+    xnestCursorFuncPtr pScreenPriv;
+
+    pScreenPriv = (xnestCursorFuncPtr)
+        dixLookupPrivate(&pScreen->devPrivates, xnestCursorScreenKey);
+
+    return pScreenPriv->spriteFuncs->DeviceCursorInitialize(pDev, pScreen);
+}
+
+void
+xnestDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
+{
+    xnestCursorFuncPtr pScreenPriv;
+
+    pScreenPriv = (xnestCursorFuncPtr)
+        dixLookupPrivate(&pScreen->devPrivates, xnestCursorScreenKey);
+
+    pScreenPriv->spriteFuncs->DeviceCursorCleanup(pDev, pScreen);
+}
diff --git a/xorg-server/hw/xnest/Display.c b/xorg-server/hw/xnest/Display.c
index 3176b60d7..a2f8acbaa 100644
--- a/xorg-server/hw/xnest/Display.c
+++ b/xorg-server/hw/xnest/Display.c
@@ -12,7 +12,6 @@ is" without express or implied warranty.
 
 */
 
-
 #ifdef HAVE_XNEST_CONFIG_H
 #include <xnest-config.h>
 #endif
@@ -47,8 +46,8 @@ int *xnestDepths;
 int xnestNumDepths;
 XPixmapFormatValues *xnestPixmapFormats;
 int xnestNumPixmapFormats;
-Pixel xnestBlackPixel;             
-Pixel xnestWhitePixel;             
+Pixel xnestBlackPixel;
+Pixel xnestWhitePixel;
 Drawable xnestDefaultDrawables[MAXDEPTH + 1];
 Pixmap xnestIconBitmap;
 Pixmap xnestScreenSaverPixmap;
@@ -61,7 +60,8 @@ unsigned long xnestEventMask;
 #endif
 
 static int _X_NORETURN
-x_io_error_handler (Display *dpy) {
+x_io_error_handler(Display * dpy)
+{
     ErrorF("Lost connection to X server: %s\n", strerror(errno));
     CloseWellKnownConnections();
     OsCleanup(1);
@@ -71,141 +71,143 @@ x_io_error_handler (Display *dpy) {
 void
 xnestOpenDisplay(int argc, char *argv[])
 {
-  XVisualInfo vi;
-  long mask;
-  int i, j;
-
-  if (!xnestDoFullGeneration) return;
-
-  XSetIOErrorHandler(x_io_error_handler);
-
-  xnestCloseDisplay();
-
-  xnestDisplay = XOpenDisplay(xnestDisplayName);
-  if (xnestDisplay == NULL)
-    FatalError("Unable to open display \"%s\".\n", 
-	       XDisplayName(xnestDisplayName));
-
-  if (xnestSynchronize)
-    XSynchronize(xnestDisplay, True);
-
-  mask = VisualScreenMask;
-  vi.screen = DefaultScreen(xnestDisplay);
-  xnestVisuals = XGetVisualInfo(xnestDisplay, mask, &vi, &xnestNumVisuals);
-  if (xnestNumVisuals == 0 || xnestVisuals == NULL)
-    FatalError("Unable to find any visuals.\n");
-
-  if (xnestUserDefaultClass || xnestUserDefaultDepth) {
-    xnestDefaultVisualIndex = UNDEFINED;
-    for (i = 0; i < xnestNumVisuals; i++)
-      if ((!xnestUserDefaultClass ||
-	   xnestVisuals[i].class == xnestDefaultClass)
-	  &&
-	  (!xnestUserDefaultDepth ||
-	   xnestVisuals[i].depth == xnestDefaultDepth)) {
-	xnestDefaultVisualIndex = i;
-	break;
-      }
-    if (xnestDefaultVisualIndex == UNDEFINED) 
-      FatalError("Unable to find desired default visual.\n");
-  }
-  else {
-    vi.visualid = XVisualIDFromVisual(DefaultVisual(xnestDisplay, 
-				      DefaultScreen(xnestDisplay))); 
-    xnestDefaultVisualIndex = 0;
-    for (i = 0; i < xnestNumVisuals; i++)
-      if (vi.visualid == xnestVisuals[i].visualid)
-	xnestDefaultVisualIndex = i;
-  }
-  
-  xnestNumDefaultColormaps = xnestNumVisuals;
-  xnestDefaultColormaps = (Colormap *)malloc(xnestNumDefaultColormaps *
-					     sizeof(Colormap));
-  for (i = 0; i < xnestNumDefaultColormaps; i++)
-    xnestDefaultColormaps[i] = XCreateColormap(xnestDisplay,
-					       DefaultRootWindow(xnestDisplay),
-					       xnestVisuals[i].visual,
-					       AllocNone);
-  
-  xnestDepths = XListDepths(xnestDisplay, DefaultScreen(xnestDisplay),
-			    &xnestNumDepths);
-
-  xnestPixmapFormats = XListPixmapFormats(xnestDisplay, 
-					  &xnestNumPixmapFormats);
-  
-  xnestBlackPixel = BlackPixel(xnestDisplay, DefaultScreen(xnestDisplay));
-  xnestWhitePixel = WhitePixel(xnestDisplay, DefaultScreen(xnestDisplay));
-
-  if (xnestParentWindow != (Window) 0)
-    xnestEventMask = StructureNotifyMask;
-  else
-    xnestEventMask = 0L;
-  
-  for (i = 0; i <= MAXDEPTH; i++)
-    xnestDefaultDrawables[i] = None;
-  
-  for (i = 0; i < xnestNumPixmapFormats; i++)
-    for (j = 0; j < xnestNumDepths; j++)
-      if (xnestPixmapFormats[i].depth == 1 ||
-	  xnestPixmapFormats[i].depth == xnestDepths[j]) {
-	xnestDefaultDrawables[xnestPixmapFormats[i].depth] =
-	  XCreatePixmap(xnestDisplay, DefaultRootWindow(xnestDisplay), 
-			1, 1, xnestPixmapFormats[i].depth);
-      }
-  
-  xnestBitmapGC = XCreateGC(xnestDisplay, xnestDefaultDrawables[1], 0L, NULL);
-  
-  if (!(xnestUserGeometry & XValue))
-    xnestX = 0;
-  
-  if (!(xnestUserGeometry & YValue))
-    xnestY = 0;
-  
-  if (xnestParentWindow == 0) {
-    if (!(xnestUserGeometry & WidthValue))
-      xnestWidth = 3 * DisplayWidth(xnestDisplay, 
-				    DefaultScreen(xnestDisplay)) / 4;
-  
-    if (!(xnestUserGeometry & HeightValue))
-      xnestHeight = 3 * DisplayHeight(xnestDisplay, 
-				      DefaultScreen(xnestDisplay)) / 4;
-  }
-
-  if (!xnestUserBorderWidth)
-    xnestBorderWidth = 1;
-
-  xnestIconBitmap = 
-    XCreateBitmapFromData(xnestDisplay,
-			  DefaultRootWindow(xnestDisplay),
-			  (char *)icon_bits,
-			  icon_width,
-			  icon_height);
-  
-  xnestScreenSaverPixmap = 
-    XCreatePixmapFromBitmapData(xnestDisplay,
-				DefaultRootWindow(xnestDisplay),
-				(char *)screensaver_bits,
-				screensaver_width,
-				screensaver_height,
-				xnestWhitePixel,
-				xnestBlackPixel,
-				DefaultDepth(xnestDisplay,
-					     DefaultScreen(xnestDisplay)));
+    XVisualInfo vi;
+    long mask;
+    int i, j;
+
+    if (!xnestDoFullGeneration)
+        return;
+
+    XSetIOErrorHandler(x_io_error_handler);
+
+    xnestCloseDisplay();
+
+    xnestDisplay = XOpenDisplay(xnestDisplayName);
+    if (xnestDisplay == NULL)
+        FatalError("Unable to open display \"%s\".\n",
+                   XDisplayName(xnestDisplayName));
+
+    if (xnestSynchronize)
+        XSynchronize(xnestDisplay, True);
+
+    mask = VisualScreenMask;
+    vi.screen = DefaultScreen(xnestDisplay);
+    xnestVisuals = XGetVisualInfo(xnestDisplay, mask, &vi, &xnestNumVisuals);
+    if (xnestNumVisuals == 0 || xnestVisuals == NULL)
+        FatalError("Unable to find any visuals.\n");
+
+    if (xnestUserDefaultClass || xnestUserDefaultDepth) {
+        xnestDefaultVisualIndex = UNDEFINED;
+        for (i = 0; i < xnestNumVisuals; i++)
+            if ((!xnestUserDefaultClass ||
+                 xnestVisuals[i].class == xnestDefaultClass)
+                &&
+                (!xnestUserDefaultDepth ||
+                 xnestVisuals[i].depth == xnestDefaultDepth)) {
+                xnestDefaultVisualIndex = i;
+                break;
+            }
+        if (xnestDefaultVisualIndex == UNDEFINED)
+            FatalError("Unable to find desired default visual.\n");
+    }
+    else {
+        vi.visualid = XVisualIDFromVisual(DefaultVisual(xnestDisplay,
+                                                        DefaultScreen
+                                                        (xnestDisplay)));
+        xnestDefaultVisualIndex = 0;
+        for (i = 0; i < xnestNumVisuals; i++)
+            if (vi.visualid == xnestVisuals[i].visualid)
+                xnestDefaultVisualIndex = i;
+    }
+
+    xnestNumDefaultColormaps = xnestNumVisuals;
+    xnestDefaultColormaps = (Colormap *) malloc(xnestNumDefaultColormaps *
+                                                sizeof(Colormap));
+    for (i = 0; i < xnestNumDefaultColormaps; i++)
+        xnestDefaultColormaps[i] = XCreateColormap(xnestDisplay,
+                                                   DefaultRootWindow
+                                                   (xnestDisplay),
+                                                   xnestVisuals[i].visual,
+                                                   AllocNone);
+
+    xnestDepths = XListDepths(xnestDisplay, DefaultScreen(xnestDisplay),
+                              &xnestNumDepths);
+
+    xnestPixmapFormats = XListPixmapFormats(xnestDisplay,
+                                            &xnestNumPixmapFormats);
+
+    xnestBlackPixel = BlackPixel(xnestDisplay, DefaultScreen(xnestDisplay));
+    xnestWhitePixel = WhitePixel(xnestDisplay, DefaultScreen(xnestDisplay));
+
+    if (xnestParentWindow != (Window) 0)
+        xnestEventMask = StructureNotifyMask;
+    else
+        xnestEventMask = 0L;
+
+    for (i = 0; i <= MAXDEPTH; i++)
+        xnestDefaultDrawables[i] = None;
+
+    for (i = 0; i < xnestNumPixmapFormats; i++)
+        for (j = 0; j < xnestNumDepths; j++)
+            if (xnestPixmapFormats[i].depth == 1 ||
+                xnestPixmapFormats[i].depth == xnestDepths[j]) {
+                xnestDefaultDrawables[xnestPixmapFormats[i].depth] =
+                    XCreatePixmap(xnestDisplay, DefaultRootWindow(xnestDisplay),
+                                  1, 1, xnestPixmapFormats[i].depth);
+            }
+
+    xnestBitmapGC = XCreateGC(xnestDisplay, xnestDefaultDrawables[1], 0L, NULL);
+
+    if (!(xnestUserGeometry & XValue))
+        xnestX = 0;
+
+    if (!(xnestUserGeometry & YValue))
+        xnestY = 0;
+
+    if (xnestParentWindow == 0) {
+        if (!(xnestUserGeometry & WidthValue))
+            xnestWidth = 3 * DisplayWidth(xnestDisplay,
+                                          DefaultScreen(xnestDisplay)) / 4;
+
+        if (!(xnestUserGeometry & HeightValue))
+            xnestHeight = 3 * DisplayHeight(xnestDisplay,
+                                            DefaultScreen(xnestDisplay)) / 4;
+    }
+
+    if (!xnestUserBorderWidth)
+        xnestBorderWidth = 1;
+
+    xnestIconBitmap =
+        XCreateBitmapFromData(xnestDisplay,
+                              DefaultRootWindow(xnestDisplay),
+                              (char *) icon_bits, icon_width, icon_height);
+
+    xnestScreenSaverPixmap =
+        XCreatePixmapFromBitmapData(xnestDisplay,
+                                    DefaultRootWindow(xnestDisplay),
+                                    (char *) screensaver_bits,
+                                    screensaver_width,
+                                    screensaver_height,
+                                    xnestWhitePixel,
+                                    xnestBlackPixel,
+                                    DefaultDepth(xnestDisplay,
+                                                 DefaultScreen(xnestDisplay)));
 }
 
 void
 xnestCloseDisplay(void)
 {
-  if (!xnestDoFullGeneration || !xnestDisplay) return;
-
-  /*
-    If xnestDoFullGeneration all x resources will be destroyed upon closing
-    the display connection.  There is no need to generate extra protocol.
-    */
-
-  free(xnestDefaultColormaps);
-  XFree(xnestVisuals);
-  XFree(xnestDepths);
-  XFree(xnestPixmapFormats);
-  XCloseDisplay(xnestDisplay);
+    if (!xnestDoFullGeneration || !xnestDisplay)
+        return;
+
+    /*
+       If xnestDoFullGeneration all x resources will be destroyed upon closing
+       the display connection.  There is no need to generate extra protocol.
+     */
+
+    free(xnestDefaultColormaps);
+    XFree(xnestVisuals);
+    XFree(xnestDepths);
+    XFree(xnestPixmapFormats);
+    XCloseDisplay(xnestDisplay);
 }
diff --git a/xorg-server/hw/xnest/Events.c b/xorg-server/hw/xnest/Events.c
index 619427ded..447d5a72b 100644
--- a/xorg-server/hw/xnest/Events.c
+++ b/xorg-server/hw/xnest/Events.c
@@ -46,7 +46,7 @@ CARD32 lastEventTime = 0;
 void
 ProcessInputEvents(void)
 {
-  mieqProcessInputEvents();
+    mieqProcessInputEvents();
 }
 
 int
@@ -60,158 +60,159 @@ TimeSinceLastInputEvent(void)
 void
 SetTimeSinceLastInputEvent(void)
 {
-  lastEventTime = GetTimeInMillis();
+    lastEventTime = GetTimeInMillis();
 }
 
 static Bool
-xnestExposurePredicate(Display *display, XEvent *event, char *args)
+xnestExposurePredicate(Display * display, XEvent * event, char *args)
 {
-  return event->type == Expose || event->type == ProcessedExpose;
+    return event->type == Expose || event->type == ProcessedExpose;
 }
 
 static Bool
-xnestNotExposurePredicate(Display *display, XEvent *event, char *args)
+xnestNotExposurePredicate(Display * display, XEvent * event, char *args)
 {
-  return !xnestExposurePredicate(display, event, args);
+    return !xnestExposurePredicate(display, event, args);
 }
 
 void
 xnestCollectExposures(void)
 {
-  XEvent X;
-  WindowPtr pWin;
-  RegionRec Rgn;
-  BoxRec Box;
-  
-  while (XCheckIfEvent(xnestDisplay, &X, xnestExposurePredicate, NULL)) {
-    pWin = xnestWindowPtr(X.xexpose.window);
-    
-    if (pWin && X.xexpose.width && X.xexpose.height) {
-      Box.x1 = pWin->drawable.x + wBorderWidth(pWin) + X.xexpose.x;
-      Box.y1 = pWin->drawable.y + wBorderWidth(pWin) + X.xexpose.y;
-      Box.x2 = Box.x1 + X.xexpose.width;
-      Box.y2 = Box.y1 + X.xexpose.height;
-      
-      RegionInit(&Rgn, &Box, 1);
-      
-      miSendExposures(pWin, &Rgn, Box.x2, Box.y2);
+    XEvent X;
+    WindowPtr pWin;
+    RegionRec Rgn;
+    BoxRec Box;
+
+    while (XCheckIfEvent(xnestDisplay, &X, xnestExposurePredicate, NULL)) {
+        pWin = xnestWindowPtr(X.xexpose.window);
+
+        if (pWin && X.xexpose.width && X.xexpose.height) {
+            Box.x1 = pWin->drawable.x + wBorderWidth(pWin) + X.xexpose.x;
+            Box.y1 = pWin->drawable.y + wBorderWidth(pWin) + X.xexpose.y;
+            Box.x2 = Box.x1 + X.xexpose.width;
+            Box.y2 = Box.y1 + X.xexpose.height;
+
+            RegionInit(&Rgn, &Box, 1);
+
+            miSendExposures(pWin, &Rgn, Box.x2, Box.y2);
+        }
     }
-  }
 }
 
 void
 xnestQueueKeyEvent(int type, unsigned int keycode)
 {
-  lastEventTime = GetTimeInMillis();
-  QueueKeyboardEvents(xnestKeyboardDevice, type, keycode, NULL);
+    lastEventTime = GetTimeInMillis();
+    QueueKeyboardEvents(xnestKeyboardDevice, type, keycode, NULL);
 }
 
 void
 xnestCollectEvents(void)
 {
-  XEvent X;
-  int valuators[2];
-  ValuatorMask mask;
-  ScreenPtr pScreen;
-
-  while (XCheckIfEvent(xnestDisplay, &X, xnestNotExposurePredicate, NULL)) {
-    switch (X.type) {
-    case KeyPress:
-      xnestUpdateModifierState(X.xkey.state);
-      xnestQueueKeyEvent(KeyPress, X.xkey.keycode);
-      break;
-      
-    case KeyRelease:
-      xnestUpdateModifierState(X.xkey.state);
-      xnestQueueKeyEvent(KeyRelease, X.xkey.keycode);
-      break;
-      
-    case ButtonPress:
-      valuator_mask_set_range(&mask, 0, 0, NULL);
-      xnestUpdateModifierState(X.xkey.state);
-      lastEventTime = GetTimeInMillis();
-      QueuePointerEvents(xnestPointerDevice, ButtonPress,
-                         X.xbutton.button, POINTER_RELATIVE, &mask);
-      break;
-      
-    case ButtonRelease:
-      valuator_mask_set_range(&mask, 0, 0, NULL);
-      xnestUpdateModifierState(X.xkey.state);
-      lastEventTime = GetTimeInMillis();
-      QueuePointerEvents(xnestPointerDevice, ButtonRelease,
-                         X.xbutton.button, POINTER_RELATIVE, &mask);
-      break;
-      
-    case MotionNotify:
-      valuators[0] = X.xmotion.x;
-      valuators[1] = X.xmotion.y;
-      valuator_mask_set_range(&mask, 0, 2, valuators);
-      lastEventTime = GetTimeInMillis();
-      QueuePointerEvents(xnestPointerDevice, MotionNotify,
-                         0, POINTER_ABSOLUTE, &mask);
-      break;
-      
-    case FocusIn:
-      if (X.xfocus.detail != NotifyInferior) {
-	pScreen = xnestScreen(X.xfocus.window);
-	if (pScreen)
-	  xnestDirectInstallColormaps(pScreen);
-      }
-      break;
-   
-    case FocusOut:
-      if (X.xfocus.detail != NotifyInferior) {
-	pScreen = xnestScreen(X.xfocus.window);
-	if (pScreen)
-	  xnestDirectUninstallColormaps(pScreen);
-      }
-      break;
-
-    case KeymapNotify:
-      break;
-
-    case EnterNotify:
-      if (X.xcrossing.detail != NotifyInferior) {
-	pScreen = xnestScreen(X.xcrossing.window);
-	if (pScreen) {
-	  NewCurrentScreen(inputInfo.pointer, pScreen, X.xcrossing.x, X.xcrossing.y);
-          valuators[0] = X.xcrossing.x;
-          valuators[1] = X.xcrossing.y;
-          valuator_mask_set_range(&mask, 0, 2, valuators);
-          lastEventTime = GetTimeInMillis();
-          QueuePointerEvents(xnestPointerDevice, MotionNotify,
-                             0, POINTER_ABSOLUTE, &mask);
-	  xnestDirectInstallColormaps(pScreen);
-	}
-      }
-      break;
-      
-    case LeaveNotify:
-      if (X.xcrossing.detail != NotifyInferior) {
-	pScreen = xnestScreen(X.xcrossing.window);
-	if (pScreen) {
-	  xnestDirectUninstallColormaps(pScreen);
-	}	
-      }
-      break;
-      
-    case DestroyNotify:
-      if (xnestParentWindow != (Window) 0 &&
-	  X.xdestroywindow.window == xnestParentWindow)
-	exit (0);
-      break;
-
-    case CirculateNotify:
-    case ConfigureNotify:
-    case GravityNotify:
-    case MapNotify:
-    case ReparentNotify:
-    case UnmapNotify:
-      break;
-      
-    default:
-      ErrorF("xnest warning: unhandled event\n");
-      break;
+    XEvent X;
+    int valuators[2];
+    ValuatorMask mask;
+    ScreenPtr pScreen;
+
+    while (XCheckIfEvent(xnestDisplay, &X, xnestNotExposurePredicate, NULL)) {
+        switch (X.type) {
+        case KeyPress:
+            xnestUpdateModifierState(X.xkey.state);
+            xnestQueueKeyEvent(KeyPress, X.xkey.keycode);
+            break;
+
+        case KeyRelease:
+            xnestUpdateModifierState(X.xkey.state);
+            xnestQueueKeyEvent(KeyRelease, X.xkey.keycode);
+            break;
+
+        case ButtonPress:
+            valuator_mask_set_range(&mask, 0, 0, NULL);
+            xnestUpdateModifierState(X.xkey.state);
+            lastEventTime = GetTimeInMillis();
+            QueuePointerEvents(xnestPointerDevice, ButtonPress,
+                               X.xbutton.button, POINTER_RELATIVE, &mask);
+            break;
+
+        case ButtonRelease:
+            valuator_mask_set_range(&mask, 0, 0, NULL);
+            xnestUpdateModifierState(X.xkey.state);
+            lastEventTime = GetTimeInMillis();
+            QueuePointerEvents(xnestPointerDevice, ButtonRelease,
+                               X.xbutton.button, POINTER_RELATIVE, &mask);
+            break;
+
+        case MotionNotify:
+            valuators[0] = X.xmotion.x;
+            valuators[1] = X.xmotion.y;
+            valuator_mask_set_range(&mask, 0, 2, valuators);
+            lastEventTime = GetTimeInMillis();
+            QueuePointerEvents(xnestPointerDevice, MotionNotify,
+                               0, POINTER_ABSOLUTE, &mask);
+            break;
+
+        case FocusIn:
+            if (X.xfocus.detail != NotifyInferior) {
+                pScreen = xnestScreen(X.xfocus.window);
+                if (pScreen)
+                    xnestDirectInstallColormaps(pScreen);
+            }
+            break;
+
+        case FocusOut:
+            if (X.xfocus.detail != NotifyInferior) {
+                pScreen = xnestScreen(X.xfocus.window);
+                if (pScreen)
+                    xnestDirectUninstallColormaps(pScreen);
+            }
+            break;
+
+        case KeymapNotify:
+            break;
+
+        case EnterNotify:
+            if (X.xcrossing.detail != NotifyInferior) {
+                pScreen = xnestScreen(X.xcrossing.window);
+                if (pScreen) {
+                    NewCurrentScreen(inputInfo.pointer, pScreen, X.xcrossing.x,
+                                     X.xcrossing.y);
+                    valuators[0] = X.xcrossing.x;
+                    valuators[1] = X.xcrossing.y;
+                    valuator_mask_set_range(&mask, 0, 2, valuators);
+                    lastEventTime = GetTimeInMillis();
+                    QueuePointerEvents(xnestPointerDevice, MotionNotify,
+                                       0, POINTER_ABSOLUTE, &mask);
+                    xnestDirectInstallColormaps(pScreen);
+                }
+            }
+            break;
+
+        case LeaveNotify:
+            if (X.xcrossing.detail != NotifyInferior) {
+                pScreen = xnestScreen(X.xcrossing.window);
+                if (pScreen) {
+                    xnestDirectUninstallColormaps(pScreen);
+                }
+            }
+            break;
+
+        case DestroyNotify:
+            if (xnestParentWindow != (Window) 0 &&
+                X.xdestroywindow.window == xnestParentWindow)
+                exit(0);
+            break;
+
+        case CirculateNotify:
+        case ConfigureNotify:
+        case GravityNotify:
+        case MapNotify:
+        case ReparentNotify:
+        case UnmapNotify:
+            break;
+
+        default:
+            ErrorF("xnest warning: unhandled event\n");
+            break;
+        }
     }
-  }
 }
diff --git a/xorg-server/hw/xnest/Font.c b/xorg-server/hw/xnest/Font.c
index 87e622680..1e95588ef 100644
--- a/xorg-server/hw/xnest/Font.c
+++ b/xorg-server/hw/xnest/Font.c
@@ -1,86 +1,88 @@
-/*

-

-Copyright 1993 by Davor Matic

-

-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.  Davor Matic makes no representations about

-the suitability of this software for any purpose.  It is provided "as

-is" without express or implied warranty.

-

-*/

-

-#ifdef HAVE_XNEST_CONFIG_H

-#include <xnest-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xatom.h>

-#include <X11/Xproto.h>

-#include "misc.h"

-#include "regionstr.h"

-#include <X11/fonts/font.h>

-#include <X11/fonts/fontstruct.h>

-#include "scrnintstr.h"

-

-#include "Xnest.h"

-

-#include "Display.h"

-#include "XNFont.h"

-

-int xnestFontPrivateIndex;

-

-Bool

-xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont)

-{

-  pointer priv;

-  Atom name_atom, value_atom;

-  int nprops;

-  FontPropPtr props;

-  int i;

-  const char *name;

-

-  FontSetPrivate(pFont, xnestFontPrivateIndex, NULL);

-

-  name_atom = MakeAtom("FONT", 4, True);

-  value_atom = 0L;

-

-  nprops = pFont->info.nprops;

-  props = pFont->info.props;

-

-  for (i = 0; i < nprops; i++)

-    if (props[i].name == name_atom) {

-      value_atom = props[i].value;

-      break;

-    }

-

-  if (!value_atom) return False;

-

-  name = NameForAtom(value_atom);

-

-  if (!name) return False;

-

-  priv = (pointer)malloc(sizeof(xnestPrivFont));

-  FontSetPrivate(pFont, xnestFontPrivateIndex, priv);

-  

-  xnestFontPriv(pFont)->font_struct = XLoadQueryFont(xnestDisplay, name);

-

-  if (!xnestFontStruct(pFont)) return False;

-						     

-  return True;

-}

-

-

-Bool

-xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)

-{

-  if (xnestFontPriv(pFont)) {

-    if (xnestFontStruct(pFont)) 

-      XFreeFont(xnestDisplay, xnestFontStruct(pFont));

-    free(xnestFontPriv(pFont));

-    FontSetPrivate(pFont, xnestFontPrivateIndex, NULL);

-  }

-  return True;

-}

+/*
+
+Copyright 1993 by Davor Matic
+
+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.  Davor Matic makes no representations about
+the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+*/
+
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xatom.h>
+#include <X11/Xproto.h>
+#include "misc.h"
+#include "regionstr.h"
+#include <X11/fonts/font.h>
+#include <X11/fonts/fontstruct.h>
+#include "scrnintstr.h"
+
+#include "Xnest.h"
+
+#include "Display.h"
+#include "XNFont.h"
+
+int xnestFontPrivateIndex;
+
+Bool
+xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont)
+{
+    pointer priv;
+    Atom name_atom, value_atom;
+    int nprops;
+    FontPropPtr props;
+    int i;
+    const char *name;
+
+    FontSetPrivate(pFont, xnestFontPrivateIndex, NULL);
+
+    name_atom = MakeAtom("FONT", 4, True);
+    value_atom = 0L;
+
+    nprops = pFont->info.nprops;
+    props = pFont->info.props;
+
+    for (i = 0; i < nprops; i++)
+        if (props[i].name == name_atom) {
+            value_atom = props[i].value;
+            break;
+        }
+
+    if (!value_atom)
+        return False;
+
+    name = NameForAtom(value_atom);
+
+    if (!name)
+        return False;
+
+    priv = (pointer) malloc(sizeof(xnestPrivFont));
+    FontSetPrivate(pFont, xnestFontPrivateIndex, priv);
+
+    xnestFontPriv(pFont)->font_struct = XLoadQueryFont(xnestDisplay, name);
+
+    if (!xnestFontStruct(pFont))
+        return False;
+
+    return True;
+}
+
+Bool
+xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
+{
+    if (xnestFontPriv(pFont)) {
+        if (xnestFontStruct(pFont))
+            XFreeFont(xnestDisplay, xnestFontStruct(pFont));
+        free(xnestFontPriv(pFont));
+        FontSetPrivate(pFont, xnestFontPrivateIndex, NULL);
+    }
+    return True;
+}
diff --git a/xorg-server/hw/xnest/GC.c b/xorg-server/hw/xnest/GC.c
index 48fe4dcbc..cfaf71475 100644
--- a/xorg-server/hw/xnest/GC.c
+++ b/xorg-server/hw/xnest/GC.c
@@ -29,7 +29,7 @@ is" without express or implied warranty.
 #include "Xnest.h"
 
 #include "Display.h"
-#include "XNGC.h" 
+#include "XNGC.h"
 #include "GCOps.h"
 #include "Drawable.h"
 #include "XNFont.h"
@@ -38,51 +38,51 @@ is" without express or implied warranty.
 DevPrivateKeyRec xnestGCPrivateKeyRec;
 
 static GCFuncs xnestFuncs = {
-  xnestValidateGC,
-  xnestChangeGC,
-  xnestCopyGC,
-  xnestDestroyGC,
-  xnestChangeClip,
-  xnestDestroyClip,
-  xnestCopyClip,
+    xnestValidateGC,
+    xnestChangeGC,
+    xnestCopyGC,
+    xnestDestroyGC,
+    xnestChangeClip,
+    xnestDestroyClip,
+    xnestCopyClip,
 };
 
 static GCOps xnestOps = {
-  xnestFillSpans,
-  xnestSetSpans,
-  xnestPutImage,
-  xnestCopyArea, 
-  xnestCopyPlane,
-  xnestPolyPoint,
-  xnestPolylines,
-  xnestPolySegment,
-  xnestPolyRectangle,
-  xnestPolyArc,
-  xnestFillPolygon,
-  xnestPolyFillRect,
-  xnestPolyFillArc,
-  xnestPolyText8, 
-  xnestPolyText16,
-  xnestImageText8,
-  xnestImageText16,
-  xnestImageGlyphBlt,
-  xnestPolyGlyphBlt,
-  xnestPushPixels
+    xnestFillSpans,
+    xnestSetSpans,
+    xnestPutImage,
+    xnestCopyArea,
+    xnestCopyPlane,
+    xnestPolyPoint,
+    xnestPolylines,
+    xnestPolySegment,
+    xnestPolyRectangle,
+    xnestPolyArc,
+    xnestFillPolygon,
+    xnestPolyFillRect,
+    xnestPolyFillArc,
+    xnestPolyText8,
+    xnestPolyText16,
+    xnestImageText8,
+    xnestImageText16,
+    xnestImageGlyphBlt,
+    xnestPolyGlyphBlt,
+    xnestPushPixels
 };
 
 Bool
 xnestCreateGC(GCPtr pGC)
 {
-  pGC->funcs = &xnestFuncs;
-  pGC->ops = &xnestOps;
-  
-  pGC->miTranslate = 1;
-   
-  xnestGCPriv(pGC)->gc = XCreateGC(xnestDisplay, 
-				   xnestDefaultDrawables[pGC->depth], 
-				   0L, NULL);
-
-  return True;
+    pGC->funcs = &xnestFuncs;
+    pGC->ops = &xnestOps;
+
+    pGC->miTranslate = 1;
+
+    xnestGCPriv(pGC)->gc = XCreateGC(xnestDisplay,
+                                     xnestDefaultDrawables[pGC->depth],
+                                     0L, NULL);
+
+    return True;
 }
 
 void
@@ -93,238 +93,236 @@ xnestValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
 void
 xnestChangeGC(GCPtr pGC, unsigned long mask)
 {
-  XGCValues values;
-  
-  if (mask & GCFunction)
-    values.function = pGC->alu;
-  
-  if (mask & GCPlaneMask)
-    values.plane_mask = pGC->planemask;
-  
-  if (mask & GCForeground)
-    values.foreground = xnestPixel(pGC->fgPixel);
-  
-  if (mask & GCBackground)
-    values.background = xnestPixel(pGC->bgPixel);
-
-  if (mask & GCLineWidth)
-    values.line_width = pGC->lineWidth;
-    
-  if (mask & GCLineStyle)
-    values.line_style = pGC->lineStyle;
-
-  if (mask & GCCapStyle)
-    values.cap_style = pGC->capStyle;
-
-  if (mask & GCJoinStyle)
-    values.join_style = pGC->joinStyle;
-
-  if (mask & GCFillStyle)
-    values.fill_style = pGC->fillStyle;
-
-  if (mask & GCFillRule)
-    values.fill_rule = pGC->fillRule;
-  
-  if (mask & GCTile) {
-    if (pGC->tileIsPixel)
-      mask &= ~GCTile;
-    else
-      values.tile = xnestPixmap(pGC->tile.pixmap);
-  }
-
-  if (mask & GCStipple)
-    values.stipple = xnestPixmap(pGC->stipple);
-
-  if (mask & GCTileStipXOrigin)
-    values.ts_x_origin = pGC->patOrg.x;
-
-  if (mask & GCTileStipYOrigin)
-    values.ts_y_origin = pGC->patOrg.y;
-
-  if (mask & GCFont)
-    values.font = xnestFont(pGC->font);
-
-  if (mask & GCSubwindowMode)
-    values.subwindow_mode = pGC->subWindowMode;
-
-  if (mask & GCGraphicsExposures)
-    values.graphics_exposures = pGC->graphicsExposures;
-
-  if (mask & GCClipXOrigin)
-    values.clip_x_origin = pGC->clipOrg.x;
-
-  if (mask & GCClipYOrigin)
-    values.clip_y_origin = pGC->clipOrg.y;
-
-  if (mask & GCClipMask) /* this is handled in change clip */
-    mask &= ~GCClipMask;
-
-  if (mask & GCDashOffset)
-    values.dash_offset = pGC->dashOffset;
-
-  if (mask & GCDashList) {
-    mask &= ~GCDashList;
-    XSetDashes(xnestDisplay, xnestGC(pGC), 
-	       pGC->dashOffset, (char *)pGC->dash, pGC->numInDashList);
-  }
-
-  if (mask & GCArcMode)
-    values.arc_mode = pGC->arcMode;
-
-  if (mask)
-    XChangeGC(xnestDisplay, xnestGC(pGC), mask, &values);
+    XGCValues values;
+
+    if (mask & GCFunction)
+        values.function = pGC->alu;
+
+    if (mask & GCPlaneMask)
+        values.plane_mask = pGC->planemask;
+
+    if (mask & GCForeground)
+        values.foreground = xnestPixel(pGC->fgPixel);
+
+    if (mask & GCBackground)
+        values.background = xnestPixel(pGC->bgPixel);
+
+    if (mask & GCLineWidth)
+        values.line_width = pGC->lineWidth;
+
+    if (mask & GCLineStyle)
+        values.line_style = pGC->lineStyle;
+
+    if (mask & GCCapStyle)
+        values.cap_style = pGC->capStyle;
+
+    if (mask & GCJoinStyle)
+        values.join_style = pGC->joinStyle;
+
+    if (mask & GCFillStyle)
+        values.fill_style = pGC->fillStyle;
+
+    if (mask & GCFillRule)
+        values.fill_rule = pGC->fillRule;
+
+    if (mask & GCTile) {
+        if (pGC->tileIsPixel)
+            mask &= ~GCTile;
+        else
+            values.tile = xnestPixmap(pGC->tile.pixmap);
+    }
+
+    if (mask & GCStipple)
+        values.stipple = xnestPixmap(pGC->stipple);
+
+    if (mask & GCTileStipXOrigin)
+        values.ts_x_origin = pGC->patOrg.x;
+
+    if (mask & GCTileStipYOrigin)
+        values.ts_y_origin = pGC->patOrg.y;
+
+    if (mask & GCFont)
+        values.font = xnestFont(pGC->font);
+
+    if (mask & GCSubwindowMode)
+        values.subwindow_mode = pGC->subWindowMode;
+
+    if (mask & GCGraphicsExposures)
+        values.graphics_exposures = pGC->graphicsExposures;
+
+    if (mask & GCClipXOrigin)
+        values.clip_x_origin = pGC->clipOrg.x;
+
+    if (mask & GCClipYOrigin)
+        values.clip_y_origin = pGC->clipOrg.y;
+
+    if (mask & GCClipMask)      /* this is handled in change clip */
+        mask &= ~GCClipMask;
+
+    if (mask & GCDashOffset)
+        values.dash_offset = pGC->dashOffset;
+
+    if (mask & GCDashList) {
+        mask &= ~GCDashList;
+        XSetDashes(xnestDisplay, xnestGC(pGC),
+                   pGC->dashOffset, (char *) pGC->dash, pGC->numInDashList);
+    }
+
+    if (mask & GCArcMode)
+        values.arc_mode = pGC->arcMode;
+
+    if (mask)
+        XChangeGC(xnestDisplay, xnestGC(pGC), mask, &values);
 }
 
 void
 xnestCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
 {
-  XCopyGC(xnestDisplay, xnestGC(pGCSrc), mask, xnestGC(pGCDst));
+    XCopyGC(xnestDisplay, xnestGC(pGCSrc), mask, xnestGC(pGCDst));
 }
 
 void
 xnestDestroyGC(GCPtr pGC)
 {
-  XFreeGC(xnestDisplay, xnestGC(pGC));
+    XFreeGC(xnestDisplay, xnestGC(pGC));
 }
 
 void
 xnestChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
 {
-  int i, size;
-  BoxPtr pBox;
-  XRectangle *pRects;
+    int i, size;
+    BoxPtr pBox;
+    XRectangle *pRects;
 
-  xnestDestroyClipHelper(pGC);
+    xnestDestroyClipHelper(pGC);
 
-  switch(type) 
-    {
+    switch (type) {
     case CT_NONE:
-      XSetClipMask(xnestDisplay, xnestGC(pGC), None);
-      break;
-      
+        XSetClipMask(xnestDisplay, xnestGC(pGC), None);
+        break;
+
     case CT_REGION:
-      nRects = RegionNumRects((RegionPtr)pValue);
-      size = nRects * sizeof(*pRects);
-      pRects = (XRectangle *) malloc(size);
-      pBox = RegionRects((RegionPtr)pValue);
-      for (i = nRects; i-- > 0; ) {
-	pRects[i].x = pBox[i].x1;
-	pRects[i].y = pBox[i].y1;
-	pRects[i].width = pBox[i].x2 - pBox[i].x1;
-	pRects[i].height = pBox[i].y2 - pBox[i].y1;
-      }
-      XSetClipRectangles(xnestDisplay, xnestGC(pGC), 0, 0,
-			 pRects, nRects, Unsorted);
-      free((char *) pRects);
-      break;
+        nRects = RegionNumRects((RegionPtr) pValue);
+        size = nRects * sizeof(*pRects);
+        pRects = (XRectangle *) malloc(size);
+        pBox = RegionRects((RegionPtr) pValue);
+        for (i = nRects; i-- > 0;) {
+            pRects[i].x = pBox[i].x1;
+            pRects[i].y = pBox[i].y1;
+            pRects[i].width = pBox[i].x2 - pBox[i].x1;
+            pRects[i].height = pBox[i].y2 - pBox[i].y1;
+        }
+        XSetClipRectangles(xnestDisplay, xnestGC(pGC), 0, 0,
+                           pRects, nRects, Unsorted);
+        free((char *) pRects);
+        break;
 
     case CT_PIXMAP:
-      XSetClipMask(xnestDisplay, xnestGC(pGC), 
-		   xnestPixmap((PixmapPtr)pValue));
-      /*
-       * Need to change into region, so subsequent uses are with
-       * current pixmap contents.
-       */
-      pGC->clientClip = (pointer) (*pGC->pScreen->BitmapToRegion)((PixmapPtr)pValue);
-      (*pGC->pScreen->DestroyPixmap)((PixmapPtr)pValue);
-      pValue = pGC->clientClip;
-      type = CT_REGION;
-      break;
+        XSetClipMask(xnestDisplay, xnestGC(pGC),
+                     xnestPixmap((PixmapPtr) pValue));
+        /*
+         * Need to change into region, so subsequent uses are with
+         * current pixmap contents.
+         */
+        pGC->clientClip =
+            (pointer) (*pGC->pScreen->BitmapToRegion) ((PixmapPtr) pValue);
+        (*pGC->pScreen->DestroyPixmap) ((PixmapPtr) pValue);
+        pValue = pGC->clientClip;
+        type = CT_REGION;
+        break;
 
     case CT_UNSORTED:
-      XSetClipRectangles(xnestDisplay, xnestGC(pGC), 
-			 pGC->clipOrg.x, pGC->clipOrg.y,
-			 (XRectangle *)pValue, nRects, Unsorted);
-      break;
+        XSetClipRectangles(xnestDisplay, xnestGC(pGC),
+                           pGC->clipOrg.x, pGC->clipOrg.y,
+                           (XRectangle *) pValue, nRects, Unsorted);
+        break;
 
     case CT_YSORTED:
-      XSetClipRectangles(xnestDisplay, xnestGC(pGC), 
-			 pGC->clipOrg.x, pGC->clipOrg.y,
-			 (XRectangle *)pValue, nRects, YSorted);
-      break;
+        XSetClipRectangles(xnestDisplay, xnestGC(pGC),
+                           pGC->clipOrg.x, pGC->clipOrg.y,
+                           (XRectangle *) pValue, nRects, YSorted);
+        break;
 
     case CT_YXSORTED:
-      XSetClipRectangles(xnestDisplay, xnestGC(pGC), 
-			 pGC->clipOrg.x, pGC->clipOrg.y,
-			 (XRectangle *)pValue, nRects, YXSorted);
-      break;
+        XSetClipRectangles(xnestDisplay, xnestGC(pGC),
+                           pGC->clipOrg.x, pGC->clipOrg.y,
+                           (XRectangle *) pValue, nRects, YXSorted);
+        break;
 
     case CT_YXBANDED:
-      XSetClipRectangles(xnestDisplay, xnestGC(pGC), 
-			 pGC->clipOrg.x, pGC->clipOrg.y,
-			 (XRectangle *)pValue, nRects, YXBanded);
-      break;
+        XSetClipRectangles(xnestDisplay, xnestGC(pGC),
+                           pGC->clipOrg.x, pGC->clipOrg.y,
+                           (XRectangle *) pValue, nRects, YXBanded);
+        break;
     }
 
-  switch(type) 
-    {
+    switch (type) {
     default:
-      break;
+        break;
 
     case CT_UNSORTED:
     case CT_YSORTED:
     case CT_YXSORTED:
     case CT_YXBANDED:
-      
-      /*
-       * other parts of server can only deal with CT_NONE,
-       * CT_PIXMAP and CT_REGION client clips.
-       */
-      pGC->clientClip = (pointer) RegionFromRects(nRects,
-						  (xRectangle *)pValue, type);
-      free(pValue);
-      pValue = pGC->clientClip;
-      type = CT_REGION;
-
-      break;
+
+        /*
+         * other parts of server can only deal with CT_NONE,
+         * CT_PIXMAP and CT_REGION client clips.
+         */
+        pGC->clientClip = (pointer) RegionFromRects(nRects,
+                                                    (xRectangle *) pValue,
+                                                    type);
+        free(pValue);
+        pValue = pGC->clientClip;
+        type = CT_REGION;
+
+        break;
     }
 
-  pGC->clientClipType = type;
-  pGC->clientClip = pValue;
+    pGC->clientClipType = type;
+    pGC->clientClip = pValue;
 }
 
 void
 xnestDestroyClip(GCPtr pGC)
 {
-  xnestDestroyClipHelper(pGC);
+    xnestDestroyClipHelper(pGC);
 
-  XSetClipMask(xnestDisplay, xnestGC(pGC), None);
- 
-  pGC->clientClipType = CT_NONE;
-  pGC->clientClip = NULL;
+    XSetClipMask(xnestDisplay, xnestGC(pGC), None);
+
+    pGC->clientClipType = CT_NONE;
+    pGC->clientClip = NULL;
 }
 
 void
 xnestDestroyClipHelper(GCPtr pGC)
 {
-  switch (pGC->clientClipType)
-    {
+    switch (pGC->clientClipType) {
     default:
     case CT_NONE:
-      break;
-      
+        break;
+
     case CT_REGION:
-      RegionDestroy(pGC->clientClip);
-      break;
+        RegionDestroy(pGC->clientClip);
+        break;
     }
 }
 
 void
 xnestCopyClip(GCPtr pGCDst, GCPtr pGCSrc)
 {
-  RegionPtr pRgn;
+    RegionPtr pRgn;
 
-  switch (pGCSrc->clientClipType)
-    {
+    switch (pGCSrc->clientClipType) {
     default:
     case CT_NONE:
-      xnestDestroyClip(pGCDst);
-      break;
+        xnestDestroyClip(pGCDst);
+        break;
 
     case CT_REGION:
-      pRgn = RegionCreate(NULL, 1);
-      RegionCopy(pRgn, pGCSrc->clientClip);
-      xnestChangeClip(pGCDst, CT_REGION, pRgn, 0);
-      break;
+        pRgn = RegionCreate(NULL, 1);
+        RegionCopy(pRgn, pGCSrc->clientClip);
+        xnestChangeClip(pGCDst, CT_REGION, pRgn, 0);
+        break;
     }
 }
diff --git a/xorg-server/hw/xnest/GCOps.c b/xorg-server/hw/xnest/GCOps.c
index d19ec6710..e26a1363b 100644
--- a/xorg-server/hw/xnest/GCOps.c
+++ b/xorg-server/hw/xnest/GCOps.c
@@ -1,327 +1,326 @@
-/*

-

-Copyright 1993 by Davor Matic

-

-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.  Davor Matic makes no representations about

-the suitability of this software for any purpose.  It is provided "as

-is" without express or implied warranty.

-

-*/

-

-#ifdef HAVE_XNEST_CONFIG_H

-#include <xnest-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "regionstr.h"

-#include <X11/fonts/fontstruct.h>

-#include "gcstruct.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "pixmapstr.h"

-#include "region.h"

-#include "servermd.h"

-

-#include "Xnest.h"

-

-#include "Display.h"

-#include "Screen.h"

-#include "XNGC.h"

-#include "XNFont.h"

-#include "GCOps.h"

-#include "Drawable.h"

-#include "Visual.h"

-

-void

-xnestFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nSpans, xPoint *pPoints,

-	       int *pWidths, int fSorted)

-{

-  ErrorF("xnest warning: function xnestFillSpans not implemented\n");

-}

-

-void

-xnestSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pSrc,

-	      xPoint *pPoints, int *pWidths, int nSpans, int fSorted)

-{

-  ErrorF("xnest warning: function xnestSetSpans not implemented\n");

-}

-

-void

-xnestGetSpans(DrawablePtr pDrawable, int maxWidth, DDXPointPtr pPoints,

-	      int *pWidths, int nSpans, char *pBuffer)

-{

-  ErrorF("xnest warning: function xnestGetSpans not implemented\n");

-}

-

-void

-xnestQueryBestSize(int class, unsigned short *pWidth, unsigned short *pHeight,

-		   ScreenPtr pScreen)

-{

-  unsigned int width, height;

-

-  width = *pWidth;

-  height = *pHeight;

-

-  XQueryBestSize(xnestDisplay, class, 

-		 xnestDefaultWindows[pScreen->myNum], 

-		 width, height, &width, &height);

-  

-  *pWidth = width;

-  *pHeight = height;

-}

-

-void

-xnestPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,

-	      int w, int h, int leftPad, int format, char *pImage)

-{

-  XImage *ximage;

-  

-  ximage = XCreateImage(xnestDisplay, xnestDefaultVisual(pDrawable->pScreen), 

-			depth, format, leftPad, (char *)pImage, 

-			w, h, BitmapPad(xnestDisplay), 

-			(format == ZPixmap) ? 

-			   PixmapBytePad(w, depth) : BitmapBytePad(w+leftPad));

-  

-  if (ximage) {

-      XPutImage(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC), 

-		ximage, 0, 0, x, y, w, h);

-      XFree(ximage);

-  }

-}

-

-void

-xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,

-	      unsigned int format, unsigned long planeMask,

-	      char *pImage)

-{

-  XImage *ximage;

-  int length;

-

-  ximage = XGetImage(xnestDisplay, xnestDrawable(pDrawable),

-                     x, y, w, h, planeMask, format);

-

-  if (ximage) {

-      length = ximage->bytes_per_line * ximage->height;

-  

-      memmove(pImage, ximage->data, length);

-  

-      XDestroyImage(ximage);

-  }

-}

-

-static Bool

-xnestBitBlitPredicate(Display *display, XEvent *event, char *args)

-{

-  return event->type == GraphicsExpose || event->type == NoExpose;

-}

-

-static RegionPtr

-xnestBitBlitHelper(GCPtr pGC)

-{

-  if (!pGC->graphicsExposures) 

-    return NullRegion;

-  else {

-    XEvent event;

-    RegionPtr pReg, pTmpReg;

-    BoxRec Box;

-    Bool pending, overlap;

-

-    pReg = RegionCreate(NULL, 1);

-    pTmpReg = RegionCreate(NULL, 1);

-    if(!pReg || !pTmpReg) return NullRegion;

-    

-    pending = True;

-    while (pending) {

-      XIfEvent(xnestDisplay, &event, xnestBitBlitPredicate, NULL);

-      

-      switch (event.type) {

-      case NoExpose:

-	pending = False;

-	break;

-	

-      case GraphicsExpose:

-	Box.x1 = event.xgraphicsexpose.x;

-	Box.y1 = event.xgraphicsexpose.y;

-	Box.x2 = event.xgraphicsexpose.x + event.xgraphicsexpose.width;

-	Box.y2 = event.xgraphicsexpose.y + event.xgraphicsexpose.height;

-	RegionReset(pTmpReg, &Box);

-	RegionAppend(pReg, pTmpReg);

-	pending = event.xgraphicsexpose.count;

-	break;

-      }

-    }

-

-    RegionDestroy(pTmpReg);

-    RegionValidate(pReg, &overlap);

-    return pReg;

-  }

-}

-

-RegionPtr

-xnestCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,

-	      GCPtr pGC, int srcx, int srcy, int width, int height,

-	      int dstx, int dsty)

-{

-  XCopyArea(xnestDisplay, 

-	    xnestDrawable(pSrcDrawable), xnestDrawable(pDstDrawable),

-	    xnestGC(pGC), srcx, srcy, width, height, dstx, dsty);

-  

-  return xnestBitBlitHelper(pGC);

-}

-

-RegionPtr

-xnestCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,

-	       GCPtr pGC, int srcx, int srcy, int width, int height,

-	       int dstx, int dsty, unsigned long plane)

-{

-  XCopyPlane(xnestDisplay, 

-	     xnestDrawable(pSrcDrawable), xnestDrawable(pDstDrawable),

-	     xnestGC(pGC), srcx, srcy, width, height, dstx, dsty, plane);

-  

-  return xnestBitBlitHelper(pGC);

-}

-

-void

-xnestPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int nPoints,

-	       DDXPointPtr pPoints)

-{

-  XDrawPoints(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC), 

-              (XPoint *)pPoints, nPoints, mode);

-}

-

-void

-xnestPolylines(DrawablePtr pDrawable, GCPtr pGC, int mode, int nPoints,

-	       DDXPointPtr pPoints)

-{

-  XDrawLines(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC), 

-              (XPoint *)pPoints, nPoints, mode);

-}

-

-void

-xnestPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nSegments,

-		 xSegment *pSegments)

-{

-  XDrawSegments(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC), 

-                (XSegment *)pSegments, nSegments);

-}

-

-void

-xnestPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, int nRectangles,

-		   xRectangle *pRectangles)

-{

-  XDrawRectangles(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),

-                  (XRectangle *)pRectangles, nRectangles);

-}

-

-void

-xnestPolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc *pArcs)

-{

-  XDrawArcs(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),

-            (XArc *)pArcs, nArcs);

-}

-

-void

-xnestFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape, int mode,

-		 int nPoints, DDXPointPtr pPoints)

-{

-  XFillPolygon(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC), 

-               (XPoint *)pPoints, nPoints, shape, mode);

-}

-

-void

-xnestPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nRectangles,

-		  xRectangle *pRectangles)

-{

-  XFillRectangles(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),

-                  (XRectangle *)pRectangles, nRectangles);

-}

-

-void

-xnestPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc *pArcs)

-{

-  XFillArcs(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),

-            (XArc *)pArcs, nArcs);

-}

-

-int

-xnestPolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,

-	       char *string)

-{

-  int width;

-

-  XDrawString(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),

-              x, y, string, count);

-  

-  width = XTextWidth(xnestFontStruct(pGC->font), string, count);

-  

-  return width + x;

-}

-

-int

-xnestPolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,

-		unsigned short *string)

-{

-  int width;

-

-  XDrawString16(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),

-                x, y, (XChar2b *)string, count);

-

-  width = XTextWidth16(xnestFontStruct(pGC->font), (XChar2b *)string, count);

-

-  return width + x;

-}

-

-void

-xnestImageText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,

-		char *string)

-{

-  XDrawImageString(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),

-                   x, y, string, count);

-}

-

-void

-xnestImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,

-		 unsigned short *string)

-{

-  XDrawImageString16(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),

-                     x, y, (XChar2b *)string, count);

-}

-

-void

-xnestImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,

-		   unsigned int nGlyphs, CharInfoPtr *pCharInfo,

-		   pointer pGlyphBase)

-{

-  ErrorF("xnest warning: function xnestImageGlyphBlt not implemented\n");

-}

-

-void

-xnestPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,

-		  unsigned int nGlyphs, CharInfoPtr *pCharInfo,

-		  pointer pGlyphBase)

-{

-  ErrorF("xnest warning: function xnestPolyGlyphBlt not implemented\n");

-}

-

-void

-xnestPushPixels(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDst,

-		int width, int height, int x, int y)

-{

-  /* only works for solid bitmaps */

-  if (pGC->fillStyle == FillSolid)

-  {

-    XSetStipple (xnestDisplay, xnestGC(pGC), xnestPixmap(pBitmap));

-    XSetTSOrigin (xnestDisplay, xnestGC(pGC), x, y);

-    XSetFillStyle (xnestDisplay, xnestGC(pGC), FillStippled);

-    XFillRectangle (xnestDisplay, xnestDrawable(pDst),

-		    xnestGC(pGC), x, y, width, height);

-    XSetFillStyle (xnestDisplay, xnestGC(pGC), FillSolid);

-  }

-  else

-    ErrorF("xnest warning: function xnestPushPixels not implemented\n");

-}

+/*
+
+Copyright 1993 by Davor Matic
+
+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.  Davor Matic makes no representations about
+the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+*/
+
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "regionstr.h"
+#include <X11/fonts/fontstruct.h>
+#include "gcstruct.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "pixmapstr.h"
+#include "region.h"
+#include "servermd.h"
+
+#include "Xnest.h"
+
+#include "Display.h"
+#include "Screen.h"
+#include "XNGC.h"
+#include "XNFont.h"
+#include "GCOps.h"
+#include "Drawable.h"
+#include "Visual.h"
+
+void
+xnestFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nSpans, xPoint * pPoints,
+               int *pWidths, int fSorted)
+{
+    ErrorF("xnest warning: function xnestFillSpans not implemented\n");
+}
+
+void
+xnestSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pSrc,
+              xPoint * pPoints, int *pWidths, int nSpans, int fSorted)
+{
+    ErrorF("xnest warning: function xnestSetSpans not implemented\n");
+}
+
+void
+xnestGetSpans(DrawablePtr pDrawable, int maxWidth, DDXPointPtr pPoints,
+              int *pWidths, int nSpans, char *pBuffer)
+{
+    ErrorF("xnest warning: function xnestGetSpans not implemented\n");
+}
+
+void
+xnestQueryBestSize(int class, unsigned short *pWidth, unsigned short *pHeight,
+                   ScreenPtr pScreen)
+{
+    unsigned int width, height;
+
+    width = *pWidth;
+    height = *pHeight;
+
+    XQueryBestSize(xnestDisplay, class,
+                   xnestDefaultWindows[pScreen->myNum],
+                   width, height, &width, &height);
+
+    *pWidth = width;
+    *pHeight = height;
+}
+
+void
+xnestPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
+              int w, int h, int leftPad, int format, char *pImage)
+{
+    XImage *ximage;
+
+    ximage = XCreateImage(xnestDisplay, xnestDefaultVisual(pDrawable->pScreen),
+                          depth, format, leftPad, (char *) pImage,
+                          w, h, BitmapPad(xnestDisplay),
+                          (format == ZPixmap) ?
+                          PixmapBytePad(w, depth) : BitmapBytePad(w + leftPad));
+
+    if (ximage) {
+        XPutImage(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+                  ximage, 0, 0, x, y, w, h);
+        XFree(ximage);
+    }
+}
+
+void
+xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
+              unsigned int format, unsigned long planeMask, char *pImage)
+{
+    XImage *ximage;
+    int length;
+
+    ximage = XGetImage(xnestDisplay, xnestDrawable(pDrawable),
+                       x, y, w, h, planeMask, format);
+
+    if (ximage) {
+        length = ximage->bytes_per_line * ximage->height;
+
+        memmove(pImage, ximage->data, length);
+
+        XDestroyImage(ximage);
+    }
+}
+
+static Bool
+xnestBitBlitPredicate(Display * display, XEvent * event, char *args)
+{
+    return event->type == GraphicsExpose || event->type == NoExpose;
+}
+
+static RegionPtr
+xnestBitBlitHelper(GCPtr pGC)
+{
+    if (!pGC->graphicsExposures)
+        return NullRegion;
+    else {
+        XEvent event;
+        RegionPtr pReg, pTmpReg;
+        BoxRec Box;
+        Bool pending, overlap;
+
+        pReg = RegionCreate(NULL, 1);
+        pTmpReg = RegionCreate(NULL, 1);
+        if (!pReg || !pTmpReg)
+            return NullRegion;
+
+        pending = True;
+        while (pending) {
+            XIfEvent(xnestDisplay, &event, xnestBitBlitPredicate, NULL);
+
+            switch (event.type) {
+            case NoExpose:
+                pending = False;
+                break;
+
+            case GraphicsExpose:
+                Box.x1 = event.xgraphicsexpose.x;
+                Box.y1 = event.xgraphicsexpose.y;
+                Box.x2 = event.xgraphicsexpose.x + event.xgraphicsexpose.width;
+                Box.y2 = event.xgraphicsexpose.y + event.xgraphicsexpose.height;
+                RegionReset(pTmpReg, &Box);
+                RegionAppend(pReg, pTmpReg);
+                pending = event.xgraphicsexpose.count;
+                break;
+            }
+        }
+
+        RegionDestroy(pTmpReg);
+        RegionValidate(pReg, &overlap);
+        return pReg;
+    }
+}
+
+RegionPtr
+xnestCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+              GCPtr pGC, int srcx, int srcy, int width, int height,
+              int dstx, int dsty)
+{
+    XCopyArea(xnestDisplay,
+              xnestDrawable(pSrcDrawable), xnestDrawable(pDstDrawable),
+              xnestGC(pGC), srcx, srcy, width, height, dstx, dsty);
+
+    return xnestBitBlitHelper(pGC);
+}
+
+RegionPtr
+xnestCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+               GCPtr pGC, int srcx, int srcy, int width, int height,
+               int dstx, int dsty, unsigned long plane)
+{
+    XCopyPlane(xnestDisplay,
+               xnestDrawable(pSrcDrawable), xnestDrawable(pDstDrawable),
+               xnestGC(pGC), srcx, srcy, width, height, dstx, dsty, plane);
+
+    return xnestBitBlitHelper(pGC);
+}
+
+void
+xnestPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int nPoints,
+               DDXPointPtr pPoints)
+{
+    XDrawPoints(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+                (XPoint *) pPoints, nPoints, mode);
+}
+
+void
+xnestPolylines(DrawablePtr pDrawable, GCPtr pGC, int mode, int nPoints,
+               DDXPointPtr pPoints)
+{
+    XDrawLines(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+               (XPoint *) pPoints, nPoints, mode);
+}
+
+void
+xnestPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nSegments,
+                 xSegment * pSegments)
+{
+    XDrawSegments(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+                  (XSegment *) pSegments, nSegments);
+}
+
+void
+xnestPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, int nRectangles,
+                   xRectangle *pRectangles)
+{
+    XDrawRectangles(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+                    (XRectangle *) pRectangles, nRectangles);
+}
+
+void
+xnestPolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
+{
+    XDrawArcs(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+              (XArc *) pArcs, nArcs);
+}
+
+void
+xnestFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape, int mode,
+                 int nPoints, DDXPointPtr pPoints)
+{
+    XFillPolygon(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+                 (XPoint *) pPoints, nPoints, shape, mode);
+}
+
+void
+xnestPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nRectangles,
+                  xRectangle *pRectangles)
+{
+    XFillRectangles(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+                    (XRectangle *) pRectangles, nRectangles);
+}
+
+void
+xnestPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
+{
+    XFillArcs(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+              (XArc *) pArcs, nArcs);
+}
+
+int
+xnestPolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
+               char *string)
+{
+    int width;
+
+    XDrawString(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+                x, y, string, count);
+
+    width = XTextWidth(xnestFontStruct(pGC->font), string, count);
+
+    return width + x;
+}
+
+int
+xnestPolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
+                unsigned short *string)
+{
+    int width;
+
+    XDrawString16(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+                  x, y, (XChar2b *) string, count);
+
+    width = XTextWidth16(xnestFontStruct(pGC->font), (XChar2b *) string, count);
+
+    return width + x;
+}
+
+void
+xnestImageText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
+                char *string)
+{
+    XDrawImageString(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+                     x, y, string, count);
+}
+
+void
+xnestImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
+                 unsigned short *string)
+{
+    XDrawImageString16(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
+                       x, y, (XChar2b *) string, count);
+}
+
+void
+xnestImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+                   unsigned int nGlyphs, CharInfoPtr * pCharInfo,
+                   pointer pGlyphBase)
+{
+    ErrorF("xnest warning: function xnestImageGlyphBlt not implemented\n");
+}
+
+void
+xnestPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+                  unsigned int nGlyphs, CharInfoPtr * pCharInfo,
+                  pointer pGlyphBase)
+{
+    ErrorF("xnest warning: function xnestPolyGlyphBlt not implemented\n");
+}
+
+void
+xnestPushPixels(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDst,
+                int width, int height, int x, int y)
+{
+    /* only works for solid bitmaps */
+    if (pGC->fillStyle == FillSolid) {
+        XSetStipple(xnestDisplay, xnestGC(pGC), xnestPixmap(pBitmap));
+        XSetTSOrigin(xnestDisplay, xnestGC(pGC), x, y);
+        XSetFillStyle(xnestDisplay, xnestGC(pGC), FillStippled);
+        XFillRectangle(xnestDisplay, xnestDrawable(pDst),
+                       xnestGC(pGC), x, y, width, height);
+        XSetFillStyle(xnestDisplay, xnestGC(pGC), FillSolid);
+    }
+    else
+        ErrorF("xnest warning: function xnestPushPixels not implemented\n");
+}
diff --git a/xorg-server/hw/xnest/GCOps.h b/xorg-server/hw/xnest/GCOps.h
index ca4cf33f7..b1cad110c 100644
--- a/xorg-server/hw/xnest/GCOps.h
+++ b/xorg-server/hw/xnest/GCOps.h
@@ -16,53 +16,53 @@ is" without express or implied warranty.
 #define XNESTGCOPS_H
 
 void xnestFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nSpans,
-		    xPoint *pPoints, int *pWidths, int fSorted);
+                    xPoint * pPoints, int *pWidths, int fSorted);
 void xnestSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pSrc,
-		   xPoint *pPoints, int *pWidths, int nSpans, int fSorted);
+                   xPoint * pPoints, int *pWidths, int nSpans, int fSorted);
 void xnestGetSpans(DrawablePtr pDrawable, int maxWidth, DDXPointPtr pPoints,
-		   int *pWidths, int nSpans, char *pBuffer);
+                   int *pWidths, int nSpans, char *pBuffer);
 void xnestQueryBestSize(int class, unsigned short *pWidth,
-			unsigned short *pHeight, ScreenPtr pScreen);
+                        unsigned short *pHeight, ScreenPtr pScreen);
 void xnestPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
-		   int w, int h, int leftPad, int format, char *pImage);
+                   int w, int h, int leftPad, int format, char *pImage);
 void xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
-		   unsigned int format, unsigned long planeMask,
-		   char *pImage);
+                   unsigned int format, unsigned long planeMask, char *pImage);
 RegionPtr xnestCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
-			GCPtr pGC, int srcx, int srcy, int width, int height,
-			int dstx, int dsty);
+                        GCPtr pGC, int srcx, int srcy, int width, int height,
+                        int dstx, int dsty);
 RegionPtr xnestCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
-			 GCPtr pGC, int srcx, int srcy, int width, int height,
-			 int dstx, int dsty, unsigned long plane);
+                         GCPtr pGC, int srcx, int srcy, int width, int height,
+                         int dstx, int dsty, unsigned long plane);
 void xnestPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int nPoints,
-		    DDXPointPtr  pPoints);
+                    DDXPointPtr pPoints);
 void xnestPolylines(DrawablePtr pDrawable, GCPtr pGC, int mode, int nPoints,
-		    DDXPointPtr pPoints);
+                    DDXPointPtr pPoints);
 void xnestPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nSegments,
-		      xSegment *pSegments);
+                      xSegment * pSegments);
 void xnestPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, int nRectangles,
-			xRectangle *pRectangles);
-void xnestPolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc *pArcs);
+                        xRectangle *pRectangles);
+void xnestPolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs);
 void xnestFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape, int mode,
-		      int nPoints, DDXPointPtr pPoints);
+                      int nPoints, DDXPointPtr pPoints);
 void xnestPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nRectangles,
-		       xRectangle *pRectangles);
-void xnestPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc *pArcs);
+                       xRectangle *pRectangles);
+void xnestPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs,
+                      xArc * pArcs);
 int xnestPolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
-		   char *string);
+                   char *string);
 int xnestPolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
-		    unsigned short *string);
+                    unsigned short *string);
 void xnestImageText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
-		    char *string);
+                     char *string);
 void xnestImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
-		    unsigned short *string);
+                      unsigned short *string);
 void xnestImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
-			unsigned int nGlyphs, CharInfoPtr *pCharInfo,
-			pointer pGlyphBase);
+                        unsigned int nGlyphs, CharInfoPtr * pCharInfo,
+                        pointer pGlyphBase);
 void xnestPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
-		       unsigned int nGlyphs, CharInfoPtr *pCharInfo,
-		       pointer pGlyphBase);
+                       unsigned int nGlyphs, CharInfoPtr * pCharInfo,
+                       pointer pGlyphBase);
 void xnestPushPixels(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable,
-		     int width, int height, int x, int y);
+                     int width, int height, int x, int y);
 
-#endif /* XNESTGCOPS_H */
+#endif                          /* XNESTGCOPS_H */
diff --git a/xorg-server/hw/xnest/Init.c b/xorg-server/hw/xnest/Init.c
index af57518ba..0909826d9 100644
--- a/xorg-server/hw/xnest/Init.c
+++ b/xorg-server/hw/xnest/Init.c
@@ -46,84 +46,86 @@ is" without express or implied warranty.
 Bool xnestDoFullGeneration = True;
 
 void
-InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
+InitOutput(ScreenInfo * screenInfo, int argc, char *argv[])
 {
-  int i, j;
-
-  xnestOpenDisplay(argc, argv);
-  
-  screenInfo->imageByteOrder = ImageByteOrder(xnestDisplay);
-  screenInfo->bitmapScanlineUnit = BitmapUnit(xnestDisplay);
-  screenInfo->bitmapScanlinePad = BitmapPad(xnestDisplay);
-  screenInfo->bitmapBitOrder = BitmapBitOrder(xnestDisplay);
-  
-  screenInfo->numPixmapFormats = 0;
-  for (i = 0; i < xnestNumPixmapFormats; i++) 
-    for (j = 0; j < xnestNumDepths; j++)
-      if ((xnestPixmapFormats[i].depth == 1) ||
-          (xnestPixmapFormats[i].depth == xnestDepths[j])) {
-	screenInfo->formats[screenInfo->numPixmapFormats].depth = 
-	  xnestPixmapFormats[i].depth;
-	screenInfo->formats[screenInfo->numPixmapFormats].bitsPerPixel = 
-	  xnestPixmapFormats[i].bits_per_pixel;
-	screenInfo->formats[screenInfo->numPixmapFormats].scanlinePad = 
-	  xnestPixmapFormats[i].scanline_pad;
-	screenInfo->numPixmapFormats++;
-	break;
-      }
-  
-  xnestFontPrivateIndex = AllocateFontPrivateIndex();
-  
-  if (!xnestNumScreens) xnestNumScreens = 1;
-
-  for (i = 0; i < xnestNumScreens; i++)
-    AddScreen(xnestOpenScreen, argc, argv);
-
-  xnestNumScreens = screenInfo->numScreens;
-
-  xnestDoFullGeneration = xnestFullGeneration;
+    int i, j;
+
+    xnestOpenDisplay(argc, argv);
+
+    screenInfo->imageByteOrder = ImageByteOrder(xnestDisplay);
+    screenInfo->bitmapScanlineUnit = BitmapUnit(xnestDisplay);
+    screenInfo->bitmapScanlinePad = BitmapPad(xnestDisplay);
+    screenInfo->bitmapBitOrder = BitmapBitOrder(xnestDisplay);
+
+    screenInfo->numPixmapFormats = 0;
+    for (i = 0; i < xnestNumPixmapFormats; i++)
+        for (j = 0; j < xnestNumDepths; j++)
+            if ((xnestPixmapFormats[i].depth == 1) ||
+                (xnestPixmapFormats[i].depth == xnestDepths[j])) {
+                screenInfo->formats[screenInfo->numPixmapFormats].depth =
+                    xnestPixmapFormats[i].depth;
+                screenInfo->formats[screenInfo->numPixmapFormats].bitsPerPixel =
+                    xnestPixmapFormats[i].bits_per_pixel;
+                screenInfo->formats[screenInfo->numPixmapFormats].scanlinePad =
+                    xnestPixmapFormats[i].scanline_pad;
+                screenInfo->numPixmapFormats++;
+                break;
+            }
+
+    xnestFontPrivateIndex = AllocateFontPrivateIndex();
+
+    if (!xnestNumScreens)
+        xnestNumScreens = 1;
+
+    for (i = 0; i < xnestNumScreens; i++)
+        AddScreen(xnestOpenScreen, argc, argv);
+
+    xnestNumScreens = screenInfo->numScreens;
+
+    xnestDoFullGeneration = xnestFullGeneration;
 }
 
 void
 InitInput(int argc, char *argv[])
 {
-  int rc;
-  rc = AllocDevicePair(serverClient, "Xnest",
-                       &xnestPointerDevice,
-                       &xnestKeyboardDevice,
-                       xnestPointerProc,
-                       xnestKeyboardProc,
-                       FALSE);
+    int rc;
+
+    rc = AllocDevicePair(serverClient, "Xnest",
+                         &xnestPointerDevice,
+                         &xnestKeyboardDevice,
+                         xnestPointerProc, xnestKeyboardProc, FALSE);
 
-  if (rc != Success)
-      FatalError("Failed to init Xnest default devices.\n");
+    if (rc != Success)
+        FatalError("Failed to init Xnest default devices.\n");
 
-  mieqInit();
+    mieqInit();
 
-  AddEnabledDevice(XConnectionNumber(xnestDisplay));
+    AddEnabledDevice(XConnectionNumber(xnestDisplay));
 
-  RegisterBlockAndWakeupHandlers(xnestBlockHandler, xnestWakeupHandler, NULL);
+    RegisterBlockAndWakeupHandlers(xnestBlockHandler, xnestWakeupHandler, NULL);
 }
 
 void
 CloseInput(void)
 {
-  mieqFini();
+    mieqFini();
 }
 
 /*
  * DDX - specific abort routine.  Called by AbortServer().
  */
-void AbortDDX(enum ExitCode error)
+void
+AbortDDX(enum ExitCode error)
 {
-  xnestDoFullGeneration = True;
-  xnestCloseDisplay();
+    xnestDoFullGeneration = True;
+    xnestCloseDisplay();
 }
 
 /* Called by GiveUp(). */
-void ddxGiveUp(enum ExitCode error)
+void
+ddxGiveUp(enum ExitCode error)
 {
-  AbortDDX(error);
+    AbortDDX(error);
 }
 
 #ifdef __APPLE__
@@ -133,18 +135,21 @@ DarwinHandleGUI(int argc, char *argv[])
 }
 #endif
 
-void OsVendorInit(void)
+void
+OsVendorInit(void)
 {
     return;
 }
 
-void OsVendorFatalError(void)
+void
+OsVendorFatalError(void)
 {
     return;
 }
 
 #if defined(DDXBEFORERESET)
-void ddxBeforeReset(void)
+void
+ddxBeforeReset(void)
 {
     return;
 }
diff --git a/xorg-server/hw/xnest/Keyboard.c b/xorg-server/hw/xnest/Keyboard.c
index 5ef376b91..d013dc91e 100644
--- a/xorg-server/hw/xnest/Keyboard.c
+++ b/xorg-server/hw/xnest/Keyboard.c
@@ -38,231 +38,230 @@ is" without express or implied warranty.
 #include <X11/extensions/XKBconfig.h>
 
 extern Bool
-XkbQueryExtension(
-	Display *		/* dpy */,
-	int *			/* opcodeReturn */,
-	int *			/* eventBaseReturn */,
-	int *			/* errorBaseReturn */,
-	int *			/* majorRtrn */,
-	int *			/* minorRtrn */
-);
-
-extern	XkbDescPtr XkbGetKeyboard(
-	Display *		/* dpy */,
-	unsigned int		/* which */,
-	unsigned int		/* deviceSpec */
-);
-
-extern	Status	XkbGetControls(
-	Display *		/* dpy */,
-	unsigned long		/* which */,
-	XkbDescPtr		/* desc */
-);
+ XkbQueryExtension(Display * /* dpy */ ,
+                   int * /* opcodeReturn */ ,
+                   int * /* eventBaseReturn */ ,
+                   int * /* errorBaseReturn */ ,
+                   int * /* majorRtrn */ ,
+                   int *        /* minorRtrn */
+    );
+
+extern XkbDescPtr XkbGetKeyboard(Display * /* dpy */ ,
+                                 unsigned int /* which */ ,
+                                 unsigned int   /* deviceSpec */
+    );
+
+extern Status XkbGetControls(Display * /* dpy */ ,
+                             unsigned long /* which */ ,
+                             XkbDescPtr /* desc */
+    );
 
 DeviceIntPtr xnestKeyboardDevice = NULL;
 
 void
 xnestBell(int volume, DeviceIntPtr pDev, pointer ctrl, int cls)
 {
-  XBell(xnestDisplay, volume);
+    XBell(xnestDisplay, volume);
 }
 
 void
 DDXRingBell(int volume, int pitch, int duration)
 {
-  XBell(xnestDisplay, volume);
+    XBell(xnestDisplay, volume);
 }
 
 void
-xnestChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
+xnestChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl * ctrl)
 {
 #if 0
-  unsigned long value_mask;
-  XKeyboardControl values;
-  int i;
-
-  value_mask = KBKeyClickPercent |
-               KBBellPercent |
-	       KBBellPitch |
-	       KBBellDuration |
-	       KBAutoRepeatMode;
-
-  values.key_click_percent = ctrl->click;
-  values.bell_percent = ctrl->bell;
-  values.bell_pitch = ctrl->bell_pitch;
-  values.bell_duration = ctrl->bell_duration;
-  values.auto_repeat_mode = ctrl->autoRepeat ? 
-                             AutoRepeatModeOn : AutoRepeatModeOff;
-
-  XChangeKeyboardControl(xnestDisplay, value_mask, &values);
-
-  /*
-  value_mask = KBKey | KBAutoRepeatMode;
-  At this point, we need to walk through the vector and compare it
-  to the current server vector.  If there are differences, report them.
-  */
-
-  value_mask = KBLed | KBLedMode;
-  for (i = 1; i <= 32; i++) {
-    values.led = i;
-    values.led_mode = (ctrl->leds & (1 << (i - 1))) ? LedModeOn : LedModeOff;
+    unsigned long value_mask;
+    XKeyboardControl values;
+    int i;
+
+    value_mask = KBKeyClickPercent |
+        KBBellPercent | KBBellPitch | KBBellDuration | KBAutoRepeatMode;
+
+    values.key_click_percent = ctrl->click;
+    values.bell_percent = ctrl->bell;
+    values.bell_pitch = ctrl->bell_pitch;
+    values.bell_duration = ctrl->bell_duration;
+    values.auto_repeat_mode = ctrl->autoRepeat ?
+        AutoRepeatModeOn : AutoRepeatModeOff;
+
     XChangeKeyboardControl(xnestDisplay, value_mask, &values);
-  }
+
+    /*
+       value_mask = KBKey | KBAutoRepeatMode;
+       At this point, we need to walk through the vector and compare it
+       to the current server vector.  If there are differences, report them.
+     */
+
+    value_mask = KBLed | KBLedMode;
+    for (i = 1; i <= 32; i++) {
+        values.led = i;
+        values.led_mode =
+            (ctrl->leds & (1 << (i - 1))) ? LedModeOn : LedModeOff;
+        XChangeKeyboardControl(xnestDisplay, value_mask, &values);
+    }
 #endif
 }
 
 int
 xnestKeyboardProc(DeviceIntPtr pDev, int onoff)
 {
-  XModifierKeymap *modifier_keymap;
-  KeySym *keymap;
-  int mapWidth;
-  int min_keycode, max_keycode;
-  KeySymsRec keySyms;
-  CARD8 modmap[MAP_LENGTH];
-  int i, j;
-  XKeyboardState values;
-  XkbDescPtr xkb;
-  int op, event, error, major, minor;
-
-  switch (onoff)
-    {
-    case DEVICE_INIT: 
-      XDisplayKeycodes(xnestDisplay, &min_keycode, &max_keycode);
+    XModifierKeymap *modifier_keymap;
+    KeySym *keymap;
+    int mapWidth;
+    int min_keycode, max_keycode;
+    KeySymsRec keySyms;
+    CARD8 modmap[MAP_LENGTH];
+    int i, j;
+    XKeyboardState values;
+    XkbDescPtr xkb;
+    int op, event, error, major, minor;
+
+    switch (onoff) {
+    case DEVICE_INIT:
+        XDisplayKeycodes(xnestDisplay, &min_keycode, &max_keycode);
 #ifdef _XSERVER64
-      {
-	KeySym64 *keymap64;
-	int len;
-	keymap64 = XGetKeyboardMapping(xnestDisplay,
-				     min_keycode,
-				     max_keycode - min_keycode + 1,
-				     &mapWidth);
-	len = (max_keycode - min_keycode + 1) * mapWidth;
-	keymap = (KeySym *)malloc(len * sizeof(KeySym));
-	for(i = 0; i < len; ++i)
-	  keymap[i] = keymap64[i];
-	XFree(keymap64);
-      }
+        {
+            KeySym64 *keymap64;
+            int len;
+
+            keymap64 = XGetKeyboardMapping(xnestDisplay,
+                                           min_keycode,
+                                           max_keycode - min_keycode + 1,
+                                           &mapWidth);
+            len = (max_keycode - min_keycode + 1) * mapWidth;
+            keymap = (KeySym *) malloc(len * sizeof(KeySym));
+            for (i = 0; i < len; ++i)
+                keymap[i] = keymap64[i];
+            XFree(keymap64);
+        }
 #else
-      keymap = XGetKeyboardMapping(xnestDisplay, 
-				   min_keycode,
-				   max_keycode - min_keycode + 1,
-				   &mapWidth);
+        keymap = XGetKeyboardMapping(xnestDisplay,
+                                     min_keycode,
+                                     max_keycode - min_keycode + 1, &mapWidth);
 #endif
 
-      memset(modmap, 0, sizeof(modmap));
-      modifier_keymap = XGetModifierMapping(xnestDisplay);
-      for (j = 0; j < 8; j++)
-            for(i = 0; i < modifier_keymap->max_keypermod; i++) {
-                  CARD8 keycode;
-                  if ((keycode = modifier_keymap->modifiermap[j * modifier_keymap->max_keypermod + i]))
-                      modmap[keycode] |= 1<<j;
-      }
-      XFreeModifiermap(modifier_keymap);
-
-      keySyms.minKeyCode = min_keycode;
-      keySyms.maxKeyCode = max_keycode;
-      keySyms.mapWidth = mapWidth;
-      keySyms.map = keymap;
-
-      if (XkbQueryExtension(xnestDisplay, &op, &event, &error, &major, &minor) == 0) {
-          ErrorF("Unable to initialize XKEYBOARD extension.\n");
-	  goto XkbError;
-      }
-      xkb = XkbGetKeyboard(xnestDisplay, XkbGBN_AllComponentsMask, XkbUseCoreKbd);
-      if (xkb == NULL || xkb->geom == NULL) {
-	  ErrorF("Couldn't get keyboard.\n");
-          goto XkbError;
-      }
-      XkbGetControls(xnestDisplay, XkbAllControlsMask, xkb);
-
-      InitKeyboardDeviceStruct(pDev, NULL,
-                               xnestBell, xnestChangeKeyboardControl);
-
-      XkbApplyMappingChange(pDev, &keySyms, keySyms.minKeyCode,
-                            keySyms.maxKeyCode - keySyms.minKeyCode + 1,
-                            modmap, serverClient);
-
-      XkbDDXChangeControls(pDev, xkb->ctrls, xkb->ctrls);
-      XkbFreeKeyboard(xkb, 0, False);
-      free(keymap);
-      break;
-    case DEVICE_ON: 
-      xnestEventMask |= XNEST_KEYBOARD_EVENT_MASK;
-      for (i = 0; i < xnestNumScreens; i++)
-	XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask);
-      break;
-    case DEVICE_OFF: 
-      xnestEventMask &= ~XNEST_KEYBOARD_EVENT_MASK;
-      for (i = 0; i < xnestNumScreens; i++)
-	XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask);
-      break;
-    case DEVICE_CLOSE: 
-      break;
+        memset(modmap, 0, sizeof(modmap));
+        modifier_keymap = XGetModifierMapping(xnestDisplay);
+        for (j = 0; j < 8; j++)
+            for (i = 0; i < modifier_keymap->max_keypermod; i++) {
+                CARD8 keycode;
+
+                if ((keycode =
+                     modifier_keymap->modifiermap[j *
+                                                  modifier_keymap->
+                                                  max_keypermod + i]))
+                    modmap[keycode] |= 1 << j;
+            }
+        XFreeModifiermap(modifier_keymap);
+
+        keySyms.minKeyCode = min_keycode;
+        keySyms.maxKeyCode = max_keycode;
+        keySyms.mapWidth = mapWidth;
+        keySyms.map = keymap;
+
+        if (XkbQueryExtension(xnestDisplay, &op, &event, &error, &major, &minor)
+            == 0) {
+            ErrorF("Unable to initialize XKEYBOARD extension.\n");
+            goto XkbError;
+        }
+        xkb =
+            XkbGetKeyboard(xnestDisplay, XkbGBN_AllComponentsMask,
+                           XkbUseCoreKbd);
+        if (xkb == NULL || xkb->geom == NULL) {
+            ErrorF("Couldn't get keyboard.\n");
+            goto XkbError;
+        }
+        XkbGetControls(xnestDisplay, XkbAllControlsMask, xkb);
+
+        InitKeyboardDeviceStruct(pDev, NULL,
+                                 xnestBell, xnestChangeKeyboardControl);
+
+        XkbApplyMappingChange(pDev, &keySyms, keySyms.minKeyCode,
+                              keySyms.maxKeyCode - keySyms.minKeyCode + 1,
+                              modmap, serverClient);
+
+        XkbDDXChangeControls(pDev, xkb->ctrls, xkb->ctrls);
+        XkbFreeKeyboard(xkb, 0, False);
+        free(keymap);
+        break;
+    case DEVICE_ON:
+        xnestEventMask |= XNEST_KEYBOARD_EVENT_MASK;
+        for (i = 0; i < xnestNumScreens; i++)
+            XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask);
+        break;
+    case DEVICE_OFF:
+        xnestEventMask &= ~XNEST_KEYBOARD_EVENT_MASK;
+        for (i = 0; i < xnestNumScreens; i++)
+            XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask);
+        break;
+    case DEVICE_CLOSE:
+        break;
     }
-  return Success;
-
-XkbError:
-  XGetKeyboardControl(xnestDisplay, &values);
-  memmove((char *)defaultKeyboardControl.autoRepeats,
-          (char *)values.auto_repeats,
-          sizeof(values.auto_repeats));
-
-  InitKeyboardDeviceStruct(pDev, NULL,
-                           xnestBell, xnestChangeKeyboardControl);
-  free(keymap);
-  return Success;
+    return Success;
+
+ XkbError:
+    XGetKeyboardControl(xnestDisplay, &values);
+    memmove((char *) defaultKeyboardControl.autoRepeats,
+            (char *) values.auto_repeats, sizeof(values.auto_repeats));
+
+    InitKeyboardDeviceStruct(pDev, NULL, xnestBell, xnestChangeKeyboardControl);
+    free(keymap);
+    return Success;
 }
 
 Bool
 LegalModifier(unsigned int key, DeviceIntPtr pDev)
 {
-  return TRUE;
+    return TRUE;
 }
 
 void
 xnestUpdateModifierState(unsigned int state)
 {
-  DeviceIntPtr pDev = xnestKeyboardDevice;
-  KeyClassPtr keyc = pDev->key;
-  int i;
-  CARD8 mask;
-  int xkb_state;
-
-  if (!pDev)
-      return;
-
-  xkb_state = XkbStateFieldFromRec(&pDev->key->xkbInfo->state);
-  state = state & 0xff;
-
-  if (xkb_state == state)
-    return;
-
-  for (i = 0, mask = 1; i < 8; i++, mask <<= 1) {
-    int key;
-
-    /* Modifier is down, but shouldn't be
-     */
-    if ((xkb_state & mask) && !(state & mask)) {
-      int count = keyc->modifierKeyCount[i];
-
-      for (key = 0; key < MAP_LENGTH; key++)
-	if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
-	  if (key_is_down(pDev, key, KEY_PROCESSED))
-	    xnestQueueKeyEvent(KeyRelease, key);
-
-	  if (--count == 0)
-	    break;
-	}
+    DeviceIntPtr pDev = xnestKeyboardDevice;
+    KeyClassPtr keyc = pDev->key;
+    int i;
+    CARD8 mask;
+    int xkb_state;
+
+    if (!pDev)
+        return;
+
+    xkb_state = XkbStateFieldFromRec(&pDev->key->xkbInfo->state);
+    state = state & 0xff;
+
+    if (xkb_state == state)
+        return;
+
+    for (i = 0, mask = 1; i < 8; i++, mask <<= 1) {
+        int key;
+
+        /* Modifier is down, but shouldn't be
+         */
+        if ((xkb_state & mask) && !(state & mask)) {
+            int count = keyc->modifierKeyCount[i];
+
+            for (key = 0; key < MAP_LENGTH; key++)
+                if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
+                    if (key_is_down(pDev, key, KEY_PROCESSED))
+                        xnestQueueKeyEvent(KeyRelease, key);
+
+                    if (--count == 0)
+                        break;
+                }
+        }
+
+        /* Modifier shoud be down, but isn't
+         */
+        if (!(xkb_state & mask) && (state & mask))
+            for (key = 0; key < MAP_LENGTH; key++)
+                if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
+                    xnestQueueKeyEvent(KeyPress, key);
+                    break;
+                }
     }
-
-    /* Modifier shoud be down, but isn't
-     */
-    if (!(xkb_state & mask) && (state & mask))
-      for (key = 0; key < MAP_LENGTH; key++)
-	if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
-	  xnestQueueKeyEvent(KeyPress, key);
-	  break;
-	}
-  }
 }
diff --git a/xorg-server/hw/xnest/Pointer.c b/xorg-server/hw/xnest/Pointer.c
index fdc6181e9..a2ee90064 100644
--- a/xorg-server/hw/xnest/Pointer.c
+++ b/xorg-server/hw/xnest/Pointer.c
@@ -34,64 +34,63 @@ is" without express or implied warranty.
 #include "Args.h"
 
 #include "xserver-properties.h"
-#include "exevents.h" /* For XIGetKnownProperty */
+#include "exevents.h"           /* For XIGetKnownProperty */
 
 DeviceIntPtr xnestPointerDevice = NULL;
 
 void
-xnestChangePointerControl(DeviceIntPtr pDev, PtrCtrl *ctrl)
+xnestChangePointerControl(DeviceIntPtr pDev, PtrCtrl * ctrl)
 {
-  XChangePointerControl(xnestDisplay, True, True, 
-			ctrl->num, ctrl->den, ctrl->threshold); 
+    XChangePointerControl(xnestDisplay, True, True,
+                          ctrl->num, ctrl->den, ctrl->threshold);
 }
 
 int
 xnestPointerProc(DeviceIntPtr pDev, int onoff)
 {
-  CARD8 map[MAXBUTTONS];
-  Atom btn_labels[MAXBUTTONS] = {0};
-  Atom axes_labels[2] = {0};
-  int nmap;
-  int i;
+    CARD8 map[MAXBUTTONS];
+    Atom btn_labels[MAXBUTTONS] = { 0 };
+    Atom axes_labels[2] = { 0 };
+    int nmap;
+    int i;
 
-  switch (onoff)
-    {
-    case DEVICE_INIT: 
-      nmap = XGetPointerMapping(xnestDisplay, map, MAXBUTTONS);
-      for (i = 0; i <= nmap; i++)
-	map[i] = i; /* buttons are already mapped */
+    switch (onoff) {
+    case DEVICE_INIT:
+        nmap = XGetPointerMapping(xnestDisplay, map, MAXBUTTONS);
+        for (i = 0; i <= nmap; i++)
+            map[i] = i;         /* buttons are already mapped */
 
-      btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
-      btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
-      btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
-      btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
-      btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
-      btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
-      btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
+        btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+        btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+        btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+        btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+        btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+        btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+        btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
 
-      axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
-      axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+        axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+        axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
 
-      XGetPointerControl(xnestDisplay,
-                         &defaultPointerControl.num,
-                         &defaultPointerControl.den,
-                         &defaultPointerControl.threshold);
-      InitPointerDeviceStruct(&pDev->public, map, nmap, btn_labels,
-			      xnestChangePointerControl,
-			      GetMotionHistorySize(), 2, axes_labels);
-      break;
-    case DEVICE_ON: 
-      xnestEventMask |= XNEST_POINTER_EVENT_MASK;
-      for (i = 0; i < xnestNumScreens; i++)
-	XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask);
-      break;
-    case DEVICE_OFF: 
-      xnestEventMask &= ~XNEST_POINTER_EVENT_MASK;
-      for (i = 0; i < xnestNumScreens; i++)
-	XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask);
-      break;
-    case DEVICE_CLOSE: 
-      break;
+        XGetPointerControl(xnestDisplay,
+                           &defaultPointerControl.num,
+                           &defaultPointerControl.den,
+                           &defaultPointerControl.threshold);
+        InitPointerDeviceStruct(&pDev->public, map, nmap, btn_labels,
+                                xnestChangePointerControl,
+                                GetMotionHistorySize(), 2, axes_labels);
+        break;
+    case DEVICE_ON:
+        xnestEventMask |= XNEST_POINTER_EVENT_MASK;
+        for (i = 0; i < xnestNumScreens; i++)
+            XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask);
+        break;
+    case DEVICE_OFF:
+        xnestEventMask &= ~XNEST_POINTER_EVENT_MASK;
+        for (i = 0; i < xnestNumScreens; i++)
+            XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask);
+        break;
+    case DEVICE_CLOSE:
+        break;
     }
-  return Success;
+    return Success;
 }
diff --git a/xorg-server/hw/xnest/Screen.c b/xorg-server/hw/xnest/Screen.c
index c4ab464cb..dd76cb801 100644
--- a/xorg-server/hw/xnest/Screen.c
+++ b/xorg-server/hw/xnest/Screen.c
@@ -1,422 +1,428 @@
-/*

-

-Copyright 1993 by Davor Matic

-

-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.  Davor Matic makes no representations about

-the suitability of this software for any purpose.  It is provided "as

-is" without express or implied warranty.

-

-*/

-

-#ifdef HAVE_XNEST_CONFIG_H

-#include <xnest-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "scrnintstr.h"

-#include "dix.h"

-#include "mi.h"

-#include "mibstore.h"

-#include "micmap.h"

-#include "colormapst.h"

-#include "resource.h"

-

-#include "Xnest.h"

-

-#include "Display.h"

-#include "Screen.h"

-#include "XNGC.h"

-#include "GCOps.h"

-#include "Drawable.h"

-#include "XNFont.h"

-#include "Color.h"

-#include "XNCursor.h"

-#include "Visual.h"

-#include "Events.h"

-#include "Init.h"

-#include "mipointer.h"

-#include "Args.h"

-#include "mipointrst.h"

-

-Window xnestDefaultWindows[MAXSCREENS];

-Window xnestScreenSaverWindows[MAXSCREENS];

-DevPrivateKeyRec xnestCursorScreenKeyRec;

-

-ScreenPtr

-xnestScreen(Window window)

-{

-  int i;

-  

-  for (i = 0; i < xnestNumScreens; i++)

-    if (xnestDefaultWindows[i] == window) 

-      return screenInfo.screens[i];

-

-  return NULL;

-}

-

-static int

-offset(unsigned long mask)

-{

-  int count;

-  

-  for (count = 0; !(mask & 1) && count < 32; count++)

-    mask >>= 1;

-  

-  return count;

-}

-

-static Bool

-xnestSaveScreen(ScreenPtr pScreen, int what)

-{

-  if (xnestSoftwareScreenSaver)

-    return False;

-  else {

-    switch (what) {

-    case SCREEN_SAVER_ON:

-      XMapRaised(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]);

-      xnestSetScreenSaverColormapWindow(pScreen);

-      break;

-      

-    case SCREEN_SAVER_OFF:

-      XUnmapWindow(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]);

-      xnestSetInstalledColormapWindows(pScreen);

-      break;

-      

-    case SCREEN_SAVER_FORCER:

-      lastEventTime = GetTimeInMillis();

-      XUnmapWindow(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]);

-      xnestSetInstalledColormapWindows(pScreen);

-      break;

-      

-    case SCREEN_SAVER_CYCLE:

-      XUnmapWindow(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]);

-      xnestSetInstalledColormapWindows(pScreen);

-      break;

-    }

-    return True;

-  }

-}

-

-static Bool

-xnestCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)

-{

-    return FALSE;

-}

-

-static void

-xnestCrossScreen(ScreenPtr pScreen, Bool entering)

-{

-}

-

-static miPointerScreenFuncRec xnestPointerCursorFuncs =

-{

-    xnestCursorOffScreen,

-    xnestCrossScreen,

-    miPointerWarpCursor

-};

-

-static miPointerSpriteFuncRec xnestPointerSpriteFuncs = 

-{

-    xnestRealizeCursor,

-    xnestUnrealizeCursor,

-    xnestSetCursor,

-    xnestMoveCursor,

-    xnestDeviceCursorInitialize,

-    xnestDeviceCursorCleanup

-};

-

-Bool

-xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])

-{

-  VisualPtr visuals;

-  DepthPtr depths;

-  int numVisuals, numDepths;

-  int i, j, depthIndex;

-  unsigned long valuemask;

-  XSetWindowAttributes attributes;

-  XWindowAttributes gattributes;

-  XSizeHints sizeHints;

-  VisualID defaultVisual;

-  int rootDepth;

-  miPointerScreenPtr PointPriv;

-

-  if (!dixRegisterPrivateKey(&xnestWindowPrivateKeyRec, PRIVATE_WINDOW, sizeof(xnestPrivWin)))

-      return FALSE;

-  if (!dixRegisterPrivateKey(&xnestGCPrivateKeyRec, PRIVATE_GC, sizeof(xnestPrivGC)))

-    return FALSE;

-  if (!dixRegisterPrivateKey(&xnestPixmapPrivateKeyRec, PRIVATE_PIXMAP, sizeof (xnestPrivPixmap)))

-      return FALSE;

-  if (!dixRegisterPrivateKey(&xnestColormapPrivateKeyRec, PRIVATE_COLORMAP, sizeof (xnestPrivColormap)))

-      return FALSE;

-  if (!dixRegisterPrivateKey(&xnestCursorScreenKeyRec, PRIVATE_SCREEN, 0))

-      return FALSE;

-

-  visuals = (VisualPtr)malloc(xnestNumVisuals * sizeof(VisualRec));

-  numVisuals = 0;

-

-  depths = (DepthPtr)malloc(MAXDEPTH * sizeof(DepthRec));

-  depths[0].depth = 1;

-  depths[0].numVids = 0;

-  depths[0].vids = (VisualID *)malloc(MAXVISUALSPERDEPTH * sizeof(VisualID));

-  numDepths = 1;

-

-  for (i = 0; i < xnestNumVisuals; i++) {

-    visuals[numVisuals].class = xnestVisuals[i].class;

-    visuals[numVisuals].bitsPerRGBValue = xnestVisuals[i].bits_per_rgb;

-    visuals[numVisuals].ColormapEntries = xnestVisuals[i].colormap_size;

-    visuals[numVisuals].nplanes = xnestVisuals[i].depth;

-    visuals[numVisuals].redMask = xnestVisuals[i].red_mask;

-    visuals[numVisuals].greenMask = xnestVisuals[i].green_mask;

-    visuals[numVisuals].blueMask = xnestVisuals[i].blue_mask;

-    visuals[numVisuals].offsetRed = offset(xnestVisuals[i].red_mask);

-    visuals[numVisuals].offsetGreen = offset(xnestVisuals[i].green_mask);

-    visuals[numVisuals].offsetBlue = offset(xnestVisuals[i].blue_mask);

-

-    /* Check for and remove duplicates. */

-    for (j = 0; j < numVisuals; j++) {

-      if (visuals[numVisuals].class           == visuals[j].class           &&

-	  visuals[numVisuals].bitsPerRGBValue == visuals[j].bitsPerRGBValue &&

-	  visuals[numVisuals].ColormapEntries == visuals[j].ColormapEntries &&

-	  visuals[numVisuals].nplanes         == visuals[j].nplanes         &&

-	  visuals[numVisuals].redMask         == visuals[j].redMask         &&

-	  visuals[numVisuals].greenMask       == visuals[j].greenMask       &&

-	  visuals[numVisuals].blueMask        == visuals[j].blueMask        &&

-	  visuals[numVisuals].offsetRed       == visuals[j].offsetRed       &&

-	  visuals[numVisuals].offsetGreen     == visuals[j].offsetGreen     &&

-	  visuals[numVisuals].offsetBlue      == visuals[j].offsetBlue)

-	break;

-    }

-    if (j < numVisuals)

-      break;

-

-    visuals[numVisuals].vid = FakeClientID(0);

-

-    depthIndex = UNDEFINED;

-    for (j = 0; j < numDepths; j++)

-      if (depths[j].depth == xnestVisuals[i].depth) {

-	depthIndex = j;

-	break;

-      }

-    

-    if (depthIndex == UNDEFINED) {

-      depthIndex = numDepths;

-      depths[depthIndex].depth = xnestVisuals[i].depth;

-      depths[depthIndex].numVids = 0;

-      depths[depthIndex].vids = 

-	(VisualID *)malloc(MAXVISUALSPERDEPTH * sizeof(VisualID));

-      numDepths++;

-    }

-    if (depths[depthIndex].numVids >= MAXVISUALSPERDEPTH) {

-	FatalError("Visual table overflow");

-    }

-    depths[depthIndex].vids[depths[depthIndex].numVids] = 

-      visuals[numVisuals].vid;

-    depths[depthIndex].numVids++;

-    

-    numVisuals++;

-  }

-  visuals = (VisualPtr)realloc(visuals, numVisuals * sizeof(VisualRec));

-

-  defaultVisual = visuals[xnestDefaultVisualIndex].vid;

-  rootDepth = visuals[xnestDefaultVisualIndex].nplanes;

-

-  if (xnestParentWindow != 0) {

-    XGetWindowAttributes(xnestDisplay, xnestParentWindow, &gattributes);

-    xnestWidth = gattributes.width;

-    xnestHeight = gattributes.height;

-  }

-

-  /* myNum */

-  /* id */

-  miScreenInit(pScreen, NULL, xnestWidth, xnestHeight, 1, 1, xnestWidth,

-	       rootDepth,

-	       numDepths, depths,

-	       defaultVisual, /* root visual */

-	       numVisuals, visuals);

-

-  pScreen->defColormap = (Colormap) FakeClientID(0);

-  pScreen->minInstalledCmaps = MINCMAPS;

-  pScreen->maxInstalledCmaps = MAXCMAPS;

-  pScreen->backingStoreSupport = NotUseful;

-  pScreen->saveUnderSupport = NotUseful;

-  pScreen->whitePixel = xnestWhitePixel;

-  pScreen->blackPixel = xnestBlackPixel;

-  /* GCperDepth */

-  /* PixmapPerDepth */

-  pScreen->devPrivate = NULL;

-  /* WindowPrivateLen */

-  /* WindowPrivateSizes */

-  /* totalWindowSize */

-  /* GCPrivateLen */

-  /* GCPrivateSizes */

-  /* totalGCSize */

-

-  /* Random screen procedures */

-

-  pScreen->QueryBestSize = xnestQueryBestSize;

-  pScreen->SaveScreen = xnestSaveScreen;

-  pScreen->GetImage = xnestGetImage;

-  pScreen->GetSpans = xnestGetSpans;

-  pScreen->SourceValidate = NULL;

-

-  /* Window Procedures */

-  

-  pScreen->CreateWindow = xnestCreateWindow;

-  pScreen->DestroyWindow = xnestDestroyWindow;

-  pScreen->PositionWindow = xnestPositionWindow;

-  pScreen->ChangeWindowAttributes = xnestChangeWindowAttributes;

-  pScreen->RealizeWindow = xnestRealizeWindow;

-  pScreen->UnrealizeWindow = xnestUnrealizeWindow;

-  pScreen->PostValidateTree = NULL;

-  pScreen->WindowExposures = xnestWindowExposures;

-  pScreen->CopyWindow = xnestCopyWindow;

-  pScreen->ClipNotify = xnestClipNotify;

-

-  /* Pixmap procedures */

-

-  pScreen->CreatePixmap = xnestCreatePixmap;

-  pScreen->DestroyPixmap = xnestDestroyPixmap;

-

-  /* Font procedures */

-

-  pScreen->RealizeFont = xnestRealizeFont;

-  pScreen->UnrealizeFont = xnestUnrealizeFont;

-

-  /* GC procedures */

-  

-  pScreen->CreateGC = xnestCreateGC;

-

-  /* Colormap procedures */

-

-  pScreen->CreateColormap = xnestCreateColormap;

-  pScreen->DestroyColormap = xnestDestroyColormap;

-  pScreen->InstallColormap = xnestInstallColormap;

-  pScreen->UninstallColormap = xnestUninstallColormap;

-  pScreen->ListInstalledColormaps = xnestListInstalledColormaps;

-  pScreen->StoreColors = xnestStoreColors;

-  pScreen->ResolveColor = xnestResolveColor;

-

-   pScreen->BitmapToRegion = xnestPixmapToRegion;

-

-  /* OS layer procedures */

-

-  pScreen->BlockHandler = (ScreenBlockHandlerProcPtr)NoopDDA;

-  pScreen->WakeupHandler = (ScreenWakeupHandlerProcPtr)NoopDDA;

-  pScreen->blockData = NULL;

-  pScreen->wakeupData = NULL;

-

-  miDCInitialize(pScreen, &xnestPointerCursorFuncs); /* init SW rendering */

-  PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);

-  xnestCursorFuncs.spriteFuncs = PointPriv->spriteFuncs;

-  dixSetPrivate(&pScreen->devPrivates, xnestCursorScreenKey, &xnestCursorFuncs);

-  PointPriv->spriteFuncs = &xnestPointerSpriteFuncs;

-

-  pScreen->mmWidth = xnestWidth * DisplayWidthMM(xnestDisplay, 

-		       DefaultScreen(xnestDisplay)) / 

-			 DisplayWidth(xnestDisplay, 

-			   DefaultScreen(xnestDisplay));

-  pScreen->mmHeight = xnestHeight * DisplayHeightMM(xnestDisplay, 

-		        DefaultScreen(xnestDisplay)) /

-			  DisplayHeight(xnestDisplay, 

-			    DefaultScreen(xnestDisplay));

-

-  /* overwrite miCloseScreen with our own */

-  pScreen->CloseScreen = xnestCloseScreen;

-

-  if (!miScreenDevPrivateInit(pScreen, xnestWidth, NULL))

-      return FALSE;

-

-  /* overwrite miSetShape with our own */

-  pScreen->SetShape = xnestSetShape;

-

-  /* devPrivates */

-

-#define POSITION_OFFSET (pScreen->myNum * (xnestWidth + xnestHeight) / 32)

-    

-  if (xnestDoFullGeneration) {

-

-    valuemask = CWBackPixel | CWEventMask | CWColormap;

-    attributes.background_pixel = xnestWhitePixel;

-    attributes.event_mask = xnestEventMask;

-    attributes.colormap = xnestDefaultVisualColormap(xnestDefaultVisual(pScreen));

-    

-    if (xnestParentWindow != 0) {

-      xnestDefaultWindows[pScreen->myNum] = xnestParentWindow;

-      XSelectInput (xnestDisplay, xnestDefaultWindows[pScreen->myNum],

-		    xnestEventMask);

-    } else

-      xnestDefaultWindows[pScreen->myNum] = 

-	XCreateWindow(xnestDisplay, 

-		      DefaultRootWindow(xnestDisplay),

-		      xnestX + POSITION_OFFSET,

-		      xnestY + POSITION_OFFSET,

-		      xnestWidth, xnestHeight,

-		      xnestBorderWidth,

-		      pScreen->rootDepth,

-		      InputOutput,

-		      xnestDefaultVisual(pScreen),

-		      valuemask, &attributes);

-

-    if (!xnestWindowName)

-      xnestWindowName = argv[0];

-    

-    sizeHints.flags = PPosition | PSize | PMaxSize;

-    sizeHints.x = xnestX + POSITION_OFFSET;

-    sizeHints.y = xnestY + POSITION_OFFSET;

-    sizeHints.width = sizeHints.max_width = xnestWidth;

-    sizeHints.height = sizeHints.max_height = xnestHeight;

-    if (xnestUserGeometry & XValue || xnestUserGeometry & YValue)

-      sizeHints.flags |= USPosition;

-    if (xnestUserGeometry & WidthValue || xnestUserGeometry & HeightValue)

-      sizeHints.flags |= USSize;

-    XSetStandardProperties(xnestDisplay, 

-			   xnestDefaultWindows[pScreen->myNum], 

-			   xnestWindowName, 

-			   xnestWindowName, 

-			   xnestIconBitmap,

-			   argv, argc, &sizeHints);

-    

-    XMapWindow(xnestDisplay, xnestDefaultWindows[pScreen->myNum]);

-

-    valuemask = CWBackPixmap | CWColormap;

-    attributes.background_pixmap = xnestScreenSaverPixmap;

-    attributes.colormap = 

-      DefaultColormap(xnestDisplay, DefaultScreen(xnestDisplay));

-    xnestScreenSaverWindows[pScreen->myNum] =

-      XCreateWindow(xnestDisplay, 

-		    xnestDefaultWindows[pScreen->myNum],

-		    0, 0, xnestWidth, xnestHeight, 0,

-		    DefaultDepth(xnestDisplay, DefaultScreen(xnestDisplay)),

-		    InputOutput, 

-		    DefaultVisual(xnestDisplay, DefaultScreen(xnestDisplay)),

-		    valuemask, &attributes);

-  }

-  

-  if (!xnestCreateDefaultColormap(pScreen)) return False;

-  

-  return True;

-}

-

-Bool

-xnestCloseScreen(int index, ScreenPtr pScreen)

-{

-  int i;

-  

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

-    free(pScreen->allowedDepths[i].vids);

-  free(pScreen->allowedDepths);

-  free(pScreen->visuals);

-  free(pScreen->devPrivate);

-

-  /*

-    If xnestDoFullGeneration all x resources will be destroyed upon closing

-    the display connection.  There is no need to generate extra protocol.

-    */

-

-  return True;

-}

+/*
+
+Copyright 1993 by Davor Matic
+
+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.  Davor Matic makes no representations about
+the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+*/
+
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "scrnintstr.h"
+#include "dix.h"
+#include "mi.h"
+#include "mibstore.h"
+#include "micmap.h"
+#include "colormapst.h"
+#include "resource.h"
+
+#include "Xnest.h"
+
+#include "Display.h"
+#include "Screen.h"
+#include "XNGC.h"
+#include "GCOps.h"
+#include "Drawable.h"
+#include "XNFont.h"
+#include "Color.h"
+#include "XNCursor.h"
+#include "Visual.h"
+#include "Events.h"
+#include "Init.h"
+#include "mipointer.h"
+#include "Args.h"
+#include "mipointrst.h"
+
+Window xnestDefaultWindows[MAXSCREENS];
+Window xnestScreenSaverWindows[MAXSCREENS];
+DevPrivateKeyRec xnestCursorScreenKeyRec;
+
+ScreenPtr
+xnestScreen(Window window)
+{
+    int i;
+
+    for (i = 0; i < xnestNumScreens; i++)
+        if (xnestDefaultWindows[i] == window)
+            return screenInfo.screens[i];
+
+    return NULL;
+}
+
+static int
+offset(unsigned long mask)
+{
+    int count;
+
+    for (count = 0; !(mask & 1) && count < 32; count++)
+        mask >>= 1;
+
+    return count;
+}
+
+static Bool
+xnestSaveScreen(ScreenPtr pScreen, int what)
+{
+    if (xnestSoftwareScreenSaver)
+        return False;
+    else {
+        switch (what) {
+        case SCREEN_SAVER_ON:
+            XMapRaised(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]);
+            xnestSetScreenSaverColormapWindow(pScreen);
+            break;
+
+        case SCREEN_SAVER_OFF:
+            XUnmapWindow(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]);
+            xnestSetInstalledColormapWindows(pScreen);
+            break;
+
+        case SCREEN_SAVER_FORCER:
+            lastEventTime = GetTimeInMillis();
+            XUnmapWindow(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]);
+            xnestSetInstalledColormapWindows(pScreen);
+            break;
+
+        case SCREEN_SAVER_CYCLE:
+            XUnmapWindow(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]);
+            xnestSetInstalledColormapWindows(pScreen);
+            break;
+        }
+        return True;
+    }
+}
+
+static Bool
+xnestCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
+{
+    return FALSE;
+}
+
+static void
+xnestCrossScreen(ScreenPtr pScreen, Bool entering)
+{
+}
+
+static miPointerScreenFuncRec xnestPointerCursorFuncs = {
+    xnestCursorOffScreen,
+    xnestCrossScreen,
+    miPointerWarpCursor
+};
+
+static miPointerSpriteFuncRec xnestPointerSpriteFuncs = {
+    xnestRealizeCursor,
+    xnestUnrealizeCursor,
+    xnestSetCursor,
+    xnestMoveCursor,
+    xnestDeviceCursorInitialize,
+    xnestDeviceCursorCleanup
+};
+
+Bool
+xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
+{
+    VisualPtr visuals;
+    DepthPtr depths;
+    int numVisuals, numDepths;
+    int i, j, depthIndex;
+    unsigned long valuemask;
+    XSetWindowAttributes attributes;
+    XWindowAttributes gattributes;
+    XSizeHints sizeHints;
+    VisualID defaultVisual;
+    int rootDepth;
+    miPointerScreenPtr PointPriv;
+
+    if (!dixRegisterPrivateKey
+        (&xnestWindowPrivateKeyRec, PRIVATE_WINDOW, sizeof(xnestPrivWin)))
+        return FALSE;
+    if (!dixRegisterPrivateKey
+        (&xnestGCPrivateKeyRec, PRIVATE_GC, sizeof(xnestPrivGC)))
+        return FALSE;
+    if (!dixRegisterPrivateKey
+        (&xnestPixmapPrivateKeyRec, PRIVATE_PIXMAP, sizeof(xnestPrivPixmap)))
+        return FALSE;
+    if (!dixRegisterPrivateKey
+        (&xnestColormapPrivateKeyRec, PRIVATE_COLORMAP,
+         sizeof(xnestPrivColormap)))
+        return FALSE;
+    if (!dixRegisterPrivateKey(&xnestCursorScreenKeyRec, PRIVATE_SCREEN, 0))
+        return FALSE;
+
+    visuals = (VisualPtr) malloc(xnestNumVisuals * sizeof(VisualRec));
+    numVisuals = 0;
+
+    depths = (DepthPtr) malloc(MAXDEPTH * sizeof(DepthRec));
+    depths[0].depth = 1;
+    depths[0].numVids = 0;
+    depths[0].vids = (VisualID *) malloc(MAXVISUALSPERDEPTH * sizeof(VisualID));
+    numDepths = 1;
+
+    for (i = 0; i < xnestNumVisuals; i++) {
+        visuals[numVisuals].class = xnestVisuals[i].class;
+        visuals[numVisuals].bitsPerRGBValue = xnestVisuals[i].bits_per_rgb;
+        visuals[numVisuals].ColormapEntries = xnestVisuals[i].colormap_size;
+        visuals[numVisuals].nplanes = xnestVisuals[i].depth;
+        visuals[numVisuals].redMask = xnestVisuals[i].red_mask;
+        visuals[numVisuals].greenMask = xnestVisuals[i].green_mask;
+        visuals[numVisuals].blueMask = xnestVisuals[i].blue_mask;
+        visuals[numVisuals].offsetRed = offset(xnestVisuals[i].red_mask);
+        visuals[numVisuals].offsetGreen = offset(xnestVisuals[i].green_mask);
+        visuals[numVisuals].offsetBlue = offset(xnestVisuals[i].blue_mask);
+
+        /* Check for and remove duplicates. */
+        for (j = 0; j < numVisuals; j++) {
+            if (visuals[numVisuals].class == visuals[j].class &&
+                visuals[numVisuals].bitsPerRGBValue ==
+                visuals[j].bitsPerRGBValue &&
+                visuals[numVisuals].ColormapEntries ==
+                visuals[j].ColormapEntries &&
+                visuals[numVisuals].nplanes == visuals[j].nplanes &&
+                visuals[numVisuals].redMask == visuals[j].redMask &&
+                visuals[numVisuals].greenMask == visuals[j].greenMask &&
+                visuals[numVisuals].blueMask == visuals[j].blueMask &&
+                visuals[numVisuals].offsetRed == visuals[j].offsetRed &&
+                visuals[numVisuals].offsetGreen == visuals[j].offsetGreen &&
+                visuals[numVisuals].offsetBlue == visuals[j].offsetBlue)
+                break;
+        }
+        if (j < numVisuals)
+            break;
+
+        visuals[numVisuals].vid = FakeClientID(0);
+
+        depthIndex = UNDEFINED;
+        for (j = 0; j < numDepths; j++)
+            if (depths[j].depth == xnestVisuals[i].depth) {
+                depthIndex = j;
+                break;
+            }
+
+        if (depthIndex == UNDEFINED) {
+            depthIndex = numDepths;
+            depths[depthIndex].depth = xnestVisuals[i].depth;
+            depths[depthIndex].numVids = 0;
+            depths[depthIndex].vids =
+                (VisualID *) malloc(MAXVISUALSPERDEPTH * sizeof(VisualID));
+            numDepths++;
+        }
+        if (depths[depthIndex].numVids >= MAXVISUALSPERDEPTH) {
+            FatalError("Visual table overflow");
+        }
+        depths[depthIndex].vids[depths[depthIndex].numVids] =
+            visuals[numVisuals].vid;
+        depths[depthIndex].numVids++;
+
+        numVisuals++;
+    }
+    visuals = (VisualPtr) realloc(visuals, numVisuals * sizeof(VisualRec));
+
+    defaultVisual = visuals[xnestDefaultVisualIndex].vid;
+    rootDepth = visuals[xnestDefaultVisualIndex].nplanes;
+
+    if (xnestParentWindow != 0) {
+        XGetWindowAttributes(xnestDisplay, xnestParentWindow, &gattributes);
+        xnestWidth = gattributes.width;
+        xnestHeight = gattributes.height;
+    }
+
+    /* myNum */
+    /* id */
+    miScreenInit(pScreen, NULL, xnestWidth, xnestHeight, 1, 1, xnestWidth, rootDepth, numDepths, depths, defaultVisual, /* root visual */
+                 numVisuals, visuals);
+
+    pScreen->defColormap = (Colormap) FakeClientID(0);
+    pScreen->minInstalledCmaps = MINCMAPS;
+    pScreen->maxInstalledCmaps = MAXCMAPS;
+    pScreen->backingStoreSupport = NotUseful;
+    pScreen->saveUnderSupport = NotUseful;
+    pScreen->whitePixel = xnestWhitePixel;
+    pScreen->blackPixel = xnestBlackPixel;
+    /* GCperDepth */
+    /* PixmapPerDepth */
+    pScreen->devPrivate = NULL;
+    /* WindowPrivateLen */
+    /* WindowPrivateSizes */
+    /* totalWindowSize */
+    /* GCPrivateLen */
+    /* GCPrivateSizes */
+    /* totalGCSize */
+
+    /* Random screen procedures */
+
+    pScreen->QueryBestSize = xnestQueryBestSize;
+    pScreen->SaveScreen = xnestSaveScreen;
+    pScreen->GetImage = xnestGetImage;
+    pScreen->GetSpans = xnestGetSpans;
+    pScreen->SourceValidate = NULL;
+
+    /* Window Procedures */
+
+    pScreen->CreateWindow = xnestCreateWindow;
+    pScreen->DestroyWindow = xnestDestroyWindow;
+    pScreen->PositionWindow = xnestPositionWindow;
+    pScreen->ChangeWindowAttributes = xnestChangeWindowAttributes;
+    pScreen->RealizeWindow = xnestRealizeWindow;
+    pScreen->UnrealizeWindow = xnestUnrealizeWindow;
+    pScreen->PostValidateTree = NULL;
+    pScreen->WindowExposures = xnestWindowExposures;
+    pScreen->CopyWindow = xnestCopyWindow;
+    pScreen->ClipNotify = xnestClipNotify;
+
+    /* Pixmap procedures */
+
+    pScreen->CreatePixmap = xnestCreatePixmap;
+    pScreen->DestroyPixmap = xnestDestroyPixmap;
+
+    /* Font procedures */
+
+    pScreen->RealizeFont = xnestRealizeFont;
+    pScreen->UnrealizeFont = xnestUnrealizeFont;
+
+    /* GC procedures */
+
+    pScreen->CreateGC = xnestCreateGC;
+
+    /* Colormap procedures */
+
+    pScreen->CreateColormap = xnestCreateColormap;
+    pScreen->DestroyColormap = xnestDestroyColormap;
+    pScreen->InstallColormap = xnestInstallColormap;
+    pScreen->UninstallColormap = xnestUninstallColormap;
+    pScreen->ListInstalledColormaps = xnestListInstalledColormaps;
+    pScreen->StoreColors = xnestStoreColors;
+    pScreen->ResolveColor = xnestResolveColor;
+
+    pScreen->BitmapToRegion = xnestPixmapToRegion;
+
+    /* OS layer procedures */
+
+    pScreen->BlockHandler = (ScreenBlockHandlerProcPtr) NoopDDA;
+    pScreen->WakeupHandler = (ScreenWakeupHandlerProcPtr) NoopDDA;
+    pScreen->blockData = NULL;
+    pScreen->wakeupData = NULL;
+
+    miDCInitialize(pScreen, &xnestPointerCursorFuncs);  /* init SW rendering */
+    PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
+    xnestCursorFuncs.spriteFuncs = PointPriv->spriteFuncs;
+    dixSetPrivate(&pScreen->devPrivates, xnestCursorScreenKey,
+                  &xnestCursorFuncs);
+    PointPriv->spriteFuncs = &xnestPointerSpriteFuncs;
+
+    pScreen->mmWidth = xnestWidth * DisplayWidthMM(xnestDisplay,
+                                                   DefaultScreen(xnestDisplay))
+        / DisplayWidth(xnestDisplay, DefaultScreen(xnestDisplay));
+    pScreen->mmHeight =
+        xnestHeight * DisplayHeightMM(xnestDisplay,
+                                      DefaultScreen(xnestDisplay)) /
+        DisplayHeight(xnestDisplay, DefaultScreen(xnestDisplay));
+
+    /* overwrite miCloseScreen with our own */
+    pScreen->CloseScreen = xnestCloseScreen;
+
+    if (!miScreenDevPrivateInit(pScreen, xnestWidth, NULL))
+        return FALSE;
+
+    /* overwrite miSetShape with our own */
+    pScreen->SetShape = xnestSetShape;
+
+    /* devPrivates */
+
+#define POSITION_OFFSET (pScreen->myNum * (xnestWidth + xnestHeight) / 32)
+
+    if (xnestDoFullGeneration) {
+
+        valuemask = CWBackPixel | CWEventMask | CWColormap;
+        attributes.background_pixel = xnestWhitePixel;
+        attributes.event_mask = xnestEventMask;
+        attributes.colormap =
+            xnestDefaultVisualColormap(xnestDefaultVisual(pScreen));
+
+        if (xnestParentWindow != 0) {
+            xnestDefaultWindows[pScreen->myNum] = xnestParentWindow;
+            XSelectInput(xnestDisplay, xnestDefaultWindows[pScreen->myNum],
+                         xnestEventMask);
+        }
+        else
+            xnestDefaultWindows[pScreen->myNum] =
+                XCreateWindow(xnestDisplay,
+                              DefaultRootWindow(xnestDisplay),
+                              xnestX + POSITION_OFFSET,
+                              xnestY + POSITION_OFFSET,
+                              xnestWidth, xnestHeight,
+                              xnestBorderWidth,
+                              pScreen->rootDepth,
+                              InputOutput,
+                              xnestDefaultVisual(pScreen),
+                              valuemask, &attributes);
+
+        if (!xnestWindowName)
+            xnestWindowName = argv[0];
+
+        sizeHints.flags = PPosition | PSize | PMaxSize;
+        sizeHints.x = xnestX + POSITION_OFFSET;
+        sizeHints.y = xnestY + POSITION_OFFSET;
+        sizeHints.width = sizeHints.max_width = xnestWidth;
+        sizeHints.height = sizeHints.max_height = xnestHeight;
+        if (xnestUserGeometry & XValue || xnestUserGeometry & YValue)
+            sizeHints.flags |= USPosition;
+        if (xnestUserGeometry & WidthValue || xnestUserGeometry & HeightValue)
+            sizeHints.flags |= USSize;
+        XSetStandardProperties(xnestDisplay,
+                               xnestDefaultWindows[pScreen->myNum],
+                               xnestWindowName,
+                               xnestWindowName,
+                               xnestIconBitmap, argv, argc, &sizeHints);
+
+        XMapWindow(xnestDisplay, xnestDefaultWindows[pScreen->myNum]);
+
+        valuemask = CWBackPixmap | CWColormap;
+        attributes.background_pixmap = xnestScreenSaverPixmap;
+        attributes.colormap =
+            DefaultColormap(xnestDisplay, DefaultScreen(xnestDisplay));
+        xnestScreenSaverWindows[pScreen->myNum] =
+            XCreateWindow(xnestDisplay,
+                          xnestDefaultWindows[pScreen->myNum],
+                          0, 0, xnestWidth, xnestHeight, 0,
+                          DefaultDepth(xnestDisplay,
+                                       DefaultScreen(xnestDisplay)),
+                          InputOutput, DefaultVisual(xnestDisplay,
+                                                     DefaultScreen
+                                                     (xnestDisplay)), valuemask,
+                          &attributes);
+    }
+
+    if (!xnestCreateDefaultColormap(pScreen))
+        return False;
+
+    return True;
+}
+
+Bool
+xnestCloseScreen(int index, ScreenPtr pScreen)
+{
+    int i;
+
+    for (i = 0; i < pScreen->numDepths; i++)
+        free(pScreen->allowedDepths[i].vids);
+    free(pScreen->allowedDepths);
+    free(pScreen->visuals);
+    free(pScreen->devPrivate);
+
+    /*
+       If xnestDoFullGeneration all x resources will be destroyed upon closing
+       the display connection.  There is no need to generate extra protocol.
+     */
+
+    return True;
+}
diff --git a/xorg-server/hw/xnest/Window.c b/xorg-server/hw/xnest/Window.c
index 7ef3d8b96..e2b21b58e 100644
--- a/xorg-server/hw/xnest/Window.c
+++ b/xorg-server/hw/xnest/Window.c
@@ -1,519 +1,517 @@
-/*

-

-Copyright 1993 by Davor Matic

-

-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.  Davor Matic makes no representations about

-the suitability of this software for any purpose.  It is provided "as

-is" without express or implied warranty.

-

-*/

-

-#ifdef HAVE_XNEST_CONFIG_H

-#include <xnest-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "gcstruct.h"

-#include "window.h"

-#include "windowstr.h"

-#include "pixmapstr.h"

-#include "colormapst.h"

-#include "scrnintstr.h"

-#include "region.h"

-

-#include "mi.h"

-

-#include "Xnest.h"

-

-#include "Display.h"

-#include "Screen.h"

-#include "XNGC.h"

-#include "Drawable.h"

-#include "Color.h"

-#include "Visual.h"

-#include "Events.h"

-#include "Args.h"

-

-DevPrivateKeyRec xnestWindowPrivateKeyRec;

-

-static int

-xnestFindWindowMatch(WindowPtr pWin, pointer ptr)

-{

-  xnestWindowMatch *wm = (xnestWindowMatch *)ptr;

-  if (wm->window == xnestWindow(pWin)) {

-    wm->pWin = pWin;

-    return WT_STOPWALKING;

-  }

-  else

-    return WT_WALKCHILDREN;

-}

-

-WindowPtr

-xnestWindowPtr(Window window)

-{

-  xnestWindowMatch wm;

-  int i;

-

-  wm.pWin = NullWindow;

-  wm.window = window;

-

-  for (i = 0; i < xnestNumScreens; i++) {

-    WalkTree(screenInfo.screens[i], xnestFindWindowMatch, (pointer) &wm);

-    if (wm.pWin) break;

-  }

-  

-  return wm.pWin;

-}

-    

-Bool

-xnestCreateWindow(WindowPtr pWin)

-{

-  unsigned long mask;

-  XSetWindowAttributes attributes;

-  Visual *visual;

-  ColormapPtr pCmap;

-

-  if (pWin->drawable.class == InputOnly) {

-    mask = 0L;

-    visual = CopyFromParent;

-  }

-  else {

-    mask = CWEventMask | CWBackingStore;

-    attributes.event_mask = ExposureMask;

-    attributes.backing_store = NotUseful;

-    

-    if (pWin->parent) {

-      if (pWin->optional && pWin->optional->visual != wVisual(pWin->parent)) {

-	visual = xnestVisualFromID(pWin->drawable.pScreen, wVisual(pWin));

-	mask |= CWColormap;

-	if (pWin->optional->colormap) {

-	  dixLookupResourceByType((pointer *)&pCmap, wColormap(pWin),

-				  RT_COLORMAP, serverClient, DixUseAccess);

-	  attributes.colormap = xnestColormap(pCmap);

-	}

-	else

-	  attributes.colormap = xnestDefaultVisualColormap(visual);

-      }

-      else 

-	visual = CopyFromParent;

-    }

-    else { /* root windows have their own colormaps at creation time */

-      visual = xnestVisualFromID(pWin->drawable.pScreen, wVisual(pWin));      

-      dixLookupResourceByType((pointer *)&pCmap, wColormap(pWin),

-			      RT_COLORMAP, serverClient, DixUseAccess);

-      mask |= CWColormap;

-      attributes.colormap = xnestColormap(pCmap);

-    }

-  }

-  

-  xnestWindowPriv(pWin)->window = XCreateWindow(xnestDisplay,

-						xnestWindowParent(pWin),

-						pWin->origin.x - 

-						wBorderWidth(pWin),

-						pWin->origin.y - 

-						wBorderWidth(pWin),

-						pWin->drawable.width,

-						pWin->drawable.height,

-						pWin->borderWidth,

-						pWin->drawable.depth, 

-						pWin->drawable.class,

-						visual,

-						mask, &attributes);

-  xnestWindowPriv(pWin)->parent = xnestWindowParent(pWin);

-  xnestWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);

-  xnestWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);

-  xnestWindowPriv(pWin)->width = pWin->drawable.width;

-  xnestWindowPriv(pWin)->height = pWin->drawable.height;

-  xnestWindowPriv(pWin)->border_width = pWin->borderWidth;

-  xnestWindowPriv(pWin)->sibling_above = None;

-  if (pWin->nextSib)

-    xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindow(pWin);

-  xnestWindowPriv(pWin)->bounding_shape = 

-    RegionCreate(NULL, 1);

-  xnestWindowPriv(pWin)->clip_shape = 

-    RegionCreate(NULL, 1);

-

-  if (!pWin->parent) /* only the root window will have the right colormap */

-    xnestSetInstalledColormapWindows(pWin->drawable.pScreen);

-  

-  return True;

-}

-

-Bool

-xnestDestroyWindow(WindowPtr pWin)

-{

-  if (pWin->nextSib)

-    xnestWindowPriv(pWin->nextSib)->sibling_above = 

-      xnestWindowPriv(pWin)->sibling_above;

-  RegionDestroy(xnestWindowPriv(pWin)->bounding_shape);

-  RegionDestroy(xnestWindowPriv(pWin)->clip_shape);

-  XDestroyWindow(xnestDisplay, xnestWindow(pWin));

-  xnestWindowPriv(pWin)->window = None;

-

-  if (pWin->optional && pWin->optional->colormap && pWin->parent)

-    xnestSetInstalledColormapWindows(pWin->drawable.pScreen);

-

-  return True;

-}

-

-Bool

-xnestPositionWindow(WindowPtr pWin, int x, int y)

-{

-  xnestConfigureWindow(pWin, 

-		       CWParent |

-		       CWX | CWY | 

-		       CWWidth | CWHeight | 

-		       CWBorderWidth);

-  

-  return True;

-}

-

-void

-xnestConfigureWindow(WindowPtr pWin, unsigned int mask)

-{

-  unsigned int valuemask;

-  XWindowChanges values;

-

-  if (mask & CWParent &&

-      xnestWindowPriv(pWin)->parent != xnestWindowParent(pWin)) {

-    XReparentWindow(xnestDisplay, xnestWindow(pWin), 

-		    xnestWindowParent(pWin), 

-		    pWin->origin.x - wBorderWidth(pWin),

-		    pWin->origin.y - wBorderWidth(pWin));

-    xnestWindowPriv(pWin)->parent = xnestWindowParent(pWin);

-    xnestWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);

-    xnestWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);

-    xnestWindowPriv(pWin)->sibling_above = None;

-    if (pWin->nextSib)

-      xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindow(pWin);

-  }

-  

-  valuemask = 0;

-  

-  if (mask & CWX &&

-      xnestWindowPriv(pWin)->x != pWin->origin.x - wBorderWidth(pWin)) {

-    valuemask |= CWX;

-    values.x =

-      xnestWindowPriv(pWin)->x = 

-	pWin->origin.x - wBorderWidth(pWin);

-  }

-

-  if (mask & CWY &&

-      xnestWindowPriv(pWin)->y != pWin->origin.y - wBorderWidth(pWin)) {

-    valuemask |= CWY;

-    values.y =

-      xnestWindowPriv(pWin)->y = 

-	pWin->origin.y - wBorderWidth(pWin);

-  }

-

-  if (mask & CWWidth &&

-      xnestWindowPriv(pWin)->width != pWin->drawable.width) {

-    valuemask |= CWWidth;

-    values.width = 

-      xnestWindowPriv(pWin)->width = 

-	pWin->drawable.width;

-  }

-  

-  if (mask & CWHeight &&

-      xnestWindowPriv(pWin)->height != pWin->drawable.height) {

-    valuemask |= CWHeight;

-    values.height = 

-      xnestWindowPriv(pWin)->height = 

-	pWin->drawable.height;

-  }

-  

-  if (mask & CWBorderWidth &&

-      xnestWindowPriv(pWin)->border_width != pWin->borderWidth) {

-    valuemask |= CWBorderWidth;

-    values.border_width = 

-      xnestWindowPriv(pWin)->border_width = 

-	pWin->borderWidth;

-  }

- 

-  if (valuemask)

-    XConfigureWindow(xnestDisplay, xnestWindow(pWin), valuemask, &values);  

-  

-  if (mask & CWStackingOrder &&

-      xnestWindowPriv(pWin)->sibling_above != xnestWindowSiblingAbove(pWin)) {

-    WindowPtr pSib;

-    

-    /* find the top sibling */

-    for (pSib = pWin; pSib->prevSib != NullWindow; pSib = pSib->prevSib);

-    

-    /* the top sibling */

-    valuemask = CWStackMode;

-    values.stack_mode = Above;

-    XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask, &values); 

-    xnestWindowPriv(pSib)->sibling_above = None;

-

-    /* the rest of siblings */

-    for (pSib = pSib->nextSib; pSib != NullWindow; pSib = pSib->nextSib) {

-      valuemask = CWSibling | CWStackMode;

-      values.sibling = xnestWindowSiblingAbove(pSib);

-      values.stack_mode = Below;

-      XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask, &values);

-      xnestWindowPriv(pSib)->sibling_above = xnestWindowSiblingAbove(pSib);

-    }

-  }

-}

-

-Bool

-xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask)

-{

-  XSetWindowAttributes attributes;

-  

-  if (mask & CWBackPixmap)

-    switch (pWin->backgroundState) {

-    case None:

-      attributes.background_pixmap = None;

-      break;

-      

-    case ParentRelative:

-      attributes.background_pixmap = ParentRelative;

-      break;

-      

-    case BackgroundPixmap:

-      attributes.background_pixmap = xnestPixmap(pWin->background.pixmap);

-      break;

-

-    case BackgroundPixel:

-      mask &= ~CWBackPixmap;  

-      break;

-    }

-

-  if (mask & CWBackPixel) {

-    if (pWin->backgroundState == BackgroundPixel)

-      attributes.background_pixel = xnestPixel(pWin->background.pixel);

-    else

-      mask &= ~CWBackPixel;

-  }

-  

-  if (mask & CWBorderPixmap) {

-    if (pWin->borderIsPixel)

-      mask &= ~CWBorderPixmap;

-    else

-      attributes.border_pixmap = xnestPixmap(pWin->border.pixmap);

-  }

-  

-  if (mask & CWBorderPixel) {

-    if (pWin->borderIsPixel)

-      attributes.border_pixel = xnestPixel(pWin->border.pixel);

-    else

-      mask &= ~CWBorderPixel;

-  }

-  

-  if (mask & CWBitGravity) 

-    attributes.bit_gravity = pWin->bitGravity;

-  

-  if (mask & CWWinGravity) /* dix does this for us */

-    mask &= ~CWWinGravity;

-

-  if (mask & CWBackingStore) /* this is really not useful */

-    mask &= ~CWBackingStore;

-

-  if (mask & CWBackingPlanes) /* this is really not useful */

-    mask &= ~CWBackingPlanes;

-

-  if (mask & CWBackingPixel) /* this is really not useful */ 

-    mask &= ~CWBackingPixel;

-

-  if (mask & CWOverrideRedirect)

-    attributes.override_redirect = pWin->overrideRedirect;

-

-  if (mask & CWSaveUnder) /* this is really not useful */

-    mask &= ~CWSaveUnder;

-

-  if (mask & CWEventMask) /* events are handled elsewhere */

-    mask &= ~CWEventMask;

-

-  if (mask & CWDontPropagate) /* events are handled elsewhere */

-    mask &= ~CWDontPropagate; 

-

-  if (mask & CWColormap) {

-    ColormapPtr pCmap;

-    

-    dixLookupResourceByType((pointer *)&pCmap, wColormap(pWin), RT_COLORMAP,

-			    serverClient, DixUseAccess);

-

-    attributes.colormap = xnestColormap(pCmap);

-

-    xnestSetInstalledColormapWindows(pWin->drawable.pScreen);

-  }

-

-  if (mask & CWCursor) /* this is handeled in cursor code */

-    mask &= ~CWCursor;

-

-  if (mask)

-    XChangeWindowAttributes(xnestDisplay, xnestWindow(pWin),

-			    mask, &attributes);

-  

-  return True;

-}	  

-

-Bool

-xnestRealizeWindow(WindowPtr pWin)

-{

-  xnestConfigureWindow(pWin, CWStackingOrder);

-  xnestShapeWindow(pWin);

-  XMapWindow(xnestDisplay, xnestWindow(pWin));

-

-  return True;

-}

-

-Bool

-xnestUnrealizeWindow(WindowPtr pWin)

-{

-  XUnmapWindow(xnestDisplay, xnestWindow(pWin));

-

-  return True;

-}

-

-void

-xnestCopyWindow(WindowPtr pWin, xPoint oldOrigin, RegionPtr oldRegion)

-{

-}

-

-void

-xnestClipNotify(WindowPtr pWin, int dx, int dy)

-{

-  xnestConfigureWindow(pWin, CWStackingOrder); 

-  xnestShapeWindow(pWin);

-}

-

-static Bool

-xnestWindowExposurePredicate(Display *display, XEvent *event, XPointer ptr)

-{

-  return (event->type == Expose && event->xexpose.window == *(Window *)ptr);

-}

-

-void

-xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn, RegionPtr other_exposed)

-{

-  XEvent event;

-  Window window;

-  BoxRec Box;

-  

-  XSync(xnestDisplay, False);

-  

-  window = xnestWindow(pWin);

-  

-  while (XCheckIfEvent(xnestDisplay, &event, 

-		       xnestWindowExposurePredicate, (char *)&window)) {

-    

-    Box.x1 = pWin->drawable.x + wBorderWidth(pWin) + event.xexpose.x;

-    Box.y1 = pWin->drawable.y + wBorderWidth(pWin) + event.xexpose.y;

-    Box.x2 = Box.x1 + event.xexpose.width;

-    Box.y2 = Box.y1 + event.xexpose.height;

-	

-    event.xexpose.type = ProcessedExpose;

-	

-    if (RegionContainsRect(pRgn, &Box) != rgnIN)

-      XPutBackEvent(xnestDisplay, &event);

-  }

-  

-  miWindowExposures(pWin, pRgn, other_exposed);

-}

-

-void

-xnestSetShape(WindowPtr pWin, int kind)

-{

-  xnestShapeWindow(pWin);

-  miSetShape(pWin, kind);

-}

-

-static Bool

-xnestRegionEqual(RegionPtr pReg1, RegionPtr pReg2)

-{

-  BoxPtr pBox1, pBox2;

-  unsigned int n1, n2;

-

-  if (pReg1 == pReg2) return True;

-

-  if (pReg1 == NullRegion || pReg2 == NullRegion) return False;

-

-  pBox1 = RegionRects(pReg1);

-  n1 = RegionNumRects(pReg1);

-

-  pBox2 = RegionRects(pReg2);

-  n2 = RegionNumRects(pReg2);

-

-  if (n1 != n2) return False;

-

-  if (pBox1 == pBox2) return True;

-

-  if (memcmp(pBox1, pBox2, n1 * sizeof(BoxRec))) return False;

-

-  return True;

-}

-

-void

-xnestShapeWindow(WindowPtr pWin)

-{

-  Region reg;

-  BoxPtr pBox;

-  XRectangle rect;

-  int i;

-

-  if (!xnestRegionEqual(xnestWindowPriv(pWin)->bounding_shape,

-			wBoundingShape(pWin))) {

-    

-    if (wBoundingShape(pWin)) {

-      RegionCopy(xnestWindowPriv(pWin)->bounding_shape, wBoundingShape(pWin));

-      

-      reg = XCreateRegion();

-      pBox = RegionRects(xnestWindowPriv(pWin)->bounding_shape);

-      for (i = 0; 

-	   i < RegionNumRects(xnestWindowPriv(pWin)->bounding_shape);

-	   i++) {

-        rect.x = pBox[i].x1;

-        rect.y = pBox[i].y1;

-        rect.width = pBox[i].x2 - pBox[i].x1;

-        rect.height = pBox[i].y2 - pBox[i].y1;

-        XUnionRectWithRegion(&rect, reg, reg);

-      }

-      XShapeCombineRegion(xnestDisplay, xnestWindow(pWin),

-			  ShapeBounding, 0, 0, reg, ShapeSet);

-      XDestroyRegion(reg);

-    }

-    else {

-      RegionEmpty(xnestWindowPriv(pWin)->bounding_shape);

-      

-      XShapeCombineMask(xnestDisplay, xnestWindow(pWin),

-			ShapeBounding, 0, 0, None, ShapeSet);

-    }

-  }

-  

-  if (!xnestRegionEqual(xnestWindowPriv(pWin)->clip_shape,

-			wClipShape(pWin))) {

-    

-    if (wClipShape(pWin)) {

-      RegionCopy(xnestWindowPriv(pWin)->clip_shape, wClipShape(pWin));

-      

-      reg = XCreateRegion();

-      pBox = RegionRects(xnestWindowPriv(pWin)->clip_shape);

-      for (i = 0; 

-	   i < RegionNumRects(xnestWindowPriv(pWin)->clip_shape);

-	   i++) {

-        rect.x = pBox[i].x1;

-        rect.y = pBox[i].y1;

-        rect.width = pBox[i].x2 - pBox[i].x1;

-        rect.height = pBox[i].y2 - pBox[i].y1;

-        XUnionRectWithRegion(&rect, reg, reg);

-      }

-      XShapeCombineRegion(xnestDisplay, xnestWindow(pWin),

-			  ShapeClip, 0, 0, reg, ShapeSet);

-      XDestroyRegion(reg);

-    }

-    else {

-      RegionEmpty(xnestWindowPriv(pWin)->clip_shape);

-      

-      XShapeCombineMask(xnestDisplay, xnestWindow(pWin),

-			ShapeClip, 0, 0, None, ShapeSet);

-    }

-  }

-}

+/*
+
+Copyright 1993 by Davor Matic
+
+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.  Davor Matic makes no representations about
+the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+*/
+
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "gcstruct.h"
+#include "window.h"
+#include "windowstr.h"
+#include "pixmapstr.h"
+#include "colormapst.h"
+#include "scrnintstr.h"
+#include "region.h"
+
+#include "mi.h"
+
+#include "Xnest.h"
+
+#include "Display.h"
+#include "Screen.h"
+#include "XNGC.h"
+#include "Drawable.h"
+#include "Color.h"
+#include "Visual.h"
+#include "Events.h"
+#include "Args.h"
+
+DevPrivateKeyRec xnestWindowPrivateKeyRec;
+
+static int
+xnestFindWindowMatch(WindowPtr pWin, pointer ptr)
+{
+    xnestWindowMatch *wm = (xnestWindowMatch *) ptr;
+
+    if (wm->window == xnestWindow(pWin)) {
+        wm->pWin = pWin;
+        return WT_STOPWALKING;
+    }
+    else
+        return WT_WALKCHILDREN;
+}
+
+WindowPtr
+xnestWindowPtr(Window window)
+{
+    xnestWindowMatch wm;
+    int i;
+
+    wm.pWin = NullWindow;
+    wm.window = window;
+
+    for (i = 0; i < xnestNumScreens; i++) {
+        WalkTree(screenInfo.screens[i], xnestFindWindowMatch, (pointer) &wm);
+        if (wm.pWin)
+            break;
+    }
+
+    return wm.pWin;
+}
+
+Bool
+xnestCreateWindow(WindowPtr pWin)
+{
+    unsigned long mask;
+    XSetWindowAttributes attributes;
+    Visual *visual;
+    ColormapPtr pCmap;
+
+    if (pWin->drawable.class == InputOnly) {
+        mask = 0L;
+        visual = CopyFromParent;
+    }
+    else {
+        mask = CWEventMask | CWBackingStore;
+        attributes.event_mask = ExposureMask;
+        attributes.backing_store = NotUseful;
+
+        if (pWin->parent) {
+            if (pWin->optional &&
+                pWin->optional->visual != wVisual(pWin->parent)) {
+                visual =
+                    xnestVisualFromID(pWin->drawable.pScreen, wVisual(pWin));
+                mask |= CWColormap;
+                if (pWin->optional->colormap) {
+                    dixLookupResourceByType((pointer *) &pCmap, wColormap(pWin),
+                                            RT_COLORMAP, serverClient,
+                                            DixUseAccess);
+                    attributes.colormap = xnestColormap(pCmap);
+                }
+                else
+                    attributes.colormap = xnestDefaultVisualColormap(visual);
+            }
+            else
+                visual = CopyFromParent;
+        }
+        else {                  /* root windows have their own colormaps at creation time */
+            visual = xnestVisualFromID(pWin->drawable.pScreen, wVisual(pWin));
+            dixLookupResourceByType((pointer *) &pCmap, wColormap(pWin),
+                                    RT_COLORMAP, serverClient, DixUseAccess);
+            mask |= CWColormap;
+            attributes.colormap = xnestColormap(pCmap);
+        }
+    }
+
+    xnestWindowPriv(pWin)->window = XCreateWindow(xnestDisplay,
+                                                  xnestWindowParent(pWin),
+                                                  pWin->origin.x -
+                                                  wBorderWidth(pWin),
+                                                  pWin->origin.y -
+                                                  wBorderWidth(pWin),
+                                                  pWin->drawable.width,
+                                                  pWin->drawable.height,
+                                                  pWin->borderWidth,
+                                                  pWin->drawable.depth,
+                                                  pWin->drawable.class,
+                                                  visual, mask, &attributes);
+    xnestWindowPriv(pWin)->parent = xnestWindowParent(pWin);
+    xnestWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);
+    xnestWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);
+    xnestWindowPriv(pWin)->width = pWin->drawable.width;
+    xnestWindowPriv(pWin)->height = pWin->drawable.height;
+    xnestWindowPriv(pWin)->border_width = pWin->borderWidth;
+    xnestWindowPriv(pWin)->sibling_above = None;
+    if (pWin->nextSib)
+        xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindow(pWin);
+    xnestWindowPriv(pWin)->bounding_shape = RegionCreate(NULL, 1);
+    xnestWindowPriv(pWin)->clip_shape = RegionCreate(NULL, 1);
+
+    if (!pWin->parent)          /* only the root window will have the right colormap */
+        xnestSetInstalledColormapWindows(pWin->drawable.pScreen);
+
+    return True;
+}
+
+Bool
+xnestDestroyWindow(WindowPtr pWin)
+{
+    if (pWin->nextSib)
+        xnestWindowPriv(pWin->nextSib)->sibling_above =
+            xnestWindowPriv(pWin)->sibling_above;
+    RegionDestroy(xnestWindowPriv(pWin)->bounding_shape);
+    RegionDestroy(xnestWindowPriv(pWin)->clip_shape);
+    XDestroyWindow(xnestDisplay, xnestWindow(pWin));
+    xnestWindowPriv(pWin)->window = None;
+
+    if (pWin->optional && pWin->optional->colormap && pWin->parent)
+        xnestSetInstalledColormapWindows(pWin->drawable.pScreen);
+
+    return True;
+}
+
+Bool
+xnestPositionWindow(WindowPtr pWin, int x, int y)
+{
+    xnestConfigureWindow(pWin,
+                         CWParent |
+                         CWX | CWY | CWWidth | CWHeight | CWBorderWidth);
+
+    return True;
+}
+
+void
+xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
+{
+    unsigned int valuemask;
+    XWindowChanges values;
+
+    if (mask & CWParent &&
+        xnestWindowPriv(pWin)->parent != xnestWindowParent(pWin)) {
+        XReparentWindow(xnestDisplay, xnestWindow(pWin),
+                        xnestWindowParent(pWin),
+                        pWin->origin.x - wBorderWidth(pWin),
+                        pWin->origin.y - wBorderWidth(pWin));
+        xnestWindowPriv(pWin)->parent = xnestWindowParent(pWin);
+        xnestWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);
+        xnestWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);
+        xnestWindowPriv(pWin)->sibling_above = None;
+        if (pWin->nextSib)
+            xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindow(pWin);
+    }
+
+    valuemask = 0;
+
+    if (mask & CWX &&
+        xnestWindowPriv(pWin)->x != pWin->origin.x - wBorderWidth(pWin)) {
+        valuemask |= CWX;
+        values.x =
+            xnestWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);
+    }
+
+    if (mask & CWY &&
+        xnestWindowPriv(pWin)->y != pWin->origin.y - wBorderWidth(pWin)) {
+        valuemask |= CWY;
+        values.y =
+            xnestWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);
+    }
+
+    if (mask & CWWidth && xnestWindowPriv(pWin)->width != pWin->drawable.width) {
+        valuemask |= CWWidth;
+        values.width = xnestWindowPriv(pWin)->width = pWin->drawable.width;
+    }
+
+    if (mask & CWHeight &&
+        xnestWindowPriv(pWin)->height != pWin->drawable.height) {
+        valuemask |= CWHeight;
+        values.height = xnestWindowPriv(pWin)->height = pWin->drawable.height;
+    }
+
+    if (mask & CWBorderWidth &&
+        xnestWindowPriv(pWin)->border_width != pWin->borderWidth) {
+        valuemask |= CWBorderWidth;
+        values.border_width =
+            xnestWindowPriv(pWin)->border_width = pWin->borderWidth;
+    }
+
+    if (valuemask)
+        XConfigureWindow(xnestDisplay, xnestWindow(pWin), valuemask, &values);
+
+    if (mask & CWStackingOrder &&
+        xnestWindowPriv(pWin)->sibling_above != xnestWindowSiblingAbove(pWin)) {
+        WindowPtr pSib;
+
+        /* find the top sibling */
+        for (pSib = pWin; pSib->prevSib != NullWindow; pSib = pSib->prevSib);
+
+        /* the top sibling */
+        valuemask = CWStackMode;
+        values.stack_mode = Above;
+        XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask, &values);
+        xnestWindowPriv(pSib)->sibling_above = None;
+
+        /* the rest of siblings */
+        for (pSib = pSib->nextSib; pSib != NullWindow; pSib = pSib->nextSib) {
+            valuemask = CWSibling | CWStackMode;
+            values.sibling = xnestWindowSiblingAbove(pSib);
+            values.stack_mode = Below;
+            XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask,
+                             &values);
+            xnestWindowPriv(pSib)->sibling_above =
+                xnestWindowSiblingAbove(pSib);
+        }
+    }
+}
+
+Bool
+xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
+{
+    XSetWindowAttributes attributes;
+
+    if (mask & CWBackPixmap)
+        switch (pWin->backgroundState) {
+        case None:
+            attributes.background_pixmap = None;
+            break;
+
+        case ParentRelative:
+            attributes.background_pixmap = ParentRelative;
+            break;
+
+        case BackgroundPixmap:
+            attributes.background_pixmap = xnestPixmap(pWin->background.pixmap);
+            break;
+
+        case BackgroundPixel:
+            mask &= ~CWBackPixmap;
+            break;
+        }
+
+    if (mask & CWBackPixel) {
+        if (pWin->backgroundState == BackgroundPixel)
+            attributes.background_pixel = xnestPixel(pWin->background.pixel);
+        else
+            mask &= ~CWBackPixel;
+    }
+
+    if (mask & CWBorderPixmap) {
+        if (pWin->borderIsPixel)
+            mask &= ~CWBorderPixmap;
+        else
+            attributes.border_pixmap = xnestPixmap(pWin->border.pixmap);
+    }
+
+    if (mask & CWBorderPixel) {
+        if (pWin->borderIsPixel)
+            attributes.border_pixel = xnestPixel(pWin->border.pixel);
+        else
+            mask &= ~CWBorderPixel;
+    }
+
+    if (mask & CWBitGravity)
+        attributes.bit_gravity = pWin->bitGravity;
+
+    if (mask & CWWinGravity)    /* dix does this for us */
+        mask &= ~CWWinGravity;
+
+    if (mask & CWBackingStore)  /* this is really not useful */
+        mask &= ~CWBackingStore;
+
+    if (mask & CWBackingPlanes) /* this is really not useful */
+        mask &= ~CWBackingPlanes;
+
+    if (mask & CWBackingPixel)  /* this is really not useful */
+        mask &= ~CWBackingPixel;
+
+    if (mask & CWOverrideRedirect)
+        attributes.override_redirect = pWin->overrideRedirect;
+
+    if (mask & CWSaveUnder)     /* this is really not useful */
+        mask &= ~CWSaveUnder;
+
+    if (mask & CWEventMask)     /* events are handled elsewhere */
+        mask &= ~CWEventMask;
+
+    if (mask & CWDontPropagate) /* events are handled elsewhere */
+        mask &= ~CWDontPropagate;
+
+    if (mask & CWColormap) {
+        ColormapPtr pCmap;
+
+        dixLookupResourceByType((pointer *) &pCmap, wColormap(pWin),
+                                RT_COLORMAP, serverClient, DixUseAccess);
+
+        attributes.colormap = xnestColormap(pCmap);
+
+        xnestSetInstalledColormapWindows(pWin->drawable.pScreen);
+    }
+
+    if (mask & CWCursor)        /* this is handeled in cursor code */
+        mask &= ~CWCursor;
+
+    if (mask)
+        XChangeWindowAttributes(xnestDisplay, xnestWindow(pWin),
+                                mask, &attributes);
+
+    return True;
+}
+
+Bool
+xnestRealizeWindow(WindowPtr pWin)
+{
+    xnestConfigureWindow(pWin, CWStackingOrder);
+    xnestShapeWindow(pWin);
+    XMapWindow(xnestDisplay, xnestWindow(pWin));
+
+    return True;
+}
+
+Bool
+xnestUnrealizeWindow(WindowPtr pWin)
+{
+    XUnmapWindow(xnestDisplay, xnestWindow(pWin));
+
+    return True;
+}
+
+void
+xnestCopyWindow(WindowPtr pWin, xPoint oldOrigin, RegionPtr oldRegion)
+{
+}
+
+void
+xnestClipNotify(WindowPtr pWin, int dx, int dy)
+{
+    xnestConfigureWindow(pWin, CWStackingOrder);
+    xnestShapeWindow(pWin);
+}
+
+static Bool
+xnestWindowExposurePredicate(Display * display, XEvent * event, XPointer ptr)
+{
+    return (event->type == Expose && event->xexpose.window == *(Window *) ptr);
+}
+
+void
+xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn, RegionPtr other_exposed)
+{
+    XEvent event;
+    Window window;
+    BoxRec Box;
+
+    XSync(xnestDisplay, False);
+
+    window = xnestWindow(pWin);
+
+    while (XCheckIfEvent(xnestDisplay, &event,
+                         xnestWindowExposurePredicate, (char *) &window)) {
+
+        Box.x1 = pWin->drawable.x + wBorderWidth(pWin) + event.xexpose.x;
+        Box.y1 = pWin->drawable.y + wBorderWidth(pWin) + event.xexpose.y;
+        Box.x2 = Box.x1 + event.xexpose.width;
+        Box.y2 = Box.y1 + event.xexpose.height;
+
+        event.xexpose.type = ProcessedExpose;
+
+        if (RegionContainsRect(pRgn, &Box) != rgnIN)
+            XPutBackEvent(xnestDisplay, &event);
+    }
+
+    miWindowExposures(pWin, pRgn, other_exposed);
+}
+
+void
+xnestSetShape(WindowPtr pWin, int kind)
+{
+    xnestShapeWindow(pWin);
+    miSetShape(pWin, kind);
+}
+
+static Bool
+xnestRegionEqual(RegionPtr pReg1, RegionPtr pReg2)
+{
+    BoxPtr pBox1, pBox2;
+    unsigned int n1, n2;
+
+    if (pReg1 == pReg2)
+        return True;
+
+    if (pReg1 == NullRegion || pReg2 == NullRegion)
+        return False;
+
+    pBox1 = RegionRects(pReg1);
+    n1 = RegionNumRects(pReg1);
+
+    pBox2 = RegionRects(pReg2);
+    n2 = RegionNumRects(pReg2);
+
+    if (n1 != n2)
+        return False;
+
+    if (pBox1 == pBox2)
+        return True;
+
+    if (memcmp(pBox1, pBox2, n1 * sizeof(BoxRec)))
+        return False;
+
+    return True;
+}
+
+void
+xnestShapeWindow(WindowPtr pWin)
+{
+    Region reg;
+    BoxPtr pBox;
+    XRectangle rect;
+    int i;
+
+    if (!xnestRegionEqual(xnestWindowPriv(pWin)->bounding_shape,
+                          wBoundingShape(pWin))) {
+
+        if (wBoundingShape(pWin)) {
+            RegionCopy(xnestWindowPriv(pWin)->bounding_shape,
+                       wBoundingShape(pWin));
+
+            reg = XCreateRegion();
+            pBox = RegionRects(xnestWindowPriv(pWin)->bounding_shape);
+            for (i = 0;
+                 i < RegionNumRects(xnestWindowPriv(pWin)->bounding_shape);
+                 i++) {
+                rect.x = pBox[i].x1;
+                rect.y = pBox[i].y1;
+                rect.width = pBox[i].x2 - pBox[i].x1;
+                rect.height = pBox[i].y2 - pBox[i].y1;
+                XUnionRectWithRegion(&rect, reg, reg);
+            }
+            XShapeCombineRegion(xnestDisplay, xnestWindow(pWin),
+                                ShapeBounding, 0, 0, reg, ShapeSet);
+            XDestroyRegion(reg);
+        }
+        else {
+            RegionEmpty(xnestWindowPriv(pWin)->bounding_shape);
+
+            XShapeCombineMask(xnestDisplay, xnestWindow(pWin),
+                              ShapeBounding, 0, 0, None, ShapeSet);
+        }
+    }
+
+    if (!xnestRegionEqual(xnestWindowPriv(pWin)->clip_shape, wClipShape(pWin))) {
+
+        if (wClipShape(pWin)) {
+            RegionCopy(xnestWindowPriv(pWin)->clip_shape, wClipShape(pWin));
+
+            reg = XCreateRegion();
+            pBox = RegionRects(xnestWindowPriv(pWin)->clip_shape);
+            for (i = 0;
+                 i < RegionNumRects(xnestWindowPriv(pWin)->clip_shape); i++) {
+                rect.x = pBox[i].x1;
+                rect.y = pBox[i].y1;
+                rect.width = pBox[i].x2 - pBox[i].x1;
+                rect.height = pBox[i].y2 - pBox[i].y1;
+                XUnionRectWithRegion(&rect, reg, reg);
+            }
+            XShapeCombineRegion(xnestDisplay, xnestWindow(pWin),
+                                ShapeClip, 0, 0, reg, ShapeSet);
+            XDestroyRegion(reg);
+        }
+        else {
+            RegionEmpty(xnestWindowPriv(pWin)->clip_shape);
+
+            XShapeCombineMask(xnestDisplay, xnestWindow(pWin),
+                              ShapeClip, 0, 0, None, ShapeSet);
+        }
+    }
+}
diff --git a/xorg-server/hw/xnest/XNCursor.h b/xorg-server/hw/xnest/XNCursor.h
index 473b2017f..1a3c6f44e 100644
--- a/xorg-server/hw/xnest/XNCursor.h
+++ b/xorg-server/hw/xnest/XNCursor.h
@@ -22,11 +22,12 @@ typedef struct {
 } xnestCursorFuncRec, *xnestCursorFuncPtr;
 
 extern DevPrivateKeyRec xnestCursorScreenKeyRec;
+
 #define xnestCursorScreenKey (&xnestCursorScreenKeyRec)
 extern xnestCursorFuncRec xnestCursorFuncs;
 
 typedef struct {
-  Cursor cursor;
+    Cursor cursor;
 } xnestPrivCursor;
 
 #define xnestGetCursorPriv(pCursor, pScreen) ((xnestPrivCursor *) \
@@ -39,21 +40,13 @@ typedef struct {
   (xnestGetCursorPriv(pCursor, pScreen)->cursor)
 
 Bool xnestRealizeCursor(DeviceIntPtr pDev,
-                        ScreenPtr pScreen,
-                        CursorPtr pCursor);
+                        ScreenPtr pScreen, CursorPtr pCursor);
 Bool xnestUnrealizeCursor(DeviceIntPtr pDev,
-                          ScreenPtr pScreen,
-                          CursorPtr pCursor);
-void xnestRecolorCursor(ScreenPtr pScreen,
-                        CursorPtr pCursor,
-                        Bool displayed);
-void xnestSetCursor (DeviceIntPtr pDev,
-                     ScreenPtr pScreen,
-                     CursorPtr pCursor,
-                     int x, int y);
-void xnestMoveCursor (DeviceIntPtr pDev,
-                      ScreenPtr pScreen,
-                      int x, int y);
+                          ScreenPtr pScreen, CursorPtr pCursor);
+void xnestRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool displayed);
+void xnestSetCursor(DeviceIntPtr pDev,
+                    ScreenPtr pScreen, CursorPtr pCursor, int x, int y);
+void xnestMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
 Bool xnestDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);
 void xnestDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);
-#endif /* XNESTCURSOR_H */
+#endif                          /* XNESTCURSOR_H */
diff --git a/xorg-server/hw/xquartz/GL/capabilities.c b/xorg-server/hw/xquartz/GL/capabilities.c
index b718a4156..4624fd4db 100644
--- a/xorg-server/hw/xquartz/GL/capabilities.c
+++ b/xorg-server/hw/xquartz/GL/capabilities.c
@@ -38,313 +38,326 @@
 
 #include "os.h"
 
-static void handleBufferModes(struct glCapabilitiesConfig *c, GLint bufferModes) {
-    if(bufferModes & kCGLStereoscopicBit) {
-	c->stereo = true;
+static void
+handleBufferModes(struct glCapabilitiesConfig *c, GLint bufferModes)
+{
+    if (bufferModes & kCGLStereoscopicBit) {
+        c->stereo = true;
     }
 
-    if(bufferModes & kCGLDoubleBufferBit) {
-	c->buffers = 2;
-    } else {
-	c->buffers = 1;
+    if (bufferModes & kCGLDoubleBufferBit) {
+        c->buffers = 2;
+    }
+    else {
+        c->buffers = 1;
     }
 }
 
-static void handleStencilModes(struct glCapabilitiesConfig *c, GLint smodes) {
+static void
+handleStencilModes(struct glCapabilitiesConfig *c, GLint smodes)
+{
     int offset = 0;
-    
-    if(kCGL0Bit & smodes)
-	c->stencil_bit_depths[offset++] = 0;
-
-    if(kCGL1Bit & smodes)
-	c->stencil_bit_depths[offset++] = 1;
-
-    if(kCGL2Bit & smodes)
-	c->stencil_bit_depths[offset++] = 2;
-    
-    if(kCGL3Bit & smodes)
-	c->stencil_bit_depths[offset++] = 3;
-
-    if(kCGL4Bit & smodes)
-	c->stencil_bit_depths[offset++] = 4;
-
-    if(kCGL5Bit & smodes)
-	c->stencil_bit_depths[offset++] = 5;
-    
-    if(kCGL6Bit & smodes)
-	c->stencil_bit_depths[offset++] = 6;
-
-    if(kCGL8Bit & smodes)
-	c->stencil_bit_depths[offset++] = 8;
-
-    if(kCGL10Bit & smodes)
-	c->stencil_bit_depths[offset++] = 10;
-
-    if(kCGL12Bit & smodes)
-	c->stencil_bit_depths[offset++] = 12;
-
-    if(kCGL16Bit & smodes)
-	c->stencil_bit_depths[offset++] = 16;
-
-    if(kCGL24Bit & smodes)
-	c->stencil_bit_depths[offset++] = 24;
-
-    if(kCGL32Bit & smodes)
-	c->stencil_bit_depths[offset++] = 32;
-    
-    if(kCGL48Bit & smodes)
-	c->stencil_bit_depths[offset++] = 48;
-    
-    if(kCGL64Bit & smodes)
-	c->stencil_bit_depths[offset++] = 64;
-    
-    if(kCGL96Bit & smodes)
-	c->stencil_bit_depths[offset++] = 96;
-    
-    if(kCGL128Bit & smodes)
-	c->stencil_bit_depths[offset++] = 128;
+
+    if (kCGL0Bit & smodes)
+        c->stencil_bit_depths[offset++] = 0;
+
+    if (kCGL1Bit & smodes)
+        c->stencil_bit_depths[offset++] = 1;
+
+    if (kCGL2Bit & smodes)
+        c->stencil_bit_depths[offset++] = 2;
+
+    if (kCGL3Bit & smodes)
+        c->stencil_bit_depths[offset++] = 3;
+
+    if (kCGL4Bit & smodes)
+        c->stencil_bit_depths[offset++] = 4;
+
+    if (kCGL5Bit & smodes)
+        c->stencil_bit_depths[offset++] = 5;
+
+    if (kCGL6Bit & smodes)
+        c->stencil_bit_depths[offset++] = 6;
+
+    if (kCGL8Bit & smodes)
+        c->stencil_bit_depths[offset++] = 8;
+
+    if (kCGL10Bit & smodes)
+        c->stencil_bit_depths[offset++] = 10;
+
+    if (kCGL12Bit & smodes)
+        c->stencil_bit_depths[offset++] = 12;
+
+    if (kCGL16Bit & smodes)
+        c->stencil_bit_depths[offset++] = 16;
+
+    if (kCGL24Bit & smodes)
+        c->stencil_bit_depths[offset++] = 24;
+
+    if (kCGL32Bit & smodes)
+        c->stencil_bit_depths[offset++] = 32;
+
+    if (kCGL48Bit & smodes)
+        c->stencil_bit_depths[offset++] = 48;
+
+    if (kCGL64Bit & smodes)
+        c->stencil_bit_depths[offset++] = 64;
+
+    if (kCGL96Bit & smodes)
+        c->stencil_bit_depths[offset++] = 96;
+
+    if (kCGL128Bit & smodes)
+        c->stencil_bit_depths[offset++] = 128;
 
     assert(offset < GLCAPS_STENCIL_BIT_DEPTH_BUFFERS);
 
     c->total_stencil_bit_depths = offset;
 }
 
-static int handleColorAndAccumulation(struct glColorBufCapabilities *c, 
-				       GLint cmodes, int forAccum) {
+static int
+handleColorAndAccumulation(struct glColorBufCapabilities *c,
+                           GLint cmodes, int forAccum)
+{
     int offset = 0;
-        
-    /*1*/
-    if(kCGLRGB444Bit & cmodes) {
-	c[offset].r = 4;
-	c[offset].g = 4; 
-	c[offset].b = 4;
-	++offset;
-    }
-    
-    /*2*/
-    if(kCGLARGB4444Bit & cmodes) {
-	c[offset].a = 4;
-	c[offset].r = 4;
-	c[offset].g = 4;
-	c[offset].b = 4;
-	c[offset].is_argb = true;
-	++offset;
-    }
-    
-    /*3*/
-    if(kCGLRGB444A8Bit & cmodes) {
-	c[offset].r = 4;
-	c[offset].g = 4;
-	c[offset].b = 4;
-	c[offset].a = 8;
-	++offset;
-    }
 
-    /*4*/
-    if(kCGLRGB555Bit & cmodes) {
-	c[offset].r = 5;
-	c[offset].g = 5;
-	c[offset].b = 5;
-	++offset;
+    /*1 */
+    if (kCGLRGB444Bit & cmodes) {
+        c[offset].r = 4;
+        c[offset].g = 4;
+        c[offset].b = 4;
+        ++offset;
     }
 
-    /*5*/
-    if(kCGLARGB1555Bit & cmodes) {
-	c[offset].a = 1;
-	c[offset].r = 5;
-	c[offset].g = 5;
-	c[offset].b = 5;
-	c[offset].is_argb = true;
-	++offset;
+    /*2 */
+    if (kCGLARGB4444Bit & cmodes) {
+        c[offset].a = 4;
+        c[offset].r = 4;
+        c[offset].g = 4;
+        c[offset].b = 4;
+        c[offset].is_argb = true;
+        ++offset;
     }
 
-    /*6*/
-    if(kCGLRGB555A8Bit & cmodes) {
-	c[offset].r = 5;
-	c[offset].g = 5; 
-	c[offset].b = 5;
-	c[offset].a = 8;
-	++offset;
+    /*3 */
+    if (kCGLRGB444A8Bit & cmodes) {
+        c[offset].r = 4;
+        c[offset].g = 4;
+        c[offset].b = 4;
+        c[offset].a = 8;
+        ++offset;
     }
 
-    /*7*/
-    if(kCGLRGB565Bit & cmodes) {
-	c[offset].r = 5;
-	c[offset].g = 6;
-	c[offset].b = 5;
-	++offset;
+    /*4 */
+    if (kCGLRGB555Bit & cmodes) {
+        c[offset].r = 5;
+        c[offset].g = 5;
+        c[offset].b = 5;
+        ++offset;
     }
 
-    /*8*/
-    if(kCGLRGB565A8Bit & cmodes) {
-	c[offset].r = 5;
-	c[offset].g = 6;
-	c[offset].b = 5;
-	c[offset].a = 8;
-	++offset;
+    /*5 */
+    if (kCGLARGB1555Bit & cmodes) {
+        c[offset].a = 1;
+        c[offset].r = 5;
+        c[offset].g = 5;
+        c[offset].b = 5;
+        c[offset].is_argb = true;
+        ++offset;
     }
 
-    /*9*/
-    if(kCGLRGB888Bit & cmodes) {
-	c[offset].r = 8;
-	c[offset].g = 8;
-	c[offset].b = 8;
-	++offset;
+    /*6 */
+    if (kCGLRGB555A8Bit & cmodes) {
+        c[offset].r = 5;
+        c[offset].g = 5;
+        c[offset].b = 5;
+        c[offset].a = 8;
+        ++offset;
     }
 
-    /*10*/
-    if(kCGLARGB8888Bit & cmodes) {
-	c[offset].a = 8;
-	c[offset].r = 8;
-	c[offset].g = 8;
-	c[offset].b = 8;
-	c[offset].is_argb = true;
-	++offset;
+    /*7 */
+    if (kCGLRGB565Bit & cmodes) {
+        c[offset].r = 5;
+        c[offset].g = 6;
+        c[offset].b = 5;
+        ++offset;
     }
 
-    /*11*/
-    if(kCGLRGB888A8Bit & cmodes) {
-	c[offset].r = 8;
-	c[offset].g = 8;
-	c[offset].b = 8;
-	c[offset].a = 8;
-	++offset;
+    /*8 */
+    if (kCGLRGB565A8Bit & cmodes) {
+        c[offset].r = 5;
+        c[offset].g = 6;
+        c[offset].b = 5;
+        c[offset].a = 8;
+        ++offset;
     }
 
-    if(forAccum) {
-//#if 0
-    /* FIXME
-     * Disable this path, because some part of libGL, X, or Xplugin 
-     * doesn't work with sizes greater than 8.
-     * When this is enabled and visuals are chosen using depths
-     * such as 16, the result is that the windows don't redraw
-     * and are often white, until a resize.
-     */
-
-    /*12*/
-    if(kCGLRGB101010Bit & cmodes) {
-	c[offset].r = 10;
-	c[offset].g = 10;
-	c[offset].b = 10;
-	++offset;
+    /*9 */
+    if (kCGLRGB888Bit & cmodes) {
+        c[offset].r = 8;
+        c[offset].g = 8;
+        c[offset].b = 8;
+        ++offset;
     }
 
-    /*13*/
-    if(kCGLARGB2101010Bit & cmodes) {
-	c[offset].a = 2;
-	c[offset].r = 10;
-	c[offset].g = 10;
-	c[offset].b = 10;
-	c[offset].is_argb = true;
-	++offset;
+    /*10 */
+    if (kCGLARGB8888Bit & cmodes) {
+        c[offset].a = 8;
+        c[offset].r = 8;
+        c[offset].g = 8;
+        c[offset].b = 8;
+        c[offset].is_argb = true;
+        ++offset;
     }
 
-    /*14*/
-    if(kCGLRGB101010_A8Bit & cmodes) {
-	c[offset].r = 10;
-	c[offset].g = 10;
-	c[offset].b = 10;
-	c[offset].a = 8;
-	++offset;
+    /*11 */
+    if (kCGLRGB888A8Bit & cmodes) {
+        c[offset].r = 8;
+        c[offset].g = 8;
+        c[offset].b = 8;
+        c[offset].a = 8;
+        ++offset;
     }
 
-    /*15*/
-    if(kCGLRGB121212Bit & cmodes) {
-	c[offset].r = 12;
-	c[offset].g = 12;
-	c[offset].b = 12;
-	++offset;	
-    }
-
-    /*16*/
-    if(kCGLARGB12121212Bit & cmodes) {
-	c[offset].a = 12;
-	c[offset].r = 12;
-	c[offset].g = 12;
-	c[offset].b = 12;
-	c[offset].is_argb = true;
-	++offset;
-    }
-
-    /*17*/
-    if(kCGLRGB161616Bit & cmodes) {
-	c[offset].r = 16;
-	c[offset].g = 16;
-	c[offset].b = 16;
-	++offset;
-    }
-
-    /*18*/
-    if(kCGLRGBA16161616Bit & cmodes) {
-	c[offset].r = 16;
-	c[offset].g = 16;
-	c[offset].b = 16;
-	c[offset].a = 16;
-	++offset;
-    }
+    if (forAccum) {
+//#if 0
+        /* FIXME
+         * Disable this path, because some part of libGL, X, or Xplugin 
+         * doesn't work with sizes greater than 8.
+         * When this is enabled and visuals are chosen using depths
+         * such as 16, the result is that the windows don't redraw
+         * and are often white, until a resize.
+         */
+
+        /*12 */
+        if (kCGLRGB101010Bit & cmodes) {
+            c[offset].r = 10;
+            c[offset].g = 10;
+            c[offset].b = 10;
+            ++offset;
+        }
+
+        /*13 */
+        if (kCGLARGB2101010Bit & cmodes) {
+            c[offset].a = 2;
+            c[offset].r = 10;
+            c[offset].g = 10;
+            c[offset].b = 10;
+            c[offset].is_argb = true;
+            ++offset;
+        }
+
+        /*14 */
+        if (kCGLRGB101010_A8Bit & cmodes) {
+            c[offset].r = 10;
+            c[offset].g = 10;
+            c[offset].b = 10;
+            c[offset].a = 8;
+            ++offset;
+        }
+
+        /*15 */
+        if (kCGLRGB121212Bit & cmodes) {
+            c[offset].r = 12;
+            c[offset].g = 12;
+            c[offset].b = 12;
+            ++offset;
+        }
+
+        /*16 */
+        if (kCGLARGB12121212Bit & cmodes) {
+            c[offset].a = 12;
+            c[offset].r = 12;
+            c[offset].g = 12;
+            c[offset].b = 12;
+            c[offset].is_argb = true;
+            ++offset;
+        }
+
+        /*17 */
+        if (kCGLRGB161616Bit & cmodes) {
+            c[offset].r = 16;
+            c[offset].g = 16;
+            c[offset].b = 16;
+            ++offset;
+        }
+
+        /*18 */
+        if (kCGLRGBA16161616Bit & cmodes) {
+            c[offset].r = 16;
+            c[offset].g = 16;
+            c[offset].b = 16;
+            c[offset].a = 16;
+            ++offset;
+        }
     }
 //#endif
 
     /* FIXME should we handle the floating point color modes, and if so, how? */
-      
+
     return offset;
 }
 
-
-static void handleColorModes(struct glCapabilitiesConfig *c, GLint cmodes) {
+static void
+handleColorModes(struct glCapabilitiesConfig *c, GLint cmodes)
+{
     c->total_color_buffers = handleColorAndAccumulation(c->color_buffers,
-							cmodes, 0);
-    
+                                                        cmodes, 0);
+
     assert(c->total_color_buffers < GLCAPS_COLOR_BUFFERS);
 }
 
-static void handleAccumulationModes(struct glCapabilitiesConfig *c, GLint cmodes) {
+static void
+handleAccumulationModes(struct glCapabilitiesConfig *c, GLint cmodes)
+{
     c->total_accum_buffers = handleColorAndAccumulation(c->accum_buffers,
-							cmodes, 1);
+                                                        cmodes, 1);
     assert(c->total_accum_buffers < GLCAPS_COLOR_BUFFERS);
 }
 
-static void handleDepthModes(struct glCapabilitiesConfig *c, GLint dmodes) {
+static void
+handleDepthModes(struct glCapabilitiesConfig *c, GLint dmodes)
+{
     int offset = 0;
+
 #define DEPTH(flag,value) do { \
 	if(dmodes & flag) { \
 	    c->depth_buffers[offset++] = value; \
 	} \
     } while(0)
 
-    /*1*/
+    /*1 */
     DEPTH(kCGL0Bit, 0);
-    /*2*/
+    /*2 */
     DEPTH(kCGL1Bit, 1);
-    /*3*/
+    /*3 */
     DEPTH(kCGL2Bit, 2);
-    /*4*/
+    /*4 */
     DEPTH(kCGL3Bit, 3);
-    /*5*/
+    /*5 */
     DEPTH(kCGL4Bit, 4);
-    /*6*/
+    /*6 */
     DEPTH(kCGL5Bit, 5);
-    /*7*/
+    /*7 */
     DEPTH(kCGL6Bit, 6);
-    /*8*/
+    /*8 */
     DEPTH(kCGL8Bit, 8);
-    /*9*/
+    /*9 */
     DEPTH(kCGL10Bit, 10);
-    /*10*/
+    /*10 */
     DEPTH(kCGL12Bit, 12);
-    /*11*/
+    /*11 */
     DEPTH(kCGL16Bit, 16);
-    /*12*/
+    /*12 */
     DEPTH(kCGL24Bit, 24);
-    /*13*/
+    /*13 */
     DEPTH(kCGL32Bit, 32);
-    /*14*/
+    /*14 */
     DEPTH(kCGL48Bit, 48);
-    /*15*/
+    /*15 */
     DEPTH(kCGL64Bit, 64);
-    /*16*/
+    /*16 */
     DEPTH(kCGL96Bit, 96);
-    /*17*/
+    /*17 */
     DEPTH(kCGL128Bit, 128);
 
 #undef DEPTH
@@ -354,95 +367,96 @@ static void handleDepthModes(struct glCapabilitiesConfig *c, GLint dmodes) {
 }
 
 /* Return non-zero if an error occured. */
-static CGLError handleRendererDescriptions(CGLRendererInfoObj info, GLint r, 
-					   struct glCapabilitiesConfig *c) {
+static CGLError
+handleRendererDescriptions(CGLRendererInfoObj info, GLint r,
+                           struct glCapabilitiesConfig *c)
+{
     CGLError err;
     GLint accelerated = 0, flags = 0, aux = 0, samplebufs = 0, samples = 0;
 
-    err = CGLDescribeRenderer (info, r, kCGLRPAccelerated, &accelerated);
+    err = CGLDescribeRenderer(info, r, kCGLRPAccelerated, &accelerated);
+
+    if (err)
+        return err;
 
-    if(err)
-	return err;
-    
     c->accelerated = accelerated;
 
     /* Buffering modes: single/double, stereo */
     err = CGLDescribeRenderer(info, r, kCGLRPBufferModes, &flags);
 
-    if(err)
-	return err;
-    
+    if (err)
+        return err;
+
     handleBufferModes(c, flags);
-    
+
     /* AUX buffers */
     err = CGLDescribeRenderer(info, r, kCGLRPMaxAuxBuffers, &aux);
 
-    if(err)
-	return err;
-    
+    if (err)
+        return err;
+
     c->aux_buffers = aux;
 
-    
     /* Depth buffer size */
     err = CGLDescribeRenderer(info, r, kCGLRPDepthModes, &flags);
-    
-    if(err)
-	return err;
 
-    handleDepthModes(c, flags);
+    if (err)
+        return err;
 
+    handleDepthModes(c, flags);
 
     /* Multisample buffers */
     err = CGLDescribeRenderer(info, r, kCGLRPMaxSampleBuffers, &samplebufs);
 
-    if(err)
-	return err;
+    if (err)
+        return err;
 
     c->multisample_buffers = samplebufs;
-    
 
     /* Multisample samples per multisample buffer */
     err = CGLDescribeRenderer(info, r, kCGLRPMaxSamples, &samples);
 
-    if(err)
-	return err;
+    if (err)
+        return err;
 
     c->multisample_samples = samples;
 
-
     /* Stencil bit depths */
     err = CGLDescribeRenderer(info, r, kCGLRPStencilModes, &flags);
 
-    if(err)
-	return err;
-
-    handleStencilModes(c, flags);   
+    if (err)
+        return err;
 
+    handleStencilModes(c, flags);
 
     /* Color modes (RGB/RGBA depths supported */
     err = CGLDescribeRenderer(info, r, kCGLRPColorModes, &flags);
 
-    if(err)
-	return err;
-    
+    if (err)
+        return err;
+
     handleColorModes(c, flags);
 
     err = CGLDescribeRenderer(info, r, kCGLRPAccumModes, &flags);
 
-    if(err)
-	return err;
+    if (err)
+        return err;
 
     handleAccumulationModes(c, flags);
-    
+
     return kCGLNoError;
 }
 
-static void initCapabilities(struct glCapabilities *cap) {
+static void
+initCapabilities(struct glCapabilities *cap)
+{
     cap->configurations = NULL;
     cap->total_configurations = 0;
 }
 
-static void initConfig(struct glCapabilitiesConfig *c) {
+static void
+initConfig(struct glCapabilitiesConfig *c)
+{
     int i;
 
     c->accelerated = false;
@@ -452,8 +466,8 @@ static void initConfig(struct glCapabilitiesConfig *c) {
 
     c->total_depth_buffer_depths = 0;
 
-    for(i = 0; i < GLCAPS_DEPTH_BUFFERS; ++i) {
-	c->depth_buffers[i] = GLCAPS_INVALID_DEPTH_VALUE;
+    for (i = 0; i < GLCAPS_DEPTH_BUFFERS; ++i) {
+        c->depth_buffers[i] = GLCAPS_INVALID_DEPTH_VALUE;
     }
 
     c->multisample_buffers = 0;
@@ -461,83 +475,88 @@ static void initConfig(struct glCapabilitiesConfig *c) {
 
     c->total_stencil_bit_depths = 0;
 
-    for(i = 0; i < GLCAPS_STENCIL_BIT_DEPTH_BUFFERS; ++i) {
-	c->stencil_bit_depths[i] = GLCAPS_INVALID_STENCIL_DEPTH;
+    for (i = 0; i < GLCAPS_STENCIL_BIT_DEPTH_BUFFERS; ++i) {
+        c->stencil_bit_depths[i] = GLCAPS_INVALID_STENCIL_DEPTH;
     }
-   
+
     c->total_color_buffers = 0;
 
-    for(i = 0; i < GLCAPS_COLOR_BUFFERS; ++i) {
-	c->color_buffers[i].r =	c->color_buffers[i].g =
-	    c->color_buffers[i].b = c->color_buffers[i].a = 
-	    GLCAPS_COLOR_BUF_INVALID_VALUE;
-	c->color_buffers[i].is_argb = false;
-     }
+    for (i = 0; i < GLCAPS_COLOR_BUFFERS; ++i) {
+        c->color_buffers[i].r = c->color_buffers[i].g =
+            c->color_buffers[i].b = c->color_buffers[i].a =
+            GLCAPS_COLOR_BUF_INVALID_VALUE;
+        c->color_buffers[i].is_argb = false;
+    }
 
     c->total_accum_buffers = 0;
 
-    for(i = 0; i < GLCAPS_COLOR_BUFFERS; ++i) {
-	c->accum_buffers[i].r = c->accum_buffers[i].g =
-	    c->accum_buffers[i].b = c->accum_buffers[i].a =
-	    GLCAPS_COLOR_BUF_INVALID_VALUE;
-	c->accum_buffers[i].is_argb = false;
+    for (i = 0; i < GLCAPS_COLOR_BUFFERS; ++i) {
+        c->accum_buffers[i].r = c->accum_buffers[i].g =
+            c->accum_buffers[i].b = c->accum_buffers[i].a =
+            GLCAPS_COLOR_BUF_INVALID_VALUE;
+        c->accum_buffers[i].is_argb = false;
     }
 
     c->next = NULL;
 }
 
-void freeGlCapabilities(struct glCapabilities *cap) {
+void
+freeGlCapabilities(struct glCapabilities *cap)
+{
     struct glCapabilitiesConfig *conf, *next;
-    
+
     conf = cap->configurations;
 
-    while(conf) {
-	next = conf->next;
-	free(conf);
-	conf = next;
+    while (conf) {
+        next = conf->next;
+        free(conf);
+        conf = next;
     }
 
-    cap->configurations = NULL;    
+    cap->configurations = NULL;
 }
 
 /*Return true if an error occured. */
-bool getGlCapabilities(struct glCapabilities *cap) {
-	CGLRendererInfoObj info;
+bool
+getGlCapabilities(struct glCapabilities *cap)
+{
+    CGLRendererInfoObj info;
     CGLError err;
-	GLint numRenderers = 0, r;
+    GLint numRenderers = 0, r;
 
     initCapabilities(cap);
 
-	err = CGLQueryRendererInfo((GLuint)-1, &info, &numRenderers);
-    if(err) {
-	    ErrorF("CGLQueryRendererInfo error: %s\n", CGLErrorString(err));
+    err = CGLQueryRendererInfo((GLuint) - 1, &info, &numRenderers);
+    if (err) {
+        ErrorF("CGLQueryRendererInfo error: %s\n", CGLErrorString(err));
         return err;
-	}
+    }
 
-	for(r = 0; r < numRenderers; r++) {
-	    struct glCapabilitiesConfig tmpconf, *conf;
+    for (r = 0; r < numRenderers; r++) {
+        struct glCapabilitiesConfig tmpconf, *conf;
 
-	    initConfig(&tmpconf);
+        initConfig(&tmpconf);
 
-	    err = handleRendererDescriptions(info, r, &tmpconf);
-	    if(err) {
-            ErrorF("handleRendererDescriptions returned error: %s\n", CGLErrorString(err));
+        err = handleRendererDescriptions(info, r, &tmpconf);
+        if (err) {
+            ErrorF("handleRendererDescriptions returned error: %s\n",
+                   CGLErrorString(err));
             ErrorF("trying to continue...\n");
             continue;
-	    }
+        }
 
-	    conf = malloc(sizeof(*conf));
-	    if(NULL == conf) {
-                FatalError("Unable to allocate memory for OpenGL capabilities\n");
-	    }
+        conf = malloc(sizeof(*conf));
+        if (NULL == conf) {
+            FatalError("Unable to allocate memory for OpenGL capabilities\n");
+        }
 
-	    /* Copy the struct. */
-	    *conf = tmpconf;
+        /* Copy the struct. */
+        *conf = tmpconf;
 
-	    /* Now link the configuration into the list. */
-	    conf->next = cap->configurations;
-	    cap->configurations = conf;
-	}
+        /* Now link the configuration into the list. */
+        conf->next = cap->configurations;
+        cap->configurations = conf;
+    }
 
     CGLDestroyRendererInfo(info);
 
diff --git a/xorg-server/hw/xquartz/GL/glcontextmodes.c b/xorg-server/hw/xquartz/GL/glcontextmodes.c
index 52a9ca440..79fadf876 100644
--- a/xorg-server/hw/xquartz/GL/glcontextmodes.c
+++ b/xorg-server/hw/xquartz/GL/glcontextmodes.c
@@ -1,550 +1,538 @@
-/*

- * (C) Copyright IBM Corporation 2003

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

- * on the rights to use, copy, modify, merge, publish, distribute, sub

- * license, 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 NON-INFRINGEMENT.  IN NO EVENT SHALL

- * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS 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.

- */

-

-/**

- * \file glcontextmodes.c

- * Utility routines for working with \c __GLcontextModes structures.  At

- * some point most or all of these functions will be moved to the Mesa

- * code base.

- *

- * \author Ian Romanick <idr@us.ibm.com>

- */

-

-#if defined(IN_MINI_GLX)

-#include <GL/gl.h>

-#else

-#if defined(HAVE_DIX_CONFIG_H)

-# include <dix-config.h>

-#endif

-#include <X11/X.h>

-#include <GL/glx.h>

-#include "GL/glxint.h"

-#endif

-

-/* Memory macros */

-#if defined(IN_MINI_GLX)

-# include <stdlib.h>

-# include <string.h>

-# define _mesa_malloc(b) malloc(b)

-# define _mesa_free(m) free(m)

-# define _mesa_memset  memset

-#else

-# ifdef XFree86Server

-# include <os.h>

-# include <string.h>

-#  define _mesa_malloc(b) malloc(b)

-#  define _mesa_free(m)   free(m)

-#  define _mesa_memset   memset

-# else

-#  include <X11/Xlibint.h>

-#  define _mesa_memset memset

-#  define _mesa_malloc(b) Xmalloc(b)

-#  define _mesa_free(m) free(m)

-# endif /* XFree86Server */

-#endif /* !defined(IN_MINI_GLX) */

-

-#include "glcontextmodes.h"

-

-#if !defined(IN_MINI_GLX)

-#define NUM_VISUAL_TYPES   6

-

-/**

- * Convert an X visual type to a GLX visual type.

- * 

- * \param visualType X visual type (i.e., \c TrueColor, \c StaticGray, etc.)

- *        to be converted.

- * \return If \c visualType is a valid X visual type, a GLX visual type will

- *         be returned.  Otherwise \c GLX_NONE will be returned.

- */

-GLint

-_gl_convert_from_x_visual_type( int visualType )

-{

-    static const int glx_visual_types[ NUM_VISUAL_TYPES ] = {

-	GLX_STATIC_GRAY,  GLX_GRAY_SCALE,

-	GLX_STATIC_COLOR, GLX_PSEUDO_COLOR,

-	GLX_TRUE_COLOR,   GLX_DIRECT_COLOR

-    };

-

-    return ( (unsigned) visualType < NUM_VISUAL_TYPES )

-	? glx_visual_types[ visualType ] : GLX_NONE;

-}

-

-

-/**

- * Convert a GLX visual type to an X visual type.

- * 

- * \param visualType GLX visual type (i.e., \c GLX_TRUE_COLOR, 

- *                   \c GLX_STATIC_GRAY, etc.) to be converted.

- * \return If \c visualType is a valid GLX visual type, an X visual type will

- *         be returned.  Otherwise -1 will be returned.

- */

-GLint

-_gl_convert_to_x_visual_type( int visualType )

-{

-    static const int x_visual_types[ NUM_VISUAL_TYPES ] = {

-	TrueColor,   DirectColor,

-	PseudoColor, StaticColor,

-	GrayScale,   StaticGray

-    };

-

-    return ( (unsigned) (visualType - GLX_TRUE_COLOR) < NUM_VISUAL_TYPES )

-	? x_visual_types[ visualType - GLX_TRUE_COLOR ] : -1;

-}

-

-

-/**

- * Copy a GLX visual config structure to a GL context mode structure.  All

- * of the fields in \c config are copied to \c mode.  Additional fields in

- * \c mode that can be derrived from the fields of \c config (i.e.,

- * \c haveDepthBuffer) are also filled in.  The remaining fields in \c mode

- * that cannot be derived are set to default values.

- * 

- * \param mode   Destination GL context mode.

- * \param config Source GLX visual config.

- * 

- * \note

- * The \c fbconfigID and \c visualID fields of the \c __GLcontextModes

- * structure will be set to the \c vid of the \c __GLXvisualConfig structure.

- */

-void

-_gl_copy_visual_to_context_mode( __GLcontextModes * mode,

-				 const __GLXvisualConfig * config )

-{

-    __GLcontextModes * const next = mode->next;

-

-    (void) _mesa_memset( mode, 0, sizeof( __GLcontextModes ) );

-    mode->next = next;

-

-    mode->visualID = config->vid;

-    mode->visualType = _gl_convert_from_x_visual_type( config->class );

-    mode->xRenderable = GL_TRUE;

-    mode->fbconfigID = config->vid;

-    mode->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT;

-

-    mode->rgbMode = (config->rgba != 0);

-    mode->renderType = (mode->rgbMode) ? GLX_RGBA_BIT : GLX_COLOR_INDEX_BIT;

-

-    mode->colorIndexMode = !(mode->rgbMode);

-    mode->doubleBufferMode = (config->doubleBuffer != 0);

-    mode->stereoMode = (config->stereo != 0);

-

-    mode->haveAccumBuffer = ((config->accumRedSize +

-			      config->accumGreenSize +

-			      config->accumBlueSize +

-			      config->accumAlphaSize) > 0);

-    mode->haveDepthBuffer = (config->depthSize > 0);

-    mode->haveStencilBuffer = (config->stencilSize > 0);

-

-    mode->redBits = config->redSize;

-    mode->greenBits = config->greenSize;

-    mode->blueBits = config->blueSize;

-    mode->alphaBits = config->alphaSize;

-    mode->redMask = config->redMask;

-    mode->greenMask = config->greenMask;

-    mode->blueMask = config->blueMask;

-    mode->alphaMask = config->alphaMask;

-    mode->rgbBits = mode->rgbMode ? config->bufferSize : 0;

-    mode->indexBits = mode->colorIndexMode ? config->bufferSize : 0;

-

-    mode->accumRedBits = config->accumRedSize;

-    mode->accumGreenBits = config->accumGreenSize;

-    mode->accumBlueBits = config->accumBlueSize;

-    mode->accumAlphaBits = config->accumAlphaSize;

-    mode->depthBits = config->depthSize;

-    mode->stencilBits = config->stencilSize;

-

-    mode->numAuxBuffers = config->auxBuffers;

-    mode->level = config->level;

-

-    mode->visualRating = config->visualRating;

-    mode->transparentPixel = config->transparentPixel;

-    mode->transparentRed   = config->transparentRed;

-    mode->transparentGreen = config->transparentGreen;

-    mode->transparentBlue  = config->transparentBlue;

-    mode->transparentAlpha = config->transparentAlpha;

-    mode->transparentIndex = config->transparentIndex;

-    mode->samples = config->multiSampleSize;

-    mode->sampleBuffers = config->nMultiSampleBuffers;

-    /* mode->visualSelectGroup = config->visualSelectGroup; ? */

-

-    mode->swapMethod = GLX_SWAP_UNDEFINED_OML;

-

-    mode->bindToTextureRgb = (mode->rgbMode) ? GL_TRUE : GL_FALSE;

-    mode->bindToTextureRgba = (mode->rgbMode && mode->alphaBits) ?

-	GL_TRUE : GL_FALSE;

-    mode->bindToMipmapTexture = mode->rgbMode ? GL_TRUE : GL_FALSE;

-    mode->bindToTextureTargets = mode->rgbMode ?

-	GLX_TEXTURE_1D_BIT_EXT | GLX_TEXTURE_2D_BIT_EXT |

-	GLX_TEXTURE_RECTANGLE_BIT_EXT : 0;

-    mode->yInverted = GL_FALSE;

-}

-

-

-/**

- * Get data from a GL context mode.

- * 

- * \param mode         GL context mode whose data is to be returned.

- * \param attribute    Attribute of \c mode that is to be returned.

- * \param value_return Location to store the data member of \c mode.

- * \return  If \c attribute is a valid attribute of \c mode, zero is

- *          returned.  Otherwise \c GLX_BAD_ATTRIBUTE is returned.

- */

-int

-_gl_get_context_mode_data(const __GLcontextModes *mode, int attribute,

-			  int *value_return)

-{

-    switch (attribute) {

-      case GLX_USE_GL:

-	*value_return = GL_TRUE;

-	return 0;

-      case GLX_BUFFER_SIZE:

-	*value_return = mode->rgbBits;

-	return 0;

-      case GLX_RGBA:

-	*value_return = mode->rgbMode;

-	return 0;

-      case GLX_RED_SIZE:

-	*value_return = mode->redBits;

-	return 0;

-      case GLX_GREEN_SIZE:

-	*value_return = mode->greenBits;

-	return 0;

-      case GLX_BLUE_SIZE:

-	*value_return = mode->blueBits;

-	return 0;

-      case GLX_ALPHA_SIZE:

-	*value_return = mode->alphaBits;

-	return 0;

-      case GLX_DOUBLEBUFFER:

-	*value_return = mode->doubleBufferMode;

-	return 0;

-      case GLX_STEREO:

-	*value_return = mode->stereoMode;

-	return 0;

-      case GLX_AUX_BUFFERS:

-	*value_return = mode->numAuxBuffers;

-	return 0;

-      case GLX_DEPTH_SIZE:

-	*value_return = mode->depthBits;

-	return 0;

-      case GLX_STENCIL_SIZE:

-	*value_return = mode->stencilBits;

-	return 0;

-      case GLX_ACCUM_RED_SIZE:

-	*value_return = mode->accumRedBits;

-	return 0;

-      case GLX_ACCUM_GREEN_SIZE:

-	*value_return = mode->accumGreenBits;

-	return 0;

-      case GLX_ACCUM_BLUE_SIZE:

-	*value_return = mode->accumBlueBits;

-	return 0;

-      case GLX_ACCUM_ALPHA_SIZE:

-	*value_return = mode->accumAlphaBits;

-	return 0;

-      case GLX_LEVEL:

-	*value_return = mode->level;

-	return 0;

-      case GLX_TRANSPARENT_TYPE_EXT:

-	*value_return = mode->transparentPixel;

-	return 0;

-      case GLX_TRANSPARENT_RED_VALUE:

-	*value_return = mode->transparentRed;

-	return 0;

-      case GLX_TRANSPARENT_GREEN_VALUE:

-	*value_return = mode->transparentGreen;

-	return 0;

-      case GLX_TRANSPARENT_BLUE_VALUE:

-	*value_return = mode->transparentBlue;

-	return 0;

-      case GLX_TRANSPARENT_ALPHA_VALUE:

-	*value_return = mode->transparentAlpha;

-	return 0;

-      case GLX_TRANSPARENT_INDEX_VALUE:

-	*value_return = mode->transparentIndex;

-	return 0;

-      case GLX_X_VISUAL_TYPE:

-	*value_return = mode->visualType;

-	return 0;

-      case GLX_CONFIG_CAVEAT:

-	*value_return = mode->visualRating;

-	return 0;

-      case GLX_VISUAL_ID:

-	*value_return = mode->visualID;

-	return 0;

-      case GLX_DRAWABLE_TYPE:

-	*value_return = mode->drawableType;

-	return 0;

-      case GLX_RENDER_TYPE:

-	*value_return = mode->renderType;

-	return 0;

-      case GLX_X_RENDERABLE:

-	*value_return = mode->xRenderable;

-	return 0;

-      case GLX_FBCONFIG_ID:

-	*value_return = mode->fbconfigID;

-	return 0;

-      case GLX_MAX_PBUFFER_WIDTH:

-	*value_return = mode->maxPbufferWidth;

-	return 0;

-      case GLX_MAX_PBUFFER_HEIGHT:

-	*value_return = mode->maxPbufferHeight;

-	return 0;

-      case GLX_MAX_PBUFFER_PIXELS:

-	*value_return = mode->maxPbufferPixels;

-	return 0;

-      case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX:

-	*value_return = mode->optimalPbufferWidth;

-	return 0;

-      case GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX:

-	*value_return = mode->optimalPbufferHeight;

-	return 0;

-      case GLX_SWAP_METHOD_OML:

-	*value_return = mode->swapMethod;

-	return 0;

-      case GLX_SAMPLE_BUFFERS_SGIS:

-	*value_return = mode->sampleBuffers;

-	return 0;

-      case GLX_SAMPLES_SGIS:

-	*value_return = mode->samples;

-	return 0;

-      case GLX_BIND_TO_TEXTURE_RGB_EXT:

-	*value_return = mode->bindToTextureRgb;

-	return 0;

-      case GLX_BIND_TO_TEXTURE_RGBA_EXT:

-	*value_return = mode->bindToTextureRgba;

-	return 0;

-      case GLX_BIND_TO_MIPMAP_TEXTURE_EXT:

-	*value_return = mode->bindToMipmapTexture == GL_TRUE ? GL_TRUE :

-	    GL_FALSE;

-	return 0;

-      case GLX_BIND_TO_TEXTURE_TARGETS_EXT:

-	*value_return = mode->bindToTextureTargets;

-	return 0;

-      case GLX_Y_INVERTED_EXT:

-	*value_return = mode->yInverted;

-	return 0;

-

-      /* Applications are NOT allowed to query GLX_VISUAL_SELECT_GROUP_SGIX.

-       * It is ONLY for communication between the GLX client and the GLX

-       * server.

-       */

-      case GLX_VISUAL_SELECT_GROUP_SGIX:

-      default:

-	return GLX_BAD_ATTRIBUTE;

-    }

-}

-#endif /* !defined(IN_MINI_GLX) */

-

-

-/**

- * Allocate a linked list of \c __GLcontextModes structures.  The fields of

- * each structure will be initialized to "reasonable" default values.  In

- * most cases this is the default value defined by table 3.4 of the GLX

- * 1.3 specification.  This means that most values are either initialized to

- * zero or \c GLX_DONT_CARE (which is -1).  As support for additional

- * extensions is added, the new values will be initialized to appropriate

- * values from the extension specification.

- * 

- * \param count         Number of structures to allocate.

- * \param minimum_size  Minimum size of a structure to allocate.  This allows

- *                      for differences in the version of the

- *                      \c __GLcontextModes stucture used in libGL and in a

- *                      DRI-based driver.

- * \returns A pointer to the first element in a linked list of \c count

- *          stuctures on success, or \c NULL on failure.

- * 

- * \warning Use of \c minimum_size does \b not guarantee binary compatibility.

- *          The fundamental assumption is that if the \c minimum_size

- *          specified by the driver and the size of the \c __GLcontextModes

- *          structure in libGL is the same, then the meaning of each byte in

- *          the structure is the same in both places.  \b Be \b careful!

- *          Basically this means that fields have to be added in libGL and

- *          then propagated to drivers.  Drivers should \b never arbitrarilly

- *          extend the \c __GLcontextModes data-structure.

- */

-__GLcontextModes *

-_gl_context_modes_create( unsigned count, size_t minimum_size )

-{

-   const size_t size = (minimum_size > sizeof( __GLcontextModes ))

-       ? minimum_size : sizeof( __GLcontextModes );

-   __GLcontextModes * base = NULL;

-   __GLcontextModes ** next;

-   unsigned   i;

-

-   next = & base;

-   for ( i = 0 ; i < count ; i++ ) {

-      *next = (__GLcontextModes *) _mesa_malloc( size );

-      if ( *next == NULL ) {

-	 _gl_context_modes_destroy( base );

-	 base = NULL;

-	 break;

-      }

-      

-      (void) _mesa_memset( *next, 0, size );

-      (*next)->visualID = GLX_DONT_CARE;

-      (*next)->visualType = GLX_DONT_CARE;

-      (*next)->visualRating = GLX_NONE;

-      (*next)->transparentPixel = GLX_NONE;

-      (*next)->transparentRed = GLX_DONT_CARE;

-      (*next)->transparentGreen = GLX_DONT_CARE;

-      (*next)->transparentBlue = GLX_DONT_CARE;

-      (*next)->transparentAlpha = GLX_DONT_CARE;

-      (*next)->transparentIndex = GLX_DONT_CARE;

-      (*next)->xRenderable = GLX_DONT_CARE;

-      (*next)->fbconfigID = GLX_DONT_CARE;

-      (*next)->swapMethod = GLX_SWAP_UNDEFINED_OML;

-      (*next)->bindToTextureRgb = GLX_DONT_CARE;

-      (*next)->bindToTextureRgba = GLX_DONT_CARE;

-      (*next)->bindToMipmapTexture = GLX_DONT_CARE;

-      (*next)->bindToTextureTargets = GLX_DONT_CARE;

-      (*next)->yInverted = GLX_DONT_CARE;

-

-      next = & ((*next)->next);

-   }

-

-   return base;

-}

-

-

-/**

- * Destroy a linked list of \c __GLcontextModes structures created by

- * \c _gl_context_modes_create.

- * 

- * \param modes  Linked list of structures to be destroyed.  All structres

- *               in the list will be freed.

- */

-void

-_gl_context_modes_destroy( __GLcontextModes * modes )

-{

-   while ( modes != NULL ) {

-      __GLcontextModes * const next = modes->next;

-

-      _mesa_free( modes );

-      modes = next;

-   }

-}

-

-

-/**

- * Find a context mode matching a Visual ID.

- *

- * \param modes  List list of context-mode structures to be searched.

- * \param vid    Visual ID to be found.

- * \returns A pointer to a context-mode in \c modes if \c vid was found in

- *          the list, or \c NULL if it was not.

- */

-

-__GLcontextModes *

-_gl_context_modes_find_visual(__GLcontextModes *modes, int vid)

-{

-    __GLcontextModes *m;

-

-    for (m = modes; m != NULL; m = m->next)

-	if (m->visualID == vid)

-	    return m;

-

-    return NULL;

-}

-

-__GLcontextModes *

-_gl_context_modes_find_fbconfig(__GLcontextModes *modes, int fbid)

-{

-    __GLcontextModes *m;

-

-    for (m = modes; m != NULL; m = m->next)

-	if (m->fbconfigID == fbid)

-	    return m;

-

-    return NULL;

-}

-

-/**

- * Determine if two context-modes are the same.  This is intended to be used

- * by libGL implementations to compare to sets of driver generated FBconfigs.

- * 

- * \param a  Context-mode to be compared.

- * \param b  Context-mode to be compared.

- * \returns \c GL_TRUE if the two context-modes are the same.  \c GL_FALSE is

- *          returned otherwise.

- */

-GLboolean

-_gl_context_modes_are_same( const __GLcontextModes * a,

-			    const __GLcontextModes * b )

-{

-    return( (a->rgbMode == b->rgbMode) &&

-	    (a->floatMode == b->floatMode) &&

-	    (a->colorIndexMode == b->colorIndexMode) &&

-	    (a->doubleBufferMode == b->doubleBufferMode) &&

-	    (a->stereoMode == b->stereoMode) &&

-	    (a->redBits == b->redBits) &&

-	    (a->greenBits == b->greenBits) &&

-	    (a->blueBits == b->blueBits) &&

-	    (a->alphaBits == b->alphaBits) &&

-#if 0 /* For some reason these don't get set on the client-side in libGL. */

-	    (a->redMask == b->redMask) &&

-	    (a->greenMask == b->greenMask) &&

-	    (a->blueMask == b->blueMask) &&

-	    (a->alphaMask == b->alphaMask) &&

-#endif

-	    (a->rgbBits == b->rgbBits) &&

-	    (a->indexBits == b->indexBits) &&

-	    (a->accumRedBits == b->accumRedBits) &&

-	    (a->accumGreenBits == b->accumGreenBits) &&

-	    (a->accumBlueBits == b->accumBlueBits) &&

-	    (a->accumAlphaBits == b->accumAlphaBits) &&

-	    (a->depthBits == b->depthBits) &&

-	    (a->stencilBits == b->stencilBits) &&

-	    (a->numAuxBuffers == b->numAuxBuffers) &&

-	    (a->level == b->level) &&

-	    (a->pixmapMode == b->pixmapMode) &&

-	    (a->visualRating == b->visualRating) &&

-

-	    (a->transparentPixel == b->transparentPixel) &&

-

-	    ((a->transparentPixel != GLX_TRANSPARENT_RGB) ||

-	     ((a->transparentRed == b->transparentRed) &&

-	      (a->transparentGreen == b->transparentGreen) &&

-	      (a->transparentBlue == b->transparentBlue) &&

-	      (a->transparentAlpha == b->transparentAlpha))) &&

-

-	    ((a->transparentPixel != GLX_TRANSPARENT_INDEX) || 

-	     (a->transparentIndex == b->transparentIndex)) &&

-

-	    (a->sampleBuffers == b->sampleBuffers) &&

-	    (a->samples == b->samples) &&

-	    ((a->drawableType & b->drawableType) != 0) &&

-	    (a->renderType == b->renderType) &&

-	    (a->maxPbufferWidth == b->maxPbufferWidth) &&

-	    (a->maxPbufferHeight == b->maxPbufferHeight) &&

-	    (a->maxPbufferPixels == b->maxPbufferPixels) &&

-	    (a->optimalPbufferWidth == b->optimalPbufferWidth) &&

-	    (a->optimalPbufferHeight == b->optimalPbufferHeight) &&

-	    (a->swapMethod == b->swapMethod) &&

-	    (a->bindToTextureRgb == b->bindToTextureRgb) &&

-	    (a->bindToTextureRgba == b->bindToTextureRgba) &&

-	    (a->bindToMipmapTexture == b->bindToMipmapTexture) &&

-	    (a->bindToTextureTargets == b->bindToTextureTargets) &&

-	    (a->yInverted == b->yInverted) );

-}

+/*
+ * (C) Copyright IBM Corporation 2003
+ * 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
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS 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.
+ */
+
+/**
+ * \file glcontextmodes.c
+ * Utility routines for working with \c __GLcontextModes structures.  At
+ * some point most or all of these functions will be moved to the Mesa
+ * code base.
+ *
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
+
+#if defined(IN_MINI_GLX)
+#include <GL/gl.h>
+#else
+#if defined(HAVE_DIX_CONFIG_H)
+#include <dix-config.h>
+#endif
+#include <X11/X.h>
+#include <GL/glx.h>
+#include "GL/glxint.h"
+#endif
+
+/* Memory macros */
+#if defined(IN_MINI_GLX)
+#include <stdlib.h>
+#include <string.h>
+#define _mesa_malloc(b) malloc(b)
+#define _mesa_free(m) free(m)
+#define _mesa_memset  memset
+#else
+#ifdef XFree86Server
+#include <os.h>
+#include <string.h>
+#define _mesa_malloc(b) malloc(b)
+#define _mesa_free(m)   free(m)
+#define _mesa_memset   memset
+#else
+#include <X11/Xlibint.h>
+#define _mesa_memset memset
+#define _mesa_malloc(b) Xmalloc(b)
+#define _mesa_free(m) free(m)
+#endif                          /* XFree86Server */
+#endif                          /* !defined(IN_MINI_GLX) */
+
+#include "glcontextmodes.h"
+
+#if !defined(IN_MINI_GLX)
+#define NUM_VISUAL_TYPES   6
+
+/**
+ * Convert an X visual type to a GLX visual type.
+ * 
+ * \param visualType X visual type (i.e., \c TrueColor, \c StaticGray, etc.)
+ *        to be converted.
+ * \return If \c visualType is a valid X visual type, a GLX visual type will
+ *         be returned.  Otherwise \c GLX_NONE will be returned.
+ */
+GLint
+_gl_convert_from_x_visual_type(int visualType)
+{
+    static const int glx_visual_types[NUM_VISUAL_TYPES] = {
+        GLX_STATIC_GRAY, GLX_GRAY_SCALE,
+        GLX_STATIC_COLOR, GLX_PSEUDO_COLOR,
+        GLX_TRUE_COLOR, GLX_DIRECT_COLOR
+    };
+
+    return ((unsigned) visualType < NUM_VISUAL_TYPES)
+        ? glx_visual_types[visualType] : GLX_NONE;
+}
+
+/**
+ * Convert a GLX visual type to an X visual type.
+ * 
+ * \param visualType GLX visual type (i.e., \c GLX_TRUE_COLOR, 
+ *                   \c GLX_STATIC_GRAY, etc.) to be converted.
+ * \return If \c visualType is a valid GLX visual type, an X visual type will
+ *         be returned.  Otherwise -1 will be returned.
+ */
+GLint
+_gl_convert_to_x_visual_type(int visualType)
+{
+    static const int x_visual_types[NUM_VISUAL_TYPES] = {
+        TrueColor, DirectColor,
+        PseudoColor, StaticColor,
+        GrayScale, StaticGray
+    };
+
+    return ((unsigned) (visualType - GLX_TRUE_COLOR) < NUM_VISUAL_TYPES)
+        ? x_visual_types[visualType - GLX_TRUE_COLOR] : -1;
+}
+
+/**
+ * Copy a GLX visual config structure to a GL context mode structure.  All
+ * of the fields in \c config are copied to \c mode.  Additional fields in
+ * \c mode that can be derrived from the fields of \c config (i.e.,
+ * \c haveDepthBuffer) are also filled in.  The remaining fields in \c mode
+ * that cannot be derived are set to default values.
+ * 
+ * \param mode   Destination GL context mode.
+ * \param config Source GLX visual config.
+ * 
+ * \note
+ * The \c fbconfigID and \c visualID fields of the \c __GLcontextModes
+ * structure will be set to the \c vid of the \c __GLXvisualConfig structure.
+ */
+void
+_gl_copy_visual_to_context_mode(__GLcontextModes * mode,
+                                const __GLXvisualConfig * config)
+{
+    __GLcontextModes *const next = mode->next;
+
+    (void) _mesa_memset(mode, 0, sizeof(__GLcontextModes));
+    mode->next = next;
+
+    mode->visualID = config->vid;
+    mode->visualType = _gl_convert_from_x_visual_type(config->class);
+    mode->xRenderable = GL_TRUE;
+    mode->fbconfigID = config->vid;
+    mode->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT;
+
+    mode->rgbMode = (config->rgba != 0);
+    mode->renderType = (mode->rgbMode) ? GLX_RGBA_BIT : GLX_COLOR_INDEX_BIT;
+
+    mode->colorIndexMode = !(mode->rgbMode);
+    mode->doubleBufferMode = (config->doubleBuffer != 0);
+    mode->stereoMode = (config->stereo != 0);
+
+    mode->haveAccumBuffer = ((config->accumRedSize +
+                              config->accumGreenSize +
+                              config->accumBlueSize +
+                              config->accumAlphaSize) > 0);
+    mode->haveDepthBuffer = (config->depthSize > 0);
+    mode->haveStencilBuffer = (config->stencilSize > 0);
+
+    mode->redBits = config->redSize;
+    mode->greenBits = config->greenSize;
+    mode->blueBits = config->blueSize;
+    mode->alphaBits = config->alphaSize;
+    mode->redMask = config->redMask;
+    mode->greenMask = config->greenMask;
+    mode->blueMask = config->blueMask;
+    mode->alphaMask = config->alphaMask;
+    mode->rgbBits = mode->rgbMode ? config->bufferSize : 0;
+    mode->indexBits = mode->colorIndexMode ? config->bufferSize : 0;
+
+    mode->accumRedBits = config->accumRedSize;
+    mode->accumGreenBits = config->accumGreenSize;
+    mode->accumBlueBits = config->accumBlueSize;
+    mode->accumAlphaBits = config->accumAlphaSize;
+    mode->depthBits = config->depthSize;
+    mode->stencilBits = config->stencilSize;
+
+    mode->numAuxBuffers = config->auxBuffers;
+    mode->level = config->level;
+
+    mode->visualRating = config->visualRating;
+    mode->transparentPixel = config->transparentPixel;
+    mode->transparentRed = config->transparentRed;
+    mode->transparentGreen = config->transparentGreen;
+    mode->transparentBlue = config->transparentBlue;
+    mode->transparentAlpha = config->transparentAlpha;
+    mode->transparentIndex = config->transparentIndex;
+    mode->samples = config->multiSampleSize;
+    mode->sampleBuffers = config->nMultiSampleBuffers;
+    /* mode->visualSelectGroup = config->visualSelectGroup; ? */
+
+    mode->swapMethod = GLX_SWAP_UNDEFINED_OML;
+
+    mode->bindToTextureRgb = (mode->rgbMode) ? GL_TRUE : GL_FALSE;
+    mode->bindToTextureRgba = (mode->rgbMode && mode->alphaBits) ?
+        GL_TRUE : GL_FALSE;
+    mode->bindToMipmapTexture = mode->rgbMode ? GL_TRUE : GL_FALSE;
+    mode->bindToTextureTargets = mode->rgbMode ?
+        GLX_TEXTURE_1D_BIT_EXT | GLX_TEXTURE_2D_BIT_EXT |
+        GLX_TEXTURE_RECTANGLE_BIT_EXT : 0;
+    mode->yInverted = GL_FALSE;
+}
+
+/**
+ * Get data from a GL context mode.
+ * 
+ * \param mode         GL context mode whose data is to be returned.
+ * \param attribute    Attribute of \c mode that is to be returned.
+ * \param value_return Location to store the data member of \c mode.
+ * \return  If \c attribute is a valid attribute of \c mode, zero is
+ *          returned.  Otherwise \c GLX_BAD_ATTRIBUTE is returned.
+ */
+int
+_gl_get_context_mode_data(const __GLcontextModes * mode, int attribute,
+                          int *value_return)
+{
+    switch (attribute) {
+    case GLX_USE_GL:
+        *value_return = GL_TRUE;
+        return 0;
+    case GLX_BUFFER_SIZE:
+        *value_return = mode->rgbBits;
+        return 0;
+    case GLX_RGBA:
+        *value_return = mode->rgbMode;
+        return 0;
+    case GLX_RED_SIZE:
+        *value_return = mode->redBits;
+        return 0;
+    case GLX_GREEN_SIZE:
+        *value_return = mode->greenBits;
+        return 0;
+    case GLX_BLUE_SIZE:
+        *value_return = mode->blueBits;
+        return 0;
+    case GLX_ALPHA_SIZE:
+        *value_return = mode->alphaBits;
+        return 0;
+    case GLX_DOUBLEBUFFER:
+        *value_return = mode->doubleBufferMode;
+        return 0;
+    case GLX_STEREO:
+        *value_return = mode->stereoMode;
+        return 0;
+    case GLX_AUX_BUFFERS:
+        *value_return = mode->numAuxBuffers;
+        return 0;
+    case GLX_DEPTH_SIZE:
+        *value_return = mode->depthBits;
+        return 0;
+    case GLX_STENCIL_SIZE:
+        *value_return = mode->stencilBits;
+        return 0;
+    case GLX_ACCUM_RED_SIZE:
+        *value_return = mode->accumRedBits;
+        return 0;
+    case GLX_ACCUM_GREEN_SIZE:
+        *value_return = mode->accumGreenBits;
+        return 0;
+    case GLX_ACCUM_BLUE_SIZE:
+        *value_return = mode->accumBlueBits;
+        return 0;
+    case GLX_ACCUM_ALPHA_SIZE:
+        *value_return = mode->accumAlphaBits;
+        return 0;
+    case GLX_LEVEL:
+        *value_return = mode->level;
+        return 0;
+    case GLX_TRANSPARENT_TYPE_EXT:
+        *value_return = mode->transparentPixel;
+        return 0;
+    case GLX_TRANSPARENT_RED_VALUE:
+        *value_return = mode->transparentRed;
+        return 0;
+    case GLX_TRANSPARENT_GREEN_VALUE:
+        *value_return = mode->transparentGreen;
+        return 0;
+    case GLX_TRANSPARENT_BLUE_VALUE:
+        *value_return = mode->transparentBlue;
+        return 0;
+    case GLX_TRANSPARENT_ALPHA_VALUE:
+        *value_return = mode->transparentAlpha;
+        return 0;
+    case GLX_TRANSPARENT_INDEX_VALUE:
+        *value_return = mode->transparentIndex;
+        return 0;
+    case GLX_X_VISUAL_TYPE:
+        *value_return = mode->visualType;
+        return 0;
+    case GLX_CONFIG_CAVEAT:
+        *value_return = mode->visualRating;
+        return 0;
+    case GLX_VISUAL_ID:
+        *value_return = mode->visualID;
+        return 0;
+    case GLX_DRAWABLE_TYPE:
+        *value_return = mode->drawableType;
+        return 0;
+    case GLX_RENDER_TYPE:
+        *value_return = mode->renderType;
+        return 0;
+    case GLX_X_RENDERABLE:
+        *value_return = mode->xRenderable;
+        return 0;
+    case GLX_FBCONFIG_ID:
+        *value_return = mode->fbconfigID;
+        return 0;
+    case GLX_MAX_PBUFFER_WIDTH:
+        *value_return = mode->maxPbufferWidth;
+        return 0;
+    case GLX_MAX_PBUFFER_HEIGHT:
+        *value_return = mode->maxPbufferHeight;
+        return 0;
+    case GLX_MAX_PBUFFER_PIXELS:
+        *value_return = mode->maxPbufferPixels;
+        return 0;
+    case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX:
+        *value_return = mode->optimalPbufferWidth;
+        return 0;
+    case GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX:
+        *value_return = mode->optimalPbufferHeight;
+        return 0;
+    case GLX_SWAP_METHOD_OML:
+        *value_return = mode->swapMethod;
+        return 0;
+    case GLX_SAMPLE_BUFFERS_SGIS:
+        *value_return = mode->sampleBuffers;
+        return 0;
+    case GLX_SAMPLES_SGIS:
+        *value_return = mode->samples;
+        return 0;
+    case GLX_BIND_TO_TEXTURE_RGB_EXT:
+        *value_return = mode->bindToTextureRgb;
+        return 0;
+    case GLX_BIND_TO_TEXTURE_RGBA_EXT:
+        *value_return = mode->bindToTextureRgba;
+        return 0;
+    case GLX_BIND_TO_MIPMAP_TEXTURE_EXT:
+        *value_return = mode->bindToMipmapTexture == GL_TRUE ? GL_TRUE :
+            GL_FALSE;
+        return 0;
+    case GLX_BIND_TO_TEXTURE_TARGETS_EXT:
+        *value_return = mode->bindToTextureTargets;
+        return 0;
+    case GLX_Y_INVERTED_EXT:
+        *value_return = mode->yInverted;
+        return 0;
+
+        /* Applications are NOT allowed to query GLX_VISUAL_SELECT_GROUP_SGIX.
+         * It is ONLY for communication between the GLX client and the GLX
+         * server.
+         */
+    case GLX_VISUAL_SELECT_GROUP_SGIX:
+    default:
+        return GLX_BAD_ATTRIBUTE;
+    }
+}
+#endif                          /* !defined(IN_MINI_GLX) */
+
+/**
+ * Allocate a linked list of \c __GLcontextModes structures.  The fields of
+ * each structure will be initialized to "reasonable" default values.  In
+ * most cases this is the default value defined by table 3.4 of the GLX
+ * 1.3 specification.  This means that most values are either initialized to
+ * zero or \c GLX_DONT_CARE (which is -1).  As support for additional
+ * extensions is added, the new values will be initialized to appropriate
+ * values from the extension specification.
+ * 
+ * \param count         Number of structures to allocate.
+ * \param minimum_size  Minimum size of a structure to allocate.  This allows
+ *                      for differences in the version of the
+ *                      \c __GLcontextModes stucture used in libGL and in a
+ *                      DRI-based driver.
+ * \returns A pointer to the first element in a linked list of \c count
+ *          stuctures on success, or \c NULL on failure.
+ * 
+ * \warning Use of \c minimum_size does \b not guarantee binary compatibility.
+ *          The fundamental assumption is that if the \c minimum_size
+ *          specified by the driver and the size of the \c __GLcontextModes
+ *          structure in libGL is the same, then the meaning of each byte in
+ *          the structure is the same in both places.  \b Be \b careful!
+ *          Basically this means that fields have to be added in libGL and
+ *          then propagated to drivers.  Drivers should \b never arbitrarilly
+ *          extend the \c __GLcontextModes data-structure.
+ */
+__GLcontextModes *
+_gl_context_modes_create(unsigned count, size_t minimum_size)
+{
+    const size_t size = (minimum_size > sizeof(__GLcontextModes))
+        ? minimum_size : sizeof(__GLcontextModes);
+    __GLcontextModes *base = NULL;
+    __GLcontextModes **next;
+    unsigned i;
+
+    next = &base;
+    for (i = 0; i < count; i++) {
+        *next = (__GLcontextModes *) _mesa_malloc(size);
+        if (*next == NULL) {
+            _gl_context_modes_destroy(base);
+            base = NULL;
+            break;
+        }
+
+        (void) _mesa_memset(*next, 0, size);
+        (*next)->visualID = GLX_DONT_CARE;
+        (*next)->visualType = GLX_DONT_CARE;
+        (*next)->visualRating = GLX_NONE;
+        (*next)->transparentPixel = GLX_NONE;
+        (*next)->transparentRed = GLX_DONT_CARE;
+        (*next)->transparentGreen = GLX_DONT_CARE;
+        (*next)->transparentBlue = GLX_DONT_CARE;
+        (*next)->transparentAlpha = GLX_DONT_CARE;
+        (*next)->transparentIndex = GLX_DONT_CARE;
+        (*next)->xRenderable = GLX_DONT_CARE;
+        (*next)->fbconfigID = GLX_DONT_CARE;
+        (*next)->swapMethod = GLX_SWAP_UNDEFINED_OML;
+        (*next)->bindToTextureRgb = GLX_DONT_CARE;
+        (*next)->bindToTextureRgba = GLX_DONT_CARE;
+        (*next)->bindToMipmapTexture = GLX_DONT_CARE;
+        (*next)->bindToTextureTargets = GLX_DONT_CARE;
+        (*next)->yInverted = GLX_DONT_CARE;
+
+        next = &((*next)->next);
+    }
+
+    return base;
+}
+
+/**
+ * Destroy a linked list of \c __GLcontextModes structures created by
+ * \c _gl_context_modes_create.
+ * 
+ * \param modes  Linked list of structures to be destroyed.  All structres
+ *               in the list will be freed.
+ */
+void
+_gl_context_modes_destroy(__GLcontextModes * modes)
+{
+    while (modes != NULL) {
+        __GLcontextModes *const next = modes->next;
+
+        _mesa_free(modes);
+        modes = next;
+    }
+}
+
+/**
+ * Find a context mode matching a Visual ID.
+ *
+ * \param modes  List list of context-mode structures to be searched.
+ * \param vid    Visual ID to be found.
+ * \returns A pointer to a context-mode in \c modes if \c vid was found in
+ *          the list, or \c NULL if it was not.
+ */
+
+__GLcontextModes *
+_gl_context_modes_find_visual(__GLcontextModes * modes, int vid)
+{
+    __GLcontextModes *m;
+
+    for (m = modes; m != NULL; m = m->next)
+        if (m->visualID == vid)
+            return m;
+
+    return NULL;
+}
+
+__GLcontextModes *
+_gl_context_modes_find_fbconfig(__GLcontextModes * modes, int fbid)
+{
+    __GLcontextModes *m;
+
+    for (m = modes; m != NULL; m = m->next)
+        if (m->fbconfigID == fbid)
+            return m;
+
+    return NULL;
+}
+
+/**
+ * Determine if two context-modes are the same.  This is intended to be used
+ * by libGL implementations to compare to sets of driver generated FBconfigs.
+ * 
+ * \param a  Context-mode to be compared.
+ * \param b  Context-mode to be compared.
+ * \returns \c GL_TRUE if the two context-modes are the same.  \c GL_FALSE is
+ *          returned otherwise.
+ */
+GLboolean
+_gl_context_modes_are_same(const __GLcontextModes * a,
+                           const __GLcontextModes * b)
+{
+    return ((a->rgbMode == b->rgbMode) &&
+            (a->floatMode == b->floatMode) &&
+            (a->colorIndexMode == b->colorIndexMode) &&
+            (a->doubleBufferMode == b->doubleBufferMode) &&
+            (a->stereoMode == b->stereoMode) &&
+            (a->redBits == b->redBits) &&
+            (a->greenBits == b->greenBits) &&
+            (a->blueBits == b->blueBits) && (a->alphaBits == b->alphaBits) &&
+#if 0                           /* For some reason these don't get set on the client-side in libGL. */
+            (a->redMask == b->redMask) &&
+            (a->greenMask == b->greenMask) &&
+            (a->blueMask == b->blueMask) && (a->alphaMask == b->alphaMask) &&
+#endif
+            (a->rgbBits == b->rgbBits) &&
+            (a->indexBits == b->indexBits) &&
+            (a->accumRedBits == b->accumRedBits) &&
+            (a->accumGreenBits == b->accumGreenBits) &&
+            (a->accumBlueBits == b->accumBlueBits) &&
+            (a->accumAlphaBits == b->accumAlphaBits) &&
+            (a->depthBits == b->depthBits) &&
+            (a->stencilBits == b->stencilBits) &&
+            (a->numAuxBuffers == b->numAuxBuffers) &&
+            (a->level == b->level) &&
+            (a->pixmapMode == b->pixmapMode) &&
+            (a->visualRating == b->visualRating) &&
+            (a->transparentPixel == b->transparentPixel) &&
+            ((a->transparentPixel != GLX_TRANSPARENT_RGB) ||
+             ((a->transparentRed == b->transparentRed) &&
+              (a->transparentGreen == b->transparentGreen) &&
+              (a->transparentBlue == b->transparentBlue) &&
+              (a->transparentAlpha == b->transparentAlpha))) &&
+            ((a->transparentPixel != GLX_TRANSPARENT_INDEX) ||
+             (a->transparentIndex == b->transparentIndex)) &&
+            (a->sampleBuffers == b->sampleBuffers) &&
+            (a->samples == b->samples) &&
+            ((a->drawableType & b->drawableType) != 0) &&
+            (a->renderType == b->renderType) &&
+            (a->maxPbufferWidth == b->maxPbufferWidth) &&
+            (a->maxPbufferHeight == b->maxPbufferHeight) &&
+            (a->maxPbufferPixels == b->maxPbufferPixels) &&
+            (a->optimalPbufferWidth == b->optimalPbufferWidth) &&
+            (a->optimalPbufferHeight == b->optimalPbufferHeight) &&
+            (a->swapMethod == b->swapMethod) &&
+            (a->bindToTextureRgb == b->bindToTextureRgb) &&
+            (a->bindToTextureRgba == b->bindToTextureRgba) &&
+            (a->bindToMipmapTexture == b->bindToMipmapTexture) &&
+            (a->bindToTextureTargets == b->bindToTextureTargets) &&
+            (a->yInverted == b->yInverted));
+}
diff --git a/xorg-server/hw/xquartz/GL/glcontextmodes.h b/xorg-server/hw/xquartz/GL/glcontextmodes.h
index afd09cd7f..871c2e1b3 100644
--- a/xorg-server/hw/xquartz/GL/glcontextmodes.h
+++ b/xorg-server/hw/xquartz/GL/glcontextmodes.h
@@ -33,22 +33,22 @@
 #include "GL/internal/glcore.h"
 
 #if !defined(IN_MINI_GLX)
-extern GLint _gl_convert_from_x_visual_type( int visualType );
-extern GLint _gl_convert_to_x_visual_type( int visualType );
-extern void _gl_copy_visual_to_context_mode( __GLcontextModes * mode,
-    const __GLXvisualConfig * config );
-extern int _gl_get_context_mode_data( const __GLcontextModes *mode,
-    int attribute, int *value_return );
-#endif /* !defined(IN_MINI_GLX) */
+extern GLint _gl_convert_from_x_visual_type(int visualType);
+extern GLint _gl_convert_to_x_visual_type(int visualType);
+extern void _gl_copy_visual_to_context_mode(__GLcontextModes * mode,
+                                            const __GLXvisualConfig * config);
+extern int _gl_get_context_mode_data(const __GLcontextModes * mode,
+                                     int attribute, int *value_return);
+#endif                          /* !defined(IN_MINI_GLX) */
 
-extern __GLcontextModes * _gl_context_modes_create( unsigned count,
-    size_t minimum_size );
-extern void _gl_context_modes_destroy( __GLcontextModes * modes );
-extern  __GLcontextModes *
-    _gl_context_modes_find_visual(__GLcontextModes *modes, int vid);
-extern __GLcontextModes *
-    _gl_context_modes_find_fbconfig(__GLcontextModes *modes, int fbid);
-extern GLboolean _gl_context_modes_are_same( const __GLcontextModes * a,
-    const __GLcontextModes * b );
+extern __GLcontextModes *_gl_context_modes_create(unsigned count,
+                                                  size_t minimum_size);
+extern void _gl_context_modes_destroy(__GLcontextModes * modes);
+extern __GLcontextModes *_gl_context_modes_find_visual(__GLcontextModes * modes,
+                                                       int vid);
+extern __GLcontextModes *_gl_context_modes_find_fbconfig(__GLcontextModes *
+                                                         modes, int fbid);
+extern GLboolean _gl_context_modes_are_same(const __GLcontextModes * a,
+                                            const __GLcontextModes * b);
 
-#endif /* GLCONTEXTMODES_H */
+#endif                          /* GLCONTEXTMODES_H */
diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c
index e6ff37668..1f4f79c4b 100644
--- a/xorg-server/hw/xquartz/GL/indirect.c
+++ b/xorg-server/hw/xquartz/GL/indirect.c
@@ -40,7 +40,7 @@
 #include <dlfcn.h>
 
 #include <OpenGL/OpenGL.h>
-#include <OpenGL/gl.h>     /* Just to prevent glxserver.h from loading mesa's and colliding with OpenGL.h */
+#include <OpenGL/gl.h>          /* Just to prevent glxserver.h from loading mesa's and colliding with OpenGL.h */
 
 #include <X11/Xproto.h>
 #include <GL/glxproto.h>
@@ -58,22 +58,28 @@
 #include "darwin.h"
 #define GLAQUA_DEBUG_MSG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", msg, ##args)
 
-__GLXprovider * GlxGetDRISWrastProvider (void);
+__GLXprovider *GlxGetDRISWrastProvider(void);
 
 static void setup_dispatch_table(void);
 GLuint __glFloorLog2(GLuint val);
-void warn_func(void * p1, char *format, ...);
+void warn_func(void *p1, char *format, ...);
 
 // some prototypes
-static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen);
-static __GLXdrawable * __glXAquaScreenCreateDrawable(ClientPtr client, __GLXscreen *screen, DrawablePtr pDraw, XID drawId, int type, XID glxDrawId, __GLXconfig *conf);
-
-static void __glXAquaContextDestroy(__GLXcontext *baseContext);
-static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext);
-static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext);
-static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, unsigned long mask);
-
-static CGLPixelFormatObj makeFormat(__GLXconfig *conf);
+static __GLXscreen *__glXAquaScreenProbe(ScreenPtr pScreen);
+static __GLXdrawable *__glXAquaScreenCreateDrawable(ClientPtr client,
+                                                    __GLXscreen * screen,
+                                                    DrawablePtr pDraw,
+                                                    XID drawId, int type,
+                                                    XID glxDrawId,
+                                                    __GLXconfig * conf);
+
+static void __glXAquaContextDestroy(__GLXcontext * baseContext);
+static int __glXAquaContextMakeCurrent(__GLXcontext * baseContext);
+static int __glXAquaContextLoseCurrent(__GLXcontext * baseContext);
+static int __glXAquaContextCopy(__GLXcontext * baseDst, __GLXcontext * baseSrc,
+                                unsigned long mask);
+
+static CGLPixelFormatObj makeFormat(__GLXconfig * conf);
 
 __GLXprovider __glXDRISWRastProvider = {
     __glXAquaScreenProbe,
@@ -81,8 +87,8 @@ __GLXprovider __glXDRISWRastProvider = {
     NULL
 };
 
-typedef struct __GLXAquaScreen   __GLXAquaScreen;
-typedef struct __GLXAquaContext  __GLXAquaContext;
+typedef struct __GLXAquaScreen __GLXAquaScreen;
+typedef struct __GLXAquaContext __GLXAquaContext;
 typedef struct __GLXAquaDrawable __GLXAquaDrawable;
 
 /*
@@ -105,7 +111,7 @@ struct __GLXAquaContext {
     CGLContextObj ctx;
     CGLPixelFormatObj pixelFormat;
     xp_surface_id sid;
-    unsigned isAttached :1;
+    unsigned isAttached:1;
 };
 
 struct __GLXAquaDrawable {
@@ -115,35 +121,34 @@ struct __GLXAquaDrawable {
     __GLXAquaContext *context;
 };
 
-
 static __GLXcontext *
-__glXAquaScreenCreateContext(__GLXscreen *screen,
-			     __GLXconfig *conf,
-			     __GLXcontext *baseShareContext)
+__glXAquaScreenCreateContext(__GLXscreen * screen,
+                             __GLXconfig * conf,
+                             __GLXcontext * baseShareContext)
 {
     __GLXAquaContext *context;
     __GLXAquaContext *shareContext = (__GLXAquaContext *) baseShareContext;
     CGLError gl_err;
-  
+
     GLAQUA_DEBUG_MSG("glXAquaScreenCreateContext\n");
-    
-    context = calloc(1, sizeof (__GLXAquaContext));
-    
+
+    context = calloc(1, sizeof(__GLXAquaContext));
+
     if (context == NULL)
-	return NULL;
+        return NULL;
 
     memset(context, 0, sizeof *context);
-    
+
     context->base.pGlxScreen = screen;
-    
-    context->base.destroy        = __glXAquaContextDestroy;
-    context->base.makeCurrent    = __glXAquaContextMakeCurrent;
-    context->base.loseCurrent    = __glXAquaContextLoseCurrent;
-    context->base.copy           = __glXAquaContextCopy;
+
+    context->base.destroy = __glXAquaContextDestroy;
+    context->base.makeCurrent = __glXAquaContextMakeCurrent;
+    context->base.loseCurrent = __glXAquaContextLoseCurrent;
+    context->base.copy = __glXAquaContextCopy;
     /*FIXME verify that the context->base is fully initialized. */
-    
+
     context->pixelFormat = makeFormat(conf);
-    
+
     if (!context->pixelFormat) {
         free(context);
         return NULL;
@@ -151,56 +156,63 @@ __glXAquaScreenCreateContext(__GLXscreen *screen,
 
     context->ctx = NULL;
     gl_err = CGLCreateContext(context->pixelFormat,
-			      shareContext ? shareContext->ctx : NULL,
-			      &context->ctx);
-    
+                              shareContext ? shareContext->ctx : NULL,
+                              &context->ctx);
+
     if (gl_err != 0) {
-	ErrorF("CGLCreateContext error: %s\n", CGLErrorString(gl_err));
-	CGLDestroyPixelFormat(context->pixelFormat);
-	free(context);
-	return NULL;
+        ErrorF("CGLCreateContext error: %s\n", CGLErrorString(gl_err));
+        CGLDestroyPixelFormat(context->pixelFormat);
+        free(context);
+        return NULL;
     }
-    
+
     setup_dispatch_table();
     GLAQUA_DEBUG_MSG("glAquaCreateContext done\n");
-    
+
     return &context->base;
 }
 
 /* maps from surface id -> list of __GLcontext */
 static x_hash_table *surface_hash;
 
-static void __glXAquaContextDestroy(__GLXcontext *baseContext) {
+static void
+__glXAquaContextDestroy(__GLXcontext * baseContext)
+{
     x_list *lst;
 
     __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
-    
+
     GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx %p)\n", baseContext);
     if (context != NULL) {
-      if (context->sid != 0 && surface_hash != NULL) {
-		lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);
-		lst = x_list_remove(lst, context);
-		x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid), lst);
-      }
-
-      if (context->ctx != NULL)
-	  CGLDestroyContext(context->ctx);
-
-      if (context->pixelFormat != NULL)
-	  CGLDestroyPixelFormat(context->pixelFormat);
-      
-      free(context);
+        if (context->sid != 0 && surface_hash != NULL) {
+            lst =
+                x_hash_table_lookup(surface_hash,
+                                    x_cvt_uint_to_vptr(context->sid), NULL);
+            lst = x_list_remove(lst, context);
+            x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid),
+                                lst);
+        }
+
+        if (context->ctx != NULL)
+            CGLDestroyContext(context->ctx);
+
+        if (context->pixelFormat != NULL)
+            CGLDestroyPixelFormat(context->pixelFormat);
+
+        free(context);
     }
 }
 
-static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext) {
+static int
+__glXAquaContextLoseCurrent(__GLXcontext * baseContext)
+{
     CGLError gl_err;
 
     GLAQUA_DEBUG_MSG("glAquaLoseCurrent (ctx 0x%p)\n", baseContext);
 
     gl_err = CGLSetCurrentContext(NULL);
     if (gl_err != 0)
-      ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));
+        ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));
 
     /* 
      * There should be no need to set __glXLastContext to NULL here, because
@@ -213,115 +225,126 @@ static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext) {
 
 /* Called when a surface is destroyed as a side effect of destroying
    the window it's attached to. */
-static void surface_notify(void *_arg, void *data) {
-    DRISurfaceNotifyArg *arg = (DRISurfaceNotifyArg *)_arg;
-    __GLXAquaDrawable *draw = (__GLXAquaDrawable *)data;
+static void
+surface_notify(void *_arg, void *data)
+{
+    DRISurfaceNotifyArg *arg = (DRISurfaceNotifyArg *) _arg;
+    __GLXAquaDrawable *draw = (__GLXAquaDrawable *) data;
     __GLXAquaContext *context;
     x_list *lst;
-    if(_arg == NULL || data == NULL) {
-	    ErrorF("surface_notify called with bad params");
-	    return;
+
+    if (_arg == NULL || data == NULL) {
+        ErrorF("surface_notify called with bad params");
+        return;
     }
-	
+
     GLAQUA_DEBUG_MSG("surface_notify(%p, %p)\n", _arg, data);
     switch (arg->kind) {
     case AppleDRISurfaceNotifyDestroyed:
         if (surface_hash != NULL)
             x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(arg->id));
-	draw->pDraw = NULL;
-	draw->sid = 0;
+        draw->pDraw = NULL;
+        draw->sid = 0;
         break;
 
     case AppleDRISurfaceNotifyChanged:
         if (surface_hash != NULL) {
-            lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(arg->id), NULL);
-            for (; lst != NULL; lst = lst->next)
-		{
+            lst =
+                x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(arg->id),
+                                    NULL);
+            for (; lst != NULL; lst = lst->next) {
                 context = lst->data;
                 xp_update_gl_context(context->ctx);
             }
         }
         break;
     default:
-	ErrorF("surface_notify: unknown kind %d\n", arg->kind);
-	break;
+        ErrorF("surface_notify: unknown kind %d\n", arg->kind);
+        break;
     }
 }
 
-static BOOL attach(__GLXAquaContext *context, __GLXAquaDrawable *draw) {
+static BOOL
+attach(__GLXAquaContext * context, __GLXAquaDrawable * draw)
+{
     DrawablePtr pDraw;
-    
+
     GLAQUA_DEBUG_MSG("attach(%p, %p)\n", context, draw);
-	
-    if(NULL == context || NULL == draw)
-	return TRUE;
+
+    if (NULL == context || NULL == draw)
+        return TRUE;
 
     pDraw = draw->base.pDraw;
 
-    if(NULL == pDraw) {
-	ErrorF("%s:%s() pDraw is NULL!\n", __FILE__, __func__);
-	return TRUE;
+    if (NULL == pDraw) {
+        ErrorF("%s:%s() pDraw is NULL!\n", __FILE__, __func__);
+        return TRUE;
     }
 
     if (draw->sid == 0) {
-	//if (!quartzProcs->CreateSurface(pDraw->pScreen, pDraw->id, pDraw,
+        //if (!quartzProcs->CreateSurface(pDraw->pScreen, pDraw->id, pDraw,
         if (!DRICreateSurface(pDraw->pScreen, pDraw->id, pDraw,
-			      0, &draw->sid, NULL,
-			      surface_notify, draw))
+                              0, &draw->sid, NULL, surface_notify, draw))
             return TRUE;
         draw->pDraw = pDraw;
-    } 
-    
+    }
+
     if (!context->isAttached || context->sid != draw->sid) {
         x_list *lst;
-	
+
         if (xp_attach_gl_context(context->ctx, draw->sid) != Success) {
-	    //quartzProcs->DestroySurface(pDraw->pScreen, pDraw->id, pDraw,
+            //quartzProcs->DestroySurface(pDraw->pScreen, pDraw->id, pDraw,
             DRIDestroySurface(pDraw->pScreen, pDraw->id, pDraw,
-			      surface_notify, draw);
+                              surface_notify, draw);
             if (surface_hash != NULL)
-                x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(draw->sid));
-	    
+                x_hash_table_remove(surface_hash,
+                                    x_cvt_uint_to_vptr(draw->sid));
+
             draw->sid = 0;
             return TRUE;
         }
-	
+
         context->isAttached = TRUE;
         context->sid = draw->sid;
-	
+
         if (surface_hash == NULL)
             surface_hash = x_hash_table_new(NULL, NULL, NULL, NULL);
-	
-        lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);
+
+        lst =
+            x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid),
+                                NULL);
         if (x_list_find(lst, context) == NULL) {
             lst = x_list_prepend(lst, context);
-            x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid), lst);
+            x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid),
+                                lst);
         }
-	
-	
 
         GLAQUA_DEBUG_MSG("attached 0x%x to 0x%x\n", (unsigned int) pDraw->id,
                          (unsigned int) draw->sid);
-    } 
+    }
 
     draw->context = context;
 
     return FALSE;
 }
 
-#if 0     // unused
-static void unattach(__GLXAquaContext *context) {
-	x_list *lst;
-	GLAQUA_DEBUG_MSG("unattach\n");
-	if (context == NULL) {
-		ErrorF("Tried to unattach a null context\n");
-		return;
-	}
+#if 0                           // unused
+static void
+unattach(__GLXAquaContext * context)
+{
+    x_list *lst;
+
+    GLAQUA_DEBUG_MSG("unattach\n");
+    if (context == NULL) {
+        ErrorF("Tried to unattach a null context\n");
+        return;
+    }
     if (context->isAttached) {
         GLAQUA_DEBUG_MSG("unattaching\n");
 
         if (surface_hash != NULL) {
-            lst = x_hash_table_lookup(surface_hash, (void *) context->sid, NULL);
+            lst =
+                x_hash_table_lookup(surface_hash, (void *) context->sid, NULL);
             lst = x_list_remove(lst, context);
             x_hash_table_insert(surface_hash, (void *) context->sid, lst);
         }
@@ -333,24 +356,28 @@ static void unattach(__GLXAquaContext *context) {
 }
 #endif
 
-static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext) {
+static int
+__glXAquaContextMakeCurrent(__GLXcontext * baseContext)
+{
     CGLError gl_err;
     __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
     __GLXAquaDrawable *drawPriv = (__GLXAquaDrawable *) context->base.drawPriv;
-    
+
     GLAQUA_DEBUG_MSG("glAquaMakeCurrent (ctx 0x%p)\n", baseContext);
-    
-    if(attach(context, drawPriv))
-	return /*error*/ 0;
+
+    if (attach(context, drawPriv))
+        return /*error */ 0;
 
     gl_err = CGLSetCurrentContext(context->ctx);
     if (gl_err != 0)
         ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));
-    
+
     return gl_err == 0;
 }
 
-static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, unsigned long mask)
+static int
+__glXAquaContextCopy(__GLXcontext * baseDst, __GLXcontext * baseSrc,
+                     unsigned long mask)
 {
     CGLError gl_err;
 
@@ -367,95 +394,100 @@ static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, un
 }
 
 /* Drawing surface notification callbacks */
-static GLboolean __glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base) {
+static GLboolean
+__glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable * base)
+{
     CGLError err;
     __GLXAquaDrawable *drawable;
- 
+
     //    GLAQUA_DEBUG_MSG("glAquaDrawableSwapBuffers(%p)\n",base);
-	
-    if(!base) {
-	ErrorF("%s passed NULL\n", __func__);
-	return GL_FALSE;
+
+    if (!base) {
+        ErrorF("%s passed NULL\n", __func__);
+        return GL_FALSE;
     }
 
-    drawable = (__GLXAquaDrawable *)base;
+    drawable = (__GLXAquaDrawable *) base;
 
-    if(NULL == drawable->context) {
-	ErrorF("%s called with a NULL->context for drawable %p!\n",
-	       __func__, (void *)drawable);
-	return GL_FALSE;
+    if (NULL == drawable->context) {
+        ErrorF("%s called with a NULL->context for drawable %p!\n",
+               __func__, (void *) drawable);
+        return GL_FALSE;
     }
 
     err = CGLFlushDrawable(drawable->context->ctx);
 
-    if(kCGLNoError != err) {
-	ErrorF("CGLFlushDrawable error: %s in %s\n", CGLErrorString(err),
-	       __func__);
-	return GL_FALSE;
+    if (kCGLNoError != err) {
+        ErrorF("CGLFlushDrawable error: %s in %s\n", CGLErrorString(err),
+               __func__);
+        return GL_FALSE;
     }
 
     return GL_TRUE;
 }
 
-
-static CGLPixelFormatObj makeFormat(__GLXconfig *conf) {
+static CGLPixelFormatObj
+makeFormat(__GLXconfig * conf)
+{
     CGLPixelFormatAttribute attr[64];
     CGLPixelFormatObj fobj;
     GLint formats;
     CGLError error;
     int i = 0;
-    
-    if(conf->doubleBufferMode)
-	attr[i++] = kCGLPFADoubleBuffer;
 
-    if(conf->stereoMode)
-	attr[i++] = kCGLPFAStereo;
+    if (conf->doubleBufferMode)
+        attr[i++] = kCGLPFADoubleBuffer;
+
+    if (conf->stereoMode)
+        attr[i++] = kCGLPFAStereo;
 
     attr[i++] = kCGLPFAColorSize;
     attr[i++] = conf->redBits + conf->greenBits + conf->blueBits;
     attr[i++] = kCGLPFAAlphaSize;
     attr[i++] = conf->alphaBits;
 
-    if((conf->accumRedBits + conf->accumGreenBits + conf->accumBlueBits +
-	conf->accumAlphaBits) > 0) {
+    if ((conf->accumRedBits + conf->accumGreenBits + conf->accumBlueBits +
+         conf->accumAlphaBits) > 0) {
 
-	attr[i++] = kCGLPFAAccumSize;
+        attr[i++] = kCGLPFAAccumSize;
         attr[i++] = conf->accumRedBits + conf->accumGreenBits
-	    + conf->accumBlueBits + conf->accumAlphaBits;
+            + conf->accumBlueBits + conf->accumAlphaBits;
     }
-    
+
     attr[i++] = kCGLPFADepthSize;
     attr[i++] = conf->depthBits;
 
-    if(conf->stencilBits) {
-	attr[i++] = kCGLPFAStencilSize;
-        attr[i++] = conf->stencilBits;	
+    if (conf->stencilBits) {
+        attr[i++] = kCGLPFAStencilSize;
+        attr[i++] = conf->stencilBits;
     }
-    
-    if(conf->numAuxBuffers > 0) {
-	attr[i++] = kCGLPFAAuxBuffers;
-	attr[i++] = conf->numAuxBuffers;
+
+    if (conf->numAuxBuffers > 0) {
+        attr[i++] = kCGLPFAAuxBuffers;
+        attr[i++] = conf->numAuxBuffers;
     }
 
-    if(conf->sampleBuffers > 0) {
-       attr[i++] = kCGLPFASampleBuffers;
-       attr[i++] = conf->sampleBuffers;
-       attr[i++] = kCGLPFASamples;
-       attr[i++] = conf->samples;
+    if (conf->sampleBuffers > 0) {
+        attr[i++] = kCGLPFASampleBuffers;
+        attr[i++] = conf->sampleBuffers;
+        attr[i++] = kCGLPFASamples;
+        attr[i++] = conf->samples;
     }
-     
+
     attr[i] = 0;
 
     error = CGLChoosePixelFormat(attr, &fobj, &formats);
-    if(error) {
-	ErrorF("error: creating pixel format %s\n", CGLErrorString(error));
-	return NULL;
+    if (error) {
+        ErrorF("error: creating pixel format %s\n", CGLErrorString(error));
+        return NULL;
     }
 
     return fobj;
 }
 
-static void __glXAquaScreenDestroy(__GLXscreen *screen) {
+static void
+__glXAquaScreenDestroy(__GLXscreen * screen)
+{
 
     GLAQUA_DEBUG_MSG("glXAquaScreenDestroy(%p)\n", screen);
     __glXScreenDestroy(screen);
@@ -464,26 +496,30 @@ static void __glXAquaScreenDestroy(__GLXscreen *screen) {
 }
 
 /* This is called by __glXInitScreens(). */
-static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {
+static __GLXscreen *
+__glXAquaScreenProbe(ScreenPtr pScreen)
+{
     __GLXAquaScreen *screen;
 
     GLAQUA_DEBUG_MSG("glXAquaScreenProbe\n");
 
-    if (pScreen == NULL) 
-	return NULL;
+    if (pScreen == NULL)
+        return NULL;
 
     screen = calloc(1, sizeof *screen);
 
-    if(NULL == screen)
-	return NULL;
-    
-    screen->base.destroy        = __glXAquaScreenDestroy;
-    screen->base.createContext  = __glXAquaScreenCreateContext;
+    if (NULL == screen)
+        return NULL;
+
+    screen->base.destroy = __glXAquaScreenDestroy;
+    screen->base.createContext = __glXAquaScreenCreateContext;
     screen->base.createDrawable = __glXAquaScreenCreateDrawable;
     screen->base.swapInterval = /*FIXME*/ NULL;
-    screen->base.pScreen       = pScreen;
-    
-    screen->base.fbconfigs = __glXAquaCreateVisualConfigs(&screen->base.numFBConfigs, pScreen->myNum);
+    screen->base.pScreen = pScreen;
+
+    screen->base.fbconfigs =
+        __glXAquaCreateVisualConfigs(&screen->base.numFBConfigs,
+                                     pScreen->myNum);
 
     __glXScreenInit(&screen->base, pScreen);
 
@@ -494,29 +530,33 @@ static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {
                                         "GLX_ARB_multisample "
                                         "GLX_EXT_visual_info "
                                         "GLX_EXT_import_context ");
-    
+
     /*We may be able to add more GLXextensions at a later time. */
-    
+
     return &screen->base;
 }
 
-#if 0 // unused
-static void __glXAquaDrawableCopySubBuffer (__GLXdrawable *drawable,
-					    int x, int y, int w, int h) {
-    /*TODO finish me*/
+#if 0                           // unused
+static void
+__glXAquaDrawableCopySubBuffer(__GLXdrawable * drawable,
+                               int x, int y, int w, int h)
+{
+    /*TODO finish me */
 }
 #endif
 
-static void __glXAquaDrawableDestroy(__GLXdrawable *base) {
+static void
+__glXAquaDrawableDestroy(__GLXdrawable * base)
+{
     /* gstaplin: base is the head of the structure, so it's at the same 
      * offset in memory.
      * Is this safe with strict aliasing?   I noticed that the other dri code
      * does this too...
      */
-    __GLXAquaDrawable *glxPriv = (__GLXAquaDrawable *)base;
+    __GLXAquaDrawable *glxPriv = (__GLXAquaDrawable *) base;
 
     GLAQUA_DEBUG_MSG("TRACE");
-    
+
     /* It doesn't work to call DRIDestroySurface here, the drawable's
        already gone.. But dri.c notices the window destruction and
        frees the surface itself. */
@@ -533,40 +573,41 @@ static void __glXAquaDrawableDestroy(__GLXdrawable *base) {
 
 static __GLXdrawable *
 __glXAquaScreenCreateDrawable(ClientPtr client,
-                              __GLXscreen *screen,
-			      DrawablePtr pDraw,
-			      XID drawId,
-			      int type,
-			      XID glxDrawId,
-			      __GLXconfig *conf) {
-  __GLXAquaDrawable *glxPriv;
+                              __GLXscreen * screen,
+                              DrawablePtr pDraw,
+                              XID drawId,
+                              int type, XID glxDrawId, __GLXconfig * conf)
+{
+    __GLXAquaDrawable *glxPriv;
 
-  glxPriv = malloc(sizeof *glxPriv);
+    glxPriv = malloc(sizeof *glxPriv);
 
-  if(glxPriv == NULL)
-      return NULL;
+    if (glxPriv == NULL)
+        return NULL;
 
-  memset(glxPriv, 0, sizeof *glxPriv);
+    memset(glxPriv, 0, sizeof *glxPriv);
 
-  if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
-    free(glxPriv);
-    return NULL;
-  }
-
-  glxPriv->base.destroy       = __glXAquaDrawableDestroy;
-  glxPriv->base.swapBuffers   = __glXAquaDrawableSwapBuffers;
-  glxPriv->base.copySubBuffer = NULL; /* __glXAquaDrawableCopySubBuffer; */
-
-  glxPriv->pDraw = pDraw;
-  glxPriv->sid = 0;
-  glxPriv->context = NULL;
-  
-  return &glxPriv->base;
+    if (!__glXDrawableInit
+        (&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
+        free(glxPriv);
+        return NULL;
+    }
+
+    glxPriv->base.destroy = __glXAquaDrawableDestroy;
+    glxPriv->base.swapBuffers = __glXAquaDrawableSwapBuffers;
+    glxPriv->base.copySubBuffer = NULL; /* __glXAquaDrawableCopySubBuffer; */
+
+    glxPriv->pDraw = pDraw;
+    glxPriv->sid = 0;
+    glxPriv->context = NULL;
+
+    return &glxPriv->base;
 }
 
 // Extra goodies for glx
 
-GLuint __glFloorLog2(GLuint val)
+GLuint
+__glFloorLog2(GLuint val)
 {
     int c = 0;
 
@@ -581,12 +622,14 @@ GLuint __glFloorLog2(GLuint val)
 #define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/OpenGL"
 #endif
 
-static void setup_dispatch_table(void) {
+static void
+setup_dispatch_table(void)
+{
     static struct _glapi_table *disp = NULL;
     static void *handle;
     const char *opengl_framework_path;
 
-    if(disp)  {
+    if (disp) {
         _glapi_set_dispatch(disp);
         return;
     }
@@ -596,12 +639,12 @@ static void setup_dispatch_table(void) {
         opengl_framework_path = OPENGL_FRAMEWORK_PATH;
     }
 
-    (void) dlerror();            /*drain dlerror */
+    (void) dlerror();           /*drain dlerror */
     handle = dlopen(opengl_framework_path, RTLD_LOCAL);
 
     if (!handle) {
         ErrorF("unable to dlopen %s : %s, using RTLD_DEFAULT\n",
-                opengl_framework_path, dlerror());
+               opengl_framework_path, dlerror());
         handle = RTLD_DEFAULT;
     }
 
diff --git a/xorg-server/hw/xquartz/GL/visualConfigs.c b/xorg-server/hw/xquartz/GL/visualConfigs.c
index 2c2a9a29e..c02427c99 100644
--- a/xorg-server/hw/xquartz/GL/visualConfigs.c
+++ b/xorg-server/hw/xquartz/GL/visualConfigs.c
@@ -58,83 +58,98 @@
 #include "darwinfb.h"
 
 /* Based originally on code from indirect.c which was based on code from i830_dri.c. */
-__GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber) {
+__GLXconfig *
+__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
+{
     int numConfigs = 0;
     __GLXconfig *visualConfigs, *c;
     struct glCapabilities caps;
     struct glCapabilitiesConfig *conf;
     int stereo, depth, aux, buffers, stencil, accum, color, msample;
-    
-    if(getGlCapabilities(&caps)) {
+
+    if (getGlCapabilities(&caps)) {
         ErrorF("error from getGlCapabilities()!\n");
         return NULL;
     }
-    
+
     /*
-     conf->stereo is 0 or 1, but we need at least 1 iteration of the loop, 
-     so we treat a true conf->stereo as 2.
-     
-     The depth size is 0 or 24.  Thus we do 2 iterations for that.
-     
-     conf->aux_buffers (when available/non-zero) result in 2 iterations instead of 1.
-     
-     conf->buffers indicates whether we have single or double buffering.
-     
-     conf->total_stencil_bit_depths
-     
-     conf->total_color_buffers indicates the RGB/RGBA color depths.
-     
-     conf->total_accum_buffers iterations for accum (with at least 1 if equal to 0) 
-     
-     conf->total_depth_buffer_depths 
-     
-     conf->multisample_buffers iterations (with at least 1 if equal to 0).  We add 1
-     for the 0 multisampling config.
-     
+       conf->stereo is 0 or 1, but we need at least 1 iteration of the loop, 
+       so we treat a true conf->stereo as 2.
+
+       The depth size is 0 or 24.  Thus we do 2 iterations for that.
+
+       conf->aux_buffers (when available/non-zero) result in 2 iterations instead of 1.
+
+       conf->buffers indicates whether we have single or double buffering.
+
+       conf->total_stencil_bit_depths
+
+       conf->total_color_buffers indicates the RGB/RGBA color depths.
+
+       conf->total_accum_buffers iterations for accum (with at least 1 if equal to 0) 
+
+       conf->total_depth_buffer_depths 
+
+       conf->multisample_buffers iterations (with at least 1 if equal to 0).  We add 1
+       for the 0 multisampling config.
+
      */
-    
+
     assert(NULL != caps.configurations);
-    
+
     numConfigs = 0;
-    
-    for(conf = caps.configurations; conf; conf = conf->next) {
-        if(conf->total_color_buffers <= 0)
+
+    for (conf = caps.configurations; conf; conf = conf->next) {
+        if (conf->total_color_buffers <= 0)
             continue;
-        
-        numConfigs += (conf->stereo ? 2 : 1) 
-	    * (conf->aux_buffers ? 2 : 1) 
-	    * conf->buffers
-	    * ((conf->total_stencil_bit_depths > 0) ? conf->total_stencil_bit_depths : 1)
-	    * conf->total_color_buffers
-	    * ((conf->total_accum_buffers > 0) ? conf->total_accum_buffers : 1)
-	    * conf->total_depth_buffer_depths
-	    * (conf->multisample_buffers + 1);
+
+        numConfigs += (conf->stereo ? 2 : 1)
+            * (conf->aux_buffers ? 2 : 1)
+            * conf->buffers
+            *
+            ((conf->total_stencil_bit_depths >
+              0) ? conf->total_stencil_bit_depths : 1)
+            * conf->total_color_buffers *
+            ((conf->total_accum_buffers > 0) ? conf->total_accum_buffers : 1)
+            * conf->total_depth_buffer_depths * (conf->multisample_buffers + 1);
     }
-    
-    if(numConfigsPtr)
-        *numConfigsPtr = numConfigs; 
-    
+
+    if (numConfigsPtr)
+        *numConfigsPtr = numConfigs;
+
     visualConfigs = calloc(sizeof(*visualConfigs), numConfigs);
-    
-    if(NULL == visualConfigs) {
+
+    if (NULL == visualConfigs) {
         ErrorF("xcalloc failure when allocating visualConfigs\n");
         freeGlCapabilities(&caps);
         return NULL;
     }
-    
-    c = visualConfigs; /* current buffer */
-    for(conf = caps.configurations; conf; conf = conf->next) {
-        for(stereo = 0; stereo < (conf->stereo ? 2 : 1); ++stereo) {
-            for(aux = 0; aux < (conf->aux_buffers ? 2 : 1); ++aux) {
-                for(buffers = 0; buffers < conf->buffers; ++buffers) {
-                    for(stencil = 0; stencil < ((conf->total_stencil_bit_depths > 0) ? 
-                                                conf->total_stencil_bit_depths : 1); ++stencil) {
-                        for(color = 0; color < conf->total_color_buffers; ++color) {
-                            for(accum = 0; accum < ((conf->total_accum_buffers > 0) ?
-                                                    conf->total_accum_buffers : 1); ++accum) {
-                                for(depth = 0; depth < conf->total_depth_buffer_depths; ++depth) {
-                                    for(msample = 0; msample < (conf->multisample_buffers + 1); ++msample) {
-                                        
+
+    c = visualConfigs;          /* current buffer */
+    for (conf = caps.configurations; conf; conf = conf->next) {
+        for (stereo = 0; stereo < (conf->stereo ? 2 : 1); ++stereo) {
+            for (aux = 0; aux < (conf->aux_buffers ? 2 : 1); ++aux) {
+                for (buffers = 0; buffers < conf->buffers; ++buffers) {
+                    for (stencil = 0;
+                         stencil <
+                         ((conf->total_stencil_bit_depths >
+                           0) ? conf->total_stencil_bit_depths : 1);
+                         ++stencil) {
+                        for (color = 0; color < conf->total_color_buffers;
+                             ++color) {
+                            for (accum = 0;
+                                 accum <
+                                 ((conf->total_accum_buffers >
+                                   0) ? conf->total_accum_buffers : 1);
+                                 ++accum) {
+                                for (depth = 0;
+                                     depth < conf->total_depth_buffer_depths;
+                                     ++depth) {
+                                    for (msample = 0;
+                                         msample <
+                                         (conf->multisample_buffers + 1);
+                                         ++msample) {
+
                                         // Global
                                         c->visualID = -1;
                                         c->visualType = GLX_TRUE_COLOR;
@@ -144,99 +159,137 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
 
                                         c->level = 0;
                                         c->indexBits = 0;
-                                        c->pixmapMode = 0; // TODO: What should this be?
-                                        
-                                        if(conf->accelerated) {
+                                        c->pixmapMode = 0;      // TODO: What should this be?
+
+                                        if (conf->accelerated) {
                                             c->visualRating = GLX_NONE;
-                                        } else {
-                                            c->visualRating = GLX_SLOW_VISUAL_EXT;
                                         }
-                                        
+                                        else {
+                                            c->visualRating =
+                                                GLX_SLOW_VISUAL_EXT;
+                                        }
+
                                         c->transparentPixel = GLX_NONE;
                                         c->transparentRed = GLX_NONE;
                                         c->transparentGreen = GLX_NONE;
                                         c->transparentBlue = GLX_NONE;
                                         c->transparentAlpha = GLX_NONE;
                                         c->transparentIndex = GLX_NONE;
-                                        
+
                                         c->visualSelectGroup = 0;
-                                        
+
                                         c->swapMethod = GLX_SWAP_UNDEFINED_OML;
-                                        
+
                                         // Stereo
                                         c->stereoMode = stereo ? TRUE : FALSE;
 
                                         // Aux buffers
-                                        c->numAuxBuffers = aux ? conf->aux_buffers : 0;
-                                        
+                                        c->numAuxBuffers =
+                                            aux ? conf->aux_buffers : 0;
+
                                         // Double Buffered
-                                        c->doubleBufferMode = buffers ? TRUE : FALSE;
+                                        c->doubleBufferMode =
+                                            buffers ? TRUE : FALSE;
 
                                         // Stencil Buffer
-                                        if(conf->total_stencil_bit_depths > 0) {
-                                            c->stencilBits = conf->stencil_bit_depths[stencil];
-                                        } else {
+                                        if (conf->total_stencil_bit_depths > 0) {
+                                            c->stencilBits =
+                                                conf->
+                                                stencil_bit_depths[stencil];
+                                        }
+                                        else {
                                             c->stencilBits = 0;
                                         }
-                                        
+
                                         // Color
-                                        if(GLCAPS_COLOR_BUF_INVALID_VALUE != conf->color_buffers[color].a) {
-                                            c->alphaBits = conf->color_buffers[color].a;
-                                        } else {
+                                        if (GLCAPS_COLOR_BUF_INVALID_VALUE !=
+                                            conf->color_buffers[color].a) {
+                                            c->alphaBits =
+                                                conf->color_buffers[color].a;
+                                        }
+                                        else {
                                             c->alphaBits = 0;
                                         }
-                                        c->redBits   = conf->color_buffers[color].r;
-                                        c->greenBits = conf->color_buffers[color].g;
-                                        c->blueBits  = conf->color_buffers[color].b;
-                                        
-                                        c->rgbBits = c->alphaBits + c->redBits + c->greenBits + c->blueBits;
-
-                                        c->alphaMask = AM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
-                                        c->redMask   = RM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
-                                        c->greenMask = GM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
-                                        c->blueMask  = BM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
-                                                                                
+                                        c->redBits =
+                                            conf->color_buffers[color].r;
+                                        c->greenBits =
+                                            conf->color_buffers[color].g;
+                                        c->blueBits =
+                                            conf->color_buffers[color].b;
+
+                                        c->rgbBits =
+                                            c->alphaBits + c->redBits +
+                                            c->greenBits + c->blueBits;
+
+                                        c->alphaMask =
+                                            AM_ARGB(c->alphaBits, c->redBits,
+                                                    c->greenBits, c->blueBits);
+                                        c->redMask =
+                                            RM_ARGB(c->alphaBits, c->redBits,
+                                                    c->greenBits, c->blueBits);
+                                        c->greenMask =
+                                            GM_ARGB(c->alphaBits, c->redBits,
+                                                    c->greenBits, c->blueBits);
+                                        c->blueMask =
+                                            BM_ARGB(c->alphaBits, c->redBits,
+                                                    c->greenBits, c->blueBits);
+
                                         // Accumulation Buffers
-                                        if(conf->total_accum_buffers > 0) {
-                                            c->accumRedBits = conf->accum_buffers[accum].r;
-                                            c->accumGreenBits = conf->accum_buffers[accum].g;
-                                            c->accumBlueBits = conf->accum_buffers[accum].b;
-                                            if(GLCAPS_COLOR_BUF_INVALID_VALUE != conf->accum_buffers[accum].a) {
-                                                c->accumAlphaBits = conf->accum_buffers[accum].a;
-                                            } else {
+                                        if (conf->total_accum_buffers > 0) {
+                                            c->accumRedBits =
+                                                conf->accum_buffers[accum].r;
+                                            c->accumGreenBits =
+                                                conf->accum_buffers[accum].g;
+                                            c->accumBlueBits =
+                                                conf->accum_buffers[accum].b;
+                                            if (GLCAPS_COLOR_BUF_INVALID_VALUE
+                                                !=
+                                                conf->accum_buffers[accum].a) {
+                                                c->accumAlphaBits =
+                                                    conf->accum_buffers[accum].
+                                                    a;
+                                            }
+                                            else {
                                                 c->accumAlphaBits = 0;
                                             }
-                                        } else {
+                                        }
+                                        else {
                                             c->accumRedBits = 0;
                                             c->accumGreenBits = 0;
                                             c->accumBlueBits = 0;
                                             c->accumAlphaBits = 0;
-                                        } 
+                                        }
 
                                         // Depth
-                                        c->depthBits = conf->depth_buffers[depth];
-                                        
+                                        c->depthBits =
+                                            conf->depth_buffers[depth];
+
                                         // MultiSample
-                                        if(msample > 0) {
-                                            c->samples = conf->multisample_samples;
-                                            c->sampleBuffers = conf->multisample_buffers;
-                                        } else {
+                                        if (msample > 0) {
+                                            c->samples =
+                                                conf->multisample_samples;
+                                            c->sampleBuffers =
+                                                conf->multisample_buffers;
+                                        }
+                                        else {
                                             c->samples = 0;
                                             c->sampleBuffers = 0;
                                         }
-										
+
                                         /* 
                                          * The Apple libGL supports GLXPixmaps and 
                                          * GLXPbuffers in direct mode.
                                          */
                                         /* SGIX_fbconfig / GLX 1.3 */
-                                        c->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT;
+                                        c->drawableType =
+                                            GLX_WINDOW_BIT | GLX_PIXMAP_BIT |
+                                            GLX_PBUFFER_BIT;
                                         c->renderType = GLX_RGBA_BIT;
                                         c->xRenderable = GL_TRUE;
                                         c->fbconfigID = -1;
-                                        
+
                                         /* SGIX_pbuffer / GLX 1.3 */
-                                        
+
                                         /* 
                                          * The CGL layer provides a way of retrieving
                                          * the maximum pbuffer width/height, but only
@@ -247,21 +300,22 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
                                          */
                                         c->maxPbufferWidth = 8192;
                                         c->maxPbufferHeight = 8192;
-                                        c->maxPbufferPixels = /*Do we need this?*/ 0;
+                                        c->maxPbufferPixels =
+                                            /*Do we need this? */ 0;
                                         /* 
                                          * There is no introspection for this sort of thing
                                          * with CGL.  What should we do realistically?
                                          */
                                         c->optimalPbufferWidth = 0;
                                         c->optimalPbufferHeight = 0;
-                                        
+
                                         /* EXT_texture_from_pixmap */
                                         c->bindToTextureRgb = 0;
                                         c->bindToTextureRgba = 0;
                                         c->bindToMipmapTexture = 0;
                                         c->bindToTextureTargets = 0;
                                         c->yInverted = 0;
-                                        
+
                                         c = c->next;
                                     }
                                 }
@@ -273,12 +327,14 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
         }
     }
 
-    (c-1)->next = NULL;
+    (c - 1)->next = NULL;
 
     if (c - visualConfigs != numConfigs) {
-        FatalError("numConfigs calculation error in setVisualConfigs!  numConfigs is %d  i is %d\n", numConfigs, (int)(c - visualConfigs));
+        FatalError
+            ("numConfigs calculation error in setVisualConfigs!  numConfigs is %d  i is %d\n",
+             numConfigs, (int) (c - visualConfigs));
     }
-    
+
     freeGlCapabilities(&caps);
     return visualConfigs;
 }
diff --git a/xorg-server/hw/xquartz/X11Application.h b/xorg-server/hw/xquartz/X11Application.h
index baee29d4c..bdbe6ac1f 100644
--- a/xorg-server/hw/xquartz/X11Application.h
+++ b/xorg-server/hw/xquartz/X11Application.h
@@ -34,49 +34,79 @@
 
 #import "X11Controller.h"
 
-@interface X11Application : NSApplication {
+ @ interface X11Application:NSApplication {
     X11Controller *_controller;
 
-    unsigned int _x_active :1;
+    unsigned int _x_active:1;
 }
 
-- (void) set_controller:controller;
-- (void) set_window_menu:(NSArray *)list;
+ -(void) set_controller:controller;
+ -(void) set_window_menu:(NSArray *) list;
 
-- (CFPropertyListRef) prefs_get_copy:(NSString *)key CF_RETURNS_RETAINED;
-- (int) prefs_get_integer:(NSString *)key default:(int)def;
-- (const char *) prefs_get_string:(NSString *)key default:(const char *)def;
-- (float) prefs_get_float:(NSString *)key default:(float)def;
-- (int) prefs_get_boolean:(NSString *)key default:(int)def;
-- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def NS_RETURNS_RETAINED;
-- (NSArray *) prefs_get_array:(NSString *)key;
-- (void) prefs_set_integer:(NSString *)key value:(int)value;
-- (void) prefs_set_float:(NSString *)key value:(float)value;
-- (void) prefs_set_boolean:(NSString *)key value:(int)value;
-- (void) prefs_set_array:(NSString *)key value:(NSArray *)value;
-- (void) prefs_set_string:(NSString *)key value:(NSString *)value;
-- (void) prefs_synchronize;
+ -(CFPropertyListRef) prefs_get_copy:(NSString *)
+key CF_RETURNS_RETAINED;
 
-- (X11Controller *) controller;
-- (OSX_BOOL) x_active;
-@end
+ -(int) prefs_get_integer:(NSString *)
+key default:(int) def;
 
-extern X11Application *X11App;
+ -(const char *) prefs_get_string:(NSString *)
+key default:(const char *) def;
 
-#endif /* __OBJC__ */
+ -(float) prefs_get_float:(NSString *)
+key default:(float) def;
 
-void X11ApplicationSetWindowMenu (int nitems, const char **items,
-					 const char *shortcuts);
-void X11ApplicationSetWindowMenuCheck (int idx);
-void X11ApplicationSetFrontProcess (void);
-void X11ApplicationSetCanQuit (int state);
-void X11ApplicationServerReady (void);
-void X11ApplicationShowHideMenubar (int state);
-void X11ApplicationLaunchClient (const char *cmd);
+ -(int) prefs_get_boolean:(NSString *)
+key default:(int) def;
 
-Bool X11ApplicationCanEnterRandR (void);
+ -(NSURL *) prefs_copy_url:(NSString *)
+key default:(NSURL *)
+def NS_RETURNS_RETAINED;
 
-void X11ApplicationMain(int argc, char **argv, char **envp);
+ -(NSArray *) prefs_get_array:(NSString *) key;
+ -(void) prefs_set_integer:(NSString *)
+key value:(int) value;
+
+ -(void) prefs_set_float:(NSString *)
+key value:(float) value;
+
+ -(void) prefs_set_boolean:(NSString *)
+key value:(int) value;
+
+ -(void) prefs_set_array:(NSString *)
+key value:(NSArray *) value;
+
+ -(void) prefs_set_string:(NSString *)
+key value:(NSString *) value;
+
+-(void) prefs_synchronize;
+
+-(X11Controller *) controller;
+-(OSX_BOOL) x_active;
+@end extern X11Application *X11App;
+
+#endif                          /* __OBJC__ */
+
+void
+X11ApplicationSetWindowMenu(int nitems, const char **items,
+                            const char *shortcuts);
+void
+X11ApplicationSetWindowMenuCheck(int idx);
+void
+X11ApplicationSetFrontProcess(void);
+void
+X11ApplicationSetCanQuit(int state);
+void
+X11ApplicationServerReady(void);
+void
+X11ApplicationShowHideMenubar(int state);
+void
+X11ApplicationLaunchClient(const char *cmd);
+
+Bool
+X11ApplicationCanEnterRandR(void);
+
+void
+X11ApplicationMain(int argc, char **argv, char **envp);
 
 #define PREFS_APPSMENU              "apps_menu"
 #define PREFS_FAKEBUTTONS           "enable_fake_buttons"
@@ -113,4 +143,4 @@ extern Bool XQuartzScrollInDeviceDirection;
 #define PREFS_SYNC_CLIPBOARD_TO_PB   "sync_clipboard_to_pasteboard"
 #define PREFS_SYNC_PRIMARY_ON_SELECT "sync_primary_on_select"
 
-#endif /* X11APPLICATION_H */
+#endif                          /* X11APPLICATION_H */
diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m
index 048e7875b..e091fbb3d 100644
--- a/xorg-server/hw/xquartz/X11Application.m
+++ b/xorg-server/hw/xquartz/X11Application.m
@@ -54,7 +54,7 @@
 #include <Xplugin.h>
 
 // pbproxy/pbproxy.h
-extern int xpbproxy_run (void);
+extern int xpbproxy_run(void);
 
 #define DEFAULTS_FILE X11LIBDIR"/X11/xserver/Xquartz.plist"
 
@@ -95,115 +95,129 @@ CFStringRef app_prefs_domain_cfstr = NULL;
 
 #define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)
 
-@interface X11Application (Private)
-- (void) sendX11NSEvent:(NSEvent *)e;
-@end
-
-@implementation X11Application
-
-typedef struct message_struct message;
+@interface X11Application(Private)
+ - (void) sendX11NSEvent:(NSEvent *) e;
+@end @ implementation X11Application typedef struct message_struct
+    message;
 struct message_struct {
-    mach_msg_header_t hdr;
-    SEL selector;
-    NSObject *arg;
+    mach_msg_header_t
+        hdr;
+    SEL
+        selector;
+    NSObject *
+        arg;
 };
 
-static mach_port_t _port;
+static mach_port_t
+    _port;
 
 /* Quartz mode initialization routine. This is often dynamically loaded
    but is statically linked into this X server. */
-Bool QuartzModeBundleInit(void);
+Bool
+QuartzModeBundleInit(void);
 
-static void init_ports (void) {
+static void
+init_ports(void)
+{
     kern_return_t r;
     NSPort *p;
-	
-    if (_port != MACH_PORT_NULL) return;
-	
-    r = mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE, &_port);
-    if (r != KERN_SUCCESS) return;
-	
-    p = [NSMachPort portWithMachPort:_port];
-    [p setDelegate:NSApp];
-    [p scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+
+    if (_port != MACH_PORT_NULL)
+        return;
+
+    r = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &_port);
+    if (r != KERN_SUCCESS)
+        return;
+
+ p =[NSMachPort portWithMachPort:_port];
+ [p setDelegate:NSApp];
+ [p scheduleInRunLoop: [NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
 }
 
-static void message_kit_thread (SEL selector, NSObject *arg) {
+static void
+message_kit_thread(SEL selector, NSObject * arg)
+{
     message msg;
     kern_return_t r;
-	
-    msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_MAKE_SEND, 0);
-    msg.hdr.msgh_size = sizeof (msg);
+
+    msg.hdr.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_MAKE_SEND, 0);
+    msg.hdr.msgh_size = sizeof(msg);
     msg.hdr.msgh_remote_port = _port;
     msg.hdr.msgh_local_port = MACH_PORT_NULL;
     msg.hdr.msgh_reserved = 0;
     msg.hdr.msgh_id = 0;
-	
+
     msg.selector = selector;
-    msg.arg = [arg retain];
-	
-    r = mach_msg (&msg.hdr, MACH_SEND_MSG, msg.hdr.msgh_size,
-		  0, MACH_PORT_NULL, 0, MACH_PORT_NULL);
+    msg.arg =[arg retain];
+
+    r = mach_msg(&msg.hdr, MACH_SEND_MSG, msg.hdr.msgh_size,
+                 0, MACH_PORT_NULL, 0, MACH_PORT_NULL);
     if (r != KERN_SUCCESS)
-		ErrorF("%s: mach_msg failed: %x\n", __FUNCTION__, r);
+        ErrorF("%s: mach_msg failed: %x\n", __FUNCTION__, r);
 }
 
-- (void) handleMachMessage:(void *)_msg {
+ -(void) handleMachMessage:(void *) _msg {
     message *msg = _msg;
-	
-    [self performSelector:msg->selector withObject:msg->arg];
+
+ [self performSelector: msg->selector withObject:msg->arg];
     [msg->arg release];
 }
 
-- (void) set_controller:obj {
-    if (_controller == nil) _controller = [obj retain];
+ -(void) set_controller:obj {
+    if (_controller == nil)
+        _controller =[obj retain];
 }
 
-- (void) dealloc {
-    if (_controller != nil) [_controller release];
-	
+-(void) dealloc {
+    if (_controller != nil)
+        [_controller release];
+
     if (_port != MACH_PORT_NULL)
-		mach_port_deallocate (mach_task_self (), _port);
-	
+        mach_port_deallocate(mach_task_self(), _port);
+
     [super dealloc];
 }
 
-- (void) orderFrontStandardAboutPanel: (id) sender {
+ -(void) orderFrontStandardAboutPanel:(id) sender {
     NSMutableDictionary *dict;
     NSDictionary *infoDict;
     NSString *tem;
-    
-    dict = [NSMutableDictionary dictionaryWithCapacity:3];
-    infoDict = [[NSBundle mainBundle] infoDictionary];
-    
-    [dict setObject: NSLocalizedString (@"The X Window System", @"About panel")
-          forKey:@"ApplicationName"];
-    
-    tem = [infoDict objectForKey:@"CFBundleShortVersionString"];
-    
-    [dict setObject:[NSString stringWithFormat:@"XQuartz %@", tem]
-          forKey:@"ApplicationVersion"];
-
-    [dict setObject:[NSString stringWithFormat:@"xorg-server %s", XSERVER_VERSION]
-          forKey:@"Version"];
-    
-    [self orderFrontStandardAboutPanelWithOptions: dict];
+
+ dict =[NSMutableDictionary dictionaryWithCapacity:3];
+    infoDict =[[NSBundle mainBundle] infoDictionary];
+
+ [dict setObject:NSLocalizedString(@"The X Window System", @"About panel")
+ forKey:@"ApplicationName"];
+
+ tem =[infoDict objectForKey:@"CFBundleShortVersionString"];
+
+ [dict setObject: [NSString stringWithFormat:@"XQuartz %@", tem]
+ forKey:@"ApplicationVersion"];
+
+ [dict setObject: [NSString stringWithFormat:@"xorg-server %s",
+     XSERVER_VERSION]
+ forKey:@"Version"];
+
+ [self orderFrontStandardAboutPanelWithOptions:dict];
 }
 
-- (void) activateX:(OSX_BOOL)state {
+ -(void) activateX:(OSX_BOOL) state {
     if (_x_active == state)
         return;
 
     DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active);
     if (state) {
-        if(bgMouseLocationUpdated) {
-            DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, bgMouseLocation.x, bgMouseLocation.y, 0.0, 0.0, 0.0);
+        if (bgMouseLocationUpdated) {
+            DarwinSendPointerEvents(darwinPointer, MotionNotify, 0,
+                                    bgMouseLocation.x, bgMouseLocation.y, 0.0,
+                                    0.0, 0.0);
             bgMouseLocationUpdated = FALSE;
         }
         DarwinSendDDXEvent(kXquartzActivate, 0);
-    } else {
+    }
+    else {
 
-        if(darwin_all_modifier_flags)
+        if (darwin_all_modifier_flags)
             DarwinUpdateModKeys(0);
 
         DarwinInputReleaseButtonsAndKeys(darwinKeyboard);
@@ -218,238 +232,270 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
     _x_active = state;
 }
 
-- (void) became_key:(NSWindow *)win {
-	[self activateX:NO];
+ -(void) became_key:(NSWindow *) win {
+ [self activateX:NO];
 }
 
-- (void) sendEvent:(NSEvent *)e {
+ -(void) sendEvent:(NSEvent *) e {
     OSX_BOOL for_appkit, for_x;
-    
+
     /* By default pass down the responder chain and to X. */
     for_appkit = YES;
     for_x = YES;
-    
+
     switch ([e type]) {
-        case NSLeftMouseDown: case NSRightMouseDown: case NSOtherMouseDown:
-        case NSLeftMouseUp: case NSRightMouseUp: case NSOtherMouseUp:
-            if ([e window] != nil) {
-                /* Pointer event has an (AppKit) window. Probably something for the kit. */
-                for_x = NO;
-                if (_x_active) [self activateX:NO];
-            } else if ([self modalWindow] == nil) {
-                /* Must be an X window. Tell appkit it doesn't have focus. */
-                for_appkit = NO;
-                
-                if ([self isActive]) {
-                    [self deactivate];
-                    if (!_x_active && quartzProcs->IsX11Window([e windowNumber]))
-                        [self activateX:YES];
-                }
+    case NSLeftMouseDown:
+    case NSRightMouseDown:
+    case NSOtherMouseDown:
+    case NSLeftMouseUp:
+    case NSRightMouseUp:
+    case NSOtherMouseUp:
+        if ([e window] != nil) {
+            /* Pointer event has an (AppKit) window. Probably something for the kit. */
+            for_x = NO;
+            if (_x_active)
+ [self activateX:NO];
+        }
+        else if ([self modalWindow] == nil) {
+            /* Must be an X window. Tell appkit it doesn't have focus. */
+            for_appkit = NO;
+
+            if ([self isActive]) {
+                [self deactivate];
+                if (!_x_active && quartzProcs->IsX11Window([e windowNumber]))
+ [self activateX:  YES];
             }
+        }
 
-            /* We want to force sending to appkit if we're over the menu bar */
-            if(!for_appkit) {
-                NSPoint NSlocation = [e locationInWindow];
-                NSWindow *window = [e window];
-                NSRect NSframe, NSvisibleFrame;
-                CGRect CGframe, CGvisibleFrame;
-                CGPoint CGlocation;
-
-                if (window != nil)	{
-                    NSRect frame = [window frame];
-                    NSlocation.x += frame.origin.x;
-                    NSlocation.y += frame.origin.y;
-                }
+        /* We want to force sending to appkit if we're over the menu bar */
+        if (!for_appkit) {
+            NSPoint NSlocation =[e locationInWindow];
+            NSWindow *window =[e window];
+            NSRect NSframe, NSvisibleFrame;
+            CGRect CGframe, CGvisibleFrame;
+            CGPoint CGlocation;
+
+            if (window != nil) {
+                NSRect frame =[window frame];
 
-                NSframe = [[NSScreen mainScreen] frame];
-                NSvisibleFrame = [[NSScreen mainScreen] visibleFrame];
-                
-                CGframe = CGRectMake(NSframe.origin.x, NSframe.origin.y,
-                                            NSframe.size.width, NSframe.size.height);
-                CGvisibleFrame = CGRectMake(NSvisibleFrame.origin.x,
-                                                   NSvisibleFrame.origin.y,
-                                                   NSvisibleFrame.size.width,
-                                                   NSvisibleFrame.size.height);
-                CGlocation = CGPointMake(NSlocation.x, NSlocation.y);
-                
-                if(CGRectContainsPoint(CGframe, CGlocation) &&
-                   !CGRectContainsPoint(CGvisibleFrame, CGlocation))
-                    for_appkit = YES;
+                NSlocation.x += frame.origin.x;
+                NSlocation.y += frame.origin.y;
             }
-            
-            break;
-            
-        case NSKeyDown: case NSKeyUp:
-            
-            if(_x_active) {
-                static BOOL do_swallow = NO;
-                static int swallow_keycode;
-                
-                if([e type] == NSKeyDown) {
-                    /* Before that though, see if there are any global
-                     * shortcuts bound to it. */
-
-                    if(darwinAppKitModMask & [e modifierFlags]) {
-                        /* Override to force sending to Appkit */
-                        swallow_keycode = [e keyCode];
-                        do_swallow = YES;
-                        for_x = NO;
+
+            NSframe =[[NSScreen mainScreen] frame];
+            NSvisibleFrame =[[NSScreen mainScreen] visibleFrame];
+
+            CGframe = CGRectMake(NSframe.origin.x, NSframe.origin.y,
+                                 NSframe.size.width, NSframe.size.height);
+            CGvisibleFrame = CGRectMake(NSvisibleFrame.origin.x,
+                                        NSvisibleFrame.origin.y,
+                                        NSvisibleFrame.size.width,
+                                        NSvisibleFrame.size.height);
+            CGlocation = CGPointMake(NSlocation.x, NSlocation.y);
+
+            if (CGRectContainsPoint(CGframe, CGlocation) &&
+                !CGRectContainsPoint(CGvisibleFrame, CGlocation))
+                for_appkit = YES;
+        }
+
+        break;
+
+    case NSKeyDown:
+    case NSKeyUp:
+
+        if (_x_active) {
+            static BOOL do_swallow = NO;
+            static int swallow_keycode;
+
+            if ([e type] == NSKeyDown) {
+                /* Before that though, see if there are any global
+                 * shortcuts bound to it. */
+
+                if (darwinAppKitModMask &[e modifierFlags]) {
+                    /* Override to force sending to Appkit */
+                    swallow_keycode =[e keyCode];
+                    do_swallow = YES;
+                    for_x = NO;
 #if XPLUGIN_VERSION >= 1
-                    } else if(XQuartzEnableKeyEquivalents &&
-                             xp_is_symbolic_hotkey_event([e eventRef])) {
-                        swallow_keycode = [e keyCode];
-                        do_swallow = YES;
-                        for_x = NO;
+                }
+                else if (XQuartzEnableKeyEquivalents &&
+                         xp_is_symbolic_hotkey_event([e eventRef])) {
+                    swallow_keycode =[e keyCode];
+                    do_swallow = YES;
+                    for_x = NO;
 #endif
-                    } else if(XQuartzEnableKeyEquivalents &&
-                              [[self mainMenu] performKeyEquivalent:e]) {
-                        swallow_keycode = [e keyCode];
-                        do_swallow = YES;
-                        for_appkit = NO;
-                        for_x = NO;
-                    } else if(!XQuartzIsRootless
-                              && ([e modifierFlags] & ALL_KEY_MASKS) == (NSCommandKeyMask | NSAlternateKeyMask)
-                              && ([e keyCode] == 0 /*a*/ || [e keyCode] == 53 /*Esc*/)) {
-                        /* We have this here to force processing fullscreen 
-                         * toggle even if XQuartzEnableKeyEquivalents is disabled */
-                        swallow_keycode = [e keyCode];
-                        do_swallow = YES;
-                        for_x = NO;
-                        for_appkit = NO;
-                        DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
-                    } else {
-                        /* No kit window is focused, so send it to X. */
-                        for_appkit = NO;
-                    }
-                } else { /* KeyUp */
-                    /* If we saw a key equivalent on the down, don't pass
-                     * the up through to X. */
-                    if (do_swallow && [e keyCode] == swallow_keycode) {
-                        do_swallow = NO;
-                        for_x = NO;
-                    }
                 }
-            } else { /* !_x_active */
-                for_x = NO;
+ else if (XQuartzEnableKeyEquivalents &&[[self mainMenu] performKeyEquivalent:e])
+                {
+                    swallow_keycode =[e keyCode];
+                    do_swallow = YES;
+                    for_appkit = NO;
+                    for_x = NO;
+                }
+                else if (!XQuartzIsRootless
+                         && ([e modifierFlags] & ALL_KEY_MASKS) ==
+                         (NSCommandKeyMask | NSAlternateKeyMask)
+                         && ([e keyCode] == 0 /*a */  ||
+                             [e keyCode] == 53 /*Esc */ )) {
+                    /* We have this here to force processing fullscreen 
+                     * toggle even if XQuartzEnableKeyEquivalents is disabled */
+                    swallow_keycode =[e keyCode];
+                    do_swallow = YES;
+                    for_x = NO;
+                    for_appkit = NO;
+                    DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
+                }
+                else {
+                    /* No kit window is focused, so send it to X. */
+                    for_appkit = NO;
+                }
+            }
+            else {              /* KeyUp */
+                /* If we saw a key equivalent on the down, don't pass
+                 * the up through to X. */
+                if (do_swallow &&[e keyCode] == swallow_keycode) {
+                    do_swallow = NO;
+                    for_x = NO;
+                }
+            }
+        }
+        else {                  /* !_x_active */
+            for_x = NO;
+        }
+        break;
+
+    case NSFlagsChanged:
+        /* Don't tell X11 about modifiers changing while it's not active */
+        if (!_x_active)
+            for_x = NO;
+        break;
+
+    case NSAppKitDefined:
+        switch ([e subtype]) {
+            static BOOL x_was_active = NO;
+
+        case NSApplicationActivatedEventType:
+            for_x = NO;
+            if ([e window] == nil && x_was_active) {
+                BOOL order_all_windows = YES, workspaces, ok;
+
+                for_appkit = NO;
+
+                /* FIXME: This is a hack to avoid passing the event to AppKit which
+                 *        would result in it raising one of its windows.
+                 */
+                _appFlags._active = YES;
+
+ [self set_front_process:nil];
+
+                /* Get the Spaces preference for SwitchOnActivate */
+                (void) CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));
+                workspaces =
+                    CFPreferencesGetAppBooleanValue(CFSTR("workspaces"),
+                                                    CFSTR("com.apple.dock"),
+                                                    &ok);
+                if (!ok)
+                    workspaces = NO;
+
+                if (workspaces) {
+                    (void)
+                        CFPreferencesAppSynchronize(CFSTR
+                                                    (".GlobalPreferences"));
+                    order_all_windows =
+                        CFPreferencesGetAppBooleanValue(CFSTR
+                                                        ("AppleSpacesSwitchOnActivate"),
+                                                        CFSTR
+                                                        (".GlobalPreferences"),
+                                                        &ok);
+                    if (!ok)
+                        order_all_windows = YES;
+                }
+
+                /* TODO: In the workspaces && !AppleSpacesSwitchOnActivate case, the windows are ordered
+                 *       correctly, but we need to activate the top window on this space if there is
+                 *       none active.
+                 *
+                 *       If there are no active windows, and there are minimized windows, we should
+                 *       be restoring one of them.
+                 */
+                if ([e data2] & 0x10) { // 0x10 (bfCPSOrderAllWindowsForward) is set when we use cmd-tab or the dock icon
+                    DarwinSendDDXEvent(kXquartzBringAllToFront, 1,
+                                       order_all_windows);
+                }
             }
             break;
-            
-        case NSFlagsChanged:
-            /* Don't tell X11 about modifiers changing while it's not active */
-            if (!_x_active)
-                for_x = NO;
+
+        case 18:               /* ApplicationDidReactivate */
+            if (XQuartzFullscreenVisible)
+                for_appkit = NO;
             break;
-            
-        case NSAppKitDefined:
-            switch ([e subtype]) {
-                static BOOL x_was_active = NO;
 
-                case NSApplicationActivatedEventType:
-                    for_x = NO;
-                    if ([e window] == nil && x_was_active) {
-                        BOOL order_all_windows = YES, workspaces, ok;
-                        for_appkit = NO;
-
-                        /* FIXME: This is a hack to avoid passing the event to AppKit which
-                         *        would result in it raising one of its windows.
-                         */
-                        _appFlags._active = YES;
-
-                        [self set_front_process:nil];
-
-                        /* Get the Spaces preference for SwitchOnActivate */
-                        (void)CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));
-                        workspaces = CFPreferencesGetAppBooleanValue(CFSTR("workspaces"), CFSTR("com.apple.dock"), &ok);
-                        if (!ok)
-                            workspaces = NO;
-
-                        if (workspaces) {
-                            (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
-                            order_all_windows = CFPreferencesGetAppBooleanValue(CFSTR("AppleSpacesSwitchOnActivate"), CFSTR(".GlobalPreferences"), &ok);
-                            if (!ok)
-                                order_all_windows = YES;
-                        }
-                        
-                        /* TODO: In the workspaces && !AppleSpacesSwitchOnActivate case, the windows are ordered
-                         *       correctly, but we need to activate the top window on this space if there is
-                         *       none active.
-                         *
-                         *       If there are no active windows, and there are minimized windows, we should
-                         *       be restoring one of them.
-                         */
-                        if ([e data2] & 0x10) { // 0x10 (bfCPSOrderAllWindowsForward) is set when we use cmd-tab or the dock icon
-                            DarwinSendDDXEvent(kXquartzBringAllToFront, 1, order_all_windows);
-                        }
-                    }
-                    break;
-                    
-                case 18: /* ApplicationDidReactivate */
-                    if (XQuartzFullscreenVisible) for_appkit = NO;
-                    break;
-                    
-                case NSApplicationDeactivatedEventType:
-                    for_x = NO;
+        case NSApplicationDeactivatedEventType:
+            for_x = NO;
 
-                    x_was_active = _x_active;
-                    if(_x_active)
-                        [self activateX:NO];
-                    break;
-            }
+            x_was_active = _x_active;
+            if (_x_active)
+ [self activateX:NO];
             break;
-            
-        default: break; /* for gcc */
+        }
+        break;
+
+    default:
+        break;                  /* for gcc */
     }
-    
-    if (for_appkit) [super sendEvent:e];
-    
+
+    if (for_appkit)
+ [super sendEvent:e];
+
     if (for_x) {
 #ifdef HAVE_LIBDISPATCH
-        dispatch_async(eventTranslationQueue, ^{
+        dispatch_async(eventTranslationQueue, ^ {
 #endif
-            [self sendX11NSEvent:e];
+ [self sendX11NSEvent:e];
 #ifdef HAVE_LIBDISPATCH
-        });
+                       }
+        );
 #endif
     }
 }
 
-- (void) set_window_menu:(NSArray *)list {
-	[_controller set_window_menu:list];
+ -(void) set_window_menu:(NSArray *) list {
+ [_controller set_window_menu:list];
 }
 
-- (void) set_window_menu_check:(NSNumber *)n {
-	[_controller set_window_menu_check:n];
+ -(void) set_window_menu_check:(NSNumber *) n {
+ [_controller set_window_menu_check:n];
 }
 
-- (void) set_apps_menu:(NSArray *)list {
-	[_controller set_apps_menu:list];
+ -(void) set_apps_menu:(NSArray *) list {
+ [_controller set_apps_menu:list];
 }
 
-- (void) set_front_process:unused {
-	[NSApp activateIgnoringOtherApps:YES];
+ -(void) set_front_process:unused {
+ [NSApp activateIgnoringOtherApps:YES];
 
-	if ([self modalWindow] == nil)
-		[self activateX:YES];
+    if ([self modalWindow] == nil)
+ [self activateX:YES];
 }
 
-- (void) set_can_quit:(NSNumber *)state {
-	[_controller set_can_quit:[state boolValue]];
+ -(void) set_can_quit:(NSNumber *) state {
+ [_controller set_can_quit:[state boolValue]];
 }
 
-- (void) server_ready:unused {
-	[_controller server_ready];
+ -(void) server_ready:unused {
+    [_controller server_ready];
 }
 
-- (void) show_hide_menubar:(NSNumber *)state {
+ -(void) show_hide_menubar:(NSNumber *) state {
     /* Also shows/hides the dock */
     if ([state boolValue])
-        SetSystemUIMode(kUIModeNormal, 0); 
+        SetSystemUIMode(kUIModeNormal, 0);
     else
-        SetSystemUIMode(kUIModeAllHidden, XQuartzFullscreenMenu ? kUIOptionAutoShowMenuBar : 0); // kUIModeAllSuppressed or kUIOptionAutoShowMenuBar can be used to allow "mouse-activation"
+        SetSystemUIMode(kUIModeAllHidden, XQuartzFullscreenMenu ? kUIOptionAutoShowMenuBar : 0);        // kUIModeAllSuppressed or kUIOptionAutoShowMenuBar can be used to allow "mouse-activation"
 }
 
-- (void) launch_client:(NSString *)cmd {
-    (void)[_controller application:self openFile:cmd];
+ -(void) launch_client:(NSString *) cmd {
+ (void)[_controller application: self openFile:cmd];
 }
 
 /* user preferences */
@@ -457,457 +503,524 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 /* Note that these functions only work for arrays whose elements
  can be toll-free-bridged between NS and CF worlds. */
 
-static const void *cfretain (CFAllocatorRef a, const void *b) {
-    return CFRetain (b);
+static const void *
+cfretain(CFAllocatorRef a, const void *b)
+{
+    return CFRetain(b);
 }
 
-static void cfrelease (CFAllocatorRef a, const void *b) {
-    CFRelease (b);
+static void
+cfrelease(CFAllocatorRef a, const void *b)
+{
+    CFRelease(b);
 }
 
-static CFMutableArrayRef nsarray_to_cfarray (NSArray *in) {
-	CFMutableArrayRef out;
-	CFArrayCallBacks cb;
-	NSObject *ns;
-	const CFTypeRef *cf;
-	int i, count;
+static CFMutableArrayRef
+nsarray_to_cfarray(NSArray * in)
+{
+    CFMutableArrayRef out;
+    CFArrayCallBacks cb;
+    NSObject *ns;
+    const CFTypeRef *cf;
+    int i, count;
+
+    memset(&cb, 0, sizeof(cb));
+    cb.version = 0;
+    cb.retain = cfretain;
+    cb.release = cfrelease;
+
+    count =[in count];
+    out = CFArrayCreateMutable(NULL, count, &cb);
+
+    for (i = 0; i < count; i++) {
+ ns =[in objectAtIndex:i];
+
+ if ([ns isKindOfClass:[NSArray class]])
+            cf = (CFTypeRef) nsarray_to_cfarray((NSArray *) ns);
+        else
+            cf = CFRetain((CFTypeRef) ns);
+
+        CFArrayAppendValue(out, cf);
+        CFRelease(cf);
+    }
+
+    return out;
+}
 
-	memset (&cb, 0, sizeof (cb));
-	cb.version = 0;
-	cb.retain = cfretain;
-	cb.release = cfrelease;
+static NSMutableArray *
+cfarray_to_nsarray(CFArrayRef in)
+{
+    NSMutableArray *out;
+    const CFTypeRef *cf;
+    NSObject *ns;
+    int i, count;
 
-	count = [in count];
-	out = CFArrayCreateMutable (NULL, count, &cb);
+    count = CFArrayGetCount(in);
+ out =[[NSMutableArray alloc] initWithCapacity:count];
 
-	for (i = 0; i < count; i++) {
-		ns = [in objectAtIndex:i];
+    for (i = 0; i < count; i++) {
+        cf = CFArrayGetValueAtIndex(in, i);
 
-		if ([ns isKindOfClass:[NSArray class]])
-			cf = (CFTypeRef) nsarray_to_cfarray ((NSArray *) ns);
-		else
-			cf = CFRetain ((CFTypeRef) ns);
+        if (CFGetTypeID(cf) == CFArrayGetTypeID())
+            ns = cfarray_to_nsarray((CFArrayRef) cf);
+        else
+            ns =[(id) cf retain];
 
-		CFArrayAppendValue (out, cf);
-		CFRelease (cf);
-	}
+ [out addObject:ns];
+        [ns release];
+    }
 
-	return out;
+    return out;
 }
 
-static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
-	NSMutableArray *out;
-	const CFTypeRef *cf;
-	NSObject *ns;
-	int i, count;
+ -(CFPropertyListRef) prefs_get_copy:(NSString *) key {
+    CFPropertyListRef value;
 
-	count = CFArrayGetCount (in);
-	out = [[NSMutableArray alloc] initWithCapacity:count];
+    value =
+        CFPreferencesCopyAppValue((CFStringRef) key, app_prefs_domain_cfstr);
 
-	for (i = 0; i < count; i++) {
-		cf = CFArrayGetValueAtIndex (in, i);
+    if (value == NULL) {
+        static CFDictionaryRef defaults;
+
+        if (defaults == NULL) {
+            CFStringRef error = NULL;
+            CFDataRef data;
+            CFURLRef url;
+            SInt32 error_code;
+
+            url = (CFURLCreateFromFileSystemRepresentation
+                   (NULL, (unsigned char *) DEFAULTS_FILE,
+                    strlen(DEFAULTS_FILE), false));
+            if (CFURLCreateDataAndPropertiesFromResource
+                (NULL, url, &data, NULL, NULL, &error_code)) {
+                defaults =
+                    (CFPropertyListCreateFromXMLData
+                     (NULL, data, kCFPropertyListMutableContainersAndLeaves,
+                      &error));
+                if (error != NULL)
+                    CFRelease(error);
+                CFRelease(data);
+            }
+            CFRelease(url);
+
+            if (defaults != NULL) {
+                NSMutableArray *apps, *elt;
+                int count, i;
+                NSString *name, *nname;
+
+                /* Localize the names in the default apps menu. */
+
+ apps =[(NSDictionary *) defaults objectForKey:@PREFS_APPSMENU];
+                if (apps != nil) {
+                    count =[apps count];
+                    for (i = 0; i < count; i++) {
+ elt =[apps objectAtIndex:i];
+ if (elt != nil &&[elt isKindOfClass:[NSArray class]]) {
+ name =[elt objectAtIndex: 0];
+                            if (name != nil) {
+                                nname = NSLocalizedString(name, nil);
+                                if (nname != nil && nname != name)
+ [elt replaceObjectAtIndex: 0 withObject:nname];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (defaults != NULL)
+            value = CFDictionaryGetValue(defaults, key);
+        if (value != NULL)
+            CFRetain(value);
+    }
+
+    return value;
+}
 
-		if (CFGetTypeID (cf) == CFArrayGetTypeID ())
-			ns = cfarray_to_nsarray ((CFArrayRef) cf);
-		else
-			ns = [(id)cf retain];
+ -(int) prefs_get_integer:(NSString *)
+key default:(int) def
+{
+    CFPropertyListRef value;
+    int ret;
 
-		[out addObject:ns];
-		[ns release];
-	}
+ value =[self prefs_get_copy:key];
+
+    if (value != NULL && CFGetTypeID(value) == CFNumberGetTypeID())
+        CFNumberGetValue(value, kCFNumberIntType, &ret);
+    else if (value != NULL && CFGetTypeID(value) == CFStringGetTypeID())
+        ret = CFStringGetIntValue(value);
+    else
+        ret = def;
 
-	return out;
+    if (value != NULL)
+        CFRelease(value);
+
+    return ret;
 }
 
-- (CFPropertyListRef) prefs_get_copy:(NSString *)key {
+ -(const char *) prefs_get_string:(NSString *)
+key default:(const char *) def
+{
     CFPropertyListRef value;
-	
-    value = CFPreferencesCopyAppValue ((CFStringRef) key, app_prefs_domain_cfstr);
-	
-    if (value == NULL) {
-      static CFDictionaryRef defaults;
-      
-      if (defaults == NULL) {
-	CFStringRef error = NULL;
-	CFDataRef data;
-	CFURLRef url;
-	SInt32 error_code;
-	
-	url = (CFURLCreateFromFileSystemRepresentation
-	       (NULL, (unsigned char *)DEFAULTS_FILE, strlen (DEFAULTS_FILE), false));
-	if (CFURLCreateDataAndPropertiesFromResource (NULL, url, &data,
-						      NULL, NULL, &error_code)) {
-	  defaults = (CFPropertyListCreateFromXMLData
-		      (NULL, data, kCFPropertyListMutableContainersAndLeaves, &error));
-	  if (error != NULL) CFRelease (error);
-	  CFRelease (data);
-	}
-	CFRelease (url);
-			
-	if (defaults != NULL) {
-	  NSMutableArray *apps, *elt;
-	  int count, i;
-	  NSString *name, *nname;
-	  
-	  /* Localize the names in the default apps menu. */
-	  
-	  apps = [(NSDictionary *)defaults objectForKey:@PREFS_APPSMENU];
-	  if (apps != nil) {
-	    count = [apps count];
-	    for (i = 0; i < count; i++)	{
-	      elt = [apps objectAtIndex:i];
-	      if (elt != nil && [elt isKindOfClass:[NSArray class]]) {
-		name = [elt objectAtIndex:0];
-		if (name != nil) {
-		  nname = NSLocalizedString (name, nil);
-		  if (nname != nil && nname != name)
-		    [elt replaceObjectAtIndex:0 withObject:nname];
-		}
-	      }
-	    }
-	  }
-	}
-      }
-		
-      if (defaults != NULL) value = CFDictionaryGetValue (defaults, key);
-      if (value != NULL) CFRetain (value);
+    const char *ret = NULL;
+
+ value =[self prefs_get_copy:key];
+
+    if (value != NULL && CFGetTypeID(value) == CFStringGetTypeID()) {
+        NSString *s = (NSString *) value;
+
+        ret =[s UTF8String];
     }
-	
-    return value;
-}
 
-- (int) prefs_get_integer:(NSString *)key default:(int)def {
-  CFPropertyListRef value;
-  int ret;
-  
-  value = [self prefs_get_copy:key];
-  
-  if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())
-    CFNumberGetValue (value, kCFNumberIntType, &ret);
-  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())
-    ret = CFStringGetIntValue (value);
-  else
-    ret = def;
-  
-  if (value != NULL) CFRelease (value);
-  
-  return ret;
-}
+    if (value != NULL)
+        CFRelease(value);
 
-- (const char *) prefs_get_string:(NSString *)key default:(const char *)def {
-  CFPropertyListRef value;
-  const char *ret = NULL;
-  
-  value = [self prefs_get_copy:key];
-  
-  if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
-    NSString *s = (NSString *) value;
-    
-    ret = [s UTF8String];
-  }
-  
-  if (value != NULL) CFRelease (value);
-  
-  return ret != NULL ? ret : def;
+    return ret != NULL ? ret : def;
 }
 
-- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def {
+ -(NSURL *) prefs_copy_url:(NSString *)
+key default:(NSURL *) def
+{
     CFPropertyListRef value;
     NSURL *ret = NULL;
-    
-    value = [self prefs_get_copy:key];
-    
-    if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
+
+ value =[self prefs_get_copy:key];
+
+    if (value != NULL && CFGetTypeID(value) == CFStringGetTypeID()) {
         NSString *s = (NSString *) value;
 
-        ret = [NSURL URLWithString:s];
+ ret =[NSURL URLWithString:s];
         [ret retain];
     }
-    
-    if (value != NULL) CFRelease (value);
-    
+
+    if (value != NULL)
+        CFRelease(value);
+
     return ret != NULL ? ret : def;
 }
 
-- (float) prefs_get_float:(NSString *)key default:(float)def {
-  CFPropertyListRef value;
-  float ret = def;
-  
-  value = [self prefs_get_copy:key];
-  
-  if (value != NULL
-      && CFGetTypeID (value) == CFNumberGetTypeID ()
-      && CFNumberIsFloatType (value))
-    CFNumberGetValue (value, kCFNumberFloatType, &ret);
-  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())
-    ret = CFStringGetDoubleValue (value);
-	
-  if (value != NULL) CFRelease (value);
-  
-  return ret;
+ -(float) prefs_get_float:(NSString *)
+key default:(float) def
+{
+    CFPropertyListRef value;
+    float ret = def;
+
+ value =[self prefs_get_copy:key];
+
+    if (value != NULL && CFGetTypeID(value) == CFNumberGetTypeID()
+        && CFNumberIsFloatType(value))
+        CFNumberGetValue(value, kCFNumberFloatType, &ret);
+    else if (value != NULL && CFGetTypeID(value) == CFStringGetTypeID())
+        ret = CFStringGetDoubleValue(value);
+
+    if (value != NULL)
+        CFRelease(value);
+
+    return ret;
 }
 
-- (int) prefs_get_boolean:(NSString *)key default:(int)def {
-  CFPropertyListRef value;
-  int ret = def;
-  
-  value = [self prefs_get_copy:key];
-  
-  if (value != NULL) {
-    if (CFGetTypeID (value) == CFNumberGetTypeID ())
-      CFNumberGetValue (value, kCFNumberIntType, &ret);
-    else if (CFGetTypeID (value) == CFBooleanGetTypeID ())
-      ret = CFBooleanGetValue (value);
-    else if (CFGetTypeID (value) == CFStringGetTypeID ()) {
-      const char *tem = [(NSString *) value UTF8String];
-      if (strcasecmp (tem, "true") == 0 || strcasecmp (tem, "yes") == 0)
-	ret = YES;
-      else
-	ret = NO;
+ -(int) prefs_get_boolean:(NSString *)
+key default:(int) def
+{
+    CFPropertyListRef value;
+    int ret = def;
+
+ value =[self prefs_get_copy:key];
+
+    if (value != NULL) {
+        if (CFGetTypeID(value) == CFNumberGetTypeID())
+            CFNumberGetValue(value, kCFNumberIntType, &ret);
+        else if (CFGetTypeID(value) == CFBooleanGetTypeID())
+            ret = CFBooleanGetValue(value);
+        else if (CFGetTypeID(value) == CFStringGetTypeID()) {
+            const char *tem =[(NSString *) value UTF8String];
+
+            if (strcasecmp(tem, "true") == 0 || strcasecmp(tem, "yes") == 0)
+                ret = YES;
+            else
+                ret = NO;
+        }
+
+        CFRelease(value);
     }
-    
-    CFRelease (value);
-  }
-  return ret;
+    return ret;
 }
 
-- (NSArray *) prefs_get_array:(NSString *)key {
-  NSArray *ret = nil;
-  CFPropertyListRef value;
-  
-  value = [self prefs_get_copy:key];
-  
-  if (value != NULL) {
-    if (CFGetTypeID (value) == CFArrayGetTypeID ())
-      ret = [cfarray_to_nsarray (value) autorelease];
-    
-    CFRelease (value);
-  }
-  
-  return ret;
+ -(NSArray *) prefs_get_array:(NSString *) key {
+    NSArray *ret = nil;
+    CFPropertyListRef value;
+
+ value =[self prefs_get_copy:key];
+
+    if (value != NULL) {
+        if (CFGetTypeID(value) == CFArrayGetTypeID())
+            ret =[cfarray_to_nsarray(value) autorelease];
+
+        CFRelease(value);
+    }
+
+    return ret;
 }
 
-- (void) prefs_set_integer:(NSString *)key value:(int)value {
+ -(void) prefs_set_integer:(NSString *)
+key value:(int) value
+{
     CFNumberRef x;
-	
-    x = CFNumberCreate (NULL, kCFNumberIntType, &value);
-	
-    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,
-			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
-	
-    CFRelease (x);
+
+    x = CFNumberCreate(NULL, kCFNumberIntType, &value);
+
+    CFPreferencesSetValue((CFStringRef) key, (CFTypeRef) x,
+                          app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
+                          kCFPreferencesAnyHost);
+
+    CFRelease(x);
 }
 
-- (void) prefs_set_float:(NSString *)key value:(float)value {
+ -(void) prefs_set_float:(NSString *)
+key value:(float) value
+{
     CFNumberRef x;
-	
-    x = CFNumberCreate (NULL, kCFNumberFloatType, &value);
-	
-    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,
-			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
-	
-    CFRelease (x);
+
+    x = CFNumberCreate(NULL, kCFNumberFloatType, &value);
+
+    CFPreferencesSetValue((CFStringRef) key, (CFTypeRef) x,
+                          app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
+                          kCFPreferencesAnyHost);
+
+    CFRelease(x);
 }
 
-- (void) prefs_set_boolean:(NSString *)key value:(int)value {
-  CFPreferencesSetValue ((CFStringRef) key,
-			 (CFTypeRef) (value ? kCFBooleanTrue
-			 : kCFBooleanFalse), app_prefs_domain_cfstr,
-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
-  
+ -(void) prefs_set_boolean:(NSString *)
+key value:(int) value
+{
+    CFPreferencesSetValue((CFStringRef) key,
+                          (CFTypeRef) (value ? kCFBooleanTrue
+                                       : kCFBooleanFalse),
+                          app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
+                          kCFPreferencesAnyHost);
+
 }
 
-- (void) prefs_set_array:(NSString *)key value:(NSArray *)value {
-  CFArrayRef cfarray;
-  
-  cfarray = nsarray_to_cfarray (value);
-  CFPreferencesSetValue ((CFStringRef) key,
-			 (CFTypeRef) cfarray,
-			 app_prefs_domain_cfstr,
-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
-  CFRelease (cfarray);
+ -(void) prefs_set_array:(NSString *)
+key value:(NSArray *) value
+{
+    CFArrayRef cfarray;
+
+    cfarray = nsarray_to_cfarray(value);
+    CFPreferencesSetValue((CFStringRef) key,
+                          (CFTypeRef) cfarray,
+                          app_prefs_domain_cfstr,
+                          kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+    CFRelease(cfarray);
 }
 
-- (void) prefs_set_string:(NSString *)key value:(NSString *)value {
-  CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) value,
-			 app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
-			 kCFPreferencesAnyHost);
+ -(void) prefs_set_string:(NSString *)
+key value:(NSString *) value
+{
+    CFPreferencesSetValue((CFStringRef) key, (CFTypeRef) value,
+                          app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
+                          kCFPreferencesAnyHost);
 }
 
-- (void) prefs_synchronize {
-    CFPreferencesAppSynchronize (kCFPreferencesCurrentApplication);
+-(void) prefs_synchronize {
+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
 }
 
-- (void) read_defaults
-{
+-(void) read_defaults {
     NSString *nsstr;
     const char *tem;
-	
-    XQuartzRootlessDefault = [self prefs_get_boolean:@PREFS_ROOTLESS
-                                           default:XQuartzRootlessDefault];
-    XQuartzFullscreenMenu = [self prefs_get_boolean:@PREFS_FULLSCREEN_MENU
-                                           default:XQuartzFullscreenMenu];
-    XQuartzFullscreenDisableHotkeys = ![self prefs_get_boolean:@PREFS_FULLSCREEN_HOTKEYS
-                                                      default:!XQuartzFullscreenDisableHotkeys];
-    darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS
-                                        default:darwinFakeButtons];
-    XQuartzOptionSendsAlt = [self prefs_get_boolean:@PREFS_OPTION_SENDS_ALT
-                                           default:XQuartzOptionSendsAlt];
+
+XQuartzRootlessDefault =[self prefs_get_boolean: @PREFS_ROOTLESS default:
+XQuartzRootlessDefault];
+XQuartzFullscreenMenu =[self prefs_get_boolean: @PREFS_FULLSCREEN_MENU default:
+XQuartzFullscreenMenu];
+XQuartzFullscreenDisableHotkeys = ![self prefs_get_boolean: @PREFS_FULLSCREEN_HOTKEYS default:
+!XQuartzFullscreenDisableHotkeys];
+darwinFakeButtons =[self prefs_get_boolean: @PREFS_FAKEBUTTONS default:
+darwinFakeButtons];
+XQuartzOptionSendsAlt =[self prefs_get_boolean: @PREFS_OPTION_SENDS_ALT default:
+XQuartzOptionSendsAlt];
 
     if (darwinFakeButtons) {
         const char *fake2, *fake3;
 
-        fake2 = [self prefs_get_string:@PREFS_FAKE_BUTTON2 default:NULL];
-        fake3 = [self prefs_get_string:@PREFS_FAKE_BUTTON3 default:NULL];
+fake2 =[self prefs_get_string: @PREFS_FAKE_BUTTON2 default:
+NULL];
+fake3 =[self prefs_get_string: @PREFS_FAKE_BUTTON3 default:
+NULL];
 
-        if (fake2 != NULL) darwinFakeMouse2Mask = DarwinParseModifierList(fake2, TRUE);
-        if (fake3 != NULL) darwinFakeMouse3Mask = DarwinParseModifierList(fake3, TRUE);
+        if (fake2 != NULL)
+            darwinFakeMouse2Mask = DarwinParseModifierList(fake2, TRUE);
+        if (fake3 != NULL)
+            darwinFakeMouse3Mask = DarwinParseModifierList(fake3, TRUE);
     }
 
-    tem = [self prefs_get_string:@PREFS_APPKIT_MODIFIERS default:NULL];
-    if (tem != NULL) darwinAppKitModMask = DarwinParseModifierList(tem, TRUE);
-	
-    tem = [self prefs_get_string:@PREFS_WINDOW_ITEM_MODIFIERS default:NULL];
+tem =[self prefs_get_string: @PREFS_APPKIT_MODIFIERS default:
+NULL];
+    if (tem != NULL)
+        darwinAppKitModMask = DarwinParseModifierList(tem, TRUE);
+
+tem =[self prefs_get_string: @PREFS_WINDOW_ITEM_MODIFIERS default:
+NULL];
     if (tem != NULL) {
         windowItemModMask = DarwinParseModifierList(tem, FALSE);
-    } else {
-        nsstr = NSLocalizedString (@"window item modifiers", @"window item modifiers");
-        if(nsstr != NULL) {
-            tem = [nsstr UTF8String];
-            if((tem != NULL) && strcmp(tem, "window item modifiers")) {
+    }
+    else {
+        nsstr =
+            NSLocalizedString(@"window item modifiers",
+                              @"window item modifiers");
+        if (nsstr != NULL) {
+            tem =[nsstr UTF8String];
+            if ((tem != NULL) && strcmp(tem, "window item modifiers")) {
                 windowItemModMask = DarwinParseModifierList(tem, FALSE);
             }
         }
     }
 
-    XQuartzEnableKeyEquivalents = [self prefs_get_boolean:@PREFS_KEYEQUIVS
-                                              default:XQuartzEnableKeyEquivalents];
-	
-    darwinSyncKeymap = [self prefs_get_boolean:@PREFS_SYNC_KEYMAP
-                                       default:darwinSyncKeymap];
-		
-    darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH
-                                         default:darwinDesiredDepth];
-    
-    noTestExtensions = ![self prefs_get_boolean:@PREFS_TEST_EXTENSIONS
-                                        default:FALSE];
-    
-    XQuartzScrollInDeviceDirection = [self prefs_get_boolean:@PREFS_SCROLL_IN_DEV_DIRECTION
-                                                     default:XQuartzScrollInDeviceDirection];
+XQuartzEnableKeyEquivalents =[self prefs_get_boolean: @PREFS_KEYEQUIVS default:
+XQuartzEnableKeyEquivalents];
+
+darwinSyncKeymap =[self prefs_get_boolean: @PREFS_SYNC_KEYMAP default:
+darwinSyncKeymap];
+
+darwinDesiredDepth =[self prefs_get_integer: @PREFS_DEPTH default:
+darwinDesiredDepth];
+
+noTestExtensions = ![self prefs_get_boolean: @PREFS_TEST_EXTENSIONS default:
+FALSE];
+
+XQuartzScrollInDeviceDirection =[self prefs_get_boolean: @PREFS_SCROLL_IN_DEV_DIRECTION default:
+XQuartzScrollInDeviceDirection];
 
 #if XQUARTZ_SPARKLE
-    NSURL *url =  [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];
-    if(url) {
-        [[SUUpdater sharedUpdater] setFeedURL:url];
+NSURL *url =[self prefs_copy_url: @PREFS_UPDATE_FEED default:
+nil];
+
+    if (url) {
+ [[SUUpdater sharedUpdater] setFeedURL:url];
         [url release];
     }
 #endif
 }
 
 /* This will end up at the end of the responder chain. */
-- (void) copy:sender {
-  DarwinSendDDXEvent(kXquartzPasteboardNotify, 1,
-			     AppleWMCopyToPasteboard);
+ -(void) copy:sender {
+    DarwinSendDDXEvent(kXquartzPasteboardNotify, 1, AppleWMCopyToPasteboard);
 }
 
-- (X11Controller *) controller {
+-(X11Controller *) controller {
     return _controller;
 }
 
-- (OSX_BOOL) x_active {
+-(OSX_BOOL) x_active {
     return _x_active;
 }
 
-@end
+@end static NSArray *
+array_with_strings_and_numbers(int nitems, const char **items,
+                               const char *numbers)
+{
+    NSMutableArray *array, *subarray;
+    NSString *string, *number;
+    int i;
 
-static NSArray *
-array_with_strings_and_numbers (int nitems, const char **items,
-				const char *numbers) {
-  NSMutableArray *array, *subarray;
-  NSString *string, *number;
-  int i;
-	
-  /* (Can't autorelease on the X server thread) */
-  
-  array = [[NSMutableArray alloc] initWithCapacity:nitems];
-  
-  for (i = 0; i < nitems; i++) {
-    subarray = [[NSMutableArray alloc] initWithCapacity:2];
-    
-    string = [[NSString alloc] initWithUTF8String:items[i]];
-    [subarray addObject:string];
-    [string release];
-    
-    if (numbers[i] != 0) {
-      number = [[NSString alloc] initWithFormat:@"%d", numbers[i]];
-      [subarray addObject:number];
-      [number release];
-    } else
-      [subarray addObject:@""];
-    
-    [array addObject:subarray];
-    [subarray release];
-  }
-  
-  return array;
+    /* (Can't autorelease on the X server thread) */
+
+ array =[[NSMutableArray alloc] initWithCapacity:nitems];
+
+    for (i = 0; i < nitems; i++) {
+ subarray =[[NSMutableArray alloc] initWithCapacity:2];
+
+ string =[[NSString alloc] initWithUTF8String:items[i]];
+ [subarray addObject:string];
+        [string release];
+
+        if (numbers[i] != 0) {
+ number =[[NSString alloc] initWithFormat:@"%d", numbers[i]];
+ [subarray addObject:number];
+            [number release];
+        }
+        else
+ [subarray addObject:@""];
+
+ [array addObject:subarray];
+        [subarray release];
+    }
+
+    return array;
 }
 
-void X11ApplicationSetWindowMenu (int nitems, const char **items,
-				  const char *shortcuts) {
-  NSArray *array;
-  array = array_with_strings_and_numbers (nitems, items, shortcuts);
-  
-  /* Send the array of strings over to the appkit thread */
-  
-  message_kit_thread (@selector (set_window_menu:), array);
-  [array release];
+void
+X11ApplicationSetWindowMenu(int nitems, const char **items,
+                            const char *shortcuts)
+{
+    NSArray *array;
+
+    array = array_with_strings_and_numbers(nitems, items, shortcuts);
+
+    /* Send the array of strings over to the appkit thread */
+
+ message_kit_thread(@selector(set_window_menu:), array);
+    [array release];
 }
 
-void X11ApplicationSetWindowMenuCheck (int idx) {
-  NSNumber *n;
-  
-  n = [[NSNumber alloc] initWithInt:idx];
-  
-  message_kit_thread (@selector (set_window_menu_check:), n);
-  
-  [n release];
+void
+X11ApplicationSetWindowMenuCheck(int idx)
+{
+    NSNumber *n;
+
+ n =[[NSNumber alloc] initWithInt:idx];
+
+ message_kit_thread(@selector(set_window_menu_check:), n);
+
+    [n release];
 }
 
-void X11ApplicationSetFrontProcess (void) {
-    message_kit_thread (@selector (set_front_process:), nil);
+void
+X11ApplicationSetFrontProcess(void)
+{
+ message_kit_thread(@selector(set_front_process:), nil);
 }
 
-void X11ApplicationSetCanQuit (int state) {
+void
+X11ApplicationSetCanQuit(int state)
+{
     NSNumber *n;
-	
-    n = [[NSNumber alloc] initWithBool:state];
-	
-    message_kit_thread (@selector (set_can_quit:), n);
-	
+
+ n =[[NSNumber alloc] initWithBool:state];
+
+ message_kit_thread(@selector(set_can_quit:), n);
+
     [n release];
 }
 
-void X11ApplicationServerReady (void) {
-    message_kit_thread (@selector (server_ready:), nil);
+void
+X11ApplicationServerReady(void)
+{
+ message_kit_thread(@selector(server_ready:), nil);
 }
 
-void X11ApplicationShowHideMenubar (int state) {
+void
+X11ApplicationShowHideMenubar(int state)
+{
     NSNumber *n;
-	
-    n = [[NSNumber alloc] initWithBool:state];
-	
-    message_kit_thread (@selector (show_hide_menubar:), n);
-	
+
+ n =[[NSNumber alloc] initWithBool:state];
+
+ message_kit_thread(@selector(show_hide_menubar:), n);
+
     [n release];
 }
 
-void X11ApplicationLaunchClient (const char *cmd) {
+void
+X11ApplicationLaunchClient(const char *cmd)
+{
     NSString *string;
-    
-    string = [[NSString alloc] initWithUTF8String:cmd];
-	
-    message_kit_thread (@selector (launch_client:), string);
-	
+
+ string =[[NSString alloc] initWithUTF8String:cmd];
+
+ message_kit_thread(@selector(launch_client:), string);
+
     [string release];
 }
 
@@ -915,112 +1028,135 @@ void X11ApplicationLaunchClient (const char *cmd) {
  * not the AppKit thread.  We want to block entering a screen-capturing RandR
  * mode until we notify the user about how to get out if the X11 client crashes.
  */
-Bool X11ApplicationCanEnterRandR(void) {
+Bool
+X11ApplicationCanEnterRandR(void)
+{
     NSString *title, *msg;
-    
-    if([X11App prefs_get_boolean:@PREFS_NO_RANDR_ALERT default:NO] || XQuartzShieldingWindowLevel != 0)
+
+if ([X11App prefs_get_boolean: @PREFS_NO_RANDR_ALERT default:
+NO] || XQuartzShieldingWindowLevel != 0)
         return TRUE;
-    
-    title = NSLocalizedString(@"Enter RandR mode?", @"Dialog title when switching to RandR");
-    msg = NSLocalizedString(@"An application has requested X11 to change the resolution of your display.  X11 will restore the display to its previous state when the requesting application requests to return to the previous state.  Alternatively, you can use the ⌥⌘A key sequence to force X11 to return to the previous state.",
-                            @"Dialog when switching to RandR");
 
-    if(!XQuartzIsRootless)
+    title =
+        NSLocalizedString(@"Enter RandR mode?",
+                          @"Dialog title when switching to RandR");
+    msg =
+        NSLocalizedString
+        (@"An application has requested X11 to change the resolution of your display.  X11 will restore the display to its previous state when the requesting application requests to return to the previous state.  Alternatively, you can use the ⌥⌘A key sequence to force X11 to return to the previous state.",
+         @"Dialog when switching to RandR");
+
+    if (!XQuartzIsRootless)
         QuartzShowFullscreen(FALSE);
-    
-    switch(NSRunAlertPanel(title, msg, NSLocalizedString(@"Allow", @""), NSLocalizedString (@"Cancel", @""), NSLocalizedString (@"Always Allow", @""))) {
-        case NSAlertOtherReturn:
-            [X11App prefs_set_boolean:@PREFS_NO_RANDR_ALERT value:YES];
-            [X11App prefs_synchronize];
-        case NSAlertDefaultReturn:
-            return YES;
 
-        default:
-            return NO;
+    switch (NSRunAlertPanel
+            (title, msg, NSLocalizedString(@"Allow", @""),
+             NSLocalizedString(@"Cancel", @""),
+             NSLocalizedString(@"Always Allow", @""))) {
+    case NSAlertOtherReturn:
+ [X11App prefs_set_boolean: @PREFS_NO_RANDR_ALERT value:YES];
+        [X11App prefs_synchronize];
+    case NSAlertDefaultReturn:
+        return YES;
+
+    default:
+        return NO;
     }
 }
 
-static void check_xinitrc (void) {
+static void
+check_xinitrc(void)
+{
     char *tem, buf[1024];
     NSString *msg;
-	
-    if ([X11App prefs_get_boolean:@PREFS_DONE_XINIT_CHECK default:NO])
-		return;
-	
-    tem = getenv ("HOME");
-    if (tem == NULL) goto done;
-	
-    snprintf (buf, sizeof (buf), "%s/.xinitrc", tem);
-    if (access (buf, F_OK) != 0)
-		goto done;
-	
-    msg = NSLocalizedString (@"You have an existing ~/.xinitrc file.\n\n\
+
+if ([X11App prefs_get_boolean: @PREFS_DONE_XINIT_CHECK default:
+NO])
+        return;
+
+    tem = getenv("HOME");
+    if (tem == NULL)
+        goto done;
+
+    snprintf(buf, sizeof(buf), "%s/.xinitrc", tem);
+    if (access(buf, F_OK) != 0)
+        goto done;
+
+    msg = NSLocalizedString(@"You have an existing ~/.xinitrc file.\n\n\
 Windows displayed by X11 applications may not have titlebars, or may look \
 different to windows displayed by native applications.\n\n\
 Would you like to move aside the existing file and use the standard X11 \
 environment the next time you start X11?", @"Startup xinitrc dialog");
 
-    if(NSAlertDefaultReturn == NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),
-                                                NSLocalizedString (@"No", @""), nil)) {
+    if (NSAlertDefaultReturn ==
+        NSRunAlertPanel(nil, msg, NSLocalizedString(@"Yes", @""),
+                        NSLocalizedString(@"No", @""), nil)) {
         char buf2[1024];
         int i = -1;
-      
-        snprintf (buf2, sizeof (buf2), "%s.old", buf);
-      
-        for(i = 1; access (buf2, F_OK) == 0; i++)
-            snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);
 
-        rename (buf, buf2);
+        snprintf(buf2, sizeof(buf2), "%s.old", buf);
+
+        for (i = 1; access(buf2, F_OK) == 0; i++)
+            snprintf(buf2, sizeof(buf2), "%s.old.%d", buf, i);
+
+        rename(buf, buf2);
     }
-    
+
  done:
-    [X11App prefs_set_boolean:@PREFS_DONE_XINIT_CHECK value:YES];
+ [X11App prefs_set_boolean: @PREFS_DONE_XINIT_CHECK value:YES];
     [X11App prefs_synchronize];
 }
 
-static inline pthread_t create_thread(void *(*func)(void *), void *arg) {
+static inline pthread_t
+create_thread(void *(*func) (void *), void *arg)
+{
     pthread_attr_t attr;
     pthread_t tid;
-    
+
     pthread_attr_init(&attr);
     pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
     pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
     pthread_create(&tid, &attr, func, arg);
     pthread_attr_destroy(&attr);
-    
+
     return tid;
 }
 
-static void *xpbproxy_x_thread(void *args) {
+static void *
+xpbproxy_x_thread(void *args)
+{
     xpbproxy_run();
 
     ErrorF("xpbproxy thread is terminating unexpectedly.\n");
     return NULL;
 }
 
-void X11ApplicationMain (int argc, char **argv, char **envp) {
+void
+X11ApplicationMain(int argc, char **argv, char **envp)
+{
     NSAutoreleasePool *pool;
 
 #ifdef DEBUG
-    while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);
+    while (access("/tmp/x11-block", F_OK) == 0)
+        sleep(1);
 #endif
-  
-    pool = [[NSAutoreleasePool alloc] init];
-    X11App = (X11Application *) [X11Application sharedApplication];
-    init_ports ();
-    
-    app_prefs_domain_cfstr = (CFStringRef)[[NSBundle mainBundle] bundleIdentifier];
+
+    pool =[[NSAutoreleasePool alloc] init];
+    X11App = (X11Application *)[X11Application sharedApplication];
+    init_ports();
+
+    app_prefs_domain_cfstr =
+        (CFStringRef)[[NSBundle mainBundle] bundleIdentifier];
 
     if (app_prefs_domain_cfstr == NULL) {
-        ErrorF("X11ApplicationMain: Unable to determine bundle identifier.  Your installation of XQuartz may be broken.\n");
-        app_prefs_domain_cfstr = CFSTR(BUNDLE_ID_PREFIX".X11");
+        ErrorF
+            ("X11ApplicationMain: Unable to determine bundle identifier.  Your installation of XQuartz may be broken.\n");
+        app_prefs_domain_cfstr = CFSTR(BUNDLE_ID_PREFIX ".X11");
     }
 
     [NSApp read_defaults];
-    [NSBundle loadNibNamed:@"main" owner:NSApp];
-    [[NSNotificationCenter defaultCenter] addObserver:NSApp
-					selector:@selector (became_key:)
-					name:NSWindowDidBecomeKeyNotification object:nil];
+ [NSBundle loadNibNamed: @"main" owner:NSApp];
+ [[NSNotificationCenter defaultCenter] addObserver: NSApp selector: @selector(became_key:)
+ name: NSWindowDidBecomeKeyNotification object:nil];
 
     /*
      * The xpr Quartz mode is statically linked into this server.
@@ -1030,23 +1166,27 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
 
     /* Calculate the height of the menubar so we can avoid it. */
     aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
-    NSMaxY([[NSScreen mainScreen] visibleFrame]);
+        NSMaxY([[NSScreen mainScreen] visibleFrame]);
 
 #ifdef HAVE_LIBDISPATCH
-    eventTranslationQueue = dispatch_queue_create(BUNDLE_ID_PREFIX".X11.NSEventsToX11EventsQueue", NULL);
+    eventTranslationQueue =
+        dispatch_queue_create(BUNDLE_ID_PREFIX ".X11.NSEventsToX11EventsQueue",
+                              NULL);
     assert(eventTranslationQueue != NULL);
 #endif
-    
+
     /* Set the key layout seed before we start the server */
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-    last_key_layout = TISCopyCurrentKeyboardLayoutInputSource();    
+    last_key_layout = TISCopyCurrentKeyboardLayoutInputSource();
 
-    if(!last_key_layout)
-        ErrorF("X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n");
+    if (!last_key_layout)
+        ErrorF
+            ("X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n");
 #else
     KLGetCurrentKeyboardLayout(&last_key_layout);
-    if(!last_key_layout)
-        ErrorF("X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n");
+    if (!last_key_layout)
+        ErrorF
+            ("X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n");
 #endif
 
     if (!QuartsResyncKeymap(FALSE)) {
@@ -1055,12 +1195,12 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
 
     /* Tell the server thread that it can proceed */
     QuartzInitServer(argc, argv, envp);
-    
+
     /* This must be done after QuartzInitServer because it can result in
      * an mieqEnqueue() - <rdar://problem/6300249>
      */
     check_xinitrc();
-    
+
     create_thread(xpbproxy_x_thread, NULL);
 
 #if XQUARTZ_SPARKLE
@@ -1074,149 +1214,177 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
     /* not reached */
 }
 
-@implementation X11Application (Private)
-
+@implementation X11Application(Private)
 #ifdef NX_DEVICELCMDKEYMASK
 /* This is to workaround a bug in the VNC server where we sometimes see the L
  * modifier and sometimes see no "side"
  */
-static inline int ensure_flag(int flags, int device_independent, int device_dependents, int device_dependent_default) {
-    if( (flags & device_independent) &&
-       !(flags & device_dependents))
+static inline int
+ensure_flag(int flags, int device_independent, int device_dependents,
+            int device_dependent_default)
+{
+    if ((flags & device_independent) && !(flags & device_dependents))
         flags |= device_dependent_default;
     return flags;
 }
 #endif
 
 #ifdef DEBUG_UNTRUSTED_POINTER_DELTA
-static const char *untrusted_str(NSEvent *e) {
-    switch([e type]) {
-        case NSScrollWheel:
-            return "NSScrollWheel";
-        case NSTabletPoint:
-            return "NSTabletPoint";
-        case NSOtherMouseDown:
-            return "NSOtherMouseDown";
-        case NSOtherMouseUp:
-            return "NSOtherMouseUp";
-        case NSLeftMouseDown:
-            return "NSLeftMouseDown";
-        case NSLeftMouseUp:
-            return "NSLeftMouseUp";
+static const char *
+untrusted_str(NSEvent * e)
+{
+    switch ([e type]) {
+    case NSScrollWheel:
+        return "NSScrollWheel";
+    case NSTabletPoint:
+        return "NSTabletPoint";
+    case NSOtherMouseDown:
+        return "NSOtherMouseDown";
+    case NSOtherMouseUp:
+        return "NSOtherMouseUp";
+    case NSLeftMouseDown:
+        return "NSLeftMouseDown";
+    case NSLeftMouseUp:
+        return "NSLeftMouseUp";
+    default:
+        switch ([e subtype]) {
+        case NSTabletPointEventSubtype:
+            return "NSTabletPointEventSubtype";
+        case NSTabletProximityEventSubtype:
+            return "NSTabletProximityEventSubtype";
         default:
-            switch([e subtype]) {
-                case NSTabletPointEventSubtype:
-                    return "NSTabletPointEventSubtype";
-                case NSTabletProximityEventSubtype:
-                    return "NSTabletProximityEventSubtype";
-                default:
-                    return "Other";
-            }
+            return "Other";
+        }
     }
 }
 #endif
 
-- (void) sendX11NSEvent:(NSEvent *)e {
+ -(void) sendX11NSEvent:(NSEvent *) e {
     NSPoint location = NSZeroPoint;
     int ev_button, ev_type;
-    static float pressure = 0.0;       // static so ProximityOut will have the value from the previous tablet event
-    static NSPoint tilt;               // static so ProximityOut will have the value from the previous tablet event
+    static float pressure = 0.0;        // static so ProximityOut will have the value from the previous tablet event
+    static NSPoint tilt;        // static so ProximityOut will have the value from the previous tablet event
     static DeviceIntPtr darwinTabletCurrent = NULL;
-    static BOOL needsProximityIn = NO; // Do we do need to handle a pending ProximityIn once we have pressure/tilt?
+    static BOOL needsProximityIn = NO;  // Do we do need to handle a pending ProximityIn once we have pressure/tilt?
     DeviceIntPtr pDev;
     int modifierFlags;
     BOOL isMouseOrTabletEvent, isTabletEvent;
 
 #ifdef HAVE_LIBDISPATCH
     static dispatch_once_t once_pred;
-    dispatch_once(&once_pred, ^{
-        tilt = NSZeroPoint;
-        darwinTabletCurrent = darwinTabletStylus;
-    });
+
+    dispatch_once(&once_pred, ^ {
+                  tilt = NSZeroPoint;
+                  darwinTabletCurrent = darwinTabletStylus;});
 #else
-    if(!darwinTabletCurrent) {
+    if (!darwinTabletCurrent) {
         tilt = NSZeroPoint;
         darwinTabletCurrent = darwinTabletStylus;
     }
 #endif
-    
-    isMouseOrTabletEvent =  [e type] == NSLeftMouseDown    ||  [e type] == NSOtherMouseDown    ||  [e type] == NSRightMouseDown    ||
-                            [e type] == NSLeftMouseUp      ||  [e type] == NSOtherMouseUp      ||  [e type] == NSRightMouseUp      ||
-                            [e type] == NSLeftMouseDragged ||  [e type] == NSOtherMouseDragged ||  [e type] == NSRightMouseDragged ||
-                            [e type] == NSMouseMoved       ||  [e type] == NSTabletPoint       ||  [e type] == NSScrollWheel;
+
+    isMouseOrTabletEvent =[e type] == NSLeftMouseDown ||
+        [e type] == NSOtherMouseDown ||[e type] == NSRightMouseDown ||
+        [e type] == NSLeftMouseUp ||[e type] == NSOtherMouseUp ||
+        [e type] == NSRightMouseUp ||[e type] == NSLeftMouseDragged ||
+        [e type] == NSOtherMouseDragged ||[e type] == NSRightMouseDragged ||
+        [e type] == NSMouseMoved ||[e type] == NSTabletPoint ||
+        [e type] == NSScrollWheel;
 
     isTabletEvent = ([e type] == NSTabletPoint) ||
-                    (isMouseOrTabletEvent && ([e subtype] == NSTabletPointEventSubtype || [e subtype] == NSTabletProximityEventSubtype));
+        (isMouseOrTabletEvent &&
+         ([e subtype] == NSTabletPointEventSubtype ||
+          [e subtype] == NSTabletProximityEventSubtype));
 
-    if(isMouseOrTabletEvent) {
+    if (isMouseOrTabletEvent) {
         static NSPoint lastpt;
-        NSWindow *window = [e window];
-        NSRect screen = [[[NSScreen screens] objectAtIndex:0] frame];
-	    BOOL hasUntrustedPointerDelta;
-        
+        NSWindow *window =[e window];
+ NSRect screen =[[[NSScreen screens] objectAtIndex:0] frame];
+        BOOL hasUntrustedPointerDelta;
+
         // NSEvents for tablets are not consistent wrt deltaXY between events, so we cannot rely on that
         // Thus tablets will be subject to the warp-pointer bug worked around by the delta, but tablets
         // are not normally used in cases where that bug would present itself, so this is a fair tradeoff
         // <rdar://problem/7111003> deltaX and deltaY are incorrect for NSMouseMoved, NSTabletPointEventSubtype
         // http://xquartz.macosforge.org/trac/ticket/288
         hasUntrustedPointerDelta = isTabletEvent;
-        
+
         // The deltaXY for middle click events also appear erroneous after fast user switching
         // <rdar://problem/7979468> deltaX and deltaY are incorrect for NSOtherMouseDown and NSOtherMouseUp after FUS
         // http://xquartz.macosforge.org/trac/ticket/389
-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSOtherMouseDown || [e type] == NSOtherMouseUp;
+        hasUntrustedPointerDelta = hasUntrustedPointerDelta ||
+            [e type] == NSOtherMouseDown ||[e type] == NSOtherMouseUp;
 
         // The deltaXY for scroll events correspond to the scroll delta, not the pointer delta
         // <rdar://problem/7989690> deltaXY for wheel events are being sent as mouse movement
-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSScrollWheel;
+        hasUntrustedPointerDelta = hasUntrustedPointerDelta ||
+            [e type] == NSScrollWheel;
 
 #ifdef DEBUG_UNTRUSTED_POINTER_DELTA
-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSLeftMouseDown || [e type] == NSLeftMouseUp;
+        hasUntrustedPointerDelta = hasUntrustedPointerDelta ||
+            [e type] == NSLeftMouseDown ||[e type] == NSLeftMouseUp;
 #endif
-        
-        if (window != nil)	{
-            NSRect frame = [window frame];
-            location = [e locationInWindow];
+
+        if (window != nil) {
+            NSRect frame =[window frame];
+
+            location =[e locationInWindow];
             location.x += frame.origin.x;
             location.y += frame.origin.y;
             lastpt = location;
-        } else if(hasUntrustedPointerDelta) {
+        }
+        else if (hasUntrustedPointerDelta) {
 #ifdef DEBUG_UNTRUSTED_POINTER_DELTA
             ErrorF("--- Begin Event Debug ---\n");
             ErrorF("Event type: %s\n", untrusted_str(e));
             ErrorF("old lastpt: (%0.2f, %0.2f)\n", lastpt.x, lastpt.y);
-            ErrorF("     delta: (%0.2f, %0.2f)\n", [e deltaX], -[e deltaY]);
-            ErrorF("  location: (%0.2f, %0.2f)\n", lastpt.x + [e deltaX], lastpt.y - [e deltaY]);
-            ErrorF("workaround: (%0.2f, %0.2f)\n", [e locationInWindow].x, [e locationInWindow].y);
+            ErrorF("     delta: (%0.2f, %0.2f)\n",[e deltaX], -[e deltaY]);
+            ErrorF("  location: (%0.2f, %0.2f)\n", lastpt.x +[e deltaX],
+                   lastpt.y -[e deltaY]);
+            ErrorF("workaround: (%0.2f, %0.2f)\n",[e locationInWindow].x,
+                   [e locationInWindow].y);
             ErrorF("--- End Event Debug ---\n");
 
-            location.x = lastpt.x + [e deltaX];
-            location.y = lastpt.y - [e deltaY];
-            lastpt = [e locationInWindow];
+            location.x = lastpt.x +[e deltaX];
+            location.y = lastpt.y -[e deltaY];
+            lastpt =[e locationInWindow];
 #else
-            location = [e locationInWindow];
+            location =[e locationInWindow];
             lastpt = location;
 #endif
-        } else {
-            location.x = lastpt.x + [e deltaX];
-            location.y = lastpt.y - [e deltaY];
-            lastpt = [e locationInWindow];
         }
-        
+        else {
+            location.x = lastpt.x +[e deltaX];
+            location.y = lastpt.y -[e deltaY];
+            lastpt =[e locationInWindow];
+        }
+
         /* Convert coordinate system */
         location.y = (screen.origin.y + screen.size.height) - location.y;
     }
-    
-    modifierFlags = [e modifierFlags];
-    
+
+    modifierFlags =[e modifierFlags];
+
 #ifdef NX_DEVICELCMDKEYMASK
     /* This is to workaround a bug in the VNC server where we sometimes see the L
      * modifier and sometimes see no "side"
      */
-    modifierFlags = ensure_flag(modifierFlags, NX_CONTROLMASK,   NX_DEVICELCTLKEYMASK   | NX_DEVICERCTLKEYMASK,     NX_DEVICELCTLKEYMASK);
-    modifierFlags = ensure_flag(modifierFlags, NX_SHIFTMASK,     NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK,   NX_DEVICELSHIFTKEYMASK);
-    modifierFlags = ensure_flag(modifierFlags, NX_COMMANDMASK,   NX_DEVICELCMDKEYMASK   | NX_DEVICERCMDKEYMASK,     NX_DEVICELCMDKEYMASK);
-    modifierFlags = ensure_flag(modifierFlags, NX_ALTERNATEMASK, NX_DEVICELALTKEYMASK   | NX_DEVICERALTKEYMASK,     NX_DEVICELALTKEYMASK);
+    modifierFlags =
+        ensure_flag(modifierFlags, NX_CONTROLMASK,
+                    NX_DEVICELCTLKEYMASK | NX_DEVICERCTLKEYMASK,
+                    NX_DEVICELCTLKEYMASK);
+    modifierFlags =
+        ensure_flag(modifierFlags, NX_SHIFTMASK,
+                    NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK,
+                    NX_DEVICELSHIFTKEYMASK);
+    modifierFlags =
+        ensure_flag(modifierFlags, NX_COMMANDMASK,
+                    NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK,
+                    NX_DEVICELCMDKEYMASK);
+    modifierFlags =
+        ensure_flag(modifierFlags, NX_ALTERNATEMASK,
+                    NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK,
+                    NX_DEVICELALTKEYMASK);
 #endif
 
     modifierFlags &= darwin_all_modifier_mask;
@@ -1225,192 +1393,236 @@ static const char *untrusted_str(NSEvent *e) {
      * emulation mucks this up, so we need to check our modifier flag state
      * on every event... ugg
      */
-    
-    if(darwin_all_modifier_flags != modifierFlags)
+
+    if (darwin_all_modifier_flags != modifierFlags)
         DarwinUpdateModKeys(modifierFlags);
-    
-	switch ([e type]) {
-		case NSLeftMouseDown:     ev_button=1; ev_type=ButtonPress;   goto handle_mouse;
-		case NSOtherMouseDown:    ev_button=2; ev_type=ButtonPress;   goto handle_mouse;
-		case NSRightMouseDown:    ev_button=3; ev_type=ButtonPress;   goto handle_mouse;
-		case NSLeftMouseUp:       ev_button=1; ev_type=ButtonRelease; goto handle_mouse;
-		case NSOtherMouseUp:      ev_button=2; ev_type=ButtonRelease; goto handle_mouse;
-		case NSRightMouseUp:      ev_button=3; ev_type=ButtonRelease; goto handle_mouse;
-		case NSLeftMouseDragged:  ev_button=1; ev_type=MotionNotify;  goto handle_mouse;
-		case NSOtherMouseDragged: ev_button=2; ev_type=MotionNotify;  goto handle_mouse;
-		case NSRightMouseDragged: ev_button=3; ev_type=MotionNotify;  goto handle_mouse;
-		case NSMouseMoved:        ev_button=0; ev_type=MotionNotify;  goto handle_mouse;
-        case NSTabletPoint:       ev_button=0; ev_type=MotionNotify;  goto handle_mouse;
-            
-        handle_mouse:
-            pDev = darwinPointer;
-
-            /* NSTabletPoint can have no subtype */
-            if([e type] != NSTabletPoint &&
-               [e subtype] == NSTabletProximityEventSubtype) {
-                switch([e pointingDeviceType]) {
-                    case NSEraserPointingDevice:
-                        darwinTabletCurrent=darwinTabletEraser;
-                        break;
-                    case NSPenPointingDevice:
-                        darwinTabletCurrent=darwinTabletStylus;
-                        break;
-                    case NSCursorPointingDevice:
-                    case NSUnknownPointingDevice:
-                    default:
-                        darwinTabletCurrent=darwinTabletCursor;
-                        break;
-                }
 
-                if([e isEnteringProximity])
-                    needsProximityIn = YES;
-                else
-                    DarwinSendProximityEvents(darwinTabletCurrent, ProximityOut,
-                                              location.x, location.y, pressure,
-                                              tilt.x, tilt.y);
-                return;
+    switch ([e type]) {
+    case NSLeftMouseDown:
+        ev_button = 1;
+        ev_type = ButtonPress;
+        goto handle_mouse;
+    case NSOtherMouseDown:
+        ev_button = 2;
+        ev_type = ButtonPress;
+        goto handle_mouse;
+    case NSRightMouseDown:
+        ev_button = 3;
+        ev_type = ButtonPress;
+        goto handle_mouse;
+    case NSLeftMouseUp:
+        ev_button = 1;
+        ev_type = ButtonRelease;
+        goto handle_mouse;
+    case NSOtherMouseUp:
+        ev_button = 2;
+        ev_type = ButtonRelease;
+        goto handle_mouse;
+    case NSRightMouseUp:
+        ev_button = 3;
+        ev_type = ButtonRelease;
+        goto handle_mouse;
+    case NSLeftMouseDragged:
+        ev_button = 1;
+        ev_type = MotionNotify;
+        goto handle_mouse;
+    case NSOtherMouseDragged:
+        ev_button = 2;
+        ev_type = MotionNotify;
+        goto handle_mouse;
+    case NSRightMouseDragged:
+        ev_button = 3;
+        ev_type = MotionNotify;
+        goto handle_mouse;
+    case NSMouseMoved:
+        ev_button = 0;
+        ev_type = MotionNotify;
+        goto handle_mouse;
+    case NSTabletPoint:
+        ev_button = 0;
+        ev_type = MotionNotify;
+        goto handle_mouse;
+
+ handle_mouse:
+        pDev = darwinPointer;
+
+        /* NSTabletPoint can have no subtype */
+        if ([e type] != NSTabletPoint &&
+            [e subtype] == NSTabletProximityEventSubtype) {
+            switch ([e pointingDeviceType]) {
+            case NSEraserPointingDevice:
+                darwinTabletCurrent = darwinTabletEraser;
+                break;
+            case NSPenPointingDevice:
+                darwinTabletCurrent = darwinTabletStylus;
+                break;
+            case NSCursorPointingDevice:
+            case NSUnknownPointingDevice:
+            default:
+                darwinTabletCurrent = darwinTabletCursor;
+                break;
             }
 
-			if ([e type] == NSTabletPoint || [e subtype] == NSTabletPointEventSubtype) {
-                pressure = [e pressure];
-                tilt     = [e tilt];
-                
-                pDev = darwinTabletCurrent;
-                
-                if(needsProximityIn) {
-                    DarwinSendProximityEvents(darwinTabletCurrent, ProximityIn,
-                                              location.x, location.y, pressure,
-                                              tilt.x, tilt.y);
-
-                    needsProximityIn = NO;
-                }
+            if ([e isEnteringProximity])
+                needsProximityIn = YES;
+            else
+                DarwinSendProximityEvents(darwinTabletCurrent, ProximityOut,
+                                          location.x, location.y, pressure,
+                                          tilt.x, tilt.y);
+            return;
+        }
+
+        if ([e type] == NSTabletPoint ||
+            [e subtype] == NSTabletPointEventSubtype) {
+            pressure =[e pressure];
+            tilt =[e tilt];
+
+            pDev = darwinTabletCurrent;
+
+            if (needsProximityIn) {
+                DarwinSendProximityEvents(darwinTabletCurrent, ProximityIn,
+                                          location.x, location.y, pressure,
+                                          tilt.x, tilt.y);
+
+                needsProximityIn = NO;
             }
+        }
 
-            if(!XQuartzServerVisible && noTestExtensions) {
+        if (!XQuartzServerVisible && noTestExtensions) {
 #if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0
 /* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */
-                xp_window_id wid = 0;
-                xp_error err;
+            xp_window_id wid = 0;
+            xp_error err;
 
-                /* Sigh. Need to check that we're really over one of
-                 * our windows. (We need to receive pointer events while
-                 * not in the foreground, but we don't want to receive them
-                 * when another window is over us or we might show a tooltip)
-                 */
+            /* Sigh. Need to check that we're really over one of
+             * our windows. (We need to receive pointer events while
+             * not in the foreground, but we don't want to receive them
+             * when another window is over us or we might show a tooltip)
+             */
 
-                err = xp_find_window(location.x, location.y, 0, &wid);
+            err = xp_find_window(location.x, location.y, 0, &wid);
 
-                if (err != XP_Success || (err == XP_Success && wid == 0))
+            if (err != XP_Success || (err == XP_Success && wid == 0))
 #endif
-                {
-                    bgMouseLocation = location;
-                    bgMouseLocationUpdated = TRUE;
-                    return;
-                }
+            {
+                bgMouseLocation = location;
+                bgMouseLocationUpdated = TRUE;
+                return;
             }
-            
-            if(bgMouseLocationUpdated) {
-                if(!(ev_type == MotionNotify && ev_button == 0)) {
-                    DarwinSendPointerEvents(pDev, MotionNotify, 0, location.x,
-                                            location.y, pressure, tilt.x, tilt.y);
-                }
-                bgMouseLocationUpdated = FALSE;
+        }
+
+        if (bgMouseLocationUpdated) {
+            if (!(ev_type == MotionNotify && ev_button == 0)) {
+                DarwinSendPointerEvents(pDev, MotionNotify, 0, location.x,
+                                        location.y, pressure, tilt.x, tilt.y);
             }
+            bgMouseLocationUpdated = FALSE;
+        }
 
-            DarwinSendPointerEvents(pDev, ev_type, ev_button, location.x, location.y,
-                                    pressure, tilt.x, tilt.y);
-            
+        DarwinSendPointerEvents(pDev, ev_type, ev_button, location.x,
+                                location.y, pressure, tilt.x, tilt.y);
+
+        break;
+
+    case NSTabletProximity:
+        switch ([e pointingDeviceType]) {
+        case NSEraserPointingDevice:
+            darwinTabletCurrent = darwinTabletEraser;
             break;
-            
-		case NSTabletProximity:
-            switch([e pointingDeviceType]) {
-                case NSEraserPointingDevice:
-                    darwinTabletCurrent=darwinTabletEraser;
-                    break;
-                case NSPenPointingDevice:
-                    darwinTabletCurrent=darwinTabletStylus;
-                    break;
-                case NSCursorPointingDevice:
-                case NSUnknownPointingDevice:
-                default:
-                    darwinTabletCurrent=darwinTabletCursor;
-                    break;
-            }
-            
-            if([e isEnteringProximity])
-                needsProximityIn = YES;
-            else
-                DarwinSendProximityEvents(darwinTabletCurrent, ProximityOut,
-                                          location.x, location.y, pressure,
-                                          tilt.x, tilt.y);
+        case NSPenPointingDevice:
+            darwinTabletCurrent = darwinTabletStylus;
             break;
-            
-		case NSScrollWheel:
-            {
-                float deltaX = [e deltaX];
-                float deltaY = [e deltaY];
+        case NSCursorPointingDevice:
+        case NSUnknownPointingDevice:
+        default:
+            darwinTabletCurrent = darwinTabletCursor;
+            break;
+        }
+
+        if ([e isEnteringProximity])
+            needsProximityIn = YES;
+        else
+            DarwinSendProximityEvents(darwinTabletCurrent, ProximityOut,
+                                      location.x, location.y, pressure,
+                                      tilt.x, tilt.y);
+        break;
+
+    case NSScrollWheel:
+    {
+        float deltaX =[e deltaX];
+        float deltaY =[e deltaY];
+
 #if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0
-                /* If we're in the background, we need to send a MotionNotify event
-                * first, since we aren't getting them on background mouse motion
-                */
-                if(!XQuartzServerVisible && noTestExtensions) {
-                    bgMouseLocationUpdated = FALSE;
-                    DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, location.x,
-                                            location.y, pressure, tilt.x, tilt.y);
-                }
+        /* If we're in the background, we need to send a MotionNotify event
+         * first, since we aren't getting them on background mouse motion
+         */
+        if (!XQuartzServerVisible && noTestExtensions) {
+            bgMouseLocationUpdated = FALSE;
+            DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, location.x,
+                                    location.y, pressure, tilt.x, tilt.y);
+        }
 #endif
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
-                // TODO: Change 1117 to NSAppKitVersionNumber10_7 when it is defined
-                if(NSAppKitVersionNumber >= 1117 && XQuartzScrollInDeviceDirection && [e isDirectionInvertedFromDevice]) {
-                    deltaX *= -1;
-                    deltaY *= -1;
-                }
+        // TODO: Change 1117 to NSAppKitVersionNumber10_7 when it is defined
+        if (NSAppKitVersionNumber >= 1117 && XQuartzScrollInDeviceDirection &&
+            [e isDirectionInvertedFromDevice]) {
+            deltaX *= -1;
+            deltaY *= -1;
+        }
 #endif
-                DarwinSendScrollEvents(deltaX, deltaY, location.x, location.y,
-                                       pressure, tilt.x, tilt.y);
-                break;
-            }
-        case NSKeyDown: case NSKeyUp:
-            {
-                /* XKB clobbers our keymap at startup, so we need to force it on the first keypress.
-                 * TODO: Make this less of a kludge.
-                 */
-                static int force_resync_keymap = YES;
-                if(force_resync_keymap) {
-                    DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
-                    force_resync_keymap = NO;
-                }
-            }
+        DarwinSendScrollEvents(deltaX, deltaY, location.x, location.y,
+                               pressure, tilt.x, tilt.y);
+        break;
+    }
+    case NSKeyDown:
+    case NSKeyUp:
+    {
+        /* XKB clobbers our keymap at startup, so we need to force it on the first keypress.
+         * TODO: Make this less of a kludge.
+         */
+        static int force_resync_keymap = YES;
+
+        if (force_resync_keymap) {
+            DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
+            force_resync_keymap = NO;
+        }
+    }
 
-            if(darwinSyncKeymap) {
+        if (darwinSyncKeymap) {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-                TISInputSourceRef key_layout = TISCopyCurrentKeyboardLayoutInputSource();
-                TISInputSourceRef clear;
-                if (CFEqual(key_layout, last_key_layout)) {
-                    CFRelease(key_layout);
-                } else {
-                    /* Swap/free thread-safely */
-                    clear = last_key_layout;
-                    last_key_layout = key_layout;
-                    CFRelease(clear);
+            TISInputSourceRef key_layout =
+                TISCopyCurrentKeyboardLayoutInputSource();
+            TISInputSourceRef clear;
+
+            if (CFEqual(key_layout, last_key_layout)) {
+                CFRelease(key_layout);
+            }
+            else {
+                /* Swap/free thread-safely */
+                clear = last_key_layout;
+                last_key_layout = key_layout;
+                CFRelease(clear);
 #else
-                KeyboardLayoutRef key_layout;
-                KLGetCurrentKeyboardLayout(&key_layout);
-                if(key_layout != last_key_layout) {
-                    last_key_layout = key_layout;
+            KeyboardLayoutRef key_layout;
+
+            KLGetCurrentKeyboardLayout(&key_layout);
+            if (key_layout != last_key_layout) {
+                last_key_layout = key_layout;
 #endif
-                    /* Update keyInfo */
-                    if (!QuartsResyncKeymap(TRUE)) {
-                        ErrorF("sendX11NSEvent: Could not build a valid keymap.\n");
-                    }
+                /* Update keyInfo */
+                if (!QuartsResyncKeymap(TRUE)) {
+                    ErrorF("sendX11NSEvent: Could not build a valid keymap.\n");
                 }
             }
+        }
 
-            ev_type = ([e type] == NSKeyDown) ? KeyPress : KeyRelease;
-            DarwinSendKeyboardEvents(ev_type, [e keyCode]);
-            break;
-            
-        default: break; /* for gcc */
-	}	
+        ev_type = ([e type] == NSKeyDown) ? KeyPress : KeyRelease;
+        DarwinSendKeyboardEvents(ev_type,[e keyCode]);
+        break;
+
+    default:
+        break;                  /* for gcc */
+    }
 }
+
 @end
diff --git a/xorg-server/hw/xquartz/X11Controller.h b/xorg-server/hw/xquartz/X11Controller.h
index b9b1d4473..e7fcd453f 100644
--- a/xorg-server/hw/xquartz/X11Controller.h
+++ b/xorg-server/hw/xquartz/X11Controller.h
@@ -55,9 +55,9 @@ typedef unsigned int NSUInteger;
 #endif
 #endif
 
-@interface X11Controller : NSObject
+ @interface X11Controller:NSObject
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
-<NSTableViewDataSource>
+    < NSTableViewDataSource >
 #endif
 {
     IBOutlet NSPanel *prefs_panel;
@@ -85,6 +85,7 @@ typedef unsigned int NSUInteger;
     IBOutlet NSPopUpButton *depth;
 
     IBOutlet NSMenuItem *window_separator;
+
     // window_separator is DEPRECATED due to this radar:
     // <rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
     // It is kept around for localization compatability and is subject to removal "eventually"
@@ -94,6 +95,7 @@ typedef unsigned int NSUInteger;
     IBOutlet NSMenuItem *dock_window_separator;
     IBOutlet NSMenuItem *apps_separator;
     IBOutlet NSMenuItem *toggle_fullscreen_item;
+
 #ifdef XQUARTZ_SPARKLE
     NSMenuItem *check_for_updates_item; // Programatically enabled
 #endif
@@ -105,7 +107,7 @@ typedef unsigned int NSUInteger;
     NSMutableArray *table_apps;
 
     IBOutlet NSMenu *dock_menu;
-    
+
     // This is where in the Windows menu we'll start (this will be the index of the separator)
     NSInteger windows_menu_start;
 
@@ -116,39 +118,40 @@ typedef unsigned int NSUInteger;
     OSX_BOOL can_quit;
 }
 
-- (void) set_window_menu:(NSArray *)list;
-- (void) set_window_menu_check:(NSNumber *)n;
-- (void) set_apps_menu:(NSArray *)list;
+ -(void) set_window_menu:(NSArray *) list;
+ -(void) set_window_menu_check:(NSNumber *) n;
+ -(void) set_apps_menu:(NSArray *) list;
 #ifdef XQUARTZ_SPARKLE
-- (void) setup_sparkle;
-- (void) updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update;
+-(void) setup_sparkle;
+ -(void) updater:(SUUpdater *)
+updater willInstallUpdate:(SUAppcastItem *) update;
 #endif
-- (void) set_can_quit:(OSX_BOOL)state;
-- (void) server_ready;
-- (OSX_BOOL) application:(NSApplication *)app openFile:(NSString *)filename;
-
-- (IBAction) apps_table_show:(id)sender;
-- (IBAction) apps_table_done:(id)sender;
-- (IBAction) apps_table_new:(id)sender;
-- (IBAction) apps_table_duplicate:(id)sender;
-- (IBAction) apps_table_delete:(id)sender;
-- (IBAction) bring_to_front:(id)sender;
-- (IBAction) close_window:(id)sender;
-- (IBAction) minimize_window:(id)sender;
-- (IBAction) zoom_window:(id)sender;
-- (IBAction) next_window:(id)sender;
-- (IBAction) previous_window:(id)sender;
-- (IBAction) enable_fullscreen_changed:(id)sender;
-- (IBAction) toggle_fullscreen:(id)sender;
-- (IBAction) prefs_changed:(id)sender;
-- (IBAction) prefs_show:(id)sender;
-- (IBAction) quit:(id)sender;
-- (IBAction) x11_help:(id)sender;
+ -(void) set_can_quit:(OSX_BOOL) state;
+-(void) server_ready;
+ -(OSX_BOOL) application:(NSApplication *)
+app openFile:(NSString *) filename;
+
+ -(IBAction) apps_table_show:(id) sender;
+ -(IBAction) apps_table_done:(id) sender;
+ -(IBAction) apps_table_new:(id) sender;
+ -(IBAction) apps_table_duplicate:(id) sender;
+ -(IBAction) apps_table_delete:(id) sender;
+ -(IBAction) bring_to_front:(id) sender;
+ -(IBAction) close_window:(id) sender;
+ -(IBAction) minimize_window:(id) sender;
+ -(IBAction) zoom_window:(id) sender;
+ -(IBAction) next_window:(id) sender;
+ -(IBAction) previous_window:(id) sender;
+ -(IBAction) enable_fullscreen_changed:(id) sender;
+ -(IBAction) toggle_fullscreen:(id) sender;
+ -(IBAction) prefs_changed:(id) sender;
+ -(IBAction) prefs_show:(id) sender;
+ -(IBAction) quit:(id) sender;
+ -(IBAction) x11_help:(id) sender;
 
 @end
+#endif                          /* __OBJC__ */
+void
+X11ControllerMain(int argc, char **argv, char **envp);
 
-#endif /* __OBJC__ */
-
-void X11ControllerMain(int argc, char **argv, char **envp);
-
-#endif /* X11CONTROLLER_H */
+#endif                          /* X11CONTROLLER_H */
diff --git a/xorg-server/hw/xquartz/X11Controller.m b/xorg-server/hw/xquartz/X11Controller.m
index 3de4e139d..b0bfc5858 100644
--- a/xorg-server/hw/xquartz/X11Controller.m
+++ b/xorg-server/hw/xquartz/X11Controller.m
@@ -53,304 +53,277 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-@implementation X11Controller
+@ implementation X11Controller - (void) awakeFromNib {
+    X11Application *xapp = NSApp;
+    NSArray *array;
+
+    /* Point X11Application at ourself. */
+ [xapp set_controller:self];
+
+ array =[xapp prefs_get_array:@PREFS_APPSMENU];
+    if (array != nil) {
+        int count;
+
+        /* convert from [TITLE1 COMMAND1 TITLE2 COMMAND2 ...]
+           to [[TITLE1 COMMAND1] [TITLE2 COMMAND2] ...] format. */
+
+        count =[array count];
+ if (count > 0 && ![[array objectAtIndex: 0] isKindOfClass:[NSArray class]])
+        {
+            int i;
+            NSMutableArray *copy, *sub;
+
+ copy =[NSMutableArray arrayWithCapacity:(count / 2)];
+
+            for (i = 0; i < count / 2; i++) {
+ sub =[[NSMutableArray alloc] initWithCapacity:3];
+ [sub addObject: [array objectAtIndex:i * 2]];
+ [sub addObject: [array objectAtIndex:i * 2 + 1]];
+ [sub addObject:@""];
+ [copy addObject:sub];
+                [sub release];
+            }
+
+            array = copy;
+        }
+
+ [self set_apps_menu:array];
+    }
 
-- (void) awakeFromNib
-{
-  X11Application *xapp = NSApp;
-  NSArray *array;
-	
-  /* Point X11Application at ourself. */
-  [xapp set_controller:self];
-	
-  array = [xapp prefs_get_array:@PREFS_APPSMENU];
-  if (array != nil)
-    {
-      int count;
-		
-      /* convert from [TITLE1 COMMAND1 TITLE2 COMMAND2 ...]
-	 to [[TITLE1 COMMAND1] [TITLE2 COMMAND2] ...] format. */
-		
-      count = [array count];
-      if (count > 0
-	  && ![[array objectAtIndex:0] isKindOfClass:[NSArray class]])
-	{
-	  int i;
-	  NSMutableArray *copy, *sub;
-			
-	  copy = [NSMutableArray arrayWithCapacity:(count / 2)];
-			
-	  for (i = 0; i < count / 2; i++)
-	    {
-	      sub = [[NSMutableArray alloc] initWithCapacity:3];
-	      [sub addObject:[array objectAtIndex:i*2]];
-	      [sub addObject:[array objectAtIndex:i*2+1]];
-	      [sub addObject:@""];
-	      [copy addObject:sub];
-	      [sub release];
-	    }
-			
-	  array = copy;
-	}
-		
-      [self set_apps_menu:array];
-    }
-    
     [[NSNotificationCenter defaultCenter]
-     addObserver: self
-     selector: @selector(apps_table_done:)
-     name: NSWindowWillCloseNotification
-     object: [apps_table window]];
+ addObserver: self selector: @selector(apps_table_done:)
+ name: NSWindowWillCloseNotification object:[apps_table window]];
 
     // Setup data about our Windows menu
-    if(window_separator) {
-        [[window_separator menu] removeItem:window_separator];
+    if (window_separator) {
+ [[window_separator menu] removeItem:window_separator];
         window_separator = nil;
     }
-    
-    windows_menu_start = [[X11App windowsMenu] numberOfItems];
+
+    windows_menu_start =[[X11App windowsMenu] numberOfItems];
 }
 
-- (void) item_selected:sender
-{
-  [NSApp activateIgnoringOtherApps:YES];
-	
-  DarwinSendDDXEvent(kXquartzControllerNotify, 2,
-			     AppleWMWindowMenuItem, [sender tag]);
+ -(void) item_selected:sender {
+ [NSApp activateIgnoringOtherApps:YES];
+
+    DarwinSendDDXEvent(kXquartzControllerNotify, 2,
+                       AppleWMWindowMenuItem,[sender tag]);
 }
 
-- (void) remove_window_menu
-{
-  NSMenu *menu;
-  int count, i;
+-(void) remove_window_menu {
+    NSMenu *menu;
+    int count, i;
+
+    /* Work backwards so we don't mess up the indices */
+    menu =[X11App windowsMenu];
+    count =[menu numberOfItems];
+    for (i = count - 1; i >= windows_menu_start; i--)
+ [menu removeItemAtIndex:i];
 
-  /* Work backwards so we don't mess up the indices */
-  menu = [X11App windowsMenu];
-  count = [menu numberOfItems];
-  for (i = count - 1; i >= windows_menu_start; i--)
-    [menu removeItemAtIndex:i];
-	
-  count = [dock_menu indexOfItem:dock_window_separator];
-  for (i = 0; i < count; i++)
-    [dock_menu removeItemAtIndex:0];
+ count =[dock_menu indexOfItem:dock_window_separator];
+    for (i = 0; i < count; i++)
+ [dock_menu removeItemAtIndex:0];
 }
 
-- (void) install_window_menu:(NSArray *)list
-{
-  NSMenu *menu;
-  NSMenuItem *item;
-  int first, count, i;
-
-  menu = [X11App windowsMenu];
-  first = windows_menu_start + 1;
-  count = [list count];
-  
-  // Push a Separator
-  if(count) {
-      [menu addItem:[NSMenuItem separatorItem]];
-  }
-
-  for (i = 0; i < count; i++)
-    {
-      NSString *name, *shortcut;
-		
-      name = [[list objectAtIndex:i] objectAtIndex:0];
-      shortcut = [[list objectAtIndex:i] objectAtIndex:1];
-        
-      if(windowItemModMask == 0 || windowItemModMask == -1)
-          shortcut = @"";
-
-      item = (NSMenuItem *) [menu addItemWithTitle:name action:@selector
-				  (item_selected:) keyEquivalent:shortcut];
-      [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
-      [item setTarget:self];
-      [item setTag:i];
-      [item setEnabled:YES];
-
-      item = (NSMenuItem *) [dock_menu insertItemWithTitle:name
-				       action:@selector
-				       (item_selected:) keyEquivalent:shortcut
-				       atIndex:i];
-      [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
-      [item setTarget:self];
-      [item setTag:i];
-      [item setEnabled:YES];
-    }
-	
-  if (checked_window_item >= 0 && checked_window_item < count)
-    {
-      item = (NSMenuItem *) [menu itemAtIndex:first + checked_window_item];
-      [item setState:NSOnState];
-      item = (NSMenuItem *) [dock_menu itemAtIndex:checked_window_item];
-      [item setState:NSOnState];
-    }
-}
-
-- (void) remove_apps_menu
-{
-  NSMenu *menu;
-  NSMenuItem *item;
-  int i;
-	
-  if (apps == nil || apps_separator == nil) return;
-	
-  menu = [apps_separator menu];
-	
-  if (menu != nil)
-    {
-      for (i = [menu numberOfItems] - 1; i >= 0; i--)
-	{
-	  item = (NSMenuItem *) [menu itemAtIndex:i];
-	  if ([item tag] != 0)
-	    [menu removeItemAtIndex:i];
-	}
-    }
-    
-  if (dock_apps_menu != nil)
-    {
-      for (i = [dock_apps_menu numberOfItems] - 1; i >= 0; i--)
-	{
-	  item = (NSMenuItem *) [dock_apps_menu itemAtIndex:i];
-	  if ([item tag] != 0)
-	    [dock_apps_menu removeItemAtIndex:i];
-	}
-    }
-    
-  [apps release];
-  apps = nil;
-}
-
-- (void) prepend_apps_item:(NSArray *)list index:(int)i menu:(NSMenu *)menu
-{
-  NSString *title, *shortcut = @"";
-  NSArray *group;
-  NSMenuItem *item;
-	
-  group = [list objectAtIndex:i];
-  title = [group objectAtIndex:0];
-  if ([group count] >= 3)
-    shortcut = [group objectAtIndex:2];
-	
-  if ([title length] != 0)
-    {
-      item = (NSMenuItem *) [menu insertItemWithTitle:title
-				  action:@selector (app_selected:)
-				  keyEquivalent:shortcut atIndex:0];
-      [item setTarget:self];
-      [item setEnabled:YES];
-    }
-  else
-    {
-      item = (NSMenuItem *) [NSMenuItem separatorItem];
-      [menu insertItem:item atIndex:0];
-    }
-	
-  [item setTag:i+1];			/* can't be zero, so add one */
-}
-
-- (void) install_apps_menu:(NSArray *)list
-{
-  NSMenu *menu;
-  int i, count;
-	
-  count = [list count];
-	
-  if (count == 0 || apps_separator == nil) return;
-	
-  menu = [apps_separator menu];
-	
-  for (i = count - 1; i >= 0; i--)
-    {
-      if (menu != nil)
-	[self prepend_apps_item:list index:i menu:menu];
-      if (dock_apps_menu != nil)
-	[self prepend_apps_item:list index:i menu:dock_apps_menu];
-    }
-	
-  apps = [list retain];
-}
-
-- (void) set_window_menu:(NSArray *)list
-{
-  [self remove_window_menu];
-  [self install_window_menu:list];
-	
-  DarwinSendDDXEvent(kXquartzControllerNotify, 1,
-			     AppleWMWindowMenuNotify);
+ -(void) install_window_menu:(NSArray *) list {
+    NSMenu *menu;
+    NSMenuItem *item;
+    int first, count, i;
+
+    menu =[X11App windowsMenu];
+    first = windows_menu_start + 1;
+    count =[list count];
+
+    // Push a Separator
+    if (count) {
+ [menu addItem:[NSMenuItem separatorItem]];
+    }
+
+    for (i = 0; i < count; i++) {
+        NSString *name, *shortcut;
+
+ name =[[list objectAtIndex: i] objectAtIndex:0];
+ shortcut =[[list objectAtIndex: i] objectAtIndex:1];
+
+        if (windowItemModMask == 0 || windowItemModMask == -1)
+            shortcut = @"";
+
+ item = (NSMenuItem *)[menu addItemWithTitle: name action: @selector(item_selected: )keyEquivalent:shortcut];
+ [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
+ [item setTarget:self];
+ [item setTag:i];
+ [item setEnabled:YES];
+
+ item = (NSMenuItem *)[dock_menu insertItemWithTitle: name action: @selector(item_selected: )keyEquivalent: shortcut atIndex:i];
+ [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
+ [item setTarget:self];
+ [item setTag:i];
+ [item setEnabled:YES];
+    }
+
+    if (checked_window_item >= 0 && checked_window_item < count) {
+ item = (NSMenuItem *)[menu itemAtIndex:first + checked_window_item];
+ [item setState:NSOnState];
+ item = (NSMenuItem *)[dock_menu itemAtIndex:checked_window_item];
+ [item setState:NSOnState];
+    }
 }
 
-- (void) set_window_menu_check:(NSNumber *)nn
-{
-  NSMenu *menu;
-  NSMenuItem *item;
-  int first, count;
-  int n = [nn intValue];
-
-  menu = [X11App windowsMenu];
-  first = windows_menu_start + 1;
-  count = [menu numberOfItems] - first;
-	
-  if (checked_window_item >= 0 && checked_window_item < count)
-    {
-      item = (NSMenuItem *) [menu itemAtIndex:first + checked_window_item];
-      [item setState:NSOffState];
-      item = (NSMenuItem *) [dock_menu itemAtIndex:checked_window_item];
-      [item setState:NSOffState];
-    }
-  if (n >= 0 && n < count)
-    {
-      item = (NSMenuItem *) [menu itemAtIndex:first + n];
-      [item setState:NSOnState];
-      item = (NSMenuItem *) [dock_menu itemAtIndex:n];
-      [item setState:NSOnState];
-    }
-  checked_window_item = n;
-}
-
-- (void) set_apps_menu:(NSArray *)list
+-(void) remove_apps_menu {
+    NSMenu *menu;
+    NSMenuItem *item;
+    int i;
+
+    if (apps == nil || apps_separator == nil)
+        return;
+
+    menu =[apps_separator menu];
+
+    if (menu != nil) {
+        for (i =[menu numberOfItems] - 1; i >= 0; i--) {
+ item = (NSMenuItem *)[menu itemAtIndex:i];
+            if ([item tag] != 0)
+ [menu removeItemAtIndex:i];
+        }
+    }
+
+    if (dock_apps_menu != nil) {
+        for (i =[dock_apps_menu numberOfItems] - 1; i >= 0; i--) {
+ item = (NSMenuItem *)[dock_apps_menu itemAtIndex:i];
+            if ([item tag] != 0)
+ [dock_apps_menu removeItemAtIndex:i];
+        }
+    }
+
+    [apps release];
+    apps = nil;
+}
+
+ -(void) prepend_apps_item:(NSArray *)
+list index:(int)
+i menu:(NSMenu *) menu
 {
-  [self remove_apps_menu];
-  [self install_apps_menu:list];
+    NSString *title, *shortcut = @"";
+    NSArray *group;
+    NSMenuItem *item;
+
+ group =[list objectAtIndex:i];
+ title =[group objectAtIndex:0];
+    if ([group count] >= 3)
+ shortcut =[group objectAtIndex:2];
+
+    if ([title length] != 0) {
+ item = (NSMenuItem *)[menu insertItemWithTitle: title action: @selector(app_selected:)
+ keyEquivalent: shortcut atIndex:0];
+ [item setTarget:self];
+ [item setEnabled:YES];
+    }
+    else {
+        item = (NSMenuItem *)[NSMenuItem separatorItem];
+ [menu insertItem: item atIndex:0];
+    }
+
+ [item setTag:i + 1];          /* can't be zero, so add one */
+}
+
+ -(void) install_apps_menu:(NSArray *) list {
+    NSMenu *menu;
+    int i, count;
+
+    count =[list count];
+
+    if (count == 0 || apps_separator == nil)
+        return;
+
+    menu =[apps_separator menu];
+
+    for (i = count - 1; i >= 0; i--) {
+        if (menu != nil)
+ [self prepend_apps_item: list index: i menu:menu];
+        if (dock_apps_menu != nil)
+ [self prepend_apps_item: list index: i menu:dock_apps_menu];
+    }
+
+    apps =[list retain];
+}
+
+ -(void) set_window_menu:(NSArray *) list {
+    [self remove_window_menu];
+ [self install_window_menu:list];
+
+    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMWindowMenuNotify);
+}
+
+ -(void) set_window_menu_check:(NSNumber *) nn {
+    NSMenu *menu;
+    NSMenuItem *item;
+    int first, count;
+    int n =[nn intValue];
+
+    menu =[X11App windowsMenu];
+    first = windows_menu_start + 1;
+    count =[menu numberOfItems] - first;
+
+    if (checked_window_item >= 0 && checked_window_item < count) {
+ item = (NSMenuItem *)[menu itemAtIndex:first + checked_window_item];
+ [item setState:NSOffState];
+ item = (NSMenuItem *)[dock_menu itemAtIndex:checked_window_item];
+ [item setState:NSOffState];
+    }
+    if (n >= 0 && n < count) {
+ item = (NSMenuItem *)[menu itemAtIndex:first + n];
+ [item setState:NSOnState];
+ item = (NSMenuItem *)[dock_menu itemAtIndex:n];
+ [item setState:NSOnState];
+    }
+    checked_window_item = n;
+}
+
+ -(void) set_apps_menu:(NSArray *) list {
+    [self remove_apps_menu];
+ [self install_apps_menu:list];
 }
 
 #ifdef XQUARTZ_SPARKLE
-- (void) setup_sparkle {
-    if(check_for_updates_item)
-        return; // already did it...
+-(void) setup_sparkle {
+    if (check_for_updates_item)
+        return;                 // already did it...
 
-    NSMenu *menu = [x11_about_item menu];
+    NSMenu *menu =[x11_about_item menu];
 
-    check_for_updates_item = [menu insertItemWithTitle:NSLocalizedString(@"Check for X11 Updates...", @"Check for X11 Updates...")
-                                               action:@selector (checkForUpdates:)
-                                        keyEquivalent:@""
-                                              atIndex:1];
-    [check_for_updates_item setTarget:[SUUpdater sharedUpdater]];
-    [check_for_updates_item setEnabled:YES];
+ check_for_updates_item =[menu insertItemWithTitle:NSLocalizedString(@"Check for X11 Updates...",
+                      @"Check for X11 Updates...")
+ action: @selector(checkForUpdates:)
+ keyEquivalent: @"" atIndex:1];
+ [check_for_updates_item setTarget:[SUUpdater sharedUpdater]];
+ [check_for_updates_item setEnabled:YES];
 
     // Set X11Controller as the delegate for the updater.
-    [[SUUpdater sharedUpdater] setDelegate:self];
+ [[SUUpdater sharedUpdater] setDelegate:self];
 }
 
 // Sent immediately before installing the specified update.
-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update {
+ -(void) updater:(SUUpdater *)
+updater willInstallUpdate:(SUAppcastItem *) update
+{
     //[self set_can_quit:YES];
 }
 
 #endif
 
-- (void) launch_client:(NSString *)filename
-{
+ -(void) launch_client:(NSString *) filename {
     int child1, child2 = 0;
     int status;
     const char *newargv[4];
     char buf[128];
     char *s;
-    
-    newargv[0] = [X11App prefs_get_string:@PREFS_LOGIN_SHELL default:"/bin/sh"];
+
+newargv[0] =[X11App prefs_get_string: @PREFS_LOGIN_SHELL default:
+"/bin/sh"];
     newargv[1] = "-c";
-    newargv[2] = [filename UTF8String];
+    newargv[2] =[filename UTF8String];
     newargv[3] = NULL;
-    
+
     s = getenv("DISPLAY");
     if (s == NULL || s[0] == 0) {
         snprintf(buf, sizeof(buf), ":%s", display);
@@ -360,502 +333,541 @@
     /* Do the fork-twice trick to avoid having to reap zombies */
     child1 = fork();
     switch (child1) {
-        case -1:                                /* error */
-            break;
-      
-        case 0:                                 /* child1 */
-            child2 = fork();
-      
-            switch (child2) {
-                int max_files, i;
-	
-                case -1:                            /* error */
-                    _exit(1);
-	 
-                case 0:                             /* child2 */
-                /* close all open files except for standard streams */
-                max_files = sysconf(_SC_OPEN_MAX);
-                for(i = 3; i < max_files; i++)
-                    close(i);
-	
-                /* ensure stdin is on /dev/null */
-                close(0);
-                open("/dev/null", O_RDONLY);
-	
-                execvp(newargv[0], (char **const) newargv);
-                _exit(2);
-	
-                default:                            /* parent (child1) */
-                _exit(0);
-            }
-            break;
-      
-        default:                                /* parent */
-            waitpid(child1, &status, 0);
+    case -1:                   /* error */
+        break;
+
+    case 0:                    /* child1 */
+        child2 = fork();
+
+        switch (child2) {
+            int max_files, i;
+
+        case -1:               /* error */
+            _exit(1);
+
+        case 0:                /* child2 */
+            /* close all open files except for standard streams */
+            max_files = sysconf(_SC_OPEN_MAX);
+            for (i = 3; i < max_files; i++)
+                close(i);
+
+            /* ensure stdin is on /dev/null */
+            close(0);
+            open("/dev/null", O_RDONLY);
+
+            execvp(newargv[0], (char **const) newargv);
+            _exit(2);
+
+        default:               /* parent (child1) */
+            _exit(0);
+        }
+        break;
+
+    default:                   /* parent */
+        waitpid(child1, &status, 0);
     }
 }
 
-- (void) app_selected:sender
-{
-  int tag;
-  NSString *item;
-  
-  tag = [sender tag] - 1;
-  if (apps == nil || tag < 0 || tag >= [apps count])
-    return;
-  
-  item = [[apps objectAtIndex:tag] objectAtIndex:1];
-  
-  [self launch_client:item];
-}
-
-- (IBAction) apps_table_show:sender
-{
-  NSArray *columns;
-  NSMutableArray *oldapps = nil;
-	
-  if (table_apps != nil)
-    oldapps = table_apps;
-
-  table_apps = [[NSMutableArray alloc] initWithCapacity:1];
-  if(apps != nil)
-      [table_apps addObjectsFromArray:apps];
-	
-  columns = [apps_table tableColumns];
-  [[columns objectAtIndex:0] setIdentifier:@"0"];
-  [[columns objectAtIndex:1] setIdentifier:@"1"];
-  [[columns objectAtIndex:2] setIdentifier:@"2"];
-	
-  [apps_table setDataSource:self];
-  [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];
-
-  [[apps_table window] makeKeyAndOrderFront:sender];
-  [apps_table reloadData];
-  if(oldapps != nil)
-    [oldapps release];
-}
-
-- (IBAction) apps_table_done:sender
-{
-  [apps_table deselectAll:sender];	/* flush edits? */
-	
-  [self remove_apps_menu];
-  [self install_apps_menu:table_apps];
-	
-  [NSApp prefs_set_array:@PREFS_APPSMENU value:table_apps];
-  [NSApp prefs_synchronize];
-	
-  [[apps_table window] orderOut:sender];
-	
-  [table_apps release];
-  table_apps = nil;
-}
-
-- (IBAction) apps_table_new:sender
-{
-  NSMutableArray *item;
-	
-  int row = [apps_table selectedRow], i;
-	
-  if (row < 0) row = 0;
-  else row = row + 1;
-	
-  i = row;
-  if (i > [table_apps count])
-    return;				/* avoid exceptions */
-	
-  [apps_table deselectAll:sender];
-	
-  item = [[NSMutableArray alloc] initWithCapacity:3];
-  [item addObject:@""];
-  [item addObject:@""];
-  [item addObject:@""];
-	
-  [table_apps insertObject:item atIndex:i];
-  [item release];
-	
-  [apps_table reloadData];
-  [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
-}
-
-- (IBAction) apps_table_duplicate:sender
-{
-  int row = [apps_table selectedRow], i;
-  NSObject *item;
-	
-  if (row < 0) {
-    [self apps_table_new:sender];
-    return;
-  }
-	
-  i = row;
-  if (i > [table_apps count] - 1) return;				/* avoid exceptions */
-    
-  [apps_table deselectAll:sender];
-	
-  item = [[table_apps objectAtIndex:i] mutableCopy];
-  [table_apps insertObject:item atIndex:i];
-  [item release];
-	
-  [apps_table reloadData];
-  [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row+1] byExtendingSelection:NO];
-}
-
-- (IBAction) apps_table_delete:sender
-{
-  int row = [apps_table selectedRow];
-	
-  if (row >= 0)
-    {
-      int i = row;
-      
-      if (i > [table_apps count] - 1) return;			/* avoid exceptions */
-      
-      [apps_table deselectAll:sender];
-      
-      [table_apps removeObjectAtIndex:i];
-    }
-	
-  [apps_table reloadData];
-	
-  row = MIN (row, [table_apps count] - 1);
-  if (row >= 0)
-    [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
-}
-
-- (NSInteger) numberOfRowsInTableView:(NSTableView *)tableView
-{
-  if (table_apps == nil) return 0;
-  
-  return [table_apps count];
+ -(void) app_selected:sender {
+    int tag;
+    NSString *item;
+
+    tag =[sender tag] - 1;
+    if (apps == nil || tag < 0 || tag >=[apps count])
+        return;
+
+ item =[[apps objectAtIndex: tag] objectAtIndex:1];
+
+ [self launch_client:item];
 }
 
-- (id) tableView:(NSTableView *)tableView
-objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
-{
-  NSArray *item;
-  int col;
-	
-  if (table_apps == nil) return nil;
-	
-  col = [[tableColumn identifier] intValue];
-	
-  item = [table_apps objectAtIndex:row];
-  if ([item count] > col)
-    return [item objectAtIndex:col];
-  else
-    return @"";
-}
-
-- (void) tableView:(NSTableView *)tableView setObjectValue:(id)object
-    forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
-{
-  NSMutableArray *item;
-  int col;
-	
-  if (table_apps == nil) return;
-	
-  col = [[tableColumn identifier] intValue];
-	
-  item = [table_apps objectAtIndex:row];
-  [item replaceObjectAtIndex:col withObject:object];
-}
-
-- (void) hide_window:sender
-{
-  if ([X11App x_active])
-    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideWindow);
-  else
-    NSBeep ();			/* FIXME: something here */
+ -(IBAction) apps_table_show:sender {
+    NSArray *columns;
+    NSMutableArray *oldapps = nil;
+
+    if (table_apps != nil)
+        oldapps = table_apps;
+
+ table_apps =[[NSMutableArray alloc] initWithCapacity:1];
+    if (apps != nil)
+ [table_apps addObjectsFromArray:apps];
+
+    columns =[apps_table tableColumns];
+ [[columns objectAtIndex: 0] setIdentifier:@"0"];
+ [[columns objectAtIndex: 1] setIdentifier:@"1"];
+ [[columns objectAtIndex: 2] setIdentifier:@"2"];
+
+ [apps_table setDataSource:self];
+ [apps_table selectRowIndexes: [NSIndexSet indexSetWithIndex: 0] byExtendingSelection:NO];
+
+ [[apps_table window] makeKeyAndOrderFront:sender];
+    [apps_table reloadData];
+    if (oldapps != nil)
+        [oldapps release];
 }
 
-- (IBAction)bring_to_front:sender
-{
-  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMBringAllToFront);
+ -(IBAction) apps_table_done:sender {
+ [apps_table deselectAll:sender];
+                                /* flush edits? */
+
+    [self remove_apps_menu];
+ [self install_apps_menu:table_apps];
+
+ [NSApp prefs_set_array: @PREFS_APPSMENU value:table_apps];
+    [NSApp prefs_synchronize];
+
+ [[apps_table window] orderOut:sender];
+
+    [table_apps release];
+    table_apps = nil;
 }
 
-- (IBAction)close_window:sender
-{
-  if ([X11App x_active])
-    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMCloseWindow);
-  else
-    [[NSApp keyWindow] performClose:sender];
+ -(IBAction) apps_table_new:sender {
+    NSMutableArray *item;
+
+    int row =[apps_table selectedRow], i;
+
+    if (row < 0)
+        row = 0;
+    else
+        row = row + 1;
+
+    i = row;
+    if (i >[table_apps count])
+        return;                 /* avoid exceptions */
+
+ [apps_table deselectAll:sender];
+
+ item =[[NSMutableArray alloc] initWithCapacity:3];
+ [item addObject:@""];
+ [item addObject:@""];
+ [item addObject:@""];
+
+ [table_apps insertObject: item atIndex:i];
+    [item release];
+
+    [apps_table reloadData];
+ [apps_table selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection:NO];
 }
 
-- (IBAction)minimize_window:sender
-{
-  if ([X11App x_active])
-    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMMinimizeWindow);
-  else
-    [[NSApp keyWindow] performMiniaturize:sender];
+ -(IBAction) apps_table_duplicate:sender {
+    int row =[apps_table selectedRow], i;
+    NSObject *item;
+
+    if (row < 0) {
+ [self apps_table_new:sender];
+        return;
+    }
+
+    i = row;
+    if (i >[table_apps count] - 1)
+        return;                 /* avoid exceptions */
+
+ [apps_table deselectAll:sender];
+
+ item =[[table_apps objectAtIndex:i] mutableCopy];
+ [table_apps insertObject: item atIndex:i];
+    [item release];
+
+    [apps_table reloadData];
+ [apps_table selectRowIndexes: [NSIndexSet indexSetWithIndex: row + 1] byExtendingSelection:NO];
 }
 
-- (IBAction)zoom_window:sender
-{
-  if ([X11App x_active])
-    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMZoomWindow);
-  else
-    [[NSApp keyWindow] performZoom:sender];
+ -(IBAction) apps_table_delete:sender {
+    int row =[apps_table selectedRow];
+
+    if (row >= 0) {
+        int i = row;
+
+        if (i >[table_apps count] - 1)
+            return;             /* avoid exceptions */
+
+ [apps_table deselectAll:sender];
+
+ [table_apps removeObjectAtIndex:i];
+    }
+
+    [apps_table reloadData];
+
+    row = MIN(row,[table_apps count] - 1);
+    if (row >= 0)
+ [apps_table selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection:NO];
+}
+
+ -(NSInteger) numberOfRowsInTableView:(NSTableView *) tableView {
+    if (table_apps == nil)
+        return 0;
+
+    return[table_apps count];
 }
 
-- (IBAction) next_window:sender
+ -(id) tableView: (NSTableView *) tableView objectValueForTableColumn:(NSTableColumn
+ *)
+tableColumn row:(NSInteger) row
 {
-  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMNextWindow);
+    NSArray *item;
+    int col;
+
+    if (table_apps == nil)
+        return nil;
+
+    col =[[tableColumn identifier] intValue];
+
+ item =[table_apps objectAtIndex:row];
+    if ([item count] > col)
+ return[item objectAtIndex:col];
+    else
+        return @"";
 }
 
-- (IBAction) previous_window:sender
+ -(void) tableView:(NSTableView *)
+tableView setObjectValue:(id) object forTableColumn:(NSTableColumn *)
+tableColumn row:(NSInteger) row
 {
-  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMPreviousWindow);
+    NSMutableArray *item;
+    int col;
+
+    if (table_apps == nil)
+        return;
+
+    col =[[tableColumn identifier] intValue];
+
+ item =[table_apps objectAtIndex:row];
+ [item replaceObjectAtIndex: col withObject:object];
+}
+
+ -(void) hide_window:sender {
+    if ([X11App x_active])
+        DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideWindow);
+    else
+        NSBeep();               /* FIXME: something here */
+}
+
+ -(IBAction) bring_to_front:sender {
+    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMBringAllToFront);
+}
+
+ -(IBAction) close_window:sender {
+    if ([X11App x_active])
+        DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMCloseWindow);
+    else
+ [[NSApp keyWindow] performClose:sender];
+}
+
+ -(IBAction) minimize_window:sender {
+    if ([X11App x_active])
+        DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMMinimizeWindow);
+    else
+ [[NSApp keyWindow] performMiniaturize:sender];
 }
 
-- (IBAction) enable_fullscreen_changed:sender {
+ -(IBAction) zoom_window:sender {
+    if ([X11App x_active])
+        DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMZoomWindow);
+    else
+ [[NSApp keyWindow] performZoom:sender];
+}
+
+ -(IBAction) next_window:sender {
+    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMNextWindow);
+}
+
+ -(IBAction) previous_window:sender {
+    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMPreviousWindow);
+}
+
+ -(IBAction) enable_fullscreen_changed:sender {
     XQuartzRootlessDefault = ![enable_fullscreen intValue];
 
-    [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];
-    [enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ? [NSColor disabledControlTextColor] : [NSColor controlTextColor]];
+ [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];
+ [enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ?[NSColor disabledControlTextColor] :[NSColor
+                                                                 controlTextColor]];
 
     DarwinSendDDXEvent(kXquartzSetRootless, 1, XQuartzRootlessDefault);
 
-    [NSApp prefs_set_boolean:@PREFS_ROOTLESS value:XQuartzRootlessDefault];
+ [NSApp prefs_set_boolean: @PREFS_ROOTLESS value:XQuartzRootlessDefault];
     [NSApp prefs_synchronize];
 }
 
-- (IBAction) toggle_fullscreen:sender
-{
-  DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
+ -(IBAction) toggle_fullscreen:sender {
+    DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
 }
 
-- (void) set_can_quit:(OSX_BOOL)state
-{
-  can_quit = state;
+ -(void) set_can_quit:(OSX_BOOL) state {
+    can_quit = state;
 }
 
-- (IBAction)prefs_changed:sender
-{
-    if(!sender)
+ -(IBAction) prefs_changed:sender {
+    if (!sender)
         return;
-    
-    if(sender == fake_buttons) {
-        darwinFakeButtons = [fake_buttons intValue];
-        [NSApp prefs_set_boolean:@PREFS_FAKEBUTTONS value:darwinFakeButtons];
-    } else if(sender == enable_keyequivs) {
-        XQuartzEnableKeyEquivalents =  [enable_keyequivs intValue];
-        [NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:XQuartzEnableKeyEquivalents];
-    } else if(sender == sync_keymap) {
-        darwinSyncKeymap = [sync_keymap intValue];
-        [NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap];
-    } else if(sender == enable_fullscreen_menu) {
-        XQuartzFullscreenMenu = [enable_fullscreen_menu intValue];
-        [NSApp prefs_set_boolean:@PREFS_FULLSCREEN_MENU value:XQuartzFullscreenMenu];
-    } else if(sender == option_sends_alt) {
+
+    if (sender == fake_buttons) {
+        darwinFakeButtons =[fake_buttons intValue];
+ [NSApp prefs_set_boolean: @PREFS_FAKEBUTTONS value:darwinFakeButtons];
+    }
+    else if (sender == enable_keyequivs) {
+        XQuartzEnableKeyEquivalents =[enable_keyequivs intValue];
+ [NSApp prefs_set_boolean: @PREFS_KEYEQUIVS value:XQuartzEnableKeyEquivalents];
+    }
+    else if (sender == sync_keymap) {
+        darwinSyncKeymap =[sync_keymap intValue];
+ [NSApp prefs_set_boolean: @PREFS_SYNC_KEYMAP value:darwinSyncKeymap];
+    }
+    else if (sender == enable_fullscreen_menu) {
+        XQuartzFullscreenMenu =[enable_fullscreen_menu intValue];
+ [NSApp prefs_set_boolean: @PREFS_FULLSCREEN_MENU value:XQuartzFullscreenMenu];
+    }
+    else if (sender == option_sends_alt) {
         BOOL prev_opt_sends_alt = XQuartzOptionSendsAlt;
-        
-        XQuartzOptionSendsAlt = [option_sends_alt intValue];
-        [NSApp prefs_set_boolean:@PREFS_OPTION_SENDS_ALT value:XQuartzOptionSendsAlt];
 
-        if(prev_opt_sends_alt != XQuartzOptionSendsAlt)
+        XQuartzOptionSendsAlt =[option_sends_alt intValue];
+ [NSApp prefs_set_boolean: @PREFS_OPTION_SENDS_ALT value:XQuartzOptionSendsAlt];
+
+        if (prev_opt_sends_alt != XQuartzOptionSendsAlt)
             QuartsResyncKeymap(TRUE);
-    } else if(sender == click_through) {
-        [NSApp prefs_set_boolean:@PREFS_CLICK_THROUGH value:[click_through intValue]];
-    } else if(sender == focus_follows_mouse) {
-        [NSApp prefs_set_boolean:@PREFS_FFM value:[focus_follows_mouse intValue]];
-    } else if(sender == focus_on_new_window) {
-        [NSApp prefs_set_boolean:@PREFS_FOCUS_ON_NEW_WINDOW value:[focus_on_new_window intValue]];
-    } else if(sender == enable_auth) {
-        [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue]];
-    } else if(sender == enable_tcp) {
-        [NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]];
-    } else if(sender == depth) {
-        [NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]];
-    } else if(sender == sync_pasteboard) {
-        BOOL pbproxy_active = [sync_pasteboard intValue];
-        [NSApp prefs_set_boolean:@PREFS_SYNC_PB value:pbproxy_active];
-
-        [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
-        [sync_pasteboard_to_primary setEnabled:pbproxy_active];
-        [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
-        [sync_primary_immediately setEnabled:pbproxy_active];
+    }
+    else if (sender == click_through) {
+ [NSApp prefs_set_boolean: @PREFS_CLICK_THROUGH value:[click_through
+         intValue]];
+    }
+    else if (sender == focus_follows_mouse) {
+ [NSApp prefs_set_boolean: @PREFS_FFM value:[focus_follows_mouse
+         intValue]];
+    }
+    else if (sender == focus_on_new_window) {
+ [NSApp prefs_set_boolean: @PREFS_FOCUS_ON_NEW_WINDOW value:[focus_on_new_window
+         intValue]];
+    }
+    else if (sender == enable_auth) {
+ [NSApp prefs_set_boolean: @PREFS_NO_AUTH value:![enable_auth
+          intValue]];
+    }
+    else if (sender == enable_tcp) {
+ [NSApp prefs_set_boolean: @PREFS_NO_TCP value:![enable_tcp intValue]];
+    }
+    else if (sender == depth) {
+ [NSApp prefs_set_integer: @PREFS_DEPTH value:[depth selectedTag]];
+    }
+    else if (sender == sync_pasteboard) {
+        BOOL pbproxy_active =[sync_pasteboard intValue];
+
+ [NSApp prefs_set_boolean: @PREFS_SYNC_PB value:pbproxy_active];
+
+ [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
+ [sync_pasteboard_to_primary setEnabled:pbproxy_active];
+ [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
+ [sync_primary_immediately setEnabled:pbproxy_active];
 
         // setEnabled doesn't do this...
-        [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
-        [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
-    } else if(sender == sync_pasteboard_to_clipboard) {
-        [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD value:[sync_pasteboard_to_clipboard intValue]];
-    } else if(sender == sync_pasteboard_to_primary) {
-        [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_PRIMARY value:[sync_pasteboard_to_primary intValue]];
-    } else if(sender == sync_clipboard_to_pasteboard) {
-        [NSApp prefs_set_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB value:[sync_clipboard_to_pasteboard intValue]];
-    } else if(sender == sync_primary_immediately) {
-        [NSApp prefs_set_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT value:[sync_primary_immediately intValue]];
-    } else if(sender == scroll_in_device_direction) {
-        XQuartzScrollInDeviceDirection = [scroll_in_device_direction intValue];
-        [NSApp prefs_set_boolean:@PREFS_SCROLL_IN_DEV_DIRECTION value:XQuartzScrollInDeviceDirection];
+ [sync_text1 setTextColor:pbproxy_active ?[NSColor controlTextColor] :[NSColor
+                                                     disabledControlTextColor]];
+ [sync_text2 setTextColor:pbproxy_active ?[NSColor controlTextColor] :[NSColor
+                                                     disabledControlTextColor]];
+    }
+    else if (sender == sync_pasteboard_to_clipboard) {
+ [NSApp prefs_set_boolean: @PREFS_SYNC_PB_TO_CLIPBOARD value:[sync_pasteboard_to_clipboard
+         intValue]];
+    }
+    else if (sender == sync_pasteboard_to_primary) {
+ [NSApp prefs_set_boolean: @PREFS_SYNC_PB_TO_PRIMARY value:[sync_pasteboard_to_primary
+         intValue]];
+    }
+    else if (sender == sync_clipboard_to_pasteboard) {
+ [NSApp prefs_set_boolean: @PREFS_SYNC_CLIPBOARD_TO_PB value:[sync_clipboard_to_pasteboard
+         intValue]];
+    }
+    else if (sender == sync_primary_immediately) {
+ [NSApp prefs_set_boolean: @PREFS_SYNC_PRIMARY_ON_SELECT value:[sync_primary_immediately
+         intValue]];
+    }
+    else if (sender == scroll_in_device_direction) {
+        XQuartzScrollInDeviceDirection =[scroll_in_device_direction intValue];
+ [NSApp prefs_set_boolean: @PREFS_SCROLL_IN_DEV_DIRECTION value:XQuartzScrollInDeviceDirection];
     }
 
     [NSApp prefs_synchronize];
-    
+
     DarwinSendDDXEvent(kXquartzReloadPreferences, 0);
 }
 
-- (IBAction) prefs_show:sender
-{
-    BOOL pbproxy_active = [NSApp prefs_get_boolean:@PREFS_SYNC_PB default:YES];
+ -(IBAction) prefs_show:sender {
+BOOL pbproxy_active =[NSApp prefs_get_boolean: @PREFS_SYNC_PB default:
+YES];
 
     // Remove preferences from the GUI which are not supported
     // TODO: Change 1117 to NSAppKitVersionNumber10_7 when it is defined
-    if(scroll_in_device_direction && NSAppKitVersionNumber < 1117) {
+    if (scroll_in_device_direction && NSAppKitVersionNumber < 1117) {
         [scroll_in_device_direction removeFromSuperview];
         scroll_in_device_direction = nil;
-    } else {
-        [scroll_in_device_direction setIntValue:XQuartzScrollInDeviceDirection];
-    }
-    
-    [fake_buttons setIntValue:darwinFakeButtons];
-    [enable_keyequivs setIntValue:XQuartzEnableKeyEquivalents];
-    [sync_keymap setIntValue:darwinSyncKeymap];
-    [option_sends_alt setIntValue:XQuartzOptionSendsAlt];
-    [click_through setIntValue:[NSApp prefs_get_boolean:@PREFS_CLICK_THROUGH default:NO]];
-    [focus_follows_mouse setIntValue:[NSApp prefs_get_boolean:@PREFS_FFM default:NO]];
-    [focus_on_new_window setIntValue:[NSApp prefs_get_boolean:@PREFS_FOCUS_ON_NEW_WINDOW default:YES]];
-    
-    [enable_auth setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_AUTH default:NO]];
-    [enable_tcp setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_TCP default:NO]];
-
-    [depth selectItemAtIndex:[depth indexOfItemWithTag:[NSApp prefs_get_integer:@PREFS_DEPTH default:-1]]];
-
-    [sync_pasteboard setIntValue:pbproxy_active];
-    [sync_pasteboard_to_clipboard setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD default:YES]];
-    [sync_pasteboard_to_primary setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PB_TO_PRIMARY default:YES]];
-    [sync_clipboard_to_pasteboard setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB default:YES]];
-    [sync_primary_immediately setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT default:NO]];
-
-    [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
-    [sync_pasteboard_to_primary setEnabled:pbproxy_active];
-    [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
-    [sync_primary_immediately setEnabled:pbproxy_active];
+    }
+    else {
+ [scroll_in_device_direction setIntValue:XQuartzScrollInDeviceDirection];
+    }
+
+ [fake_buttons setIntValue:darwinFakeButtons];
+ [enable_keyequivs setIntValue:XQuartzEnableKeyEquivalents];
+ [sync_keymap setIntValue:darwinSyncKeymap];
+ [option_sends_alt setIntValue:XQuartzOptionSendsAlt];
+[click_through setIntValue: [NSApp prefs_get_boolean: @PREFS_CLICK_THROUGH default:
+NO]];
+[focus_follows_mouse setIntValue: [NSApp prefs_get_boolean: @PREFS_FFM default:
+NO]];
+[focus_on_new_window setIntValue: [NSApp prefs_get_boolean: @PREFS_FOCUS_ON_NEW_WINDOW default:
+YES]];
+
+[enable_auth setIntValue: ![NSApp prefs_get_boolean: @PREFS_NO_AUTH default:
+NO]];
+[enable_tcp setIntValue: ![NSApp prefs_get_boolean: @PREFS_NO_TCP default:
+NO]];
+
+[depth selectItemAtIndex: [depth indexOfItemWithTag: [NSApp prefs_get_integer: @PREFS_DEPTH default:
+-1]]];
+
+ [sync_pasteboard setIntValue:pbproxy_active];
+[sync_pasteboard_to_clipboard setIntValue: [NSApp prefs_get_boolean: @PREFS_SYNC_PB_TO_CLIPBOARD default:
+YES]];
+[sync_pasteboard_to_primary setIntValue: [NSApp prefs_get_boolean: @PREFS_SYNC_PB_TO_PRIMARY default:
+YES]];
+[sync_clipboard_to_pasteboard setIntValue: [NSApp prefs_get_boolean: @PREFS_SYNC_CLIPBOARD_TO_PB default:
+YES]];
+[sync_primary_immediately setIntValue: [NSApp prefs_get_boolean: @PREFS_SYNC_PRIMARY_ON_SELECT default:
+NO]];
+
+ [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
+ [sync_pasteboard_to_primary setEnabled:pbproxy_active];
+ [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
+ [sync_primary_immediately setEnabled:pbproxy_active];
 
     // setEnabled doesn't do this...
-    [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
-    [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
-	
-    [enable_fullscreen setIntValue:!XQuartzRootlessDefault];
-    [enable_fullscreen_menu setIntValue:XQuartzFullscreenMenu];
-    [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];
-    [enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ? [NSColor disabledControlTextColor] : [NSColor controlTextColor]];
+ [sync_text1 setTextColor:pbproxy_active ?[NSColor controlTextColor] :[NSColor
+                                                 disabledControlTextColor]];
+ [sync_text2 setTextColor:pbproxy_active ?[NSColor controlTextColor] :[NSColor
+                                                 disabledControlTextColor]];
 
-    [prefs_panel makeKeyAndOrderFront:sender];
+ [enable_fullscreen setIntValue:!XQuartzRootlessDefault];
+ [enable_fullscreen_menu setIntValue:XQuartzFullscreenMenu];
+ [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];
+ [enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ?[NSColor disabledControlTextColor] :[NSColor
+                                                                 controlTextColor]];
+
+ [prefs_panel makeKeyAndOrderFront:sender];
 }
 
-- (IBAction) quit:sender {
+ -(IBAction) quit:sender {
     DarwinSendDDXEvent(kXquartzQuit, 0);
 }
 
-- (IBAction) x11_help:sender {
+ -(IBAction) x11_help:sender {
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-    AHLookupAnchor((CFStringRef)NSLocalizedString(@"Mac Help", no comment), CFSTR("mchlp2276"));
+    AHLookupAnchor((CFStringRef) NSLocalizedString(@"Mac Help", no comment),
+                   CFSTR("mchlp2276"));
 #else
     AHLookupAnchor(CFSTR("com.apple.machelp"), CFSTR("mchlp2276"));
 #endif
 }
 
-- (OSX_BOOL) validateMenuItem:(NSMenuItem *)item {
-  NSMenu *menu = [item menu];
-    
-  if (item == toggle_fullscreen_item)
-    return !XQuartzIsRootless;
-  else if (menu == [X11App windowsMenu] || menu == dock_menu
-	   || (menu == [x11_about_item menu] && [item tag] == 42))
-    return (AppleWMSelectedEvents () & AppleWMControllerNotifyMask) != 0;
-  else
-    return TRUE;
+ -(OSX_BOOL) validateMenuItem:(NSMenuItem *) item {
+    NSMenu *menu =[item menu];
+
+    if (item == toggle_fullscreen_item)
+        return !XQuartzIsRootless;
+    else if (menu ==[X11App windowsMenu] || menu == dock_menu
+             || (menu ==[x11_about_item menu] &&[item tag] == 42))
+        return (AppleWMSelectedEvents() & AppleWMControllerNotifyMask) != 0;
+    else
+        return TRUE;
 }
 
-- (void) applicationDidHide:(NSNotification *)notify
-{
-  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideAll);
+ -(void) applicationDidHide:(NSNotification *) notify {
+    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideAll);
 
-  /* Toggle off fullscreen mode to leave our non-default video 
-   * mode and hide our guard window.                          
-   */
-  if (!XQuartzIsRootless && XQuartzFullscreenVisible) {
-    DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
-  }
+    /* Toggle off fullscreen mode to leave our non-default video 
+     * mode and hide our guard window.                          
+     */
+    if (!XQuartzIsRootless && XQuartzFullscreenVisible) {
+        DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
+    }
 }
 
-- (void) applicationDidUnhide:(NSNotification *)notify
-{
-  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMShowAll);
+ -(void) applicationDidUnhide:(NSNotification *) notify {
+    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMShowAll);
 }
 
-- (NSApplicationTerminateReply) applicationShouldTerminate:sender {
+ -(NSApplicationTerminateReply) applicationShouldTerminate:sender {
     NSString *msg;
     NSString *title;
-	
-    if (can_quit || [X11App prefs_get_boolean:@PREFS_NO_QUIT_ALERT default:NO])
+
+if (can_quit ||[X11App prefs_get_boolean: @PREFS_NO_QUIT_ALERT default:
+NO])
         return NSTerminateNow;
-	
+
     /* Make sure we're frontmost. */
-    [NSApp activateIgnoringOtherApps:YES];
-	
-    title = NSLocalizedString(@"Do you really want to quit X11?", @"Dialog title when quitting");
-    msg = NSLocalizedString(@"Any open X11 applications will stop immediately, and you will lose any unsaved changes.", @"Dialog when quitting");
+ [NSApp activateIgnoringOtherApps:YES];
+
+    title =
+        NSLocalizedString(@"Do you really want to quit X11?",
+                          @"Dialog title when quitting");
+    msg =
+        NSLocalizedString
+        (@"Any open X11 applications will stop immediately, and you will lose any unsaved changes.",
+         @"Dialog when quitting");
 
     /* FIXME: safe to run the alert in here? Or should we return Later
      *        and then run the alert on a timer? It seems to work here, so..
      */
-	
-    return (NSRunAlertPanel (title, msg, NSLocalizedString (@"Quit", @""),
-                             NSLocalizedString (@"Cancel", @""), nil)
+
+    return (NSRunAlertPanel(title, msg, NSLocalizedString(@"Quit", @""),
+                            NSLocalizedString(@"Cancel", @""), nil)
             == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
 }
 
-- (void) applicationWillTerminate:(NSNotification *)aNotification
-{
-  unsigned remain;
-  [X11App prefs_synchronize];
-	
-  /* shutdown the X server, it will exit () for us. */
-  DarwinSendDDXEvent(kXquartzQuit, 0);
-	
-  /* In case it doesn't, exit anyway after a while. */
-  remain = 10000000;
-  while((remain = usleep(remain)) > 0);
+ -(void) applicationWillTerminate:(NSNotification *) aNotification {
+    unsigned remain;
+
+    [X11App prefs_synchronize];
+
+    /* shutdown the X server, it will exit () for us. */
+    DarwinSendDDXEvent(kXquartzQuit, 0);
+
+    /* In case it doesn't, exit anyway after a while. */
+    remain = 10000000;
+    while ((remain = usleep(remain)) > 0);
 
-  exit (1);
+    exit(1);
 }
 
-- (void) server_ready
-{
-  x_list *node;
-	
-  finished_launching = YES;
-	
-  for (node = pending_apps; node != NULL; node = node->next)
-    {
-      NSString *filename = node->data;
-      [self launch_client:filename];
-      [filename release];
-    }
-	
-  x_list_free (pending_apps);
-  pending_apps = NULL;
-}
-
-- (OSX_BOOL) application:(NSApplication *)app openFile:(NSString *)filename
+-(void) server_ready {
+    x_list *node;
+
+    finished_launching = YES;
+
+    for (node = pending_apps; node != NULL; node = node->next) {
+        NSString *filename = node->data;
+
+ [self launch_client:filename];
+        [filename release];
+    }
+
+    x_list_free(pending_apps);
+    pending_apps = NULL;
+}
+
+ -(OSX_BOOL) application:(NSApplication *)
+app openFile:(NSString *) filename
 {
-    const char *name = [filename UTF8String];
-    
+    const char *name =[filename UTF8String];
+
     if (finished_launching)
-        [self launch_client:filename];
-    else if (name[0] != ':')		/* ignore display names */
-        pending_apps = x_list_prepend (pending_apps, [filename retain]);
-    
+ [self launch_client:filename];
+    else if (name[0] != ':')    /* ignore display names */
+        pending_apps = x_list_prepend(pending_apps,[filename retain]);
+
     /* FIXME: report failures. */
     return YES;
 }
 
-@end
-
-void X11ControllerMain(int argc, char **argv, char **envp) {
-    X11ApplicationMain (argc, argv, envp);
+@end void
+X11ControllerMain(int argc, char **argv, char **envp)
+{
+    X11ApplicationMain(argc, argv, envp);
 }
diff --git a/xorg-server/hw/xquartz/applewm.c b/xorg-server/hw/xquartz/applewm.c
index 55976c454..70fb60a18 100644
--- a/xorg-server/hw/xquartz/applewm.c
+++ b/xorg-server/hw/xquartz/applewm.c
@@ -64,38 +64,41 @@ static Atom func (void) {                                       \
 }
 
 DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")
-DEFINE_ATOM_HELPER (xa_apple_no_order_in, "_APPLE_NO_ORDER_IN")
+    DEFINE_ATOM_HELPER(xa_apple_no_order_in, "_APPLE_NO_ORDER_IN")
 
 static AppleWMProcsPtr appleWMProcs;
 
 static int WMErrorBase;
 
-
 static unsigned char WMReqCode = 0;
 static int WMEventBase = 0;
 
-static RESTYPE ClientType, EventType; /* resource types for event masks */
+static RESTYPE ClientType, EventType;   /* resource types for event masks */
 static XID eventResource;
 
 /* Currently selected events */
 static unsigned int eventMask = 0;
 
-static int WMFreeClient (pointer data, XID id);
-static int WMFreeEvents (pointer data, XID id);
-static void SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to);
+static int
+WMFreeClient(pointer data, XID id);
+static int
+WMFreeEvents(pointer data, XID id);
+static void
+SNotifyEvent(xAppleWMNotifyEvent * from, xAppleWMNotifyEvent * to);
 
 typedef struct _WMEvent *WMEventPtr;
 typedef struct _WMEvent {
-    WMEventPtr      next;
-    ClientPtr       client;
-    XID             clientResource;
-    unsigned int    mask;
+    WMEventPtr next;
+    ClientPtr client;
+    XID clientResource;
+    unsigned int mask;
 } WMEventRec;
 
 static inline BoxRec
-make_box (int x, int y, int w, int h)
+make_box(int x, int y, int w, int h)
 {
     BoxRec r;
+
     r.x1 = x;
     r.y1 = y;
     r.x2 = x + w;
@@ -105,9 +108,7 @@ make_box (int x, int y, int w, int h)
 
 /* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */
 void
-AppleWMSetScreenOrigin(
-    WindowPtr pWin
-)
+AppleWMSetScreenOrigin(WindowPtr pWin)
 {
     int32_t data[2];
 
@@ -115,7 +116,7 @@ AppleWMSetScreenOrigin(
     data[1] = pWin->drawable.pScreen->y + darwinMainScreenY;
 
     dixChangeWindowProperty(serverClient, pWin, xa_native_screen_origin(),
-			    XA_INTEGER, 32, PropModeReplace, 2, data, TRUE);
+                            XA_INTEGER, 32, PropModeReplace, 2, data, TRUE);
 }
 
 /* Window managers can set the _APPLE_NO_ORDER_IN property on windows
@@ -123,9 +124,7 @@ AppleWMSetScreenOrigin(
    be mapped but remain ordered-out until the animation
    completes (when the Dock will order them in). */
 Bool
-AppleWMDoReorderWindow(
-    WindowPtr pWin
-)
+AppleWMDoReorderWindow(WindowPtr pWin)
 {
     Atom atom;
     PropertyPtr prop;
@@ -133,18 +132,15 @@ AppleWMDoReorderWindow(
 
     atom = xa_apple_no_order_in();
     rc = dixLookupProperty(&prop, pWin, atom, serverClient, DixReadAccess);
-    
-    if(Success == rc && prop->type == atom)
-	return 0;
-    
+
+    if (Success == rc && prop->type == atom)
+        return 0;
+
     return 1;
 }
 
-
 static int
-ProcAppleWMQueryVersion(
-    register ClientPtr client
-)
+ProcAppleWMQueryVersion(register ClientPtr client)
 {
     xAppleWMQueryVersionReply rep;
 
@@ -159,15 +155,14 @@ ProcAppleWMQueryVersion(
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
     }
-    WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *)&rep);
+    WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *) &rep);
     return Success;
 }
-
 
 /* events */
 
 static inline void
-updateEventMask (WMEventPtr *pHead)
+updateEventMask(WMEventPtr * pHead)
 {
     WMEventPtr pCur;
 
@@ -176,18 +171,21 @@ updateEventMask (WMEventPtr *pHead)
         eventMask |= pCur->mask;
 }
 
-/*ARGSUSED*/
-static int
-WMFreeClient (pointer data, XID id) {
-    WMEventPtr   pEvent;
-    WMEventPtr   *pHead, pCur, pPrev;
+ /*ARGSUSED*/ static int
+WMFreeClient(pointer data, XID id)
+{
+    WMEventPtr pEvent;
+    WMEventPtr *pHead, pCur, pPrev;
     int i;
 
     pEvent = (WMEventPtr) data;
-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess | DixWriteAccess | DixDestroyAccess);
+    i = dixLookupResourceByType((pointer *) &pHead, eventResource, EventType,
+                                serverClient,
+                                DixReadAccess | DixWriteAccess |
+                                DixDestroyAccess);
     if (i == Success && pHead) {
         pPrev = 0;
-        for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next)
+        for (pCur = *pHead; pCur && pCur != pEvent; pCur = pCur->next)
             pPrev = pCur;
         if (pCur) {
             if (pPrev)
@@ -195,21 +193,21 @@ WMFreeClient (pointer data, XID id) {
             else
                 *pHead = pEvent->next;
         }
-        updateEventMask (pHead);
+        updateEventMask(pHead);
     }
     free((pointer) pEvent);
     return 1;
 }
 
-/*ARGSUSED*/
-static int
-WMFreeEvents (pointer data, XID id) {
-    WMEventPtr   *pHead, pCur, pNext;
+ /*ARGSUSED*/ static int
+WMFreeEvents(pointer data, XID id)
+{
+    WMEventPtr *pHead, pCur, pNext;
 
     pHead = (WMEventPtr *) data;
     for (pCur = *pHead; pCur; pCur = pNext) {
         pNext = pCur->next;
-        FreeResource (pCur->clientResource, ClientType);
+        FreeResource(pCur->clientResource, ClientType);
         free((pointer) pCur);
     }
     free((pointer) pHead);
@@ -218,31 +216,30 @@ WMFreeEvents (pointer data, XID id) {
 }
 
 static int
-ProcAppleWMSelectInput (register ClientPtr client)
+ProcAppleWMSelectInput(register ClientPtr client)
 {
     REQUEST(xAppleWMSelectInputReq);
-    WMEventPtr      pEvent, pNewEvent, *pHead;
-    XID             clientResource;
-    int             i;
+    WMEventPtr pEvent, pNewEvent, *pHead;
+    XID clientResource;
+    int i;
 
-    REQUEST_SIZE_MATCH (xAppleWMSelectInputReq);
-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, client, DixWriteAccess);
+    REQUEST_SIZE_MATCH(xAppleWMSelectInputReq);
+    i = dixLookupResourceByType((pointer *) &pHead, eventResource, EventType,
+                                client, DixWriteAccess);
     if (stuff->mask != 0) {
         if (i == Success && pHead) {
             /* check for existing entry. */
-            for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
-            {
-                if (pEvent->client == client)
-                {
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+                if (pEvent->client == client) {
                     pEvent->mask = stuff->mask;
-                    updateEventMask (pHead);
+                    updateEventMask(pHead);
                     return Success;
                 }
             }
         }
 
         /* build the entry */
-        pNewEvent = (WMEventPtr) malloc(sizeof (WMEventRec));
+        pNewEvent = (WMEventPtr) malloc(sizeof(WMEventRec));
         if (!pNewEvent)
             return BadAlloc;
         pNewEvent->next = 0;
@@ -252,9 +249,9 @@ ProcAppleWMSelectInput (register ClientPtr client)
          * add a resource that will be deleted when
          * the client goes away
          */
-        clientResource = FakeClientID (client->index);
+        clientResource = FakeClientID(client->index);
         pNewEvent->clientResource = clientResource;
-        if (!AddResource (clientResource, ClientType, (pointer)pNewEvent))
+        if (!AddResource(clientResource, ClientType, (pointer) pNewEvent))
             return BadAlloc;
         /*
          * create a resource to contain a pointer to the list
@@ -262,21 +259,20 @@ ProcAppleWMSelectInput (register ClientPtr client)
          * the list may be arbitrarily rearranged which cannot be
          * done through the resource database.
          */
-        if (i != Success || !pHead)
-        {
-            pHead = (WMEventPtr *) malloc(sizeof (WMEventPtr));
+        if (i != Success || !pHead) {
+            pHead = (WMEventPtr *) malloc(sizeof(WMEventPtr));
             if (!pHead ||
-                !AddResource (eventResource, EventType, (pointer)pHead))
-            {
-                FreeResource (clientResource, RT_NONE);
+                !AddResource(eventResource, EventType, (pointer) pHead)) {
+                FreeResource(clientResource, RT_NONE);
                 return BadAlloc;
             }
             *pHead = 0;
         }
         pNewEvent->next = *pHead;
         *pHead = pNewEvent;
-        updateEventMask (pHead);
-    } else if (stuff->mask == 0) {
+        updateEventMask(pHead);
+    }
+    else if (stuff->mask == 0) {
         /* delete the interest */
         if (i == Success && pHead) {
             pNewEvent = 0;
@@ -286,16 +282,17 @@ ProcAppleWMSelectInput (register ClientPtr client)
                 pNewEvent = pEvent;
             }
             if (pEvent) {
-                FreeResource (pEvent->clientResource, ClientType);
+                FreeResource(pEvent->clientResource, ClientType);
                 if (pNewEvent)
                     pNewEvent->next = pEvent->next;
                 else
                     *pHead = pEvent->next;
                 free(pEvent);
-                updateEventMask (pHead);
+                updateEventMask(pHead);
             }
         }
-    } else {
+    }
+    else {
         client->errorValue = stuff->mask;
         return BadValue;
     }
@@ -307,12 +304,14 @@ ProcAppleWMSelectInput (register ClientPtr client)
  */
 
 void
-AppleWMSendEvent (int type, unsigned int mask, int which, int arg) {
-    WMEventPtr      *pHead, pEvent;
+AppleWMSendEvent(int type, unsigned int mask, int which, int arg)
+{
+    WMEventPtr *pHead, pEvent;
     xAppleWMNotifyEvent se;
-    int             i;
+    int i;
 
-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess);
+    i = dixLookupResourceByType((pointer *) &pHead, eventResource, EventType,
+                                serverClient, DixReadAccess);
     if (i != Success || !pHead)
         return;
     for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
@@ -322,24 +321,21 @@ AppleWMSendEvent (int type, unsigned int mask, int which, int arg) {
         se.kind = which;
         se.arg = arg;
         se.time = currentTime.milliseconds;
-        WriteEventsToClient (pEvent->client, 1, (xEvent *) &se);
+        WriteEventsToClient(pEvent->client, 1, (xEvent *) &se);
     }
 }
 
 /* Safe to call from any thread. */
 unsigned int
-AppleWMSelectedEvents (void)
+AppleWMSelectedEvents(void)
 {
     return eventMask;
 }
-
 
 /* general utility functions */
 
 static int
-ProcAppleWMDisableUpdate(
-    register ClientPtr client
-)
+ProcAppleWMDisableUpdate(register ClientPtr client)
 {
     REQUEST_SIZE_MATCH(xAppleWMDisableUpdateReq);
 
@@ -349,9 +345,7 @@ ProcAppleWMDisableUpdate(
 }
 
 static int
-ProcAppleWMReenableUpdate(
-    register ClientPtr client
-)
+ProcAppleWMReenableUpdate(register ClientPtr client)
 {
     REQUEST_SIZE_MATCH(xAppleWMReenableUpdateReq);
 
@@ -359,41 +353,37 @@ ProcAppleWMReenableUpdate(
 
     return Success;
 }
-
 
 /* window functions */
 
 static int
-ProcAppleWMSetWindowMenu(
-    register ClientPtr client
-)
+ProcAppleWMSetWindowMenu(register ClientPtr client)
 {
     const char *bytes, **items;
     char *shortcuts;
     int max_len, nitems, i, j;
+
     REQUEST(xAppleWMSetWindowMenuReq);
 
     REQUEST_AT_LEAST_SIZE(xAppleWMSetWindowMenuReq);
 
     nitems = stuff->nitems;
-    items = malloc(sizeof (char *) * nitems);
-    shortcuts = malloc(sizeof (char) * nitems);
+    items = malloc(sizeof(char *) * nitems);
+    shortcuts = malloc(sizeof(char) * nitems);
 
     max_len = (stuff->length << 2) - sizeof(xAppleWMSetWindowMenuReq);
     bytes = (char *) &stuff[1];
 
-    for (i = j = 0; i < max_len && j < nitems;)
-    {
+    for (i = j = 0; i < max_len && j < nitems;) {
         shortcuts[j] = bytes[i++];
         items[j++] = bytes + i;
 
-        while (i < max_len)
-        {
+        while (i < max_len) {
             if (bytes[i++] == 0)
                 break;
         }
     }
-    X11ApplicationSetWindowMenu (nitems, items, shortcuts);
+    X11ApplicationSetWindowMenu(nitems, items, shortcuts);
     free(items);
     free(shortcuts);
 
@@ -401,9 +391,7 @@ ProcAppleWMSetWindowMenu(
 }
 
 static int
-ProcAppleWMSetWindowMenuCheck(
-    register ClientPtr client
-)
+ProcAppleWMSetWindowMenuCheck(register ClientPtr client)
 {
     REQUEST(xAppleWMSetWindowMenuCheckReq);
 
@@ -413,9 +401,7 @@ ProcAppleWMSetWindowMenuCheck(
 }
 
 static int
-ProcAppleWMSetFrontProcess(
-    register ClientPtr client
-)
+ProcAppleWMSetFrontProcess(register ClientPtr client)
 {
     REQUEST_SIZE_MATCH(xAppleWMSetFrontProcessReq);
 
@@ -432,16 +418,15 @@ ProcAppleWMSetWindowLevel(register ClientPtr client)
 
     REQUEST_SIZE_MATCH(xAppleWMSetWindowLevelReq);
 
-    if (Success != dixLookupWindow(&pWin, stuff->window, client,
-				   DixReadAccess))
+    if (Success != dixLookupWindow(&pWin, stuff->window, client, DixReadAccess))
         return BadValue;
 
     if (stuff->level >= AppleWMNumWindowLevels) {
         return BadValue;
     }
 
-     err = appleWMProcs->SetWindowLevel(pWin, stuff->level);
-     if (err != Success) {
+    err = appleWMProcs->SetWindowLevel(pWin, stuff->level);
+    if (err != Success) {
         return err;
     }
 
@@ -453,10 +438,10 @@ ProcAppleWMSendPSN(register ClientPtr client)
 {
     REQUEST(xAppleWMSendPSNReq);
     int err;
-    
+
     REQUEST_SIZE_MATCH(xAppleWMSendPSNReq);
-    
-    if(!appleWMProcs->SendPSN)
+
+    if (!appleWMProcs->SendPSN)
         return BadRequest;
 
     err = appleWMProcs->SendPSN(stuff->psn_hi, stuff->psn_lo);
@@ -471,21 +456,25 @@ static int
 ProcAppleWMAttachTransient(register ClientPtr client)
 {
     WindowPtr pWinChild, pWinParent;
+
     REQUEST(xAppleWMAttachTransientReq);
     int err;
-    
+
     REQUEST_SIZE_MATCH(xAppleWMAttachTransientReq);
-    
-    if(!appleWMProcs->AttachTransient)
+
+    if (!appleWMProcs->AttachTransient)
         return BadRequest;
 
-    if (Success != dixLookupWindow(&pWinChild, stuff->child, client, DixReadAccess))
+    if (Success !=
+        dixLookupWindow(&pWinChild, stuff->child, client, DixReadAccess))
         return BadValue;
 
-    if(stuff->parent) {
-        if(Success != dixLookupWindow(&pWinParent, stuff->parent, client, DixReadAccess))
+    if (stuff->parent) {
+        if (Success !=
+            dixLookupWindow(&pWinParent, stuff->parent, client, DixReadAccess))
             return BadValue;
-    } else {
+    }
+    else {
         pWinParent = NULL;
     }
 
@@ -498,9 +487,7 @@ ProcAppleWMAttachTransient(register ClientPtr client)
 }
 
 static int
-ProcAppleWMSetCanQuit(
-    register ClientPtr client
-)
+ProcAppleWMSetCanQuit(register ClientPtr client)
 {
     REQUEST(xAppleWMSetCanQuitReq);
 
@@ -509,17 +496,15 @@ ProcAppleWMSetCanQuit(
     X11ApplicationSetCanQuit(stuff->state);
     return Success;
 }
-
 
 /* frame functions */
 
 static int
-ProcAppleWMFrameGetRect(
-    register ClientPtr client
-)
+ProcAppleWMFrameGetRect(register ClientPtr client)
 {
     xAppleWMFrameGetRectReply rep;
     BoxRec ir, or, rr;
+
     REQUEST(xAppleWMFrameGetRectReq);
 
     REQUEST_SIZE_MATCH(xAppleWMFrameGetRectReq);
@@ -527,13 +512,12 @@ ProcAppleWMFrameGetRect(
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+    ir = make_box(stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box(stuff->ox, stuff->oy, stuff->ow, stuff->oh);
 
     if (appleWMProcs->FrameGetRect(stuff->frame_rect,
                                    stuff->frame_class,
-                                   &or, &ir, &rr) != Success)
-    {
+                                   &or, &ir, &rr) != Success) {
         return BadValue;
     }
 
@@ -542,18 +526,17 @@ ProcAppleWMFrameGetRect(
     rep.w = rr.x2 - rr.x1;
     rep.h = rr.y2 - rr.y1;
 
-    WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *)&rep);
+    WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *) &rep);
     return Success;
 }
 
 static int
-ProcAppleWMFrameHitTest(
-    register ClientPtr client
-)
+ProcAppleWMFrameHitTest(register ClientPtr client)
 {
     xAppleWMFrameHitTestReply rep;
     BoxRec ir, or;
     int ret;
+
     REQUEST(xAppleWMFrameHitTestReq);
 
     REQUEST_SIZE_MATCH(xAppleWMFrameHitTestReq);
@@ -561,40 +544,37 @@ ProcAppleWMFrameHitTest(
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+    ir = make_box(stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box(stuff->ox, stuff->oy, stuff->ow, stuff->oh);
 
     if (appleWMProcs->FrameHitTest(stuff->frame_class, stuff->px,
-                                   stuff->py, &or, &ir, &ret) != Success)
-    {
+                                   stuff->py, &or, &ir, &ret) != Success) {
         return BadValue;
     }
 
     rep.ret = ret;
 
-    WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *)&rep);
+    WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *) &rep);
     return Success;
 }
 
 static int
-ProcAppleWMFrameDraw(
-    register ClientPtr client
-)
+ProcAppleWMFrameDraw(register ClientPtr client)
 {
     BoxRec ir, or;
     unsigned int title_length, title_max;
     unsigned char *title_bytes;
+
     REQUEST(xAppleWMFrameDrawReq);
     WindowPtr pWin;
 
     REQUEST_AT_LEAST_SIZE(xAppleWMFrameDrawReq);
 
-    if (Success != dixLookupWindow(&pWin, stuff->window, client,
-				   DixReadAccess))
+    if (Success != dixLookupWindow(&pWin, stuff->window, client, DixReadAccess))
         return BadValue;
 
-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+    ir = make_box(stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box(stuff->ox, stuff->oy, stuff->ow, stuff->oh);
 
     title_length = stuff->title_length;
     title_max = (stuff->length << 2) - sizeof(xAppleWMFrameDrawReq);
@@ -613,19 +593,15 @@ ProcAppleWMFrameDraw(
 
     return Success;
 }
-
 
 /* dispatch */
 
 static int
-ProcAppleWMDispatch (
-    register ClientPtr  client
-)
+ProcAppleWMDispatch(register ClientPtr client)
 {
     REQUEST(xReq);
 
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_AppleWMQueryVersion:
         return ProcAppleWMQueryVersion(client);
     }
@@ -633,8 +609,7 @@ ProcAppleWMDispatch (
     if (!LocalClient(client))
         return WMErrorBase + AppleWMClientNotLocal;
 
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_AppleWMSelectInput:
         return ProcAppleWMSelectInput(client);
     case X_AppleWMDisableUpdate:
@@ -667,18 +642,17 @@ ProcAppleWMDispatch (
 }
 
 static void
-SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to) {
+SNotifyEvent(xAppleWMNotifyEvent * from, xAppleWMNotifyEvent * to)
+{
     to->type = from->type;
     to->kind = from->kind;
-    cpswaps (from->sequenceNumber, to->sequenceNumber);
-    cpswapl (from->time, to->time);
-    cpswapl (from->arg, to->arg);
+    cpswaps(from->sequenceNumber, to->sequenceNumber);
+    cpswapl(from->time, to->time);
+    cpswapl(from->arg, to->arg);
 }
 
 static int
-SProcAppleWMQueryVersion(
-    register ClientPtr  client
-)
+SProcAppleWMQueryVersion(register ClientPtr client)
 {
     REQUEST(xAppleWMQueryVersionReq);
     swaps(&stuff->length);
@@ -686,9 +660,7 @@ SProcAppleWMQueryVersion(
 }
 
 static int
-SProcAppleWMDispatch (
-    register ClientPtr  client
-)
+SProcAppleWMDispatch(register ClientPtr client)
 {
     REQUEST(xReq);
 
@@ -697,8 +669,7 @@ SProcAppleWMDispatch (
         return WMErrorBase + AppleWMClientNotLocal;
 
     /* only local clients are allowed WM access */
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_AppleWMQueryVersion:
         return SProcAppleWMQueryVersion(client);
     default:
@@ -707,10 +678,9 @@ SProcAppleWMDispatch (
 }
 
 void
-AppleWMExtensionInit(
-    AppleWMProcsPtr procsPtr)
+AppleWMExtensionInit(AppleWMProcsPtr procsPtr)
 {
-    ExtensionEntry* extEntry;
+    ExtensionEntry *extEntry;
 
     ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
     EventType = CreateNewResourceType(WMFreeEvents, "WMEvent");
@@ -722,14 +692,13 @@ AppleWMExtensionInit(
                                  AppleWMNumberErrors,
                                  ProcAppleWMDispatch,
                                  SProcAppleWMDispatch,
-                                 NULL,
-                                 StandardMinorOpcode)))
-    {
+                                 NULL, StandardMinorOpcode))) {
         size_t i;
-        WMReqCode = (unsigned char)extEntry->base;
+
+        WMReqCode = (unsigned char) extEntry->base;
         WMErrorBase = extEntry->errorBase;
         WMEventBase = extEntry->eventBase;
-        for (i=0; i < AppleWMNumberEvents; i++)
+        for (i = 0; i < AppleWMNumberEvents; i++)
             EventSwapVector[WMEventBase + i] = (EventSwapPtr) SNotifyEvent;
         appleWMProcs = procsPtr;
     }
diff --git a/xorg-server/hw/xquartz/applewmExt.h b/xorg-server/hw/xquartz/applewmExt.h
index c46a7bde4..2ad9f45b9 100644
--- a/xorg-server/hw/xquartz/applewmExt.h
+++ b/xorg-server/hw/xquartz/applewmExt.h
@@ -40,20 +40,21 @@ typedef int xp_frame_class;
 typedef int xp_frame_rect;
 #endif
 
-typedef int (*DisableUpdateProc)(void);
-typedef int (*EnableUpdateProc)(void);
-typedef int (*SetWindowLevelProc)(WindowPtr pWin, int level);
-typedef int (*FrameGetRectProc)(xp_frame_rect type, xp_frame_class class, const BoxRec *outer,
-                                const BoxRec *inner, BoxRec *ret);
-typedef int (*FrameHitTestProc)(xp_frame_class class, int x, int y,
-                                const BoxRec *outer,
-                                const BoxRec *inner, int *ret);
-typedef int (*FrameDrawProc)(WindowPtr pWin, xp_frame_class class, xp_frame_attr attr,
-                             const BoxRec *outer, const BoxRec *inner,
-                             unsigned int title_len,
-                             const unsigned char *title_bytes);
-typedef int (*SendPSNProc)(uint32_t hi, uint32_t lo);
-typedef int (*AttachTransientProc)(WindowPtr pWinChild, WindowPtr pWinParent);
+typedef int (*DisableUpdateProc) (void);
+typedef int (*EnableUpdateProc) (void);
+typedef int (*SetWindowLevelProc) (WindowPtr pWin, int level);
+typedef int (*FrameGetRectProc) (xp_frame_rect type, xp_frame_class class,
+                                 const BoxRec * outer, const BoxRec * inner,
+                                 BoxRec * ret);
+typedef int (*FrameHitTestProc) (xp_frame_class class, int x, int y,
+                                 const BoxRec * outer, const BoxRec * inner,
+                                 int *ret);
+typedef int (*FrameDrawProc) (WindowPtr pWin, xp_frame_class class,
+                              xp_frame_attr attr, const BoxRec * outer,
+                              const BoxRec * inner, unsigned int title_len,
+                              const unsigned char *title_bytes);
+typedef int (*SendPSNProc) (uint32_t hi, uint32_t lo);
+typedef int (*AttachTransientProc) (WindowPtr pWinChild, WindowPtr pWinParent);
 
 /*
  * AppleWM implementation function list
@@ -69,27 +70,19 @@ typedef struct _AppleWMProcs {
     AttachTransientProc AttachTransient;
 } AppleWMProcsRec, *AppleWMProcsPtr;
 
-void AppleWMExtensionInit(
-    AppleWMProcsPtr procsPtr
-);
+void AppleWMExtensionInit(AppleWMProcsPtr procsPtr);
 
-void AppleWMSetScreenOrigin(
-    WindowPtr pWin
-);
+void AppleWMSetScreenOrigin(WindowPtr pWin);
 
-Bool AppleWMDoReorderWindow(
-    WindowPtr pWin
-);
+Bool AppleWMDoReorderWindow(WindowPtr pWin);
 
-void AppleWMSendEvent(
-    int             /* type */,
-    unsigned int    /* mask */,
-    int             /* which */,
-    int             /* arg */
-);
+void AppleWMSendEvent(int /* type */ ,
+                      unsigned int /* mask */ ,
+                      int /* which */ ,
+                      int       /* arg */
+    );
 
-unsigned int AppleWMSelectedEvents(
-    void
-);
+unsigned int AppleWMSelectedEvents(void
+    );
 
-#endif /* _APPLEWMEXT_H_ */
+#endif                          /* _APPLEWMEXT_H_ */
diff --git a/xorg-server/hw/xquartz/console_redirect.c b/xorg-server/hw/xquartz/console_redirect.c
index 70a819e42..0f96a9512 100644
--- a/xorg-server/hw/xquartz/console_redirect.c
+++ b/xorg-server/hw/xquartz/console_redirect.c
@@ -94,12 +94,15 @@ static int n_redirect_fds = 0;
  *      were processed.  If the pipe is still open, the number of read bytes
  *      is returned.
  */
-static inline int _read_redirect(int fd, int flush) {
+static inline int
+_read_redirect(int fd, int flush)
+{
     int total_read = 0;
     int nbytes;
     asl_redirect *aslr = &redirect_fds[fd];
 
-    while((nbytes = read(fd, aslr->w, BUF_SIZE - (aslr->w - aslr->buf) - 1)) > 0) {
+    while ((nbytes =
+            read(fd, aslr->w, BUF_SIZE - (aslr->w - aslr->buf) - 1)) > 0) {
         char *s, *p;
 
         /* Increment our returned number read */
@@ -109,17 +112,19 @@ static inline int _read_redirect(int fd, int flush) {
         aslr->buf[nbytes] = '\0';
 
         /* One line at a time */
-        for(p=aslr->buf; *p && (p - aslr->buf) < nbytes; p = s + 1) {
+        for (p = aslr->buf; *p && (p - aslr->buf) < nbytes; p = s + 1) {
             // Find null or \n
-            for(s=p; *s && *s != '\n'; s++);
-            if(*s == '\n') {
-                *s='\0';
+            for (s = p; *s && *s != '\n'; s++);
+            if (*s == '\n') {
+                *s = '\0';
                 asl_log(aslr->asl, aslr->msg, aslr->level, "%s", p);
-            } else if(aslr->buf != p) {
+            }
+            else if (aslr->buf != p) {
                 memmove(aslr->buf, p, BUF_SIZE - (p - aslr->buf));
                 aslr->w = aslr->buf + (s - p);
                 break;
-            } else if(nbytes == BUF_SIZE - 1) {
+            }
+            else if (nbytes == BUF_SIZE - 1) {
                 asl_log(aslr->asl, aslr->msg, aslr->level, "%s", p);
                 aslr->w = aslr->buf;
                 break;
@@ -128,29 +133,34 @@ static inline int _read_redirect(int fd, int flush) {
     }
 
     /* Flush if requested or we're at EOF */
-    if(flush || nbytes == 0) {
-        if(aslr->w > aslr->buf) {
+    if (flush || nbytes == 0) {
+        if (aslr->w > aslr->buf) {
             *aslr->w = '\0';
             asl_log(aslr->asl, aslr->msg, aslr->level, "%s", aslr->buf);
         }
     }
 
-    if(nbytes == 0)
+    if (nbytes == 0)
         return EOF;
     return total_read;
 }
 
 #ifdef HAVE_LIBDISPATCH
-static void read_from_source(void *_source) {
-    dispatch_source_t source = (dispatch_source_t)_source;
+static void
+read_from_source(void *_source)
+{
+    dispatch_source_t source = (dispatch_source_t) _source;
     int fd = dispatch_source_get_handle(source);
-    if(_read_redirect(fd, 0) == EOF) {
+
+    if (_read_redirect(fd, 0) == EOF) {
         dispatch_source_cancel(source);
     }
 }
 
-static void cancel_source(void *_source) {
-    dispatch_source_t source = (dispatch_source_t)_source;
+static void
+cancel_source(void *_source)
+{
+    dispatch_source_t source = (dispatch_source_t) _source;
     int fd = dispatch_source_get_handle(source);
     asl_redirect *aslr = &redirect_fds[fd];
 
@@ -164,63 +174,70 @@ static void cancel_source(void *_source) {
     dispatch_group_leave(read_source_group);
 }
 
-#else /* !HAVE_LIBDISPATCH */
-static void *redirect_thread(void *ctx __unused) {
+#else                           /* !HAVE_LIBDISPATCH */
+static void *
+redirect_thread(void *ctx __unused)
+{
     struct kevent ev;
     int n;
 
-    while(1) {
+    while (1) {
         n = kevent(kq, NULL, 0, &ev, 1, NULL);
 
         /* Bail on errors */
-        if(n < 0) {
-            asl_log(NULL, NULL, ASL_LEVEL_ERR, "kevent failure: %s", strerror(errno));
+        if (n < 0) {
+            asl_log(NULL, NULL, ASL_LEVEL_ERR, "kevent failure: %s",
+                    strerror(errno));
             break;
         }
-        
+
         /* This should not happen */
-        if(n == 0)
+        if (n == 0)
             continue;
 
-        switch(ev.filter) {
-            case EVFILT_READ:
-                pthread_mutex_lock(&redirect_fds_lock);
-                {
-                    int fd = ev.ident;
-                    int close_fd = 0;
-                    asl_redirect *aslr = &redirect_fds[fd];
-
-                    if(fd < 0 || fd >= n_redirect_fds || aslr->buf == NULL) {
-                        asl_log(NULL, NULL, ASL_LEVEL_ERR, "Unexpected file descriptor: %d", fd);
-                        goto next;
-                    }
+        switch (ev.filter) {
+        case EVFILT_READ:
+            pthread_mutex_lock(&redirect_fds_lock);
+            {
+                int fd = ev.ident;
+                int close_fd = 0;
+                asl_redirect *aslr = &redirect_fds[fd];
+
+                if (fd < 0 || fd >= n_redirect_fds || aslr->buf == NULL) {
+                    asl_log(NULL, NULL, ASL_LEVEL_ERR,
+                            "Unexpected file descriptor: %d", fd);
+                    goto next;
+                }
 
-                    if(ev.flags & EV_EOF) {
-                        close_fd = 1;
-                        if(EOF != _read_redirect(fd, 1)) {
-                            asl_log(NULL, NULL, ASL_LEVEL_ERR, "kevent reported EOF on %d, but read doesn't concur.", fd);
-                        }
-                    } else {
-                        close_fd = (EOF == _read_redirect(fd, 0));
-                    }
-                    
-                    if(close_fd) {
-                        EV_SET(&ev, fd, EVFILT_READ, EV_DELETE, 0, 0, 0);
-                        kevent(kq, &ev, 1, NULL, 0, NULL);
-                        close(fd);
-                        free(aslr->buf);
-                        memset(aslr, 0, sizeof(*aslr));
+                if (ev.flags & EV_EOF) {
+                    close_fd = 1;
+                    if (EOF != _read_redirect(fd, 1)) {
+                        asl_log(NULL, NULL, ASL_LEVEL_ERR,
+                                "kevent reported EOF on %d, but read doesn't concur.",
+                                fd);
                     }
                 }
-                next:
-                pthread_mutex_unlock(&redirect_fds_lock);
+                else {
+                    close_fd = (EOF == _read_redirect(fd, 0));
+                }
+
+                if (close_fd) {
+                    EV_SET(&ev, fd, EVFILT_READ, EV_DELETE, 0, 0, 0);
+                    kevent(kq, &ev, 1, NULL, 0, NULL);
+                    close(fd);
+                    free(aslr->buf);
+                    memset(aslr, 0, sizeof(*aslr));
+                }
+            }
+ next:
+            pthread_mutex_unlock(&redirect_fds_lock);
 
-            case EVFILT_TIMER:
-                if(ev.udata == ASL_REDIRECT_TERMINATE)
-                    return NULL;
+        case EVFILT_TIMER:
+            if (ev.udata == ASL_REDIRECT_TERMINATE)
+                return NULL;
 
-            default:
-                ;;
+        default:
+            ;;
         }
     }
 
@@ -228,9 +245,11 @@ static void *redirect_thread(void *ctx __unused) {
 }
 #endif
 
-static void redirect_atexit(void) {
+static void
+redirect_atexit(void)
+{
     /* stdout is linebuffered, so flush the buffer */
-    if(redirect_fds[STDOUT_FILENO].buf)
+    if (redirect_fds[STDOUT_FILENO].buf)
         fflush(stdout);
 
 #ifdef HAVE_LIBDISPATCH
@@ -238,30 +257,35 @@ static void redirect_atexit(void) {
         int i;
 
         /* Cancel all of our dispatch sources, so they flush to ASL */
-        for(i=0; i < n_redirect_fds; i++)
-            if(redirect_fds[i].read_source)
+        for (i = 0; i < n_redirect_fds; i++)
+            if (redirect_fds[i].read_source)
                 dispatch_source_cancel(redirect_fds[i].read_source);
 
         /* Wait at least three seconds for our sources to flush to ASL */
-        dispatch_group_wait(read_source_group, dispatch_time(DISPATCH_TIME_NOW, 3LL * NSEC_PER_SEC));
+        dispatch_group_wait(read_source_group,
+                            dispatch_time(DISPATCH_TIME_NOW,
+                                          3LL * NSEC_PER_SEC));
     }
 #else
     {
         struct kevent ev;
 
         /* Tell our reader thread it is time to pack up and go home */
-        EV_SET(&ev, 0, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 0, ASL_REDIRECT_TERMINATE);
+        EV_SET(&ev, 0, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 0,
+               ASL_REDIRECT_TERMINATE);
         kevent(kq, &ev, 1, NULL, 0, NULL);
-    
+
         pthread_join(redirect_pthread, NULL);
     }
 #endif
 }
 
 #ifdef HAVE_LIBDISPATCH
-static void xq_asl_init(void *ctx __unused)
+static void
+xq_asl_init(void *ctx __unused)
 #else
-static void xq_asl_init(void)
+static void
+xq_asl_init(void)
 #endif
 {
     assert((redirect_fds = calloc(16, sizeof(*redirect_fds))) != NULL);
@@ -281,20 +305,24 @@ static void xq_asl_init(void)
     atexit(redirect_atexit);
 }
 
-int xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd) {
+int
+xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd)
+{
 #ifdef HAVE_LIBDISPATCH
     int err __block = 0;
     static dispatch_once_t once_control;
+
     dispatch_once_f(&once_control, NULL, xq_asl_init);
 #else
     int err = 0;
     static pthread_once_t once_control = PTHREAD_ONCE_INIT;
+
     assert(pthread_once(&once_control, xq_asl_init) == 0);
 #endif
-    
-    if(fd < 0)
+
+    if (fd < 0)
         return EBADF;
-    
+
 #ifdef HAVE_LIBDISPATCH
 #define BLOCK_DONE return
     dispatch_sync(redirect_serial_q, ^
@@ -304,10 +332,11 @@ int xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd) {
 #endif
     {
         /* Reallocate if we need more space */
-        if(fd >= n_redirect_fds) {
+        if (fd >= n_redirect_fds) {
             size_t new_n = 1 << (ffs(fd) + 1);
-            asl_redirect *new_array = realloc(redirect_fds, new_n * sizeof(*redirect_fds));
-            if(!new_array) {
+            asl_redirect *new_array =
+                realloc(redirect_fds, new_n * sizeof(*redirect_fds));
+            if (!new_array) {
                 err = errno;
                 BLOCK_DONE;
             }
@@ -315,33 +344,35 @@ int xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd) {
             memset(redirect_fds + n_redirect_fds, 0, new_n - n_redirect_fds);
             n_redirect_fds = new_n;
         }
-        
+
         /* If we're already listening on it, return error. */
-        if(redirect_fds[fd].buf != NULL) {
+        if (redirect_fds[fd].buf != NULL) {
             err = EBADF;
             BLOCK_DONE;
         }
-        
+
         /* Initialize our buffer */
-        redirect_fds[fd].buf = (char *)malloc(BUF_SIZE);
-        if(redirect_fds[fd].buf == NULL) {
+        redirect_fds[fd].buf = (char *) malloc(BUF_SIZE);
+        if (redirect_fds[fd].buf == NULL) {
             err = errno;
             BLOCK_DONE;
         }
         redirect_fds[fd].w = redirect_fds[fd].buf;
-        
+
         /* Store our ASL settings */
         redirect_fds[fd].level = level;
         redirect_fds[fd].asl = asl;
         redirect_fds[fd].msg = msg;
-        
+
         /* Don't block on reads from this fd */
         fcntl(fd, F_SETFL, O_NONBLOCK);
-        
+
         /* Start listening */
 #ifdef HAVE_LIBDISPATCH
         {
-            dispatch_source_t read_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ, fd, 0, redirect_serial_q);
+            dispatch_source_t read_source =
+                dispatch_source_create(DISPATCH_SOURCE_TYPE_READ, fd, 0,
+                                       redirect_serial_q);
             redirect_fds[fd].read_source = read_source;
             dispatch_set_context(read_source, read_source);
             dispatch_source_set_event_handler_f(read_source, read_from_source);
@@ -352,6 +383,7 @@ int xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd) {
 #else
         {
             struct kevent ev;
+
             EV_SET(&ev, fd, EVFILT_READ, EV_ADD, 0, 0, 0);
             kevent(kq, &ev, 1, NULL, 0, NULL);
         }
@@ -360,36 +392,38 @@ int xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd) {
 #ifdef HAVE_LIBDISPATCH
     );
 #else
-done:
+ done:
     assert(pthread_mutex_unlock(&redirect_fds_lock) == 0);
 #endif
 #undef BLOCK_DONE
-    
+
     return err;
 }
 
-int xq_asl_capture_fd(aslclient asl, aslmsg msg, int level, int fd) {
+int
+xq_asl_capture_fd(aslclient asl, aslmsg msg, int level, int fd)
+{
     int pipepair[2];
-    
+
     /* Create pipe */
-    if(pipe(pipepair) == -1)
+    if (pipe(pipepair) == -1)
         return errno;
-    
+
     /* Close the read fd but not the write fd on exec */
-    if(fcntl(pipepair[0], F_SETFD, FD_CLOEXEC) == -1)
+    if (fcntl(pipepair[0], F_SETFD, FD_CLOEXEC) == -1)
         return errno;
 
     /* Replace the existing fd */
-    if(dup2(pipepair[1], fd) == -1) {
+    if (dup2(pipepair[1], fd) == -1) {
         close(pipepair[0]);
         close(pipepair[1]);
         return errno;
     }
 
     /* If we capture STDOUT_FILENO, make sure we linebuffer stdout */
-    if(fd == STDOUT_FILENO)
+    if (fd == STDOUT_FILENO)
         setlinebuf(stdout);
-    
+
     /* Close the duplicate fds since they've been reassigned */
     close(pipepair[1]);
 
@@ -398,7 +432,9 @@ int xq_asl_capture_fd(aslclient asl, aslmsg msg, int level, int fd) {
 }
 
 #ifdef DEBUG_CONSOLE_REDIRECT
-int main(int argc __unused, char **argv __unused) {
+int
+main(int argc __unused, char **argv __unused)
+{
     xq_asl_capture_fd(NULL, NULL, ASL_LEVEL_NOTICE, STDOUT_FILENO);
     xq_asl_capture_fd(NULL, NULL, ASL_LEVEL_ERR, STDERR_FILENO);
 
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index 465a96d12..a0ce377b1 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -38,10 +38,10 @@
 #include "servermd.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
-#include "mibstore.h"		// mi backing store implementation
-#include "mipointer.h"		// mi software cursor
-#include "micmap.h"		// mi colormap code
-#include "fb.h"			// fb framebuffer code
+#include "mibstore.h"           // mi backing store implementation
+#include "mipointer.h"          // mi software cursor
+#include "micmap.h"             // mi colormap code
+#include "fb.h"                 // fb framebuffer code
 #include "site.h"
 #include "globals.h"
 #include "dix.h"
@@ -79,21 +79,24 @@
 
 aslclient aslc;
 
-void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...) {
+void
+xq_asl_log(int level, const char *subsystem, const char *file,
+           const char *function, int line, const char *fmt, ...)
+{
     va_list args;
     aslmsg msg = asl_new(ASL_TYPE_MSG);
 
-    if(msg) {
+    if (msg) {
         char *_line;
 
         asl_set(msg, "File", file);
         asl_set(msg, "Function", function);
         asprintf(&_line, "%d", line);
-        if(_line) {
+        if (_line) {
             asl_set(msg, "Line", _line);
             free(_line);
         }
-        if(subsystem)
+        if (subsystem)
             asl_set(msg, "Subsystem", subsystem);
     }
 
@@ -101,82 +104,86 @@ void xq_asl_log (int level, const char *subsystem, const char *file, const char
     asl_vlog(aslc, msg, level, fmt, args);
     va_end(args);
 
-    if(msg)
+    if (msg)
         asl_free(msg);
 }
 
 /*
  * X server shared global variables
  */
-int                     darwinScreensFound = 0;
-DevPrivateKeyRec        darwinScreenKeyRec;
-io_connect_t            darwinParamConnect = 0;
-int                     darwinEventReadFD = -1;
-int                     darwinEventWriteFD = -1;
+int darwinScreensFound = 0;
+DevPrivateKeyRec darwinScreenKeyRec;
+io_connect_t darwinParamConnect = 0;
+int darwinEventReadFD = -1;
+int darwinEventWriteFD = -1;
+
 // int                     darwinMouseAccelChange = 1;
-int                     darwinFakeButtons = 0;
+int darwinFakeButtons = 0;
 
 // location of X11's (0,0) point in global screen coordinates
-int                     darwinMainScreenX = 0;
-int                     darwinMainScreenY = 0;
+int darwinMainScreenX = 0;
+int darwinMainScreenY = 0;
 
 // parameters read from the command line or user preferences
-int                     darwinDesiredDepth = -1;
-int                     darwinSyncKeymap = FALSE;
+int darwinDesiredDepth = -1;
+int darwinSyncKeymap = FALSE;
 
 // modifier masks for faking mouse buttons - ANY of these bits trigger it  (not all)
 #ifdef NX_DEVICELCMDKEYMASK
-int                     darwinFakeMouse2Mask = NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
-int                     darwinFakeMouse3Mask = NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;
+int darwinFakeMouse2Mask = NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
+int darwinFakeMouse3Mask = NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;
 #else
-int                     darwinFakeMouse2Mask = NX_ALTERNATEMASK;
-int                     darwinFakeMouse3Mask = NX_COMMANDMASK;
+int darwinFakeMouse2Mask = NX_ALTERNATEMASK;
+int darwinFakeMouse3Mask = NX_COMMANDMASK;
 #endif
 
 // Modifier mask for overriding event delivery to appkit (might be useful to set this to rcommand for input menu
-unsigned int            darwinAppKitModMask = 0; // Any of these bits
+unsigned int darwinAppKitModMask = 0;   // Any of these bits
 
 // Modifier mask for items in the Window menu (0 and -1 cause shortcuts to be disabled)
-unsigned int            windowItemModMask = NX_COMMANDMASK;
+unsigned int windowItemModMask = NX_COMMANDMASK;
 
 // devices
-DeviceIntPtr            darwinKeyboard = NULL;
-DeviceIntPtr            darwinPointer = NULL;
-DeviceIntPtr            darwinTabletStylus = NULL;
-DeviceIntPtr            darwinTabletCursor = NULL;
-DeviceIntPtr            darwinTabletEraser = NULL;
+DeviceIntPtr darwinKeyboard = NULL;
+DeviceIntPtr darwinPointer = NULL;
+DeviceIntPtr darwinTabletStylus = NULL;
+DeviceIntPtr darwinTabletCursor = NULL;
+DeviceIntPtr darwinTabletEraser = NULL;
 
 // Common pixmap formats
 static PixmapFormatRec formats[] = {
-        { 1,    1,      BITMAP_SCANLINE_PAD },
-        { 4,    8,      BITMAP_SCANLINE_PAD },
-        { 8,    8,      BITMAP_SCANLINE_PAD },
-        { 15,   16,     BITMAP_SCANLINE_PAD },
-        { 16,   16,     BITMAP_SCANLINE_PAD },
-        { 24,   32,     BITMAP_SCANLINE_PAD },
-        { 32,   32,     BITMAP_SCANLINE_PAD }
+    {1, 1, BITMAP_SCANLINE_PAD},
+    {4, 8, BITMAP_SCANLINE_PAD},
+    {8, 8, BITMAP_SCANLINE_PAD},
+    {15, 16, BITMAP_SCANLINE_PAD},
+    {16, 16, BITMAP_SCANLINE_PAD},
+    {24, 32, BITMAP_SCANLINE_PAD},
+    {32, 32, BITMAP_SCANLINE_PAD}
 };
-const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);
+
+const int NUMFORMATS = sizeof(formats) / sizeof(formats[0]);
 
 void
 DarwinPrintBanner(void)
-{ 
-  ErrorF("Xquartz starting:\n");
-  ErrorF("X.Org X Server %s\n", XSERVER_VERSION);
-  ErrorF("Build Date: %s\n", BUILD_DATE );
+{
+    ErrorF("Xquartz starting:\n");
+    ErrorF("X.Org X Server %s\n", XSERVER_VERSION);
+    ErrorF("Build Date: %s\n", BUILD_DATE);
 }
 
-
 /*
  * DarwinSaveScreen
  *  X screensaver support. Not implemented.
  */
-static Bool DarwinSaveScreen(ScreenPtr pScreen, int on)
+static Bool
+DarwinSaveScreen(ScreenPtr pScreen, int on)
 {
     // FIXME
     if (on == SCREEN_SAVER_FORCER) {
-    } else if (on == SCREEN_SAVER_ON) {
-    } else {
+    }
+    else if (on == SCREEN_SAVER_ON) {
+    }
+    else {
     }
     return TRUE;
 }
@@ -186,14 +193,16 @@ static Bool DarwinSaveScreen(ScreenPtr pScreen, int on)
  *  This is a callback from dix during AddScreen() from InitOutput().
  *  Initialize the screen and communicate information about it back to dix.
  */
-static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) {
-    int         dpi;
-    static int  foundIndex = 0;
-    Bool        ret;
+static Bool
+DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
+{
+    int dpi;
+    static int foundIndex = 0;
+    Bool ret;
     DarwinFramebufferPtr dfb;
 
     if (!dixRegisterPrivateKey(&darwinScreenKeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
 
     // reset index of found screens for each server generation
     if (index == 0) {
@@ -212,23 +221,27 @@ static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv
     // setup hardware/mode specific details
     ret = QuartzAddScreen(foundIndex, pScreen);
     foundIndex++;
-    if (! ret)
+    if (!ret)
         return FALSE;
 
     // setup a single visual appropriate for our pixel type
-    if(!miSetVisualTypesAndMasks(dfb->depth, dfb->visuals, dfb->bitsPerRGB,
-                                 dfb->preferredCVC, dfb->redMask,
-                                 dfb->greenMask, dfb->blueMask)) {
+    if (!miSetVisualTypesAndMasks(dfb->depth, dfb->visuals, dfb->bitsPerRGB,
+                                  dfb->preferredCVC, dfb->redMask,
+                                  dfb->greenMask, dfb->blueMask)) {
         return FALSE;
     }
-  
+
 // TODO: Make PseudoColor visuals not suck in TrueColor mode  
 //    if(dfb->depth > 8)
 //        miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
-    if(dfb->depth > 15)
-        miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor, RM_ARGB(0,5,5,5), GM_ARGB(0,5,5,5), BM_ARGB(0,5,5,5));
-    if(dfb->depth > 24)
-        miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor, RM_ARGB(0,8,8,8), GM_ARGB(0,8,8,8), BM_ARGB(0,8,8,8));
+    if (dfb->depth > 15)
+        miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor,
+                                 RM_ARGB(0, 5, 5, 5), GM_ARGB(0, 5, 5, 5),
+                                 BM_ARGB(0, 5, 5, 5));
+    if (dfb->depth > 24)
+        miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor,
+                                 RM_ARGB(0, 8, 8, 8), GM_ARGB(0, 8, 8, 8),
+                                 BM_ARGB(0, 8, 8, 8));
 
     miSetPixmapDepths();
 
@@ -240,17 +253,16 @@ static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv
         dpi = 96;
 
     // initialize fb
-    if (! fbScreenInit(pScreen,
-                dfb->framebuffer,                 // pointer to screen bitmap
-                dfb->width, dfb->height,          // screen size in pixels
-                dpi, dpi,                         // dots per inch
-                dfb->pitch/(dfb->bitsPerPixel/8), // pixel width of framebuffer
-                dfb->bitsPerPixel))               // bits per pixel for screen
+    if (!fbScreenInit(pScreen, dfb->framebuffer,        // pointer to screen bitmap
+                      dfb->width, dfb->height,  // screen size in pixels
+                      dpi, dpi, // dots per inch
+                      dfb->pitch / (dfb->bitsPerPixel / 8),     // pixel width of framebuffer
+                      dfb->bitsPerPixel))       // bits per pixel for screen
     {
         return FALSE;
     }
 
-    if (! fbPictureInit(pScreen, 0, 0)) {
+    if (!fbPictureInit(pScreen, 0, 0)) {
         return FALSE;
     }
 
@@ -268,7 +280,7 @@ static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv
 
     // create and install the default colormap and
     // set pScreen->blackPixel / pScreen->white
-    if (!miCreateDefColormap( pScreen )) {
+    if (!miCreateDefColormap(pScreen)) {
         return FALSE;
     }
 
@@ -276,7 +288,7 @@ static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv
     pScreen->y = dfb->y;
 
     /*    ErrorF("Screen %d added: %dx%d @ (%d,%d)\n",
-	  index, dfb->width, dfb->height, dfb->x, dfb->y); */
+       index, dfb->width, dfb->height, dfb->x, dfb->y); */
 
     return TRUE;
 }
@@ -292,100 +304,110 @@ static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv
 /*
  * DarwinMouseProc: Handle the initialization, etc. of a mouse
  */
-static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
+static int
+DarwinMouseProc(DeviceIntPtr pPointer, int what)
+{
 #define NBUTTONS 7
 #define NAXES 2
-	// 7 buttons: left, right, middle, then four scroll wheel "buttons"
-    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3, 4, 5, 6, 7};
-    Atom btn_labels[NBUTTONS] = {0};
-    Atom axes_labels[NAXES] = {0};
+    // 7 buttons: left, right, middle, then four scroll wheel "buttons"
+    CARD8 map[NBUTTONS + 1] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+    Atom btn_labels[NBUTTONS] = { 0 };
+    Atom axes_labels[NAXES] = { 0 };
 
     switch (what) {
-        case DEVICE_INIT:
-            pPointer->public.on = FALSE;
-
-            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
-            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
-            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
-            btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
-            btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
-            btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
-            btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
-
-            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
-            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
-
-
-            // Set button map.
-            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
-                                    btn_labels,
-                                    (PtrCtrlProcPtr)NoopDDA,
-                                    GetMotionHistorySize(), NAXES,
-                                    axes_labels);
-            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Absolute);
-            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Absolute);
-            break;
-        case DEVICE_ON:
-            pPointer->public.on = TRUE;
-            AddEnabledDevice( darwinEventReadFD );
-            return Success;
-        case DEVICE_CLOSE:
-        case DEVICE_OFF:
-            pPointer->public.on = FALSE;
-            RemoveEnabledDevice(darwinEventReadFD);
-            return Success;
+    case DEVICE_INIT:
+        pPointer->public.on = FALSE;
+
+        btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+        btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+        btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+        btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+        btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+        btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+        btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
+
+        axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+        axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+
+        // Set button map.
+        InitPointerDeviceStruct((DevicePtr) pPointer, map, NBUTTONS,
+                                btn_labels,
+                                (PtrCtrlProcPtr) NoopDDA,
+                                GetMotionHistorySize(), NAXES, axes_labels);
+        InitValuatorAxisStruct(pPointer, 0, axes_labels[0], NO_AXIS_LIMITS,
+                               NO_AXIS_LIMITS, 0, 0, 0, Absolute);
+        InitValuatorAxisStruct(pPointer, 1, axes_labels[1], NO_AXIS_LIMITS,
+                               NO_AXIS_LIMITS, 0, 0, 0, Absolute);
+        break;
+    case DEVICE_ON:
+        pPointer->public.on = TRUE;
+        AddEnabledDevice(darwinEventReadFD);
+        return Success;
+    case DEVICE_CLOSE:
+    case DEVICE_OFF:
+        pPointer->public.on = FALSE;
+        RemoveEnabledDevice(darwinEventReadFD);
+        return Success;
     }
-    
+
     return Success;
 #undef NBUTTONS
 #undef NAXES
 }
 
-static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {
+static int
+DarwinTabletProc(DeviceIntPtr pPointer, int what)
+{
 #define NBUTTONS 3
 #define NAXES 5
-    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3};
-    Atom btn_labels[NBUTTONS] = {0};
-    Atom axes_labels[NAXES] = {0};
+    CARD8 map[NBUTTONS + 1] = { 0, 1, 2, 3 };
+    Atom btn_labels[NBUTTONS] = { 0 };
+    Atom axes_labels[NAXES] = { 0 };
 
     switch (what) {
-        case DEVICE_INIT:
-            pPointer->public.on = FALSE;
-
-            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
-            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
-            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
-
-            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
-            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
-            axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
-            axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X);
-            axes_labels[4] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y);
-
-            // Set button map.
-            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
-                                    btn_labels,
-                                    (PtrCtrlProcPtr)NoopDDA,
-                                    GetMotionHistorySize(), NAXES,
-                                    axes_labels);
-            InitProximityClassDeviceStruct(pPointer);
-
-            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
-            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
-            InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
-            InitValuatorAxisStruct(pPointer, 3, axes_labels[3], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
-            InitValuatorAxisStruct(pPointer, 4, axes_labels[4], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+    case DEVICE_INIT:
+        pPointer->public.on = FALSE;
+
+        btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+        btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+        btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+
+        axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
+        axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
+        axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
+        axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X);
+        axes_labels[4] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y);
+
+        // Set button map.
+        InitPointerDeviceStruct((DevicePtr) pPointer, map, NBUTTONS,
+                                btn_labels,
+                                (PtrCtrlProcPtr) NoopDDA,
+                                GetMotionHistorySize(), NAXES, axes_labels);
+        InitProximityClassDeviceStruct(pPointer);
+
+        InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0,
+                               XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+        InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0,
+                               XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+        InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 0,
+                               XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+        InitValuatorAxisStruct(pPointer, 3, axes_labels[3],
+                               -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT,
+                               1, 0, 1, Absolute);
+        InitValuatorAxisStruct(pPointer, 4, axes_labels[4],
+                               -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT,
+                               1, 0, 1, Absolute);
 //          pPointer->use = IsXExtensionDevice;
-            break;
-        case DEVICE_ON:
-            pPointer->public.on = TRUE;
-            AddEnabledDevice( darwinEventReadFD );
-            return Success;
-        case DEVICE_CLOSE:
-        case DEVICE_OFF:
-            pPointer->public.on = FALSE;
-            RemoveEnabledDevice(darwinEventReadFD);
-            return Success;
+        break;
+    case DEVICE_ON:
+        pPointer->public.on = TRUE;
+        AddEnabledDevice(darwinEventReadFD);
+        return Success;
+    case DEVICE_CLOSE:
+    case DEVICE_OFF:
+        pPointer->public.on = FALSE;
+        RemoveEnabledDevice(darwinEventReadFD);
+        return Success;
     }
     return Success;
 #undef NBUTTONS
@@ -396,22 +418,23 @@ static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {
  * DarwinKeybdProc
  *  Callback from X
  */
-static int DarwinKeybdProc( DeviceIntPtr pDev, int onoff )
+static int
+DarwinKeybdProc(DeviceIntPtr pDev, int onoff)
 {
-    switch ( onoff ) {
-        case DEVICE_INIT:
-            DarwinKeyboardInit( pDev );
-            break;
-        case DEVICE_ON:
-            pDev->public.on = TRUE;
-            AddEnabledDevice( darwinEventReadFD );
-            break;
-        case DEVICE_OFF:
-            pDev->public.on = FALSE;
-            RemoveEnabledDevice( darwinEventReadFD );
-            break;
-        case DEVICE_CLOSE:
-            break;
+    switch (onoff) {
+    case DEVICE_INIT:
+        DarwinKeyboardInit(pDev);
+        break;
+    case DEVICE_ON:
+        pDev->public.on = TRUE;
+        AddEnabledDevice(darwinEventReadFD);
+        break;
+    case DEVICE_OFF:
+        pDev->public.on = FALSE;
+        RemoveEnabledDevice(darwinEventReadFD);
+        break;
+    case DEVICE_CLOSE:
+        break;
     }
 
     return Success;
@@ -429,7 +452,8 @@ static int DarwinKeybdProc( DeviceIntPtr pDev, int onoff )
  * DarwinParseModifierList
  *  Parse a list of modifier names and return a corresponding modifier mask
  */
-int DarwinParseModifierList(const char *constmodifiers, int separatelr)
+int
+DarwinParseModifierList(const char *constmodifiers, int separatelr)
 {
     int result = 0;
 
@@ -440,9 +464,9 @@ int DarwinParseModifierList(const char *constmodifiers, int separatelr)
         char *p = modifiers;
 
         while (p) {
-            modifier = strsep(&p, " ,+&|/"); // allow lots of separators
+            modifier = strsep(&p, " ,+&|/");    // allow lots of separators
             nxkey = DarwinModifierStringToNXMask(modifier, separatelr);
-            if(nxkey)
+            if (nxkey)
                 result |= nxkey;
             else
                 ErrorF("fakebuttons: Unknown modifier \"%s\"\n", modifier);
@@ -464,10 +488,12 @@ int DarwinParseModifierList(const char *constmodifiers, int separatelr)
  * InitInput
  *  Register the keyboard and mouse devices
  */
-void InitInput( int argc, char **argv )
+void
+InitInput(int argc, char **argv)
 {
-    XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",
-                          .variant = NULL, .options = NULL };
+    XkbRMLVOSet rmlvo = {.rules = "base",.model = "empty",.layout = "empty",
+        .variant = NULL,.options = NULL
+    };
     /* We need to really have rules... or something... */
     XkbSetRulesDflts(&rmlvo);
 
@@ -475,18 +501,18 @@ void InitInput( int argc, char **argv )
     darwinKeyboard->name = strdup("keyboard");
 
     /* here's the snippet from the current gdk sources:
-    if (!strcmp (tmp_name, "pointer"))
-        gdkdev->info.source = GDK_SOURCE_MOUSE;
-    else if (!strcmp (tmp_name, "wacom") ||
-             !strcmp (tmp_name, "pen"))
-        gdkdev->info.source = GDK_SOURCE_PEN;
-    else if (!strcmp (tmp_name, "eraser"))
-        gdkdev->info.source = GDK_SOURCE_ERASER;
-    else if (!strcmp (tmp_name, "cursor"))
-        gdkdev->info.source = GDK_SOURCE_CURSOR;
-    else
-        gdkdev->info.source = GDK_SOURCE_PEN;
-    */
+       if (!strcmp (tmp_name, "pointer"))
+       gdkdev->info.source = GDK_SOURCE_MOUSE;
+       else if (!strcmp (tmp_name, "wacom") ||
+       !strcmp (tmp_name, "pen"))
+       gdkdev->info.source = GDK_SOURCE_PEN;
+       else if (!strcmp (tmp_name, "eraser"))
+       gdkdev->info.source = GDK_SOURCE_ERASER;
+       else if (!strcmp (tmp_name, "cursor"))
+       gdkdev->info.source = GDK_SOURCE_CURSOR;
+       else
+       gdkdev->info.source = GDK_SOURCE_PEN;
+     */
 
     darwinPointer = AddInputDevice(serverClient, DarwinMouseProc, TRUE);
     darwinPointer->name = strdup("pointer");
@@ -505,7 +531,8 @@ void InitInput( int argc, char **argv )
     QuartzInitInput(argc, argv);
 }
 
-void CloseInput(void)
+void
+CloseInput(void)
 {
     DarwinEQFini();
 }
@@ -525,18 +552,18 @@ void CloseInput(void)
  *  easier target to hit.
  */
 void
-DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)
+DarwinAdjustScreenOrigins(ScreenInfo * pScreenInfo)
 {
     int i, left, top;
 
     left = pScreenInfo->screens[0]->x;
-    top  = pScreenInfo->screens[0]->y;
+    top = pScreenInfo->screens[0]->y;
 
     /* Find leftmost screen. If there's a tie, take the topmost of the two. */
     for (i = 1; i < pScreenInfo->numScreens; i++) {
-        if (pScreenInfo->screens[i]->x < left  ||
-            (pScreenInfo->screens[i]->x == left && pScreenInfo->screens[i]->y < top))
-        {
+        if (pScreenInfo->screens[i]->x < left ||
+            (pScreenInfo->screens[i]->x == left &&
+             pScreenInfo->screens[i]->y < top)) {
             left = pScreenInfo->screens[i]->x;
             top = pScreenInfo->screens[i]->y;
         }
@@ -544,7 +571,7 @@ DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)
 
     darwinMainScreenX = left;
     darwinMainScreenY = top;
-    
+
     DEBUG_LOG("top = %d, left=%d\n", top, left);
 
     /* Shift all screens so that there is a screen whose top left
@@ -557,12 +584,12 @@ DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)
             pScreenInfo->screens[i]->x -= darwinMainScreenX;
             pScreenInfo->screens[i]->y -= darwinMainScreenY;
             DEBUG_LOG("Screen %d placed at X11 coordinate (%d,%d).\n",
-                      i, pScreenInfo->screens[i]->x, pScreenInfo->screens[i]->y);
+                      i, pScreenInfo->screens[i]->x,
+                      pScreenInfo->screens[i]->y);
         }
     }
 }
 
-
 /*
  * InitOutput
  *  Initialize screenInfo for all actually accessible framebuffers.
@@ -576,7 +603,8 @@ DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)
  *  After other screen setup has been done, a mode specific
  *  SetupScreen function can be called to finalize screen setup.
  */
-void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
+void
+InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
 {
     int i;
 
@@ -601,56 +629,62 @@ void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
     DarwinAdjustScreenOrigins(pScreenInfo);
 }
 
-
 /*
  * OsVendorFatalError
  */
-void OsVendorFatalError( void )
+void
+OsVendorFatalError(void)
 {
-    ErrorF( "   OsVendorFatalError\n" );
+    ErrorF("   OsVendorFatalError\n");
 }
 
-
 /*
  * OsVendorInit
  *  Initialization of Darwin OS support.
  */
-void OsVendorInit(void)
+void
+OsVendorInit(void)
 {
     if (serverGeneration == 1) {
         char *lf;
         char *home = getenv("HOME");
+
         assert(home);
-        assert(0 < asprintf(&lf, "%s/Library/Logs/%s.X11.log", home, bundle_id_prefix));
+        assert(0 <
+               asprintf(&lf, "%s/Library/Logs/%s.X11.log", home,
+                        bundle_id_prefix));
         LogInit(lf, ".old");
         free(lf);
 
         DarwinPrintBanner();
 #ifdef ENABLE_DEBUG_LOG
-	{
-	  char *home_dir=NULL, *log_file_path=NULL;
-	  home_dir = getenv("HOME");
-	  if (home_dir) asprintf(&log_file_path, "%s/%s", home_dir, DEBUG_LOG_NAME);
-	  if (log_file_path) {
-	    if (!access(log_file_path, F_OK)) {
-	      debug_log_fp = fopen(log_file_path, "a");
-	      if (debug_log_fp) ErrorF("Debug logging enabled to %s\n", log_file_path);
-	    }
-	    free(log_file_path);
-	  }
-	}
+        {
+            char *home_dir = NULL, *log_file_path = NULL;
+
+            home_dir = getenv("HOME");
+            if (home_dir)
+                asprintf(&log_file_path, "%s/%s", home_dir, DEBUG_LOG_NAME);
+            if (log_file_path) {
+                if (!access(log_file_path, F_OK)) {
+                    debug_log_fp = fopen(log_file_path, "a");
+                    if (debug_log_fp)
+                        ErrorF("Debug logging enabled to %s\n", log_file_path);
+                }
+                free(log_file_path);
+            }
+        }
 #endif
     }
 }
 
-
 /*
  * ddxProcessArgument
  *  Process device-dependent command line args. Returns 0 if argument is
  *  not device dependent, otherwise Count of number of elements of argv
  *  that are part of a device dependent commandline option.
  */
-int ddxProcessArgument( int argc, char *argv[], int i )
+int
+ddxProcessArgument(int argc, char *argv[], int i)
 {
 //    if ( !strcmp( argv[i], "-fullscreen" ) ) {
 //        ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );
@@ -663,75 +697,74 @@ int ddxProcessArgument( int argc, char *argv[], int i )
 //    }
 
     // This command line arg is passed when launched from the Aqua GUI.
-    if ( !strncmp( argv[i], "-psn_", 5 ) ) {
+    if (!strncmp(argv[i], "-psn_", 5)) {
         return 1;
     }
 
-    if ( !strcmp( argv[i], "-fakebuttons" ) ) {
+    if (!strcmp(argv[i], "-fakebuttons")) {
         darwinFakeButtons = TRUE;
-        ErrorF( "Faking a three button mouse\n" );
+        ErrorF("Faking a three button mouse\n");
         return 1;
     }
 
-    if ( !strcmp( argv[i], "-nofakebuttons" ) ) {
+    if (!strcmp(argv[i], "-nofakebuttons")) {
         darwinFakeButtons = FALSE;
-        ErrorF( "Not faking a three button mouse\n" );
+        ErrorF("Not faking a three button mouse\n");
         return 1;
     }
 
-    if (!strcmp( argv[i], "-fakemouse2" ) ) {
-        if ( i == argc-1 ) {
-            FatalError( "-fakemouse2 must be followed by a modifer list\n" );
+    if (!strcmp(argv[i], "-fakemouse2")) {
+        if (i == argc - 1) {
+            FatalError("-fakemouse2 must be followed by a modifer list\n");
         }
-        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))
+        if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], ""))
             darwinFakeMouse2Mask = 0;
         else
-            darwinFakeMouse2Mask = DarwinParseModifierList(argv[i+1], 1);
+            darwinFakeMouse2Mask = DarwinParseModifierList(argv[i + 1], 1);
         ErrorF("Modifier mask to fake mouse button 2 = 0x%x\n",
                darwinFakeMouse2Mask);
         return 2;
     }
 
-    if (!strcmp( argv[i], "-fakemouse3" ) ) {
-        if ( i == argc-1 ) {
-            FatalError( "-fakemouse3 must be followed by a modifer list\n" );
+    if (!strcmp(argv[i], "-fakemouse3")) {
+        if (i == argc - 1) {
+            FatalError("-fakemouse3 must be followed by a modifer list\n");
         }
-        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))
+        if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], ""))
             darwinFakeMouse3Mask = 0;
         else
-            darwinFakeMouse3Mask = DarwinParseModifierList(argv[i+1], 1);
+            darwinFakeMouse3Mask = DarwinParseModifierList(argv[i + 1], 1);
         ErrorF("Modifier mask to fake mouse button 3 = 0x%x\n",
                darwinFakeMouse3Mask);
         return 2;
     }
 
-    if ( !strcmp( argv[i], "+synckeymap" ) ) {
+    if (!strcmp(argv[i], "+synckeymap")) {
         darwinSyncKeymap = TRUE;
         return 1;
     }
 
-    if ( !strcmp( argv[i], "-synckeymap" ) ) {
+    if (!strcmp(argv[i], "-synckeymap")) {
         darwinSyncKeymap = FALSE;
         return 1;
     }
 
-    if ( !strcmp( argv[i], "-depth" ) ) {
-        if ( i == argc-1 ) {
-            FatalError( "-depth must be followed by a number\n" );
+    if (!strcmp(argv[i], "-depth")) {
+        if (i == argc - 1) {
+            FatalError("-depth must be followed by a number\n");
         }
-        darwinDesiredDepth = atoi( argv[i+1] );
-        if(darwinDesiredDepth != -1 &&
-           darwinDesiredDepth != 8 &&
-           darwinDesiredDepth != 15 &&
-           darwinDesiredDepth != 24) {
-            FatalError( "Unsupported pixel depth. Use 8, 15, or 24 bits\n" );
+        darwinDesiredDepth = atoi(argv[i + 1]);
+        if (darwinDesiredDepth != -1 &&
+            darwinDesiredDepth != 8 &&
+            darwinDesiredDepth != 15 && darwinDesiredDepth != 24) {
+            FatalError("Unsupported pixel depth. Use 8, 15, or 24 bits\n");
         }
 
-        ErrorF( "Attempting to use pixel depth of %i\n", darwinDesiredDepth );
+        ErrorF("Attempting to use pixel depth of %i\n", darwinDesiredDepth);
         return 2;
     }
 
-    if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {
+    if (!strcmp(argv[i], "-showconfig") || !strcmp(argv[i], "-version")) {
         DarwinPrintBanner();
         exit(0);
     }
@@ -739,48 +772,51 @@ int ddxProcessArgument( int argc, char *argv[], int i )
     return 0;
 }
 
-
 /*
  * ddxUseMsg --
  *  Print out correct use of device dependent commandline options.
  *  Maybe the user now knows what really to do ...
  */
-void ddxUseMsg( void )
+void
+ddxUseMsg(void)
 {
     ErrorF("\n");
     ErrorF("\n");
     ErrorF("Device Dependent Usage:\n");
     ErrorF("\n");
     ErrorF("-depth <8,15,24> : use this bit depth.\n");
-    ErrorF("-fakebuttons : fake a three button mouse with Command and Option keys.\n");
+    ErrorF
+        ("-fakebuttons : fake a three button mouse with Command and Option keys.\n");
     ErrorF("-nofakebuttons : don't fake a three button mouse.\n");
-    ErrorF("-fakemouse2 <modifiers> : fake middle mouse button with modifier keys.\n");
-    ErrorF("-fakemouse3 <modifiers> : fake right mouse button with modifier keys.\n");
-    ErrorF("  ex: -fakemouse2 \"option,shift\" = option-shift-click is middle button.\n");
+    ErrorF
+        ("-fakemouse2 <modifiers> : fake middle mouse button with modifier keys.\n");
+    ErrorF
+        ("-fakemouse3 <modifiers> : fake right mouse button with modifier keys.\n");
+    ErrorF
+        ("  ex: -fakemouse2 \"option,shift\" = option-shift-click is middle button.\n");
     ErrorF("-version : show the server version.\n");
     ErrorF("\n");
 }
 
-
 /*
  * ddxGiveUp --
  *      Device dependent cleanup. Called by dix before normal server death.
  */
-void ddxGiveUp( enum ExitCode error )
+void
+ddxGiveUp(enum ExitCode error)
 {
     LogClose(error);
 }
 
-
 /*
  * AbortDDX --
  *      DDX - specific abort routine.  Called by AbortServer(). The attempt is
  *      made to restore all original setting of the displays. Also all devices
  *      are closed.
  */
-_X_NORETURN
-void AbortDDX( enum ExitCode error ) {
-    ErrorF( "   AbortDDX\n" );
+_X_NORETURN void
+AbortDDX(enum ExitCode error)
+{
+    ErrorF("   AbortDDX\n");
     OsAbort();
 }
-
diff --git a/xorg-server/hw/xquartz/darwin.h b/xorg-server/hw/xquartz/darwin.h
index aafc12fbf..b1157ce97 100644
--- a/xorg-server/hw/xquartz/darwin.h
+++ b/xorg-server/hw/xquartz/darwin.h
@@ -39,7 +39,7 @@
 // From darwin.c
 void DarwinPrintBanner(void);
 int DarwinParseModifierList(const char *constmodifiers, int separatelr);
-void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
+void DarwinAdjustScreenOrigins(ScreenInfo * pScreenInfo);
 
 #define SCREEN_PRIV(pScreen) ((DarwinFramebufferPtr) \
     dixLookupPrivate(&pScreen->devPrivates, darwinScreenKey))
@@ -48,39 +48,42 @@ void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
  * Global variables from darwin.c
  */
 extern DevPrivateKeyRec darwinScreenKeyRec;
+
 #define darwinScreenKey (&darwinScreenKeyRec)
-extern int              darwinScreensFound;
-extern io_connect_t     darwinParamConnect;
-extern int              darwinEventReadFD;
-extern int              darwinEventWriteFD;
-extern DeviceIntPtr     darwinPointer;
-extern DeviceIntPtr     darwinTabletCursor;
-extern DeviceIntPtr     darwinTabletStylus;
-extern DeviceIntPtr     darwinTabletEraser;
-extern DeviceIntPtr     darwinKeyboard;
+extern int darwinScreensFound;
+extern io_connect_t darwinParamConnect;
+extern int darwinEventReadFD;
+extern int darwinEventWriteFD;
+extern DeviceIntPtr darwinPointer;
+extern DeviceIntPtr darwinTabletCursor;
+extern DeviceIntPtr darwinTabletStylus;
+extern DeviceIntPtr darwinTabletEraser;
+extern DeviceIntPtr darwinKeyboard;
 
 // User preferences
-extern int              darwinMouseAccelChange;
-extern int              darwinFakeButtons;
-extern int              darwinFakeMouse2Mask;
-extern int              darwinFakeMouse3Mask;
-extern unsigned int     darwinAppKitModMask;
-extern unsigned int     windowItemModMask;
-extern int              darwinSyncKeymap;
-extern int              darwinDesiredDepth;
+extern int darwinMouseAccelChange;
+extern int darwinFakeButtons;
+extern int darwinFakeMouse2Mask;
+extern int darwinFakeMouse3Mask;
+extern unsigned int darwinAppKitModMask;
+extern unsigned int windowItemModMask;
+extern int darwinSyncKeymap;
+extern int darwinDesiredDepth;
 
 // location of X11's (0,0) point in global screen coordinates
-extern int              darwinMainScreenX;
-extern int              darwinMainScreenY;
+extern int darwinMainScreenX;
+extern int darwinMainScreenY;
 
 // bundle-main.c
 extern char *bundle_id_prefix;
 
-_X_ATTRIBUTE_PRINTF(6,7)
-extern void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...);
+_X_ATTRIBUTE_PRINTF(6, 7)
+extern void
+xq_asl_log(int level, const char *subsystem, const char *file,
+           const char *function, int line, const char *fmt, ...);
 
 #define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args)
 #define DEBUG_LOG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "XQuartz", msg, ##args)
 #define TRACE() DEBUG_LOG("TRACE")
 
-#endif  /* _DARWIN_H */
+#endif                          /* _DARWIN_H */
diff --git a/xorg-server/hw/xquartz/darwinEvents.c b/xorg-server/hw/xquartz/darwinEvents.c
index 3438da116..cf29a7b21 100644
--- a/xorg-server/hw/xquartz/darwinEvents.c
+++ b/xorg-server/hw/xquartz/darwinEvents.c
@@ -75,9 +75,10 @@ in this Software without prior written authorization from The Open Group.
 #include "applewmExt.h"
 
 /* FIXME: Abstract this better */
-extern Bool QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev);
+extern Bool QuartzModeEventHandler(int screenNum, XQuartzEvent * e,
+                                   DeviceIntPtr dev);
 
-int darwin_all_modifier_flags = 0;  // last known modifier state
+int darwin_all_modifier_flags = 0;      // last known modifier state
 int darwin_all_modifier_mask = 0;
 int darwin_x11_modifier_mask = 0;
 
@@ -88,42 +89,50 @@ static pthread_mutex_t fd_add_lock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t fd_add_ready_cond = PTHREAD_COND_INITIALIZER;
 static pthread_t fd_add_tid = NULL;
 
-static InternalEvent* darwinEvents = NULL;
+static InternalEvent *darwinEvents = NULL;
 
 static pthread_mutex_t mieq_lock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t mieq_ready_cond = PTHREAD_COND_INITIALIZER;
 
 /*** Pthread Magics ***/
-static pthread_t create_thread(void *(*func)(void *), void *arg) {
+static pthread_t
+create_thread(void *(*func) (void *), void *arg)
+{
     pthread_attr_t attr;
     pthread_t tid;
 
-    pthread_attr_init (&attr);
-    pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);
-    pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
-    pthread_create (&tid, &attr, func, arg);
-    pthread_attr_destroy (&attr);
+    pthread_attr_init(&attr);
+    pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
+    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+    pthread_create(&tid, &attr, func, arg);
+    pthread_attr_destroy(&attr);
 
     return tid;
 }
 
 void darwinEvents_lock(void);
-void darwinEvents_lock(void) {
+void
+darwinEvents_lock(void)
+{
     int err;
-    if((err = pthread_mutex_lock(&mieq_lock))) {
+
+    if ((err = pthread_mutex_lock(&mieq_lock))) {
         ErrorF("%s:%s:%d: Failed to lock mieq_lock: %d\n",
                __FILE__, __FUNCTION__, __LINE__, err);
         xorg_backtrace();
     }
-    if(darwinEvents == NULL) {
+    if (darwinEvents == NULL) {
         pthread_cond_wait(&mieq_ready_cond, &mieq_lock);
     }
 }
 
 void darwinEvents_unlock(void);
-void darwinEvents_unlock(void) {
+void
+darwinEvents_unlock(void)
+{
     int err;
-    if((err = pthread_mutex_unlock(&mieq_lock))) {
+
+    if ((err = pthread_mutex_unlock(&mieq_lock))) {
         ErrorF("%s:%s:%d: Failed to unlock mieq_lock: %d\n",
                __FILE__, __FUNCTION__, __LINE__, err);
         xorg_backtrace();
@@ -134,7 +143,9 @@ void darwinEvents_unlock(void) {
  * DarwinPressModifierKey
  * Press or release the given modifier key (one of NX_MODIFIERKEY_* constants)
  */
-static void DarwinPressModifierKey(int pressed, int key) {
+static void
+DarwinPressModifierKey(int pressed, int key)
+{
     int keycode = DarwinModifierNXKeyToNXKeycode(key, 0);
 
     if (keycode == 0) {
@@ -165,9 +176,9 @@ static int darwin_x11_modifier_mask_list[] = {
 
 static int darwin_all_modifier_mask_additions[] = { NX_SECONDARYFNMASK, };
 
-static void DarwinUpdateModifiers(
-    int pressed,        // KeyPress or KeyRelease
-    int flags )         // modifier flags that have changed
+static void
+DarwinUpdateModifiers(int pressed,      // KeyPress or KeyRelease
+                      int flags)        // modifier flags that have changed
 {
     int *f;
     int key;
@@ -175,15 +186,15 @@ static void DarwinUpdateModifiers(
     /* Capslock is special.  This mask is the state of capslock (on/off),
      * not the state of the button.  Hopefully we can find a better solution.
      */
-    if(NX_ALPHASHIFTMASK & flags) {
+    if (NX_ALPHASHIFTMASK & flags) {
         DarwinPressModifierKey(KeyPress, NX_MODIFIERKEY_ALPHALOCK);
         DarwinPressModifierKey(KeyRelease, NX_MODIFIERKEY_ALPHALOCK);
     }
-    
-    for(f=darwin_x11_modifier_mask_list; *f; f++)
-        if(*f & flags && *f != NX_ALPHASHIFTMASK) {
+
+    for (f = darwin_x11_modifier_mask_list; *f; f++)
+        if (*f & flags && *f != NX_ALPHASHIFTMASK) {
             key = DarwinModifierNXMaskToNXKey(*f);
-            if(key == -1)
+            if (key == -1)
                 ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n", *f);
             else
                 DarwinPressModifierKey(pressed, key);
@@ -194,107 +205,107 @@ static void DarwinUpdateModifiers(
    be moved into their own individual functions and set as handlers using
    mieqSetHandler. */
 
-static void DarwinEventHandler(int screenNum, InternalEvent *ie, DeviceIntPtr dev) {
+static void
+DarwinEventHandler(int screenNum, InternalEvent *ie, DeviceIntPtr dev)
+{
     XQuartzEvent *e = &(ie->xquartz_event);
 
-    switch(e->subtype) {
-        case kXquartzControllerNotify:
-            DEBUG_LOG("kXquartzControllerNotify\n");
-            AppleWMSendEvent(AppleWMControllerNotify,
-                             AppleWMControllerNotifyMask,
-                             e->data[0],
-                             e->data[1]);
-            break;
-            
-        case kXquartzPasteboardNotify:
-            DEBUG_LOG("kXquartzPasteboardNotify\n");
-            AppleWMSendEvent(AppleWMPasteboardNotify,
-                             AppleWMPasteboardNotifyMask,
-                             e->data[0],
-                             e->data[1]);
-            break;
-            
-        case kXquartzActivate:
-            DEBUG_LOG("kXquartzActivate\n");
-            QuartzShow();
-            AppleWMSendEvent(AppleWMActivationNotify,
-                             AppleWMActivationNotifyMask,
-                             AppleWMIsActive, 0);
-            break;
-            
-        case kXquartzDeactivate:
-            DEBUG_LOG("kXquartzDeactivate\n");
-            AppleWMSendEvent(AppleWMActivationNotify,
-                             AppleWMActivationNotifyMask,
-                             AppleWMIsInactive, 0);
-            QuartzHide();
-            break;
-
-        case kXquartzReloadPreferences:
-            DEBUG_LOG("kXquartzReloadPreferences\n");
-            AppleWMSendEvent(AppleWMActivationNotify,
-                             AppleWMActivationNotifyMask,
-                             AppleWMReloadPreferences, 0);
-            break;
-            
-        case kXquartzToggleFullscreen:
-            DEBUG_LOG("kXquartzToggleFullscreen\n");
-            if(XQuartzIsRootless)
-                ErrorF("Ignoring kXquartzToggleFullscreen because of rootless mode.");
-            else 
-                QuartzRandRToggleFullscreen();
-            break;
-            
-        case kXquartzSetRootless:
-            DEBUG_LOG("kXquartzSetRootless\n");
-            if(e->data[0]) {
-                QuartzRandRSetFakeRootless();
-            } else {
-                QuartzRandRSetFakeFullscreen(FALSE);
-            }
-            break;
-            
-        case kXquartzSetRootClip:
-            QuartzSetRootClip((Bool)e->data[0]);
-            break;
-            
-        case kXquartzQuit:
-            GiveUp(0);
-            break;
-            
-        case kXquartzSpaceChanged:
-            DEBUG_LOG("kXquartzSpaceChanged\n");
-            QuartzSpaceChanged(e->data[0]);
-            break;
-
-        case kXquartzListenOnOpenFD:
-            ErrorF("Calling ListenOnOpenFD() for new fd: %d\n", (int)e->data[0]);
-            ListenOnOpenFD((int)e->data[0], 1);
-            break;
-            
-        case kXquartzReloadKeymap:
-            DarwinKeyboardReloadHandler();
-            break;
-            
-        case kXquartzDisplayChanged:
-            DEBUG_LOG("kXquartzDisplayChanged\n");
-            QuartzUpdateScreens();
-
-            /* Update our RandR info */
-            QuartzRandRUpdateFakeModes(TRUE);
-            break;
-            
-        default:
-            if(!QuartzModeEventHandler(screenNum, e, dev))
-                ErrorF("Unknown application defined event type %d.\n", e->subtype);
-    }	
+    switch (e->subtype) {
+    case kXquartzControllerNotify:
+        DEBUG_LOG("kXquartzControllerNotify\n");
+        AppleWMSendEvent(AppleWMControllerNotify,
+                         AppleWMControllerNotifyMask, e->data[0], e->data[1]);
+        break;
+
+    case kXquartzPasteboardNotify:
+        DEBUG_LOG("kXquartzPasteboardNotify\n");
+        AppleWMSendEvent(AppleWMPasteboardNotify,
+                         AppleWMPasteboardNotifyMask, e->data[0], e->data[1]);
+        break;
+
+    case kXquartzActivate:
+        DEBUG_LOG("kXquartzActivate\n");
+        QuartzShow();
+        AppleWMSendEvent(AppleWMActivationNotify,
+                         AppleWMActivationNotifyMask, AppleWMIsActive, 0);
+        break;
+
+    case kXquartzDeactivate:
+        DEBUG_LOG("kXquartzDeactivate\n");
+        AppleWMSendEvent(AppleWMActivationNotify,
+                         AppleWMActivationNotifyMask, AppleWMIsInactive, 0);
+        QuartzHide();
+        break;
+
+    case kXquartzReloadPreferences:
+        DEBUG_LOG("kXquartzReloadPreferences\n");
+        AppleWMSendEvent(AppleWMActivationNotify,
+                         AppleWMActivationNotifyMask,
+                         AppleWMReloadPreferences, 0);
+        break;
+
+    case kXquartzToggleFullscreen:
+        DEBUG_LOG("kXquartzToggleFullscreen\n");
+        if (XQuartzIsRootless)
+            ErrorF
+                ("Ignoring kXquartzToggleFullscreen because of rootless mode.");
+        else
+            QuartzRandRToggleFullscreen();
+        break;
+
+    case kXquartzSetRootless:
+        DEBUG_LOG("kXquartzSetRootless\n");
+        if (e->data[0]) {
+            QuartzRandRSetFakeRootless();
+        }
+        else {
+            QuartzRandRSetFakeFullscreen(FALSE);
+        }
+        break;
+
+    case kXquartzSetRootClip:
+        QuartzSetRootClip((Bool) e->data[0]);
+        break;
+
+    case kXquartzQuit:
+        GiveUp(0);
+        break;
+
+    case kXquartzSpaceChanged:
+        DEBUG_LOG("kXquartzSpaceChanged\n");
+        QuartzSpaceChanged(e->data[0]);
+        break;
+
+    case kXquartzListenOnOpenFD:
+        ErrorF("Calling ListenOnOpenFD() for new fd: %d\n", (int) e->data[0]);
+        ListenOnOpenFD((int) e->data[0], 1);
+        break;
+
+    case kXquartzReloadKeymap:
+        DarwinKeyboardReloadHandler();
+        break;
+
+    case kXquartzDisplayChanged:
+        DEBUG_LOG("kXquartzDisplayChanged\n");
+        QuartzUpdateScreens();
+
+        /* Update our RandR info */
+        QuartzRandRUpdateFakeModes(TRUE);
+        break;
+
+    default:
+        if (!QuartzModeEventHandler(screenNum, e, dev))
+            ErrorF("Unknown application defined event type %d.\n", e->subtype);
+    }
 }
 
-void DarwinListenOnOpenFD(int fd) {
+void
+DarwinListenOnOpenFD(int fd)
+{
     ErrorF("DarwinListenOnOpenFD: %d\n", fd);
-    
+
     pthread_mutex_lock(&fd_add_lock);
-    if(fd_add_count < FD_ADD_MAX)
+    if (fd_add_count < FD_ADD_MAX)
         fd_add[fd_add_count++] = fd;
     else
         ErrorF("FD Addition buffer at max.  Dropping fd addition request.\n");
@@ -303,7 +314,9 @@ void DarwinListenOnOpenFD(int fd) {
     pthread_mutex_unlock(&fd_add_lock);
 }
 
-static void *DarwinProcessFDAdditionQueue_thread(void *args) {
+static void *
+DarwinProcessFDAdditionQueue_thread(void *args)
+{
     /* TODO: Possibly adjust this to no longer be a race... maybe trigger this
      *       once a client connects and claims to be the WM.
      *
@@ -320,15 +333,17 @@ static void *DarwinProcessFDAdditionQueue_thread(void *args) {
     sleep_for.tv_sec = 3;
     sleep_for.tv_nsec = 0;
 
-    ErrorF("X11.app: DarwinProcessFDAdditionQueue_thread: Sleeping to allow xinitrc to catchup.\n");
-    while(nanosleep(&sleep_for, &sleep_remaining) != 0) {
+    ErrorF
+        ("X11.app: DarwinProcessFDAdditionQueue_thread: Sleeping to allow xinitrc to catchup.\n");
+    while (nanosleep(&sleep_for, &sleep_remaining) != 0) {
         sleep_for = sleep_remaining;
     }
 
     pthread_mutex_lock(&fd_add_lock);
-    while(true) {
-        while(fd_add_count) {
-            DarwinSendDDXEvent(kXquartzListenOnOpenFD, 1, fd_add[--fd_add_count]);
+    while (true) {
+        while (fd_add_count) {
+            DarwinSendDDXEvent(kXquartzListenOnOpenFD, 1,
+                               fd_add[--fd_add_count]);
         }
         pthread_cond_wait(&fd_add_ready_cond, &fd_add_lock);
     }
@@ -336,17 +351,21 @@ static void *DarwinProcessFDAdditionQueue_thread(void *args) {
     return NULL;
 }
 
-Bool DarwinEQInit(void) { 
+Bool
+DarwinEQInit(void)
+{
     int *p;
 
-    for(p=darwin_x11_modifier_mask_list, darwin_all_modifier_mask=0; *p; p++) {
+    for (p = darwin_x11_modifier_mask_list, darwin_all_modifier_mask = 0; *p;
+         p++) {
         darwin_x11_modifier_mask |= *p;
     }
-    
-    for(p=darwin_all_modifier_mask_additions, darwin_all_modifier_mask= darwin_x11_modifier_mask; *p; p++) {
+
+    for (p = darwin_all_modifier_mask_additions, darwin_all_modifier_mask =
+         darwin_x11_modifier_mask; *p; p++) {
         darwin_all_modifier_mask |= *p;
     }
-    
+
     mieqInit();
     mieqSetHandler(ET_XQuartz, DarwinEventHandler);
 
@@ -356,22 +375,24 @@ Bool DarwinEQInit(void) {
      */
     if (!darwinEvents) {
         darwinEvents = InitEventList(GetMaximumEventsNum());;
-        
+
         if (!darwinEvents)
             FatalError("Couldn't allocate event buffer\n");
-        
+
         darwinEvents_lock();
         pthread_cond_broadcast(&mieq_ready_cond);
         darwinEvents_unlock();
     }
 
-    if(!fd_add_tid)
+    if (!fd_add_tid)
         fd_add_tid = create_thread(DarwinProcessFDAdditionQueue_thread, NULL);
-    
+
     return TRUE;
 }
 
-void DarwinEQFini(void) {
+void
+DarwinEQFini(void)
+{
     mieqFini();
 }
 
@@ -379,53 +400,65 @@ void DarwinEQFini(void) {
  * ProcessInputEvents
  *  Read and process events from the event queue until it is empty.
  */
-void ProcessInputEvents(void) {
+void
+ProcessInputEvents(void)
+{
     char nullbyte;
-	int x = sizeof(nullbyte);
-    
+    int x = sizeof(nullbyte);
+
     mieqProcessInputEvents();
 
     // Empty the signaling pipe
     while (x == sizeof(nullbyte)) {
-      x = read(darwinEventReadFD, &nullbyte, sizeof(nullbyte));
+        x = read(darwinEventReadFD, &nullbyte, sizeof(nullbyte));
     }
 }
 
 /* Sends a null byte down darwinEventWriteFD, which will cause the
    Dispatch() event loop to check out event queue */
-static void DarwinPokeEQ(void) {
-	char nullbyte=0;
-	//  <daniels> oh, i ... er ... christ.
-	write(darwinEventWriteFD, &nullbyte, sizeof(nullbyte));
+static void
+DarwinPokeEQ(void)
+{
+    char nullbyte = 0;
+
+    //  <daniels> oh, i ... er ... christ.
+    write(darwinEventWriteFD, &nullbyte, sizeof(nullbyte));
 }
 
 /* Convert from Appkit pointer input values to X input values:
  * Note: pointer_x and pointer_y are relative to the upper-left of primary
  *       display.
  */
-static void DarwinPrepareValuators(DeviceIntPtr pDev, int *valuators, ScreenPtr screen,
-                                   float pointer_x, float pointer_y, 
-                                   float pressure, float tilt_x, float tilt_y) {
+static void
+DarwinPrepareValuators(DeviceIntPtr pDev, int *valuators, ScreenPtr screen,
+                       float pointer_x, float pointer_y,
+                       float pressure, float tilt_x, float tilt_y)
+{
     /* Fix offset between darwin and X screens */
     pointer_x -= darwinMainScreenX + screen->x;
     pointer_y -= darwinMainScreenY + screen->y;
 
-    if(pointer_x < 0.0)
+    if (pointer_x < 0.0)
         pointer_x = 0.0;
 
-    if(pointer_y < 0.0)
+    if (pointer_y < 0.0)
         pointer_y = 0.0;
-    
-    if(pDev == darwinPointer) {
+
+    if (pDev == darwinPointer) {
         valuators[0] = pointer_x;
         valuators[1] = pointer_y;
         valuators[2] = 0;
         valuators[3] = 0;
         valuators[4] = 0;
-    } else {
+    }
+    else {
         /* Setup our array of values */
-        valuators[0] = XQUARTZ_VALUATOR_LIMIT * (pointer_x / (float)screenInfo.screens[0]->width);
-        valuators[1] = XQUARTZ_VALUATOR_LIMIT * (pointer_y / (float)screenInfo.screens[0]->height);
+        valuators[0] =
+            XQUARTZ_VALUATOR_LIMIT * (pointer_x /
+                                      (float) screenInfo.screens[0]->width);
+        valuators[1] =
+            XQUARTZ_VALUATOR_LIMIT * (pointer_y /
+                                      (float) screenInfo.screens[0]->height);
         valuators[2] = XQUARTZ_VALUATOR_LIMIT * pressure;
         valuators[3] = XQUARTZ_VALUATOR_LIMIT * tilt_x;
         valuators[4] = XQUARTZ_VALUATOR_LIMIT * tilt_y;
@@ -434,13 +467,17 @@ static void DarwinPrepareValuators(DeviceIntPtr pDev, int *valuators, ScreenPtr
     //          valuators[0], valuators[1], valuators[2], valuators[3], valuators[4]);
 }
 
-void DarwinInputReleaseButtonsAndKeys(DeviceIntPtr pDev) {
+void
+DarwinInputReleaseButtonsAndKeys(DeviceIntPtr pDev)
+{
     darwinEvents_lock(); {
         int i;
+
         if (pDev->button) {
             for (i = 0; i < pDev->button->numButtons; i++) {
                 if (BitIsOn(pDev->button->down, i)) {
-                    QueuePointerEvents(pDev, ButtonRelease, i, POINTER_ABSOLUTE, NULL);
+                    QueuePointerEvents(pDev, ButtonRelease, i, POINTER_ABSOLUTE,
+                                       NULL);
                 }
             }
         }
@@ -448,157 +485,207 @@ void DarwinInputReleaseButtonsAndKeys(DeviceIntPtr pDev) {
         if (pDev->key) {
             for (i = 0; i < NUM_KEYCODES; i++) {
                 if (BitIsOn(pDev->key->down, i + MIN_KEYCODE)) {
-                    QueueKeyboardEvents(pDev, KeyRelease, i + MIN_KEYCODE, NULL);
+                    QueueKeyboardEvents(pDev, KeyRelease, i + MIN_KEYCODE,
+                                        NULL);
                 }
             }
         }
         DarwinPokeEQ();
-    } darwinEvents_unlock();
+    }
+    darwinEvents_unlock();
 }
 
-void DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button, float pointer_x, float pointer_y, 
-			     float pressure, float tilt_x, float tilt_y) {
-	static int darwinFakeMouseButtonDown = 0;
+void
+DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button,
+                        float pointer_x, float pointer_y, float pressure,
+                        float tilt_x, float tilt_y)
+{
+    static int darwinFakeMouseButtonDown = 0;
     ScreenPtr screen;
     int valuators[5];
-	
+
     //DEBUG_LOG("x=%f, y=%f, p=%f, tx=%f, ty=%f\n", pointer_x, pointer_y, pressure, tilt_x, tilt_y);
-    
-	if(!darwinEvents) {
-		DEBUG_LOG("DarwinSendPointerEvents called before darwinEvents was initialized\n");
-		return;
-	}
+
+    if (!darwinEvents) {
+        DEBUG_LOG
+            ("DarwinSendPointerEvents called before darwinEvents was initialized\n");
+        return;
+    }
 
     screen = miPointerGetScreen(pDev);
-    if(!screen) {
-        DEBUG_LOG("DarwinSendPointerEvents called before screen was initialized\n");
+    if (!screen) {
+        DEBUG_LOG
+            ("DarwinSendPointerEvents called before screen was initialized\n");
         return;
     }
 
     /* Handle fake click */
-	if (ev_type == ButtonPress && darwinFakeButtons && ev_button == 1) {
-        if(darwinFakeMouseButtonDown != 0) {
+    if (ev_type == ButtonPress && darwinFakeButtons && ev_button == 1) {
+        if (darwinFakeMouseButtonDown != 0) {
             /* We're currently "down" with another button, so release it first */
-            DarwinSendPointerEvents(pDev, ButtonRelease, darwinFakeMouseButtonDown, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
-            darwinFakeMouseButtonDown=0;
+            DarwinSendPointerEvents(pDev, ButtonRelease,
+                                    darwinFakeMouseButtonDown, pointer_x,
+                                    pointer_y, pressure, tilt_x, tilt_y);
+            darwinFakeMouseButtonDown = 0;
         }
-		if (darwin_all_modifier_flags & darwinFakeMouse2Mask) {
+        if (darwin_all_modifier_flags & darwinFakeMouse2Mask) {
             ev_button = 2;
-			darwinFakeMouseButtonDown = 2;
-            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse2Mask);
-		} else if (darwin_all_modifier_flags & darwinFakeMouse3Mask) {
+            darwinFakeMouseButtonDown = 2;
+            DarwinUpdateModKeys(darwin_all_modifier_flags &
+                                ~darwinFakeMouse2Mask);
+        }
+        else if (darwin_all_modifier_flags & darwinFakeMouse3Mask) {
             ev_button = 3;
-			darwinFakeMouseButtonDown = 3;
-            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse3Mask);
-		}
-	}
+            darwinFakeMouseButtonDown = 3;
+            DarwinUpdateModKeys(darwin_all_modifier_flags &
+                                ~darwinFakeMouse3Mask);
+        }
+    }
 
-	if (ev_type == ButtonRelease && ev_button == 1) {
-        if(darwinFakeMouseButtonDown) {
+    if (ev_type == ButtonRelease && ev_button == 1) {
+        if (darwinFakeMouseButtonDown) {
             ev_button = darwinFakeMouseButtonDown;
         }
 
-        if(darwinFakeMouseButtonDown == 2) {
-            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse2Mask);
-        } else if(darwinFakeMouseButtonDown == 3) {
-            DarwinUpdateModKeys(darwin_all_modifier_flags & ~darwinFakeMouse3Mask);
+        if (darwinFakeMouseButtonDown == 2) {
+            DarwinUpdateModKeys(darwin_all_modifier_flags &
+                                ~darwinFakeMouse2Mask);
+        }
+        else if (darwinFakeMouseButtonDown == 3) {
+            DarwinUpdateModKeys(darwin_all_modifier_flags &
+                                ~darwinFakeMouse3Mask);
         }
 
         darwinFakeMouseButtonDown = 0;
-	}
+    }
 
-    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y,
+                           pressure, tilt_x, tilt_y);
     darwinEvents_lock(); {
         ValuatorMask mask;
-        valuator_mask_set_range(&mask, 0, (pDev == darwinPointer) ? 2 : 5, valuators);
+
+        valuator_mask_set_range(&mask, 0, (pDev == darwinPointer) ? 2 : 5,
+                                valuators);
         QueuePointerEvents(pDev, ev_type, ev_button, POINTER_ABSOLUTE, &mask);
         DarwinPokeEQ();
     } darwinEvents_unlock();
 }
 
-void DarwinSendKeyboardEvents(int ev_type, int keycode) {
+void
+DarwinSendKeyboardEvents(int ev_type, int keycode)
+{
 
-	if(!darwinEvents) {
-		DEBUG_LOG("DarwinSendKeyboardEvents called before darwinEvents was initialized\n");
-		return;
-	}
+    if (!darwinEvents) {
+        DEBUG_LOG
+            ("DarwinSendKeyboardEvents called before darwinEvents was initialized\n");
+        return;
+    }
 
     darwinEvents_lock(); {
-        QueueKeyboardEvents(darwinKeyboard, ev_type, keycode + MIN_KEYCODE, NULL);
+        QueueKeyboardEvents(darwinKeyboard, ev_type, keycode + MIN_KEYCODE,
+                            NULL);
         DarwinPokeEQ();
-    } darwinEvents_unlock();
+    }
+    darwinEvents_unlock();
 }
 
-void DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, float pointer_x, float pointer_y,  
-                               float pressure, float tilt_x, float tilt_y) {
+void
+DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, float pointer_x,
+                          float pointer_y, float pressure, float tilt_x,
+                          float tilt_y)
+{
     ScreenPtr screen;
     int valuators[5];
 
-    DEBUG_LOG("DarwinSendProximityEvents: %d l:%f,%f p:%f t:%f,%f\n", ev_type, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+    DEBUG_LOG("DarwinSendProximityEvents: %d l:%f,%f p:%f t:%f,%f\n", ev_type,
+              pointer_x, pointer_y, pressure, tilt_x, tilt_y);
 
-    if(!darwinEvents) {
-        DEBUG_LOG("DarwinSendProximityEvents called before darwinEvents was initialized\n");
+    if (!darwinEvents) {
+        DEBUG_LOG
+            ("DarwinSendProximityEvents called before darwinEvents was initialized\n");
         return;
     }
-    
+
     screen = miPointerGetScreen(pDev);
-    if(!screen) {
-        DEBUG_LOG("DarwinSendPointerEvents called before screen was initialized\n");
+    if (!screen) {
+        DEBUG_LOG
+            ("DarwinSendPointerEvents called before screen was initialized\n");
         return;
-    }    
+    }
 
-    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y,
+                           pressure, tilt_x, tilt_y);
     darwinEvents_lock(); {
         ValuatorMask mask;
+
         valuator_mask_set_range(&mask, 0, 5, valuators);
         QueueProximityEvents(pDev, ev_type, &mask);
         DarwinPokeEQ();
     } darwinEvents_unlock();
 }
 
-
 /* Send the appropriate number of button clicks to emulate scroll wheel */
-void DarwinSendScrollEvents(float count_x, float count_y, 
-							float pointer_x, float pointer_y, 
-			    			float pressure, float tilt_x, float tilt_y) {
-	int sign_x, sign_y;
-	if(!darwinEvents) {
-		DEBUG_LOG("DarwinSendScrollEvents called before darwinEvents was initialized\n");
-		return;
-	}
-
-	sign_x = count_x > 0.0f ? SCROLLWHEELLEFTFAKE : SCROLLWHEELRIGHTFAKE;
-	sign_y = count_y > 0.0f ? SCROLLWHEELUPFAKE : SCROLLWHEELDOWNFAKE;
-	count_x = fabs(count_x);
-	count_y = fabs(count_y);
-	
-	while ((count_x > 0.0f) || (count_y > 0.0f)) {
-		if (count_x > 0.0f) {
-			DarwinSendPointerEvents(darwinPointer, ButtonPress, sign_x, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
-			DarwinSendPointerEvents(darwinPointer, ButtonRelease, sign_x, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
-			count_x = count_x - 1.0f;
-		}
-		if (count_y > 0.0f) {
-			DarwinSendPointerEvents(darwinPointer, ButtonPress, sign_y, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
-			DarwinSendPointerEvents(darwinPointer, ButtonRelease, sign_y, pointer_x, pointer_y, pressure, tilt_x, tilt_y);
-			count_y = count_y - 1.0f;
-		}
-	}
+void
+DarwinSendScrollEvents(float count_x, float count_y,
+                       float pointer_x, float pointer_y,
+                       float pressure, float tilt_x, float tilt_y)
+{
+    int sign_x, sign_y;
+
+    if (!darwinEvents) {
+        DEBUG_LOG
+            ("DarwinSendScrollEvents called before darwinEvents was initialized\n");
+        return;
+    }
+
+    sign_x = count_x > 0.0f ? SCROLLWHEELLEFTFAKE : SCROLLWHEELRIGHTFAKE;
+    sign_y = count_y > 0.0f ? SCROLLWHEELUPFAKE : SCROLLWHEELDOWNFAKE;
+    count_x = fabs(count_x);
+    count_y = fabs(count_y);
+
+    while ((count_x > 0.0f) || (count_y > 0.0f)) {
+        if (count_x > 0.0f) {
+            DarwinSendPointerEvents(darwinPointer, ButtonPress, sign_x,
+                                    pointer_x, pointer_y, pressure, tilt_x,
+                                    tilt_y);
+            DarwinSendPointerEvents(darwinPointer, ButtonRelease, sign_x,
+                                    pointer_x, pointer_y, pressure, tilt_x,
+                                    tilt_y);
+            count_x = count_x - 1.0f;
+        }
+        if (count_y > 0.0f) {
+            DarwinSendPointerEvents(darwinPointer, ButtonPress, sign_y,
+                                    pointer_x, pointer_y, pressure, tilt_x,
+                                    tilt_y);
+            DarwinSendPointerEvents(darwinPointer, ButtonRelease, sign_y,
+                                    pointer_x, pointer_y, pressure, tilt_x,
+                                    tilt_y);
+            count_y = count_y - 1.0f;
+        }
+    }
 }
 
 /* Send the appropriate KeyPress/KeyRelease events to GetKeyboardEvents to
    reflect changing modifier flags (alt, control, meta, etc) */
-void DarwinUpdateModKeys(int flags) {
-	DarwinUpdateModifiers(KeyRelease, darwin_all_modifier_flags & ~flags & darwin_x11_modifier_mask);
-	DarwinUpdateModifiers(KeyPress, ~darwin_all_modifier_flags & flags & darwin_x11_modifier_mask);
-	darwin_all_modifier_flags = flags;
+void
+DarwinUpdateModKeys(int flags)
+{
+    DarwinUpdateModifiers(KeyRelease,
+                          darwin_all_modifier_flags & ~flags &
+                          darwin_x11_modifier_mask);
+    DarwinUpdateModifiers(KeyPress,
+                          ~darwin_all_modifier_flags & flags &
+                          darwin_x11_modifier_mask);
+    darwin_all_modifier_flags = flags;
 }
 
 /*
  * DarwinSendDDXEvent
  *  Send the X server thread a message by placing it on the event queue.
  */
-void DarwinSendDDXEvent(int type, int argc, ...) {
+void
+DarwinSendDDXEvent(int type, int argc, ...)
+{
     XQuartzEvent e;
     int i;
     va_list args;
@@ -611,14 +698,14 @@ void DarwinSendDDXEvent(int type, int argc, ...) {
     e.subtype = type;
 
     if (argc > 0 && argc < XQUARTZ_EVENT_MAXARGS) {
-        va_start (args, argc);
+        va_start(args, argc);
         for (i = 0; i < argc; i++)
-            e.data[i] = (uint32_t) va_arg (args, uint32_t);
-        va_end (args);
+            e.data[i] = (uint32_t) va_arg(args, uint32_t);
+        va_end(args);
     }
 
     darwinEvents_lock(); {
-        mieqEnqueue(NULL, (InternalEvent*)&e);
+        mieqEnqueue(NULL, (InternalEvent *) &e);
         DarwinPokeEQ();
     } darwinEvents_unlock();
 }
diff --git a/xorg-server/hw/xquartz/darwinEvents.h b/xorg-server/hw/xquartz/darwinEvents.h
index a44872b69..515dd3049 100644
--- a/xorg-server/hw/xquartz/darwinEvents.h
+++ b/xorg-server/hw/xquartz/darwinEvents.h
@@ -37,13 +37,16 @@ void DarwinEQEnqueue(const xEventPtr e);
 void DarwinEQPointerPost(DeviceIntPtr pDev, xEventPtr e);
 void DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX);
 void DarwinInputReleaseButtonsAndKeys(DeviceIntPtr pDev);
-void DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button, float pointer_x, float pointer_y,
-			     float pressure, float tilt_x, float tilt_y);
-void DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, float pointer_x, float pointer_y,
-                               float pressure, float tilt_x, float tilt_y);
+void DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button,
+                             float pointer_x, float pointer_y, float pressure,
+                             float tilt_x, float tilt_y);
+void DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, float pointer_x,
+                               float pointer_y, float pressure, float tilt_x,
+                               float tilt_y);
 void DarwinSendKeyboardEvents(int ev_type, int keycode);
-void DarwinSendScrollEvents(float count_x, float count_y, float pointer_x, float pointer_y,
-			    float pressure, float tilt_x, float tilt_y);
+void DarwinSendScrollEvents(float count_x, float count_y, float pointer_x,
+                            float pointer_y, float pressure, float tilt_x,
+                            float tilt_y);
 void DarwinUpdateModKeys(int flags);
 void DarwinListenOnOpenFD(int fd);
 
@@ -51,28 +54,28 @@ void DarwinListenOnOpenFD(int fd);
  * Subtypes for the ET_XQuartz event type
  */
 enum {
-    kXquartzReloadKeymap,     // Reload system keymap
-    kXquartzActivate,         // restore X drawing and cursor
-    kXquartzDeactivate,       // clip X drawing and switch to Aqua cursor
-    kXquartzSetRootClip,      // enable or disable drawing to the X screen
-    kXquartzQuit,             // kill the X server and release the display
-    kXquartzBringAllToFront,  // bring all X windows to front
-    kXquartzToggleFullscreen, // Enable/Disable fullscreen mode
-    kXquartzSetRootless,      // Set rootless mode
-    kXquartzSpaceChanged,     // Spaces changed
-    kXquartzListenOnOpenFD,   // Listen to the launchd fd (passed as arg)
+    kXquartzReloadKeymap,       // Reload system keymap
+    kXquartzActivate,           // restore X drawing and cursor
+    kXquartzDeactivate,         // clip X drawing and switch to Aqua cursor
+    kXquartzSetRootClip,        // enable or disable drawing to the X screen
+    kXquartzQuit,               // kill the X server and release the display
+    kXquartzBringAllToFront,    // bring all X windows to front
+    kXquartzToggleFullscreen,   // Enable/Disable fullscreen mode
+    kXquartzSetRootless,        // Set rootless mode
+    kXquartzSpaceChanged,       // Spaces changed
+    kXquartzListenOnOpenFD,     // Listen to the launchd fd (passed as arg)
     /*
      * AppleWM events
      */
-    kXquartzControllerNotify, // send an AppleWMControllerNotify event
-    kXquartzPasteboardNotify, // notify the WM to copy or paste
-    kXquartzReloadPreferences, // send AppleWMReloadPreferences
+    kXquartzControllerNotify,   // send an AppleWMControllerNotify event
+    kXquartzPasteboardNotify,   // notify the WM to copy or paste
+    kXquartzReloadPreferences,  // send AppleWMReloadPreferences
     /*
      * Xplugin notification events
      */
-    kXquartzDisplayChanged,   // display configuration has changed
-    kXquartzWindowState,      // window visibility state has changed
-    kXquartzWindowMoved,      // window has moved on screen
+    kXquartzDisplayChanged,     // display configuration has changed
+    kXquartzWindowState,        // window visibility state has changed
+    kXquartzWindowMoved,        // window has moved on screen
 };
 
 /* Send one of the above events to the server thread. */
@@ -89,4 +92,4 @@ extern int darwin_x11_modifier_mask;
 /* The current state of the above listed modifiers */
 extern int darwin_all_modifier_flags;
 
-#endif  /* _DARWIN_EVENTS_H */
+#endif                          /* _DARWIN_EVENTS_H */
diff --git a/xorg-server/hw/xquartz/darwinXinput.c b/xorg-server/hw/xquartz/darwinXinput.c
index 94c31bb23..4d6604ed4 100644
--- a/xorg-server/hw/xquartz/darwinXinput.c
+++ b/xorg-server/hw/xquartz/darwinXinput.c
@@ -78,7 +78,7 @@ SOFTWARE.
 int
 SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)
 {
-  DEBUG_LOG("SetDeviceMode(%p, %p, %d)\n", client, dev, mode);
+    DEBUG_LOG("SetDeviceMode(%p, %p, %d)\n", client, dev, mode);
     return BadMatch;
 }
 
@@ -96,11 +96,11 @@ SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)
 
 int
 SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,
-		   int *valuators, int first_valuator, int num_valuators)
+                   int *valuators, int first_valuator, int num_valuators)
 {
-  DEBUG_LOG("SetDeviceValuators(%p, %p, %p, %d, %d)\n", client,
-	    dev, valuators, first_valuator, num_valuators);
-  return BadMatch;
+    DEBUG_LOG("SetDeviceValuators(%p, %p, %p, %d, %d)\n", client,
+              dev, valuators, first_valuator, num_valuators);
+    return BadMatch;
 }
 
 /****************************************************************************
@@ -112,15 +112,13 @@ SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,
  */
 
 int
-ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,
-		    xDeviceCtl * control)
+ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev, xDeviceCtl * control)
 {
 
-  DEBUG_LOG("ChangeDeviceControl(%p, %p, %p)\n", client, dev, control);
-  return BadMatch;
+    DEBUG_LOG("ChangeDeviceControl(%p, %p, %p)\n", client, dev, control);
+    return BadMatch;
 }
 
-
 /****************************************************************************
  *
  * Caller: configAddDevice (and others)
@@ -129,11 +127,11 @@ ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,
  *
  */
 int
-NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
+NewInputDeviceRequest(InputOption *options, InputAttributes * attrs,
                       DeviceIntPtr *pdev)
 {
-  DEBUG_LOG("NewInputDeviceRequest(%p, %p)\n", options, pdev);
-  return BadValue;
+    DEBUG_LOG("NewInputDeviceRequest(%p, %p)\n", options, pdev);
+    return BadValue;
 }
 
 /****************************************************************************
@@ -146,6 +144,5 @@ NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
 void
 DeleteInputDeviceRequest(DeviceIntPtr dev)
 {
-  DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);
+    DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);
 }
-
diff --git a/xorg-server/hw/xquartz/keysym2ucs.c b/xorg-server/hw/xquartz/keysym2ucs.c
index 8626ebc4e..73ea55ad3 100644
--- a/xorg-server/hw/xquartz/keysym2ucs.c
+++ b/xorg-server/hw/xquartz/keysym2ucs.c
@@ -40,795 +40,796 @@
 #include <string.h>
 
 struct codepair {
-  unsigned short keysym;
-  unsigned short ucs;
+    unsigned short keysym;
+    unsigned short ucs;
 };
 
 const static struct codepair keysymtab[] = {
-  { 0x01a1, 0x0104 },
-  { 0x01a2, 0x02d8 },
-  { 0x01a3, 0x0141 },
-  { 0x01a5, 0x013d },
-  { 0x01a6, 0x015a },
-  { 0x01a9, 0x0160 },
-  { 0x01aa, 0x015e },
-  { 0x01ab, 0x0164 },
-  { 0x01ac, 0x0179 },
-  { 0x01ae, 0x017d },
-  { 0x01af, 0x017b },
-  { 0x01b1, 0x0105 },
-  { 0x01b2, 0x02db },
-  { 0x01b3, 0x0142 },
-  { 0x01b5, 0x013e },
-  { 0x01b6, 0x015b },
-  { 0x01b7, 0x02c7 },
-  { 0x01b9, 0x0161 },
-  { 0x01ba, 0x015f },
-  { 0x01bb, 0x0165 },
-  { 0x01bc, 0x017a },
-  { 0x01bd, 0x02dd },
-  { 0x01be, 0x017e },
-  { 0x01bf, 0x017c },
-  { 0x01c0, 0x0154 },
-  { 0x01c3, 0x0102 },
-  { 0x01c5, 0x0139 },
-  { 0x01c6, 0x0106 },
-  { 0x01c8, 0x010c },
-  { 0x01ca, 0x0118 },
-  { 0x01cc, 0x011a },
-  { 0x01cf, 0x010e },
-  { 0x01d0, 0x0110 },
-  { 0x01d1, 0x0143 },
-  { 0x01d2, 0x0147 },
-  { 0x01d5, 0x0150 },
-  { 0x01d8, 0x0158 },
-  { 0x01d9, 0x016e },
-  { 0x01db, 0x0170 },
-  { 0x01de, 0x0162 },
-  { 0x01e0, 0x0155 },
-  { 0x01e3, 0x0103 },
-  { 0x01e5, 0x013a },
-  { 0x01e6, 0x0107 },
-  { 0x01e8, 0x010d },
-  { 0x01ea, 0x0119 },
-  { 0x01ec, 0x011b },
-  { 0x01ef, 0x010f },
-  { 0x01f0, 0x0111 },
-  { 0x01f1, 0x0144 },
-  { 0x01f2, 0x0148 },
-  { 0x01f5, 0x0151 },
-  { 0x01f8, 0x0159 },
-  { 0x01f9, 0x016f },
-  { 0x01fb, 0x0171 },
-  { 0x01fe, 0x0163 },
-  { 0x01ff, 0x02d9 },
-  { 0x02a1, 0x0126 },
-  { 0x02a6, 0x0124 },
-  { 0x02a9, 0x0130 },
-  { 0x02ab, 0x011e },
-  { 0x02ac, 0x0134 },
-  { 0x02b1, 0x0127 },
-  { 0x02b6, 0x0125 },
-  { 0x02b9, 0x0131 },
-  { 0x02bb, 0x011f },
-  { 0x02bc, 0x0135 },
-  { 0x02c5, 0x010a },
-  { 0x02c6, 0x0108 },
-  { 0x02d5, 0x0120 },
-  { 0x02d8, 0x011c },
-  { 0x02dd, 0x016c },
-  { 0x02de, 0x015c },
-  { 0x02e5, 0x010b },
-  { 0x02e6, 0x0109 },
-  { 0x02f5, 0x0121 },
-  { 0x02f8, 0x011d },
-  { 0x02fd, 0x016d },
-  { 0x02fe, 0x015d },
-  { 0x03a2, 0x0138 },
-  { 0x03a3, 0x0156 },
-  { 0x03a5, 0x0128 },
-  { 0x03a6, 0x013b },
-  { 0x03aa, 0x0112 },
-  { 0x03ab, 0x0122 },
-  { 0x03ac, 0x0166 },
-  { 0x03b3, 0x0157 },
-  { 0x03b5, 0x0129 },
-  { 0x03b6, 0x013c },
-  { 0x03ba, 0x0113 },
-  { 0x03bb, 0x0123 },
-  { 0x03bc, 0x0167 },
-  { 0x03bd, 0x014a },
-  { 0x03bf, 0x014b },
-  { 0x03c0, 0x0100 },
-  { 0x03c7, 0x012e },
-  { 0x03cc, 0x0116 },
-  { 0x03cf, 0x012a },
-  { 0x03d1, 0x0145 },
-  { 0x03d2, 0x014c },
-  { 0x03d3, 0x0136 },
-  { 0x03d9, 0x0172 },
-  { 0x03dd, 0x0168 },
-  { 0x03de, 0x016a },
-  { 0x03e0, 0x0101 },
-  { 0x03e7, 0x012f },
-  { 0x03ec, 0x0117 },
-  { 0x03ef, 0x012b },
-  { 0x03f1, 0x0146 },
-  { 0x03f2, 0x014d },
-  { 0x03f3, 0x0137 },
-  { 0x03f9, 0x0173 },
-  { 0x03fd, 0x0169 },
-  { 0x03fe, 0x016b },
-  { 0x047e, 0x203e },
-  { 0x04a1, 0x3002 },
-  { 0x04a2, 0x300c },
-  { 0x04a3, 0x300d },
-  { 0x04a4, 0x3001 },
-  { 0x04a5, 0x30fb },
-  { 0x04a6, 0x30f2 },
-  { 0x04a7, 0x30a1 },
-  { 0x04a8, 0x30a3 },
-  { 0x04a9, 0x30a5 },
-  { 0x04aa, 0x30a7 },
-  { 0x04ab, 0x30a9 },
-  { 0x04ac, 0x30e3 },
-  { 0x04ad, 0x30e5 },
-  { 0x04ae, 0x30e7 },
-  { 0x04af, 0x30c3 },
-  { 0x04b0, 0x30fc },
-  { 0x04b1, 0x30a2 },
-  { 0x04b2, 0x30a4 },
-  { 0x04b3, 0x30a6 },
-  { 0x04b4, 0x30a8 },
-  { 0x04b5, 0x30aa },
-  { 0x04b6, 0x30ab },
-  { 0x04b7, 0x30ad },
-  { 0x04b8, 0x30af },
-  { 0x04b9, 0x30b1 },
-  { 0x04ba, 0x30b3 },
-  { 0x04bb, 0x30b5 },
-  { 0x04bc, 0x30b7 },
-  { 0x04bd, 0x30b9 },
-  { 0x04be, 0x30bb },
-  { 0x04bf, 0x30bd },
-  { 0x04c0, 0x30bf },
-  { 0x04c1, 0x30c1 },
-  { 0x04c2, 0x30c4 },
-  { 0x04c3, 0x30c6 },
-  { 0x04c4, 0x30c8 },
-  { 0x04c5, 0x30ca },
-  { 0x04c6, 0x30cb },
-  { 0x04c7, 0x30cc },
-  { 0x04c8, 0x30cd },
-  { 0x04c9, 0x30ce },
-  { 0x04ca, 0x30cf },
-  { 0x04cb, 0x30d2 },
-  { 0x04cc, 0x30d5 },
-  { 0x04cd, 0x30d8 },
-  { 0x04ce, 0x30db },
-  { 0x04cf, 0x30de },
-  { 0x04d0, 0x30df },
-  { 0x04d1, 0x30e0 },
-  { 0x04d2, 0x30e1 },
-  { 0x04d3, 0x30e2 },
-  { 0x04d4, 0x30e4 },
-  { 0x04d5, 0x30e6 },
-  { 0x04d6, 0x30e8 },
-  { 0x04d7, 0x30e9 },
-  { 0x04d8, 0x30ea },
-  { 0x04d9, 0x30eb },
-  { 0x04da, 0x30ec },
-  { 0x04db, 0x30ed },
-  { 0x04dc, 0x30ef },
-  { 0x04dd, 0x30f3 },
-  { 0x04de, 0x309b },
-  { 0x04df, 0x309c },
-  { 0x05ac, 0x060c },
-  { 0x05bb, 0x061b },
-  { 0x05bf, 0x061f },
-  { 0x05c1, 0x0621 },
-  { 0x05c2, 0x0622 },
-  { 0x05c3, 0x0623 },
-  { 0x05c4, 0x0624 },
-  { 0x05c5, 0x0625 },
-  { 0x05c6, 0x0626 },
-  { 0x05c7, 0x0627 },
-  { 0x05c8, 0x0628 },
-  { 0x05c9, 0x0629 },
-  { 0x05ca, 0x062a },
-  { 0x05cb, 0x062b },
-  { 0x05cc, 0x062c },
-  { 0x05cd, 0x062d },
-  { 0x05ce, 0x062e },
-  { 0x05cf, 0x062f },
-  { 0x05d0, 0x0630 },
-  { 0x05d1, 0x0631 },
-  { 0x05d2, 0x0632 },
-  { 0x05d3, 0x0633 },
-  { 0x05d4, 0x0634 },
-  { 0x05d5, 0x0635 },
-  { 0x05d6, 0x0636 },
-  { 0x05d7, 0x0637 },
-  { 0x05d8, 0x0638 },
-  { 0x05d9, 0x0639 },
-  { 0x05da, 0x063a },
-  { 0x05e0, 0x0640 },
-  { 0x05e1, 0x0641 },
-  { 0x05e2, 0x0642 },
-  { 0x05e3, 0x0643 },
-  { 0x05e4, 0x0644 },
-  { 0x05e5, 0x0645 },
-  { 0x05e6, 0x0646 },
-  { 0x05e7, 0x0647 },
-  { 0x05e8, 0x0648 },
-  { 0x05e9, 0x0649 },
-  { 0x05ea, 0x064a },
-  { 0x05eb, 0x064b },
-  { 0x05ec, 0x064c },
-  { 0x05ed, 0x064d },
-  { 0x05ee, 0x064e },
-  { 0x05ef, 0x064f },
-  { 0x05f0, 0x0650 },
-  { 0x05f1, 0x0651 },
-  { 0x05f2, 0x0652 },
-  { 0x06a1, 0x0452 },
-  { 0x06a2, 0x0453 },
-  { 0x06a3, 0x0451 },
-  { 0x06a4, 0x0454 },
-  { 0x06a5, 0x0455 },
-  { 0x06a6, 0x0456 },
-  { 0x06a7, 0x0457 },
-  { 0x06a8, 0x0458 },
-  { 0x06a9, 0x0459 },
-  { 0x06aa, 0x045a },
-  { 0x06ab, 0x045b },
-  { 0x06ac, 0x045c },
-  { 0x06ae, 0x045e },
-  { 0x06af, 0x045f },
-  { 0x06b0, 0x2116 },
-  { 0x06b1, 0x0402 },
-  { 0x06b2, 0x0403 },
-  { 0x06b3, 0x0401 },
-  { 0x06b4, 0x0404 },
-  { 0x06b5, 0x0405 },
-  { 0x06b6, 0x0406 },
-  { 0x06b7, 0x0407 },
-  { 0x06b8, 0x0408 },
-  { 0x06b9, 0x0409 },
-  { 0x06ba, 0x040a },
-  { 0x06bb, 0x040b },
-  { 0x06bc, 0x040c },
-  { 0x06be, 0x040e },
-  { 0x06bf, 0x040f },
-  { 0x06c0, 0x044e },
-  { 0x06c1, 0x0430 },
-  { 0x06c2, 0x0431 },
-  { 0x06c3, 0x0446 },
-  { 0x06c4, 0x0434 },
-  { 0x06c5, 0x0435 },
-  { 0x06c6, 0x0444 },
-  { 0x06c7, 0x0433 },
-  { 0x06c8, 0x0445 },
-  { 0x06c9, 0x0438 },
-  { 0x06ca, 0x0439 },
-  { 0x06cb, 0x043a },
-  { 0x06cc, 0x043b },
-  { 0x06cd, 0x043c },
-  { 0x06ce, 0x043d },
-  { 0x06cf, 0x043e },
-  { 0x06d0, 0x043f },
-  { 0x06d1, 0x044f },
-  { 0x06d2, 0x0440 },
-  { 0x06d3, 0x0441 },
-  { 0x06d4, 0x0442 },
-  { 0x06d5, 0x0443 },
-  { 0x06d6, 0x0436 },
-  { 0x06d7, 0x0432 },
-  { 0x06d8, 0x044c },
-  { 0x06d9, 0x044b },
-  { 0x06da, 0x0437 },
-  { 0x06db, 0x0448 },
-  { 0x06dc, 0x044d },
-  { 0x06dd, 0x0449 },
-  { 0x06de, 0x0447 },
-  { 0x06df, 0x044a },
-  { 0x06e0, 0x042e },
-  { 0x06e1, 0x0410 },
-  { 0x06e2, 0x0411 },
-  { 0x06e3, 0x0426 },
-  { 0x06e4, 0x0414 },
-  { 0x06e5, 0x0415 },
-  { 0x06e6, 0x0424 },
-  { 0x06e7, 0x0413 },
-  { 0x06e8, 0x0425 },
-  { 0x06e9, 0x0418 },
-  { 0x06ea, 0x0419 },
-  { 0x06eb, 0x041a },
-  { 0x06ec, 0x041b },
-  { 0x06ed, 0x041c },
-  { 0x06ee, 0x041d },
-  { 0x06ef, 0x041e },
-  { 0x06f0, 0x041f },
-  { 0x06f1, 0x042f },
-  { 0x06f2, 0x0420 },
-  { 0x06f3, 0x0421 },
-  { 0x06f4, 0x0422 },
-  { 0x06f5, 0x0423 },
-  { 0x06f6, 0x0416 },
-  { 0x06f7, 0x0412 },
-  { 0x06f8, 0x042c },
-  { 0x06f9, 0x042b },
-  { 0x06fa, 0x0417 },
-  { 0x06fb, 0x0428 },
-  { 0x06fc, 0x042d },
-  { 0x06fd, 0x0429 },
-  { 0x06fe, 0x0427 },
-  { 0x06ff, 0x042a },
-  { 0x07a1, 0x0386 },
-  { 0x07a2, 0x0388 },
-  { 0x07a3, 0x0389 },
-  { 0x07a4, 0x038a },
-  { 0x07a5, 0x03aa },
-  { 0x07a7, 0x038c },
-  { 0x07a8, 0x038e },
-  { 0x07a9, 0x03ab },
-  { 0x07ab, 0x038f },
-  { 0x07ae, 0x0385 },
-  { 0x07af, 0x2015 },
-  { 0x07b1, 0x03ac },
-  { 0x07b2, 0x03ad },
-  { 0x07b3, 0x03ae },
-  { 0x07b4, 0x03af },
-  { 0x07b5, 0x03ca },
-  { 0x07b6, 0x0390 },
-  { 0x07b7, 0x03cc },
-  { 0x07b8, 0x03cd },
-  { 0x07b9, 0x03cb },
-  { 0x07ba, 0x03b0 },
-  { 0x07bb, 0x03ce },
-  { 0x07c1, 0x0391 },
-  { 0x07c2, 0x0392 },
-  { 0x07c3, 0x0393 },
-  { 0x07c4, 0x0394 },
-  { 0x07c5, 0x0395 },
-  { 0x07c6, 0x0396 },
-  { 0x07c7, 0x0397 },
-  { 0x07c8, 0x0398 },
-  { 0x07c9, 0x0399 },
-  { 0x07ca, 0x039a },
-  { 0x07cb, 0x039b },
-  { 0x07cc, 0x039c },
-  { 0x07cd, 0x039d },
-  { 0x07ce, 0x039e },
-  { 0x07cf, 0x039f },
-  { 0x07d0, 0x03a0 },
-  { 0x07d1, 0x03a1 },
-  { 0x07d2, 0x03a3 },
-  { 0x07d4, 0x03a4 },
-  { 0x07d5, 0x03a5 },
-  { 0x07d6, 0x03a6 },
-  { 0x07d7, 0x03a7 },
-  { 0x07d8, 0x03a8 },
-  { 0x07d9, 0x03a9 },
-  { 0x07e1, 0x03b1 },
-  { 0x07e2, 0x03b2 },
-  { 0x07e3, 0x03b3 },
-  { 0x07e4, 0x03b4 },
-  { 0x07e5, 0x03b5 },
-  { 0x07e6, 0x03b6 },
-  { 0x07e7, 0x03b7 },
-  { 0x07e8, 0x03b8 },
-  { 0x07e9, 0x03b9 },
-  { 0x07ea, 0x03ba },
-  { 0x07eb, 0x03bb },
-  { 0x07ec, 0x03bc },
-  { 0x07ed, 0x03bd },
-  { 0x07ee, 0x03be },
-  { 0x07ef, 0x03bf },
-  { 0x07f0, 0x03c0 },
-  { 0x07f1, 0x03c1 },
-  { 0x07f2, 0x03c3 },
-  { 0x07f3, 0x03c2 },
-  { 0x07f4, 0x03c4 },
-  { 0x07f5, 0x03c5 },
-  { 0x07f6, 0x03c6 },
-  { 0x07f7, 0x03c7 },
-  { 0x07f8, 0x03c8 },
-  { 0x07f9, 0x03c9 },
-  { 0x08a1, 0x23b7 },
-  { 0x08a2, 0x250c },
-  { 0x08a3, 0x2500 },
-  { 0x08a4, 0x2320 },
-  { 0x08a5, 0x2321 },
-  { 0x08a6, 0x2502 },
-  { 0x08a7, 0x23a1 },
-  { 0x08a8, 0x23a3 },
-  { 0x08a9, 0x23a4 },
-  { 0x08aa, 0x23a6 },
-  { 0x08ab, 0x239b },
-  { 0x08ac, 0x239d },
-  { 0x08ad, 0x239e },
-  { 0x08ae, 0x23a0 },
-  { 0x08af, 0x23a8 },
-  { 0x08b0, 0x23ac },
-  { 0x08bc, 0x2264 },
-  { 0x08bd, 0x2260 },
-  { 0x08be, 0x2265 },
-  { 0x08bf, 0x222b },
-  { 0x08c0, 0x2234 },
-  { 0x08c1, 0x221d },
-  { 0x08c2, 0x221e },
-  { 0x08c5, 0x2207 },
-  { 0x08c8, 0x223c },
-  { 0x08c9, 0x2243 },
-  { 0x08cd, 0x21d4 },
-  { 0x08ce, 0x21d2 },
-  { 0x08cf, 0x2261 },
-  { 0x08d6, 0x221a },
-  { 0x08da, 0x2282 },
-  { 0x08db, 0x2283 },
-  { 0x08dc, 0x2229 },
-  { 0x08dd, 0x222a },
-  { 0x08de, 0x2227 },
-  { 0x08df, 0x2228 },
-  { 0x08ef, 0x2202 },
-  { 0x08f6, 0x0192 },
-  { 0x08fb, 0x2190 },
-  { 0x08fc, 0x2191 },
-  { 0x08fd, 0x2192 },
-  { 0x08fe, 0x2193 },
-  { 0x09e0, 0x25c6 },
-  { 0x09e1, 0x2592 },
-  { 0x09e2, 0x2409 },
-  { 0x09e3, 0x240c },
-  { 0x09e4, 0x240d },
-  { 0x09e5, 0x240a },
-  { 0x09e8, 0x2424 },
-  { 0x09e9, 0x240b },
-  { 0x09ea, 0x2518 },
-  { 0x09eb, 0x2510 },
-  { 0x09ec, 0x250c },
-  { 0x09ed, 0x2514 },
-  { 0x09ee, 0x253c },
-  { 0x09ef, 0x23ba },
-  { 0x09f0, 0x23bb },
-  { 0x09f1, 0x2500 },
-  { 0x09f2, 0x23bc },
-  { 0x09f3, 0x23bd },
-  { 0x09f4, 0x251c },
-  { 0x09f5, 0x2524 },
-  { 0x09f6, 0x2534 },
-  { 0x09f7, 0x252c },
-  { 0x09f8, 0x2502 },
-  { 0x0aa1, 0x2003 },
-  { 0x0aa2, 0x2002 },
-  { 0x0aa3, 0x2004 },
-  { 0x0aa4, 0x2005 },
-  { 0x0aa5, 0x2007 },
-  { 0x0aa6, 0x2008 },
-  { 0x0aa7, 0x2009 },
-  { 0x0aa8, 0x200a },
-  { 0x0aa9, 0x2014 },
-  { 0x0aaa, 0x2013 },
-  { 0x0aae, 0x2026 },
-  { 0x0aaf, 0x2025 },
-  { 0x0ab0, 0x2153 },
-  { 0x0ab1, 0x2154 },
-  { 0x0ab2, 0x2155 },
-  { 0x0ab3, 0x2156 },
-  { 0x0ab4, 0x2157 },
-  { 0x0ab5, 0x2158 },
-  { 0x0ab6, 0x2159 },
-  { 0x0ab7, 0x215a },
-  { 0x0ab8, 0x2105 },
-  { 0x0abb, 0x2012 },
-  { 0x0abc, 0x2329 },
-  { 0x0abe, 0x232a },
-  { 0x0ac3, 0x215b },
-  { 0x0ac4, 0x215c },
-  { 0x0ac5, 0x215d },
-  { 0x0ac6, 0x215e },
-  { 0x0ac9, 0x2122 },
-  { 0x0aca, 0x2613 },
-  { 0x0acc, 0x25c1 },
-  { 0x0acd, 0x25b7 },
-  { 0x0ace, 0x25cb },
-  { 0x0acf, 0x25af },
-  { 0x0ad0, 0x2018 },
-  { 0x0ad1, 0x2019 },
-  { 0x0ad2, 0x201c },
-  { 0x0ad3, 0x201d },
-  { 0x0ad4, 0x211e },
-  { 0x0ad6, 0x2032 },
-  { 0x0ad7, 0x2033 },
-  { 0x0ad9, 0x271d },
-  { 0x0adb, 0x25ac },
-  { 0x0adc, 0x25c0 },
-  { 0x0add, 0x25b6 },
-  { 0x0ade, 0x25cf },
-  { 0x0adf, 0x25ae },
-  { 0x0ae0, 0x25e6 },
-  { 0x0ae1, 0x25ab },
-  { 0x0ae2, 0x25ad },
-  { 0x0ae3, 0x25b3 },
-  { 0x0ae4, 0x25bd },
-  { 0x0ae5, 0x2606 },
-  { 0x0ae6, 0x2022 },
-  { 0x0ae7, 0x25aa },
-  { 0x0ae8, 0x25b2 },
-  { 0x0ae9, 0x25bc },
-  { 0x0aea, 0x261c },
-  { 0x0aeb, 0x261e },
-  { 0x0aec, 0x2663 },
-  { 0x0aed, 0x2666 },
-  { 0x0aee, 0x2665 },
-  { 0x0af0, 0x2720 },
-  { 0x0af1, 0x2020 },
-  { 0x0af2, 0x2021 },
-  { 0x0af3, 0x2713 },
-  { 0x0af4, 0x2717 },
-  { 0x0af5, 0x266f },
-  { 0x0af6, 0x266d },
-  { 0x0af7, 0x2642 },
-  { 0x0af8, 0x2640 },
-  { 0x0af9, 0x260e },
-  { 0x0afa, 0x2315 },
-  { 0x0afb, 0x2117 },
-  { 0x0afc, 0x2038 },
-  { 0x0afd, 0x201a },
-  { 0x0afe, 0x201e },
-  { 0x0ba3, 0x003c },
-  { 0x0ba6, 0x003e },
-  { 0x0ba8, 0x2228 },
-  { 0x0ba9, 0x2227 },
-  { 0x0bc0, 0x00af },
-  { 0x0bc2, 0x22a5 },
-  { 0x0bc3, 0x2229 },
-  { 0x0bc4, 0x230a },
-  { 0x0bc6, 0x005f },
-  { 0x0bca, 0x2218 },
-  { 0x0bcc, 0x2395 },
-  { 0x0bce, 0x22a4 },
-  { 0x0bcf, 0x25cb },
-  { 0x0bd3, 0x2308 },
-  { 0x0bd6, 0x222a },
-  { 0x0bd8, 0x2283 },
-  { 0x0bda, 0x2282 },
-  { 0x0bdc, 0x22a2 },
-  { 0x0bfc, 0x22a3 },
-  { 0x0cdf, 0x2017 },
-  { 0x0ce0, 0x05d0 },
-  { 0x0ce1, 0x05d1 },
-  { 0x0ce2, 0x05d2 },
-  { 0x0ce3, 0x05d3 },
-  { 0x0ce4, 0x05d4 },
-  { 0x0ce5, 0x05d5 },
-  { 0x0ce6, 0x05d6 },
-  { 0x0ce7, 0x05d7 },
-  { 0x0ce8, 0x05d8 },
-  { 0x0ce9, 0x05d9 },
-  { 0x0cea, 0x05da },
-  { 0x0ceb, 0x05db },
-  { 0x0cec, 0x05dc },
-  { 0x0ced, 0x05dd },
-  { 0x0cee, 0x05de },
-  { 0x0cef, 0x05df },
-  { 0x0cf0, 0x05e0 },
-  { 0x0cf1, 0x05e1 },
-  { 0x0cf2, 0x05e2 },
-  { 0x0cf3, 0x05e3 },
-  { 0x0cf4, 0x05e4 },
-  { 0x0cf5, 0x05e5 },
-  { 0x0cf6, 0x05e6 },
-  { 0x0cf7, 0x05e7 },
-  { 0x0cf8, 0x05e8 },
-  { 0x0cf9, 0x05e9 },
-  { 0x0cfa, 0x05ea },
-  { 0x0da1, 0x0e01 },
-  { 0x0da2, 0x0e02 },
-  { 0x0da3, 0x0e03 },
-  { 0x0da4, 0x0e04 },
-  { 0x0da5, 0x0e05 },
-  { 0x0da6, 0x0e06 },
-  { 0x0da7, 0x0e07 },
-  { 0x0da8, 0x0e08 },
-  { 0x0da9, 0x0e09 },
-  { 0x0daa, 0x0e0a },
-  { 0x0dab, 0x0e0b },
-  { 0x0dac, 0x0e0c },
-  { 0x0dad, 0x0e0d },
-  { 0x0dae, 0x0e0e },
-  { 0x0daf, 0x0e0f },
-  { 0x0db0, 0x0e10 },
-  { 0x0db1, 0x0e11 },
-  { 0x0db2, 0x0e12 },
-  { 0x0db3, 0x0e13 },
-  { 0x0db4, 0x0e14 },
-  { 0x0db5, 0x0e15 },
-  { 0x0db6, 0x0e16 },
-  { 0x0db7, 0x0e17 },
-  { 0x0db8, 0x0e18 },
-  { 0x0db9, 0x0e19 },
-  { 0x0dba, 0x0e1a },
-  { 0x0dbb, 0x0e1b },
-  { 0x0dbc, 0x0e1c },
-  { 0x0dbd, 0x0e1d },
-  { 0x0dbe, 0x0e1e },
-  { 0x0dbf, 0x0e1f },
-  { 0x0dc0, 0x0e20 },
-  { 0x0dc1, 0x0e21 },
-  { 0x0dc2, 0x0e22 },
-  { 0x0dc3, 0x0e23 },
-  { 0x0dc4, 0x0e24 },
-  { 0x0dc5, 0x0e25 },
-  { 0x0dc6, 0x0e26 },
-  { 0x0dc7, 0x0e27 },
-  { 0x0dc8, 0x0e28 },
-  { 0x0dc9, 0x0e29 },
-  { 0x0dca, 0x0e2a },
-  { 0x0dcb, 0x0e2b },
-  { 0x0dcc, 0x0e2c },
-  { 0x0dcd, 0x0e2d },
-  { 0x0dce, 0x0e2e },
-  { 0x0dcf, 0x0e2f },
-  { 0x0dd0, 0x0e30 },
-  { 0x0dd1, 0x0e31 },
-  { 0x0dd2, 0x0e32 },
-  { 0x0dd3, 0x0e33 },
-  { 0x0dd4, 0x0e34 },
-  { 0x0dd5, 0x0e35 },
-  { 0x0dd6, 0x0e36 },
-  { 0x0dd7, 0x0e37 },
-  { 0x0dd8, 0x0e38 },
-  { 0x0dd9, 0x0e39 },
-  { 0x0dda, 0x0e3a },
-  { 0x0ddf, 0x0e3f },
-  { 0x0de0, 0x0e40 },
-  { 0x0de1, 0x0e41 },
-  { 0x0de2, 0x0e42 },
-  { 0x0de3, 0x0e43 },
-  { 0x0de4, 0x0e44 },
-  { 0x0de5, 0x0e45 },
-  { 0x0de6, 0x0e46 },
-  { 0x0de7, 0x0e47 },
-  { 0x0de8, 0x0e48 },
-  { 0x0de9, 0x0e49 },
-  { 0x0dea, 0x0e4a },
-  { 0x0deb, 0x0e4b },
-  { 0x0dec, 0x0e4c },
-  { 0x0ded, 0x0e4d },
-  { 0x0df0, 0x0e50 },
-  { 0x0df1, 0x0e51 },
-  { 0x0df2, 0x0e52 },
-  { 0x0df3, 0x0e53 },
-  { 0x0df4, 0x0e54 },
-  { 0x0df5, 0x0e55 },
-  { 0x0df6, 0x0e56 },
-  { 0x0df7, 0x0e57 },
-  { 0x0df8, 0x0e58 },
-  { 0x0df9, 0x0e59 },
-  { 0x0ea1, 0x3131 },
-  { 0x0ea2, 0x3132 },
-  { 0x0ea3, 0x3133 },
-  { 0x0ea4, 0x3134 },
-  { 0x0ea5, 0x3135 },
-  { 0x0ea6, 0x3136 },
-  { 0x0ea7, 0x3137 },
-  { 0x0ea8, 0x3138 },
-  { 0x0ea9, 0x3139 },
-  { 0x0eaa, 0x313a },
-  { 0x0eab, 0x313b },
-  { 0x0eac, 0x313c },
-  { 0x0ead, 0x313d },
-  { 0x0eae, 0x313e },
-  { 0x0eaf, 0x313f },
-  { 0x0eb0, 0x3140 },
-  { 0x0eb1, 0x3141 },
-  { 0x0eb2, 0x3142 },
-  { 0x0eb3, 0x3143 },
-  { 0x0eb4, 0x3144 },
-  { 0x0eb5, 0x3145 },
-  { 0x0eb6, 0x3146 },
-  { 0x0eb7, 0x3147 },
-  { 0x0eb8, 0x3148 },
-  { 0x0eb9, 0x3149 },
-  { 0x0eba, 0x314a },
-  { 0x0ebb, 0x314b },
-  { 0x0ebc, 0x314c },
-  { 0x0ebd, 0x314d },
-  { 0x0ebe, 0x314e },
-  { 0x0ebf, 0x314f },
-  { 0x0ec0, 0x3150 },
-  { 0x0ec1, 0x3151 },
-  { 0x0ec2, 0x3152 },
-  { 0x0ec3, 0x3153 },
-  { 0x0ec4, 0x3154 },
-  { 0x0ec5, 0x3155 },
-  { 0x0ec6, 0x3156 },
-  { 0x0ec7, 0x3157 },
-  { 0x0ec8, 0x3158 },
-  { 0x0ec9, 0x3159 },
-  { 0x0eca, 0x315a },
-  { 0x0ecb, 0x315b },
-  { 0x0ecc, 0x315c },
-  { 0x0ecd, 0x315d },
-  { 0x0ece, 0x315e },
-  { 0x0ecf, 0x315f },
-  { 0x0ed0, 0x3160 },
-  { 0x0ed1, 0x3161 },
-  { 0x0ed2, 0x3162 },
-  { 0x0ed3, 0x3163 },
-  { 0x0ed4, 0x11a8 },
-  { 0x0ed5, 0x11a9 },
-  { 0x0ed6, 0x11aa },
-  { 0x0ed7, 0x11ab },
-  { 0x0ed8, 0x11ac },
-  { 0x0ed9, 0x11ad },
-  { 0x0eda, 0x11ae },
-  { 0x0edb, 0x11af },
-  { 0x0edc, 0x11b0 },
-  { 0x0edd, 0x11b1 },
-  { 0x0ede, 0x11b2 },
-  { 0x0edf, 0x11b3 },
-  { 0x0ee0, 0x11b4 },
-  { 0x0ee1, 0x11b5 },
-  { 0x0ee2, 0x11b6 },
-  { 0x0ee3, 0x11b7 },
-  { 0x0ee4, 0x11b8 },
-  { 0x0ee5, 0x11b9 },
-  { 0x0ee6, 0x11ba },
-  { 0x0ee7, 0x11bb },
-  { 0x0ee8, 0x11bc },
-  { 0x0ee9, 0x11bd },
-  { 0x0eea, 0x11be },
-  { 0x0eeb, 0x11bf },
-  { 0x0eec, 0x11c0 },
-  { 0x0eed, 0x11c1 },
-  { 0x0eee, 0x11c2 },
-  { 0x0eef, 0x316d },
-  { 0x0ef0, 0x3171 },
-  { 0x0ef1, 0x3178 },
-  { 0x0ef2, 0x317f },
-  { 0x0ef3, 0x3181 },
-  { 0x0ef4, 0x3184 },
-  { 0x0ef5, 0x3186 },
-  { 0x0ef6, 0x318d },
-  { 0x0ef7, 0x318e },
-  { 0x0ef8, 0x11eb },
-  { 0x0ef9, 0x11f0 },
-  { 0x0efa, 0x11f9 },
-  { 0x0eff, 0x20a9 },
+    {0x01a1, 0x0104},
+    {0x01a2, 0x02d8},
+    {0x01a3, 0x0141},
+    {0x01a5, 0x013d},
+    {0x01a6, 0x015a},
+    {0x01a9, 0x0160},
+    {0x01aa, 0x015e},
+    {0x01ab, 0x0164},
+    {0x01ac, 0x0179},
+    {0x01ae, 0x017d},
+    {0x01af, 0x017b},
+    {0x01b1, 0x0105},
+    {0x01b2, 0x02db},
+    {0x01b3, 0x0142},
+    {0x01b5, 0x013e},
+    {0x01b6, 0x015b},
+    {0x01b7, 0x02c7},
+    {0x01b9, 0x0161},
+    {0x01ba, 0x015f},
+    {0x01bb, 0x0165},
+    {0x01bc, 0x017a},
+    {0x01bd, 0x02dd},
+    {0x01be, 0x017e},
+    {0x01bf, 0x017c},
+    {0x01c0, 0x0154},
+    {0x01c3, 0x0102},
+    {0x01c5, 0x0139},
+    {0x01c6, 0x0106},
+    {0x01c8, 0x010c},
+    {0x01ca, 0x0118},
+    {0x01cc, 0x011a},
+    {0x01cf, 0x010e},
+    {0x01d0, 0x0110},
+    {0x01d1, 0x0143},
+    {0x01d2, 0x0147},
+    {0x01d5, 0x0150},
+    {0x01d8, 0x0158},
+    {0x01d9, 0x016e},
+    {0x01db, 0x0170},
+    {0x01de, 0x0162},
+    {0x01e0, 0x0155},
+    {0x01e3, 0x0103},
+    {0x01e5, 0x013a},
+    {0x01e6, 0x0107},
+    {0x01e8, 0x010d},
+    {0x01ea, 0x0119},
+    {0x01ec, 0x011b},
+    {0x01ef, 0x010f},
+    {0x01f0, 0x0111},
+    {0x01f1, 0x0144},
+    {0x01f2, 0x0148},
+    {0x01f5, 0x0151},
+    {0x01f8, 0x0159},
+    {0x01f9, 0x016f},
+    {0x01fb, 0x0171},
+    {0x01fe, 0x0163},
+    {0x01ff, 0x02d9},
+    {0x02a1, 0x0126},
+    {0x02a6, 0x0124},
+    {0x02a9, 0x0130},
+    {0x02ab, 0x011e},
+    {0x02ac, 0x0134},
+    {0x02b1, 0x0127},
+    {0x02b6, 0x0125},
+    {0x02b9, 0x0131},
+    {0x02bb, 0x011f},
+    {0x02bc, 0x0135},
+    {0x02c5, 0x010a},
+    {0x02c6, 0x0108},
+    {0x02d5, 0x0120},
+    {0x02d8, 0x011c},
+    {0x02dd, 0x016c},
+    {0x02de, 0x015c},
+    {0x02e5, 0x010b},
+    {0x02e6, 0x0109},
+    {0x02f5, 0x0121},
+    {0x02f8, 0x011d},
+    {0x02fd, 0x016d},
+    {0x02fe, 0x015d},
+    {0x03a2, 0x0138},
+    {0x03a3, 0x0156},
+    {0x03a5, 0x0128},
+    {0x03a6, 0x013b},
+    {0x03aa, 0x0112},
+    {0x03ab, 0x0122},
+    {0x03ac, 0x0166},
+    {0x03b3, 0x0157},
+    {0x03b5, 0x0129},
+    {0x03b6, 0x013c},
+    {0x03ba, 0x0113},
+    {0x03bb, 0x0123},
+    {0x03bc, 0x0167},
+    {0x03bd, 0x014a},
+    {0x03bf, 0x014b},
+    {0x03c0, 0x0100},
+    {0x03c7, 0x012e},
+    {0x03cc, 0x0116},
+    {0x03cf, 0x012a},
+    {0x03d1, 0x0145},
+    {0x03d2, 0x014c},
+    {0x03d3, 0x0136},
+    {0x03d9, 0x0172},
+    {0x03dd, 0x0168},
+    {0x03de, 0x016a},
+    {0x03e0, 0x0101},
+    {0x03e7, 0x012f},
+    {0x03ec, 0x0117},
+    {0x03ef, 0x012b},
+    {0x03f1, 0x0146},
+    {0x03f2, 0x014d},
+    {0x03f3, 0x0137},
+    {0x03f9, 0x0173},
+    {0x03fd, 0x0169},
+    {0x03fe, 0x016b},
+    {0x047e, 0x203e},
+    {0x04a1, 0x3002},
+    {0x04a2, 0x300c},
+    {0x04a3, 0x300d},
+    {0x04a4, 0x3001},
+    {0x04a5, 0x30fb},
+    {0x04a6, 0x30f2},
+    {0x04a7, 0x30a1},
+    {0x04a8, 0x30a3},
+    {0x04a9, 0x30a5},
+    {0x04aa, 0x30a7},
+    {0x04ab, 0x30a9},
+    {0x04ac, 0x30e3},
+    {0x04ad, 0x30e5},
+    {0x04ae, 0x30e7},
+    {0x04af, 0x30c3},
+    {0x04b0, 0x30fc},
+    {0x04b1, 0x30a2},
+    {0x04b2, 0x30a4},
+    {0x04b3, 0x30a6},
+    {0x04b4, 0x30a8},
+    {0x04b5, 0x30aa},
+    {0x04b6, 0x30ab},
+    {0x04b7, 0x30ad},
+    {0x04b8, 0x30af},
+    {0x04b9, 0x30b1},
+    {0x04ba, 0x30b3},
+    {0x04bb, 0x30b5},
+    {0x04bc, 0x30b7},
+    {0x04bd, 0x30b9},
+    {0x04be, 0x30bb},
+    {0x04bf, 0x30bd},
+    {0x04c0, 0x30bf},
+    {0x04c1, 0x30c1},
+    {0x04c2, 0x30c4},
+    {0x04c3, 0x30c6},
+    {0x04c4, 0x30c8},
+    {0x04c5, 0x30ca},
+    {0x04c6, 0x30cb},
+    {0x04c7, 0x30cc},
+    {0x04c8, 0x30cd},
+    {0x04c9, 0x30ce},
+    {0x04ca, 0x30cf},
+    {0x04cb, 0x30d2},
+    {0x04cc, 0x30d5},
+    {0x04cd, 0x30d8},
+    {0x04ce, 0x30db},
+    {0x04cf, 0x30de},
+    {0x04d0, 0x30df},
+    {0x04d1, 0x30e0},
+    {0x04d2, 0x30e1},
+    {0x04d3, 0x30e2},
+    {0x04d4, 0x30e4},
+    {0x04d5, 0x30e6},
+    {0x04d6, 0x30e8},
+    {0x04d7, 0x30e9},
+    {0x04d8, 0x30ea},
+    {0x04d9, 0x30eb},
+    {0x04da, 0x30ec},
+    {0x04db, 0x30ed},
+    {0x04dc, 0x30ef},
+    {0x04dd, 0x30f3},
+    {0x04de, 0x309b},
+    {0x04df, 0x309c},
+    {0x05ac, 0x060c},
+    {0x05bb, 0x061b},
+    {0x05bf, 0x061f},
+    {0x05c1, 0x0621},
+    {0x05c2, 0x0622},
+    {0x05c3, 0x0623},
+    {0x05c4, 0x0624},
+    {0x05c5, 0x0625},
+    {0x05c6, 0x0626},
+    {0x05c7, 0x0627},
+    {0x05c8, 0x0628},
+    {0x05c9, 0x0629},
+    {0x05ca, 0x062a},
+    {0x05cb, 0x062b},
+    {0x05cc, 0x062c},
+    {0x05cd, 0x062d},
+    {0x05ce, 0x062e},
+    {0x05cf, 0x062f},
+    {0x05d0, 0x0630},
+    {0x05d1, 0x0631},
+    {0x05d2, 0x0632},
+    {0x05d3, 0x0633},
+    {0x05d4, 0x0634},
+    {0x05d5, 0x0635},
+    {0x05d6, 0x0636},
+    {0x05d7, 0x0637},
+    {0x05d8, 0x0638},
+    {0x05d9, 0x0639},
+    {0x05da, 0x063a},
+    {0x05e0, 0x0640},
+    {0x05e1, 0x0641},
+    {0x05e2, 0x0642},
+    {0x05e3, 0x0643},
+    {0x05e4, 0x0644},
+    {0x05e5, 0x0645},
+    {0x05e6, 0x0646},
+    {0x05e7, 0x0647},
+    {0x05e8, 0x0648},
+    {0x05e9, 0x0649},
+    {0x05ea, 0x064a},
+    {0x05eb, 0x064b},
+    {0x05ec, 0x064c},
+    {0x05ed, 0x064d},
+    {0x05ee, 0x064e},
+    {0x05ef, 0x064f},
+    {0x05f0, 0x0650},
+    {0x05f1, 0x0651},
+    {0x05f2, 0x0652},
+    {0x06a1, 0x0452},
+    {0x06a2, 0x0453},
+    {0x06a3, 0x0451},
+    {0x06a4, 0x0454},
+    {0x06a5, 0x0455},
+    {0x06a6, 0x0456},
+    {0x06a7, 0x0457},
+    {0x06a8, 0x0458},
+    {0x06a9, 0x0459},
+    {0x06aa, 0x045a},
+    {0x06ab, 0x045b},
+    {0x06ac, 0x045c},
+    {0x06ae, 0x045e},
+    {0x06af, 0x045f},
+    {0x06b0, 0x2116},
+    {0x06b1, 0x0402},
+    {0x06b2, 0x0403},
+    {0x06b3, 0x0401},
+    {0x06b4, 0x0404},
+    {0x06b5, 0x0405},
+    {0x06b6, 0x0406},
+    {0x06b7, 0x0407},
+    {0x06b8, 0x0408},
+    {0x06b9, 0x0409},
+    {0x06ba, 0x040a},
+    {0x06bb, 0x040b},
+    {0x06bc, 0x040c},
+    {0x06be, 0x040e},
+    {0x06bf, 0x040f},
+    {0x06c0, 0x044e},
+    {0x06c1, 0x0430},
+    {0x06c2, 0x0431},
+    {0x06c3, 0x0446},
+    {0x06c4, 0x0434},
+    {0x06c5, 0x0435},
+    {0x06c6, 0x0444},
+    {0x06c7, 0x0433},
+    {0x06c8, 0x0445},
+    {0x06c9, 0x0438},
+    {0x06ca, 0x0439},
+    {0x06cb, 0x043a},
+    {0x06cc, 0x043b},
+    {0x06cd, 0x043c},
+    {0x06ce, 0x043d},
+    {0x06cf, 0x043e},
+    {0x06d0, 0x043f},
+    {0x06d1, 0x044f},
+    {0x06d2, 0x0440},
+    {0x06d3, 0x0441},
+    {0x06d4, 0x0442},
+    {0x06d5, 0x0443},
+    {0x06d6, 0x0436},
+    {0x06d7, 0x0432},
+    {0x06d8, 0x044c},
+    {0x06d9, 0x044b},
+    {0x06da, 0x0437},
+    {0x06db, 0x0448},
+    {0x06dc, 0x044d},
+    {0x06dd, 0x0449},
+    {0x06de, 0x0447},
+    {0x06df, 0x044a},
+    {0x06e0, 0x042e},
+    {0x06e1, 0x0410},
+    {0x06e2, 0x0411},
+    {0x06e3, 0x0426},
+    {0x06e4, 0x0414},
+    {0x06e5, 0x0415},
+    {0x06e6, 0x0424},
+    {0x06e7, 0x0413},
+    {0x06e8, 0x0425},
+    {0x06e9, 0x0418},
+    {0x06ea, 0x0419},
+    {0x06eb, 0x041a},
+    {0x06ec, 0x041b},
+    {0x06ed, 0x041c},
+    {0x06ee, 0x041d},
+    {0x06ef, 0x041e},
+    {0x06f0, 0x041f},
+    {0x06f1, 0x042f},
+    {0x06f2, 0x0420},
+    {0x06f3, 0x0421},
+    {0x06f4, 0x0422},
+    {0x06f5, 0x0423},
+    {0x06f6, 0x0416},
+    {0x06f7, 0x0412},
+    {0x06f8, 0x042c},
+    {0x06f9, 0x042b},
+    {0x06fa, 0x0417},
+    {0x06fb, 0x0428},
+    {0x06fc, 0x042d},
+    {0x06fd, 0x0429},
+    {0x06fe, 0x0427},
+    {0x06ff, 0x042a},
+    {0x07a1, 0x0386},
+    {0x07a2, 0x0388},
+    {0x07a3, 0x0389},
+    {0x07a4, 0x038a},
+    {0x07a5, 0x03aa},
+    {0x07a7, 0x038c},
+    {0x07a8, 0x038e},
+    {0x07a9, 0x03ab},
+    {0x07ab, 0x038f},
+    {0x07ae, 0x0385},
+    {0x07af, 0x2015},
+    {0x07b1, 0x03ac},
+    {0x07b2, 0x03ad},
+    {0x07b3, 0x03ae},
+    {0x07b4, 0x03af},
+    {0x07b5, 0x03ca},
+    {0x07b6, 0x0390},
+    {0x07b7, 0x03cc},
+    {0x07b8, 0x03cd},
+    {0x07b9, 0x03cb},
+    {0x07ba, 0x03b0},
+    {0x07bb, 0x03ce},
+    {0x07c1, 0x0391},
+    {0x07c2, 0x0392},
+    {0x07c3, 0x0393},
+    {0x07c4, 0x0394},
+    {0x07c5, 0x0395},
+    {0x07c6, 0x0396},
+    {0x07c7, 0x0397},
+    {0x07c8, 0x0398},
+    {0x07c9, 0x0399},
+    {0x07ca, 0x039a},
+    {0x07cb, 0x039b},
+    {0x07cc, 0x039c},
+    {0x07cd, 0x039d},
+    {0x07ce, 0x039e},
+    {0x07cf, 0x039f},
+    {0x07d0, 0x03a0},
+    {0x07d1, 0x03a1},
+    {0x07d2, 0x03a3},
+    {0x07d4, 0x03a4},
+    {0x07d5, 0x03a5},
+    {0x07d6, 0x03a6},
+    {0x07d7, 0x03a7},
+    {0x07d8, 0x03a8},
+    {0x07d9, 0x03a9},
+    {0x07e1, 0x03b1},
+    {0x07e2, 0x03b2},
+    {0x07e3, 0x03b3},
+    {0x07e4, 0x03b4},
+    {0x07e5, 0x03b5},
+    {0x07e6, 0x03b6},
+    {0x07e7, 0x03b7},
+    {0x07e8, 0x03b8},
+    {0x07e9, 0x03b9},
+    {0x07ea, 0x03ba},
+    {0x07eb, 0x03bb},
+    {0x07ec, 0x03bc},
+    {0x07ed, 0x03bd},
+    {0x07ee, 0x03be},
+    {0x07ef, 0x03bf},
+    {0x07f0, 0x03c0},
+    {0x07f1, 0x03c1},
+    {0x07f2, 0x03c3},
+    {0x07f3, 0x03c2},
+    {0x07f4, 0x03c4},
+    {0x07f5, 0x03c5},
+    {0x07f6, 0x03c6},
+    {0x07f7, 0x03c7},
+    {0x07f8, 0x03c8},
+    {0x07f9, 0x03c9},
+    {0x08a1, 0x23b7},
+    {0x08a2, 0x250c},
+    {0x08a3, 0x2500},
+    {0x08a4, 0x2320},
+    {0x08a5, 0x2321},
+    {0x08a6, 0x2502},
+    {0x08a7, 0x23a1},
+    {0x08a8, 0x23a3},
+    {0x08a9, 0x23a4},
+    {0x08aa, 0x23a6},
+    {0x08ab, 0x239b},
+    {0x08ac, 0x239d},
+    {0x08ad, 0x239e},
+    {0x08ae, 0x23a0},
+    {0x08af, 0x23a8},
+    {0x08b0, 0x23ac},
+    {0x08bc, 0x2264},
+    {0x08bd, 0x2260},
+    {0x08be, 0x2265},
+    {0x08bf, 0x222b},
+    {0x08c0, 0x2234},
+    {0x08c1, 0x221d},
+    {0x08c2, 0x221e},
+    {0x08c5, 0x2207},
+    {0x08c8, 0x223c},
+    {0x08c9, 0x2243},
+    {0x08cd, 0x21d4},
+    {0x08ce, 0x21d2},
+    {0x08cf, 0x2261},
+    {0x08d6, 0x221a},
+    {0x08da, 0x2282},
+    {0x08db, 0x2283},
+    {0x08dc, 0x2229},
+    {0x08dd, 0x222a},
+    {0x08de, 0x2227},
+    {0x08df, 0x2228},
+    {0x08ef, 0x2202},
+    {0x08f6, 0x0192},
+    {0x08fb, 0x2190},
+    {0x08fc, 0x2191},
+    {0x08fd, 0x2192},
+    {0x08fe, 0x2193},
+    {0x09e0, 0x25c6},
+    {0x09e1, 0x2592},
+    {0x09e2, 0x2409},
+    {0x09e3, 0x240c},
+    {0x09e4, 0x240d},
+    {0x09e5, 0x240a},
+    {0x09e8, 0x2424},
+    {0x09e9, 0x240b},
+    {0x09ea, 0x2518},
+    {0x09eb, 0x2510},
+    {0x09ec, 0x250c},
+    {0x09ed, 0x2514},
+    {0x09ee, 0x253c},
+    {0x09ef, 0x23ba},
+    {0x09f0, 0x23bb},
+    {0x09f1, 0x2500},
+    {0x09f2, 0x23bc},
+    {0x09f3, 0x23bd},
+    {0x09f4, 0x251c},
+    {0x09f5, 0x2524},
+    {0x09f6, 0x2534},
+    {0x09f7, 0x252c},
+    {0x09f8, 0x2502},
+    {0x0aa1, 0x2003},
+    {0x0aa2, 0x2002},
+    {0x0aa3, 0x2004},
+    {0x0aa4, 0x2005},
+    {0x0aa5, 0x2007},
+    {0x0aa6, 0x2008},
+    {0x0aa7, 0x2009},
+    {0x0aa8, 0x200a},
+    {0x0aa9, 0x2014},
+    {0x0aaa, 0x2013},
+    {0x0aae, 0x2026},
+    {0x0aaf, 0x2025},
+    {0x0ab0, 0x2153},
+    {0x0ab1, 0x2154},
+    {0x0ab2, 0x2155},
+    {0x0ab3, 0x2156},
+    {0x0ab4, 0x2157},
+    {0x0ab5, 0x2158},
+    {0x0ab6, 0x2159},
+    {0x0ab7, 0x215a},
+    {0x0ab8, 0x2105},
+    {0x0abb, 0x2012},
+    {0x0abc, 0x2329},
+    {0x0abe, 0x232a},
+    {0x0ac3, 0x215b},
+    {0x0ac4, 0x215c},
+    {0x0ac5, 0x215d},
+    {0x0ac6, 0x215e},
+    {0x0ac9, 0x2122},
+    {0x0aca, 0x2613},
+    {0x0acc, 0x25c1},
+    {0x0acd, 0x25b7},
+    {0x0ace, 0x25cb},
+    {0x0acf, 0x25af},
+    {0x0ad0, 0x2018},
+    {0x0ad1, 0x2019},
+    {0x0ad2, 0x201c},
+    {0x0ad3, 0x201d},
+    {0x0ad4, 0x211e},
+    {0x0ad6, 0x2032},
+    {0x0ad7, 0x2033},
+    {0x0ad9, 0x271d},
+    {0x0adb, 0x25ac},
+    {0x0adc, 0x25c0},
+    {0x0add, 0x25b6},
+    {0x0ade, 0x25cf},
+    {0x0adf, 0x25ae},
+    {0x0ae0, 0x25e6},
+    {0x0ae1, 0x25ab},
+    {0x0ae2, 0x25ad},
+    {0x0ae3, 0x25b3},
+    {0x0ae4, 0x25bd},
+    {0x0ae5, 0x2606},
+    {0x0ae6, 0x2022},
+    {0x0ae7, 0x25aa},
+    {0x0ae8, 0x25b2},
+    {0x0ae9, 0x25bc},
+    {0x0aea, 0x261c},
+    {0x0aeb, 0x261e},
+    {0x0aec, 0x2663},
+    {0x0aed, 0x2666},
+    {0x0aee, 0x2665},
+    {0x0af0, 0x2720},
+    {0x0af1, 0x2020},
+    {0x0af2, 0x2021},
+    {0x0af3, 0x2713},
+    {0x0af4, 0x2717},
+    {0x0af5, 0x266f},
+    {0x0af6, 0x266d},
+    {0x0af7, 0x2642},
+    {0x0af8, 0x2640},
+    {0x0af9, 0x260e},
+    {0x0afa, 0x2315},
+    {0x0afb, 0x2117},
+    {0x0afc, 0x2038},
+    {0x0afd, 0x201a},
+    {0x0afe, 0x201e},
+    {0x0ba3, 0x003c},
+    {0x0ba6, 0x003e},
+    {0x0ba8, 0x2228},
+    {0x0ba9, 0x2227},
+    {0x0bc0, 0x00af},
+    {0x0bc2, 0x22a5},
+    {0x0bc3, 0x2229},
+    {0x0bc4, 0x230a},
+    {0x0bc6, 0x005f},
+    {0x0bca, 0x2218},
+    {0x0bcc, 0x2395},
+    {0x0bce, 0x22a4},
+    {0x0bcf, 0x25cb},
+    {0x0bd3, 0x2308},
+    {0x0bd6, 0x222a},
+    {0x0bd8, 0x2283},
+    {0x0bda, 0x2282},
+    {0x0bdc, 0x22a2},
+    {0x0bfc, 0x22a3},
+    {0x0cdf, 0x2017},
+    {0x0ce0, 0x05d0},
+    {0x0ce1, 0x05d1},
+    {0x0ce2, 0x05d2},
+    {0x0ce3, 0x05d3},
+    {0x0ce4, 0x05d4},
+    {0x0ce5, 0x05d5},
+    {0x0ce6, 0x05d6},
+    {0x0ce7, 0x05d7},
+    {0x0ce8, 0x05d8},
+    {0x0ce9, 0x05d9},
+    {0x0cea, 0x05da},
+    {0x0ceb, 0x05db},
+    {0x0cec, 0x05dc},
+    {0x0ced, 0x05dd},
+    {0x0cee, 0x05de},
+    {0x0cef, 0x05df},
+    {0x0cf0, 0x05e0},
+    {0x0cf1, 0x05e1},
+    {0x0cf2, 0x05e2},
+    {0x0cf3, 0x05e3},
+    {0x0cf4, 0x05e4},
+    {0x0cf5, 0x05e5},
+    {0x0cf6, 0x05e6},
+    {0x0cf7, 0x05e7},
+    {0x0cf8, 0x05e8},
+    {0x0cf9, 0x05e9},
+    {0x0cfa, 0x05ea},
+    {0x0da1, 0x0e01},
+    {0x0da2, 0x0e02},
+    {0x0da3, 0x0e03},
+    {0x0da4, 0x0e04},
+    {0x0da5, 0x0e05},
+    {0x0da6, 0x0e06},
+    {0x0da7, 0x0e07},
+    {0x0da8, 0x0e08},
+    {0x0da9, 0x0e09},
+    {0x0daa, 0x0e0a},
+    {0x0dab, 0x0e0b},
+    {0x0dac, 0x0e0c},
+    {0x0dad, 0x0e0d},
+    {0x0dae, 0x0e0e},
+    {0x0daf, 0x0e0f},
+    {0x0db0, 0x0e10},
+    {0x0db1, 0x0e11},
+    {0x0db2, 0x0e12},
+    {0x0db3, 0x0e13},
+    {0x0db4, 0x0e14},
+    {0x0db5, 0x0e15},
+    {0x0db6, 0x0e16},
+    {0x0db7, 0x0e17},
+    {0x0db8, 0x0e18},
+    {0x0db9, 0x0e19},
+    {0x0dba, 0x0e1a},
+    {0x0dbb, 0x0e1b},
+    {0x0dbc, 0x0e1c},
+    {0x0dbd, 0x0e1d},
+    {0x0dbe, 0x0e1e},
+    {0x0dbf, 0x0e1f},
+    {0x0dc0, 0x0e20},
+    {0x0dc1, 0x0e21},
+    {0x0dc2, 0x0e22},
+    {0x0dc3, 0x0e23},
+    {0x0dc4, 0x0e24},
+    {0x0dc5, 0x0e25},
+    {0x0dc6, 0x0e26},
+    {0x0dc7, 0x0e27},
+    {0x0dc8, 0x0e28},
+    {0x0dc9, 0x0e29},
+    {0x0dca, 0x0e2a},
+    {0x0dcb, 0x0e2b},
+    {0x0dcc, 0x0e2c},
+    {0x0dcd, 0x0e2d},
+    {0x0dce, 0x0e2e},
+    {0x0dcf, 0x0e2f},
+    {0x0dd0, 0x0e30},
+    {0x0dd1, 0x0e31},
+    {0x0dd2, 0x0e32},
+    {0x0dd3, 0x0e33},
+    {0x0dd4, 0x0e34},
+    {0x0dd5, 0x0e35},
+    {0x0dd6, 0x0e36},
+    {0x0dd7, 0x0e37},
+    {0x0dd8, 0x0e38},
+    {0x0dd9, 0x0e39},
+    {0x0dda, 0x0e3a},
+    {0x0ddf, 0x0e3f},
+    {0x0de0, 0x0e40},
+    {0x0de1, 0x0e41},
+    {0x0de2, 0x0e42},
+    {0x0de3, 0x0e43},
+    {0x0de4, 0x0e44},
+    {0x0de5, 0x0e45},
+    {0x0de6, 0x0e46},
+    {0x0de7, 0x0e47},
+    {0x0de8, 0x0e48},
+    {0x0de9, 0x0e49},
+    {0x0dea, 0x0e4a},
+    {0x0deb, 0x0e4b},
+    {0x0dec, 0x0e4c},
+    {0x0ded, 0x0e4d},
+    {0x0df0, 0x0e50},
+    {0x0df1, 0x0e51},
+    {0x0df2, 0x0e52},
+    {0x0df3, 0x0e53},
+    {0x0df4, 0x0e54},
+    {0x0df5, 0x0e55},
+    {0x0df6, 0x0e56},
+    {0x0df7, 0x0e57},
+    {0x0df8, 0x0e58},
+    {0x0df9, 0x0e59},
+    {0x0ea1, 0x3131},
+    {0x0ea2, 0x3132},
+    {0x0ea3, 0x3133},
+    {0x0ea4, 0x3134},
+    {0x0ea5, 0x3135},
+    {0x0ea6, 0x3136},
+    {0x0ea7, 0x3137},
+    {0x0ea8, 0x3138},
+    {0x0ea9, 0x3139},
+    {0x0eaa, 0x313a},
+    {0x0eab, 0x313b},
+    {0x0eac, 0x313c},
+    {0x0ead, 0x313d},
+    {0x0eae, 0x313e},
+    {0x0eaf, 0x313f},
+    {0x0eb0, 0x3140},
+    {0x0eb1, 0x3141},
+    {0x0eb2, 0x3142},
+    {0x0eb3, 0x3143},
+    {0x0eb4, 0x3144},
+    {0x0eb5, 0x3145},
+    {0x0eb6, 0x3146},
+    {0x0eb7, 0x3147},
+    {0x0eb8, 0x3148},
+    {0x0eb9, 0x3149},
+    {0x0eba, 0x314a},
+    {0x0ebb, 0x314b},
+    {0x0ebc, 0x314c},
+    {0x0ebd, 0x314d},
+    {0x0ebe, 0x314e},
+    {0x0ebf, 0x314f},
+    {0x0ec0, 0x3150},
+    {0x0ec1, 0x3151},
+    {0x0ec2, 0x3152},
+    {0x0ec3, 0x3153},
+    {0x0ec4, 0x3154},
+    {0x0ec5, 0x3155},
+    {0x0ec6, 0x3156},
+    {0x0ec7, 0x3157},
+    {0x0ec8, 0x3158},
+    {0x0ec9, 0x3159},
+    {0x0eca, 0x315a},
+    {0x0ecb, 0x315b},
+    {0x0ecc, 0x315c},
+    {0x0ecd, 0x315d},
+    {0x0ece, 0x315e},
+    {0x0ecf, 0x315f},
+    {0x0ed0, 0x3160},
+    {0x0ed1, 0x3161},
+    {0x0ed2, 0x3162},
+    {0x0ed3, 0x3163},
+    {0x0ed4, 0x11a8},
+    {0x0ed5, 0x11a9},
+    {0x0ed6, 0x11aa},
+    {0x0ed7, 0x11ab},
+    {0x0ed8, 0x11ac},
+    {0x0ed9, 0x11ad},
+    {0x0eda, 0x11ae},
+    {0x0edb, 0x11af},
+    {0x0edc, 0x11b0},
+    {0x0edd, 0x11b1},
+    {0x0ede, 0x11b2},
+    {0x0edf, 0x11b3},
+    {0x0ee0, 0x11b4},
+    {0x0ee1, 0x11b5},
+    {0x0ee2, 0x11b6},
+    {0x0ee3, 0x11b7},
+    {0x0ee4, 0x11b8},
+    {0x0ee5, 0x11b9},
+    {0x0ee6, 0x11ba},
+    {0x0ee7, 0x11bb},
+    {0x0ee8, 0x11bc},
+    {0x0ee9, 0x11bd},
+    {0x0eea, 0x11be},
+    {0x0eeb, 0x11bf},
+    {0x0eec, 0x11c0},
+    {0x0eed, 0x11c1},
+    {0x0eee, 0x11c2},
+    {0x0eef, 0x316d},
+    {0x0ef0, 0x3171},
+    {0x0ef1, 0x3178},
+    {0x0ef2, 0x317f},
+    {0x0ef3, 0x3181},
+    {0x0ef4, 0x3184},
+    {0x0ef5, 0x3186},
+    {0x0ef6, 0x318d},
+    {0x0ef7, 0x318e},
+    {0x0ef8, 0x11eb},
+    {0x0ef9, 0x11f0},
+    {0x0efa, 0x11f9},
+    {0x0eff, 0x20a9},
 #if 0
-  /* FIXME: there is no keysym 0x13a4? But 0x20ac is EuroSign in both
-     keysym and Unicode */
-  { 0x13a4, 0x20ac },
+    /* FIXME: there is no keysym 0x13a4? But 0x20ac is EuroSign in both
+       keysym and Unicode */
+    {0x13a4, 0x20ac},
 #endif
-  { 0x13bc, 0x0152 },
-  { 0x13bd, 0x0153 },
-  { 0x13be, 0x0178 },
-  { 0x20ac, 0x20ac },
+    {0x13bc, 0x0152},
+    {0x13bd, 0x0153},
+    {0x13be, 0x0178},
+    {0x20ac, 0x20ac},
 
-  /* Special function keys. */
+    /* Special function keys. */
 
-  { 0xff08, 0x0008 },			/* XK_BackSpace */
-  { 0xff09, 0x0009 },			/* XK_Tab */
-  { 0xff0a, 0x000a },			/* XK_Linefeed */
-  { 0xff0d, 0x000d },			/* XK_Return */
-  { 0xff13, 0x0013 },			/* XK_Pause */
-  { 0xff1b, 0x001b },			/* XK_Escape */
-  { 0xff50, 0x0001 },			/* XK_Home */
-  { 0xff51, 0x001c },			/* XK_Left */
-  { 0xff52, 0x001e },			/* XK_Up */
-  { 0xff53, 0x001d },			/* XK_Right */
-  { 0xff54, 0x001f },			/* XK_Down */
-  { 0xff55, 0x000b },			/* XK_Prior */
-  { 0xff56, 0x000c },			/* XK_Next */
-  { 0xff57, 0x0004 },			/* XK_End */
-  { 0xff6a, 0x0005 },			/* XK_Help */
-  { 0xffff, 0x007f },			/* XK_Delete */
+    {0xff08, 0x0008},           /* XK_BackSpace */
+    {0xff09, 0x0009},           /* XK_Tab */
+    {0xff0a, 0x000a},           /* XK_Linefeed */
+    {0xff0d, 0x000d},           /* XK_Return */
+    {0xff13, 0x0013},           /* XK_Pause */
+    {0xff1b, 0x001b},           /* XK_Escape */
+    {0xff50, 0x0001},           /* XK_Home */
+    {0xff51, 0x001c},           /* XK_Left */
+    {0xff52, 0x001e},           /* XK_Up */
+    {0xff53, 0x001d},           /* XK_Right */
+    {0xff54, 0x001f},           /* XK_Down */
+    {0xff55, 0x000b},           /* XK_Prior */
+    {0xff56, 0x000c},           /* XK_Next */
+    {0xff57, 0x0004},           /* XK_End */
+    {0xff6a, 0x0005},           /* XK_Help */
+    {0xffff, 0x007f},           /* XK_Delete */
 };
 
-long keysym2ucs(int keysym)
+long
+keysym2ucs(int keysym)
 {
     int min = 0;
     int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
@@ -841,33 +842,35 @@ long keysym2ucs(int keysym)
 
     /* also check for directly encoded 24-bit UCS characters */
     if ((keysym & 0xff000000) == 0x01000000)
-	return keysym & 0x00ffffff;
+        return keysym & 0x00ffffff;
 
     /* binary search in table */
     while (max >= min) {
-	mid = (min + max) / 2;
-	if (keysymtab[mid].keysym < keysym)
-	    min = mid + 1;
-	else if (keysymtab[mid].keysym > keysym)
-	    max = mid - 1;
-	else {
-	    /* found it */
-	    return keysymtab[mid].ucs;
-	}
+        mid = (min + max) / 2;
+        if (keysymtab[mid].keysym < keysym)
+            min = mid + 1;
+        else if (keysymtab[mid].keysym > keysym)
+            max = mid - 1;
+        else {
+            /* found it */
+            return keysymtab[mid].ucs;
+        }
     }
 
     /* no matching Unicode value found */
     return -1;
 }
 
-static int reverse_compare (const void *a, const void *b)
+static int
+reverse_compare(const void *a, const void *b)
 {
     const struct codepair *ca = a, *cb = b;
 
     return ca->ucs - cb->ucs;
 }
 
-int ucs2keysym(long ucs)
+int
+ucs2keysym(long ucs)
 {
     static struct codepair *reverse_keysymtab;
 
@@ -875,33 +878,30 @@ int ucs2keysym(long ucs)
     int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
     int mid;
 
-    if (reverse_keysymtab == NULL)
-    {
-	reverse_keysymtab = malloc (sizeof (keysymtab));
-	memcpy (reverse_keysymtab, keysymtab, sizeof (keysymtab));
+    if (reverse_keysymtab == NULL) {
+        reverse_keysymtab = malloc(sizeof(keysymtab));
+        memcpy(reverse_keysymtab, keysymtab, sizeof(keysymtab));
 
-	qsort (reverse_keysymtab,
-	       sizeof (keysymtab) / sizeof (struct codepair),
-	       sizeof (struct codepair),
-	       reverse_compare);
+        qsort(reverse_keysymtab,
+              sizeof(keysymtab) / sizeof(struct codepair),
+              sizeof(struct codepair), reverse_compare);
     }
 
     /* first check for Latin-1 characters (1:1 mapping) */
-    if ((ucs >= 0x0020 && ucs <= 0x007e) ||
-        (ucs >= 0x00a0 && ucs <= 0x00ff))
+    if ((ucs >= 0x0020 && ucs <= 0x007e) || (ucs >= 0x00a0 && ucs <= 0x00ff))
         return ucs;
 
     /* binary search in table */
     while (max >= min) {
-	mid = (min + max) / 2;
-	if (reverse_keysymtab[mid].ucs < ucs)
-	    min = mid + 1;
-	else if (reverse_keysymtab[mid].ucs > ucs)
-	    max = mid - 1;
-	else {
-	    /* found it */
-	    return reverse_keysymtab[mid].keysym;
-	}
+        mid = (min + max) / 2;
+        if (reverse_keysymtab[mid].ucs < ucs)
+            min = mid + 1;
+        else if (reverse_keysymtab[mid].ucs > ucs)
+            max = mid - 1;
+        else {
+            /* found it */
+            return reverse_keysymtab[mid].keysym;
+        }
     }
 
     /* finally, assume a directly encoded 24-bit UCS character */
diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
index 94c606823..7a53803da 100644
--- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c
+++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
@@ -69,8 +69,13 @@ void DarwinListenOnOpenFD(int fd);
 extern aslclient aslc;
 
 /* Ditto, from os/log.c */
-extern void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
-extern void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;
+extern void
+ErrorF(const char *f, ...)
+_X_ATTRIBUTE_PRINTF(1, 2);
+extern void
+FatalError(const char *f, ...)
+_X_ATTRIBUTE_PRINTF(1, 2)
+    _X_NORETURN;
 
 extern int noPanoramiXExtension;
 
@@ -85,16 +90,19 @@ extern int noPanoramiXExtension;
 #define XSERVER_VERSION "?"
 #endif
 
-static char __crashreporter_info_buff__[4096] = {0};
-static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0];
+static char __crashreporter_info_buff__[4096] = { 0 };
+
+static const char *__crashreporter_info__ __attribute__ ((__used__)) =
+    &__crashreporter_info_buff__[0];
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
 // This is actually a toolchain requirement, but I'm not sure the correct check,
 // but it should be fine to just only include it for Leopard and later.  This line
 // just tells the linker to never strip this symbol (such as for space optimization)
-asm (".desc ___crashreporter_info__, 0x10");
+asm(".desc ___crashreporter_info__, 0x10");
 #endif
 
-static const char *__crashreporter_info__base = "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE;
+static const char *__crashreporter_info__base =
+    "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE;
 
 char *bundle_id_prefix = NULL;
 static char *server_bootstrap_name = NULL;
@@ -113,16 +121,18 @@ static char *pref_startx_script;
 
 #ifndef HAVE_LIBDISPATCH
 /*** Pthread Magics ***/
-static pthread_t create_thread(void *(*func)(void *), void *arg) {
+static pthread_t
+create_thread(void *(*func) (void *), void *arg)
+{
     pthread_attr_t attr;
     pthread_t tid;
-	
-    pthread_attr_init (&attr);
-    pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);
-    pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
-    pthread_create (&tid, &attr, func, arg);
-    pthread_attr_destroy (&attr);
-	
+
+    pthread_attr_init(&attr);
+    pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
+    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+    pthread_create(&tid, &attr, func, arg);
+    pthread_attr_destroy(&attr);
+
     return tid;
 }
 #endif
@@ -130,11 +140,13 @@ static pthread_t create_thread(void *(*func)(void *), void *arg) {
 /*** Mach-O IPC Stuffs ***/
 
 union MaxMsgSize {
-	union __RequestUnion__mach_startup_subsystem req;
-	union __ReplyUnion__mach_startup_subsystem rep; 
+    union __RequestUnion__mach_startup_subsystem req;
+    union __ReplyUnion__mach_startup_subsystem rep;
 };
 
-static mach_port_t checkin_or_register(char *bname) {
+static mach_port_t
+checkin_or_register(char *bname)
+{
     kern_return_t kr;
     mach_port_t mp;
 
@@ -150,7 +162,8 @@ static mach_port_t checkin_or_register(char *bname) {
         exit(EXIT_FAILURE);
     }
 
-    kr = mach_port_insert_right(mach_task_self(), mp, mp, MACH_MSG_TYPE_MAKE_SEND);
+    kr = mach_port_insert_right(mach_task_self(), mp, mp,
+                                MACH_MSG_TYPE_MAKE_SEND);
     if (kr != KERN_SUCCESS) {
         ErrorF("mach_port_insert_right(): %s\n", mach_error_string(kr));
         exit(EXIT_FAILURE);
@@ -158,7 +171,7 @@ static mach_port_t checkin_or_register(char *bname) {
 
 #ifdef __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // bootstrap_register
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"    // bootstrap_register
 #endif
     kr = bootstrap_register(bootstrap_port, bname, mp);
 #ifdef __clang__
@@ -174,23 +187,25 @@ static mach_port_t checkin_or_register(char *bname) {
 }
 
 /*** $DISPLAY handoff ***/
-static int accept_fd_handoff(int connected_fd) {
+static int
+accept_fd_handoff(int connected_fd)
+{
     int launchd_fd;
-    
+
     char databuf[] = "display";
     struct iovec iov[1];
-    
+
     union {
         struct cmsghdr hdr;
         char bytes[CMSG_SPACE(sizeof(int))];
     } buf;
-    
+
     struct msghdr msg;
     struct cmsghdr *cmsg;
 
     iov[0].iov_base = databuf;
-    iov[0].iov_len  = sizeof(databuf);
-    
+    iov[0].iov_len = sizeof(databuf);
+
     msg.msg_iov = iov;
     msg.msg_iovlen = 1;
     msg.msg_control = buf.bytes;
@@ -198,23 +213,25 @@ static int accept_fd_handoff(int connected_fd) {
     msg.msg_name = 0;
     msg.msg_namelen = 0;
     msg.msg_flags = 0;
-    
-    cmsg = CMSG_FIRSTHDR (&msg);
+
+    cmsg = CMSG_FIRSTHDR(&msg);
     cmsg->cmsg_level = SOL_SOCKET;
     cmsg->cmsg_type = SCM_RIGHTS;
     cmsg->cmsg_len = CMSG_LEN(sizeof(int));
-    
+
     msg.msg_controllen = cmsg->cmsg_len;
-    
-    *((int*)CMSG_DATA(cmsg)) = -1;
-    
-    if(recvmsg(connected_fd, &msg, 0) < 0) {
-        ErrorF("X11.app: Error receiving $DISPLAY file descriptor.  recvmsg() error: %s\n", strerror(errno));
+
+    *((int *) CMSG_DATA(cmsg)) = -1;
+
+    if (recvmsg(connected_fd, &msg, 0) < 0) {
+        ErrorF
+            ("X11.app: Error receiving $DISPLAY file descriptor.  recvmsg() error: %s\n",
+             strerror(errno));
         return -1;
     }
-    
-    launchd_fd = *((int*)CMSG_DATA(cmsg));
-    
+
+    launchd_fd = *((int *) CMSG_DATA(cmsg));
+
     return launchd_fd;
 }
 
@@ -227,10 +244,14 @@ typedef struct {
  * descriptor for the new connection to accept_fd_handoff()
  */
 #ifdef HAVE_LIBDISPATCH
-static void socket_handoff(socket_handoff_t *handoff_data) {
+static void
+socket_handoff(socket_handoff_t * handoff_data)
+{
 #else
-static void *socket_handoff_thread(void *arg) {
-    socket_handoff_t *handoff_data = (socket_handoff_t *)arg;
+static void *
+socket_handoff_thread(void *arg)
+{
+    socket_handoff_t *handoff_data = (socket_handoff_t *) arg;
 #endif
 
     int launchd_fd = -1;
@@ -239,17 +260,20 @@ static void *socket_handoff_thread(void *arg) {
     /* Now actually get the passed file descriptor from this connection
      * If we encounter an error, keep listening.
      */
-    while(launchd_fd == -1) {
+    while (launchd_fd == -1) {
         connected_fd = accept(handoff_data->fd, NULL, NULL);
-        if(connected_fd == -1) {
-            ErrorF("X11.app: Failed to accept incoming connection on socket (fd=%d): %s\n", handoff_data->fd, strerror(errno));
+        if (connected_fd == -1) {
+            ErrorF
+                ("X11.app: Failed to accept incoming connection on socket (fd=%d): %s\n",
+                 handoff_data->fd, strerror(errno));
             sleep(2);
             continue;
         }
 
         launchd_fd = accept_fd_handoff(connected_fd);
-        if(launchd_fd == -1)
-            ErrorF("X11.app: Error receiving $DISPLAY file descriptor, no descriptor received?  Waiting for another connection.\n");
+        if (launchd_fd == -1)
+            ErrorF
+                ("X11.app: Error receiving $DISPLAY file descriptor, no descriptor received?  Waiting for another connection.\n");
 
         close(connected_fd);
     }
@@ -257,8 +281,10 @@ static void *socket_handoff_thread(void *arg) {
     close(handoff_data->fd);
     unlink(handoff_data->filename);
     free(handoff_data);
-        
-    ErrorF("X11.app Handing off fd to server thread via DarwinListenOnOpenFD(%d)\n", launchd_fd);
+
+    ErrorF
+        ("X11.app Handing off fd to server thread via DarwinListenOnOpenFD(%d)\n",
+         launchd_fd);
     DarwinListenOnOpenFD(launchd_fd);
 
 #ifndef HAVE_LIBDISPATCH
@@ -266,67 +292,78 @@ static void *socket_handoff_thread(void *arg) {
 #endif
 }
 
-static int create_socket(char *filename_out) {
+static int
+create_socket(char *filename_out)
+{
     struct sockaddr_un servaddr_un;
     struct sockaddr *servaddr;
     socklen_t servaddr_len;
     int ret_fd;
     size_t try, try_max;
-    
-    for(try=0, try_max=5; try < try_max; try++) {
+
+    for (try = 0, try_max = 5; try < try_max; try++) {
         tmpnam(filename_out);
-        
+
         /* Setup servaddr_un */
-        memset (&servaddr_un, 0, sizeof (struct sockaddr_un));
+        memset(&servaddr_un, 0, sizeof(struct sockaddr_un));
         servaddr_un.sun_family = AF_UNIX;
-        strlcpy(servaddr_un.sun_path, filename_out, sizeof(servaddr_un.sun_path));
-        
+        strlcpy(servaddr_un.sun_path, filename_out,
+                sizeof(servaddr_un.sun_path));
+
         servaddr = (struct sockaddr *) &servaddr_un;
-        servaddr_len = sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) + strlen(filename_out);
-        
+        servaddr_len =
+            sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) +
+            strlen(filename_out);
+
         ret_fd = socket(PF_UNIX, SOCK_STREAM, 0);
-        if(ret_fd == -1) {
-            ErrorF("X11.app: Failed to create socket (try %d / %d): %s - %s\n", (int)try+1, (int)try_max, filename_out, strerror(errno));
+        if (ret_fd == -1) {
+            ErrorF("X11.app: Failed to create socket (try %d / %d): %s - %s\n",
+                   (int) try + 1, (int) try_max, filename_out, strerror(errno));
             continue;
         }
-        
-        if(bind(ret_fd, servaddr, servaddr_len) != 0) {
-            ErrorF("X11.app: Failed to bind socket: %d - %s\n", errno, strerror(errno));
+
+        if (bind(ret_fd, servaddr, servaddr_len) != 0) {
+            ErrorF("X11.app: Failed to bind socket: %d - %s\n", errno,
+                   strerror(errno));
             close(ret_fd);
             return 0;
         }
-        
-        if(listen(ret_fd, 10) != 0) {
-            ErrorF("X11.app: Failed to listen to socket: %s - %d - %s\n", filename_out, errno, strerror(errno));
+
+        if (listen(ret_fd, 10) != 0) {
+            ErrorF("X11.app: Failed to listen to socket: %s - %d - %s\n",
+                   filename_out, errno, strerror(errno));
             close(ret_fd);
             return 0;
         }
-        
+
 #ifdef DEBUG
-        ErrorF("X11.app: Listening on socket for fd handoff:  (%d) %s\n", ret_fd, filename_out);
+        ErrorF("X11.app: Listening on socket for fd handoff:  (%d) %s\n",
+               ret_fd, filename_out);
 #endif
-        
+
         return ret_fd;
     }
-    
+
     return 0;
 }
 
 static int launchd_socket_handed_off = 0;
 
-kern_return_t do_request_fd_handoff_socket(mach_port_t port, string_t filename) {
+kern_return_t
+do_request_fd_handoff_socket(mach_port_t port, string_t filename)
+{
     socket_handoff_t *handoff_data;
-    
+
     launchd_socket_handed_off = 1;
 
-    handoff_data = (socket_handoff_t *)calloc(1,sizeof(socket_handoff_t));
-    if(!handoff_data) {
+    handoff_data = (socket_handoff_t *) calloc(1, sizeof(socket_handoff_t));
+    if (!handoff_data) {
         ErrorF("X11.app: Error allocating memory for handoff_data\n");
         return KERN_FAILURE;
     }
 
     handoff_data->fd = create_socket(handoff_data->filename);
-    if(!handoff_data->fd) {
+    if (!handoff_data->fd) {
         free(handoff_data);
         return KERN_FAILURE;
     }
@@ -334,71 +371,78 @@ kern_return_t do_request_fd_handoff_socket(mach_port_t port, string_t filename)
     strlcpy(filename, handoff_data->filename, STRING_T_SIZE);
 
 #ifdef HAVE_LIBDISPATCH
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), ^{
-        socket_handoff(handoff_data);
-    });
+    dispatch_async(dispatch_get_global_queue
+                   (DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^ {
+                   socket_handoff(handoff_data);}
+    );
 #else
     create_thread(socket_handoff_thread, handoff_data);
 #endif
-    
+
 #ifdef DEBUG
-    ErrorF("X11.app: Thread created for handoff.  Returning success to tell caller to connect and push the fd.\n");
+    ErrorF
+        ("X11.app: Thread created for handoff.  Returning success to tell caller to connect and push the fd.\n");
 #endif
 
     return KERN_SUCCESS;
 }
 
-kern_return_t do_request_pid(mach_port_t port, int *my_pid) {
+kern_return_t
+do_request_pid(mach_port_t port, int *my_pid)
+{
     *my_pid = getpid();
     return KERN_SUCCESS;
 }
 
 /*** Server Startup ***/
-kern_return_t do_start_x11_server(mach_port_t port, string_array_t argv,
-                                  mach_msg_type_number_t argvCnt,
-                                  string_array_t envp,
-                                  mach_msg_type_number_t envpCnt) {
+kern_return_t
+do_start_x11_server(mach_port_t port, string_array_t argv,
+                    mach_msg_type_number_t argvCnt,
+                    string_array_t envp, mach_msg_type_number_t envpCnt)
+{
     /* And now back to char ** */
     char **_argv = alloca((argvCnt + 1) * sizeof(char *));
     char **_envp = alloca((envpCnt + 1) * sizeof(char *));
     size_t i;
-    
+
     /* If we didn't get handed a launchd DISPLAY socket, we should
      * unset DISPLAY or we can run into problems with pbproxy
      */
-    if(!launchd_socket_handed_off) {
+    if (!launchd_socket_handed_off) {
         ErrorF("X11.app: No launchd socket handed off, unsetting DISPLAY\n");
         unsetenv("DISPLAY");
     }
-    
-    if(!_argv || !_envp) {
+
+    if (!_argv || !_envp) {
         return KERN_FAILURE;
     }
 
     ErrorF("X11.app: do_start_x11_server(): argc=%d\n", argvCnt);
-    for(i=0; i < argvCnt; i++) {
+    for (i = 0; i < argvCnt; i++) {
         _argv[i] = argv[i];
-        ErrorF("\targv[%u] = %s\n", (unsigned)i, argv[i]);
+        ErrorF("\targv[%u] = %s\n", (unsigned) i, argv[i]);
     }
     _argv[argvCnt] = NULL;
-    
-    for(i=0; i < envpCnt; i++) {
+
+    for (i = 0; i < envpCnt; i++) {
         _envp[i] = envp[i];
     }
     _envp[envpCnt] = NULL;
-    
-    if(server_main(argvCnt, _argv, _envp) == 0)
+
+    if (server_main(argvCnt, _argv, _envp) == 0)
         return KERN_SUCCESS;
     else
         return KERN_FAILURE;
 }
 
-static int startup_trigger(int argc, char **argv, char **envp) {
+static int
+startup_trigger(int argc, char **argv, char **envp)
+{
     Display *display;
     const char *s;
-    
+
     /* Take care of the case where we're called like a normal DDX */
-    if(argc > 1 && argv[1][0] == ':') {
+    if (argc > 1 && argv[1][0] == ':') {
         size_t i;
         kern_return_t kr;
         mach_port_t mp;
@@ -407,32 +451,35 @@ static int startup_trigger(int argc, char **argv, char **envp) {
 
         /* We need to count envp */
         int envpc;
-        for(envpc=0; envp[envpc]; envpc++);
+
+        for (envpc = 0; envp[envpc]; envpc++);
 
         /* We have fixed-size string lengths due to limitations in IPC,
          * so we need to copy our argv and envp.
          */
-        newargv = (string_array_t)alloca(argc * sizeof(string_t));
-        newenvp = (string_array_t)alloca(envpc * sizeof(string_t));
-        
-        if(!newargv || !newenvp) {
+        newargv = (string_array_t) alloca(argc * sizeof(string_t));
+        newenvp = (string_array_t) alloca(envpc * sizeof(string_t));
+
+        if (!newargv || !newenvp) {
             ErrorF("Memory allocation failure\n");
             exit(EXIT_FAILURE);
         }
-        
-        for(i=0; i < argc; i++) {
+
+        for (i = 0; i < argc; i++) {
             strlcpy(newargv[i], argv[i], STRING_T_SIZE);
         }
-        for(i=0; i < envpc; i++) {
+        for (i = 0; i < envpc; i++) {
             strlcpy(newenvp[i], envp[i], STRING_T_SIZE);
         }
 
         kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
         if (kr != KERN_SUCCESS) {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-            ErrorF("bootstrap_look_up(%s): %s\n", server_bootstrap_name, bootstrap_strerror(kr));
+            ErrorF("bootstrap_look_up(%s): %s\n", server_bootstrap_name,
+                   bootstrap_strerror(kr));
 #else
-            ErrorF("bootstrap_look_up(%s): %ul\n", server_bootstrap_name, (unsigned long)kr);
+            ErrorF("bootstrap_look_up(%s): %ul\n", server_bootstrap_name,
+                   (unsigned long) kr);
 #endif
             exit(EXIT_FAILURE);
         }
@@ -448,10 +495,10 @@ static int startup_trigger(int argc, char **argv, char **envp) {
     /* If we have a process serial number and it's our only arg, act as if
      * the user double clicked the app bundle: launch app_to_run if possible
      */
-    if(argc == 1 || (argc == 2 && !strncmp(argv[1], "-psn_", 5))) {
+    if (argc == 1 || (argc == 2 && !strncmp(argv[1], "-psn_", 5))) {
         /* Now, try to open a display, if so, run the launcher */
         display = XOpenDisplay(NULL);
-        if(display) {
+        if (display) {
             /* Could open the display, start the launcher */
             XCloseDisplay(display);
 
@@ -460,31 +507,41 @@ static int startup_trigger(int argc, char **argv, char **envp) {
     }
 
     /* Start the server */
-    if((s = getenv("DISPLAY"))) {
-        ErrorF("X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting).  Starting X server.\n", s);
+    if ((s = getenv("DISPLAY"))) {
+        ErrorF
+            ("X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting).  Starting X server.\n",
+             s);
         unsetenv("DISPLAY");
-    } else {
-        ErrorF("X11.app: Could not connect to server (DISPLAY is not set).  Starting X server.\n");
+    }
+    else {
+        ErrorF
+            ("X11.app: Could not connect to server (DISPLAY is not set).  Starting X server.\n");
     }
     return execute(pref_startx_script);
 }
 
 /** Setup the environment we want our child processes to inherit */
-static void ensure_path(const char *dir) {
+static void
+ensure_path(const char *dir)
+{
     char buf[1024], *temp;
-    
+
     /* Make sure /usr/X11/bin is in the $PATH */
     temp = getenv("PATH");
-    if(temp == NULL || temp[0] == 0) {
-        snprintf(buf, sizeof(buf), "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:%s", dir);
+    if (temp == NULL || temp[0] == 0) {
+        snprintf(buf, sizeof(buf),
+                 "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:%s", dir);
         setenv("PATH", buf, TRUE);
-    } else if(strnstr(temp, X11BINDIR, sizeof(temp)) == NULL) {
+    }
+    else if (strnstr(temp, X11BINDIR, sizeof(temp)) == NULL) {
         snprintf(buf, sizeof(buf), "%s:%s", temp, dir);
         setenv("PATH", buf, TRUE);
     }
 }
 
-static void setup_console_redirect(const char *bundle_id) {
+static void
+setup_console_redirect(const char *bundle_id)
+{
     char *asl_sender;
     char *asl_facility;
 
@@ -493,7 +550,7 @@ static void setup_console_redirect(const char *bundle_id) {
 
     asl_facility = strdup(bundle_id);
     assert(asl_facility);
-    if(strcmp(asl_facility + strlen(asl_facility) - 4, ".X11") == 0)
+    if (strcmp(asl_facility + strlen(asl_facility) - 4, ".X11") == 0)
         asl_facility[strlen(asl_facility) - 4] = '\0';
 
     assert(aslc = asl_open(asl_sender, asl_facility, ASL_OPT_NO_DELAY));
@@ -505,7 +562,9 @@ static void setup_console_redirect(const char *bundle_id) {
     xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO);
 }
 
-static void setup_env(void) {
+static void
+setup_env(void)
+{
     char *temp;
     const char *pds = NULL;
     const char *disp = getenv("DISPLAY");
@@ -515,81 +574,93 @@ static void setup_env(void) {
      * quartz-wm and the Xquartz stub's MachIPC)
      */
     CFBundleRef bundle = CFBundleGetMainBundle();
-    if(bundle) {
+
+    if (bundle) {
         CFStringRef pd = CFBundleGetIdentifier(bundle);
-        if(pd) {
+
+        if (pd) {
             pds = CFStringGetCStringPtr(pd, 0);
         }
     }
 
     /* fallback to hardcoded value if we can't discover it */
-    if(!pds) {
-        pds = BUNDLE_ID_PREFIX".X11";
+    if (!pds) {
+        pds = BUNDLE_ID_PREFIX ".X11";
     }
 
     setup_console_redirect(pds);
 
     server_bootstrap_name = strdup(pds);
-    if(!server_bootstrap_name) {
+    if (!server_bootstrap_name) {
         ErrorF("X11.app: Memory allocation error.\n");
         exit(1);
     }
     setenv("X11_PREFS_DOMAIN", server_bootstrap_name, 1);
-    
+
     len = strlen(server_bootstrap_name);
     bundle_id_prefix = malloc(sizeof(char) * (len - 3));
-    if(!bundle_id_prefix) {
+    if (!bundle_id_prefix) {
         ErrorF("X11.app: Memory allocation error.\n");
         exit(1);
     }
     strlcpy(bundle_id_prefix, server_bootstrap_name, len - 3);
-    
+
     /* We need to unset DISPLAY if it is not our socket */
-    if(disp) {
+    if (disp) {
         /* s = basename(disp) */
         const char *d, *s;
-	    for(s = NULL, d = disp; *d; d++) {
-            if(*d == '/')
+
+        for (s = NULL, d = disp; *d; d++) {
+            if (*d == '/')
                 s = d + 1;
         }
 
-        if(s && *s) {
-            if(strcmp(bundle_id_prefix, "org.x") == 0 && strcmp(s, ":0") == 0) {
-                ErrorF("X11.app: Detected old style launchd DISPLAY, please update xinit.\n");
-            } else {
-                temp = (char *)malloc(sizeof(char) * len);
-                if(!temp) {
-                    ErrorF("X11.app: Memory allocation error creating space for socket name test.\n");
+        if (s && *s) {
+            if (strcmp(bundle_id_prefix, "org.x") == 0 && strcmp(s, ":0") == 0) {
+                ErrorF
+                    ("X11.app: Detected old style launchd DISPLAY, please update xinit.\n");
+            }
+            else {
+                temp = (char *) malloc(sizeof(char) * len);
+                if (!temp) {
+                    ErrorF
+                        ("X11.app: Memory allocation error creating space for socket name test.\n");
                     exit(1);
                 }
                 strlcpy(temp, bundle_id_prefix, len);
                 strlcat(temp, ":0", len);
-            
-                if(strcmp(temp, s) != 0) {
+
+                if (strcmp(temp, s) != 0) {
                     /* If we don't have a match, unset it. */
-                    ErrorF("X11.app: DISPLAY (\"%s\") does not match our id (\"%s\"), unsetting.\n", disp, bundle_id_prefix);
+                    ErrorF
+                        ("X11.app: DISPLAY (\"%s\") does not match our id (\"%s\"), unsetting.\n",
+                         disp, bundle_id_prefix);
                     unsetenv("DISPLAY");
                 }
                 free(temp);
             }
-        } else {
+        }
+        else {
             /* The DISPLAY environment variable is not formatted like a launchd socket, so reset. */
-            ErrorF("X11.app: DISPLAY does not look like a launchd set variable, unsetting.\n");
+            ErrorF
+                ("X11.app: DISPLAY does not look like a launchd set variable, unsetting.\n");
             unsetenv("DISPLAY");
         }
     }
 
     /* Make sure PATH is right */
     ensure_path(X11BINDIR);
-    
+
     /* cd $HOME */
     temp = getenv("HOME");
-    if(temp != NULL && temp[0] != '\0')
+    if (temp != NULL && temp[0] != '\0')
         chdir(temp);
 }
 
 /*** Main ***/
-int main(int argc, char **argv, char **envp) {
+int
+main(int argc, char **argv, char **envp)
+{
     Bool listenOnly = FALSE;
     int i;
     mach_msg_size_t mxmsgsz = sizeof(union MaxMsgSize) + MAX_TRAILER_SIZE;
@@ -598,31 +669,32 @@ int main(int argc, char **argv, char **envp) {
 
     /* Setup our environment for our children */
     setup_env();
-    
+
     /* The server must not run the PanoramiX operations. */
     noPanoramiXExtension = TRUE;
 
     /* Setup the initial crasherporter info */
-    strlcpy(__crashreporter_info_buff__, __crashreporter_info__base, sizeof(__crashreporter_info_buff__));
-    
+    strlcpy(__crashreporter_info_buff__, __crashreporter_info__base,
+            sizeof(__crashreporter_info_buff__));
+
     ErrorF("X11.app: main(): argc=%d\n", argc);
-    for(i=0; i < argc; i++) {
-        ErrorF("\targv[%u] = %s\n", (unsigned)i, argv[i]);
-        if(!strcmp(argv[i], "--listenonly")) {
+    for (i = 0; i < argc; i++) {
+        ErrorF("\targv[%u] = %s\n", (unsigned) i, argv[i]);
+        if (!strcmp(argv[i], "--listenonly")) {
             listenOnly = TRUE;
         }
     }
 
     mp = checkin_or_register(server_bootstrap_name);
-    if(mp == MACH_PORT_NULL) {
+    if (mp == MACH_PORT_NULL) {
         ErrorF("NULL mach service: %s", server_bootstrap_name);
         return EXIT_FAILURE;
     }
-    
+
     /* Check if we need to do something other than listen, and make another
      * thread handle it.
      */
-    if(!listenOnly) {
+    if (!listenOnly) {
         pid_t child1, child2;
         int status;
 
@@ -632,50 +704,51 @@ int main(int argc, char **argv, char **envp) {
         pref_login_shell = command_from_prefs("login_shell", DEFAULT_SHELL);
         assert(pref_login_shell);
 
-        pref_startx_script = command_from_prefs("startx_script", DEFAULT_STARTX);
+        pref_startx_script =
+            command_from_prefs("startx_script", DEFAULT_STARTX);
         assert(pref_startx_script);
 
         /* Do the fork-twice trick to avoid having to reap zombies */
         child1 = fork();
         switch (child1) {
-            case -1:                                /* error */
-                FatalError("fork() failed: %s\n", strerror(errno));
+        case -1:               /* error */
+            FatalError("fork() failed: %s\n", strerror(errno));
 
-            case 0:                                 /* child1 */
-                child2 = fork();
+        case 0:                /* child1 */
+            child2 = fork();
 
-                switch (child2) {
-                    int max_files;
+            switch (child2) {
+                int max_files;
 
-                    case -1:                            /* error */
-                        FatalError("fork() failed: %s\n", strerror(errno));
+            case -1:           /* error */
+                FatalError("fork() failed: %s\n", strerror(errno));
 
-                    case 0:                             /* child2 */
-                        /* close all open files except for standard streams */
-                        max_files = sysconf(_SC_OPEN_MAX);
-                        for(i = 3; i < max_files; i++)
-                            close(i);
+            case 0:            /* child2 */
+                /* close all open files except for standard streams */
+                max_files = sysconf(_SC_OPEN_MAX);
+                for (i = 3; i < max_files; i++)
+                    close(i);
 
-                        /* ensure stdin is on /dev/null */
-                        close(0);
-                        open("/dev/null", O_RDONLY);
+                /* ensure stdin is on /dev/null */
+                close(0);
+                open("/dev/null", O_RDONLY);
 
-                        return startup_trigger(argc, argv, envp);
+                return startup_trigger(argc, argv, envp);
 
-                    default:                            /* parent (child1) */
-                        _exit(0);
-                }
-                break;
+            default:           /* parent (child1) */
+                _exit(0);
+            }
+            break;
 
-            default:                                /* parent */
-              waitpid(child1, &status, 0);
+        default:               /* parent */
+            waitpid(child1, &status, 0);
         }
 
         free(pref_app_to_run);
         free(pref_login_shell);
         free(pref_startx_script);
     }
-    
+
     /* Main event loop */
     ErrorF("Waiting for startup parameters via Mach IPC.\n");
     kr = mach_msg_server(mach_startup_server, mxmsgsz, mp, 0);
@@ -683,72 +756,83 @@ int main(int argc, char **argv, char **envp) {
         ErrorF("%s.X11(mp): %s\n", BUNDLE_ID_PREFIX, mach_error_string(kr));
         return EXIT_FAILURE;
     }
-    
+
     return EXIT_SUCCESS;
 }
 
-static int execute(const char *command) {
+static int
+execute(const char *command)
+{
     const char *newargv[4];
     const char **p;
-    
+
     newargv[0] = pref_login_shell;
     newargv[1] = "-c";
     newargv[2] = command;
     newargv[3] = NULL;
-    
+
     ErrorF("X11.app: Launching %s:\n", command);
-    for(p=newargv; *p; p++) {
-        ErrorF("\targv[%ld] = %s\n", (long int)(p - newargv), *p);
+    for (p = newargv; *p; p++) {
+        ErrorF("\targv[%ld] = %s\n", (long int) (p - newargv), *p);
     }
 
-    execvp (newargv[0], (char * const *) newargv);
-    perror ("X11.app: Couldn't exec.");
+    execvp(newargv[0], (char *const *) newargv);
+    perror("X11.app: Couldn't exec.");
     return 1;
 }
 
-static char *command_from_prefs(const char *key, const char *default_value) {
+static char *
+command_from_prefs(const char *key, const char *default_value)
+{
     char *command = NULL;
-    
+
     CFStringRef cfKey;
     CFPropertyListRef PlistRef;
 
-    if(!key)
+    if (!key)
         return NULL;
 
     cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
 
-    if(!cfKey)
+    if (!cfKey)
         return NULL;
 
-    PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
-    
+    PlistRef =
+        CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
+
     if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
-        CFStringRef cfDefaultValue = CFStringCreateWithCString(NULL, default_value, kCFStringEncodingASCII);
+        CFStringRef cfDefaultValue =
+            CFStringCreateWithCString(NULL, default_value,
+                                      kCFStringEncodingASCII);
         int len = strlen(default_value) + 1;
 
-        if(!cfDefaultValue)
+        if (!cfDefaultValue)
             goto command_from_prefs_out;
 
-        CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);
+        CFPreferencesSetAppValue(cfKey, cfDefaultValue,
+                                 kCFPreferencesCurrentApplication);
         CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
         CFRelease(cfDefaultValue);
-        
-        command = (char *)malloc(len * sizeof(char));
-        if(!command)
+
+        command = (char *) malloc(len * sizeof(char));
+        if (!command)
             goto command_from_prefs_out;
         strcpy(command, default_value);
-    } else {
-        int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
-        command = (char *)malloc(len * sizeof(char));
-        if(!command)
+    }
+    else {
+        int len = CFStringGetLength((CFStringRef) PlistRef) + 1;
+
+        command = (char *) malloc(len * sizeof(char));
+        if (!command)
             goto command_from_prefs_out;
-        CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);
+        CFStringGetCString((CFStringRef) PlistRef, command, len,
+                           kCFStringEncodingASCII);
     }
 
-command_from_prefs_out:
+ command_from_prefs_out:
     if (PlistRef)
         CFRelease(PlistRef);
-    if(cfKey)
+    if (cfKey)
         CFRelease(cfKey);
     return command;
 }
diff --git a/xorg-server/hw/xquartz/mach-startup/launchd_fd.c b/xorg-server/hw/xquartz/mach-startup/launchd_fd.c
index 8003dd177..fd1d276e3 100644
--- a/xorg-server/hw/xquartz/mach-startup/launchd_fd.c
+++ b/xorg-server/hw/xquartz/mach-startup/launchd_fd.c
@@ -38,54 +38,68 @@
 
 extern aslclient aslc;
 
-int launchd_display_fd(void) {
+int
+launchd_display_fd(void)
+{
     launch_data_t sockets_dict, checkin_request, checkin_response;
     launch_data_t listening_fd_array, listening_fd;
 
     /* Get launchd fd */
     if ((checkin_request = launch_data_new_string(LAUNCH_KEY_CHECKIN)) == NULL) {
-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launch_data_new_string(\"" LAUNCH_KEY_CHECKIN "\") Unable to create string.\n");
+        asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                "launch_data_new_string(\"" LAUNCH_KEY_CHECKIN
+                "\") Unable to create string.\n");
         return ERROR_FD;
     }
-    
+
     if ((checkin_response = launch_msg(checkin_request)) == NULL) {
-        asl_log(aslc, NULL, ASL_LEVEL_WARNING, "launch_msg(\"" LAUNCH_KEY_CHECKIN "\") IPC failure: %s\n",strerror(errno));
+        asl_log(aslc, NULL, ASL_LEVEL_WARNING,
+                "launch_msg(\"" LAUNCH_KEY_CHECKIN "\") IPC failure: %s\n",
+                strerror(errno));
         return ERROR_FD;
     }
-    
+
     if (LAUNCH_DATA_ERRNO == launch_data_get_type(checkin_response)) {
         // ignore EACCES, which is common if we weren't started by launchd
         if (launch_data_get_errno(checkin_response) != EACCES)
-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in failed: %s\n", strerror(launch_data_get_errno(checkin_response)));
+            asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in failed: %s\n",
+                    strerror(launch_data_get_errno(checkin_response)));
         return ERROR_FD;
-    } 
-    
-    sockets_dict = launch_data_dict_lookup(checkin_response, LAUNCH_JOBKEY_SOCKETS);
+    }
+
+    sockets_dict =
+        launch_data_dict_lookup(checkin_response, LAUNCH_JOBKEY_SOCKETS);
     if (NULL == sockets_dict) {
-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: no sockets found to answer requests on!\n");
+        asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                "launchd check-in: no sockets found to answer requests on!\n");
         return ERROR_FD;
     }
-    
+
     if (launch_data_dict_get_count(sockets_dict) > 1) {
-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: some sockets will be ignored!\n");
+        asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                "launchd check-in: some sockets will be ignored!\n");
         return ERROR_FD;
     }
-    
-    listening_fd_array = launch_data_dict_lookup(sockets_dict, BUNDLE_ID_PREFIX":0");
+
+    listening_fd_array =
+        launch_data_dict_lookup(sockets_dict, BUNDLE_ID_PREFIX ":0");
     if (NULL == listening_fd_array) {
         listening_fd_array = launch_data_dict_lookup(sockets_dict, ":0");
         if (NULL == listening_fd_array) {
-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: No known sockets found to answer requests on! \"%s:0\" and \":0\" failed.\n", BUNDLE_ID_PREFIX);
+            asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                    "launchd check-in: No known sockets found to answer requests on! \"%s:0\" and \":0\" failed.\n",
+                    BUNDLE_ID_PREFIX);
             return ERROR_FD;
         }
     }
-    
-    if (launch_data_array_get_count(listening_fd_array)!=1) {
-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: Expected 1 socket from launchd, got %u)\n",
-                (unsigned)launch_data_array_get_count(listening_fd_array));
+
+    if (launch_data_array_get_count(listening_fd_array) != 1) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                "launchd check-in: Expected 1 socket from launchd, got %u)\n",
+                (unsigned) launch_data_array_get_count(listening_fd_array));
         return ERROR_FD;
     }
-    
-    listening_fd=launch_data_array_get_index(listening_fd_array, 0);
+
+    listening_fd = launch_data_array_get_index(listening_fd_array, 0);
     return launch_data_get_fd(listening_fd);
 }
diff --git a/xorg-server/hw/xquartz/mach-startup/stub.c b/xorg-server/hw/xquartz/mach-startup/stub.c
index d8e4abdd1..f457aaba0 100644
--- a/xorg-server/hw/xquartz/mach-startup/stub.c
+++ b/xorg-server/hw/xquartz/mach-startup/stub.c
@@ -58,85 +58,105 @@ static char x11_path[PATH_MAX + 1];
 static pid_t x11app_pid = 0;
 aslclient aslc;
 
-static void set_x11_path(void) {
+static void
+set_x11_path(void)
+{
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
 
     CFURLRef appURL = NULL;
-    OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
+    OSStatus osstatus =
+        LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil,
+                                 nil, &appURL);
 
     switch (osstatus) {
-        case noErr:
-            if (appURL == NULL) {
-                asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Invalid response from LSFindApplicationForInfo(%s)", 
-                        kX11AppBundleId);
-                exit(1);
-            }
+    case noErr:
+        if (appURL == NULL) {
+            asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                    "Xquartz: Invalid response from LSFindApplicationForInfo(%s)",
+                    kX11AppBundleId);
+            exit(1);
+        }
 
-            if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
-                asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Error resolving URL for %s", kX11AppBundleId);
-                exit(3);
-            }
+        if (!CFURLGetFileSystemRepresentation
+            (appURL, true, (unsigned char *) x11_path, sizeof(x11_path))) {
+            asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                    "Xquartz: Error resolving URL for %s", kX11AppBundleId);
+            exit(3);
+        }
 
-            strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
-            asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: X11.app = %s", x11_path);
-            break;
-        case kLSApplicationNotFoundErr:
-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Unable to find application for %s", kX11AppBundleId);
-            exit(10);
-        default:
-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Unable to find application for %s, error code = %d", 
-                    kX11AppBundleId, (int)osstatus);
-            exit(11);
+        strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
+        asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: X11.app = %s", x11_path);
+        break;
+    case kLSApplicationNotFoundErr:
+        asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                "Xquartz: Unable to find application for %s", kX11AppBundleId);
+        exit(10);
+    default:
+        asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                "Xquartz: Unable to find application for %s, error code = %d",
+                kX11AppBundleId, (int) osstatus);
+        exit(11);
     }
 #else
     /* TODO: Make Tiger smarter... but TBH, this should never get called on Tiger... */
-    strlcpy(x11_path, "/Applications/Utilities/X11.app/Contents/MacOS/X11", sizeof(x11_path));
+    strlcpy(x11_path, "/Applications/Utilities/X11.app/Contents/MacOS/X11",
+            sizeof(x11_path));
 #endif
 }
 
-static int connect_to_socket(const char *filename) {
+static int
+connect_to_socket(const char *filename)
+{
     struct sockaddr_un servaddr_un;
     struct sockaddr *servaddr;
     socklen_t servaddr_len;
     int ret_fd;
 
     /* Setup servaddr_un */
-    memset (&servaddr_un, 0, sizeof (struct sockaddr_un));
+    memset(&servaddr_un, 0, sizeof(struct sockaddr_un));
     servaddr_un.sun_family = AF_UNIX;
     strlcpy(servaddr_un.sun_path, filename, sizeof(servaddr_un.sun_path));
-    
+
     servaddr = (struct sockaddr *) &servaddr_un;
-    servaddr_len = sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) + strlen(filename);
-    
+    servaddr_len =
+        sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) +
+        strlen(filename);
+
     ret_fd = socket(PF_UNIX, SOCK_STREAM, 0);
-    if(ret_fd == -1) {
-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Failed to create socket: %s - %s", filename, strerror(errno));
+    if (ret_fd == -1) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                "Xquartz: Failed to create socket: %s - %s", filename,
+                strerror(errno));
         return -1;
     }
 
-    if(connect(ret_fd, servaddr, servaddr_len) < 0) {
-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Failed to connect to socket: %s - %d - %s", filename, errno, strerror(errno));
+    if (connect(ret_fd, servaddr, servaddr_len) < 0) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                "Xquartz: Failed to connect to socket: %s - %d - %s", filename,
+                errno, strerror(errno));
         close(ret_fd);
         return -1;
     }
-    
+
     return ret_fd;
 }
 
-static void send_fd_handoff(int connected_fd, int launchd_fd) {
+static void
+send_fd_handoff(int connected_fd, int launchd_fd)
+{
     char databuf[] = "display";
     struct iovec iov[1];
-    
+
     union {
         struct cmsghdr hdr;
         char bytes[CMSG_SPACE(sizeof(int))];
     } buf;
-    
+
     struct msghdr msg;
     struct cmsghdr *cmsg;
 
     iov[0].iov_base = databuf;
-    iov[0].iov_len  = sizeof(databuf);
+    iov[0].iov_len = sizeof(databuf);
 
     msg.msg_iov = iov;
     msg.msg_iovlen = 1;
@@ -146,32 +166,39 @@ static void send_fd_handoff(int connected_fd, int launchd_fd) {
     msg.msg_namelen = 0;
     msg.msg_flags = 0;
 
-    cmsg = CMSG_FIRSTHDR (&msg);
+    cmsg = CMSG_FIRSTHDR(&msg);
     cmsg->cmsg_level = SOL_SOCKET;
     cmsg->cmsg_type = SCM_RIGHTS;
     cmsg->cmsg_len = CMSG_LEN(sizeof(int));
 
     msg.msg_controllen = cmsg->cmsg_len;
-    
-    *((int*)CMSG_DATA(cmsg)) = launchd_fd;
-    
-    if(sendmsg(connected_fd, &msg, 0) < 0) {
-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Error sending $DISPLAY file descriptor over fd %d: %d -- %s", connected_fd, errno, strerror(errno));
+
+    *((int *) CMSG_DATA(cmsg)) = launchd_fd;
+
+    if (sendmsg(connected_fd, &msg, 0) < 0) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                "Xquartz: Error sending $DISPLAY file descriptor over fd %d: %d -- %s",
+                connected_fd, errno, strerror(errno));
         return;
     }
 
-    asl_log(aslc, NULL, ASL_LEVEL_DEBUG, "Xquartz: Message sent.  Closing handoff fd.");
+    asl_log(aslc, NULL, ASL_LEVEL_DEBUG,
+            "Xquartz: Message sent.  Closing handoff fd.");
     close(connected_fd);
 }
 
-__attribute__((__noreturn__))
-static void signal_handler(int sig) {
-    if(x11app_pid)
+__attribute__ ((__noreturn__))
+static void
+signal_handler(int sig)
+{
+    if (x11app_pid)
         kill(x11app_pid, sig);
     _exit(0);
 }
 
-int main(int argc, char **argv, char **envp) {
+int
+main(int argc, char **argv, char **envp)
+{
     int envpc;
     kern_return_t kr;
     mach_port_t mp;
@@ -185,7 +212,7 @@ int main(int argc, char **argv, char **envp) {
     char *asl_facility;
     char *server_bootstrap_name = kX11AppBundleId;
 
-    if(getenv("X11_PREFS_DOMAIN"))
+    if (getenv("X11_PREFS_DOMAIN"))
         server_bootstrap_name = getenv("X11_PREFS_DOMAIN");
 
     asprintf(&asl_sender, "%s.stub", server_bootstrap_name);
@@ -193,8 +220,8 @@ int main(int argc, char **argv, char **envp) {
 
     asl_facility = strdup(server_bootstrap_name);
     assert(asl_facility);
-    if(strcmp(asl_facility + strlen(asl_facility) - 4, ".X11") == 0)
-        asl_facility[strlen(asl_facility) - 4] = '\0';    
+    if (strcmp(asl_facility + strlen(asl_facility) - 4, ".X11") == 0)
+        asl_facility[strlen(asl_facility) - 4] = '\0';
 
     assert(aslc = asl_open(asl_sender, asl_facility, ASL_OPT_NO_DELAY));
     free(asl_sender);
@@ -205,103 +232,119 @@ int main(int argc, char **argv, char **envp) {
      * time out waiting for it and will just poll for the server.
      */
     handler = signal(SIGUSR1, SIG_IGN);
-    if(handler == SIG_IGN)
+    if (handler == SIG_IGN)
         kill(getppid(), SIGUSR1);
     signal(SIGUSR1, handler);
 
     /* Pass on SIGs to X11.app */
     signal(SIGINT, signal_handler);
     signal(SIGTERM, signal_handler);
-    
+
     /* Get the $DISPLAY FD */
     launchd_fd = launchd_display_fd();
 
     kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
-    if(kr != KERN_SUCCESS) {
+    if (kr != KERN_SUCCESS) {
         pid_t child;
 
-        asl_log(aslc, NULL, ASL_LEVEL_WARNING, "Xquartz: Unable to locate waiting server: %s", server_bootstrap_name);
+        asl_log(aslc, NULL, ASL_LEVEL_WARNING,
+                "Xquartz: Unable to locate waiting server: %s",
+                server_bootstrap_name);
         set_x11_path();
 
         /* This forking is ugly and will be cleaned up later */
         child = fork();
-        if(child == -1) {
-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Could not fork: %s", strerror(errno));
+        if (child == -1) {
+            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Could not fork: %s",
+                    strerror(errno));
             return EXIT_FAILURE;
         }
 
-        if(child == 0) {
+        if (child == 0) {
             char *_argv[3];
+
             _argv[0] = x11_path;
             _argv[1] = "--listenonly";
             _argv[2] = NULL;
-            asl_log(aslc, NULL, ASL_LEVEL_NOTICE, "Xquartz: Starting X server: %s --listenonly", x11_path);
+            asl_log(aslc, NULL, ASL_LEVEL_NOTICE,
+                    "Xquartz: Starting X server: %s --listenonly", x11_path);
             return execvp(x11_path, _argv);
         }
 
         /* Try connecting for 10 seconds */
-        for(i=0; i < 80; i++) {
+        for (i = 0; i < 80; i++) {
             usleep(250000);
             kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
-            if(kr == KERN_SUCCESS)
+            if (kr == KERN_SUCCESS)
                 break;
         }
 
-        if(kr != KERN_SUCCESS) {
+        if (kr != KERN_SUCCESS) {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: bootstrap_look_up(): %s", bootstrap_strerror(kr));
+            asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                    "Xquartz: bootstrap_look_up(): %s", bootstrap_strerror(kr));
 #else
-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: bootstrap_look_up(): %ul", (unsigned long)kr);
+            asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                    "Xquartz: bootstrap_look_up(): %ul", (unsigned long) kr);
 #endif
             return EXIT_FAILURE;
         }
     }
-    
+
     /* Get X11.app's pid */
     request_pid(mp, &x11app_pid);
 
     /* Handoff the $DISPLAY FD */
-    if(launchd_fd != -1) {
+    if (launchd_fd != -1) {
         size_t try, try_max;
         int handoff_fd = -1;
 
-        for(try=0, try_max=5; try < try_max; try++) {
-            if(request_fd_handoff_socket(mp, handoff_socket_filename) != KERN_SUCCESS) {
-                asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: Failed to request a socket from the server to send the $DISPLAY fd over (try %d of %d)", (int)try+1, (int)try_max);
+        for (try = 0, try_max = 5; try < try_max; try++) {
+            if (request_fd_handoff_socket(mp, handoff_socket_filename) !=
+                KERN_SUCCESS) {
+                asl_log(aslc, NULL, ASL_LEVEL_INFO,
+                        "Xquartz: Failed to request a socket from the server to send the $DISPLAY fd over (try %d of %d)",
+                        (int) try + 1, (int) try_max);
                 continue;
             }
 
             handoff_fd = connect_to_socket(handoff_socket_filename);
-            if(handoff_fd == -1) {
-                asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Failed to connect to socket (try %d of %d)", (int)try+1, (int)try_max);
+            if (handoff_fd == -1) {
+                asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                        "Xquartz: Failed to connect to socket (try %d of %d)",
+                        (int) try + 1, (int) try_max);
                 continue;
             }
 
-            asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: Handoff connection established (try %d of %d) on fd %d, \"%s\".  Sending message.", (int)try+1, (int)try_max, handoff_fd, handoff_socket_filename);
-            send_fd_handoff(handoff_fd, launchd_fd);            
+            asl_log(aslc, NULL, ASL_LEVEL_INFO,
+                    "Xquartz: Handoff connection established (try %d of %d) on fd %d, \"%s\".  Sending message.",
+                    (int) try + 1, (int) try_max, handoff_fd,
+                    handoff_socket_filename);
+            send_fd_handoff(handoff_fd, launchd_fd);
             close(handoff_fd);
             break;
         }
     }
 
     /* Count envp */
-    for(envpc=0; envp[envpc]; envpc++);
-    
+    for (envpc = 0; envp[envpc]; envpc++);
+
     /* We have fixed-size string lengths due to limitations in IPC,
      * so we need to copy our argv and envp.
      */
-    newargv = (string_array_t)calloc((1 + argc), sizeof(string_t));
-    newenvp = (string_array_t)calloc((1 + envpc), sizeof(string_t));
+    newargv = (string_array_t) calloc((1 + argc), sizeof(string_t));
+    newenvp = (string_array_t) calloc((1 + envpc), sizeof(string_t));
 
-    if(!newargv || !newenvp) {
-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Memory allocation failure");
+    if (!newargv || !newenvp) {
+        asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                "Xquartz: Memory allocation failure");
         return EXIT_FAILURE;
     }
-    
-    for(i=0; i < argc; i++) {
+
+    for (i = 0; i < argc; i++) {
         strlcpy(newargv[i], argv[i], STRING_T_SIZE);
     }
-    for(i=0; i < envpc; i++) {
+    for (i = 0; i < envpc; i++) {
         strlcpy(newenvp[i], envp[i], STRING_T_SIZE);
     }
 
@@ -311,7 +354,8 @@ int main(int argc, char **argv, char **envp) {
     free(newenvp);
 
     if (kr != KERN_SUCCESS) {
-        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: start_x11_server: %s", mach_error_string(kr));
+        asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: start_x11_server: %s",
+                mach_error_string(kr));
         return EXIT_FAILURE;
     }
     return EXIT_SUCCESS;
diff --git a/xorg-server/hw/xquartz/pbproxy/app-main.m b/xorg-server/hw/xquartz/pbproxy/app-main.m
index 772c458a1..c061418d8 100644
--- a/xorg-server/hw/xquartz/pbproxy/app-main.m
+++ b/xorg-server/hw/xquartz/pbproxy/app-main.m
@@ -31,10 +31,10 @@
 #import "x-selection.h"
 
 #include <pthread.h>
-#include <unistd.h> /*for getpid*/
+#include <unistd.h>             /*for getpid */
 #include <Cocoa/Cocoa.h>
 
-static const char *app_prefs_domain = 	BUNDLE_ID_PREFIX".xpbproxy";
+static const char *app_prefs_domain = BUNDLE_ID_PREFIX ".xpbproxy";
 CFStringRef app_prefs_domain_cfstr;
 
 /* Stubs */
@@ -43,18 +43,20 @@ BOOL serverRunning = YES;
 pthread_mutex_t serverRunningMutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t serverRunningCond = PTHREAD_COND_INITIALIZER;
 
-static void signal_handler (int sig) {
-    switch(sig) {
-        case SIGHUP:
-            xpbproxy_prefs_reload = YES;
-            break;
-        default:
-            _exit(EXIT_SUCCESS);
+static void
+signal_handler(int sig)
+{
+    switch (sig) {
+    case SIGHUP:
+        xpbproxy_prefs_reload = YES;
+        break;
+    default:
+        _exit(EXIT_SUCCESS);
     }
 }
 
 void
-ErrorF(const char * f, ...)
+ErrorF(const char *f, ...)
 {
     va_list args;
 
@@ -64,7 +66,10 @@ ErrorF(const char * f, ...)
 }
 
 /* TODO: Have this actually log to ASL */
-void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...) {
+void
+xq_asl_log(int level, const char *subsystem, const char *file,
+           const char *function, int line, const char *fmt, ...)
+{
 #ifdef DEBUG
     va_list args;
 
@@ -74,7 +79,9 @@ void xq_asl_log (int level, const char *subsystem, const char *file, const char
 #endif
 }
 
-int main (int argc, const char *argv[]) {
+int
+main(int argc, const char *argv[])
+{
     const char *s;
     int i;
 
@@ -84,31 +91,36 @@ int main (int argc, const char *argv[]) {
 
     xpbproxy_is_standalone = YES;
 
-    if((s = getenv("X11_PREFS_DOMAIN")))
+    if ((s = getenv("X11_PREFS_DOMAIN")))
         app_prefs_domain = s;
 
     for (i = 1; i < argc; i++) {
-        if(strcmp (argv[i], "--prefs-domain") == 0 && i+1 < argc) {
+        if (strcmp(argv[i], "--prefs-domain") == 0 && i + 1 < argc) {
             app_prefs_domain = argv[++i];
-        } else if (strcmp (argv[i], "--help") == 0) {
+        }
+        else if (strcmp(argv[i], "--help") == 0) {
             ErrorF("usage: xpbproxy OPTIONS\n"
                    "Pasteboard proxying for X11.\n\n"
                    "--prefs-domain <domain>   Change the domain used for reading preferences\n"
-                   "                          (default: %s)\n", app_prefs_domain);
+                   "                          (default: %s)\n",
+                   app_prefs_domain);
             return 0;
-        } else {
+        }
+        else {
             ErrorF("usage: xpbproxy OPTIONS...\n"
-                    "Try 'xpbproxy --help' for more information.\n");
+                   "Try 'xpbproxy --help' for more information.\n");
             return 1;
         }
     }
-    
-    app_prefs_domain_cfstr = CFStringCreateWithCString(NULL, app_prefs_domain, kCFStringEncodingUTF8);
-    
-    signal (SIGINT, signal_handler);
-    signal (SIGTERM, signal_handler);
-    signal (SIGHUP, signal_handler);
-    signal (SIGPIPE, SIG_IGN);
+
+    app_prefs_domain_cfstr =
+        CFStringCreateWithCString(NULL, app_prefs_domain,
+                                  kCFStringEncodingUTF8);
+
+    signal(SIGINT, signal_handler);
+    signal(SIGTERM, signal_handler);
+    signal(SIGHUP, signal_handler);
+    signal(SIGPIPE, SIG_IGN);
 
     return xpbproxy_run();
 }
diff --git a/xorg-server/hw/xquartz/pbproxy/main.m b/xorg-server/hw/xquartz/pbproxy/main.m
index 29ce83b35..b52aec8a4 100644
--- a/xorg-server/hw/xquartz/pbproxy/main.m
+++ b/xorg-server/hw/xquartz/pbproxy/main.m
@@ -51,27 +51,31 @@ extern BOOL serverRunning;
 extern pthread_mutex_t serverRunningMutex;
 extern pthread_cond_t serverRunningCond;
 
-static inline void wait_for_server_init(void) {
+static inline void
+wait_for_server_init(void)
+{
     /* If the server hasn't finished initializing, wait for it... */
-    if(!serverRunning) {
+    if (!serverRunning) {
         pthread_mutex_lock(&serverRunningMutex);
-        while(!serverRunning)
+        while (!serverRunning)
             pthread_cond_wait(&serverRunningCond, &serverRunningMutex);
         pthread_mutex_unlock(&serverRunningMutex);
     }
 }
 
-static int x_io_error_handler (Display *dpy) {
+static int
+x_io_error_handler(Display * dpy)
+{
     /* We lost our connection to the server. */
-    
-    TRACE ();
+
+    TRACE();
 
     /* trigger the thread to restart?
      *   NO - this would be to a "deeper" problem, and restarts would just
      *        make things worse...
      */
 #ifdef STANDALONE_XPBPROXY
-    if(xpbproxy_is_standalone)
+    if (xpbproxy_is_standalone)
         exit(EXIT_FAILURE);
 #endif
 
@@ -80,70 +84,81 @@ static int x_io_error_handler (Display *dpy) {
     return 0;
 }
 
-static int x_error_handler (Display *dpy, XErrorEvent *errevent) {
+static int
+x_error_handler(Display * dpy, XErrorEvent * errevent)
+{
     return 0;
 }
 
-int xpbproxy_run (void) {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+int
+xpbproxy_run(void)
+{
+    NSAutoreleasePool *pool =[[NSAutoreleasePool alloc] init];
     size_t i;
-    
+
     wait_for_server_init();
-    
-    for(i=0, xpbproxy_dpy=NULL; !xpbproxy_dpy && i<5; i++) {
+
+    for (i = 0, xpbproxy_dpy = NULL; !xpbproxy_dpy && i < 5; i++) {
         xpbproxy_dpy = XOpenDisplay(NULL);
-        
-        if(!xpbproxy_dpy && display) {
+
+        if (!xpbproxy_dpy && display) {
             char _display[32];
+
             snprintf(_display, sizeof(_display), ":%s", display);
             setenv("DISPLAY", _display, TRUE);
-            
-            xpbproxy_dpy=XOpenDisplay(_display);
+
+            xpbproxy_dpy = XOpenDisplay(_display);
         }
-        if(!xpbproxy_dpy)
+        if (!xpbproxy_dpy)
             sleep(1);
     }
-    
+
     if (xpbproxy_dpy == NULL) {
         ErrorF("xpbproxy: can't open default display\n");
         [pool release];
         return EXIT_FAILURE;
     }
-    
-    XSetIOErrorHandler (x_io_error_handler);
-    XSetErrorHandler (x_error_handler);
-    
-    if (!XAppleWMQueryExtension (xpbproxy_dpy, &xpbproxy_apple_wm_event_base,
-                                 &xpbproxy_apple_wm_error_base)) {
+
+    XSetIOErrorHandler(x_io_error_handler);
+    XSetErrorHandler(x_error_handler);
+
+    if (!XAppleWMQueryExtension(xpbproxy_dpy, &xpbproxy_apple_wm_event_base,
+                                &xpbproxy_apple_wm_error_base)) {
         ErrorF("xpbproxy: can't open AppleWM server extension\n");
         [pool release];
         return EXIT_FAILURE;
     }
 
-    xpbproxy_have_xfixes = XFixesQueryExtension(xpbproxy_dpy, &xpbproxy_xfixes_event_base, &xpbproxy_xfixes_error_base);
+    xpbproxy_have_xfixes =
+        XFixesQueryExtension(xpbproxy_dpy, &xpbproxy_xfixes_event_base,
+                             &xpbproxy_xfixes_error_base);
+
+    XAppleWMSelectInput(xpbproxy_dpy, AppleWMActivationNotifyMask |
+                        AppleWMPasteboardNotifyMask);
 
-    XAppleWMSelectInput (xpbproxy_dpy, AppleWMActivationNotifyMask |
-                         AppleWMPasteboardNotifyMask);
-    
-    _selection_object = [[x_selection alloc] init];
-    
-    if(!xpbproxy_input_register()) {
+    _selection_object =[[x_selection alloc] init];
+
+    if (!xpbproxy_input_register()) {
         [pool release];
         return EXIT_FAILURE;
     }
-    
+
     [pool release];
-    
+
     CFRunLoopRun();
 
     return EXIT_SUCCESS;
 }
 
-id xpbproxy_selection_object (void) {
+id
+xpbproxy_selection_object(void)
+{
     return _selection_object;
 }
 
-Time xpbproxy_current_timestamp (void) {
+Time
+xpbproxy_current_timestamp(void)
+{
     /* FIXME: may want to fetch a timestamp from the server.. */
     return CurrentTime;
 }
diff --git a/xorg-server/hw/xquartz/pbproxy/pbproxy.h b/xorg-server/hw/xquartz/pbproxy/pbproxy.h
index c80a660cc..bdb15aeca 100644
--- a/xorg-server/hw/xquartz/pbproxy/pbproxy.h
+++ b/xorg-server/hw/xquartz/pbproxy/pbproxy.h
@@ -65,11 +65,11 @@ extern BOOL xpbproxy_is_standalone;
 #endif
 
 /* from main.m */
-extern void xpbproxy_set_is_active (BOOL state);
-extern BOOL xpbproxy_get_is_active (void);
-extern id xpbproxy_selection_object (void);
-extern Time xpbproxy_current_timestamp (void);
-extern int xpbproxy_run (void);
+extern void xpbproxy_set_is_active(BOOL state);
+extern BOOL xpbproxy_get_is_active(void);
+extern id xpbproxy_selection_object(void);
+extern Time xpbproxy_current_timestamp(void);
+extern int xpbproxy_run(void);
 
 extern Display *xpbproxy_dpy;
 extern int xpbproxy_apple_wm_event_base, xpbproxy_apple_wm_error_base;
@@ -77,17 +77,21 @@ extern int xpbproxy_xfixes_event_base, xpbproxy_xfixes_error_base;
 extern BOOL xpbproxy_have_xfixes;
 
 /* from x-input.m */
-extern BOOL xpbproxy_input_register (void);
+extern BOOL xpbproxy_input_register(void);
 
 /* os/log.c or app-main.m */
-extern void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
+extern void
+ErrorF(const char *f, ...)
+_X_ATTRIBUTE_PRINTF(1, 2);
 
 /* from darwin.h */
-_X_ATTRIBUTE_PRINTF(6,7)
-extern void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...);
+_X_ATTRIBUTE_PRINTF(6, 7)
+extern void
+xq_asl_log(int level, const char *subsystem, const char *file,
+           const char *function, int line, const char *fmt, ...);
 
 #define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args)
 #define DebugF(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpbproxy", msg, ##args)
 #define TRACE() DebugF("TRACE")
 
-#endif /* PBPROXY_H */
+#endif                          /* PBPROXY_H */
diff --git a/xorg-server/hw/xquartz/pbproxy/trick_autotools.c b/xorg-server/hw/xquartz/pbproxy/trick_autotools.c
index a38f077b1..11aff526d 100644
--- a/xorg-server/hw/xquartz/pbproxy/trick_autotools.c
+++ b/xorg-server/hw/xquartz/pbproxy/trick_autotools.c
@@ -1,3 +1,5 @@
-int this_is_just_here_to_make_automake_work() {
-	return 0;
+int
+this_is_just_here_to_make_automake_work()
+{
+    return 0;
 }
diff --git a/xorg-server/hw/xquartz/pbproxy/x-input.m b/xorg-server/hw/xquartz/pbproxy/x-input.m
index ebb89980f..134bf59d8 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-input.m
+++ b/xorg-server/hw/xquartz/pbproxy/x-input.m
@@ -48,126 +48,138 @@ BOOL xpbproxy_prefs_reload = NO;
 /* Timestamp when the X server last told us it's active */
 static Time last_activation_time;
 
-static void x_event_apple_wm_notify(XAppleWMNotifyEvent *e) {
+static void
+x_event_apple_wm_notify(XAppleWMNotifyEvent * e)
+{
     int type = e->type - xpbproxy_apple_wm_event_base;
     int kind = e->kind;
 
     /* We want to reload prefs even if we're not active */
-    if(type == AppleWMActivationNotify &&
-       kind == AppleWMReloadPreferences)
-        [xpbproxy_selection_object() reload_preferences];
+    if (type == AppleWMActivationNotify && kind == AppleWMReloadPreferences)
+        [xpbproxy_selection_object()reload_preferences];
 
-    if(![xpbproxy_selection_object() is_active])
+    if (![xpbproxy_selection_object()is_active])
         return;
 
-    switch (type) {              
-        case AppleWMActivationNotify:
-            switch (kind) {
-                case AppleWMIsActive:
-                    last_activation_time = e->time;
-                    [xpbproxy_selection_object() x_active:e->time];
-                    break;
-                    
-                case AppleWMIsInactive:
-                    [xpbproxy_selection_object() x_inactive:e->time];
-                    break;
-            }
+    switch (type) {
+    case AppleWMActivationNotify:
+        switch (kind) {
+        case AppleWMIsActive:
+            last_activation_time = e->time;
+ [xpbproxy_selection_object()x_active:e->time];
             break;
-            
-        case AppleWMPasteboardNotify:
-            switch (kind) {
-                case AppleWMCopyToPasteboard:
-                    [xpbproxy_selection_object() x_copy:e->time];
-            }
+
+        case AppleWMIsInactive:
+ [xpbproxy_selection_object()x_inactive:e->time];
             break;
+        }
+        break;
+
+    case AppleWMPasteboardNotify:
+        switch (kind) {
+        case AppleWMCopyToPasteboard:
+ [xpbproxy_selection_object()x_copy:e->time];
+        }
+        break;
     }
 }
 
-static void xpbproxy_process_xevents(void) {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    
-    if(pool == nil) {
+static void
+xpbproxy_process_xevents(void)
+{
+    NSAutoreleasePool *pool =[[NSAutoreleasePool alloc] init];
+
+    if (pool == nil) {
         ErrorF("unable to allocate/init auto release pool!\n");
         return;
     }
-    
+
     while (XPending(xpbproxy_dpy) != 0) {
         XEvent e;
-        
-        XNextEvent (xpbproxy_dpy, &e);
-        
-        switch (e.type) {                
-            case SelectionClear:
-                if([xpbproxy_selection_object() is_active])
-                    [xpbproxy_selection_object () clear_event:&e.xselectionclear];
-                break;
-                
-            case SelectionRequest:
-                [xpbproxy_selection_object () request_event:&e.xselectionrequest];
-                break;
-                
-            case SelectionNotify:
-                [xpbproxy_selection_object () notify_event:&e.xselection];
-                break;
-                
-            case PropertyNotify:
-                [xpbproxy_selection_object () property_event:&e.xproperty];
-                break;
-                
-            default:
-                if(e.type >= xpbproxy_apple_wm_event_base &&
-                   e.type < xpbproxy_apple_wm_event_base + AppleWMNumberEvents) {
-                    x_event_apple_wm_notify((XAppleWMNotifyEvent *) &e);
-                } else if(e.type == xpbproxy_xfixes_event_base + XFixesSelectionNotify) {
-                    [xpbproxy_selection_object() xfixes_selection_notify:(XFixesSelectionNotifyEvent *)&e];
-                }
-                break;
+
+        XNextEvent(xpbproxy_dpy, &e);
+
+        switch (e.type) {
+        case SelectionClear:
+            if ([xpbproxy_selection_object()is_active])
+ [xpbproxy_selection_object()clear_event:&e.xselectionclear];
+            break;
+
+        case SelectionRequest:
+ [xpbproxy_selection_object()request_event:&e.xselectionrequest];
+            break;
+
+        case SelectionNotify:
+ [xpbproxy_selection_object()notify_event:&e.xselection];
+            break;
+
+        case PropertyNotify:
+ [xpbproxy_selection_object()property_event:&e.xproperty];
+            break;
+
+        default:
+            if (e.type >= xpbproxy_apple_wm_event_base &&
+                e.type < xpbproxy_apple_wm_event_base + AppleWMNumberEvents) {
+                x_event_apple_wm_notify((XAppleWMNotifyEvent *) & e);
+            }
+            else if (e.type ==
+                     xpbproxy_xfixes_event_base + XFixesSelectionNotify) {
+ [xpbproxy_selection_object()xfixes_selection_notify:(XFixesSelectionNotifyEvent *) &
+                 e];
+            }
+            break;
         }
-        
+
         XFlush(xpbproxy_dpy);
     }
-    
+
     [pool release];
 }
 
-static BOOL add_input_socket (int sock, CFOptionFlags callback_types,
-                             CFSocketCallBack callback, const CFSocketContext *ctx,
-                             CFRunLoopSourceRef *cf_source) {
+static BOOL
+add_input_socket(int sock, CFOptionFlags callback_types,
+                 CFSocketCallBack callback, const CFSocketContext * ctx,
+                 CFRunLoopSourceRef * cf_source)
+{
     CFSocketRef cf_sock;
-    
-    cf_sock = CFSocketCreateWithNative (kCFAllocatorDefault, sock,
-                                        callback_types, callback, ctx);
+
+    cf_sock = CFSocketCreateWithNative(kCFAllocatorDefault, sock,
+                                       callback_types, callback, ctx);
     if (cf_sock == NULL) {
-        close (sock);
+        close(sock);
         return FALSE;
     }
-    
-    *cf_source = CFSocketCreateRunLoopSource (kCFAllocatorDefault,
-                                              cf_sock, 0);
-    CFRelease (cf_sock);
-    
+
+    *cf_source = CFSocketCreateRunLoopSource(kCFAllocatorDefault, cf_sock, 0);
+    CFRelease(cf_sock);
+
     if (*cf_source == NULL)
         return FALSE;
-    
-    CFRunLoopAddSource (CFRunLoopGetCurrent (),
-                        *cf_source, kCFRunLoopDefaultMode);
+
+    CFRunLoopAddSource(CFRunLoopGetCurrent(),
+                       *cf_source, kCFRunLoopDefaultMode);
     return TRUE;
 }
 
-static void x_input_callback (CFSocketRef sock, CFSocketCallBackType type,
-                              CFDataRef address, const void *data, void *info) {
+static void
+x_input_callback(CFSocketRef sock, CFSocketCallBackType type,
+                 CFDataRef address, const void *data, void *info)
+{
 
 #ifdef STANDALONE_XPBPROXY
-    if(xpbproxy_prefs_reload) {
-        [xpbproxy_selection_object() reload_preferences];
+    if (xpbproxy_prefs_reload) {
+        [xpbproxy_selection_object()reload_preferences];
         xpbproxy_prefs_reload = NO;
     }
 #endif
-    
+
     xpbproxy_process_xevents();
 }
 
-BOOL xpbproxy_input_register(void) {
-    return add_input_socket(ConnectionNumber(xpbproxy_dpy), kCFSocketReadCallBack,
-                            x_input_callback, NULL, &xpbproxy_dpy_source);
+BOOL
+xpbproxy_input_register(void)
+{
+    return add_input_socket(ConnectionNumber(xpbproxy_dpy),
+                            kCFSocketReadCallBack, x_input_callback, NULL,
+                            &xpbproxy_dpy_source);
 }
diff --git a/xorg-server/hw/xquartz/pbproxy/x-selection.h b/xorg-server/hw/xquartz/pbproxy/x-selection.h
index d4a39e58f..f5c6c9bd5 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-selection.h
+++ b/xorg-server/hw/xquartz/pbproxy/x-selection.h
@@ -41,9 +41,9 @@
 
 /* This stores image data or text. */
 struct propdata {
-	unsigned char *data;
-	size_t length;
-	int format;
+    unsigned char *data;
+    size_t length;
+    int format;
 };
 
 struct atom_list {
@@ -52,16 +52,13 @@ struct atom_list {
         compound_text, atom_pair;
 };
 
-
-@interface x_selection : NSObject
-{
-@private
-
-    /* The unmapped window we use for fetching selections. */
+ @interface x_selection:NSObject {
+    @private
+        /* The unmapped window we use for fetching selections. */
     Window _selection_window;
 
     Atom request_atom;
-    
+
     struct {
         struct propdata propdata;
         Window requestor;
@@ -74,37 +71,40 @@ struct atom_list {
      * pending_copy is > 0 we do it again.
      */
     int pending_copy;
+
     /* 
      * This is used for the same purpose as pending_copy, but for the 
      * CLIPBOARD.  It also prevents a race with INCR transfers.
      */
-    int pending_clipboard; 
-    
+    int pending_clipboard;
+
     struct atom_list atoms[1];
 }
 
-- (void) x_active:(Time)timestamp;
-- (void) x_inactive:(Time)timestamp;
-
-- (void) x_copy:(Time)timestamp;
-
-- (void) clear_event:(XSelectionClearEvent *)e;
-- (void) request_event:(XSelectionRequestEvent *)e;
-- (void) notify_event:(XSelectionEvent *)e;
-- (void) property_event:(XPropertyEvent *)e;
-- (void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *)e;
-- (void) handle_selection:(Atom)selection type:(Atom)type propdata:(struct propdata *)pdata;
-- (void) claim_clipboard;
-- (BOOL) set_clipboard_manager_status:(BOOL)value;
-- (void) own_clipboard;
-- (void) copy_completed:(Atom)selection;
-
-- (void) reload_preferences;
-- (BOOL) is_active;
-- (void) send_none:(XSelectionRequestEvent *)e;
-@end
+ -(void) x_active:(Time) timestamp;
+ -(void) x_inactive:(Time) timestamp;
+
+ -(void) x_copy:(Time) timestamp;
+
+ -(void) clear_event:(XSelectionClearEvent *) e;
+ -(void) request_event:(XSelectionRequestEvent *) e;
+ -(void) notify_event:(XSelectionEvent *) e;
+ -(void) property_event:(XPropertyEvent *) e;
+ -(void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *) e;
+ -(void) handle_selection:(Atom)
+selection type:(Atom)
+type propdata:(struct propdata *) pdata;
 
+-(void) claim_clipboard;
+ -(BOOL) set_clipboard_manager_status:(BOOL) value;
+-(void) own_clipboard;
+ -(void) copy_completed:(Atom) selection;
+
+-(void) reload_preferences;
+-(BOOL) is_active;
+ -(void) send_none:(XSelectionRequestEvent *) e;
+@end
 /* main.m */
 extern x_selection *_selection_object;
 
-#endif /* X_SELECTION_H */
+#endif                          /* X_SELECTION_H */
diff --git a/xorg-server/hw/xquartz/pbproxy/x-selection.m b/xorg-server/hw/xquartz/pbproxy/x-selection.m
index b5f4dde5c..317aed073 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-selection.m
+++ b/xorg-server/hw/xquartz/pbproxy/x-selection.m
@@ -65,59 +65,61 @@
  */
 
 static struct {
-    BOOL active ;
-    BOOL primary_on_grab; /* This is provided as an option for people who
-			   * want it and has issues that won't ever be
-			   * addressed to make it *always* work.
-			   */
+    BOOL active;
+    BOOL primary_on_grab;       /* This is provided as an option for people who
+                                 * want it and has issues that won't ever be
+                                 * addressed to make it *always* work.
+                                 */
     BOOL clipboard_to_pasteboard;
     BOOL pasteboard_to_primary;
     BOOL pasteboard_to_clipboard;
-} pbproxy_prefs = { YES, NO, YES, YES, YES };
+} pbproxy_prefs = {
+YES, NO, YES, YES, YES};
 
 @implementation x_selection
-
-static struct propdata null_propdata = {NULL, 0, 0};
+    static struct propdata null_propdata = { NULL, 0, 0 };
 
 #ifdef DEBUG
 static void
-dump_prefs() {
-    ErrorF(fp, 
-	   "pbproxy preferences:\n"
-	   "\tactive %u\n"
-	   "\tprimary_on_grab %u\n"
-	   "\tclipboard_to_pasteboard %u\n"
-	   "\tpasteboard_to_primary %u\n"
-	   "\tpasteboard_to_clipboard %u\n",
-	   pbproxy_prefs.active,
-	   pbproxy_prefs.primary_on_grab,
-	   pbproxy_prefs.clipboard_to_pasteboard,
-	   pbproxy_prefs.pasteboard_to_primary,
-	   pbproxy_prefs.pasteboard_to_clipboard);
+dump_prefs()
+{
+    ErrorF(fp,
+           "pbproxy preferences:\n"
+           "\tactive %u\n"
+           "\tprimary_on_grab %u\n"
+           "\tclipboard_to_pasteboard %u\n"
+           "\tpasteboard_to_primary %u\n"
+           "\tpasteboard_to_clipboard %u\n",
+           pbproxy_prefs.active,
+           pbproxy_prefs.primary_on_grab,
+           pbproxy_prefs.clipboard_to_pasteboard,
+           pbproxy_prefs.pasteboard_to_primary,
+           pbproxy_prefs.pasteboard_to_clipboard);
 }
 #endif
 
 extern CFStringRef app_prefs_domain_cfstr;
 
 static BOOL
-prefs_get_bool (CFStringRef key, BOOL defaultValue) {
+prefs_get_bool(CFStringRef key, BOOL defaultValue)
+{
     Boolean value, ok;
-    
-    value = CFPreferencesGetAppBooleanValue (key, app_prefs_domain_cfstr, &ok);
-   
+
+    value = CFPreferencesGetAppBooleanValue(key, app_prefs_domain_cfstr, &ok);
+
     return ok ? (BOOL) value : defaultValue;
 }
 
 static void
-init_propdata (struct propdata *pdata)
+init_propdata(struct propdata *pdata)
 {
     *pdata = null_propdata;
 }
 
 static void
-free_propdata (struct propdata *pdata)
+free_propdata(struct propdata *pdata)
 {
-    free (pdata->data);
+    free(pdata->data);
     *pdata = null_propdata;
 }
 
@@ -127,188 +129,175 @@ free_propdata (struct propdata *pdata)
  * The property is only deleted when bytesleft is 0 if delete is True.
  */
 static Bool
-get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Atom *type) 
+get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
+             Atom *type)
 {
     long offset = 0;
     unsigned long numitems, bytesleft = 0;
+
 #ifdef TEST
     /* This is used to test the growth handling. */
     unsigned long length = 4UL;
 #else
-    unsigned long length = (100000UL + 3) / 4; 
+    unsigned long length = (100000UL + 3) / 4;
 #endif
     unsigned char *buf = NULL, *chunk = NULL;
     size_t buflen = 0, chunkbytesize = 0;
     int format;
 
-    TRACE ();
-    
-    if(None == property)
-	return True;
-    
-    do 
-    {
-	unsigned long newbuflen = 0;
-	unsigned char *newbuf = NULL;
-	
-#ifdef TEST   
-	ErrorF("bytesleft %lu\n", bytesleft);
+    TRACE();
+
+    if (None == property)
+        return True;
+
+    do {
+        unsigned long newbuflen = 0;
+        unsigned char *newbuf = NULL;
+
+#ifdef TEST
+        ErrorF("bytesleft %lu\n", bytesleft);
 #endif
 
-	if (Success != XGetWindowProperty (xpbproxy_dpy, win, property,
-					   offset, length, delete, 
-					   AnyPropertyType,
-					   type, &format, &numitems, 
-					   &bytesleft, &chunk)) 
-	{
-	    DebugF ("Error while getting window property.\n");
-	    *pdata = null_propdata;
-	    free (buf);
-	    return True;
-	}
-	
+        if (Success != XGetWindowProperty(xpbproxy_dpy, win, property,
+                                          offset, length, delete,
+                                          AnyPropertyType,
+                                          type, &format, &numitems,
+                                          &bytesleft, &chunk)) {
+            DebugF("Error while getting window property.\n");
+            *pdata = null_propdata;
+            free(buf);
+            return True;
+        }
+
 #ifdef TEST
-	ErrorF("format %d numitems %lu bytesleft %lu\n",
-	       format, numitems, bytesleft);
-	
-	ErrorF("type %s\n", XGetAtomName (xpbproxy_dpy, *type));
+        ErrorF("format %d numitems %lu bytesleft %lu\n",
+               format, numitems, bytesleft);
+
+        ErrorF("type %s\n", XGetAtomName(xpbproxy_dpy, *type));
 #endif
-	
-	/* Format is the number of bits. */
-	if (format == 8)
-	  chunkbytesize = numitems;
-	else if (format == 16)
-	  chunkbytesize = numitems * sizeof(short);
-	else if (format == 32)
-	  chunkbytesize = numitems * sizeof(long);
+
+        /* Format is the number of bits. */
+        if (format == 8)
+            chunkbytesize = numitems;
+        else if (format == 16)
+            chunkbytesize = numitems * sizeof(short);
+        else if (format == 32)
+            chunkbytesize = numitems * sizeof(long);
 
 #ifdef TEST
-	ErrorF("chunkbytesize %zu\n", chunkbytesize);
+        ErrorF("chunkbytesize %zu\n", chunkbytesize);
 #endif
- 	newbuflen = buflen + chunkbytesize;
-	if (newbuflen > 0) 
-	{
-	    newbuf = realloc (buf, newbuflen);
-	    
-	    if (NULL == newbuf)
-	    {
-		XFree (chunk);
-		free (buf);
-		return True;
-	    }
-	
-	    memcpy (newbuf + buflen, chunk, chunkbytesize);
-	    XFree (chunk);
-	    buf = newbuf;
-	    buflen = newbuflen;
-	    /* offset is a multiple of 32 bits*/
-	    offset += chunkbytesize / 4;
-	} 
-	else 
-	{
-	    if (chunk) 
-		XFree (chunk);
-	}
-	
+        newbuflen = buflen + chunkbytesize;
+        if (newbuflen > 0) {
+            newbuf = realloc(buf, newbuflen);
+
+            if (NULL == newbuf) {
+                XFree(chunk);
+                free(buf);
+                return True;
+            }
+
+            memcpy(newbuf + buflen, chunk, chunkbytesize);
+            XFree(chunk);
+            buf = newbuf;
+            buflen = newbuflen;
+            /* offset is a multiple of 32 bits */
+            offset += chunkbytesize / 4;
+        }
+        else {
+            if (chunk)
+                XFree(chunk);
+        }
+
 #ifdef TEST
-	ErrorF("bytesleft %lu\n", bytesleft);
+        ErrorF("bytesleft %lu\n", bytesleft);
 #endif
     } while (bytesleft > 0);
-    
+
     pdata->data = buf;
     pdata->length = buflen;
     pdata->format = format;
 
-    return /*success*/ False;
+    return /*success */ False;
 }
 
-
 /* Implementation methods */
 
 /* This finds the preferred type from a TARGETS list.*/
-- (Atom) find_preferred:(struct propdata *)pdata
-{
+ -(Atom) find_preferred:(struct propdata *) pdata {
     Atom a = None;
     size_t i, step;
     Bool png = False, jpeg = False, utf8 = False, string = False;
 
-    TRACE ();
-
-    if (pdata->format != 32)
-    {
-	ErrorF("Atom list is expected to be formatted as an array of 32bit values.\n");
-	return None;
-    }
-
-    for (i = 0, step = sizeof(long); i < pdata->length; i += step)
-    {
-	a = (Atom)*(long *)(pdata->data + i);
-
-	if (a == atoms->image_png)
-	{
-	    png = True;
-	}
-	else if (a == atoms->image_jpeg)
-	{
-	    jpeg = True;
-	}
-	else if (a == atoms->utf8_string)
-	{
-	    utf8 = True;
-        } 
-	else if (a == atoms->string)
-	{
-	    string = True;
-	}
-	else
-	{
-	    char *type = XGetAtomName(xpbproxy_dpy, a);
-	    if (type)
-	    {
-		DebugF("Unhandled X11 mime type: %s", type);
-		XFree(type);
-	    }
-	}
-    }
-
-    /*We prefer PNG over strings, and UTF8 over a Latin-1 string.*/
+    TRACE();
+
+    if (pdata->format != 32) {
+        ErrorF
+            ("Atom list is expected to be formatted as an array of 32bit values.\n");
+        return None;
+    }
+
+    for (i = 0, step = sizeof(long); i < pdata->length; i += step) {
+        a = (Atom) *(long *) (pdata->data + i);
+
+        if (a == atoms->image_png) {
+            png = True;
+        }
+        else if (a == atoms->image_jpeg) {
+            jpeg = True;
+        }
+        else if (a == atoms->utf8_string) {
+            utf8 = True;
+        }
+        else if (a == atoms->string) {
+            string = True;
+        }
+        else {
+            char *type = XGetAtomName(xpbproxy_dpy, a);
+
+            if (type) {
+                DebugF("Unhandled X11 mime type: %s", type);
+                XFree(type);
+            }
+        }
+    }
+
+    /*We prefer PNG over strings, and UTF8 over a Latin-1 string. */
     if (png)
-	return atoms->image_png;
+        return atoms->image_png;
 
     if (jpeg)
-	return atoms->image_jpeg;
+        return atoms->image_jpeg;
 
     if (utf8)
-	return atoms->utf8_string;
+        return atoms->utf8_string;
 
     if (string)
-	return atoms->string;
+        return atoms->string;
 
-    /* This is evidently something we don't know how to handle.*/
+    /* This is evidently something we don't know how to handle. */
     return None;
 }
 
 /* Return True if this is an INCR-style transfer. */
-- (Bool) is_incr_type:(XSelectionEvent *)e
-{
+ -(Bool) is_incr_type:(XSelectionEvent *) e {
     Atom seltype;
     int format;
     unsigned long numitems = 0UL, bytesleft = 0UL;
     unsigned char *chunk;
-       
-    TRACE ();
 
-    if (Success != XGetWindowProperty (xpbproxy_dpy, e->requestor, e->property,
-				       /*offset*/ 0L, /*length*/ 4UL,
-				       /*Delete*/ False,
-				       AnyPropertyType, &seltype, &format,
-				       &numitems, &bytesleft, &chunk))
-    {
-	return False;
+    TRACE();
+
+    if (Success != XGetWindowProperty(xpbproxy_dpy, e->requestor, e->property,
+                                      /*offset */ 0L, /*length */ 4UL,
+                                      /*Delete */ False,
+                                      AnyPropertyType, &seltype, &format,
+                                      &numitems, &bytesleft, &chunk)) {
+        return False;
     }
 
-    if(chunk)
-	XFree(chunk);
+    if (chunk)
+        XFree(chunk);
 
     return (seltype == atoms->incr) ? True : False;
 }
@@ -317,133 +306,122 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
  * This should be called after a selection has been copied, 
  * or when the selection is unfinished before a transfer completes. 
  */
-- (void) release_pending
-{
-    TRACE ();
+-(void) release_pending {
+    TRACE();
 
-    free_propdata (&pending.propdata);
+    free_propdata(&pending.propdata);
     pending.requestor = None;
     pending.selection = None;
 }
 
 /* Return True if an error occurs during an append.*/
 /* Return False if the append succeeds. */
-- (Bool) append_to_pending:(struct propdata *)pdata requestor:(Window)requestor
+ -(Bool) append_to_pending:(struct propdata *)
+pdata requestor:(Window) requestor
 {
     unsigned char *newdata;
     size_t newlength;
-    
-    TRACE ();
-    
-    if (requestor != pending.requestor)
-    {
-	[self release_pending];
-	pending.requestor = requestor;
-    }
-	
+
+    TRACE();
+
+    if (requestor != pending.requestor) {
+        [self release_pending];
+        pending.requestor = requestor;
+    }
+
     newlength = pending.propdata.length + pdata->length;
     newdata = realloc(pending.propdata.data, newlength);
 
-    if(NULL == newdata) 
-    {
-	perror("realloc propdata");
-	[self release_pending];
+    if (NULL == newdata) {
+        perror("realloc propdata");
+        [self release_pending];
         return True;
     }
 
     memcpy(newdata + pending.propdata.length, pdata->data, pdata->length);
     pending.propdata.data = newdata;
     pending.propdata.length = newlength;
-    
+
     return False;
 }
 
-
-
 /* Called when X11 becomes active (i.e. has key focus) */
-- (void) x_active:(Time)timestamp
-{
+ -(void) x_active:(Time) timestamp {
     static NSInteger changeCount;
     NSInteger countNow;
     NSPasteboard *pb;
 
-    TRACE ();
+    TRACE();
 
-    pb = [NSPasteboard generalPasteboard];
+    pb =[NSPasteboard generalPasteboard];
 
     if (nil == pb)
-	return;
+        return;
 
-    countNow = [pb changeCount];
+    countNow =[pb changeCount];
 
-    if (countNow != changeCount)
-    {
-        DebugF ("changed pasteboard!\n");
+    if (countNow != changeCount) {
+        DebugF("changed pasteboard!\n");
         changeCount = countNow;
-        
-        if (pbproxy_prefs.pasteboard_to_primary)
-        {
-            XSetSelectionOwner (xpbproxy_dpy, atoms->primary, _selection_window, CurrentTime);
+
+        if (pbproxy_prefs.pasteboard_to_primary) {
+            XSetSelectionOwner(xpbproxy_dpy, atoms->primary, _selection_window,
+                               CurrentTime);
         }
-        
+
         if (pbproxy_prefs.pasteboard_to_clipboard) {
             [self own_clipboard];
         }
     }
 
 #if 0
-	/*gstaplin: we should perhaps investigate something like this branch above...*/
-	if ([_pasteboard availableTypeFromArray: _known_types] != nil)
-	{
-	    /* Pasteboard has data we should proxy; I think it makes
-	       sense to put it on both CLIPBOARD and PRIMARY */
-
-	    XSetSelectionOwner (xpbproxy_dpy, atoms->clipboard,
-				_selection_window, timestamp);
-	    XSetSelectionOwner (xpbproxy_dpy, atoms->primary,
-				_selection_window, timestamp);
-	}
+    /*gstaplin: we should perhaps investigate something like this branch above... */
+ if ([_pasteboard availableTypeFromArray:_known_types] != nil) {
+        /* Pasteboard has data we should proxy; I think it makes
+           sense to put it on both CLIPBOARD and PRIMARY */
+
+        XSetSelectionOwner(xpbproxy_dpy, atoms->clipboard,
+                           _selection_window, timestamp);
+        XSetSelectionOwner(xpbproxy_dpy, atoms->primary,
+                           _selection_window, timestamp);
+    }
 #endif
 }
 
 /* Called when X11 loses key focus */
-- (void) x_inactive:(Time)timestamp
-{
-    TRACE ();
+ -(void) x_inactive:(Time) timestamp {
+    TRACE();
 }
 
 /* This requests the TARGETS list from the PRIMARY selection owner. */
-- (void) x_copy_request_targets
-{
-    TRACE ();
+-(void) x_copy_request_targets {
+    TRACE();
 
     request_atom = atoms->targets;
-    XConvertSelection (xpbproxy_dpy, atoms->primary, atoms->targets,
-		       atoms->primary, _selection_window, CurrentTime);
+    XConvertSelection(xpbproxy_dpy, atoms->primary, atoms->targets,
+                      atoms->primary, _selection_window, CurrentTime);
 }
 
 /* Called when the Edit/Copy item on the main X11 menubar is selected
  * and no appkit window claims it. */
-- (void) x_copy:(Time)timestamp
-{
+ -(void) x_copy:(Time) timestamp {
     Window w;
 
-    TRACE ();
+    TRACE();
 
-    w = XGetSelectionOwner (xpbproxy_dpy, atoms->primary);
+    w = XGetSelectionOwner(xpbproxy_dpy, atoms->primary);
 
-    if (None != w)
-    {
-	++pending_copy;
-	
-	if (1 == pending_copy) {
-	    /*
-	     * There are no other copy operations in progress, so we
-	     * can proceed safely.  Otherwise the copy_completed method
-	     * will see that the pending_copy is > 1, and do another copy.
-	     */	    
-	    [self x_copy_request_targets];
-	}
+    if (None != w) {
+        ++pending_copy;
+
+        if (1 == pending_copy) {
+            /*
+             * There are no other copy operations in progress, so we
+             * can proceed safely.  Otherwise the copy_completed method
+             * will see that the pending_copy is > 1, and do another copy.
+             */
+            [self x_copy_request_targets];
+        }
     }
 }
 
@@ -451,32 +429,37 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
  * This prevents tools like xclipboard from causing havoc.
  * Returns TRUE on success
  */
-- (BOOL) set_clipboard_manager_status:(BOOL)value
-{
-    TRACE ();
+ -(BOOL) set_clipboard_manager_status:(BOOL) value {
+    TRACE();
 
-    Window owner = XGetSelectionOwner (xpbproxy_dpy, atoms->clipboard_manager);
+    Window owner = XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager);
 
-    if(value) {
-        if(owner == _selection_window)
+    if (value) {
+        if (owner == _selection_window)
             return TRUE;
 
-        if(owner != None) {
-            ErrorF("A clipboard manager using window 0x%lx already owns the clipboard selection.  "
-		   "pbproxy will not sync clipboard to pasteboard.\n", owner);
+        if (owner != None) {
+            ErrorF
+                ("A clipboard manager using window 0x%lx already owns the clipboard selection.  "
+                 "pbproxy will not sync clipboard to pasteboard.\n", owner);
             return FALSE;
         }
-        
-        XSetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager, _selection_window, CurrentTime);
-        return (_selection_window == XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager));
-    } else {
-        if(owner != _selection_window)
+
+        XSetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager,
+                           _selection_window, CurrentTime);
+        return (_selection_window ==
+                XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager));
+    }
+    else {
+        if (owner != _selection_window)
             return TRUE;
 
-        XSetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager, None, CurrentTime);
-        return(None == XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager));
+        XSetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager, None,
+                           CurrentTime);
+        return (None ==
+                XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager));
     }
-    
+
     return FALSE;
 }
 
@@ -484,31 +467,30 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
  * This occurs when we previously owned a selection, 
  * and then lost it from another client.
  */
-- (void) clear_event:(XSelectionClearEvent *)e
-{
-    
+ -(void) clear_event:(XSelectionClearEvent *) e {
+
+    TRACE();
+
+    DebugF("e->selection %s\n", XGetAtomName(xpbproxy_dpy, e->selection));
 
-    TRACE ();
-        
-    DebugF ("e->selection %s\n", XGetAtomName (xpbproxy_dpy, e->selection));
-    
-    if(e->selection == atoms->clipboard) {
+    if (e->selection == atoms->clipboard) {
         /* 
          * We lost ownership of the CLIPBOARD.
          */
         ++pending_clipboard;
-        
+
         if (1 == pending_clipboard) {
             /* Claim the clipboard contents from the new owner. */
             [self claim_clipboard];
         }
-    } else if(e->selection == atoms->clipboard_manager) {
-        if(pbproxy_prefs.clipboard_to_pasteboard) {
+    }
+    else if (e->selection == atoms->clipboard_manager) {
+        if (pbproxy_prefs.clipboard_to_pasteboard) {
             /* Another CLIPBOARD_MANAGER has set itself as owner.  Disable syncing
              * to avoid a race.
              */
             ErrorF("Another clipboard manager was started!  "
-		    "xpbproxy is disabling syncing with clipboard.\n"); 
+                   "xpbproxy is disabling syncing with clipboard.\n");
             pbproxy_prefs.clipboard_to_pasteboard = NO;
         }
     }
@@ -517,73 +499,71 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 /* 
  * We greedily acquire the clipboard after it changes, and on startup.
  */
-- (void) claim_clipboard
-{
+-(void) claim_clipboard {
     Window owner;
-    
-    TRACE ();
-    
+
+    TRACE();
+
     if (!pbproxy_prefs.clipboard_to_pasteboard)
         return;
-    
-    owner = XGetSelectionOwner (xpbproxy_dpy, atoms->clipboard);
+
+    owner = XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard);
     if (None == owner) {
         /*
          * The owner probably died or we are just starting up pbproxy.
          * Set pbproxy's _selection_window as the owner, and continue.
          */
-        DebugF ("No clipboard owner.\n");
-        [self copy_completed:atoms->clipboard];
+        DebugF("No clipboard owner.\n");
+ [self copy_completed:atoms->clipboard];
         return;
-    } else if (owner == _selection_window) {
-        [self copy_completed:atoms->clipboard];
+    }
+    else if (owner == _selection_window) {
+ [self copy_completed:atoms->clipboard];
         return;
     }
-    
-    DebugF ("requesting targets\n");
-    
+
+    DebugF("requesting targets\n");
+
     request_atom = atoms->targets;
-    XConvertSelection (xpbproxy_dpy, atoms->clipboard, atoms->targets,
-                       atoms->clipboard, _selection_window, CurrentTime);
-    XFlush (xpbproxy_dpy);
+    XConvertSelection(xpbproxy_dpy, atoms->clipboard, atoms->targets,
+                      atoms->clipboard, _selection_window, CurrentTime);
+    XFlush(xpbproxy_dpy);
     /* Now we will get a SelectionNotify event in the future. */
 }
 
 /* Greedily acquire the clipboard. */
-- (void) own_clipboard
-{
+-(void) own_clipboard {
 
-    TRACE ();
+    TRACE();
 
     /* We should perhaps have a boundary limit on the number of iterations... */
-    do 
-    {
-	XSetSelectionOwner (xpbproxy_dpy, atoms->clipboard, _selection_window,
-			    CurrentTime);
-    } while (_selection_window != XGetSelectionOwner (xpbproxy_dpy,
-						      atoms->clipboard));
+    do {
+        XSetSelectionOwner(xpbproxy_dpy, atoms->clipboard, _selection_window,
+                           CurrentTime);
+    } while (_selection_window != XGetSelectionOwner(xpbproxy_dpy,
+                                                     atoms->clipboard));
 }
 
-- (void) init_reply:(XEvent *)reply request:(XSelectionRequestEvent *)e
+ -(void) init_reply:(XEvent *)
+reply request:(XSelectionRequestEvent *) e
 {
     reply->xselection.type = SelectionNotify;
     reply->xselection.selection = e->selection;
     reply->xselection.target = e->target;
     reply->xselection.requestor = e->requestor;
     reply->xselection.time = e->time;
-    reply->xselection.property = None; 
+    reply->xselection.property = None;
 }
 
-- (void) send_reply:(XEvent *)reply
-{
+ -(void) send_reply:(XEvent *) reply {
     /*
      * We are supposed to use an empty event mask, and not propagate
      * the event, according to the ICCCM.
      */
-    DebugF ("reply->xselection.requestor 0x%lx\n", reply->xselection.requestor);
-  
-    XSendEvent (xpbproxy_dpy, reply->xselection.requestor, False, 0, reply);
-    XFlush (xpbproxy_dpy);
+    DebugF("reply->xselection.requestor 0x%lx\n", reply->xselection.requestor);
+
+    XSendEvent(xpbproxy_dpy, reply->xselection.requestor, False, 0, reply);
+    XFlush(xpbproxy_dpy);
 }
 
 /* 
@@ -594,76 +574,75 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
  * (in Latin-1 encoding).  The requestor can then make the choice based on
  * the list.
  */
-- (void) send_targets:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb
+ -(void) send_targets:(XSelectionRequestEvent *)
+e pasteboard:(NSPasteboard *) pb
 {
     XEvent reply;
     NSArray *pbtypes;
 
-    [self init_reply:&reply request:e];
+ [self init_reply: &reply request:e];
 
-    pbtypes = [pb types];
-    if (pbtypes)
-    {
-	long list[7]; /* Don't forget to increase this if we handle more types! */
+    pbtypes =[pb types];
+    if (pbtypes) {
+        long list[7];           /* Don't forget to increase this if we handle more types! */
         long count = 0;
- 	
-	/*
-	 * I'm not sure if this is needed, but some toolkits/clients list 
-	 * TARGETS in response to targets. 
-	 */
-	list[count] = atoms->targets;
-	++count;
-
-	if ([pbtypes containsObject:NSStringPboardType])
-	{
-	    /* We have a string type that we can convert to UTF8, or Latin-1... */
-	    DebugF ("NSStringPboardType\n");
-	    list[count] = atoms->utf8_string;
-	    ++count;
-	    list[count] = atoms->string;
-	    ++count;
-	    list[count] = atoms->compound_text;
-	    ++count;
-	}
-
-	/* TODO add the NSPICTPboardType back again, once we have conversion
-	 * functionality in send_image.
-	 */
+
+        /*
+         * I'm not sure if this is needed, but some toolkits/clients list 
+         * TARGETS in response to targets. 
+         */
+        list[count] = atoms->targets;
+        ++count;
+
+ if ([pbtypes containsObject:NSStringPboardType]) {
+            /* We have a string type that we can convert to UTF8, or Latin-1... */
+            DebugF("NSStringPboardType\n");
+            list[count] = atoms->utf8_string;
+            ++count;
+            list[count] = atoms->string;
+            ++count;
+            list[count] = atoms->compound_text;
+            ++count;
+        }
+
+        /* TODO add the NSPICTPboardType back again, once we have conversion
+         * functionality in send_image.
+         */
 #ifdef __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // NSPICTPboardType
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"    // NSPICTPboardType
 #endif
 
-	if ([pbtypes containsObject:NSPICTPboardType] 
-	    || [pbtypes containsObject:NSTIFFPboardType]) 
-	{
-	    /* We can convert a TIFF to a PNG or JPEG. */
-	    DebugF ("NSTIFFPboardType\n");
-	    list[count] = atoms->image_png;
-	    ++count;
-	    list[count] = atoms->image_jpeg;
-	    ++count;
-	} 
+ if ([pbtypes containsObject:NSPICTPboardType]
+ ||[pbtypes containsObject:NSTIFFPboardType]) {
+            /* We can convert a TIFF to a PNG or JPEG. */
+            DebugF("NSTIFFPboardType\n");
+            list[count] = atoms->image_png;
+            ++count;
+            list[count] = atoms->image_jpeg;
+            ++count;
+        }
 
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
 
-	if (count)
-	{
-	    /* We have a list of ATOMs to send. */
-	    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, atoms->atom, 32,
-			 PropModeReplace, (unsigned char *) list, count);
-	    
-	    reply.xselection.property = e->property;
-	}
+        if (count) {
+            /* We have a list of ATOMs to send. */
+            XChangeProperty(xpbproxy_dpy, e->requestor, e->property,
+                            atoms->atom, 32, PropModeReplace,
+                            (unsigned char *) list, count);
+
+            reply.xselection.property = e->property;
+        }
     }
 
-    [self send_reply:&reply];
+ [self send_reply:&reply];
 }
 
-
-- (void) send_string:(XSelectionRequestEvent *)e utf8:(BOOL)utf8 pasteboard:(NSPasteboard *)pb
+ -(void) send_string:(XSelectionRequestEvent *)
+e utf8:(BOOL)
+utf8 pasteboard:(NSPasteboard *) pb
 {
     XEvent reply;
     NSArray *pbtypes;
@@ -671,162 +650,158 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
     const char *bytes;
     NSUInteger length;
 
-    TRACE ();
+    TRACE();
+
+ [self init_reply: &reply request:e];
 
-    [self init_reply:&reply request:e];
+    pbtypes =[pb types];
 
-    pbtypes = [pb types];
- 
-    if (![pbtypes containsObject:NSStringPboardType])
-    {
-	[self send_reply:&reply];
-	return;
+ if (![pbtypes containsObject:NSStringPboardType]) {
+ [self send_reply:&reply];
+        return;
     }
 
 #ifdef __LP64__
-    DebugF ("pbtypes retainCount after containsObject: %lu\n", [pbtypes retainCount]);
+    DebugF("pbtypes retainCount after containsObject: %lu\n",
+           [pbtypes retainCount]);
 #else
-    DebugF ("pbtypes retainCount after containsObject: %u\n", [pbtypes retainCount]);
+    DebugF("pbtypes retainCount after containsObject: %u\n",
+           [pbtypes retainCount]);
 #endif
 
-    data = [pb stringForType:NSStringPboardType];
+ data =[pb stringForType:NSStringPboardType];
 
-    if (nil == data)
-    {
-	[self send_reply:&reply];
-	return;
-    }
-
-    if (utf8) 
-    {
-	bytes = [data UTF8String];
-	/*
-	 * We don't want the UTF-8 string length here.  
-	 * We want the length in bytes.
-	 */
-	length = strlen (bytes);
-	
-	if (length < 50) {
-	    DebugF ("UTF-8: %s\n", bytes);
+    if (nil == data) {
+ [self send_reply:&reply];
+        return;
+    }
+
+    if (utf8) {
+        bytes =[data UTF8String];
+        /*
+         * We don't want the UTF-8 string length here.  
+         * We want the length in bytes.
+         */
+        length = strlen(bytes);
+
+        if (length < 50) {
+            DebugF("UTF-8: %s\n", bytes);
 #ifdef __LP64__
-	    DebugF ("UTF-8 length: %lu\n", length); 
+            DebugF("UTF-8 length: %lu\n", length);
 #else
-	    DebugF ("UTF-8 length: %u\n", length); 
+            DebugF("UTF-8 length: %u\n", length);
 #endif
-	}
-    } 
-    else 
-    {
-	DebugF ("Latin-1\n");
-	bytes = [data cStringUsingEncoding:NSISOLatin1StringEncoding];
-	/*WARNING: bytes is not NUL-terminated. */
-	length = [data lengthOfBytesUsingEncoding:NSISOLatin1StringEncoding];
-    }
-
-    DebugF ("e->target %s\n", XGetAtomName (xpbproxy_dpy, e->target));
-    
-    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, e->target,
-		     8, PropModeReplace, (unsigned char *) bytes, length);
-    
+        }
+    }
+    else {
+        DebugF("Latin-1\n");
+ bytes =[data cStringUsingEncoding:NSISOLatin1StringEncoding];
+        /*WARNING: bytes is not NUL-terminated. */
+ length =[data lengthOfBytesUsingEncoding:NSISOLatin1StringEncoding];
+    }
+
+    DebugF("e->target %s\n", XGetAtomName(xpbproxy_dpy, e->target));
+
+    XChangeProperty(xpbproxy_dpy, e->requestor, e->property, e->target,
+                    8, PropModeReplace, (unsigned char *) bytes, length);
+
     reply.xselection.property = e->property;
 
-    [self send_reply:&reply];
+ [self send_reply:&reply];
 }
 
-- (void) send_compound_text:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb
+ -(void) send_compound_text:(XSelectionRequestEvent *)
+e pasteboard:(NSPasteboard *) pb
 {
     XEvent reply;
     NSArray *pbtypes;
-    
-    TRACE ();
-    
-    [self init_reply:&reply request:e];
-     
-    pbtypes = [pb types];
-
-    if ([pbtypes containsObject: NSStringPboardType])
-    {
-	NSString *data = [pb stringForType:NSStringPboardType];
-	if (nil != data)
-	{
-	    /*
-	     * Cast to (void *) to avoid a const warning. 
-	     * AFAIK Xutf8TextListToTextProperty does not modify the input memory.
-	     */
-	    void *utf8 = (void *)[data UTF8String];
-	    char *list[] = { utf8, NULL };
-	    XTextProperty textprop;
-	    
-	    textprop.value = NULL;
-
-	    if (Success == Xutf8TextListToTextProperty (xpbproxy_dpy, list, 1,
-							XCompoundTextStyle,
-							&textprop))
-	    {
-		
-		if (8 != textprop.format)
-		    DebugF ("textprop.format is unexpectedly not 8 - it's %d instead\n",
-			textprop.format);
-
-		XChangeProperty (xpbproxy_dpy, e->requestor, e->property, 
-				 atoms->compound_text, textprop.format, 
-				 PropModeReplace, textprop.value,
-				 textprop.nitems);
-		
-		reply.xselection.property = e->property;
-	    }
-
-	    if (textprop.value)
- 		XFree (textprop.value);
-
-	}
-    }
-    
-    [self send_reply:&reply];
+
+    TRACE();
+
+ [self init_reply: &reply request:e];
+
+    pbtypes =[pb types];
+
+ if ([pbtypes containsObject:NSStringPboardType]) {
+ NSString *data =[pb stringForType:NSStringPboardType];
+
+        if (nil != data) {
+            /*
+             * Cast to (void *) to avoid a const warning. 
+             * AFAIK Xutf8TextListToTextProperty does not modify the input memory.
+             */
+            void *utf8 = (void *)[data UTF8String];
+            char *list[] = { utf8, NULL };
+            XTextProperty textprop;
+
+            textprop.value = NULL;
+
+            if (Success == Xutf8TextListToTextProperty(xpbproxy_dpy, list, 1,
+                                                       XCompoundTextStyle,
+                                                       &textprop)) {
+
+                if (8 != textprop.format)
+                    DebugF
+                        ("textprop.format is unexpectedly not 8 - it's %d instead\n",
+                         textprop.format);
+
+                XChangeProperty(xpbproxy_dpy, e->requestor, e->property,
+                                atoms->compound_text, textprop.format,
+                                PropModeReplace, textprop.value,
+                                textprop.nitems);
+
+                reply.xselection.property = e->property;
+            }
+
+            if (textprop.value)
+                XFree(textprop.value);
+
+        }
+    }
+
+ [self send_reply:&reply];
 }
 
 /* Finding a test application that uses MULTIPLE has proven to be difficult. */
-- (void) send_multiple:(XSelectionRequestEvent *)e
-{
+ -(void) send_multiple:(XSelectionRequestEvent *) e {
     XEvent reply;
 
-    TRACE ();
+    TRACE();
+
+ [self init_reply: &reply request:e];
 
-    [self init_reply:&reply request:e];
+    if (None != e->property) {
 
-    if (None != e->property) 
-    {
-	
     }
-    
-    [self send_reply:&reply];
+
+ [self send_reply:&reply];
 }
 
 /* Return nil if an error occured. */
 /* DO NOT retain the encdata for longer than the length of an event response.  
  * The autorelease pool will reuse/free it.
- */ 
-- (NSData *) encode_image_data:(NSData *)data type:(NSBitmapImageFileType)enctype
+ */
+ -(NSData *) encode_image_data:(NSData *)
+data type:(NSBitmapImageFileType) enctype
 {
-    NSBitmapImageRep *bmimage = nil; 
+    NSBitmapImageRep *bmimage = nil;
     NSData *encdata = nil;
     NSDictionary *dict = nil;
 
-    bmimage = [[NSBitmapImageRep alloc] initWithData:data];
+ bmimage =[[NSBitmapImageRep alloc] initWithData:data];
 
     if (nil == bmimage)
-	return nil;
+        return nil;
 
-    dict = [[NSDictionary alloc] init];
-    encdata = [bmimage representationUsingType:enctype properties:dict];
+    dict =[[NSDictionary alloc] init];
+ encdata =[bmimage representationUsingType: enctype properties:dict];
 
-    if (nil == encdata)
-    {
-	[dict autorelease];
-	[bmimage autorelease];
-	return nil;
+    if (nil == encdata) {
+        [dict autorelease];
+        [bmimage autorelease];
+        return nil;
     }
-    
+
     [dict autorelease];
     [bmimage autorelease];
 
@@ -835,60 +810,53 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 
 /* Return YES when an error has occured when trying to send the PICT. */
 /* The caller should send a default reponse with a property of None when an error occurs. */
-- (BOOL) send_image_pict_reply:(XSelectionRequestEvent *)e 
-		    pasteboard:(NSPasteboard *)pb 
-			  type:(NSBitmapImageFileType)imagetype
+ -(BOOL) send_image_pict_reply: (XSelectionRequestEvent *) e pasteboard: (NSPasteboard *) pb type:(NSBitmapImageFileType) imagetype
 {
     XEvent reply;
     NSImage *img = nil;
     NSData *data = nil, *encdata = nil;
     NSUInteger length;
     const void *bytes = NULL;
-    
-    img = [[NSImage alloc] initWithPasteboard:pb];
 
-    if (nil == img) 
-    {
-	return YES;
+ img =[[NSImage alloc] initWithPasteboard:pb];
+
+    if (nil == img) {
+        return YES;
     }
-	    
-    data = [img TIFFRepresentation];
 
-    if (nil == data)
-    {
-	[img autorelease];
-	ErrorF("unable to convert PICT to TIFF!\n");
-	return YES;
-    }
-        
-    encdata = [self encode_image_data:data type:imagetype];
-    if(nil == encdata)
-    {
-	[img autorelease];
-	return YES;
-    }
-
-    [self init_reply:&reply request:e];
-
-    length = [encdata length];
-    bytes = [encdata bytes];
-    
-    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, e->target,
-		     8, PropModeReplace, bytes, length);
+    data =[img TIFFRepresentation];
+
+    if (nil == data) {
+        [img autorelease];
+        ErrorF("unable to convert PICT to TIFF!\n");
+        return YES;
+    }
+
+ encdata =[self encode_image_data: data type:imagetype];
+    if (nil == encdata) {
+        [img autorelease];
+        return YES;
+    }
+
+ [self init_reply: &reply request:e];
+
+    length =[encdata length];
+    bytes =[encdata bytes];
+
+    XChangeProperty(xpbproxy_dpy, e->requestor, e->property, e->target,
+                    8, PropModeReplace, bytes, length);
     reply.xselection.property = e->property;
 
-    [self send_reply:&reply];
+ [self send_reply:&reply];
 
     [img autorelease];
 
-    return NO; /*no error*/
+    return NO;                  /*no error */
 }
 
 /* Return YES if an error occured. */
 /* The caller should send a reply with a property of None when an error occurs. */
-- (BOOL) send_image_tiff_reply:(XSelectionRequestEvent *)e
-		    pasteboard:(NSPasteboard *)pb 
-			  type:(NSBitmapImageFileType)imagetype
+ -(BOOL) send_image_tiff_reply: (XSelectionRequestEvent *) e pasteboard: (NSPasteboard *) pb type:(NSBitmapImageFileType) imagetype
 {
     XEvent reply;
     NSData *data = nil;
@@ -896,91 +864,87 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
     NSUInteger length;
     const void *bytes = NULL;
 
-    data = [pb dataForType:NSTIFFPboardType];
+ data =[pb dataForType:NSTIFFPboardType];
 
     if (nil == data)
- 	return YES;
-  
-    encdata = [self encode_image_data:data type:imagetype];
+        return YES;
+
+ encdata =[self encode_image_data: data type:imagetype];
 
-    if(nil == encdata)
-	return YES;
+    if (nil == encdata)
+        return YES;
+
+ [self init_reply: &reply request:e];
 
-    [self init_reply:&reply request:e];
+    length =[encdata length];
+    bytes =[encdata bytes];
 
-    length = [encdata length];
-    bytes = [encdata bytes];
-    
-    XChangeProperty (xpbproxy_dpy, e->requestor, e->property, e->target,
-		     8, PropModeReplace, bytes, length);
+    XChangeProperty(xpbproxy_dpy, e->requestor, e->property, e->target,
+                    8, PropModeReplace, bytes, length);
     reply.xselection.property = e->property;
-    
-    [self send_reply:&reply];
 
-    return NO; /*no error*/
+ [self send_reply:&reply];
+
+    return NO;                  /*no error */
 }
 
-- (void) send_image:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb
+ -(void) send_image:(XSelectionRequestEvent *)
+e pasteboard:(NSPasteboard *) pb
 {
     NSArray *pbtypes = nil;
     NSBitmapImageFileType imagetype = NSPNGFileType;
 
-    TRACE ();
+    TRACE();
 
     if (e->target == atoms->image_png)
-	imagetype = NSPNGFileType;
+        imagetype = NSPNGFileType;
     else if (e->target == atoms->image_jpeg)
-	imagetype = NSJPEGFileType;
-    else 
-    {
-	ErrorF("internal failure in xpbproxy!  imagetype being sent isn't PNG or JPEG.\n");
+        imagetype = NSJPEGFileType;
+    else {
+        ErrorF
+            ("internal failure in xpbproxy!  imagetype being sent isn't PNG or JPEG.\n");
     }
 
-    pbtypes = [pb types];
+    pbtypes =[pb types];
 
-    if (pbtypes) 
-    {
-	if ([pbtypes containsObject:NSTIFFPboardType])
-	{
-	    if (NO == [self send_image_tiff_reply:e pasteboard:pb type:imagetype]) 
-	  	return;
-	} 
+    if (pbtypes) {
+ if ([pbtypes containsObject:NSTIFFPboardType]) {
+ if (NO ==[self send_image_tiff_reply: e pasteboard: pb type:imagetype])
+                return;
+        }
 #ifdef __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // NSPICTPboardType
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"    // NSPICTPboardType
 #endif
-     	else if ([pbtypes containsObject:NSPICTPboardType])
+ else if ([pbtypes containsObject:NSPICTPboardType])
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
-	{
-	    if (NO == [self send_image_pict_reply:e pasteboard:pb type:imagetype]) 
-		return;
+        {
+ if (NO ==[self send_image_pict_reply: e pasteboard: pb type:imagetype])
+                return;
 
-	    /* Fall through intentionally to the send_none: */
-	}
+            /* Fall through intentionally to the send_none: */
+        }
     }
 
-    [self send_none:e];
+ [self send_none:e];
 }
 
-- (void)send_none:(XSelectionRequestEvent *)e
-{
+ -(void) send_none:(XSelectionRequestEvent *) e {
     XEvent reply;
 
-    TRACE ();
+    TRACE();
 
-    [self init_reply:&reply request:e];
-    [self send_reply:&reply];
+ [self init_reply: &reply request:e];
+ [self send_reply:&reply];
 }
 
-
 /* Another client requested the data or targets of data available from the clipboard. */
-- (void)request_event:(XSelectionRequestEvent *)e
-{
+ -(void) request_event:(XSelectionRequestEvent *) e {
     NSPasteboard *pb;
 
-    TRACE ();
+    TRACE();
 
     /* TODO We should also keep track of the time of the selection, and 
      * according to the ICCCM "refuse the request" if the event timestamp
@@ -992,388 +956,367 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
      * Perhaps we should just punt and ignore races.
      */
 
-    /*TODO we need a COMPOUND_TEXT test app*/
-    /*TODO we need a MULTIPLE test app*/
+    /*TODO we need a COMPOUND_TEXT test app */
+    /*TODO we need a MULTIPLE test app */
 
-    pb = [NSPasteboard generalPasteboard];
-    if (nil == pb) 
-    {
-	[self send_none:e];
-	return;
+    pb =[NSPasteboard generalPasteboard];
+    if (nil == pb) {
+ [self send_none:e];
+        return;
     }
-    
 
     if (None != e->target)
-	DebugF ("e->target %s\n", XGetAtomName (xpbproxy_dpy, e->target));
-
-    if (e->target == atoms->targets) 
-    {
-	/* The paste requestor wants to know what TARGETS we support. */
-	[self send_targets:e pasteboard:pb];
-    }
-    else if (e->target == atoms->multiple)
-    {
-	/*
-	 * This isn't finished, and may never be, unless I can find 
-	 * a good test app.
-	 */
-	[self send_multiple:e];
-    } 
-    else if (e->target == atoms->utf8_string)
-    {
-	[self send_string:e utf8:YES pasteboard:pb];
-    } 
-    else if (e->target == atoms->string)
-    {
-	[self send_string:e utf8:NO pasteboard:pb];
-    }
-    else if (e->target == atoms->compound_text)
-    {
-	[self send_compound_text:e pasteboard:pb];
-    }
-    else if (e->target == atoms->multiple)
-    {
-	[self send_multiple:e];
-    }
-    else if (e->target == atoms->image_png || e->target == atoms->image_jpeg)
-    {
-	[self send_image:e pasteboard:pb];
+        DebugF("e->target %s\n", XGetAtomName(xpbproxy_dpy, e->target));
+
+    if (e->target == atoms->targets) {
+        /* The paste requestor wants to know what TARGETS we support. */
+ [self send_targets: e pasteboard:pb];
     }
-    else
-    {
-	[self send_none:e];
+    else if (e->target == atoms->multiple) {
+        /*
+         * This isn't finished, and may never be, unless I can find 
+         * a good test app.
+         */
+ [self send_multiple:e];
+    }
+    else if (e->target == atoms->utf8_string) {
+ [self send_string: e utf8: YES pasteboard:pb];
+    }
+    else if (e->target == atoms->string) {
+ [self send_string: e utf8: NO pasteboard:pb];
+    }
+    else if (e->target == atoms->compound_text) {
+ [self send_compound_text: e pasteboard:pb];
+    }
+    else if (e->target == atoms->multiple) {
+ [self send_multiple:e];
+    }
+    else if (e->target == atoms->image_png || e->target == atoms->image_jpeg) {
+ [self send_image: e pasteboard:pb];
+    }
+    else {
+ [self send_none:e];
     }
 }
 
 /* This handles the events resulting from an XConvertSelection request. */
-- (void) notify_event:(XSelectionEvent *)e
-{
+ -(void) notify_event:(XSelectionEvent *) e {
     Atom type;
     struct propdata pdata;
-	
-    TRACE ();
+
+    TRACE();
 
     [self release_pending];
- 
+
     if (None == e->property) {
-	DebugF ("e->property is None.\n");
-	[self copy_completed:e->selection];
-	/* Nothing is selected. */
-	return;
+        DebugF("e->property is None.\n");
+ [self copy_completed:e->selection];
+        /* Nothing is selected. */
+        return;
     }
 
 #if 0
-    ErrorF("e->selection %s\n", XGetAtomName (xpbproxy_dpy, e->selection));
-    ErrorF("e->property %s\n", XGetAtomName (xpbproxy_dpy, e->property));
+    ErrorF("e->selection %s\n", XGetAtomName(xpbproxy_dpy, e->selection));
+    ErrorF("e->property %s\n", XGetAtomName(xpbproxy_dpy, e->property));
 #endif
 
-    if ([self is_incr_type:e]) 
-    {
-	/*
-	 * This is an INCR-style transfer, which means that we 
-	 * will get the data after a series of PropertyNotify events.
-	 */
-	DebugF ("is INCR\n");
+ if ([self is_incr_type:e]) {
+        /*
+         * This is an INCR-style transfer, which means that we 
+         * will get the data after a series of PropertyNotify events.
+         */
+        DebugF("is INCR\n");
 
-	if (get_property (e->requestor, e->property, &pdata, /*Delete*/ True, &type)) 
-	{
-	    /* 
-	     * An error occured, so we should invoke the copy_completed:, but
-	     * not handle_selection:type:propdata:
-	     */
-	    [self copy_completed:e->selection];
-	    return;
-	}
+        if (get_property
+            (e->requestor, e->property, &pdata, /*Delete */ True, &type)) {
+            /* 
+             * An error occured, so we should invoke the copy_completed:, but
+             * not handle_selection:type:propdata:
+             */
+ [self copy_completed:e->selection];
+            return;
+        }
 
-	free_propdata (&pdata);
+        free_propdata(&pdata);
 
-      	pending.requestor = e->requestor;
-	pending.selection = e->selection;
+        pending.requestor = e->requestor;
+        pending.selection = e->selection;
 
-	DebugF ("set pending.requestor to 0x%lx\n", pending.requestor);
+        DebugF("set pending.requestor to 0x%lx\n", pending.requestor);
     }
-    else
-    {
-	if (get_property (e->requestor, e->property, &pdata, /*Delete*/ True, &type))
-	{
-	    [self copy_completed:e->selection];
-	    return;
-	}
-
-	/* We have the complete selection data.*/
-	[self handle_selection:e->selection type:type propdata:&pdata];
-	
-	DebugF ("handled selection with the first notify_event\n");
+    else {
+        if (get_property
+            (e->requestor, e->property, &pdata, /*Delete */ True, &type)) {
+ [self copy_completed:e->selection];
+            return;
+        }
+
+        /* We have the complete selection data. */
+ [self handle_selection: e->selection type: type propdata:&pdata];
+
+        DebugF("handled selection with the first notify_event\n");
     }
 }
 
 /* This is used for INCR transfers.  See the ICCCM for the details. */
 /* This is used to retrieve PRIMARY and CLIPBOARD selections. */
-- (void) property_event:(XPropertyEvent *)e
-{
+ -(void) property_event:(XPropertyEvent *) e {
     struct propdata pdata;
     Atom type;
 
-    TRACE ();
-    
-    if (None != e->atom) 
-    {
+    TRACE();
+
+    if (None != e->atom) {
 #ifdef DEBUG
-	char *name = XGetAtomName (xpbproxy_dpy, e->atom);
+        char *name = XGetAtomName(xpbproxy_dpy, e->atom);
 
-	if (name) 
-	{
-	    DebugF ("e->atom %s\n", name);
-	    XFree(name);
-	}
+        if (name) {
+            DebugF("e->atom %s\n", name);
+            XFree(name);
+        }
 #endif
     }
 
-    if (None != pending.requestor && PropertyNewValue == e->state) 
-    {
-	DebugF ("pending.requestor 0x%lx\n", pending.requestor);
+    if (None != pending.requestor && PropertyNewValue == e->state) {
+        DebugF("pending.requestor 0x%lx\n", pending.requestor);
 
-	if (get_property (e->window, e->atom, &pdata, /*Delete*/ True, &type))
-        {
-	    [self copy_completed:pending.selection];
-	    [self release_pending];
-	    return;
-	}
-
-	if (0 == pdata.length) 
-	{
-	    /*
-	     * We completed the transfer.
-	     * handle_selection will call copy_completed: for us.
-	     */
-	    [self handle_selection:pending.selection type:type propdata:&pending.propdata];
-	    free_propdata(&pdata);
-	    pending.propdata = null_propdata;
-	    pending.requestor = None;
-	    pending.selection = None;
-	}
-	else 
-	{
-	    [self append_to_pending:&pdata requestor:e->window];
-	    free_propdata (&pdata);
-	}
+        if (get_property(e->window, e->atom, &pdata, /*Delete */ True, &type)) {
+ [self copy_completed:pending.selection];
+            [self release_pending];
+            return;
+        }
+
+        if (0 == pdata.length) {
+            /*
+             * We completed the transfer.
+             * handle_selection will call copy_completed: for us.
+             */
+ [self handle_selection: pending.selection type: type propdata:&pending.
+             propdata];
+            free_propdata(&pdata);
+            pending.propdata = null_propdata;
+            pending.requestor = None;
+            pending.selection = None;
+        }
+        else {
+ [self append_to_pending: &pdata requestor:e->window];
+            free_propdata(&pdata);
+        }
     }
 }
 
-- (void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *)e {
-    if(!pbproxy_prefs.active)
+ -(void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *) e {
+    if (!pbproxy_prefs.active)
         return;
-    
-    switch(e->subtype) {              
-        case XFixesSetSelectionOwnerNotify:
-            if(e->selection == atoms->primary && pbproxy_prefs.primary_on_grab)
-                [self x_copy:e->timestamp];
-            break;
-                
-        case XFixesSelectionWindowDestroyNotify:
-        case XFixesSelectionClientCloseNotify:
-        default:
-            ErrorF("Unhandled XFixesSelectionNotifyEvent: subtype=%d\n", e->subtype);
-            break;
+
+    switch (e->subtype) {
+    case XFixesSetSelectionOwnerNotify:
+        if (e->selection == atoms->primary && pbproxy_prefs.primary_on_grab)
+ [self x_copy:e->timestamp];
+        break;
+
+    case XFixesSelectionWindowDestroyNotify:
+    case XFixesSelectionClientCloseNotify:
+    default:
+        ErrorF("Unhandled XFixesSelectionNotifyEvent: subtype=%d\n",
+               e->subtype);
+        break;
     }
 }
 
-- (void) handle_targets: (Atom)selection propdata:(struct propdata *)pdata
+ -(void) handle_targets:(Atom)
+selection propdata:(struct propdata *) pdata
 {
     /* Find a type we can handle and prefer from the list of ATOMs. */
     Atom preferred;
     char *name;
 
-    TRACE ();
+    TRACE();
+
+ preferred =[self find_preferred:pdata];
 
-    preferred = [self find_preferred:pdata];
-    
-    if (None == preferred) 
-    {
-	/* 
-	 * This isn't required by the ICCCM, but some apps apparently 
-	 * don't respond to TARGETS properly.
-	 */
-	preferred = atoms->string;
+    if (None == preferred) {
+        /* 
+         * This isn't required by the ICCCM, but some apps apparently 
+         * don't respond to TARGETS properly.
+         */
+        preferred = atoms->string;
     }
 
-    (void)name; /* Avoid a warning with non-debug compiles. */
+    (void) name;                /* Avoid a warning with non-debug compiles. */
 #ifdef DEBUG
-    name = XGetAtomName (xpbproxy_dpy, preferred);
+    name = XGetAtomName(xpbproxy_dpy, preferred);
 
-    if (name)
-    {
-	DebugF ("requesting %s\n", name);
+    if (name) {
+        DebugF("requesting %s\n", name);
     }
 #endif
     request_atom = preferred;
-    XConvertSelection (xpbproxy_dpy, selection, preferred, selection,
-		       _selection_window, CurrentTime);    
+    XConvertSelection(xpbproxy_dpy, selection, preferred, selection,
+                      _selection_window, CurrentTime);
 }
 
 /* This handles the image type of selection (typically in CLIPBOARD). */
 /* We convert to a TIFF, so that other applications can paste more easily. */
-- (void) handle_image: (struct propdata *)pdata pasteboard:(NSPasteboard *)pb
+ -(void) handle_image:(struct propdata *)
+pdata pasteboard:(NSPasteboard *) pb
 {
     NSArray *pbtypes;
     NSUInteger length;
     NSData *data, *tiff;
     NSBitmapImageRep *bmimage;
 
-    TRACE ();
+    TRACE();
 
     length = pdata->length;
-    data = [[NSData alloc] initWithBytes:pdata->data length:length];
+ data =[[NSData alloc] initWithBytes: pdata->data length:length];
 
-    if (nil == data)
-    {
-	DebugF ("unable to create NSData object!\n");
-	return;
+    if (nil == data) {
+        DebugF("unable to create NSData object!\n");
+        return;
     }
 
 #ifdef __LP64__
-    DebugF ("data retainCount before NSBitmapImageRep initWithData: %lu\n",
-	[data retainCount]);
+    DebugF("data retainCount before NSBitmapImageRep initWithData: %lu\n",
+           [data retainCount]);
 #else
-    DebugF ("data retainCount before NSBitmapImageRep initWithData: %u\n",
-	[data retainCount]);
+    DebugF("data retainCount before NSBitmapImageRep initWithData: %u\n",
+           [data retainCount]);
 #endif
 
-    bmimage = [[NSBitmapImageRep alloc] initWithData:data];
+ bmimage =[[NSBitmapImageRep alloc] initWithData:data];
 
-    if (nil == bmimage)
-    {
-	[data autorelease];
-	DebugF ("unable to create NSBitmapImageRep!\n");
-	return;
+    if (nil == bmimage) {
+        [data autorelease];
+        DebugF("unable to create NSBitmapImageRep!\n");
+        return;
     }
 
 #ifdef __LP64__
-    DebugF ("data retainCount after NSBitmapImageRep initWithData: %lu\n", 
-	[data retainCount]);
+    DebugF("data retainCount after NSBitmapImageRep initWithData: %lu\n",
+           [data retainCount]);
 #else
-    DebugF ("data retainCount after NSBitmapImageRep initWithData: %u\n", 
-	[data retainCount]);
+    DebugF("data retainCount after NSBitmapImageRep initWithData: %u\n",
+           [data retainCount]);
 #endif
 
-    @try 
-    {
-	tiff = [bmimage TIFFRepresentation];
+    @try {
+        tiff =[bmimage TIFFRepresentation];
     }
 
-    @catch (NSException *e) 
-    {
-	DebugF ("NSTIFFException!\n");
-	[data autorelease];
-	[bmimage autorelease];
-	return;
+    @catch(NSException * e) {
+        DebugF("NSTIFFException!\n");
+        [data autorelease];
+        [bmimage autorelease];
+        return;
     }
-    
+
 #ifdef __LP64__
-    DebugF ("bmimage retainCount after TIFFRepresentation %lu\n", [bmimage retainCount]);
+    DebugF("bmimage retainCount after TIFFRepresentation %lu\n",
+           [bmimage retainCount]);
 #else
-    DebugF ("bmimage retainCount after TIFFRepresentation %u\n", [bmimage retainCount]);
+    DebugF("bmimage retainCount after TIFFRepresentation %u\n",
+           [bmimage retainCount]);
 #endif
 
-    pbtypes = [NSArray arrayWithObjects:NSTIFFPboardType, nil];
+ pbtypes =[NSArray arrayWithObjects:NSTIFFPboardType, nil];
 
-    if (nil == pbtypes)
-    {
-	[data autorelease];
-	[bmimage autorelease];
-	return;
+    if (nil == pbtypes) {
+        [data autorelease];
+        [bmimage autorelease];
+        return;
     }
 
-    [pb declareTypes:pbtypes owner:nil];
-    if (YES != [pb setData:tiff forType:NSTIFFPboardType])
-    {
-	DebugF ("writing pasteboard data failed!\n");
+ [pb declareTypes: pbtypes owner:nil];
+ if (YES !=[pb setData: tiff forType:NSTIFFPboardType]) {
+        DebugF("writing pasteboard data failed!\n");
     }
 
     [data autorelease];
 
 #ifdef __LP64__
-    DebugF ("bmimage retainCount before release %lu\n", [bmimage retainCount]);
+    DebugF("bmimage retainCount before release %lu\n",[bmimage retainCount]);
 #else
-    DebugF ("bmimage retainCount before release %u\n", [bmimage retainCount]);
+    DebugF("bmimage retainCount before release %u\n",[bmimage retainCount]);
 #endif
 
     [bmimage autorelease];
 }
 
 /* This handles the UTF8_STRING type of selection. */
-- (void) handle_utf8_string:(struct propdata *)pdata pasteboard:(NSPasteboard *)pb
+ -(void) handle_utf8_string:(struct propdata *)
+pdata pasteboard:(NSPasteboard *) pb
 {
     NSString *string;
     NSArray *pbtypes;
- 
-    TRACE ();
 
-    string = [[NSString alloc] initWithBytes:pdata->data length:pdata->length encoding:NSUTF8StringEncoding];
- 
+    TRACE();
+
+ string =[[NSString alloc] initWithBytes: pdata->data length: pdata->length encoding:NSUTF8StringEncoding];
+
     if (nil == string)
-	return;
+        return;
 
-    pbtypes = [NSArray arrayWithObjects:NSStringPboardType, nil];
+ pbtypes =[NSArray arrayWithObjects:NSStringPboardType, nil];
 
-    if (nil == pbtypes)
-    {
-	[string autorelease];
-	return;	
+    if (nil == pbtypes) {
+        [string autorelease];
+        return;
     }
 
-    [pb declareTypes:pbtypes owner:nil];
-    
-    if (YES != [pb setString:string forType:NSStringPboardType]) {
-	ErrorF("pasteboard setString:forType: failed!\n");
+ [pb declareTypes: pbtypes owner:nil];
+
+ if (YES !=[pb setString: string forType:NSStringPboardType]) {
+        ErrorF("pasteboard setString:forType: failed!\n");
     }
     [string autorelease];
-    DebugF ("done handling utf8 string\n");
+    DebugF("done handling utf8 string\n");
 }
 
 /* This handles the STRING type, which should be in Latin-1. */
-- (void) handle_string: (struct propdata *)pdata pasteboard:(NSPasteboard *)pb
+ -(void) handle_string:(struct propdata *)
+pdata pasteboard:(NSPasteboard *) pb
 {
-    NSString *string; 
+    NSString *string;
     NSArray *pbtypes;
 
-    TRACE ();
+    TRACE();
+
+ string =[[NSString alloc] initWithBytes: pdata->data length: pdata->length encoding:NSISOLatin1StringEncoding];
 
-    string = [[NSString alloc] initWithBytes:pdata->data length:pdata->length encoding:NSISOLatin1StringEncoding];
-    
     if (nil == string)
-	return;
+        return;
 
-    pbtypes = [NSArray arrayWithObjects:NSStringPboardType, nil];
+ pbtypes =[NSArray arrayWithObjects:NSStringPboardType, nil];
 
-    if (nil == pbtypes)
-    {
-	[string autorelease];
-	return;
+    if (nil == pbtypes) {
+        [string autorelease];
+        return;
     }
 
-    [pb declareTypes:pbtypes owner:nil];
-    if (YES != [pb setString:string forType:NSStringPboardType]) {
-	ErrorF("pasteboard setString:forType failed in handle_string!\n");
+ [pb declareTypes: pbtypes owner:nil];
+ if (YES !=[pb setString: string forType:NSStringPboardType]) {
+        ErrorF("pasteboard setString:forType failed in handle_string!\n");
     }
     [string autorelease];
 }
 
 /* This is called when the selection is completely retrieved from another client. */
 /* Warning: this frees the propdata. */
-- (void) handle_selection:(Atom)selection type:(Atom)type propdata:(struct propdata *)pdata
+ -(void) handle_selection:(Atom)
+selection type:(Atom)
+type propdata:(struct propdata *) pdata
 {
     NSPasteboard *pb;
 
-    TRACE ();
+    TRACE();
 
-    pb = [NSPasteboard generalPasteboard];
+    pb =[NSPasteboard generalPasteboard];
 
-    if (nil == pb) 
-    {
-	[self copy_completed:selection];
-	free_propdata (pdata);
-	return;
+    if (nil == pb) {
+ [self copy_completed:selection];
+        free_propdata(pdata);
+        return;
     }
 
     /*
@@ -1381,205 +1324,201 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
      * These aren't ICCCM compliant apps, but we need these to work... 
      */
     if (request_atom == atoms->targets
-	&& (type == atoms->atom || type == atoms->targets))
-    {
-	[self handle_targets:selection propdata:pdata];
-	free_propdata(pdata);
-	return;
-    } 
-    else if (type == atoms->image_png)
-    {
-	[self handle_image:pdata pasteboard:pb];
-    } 
-    else if (type == atoms->image_jpeg)
-    {
-	[self handle_image:pdata pasteboard:pb];
-    }
-    else if (type == atoms->utf8_string) 
-    {
-	[self handle_utf8_string:pdata pasteboard:pb];
-    } 
-    else if (type == atoms->string)
-    {
-	[self handle_string:pdata pasteboard:pb];
-    } 
-   
+        && (type == atoms->atom || type == atoms->targets)) {
+ [self handle_targets: selection propdata:pdata];
+        free_propdata(pdata);
+        return;
+    }
+    else if (type == atoms->image_png) {
+ [self handle_image: pdata pasteboard:pb];
+    }
+    else if (type == atoms->image_jpeg) {
+ [self handle_image: pdata pasteboard:pb];
+    }
+    else if (type == atoms->utf8_string) {
+ [self handle_utf8_string: pdata pasteboard:pb];
+    }
+    else if (type == atoms->string) {
+ [self handle_string: pdata pasteboard:pb];
+    }
+
     free_propdata(pdata);
 
-    [self copy_completed:selection];
+ [self copy_completed:selection];
 }
 
-
-- (void) copy_completed:(Atom)selection
-{
-    TRACE ();
+ -(void) copy_completed:(Atom) selection {
+    TRACE();
     char *name;
 
-    (void)name; /* Avoid warning with non-debug compiles. */
+    (void) name;                /* Avoid warning with non-debug compiles. */
 #ifdef DEBUG
-    name = XGetAtomName (xpbproxy_dpy, selection);
-    if (name)
-    {
-	DebugF ("copy_completed: %s\n", name);
-	XFree (name);
+    name = XGetAtomName(xpbproxy_dpy, selection);
+    if (name) {
+        DebugF("copy_completed: %s\n", name);
+        XFree(name);
     }
 #endif
 
-    if (selection == atoms->primary && pending_copy > 0)
-    {
-	--pending_copy;
-	if (pending_copy > 0)
-	{
-	    /* Copy PRIMARY again. */
-	    [self x_copy_request_targets];
-	    return;
-	}
-    }
-    else if (selection == atoms->clipboard && pending_clipboard > 0) 
-    {
-	--pending_clipboard;
-	if (pending_clipboard > 0) 
-	{
-	    /* Copy CLIPBOARD. */
-	    [self claim_clipboard];
-	    return;
-	} 
-	else 
-	{
-	    /* We got the final data.  Now set pbproxy as the owner. */
-	    [self own_clipboard];
-	    return;
-	}
-    }
-    
+    if (selection == atoms->primary && pending_copy > 0) {
+        --pending_copy;
+        if (pending_copy > 0) {
+            /* Copy PRIMARY again. */
+            [self x_copy_request_targets];
+            return;
+        }
+    }
+    else if (selection == atoms->clipboard && pending_clipboard > 0) {
+        --pending_clipboard;
+        if (pending_clipboard > 0) {
+            /* Copy CLIPBOARD. */
+            [self claim_clipboard];
+            return;
+        }
+        else {
+            /* We got the final data.  Now set pbproxy as the owner. */
+            [self own_clipboard];
+            return;
+        }
+    }
+
     /* 
      * We had 1 or more primary in progress, and the clipboard arrived
      * while we were busy. 
      */
-    if (pending_clipboard > 0)
-    {
-	[self claim_clipboard];
+    if (pending_clipboard > 0) {
+        [self claim_clipboard];
     }
 }
 
-- (void) reload_preferences
-{
+-(void) reload_preferences {
     /*
      * It's uncertain how we could handle the synchronization failing, so cast to void.
      * The prefs_get_bool should fall back to defaults if the org.x.X11 plist doesn't exist or is invalid.
      */
-    (void)CFPreferencesAppSynchronize(app_prefs_domain_cfstr);
+    (void) CFPreferencesAppSynchronize(app_prefs_domain_cfstr);
 #ifdef STANDALONE_XPBPROXY
-    if(xpbproxy_is_standalone)
+    if (xpbproxy_is_standalone)
         pbproxy_prefs.active = YES;
     else
 #endif
-    pbproxy_prefs.active = prefs_get_bool(CFSTR("sync_pasteboard"), pbproxy_prefs.active);
-    pbproxy_prefs.primary_on_grab = prefs_get_bool(CFSTR("sync_primary_on_select"), pbproxy_prefs.primary_on_grab);
-    pbproxy_prefs.clipboard_to_pasteboard = prefs_get_bool(CFSTR("sync_clipboard_to_pasteboard"), pbproxy_prefs.clipboard_to_pasteboard);
-    pbproxy_prefs.pasteboard_to_primary = prefs_get_bool(CFSTR("sync_pasteboard_to_primary"), pbproxy_prefs.pasteboard_to_primary);
-    pbproxy_prefs.pasteboard_to_clipboard =  prefs_get_bool(CFSTR("sync_pasteboard_to_clipboard"), pbproxy_prefs.pasteboard_to_clipboard);
+        pbproxy_prefs.active =
+            prefs_get_bool(CFSTR("sync_pasteboard"), pbproxy_prefs.active);
+    pbproxy_prefs.primary_on_grab =
+        prefs_get_bool(CFSTR("sync_primary_on_select"),
+                       pbproxy_prefs.primary_on_grab);
+    pbproxy_prefs.clipboard_to_pasteboard =
+        prefs_get_bool(CFSTR("sync_clipboard_to_pasteboard"),
+                       pbproxy_prefs.clipboard_to_pasteboard);
+    pbproxy_prefs.pasteboard_to_primary =
+        prefs_get_bool(CFSTR("sync_pasteboard_to_primary"),
+                       pbproxy_prefs.pasteboard_to_primary);
+    pbproxy_prefs.pasteboard_to_clipboard =
+        prefs_get_bool(CFSTR("sync_pasteboard_to_clipboard"),
+                       pbproxy_prefs.pasteboard_to_clipboard);
 
     /* This is used for debugging. */
     //dump_prefs();
 
-    if(pbproxy_prefs.active && pbproxy_prefs.primary_on_grab && !xpbproxy_have_xfixes) {
-        ErrorF("Disabling sync_primary_on_select functionality due to missing XFixes extension.\n");
+    if (pbproxy_prefs.active && pbproxy_prefs.primary_on_grab &&
+        !xpbproxy_have_xfixes) {
+        ErrorF
+            ("Disabling sync_primary_on_select functionality due to missing XFixes extension.\n");
         pbproxy_prefs.primary_on_grab = NO;
     }
 
     /* Claim or release the CLIPBOARD_MANAGER atom */
-    if(![self set_clipboard_manager_status:(pbproxy_prefs.active && pbproxy_prefs.clipboard_to_pasteboard)])
+ if (![self set_clipboard_manager_status:(pbproxy_prefs.active &&
+     pbproxy_prefs.
+     clipboard_to_pasteboard)])
         pbproxy_prefs.clipboard_to_pasteboard = NO;
-    
-    if(pbproxy_prefs.active && pbproxy_prefs.clipboard_to_pasteboard)
+
+    if (pbproxy_prefs.active && pbproxy_prefs.clipboard_to_pasteboard)
         [self claim_clipboard];
 }
 
-- (BOOL) is_active 
-{
+-(BOOL) is_active {
     return pbproxy_prefs.active;
 }
 
 /* NSPasteboard-required methods */
 
-- (void) paste:(id)sender
-{
-    TRACE ();
+ -(void) paste:(id) sender {
+    TRACE();
 }
 
-- (void) pasteboard:(NSPasteboard *)pb provideDataForType:(NSString *)type
+ -(void) pasteboard:(NSPasteboard *)
+pb provideDataForType:(NSString *) type
 {
-    TRACE ();
+    TRACE();
 }
 
-- (void) pasteboardChangedOwner:(NSPasteboard *)pb
-{
-    TRACE ();
+ -(void) pasteboardChangedOwner:(NSPasteboard *) pb {
+    TRACE();
 
     /* Right now we don't care with this. */
 }
 
 /* Allocation */
 
-- init
-{
+-init {
     unsigned long pixel;
 
-    self = [super init];
+    self =[super init];
     if (self == nil)
-	return nil;
-
-    atoms->primary = XInternAtom (xpbproxy_dpy, "PRIMARY", False);
-    atoms->clipboard = XInternAtom (xpbproxy_dpy, "CLIPBOARD", False);
-    atoms->text = XInternAtom (xpbproxy_dpy, "TEXT", False);
-    atoms->utf8_string = XInternAtom (xpbproxy_dpy, "UTF8_STRING", False);
-    atoms->string = XInternAtom (xpbproxy_dpy, "STRING", False);
-    atoms->targets = XInternAtom (xpbproxy_dpy, "TARGETS", False);
-    atoms->multiple = XInternAtom (xpbproxy_dpy, "MULTIPLE", False);
-    atoms->cstring = XInternAtom (xpbproxy_dpy, "CSTRING", False);
-    atoms->image_png = XInternAtom (xpbproxy_dpy, "image/png", False);
-    atoms->image_jpeg = XInternAtom (xpbproxy_dpy, "image/jpeg", False);
-    atoms->incr = XInternAtom (xpbproxy_dpy, "INCR", False);
-    atoms->atom = XInternAtom (xpbproxy_dpy, "ATOM", False);
-    atoms->clipboard_manager = XInternAtom (xpbproxy_dpy, "CLIPBOARD_MANAGER", False);
-    atoms->compound_text = XInternAtom (xpbproxy_dpy, "COMPOUND_TEXT", False);
-    atoms->atom_pair = XInternAtom (xpbproxy_dpy, "ATOM_PAIR", False);
-
-    pixel = BlackPixel (xpbproxy_dpy, DefaultScreen (xpbproxy_dpy));
-    _selection_window = XCreateSimpleWindow (xpbproxy_dpy, DefaultRootWindow (xpbproxy_dpy),
-					     0, 0, 1, 1, 0, pixel, pixel);
+        return nil;
+
+    atoms->primary = XInternAtom(xpbproxy_dpy, "PRIMARY", False);
+    atoms->clipboard = XInternAtom(xpbproxy_dpy, "CLIPBOARD", False);
+    atoms->text = XInternAtom(xpbproxy_dpy, "TEXT", False);
+    atoms->utf8_string = XInternAtom(xpbproxy_dpy, "UTF8_STRING", False);
+    atoms->string = XInternAtom(xpbproxy_dpy, "STRING", False);
+    atoms->targets = XInternAtom(xpbproxy_dpy, "TARGETS", False);
+    atoms->multiple = XInternAtom(xpbproxy_dpy, "MULTIPLE", False);
+    atoms->cstring = XInternAtom(xpbproxy_dpy, "CSTRING", False);
+    atoms->image_png = XInternAtom(xpbproxy_dpy, "image/png", False);
+    atoms->image_jpeg = XInternAtom(xpbproxy_dpy, "image/jpeg", False);
+    atoms->incr = XInternAtom(xpbproxy_dpy, "INCR", False);
+    atoms->atom = XInternAtom(xpbproxy_dpy, "ATOM", False);
+    atoms->clipboard_manager =
+        XInternAtom(xpbproxy_dpy, "CLIPBOARD_MANAGER", False);
+    atoms->compound_text = XInternAtom(xpbproxy_dpy, "COMPOUND_TEXT", False);
+    atoms->atom_pair = XInternAtom(xpbproxy_dpy, "ATOM_PAIR", False);
+
+    pixel = BlackPixel(xpbproxy_dpy, DefaultScreen(xpbproxy_dpy));
+    _selection_window =
+        XCreateSimpleWindow(xpbproxy_dpy, DefaultRootWindow(xpbproxy_dpy), 0, 0,
+                            1, 1, 0, pixel, pixel);
 
     /* This is used to get PropertyNotify events when doing INCR transfers. */
-    XSelectInput (xpbproxy_dpy, _selection_window, PropertyChangeMask);
+    XSelectInput(xpbproxy_dpy, _selection_window, PropertyChangeMask);
 
     request_atom = None;
 
-    init_propdata (&pending.propdata);
+    init_propdata(&pending.propdata);
     pending.requestor = None;
     pending.selection = None;
 
     pending_copy = 0;
     pending_clipboard = 0;
 
-    if(xpbproxy_have_xfixes)
-        XFixesSelectSelectionInput(xpbproxy_dpy, _selection_window, atoms->primary, 
+    if (xpbproxy_have_xfixes)
+        XFixesSelectSelectionInput(xpbproxy_dpy, _selection_window,
+                                   atoms->primary,
                                    XFixesSetSelectionOwnerNotifyMask);
 
     [self reload_preferences];
-    
+
     return self;
 }
 
-- (void) dealloc
-{
-    if (None != _selection_window)
-    {
-	XDestroyWindow (xpbproxy_dpy, _selection_window);
-	_selection_window = None;
+-(void) dealloc {
+    if (None != _selection_window) {
+        XDestroyWindow(xpbproxy_dpy, _selection_window);
+        _selection_window = None;
     }
 
-    free_propdata (&pending.propdata);
+    free_propdata(&pending.propdata);
 
     [super dealloc];
 }
diff --git a/xorg-server/hw/xquartz/pseudoramiX.c b/xorg-server/hw/xquartz/pseudoramiX.c
index 5a5b9c2e7..f5375039b 100644
--- a/xorg-server/hw/xquartz/pseudoramiX.c
+++ b/xorg-server/hw/xquartz/pseudoramiX.c
@@ -47,9 +47,9 @@ Equipment Corporation.
 
 Bool noPseudoramiXExtension = FALSE;
 
-extern int ProcPanoramiXQueryVersion (ClientPtr client);
+extern int ProcPanoramiXQueryVersion(ClientPtr client);
 
-static void PseudoramiXResetProc(ExtensionEntry *extEntry);
+static void PseudoramiXResetProc(ExtensionEntry * extEntry);
 
 static int ProcPseudoramiXQueryVersion(ClientPtr client);
 static int ProcPseudoramiXGetState(ClientPtr client);
@@ -67,7 +67,6 @@ static int SProcPseudoramiXIsActive(ClientPtr client);
 static int SProcPseudoramiXQueryScreens(ClientPtr client);
 static int SProcPseudoramiXDispatch(ClientPtr client);
 
-
 typedef struct {
     int x;
     int y;
@@ -80,7 +79,6 @@ static int pseudoramiXScreensAllocated = 0;
 static int pseudoramiXNumScreens = 0;
 static unsigned long pseudoramiXGeneration = 0;
 
-
 // Add a PseudoramiX screen.
 // The rest of the X server will know nothing about this screen.
 // Can be called before or after extension init.
@@ -90,13 +88,14 @@ PseudoramiXAddScreen(int x, int y, int w, int h)
 {
     PseudoramiXScreenRec *s;
 
-    if (noPseudoramiXExtension) return;
+    if (noPseudoramiXExtension)
+        return;
 
     if (pseudoramiXNumScreens == pseudoramiXScreensAllocated) {
         pseudoramiXScreensAllocated += pseudoramiXScreensAllocated + 1;
         pseudoramiXScreens = realloc(pseudoramiXScreens,
-                                      pseudoramiXScreensAllocated *
-                                      sizeof(PseudoramiXScreenRec));
+                                     pseudoramiXScreensAllocated *
+                                     sizeof(PseudoramiXScreenRec));
     }
 
     DEBUG_LOG("x: %d, y: %d, w: %d, h: %d\n", x, y, w, h);
@@ -108,15 +107,16 @@ PseudoramiXAddScreen(int x, int y, int w, int h)
     s->h = h;
 }
 
-
 // Initialize PseudoramiX.
 // Copied from PanoramiXExtensionInit
-void PseudoramiXExtensionInit(int argc, char *argv[])
+void
+PseudoramiXExtensionInit(int argc, char *argv[])
 {
-    Bool	     	success = FALSE;
-    ExtensionEntry 	*extEntry;
+    Bool success = FALSE;
+    ExtensionEntry *extEntry;
 
-    if (noPseudoramiXExtension) return;
+    if (noPseudoramiXExtension)
+        return;
 
     TRACE();
 
@@ -134,11 +134,11 @@ void PseudoramiXExtensionInit(int argc, char *argv[])
         extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
                                 ProcPseudoramiXDispatch,
                                 SProcPseudoramiXDispatch,
-                                PseudoramiXResetProc,
-                                StandardMinorOpcode);
+                                PseudoramiXResetProc, StandardMinorOpcode);
         if (!extEntry) {
             ErrorF("PseudoramiXExtensionInit(): AddExtension failed\n");
-        } else {
+        }
+        else {
             pseudoramiXGeneration = serverGeneration;
             success = TRUE;
         }
@@ -151,34 +151,34 @@ void PseudoramiXExtensionInit(int argc, char *argv[])
     }
 }
 
-
-void PseudoramiXResetScreens(void)
+void
+PseudoramiXResetScreens(void)
 {
     TRACE();
 
     pseudoramiXNumScreens = 0;
 }
 
-
-static void PseudoramiXResetProc(ExtensionEntry *extEntry)
+static void
+PseudoramiXResetProc(ExtensionEntry * extEntry)
 {
     TRACE();
 
     PseudoramiXResetScreens();
 }
 
-
 // was PanoramiX
-static int ProcPseudoramiXQueryVersion(ClientPtr client)
+static int
+ProcPseudoramiXQueryVersion(ClientPtr client)
 {
     TRACE();
 
     return ProcPanoramiXQueryVersion(client);
 }
 
-
 // was PanoramiX
-static int ProcPseudoramiXGetState(ClientPtr client)
+static int
+ProcPseudoramiXGetState(ClientPtr client)
 {
     REQUEST(xPanoramiXGetStateReq);
     WindowPtr pWin;
@@ -186,11 +186,11 @@ static int ProcPseudoramiXGetState(ClientPtr client)
     register int rc;
 
     TRACE();
-    
+
     REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -201,13 +201,13 @@ static int ProcPseudoramiXGetState(ClientPtr client)
         swapl(&rep.length);
         swaps(&rep.state);
     }
-    WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) &rep);
+    WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *) &rep);
     return Success;
 }
 
-
 // was PanoramiX
-static int ProcPseudoramiXGetScreenCount(ClientPtr client)
+static int
+ProcPseudoramiXGetScreenCount(ClientPtr client)
 {
     REQUEST(xPanoramiXGetScreenCountReq);
     WindowPtr pWin;
@@ -215,11 +215,11 @@ static int ProcPseudoramiXGetScreenCount(ClientPtr client)
     register int rc;
 
     TRACE();
-    
+
     REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -230,31 +230,31 @@ static int ProcPseudoramiXGetScreenCount(ClientPtr client)
         swapl(&rep.length);
         swaps(&rep.ScreenCount);
     }
-    WriteToClient (client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
+    WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *) &rep);
     return Success;
 }
 
-
 // was PanoramiX
-static int ProcPseudoramiXGetScreenSize(ClientPtr client)
+static int
+ProcPseudoramiXGetScreenSize(ClientPtr client)
 {
     REQUEST(xPanoramiXGetScreenSizeReq);
-    WindowPtr			pWin;
-    xPanoramiXGetScreenSizeReply	rep;
-    register int			n, rc;
+    WindowPtr pWin;
+    xPanoramiXGetScreenSizeReply rep;
+    register int n, rc;
 
     TRACE();
-    
+
     REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
     /* screen dimensions */
-    rep.width  = pseudoramiXScreens[stuff->screen].w;
+    rep.width = pseudoramiXScreens[stuff->screen].w;
     // was screenInfo.screens[stuff->screen]->width;
     rep.height = pseudoramiXScreens[stuff->screen].h;
     // was screenInfo.screens[stuff->screen]->height;
@@ -264,19 +264,19 @@ static int ProcPseudoramiXGetScreenSize(ClientPtr client)
         swaps(&rep.width);
         swaps(&rep.height);
     }
-    WriteToClient (client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
+    WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *) &rep);
     return Success;
 }
 
-
 // was Xinerama
-static int ProcPseudoramiXIsActive(ClientPtr client)
+static int
+ProcPseudoramiXIsActive(ClientPtr client)
 {
     /* REQUEST(xXineramaIsActiveReq); */
-    xXineramaIsActiveReply	rep;
+    xXineramaIsActiveReply rep;
 
     TRACE();
-    
+
     REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
 
     rep.type = X_Reply;
@@ -284,23 +284,24 @@ static int ProcPseudoramiXIsActive(ClientPtr client)
     rep.sequenceNumber = client->sequence;
     rep.state = !noPseudoramiXExtension;
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.state);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.state);
     }
-    WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep);
+    WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *) &rep);
     return Success;
 }
 
-
 // was Xinerama
-static int ProcPseudoramiXQueryScreens(ClientPtr client)
+static int
+ProcPseudoramiXQueryScreens(ClientPtr client)
 {
     /* REQUEST(xXineramaQueryScreensReq); */
-    xXineramaQueryScreensReply	rep;
+    xXineramaQueryScreensReply rep;
+
+    DEBUG_LOG("noPseudoramiXExtension=%d, pseudoramiXNumScreens=%d\n",
+              noPseudoramiXExtension, pseudoramiXNumScreens);
 
-    DEBUG_LOG("noPseudoramiXExtension=%d, pseudoramiXNumScreens=%d\n", noPseudoramiXExtension, pseudoramiXNumScreens);
-    
     REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
 
     rep.type = X_Reply;
@@ -308,155 +309,150 @@ static int ProcPseudoramiXQueryScreens(ClientPtr client)
     rep.number = noPseudoramiXExtension ? 0 : pseudoramiXNumScreens;
     rep.length = bytes_to_int32(rep.number * sz_XineramaScreenInfo);
     if (client->swapped) {
-	swaps(&rep.sequenceNumber);
-	swapl(&rep.length);
-	swapl(&rep.number);
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.number);
     }
-    WriteToClient (client, sizeof (xXineramaQueryScreensReply), (char *) &rep);
+    WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *) &rep);
 
     if (!noPseudoramiXExtension) {
-	xXineramaScreenInfo scratch;
-	int i;
-
-	for(i = 0; i < pseudoramiXNumScreens; i++) {
-	    scratch.x_org  = pseudoramiXScreens[i].x;
-	    scratch.y_org  = pseudoramiXScreens[i].y;
-	    scratch.width  = pseudoramiXScreens[i].w;
-	    scratch.height = pseudoramiXScreens[i].h;
-
-	    if(client->swapped) {
-		swaps(&scratch.x_org);
-		swaps(&scratch.y_org);
-		swaps(&scratch.width);
-		swaps(&scratch.height);
-	    }
-	    WriteToClient (client, sz_XineramaScreenInfo, (char *) &scratch);
-	}
+        xXineramaScreenInfo scratch;
+        int i;
+
+        for (i = 0; i < pseudoramiXNumScreens; i++) {
+            scratch.x_org = pseudoramiXScreens[i].x;
+            scratch.y_org = pseudoramiXScreens[i].y;
+            scratch.width = pseudoramiXScreens[i].w;
+            scratch.height = pseudoramiXScreens[i].h;
+
+            if (client->swapped) {
+                swaps(&scratch.x_org);
+                swaps(&scratch.y_org);
+                swaps(&scratch.width);
+                swaps(&scratch.height);
+            }
+            WriteToClient(client, sz_XineramaScreenInfo, (char *) &scratch);
+        }
     }
 
     return Success;
 }
 
-
 // was PanoramiX
-static int ProcPseudoramiXDispatch (ClientPtr client)
-{   REQUEST(xReq);
+static int
+ProcPseudoramiXDispatch(ClientPtr client)
+{
+    REQUEST(xReq);
     TRACE();
-    switch (stuff->data)
-    {
-	case X_PanoramiXQueryVersion:
-	     return ProcPseudoramiXQueryVersion(client);
-	case X_PanoramiXGetState:
-	     return ProcPseudoramiXGetState(client);
-	case X_PanoramiXGetScreenCount:
-	     return ProcPseudoramiXGetScreenCount(client);
-	case X_PanoramiXGetScreenSize:
-	     return ProcPseudoramiXGetScreenSize(client);
-	case X_XineramaIsActive:
-	     return ProcPseudoramiXIsActive(client);
-	case X_XineramaQueryScreens:
-	     return ProcPseudoramiXQueryScreens(client);
+    switch (stuff->data) {
+    case X_PanoramiXQueryVersion:
+        return ProcPseudoramiXQueryVersion(client);
+    case X_PanoramiXGetState:
+        return ProcPseudoramiXGetState(client);
+    case X_PanoramiXGetScreenCount:
+        return ProcPseudoramiXGetScreenCount(client);
+    case X_PanoramiXGetScreenSize:
+        return ProcPseudoramiXGetScreenSize(client);
+    case X_XineramaIsActive:
+        return ProcPseudoramiXIsActive(client);
+    case X_XineramaQueryScreens:
+        return ProcPseudoramiXQueryScreens(client);
     }
     return BadRequest;
 }
 
-
-
 static int
-SProcPseudoramiXQueryVersion (ClientPtr client)
+SProcPseudoramiXQueryVersion(ClientPtr client)
 {
-	REQUEST(xPanoramiXQueryVersionReq);
+    REQUEST(xPanoramiXQueryVersionReq);
 
     TRACE();
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
-	return ProcPseudoramiXQueryVersion(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xPanoramiXQueryVersionReq);
+    return ProcPseudoramiXQueryVersion(client);
 }
 
 static int
 SProcPseudoramiXGetState(ClientPtr client)
 {
-	REQUEST(xPanoramiXGetStateReq);
+    REQUEST(xPanoramiXGetStateReq);
 
     TRACE();
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-	return ProcPseudoramiXGetState(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
+    return ProcPseudoramiXGetState(client);
 }
 
 static int
 SProcPseudoramiXGetScreenCount(ClientPtr client)
 {
-	REQUEST(xPanoramiXGetScreenCountReq);
+    REQUEST(xPanoramiXGetScreenCountReq);
 
     TRACE();
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-	return ProcPseudoramiXGetScreenCount(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
+    return ProcPseudoramiXGetScreenCount(client);
 }
 
 static int
 SProcPseudoramiXGetScreenSize(ClientPtr client)
 {
-	REQUEST(xPanoramiXGetScreenSizeReq);
+    REQUEST(xPanoramiXGetScreenSizeReq);
 
     TRACE();
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-	return ProcPseudoramiXGetScreenSize(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
+    return ProcPseudoramiXGetScreenSize(client);
 }
 
-
 static int
 SProcPseudoramiXIsActive(ClientPtr client)
 {
-	REQUEST(xXineramaIsActiveReq);
+    REQUEST(xXineramaIsActiveReq);
 
     TRACE();
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
-	return ProcPseudoramiXIsActive(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
+    return ProcPseudoramiXIsActive(client);
 }
 
-
 static int
 SProcPseudoramiXQueryScreens(ClientPtr client)
 {
-	REQUEST(xXineramaQueryScreensReq);
+    REQUEST(xXineramaQueryScreensReq);
 
     TRACE();
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
-	return ProcPseudoramiXQueryScreens(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
+    return ProcPseudoramiXQueryScreens(client);
 }
 
-
 static int
-SProcPseudoramiXDispatch (ClientPtr client)
-{   REQUEST(xReq);
+SProcPseudoramiXDispatch(ClientPtr client)
+{
+    REQUEST(xReq);
 
     TRACE();
 
-    switch (stuff->data)
-    {
-	case X_PanoramiXQueryVersion:
-	     return SProcPseudoramiXQueryVersion(client);
-	case X_PanoramiXGetState:
-	     return SProcPseudoramiXGetState(client);
-	case X_PanoramiXGetScreenCount:
-	     return SProcPseudoramiXGetScreenCount(client);
-	case X_PanoramiXGetScreenSize:
-	     return SProcPseudoramiXGetScreenSize(client);
-	case X_XineramaIsActive:
-	     return SProcPseudoramiXIsActive(client);
-	case X_XineramaQueryScreens:
-	     return SProcPseudoramiXQueryScreens(client);
+    switch (stuff->data) {
+    case X_PanoramiXQueryVersion:
+        return SProcPseudoramiXQueryVersion(client);
+    case X_PanoramiXGetState:
+        return SProcPseudoramiXGetState(client);
+    case X_PanoramiXGetScreenCount:
+        return SProcPseudoramiXGetScreenCount(client);
+    case X_PanoramiXGetScreenSize:
+        return SProcPseudoramiXGetScreenSize(client);
+    case X_XineramaIsActive:
+        return SProcPseudoramiXIsActive(client);
+    case X_XineramaQueryScreens:
+        return SProcPseudoramiXQueryScreens(client);
     }
     return BadRequest;
 }
diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index c395b42e6..e4578cc3e 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -68,10 +68,10 @@
 #include <rootlessCommon.h>
 #include <Xplugin.h>
 
-DevPrivateKeyRec        quartzScreenKeyRec;
-int                     aquaMenuBarHeight = 0;
-QuartzModeProcsPtr      quartzProcs = NULL;
-const char             *quartzOpenGLBundle = NULL;
+DevPrivateKeyRec quartzScreenKeyRec;
+int aquaMenuBarHeight = 0;
+QuartzModeProcsPtr quartzProcs = NULL;
+const char *quartzOpenGLBundle = NULL;
 
 Bool XQuartzFullscreenDisableHotkeys = TRUE;
 Bool XQuartzOptionSendsAlt = FALSE;
@@ -96,9 +96,8 @@ int32_t XQuartzShieldingWindowLevel = 0;
  * QuartzAddScreen
  *  Do mode dependent initialization of each screen for Quartz.
  */
-Bool QuartzAddScreen(
-    int index,
-    ScreenPtr pScreen)
+Bool
+QuartzAddScreen(int index, ScreenPtr pScreen)
 {
     // allocate space for private per screen Quartz specific storage
     QuartzScreenPtr displayInfo = calloc(sizeof(QuartzScreenRec), 1);
@@ -110,25 +109,23 @@ Bool QuartzAddScreen(
     return quartzProcs->AddScreen(index, pScreen);
 }
 
-
 /*
  * QuartzSetupScreen
  *  Finalize mode specific setup of each screen.
  */
-Bool QuartzSetupScreen(
-    int index,
-    ScreenPtr pScreen)
+Bool
+QuartzSetupScreen(int index, ScreenPtr pScreen)
 {
     // do Quartz mode specific setup
-    if (! quartzProcs->SetupScreen(index, pScreen))
+    if (!quartzProcs->SetupScreen(index, pScreen))
         return FALSE;
 
     // setup cursor support
-    if (! quartzProcs->InitCursor(pScreen))
+    if (!quartzProcs->InitCursor(pScreen))
         return FALSE;
 
 #if defined(RANDR)
-    if(!QuartzRandRInit(pScreen)) {
+    if (!QuartzRandRInit(pScreen)) {
         DEBUG_LOG("Failed to init RandR extension.\n");
         return FALSE;
     }
@@ -137,14 +134,12 @@ Bool QuartzSetupScreen(
     return TRUE;
 }
 
-
 /*
  * QuartzInitOutput
  *  Quartz display initialization.
  */
-void QuartzInitOutput(
-    int argc,
-    char **argv )
+void
+QuartzInitOutput(int argc, char **argv)
 {
     /* For XQuartz, we want to just use the default signal handler to work better with CrashTracer */
     signal(SIGSEGV, SIG_DFL);
@@ -167,27 +162,23 @@ void QuartzInitOutput(
 #endif
 
     if (!RegisterBlockAndWakeupHandlers(QuartzBlockHandler,
-                                        QuartzWakeupHandler,
-                                        NULL))
-    {
+                                        QuartzWakeupHandler, NULL)) {
         FatalError("Could not register block and wakeup handlers.");
     }
 
     if (!dixRegisterPrivateKey(&quartzScreenKeyRec, PRIVATE_SCREEN, 0))
-	FatalError("Failed to alloc quartz screen private.\n");
+        FatalError("Failed to alloc quartz screen private.\n");
 
     // Do display mode specific initialization
     quartzProcs->DisplayInit();
 }
 
-
 /*
  * QuartzInitInput
  *  Inform the main thread the X server is ready to handle events.
  */
-void QuartzInitInput(
-    int argc,
-    char **argv )
+void
+QuartzInitInput(int argc, char **argv)
 {
     X11ApplicationSetCanQuit(0);
     X11ApplicationServerReady();
@@ -196,44 +187,44 @@ void QuartzInitInput(
         quartzProcs->InitInput(argc, argv);
 }
 
-
-void QuartzUpdateScreens(void) {
+void
+QuartzUpdateScreens(void)
+{
     ScreenPtr pScreen;
     WindowPtr pRoot;
     int x, y, width, height, sx, sy;
     xEvent e;
     BoxRec bounds;
-    
-    if (noPseudoramiXExtension || screenInfo.numScreens != 1)
-    {
+
+    if (noPseudoramiXExtension || screenInfo.numScreens != 1) {
         /* FIXME: if not using Xinerama, we have multiple screens, and
-         to do this properly may need to add or remove screens. Which
-         isn't possible. So don't do anything. Another reason why
-         we default to running with Xinerama. */
-        
+           to do this properly may need to add or remove screens. Which
+           isn't possible. So don't do anything. Another reason why
+           we default to running with Xinerama. */
+
         return;
     }
-    
+
     pScreen = screenInfo.screens[0];
-    
+
     PseudoramiXResetScreens();
     quartzProcs->AddPseudoramiXScreens(&x, &y, &width, &height, pScreen);
-    
+
     pScreen->x = x;
     pScreen->y = y;
     pScreen->mmWidth = pScreen->mmWidth * ((double) width / pScreen->width);
     pScreen->mmHeight = pScreen->mmHeight * ((double) height / pScreen->height);
     pScreen->width = width;
     pScreen->height = height;
-    
+
     DarwinAdjustScreenOrigins(&screenInfo);
-    
+
     /* DarwinAdjustScreenOrigins or UpdateScreen may change pScreen->x/y,
      * so use it rather than x/y
      */
     sx = pScreen->x + darwinMainScreenX;
     sy = pScreen->y + darwinMainScreenY;
-    
+
     /* Adjust the root window. */
     pRoot = pScreen->root;
     AppleWMSetScreenOrigin(pRoot);
@@ -250,7 +241,10 @@ void QuartzUpdateScreens(void) {
     inputInfo.pointer->spriteInfo->sprite->physLimits = bounds;
     inputInfo.pointer->spriteInfo->sprite->hotLimits = bounds;
 
-    DEBUG_LOG("Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n", width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY, x, y, pScreen->x, pScreen->y);
+    DEBUG_LOG
+        ("Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n",
+         width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY, x,
+         y, pScreen->x, pScreen->y);
 
     /* Send an event for the root reconfigure */
     e.u.u.type = ConfigureNotify;
@@ -267,74 +261,86 @@ void QuartzUpdateScreens(void) {
     quartzProcs->UpdateScreen(pScreen);
 
     /* miPaintWindow needs to be called after RootlessUpdateScreenPixmap (from xprUpdateScreen) */
-    miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);
+    miPaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND);
 
     /* Tell RandR about the new size, so new connections get the correct info */
     RRScreenSizeNotify(pScreen);
 }
 
-static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) {
+static void
+pokeActivityCallback(CFRunLoopTimerRef timer, void *info)
+{
     UpdateSystemActivity(OverallAct);
 }
 
-static void QuartzScreenSaver(int state) {
+static void
+QuartzScreenSaver(int state)
+{
     static CFRunLoopTimerRef pokeActivityTimer = NULL;
-    static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL };
+    static CFRunLoopTimerContext pokeActivityContext =
+        { 0, NULL, NULL, NULL, NULL };
     static OSSpinLock pokeActivitySpinLock = OS_SPINLOCK_INIT;
 
     OSSpinLockLock(&pokeActivitySpinLock);
 
-    if(state) {
-        if(pokeActivityTimer == NULL)
+    if (state) {
+        if (pokeActivityTimer == NULL)
             goto QuartzScreenSaverEnd;
 
         CFRunLoopTimerInvalidate(pokeActivityTimer);
         CFRelease(pokeActivityTimer);
         pokeActivityTimer = NULL;
-    } else {
-        if(pokeActivityTimer != NULL)
+    }
+    else {
+        if (pokeActivityTimer != NULL)
             goto QuartzScreenSaverEnd;
-        
-        pokeActivityTimer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0, pokeActivityCallback, &pokeActivityContext);
-        if(pokeActivityTimer == NULL) {
+
+        pokeActivityTimer =
+            CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0,
+                                 pokeActivityCallback, &pokeActivityContext);
+        if (pokeActivityTimer == NULL) {
             ErrorF("Unable to create pokeActivityTimer.\n");
             goto QuartzScreenSaverEnd;
         }
 
-        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);
+        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer,
+                          kCFRunLoopCommonModes);
     }
-QuartzScreenSaverEnd:
+ QuartzScreenSaverEnd:
     OSSpinLockUnlock(&pokeActivitySpinLock);
 }
 
-void QuartzShowFullscreen(int state) {
+void
+QuartzShowFullscreen(int state)
+{
     int i;
-    
+
     DEBUG_LOG("QuartzShowFullscreen: state=%d\n", state);
-    
-    if(XQuartzIsRootless) {
+
+    if (XQuartzIsRootless) {
         ErrorF("QuartzShowFullscreen called while in rootless mode.\n");
         return;
     }
-    
+
     QuartzScreenSaver(!state);
-    
-    if(XQuartzFullscreenVisible == state)
+
+    if (XQuartzFullscreenVisible == state)
         return;
-    
+
     XQuartzFullscreenVisible = state;
-    
-    xp_disable_update ();
-    
+
+    xp_disable_update();
+
     if (!XQuartzFullscreenVisible)
         RootlessHideAllWindows();
-    
+
     RootlessUpdateRooted(XQuartzFullscreenVisible);
-    
+
     if (XQuartzFullscreenVisible) {
-        RootlessShowAllWindows ();
-        for (i=0; i < screenInfo.numScreens; i++) {
-            ScreenPtr pScreen = screenInfo.screens[i];        
+        RootlessShowAllWindows();
+        for (i = 0; i < screenInfo.numScreens; i++) {
+            ScreenPtr pScreen = screenInfo.screens[i];
+
             RootlessRepositionWindows(pScreen);
             // JH: I don't think this is necessary, but keeping it here as a reminder
             //RootlessUpdateScreenPixmap(pScreen);
@@ -345,32 +351,35 @@ void QuartzShowFullscreen(int state) {
      * in fullscreen mode, even though it's not visible. 
      */
     X11ApplicationShowHideMenubar(!XQuartzFullscreenVisible);
-    
-    xp_reenable_update ();
-    
+
+    xp_reenable_update();
+
     if (XQuartzFullscreenDisableHotkeys)
         xp_disable_hot_keys(XQuartzFullscreenVisible);
 }
 
-void QuartzSetRootless(Bool state) {    
+void
+QuartzSetRootless(Bool state)
+{
     DEBUG_LOG("QuartzSetRootless state=%d\n", state);
-    
-    if(XQuartzIsRootless == state)
+
+    if (XQuartzIsRootless == state)
         return;
-    
-    if(state)
+
+    if (state)
         QuartzShowFullscreen(FALSE);
-    
+
     XQuartzIsRootless = state;
 
     xp_disable_update();
 
-    /* When in rootless, the menubar is not part of the screen, so we need to update our screens on toggle */    
+    /* When in rootless, the menubar is not part of the screen, so we need to update our screens on toggle */
     QuartzUpdateScreens();
 
-    if(XQuartzIsRootless) {
+    if (XQuartzIsRootless) {
         RootlessShowAllWindows();
-    } else {
+    }
+    else {
         RootlessHideAllWindows();
     }
 
@@ -387,31 +396,33 @@ void QuartzSetRootless(Bool state) {
  *  Calls mode specific screen resume to restore the X clip regions
  *  (if needed) and the X server cursor state.
  */
-void QuartzShow(void) {
+void
+QuartzShow(void)
+{
     int i;
 
     if (XQuartzServerVisible)
         return;
-    
+
     XQuartzServerVisible = TRUE;
     for (i = 0; i < screenInfo.numScreens; i++) {
         if (screenInfo.screens[i]) {
             quartzProcs->ResumeScreen(screenInfo.screens[i]);
         }
     }
-    
+
     if (!XQuartzIsRootless)
         QuartzShowFullscreen(TRUE);
 }
 
-
 /*
  * QuartzHide
  *  Remove the X server display from the screen. Does nothing if already
  *  hidden. Calls mode specific screen suspend to set X clip regions to
  *  prevent drawing (if needed) and restore the Aqua cursor.
  */
-void QuartzHide(void)
+void
+QuartzHide(void)
 {
     int i;
 
@@ -423,18 +434,17 @@ void QuartzHide(void)
         }
     }
 
-    if(!XQuartzIsRootless)
+    if (!XQuartzIsRootless)
         QuartzShowFullscreen(FALSE);
     XQuartzServerVisible = FALSE;
 }
 
-
 /*
  * QuartzSetRootClip
  *  Enable or disable rendering to the X screen.
  */
-void QuartzSetRootClip(
-    BOOL enable)
+void
+QuartzSetRootClip(BOOL enable)
 {
     int i;
 
@@ -452,7 +462,9 @@ void QuartzSetRootClip(
  * QuartzSpaceChanged
  *  Unmap offscreen windows, map onscreen windows
  */
-void QuartzSpaceChanged(uint32_t space_id) {
+void
+QuartzSpaceChanged(uint32_t space_id)
+{
     /* Do something special here, so we don't depend on quartz-wm for spaces to work... */
     DEBUG_LOG("Space Changed (%u) ... do something interesting...\n", space_id);
 }
@@ -462,26 +474,30 @@ void QuartzSpaceChanged(uint32_t space_id) {
  *  Associate an X11 screen with one or more CoreGraphics display IDs by copying
  *  the list into a private array. Free the previously copied array, if present.
  */
-void QuartzCopyDisplayIDs(ScreenPtr pScreen,
-                          int displayCount, CGDirectDisplayID *displayIDs) {
+void
+QuartzCopyDisplayIDs(ScreenPtr pScreen,
+                     int displayCount, CGDirectDisplayID * displayIDs)
+{
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
 
     free(pQuartzScreen->displayIDs);
-    if(displayCount) {
+    if (displayCount) {
         size_t size = displayCount * sizeof(CGDirectDisplayID);
+
         pQuartzScreen->displayIDs = malloc(size);
         memcpy(pQuartzScreen->displayIDs, displayIDs, size);
-    } else {
-       pQuartzScreen->displayIDs = NULL;
+    }
+    else {
+        pQuartzScreen->displayIDs = NULL;
     }
     pQuartzScreen->displayCount = displayCount;
 }
 
 void NSBeep(void);
-void DDXRingBell(
-    int volume,         // volume is % of max
-    int pitch,          // pitch is Hz
-    int duration)       // duration is milliseconds
+void
+DDXRingBell(int volume,         // volume is % of max
+            int pitch,          // pitch is Hz
+            int duration)       // duration is milliseconds
 {
     if (volume)
         NSBeep();
diff --git a/xorg-server/hw/xquartz/quartzCocoa.m b/xorg-server/hw/xquartz/quartzCocoa.m
index d1087015b..c0401b5e1 100644
--- a/xorg-server/hw/xquartz/quartzCocoa.m
+++ b/xorg-server/hw/xquartz/quartzCocoa.m
@@ -1,71 +1,66 @@
-/**************************************************************

- *

- * Quartz-specific support for the Darwin X Server

- * that requires Cocoa and Objective-C.

- *

- * This file is separate from the parts of Quartz support

- * that use X include files to avoid symbol collisions.

- *

- * Copyright (c) 2001-2004 Torrey T. Lyons and Greg Parker.

- *                 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#include "sanitizedCocoa.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartzCommon.h"

-#include "inputstr.h"

-

-#include "darwin.h"

-

-/*

- * QuartzBlockHandler

- *  Clean out any autoreleased objects.

- */

-void QuartzBlockHandler(

-    pointer blockData,

-    OSTimePtr pTimeout,

-    pointer pReadmask)

-{

-    static NSAutoreleasePool *aPool = nil;

-

-    [aPool release];

-    aPool = [[NSAutoreleasePool alloc] init];

-}

-

-

-/*

- * QuartzWakeupHandler

- */

-void QuartzWakeupHandler(

-    pointer blockData,

-    int result,

-    pointer pReadmask)

-{

-    // nothing here

-}

+/**************************************************************
+ *
+ * Quartz-specific support for the Darwin X Server
+ * that requires Cocoa and Objective-C.
+ *
+ * This file is separate from the parts of Quartz support
+ * that use X include files to avoid symbol collisions.
+ *
+ * Copyright (c) 2001-2004 Torrey T. Lyons and Greg Parker.
+ *                 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#include "sanitizedCocoa.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartzCommon.h"
+#include "inputstr.h"
+
+#include "darwin.h"
+
+/*
+ * QuartzBlockHandler
+ *  Clean out any autoreleased objects.
+ */
+void
+QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
+{
+    static NSAutoreleasePool *aPool = nil;
+
+    [aPool release];
+    aPool =[[NSAutoreleasePool alloc] init];
+}
+
+/*
+ * QuartzWakeupHandler
+ */
+void
+QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask)
+{
+    // nothing here
+}
diff --git a/xorg-server/hw/xquartz/quartzCommon.h b/xorg-server/hw/xquartz/quartzCommon.h
index ac089ac71..e12e1d25c 100644
--- a/xorg-server/hw/xquartz/quartzCommon.h
+++ b/xorg-server/hw/xquartz/quartzCommon.h
@@ -1,52 +1,54 @@
-/*

- * quartzCommon.h

- *

- * Common definitions used internally by all Quartz modes

- *

- * This file should be included before any X11 or IOKit headers

- * so that it can avoid symbol conflicts.

- *

- * Copyright (c) 2001-2004 Torrey T. Lyons and Greg Parker.

- *                 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifndef _QUARTZCOMMON_H

-#define _QUARTZCOMMON_H

-

-#include <X11/Xdefs.h>

-#include "privates.h"

-

-// Other shared data

-extern DevPrivateKeyRec quartzScreenKeyRec;

-#define quartzScreenKey (&quartzScreenKeyRec)

-extern int              aquaMenuBarHeight;

-

-// Name of GLX bundle for native OpenGL

-extern const char      *quartzOpenGLBundle;

-

-void QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask);

-void QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask);

-

-#endif  /* _QUARTZCOMMON_H */

+/*
+ * quartzCommon.h
+ *
+ * Common definitions used internally by all Quartz modes
+ *
+ * This file should be included before any X11 or IOKit headers
+ * so that it can avoid symbol conflicts.
+ *
+ * Copyright (c) 2001-2004 Torrey T. Lyons and Greg Parker.
+ *                 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifndef _QUARTZCOMMON_H
+#define _QUARTZCOMMON_H
+
+#include <X11/Xdefs.h>
+#include "privates.h"
+
+// Other shared data
+extern DevPrivateKeyRec quartzScreenKeyRec;
+
+#define quartzScreenKey (&quartzScreenKeyRec)
+extern int aquaMenuBarHeight;
+
+// Name of GLX bundle for native OpenGL
+extern const char *quartzOpenGLBundle;
+
+void QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout,
+                        pointer pReadmask);
+void QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask);
+
+#endif                          /* _QUARTZCOMMON_H */
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.c b/xorg-server/hw/xquartz/quartzKeyboard.c
index e682f08b6..e7aadbcf5 100644
--- a/xorg-server/hw/xquartz/quartzKeyboard.c
+++ b/xorg-server/hw/xquartz/quartzKeyboard.c
@@ -65,7 +65,7 @@
 #include "keysym2ucs.h"
 
 extern void
-CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
+ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
 
 enum {
     MOD_COMMAND = 256,
@@ -84,33 +84,31 @@ const static struct {
     unsigned short keycode;
     KeySym keysym;
 } known_keys[] = {
-    {55,  XK_Meta_L},
-    {56,  XK_Shift_L},
-    {57,  XK_Caps_Lock},
-    {58,  XK_Alt_L},
-    {59,  XK_Control_L},
-
-    {60,  XK_Shift_R},
-    {61,  XK_Alt_R},
-    {62,  XK_Control_R},
-    {63,  XK_Meta_R},
-
-    {122, XK_F1},
-    {120, XK_F2},
-    {99,  XK_F3},
-    {118, XK_F4},
-    {96,  XK_F5},
-    {97,  XK_F6},
-    {98,  XK_F7},
-    {100, XK_F8},
-    {101, XK_F9},
-    {109, XK_F10},
-    {103, XK_F11},
-    {111, XK_F12},
-    {105, XK_F13},
-    {107, XK_F14},
-    {113, XK_F15},
-};
+    {
+    55, XK_Meta_L}, {
+    56, XK_Shift_L}, {
+    57, XK_Caps_Lock}, {
+    58, XK_Alt_L}, {
+    59, XK_Control_L}, {
+    60, XK_Shift_R}, {
+    61, XK_Alt_R}, {
+    62, XK_Control_R}, {
+    63, XK_Meta_R}, {
+    122, XK_F1}, {
+    120, XK_F2}, {
+    99, XK_F3}, {
+    118, XK_F4}, {
+    96, XK_F5}, {
+    97, XK_F6}, {
+    98, XK_F7}, {
+    100, XK_F8}, {
+    101, XK_F9}, {
+    109, XK_F10}, {
+    103, XK_F11}, {
+    111, XK_F12}, {
+    105, XK_F13}, {
+    107, XK_F14}, {
+113, XK_F15},};
 #endif
 
 #if HACK_KEYPAD
@@ -121,24 +119,24 @@ const static struct {
     unsigned short keycode;
     KeySym normal, keypad;
 } known_numeric_keys[] = {
-    {65, XK_period, XK_KP_Decimal},
-    {67, XK_asterisk, XK_KP_Multiply},
-    {69, XK_plus, XK_KP_Add},
-    {75, XK_slash, XK_KP_Divide},
-    {76, 0x01000003, XK_KP_Enter},
-    {78, XK_minus, XK_KP_Subtract},
-    {81, XK_equal, XK_KP_Equal},
-    {82, XK_0, XK_KP_0},
-    {83, XK_1, XK_KP_1},
-    {84, XK_2, XK_KP_2},
-    {85, XK_3, XK_KP_3},
-    {86, XK_4, XK_KP_4},
-    {87, XK_5, XK_KP_5},
-    {88, XK_6, XK_KP_6},
-    {89, XK_7, XK_KP_7},
-    {91, XK_8, XK_KP_8},
-    {92, XK_9, XK_KP_9},
-};
+    {
+    65, XK_period, XK_KP_Decimal}, {
+    67, XK_asterisk, XK_KP_Multiply}, {
+    69, XK_plus, XK_KP_Add}, {
+    75, XK_slash, XK_KP_Divide}, {
+    76, 0x01000003, XK_KP_Enter}, {
+    78, XK_minus, XK_KP_Subtract}, {
+    81, XK_equal, XK_KP_Equal}, {
+    82, XK_0, XK_KP_0}, {
+    83, XK_1, XK_KP_1}, {
+    84, XK_2, XK_KP_2}, {
+    85, XK_3, XK_KP_3}, {
+    86, XK_4, XK_KP_4}, {
+    87, XK_5, XK_KP_5}, {
+    88, XK_6, XK_KP_6}, {
+    89, XK_7, XK_KP_7}, {
+    91, XK_8, XK_KP_8}, {
+92, XK_9, XK_KP_9},};
 #endif
 
 #if HACK_BLACKLIST
@@ -148,7 +146,7 @@ const static struct {
  *
  * legacy Mac keycodes for arrow keys that shift-modify to math symbols
  */
-const static unsigned short keycode_blacklist[] = {66, 70, 72, 77};
+const static unsigned short keycode_blacklist[] = { 66, 70, 72, 77 };
 #endif
 
 /* Table mapping normal keysyms to their dead equivalents.
@@ -157,30 +155,40 @@ const static unsigned short keycode_blacklist[] = {66, 70, 72, 77};
 const static struct {
     KeySym normal, dead;
 } dead_keys[] = {
-    {XK_grave, XK_dead_grave},
-    {XK_apostrophe, XK_dead_acute},             /* US:"=" on a Czech keyboard */
-    {XK_acute, XK_dead_acute},
-    {UKEYSYM (0x384), XK_dead_acute},           /* US:";" on a Greek keyboard */
+    {
+    XK_grave, XK_dead_grave}, {
+    XK_apostrophe, XK_dead_acute},      /* US:"=" on a Czech keyboard */
+    {
+    XK_acute, XK_dead_acute}, {
+    UKEYSYM(0x384), XK_dead_acute},     /* US:";" on a Greek keyboard */
 //    {XK_Greek_accentdieresis, XK_dead_diaeresis},   /* US:"opt+;" on a Greek keyboard ... replace with dead_accentdieresis if there is one */
-    {XK_asciicircum, XK_dead_circumflex},
-    {UKEYSYM (0x2c6), XK_dead_circumflex},	/* MODIFIER LETTER CIRCUMFLEX ACCENT */
-    {XK_asciitilde, XK_dead_tilde},
-    {UKEYSYM (0x2dc), XK_dead_tilde},		/* SMALL TILDE */
-    {XK_macron, XK_dead_macron},
-    {XK_breve, XK_dead_breve},
-    {XK_abovedot, XK_dead_abovedot},
-    {XK_diaeresis, XK_dead_diaeresis},
-    {UKEYSYM (0x2da), XK_dead_abovering},	/* DOT ABOVE */
-    {XK_doubleacute, XK_dead_doubleacute},
-    {XK_caron, XK_dead_caron},
-    {XK_cedilla, XK_dead_cedilla},
-    {XK_ogonek, XK_dead_ogonek},
-    {UKEYSYM (0x269), XK_dead_iota},		/* LATIN SMALL LETTER IOTA */
-    {UKEYSYM (0x2ec), XK_dead_voiced_sound},	/* MODIFIER LETTER VOICING */
+    {
+    XK_asciicircum, XK_dead_circumflex}, {
+    UKEYSYM(0x2c6), XK_dead_circumflex},        /* MODIFIER LETTER CIRCUMFLEX ACCENT */
+    {
+    XK_asciitilde, XK_dead_tilde}, {
+    UKEYSYM(0x2dc), XK_dead_tilde},     /* SMALL TILDE */
+    {
+    XK_macron, XK_dead_macron}, {
+    XK_breve, XK_dead_breve}, {
+    XK_abovedot, XK_dead_abovedot}, {
+    XK_diaeresis, XK_dead_diaeresis}, {
+    UKEYSYM(0x2da), XK_dead_abovering}, /* DOT ABOVE */
+    {
+    XK_doubleacute, XK_dead_doubleacute}, {
+    XK_caron, XK_dead_caron}, {
+    XK_cedilla, XK_dead_cedilla}, {
+    XK_ogonek, XK_dead_ogonek}, {
+    UKEYSYM(0x269), XK_dead_iota},      /* LATIN SMALL LETTER IOTA */
+    {
+    UKEYSYM(0x2ec), XK_dead_voiced_sound},      /* MODIFIER LETTER VOICING */
 /*  {XK_semivoiced_sound, XK_dead_semivoiced_sound}, */
-    {UKEYSYM (0x323), XK_dead_belowdot},	/* COMBINING DOT BELOW */
-    {UKEYSYM (0x309), XK_dead_hook}, 		/* COMBINING HOOK ABOVE */
-    {UKEYSYM (0x31b), XK_dead_horn},		/* COMBINING HORN */
+    {
+    UKEYSYM(0x323), XK_dead_belowdot},  /* COMBINING DOT BELOW */
+    {
+    UKEYSYM(0x309), XK_dead_hook},      /* COMBINING HOOK ABOVE */
+    {
+    UKEYSYM(0x31b), XK_dead_horn},      /* COMBINING HORN */
 };
 
 typedef struct darwinKeyboardInfo_struct {
@@ -192,7 +200,9 @@ typedef struct darwinKeyboardInfo_struct {
 darwinKeyboardInfo keyInfo;
 pthread_mutex_t keyInfo_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-static void DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl *ctrl) {
+static void
+DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl * ctrl)
+{
     // FIXME: to be implemented
     // keyclick, bell volume / pitch, autorepead, LED's
 }
@@ -206,7 +216,9 @@ static void DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl *ctrl) {
  *      Use the keyMap field of keyboard info structure to populate
  *      the modMap and modifierKeycodes fields.
  */
-static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
+static void
+DarwinBuildModifierMaps(darwinKeyboardInfo * info)
+{
     int i;
     KeySym *k;
 
@@ -217,83 +229,84 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
         k = info->keyMap + i * GLYPHS_PER_KEY;
 
         switch (*k) {
-            case XK_Shift_L:
-                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;
-                info->modMap[MIN_KEYCODE + i] = ShiftMask;
-                break;
+        case XK_Shift_L:
+            info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;
+            info->modMap[MIN_KEYCODE + i] = ShiftMask;
+            break;
 
-            case XK_Shift_R:
+        case XK_Shift_R:
 #ifdef NX_MODIFIERKEY_RSHIFT
-                info->modifierKeycodes[NX_MODIFIERKEY_RSHIFT][0] = i;
+            info->modifierKeycodes[NX_MODIFIERKEY_RSHIFT][0] = i;
 #else
-                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;
+            info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;
 #endif
-                info->modMap[MIN_KEYCODE + i] = ShiftMask;
-                break;
+            info->modMap[MIN_KEYCODE + i] = ShiftMask;
+            break;
 
-            case XK_Control_L:
-                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;
-                info->modMap[MIN_KEYCODE + i] = ControlMask;
-                break;
+        case XK_Control_L:
+            info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;
+            info->modMap[MIN_KEYCODE + i] = ControlMask;
+            break;
 
-            case XK_Control_R:
+        case XK_Control_R:
 #ifdef NX_MODIFIERKEY_RCONTROL
-                info->modifierKeycodes[NX_MODIFIERKEY_RCONTROL][0] = i;
+            info->modifierKeycodes[NX_MODIFIERKEY_RCONTROL][0] = i;
 #else
-                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;
+            info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;
 #endif
-                info->modMap[MIN_KEYCODE + i] = ControlMask;
-                break;
+            info->modMap[MIN_KEYCODE + i] = ControlMask;
+            break;
 
-            case XK_Caps_Lock:
-                info->modifierKeycodes[NX_MODIFIERKEY_ALPHALOCK][0] = i;
-                info->modMap[MIN_KEYCODE + i] = LockMask;
-                break;
+        case XK_Caps_Lock:
+            info->modifierKeycodes[NX_MODIFIERKEY_ALPHALOCK][0] = i;
+            info->modMap[MIN_KEYCODE + i] = LockMask;
+            break;
 
-            case XK_Alt_L:
-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
-                info->modMap[MIN_KEYCODE + i] = Mod1Mask;
-                if(!XQuartzOptionSendsAlt)
-                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
-                break;
+        case XK_Alt_L:
+            info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+            info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+            if (!XQuartzOptionSendsAlt)
+                *k = XK_Mode_switch;    // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
+            break;
 
-            case XK_Alt_R:
+        case XK_Alt_R:
 #ifdef NX_MODIFIERKEY_RALTERNATE
-                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
+            info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
 #else
-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+            info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
 #endif
-                if(!XQuartzOptionSendsAlt)
-                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
-                info->modMap[MIN_KEYCODE + i] = Mod1Mask;
-                break;
+            if (!XQuartzOptionSendsAlt)
+                *k = XK_Mode_switch;    // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
+            info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+            break;
 
-            case XK_Mode_switch:
-                ErrorF("DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n");
-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+        case XK_Mode_switch:
+            ErrorF
+                ("DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n");
+            info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
 #ifdef NX_MODIFIERKEY_RALTERNATE
-                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
+            info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
 #endif
-                info->modMap[MIN_KEYCODE + i] = Mod1Mask;
-                break;
+            info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+            break;
 
-            case XK_Meta_L:
-                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;
-                info->modMap[MIN_KEYCODE + i] = Mod2Mask;
-                break;
+        case XK_Meta_L:
+            info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;
+            info->modMap[MIN_KEYCODE + i] = Mod2Mask;
+            break;
 
-            case XK_Meta_R:
+        case XK_Meta_R:
 #ifdef NX_MODIFIERKEY_RCOMMAND
-                info->modifierKeycodes[NX_MODIFIERKEY_RCOMMAND][0] = i;
+            info->modifierKeycodes[NX_MODIFIERKEY_RCOMMAND][0] = i;
 #else
-                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;
+            info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;
 #endif
-                info->modMap[MIN_KEYCODE + i] = Mod2Mask;
-                break;
+            info->modMap[MIN_KEYCODE + i] = Mod2Mask;
+            break;
 
-            case XK_Num_Lock:
-                info->modMap[MIN_KEYCODE + i] = Mod3Mask;
-                break;
+        case XK_Num_Lock:
+            info->modMap[MIN_KEYCODE + i] = Mod3Mask;
+            break;
         }
     }
 }
@@ -304,7 +317,9 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
  *      X keyboard map and modifier map. Set the new keyboard
  *      device structure.
  */
-void DarwinKeyboardInit(DeviceIntPtr pDev) {
+void
+DarwinKeyboardInit(DeviceIntPtr pDev)
+{
     // Open a shared connection to the HID System.
     // Note that the Event Status Driver is really just a wrapper
     // for a kIOHIDParamConnectType connection.
@@ -320,46 +335,51 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
 /* Set the repeat rates based on global preferences and keycodes for modifiers.
  * Precondition: Has the keyInfo_mutex lock.
  */
-static void DarwinKeyboardSetRepeat(DeviceIntPtr pDev, int initialKeyRepeatValue, int keyRepeatValue) {
-    if(initialKeyRepeatValue == 300000) { // off
+static void
+DarwinKeyboardSetRepeat(DeviceIntPtr pDev, int initialKeyRepeatValue,
+                        int keyRepeatValue)
+{
+    if (initialKeyRepeatValue == 300000) {      // off
         /* Turn off repeats globally */
         XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOff);
-    } else {
+    }
+    else {
         int i;
-        XkbControlsPtr      ctrl;
-        XkbControlsRec      old;
+        XkbControlsPtr ctrl;
+        XkbControlsRec old;
 
         /* Turn on repeats globally */
         XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOn);
-        
+
         /* Setup the bit mask for individual key repeats */
         ctrl = pDev->key->xkbInfo->desc->ctrls;
-        old= *ctrl;
-        
+        old = *ctrl;
+
         ctrl->repeat_delay = initialKeyRepeatValue * 15;
         ctrl->repeat_interval = keyRepeatValue * 15;
 
         /* Turn off key-repeat for modifier keys, on for others */
         /* First set them all on */
-        for(i=0; i < XkbPerKeyBitArraySize; i++)
+        for (i = 0; i < XkbPerKeyBitArraySize; i++)
             ctrl->per_key_repeat[i] = -1;
 
         /* Now turn off the modifiers */
-        for(i=0; i < 32; i++) {
+        for (i = 0; i < 32; i++) {
             unsigned char keycode;
-            
+
             keycode = keyInfo.modifierKeycodes[i][0];
-            if(keycode)
+            if (keycode)
                 ClearBit(ctrl->per_key_repeat, keycode + MIN_KEYCODE);
 
             keycode = keyInfo.modifierKeycodes[i][1];
-            if(keycode)
+            if (keycode)
                 ClearBit(ctrl->per_key_repeat, keycode + MIN_KEYCODE);
         }
 
         /* Hurray for data duplication */
         if (pDev->kbdfeed)
-            memcpy(pDev->kbdfeed->ctrl.autoRepeats, ctrl->per_key_repeat, XkbPerKeyBitArraySize);
+            memcpy(pDev->kbdfeed->ctrl.autoRepeats, ctrl->per_key_repeat,
+                   XkbPerKeyBitArraySize);
 
         //ErrorF("per_key_repeat =\n");
         //for(i=0; i < XkbPerKeyBitArraySize; i++)
@@ -370,7 +390,9 @@ static void DarwinKeyboardSetRepeat(DeviceIntPtr pDev, int initialKeyRepeatValue
     }
 }
 
-void DarwinKeyboardReloadHandler(void) {
+void
+DarwinKeyboardReloadHandler(void)
+{
     KeySymsRec keySyms;
     CFIndex initialKeyRepeatValue, keyRepeatValue;
     BOOL ok;
@@ -383,62 +405,78 @@ void DarwinKeyboardReloadHandler(void) {
     DEBUG_LOG("DarwinKeyboardReloadHandler\n");
 
     /* Get our key repeat settings from GlobalPreferences */
-    (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
-    
-    initialKeyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("InitialKeyRepeat"), CFSTR(".GlobalPreferences"), &ok);
-    if(!ok)
+    (void) CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
+
+    initialKeyRepeatValue =
+        CFPreferencesGetAppIntegerValue(CFSTR("InitialKeyRepeat"),
+                                        CFSTR(".GlobalPreferences"), &ok);
+    if (!ok)
         initialKeyRepeatValue = 35;
-    
-    keyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("KeyRepeat"), CFSTR(".GlobalPreferences"), &ok);
-    if(!ok)
+
+    keyRepeatValue =
+        CFPreferencesGetAppIntegerValue(CFSTR("KeyRepeat"),
+                                        CFSTR(".GlobalPreferences"), &ok);
+    if (!ok)
         keyRepeatValue = 6;
-    
+
     pthread_mutex_lock(&keyInfo_mutex); {
         /* Initialize our keySyms */
         keySyms.map = keyInfo.keyMap;
-        keySyms.mapWidth   = GLYPHS_PER_KEY;
+        keySyms.mapWidth = GLYPHS_PER_KEY;
         keySyms.minKeyCode = MIN_KEYCODE;
         keySyms.maxKeyCode = MAX_KEYCODE;
 
-	// TODO: We should build the entire XkbDescRec and use XkbCopyKeymap
+        // TODO: We should build the entire XkbDescRec and use XkbCopyKeymap
         /* Apply the mappings to darwinKeyboard */
         XkbApplyMappingChange(darwinKeyboard, &keySyms, keySyms.minKeyCode,
                               keySyms.maxKeyCode - keySyms.minKeyCode + 1,
                               keyInfo.modMap, serverClient);
-        DarwinKeyboardSetRepeat(darwinKeyboard, initialKeyRepeatValue, keyRepeatValue);
+        DarwinKeyboardSetRepeat(darwinKeyboard, initialKeyRepeatValue,
+                                keyRepeatValue);
 
         /* Apply the mappings to the core keyboard */
         for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
             if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) {
                 XkbApplyMappingChange(pDev, &keySyms, keySyms.minKeyCode,
-                                      keySyms.maxKeyCode - keySyms.minKeyCode + 1,
-                                      keyInfo.modMap, serverClient);
-                DarwinKeyboardSetRepeat(pDev, initialKeyRepeatValue, keyRepeatValue);    
+                                      keySyms.maxKeyCode - keySyms.minKeyCode +
+                                      1, keyInfo.modMap, serverClient);
+                DarwinKeyboardSetRepeat(pDev, initialKeyRepeatValue,
+                                        keyRepeatValue);
             }
         }
-    } pthread_mutex_unlock(&keyInfo_mutex);
+    }
+    pthread_mutex_unlock(&keyInfo_mutex);
 
     /* Modify with xmodmap */
     if (access(xmodmap, F_OK) == 0) {
         /* Check for system .Xmodmap */
         if (access(sysmodmap, F_OK) == 0) {
-            if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, sysmodmap) < sizeof(cmd)) {
+            if (snprintf(cmd, sizeof(cmd), "%s %s", xmodmap, sysmodmap) <
+                sizeof(cmd)) {
                 X11ApplicationLaunchClient(cmd);
-            } else {
-                ErrorF("X11.app: Unable to create / execute xmodmap command line");
+            }
+            else {
+                ErrorF
+                    ("X11.app: Unable to create / execute xmodmap command line");
             }
         }
 
         /* Check for user's local .Xmodmap */
-        if ((homedir != NULL) && (snprintf (usermodmap, sizeof(usermodmap), "%s/.Xmodmap", homedir) < sizeof(usermodmap))) {
+        if ((homedir != NULL) &&
+            (snprintf(usermodmap, sizeof(usermodmap), "%s/.Xmodmap", homedir) <
+             sizeof(usermodmap))) {
             if (access(usermodmap, F_OK) == 0) {
-                if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, usermodmap) < sizeof(cmd)) {
+                if (snprintf(cmd, sizeof(cmd), "%s %s", xmodmap, usermodmap) <
+                    sizeof(cmd)) {
                     X11ApplicationLaunchClient(cmd);
-                } else {
-                    ErrorF("X11.app: Unable to create / execute xmodmap command line");
+                }
+                else {
+                    ErrorF
+                        ("X11.app: Unable to create / execute xmodmap command line");
                 }
             }
-        } else {
+        }
+        else {
             ErrorF("X11.app: Unable to determine path to user's .Xmodmap");
         }
     }
@@ -460,8 +498,11 @@ void DarwinKeyboardReloadHandler(void) {
  *      side = 0 for left or 1 for right.
  *      Returns 0 if key+side is not a known modifier.
  */
-int DarwinModifierNXKeyToNXKeycode(int key, int side) {
+int
+DarwinModifierNXKeyToNXKeycode(int key, int side)
+{
     int retval;
+
     pthread_mutex_lock(&keyInfo_mutex);
     retval = keyInfo.modifierKeycodes[key][side];
     pthread_mutex_unlock(&keyInfo_mutex);
@@ -474,7 +515,9 @@ int DarwinModifierNXKeyToNXKeycode(int key, int side) {
  *      Returns -1 if keycode+side is not a modifier key
  *      outSide may be NULL, else it gets 0 for left and 1 for right.
  */
-int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide) {
+int
+DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide)
+{
     int key, side;
 
     keycode += MIN_KEYCODE;
@@ -483,7 +526,8 @@ int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide) {
     pthread_mutex_lock(&keyInfo_mutex);
     for (key = 0; key < NX_NUMMODIFIERS; key++) {
         for (side = 0; side <= 1; side++) {
-            if (keyInfo.modifierKeycodes[key][side] == keycode) break;
+            if (keyInfo.modifierKeycodes[key][side] == keycode)
+                break;
         }
     }
     pthread_mutex_unlock(&keyInfo_mutex);
@@ -491,7 +535,8 @@ int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide) {
     if (key == NX_NUMMODIFIERS) {
         return -1;
     }
-    if (outSide) *outSide = side;
+    if (outSide)
+        *outSide = side;
 
     return key;
 }
@@ -500,32 +545,50 @@ int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide) {
  * DarwinModifierNXMaskToNXKey
  *      Returns -1 if mask is not a known modifier mask.
  */
-int DarwinModifierNXMaskToNXKey(int mask) {
+int
+DarwinModifierNXMaskToNXKey(int mask)
+{
     switch (mask) {
-        case NX_ALPHASHIFTMASK:       return NX_MODIFIERKEY_ALPHALOCK;
-        case NX_SHIFTMASK:            return NX_MODIFIERKEY_SHIFT;
+    case NX_ALPHASHIFTMASK:
+        return NX_MODIFIERKEY_ALPHALOCK;
+    case NX_SHIFTMASK:
+        return NX_MODIFIERKEY_SHIFT;
 #ifdef NX_DEVICELSHIFTKEYMASK
-        case NX_DEVICELSHIFTKEYMASK:  return NX_MODIFIERKEY_SHIFT;
-        case NX_DEVICERSHIFTKEYMASK:  return NX_MODIFIERKEY_RSHIFT;
+    case NX_DEVICELSHIFTKEYMASK:
+        return NX_MODIFIERKEY_SHIFT;
+    case NX_DEVICERSHIFTKEYMASK:
+        return NX_MODIFIERKEY_RSHIFT;
 #endif
-        case NX_CONTROLMASK:          return NX_MODIFIERKEY_CONTROL;
+    case NX_CONTROLMASK:
+        return NX_MODIFIERKEY_CONTROL;
 #ifdef NX_DEVICELCTLKEYMASK
-        case NX_DEVICELCTLKEYMASK:    return NX_MODIFIERKEY_CONTROL;
-        case NX_DEVICERCTLKEYMASK:    return NX_MODIFIERKEY_RCONTROL;
+    case NX_DEVICELCTLKEYMASK:
+        return NX_MODIFIERKEY_CONTROL;
+    case NX_DEVICERCTLKEYMASK:
+        return NX_MODIFIERKEY_RCONTROL;
 #endif
-        case NX_ALTERNATEMASK:        return NX_MODIFIERKEY_ALTERNATE;
+    case NX_ALTERNATEMASK:
+        return NX_MODIFIERKEY_ALTERNATE;
 #ifdef NX_DEVICELALTKEYMASK
-        case NX_DEVICELALTKEYMASK:    return NX_MODIFIERKEY_ALTERNATE;
-        case NX_DEVICERALTKEYMASK:    return NX_MODIFIERKEY_RALTERNATE;
+    case NX_DEVICELALTKEYMASK:
+        return NX_MODIFIERKEY_ALTERNATE;
+    case NX_DEVICERALTKEYMASK:
+        return NX_MODIFIERKEY_RALTERNATE;
 #endif
-        case NX_COMMANDMASK:          return NX_MODIFIERKEY_COMMAND;
+    case NX_COMMANDMASK:
+        return NX_MODIFIERKEY_COMMAND;
 #ifdef NX_DEVICELCMDKEYMASK
-        case NX_DEVICELCMDKEYMASK:    return NX_MODIFIERKEY_COMMAND;
-        case NX_DEVICERCMDKEYMASK:    return NX_MODIFIERKEY_RCOMMAND;
-#endif
-        case NX_NUMERICPADMASK:       return NX_MODIFIERKEY_NUMERICPAD;
-        case NX_HELPMASK:             return NX_MODIFIERKEY_HELP;
-        case NX_SECONDARYFNMASK:      return NX_MODIFIERKEY_SECONDARYFN;
+    case NX_DEVICELCMDKEYMASK:
+        return NX_MODIFIERKEY_COMMAND;
+    case NX_DEVICERCMDKEYMASK:
+        return NX_MODIFIERKEY_RCOMMAND;
+#endif
+    case NX_NUMERICPADMASK:
+        return NX_MODIFIERKEY_NUMERICPAD;
+    case NX_HELPMASK:
+        return NX_MODIFIERKEY_HELP;
+    case NX_SECONDARYFNMASK:
+        return NX_MODIFIERKEY_SECONDARYFN;
     }
     return -1;
 }
@@ -534,27 +597,45 @@ int DarwinModifierNXMaskToNXKey(int mask) {
  * DarwinModifierNXKeyToNXMask
  *      Returns 0 if key is not a known modifier key.
  */
-int DarwinModifierNXKeyToNXMask(int key) {
+int
+DarwinModifierNXKeyToNXMask(int key)
+{
     switch (key) {
-        case NX_MODIFIERKEY_ALPHALOCK:   return NX_ALPHASHIFTMASK;
+    case NX_MODIFIERKEY_ALPHALOCK:
+        return NX_ALPHASHIFTMASK;
 #ifdef NX_DEVICELSHIFTKEYMASK
-        case NX_MODIFIERKEY_SHIFT:       return NX_DEVICELSHIFTKEYMASK;
-        case NX_MODIFIERKEY_RSHIFT:      return NX_DEVICERSHIFTKEYMASK;
-        case NX_MODIFIERKEY_CONTROL:     return NX_DEVICELCTLKEYMASK;
-        case NX_MODIFIERKEY_RCONTROL:    return NX_DEVICERCTLKEYMASK;
-        case NX_MODIFIERKEY_ALTERNATE:   return NX_DEVICELALTKEYMASK;
-        case NX_MODIFIERKEY_RALTERNATE:  return NX_DEVICERALTKEYMASK;
-        case NX_MODIFIERKEY_COMMAND:     return NX_DEVICELCMDKEYMASK;
-        case NX_MODIFIERKEY_RCOMMAND:    return NX_DEVICERCMDKEYMASK;
+    case NX_MODIFIERKEY_SHIFT:
+        return NX_DEVICELSHIFTKEYMASK;
+    case NX_MODIFIERKEY_RSHIFT:
+        return NX_DEVICERSHIFTKEYMASK;
+    case NX_MODIFIERKEY_CONTROL:
+        return NX_DEVICELCTLKEYMASK;
+    case NX_MODIFIERKEY_RCONTROL:
+        return NX_DEVICERCTLKEYMASK;
+    case NX_MODIFIERKEY_ALTERNATE:
+        return NX_DEVICELALTKEYMASK;
+    case NX_MODIFIERKEY_RALTERNATE:
+        return NX_DEVICERALTKEYMASK;
+    case NX_MODIFIERKEY_COMMAND:
+        return NX_DEVICELCMDKEYMASK;
+    case NX_MODIFIERKEY_RCOMMAND:
+        return NX_DEVICERCMDKEYMASK;
 #else
-        case NX_MODIFIERKEY_SHIFT:       return NX_SHIFTMASK;
-        case NX_MODIFIERKEY_CONTROL:     return NX_CONTROLMASK;
-        case NX_MODIFIERKEY_ALTERNATE:   return NX_ALTERNATEMASK;
-        case NX_MODIFIERKEY_COMMAND:     return NX_COMMANDMASK;
-#endif
-        case NX_MODIFIERKEY_NUMERICPAD:  return NX_NUMERICPADMASK;
-        case NX_MODIFIERKEY_HELP:        return NX_HELPMASK;
-        case NX_MODIFIERKEY_SECONDARYFN: return NX_SECONDARYFNMASK;
+    case NX_MODIFIERKEY_SHIFT:
+        return NX_SHIFTMASK;
+    case NX_MODIFIERKEY_CONTROL:
+        return NX_CONTROLMASK;
+    case NX_MODIFIERKEY_ALTERNATE:
+        return NX_ALTERNATEMASK;
+    case NX_MODIFIERKEY_COMMAND:
+        return NX_COMMANDMASK;
+#endif
+    case NX_MODIFIERKEY_NUMERICPAD:
+        return NX_NUMERICPADMASK;
+    case NX_MODIFIERKEY_HELP:
+        return NX_HELPMASK;
+    case NX_MODIFIERKEY_SECONDARYFN:
+        return NX_SECONDARYFNMASK;
     }
     return 0;
 }
@@ -563,48 +644,85 @@ int DarwinModifierNXKeyToNXMask(int key) {
  * DarwinModifierStringToNXMask
  *      Returns 0 if string is not a known modifier.
  */
-int DarwinModifierStringToNXMask(const char *str, int separatelr) {
+int
+DarwinModifierStringToNXMask(const char *str, int separatelr)
+{
 #ifdef NX_DEVICELSHIFTKEYMASK
-    if(separatelr) {
-        if (!strcasecmp(str, "shift"))    return NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK;
-        if (!strcasecmp(str, "control"))  return NX_DEVICELCTLKEYMASK | NX_DEVICERCTLKEYMASK;
-        if (!strcasecmp(str, "option"))   return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
-        if (!strcasecmp(str, "alt"))   return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
-        if (!strcasecmp(str, "command"))  return NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;
-        if (!strcasecmp(str, "lshift"))   return NX_DEVICELSHIFTKEYMASK;
-        if (!strcasecmp(str, "rshift"))   return NX_DEVICERSHIFTKEYMASK;
-        if (!strcasecmp(str, "lcontrol")) return NX_DEVICELCTLKEYMASK;
-        if (!strcasecmp(str, "rcontrol")) return NX_DEVICERCTLKEYMASK;
-        if (!strcasecmp(str, "loption"))  return NX_DEVICELALTKEYMASK;
-        if (!strcasecmp(str, "roption"))  return NX_DEVICERALTKEYMASK;
-        if (!strcasecmp(str, "lalt"))  return NX_DEVICELALTKEYMASK;
-        if (!strcasecmp(str, "ralt"))  return NX_DEVICERALTKEYMASK;
-        if (!strcasecmp(str, "lcommand")) return NX_DEVICELCMDKEYMASK;
-        if (!strcasecmp(str, "rcommand")) return NX_DEVICERCMDKEYMASK;
-    } else {
-#endif
-        if (!strcasecmp(str, "shift"))    return NX_SHIFTMASK;
-        if (!strcasecmp(str, "control"))  return NX_CONTROLMASK;
-        if (!strcasecmp(str, "option"))   return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "alt"))   return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "command"))  return NX_COMMANDMASK;
-        if (!strcasecmp(str, "lshift"))   return NX_SHIFTMASK;
-        if (!strcasecmp(str, "rshift"))   return NX_SHIFTMASK;
-        if (!strcasecmp(str, "lcontrol")) return NX_CONTROLMASK;
-        if (!strcasecmp(str, "rcontrol")) return NX_CONTROLMASK;
-        if (!strcasecmp(str, "loption"))  return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "roption"))  return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "lalt"))  return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "ralt"))  return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "lcommand")) return NX_COMMANDMASK;
-        if (!strcasecmp(str, "rcommand")) return NX_COMMANDMASK;
+    if (separatelr) {
+        if (!strcasecmp(str, "shift"))
+            return NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK;
+        if (!strcasecmp(str, "control"))
+            return NX_DEVICELCTLKEYMASK | NX_DEVICERCTLKEYMASK;
+        if (!strcasecmp(str, "option"))
+            return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "alt"))
+            return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "command"))
+            return NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;
+        if (!strcasecmp(str, "lshift"))
+            return NX_DEVICELSHIFTKEYMASK;
+        if (!strcasecmp(str, "rshift"))
+            return NX_DEVICERSHIFTKEYMASK;
+        if (!strcasecmp(str, "lcontrol"))
+            return NX_DEVICELCTLKEYMASK;
+        if (!strcasecmp(str, "rcontrol"))
+            return NX_DEVICERCTLKEYMASK;
+        if (!strcasecmp(str, "loption"))
+            return NX_DEVICELALTKEYMASK;
+        if (!strcasecmp(str, "roption"))
+            return NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "lalt"))
+            return NX_DEVICELALTKEYMASK;
+        if (!strcasecmp(str, "ralt"))
+            return NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "lcommand"))
+            return NX_DEVICELCMDKEYMASK;
+        if (!strcasecmp(str, "rcommand"))
+            return NX_DEVICERCMDKEYMASK;
+    }
+    else {
+#endif
+        if (!strcasecmp(str, "shift"))
+            return NX_SHIFTMASK;
+        if (!strcasecmp(str, "control"))
+            return NX_CONTROLMASK;
+        if (!strcasecmp(str, "option"))
+            return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "alt"))
+            return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "command"))
+            return NX_COMMANDMASK;
+        if (!strcasecmp(str, "lshift"))
+            return NX_SHIFTMASK;
+        if (!strcasecmp(str, "rshift"))
+            return NX_SHIFTMASK;
+        if (!strcasecmp(str, "lcontrol"))
+            return NX_CONTROLMASK;
+        if (!strcasecmp(str, "rcontrol"))
+            return NX_CONTROLMASK;
+        if (!strcasecmp(str, "loption"))
+            return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "roption"))
+            return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "lalt"))
+            return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "ralt"))
+            return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "lcommand"))
+            return NX_COMMANDMASK;
+        if (!strcasecmp(str, "rcommand"))
+            return NX_COMMANDMASK;
 #ifdef NX_DEVICELSHIFTKEYMASK
     }
 #endif
-    if (!strcasecmp(str, "lock"))     return NX_ALPHASHIFTMASK;
-    if (!strcasecmp(str, "fn"))       return NX_SECONDARYFNMASK;
-    if (!strcasecmp(str, "help"))     return NX_HELPMASK;
-    if (!strcasecmp(str, "numlock"))  return NX_NUMERICPADMASK;
+    if (!strcasecmp(str, "lock"))
+        return NX_ALPHASHIFTMASK;
+    if (!strcasecmp(str, "fn"))
+        return NX_SECONDARYFNMASK;
+    if (!strcasecmp(str, "help"))
+        return NX_HELPMASK;
+    if (!strcasecmp(str, "numlock"))
+        return NX_NUMERICPADMASK;
     return 0;
 }
 
@@ -613,12 +731,15 @@ int DarwinModifierStringToNXMask(const char *str, int separatelr) {
  *      This allows the ddx layer to prevent some keys from being remapped
  *      as modifier keys.
  */
-Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
+Bool
+LegalModifier(unsigned int key, DeviceIntPtr pDev)
 {
     return 1;
 }
 
-static inline UniChar macroman2ucs(unsigned char c) {
+static inline UniChar
+macroman2ucs(unsigned char c)
+{
     /* Precalculated table mapping MacRoman-128 to Unicode. Generated
        by creating single element CFStringRefs then extracting the
        first character. */
@@ -642,20 +763,27 @@ static inline UniChar macroman2ucs(unsigned char c) {
         0xaf, 0x2d8, 0x2d9, 0x2da, 0xb8, 0x2dd, 0x2db, 0x2c7,
     };
 
-    if (c < 128) return c;
-    else         return table[c - 128];
+    if (c < 128)
+        return c;
+    else
+        return table[c - 128];
 }
 
-static KeySym make_dead_key(KeySym in) {
+static KeySym
+make_dead_key(KeySym in)
+{
     int i;
 
-    for (i = 0; i < sizeof (dead_keys) / sizeof (dead_keys[0]); i++)
-        if (dead_keys[i].normal == in) return dead_keys[i].dead;
+    for (i = 0; i < sizeof(dead_keys) / sizeof(dead_keys[0]); i++)
+        if (dead_keys[i].normal == in)
+            return dead_keys[i].dead;
 
     return in;
 }
 
-static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
+static Bool
+QuartzReadSystemKeymap(darwinKeyboardInfo * info)
+{
 #if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
     KeyboardLayoutRef key_layout;
     int is_uchr = 1;
@@ -669,48 +797,58 @@ static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
     CFDataRef currentKeyLayoutDataRef = NULL;
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-    TISInputSourceRef currentKeyLayoutRef = TISCopyCurrentKeyboardLayoutInputSource();
+    TISInputSourceRef currentKeyLayoutRef =
+        TISCopyCurrentKeyboardLayoutInputSource();
 
     if (currentKeyLayoutRef) {
-      currentKeyLayoutDataRef = (CFDataRef )TISGetInputSourceProperty(currentKeyLayoutRef, kTISPropertyUnicodeKeyLayoutData);
-      if (currentKeyLayoutDataRef)
-          chr_data = CFDataGetBytePtr(currentKeyLayoutDataRef);
+        currentKeyLayoutDataRef =
+            (CFDataRef) TISGetInputSourceProperty(currentKeyLayoutRef,
+                                                  kTISPropertyUnicodeKeyLayoutData);
+        if (currentKeyLayoutDataRef)
+            chr_data = CFDataGetBytePtr(currentKeyLayoutDataRef);
     }
 #endif
 
 #ifdef __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // KLGetCurrentKeyboardLayout, KLGetKeyboardLayoutProperty
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"    // KLGetCurrentKeyboardLayout, KLGetKeyboardLayoutProperty
 #endif
 
 #if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
     if (chr_data == NULL) {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-        ErrorF("X11.app: Error detected in determining keyboard layout.  If you are using an Apple-provided keyboard layout, please report this error at http://xquartz.macosforge.org and http://bugreport.apple.com\n");
-        ErrorF("X11.app: Debug Info: keyboard_type=%u, currentKeyLayoutRef=%p, currentKeyLayoutDataRef=%p, chr_data=%p\n",
-               (unsigned)keyboard_type, currentKeyLayoutRef, currentKeyLayoutDataRef, chr_data);
+        ErrorF
+            ("X11.app: Error detected in determining keyboard layout.  If you are using an Apple-provided keyboard layout, please report this error at http://xquartz.macosforge.org and http://bugreport.apple.com\n");
+        ErrorF
+            ("X11.app: Debug Info: keyboard_type=%u, currentKeyLayoutRef=%p, currentKeyLayoutDataRef=%p, chr_data=%p\n",
+             (unsigned) keyboard_type, currentKeyLayoutRef,
+             currentKeyLayoutDataRef, chr_data);
 #endif
 
-        KLGetCurrentKeyboardLayout (&key_layout);
-        KLGetKeyboardLayoutProperty (key_layout, kKLuchrData, &chr_data);
+        KLGetCurrentKeyboardLayout(&key_layout);
+        KLGetKeyboardLayoutProperty(key_layout, kKLuchrData, &chr_data);
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-        if(chr_data != NULL) {
-            ErrorF("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
+        if (chr_data != NULL) {
+            ErrorF
+                ("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
         }
 #endif
     }
 
     if (chr_data == NULL) {
-        ErrorF("X11.app: Debug Info: kKLuchrData failed, trying kKLKCHRData.\n");
-        ErrorF("If you are using a 3rd party keyboard layout, please see http://xquartz.macosforge.org/trac/ticket/154\n");
-        KLGetKeyboardLayoutProperty (key_layout, kKLKCHRData, &chr_data);
+        ErrorF
+            ("X11.app: Debug Info: kKLuchrData failed, trying kKLKCHRData.\n");
+        ErrorF
+            ("If you are using a 3rd party keyboard layout, please see http://xquartz.macosforge.org/trac/ticket/154\n");
+        KLGetKeyboardLayoutProperty(key_layout, kKLKCHRData, &chr_data);
         is_uchr = 0;
         num_keycodes = 128;
-        
+
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-        if(chr_data != NULL) {
-            ErrorF("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
+        if (chr_data != NULL) {
+            ErrorF
+                ("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
         }
 #endif
     }
@@ -721,61 +859,66 @@ static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
 #endif
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-    if(currentKeyLayoutRef)
+    if (currentKeyLayoutRef)
         CFRelease(currentKeyLayoutRef);
 #endif
-    
+
     if (chr_data == NULL) {
-      ErrorF ( "Couldn't get uchr or kchr resource\n");
-      return FALSE;
+        ErrorF("Couldn't get uchr or kchr resource\n");
+        return FALSE;
     }
-    
+
     /* Scan the keycode range for the Unicode character that each
        key produces in the four shift states. Then convert that to
        an X11 keysym (which may just the bit that says "this is
        Unicode" if it can't find the real symbol.) */
-       
+
     /* KeyTranslate is not available on 64-bit platforms; UCKeyTranslate
        must be used instead. */
 
     for (i = 0; i < num_keycodes; i++) {
-        static const int mods[4] = {0, MOD_SHIFT, MOD_OPTION,
-                                    MOD_OPTION | MOD_SHIFT};
+        static const int mods[4] = { 0, MOD_SHIFT, MOD_OPTION,
+            MOD_OPTION | MOD_SHIFT
+        };
 
         k = info->keyMap + i * GLYPHS_PER_KEY;
 
         for (j = 0; j < 4; j++) {
 #if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
-            if (is_uchr)  {
+            if (is_uchr) {
 #endif
                 UniChar s[8];
                 UniCharCount len;
                 UInt32 dead_key_state = 0, extra_dead = 0;
 
-                err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,
-                                      mods[j] >> 8, keyboard_type, 0,
-                                      &dead_key_state, 8, &len, s);
-                if (err != noErr) continue;
+                err = UCKeyTranslate(chr_data, i, kUCKeyActionDown,
+                                     mods[j] >> 8, keyboard_type, 0,
+                                     &dead_key_state, 8, &len, s);
+                if (err != noErr)
+                    continue;
 
                 if (len == 0 && dead_key_state != 0) {
                     /* Found a dead key. Work out which one it is, but
                        remembering that it's dead. */
-                    err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,
-                                          mods[j] >> 8, keyboard_type,
-                                          kUCKeyTranslateNoDeadKeysMask,
-                                          &extra_dead, 8, &len, s);
-                    if (err != noErr) continue;
+                    err = UCKeyTranslate(chr_data, i, kUCKeyActionDown,
+                                         mods[j] >> 8, keyboard_type,
+                                         kUCKeyTranslateNoDeadKeysMask,
+                                         &extra_dead, 8, &len, s);
+                    if (err != noErr)
+                        continue;
                 }
 
                 /* Not sure why 0x0010 is there.
                  * 0x0000 - <rdar://problem/7793566> 'Unicode Hex Input' ...
                  */
                 if (len > 0 && s[0] != 0x0010 && s[0] != 0x0000) {
-                    k[j] = ucs2keysym (s[0]);
-                    if (dead_key_state != 0) k[j] = make_dead_key (k[j]);
+                    k[j] = ucs2keysym(s[0]);
+                    if (dead_key_state != 0)
+                        k[j] = make_dead_key(k[j]);
                 }
 #if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
-            } else { // kchr
+            }
+            else {              // kchr
                 UInt32 c, state = 0, state2 = 0;
                 UInt16 code;
 
@@ -783,10 +926,10 @@ static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
 
 #ifdef __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // KeyTranslate
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"    // KeyTranslate
 #endif
 
-                c = KeyTranslate (chr_data, code, &state);
+                c = KeyTranslate(chr_data, code, &state);
 
                 /* Dead keys are only processed on key-down, so ask
                    to translate those events. When we find a dead key,
@@ -794,7 +937,7 @@ static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
                    us the actual dead character. */
 
                 if (state != 0)
-                    c = KeyTranslate (chr_data, code | 128, &state2);
+                    c = KeyTranslate(chr_data, code | 128, &state2);
 
 #ifdef __clang__
 #pragma clang diagnostic pop
@@ -803,45 +946,52 @@ static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
                 /* Characters seem to be in MacRoman encoding. */
 
                 if (c != 0 && c != 0x0010) {
-                    k[j] = ucs2keysym (macroman2ucs (c & 255));
+                    k[j] = ucs2keysym(macroman2ucs(c & 255));
 
-                    if (state != 0) k[j] = make_dead_key (k[j]);
+                    if (state != 0)
+                        k[j] = make_dead_key(k[j]);
                 }
             }
 #endif
         }
 
-        if (k[3] == k[2]) k[3] = NoSymbol;
-        if (k[1] == k[0]) k[1] = NoSymbol;
-        if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
-        if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;
+        if (k[3] == k[2])
+            k[3] = NoSymbol;
+        if (k[1] == k[0])
+            k[1] = NoSymbol;
+        if (k[0] == k[2] && k[1] == k[3])
+            k[2] = k[3] = NoSymbol;
+        if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol)
+            k[3] = NoSymbol;
     }
 
 #if HACK_MISSING
     /* Fix up some things that are normally missing.. */
-    
-    for (i = 0; i < sizeof (known_keys) / sizeof (known_keys[0]); i++) {
+
+    for (i = 0; i < sizeof(known_keys) / sizeof(known_keys[0]); i++) {
         k = info->keyMap + known_keys[i].keycode * GLYPHS_PER_KEY;
-        
-        if (   k[0] == NoSymbol && k[1] == NoSymbol
+
+        if (k[0] == NoSymbol && k[1] == NoSymbol
             && k[2] == NoSymbol && k[3] == NoSymbol)
             k[0] = known_keys[i].keysym;
     }
 #endif
-    
+
 #if HACK_KEYPAD
     /* And some more things. We find the right symbols for the numeric
-     keypad, but not the KP_ keysyms. So try to convert known keycodes. */
-    for (i = 0; i < sizeof (known_numeric_keys) / sizeof (known_numeric_keys[0]); i++) {
+       keypad, but not the KP_ keysyms. So try to convert known keycodes. */
+    for (i = 0; i < sizeof(known_numeric_keys) / sizeof(known_numeric_keys[0]);
+         i++) {
         k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;
-        
+
         if (k[0] == known_numeric_keys[i].normal)
             k[0] = known_numeric_keys[i].keypad;
     }
 #endif
-    
+
 #if HACK_BLACKLIST
-    for (i = 0; i < sizeof (keycode_blacklist) / sizeof (keycode_blacklist[0]); i++) {
+    for (i = 0; i < sizeof(keycode_blacklist) / sizeof(keycode_blacklist[0]);
+         i++) {
         k = info->keyMap + keycode_blacklist[i] * GLYPHS_PER_KEY;
         k[0] = k[1] = k[2] = k[3] = NoSymbol;
     }
@@ -852,8 +1002,11 @@ static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
     return TRUE;
 }
 
-Bool QuartsResyncKeymap(Bool sendDDXEvent) {
+Bool
+QuartsResyncKeymap(Bool sendDDXEvent)
+{
     Bool retval;
+
     /* Update keyInfo */
     pthread_mutex_lock(&keyInfo_mutex);
     memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap));
@@ -861,7 +1014,7 @@ Bool QuartsResyncKeymap(Bool sendDDXEvent) {
     pthread_mutex_unlock(&keyInfo_mutex);
 
     /* Tell server thread to deal with new keyInfo */
-    if(sendDDXEvent)
+    if (sendDDXEvent)
         DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
 
     return retval;
diff --git a/xorg-server/hw/xquartz/quartzRandR.c b/xorg-server/hw/xquartz/quartzRandR.c
index 98b382d65..b7c424f50 100644
--- a/xorg-server/hw/xquartz/quartzRandR.c
+++ b/xorg-server/hw/xquartz/quartzRandR.c
@@ -64,14 +64,17 @@ static Bool ignore_next_fake_mode_update = FALSE;
 #define CALLBACK_ERROR -1
 
 typedef int (*QuartzModeCallback)
-    (ScreenPtr, QuartzModeInfoPtr, void *);
+ (ScreenPtr, QuartzModeInfoPtr, void *);
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
 
-static long getDictLong (CFDictionaryRef dictRef, CFStringRef key) {
+static long
+getDictLong(CFDictionaryRef dictRef, CFStringRef key)
+{
     long value;
 
     CFNumberRef numRef = (CFNumberRef) CFDictionaryGetValue(dictRef, key);
+
     if (!numRef)
         return 0;
 
@@ -80,10 +83,13 @@ static long getDictLong (CFDictionaryRef dictRef, CFStringRef key) {
     return value;
 }
 
-static double getDictDouble (CFDictionaryRef dictRef, CFStringRef key) {
+static double
+getDictDouble(CFDictionaryRef dictRef, CFStringRef key)
+{
     double value;
 
     CFNumberRef numRef = (CFNumberRef) CFDictionaryGetValue(dictRef, key);
+
     if (!numRef)
         return 0.0;
 
@@ -92,43 +98,51 @@ static double getDictDouble (CFDictionaryRef dictRef, CFStringRef key) {
     return value;
 }
 
-static void QuartzRandRGetModeInfo (CFDictionaryRef modeRef,
-                                    QuartzModeInfoPtr pMode) {
+static void
+QuartzRandRGetModeInfo(CFDictionaryRef modeRef, QuartzModeInfoPtr pMode)
+{
     pMode->width = (size_t) getDictLong(modeRef, kCGDisplayWidth);
     pMode->height = (size_t) getDictLong(modeRef, kCGDisplayHeight);
-    pMode->refresh = (int)(getDictDouble(modeRef, kCGDisplayRefreshRate) + 0.5);
+    pMode->refresh =
+        (int) (getDictDouble(modeRef, kCGDisplayRefreshRate) + 0.5);
     if (pMode->refresh == 0)
         pMode->refresh = DEFAULT_REFRESH;
     pMode->ref = NULL;
     pMode->pSize = NULL;
 }
 
-static Bool QuartzRandRCopyCurrentModeInfo (CGDirectDisplayID screenId,
-                                           QuartzModeInfoPtr pMode) {
+static Bool
+QuartzRandRCopyCurrentModeInfo(CGDirectDisplayID screenId,
+                               QuartzModeInfoPtr pMode)
+{
     CFDictionaryRef curModeRef = CGDisplayCurrentMode(screenId);
+
     if (!curModeRef)
         return FALSE;
 
     QuartzRandRGetModeInfo(curModeRef, pMode);
-    pMode->ref = (void *)curModeRef;
+    pMode->ref = (void *) curModeRef;
     CFRetain(pMode->ref);
     return TRUE;
 }
 
-static Bool QuartzRandRSetCGMode (CGDirectDisplayID screenId,
-                                QuartzModeInfoPtr pMode) {
+static Bool
+QuartzRandRSetCGMode(CGDirectDisplayID screenId, QuartzModeInfoPtr pMode)
+{
     CFDictionaryRef modeRef = (CFDictionaryRef) pMode->ref;
+
     return (CGDisplaySwitchToMode(screenId, modeRef) == kCGErrorSuccess);
 }
 
-static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,
-                                       QuartzModeCallback callback,
-                                       void *data) {
+static Bool
+QuartzRandREnumerateModes(ScreenPtr pScreen,
+                          QuartzModeCallback callback, void *data)
+{
     Bool retval = FALSE;
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
 
     /* Just an 800x600 fallback if we have no attached heads */
-    if(pQuartzScreen->displayIDs) {
+    if (pQuartzScreen->displayIDs) {
         CFDictionaryRef curModeRef, modeRef;
         long curBpp;
         CFArrayRef modes;
@@ -146,6 +160,7 @@ static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,
             return FALSE;
         for (i = 0; i < CFArrayGetCount(modes); i++) {
             int cb;
+
             modeRef = (CFDictionaryRef) CFArrayGetValueAtIndex(modes, i);
 
             /* Skip modes that are not usable on the current display or have a
@@ -157,7 +172,7 @@ static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,
                 continue;
 
             QuartzRandRGetModeInfo(modeRef, &modeInfo);
-            modeInfo.ref = (void *)modeRef;
+            modeInfo.ref = (void *) modeRef;
             cb = callback(pScreen, &modeInfo, data);
             if (cb == CALLBACK_CONTINUE)
                 retval = TRUE;
@@ -168,35 +183,36 @@ static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,
         }
     }
 
-    switch(callback(pScreen, &pQuartzScreen->rootlessMode, data)) {
-        case CALLBACK_SUCCESS:
-            return TRUE;
-        case CALLBACK_ERROR:
-            return FALSE;
-        case CALLBACK_CONTINUE:
-            retval = TRUE;
-        default:
-            break;
+    switch (callback(pScreen, &pQuartzScreen->rootlessMode, data)) {
+    case CALLBACK_SUCCESS:
+        return TRUE;
+    case CALLBACK_ERROR:
+        return FALSE;
+    case CALLBACK_CONTINUE:
+        retval = TRUE;
+    default:
+        break;
     }
 
-    switch(callback(pScreen, &pQuartzScreen->fullscreenMode, data)) {
-        case CALLBACK_SUCCESS:
-            return TRUE;
-        case CALLBACK_ERROR:
-            return FALSE;
-        case CALLBACK_CONTINUE:
-            retval = TRUE;
-        default:
-            break;
+    switch (callback(pScreen, &pQuartzScreen->fullscreenMode, data)) {
+    case CALLBACK_SUCCESS:
+        return TRUE;
+    case CALLBACK_ERROR:
+        return FALSE;
+    case CALLBACK_CONTINUE:
+        retval = TRUE;
+    default:
+        break;
     }
 
     return retval;
 }
 
-#else /* we have the new CG APIs from Snow Leopard */
+#else                           /* we have the new CG APIs from Snow Leopard */
 
-static void QuartzRandRGetModeInfo (CGDisplayModeRef modeRef,
-                                    QuartzModeInfoPtr pMode) {
+static void
+QuartzRandRGetModeInfo(CGDisplayModeRef modeRef, QuartzModeInfoPtr pMode)
+{
     pMode->width = CGDisplayModeGetWidth(modeRef);
     pMode->height = CGDisplayModeGetHeight(modeRef);
     pMode->refresh = (int) (CGDisplayModeGetRefreshRate(modeRef) + 0.5);
@@ -206,9 +222,12 @@ static void QuartzRandRGetModeInfo (CGDisplayModeRef modeRef,
     pMode->pSize = NULL;
 }
 
-static Bool QuartzRandRCopyCurrentModeInfo (CGDirectDisplayID screenId,
-                                            QuartzModeInfoPtr pMode) {
+static Bool
+QuartzRandRCopyCurrentModeInfo(CGDirectDisplayID screenId,
+                               QuartzModeInfoPtr pMode)
+{
     CGDisplayModeRef curModeRef = CGDisplayCopyDisplayMode(screenId);
+
     if (!curModeRef)
         return FALSE;
 
@@ -217,23 +236,27 @@ static Bool QuartzRandRCopyCurrentModeInfo (CGDirectDisplayID screenId,
     return TRUE;
 }
 
-static Bool QuartzRandRSetCGMode (CGDirectDisplayID screenId,
-                                QuartzModeInfoPtr pMode) {
+static Bool
+QuartzRandRSetCGMode(CGDirectDisplayID screenId, QuartzModeInfoPtr pMode)
+{
     CGDisplayModeRef modeRef = (CGDisplayModeRef) pMode->ref;
+
     if (!modeRef)
         return FALSE;
 
-    return (CGDisplaySetDisplayMode(screenId, modeRef, NULL) == kCGErrorSuccess);
+    return (CGDisplaySetDisplayMode(screenId, modeRef, NULL) ==
+            kCGErrorSuccess);
 }
 
-static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,
-                                       QuartzModeCallback callback,
-                                       void *data) {
+static Bool
+QuartzRandREnumerateModes(ScreenPtr pScreen,
+                          QuartzModeCallback callback, void *data)
+{
     Bool retval = FALSE;
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
 
     /* Just an 800x600 fallback if we have no attached heads */
-    if(pQuartzScreen->displayIDs) {
+    if (pQuartzScreen->displayIDs) {
         CGDisplayModeRef curModeRef, modeRef;
         CFStringRef curPixelEnc, pixelEnc;
         CFComparisonResult pixelEncEqual;
@@ -255,6 +278,7 @@ static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,
         }
         for (i = 0; i < CFArrayGetCount(modes); i++) {
             int cb;
+
             modeRef = (CGDisplayModeRef) CFArrayGetValueAtIndex(modes, i);
 
             /* Skip modes that are not usable on the current display or have a
@@ -273,11 +297,13 @@ static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,
             cb = callback(pScreen, &modeInfo, data);
             if (cb == CALLBACK_CONTINUE) {
                 retval = TRUE;
-            } else if (cb == CALLBACK_SUCCESS) {
+            }
+            else if (cb == CALLBACK_SUCCESS) {
                 CFRelease(modes);
                 CFRelease(curPixelEnc);
                 return TRUE;
-            } else if (cb == CALLBACK_ERROR) {
+            }
+            else if (cb == CALLBACK_ERROR) {
                 CFRelease(modes);
                 CFRelease(curPixelEnc);
                 return FALSE;
@@ -288,81 +314,91 @@ static Bool QuartzRandREnumerateModes (ScreenPtr pScreen,
         CFRelease(curPixelEnc);
     }
 
-    switch(callback(pScreen, &pQuartzScreen->rootlessMode, data)) {
-        case CALLBACK_SUCCESS:
-            return TRUE;
-        case CALLBACK_ERROR:
-            return FALSE;
-        case CALLBACK_CONTINUE:
-            retval = TRUE;
-        default:
-            break;
+    switch (callback(pScreen, &pQuartzScreen->rootlessMode, data)) {
+    case CALLBACK_SUCCESS:
+        return TRUE;
+    case CALLBACK_ERROR:
+        return FALSE;
+    case CALLBACK_CONTINUE:
+        retval = TRUE;
+    default:
+        break;
     }
 
-    switch(callback(pScreen, &pQuartzScreen->fullscreenMode, data)) {
-        case CALLBACK_SUCCESS:
-            return TRUE;
-        case CALLBACK_ERROR:
-            return FALSE;
-        case CALLBACK_CONTINUE:
-            retval = TRUE;
-        default:
-            break;
+    switch (callback(pScreen, &pQuartzScreen->fullscreenMode, data)) {
+    case CALLBACK_SUCCESS:
+        return TRUE;
+    case CALLBACK_ERROR:
+        return FALSE;
+    case CALLBACK_CONTINUE:
+        retval = TRUE;
+    default:
+        break;
     }
 
     return retval;
 }
 
-#endif  /* Snow Leopard CoreGraphics APIs */
+#endif                          /* Snow Leopard CoreGraphics APIs */
 
-
-static Bool QuartzRandRModesEqual (QuartzModeInfoPtr pMode1,
-                                   QuartzModeInfoPtr pMode2) {
+static Bool
+QuartzRandRModesEqual(QuartzModeInfoPtr pMode1, QuartzModeInfoPtr pMode2)
+{
     return (pMode1->width == pMode2->width) &&
-           (pMode1->height == pMode2->height) &&
-           (pMode1->refresh == pMode2->refresh);
+        (pMode1->height == pMode2->height) &&
+        (pMode1->refresh == pMode2->refresh);
 }
 
-static Bool QuartzRandRRegisterMode (ScreenPtr pScreen,
-                                     QuartzModeInfoPtr pMode) {
+static Bool
+QuartzRandRRegisterMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode)
+{
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
-    Bool isCurrentMode = QuartzRandRModesEqual(&pQuartzScreen->currentMode, pMode);
+    Bool isCurrentMode =
+        QuartzRandRModesEqual(&pQuartzScreen->currentMode, pMode);
 
     /* TODO: DPI */
-    pMode->pSize = RRRegisterSize(pScreen, pMode->width, pMode->height, pScreen->mmWidth, pScreen->mmHeight);
+    pMode->pSize =
+        RRRegisterSize(pScreen, pMode->width, pMode->height, pScreen->mmWidth,
+                       pScreen->mmHeight);
     if (pMode->pSize) {
         //DEBUG_LOG("registering: %d x %d @ %d %s\n", (int)pMode->width, (int)pMode->height, (int)pMode->refresh, isCurrentMode ? "*" : "");
         RRRegisterRate(pScreen, pMode->pSize, pMode->refresh);
 
         if (isCurrentMode)
-            RRSetCurrentConfig(pScreen, RR_Rotate_0, pMode->refresh, pMode->pSize);
+            RRSetCurrentConfig(pScreen, RR_Rotate_0, pMode->refresh,
+                               pMode->pSize);
 
         return TRUE;
     }
     return FALSE;
 }
 
-static int QuartzRandRRegisterModeCallback (ScreenPtr pScreen,
-                                        QuartzModeInfoPtr pMode,
-                                        void *data __unused) {
-    if(QuartzRandRRegisterMode(pScreen, pMode)) {
+static int
+QuartzRandRRegisterModeCallback(ScreenPtr pScreen,
+                                QuartzModeInfoPtr pMode, void *data __unused)
+{
+    if (QuartzRandRRegisterMode(pScreen, pMode)) {
         return CALLBACK_CONTINUE;
-    } else {
+    }
+    else {
         return CALLBACK_ERROR;
     }
 }
 
-static Bool QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL doRegister) {
+static Bool
+QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL doRegister)
+{
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
-    Bool captureDisplay = (pMode->refresh != FAKE_REFRESH_FULLSCREEN && pMode->refresh != FAKE_REFRESH_ROOTLESS);
+    Bool captureDisplay = (pMode->refresh != FAKE_REFRESH_FULLSCREEN &&
+                           pMode->refresh != FAKE_REFRESH_ROOTLESS);
     CGDirectDisplayID screenId;
 
-    if(pQuartzScreen->displayIDs == NULL)
+    if (pQuartzScreen->displayIDs == NULL)
         return FALSE;
 
     screenId = pQuartzScreen->displayIDs[0];
-    if(XQuartzShieldingWindowLevel == 0 && captureDisplay) {
-        if(!X11ApplicationCanEnterRandR())
+    if (XQuartzShieldingWindowLevel == 0 && captureDisplay) {
+        if (!X11ApplicationCanEnterRandR())
             return FALSE;
         CGCaptureAllDisplays();
         XQuartzShieldingWindowLevel = CGShieldingWindowLevel(); // 2147483630
@@ -370,11 +406,14 @@ static Bool QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL
                   CGShieldingWindowID(screenId), XQuartzShieldingWindowLevel);
     }
 
-    if (pQuartzScreen->currentMode.ref && CFEqual(pMode->ref, pQuartzScreen->currentMode.ref)) {
+    if (pQuartzScreen->currentMode.ref &&
+        CFEqual(pMode->ref, pQuartzScreen->currentMode.ref)) {
         DEBUG_LOG("Requested RandR resolution matches current CG mode\n");
-    } if (QuartzRandRSetCGMode(screenId, pMode)) {
+    }
+    if (QuartzRandRSetCGMode(screenId, pMode)) {
         ignore_next_fake_mode_update = TRUE;
-    } else {
+    }
+    else {
         DEBUG_LOG("Error while requesting CG resolution change.\n");
         return FALSE;
     }
@@ -387,13 +426,13 @@ static Bool QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL
         QuartzShowFullscreen(TRUE);
     }
 
-    if(pQuartzScreen->currentMode.ref)
+    if (pQuartzScreen->currentMode.ref)
         CFRelease(pQuartzScreen->currentMode.ref);
     pQuartzScreen->currentMode = *pMode;
-    if(pQuartzScreen->currentMode.ref)
+    if (pQuartzScreen->currentMode.ref)
         CFRetain(pQuartzScreen->currentMode.ref);
-    
-    if(XQuartzShieldingWindowLevel != 0 && !captureDisplay) {
+
+    if (XQuartzShieldingWindowLevel != 0 && !captureDisplay) {
         CGReleaseAllDisplays();
         XQuartzShieldingWindowLevel = 0;
     }
@@ -401,32 +440,37 @@ static Bool QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL
     return TRUE;
 }
 
-static int QuartzRandRSetModeCallback (ScreenPtr pScreen,
-                                       QuartzModeInfoPtr pMode,
-                                       void *data) {
+static int
+QuartzRandRSetModeCallback(ScreenPtr pScreen,
+                           QuartzModeInfoPtr pMode, void *data)
+{
     QuartzModeInfoPtr pReqMode = (QuartzModeInfoPtr) data;
-	
+
     if (!QuartzRandRModesEqual(pMode, pReqMode))
-        return CALLBACK_CONTINUE;  /* continue enumeration */
+        return CALLBACK_CONTINUE;       /* continue enumeration */
 
-    DEBUG_LOG("Found a match for requested RandR resolution (%dx%d@%d).\n", (int)pMode->width, (int)pMode->height, (int)pMode->refresh);
+    DEBUG_LOG("Found a match for requested RandR resolution (%dx%d@%d).\n",
+              (int) pMode->width, (int) pMode->height, (int) pMode->refresh);
 
-    if(QuartzRandRSetMode(pScreen, pMode, FALSE))
+    if (QuartzRandRSetMode(pScreen, pMode, FALSE))
         return CALLBACK_SUCCESS;
     else
         return CALLBACK_ERROR;
 }
 
-static Bool QuartzRandRGetInfo (ScreenPtr pScreen, Rotation *rotations) {
-    *rotations = RR_Rotate_0;  /* TODO: support rotation */
+static Bool
+QuartzRandRGetInfo(ScreenPtr pScreen, Rotation * rotations)
+{
+    *rotations = RR_Rotate_0;   /* TODO: support rotation */
 
-    return QuartzRandREnumerateModes(pScreen, QuartzRandRRegisterModeCallback, NULL);
+    return QuartzRandREnumerateModes(pScreen, QuartzRandRRegisterModeCallback,
+                                     NULL);
 }
 
-static Bool QuartzRandRSetConfig (ScreenPtr           pScreen,
-                                  Rotation            randr,
-                                  int                 rate,
-                                  RRScreenSizePtr     pSize) {
+static Bool
+QuartzRandRSetConfig(ScreenPtr pScreen,
+                     Rotation randr, int rate, RRScreenSizePtr pSize)
+{
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
     QuartzModeInfo reqMode;
 
@@ -437,92 +481,111 @@ static Bool QuartzRandRSetConfig (ScreenPtr           pScreen,
     /* Do not switch modes if requested mode is equal to current mode. */
     if (QuartzRandRModesEqual(&reqMode, &pQuartzScreen->currentMode))
         return TRUE;
-        
-    if (QuartzRandREnumerateModes(pScreen, QuartzRandRSetModeCallback, &reqMode)) {
+
+    if (QuartzRandREnumerateModes
+        (pScreen, QuartzRandRSetModeCallback, &reqMode)) {
         return TRUE;
     }
-    
-    DEBUG_LOG("Unable to find a matching config: %d x %d @ %d\n", (int)reqMode.width, (int)reqMode.height, (int)reqMode.refresh);
+
+    DEBUG_LOG("Unable to find a matching config: %d x %d @ %d\n",
+              (int) reqMode.width, (int) reqMode.height, (int) reqMode.refresh);
     return FALSE;
 }
 
-static Bool _QuartzRandRUpdateFakeModes (ScreenPtr pScreen) {
+static Bool
+_QuartzRandRUpdateFakeModes(ScreenPtr pScreen)
+{
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
     QuartzModeInfo activeMode;
 
-    if(pQuartzScreen->displayCount > 0) {
-        if(!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0], &activeMode)) {
+    if (pQuartzScreen->displayCount > 0) {
+        if (!QuartzRandRCopyCurrentModeInfo
+            (pQuartzScreen->displayIDs[0], &activeMode)) {
             ErrorF("Unable to determine current display mode.\n");
             return FALSE;
         }
-    } else {
+    }
+    else {
         memset(&activeMode, 0, sizeof(activeMode));
         activeMode.width = 800;
         activeMode.height = 600;
         activeMode.refresh = 60;
     }
 
-    if(pQuartzScreen->fullscreenMode.ref)
+    if (pQuartzScreen->fullscreenMode.ref)
         CFRelease(pQuartzScreen->fullscreenMode.ref);
-    if(pQuartzScreen->currentMode.ref)
+    if (pQuartzScreen->currentMode.ref)
         CFRelease(pQuartzScreen->currentMode.ref);
 
-    if(pQuartzScreen->displayCount > 1) {
+    if (pQuartzScreen->displayCount > 1) {
         activeMode.width = pScreen->width;
         activeMode.height = pScreen->height;
-        if(XQuartzIsRootless)
+        if (XQuartzIsRootless)
             activeMode.height += aquaMenuBarHeight;
     }
 
-    pQuartzScreen->fullscreenMode = activeMode; 
+    pQuartzScreen->fullscreenMode = activeMode;
     pQuartzScreen->fullscreenMode.refresh = FAKE_REFRESH_FULLSCREEN;
 
     pQuartzScreen->rootlessMode = activeMode;
     pQuartzScreen->rootlessMode.refresh = FAKE_REFRESH_ROOTLESS;
     pQuartzScreen->rootlessMode.height -= aquaMenuBarHeight;
 
-    if(XQuartzIsRootless) {
+    if (XQuartzIsRootless) {
         pQuartzScreen->currentMode = pQuartzScreen->rootlessMode;
-    } else {
+    }
+    else {
         pQuartzScreen->currentMode = pQuartzScreen->fullscreenMode;
     }
 
     /* This extra retain is for currentMode's copy.
      * fullscreen and rootless share a retain.
      */
-    if(pQuartzScreen->currentMode.ref)
+    if (pQuartzScreen->currentMode.ref)
         CFRetain(pQuartzScreen->currentMode.ref);
-    
-    DEBUG_LOG("rootlessMode: %d x %d\n", (int)pQuartzScreen->rootlessMode.width, (int)pQuartzScreen->rootlessMode.height);
-    DEBUG_LOG("fullscreenMode: %d x %d\n", (int)pQuartzScreen->fullscreenMode.width, (int)pQuartzScreen->fullscreenMode.height);
-    DEBUG_LOG("currentMode: %d x %d\n", (int)pQuartzScreen->currentMode.width, (int)pQuartzScreen->currentMode.height);
-    
+
+    DEBUG_LOG("rootlessMode: %d x %d\n",
+              (int) pQuartzScreen->rootlessMode.width,
+              (int) pQuartzScreen->rootlessMode.height);
+    DEBUG_LOG("fullscreenMode: %d x %d\n",
+              (int) pQuartzScreen->fullscreenMode.width,
+              (int) pQuartzScreen->fullscreenMode.height);
+    DEBUG_LOG("currentMode: %d x %d\n", (int) pQuartzScreen->currentMode.width,
+              (int) pQuartzScreen->currentMode.height);
+
     return TRUE;
 }
 
-Bool QuartzRandRUpdateFakeModes (BOOL force_update) {
+Bool
+QuartzRandRUpdateFakeModes(BOOL force_update)
+{
     ScreenPtr pScreen = screenInfo.screens[0];
-    
-    if(ignore_next_fake_mode_update) {
-        DEBUG_LOG("Ignoring update request caused by RandR resolution change.\n");
+
+    if (ignore_next_fake_mode_update) {
+        DEBUG_LOG
+            ("Ignoring update request caused by RandR resolution change.\n");
         ignore_next_fake_mode_update = FALSE;
         return TRUE;
     }
-    
-    if(!_QuartzRandRUpdateFakeModes(pScreen))
+
+    if (!_QuartzRandRUpdateFakeModes(pScreen))
         return FALSE;
-    
-    if(force_update)
+
+    if (force_update)
         RRGetInfo(pScreen, TRUE);
 
     return TRUE;
 }
 
-Bool QuartzRandRInit (ScreenPtr pScreen) {
-    rrScrPrivPtr    pScrPriv;
-    
-    if (!RRScreenInit (pScreen)) return FALSE;
-    if (!_QuartzRandRUpdateFakeModes (pScreen)) return FALSE;
+Bool
+QuartzRandRInit(ScreenPtr pScreen)
+{
+    rrScrPrivPtr pScrPriv;
+
+    if (!RRScreenInit(pScreen))
+        return FALSE;
+    if (!_QuartzRandRUpdateFakeModes(pScreen))
+        return FALSE;
 
     pScrPriv = rrGetScrPriv(pScreen);
     pScrPriv->rrGetInfo = QuartzRandRGetInfo;
@@ -530,12 +593,14 @@ Bool QuartzRandRInit (ScreenPtr pScreen) {
     return TRUE;
 }
 
-void QuartzRandRSetFakeRootless (void) {
+void
+QuartzRandRSetFakeRootless(void)
+{
     int i;
-    
+
     DEBUG_LOG("QuartzRandRSetFakeRootless called.\n");
-    
-    for (i=0; i < screenInfo.numScreens; i++) {
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
         ScreenPtr pScreen = screenInfo.screens[i];
         QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
 
@@ -543,18 +608,20 @@ void QuartzRandRSetFakeRootless (void) {
     }
 }
 
-void QuartzRandRSetFakeFullscreen (BOOL state) {
+void
+QuartzRandRSetFakeFullscreen(BOOL state)
+{
     int i;
 
     DEBUG_LOG("QuartzRandRSetFakeFullscreen called.\n");
-    
-    for (i=0; i < screenInfo.numScreens; i++) {
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
         ScreenPtr pScreen = screenInfo.screens[i];
         QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
 
         QuartzRandRSetMode(pScreen, &pQuartzScreen->fullscreenMode, TRUE);
     }
-    
+
     QuartzShowFullscreen(state);
 }
 
@@ -563,23 +630,31 @@ void QuartzRandRSetFakeFullscreen (BOOL state) {
  * mode, this will toggles us to the default fake mode and hide windows if
  * it is fullscreen
  */
-void QuartzRandRToggleFullscreen (void) {
+void
+QuartzRandRToggleFullscreen(void)
+{
     ScreenPtr pScreen = screenInfo.screens[0];
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
 
     if (pQuartzScreen->currentMode.ref == NULL) {
-        ErrorF("Ignoring QuartzRandRToggleFullscreen because don't have a current mode set.\n");
-    } else if (pQuartzScreen->currentMode.refresh == FAKE_REFRESH_ROOTLESS) {
-        ErrorF("Ignoring QuartzRandRToggleFullscreen because we are in rootless mode.\n");
-    } else if (pQuartzScreen->currentMode.refresh == FAKE_REFRESH_FULLSCREEN) {
+        ErrorF
+            ("Ignoring QuartzRandRToggleFullscreen because don't have a current mode set.\n");
+    }
+    else if (pQuartzScreen->currentMode.refresh == FAKE_REFRESH_ROOTLESS) {
+        ErrorF
+            ("Ignoring QuartzRandRToggleFullscreen because we are in rootless mode.\n");
+    }
+    else if (pQuartzScreen->currentMode.refresh == FAKE_REFRESH_FULLSCREEN) {
         /* Legacy fullscreen mode.  Hide/Show */
         QuartzShowFullscreen(!XQuartzFullscreenVisible);
-    } else {
+    }
+    else {
         /* RandR fullscreen mode.  Return to default mode and hide if it is fullscreen. */
-        if(XQuartzRootlessDefault) {
+        if (XQuartzRootlessDefault) {
             QuartzRandRSetFakeRootless();
-        } else {
+        }
+        else {
             QuartzRandRSetFakeFullscreen(FALSE);
         }
-    }    
+    }
 }
diff --git a/xorg-server/hw/xquartz/quartzStartup.c b/xorg-server/hw/xquartz/quartzStartup.c
index 25ef76efa..183bf7618 100644
--- a/xorg-server/hw/xquartz/quartzStartup.c
+++ b/xorg-server/hw/xquartz/quartzStartup.c
@@ -56,59 +56,68 @@ struct arg {
     char **envp;
 };
 
-_X_NORETURN
-static void server_thread (void *arg) {
-    struct arg args = *((struct arg *)arg);
+_X_NORETURN static void
+server_thread(void *arg)
+{
+    struct arg args = *((struct arg *) arg);
+
     free(arg);
-    exit (dix_main(args.argc, args.argv, args.envp));
+    exit(dix_main(args.argc, args.argv, args.envp));
 }
 
-static pthread_t create_thread (void *func, void *arg) {
+static pthread_t
+create_thread(void *func, void *arg)
+{
     pthread_attr_t attr;
     pthread_t tid;
-	
-    pthread_attr_init (&attr);
-    pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);
-    pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
-    pthread_create (&tid, &attr, func, arg);
-    pthread_attr_destroy (&attr);
-	
+
+    pthread_attr_init(&attr);
+    pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
+    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+    pthread_create(&tid, &attr, func, arg);
+    pthread_attr_destroy(&attr);
+
     return tid;
 }
 
-void QuartzInitServer(int argc, char **argv, char **envp) {
-    struct arg *args = (struct arg*)malloc(sizeof(struct arg));
-    if(!args)
+void
+QuartzInitServer(int argc, char **argv, char **envp)
+{
+    struct arg *args = (struct arg *) malloc(sizeof(struct arg));
+
+    if (!args)
         FatalError("Could not allocate memory.\n");
-    
+
     args->argc = argc;
     args->argv = argv;
     args->envp = envp;
-    
+
     if (!create_thread(server_thread, args)) {
         FatalError("can't create secondary thread\n");
     }
 }
 
-int server_main(int argc, char **argv, char **envp) {
-    int         i;
-    int         fd[2];
+int
+server_main(int argc, char **argv, char **envp)
+{
+    int i;
+    int fd[2];
 
     /* Unset CFProcessPath, so our children don't inherit this kludge we need
      * to load our nib.  If an xterm gets this set, then it fails to
      * 'open hi.txt' properly.
      */
     unsetenv("CFProcessPath");
-    
+
     // Make a pipe to pass events
-    assert( pipe(fd) == 0 );
+    assert(pipe(fd) == 0);
     darwinEventReadFD = fd[0];
     darwinEventWriteFD = fd[1];
     fcntl(darwinEventReadFD, F_SETFL, O_NONBLOCK);
 
     for (i = 1; i < argc; i++) {
         // Display version info without starting Mac OS X UI if requested
-        if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {
+        if (!strcmp(argv[i], "-showconfig") || !strcmp(argv[i], "-version")) {
             DarwinPrintBanner();
             exit(0);
         }
diff --git a/xorg-server/hw/xquartz/xpr/appledri.c b/xorg-server/hw/xquartz/xpr/appledri.c
index 44c132abc..4ef0061b2 100644
--- a/xorg-server/hw/xquartz/xpr/appledri.c
+++ b/xorg-server/hw/xquartz/xpr/appledri.c
@@ -59,36 +59,31 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 static int DRIErrorBase = 0;
 
-
-static void AppleDRIResetProc(ExtensionEntry* extEntry);
+static void AppleDRIResetProc(ExtensionEntry * extEntry);
 static int ProcAppleDRICreatePixmap(ClientPtr client);
 
 static unsigned char DRIReqCode = 0;
 static int DRIEventBase = 0;
 
-static void SNotifyEvent(xAppleDRINotifyEvent *from, xAppleDRINotifyEvent *to);
+static void SNotifyEvent(xAppleDRINotifyEvent * from,
+                         xAppleDRINotifyEvent * to);
 
 typedef struct _DRIEvent *DRIEventPtr;
 typedef struct _DRIEvent {
-    DRIEventPtr     next;
-    ClientPtr       client;
-    XID             clientResource;
-    unsigned int    mask;
+    DRIEventPtr next;
+    ClientPtr client;
+    XID clientResource;
+    unsigned int mask;
 } DRIEventRec;
 
-/*ARGSUSED*/
-static void
-AppleDRIResetProc (
-    ExtensionEntry* extEntry
-)
+ /*ARGSUSED*/ static void
+AppleDRIResetProc(ExtensionEntry * extEntry)
 {
     DRIReset();
 }
 
 static int
-ProcAppleDRIQueryVersion(
-    register ClientPtr client
-)
+ProcAppleDRIQueryVersion(register ClientPtr client)
 {
     xAppleDRIQueryVersionReply rep;
 
@@ -106,17 +101,14 @@ ProcAppleDRIQueryVersion(
         swaps(&rep.minorVersion);
         swapl(&rep.patchVersion);
     }
-    WriteToClient(client, sizeof(xAppleDRIQueryVersionReply), (char *)&rep);
+    WriteToClient(client, sizeof(xAppleDRIQueryVersionReply), (char *) &rep);
     return Success;
 }
 
-
 /* surfaces */
 
 static int
-ProcAppleDRIQueryDirectRenderingCapable(
-    register ClientPtr client
-)
+ProcAppleDRIQueryDirectRenderingCapable(register ClientPtr client)
 {
     xAppleDRIQueryDirectRenderingCapableReply rep;
     Bool isCapable;
@@ -127,8 +119,8 @@ ProcAppleDRIQueryDirectRenderingCapable(
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    if (!DRIQueryDirectRenderingCapable( screenInfo.screens[stuff->screen], 
-                                         &isCapable)) {
+    if (!DRIQueryDirectRenderingCapable(screenInfo.screens[stuff->screen],
+                                        &isCapable)) {
         return BadValue;
     }
     rep.isCapable = isCapable;
@@ -141,18 +133,17 @@ ProcAppleDRIQueryDirectRenderingCapable(
         swapl(&rep.length);
     }
 
-    WriteToClient(client, 
-        sizeof(xAppleDRIQueryDirectRenderingCapableReply), (char *)&rep);
+    WriteToClient(client,
+                  sizeof(xAppleDRIQueryDirectRenderingCapableReply),
+                  (char *) &rep);
     return Success;
 }
 
 static int
-ProcAppleDRIAuthConnection(
-    register ClientPtr client
-)
+ProcAppleDRIAuthConnection(register ClientPtr client)
 {
     xAppleDRIAuthConnectionReply rep;
-    
+
     REQUEST(xAppleDRIAuthConnectionReq);
     REQUEST_SIZE_MATCH(xAppleDRIAuthConnectionReq);
 
@@ -161,25 +152,23 @@ ProcAppleDRIAuthConnection(
     rep.sequenceNumber = client->sequence;
     rep.authenticated = 1;
 
-    if (!DRIAuthConnection( screenInfo.screens[stuff->screen], stuff->magic)) {
-        ErrorF("Failed to authenticate %u\n", (unsigned int)stuff->magic);
+    if (!DRIAuthConnection(screenInfo.screens[stuff->screen], stuff->magic)) {
+        ErrorF("Failed to authenticate %u\n", (unsigned int) stuff->magic);
         rep.authenticated = 0;
     }
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
-        swapl(&rep.authenticated); /* Yes, this is a CARD32 ... sigh */
+        swapl(&rep.authenticated);      /* Yes, this is a CARD32 ... sigh */
     }
 
-    WriteToClient(client, sizeof(xAppleDRIAuthConnectionReply), (char *)&rep);
+    WriteToClient(client, sizeof(xAppleDRIAuthConnectionReply), (char *) &rep);
     return Success;
 }
 
-static void surface_notify(
-    void *_arg,
-    void *data
-)
+static void
+surface_notify(void *_arg, void *data)
 {
     DRISurfaceNotifyArg *arg = _arg;
     int client_index = (int) x_cvt_vptr_to_uint(data);
@@ -192,13 +181,11 @@ static void surface_notify(
     se.kind = arg->kind;
     se.arg = arg->id;
     se.time = currentTime.milliseconds;
-    WriteEventsToClient (clients[client_index], 1, (xEvent *) &se);
+    WriteEventsToClient(clients[client_index], 1, (xEvent *) &se);
 }
 
 static int
-ProcAppleDRICreateSurface(
-    ClientPtr client
-)
+ProcAppleDRICreateSurface(ClientPtr client)
 {
     xAppleDRICreateSurfaceReply rep;
     DrawablePtr pDrawable;
@@ -213,17 +200,16 @@ ProcAppleDRICreateSurface(
     rep.sequenceNumber = client->sequence;
 
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
-			   DixReadAccess);
+                           DixReadAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
     rep.key_0 = rep.key_1 = rep.uid = 0;
 
-    if (!DRICreateSurface( screenInfo.screens[stuff->screen],
-                           (Drawable)stuff->drawable, pDrawable,
-                           stuff->client_id, &sid, key,
-                           surface_notify,
-                           x_cvt_uint_to_vptr(client->index))) {
+    if (!DRICreateSurface(screenInfo.screens[stuff->screen],
+                          (Drawable) stuff->drawable, pDrawable,
+                          stuff->client_id, &sid, key,
+                          surface_notify, x_cvt_uint_to_vptr(client->index))) {
         return BadValue;
     }
 
@@ -239,28 +225,27 @@ ProcAppleDRICreateSurface(
         swapl(&rep.uid);
     }
 
-    WriteToClient(client, sizeof(xAppleDRICreateSurfaceReply), (char *)&rep);
+    WriteToClient(client, sizeof(xAppleDRICreateSurfaceReply), (char *) &rep);
     return Success;
 }
 
 static int
-ProcAppleDRIDestroySurface(
-    register ClientPtr client
-)
+ProcAppleDRIDestroySurface(register ClientPtr client)
 {
     int rc;
+
     REQUEST(xAppleDRIDestroySurfaceReq);
     DrawablePtr pDrawable;
+
     REQUEST_SIZE_MATCH(xAppleDRIDestroySurfaceReq);
 
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
-			   DixReadAccess);
+                           DixReadAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
-    if (!DRIDestroySurface( screenInfo.screens[stuff->screen], 
-                            (Drawable)stuff->drawable,
-                            pDrawable, NULL, NULL)) {
+    if (!DRIDestroySurface(screenInfo.screens[stuff->screen],
+                           (Drawable) stuff->drawable, pDrawable, NULL, NULL)) {
         return BadValue;
     }
 
@@ -283,23 +268,21 @@ ProcAppleDRICreatePixmap(ClientPtr client)
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
                            DixReadAccess);
 
-    if(rc != Success)
+    if (rc != Success)
         return rc;
-    
-    if(!DRICreatePixmap(screenInfo.screens[stuff->screen],
-                              (Drawable)stuff->drawable,
-                              pDrawable,
-			      path, PATH_MAX)) {
+
+    if (!DRICreatePixmap(screenInfo.screens[stuff->screen],
+                         (Drawable) stuff->drawable,
+                         pDrawable, path, PATH_MAX)) {
+        return BadValue;
+    }
+
+    if (!DRIGetPixmapData(pDrawable, &width, &height, &pitch, &bpp, &ptr)) {
         return BadValue;
     }
 
-    if(!DRIGetPixmapData(pDrawable, &width, &height,
-			 &pitch, &bpp, &ptr)) {
-	return BadValue;
-    } 
-	
     rep.stringLength = strlen(path) + 1;
-		
+
     rep.type = X_Reply;
     rep.length = bytes_to_int32(rep.stringLength);
     rep.sequenceNumber = client->sequence;
@@ -309,9 +292,9 @@ ProcAppleDRICreatePixmap(ClientPtr client)
     rep.bpp = bpp;
     rep.size = pitch * height;
 
-    if(sizeof(rep) != sz_xAppleDRICreatePixmapReply)
-	ErrorF("error sizeof(rep) is %zu\n", sizeof(rep)); 
-    
+    if (sizeof(rep) != sz_xAppleDRICreatePixmapReply)
+        ErrorF("error sizeof(rep) is %zu\n", sizeof(rep));
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -334,15 +317,16 @@ ProcAppleDRIDestroyPixmap(ClientPtr client)
 {
     DrawablePtr pDrawable;
     int rc;
+
     REQUEST(xAppleDRIDestroyPixmapReq);
     REQUEST_SIZE_MATCH(xAppleDRIDestroyPixmapReq);
 
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
-			    DixReadAccess);
+                           DixReadAccess);
+
+    if (rc != Success)
+        return rc;
 
-    if(rc != Success)
-	return rc;
-    
     DRIDestroyPixmap(pDrawable);
 
     return Success;
@@ -351,14 +335,11 @@ ProcAppleDRIDestroyPixmap(ClientPtr client)
 /* dispatch */
 
 static int
-ProcAppleDRIDispatch (
-    register ClientPtr client
-)
+ProcAppleDRIDispatch(register ClientPtr client)
 {
     REQUEST(xReq);
 
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_AppleDRIQueryVersion:
         return ProcAppleDRIQueryVersion(client);
     case X_AppleDRIQueryDirectRenderingCapable:
@@ -368,8 +349,7 @@ ProcAppleDRIDispatch (
     if (!LocalClient(client))
         return DRIErrorBase + AppleDRIClientNotLocal;
 
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_AppleDRIAuthConnection:
         return ProcAppleDRIAuthConnection(client);
     case X_AppleDRICreateSurface:
@@ -377,9 +357,9 @@ ProcAppleDRIDispatch (
     case X_AppleDRIDestroySurface:
         return ProcAppleDRIDestroySurface(client);
     case X_AppleDRICreatePixmap:
-	return ProcAppleDRICreatePixmap(client);
+        return ProcAppleDRICreatePixmap(client);
     case X_AppleDRIDestroyPixmap:
-	return ProcAppleDRIDestroyPixmap(client);
+        return ProcAppleDRIDestroyPixmap(client);
 
     default:
         return BadRequest;
@@ -387,22 +367,17 @@ ProcAppleDRIDispatch (
 }
 
 static void
-SNotifyEvent(
-    xAppleDRINotifyEvent *from,
-    xAppleDRINotifyEvent *to
-)
+SNotifyEvent(xAppleDRINotifyEvent * from, xAppleDRINotifyEvent * to)
 {
     to->type = from->type;
     to->kind = from->kind;
-    cpswaps (from->sequenceNumber, to->sequenceNumber);
-    cpswapl (from->time, to->time);
-    cpswapl (from->arg, to->arg);
+    cpswaps(from->sequenceNumber, to->sequenceNumber);
+    cpswapl(from->time, to->time);
+    cpswapl(from->arg, to->arg);
 }
 
 static int
-SProcAppleDRIQueryVersion(
-    register ClientPtr client
-)
+SProcAppleDRIQueryVersion(register ClientPtr client)
 {
     REQUEST(xAppleDRIQueryVersionReq);
     swaps(&stuff->length);
@@ -410,9 +385,7 @@ SProcAppleDRIQueryVersion(
 }
 
 static int
-SProcAppleDRIQueryDirectRenderingCapable(
-    register ClientPtr client
-)
+SProcAppleDRIQueryDirectRenderingCapable(register ClientPtr client)
 {
     REQUEST(xAppleDRIQueryDirectRenderingCapableReq);
     swaps(&stuff->length);
@@ -421,9 +394,7 @@ SProcAppleDRIQueryDirectRenderingCapable(
 }
 
 static int
-SProcAppleDRIAuthConnection(
-    register ClientPtr client
-)
+SProcAppleDRIAuthConnection(register ClientPtr client)
 {
     REQUEST(xAppleDRIAuthConnectionReq);
     swaps(&stuff->length);
@@ -433,9 +404,7 @@ SProcAppleDRIAuthConnection(
 }
 
 static int
-SProcAppleDRICreateSurface(
-    register ClientPtr client
-)
+SProcAppleDRICreateSurface(register ClientPtr client)
 {
     REQUEST(xAppleDRICreateSurfaceReq);
     swaps(&stuff->length);
@@ -446,9 +415,7 @@ SProcAppleDRICreateSurface(
 }
 
 static int
-SProcAppleDRIDestroySurface(
-    register ClientPtr client
-)
+SProcAppleDRIDestroySurface(register ClientPtr client)
 {
     REQUEST(xAppleDRIDestroySurfaceReq);
     swaps(&stuff->length);
@@ -458,9 +425,7 @@ SProcAppleDRIDestroySurface(
 }
 
 static int
-SProcAppleDRICreatePixmap(
-    register ClientPtr client
-)
+SProcAppleDRICreatePixmap(register ClientPtr client)
 {
     REQUEST(xAppleDRICreatePixmapReq);
     swaps(&stuff->length);
@@ -470,9 +435,7 @@ SProcAppleDRICreatePixmap(
 }
 
 static int
-SProcAppleDRIDestroyPixmap(
-    register ClientPtr client
-)
+SProcAppleDRIDestroyPixmap(register ClientPtr client)
 {
     REQUEST(xAppleDRIDestroyPixmapReq);
     swaps(&stuff->length);
@@ -481,14 +444,11 @@ SProcAppleDRIDestroyPixmap(
 }
 
 static int
-SProcAppleDRIDispatch (
-    register ClientPtr client
-)
+SProcAppleDRIDispatch(register ClientPtr client)
 {
     REQUEST(xReq);
 
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_AppleDRIQueryVersion:
         return SProcAppleDRIQueryVersion(client);
     case X_AppleDRIQueryDirectRenderingCapable:
@@ -498,8 +458,7 @@ SProcAppleDRIDispatch (
     if (!LocalClient(client))
         return DRIErrorBase + AppleDRIClientNotLocal;
 
-    switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_AppleDRIAuthConnection:
         return SProcAppleDRIAuthConnection(client);
     case X_AppleDRICreateSurface:
@@ -507,9 +466,9 @@ SProcAppleDRIDispatch (
     case X_AppleDRIDestroySurface:
         return SProcAppleDRIDestroySurface(client);
     case X_AppleDRICreatePixmap:
-	return SProcAppleDRICreatePixmap(client);
+        return SProcAppleDRICreatePixmap(client);
     case X_AppleDRIDestroyPixmap:
-	return SProcAppleDRIDestroyPixmap(client);
+        return SProcAppleDRIDestroyPixmap(client);
 
     default:
         return BadRequest;
@@ -519,7 +478,7 @@ SProcAppleDRIDispatch (
 void
 AppleDRIExtensionInit(void)
 {
-    ExtensionEntry* extEntry;
+    ExtensionEntry *extEntry;
 
     if (DRIExtensionInit() &&
         (extEntry = AddExtension(APPLEDRINAME,
@@ -527,13 +486,13 @@ AppleDRIExtensionInit(void)
                                  AppleDRINumberErrors,
                                  ProcAppleDRIDispatch,
                                  SProcAppleDRIDispatch,
-                                 AppleDRIResetProc,
-                                 StandardMinorOpcode))) {
+                                 AppleDRIResetProc, StandardMinorOpcode))) {
         size_t i;
-        DRIReqCode = (unsigned char)extEntry->base;
+
+        DRIReqCode = (unsigned char) extEntry->base;
         DRIErrorBase = extEntry->errorBase;
         DRIEventBase = extEntry->eventBase;
-        for (i=0; i < AppleDRINumberEvents; i++)
+        for (i = 0; i < AppleDRINumberEvents; i++)
             EventSwapVector[DRIEventBase + i] = (EventSwapPtr) SNotifyEvent;
     }
 }
diff --git a/xorg-server/hw/xquartz/xpr/appledristr.h b/xorg-server/hw/xquartz/xpr/appledristr.h
index b5ffe5b46..131a699d9 100644
--- a/xorg-server/hw/xquartz/xpr/appledristr.h
+++ b/xorg-server/hw/xquartz/xpr/appledristr.h
@@ -46,207 +46,200 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define APPLE_DRI_MINOR_VERSION	0
 #define APPLE_DRI_PATCH_VERSION	0
 
-typedef struct _AppleDRIQueryVersion
-{
-   CARD8 reqType;               /* always DRIReqCode */
-   CARD8 driReqType;            /* always X_DRIQueryVersion */
-   CARD16 length B16;
+typedef struct _AppleDRIQueryVersion {
+    CARD8 reqType;              /* always DRIReqCode */
+    CARD8 driReqType;           /* always X_DRIQueryVersion */
+    CARD16 length B16;
 } xAppleDRIQueryVersionReq;
+
 #define sz_xAppleDRIQueryVersionReq	4
 
-typedef struct
-{
-   BYTE type;                   /* X_Reply */
-   BOOL pad1;
-   CARD16 sequenceNumber B16;
-   CARD32 length B32;
-   CARD16 majorVersion B16;     /* major version of DRI protocol */
-   CARD16 minorVersion B16;     /* minor version of DRI protocol */
-   CARD32 patchVersion B32;     /* patch version of DRI protocol */
-   CARD32 pad3 B32;
-   CARD32 pad4 B32;
-   CARD32 pad5 B32;
-   CARD32 pad6 B32;
+typedef struct {
+    BYTE type;                  /* X_Reply */
+    BOOL pad1;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32;
+    CARD16 majorVersion B16;    /* major version of DRI protocol */
+    CARD16 minorVersion B16;    /* minor version of DRI protocol */
+    CARD32 patchVersion B32;    /* patch version of DRI protocol */
+    CARD32 pad3 B32;
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+    CARD32 pad6 B32;
 } xAppleDRIQueryVersionReply;
+
 #define sz_xAppleDRIQueryVersionReply	32
 
-typedef struct _AppleDRIQueryDirectRenderingCapable
-{
-   CARD8 reqType;               /* always DRIReqCode */
-   CARD8 driReqType;            /* X_DRIQueryDirectRenderingCapable */
-   CARD16 length B16;
-   CARD32 screen B32;
+typedef struct _AppleDRIQueryDirectRenderingCapable {
+    CARD8 reqType;              /* always DRIReqCode */
+    CARD8 driReqType;           /* X_DRIQueryDirectRenderingCapable */
+    CARD16 length B16;
+    CARD32 screen B32;
 } xAppleDRIQueryDirectRenderingCapableReq;
+
 #define sz_xAppleDRIQueryDirectRenderingCapableReq	8
 
-typedef struct
-{
-   BYTE type;                   /* X_Reply */
-   BOOL pad1;
-   CARD16 sequenceNumber B16;
-   CARD32 length B32;
-   BOOL isCapable;
-   BOOL pad2;
-   BOOL pad3;
-   BOOL pad4;
-   CARD32 pad5 B32;
-   CARD32 pad6 B32;
-   CARD32 pad7 B32;
-   CARD32 pad8 B32;
-   CARD32 pad9 B32;
+typedef struct {
+    BYTE type;                  /* X_Reply */
+    BOOL pad1;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32;
+    BOOL isCapable;
+    BOOL pad2;
+    BOOL pad3;
+    BOOL pad4;
+    CARD32 pad5 B32;
+    CARD32 pad6 B32;
+    CARD32 pad7 B32;
+    CARD32 pad8 B32;
+    CARD32 pad9 B32;
 } xAppleDRIQueryDirectRenderingCapableReply;
+
 #define sz_xAppleDRIQueryDirectRenderingCapableReply	32
 
-typedef struct _AppleDRIAuthConnection
-{
-   CARD8 reqType;               /* always DRIReqCode */
-   CARD8 driReqType;            /* always X_DRICloseConnection */
-   CARD16 length B16;
-   CARD32 screen B32;
-   CARD32 magic B32;
+typedef struct _AppleDRIAuthConnection {
+    CARD8 reqType;              /* always DRIReqCode */
+    CARD8 driReqType;           /* always X_DRICloseConnection */
+    CARD16 length B16;
+    CARD32 screen B32;
+    CARD32 magic B32;
 } xAppleDRIAuthConnectionReq;
+
 #define sz_xAppleDRIAuthConnectionReq	12
 
-typedef struct
-{
-   BYTE type;
-   BOOL pad1;
-   CARD16 sequenceNumber B16;
-   CARD32 length B32;
-   CARD32 authenticated B32;
-   CARD32 pad2 B32;
-   CARD32 pad3 B32;
-   CARD32 pad4 B32;
-   CARD32 pad5 B32;
-   CARD32 pad6 B32;
+typedef struct {
+    BYTE type;
+    BOOL pad1;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32;
+    CARD32 authenticated B32;
+    CARD32 pad2 B32;
+    CARD32 pad3 B32;
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+    CARD32 pad6 B32;
 } xAppleDRIAuthConnectionReply;
+
 #define zx_xAppleDRIAuthConnectionReply  32
 
-typedef struct _AppleDRICreateSurface
-{
-   CARD8 reqType;               /* always DRIReqCode */
-   CARD8 driReqType;            /* always X_DRICreateSurface */
-   CARD16 length B16;
-   CARD32 screen B32;
-   CARD32 drawable B32;
-   CARD32 client_id B32;
+typedef struct _AppleDRICreateSurface {
+    CARD8 reqType;              /* always DRIReqCode */
+    CARD8 driReqType;           /* always X_DRICreateSurface */
+    CARD16 length B16;
+    CARD32 screen B32;
+    CARD32 drawable B32;
+    CARD32 client_id B32;
 } xAppleDRICreateSurfaceReq;
+
 #define sz_xAppleDRICreateSurfaceReq	16
 
-typedef struct
-{
-   BYTE type;                   /* X_Reply */
-   BOOL pad1;
-   CARD16 sequenceNumber B16;
-   CARD32 length B32;
-   CARD32 key_0 B32;
-   CARD32 key_1 B32;
-   CARD32 uid B32;
-   CARD32 pad4 B32;
-   CARD32 pad5 B32;
-   CARD32 pad6 B32;
+typedef struct {
+    BYTE type;                  /* X_Reply */
+    BOOL pad1;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32;
+    CARD32 key_0 B32;
+    CARD32 key_1 B32;
+    CARD32 uid B32;
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+    CARD32 pad6 B32;
 } xAppleDRICreateSurfaceReply;
+
 #define sz_xAppleDRICreateSurfaceReply	32
 
-typedef struct _AppleDRIDestroySurface
-{
-   CARD8 reqType;               /* always DRIReqCode */
-   CARD8 driReqType;            /* always X_DRIDestroySurface */
-   CARD16 length B16;
-   CARD32 screen B32;
-   CARD32 drawable B32;
+typedef struct _AppleDRIDestroySurface {
+    CARD8 reqType;              /* always DRIReqCode */
+    CARD8 driReqType;           /* always X_DRIDestroySurface */
+    CARD16 length B16;
+    CARD32 screen B32;
+    CARD32 drawable B32;
 } xAppleDRIDestroySurfaceReq;
+
 #define sz_xAppleDRIDestroySurfaceReq	12
 
-typedef struct _AppleDRINotify
-{
-   BYTE type;                   /* always eventBase + event type */
-   BYTE kind;
-   CARD16 sequenceNumber B16;
-   CARD32 time B32;             /* time of change */
-   CARD32 pad1 B32;
-   CARD32 arg B32;
-   CARD32 pad3 B32;
-   CARD32 pad4 B32;
-   CARD32 pad5 B32;
-   CARD32 pad6 B32;
+typedef struct _AppleDRINotify {
+    BYTE type;                  /* always eventBase + event type */
+    BYTE kind;
+    CARD16 sequenceNumber B16;
+    CARD32 time B32;            /* time of change */
+    CARD32 pad1 B32;
+    CARD32 arg B32;
+    CARD32 pad3 B32;
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+    CARD32 pad6 B32;
 } xAppleDRINotifyEvent;
-#define sz_xAppleDRINotifyEvent	32
 
+#define sz_xAppleDRINotifyEvent	32
 
-typedef struct
-{
-   CARD8 reqType;
-   CARD8 driReqType;
-   CARD16 length B16;
-   CARD32 screen B32;
-   CARD32 drawable B32;
-   BOOL doubleSwap;
-   CARD8 pad1, pad2, pad3;
+typedef struct {
+    CARD8 reqType;
+    CARD8 driReqType;
+    CARD16 length B16;
+    CARD32 screen B32;
+    CARD32 drawable B32;
+    BOOL doubleSwap;
+    CARD8 pad1, pad2, pad3;
 } xAppleDRICreateSharedBufferReq;
 
 #define sz_xAppleDRICreateSharedBufferReq 16
 
-typedef struct
-{
-   BYTE type;
-   BYTE data1;
-   CARD16 sequenceNumber B16;
-   CARD32 length B32;
-   CARD32 stringLength B32;     /* 0 on error */
-   CARD32 width B32;
-   CARD32 height B32;
-   CARD32 pad1 B32;
-   CARD32 pad2 B32;
-   CARD32 pad3 B32;
+typedef struct {
+    BYTE type;
+    BYTE data1;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32;
+    CARD32 stringLength B32;    /* 0 on error */
+    CARD32 width B32;
+    CARD32 height B32;
+    CARD32 pad1 B32;
+    CARD32 pad2 B32;
+    CARD32 pad3 B32;
 } xAppleDRICreateSharedBufferReply;
 
 #define sz_xAppleDRICreateSharedBufferReply 32
 
-typedef struct
-{
-   CARD8 reqType;
-   CARD8 driReqType;
-   CARD16 length B16;
-   CARD32 screen B32;
-   CARD32 drawable B32;
+typedef struct {
+    CARD8 reqType;
+    CARD8 driReqType;
+    CARD16 length B16;
+    CARD32 screen B32;
+    CARD32 drawable B32;
 } xAppleDRISwapBuffersReq;
 
 #define sz_xAppleDRISwapBuffersReq 12
 
-typedef struct
-{
-   CARD8 reqType;               /*1 */
-   CARD8 driReqType;            /*2 */
-   CARD16 length B16;           /*4 */
-   CARD32 screen B32;           /*8 */
-   CARD32 drawable B32;         /*12 */
+typedef struct {
+    CARD8 reqType;              /*1 */
+    CARD8 driReqType;           /*2 */
+    CARD16 length B16;          /*4 */
+    CARD32 screen B32;          /*8 */
+    CARD32 drawable B32;        /*12 */
 } xAppleDRICreatePixmapReq;
 
 #define sz_xAppleDRICreatePixmapReq 12
 
-typedef struct
-{
-   BYTE type;                   /*1 */
-   BOOL pad1;                   /*2 */
-   CARD16 sequenceNumber B16;   /*4 */
-   CARD32 length B32;           /*8 */
-   CARD32 width B32;            /*12 */
-   CARD32 height B32;           /*16 */
-   CARD32 pitch B32;            /*20 */
-   CARD32 bpp B32;              /*24 */
-   CARD32 size B32;             /*28 */
-   CARD32 stringLength B32;     /*32 */
+typedef struct {
+    BYTE type;                  /*1 */
+    BOOL pad1;                  /*2 */
+    CARD16 sequenceNumber B16;  /*4 */
+    CARD32 length B32;          /*8 */
+    CARD32 width B32;           /*12 */
+    CARD32 height B32;          /*16 */
+    CARD32 pitch B32;           /*20 */
+    CARD32 bpp B32;             /*24 */
+    CARD32 size B32;            /*28 */
+    CARD32 stringLength B32;    /*32 */
 } xAppleDRICreatePixmapReply;
 
 #define sz_xAppleDRICreatePixmapReply 32
 
-typedef struct
-{
-   CARD8 reqType;               /*1 */
-   CARD8 driReqType;            /*2 */
-   CARD16 length B16;           /*4 */
-   CARD32 drawable B32;         /*8 */
+typedef struct {
+    CARD8 reqType;              /*1 */
+    CARD8 driReqType;           /*2 */
+    CARD16 length B16;          /*4 */
+    CARD32 drawable B32;        /*8 */
 } xAppleDRIDestroyPixmapReq;
 
 #define sz_xAppleDRIDestroyPixmapReq 8
@@ -255,12 +248,12 @@ typedef struct
 
 void AppleDRISendEvent(
 #if NeedFunctionPrototypes
-                         int /* type */ ,
-                         unsigned int /* mask */ ,
-                         int /* which */ ,
-                         int    /* arg */
+                          int /* type */ ,
+                          unsigned int /* mask */ ,
+                          int /* which */ ,
+                          int   /* arg */
 #endif
-   );
+    );
 
-#endif /* _APPLEDRI_SERVER_ */
-#endif /* _APPLEDRISTR_H_ */
+#endif                          /* _APPLEDRI_SERVER_ */
+#endif                          /* _APPLEDRISTR_H_ */
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);
 
 }
diff --git a/xorg-server/hw/xquartz/xpr/dri.h b/xorg-server/hw/xquartz/xpr/dri.h
index 48fea3668..b4342617c 100644
--- a/xorg-server/hw/xquartz/xpr/dri.h
+++ b/xorg-server/hw/xquartz/xpr/dri.h
@@ -43,8 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "appledri.h"
 #include <Xplugin.h>
 
-typedef void (*ClipNotifyPtr)( WindowPtr, int, int );
-
+typedef void (*ClipNotifyPtr) (WindowPtr, int, int);
 
 /*
  * These functions can be wrapped by the DRI.  Each of these have
@@ -52,11 +51,11 @@ typedef void (*ClipNotifyPtr)( WindowPtr, int, int );
  * overridden by the driver in its [driver]DRIScreenInit function.
  */
 typedef struct {
-    WindowExposuresProcPtr       WindowExposures;
-    CopyWindowProcPtr            CopyWindow;
-    ValidateTreeProcPtr          ValidateTree;
-    PostValidateTreeProcPtr      PostValidateTree;
-    ClipNotifyProcPtr            ClipNotify;
+    WindowExposuresProcPtr WindowExposures;
+    CopyWindowProcPtr CopyWindow;
+    ValidateTreeProcPtr ValidateTree;
+    PostValidateTreeProcPtr PostValidateTree;
+    ClipNotifyProcPtr ClipNotify;
 } DRIWrappedFuncsRec, *DRIWrappedFuncsPtr;
 
 typedef struct {
@@ -74,8 +73,7 @@ extern Bool DRIExtensionInit(void);
 
 extern void DRIReset(void);
 
-extern Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen,
-                                           Bool *isCapable);
+extern Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool *isCapable);
 
 extern Bool DRIAuthConnection(ScreenPtr pScreen, unsigned int magic);
 
@@ -83,55 +81,43 @@ extern Bool DRICreateSurface(ScreenPtr pScreen,
                              Drawable id,
                              DrawablePtr pDrawable,
                              xp_client_id client_id,
-                             xp_surface_id *surface_id,
+                             xp_surface_id * surface_id,
                              unsigned int key[2],
                              void (*notify) (void *arg, void *data),
                              void *notify_data);
 
 extern Bool DRIDestroySurface(ScreenPtr pScreen,
-                             Drawable id,
-                             DrawablePtr pDrawable,
-                             void (*notify) (void *arg, void *data),
-                             void *notify_data);
+                              Drawable id,
+                              DrawablePtr pDrawable,
+                              void (*notify) (void *arg, void *data),
+                              void *notify_data);
 
-extern Bool DRIDrawablePrivDelete(pointer pResource,
-                                  XID id);
+extern Bool DRIDrawablePrivDelete(pointer pResource, XID id);
 
 extern DRIWrappedFuncsRec *DRIGetWrappedFuncs(ScreenPtr pScreen);
 
 extern void DRICopyWindow(WindowPtr pWin,
-                          DDXPointRec ptOldOrg,
-                          RegionPtr prgnSrc);
+                          DDXPointRec ptOldOrg, RegionPtr prgnSrc);
 
-extern int DRIValidateTree(WindowPtr pParent,
-                           WindowPtr pChild,
-                           VTKind    kind);
+extern int DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
 
 extern void DRIPostValidateTree(WindowPtr pParent,
-                                WindowPtr pChild,
-                                VTKind    kind);
+                                WindowPtr pChild, VTKind kind);
 
-extern void DRIClipNotify(WindowPtr pWin,
-                          int dx,
-                          int dy);
+extern void DRIClipNotify(WindowPtr pWin, int dx, int dy);
 
-extern void DRIWindowExposures(WindowPtr pWin,
-                              RegionPtr prgn,
-                              RegionPtr bsreg);
+extern void DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg);
 
-extern void DRISurfaceNotify (xp_surface_id id, int kind);
+extern void DRISurfaceNotify(xp_surface_id id, int kind);
 
 extern void DRIQueryVersion(int *majorVersion,
-                            int *minorVersion,
-                            int *patchVersion);
+                            int *minorVersion, int *patchVersion);
 
 extern Bool DRICreatePixmap(ScreenPtr pScreen, Drawable id,
-			    DrawablePtr pDrawable, char *path,
-			    size_t pathmax);
+                            DrawablePtr pDrawable, char *path, size_t pathmax);
 
 extern Bool DRIGetPixmapData(DrawablePtr pDrawable, int *width, int *height,
-			     int *pitch, int *bpp, void **ptr);
-
+                             int *pitch, int *bpp, void **ptr);
 
 extern void DRIDestroyPixmap(DrawablePtr pDrawable);
 
diff --git a/xorg-server/hw/xquartz/xpr/driWrap.c b/xorg-server/hw/xquartz/xpr/driWrap.c
index c38761555..eca31b263 100644
--- a/xorg-server/hw/xquartz/xpr/driWrap.c
+++ b/xorg-server/hw/xquartz/xpr/driWrap.c
@@ -1,537 +1,552 @@
-/*

-Copyright (c) 2009 Apple Computer, 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, sub license, 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 NON-INFRINGEMENT.

-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.

-*/

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <stddef.h>

-#include "mi.h"

-#include "scrnintstr.h"

-#include "gcstruct.h"

-#include "pixmapstr.h"

-#include "windowstr.h"

-#include "dixfontstr.h"

-#include "mivalidate.h"

-#include "driWrap.h"

-#include "dri.h"

-

-#include <OpenGL/OpenGL.h>

-

-typedef struct {

-    GCOps *originalOps;

-} DRIGCRec;

-

-typedef struct {

-    GCOps *originalOps;

-    CreateGCProcPtr CreateGC;

-} DRIWrapScreenRec;

-

-typedef struct {

-    Bool didSave;

-    int devKind;

-    DevUnion devPrivate;

-} DRISavedDrawableState;

-

-static DevPrivateKeyRec driGCKeyRec;

-#define driGCKey (&driGCKeyRec)

-

-static DevPrivateKeyRec driWrapScreenKeyRec;

-#define driWrapScreenKey (&driWrapScreenKeyRec)

-

-static GCOps driGCOps;

-

-#define wrap(priv, real, member, func) { \

-	priv->member = real->member; \

-	real->member = func; \

-    }

-

-#define unwrap(priv, real, member) { \

-	real->member = priv->member; \

-    }

-

-static DRIGCRec *

-DRIGetGCPriv(GCPtr pGC) {

-    return dixLookupPrivate(&pGC->devPrivates, driGCKey);

-}

-

-static void

-DRIUnwrapGC(GCPtr pGC) {

-    DRIGCRec *pGCPriv = DRIGetGCPriv(pGC);

-

-    pGC->ops = pGCPriv->originalOps;

-}

-

-static void 

-DRIWrapGC(GCPtr pGC) {

-    pGC->ops = &driGCOps;

-}

-

-static void

-DRISurfaceSetDrawable(DrawablePtr pDraw, 

-				  DRISavedDrawableState *saved) {

-    saved->didSave = FALSE;

-    

-    if(pDraw->type == DRAWABLE_PIXMAP) {

-	int pitch, width, height, bpp;

-	void *buffer;

-

-	if(DRIGetPixmapData(pDraw, &width, &height, &pitch, &bpp, &buffer)) {

-	    PixmapPtr pPix = (PixmapPtr)pDraw;

-

-	    saved->devKind = pPix->devKind;

-	    saved->devPrivate.ptr = pPix->devPrivate.ptr;

-	    saved->didSave = TRUE;

-

-	    pPix->devKind = pitch;

-	    pPix->devPrivate.ptr = buffer;

-	}

-    }

-}

-

-static void

-DRISurfaceRestoreDrawable(DrawablePtr pDraw,

-				      DRISavedDrawableState *saved) {

-    PixmapPtr pPix = (PixmapPtr)pDraw;

-

-    if(!saved->didSave) 

-	return;

-

-    pPix->devKind = saved->devKind;

-    pPix->devPrivate.ptr = saved->devPrivate.ptr;

-}

-

-static void

-DRIFillSpans(DrawablePtr dst, GCPtr pGC, int nInit,

-			 DDXPointPtr pptInit, int *pwidthInit, 

-			 int sorted) {

-    DRISavedDrawableState saved;

-

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-

-    pGC->ops->FillSpans(dst, pGC, nInit, pptInit, pwidthInit, sorted);

-    

-    DRIWrapGC(pGC);

-    

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void

-DRISetSpans(DrawablePtr dst, GCPtr pGC, char *pSrc,

-			DDXPointPtr pptInit, int *pwidthInit,

-			int nspans, int sorted) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-    

-    pGC->ops->SetSpans(dst, pGC, pSrc, pptInit, pwidthInit, nspans, sorted);

-

-    DRIWrapGC(pGC);

-    

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void

-DRIPutImage(DrawablePtr dst, GCPtr pGC,

-			int depth, int x, int y, int w, int h,

-			int leftPad, int format, char *pBits) {

-    DRISavedDrawableState saved;

-

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-

-    pGC->ops->PutImage(dst, pGC, depth, x, y, w, h, leftPad, format, pBits);

-   

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static RegionPtr

-DRICopyArea(DrawablePtr pSrc, DrawablePtr dst, GCPtr pGC,

-			     int srcx, int srcy, int w, int h,

-			     int dstx, int dsty) {

-    RegionPtr pReg;

-    DRISavedDrawableState pSrcSaved, dstSaved;

-    

-    DRISurfaceSetDrawable(pSrc, &pSrcSaved);

-    DRISurfaceSetDrawable(dst, &dstSaved);

-      

-    DRIUnwrapGC(pGC);

-

-    pReg = pGC->ops->CopyArea(pSrc, dst, pGC, srcx, srcy, w, h, dstx, dsty);

-

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(pSrc, &pSrcSaved);

-    DRISurfaceRestoreDrawable(dst, &dstSaved);     

-

-    return pReg;

-}

-

-static RegionPtr

-DRICopyPlane(DrawablePtr pSrc, DrawablePtr dst,

-			     GCPtr pGC, int srcx, int srcy,

-			     int w, int h, int dstx, int dsty,

-			     unsigned long plane) {

-    RegionPtr pReg;

-    DRISavedDrawableState pSrcSaved, dstSaved;

-

-    DRISurfaceSetDrawable(pSrc, &pSrcSaved);

-    DRISurfaceSetDrawable(dst, &dstSaved);

-

-

-    DRIUnwrapGC(pGC);

-    

-    pReg = pGC->ops->CopyPlane(pSrc, dst, pGC, srcx, srcy, w, h, dstx, dsty,

-			       plane);

-    

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(pSrc, &pSrcSaved);

-    DRISurfaceRestoreDrawable(dst, &dstSaved);

-

-    return pReg;

-}

-

-static void

-DRIPolyPoint(DrawablePtr dst, GCPtr pGC,

-			 int mode, int npt, DDXPointPtr pptInit) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-    

-    DRIUnwrapGC(pGC);

-    

-    pGC->ops->PolyPoint(dst, pGC, mode, npt, pptInit);

-

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void

-DRIPolylines(DrawablePtr dst, GCPtr pGC,

-			 int mode, int npt, DDXPointPtr pptInit) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-	

-    pGC->ops->Polylines(dst, pGC, mode, npt, pptInit);

-

-    DRIWrapGC(pGC);

-    

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void

-DRIPolySegment(DrawablePtr dst, GCPtr pGC,

-			   int nseg, xSegment *pSeg) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-

-    pGC->ops->PolySegment(dst, pGC, nseg, pSeg);

-    

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void

-DRIPolyRectangle(DrawablePtr dst, GCPtr pGC,

-                                  int nRects, xRectangle *pRects) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-    

-    DRIUnwrapGC(pGC);

- 

-    pGC->ops->PolyRectangle(dst, pGC, nRects, pRects);

-   

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-static void

-DRIPolyArc(DrawablePtr dst, GCPtr pGC, int narcs, xArc *parcs) {

-    DRISavedDrawableState saved;

-      

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-    

-    pGC->ops->PolyArc(dst, pGC, narcs, parcs);

-

-    DRIWrapGC(pGC);

-    

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void

-DRIFillPolygon(DrawablePtr dst, GCPtr pGC,

-			   int shape, int mode, int count,

-			   DDXPointPtr pptInit) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-      

-    DRIUnwrapGC(pGC);

-    

-    pGC->ops->FillPolygon(dst, pGC, shape, mode, count, pptInit);

-

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void

-DRIPolyFillRect(DrawablePtr dst, GCPtr pGC,

-			    int nRectsInit, xRectangle *pRectsInit) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-

-    pGC->ops->PolyFillRect(dst, pGC, nRectsInit, pRectsInit);

-    

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void

-DRIPolyFillArc(DrawablePtr dst, GCPtr pGC,

-			   int narcsInit, xArc *parcsInit) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-

-    pGC->ops->PolyFillArc(dst, pGC, narcsInit, parcsInit);

-    

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static int

-DRIPolyText8(DrawablePtr dst, GCPtr pGC,

-			int x, int y, int count, char *chars) {

-    int ret;

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-    

-    ret = pGC->ops->PolyText8(dst, pGC, x, y, count, chars);

-    

-    DRIWrapGC(pGC);

-    

-    DRISurfaceRestoreDrawable(dst, &saved);

-

-    return ret;

-}

-

-static int

-DRIPolyText16(DrawablePtr dst, GCPtr pGC,

-			 int x, int y, int count, unsigned short *chars) {

-    int ret;

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-    

-    ret = pGC->ops->PolyText16(dst, pGC, x, y, count, chars);

-

-    DRIWrapGC(pGC);

-    

-    DRISurfaceRestoreDrawable(dst, &saved);

-

-    return ret;

-}

-

-static void

-DRIImageText8(DrawablePtr dst, GCPtr pGC,

-			  int x, int y, int count, char *chars) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-    

-    pGC->ops->ImageText8(dst, pGC, x, y, count, chars);

-

-    DRIWrapGC(pGC);

-    

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void

-DRIImageText16(DrawablePtr dst, GCPtr pGC,

-			   int x, int y, int count, unsigned short *chars) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-

-    pGC->ops->ImageText16(dst, pGC, x, y, count, chars);

-    

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void

-DRIImageGlyphBlt(DrawablePtr dst, GCPtr pGC,

-			     int x, int y, unsigned int nglyphInit,

-			     CharInfoPtr *ppciInit, pointer unused) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-

-    pGC->ops->ImageGlyphBlt(dst, pGC, x, y, nglyphInit, ppciInit, unused);

-    

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void DRIPolyGlyphBlt(DrawablePtr dst, GCPtr pGC,

-			    int x, int y, unsigned int nglyph,

-			    CharInfoPtr *ppci, pointer pglyphBase) {

-    DRISavedDrawableState saved;

-    

-    DRISurfaceSetDrawable(dst, &saved);

-

-    DRIUnwrapGC(pGC);

-

-    pGC->ops->PolyGlyphBlt(dst, pGC, x, y, nglyph, ppci, pglyphBase);

-    

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(dst, &saved);

-}

-

-static void

-DRIPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr dst,

-			  int dx, int dy, int xOrg, int yOrg) {

-    DRISavedDrawableState bitMapSaved, dstSaved;

-        

-    DRISurfaceSetDrawable(&pBitMap->drawable, &bitMapSaved);

-    DRISurfaceSetDrawable(dst, &dstSaved);

-

-    DRIUnwrapGC(pGC);

-

-    pGC->ops->PushPixels(pGC, pBitMap, dst, dx, dy, xOrg, yOrg);

-    

-    DRIWrapGC(pGC);

-

-    DRISurfaceRestoreDrawable(&pBitMap->drawable, &bitMapSaved);

-    DRISurfaceRestoreDrawable(dst, &dstSaved);

-}

-

-

-static GCOps driGCOps = {

-    DRIFillSpans,

-    DRISetSpans,

-    DRIPutImage,

-    DRICopyArea,

-    DRICopyPlane,

-    DRIPolyPoint,

-    DRIPolylines,

-    DRIPolySegment,

-    DRIPolyRectangle,

-    DRIPolyArc,

-    DRIFillPolygon,

-    DRIPolyFillRect,

-    DRIPolyFillArc,

-    DRIPolyText8,

-    DRIPolyText16,

-    DRIImageText8,

-    DRIImageText16,

-    DRIImageGlyphBlt,

-    DRIPolyGlyphBlt,

-    DRIPushPixels

-};

-

-

-static Bool

-DRICreateGC(GCPtr pGC) {

-    ScreenPtr pScreen = pGC->pScreen;

-    DRIWrapScreenRec *pScreenPriv;

-    DRIGCRec *pGCPriv;

-    Bool ret;

-

-    pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, driWrapScreenKey);

-    

-    pGCPriv = DRIGetGCPriv(pGC);

-

-    unwrap(pScreenPriv, pScreen, CreateGC);

-    ret = pScreen->CreateGC(pGC);

-

-    if(ret) {

-	pGCPriv->originalOps = pGC->ops;

-	pGC->ops = &driGCOps;

-    }

-

-    wrap(pScreenPriv, pScreen, CreateGC, DRICreateGC);

-    

-    return ret;

-}

-

-

-/* Return false if an error occurred. */

-Bool 

-DRIWrapInit(ScreenPtr pScreen) {

-    DRIWrapScreenRec *pScreenPriv;

-

-    if(!dixRegisterPrivateKey(&driGCKeyRec, PRIVATE_GC, sizeof(DRIGCRec)))

-	return FALSE;

-

-    if(!dixRegisterPrivateKey(&driWrapScreenKeyRec, PRIVATE_SCREEN, sizeof(DRIWrapScreenRec)))

-	return FALSE;

-

-    pScreenPriv = dixGetPrivateAddr(&pScreen->devPrivates, &driWrapScreenKeyRec);

-    pScreenPriv->CreateGC = pScreen->CreateGC;

-    pScreen->CreateGC = DRICreateGC;

-    

-    return TRUE;

-}

+/*
+Copyright (c) 2009 Apple Computer, 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, sub license, 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 NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stddef.h>
+#include "mi.h"
+#include "scrnintstr.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+#include "windowstr.h"
+#include "dixfontstr.h"
+#include "mivalidate.h"
+#include "driWrap.h"
+#include "dri.h"
+
+#include <OpenGL/OpenGL.h>
+
+typedef struct {
+    GCOps *originalOps;
+} DRIGCRec;
+
+typedef struct {
+    GCOps *originalOps;
+    CreateGCProcPtr CreateGC;
+} DRIWrapScreenRec;
+
+typedef struct {
+    Bool didSave;
+    int devKind;
+    DevUnion devPrivate;
+} DRISavedDrawableState;
+
+static DevPrivateKeyRec driGCKeyRec;
+
+#define driGCKey (&driGCKeyRec)
+
+static DevPrivateKeyRec driWrapScreenKeyRec;
+
+#define driWrapScreenKey (&driWrapScreenKeyRec)
+
+static GCOps driGCOps;
+
+#define wrap(priv, real, member, func) { \
+	priv->member = real->member; \
+	real->member = func; \
+    }
+
+#define unwrap(priv, real, member) { \
+	real->member = priv->member; \
+    }
+
+static DRIGCRec *
+DRIGetGCPriv(GCPtr pGC)
+{
+    return dixLookupPrivate(&pGC->devPrivates, driGCKey);
+}
+
+static void
+DRIUnwrapGC(GCPtr pGC)
+{
+    DRIGCRec *pGCPriv = DRIGetGCPriv(pGC);
+
+    pGC->ops = pGCPriv->originalOps;
+}
+
+static void
+DRIWrapGC(GCPtr pGC)
+{
+    pGC->ops = &driGCOps;
+}
+
+static void
+DRISurfaceSetDrawable(DrawablePtr pDraw, DRISavedDrawableState * saved)
+{
+    saved->didSave = FALSE;
+
+    if (pDraw->type == DRAWABLE_PIXMAP) {
+        int pitch, width, height, bpp;
+        void *buffer;
+
+        if (DRIGetPixmapData(pDraw, &width, &height, &pitch, &bpp, &buffer)) {
+            PixmapPtr pPix = (PixmapPtr) pDraw;
+
+            saved->devKind = pPix->devKind;
+            saved->devPrivate.ptr = pPix->devPrivate.ptr;
+            saved->didSave = TRUE;
+
+            pPix->devKind = pitch;
+            pPix->devPrivate.ptr = buffer;
+        }
+    }
+}
+
+static void
+DRISurfaceRestoreDrawable(DrawablePtr pDraw, DRISavedDrawableState * saved)
+{
+    PixmapPtr pPix = (PixmapPtr) pDraw;
+
+    if (!saved->didSave)
+        return;
+
+    pPix->devKind = saved->devKind;
+    pPix->devPrivate.ptr = saved->devPrivate.ptr;
+}
+
+static void
+DRIFillSpans(DrawablePtr dst, GCPtr pGC, int nInit,
+             DDXPointPtr pptInit, int *pwidthInit, int sorted)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->FillSpans(dst, pGC, nInit, pptInit, pwidthInit, sorted);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRISetSpans(DrawablePtr dst, GCPtr pGC, char *pSrc,
+            DDXPointPtr pptInit, int *pwidthInit, int nspans, int sorted)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->SetSpans(dst, pGC, pSrc, pptInit, pwidthInit, nspans, sorted);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIPutImage(DrawablePtr dst, GCPtr pGC,
+            int depth, int x, int y, int w, int h,
+            int leftPad, int format, char *pBits)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->PutImage(dst, pGC, depth, x, y, w, h, leftPad, format, pBits);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static RegionPtr
+DRICopyArea(DrawablePtr pSrc, DrawablePtr dst, GCPtr pGC,
+            int srcx, int srcy, int w, int h, int dstx, int dsty)
+{
+    RegionPtr pReg;
+    DRISavedDrawableState pSrcSaved, dstSaved;
+
+    DRISurfaceSetDrawable(pSrc, &pSrcSaved);
+    DRISurfaceSetDrawable(dst, &dstSaved);
+
+    DRIUnwrapGC(pGC);
+
+    pReg = pGC->ops->CopyArea(pSrc, dst, pGC, srcx, srcy, w, h, dstx, dsty);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(pSrc, &pSrcSaved);
+    DRISurfaceRestoreDrawable(dst, &dstSaved);
+
+    return pReg;
+}
+
+static RegionPtr
+DRICopyPlane(DrawablePtr pSrc, DrawablePtr dst,
+             GCPtr pGC, int srcx, int srcy,
+             int w, int h, int dstx, int dsty, unsigned long plane)
+{
+    RegionPtr pReg;
+    DRISavedDrawableState pSrcSaved, dstSaved;
+
+    DRISurfaceSetDrawable(pSrc, &pSrcSaved);
+    DRISurfaceSetDrawable(dst, &dstSaved);
+
+    DRIUnwrapGC(pGC);
+
+    pReg = pGC->ops->CopyPlane(pSrc, dst, pGC, srcx, srcy, w, h, dstx, dsty,
+                               plane);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(pSrc, &pSrcSaved);
+    DRISurfaceRestoreDrawable(dst, &dstSaved);
+
+    return pReg;
+}
+
+static void
+DRIPolyPoint(DrawablePtr dst, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->PolyPoint(dst, pGC, mode, npt, pptInit);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIPolylines(DrawablePtr dst, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->Polylines(dst, pGC, mode, npt, pptInit);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIPolySegment(DrawablePtr dst, GCPtr pGC, int nseg, xSegment * pSeg)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->PolySegment(dst, pGC, nseg, pSeg);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIPolyRectangle(DrawablePtr dst, GCPtr pGC, int nRects, xRectangle *pRects)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->PolyRectangle(dst, pGC, nRects, pRects);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIPolyArc(DrawablePtr dst, GCPtr pGC, int narcs, xArc * parcs)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->PolyArc(dst, pGC, narcs, parcs);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIFillPolygon(DrawablePtr dst, GCPtr pGC,
+               int shape, int mode, int count, DDXPointPtr pptInit)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->FillPolygon(dst, pGC, shape, mode, count, pptInit);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIPolyFillRect(DrawablePtr dst, GCPtr pGC,
+                int nRectsInit, xRectangle *pRectsInit)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->PolyFillRect(dst, pGC, nRectsInit, pRectsInit);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIPolyFillArc(DrawablePtr dst, GCPtr pGC, int narcsInit, xArc * parcsInit)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->PolyFillArc(dst, pGC, narcsInit, parcsInit);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static int
+DRIPolyText8(DrawablePtr dst, GCPtr pGC, int x, int y, int count, char *chars)
+{
+    int ret;
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    ret = pGC->ops->PolyText8(dst, pGC, x, y, count, chars);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+
+    return ret;
+}
+
+static int
+DRIPolyText16(DrawablePtr dst, GCPtr pGC,
+              int x, int y, int count, unsigned short *chars)
+{
+    int ret;
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    ret = pGC->ops->PolyText16(dst, pGC, x, y, count, chars);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+
+    return ret;
+}
+
+static void
+DRIImageText8(DrawablePtr dst, GCPtr pGC, int x, int y, int count, char *chars)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->ImageText8(dst, pGC, x, y, count, chars);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIImageText16(DrawablePtr dst, GCPtr pGC,
+               int x, int y, int count, unsigned short *chars)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->ImageText16(dst, pGC, x, y, count, chars);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
+                 int x, int y, unsigned int nglyphInit,
+                 CharInfoPtr * ppciInit, pointer unused)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->ImageGlyphBlt(dst, pGC, x, y, nglyphInit, ppciInit, unused);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIPolyGlyphBlt(DrawablePtr dst, GCPtr pGC,
+                int x, int y, unsigned int nglyph,
+                CharInfoPtr * ppci, pointer pglyphBase)
+{
+    DRISavedDrawableState saved;
+
+    DRISurfaceSetDrawable(dst, &saved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->PolyGlyphBlt(dst, pGC, x, y, nglyph, ppci, pglyphBase);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(dst, &saved);
+}
+
+static void
+DRIPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr dst,
+              int dx, int dy, int xOrg, int yOrg)
+{
+    DRISavedDrawableState bitMapSaved, dstSaved;
+
+    DRISurfaceSetDrawable(&pBitMap->drawable, &bitMapSaved);
+    DRISurfaceSetDrawable(dst, &dstSaved);
+
+    DRIUnwrapGC(pGC);
+
+    pGC->ops->PushPixels(pGC, pBitMap, dst, dx, dy, xOrg, yOrg);
+
+    DRIWrapGC(pGC);
+
+    DRISurfaceRestoreDrawable(&pBitMap->drawable, &bitMapSaved);
+    DRISurfaceRestoreDrawable(dst, &dstSaved);
+}
+
+static GCOps driGCOps = {
+    DRIFillSpans,
+    DRISetSpans,
+    DRIPutImage,
+    DRICopyArea,
+    DRICopyPlane,
+    DRIPolyPoint,
+    DRIPolylines,
+    DRIPolySegment,
+    DRIPolyRectangle,
+    DRIPolyArc,
+    DRIFillPolygon,
+    DRIPolyFillRect,
+    DRIPolyFillArc,
+    DRIPolyText8,
+    DRIPolyText16,
+    DRIImageText8,
+    DRIImageText16,
+    DRIImageGlyphBlt,
+    DRIPolyGlyphBlt,
+    DRIPushPixels
+};
+
+static Bool
+DRICreateGC(GCPtr pGC)
+{
+    ScreenPtr pScreen = pGC->pScreen;
+    DRIWrapScreenRec *pScreenPriv;
+    DRIGCRec *pGCPriv;
+    Bool ret;
+
+    pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, driWrapScreenKey);
+
+    pGCPriv = DRIGetGCPriv(pGC);
+
+    unwrap(pScreenPriv, pScreen, CreateGC);
+    ret = pScreen->CreateGC(pGC);
+
+    if (ret) {
+        pGCPriv->originalOps = pGC->ops;
+        pGC->ops = &driGCOps;
+    }
+
+    wrap(pScreenPriv, pScreen, CreateGC, DRICreateGC);
+
+    return ret;
+}
+
+/* Return false if an error occurred. */
+Bool
+DRIWrapInit(ScreenPtr pScreen)
+{
+    DRIWrapScreenRec *pScreenPriv;
+
+    if (!dixRegisterPrivateKey(&driGCKeyRec, PRIVATE_GC, sizeof(DRIGCRec)))
+        return FALSE;
+
+    if (!dixRegisterPrivateKey
+        (&driWrapScreenKeyRec, PRIVATE_SCREEN, sizeof(DRIWrapScreenRec)))
+        return FALSE;
+
+    pScreenPriv =
+        dixGetPrivateAddr(&pScreen->devPrivates, &driWrapScreenKeyRec);
+    pScreenPriv->CreateGC = pScreen->CreateGC;
+    pScreen->CreateGC = DRICreateGC;
+
+    return TRUE;
+}
diff --git a/xorg-server/hw/xquartz/xpr/dristruct.h b/xorg-server/hw/xquartz/xpr/dristruct.h
index 19d78a973..13d590b1f 100644
--- a/xorg-server/hw/xquartz/xpr/dristruct.h
+++ b/xorg-server/hw/xquartz/xpr/dristruct.h
@@ -46,15 +46,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) ((DRIDrawablePrivPtr) \
     dixLookupPrivate(&(pPix)->devPrivates, DRIPixmapPrivKey))
 
-typedef struct _DRIDrawablePrivRec
-{
-    xp_surface_id   sid;
-    int             drawableIndex;
-    DrawablePtr     pDraw;
-    ScreenPtr       pScreen;
-    int             refCount;
-    unsigned int    key[2];
-    x_list          *notifiers;     /* list of (FUN . DATA) */
+typedef struct _DRIDrawablePrivRec {
+    xp_surface_id sid;
+    int drawableIndex;
+    DrawablePtr pDraw;
+    ScreenPtr pScreen;
+    int refCount;
+    unsigned int key[2];
+    x_list *notifiers;          /* list of (FUN . DATA) */
 } DRIDrawablePrivRec, *DRIDrawablePrivPtr;
 
 #define DRI_SCREEN_PRIV(pScreen) ((DRIScreenPrivPtr) \
@@ -64,13 +63,11 @@ typedef struct _DRIDrawablePrivRec
     dixLookupPrivate(&screenInfo.screens[screenIndex]->devPrivates, \
 		     DRIScreenPrivKey))
 
-
-typedef struct _DRIScreenPrivRec
-{
-    Bool                directRenderingSupport;
-    int                 nrWindows;
-    DRIWrappedFuncsRec  wrap;
-    DrawablePtr         DRIDrawables[DRI_MAX_DRAWABLES];
+typedef struct _DRIScreenPrivRec {
+    Bool directRenderingSupport;
+    int nrWindows;
+    DRIWrappedFuncsRec wrap;
+    DrawablePtr DRIDrawables[DRI_MAX_DRAWABLES];
 } DRIScreenPrivRec, *DRIScreenPrivPtr;
 
-#endif /* DRI_STRUCT_H */
+#endif                          /* DRI_STRUCT_H */
diff --git a/xorg-server/hw/xquartz/xpr/x-hash.c b/xorg-server/hw/xquartz/xpr/x-hash.c
index 7c6a67bd1..a3ff66177 100644
--- a/xorg-server/hw/xquartz/xpr/x-hash.c
+++ b/xorg-server/hw/xquartz/xpr/x-hash.c
@@ -65,13 +65,13 @@ static const unsigned int bucket_sizes[] = {
 #define N_BUCKET_SIZES (sizeof (bucket_sizes) / sizeof (bucket_sizes[0]))
 
 static inline unsigned int
-hash_table_total_buckets (x_hash_table *h)
+hash_table_total_buckets(x_hash_table * h)
 {
     return bucket_sizes[h->bucket_index];
 }
 
 static inline void
-hash_table_destroy_item (x_hash_table *h, void *k, void *v)
+hash_table_destroy_item(x_hash_table * h, void *k, void *v)
 {
     if (h->destroy_key != 0)
         (*h->destroy_key) (k);
@@ -81,7 +81,7 @@ hash_table_destroy_item (x_hash_table *h, void *k, void *v)
 }
 
 static inline size_t
-hash_table_hash_key (x_hash_table *h, void *k)
+hash_table_hash_key(x_hash_table * h, void *k)
 {
     if (h->hash_key != 0)
         return (*h->hash_key) (k);
@@ -90,7 +90,7 @@ hash_table_hash_key (x_hash_table *h, void *k)
 }
 
 static inline int
-hash_table_compare_keys (x_hash_table *h, void *k1, void *k2)
+hash_table_compare_keys(x_hash_table * h, void *k1, void *k2)
 {
     if (h->compare_keys == 0)
         return k1 == k2;
@@ -99,7 +99,7 @@ hash_table_compare_keys (x_hash_table *h, void *k1, void *k2)
 }
 
 static void
-hash_table_split (x_hash_table *h)
+hash_table_split(x_hash_table * h)
 {
     x_list **new, **old;
     x_list *node, *item, *next;
@@ -110,28 +110,25 @@ hash_table_split (x_hash_table *h)
     if (h->bucket_index == N_BUCKET_SIZES - 1)
         return;
 
-    old_size = hash_table_total_buckets (h);
+    old_size = hash_table_total_buckets(h);
     old = h->buckets;
 
     h->bucket_index++;
 
-    new_size = hash_table_total_buckets (h);
-    new = calloc (new_size, sizeof (x_list *));
+    new_size = hash_table_total_buckets(h);
+    new = calloc(new_size, sizeof(x_list *));
 
-    if (new == 0)
-    {
+    if (new == 0) {
         h->bucket_index--;
         return;
     }
 
-    for (i = 0; i < old_size; i++)
-    {
-        for (node = old[i]; node != 0; node = next)
-        {
+    for (i = 0; i < old_size; i++) {
+        for (node = old[i]; node != 0; node = next) {
             next = node->next;
             item = node->data;
 
-            b = hash_table_hash_key (h, ITEM_KEY (item)) % new_size;
+            b = hash_table_hash_key(h, ITEM_KEY(item)) % new_size;
 
             node->next = new[b];
             new[b] = node;
@@ -139,30 +136,27 @@ hash_table_split (x_hash_table *h)
     }
 
     h->buckets = new;
-    free (old);
+    free(old);
 }
 
-X_EXTERN x_hash_table *
-X_PFX (hash_table_new) (x_hash_fun *hash,
-                        x_compare_fun *compare,
-                        x_destroy_fun *key_destroy,
-                        x_destroy_fun *value_destroy)
-{
+X_EXTERN x_hash_table *X_PFX(hash_table_new) (x_hash_fun * hash,
+                                              x_compare_fun * compare,
+                                              x_destroy_fun * key_destroy,
+                                              x_destroy_fun * value_destroy) {
     x_hash_table *h;
 
-    h = calloc (1, sizeof (x_hash_table));
+    h = calloc(1, sizeof(x_hash_table));
     if (h == 0)
         return 0;
 
     h->bucket_index = 0;
-    h->buckets = calloc (hash_table_total_buckets (h), sizeof (x_list *));
+    h->buckets = calloc(hash_table_total_buckets(h), sizeof(x_list *));
 
-    if (h->buckets == 0)
-    {
-        free (h);
+    if (h->buckets == 0) {
+        free(h);
         return 0;
     }
-    
+
     h->hash_key = hash;
     h->compare_keys = compare;
     h->destroy_key = key_destroy;
@@ -172,66 +166,57 @@ X_PFX (hash_table_new) (x_hash_fun *hash,
 }
 
 X_EXTERN void
-X_PFX (hash_table_free) (x_hash_table *h)
-{
+ X_PFX(hash_table_free) (x_hash_table * h) {
     int n, i;
     x_list *node, *item;
 
-    assert (h != NULL);
+    assert(h != NULL);
 
-    n = hash_table_total_buckets (h);
+    n = hash_table_total_buckets(h);
 
-    for (i = 0; i < n; i++)
-    {
-        for (node = h->buckets[i]; node != 0; node = node->next)
-        {
+    for (i = 0; i < n; i++) {
+        for (node = h->buckets[i]; node != 0; node = node->next) {
             item = node->data;
-            hash_table_destroy_item (h, ITEM_KEY (item), ITEM_VALUE (item));
-            ITEM_FREE (item);
+            hash_table_destroy_item(h, ITEM_KEY(item), ITEM_VALUE(item));
+            ITEM_FREE(item);
         }
-        X_PFX (list_free) (h->buckets[i]);
+        X_PFX(list_free) (h->buckets[i]);
     }
 
-    free (h->buckets);
-    free (h);
+    free(h->buckets);
+    free(h);
 }
 
 X_EXTERN unsigned int
-X_PFX (hash_table_size) (x_hash_table *h)
-{
-    assert (h != NULL);
+ X_PFX(hash_table_size) (x_hash_table * h) {
+    assert(h != NULL);
 
     return h->total_keys;
 }
 
 static void
-hash_table_modify (x_hash_table *h, void *k, void *v, int replace)
+hash_table_modify(x_hash_table * h, void *k, void *v, int replace)
 {
     size_t hash_value;
     x_list *node, *item;
 
-    assert (h != NULL);
+    assert(h != NULL);
 
-    hash_value = hash_table_hash_key (h, k);
+    hash_value = hash_table_hash_key(h, k);
 
-    for (node = h->buckets[hash_value % hash_table_total_buckets (h)];
-         node != 0; node = node->next)
-    {
+    for (node = h->buckets[hash_value % hash_table_total_buckets(h)];
+         node != 0; node = node->next) {
         item = node->data;
 
-        if (hash_table_compare_keys (h, ITEM_KEY (item), k))
-        {
-            if (replace)
-            {
-                hash_table_destroy_item (h, ITEM_KEY (item),
-                                         ITEM_VALUE (item));
+        if (hash_table_compare_keys(h, ITEM_KEY(item), k)) {
+            if (replace) {
+                hash_table_destroy_item(h, ITEM_KEY(item), ITEM_VALUE(item));
                 item->next = k;
-                ITEM_VALUE (item) = v;
+                ITEM_VALUE(item) = v;
             }
-            else
-            {
-                hash_table_destroy_item (h, k, ITEM_VALUE (item));
-                ITEM_VALUE (item) = v;
+            else {
+                hash_table_destroy_item(h, k, ITEM_VALUE(item));
+                ITEM_VALUE(item) = v;
             }
             return;
         }
@@ -240,78 +225,69 @@ hash_table_modify (x_hash_table *h, void *k, void *v, int replace)
     /* Key isn't already in the table. Insert it. */
 
     if (h->total_keys + 1
-        > hash_table_total_buckets (h) * SPLIT_THRESHOLD_FACTOR)
-    {
-        hash_table_split (h);
+        > hash_table_total_buckets(h) * SPLIT_THRESHOLD_FACTOR) {
+        hash_table_split(h);
     }
 
-    hash_value = hash_value % hash_table_total_buckets (h);
-    h->buckets[hash_value] = X_PFX (list_prepend) (h->buckets[hash_value],
-                                                   ITEM_NEW (k, v));
+    hash_value = hash_value % hash_table_total_buckets(h);
+    h->buckets[hash_value] = X_PFX(list_prepend) (h->buckets[hash_value],
+                                                  ITEM_NEW(k, v));
     h->total_keys++;
 }
 
 X_EXTERN void
-X_PFX (hash_table_insert) (x_hash_table *h, void *k, void *v)
-{
-    hash_table_modify (h, k, v, 0);
+ X_PFX(hash_table_insert) (x_hash_table * h, void *k, void *v) {
+    hash_table_modify(h, k, v, 0);
 }
 
 X_EXTERN void
-X_PFX (hash_table_replace) (x_hash_table *h, void *k, void *v)
-{
-    hash_table_modify (h, k, v, 1);
+ X_PFX(hash_table_replace) (x_hash_table * h, void *k, void *v) {
+    hash_table_modify(h, k, v, 1);
 }
 
 X_EXTERN void
-X_PFX (hash_table_remove) (x_hash_table *h, void *k)
-{
+ X_PFX(hash_table_remove) (x_hash_table * h, void *k) {
     size_t hash_value;
     x_list **ptr, *item;
 
-    assert (h != NULL);
+    assert(h != NULL);
 
-    hash_value = hash_table_hash_key (h, k);
+    hash_value = hash_table_hash_key(h, k);
 
-    for (ptr = &h->buckets[hash_value % hash_table_total_buckets (h)];
-         *ptr != 0; ptr = &((*ptr)->next))
-    {
+    for (ptr = &h->buckets[hash_value % hash_table_total_buckets(h)];
+         *ptr != 0; ptr = &((*ptr)->next)) {
         item = (*ptr)->data;
 
-        if (hash_table_compare_keys (h, ITEM_KEY (item), k))
-        {
-            hash_table_destroy_item (h, ITEM_KEY (item), ITEM_VALUE (item));
-            ITEM_FREE (item);
+        if (hash_table_compare_keys(h, ITEM_KEY(item), k)) {
+            hash_table_destroy_item(h, ITEM_KEY(item), ITEM_VALUE(item));
+            ITEM_FREE(item);
             item = *ptr;
             *ptr = item->next;
-            X_PFX (list_free_1) (item);
+            X_PFX(list_free_1) (item);
             h->total_keys--;
             return;
         }
     }
 }
 
-X_EXTERN void *
-X_PFX (hash_table_lookup) (x_hash_table *h, void *k, void **k_ret)
-{
+X_EXTERN void *X_PFX(hash_table_lookup) (x_hash_table * h, void *k,
+                                         void **k_ret) {
     size_t hash_value;
     x_list *node, *item;
 
-    assert (h != NULL);
+    assert(h != NULL);
 
-    hash_value = hash_table_hash_key (h, k);
+    hash_value = hash_table_hash_key(h, k);
 
-    for (node = h->buckets[hash_value % hash_table_total_buckets (h)];
-         node != 0; node = node->next)
-    {
+    for (node = h->buckets[hash_value % hash_table_total_buckets(h)];
+         node != 0; node = node->next) {
         item = node->data;
 
-        if (hash_table_compare_keys (h, ITEM_KEY (item), k))
-        {
+        if (hash_table_compare_keys(h, ITEM_KEY(item), k)) {
             if (k_ret != 0)
-            *k_ret = ITEM_KEY (item);
+                *k_ret = ITEM_KEY(item);
 
-            return ITEM_VALUE (item);
+            return ITEM_VALUE(item);
         }
     }
 
@@ -322,22 +298,20 @@ X_PFX (hash_table_lookup) (x_hash_table *h, void *k, void **k_ret)
 }
 
 X_EXTERN void
-X_PFX (hash_table_foreach) (x_hash_table *h,
-                            x_hash_foreach_fun *fun, void *data)
-{
+
+X_PFX(hash_table_foreach) (x_hash_table * h,
+                           x_hash_foreach_fun * fun, void *data) {
     int i, n;
     x_list *node, *item;
 
-    assert (h != NULL);
+    assert(h != NULL);
 
-    n = hash_table_total_buckets (h);
+    n = hash_table_total_buckets(h);
 
-    for (i = 0; i < n; i++)
-    {
-        for (node = h->buckets[i]; node != 0; node = node->next)
-        {
+    for (i = 0; i < n; i++) {
+        for (node = h->buckets[i]; node != 0; node = node->next) {
             item = node->data;
-            (*fun) (ITEM_KEY (item), ITEM_VALUE (item), data);
+            (*fun) (ITEM_KEY(item), ITEM_VALUE(item), data);
         }
     }
 }
diff --git a/xorg-server/hw/xquartz/xpr/x-hash.h b/xorg-server/hw/xquartz/xpr/x-hash.h
index f876b6b71..c4543346a 100644
--- a/xorg-server/hw/xquartz/xpr/x-hash.h
+++ b/xorg-server/hw/xquartz/xpr/x-hash.h
@@ -43,49 +43,45 @@ typedef void (x_hash_foreach_fun) (void *k, void *v, void *data);
 /* for X_PFX and X_EXTERN */
 #include "x-list.h"
 
-X_EXTERN x_hash_table *X_PFX (hash_table_new) (x_hash_fun *hash,
-					       x_compare_fun *compare,
-					       x_destroy_fun *key_destroy,
-					       x_destroy_fun *value_destroy);
-X_EXTERN void X_PFX (hash_table_free) (x_hash_table *h);
-
-X_EXTERN unsigned int X_PFX (hash_table_size) (x_hash_table *h);
-
-X_EXTERN void X_PFX (hash_table_insert) (x_hash_table *h, void *k, void *v);
-X_EXTERN void X_PFX (hash_table_replace) (x_hash_table *h, void *k, void *v);
-X_EXTERN void X_PFX (hash_table_remove) (x_hash_table *h, void *k);
-X_EXTERN void *X_PFX (hash_table_lookup) (x_hash_table *h,
-					  void *k, void **k_ret);
-X_EXTERN void X_PFX (hash_table_foreach) (x_hash_table *h,
-					  x_hash_foreach_fun *fun,
-					  void *data);
+X_EXTERN x_hash_table *X_PFX(hash_table_new) (x_hash_fun * hash,
+                                              x_compare_fun * compare,
+                                              x_destroy_fun * key_destroy,
+                                              x_destroy_fun * value_destroy);
+X_EXTERN void X_PFX(hash_table_free) (x_hash_table * h);
+
+X_EXTERN unsigned int X_PFX(hash_table_size) (x_hash_table * h);
+
+X_EXTERN void X_PFX(hash_table_insert) (x_hash_table * h, void *k, void *v);
+X_EXTERN void X_PFX(hash_table_replace) (x_hash_table * h, void *k, void *v);
+X_EXTERN void X_PFX(hash_table_remove) (x_hash_table * h, void *k);
+X_EXTERN void *X_PFX(hash_table_lookup) (x_hash_table * h,
+                                         void *k, void **k_ret);
+X_EXTERN void X_PFX(hash_table_foreach) (x_hash_table * h,
+                                         x_hash_foreach_fun * fun, void *data);
 
 /* Conversion between unsigned int (e.g. xp_resource_id) and void pointer */
 
 /* Forward declarations */
-static __inline__ void *
-X_PFX (cvt_uint_to_vptr) (unsigned int val) __attribute__((always_inline));
+static __inline__ void *X_PFX(cvt_uint_to_vptr) (unsigned int val)
+    __attribute__ ((always_inline));
 static __inline__ unsigned int
-X_PFX (cvt_vptr_to_uint) (void * val) __attribute__((always_inline));
+ X_PFX(cvt_vptr_to_uint) (void *val) __attribute__ ((always_inline));
 
 /* Implementations */
-static __inline__ void *
-X_PFX (cvt_uint_to_vptr) (unsigned int val)
-{
-	return (void*)((unsigned long)(val));
+static __inline__ void *X_PFX(cvt_uint_to_vptr) (unsigned int val) {
+    return (void *) ((unsigned long) (val));
 }
 
 static __inline__ unsigned int
-X_PFX (cvt_vptr_to_uint) (void * val)
-{
-	size_t sv = (size_t)val;
-	unsigned int uv = (unsigned int)sv;
-	
-	/* If this assert fails, chances are val actually is a pointer,
-	   or there's been memory corruption */
-	assert(sv == uv);
-	
-	return uv;
+ X_PFX(cvt_vptr_to_uint) (void *val) {
+    size_t sv = (size_t) val;
+    unsigned int uv = (unsigned int) sv;
+
+    /* If this assert fails, chances are val actually is a pointer,
+       or there's been memory corruption */
+    assert(sv == uv);
+
+    return uv;
 }
 
-#endif /* X_HASH_H */
+#endif                          /* X_HASH_H */
diff --git a/xorg-server/hw/xquartz/xpr/x-hook.c b/xorg-server/hw/xquartz/xpr/x-hook.c
index c65b6fc68..fd34658e7 100644
--- a/xorg-server/hw/xquartz/xpr/x-hook.c
+++ b/xorg-server/hw/xquartz/xpr/x-hook.c
@@ -1,120 +1,111 @@
-/* x-hook.c

-

-   Copyright (c) 2003 Apple Computer, 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 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 ABOVE LISTED COPYRIGHT

-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

-   DEALINGS IN THE SOFTWARE.

-

-   Except as contained in this notice, the name(s) of the above

-   copyright holders shall not be used in advertising or otherwise to

-   promote the sale, use or other dealings in this Software without

-   prior written authorization. */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "x-hook.h"

-#include <stdlib.h>

-#include <assert.h>

-#include "os.h"

-

-#define CELL_NEW(f,d) X_PFX (list_prepend) ((x_list *) (f), (d))

-#define CELL_FREE(c)  X_PFX (list_free_1) (c)

-#define CELL_FUN(c)   ((x_hook_function *) ((c)->next))

-#define CELL_DATA(c)  ((c)->data)

-

-X_EXTERN x_list *

-X_PFX (hook_add) (x_list *lst, x_hook_function *fun, void *data)

-{

-    return X_PFX (list_prepend) (lst, CELL_NEW (fun, data));

-}

-

-X_EXTERN x_list *

-X_PFX (hook_remove) (x_list *lst, x_hook_function *fun, void *data)

-{

-    x_list *node, *cell;

-    x_list *to_delete = NULL;

-

-    for (node = lst; node != NULL; node = node->next)

-    {

-	cell = node->data;

-	if (CELL_FUN (cell) == fun && CELL_DATA (cell) == data)

-	    to_delete = X_PFX (list_prepend) (to_delete, cell);

-    }

-

-    for (node = to_delete; node != NULL; node = node->next)

-    {

-	cell = node->data;

-	lst = X_PFX (list_remove) (lst, cell);

-	CELL_FREE (cell);

-    }

-

-    X_PFX (list_free) (to_delete);

-    return lst;

-}

-

-X_EXTERN void

-X_PFX (hook_run) (x_list *lst, void *arg)

-{

-    x_list *node, *cell;

-    x_hook_function **fun;

-    void **data;

-    int length, i;

-

-    if(!lst)

-        return;

-

-    length = X_PFX (list_length) (lst);

-    fun = malloc(sizeof (x_hook_function *) * length);

-    data = malloc(sizeof (void *) * length);

-

-    if(!fun || !data) {

-        FatalError("Failed to allocate memory in %s\n", __func__);

-    }

-    

-    for (i = 0, node = lst; node != NULL; node = node->next, i++)

-    {

-	cell = node->data;

-	fun[i] = CELL_FUN (cell);

-	data[i] = CELL_DATA (cell);

-    }

-

-    for (i = 0; i < length; i++)

-    {

-	(*fun[i]) (arg, data[i]);

-    }

-    

-    free(fun);

-    free(data);

-}

-

-X_EXTERN void

-X_PFX (hook_free) (x_list *lst)

-{

-    x_list *node;

-

-    for (node = lst; node != NULL; node = node->next)

-    {

-	CELL_FREE (node->data);

-    }

-

-    X_PFX (list_free) (lst);

-}

+/* x-hook.c
+
+   Copyright (c) 2003 Apple Computer, 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 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 ABOVE LISTED COPYRIGHT
+   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+
+   Except as contained in this notice, the name(s) of the above
+   copyright holders shall not be used in advertising or otherwise to
+   promote the sale, use or other dealings in this Software without
+   prior written authorization. */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "x-hook.h"
+#include <stdlib.h>
+#include <assert.h>
+#include "os.h"
+
+#define CELL_NEW(f,d) X_PFX (list_prepend) ((x_list *) (f), (d))
+#define CELL_FREE(c)  X_PFX (list_free_1) (c)
+#define CELL_FUN(c)   ((x_hook_function *) ((c)->next))
+#define CELL_DATA(c)  ((c)->data)
+
+X_EXTERN x_list *X_PFX(hook_add) (x_list * lst, x_hook_function * fun,
+                                  void *data) {
+    return X_PFX(list_prepend) (lst, CELL_NEW(fun, data));
+}
+
+X_EXTERN x_list *X_PFX(hook_remove) (x_list * lst, x_hook_function * fun,
+                                     void *data) {
+    x_list *node, *cell;
+    x_list *to_delete = NULL;
+
+    for (node = lst; node != NULL; node = node->next) {
+        cell = node->data;
+        if (CELL_FUN(cell) == fun && CELL_DATA(cell) == data)
+            to_delete = X_PFX(list_prepend) (to_delete, cell);
+    }
+
+    for (node = to_delete; node != NULL; node = node->next) {
+        cell = node->data;
+        lst = X_PFX(list_remove) (lst, cell);
+        CELL_FREE(cell);
+    }
+
+    X_PFX(list_free) (to_delete);
+    return lst;
+}
+
+X_EXTERN void
+ X_PFX(hook_run) (x_list * lst, void *arg) {
+    x_list *node, *cell;
+    x_hook_function **fun;
+    void **data;
+    int length, i;
+
+    if (!lst)
+        return;
+
+    length = X_PFX(list_length) (lst);
+    fun = malloc(sizeof(x_hook_function *) * length);
+    data = malloc(sizeof(void *) * length);
+
+    if (!fun || !data) {
+        FatalError("Failed to allocate memory in %s\n", __func__);
+    }
+
+    for (i = 0, node = lst; node != NULL; node = node->next, i++) {
+        cell = node->data;
+        fun[i] = CELL_FUN(cell);
+        data[i] = CELL_DATA(cell);
+    }
+
+    for (i = 0; i < length; i++) {
+        (*fun[i]) (arg, data[i]);
+    }
+
+    free(fun);
+    free(data);
+}
+
+X_EXTERN void
+ X_PFX(hook_free) (x_list * lst) {
+    x_list *node;
+
+    for (node = lst; node != NULL; node = node->next) {
+        CELL_FREE(node->data);
+    }
+
+    X_PFX(list_free) (lst);
+}
diff --git a/xorg-server/hw/xquartz/xpr/x-hook.h b/xorg-server/hw/xquartz/xpr/x-hook.h
index 392352d50..da3407f92 100644
--- a/xorg-server/hw/xquartz/xpr/x-hook.h
+++ b/xorg-server/hw/xquartz/xpr/x-hook.h
@@ -32,11 +32,13 @@
 
 #include "x-list.h"
 
-typedef void x_hook_function (void *arg, void *data);
+typedef void x_hook_function(void *arg, void *data);
 
-X_EXTERN x_list *X_PFX (hook_add) (x_list *lst, x_hook_function *fun, void *data);
-X_EXTERN x_list *X_PFX (hook_remove) (x_list *lst, x_hook_function *fun, void *data);
-X_EXTERN void X_PFX (hook_run) (x_list *lst, void *arg);
-X_EXTERN void X_PFX (hook_free) (x_list *lst);
+X_EXTERN x_list *X_PFX(hook_add) (x_list * lst, x_hook_function * fun,
+                                  void *data);
+X_EXTERN x_list *X_PFX(hook_remove) (x_list * lst, x_hook_function * fun,
+                                     void *data);
+X_EXTERN void X_PFX(hook_run) (x_list * lst, void *arg);
+X_EXTERN void X_PFX(hook_free) (x_list * lst);
 
-#endif /* X_HOOK_H */
+#endif                          /* X_HOOK_H */
diff --git a/xorg-server/hw/xquartz/xpr/x-list.c b/xorg-server/hw/xquartz/xpr/x-list.c
index 77c9309aa..757ff4cb0 100644
--- a/xorg-server/hw/xquartz/xpr/x-list.c
+++ b/xorg-server/hw/xquartz/xpr/x-list.c
@@ -50,57 +50,51 @@ static x_list *freelist;
 static pthread_mutex_t freelist_lock = PTHREAD_MUTEX_INITIALIZER;
 
 static inline void
-list_free_1 (x_list *node)
+list_free_1(x_list * node)
 {
     node->next = freelist;
     freelist = node;
 }
 
 X_EXTERN void
-X_PFX (list_free_1) (x_list *node)
-{
-    assert (node != NULL);
+ X_PFX(list_free_1) (x_list * node) {
+    assert(node != NULL);
 
-    pthread_mutex_lock (&freelist_lock);
+    pthread_mutex_lock(&freelist_lock);
 
-    list_free_1 (node);
+    list_free_1(node);
 
-    pthread_mutex_unlock (&freelist_lock);
+    pthread_mutex_unlock(&freelist_lock);
 }
 
 X_EXTERN void
-X_PFX (list_free) (x_list *lst)
-{
+ X_PFX(list_free) (x_list * lst) {
     x_list *next;
 
-    pthread_mutex_lock (&freelist_lock);
+    pthread_mutex_lock(&freelist_lock);
 
-    for (; lst != NULL; lst = next)
-    {
+    for (; lst != NULL; lst = next) {
         next = lst->next;
-        list_free_1 (lst);
+        list_free_1(lst);
     }
 
-    pthread_mutex_unlock (&freelist_lock);
+    pthread_mutex_unlock(&freelist_lock);
 }
 
-X_EXTERN x_list *
-X_PFX (list_prepend) (x_list *lst, void *data)
-{
+X_EXTERN x_list *X_PFX(list_prepend) (x_list * lst, void *data) {
     x_list *node;
 
-    pthread_mutex_lock (&freelist_lock);
+    pthread_mutex_lock(&freelist_lock);
 
-    if (freelist == NULL)
-    {
+    if (freelist == NULL) {
         x_list_block *b;
         int i;
 
-        b = malloc (sizeof (x_list_block));
+        b = malloc(sizeof(x_list_block));
         assert(b != NULL);
 
         for (i = 0; i < NODES_PER_BLOCK - 1; i++)
-            b->l[i].next = &(b->l[i+1]);
+            b->l[i].next = &(b->l[i + 1]);
         b->l[i].next = NULL;
 
         freelist = b->l;
@@ -109,7 +103,7 @@ X_PFX (list_prepend) (x_list *lst, void *data)
     node = freelist;
     freelist = node->next;
 
-    pthread_mutex_unlock (&freelist_lock);
+    pthread_mutex_unlock(&freelist_lock);
 
     node->next = lst;
     node->data = data;
@@ -117,29 +111,24 @@ X_PFX (list_prepend) (x_list *lst, void *data)
     return node;
 }
 
-X_EXTERN x_list *
-X_PFX (list_append) (x_list *lst, void *data)
-{
+X_EXTERN x_list *X_PFX(list_append) (x_list * lst, void *data) {
     x_list *head = lst;
 
     if (lst == NULL)
-        return X_PFX (list_prepend) (NULL, data);
+        return X_PFX(list_prepend) (NULL, data);
 
     while (lst->next != NULL)
         lst = lst->next;
 
-    lst->next = X_PFX (list_prepend) (NULL, data);
+    lst->next = X_PFX(list_prepend) (NULL, data);
 
     return head;
 }
 
-X_EXTERN x_list *
-X_PFX (list_reverse) (x_list *lst)
-{
+X_EXTERN x_list *X_PFX(list_reverse) (x_list * lst) {
     x_list *head = NULL, *next;
-    
-    while (lst != NULL)
-    {
+
+    while (lst != NULL) {
         next = lst->next;
         lst->next = head;
         head = lst;
@@ -149,11 +138,8 @@ X_PFX (list_reverse) (x_list *lst)
     return head;
 }
 
-X_EXTERN x_list *
-X_PFX (list_find) (x_list *lst, void *data)
-{
-    for (; lst != NULL; lst = lst->next)
-    {
+X_EXTERN x_list *X_PFX(list_find) (x_list * lst, void *data) {
+    for (; lst != NULL; lst = lst->next) {
         if (lst->data == data)
             return lst;
     }
@@ -161,26 +147,22 @@ X_PFX (list_find) (x_list *lst, void *data)
     return NULL;
 }
 
-X_EXTERN x_list *
-X_PFX (list_nth) (x_list *lst, int n)
-{
+X_EXTERN x_list *X_PFX(list_nth) (x_list * lst, int n) {
     while (n-- > 0 && lst != NULL)
         lst = lst->next;
 
     return lst;
 }
 
-X_EXTERN x_list *
-X_PFX (list_pop) (x_list *lst, void **data_ret)
-{
+X_EXTERN x_list *X_PFX(list_pop) (x_list * lst, void **data_ret) {
     void *data = NULL;
 
-    if (lst != NULL)
-    {
+    if (lst != NULL) {
         x_list *tem = lst;
+
         data = lst->data;
         lst = lst->next;
-        X_PFX (list_free_1) (tem);
+        X_PFX(list_free_1) (tem);
     }
 
     if (data_ret != NULL)
@@ -189,61 +171,50 @@ X_PFX (list_pop) (x_list *lst, void **data_ret)
     return lst;
 }
 
-X_EXTERN x_list *
-X_PFX (list_filter) (x_list *lst,
-                     int (*pred) (void *item, void *data), void *data)
-{
+X_EXTERN x_list *X_PFX(list_filter) (x_list * lst,
+                                     int (*pred) (void *item, void *data),
+                                     void *data) {
     x_list *ret = NULL, *node;
 
-    for (node = lst; node != NULL; node = node->next)
-    {
+    for (node = lst; node != NULL; node = node->next) {
         if ((*pred) (node->data, data))
-            ret = X_PFX (list_prepend) (ret, node->data);
+            ret = X_PFX(list_prepend) (ret, node->data);
     }
 
-    return X_PFX (list_reverse) (ret);
+    return X_PFX(list_reverse) (ret);
 }
 
-X_EXTERN x_list *
-X_PFX (list_map) (x_list *lst,
-                  void *(*fun) (void *item, void *data), void *data)
-{
+X_EXTERN x_list *X_PFX(list_map) (x_list * lst,
+                                  void *(*fun) (void *item, void *data),
+                                  void *data) {
     x_list *ret = NULL, *node;
 
-    for (node = lst; node != NULL; node = node->next)
-    {
-        X_PFX (list_prepend) (ret, fun (node->data, data));
+    for (node = lst; node != NULL; node = node->next) {
+        X_PFX(list_prepend) (ret, fun(node->data, data));
     }
 
-    return X_PFX (list_reverse) (ret);
+    return X_PFX(list_reverse) (ret);
 }
 
-X_EXTERN x_list *
-X_PFX (list_copy) (x_list *lst)
-{
+X_EXTERN x_list *X_PFX(list_copy) (x_list * lst) {
     x_list *copy = NULL;
 
-    for (; lst != NULL; lst = lst->next)
-    {
-        copy = X_PFX (list_prepend) (copy, lst->data);
+    for (; lst != NULL; lst = lst->next) {
+        copy = X_PFX(list_prepend) (copy, lst->data);
     }
 
-    return X_PFX (list_reverse) (copy);
+    return X_PFX(list_reverse) (copy);
 }
 
-X_EXTERN x_list *
-X_PFX (list_remove) (x_list *lst, void *data)
-{
+X_EXTERN x_list *X_PFX(list_remove) (x_list * lst, void *data) {
     x_list **ptr, *node;
 
-    for (ptr = &lst; *ptr != NULL;)
-    {
+    for (ptr = &lst; *ptr != NULL;) {
         node = *ptr;
 
-        if (node->data == data)
-        {
+        if (node->data == data) {
             *ptr = node->next;
-            X_PFX (list_free_1) (node);
+            X_PFX(list_free_1) (node);
         }
         else
             ptr = &((*ptr)->next);
@@ -253,8 +224,7 @@ X_PFX (list_remove) (x_list *lst, void *data)
 }
 
 X_EXTERN unsigned int
-X_PFX (list_length) (x_list *lst)
-{
+ X_PFX(list_length) (x_list * lst) {
     unsigned int n;
 
     n = 0;
@@ -265,19 +235,17 @@ X_PFX (list_length) (x_list *lst)
 }
 
 X_EXTERN void
-X_PFX (list_foreach) (x_list *lst,
-                      void (*fun) (void *data, void *user_data),
-                      void *user_data)
-{
-    for (; lst != NULL; lst = lst->next)
-    {
+
+X_PFX(list_foreach) (x_list * lst,
+                     void (*fun) (void *data, void *user_data),
+                     void *user_data) {
+    for (; lst != NULL; lst = lst->next) {
         (*fun) (lst->data, user_data);
     }
 }
 
 static x_list *
-list_sort_1 (x_list *lst, int length,
-             int (*less) (const void *, const void *))
+list_sort_1(x_list * lst, int length, int (*less) (const void *, const void *))
 {
     x_list *mid, *ptr;
     x_list *out_head, *out;
@@ -299,20 +267,19 @@ list_sort_1 (x_list *lst, int length,
 
     /* Sort each sub-list. */
 
-    lst = list_sort_1 (lst, mid_point, less);
-    mid = list_sort_1 (mid, length - mid_point, less);
+    lst = list_sort_1(lst, mid_point, less);
+    mid = list_sort_1(mid, length - mid_point, less);
 
     /* Then merge them back together. */
 
-    assert (lst != NULL && mid != NULL);
+    assert(lst != NULL && mid != NULL);
 
     if ((*less) (mid->data, lst->data))
         out = out_head = mid, mid = mid->next;
     else
         out = out_head = lst, lst = lst->next;
 
-    while (lst != NULL && mid != NULL)
-    {
+    while (lst != NULL && mid != NULL) {
         if ((*less) (mid->data, lst->data))
             out = out->next = mid, mid = mid->next;
         else
@@ -327,12 +294,11 @@ list_sort_1 (x_list *lst, int length,
     return out_head;
 }
 
-X_EXTERN x_list *
-X_PFX (list_sort) (x_list *lst, int (*less) (const void *, const void *))
-{
+X_EXTERN x_list *X_PFX(list_sort) (x_list * lst,
+                                   int (*less) (const void *, const void *)) {
     int length;
 
-    length = X_PFX (list_length) (lst);
+    length = X_PFX(list_length) (lst);
 
-    return list_sort_1 (lst, length, less);
+    return list_sort_1(lst, length, less);
 }
diff --git a/xorg-server/hw/xquartz/xpr/xprAppleWM.c b/xorg-server/hw/xquartz/xpr/xprAppleWM.c
index b6b9a5fc8..77b9fa3e8 100644
--- a/xorg-server/hw/xquartz/xpr/xprAppleWM.c
+++ b/xorg-server/hw/xquartz/xpr/xprAppleWM.c
@@ -43,9 +43,8 @@
 #include "quartz.h"
 #include "x-hash.h"
 
-static int xprSetWindowLevel(
-    WindowPtr pWin,
-    int level)
+static int
+xprSetWindowLevel(WindowPtr pWin, int level)
 {
     xp_window_id wid;
     xp_window_changes wc;
@@ -56,25 +55,25 @@ static int xprSetWindowLevel(
     if (level < 0 || level >= AppleWMNumWindowLevels) {
         return BadValue;
     }
-    
-    wid = x_cvt_vptr_to_uint(RootlessFrameForWindow (pWin, TRUE));
+
+    wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWin, TRUE));
     if (wid == 0)
         return BadWindow;
 
-    RootlessStopDrawing (pWin, FALSE);
+    RootlessStopDrawing(pWin, FALSE);
     winRec = WINREC(pWin);
- 
-    if(!winRec)
+
+    if (!winRec)
         return BadWindow;
-    
-    if(XQuartzIsRootless)
+
+    if (XQuartzIsRootless)
         wc.window_level = normal_window_levels[level];
-    else if(XQuartzShieldingWindowLevel)
+    else if (XQuartzShieldingWindowLevel)
         wc.window_level = XQuartzShieldingWindowLevel + 1;
     else
         wc.window_level = rooted_window_levels[level];
-    
-    if (xp_configure_window (wid, XP_WINDOW_LEVEL, &wc) != Success) {
+
+    if (xp_configure_window(wid, XP_WINDOW_LEVEL, &wc) != Success) {
         return BadValue;
     }
 
@@ -84,52 +83,54 @@ static int xprSetWindowLevel(
 }
 
 #if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3
-static int xprAttachTransient(WindowPtr pWinChild, WindowPtr pWinParent) {
-    xp_window_id child_wid, parent_wid; 
+static int
+xprAttachTransient(WindowPtr pWinChild, WindowPtr pWinParent)
+{
+    xp_window_id child_wid, parent_wid;
     xp_window_changes wc;
 
     child_wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWinChild, TRUE));
     if (child_wid == 0)
         return BadWindow;
 
-    if(pWinParent) {
-        parent_wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWinParent, TRUE));
+    if (pWinParent) {
+        parent_wid =
+            x_cvt_vptr_to_uint(RootlessFrameForWindow(pWinParent, TRUE));
         if (parent_wid == 0)
             return BadWindow;
-    } else {
+    }
+    else {
         parent_wid = 0;
     }
-     
+
     wc.transient_for = parent_wid;
 
-    RootlessStopDrawing (pWinChild, FALSE);
+    RootlessStopDrawing(pWinChild, FALSE);
 
     if (xp_configure_window(child_wid, XP_ATTACH_TRANSIENT, &wc) != Success) {
         return BadValue;
     }
 
-    return Success;    
+    return Success;
 }
 #endif
 
-static int xprFrameDraw(
-    WindowPtr pWin,
-    xp_frame_class class,
-    xp_frame_attr attr,
-    const BoxRec *outer,
-    const BoxRec *inner,
-    unsigned int title_len,
-    const unsigned char *title_bytes)
+static int
+xprFrameDraw(WindowPtr pWin,
+             xp_frame_class class,
+             xp_frame_attr attr,
+             const BoxRec * outer,
+             const BoxRec * inner,
+             unsigned int title_len, const unsigned char *title_bytes)
 {
     xp_window_id wid;
 
-    wid = x_cvt_vptr_to_uint(RootlessFrameForWindow (pWin, FALSE));
+    wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWin, FALSE));
     if (wid == 0)
         return BadWindow;
 
-    if (xp_frame_draw (wid, class, attr, outer, inner,
-                       title_len, title_bytes) != Success)
-    {
+    if (xp_frame_draw(wid, class, attr, outer, inner,
+                      title_len, title_bytes) != Success) {
         return BadValue;
     }
 
@@ -155,8 +156,8 @@ static AppleWMProcsRec xprAppleWMProcs = {
 #endif
 };
 
-
-void xprAppleWMInit(void)
+void
+xprAppleWMInit(void)
 {
     AppleWMExtensionInit(&xprAppleWMProcs);
 }
diff --git a/xorg-server/hw/xquartz/xpr/xprCursor.c b/xorg-server/hw/xquartz/xpr/xprCursor.c
index 2b31865a5..b0afa8c0e 100644
--- a/xorg-server/hw/xquartz/xpr/xprCursor.c
+++ b/xorg-server/hw/xquartz/xpr/xprCursor.c
@@ -51,12 +51,13 @@
 #include "x-hash.h"
 
 typedef struct {
-    int                     cursorVisible;
-    QueryBestSizeProcPtr    QueryBestSize;
-    miPointerSpriteFuncPtr  spriteFuncs;
+    int cursorVisible;
+    QueryBestSizeProcPtr QueryBestSize;
+    miPointerSpriteFuncPtr spriteFuncs;
 } QuartzCursorScreenRec, *QuartzCursorScreenPtr;
 
 static DevPrivateKeyRec darwinCursorScreenKeyRec;
+
 #define darwinCursorScreenKey (&darwinCursorScreenKeyRec)
 
 #define CURSOR_PRIV(pScreen) ((QuartzCursorScreenPtr) \
@@ -85,22 +86,22 @@ load_cursor(CursorPtr src, int screen)
     hot_y = src->bits->yhot;
 
 #ifdef ARGB_CURSOR
-    if (src->bits->argb != NULL)
-    {
+    if (src->bits->argb != NULL) {
 #if BITMAP_BIT_ORDER == MSBFirst
-        rowbytes = src->bits->width * sizeof (CARD32);
+        rowbytes = src->bits->width * sizeof(CARD32);
         data = (uint32_t *) src->bits->argb;
 #else
-        const uint32_t *be_data=(uint32_t *) src->bits->argb;
+        const uint32_t *be_data = (uint32_t *) src->bits->argb;
         unsigned i;
-        rowbytes = src->bits->width * sizeof (CARD32);
+
+        rowbytes = src->bits->width * sizeof(CARD32);
         data = malloc(rowbytes * src->bits->height);
         free_data = TRUE;
-        if(!data) {
+        if (!data) {
             FatalError("Failed to allocate memory in %s\n", __func__);
         }
-        for(i=0;i<(src->bits->width*src->bits->height);i++)
-            data[i]=ntohl(be_data[i]);
+        for (i = 0; i < (src->bits->width * src->bits->height); i++)
+            data[i] = ntohl(be_data[i]);
 #endif
     }
     else
@@ -123,42 +124,43 @@ load_cursor(CursorPtr src, int screen)
         rowbytes = ((src->bits->width * 4) + 31) & ~31;
         data = malloc(rowbytes * src->bits->height);
         free_data = TRUE;
-        if(!data) {
+        if (!data) {
             FatalError("Failed to allocate memory in %s\n", __func__);
         }
-        
-        if (!src->bits->emptyMask)
-        {
+
+        if (!src->bits->emptyMask) {
             ycount = src->bits->height;
-            srow = src->bits->source; mrow = src->bits->mask;
+            srow = src->bits->source;
+            mrow = src->bits->mask;
             drow = data;
 
-            while (ycount-- > 0)
-            {
+            while (ycount-- > 0) {
                 xcount = bits_to_bytes(src->bits->width);
-                sptr = srow; mptr = mrow;
+                sptr = srow;
+                mptr = mrow;
                 dptr = drow;
 
-                while (xcount-- > 0)
-                {
+                while (xcount-- > 0) {
                     uint8_t s, m;
                     int i;
 
-                    s = *sptr++; m = *mptr++;
-                    for (i = 0; i < 8; i++)
-                    {
+                    s = *sptr++;
+                    m = *mptr++;
+                    for (i = 0; i < 8; i++) {
 #if BITMAP_BIT_ORDER == MSBFirst
                         if (m & 128)
                             *dptr++ = (s & 128) ? fg_color : bg_color;
                         else
                             *dptr++ = 0;
-                        s <<= 1; m <<= 1;
+                        s <<= 1;
+                        m <<= 1;
 #else
                         if (m & 1)
                             *dptr++ = (s & 1) ? fg_color : bg_color;
                         else
                             *dptr++ = 0;
-                        s >>= 1; m >>= 1;
+                        s >>= 1;
+                        m >>= 1;
 #endif
                     }
                 }
@@ -168,19 +170,17 @@ load_cursor(CursorPtr src, int screen)
                 drow = (uint32_t *) ((char *) drow + rowbytes);
             }
         }
-        else
-        {
+        else {
             memset(data, 0, src->bits->height * rowbytes);
         }
     }
 
     err = xp_set_cursor(width, height, hot_x, hot_y, data, rowbytes);
-    if(free_data)
+    if (free_data)
         free(data);
     return err == Success;
 }
 
-
 /*
 ===========================================================================
 
@@ -196,7 +196,7 @@ load_cursor(CursorPtr src, int screen)
 static Bool
 QuartzRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
 {
-    if(pCursor == NULL || pCursor->bits == NULL)
+    if (pCursor == NULL || pCursor->bits == NULL)
         return FALSE;
 
     /* FIXME: cache ARGB8888 representation? */
@@ -204,7 +204,6 @@ QuartzRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
     return TRUE;
 }
 
-
 /*
  * QuartzUnrealizeCursor
  *  Free the storage space associated with a realized cursor.
@@ -215,33 +214,29 @@ QuartzUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
     return TRUE;
 }
 
-
 /*
  * QuartzSetCursor
  *  Set the cursor sprite and position.
  */
 static void
-QuartzSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
+QuartzSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x,
+                int y)
 {
     QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
 
     if (!XQuartzServerVisible)
         return;
 
-    if (pCursor == NULL)
-    {
-        if (ScreenPriv->cursorVisible)
-        {
+    if (pCursor == NULL) {
+        if (ScreenPriv->cursorVisible) {
             xp_hide_cursor();
             ScreenPriv->cursorVisible = FALSE;
         }
     }
-    else
-    {
+    else {
         load_cursor(pCursor, pScreen->myNum);
 
-        if (!ScreenPriv->cursorVisible)
-        {
+        if (!ScreenPriv->cursorVisible) {
             xp_show_cursor();
             ScreenPriv->cursorVisible = TRUE;
         }
@@ -274,7 +269,6 @@ QuartzCursorOffScreen(ScreenPtr *pScreen, int *x, int *y)
     return FALSE;
 }
 
-
 /*
  * QuartzCrossScreen
  */
@@ -284,7 +278,6 @@ QuartzCrossScreen(ScreenPtr pScreen, Bool entering)
     return;
 }
 
-
 /*
  * QuartzWarpCursor
  *  Change the cursor position without generating an event or motion history.
@@ -294,8 +287,7 @@ QuartzCrossScreen(ScreenPtr pScreen, Bool entering)
 static void
 QuartzWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 {
-    if (XQuartzServerVisible)
-    {
+    if (XQuartzServerVisible) {
         int sx, sy;
 
         sx = pScreen->x + darwinMainScreenX;
@@ -308,7 +300,6 @@ QuartzWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
     miPointerUpdateSprite(pDev);
 }
 
-
 static miPointerScreenFuncRec quartzScreenFuncsRec = {
     QuartzCursorOffScreen,
     QuartzCrossScreen,
@@ -317,7 +308,6 @@ static miPointerScreenFuncRec quartzScreenFuncsRec = {
     NULL
 };
 
-
 /*
 ===========================================================================
 
@@ -336,15 +326,13 @@ QuartzCursorQueryBestSize(int class, unsigned short *width,
 {
     QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
 
-    if (class == CursorShape)
-    {
+    if (class == CursorShape) {
         /* FIXME: query window server? */
         *width = 32;
         *height = 32;
     }
-    else
-    {
-        (*ScreenPriv->QueryBestSize)(class, width, height, pScreen);
+    else {
+        (*ScreenPriv->QueryBestSize) (class, width, height, pScreen);
     }
 }
 
@@ -363,7 +351,7 @@ QuartzInitCursor(ScreenPtr pScreen)
         return FALSE;
 
     if (!dixRegisterPrivateKey(&darwinCursorScreenKeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
 
     ScreenPriv = calloc(1, sizeof(QuartzCursorScreenRec));
     if (ScreenPriv == NULL)
@@ -384,7 +372,7 @@ QuartzInitCursor(ScreenPtr pScreen)
     PointPriv->spriteFuncs->UnrealizeCursor = QuartzUnrealizeCursor;
     PointPriv->spriteFuncs->SetCursor = QuartzSetCursor;
     PointPriv->spriteFuncs->MoveCursor = QuartzMoveCursor;
-    
+
     ScreenPriv->cursorVisible = TRUE;
     return TRUE;
 }
@@ -398,7 +386,6 @@ QuartzSuspendXCursor(ScreenPtr pScreen)
 {
 }
 
-
 /*
  * QuartzResumeXCursor
  *  X server is showing. Restore the X cursor.
@@ -410,7 +397,7 @@ QuartzResumeXCursor(ScreenPtr pScreen)
     CursorPtr pCursor;
 
     /* TODO: Tablet? */
-    
+
     pWin = GetSpriteWindow(darwinPointer);
     if (pWin->drawable.pScreen != pScreen)
         return;
diff --git a/xorg-server/hw/xquartz/xpr/xprEvent.c b/xorg-server/hw/xquartz/xpr/xprEvent.c
index 4e7ece64f..7f4b077c3 100644
--- a/xorg-server/hw/xquartz/xpr/xprEvent.c
+++ b/xorg-server/hw/xquartz/xpr/xprEvent.c
@@ -55,24 +55,25 @@
 #include "rootlessWindow.h"
 #include "xprEvent.h"
 
-Bool QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev) {
-    switch(e->subtype) {
-        case kXquartzWindowState:
-            DEBUG_LOG("kXquartzWindowState\n");
-            RootlessNativeWindowStateChanged(xprGetXWindow(e->data[0]),
-                                             e->data[1]);
-            return TRUE;
-            
-        case kXquartzWindowMoved:
-            DEBUG_LOG("kXquartzWindowMoved\n");
-            RootlessNativeWindowMoved(xprGetXWindow(e->data[0]));
-            return TRUE;
-            
-        case kXquartzBringAllToFront:
-            DEBUG_LOG("kXquartzBringAllToFront\n");
-            RootlessOrderAllWindows(e->data[0]);
-            return TRUE;
-        default:
-            return FALSE;
+Bool
+QuartzModeEventHandler(int screenNum, XQuartzEvent * e, DeviceIntPtr dev)
+{
+    switch (e->subtype) {
+    case kXquartzWindowState:
+        DEBUG_LOG("kXquartzWindowState\n");
+        RootlessNativeWindowStateChanged(xprGetXWindow(e->data[0]), e->data[1]);
+        return TRUE;
+
+    case kXquartzWindowMoved:
+        DEBUG_LOG("kXquartzWindowMoved\n");
+        RootlessNativeWindowMoved(xprGetXWindow(e->data[0]));
+        return TRUE;
+
+    case kXquartzBringAllToFront:
+        DEBUG_LOG("kXquartzBringAllToFront\n");
+        RootlessOrderAllWindows(e->data[0]);
+        return TRUE;
+    default:
+        return FALSE;
     }
 }
diff --git a/xorg-server/hw/xquartz/xpr/xprFrame.c b/xorg-server/hw/xquartz/xpr/xprFrame.c
index 98f1cc3ed..ed81c4b48 100644
--- a/xorg-server/hw/xquartz/xpr/xprFrame.c
+++ b/xorg-server/hw/xquartz/xpr/xprFrame.c
@@ -73,37 +73,51 @@ static pthread_rwlock_t window_hash_rwlock;
 #endif
 
 /* Prototypes for static functions */
-static Bool xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
+static Bool
+xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
                int newX, int newY, RegionPtr pShape);
-static void xprDestroyFrame(RootlessFrameID wid);
-static void xprMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY);
-static void xprResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,
+static void
+xprDestroyFrame(RootlessFrameID wid);
+static void
+xprMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY);
+static void
+xprResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,
                int newX, int newY, unsigned int newW, unsigned int newH,
                unsigned int gravity);
-static void xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid);
-static void xprReshapeFrame(RootlessFrameID wid, RegionPtr pShape);
-static void xprUnmapFrame(RootlessFrameID wid);
-static void xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow);
-static void xprStopDrawing(RootlessFrameID wid, Bool flush);
-static void xprUpdateRegion(RootlessFrameID wid, RegionPtr pDamage);
-static void xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec *rects,
+static void
+xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid);
+static void
+xprReshapeFrame(RootlessFrameID wid, RegionPtr pShape);
+static void
+xprUnmapFrame(RootlessFrameID wid);
+static void
+xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow);
+static void
+xprStopDrawing(RootlessFrameID wid, Bool flush);
+static void
+xprUpdateRegion(RootlessFrameID wid, RegionPtr pDamage);
+static void
+xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec * rects,
                int shift_x, int shift_y);
-static void xprSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin);
-static Bool xprDoReorderWindow(RootlessWindowPtr pFrame);
-static void xprHideWindow(RootlessFrameID wid);
-static void xprUpdateColormap(RootlessFrameID wid, ScreenPtr pScreen);
-static void xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,
+static void
+xprSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin);
+static Bool
+xprDoReorderWindow(RootlessWindowPtr pFrame);
+static void
+xprHideWindow(RootlessFrameID wid);
+static void
+xprUpdateColormap(RootlessFrameID wid, ScreenPtr pScreen);
+static void
+xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec * dstRects,
               int dx, int dy);
 
-
 static inline xp_error
 xprConfigureWindow(xp_window_id id, unsigned int mask,
-                   const xp_window_changes *values)
+                   const xp_window_changes * values)
 {
     return xp_configure_window(id, mask, values);
 }
 
-
 static void
 xprSetNativeProperty(RootlessWindowPtr pFrame)
 {
@@ -112,20 +126,22 @@ xprSetNativeProperty(RootlessWindowPtr pFrame)
     long data;
 
     err = xp_get_native_window(x_cvt_vptr_to_uint(pFrame->wid), &native_id);
-    if (err == Success)
-    {
+    if (err == Success) {
         /* FIXME: move this to AppleWM extension */
 
         data = native_id;
-        dixChangeWindowProperty(serverClient, pFrame->win, xa_native_window_id(),
-				XA_INTEGER, 32, PropModeReplace, 1, &data, TRUE);
+        dixChangeWindowProperty(serverClient, pFrame->win,
+                                xa_native_window_id(), XA_INTEGER, 32,
+                                PropModeReplace, 1, &data, TRUE);
     }
 }
 
 static xp_error
-xprColormapCallback(void *data, int first_color, int n_colors, uint32_t *colors)
+xprColormapCallback(void *data, int first_color, int n_colors,
+                    uint32_t * colors)
 {
-    return (RootlessResolveColormap (data, first_color, n_colors, colors) ? XP_Success : XP_BadMatch);
+    return (RootlessResolveColormap(data, first_color, n_colors, colors) ?
+            XP_Success : XP_BadMatch);
 }
 
 /*
@@ -147,8 +163,7 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
     wc.bit_gravity = XP_GRAVITY_NONE;
     mask |= XP_BOUNDS;
 
-    if (pWin->drawable.depth == 8)
-    {
+    if (pWin->drawable.depth == 8) {
         wc.depth = XP_DEPTH_INDEX8;
         wc.colormap = xprColormapCallback;
         wc.colormap_data = pScreen;
@@ -162,35 +177,34 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
         wc.depth = XP_DEPTH_NIL;
     mask |= XP_DEPTH;
 
-    if (pShape != NULL)
-    {
+    if (pShape != NULL) {
         wc.shape_nrects = RegionNumRects(pShape);
         wc.shape_rects = RegionRects(pShape);
         wc.shape_tx = wc.shape_ty = 0;
         mask |= XP_SHAPE;
     }
 
-    pFrame->level = !IsRoot (pWin) ? AppleWMWindowLevelNormal : AppleWMNumWindowLevels;
+    pFrame->level =
+        !IsRoot(pWin) ? AppleWMWindowLevelNormal : AppleWMNumWindowLevels;
 
-    if(XQuartzIsRootless)
+    if (XQuartzIsRootless)
         wc.window_level = normal_window_levels[pFrame->level];
-    else if(XQuartzShieldingWindowLevel)
+    else if (XQuartzShieldingWindowLevel)
         wc.window_level = XQuartzShieldingWindowLevel + 1;
     else
         wc.window_level = rooted_window_levels[pFrame->level];
     mask |= XP_WINDOW_LEVEL;
 
-    err = xp_create_window(mask, &wc, (xp_window_id *) &pFrame->wid);
+    err = xp_create_window(mask, &wc, (xp_window_id *) & pFrame->wid);
 
-    if (err != Success)
-    {
+    if (err != Success) {
         return FALSE;
     }
 
 #ifdef HAVE_LIBDISPATCH
-    dispatch_async(window_hash_serial_q, ^{
-        x_hash_table_insert(window_hash, pFrame->wid, pFrame);
-    });
+    dispatch_async(window_hash_serial_q, ^ {
+                   x_hash_table_insert(window_hash, pFrame->wid, pFrame);}
+    );
 #else
     pthread_rwlock_wrlock(&window_hash_rwlock);
     x_hash_table_insert(window_hash, pFrame->wid, pFrame);
@@ -202,7 +216,6 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
     return TRUE;
 }
 
-
 /*
  * Destroy a frame.
  */
@@ -212,9 +225,8 @@ xprDestroyFrame(RootlessFrameID wid)
     xp_error err;
 
 #ifdef HAVE_LIBDISPATCH
-    dispatch_async(window_hash_serial_q, ^{
-        x_hash_table_remove(window_hash, wid);
-    });
+    dispatch_async(window_hash_serial_q, ^ {
+                   x_hash_table_remove(window_hash, wid);});
 #else
     pthread_rwlock_wrlock(&window_hash_rwlock);
     x_hash_table_remove(window_hash, wid);
@@ -223,10 +235,10 @@ xprDestroyFrame(RootlessFrameID wid)
 
     err = xp_destroy_window(x_cvt_vptr_to_uint(wid));
     if (err != Success)
-        FatalError("Could not destroy window %d (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);
+        FatalError("Could not destroy window %d (%d).",
+                   (int) x_cvt_vptr_to_uint(wid), (int) err);
 }
 
-
 /*
  * Move a frame on screen.
  */
@@ -241,7 +253,6 @@ xprMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY)
     xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_ORIGIN, &wc);
 }
 
-
 /*
  * Resize and move a frame.
  */
@@ -264,43 +275,46 @@ xprResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,
     xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_BOUNDS, &wc);
 }
 
-
 /*
  * Change frame stacking.
  */
-static void xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid) {
+static void
+xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
+{
     xp_window_changes wc;
     unsigned int mask = XP_STACKING;
+
 #ifdef HAVE_LIBDISPATCH
     __block
 #endif
-    RootlessWindowRec *winRec;
+        RootlessWindowRec * winRec;
 
     /* Stack frame below nextWid it if it exists, or raise
        frame above everything otherwise. */
 
-    if(nextWid == NULL) {
+    if (nextWid == NULL) {
         wc.stack_mode = XP_MAPPED_ABOVE;
         wc.sibling = 0;
-    } else {
+    }
+    else {
         wc.stack_mode = XP_MAPPED_BELOW;
         wc.sibling = x_cvt_vptr_to_uint(nextWid);
     }
 
 #ifdef HAVE_LIBDISPATCH
-    dispatch_sync(window_hash_serial_q, ^{
-        winRec = x_hash_table_lookup(window_hash, wid, NULL);
-    });
+    dispatch_sync(window_hash_serial_q, ^ {
+                  winRec = x_hash_table_lookup(window_hash, wid, NULL);}
+    );
 #else
     pthread_rwlock_rdlock(&window_hash_rwlock);
     winRec = x_hash_table_lookup(window_hash, wid, NULL);
     pthread_rwlock_unlock(&window_hash_rwlock);
 #endif
-    
-    if(winRec) {
-        if(XQuartzIsRootless)
+
+    if (winRec) {
+        if (XQuartzIsRootless)
             wc.window_level = normal_window_levels[winRec->level];
-        else if(XQuartzShieldingWindowLevel)
+        else if (XQuartzShieldingWindowLevel)
             wc.window_level = XQuartzShieldingWindowLevel + 1;
         else
             wc.window_level = rooted_window_levels[winRec->level];
@@ -310,7 +324,6 @@ static void xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid) {
     xprConfigureWindow(x_cvt_vptr_to_uint(wid), mask, &wc);
 }
 
-
 /*
  * Change the frame's shape.
  */
@@ -319,13 +332,11 @@ xprReshapeFrame(RootlessFrameID wid, RegionPtr pShape)
 {
     xp_window_changes wc;
 
-    if (pShape != NULL)
-    {
+    if (pShape != NULL) {
         wc.shape_nrects = RegionNumRects(pShape);
         wc.shape_rects = RegionRects(pShape);
     }
-    else
-    {
+    else {
         wc.shape_nrects = -1;
         wc.shape_rects = NULL;
     }
@@ -335,7 +346,6 @@ xprReshapeFrame(RootlessFrameID wid, RegionPtr pShape)
     xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_SHAPE, &wc);
 }
 
-
 /*
  * Unmap a frame.
  */
@@ -350,7 +360,6 @@ xprUnmapFrame(RootlessFrameID wid)
     xprConfigureWindow(x_cvt_vptr_to_uint(wid), XP_STACKING, &wc);
 }
 
-
 /*
  * Start drawing to a frame.
  *  Prepare for direct access to its backing buffer.
@@ -362,15 +371,17 @@ xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
     unsigned int rowbytes[2];
     xp_error err;
 
-    err = xp_lock_window(x_cvt_vptr_to_uint(wid), NULL, NULL, data, rowbytes, NULL);
+    err =
+        xp_lock_window(x_cvt_vptr_to_uint(wid), NULL, NULL, data, rowbytes,
+                       NULL);
     if (err != Success)
-        FatalError("Could not lock window %d for drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);
+        FatalError("Could not lock window %d for drawing (%d).",
+                   (int) x_cvt_vptr_to_uint(wid), (int) err);
 
     *pixelData = data[0];
     *bytesPerRow = rowbytes[0];
 }
 
-
 /*
  * Stop drawing to a frame.
  */
@@ -383,11 +394,11 @@ xprStopDrawing(RootlessFrameID wid, Bool flush)
     /* This should be a FatalError, but we started tripping over it.  Make it a
      * FatalError after http://xquartz.macosforge.org/trac/ticket/482 is fixed.
      */
-    if(err != Success)
-        ErrorF("Could not unlock window %d after drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);
+    if (err != Success)
+        ErrorF("Could not unlock window %d after drawing (%d).",
+               (int) x_cvt_vptr_to_uint(wid), (int) err);
 }
 
-
 /*
  * Flush drawing updates to the screen.
  */
@@ -397,18 +408,16 @@ xprUpdateRegion(RootlessFrameID wid, RegionPtr pDamage)
     xp_flush_window(x_cvt_vptr_to_uint(wid));
 }
 
-
 /*
  * Mark damaged rectangles as requiring redisplay to screen.
  */
 static void
-xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec *rects,
+xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec * rects,
                int shift_x, int shift_y)
 {
     xp_mark_window(x_cvt_vptr_to_uint(wid), nrects, rects, shift_x, shift_y);
 }
 
-
 /*
  * Called after the window associated with a frame has been switched
  * to a new top-level parent.
@@ -421,31 +430,29 @@ xprSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin)
     xprSetNativeProperty(pFrame);
 }
 
-
 /*
  * Called to check if the frame should be reordered when it is restacked.
  */
-static Bool xprDoReorderWindow(RootlessWindowPtr pFrame)
+static Bool
+xprDoReorderWindow(RootlessWindowPtr pFrame)
 {
     WindowPtr pWin = pFrame->win;
 
     return AppleWMDoReorderWindow(pWin);
 }
 
-
 /*
  * Copy area in frame to another part of frame.
  *  Used to accelerate scrolling.
  */
 static void
-xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,
+xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec * dstRects,
               int dx, int dy)
 {
     xp_copy_window(x_cvt_vptr_to_uint(wid), x_cvt_vptr_to_uint(wid),
                    dstNrects, dstRects, dx, dy);
 }
 
-
 static RootlessFrameProcsRec xprRootlessProcs = {
     xprCreateFrame,
     xprDestroyFrame,
@@ -466,7 +473,6 @@ static RootlessFrameProcsRec xprRootlessProcs = {
     xprCopyWindow
 };
 
-
 /*
  * Initialize XPR implementation
  */
@@ -480,15 +486,16 @@ xprInit(ScreenPtr pScreen)
 
     assert((window_hash = x_hash_table_new(NULL, NULL, NULL, NULL)));
 #ifdef HAVE_LIBDISPATCH
-    assert((window_hash_serial_q = dispatch_queue_create(BUNDLE_ID_PREFIX".X11.xpr_window_hash", NULL)));
+    assert((window_hash_serial_q =
+            dispatch_queue_create(BUNDLE_ID_PREFIX ".X11.xpr_window_hash",
+                                  NULL)));
 #else
     assert(0 == pthread_rwlock_init(&window_hash_rwlock, NULL));
 #endif
-    
+
     return TRUE;
 }
 
-
 /*
  * Given the id of a physical window, try to find the top-level (or root)
  * X window that it represents.
@@ -498,11 +505,14 @@ xprGetXWindow(xp_window_id wid)
 {
 #ifdef HAVE_LIBDISPATCH
     RootlessWindowRec *winRec __block;
-    dispatch_sync(window_hash_serial_q, ^{
-        winRec = x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid), NULL);
-    });
+
+    dispatch_sync(window_hash_serial_q, ^ {
+                  winRec =
+                  x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid),
+                                      NULL);});
 #else
     RootlessWindowRec *winRec;
+
     pthread_rwlock_rdlock(&window_hash_rwlock);
     winRec = x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid), NULL);
     pthread_rwlock_unlock(&window_hash_rwlock);
@@ -529,7 +539,6 @@ xprIsX11Window(int windowNumber)
     return ret;
 }
 
-
 /*
  * xprHideWindows
  *  Hide or unhide all top level windows. This is called for application hide/
@@ -544,6 +553,7 @@ xprHideWindows(Bool hide)
 
     for (screen = 0; screen < screenInfo.numScreens; screen++) {
         RootlessFrameID prevWid = NULL;
+
         pRoot = screenInfo.screens[screen]->root;
 
         for (pWin = pRoot->firstChild; pWin; pWin = pWin->nextSib) {
@@ -552,7 +562,8 @@ xprHideWindows(Bool hide)
             if (winRec != NULL) {
                 if (hide) {
                     xprUnmapFrame(winRec->wid);
-                } else {
+                }
+                else {
                     BoxRec box;
 
                     xprRestackFrame(winRec->wid, prevWid);
@@ -577,32 +588,35 @@ xprHideWindows(Bool hide)
 Bool no_configure_window;
 
 static inline int
-configure_window (xp_window_id id, unsigned int mask,
-                  const xp_window_changes *values)
+configure_window(xp_window_id id, unsigned int mask,
+                 const xp_window_changes * values)
 {
-  if (!no_configure_window)
-    return xp_configure_window (id, mask, values);
-  else
-    return XP_Success;
+    if (!no_configure_window)
+        return xp_configure_window(id, mask, values);
+    else
+        return XP_Success;
 }
 
-
 static
-void xprUpdateColormap(RootlessFrameID wid, ScreenPtr pScreen)
+    void
+xprUpdateColormap(RootlessFrameID wid, ScreenPtr pScreen)
 {
-  /* This is how we tell xp that the colormap may have changed. */
-  xp_window_changes wc;
-  wc.colormap = xprColormapCallback;
-  wc.colormap_data = pScreen;
+    /* This is how we tell xp that the colormap may have changed. */
+    xp_window_changes wc;
 
-  configure_window(MAKE_WINDOW_ID(wid), XP_COLORMAP, &wc);
+    wc.colormap = xprColormapCallback;
+    wc.colormap_data = pScreen;
+
+    configure_window(MAKE_WINDOW_ID(wid), XP_COLORMAP, &wc);
 }
 
 static
-void xprHideWindow(RootlessFrameID wid)
+    void
+xprHideWindow(RootlessFrameID wid)
 {
-  xp_window_changes wc;
-  wc.stack_mode = XP_UNMAPPED;
-  wc.sibling = 0;
-  configure_window(MAKE_WINDOW_ID(wid), XP_STACKING, &wc);
+    xp_window_changes wc;
+
+    wc.stack_mode = XP_UNMAPPED;
+    wc.sibling = 0;
+    configure_window(MAKE_WINDOW_ID(wid), XP_STACKING, &wc);
 }
diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index 002355eca..185369e6b 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -51,7 +51,7 @@
 #include "rootlessCommon.h"
 
 #ifdef DAMAGE
-# include "damage.h"
+#include "damage.h"
 #endif
 
 /* 10.4's deferred update makes X slower.. have to live with the tearing
@@ -65,61 +65,67 @@ static const char *xprOpenGLBundle = "glxCGL.bundle";
  * eventHandler
  *  Callback handler for Xplugin events.
  */
-static void eventHandler(unsigned int type, const void *arg,
-                         unsigned int arg_size, void *data) {
-    
+static void
+eventHandler(unsigned int type, const void *arg,
+             unsigned int arg_size, void *data)
+{
+
     switch (type) {
-        case XP_EVENT_DISPLAY_CHANGED:
-            DEBUG_LOG("XP_EVENT_DISPLAY_CHANGED\n");
-            DarwinSendDDXEvent(kXquartzDisplayChanged, 0);
-            break;
-            
-        case XP_EVENT_WINDOW_STATE_CHANGED:
-            if (arg_size >= sizeof(xp_window_state_event)) {
-                const xp_window_state_event *ws_arg = arg;
-                
-                DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: id=%d, state=%d\n", ws_arg->id, ws_arg->state);
-                DarwinSendDDXEvent(kXquartzWindowState, 2,
-                                          ws_arg->id, ws_arg->state);
-            } else {
-                DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: ignored\n");
-            }
-            break;
-            
-        case XP_EVENT_WINDOW_MOVED:
-            DEBUG_LOG("XP_EVENT_WINDOW_MOVED\n");
-            if (arg_size == sizeof(xp_window_id))  {
-                xp_window_id id = * (xp_window_id *) arg;
-                DarwinSendDDXEvent(kXquartzWindowMoved, 1, id);
-            }
-            break;
-            
-        case XP_EVENT_SURFACE_DESTROYED:
-            DEBUG_LOG("XP_EVENT_SURFACE_DESTROYED\n");
-        case XP_EVENT_SURFACE_CHANGED:
-            DEBUG_LOG("XP_EVENT_SURFACE_CHANGED\n");
-            if (arg_size == sizeof(xp_surface_id)) {
-                int kind;
-                
-                if (type == XP_EVENT_SURFACE_DESTROYED)
-                    kind = AppleDRISurfaceNotifyDestroyed;
-                else
-                    kind = AppleDRISurfaceNotifyChanged;
-                
-                DRISurfaceNotify(*(xp_surface_id *) arg, kind);
-            }
-            break;
+    case XP_EVENT_DISPLAY_CHANGED:
+        DEBUG_LOG("XP_EVENT_DISPLAY_CHANGED\n");
+        DarwinSendDDXEvent(kXquartzDisplayChanged, 0);
+        break;
+
+    case XP_EVENT_WINDOW_STATE_CHANGED:
+        if (arg_size >= sizeof(xp_window_state_event)) {
+            const xp_window_state_event *ws_arg = arg;
+
+            DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: id=%d, state=%d\n",
+                      ws_arg->id, ws_arg->state);
+            DarwinSendDDXEvent(kXquartzWindowState, 2, ws_arg->id,
+                               ws_arg->state);
+        }
+        else {
+            DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: ignored\n");
+        }
+        break;
+
+    case XP_EVENT_WINDOW_MOVED:
+        DEBUG_LOG("XP_EVENT_WINDOW_MOVED\n");
+        if (arg_size == sizeof(xp_window_id)) {
+            xp_window_id id = *(xp_window_id *) arg;
+
+            DarwinSendDDXEvent(kXquartzWindowMoved, 1, id);
+        }
+        break;
+
+    case XP_EVENT_SURFACE_DESTROYED:
+        DEBUG_LOG("XP_EVENT_SURFACE_DESTROYED\n");
+    case XP_EVENT_SURFACE_CHANGED:
+        DEBUG_LOG("XP_EVENT_SURFACE_CHANGED\n");
+        if (arg_size == sizeof(xp_surface_id)) {
+            int kind;
+
+            if (type == XP_EVENT_SURFACE_DESTROYED)
+                kind = AppleDRISurfaceNotifyDestroyed;
+            else
+                kind = AppleDRISurfaceNotifyChanged;
+
+            DRISurfaceNotify(*(xp_surface_id *) arg, kind);
+        }
+        break;
 #ifdef XP_EVENT_SPACE_CHANGED
-        case  XP_EVENT_SPACE_CHANGED:
-            DEBUG_LOG("XP_EVENT_SPACE_CHANGED\n");
-            if(arg_size == sizeof(uint32_t)) {
-                uint32_t space_id = *(uint32_t *)arg;
-                DarwinSendDDXEvent(kXquartzSpaceChanged, 1, space_id);
-            }
-            break;
+    case XP_EVENT_SPACE_CHANGED:
+        DEBUG_LOG("XP_EVENT_SPACE_CHANGED\n");
+        if (arg_size == sizeof(uint32_t)) {
+            uint32_t space_id = *(uint32_t *) arg;
+
+            DarwinSendDDXEvent(kXquartzSpaceChanged, 1, space_id);
+        }
+        break;
 #endif
-        default:
-            ErrorF("Unknown XP_EVENT type (%d) in xprScreen:eventHandler\n", type);
+    default:
+        ErrorF("Unknown XP_EVENT type (%d) in xprScreen:eventHandler\n", type);
     }
 }
 
@@ -132,7 +138,7 @@ displayAtIndex(int index)
 {
     CGError err;
     CGDisplayCount cnt;
-    CGDirectDisplayID dpy[index+1];
+    CGDirectDisplayID dpy[index + 1];
 
     err = CGGetActiveDisplayList(index + 1, dpy, &cnt);
     if (err == kCGErrorSuccess && cnt == index + 1)
@@ -153,19 +159,18 @@ displayScreenBounds(CGDirectDisplayID id)
     frame = CGDisplayBounds(id);
 
     DEBUG_LOG("    %dx%d @ (%d,%d).\n",
-              (int)frame.size.width, (int)frame.size.height,
-              (int)frame.origin.x, (int)frame.origin.y);
-    
+              (int) frame.size.width, (int) frame.size.height,
+              (int) frame.origin.x, (int) frame.origin.y);
+
     /* Remove menubar to help standard X11 window managers. */
-    if (XQuartzIsRootless && 
-        frame.origin.x == 0 && frame.origin.y == 0) {
+    if (XQuartzIsRootless && frame.origin.x == 0 && frame.origin.y == 0) {
         frame.origin.y += aquaMenuBarHeight;
         frame.size.height -= aquaMenuBarHeight;
     }
 
     DEBUG_LOG("    %dx%d @ (%d,%d).\n",
-              (int)frame.size.width, (int)frame.size.height,
-              (int)frame.origin.x, (int)frame.origin.y);
+              (int) frame.size.width, (int) frame.size.height,
+              (int) frame.origin.x, (int) frame.origin.y);
 
     return frame;
 }
@@ -176,7 +181,8 @@ displayScreenBounds(CGDirectDisplayID id)
  *  with PseudoramiX.
  */
 static void
-xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height, ScreenPtr pScreen)
+xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height,
+                         ScreenPtr pScreen)
 {
     CGDisplayCount i, displayCount;
     CGDirectDisplayID *displayList = NULL;
@@ -184,10 +190,11 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height, ScreenPtr pScr
 
     // Find all the CoreGraphics displays
     CGGetActiveDisplayList(0, NULL, &displayCount);
-    DEBUG_LOG("displayCount: %d\n", (int)displayCount);
+    DEBUG_LOG("displayCount: %d\n", (int) displayCount);
 
-    if(!displayCount) {
-        ErrorF("CoreGraphics has reported no connected displays.  Creating a stub 800x600 display.\n");
+    if (!displayCount) {
+        ErrorF
+            ("CoreGraphics has reported no connected displays.  Creating a stub 800x600 display.\n");
         *x = *y = 0;
         *width = 800;
         *height = 600;
@@ -204,7 +211,7 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height, ScreenPtr pScr
         displayCount = 1;
 
     displayList = malloc(displayCount * sizeof(CGDirectDisplayID));
-    if(!displayList)
+    if (!displayList)
         FatalError("Unable to allocate memory for list of displays.\n");
     CGGetActiveDisplayList(displayCount, displayList, &displayCount);
     QuartzCopyDisplayIDs(pScreen, displayCount, displayList);
@@ -212,6 +219,7 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height, ScreenPtr pScr
     /* Get the union of all screens */
     for (i = 0; i < displayCount; i++) {
         CGDirectDisplayID dpy = displayList[i];
+
         frame = displayScreenBounds(dpy);
         unionRect = CGRectUnion(unionRect, frame);
     }
@@ -226,8 +234,7 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height, ScreenPtr pScr
               *x, *y, *width, *height);
 
     /* Tell PseudoramiX about the real screens. */
-    for (i = 0; i < displayCount; i++)
-    {
+    for (i = 0; i < displayCount; i++) {
         CGDirectDisplayID dpy = displayList[i];
 
         frame = displayScreenBounds(dpy);
@@ -235,7 +242,7 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height, ScreenPtr pScr
         frame.origin.y -= unionRect.origin.y;
 
         DEBUG_LOG("    placed at X11 coordinate (%d,%d).\n",
-                  (int)frame.origin.x, (int)frame.origin.y);
+                  (int) frame.origin.x, (int) frame.origin.y);
 
         PseudoramiXAddScreen(frame.origin.x, frame.origin.y,
                              frame.size.width, frame.size.height);
@@ -263,20 +270,18 @@ xprDisplayInit(void)
     if (noPseudoramiXExtension)
         darwinScreensFound = displayCount;
     else
-        darwinScreensFound =  1;
+        darwinScreensFound = 1;
 
     if (xp_init(XP_BACKGROUND_EVENTS | XP_NO_DEFERRED_UPDATES) != Success)
         FatalError("Could not initialize the Xplugin library.");
 
     xp_select_events(XP_EVENT_DISPLAY_CHANGED
-                     | XP_EVENT_WINDOW_STATE_CHANGED
-                     | XP_EVENT_WINDOW_MOVED
+                     | XP_EVENT_WINDOW_STATE_CHANGED | XP_EVENT_WINDOW_MOVED
 #ifdef XP_EVENT_SPACE_CHANGED
                      | XP_EVENT_SPACE_CHANGED
 #endif
                      | XP_EVENT_SURFACE_CHANGED
-                     | XP_EVENT_SURFACE_DESTROYED,
-                     eventHandler, NULL);
+                     | XP_EVENT_SURFACE_DESTROYED, eventHandler, NULL);
 
     AppleDRIExtensionInit();
     xprAppleWMInit();
@@ -297,81 +302,92 @@ xprAddScreen(int index, ScreenPtr pScreen)
     int depth = darwinDesiredDepth;
 
     DEBUG_LOG("index=%d depth=%d\n", index, depth);
-    
-    if(depth == -1) {
+
+    if (depth == -1) {
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-        depth = CGDisplaySamplesPerPixel(kCGDirectMainDisplay) * CGDisplayBitsPerSample(kCGDirectMainDisplay);
+        depth =
+            CGDisplaySamplesPerPixel(kCGDirectMainDisplay) *
+            CGDisplayBitsPerSample(kCGDirectMainDisplay);
 #else
         CGDisplayModeRef modeRef;
         CFStringRef encStrRef;
-        
+
         modeRef = CGDisplayCopyDisplayMode(kCGDirectMainDisplay);
-        if(!modeRef)
+        if (!modeRef)
             goto have_depth;
 
         encStrRef = CGDisplayModeCopyPixelEncoding(modeRef);
         CFRelease(modeRef);
-        if(!encStrRef)
+        if (!encStrRef)
             goto have_depth;
-        
-        if(CFStringCompare(encStrRef, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+
+        if (CFStringCompare
+            (encStrRef, CFSTR(IO32BitDirectPixels),
+             kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
             depth = 24;
-        } else if(CFStringCompare(encStrRef, CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+        }
+        else if (CFStringCompare
+                 (encStrRef, CFSTR(IO16BitDirectPixels),
+                  kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
             depth = 15;
-        } else if(CFStringCompare(encStrRef, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+        }
+        else if (CFStringCompare
+                 (encStrRef, CFSTR(IO8BitIndexedPixels),
+                  kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
             depth = 8;
         }
 
         CFRelease(encStrRef);
 #endif
     }
-    
+
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
-have_depth:
+ have_depth:
 #endif
-    switch(depth) {
-        case 8: // pseudo-working
-            dfb->visuals = PseudoColorMask;
-            dfb->preferredCVC = PseudoColor;
-            dfb->depth = 8;
-            dfb->bitsPerRGB = 8;
-            dfb->bitsPerPixel = 8;
-            dfb->redMask = 0;
-            dfb->greenMask = 0;
-            dfb->blueMask = 0;
-            break;
-        case 15:
-            dfb->visuals = TrueColorMask; //LARGE_VISUALS;
-            dfb->preferredCVC = TrueColor;
-            dfb->depth = 15;
-            dfb->bitsPerRGB = 5;
-            dfb->bitsPerPixel = 16;
-            dfb->redMask   = RM_ARGB(0,5,5,5);
-            dfb->greenMask = GM_ARGB(0,5,5,5);
-            dfb->blueMask  = BM_ARGB(0,5,5,5);
-            break;
+    switch (depth) {
+    case 8:                    // pseudo-working
+        dfb->visuals = PseudoColorMask;
+        dfb->preferredCVC = PseudoColor;
+        dfb->depth = 8;
+        dfb->bitsPerRGB = 8;
+        dfb->bitsPerPixel = 8;
+        dfb->redMask = 0;
+        dfb->greenMask = 0;
+        dfb->blueMask = 0;
+        break;
+    case 15:
+        dfb->visuals = TrueColorMask;   //LARGE_VISUALS;
+        dfb->preferredCVC = TrueColor;
+        dfb->depth = 15;
+        dfb->bitsPerRGB = 5;
+        dfb->bitsPerPixel = 16;
+        dfb->redMask = RM_ARGB(0, 5, 5, 5);
+        dfb->greenMask = GM_ARGB(0, 5, 5, 5);
+        dfb->blueMask = BM_ARGB(0, 5, 5, 5);
+        break;
 //        case 24:
-        default:
-            if(depth != 24)
-                ErrorF("Unsupported color depth requested.  Defaulting to 24bit. (depth=%d darwinDesiredDepth=%d)\n", depth, darwinDesiredDepth);
-            dfb->visuals = TrueColorMask; //LARGE_VISUALS;
-            dfb->preferredCVC = TrueColor;
-            dfb->depth = 24;
-            dfb->bitsPerRGB = 8;
-            dfb->bitsPerPixel = 32;
-            dfb->redMask   = RM_ARGB(0,8,8,8);
-            dfb->greenMask = GM_ARGB(0,8,8,8);
-            dfb->blueMask  = BM_ARGB(0,8,8,8);
-            break;
+    default:
+        if (depth != 24)
+            ErrorF
+                ("Unsupported color depth requested.  Defaulting to 24bit. (depth=%d darwinDesiredDepth=%d)\n",
+                 depth, darwinDesiredDepth);
+        dfb->visuals = TrueColorMask;   //LARGE_VISUALS;
+        dfb->preferredCVC = TrueColor;
+        dfb->depth = 24;
+        dfb->bitsPerRGB = 8;
+        dfb->bitsPerPixel = 32;
+        dfb->redMask = RM_ARGB(0, 8, 8, 8);
+        dfb->greenMask = GM_ARGB(0, 8, 8, 8);
+        dfb->blueMask = BM_ARGB(0, 8, 8, 8);
+        break;
     }
 
-    if (noPseudoramiXExtension)
-    {
+    if (noPseudoramiXExtension) {
         CGDirectDisplayID dpy;
         CGRect frame;
 
         ErrorF("Warning: noPseudoramiXExtension!\n");
-        
+
         dpy = displayAtIndex(index);
         QuartzCopyDisplayIDs(pScreen, 1, &dpy);
 
@@ -379,12 +395,12 @@ have_depth:
 
         dfb->x = frame.origin.x;
         dfb->y = frame.origin.y;
-        dfb->width =  frame.size.width;
+        dfb->width = frame.size.width;
         dfb->height = frame.size.height;
     }
-    else
-    {
-        xprAddPseudoramiXScreens(&dfb->x, &dfb->y, &dfb->width, &dfb->height, pScreen);
+    else {
+        xprAddPseudoramiXScreens(&dfb->x, &dfb->y, &dfb->width, &dfb->height,
+                                 pScreen);
     }
 
     /* Passing zero width (pitch) makes miCreateScreenResources set the
diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c
index 9cf573536..395b533fc 100644
--- a/xorg-server/hw/xwin/InitInput.c
+++ b/xorg-server/hw/xwin/InitInput.c
@@ -33,18 +33,16 @@
 #include "dixstruct.h"
 #include "inputstr.h"
 
-
 /*
  * Local function prototypes
  */
 
 #ifdef XWIN_CLIPBOARD
-int winProcEstablishConnection(ClientPtr /* client */);
-int winProcQueryTree(ClientPtr /* client */);
-int winProcSetSelectionOwner(ClientPtr /* client */);
+int winProcEstablishConnection(ClientPtr /* client */ );
+int winProcQueryTree(ClientPtr /* client */ );
+int winProcSetSelectionOwner(ClientPtr /* client */ );
 #endif
 
-
 /*
  * Local global declarations
  */
@@ -62,93 +60,87 @@ DeviceIntPtr g_pwinKeyboard;
  */
 
 Bool
-LegalModifier (unsigned int uiKey, DeviceIntPtr pDevice)
+LegalModifier(unsigned int uiKey, DeviceIntPtr pDevice)
 {
-  return TRUE;
+    return TRUE;
 }
 
-
 /* Called from dix/dispatch.c */
 /*
  * Run through the Windows message queue(s) one more time.
  * Tell mi to dequeue the events that we have sent it.
  */
 void
-ProcessInputEvents (void)
+ProcessInputEvents(void)
 {
 #if 0
-  ErrorF ("ProcessInputEvents\n");
+    ErrorF("ProcessInputEvents\n");
 #endif
 
-  mieqProcessInputEvents ();
+    mieqProcessInputEvents();
 
 #if 0
-  ErrorF ("ProcessInputEvents - returning\n");
+    ErrorF("ProcessInputEvents - returning\n");
 #endif
 }
 
-
-void DDXRingBell(int volume, int pitch, int duration)
+void
+DDXRingBell(int volume, int pitch, int duration)
 {
-  /* winKeybdBell is used instead */
-  return;
+    /* winKeybdBell is used instead */
+    return;
 }
 
-
 /* See Porting Layer Definition - p. 17 */
 void
-InitInput (int argc, char *argv[])
+InitInput(int argc, char *argv[])
 {
 #if CYGDEBUG
-  winDebug ("InitInput\n");
+    winDebug("InitInput\n");
 #endif
 
 #ifdef XWIN_CLIPBOARD
-  /*
-   * Wrap some functions at every generation of the server.
-   */
-  if (InitialVector[2] != winProcEstablishConnection)
-    {
-      winProcEstablishConnectionOrig = InitialVector[2];
-      InitialVector[2] = winProcEstablishConnection;
+    /*
+     * Wrap some functions at every generation of the server.
+     */
+    if (InitialVector[2] != winProcEstablishConnection) {
+        winProcEstablishConnectionOrig = InitialVector[2];
+        InitialVector[2] = winProcEstablishConnection;
     }
 #endif
 
-  g_pwinPointer = AddInputDevice (serverClient, winMouseProc, TRUE);
-  g_pwinKeyboard = AddInputDevice (serverClient, winKeybdProc, TRUE);
-  g_pwinPointer->name = strdup("Windows mouse");
-  g_pwinKeyboard->name = strdup("Windows keyboard");
+    g_pwinPointer = AddInputDevice(serverClient, winMouseProc, TRUE);
+    g_pwinKeyboard = AddInputDevice(serverClient, winKeybdProc, TRUE);
+    g_pwinPointer->name = strdup("Windows mouse");
+    g_pwinKeyboard->name = strdup("Windows keyboard");
 
-  mieqInit ();
+    mieqInit();
 
-  /* Initialize the mode key states */
-  winInitializeModeKeyStates ();
+    /* Initialize the mode key states */
+    winInitializeModeKeyStates();
 
 #ifdef HAS_DEVWINDOWS
-  /* Only open the windows message queue device once */
-  if (g_fdMessageQueue == WIN_FD_INVALID)
-    {
-      /* Open a file descriptor for the Windows message queue */
-      g_fdMessageQueue = open (WIN_MSG_QUEUE_FNAME, O_RDONLY);
-      
-      if (g_fdMessageQueue == -1)
-	{
-	  FatalError ("InitInput - Failed opening %s\n",
-		      WIN_MSG_QUEUE_FNAME);
-	}
-
-      /* Add the message queue as a device to wait for in WaitForSomething */
-      AddEnabledDevice (g_fdMessageQueue);
+    /* Only open the windows message queue device once */
+    if (g_fdMessageQueue == WIN_FD_INVALID) {
+        /* Open a file descriptor for the Windows message queue */
+        g_fdMessageQueue = open(WIN_MSG_QUEUE_FNAME, O_RDONLY);
+
+        if (g_fdMessageQueue == -1) {
+            FatalError("InitInput - Failed opening %s\n", WIN_MSG_QUEUE_FNAME);
+        }
+
+        /* Add the message queue as a device to wait for in WaitForSomething */
+        AddEnabledDevice(g_fdMessageQueue);
     }
 #endif
 
 #if CYGDEBUG
-  winDebug ("InitInput - returning\n");
+    winDebug("InitInput - returning\n");
 #endif
 }
 
 void
-CloseInput (void)
+CloseInput(void)
 {
-  mieqFini ();
+    mieqFini();
 }
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index 4a601b222..4d0df110f 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -49,25 +49,22 @@ from The Open Group.
 #endif
 #ifdef RELOCATE_PROJECTROOT
 #include <shlobj.h>
-typedef WINAPI HRESULT (*SHGETFOLDERPATHPROC)(
-    HWND hwndOwner,
-    int nFolder,
-    HANDLE hToken,
-    DWORD dwFlags,
-    LPTSTR pszPath
-);
+typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
+                                              int nFolder,
+                                              HANDLE hToken,
+                                              DWORD dwFlags, LPTSTR pszPath);
 #endif
 
 /*
  * References to external symbols
  */
 #ifdef XWIN_CLIPBOARD
-extern Bool			g_fUnicodeClipboard;
-extern Bool			g_fClipboardLaunched;
-extern Bool			g_fClipboardStarted;
-extern pthread_t		g_ptClipboardProc;
-extern HWND			g_hwndClipboard;
-extern Bool			g_fClipboard;
+extern Bool g_fUnicodeClipboard;
+extern Bool g_fClipboardLaunched;
+extern Bool g_fClipboardStarted;
+extern pthread_t g_ptClipboardProc;
+extern HWND g_hwndClipboard;
+extern Bool g_fClipboard;
 #endif
 
 /*
@@ -76,29 +73,28 @@ extern Bool			g_fClipboard;
 
 #ifdef XWIN_CLIPBOARD
 static void
-winClipboardShutdown (void);
+ winClipboardShutdown(void);
 #endif
 
 #if defined(DDXOSVERRORF)
 void
-OsVendorVErrorF (const char *pszFormat, va_list va_args);
+ OsVendorVErrorF(const char *pszFormat, va_list va_args);
 #endif
 
 static Bool
-winCheckDisplayNumber (void);
+ winCheckDisplayNumber(void);
 
 void
-winLogCommandLine (int argc, char *argv[]);
+ winLogCommandLine(int argc, char *argv[]);
 
 void
-winLogVersionInfo (void);
+ winLogVersionInfo(void);
 
 Bool
-winValidateArgs (void);
+ winValidateArgs(void);
 
 #ifdef RELOCATE_PROJECTROOT
-const char *
-winGetBaseDir(void);
+const char *winGetBaseDir(void);
 #endif
 
 /*
@@ -115,40 +111,38 @@ winGetBaseDir(void);
  */
 
 static PixmapFormatRec g_PixmapFormats[] = {
-  { 1,    1,      BITMAP_SCANLINE_PAD },
-  { 4,    8,      BITMAP_SCANLINE_PAD },
-  { 8,    8,      BITMAP_SCANLINE_PAD },
-  { 15,   16,     BITMAP_SCANLINE_PAD },
-  { 16,   16,     BITMAP_SCANLINE_PAD },
-  { 24,   32,     BITMAP_SCANLINE_PAD },
-  { 32,   32,     BITMAP_SCANLINE_PAD }
+    {1, 1, BITMAP_SCANLINE_PAD},
+    {4, 8, BITMAP_SCANLINE_PAD},
+    {8, 8, BITMAP_SCANLINE_PAD},
+    {15, 16, BITMAP_SCANLINE_PAD},
+    {16, 16, BITMAP_SCANLINE_PAD},
+    {24, 32, BITMAP_SCANLINE_PAD},
+    {32, 32, BITMAP_SCANLINE_PAD}
 };
 
-const int NUMFORMATS = sizeof (g_PixmapFormats) / sizeof (g_PixmapFormats[0]);
+const int NUMFORMATS = sizeof(g_PixmapFormats) / sizeof(g_PixmapFormats[0]);
 
 #ifdef XWIN_CLIPBOARD
 static void
-winClipboardShutdown (void)
+winClipboardShutdown(void)
 {
-  /* Close down clipboard resources */
-  if (g_fClipboard && g_fClipboardLaunched && g_fClipboardStarted)
-    {
-      /* Synchronously destroy the clipboard window */
-      if (g_hwndClipboard != NULL)
-	{
-	  SendMessage (g_hwndClipboard, WM_DESTROY, 0, 0);
-	  /* NOTE: g_hwndClipboard is set to NULL in winclipboardthread.c */
-	}
-      else
-	return;
-      
-      /* Wait for the clipboard thread to exit */
-      pthread_join (g_ptClipboardProc, NULL);
-
-      g_fClipboardLaunched = FALSE;
-      g_fClipboardStarted = FALSE;
-
-      winDebug ("winClipboardShutdown - Clipboard thread has exited.\n");
+    /* Close down clipboard resources */
+    if (g_fClipboard && g_fClipboardLaunched && g_fClipboardStarted) {
+        /* Synchronously destroy the clipboard window */
+        if (g_hwndClipboard != NULL) {
+            SendMessage(g_hwndClipboard, WM_DESTROY, 0, 0);
+            /* NOTE: g_hwndClipboard is set to NULL in winclipboardthread.c */
+        }
+        else
+            return;
+
+        /* Wait for the clipboard thread to exit */
+        pthread_join(g_ptClipboardProc, NULL);
+
+        g_fClipboardLaunched = FALSE;
+        g_fClipboardStarted = FALSE;
+
+        winDebug("winClipboardShutdown - Clipboard thread has exited.\n");
     }
 }
 #endif
@@ -157,10 +151,9 @@ void
 ddxPushProviders(void)
 {
 #ifdef XWIN_GLX_WINDOWS
-  if (g_fNativeGl)
-    {
-      /* install the native GL provider */
-      glxWinPushNativeProvider();
+    if (g_fNativeGl) {
+        /* install the native GL provider */
+        glxWinPushNativeProvider();
     }
 #endif
 }
@@ -172,92 +165,90 @@ ddxPushProviders(void)
  */
 
 void
-ddxBeforeReset (void)
+ddxBeforeReset(void)
 {
-  winDebug ("ddxBeforeReset - Hello\n");
+    winDebug("ddxBeforeReset - Hello\n");
 
 #ifdef XWIN_CLIPBOARD
-  winClipboardShutdown ();
+    winClipboardShutdown();
 #endif
 }
 #endif
 
-
 /* See Porting Layer Definition - p. 57 */
 void
-ddxGiveUp (enum ExitCode error)
+ddxGiveUp(enum ExitCode error)
 {
-  int		i;
+    int i;
 
 #if CYGDEBUG
-  winDebug ("ddxGiveUp\n");
+    winDebug("ddxGiveUp\n");
 #endif
 
-  /* Perform per-screen deinitialization */
-  for (i = 0; i < g_iNumScreens; ++i)
-    {
-      /* Delete the tray icon */
-      if (!g_ScreenInfo[i].fNoTrayIcon && g_ScreenInfo[i].pScreen)
- 	winDeleteNotifyIcon (winGetScreenPriv (g_ScreenInfo[i].pScreen));
+    /* Perform per-screen deinitialization */
+    for (i = 0; i < g_iNumScreens; ++i) {
+        /* Delete the tray icon */
+        if (!g_ScreenInfo[i].fNoTrayIcon && g_ScreenInfo[i].pScreen)
+            winDeleteNotifyIcon(winGetScreenPriv(g_ScreenInfo[i].pScreen));
     }
 
 #ifdef XWIN_MULTIWINDOW
-  /* Notify the worker threads we're exiting */
-  winDeinitMultiWindowWM ();
+    /* Notify the worker threads we're exiting */
+    winDeinitMultiWindowWM();
 #endif
 
 #ifdef HAS_DEVWINDOWS
-  /* Close our handle to our message queue */
-  if (g_fdMessageQueue != WIN_FD_INVALID)
-    {
-      /* Close /dev/windows */
-      close (g_fdMessageQueue);
+    /* Close our handle to our message queue */
+    if (g_fdMessageQueue != WIN_FD_INVALID) {
+        /* Close /dev/windows */
+        close(g_fdMessageQueue);
 
-      /* Set the file handle to invalid */
-      g_fdMessageQueue = WIN_FD_INVALID;
+        /* Set the file handle to invalid */
+        g_fdMessageQueue = WIN_FD_INVALID;
     }
 #endif
 
-  if (!g_fLogInited) {
-    g_pszLogFile = LogInit (g_pszLogFile, NULL);
-    g_fLogInited = TRUE;
-  }  
-  LogClose (error);
-
-  /*
-   * At this point we aren't creating any new screens, so
-   * we are guaranteed to not need the DirectDraw functions.
-   */
-  winReleaseDDProcAddresses();
-  
-  /* Free concatenated command line */
-  free(g_pszCommandLine);
-  g_pszCommandLine = NULL;
-
-  /* Remove our keyboard hook if it is installed */
-  winRemoveKeyboardHookLL ();
-
-  /* Tell Windows that we want to end the app */
-  PostQuitMessage (0);
-}
+    if (!g_fLogInited) {
+        g_pszLogFile = LogInit(g_pszLogFile, NULL);
+        g_fLogInited = TRUE;
+    }
+    LogClose(error);
 
+    /*
+     * At this point we aren't creating any new screens, so
+     * we are guaranteed to not need the DirectDraw functions.
+     */
+    winReleaseDDProcAddresses();
+
+    /* Free concatenated command line */
+    free(g_pszCommandLine);
+    g_pszCommandLine = NULL;
+
+    /* Remove our keyboard hook if it is installed */
+    winRemoveKeyboardHookLL();
+
+    /* Tell Windows that we want to end the app */
+    PostQuitMessage(0);
+}
 
 /* See Porting Layer Definition - p. 57 */
 void
-AbortDDX (enum ExitCode error)
+AbortDDX(enum ExitCode error)
 {
 #if CYGDEBUG
-  winDebug ("AbortDDX\n");
+    winDebug("AbortDDX\n");
 #endif
-  ddxGiveUp (error);
+    ddxGiveUp(error);
 }
 
 #ifdef __CYGWIN__
 /* hasmntopt is currently not implemented for cygwin */
-static const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
+static const char *
+winCheckMntOpt(const struct mntent *mnt, const char *opt)
 {
     const char *s;
     size_t len;
+
     if (mnt == NULL)
         return NULL;
     if (opt == NULL)
@@ -269,99 +260,94 @@ static const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
     s = strstr(mnt->mnt_opts, opt);
     if (s == NULL)
         return NULL;
-    if ((s == mnt->mnt_opts || *(s-1) == ',') &&  (s[len] == 0 || s[len] == ','))
-        return (char *)opt;
+    if ((s == mnt->mnt_opts || *(s - 1) == ',') &&
+        (s[len] == 0 || s[len] == ','))
+        return (char *) opt;
     return NULL;
 }
 
 static void
 winCheckMount(void)
 {
-  FILE *mnt;
-  struct mntent *ent;
-
-  enum { none = 0, sys_root, user_root, sys_tmp, user_tmp } 
-    level = none, curlevel;
-  BOOL binary = TRUE;
-
-  mnt = setmntent("/etc/mtab", "r");
-  if (mnt == NULL)
-  {
-    ErrorF("setmntent failed");
-    return;
-  }
-
-  while ((ent = getmntent(mnt)) != NULL)
-  {
-    BOOL system = (winCheckMntOpt(ent, "user") != NULL);
-    BOOL root = (strcmp(ent->mnt_dir, "/") == 0);
-    BOOL tmp = (strcmp(ent->mnt_dir, "/tmp") == 0);
-    
-    if (system)
-    {
-      if (root)
-        curlevel = sys_root;
-      else if (tmp)
-        curlevel = sys_tmp;
-      else
-        continue;
+    FILE *mnt;
+    struct mntent *ent;
+
+    enum { none = 0, sys_root, user_root, sys_tmp, user_tmp }
+        level = none, curlevel;
+    BOOL binary = TRUE;
+
+    mnt = setmntent("/etc/mtab", "r");
+    if (mnt == NULL) {
+        ErrorF("setmntent failed");
+        return;
     }
-    else
-    {
-      if (root)
-        curlevel = user_root;
-      else if (tmp) 
-        curlevel = user_tmp;
-      else
-        continue;
+
+    while ((ent = getmntent(mnt)) != NULL) {
+        BOOL system = (winCheckMntOpt(ent, "user") != NULL);
+        BOOL root = (strcmp(ent->mnt_dir, "/") == 0);
+        BOOL tmp = (strcmp(ent->mnt_dir, "/tmp") == 0);
+
+        if (system) {
+            if (root)
+                curlevel = sys_root;
+            else if (tmp)
+                curlevel = sys_tmp;
+            else
+                continue;
+        }
+        else {
+            if (root)
+                curlevel = user_root;
+            else if (tmp)
+                curlevel = user_tmp;
+            else
+                continue;
+        }
+
+        if (curlevel <= level)
+            continue;
+        level = curlevel;
+
+        if ((winCheckMntOpt(ent, "binary") == NULL) &&
+            (winCheckMntOpt(ent, "binmode") == NULL))
+            binary = FALSE;
+        else
+            binary = TRUE;
+    }
+
+    if (endmntent(mnt) != 1) {
+        ErrorF("endmntent failed");
+        return;
     }
 
-    if (curlevel <= level)
-      continue;
-    level = curlevel;
-
-    if ((winCheckMntOpt(ent, "binary") == NULL) &&
-        (winCheckMntOpt(ent, "binmode") == NULL))
-      binary = FALSE;
-    else
-      binary = TRUE;
-  }
-    
-  if (endmntent(mnt) != 1)
-  {
-    ErrorF("endmntent failed");
-    return;
-  }
-  
- if (!binary) 
-   winMsg(X_WARNING, "/tmp mounted in textmode\n");
+    if (!binary)
+        winMsg(X_WARNING, "/tmp mounted in textmode\n");
 }
 #else
 static void
-winCheckMount(void) 
+winCheckMount(void)
 {
 }
 #endif
 
 #ifdef RELOCATE_PROJECTROOT
-const char * 
+const char *
 winGetBaseDir(void)
 {
     static BOOL inited = FALSE;
     static char buffer[MAX_PATH];
-    if (!inited)
-    {
+
+    if (!inited) {
         char *fendptr;
         HMODULE module = GetModuleHandle(NULL);
         DWORD size = GetModuleFileName(module, buffer, sizeof(buffer));
+
         if (sizeof(buffer) > 0)
-            buffer[sizeof(buffer)-1] = 0;
-    
+            buffer[sizeof(buffer) - 1] = 0;
+
         fendptr = buffer + size;
-        while (fendptr > buffer)
-        {
-            if (*fendptr == '\\' || *fendptr == '/')
-            {
+        while (fendptr > buffer) {
+            if (*fendptr == '\\' || *fendptr == '/') {
                 *fendptr = 0;
                 break;
             }
@@ -374,10 +360,11 @@ winGetBaseDir(void)
 #endif
 
 static void
-winFixupPaths (void)
+winFixupPaths(void)
 {
     BOOL changed_fontpath = FALSE;
     MessageType font_from = X_DEFAULT;
+
 #ifdef RELOCATE_PROJECTROOT
     const char *basedir = winGetBaseDir();
     size_t basedirlen = strlen(basedir);
@@ -387,10 +374,10 @@ winFixupPaths (void)
     {
         /* Open fontpath configuration file */
         FILE *fontdirs = fopen(ETCX11DIR "/font-dirs", "rt");
-        if (fontdirs != NULL)
-        {
+
+        if (fontdirs != NULL) {
             char buffer[256];
-            int needs_sep = TRUE; 
+            int needs_sep = TRUE;
             int comment_block = FALSE;
 
             /* get default fontpath */
@@ -398,8 +385,7 @@ winFixupPaths (void)
             size_t size = strlen(fontpath);
 
             /* read all lines */
-            while (!feof(fontdirs))
-            {
+            while (!feof(fontdirs)) {
                 size_t blen;
                 char *hashchar;
                 char *str;
@@ -407,29 +393,26 @@ winFixupPaths (void)
 
                 /* read one line */
                 str = fgets(buffer, sizeof(buffer), fontdirs);
-                if (str == NULL) /* stop on error or eof */
+                if (str == NULL)        /* stop on error or eof */
                     break;
 
                 if (strchr(str, '\n') != NULL)
                     has_eol = TRUE;
 
                 /* check if block is continued comment */
-                if (comment_block)
-                {
+                if (comment_block) {
                     /* ignore all input */
-                    *str = 0; 
-                    blen = 0; 
-                    if (has_eol) /* check if line ended in this block */
+                    *str = 0;
+                    blen = 0;
+                    if (has_eol)        /* check if line ended in this block */
                         comment_block = FALSE;
                 }
-                else 
-                {
+                else {
                     /* find comment character. ignore all trailing input */
                     hashchar = strchr(str, '#');
-                    if (hashchar != NULL)
-                    {
+                    if (hashchar != NULL) {
                         *hashchar = 0;
-                        if (!has_eol) /* mark next block as continued comment */
+                        if (!has_eol)   /* mark next block as continued comment */
                             comment_block = TRUE;
                     }
                 }
@@ -438,31 +421,30 @@ winFixupPaths (void)
                 while (*str == ' ' || *str == '\t')
                     str++;
 
-                /* get size, strip whitespaces from end */ 
+                /* get size, strip whitespaces from end */
                 blen = strlen(str);
-                while (blen > 0 && (str[blen-1] == ' ' || 
-                            str[blen-1] == '\t' || str[blen-1] == '\n'))
-                {
+                while (blen > 0 && (str[blen - 1] == ' ' ||
+                                    str[blen - 1] == '\t' ||
+                                    str[blen - 1] == '\n')) {
                     str[--blen] = 0;
                 }
 
-                /* still something left to add? */ 
-                if (blen > 0)
-                {
+                /* still something left to add? */
+                if (blen > 0) {
                     size_t newsize = size + blen;
+
                     /* reserve one character more for ',' */
                     if (needs_sep)
                         newsize++;
 
                     /* allocate memory */
                     if (fontpath == NULL)
-                        fontpath = malloc(newsize+1);
+                        fontpath = malloc(newsize + 1);
                     else
-                        fontpath = realloc(fontpath, newsize+1);
+                        fontpath = realloc(fontpath, newsize + 1);
 
                     /* add separator */
-                    if (needs_sep)
-                    {
+                    if (needs_sep) {
                         fontpath[size] = ',';
                         size++;
                         needs_sep = FALSE;
@@ -480,14 +462,14 @@ winFixupPaths (void)
             }
 
             /* cleanup */
-            fclose(fontdirs);  
+            fclose(fontdirs);
             defaultFontPath = strdup(fontpath);
             free(fontpath);
             changed_fontpath = TRUE;
             font_from = X_CONFIG;
         }
     }
-#endif /* READ_FONTDIRS */
+#endif                          /* READ_FONTDIRS */
 #ifdef RELOCATE_PROJECTROOT
     {
         const char *libx11dir = PROJECTROOT "/lib/X11";
@@ -500,20 +482,19 @@ winFixupPaths (void)
         ptr = strchr(oldptr, ',');
         if (ptr == NULL)
             ptr = endptr;
-        while (ptr != NULL)
-        {
+        while (ptr != NULL) {
             size_t oldfp_len = (ptr - oldptr);
             size_t newsize = oldfp_len;
             char *newpath = malloc(newsize + 1);
+
             strncpy(newpath, oldptr, newsize);
             newpath[newsize] = 0;
 
-
-            if (strncmp(libx11dir, newpath, libx11dir_len) == 0)
-            {
+            if (strncmp(libx11dir, newpath, libx11dir_len) == 0) {
                 char *compose;
+
                 newsize = newsize - libx11dir_len + basedirlen;
-                compose = malloc(newsize + 1);  
+                compose = malloc(newsize + 1);
                 strcpy(compose, basedir);
                 strncat(compose, newpath + libx11dir_len, newsize - basedirlen);
                 compose[newsize] = 0;
@@ -523,7 +504,7 @@ winFixupPaths (void)
 
             oldfp_len = newfp_len;
             if (oldfp_len > 0)
-                newfp_len ++; /* space for separator */
+                newfp_len++;    /* space for separator */
             newfp_len += newsize;
 
             if (newfp == NULL)
@@ -531,8 +512,7 @@ winFixupPaths (void)
             else
                 newfp = realloc(newfp, newfp_len + 1);
 
-            if (oldfp_len > 0)
-            {
+            if (oldfp_len > 0) {
                 strcpy(newfp + oldfp_len, ",");
                 oldfp_len++;
             }
@@ -540,76 +520,73 @@ winFixupPaths (void)
 
             free(newpath);
 
-            if (*ptr == 0)
-            {
+            if (*ptr == 0) {
                 oldptr = ptr;
                 ptr = NULL;
-            } else
-            {
+            }
+            else {
                 oldptr = ptr + 1;
                 ptr = strchr(oldptr, ',');
                 if (ptr == NULL)
                     ptr = endptr;
             }
-        } 
+        }
 
         defaultFontPath = strdup(newfp);
         free(newfp);
         changed_fontpath = TRUE;
     }
-#endif /* RELOCATE_PROJECTROOT */
+#endif                          /* RELOCATE_PROJECTROOT */
     if (changed_fontpath)
-        winMsg (font_from, "FontPath set to \"%s\"\n", defaultFontPath);
+        winMsg(font_from, "FontPath set to \"%s\"\n", defaultFontPath);
 
 #ifdef RELOCATE_PROJECTROOT
-    if (getenv("XKEYSYMDB") == NULL)
-    {
+    if (getenv("XKEYSYMDB") == NULL) {
         char buffer[MAX_PATH];
-        snprintf(buffer, sizeof(buffer), "XKEYSYMDB=%s\\XKeysymDB",
-                basedir);
-        buffer[sizeof(buffer)-1] = 0;
+
+        snprintf(buffer, sizeof(buffer), "XKEYSYMDB=%s\\XKeysymDB", basedir);
+        buffer[sizeof(buffer) - 1] = 0;
         putenv(buffer);
     }
-    if (getenv("XERRORDB") == NULL)
-    {
+    if (getenv("XERRORDB") == NULL) {
         char buffer[MAX_PATH];
-        snprintf(buffer, sizeof(buffer), "XERRORDB=%s\\XErrorDB",
-                basedir);
-        buffer[sizeof(buffer)-1] = 0;
+
+        snprintf(buffer, sizeof(buffer), "XERRORDB=%s\\XErrorDB", basedir);
+        buffer[sizeof(buffer) - 1] = 0;
         putenv(buffer);
     }
-    if (getenv("XLOCALEDIR") == NULL)
-    {
+    if (getenv("XLOCALEDIR") == NULL) {
         char buffer[MAX_PATH];
-        snprintf(buffer, sizeof(buffer), "XLOCALEDIR=%s\\locale",
-                basedir);
-        buffer[sizeof(buffer)-1] = 0;
+
+        snprintf(buffer, sizeof(buffer), "XLOCALEDIR=%s\\locale", basedir);
+        buffer[sizeof(buffer) - 1] = 0;
         putenv(buffer);
     }
-    if (getenv("HOME") == NULL)
-    {
+    if (getenv("HOME") == NULL) {
         char buffer[MAX_PATH + 5];
+
         strncpy(buffer, "HOME=", 5);
 
         /* query appdata directory */
-        if (SHGetFolderPathA(NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE, NULL, 0, buffer + 5) == 0)
-        {
+        if (SHGetFolderPathA
+            (NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, 0,
+             buffer + 5) == 0) {
             putenv(buffer);
-        } else
-        {
-            winMsg (X_ERROR, "Can not determine HOME directory\n");
+        }
+        else {
+            winMsg(X_ERROR, "Can not determine HOME directory\n");
         }
     }
     if (!g_fLogFileChanged) {
         static char buffer[MAX_PATH];
         DWORD size = GetTempPath(sizeof(buffer), buffer);
-        if (size && size < sizeof(buffer))
-        {
-            snprintf(buffer + size, sizeof(buffer) - size, 
-                    "XWin.%s.log", display); 
-            buffer[sizeof(buffer)-1] = 0;
+
+        if (size && size < sizeof(buffer)) {
+            snprintf(buffer + size, sizeof(buffer) - size,
+                     "XWin.%s.log", display);
+            buffer[sizeof(buffer) - 1] = 0;
             g_pszLogFile = buffer;
-            winMsg (X_DEFAULT, "Logfile set to \"%s\"\n", g_pszLogFile);
+            winMsg(X_DEFAULT, "Logfile set to \"%s\"\n", g_pszLogFile);
         }
     }
     {
@@ -617,294 +594,283 @@ winFixupPaths (void)
 
         snprintf(xkbbasedir, sizeof(xkbbasedir), "%s\\xkb", basedir);
         if (sizeof(xkbbasedir) > 0)
-            xkbbasedir[sizeof(xkbbasedir)-1] = 0;
+            xkbbasedir[sizeof(xkbbasedir) - 1] = 0;
         XkbBaseDirectory = xkbbasedir;
-	XkbBinDirectory = basedir;
+        XkbBinDirectory = basedir;
     }
-#endif /* RELOCATE_PROJECTROOT */
+#endif                          /* RELOCATE_PROJECTROOT */
 }
 
 void
-OsVendorInit (void)
+OsVendorInit(void)
 {
-  /* Re-initialize global variables on server reset */
-  winInitializeGlobals ();
+    /* Re-initialize global variables on server reset */
+    winInitializeGlobals();
 
-  winFixupPaths();
+    winFixupPaths();
 
 #ifdef DDXOSVERRORF
-  if (!OsVendorVErrorFProc)
-    OsVendorVErrorFProc = OsVendorVErrorF;
+    if (!OsVendorVErrorFProc)
+        OsVendorVErrorFProc = OsVendorVErrorF;
 #endif
 
-  if (!g_fLogInited) {
-    /* keep this order. If LogInit fails it calls Abort which then calls
-     * ddxGiveUp where LogInit is called again and creates an infinite 
-     * recursion. If we set g_fLogInited to TRUE before the init we 
-     * avoid the second call 
-     */  
-    g_fLogInited = TRUE;
-    g_pszLogFile = LogInit (g_pszLogFile, NULL);
-  } 
-  LogSetParameter (XLOG_FLUSH, 1);
-  LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose);
-  LogSetParameter (XLOG_FILE_VERBOSITY, g_iLogVerbose);
-
-  /* Log the version information */
-  if (serverGeneration == 1)
-    winLogVersionInfo ();
-
-  winCheckMount();  
-
-  /* Add a default screen if no screens were specified */
-  if (g_iNumScreens == 0)
-    {
-      winDebug ("OsVendorInit - Creating default screen 0\n");
-
-      /*
-       * We need to initialize the default screen 0 if no -screen
-       * arguments were processed.
-       *
-       * Add a screen 0 using the defaults set by winInitializeDefaultScreens()
-       * and any additional default screen parameters given
-       */
-      winInitializeScreens(1);
-
-      /* We have to flag this as an explicit screen, even though it isn't */
-      g_ScreenInfo[0].fExplicitScreen = TRUE;
+    if (!g_fLogInited) {
+        /* keep this order. If LogInit fails it calls Abort which then calls
+         * ddxGiveUp where LogInit is called again and creates an infinite 
+         * recursion. If we set g_fLogInited to TRUE before the init we 
+         * avoid the second call 
+         */
+        g_fLogInited = TRUE;
+        g_pszLogFile = LogInit(g_pszLogFile, NULL);
+    }
+    LogSetParameter(XLOG_FLUSH, 1);
+    LogSetParameter(XLOG_VERBOSITY, g_iLogVerbose);
+    LogSetParameter(XLOG_FILE_VERBOSITY, g_iLogVerbose);
+
+    /* Log the version information */
+    if (serverGeneration == 1)
+        winLogVersionInfo();
+
+    winCheckMount();
+
+    /* Add a default screen if no screens were specified */
+    if (g_iNumScreens == 0) {
+        winDebug("OsVendorInit - Creating default screen 0\n");
+
+        /*
+         * We need to initialize the default screen 0 if no -screen
+         * arguments were processed.
+         *
+         * Add a screen 0 using the defaults set by winInitializeDefaultScreens()
+         * and any additional default screen parameters given
+         */
+        winInitializeScreens(1);
+
+        /* We have to flag this as an explicit screen, even though it isn't */
+        g_ScreenInfo[0].fExplicitScreen = TRUE;
     }
 
-  /* Work out what the default emulate3buttons setting should be, and apply
-     it if nothing was explicitly specified */
-  {
-    int mouseButtons = GetSystemMetrics(SM_CMOUSEBUTTONS);
-    int j;
-
-    for (j = 0; j < g_iNumScreens; j++)
-      {
-        if (g_ScreenInfo[j].iE3BTimeout == WIN_E3B_DEFAULT)
-          {
-            if (mouseButtons < 3)
-              {
-                static Bool reportOnce = TRUE;
-                g_ScreenInfo[j].iE3BTimeout = WIN_DEFAULT_E3B_TIME;
-                if (reportOnce)
-                  {
-                    reportOnce = FALSE;
-                    winMsg(X_PROBED, "Windows reports only %d mouse buttons, defaulting to -emulate3buttons\n", mouseButtons);
-                  }
-              }
-            else
-              {
-                g_ScreenInfo[j].iE3BTimeout = WIN_E3B_OFF;
-              }
-          }
-      }
-  }
+    /* Work out what the default emulate3buttons setting should be, and apply
+       it if nothing was explicitly specified */
+    {
+        int mouseButtons = GetSystemMetrics(SM_CMOUSEBUTTONS);
+        int j;
+
+        for (j = 0; j < g_iNumScreens; j++) {
+            if (g_ScreenInfo[j].iE3BTimeout == WIN_E3B_DEFAULT) {
+                if (mouseButtons < 3) {
+                    static Bool reportOnce = TRUE;
+
+                    g_ScreenInfo[j].iE3BTimeout = WIN_DEFAULT_E3B_TIME;
+                    if (reportOnce) {
+                        reportOnce = FALSE;
+                        winMsg(X_PROBED,
+                               "Windows reports only %d mouse buttons, defaulting to -emulate3buttons\n",
+                               mouseButtons);
+                    }
+                }
+                else {
+                    g_ScreenInfo[j].iE3BTimeout = WIN_E3B_OFF;
+                }
+            }
+        }
+    }
 }
 
 static void
-winUseMsg (void)
+winUseMsg(void)
 {
-  ErrorF("\n");
-  ErrorF("\n");
-  ErrorF(EXECUTABLE_NAME " Device Dependent Usage:\n");
-  ErrorF("\n");
+    ErrorF("\n");
+    ErrorF("\n");
+    ErrorF(EXECUTABLE_NAME " Device Dependent Usage:\n");
+    ErrorF("\n");
 
 #ifdef XWIN_CLIPBOARD
-  ErrorF ("-[no]clipboard\n"
-	  "\tEnable [disable] the clipboard integration. Default is enabled.\n");
+    ErrorF("-[no]clipboard\n"
+           "\tEnable [disable] the clipboard integration. Default is enabled.\n");
 #endif
 
-  ErrorF ("-clipupdates num_boxes\n"
-	  "\tUse a clipping region to constrain shadow update blits to\n"
-	  "\tthe updated region when num_boxes, or more, are in the\n"
-	  "\tupdated region.\n");
+    ErrorF("-clipupdates num_boxes\n"
+           "\tUse a clipping region to constrain shadow update blits to\n"
+           "\tthe updated region when num_boxes, or more, are in the\n"
+           "\tupdated region.\n");
 
 #ifdef XWIN_XF86CONFIG
-  ErrorF ("-config\n"
-          "\tSpecify a configuration file.\n");
+    ErrorF("-config\n" "\tSpecify a configuration file.\n");
 
-  ErrorF ("-configdir\n"
-          "\tSpecify a configuration directory.\n");
+    ErrorF("-configdir\n" "\tSpecify a configuration directory.\n");
 #endif
 
-  ErrorF ("-depth bits_per_pixel\n"
-	  "\tSpecify an optional bitdepth to use in fullscreen mode\n"
-	  "\twith a DirectDraw engine.\n");
+    ErrorF("-depth bits_per_pixel\n"
+           "\tSpecify an optional bitdepth to use in fullscreen mode\n"
+           "\twith a DirectDraw engine.\n");
 
-  ErrorF ("-[no]emulate3buttons [timeout]\n"
-	  "\tEmulate 3 button mouse with an optional timeout in\n"
-	  "\tmilliseconds.\n");
+    ErrorF("-[no]emulate3buttons [timeout]\n"
+           "\tEmulate 3 button mouse with an optional timeout in\n"
+           "\tmilliseconds.\n");
 
 #ifdef XWIN_EMULATEPSEUDO
-  ErrorF ("-emulatepseudo\n"
-	  "\tCreate a depth 8 PseudoColor visual when running in\n"
-	  "\tdepths 15, 16, 24, or 32, collectively known as TrueColor\n"
-	  "\tdepths.  The PseudoColor visual does not have correct colors,\n"
-	  "\tand it may crash, but it at least allows you to run your\n"
-	  "\tapplication in TrueColor modes.\n");
+    ErrorF("-emulatepseudo\n"
+           "\tCreate a depth 8 PseudoColor visual when running in\n"
+           "\tdepths 15, 16, 24, or 32, collectively known as TrueColor\n"
+           "\tdepths.  The PseudoColor visual does not have correct colors,\n"
+           "\tand it may crash, but it at least allows you to run your\n"
+           "\tapplication in TrueColor modes.\n");
 #endif
 
-  ErrorF ("-engine engine_type_id\n"
-	  "\tOverride the server's automatically selected engine type:\n"
-	  "\t\t1 - Shadow GDI\n"
-	  "\t\t2 - Shadow DirectDraw\n"
-	  "\t\t4 - Shadow DirectDraw4 Non-Locking\n"
+    ErrorF("-engine engine_type_id\n"
+           "\tOverride the server's automatically selected engine type:\n"
+           "\t\t1 - Shadow GDI\n"
+           "\t\t2 - Shadow DirectDraw\n"
+           "\t\t4 - Shadow DirectDraw4 Non-Locking\n"
 #ifdef XWIN_PRIMARYFB
-	  "\t\t8 - Primary DirectDraw - obsolete\n"
+           "\t\t8 - Primary DirectDraw - obsolete\n"
 #endif
 #ifdef XWIN_NATIVEGDI
-	  "\t\t16 - Native GDI - experimental\n"
+           "\t\t16 - Native GDI - experimental\n"
 #endif
-	  );
+        );
 
-  ErrorF ("-fullscreen\n"
-	  "\tRun the server in fullscreen mode.\n");
+    ErrorF("-fullscreen\n" "\tRun the server in fullscreen mode.\n");
 
-  ErrorF ("-ignoreinput\n"
-	  "\tIgnore keyboard and mouse input.\n");
+    ErrorF("-ignoreinput\n" "\tIgnore keyboard and mouse input.\n");
 
 #ifdef XWIN_MULTIWINDOWEXTWM
-  ErrorF ("-internalwm\n"
-	  "\tRun the internal window manager.\n");
+    ErrorF("-internalwm\n" "\tRun the internal window manager.\n");
 #endif
 
 #ifdef XWIN_XF86CONFIG
-  ErrorF ("-keyboard\n"
-	  "\tSpecify a keyboard device from the configuration file.\n");
+    ErrorF("-keyboard\n"
+           "\tSpecify a keyboard device from the configuration file.\n");
 #endif
 
-  ErrorF ("-[no]keyhook\n"
-	  "\tGrab special Windows keypresses like Alt-Tab or the Menu "
-          "key.\n");
+    ErrorF("-[no]keyhook\n"
+           "\tGrab special Windows keypresses like Alt-Tab or the Menu "
+           "key.\n");
 
-  ErrorF ("-lesspointer\n"
-	  "\tHide the windows mouse pointer when it is over any\n"
-          "\t" EXECUTABLE_NAME " window.  This prevents ghost cursors appearing when\n"
-	  "\tthe Windows cursor is drawn on top of the X cursor\n");
+    ErrorF("-lesspointer\n"
+           "\tHide the windows mouse pointer when it is over any\n"
+           "\t" EXECUTABLE_NAME
+           " window.  This prevents ghost cursors appearing when\n"
+           "\tthe Windows cursor is drawn on top of the X cursor\n");
 
-  ErrorF ("-logfile filename\n"
-	  "\tWrite log messages to <filename>.\n");
+    ErrorF("-logfile filename\n" "\tWrite log messages to <filename>.\n");
 
-  ErrorF ("-logverbose verbosity\n"
-	  "\tSet the verbosity of log messages. [NOTE: Only a few messages\n"
-	  "\trespect the settings yet]\n"
-	  "\t\t0 - only print fatal error.\n"
-	  "\t\t1 - print additional configuration information.\n"
-	  "\t\t2 - print additional runtime information [default].\n"
-	  "\t\t3 - print debugging and tracing information.\n");
+    ErrorF("-logverbose verbosity\n"
+           "\tSet the verbosity of log messages. [NOTE: Only a few messages\n"
+           "\trespect the settings yet]\n"
+           "\t\t0 - only print fatal error.\n"
+           "\t\t1 - print additional configuration information.\n"
+           "\t\t2 - print additional runtime information [default].\n"
+           "\t\t3 - print debugging and tracing information.\n");
 
-  ErrorF ("-[no]multimonitors or -[no]multiplemonitors\n"
-	  "\tUse the entire virtual screen if multiple\n"
-	  "\tmonitors are present.\n");
+    ErrorF("-[no]multimonitors or -[no]multiplemonitors\n"
+           "\tUse the entire virtual screen if multiple\n"
+           "\tmonitors are present.\n");
 
 #ifdef XWIN_MULTIWINDOW
-  ErrorF ("-multiwindow\n"
-	  "\tRun the server in multi-window mode.\n");
+    ErrorF("-multiwindow\n" "\tRun the server in multi-window mode.\n");
 #endif
 
 #ifdef XWIN_MULTIWINDOWEXTWM
-  ErrorF ("-mwextwm\n"
-	  "\tRun the server in multi-window external window manager mode.\n");
+    ErrorF("-mwextwm\n"
+           "\tRun the server in multi-window external window manager mode.\n");
 #endif
 
-  ErrorF ("-nodecoration\n"
-          "\tDo not draw a window border, title bar, etc.  Windowed\n"
-	  "\tmode only.\n");
+    ErrorF("-nodecoration\n"
+           "\tDo not draw a window border, title bar, etc.  Windowed\n"
+           "\tmode only.\n");
 
 #ifdef XWIN_CLIPBOARD
-  ErrorF ("-nounicodeclipboard\n"
-	  "\tDo not use Unicode clipboard even if on a NT-based platform.\n");
+    ErrorF("-nounicodeclipboard\n"
+           "\tDo not use Unicode clipboard even if on a NT-based platform.\n");
 #endif
 
-  ErrorF ("-refresh rate_in_Hz\n"
-	  "\tSpecify an optional refresh rate to use in fullscreen mode\n"
-	  "\twith a DirectDraw engine.\n");
-
-  ErrorF ("-resize=none|scrollbars|randr"
-	  "\tIn windowed mode, [don't] allow resizing of the window. 'scrollbars'\n"
-	  "\tmode gives the window scrollbars as needed, 'randr' mode uses the RANR\n"
-	  "\textension to resize the X screen.\n");
-
-  ErrorF ("-rootless\n"
-	  "\tRun the server in rootless mode.\n");
-
-  ErrorF ("-screen scr_num [width height [x y] | [[WxH[+X+Y]][@m]] ]\n"
-	  "\tEnable screen scr_num and optionally specify a width and\n"
-	  "\theight and initial position for that screen. Additionally\n"
-	  "\ta monitor number can be specified to start the server on,\n"
-	  "\tat which point, all coordinates become relative to that\n"
-	  "\tmonitor. Examples:\n"
-	  "\t -screen 0 800x600+100+100@2 ; 2nd monitor offset 100,100 size 800x600\n"
-	  "\t -screen 0 1024x768@3        ; 3rd monitor size 1024x768\n"
-	  "\t -screen 0 @1 ; on 1st monitor using its full resolution (the default)\n");
-
-  ErrorF ("-silent-dup-error\n"
-	  "\tIf another instance of " EXECUTABLE_NAME " with the same display number is running\n"
-	  "\texit silently and don't display any error message.\n");
-
-  ErrorF ("-swcursor\n"
-	  "\tDisable the usage of the Windows cursor and use the X11 software\n"
-	  "\tcursor instead.\n");
-
-  ErrorF ("-[no]trayicon\n"
-          "\tDo not create a tray icon.  Default is to create one\n"
-	  "\ticon per screen.  You can globally disable tray icons with\n"
-	  "\t-notrayicon, then enable it for specific screens with\n"
-	  "\t-trayicon for those screens.\n");
-
-  ErrorF ("-[no]unixkill\n"
-          "\tCtrl+Alt+Backspace exits the X Server.\n");
+    ErrorF("-refresh rate_in_Hz\n"
+           "\tSpecify an optional refresh rate to use in fullscreen mode\n"
+           "\twith a DirectDraw engine.\n");
+
+    ErrorF("-resize=none|scrollbars|randr"
+           "\tIn windowed mode, [don't] allow resizing of the window. 'scrollbars'\n"
+           "\tmode gives the window scrollbars as needed, 'randr' mode uses the RANR\n"
+           "\textension to resize the X screen.\n");
+
+    ErrorF("-rootless\n" "\tRun the server in rootless mode.\n");
+
+    ErrorF("-screen scr_num [width height [x y] | [[WxH[+X+Y]][@m]] ]\n"
+           "\tEnable screen scr_num and optionally specify a width and\n"
+           "\theight and initial position for that screen. Additionally\n"
+           "\ta monitor number can be specified to start the server on,\n"
+           "\tat which point, all coordinates become relative to that\n"
+           "\tmonitor. Examples:\n"
+           "\t -screen 0 800x600+100+100@2 ; 2nd monitor offset 100,100 size 800x600\n"
+           "\t -screen 0 1024x768@3        ; 3rd monitor size 1024x768\n"
+           "\t -screen 0 @1 ; on 1st monitor using its full resolution (the default)\n");
+
+    ErrorF("-silent-dup-error\n"
+           "\tIf another instance of " EXECUTABLE_NAME
+           " with the same display number is running\n"
+           "\texit silently and don't display any error message.\n");
+
+    ErrorF("-swcursor\n"
+           "\tDisable the usage of the Windows cursor and use the X11 software\n"
+           "\tcursor instead.\n");
+
+    ErrorF("-[no]trayicon\n"
+           "\tDo not create a tray icon.  Default is to create one\n"
+           "\ticon per screen.  You can globally disable tray icons with\n"
+           "\t-notrayicon, then enable it for specific screens with\n"
+           "\t-trayicon for those screens.\n");
+
+    ErrorF("-[no]unixkill\n" "\tCtrl+Alt+Backspace exits the X Server.\n");
 
 #ifdef XWIN_GLX_WINDOWS
-  ErrorF ("-[no]wgl\n"
-	  "\tEnable the GLX extension to use the native Windows WGL interface for accelerated OpenGL\n");
+    ErrorF("-[no]wgl\n"
+           "\tEnable the GLX extension to use the native Windows WGL interface for accelerated OpenGL\n");
 #endif
 
-  ErrorF ("-[no]winkill\n"
-          "\tAlt+F4 exits the X Server.\n");
+    ErrorF("-[no]winkill\n" "\tAlt+F4 exits the X Server.\n");
 
-  ErrorF ("-xkblayout XKBLayout\n"
-	  "\tEquivalent to XKBLayout in XF86Config files.\n"
-	  "\tFor example: -xkblayout de\n");
+    ErrorF("-xkblayout XKBLayout\n"
+           "\tEquivalent to XKBLayout in XF86Config files.\n"
+           "\tFor example: -xkblayout de\n");
 
-  ErrorF ("-xkbmodel XKBModel\n"
-	  "\tEquivalent to XKBModel in XF86Config files.\n");
+    ErrorF("-xkbmodel XKBModel\n"
+           "\tEquivalent to XKBModel in XF86Config files.\n");
 
-  ErrorF ("-xkboptions XKBOptions\n"
-	  "\tEquivalent to XKBOptions in XF86Config files.\n");
+    ErrorF("-xkboptions XKBOptions\n"
+           "\tEquivalent to XKBOptions in XF86Config files.\n");
 
-  ErrorF ("-xkbrules XKBRules\n"
-	  "\tEquivalent to XKBRules in XF86Config files.\n");
+    ErrorF("-xkbrules XKBRules\n"
+           "\tEquivalent to XKBRules in XF86Config files.\n");
 
-  ErrorF ("-xkbvariant XKBVariant\n"
-	  "\tEquivalent to XKBVariant in XF86Config files.\n"
-	  "\tFor example: -xkbvariant nodeadkeys\n");
+    ErrorF("-xkbvariant XKBVariant\n"
+           "\tEquivalent to XKBVariant in XF86Config files.\n"
+           "\tFor example: -xkbvariant nodeadkeys\n");
 }
 
 /* See Porting Layer Definition - p. 57 */
 void
 ddxUseMsg(void)
 {
-  /* Set a flag so that FatalError won't give duplicate warning message */
-  g_fSilentFatalError = TRUE;
-  
-  winUseMsg();  
-
-  /* Log file will not be opened for UseMsg unless we open it now */
-  if (!g_fLogInited) {
-    g_pszLogFile = LogInit (g_pszLogFile, NULL);
-    g_fLogInited = TRUE;
-  }  
-  LogClose (EXIT_NO_ERROR);
-
-  /* Notify user where UseMsg text can be found.*/
-  if (!g_fNoHelpMessageBox)
-    winMessageBoxF ("The " PROJECT_NAME " help text has been printed to "
-		  "%s.\n"
-		  "Please open %s to read the help text.\n",
-		  MB_ICONINFORMATION, g_pszLogFile, g_pszLogFile);
+    /* Set a flag so that FatalError won't give duplicate warning message */
+    g_fSilentFatalError = TRUE;
+
+    winUseMsg();
+
+    /* Log file will not be opened for UseMsg unless we open it now */
+    if (!g_fLogInited) {
+        g_pszLogFile = LogInit(g_pszLogFile, NULL);
+        g_fLogInited = TRUE;
+    }
+    LogClose(EXIT_NO_ERROR);
+
+    /* Notify user where UseMsg text can be found. */
+    if (!g_fNoHelpMessageBox)
+        winMessageBoxF("The " PROJECT_NAME " help text has been printed to "
+                       "%s.\n"
+                       "Please open %s to read the help text.\n",
+                       MB_ICONINFORMATION, g_pszLogFile, g_pszLogFile);
 }
 
 /* See Porting Layer Definition - p. 20 */
@@ -915,102 +881,95 @@ ddxUseMsg(void)
  */
 
 void
-InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
+InitOutput(ScreenInfo * screenInfo, int argc, char *argv[])
 {
-  int		i;
+    int i;
 
-  /* Log the command line */
-  winLogCommandLine (argc, argv);
+    /* Log the command line */
+    winLogCommandLine(argc, argv);
 
 #if CYGDEBUG
-  winDebug ("InitOutput\n");
+    winDebug("InitOutput\n");
 #endif
 
-  /* Validate command-line arguments */
-  if (serverGeneration == 1 && !winValidateArgs ())
-    {
-      FatalError ("InitOutput - Invalid command-line arguments found.  "
-		  "Exiting.\n");
+    /* Validate command-line arguments */
+    if (serverGeneration == 1 && !winValidateArgs()) {
+        FatalError("InitOutput - Invalid command-line arguments found.  "
+                   "Exiting.\n");
     }
 
-  /* Check for duplicate invocation on same display number.*/
-  if (serverGeneration == 1 && !winCheckDisplayNumber ())
-    {
-      if (g_fSilentDupError)
-        g_fSilentFatalError = TRUE;  
-      FatalError ("InitOutput - Duplicate invocation on display "
-		  "number: %s.  Exiting.\n", display);
+    /* Check for duplicate invocation on same display number. */
+    if (serverGeneration == 1 && !winCheckDisplayNumber()) {
+        if (g_fSilentDupError)
+            g_fSilentFatalError = TRUE;
+        FatalError("InitOutput - Duplicate invocation on display "
+                   "number: %s.  Exiting.\n", display);
     }
 
 #ifdef XWIN_XF86CONFIG
-  /* Try to read the xorg.conf-style configuration file */
-  if (!winReadConfigfile ())
-    winErrorFVerb (1, "InitOutput - Error reading config file\n");
+    /* Try to read the xorg.conf-style configuration file */
+    if (!winReadConfigfile())
+        winErrorFVerb(1, "InitOutput - Error reading config file\n");
 #else
-  winMsg(X_INFO, "xorg.conf is not supported\n");
-  winMsg(X_INFO, "See http://x.cygwin.com/docs/faq/cygwin-x-faq.html "
-         "for more information\n");
-  winConfigFiles ();
+    winMsg(X_INFO, "xorg.conf is not supported\n");
+    winMsg(X_INFO, "See http://x.cygwin.com/docs/faq/cygwin-x-faq.html "
+           "for more information\n");
+    winConfigFiles();
 #endif
 
-  /* Load preferences from XWinrc file */
-  LoadPreferences();
-
-  /* Setup global screen info parameters */
-  screenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
-  screenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
-  screenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
-  screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
-  screenInfo->numPixmapFormats = NUMFORMATS;
-  
-  /* Describe how we want common pixmap formats padded */
-  for (i = 0; i < NUMFORMATS; i++)
-    {
-      screenInfo->formats[i] = g_PixmapFormats[i];
+    /* Load preferences from XWinrc file */
+    LoadPreferences();
+
+    /* Setup global screen info parameters */
+    screenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
+    screenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
+    screenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+    screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
+    screenInfo->numPixmapFormats = NUMFORMATS;
+
+    /* Describe how we want common pixmap formats padded */
+    for (i = 0; i < NUMFORMATS; i++) {
+        screenInfo->formats[i] = g_PixmapFormats[i];
     }
 
-  /* Load pointers to DirectDraw functions */
-  winGetDDProcAddresses ();
-  
-  /* Detect supported engines */
-  winDetectSupportedEngines ();
+    /* Load pointers to DirectDraw functions */
+    winGetDDProcAddresses();
 
-  /* Store the instance handle */
-  g_hInstance = GetModuleHandle (NULL);
+    /* Detect supported engines */
+    winDetectSupportedEngines();
 
-  /* Initialize each screen */
-  for (i = 0; i < g_iNumScreens; ++i)
-    {
-      /* Initialize the screen */
-      if (-1 == AddScreen (winScreenInit, argc, argv))
-	{
-	  FatalError ("InitOutput - Couldn't add screen %d", i);
-	}
+    /* Store the instance handle */
+    g_hInstance = GetModuleHandle(NULL);
+
+    /* Initialize each screen */
+    for (i = 0; i < g_iNumScreens; ++i) {
+        /* Initialize the screen */
+        if (-1 == AddScreen(winScreenInit, argc, argv)) {
+            FatalError("InitOutput - Couldn't add screen %d", i);
+        }
     }
 
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
 
-  /* Generate a cookie used by internal clients for authorization */
-  if (g_fXdmcpEnabled || g_fAuthEnabled)
-    winGenerateAuthorization ();
-
-  /* Perform some one time initialization */
-  if (1 == serverGeneration)
-    {
-      /*
-       * setlocale applies to all threads in the current process.
-       * Apply locale specified in LANG environment variable.
-       */
-      setlocale (LC_ALL, "");
+    /* Generate a cookie used by internal clients for authorization */
+    if (g_fXdmcpEnabled || g_fAuthEnabled)
+        winGenerateAuthorization();
+
+    /* Perform some one time initialization */
+    if (1 == serverGeneration) {
+        /*
+         * setlocale applies to all threads in the current process.
+         * Apply locale specified in LANG environment variable.
+         */
+        setlocale(LC_ALL, "");
     }
 #endif
 
 #if CYGDEBUG || YES
-  winDebug ("InitOutput - Returning.\n");
+    winDebug("InitOutput - Returning.\n");
 #endif
 }
 
-
 /*
  * winCheckDisplayNumber - Check if another instance of Cygwin/X is
  * already running on the same display number.  If no one exists,
@@ -1020,67 +979,60 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
  */
 
 static Bool
-winCheckDisplayNumber (void)
+winCheckDisplayNumber(void)
 {
-  int			nDisp;
-  HANDLE		mutex;
-  char			name[MAX_PATH];
-  char *		pszPrefix = '\0';
-  OSVERSIONINFO		osvi = {0};
-
-  /* Check display range */
-  nDisp = atoi (display);
-  if (nDisp < 0 || nDisp > 65535)
-    {
-      ErrorF ("winCheckDisplayNumber - Bad display number: %d\n", nDisp);
-      return FALSE;
+    int nDisp;
+    HANDLE mutex;
+    char name[MAX_PATH];
+    char *pszPrefix = '\0';
+    OSVERSIONINFO osvi = { 0 };
+
+    /* Check display range */
+    nDisp = atoi(display);
+    if (nDisp < 0 || nDisp > 65535) {
+        ErrorF("winCheckDisplayNumber - Bad display number: %d\n", nDisp);
+        return FALSE;
     }
 
-  /* Set first character of mutex name to null */
-  name[0] = '\0';
+    /* Set first character of mutex name to null */
+    name[0] = '\0';
 
-  /* Get operating system version information */
-  osvi.dwOSVersionInfoSize = sizeof (osvi);
-  GetVersionEx (&osvi);
+    /* Get operating system version information */
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+    GetVersionEx(&osvi);
 
-  /* Want a mutex shared among all terminals on NT > 4.0 */
-  if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT
-      && osvi.dwMajorVersion >= 5)
-    {
-      pszPrefix = "Global\\";
+    /* Want a mutex shared among all terminals on NT > 4.0 */
+    if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion >= 5) {
+        pszPrefix = "Global\\";
     }
 
-  /* Setup Cygwin/X specific part of name */
-  snprintf (name, sizeof(name), "%sCYGWINX_DISPLAY:%d", pszPrefix, nDisp);
-
-  /* Windows automatically releases the mutex when this process exits */
-  mutex = CreateMutex (NULL, FALSE, name);
-  if (!mutex)
-    {
-      LPVOID lpMsgBuf;
-
-      /* Display a fancy error message */
-      FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-		     FORMAT_MESSAGE_FROM_SYSTEM | 
-		     FORMAT_MESSAGE_IGNORE_INSERTS,
-		     NULL,
-		     GetLastError (),
-		     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-		     (LPTSTR) &lpMsgBuf,
-		     0, NULL);
-      ErrorF ("winCheckDisplayNumber - CreateMutex failed: %s\n",
-	      (LPSTR)lpMsgBuf);
-      LocalFree (lpMsgBuf);
-
-      return FALSE;
+    /* Setup Cygwin/X specific part of name */
+    snprintf(name, sizeof(name), "%sCYGWINX_DISPLAY:%d", pszPrefix, nDisp);
+
+    /* Windows automatically releases the mutex when this process exits */
+    mutex = CreateMutex(NULL, FALSE, name);
+    if (!mutex) {
+        LPVOID lpMsgBuf;
+
+        /* Display a fancy error message */
+        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                      FORMAT_MESSAGE_FROM_SYSTEM |
+                      FORMAT_MESSAGE_IGNORE_INSERTS,
+                      NULL,
+                      GetLastError(),
+                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                      (LPTSTR) & lpMsgBuf, 0, NULL);
+        ErrorF("winCheckDisplayNumber - CreateMutex failed: %s\n",
+               (LPSTR) lpMsgBuf);
+        LocalFree(lpMsgBuf);
+
+        return FALSE;
     }
-  if (GetLastError () == ERROR_ALREADY_EXISTS)
-    {
-      ErrorF ("winCheckDisplayNumber - "
-	      PROJECT_NAME " is already running on display %d\n",
-	      nDisp);
-      return FALSE;
+    if (GetLastError() == ERROR_ALREADY_EXISTS) {
+        ErrorF("winCheckDisplayNumber - "
+               PROJECT_NAME " is already running on display %d\n", nDisp);
+        return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
diff --git a/xorg-server/hw/xwin/ddraw.h b/xorg-server/hw/xwin/ddraw.h
index 9d87b2b95..9463049c8 100644
--- a/xorg-server/hw/xwin/ddraw.h
+++ b/xorg-server/hw/xwin/ddraw.h
@@ -11,62 +11,76 @@
 
 #define ICOM_CALL_( xfn, p, args) (p)->lpVtbl->xfn args
 
-# ifdef UNICODE
-#  define WINELIB_NAME_AW(func) func##W
-# else
-#  define WINELIB_NAME_AW(func) func##A
-# endif  /* UNICODE */
+#ifdef UNICODE
+#define WINELIB_NAME_AW(func) func##W
+#else
+#define WINELIB_NAME_AW(func) func##A
+#endif                          /* UNICODE */
 #define DECL_WINELIB_TYPE_AW(type)  typedef WINELIB_NAME_AW(type) type;
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* defined(__cplusplus) */
+#endif                          /* defined(__cplusplus) */
 
 #ifndef	DIRECTDRAW_VERSION
 #define	DIRECTDRAW_VERSION	0x0700
-#endif /* DIRECTDRAW_VERSION */
+#endif                          /* DIRECTDRAW_VERSION */
 
 /*****************************************************************************
  * Predeclare the interfaces
  */
-DEFINE_GUID( CLSID_DirectDraw,		0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35 );
-DEFINE_GUID( CLSID_DirectDraw7,         0x3C305196,0x50DB,0x11D3,0x9C,0xFE,0x00,0xC0,0x4F,0xD9,0x30,0xC5 );
-DEFINE_GUID( CLSID_DirectDrawClipper,	0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xb9,0x33,0x56 );
-DEFINE_GUID( IID_IDirectDraw,		0x6C14DB80,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-DEFINE_GUID( IID_IDirectDraw2,		0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 );
-DEFINE_GUID( IID_IDirectDraw4,          0x9c59509a,0x39bd,0x11d1,0x8c,0x4a,0x00,0xc0,0x4f,0xd9,0x30,0xc5 );
-DEFINE_GUID( IID_IDirectDraw7,          0x15e65ec0,0x3b9c,0x11d2,0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b );
-DEFINE_GUID( IID_IDirectDrawSurface,	0x6C14DB81,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-DEFINE_GUID( IID_IDirectDrawSurface2,	0x57805885,0x6eec,0x11cf,0x94,0x41,0xa8,0x23,0x03,0xc1,0x0e,0x27 );
-DEFINE_GUID( IID_IDirectDrawSurface3,	0xDA044E00,0x69B2,0x11D0,0xA1,0xD5,0x00,0xAA,0x00,0xB8,0xDF,0xBB );
-DEFINE_GUID( IID_IDirectDrawSurface4,   0x0B2B8630,0xAD35,0x11D0,0x8E,0xA6,0x00,0x60,0x97,0x97,0xEA,0x5B );
-DEFINE_GUID( IID_IDirectDrawSurface7,   0x06675a80,0x3b9b,0x11d2,0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b );
-DEFINE_GUID( IID_IDirectDrawPalette,	0x6C14DB84,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-DEFINE_GUID( IID_IDirectDrawClipper,	0x6C14DB85,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-DEFINE_GUID( IID_IDirectDrawColorControl,0x4B9F0EE0,0x0D7E,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8 );
-DEFINE_GUID( IID_IDirectDrawGammaControl,0x69C11C3E,0xB46B,0x11D1,0xAD,0x7A,0x00,0xC0,0x4F,0xC2,0x9B,0x4E );
-
-typedef struct IDirectDraw *LPDIRECTDRAW;
-typedef struct IDirectDraw2 *LPDIRECTDRAW2;
-typedef struct IDirectDraw4 *LPDIRECTDRAW4;
-typedef struct IDirectDraw7 *LPDIRECTDRAW7;
-typedef struct IDirectDrawClipper *LPDIRECTDRAWCLIPPER;
-typedef struct IDirectDrawPalette *LPDIRECTDRAWPALETTE;
-typedef struct IDirectDrawSurface *LPDIRECTDRAWSURFACE;
-typedef struct IDirectDrawSurface2 *LPDIRECTDRAWSURFACE2;
-typedef struct IDirectDrawSurface3 *LPDIRECTDRAWSURFACE3;
-typedef struct IDirectDrawSurface4 *LPDIRECTDRAWSURFACE4;
-typedef struct IDirectDrawSurface7 *LPDIRECTDRAWSURFACE7;
-typedef struct IDirectDrawColorControl *LPDIRECTDRAWCOLORCONTROL;
-typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL;
-
+    DEFINE_GUID(CLSID_DirectDraw, 0xD7B70EE0, 0x4340, 0x11CF, 0xB0, 0x63, 0x00,
+                0x20, 0xAF, 0xC2, 0xCD, 0x35);
+    DEFINE_GUID(CLSID_DirectDraw7, 0x3C305196, 0x50DB, 0x11D3, 0x9C, 0xFE, 0x00,
+                0xC0, 0x4F, 0xD9, 0x30, 0xC5);
+    DEFINE_GUID(CLSID_DirectDrawClipper, 0x593817A0, 0x7DB3, 0x11CF, 0xA2, 0xDE,
+                0x00, 0xAA, 0x00, 0xb9, 0x33, 0x56);
+    DEFINE_GUID(IID_IDirectDraw, 0x6C14DB80, 0xA733, 0x11CE, 0xA5, 0x21, 0x00,
+                0x20, 0xAF, 0x0B, 0xE5, 0x60);
+    DEFINE_GUID(IID_IDirectDraw2, 0xB3A6F3E0, 0x2B43, 0x11CF, 0xA2, 0xDE, 0x00,
+                0xAA, 0x00, 0xB9, 0x33, 0x56);
+    DEFINE_GUID(IID_IDirectDraw4, 0x9c59509a, 0x39bd, 0x11d1, 0x8c, 0x4a, 0x00,
+                0xc0, 0x4f, 0xd9, 0x30, 0xc5);
+    DEFINE_GUID(IID_IDirectDraw7, 0x15e65ec0, 0x3b9c, 0x11d2, 0xb9, 0x2f, 0x00,
+                0x60, 0x97, 0x97, 0xea, 0x5b);
+    DEFINE_GUID(IID_IDirectDrawSurface, 0x6C14DB81, 0xA733, 0x11CE, 0xA5, 0x21,
+                0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
+    DEFINE_GUID(IID_IDirectDrawSurface2, 0x57805885, 0x6eec, 0x11cf, 0x94, 0x41,
+                0xa8, 0x23, 0x03, 0xc1, 0x0e, 0x27);
+    DEFINE_GUID(IID_IDirectDrawSurface3, 0xDA044E00, 0x69B2, 0x11D0, 0xA1, 0xD5,
+                0x00, 0xAA, 0x00, 0xB8, 0xDF, 0xBB);
+    DEFINE_GUID(IID_IDirectDrawSurface4, 0x0B2B8630, 0xAD35, 0x11D0, 0x8E, 0xA6,
+                0x00, 0x60, 0x97, 0x97, 0xEA, 0x5B);
+    DEFINE_GUID(IID_IDirectDrawSurface7, 0x06675a80, 0x3b9b, 0x11d2, 0xb9, 0x2f,
+                0x00, 0x60, 0x97, 0x97, 0xea, 0x5b);
+    DEFINE_GUID(IID_IDirectDrawPalette, 0x6C14DB84, 0xA733, 0x11CE, 0xA5, 0x21,
+                0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
+    DEFINE_GUID(IID_IDirectDrawClipper, 0x6C14DB85, 0xA733, 0x11CE, 0xA5, 0x21,
+                0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
+    DEFINE_GUID(IID_IDirectDrawColorControl, 0x4B9F0EE0, 0x0D7E, 0x11D0, 0x9B,
+                0x06, 0x00, 0xA0, 0xC9, 0x03, 0xA3, 0xB8);
+    DEFINE_GUID(IID_IDirectDrawGammaControl, 0x69C11C3E, 0xB46B, 0x11D1, 0xAD,
+                0x7A, 0x00, 0xC0, 0x4F, 0xC2, 0x9B, 0x4E);
+
+    typedef struct IDirectDraw *LPDIRECTDRAW;
+    typedef struct IDirectDraw2 *LPDIRECTDRAW2;
+    typedef struct IDirectDraw4 *LPDIRECTDRAW4;
+    typedef struct IDirectDraw7 *LPDIRECTDRAW7;
+    typedef struct IDirectDrawClipper *LPDIRECTDRAWCLIPPER;
+    typedef struct IDirectDrawPalette *LPDIRECTDRAWPALETTE;
+    typedef struct IDirectDrawSurface *LPDIRECTDRAWSURFACE;
+    typedef struct IDirectDrawSurface2 *LPDIRECTDRAWSURFACE2;
+    typedef struct IDirectDrawSurface3 *LPDIRECTDRAWSURFACE3;
+    typedef struct IDirectDrawSurface4 *LPDIRECTDRAWSURFACE4;
+    typedef struct IDirectDrawSurface7 *LPDIRECTDRAWSURFACE7;
+    typedef struct IDirectDrawColorControl *LPDIRECTDRAWCOLORCONTROL;
+    typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL;
 
 #define DDENUMRET_CANCEL	0
 #define DDENUMRET_OK		1
 
 #define DD_OK			0
 
-
 #define _FACDD		0x876
 #define MAKE_DDHRESULT( code )  MAKE_HRESULT( 1, _FACDD, code )
 
@@ -228,8 +242,8 @@ typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL;
 
 /* dwFlags for Flip */
 #define DDFLIP_WAIT		0x00000001
-#define DDFLIP_EVEN		0x00000002 /* only valid for overlay */
-#define DDFLIP_ODD		0x00000004 /* only valid for overlay */
+#define DDFLIP_EVEN		0x00000002      /* only valid for overlay */
+#define DDFLIP_ODD		0x00000004      /* only valid for overlay */
 #define DDFLIP_NOVSYNC		0x00000008
 #define DDFLIP_STEREO		0x00000010
 #define DDFLIP_DONOTWAIT	0x00000020
@@ -307,9 +321,9 @@ typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL;
 /* optimized? surface */
 #define DDSCAPS_OPTIMIZED		0x80000000
 
-typedef struct _DDSCAPS {
-	DWORD	dwCaps;	/* capabilities of surface wanted */
-} DDSCAPS,*LPDDSCAPS;
+    typedef struct _DDSCAPS {
+        DWORD dwCaps;           /* capabilities of surface wanted */
+    } DDSCAPS, *LPDDSCAPS;
 
 /* DDSCAPS2.dwCaps2 */
 /* indicates the surface will receive data from a video port using
@@ -353,267 +367,263 @@ typedef struct _DDSCAPS {
 /* indicates surface is part of a stereo flipping chain */
 #define DDSCAPS2_STEREOSURFACELEFT      0x00080000
 
-typedef struct _DDSCAPS2 {
-	DWORD	dwCaps;	/* capabilities of surface wanted */
-	DWORD   dwCaps2; /* additional capabilities */
-	DWORD   dwCaps3; /* reserved capabilities */
-	DWORD   dwCaps4; /* more reserved capabilities */
-} DDSCAPS2,*LPDDSCAPS2;
-
-#define	DD_ROP_SPACE	(256/32)	/* space required to store ROP array */
-
-typedef struct _DDCAPS_DX7		/* DirectX 7 version of caps struct */
-{
-    DWORD	dwSize;                 /* size of the DDDRIVERCAPS structure */
-    DWORD	dwCaps;                 /* driver specific capabilities */
-    DWORD	dwCaps2;                /* more driver specific capabilites */
-    DWORD	dwCKeyCaps;             /* color key capabilities of the surface */
-    DWORD	dwFXCaps;               /* driver specific stretching and effects capabilites */
-    DWORD	dwFXAlphaCaps;          /* alpha driver specific capabilities */
-    DWORD	dwPalCaps;              /* palette capabilities */
-    DWORD	dwSVCaps;               /* stereo vision capabilities */
-    DWORD	dwAlphaBltConstBitDepths;       /* DDBD_2,4,8 */
-    DWORD	dwAlphaBltPixelBitDepths;       /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaBltSurfaceBitDepths;     /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlayConstBitDepths;   /* DDBD_2,4,8 */
-    DWORD	dwAlphaOverlayPixelBitDepths;   /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-    DWORD	dwZBufferBitDepths;             /* DDBD_8,16,24,32 */
-    DWORD	dwVidMemTotal;          /* total amount of video memory */
-    DWORD	dwVidMemFree;           /* amount of free video memory */
-    DWORD	dwMaxVisibleOverlays;   /* maximum number of visible overlays */
-    DWORD	dwCurrVisibleOverlays;  /* current number of visible overlays */
-    DWORD	dwNumFourCCCodes;       /* number of four cc codes */
-    DWORD	dwAlignBoundarySrc;     /* source rectangle alignment */
-    DWORD	dwAlignSizeSrc;         /* source rectangle byte size */
-    DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
-    DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
-    DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
-    DDSCAPS	ddsOldCaps;             /* old DDSCAPS - superceded for DirectX6+ */
-    DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinLiveVideoStretch;  /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxLiveVideoStretch;  /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinHwCodecStretch;    /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxHwCodecStretch;    /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwReserved1;
-    DWORD	dwReserved2;
-    DWORD	dwReserved3;
-    DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
-    DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
-    DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-    DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
-    DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
-    DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-    DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
-    DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
-    DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-    DWORD       dwMaxVideoPorts;        /* maximum number of usable video ports */
-    DWORD   	dwCurrVideoPorts;       /* current number of video ports used */
-    DWORD   	dwSVBCaps2;             /* more driver specific capabilities for System->Vmem blts */
-    DWORD   	dwNLVBCaps;             /* driver specific capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBCaps2;            /* more driver specific capabilities non-local->local vidmem blts */
-    DWORD   	dwNLVBCKeyCaps;         /* driver color key capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBFXCaps;           /* driver FX capabilities for non-local->local blts */
-    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-    DDSCAPS2    ddsCaps;		/* surface capabilities */
-} DDCAPS_DX7,*LPDDCAPS_DX7;
-
-typedef struct _DDCAPS_DX6		/* DirectX 6 version of caps struct */
-{
-    DWORD	dwSize;                 /* size of the DDDRIVERCAPS structure */
-    DWORD	dwCaps;                 /* driver specific capabilities */
-    DWORD	dwCaps2;                /* more driver specific capabilites */
-    DWORD	dwCKeyCaps;             /* color key capabilities of the surface */
-    DWORD	dwFXCaps;               /* driver specific stretching and effects capabilites */
-    DWORD	dwFXAlphaCaps;          /* alpha driver specific capabilities */
-    DWORD	dwPalCaps;              /* palette capabilities */
-    DWORD	dwSVCaps;               /* stereo vision capabilities */
-    DWORD	dwAlphaBltConstBitDepths;       /* DDBD_2,4,8 */
-    DWORD	dwAlphaBltPixelBitDepths;       /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaBltSurfaceBitDepths;     /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlayConstBitDepths;   /* DDBD_2,4,8 */
-    DWORD	dwAlphaOverlayPixelBitDepths;   /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-    DWORD	dwZBufferBitDepths;             /* DDBD_8,16,24,32 */
-    DWORD	dwVidMemTotal;          /* total amount of video memory */
-    DWORD	dwVidMemFree;           /* amount of free video memory */
-    DWORD	dwMaxVisibleOverlays;   /* maximum number of visible overlays */
-    DWORD	dwCurrVisibleOverlays;  /* current number of visible overlays */
-    DWORD	dwNumFourCCCodes;       /* number of four cc codes */
-    DWORD	dwAlignBoundarySrc;     /* source rectangle alignment */
-    DWORD	dwAlignSizeSrc;         /* source rectangle byte size */
-    DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
-    DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
-    DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
-    DDSCAPS	ddsOldCaps;             /* old DDSCAPS - superceded for DirectX6+ */
-    DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinLiveVideoStretch;  /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxLiveVideoStretch;  /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinHwCodecStretch;    /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxHwCodecStretch;    /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwReserved1;
-    DWORD	dwReserved2;
-    DWORD	dwReserved3;
-    DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
-    DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
-    DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-    DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
-    DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
-    DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-    DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
-    DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
-    DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-    DWORD       dwMaxVideoPorts;        /* maximum number of usable video ports */
-    DWORD   	dwCurrVideoPorts;       /* current number of video ports used */
-    DWORD   	dwSVBCaps2;             /* more driver specific capabilities for System->Vmem blts */
-    DWORD   	dwNLVBCaps;             /* driver specific capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBCaps2;            /* more driver specific capabilities non-local->local vidmem blts */
-    DWORD   	dwNLVBCKeyCaps;         /* driver color key capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBFXCaps;           /* driver FX capabilities for non-local->local blts */
-    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-    /* and one new member for DirectX 6 */
-    DDSCAPS2    ddsCaps;		/* surface capabilities */
-} DDCAPS_DX6,*LPDDCAPS_DX6;
-
-typedef struct _DDCAPS_DX5		/* DirectX5 version of caps struct */
-{
-    DWORD	dwSize;                 /* size of the DDDRIVERCAPS structure */
-    DWORD	dwCaps;                 /* driver specific capabilities */
-    DWORD	dwCaps2;                /* more driver specific capabilites */
-    DWORD	dwCKeyCaps;             /* color key capabilities of the surface */
-    DWORD	dwFXCaps;               /* driver specific stretching and effects capabilites */
-    DWORD	dwFXAlphaCaps;          /* alpha driver specific capabilities */
-    DWORD	dwPalCaps;              /* palette capabilities */
-    DWORD	dwSVCaps;               /* stereo vision capabilities */
-    DWORD	dwAlphaBltConstBitDepths;       /* DDBD_2,4,8 */
-    DWORD	dwAlphaBltPixelBitDepths;       /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaBltSurfaceBitDepths;     /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlayConstBitDepths;   /* DDBD_2,4,8 */
-    DWORD	dwAlphaOverlayPixelBitDepths;   /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-    DWORD	dwZBufferBitDepths;             /* DDBD_8,16,24,32 */
-    DWORD	dwVidMemTotal;          /* total amount of video memory */
-    DWORD	dwVidMemFree;           /* amount of free video memory */
-    DWORD	dwMaxVisibleOverlays;   /* maximum number of visible overlays */
-    DWORD	dwCurrVisibleOverlays;  /* current number of visible overlays */
-    DWORD	dwNumFourCCCodes;       /* number of four cc codes */
-    DWORD	dwAlignBoundarySrc;     /* source rectangle alignment */
-    DWORD	dwAlignSizeSrc;         /* source rectangle byte size */
-    DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
-    DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
-    DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
-    DDSCAPS	ddsCaps;                /* DDSCAPS structure has all the general capabilities */
-    DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinLiveVideoStretch;  /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxLiveVideoStretch;  /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinHwCodecStretch;    /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxHwCodecStretch;    /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwReserved1;
-    DWORD	dwReserved2;
-    DWORD	dwReserved3;
-    DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
-    DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
-    DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-    DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
-    DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
-    DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-    DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
-    DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
-    DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-    /* the following are the new DirectX 5 members */
-    DWORD       dwMaxVideoPorts;        /* maximum number of usable video ports */
-    DWORD   	dwCurrVideoPorts;       /* current number of video ports used */
-    DWORD   	dwSVBCaps2;             /* more driver specific capabilities for System->Vmem blts */
-    DWORD   	dwNLVBCaps;             /* driver specific capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBCaps2;            /* more driver specific capabilities non-local->local vidmem blts */
-    DWORD   	dwNLVBCKeyCaps;         /* driver color key capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBFXCaps;           /* driver FX capabilities for non-local->local blts */
-    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-} DDCAPS_DX5,*LPDDCAPS_DX5;
-
-typedef struct _DDCAPS_DX3		/* DirectX3 version of caps struct */
-{
-    DWORD	dwSize;                 /* size of the DDDRIVERCAPS structure */
-    DWORD	dwCaps;                 /* driver specific capabilities */
-    DWORD	dwCaps2;                /* more driver specific capabilites */
-    DWORD	dwCKeyCaps;             /* color key capabilities of the surface */
-    DWORD	dwFXCaps;               /* driver specific stretching and effects capabilites */
-    DWORD	dwFXAlphaCaps;          /* alpha driver specific capabilities */
-    DWORD	dwPalCaps;              /* palette capabilities */
-    DWORD	dwSVCaps;               /* stereo vision capabilities */
-    DWORD	dwAlphaBltConstBitDepths;       /* DDBD_2,4,8 */
-    DWORD	dwAlphaBltPixelBitDepths;       /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaBltSurfaceBitDepths;     /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlayConstBitDepths;   /* DDBD_2,4,8 */
-    DWORD	dwAlphaOverlayPixelBitDepths;   /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-    DWORD	dwZBufferBitDepths;             /* DDBD_8,16,24,32 */
-    DWORD	dwVidMemTotal;          /* total amount of video memory */
-    DWORD	dwVidMemFree;           /* amount of free video memory */
-    DWORD	dwMaxVisibleOverlays;   /* maximum number of visible overlays */
-    DWORD	dwCurrVisibleOverlays;  /* current number of visible overlays */
-    DWORD	dwNumFourCCCodes;       /* number of four cc codes */
-    DWORD	dwAlignBoundarySrc;     /* source rectangle alignment */
-    DWORD	dwAlignSizeSrc;         /* source rectangle byte size */
-    DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
-    DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
-    DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
-    DDSCAPS	ddsCaps;                /* DDSCAPS structure has all the general capabilities */
-    DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinLiveVideoStretch;  /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxLiveVideoStretch;  /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinHwCodecStretch;    /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxHwCodecStretch;    /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwReserved1;
-    DWORD	dwReserved2;
-    DWORD	dwReserved3;
-    DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
-    DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
-    DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-    DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
-    DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
-    DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-    DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
-    DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
-    DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-    DWORD	dwReserved4;
-    DWORD	dwReserved5;
-    DWORD	dwReserved6;
-} DDCAPS_DX3,*LPDDCAPS_DX3;
+    typedef struct _DDSCAPS2 {
+        DWORD dwCaps;           /* capabilities of surface wanted */
+        DWORD dwCaps2;          /* additional capabilities */
+        DWORD dwCaps3;          /* reserved capabilities */
+        DWORD dwCaps4;          /* more reserved capabilities */
+    } DDSCAPS2, *LPDDSCAPS2;
+
+#define	DD_ROP_SPACE	(256/32)        /* space required to store ROP array */
+
+    typedef struct _DDCAPS_DX7 {        /* DirectX 7 version of caps struct */
+        DWORD dwSize;           /* size of the DDDRIVERCAPS structure */
+        DWORD dwCaps;           /* driver specific capabilities */
+        DWORD dwCaps2;          /* more driver specific capabilites */
+        DWORD dwCKeyCaps;       /* color key capabilities of the surface */
+        DWORD dwFXCaps;         /* driver specific stretching and effects capabilites */
+        DWORD dwFXAlphaCaps;    /* alpha driver specific capabilities */
+        DWORD dwPalCaps;        /* palette capabilities */
+        DWORD dwSVCaps;         /* stereo vision capabilities */
+        DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
+        DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
+        DWORD dwAlphaBltSurfaceBitDepths;       /* DDBD_1,2,4,8 */
+        DWORD dwAlphaOverlayConstBitDepths;     /* DDBD_2,4,8 */
+        DWORD dwAlphaOverlayPixelBitDepths;     /* DDBD_1,2,4,8 */
+        DWORD dwAlphaOverlaySurfaceBitDepths;   /* DDBD_1,2,4,8 */
+        DWORD dwZBufferBitDepths;       /* DDBD_8,16,24,32 */
+        DWORD dwVidMemTotal;    /* total amount of video memory */
+        DWORD dwVidMemFree;     /* amount of free video memory */
+        DWORD dwMaxVisibleOverlays;     /* maximum number of visible overlays */
+        DWORD dwCurrVisibleOverlays;    /* current number of visible overlays */
+        DWORD dwNumFourCCCodes; /* number of four cc codes */
+        DWORD dwAlignBoundarySrc;       /* source rectangle alignment */
+        DWORD dwAlignSizeSrc;   /* source rectangle byte size */
+        DWORD dwAlignBoundaryDest;      /* dest rectangle alignment */
+        DWORD dwAlignSizeDest;  /* dest rectangle byte size */
+        DWORD dwAlignStrideAlign;       /* stride alignment */
+        DWORD dwRops[DD_ROP_SPACE];     /* ROPS supported */
+        DDSCAPS ddsOldCaps;     /* old DDSCAPS - superceded for DirectX6+ */
+        DWORD dwMinOverlayStretch;      /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxOverlayStretch;      /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMinLiveVideoStretch;    /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxLiveVideoStretch;    /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMinHwCodecStretch;      /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxHwCodecStretch;      /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwReserved1;
+        DWORD dwReserved2;
+        DWORD dwReserved3;
+        DWORD dwSVBCaps;        /* driver specific capabilities for System->Vmem blts */
+        DWORD dwSVBCKeyCaps;    /* driver color key capabilities for System->Vmem blts */
+        DWORD dwSVBFXCaps;      /* driver FX capabilities for System->Vmem blts */
+        DWORD dwSVBRops[DD_ROP_SPACE];  /* ROPS supported for System->Vmem blts */
+        DWORD dwVSBCaps;        /* driver specific capabilities for Vmem->System blts */
+        DWORD dwVSBCKeyCaps;    /* driver color key capabilities for Vmem->System blts */
+        DWORD dwVSBFXCaps;      /* driver FX capabilities for Vmem->System blts */
+        DWORD dwVSBRops[DD_ROP_SPACE];  /* ROPS supported for Vmem->System blts */
+        DWORD dwSSBCaps;        /* driver specific capabilities for System->System blts */
+        DWORD dwSSBCKeyCaps;    /* driver color key capabilities for System->System blts */
+        DWORD dwSSBFXCaps;      /* driver FX capabilities for System->System blts */
+        DWORD dwSSBRops[DD_ROP_SPACE];  /* ROPS supported for System->System blts */
+        DWORD dwMaxVideoPorts;  /* maximum number of usable video ports */
+        DWORD dwCurrVideoPorts; /* current number of video ports used */
+        DWORD dwSVBCaps2;       /* more driver specific capabilities for System->Vmem blts */
+        DWORD dwNLVBCaps;       /* driver specific capabilities for non-local->local vidmem blts */
+        DWORD dwNLVBCaps2;      /* more driver specific capabilities non-local->local vidmem blts */
+        DWORD dwNLVBCKeyCaps;   /* driver color key capabilities for non-local->local vidmem blts */
+        DWORD dwNLVBFXCaps;     /* driver FX capabilities for non-local->local blts */
+        DWORD dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
+        DDSCAPS2 ddsCaps;       /* surface capabilities */
+    } DDCAPS_DX7, *LPDDCAPS_DX7;
+
+    typedef struct _DDCAPS_DX6 {        /* DirectX 6 version of caps struct */
+        DWORD dwSize;           /* size of the DDDRIVERCAPS structure */
+        DWORD dwCaps;           /* driver specific capabilities */
+        DWORD dwCaps2;          /* more driver specific capabilites */
+        DWORD dwCKeyCaps;       /* color key capabilities of the surface */
+        DWORD dwFXCaps;         /* driver specific stretching and effects capabilites */
+        DWORD dwFXAlphaCaps;    /* alpha driver specific capabilities */
+        DWORD dwPalCaps;        /* palette capabilities */
+        DWORD dwSVCaps;         /* stereo vision capabilities */
+        DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
+        DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
+        DWORD dwAlphaBltSurfaceBitDepths;       /* DDBD_1,2,4,8 */
+        DWORD dwAlphaOverlayConstBitDepths;     /* DDBD_2,4,8 */
+        DWORD dwAlphaOverlayPixelBitDepths;     /* DDBD_1,2,4,8 */
+        DWORD dwAlphaOverlaySurfaceBitDepths;   /* DDBD_1,2,4,8 */
+        DWORD dwZBufferBitDepths;       /* DDBD_8,16,24,32 */
+        DWORD dwVidMemTotal;    /* total amount of video memory */
+        DWORD dwVidMemFree;     /* amount of free video memory */
+        DWORD dwMaxVisibleOverlays;     /* maximum number of visible overlays */
+        DWORD dwCurrVisibleOverlays;    /* current number of visible overlays */
+        DWORD dwNumFourCCCodes; /* number of four cc codes */
+        DWORD dwAlignBoundarySrc;       /* source rectangle alignment */
+        DWORD dwAlignSizeSrc;   /* source rectangle byte size */
+        DWORD dwAlignBoundaryDest;      /* dest rectangle alignment */
+        DWORD dwAlignSizeDest;  /* dest rectangle byte size */
+        DWORD dwAlignStrideAlign;       /* stride alignment */
+        DWORD dwRops[DD_ROP_SPACE];     /* ROPS supported */
+        DDSCAPS ddsOldCaps;     /* old DDSCAPS - superceded for DirectX6+ */
+        DWORD dwMinOverlayStretch;      /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxOverlayStretch;      /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMinLiveVideoStretch;    /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxLiveVideoStretch;    /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMinHwCodecStretch;      /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxHwCodecStretch;      /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwReserved1;
+        DWORD dwReserved2;
+        DWORD dwReserved3;
+        DWORD dwSVBCaps;        /* driver specific capabilities for System->Vmem blts */
+        DWORD dwSVBCKeyCaps;    /* driver color key capabilities for System->Vmem blts */
+        DWORD dwSVBFXCaps;      /* driver FX capabilities for System->Vmem blts */
+        DWORD dwSVBRops[DD_ROP_SPACE];  /* ROPS supported for System->Vmem blts */
+        DWORD dwVSBCaps;        /* driver specific capabilities for Vmem->System blts */
+        DWORD dwVSBCKeyCaps;    /* driver color key capabilities for Vmem->System blts */
+        DWORD dwVSBFXCaps;      /* driver FX capabilities for Vmem->System blts */
+        DWORD dwVSBRops[DD_ROP_SPACE];  /* ROPS supported for Vmem->System blts */
+        DWORD dwSSBCaps;        /* driver specific capabilities for System->System blts */
+        DWORD dwSSBCKeyCaps;    /* driver color key capabilities for System->System blts */
+        DWORD dwSSBFXCaps;      /* driver FX capabilities for System->System blts */
+        DWORD dwSSBRops[DD_ROP_SPACE];  /* ROPS supported for System->System blts */
+        DWORD dwMaxVideoPorts;  /* maximum number of usable video ports */
+        DWORD dwCurrVideoPorts; /* current number of video ports used */
+        DWORD dwSVBCaps2;       /* more driver specific capabilities for System->Vmem blts */
+        DWORD dwNLVBCaps;       /* driver specific capabilities for non-local->local vidmem blts */
+        DWORD dwNLVBCaps2;      /* more driver specific capabilities non-local->local vidmem blts */
+        DWORD dwNLVBCKeyCaps;   /* driver color key capabilities for non-local->local vidmem blts */
+        DWORD dwNLVBFXCaps;     /* driver FX capabilities for non-local->local blts */
+        DWORD dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
+        /* and one new member for DirectX 6 */
+        DDSCAPS2 ddsCaps;       /* surface capabilities */
+    } DDCAPS_DX6, *LPDDCAPS_DX6;
+
+    typedef struct _DDCAPS_DX5 {        /* DirectX5 version of caps struct */
+        DWORD dwSize;           /* size of the DDDRIVERCAPS structure */
+        DWORD dwCaps;           /* driver specific capabilities */
+        DWORD dwCaps2;          /* more driver specific capabilites */
+        DWORD dwCKeyCaps;       /* color key capabilities of the surface */
+        DWORD dwFXCaps;         /* driver specific stretching and effects capabilites */
+        DWORD dwFXAlphaCaps;    /* alpha driver specific capabilities */
+        DWORD dwPalCaps;        /* palette capabilities */
+        DWORD dwSVCaps;         /* stereo vision capabilities */
+        DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
+        DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
+        DWORD dwAlphaBltSurfaceBitDepths;       /* DDBD_1,2,4,8 */
+        DWORD dwAlphaOverlayConstBitDepths;     /* DDBD_2,4,8 */
+        DWORD dwAlphaOverlayPixelBitDepths;     /* DDBD_1,2,4,8 */
+        DWORD dwAlphaOverlaySurfaceBitDepths;   /* DDBD_1,2,4,8 */
+        DWORD dwZBufferBitDepths;       /* DDBD_8,16,24,32 */
+        DWORD dwVidMemTotal;    /* total amount of video memory */
+        DWORD dwVidMemFree;     /* amount of free video memory */
+        DWORD dwMaxVisibleOverlays;     /* maximum number of visible overlays */
+        DWORD dwCurrVisibleOverlays;    /* current number of visible overlays */
+        DWORD dwNumFourCCCodes; /* number of four cc codes */
+        DWORD dwAlignBoundarySrc;       /* source rectangle alignment */
+        DWORD dwAlignSizeSrc;   /* source rectangle byte size */
+        DWORD dwAlignBoundaryDest;      /* dest rectangle alignment */
+        DWORD dwAlignSizeDest;  /* dest rectangle byte size */
+        DWORD dwAlignStrideAlign;       /* stride alignment */
+        DWORD dwRops[DD_ROP_SPACE];     /* ROPS supported */
+        DDSCAPS ddsCaps;        /* DDSCAPS structure has all the general capabilities */
+        DWORD dwMinOverlayStretch;      /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxOverlayStretch;      /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMinLiveVideoStretch;    /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxLiveVideoStretch;    /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMinHwCodecStretch;      /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxHwCodecStretch;      /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwReserved1;
+        DWORD dwReserved2;
+        DWORD dwReserved3;
+        DWORD dwSVBCaps;        /* driver specific capabilities for System->Vmem blts */
+        DWORD dwSVBCKeyCaps;    /* driver color key capabilities for System->Vmem blts */
+        DWORD dwSVBFXCaps;      /* driver FX capabilities for System->Vmem blts */
+        DWORD dwSVBRops[DD_ROP_SPACE];  /* ROPS supported for System->Vmem blts */
+        DWORD dwVSBCaps;        /* driver specific capabilities for Vmem->System blts */
+        DWORD dwVSBCKeyCaps;    /* driver color key capabilities for Vmem->System blts */
+        DWORD dwVSBFXCaps;      /* driver FX capabilities for Vmem->System blts */
+        DWORD dwVSBRops[DD_ROP_SPACE];  /* ROPS supported for Vmem->System blts */
+        DWORD dwSSBCaps;        /* driver specific capabilities for System->System blts */
+        DWORD dwSSBCKeyCaps;    /* driver color key capabilities for System->System blts */
+        DWORD dwSSBFXCaps;      /* driver FX capabilities for System->System blts */
+        DWORD dwSSBRops[DD_ROP_SPACE];  /* ROPS supported for System->System blts */
+        /* the following are the new DirectX 5 members */
+        DWORD dwMaxVideoPorts;  /* maximum number of usable video ports */
+        DWORD dwCurrVideoPorts; /* current number of video ports used */
+        DWORD dwSVBCaps2;       /* more driver specific capabilities for System->Vmem blts */
+        DWORD dwNLVBCaps;       /* driver specific capabilities for non-local->local vidmem blts */
+        DWORD dwNLVBCaps2;      /* more driver specific capabilities non-local->local vidmem blts */
+        DWORD dwNLVBCKeyCaps;   /* driver color key capabilities for non-local->local vidmem blts */
+        DWORD dwNLVBFXCaps;     /* driver FX capabilities for non-local->local blts */
+        DWORD dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
+    } DDCAPS_DX5, *LPDDCAPS_DX5;
+
+    typedef struct _DDCAPS_DX3 {        /* DirectX3 version of caps struct */
+        DWORD dwSize;           /* size of the DDDRIVERCAPS structure */
+        DWORD dwCaps;           /* driver specific capabilities */
+        DWORD dwCaps2;          /* more driver specific capabilites */
+        DWORD dwCKeyCaps;       /* color key capabilities of the surface */
+        DWORD dwFXCaps;         /* driver specific stretching and effects capabilites */
+        DWORD dwFXAlphaCaps;    /* alpha driver specific capabilities */
+        DWORD dwPalCaps;        /* palette capabilities */
+        DWORD dwSVCaps;         /* stereo vision capabilities */
+        DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
+        DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
+        DWORD dwAlphaBltSurfaceBitDepths;       /* DDBD_1,2,4,8 */
+        DWORD dwAlphaOverlayConstBitDepths;     /* DDBD_2,4,8 */
+        DWORD dwAlphaOverlayPixelBitDepths;     /* DDBD_1,2,4,8 */
+        DWORD dwAlphaOverlaySurfaceBitDepths;   /* DDBD_1,2,4,8 */
+        DWORD dwZBufferBitDepths;       /* DDBD_8,16,24,32 */
+        DWORD dwVidMemTotal;    /* total amount of video memory */
+        DWORD dwVidMemFree;     /* amount of free video memory */
+        DWORD dwMaxVisibleOverlays;     /* maximum number of visible overlays */
+        DWORD dwCurrVisibleOverlays;    /* current number of visible overlays */
+        DWORD dwNumFourCCCodes; /* number of four cc codes */
+        DWORD dwAlignBoundarySrc;       /* source rectangle alignment */
+        DWORD dwAlignSizeSrc;   /* source rectangle byte size */
+        DWORD dwAlignBoundaryDest;      /* dest rectangle alignment */
+        DWORD dwAlignSizeDest;  /* dest rectangle byte size */
+        DWORD dwAlignStrideAlign;       /* stride alignment */
+        DWORD dwRops[DD_ROP_SPACE];     /* ROPS supported */
+        DDSCAPS ddsCaps;        /* DDSCAPS structure has all the general capabilities */
+        DWORD dwMinOverlayStretch;      /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxOverlayStretch;      /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMinLiveVideoStretch;    /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxLiveVideoStretch;    /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMinHwCodecStretch;      /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwMaxHwCodecStretch;      /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+        DWORD dwReserved1;
+        DWORD dwReserved2;
+        DWORD dwReserved3;
+        DWORD dwSVBCaps;        /* driver specific capabilities for System->Vmem blts */
+        DWORD dwSVBCKeyCaps;    /* driver color key capabilities for System->Vmem blts */
+        DWORD dwSVBFXCaps;      /* driver FX capabilities for System->Vmem blts */
+        DWORD dwSVBRops[DD_ROP_SPACE];  /* ROPS supported for System->Vmem blts */
+        DWORD dwVSBCaps;        /* driver specific capabilities for Vmem->System blts */
+        DWORD dwVSBCKeyCaps;    /* driver color key capabilities for Vmem->System blts */
+        DWORD dwVSBFXCaps;      /* driver FX capabilities for Vmem->System blts */
+        DWORD dwVSBRops[DD_ROP_SPACE];  /* ROPS supported for Vmem->System blts */
+        DWORD dwSSBCaps;        /* driver specific capabilities for System->System blts */
+        DWORD dwSSBCKeyCaps;    /* driver color key capabilities for System->System blts */
+        DWORD dwSSBFXCaps;      /* driver FX capabilities for System->System blts */
+        DWORD dwSSBRops[DD_ROP_SPACE];  /* ROPS supported for System->System blts */
+        DWORD dwReserved4;
+        DWORD dwReserved5;
+        DWORD dwReserved6;
+    } DDCAPS_DX3, *LPDDCAPS_DX3;
 
 /* set caps struct according to DIRECTDRAW_VERSION */
 
 #if DIRECTDRAW_VERSION <= 0x300
-typedef DDCAPS_DX3 DDCAPS;
+    typedef DDCAPS_DX3 DDCAPS;
 #elif DIRECTDRAW_VERSION <= 0x500
-typedef DDCAPS_DX5 DDCAPS;
+    typedef DDCAPS_DX5 DDCAPS;
 #elif DIRECTDRAW_VERSION <= 0x600
-typedef DDCAPS_DX6 DDCAPS;
+    typedef DDCAPS_DX6 DDCAPS;
 #else
-typedef DDCAPS_DX7 DDCAPS;
+    typedef DDCAPS_DX7 DDCAPS;
 #endif
 
-typedef DDCAPS *LPDDCAPS;
+    typedef DDCAPS *LPDDCAPS;
 
 /* DDCAPS.dwCaps */
 #define DDCAPS_3D			0x00000001
@@ -676,23 +686,21 @@ typedef DDCAPS *LPDDCAPS;
 #define DDCAPS2_STEREO                  0x02000000
 #define DDCAPS2_SYSTONONLOCAL_AS_SYSTOLOCAL   0x04000000
 
-
 /* Set/Get Colour Key Flags */
-#define DDCKEY_COLORSPACE  0x00000001  /* Struct is single colour space */
-#define DDCKEY_DESTBLT     0x00000002  /* To be used as dest for blt */
-#define DDCKEY_DESTOVERLAY 0x00000004  /* To be used as dest for CK overlays */
-#define DDCKEY_SRCBLT      0x00000008  /* To be used as src for blt */
-#define DDCKEY_SRCOVERLAY  0x00000010  /* To be used as src for CK overlays */
-
-typedef struct _DDCOLORKEY
-{
-	DWORD	dwColorSpaceLowValue;/* low boundary of color space that is to
-                                      * be treated as Color Key, inclusive
-				      */
-	DWORD	dwColorSpaceHighValue;/* high boundary of color space that is
-                                       * to be treated as Color Key, inclusive
-				       */
-} DDCOLORKEY,*LPDDCOLORKEY;
+#define DDCKEY_COLORSPACE  0x00000001   /* Struct is single colour space */
+#define DDCKEY_DESTBLT     0x00000002   /* To be used as dest for blt */
+#define DDCKEY_DESTOVERLAY 0x00000004   /* To be used as dest for CK overlays */
+#define DDCKEY_SRCBLT      0x00000008   /* To be used as src for blt */
+#define DDCKEY_SRCOVERLAY  0x00000010   /* To be used as src for CK overlays */
+
+    typedef struct _DDCOLORKEY {
+        DWORD dwColorSpaceLowValue;     /* low boundary of color space that is to
+                                         * be treated as Color Key, inclusive
+                                         */
+        DWORD dwColorSpaceHighValue;    /* high boundary of color space that is
+                                         * to be treated as Color Key, inclusive
+                                         */
+    } DDCOLORKEY, *LPDDCOLORKEY;
 
 /* ddCKEYCAPS bits */
 #define DDCKEYCAPS_DESTBLT			0x00000001
@@ -715,46 +723,46 @@ typedef struct _DDCOLORKEY
 #define DDCKEYCAPS_SRCOVERLAYYUV		0x00020000
 #define DDCKEYCAPS_NOCOSTOVERLAY		0x00040000
 
-typedef struct _DDPIXELFORMAT {
-    DWORD	dwSize;                 /* 0: size of structure */
-    DWORD	dwFlags;                /* 4: pixel format flags */
-    DWORD	dwFourCC;               /* 8: (FOURCC code) */
-    union {
-	DWORD	dwRGBBitCount;          /* C: how many bits per pixel */
-	DWORD	dwYUVBitCount;          /* C: how many bits per pixel */
-	DWORD	dwZBufferBitDepth;      /* C: how many bits for z buffers */
-	DWORD	dwAlphaBitDepth;        /* C: how many bits for alpha channels*/
-	DWORD	dwLuminanceBitCount;
-	DWORD	dwBumpBitCount;
-    } DUMMYUNIONNAME1;
-    union {
-	DWORD	dwRBitMask;             /* 10: mask for red bit*/
-	DWORD	dwYBitMask;             /* 10: mask for Y bits*/
-	DWORD	dwStencilBitDepth;
-	DWORD	dwLuminanceBitMask;
-	DWORD	dwBumpDuBitMask;
-    } DUMMYUNIONNAME2;
-    union {
-	DWORD	dwGBitMask;             /* 14: mask for green bits*/
-	DWORD	dwUBitMask;             /* 14: mask for U bits*/
-	DWORD	dwZBitMask;
-	DWORD	dwBumpDvBitMask;
-    } DUMMYUNIONNAME3;
-    union {
-	DWORD   dwBBitMask;             /* 18: mask for blue bits*/
-	DWORD   dwVBitMask;             /* 18: mask for V bits*/
-	DWORD	dwStencilBitMask;
-	DWORD	dwBumpLuminanceBitMask;
-    } DUMMYUNIONNAME4;
-    union {
-    	DWORD	dwRGBAlphaBitMask;	/* 1C: mask for alpha channel */
-    	DWORD	dwYUVAlphaBitMask;	/* 1C: mask for alpha channel */
-	DWORD	dwLuminanceAlphaBitMask;
-	DWORD	dwRGBZBitMask;		/* 1C: mask for Z channel */
-	DWORD	dwYUVZBitMask;		/* 1C: mask for Z channel */
-    } DUMMYUNIONNAME5;
-    					/* 20: next structure */
-} DDPIXELFORMAT,*LPDDPIXELFORMAT;
+    typedef struct _DDPIXELFORMAT {
+        DWORD dwSize;           /* 0: size of structure */
+        DWORD dwFlags;          /* 4: pixel format flags */
+        DWORD dwFourCC;         /* 8: (FOURCC code) */
+        union {
+            DWORD dwRGBBitCount;        /* C: how many bits per pixel */
+            DWORD dwYUVBitCount;        /* C: how many bits per pixel */
+            DWORD dwZBufferBitDepth;    /* C: how many bits for z buffers */
+            DWORD dwAlphaBitDepth;      /* C: how many bits for alpha channels */
+            DWORD dwLuminanceBitCount;
+            DWORD dwBumpBitCount;
+        } DUMMYUNIONNAME1;
+        union {
+            DWORD dwRBitMask;   /* 10: mask for red bit */
+            DWORD dwYBitMask;   /* 10: mask for Y bits */
+            DWORD dwStencilBitDepth;
+            DWORD dwLuminanceBitMask;
+            DWORD dwBumpDuBitMask;
+        } DUMMYUNIONNAME2;
+        union {
+            DWORD dwGBitMask;   /* 14: mask for green bits */
+            DWORD dwUBitMask;   /* 14: mask for U bits */
+            DWORD dwZBitMask;
+            DWORD dwBumpDvBitMask;
+        } DUMMYUNIONNAME3;
+        union {
+            DWORD dwBBitMask;   /* 18: mask for blue bits */
+            DWORD dwVBitMask;   /* 18: mask for V bits */
+            DWORD dwStencilBitMask;
+            DWORD dwBumpLuminanceBitMask;
+        } DUMMYUNIONNAME4;
+        union {
+            DWORD dwRGBAlphaBitMask;    /* 1C: mask for alpha channel */
+            DWORD dwYUVAlphaBitMask;    /* 1C: mask for alpha channel */
+            DWORD dwLuminanceAlphaBitMask;
+            DWORD dwRGBZBitMask;        /* 1C: mask for Z channel */
+            DWORD dwYUVZBitMask;        /* 1C: mask for Z channel */
+        } DUMMYUNIONNAME5;
+        /* 20: next structure */
+    } DDPIXELFORMAT, *LPDDPIXELFORMAT;
 
 /* DDCAPS.dwFXCaps */
 #define DDFXCAPS_BLTALPHA               0x00000001
@@ -815,7 +823,7 @@ typedef struct _DDPIXELFORMAT {
 
 /* DDCAPS.dwSVCaps */
 /* the first 4 of these are now obsolete */
-#if DIRECTDRAW_VERSION >= 0x700	/* FIXME: I'm not sure when this switch occured */
+#if DIRECTDRAW_VERSION >= 0x700 /* FIXME: I'm not sure when this switch occured */
 #define DDSVCAPS_RESERVED1		0x00000001
 #define DDSVCAPS_RESERVED2		0x00000002
 #define DDSVCAPS_RESERVED3		0x00000004
@@ -902,7 +910,6 @@ typedef struct _DDPIXELFORMAT {
 #define DDSCL_FPUSETUP                  0x00000800
 #define DDSCL_FPUPRESERVE               0x00001000
 
-
 /* DDSURFACEDESC.dwFlags */
 #define	DDSD_CAPS		0x00000001
 #define	DDSD_HEIGHT		0x00000002
@@ -945,67 +952,65 @@ typedef struct _DDPIXELFORMAT {
 #define DDWAITVB_BLOCKBEGINEVENT	0x00000002
 #define DDWAITVB_BLOCKEND		0x00000004
 
-typedef struct _DDSURFACEDESC
-{
-	DWORD	dwSize;		/* 0: size of the DDSURFACEDESC structure*/
-	DWORD	dwFlags;	/* 4: determines what fields are valid*/
-	DWORD	dwHeight;	/* 8: height of surface to be created*/
-	DWORD	dwWidth;	/* C: width of input surface*/
-	union {
-		LONG	lPitch;	/* 10: distance to start of next line (return value only)*/
-		DWORD	dwLinearSize;
-	} DUMMYUNIONNAME1;
-	DWORD	dwBackBufferCount;/* 14: number of back buffers requested*/
-	union {
-		DWORD	dwMipMapCount;/* 18:number of mip-map levels requested*/
-		DWORD	dwZBufferBitDepth;/*18: depth of Z buffer requested*/
-		DWORD	dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
-	} DUMMYUNIONNAME2;		
-	DWORD	dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/
-	DWORD	dwReserved;	/* 20:reserved*/
-	LPVOID	lpSurface;	/* 24:pointer to the associated surface memory*/
-	DDCOLORKEY	ddckCKDestOverlay;/* 28: CK for dest overlay use*/
-	DDCOLORKEY	ddckCKDestBlt;	/* 30: CK for destination blt use*/
-	DDCOLORKEY	ddckCKSrcOverlay;/* 38: CK for source overlay use*/
-	DDCOLORKEY	ddckCKSrcBlt;	/* 40: CK for source blt use*/
-	DDPIXELFORMAT	ddpfPixelFormat;/* 48: pixel format description of the surface*/
-	DDSCAPS		ddsCaps;	/* 68: direct draw surface caps */
-} DDSURFACEDESC,*LPDDSURFACEDESC;
-
-typedef struct _DDSURFACEDESC2
-{
-	DWORD	dwSize;		/* 0: size of the DDSURFACEDESC structure*/
-	DWORD	dwFlags;	/* 4: determines what fields are valid*/
-	DWORD	dwHeight;	/* 8: height of surface to be created*/
-	DWORD	dwWidth;	/* C: width of input surface*/
-	union {
-		LONG	lPitch;	      /*10: distance to start of next line (return value only)*/
-		DWORD   dwLinearSize; /*10: formless late-allocated optimized surface size */
-	} DUMMYUNIONNAME1;
-	DWORD	dwBackBufferCount;/* 14: number of back buffers requested*/
-	union {
-		DWORD	dwMipMapCount;/* 18:number of mip-map levels requested*/
-		DWORD	dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
-		DWORD   dwSrcVBHandle;/* 18:source used in VB::Optimize */
-	} DUMMYUNIONNAME2;
-	DWORD	dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/
-	DWORD	dwReserved;	/* 20:reserved*/
-	LPVOID	lpSurface;	/* 24:pointer to the associated surface memory*/
-	union {
-		DDCOLORKEY	ddckCKDestOverlay; /* 28: CK for dest overlay use*/
-		DWORD 		dwEmptyFaceColor;  /* 28: color for empty cubemap faces */
-	} DUMMYUNIONNAME3;
-	DDCOLORKEY	ddckCKDestBlt;	/* 30: CK for destination blt use*/
-	DDCOLORKEY	ddckCKSrcOverlay;/* 38: CK for source overlay use*/
-	DDCOLORKEY	ddckCKSrcBlt;	/* 40: CK for source blt use*/
-
-	union {
-		DDPIXELFORMAT	ddpfPixelFormat;/* 48: pixel format description of the surface*/
-		DWORD 		dwFVF;	/* 48: vertex format description of vertex buffers */	
-	} DUMMYUNIONNAME4;
-	DDSCAPS2	ddsCaps;  /* 68: DDraw surface caps */
-	DWORD		dwTextureStage; /* 78: stage in multitexture cascade */
-} DDSURFACEDESC2,*LPDDSURFACEDESC2;
+    typedef struct _DDSURFACEDESC {
+        DWORD dwSize;           /* 0: size of the DDSURFACEDESC structure */
+        DWORD dwFlags;          /* 4: determines what fields are valid */
+        DWORD dwHeight;         /* 8: height of surface to be created */
+        DWORD dwWidth;          /* C: width of input surface */
+        union {
+            LONG lPitch;        /* 10: distance to start of next line (return value only) */
+            DWORD dwLinearSize;
+        } DUMMYUNIONNAME1;
+        DWORD dwBackBufferCount;        /* 14: number of back buffers requested */
+        union {
+            DWORD dwMipMapCount;        /* 18:number of mip-map levels requested */
+            DWORD dwZBufferBitDepth;    /*18: depth of Z buffer requested */
+            DWORD dwRefreshRate;        /* 18:refresh rate (used when display mode is described) */
+        } DUMMYUNIONNAME2;
+        DWORD dwAlphaBitDepth;  /* 1C:depth of alpha buffer requested */
+        DWORD dwReserved;       /* 20:reserved */
+        LPVOID lpSurface;       /* 24:pointer to the associated surface memory */
+        DDCOLORKEY ddckCKDestOverlay;   /* 28: CK for dest overlay use */
+        DDCOLORKEY ddckCKDestBlt;       /* 30: CK for destination blt use */
+        DDCOLORKEY ddckCKSrcOverlay;    /* 38: CK for source overlay use */
+        DDCOLORKEY ddckCKSrcBlt;        /* 40: CK for source blt use */
+        DDPIXELFORMAT ddpfPixelFormat;  /* 48: pixel format description of the surface */
+        DDSCAPS ddsCaps;        /* 68: direct draw surface caps */
+    } DDSURFACEDESC, *LPDDSURFACEDESC;
+
+    typedef struct _DDSURFACEDESC2 {
+        DWORD dwSize;           /* 0: size of the DDSURFACEDESC structure */
+        DWORD dwFlags;          /* 4: determines what fields are valid */
+        DWORD dwHeight;         /* 8: height of surface to be created */
+        DWORD dwWidth;          /* C: width of input surface */
+        union {
+            LONG lPitch;        /*10: distance to start of next line (return value only) */
+            DWORD dwLinearSize; /*10: formless late-allocated optimized surface size */
+        } DUMMYUNIONNAME1;
+        DWORD dwBackBufferCount;        /* 14: number of back buffers requested */
+        union {
+            DWORD dwMipMapCount;        /* 18:number of mip-map levels requested */
+            DWORD dwRefreshRate;        /* 18:refresh rate (used when display mode is described) */
+            DWORD dwSrcVBHandle;        /* 18:source used in VB::Optimize */
+        } DUMMYUNIONNAME2;
+        DWORD dwAlphaBitDepth;  /* 1C:depth of alpha buffer requested */
+        DWORD dwReserved;       /* 20:reserved */
+        LPVOID lpSurface;       /* 24:pointer to the associated surface memory */
+        union {
+            DDCOLORKEY ddckCKDestOverlay;       /* 28: CK for dest overlay use */
+            DWORD dwEmptyFaceColor;     /* 28: color for empty cubemap faces */
+        } DUMMYUNIONNAME3;
+        DDCOLORKEY ddckCKDestBlt;       /* 30: CK for destination blt use */
+        DDCOLORKEY ddckCKSrcOverlay;    /* 38: CK for source overlay use */
+        DDCOLORKEY ddckCKSrcBlt;        /* 40: CK for source blt use */
+
+        union {
+            DDPIXELFORMAT ddpfPixelFormat;      /* 48: pixel format description of the surface */
+            DWORD dwFVF;        /* 48: vertex format description of vertex buffers */
+        } DUMMYUNIONNAME4;
+        DDSCAPS2 ddsCaps;       /* 68: DDraw surface caps */
+        DWORD dwTextureStage;   /* 78: stage in multitexture cascade */
+    } DDSURFACEDESC2, *LPDDSURFACEDESC2;
 
 /* DDCOLORCONTROL.dwFlags */
 #define DDCOLOR_BRIGHTNESS	0x00000001
@@ -1016,41 +1021,52 @@ typedef struct _DDSURFACEDESC2
 #define DDCOLOR_GAMMA		0x00000020
 #define DDCOLOR_COLORENABLE	0x00000040
 
-typedef struct {
-	DWORD	dwSize;
-	DWORD	dwFlags;
-	LONG	lBrightness;
-	LONG	lContrast;
-	LONG	lHue;
-	LONG	lSaturation;
-	LONG	lSharpness;
-	LONG	lGamma;
-	LONG	lColorEnable;
-	DWORD	dwReserved1;
-} DDCOLORCONTROL,*LPDDCOLORCONTROL;
-
-typedef struct {
-	WORD	red[256];
-	WORD	green[256];
-	WORD	blue[256];
-} DDGAMMARAMP,*LPDDGAMMARAMP;
-
-typedef BOOL CALLBACK (*LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
-typedef BOOL CALLBACK (*LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
-DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
-
-typedef HRESULT CALLBACK (*LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
-typedef HRESULT CALLBACK (*LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID);
-typedef HRESULT CALLBACK (*LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
-typedef HRESULT CALLBACK (*LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID);
-typedef HRESULT CALLBACK (*LPDDENUMSURFACESCALLBACK7)(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2, LPVOID);
-
-typedef BOOL CALLBACK (*LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
-typedef BOOL CALLBACK (*LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
-DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
-
-HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
-HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
+    typedef struct {
+        DWORD dwSize;
+        DWORD dwFlags;
+        LONG lBrightness;
+        LONG lContrast;
+        LONG lHue;
+        LONG lSaturation;
+        LONG lSharpness;
+        LONG lGamma;
+        LONG lColorEnable;
+        DWORD dwReserved1;
+    } DDCOLORCONTROL, *LPDDCOLORCONTROL;
+
+    typedef struct {
+        WORD red[256];
+        WORD green[256];
+        WORD blue[256];
+    } DDGAMMARAMP, *LPDDGAMMARAMP;
+
+    typedef BOOL CALLBACK(*LPDDENUMCALLBACKA) (GUID *, LPSTR, LPSTR, LPVOID);
+    typedef BOOL CALLBACK(*LPDDENUMCALLBACKW) (GUID *, LPWSTR, LPWSTR, LPVOID);
+     DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
+
+    typedef HRESULT CALLBACK(*LPDDENUMMODESCALLBACK) (LPDDSURFACEDESC, LPVOID);
+    typedef HRESULT CALLBACK(*LPDDENUMMODESCALLBACK2) (LPDDSURFACEDESC2,
+                                                       LPVOID);
+    typedef HRESULT CALLBACK(*LPDDENUMSURFACESCALLBACK) (LPDIRECTDRAWSURFACE,
+                                                         LPDDSURFACEDESC,
+                                                         LPVOID);
+    typedef HRESULT CALLBACK(*LPDDENUMSURFACESCALLBACK2) (LPDIRECTDRAWSURFACE4,
+                                                          LPDDSURFACEDESC2,
+                                                          LPVOID);
+    typedef HRESULT CALLBACK(*LPDDENUMSURFACESCALLBACK7) (LPDIRECTDRAWSURFACE7,
+                                                          LPDDSURFACEDESC2,
+                                                          LPVOID);
+
+    typedef BOOL CALLBACK(*LPDDENUMCALLBACKEXA) (GUID *, LPSTR, LPSTR, LPVOID,
+                                                 HMONITOR);
+    typedef BOOL CALLBACK(*LPDDENUMCALLBACKEXW) (GUID *, LPWSTR, LPWSTR, LPVOID,
+                                                 HMONITOR);
+     DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
+
+    HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA lpCallback,
+                                          LPVOID lpContext, DWORD dwFlags);
+    HRESULT WINAPI DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW lpCallback,
+                                          LPVOID lpContext, DWORD dwFlags);
 #define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx)
 
 /* flags for DirectDrawEnumerateEx */
@@ -1062,54 +1078,48 @@ HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lp
 #define DDCREATE_HARDWAREONLY	1L
 #define DDCREATE_EMULATIONONLY	2L
 
-typedef struct _DDBLTFX
-{
-    DWORD       dwSize;                         /* size of structure */
-    DWORD       dwDDFX;                         /* FX operations */
-    DWORD       dwROP;                          /* Win32 raster operations */
-    DWORD       dwDDROP;                        /* Raster operations new for DirectDraw */
-    DWORD       dwRotationAngle;                /* Rotation angle for blt */
-    DWORD       dwZBufferOpCode;                /* ZBuffer compares */
-    DWORD       dwZBufferLow;                   /* Low limit of Z buffer */
-    DWORD       dwZBufferHigh;                  /* High limit of Z buffer */
-    DWORD       dwZBufferBaseDest;              /* Destination base value */
-    DWORD       dwZDestConstBitDepth;           /* Bit depth used to specify Z constant for destination */
-    union
-    {
-        DWORD   dwZDestConst;                   /* Constant to use as Z buffer for dest */
-        LPDIRECTDRAWSURFACE lpDDSZBufferDest;   /* Surface to use as Z buffer for dest */
-    } DUMMYUNIONNAME1;
-    DWORD       dwZSrcConstBitDepth;            /* Bit depth used to specify Z constant for source */
-    union
-    {
-        DWORD   dwZSrcConst;                    /* Constant to use as Z buffer for src */
-        LPDIRECTDRAWSURFACE lpDDSZBufferSrc;    /* Surface to use as Z buffer for src */
-    } DUMMYUNIONNAME2;
-    DWORD       dwAlphaEdgeBlendBitDepth;       /* Bit depth used to specify constant for alpha edge blend */
-    DWORD       dwAlphaEdgeBlend;               /* Alpha for edge blending */
-    DWORD       dwReserved;
-    DWORD       dwAlphaDestConstBitDepth;       /* Bit depth used to specify alpha constant for destination */
-    union
-    {
-        DWORD   dwAlphaDestConst;               /* Constant to use as Alpha Channel */
-        LPDIRECTDRAWSURFACE lpDDSAlphaDest;     /* Surface to use as Alpha Channel */
-    } DUMMYUNIONNAME3;
-    DWORD       dwAlphaSrcConstBitDepth;        /* Bit depth used to specify alpha constant for source */
-    union
-    {
-        DWORD   dwAlphaSrcConst;                /* Constant to use as Alpha Channel */
-        LPDIRECTDRAWSURFACE lpDDSAlphaSrc;      /* Surface to use as Alpha Channel */
-    } DUMMYUNIONNAME4;
-    union
-    {
-        DWORD   dwFillColor;                    /* color in RGB or Palettized */
-        DWORD   dwFillDepth;                    /* depth value for z-buffer */
-	DWORD   dwFillPixel;			/* pixel val for RGBA or RGBZ */
-        LPDIRECTDRAWSURFACE lpDDSPattern;       /* Surface to use as pattern */
-    } DUMMYUNIONNAME5;
-    DDCOLORKEY  ddckDestColorkey;               /* DestColorkey override */
-    DDCOLORKEY  ddckSrcColorkey;                /* SrcColorkey override */
-} DDBLTFX,*LPDDBLTFX;
+    typedef struct _DDBLTFX {
+        DWORD dwSize;           /* size of structure */
+        DWORD dwDDFX;           /* FX operations */
+        DWORD dwROP;            /* Win32 raster operations */
+        DWORD dwDDROP;          /* Raster operations new for DirectDraw */
+        DWORD dwRotationAngle;  /* Rotation angle for blt */
+        DWORD dwZBufferOpCode;  /* ZBuffer compares */
+        DWORD dwZBufferLow;     /* Low limit of Z buffer */
+        DWORD dwZBufferHigh;    /* High limit of Z buffer */
+        DWORD dwZBufferBaseDest;        /* Destination base value */
+        DWORD dwZDestConstBitDepth;     /* Bit depth used to specify Z constant for destination */
+        union {
+            DWORD dwZDestConst; /* Constant to use as Z buffer for dest */
+            LPDIRECTDRAWSURFACE lpDDSZBufferDest;       /* Surface to use as Z buffer for dest */
+        } DUMMYUNIONNAME1;
+        DWORD dwZSrcConstBitDepth;      /* Bit depth used to specify Z constant for source */
+        union {
+            DWORD dwZSrcConst;  /* Constant to use as Z buffer for src */
+            LPDIRECTDRAWSURFACE lpDDSZBufferSrc;        /* Surface to use as Z buffer for src */
+        } DUMMYUNIONNAME2;
+        DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */
+        DWORD dwAlphaEdgeBlend; /* Alpha for edge blending */
+        DWORD dwReserved;
+        DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */
+        union {
+            DWORD dwAlphaDestConst;     /* Constant to use as Alpha Channel */
+            LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as Alpha Channel */
+        } DUMMYUNIONNAME3;
+        DWORD dwAlphaSrcConstBitDepth;  /* Bit depth used to specify alpha constant for source */
+        union {
+            DWORD dwAlphaSrcConst;      /* Constant to use as Alpha Channel */
+            LPDIRECTDRAWSURFACE lpDDSAlphaSrc;  /* Surface to use as Alpha Channel */
+        } DUMMYUNIONNAME4;
+        union {
+            DWORD dwFillColor;  /* color in RGB or Palettized */
+            DWORD dwFillDepth;  /* depth value for z-buffer */
+            DWORD dwFillPixel;  /* pixel val for RGBA or RGBZ */
+            LPDIRECTDRAWSURFACE lpDDSPattern;   /* Surface to use as pattern */
+        } DUMMYUNIONNAME5;
+        DDCOLORKEY ddckDestColorkey;    /* DestColorkey override */
+        DDCOLORKEY ddckSrcColorkey;     /* SrcColorkey override */
+    } DDBLTFX, *LPDDBLTFX;
 
 /* dwDDFX */
 /* arithmetic stretching along y axis */
@@ -1131,79 +1141,78 @@ typedef struct _DDBLTFX
 /* add dwZBufferBaseDest to every source z value before compare */
 #define DDBLTFX_ZBUFFERBASEDEST			0x00000100
 
-typedef struct _DDOVERLAYFX
-{
-    DWORD       dwSize;                         /* size of structure */
-    DWORD       dwAlphaEdgeBlendBitDepth;       /* Bit depth used to specify constant for alpha edge blend */
-    DWORD       dwAlphaEdgeBlend;               /* Constant to use as alpha for edge blend */
-    DWORD       dwReserved;
-    DWORD       dwAlphaDestConstBitDepth;       /* Bit depth used to specify alpha constant for destination */
-    union
-    {
-        DWORD   dwAlphaDestConst;               /* Constant to use as alpha channel for dest */
-        LPDIRECTDRAWSURFACE lpDDSAlphaDest;     /* Surface to use as alpha channel for dest */
-    } DUMMYUNIONNAME1;
-    DWORD       dwAlphaSrcConstBitDepth;        /* Bit depth used to specify alpha constant for source */
-    union
-    {
-        DWORD   dwAlphaSrcConst;                /* Constant to use as alpha channel for src */
-        LPDIRECTDRAWSURFACE lpDDSAlphaSrc;      /* Surface to use as alpha channel for src */
-    } DUMMYUNIONNAME2;
-    DDCOLORKEY  dckDestColorkey;                /* DestColorkey override */
-    DDCOLORKEY  dckSrcColorkey;                 /* DestColorkey override */
-    DWORD       dwDDFX;                         /* Overlay FX */
-    DWORD       dwFlags;                        /* flags */
-} DDOVERLAYFX,*LPDDOVERLAYFX;
-
-typedef struct _DDBLTBATCH
-{
-    LPRECT		lprDest;
-    LPDIRECTDRAWSURFACE	lpDDSSrc;
-    LPRECT		lprSrc;
-    DWORD		dwFlags;
-    LPDDBLTFX		lpDDBltFx;
-} DDBLTBATCH,*LPDDBLTBATCH;
+    typedef struct _DDOVERLAYFX {
+        DWORD dwSize;           /* size of structure */
+        DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */
+        DWORD dwAlphaEdgeBlend; /* Constant to use as alpha for edge blend */
+        DWORD dwReserved;
+        DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */
+        union {
+            DWORD dwAlphaDestConst;     /* Constant to use as alpha channel for dest */
+            LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as alpha channel for dest */
+        } DUMMYUNIONNAME1;
+        DWORD dwAlphaSrcConstBitDepth;  /* Bit depth used to specify alpha constant for source */
+        union {
+            DWORD dwAlphaSrcConst;      /* Constant to use as alpha channel for src */
+            LPDIRECTDRAWSURFACE lpDDSAlphaSrc;  /* Surface to use as alpha channel for src */
+        } DUMMYUNIONNAME2;
+        DDCOLORKEY dckDestColorkey;     /* DestColorkey override */
+        DDCOLORKEY dckSrcColorkey;      /* DestColorkey override */
+        DWORD dwDDFX;           /* Overlay FX */
+        DWORD dwFlags;          /* flags */
+    } DDOVERLAYFX, *LPDDOVERLAYFX;
+
+    typedef struct _DDBLTBATCH {
+        LPRECT lprDest;
+        LPDIRECTDRAWSURFACE lpDDSSrc;
+        LPRECT lprSrc;
+        DWORD dwFlags;
+        LPDDBLTFX lpDDBltFx;
+    } DDBLTBATCH, *LPDDBLTBATCH;
 
 #define MAX_DDDEVICEID_STRING          512
 
-typedef struct tagDDDEVICEIDENTIFIER {
-  char    szDriver[MAX_DDDEVICEID_STRING];
-  char    szDescription[MAX_DDDEVICEID_STRING];
-  LARGE_INTEGER  liDriverVersion;
-  DWORD   dwVendorId;
-  DWORD   dwDeviceId;
-  DWORD   dwSubSysId;
-  DWORD   dwRevision;
-  GUID    guidDeviceIdentifier;
-} DDDEVICEIDENTIFIER, * LPDDDEVICEIDENTIFIER;
-
-typedef struct tagDDDEVICEIDENTIFIER2 {
-  char    szDriver[MAX_DDDEVICEID_STRING];	/* user readable driver name */
-  char    szDescription[MAX_DDDEVICEID_STRING]; /* user readable description */
-  LARGE_INTEGER  liDriverVersion;		/* driver version */
-  DWORD   dwVendorId;				/* vendor ID, zero if unknown */
-  DWORD   dwDeviceId;				/* chipset ID, zero if unknown */
-  DWORD   dwSubSysId;				/* board ID, zero if unknown */
-  DWORD   dwRevision;				/* chipset version, zero if unknown */
-  GUID    guidDeviceIdentifier;			/* unique ID for this driver/chipset combination */
-  DWORD   dwWHQLLevel;				/* Windows Hardware Quality Lab certification level */
-} DDDEVICEIDENTIFIER2, * LPDDDEVICEIDENTIFIER2;
+    typedef struct tagDDDEVICEIDENTIFIER {
+        char szDriver[MAX_DDDEVICEID_STRING];
+        char szDescription[MAX_DDDEVICEID_STRING];
+        LARGE_INTEGER liDriverVersion;
+        DWORD dwVendorId;
+        DWORD dwDeviceId;
+        DWORD dwSubSysId;
+        DWORD dwRevision;
+        GUID guidDeviceIdentifier;
+    } DDDEVICEIDENTIFIER, *LPDDDEVICEIDENTIFIER;
+
+    typedef struct tagDDDEVICEIDENTIFIER2 {
+        char szDriver[MAX_DDDEVICEID_STRING];   /* user readable driver name */
+        char szDescription[MAX_DDDEVICEID_STRING];      /* user readable description */
+        LARGE_INTEGER liDriverVersion;  /* driver version */
+        DWORD dwVendorId;       /* vendor ID, zero if unknown */
+        DWORD dwDeviceId;       /* chipset ID, zero if unknown */
+        DWORD dwSubSysId;       /* board ID, zero if unknown */
+        DWORD dwRevision;       /* chipset version, zero if unknown */
+        GUID guidDeviceIdentifier;      /* unique ID for this driver/chipset combination */
+        DWORD dwWHQLLevel;      /* Windows Hardware Quality Lab certification level */
+    } DDDEVICEIDENTIFIER2, *LPDDDEVICEIDENTIFIER2;
 
 /*****************************************************************************
  * IDirectDrawPalette interface
  */
 #undef INTERFACE
 #define INTERFACE IDirectDrawPalette
-DECLARE_INTERFACE_(IDirectDrawPalette,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(GetCaps)(THIS_ LPDWORD lpdwCaps) PURE;
-    STDMETHOD(GetEntries)(THIS_ DWORD dwFlags, DWORD dwBase, DWORD dwNumEntries, LPPALETTEENTRY lpEntries) PURE;
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags, LPPALETTEENTRY lpDDColorTable) PURE;
-    STDMETHOD(SetEntries)(THIS_ DWORD dwFlags, DWORD dwStartingEntry, DWORD dwCount, LPPALETTEENTRY lpEntries) PURE;
-};
+     DECLARE_INTERFACE_(IDirectDrawPalette, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, PVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(GetCaps) (THIS_ LPDWORD lpdwCaps) PURE;
+        STDMETHOD(GetEntries) (THIS_ DWORD dwFlags, DWORD dwBase,
+                               DWORD dwNumEntries,
+                               LPPALETTEENTRY lpEntries) PURE;
+        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags,
+                               LPPALETTEENTRY lpDDColorTable) PURE;
+        STDMETHOD(SetEntries) (THIS_ DWORD dwFlags, DWORD dwStartingEntry,
+                               DWORD dwCount, LPPALETTEENTRY lpEntries) PURE;
+    };
 
     /*** IUnknown methods ***/
 #define IDirectDrawPalette_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
@@ -1215,24 +1224,23 @@ DECLARE_INTERFACE_(IDirectDrawPalette,IUnknown)
 #define IDirectDrawPalette_Initialize(p,a,b,c)   ICOM_CALL_(Initialize,p,(p,a,b,c))
 #define IDirectDrawPalette_SetEntries(p,a,b,c,d) ICOM_CALL_(SetEntries,p,(p,a,b,c,d))
 
-
 /*****************************************************************************
  * IDirectDrawClipper interface
  */
 #undef INTERFACE
 #define INTERFACE IDirectDrawClipper
-DECLARE_INTERFACE_(IDirectDrawClipper,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(GetClipList)(THIS_ LPRECT lpRect, LPRGNDATA lpClipList, LPDWORD lpdwSize) PURE;
-    STDMETHOD(GetHWnd)(THIS_ HWND* lphWnd) PURE;
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags) PURE;
-    STDMETHOD(IsClipListChanged)(THIS_ BOOL* lpbChanged) PURE;
-    STDMETHOD(SetClipList)(THIS_ LPRGNDATA lpClipList, DWORD dwFlags) PURE;
-    STDMETHOD(SetHWnd)(THIS_ DWORD dwFlags, HWND hWnd) PURE;
-};
+    DECLARE_INTERFACE_(IDirectDrawClipper, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(GetClipList) (THIS_ LPRECT lpRect, LPRGNDATA lpClipList,
+                                LPDWORD lpdwSize) PURE;
+        STDMETHOD(GetHWnd) (THIS_ HWND * lphWnd) PURE;
+        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags) PURE;
+        STDMETHOD(IsClipListChanged) (THIS_ BOOL * lpbChanged) PURE;
+        STDMETHOD(SetClipList) (THIS_ LPRGNDATA lpClipList, DWORD dwFlags) PURE;
+        STDMETHOD(SetHWnd) (THIS_ DWORD dwFlags, HWND hWnd) PURE;
+    };
 
     /*** IUnknown methods ***/
 #define IDirectDrawClipper_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
@@ -1246,38 +1254,56 @@ DECLARE_INTERFACE_(IDirectDrawClipper,IUnknown)
 #define IDirectDrawClipper_SetClipList(p,a,b)     ICOM_CALL_(SetClipList,p,(p,a,b))
 #define IDirectDrawClipper_SetHWnd(p,a,b)         ICOM_CALL_(SetHWnd,p,(p,a,b))
 
-
 /*****************************************************************************
  * IDirectDraw interface
  */
 #undef INTERFACE
 #define INTERFACE IDirectDraw
-DECLARE_INTERFACE_(IDirectDraw,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(Compact)(THIS) PURE;
-    STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, IUnknown* pUnkOuter) PURE;
-    STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE* lplpDDPalette, IUnknown* pUnkOuter) PURE;
-    STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE* lplpDDSurface, IUnknown* pUnkOuter) PURE;
-    STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE* lplpDupDDSurface) PURE;
-    STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE;
-    STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
-    STDMETHOD(FlipToGDISurface)(THIS) PURE;
-    STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
-    STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-    STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
-    STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE* lplpGDIDDSurface) PURE;
-    STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
-    STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
-    STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL* lpbIsInVB) PURE;
-    STDMETHOD(Initialize)(THIS_ GUID* lpGUID) PURE;
-    STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
-    STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD, DWORD) PURE;
-    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
-};
+    DECLARE_INTERFACE_(IDirectDraw, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(Compact) (THIS) PURE;
+        STDMETHOD(CreateClipper) (THIS_ DWORD dwFlags,
+                                  LPDIRECTDRAWCLIPPER * lplpDDClipper,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(CreatePalette) (THIS_ DWORD dwFlags,
+                                  LPPALETTEENTRY lpColorTable,
+                                  LPDIRECTDRAWPALETTE * lplpDDPalette,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(CreateSurface) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc,
+                                  LPDIRECTDRAWSURFACE * lplpDDSurface,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(DuplicateSurface) (THIS_ LPDIRECTDRAWSURFACE lpDDSurface,
+                                     LPDIRECTDRAWSURFACE *
+                                     lplpDupDDSurface) PURE;
+        STDMETHOD(EnumDisplayModes) (THIS_ DWORD dwFlags,
+                                     LPDDSURFACEDESC lpDDSurfaceDesc,
+                                     LPVOID lpContext,
+                                     LPDDENUMMODESCALLBACK lpEnumModesCallback)
+            PURE;
+        STDMETHOD(EnumSurfaces) (THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD,
+                                 LPVOID lpContext,
+                                 LPDDENUMSURFACESCALLBACK
+                                 lpEnumSurfacesCallback) PURE;
+        STDMETHOD(FlipToGDISurface) (THIS) PURE;
+        STDMETHOD(GetCaps) (THIS_ LPDDCAPS lpDDDriverCaps,
+                            LPDDCAPS lpDDHELCaps) PURE;
+        STDMETHOD(GetDisplayMode) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+        STDMETHOD(GetFourCCCodes) (THIS_ LPDWORD lpNumCodes,
+                                   LPDWORD lpCodes) PURE;
+        STDMETHOD(GetGDISurface) (THIS_ LPDIRECTDRAWSURFACE *
+                                  lplpGDIDDSurface) PURE;
+        STDMETHOD(GetMonitorFrequency) (THIS_ LPDWORD lpdwFrequency) PURE;
+        STDMETHOD(GetScanLine) (THIS_ LPDWORD lpdwScanLine) PURE;
+        STDMETHOD(GetVerticalBlankStatus) (THIS_ BOOL * lpbIsInVB) PURE;
+        STDMETHOD(Initialize) (THIS_ GUID * lpGUID) PURE;
+        STDMETHOD(RestoreDisplayMode) (THIS) PURE;
+        STDMETHOD(SetCooperativeLevel) (THIS_ HWND hWnd, DWORD dwFlags) PURE;
+        STDMETHOD(SetDisplayMode) (THIS_ DWORD, DWORD, DWORD) PURE;
+        STDMETHOD(WaitForVerticalBlank) (THIS_ DWORD dwFlags,
+                                         HANDLE hEvent) PURE;
+    };
 
     /*** IUnknown methods ***/
 #define IDirectDraw_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
@@ -1305,7 +1331,6 @@ DECLARE_INTERFACE_(IDirectDraw,IUnknown)
 #define IDirectDraw_SetDisplayMode(p,a,b,c)     ICOM_CALL_(SetDisplayMode,p,(p,a,b,c))
 #define IDirectDraw_WaitForVerticalBlank(p,a,b) ICOM_CALL_(WaitForVerticalBlank,p,(p,a,b))
 
-
 /* flags for Lock() */
 #define DDLOCK_SURFACEMEMORYPTR	0x00000000
 #define DDLOCK_WAIT		0x00000001
@@ -1314,7 +1339,6 @@ DECLARE_INTERFACE_(IDirectDraw,IUnknown)
 #define DDLOCK_WRITEONLY	0x00000020
 #define DDLOCK_NOSYSLOCK	0x00000800
 
-
 /*****************************************************************************
  * IDirectDraw2 interface
  */
@@ -1323,34 +1347,57 @@ DECLARE_INTERFACE_(IDirectDraw,IUnknown)
  */
 #undef INTERFACE
 #define INTERFACE IDirectDraw2
-DECLARE_INTERFACE_(IDirectDraw2,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(Compact)(THIS) PURE; 
-    STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE* lplpDDPalette, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE2* lplpDDSurface, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSurface, LPDIRECTDRAWSURFACE2* lplpDupDDSurface) PURE; 
-    STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE; 
-    STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(FlipToGDISurface)(THIS) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; 
-    STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; 
-    STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE2* lplpGDIDDSurface) PURE; 
-    STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; 
-    STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; 
-    STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL* lpbIsInVB) PURE; 
-    STDMETHOD(Initialize)(THIS_ GUID* lpGUID) PURE; 
-    STDMETHOD(RestoreDisplayMode)(THIS) PURE; 
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE; 
-    STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; 
-    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; 
-           
-    STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE;
-};
+    DECLARE_INTERFACE_(IDirectDraw2, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(Compact) (THIS) PURE;
+        STDMETHOD(CreateClipper) (THIS_ DWORD dwFlags,
+                                  LPDIRECTDRAWCLIPPER * lplpDDClipper,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(CreatePalette) (THIS_ DWORD dwFlags,
+                                  LPPALETTEENTRY lpColorTable,
+                                  LPDIRECTDRAWPALETTE * lplpDDPalette,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(CreateSurface) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc,
+                                  LPDIRECTDRAWSURFACE2 * lplpDDSurface,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(DuplicateSurface) (THIS_ LPDIRECTDRAWSURFACE2 lpDDSurface,
+                                     LPDIRECTDRAWSURFACE2 *
+                                     lplpDupDDSurface) PURE;
+        STDMETHOD(EnumDisplayModes) (THIS_ DWORD dwFlags,
+                                     LPDDSURFACEDESC lpDDSurfaceDesc,
+                                     LPVOID lpContext,
+                                     LPDDENUMMODESCALLBACK lpEnumModesCallback)
+            PURE;
+        STDMETHOD(EnumSurfaces) (THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD,
+                                 LPVOID lpContext,
+                                 LPDDENUMSURFACESCALLBACK
+                                 lpEnumSurfacesCallback) PURE;
+        STDMETHOD(FlipToGDISurface) (THIS) PURE;
+        STDMETHOD(GetCaps) (THIS_ LPDDCAPS lpDDDriverCaps,
+                            LPDDCAPS lpDDHELCaps) PURE;
+        STDMETHOD(GetDisplayMode) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+        STDMETHOD(GetFourCCCodes) (THIS_ LPDWORD lpNumCodes,
+                                   LPDWORD lpCodes) PURE;
+        STDMETHOD(GetGDISurface) (THIS_ LPDIRECTDRAWSURFACE2 *
+                                  lplpGDIDDSurface) PURE;
+        STDMETHOD(GetMonitorFrequency) (THIS_ LPDWORD lpdwFrequency) PURE;
+        STDMETHOD(GetScanLine) (THIS_ LPDWORD lpdwScanLine) PURE;
+        STDMETHOD(GetVerticalBlankStatus) (THIS_ BOOL * lpbIsInVB) PURE;
+        STDMETHOD(Initialize) (THIS_ GUID * lpGUID) PURE;
+        STDMETHOD(RestoreDisplayMode) (THIS) PURE;
+        STDMETHOD(SetCooperativeLevel) (THIS_ HWND hWnd, DWORD dwFlags) PURE;
+        STDMETHOD(SetDisplayMode) (THIS_ DWORD dwWidth, DWORD dwHeight,
+                                   DWORD dwBPP, DWORD dwRefreshRate,
+                                   DWORD dwFlags) PURE;
+        STDMETHOD(WaitForVerticalBlank) (THIS_ DWORD dwFlags,
+                                         HANDLE hEvent) PURE;
+
+        STDMETHOD(GetAvailableVidMem) (THIS_ LPDDSCAPS lpDDCaps,
+                                       LPDWORD lpdwTotal,
+                                       LPDWORD lpdwFree) PURE;
+    };
 
     /*** IUnknown methods ***/
 #define IDirectDraw2_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
@@ -1380,45 +1427,67 @@ DECLARE_INTERFACE_(IDirectDraw2,IUnknown)
 /*** IDirectDraw2 methods ***/
 #define IDirectDraw2_GetAvailableVidMem(p,a,b,c) ICOM_CALL_(GetAvailableVidMem,p,(p,a,b,c))
 
-
 /*****************************************************************************
  * IDirectDraw4 interface
  */
 #undef INTERFACE
 #define INTERFACE IDirectDraw4
-DECLARE_INTERFACE_(IDirectDraw4,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(Compact)(THIS) PURE; 
-    STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE* lplpDDPalette, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc, LPDIRECTDRAWSURFACE4* lplpDDSurface, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurface, LPDIRECTDRAWSURFACE4* lplpDupDDSurface) PURE; 
-    STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; 
-    STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(FlipToGDISurface)(THIS) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; 
-    STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; 
-    STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; 
-    STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE4* lplpGDIDDSurface) PURE; 
-    STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; 
-    STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; 
-    STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL* lpbIsInVB) PURE; 
-    STDMETHOD(Initialize)(THIS_ GUID* lpGUID) PURE; 
-    STDMETHOD(RestoreDisplayMode)(THIS) PURE; 
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE; 
-    STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; 
-    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; 
-           
-    STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; 
-     
-    STDMETHOD(GetSurfaceFromDC)(THIS_ HDC , LPDIRECTDRAWSURFACE4* ) PURE; 
-    STDMETHOD(RestoreAllSurfaces)(THIS) PURE; 
-    STDMETHOD(TestCooperativeLevel)(THIS) PURE; 
-    STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER , DWORD ) PURE;
-};
+    DECLARE_INTERFACE_(IDirectDraw4, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(Compact) (THIS) PURE;
+        STDMETHOD(CreateClipper) (THIS_ DWORD dwFlags,
+                                  LPDIRECTDRAWCLIPPER * lplpDDClipper,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(CreatePalette) (THIS_ DWORD dwFlags,
+                                  LPPALETTEENTRY lpColorTable,
+                                  LPDIRECTDRAWPALETTE * lplpDDPalette,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(CreateSurface) (THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc,
+                                  LPDIRECTDRAWSURFACE4 * lplpDDSurface,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(DuplicateSurface) (THIS_ LPDIRECTDRAWSURFACE4 lpDDSurface,
+                                     LPDIRECTDRAWSURFACE4 *
+                                     lplpDupDDSurface) PURE;
+        STDMETHOD(EnumDisplayModes) (THIS_ DWORD dwFlags,
+                                     LPDDSURFACEDESC2 lpDDSurfaceDesc,
+                                     LPVOID lpContext,
+                                     LPDDENUMMODESCALLBACK2 lpEnumModesCallback)
+            PURE;
+        STDMETHOD(EnumSurfaces) (THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD,
+                                 LPVOID lpContext,
+                                 LPDDENUMSURFACESCALLBACK2
+                                 lpEnumSurfacesCallback) PURE;
+        STDMETHOD(FlipToGDISurface) (THIS) PURE;
+        STDMETHOD(GetCaps) (THIS_ LPDDCAPS lpDDDriverCaps,
+                            LPDDCAPS lpDDHELCaps) PURE;
+        STDMETHOD(GetDisplayMode) (THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
+        STDMETHOD(GetFourCCCodes) (THIS_ LPDWORD lpNumCodes,
+                                   LPDWORD lpCodes) PURE;
+        STDMETHOD(GetGDISurface) (THIS_ LPDIRECTDRAWSURFACE4 *
+                                  lplpGDIDDSurface) PURE;
+        STDMETHOD(GetMonitorFrequency) (THIS_ LPDWORD lpdwFrequency) PURE;
+        STDMETHOD(GetScanLine) (THIS_ LPDWORD lpdwScanLine) PURE;
+        STDMETHOD(GetVerticalBlankStatus) (THIS_ BOOL * lpbIsInVB) PURE;
+        STDMETHOD(Initialize) (THIS_ GUID * lpGUID) PURE;
+        STDMETHOD(RestoreDisplayMode) (THIS) PURE;
+        STDMETHOD(SetCooperativeLevel) (THIS_ HWND hWnd, DWORD dwFlags) PURE;
+        STDMETHOD(SetDisplayMode) (THIS_ DWORD dwWidth, DWORD dwHeight,
+                                   DWORD dwBPP, DWORD dwRefreshRate,
+                                   DWORD dwFlags) PURE;
+        STDMETHOD(WaitForVerticalBlank) (THIS_ DWORD dwFlags,
+                                         HANDLE hEvent) PURE;
+
+        STDMETHOD(GetAvailableVidMem) (THIS_ LPDDSCAPS2 lpDDCaps,
+                                       LPDWORD lpdwTotal,
+                                       LPDWORD lpdwFree) PURE;
+
+        STDMETHOD(GetSurfaceFromDC) (THIS_ HDC, LPDIRECTDRAWSURFACE4 *) PURE;
+        STDMETHOD(RestoreAllSurfaces) (THIS) PURE;
+        STDMETHOD(TestCooperativeLevel) (THIS) PURE;
+        STDMETHOD(GetDeviceIdentifier) (THIS_ LPDDDEVICEIDENTIFIER, DWORD) PURE;
+    };
 
     /*** IUnknown methods ***/
 #define IDirectDraw4_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
@@ -1453,7 +1522,6 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown)
 #define IDirectDraw4_TestCooperativeLevel(p)    ICOM_CALL_(TestCooperativeLevel,p,(p))
 #define IDirectDraw4_GetDeviceIdentifier(p,a,b) ICOM_CALL_(GetDeviceIdentifier,p,(p,a,b))
 
-
 /*****************************************************************************
  * IDirectDraw7 interface
  */
@@ -1462,42 +1530,66 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown)
  */
 #undef INTERFACE
 #define INTERFACE IDirectDraw7
-DECLARE_INTERFACE_(IDirectDraw7,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(Compact)(THIS) PURE; 
-    STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE* lplpDDPalette, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc, LPDIRECTDRAWSURFACE7* lplpDDSurface, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSurface, LPDIRECTDRAWSURFACE7* lplpDupDDSurface) PURE; 
-    STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; 
-    STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(FlipToGDISurface)(THIS) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; 
-    STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; 
-    STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; 
-    STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE7* lplpGDIDDSurface) PURE; 
-    STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; 
-    STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; 
-    STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL* lpbIsInVB) PURE; 
-    STDMETHOD(Initialize)(THIS_ GUID* lpGUID) PURE; 
-    STDMETHOD(RestoreDisplayMode)(THIS) PURE; 
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE; 
-    STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; 
-    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; 
-           
-    STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; 
-           
-    STDMETHOD(GetSurfaceFromDC)(THIS_ HDC , LPDIRECTDRAWSURFACE7* ) PURE; 
-    STDMETHOD(RestoreAllSurfaces)(THIS) PURE; 
-    STDMETHOD(TestCooperativeLevel)(THIS) PURE; 
-    STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER2 , DWORD ) PURE; 
-           
-    STDMETHOD(StartModeTest)(THIS_ LPSIZE , DWORD , DWORD ) PURE; 
-    STDMETHOD(EvaluateMode)(THIS_ DWORD , DWORD * ) PURE;
-};
+    DECLARE_INTERFACE_(IDirectDraw7, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(Compact) (THIS) PURE;
+        STDMETHOD(CreateClipper) (THIS_ DWORD dwFlags,
+                                  LPDIRECTDRAWCLIPPER * lplpDDClipper,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(CreatePalette) (THIS_ DWORD dwFlags,
+                                  LPPALETTEENTRY lpColorTable,
+                                  LPDIRECTDRAWPALETTE * lplpDDPalette,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(CreateSurface) (THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc,
+                                  LPDIRECTDRAWSURFACE7 * lplpDDSurface,
+                                  IUnknown * pUnkOuter) PURE;
+        STDMETHOD(DuplicateSurface) (THIS_ LPDIRECTDRAWSURFACE7 lpDDSurface,
+                                     LPDIRECTDRAWSURFACE7 *
+                                     lplpDupDDSurface) PURE;
+        STDMETHOD(EnumDisplayModes) (THIS_ DWORD dwFlags,
+                                     LPDDSURFACEDESC2 lpDDSurfaceDesc,
+                                     LPVOID lpContext,
+                                     LPDDENUMMODESCALLBACK2 lpEnumModesCallback)
+            PURE;
+        STDMETHOD(EnumSurfaces) (THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD,
+                                 LPVOID lpContext,
+                                 LPDDENUMSURFACESCALLBACK7
+                                 lpEnumSurfacesCallback) PURE;
+        STDMETHOD(FlipToGDISurface) (THIS) PURE;
+        STDMETHOD(GetCaps) (THIS_ LPDDCAPS lpDDDriverCaps,
+                            LPDDCAPS lpDDHELCaps) PURE;
+        STDMETHOD(GetDisplayMode) (THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
+        STDMETHOD(GetFourCCCodes) (THIS_ LPDWORD lpNumCodes,
+                                   LPDWORD lpCodes) PURE;
+        STDMETHOD(GetGDISurface) (THIS_ LPDIRECTDRAWSURFACE7 *
+                                  lplpGDIDDSurface) PURE;
+        STDMETHOD(GetMonitorFrequency) (THIS_ LPDWORD lpdwFrequency) PURE;
+        STDMETHOD(GetScanLine) (THIS_ LPDWORD lpdwScanLine) PURE;
+        STDMETHOD(GetVerticalBlankStatus) (THIS_ BOOL * lpbIsInVB) PURE;
+        STDMETHOD(Initialize) (THIS_ GUID * lpGUID) PURE;
+        STDMETHOD(RestoreDisplayMode) (THIS) PURE;
+        STDMETHOD(SetCooperativeLevel) (THIS_ HWND hWnd, DWORD dwFlags) PURE;
+        STDMETHOD(SetDisplayMode) (THIS_ DWORD dwWidth, DWORD dwHeight,
+                                   DWORD dwBPP, DWORD dwRefreshRate,
+                                   DWORD dwFlags) PURE;
+        STDMETHOD(WaitForVerticalBlank) (THIS_ DWORD dwFlags,
+                                         HANDLE hEvent) PURE;
+
+        STDMETHOD(GetAvailableVidMem) (THIS_ LPDDSCAPS2 lpDDCaps,
+                                       LPDWORD lpdwTotal,
+                                       LPDWORD lpdwFree) PURE;
+
+        STDMETHOD(GetSurfaceFromDC) (THIS_ HDC, LPDIRECTDRAWSURFACE7 *) PURE;
+        STDMETHOD(RestoreAllSurfaces) (THIS) PURE;
+        STDMETHOD(TestCooperativeLevel) (THIS) PURE;
+        STDMETHOD(GetDeviceIdentifier) (THIS_ LPDDDEVICEIDENTIFIER2,
+                                        DWORD) PURE;
+
+        STDMETHOD(StartModeTest) (THIS_ LPSIZE, DWORD, DWORD) PURE;
+        STDMETHOD(EvaluateMode) (THIS_ DWORD, DWORD *) PURE;
+    };
 
     /*** IUnknown methods ***/
 #define IDirectDraw7_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
@@ -1535,51 +1627,74 @@ DECLARE_INTERFACE_(IDirectDraw7,IUnknown)
 #define IDirectDraw7_StartModeTest(p,a,b,c)     ICOM_CALL_(StartModeTest,p,(p,a,b,c))
 #define IDirectDraw7_EvaluateMode(p,a,b)        ICOM_CALL_(EvaluateMode,p,(p,a,b))
 
-
 /*****************************************************************************
  * IDirectDrawSurface interface
  */
 #undef INTERFACE
 #define INTERFACE IDirectDrawSurface
-DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSAttachedSurface) PURE; 
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; 
-    STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; 
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; 
-    STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; 
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE lpDDSAttachedSurface) PURE; 
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; 
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; 
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE* lplpDDAttachedSurface) PURE; 
-    STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; 
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER* lplpDDClipper) PURE; 
-    STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(GetDC)(THIS_ HDC* lphDC) PURE; 
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; 
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE* lplpDDPalette) PURE; 
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; 
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(IsLost)(THIS) PURE; 
-    STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; 
-    STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; 
-    STDMETHOD(Restore)(THIS) PURE; 
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE; 
-    STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; 
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; 
-    STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; 
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; 
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE lpDDSReference) PURE;
-};
+    DECLARE_INTERFACE_(IDirectDrawSurface, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(AddAttachedSurface) (THIS_ LPDIRECTDRAWSURFACE
+                                       lpDDSAttachedSurface) PURE;
+        STDMETHOD(AddOverlayDirtyRect) (THIS_ LPRECT lpRect) PURE;
+        STDMETHOD(Blt) (THIS_ LPRECT lpDestRect,
+                        LPDIRECTDRAWSURFACE lpDDSrcSurface, LPRECT lpSrcRect,
+                        DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
+        STDMETHOD(BltBatch) (THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount,
+                             DWORD dwFlags) PURE;
+        STDMETHOD(BltFast) (THIS_ DWORD dwX, DWORD dwY,
+                            LPDIRECTDRAWSURFACE lpDDSrcSurface,
+                            LPRECT lpSrcRect, DWORD dwTrans) PURE;
+        STDMETHOD(DeleteAttachedSurface) (THIS_ DWORD dwFlags,
+                                          LPDIRECTDRAWSURFACE
+                                          lpDDSAttachedSurface) PURE;
+        STDMETHOD(EnumAttachedSurfaces) (THIS_ LPVOID lpContext,
+                                         LPDDENUMSURFACESCALLBACK
+                                         lpEnumSurfacesCallback) PURE;
+        STDMETHOD(EnumOverlayZOrders) (THIS_ DWORD dwFlags, LPVOID lpContext,
+                                       LPDDENUMSURFACESCALLBACK lpfnCallback)
+            PURE;
+        STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE lpDDSurfaceTargetOverride,
+                         DWORD dwFlags) PURE;
+        STDMETHOD(GetAttachedSurface) (THIS_ LPDDSCAPS lpDDSCaps,
+                                       LPDIRECTDRAWSURFACE *
+                                       lplpDDAttachedSurface) PURE;
+        STDMETHOD(GetBltStatus) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(GetCaps) (THIS_ LPDDSCAPS lpDDSCaps) PURE;
+        STDMETHOD(GetClipper) (THIS_ LPDIRECTDRAWCLIPPER * lplpDDClipper) PURE;
+        STDMETHOD(GetColorKey) (THIS_ DWORD dwFlags,
+                                LPDDCOLORKEY lpDDColorKey) PURE;
+        STDMETHOD(GetDC) (THIS_ HDC * lphDC) PURE;
+        STDMETHOD(GetFlipStatus) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(GetOverlayPosition) (THIS_ LPLONG lplX, LPLONG lplY) PURE;
+        STDMETHOD(GetPalette) (THIS_ LPDIRECTDRAWPALETTE * lplpDDPalette) PURE;
+        STDMETHOD(GetPixelFormat) (THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
+        STDMETHOD(GetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD,
+                               LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+        STDMETHOD(IsLost) (THIS) PURE;
+        STDMETHOD(Lock) (THIS_ LPRECT lpDestRect,
+                         LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags,
+                         HANDLE hEvent) PURE;
+        STDMETHOD(ReleaseDC) (THIS_ HDC hDC) PURE;
+        STDMETHOD(Restore) (THIS) PURE;
+        STDMETHOD(SetClipper) (THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
+        STDMETHOD(SetColorKey) (THIS_ DWORD dwFlags,
+                                LPDDCOLORKEY lpDDColorKey) PURE;
+        STDMETHOD(SetOverlayPosition) (THIS_ LONG lX, LONG lY) PURE;
+        STDMETHOD(SetPalette) (THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
+        STDMETHOD(Unlock) (THIS_ LPVOID lpSurfaceData) PURE;
+        STDMETHOD(UpdateOverlay) (THIS_ LPRECT lpSrcRect,
+                                  LPDIRECTDRAWSURFACE lpDDDestSurface,
+                                  LPRECT lpDestRect, DWORD dwFlags,
+                                  LPDDOVERLAYFX lpDDOverlayFx) PURE;
+        STDMETHOD(UpdateOverlayDisplay) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(UpdateOverlayZOrder) (THIS_ DWORD dwFlags,
+                                        LPDIRECTDRAWSURFACE lpDDSReference)
+            PURE;
+    };
 
     /*** IUnknown methods ***/
 #define IDirectDrawSurface_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
@@ -1620,7 +1735,6 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown)
 #define IDirectDrawSurface_UpdateOverlayDisplay(p,a)    ICOM_CALL_(UpdateOverlayDisplay,p,(p,a))
 #define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b)   ICOM_CALL_(UpdateOverlayZOrder,p,(p,a,b))
 
-
 /*****************************************************************************
  * IDirectDrawSurface2 interface
  */
@@ -1629,49 +1743,73 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown)
  */
 #undef INTERFACE
 #define INTERFACE IDirectDrawSurface2
-DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; 
-    STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; 
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; 
-    STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; 
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; 
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; 
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE2* lplpDDAttachedSurface) PURE; 
-    STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; 
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER* lplpDDClipper) PURE; 
-    STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(GetDC)(THIS_ HDC* lphDC) PURE; 
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; 
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE* lplpDDPalette) PURE; 
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; 
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(IsLost)(THIS) PURE; 
-    STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; 
-    STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; 
-    STDMETHOD(Restore)(THIS) PURE; 
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE; 
-    STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; 
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; 
-    STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; 
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE2 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; 
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSReference) PURE; 
-    /* added in v2 */ 
-    STDMETHOD(GetDDInterface)(THIS_ LPVOID* lplpDD) PURE; 
-    STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE;
-};
+    DECLARE_INTERFACE_(IDirectDrawSurface2, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(AddAttachedSurface) (THIS_ LPDIRECTDRAWSURFACE2
+                                       lpDDSAttachedSurface) PURE;
+        STDMETHOD(AddOverlayDirtyRect) (THIS_ LPRECT lpRect) PURE;
+        STDMETHOD(Blt) (THIS_ LPRECT lpDestRect,
+                        LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect,
+                        DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
+        STDMETHOD(BltBatch) (THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount,
+                             DWORD dwFlags) PURE;
+        STDMETHOD(BltFast) (THIS_ DWORD dwX, DWORD dwY,
+                            LPDIRECTDRAWSURFACE2 lpDDSrcSurface,
+                            LPRECT lpSrcRect, DWORD dwTrans) PURE;
+        STDMETHOD(DeleteAttachedSurface) (THIS_ DWORD dwFlags,
+                                          LPDIRECTDRAWSURFACE2
+                                          lpDDSAttachedSurface) PURE;
+        STDMETHOD(EnumAttachedSurfaces) (THIS_ LPVOID lpContext,
+                                         LPDDENUMSURFACESCALLBACK
+                                         lpEnumSurfacesCallback) PURE;
+        STDMETHOD(EnumOverlayZOrders) (THIS_ DWORD dwFlags, LPVOID lpContext,
+                                       LPDDENUMSURFACESCALLBACK lpfnCallback)
+            PURE;
+        STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE2 lpDDSurfaceTargetOverride,
+                         DWORD dwFlags) PURE;
+        STDMETHOD(GetAttachedSurface) (THIS_ LPDDSCAPS lpDDSCaps,
+                                       LPDIRECTDRAWSURFACE2 *
+                                       lplpDDAttachedSurface) PURE;
+        STDMETHOD(GetBltStatus) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(GetCaps) (THIS_ LPDDSCAPS lpDDSCaps) PURE;
+        STDMETHOD(GetClipper) (THIS_ LPDIRECTDRAWCLIPPER * lplpDDClipper) PURE;
+        STDMETHOD(GetColorKey) (THIS_ DWORD dwFlags,
+                                LPDDCOLORKEY lpDDColorKey) PURE;
+        STDMETHOD(GetDC) (THIS_ HDC * lphDC) PURE;
+        STDMETHOD(GetFlipStatus) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(GetOverlayPosition) (THIS_ LPLONG lplX, LPLONG lplY) PURE;
+        STDMETHOD(GetPalette) (THIS_ LPDIRECTDRAWPALETTE * lplpDDPalette) PURE;
+        STDMETHOD(GetPixelFormat) (THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
+        STDMETHOD(GetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD,
+                               LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+        STDMETHOD(IsLost) (THIS) PURE;
+        STDMETHOD(Lock) (THIS_ LPRECT lpDestRect,
+                         LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags,
+                         HANDLE hEvent) PURE;
+        STDMETHOD(ReleaseDC) (THIS_ HDC hDC) PURE;
+        STDMETHOD(Restore) (THIS) PURE;
+        STDMETHOD(SetClipper) (THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
+        STDMETHOD(SetColorKey) (THIS_ DWORD dwFlags,
+                                LPDDCOLORKEY lpDDColorKey) PURE;
+        STDMETHOD(SetOverlayPosition) (THIS_ LONG lX, LONG lY) PURE;
+        STDMETHOD(SetPalette) (THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
+        STDMETHOD(Unlock) (THIS_ LPVOID lpSurfaceData) PURE;
+        STDMETHOD(UpdateOverlay) (THIS_ LPRECT lpSrcRect,
+                                  LPDIRECTDRAWSURFACE2 lpDDDestSurface,
+                                  LPRECT lpDestRect, DWORD dwFlags,
+                                  LPDDOVERLAYFX lpDDOverlayFx) PURE;
+        STDMETHOD(UpdateOverlayDisplay) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(UpdateOverlayZOrder) (THIS_ DWORD dwFlags,
+                                        LPDIRECTDRAWSURFACE2 lpDDSReference)
+            PURE;
+        /* added in v2 */
+        STDMETHOD(GetDDInterface) (THIS_ LPVOID * lplpDD) PURE;
+        STDMETHOD(PageLock) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(PageUnlock) (THIS_ DWORD dwFlags) PURE;
+    };
 
     /*** IUnknown methods ***/
 #define IDirectDrawSurface2_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
@@ -1716,7 +1854,6 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown)
 #define IDirectDrawSurface2_PageLock(p,a)       ICOM_CALL_(PageLock,p,(p,a))
 #define IDirectDrawSurface2_PageUnlock(p,a)     ICOM_CALL_(PageUnlock,p,(p,a))
 
-
 /*****************************************************************************
  * IDirectDrawSurface3 interface
  */
@@ -1725,51 +1862,76 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown)
  */
 #undef INTERFACE
 #define INTERFACE IDirectDrawSurface3
-DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; 
-    STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; 
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; 
-    STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; 
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; 
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; 
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE3* lplpDDAttachedSurface) PURE; 
-    STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; 
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER* lplpDDClipper) PURE; 
-    STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(GetDC)(THIS_ HDC* lphDC) PURE; 
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; 
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE* lplpDDPalette) PURE; 
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; 
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(IsLost)(THIS) PURE; 
-    STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; 
-    STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; 
-    STDMETHOD(Restore)(THIS) PURE; 
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE; 
-    STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; 
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; 
-    STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; 
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE3 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; 
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSReference) PURE; 
-    /* added in v2 */ 
-    STDMETHOD(GetDDInterface)(THIS_ LPVOID* lplpDD) PURE; 
-    STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; 
-    /* added in v3 */ 
-    STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSD, DWORD dwFlags) PURE;
-};
+    DECLARE_INTERFACE_(IDirectDrawSurface3, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(AddAttachedSurface) (THIS_ LPDIRECTDRAWSURFACE3
+                                       lpDDSAttachedSurface) PURE;
+        STDMETHOD(AddOverlayDirtyRect) (THIS_ LPRECT lpRect) PURE;
+        STDMETHOD(Blt) (THIS_ LPRECT lpDestRect,
+                        LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect,
+                        DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
+        STDMETHOD(BltBatch) (THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount,
+                             DWORD dwFlags) PURE;
+        STDMETHOD(BltFast) (THIS_ DWORD dwX, DWORD dwY,
+                            LPDIRECTDRAWSURFACE3 lpDDSrcSurface,
+                            LPRECT lpSrcRect, DWORD dwTrans) PURE;
+        STDMETHOD(DeleteAttachedSurface) (THIS_ DWORD dwFlags,
+                                          LPDIRECTDRAWSURFACE3
+                                          lpDDSAttachedSurface) PURE;
+        STDMETHOD(EnumAttachedSurfaces) (THIS_ LPVOID lpContext,
+                                         LPDDENUMSURFACESCALLBACK
+                                         lpEnumSurfacesCallback) PURE;
+        STDMETHOD(EnumOverlayZOrders) (THIS_ DWORD dwFlags, LPVOID lpContext,
+                                       LPDDENUMSURFACESCALLBACK lpfnCallback)
+            PURE;
+        STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE3 lpDDSurfaceTargetOverride,
+                         DWORD dwFlags) PURE;
+        STDMETHOD(GetAttachedSurface) (THIS_ LPDDSCAPS lpDDSCaps,
+                                       LPDIRECTDRAWSURFACE3 *
+                                       lplpDDAttachedSurface) PURE;
+        STDMETHOD(GetBltStatus) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(GetCaps) (THIS_ LPDDSCAPS lpDDSCaps) PURE;
+        STDMETHOD(GetClipper) (THIS_ LPDIRECTDRAWCLIPPER * lplpDDClipper) PURE;
+        STDMETHOD(GetColorKey) (THIS_ DWORD dwFlags,
+                                LPDDCOLORKEY lpDDColorKey) PURE;
+        STDMETHOD(GetDC) (THIS_ HDC * lphDC) PURE;
+        STDMETHOD(GetFlipStatus) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(GetOverlayPosition) (THIS_ LPLONG lplX, LPLONG lplY) PURE;
+        STDMETHOD(GetPalette) (THIS_ LPDIRECTDRAWPALETTE * lplpDDPalette) PURE;
+        STDMETHOD(GetPixelFormat) (THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
+        STDMETHOD(GetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD,
+                               LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+        STDMETHOD(IsLost) (THIS) PURE;
+        STDMETHOD(Lock) (THIS_ LPRECT lpDestRect,
+                         LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags,
+                         HANDLE hEvent) PURE;
+        STDMETHOD(ReleaseDC) (THIS_ HDC hDC) PURE;
+        STDMETHOD(Restore) (THIS) PURE;
+        STDMETHOD(SetClipper) (THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
+        STDMETHOD(SetColorKey) (THIS_ DWORD dwFlags,
+                                LPDDCOLORKEY lpDDColorKey) PURE;
+        STDMETHOD(SetOverlayPosition) (THIS_ LONG lX, LONG lY) PURE;
+        STDMETHOD(SetPalette) (THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
+        STDMETHOD(Unlock) (THIS_ LPVOID lpSurfaceData) PURE;
+        STDMETHOD(UpdateOverlay) (THIS_ LPRECT lpSrcRect,
+                                  LPDIRECTDRAWSURFACE3 lpDDDestSurface,
+                                  LPRECT lpDestRect, DWORD dwFlags,
+                                  LPDDOVERLAYFX lpDDOverlayFx) PURE;
+        STDMETHOD(UpdateOverlayDisplay) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(UpdateOverlayZOrder) (THIS_ DWORD dwFlags,
+                                        LPDIRECTDRAWSURFACE3 lpDDSReference)
+            PURE;
+        /* added in v2 */
+        STDMETHOD(GetDDInterface) (THIS_ LPVOID * lplpDD) PURE;
+        STDMETHOD(PageLock) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(PageUnlock) (THIS_ DWORD dwFlags) PURE;
+        /* added in v3 */
+        STDMETHOD(SetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSD,
+                                   DWORD dwFlags) PURE;
+    };
 
     /*** IUnknown methods ***/
 #define IDirectDrawSurface3_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
@@ -1816,7 +1978,6 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown)
 /*** IDirectDrawSurface3 methods ***/
 #define IDirectDrawSurface3_SetSurfaceDesc(p,a,b) ICOM_CALL_(SetSurfaceDesc,p,(p,a,b))
 
-
 /*****************************************************************************
  * IDirectDrawSurface4 interface
  */
@@ -1824,57 +1985,82 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown)
  */
 #undef INTERFACE
 #define INTERFACE IDirectDrawSurface4
-DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; 
-    STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; 
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; 
-    STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; 
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; 
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; 
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE4* lplpDDAttachedSurface) PURE; 
-    STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE; 
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER* lplpDDClipper) PURE; 
-    STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(GetDC)(THIS_ HDC* lphDC) PURE; 
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; 
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE* lplpDDPalette) PURE; 
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; 
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(IsLost)(THIS) PURE; 
-    STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; 
-    STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; 
-    STDMETHOD(Restore)(THIS) PURE; 
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE; 
-    STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; 
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; 
-    STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE; 
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE4 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; 
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSReference) PURE; 
-    /* added in v2 */ 
-    STDMETHOD(GetDDInterface)(THIS_ LPVOID* lplpDD) PURE; 
-    STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; 
-    /* added in v3 */ 
-    STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSD, DWORD dwFlags) PURE; 
-    /* added in v4 */ 
-    STDMETHOD(SetPrivateData)(THIS_ REFGUID , LPVOID , DWORD , DWORD ) PURE; 
-    STDMETHOD(GetPrivateData)(THIS_ REFGUID , LPVOID , LPDWORD ) PURE; 
-    STDMETHOD(FreePrivateData)(THIS_ REFGUID ) PURE; 
-    STDMETHOD(GetUniquenessValue)(THIS_ LPDWORD ) PURE; 
-    STDMETHOD(ChangeUniquenessValue)(THIS) PURE;
-};
+    DECLARE_INTERFACE_(IDirectDrawSurface4, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(AddAttachedSurface) (THIS_ LPDIRECTDRAWSURFACE4
+                                       lpDDSAttachedSurface) PURE;
+        STDMETHOD(AddOverlayDirtyRect) (THIS_ LPRECT lpRect) PURE;
+        STDMETHOD(Blt) (THIS_ LPRECT lpDestRect,
+                        LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect,
+                        DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
+        STDMETHOD(BltBatch) (THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount,
+                             DWORD dwFlags) PURE;
+        STDMETHOD(BltFast) (THIS_ DWORD dwX, DWORD dwY,
+                            LPDIRECTDRAWSURFACE4 lpDDSrcSurface,
+                            LPRECT lpSrcRect, DWORD dwTrans) PURE;
+        STDMETHOD(DeleteAttachedSurface) (THIS_ DWORD dwFlags,
+                                          LPDIRECTDRAWSURFACE4
+                                          lpDDSAttachedSurface) PURE;
+        STDMETHOD(EnumAttachedSurfaces) (THIS_ LPVOID lpContext,
+                                         LPDDENUMSURFACESCALLBACK
+                                         lpEnumSurfacesCallback) PURE;
+        STDMETHOD(EnumOverlayZOrders) (THIS_ DWORD dwFlags, LPVOID lpContext,
+                                       LPDDENUMSURFACESCALLBACK lpfnCallback)
+            PURE;
+        STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE4 lpDDSurfaceTargetOverride,
+                         DWORD dwFlags) PURE;
+        STDMETHOD(GetAttachedSurface) (THIS_ LPDDSCAPS2 lpDDSCaps,
+                                       LPDIRECTDRAWSURFACE4 *
+                                       lplpDDAttachedSurface) PURE;
+        STDMETHOD(GetBltStatus) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(GetCaps) (THIS_ LPDDSCAPS2 lpDDSCaps) PURE;
+        STDMETHOD(GetClipper) (THIS_ LPDIRECTDRAWCLIPPER * lplpDDClipper) PURE;
+        STDMETHOD(GetColorKey) (THIS_ DWORD dwFlags,
+                                LPDDCOLORKEY lpDDColorKey) PURE;
+        STDMETHOD(GetDC) (THIS_ HDC * lphDC) PURE;
+        STDMETHOD(GetFlipStatus) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(GetOverlayPosition) (THIS_ LPLONG lplX, LPLONG lplY) PURE;
+        STDMETHOD(GetPalette) (THIS_ LPDIRECTDRAWPALETTE * lplpDDPalette) PURE;
+        STDMETHOD(GetPixelFormat) (THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
+        STDMETHOD(GetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD,
+                               LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+        STDMETHOD(IsLost) (THIS) PURE;
+        STDMETHOD(Lock) (THIS_ LPRECT lpDestRect,
+                         LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags,
+                         HANDLE hEvent) PURE;
+        STDMETHOD(ReleaseDC) (THIS_ HDC hDC) PURE;
+        STDMETHOD(Restore) (THIS) PURE;
+        STDMETHOD(SetClipper) (THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
+        STDMETHOD(SetColorKey) (THIS_ DWORD dwFlags,
+                                LPDDCOLORKEY lpDDColorKey) PURE;
+        STDMETHOD(SetOverlayPosition) (THIS_ LONG lX, LONG lY) PURE;
+        STDMETHOD(SetPalette) (THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
+        STDMETHOD(Unlock) (THIS_ LPRECT lpSurfaceData) PURE;
+        STDMETHOD(UpdateOverlay) (THIS_ LPRECT lpSrcRect,
+                                  LPDIRECTDRAWSURFACE4 lpDDDestSurface,
+                                  LPRECT lpDestRect, DWORD dwFlags,
+                                  LPDDOVERLAYFX lpDDOverlayFx) PURE;
+        STDMETHOD(UpdateOverlayDisplay) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(UpdateOverlayZOrder) (THIS_ DWORD dwFlags,
+                                        LPDIRECTDRAWSURFACE4 lpDDSReference)
+            PURE;
+        /* added in v2 */
+        STDMETHOD(GetDDInterface) (THIS_ LPVOID * lplpDD) PURE;
+        STDMETHOD(PageLock) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(PageUnlock) (THIS_ DWORD dwFlags) PURE;
+        /* added in v3 */
+        STDMETHOD(SetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSD,
+                                   DWORD dwFlags) PURE;
+        /* added in v4 */
+        STDMETHOD(SetPrivateData) (THIS_ REFGUID, LPVOID, DWORD, DWORD) PURE;
+        STDMETHOD(GetPrivateData) (THIS_ REFGUID, LPVOID, LPDWORD) PURE;
+        STDMETHOD(FreePrivateData) (THIS_ REFGUID) PURE;
+        STDMETHOD(GetUniquenessValue) (THIS_ LPDWORD) PURE;
+        STDMETHOD(ChangeUniquenessValue) (THIS) PURE;
+    };
 
     /*** IUnknown methods ***/
 #define IDirectDrawSurface4_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
@@ -1927,68 +2113,92 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown)
 #define IDirectDrawSurface4_GetUniquenessValue(p,a)   ICOM_CALL_(GetUniquenessValue,p,(p,a))
 #define IDirectDrawSurface4_ChangeUniquenessValue(p)  ICOM_CALL_(ChangeUniquenessValue,p,(p))
 
-
 /*****************************************************************************
  * IDirectDrawSurface7 interface
  */
 #undef INTERFACE
 #define INTERFACE IDirectDrawSurface7
-DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; 
-    STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE7 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; 
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; 
-    STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE7 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; 
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE7 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpfnCallback) PURE; 
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; 
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE7* lplpDDAttachedSurface) PURE; 
-    STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE; 
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER* lplpDDClipper) PURE; 
-    STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(GetDC)(THIS_ HDC* lphDC) PURE; 
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; 
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE* lplpDDPalette) PURE; 
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; 
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; 
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; 
-    STDMETHOD(IsLost)(THIS) PURE; 
-    STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; 
-    STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; 
-    STDMETHOD(Restore)(THIS) PURE; 
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE; 
-    STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; 
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; 
-    STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE; 
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE7 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; 
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE7 lpDDSReference) PURE; 
-    /* added in v2 */ 
-    STDMETHOD(GetDDInterface)(THIS_ LPVOID* lplpDD) PURE; 
-    STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; 
-    /* added in v3 */ 
-    STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) PURE; 
-    /* added in v4 */ 
-    STDMETHOD(SetPrivateData)(THIS_ REFGUID , LPVOID , DWORD , DWORD ) PURE; 
-    STDMETHOD(GetPrivateData)(THIS_ REFGUID , LPVOID , LPDWORD ) PURE; 
-    STDMETHOD(FreePrivateData)(THIS_ REFGUID ) PURE; 
-    STDMETHOD(GetUniquenessValue)(THIS_ LPDWORD ) PURE; 
-    STDMETHOD(ChangeUniquenessValue)(THIS) PURE; 
-    /* added in v7 */ 
-    STDMETHOD(SetPriority)(THIS_ DWORD prio) PURE; 
-    STDMETHOD(GetPriority)(THIS_ LPDWORD prio) PURE; 
-    STDMETHOD(SetLOD)(THIS_ DWORD lod) PURE; 
-    STDMETHOD(GetLOD)(THIS_ LPDWORD lod) PURE;
-};
+    DECLARE_INTERFACE_(IDirectDrawSurface7, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(AddAttachedSurface) (THIS_ LPDIRECTDRAWSURFACE7
+                                       lpDDSAttachedSurface) PURE;
+        STDMETHOD(AddOverlayDirtyRect) (THIS_ LPRECT lpRect) PURE;
+        STDMETHOD(Blt) (THIS_ LPRECT lpDestRect,
+                        LPDIRECTDRAWSURFACE7 lpDDSrcSurface, LPRECT lpSrcRect,
+                        DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
+        STDMETHOD(BltBatch) (THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount,
+                             DWORD dwFlags) PURE;
+        STDMETHOD(BltFast) (THIS_ DWORD dwX, DWORD dwY,
+                            LPDIRECTDRAWSURFACE7 lpDDSrcSurface,
+                            LPRECT lpSrcRect, DWORD dwTrans) PURE;
+        STDMETHOD(DeleteAttachedSurface) (THIS_ DWORD dwFlags,
+                                          LPDIRECTDRAWSURFACE7
+                                          lpDDSAttachedSurface) PURE;
+        STDMETHOD(EnumAttachedSurfaces) (THIS_ LPVOID lpContext,
+                                         LPDDENUMSURFACESCALLBACK7
+                                         lpEnumSurfacesCallback) PURE;
+        STDMETHOD(EnumOverlayZOrders) (THIS_ DWORD dwFlags, LPVOID lpContext,
+                                       LPDDENUMSURFACESCALLBACK7 lpfnCallback)
+            PURE;
+        STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride,
+                         DWORD dwFlags) PURE;
+        STDMETHOD(GetAttachedSurface) (THIS_ LPDDSCAPS2 lpDDSCaps,
+                                       LPDIRECTDRAWSURFACE7 *
+                                       lplpDDAttachedSurface) PURE;
+        STDMETHOD(GetBltStatus) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(GetCaps) (THIS_ LPDDSCAPS2 lpDDSCaps) PURE;
+        STDMETHOD(GetClipper) (THIS_ LPDIRECTDRAWCLIPPER * lplpDDClipper) PURE;
+        STDMETHOD(GetColorKey) (THIS_ DWORD dwFlags,
+                                LPDDCOLORKEY lpDDColorKey) PURE;
+        STDMETHOD(GetDC) (THIS_ HDC * lphDC) PURE;
+        STDMETHOD(GetFlipStatus) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(GetOverlayPosition) (THIS_ LPLONG lplX, LPLONG lplY) PURE;
+        STDMETHOD(GetPalette) (THIS_ LPDIRECTDRAWPALETTE * lplpDDPalette) PURE;
+        STDMETHOD(GetPixelFormat) (THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
+        STDMETHOD(GetSurfaceDesc) (THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
+        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD,
+                               LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
+        STDMETHOD(IsLost) (THIS) PURE;
+        STDMETHOD(Lock) (THIS_ LPRECT lpDestRect,
+                         LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags,
+                         HANDLE hEvent) PURE;
+        STDMETHOD(ReleaseDC) (THIS_ HDC hDC) PURE;
+        STDMETHOD(Restore) (THIS) PURE;
+        STDMETHOD(SetClipper) (THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
+        STDMETHOD(SetColorKey) (THIS_ DWORD dwFlags,
+                                LPDDCOLORKEY lpDDColorKey) PURE;
+        STDMETHOD(SetOverlayPosition) (THIS_ LONG lX, LONG lY) PURE;
+        STDMETHOD(SetPalette) (THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
+        STDMETHOD(Unlock) (THIS_ LPRECT lpSurfaceData) PURE;
+        STDMETHOD(UpdateOverlay) (THIS_ LPRECT lpSrcRect,
+                                  LPDIRECTDRAWSURFACE7 lpDDDestSurface,
+                                  LPRECT lpDestRect, DWORD dwFlags,
+                                  LPDDOVERLAYFX lpDDOverlayFx) PURE;
+        STDMETHOD(UpdateOverlayDisplay) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(UpdateOverlayZOrder) (THIS_ DWORD dwFlags,
+                                        LPDIRECTDRAWSURFACE7 lpDDSReference)
+            PURE;
+        /* added in v2 */
+        STDMETHOD(GetDDInterface) (THIS_ LPVOID * lplpDD) PURE;
+        STDMETHOD(PageLock) (THIS_ DWORD dwFlags) PURE;
+        STDMETHOD(PageUnlock) (THIS_ DWORD dwFlags) PURE;
+        /* added in v3 */
+        STDMETHOD(SetSurfaceDesc) (THIS_ LPDDSURFACEDESC2 lpDDSD,
+                                   DWORD dwFlags) PURE;
+        /* added in v4 */
+        STDMETHOD(SetPrivateData) (THIS_ REFGUID, LPVOID, DWORD, DWORD) PURE;
+        STDMETHOD(GetPrivateData) (THIS_ REFGUID, LPVOID, LPDWORD) PURE;
+        STDMETHOD(FreePrivateData) (THIS_ REFGUID) PURE;
+        STDMETHOD(GetUniquenessValue) (THIS_ LPDWORD) PURE;
+        STDMETHOD(ChangeUniquenessValue) (THIS) PURE;
+        /* added in v7 */
+        STDMETHOD(SetPriority) (THIS_ DWORD prio) PURE;
+        STDMETHOD(GetPriority) (THIS_ LPDWORD prio) PURE;
+        STDMETHOD(SetLOD) (THIS_ DWORD lod) PURE;
+        STDMETHOD(GetLOD) (THIS_ LPDWORD lod) PURE;
+    };
 
     /*** IUnknown methods ***/
 #define IDirectDrawSurface7_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
@@ -2051,20 +2261,21 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown)
  */
 #undef INTERFACE
 #define INTERFACE IDirectDrawColorControl
-DECLARE_INTERFACE_(IDirectDrawColorControl,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(GetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE; 
-    STDMETHOD(SetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE;
-};
-
-	/*** IUnknown methods ***/
+    DECLARE_INTERFACE_(IDirectDrawColorControl, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(GetColorControls) (THIS_ LPDDCOLORCONTROL lpColorControl)
+            PURE;
+        STDMETHOD(SetColorControls) (THIS_ LPDDCOLORCONTROL lpColorControl)
+            PURE;
+    };
+
+        /*** IUnknown methods ***/
 #define IDirectDrawColorControl_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
 #define IDirectDrawColorControl_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
 #define IDirectDrawColorControl_Release(p)            ICOM_CALL_(Release,p,(p))
-	/*** IDirectDrawColorControl methods ***/
+        /*** IDirectDrawColorControl methods ***/
 #define IDirectDrawColorControl_GetColorControls(p,a) ICOM_CALL_(GetColorControls,p,(p,a))
 #define IDirectDrawColorControl_SetColorControls(p,a) ICOM_CALL_(SetColorControls,p,(p,a))
 
@@ -2073,34 +2284,35 @@ DECLARE_INTERFACE_(IDirectDrawColorControl,IUnknown)
  */
 #undef INTERFACE
 #define INTERFACE IDirectDrawGammaControl
-DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(GetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE; 
-    STDMETHOD(SetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE;
-};
-
-	/*** IUnknown methods ***/
+    DECLARE_INTERFACE_(IDirectDrawGammaControl, IUnknown) {
+        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
+        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+        STDMETHOD_(ULONG, Release) (THIS) PURE;
+        STDMETHOD(GetGammaRamp) (THIS_ DWORD dwFlags,
+                                 LPDDGAMMARAMP lpGammaRamp) PURE;
+        STDMETHOD(SetGammaRamp) (THIS_ DWORD dwFlags,
+                                 LPDDGAMMARAMP lpGammaRamp) PURE;
+    };
+
+        /*** IUnknown methods ***/
 #define IDirectDrawGammaControl_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
 #define IDirectDrawGammaControl_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
 #define IDirectDrawGammaControl_Release(p)            ICOM_CALL_(Release,p,(p))
-	/*** IDirectDrawGammaControl methods ***/
+        /*** IDirectDrawGammaControl methods ***/
 #define IDirectDrawGammaControl_GetGammaRamp(p,a,b)   ICOM_CALL_(GetGammaRamp,p,(p,a,b))
 #define IDirectDrawGammaControl_SetGammaRamp(p,a,b)   ICOM_CALL_(SetGammaRamp,p,(p,a,b))
 
+    HRESULT WINAPI DirectDrawCreate(LPGUID, LPDIRECTDRAW *, LPUNKNOWN);
+    HRESULT WINAPI DirectDrawCreateEx(LPGUID, LPVOID *, REFIID, LPUNKNOWN);
+    HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA, LPVOID);
+    HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW, LPVOID);
 
-HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN);
-HRESULT WINAPI DirectDrawCreateEx(LPGUID,LPVOID*,REFIID,LPUNKNOWN);
-HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
-HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
 #define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
-HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN);
-
+    HRESULT WINAPI DirectDrawCreateClipper(DWORD, LPDIRECTDRAWCLIPPER *,
+                                           LPUNKNOWN);
 
 #ifdef __cplusplus
-} /* extern "C" */
-#endif /* defined(__cplusplus) */
+}                               /* extern "C" */
+#endif                          /* defined(__cplusplus) */
 
-#endif /* __XWIN_DDRAW_H */
+#endif                          /* __XWIN_DDRAW_H */
diff --git a/xorg-server/hw/xwin/glx/glwindows.h b/xorg-server/hw/xwin/glx/glwindows.h
index cc3f2e6ee..ec1d1f51b 100644
--- a/xorg-server/hw/xwin/glx/glwindows.h
+++ b/xorg-server/hw/xwin/glx/glwindows.h
@@ -28,25 +28,25 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-
 #include <GL/gl.h>
 
 typedef struct {
-    unsigned int enableDebug : 1;
-    unsigned int enableTrace : 1;
-    unsigned int dumpPFD : 1;
-    unsigned int dumpHWND : 1;
-    unsigned int dumpDC : 1;
-    unsigned int enableGLcallTrace : 1;
-    unsigned int enableWGLcallTrace :1;
+    unsigned int enableDebug:1;
+    unsigned int enableTrace:1;
+    unsigned int dumpPFD:1;
+    unsigned int dumpHWND:1;
+    unsigned int dumpDC:1;
+    unsigned int enableGLcallTrace:1;
+    unsigned int enableWGLcallTrace:1;
 } glxWinDebugSettingsRec;
 
 extern glxWinDebugSettingsRec glxWinDebugSettings;
 
 void glWinCallDelta(void);
 void glxWinPushNativeProvider(void);
-const GLubyte* glGetStringWrapperNonstatic(GLenum name);
-void glAddSwapHintRectWINWrapperNonstatic(GLint x, GLint y, GLsizei width, GLsizei height);
+const GLubyte *glGetStringWrapperNonstatic(GLenum name);
+void glAddSwapHintRectWINWrapperNonstatic(GLint x, GLint y, GLsizei width,
+                                          GLsizei height);
 void glWinSetupDispatchTable(void);
 
 #if 1
diff --git a/xorg-server/hw/xwin/glx/glwrap.c b/xorg-server/hw/xwin/glx/glwrap.c
index 5190d36f7..690b82926 100644
--- a/xorg-server/hw/xwin/glx/glwrap.c
+++ b/xorg-server/hw/xwin/glx/glwrap.c
@@ -51,54 +51,48 @@ static unsigned int glWinDirectProcCalls = 0;
 void
 glWinCallDelta(void)
 {
-  static unsigned int glWinIndirectProcCallsLast = 0;
-  static unsigned int glWinDirectProcCallsLast = 0;
-  if ((glWinIndirectProcCalls != glWinIndirectProcCallsLast) ||
-      (glWinDirectProcCalls != glWinDirectProcCallsLast))
-    {
-      if (glxWinDebugSettings.enableTrace)
-        {
-          ErrorF("after %d direct and %d indirect GL calls\n",
-                 glWinDirectProcCalls - glWinDirectProcCallsLast,
-                 glWinIndirectProcCalls - glWinIndirectProcCallsLast);
+    static unsigned int glWinIndirectProcCallsLast = 0;
+    static unsigned int glWinDirectProcCallsLast = 0;
+
+    if ((glWinIndirectProcCalls != glWinIndirectProcCallsLast) ||
+        (glWinDirectProcCalls != glWinDirectProcCallsLast)) {
+        if (glxWinDebugSettings.enableTrace) {
+            ErrorF("after %d direct and %d indirect GL calls\n",
+                   glWinDirectProcCalls - glWinDirectProcCallsLast,
+                   glWinIndirectProcCalls - glWinIndirectProcCallsLast);
         }
-      glWinDirectProcCallsLast = glWinDirectProcCalls;
-      glWinIndirectProcCallsLast = glWinIndirectProcCalls;
+        glWinDirectProcCallsLast = glWinDirectProcCalls;
+        glWinIndirectProcCallsLast = glWinIndirectProcCalls;
     }
 }
 
 static PROC
-glWinResolveHelper(PROC *cache, char *symbol)
+glWinResolveHelper(PROC * cache, char *symbol)
 {
-  PROC proc = NULL;
-
-  /* If not yet cached, call wglGetProcAddress */
-  if ((*cache) == NULL)
-    {
-      proc = wglGetProcAddress(symbol);
-      if (proc == NULL)
-        {
-          ErrorF("glwrap: Can't resolve \"%s\"\n", symbol);
-          (*cache) = (PROC)-1;
+    PROC proc = NULL;
+
+    /* If not yet cached, call wglGetProcAddress */
+    if ((*cache) == NULL) {
+        proc = wglGetProcAddress(symbol);
+        if (proc == NULL) {
+            ErrorF("glwrap: Can't resolve \"%s\"\n", symbol);
+            (*cache) = (PROC) - 1;
         }
-      else
-        {
-          ErrorF("glwrap: Resolved \"%s\"\n", symbol);
-          (*cache) = proc;
+        else {
+            ErrorF("glwrap: Resolved \"%s\"\n", symbol);
+            (*cache) = proc;
         }
     }
-  /* Cached wglGetProcAddress failure */
-  else if ((*cache) == (PROC)-1)
-    {
-      proc = 0;
+    /* Cached wglGetProcAddress failure */
+    else if ((*cache) == (PROC) - 1) {
+        proc = 0;
     }
-  /* Cached wglGetProcAddress result */
-  else
-    {
-      proc = (*cache);
+    /* Cached wglGetProcAddress result */
+    else {
+        proc = (*cache);
     }
 
-  return proc;
+    return proc;
 }
 
 #define RESOLVE_RET(proctype, symbol, retval) \
@@ -129,20 +123,24 @@ glWinResolveHelper(PROC *cache, char *symbol)
   Special non-static wrapper for glGetString for debug output
 */
 
-const GLubyte* glGetStringWrapperNonstatic(GLenum name)
+const GLubyte *
+glGetStringWrapperNonstatic(GLenum name)
 {
-  return glGetString(name);
+    return glGetString(name);
 }
 
 /*
   Special non-static wrapper for glAddSwapHintRectWIN for copySubBuffers
 */
 
-typedef void (__stdcall *PFNGLADDSWAPHINTRECTWIN)(GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (__stdcall * PFNGLADDSWAPHINTRECTWIN) (GLint x, GLint y,
+                                                    GLsizei width,
+                                                    GLsizei height);
 
-void glAddSwapHintRectWINWrapperNonstatic(GLint x, GLint y, GLsizei width, GLsizei height)
+void
+glAddSwapHintRectWINWrapperNonstatic(GLint x, GLint y, GLsizei width,
+                                     GLsizei height)
 {
-  RESOLVE(PFNGLADDSWAPHINTRECTWIN, "glAddSwapHintRectWIN");
-  proc(x, y, width, height);
+    RESOLVE(PFNGLADDSWAPHINTRECTWIN, "glAddSwapHintRectWIN");
+    proc(x, y, width, height);
 }
-
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 86fef55d1..56f677a8f 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -105,56 +105,53 @@
  *   structure definitions
  */
 
-typedef struct __GLXWinContext  __GLXWinContext;
+typedef struct __GLXWinContext __GLXWinContext;
 typedef struct __GLXWinDrawable __GLXWinDrawable;
 typedef struct __GLXWinScreen glxWinScreen;
 typedef struct __GLXWinConfig GLXWinConfig;
 
 struct __GLXWinContext {
-  __GLXcontext base;
-  HGLRC ctx;                         /* Windows GL Context */
-  __GLXWinContext *shareContext;     /* Context with which we will share display lists and textures */
-  HWND hwnd;                         /* For detecting when HWND has changed */
+    __GLXcontext base;
+    HGLRC ctx;                  /* Windows GL Context */
+    __GLXWinContext *shareContext;      /* Context with which we will share display lists and textures */
+    HWND hwnd;                  /* For detecting when HWND has changed */
 };
 
-struct __GLXWinDrawable
-{
-  __GLXdrawable base;
-  __GLXWinContext *drawContext;
-  __GLXWinContext *readContext;
-
-  /* If this drawable is GLX_DRAWABLE_PBUFFER */
-  HPBUFFERARB hPbuffer;
-
-  /* If this drawable is GLX_DRAWABLE_PIXMAP */
-  HDC dibDC;
-  HBITMAP hDIB;
-  HBITMAP hOldDIB; /* original DIB for DC */
-  void *pOldBits; /* original pBits for this drawable's pixmap */
+struct __GLXWinDrawable {
+    __GLXdrawable base;
+    __GLXWinContext *drawContext;
+    __GLXWinContext *readContext;
+
+    /* If this drawable is GLX_DRAWABLE_PBUFFER */
+    HPBUFFERARB hPbuffer;
+
+    /* If this drawable is GLX_DRAWABLE_PIXMAP */
+    HDC dibDC;
+    HBITMAP hDIB;
+    HBITMAP hOldDIB;            /* original DIB for DC */
+    void *pOldBits;             /* original pBits for this drawable's pixmap */
 };
 
-struct __GLXWinScreen
-{
-  __GLXscreen base;
+struct __GLXWinScreen {
+    __GLXscreen base;
 
-  /* Supported GLX extensions */
-  unsigned char glx_enable_bits[__GLX_EXT_BYTES];
+    /* Supported GLX extensions */
+    unsigned char glx_enable_bits[__GLX_EXT_BYTES];
 
-  Bool has_WGL_ARB_multisample;
-  Bool has_WGL_ARB_pixel_format;
-  Bool has_WGL_ARB_pbuffer;
-  Bool has_WGL_ARB_render_texture;
+    Bool has_WGL_ARB_multisample;
+    Bool has_WGL_ARB_pixel_format;
+    Bool has_WGL_ARB_pbuffer;
+    Bool has_WGL_ARB_render_texture;
 
-  /* wrapped screen functions */
-  RealizeWindowProcPtr RealizeWindow;
-  UnrealizeWindowProcPtr UnrealizeWindow;
-  CopyWindowProcPtr CopyWindow;
+    /* wrapped screen functions */
+    RealizeWindowProcPtr RealizeWindow;
+    UnrealizeWindowProcPtr UnrealizeWindow;
+    CopyWindowProcPtr CopyWindow;
 };
 
-struct __GLXWinConfig
-{
-  __GLXconfig base;
-  int pixelFormatIndex;
+struct __GLXWinConfig {
+    __GLXconfig base;
+    int pixelFormatIndex;
 };
 
 /* ---------------------------------------------------------------------- */
@@ -169,9 +166,10 @@ struct __GLXWinConfig
         GLWIN_DEBUG_MSG("Got HWND %p for window '%s'", hwnd, buffer); \
     }
 
-glxWinDebugSettingsRec glxWinDebugSettings = { 0, 0, 0, 0, 0, 0};
+glxWinDebugSettingsRec glxWinDebugSettings = { 0, 0, 0, 0, 0, 0 };
 
-static void glxWinInitDebugSettings(void)
+static void
+glxWinInitDebugSettings(void)
 {
     char *envptr;
 
@@ -204,8 +202,7 @@ static void glxWinInitDebugSettings(void)
         glxWinDebugSettings.enableWGLcallTrace = (atoi(envptr) == 1);
 
     envptr = getenv("GLWIN_DEBUG_ALL");
-    if (envptr != NULL)
-      {
+    if (envptr != NULL) {
         glxWinDebugSettings.enableDebug = 1;
         glxWinDebugSettings.enableTrace = 1;
         glxWinDebugSettings.dumpPFD = 1;
@@ -213,36 +210,33 @@ static void glxWinInitDebugSettings(void)
         glxWinDebugSettings.dumpDC = 1;
         glxWinDebugSettings.enableGLcallTrace = 1;
         glxWinDebugSettings.enableWGLcallTrace = 1;
-      }
+    }
 }
 
 static
-const char *glxWinErrorMessage(void)
+const char *
+glxWinErrorMessage(void)
 {
-  static char errorbuffer[1024];
-  unsigned int last_error = GetLastError();
-
-  if (!FormatMessage(
-                     FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK,
-                     NULL,
-                     last_error,
-                     0,
-                     (LPTSTR) &errorbuffer,
-                     sizeof(errorbuffer),
-                     NULL ))
-    {
-      snprintf(errorbuffer, sizeof(errorbuffer), "Unknown error");
+    static char errorbuffer[1024];
+    unsigned int last_error = GetLastError();
+
+    if (!FormatMessage
+        (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
+         FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, last_error, 0,
+         (LPTSTR) & errorbuffer, sizeof(errorbuffer), NULL)) {
+        snprintf(errorbuffer, sizeof(errorbuffer), "Unknown error");
     }
 
-  if ((errorbuffer[strlen(errorbuffer)-1] == '\n') || (errorbuffer[strlen(errorbuffer)-1] == '\r'))
-    errorbuffer[strlen(errorbuffer)-1] = 0;
+    if ((errorbuffer[strlen(errorbuffer) - 1] == '\n') ||
+        (errorbuffer[strlen(errorbuffer) - 1] == '\r'))
+        errorbuffer[strlen(errorbuffer) - 1] = 0;
 
-  sprintf(errorbuffer + strlen(errorbuffer), " (%08x)", last_error);
+    sprintf(errorbuffer + strlen(errorbuffer), " (%08x)", last_error);
 
-  return errorbuffer;
+    return errorbuffer;
 }
 
-static void pfdOut(const PIXELFORMATDESCRIPTOR *pfd);
+static void pfdOut(const PIXELFORMATDESCRIPTOR * pfd);
 
 #define DUMP_PFD_FLAG(flag) \
     if (pfd->dwFlags & flag) { \
@@ -250,36 +244,39 @@ static void pfdOut(const PIXELFORMATDESCRIPTOR *pfd);
         pipesym = " | "; \
     }
 
-static void pfdOut(const PIXELFORMATDESCRIPTOR *pfd)
+static void
+pfdOut(const PIXELFORMATDESCRIPTOR * pfd)
 {
-    const char *pipesym = ""; /* will be set after first flag dump */
+    const char *pipesym = "";   /* will be set after first flag dump */
+
     ErrorF("PIXELFORMATDESCRIPTOR:\n");
     ErrorF("nSize = %u\n", pfd->nSize);
     ErrorF("nVersion = %u\n", pfd->nVersion);
     ErrorF("dwFlags = %lu = {", pfd->dwFlags);
-        DUMP_PFD_FLAG(PFD_DOUBLEBUFFER);
-        DUMP_PFD_FLAG(PFD_STEREO);
-        DUMP_PFD_FLAG(PFD_DRAW_TO_WINDOW);
-        DUMP_PFD_FLAG(PFD_DRAW_TO_BITMAP);
-        DUMP_PFD_FLAG(PFD_SUPPORT_GDI);
-        DUMP_PFD_FLAG(PFD_SUPPORT_OPENGL);
-        DUMP_PFD_FLAG(PFD_GENERIC_FORMAT);
-        DUMP_PFD_FLAG(PFD_NEED_PALETTE);
-        DUMP_PFD_FLAG(PFD_NEED_SYSTEM_PALETTE);
-        DUMP_PFD_FLAG(PFD_SWAP_EXCHANGE);
-        DUMP_PFD_FLAG(PFD_SWAP_COPY);
-        DUMP_PFD_FLAG(PFD_SWAP_LAYER_BUFFERS);
-        DUMP_PFD_FLAG(PFD_GENERIC_ACCELERATED);
-        DUMP_PFD_FLAG(PFD_SUPPORT_DIRECTDRAW);
-        DUMP_PFD_FLAG(PFD_DIRECT3D_ACCELERATED);
-        DUMP_PFD_FLAG(PFD_SUPPORT_COMPOSITION);
-        DUMP_PFD_FLAG(PFD_DEPTH_DONTCARE);
-        DUMP_PFD_FLAG(PFD_DOUBLEBUFFER_DONTCARE);
-        DUMP_PFD_FLAG(PFD_STEREO_DONTCARE);
+    DUMP_PFD_FLAG(PFD_DOUBLEBUFFER);
+    DUMP_PFD_FLAG(PFD_STEREO);
+    DUMP_PFD_FLAG(PFD_DRAW_TO_WINDOW);
+    DUMP_PFD_FLAG(PFD_DRAW_TO_BITMAP);
+    DUMP_PFD_FLAG(PFD_SUPPORT_GDI);
+    DUMP_PFD_FLAG(PFD_SUPPORT_OPENGL);
+    DUMP_PFD_FLAG(PFD_GENERIC_FORMAT);
+    DUMP_PFD_FLAG(PFD_NEED_PALETTE);
+    DUMP_PFD_FLAG(PFD_NEED_SYSTEM_PALETTE);
+    DUMP_PFD_FLAG(PFD_SWAP_EXCHANGE);
+    DUMP_PFD_FLAG(PFD_SWAP_COPY);
+    DUMP_PFD_FLAG(PFD_SWAP_LAYER_BUFFERS);
+    DUMP_PFD_FLAG(PFD_GENERIC_ACCELERATED);
+    DUMP_PFD_FLAG(PFD_SUPPORT_DIRECTDRAW);
+    DUMP_PFD_FLAG(PFD_DIRECT3D_ACCELERATED);
+    DUMP_PFD_FLAG(PFD_SUPPORT_COMPOSITION);
+    DUMP_PFD_FLAG(PFD_DEPTH_DONTCARE);
+    DUMP_PFD_FLAG(PFD_DOUBLEBUFFER_DONTCARE);
+    DUMP_PFD_FLAG(PFD_STEREO_DONTCARE);
     ErrorF("}\n");
 
     ErrorF("iPixelType = %hu = %s\n", pfd->iPixelType,
-            (pfd->iPixelType == PFD_TYPE_RGBA ? "PFD_TYPE_RGBA" : "PFD_TYPE_COLORINDEX"));
+           (pfd->iPixelType ==
+            PFD_TYPE_RGBA ? "PFD_TYPE_RGBA" : "PFD_TYPE_COLORINDEX"));
     ErrorF("cColorBits = %hhu\n", pfd->cColorBits);
     ErrorF("cRedBits = %hhu\n", pfd->cRedBits);
     ErrorF("cRedShift = %hhu\n", pfd->cRedShift);
@@ -308,87 +305,88 @@ static void pfdOut(const PIXELFORMATDESCRIPTOR *pfd)
 static const char *
 visual_class_name(int cls)
 {
-  switch (cls) {
-  case GLX_STATIC_COLOR:
-    return "StaticColor";
-  case GLX_PSEUDO_COLOR:
-    return "PseudoColor";
-  case GLX_STATIC_GRAY:
-    return "StaticGray";
-  case GLX_GRAY_SCALE:
-    return "GrayScale";
-  case GLX_TRUE_COLOR:
-     return "TrueColor";
-  case GLX_DIRECT_COLOR:
-     return "DirectColor";
-  default:
-    return "-none-";
-  }
+    switch (cls) {
+    case GLX_STATIC_COLOR:
+        return "StaticColor";
+    case GLX_PSEUDO_COLOR:
+        return "PseudoColor";
+    case GLX_STATIC_GRAY:
+        return "StaticGray";
+    case GLX_GRAY_SCALE:
+        return "GrayScale";
+    case GLX_TRUE_COLOR:
+        return "TrueColor";
+    case GLX_DIRECT_COLOR:
+        return "DirectColor";
+    default:
+        return "-none-";
+    }
 }
 
 static const char *
 swap_method_name(int mthd)
 {
-  switch (mthd)
-    {
+    switch (mthd) {
     case GLX_SWAP_EXCHANGE_OML:
-      return "xchg";
+        return "xchg";
     case GLX_SWAP_COPY_OML:
-      return "copy";
+        return "copy";
     case GLX_SWAP_UNDEFINED_OML:
-      return "    ";
+        return "    ";
     default:
-      return "????";
+        return "????";
     }
 }
 
 static void
-fbConfigsDump(unsigned int n, __GLXconfig *c)
+fbConfigsDump(unsigned int n, __GLXconfig * c)
 {
-  ErrorF("%d fbConfigs\n", n);
-  ErrorF("pxf vis  fb                      render         Ste                     aux    accum        MS    drawable             Group/\n");
-  ErrorF("idx  ID  ID VisualType Depth Lvl RGB CI DB Swap reo  R  G  B  A   Z  S  buf AR AG AB AA  bufs num  W P Pb  Float Trans Caveat\n");
-  ErrorF("-----------------------------------------------------------------------------------------------------------------------------\n");
-
-  while (c != NULL)
-    {
-      unsigned int i = ((GLXWinConfig *)c)->pixelFormatIndex;
-
-      ErrorF("%3d %3x %3x "
-             "%-11s"
-             " %3d %3d   %s   %s  %s %s  %s  "
-             "%2d %2d %2d %2d  "
-             "%2d %2d  "
-             "%2d  "
-             "%2d %2d %2d %2d"
-             "   %2d   %2d"
-             "  %s %s %s "
-             "    %s   "
-             "  %s   "
-             "  %d %s"
-             "\n",
-             i, c->visualID, c->fbconfigID,
-             visual_class_name(c->visualType),
-             c->rgbBits ? c->rgbBits : c->indexBits,
-             c->level,
-	     (c->renderType & GLX_RGBA_BIT) ? "y" : ".",
-	     (c->renderType & GLX_COLOR_INDEX_BIT) ? "y" : ".",
-	     c->doubleBufferMode ? "y" : ".",
-             swap_method_name(c->swapMethod),
-	     c->stereoMode ? "y" : ".",
-             c->redBits, c->greenBits, c->blueBits, c->alphaBits,
-             c->depthBits, c->stencilBits,
-             c->numAuxBuffers,
-             c->accumRedBits, c->accumGreenBits, c->accumBlueBits, c->accumAlphaBits,
-             c->sampleBuffers, c->samples,
-             (c->drawableType & GLX_WINDOW_BIT) ? "y" : ".",
-             (c->drawableType & GLX_PIXMAP_BIT) ? "y" : ".",
-             (c->drawableType & GLX_PBUFFER_BIT) ? "y" : ".",
-             ".",
-             (c->transparentPixel != GLX_NONE_EXT) ? "y" : ".",
-             c->visualSelectGroup, (c->visualRating == GLX_SLOW_VISUAL_EXT) ? "*" : " ");
-
-      c = c->next;
+    ErrorF("%d fbConfigs\n", n);
+    ErrorF
+        ("pxf vis  fb                      render         Ste                     aux    accum        MS    drawable             Group/\n");
+    ErrorF
+        ("idx  ID  ID VisualType Depth Lvl RGB CI DB Swap reo  R  G  B  A   Z  S  buf AR AG AB AA  bufs num  W P Pb  Float Trans Caveat\n");
+    ErrorF
+        ("-----------------------------------------------------------------------------------------------------------------------------\n");
+
+    while (c != NULL) {
+        unsigned int i = ((GLXWinConfig *) c)->pixelFormatIndex;
+
+        ErrorF("%3d %3x %3x "
+               "%-11s"
+               " %3d %3d   %s   %s  %s %s  %s  "
+               "%2d %2d %2d %2d  "
+               "%2d %2d  "
+               "%2d  "
+               "%2d %2d %2d %2d"
+               "   %2d   %2d"
+               "  %s %s %s "
+               "    %s   "
+               "  %s   "
+               "  %d %s"
+               "\n",
+               i, c->visualID, c->fbconfigID,
+               visual_class_name(c->visualType),
+               c->rgbBits ? c->rgbBits : c->indexBits,
+               c->level,
+               (c->renderType & GLX_RGBA_BIT) ? "y" : ".",
+               (c->renderType & GLX_COLOR_INDEX_BIT) ? "y" : ".",
+               c->doubleBufferMode ? "y" : ".",
+               swap_method_name(c->swapMethod),
+               c->stereoMode ? "y" : ".",
+               c->redBits, c->greenBits, c->blueBits, c->alphaBits,
+               c->depthBits, c->stencilBits,
+               c->numAuxBuffers,
+               c->accumRedBits, c->accumGreenBits, c->accumBlueBits,
+               c->accumAlphaBits, c->sampleBuffers, c->samples,
+               (c->drawableType & GLX_WINDOW_BIT) ? "y" : ".",
+               (c->drawableType & GLX_PIXMAP_BIT) ? "y" : ".",
+               (c->drawableType & GLX_PBUFFER_BIT) ? "y" : ".", ".",
+               (c->transparentPixel != GLX_NONE_EXT) ? "y" : ".",
+               c->visualSelectGroup,
+               (c->visualRating == GLX_SLOW_VISUAL_EXT) ? "*" : " ");
+
+        c = c->next;
     }
 }
 
@@ -398,28 +396,33 @@ fbConfigsDump(unsigned int n, __GLXconfig *c)
  */
 
 static __GLXscreen *glxWinScreenProbe(ScreenPtr pScreen);
-static __GLXcontext *glxWinCreateContext(__GLXscreen *screen,
-                                        __GLXconfig *modes,
-                                        __GLXcontext *baseShareContext);
+static __GLXcontext *glxWinCreateContext(__GLXscreen * screen,
+                                         __GLXconfig * modes,
+                                         __GLXcontext * baseShareContext);
 static __GLXdrawable *glxWinCreateDrawable(ClientPtr client,
-                                          __GLXscreen *screen,
-                                          DrawablePtr pDraw,
-                                          XID drawId,
-                                          int type,
-                                          XID glxDrawId,
-                                          __GLXconfig *conf);
+                                           __GLXscreen * screen,
+                                           DrawablePtr pDraw,
+                                           XID drawId,
+                                           int type,
+                                           XID glxDrawId, __GLXconfig * conf);
 
 static Bool glxWinRealizeWindow(WindowPtr pWin);
 static Bool glxWinUnrealizeWindow(WindowPtr pWin);
-static void glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
-
-static HDC glxWinMakeDC(__GLXWinContext *gc, __GLXWinDrawable *draw, HDC *hdc, HWND *hwnd);
-static void glxWinReleaseDC(HWND hwnd, HDC hdc, __GLXWinDrawable *draw);
-
-static void glxWinCreateConfigs(HDC dc, glxWinScreen *screen);
-static void glxWinCreateConfigsExt(HDC hdc, glxWinScreen *screen);
-static int fbConfigToPixelFormat(__GLXconfig *mode, PIXELFORMATDESCRIPTOR *pfdret, int drawableTypeOverride);
-static int fbConfigToPixelFormatIndex(HDC hdc, __GLXconfig *mode, int drawableTypeOverride, glxWinScreen *winScreen);
+static void glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,
+                             RegionPtr prgnSrc);
+
+static HDC glxWinMakeDC(__GLXWinContext * gc, __GLXWinDrawable * draw,
+                        HDC * hdc, HWND * hwnd);
+static void glxWinReleaseDC(HWND hwnd, HDC hdc, __GLXWinDrawable * draw);
+
+static void glxWinCreateConfigs(HDC dc, glxWinScreen * screen);
+static void glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen);
+static int fbConfigToPixelFormat(__GLXconfig * mode,
+                                 PIXELFORMATDESCRIPTOR * pfdret,
+                                 int drawableTypeOverride);
+static int fbConfigToPixelFormatIndex(HDC hdc, __GLXconfig * mode,
+                                      int drawableTypeOverride,
+                                      glxWinScreen * winScreen);
 
 /* ---------------------------------------------------------------------- */
 /*
@@ -435,7 +438,7 @@ __GLXprovider __glXWGLProvider = {
 void
 glxWinPushNativeProvider(void)
 {
-  GlxPushProvider(&__glXWGLProvider);
+    GlxPushProvider(&__glXWGLProvider);
 }
 
 /* ---------------------------------------------------------------------- */
@@ -444,7 +447,7 @@ glxWinPushNativeProvider(void)
  */
 
 static void
-glxWinScreenDestroy(__GLXscreen *screen)
+glxWinScreenDestroy(__GLXscreen * screen)
 {
     GLWIN_DEBUG_MSG("glxWinScreenDestroy(%p)", screen);
     __glXScreenDestroy(screen);
@@ -452,14 +455,15 @@ glxWinScreenDestroy(__GLXscreen *screen)
 }
 
 static int
-glxWinScreenSwapInterval(__GLXdrawable *drawable, int interval)
+glxWinScreenSwapInterval(__GLXdrawable * drawable, int interval)
 {
-  BOOL ret = wglSwapIntervalEXTWrapper(interval);
-  if (!ret)
-    {
-      ErrorF("wglSwapIntervalEXT interval %d failed:%s\n", interval, glxWinErrorMessage());
+    BOOL ret = wglSwapIntervalEXTWrapper(interval);
+
+    if (!ret) {
+        ErrorF("wglSwapIntervalEXT interval %d failed:%s\n", interval,
+               glxWinErrorMessage());
     }
-  return ret;
+    return ret;
 }
 
 /*
@@ -468,44 +472,41 @@ glxWinScreenSwapInterval(__GLXdrawable *drawable, int interval)
 static void
 glxLogExtensions(const char *prefix, const char *extensions)
 {
-  int length = 0;
-  char *strl;
-  char *str = strdup(extensions);
+    int length = 0;
+    char *strl;
+    char *str = strdup(extensions);
 
-  if (str == NULL)
-    {
-      ErrorF("glxLogExtensions: xalloc error\n");
-      return;
+    if (str == NULL) {
+        ErrorF("glxLogExtensions: xalloc error\n");
+        return;
     }
 
-  strl = strtok(str, " ");
-  ErrorF("%s%s", prefix, strl);
-  length = strlen(prefix) + strlen(strl);
+    strl = strtok(str, " ");
+    ErrorF("%s%s", prefix, strl);
+    length = strlen(prefix) + strlen(strl);
 
-  while (1)
-    {
-      strl = strtok(NULL, " ");
-      if (strl == NULL) break;
+    while (1) {
+        strl = strtok(NULL, " ");
+        if (strl == NULL)
+            break;
 
-      if (length + strlen(strl) + 1 > 120)
-        {
-          ErrorF("\n");
-          ErrorF("%s",prefix);
-          length = strlen(prefix);
+        if (length + strlen(strl) + 1 > 120) {
+            ErrorF("\n");
+            ErrorF("%s", prefix);
+            length = strlen(prefix);
         }
-      else
-        {
-          ErrorF(" ");
-          length++;
+        else {
+            ErrorF(" ");
+            length++;
         }
 
-      ErrorF("%s", strl);
-      length = length + strlen(strl);
+        ErrorF("%s", strl);
+        length = length + strlen(strl);
     }
 
-  ErrorF("\n");
+    ErrorF("\n");
 
-  free(str);
+    free(str);
 }
 
 /* This is called by GlxExtensionInit() asking the GLX provider if it can handle the screen... */
@@ -524,18 +525,18 @@ glxWinScreenProbe(ScreenPtr pScreen)
     glxWinInitDebugSettings();
 
     if (pScreen == NULL)
-	return NULL;
+        return NULL;
 
-    if (!winCheckScreenAiglxIsSupported(pScreen))
-      {
-        LogMessage(X_ERROR,"AIGLX: No native OpenGL in modes with a root window\n");
+    if (!winCheckScreenAiglxIsSupported(pScreen)) {
+        LogMessage(X_ERROR,
+                   "AIGLX: No native OpenGL in modes with a root window\n");
         return NULL;
-      }
+    }
 
     screen = calloc(1, sizeof(glxWinScreen));
 
     if (NULL == screen)
-	return NULL;
+        return NULL;
 
     /* Wrap RealizeWindow, UnrealizeWindow and CopyWindow on this screen */
     screen->RealizeWindow = pScreen->RealizeWindow;
@@ -550,33 +551,36 @@ glxWinScreenProbe(ScreenPtr pScreen)
     // create window class
 #define WIN_GL_TEST_WINDOW_CLASS "XWinGLTest"
     {
-      static wATOM glTestWndClass = 0;
-      if (glTestWndClass == 0)
-        {
-          WNDCLASSEX wc;
-          wc.cbSize = sizeof(WNDCLASSEX);
-          wc.style = CS_HREDRAW | CS_VREDRAW;
-          wc.lpfnWndProc = DefWindowProc;
-          wc.cbClsExtra = 0;
-          wc.cbWndExtra = 0;
-          wc.hInstance = GetModuleHandle(NULL);
-          wc.hIcon = 0;
-          wc.hCursor = 0;
-          wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
-          wc.lpszMenuName = NULL;
-          wc.lpszClassName = WIN_GL_TEST_WINDOW_CLASS;
-          wc.hIconSm = 0;
-          RegisterClassEx (&wc);
-      }
+        static wATOM glTestWndClass = 0;
+
+        if (glTestWndClass == 0) {
+            WNDCLASSEX wc;
+
+            wc.cbSize = sizeof(WNDCLASSEX);
+            wc.style = CS_HREDRAW | CS_VREDRAW;
+            wc.lpfnWndProc = DefWindowProc;
+            wc.cbClsExtra = 0;
+            wc.cbWndExtra = 0;
+            wc.hInstance = GetModuleHandle(NULL);
+            wc.hIcon = 0;
+            wc.hCursor = 0;
+            wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+            wc.lpszMenuName = NULL;
+            wc.lpszClassName = WIN_GL_TEST_WINDOW_CLASS;
+            wc.hIconSm = 0;
+            RegisterClassEx(&wc);
+        }
     }
 
     // create an invisible window for a scratch DC
     hwnd = CreateWindowExA(0,
                            WIN_GL_TEST_WINDOW_CLASS,
                            "XWin GL Renderer Capabilities Test Window",
-                           0, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);
+                           0, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL),
+                           NULL);
     if (hwnd == NULL)
-      LogMessage(X_ERROR,"AIGLX: Couldn't create a window for render capabilities testing\n");
+        LogMessage(X_ERROR,
+                   "AIGLX: Couldn't create a window for render capabilities testing\n");
 
     hdc = GetDC(hwnd);
 
@@ -592,10 +596,11 @@ glxWinScreenProbe(ScreenPtr pScreen)
     ErrorF("GL_VERSION:     %s\n", glGetStringWrapperNonstatic(GL_VERSION));
     ErrorF("GL_VENDOR:      %s\n", glGetStringWrapperNonstatic(GL_VENDOR));
     ErrorF("GL_RENDERER:    %s\n", glGetStringWrapperNonstatic(GL_RENDERER));
-    gl_extensions = (const char *)glGetStringWrapperNonstatic(GL_EXTENSIONS);
+    gl_extensions = (const char *) glGetStringWrapperNonstatic(GL_EXTENSIONS);
     glxLogExtensions("GL_EXTENSIONS:  ", gl_extensions);
     wgl_extensions = wglGetExtensionsStringARBWrapper(hdc);
-    if (!wgl_extensions) wgl_extensions = "";
+    if (!wgl_extensions)
+        wgl_extensions = "";
     glxLogExtensions("WGL_EXTENSIONS: ", wgl_extensions);
 
     // Can you see the problem here?  The extensions string is DC specific
@@ -604,48 +609,50 @@ glxWinScreenProbe(ScreenPtr pScreen)
     // those screens to be accelerated in XP and earlier...
 
     {
-      // testing facility to not use any WGL extensions
-      char *envptr = getenv("GLWIN_NO_WGL_EXTENSIONS");
-      if ((envptr != NULL) && (atoi(envptr) != 0))
-        {
-          ErrorF("GLWIN_NO_WGL_EXTENSIONS is set, ignoring WGL_EXTENSIONS\n");
-          wgl_extensions = "";
+        // testing facility to not use any WGL extensions
+        char *envptr = getenv("GLWIN_NO_WGL_EXTENSIONS");
+
+        if ((envptr != NULL) && (atoi(envptr) != 0)) {
+            ErrorF("GLWIN_NO_WGL_EXTENSIONS is set, ignoring WGL_EXTENSIONS\n");
+            wgl_extensions = "";
         }
     }
 
     {
-      Bool glx_sgi_make_current_read = FALSE;
-
-      //
-      // Based on the WGL extensions available, enable various GLX extensions
-      // XXX: make this table-driven ?
-      //
-      memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES);
-
-      __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info");
-      __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating");
-      __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context");
-      __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method");
-      __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig");
-
-      if (strstr(wgl_extensions, "WGL_ARB_make_current_read"))
-        {
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGI_make_current_read");
-          LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_make_current_read\n");
-          glx_sgi_make_current_read = TRUE;
+        Bool glx_sgi_make_current_read = FALSE;
+
+        //
+        // Based on the WGL extensions available, enable various GLX extensions
+        // XXX: make this table-driven ?
+        //
+        memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES);
+
+        __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info");
+        __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating");
+        __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context");
+        __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method");
+        __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig");
+
+        if (strstr(wgl_extensions, "WGL_ARB_make_current_read")) {
+            __glXEnableExtension(screen->glx_enable_bits,
+                                 "GLX_SGI_make_current_read");
+            LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_make_current_read\n");
+            glx_sgi_make_current_read = TRUE;
         }
 
-      if (strstr(gl_extensions, "GL_WIN_swap_hint"))
-        {
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_MESA_copy_sub_buffer");
-          LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
+        if (strstr(gl_extensions, "GL_WIN_swap_hint")) {
+            __glXEnableExtension(screen->glx_enable_bits,
+                                 "GLX_MESA_copy_sub_buffer");
+            LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
         }
 
-      if (strstr(wgl_extensions, "WGL_EXT_swap_control"))
-        {
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGI_swap_control");
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_MESA_swap_control");
-          LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
+        if (strstr(wgl_extensions, "WGL_EXT_swap_control")) {
+            __glXEnableExtension(screen->glx_enable_bits,
+                                 "GLX_SGI_swap_control");
+            __glXEnableExtension(screen->glx_enable_bits,
+                                 "GLX_MESA_swap_control");
+            LogMessage(X_INFO,
+                       "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
         }
 
 /*       // Hmm?  screen->texOffset */
@@ -656,105 +663,102 @@ glxWinScreenProbe(ScreenPtr pScreen)
 /*           screen->has_WGL_ARB_render_texture = TRUE; */
 /*         } */
 
-      if (strstr(wgl_extensions, "WGL_ARB_pbuffer"))
-        {
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_pbuffer");
-          LogMessage(X_INFO, "AIGLX: enabled GLX_SGIX_pbuffer\n");
-          screen->has_WGL_ARB_pbuffer = TRUE;
+        if (strstr(wgl_extensions, "WGL_ARB_pbuffer")) {
+            __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_pbuffer");
+            LogMessage(X_INFO, "AIGLX: enabled GLX_SGIX_pbuffer\n");
+            screen->has_WGL_ARB_pbuffer = TRUE;
         }
 
-      if (strstr(wgl_extensions, "WGL_ARB_multisample"))
-        {
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample");
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample");
-          LogMessage(X_INFO, "AIGLX: enabled GLX_ARB_multisample and GLX_SGIS_multisample\n");
-          screen->has_WGL_ARB_multisample = TRUE;
+        if (strstr(wgl_extensions, "WGL_ARB_multisample")) {
+            __glXEnableExtension(screen->glx_enable_bits,
+                                 "GLX_ARB_multisample");
+            __glXEnableExtension(screen->glx_enable_bits,
+                                 "GLX_SGIS_multisample");
+            LogMessage(X_INFO,
+                       "AIGLX: enabled GLX_ARB_multisample and GLX_SGIS_multisample\n");
+            screen->has_WGL_ARB_multisample = TRUE;
         }
 
-      screen->base.destroy = glxWinScreenDestroy;
-      screen->base.createContext = glxWinCreateContext;
-      screen->base.createDrawable = glxWinCreateDrawable;
-      screen->base.swapInterval = glxWinScreenSwapInterval;
-      screen->base.pScreen = pScreen;
-
-      // Creating the fbConfigs initializes screen->base.fbconfigs and screen->base.numFBConfigs
-      if (strstr(wgl_extensions, "WGL_ARB_pixel_format"))
-        {
-          glxWinCreateConfigsExt(hdc, screen);
-
-          /*
-            Some graphics drivers appear to advertise WGL_ARB_pixel_format,
-            but it doesn't work usefully, so we have to be prepared for it
-            to fail and fall back to using DescribePixelFormat()
-          */
-          if (screen->base.numFBConfigs > 0)
-            {
-              screen->has_WGL_ARB_pixel_format = TRUE;
+        screen->base.destroy = glxWinScreenDestroy;
+        screen->base.createContext = glxWinCreateContext;
+        screen->base.createDrawable = glxWinCreateDrawable;
+        screen->base.swapInterval = glxWinScreenSwapInterval;
+        screen->base.pScreen = pScreen;
+
+        // Creating the fbConfigs initializes screen->base.fbconfigs and screen->base.numFBConfigs
+        if (strstr(wgl_extensions, "WGL_ARB_pixel_format")) {
+            glxWinCreateConfigsExt(hdc, screen);
+
+            /*
+               Some graphics drivers appear to advertise WGL_ARB_pixel_format,
+               but it doesn't work usefully, so we have to be prepared for it
+               to fail and fall back to using DescribePixelFormat()
+             */
+            if (screen->base.numFBConfigs > 0) {
+                screen->has_WGL_ARB_pixel_format = TRUE;
             }
         }
 
-      if (screen->base.numFBConfigs <= 0)
-        {
-          glxWinCreateConfigs(hdc, screen);
-          screen->has_WGL_ARB_pixel_format = FALSE;
+        if (screen->base.numFBConfigs <= 0) {
+            glxWinCreateConfigs(hdc, screen);
+            screen->has_WGL_ARB_pixel_format = FALSE;
         }
 
-      /*
-        If we still didn't get any fbConfigs, we can't provide GLX for this screen
-       */
-      if (screen->base.numFBConfigs <= 0)
-        {
-          free(screen);
-          LogMessage(X_ERROR,"AIGLX: No fbConfigs could be made from native OpenGL pixel formats\n");
-          return NULL;
-        }
-
-      /* These will be set by __glXScreenInit */
-      screen->base.visuals = NULL;
-      screen->base.numVisuals = 0;
-
-      __glXScreenInit(&screen->base, pScreen);
-
-      // dump out fbConfigs now fbConfigIds and visualIDs have been assigned
-      fbConfigsDump(screen->base.numFBConfigs, screen->base.fbconfigs);
-
-      // Override the GL extensions string set by __glXScreenInit()
-      screen->base.GLextensions = strdup(gl_extensions);
-
-      // Generate the GLX extensions string (overrides that set by __glXScreenInit())
-      {
-        unsigned int buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);
-        if (buffer_size > 0)
-          {
-            free(screen->base.GLXextensions);
-
-            screen->base.GLXextensions = xnfalloc(buffer_size);
-            __glXGetExtensionString(screen->glx_enable_bits, screen->base.GLXextensions);
-          }
-      }
-
-      //
-      // Override the GLX version (__glXScreenInit() sets it to "1.2")
-      // if we have all the needed extensions to operate as a higher version
-      //
-      // SGIX_fbconfig && SGIX_pbuffer && SGI_make_current_read -> 1.3
-      // ARB_multisample -> 1.4
-      //
-      if (screen->has_WGL_ARB_pbuffer && glx_sgi_make_current_read)
+        /*
+           If we still didn't get any fbConfigs, we can't provide GLX for this screen
+         */
+        if (screen->base.numFBConfigs <= 0) {
+            free(screen);
+            LogMessage(X_ERROR,
+                       "AIGLX: No fbConfigs could be made from native OpenGL pixel formats\n");
+            return NULL;
+        }
+
+        /* These will be set by __glXScreenInit */
+        screen->base.visuals = NULL;
+        screen->base.numVisuals = 0;
+
+        __glXScreenInit(&screen->base, pScreen);
+
+        // dump out fbConfigs now fbConfigIds and visualIDs have been assigned
+        fbConfigsDump(screen->base.numFBConfigs, screen->base.fbconfigs);
+
+        // Override the GL extensions string set by __glXScreenInit()
+        screen->base.GLextensions = strdup(gl_extensions);
+
+        // Generate the GLX extensions string (overrides that set by __glXScreenInit())
         {
-          if (screen->has_WGL_ARB_multisample)
-            {
-              screen->base.GLXmajor = 1;
-              screen->base.GLXminor = 4;
+            unsigned int buffer_size =
+                __glXGetExtensionString(screen->glx_enable_bits, NULL);
+            if (buffer_size > 0) {
+                free(screen->base.GLXextensions);
+
+                screen->base.GLXextensions = xnfalloc(buffer_size);
+                __glXGetExtensionString(screen->glx_enable_bits,
+                                        screen->base.GLXextensions);
             }
-          else
-            {
-              screen->base.GLXmajor = 1;
-              screen->base.GLXminor = 3;
+        }
+
+        //
+        // Override the GLX version (__glXScreenInit() sets it to "1.2")
+        // if we have all the needed extensions to operate as a higher version
+        //
+        // SGIX_fbconfig && SGIX_pbuffer && SGI_make_current_read -> 1.3
+        // ARB_multisample -> 1.4
+        //
+        if (screen->has_WGL_ARB_pbuffer && glx_sgi_make_current_read) {
+            if (screen->has_WGL_ARB_multisample) {
+                screen->base.GLXmajor = 1;
+                screen->base.GLXminor = 4;
+            }
+            else {
+                screen->base.GLXmajor = 1;
+                screen->base.GLXminor = 3;
             }
         }
     }
-    LogMessage(X_INFO, "AIGLX: Set GLX version to %d.%d\n", screen->base.GLXmajor, screen->base.GLXminor);
+    LogMessage(X_INFO, "AIGLX: Set GLX version to %d.%d\n",
+               screen->base.GLXmajor, screen->base.GLXminor);
 
     wglMakeCurrent(NULL, NULL);
     wglDeleteContext(hglrc);
@@ -786,7 +790,6 @@ glxWinRealizeWindow(WindowPtr pWin)
     return result;
 }
 
-
 static void
 glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
@@ -796,9 +799,8 @@ glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 
     GLWIN_TRACE_MSG("glxWinCopyWindow pWindow %p", pWindow);
 
-    dixLookupResourceByType((pointer) &pGlxDraw, pWindow->drawable.id, __glXDrawableRes,
-				NullClient, DixUnknownAccess);
-
+    dixLookupResourceByType((pointer) &pGlxDraw, pWindow->drawable.id,
+                            __glXDrawableRes, NullClient, DixUnknownAccess);
 
     /*
        Discard any CopyWindow requests if a GL drawing context is pointing at the window
@@ -806,12 +808,11 @@ glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
        For regions which are being drawn by GL, the shadow framebuffer doesn't have the
        correct bits, so we wish to avoid shadow framebuffer damage occuring, which will
        cause those incorrect bits to be transferred to the display....
-    */
-    if (pGlxDraw && pGlxDraw->drawContext)
-      {
+     */
+    if (pGlxDraw && pGlxDraw->drawContext) {
         GLWIN_DEBUG_MSG("glxWinCopyWindow: discarding");
         return;
-      }
+    }
 
     GLWIN_DEBUG_MSG("glxWinCopyWindow - passing to hw layer");
 
@@ -825,7 +826,7 @@ glxWinUnrealizeWindow(WindowPtr pWin)
 {
     Bool result;
     ScreenPtr pScreen = pWin->drawable.pScreen;
-    glxWinScreen *screenPriv = (glxWinScreen *)glxGetScreen(pScreen);
+    glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen);
 
     GLWIN_DEBUG_MSG("glxWinUnrealizeWindow");
 
@@ -842,132 +843,126 @@ glxWinUnrealizeWindow(WindowPtr pWin)
  */
 
 static GLboolean
-glxWinDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base)
+glxWinDrawableSwapBuffers(ClientPtr client, __GLXdrawable * base)
 {
     HDC dc;
     HWND hwnd;
     BOOL ret;
-    __GLXWinDrawable *draw = (__GLXWinDrawable *)base;
+    __GLXWinDrawable *draw = (__GLXWinDrawable *) base;
 
     /* Swap buffers on the last active context for drawing on the drawable */
-    if (draw->drawContext == NULL)
-      {
+    if (draw->drawContext == NULL) {
         GLWIN_TRACE_MSG("glxWinSwapBuffers - no context for drawable");
         return GL_FALSE;
-      }
+    }
 
-    GLWIN_TRACE_MSG("glxWinSwapBuffers on drawable %p, last context %p (native ctx %p)", base, draw->drawContext, draw->drawContext->ctx);
+    GLWIN_TRACE_MSG
+        ("glxWinSwapBuffers on drawable %p, last context %p (native ctx %p)",
+         base, draw->drawContext, draw->drawContext->ctx);
 
     /*
        draw->drawContext->base.drawPriv will not be set if the context is not current anymore,
        but if it is, it should point to this drawable....
-    */
-    assert((draw->drawContext->base.drawPriv == NULL) || (draw->drawContext->base.drawPriv == base));
+     */
+    assert((draw->drawContext->base.drawPriv == NULL) ||
+           (draw->drawContext->base.drawPriv == base));
 
     dc = glxWinMakeDC(draw->drawContext, draw, &dc, &hwnd);
     if (dc == NULL)
-      return GL_FALSE;
+        return GL_FALSE;
 
     ret = wglSwapLayerBuffers(dc, WGL_SWAP_MAIN_PLANE);
 
     glxWinReleaseDC(hwnd, dc, draw);
 
-    if (!ret)
-      {
+    if (!ret) {
         ErrorF("wglSwapBuffers failed: %s\n", glxWinErrorMessage());
         return GL_FALSE;
-      }
+    }
 
     return GL_TRUE;
 }
 
 static void
-glxWinDrawableCopySubBuffer(__GLXdrawable *drawable,
+glxWinDrawableCopySubBuffer(__GLXdrawable * drawable,
                             int x, int y, int w, int h)
 {
-  glAddSwapHintRectWINWrapperNonstatic(x, y, w, h);
-  glxWinDrawableSwapBuffers(NULL, drawable);
+    glAddSwapHintRectWINWrapperNonstatic(x, y, w, h);
+    glxWinDrawableSwapBuffers(NULL, drawable);
 }
 
 static void
-glxWinDrawableDestroy(__GLXdrawable *base)
+glxWinDrawableDestroy(__GLXdrawable * base)
 {
-  __GLXWinDrawable *glxPriv = (__GLXWinDrawable *)base;
+    __GLXWinDrawable *glxPriv = (__GLXWinDrawable *) base;
+
+    if (glxPriv->drawContext &&
+        (__glXLastContext == &((glxPriv->drawContext)->base))) {
+        // if this context is current and has unflushed commands, say we have flushed them
+        // (don't actually flush them, the window is going away anyhow, and an implict flush occurs
+        // on the next context change)
+        // (GLX core considers it an error when we try to select a new current context if the old one
+        // has unflushed commands, but the window has disappeared..)
+        __glXLastContext->hasUnflushedCommands = FALSE;
+        __glXLastContext = NULL;
+    }
 
-  if (glxPriv->drawContext && (__glXLastContext == &((glxPriv->drawContext)->base)))
-    {
-      // if this context is current and has unflushed commands, say we have flushed them
-      // (don't actually flush them, the window is going away anyhow, and an implict flush occurs
-      // on the next context change)
-      // (GLX core considers it an error when we try to select a new current context if the old one
-      // has unflushed commands, but the window has disappeared..)
-      __glXLastContext->hasUnflushedCommands = FALSE;
-      __glXLastContext = NULL;
-    }
-
-  if (glxPriv->hPbuffer)
-    if (!wglDestroyPbufferARBWrapper(glxPriv->hPbuffer))
-      {
-        ErrorF("wglDestroyPbufferARB failed: %s\n", glxWinErrorMessage());
-      }
-
-  if (glxPriv->dibDC)
-    {
-      // restore the default DIB
-      SelectObject(glxPriv->dibDC, glxPriv->hOldDIB);
+    if (glxPriv->hPbuffer)
+        if (!wglDestroyPbufferARBWrapper(glxPriv->hPbuffer)) {
+            ErrorF("wglDestroyPbufferARB failed: %s\n", glxWinErrorMessage());
+        }
 
-      if (!DeleteDC(glxPriv->dibDC))
-        {
-          ErrorF("DeleteDC failed: %s\n", glxWinErrorMessage());
+    if (glxPriv->dibDC) {
+        // restore the default DIB
+        SelectObject(glxPriv->dibDC, glxPriv->hOldDIB);
+
+        if (!DeleteDC(glxPriv->dibDC)) {
+            ErrorF("DeleteDC failed: %s\n", glxWinErrorMessage());
         }
     }
 
-  if (glxPriv->hDIB)
-    {
-      if (!DeleteObject(glxPriv->hDIB))
-        {
-          ErrorF("DeleteObject failed: %s\n", glxWinErrorMessage());
+    if (glxPriv->hDIB) {
+        if (!DeleteObject(glxPriv->hDIB)) {
+            ErrorF("DeleteObject failed: %s\n", glxWinErrorMessage());
         }
 
-      ((PixmapPtr)glxPriv->base.pDraw)->devPrivate.ptr = glxPriv->pOldBits;
+        ((PixmapPtr) glxPriv->base.pDraw)->devPrivate.ptr = glxPriv->pOldBits;
     }
 
-  GLWIN_DEBUG_MSG("glxWinDestroyDrawable");
-  free(glxPriv);
+    GLWIN_DEBUG_MSG("glxWinDestroyDrawable");
+    free(glxPriv);
 }
 
 static __GLXdrawable *
 glxWinCreateDrawable(ClientPtr client,
-                    __GLXscreen *screen,
-                    DrawablePtr pDraw,
-                    XID drawId,
-                    int type,
-                    XID glxDrawId,
-                    __GLXconfig *conf)
+                     __GLXscreen * screen,
+                     DrawablePtr pDraw,
+                     XID drawId, int type, XID glxDrawId, __GLXconfig * conf)
 {
-  __GLXWinDrawable *glxPriv;
+    __GLXWinDrawable *glxPriv;
 
-  glxPriv = malloc(sizeof *glxPriv);
+    glxPriv = malloc(sizeof *glxPriv);
 
-  if (glxPriv == NULL)
-      return NULL;
+    if (glxPriv == NULL)
+        return NULL;
 
-  memset(glxPriv, 0, sizeof *glxPriv);
+    memset(glxPriv, 0, sizeof *glxPriv);
 
-  if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
-    free(glxPriv);
-    return NULL;
-  }
+    if (!__glXDrawableInit
+        (&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
+        free(glxPriv);
+        return NULL;
+    }
 
-  glxPriv->base.destroy       = glxWinDrawableDestroy;
-  glxPriv->base.swapBuffers   = glxWinDrawableSwapBuffers;
-  glxPriv->base.copySubBuffer = glxWinDrawableCopySubBuffer;
-  // glxPriv->base.waitX  what are these for?
-  // glxPriv->base.waitGL
+    glxPriv->base.destroy = glxWinDrawableDestroy;
+    glxPriv->base.swapBuffers = glxWinDrawableSwapBuffers;
+    glxPriv->base.copySubBuffer = glxWinDrawableCopySubBuffer;
+    // glxPriv->base.waitX  what are these for?
+    // glxPriv->base.waitGL
 
-  GLWIN_DEBUG_MSG("glxWinCreateDrawable %p", glxPriv);
+    GLWIN_DEBUG_MSG("glxWinCreateDrawable %p", glxPriv);
 
-  return &glxPriv->base;
+    return &glxPriv->base;
 }
 
 /* ---------------------------------------------------------------------- */
@@ -976,21 +971,21 @@ glxWinCreateDrawable(ClientPtr client,
  */
 
 static
-int glxWinBindTexImage(__GLXcontext  *baseContext,
-                      int            buffer,
-                      __GLXdrawable *pixmap)
+    int
+glxWinBindTexImage(__GLXcontext * baseContext,
+                   int buffer, __GLXdrawable * pixmap)
 {
-  ErrorF("glxWinBindTexImage: not implemented\n");
-  return FALSE;
+    ErrorF("glxWinBindTexImage: not implemented\n");
+    return FALSE;
 }
 
 static
-int glxWinReleaseTexImage(__GLXcontext  *baseContext,
-                         int            buffer,
-                         __GLXdrawable *pixmap)
+    int
+glxWinReleaseTexImage(__GLXcontext * baseContext,
+                      int buffer, __GLXdrawable * pixmap)
 {
-  ErrorF(" glxWinReleaseTexImage: not implemented\n");
-  return FALSE;
+    ErrorF(" glxWinReleaseTexImage: not implemented\n");
+    return FALSE;
 }
 
 /* ---------------------------------------------------------------------- */
@@ -1013,41 +1008,44 @@ int glxWinReleaseTexImage(__GLXcontext  *baseContext,
  */
 
 static Bool
-glxWinSetPixelFormat(__GLXWinContext *gc, HDC hdc, int bppOverride, int drawableTypeOverride)
+glxWinSetPixelFormat(__GLXWinContext * gc, HDC hdc, int bppOverride,
+                     int drawableTypeOverride)
 {
-  __GLXscreen *screen = gc->base.pGlxScreen;
-  glxWinScreen *winScreen = (glxWinScreen *)screen;
-
-  __GLXconfig *config = gc->base.config;
-  GLXWinConfig *winConfig = (GLXWinConfig *)config;
+    __GLXscreen *screen = gc->base.pGlxScreen;
+    glxWinScreen *winScreen = (glxWinScreen *) screen;
 
-  GLWIN_DEBUG_MSG("glxWinSetPixelFormat: pixelFormatIndex %d", winConfig->pixelFormatIndex);
+    __GLXconfig *config = gc->base.config;
+    GLXWinConfig *winConfig = (GLXWinConfig *) config;
 
-  /*
-    Normally, we can just use the the pixelFormatIndex corresponding
-    to the fbconfig which has been specified by the client
-  */
+    GLWIN_DEBUG_MSG("glxWinSetPixelFormat: pixelFormatIndex %d",
+                    winConfig->pixelFormatIndex);
 
-  if (!((bppOverride && (bppOverride != (config->redBits + config->greenBits + config->blueBits) ))
-        || ((config->drawableType & drawableTypeOverride) == 0)))
-    {
-      if (!SetPixelFormat(hdc, winConfig->pixelFormatIndex, NULL))
-        {
-          ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
-          return FALSE;
+    /*
+       Normally, we can just use the the pixelFormatIndex corresponding
+       to the fbconfig which has been specified by the client
+     */
+
+    if (!
+        ((bppOverride &&
+          (bppOverride !=
+           (config->redBits + config->greenBits + config->blueBits)))
+         || ((config->drawableType & drawableTypeOverride) == 0))) {
+        if (!SetPixelFormat(hdc, winConfig->pixelFormatIndex, NULL)) {
+            ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
+            return FALSE;
         }
 
-      return TRUE;
+        return TRUE;
     }
 
-  /*
-    However, in certain special cases this pixel format will be incompatible with the
-    use we are going to put it to, so we need to re-evaluate the pixel format to use:
+    /*
+       However, in certain special cases this pixel format will be incompatible with the
+       use we are going to put it to, so we need to re-evaluate the pixel format to use:
 
-    1) When PFD_DRAW_TO_BITMAP is set, ChoosePixelFormat() always returns a format with
+       1) When PFD_DRAW_TO_BITMAP is set, ChoosePixelFormat() always returns a format with
        the cColorBits we asked for, so we need to ensure it matches the bpp of the bitmap
 
-    2) Applications may assume that visuals selected with glXChooseVisual() work with
+       2) Applications may assume that visuals selected with glXChooseVisual() work with
        pixmap drawables (there is no attribute to explicitly query for pixmap drawable
        support as there is for glXChooseFBConfig())
        (it's arguable this is an error in the application, but we try to make it work)
@@ -1056,348 +1054,363 @@ glxWinSetPixelFormat(__GLXWinContext *gc, HDC hdc, int bppOverride, int drawable
        by default, but if the actual drawable type we're trying to select the context
        on (drawableTypeOverride) isn't supported by the selected fbConfig, reconsider
        and see if we can find a suitable one...
-   */
-  ErrorF("glxWinSetPixelFormat: having second thoughts: cColorbits %d, bppOveride %d; config->drawableType %d, drawableTypeOverride %d\n",
-         (config->redBits + config->greenBits + config->blueBits), bppOverride, config->drawableType, drawableTypeOverride);
-
-  if (!winScreen->has_WGL_ARB_pixel_format)
-    {
-      PIXELFORMATDESCRIPTOR pfd;
-      int pixelFormat;
-
-      /* convert fbConfig to PFD */
-      if (fbConfigToPixelFormat(gc->base.config, &pfd, drawableTypeOverride))
-        {
-          ErrorF("glxWinSetPixelFormat: fbConfigToPixelFormat failed\n");
-          return FALSE;
+     */
+    ErrorF
+        ("glxWinSetPixelFormat: having second thoughts: cColorbits %d, bppOveride %d; config->drawableType %d, drawableTypeOverride %d\n",
+         (config->redBits + config->greenBits + config->blueBits), bppOverride,
+         config->drawableType, drawableTypeOverride);
+
+    if (!winScreen->has_WGL_ARB_pixel_format) {
+        PIXELFORMATDESCRIPTOR pfd;
+        int pixelFormat;
+
+        /* convert fbConfig to PFD */
+        if (fbConfigToPixelFormat(gc->base.config, &pfd, drawableTypeOverride)) {
+            ErrorF("glxWinSetPixelFormat: fbConfigToPixelFormat failed\n");
+            return FALSE;
         }
 
-      if (glxWinDebugSettings.dumpPFD)
-        pfdOut(&pfd);
+        if (glxWinDebugSettings.dumpPFD)
+            pfdOut(&pfd);
 
-      if (bppOverride)
-        {
-          GLWIN_DEBUG_MSG("glxWinSetPixelFormat: Forcing bpp from %d to %d\n", pfd.cColorBits, bppOverride);
-          pfd.cColorBits = bppOverride;
+        if (bppOverride) {
+            GLWIN_DEBUG_MSG("glxWinSetPixelFormat: Forcing bpp from %d to %d\n",
+                            pfd.cColorBits, bppOverride);
+            pfd.cColorBits = bppOverride;
         }
 
-      pixelFormat = ChoosePixelFormat(hdc, &pfd);
-      if (pixelFormat == 0)
-        {
-          ErrorF("ChoosePixelFormat error: %s\n", glxWinErrorMessage());
-          return FALSE;
+        pixelFormat = ChoosePixelFormat(hdc, &pfd);
+        if (pixelFormat == 0) {
+            ErrorF("ChoosePixelFormat error: %s\n", glxWinErrorMessage());
+            return FALSE;
         }
 
-      GLWIN_DEBUG_MSG("ChoosePixelFormat: chose pixelFormatIndex %d", pixelFormat);
-      ErrorF("ChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n", pixelFormat, winConfig->pixelFormatIndex);
+        GLWIN_DEBUG_MSG("ChoosePixelFormat: chose pixelFormatIndex %d",
+                        pixelFormat);
+        ErrorF
+            ("ChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n",
+             pixelFormat, winConfig->pixelFormatIndex);
 
-      if (!SetPixelFormat(hdc, pixelFormat, &pfd))
-        {
-          ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
-          return FALSE;
+        if (!SetPixelFormat(hdc, pixelFormat, &pfd)) {
+            ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
+            return FALSE;
         }
     }
-  else
-    {
-      int pixelFormat = fbConfigToPixelFormatIndex(hdc, gc->base.config, drawableTypeOverride, winScreen);
-      if (pixelFormat == 0)
-        {
-          ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());
-          return FALSE;
+    else {
+        int pixelFormat =
+            fbConfigToPixelFormatIndex(hdc, gc->base.config,
+                                       drawableTypeOverride, winScreen);
+        if (pixelFormat == 0) {
+            ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());
+            return FALSE;
         }
 
-      GLWIN_DEBUG_MSG("wglChoosePixelFormat: chose pixelFormatIndex %d", pixelFormat);
-      ErrorF("wglChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n", pixelFormat, winConfig->pixelFormatIndex);
+        GLWIN_DEBUG_MSG("wglChoosePixelFormat: chose pixelFormatIndex %d",
+                        pixelFormat);
+        ErrorF
+            ("wglChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n",
+             pixelFormat, winConfig->pixelFormatIndex);
 
-      if (!SetPixelFormat(hdc, pixelFormat, NULL))
-        {
-          ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
-          return FALSE;
+        if (!SetPixelFormat(hdc, pixelFormat, NULL)) {
+            ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
+            return FALSE;
         }
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 static HDC
-glxWinMakeDC(__GLXWinContext *gc, __GLXWinDrawable *draw, HDC *hdc, HWND *hwnd)
+glxWinMakeDC(__GLXWinContext * gc, __GLXWinDrawable * draw, HDC * hdc,
+             HWND * hwnd)
 {
-  *hdc = NULL;
-  *hwnd = NULL;
+    *hdc = NULL;
+    *hwnd = NULL;
 
-  if (draw == NULL)
-    {
-      GLWIN_TRACE_MSG("No drawable for context %p (native ctx %p)", gc, gc->ctx);
-      return NULL;
+    if (draw == NULL) {
+        GLWIN_TRACE_MSG("No drawable for context %p (native ctx %p)", gc,
+                        gc->ctx);
+        return NULL;
     }
 
-  switch (draw->base.type)
-  {
+    switch (draw->base.type) {
     case GLX_DRAWABLE_WINDOW:
     {
-      WindowPtr pWin;
+        WindowPtr pWin;
 
-      pWin = (WindowPtr) draw->base.pDraw;
-      if (pWin == NULL)
-        {
-          GLWIN_TRACE_MSG("for drawable %p, no WindowPtr", pWin);
-          return NULL;
+        pWin = (WindowPtr) draw->base.pDraw;
+        if (pWin == NULL) {
+            GLWIN_TRACE_MSG("for drawable %p, no WindowPtr", pWin);
+            return NULL;
         }
 
-      *hwnd = winGetWindowInfo(pWin);
+        *hwnd = winGetWindowInfo(pWin);
 
-      if (*hwnd == NULL)
-        {
-          ErrorF("No HWND error: %s\n", glxWinErrorMessage());
-          return NULL;
+        if (*hwnd == NULL) {
+            ErrorF("No HWND error: %s\n", glxWinErrorMessage());
+            return NULL;
         }
 
-      *hdc = GetDC(*hwnd);
+        *hdc = GetDC(*hwnd);
 
-      if (*hdc == NULL)
-        ErrorF("GetDC error: %s\n", glxWinErrorMessage());
+        if (*hdc == NULL)
+            ErrorF("GetDC error: %s\n", glxWinErrorMessage());
 
-      /* Check if the hwnd has changed... */
-      if (*hwnd != gc->hwnd)
-        {
-          if (glxWinDebugSettings.enableTrace)
-            GLWIN_DEBUG_HWND(*hwnd);
+        /* Check if the hwnd has changed... */
+        if (*hwnd != gc->hwnd) {
+            if (glxWinDebugSettings.enableTrace)
+                GLWIN_DEBUG_HWND(*hwnd);
 
-          GLWIN_TRACE_MSG("for context %p (native ctx %p), hWnd changed from %p to %p", gc, gc->ctx, gc->hwnd, *hwnd);
-          gc->hwnd = *hwnd;
+            GLWIN_TRACE_MSG
+                ("for context %p (native ctx %p), hWnd changed from %p to %p",
+                 gc, gc->ctx, gc->hwnd, *hwnd);
+            gc->hwnd = *hwnd;
 
-          /* We must select a pixelformat, but SetPixelFormat can only be called once for a window... */
-          if (!glxWinSetPixelFormat(gc, *hdc, 0, GLX_WINDOW_BIT))
-            {
-              ErrorF("glxWinSetPixelFormat error: %s\n", glxWinErrorMessage());
-              ReleaseDC(*hwnd, *hdc);
-              *hdc = NULL;
-              return NULL;
+            /* We must select a pixelformat, but SetPixelFormat can only be called once for a window... */
+            if (!glxWinSetPixelFormat(gc, *hdc, 0, GLX_WINDOW_BIT)) {
+                ErrorF("glxWinSetPixelFormat error: %s\n",
+                       glxWinErrorMessage());
+                ReleaseDC(*hwnd, *hdc);
+                *hdc = NULL;
+                return NULL;
             }
         }
     }
-    break;
+        break;
 
-  case GLX_DRAWABLE_PBUFFER:
+    case GLX_DRAWABLE_PBUFFER:
     {
-      *hdc = wglGetPbufferDCARBWrapper(draw->hPbuffer);
+        *hdc = wglGetPbufferDCARBWrapper(draw->hPbuffer);
 
-      if (*hdc == NULL)
-        ErrorF("GetDC (pbuffer) error: %s\n", glxWinErrorMessage());
+        if (*hdc == NULL)
+            ErrorF("GetDC (pbuffer) error: %s\n", glxWinErrorMessage());
     }
-    break;
+        break;
 
-  case GLX_DRAWABLE_PIXMAP:
+    case GLX_DRAWABLE_PIXMAP:
     {
-      *hdc = draw->dibDC;
+        *hdc = draw->dibDC;
     }
-    break;
+        break;
 
-  default:
+    default:
     {
-      ErrorF("glxWinMakeDC: tried to makeDC for unhandled drawable type %d\n", draw->base.type);
+        ErrorF("glxWinMakeDC: tried to makeDC for unhandled drawable type %d\n",
+               draw->base.type);
+    }
     }
-  }
 
-  if (glxWinDebugSettings.dumpDC)
-    GLWIN_DEBUG_MSG("Got HDC %p", *hdc);
+    if (glxWinDebugSettings.dumpDC)
+        GLWIN_DEBUG_MSG("Got HDC %p", *hdc);
 
-  return *hdc;
+    return *hdc;
 }
 
 static void
-glxWinReleaseDC(HWND hwnd, HDC hdc,__GLXWinDrawable *draw)
+glxWinReleaseDC(HWND hwnd, HDC hdc, __GLXWinDrawable * draw)
 {
-  switch (draw->base.type)
-  {
+    switch (draw->base.type) {
     case GLX_DRAWABLE_WINDOW:
     {
-      ReleaseDC(hwnd, hdc);
+        ReleaseDC(hwnd, hdc);
     }
-    break;
+        break;
 
-  case GLX_DRAWABLE_PBUFFER:
+    case GLX_DRAWABLE_PBUFFER:
     {
-      if (!wglReleasePbufferDCARBWrapper(draw->hPbuffer, hdc))
-        {
-          ErrorF("wglReleasePbufferDCARB error: %s\n", glxWinErrorMessage());
+        if (!wglReleasePbufferDCARBWrapper(draw->hPbuffer, hdc)) {
+            ErrorF("wglReleasePbufferDCARB error: %s\n", glxWinErrorMessage());
         }
     }
-    break;
+        break;
 
-  case GLX_DRAWABLE_PIXMAP:
+    case GLX_DRAWABLE_PIXMAP:
     {
-      // don't release DC, the memory DC lives as long as the bitmap
+        // don't release DC, the memory DC lives as long as the bitmap
 
-      // We must ensure that all GDI drawing into the bitmap has completed
-      // in case we subsequently access the bits from it
-      GdiFlush();
+        // We must ensure that all GDI drawing into the bitmap has completed
+        // in case we subsequently access the bits from it
+        GdiFlush();
     }
-    break;
+        break;
 
-  default:
+    default:
     {
-      ErrorF("glxWinReleaseDC: tried to releaseDC for unhandled drawable type %d\n", draw->base.type);
+        ErrorF
+            ("glxWinReleaseDC: tried to releaseDC for unhandled drawable type %d\n",
+             draw->base.type);
+    }
     }
-  }
 }
 
 static void
-glxWinDeferredCreateContext(__GLXWinContext *gc, __GLXWinDrawable *draw)
+glxWinDeferredCreateContext(__GLXWinContext * gc, __GLXWinDrawable * draw)
 {
-  HDC dc;
-  HWND hwnd;
-  GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: attach context %p to drawable %p", gc, draw);
+    HDC dc;
+    HWND hwnd;
+
+    GLWIN_DEBUG_MSG
+        ("glxWinDeferredCreateContext: attach context %p to drawable %p", gc,
+         draw);
 
-  switch (draw->base.type)
-  {
+    switch (draw->base.type) {
     case GLX_DRAWABLE_WINDOW:
     {
-      WindowPtr pWin = (WindowPtr) draw->base.pDraw;
+        WindowPtr pWin = (WindowPtr) draw->base.pDraw;
 
-      if (!(gc->base.config->drawableType & GLX_WINDOW_BIT))
-        {
-          ErrorF("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_WINDOW_BIT to a GLX_DRAWABLE_WINDOW drawable\n");
+        if (!(gc->base.config->drawableType & GLX_WINDOW_BIT)) {
+            ErrorF
+                ("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_WINDOW_BIT to a GLX_DRAWABLE_WINDOW drawable\n");
         }
 
-      if (pWin == NULL)
-        {
-          GLWIN_DEBUG_MSG("Deferring until X window is created");
-          return;
+        if (pWin == NULL) {
+            GLWIN_DEBUG_MSG("Deferring until X window is created");
+            return;
         }
 
-      GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: pWin %p", pWin);
+        GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: pWin %p", pWin);
 
-      if (winGetWindowInfo(pWin) == NULL)
-        {
-          GLWIN_DEBUG_MSG("Deferring until native window is created");
-          return;
+        if (winGetWindowInfo(pWin) == NULL) {
+            GLWIN_DEBUG_MSG("Deferring until native window is created");
+            return;
         }
     }
-    break;
+        break;
 
     case GLX_DRAWABLE_PBUFFER:
     {
-      if (draw->hPbuffer == NULL)
-        {
-          __GLXscreen *screen;
-          glxWinScreen *winScreen;
-          int pixelFormat;
-          // XXX: which DC are supposed to use???
-          HDC screenDC = GetDC(NULL);
+        if (draw->hPbuffer == NULL) {
+            __GLXscreen *screen;
+            glxWinScreen *winScreen;
+            int pixelFormat;
 
-          if (!(gc->base.config->drawableType & GLX_PBUFFER_BIT))
-            {
-              ErrorF("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_PBUFFER_BIT to a GLX_DRAWABLE_PBUFFER drawable\n");
+            // XXX: which DC are supposed to use???
+            HDC screenDC = GetDC(NULL);
+
+            if (!(gc->base.config->drawableType & GLX_PBUFFER_BIT)) {
+                ErrorF
+                    ("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_PBUFFER_BIT to a GLX_DRAWABLE_PBUFFER drawable\n");
             }
 
-          screen = gc->base.pGlxScreen;
-          winScreen = (glxWinScreen *)screen;
+            screen = gc->base.pGlxScreen;
+            winScreen = (glxWinScreen *) screen;
 
-          pixelFormat = fbConfigToPixelFormatIndex(screenDC, gc->base.config, GLX_DRAWABLE_PBUFFER, winScreen);
-          if (pixelFormat == 0)
-            {
-              ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());
-              return;
+            pixelFormat =
+                fbConfigToPixelFormatIndex(screenDC, gc->base.config,
+                                           GLX_DRAWABLE_PBUFFER, winScreen);
+            if (pixelFormat == 0) {
+                ErrorF("wglChoosePixelFormat error: %s\n",
+                       glxWinErrorMessage());
+                return;
             }
 
-          draw->hPbuffer = wglCreatePbufferARBWrapper(screenDC, pixelFormat, draw->base.pDraw->width, draw->base.pDraw->height, NULL);
-          ReleaseDC(NULL, screenDC);
+            draw->hPbuffer =
+                wglCreatePbufferARBWrapper(screenDC, pixelFormat,
+                                           draw->base.pDraw->width,
+                                           draw->base.pDraw->height, NULL);
+            ReleaseDC(NULL, screenDC);
 
-          if (draw->hPbuffer == NULL)
-            {
-              ErrorF("wglCreatePbufferARBWrapper error: %s\n", glxWinErrorMessage());
-              return;
+            if (draw->hPbuffer == NULL) {
+                ErrorF("wglCreatePbufferARBWrapper error: %s\n",
+                       glxWinErrorMessage());
+                return;
             }
 
-          GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: pBuffer %p created for drawable %p", draw->hPbuffer, draw);
+            GLWIN_DEBUG_MSG
+                ("glxWinDeferredCreateContext: pBuffer %p created for drawable %p",
+                 draw->hPbuffer, draw);
         }
     }
-    break;
+        break;
 
     case GLX_DRAWABLE_PIXMAP:
     {
-      if (draw->dibDC == NULL)
-        {
-          BITMAPINFOHEADER bmpHeader;
-          void *pBits;
-
-          memset (&bmpHeader, 0, sizeof(BITMAPINFOHEADER));
-          bmpHeader.biSize = sizeof(BITMAPINFOHEADER);
-          bmpHeader.biWidth = draw->base.pDraw->width;
-          bmpHeader.biHeight = draw->base.pDraw->height;
-          bmpHeader.biPlanes = 1;
-          bmpHeader.biBitCount = draw->base.pDraw->bitsPerPixel;
-          bmpHeader.biCompression = BI_RGB;
-
-          if (!(gc->base.config->drawableType & GLX_PIXMAP_BIT))
-            {
-              ErrorF("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_PIXMAP_BIT to a GLX_DRAWABLE_PIXMAP drawable\n");
+        if (draw->dibDC == NULL) {
+            BITMAPINFOHEADER bmpHeader;
+            void *pBits;
+
+            memset(&bmpHeader, 0, sizeof(BITMAPINFOHEADER));
+            bmpHeader.biSize = sizeof(BITMAPINFOHEADER);
+            bmpHeader.biWidth = draw->base.pDraw->width;
+            bmpHeader.biHeight = draw->base.pDraw->height;
+            bmpHeader.biPlanes = 1;
+            bmpHeader.biBitCount = draw->base.pDraw->bitsPerPixel;
+            bmpHeader.biCompression = BI_RGB;
+
+            if (!(gc->base.config->drawableType & GLX_PIXMAP_BIT)) {
+                ErrorF
+                    ("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_PIXMAP_BIT to a GLX_DRAWABLE_PIXMAP drawable\n");
             }
 
-          draw->dibDC = CreateCompatibleDC(NULL);
-          if (draw->dibDC == NULL)
-            {
-              ErrorF("CreateCompatibleDC error: %s\n", glxWinErrorMessage());
-              return;
+            draw->dibDC = CreateCompatibleDC(NULL);
+            if (draw->dibDC == NULL) {
+                ErrorF("CreateCompatibleDC error: %s\n", glxWinErrorMessage());
+                return;
             }
 
-          draw->hDIB = CreateDIBSection(draw->dibDC, (BITMAPINFO *)&bmpHeader, DIB_RGB_COLORS, &pBits, 0, 0);
-          if (draw->dibDC == NULL)
-            {
-              ErrorF("CreateDIBSection error: %s\n", glxWinErrorMessage());
-              return;
+            draw->hDIB =
+                CreateDIBSection(draw->dibDC, (BITMAPINFO *) & bmpHeader,
+                                 DIB_RGB_COLORS, &pBits, 0, 0);
+            if (draw->dibDC == NULL) {
+                ErrorF("CreateDIBSection error: %s\n", glxWinErrorMessage());
+                return;
             }
 
-          // XXX: CreateDIBSection insists on allocating the bitmap memory for us, so we're going to
-          // need some jiggery pokery to point the underlying X Drawable's bitmap at the same set of bits
-          // so that they can be read with XGetImage as well as glReadPixels, assuming the formats are
-          // even compatible ...
-          draw->pOldBits = ((PixmapPtr)draw->base.pDraw)->devPrivate.ptr;
-          ((PixmapPtr)draw->base.pDraw)->devPrivate.ptr = pBits;
-
-          // Select the DIB into the DC
-          draw->hOldDIB = SelectObject(draw->dibDC, draw->hDIB);
-          if (!draw->hOldDIB)
-            {
-              ErrorF("SelectObject error: %s\n", glxWinErrorMessage());
+            // XXX: CreateDIBSection insists on allocating the bitmap memory for us, so we're going to
+            // need some jiggery pokery to point the underlying X Drawable's bitmap at the same set of bits
+            // so that they can be read with XGetImage as well as glReadPixels, assuming the formats are
+            // even compatible ...
+            draw->pOldBits = ((PixmapPtr) draw->base.pDraw)->devPrivate.ptr;
+            ((PixmapPtr) draw->base.pDraw)->devPrivate.ptr = pBits;
+
+            // Select the DIB into the DC
+            draw->hOldDIB = SelectObject(draw->dibDC, draw->hDIB);
+            if (!draw->hOldDIB) {
+                ErrorF("SelectObject error: %s\n", glxWinErrorMessage());
             }
 
-          // Set the pixel format of the bitmap
-          glxWinSetPixelFormat(gc, draw->dibDC, draw->base.pDraw->bitsPerPixel, GLX_PIXMAP_BIT);
+            // Set the pixel format of the bitmap
+            glxWinSetPixelFormat(gc, draw->dibDC,
+                                 draw->base.pDraw->bitsPerPixel,
+                                 GLX_PIXMAP_BIT);
 
-          GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: DIB bitmap %p created for drawable %p", draw->hDIB, draw);
+            GLWIN_DEBUG_MSG
+                ("glxWinDeferredCreateContext: DIB bitmap %p created for drawable %p",
+                 draw->hDIB, draw);
         }
     }
-    break;
+        break;
 
     default:
     {
-      ErrorF("glxWinDeferredCreateContext: tried to attach unhandled drawable type %d\n", draw->base.type);
-      return;
+        ErrorF
+            ("glxWinDeferredCreateContext: tried to attach unhandled drawable type %d\n",
+             draw->base.type);
+        return;
+    }
     }
-  }
 
-  dc = glxWinMakeDC(gc, draw, &dc, &hwnd);
-  gc->ctx = wglCreateContext(dc);
-  glxWinReleaseDC(hwnd, dc, draw);
+    dc = glxWinMakeDC(gc, draw, &dc, &hwnd);
+    gc->ctx = wglCreateContext(dc);
+    glxWinReleaseDC(hwnd, dc, draw);
 
-  if (gc->ctx == NULL)
-    {
-      ErrorF("wglCreateContext error: %s\n", glxWinErrorMessage());
-      return;
+    if (gc->ctx == NULL) {
+        ErrorF("wglCreateContext error: %s\n", glxWinErrorMessage());
+        return;
     }
 
-  GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: attached context %p to native context %p drawable %p", gc, gc->ctx, draw);
+    GLWIN_DEBUG_MSG
+        ("glxWinDeferredCreateContext: attached context %p to native context %p drawable %p",
+         gc, gc->ctx, draw);
 
-  // if the native context was created successfully, shareLists if needed
-  if (gc->ctx && gc->shareContext)
-    {
-      GLWIN_DEBUG_MSG("glxWinCreateContextReal shareLists with context %p (native ctx %p)", gc->shareContext, gc->shareContext->ctx);
+    // if the native context was created successfully, shareLists if needed
+    if (gc->ctx && gc->shareContext) {
+        GLWIN_DEBUG_MSG
+            ("glxWinCreateContextReal shareLists with context %p (native ctx %p)",
+             gc->shareContext, gc->shareContext->ctx);
 
-      if (!wglShareLists(gc->shareContext->ctx, gc->ctx))
-        {
-          ErrorF("wglShareLists error: %s\n", glxWinErrorMessage());
+        if (!wglShareLists(gc->shareContext->ctx, gc->ctx)) {
+            ErrorF("wglShareLists error: %s\n", glxWinErrorMessage());
         }
     }
 }
@@ -1407,183 +1420,177 @@ glxWinDeferredCreateContext(__GLXWinContext *gc, __GLXWinDrawable *draw)
  * Context functions
  */
 
-
 /* Context manipulation routines should return TRUE on success, FALSE on failure */
 static int
-glxWinContextMakeCurrent(__GLXcontext *base)
+glxWinContextMakeCurrent(__GLXcontext * base)
 {
-  __GLXWinContext *gc = (__GLXWinContext *)base;
-  BOOL ret;
-  HDC drawDC;
-  HDC readDC = NULL;
-  __GLXdrawable *drawPriv;
-  __GLXdrawable *readPriv = NULL;
-  HWND hDrawWnd;
-  HWND hReadWnd;
-
-  GLWIN_TRACE_MSG("glxWinContextMakeCurrent context %p (native ctx %p)", gc, gc->ctx);
-  glWinCallDelta();
-
-  /* Keep a note of the last active context in the drawable */
-  drawPriv = gc->base.drawPriv;
-  ((__GLXWinDrawable *)drawPriv)->drawContext = gc;
-
-  if (gc->ctx == NULL)
-    {
-      glxWinDeferredCreateContext(gc, (__GLXWinDrawable *)drawPriv);
+    __GLXWinContext *gc = (__GLXWinContext *) base;
+    BOOL ret;
+    HDC drawDC;
+    HDC readDC = NULL;
+    __GLXdrawable *drawPriv;
+    __GLXdrawable *readPriv = NULL;
+    HWND hDrawWnd;
+    HWND hReadWnd;
+
+    GLWIN_TRACE_MSG("glxWinContextMakeCurrent context %p (native ctx %p)", gc,
+                    gc->ctx);
+    glWinCallDelta();
+
+    /* Keep a note of the last active context in the drawable */
+    drawPriv = gc->base.drawPriv;
+    ((__GLXWinDrawable *) drawPriv)->drawContext = gc;
+
+    if (gc->ctx == NULL) {
+        glxWinDeferredCreateContext(gc, (__GLXWinDrawable *) drawPriv);
     }
 
-  if (gc->ctx == NULL)
-    {
-      ErrorF("glxWinContextMakeCurrent: Native context is NULL\n");
-      return FALSE;
+    if (gc->ctx == NULL) {
+        ErrorF("glxWinContextMakeCurrent: Native context is NULL\n");
+        return FALSE;
     }
 
-  drawDC = glxWinMakeDC(gc, (__GLXWinDrawable *)drawPriv, &drawDC, &hDrawWnd);
-  if (drawDC == NULL)
-    {
-      ErrorF("glxWinMakeDC failed for drawDC\n");
-      return FALSE;
+    drawDC =
+        glxWinMakeDC(gc, (__GLXWinDrawable *) drawPriv, &drawDC, &hDrawWnd);
+    if (drawDC == NULL) {
+        ErrorF("glxWinMakeDC failed for drawDC\n");
+        return FALSE;
     }
 
-  if ((gc->base.readPriv != NULL) && (gc->base.readPriv != gc->base.drawPriv))
-    {
-      // XXX: should only occur with WGL_ARB_make_current_read
-      /*
-        If there is a separate read drawable, create a separate read DC, and
-        use the wglMakeContextCurrent extension to make the context current drawing
-        to one DC and reading from the other
-      */
-      readPriv = gc->base.readPriv;
-      readDC = glxWinMakeDC(gc, (__GLXWinDrawable *)readPriv, &readDC, &hReadWnd);
-      if (readDC == NULL)
-        {
-          ErrorF("glxWinMakeDC failed for readDC\n");
-          glxWinReleaseDC(hDrawWnd, drawDC, (__GLXWinDrawable *)drawPriv);
-          return FALSE;
+    if ((gc->base.readPriv != NULL) && (gc->base.readPriv != gc->base.drawPriv)) {
+        // XXX: should only occur with WGL_ARB_make_current_read
+        /*
+           If there is a separate read drawable, create a separate read DC, and
+           use the wglMakeContextCurrent extension to make the context current drawing
+           to one DC and reading from the other
+         */
+        readPriv = gc->base.readPriv;
+        readDC =
+            glxWinMakeDC(gc, (__GLXWinDrawable *) readPriv, &readDC, &hReadWnd);
+        if (readDC == NULL) {
+            ErrorF("glxWinMakeDC failed for readDC\n");
+            glxWinReleaseDC(hDrawWnd, drawDC, (__GLXWinDrawable *) drawPriv);
+            return FALSE;
         }
 
-      ret = wglMakeContextCurrentARBWrapper(drawDC, readDC, gc->ctx);
-      if (!ret)
-        {
-          ErrorF("wglMakeContextCurrentARBWrapper error: %s\n", glxWinErrorMessage());
+        ret = wglMakeContextCurrentARBWrapper(drawDC, readDC, gc->ctx);
+        if (!ret) {
+            ErrorF("wglMakeContextCurrentARBWrapper error: %s\n",
+                   glxWinErrorMessage());
         }
     }
-  else
-    {
-      /* Otherwise, just use wglMakeCurrent */
-      ret = wglMakeCurrent(drawDC, gc->ctx);
-      if (!ret)
-        {
-          ErrorF("wglMakeCurrent error: %s\n", glxWinErrorMessage());
+    else {
+        /* Otherwise, just use wglMakeCurrent */
+        ret = wglMakeCurrent(drawDC, gc->ctx);
+        if (!ret) {
+            ErrorF("wglMakeCurrent error: %s\n", glxWinErrorMessage());
         }
     }
 
-  // apparently make current could fail if the context is current in a different thread,
-  // but that shouldn't be able to happen in the current server...
+    // apparently make current could fail if the context is current in a different thread,
+    // but that shouldn't be able to happen in the current server...
 
-  glxWinReleaseDC(hDrawWnd, drawDC, (__GLXWinDrawable *)drawPriv);
-  if (readDC)
-    glxWinReleaseDC(hReadWnd, readDC, (__GLXWinDrawable *)readPriv);
+    glxWinReleaseDC(hDrawWnd, drawDC, (__GLXWinDrawable *) drawPriv);
+    if (readDC)
+        glxWinReleaseDC(hReadWnd, readDC, (__GLXWinDrawable *) readPriv);
 
-  return ret;
+    return ret;
 }
 
 static int
-glxWinContextLoseCurrent(__GLXcontext *base)
+glxWinContextLoseCurrent(__GLXcontext * base)
 {
-  BOOL ret;
-  __GLXWinContext *gc = (__GLXWinContext *)base;
+    BOOL ret;
+    __GLXWinContext *gc = (__GLXWinContext *) base;
 
-  GLWIN_TRACE_MSG("glxWinContextLoseCurrent context %p (native ctx %p)", gc, gc->ctx);
-  glWinCallDelta();
+    GLWIN_TRACE_MSG("glxWinContextLoseCurrent context %p (native ctx %p)", gc,
+                    gc->ctx);
+    glWinCallDelta();
 
-  /*
-     An error seems to be reported if we try to make no context current
-     if there is already no current context, so avoid doing that...
-  */
-  if (__glXLastContext != NULL)
-    {
-      ret = wglMakeCurrent(NULL, NULL); /* We don't need a DC when setting no current context */
-      if (!ret)
-        ErrorF("glxWinContextLoseCurrent error: %s\n", glxWinErrorMessage());
+    /*
+       An error seems to be reported if we try to make no context current
+       if there is already no current context, so avoid doing that...
+     */
+    if (__glXLastContext != NULL) {
+        ret = wglMakeCurrent(NULL, NULL);       /* We don't need a DC when setting no current context */
+        if (!ret)
+            ErrorF("glxWinContextLoseCurrent error: %s\n",
+                   glxWinErrorMessage());
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 static int
-glxWinContextCopy(__GLXcontext *dst_base, __GLXcontext *src_base, unsigned long mask)
+glxWinContextCopy(__GLXcontext * dst_base, __GLXcontext * src_base,
+                  unsigned long mask)
 {
-  __GLXWinContext *dst = (__GLXWinContext *)dst_base;
-  __GLXWinContext *src = (__GLXWinContext *)src_base;
-  BOOL ret;
+    __GLXWinContext *dst = (__GLXWinContext *) dst_base;
+    __GLXWinContext *src = (__GLXWinContext *) src_base;
+    BOOL ret;
 
-  GLWIN_DEBUG_MSG("glxWinContextCopy");
+    GLWIN_DEBUG_MSG("glxWinContextCopy");
 
-  ret = wglCopyContext(src->ctx, dst->ctx, mask);
-  if (!ret)
-    {
-      ErrorF("wglCopyContext error: %s\n", glxWinErrorMessage());
+    ret = wglCopyContext(src->ctx, dst->ctx, mask);
+    if (!ret) {
+        ErrorF("wglCopyContext error: %s\n", glxWinErrorMessage());
     }
 
-  return ret;
+    return ret;
 }
 
 static void
-glxWinContextDestroy(__GLXcontext *base)
+glxWinContextDestroy(__GLXcontext * base)
 {
-  __GLXWinContext *gc = (__GLXWinContext *)base;
+    __GLXWinContext *gc = (__GLXWinContext *) base;
 
-  if (gc != NULL)
-    {
-      GLWIN_DEBUG_MSG("GLXcontext %p destroyed (native ctx %p)", base, gc->ctx);
+    if (gc != NULL) {
+        GLWIN_DEBUG_MSG("GLXcontext %p destroyed (native ctx %p)", base,
+                        gc->ctx);
 
-      if (gc->ctx)
-        {
-          /* It's bad style to delete the context while it's still current */
-          if (wglGetCurrentContext() == gc->ctx)
-            {
-              wglMakeCurrent(NULL, NULL);
+        if (gc->ctx) {
+            /* It's bad style to delete the context while it's still current */
+            if (wglGetCurrentContext() == gc->ctx) {
+                wglMakeCurrent(NULL, NULL);
             }
 
-          {
-            BOOL ret = wglDeleteContext(gc->ctx);
-            if (!ret)
-              ErrorF("wglDeleteContext error: %s\n", glxWinErrorMessage());
-          }
+            {
+                BOOL ret = wglDeleteContext(gc->ctx);
 
-          gc->ctx = NULL;
+                if (!ret)
+                    ErrorF("wglDeleteContext error: %s\n",
+                           glxWinErrorMessage());
+            }
+
+            gc->ctx = NULL;
         }
 
-      free(gc);
+        free(gc);
     }
 }
 
 static __GLXcontext *
-glxWinCreateContext(__GLXscreen *screen,
-                   __GLXconfig *modes,
-                   __GLXcontext *baseShareContext)
+glxWinCreateContext(__GLXscreen * screen,
+                    __GLXconfig * modes, __GLXcontext * baseShareContext)
 {
     __GLXWinContext *context;
-    __GLXWinContext *shareContext = (__GLXWinContext *)baseShareContext;
+    __GLXWinContext *shareContext = (__GLXWinContext *) baseShareContext;
 
-    static __GLXtextureFromPixmap glxWinTextureFromPixmap =
-      {
+    static __GLXtextureFromPixmap glxWinTextureFromPixmap = {
         glxWinBindTexImage,
         glxWinReleaseTexImage
-      };
+    };
 
-    context = (__GLXWinContext *)calloc(1, sizeof(__GLXWinContext));
+    context = (__GLXWinContext *) calloc(1, sizeof(__GLXWinContext));
 
     if (!context)
         return NULL;
 
     memset(context, 0, sizeof *context);
-    context->base.destroy        = glxWinContextDestroy;
-    context->base.makeCurrent    = glxWinContextMakeCurrent;
-    context->base.loseCurrent    = glxWinContextLoseCurrent;
-    context->base.copy           = glxWinContextCopy;
+    context->base.destroy = glxWinContextDestroy;
+    context->base.makeCurrent = glxWinContextMakeCurrent;
+    context->base.loseCurrent = glxWinContextLoseCurrent;
+    context->base.copy = glxWinContextCopy;
     context->base.textureFromPixmap = &glxWinTextureFromPixmap;
     context->base.config = modes;
     context->base.pGlxScreen = screen;
@@ -1605,32 +1612,33 @@ glxWinCreateContext(__GLXscreen *screen,
  */
 
 static int
-fbConfigToPixelFormat(__GLXconfig *mode, PIXELFORMATDESCRIPTOR *pfdret, int drawableTypeOverride)
+fbConfigToPixelFormat(__GLXconfig * mode, PIXELFORMATDESCRIPTOR * pfdret,
+                      int drawableTypeOverride)
 {
     PIXELFORMATDESCRIPTOR pfd = {
-      sizeof(PIXELFORMATDESCRIPTOR),   /* size of this pfd */
-      1,                     /* version number */
-      PFD_SUPPORT_OPENGL,    /* support OpenGL */
-      PFD_TYPE_RGBA,         /* RGBA type */
-      24,                    /* 24-bit color depth */
-      0, 0, 0, 0, 0, 0,      /* color bits ignored */
-      0,                     /* no alpha buffer */
-      0,                     /* shift bit ignored */
-      0,                     /* no accumulation buffer */
-      0, 0, 0, 0,            /* accum bits ignored */
-      32,                    /* 32-bit z-buffer */
-      0,                     /* no stencil buffer */
-      0,                     /* no auxiliary buffer */
-      PFD_MAIN_PLANE,        /* main layer */
-      0,                     /* reserved */
-      0, 0, 0                /* layer masks ignored */
+        sizeof(PIXELFORMATDESCRIPTOR),  /* size of this pfd */
+        1,                      /* version number */
+        PFD_SUPPORT_OPENGL,     /* support OpenGL */
+        PFD_TYPE_RGBA,          /* RGBA type */
+        24,                     /* 24-bit color depth */
+        0, 0, 0, 0, 0, 0,       /* color bits ignored */
+        0,                      /* no alpha buffer */
+        0,                      /* shift bit ignored */
+        0,                      /* no accumulation buffer */
+        0, 0, 0, 0,             /* accum bits ignored */
+        32,                     /* 32-bit z-buffer */
+        0,                      /* no stencil buffer */
+        0,                      /* no auxiliary buffer */
+        PFD_MAIN_PLANE,         /* main layer */
+        0,                      /* reserved */
+        0, 0, 0                 /* layer masks ignored */
     };
 
     if ((mode->drawableType | drawableTypeOverride) & GLX_WINDOW_BIT)
-      pfd.dwFlags |= PFD_DRAW_TO_WINDOW; /* support window */
+        pfd.dwFlags |= PFD_DRAW_TO_WINDOW;      /* support window */
 
     if ((mode->drawableType | drawableTypeOverride) & GLX_PIXMAP_BIT)
-      pfd.dwFlags |= (PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI); /* supports software rendering to bitmap */
+        pfd.dwFlags |= (PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI);  /* supports software rendering to bitmap */
 
     if (mode->stereoMode) {
         pfd.dwFlags |= PFD_STEREO;
@@ -1642,15 +1650,17 @@ fbConfigToPixelFormat(__GLXconfig *mode, PIXELFORMATDESCRIPTOR *pfdret, int draw
     pfd.iPixelType = PFD_TYPE_RGBA;
     pfd.cColorBits = mode->redBits + mode->greenBits + mode->blueBits;
     pfd.cRedBits = mode->redBits;
-    pfd.cRedShift = 0; /* FIXME */
+    pfd.cRedShift = 0;          /* FIXME */
     pfd.cGreenBits = mode->greenBits;
-    pfd.cGreenShift = 0; /* FIXME  */
+    pfd.cGreenShift = 0;        /* FIXME  */
     pfd.cBlueBits = mode->blueBits;
-    pfd.cBlueShift = 0; /* FIXME */
+    pfd.cBlueShift = 0;         /* FIXME */
     pfd.cAlphaBits = mode->alphaBits;
-    pfd.cAlphaShift = 0; /* FIXME */
+    pfd.cAlphaShift = 0;        /* FIXME */
 
-    pfd.cAccumBits = mode->accumRedBits + mode->accumGreenBits + mode->accumBlueBits + mode->accumAlphaBits;
+    pfd.cAccumBits =
+        mode->accumRedBits + mode->accumGreenBits + mode->accumBlueBits +
+        mode->accumAlphaBits;
     pfd.cAccumRedBits = mode->accumRedBits;
     pfd.cAccumGreenBits = mode->accumGreenBits;
     pfd.cAccumBlueBits = mode->accumBlueBits;
@@ -1671,94 +1681,98 @@ fbConfigToPixelFormat(__GLXconfig *mode, PIXELFORMATDESCRIPTOR *pfdret, int draw
 #define SET_ATTR_VALUE(attr, value) { attribList[i++] = attr; attribList[i++] = value; assert(i < NUM_ELEMENTS(attribList)); }
 
 static int
-fbConfigToPixelFormatIndex(HDC hdc, __GLXconfig *mode, int drawableTypeOverride, glxWinScreen *winScreen)
+fbConfigToPixelFormatIndex(HDC hdc, __GLXconfig * mode,
+                           int drawableTypeOverride, glxWinScreen * winScreen)
 {
-  UINT numFormats;
-  unsigned int i = 0;
-
-  /* convert fbConfig to attr-value list  */
-  int attribList[60];
-
-  SET_ATTR_VALUE(WGL_SUPPORT_OPENGL_ARB, TRUE);
-  SET_ATTR_VALUE(WGL_PIXEL_TYPE_ARB, (mode->visualType == GLX_TRUE_COLOR) ? WGL_TYPE_RGBA_ARB : WGL_TYPE_COLORINDEX_ARB);
-  SET_ATTR_VALUE(WGL_COLOR_BITS_ARB, (mode->visualType == GLX_TRUE_COLOR) ? mode->rgbBits : mode->indexBits);
-  SET_ATTR_VALUE(WGL_RED_BITS_ARB, mode->redBits);
-  SET_ATTR_VALUE(WGL_GREEN_BITS_ARB, mode->greenBits);
-  SET_ATTR_VALUE(WGL_BLUE_BITS_ARB, mode->blueBits);
-  SET_ATTR_VALUE(WGL_ALPHA_BITS_ARB, mode->alphaBits);
-  SET_ATTR_VALUE(WGL_ACCUM_RED_BITS_ARB, mode->accumRedBits);
-  SET_ATTR_VALUE(WGL_ACCUM_GREEN_BITS_ARB, mode->accumGreenBits);
-  SET_ATTR_VALUE(WGL_ACCUM_BLUE_BITS_ARB, mode->accumBlueBits);
-  SET_ATTR_VALUE(WGL_ACCUM_ALPHA_BITS_ARB, mode->accumAlphaBits);
-  SET_ATTR_VALUE(WGL_DEPTH_BITS_ARB, mode->depthBits);
-  SET_ATTR_VALUE(WGL_STENCIL_BITS_ARB, mode->stencilBits);
-  SET_ATTR_VALUE(WGL_AUX_BUFFERS_ARB, mode->numAuxBuffers);
-
-  if (mode->doubleBufferMode)
-    SET_ATTR_VALUE(WGL_DOUBLE_BUFFER_ARB, TRUE);
-
-  if (mode->stereoMode)
-    SET_ATTR_VALUE(WGL_STEREO_ARB, TRUE);
-
-  // Some attributes are only added to the list if the value requested is not 'don't care', as exactly matching that is daft..
-  if (mode->swapMethod == GLX_SWAP_EXCHANGE_OML)
-    SET_ATTR_VALUE(WGL_SWAP_METHOD_ARB, WGL_SWAP_EXCHANGE_ARB);
-
-  if (mode->swapMethod == GLX_SWAP_COPY_OML)
-    SET_ATTR_VALUE(WGL_SWAP_COPY_ARB, TRUE);
-
-  // XXX: this should probably be the other way around, but that messes up drawableTypeOverride
-  if (mode->visualRating == GLX_SLOW_VISUAL_EXT)
-    SET_ATTR_VALUE(WGL_ACCELERATION_ARB, WGL_NO_ACCELERATION_ARB);
-
-  // must support all the drawable types the mode supports
-  if ((mode->drawableType | drawableTypeOverride) & GLX_WINDOW_BIT)
-    SET_ATTR_VALUE(WGL_DRAW_TO_WINDOW_ARB,TRUE);
-
-  // XXX: this is a horrible hacky heuristic, in fact this whole drawableTypeOverride thing is a bad idea
-  // try to avoid asking for formats which don't exist (by not asking for all when adjusting the config to include the drawableTypeOverride)
-  if (drawableTypeOverride == GLX_WINDOW_BIT)
-    {
-      if (mode->drawableType & GLX_PIXMAP_BIT)
-        SET_ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, TRUE);
+    UINT numFormats;
+    unsigned int i = 0;
+
+    /* convert fbConfig to attr-value list  */
+    int attribList[60];
+
+    SET_ATTR_VALUE(WGL_SUPPORT_OPENGL_ARB, TRUE);
+    SET_ATTR_VALUE(WGL_PIXEL_TYPE_ARB,
+                   (mode->visualType ==
+                    GLX_TRUE_COLOR) ? WGL_TYPE_RGBA_ARB :
+                   WGL_TYPE_COLORINDEX_ARB);
+    SET_ATTR_VALUE(WGL_COLOR_BITS_ARB,
+                   (mode->visualType ==
+                    GLX_TRUE_COLOR) ? mode->rgbBits : mode->indexBits);
+    SET_ATTR_VALUE(WGL_RED_BITS_ARB, mode->redBits);
+    SET_ATTR_VALUE(WGL_GREEN_BITS_ARB, mode->greenBits);
+    SET_ATTR_VALUE(WGL_BLUE_BITS_ARB, mode->blueBits);
+    SET_ATTR_VALUE(WGL_ALPHA_BITS_ARB, mode->alphaBits);
+    SET_ATTR_VALUE(WGL_ACCUM_RED_BITS_ARB, mode->accumRedBits);
+    SET_ATTR_VALUE(WGL_ACCUM_GREEN_BITS_ARB, mode->accumGreenBits);
+    SET_ATTR_VALUE(WGL_ACCUM_BLUE_BITS_ARB, mode->accumBlueBits);
+    SET_ATTR_VALUE(WGL_ACCUM_ALPHA_BITS_ARB, mode->accumAlphaBits);
+    SET_ATTR_VALUE(WGL_DEPTH_BITS_ARB, mode->depthBits);
+    SET_ATTR_VALUE(WGL_STENCIL_BITS_ARB, mode->stencilBits);
+    SET_ATTR_VALUE(WGL_AUX_BUFFERS_ARB, mode->numAuxBuffers);
+
+    if (mode->doubleBufferMode)
+        SET_ATTR_VALUE(WGL_DOUBLE_BUFFER_ARB, TRUE);
+
+    if (mode->stereoMode)
+        SET_ATTR_VALUE(WGL_STEREO_ARB, TRUE);
+
+    // Some attributes are only added to the list if the value requested is not 'don't care', as exactly matching that is daft..
+    if (mode->swapMethod == GLX_SWAP_EXCHANGE_OML)
+        SET_ATTR_VALUE(WGL_SWAP_METHOD_ARB, WGL_SWAP_EXCHANGE_ARB);
+
+    if (mode->swapMethod == GLX_SWAP_COPY_OML)
+        SET_ATTR_VALUE(WGL_SWAP_COPY_ARB, TRUE);
+
+    // XXX: this should probably be the other way around, but that messes up drawableTypeOverride
+    if (mode->visualRating == GLX_SLOW_VISUAL_EXT)
+        SET_ATTR_VALUE(WGL_ACCELERATION_ARB, WGL_NO_ACCELERATION_ARB);
+
+    // must support all the drawable types the mode supports
+    if ((mode->drawableType | drawableTypeOverride) & GLX_WINDOW_BIT)
+        SET_ATTR_VALUE(WGL_DRAW_TO_WINDOW_ARB, TRUE);
 
-      if (mode->drawableType & GLX_PBUFFER_BIT)
-        if (winScreen->has_WGL_ARB_pbuffer)
-          SET_ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, TRUE);
+    // XXX: this is a horrible hacky heuristic, in fact this whole drawableTypeOverride thing is a bad idea
+    // try to avoid asking for formats which don't exist (by not asking for all when adjusting the config to include the drawableTypeOverride)
+    if (drawableTypeOverride == GLX_WINDOW_BIT) {
+        if (mode->drawableType & GLX_PIXMAP_BIT)
+            SET_ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, TRUE);
+
+        if (mode->drawableType & GLX_PBUFFER_BIT)
+            if (winScreen->has_WGL_ARB_pbuffer)
+                SET_ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, TRUE);
     }
-  else
-    {
-      if (drawableTypeOverride & GLX_PIXMAP_BIT)
-        SET_ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, TRUE);
+    else {
+        if (drawableTypeOverride & GLX_PIXMAP_BIT)
+            SET_ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, TRUE);
 
-      if (drawableTypeOverride & GLX_PBUFFER_BIT)
-        if (winScreen->has_WGL_ARB_pbuffer)
-          SET_ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, TRUE);
+        if (drawableTypeOverride & GLX_PBUFFER_BIT)
+            if (winScreen->has_WGL_ARB_pbuffer)
+                SET_ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, TRUE);
     }
 
-  SET_ATTR_VALUE(0, 0); // terminator
+    SET_ATTR_VALUE(0, 0);       // terminator
 
-  /* choose the first match */
-  {
-    int pixelFormatIndex;
+    /* choose the first match */
+    {
+        int pixelFormatIndex;
 
-    if (!wglChoosePixelFormatARBWrapper(hdc, attribList, NULL, 1, &pixelFormatIndex, &numFormats))
-      {
-        ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());
-      }
-    else
-      {
-        if (numFormats > 0)
-          {
-            GLWIN_DEBUG_MSG("wglChoosePixelFormat: chose pixelFormatIndex %d)", pixelFormatIndex);
-            return pixelFormatIndex;
-          }
-        else
-          ErrorF("wglChoosePixelFormat couldn't decide\n");
-      }
-  }
+        if (!wglChoosePixelFormatARBWrapper
+            (hdc, attribList, NULL, 1, &pixelFormatIndex, &numFormats)) {
+            ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());
+        }
+        else {
+            if (numFormats > 0) {
+                GLWIN_DEBUG_MSG
+                    ("wglChoosePixelFormat: chose pixelFormatIndex %d)",
+                     pixelFormatIndex);
+                return pixelFormatIndex;
+            }
+            else
+                ErrorF("wglChoosePixelFormat couldn't decide\n");
+        }
+    }
 
-  return 0;
+    return 0;
 }
 
 /* ---------------------------------------------------------------------- */
@@ -1769,586 +1783,614 @@ fbConfigToPixelFormatIndex(HDC hdc, __GLXconfig *mode, int drawableTypeOverride,
 // Create the GLXconfigs using DescribePixelFormat()
 //
 static void
-glxWinCreateConfigs(HDC hdc, glxWinScreen *screen)
+glxWinCreateConfigs(HDC hdc, glxWinScreen * screen)
 {
-  GLXWinConfig *c, *result, *prev = NULL;
-  int numConfigs = 0;
-  int i = 0;
-  int n = 0;
-  PIXELFORMATDESCRIPTOR pfd;
+    GLXWinConfig *c, *result, *prev = NULL;
+    int numConfigs = 0;
+    int i = 0;
+    int n = 0;
+    PIXELFORMATDESCRIPTOR pfd;
 
-  GLWIN_DEBUG_MSG("glxWinCreateConfigs");
+    GLWIN_DEBUG_MSG("glxWinCreateConfigs");
 
-  screen->base.numFBConfigs = 0;
-  screen->base.fbconfigs = NULL;
+    screen->base.numFBConfigs = 0;
+    screen->base.fbconfigs = NULL;
 
-  // get the number of pixelformats
-  numConfigs = DescribePixelFormat(hdc, 1, sizeof(PIXELFORMATDESCRIPTOR), NULL);
-  GLWIN_DEBUG_MSG("DescribePixelFormat says %d possible pixel formats", numConfigs);
+    // get the number of pixelformats
+    numConfigs =
+        DescribePixelFormat(hdc, 1, sizeof(PIXELFORMATDESCRIPTOR), NULL);
+    GLWIN_DEBUG_MSG("DescribePixelFormat says %d possible pixel formats",
+                    numConfigs);
 
-  /* alloc */
-  result = malloc(sizeof(GLXWinConfig) * numConfigs);
+    /* alloc */
+    result = malloc(sizeof(GLXWinConfig) * numConfigs);
 
-  if (NULL == result)
-    {
-      return;
+    if (NULL == result) {
+        return;
     }
 
-  memset(result, 0, sizeof(GLXWinConfig) * numConfigs);
-  n = 0;
+    memset(result, 0, sizeof(GLXWinConfig) * numConfigs);
+    n = 0;
 
-  /* fill in configs */
-  for (i = 0;  i < numConfigs; i++)
-    {
-      int rc;
+    /* fill in configs */
+    for (i = 0; i < numConfigs; i++) {
+        int rc;
 
-      c = &(result[i]);
-      c->base.next = NULL;
-      c->pixelFormatIndex = i+1;
+        c = &(result[i]);
+        c->base.next = NULL;
+        c->pixelFormatIndex = i + 1;
 
-      rc = DescribePixelFormat(hdc, i+1, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
+        rc = DescribePixelFormat(hdc, i + 1, sizeof(PIXELFORMATDESCRIPTOR),
+                                 &pfd);
 
-      if (!rc)
-        {
-          ErrorF("DescribePixelFormat failed for index %d, error %s\n", i+1, glxWinErrorMessage());
-          break;
+        if (!rc) {
+            ErrorF("DescribePixelFormat failed for index %d, error %s\n", i + 1,
+                   glxWinErrorMessage());
+            break;
         }
 
-      if (glxWinDebugSettings.dumpPFD)
-        pfdOut(&pfd);
+        if (glxWinDebugSettings.dumpPFD)
+            pfdOut(&pfd);
 
-      if (!(pfd.dwFlags & (PFD_DRAW_TO_WINDOW | PFD_DRAW_TO_BITMAP)) || !(pfd.dwFlags & PFD_SUPPORT_OPENGL))
-        {
-          GLWIN_DEBUG_MSG("pixelFormat %d has unsuitable flags 0x%08lx, skipping", i+1, pfd.dwFlags);
-          continue;
+        if (!(pfd.dwFlags & (PFD_DRAW_TO_WINDOW | PFD_DRAW_TO_BITMAP)) ||
+            !(pfd.dwFlags & PFD_SUPPORT_OPENGL)) {
+            GLWIN_DEBUG_MSG
+                ("pixelFormat %d has unsuitable flags 0x%08lx, skipping", i + 1,
+                 pfd.dwFlags);
+            continue;
         }
 
-      c->base.doubleBufferMode = (pfd.dwFlags & PFD_DOUBLEBUFFER) ? GL_TRUE : GL_FALSE;
-      c->base.stereoMode = (pfd.dwFlags & PFD_STEREO) ? GL_TRUE : GL_FALSE;
+        c->base.doubleBufferMode =
+            (pfd.dwFlags & PFD_DOUBLEBUFFER) ? GL_TRUE : GL_FALSE;
+        c->base.stereoMode = (pfd.dwFlags & PFD_STEREO) ? GL_TRUE : GL_FALSE;
 
-      c->base.redBits = pfd.cRedBits;
-      c->base.greenBits = pfd.cGreenBits;
-      c->base.blueBits = pfd.cBlueBits;
-      c->base.alphaBits = pfd.cAlphaBits;
+        c->base.redBits = pfd.cRedBits;
+        c->base.greenBits = pfd.cGreenBits;
+        c->base.blueBits = pfd.cBlueBits;
+        c->base.alphaBits = pfd.cAlphaBits;
 
-      c->base.redMask = BITS_AND_SHIFT_TO_MASK(pfd.cRedBits, pfd.cRedShift);
-      c->base.greenMask =  BITS_AND_SHIFT_TO_MASK(pfd.cGreenBits, pfd.cGreenShift);
-      c->base.blueMask = BITS_AND_SHIFT_TO_MASK(pfd.cBlueBits, pfd.cBlueShift);
-      c->base.alphaMask = BITS_AND_SHIFT_TO_MASK(pfd.cAlphaBits, pfd.cAlphaShift);
+        c->base.redMask = BITS_AND_SHIFT_TO_MASK(pfd.cRedBits, pfd.cRedShift);
+        c->base.greenMask =
+            BITS_AND_SHIFT_TO_MASK(pfd.cGreenBits, pfd.cGreenShift);
+        c->base.blueMask =
+            BITS_AND_SHIFT_TO_MASK(pfd.cBlueBits, pfd.cBlueShift);
+        c->base.alphaMask =
+            BITS_AND_SHIFT_TO_MASK(pfd.cAlphaBits, pfd.cAlphaShift);
 
-      c->base.rgbBits = pfd.cColorBits;
+        c->base.rgbBits = pfd.cColorBits;
 
-      if (pfd.iPixelType == PFD_TYPE_COLORINDEX)
-        {
-          c->base.indexBits = pfd.cColorBits;
+        if (pfd.iPixelType == PFD_TYPE_COLORINDEX) {
+            c->base.indexBits = pfd.cColorBits;
         }
-      else
-        {
-          c->base.indexBits = 0;
+        else {
+            c->base.indexBits = 0;
         }
 
-      c->base.accumRedBits = pfd.cAccumRedBits;
-      c->base.accumGreenBits = pfd.cAccumGreenBits;
-      c->base.accumBlueBits = pfd.cAccumBlueBits;
-      c->base.accumAlphaBits = pfd.cAccumAlphaBits;
-      //  pfd.cAccumBits;
+        c->base.accumRedBits = pfd.cAccumRedBits;
+        c->base.accumGreenBits = pfd.cAccumGreenBits;
+        c->base.accumBlueBits = pfd.cAccumBlueBits;
+        c->base.accumAlphaBits = pfd.cAccumAlphaBits;
+        //  pfd.cAccumBits;
 
-      c->base.depthBits = pfd.cDepthBits;
-      c->base.stencilBits = pfd.cStencilBits;
-      c->base.numAuxBuffers = pfd.cAuxBuffers;
+        c->base.depthBits = pfd.cDepthBits;
+        c->base.stencilBits = pfd.cStencilBits;
+        c->base.numAuxBuffers = pfd.cAuxBuffers;
 
-      // pfd.iLayerType; // ignored
-      c->base.level = 0;
-      // pfd.dwLayerMask; // ignored
-      // pfd.dwDamageMask;  // ignored
+        // pfd.iLayerType; // ignored
+        c->base.level = 0;
+        // pfd.dwLayerMask; // ignored
+        // pfd.dwDamageMask;  // ignored
 
-      c->base.pixmapMode = 0;
-      c->base.visualID = -1;  // will be set by __glXScreenInit()
+        c->base.pixmapMode = 0;
+        c->base.visualID = -1;  // will be set by __glXScreenInit()
 
-      /* EXT_visual_rating / GLX 1.2 */
-      if (pfd.dwFlags & PFD_GENERIC_FORMAT)
-        {
-          c->base.visualRating = GLX_SLOW_VISUAL_EXT;
+        /* EXT_visual_rating / GLX 1.2 */
+        if (pfd.dwFlags & PFD_GENERIC_FORMAT) {
+            c->base.visualRating = GLX_SLOW_VISUAL_EXT;
         }
-      else
-        {
-          // PFD_GENERIC_ACCELERATED is not considered, so this may be MCD or ICD acclerated...
-          c->base.visualRating = GLX_NONE_EXT;
+        else {
+            // PFD_GENERIC_ACCELERATED is not considered, so this may be MCD or ICD acclerated...
+            c->base.visualRating = GLX_NONE_EXT;
         }
 
-      /* EXT_visual_info / GLX 1.2 */
-      if (pfd.iPixelType == PFD_TYPE_COLORINDEX)
-        {
-          c->base.visualType = GLX_STATIC_COLOR;
+        /* EXT_visual_info / GLX 1.2 */
+        if (pfd.iPixelType == PFD_TYPE_COLORINDEX) {
+            c->base.visualType = GLX_STATIC_COLOR;
 
-          if (!getenv("GLWIN_ENABLE_COLORINDEX_FBCONFIGS"))
-            {
-              GLWIN_DEBUG_MSG("pixelFormat %d is PFD_TYPE_COLORINDEX, skipping", i+1);
-              continue;
+            if (!getenv("GLWIN_ENABLE_COLORINDEX_FBCONFIGS")) {
+                GLWIN_DEBUG_MSG
+                    ("pixelFormat %d is PFD_TYPE_COLORINDEX, skipping", i + 1);
+                continue;
             }
         }
-      else
-        {
-          c->base.visualType = GLX_TRUE_COLOR;
+        else {
+            c->base.visualType = GLX_TRUE_COLOR;
         }
 
-      // pfd.dwVisibleMask; ???
-      c->base.transparentPixel = GLX_NONE;
-      c->base.transparentRed = GLX_NONE;
-      c->base.transparentGreen = GLX_NONE;
-      c->base.transparentBlue = GLX_NONE;
-      c->base.transparentAlpha = GLX_NONE;
-      c->base.transparentIndex = GLX_NONE;
-
-      /* ARB_multisample / SGIS_multisample */
-      c->base.sampleBuffers = 0;
-      c->base.samples = 0;
-
-      /* SGIX_fbconfig / GLX 1.3 */
-      c->base.drawableType = (((pfd.dwFlags & PFD_DRAW_TO_WINDOW) ? GLX_WINDOW_BIT : 0)
-                         | ((pfd.dwFlags & PFD_DRAW_TO_BITMAP) ? GLX_PIXMAP_BIT : 0));
-
-      if (pfd.iPixelType == PFD_TYPE_COLORINDEX)
-        {
-          c->base.renderType = GLX_RGBA_BIT | GLX_COLOR_INDEX_BIT;
+        // pfd.dwVisibleMask; ???
+        c->base.transparentPixel = GLX_NONE;
+        c->base.transparentRed = GLX_NONE;
+        c->base.transparentGreen = GLX_NONE;
+        c->base.transparentBlue = GLX_NONE;
+        c->base.transparentAlpha = GLX_NONE;
+        c->base.transparentIndex = GLX_NONE;
+
+        /* ARB_multisample / SGIS_multisample */
+        c->base.sampleBuffers = 0;
+        c->base.samples = 0;
+
+        /* SGIX_fbconfig / GLX 1.3 */
+        c->base.drawableType =
+            (((pfd.dwFlags & PFD_DRAW_TO_WINDOW) ? GLX_WINDOW_BIT : 0)
+             | ((pfd.dwFlags & PFD_DRAW_TO_BITMAP) ? GLX_PIXMAP_BIT : 0));
+
+        if (pfd.iPixelType == PFD_TYPE_COLORINDEX) {
+            c->base.renderType = GLX_RGBA_BIT | GLX_COLOR_INDEX_BIT;
         }
-      else
-        {
-          c->base.renderType = GLX_RGBA_BIT;
+        else {
+            c->base.renderType = GLX_RGBA_BIT;
         }
 
-      c->base.xRenderable = GL_TRUE;
-      c->base.fbconfigID = -1; // will be set by __glXScreenInit()
+        c->base.xRenderable = GL_TRUE;
+        c->base.fbconfigID = -1;        // will be set by __glXScreenInit()
 
-      /* SGIX_pbuffer / GLX 1.3 */
-      // XXX: How can we find these values out ???
-      c->base.maxPbufferWidth = -1;
-      c->base.maxPbufferHeight = -1;
-      c->base.maxPbufferPixels = -1;
-      c->base.optimalPbufferWidth = 0; // there is no optimal value
-      c->base.optimalPbufferHeight = 0;
+        /* SGIX_pbuffer / GLX 1.3 */
+        // XXX: How can we find these values out ???
+        c->base.maxPbufferWidth = -1;
+        c->base.maxPbufferHeight = -1;
+        c->base.maxPbufferPixels = -1;
+        c->base.optimalPbufferWidth = 0;        // there is no optimal value
+        c->base.optimalPbufferHeight = 0;
 
-      /* SGIX_visual_select_group */
-      // arrange for visuals with the best acceleration to be preferred in selection
-      switch (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED))
-        {
+        /* SGIX_visual_select_group */
+        // arrange for visuals with the best acceleration to be preferred in selection
+        switch (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) {
         case 0:
-          c->base.visualSelectGroup = 2;
-          break;
+            c->base.visualSelectGroup = 2;
+            break;
 
         case PFD_GENERIC_ACCELERATED:
-          c->base.visualSelectGroup = 1;
-          break;
+            c->base.visualSelectGroup = 1;
+            break;
 
         case PFD_GENERIC_FORMAT:
-          c->base.visualSelectGroup = 0;
-          break;
+            c->base.visualSelectGroup = 0;
+            break;
 
         default:
-          ;
-          // "can't happen"
+            ;
+            // "can't happen"
         }
 
-      /* OML_swap_method */
-      if (pfd.dwFlags & PFD_SWAP_EXCHANGE)
-        c->base.swapMethod = GLX_SWAP_EXCHANGE_OML;
-      else if (pfd.dwFlags & PFD_SWAP_COPY)
-        c->base.swapMethod = GLX_SWAP_COPY_OML;
-      else
-        c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;
+        /* OML_swap_method */
+        if (pfd.dwFlags & PFD_SWAP_EXCHANGE)
+            c->base.swapMethod = GLX_SWAP_EXCHANGE_OML;
+        else if (pfd.dwFlags & PFD_SWAP_COPY)
+            c->base.swapMethod = GLX_SWAP_COPY_OML;
+        else
+            c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;
 
-      /* EXT_import_context */
-      c->base.screen = screen->base.pScreen->myNum;
+        /* EXT_import_context */
+        c->base.screen = screen->base.pScreen->myNum;
 
-      /* EXT_texture_from_pixmap */
-      c->base.bindToTextureRgb = -1;
-      c->base.bindToTextureRgba = -1;
-      c->base.bindToMipmapTexture = -1;
-      c->base.bindToTextureTargets = -1;
-      c->base.yInverted = -1;
+        /* EXT_texture_from_pixmap */
+        c->base.bindToTextureRgb = -1;
+        c->base.bindToTextureRgba = -1;
+        c->base.bindToMipmapTexture = -1;
+        c->base.bindToTextureTargets = -1;
+        c->base.yInverted = -1;
 
-      n++;
+        n++;
 
-      // update previous config to point to this config
-      if (prev)
-        prev->base.next = &(c->base);
+        // update previous config to point to this config
+        if (prev)
+            prev->base.next = &(c->base);
 
-      prev = c;
+        prev = c;
     }
 
-  GLWIN_DEBUG_MSG("found %d pixelFormats suitable for conversion to fbConfigs", n);
+    GLWIN_DEBUG_MSG
+        ("found %d pixelFormats suitable for conversion to fbConfigs", n);
 
-  screen->base.numFBConfigs = n;
-  screen->base.fbconfigs = &(result->base);
+    screen->base.numFBConfigs = n;
+    screen->base.fbconfigs = &(result->base);
 }
 
 // helper function to access an attribute value from an attribute value array by attribute
 static
-int getAttrValue(const int attrs[], int values[], unsigned int num, int attr, int fallback)
+    int
+getAttrValue(const int attrs[], int values[], unsigned int num, int attr,
+             int fallback)
 {
-  unsigned int i;
-  for (i = 0; i < num; i++)
-    {
-      if (attrs[i] == attr)
-        {
-          GLWIN_TRACE_MSG("getAttrValue attr 0x%x, value %d", attr, values[i]);
-          return values[i];
+    unsigned int i;
+
+    for (i = 0; i < num; i++) {
+        if (attrs[i] == attr) {
+            GLWIN_TRACE_MSG("getAttrValue attr 0x%x, value %d", attr,
+                            values[i]);
+            return values[i];
         }
     }
 
-  ErrorF("getAttrValue failed to find attr 0x%x, using default value %d\n", attr, fallback);
-  return fallback;
+    ErrorF("getAttrValue failed to find attr 0x%x, using default value %d\n",
+           attr, fallback);
+    return fallback;
 }
 
 //
 // Create the GLXconfigs using wglGetPixelFormatAttribfvARB() extension
 //
 static void
-glxWinCreateConfigsExt(HDC hdc, glxWinScreen *screen)
+glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen)
 {
-  GLXWinConfig *c, *result, *prev = NULL;
-  int i = 0;
-  int n = 0;
+    GLXWinConfig *c, *result, *prev = NULL;
+    int i = 0;
+    int n = 0;
 
-  const int attr = WGL_NUMBER_PIXEL_FORMATS_ARB;
-  int numConfigs;
+    const int attr = WGL_NUMBER_PIXEL_FORMATS_ARB;
+    int numConfigs;
 
-  int attrs[50];
-  unsigned int num_attrs = 0;
+    int attrs[50];
+    unsigned int num_attrs = 0;
 
-  GLWIN_DEBUG_MSG("glxWinCreateConfigsExt");
+    GLWIN_DEBUG_MSG("glxWinCreateConfigsExt");
 
-  screen->base.numFBConfigs = 0;
-  screen->base.fbconfigs = NULL;
+    screen->base.numFBConfigs = 0;
+    screen->base.fbconfigs = NULL;
 
-  if (!wglGetPixelFormatAttribivARBWrapper(hdc, 0, 0, 1, &attr, &numConfigs))
-    {
-      ErrorF("wglGetPixelFormatAttribivARB failed for WGL_NUMBER_PIXEL_FORMATS_ARB: %s\n", glxWinErrorMessage());
-      return;
+    if (!wglGetPixelFormatAttribivARBWrapper(hdc, 0, 0, 1, &attr, &numConfigs)) {
+        ErrorF
+            ("wglGetPixelFormatAttribivARB failed for WGL_NUMBER_PIXEL_FORMATS_ARB: %s\n",
+             glxWinErrorMessage());
+        return;
     }
 
-  GLWIN_DEBUG_MSG("wglGetPixelFormatAttribivARB says %d possible pixel formats", numConfigs);
+    GLWIN_DEBUG_MSG
+        ("wglGetPixelFormatAttribivARB says %d possible pixel formats",
+         numConfigs);
 
-  /* alloc */
-  result = malloc(sizeof(GLXWinConfig) * numConfigs);
+    /* alloc */
+    result = malloc(sizeof(GLXWinConfig) * numConfigs);
 
-  if (NULL == result)
-    {
-      return;
+    if (NULL == result) {
+        return;
     }
 
-  memset(result, 0, sizeof(GLXWinConfig) * numConfigs);
-  n = 0;
+    memset(result, 0, sizeof(GLXWinConfig) * numConfigs);
+    n = 0;
 
 #define ADD_ATTR(a) { attrs[num_attrs++] = a; assert(num_attrs < NUM_ELEMENTS(attrs)); }
 
-  ADD_ATTR(WGL_DRAW_TO_WINDOW_ARB);
-  ADD_ATTR(WGL_DRAW_TO_BITMAP_ARB);
-  ADD_ATTR(WGL_ACCELERATION_ARB);
-  ADD_ATTR(WGL_SWAP_LAYER_BUFFERS_ARB);
-  ADD_ATTR(WGL_NUMBER_OVERLAYS_ARB);
-  ADD_ATTR(WGL_NUMBER_UNDERLAYS_ARB);
-  ADD_ATTR(WGL_TRANSPARENT_ARB);
-  ADD_ATTR(WGL_TRANSPARENT_RED_VALUE_ARB);
-  ADD_ATTR(WGL_TRANSPARENT_GREEN_VALUE_ARB);
-  ADD_ATTR(WGL_TRANSPARENT_GREEN_VALUE_ARB);
-  ADD_ATTR(WGL_TRANSPARENT_ALPHA_VALUE_ARB);
-  ADD_ATTR(WGL_SUPPORT_OPENGL_ARB);
-  ADD_ATTR(WGL_DOUBLE_BUFFER_ARB);
-  ADD_ATTR(WGL_STEREO_ARB);
-  ADD_ATTR(WGL_PIXEL_TYPE_ARB);
-  ADD_ATTR(WGL_COLOR_BITS_ARB);
-  ADD_ATTR(WGL_RED_BITS_ARB);
-  ADD_ATTR(WGL_RED_SHIFT_ARB);
-  ADD_ATTR(WGL_GREEN_BITS_ARB);
-  ADD_ATTR(WGL_GREEN_SHIFT_ARB);
-  ADD_ATTR(WGL_BLUE_BITS_ARB);
-  ADD_ATTR(WGL_BLUE_SHIFT_ARB);
-  ADD_ATTR(WGL_ALPHA_BITS_ARB);
-  ADD_ATTR(WGL_ALPHA_SHIFT_ARB);
-  ADD_ATTR(WGL_ACCUM_RED_BITS_ARB);
-  ADD_ATTR(WGL_ACCUM_GREEN_BITS_ARB);
-  ADD_ATTR(WGL_ACCUM_BLUE_BITS_ARB);
-  ADD_ATTR(WGL_ACCUM_ALPHA_BITS_ARB);
-  ADD_ATTR(WGL_DEPTH_BITS_ARB);
-  ADD_ATTR(WGL_STENCIL_BITS_ARB);
-  ADD_ATTR(WGL_AUX_BUFFERS_ARB);
-  ADD_ATTR(WGL_SWAP_METHOD_ARB);
-
-  if (screen->has_WGL_ARB_multisample)
-    {
-      // we may not query these attrs if WGL_ARB_multisample is not offered
-      ADD_ATTR(WGL_SAMPLE_BUFFERS_ARB);
-      ADD_ATTR(WGL_SAMPLES_ARB);
+    ADD_ATTR(WGL_DRAW_TO_WINDOW_ARB);
+    ADD_ATTR(WGL_DRAW_TO_BITMAP_ARB);
+    ADD_ATTR(WGL_ACCELERATION_ARB);
+    ADD_ATTR(WGL_SWAP_LAYER_BUFFERS_ARB);
+    ADD_ATTR(WGL_NUMBER_OVERLAYS_ARB);
+    ADD_ATTR(WGL_NUMBER_UNDERLAYS_ARB);
+    ADD_ATTR(WGL_TRANSPARENT_ARB);
+    ADD_ATTR(WGL_TRANSPARENT_RED_VALUE_ARB);
+    ADD_ATTR(WGL_TRANSPARENT_GREEN_VALUE_ARB);
+    ADD_ATTR(WGL_TRANSPARENT_GREEN_VALUE_ARB);
+    ADD_ATTR(WGL_TRANSPARENT_ALPHA_VALUE_ARB);
+    ADD_ATTR(WGL_SUPPORT_OPENGL_ARB);
+    ADD_ATTR(WGL_DOUBLE_BUFFER_ARB);
+    ADD_ATTR(WGL_STEREO_ARB);
+    ADD_ATTR(WGL_PIXEL_TYPE_ARB);
+    ADD_ATTR(WGL_COLOR_BITS_ARB);
+    ADD_ATTR(WGL_RED_BITS_ARB);
+    ADD_ATTR(WGL_RED_SHIFT_ARB);
+    ADD_ATTR(WGL_GREEN_BITS_ARB);
+    ADD_ATTR(WGL_GREEN_SHIFT_ARB);
+    ADD_ATTR(WGL_BLUE_BITS_ARB);
+    ADD_ATTR(WGL_BLUE_SHIFT_ARB);
+    ADD_ATTR(WGL_ALPHA_BITS_ARB);
+    ADD_ATTR(WGL_ALPHA_SHIFT_ARB);
+    ADD_ATTR(WGL_ACCUM_RED_BITS_ARB);
+    ADD_ATTR(WGL_ACCUM_GREEN_BITS_ARB);
+    ADD_ATTR(WGL_ACCUM_BLUE_BITS_ARB);
+    ADD_ATTR(WGL_ACCUM_ALPHA_BITS_ARB);
+    ADD_ATTR(WGL_DEPTH_BITS_ARB);
+    ADD_ATTR(WGL_STENCIL_BITS_ARB);
+    ADD_ATTR(WGL_AUX_BUFFERS_ARB);
+    ADD_ATTR(WGL_SWAP_METHOD_ARB);
+
+    if (screen->has_WGL_ARB_multisample) {
+        // we may not query these attrs if WGL_ARB_multisample is not offered
+        ADD_ATTR(WGL_SAMPLE_BUFFERS_ARB);
+        ADD_ATTR(WGL_SAMPLES_ARB);
     }
 
-  if (screen->has_WGL_ARB_render_texture)
-    {
-      // we may not query these attrs if WGL_ARB_render_texture is not offered
-      ADD_ATTR(WGL_BIND_TO_TEXTURE_RGB_ARB);
-      ADD_ATTR(WGL_BIND_TO_TEXTURE_RGBA_ARB);
+    if (screen->has_WGL_ARB_render_texture) {
+        // we may not query these attrs if WGL_ARB_render_texture is not offered
+        ADD_ATTR(WGL_BIND_TO_TEXTURE_RGB_ARB);
+        ADD_ATTR(WGL_BIND_TO_TEXTURE_RGBA_ARB);
     }
 
-  if (screen->has_WGL_ARB_pbuffer)
-    {
-      // we may not query these attrs if WGL_ARB_pbuffer is not offered
-      ADD_ATTR(WGL_DRAW_TO_PBUFFER_ARB);
-      ADD_ATTR(WGL_MAX_PBUFFER_PIXELS_ARB);
-      ADD_ATTR(WGL_MAX_PBUFFER_WIDTH_ARB);
-      ADD_ATTR(WGL_MAX_PBUFFER_HEIGHT_ARB);
+    if (screen->has_WGL_ARB_pbuffer) {
+        // we may not query these attrs if WGL_ARB_pbuffer is not offered
+        ADD_ATTR(WGL_DRAW_TO_PBUFFER_ARB);
+        ADD_ATTR(WGL_MAX_PBUFFER_PIXELS_ARB);
+        ADD_ATTR(WGL_MAX_PBUFFER_WIDTH_ARB);
+        ADD_ATTR(WGL_MAX_PBUFFER_HEIGHT_ARB);
     }
 
-  /* fill in configs */
-  for (i = 0;  i < numConfigs; i++)
-    {
-      int values[num_attrs];
+    /* fill in configs */
+    for (i = 0; i < numConfigs; i++) {
+        int values[num_attrs];
 
-      c = &(result[i]);
-      c->base.next = NULL;
-      c->pixelFormatIndex = i+1;
+        c = &(result[i]);
+        c->base.next = NULL;
+        c->pixelFormatIndex = i + 1;
 
-      if (!wglGetPixelFormatAttribivARBWrapper(hdc, i+1, 0, num_attrs, attrs, values))
-        {
-          ErrorF("wglGetPixelFormatAttribivARB failed for index %d, error %s\n", i+1, glxWinErrorMessage());
-          break;
+        if (!wglGetPixelFormatAttribivARBWrapper
+            (hdc, i + 1, 0, num_attrs, attrs, values)) {
+            ErrorF
+                ("wglGetPixelFormatAttribivARB failed for index %d, error %s\n",
+                 i + 1, glxWinErrorMessage());
+            break;
         }
 
 #define ATTR_VALUE(a, d) getAttrValue(attrs, values, num_attrs, (a), (d))
 
-      if (!ATTR_VALUE(WGL_SUPPORT_OPENGL_ARB, 0))
-        {
-          GLWIN_DEBUG_MSG("pixelFormat %d isn't WGL_SUPPORT_OPENGL_ARB, skipping", i+1);
-          continue;
+        if (!ATTR_VALUE(WGL_SUPPORT_OPENGL_ARB, 0)) {
+            GLWIN_DEBUG_MSG
+                ("pixelFormat %d isn't WGL_SUPPORT_OPENGL_ARB, skipping",
+                 i + 1);
+            continue;
         }
 
-      c->base.doubleBufferMode = ATTR_VALUE(WGL_DOUBLE_BUFFER_ARB, 0) ? GL_TRUE : GL_FALSE;
-      c->base.stereoMode = ATTR_VALUE(WGL_STEREO_ARB, 0) ? GL_TRUE : GL_FALSE;
-
-      c->base.redBits = ATTR_VALUE(WGL_RED_BITS_ARB, 0);
-      c->base.greenBits = ATTR_VALUE(WGL_GREEN_BITS_ARB, 0);
-      c->base.blueBits = ATTR_VALUE(WGL_BLUE_BITS_ARB, 0);
-      c->base.alphaBits = ATTR_VALUE(WGL_ALPHA_BITS_ARB, 0);
-
-      c->base.redMask = BITS_AND_SHIFT_TO_MASK(c->base.redBits, ATTR_VALUE(WGL_RED_SHIFT_ARB, 0));
-      c->base.greenMask = BITS_AND_SHIFT_TO_MASK(c->base.greenBits, ATTR_VALUE(WGL_GREEN_SHIFT_ARB, 0));
-      c->base.blueMask = BITS_AND_SHIFT_TO_MASK(c->base.blueBits, ATTR_VALUE(WGL_BLUE_SHIFT_ARB, 0));
-      c->base.alphaMask = BITS_AND_SHIFT_TO_MASK(c->base.alphaBits, ATTR_VALUE(WGL_ALPHA_SHIFT_ARB, 0));
-
-      switch (ATTR_VALUE(WGL_PIXEL_TYPE_ARB, 0))
-        {
+        c->base.doubleBufferMode =
+            ATTR_VALUE(WGL_DOUBLE_BUFFER_ARB, 0) ? GL_TRUE : GL_FALSE;
+        c->base.stereoMode = ATTR_VALUE(WGL_STEREO_ARB, 0) ? GL_TRUE : GL_FALSE;
+
+        c->base.redBits = ATTR_VALUE(WGL_RED_BITS_ARB, 0);
+        c->base.greenBits = ATTR_VALUE(WGL_GREEN_BITS_ARB, 0);
+        c->base.blueBits = ATTR_VALUE(WGL_BLUE_BITS_ARB, 0);
+        c->base.alphaBits = ATTR_VALUE(WGL_ALPHA_BITS_ARB, 0);
+
+        c->base.redMask =
+            BITS_AND_SHIFT_TO_MASK(c->base.redBits,
+                                   ATTR_VALUE(WGL_RED_SHIFT_ARB, 0));
+        c->base.greenMask =
+            BITS_AND_SHIFT_TO_MASK(c->base.greenBits,
+                                   ATTR_VALUE(WGL_GREEN_SHIFT_ARB, 0));
+        c->base.blueMask =
+            BITS_AND_SHIFT_TO_MASK(c->base.blueBits,
+                                   ATTR_VALUE(WGL_BLUE_SHIFT_ARB, 0));
+        c->base.alphaMask =
+            BITS_AND_SHIFT_TO_MASK(c->base.alphaBits,
+                                   ATTR_VALUE(WGL_ALPHA_SHIFT_ARB, 0));
+
+        switch (ATTR_VALUE(WGL_PIXEL_TYPE_ARB, 0)) {
         case WGL_TYPE_COLORINDEX_ARB:
-          c->base.indexBits = ATTR_VALUE(WGL_COLOR_BITS_ARB, 0);
-          c->base.rgbBits = 0;
-          c->base.visualType = GLX_STATIC_COLOR;
-
-          if (!getenv("GLWIN_ENABLE_COLORINDEX_FBCONFIGS"))
-            {
-              GLWIN_DEBUG_MSG("pixelFormat %d is WGL_TYPE_COLORINDEX_ARB, skipping", i+1);
-              continue;
+            c->base.indexBits = ATTR_VALUE(WGL_COLOR_BITS_ARB, 0);
+            c->base.rgbBits = 0;
+            c->base.visualType = GLX_STATIC_COLOR;
+
+            if (!getenv("GLWIN_ENABLE_COLORINDEX_FBCONFIGS")) {
+                GLWIN_DEBUG_MSG
+                    ("pixelFormat %d is WGL_TYPE_COLORINDEX_ARB, skipping",
+                     i + 1);
+                continue;
             }
 
-          break;
+            break;
 
         case WGL_TYPE_RGBA_FLOAT_ARB:
-          GLWIN_DEBUG_MSG("pixelFormat %d is WGL_TYPE_RGBA_FLOAT_ARB, skipping", i+1);
-          continue;
+            GLWIN_DEBUG_MSG
+                ("pixelFormat %d is WGL_TYPE_RGBA_FLOAT_ARB, skipping", i + 1);
+            continue;
 
         case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT:
-          GLWIN_DEBUG_MSG("pixelFormat %d is WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT, skipping", i+1);
-          continue;
+            GLWIN_DEBUG_MSG
+                ("pixelFormat %d is WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT, skipping",
+                 i + 1);
+            continue;
 
         case WGL_TYPE_RGBA_ARB:
-          c->base.indexBits = 0;
-          c->base.rgbBits = ATTR_VALUE(WGL_COLOR_BITS_ARB, 0);
-          c->base.visualType = GLX_TRUE_COLOR;
-          break;
+            c->base.indexBits = 0;
+            c->base.rgbBits = ATTR_VALUE(WGL_COLOR_BITS_ARB, 0);
+            c->base.visualType = GLX_TRUE_COLOR;
+            break;
 
         default:
-          ErrorF("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_PIXEL_TYPE_ARB\n", ATTR_VALUE(WGL_PIXEL_TYPE_ARB, 0));
-          continue;
+            ErrorF
+                ("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_PIXEL_TYPE_ARB\n",
+                 ATTR_VALUE(WGL_PIXEL_TYPE_ARB, 0));
+            continue;
         }
 
-      c->base.accumRedBits = ATTR_VALUE(WGL_ACCUM_RED_BITS_ARB, 0);
-      c->base.accumGreenBits = ATTR_VALUE(WGL_ACCUM_GREEN_BITS_ARB, 0);
-      c->base.accumBlueBits = ATTR_VALUE(WGL_ACCUM_BLUE_BITS_ARB, 0);
-      c->base.accumAlphaBits = ATTR_VALUE(WGL_ACCUM_ALPHA_BITS_ARB, 0);
+        c->base.accumRedBits = ATTR_VALUE(WGL_ACCUM_RED_BITS_ARB, 0);
+        c->base.accumGreenBits = ATTR_VALUE(WGL_ACCUM_GREEN_BITS_ARB, 0);
+        c->base.accumBlueBits = ATTR_VALUE(WGL_ACCUM_BLUE_BITS_ARB, 0);
+        c->base.accumAlphaBits = ATTR_VALUE(WGL_ACCUM_ALPHA_BITS_ARB, 0);
 
-      c->base.depthBits = ATTR_VALUE(WGL_DEPTH_BITS_ARB, 0);
-      c->base.stencilBits = ATTR_VALUE(WGL_STENCIL_BITS_ARB, 0);
-      c->base.numAuxBuffers = ATTR_VALUE(WGL_AUX_BUFFERS_ARB, 0);
+        c->base.depthBits = ATTR_VALUE(WGL_DEPTH_BITS_ARB, 0);
+        c->base.stencilBits = ATTR_VALUE(WGL_STENCIL_BITS_ARB, 0);
+        c->base.numAuxBuffers = ATTR_VALUE(WGL_AUX_BUFFERS_ARB, 0);
 
-      {
-        int layers = ATTR_VALUE(WGL_NUMBER_OVERLAYS_ARB,0) + ATTR_VALUE(WGL_NUMBER_UNDERLAYS_ARB, 0);
+        {
+            int layers =
+                ATTR_VALUE(WGL_NUMBER_OVERLAYS_ARB,
+                           0) + ATTR_VALUE(WGL_NUMBER_UNDERLAYS_ARB, 0);
 
-        if (layers > 0)
-          {
-            ErrorF("pixelFormat %d: has %d overlay, %d underlays which aren't currently handled", i, ATTR_VALUE(WGL_NUMBER_OVERLAYS_ARB,0), ATTR_VALUE(WGL_NUMBER_UNDERLAYS_ARB, 0));
-            // XXX: need to iterate over layers?
-          }
-      }
-      c->base.level = 0;
+            if (layers > 0) {
+                ErrorF
+                    ("pixelFormat %d: has %d overlay, %d underlays which aren't currently handled",
+                     i, ATTR_VALUE(WGL_NUMBER_OVERLAYS_ARB, 0),
+                     ATTR_VALUE(WGL_NUMBER_UNDERLAYS_ARB, 0));
+                // XXX: need to iterate over layers?
+            }
+        }
+        c->base.level = 0;
 
-      c->base.pixmapMode = 0; // ???
-      c->base.visualID = -1;  // will be set by __glXScreenInit()
+        c->base.pixmapMode = 0; // ???
+        c->base.visualID = -1;  // will be set by __glXScreenInit()
 
-      /* EXT_visual_rating / GLX 1.2 */
-      switch (ATTR_VALUE(WGL_ACCELERATION_ARB, 0))
-        {
+        /* EXT_visual_rating / GLX 1.2 */
+        switch (ATTR_VALUE(WGL_ACCELERATION_ARB, 0)) {
         default:
-          ErrorF("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_ACCELERATION_ARB\n", ATTR_VALUE(WGL_ACCELERATION_ARB, 0));
+            ErrorF
+                ("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_ACCELERATION_ARB\n",
+                 ATTR_VALUE(WGL_ACCELERATION_ARB, 0));
 
         case WGL_NO_ACCELERATION_ARB:
-          c->base.visualRating = GLX_SLOW_VISUAL_EXT;
-          break;
+            c->base.visualRating = GLX_SLOW_VISUAL_EXT;
+            break;
 
         case WGL_GENERIC_ACCELERATION_ARB:
         case WGL_FULL_ACCELERATION_ARB:
-          c->base.visualRating = GLX_NONE_EXT;
-          break;
+            c->base.visualRating = GLX_NONE_EXT;
+            break;
         }
 
-      /* EXT_visual_info / GLX 1.2 */
-      // c->base.visualType is set above
-      if (ATTR_VALUE(WGL_TRANSPARENT_ARB, 0))
-        {
-          c->base.transparentPixel = (c->base.visualType == GLX_TRUE_COLOR) ? GLX_TRANSPARENT_RGB_EXT : GLX_TRANSPARENT_INDEX_EXT;
-          c->base.transparentRed = ATTR_VALUE(WGL_TRANSPARENT_RED_VALUE_ARB, 0);
-          c->base.transparentGreen = ATTR_VALUE(WGL_TRANSPARENT_GREEN_VALUE_ARB, 0);
-          c->base.transparentBlue = ATTR_VALUE(WGL_TRANSPARENT_BLUE_VALUE_ARB, 0);
-          c->base.transparentAlpha = ATTR_VALUE(WGL_TRANSPARENT_ALPHA_VALUE_ARB, 0);
-          c->base.transparentIndex = ATTR_VALUE(WGL_TRANSPARENT_INDEX_VALUE_ARB, 0);
-        }
-      else
-        {
-          c->base.transparentPixel = GLX_NONE_EXT;
-          c->base.transparentRed = GLX_NONE;
-          c->base.transparentGreen = GLX_NONE;
-          c->base.transparentBlue = GLX_NONE;
-          c->base.transparentAlpha = GLX_NONE;
-          c->base.transparentIndex = GLX_NONE;
+        /* EXT_visual_info / GLX 1.2 */
+        // c->base.visualType is set above
+        if (ATTR_VALUE(WGL_TRANSPARENT_ARB, 0)) {
+            c->base.transparentPixel =
+                (c->base.visualType ==
+                 GLX_TRUE_COLOR) ? GLX_TRANSPARENT_RGB_EXT :
+                GLX_TRANSPARENT_INDEX_EXT;
+            c->base.transparentRed =
+                ATTR_VALUE(WGL_TRANSPARENT_RED_VALUE_ARB, 0);
+            c->base.transparentGreen =
+                ATTR_VALUE(WGL_TRANSPARENT_GREEN_VALUE_ARB, 0);
+            c->base.transparentBlue =
+                ATTR_VALUE(WGL_TRANSPARENT_BLUE_VALUE_ARB, 0);
+            c->base.transparentAlpha =
+                ATTR_VALUE(WGL_TRANSPARENT_ALPHA_VALUE_ARB, 0);
+            c->base.transparentIndex =
+                ATTR_VALUE(WGL_TRANSPARENT_INDEX_VALUE_ARB, 0);
+        }
+        else {
+            c->base.transparentPixel = GLX_NONE_EXT;
+            c->base.transparentRed = GLX_NONE;
+            c->base.transparentGreen = GLX_NONE;
+            c->base.transparentBlue = GLX_NONE;
+            c->base.transparentAlpha = GLX_NONE;
+            c->base.transparentIndex = GLX_NONE;
         }
 
-      /* ARB_multisample / SGIS_multisample */
-      if (screen->has_WGL_ARB_multisample)
-        {
-          c->base.sampleBuffers = ATTR_VALUE(WGL_SAMPLE_BUFFERS_ARB, 0);
-          c->base.samples = ATTR_VALUE(WGL_SAMPLES_ARB, 0);
+        /* ARB_multisample / SGIS_multisample */
+        if (screen->has_WGL_ARB_multisample) {
+            c->base.sampleBuffers = ATTR_VALUE(WGL_SAMPLE_BUFFERS_ARB, 0);
+            c->base.samples = ATTR_VALUE(WGL_SAMPLES_ARB, 0);
         }
-      else
-        {
-          c->base.sampleBuffers = 0;
-          c->base.samples = 0;
+        else {
+            c->base.sampleBuffers = 0;
+            c->base.samples = 0;
         }
 
-      /* SGIX_fbconfig / GLX 1.3 */
-      c->base.drawableType = ((ATTR_VALUE(WGL_DRAW_TO_WINDOW_ARB, 0) ? GLX_WINDOW_BIT : 0)
-                         | (ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, 0) ? GLX_PIXMAP_BIT : 0)
-                         | (ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, 0) ? GLX_PBUFFER_BIT : 0));
-
-      /*
-        Assume OpenGL RGBA rendering is available on all visuals
-        (it is specified to render to red component in single-channel visuals,
-        if supported, but there doesn't seem to be any mechanism to check if it
-        is supported)
-
-        Color index rendering is only supported on single-channel visuals
-      */
-      if (c->base.visualType == GLX_STATIC_COLOR)
-        {
-          c->base.renderType = GLX_RGBA_BIT | GLX_COLOR_INDEX_BIT;
+        /* SGIX_fbconfig / GLX 1.3 */
+        c->base.drawableType =
+            ((ATTR_VALUE(WGL_DRAW_TO_WINDOW_ARB, 0) ? GLX_WINDOW_BIT : 0)
+             | (ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, 0) ? GLX_PIXMAP_BIT : 0)
+             | (ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, 0) ? GLX_PBUFFER_BIT : 0));
+
+        /*
+           Assume OpenGL RGBA rendering is available on all visuals
+           (it is specified to render to red component in single-channel visuals,
+           if supported, but there doesn't seem to be any mechanism to check if it
+           is supported)
+
+           Color index rendering is only supported on single-channel visuals
+         */
+        if (c->base.visualType == GLX_STATIC_COLOR) {
+            c->base.renderType = GLX_RGBA_BIT | GLX_COLOR_INDEX_BIT;
         }
-      else
-        {
-          c->base.renderType = GLX_RGBA_BIT;
+        else {
+            c->base.renderType = GLX_RGBA_BIT;
         }
 
-      c->base.xRenderable = GL_TRUE;
-      c->base.fbconfigID = -1; // will be set by __glXScreenInit()
+        c->base.xRenderable = GL_TRUE;
+        c->base.fbconfigID = -1;        // will be set by __glXScreenInit()
 
-      /* SGIX_pbuffer / GLX 1.3 */
-      if (screen->has_WGL_ARB_pbuffer)
-        {
-          c->base.maxPbufferWidth = ATTR_VALUE(WGL_MAX_PBUFFER_WIDTH_ARB, -1);
-          c->base.maxPbufferHeight = ATTR_VALUE(WGL_MAX_PBUFFER_HEIGHT_ARB, -1);
-          c->base.maxPbufferPixels =  ATTR_VALUE(WGL_MAX_PBUFFER_PIXELS_ARB, -1);
+        /* SGIX_pbuffer / GLX 1.3 */
+        if (screen->has_WGL_ARB_pbuffer) {
+            c->base.maxPbufferWidth = ATTR_VALUE(WGL_MAX_PBUFFER_WIDTH_ARB, -1);
+            c->base.maxPbufferHeight =
+                ATTR_VALUE(WGL_MAX_PBUFFER_HEIGHT_ARB, -1);
+            c->base.maxPbufferPixels =
+                ATTR_VALUE(WGL_MAX_PBUFFER_PIXELS_ARB, -1);
         }
-      else
-        {
-          c->base.maxPbufferWidth = -1;
-          c->base.maxPbufferHeight = -1;
-          c->base.maxPbufferPixels =  -1;
+        else {
+            c->base.maxPbufferWidth = -1;
+            c->base.maxPbufferHeight = -1;
+            c->base.maxPbufferPixels = -1;
         }
-      c->base.optimalPbufferWidth = 0; // there is no optimal value
-      c->base.optimalPbufferHeight = 0;
+        c->base.optimalPbufferWidth = 0;        // there is no optimal value
+        c->base.optimalPbufferHeight = 0;
 
-      /* SGIX_visual_select_group */
-      // arrange for visuals with the best acceleration to be preferred in selection
-      switch (ATTR_VALUE(WGL_ACCELERATION_ARB, 0))
-        {
+        /* SGIX_visual_select_group */
+        // arrange for visuals with the best acceleration to be preferred in selection
+        switch (ATTR_VALUE(WGL_ACCELERATION_ARB, 0)) {
         case WGL_FULL_ACCELERATION_ARB:
-          c->base.visualSelectGroup = 2;
-          break;
+            c->base.visualSelectGroup = 2;
+            break;
 
         case WGL_GENERIC_ACCELERATION_ARB:
-          c->base.visualSelectGroup = 1;
-          break;
+            c->base.visualSelectGroup = 1;
+            break;
 
         default:
         case WGL_NO_ACCELERATION_ARB:
-          c->base.visualSelectGroup = 0;
-          break;
+            c->base.visualSelectGroup = 0;
+            break;
         }
 
-      /* OML_swap_method */
-      switch (ATTR_VALUE(WGL_SWAP_METHOD_ARB, 0))
-        {
+        /* OML_swap_method */
+        switch (ATTR_VALUE(WGL_SWAP_METHOD_ARB, 0)) {
         case WGL_SWAP_EXCHANGE_ARB:
-          c->base.swapMethod = GLX_SWAP_EXCHANGE_OML;
-          break;
+            c->base.swapMethod = GLX_SWAP_EXCHANGE_OML;
+            break;
 
         case WGL_SWAP_COPY_ARB:
-          c->base.swapMethod = GLX_SWAP_COPY_OML;
-          break;
+            c->base.swapMethod = GLX_SWAP_COPY_OML;
+            break;
 
         default:
-          ErrorF("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_SWAP_METHOD_ARB\n", ATTR_VALUE(WGL_SWAP_METHOD_ARB, 0));
+            ErrorF
+                ("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_SWAP_METHOD_ARB\n",
+                 ATTR_VALUE(WGL_SWAP_METHOD_ARB, 0));
 
         case WGL_SWAP_UNDEFINED_ARB:
-          c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;
+            c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;
         }
 
-      /* EXT_import_context */
-      c->base.screen = screen->base.pScreen->myNum;
-
-      /* EXT_texture_from_pixmap */
-      /*
-         Mesa's DRI configs always have bindToTextureRgb/Rgba TRUE (see driCreateConfigs(), so setting
-         bindToTextureRgb/bindToTextureRgba to FALSE means that swrast can't find any fbConfigs to use,
-         so setting these to 0, even if we know bindToTexture isn't available, isn't a good idea...
-       */
-      if (screen->has_WGL_ARB_render_texture)
-        {
-          c->base.bindToTextureRgb = ATTR_VALUE(WGL_BIND_TO_TEXTURE_RGB_ARB, -1);
-          c->base.bindToTextureRgba = ATTR_VALUE(WGL_BIND_TO_TEXTURE_RGBA_ARB, -1);
+        /* EXT_import_context */
+        c->base.screen = screen->base.pScreen->myNum;
+
+        /* EXT_texture_from_pixmap */
+        /*
+           Mesa's DRI configs always have bindToTextureRgb/Rgba TRUE (see driCreateConfigs(), so setting
+           bindToTextureRgb/bindToTextureRgba to FALSE means that swrast can't find any fbConfigs to use,
+           so setting these to 0, even if we know bindToTexture isn't available, isn't a good idea...
+         */
+        if (screen->has_WGL_ARB_render_texture) {
+            c->base.bindToTextureRgb =
+                ATTR_VALUE(WGL_BIND_TO_TEXTURE_RGB_ARB, -1);
+            c->base.bindToTextureRgba =
+                ATTR_VALUE(WGL_BIND_TO_TEXTURE_RGBA_ARB, -1);
         }
-      else
-        {
-          c->base.bindToTextureRgb = -1;
-          c->base.bindToTextureRgba = -1;
+        else {
+            c->base.bindToTextureRgb = -1;
+            c->base.bindToTextureRgba = -1;
         }
-      c->base.bindToMipmapTexture = -1;
-      c->base.bindToTextureTargets = GLX_TEXTURE_1D_BIT_EXT | GLX_TEXTURE_2D_BIT_EXT | GLX_TEXTURE_RECTANGLE_BIT_EXT;
-      c->base.yInverted = -1;
+        c->base.bindToMipmapTexture = -1;
+        c->base.bindToTextureTargets =
+            GLX_TEXTURE_1D_BIT_EXT | GLX_TEXTURE_2D_BIT_EXT |
+            GLX_TEXTURE_RECTANGLE_BIT_EXT;
+        c->base.yInverted = -1;
 
-      n++;
+        n++;
 
-      // update previous config to point to this config
-      if (prev)
-        prev->base.next = &(c->base);
+        // update previous config to point to this config
+        if (prev)
+            prev->base.next = &(c->base);
 
-      prev = c;
+        prev = c;
     }
 
-  screen->base.numFBConfigs = n;
-  screen->base.fbconfigs = &(result->base);
+    screen->base.numFBConfigs = n;
+    screen->base.fbconfigs = &(result->base);
 }
diff --git a/xorg-server/hw/xwin/glx/wgl_ext_api.h b/xorg-server/hw/xwin/glx/wgl_ext_api.h
index 3c8a5eb0f..b7231eb13 100644
--- a/xorg-server/hw/xwin/glx/wgl_ext_api.h
+++ b/xorg-server/hw/xwin/glx/wgl_ext_api.h
@@ -1,87 +1,83 @@
-/*

- * File: wgl_ext_api.h

- * Purpose: Wrapper functions for Win32 OpenGL wgl extension functions

- *

- * Authors: Jon TURNEY

- *

- * Copyright (c) Jon TURNEY 2009

- *

- *

- * 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.

- */

-

-#ifndef wgl_ext_api_h

-#define wgl_ext_api_h

-

-#include <GL/wglext.h>

-

-void wglResolveExtensionProcs(void);

-

-/*

-  Prototypes for wrapper functions we actually use

-  XXX: should be automatically generated as well

-*/

-

-const char *wglGetExtensionsStringARBWrapper(HDC hdc);

-BOOL wglMakeContextCurrentARBWrapper(HDC hDrawDC, HDC hReadDC, HGLRC hglrc);

-HDC wglGetCurrentReadDCARBWrapper(VOID);

-

-BOOL wglGetPixelFormatAttribivARBWrapper(HDC hdc,

-                                          int iPixelFormat,

-                                          int iLayerPlane,

-                                          UINT nAttributes,

-                                          const int *piAttributes,

-                                          int *piValues);

-

-BOOL wglGetPixelFormatAttribfvARBWrapper(HDC hdc,

-                                          int iPixelFormat,

-                                          int iLayerPlane,

-                                          UINT nAttributes,

-                                          const int *piAttributes,

-                                          FLOAT *pfValues);

-

-BOOL wglChoosePixelFormatARBWrapper(HDC hdc,

-                                     const int *piAttribIList,

-                                     const FLOAT *pfAttribFList,

-                                     UINT nMaxFormats,

-                                     int *piFormats,

-                                     UINT *nNumFormats);

-

-HPBUFFERARB wglCreatePbufferARBWrapper(HDC hDC,

-                                       int iPixelFormat,

-                                       int iWidth,

-                                       int iHeight,

-                                       const int *piAttribList);

-

-HDC wglGetPbufferDCARBWrapper(HPBUFFERARB hPbuffer);

-

-int wglReleasePbufferDCARBWrapper(HPBUFFERARB hPbuffer,

-                                  HDC hDC);

-

-BOOL wglDestroyPbufferARBWrapper(HPBUFFERARB hPbuffer);

-

-BOOL wglQueryPbufferARBWrapper(HPBUFFERARB hPbuffer,

-                                int iAttribute,

-                                int *piValue);

-

-BOOL wglSwapIntervalEXTWrapper(int interval);

-

-int wglGetSwapIntervalEXTWrapper(void);

-

-#endif /* wgl_ext_api_h */

+/*
+ * File: wgl_ext_api.h
+ * Purpose: Wrapper functions for Win32 OpenGL wgl extension functions
+ *
+ * Authors: Jon TURNEY
+ *
+ * Copyright (c) Jon TURNEY 2009
+ *
+ *
+ * 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.
+ */
+
+#ifndef wgl_ext_api_h
+#define wgl_ext_api_h
+
+#include <GL/wglext.h>
+
+void wglResolveExtensionProcs(void);
+
+/*
+  Prototypes for wrapper functions we actually use
+  XXX: should be automatically generated as well
+*/
+
+const char *wglGetExtensionsStringARBWrapper(HDC hdc);
+BOOL wglMakeContextCurrentARBWrapper(HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+HDC wglGetCurrentReadDCARBWrapper(VOID);
+
+BOOL wglGetPixelFormatAttribivARBWrapper(HDC hdc,
+                                         int iPixelFormat,
+                                         int iLayerPlane,
+                                         UINT nAttributes,
+                                         const int *piAttributes,
+                                         int *piValues);
+
+BOOL wglGetPixelFormatAttribfvARBWrapper(HDC hdc,
+                                         int iPixelFormat,
+                                         int iLayerPlane,
+                                         UINT nAttributes,
+                                         const int *piAttributes,
+                                         FLOAT * pfValues);
+
+BOOL wglChoosePixelFormatARBWrapper(HDC hdc,
+                                    const int *piAttribIList,
+                                    const FLOAT * pfAttribFList,
+                                    UINT nMaxFormats,
+                                    int *piFormats, UINT * nNumFormats);
+
+HPBUFFERARB wglCreatePbufferARBWrapper(HDC hDC,
+                                       int iPixelFormat,
+                                       int iWidth,
+                                       int iHeight, const int *piAttribList);
+
+HDC wglGetPbufferDCARBWrapper(HPBUFFERARB hPbuffer);
+
+int wglReleasePbufferDCARBWrapper(HPBUFFERARB hPbuffer, HDC hDC);
+
+BOOL wglDestroyPbufferARBWrapper(HPBUFFERARB hPbuffer);
+
+BOOL wglQueryPbufferARBWrapper(HPBUFFERARB hPbuffer,
+                               int iAttribute, int *piValue);
+
+BOOL wglSwapIntervalEXTWrapper(int interval);
+
+int wglGetSwapIntervalEXTWrapper(void);
+
+#endif                          /* wgl_ext_api_h */
diff --git a/xorg-server/hw/xwin/glx/winpriv.c b/xorg-server/hw/xwin/glx/winpriv.c
index 460973730..4f6e4ffd5 100644
--- a/xorg-server/hw/xwin/glx/winpriv.c
+++ b/xorg-server/hw/xwin/glx/winpriv.c
@@ -12,26 +12,26 @@
 #include "winwindow.h"
 
 void
-winCreateWindowsWindow (WindowPtr pWin);
+ winCreateWindowsWindow(WindowPtr pWin);
+
 /**
  * Return size and handles of a window.
  * If pWin is NULL, then the information for the root window is requested.
  */
-HWND winGetWindowInfo(WindowPtr pWin)
+HWND
+winGetWindowInfo(WindowPtr pWin)
 {
     winTrace("%s: pWin %p XID 0x%x\n", __FUNCTION__, pWin, pWin->drawable.id);
 
     /* a real window was requested */
-    if (pWin != NULL)
-    {
+    if (pWin != NULL) {
         /* Get the window and screen privates */
         ScreenPtr pScreen = pWin->drawable.pScreen;
         winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
         winScreenInfoPtr pScreenInfo = NULL;
         HWND hwnd = NULL;
 
-        if (pWinScreen == NULL)
-        {
+        if (pWinScreen == NULL) {
             ErrorF("winGetWindowInfo: screen has no privates\n");
             return NULL;
         }
@@ -41,48 +41,42 @@ HWND winGetWindowInfo(WindowPtr pWin)
         pScreenInfo = pWinScreen->pScreenInfo;
 #ifdef XWIN_MULTIWINDOW
         /* check for multiwindow mode */
-        if (pScreenInfo->fMultiWindow)
-        {
+        if (pScreenInfo->fMultiWindow) {
             winWindowPriv(pWin);
 
-            if (pWinPriv == NULL)
-            {
+            if (pWinPriv == NULL) {
                 ErrorF("winGetWindowInfo: window has no privates\n");
                 return hwnd;
             }
 
-            if (pWinPriv->hWnd == NULL)
-            {
-              winCreateWindowsWindow(pWin);
-              ErrorF("winGetWindowInfo: forcing window to exist...\n");
+            if (pWinPriv->hWnd == NULL) {
+                winCreateWindowsWindow(pWin);
+                ErrorF("winGetWindowInfo: forcing window to exist...\n");
             }
 
-            if (pWinPriv->hWnd != NULL)
-              {
+            if (pWinPriv->hWnd != NULL) {
                 /* copy window handle */
                 hwnd = pWinPriv->hWnd;
 
                 /* mark GLX active on that hwnd */
                 pWinPriv->fWglUsed = TRUE;
-              }
+            }
 
             return hwnd;
         }
 #endif
 #ifdef XWIN_MULTIWINDOWEXTWM
         /* check for multiwindow external wm mode */
-        if (pScreenInfo->fMWExtWM)
-        {
+        if (pScreenInfo->fMWExtWM) {
             win32RootlessWindowPtr pRLWinPriv
-                = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, FALSE);
+                = (win32RootlessWindowPtr) RootlessFrameForWindow(pWin, FALSE);
 
             if (pRLWinPriv == NULL) {
                 ErrorF("winGetWindowInfo: window has no privates\n");
                 return hwnd;
             }
 
-            if (pRLWinPriv->hWnd != NULL)
-            {
+            if (pRLWinPriv->hWnd != NULL) {
                 /* copy window handle */
                 hwnd = pRLWinPriv->hWnd;
             }
@@ -90,13 +84,11 @@ HWND winGetWindowInfo(WindowPtr pWin)
         }
 #endif
     }
-    else
-    {
+    else {
         ScreenPtr pScreen = g_ScreenInfo[0].pScreen;
         winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
 
-        if (pWinScreen == NULL)
-        {
+        if (pWinScreen == NULL) {
             ErrorF("winGetWindowInfo: screen has no privates\n");
             return NULL;
         }
@@ -112,18 +104,18 @@ HWND winGetWindowInfo(WindowPtr pWin)
 Bool
 winCheckScreenAiglxIsSupported(ScreenPtr pScreen)
 {
-  winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
-  winScreenInfoPtr pScreenInfo = pWinScreen->pScreenInfo;
+    winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
+    winScreenInfoPtr pScreenInfo = pWinScreen->pScreenInfo;
 
 #ifdef XWIN_MULTIWINDOW
-  if (pScreenInfo->fMultiWindow)
-    return TRUE;
+    if (pScreenInfo->fMultiWindow)
+        return TRUE;
 #endif
 
 #ifdef XWIN_MULTIWINDOWEXTWM
-  if (pScreenInfo->fMWExtWM)
-    return TRUE;
+    if (pScreenInfo->fMWExtWM)
+        return TRUE;
 #endif
 
-  return FALSE;
+    return FALSE;
 }
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index 583906442..ce90d05e2 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -49,21 +49,20 @@
 
 /* WM_XBUTTON Messages. They should go into w32api. */
 #ifndef WM_XBUTTONDOWN
-# define WM_XBUTTONDOWN 523
+#define WM_XBUTTONDOWN 523
 #endif
 #ifndef WM_XBUTTONUP
-# define WM_XBUTTONUP 524
+#define WM_XBUTTONUP 524
 #endif
 #ifndef WM_XBUTTONDBLCLK
-# define WM_XBUTTONDBLCLK 525
+#define WM_XBUTTONDBLCLK 525
 #endif
 
-
 #define WIN_DEFAULT_BPP				0
 #define WIN_DEFAULT_WHITEPIXEL			255
 #define WIN_DEFAULT_BLACKPIXEL			0
 #define WIN_DEFAULT_LINEBIAS			0
-#define WIN_DEFAULT_E3B_TIME			50 /* milliseconds */
+#define WIN_DEFAULT_E3B_TIME			50      /* milliseconds */
 #define WIN_DEFAULT_DPI				96
 #define WIN_DEFAULT_REFRESH			0
 #define WIN_DEFAULT_WIN_KILL			TRUE
@@ -106,15 +105,15 @@
 
 #define WIN_FD_INVALID		-1
 
-#define WIN_SERVER_NONE		0x0L	/* 0 */
-#define WIN_SERVER_SHADOW_GDI	0x1L	/* 1 */
-#define WIN_SERVER_SHADOW_DD	0x2L	/* 2 */
-#define WIN_SERVER_SHADOW_DDNL	0x4L	/* 4 */
+#define WIN_SERVER_NONE		0x0L    /* 0 */
+#define WIN_SERVER_SHADOW_GDI	0x1L    /* 1 */
+#define WIN_SERVER_SHADOW_DD	0x2L    /* 2 */
+#define WIN_SERVER_SHADOW_DDNL	0x4L    /* 4 */
 #ifdef XWIN_PRIMARYFB
-#define WIN_SERVER_PRIMARY_DD	0x8L	/* 8 */
+#define WIN_SERVER_PRIMARY_DD	0x8L    /* 8 */
 #endif
 #ifdef XWIN_NATIVEGDI
-# define WIN_SERVER_NATIVE_GDI	0x10L	/* 16 */
+#define WIN_SERVER_NATIVE_GDI	0x10L   /* 16 */
 #endif
 
 #define AltMapIndex		Mod1MapIndex
@@ -149,8 +148,8 @@
 #include <sys/mman.h>
 #ifndef MAP_FILE
 #define MAP_FILE 0
-#endif /* MAP_FILE */
-#endif /* HAVE_MMAP */
+#endif                          /* MAP_FILE */
+#endif                          /* HAVE_MMAP */
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
@@ -194,7 +193,6 @@
 #include "winms.h"
 #include "winresource.h"
 
-
 /*
  * Define Windows constants
  */
@@ -203,12 +201,10 @@
 #define WM_INIT_SYS_MENU	(WM_USER + 1001)
 #define WM_GIVEUP		(WM_USER + 1002)
 
-
 /* Local includes */
 #include "winwindow.h"
 #include "winmsg.h"
 
-
 /*
  * Debugging macros
  */
@@ -253,7 +249,6 @@ if (++PROFPT##point % thresh == 0)\
 ErrorF (#point ": PROFILEPOINT hit %u times\n", PROFPT##point);\
 }
 
-
 /* We use xor this macro for detecting toggle key state changes */
 #define WIN_XOR(a,b) ((!(a) && (b)) || ((a) && !(b)))
 
@@ -272,117 +267,111 @@ static Atom func (void) {					\
  * Typedefs for engine dependent function pointers
  */
 
-typedef Bool (*winAllocateFBProcPtr)(ScreenPtr);
+typedef Bool (*winAllocateFBProcPtr) (ScreenPtr);
 
-typedef void (*winFreeFBProcPtr)(ScreenPtr);
+typedef void (*winFreeFBProcPtr) (ScreenPtr);
 
-typedef void (*winShadowUpdateProcPtr)(ScreenPtr, shadowBufPtr);
+typedef void (*winShadowUpdateProcPtr) (ScreenPtr, shadowBufPtr);
 
-typedef Bool (*winInitScreenProcPtr)(ScreenPtr);
+typedef Bool (*winInitScreenProcPtr) (ScreenPtr);
 
-typedef Bool (*winCloseScreenProcPtr)(int, ScreenPtr);
+typedef Bool (*winCloseScreenProcPtr) (int, ScreenPtr);
 
-typedef Bool (*winInitVisualsProcPtr)(ScreenPtr);
+typedef Bool (*winInitVisualsProcPtr) (ScreenPtr);
 
-typedef Bool (*winAdjustVideoModeProcPtr)(ScreenPtr);
+typedef Bool (*winAdjustVideoModeProcPtr) (ScreenPtr);
 
-typedef Bool (*winCreateBoundingWindowProcPtr)(ScreenPtr);
+typedef Bool (*winCreateBoundingWindowProcPtr) (ScreenPtr);
 
-typedef Bool (*winFinishScreenInitProcPtr)(int, ScreenPtr, int, char **);
+typedef Bool (*winFinishScreenInitProcPtr) (int, ScreenPtr, int, char **);
 
-typedef Bool (*winBltExposedRegionsProcPtr)(ScreenPtr);
+typedef Bool (*winBltExposedRegionsProcPtr) (ScreenPtr);
 
-typedef Bool (*winActivateAppProcPtr)(ScreenPtr);
+typedef Bool (*winActivateAppProcPtr) (ScreenPtr);
 
-typedef Bool (*winRedrawScreenProcPtr)(ScreenPtr pScreen);
+typedef Bool (*winRedrawScreenProcPtr) (ScreenPtr pScreen);
 
-typedef Bool (*winRealizeInstalledPaletteProcPtr)(ScreenPtr pScreen);
+typedef Bool (*winRealizeInstalledPaletteProcPtr) (ScreenPtr pScreen);
 
-typedef Bool (*winInstallColormapProcPtr)(ColormapPtr pColormap);
+typedef Bool (*winInstallColormapProcPtr) (ColormapPtr pColormap);
 
-typedef Bool (*winStoreColorsProcPtr)(ColormapPtr pmap, 
-				      int ndef, xColorItem *pdefs);
+typedef Bool (*winStoreColorsProcPtr) (ColormapPtr pmap,
+                                       int ndef, xColorItem * pdefs);
 
-typedef Bool (*winCreateColormapProcPtr)(ColormapPtr pColormap);
+typedef Bool (*winCreateColormapProcPtr) (ColormapPtr pColormap);
 
-typedef Bool (*winDestroyColormapProcPtr)(ColormapPtr pColormap);
+typedef Bool (*winDestroyColormapProcPtr) (ColormapPtr pColormap);
 
-typedef Bool (*winHotKeyAltTabProcPtr)(ScreenPtr);
+typedef Bool (*winHotKeyAltTabProcPtr) (ScreenPtr);
 
-typedef Bool (*winCreatePrimarySurfaceProcPtr)(ScreenPtr);
+typedef Bool (*winCreatePrimarySurfaceProcPtr) (ScreenPtr);
 
-typedef Bool (*winReleasePrimarySurfaceProcPtr)(ScreenPtr);
+typedef Bool (*winReleasePrimarySurfaceProcPtr) (ScreenPtr);
 
-typedef Bool (*winFinishCreateWindowsWindowProcPtr)(WindowPtr pWin);
+typedef Bool (*winFinishCreateWindowsWindowProcPtr) (WindowPtr pWin);
 
-typedef Bool (*winCreateScreenResourcesProc)(ScreenPtr);
+typedef Bool (*winCreateScreenResourcesProc) (ScreenPtr);
 
 #ifdef XWIN_NATIVEGDI
 /* Typedefs for native GDI wrappers */
 typedef Bool (*RealizeFontPtr) (ScreenPtr pScreen, FontPtr pFont);
-typedef Bool (*UnrealizeFontPtr)(ScreenPtr pScreen, FontPtr pFont);
+typedef Bool (*UnrealizeFontPtr) (ScreenPtr pScreen, FontPtr pFont);
 #endif
 
-
 /*
  * GC (graphics context) privates
  */
 
-typedef struct
-{
-  HDC			hdc;
-  HDC			hdcMem;
+typedef struct {
+    HDC hdc;
+    HDC hdcMem;
 } winPrivGCRec, *winPrivGCPtr;
 
-
 /*
  * Pixmap privates
  */
 
-typedef struct
-{
-  HDC			hdcSelected;
-  HBITMAP		hBitmap;
-  BYTE			*pbBits;
-  DWORD			dwScanlineBytes;
-  BITMAPINFOHEADER	*pbmih;
+typedef struct {
+    HDC hdcSelected;
+    HBITMAP hBitmap;
+    BYTE *pbBits;
+    DWORD dwScanlineBytes;
+    BITMAPINFOHEADER *pbmih;
 } winPrivPixmapRec, *winPrivPixmapPtr;
 
-
 /*
  * Colormap privates
  */
 
-typedef struct
-{
-  HPALETTE		hPalette;
-  LPDIRECTDRAWPALETTE	lpDDPalette;
-  RGBQUAD		rgbColors[WIN_NUM_PALETTE_ENTRIES];
-  PALETTEENTRY		peColors[WIN_NUM_PALETTE_ENTRIES];
+typedef struct {
+    HPALETTE hPalette;
+    LPDIRECTDRAWPALETTE lpDDPalette;
+    RGBQUAD rgbColors[WIN_NUM_PALETTE_ENTRIES];
+    PALETTEENTRY peColors[WIN_NUM_PALETTE_ENTRIES];
 } winPrivCmapRec, *winPrivCmapPtr;
 
 /*
  * Windows Cursor handling.
- */ 
-  
+ */
+
 typedef struct {
-  /* from GetSystemMetrics */
-  int sm_cx;
-  int sm_cy;
-
-  BOOL visible;
-  HCURSOR handle;
-  QueryBestSizeProcPtr QueryBestSize;
-  miPointerSpriteFuncPtr spriteFuncs;
+    /* from GetSystemMetrics */
+    int sm_cx;
+    int sm_cy;
+
+    BOOL visible;
+    HCURSOR handle;
+    QueryBestSizeProcPtr QueryBestSize;
+    miPointerSpriteFuncPtr spriteFuncs;
 } winCursorRec;
 
 /*
  * Resize modes
  */
 typedef enum {
-  notAllowed,
-  resizeWithScrollbars,
-  resizeWithRandr
+    notAllowed,
+    resizeWithScrollbars,
+    resizeWithRandr
 } winResizeMode;
 
 /*
@@ -390,292 +379,291 @@ typedef enum {
  * in the server startup sequence.
  */
 
-typedef struct
-{
-  ScreenPtr		pScreen;
-  
-  /* Did the user specify a height and width? */
-  Bool			fUserGaveHeightAndWidth;
-
-  DWORD			dwScreen;
-
-  int			iMonitor;
-  DWORD			dwUserWidth;
-  DWORD			dwUserHeight;
-  DWORD			dwWidth;
-  DWORD			dwHeight;
-  DWORD			dwPaddedWidth;
-
-  /* Did the user specify a screen position? */
-  Bool			fUserGavePosition;
-  DWORD                 dwInitialX;
-  DWORD                 dwInitialY;
-
-  /*
-   * dwStride is the number of whole pixels that occupy a scanline,
-   * including those pixels that are not displayed.  This is basically
-   * a rounding up of the width.
-   */
-  DWORD			dwStride;
-
-  /* Offset of the screen in the window when using scrollbars */
-  DWORD			dwXOffset;
-  DWORD			dwYOffset;
-
-  DWORD			dwBPP;
-  DWORD			dwDepth;
-  DWORD			dwRefreshRate;
-  char			*pfb;
-  DWORD			dwEngine;
-  DWORD			dwEnginePreferred;
-  DWORD			dwClipUpdatesNBoxes;
+typedef struct {
+    ScreenPtr pScreen;
+
+    /* Did the user specify a height and width? */
+    Bool fUserGaveHeightAndWidth;
+
+    DWORD dwScreen;
+
+    int iMonitor;
+    DWORD dwUserWidth;
+    DWORD dwUserHeight;
+    DWORD dwWidth;
+    DWORD dwHeight;
+    DWORD dwPaddedWidth;
+
+    /* Did the user specify a screen position? */
+    Bool fUserGavePosition;
+    DWORD dwInitialX;
+    DWORD dwInitialY;
+
+    /*
+     * dwStride is the number of whole pixels that occupy a scanline,
+     * including those pixels that are not displayed.  This is basically
+     * a rounding up of the width.
+     */
+    DWORD dwStride;
+
+    /* Offset of the screen in the window when using scrollbars */
+    DWORD dwXOffset;
+    DWORD dwYOffset;
+
+    DWORD dwBPP;
+    DWORD dwDepth;
+    DWORD dwRefreshRate;
+    char *pfb;
+    DWORD dwEngine;
+    DWORD dwEnginePreferred;
+    DWORD dwClipUpdatesNBoxes;
 #ifdef XWIN_EMULATEPSEUDO
-  Bool			fEmulatePseudo;
+    Bool fEmulatePseudo;
 #endif
-  Bool			fFullScreen;
-  Bool			fDecoration;
+    Bool fFullScreen;
+    Bool fDecoration;
 #ifdef XWIN_MULTIWINDOWEXTWM
-  Bool			fMWExtWM;
-  Bool			fInternalWM;
-  Bool			fAnotherWMRunning;
+    Bool fMWExtWM;
+    Bool fInternalWM;
+    Bool fAnotherWMRunning;
 #endif
-  Bool			fRootless;
+    Bool fRootless;
 #ifdef XWIN_MULTIWINDOW
-  Bool			fMultiWindow;
+    Bool fMultiWindow;
 #endif
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
-  Bool			fMultiMonitorOverride;
+    Bool fMultiMonitorOverride;
 #endif
-  Bool                  fMultipleMonitors;
-  Bool			fLessPointer;
-  winResizeMode		iResizeMode;
-  Bool			fNoTrayIcon;
-  int			iE3BTimeout;
-  /* Windows (Alt+F4) and Unix (Ctrl+Alt+Backspace) Killkey */
-  Bool                  fUseWinKillKey;
-  Bool                  fUseUnixKillKey;
-  Bool			fIgnoreInput;
-
-  /* Did the user explicitly set this screen? */
-  Bool			fExplicitScreen;
+    Bool fMultipleMonitors;
+    Bool fLessPointer;
+    winResizeMode iResizeMode;
+    Bool fNoTrayIcon;
+    int iE3BTimeout;
+    /* Windows (Alt+F4) and Unix (Ctrl+Alt+Backspace) Killkey */
+    Bool fUseWinKillKey;
+    Bool fUseUnixKillKey;
+    Bool fIgnoreInput;
+
+    /* Did the user explicitly set this screen? */
+    Bool fExplicitScreen;
 } winScreenInfo, *winScreenInfoPtr;
 
-
 /*
  * Screen privates
  */
 
-typedef struct _winPrivScreenRec
-{
-  winScreenInfoPtr	pScreenInfo;
+typedef struct _winPrivScreenRec {
+    winScreenInfoPtr pScreenInfo;
 
-  Bool			fEnabled;
-  Bool			fClosed;
-  Bool			fActive;
-  Bool			fBadDepth;
+    Bool fEnabled;
+    Bool fClosed;
+    Bool fActive;
+    Bool fBadDepth;
 
-  int			iDeltaZ;
+    int iDeltaZ;
 
-  int			iConnectedClients;
+    int iConnectedClients;
 
-  CloseScreenProcPtr	CloseScreen;
+    CloseScreenProcPtr CloseScreen;
 
-  DWORD			dwRedMask;
-  DWORD			dwGreenMask;
-  DWORD			dwBlueMask;
-  DWORD			dwBitsPerRGB;
+    DWORD dwRedMask;
+    DWORD dwGreenMask;
+    DWORD dwBlueMask;
+    DWORD dwBitsPerRGB;
 
-  DWORD			dwModeKeyStates;
+    DWORD dwModeKeyStates;
 
-  /* Handle to icons that must be freed */
-  HICON			hiconNotifyIcon;
+    /* Handle to icons that must be freed */
+    HICON hiconNotifyIcon;
 
-  /* Palette management */
-  ColormapPtr		pcmapInstalled;
+    /* Palette management */
+    ColormapPtr pcmapInstalled;
 
-  /* Pointer to the root visual so we only have to look it up once */
-  VisualPtr		pRootVisual;
+    /* Pointer to the root visual so we only have to look it up once */
+    VisualPtr pRootVisual;
 
-  /* 3 button emulation variables */
-  int			iE3BCachedPress;
-  Bool			fE3BFakeButton2Sent;
+    /* 3 button emulation variables */
+    int iE3BCachedPress;
+    Bool fE3BFakeButton2Sent;
 
-  /* Privates used by shadow fb GDI server */
-  HBITMAP		hbmpShadow;
-  HDC			hdcScreen;
-  HDC			hdcShadow;
-  HWND			hwndScreen;
-  BITMAPINFOHEADER      *pbmih;
+    /* Privates used by shadow fb GDI server */
+    HBITMAP hbmpShadow;
+    HDC hdcScreen;
+    HDC hdcShadow;
+    HWND hwndScreen;
+    BITMAPINFOHEADER *pbmih;
 
-  /* Privates used by shadow fb and primary fb DirectDraw servers */
-  LPDIRECTDRAW		pdd;
-  LPDIRECTDRAWSURFACE2	pddsPrimary;
-  LPDIRECTDRAW2		pdd2;
+    /* Privates used by shadow fb and primary fb DirectDraw servers */
+    LPDIRECTDRAW pdd;
+    LPDIRECTDRAWSURFACE2 pddsPrimary;
+    LPDIRECTDRAW2 pdd2;
 
-  /* Privates used by shadow fb DirectDraw server */
-  LPDIRECTDRAWSURFACE2	pddsShadow;
-  LPDDSURFACEDESC	pddsdShadow;
+    /* Privates used by shadow fb DirectDraw server */
+    LPDIRECTDRAWSURFACE2 pddsShadow;
+    LPDDSURFACEDESC pddsdShadow;
 
-  /* Privates used by primary fb DirectDraw server */
-  LPDIRECTDRAWSURFACE2	pddsOffscreen;
-  LPDDSURFACEDESC	pddsdOffscreen;
-  LPDDSURFACEDESC	pddsdPrimary;
+    /* Privates used by primary fb DirectDraw server */
+    LPDIRECTDRAWSURFACE2 pddsOffscreen;
+    LPDDSURFACEDESC pddsdOffscreen;
+    LPDDSURFACEDESC pddsdPrimary;
 
-  /* Privates used by shadow fb DirectDraw Nonlocking server */
-  LPDIRECTDRAW4		pdd4;
-  LPDIRECTDRAWSURFACE4	pddsShadow4;
-  LPDIRECTDRAWSURFACE4	pddsPrimary4;
-  BOOL			fRetryCreateSurface;
+    /* Privates used by shadow fb DirectDraw Nonlocking server */
+    LPDIRECTDRAW4 pdd4;
+    LPDIRECTDRAWSURFACE4 pddsShadow4;
+    LPDIRECTDRAWSURFACE4 pddsPrimary4;
+    BOOL fRetryCreateSurface;
 
-  /* Privates used by both shadow fb DirectDraw servers */
-  LPDIRECTDRAWCLIPPER	pddcPrimary;
+    /* Privates used by both shadow fb DirectDraw servers */
+    LPDIRECTDRAWCLIPPER pddcPrimary;
 
 #ifdef XWIN_MULTIWINDOWEXTWM
-  /* Privates used by multi-window external window manager */
-  RootlessFrameID	widTop;
-  Bool			fRestacking;
+    /* Privates used by multi-window external window manager */
+    RootlessFrameID widTop;
+    Bool fRestacking;
 #endif
 
 #ifdef XWIN_MULTIWINDOW
-  /* Privates used by multi-window */
-  pthread_t		ptWMProc;
-  pthread_t		ptXMsgProc;
-  void			*pWMInfo;
+    /* Privates used by multi-window */
+    pthread_t ptWMProc;
+    pthread_t ptXMsgProc;
+    void *pWMInfo;
 #endif
 
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
-  /* Privates used by both multi-window and rootless */
-  Bool			fRootWindowShown;
+    /* Privates used by both multi-window and rootless */
+    Bool fRootWindowShown;
 #endif
 
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
-  /* Privates used for any module running in a seperate thread */
-  pthread_mutex_t	pmServerStarted;
-  Bool			fServerStarted;
+    /* Privates used for any module running in a seperate thread */
+    pthread_mutex_t pmServerStarted;
+    Bool fServerStarted;
 #endif
-  
-  /* Engine specific functions */
-  winAllocateFBProcPtr			pwinAllocateFB;
-  winFreeFBProcPtr			pwinFreeFB;
-  winShadowUpdateProcPtr		pwinShadowUpdate;
-  winInitScreenProcPtr			pwinInitScreen;
-  winCloseScreenProcPtr			pwinCloseScreen;
-  winInitVisualsProcPtr			pwinInitVisuals;
-  winAdjustVideoModeProcPtr		pwinAdjustVideoMode;
-  winCreateBoundingWindowProcPtr	pwinCreateBoundingWindow;
-  winFinishScreenInitProcPtr		pwinFinishScreenInit;
-  winBltExposedRegionsProcPtr		pwinBltExposedRegions;
-  winActivateAppProcPtr			pwinActivateApp;
-  winRedrawScreenProcPtr		pwinRedrawScreen;
-  winRealizeInstalledPaletteProcPtr	pwinRealizeInstalledPalette;
-  winInstallColormapProcPtr		pwinInstallColormap;
-  winStoreColorsProcPtr			pwinStoreColors;
-  winCreateColormapProcPtr		pwinCreateColormap;
-  winDestroyColormapProcPtr		pwinDestroyColormap;
-  winHotKeyAltTabProcPtr		pwinHotKeyAltTab;
-  winCreatePrimarySurfaceProcPtr	pwinCreatePrimarySurface;
-  winReleasePrimarySurfaceProcPtr	pwinReleasePrimarySurface;
-
-  winCreateScreenResourcesProc       pwinCreateScreenResources;
+
+    /* Engine specific functions */
+    winAllocateFBProcPtr pwinAllocateFB;
+    winFreeFBProcPtr pwinFreeFB;
+    winShadowUpdateProcPtr pwinShadowUpdate;
+    winInitScreenProcPtr pwinInitScreen;
+    winCloseScreenProcPtr pwinCloseScreen;
+    winInitVisualsProcPtr pwinInitVisuals;
+    winAdjustVideoModeProcPtr pwinAdjustVideoMode;
+    winCreateBoundingWindowProcPtr pwinCreateBoundingWindow;
+    winFinishScreenInitProcPtr pwinFinishScreenInit;
+    winBltExposedRegionsProcPtr pwinBltExposedRegions;
+    winActivateAppProcPtr pwinActivateApp;
+    winRedrawScreenProcPtr pwinRedrawScreen;
+    winRealizeInstalledPaletteProcPtr pwinRealizeInstalledPalette;
+    winInstallColormapProcPtr pwinInstallColormap;
+    winStoreColorsProcPtr pwinStoreColors;
+    winCreateColormapProcPtr pwinCreateColormap;
+    winDestroyColormapProcPtr pwinDestroyColormap;
+    winHotKeyAltTabProcPtr pwinHotKeyAltTab;
+    winCreatePrimarySurfaceProcPtr pwinCreatePrimarySurface;
+    winReleasePrimarySurfaceProcPtr pwinReleasePrimarySurface;
+
+    winCreateScreenResourcesProc pwinCreateScreenResources;
 
 #ifdef XWIN_MULTIWINDOW
-  /* Window Procedures for MultiWindow mode */
-  winFinishCreateWindowsWindowProcPtr	pwinFinishCreateWindowsWindow;
+    /* Window Procedures for MultiWindow mode */
+    winFinishCreateWindowsWindowProcPtr pwinFinishCreateWindowsWindow;
 #endif
 
-  /* Window Procedures for Rootless mode */
-  CreateWindowProcPtr			CreateWindow;
-  DestroyWindowProcPtr			DestroyWindow;
-  PositionWindowProcPtr			PositionWindow;
-  ChangeWindowAttributesProcPtr		ChangeWindowAttributes;
-  RealizeWindowProcPtr			RealizeWindow;
-  UnrealizeWindowProcPtr		UnrealizeWindow;
-  ValidateTreeProcPtr			ValidateTree;
-  PostValidateTreeProcPtr		PostValidateTree;
-  WindowExposuresProcPtr		WindowExposures;
-  CopyWindowProcPtr			CopyWindow;
-  ClearToBackgroundProcPtr		ClearToBackground;
-  ClipNotifyProcPtr			ClipNotify;
-  RestackWindowProcPtr			RestackWindow;
-  ReparentWindowProcPtr			ReparentWindow;
-  ResizeWindowProcPtr			ResizeWindow;
-  MoveWindowProcPtr			MoveWindow;
-  SetShapeProcPtr			SetShape;
-
-  winCursorRec                          cursor;
+    /* Window Procedures for Rootless mode */
+    CreateWindowProcPtr CreateWindow;
+    DestroyWindowProcPtr DestroyWindow;
+    PositionWindowProcPtr PositionWindow;
+    ChangeWindowAttributesProcPtr ChangeWindowAttributes;
+    RealizeWindowProcPtr RealizeWindow;
+    UnrealizeWindowProcPtr UnrealizeWindow;
+    ValidateTreeProcPtr ValidateTree;
+    PostValidateTreeProcPtr PostValidateTree;
+    WindowExposuresProcPtr WindowExposures;
+    CopyWindowProcPtr CopyWindow;
+    ClearToBackgroundProcPtr ClearToBackground;
+    ClipNotifyProcPtr ClipNotify;
+    RestackWindowProcPtr RestackWindow;
+    ReparentWindowProcPtr ReparentWindow;
+    ResizeWindowProcPtr ResizeWindow;
+    MoveWindowProcPtr MoveWindow;
+    SetShapeProcPtr SetShape;
+
+    winCursorRec cursor;
 
 #ifdef XWIN_NATIVEGDI
-  RealizeFontPtr                        RealizeFont;
-  UnrealizeFontPtr                      UnrealizeFont;
+    RealizeFontPtr RealizeFont;
+    UnrealizeFontPtr UnrealizeFont;
 #endif
 
 } winPrivScreenRec;
 
-
 #ifdef XWIN_MULTIWINDOWEXTWM
 typedef struct {
-  RootlessWindowPtr	pFrame;
-  HWND			hWnd;
-  int			dwWidthBytes;
-  BITMAPINFOHEADER	*pbmihShadow;
-  HBITMAP		hbmpShadow;
-  HDC			hdcShadow;
-  HDC			hdcScreen;
-  BOOL			fResized;
-  BOOL			fRestackingNow;
-  BOOL			fClose;
-  BOOL			fMovingOrSizing;
-  BOOL			fDestroyed;//for debug
-  char			*pfb;
+    RootlessWindowPtr pFrame;
+    HWND hWnd;
+    int dwWidthBytes;
+    BITMAPINFOHEADER *pbmihShadow;
+    HBITMAP hbmpShadow;
+    HDC hdcShadow;
+    HDC hdcScreen;
+    BOOL fResized;
+    BOOL fRestackingNow;
+    BOOL fClose;
+    BOOL fMovingOrSizing;
+    BOOL fDestroyed;            //for debug
+    char *pfb;
 } win32RootlessWindowRec, *win32RootlessWindowPtr;
 #endif
 
-
 typedef struct {
-  pointer		value;
-  XID			id;
+    pointer value;
+    XID id;
 } WindowIDPairRec, *WindowIDPairPtr;
 
-
 /*
  * Extern declares for general global variables
  */
 
 #include "winglobals.h"
 
-extern winScreenInfo *		g_ScreenInfo;
-extern miPointerScreenFuncRec	g_winPointerCursorFuncs;
-extern DWORD			g_dwEvents;
+extern winScreenInfo *g_ScreenInfo;
+extern miPointerScreenFuncRec g_winPointerCursorFuncs;
+extern DWORD g_dwEvents;
+
 #ifdef HAS_DEVWINDOWS
-extern int			g_fdMessageQueue;
+extern int g_fdMessageQueue;
 #endif
-extern DevPrivateKeyRec		g_iScreenPrivateKeyRec;
+extern DevPrivateKeyRec g_iScreenPrivateKeyRec;
+
 #define g_iScreenPrivateKey  	(&g_iScreenPrivateKeyRec)
-extern DevPrivateKeyRec		g_iCmapPrivateKeyRec;
+extern DevPrivateKeyRec g_iCmapPrivateKeyRec;
+
 #define g_iCmapPrivateKey 	(&g_iCmapPrivateKeyRec)
-extern DevPrivateKeyRec		g_iGCPrivateKeyRec;
+extern DevPrivateKeyRec g_iGCPrivateKeyRec;
+
 #define g_iGCPrivateKey 	(&g_iGCPrivateKeyRec)
-extern DevPrivateKeyRec		g_iPixmapPrivateKeyRec;
+extern DevPrivateKeyRec g_iPixmapPrivateKeyRec;
+
 #define g_iPixmapPrivateKey 	(&g_iPixmapPrivateKeyRec)
-extern DevPrivateKeyRec		g_iWindowPrivateKeyRec;
+extern DevPrivateKeyRec g_iWindowPrivateKeyRec;
+
 #define g_iWindowPrivateKey 	(&g_iWindowPrivateKeyRec)
 
-extern unsigned long		g_ulServerGeneration;
-extern DWORD			g_dwEnginesSupported;
-extern HINSTANCE		g_hInstance;
-extern int                      g_copyROP[];
-extern int                      g_patternROP[];
-extern const char *		g_pszQueryHost;
-extern DeviceIntPtr             g_pwinPointer;
-extern DeviceIntPtr             g_pwinKeyboard;
+extern unsigned long g_ulServerGeneration;
+extern DWORD g_dwEnginesSupported;
+extern HINSTANCE g_hInstance;
+extern int g_copyROP[];
+extern int g_patternROP[];
+extern const char *g_pszQueryHost;
+extern DeviceIntPtr g_pwinPointer;
+extern DeviceIntPtr g_pwinKeyboard;
 
 /*
  * Extern declares for dynamically loaded library function pointers
  */
 
-extern FARPROC			g_fpDirectDrawCreate;
-extern FARPROC			g_fpDirectDrawCreateClipper;
-
+extern FARPROC g_fpDirectDrawCreate;
+extern FARPROC g_fpDirectDrawCreateClipper;
 
 /*
  * Screen privates macros
@@ -690,7 +678,6 @@ extern FARPROC			g_fpDirectDrawCreateClipper;
 #define winScreenPriv(pScreen) \
 	winPrivScreenPtr pScreenPriv = winGetScreenPriv(pScreen)
 
-
 /*
  * Colormap privates macros
  */
@@ -704,7 +691,6 @@ extern FARPROC			g_fpDirectDrawCreateClipper;
 #define winCmapPriv(pCmap) \
 	winPrivCmapPtr pCmapPriv = winGetCmapPriv(pCmap)
 
-
 /*
  * GC privates macros
  */
@@ -718,7 +704,6 @@ extern FARPROC			g_fpDirectDrawCreateClipper;
 #define winGCPriv(pGC) \
 	winPrivGCPtr pGCPriv = winGetGCPriv(pGC)
 
-
 /*
  * Pixmap privates macros
  */
@@ -732,7 +717,6 @@ extern FARPROC			g_fpDirectDrawCreateClipper;
 #define winPixmapPriv(pPixmap) \
 	winPrivPixmapPtr pPixmapPriv = winGetPixmapPriv(pPixmap)
 
-
 /*
  * Window privates macros
  */
@@ -758,7 +742,7 @@ extern FARPROC			g_fpDirectDrawCreateClipper;
     real->mem = priv->mem; \
 }
 
-#define WIN_WRAP(mem, func) _WIN_WRAP(pScreenPriv, pScreen, mem, func) 
+#define WIN_WRAP(mem, func) _WIN_WRAP(pScreenPriv, pScreen, mem, func)
 
 #define WIN_UNWRAP(mem) _WIN_UNWRAP(pScreenPriv, pScreen, mem)
 
@@ -766,20 +750,18 @@ extern FARPROC			g_fpDirectDrawCreateClipper;
  * BEGIN DDX and DIX Function Prototypes
  */
 
-
 /*
  * winallpriv.c
  */
 
 Bool
-winAllocatePrivates (ScreenPtr pScreen);
+ winAllocatePrivates(ScreenPtr pScreen);
 
 Bool
-winInitCmapPrivates (ColormapPtr pCmap, int index);
+ winInitCmapPrivates(ColormapPtr pCmap, int index);
 
 Bool
-winAllocateCmapPrivates (ColormapPtr pCmap);
-
+ winAllocateCmapPrivates(ColormapPtr pCmap);
 
 /*
  * winauth.c
@@ -787,21 +769,18 @@ winAllocateCmapPrivates (ColormapPtr pCmap);
 
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
 Bool
-winGenerateAuthorization (void);
+ winGenerateAuthorization(void);
 void winSetAuthorization(void);
 #endif
 
-
 /*
  * winblock.c
  */
 
 void
-winBlockHandler (int nScreen,
-		 pointer pBlockData,
-		 pointer pTimeout,
-		 pointer pReadMask);
 
+winBlockHandler(int nScreen,
+                pointer pBlockData, pointer pTimeout, pointer pReadMask);
 
 #ifdef XWIN_NATIVEGDI
 /*
@@ -809,75 +788,69 @@ winBlockHandler (int nScreen,
  */
 
 RegionPtr
-winPixmapToRegionNativeGDI (PixmapPtr pPix);
+ winPixmapToRegionNativeGDI(PixmapPtr pPix);
 #endif
 
-
 #ifdef XWIN_CLIPBOARD
 /*
  * winclipboardinit.c
  */
 
 Bool
-winInitClipboard (void);
+ winInitClipboard(void);
 
 void
-winFixClipboardChain (void);
+ winFixClipboardChain(void);
 #endif
 
-
 /*
  * wincmap.c
  */
 
 void
-winSetColormapFunctions (ScreenPtr pScreen);
+ winSetColormapFunctions(ScreenPtr pScreen);
 
 Bool
-winCreateDefColormap (ScreenPtr pScreen);
-
+ winCreateDefColormap(ScreenPtr pScreen);
 
 /*
  * wincreatewnd.c
  */
 
 Bool
-winCreateBoundingWindowFullScreen (ScreenPtr pScreen);
+ winCreateBoundingWindowFullScreen(ScreenPtr pScreen);
 
 Bool
-winCreateBoundingWindowWindowed (ScreenPtr pScreen);
-
+ winCreateBoundingWindowWindowed(ScreenPtr pScreen);
 
 /*
  * windialogs.c
  */
 
 void
-winDisplayExitDialog (winPrivScreenPtr pScreenPriv);
+ winDisplayExitDialog(winPrivScreenPtr pScreenPriv);
 
 void
-winDisplayDepthChangeDialog (winPrivScreenPtr pScreenPriv);
+ winDisplayDepthChangeDialog(winPrivScreenPtr pScreenPriv);
 
 void
-winDisplayAboutDialog (winPrivScreenPtr pScreenPriv);
-
+ winDisplayAboutDialog(winPrivScreenPtr pScreenPriv);
 
 /*
  * winengine.c
  */
 
 void
-winDetectSupportedEngines (void);
+ winDetectSupportedEngines(void);
 
 Bool
-winSetEngine (ScreenPtr pScreen);
+ winSetEngine(ScreenPtr pScreen);
 
 Bool
-winGetDDProcAddresses (void);
+ winGetDDProcAddresses(void);
 
 void
-winReleaseDDProcAddresses(void);
-
+ winReleaseDDProcAddresses(void);
 
 /*
  * winerror.c
@@ -885,12 +858,11 @@ winReleaseDDProcAddresses(void);
 
 #ifdef DDXOSVERRORF
 void
-OSVenderVErrorF (const char *pszFormat, va_list va_args);
+ OSVenderVErrorF(const char *pszFormat, va_list va_args);
 #endif
 
 void
-winMessageBoxF (const char *pszError, UINT uType, ...);
-
+ winMessageBoxF(const char *pszError, UINT uType, ...);
 
 #ifdef XWIN_NATIVEGDI
 /*
@@ -898,14 +870,12 @@ winMessageBoxF (const char *pszError, UINT uType, ...);
  */
 
 void
-winFillSpansNativeGDI (DrawablePtr	pDrawable,
-		       GCPtr		pGC,
-		       int		nSpans,
-		       DDXPointPtr	pPoints,
-		       int		*pWidths,
-		       int		fSorted);
-#endif
 
+winFillSpansNativeGDI(DrawablePtr pDrawable,
+                      GCPtr pGC,
+                      int nSpans,
+                      DDXPointPtr pPoints, int *pWidths, int fSorted);
+#endif
 
 #ifdef XWIN_NATIVEGDI
 /*
@@ -913,87 +883,79 @@ winFillSpansNativeGDI (DrawablePtr	pDrawable,
  */
 
 Bool
-winRealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont);
+ winRealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont);
 
 Bool
-winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont);
+ winUnrealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont);
 #endif
 
-
 #ifdef XWIN_NATIVEGDI
 /*
  * wingc.c
  */
 
 Bool
-winCreateGCNativeGDI (GCPtr pGC);
+ winCreateGCNativeGDI(GCPtr pGC);
 #endif
 
-
 #ifdef XWIN_NATIVEGDI
 /*
  * wingetsp.c
  */
 
 void
-winGetSpansNativeGDI (DrawablePtr	pDrawable, 
-		      int		wMax, 
-		      DDXPointPtr	pPoints, 
-		      int		*pWidths, 
-		      int		nSpans, 
-		      char		*pDst);
-#endif
 
+winGetSpansNativeGDI(DrawablePtr pDrawable,
+                     int wMax,
+                     DDXPointPtr pPoints, int *pWidths, int nSpans, char *pDst);
+#endif
 
 /*
  * winglobals.c
  */
 
 void
-winInitializeGlobals (void);
-
+ winInitializeGlobals(void);
 
 /*
  * winkeybd.c
  */
 
 void
-winTranslateKey (WPARAM wParam, LPARAM lParam, int *piScanCode);
+ winTranslateKey(WPARAM wParam, LPARAM lParam, int *piScanCode);
 
 int
-winKeybdProc (DeviceIntPtr pDeviceInt, int iState);
+ winKeybdProc(DeviceIntPtr pDeviceInt, int iState);
 
 void
-winInitializeModeKeyStates (void);
+ winInitializeModeKeyStates(void);
 
 void
-winRestoreModeKeyStates (void);
+ winRestoreModeKeyStates(void);
 
 Bool
-winIsFakeCtrl_L (UINT message, WPARAM wParam, LPARAM lParam);
+ winIsFakeCtrl_L(UINT message, WPARAM wParam, LPARAM lParam);
 
 void
-winKeybdReleaseKeys (void);
+ winKeybdReleaseKeys(void);
 
 void
-winSendKeyEvent (DWORD dwKey, Bool fDown);
+ winSendKeyEvent(DWORD dwKey, Bool fDown);
 
-BOOL
-winCheckKeyPressed(WPARAM wParam, LPARAM lParam);
+BOOL winCheckKeyPressed(WPARAM wParam, LPARAM lParam);
 
 void
-winFixShiftKeys (int iScanCode);
+ winFixShiftKeys(int iScanCode);
 
 /*
  * winkeyhook.c
  */
 
 Bool
-winInstallKeyboardHookLL (void);
+ winInstallKeyboardHookLL(void);
 
 void
-winRemoveKeyboardHookLL (void);
-
+ winRemoveKeyboardHookLL(void);
 
 /*
  * winmisc.c
@@ -1001,42 +963,41 @@ winRemoveKeyboardHookLL (void);
 
 #ifdef XWIN_NATIVEGDI
 void
-winQueryBestSizeNativeGDI (int class, unsigned short *pWidth,
-			   unsigned short *pHeight, ScreenPtr pScreen);
+
+winQueryBestSizeNativeGDI(int class, unsigned short *pWidth,
+                          unsigned short *pHeight, ScreenPtr pScreen);
 #endif
 
 CARD8
-winCountBits (DWORD dw);
+ winCountBits(DWORD dw);
 
 Bool
-winUpdateFBPointer (ScreenPtr pScreen, void *pbits);
+ winUpdateFBPointer(ScreenPtr pScreen, void *pbits);
 
 #ifdef XWIN_NATIVEGDI
-BOOL
-winPaintBackground (HWND hwnd, COLORREF colorref);
+BOOL winPaintBackground(HWND hwnd, COLORREF colorref);
 #endif
 
-
 /*
  * winmouse.c
  */
 
 int
-winMouseProc (DeviceIntPtr pDeviceInt, int iState);
+ winMouseProc(DeviceIntPtr pDeviceInt, int iState);
 
 int
-winMouseWheel (ScreenPtr pScreen, int iDeltaZ);
+ winMouseWheel(ScreenPtr pScreen, int iDeltaZ);
 
 void
-winMouseButtonsSendEvent (int iEventType, int iButton);
+ winMouseButtonsSendEvent(int iEventType, int iButton);
 
 int
-winMouseButtonsHandle (ScreenPtr pScreen,
-		       int iEventType, int iButton,
-		       WPARAM wParam);
+
+winMouseButtonsHandle(ScreenPtr pScreen,
+                      int iEventType, int iButton, WPARAM wParam);
 
 void
-winEnqueueMotion(int x, int y);
+ winEnqueueMotion(int x, int y);
 
 #ifdef XWIN_NATIVEGDI
 /*
@@ -1044,43 +1005,42 @@ winEnqueueMotion(int x, int y);
  */
 
 HBITMAP
-winCreateDIBNativeGDI (int iWidth, int iHeight, int iDepth,
-		       BYTE **ppbBits, BITMAPINFO **ppbmi);
+winCreateDIBNativeGDI(int iWidth, int iHeight, int iDepth,
+                      BYTE ** ppbBits, BITMAPINFO ** ppbmi);
 
 Bool
-winSetEngineFunctionsNativeGDI (ScreenPtr pScreen);
+ winSetEngineFunctionsNativeGDI(ScreenPtr pScreen);
 #endif
 
-
 #ifdef XWIN_PRIMARYFB
 /*
  * winpfbddd.c
  */
 
 Bool
-winSetEngineFunctionsPrimaryDD (ScreenPtr pScreen);
+ winSetEngineFunctionsPrimaryDD(ScreenPtr pScreen);
 #endif
 
-
 #ifdef XWIN_NATIVEGDI
 /*
  * winpixmap.c
  */
 
 PixmapPtr
-winCreatePixmapNativeGDI (ScreenPtr pScreen, int width, int height, int depth,
-			  unsigned usage_hint);
+
+winCreatePixmapNativeGDI(ScreenPtr pScreen, int width, int height, int depth,
+                         unsigned usage_hint);
 
 Bool
-winDestroyPixmapNativeGDI (PixmapPtr pPixmap);
+ winDestroyPixmapNativeGDI(PixmapPtr pPixmap);
 
 Bool
-winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,
-				int iWidth, int iHeight,
-				int iDepth,
-				int iBitsPerPixel,
-				int devKind,
-				pointer pPixData);
+
+winModifyPixmapHeaderNativeGDI(PixmapPtr pPixmap,
+                               int iWidth, int iHeight,
+                               int iDepth,
+                               int iBitsPerPixel,
+                               int devKind, pointer pPixData);
 #endif
 
 #ifdef XWIN_NATIVEGDI
@@ -1089,13 +1049,10 @@ winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,
  */
 
 void
-winPolyLineNativeGDI (DrawablePtr	pDrawable,
-		      GCPtr		pGC,
-		      int		mode,
-		      int		npt,
-		      DDXPointPtr	ppt);
-#endif
 
+winPolyLineNativeGDI(DrawablePtr pDrawable,
+                     GCPtr pGC, int mode, int npt, DDXPointPtr ppt);
+#endif
 
 #ifdef XWIN_NATIVEGDI
 /*
@@ -1103,32 +1060,27 @@ winPolyLineNativeGDI (DrawablePtr	pDrawable,
  */
 
 void
-winPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
-	       int dx, int dy, int xOrg, int yOrg);
-#endif
 
+winPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
+              int dx, int dy, int xOrg, int yOrg);
+#endif
 
 /*
  * winscrinit.c
  */
 
 Bool
-winScreenInit (int index,
-	       ScreenPtr pScreen,
-	       int argc, char **argv);
+ winScreenInit(int index, ScreenPtr pScreen, int argc, char **argv);
 
 Bool
-winFinishScreenInitFB (int index,
-		       ScreenPtr pScreen,
-		       int argc, char **argv);
+ winFinishScreenInitFB(int index, ScreenPtr pScreen, int argc, char **argv);
 
 #if defined(XWIN_NATIVEGDI)
 Bool
-winFinishScreenInitNativeGDI (int index,
-			      ScreenPtr pScreen,
-			      int argc, char **argv);
-#endif
 
+winFinishScreenInitNativeGDI(int index,
+                             ScreenPtr pScreen, int argc, char **argv);
+#endif
 
 #ifdef XWIN_NATIVEGDI
 /*
@@ -1136,50 +1088,43 @@ winFinishScreenInitNativeGDI (int index,
  */
 
 void
-winSetSpansNativeGDI (DrawablePtr	pDrawable,
-		      GCPtr		pGC,
-		      char		*pSrc,
-		      DDXPointPtr	pPoints,
-		      int		*pWidth,
-		      int		nSpans,
-		      int		fSorted);
-#endif
 
+winSetSpansNativeGDI(DrawablePtr pDrawable,
+                     GCPtr pGC,
+                     char *pSrc,
+                     DDXPointPtr pPoints, int *pWidth, int nSpans, int fSorted);
+#endif
 
 /*
  * winshaddd.c
  */
 
 Bool
-winSetEngineFunctionsShadowDD (ScreenPtr pScreen);
-
+ winSetEngineFunctionsShadowDD(ScreenPtr pScreen);
 
 /*
  * winshadddnl.c
  */
 
 Bool
-winSetEngineFunctionsShadowDDNL (ScreenPtr pScreen);
-
+ winSetEngineFunctionsShadowDDNL(ScreenPtr pScreen);
 
 /*
  * winshadgdi.c
  */
 
 Bool
-winSetEngineFunctionsShadowGDI (ScreenPtr pScreen);
-
+ winSetEngineFunctionsShadowGDI(ScreenPtr pScreen);
 
 /*
  * winwakeup.c
  */
 
 void
-winWakeupHandler (int nScreen,
-		  pointer pWakeupData,
-		  unsigned long ulResult,
-		  pointer pReadmask);
 
+winWakeupHandler(int nScreen,
+                 pointer pWakeupData,
+                 unsigned long ulResult, pointer pReadmask);
 
 /*
  * winwindow.c
@@ -1187,60 +1132,57 @@ winWakeupHandler (int nScreen,
 
 #ifdef XWIN_NATIVEGDI
 Bool
-winCreateWindowNativeGDI (WindowPtr pWin);
+ winCreateWindowNativeGDI(WindowPtr pWin);
 
 Bool
-winDestroyWindowNativeGDI (WindowPtr pWin);
+ winDestroyWindowNativeGDI(WindowPtr pWin);
 
 Bool
-winPositionWindowNativeGDI (WindowPtr pWin, int x, int y);
+ winPositionWindowNativeGDI(WindowPtr pWin, int x, int y);
 
-void 
-winCopyWindowNativeGDI (WindowPtr pWin,
-			DDXPointRec ptOldOrg,
-			RegionPtr prgnSrc);
+void
+
+winCopyWindowNativeGDI(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
 
 Bool
-winChangeWindowAttributesNativeGDI (WindowPtr pWin, unsigned long mask);
+ winChangeWindowAttributesNativeGDI(WindowPtr pWin, unsigned long mask);
 
 Bool
-winUnmapWindowNativeGDI (WindowPtr pWindow);
+ winUnmapWindowNativeGDI(WindowPtr pWindow);
 
 Bool
-winMapWindowNativeGDI (WindowPtr pWindow);
+ winMapWindowNativeGDI(WindowPtr pWindow);
 #endif
 
 Bool
-winCreateWindowRootless (WindowPtr pWindow);
+ winCreateWindowRootless(WindowPtr pWindow);
 
 Bool
-winDestroyWindowRootless (WindowPtr pWindow);
+ winDestroyWindowRootless(WindowPtr pWindow);
 
 Bool
-winPositionWindowRootless (WindowPtr pWindow, int x, int y);
+ winPositionWindowRootless(WindowPtr pWindow, int x, int y);
 
 Bool
-winChangeWindowAttributesRootless (WindowPtr pWindow, unsigned long mask);
+ winChangeWindowAttributesRootless(WindowPtr pWindow, unsigned long mask);
 
 Bool
-winUnmapWindowRootless (WindowPtr pWindow);
+ winUnmapWindowRootless(WindowPtr pWindow);
 
 Bool
-winMapWindowRootless (WindowPtr pWindow);
+ winMapWindowRootless(WindowPtr pWindow);
 
 void
-winSetShapeRootless (WindowPtr pWindow, int kind);
-
+ winSetShapeRootless(WindowPtr pWindow, int kind);
 
 /*
  * winmultiwindowicons.c - Used by both multi-window and Win32Rootless
  */
 
-HICON
-winXIconToHICON (WindowPtr pWin, int iconSize);
+HICON winXIconToHICON(WindowPtr pWin, int iconSize);
 
 void
-winSelectIcons(WindowPtr pWin, HICON *pIcon, HICON *pSmallIcon);
+ winSelectIcons(WindowPtr pWin, HICON * pIcon, HICON * pSmallIcon);
 
 #ifdef XWIN_MULTIWINDOW
 /*
@@ -1248,102 +1190,98 @@ winSelectIcons(WindowPtr pWin, HICON *pIcon, HICON *pSmallIcon);
  */
 
 void
-winReshapeMultiWindow (WindowPtr pWin);
+ winReshapeMultiWindow(WindowPtr pWin);
 
 void
-winSetShapeMultiWindow (WindowPtr pWindow, int kind);
+ winSetShapeMultiWindow(WindowPtr pWindow, int kind);
 
 void
-winUpdateRgnMultiWindow (WindowPtr pWindow);
+ winUpdateRgnMultiWindow(WindowPtr pWindow);
 #endif
 
-
 #ifdef XWIN_MULTIWINDOW
 /*
  * winmultiwindowwindow.c
  */
 
 Bool
-winCreateWindowMultiWindow (WindowPtr pWindow);
+ winCreateWindowMultiWindow(WindowPtr pWindow);
 
 Bool
-winDestroyWindowMultiWindow (WindowPtr pWindow);
+ winDestroyWindowMultiWindow(WindowPtr pWindow);
 
 Bool
-winPositionWindowMultiWindow (WindowPtr pWindow, int x, int y);
+ winPositionWindowMultiWindow(WindowPtr pWindow, int x, int y);
 
 Bool
-winChangeWindowAttributesMultiWindow (WindowPtr pWindow, unsigned long mask);
+ winChangeWindowAttributesMultiWindow(WindowPtr pWindow, unsigned long mask);
 
 Bool
-winUnmapWindowMultiWindow (WindowPtr pWindow);
+ winUnmapWindowMultiWindow(WindowPtr pWindow);
 
 Bool
-winMapWindowMultiWindow (WindowPtr pWindow);
+ winMapWindowMultiWindow(WindowPtr pWindow);
 
 void
-winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent);
+ winReparentWindowMultiWindow(WindowPtr pWin, WindowPtr pPriorParent);
 
 void
-winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib);
+ winRestackWindowMultiWindow(WindowPtr pWin, WindowPtr pOldNextSib);
 
 void
-winReorderWindowsMultiWindow (void);
+ winReorderWindowsMultiWindow(void);
 
 void
-winResizeWindowMultiWindow (WindowPtr pWin, int x, int y, unsigned int w,
-			    unsigned int h, WindowPtr pSib);
+
+winResizeWindowMultiWindow(WindowPtr pWin, int x, int y, unsigned int w,
+                           unsigned int h, WindowPtr pSib);
 void
-winMoveWindowMultiWindow (WindowPtr pWin, int x, int y,
-			  WindowPtr pSib, VTKind kind);
+
+winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
+                         WindowPtr pSib, VTKind kind);
 
 void
-winCopyWindowMultiWindow (WindowPtr pWin, DDXPointRec oldpt,
-			  RegionPtr oldRegion);
+
+winCopyWindowMultiWindow(WindowPtr pWin, DDXPointRec oldpt,
+                         RegionPtr oldRegion);
 
 XID
-winGetWindowID (WindowPtr pWin);
+ winGetWindowID(WindowPtr pWin);
 
 int
-winAdjustXWindow (WindowPtr pWin, HWND hwnd);
+ winAdjustXWindow(WindowPtr pWin, HWND hwnd);
 #endif
 
-
 #ifdef XWIN_MULTIWINDOW
 /*
  * winmultiwindowwndproc.c
  */
 
 LRESULT CALLBACK
-winTopLevelWindowProc (HWND hwnd, UINT message, 
-		       WPARAM wParam, LPARAM lParam);
+winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 #endif
 
-
 /*
  * wintrayicon.c
  */
 
 void
-winInitNotifyIcon (winPrivScreenPtr pScreenPriv);
+ winInitNotifyIcon(winPrivScreenPtr pScreenPriv);
 
 void
-winDeleteNotifyIcon (winPrivScreenPtr pScreenPriv);
+ winDeleteNotifyIcon(winPrivScreenPtr pScreenPriv);
 
 LRESULT
-winHandleIconMessage (HWND hwnd, UINT message,
-		      WPARAM wParam, LPARAM lParam,
-		      winPrivScreenPtr pScreenPriv);
-
+winHandleIconMessage(HWND hwnd, UINT message,
+                     WPARAM wParam, LPARAM lParam,
+                     winPrivScreenPtr pScreenPriv);
 
 /*
  * winwndproc.c
  */
 
 LRESULT CALLBACK
-winWindowProc (HWND hWnd, UINT message, 
-	       WPARAM wParam, LPARAM lParam);
-
+winWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 #ifdef XWIN_MULTIWINDOWEXTWM
 /*
@@ -1351,55 +1289,61 @@ winWindowProc (HWND hWnd, UINT message,
  */
 
 Bool
-winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,
-			     int newX, int newY, RegionPtr pShape);
+
+winMWExtWMCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
+                      int newX, int newY, RegionPtr pShape);
 
 void
-winMWExtWMDestroyFrame (RootlessFrameID wid);
+ winMWExtWMDestroyFrame(RootlessFrameID wid);
 
 void
-winMWExtWMMoveFrame (RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY);
+
+winMWExtWMMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY);
 
 void
-winMWExtWMResizeFrame (RootlessFrameID wid, ScreenPtr pScreen,
-			     int newX, int newY, unsigned int newW, unsigned int newH,
-			     unsigned int gravity);
+
+winMWExtWMResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,
+                      int newX, int newY, unsigned int newW, unsigned int newH,
+                      unsigned int gravity);
 
 void
-winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid);
+ winMWExtWMRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid);
 
 void
-winMWExtWMReshapeFrame (RootlessFrameID wid, RegionPtr pShape);
+ winMWExtWMReshapeFrame(RootlessFrameID wid, RegionPtr pShape);
 
 void
-winMWExtWMUnmapFrame (RootlessFrameID wid);
+ winMWExtWMUnmapFrame(RootlessFrameID wid);
 
 void
-winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow);
+
+winMWExtWMStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow);
 
 void
-winMWExtWMStopDrawing (RootlessFrameID wid, Bool flush);
+ winMWExtWMStopDrawing(RootlessFrameID wid, Bool flush);
 
 void
-winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage);
+ winMWExtWMUpdateRegion(RootlessFrameID wid, RegionPtr pDamage);
 
 void
-winMWExtWMDamageRects (RootlessFrameID wid, int count, const BoxRec *rects,
-			     int shift_x, int shift_y);
+
+winMWExtWMDamageRects(RootlessFrameID wid, int count, const BoxRec * rects,
+                      int shift_x, int shift_y);
 
 void
-winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin);
+ winMWExtWMRootlessSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin);
 
 void
-winMWExtWMCopyBytes (unsigned int width, unsigned int height,
-			   const void *src, unsigned int srcRowBytes,
-			   void *dst, unsigned int dstRowBytes);
+
+winMWExtWMCopyBytes(unsigned int width, unsigned int height,
+                    const void *src, unsigned int srcRowBytes,
+                    void *dst, unsigned int dstRowBytes);
 
 void
-winMWExtWMCopyWindow (RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,
-			    int dx, int dy);
-#endif
 
+winMWExtWMCopyWindow(RootlessFrameID wid, int dstNrects,
+                     const BoxRec * dstRects, int dx, int dy);
+#endif
 
 #ifdef XWIN_MULTIWINDOWEXTWM
 /*
@@ -1407,85 +1351,81 @@ winMWExtWMCopyWindow (RootlessFrameID wid, int dstNrects, const BoxRec *dstRects
  */
 
 void
-winMWExtWMReorderWindows (ScreenPtr pScreen);
+ winMWExtWMReorderWindows(ScreenPtr pScreen);
 
 void
-winMWExtWMMoveXWindow (WindowPtr pWin, int x, int y);
+ winMWExtWMMoveXWindow(WindowPtr pWin, int x, int y);
 
 void
-winMWExtWMResizeXWindow (WindowPtr pWin, int w, int h);
+ winMWExtWMResizeXWindow(WindowPtr pWin, int w, int h);
 
 void
-winMWExtWMMoveResizeXWindow (WindowPtr pWin, int x, int y, int w, int h);
+ winMWExtWMMoveResizeXWindow(WindowPtr pWin, int x, int y, int w, int h);
 
 void
-winMWExtWMUpdateIcon (Window id);
+ winMWExtWMUpdateIcon(Window id);
 
 void
-winMWExtWMUpdateWindowDecoration (win32RootlessWindowPtr pRLWinPriv,
-				  winScreenInfoPtr pScreenInfo);
 
-wBOOL CALLBACK
-winMWExtWMDecorateWindow (HWND hwnd, LPARAM lParam);
+winMWExtWMUpdateWindowDecoration(win32RootlessWindowPtr pRLWinPriv,
+                                 winScreenInfoPtr pScreenInfo);
+
+wBOOL CALLBACK winMWExtWMDecorateWindow(HWND hwnd, LPARAM lParam);
 
 Bool
-winIsInternalWMRunning (winScreenInfoPtr pScreenInfo);
+ winIsInternalWMRunning(winScreenInfoPtr pScreenInfo);
 
 void
-winMWExtWMRestackWindows (ScreenPtr pScreen);
+ winMWExtWMRestackWindows(ScreenPtr pScreen);
 #endif
 
-
 #ifdef XWIN_MULTIWINDOWEXTWM
 /*
  * winwin32rootlesswndproc.c
  */
 
 LRESULT CALLBACK
-winMWExtWMWindowProc (HWND hwnd, UINT message, 
-			    WPARAM wParam, LPARAM lParam);
+winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 #endif
 
-
 /*
  * winwindowswm.c
  */
 
 void
-winWindowsWMSendEvent (int type, unsigned int mask, int which, int arg,
-		       Window window, int x, int y, int w, int h);
+
+winWindowsWMSendEvent(int type, unsigned int mask, int which, int arg,
+                      Window window, int x, int y, int w, int h);
 
 void
-winWindowsWMExtensionInit (void);
+ winWindowsWMExtensionInit(void);
 
 /*
  * wincursor.c
  */
 
 Bool
-winInitCursor (ScreenPtr pScreen);
+ winInitCursor(ScreenPtr pScreen);
 
 /*
  * winprocarg.c
  */
 void
-winInitializeScreens(int maxscreens);
+ winInitializeScreens(int maxscreens);
 
 /*
  * winrandr.c
  */
 Bool
-winRandRInit (ScreenPtr pScreen);
+ winRandRInit(ScreenPtr pScreen);
 void
-winDoRandRScreenSetSize (ScreenPtr  pScreen,
-                         CARD16	    width,
-                         CARD16	    height,
-                         CARD32	    mmWidth,
-                         CARD32	    mmHeight);
+
+winDoRandRScreenSetSize(ScreenPtr pScreen,
+                        CARD16 width,
+                        CARD16 height, CARD32 mmWidth, CARD32 mmHeight);
 
 /*
  * END DDX and DIX Function Prototypes
  */
 
-#endif /* _WIN_H_ */
-
+#endif                          /* _WIN_H_ */
diff --git a/xorg-server/hw/xwin/winallpriv.c b/xorg-server/hw/xwin/winallpriv.c
index ce74a021e..ea3126fa0 100644
--- a/xorg-server/hw/xwin/winallpriv.c
+++ b/xorg-server/hw/xwin/winallpriv.c
@@ -1,186 +1,176 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	Keith Packard, MIT X Consortium

- *		Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-/* See Porting Layer Definition - p. 58 */

-/*

- * Allocate indexes for the privates that we use.

- * Allocate memory directly for the screen privates.

- * Reserve space in GCs and Pixmaps for our privates.

- * Colormap privates are handled in winAllocateCmapPrivates ()

- */

-

-Bool

-winAllocatePrivates (ScreenPtr pScreen)

-{

-  winPrivScreenPtr	pScreenPriv;

-

-#if CYGDEBUG

-  winDebug ("winAllocateScreenPrivates - g_ulServerGeneration: %d "

-	  "serverGeneration: %d\n",

-	  g_ulServerGeneration, serverGeneration);

-#endif

-

-  /* We need a new slot for our privates if the screen gen has changed */

-  if (g_ulServerGeneration != serverGeneration)

-    {

-      g_ulServerGeneration = serverGeneration;

-    }

-

-  /* Allocate memory for the screen private structure */

-  pScreenPriv = (winPrivScreenPtr) malloc (sizeof (winPrivScreenRec));

-  if (!pScreenPriv)

-    {

-      ErrorF ("winAllocateScreenPrivates - malloc () failed\n");

-      return FALSE;

-    }

-

-  /* Initialize the memory of the private structure */

-  ZeroMemory (pScreenPriv, sizeof (winPrivScreenRec));

-

-  /* Intialize private structure members */

-  pScreenPriv->fActive = TRUE;

-

-  /* Register our screen private */

-  if (!dixRegisterPrivateKey(g_iScreenPrivateKey, PRIVATE_SCREEN, 0))

-    {

-      ErrorF ("winAllocatePrivates - AllocateScreenPrivate () failed\n");

-      return FALSE;

-    }

-

-  /* Save the screen private pointer */

-  winSetScreenPriv (pScreen, pScreenPriv);

-

-  /* Reserve GC memory for our privates */

-  if (!dixRegisterPrivateKey(g_iGCPrivateKey, PRIVATE_GC, sizeof (winPrivGCRec)))

-    {

-      ErrorF ("winAllocatePrivates - AllocateGCPrivate () failed\n");

-      return FALSE;

-    }

-

-  /* Reserve Pixmap memory for our privates */

-  if (!dixRegisterPrivateKey(g_iPixmapPrivateKey, PRIVATE_PIXMAP, sizeof (winPrivPixmapRec)))

-    {

-      ErrorF ("winAllocatePrivates - AllocatePixmapPrivates () failed\n");

-      return FALSE;

-    }

-

-  /* Reserve Window memory for our privates */

-  if (!dixRegisterPrivateKey(g_iWindowPrivateKey, PRIVATE_WINDOW, sizeof (winPrivWinRec)))

-    {

-      ErrorF ("winAllocatePrivates () - AllocateWindowPrivates () failed\n");

-       return FALSE;

-     }

-

-  return TRUE;

-}

-

-

-/*

- * Colormap privates may be allocated after the default colormap has

- * already been created for some screens.  This initialization procedure

- * is called for each default colormap that is found.

- */

-

-Bool

-winInitCmapPrivates (ColormapPtr pcmap, int index)

-{

-#if CYGDEBUG

-  winDebug ("winInitCmapPrivates\n");

-#endif

-  

-  /*

-   * I see no way that this function can do anything useful

-   * with only a ColormapPtr.  We don't have the index for

-   * our dev privates yet, so we can't really initialize

-   * anything.  Perhaps I am misunderstanding the purpose

-   * of this function.

-   */

-  /*  That's definitely true.

-   *  I therefore changed the API and added the index as argument.

-   */

-  return TRUE;

-}

-

-

-/*

- * Allocate memory for our colormap privates

- */

-

-Bool

-winAllocateCmapPrivates (ColormapPtr pCmap)

-{

-  winPrivCmapPtr		pCmapPriv;

-  static unsigned long		s_ulPrivateGeneration = 0;

-

-#if CYGDEBUG

-  winDebug ("winAllocateCmapPrivates\n");

-#endif

-

-  /* Get a new privates index when the server generation changes */

-  if (s_ulPrivateGeneration != serverGeneration)

-    {

-      /* Save the new server generation */

-      s_ulPrivateGeneration = serverGeneration;

-    }

-

-  /* Allocate memory for our private structure */

-  pCmapPriv = (winPrivCmapPtr) malloc (sizeof (winPrivCmapRec));

-  if (!pCmapPriv)

-    {

-      ErrorF ("winAllocateCmapPrivates - malloc () failed\n");

-      return FALSE;

-    }

-

-  /* Initialize the memory of the private structure */

-  ZeroMemory (pCmapPriv, sizeof (winPrivCmapRec));

-

-  /* Register our colourmap private */

-  if (!dixRegisterPrivateKey(g_iCmapPrivateKey, PRIVATE_COLORMAP, 0))

-    {

-      ErrorF ("winAllocateCmapPrivates - AllocateCmapPrivate () failed\n");

-      return FALSE;

-    }

-

-  /* Save the cmap private pointer */

-  winSetCmapPriv (pCmap, pCmapPriv);

-

-#if CYGDEBUG

-  winDebug ("winAllocateCmapPrivates - Returning\n");

-#endif

-

-  return TRUE;

-}

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	Keith Packard, MIT X Consortium
+ *		Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+/* See Porting Layer Definition - p. 58 */
+/*
+ * Allocate indexes for the privates that we use.
+ * Allocate memory directly for the screen privates.
+ * Reserve space in GCs and Pixmaps for our privates.
+ * Colormap privates are handled in winAllocateCmapPrivates ()
+ */
+
+Bool
+winAllocatePrivates(ScreenPtr pScreen)
+{
+    winPrivScreenPtr pScreenPriv;
+
+#if CYGDEBUG
+    winDebug("winAllocateScreenPrivates - g_ulServerGeneration: %d "
+             "serverGeneration: %d\n", g_ulServerGeneration, serverGeneration);
+#endif
+
+    /* We need a new slot for our privates if the screen gen has changed */
+    if (g_ulServerGeneration != serverGeneration) {
+        g_ulServerGeneration = serverGeneration;
+    }
+
+    /* Allocate memory for the screen private structure */
+    pScreenPriv = (winPrivScreenPtr) malloc(sizeof(winPrivScreenRec));
+    if (!pScreenPriv) {
+        ErrorF("winAllocateScreenPrivates - malloc () failed\n");
+        return FALSE;
+    }
+
+    /* Initialize the memory of the private structure */
+    ZeroMemory(pScreenPriv, sizeof(winPrivScreenRec));
+
+    /* Intialize private structure members */
+    pScreenPriv->fActive = TRUE;
+
+    /* Register our screen private */
+    if (!dixRegisterPrivateKey(g_iScreenPrivateKey, PRIVATE_SCREEN, 0)) {
+        ErrorF("winAllocatePrivates - AllocateScreenPrivate () failed\n");
+        return FALSE;
+    }
+
+    /* Save the screen private pointer */
+    winSetScreenPriv(pScreen, pScreenPriv);
+
+    /* Reserve GC memory for our privates */
+    if (!dixRegisterPrivateKey
+        (g_iGCPrivateKey, PRIVATE_GC, sizeof(winPrivGCRec))) {
+        ErrorF("winAllocatePrivates - AllocateGCPrivate () failed\n");
+        return FALSE;
+    }
+
+    /* Reserve Pixmap memory for our privates */
+    if (!dixRegisterPrivateKey
+        (g_iPixmapPrivateKey, PRIVATE_PIXMAP, sizeof(winPrivPixmapRec))) {
+        ErrorF("winAllocatePrivates - AllocatePixmapPrivates () failed\n");
+        return FALSE;
+    }
+
+    /* Reserve Window memory for our privates */
+    if (!dixRegisterPrivateKey
+        (g_iWindowPrivateKey, PRIVATE_WINDOW, sizeof(winPrivWinRec))) {
+        ErrorF("winAllocatePrivates () - AllocateWindowPrivates () failed\n");
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * Colormap privates may be allocated after the default colormap has
+ * already been created for some screens.  This initialization procedure
+ * is called for each default colormap that is found.
+ */
+
+Bool
+winInitCmapPrivates(ColormapPtr pcmap, int index)
+{
+#if CYGDEBUG
+    winDebug("winInitCmapPrivates\n");
+#endif
+
+    /*
+     * I see no way that this function can do anything useful
+     * with only a ColormapPtr.  We don't have the index for
+     * our dev privates yet, so we can't really initialize
+     * anything.  Perhaps I am misunderstanding the purpose
+     * of this function.
+     */
+    /*  That's definitely true.
+     *  I therefore changed the API and added the index as argument.
+     */
+    return TRUE;
+}
+
+/*
+ * Allocate memory for our colormap privates
+ */
+
+Bool
+winAllocateCmapPrivates(ColormapPtr pCmap)
+{
+    winPrivCmapPtr pCmapPriv;
+    static unsigned long s_ulPrivateGeneration = 0;
+
+#if CYGDEBUG
+    winDebug("winAllocateCmapPrivates\n");
+#endif
+
+    /* Get a new privates index when the server generation changes */
+    if (s_ulPrivateGeneration != serverGeneration) {
+        /* Save the new server generation */
+        s_ulPrivateGeneration = serverGeneration;
+    }
+
+    /* Allocate memory for our private structure */
+    pCmapPriv = (winPrivCmapPtr) malloc(sizeof(winPrivCmapRec));
+    if (!pCmapPriv) {
+        ErrorF("winAllocateCmapPrivates - malloc () failed\n");
+        return FALSE;
+    }
+
+    /* Initialize the memory of the private structure */
+    ZeroMemory(pCmapPriv, sizeof(winPrivCmapRec));
+
+    /* Register our colourmap private */
+    if (!dixRegisterPrivateKey(g_iCmapPrivateKey, PRIVATE_COLORMAP, 0)) {
+        ErrorF("winAllocateCmapPrivates - AllocateCmapPrivate () failed\n");
+        return FALSE;
+    }
+
+    /* Save the cmap private pointer */
+    winSetCmapPriv(pCmap, pCmapPriv);
+
+#if CYGDEBUG
+    winDebug("winAllocateCmapPrivates - Returning\n");
+#endif
+
+    return TRUE;
+}
diff --git a/xorg-server/hw/xwin/winauth.c b/xorg-server/hw/xwin/winauth.c
index 7d4372549..25d1fbd62 100644
--- a/xorg-server/hw/xwin/winauth.c
+++ b/xorg-server/hw/xwin/winauth.c
@@ -1,202 +1,182 @@
-/*

- *Copyright (C) 2003-2004 Harold L Hunt II 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 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 HAROLD L HUNT II BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of Harold L Hunt II

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from Harold L Hunt II.

- *

- * Authors:	Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-

-#include "win.h"

-

-/* Includes for authorization */

-#include "securitysrv.h"

-

-

-/*

- * Constants

- */

-

-#define AUTH_NAME	"MIT-MAGIC-COOKIE-1"

-

-

-/*

- * Locals

- */

-

-static XID g_authId = 0;

-static unsigned int g_uiAuthDataLen = 0;

-static char *g_pAuthData = NULL;

-

-/*

- * Code to generate a MIT-MAGIC-COOKIE-1, copied from under XCSECURITY

- */

-

-#ifndef XCSECURITY

-static

-void

-GenerateRandomData (int len, char *buf)

-{

-    int fd;

-

-    fd = open("/dev/urandom", O_RDONLY);

-    read(fd, buf, len);

-    close(fd);

-}

-

-

-static char cookie[16]; /* 128 bits */

-

-XID

-static MitGenerateCookie (

-    unsigned	data_length,

-    char	*data,

-    XID		id,

-    unsigned	*data_length_return,

-    char	**data_return)

-{

-    int i = 0;

-    int status;

-

-    while (data_length--)

-    {

-	cookie[i++] += *data++;

-	if (i >= sizeof (cookie)) i = 0;

-    }

-    GenerateRandomData(sizeof (cookie), cookie);

-    status = MitAddCookie(sizeof (cookie), cookie, id);

-    if (!status)

-    {

-	id = -1;

-    }

-    else

-    {

-	*data_return = cookie;

-	*data_length_return = sizeof (cookie);

-    }

-    return id;

-}

-

-static

-XID

-GenerateAuthorization(

-	unsigned name_length,

-	char	*name,

-	unsigned data_length,

-	char	*data,

-	unsigned *data_length_return,

-	char	**data_return)

-{

-    return MitGenerateCookie(data_length, data,

-                             FakeClientID(0), data_length_return, data_return);

-}

-#endif

-

-/*

- * Generate authorization cookie for internal server clients

- */

-

-Bool

-winGenerateAuthorization (void)

-{

-  Bool				fFreeAuth = FALSE;

-  SecurityAuthorizationPtr	pAuth = NULL;

-

-  /* Call OS layer to generate authorization key */

-  g_authId = GenerateAuthorization (strlen (AUTH_NAME),

-				    AUTH_NAME,

-				    0,

-				    NULL,

-				    &g_uiAuthDataLen,

-				    &g_pAuthData);

-  if ((XID) ~0L == g_authId)

-    {

-      ErrorF ("winGenerateAuthorization - GenerateAuthorization failed\n");

-      goto auth_bailout;

-    }

-

-  else

-    {

-      winDebug("winGenerateAuthorization - GenerateAuthorization success!\n"

-	      "AuthDataLen: %d AuthData: %s\n",

-	      g_uiAuthDataLen, g_pAuthData);

-    }

-

-#ifdef XCSECURITY

-  /* Allocate structure for additional auth information */

-  pAuth = (SecurityAuthorizationPtr) 

-    malloc(sizeof (SecurityAuthorizationRec));

-  if (!(pAuth))

-    {

-      ErrorF ("winGenerateAuthorization - Failed allocating "

-	      "SecurityAuthorizationPtr.\n");

-      goto auth_bailout;

-    }

-  

-  /* Fill in the auth fields */

-  pAuth->id = g_authId;

-  pAuth->timeout = 0; /* live for x seconds after refcnt == 0 */

-  pAuth->group = None;

-  pAuth->trustLevel = XSecurityClientTrusted;

-  pAuth->refcnt = 1; /* this auth must stick around */

-  pAuth->secondsRemaining = 0;

-  pAuth->timer = NULL;

-  pAuth->eventClients = NULL;

-  

-  /* Add the authorization to the server's auth list */

-  if (!AddResource (g_authId,

-		    SecurityAuthorizationResType,

-		    pAuth))

-    {

-      ErrorF ("winGenerateAuthorization - AddResource failed for auth.\n");

-      fFreeAuth = TRUE;

-      goto auth_bailout;

-    }

-  

-  /* Don't free the auth data, since it is still used internally */

-  pAuth = NULL;

-#endif

-

-  return TRUE;

-

- auth_bailout:

-  if (fFreeAuth)

-    free(pAuth);

-  

-  return FALSE;

-}

-

-/* Use our generated cookie for authentication */

-void

-winSetAuthorization(void)

-{

-  XSetAuthorization (AUTH_NAME,

-		     strlen (AUTH_NAME),

-		     g_pAuthData,

-		     g_uiAuthDataLen);

-}

+/*
+ *Copyright (C) 2003-2004 Harold L Hunt II 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 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 HAROLD L HUNT II BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of Harold L Hunt II
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from Harold L Hunt II.
+ *
+ * Authors:	Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+
+#include "win.h"
+
+/* Includes for authorization */
+#include "securitysrv.h"
+
+/*
+ * Constants
+ */
+
+#define AUTH_NAME	"MIT-MAGIC-COOKIE-1"
+
+/*
+ * Locals
+ */
+
+static XID g_authId = 0;
+static unsigned int g_uiAuthDataLen = 0;
+static char *g_pAuthData = NULL;
+
+/*
+ * Code to generate a MIT-MAGIC-COOKIE-1, copied from under XCSECURITY
+ */
+
+#ifndef XCSECURITY
+static
+    void
+GenerateRandomData(int len, char *buf)
+{
+    int fd;
+
+    fd = open("/dev/urandom", O_RDONLY);
+    read(fd, buf, len);
+    close(fd);
+}
+
+static char cookie[16];         /* 128 bits */
+
+XID
+    static
+MitGenerateCookie(unsigned data_length,
+                  char *data,
+                  XID id, unsigned *data_length_return, char **data_return)
+{
+    int i = 0;
+    int status;
+
+    while (data_length--) {
+        cookie[i++] += *data++;
+        if (i >= sizeof(cookie))
+            i = 0;
+    }
+    GenerateRandomData(sizeof(cookie), cookie);
+    status = MitAddCookie(sizeof(cookie), cookie, id);
+    if (!status) {
+        id = -1;
+    }
+    else {
+        *data_return = cookie;
+        *data_length_return = sizeof(cookie);
+    }
+    return id;
+}
+
+static
+    XID
+GenerateAuthorization(unsigned name_length,
+                      char *name,
+                      unsigned data_length,
+                      char *data,
+                      unsigned *data_length_return, char **data_return)
+{
+    return MitGenerateCookie(data_length, data,
+                             FakeClientID(0), data_length_return, data_return);
+}
+#endif
+
+/*
+ * Generate authorization cookie for internal server clients
+ */
+
+Bool
+winGenerateAuthorization(void)
+{
+    Bool fFreeAuth = FALSE;
+    SecurityAuthorizationPtr pAuth = NULL;
+
+    /* Call OS layer to generate authorization key */
+    g_authId = GenerateAuthorization(strlen(AUTH_NAME),
+                                     AUTH_NAME,
+                                     0, NULL, &g_uiAuthDataLen, &g_pAuthData);
+    if ((XID) ~0L == g_authId) {
+        ErrorF("winGenerateAuthorization - GenerateAuthorization failed\n");
+        goto auth_bailout;
+    }
+
+    else {
+        winDebug("winGenerateAuthorization - GenerateAuthorization success!\n"
+                 "AuthDataLen: %d AuthData: %s\n",
+                 g_uiAuthDataLen, g_pAuthData);
+    }
+
+#ifdef XCSECURITY
+    /* Allocate structure for additional auth information */
+    pAuth = (SecurityAuthorizationPtr)
+        malloc(sizeof(SecurityAuthorizationRec));
+    if (!(pAuth)) {
+        ErrorF("winGenerateAuthorization - Failed allocating "
+               "SecurityAuthorizationPtr.\n");
+        goto auth_bailout;
+    }
+
+    /* Fill in the auth fields */
+    pAuth->id = g_authId;
+    pAuth->timeout = 0;         /* live for x seconds after refcnt == 0 */
+    pAuth->group = None;
+    pAuth->trustLevel = XSecurityClientTrusted;
+    pAuth->refcnt = 1;          /* this auth must stick around */
+    pAuth->secondsRemaining = 0;
+    pAuth->timer = NULL;
+    pAuth->eventClients = NULL;
+
+    /* Add the authorization to the server's auth list */
+    if (!AddResource(g_authId, SecurityAuthorizationResType, pAuth)) {
+        ErrorF("winGenerateAuthorization - AddResource failed for auth.\n");
+        fFreeAuth = TRUE;
+        goto auth_bailout;
+    }
+
+    /* Don't free the auth data, since it is still used internally */
+    pAuth = NULL;
+#endif
+
+    return TRUE;
+
+ auth_bailout:
+    if (fFreeAuth)
+        free(pAuth);
+
+    return FALSE;
+}
+
+/* Use our generated cookie for authentication */
+void
+winSetAuthorization(void)
+{
+    XSetAuthorization(AUTH_NAME,
+                      strlen(AUTH_NAME), g_pAuthData, g_uiAuthDataLen);
+}
diff --git a/xorg-server/hw/xwin/winblock.c b/xorg-server/hw/xwin/winblock.c
index a70d7a42a..c18d080fa 100644
--- a/xorg-server/hw/xwin/winblock.c
+++ b/xorg-server/hw/xwin/winblock.c
@@ -1,96 +1,89 @@
-/*

- *Copyright (C) 2001-2004 Harold L Hunt II 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 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 HAROLD L HUNT II BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of Harold L Hunt II

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from Harold L Hunt II.

- *

- * Authors:	Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-#include "winmsg.h"

-

-/* See Porting Layer Definition - p. 6 */

-void

-winBlockHandler (int nScreen,

-		 pointer pBlockData,

-		 pointer pTimeout,

-		 pointer pReadMask)

-{

-#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

-  winScreenPriv((ScreenPtr)pBlockData);

-#endif

-  MSG			msg;

-#ifndef HAS_DEVWINDOWS

-  struct timeval **tvp = pTimeout;

-  if (*tvp != NULL) 

-  {

-    (*tvp)->tv_sec = 0;

-    (*tvp)->tv_usec = 100;

-  }

-#endif

-

-#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

-  /* Signal threaded modules to begin */

-  if (pScreenPriv != NULL && !pScreenPriv->fServerStarted)

-    {

-      int		iReturn;

-      

-      winDebug ("winBlockHandler - Releasing pmServerStarted\n");

-

-      /* Flag that modules are to be started */

-      pScreenPriv->fServerStarted = TRUE;

-

-      /* Unlock the mutex for threaded modules */

-      iReturn = pthread_mutex_unlock (&pScreenPriv->pmServerStarted);

-      if (iReturn != 0)

-	{

-	  ErrorF ("winBlockHandler - pthread_mutex_unlock () failed: %d\n",

-		  iReturn);

-	  goto winBlockHandler_ProcessMessages; 

-	}

-

-      winDebug ("winBlockHandler - pthread_mutex_unlock () returned\n");

-    }

-

-winBlockHandler_ProcessMessages:

-#endif

-

-  /* Process all messages on our queue */

-  while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))

-    {

-      if ((g_hDlgDepthChange == 0

-	   || !IsDialogMessage (g_hDlgDepthChange, &msg))

-	  && (g_hDlgExit == 0

-	      || !IsDialogMessage (g_hDlgExit, &msg))

-	  && (g_hDlgAbout == 0

-	      || !IsDialogMessage (g_hDlgAbout, &msg)))

-	{

-	  DispatchMessage (&msg);

-	}

-    }

-}

+/*
+ *Copyright (C) 2001-2004 Harold L Hunt II 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 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 HAROLD L HUNT II BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of Harold L Hunt II
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from Harold L Hunt II.
+ *
+ * Authors:	Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+#include "winmsg.h"
+
+/* See Porting Layer Definition - p. 6 */
+void
+winBlockHandler(int nScreen,
+                pointer pBlockData, pointer pTimeout, pointer pReadMask)
+{
+#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+    winScreenPriv((ScreenPtr) pBlockData);
+#endif
+    MSG msg;
+
+#ifndef HAS_DEVWINDOWS
+    struct timeval **tvp = pTimeout;
+
+    if (*tvp != NULL) {
+        (*tvp)->tv_sec = 0;
+        (*tvp)->tv_usec = 100;
+    }
+#endif
+
+#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+    /* Signal threaded modules to begin */
+    if (pScreenPriv != NULL && !pScreenPriv->fServerStarted) {
+        int iReturn;
+
+        winDebug("winBlockHandler - Releasing pmServerStarted\n");
+
+        /* Flag that modules are to be started */
+        pScreenPriv->fServerStarted = TRUE;
+
+        /* Unlock the mutex for threaded modules */
+        iReturn = pthread_mutex_unlock(&pScreenPriv->pmServerStarted);
+        if (iReturn != 0) {
+            ErrorF("winBlockHandler - pthread_mutex_unlock () failed: %d\n",
+                   iReturn);
+            goto winBlockHandler_ProcessMessages;
+        }
+
+        winDebug("winBlockHandler - pthread_mutex_unlock () returned\n");
+    }
+
+ winBlockHandler_ProcessMessages:
+#endif
+
+    /* Process all messages on our queue */
+    while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+        if ((g_hDlgDepthChange == 0
+             || !IsDialogMessage(g_hDlgDepthChange, &msg))
+            && (g_hDlgExit == 0 || !IsDialogMessage(g_hDlgExit, &msg))
+            && (g_hDlgAbout == 0 || !IsDialogMessage(g_hDlgAbout, &msg))) {
+            DispatchMessage(&msg);
+        }
+    }
+}
diff --git a/xorg-server/hw/xwin/winclipboard.h b/xorg-server/hw/xwin/winclipboard.h
index b655f1623..203a9639a 100644
--- a/xorg-server/hw/xwin/winclipboard.h
+++ b/xorg-server/hw/xwin/winclipboard.h
@@ -54,12 +54,11 @@
 /* Windows headers */
 #include <X11/Xwindows.h>
 
-
 /* Clipboard module constants */
 #define WIN_CLIPBOARD_WINDOW_CLASS		"xwinclip"
 #define WIN_CLIPBOARD_WINDOW_TITLE		"xwinclip"
 #ifdef HAS_DEVWINDOWS
-# define WIN_MSG_QUEUE_FNAME			"/dev/windows"
+#define WIN_MSG_QUEUE_FNAME			"/dev/windows"
 #endif
 #define WIN_CONNECT_RETRIES			40
 #define WIN_CONNECT_DELAY			4
@@ -80,71 +79,60 @@
  */
 
 extern char *display;
-extern void ErrorF (const char* /*f*/, ...);
-extern void winDebug (const char *format, ...);
-extern void winErrorFVerb (int verb, const char *format, ...);
-
+extern void ErrorF(const char * /*f */ , ...);
+extern void winDebug(const char *format, ...);
+extern void winErrorFVerb(int verb, const char *format, ...);
 
 /*
  * winclipboardinit.c
  */
 
 Bool
-winInitClipboard (void);
-
-HWND
-winClipboardCreateMessagingWindow (void);
+ winInitClipboard(void);
 
+HWND winClipboardCreateMessagingWindow(void);
 
 /*
  * winclipboardtextconv.c
  */
 
 void
-winClipboardDOStoUNIX (char *pszData, int iLength);
+ winClipboardDOStoUNIX(char *pszData, int iLength);
 
 void
-winClipboardUNIXtoDOS (unsigned char **ppszData, int iLength);
-
+ winClipboardUNIXtoDOS(unsigned char **ppszData, int iLength);
 
 /*
  * winclipboardthread.c
  */
 
-void *
-winClipboardProc (void *);
+void *winClipboardProc(void *);
 
 void
-winDeinitClipboard (void);
-
+ winDeinitClipboard(void);
 
 /*
  * winclipboardunicode.c
  */
 
 Bool
-winClipboardDetectUnicodeSupport (void);
-
+ winClipboardDetectUnicodeSupport(void);
 
 /*
  * winclipboardwndproc.c
  */
 
-BOOL
-winClipboardFlushWindowsMessageQueue (HWND hwnd);
+BOOL winClipboardFlushWindowsMessageQueue(HWND hwnd);
 
 LRESULT CALLBACK
-winClipboardWindowProc (HWND hwnd, UINT message, 
-			WPARAM wParam, LPARAM lParam);
-
+winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 /*
  * winclipboardxevents.c
  */
 
 int
-winClipboardFlushXEvents (HWND hwnd,
-			  int iWindow,
-			  Display *pDisplay,
-			  Bool fUnicodeSupport);
+
+winClipboardFlushXEvents(HWND hwnd,
+                         int iWindow, Display * pDisplay, Bool fUnicodeSupport);
 #endif
diff --git a/xorg-server/hw/xwin/winclipboardinit.c b/xorg-server/hw/xwin/winclipboardinit.c
index a8b038c5c..696d9e2d6 100644
--- a/xorg-server/hw/xwin/winclipboardinit.c
+++ b/xorg-server/hw/xwin/winclipboardinit.c
@@ -1,145 +1,134 @@
-/*

- *Copyright (C) 2003-2004 Harold L Hunt II 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 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 HAROLD L HUNT II BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of Harold L Hunt II

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from Harold L Hunt II.

- *

- * Authors:	Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "dixstruct.h"

-#include "winclipboard.h"

-

-

-/*

- * Local typedefs

- */

-

-typedef int (*winDispatchProcPtr) (ClientPtr);

-

-int winProcSetSelectionOwner(ClientPtr /* client */);

-

-

-/*

- * References to external symbols

- */

-

-extern pthread_t		g_ptClipboardProc;

-extern winDispatchProcPtr	winProcSetSelectionOwnerOrig;

-extern Bool			g_fClipboard;

-extern HWND			g_hwndClipboard;

-

-

-/*

- * Intialize the Clipboard module

- */

-

-Bool

-winInitClipboard (void)

-{

-  ErrorF ("winInitClipboard ()\n");

-

-  /* Wrap some internal server functions */

-  if (ProcVector[X_SetSelectionOwner] != winProcSetSelectionOwner)

-    {

-      winProcSetSelectionOwnerOrig = ProcVector[X_SetSelectionOwner];

-      ProcVector[X_SetSelectionOwner] = winProcSetSelectionOwner;

-    }

-  

-  /* Spawn a thread for the Clipboard module */

-  if (pthread_create (&g_ptClipboardProc,

-		      NULL,

-		      winClipboardProc,

-		      NULL))

-    {

-      /* Bail if thread creation failed */

-      ErrorF ("winInitClipboard - pthread_create failed.\n");

-      return FALSE;

-    }

-

-  return TRUE;

-}

-

-

-/*

- * Create the Windows window that we use to recieve Windows messages

- */

-

-HWND

-winClipboardCreateMessagingWindow (void)

-{

-  WNDCLASSEX			wc;

-  HWND				hwnd;

-

-  /* Setup our window class */

-  wc.cbSize=sizeof(WNDCLASSEX);

-  wc.style = CS_HREDRAW | CS_VREDRAW;

-  wc.lpfnWndProc = winClipboardWindowProc;

-  wc.cbClsExtra = 0;

-  wc.cbWndExtra = 0;

-  wc.hInstance = GetModuleHandle (NULL);

-  wc.hIcon = 0;

-  wc.hCursor = 0;

-  wc.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH);

-  wc.lpszMenuName = NULL;

-  wc.lpszClassName = WIN_CLIPBOARD_WINDOW_CLASS;

-  wc.hIconSm = 0;

-  RegisterClassEx (&wc);

-

-  /* Create the window */

-  hwnd = CreateWindowExA (0,			/* Extended styles */

-			  WIN_CLIPBOARD_WINDOW_CLASS,/* Class name */

-			  WIN_CLIPBOARD_WINDOW_TITLE,/* Window name */

-			  WS_OVERLAPPED,	/* Not visible anyway */

-			  CW_USEDEFAULT,	/* Horizontal position */

-			  CW_USEDEFAULT,	/* Vertical position */

-			  CW_USEDEFAULT,	/* Right edge */

-			  CW_USEDEFAULT,	/* Bottom edge */

-			  (HWND) NULL,		/* No parent or owner window */

-			  (HMENU) NULL,		/* No menu */

-			  GetModuleHandle (NULL),/* Instance handle */

-			  NULL);		/* Creation data */

-  assert (hwnd != NULL);

-

-  /* I'm not sure, but we may need to call this to start message processing */

-  ShowWindow (hwnd, SW_HIDE);

-

-  /* Similarly, we may need a call to this even though we don't paint */

-  UpdateWindow (hwnd);

-

-  return hwnd;

-}

-

-void

-winFixClipboardChain (void)

-{

-   if (g_fClipboard

-       && g_hwndClipboard)

-     {

-       PostMessage (g_hwndClipboard, WM_WM_REINIT, 0, 0);

-     }

-}

+/*
+ *Copyright (C) 2003-2004 Harold L Hunt II 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 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 HAROLD L HUNT II BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of Harold L Hunt II
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from Harold L Hunt II.
+ *
+ * Authors:	Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "dixstruct.h"
+#include "winclipboard.h"
+
+/*
+ * Local typedefs
+ */
+
+typedef int (*winDispatchProcPtr) (ClientPtr);
+
+int winProcSetSelectionOwner(ClientPtr /* client */ );
+
+/*
+ * References to external symbols
+ */
+
+extern pthread_t g_ptClipboardProc;
+extern winDispatchProcPtr winProcSetSelectionOwnerOrig;
+extern Bool g_fClipboard;
+extern HWND g_hwndClipboard;
+
+/*
+ * Intialize the Clipboard module
+ */
+
+Bool
+winInitClipboard(void)
+{
+    ErrorF("winInitClipboard ()\n");
+
+    /* Wrap some internal server functions */
+    if (ProcVector[X_SetSelectionOwner] != winProcSetSelectionOwner) {
+        winProcSetSelectionOwnerOrig = ProcVector[X_SetSelectionOwner];
+        ProcVector[X_SetSelectionOwner] = winProcSetSelectionOwner;
+    }
+
+    /* Spawn a thread for the Clipboard module */
+    if (pthread_create(&g_ptClipboardProc, NULL, winClipboardProc, NULL)) {
+        /* Bail if thread creation failed */
+        ErrorF("winInitClipboard - pthread_create failed.\n");
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * Create the Windows window that we use to recieve Windows messages
+ */
+
+HWND
+winClipboardCreateMessagingWindow(void)
+{
+    WNDCLASSEX wc;
+    HWND hwnd;
+
+    /* Setup our window class */
+    wc.cbSize = sizeof(WNDCLASSEX);
+    wc.style = CS_HREDRAW | CS_VREDRAW;
+    wc.lpfnWndProc = winClipboardWindowProc;
+    wc.cbClsExtra = 0;
+    wc.cbWndExtra = 0;
+    wc.hInstance = GetModuleHandle(NULL);
+    wc.hIcon = 0;
+    wc.hCursor = 0;
+    wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+    wc.lpszMenuName = NULL;
+    wc.lpszClassName = WIN_CLIPBOARD_WINDOW_CLASS;
+    wc.hIconSm = 0;
+    RegisterClassEx(&wc);
+
+    /* Create the window */
+    hwnd = CreateWindowExA(0,   /* Extended styles */
+                           WIN_CLIPBOARD_WINDOW_CLASS,  /* Class name */
+                           WIN_CLIPBOARD_WINDOW_TITLE,  /* Window name */
+                           WS_OVERLAPPED,       /* Not visible anyway */
+                           CW_USEDEFAULT,       /* Horizontal position */
+                           CW_USEDEFAULT,       /* Vertical position */
+                           CW_USEDEFAULT,       /* Right edge */
+                           CW_USEDEFAULT,       /* Bottom edge */
+                           (HWND) NULL, /* No parent or owner window */
+                           (HMENU) NULL,        /* No menu */
+                           GetModuleHandle(NULL),       /* Instance handle */
+                           NULL);       /* Creation data */
+    assert(hwnd != NULL);
+
+    /* I'm not sure, but we may need to call this to start message processing */
+    ShowWindow(hwnd, SW_HIDE);
+
+    /* Similarly, we may need a call to this even though we don't paint */
+    UpdateWindow(hwnd);
+
+    return hwnd;
+}
+
+void
+winFixClipboardChain(void)
+{
+    if (g_fClipboard && g_hwndClipboard) {
+        PostMessage(g_hwndClipboard, WM_WM_REINIT, 0, 0);
+    }
+}
diff --git a/xorg-server/hw/xwin/winclipboardtextconv.c b/xorg-server/hw/xwin/winclipboardtextconv.c
index 400f560fa..74a351b17 100644
--- a/xorg-server/hw/xwin/winclipboardtextconv.c
+++ b/xorg-server/hw/xwin/winclipboardtextconv.c
@@ -36,9 +36,9 @@
 #include <stdlib.h>
 
 void
-winClipboardDOStoUNIX (char *pszSrc, int iLength);
+ winClipboardDOStoUNIX(char *pszSrc, int iLength);
 void
-winClipboardUNIXtoDOS (unsigned char **ppszData, int iLength);
+ winClipboardUNIXtoDOS(unsigned char **ppszData, int iLength);
 
 /*
  * Convert \r\n to \n
@@ -48,108 +48,100 @@ winClipboardUNIXtoDOS (unsigned char **ppszData, int iLength);
  */
 
 void
-winClipboardDOStoUNIX (char *pszSrc, int iLength)
+winClipboardDOStoUNIX(char *pszSrc, int iLength)
 {
-  char			*pszDest = pszSrc;
-  char			*pszEnd = pszSrc + iLength;
+    char *pszDest = pszSrc;
+    char *pszEnd = pszSrc + iLength;
 
-  /* Loop until the last character */
-  while (pszSrc < pszEnd)
-    {
-      /* Copy the current source character to current destination character */
-      *pszDest = *pszSrc;
+    /* Loop until the last character */
+    while (pszSrc < pszEnd) {
+        /* Copy the current source character to current destination character */
+        *pszDest = *pszSrc;
 
-      /* Advance to the next source character */
-      pszSrc++;
+        /* Advance to the next source character */
+        pszSrc++;
 
-      /* Don't advance the destination character if we need to drop an \r */
-      if (*pszDest != '\r' || *pszSrc != '\n')
-	pszDest++;
+        /* Don't advance the destination character if we need to drop an \r */
+        if (*pszDest != '\r' || *pszSrc != '\n')
+            pszDest++;
     }
 
-  /* Move the terminating null */
-  *pszDest = '\0';
+    /* Move the terminating null */
+    *pszDest = '\0';
 }
 
-
 /*
  * Convert \n to \r\n
  */
 
 void
-winClipboardUNIXtoDOS (unsigned char **ppszData, int iLength)
+winClipboardUNIXtoDOS(unsigned char **ppszData, int iLength)
 {
-  int			iNewlineCount = 0;
-  unsigned char		*pszSrc = *ppszData;
-  unsigned char		*pszEnd = pszSrc + iLength;
-  unsigned char		*pszDest = NULL, *pszDestBegin = NULL;
-
-  winDebug("UNIXtoDOS () - Original data:'%s'\n", *ppszData);
-
-  /* Count \n characters without leading \r */
-  while (pszSrc < pszEnd)
-    {
-      /* Skip ahead two character if found set of \r\n */
-      if (*pszSrc == '\r' && pszSrc + 1 < pszEnd && *(pszSrc + 1) == '\n')
-	{
-	  pszSrc += 2;
-	  continue;
-	} 
-
-      /* Increment the count if found naked \n */
-      if (*pszSrc == '\n')
-	{
-	  iNewlineCount++;
-	}
-
-      pszSrc++;
+    int iNewlineCount = 0;
+    unsigned char *pszSrc = *ppszData;
+    unsigned char *pszEnd = pszSrc + iLength;
+    unsigned char *pszDest = NULL, *pszDestBegin = NULL;
+
+    winDebug("UNIXtoDOS () - Original data:'%s'\n", *ppszData);
+
+    /* Count \n characters without leading \r */
+    while (pszSrc < pszEnd) {
+        /* Skip ahead two character if found set of \r\n */
+        if (*pszSrc == '\r' && pszSrc + 1 < pszEnd && *(pszSrc + 1) == '\n') {
+            pszSrc += 2;
+            continue;
+        }
+
+        /* Increment the count if found naked \n */
+        if (*pszSrc == '\n') {
+            iNewlineCount++;
+        }
+
+        pszSrc++;
     }
-  
-  /* Return if no naked \n's */
-  if (iNewlineCount == 0)
-    return;
-
-  /* Allocate a new string */
-  pszDestBegin = pszDest = malloc (iLength + iNewlineCount + 1);
-
-  /* Set source pointer to beginning of data string */
-  pszSrc = *ppszData;
-
-  /* Loop through all characters in source string */
-  while (pszSrc < pszEnd)
-    {
-      /* Copy line endings that are already valid */
-      if (*pszSrc == '\r' && pszSrc + 1 < pszEnd && *(pszSrc + 1) == '\n')
-	{
-	  *pszDest = *pszSrc;
-	  *(pszDest + 1) = *(pszSrc + 1);
-	  pszDest += 2;
-	  pszSrc += 2;
-	  continue;
-	}
-
-      /* Add \r to naked \n's */
-      if (*pszSrc == '\n')
-	{
-	  *pszDest = '\r';
-	  *(pszDest + 1) = *pszSrc;
-	  pszDest += 2;
-	  pszSrc += 1;
-	  continue;
-	}
-
-      /* Copy normal characters */
-      *pszDest = *pszSrc;
-      pszSrc++;
-      pszDest++;
+
+    /* Return if no naked \n's */
+    if (iNewlineCount == 0)
+        return;
+
+    /* Allocate a new string */
+    pszDestBegin = pszDest = malloc(iLength + iNewlineCount + 1);
+
+    /* Set source pointer to beginning of data string */
+    pszSrc = *ppszData;
+
+    /* Loop through all characters in source string */
+    while (pszSrc < pszEnd) {
+        /* Copy line endings that are already valid */
+        if (*pszSrc == '\r' && pszSrc + 1 < pszEnd && *(pszSrc + 1) == '\n') {
+            *pszDest = *pszSrc;
+            *(pszDest + 1) = *(pszSrc + 1);
+            pszDest += 2;
+            pszSrc += 2;
+            continue;
+        }
+
+        /* Add \r to naked \n's */
+        if (*pszSrc == '\n') {
+            *pszDest = '\r';
+            *(pszDest + 1) = *pszSrc;
+            pszDest += 2;
+            pszSrc += 1;
+            continue;
+        }
+
+        /* Copy normal characters */
+        *pszDest = *pszSrc;
+        pszSrc++;
+        pszDest++;
     }
 
-  /* Put terminating null at end of new string */
-  *pszDest = '\0';
+    /* Put terminating null at end of new string */
+    *pszDest = '\0';
 
-  /* Swap string pointers */
-  free (*ppszData);
-  *ppszData = pszDestBegin;
+    /* Swap string pointers */
+    free(*ppszData);
+    *ppszData = pszDestBegin;
 
-  winDebug("UNIXtoDOS () - Final string:'%s'\n", pszDestBegin);
+    winDebug("UNIXtoDOS () - Final string:'%s'\n", pszDestBegin);
 }
diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c
index bc4bc3059..181cb7203 100644
--- a/xorg-server/hw/xwin/winclipboardthread.c
+++ b/xorg-server/hw/xwin/winclipboardthread.c
@@ -42,486 +42,438 @@
 #endif
 #include "misc.h"
 
-
 /*
  * References to external symbols
  */
 
-extern Bool		g_fUnicodeClipboard;
-extern unsigned long	serverGeneration;
-extern Bool		g_fClipboardStarted;
-extern Bool             g_fClipboardLaunched;
-extern Bool             g_fClipboard;
-extern HWND		g_hwndClipboard;
-extern void		*g_pClipboardDisplay;
-extern Window		g_iClipboardWindow;
-
+extern Bool g_fUnicodeClipboard;
+extern unsigned long serverGeneration;
+extern Bool g_fClipboardStarted;
+extern Bool g_fClipboardLaunched;
+extern Bool g_fClipboard;
+extern HWND g_hwndClipboard;
+extern void *g_pClipboardDisplay;
+extern Window g_iClipboardWindow;
 
 /*
  * Global variables
  */
 
-static jmp_buf			g_jmpEntry;
+static jmp_buf g_jmpEntry;
 static int clipboardRestarts = 0;
 static XIOErrorHandler g_winClipboardOldIOErrorHandler;
 static pthread_t g_winClipboardProcThread;
 
-Bool				g_fUnicodeSupport = FALSE;
-Bool				g_fUseUnicode = FALSE;
-
+Bool g_fUnicodeSupport = FALSE;
+Bool g_fUseUnicode = FALSE;
 
 /*
  * Local function prototypes
  */
 
 static int
-winClipboardErrorHandler (Display *pDisplay, XErrorEvent *pErr);
+ winClipboardErrorHandler(Display * pDisplay, XErrorEvent * pErr);
 
 static int
-winClipboardIOErrorHandler (Display *pDisplay);
+ winClipboardIOErrorHandler(Display * pDisplay);
 
 /*
  * Main thread function
  */
 
 void *
-winClipboardProc (void *pvNotUsed)
+winClipboardProc(void *pvNotUsed)
 {
-  Atom			atomClipboard, atomClipboardManager;
-  int			iReturn;
-  HWND			hwnd = NULL;
-  int			iConnectionNumber = 0;
+    Atom atomClipboard, atomClipboardManager;
+    int iReturn;
+    HWND hwnd = NULL;
+    int iConnectionNumber = 0;
+
 #ifdef HAS_DEVWINDOWS
-  int			fdMessageQueue = 0;
+    int fdMessageQueue = 0;
 #else
-  struct timeval        tvTimeout;
+    struct timeval tvTimeout;
 #endif
-  fd_set		fdsRead;
-  int			iMaxDescriptor;
-  Display		*pDisplay = NULL;
-  Window		iWindow = None;
-  int			iRetries;
-  Bool			fUseUnicode;
-  char			szDisplay[512];
-  int			iSelectError;
-
-  ErrorF ("winClipboardProc - Hello\n");
-  ++clipboardRestarts;
-
-  /* Do we have Unicode support? */
-  g_fUnicodeSupport = winClipboardDetectUnicodeSupport ();
-
-  /* Do we use Unicode clipboard? */
-  fUseUnicode = g_fUnicodeClipboard && g_fUnicodeSupport;
-
-  /* Save the Unicode support flag in a global */
-  g_fUseUnicode = fUseUnicode;
-
-  /* Allow multiple threads to access Xlib */
-  if (XInitThreads () == 0)
-    {
-      ErrorF ("winClipboardProc - XInitThreads failed.\n");
-      goto winClipboardProc_Exit;
+    fd_set fdsRead;
+    int iMaxDescriptor;
+    Display *pDisplay = NULL;
+    Window iWindow = None;
+    int iRetries;
+    Bool fUseUnicode;
+    char szDisplay[512];
+    int iSelectError;
+
+    ErrorF("winClipboardProc - Hello\n");
+    ++clipboardRestarts;
+
+    /* Do we have Unicode support? */
+    g_fUnicodeSupport = winClipboardDetectUnicodeSupport();
+
+    /* Do we use Unicode clipboard? */
+    fUseUnicode = g_fUnicodeClipboard && g_fUnicodeSupport;
+
+    /* Save the Unicode support flag in a global */
+    g_fUseUnicode = fUseUnicode;
+
+    /* Allow multiple threads to access Xlib */
+    if (XInitThreads() == 0) {
+        ErrorF("winClipboardProc - XInitThreads failed.\n");
+        goto winClipboardProc_Exit;
     }
 
-  /* See if X supports the current locale */
-  if (XSupportsLocale () == False)
-    {
-      ErrorF ("winClipboardProc - Warning: Locale not supported by X.\n");
+    /* See if X supports the current locale */
+    if (XSupportsLocale() == False) {
+        ErrorF("winClipboardProc - Warning: Locale not supported by X.\n");
     }
 
-  /* Set error handler */
-  XSetErrorHandler (winClipboardErrorHandler);
-  g_winClipboardProcThread = pthread_self();
-  g_winClipboardOldIOErrorHandler = XSetIOErrorHandler (winClipboardIOErrorHandler);
-
-  /* Set jump point for Error exits */
-  iReturn = setjmp (g_jmpEntry);
-  
-  /* Check if we should continue operations */
-  if (iReturn != WIN_JMP_ERROR_IO
-      && iReturn != WIN_JMP_OKAY)
-    {
-      /* setjmp returned an unknown value, exit */
-      ErrorF ("winClipboardProc - setjmp returned: %d exiting\n",
-	      iReturn);
-      goto winClipboardProc_Exit;
+    /* Set error handler */
+    XSetErrorHandler(winClipboardErrorHandler);
+    g_winClipboardProcThread = pthread_self();
+    g_winClipboardOldIOErrorHandler =
+        XSetIOErrorHandler(winClipboardIOErrorHandler);
+
+    /* Set jump point for Error exits */
+    iReturn = setjmp(g_jmpEntry);
+
+    /* Check if we should continue operations */
+    if (iReturn != WIN_JMP_ERROR_IO && iReturn != WIN_JMP_OKAY) {
+        /* setjmp returned an unknown value, exit */
+        ErrorF("winClipboardProc - setjmp returned: %d exiting\n", iReturn);
+        goto winClipboardProc_Exit;
     }
-  else if (iReturn == WIN_JMP_ERROR_IO)
-    {
-      /* TODO: Cleanup the Win32 window and free any allocated memory */
-      ErrorF ("winClipboardProc - setjmp returned for IO Error Handler.\n");
-      pthread_exit (NULL);
+    else if (iReturn == WIN_JMP_ERROR_IO) {
+        /* TODO: Cleanup the Win32 window and free any allocated memory */
+        ErrorF("winClipboardProc - setjmp returned for IO Error Handler.\n");
+        pthread_exit(NULL);
     }
 
-  /* Use our generated cookie for authentication */
-  winSetAuthorization();
-
-  /* Initialize retry count */
-  iRetries = 0;
-
-  /* Setup the display connection string x */
-  /*
-   * NOTE: Always connect to screen 0 since we require that screen
-   * numbers start at 0 and increase without gaps.  We only need
-   * to connect to one screen on the display to get events
-   * for all screens on the display.  That is why there is only
-   * one clipboard client thread.
-   */
-  snprintf (szDisplay,
-	    512,
-	    "127.0.0.1:%s.0",
-	    display);
-
-  /* Print the display connection string */
-  ErrorF ("winClipboardProc - DISPLAY=%s\n", szDisplay);
-
-  /* Open the X display */
-  do
-    {
-      pDisplay = XOpenDisplay (szDisplay);
-      if (pDisplay == NULL)
-	{
-	  ErrorF ("winClipboardProc - Could not open display, "
-		  "try: %d, sleeping: %d\n",
-		  iRetries + 1, WIN_CONNECT_DELAY);
-	  ++iRetries;
-	  sleep (WIN_CONNECT_DELAY);
-	  continue;
-	}
-      else
-	break;
+    /* Use our generated cookie for authentication */
+    winSetAuthorization();
+
+    /* Initialize retry count */
+    iRetries = 0;
+
+    /* Setup the display connection string x */
+    /*
+     * NOTE: Always connect to screen 0 since we require that screen
+     * numbers start at 0 and increase without gaps.  We only need
+     * to connect to one screen on the display to get events
+     * for all screens on the display.  That is why there is only
+     * one clipboard client thread.
+     */
+    snprintf(szDisplay, 512, "127.0.0.1:%s.0", display);
+
+    /* Print the display connection string */
+    ErrorF("winClipboardProc - DISPLAY=%s\n", szDisplay);
+
+    /* Open the X display */
+    do {
+        pDisplay = XOpenDisplay(szDisplay);
+        if (pDisplay == NULL) {
+            ErrorF("winClipboardProc - Could not open display, "
+                   "try: %d, sleeping: %d\n", iRetries + 1, WIN_CONNECT_DELAY);
+            ++iRetries;
+            sleep(WIN_CONNECT_DELAY);
+            continue;
+        }
+        else
+            break;
     }
-  while (pDisplay == NULL && iRetries < WIN_CONNECT_RETRIES);
+    while (pDisplay == NULL && iRetries < WIN_CONNECT_RETRIES);
 
-  /* Make sure that the display opened */
-  if (pDisplay == NULL)
-    {
-      ErrorF ("winClipboardProc - Failed opening the display, giving up\n");
-      goto winClipboardProc_Done;
+    /* Make sure that the display opened */
+    if (pDisplay == NULL) {
+        ErrorF("winClipboardProc - Failed opening the display, giving up\n");
+        goto winClipboardProc_Done;
     }
 
-  /* Save the display in the screen privates */
-  g_pClipboardDisplay = pDisplay;
+    /* Save the display in the screen privates */
+    g_pClipboardDisplay = pDisplay;
 
-  ErrorF ("winClipboardProc - XOpenDisplay () returned and "
-	  "successfully opened the display.\n");
+    ErrorF("winClipboardProc - XOpenDisplay () returned and "
+           "successfully opened the display.\n");
 
-  /* Get our connection number */
-  iConnectionNumber = ConnectionNumber (pDisplay);
+    /* Get our connection number */
+    iConnectionNumber = ConnectionNumber(pDisplay);
 
 #ifdef HAS_DEVWINDOWS
-  /* Open a file descriptor for the windows message queue */
-  fdMessageQueue = open (WIN_MSG_QUEUE_FNAME, O_RDONLY);
-  if (fdMessageQueue == -1)
-    {
-      ErrorF ("winClipboardProc - Failed opening %s\n", WIN_MSG_QUEUE_FNAME);
-      goto winClipboardProc_Done;
+    /* Open a file descriptor for the windows message queue */
+    fdMessageQueue = open(WIN_MSG_QUEUE_FNAME, O_RDONLY);
+    if (fdMessageQueue == -1) {
+        ErrorF("winClipboardProc - Failed opening %s\n", WIN_MSG_QUEUE_FNAME);
+        goto winClipboardProc_Done;
     }
 
-  /* Find max of our file descriptors */
-  iMaxDescriptor = max (fdMessageQueue, iConnectionNumber) + 1;
+    /* Find max of our file descriptors */
+    iMaxDescriptor = max(fdMessageQueue, iConnectionNumber) + 1;
 #else
-  iMaxDescriptor = iConnectionNumber + 1;
+    iMaxDescriptor = iConnectionNumber + 1;
 #endif
 
-  /* Create atoms */
-  atomClipboard = XInternAtom (pDisplay, "CLIPBOARD", False);
-  atomClipboardManager = XInternAtom (pDisplay, "CLIPBOARD_MANAGER", False);
-
-  /* Create a messaging window */
-  iWindow = XCreateSimpleWindow (pDisplay,
-				 DefaultRootWindow (pDisplay),
-				 1, 1,
-				 500, 500,
-				 0,
-				 BlackPixel (pDisplay, 0),
-				 BlackPixel (pDisplay, 0));
-  if (iWindow == 0)
-    {
-      ErrorF ("winClipboardProc - Could not create an X window.\n");
-      goto winClipboardProc_Done;
+    /* Create atoms */
+    atomClipboard = XInternAtom(pDisplay, "CLIPBOARD", False);
+    atomClipboardManager = XInternAtom(pDisplay, "CLIPBOARD_MANAGER", False);
+
+    /* Create a messaging window */
+    iWindow = XCreateSimpleWindow(pDisplay,
+                                  DefaultRootWindow(pDisplay),
+                                  1, 1,
+                                  500, 500,
+                                  0,
+                                  BlackPixel(pDisplay, 0),
+                                  BlackPixel(pDisplay, 0));
+    if (iWindow == 0) {
+        ErrorF("winClipboardProc - Could not create an X window.\n");
+        goto winClipboardProc_Done;
     }
 
-  XStoreName(pDisplay, iWindow, "xwinclip");
-
-  /* Select event types to watch */
-  if (XSelectInput (pDisplay,
-		    iWindow,
-		    PropertyChangeMask) == BadWindow)
-    ErrorF ("winClipboardProc - XSelectInput generated BadWindow "
-	    "on messaging window\n");
-
-  /* Save the window in the screen privates */
-  g_iClipboardWindow = iWindow;
-
-  /* Create Windows messaging window */
-  hwnd = winClipboardCreateMessagingWindow ();
-  
-  /* Save copy of HWND in screen privates */
-  g_hwndClipboard = hwnd;
-
-  /* Assert ownership of selections if Win32 clipboard is owned */
-  if (NULL != GetClipboardOwner ())
-    {
-      /* PRIMARY */
-      iReturn = XSetSelectionOwner (pDisplay, XA_PRIMARY,
-				    iWindow, CurrentTime);
-      if (iReturn == BadAtom || iReturn == BadWindow ||
-	  XGetSelectionOwner (pDisplay, XA_PRIMARY) != iWindow)
-	{
-	  ErrorF ("winClipboardProc - Could not set PRIMARY owner\n");
-	  goto winClipboardProc_Done;
-	}
-
-      /* CLIPBOARD */
-      iReturn = XSetSelectionOwner (pDisplay, atomClipboard,
-				    iWindow, CurrentTime);
-      if (iReturn == BadAtom || iReturn == BadWindow ||
-	  XGetSelectionOwner (pDisplay, atomClipboard) != iWindow)
-	{
-	  ErrorF ("winClipboardProc - Could not set CLIPBOARD owner\n");
-	  goto winClipboardProc_Done;
-	}
-    }
+    XStoreName(pDisplay, iWindow, "xwinclip");
 
-  /* Pre-flush X events */
-  /* 
-   * NOTE: Apparently you'll freeze if you don't do this,
-   *	   because there may be events in local data structures
-   *	   already.
-   */
-  winClipboardFlushXEvents (hwnd,
-			    iWindow,
-			    pDisplay,
-			    fUseUnicode);
-
-  /* Pre-flush Windows messages */
-  if (!winClipboardFlushWindowsMessageQueue (hwnd))
-    return 0;
+    /* Select event types to watch */
+    if (XSelectInput(pDisplay, iWindow, PropertyChangeMask) == BadWindow)
+        ErrorF("winClipboardProc - XSelectInput generated BadWindow "
+               "on messaging window\n");
+
+    /* Save the window in the screen privates */
+    g_iClipboardWindow = iWindow;
+
+    /* Create Windows messaging window */
+    hwnd = winClipboardCreateMessagingWindow();
+
+    /* Save copy of HWND in screen privates */
+    g_hwndClipboard = hwnd;
+
+    /* Assert ownership of selections if Win32 clipboard is owned */
+    if (NULL != GetClipboardOwner()) {
+        /* PRIMARY */
+        iReturn = XSetSelectionOwner(pDisplay, XA_PRIMARY,
+                                     iWindow, CurrentTime);
+        if (iReturn == BadAtom || iReturn == BadWindow ||
+            XGetSelectionOwner(pDisplay, XA_PRIMARY) != iWindow) {
+            ErrorF("winClipboardProc - Could not set PRIMARY owner\n");
+            goto winClipboardProc_Done;
+        }
+
+        /* CLIPBOARD */
+        iReturn = XSetSelectionOwner(pDisplay, atomClipboard,
+                                     iWindow, CurrentTime);
+        if (iReturn == BadAtom || iReturn == BadWindow ||
+            XGetSelectionOwner(pDisplay, atomClipboard) != iWindow) {
+            ErrorF("winClipboardProc - Could not set CLIPBOARD owner\n");
+            goto winClipboardProc_Done;
+        }
+    }
 
-  /* Signal that the clipboard client has started */
-  g_fClipboardStarted = TRUE;
-
-  /* Loop for X events */
-  while (1)
-    {
-      /* Setup the file descriptor set */
-      /*
-       * NOTE: You have to do this before every call to select
-       *       because select modifies the mask to indicate
-       *       which descriptors are ready.
-       */
-      FD_ZERO (&fdsRead);
-      FD_SET (iConnectionNumber, &fdsRead);
+    /* Pre-flush X events */
+    /* 
+     * NOTE: Apparently you'll freeze if you don't do this,
+     *       because there may be events in local data structures
+     *       already.
+     */
+    winClipboardFlushXEvents(hwnd, iWindow, pDisplay, fUseUnicode);
+
+    /* Pre-flush Windows messages */
+    if (!winClipboardFlushWindowsMessageQueue(hwnd))
+        return 0;
+
+    /* Signal that the clipboard client has started */
+    g_fClipboardStarted = TRUE;
+
+    /* Loop for X events */
+    while (1) {
+        /* Setup the file descriptor set */
+        /*
+         * NOTE: You have to do this before every call to select
+         *       because select modifies the mask to indicate
+         *       which descriptors are ready.
+         */
+        FD_ZERO(&fdsRead);
+        FD_SET(iConnectionNumber, &fdsRead);
 #ifdef HAS_DEVWINDOWS
-      FD_SET (fdMessageQueue, &fdsRead);
+        FD_SET(fdMessageQueue, &fdsRead);
 #else
-      tvTimeout.tv_sec = 0;
-      tvTimeout.tv_usec = 100;
+        tvTimeout.tv_sec = 0;
+        tvTimeout.tv_usec = 100;
 #endif
 
-      /* Wait for a Windows event or an X event */
-      iReturn = select (iMaxDescriptor,	/* Highest fds number */
-			&fdsRead,	/* Read mask */
-			NULL,		/* No write mask */
-			NULL,		/* No exception mask */
+        /* Wait for a Windows event or an X event */
+        iReturn = select(iMaxDescriptor,        /* Highest fds number */
+                         &fdsRead,      /* Read mask */
+                         NULL,  /* No write mask */
+                         NULL,  /* No exception mask */
 #ifdef HAS_DEVWINDOWS
-			NULL		/* No timeout */
+                         NULL   /* No timeout */
 #else
-			&tvTimeout      /* Set timeout */
+                         &tvTimeout     /* Set timeout */
 #endif
-          );
+            );
 
 #ifndef HAS_WINSOCK
-      iSelectError = errno;
+        iSelectError = errno;
 #else
-      iSelectError = WSAGetLastError();
+        iSelectError = WSAGetLastError();
 #endif
 
-      if (iReturn < 0)
-	{
+        if (iReturn < 0) {
 #ifndef HAS_WINSOCK
-          if (iSelectError == EINTR)
+            if (iSelectError == EINTR)
 #else
-          if (iSelectError == WSAEINTR)
+            if (iSelectError == WSAEINTR)
 #endif
-            continue;
-          
-	  ErrorF ("winClipboardProc - Call to select () failed: %d.  "
-		  "Bailing.\n", iReturn);
-	  break;
-	}
-
-      /* Branch on which descriptor became active */
-      if (FD_ISSET (iConnectionNumber, &fdsRead))
-	{
-	  /* Process X events */
-	  /* Exit when we see that server is shutting down */
-	  iReturn = winClipboardFlushXEvents (hwnd,
-					      iWindow,
-					      pDisplay,
-					      fUseUnicode);
-	  if (WIN_XEVENTS_SHUTDOWN == iReturn)
-	    {
-	      ErrorF ("winClipboardProc - winClipboardFlushXEvents "
-		      "trapped shutdown event, exiting main loop.\n");
-	      break;
-	    }
-	}
+                continue;
+
+            ErrorF("winClipboardProc - Call to select () failed: %d.  "
+                   "Bailing.\n", iReturn);
+            break;
+        }
+
+        /* Branch on which descriptor became active */
+        if (FD_ISSET(iConnectionNumber, &fdsRead)) {
+            /* Process X events */
+            /* Exit when we see that server is shutting down */
+            iReturn = winClipboardFlushXEvents(hwnd,
+                                               iWindow, pDisplay, fUseUnicode);
+            if (WIN_XEVENTS_SHUTDOWN == iReturn) {
+                ErrorF("winClipboardProc - winClipboardFlushXEvents "
+                       "trapped shutdown event, exiting main loop.\n");
+                break;
+            }
+        }
 
 #ifdef HAS_DEVWINDOWS
-      /* Check for Windows event ready */
-      if (FD_ISSET (fdMessageQueue, &fdsRead))
+        /* Check for Windows event ready */
+        if (FD_ISSET(fdMessageQueue, &fdsRead))
 #else
-      if (1)
+        if (1)
 #endif
-	{
-	  /* Process Windows messages */
-	  if (!winClipboardFlushWindowsMessageQueue (hwnd))
-	    {
-	      ErrorF ("winClipboardProc - "
-		      "winClipboardFlushWindowsMessageQueue trapped "
-		      "WM_QUIT message, exiting main loop.\n");
-	      break;
-	    }
-	}
+        {
+            /* Process Windows messages */
+            if (!winClipboardFlushWindowsMessageQueue(hwnd)) {
+                ErrorF("winClipboardProc - "
+                       "winClipboardFlushWindowsMessageQueue trapped "
+                       "WM_QUIT message, exiting main loop.\n");
+                break;
+            }
+        }
     }
 
-winClipboardProc_Exit:
-  /* disable the clipboard, which means the thread will die */
-  g_fClipboard = FALSE;
-
-winClipboardProc_Done:
-  /* Close our Windows window */
-  if (g_hwndClipboard )
-    {
-      /* Destroy the Window window (hwnd) */
-      winDebug("winClipboardProc - Destroy Windows window\n");
-      PostMessage(g_hwndClipboard, WM_DESTROY, 0, 0);
-      winClipboardFlushWindowsMessageQueue(g_hwndClipboard);
+ winClipboardProc_Exit:
+    /* disable the clipboard, which means the thread will die */
+    g_fClipboard = FALSE;
+
+ winClipboardProc_Done:
+    /* Close our Windows window */
+    if (g_hwndClipboard) {
+        /* Destroy the Window window (hwnd) */
+        winDebug("winClipboardProc - Destroy Windows window\n");
+        PostMessage(g_hwndClipboard, WM_DESTROY, 0, 0);
+        winClipboardFlushWindowsMessageQueue(g_hwndClipboard);
     }
 
-  /* Close our X window */
-  if (pDisplay && iWindow)
-    {
-      iReturn = XDestroyWindow (pDisplay, iWindow);
-      if (iReturn == BadWindow)
-	ErrorF ("winClipboardProc - XDestroyWindow returned BadWindow.\n");
-      else
-	ErrorF ("winClipboardProc - XDestroyWindow succeeded.\n");
+    /* Close our X window */
+    if (pDisplay && iWindow) {
+        iReturn = XDestroyWindow(pDisplay, iWindow);
+        if (iReturn == BadWindow)
+            ErrorF("winClipboardProc - XDestroyWindow returned BadWindow.\n");
+        else
+            ErrorF("winClipboardProc - XDestroyWindow succeeded.\n");
     }
 
-
 #ifdef HAS_DEVWINDOWS
-  /* Close our Win32 message handle */
-  if (fdMessageQueue)
-    close (fdMessageQueue);
+    /* Close our Win32 message handle */
+    if (fdMessageQueue)
+        close(fdMessageQueue);
 #endif
 
 #if 0
-  /*
-   * FIXME: XCloseDisplay hangs if we call it, as of 2004/03/26.  The
-   * XSync and XSelectInput calls did not help.
-   */
-
-  /* Discard any remaining events */
-  XSync (pDisplay, TRUE);
-
-  /* Select event types to watch */
-  XSelectInput (pDisplay,
-		DefaultRootWindow (pDisplay),
-		None);
-
-  /* Close our X display */
-  if (pDisplay)
-    {
-      XCloseDisplay (pDisplay);
+    /*
+     * FIXME: XCloseDisplay hangs if we call it, as of 2004/03/26.  The
+     * XSync and XSelectInput calls did not help.
+     */
+
+    /* Discard any remaining events */
+    XSync(pDisplay, TRUE);
+
+    /* Select event types to watch */
+    XSelectInput(pDisplay, DefaultRootWindow(pDisplay), None);
+
+    /* Close our X display */
+    if (pDisplay) {
+        XCloseDisplay(pDisplay);
     }
 #endif
 
-  /* global clipboard variable reset */
-  g_fClipboardLaunched = FALSE;
-  g_fClipboardStarted = FALSE;
-  g_iClipboardWindow = None;
-  g_pClipboardDisplay = NULL;
-  g_hwndClipboard = NULL;
-
-  /* checking if we need to restart */
-  if (clipboardRestarts >= WIN_CLIPBOARD_RETRIES)
-    {
-      /* terminates clipboard thread but the main server still lives */
-      ErrorF("winClipboardProc - the clipboard thread has restarted %d times and seems to be unstable, disabling clipboard integration\n",  clipboardRestarts);
-      g_fClipboard = FALSE;
-      return;
+    /* global clipboard variable reset */
+    g_fClipboardLaunched = FALSE;
+    g_fClipboardStarted = FALSE;
+    g_iClipboardWindow = None;
+    g_pClipboardDisplay = NULL;
+    g_hwndClipboard = NULL;
+
+    /* checking if we need to restart */
+    if (clipboardRestarts >= WIN_CLIPBOARD_RETRIES) {
+        /* terminates clipboard thread but the main server still lives */
+        ErrorF
+            ("winClipboardProc - the clipboard thread has restarted %d times and seems to be unstable, disabling clipboard integration\n",
+             clipboardRestarts);
+        g_fClipboard = FALSE;
+        return;
     }
 
-  if (g_fClipboard)
-    {
-      sleep(WIN_CLIPBOARD_DELAY);
-      ErrorF("winClipboardProc - trying to restart clipboard thread \n");
-      /* Create the clipboard client thread */
-      if (!winInitClipboard ())
-        {
-          ErrorF ("winClipboardProc - winClipboardInit failed.\n");
-          return;
+    if (g_fClipboard) {
+        sleep(WIN_CLIPBOARD_DELAY);
+        ErrorF("winClipboardProc - trying to restart clipboard thread \n");
+        /* Create the clipboard client thread */
+        if (!winInitClipboard()) {
+            ErrorF("winClipboardProc - winClipboardInit failed.\n");
+            return;
         }
 
-      winDebug ("winClipboardProc - winInitClipboard returned.\n");
-      /* Flag that clipboard client has been launched */
-      g_fClipboardLaunched = TRUE;
+        winDebug("winClipboardProc - winInitClipboard returned.\n");
+        /* Flag that clipboard client has been launched */
+        g_fClipboardLaunched = TRUE;
     }
-  else
-    {
-      ErrorF ("winClipboardProc - Clipboard disabled  - Exit from server \n");
-      /* clipboard thread has exited, stop server as well */
-      kill(getpid(), SIGTERM);
+    else {
+        ErrorF("winClipboardProc - Clipboard disabled  - Exit from server \n");
+        /* clipboard thread has exited, stop server as well */
+        kill(getpid(), SIGTERM);
     }
 
-  return NULL;
+    return NULL;
 }
 
-
 /*
  * winClipboardErrorHandler - Our application specific error handler
  */
 
 static int
-winClipboardErrorHandler (Display *pDisplay, XErrorEvent *pErr)
+winClipboardErrorHandler(Display * pDisplay, XErrorEvent * pErr)
 {
-  char pszErrorMsg[100];
-  
-  XGetErrorText (pDisplay,
-		 pErr->error_code,
-		 pszErrorMsg,
-		 sizeof (pszErrorMsg));
-  ErrorF ("winClipboardErrorHandler - ERROR: \n\t%s\n"
-	  "\tSerial: %lu, Request Code: %d, Minor Code: %d\n",
-	  pszErrorMsg,
-	  pErr->serial,
-	  pErr->request_code,
-	  pErr->minor_code);
-  return 0;
-}
+    char pszErrorMsg[100];
 
+    XGetErrorText(pDisplay, pErr->error_code, pszErrorMsg, sizeof(pszErrorMsg));
+    ErrorF("winClipboardErrorHandler - ERROR: \n\t%s\n"
+           "\tSerial: %lu, Request Code: %d, Minor Code: %d\n",
+           pszErrorMsg, pErr->serial, pErr->request_code, pErr->minor_code);
+    return 0;
+}
 
 /*
  * winClipboardIOErrorHandler - Our application specific IO error handler
  */
 
 static int
-winClipboardIOErrorHandler (Display *pDisplay)
+winClipboardIOErrorHandler(Display * pDisplay)
 {
-  ErrorF ("winClipboardIOErrorHandler!\n\n");
+    ErrorF("winClipboardIOErrorHandler!\n\n");
 
-  if (pthread_equal(pthread_self(),g_winClipboardProcThread))
-    {
-      /* Restart at the main entry point */
-      longjmp (g_jmpEntry, WIN_JMP_ERROR_IO);
+    if (pthread_equal(pthread_self(), g_winClipboardProcThread)) {
+        /* Restart at the main entry point */
+        longjmp(g_jmpEntry, WIN_JMP_ERROR_IO);
     }
 
-  if (g_winClipboardOldIOErrorHandler)
-    g_winClipboardOldIOErrorHandler(pDisplay);
+    if (g_winClipboardOldIOErrorHandler)
+        g_winClipboardOldIOErrorHandler(pDisplay);
 
-  return 0;
+    return 0;
 }
diff --git a/xorg-server/hw/xwin/winclipboardunicode.c b/xorg-server/hw/xwin/winclipboardunicode.c
index a297bf2e9..9c06f7b4d 100644
--- a/xorg-server/hw/xwin/winclipboardunicode.c
+++ b/xorg-server/hw/xwin/winclipboardunicode.c
@@ -33,35 +33,33 @@
 #endif
 #include "winclipboard.h"
 
-
 /*
  * Determine whether we suport Unicode or not.
  * NOTE: Currently, just check if we are on an NT-based platform or not.
  */
 
 Bool
-winClipboardDetectUnicodeSupport (void)
+winClipboardDetectUnicodeSupport(void)
 {
-  Bool			fReturn = FALSE;
-  OSVERSIONINFO		osvi = {0};
+    Bool fReturn = FALSE;
+    OSVERSIONINFO osvi = { 0 };
 
-  /* Get operating system version information */
-  osvi.dwOSVersionInfoSize = sizeof (osvi);
-  GetVersionEx (&osvi);
+    /* Get operating system version information */
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+    GetVersionEx(&osvi);
 
-  /* Branch on platform ID */
-  switch (osvi.dwPlatformId)
-    {
+    /* Branch on platform ID */
+    switch (osvi.dwPlatformId) {
     case VER_PLATFORM_WIN32_NT:
-      /* Unicode supported on NT only */
-      fReturn = TRUE;
-      break;
+        /* Unicode supported on NT only */
+        fReturn = TRUE;
+        break;
 
     case VER_PLATFORM_WIN32_WINDOWS:
-      /* Unicode is not supported on non-NT */
-      fReturn = FALSE;
-      break;
+        /* Unicode is not supported on non-NT */
+        fReturn = FALSE;
+        break;
     }
 
-  return fReturn;
+    return fReturn;
 }
diff --git a/xorg-server/hw/xwin/winclipboardwndproc.c b/xorg-server/hw/xwin/winclipboardwndproc.c
index 02347ff43..78b061517 100644
--- a/xorg-server/hw/xwin/winclipboardwndproc.c
+++ b/xorg-server/hw/xwin/winclipboardwndproc.c
@@ -44,527 +44,483 @@
 
 #define WIN_POLL_TIMEOUT	1
 
-
 /*
  * References to external symbols
  */
 
-extern Bool		g_fUseUnicode;
-extern Bool		g_fUnicodeSupport;
-extern void		*g_pClipboardDisplay;
-extern Window		g_iClipboardWindow;
-extern Atom		g_atomLastOwnedSelection;
-
+extern Bool g_fUseUnicode;
+extern Bool g_fUnicodeSupport;
+extern void *g_pClipboardDisplay;
+extern Window g_iClipboardWindow;
+extern Atom g_atomLastOwnedSelection;
 
 /* 
  * Local function prototypes
  */
 
 static int
-winProcessXEventsTimeout (HWND hwnd, int iWindow, Display *pDisplay,
-			  Bool fUseUnicode, int iTimeoutSec);
 
+winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
+                         Bool fUseUnicode, int iTimeoutSec);
 
 /*
  * Process X events up to specified timeout
  */
 
 static int
-winProcessXEventsTimeout (HWND hwnd, int iWindow, Display *pDisplay,
-			  Bool fUseUnicode, int iTimeoutSec)
+winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
+                         Bool fUseUnicode, int iTimeoutSec)
 {
-  int			iConnNumber;
-  struct timeval	tv;
-  int			iReturn;
-  DWORD			dwStopTime = (GetTickCount () / 1000) + iTimeoutSec;
-
-  /* We need to ensure that all pending events are processed */
-  XSync (pDisplay, FALSE);
-
-  /* Get our connection number */
-  iConnNumber = ConnectionNumber (pDisplay);
-
-  /* Loop for X events */
-  while (1)
-    {
-      fd_set		fdsRead;
-
-      /* Setup the file descriptor set */
-      FD_ZERO (&fdsRead);
-      FD_SET (iConnNumber, &fdsRead);
-
-      /* Adjust timeout */
-      tv.tv_sec = dwStopTime - (GetTickCount () / 1000);
-      tv.tv_usec = 0;
-
-      /* Break out if no time left */
-      if (tv.tv_sec < 0)
-	return WIN_XEVENTS_SUCCESS;
-
-      /* Wait for an X event */
-      iReturn = select (iConnNumber + 1,/* Highest fds number */
-			&fdsRead,	/* Read mask */
-			NULL,		/* No write mask */
-			NULL,		/* No exception mask */
-			&tv);		/* No timeout */
-      if (iReturn < 0)
-	{
-	  ErrorF ("winProcessXEventsTimeout - Call to select () failed: %d.  "
-		  "Bailing.\n", iReturn);
-	  break;
-	}
-
-      /* Branch on which descriptor became active */
-      if (FD_ISSET (iConnNumber, &fdsRead))
-	{
-	  /* Process X events */
-	  /* Exit when we see that server is shutting down */
-	  iReturn = winClipboardFlushXEvents (hwnd,
-					      iWindow,
-					      pDisplay,
-					      fUseUnicode);
-	  if (WIN_XEVENTS_NOTIFY == iReturn)
-	    {
-	      /* Bail out if notify processed */
-	      return iReturn;
-	    }
-	}
+    int iConnNumber;
+    struct timeval tv;
+    int iReturn;
+    DWORD dwStopTime = (GetTickCount() / 1000) + iTimeoutSec;
+
+    /* We need to ensure that all pending events are processed */
+    XSync(pDisplay, FALSE);
+
+    /* Get our connection number */
+    iConnNumber = ConnectionNumber(pDisplay);
+
+    /* Loop for X events */
+    while (1) {
+        fd_set fdsRead;
+
+        /* Setup the file descriptor set */
+        FD_ZERO(&fdsRead);
+        FD_SET(iConnNumber, &fdsRead);
+
+        /* Adjust timeout */
+        tv.tv_sec = dwStopTime - (GetTickCount() / 1000);
+        tv.tv_usec = 0;
+
+        /* Break out if no time left */
+        if (tv.tv_sec < 0)
+            return WIN_XEVENTS_SUCCESS;
+
+        /* Wait for an X event */
+        iReturn = select(iConnNumber + 1,       /* Highest fds number */
+                         &fdsRead,      /* Read mask */
+                         NULL,  /* No write mask */
+                         NULL,  /* No exception mask */
+                         &tv);  /* No timeout */
+        if (iReturn < 0) {
+            ErrorF("winProcessXEventsTimeout - Call to select () failed: %d.  "
+                   "Bailing.\n", iReturn);
+            break;
+        }
+
+        /* Branch on which descriptor became active */
+        if (FD_ISSET(iConnNumber, &fdsRead)) {
+            /* Process X events */
+            /* Exit when we see that server is shutting down */
+            iReturn = winClipboardFlushXEvents(hwnd,
+                                               iWindow, pDisplay, fUseUnicode);
+            if (WIN_XEVENTS_NOTIFY == iReturn) {
+                /* Bail out if notify processed */
+                return iReturn;
+            }
+        }
     }
 
-  return WIN_XEVENTS_SUCCESS;
+    return WIN_XEVENTS_SUCCESS;
 }
 
-
 /*
  * Process a given Windows message
  */
 
 LRESULT CALLBACK
-winClipboardWindowProc (HWND hwnd, UINT message, 
-			WPARAM wParam, LPARAM lParam)
+winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  static HWND		s_hwndNextViewer;
-  static Bool		s_fCBCInitialized;
+    static HWND s_hwndNextViewer;
+    static Bool s_fCBCInitialized;
 
-  /* Branch on message type */
-  switch (message)
-    {
+    /* Branch on message type */
+    switch (message) {
     case WM_DESTROY:
-      {
-	winDebug ("winClipboardWindowProc - WM_DESTROY\n");
+    {
+        winDebug("winClipboardWindowProc - WM_DESTROY\n");
 
-	/* Remove ourselves from the clipboard chain */
-	ChangeClipboardChain (hwnd, s_hwndNextViewer);
-	
-	s_hwndNextViewer = NULL;
+        /* Remove ourselves from the clipboard chain */
+        ChangeClipboardChain(hwnd, s_hwndNextViewer);
 
-	PostQuitMessage (0);
-      }
-      return 0;
+        s_hwndNextViewer = NULL;
 
+        PostQuitMessage(0);
+    }
+        return 0;
 
     case WM_CREATE:
-      {
-	HWND first, next;
-	DWORD error_code = 0;
-	winDebug ("winClipboardWindowProc - WM_CREATE\n");
-	
-	first = GetClipboardViewer();			/* Get handle to first viewer in chain. */
-	if (first == hwnd) return 0;			/* Make sure it's not us! */
-	/* Add ourselves to the clipboard viewer chain */
-	next = SetClipboardViewer (hwnd);
-	error_code = GetLastError();
-	if (SUCCEEDED(error_code) && (next == first))	/* SetClipboardViewer must have succeeded, and the handle */
-		s_hwndNextViewer = next;		/* it returned must have been the first window in the chain */
-	else
-		s_fCBCInitialized = FALSE;
-      }
-      return 0;
-
+    {
+        HWND first, next;
+        DWORD error_code = 0;
+
+        winDebug("winClipboardWindowProc - WM_CREATE\n");
+
+        first = GetClipboardViewer();   /* Get handle to first viewer in chain. */
+        if (first == hwnd)
+            return 0;           /* Make sure it's not us! */
+        /* Add ourselves to the clipboard viewer chain */
+        next = SetClipboardViewer(hwnd);
+        error_code = GetLastError();
+        if (SUCCEEDED(error_code) && (next == first))   /* SetClipboardViewer must have succeeded, and the handle */
+            s_hwndNextViewer = next;    /* it returned must have been the first window in the chain */
+        else
+            s_fCBCInitialized = FALSE;
+    }
+        return 0;
 
     case WM_CHANGECBCHAIN:
-      {
-	winDebug ("winClipboardWindowProc - WM_CHANGECBCHAIN: wParam(%x) "
-		  "lParam(%x) s_hwndNextViewer(%x)\n", 
-		  wParam, lParam, s_hwndNextViewer);
-
-	if ((HWND) wParam == s_hwndNextViewer)
-	  {
-	    s_hwndNextViewer = (HWND) lParam;
-	    if (s_hwndNextViewer == hwnd)
-	      {
-		s_hwndNextViewer = NULL;
-		winErrorFVerb (1, "winClipboardWindowProc - WM_CHANGECBCHAIN: "
-			       "attempted to set next window to ourselves.");
-	      }
-	  }
-	else if (s_hwndNextViewer)
-	  SendMessage (s_hwndNextViewer, message,
-		       wParam, lParam);
-
-      }
-      winDebug ("winClipboardWindowProc - WM_CHANGECBCHAIN: Exit\n");
-      return 0;
+    {
+        winDebug("winClipboardWindowProc - WM_CHANGECBCHAIN: wParam(%x) "
+                 "lParam(%x) s_hwndNextViewer(%x)\n",
+                 wParam, lParam, s_hwndNextViewer);
+
+        if ((HWND) wParam == s_hwndNextViewer) {
+            s_hwndNextViewer = (HWND) lParam;
+            if (s_hwndNextViewer == hwnd) {
+                s_hwndNextViewer = NULL;
+                winErrorFVerb(1, "winClipboardWindowProc - WM_CHANGECBCHAIN: "
+                              "attempted to set next window to ourselves.");
+            }
+        }
+        else if (s_hwndNextViewer)
+            SendMessage(s_hwndNextViewer, message, wParam, lParam);
+
+    }
+        winDebug("winClipboardWindowProc - WM_CHANGECBCHAIN: Exit\n");
+        return 0;
 
     case WM_WM_REINIT:
-      {
+    {
         /* Ensure that we're in the clipboard chain.  Some apps,
          * WinXP's remote desktop for one, don't play nice with the
          * chain.  This message is called whenever we receive a
          * WM_ACTIVATEAPP message to ensure that we continue to
          * receive clipboard messages.
-	 *
-	 * It might be possible to detect if we're still in the chain
-	 * by calling SendMessage (GetClipboardViewer(),
-	 * WM_DRAWCLIPBOARD, 0, 0); and then seeing if we get the
-	 * WM_DRAWCLIPBOARD message.  That, however, might be more
-	 * expensive than just putting ourselves back into the chain.
-	 */
-
-	HWND first, next;
-	DWORD error_code = 0;
-	winDebug ("winClipboardWindowProc - WM_WM_REINIT: Enter\n");
-
-	first = GetClipboardViewer();			/* Get handle to first viewer in chain. */
-	if (first == hwnd) return 0;			/* Make sure it's not us! */
-	winDebug ("  WM_WM_REINIT: Replacing us(%x) with %x at head "
-		  "of chain\n", hwnd, s_hwndNextViewer);
-	s_fCBCInitialized = FALSE;
-	ChangeClipboardChain (hwnd, s_hwndNextViewer);
-	s_hwndNextViewer = NULL;
-	s_fCBCInitialized = FALSE;
-	winDebug ("  WM_WM_REINIT: Putting us back at head of chain.\n");
-	first = GetClipboardViewer();			/* Get handle to first viewer in chain. */
-	if (first == hwnd) return 0;			/* Make sure it's not us! */
-	next = SetClipboardViewer (hwnd);
-	error_code = GetLastError();
-	if (SUCCEEDED(error_code) && (next == first))	/* SetClipboardViewer must have succeeded, and the handle */
-		s_hwndNextViewer = next;		/* it returned must have been the first window in the chain */
-	else
-		s_fCBCInitialized = FALSE;
-      }
-      winDebug ("winClipboardWindowProc - WM_WM_REINIT: Exit\n");
-      return 0;
-
+         *
+         * It might be possible to detect if we're still in the chain
+         * by calling SendMessage (GetClipboardViewer(),
+         * WM_DRAWCLIPBOARD, 0, 0); and then seeing if we get the
+         * WM_DRAWCLIPBOARD message.  That, however, might be more
+         * expensive than just putting ourselves back into the chain.
+         */
+
+        HWND first, next;
+        DWORD error_code = 0;
+
+        winDebug("winClipboardWindowProc - WM_WM_REINIT: Enter\n");
+
+        first = GetClipboardViewer();   /* Get handle to first viewer in chain. */
+        if (first == hwnd)
+            return 0;           /* Make sure it's not us! */
+        winDebug("  WM_WM_REINIT: Replacing us(%x) with %x at head "
+                 "of chain\n", hwnd, s_hwndNextViewer);
+        s_fCBCInitialized = FALSE;
+        ChangeClipboardChain(hwnd, s_hwndNextViewer);
+        s_hwndNextViewer = NULL;
+        s_fCBCInitialized = FALSE;
+        winDebug("  WM_WM_REINIT: Putting us back at head of chain.\n");
+        first = GetClipboardViewer();   /* Get handle to first viewer in chain. */
+        if (first == hwnd)
+            return 0;           /* Make sure it's not us! */
+        next = SetClipboardViewer(hwnd);
+        error_code = GetLastError();
+        if (SUCCEEDED(error_code) && (next == first))   /* SetClipboardViewer must have succeeded, and the handle */
+            s_hwndNextViewer = next;    /* it returned must have been the first window in the chain */
+        else
+            s_fCBCInitialized = FALSE;
+    }
+        winDebug("winClipboardWindowProc - WM_WM_REINIT: Exit\n");
+        return 0;
 
     case WM_DRAWCLIPBOARD:
-      {
-	static Atom atomClipboard;
-	static int generation;
-	static Bool s_fProcessingDrawClipboard = FALSE;
-	Display	*pDisplay = g_pClipboardDisplay;
-	Window	iWindow = g_iClipboardWindow;
-	int	iReturn;
-
-	winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Enter\n");
-
-	if (generation != serverGeneration)
-          {
+    {
+        static Atom atomClipboard;
+        static int generation;
+        static Bool s_fProcessingDrawClipboard = FALSE;
+        Display *pDisplay = g_pClipboardDisplay;
+        Window iWindow = g_iClipboardWindow;
+        int iReturn;
+
+        winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Enter\n");
+
+        if (generation != serverGeneration) {
             generation = serverGeneration;
-            atomClipboard = XInternAtom (pDisplay, "CLIPBOARD", False);
-          }
-
-	/*
-	 * We've occasionally seen a loop in the clipboard chain.
-	 * Try and fix it on the first hint of recursion.
-	 */
-	if (! s_fProcessingDrawClipboard) 
-	  {
-	    s_fProcessingDrawClipboard = TRUE;
-	  }
-	else
-	  {
-	    /* Attempt to break the nesting by getting out of the chain, twice?, and then fix and bail */
-	    s_fCBCInitialized = FALSE;
-	    ChangeClipboardChain (hwnd, s_hwndNextViewer);
-	    winFixClipboardChain();
-	    winErrorFVerb (1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-			   "Nested calls detected.  Re-initing.\n");
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-	    s_fProcessingDrawClipboard = FALSE;
-	    return 0;
-	  }
-
-	/* Bail on first message */
-	if (!s_fCBCInitialized)
-	  {
-	    s_fCBCInitialized = TRUE;
-	    s_fProcessingDrawClipboard = FALSE;
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-	    return 0;
-	  }
-
-	/*
-	 * NOTE: We cannot bail out when NULL == GetClipboardOwner ()
-	 * because some applications deal with the clipboard in a manner
-	 * that causes the clipboard owner to be NULL when they are in
-	 * fact taking ownership.  One example of this is the Win32
-	 * native compile of emacs.
-	 */
-	
-	/* Bail when we still own the clipboard */
-	if (hwnd == GetClipboardOwner ())
-	  {
-
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "We own the clipboard, returning.\n");
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-	    s_fProcessingDrawClipboard = FALSE;
-	    if (s_hwndNextViewer)
-		SendMessage (s_hwndNextViewer, message, wParam, lParam);
-	    return 0;
-	  }
-
-	/*
-	 * Do not take ownership of the X11 selections when something
-	 * other than CF_TEXT or CF_UNICODETEXT has been copied
-	 * into the Win32 clipboard.
-	 */
-	if (!IsClipboardFormatAvailable (CF_TEXT)
-	    && !IsClipboardFormatAvailable (CF_UNICODETEXT))
-	  {
-
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "Clipboard does not contain CF_TEXT nor "
-		    "CF_UNICODETEXT.\n");
-
-	    /*
-	     * We need to make sure that the X Server has processed
-	     * previous XSetSelectionOwner messages.
-	     */
-	    XSync (pDisplay, FALSE);
+            atomClipboard = XInternAtom(pDisplay, "CLIPBOARD", False);
+        }
+
+        /*
+         * We've occasionally seen a loop in the clipboard chain.
+         * Try and fix it on the first hint of recursion.
+         */
+        if (!s_fProcessingDrawClipboard) {
+            s_fProcessingDrawClipboard = TRUE;
+        }
+        else {
+            /* Attempt to break the nesting by getting out of the chain, twice?, and then fix and bail */
+            s_fCBCInitialized = FALSE;
+            ChangeClipboardChain(hwnd, s_hwndNextViewer);
+            winFixClipboardChain();
+            winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                          "Nested calls detected.  Re-initing.\n");
+            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
+            s_fProcessingDrawClipboard = FALSE;
+            return 0;
+        }
+
+        /* Bail on first message */
+        if (!s_fCBCInitialized) {
+            s_fCBCInitialized = TRUE;
+            s_fProcessingDrawClipboard = FALSE;
+            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
+            return 0;
+        }
+
+        /*
+         * NOTE: We cannot bail out when NULL == GetClipboardOwner ()
+         * because some applications deal with the clipboard in a manner
+         * that causes the clipboard owner to be NULL when they are in
+         * fact taking ownership.  One example of this is the Win32
+         * native compile of emacs.
+         */
+
+        /* Bail when we still own the clipboard */
+        if (hwnd == GetClipboardOwner()) {
+
+            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                     "We own the clipboard, returning.\n");
+            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
+            s_fProcessingDrawClipboard = FALSE;
+            if (s_hwndNextViewer)
+                SendMessage(s_hwndNextViewer, message, wParam, lParam);
+            return 0;
+        }
+
+        /*
+         * Do not take ownership of the X11 selections when something
+         * other than CF_TEXT or CF_UNICODETEXT has been copied
+         * into the Win32 clipboard.
+         */
+        if (!IsClipboardFormatAvailable(CF_TEXT)
+            && !IsClipboardFormatAvailable(CF_UNICODETEXT)) {
+
+            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                     "Clipboard does not contain CF_TEXT nor "
+                     "CF_UNICODETEXT.\n");
+
+            /*
+             * We need to make sure that the X Server has processed
+             * previous XSetSelectionOwner messages.
+             */
+            XSync(pDisplay, FALSE);
 
             winDebug("winClipboardWindowProc - XSync done.\n");
-	    
-	    /* Release PRIMARY selection if owned */
-	    iReturn = XGetSelectionOwner (pDisplay, XA_PRIMARY);
-	    if (iReturn == g_iClipboardWindow)
-	      {
-		winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-			"PRIMARY selection is owned by us.\n");
-		XSetSelectionOwner (pDisplay,
-				    XA_PRIMARY,
-				    None,
-				    CurrentTime);
-	      }
-	    else if (BadWindow == iReturn || BadAtom == iReturn)
-	      winErrorFVerb (1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		      "XGetSelection failed for PRIMARY: %d\n", iReturn);
-
-	    /* Release CLIPBOARD selection if owned */
-	    iReturn = XGetSelectionOwner (pDisplay,
-					  atomClipboard);
-	    if (iReturn == g_iClipboardWindow)
-	      {
-		winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-			"CLIPBOARD selection is owned by us.\n");
-		XSetSelectionOwner (pDisplay,
-				    atomClipboard,
-				    None,
-				    CurrentTime);
-	      }
-	    else if (BadWindow == iReturn || BadAtom == iReturn)
-	      winErrorFVerb (1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		      "XGetSelection failed for CLIPBOARD: %d\n", iReturn);
-
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-	    s_fProcessingDrawClipboard = FALSE;
-	    if (s_hwndNextViewer)
-		SendMessage (s_hwndNextViewer, message, wParam, lParam);
-	    return 0;
-	  }
-
-	/* Reassert ownership of PRIMARY */	  
-	iReturn = XSetSelectionOwner (pDisplay,
-				      XA_PRIMARY,
-				      iWindow,
-				      CurrentTime);
-	if (iReturn == BadAtom || iReturn == BadWindow ||
-	    XGetSelectionOwner (pDisplay, XA_PRIMARY) != iWindow)
-	  {
-	    winErrorFVerb (1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "Could not reassert ownership of PRIMARY\n");
-	  }
-	else
-	  {
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "Reasserted ownership of PRIMARY\n");
-	  }
-	
-	/* Reassert ownership of the CLIPBOARD */	  
-	iReturn = XSetSelectionOwner (pDisplay,
-				      atomClipboard,
-				      iWindow,
-				      CurrentTime);
-
-	if (iReturn == BadAtom || iReturn == BadWindow ||
-	    XGetSelectionOwner (pDisplay, atomClipboard) != iWindow)
-	  {
-	    winErrorFVerb (1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "Could not reassert ownership of CLIPBOARD\n");
-	  }
-	else
-	  {
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "Reasserted ownership of CLIPBOARD\n");
-	  }
-	
-	/* Flush the pending SetSelectionOwner event now */
-	XFlush (pDisplay);
-
-	s_fProcessingDrawClipboard = FALSE;
-      }
-      winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-      /* Pass the message on the next window in the clipboard viewer chain */
-      if (s_hwndNextViewer)
-	SendMessage (s_hwndNextViewer, message, wParam, lParam);
-      return 0;
 
+            /* Release PRIMARY selection if owned */
+            iReturn = XGetSelectionOwner(pDisplay, XA_PRIMARY);
+            if (iReturn == g_iClipboardWindow) {
+                winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                         "PRIMARY selection is owned by us.\n");
+                XSetSelectionOwner(pDisplay, XA_PRIMARY, None, CurrentTime);
+            }
+            else if (BadWindow == iReturn || BadAtom == iReturn)
+                winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                              "XGetSelection failed for PRIMARY: %d\n",
+                              iReturn);
+
+            /* Release CLIPBOARD selection if owned */
+            iReturn = XGetSelectionOwner(pDisplay, atomClipboard);
+            if (iReturn == g_iClipboardWindow) {
+                winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                         "CLIPBOARD selection is owned by us.\n");
+                XSetSelectionOwner(pDisplay, atomClipboard, None, CurrentTime);
+            }
+            else if (BadWindow == iReturn || BadAtom == iReturn)
+                winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                              "XGetSelection failed for CLIPBOARD: %d\n",
+                              iReturn);
+
+            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
+            s_fProcessingDrawClipboard = FALSE;
+            if (s_hwndNextViewer)
+                SendMessage(s_hwndNextViewer, message, wParam, lParam);
+            return 0;
+        }
+
+        /* Reassert ownership of PRIMARY */
+        iReturn = XSetSelectionOwner(pDisplay,
+                                     XA_PRIMARY, iWindow, CurrentTime);
+        if (iReturn == BadAtom || iReturn == BadWindow ||
+            XGetSelectionOwner(pDisplay, XA_PRIMARY) != iWindow) {
+            winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                          "Could not reassert ownership of PRIMARY\n");
+        }
+        else {
+            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                     "Reasserted ownership of PRIMARY\n");
+        }
+
+        /* Reassert ownership of the CLIPBOARD */
+        iReturn = XSetSelectionOwner(pDisplay,
+                                     atomClipboard, iWindow, CurrentTime);
+
+        if (iReturn == BadAtom || iReturn == BadWindow ||
+            XGetSelectionOwner(pDisplay, atomClipboard) != iWindow) {
+            winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                          "Could not reassert ownership of CLIPBOARD\n");
+        }
+        else {
+            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                     "Reasserted ownership of CLIPBOARD\n");
+        }
+
+        /* Flush the pending SetSelectionOwner event now */
+        XFlush(pDisplay);
+
+        s_fProcessingDrawClipboard = FALSE;
+    }
+        winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
+        /* Pass the message on the next window in the clipboard viewer chain */
+        if (s_hwndNextViewer)
+            SendMessage(s_hwndNextViewer, message, wParam, lParam);
+        return 0;
 
     case WM_DESTROYCLIPBOARD:
-      /*
-       * NOTE: Intentionally do nothing.
-       * Changes in the Win32 clipboard are handled by WM_DRAWCLIPBOARD
-       * above.  We only process this message to conform to the specs
-       * for delayed clipboard rendering in Win32.  You might think
-       * that we need to release ownership of the X11 selections, but
-       * we do not, because a WM_DRAWCLIPBOARD message will closely
-       * follow this message and reassert ownership of the X11
-       * selections, handling the issue for us.
-       */
-      winDebug ("winClipboardWindowProc - WM_DESTROYCLIPBOARD - Ignored.\n");
-      return 0;
+        /*
+         * NOTE: Intentionally do nothing.
+         * Changes in the Win32 clipboard are handled by WM_DRAWCLIPBOARD
+         * above.  We only process this message to conform to the specs
+         * for delayed clipboard rendering in Win32.  You might think
+         * that we need to release ownership of the X11 selections, but
+         * we do not, because a WM_DRAWCLIPBOARD message will closely
+         * follow this message and reassert ownership of the X11
+         * selections, handling the issue for us.
+         */
+        winDebug("winClipboardWindowProc - WM_DESTROYCLIPBOARD - Ignored.\n");
+        return 0;
 
     case WM_RENDERFORMAT:
     case WM_RENDERALLFORMATS:
-      {
-	int	iReturn;
-	Display *pDisplay = g_pClipboardDisplay;
-	Window	iWindow = g_iClipboardWindow;
-	Bool	fConvertToUnicode;
-
-	winDebug ("winClipboardWindowProc - WM_RENDER*FORMAT - Hello.\n");
-
-	/* Flag whether to convert to Unicode or not */
-	if (message == WM_RENDERALLFORMATS)
-	  fConvertToUnicode = FALSE;
-	else
-	  fConvertToUnicode = g_fUnicodeSupport && (CF_UNICODETEXT == wParam);
-
-	/* Request the selection contents */
-	iReturn = XConvertSelection (pDisplay,
-				     g_atomLastOwnedSelection,
-				     XInternAtom (pDisplay,
-						  "COMPOUND_TEXT", False),
-				     XInternAtom (pDisplay,
-						  "CYGX_CUT_BUFFER", False),
-				     iWindow,
-				     CurrentTime);
-	if (iReturn == BadAtom || iReturn == BadWindow)
-	  {
-	    winErrorFVerb (1, "winClipboardWindowProc - WM_RENDER*FORMAT - "
-		    "XConvertSelection () failed\n");
-	    break;
-	  }
-
-	/* Special handling for WM_RENDERALLFORMATS */
-	if (message == WM_RENDERALLFORMATS)
-	  {
-	    /* We must open and empty the clipboard */
-
-	    /* Close clipboard if we have it open already */
-	    if (GetOpenClipboardWindow () == hwnd)
-	      {
-		CloseClipboard ();
-	      }	    
-
-	    if (!OpenClipboard (hwnd))
-	      {
-		winErrorFVerb (1, "winClipboardWindowProc - WM_RENDER*FORMATS - "
-			"OpenClipboard () failed: %08x\n",
-			GetLastError ());
-		break;
-	      }
-	    
-	    if (!EmptyClipboard ())
-	      {
-		winErrorFVerb (1, "winClipboardWindowProc - WM_RENDER*FORMATS - "
-			"EmptyClipboard () failed: %08x\n",
-		      GetLastError ());
-		break;
-	      }
-	  }
-
-	/* Process the SelectionNotify event */
-	iReturn = winProcessXEventsTimeout (hwnd,
-					    iWindow,
-					    pDisplay,
-					    fConvertToUnicode,
-					    WIN_POLL_TIMEOUT);
-
-	/*
-	 * The last call to winProcessXEventsTimeout
-	 * from above had better have seen a notify event, or else we
-	 * are dealing with a buggy or old X11 app.  In these cases we
-	 * have to paste some fake data to the Win32 clipboard to
-	 * satisfy the requirement that we write something to it.
-	 */
-	if (WIN_XEVENTS_NOTIFY != iReturn)
-	  {
-	    /* Paste no data, to satisfy required call to SetClipboardData */
-	    if (g_fUnicodeSupport)
-	      SetClipboardData (CF_UNICODETEXT, NULL);
-	    SetClipboardData (CF_TEXT, NULL);
-
-            ErrorF("winClipboardWindowProc - timed out waiting for WIN_XEVENTS_NOTIFY\n");
-	  }
-
-	/* Special handling for WM_RENDERALLFORMATS */
-	if (message == WM_RENDERALLFORMATS)
-	  {
-	    /* We must close the clipboard */
-	    
-	    if (!CloseClipboard ())
-	      {
-	      winErrorFVerb (1, "winClipboardWindowProc - WM_RENDERALLFORMATS - "
-		      "CloseClipboard () failed: %08x\n",
-		      GetLastError ());
-	      break;
-	      }
-	  }
-
-	winDebug ("winClipboardWindowProc - WM_RENDER*FORMAT - Returning.\n");
-	return 0;
-      }
+    {
+        int iReturn;
+        Display *pDisplay = g_pClipboardDisplay;
+        Window iWindow = g_iClipboardWindow;
+        Bool fConvertToUnicode;
+
+        winDebug("winClipboardWindowProc - WM_RENDER*FORMAT - Hello.\n");
+
+        /* Flag whether to convert to Unicode or not */
+        if (message == WM_RENDERALLFORMATS)
+            fConvertToUnicode = FALSE;
+        else
+            fConvertToUnicode = g_fUnicodeSupport && (CF_UNICODETEXT == wParam);
+
+        /* Request the selection contents */
+        iReturn = XConvertSelection(pDisplay,
+                                    g_atomLastOwnedSelection,
+                                    XInternAtom(pDisplay,
+                                                "COMPOUND_TEXT", False),
+                                    XInternAtom(pDisplay,
+                                                "CYGX_CUT_BUFFER", False),
+                                    iWindow, CurrentTime);
+        if (iReturn == BadAtom || iReturn == BadWindow) {
+            winErrorFVerb(1, "winClipboardWindowProc - WM_RENDER*FORMAT - "
+                          "XConvertSelection () failed\n");
+            break;
+        }
+
+        /* Special handling for WM_RENDERALLFORMATS */
+        if (message == WM_RENDERALLFORMATS) {
+            /* We must open and empty the clipboard */
+
+            /* Close clipboard if we have it open already */
+            if (GetOpenClipboardWindow() == hwnd) {
+                CloseClipboard();
+            }
+
+            if (!OpenClipboard(hwnd)) {
+                winErrorFVerb(1, "winClipboardWindowProc - WM_RENDER*FORMATS - "
+                              "OpenClipboard () failed: %08x\n",
+                              GetLastError());
+                break;
+            }
+
+            if (!EmptyClipboard()) {
+                winErrorFVerb(1, "winClipboardWindowProc - WM_RENDER*FORMATS - "
+                              "EmptyClipboard () failed: %08x\n",
+                              GetLastError());
+                break;
+            }
+        }
+
+        /* Process the SelectionNotify event */
+        iReturn = winProcessXEventsTimeout(hwnd,
+                                           iWindow,
+                                           pDisplay,
+                                           fConvertToUnicode, WIN_POLL_TIMEOUT);
+
+        /*
+         * The last call to winProcessXEventsTimeout
+         * from above had better have seen a notify event, or else we
+         * are dealing with a buggy or old X11 app.  In these cases we
+         * have to paste some fake data to the Win32 clipboard to
+         * satisfy the requirement that we write something to it.
+         */
+        if (WIN_XEVENTS_NOTIFY != iReturn) {
+            /* Paste no data, to satisfy required call to SetClipboardData */
+            if (g_fUnicodeSupport)
+                SetClipboardData(CF_UNICODETEXT, NULL);
+            SetClipboardData(CF_TEXT, NULL);
+
+            ErrorF
+                ("winClipboardWindowProc - timed out waiting for WIN_XEVENTS_NOTIFY\n");
+        }
+
+        /* Special handling for WM_RENDERALLFORMATS */
+        if (message == WM_RENDERALLFORMATS) {
+            /* We must close the clipboard */
+
+            if (!CloseClipboard()) {
+                winErrorFVerb(1,
+                              "winClipboardWindowProc - WM_RENDERALLFORMATS - "
+                              "CloseClipboard () failed: %08x\n",
+                              GetLastError());
+                break;
+            }
+        }
+
+        winDebug("winClipboardWindowProc - WM_RENDER*FORMAT - Returning.\n");
+        return 0;
+    }
     }
 
-  /* Let Windows perform default processing for unhandled messages */
-  return DefWindowProc (hwnd, message, wParam, lParam);
+    /* Let Windows perform default processing for unhandled messages */
+    return DefWindowProc(hwnd, message, wParam, lParam);
 }
 
-
 /*
  * Process any pending Windows messages
  */
 
 BOOL
-winClipboardFlushWindowsMessageQueue (HWND hwnd)
+winClipboardFlushWindowsMessageQueue(HWND hwnd)
 {
-  MSG			msg;
-
-  /* Flush the messaging window queue */
-  /* NOTE: Do not pass the hwnd of our messaging window to PeekMessage,
-   * as this will filter out many non-window-specific messages that
-   * are sent to our thread, such as WM_QUIT.
-   */
-  while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
-    {
-      /* Dispatch the message if not WM_QUIT */
-      if (msg.message == WM_QUIT)
-	return FALSE;
-      else
-	DispatchMessage (&msg);
+    MSG msg;
+
+    /* Flush the messaging window queue */
+    /* NOTE: Do not pass the hwnd of our messaging window to PeekMessage,
+     * as this will filter out many non-window-specific messages that
+     * are sent to our thread, such as WM_QUIT.
+     */
+    while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+        /* Dispatch the message if not WM_QUIT */
+        if (msg.message == WM_QUIT)
+            return FALSE;
+        else
+            DispatchMessage(&msg);
     }
-  
-  return TRUE;
+
+    return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winclipboardwrappers.c b/xorg-server/hw/xwin/winclipboardwrappers.c
index ec6e95a8a..53b419ea0 100644
--- a/xorg-server/hw/xwin/winclipboardwrappers.c
+++ b/xorg-server/hw/xwin/winclipboardwrappers.c
@@ -37,7 +37,6 @@
 #include "dixstruct.h"
 #include <X11/Xatom.h>
 
-
 /*
  * Constants
  */
@@ -46,38 +45,36 @@
 #define CLIP_OWN_PRIMARY		0
 #define CLIP_OWN_CLIPBOARD		1
 
-
 /*
  * Local function prototypes
  */
 
-int winProcEstablishConnection(ClientPtr /* client */);
-int winProcQueryTree(ClientPtr /* client */);
-int winProcSetSelectionOwner(ClientPtr /* client */);
+int winProcEstablishConnection(ClientPtr /* client */ );
+int winProcQueryTree(ClientPtr /* client */ );
+int winProcSetSelectionOwner(ClientPtr /* client */ );
+
 DISPATCH_PROC(winProcEstablishConnection);
 DISPATCH_PROC(winProcSetSelectionOwner);
 
-
 /*
  * References to external symbols
  */
 
-extern Bool		g_fUnicodeSupport;
-extern int		g_iNumScreens;
-extern unsigned int	g_uiAuthDataLen;
-extern char		*g_pAuthData;
-extern Bool		g_fXdmcpEnabled;
-extern Bool		g_fClipboardLaunched;
-extern Bool		g_fClipboardStarted;
-extern Bool		g_fClipboard;
-extern Window		g_iClipboardWindow;
-extern Atom		g_atomLastOwnedSelection;
-extern HWND		g_hwndClipboard;
-
-extern winDispatchProcPtr	winProcEstablishConnectionOrig;
-extern winDispatchProcPtr	winProcQueryTreeOrig;
-extern winDispatchProcPtr	winProcSetSelectionOwnerOrig;
-
+extern Bool g_fUnicodeSupport;
+extern int g_iNumScreens;
+extern unsigned int g_uiAuthDataLen;
+extern char *g_pAuthData;
+extern Bool g_fXdmcpEnabled;
+extern Bool g_fClipboardLaunched;
+extern Bool g_fClipboardStarted;
+extern Bool g_fClipboard;
+extern Window g_iClipboardWindow;
+extern Atom g_atomLastOwnedSelection;
+extern HWND g_hwndClipboard;
+
+extern winDispatchProcPtr winProcEstablishConnectionOrig;
+extern winDispatchProcPtr winProcQueryTreeOrig;
+extern winDispatchProcPtr winProcSetSelectionOwnerOrig;
 
 /*
  * Wrapper for internal EstablishConnection function.
@@ -86,109 +83,103 @@ extern winDispatchProcPtr	winProcSetSelectionOwnerOrig;
  */
 
 int
-winProcEstablishConnection (ClientPtr client)
+winProcEstablishConnection(ClientPtr client)
 {
-  int			iReturn;
-  static int		s_iCallCount = 0;
-  static unsigned long	s_ulServerGeneration = 0;
-
-  if (s_iCallCount == 0) ErrorF ("winProcEstablishConnection - Hello\n");
-
-  /* Do nothing if clipboard is not enabled */
-  if (!g_fClipboard)
-    {
-      ErrorF ("winProcEstablishConnection - Clipboard is not enabled, "
-	      "returning.\n");
-      
-      /* Unwrap the original function, call it, and return */
-      InitialVector[2] = winProcEstablishConnectionOrig;
-      iReturn = (*winProcEstablishConnectionOrig) (client);
-      winProcEstablishConnectionOrig = NULL;
-      return iReturn;
+    int iReturn;
+    static int s_iCallCount = 0;
+    static unsigned long s_ulServerGeneration = 0;
+
+    if (s_iCallCount == 0)
+        ErrorF("winProcEstablishConnection - Hello\n");
+
+    /* Do nothing if clipboard is not enabled */
+    if (!g_fClipboard) {
+        ErrorF("winProcEstablishConnection - Clipboard is not enabled, "
+               "returning.\n");
+
+        /* Unwrap the original function, call it, and return */
+        InitialVector[2] = winProcEstablishConnectionOrig;
+        iReturn = (*winProcEstablishConnectionOrig) (client);
+        winProcEstablishConnectionOrig = NULL;
+        return iReturn;
     }
 
-  /* Watch for server reset */
-  if (s_ulServerGeneration != serverGeneration)
-    {
-      /* Save new generation number */
-      s_ulServerGeneration = serverGeneration;
+    /* Watch for server reset */
+    if (s_ulServerGeneration != serverGeneration) {
+        /* Save new generation number */
+        s_ulServerGeneration = serverGeneration;
 
-      /* Reset call count */
-      s_iCallCount = 0;
+        /* Reset call count */
+        s_iCallCount = 0;
     }
 
-  /* Increment call count */
-  ++s_iCallCount;
-
-  /*
-   * This procedure is only used for initialization.
-   * We can unwrap the original procedure at this point
-   * so that this function is no longer called until the
-   * server resets and the function is wrapped again.
-   */
-  InitialVector[2] = winProcEstablishConnectionOrig;
-
-  /*
-   * Call original function and bail if it fails.
-   * NOTE: We must do this first, since we need XdmcpOpenDisplay
-   * to be called before we initialize our clipboard client.
-   */
-  iReturn = (*winProcEstablishConnectionOrig) (client);
-  if (iReturn != 0)
-    {
-      ErrorF ("winProcEstablishConnection - ProcEstablishConnection "
-	      "failed, bailing.\n");
-      return iReturn;
+    /* Increment call count */
+    ++s_iCallCount;
+
+    /*
+     * This procedure is only used for initialization.
+     * We can unwrap the original procedure at this point
+     * so that this function is no longer called until the
+     * server resets and the function is wrapped again.
+     */
+    InitialVector[2] = winProcEstablishConnectionOrig;
+
+    /*
+     * Call original function and bail if it fails.
+     * NOTE: We must do this first, since we need XdmcpOpenDisplay
+     * to be called before we initialize our clipboard client.
+     */
+    iReturn = (*winProcEstablishConnectionOrig) (client);
+    if (iReturn != 0) {
+        ErrorF("winProcEstablishConnection - ProcEstablishConnection "
+               "failed, bailing.\n");
+        return iReturn;
     }
 
-  /* Clear original function pointer */
-  winProcEstablishConnectionOrig = NULL;
+    /* Clear original function pointer */
+    winProcEstablishConnectionOrig = NULL;
 
-  /* If the clipboard client has already been started, abort */
-  if (g_fClipboardLaunched)
-    {
-      ErrorF ("winProcEstablishConnection - Clipboard client already "
-	      "launched, returning.\n");
-      return iReturn;
+    /* If the clipboard client has already been started, abort */
+    if (g_fClipboardLaunched) {
+        ErrorF("winProcEstablishConnection - Clipboard client already "
+               "launched, returning.\n");
+        return iReturn;
     }
 
-  /* Startup the clipboard client if clipboard mode is being used */
-  if (g_fClipboard)
-    {
-      /*
-       * NOTE: The clipboard client is started here for a reason:
-       * 1) Assume you are using XDMCP (e.g. XWin -query %hostname%)
-       * 2) If the clipboard client attaches during X Server startup,
-       *    then it becomes the "magic client" that causes the X Server
-       *    to reset if it exits.
-       * 3) XDMCP calls KillAllClients when it starts up.
-       * 4) The clipboard client is a client, so it is killed.
-       * 5) The clipboard client is the "magic client", so the X Server
-       *    resets itself.
-       * 6) This repeats ad infinitum.
-       * 7) We avoid this by waiting until at least one client (could
-       *    be XDM, could be another client) connects, which makes it
-       *    almost certain that the clipboard client will not connect
-       *    until after XDM when using XDMCP.
-       */
-      
-      /* Create the clipboard client thread */
-      if (!winInitClipboard ())
-	{
-	  ErrorF ("winProcEstablishConnection - winClipboardInit "
-		  "failed.\n");
-	  return iReturn;
-	}
-      
-      ErrorF ("winProcEstablishConnection - winInitClipboard returned.\n");
+    /* Startup the clipboard client if clipboard mode is being used */
+    if (g_fClipboard) {
+        /*
+         * NOTE: The clipboard client is started here for a reason:
+         * 1) Assume you are using XDMCP (e.g. XWin -query %hostname%)
+         * 2) If the clipboard client attaches during X Server startup,
+         *    then it becomes the "magic client" that causes the X Server
+         *    to reset if it exits.
+         * 3) XDMCP calls KillAllClients when it starts up.
+         * 4) The clipboard client is a client, so it is killed.
+         * 5) The clipboard client is the "magic client", so the X Server
+         *    resets itself.
+         * 6) This repeats ad infinitum.
+         * 7) We avoid this by waiting until at least one client (could
+         *    be XDM, could be another client) connects, which makes it
+         *    almost certain that the clipboard client will not connect
+         *    until after XDM when using XDMCP.
+         */
+
+        /* Create the clipboard client thread */
+        if (!winInitClipboard()) {
+            ErrorF("winProcEstablishConnection - winClipboardInit "
+                   "failed.\n");
+            return iReturn;
+        }
+
+        ErrorF("winProcEstablishConnection - winInitClipboard returned.\n");
     }
-  
-  /* Flag that clipboard client has been launched */
-  g_fClipboardLaunched = TRUE;
 
-  return iReturn;
-}
+    /* Flag that clipboard client has been launched */
+    g_fClipboardLaunched = TRUE;
 
+    return iReturn;
+}
 
 /*
  * Wrapper for internal SetSelectionOwner function.
@@ -196,216 +187,198 @@ winProcEstablishConnection (ClientPtr client)
  */
 
 int
-winProcSetSelectionOwner (ClientPtr client)
+winProcSetSelectionOwner(ClientPtr client)
 {
-  int			i;
-  DrawablePtr		pDrawable;
-  WindowPtr		pWindow = None;
-  Bool			fOwnedToNotOwned = FALSE;
-  static Window		s_iOwners[CLIP_NUM_SELECTIONS] = {None};
-  static unsigned long	s_ulServerGeneration = 0;
-  REQUEST(xSetSelectionOwnerReq);
-  
-  REQUEST_SIZE_MATCH(xSetSelectionOwnerReq);
-
-  winDebug("winProcSetSelectionOwner - Hello.\n");
-
-  /* Watch for server reset */
-  if (s_ulServerGeneration != serverGeneration)
-    {
-      /* Save new generation number */
-      s_ulServerGeneration = serverGeneration;
-
-      /* Initialize static variables */
-      for (i = 0; i < CLIP_NUM_SELECTIONS; ++i)
-	s_iOwners[i] = None;
+    int i;
+    DrawablePtr pDrawable;
+    WindowPtr pWindow = None;
+    Bool fOwnedToNotOwned = FALSE;
+    static Window s_iOwners[CLIP_NUM_SELECTIONS] = { None };
+    static unsigned long s_ulServerGeneration = 0;
+
+    REQUEST(xSetSelectionOwnerReq);
+
+    REQUEST_SIZE_MATCH(xSetSelectionOwnerReq);
+
+    winDebug("winProcSetSelectionOwner - Hello.\n");
+
+    /* Watch for server reset */
+    if (s_ulServerGeneration != serverGeneration) {
+        /* Save new generation number */
+        s_ulServerGeneration = serverGeneration;
+
+        /* Initialize static variables */
+        for (i = 0; i < CLIP_NUM_SELECTIONS; ++i)
+            s_iOwners[i] = None;
     }
 
-  /* Abort if clipboard not completely initialized yet */
-  if (!g_fClipboardStarted)
-    {
-      /* ErrorF ("winProcSetSelectionOwner - Clipboard not yet started, "
-	      "aborting.\n"); */
-      goto winProcSetSelectionOwner_Done;
+    /* Abort if clipboard not completely initialized yet */
+    if (!g_fClipboardStarted) {
+        /* ErrorF ("winProcSetSelectionOwner - Clipboard not yet started, "
+           "aborting.\n"); */
+        goto winProcSetSelectionOwner_Done;
     }
-  
-  /* Grab window if we have one */
-  if (None != stuff->window)
-    {
-      /* Grab the Window from the request */
-      int rc = dixLookupWindow(&pWindow, stuff->window, client, DixReadAccess);
-      if (rc != Success) {
-	  ErrorF ("winProcSetSelectionOwner - Found BadWindow, aborting.\n");
-	  goto winProcSetSelectionOwner_Done;
-      }
+
+    /* Grab window if we have one */
+    if (None != stuff->window) {
+        /* Grab the Window from the request */
+        int rc =
+            dixLookupWindow(&pWindow, stuff->window, client, DixReadAccess);
+        if (rc != Success) {
+            ErrorF("winProcSetSelectionOwner - Found BadWindow, aborting.\n");
+            goto winProcSetSelectionOwner_Done;
+        }
     }
 
-  /* Now we either have a valid window or None */
-
-  /* Save selection owners for monitored selections, ignore other selections */
-  if (XA_PRIMARY == stuff->selection)
-    {
-      /* Look for owned -> not owned transition */
-      if (None == stuff->window
-	  && None != s_iOwners[CLIP_OWN_PRIMARY])
-	{
-	  fOwnedToNotOwned = TRUE;
-
-	  winDebug("winProcSetSelectionOwner - PRIMARY - Going from "
-		  "owned to not owned.\n");
-
-	  /* Adjust last owned selection */
-	  if (None != s_iOwners[CLIP_OWN_CLIPBOARD])
-	    g_atomLastOwnedSelection = MakeAtom ("CLIPBOARD", 9, TRUE);
-	  else
-	    g_atomLastOwnedSelection = None;
-	}
-      
-      /* Save new selection owner or None */
-      s_iOwners[CLIP_OWN_PRIMARY] = stuff->window;
-
-      winDebug("winProcSetSelectionOwner - PRIMARY - Now owned by: %d\n",
-	      stuff->window);
+    /* Now we either have a valid window or None */
+
+    /* Save selection owners for monitored selections, ignore other selections */
+    if (XA_PRIMARY == stuff->selection) {
+        /* Look for owned -> not owned transition */
+        if (None == stuff->window && None != s_iOwners[CLIP_OWN_PRIMARY]) {
+            fOwnedToNotOwned = TRUE;
+
+            winDebug("winProcSetSelectionOwner - PRIMARY - Going from "
+                     "owned to not owned.\n");
+
+            /* Adjust last owned selection */
+            if (None != s_iOwners[CLIP_OWN_CLIPBOARD])
+                g_atomLastOwnedSelection = MakeAtom("CLIPBOARD", 9, TRUE);
+            else
+                g_atomLastOwnedSelection = None;
+        }
+
+        /* Save new selection owner or None */
+        s_iOwners[CLIP_OWN_PRIMARY] = stuff->window;
+
+        winDebug("winProcSetSelectionOwner - PRIMARY - Now owned by: %d\n",
+                 stuff->window);
     }
-  else if (MakeAtom ("CLIPBOARD", 9, TRUE) == stuff->selection)
-    {
-      /* Look for owned -> not owned transition */
-      if (None == stuff->window
-	  && None != s_iOwners[CLIP_OWN_CLIPBOARD])
-	{
-	  fOwnedToNotOwned = TRUE;
-
-	  winDebug("winProcSetSelectionOwner - CLIPBOARD - Going from "
-                   "owned to not owned.\n");
-
-	  /* Adjust last owned selection */
-	  if (None != s_iOwners[CLIP_OWN_PRIMARY])
-	    g_atomLastOwnedSelection = XA_PRIMARY;
-	  else
-	    g_atomLastOwnedSelection = None;
-	}
-      
-      /* Save new selection owner or None */
-      s_iOwners[CLIP_OWN_CLIPBOARD] = stuff->window;
-
-      winDebug("winProcSetSelectionOwner - CLIPBOARD - Now owned by: %d\n",
-               stuff->window);
+    else if (MakeAtom("CLIPBOARD", 9, TRUE) == stuff->selection) {
+        /* Look for owned -> not owned transition */
+        if (None == stuff->window && None != s_iOwners[CLIP_OWN_CLIPBOARD]) {
+            fOwnedToNotOwned = TRUE;
+
+            winDebug("winProcSetSelectionOwner - CLIPBOARD - Going from "
+                     "owned to not owned.\n");
+
+            /* Adjust last owned selection */
+            if (None != s_iOwners[CLIP_OWN_PRIMARY])
+                g_atomLastOwnedSelection = XA_PRIMARY;
+            else
+                g_atomLastOwnedSelection = None;
+        }
+
+        /* Save new selection owner or None */
+        s_iOwners[CLIP_OWN_CLIPBOARD] = stuff->window;
+
+        winDebug("winProcSetSelectionOwner - CLIPBOARD - Now owned by: %d\n",
+                 stuff->window);
 
     }
-  else
-    goto winProcSetSelectionOwner_Done;
-
-  /*
-   * At this point, if one of the selections is still owned by the 
-   * clipboard manager then it should be marked as unowned since
-   * we will be taking ownership of the Win32 clipboard.
-   */
-  if (g_iClipboardWindow == s_iOwners[CLIP_OWN_PRIMARY])
-    s_iOwners[CLIP_OWN_PRIMARY] = None;
-  if (g_iClipboardWindow == s_iOwners[CLIP_OWN_CLIPBOARD])
-    s_iOwners[CLIP_OWN_CLIPBOARD] = None;
-
-  /*
-   * Handle case when selection is being disowned,
-   * WM_DRAWCLIPBOARD did not do the disowning,
-   * both monitored selections are no longer owned,
-   * an owned to not owned transition was detected,
-   * and we currently own the Win32 clipboard.
-   */
-  if (stuff->window == None
-      && s_iOwners[CLIP_OWN_PRIMARY] == None
-      && s_iOwners[CLIP_OWN_CLIPBOARD] == None
-      && fOwnedToNotOwned
-      && g_hwndClipboard != NULL
-      && g_hwndClipboard == GetClipboardOwner ())
-    {
-      winDebug("winProcSetSelectionOwner - We currently own the "
-               "clipboard and neither the PRIMARY nor the CLIPBOARD "
-               "selections are owned, releasing ownership of Win32 "
-               "clipboard.\n");
-
-      /* Release ownership of the Windows clipboard */
-      OpenClipboard (NULL);
-      EmptyClipboard ();
-      CloseClipboard ();
-
-      goto winProcSetSelectionOwner_Done;
+    else
+        goto winProcSetSelectionOwner_Done;
+
+    /*
+     * At this point, if one of the selections is still owned by the 
+     * clipboard manager then it should be marked as unowned since
+     * we will be taking ownership of the Win32 clipboard.
+     */
+    if (g_iClipboardWindow == s_iOwners[CLIP_OWN_PRIMARY])
+        s_iOwners[CLIP_OWN_PRIMARY] = None;
+    if (g_iClipboardWindow == s_iOwners[CLIP_OWN_CLIPBOARD])
+        s_iOwners[CLIP_OWN_CLIPBOARD] = None;
+
+    /*
+     * Handle case when selection is being disowned,
+     * WM_DRAWCLIPBOARD did not do the disowning,
+     * both monitored selections are no longer owned,
+     * an owned to not owned transition was detected,
+     * and we currently own the Win32 clipboard.
+     */
+    if (stuff->window == None
+        && s_iOwners[CLIP_OWN_PRIMARY] == None
+        && s_iOwners[CLIP_OWN_CLIPBOARD] == None
+        && fOwnedToNotOwned
+        && g_hwndClipboard != NULL && g_hwndClipboard == GetClipboardOwner()) {
+        winDebug("winProcSetSelectionOwner - We currently own the "
+                 "clipboard and neither the PRIMARY nor the CLIPBOARD "
+                 "selections are owned, releasing ownership of Win32 "
+                 "clipboard.\n");
+
+        /* Release ownership of the Windows clipboard */
+        OpenClipboard(NULL);
+        EmptyClipboard();
+        CloseClipboard();
+
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Abort if no window at this point */
-  if (None == stuff->window)
-    {
-      winDebug("winProcSetSelectionOwner - No window, returning.\n");
-      goto winProcSetSelectionOwner_Done;
+    /* Abort if no window at this point */
+    if (None == stuff->window) {
+        winDebug("winProcSetSelectionOwner - No window, returning.\n");
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Abort if invalid selection */
-  if (!ValidAtom (stuff->selection))
-    {
-      ErrorF ("winProcSetSelectionOwner - Found BadAtom, aborting.\n");
-      goto winProcSetSelectionOwner_Done;
+    /* Abort if invalid selection */
+    if (!ValidAtom(stuff->selection)) {
+        ErrorF("winProcSetSelectionOwner - Found BadAtom, aborting.\n");
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Cast Window to Drawable */
-  pDrawable = (DrawablePtr) pWindow;
-  
-  /* Abort if clipboard manager is owning the selection */
-  if (pDrawable->id == g_iClipboardWindow)
-    {
-      winDebug("winProcSetSelectionOwner - We changed ownership, "
-               "aborting.\n");
-      goto winProcSetSelectionOwner_Done;
+    /* Cast Window to Drawable */
+    pDrawable = (DrawablePtr) pWindow;
+
+    /* Abort if clipboard manager is owning the selection */
+    if (pDrawable->id == g_iClipboardWindow) {
+        winDebug("winProcSetSelectionOwner - We changed ownership, "
+                 "aborting.\n");
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Abort if root window is taking ownership */
-  if (pDrawable->id == 0)
-    {
-      ErrorF ("winProcSetSelectionOwner - Root window taking ownership, "
-	      "aborting\n");
-      goto winProcSetSelectionOwner_Done;
+    /* Abort if root window is taking ownership */
+    if (pDrawable->id == 0) {
+        ErrorF("winProcSetSelectionOwner - Root window taking ownership, "
+               "aborting\n");
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Close clipboard if we have it open already */
-  if (GetOpenClipboardWindow () == g_hwndClipboard)
-    {
-      CloseClipboard ();
+    /* Close clipboard if we have it open already */
+    if (GetOpenClipboardWindow() == g_hwndClipboard) {
+        CloseClipboard();
     }
 
-  /* Access the Windows clipboard */
-  if (!OpenClipboard (g_hwndClipboard))
-    {
-      ErrorF ("winProcSetSelectionOwner - OpenClipboard () failed: %08x\n",
-	      (int) GetLastError ());
-      goto winProcSetSelectionOwner_Done;
+    /* Access the Windows clipboard */
+    if (!OpenClipboard(g_hwndClipboard)) {
+        ErrorF("winProcSetSelectionOwner - OpenClipboard () failed: %08x\n",
+               (int) GetLastError());
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Take ownership of the Windows clipboard */
-  if (!EmptyClipboard ())
-    {
-      ErrorF ("winProcSetSelectionOwner - EmptyClipboard () failed: %08x\n",
-	      (int) GetLastError ());
-      goto winProcSetSelectionOwner_Done;
+    /* Take ownership of the Windows clipboard */
+    if (!EmptyClipboard()) {
+        ErrorF("winProcSetSelectionOwner - EmptyClipboard () failed: %08x\n",
+               (int) GetLastError());
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Advertise Unicode if we support it */
-  if (g_fUnicodeSupport)
-    SetClipboardData (CF_UNICODETEXT, NULL);
+    /* Advertise Unicode if we support it */
+    if (g_fUnicodeSupport)
+        SetClipboardData(CF_UNICODETEXT, NULL);
 
-  /* Always advertise regular text */
-  SetClipboardData (CF_TEXT, NULL);
+    /* Always advertise regular text */
+    SetClipboardData(CF_TEXT, NULL);
 
-  /* Save handle to last owned selection */
-  g_atomLastOwnedSelection = stuff->selection;
+    /* Save handle to last owned selection */
+    g_atomLastOwnedSelection = stuff->selection;
 
-  /* Release the clipboard */
-  if (!CloseClipboard ())
-    {
-      ErrorF ("winProcSetSelectionOwner - CloseClipboard () failed: "
-	      "%08x\n",
-	      (int) GetLastError ());
-      goto winProcSetSelectionOwner_Done;
+    /* Release the clipboard */
+    if (!CloseClipboard()) {
+        ErrorF("winProcSetSelectionOwner - CloseClipboard () failed: "
+               "%08x\n", (int) GetLastError());
+        goto winProcSetSelectionOwner_Done;
     }
 
  winProcSetSelectionOwner_Done:
-  return (*winProcSetSelectionOwnerOrig) (client);
+    return (*winProcSetSelectionOwnerOrig) (client);
 }
diff --git a/xorg-server/hw/xwin/winclipboardxevents.c b/xorg-server/hw/xwin/winclipboardxevents.c
index b0006a01f..59b1f0715 100644
--- a/xorg-server/hw/xwin/winclipboardxevents.c
+++ b/xorg-server/hw/xwin/winclipboardxevents.c
@@ -36,770 +36,679 @@
 #include "winclipboard.h"
 #include "misc.h"
 
-
 /*
  * References to external symbols
  */
 
-extern Bool		g_fUnicodeSupport;
-
+extern Bool g_fUnicodeSupport;
 
 /*
  * Process any pending X events
  */
 
 int
-winClipboardFlushXEvents (HWND hwnd,
-			  int iWindow,
-			  Display *pDisplay,
-			  Bool fUseUnicode)
+winClipboardFlushXEvents(HWND hwnd,
+                         int iWindow, Display * pDisplay, Bool fUseUnicode)
 {
-  static Atom atomLocalProperty;
-  static Atom atomCompoundText;
-  static Atom atomUTF8String;
-  static Atom atomTargets;
-  static int generation;
-
-  if (generation != serverGeneration)
-    {
-      generation = serverGeneration;
-      atomLocalProperty = XInternAtom (pDisplay, WIN_LOCAL_PROPERTY, False);
-      atomUTF8String = XInternAtom (pDisplay, "UTF8_STRING", False);
-      atomCompoundText = XInternAtom (pDisplay, "COMPOUND_TEXT", False);
-      atomTargets = XInternAtom (pDisplay, "TARGETS", False);
+    static Atom atomLocalProperty;
+    static Atom atomCompoundText;
+    static Atom atomUTF8String;
+    static Atom atomTargets;
+    static int generation;
+
+    if (generation != serverGeneration) {
+        generation = serverGeneration;
+        atomLocalProperty = XInternAtom(pDisplay, WIN_LOCAL_PROPERTY, False);
+        atomUTF8String = XInternAtom(pDisplay, "UTF8_STRING", False);
+        atomCompoundText = XInternAtom(pDisplay, "COMPOUND_TEXT", False);
+        atomTargets = XInternAtom(pDisplay, "TARGETS", False);
     }
 
-  /* Process all pending events */
-  while (XPending (pDisplay))
-    {
-      XTextProperty		xtpText = {0};
-      XEvent			event;
-      XSelectionEvent		eventSelection;
-      unsigned long		ulReturnBytesLeft;
-      char			*pszReturnData = NULL;
-      char			*pszGlobalData = NULL;
-      int			iReturn;
-      HGLOBAL			hGlobal = NULL;
-      XICCEncodingStyle		xiccesStyle;
-      int			iConvertDataLen = 0;
-      char			*pszConvertData = NULL;
-      char			*pszTextList[2] = {NULL};
-      int			iCount;
-      char			**ppszTextList = NULL;
-      wchar_t			*pwszUnicodeStr = NULL;
-      int			iUnicodeLen = 0;
-      int			iReturnDataLen = 0;
-      int			i;
-      Bool			fAbort = FALSE;
-      Bool			fCloseClipboard = FALSE;
-      Bool			fSetClipboardData = TRUE;
-
-      /* Get the next event - will not block because one is ready */
-      XNextEvent (pDisplay, &event);
-
-      /* Branch on the event type */
-      switch (event.type)
-	{
-	  /*
-	   * SelectionRequest
-	   */
-
-	case SelectionRequest:
-	  {
-	    char			*pszAtomName = NULL;
-	    winDebug("SelectionRequest - target %d\n",
+    /* Process all pending events */
+    while (XPending(pDisplay)) {
+        XTextProperty xtpText = { 0 };
+        XEvent event;
+        XSelectionEvent eventSelection;
+        unsigned long ulReturnBytesLeft;
+        char *pszReturnData = NULL;
+        char *pszGlobalData = NULL;
+        int iReturn;
+        HGLOBAL hGlobal = NULL;
+        XICCEncodingStyle xiccesStyle;
+        int iConvertDataLen = 0;
+        char *pszConvertData = NULL;
+        char *pszTextList[2] = { NULL };
+        int iCount;
+        char **ppszTextList = NULL;
+        wchar_t *pwszUnicodeStr = NULL;
+        int iUnicodeLen = 0;
+        int iReturnDataLen = 0;
+        int i;
+        Bool fAbort = FALSE;
+        Bool fCloseClipboard = FALSE;
+        Bool fSetClipboardData = TRUE;
+
+        /* Get the next event - will not block because one is ready */
+        XNextEvent(pDisplay, &event);
+
+        /* Branch on the event type */
+        switch (event.type) {
+            /*
+             * SelectionRequest
+             */
+
+        case SelectionRequest:
+        {
+            char *pszAtomName = NULL;
+
+            winDebug("SelectionRequest - target %d\n",
                      event.xselectionrequest.target);
 
-	    pszAtomName = XGetAtomName (pDisplay,
-					event.xselectionrequest.target);
-	    winDebug("SelectionRequest - Target atom name %s\n", pszAtomName);
-	    XFree (pszAtomName);
-	    pszAtomName = NULL;
-	  }
-
-	  /* Abort if invalid target type */
-	  if (event.xselectionrequest.target != XA_STRING
-	      && event.xselectionrequest.target != atomUTF8String
-	      && event.xselectionrequest.target != atomCompoundText
-	      && event.xselectionrequest.target != atomTargets)
-	    {
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-
-	  /* Handle targets type of request */
-	  if (event.xselectionrequest.target == atomTargets)
-	    {
-	      Atom atomTargetArr[] = {atomTargets,
-				      atomCompoundText,
-				      atomUTF8String,
-				      XA_STRING};
-
-	      /* Try to change the property */
-	      iReturn = XChangeProperty (pDisplay,
-					 event.xselectionrequest.requestor,
-					 event.xselectionrequest.property,
-					 XA_ATOM,
-					 32,
-					 PropModeReplace,
-					 (unsigned char *) atomTargetArr,
-					 (sizeof (atomTargetArr)
-					  / sizeof (atomTargetArr[0])));
-	      if (iReturn == BadAlloc
-		  || iReturn == BadAtom
-		  || iReturn == BadMatch
-		  || iReturn == BadValue
-		  || iReturn == BadWindow)
-		{
-		  ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-			  "XChangeProperty failed: %d\n",
-			  iReturn);
-		}
-
-	      /* Setup selection notify xevent */
-	      eventSelection.type	= SelectionNotify;
-	      eventSelection.send_event	= True;
-	      eventSelection.display	= pDisplay;
-	      eventSelection.requestor	= event.xselectionrequest.requestor;
-	      eventSelection.selection	= event.xselectionrequest.selection;
-	      eventSelection.target	= event.xselectionrequest.target;
-	      eventSelection.property	= event.xselectionrequest.property;
-	      eventSelection.time	= event.xselectionrequest.time;
-
-	      /*
-	       * Notify the requesting window that
-	       * the operation has completed
-	       */
-	      iReturn = XSendEvent (pDisplay,
-				    eventSelection.requestor,
-				    False,
-				    0L,
-				    (XEvent *) &eventSelection);
-	      if (iReturn == BadValue || iReturn == BadWindow)
-		{
-		  ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-			  "XSendEvent () failed\n");
-		}
-	      break;
-	    }
-
-	  /* Check that clipboard format is available */
-	  if (fUseUnicode
-	      && !IsClipboardFormatAvailable (CF_UNICODETEXT))
-	    {
-	      static int count; /* Hack to stop acroread spamming the log */
-	      static HWND lasthwnd; /* I've not seen any other client get here repeatedly? */
-	      if (hwnd != lasthwnd) count = 0;
-	      count++;
-	      if (count < 6) ErrorF ("winClipboardFlushXEvents - CF_UNICODETEXT is not "
-		      "available from Win32 clipboard.  Aborting %d.\n", count);
-	      lasthwnd = hwnd;
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-	  else if (!fUseUnicode
-		   && !IsClipboardFormatAvailable (CF_TEXT))
-	    {
-	      ErrorF ("winClipboardFlushXEvents - CF_TEXT is not "
-		      "available from Win32 clipboard.  Aborting.\n");
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-
-	  /* Close clipboard if we have it open already */
-	  if (GetOpenClipboardWindow () == hwnd)
-	    {
-	      CloseClipboard ();
-	    }
-
-	  /* Access the clipboard */
-	  if (!OpenClipboard (hwnd))
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-		      "OpenClipboard () failed: %08lx\n",
-		      GetLastError ());
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-	  
-	  /* Indicate that clipboard was opened */
-	  fCloseClipboard = TRUE;
-
-	  /* Setup the string style */
-	  if (event.xselectionrequest.target == XA_STRING)
-	    xiccesStyle = XStringStyle;
+            pszAtomName = XGetAtomName(pDisplay,
+                                       event.xselectionrequest.target);
+            winDebug("SelectionRequest - Target atom name %s\n", pszAtomName);
+            XFree(pszAtomName);
+            pszAtomName = NULL;
+        }
+
+            /* Abort if invalid target type */
+            if (event.xselectionrequest.target != XA_STRING
+                && event.xselectionrequest.target != atomUTF8String
+                && event.xselectionrequest.target != atomCompoundText
+                && event.xselectionrequest.target != atomTargets) {
+                /* Abort */
+                fAbort = TRUE;
+                goto winClipboardFlushXEvents_SelectionRequest_Done;
+            }
+
+            /* Handle targets type of request */
+            if (event.xselectionrequest.target == atomTargets) {
+                Atom atomTargetArr[] = { atomTargets,
+                    atomCompoundText,
+                    atomUTF8String,
+                    XA_STRING
+                };
+
+                /* Try to change the property */
+                iReturn = XChangeProperty(pDisplay,
+                                          event.xselectionrequest.requestor,
+                                          event.xselectionrequest.property,
+                                          XA_ATOM,
+                                          32,
+                                          PropModeReplace,
+                                          (unsigned char *) atomTargetArr,
+                                          (sizeof(atomTargetArr)
+                                           / sizeof(atomTargetArr[0])));
+                if (iReturn == BadAlloc
+                    || iReturn == BadAtom
+                    || iReturn == BadMatch
+                    || iReturn == BadValue || iReturn == BadWindow) {
+                    ErrorF("winClipboardFlushXEvents - SelectionRequest - "
+                           "XChangeProperty failed: %d\n", iReturn);
+                }
+
+                /* Setup selection notify xevent */
+                eventSelection.type = SelectionNotify;
+                eventSelection.send_event = True;
+                eventSelection.display = pDisplay;
+                eventSelection.requestor = event.xselectionrequest.requestor;
+                eventSelection.selection = event.xselectionrequest.selection;
+                eventSelection.target = event.xselectionrequest.target;
+                eventSelection.property = event.xselectionrequest.property;
+                eventSelection.time = event.xselectionrequest.time;
+
+                /*
+                 * Notify the requesting window that
+                 * the operation has completed
+                 */
+                iReturn = XSendEvent(pDisplay,
+                                     eventSelection.requestor,
+                                     False, 0L, (XEvent *) & eventSelection);
+                if (iReturn == BadValue || iReturn == BadWindow) {
+                    ErrorF("winClipboardFlushXEvents - SelectionRequest - "
+                           "XSendEvent () failed\n");
+                }
+                break;
+            }
+
+            /* Check that clipboard format is available */
+            if (fUseUnicode && !IsClipboardFormatAvailable(CF_UNICODETEXT)) {
+                static int count;       /* Hack to stop acroread spamming the log */
+                static HWND lasthwnd;   /* I've not seen any other client get here repeatedly? */
+
+                if (hwnd != lasthwnd)
+                    count = 0;
+                count++;
+                if (count < 6)
+                    ErrorF("winClipboardFlushXEvents - CF_UNICODETEXT is not "
+                           "available from Win32 clipboard.  Aborting %d.\n",
+                           count);
+                lasthwnd = hwnd;
+
+                /* Abort */
+                fAbort = TRUE;
+                goto winClipboardFlushXEvents_SelectionRequest_Done;
+            }
+            else if (!fUseUnicode && !IsClipboardFormatAvailable(CF_TEXT)) {
+                ErrorF("winClipboardFlushXEvents - CF_TEXT is not "
+                       "available from Win32 clipboard.  Aborting.\n");
+
+                /* Abort */
+                fAbort = TRUE;
+                goto winClipboardFlushXEvents_SelectionRequest_Done;
+            }
+
+            /* Close clipboard if we have it open already */
+            if (GetOpenClipboardWindow() == hwnd) {
+                CloseClipboard();
+            }
+
+            /* Access the clipboard */
+            if (!OpenClipboard(hwnd)) {
+                ErrorF("winClipboardFlushXEvents - SelectionRequest - "
+                       "OpenClipboard () failed: %08lx\n", GetLastError());
+
+                /* Abort */
+                fAbort = TRUE;
+                goto winClipboardFlushXEvents_SelectionRequest_Done;
+            }
+
+            /* Indicate that clipboard was opened */
+            fCloseClipboard = TRUE;
+
+            /* Setup the string style */
+            if (event.xselectionrequest.target == XA_STRING)
+                xiccesStyle = XStringStyle;
 #ifdef X_HAVE_UTF8_STRING
-	  else if (event.xselectionrequest.target == atomUTF8String)
-	    xiccesStyle = XUTF8StringStyle;
+            else if (event.xselectionrequest.target == atomUTF8String)
+                xiccesStyle = XUTF8StringStyle;
 #endif
-	  else if (event.xselectionrequest.target == atomCompoundText)
-	    xiccesStyle = XCompoundTextStyle;
-	  else
-	    xiccesStyle = XStringStyle;
-
-	  /*
-	   * FIXME: Can't pass CF_UNICODETEXT on Windows 95/98/Me
-	   */
-	  
-	  /* Get a pointer to the clipboard text, in desired format */
-	  if (fUseUnicode)
-	    {
-	      /* Retrieve clipboard data */
-	      hGlobal = GetClipboardData (CF_UNICODETEXT);
-	    }
-	  else
-	    {
-	      /* Retrieve clipboard data */
-	      hGlobal = GetClipboardData (CF_TEXT);
-	    }
-	  if (!hGlobal)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-		      "GetClipboardData () failed: %08lx\n",
-		      GetLastError ());
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-	  pszGlobalData = (char *) GlobalLock (hGlobal);
-
-	  /* Convert the Unicode string to UTF8 (MBCS) */
-	  if (fUseUnicode)
-	    {
-	      iConvertDataLen = WideCharToMultiByte (CP_UTF8,
-						     0,
-						     (LPCWSTR)pszGlobalData,
-						     -1,
-						     NULL,
-						     0,
-						     NULL,
-						     NULL);
-	      /* NOTE: iConvertDataLen includes space for null terminator */
-	      pszConvertData = (char *) malloc (iConvertDataLen);
-	      WideCharToMultiByte (CP_UTF8,
-				   0,
-				   (LPCWSTR)pszGlobalData,
-				   -1,
-				   pszConvertData,
-				   iConvertDataLen,
-				   NULL,
-				   NULL);
-	    }
-	  else
-	    {
-	      pszConvertData = strdup (pszGlobalData);
-	      iConvertDataLen = strlen (pszConvertData) + 1;
-	    }
-
-	  /* Convert DOS string to UNIX string */
-	  winClipboardDOStoUNIX (pszConvertData, strlen (pszConvertData));
-
-	  /* Setup our text list */
-	  pszTextList[0] = pszConvertData;
-	  pszTextList[1] = NULL;
-
-	  /* Initialize the text property */
-	  xtpText.value = NULL;
-	  xtpText.nitems = 0;
-
-	  /* Create the text property from the text list */
-	  if (fUseUnicode)
-	    {
+            else if (event.xselectionrequest.target == atomCompoundText)
+                xiccesStyle = XCompoundTextStyle;
+            else
+                xiccesStyle = XStringStyle;
+
+            /*
+             * FIXME: Can't pass CF_UNICODETEXT on Windows 95/98/Me
+             */
+
+            /* Get a pointer to the clipboard text, in desired format */
+            if (fUseUnicode) {
+                /* Retrieve clipboard data */
+                hGlobal = GetClipboardData(CF_UNICODETEXT);
+            }
+            else {
+                /* Retrieve clipboard data */
+                hGlobal = GetClipboardData(CF_TEXT);
+            }
+            if (!hGlobal) {
+                ErrorF("winClipboardFlushXEvents - SelectionRequest - "
+                       "GetClipboardData () failed: %08lx\n", GetLastError());
+
+                /* Abort */
+                fAbort = TRUE;
+                goto winClipboardFlushXEvents_SelectionRequest_Done;
+            }
+            pszGlobalData = (char *) GlobalLock(hGlobal);
+
+            /* Convert the Unicode string to UTF8 (MBCS) */
+            if (fUseUnicode) {
+                iConvertDataLen = WideCharToMultiByte(CP_UTF8,
+                                                      0,
+                                                      (LPCWSTR) pszGlobalData,
+                                                      -1, NULL, 0, NULL, NULL);
+                /* NOTE: iConvertDataLen includes space for null terminator */
+                pszConvertData = (char *) malloc(iConvertDataLen);
+                WideCharToMultiByte(CP_UTF8,
+                                    0,
+                                    (LPCWSTR) pszGlobalData,
+                                    -1,
+                                    pszConvertData,
+                                    iConvertDataLen, NULL, NULL);
+            }
+            else {
+                pszConvertData = strdup(pszGlobalData);
+                iConvertDataLen = strlen(pszConvertData) + 1;
+            }
+
+            /* Convert DOS string to UNIX string */
+            winClipboardDOStoUNIX(pszConvertData, strlen(pszConvertData));
+
+            /* Setup our text list */
+            pszTextList[0] = pszConvertData;
+            pszTextList[1] = NULL;
+
+            /* Initialize the text property */
+            xtpText.value = NULL;
+            xtpText.nitems = 0;
+
+            /* Create the text property from the text list */
+            if (fUseUnicode) {
 #ifdef X_HAVE_UTF8_STRING
-	      iReturn = Xutf8TextListToTextProperty (pDisplay,
-						     pszTextList,
-						     1,
-						     xiccesStyle,
-						     &xtpText);
+                iReturn = Xutf8TextListToTextProperty(pDisplay,
+                                                      pszTextList,
+                                                      1, xiccesStyle, &xtpText);
 #endif
-	    }
-	  else
-	    {
-	      iReturn = XmbTextListToTextProperty (pDisplay,
-						   pszTextList,
-						   1,
-						   xiccesStyle,
-						   &xtpText);
-	    }
-	  if (iReturn == XNoMemory || iReturn == XLocaleNotSupported)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-		      "X*TextListToTextProperty failed: %d\n",
-		      iReturn);
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-	  
-	  /* Free the converted string */
-	  free (pszConvertData);
-	  pszConvertData = NULL;
-
-	  /* Copy the clipboard text to the requesting window */
-	  iReturn = XChangeProperty (pDisplay,
-				     event.xselectionrequest.requestor,
-				     event.xselectionrequest.property,
-				     event.xselectionrequest.target,
-				     8,
-				     PropModeReplace,
-				     xtpText.value,
-				     xtpText.nitems);
-	  if (iReturn == BadAlloc || iReturn == BadAtom
-	      || iReturn == BadMatch || iReturn == BadValue
-	      || iReturn == BadWindow)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-		      "XChangeProperty failed: %d\n",
-		      iReturn);
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-
-	  /* Release the clipboard data */
-	  GlobalUnlock (hGlobal);
-	  pszGlobalData = NULL;
-	  fCloseClipboard = FALSE;
-	  CloseClipboard ();
-
-	  /* Clean up */
-	  XFree (xtpText.value);
-	  xtpText.value = NULL;
-	  xtpText.nitems = 0;
-
-	  /* Setup selection notify event */
-	  eventSelection.type = SelectionNotify;
-	  eventSelection.send_event = True;
-	  eventSelection.display = pDisplay;
-	  eventSelection.requestor = event.xselectionrequest.requestor;
-	  eventSelection.selection = event.xselectionrequest.selection;
-	  eventSelection.target = event.xselectionrequest.target;
-	  eventSelection.property = event.xselectionrequest.property;
-	  eventSelection.time = event.xselectionrequest.time;
-
-	  /* Notify the requesting window that the operation has completed */
-	  iReturn = XSendEvent (pDisplay,
-				eventSelection.requestor,
-				False,
-				0L,
-				(XEvent *) &eventSelection);
-	  if (iReturn == BadValue || iReturn == BadWindow)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-		      "XSendEvent () failed\n");
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-
-	winClipboardFlushXEvents_SelectionRequest_Done:
-	  /* Free allocated resources */
-	  if (xtpText.value)
-	  {
-	    XFree (xtpText.value);
-	    xtpText.value = NULL;
-	    xtpText.nitems = 0;
-	  }
-	  free(pszConvertData);
-	  if (hGlobal && pszGlobalData)
-	    GlobalUnlock (hGlobal);
-	  
-	  /*
-	   * Send a SelectionNotify event to the requesting
-	   * client when we abort.
-	   */
-	  if (fAbort)
-	    {
-	      /* Setup selection notify event */
-	      eventSelection.type = SelectionNotify;
-	      eventSelection.send_event = True;
-	      eventSelection.display = pDisplay;
-	      eventSelection.requestor = event.xselectionrequest.requestor;
-	      eventSelection.selection = event.xselectionrequest.selection;
-	      eventSelection.target = event.xselectionrequest.target;
-	      eventSelection.property = None;
-	      eventSelection.time = event.xselectionrequest.time;
-
-	      /* Notify the requesting window that the operation is complete */
-	      iReturn = XSendEvent (pDisplay,
-				    eventSelection.requestor,
-				    False,
-				    0L,
-				    (XEvent *) &eventSelection);
-	      if (iReturn == BadValue || iReturn == BadWindow)
-		{
-		  /*
-		   * Should not be a problem if XSendEvent fails because
-		   * the client may simply have exited.
-		   */
-		  ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-			  "XSendEvent () failed for abort event.\n");
-		}
-	    }
-
-	  /* Close clipboard if it was opened */
-	  if (fCloseClipboard)
-	  {
-	    fCloseClipboard = FALSE;
-	    CloseClipboard ();
-	  }
-	  break;
-
-
-	  /*
-	   * SelectionNotify
-	   */ 
-
-	case SelectionNotify:
-
-	  winDebug ("winClipboardFlushXEvents - SelectionNotify\n");
-	  {
-	    char		*pszAtomName;
-	    pszAtomName = XGetAtomName (pDisplay,
-					event.xselection.selection);
-
-	    winDebug("winClipboardFlushXEvents - SelectionNotify - ATOM: %s\n",
+            }
+            else {
+                iReturn = XmbTextListToTextProperty(pDisplay,
+                                                    pszTextList,
+                                                    1, xiccesStyle, &xtpText);
+            }
+            if (iReturn == XNoMemory || iReturn == XLocaleNotSupported) {
+                ErrorF("winClipboardFlushXEvents - SelectionRequest - "
+                       "X*TextListToTextProperty failed: %d\n", iReturn);
+
+                /* Abort */
+                fAbort = TRUE;
+                goto winClipboardFlushXEvents_SelectionRequest_Done;
+            }
+
+            /* Free the converted string */
+            free(pszConvertData);
+            pszConvertData = NULL;
+
+            /* Copy the clipboard text to the requesting window */
+            iReturn = XChangeProperty(pDisplay,
+                                      event.xselectionrequest.requestor,
+                                      event.xselectionrequest.property,
+                                      event.xselectionrequest.target,
+                                      8,
+                                      PropModeReplace,
+                                      xtpText.value, xtpText.nitems);
+            if (iReturn == BadAlloc || iReturn == BadAtom
+                || iReturn == BadMatch || iReturn == BadValue
+                || iReturn == BadWindow) {
+                ErrorF("winClipboardFlushXEvents - SelectionRequest - "
+                       "XChangeProperty failed: %d\n", iReturn);
+
+                /* Abort */
+                fAbort = TRUE;
+                goto winClipboardFlushXEvents_SelectionRequest_Done;
+            }
+
+            /* Release the clipboard data */
+            GlobalUnlock(hGlobal);
+            pszGlobalData = NULL;
+            fCloseClipboard = FALSE;
+            CloseClipboard();
+
+            /* Clean up */
+            XFree(xtpText.value);
+            xtpText.value = NULL;
+            xtpText.nitems = 0;
+
+            /* Setup selection notify event */
+            eventSelection.type = SelectionNotify;
+            eventSelection.send_event = True;
+            eventSelection.display = pDisplay;
+            eventSelection.requestor = event.xselectionrequest.requestor;
+            eventSelection.selection = event.xselectionrequest.selection;
+            eventSelection.target = event.xselectionrequest.target;
+            eventSelection.property = event.xselectionrequest.property;
+            eventSelection.time = event.xselectionrequest.time;
+
+            /* Notify the requesting window that the operation has completed */
+            iReturn = XSendEvent(pDisplay,
+                                 eventSelection.requestor,
+                                 False, 0L, (XEvent *) & eventSelection);
+            if (iReturn == BadValue || iReturn == BadWindow) {
+                ErrorF("winClipboardFlushXEvents - SelectionRequest - "
+                       "XSendEvent () failed\n");
+
+                /* Abort */
+                fAbort = TRUE;
+                goto winClipboardFlushXEvents_SelectionRequest_Done;
+            }
+
+ winClipboardFlushXEvents_SelectionRequest_Done:
+            /* Free allocated resources */
+            if (xtpText.value) {
+                XFree(xtpText.value);
+                xtpText.value = NULL;
+                xtpText.nitems = 0;
+            }
+            free(pszConvertData);
+            if (hGlobal && pszGlobalData)
+                GlobalUnlock(hGlobal);
+
+            /*
+             * Send a SelectionNotify event to the requesting
+             * client when we abort.
+             */
+            if (fAbort) {
+                /* Setup selection notify event */
+                eventSelection.type = SelectionNotify;
+                eventSelection.send_event = True;
+                eventSelection.display = pDisplay;
+                eventSelection.requestor = event.xselectionrequest.requestor;
+                eventSelection.selection = event.xselectionrequest.selection;
+                eventSelection.target = event.xselectionrequest.target;
+                eventSelection.property = None;
+                eventSelection.time = event.xselectionrequest.time;
+
+                /* Notify the requesting window that the operation is complete */
+                iReturn = XSendEvent(pDisplay,
+                                     eventSelection.requestor,
+                                     False, 0L, (XEvent *) & eventSelection);
+                if (iReturn == BadValue || iReturn == BadWindow) {
+                    /*
+                     * Should not be a problem if XSendEvent fails because
+                     * the client may simply have exited.
+                     */
+                    ErrorF("winClipboardFlushXEvents - SelectionRequest - "
+                           "XSendEvent () failed for abort event.\n");
+                }
+            }
+
+            /* Close clipboard if it was opened */
+            if (fCloseClipboard) {
+                fCloseClipboard = FALSE;
+                CloseClipboard();
+            }
+            break;
+
+            /*
+             * SelectionNotify
+             */
+
+        case SelectionNotify:
+
+            winDebug("winClipboardFlushXEvents - SelectionNotify\n");
+            {
+                char *pszAtomName;
+
+                pszAtomName = XGetAtomName(pDisplay,
+                                           event.xselection.selection);
+
+                winDebug
+                    ("winClipboardFlushXEvents - SelectionNotify - ATOM: %s\n",
                      pszAtomName);
-	    XFree (pszAtomName);
-	  }
-
-	  /*
-	   * Request conversion of UTF8 and CompoundText targets.
-	   */
-	  if (event.xselection.property == None)
-	    {
-	      if (event.xselection.target == XA_STRING)
-		{
-		  winDebug ("winClipboardFlushXEvents - SelectionNotify - "
-                            "XA_STRING\n");
-
-		  return WIN_XEVENTS_CONVERT;
-		}
-	      else if (event.xselection.target == atomUTF8String)
-		{
-		  winDebug("winClipboardFlushXEvents - SelectionNotify - "
-                           "Requesting conversion of UTF8 target.\n");
-
-		  XConvertSelection (pDisplay,
-				     event.xselection.selection,
-				     XA_STRING,
-				     atomLocalProperty,
-				     iWindow,
-				     CurrentTime);
-
-		  /* Process the ConvertSelection event */
-		  XFlush (pDisplay);
-		  return WIN_XEVENTS_CONVERT;
-		}
+                XFree(pszAtomName);
+            }
+
+            /*
+             * Request conversion of UTF8 and CompoundText targets.
+             */
+            if (event.xselection.property == None) {
+                if (event.xselection.target == XA_STRING) {
+                    winDebug("winClipboardFlushXEvents - SelectionNotify - "
+                             "XA_STRING\n");
+
+                    return WIN_XEVENTS_CONVERT;
+                }
+                else if (event.xselection.target == atomUTF8String) {
+                    winDebug("winClipboardFlushXEvents - SelectionNotify - "
+                             "Requesting conversion of UTF8 target.\n");
+
+                    XConvertSelection(pDisplay,
+                                      event.xselection.selection,
+                                      XA_STRING,
+                                      atomLocalProperty, iWindow, CurrentTime);
+
+                    /* Process the ConvertSelection event */
+                    XFlush(pDisplay);
+                    return WIN_XEVENTS_CONVERT;
+                }
 #ifdef X_HAVE_UTF8_STRING
-	      else if (event.xselection.target == atomCompoundText)
-		{
-		  winDebug("winClipboardFlushXEvents - SelectionNotify - "
-                           "Requesting conversion of CompoundText target.\n");
-
-		  XConvertSelection (pDisplay,
-				     event.xselection.selection,
-				     atomUTF8String,
-				     atomLocalProperty,
-				     iWindow,
-				     CurrentTime);
-
-		  /* Process the ConvertSelection event */
-		  XFlush (pDisplay);
-		  return WIN_XEVENTS_CONVERT;
-		}
+                else if (event.xselection.target == atomCompoundText) {
+                    winDebug("winClipboardFlushXEvents - SelectionNotify - "
+                             "Requesting conversion of CompoundText target.\n");
+
+                    XConvertSelection(pDisplay,
+                                      event.xselection.selection,
+                                      atomUTF8String,
+                                      atomLocalProperty, iWindow, CurrentTime);
+
+                    /* Process the ConvertSelection event */
+                    XFlush(pDisplay);
+                    return WIN_XEVENTS_CONVERT;
+                }
 #endif
-	      else
-		{
-		  ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-			  "Unknown format.  Cannot request conversion, "
-			  "aborting.\n");
-		  break;
-		}
-	    }
-
-	  /* Retrieve the size of the stored data */
-	  iReturn = XGetWindowProperty (pDisplay,
-					iWindow,
-					atomLocalProperty,
-					0,
-					0, /* Don't get data, just size */
-					False,
-					AnyPropertyType,
-					&xtpText.encoding,
-					&xtpText.format,
-					&xtpText.nitems,
-					&ulReturnBytesLeft,
-					&xtpText.value);
-	  if (iReturn != Success)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-		      "XGetWindowProperty () failed, aborting: %d\n",
-		      iReturn);
-	      break;
-	    }
-
-	  winDebug("SelectionNotify - returned data %d left %d\n",
-                   xtpText.nitems, ulReturnBytesLeft);
-
-	  /* Request the selection data */
-	  iReturn = XGetWindowProperty (pDisplay,
-					iWindow,
-					atomLocalProperty,
-					0,
-					ulReturnBytesLeft,
-					False,
-					AnyPropertyType,
-					&xtpText.encoding,
-					&xtpText.format,
-					&xtpText.nitems,
-					&ulReturnBytesLeft,
-					&xtpText.value);
-	  if (iReturn != Success)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-		      "XGetWindowProperty () failed, aborting: %d\n",
-		      iReturn);
-	      break;
-	    }
-
-	    {
-	      char		*pszAtomName = NULL;
-
-	      winDebug("SelectionNotify - returned data %d left %d\n",
-                       xtpText.nitems, ulReturnBytesLeft);
-	      pszAtomName = XGetAtomName(pDisplay, xtpText.encoding);
-	      winDebug("Notify atom name %s\n", pszAtomName);
-	      XFree (pszAtomName);
-	      pszAtomName = NULL;
-	    }
-
-	  if (fUseUnicode)
-	    {
+                else {
+                    ErrorF("winClipboardFlushXEvents - SelectionNotify - "
+                           "Unknown format.  Cannot request conversion, "
+                           "aborting.\n");
+                    break;
+                }
+            }
+
+            /* Retrieve the size of the stored data */
+            iReturn = XGetWindowProperty(pDisplay, iWindow, atomLocalProperty, 0, 0,    /* Don't get data, just size */
+                                         False,
+                                         AnyPropertyType,
+                                         &xtpText.encoding,
+                                         &xtpText.format,
+                                         &xtpText.nitems,
+                                         &ulReturnBytesLeft, &xtpText.value);
+            if (iReturn != Success) {
+                ErrorF("winClipboardFlushXEvents - SelectionNotify - "
+                       "XGetWindowProperty () failed, aborting: %d\n", iReturn);
+                break;
+            }
+
+            winDebug("SelectionNotify - returned data %d left %d\n",
+                     xtpText.nitems, ulReturnBytesLeft);
+
+            /* Request the selection data */
+            iReturn = XGetWindowProperty(pDisplay,
+                                         iWindow,
+                                         atomLocalProperty,
+                                         0,
+                                         ulReturnBytesLeft,
+                                         False,
+                                         AnyPropertyType,
+                                         &xtpText.encoding,
+                                         &xtpText.format,
+                                         &xtpText.nitems,
+                                         &ulReturnBytesLeft, &xtpText.value);
+            if (iReturn != Success) {
+                ErrorF("winClipboardFlushXEvents - SelectionNotify - "
+                       "XGetWindowProperty () failed, aborting: %d\n", iReturn);
+                break;
+            }
+
+            {
+                char *pszAtomName = NULL;
+
+                winDebug("SelectionNotify - returned data %d left %d\n",
+                         xtpText.nitems, ulReturnBytesLeft);
+                pszAtomName = XGetAtomName(pDisplay, xtpText.encoding);
+                winDebug("Notify atom name %s\n", pszAtomName);
+                XFree(pszAtomName);
+                pszAtomName = NULL;
+            }
+
+            if (fUseUnicode) {
 #ifdef X_HAVE_UTF8_STRING
-	      /* Convert the text property to a text list */
-	      iReturn = Xutf8TextPropertyToTextList (pDisplay,
-						     &xtpText,
-						     &ppszTextList,
-						     &iCount);
+                /* Convert the text property to a text list */
+                iReturn = Xutf8TextPropertyToTextList(pDisplay,
+                                                      &xtpText,
+                                                      &ppszTextList, &iCount);
 #endif
-	    }
-	  else
-	    {
-	      iReturn = XmbTextPropertyToTextList (pDisplay,
-						   &xtpText,
-						   &ppszTextList,
-						   &iCount);
-	    }
-	  if (iReturn == Success || iReturn > 0)
-	    {
-	      /* Conversion succeeded or some unconvertible characters */
-	      if (ppszTextList != NULL)
-		{
-		  iReturnDataLen = 0;
-		  for (i = 0; i < iCount; i++)
-		    {
-		      iReturnDataLen += strlen(ppszTextList[i]);
-		    }
-		  pszReturnData = malloc (iReturnDataLen + 1);
-		  pszReturnData[0] = '\0';
-		  for (i = 0; i < iCount; i++)
-		    {
-		      strcat (pszReturnData, ppszTextList[i]);
-		    }
-		}
-	      else
-		{
-		  ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-			  "X*TextPropertyToTextList list_return is NULL.\n");
-		  pszReturnData = malloc (1);
-		  pszReturnData[0] = '\0';
-		}
-	    }
-	  else
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-		      "X*TextPropertyToTextList returned: ");
-	      switch (iReturn)
-		{
-		case XNoMemory:
-		  ErrorF ("XNoMemory\n");
-		  break;
-		case XLocaleNotSupported:
-		  ErrorF ("XLocaleNotSupported\n");
-		  break;
-		case XConverterNotFound:
-		  ErrorF ("XConverterNotFound\n");
-		  break;
-		default:
-		  ErrorF ("%d\n", iReturn);
-		  break;
-		}
-	      pszReturnData = malloc (1);
-	      pszReturnData[0] = '\0';
-	    }
-
-	  /* Free the data returned from XGetWindowProperty */
-	  if (ppszTextList)
-	    XFreeStringList (ppszTextList);
-	  ppszTextList = NULL;
-	  XFree (xtpText.value);
-	  xtpText.value = NULL;
-	  xtpText.nitems = 0;
-
-	  /* Convert the X clipboard string to DOS format */
-	  winClipboardUNIXtoDOS (&pszReturnData, strlen (pszReturnData));
-
-	  if (fUseUnicode)
-	    {
-	      /* Find out how much space needed to convert MBCS to Unicode */
-	      iUnicodeLen = MultiByteToWideChar (CP_UTF8,
-						 0,
-						 pszReturnData,
-						 -1,
-						 NULL,
-						 0);
-
-	      /* Allocate memory for the Unicode string */
-	      pwszUnicodeStr
-		= (wchar_t*) malloc (sizeof (wchar_t) * (iUnicodeLen + 1));
-	      if (!pwszUnicodeStr)
-		{
-		  ErrorF ("winClipboardFlushXEvents - SelectionNotify "
-			  "malloc failed for pwszUnicodeStr, aborting.\n");
-
-		  /* Abort */
-		  fAbort = TRUE;
-		  goto winClipboardFlushXEvents_SelectionNotify_Done;
-		}
-
-	      /* Do the actual conversion */
-	      MultiByteToWideChar (CP_UTF8,
-				   0,
-				   pszReturnData,
-				   -1,
-				   pwszUnicodeStr,
-				   iUnicodeLen);
-	      
-	      /* Allocate global memory for the X clipboard data */
-	      hGlobal = GlobalAlloc (GMEM_MOVEABLE,
-				     sizeof (wchar_t) * (iUnicodeLen + 1));
-	    }
-	  else
-	    {
-	      pszConvertData = strdup (pszReturnData);
-	      iConvertDataLen = strlen (pszConvertData) + 1;
-
-	      /* Allocate global memory for the X clipboard data */
-	      hGlobal = GlobalAlloc (GMEM_MOVEABLE, iConvertDataLen);
-	    }
-
-	  free (pszReturnData);
-
-	  /* Check that global memory was allocated */
-	  if (!hGlobal)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionNotify "
-		      "GlobalAlloc failed, aborting: %ld\n",
-		      GetLastError ());
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionNotify_Done;
-	    }
-
-	  /* Obtain a pointer to the global memory */
-	  pszGlobalData = GlobalLock (hGlobal);
-	  if (pszGlobalData == NULL)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - Could not lock global "
-		      "memory for clipboard transfer\n");
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionNotify_Done;
-	    }
-
-	  /* Copy the returned string into the global memory */
-	  if (fUseUnicode)
-	    {
-	      memcpy (pszGlobalData,
-		      pwszUnicodeStr,
-		      sizeof (wchar_t) * (iUnicodeLen + 1));
-	      free (pwszUnicodeStr);
-	      pwszUnicodeStr = NULL;
-	    }
-	  else
-	    {
-	      strcpy (pszGlobalData, pszConvertData);
-	      free (pszConvertData);
-	      pszConvertData = NULL;
-	    }
-
-	  /* Release the pointer to the global memory */
-	  GlobalUnlock (hGlobal);
-	  pszGlobalData = NULL;
-
-	  /* Push the selection data to the Windows clipboard */
-	  if (fUseUnicode)
-	    SetClipboardData (CF_UNICODETEXT, hGlobal);
-	  else
-	    SetClipboardData (CF_TEXT, hGlobal);
-
-	  /* Flag that SetClipboardData has been called */
-	  fSetClipboardData = FALSE;
-
-	  /*
-	   * NOTE: Do not try to free pszGlobalData, it is owned by
-	   * Windows after the call to SetClipboardData ().
-	   */
-
-	winClipboardFlushXEvents_SelectionNotify_Done:
-	  /* Free allocated resources */
-	  if (ppszTextList)
-	    XFreeStringList (ppszTextList);
-	  if (xtpText.value)
-	  {
-	    XFree (xtpText.value);
-	    xtpText.value = NULL;
-	    xtpText.nitems = 0;
-	  }
-	  free(pszConvertData);
-	  free(pwszUnicodeStr);
-	  if (hGlobal && pszGlobalData)
-	    GlobalUnlock (hGlobal);
-	  if (fSetClipboardData && g_fUnicodeSupport)
-	    SetClipboardData (CF_UNICODETEXT, NULL);
-	  if (fSetClipboardData)
-	    SetClipboardData (CF_TEXT, NULL);
-	  return WIN_XEVENTS_NOTIFY;
+            }
+            else {
+                iReturn = XmbTextPropertyToTextList(pDisplay,
+                                                    &xtpText,
+                                                    &ppszTextList, &iCount);
+            }
+            if (iReturn == Success || iReturn > 0) {
+                /* Conversion succeeded or some unconvertible characters */
+                if (ppszTextList != NULL) {
+                    iReturnDataLen = 0;
+                    for (i = 0; i < iCount; i++) {
+                        iReturnDataLen += strlen(ppszTextList[i]);
+                    }
+                    pszReturnData = malloc(iReturnDataLen + 1);
+                    pszReturnData[0] = '\0';
+                    for (i = 0; i < iCount; i++) {
+                        strcat(pszReturnData, ppszTextList[i]);
+                    }
+                }
+                else {
+                    ErrorF("winClipboardFlushXEvents - SelectionNotify - "
+                           "X*TextPropertyToTextList list_return is NULL.\n");
+                    pszReturnData = malloc(1);
+                    pszReturnData[0] = '\0';
+                }
+            }
+            else {
+                ErrorF("winClipboardFlushXEvents - SelectionNotify - "
+                       "X*TextPropertyToTextList returned: ");
+                switch (iReturn) {
+                case XNoMemory:
+                    ErrorF("XNoMemory\n");
+                    break;
+                case XLocaleNotSupported:
+                    ErrorF("XLocaleNotSupported\n");
+                    break;
+                case XConverterNotFound:
+                    ErrorF("XConverterNotFound\n");
+                    break;
+                default:
+                    ErrorF("%d\n", iReturn);
+                    break;
+                }
+                pszReturnData = malloc(1);
+                pszReturnData[0] = '\0';
+            }
+
+            /* Free the data returned from XGetWindowProperty */
+            if (ppszTextList)
+                XFreeStringList(ppszTextList);
+            ppszTextList = NULL;
+            XFree(xtpText.value);
+            xtpText.value = NULL;
+            xtpText.nitems = 0;
+
+            /* Convert the X clipboard string to DOS format */
+            winClipboardUNIXtoDOS(&pszReturnData, strlen(pszReturnData));
+
+            if (fUseUnicode) {
+                /* Find out how much space needed to convert MBCS to Unicode */
+                iUnicodeLen = MultiByteToWideChar(CP_UTF8,
+                                                  0,
+                                                  pszReturnData, -1, NULL, 0);
+
+                /* Allocate memory for the Unicode string */
+                pwszUnicodeStr
+                    = (wchar_t *) malloc(sizeof(wchar_t) * (iUnicodeLen + 1));
+                if (!pwszUnicodeStr) {
+                    ErrorF("winClipboardFlushXEvents - SelectionNotify "
+                           "malloc failed for pwszUnicodeStr, aborting.\n");
+
+                    /* Abort */
+                    fAbort = TRUE;
+                    goto winClipboardFlushXEvents_SelectionNotify_Done;
+                }
+
+                /* Do the actual conversion */
+                MultiByteToWideChar(CP_UTF8,
+                                    0,
+                                    pszReturnData,
+                                    -1, pwszUnicodeStr, iUnicodeLen);
+
+                /* Allocate global memory for the X clipboard data */
+                hGlobal = GlobalAlloc(GMEM_MOVEABLE,
+                                      sizeof(wchar_t) * (iUnicodeLen + 1));
+            }
+            else {
+                pszConvertData = strdup(pszReturnData);
+                iConvertDataLen = strlen(pszConvertData) + 1;
+
+                /* Allocate global memory for the X clipboard data */
+                hGlobal = GlobalAlloc(GMEM_MOVEABLE, iConvertDataLen);
+            }
+
+            free(pszReturnData);
+
+            /* Check that global memory was allocated */
+            if (!hGlobal) {
+                ErrorF("winClipboardFlushXEvents - SelectionNotify "
+                       "GlobalAlloc failed, aborting: %ld\n", GetLastError());
+
+                /* Abort */
+                fAbort = TRUE;
+                goto winClipboardFlushXEvents_SelectionNotify_Done;
+            }
+
+            /* Obtain a pointer to the global memory */
+            pszGlobalData = GlobalLock(hGlobal);
+            if (pszGlobalData == NULL) {
+                ErrorF("winClipboardFlushXEvents - Could not lock global "
+                       "memory for clipboard transfer\n");
+
+                /* Abort */
+                fAbort = TRUE;
+                goto winClipboardFlushXEvents_SelectionNotify_Done;
+            }
+
+            /* Copy the returned string into the global memory */
+            if (fUseUnicode) {
+                memcpy(pszGlobalData,
+                       pwszUnicodeStr, sizeof(wchar_t) * (iUnicodeLen + 1));
+                free(pwszUnicodeStr);
+                pwszUnicodeStr = NULL;
+            }
+            else {
+                strcpy(pszGlobalData, pszConvertData);
+                free(pszConvertData);
+                pszConvertData = NULL;
+            }
+
+            /* Release the pointer to the global memory */
+            GlobalUnlock(hGlobal);
+            pszGlobalData = NULL;
+
+            /* Push the selection data to the Windows clipboard */
+            if (fUseUnicode)
+                SetClipboardData(CF_UNICODETEXT, hGlobal);
+            else
+                SetClipboardData(CF_TEXT, hGlobal);
+
+            /* Flag that SetClipboardData has been called */
+            fSetClipboardData = FALSE;
+
+            /*
+             * NOTE: Do not try to free pszGlobalData, it is owned by
+             * Windows after the call to SetClipboardData ().
+             */
+
+ winClipboardFlushXEvents_SelectionNotify_Done:
+            /* Free allocated resources */
+            if (ppszTextList)
+                XFreeStringList(ppszTextList);
+            if (xtpText.value) {
+                XFree(xtpText.value);
+                xtpText.value = NULL;
+                xtpText.nitems = 0;
+            }
+            free(pszConvertData);
+            free(pwszUnicodeStr);
+            if (hGlobal && pszGlobalData)
+                GlobalUnlock(hGlobal);
+            if (fSetClipboardData && g_fUnicodeSupport)
+                SetClipboardData(CF_UNICODETEXT, NULL);
+            if (fSetClipboardData)
+                SetClipboardData(CF_TEXT, NULL);
+            return WIN_XEVENTS_NOTIFY;
 
         case SelectionClear:
-          winDebug("SelectionClear - doing nothing\n");
-          break;
+            winDebug("SelectionClear - doing nothing\n");
+            break;
 
-	case PropertyNotify:
-	  break;
+        case PropertyNotify:
+            break;
 
-	case MappingNotify:
-	  break;
+        case MappingNotify:
+            break;
 
-	default:
-          ErrorF ("winClipboardFlushXEvents - unexpected event type %d\n", event.type);
-	  break;
-	}
+        default:
+            ErrorF("winClipboardFlushXEvents - unexpected event type %d\n",
+                   event.type);
+            break;
+        }
     }
 
-  return WIN_XEVENTS_SUCCESS;
+    return WIN_XEVENTS_SUCCESS;
 }
diff --git a/xorg-server/hw/xwin/wincmap.c b/xorg-server/hw/xwin/wincmap.c
index 6cb037243..610437ad4 100644
--- a/xorg-server/hw/xwin/wincmap.c
+++ b/xorg-server/hw/xwin/wincmap.c
@@ -1,671 +1,602 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	Dakshinamurthy Karra

- *		Suhaib M Siddiqi

- *		Peter Busch

- *		Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-/*

- * Local prototypes

- */

-

-static int

-winListInstalledColormaps (ScreenPtr pScreen, Colormap *pmaps);

-

-static void

-winStoreColors (ColormapPtr pmap, int ndef, xColorItem *pdefs);

-

-static void

-winInstallColormap (ColormapPtr pmap);

-

-static void

-winUninstallColormap (ColormapPtr pmap);

-

-static void

-winResolveColor (unsigned short *pred,

-		 unsigned short *pgreen,

-		 unsigned short *pblue,

-		 VisualPtr	pVisual);

-

-static Bool

-winCreateColormap (ColormapPtr pmap);

-

-static void

-winDestroyColormap (ColormapPtr pmap);

-

-static Bool

-winGetPaletteDIB (ScreenPtr pScreen, ColormapPtr pcmap);

-

-static Bool

-winGetPaletteDD (ScreenPtr pScreen, ColormapPtr pcmap);

-

-

-/*

- * Set screen functions for colormaps

- */

-

-void

-winSetColormapFunctions (ScreenPtr pScreen)

-{

-  pScreen->CreateColormap = winCreateColormap;

-  pScreen->DestroyColormap = winDestroyColormap;

-  pScreen->InstallColormap = winInstallColormap;

-  pScreen->UninstallColormap = winUninstallColormap;

-  pScreen->ListInstalledColormaps = winListInstalledColormaps;

-  pScreen->StoreColors = winStoreColors;

-  pScreen->ResolveColor = winResolveColor;

-}

-

-

-/* See Porting Layer Definition - p. 30 */

-/*

- * Walk the list of installed colormaps, filling the pmaps list

- * with the resource ids of the installed maps, and return

- * a count of the total number of installed maps.

- */

-static int

-winListInstalledColormaps (ScreenPtr pScreen, Colormap *pmaps)

-{

-  winScreenPriv(pScreen);

-

-  /*

-   * There will only be one installed colormap, so we only need

-   * to return one id, and the count of installed maps will always

-   * be one.

-   */

-  *pmaps = pScreenPriv->pcmapInstalled->mid;

-  return 1;

-}

-

-

-/* See Porting Layer Definition - p. 30 */

-/* See Programming Windows - p. 663 */

-static void

-winInstallColormap (ColormapPtr pColormap)

-{

-  ScreenPtr		pScreen = pColormap->pScreen;

-  winScreenPriv(pScreen);

-  ColormapPtr		oldpmap = pScreenPriv->pcmapInstalled;

-

-#if CYGDEBUG

-  winDebug ("winInstallColormap\n");

-#endif

- 

-  /* Did the colormap actually change? */

-  if (pColormap != oldpmap)

-    {

-#if CYGDEBUG

-      winDebug ("winInstallColormap - Colormap has changed, attempt "

-	      "to install.\n");

-#endif

-      

-      /* Was there a previous colormap? */

-      if (oldpmap != (ColormapPtr) None)

-	{

-	  /* There was a previous colormap; tell clients it is gone */

-	  WalkTree (pColormap->pScreen, TellLostMap, (char *)&oldpmap->mid);

-	}

-      

-      /* Install new colormap */

-      pScreenPriv->pcmapInstalled = pColormap;

-      WalkTree (pColormap->pScreen, TellGainedMap, (char *)&pColormap->mid);

-      

-      /* Call the engine specific colormap install procedure */

-      if (!((*pScreenPriv->pwinInstallColormap) (pColormap)))

-	{

-	  winErrorFVerb (2, "winInstallColormap - Screen specific colormap install "

-		  "procedure failed.  Continuing, but colors may be "

-		  "messed up from now on.\n");

-	}

-    }

-

-  /* Save a pointer to the newly installed colormap */

-  pScreenPriv->pcmapInstalled = pColormap;

-}

-

-

-/* See Porting Layer Definition - p. 30 */

-static void

-winUninstallColormap (ColormapPtr pmap)

-{

-  winScreenPriv(pmap->pScreen);

-  ColormapPtr curpmap = pScreenPriv->pcmapInstalled;

-

-#if CYGDEBUG

-  winDebug ("winUninstallColormap\n");

-#endif

-

-  /* Is the colormap currently installed? */

-  if (pmap != curpmap)

-    {

-      /* Colormap not installed, nothing to do */

-      return;

-    }

-  

-  /* Clear the installed colormap flag */

-  pScreenPriv->pcmapInstalled = NULL;

-  

-  /*

-   * NOTE: The default colormap does not get "uninstalled" before

-   * it is destroyed.

-   */

-

-  /* Install the default cmap in place of the cmap to be uninstalled */

-  if (pmap->mid != pmap->pScreen->defColormap)

-    {

-      dixLookupResourceByType((pointer) &curpmap, pmap->pScreen->defColormap,

-				RT_COLORMAP, NullClient, DixUnknownAccess);

-      (*pmap->pScreen->InstallColormap) (curpmap);

-    }

-}

-

-

-/* See Porting Layer Definition - p. 30 */

-static void

-winStoreColors (ColormapPtr pmap,

-		int ndef,

-		xColorItem *pdefs)

-{

-  ScreenPtr		pScreen = pmap->pScreen;

-  winScreenPriv(pScreen);

-  winCmapPriv(pmap);

-  int			i;

-  unsigned short	nRed, nGreen, nBlue;

-

-#if CYGDEBUG

-  if (ndef != 1)

-    winDebug ("winStoreColors - ndef: %d\n",

-	    ndef);

-#endif

-

-  /* Save the new colors in the colormap privates */

-  for (i = 0; i < ndef; ++i)

-    {

-      /* Adjust the colors from the X color spec to the Windows color spec */

-      nRed = pdefs[i].red >> 8;

-      nGreen = pdefs[i].green >> 8;

-      nBlue = pdefs[i].blue >> 8;

-

-      /* Copy the colors to a palette entry table */

-      pCmapPriv->peColors[pdefs[0].pixel + i].peRed = nRed;

-      pCmapPriv->peColors[pdefs[0].pixel + i].peGreen = nGreen;

-      pCmapPriv->peColors[pdefs[0].pixel + i].peBlue = nBlue;

-      

-      /* Copy the colors to a RGBQUAD table */

-      pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbRed = nRed;

-      pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbGreen = nGreen;

-      pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbBlue = nBlue;

-

-#if CYGDEBUG

-      winDebug ("winStoreColors - nRed %d nGreen %d nBlue %d\n",

-	      nRed, nGreen, nBlue);

-#endif

-    }

-

-  /* Call the engine specific store colors procedure */

-  if (!((pScreenPriv->pwinStoreColors) (pmap, ndef, pdefs)))

-    {

-      winErrorFVerb (2, "winStoreColors - Engine cpecific color storage procedure "

-	      "failed.  Continuing, but colors may be messed up from now "

-	      "on.\n");

-    }

-}

-

-

-/* See Porting Layer Definition - p. 30 */

-static void

-winResolveColor (unsigned short *pred,

-		 unsigned short *pgreen,

-		 unsigned short *pblue,

-		 VisualPtr	pVisual)

-{

-#if CYGDEBUG

-  winDebug ("winResolveColor ()\n");

-#endif

-

-  miResolveColor (pred, pgreen, pblue, pVisual);

-}

-

-

-/* See Porting Layer Definition - p. 29 */

-static Bool

-winCreateColormap (ColormapPtr pmap)

-{

-  winPrivCmapPtr	pCmapPriv = NULL;

-  ScreenPtr		pScreen = pmap->pScreen;

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winDebug ("winCreateColormap\n");

-#endif

-

-  /* Allocate colormap privates */

-  if (!winAllocateCmapPrivates (pmap))

-    {

-      ErrorF ("winCreateColorma - Couldn't allocate cmap privates\n");

-      return FALSE;

-    }

-

-  /* Get a pointer to the newly allocated privates */

-  pCmapPriv = winGetCmapPriv (pmap);

-

-  /*

-   * FIXME: This is some evil hackery to help in handling some X clients

-   * that expect the top pixel to be white.  This "help" only lasts until

-   * some client overwrites the top colormap entry.

-   * 

-   * We don't want to actually allocate the top entry, as that causes

-   * problems with X clients that need 7 planes (128 colors) in the default

-   * colormap, such as Magic 7.1.

-   */

-  pCmapPriv->rgbColors[WIN_NUM_PALETTE_ENTRIES - 1].rgbRed = 255;

-  pCmapPriv->rgbColors[WIN_NUM_PALETTE_ENTRIES - 1].rgbGreen = 255;

-  pCmapPriv->rgbColors[WIN_NUM_PALETTE_ENTRIES - 1].rgbBlue = 255;

-  pCmapPriv->peColors[WIN_NUM_PALETTE_ENTRIES - 1].peRed = 255;

-  pCmapPriv->peColors[WIN_NUM_PALETTE_ENTRIES - 1].peGreen = 255;

-  pCmapPriv->peColors[WIN_NUM_PALETTE_ENTRIES - 1].peBlue = 255;

-

-  /* Call the engine specific colormap initialization procedure */

-  if (!((*pScreenPriv->pwinCreateColormap) (pmap)))

-    {

-      ErrorF ("winCreateColormap - Engine specific colormap creation "

-	      "procedure failed.  Aborting.\n");

-      return FALSE;

-    }

-

-  return TRUE;

-}

-

-

-/* See Porting Layer Definition - p. 29, 30 */

-static void

-winDestroyColormap (ColormapPtr pColormap)

-{

-  winScreenPriv(pColormap->pScreen);

-  winCmapPriv(pColormap);

-

-  /* Call the engine specific colormap destruction procedure */

-  if (!((*pScreenPriv->pwinDestroyColormap) (pColormap)))

-    {

-      winErrorFVerb (2, "winDestroyColormap - Engine specific colormap destruction "

-	      "procedure failed.  Continuing, but it is possible that memory "

-	      "was leaked, or that colors will be messed up from now on.\n");

-    }

-

-  /* Free the colormap privates */

-  free (pCmapPriv);

-  winSetCmapPriv (pColormap, NULL);

-

-#if CYGDEBUG

-  winDebug ("winDestroyColormap - Returning\n");

-#endif

-}

-

-

-/*

- * Internal function to load the palette used by the Shadow DIB

- */

-

-static Bool

-winGetPaletteDIB (ScreenPtr pScreen, ColormapPtr pcmap)

-{

-  winScreenPriv(pScreen);

-  int			i;

-  Pixel			pixel; /* Pixel == CARD32 */

-  CARD16		nRed, nGreen, nBlue; /* CARD16 == unsigned short */

-  UINT			uiColorsRetrieved = 0;

-  RGBQUAD		rgbColors[WIN_NUM_PALETTE_ENTRIES];

-      

-  /* Get the color table for the screen */

-  uiColorsRetrieved = GetDIBColorTable (pScreenPriv->hdcScreen,

-					0,

-					WIN_NUM_PALETTE_ENTRIES,

-					rgbColors);

-  if (uiColorsRetrieved == 0)

-    {

-      ErrorF ("winGetPaletteDIB - Could not retrieve screen color table\n");

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winGetPaletteDIB - Retrieved %d colors from DIB\n",

-	  uiColorsRetrieved);

-#endif

-

-  /* Set the DIB color table to the default screen palette */

-  if (SetDIBColorTable (pScreenPriv->hdcShadow,

-			0,

-			uiColorsRetrieved,

-			rgbColors) == 0)

-    {

-      ErrorF ("winGetPaletteDIB - SetDIBColorTable () failed\n");

-      return FALSE;

-    }

-

-  /* Alloc each color in the DIB color table */

-  for (i = 0; i < uiColorsRetrieved; ++i)

-    {

-      pixel = i;

-

-      /* Extract the color values for current palette entry */

-      nRed = rgbColors[i].rgbRed << 8;

-      nGreen = rgbColors[i].rgbGreen << 8;

-      nBlue = rgbColors[i].rgbBlue << 8;

-

-#if CYGDEBUG

-      winDebug ("winGetPaletteDIB - Allocating a color: %d; "

-	      "%d %d %d\n",

-	      pixel, nRed, nGreen, nBlue);

-#endif

-

-      /* Allocate a entry in the X colormap */

-      if (AllocColor (pcmap,

-		      &nRed,

-		      &nGreen,

-		      &nBlue,

-		      &pixel,

-		      0) != Success)

-	{

-	  ErrorF ("winGetPaletteDIB - AllocColor () failed, pixel %d\n",

-		  i);

-	  return FALSE;

-	}

-

-      if (i != pixel

-	  || nRed != rgbColors[i].rgbRed 

-	  || nGreen != rgbColors[i].rgbGreen

-	  || nBlue != rgbColors[i].rgbBlue)

-	{

-	  winDebug ("winGetPaletteDIB - Got: %d; "

-		  "%d %d %d\n",

-		  (int) pixel, nRed, nGreen, nBlue);

-	}

-	  

-      /* FIXME: Not sure that this bit is needed at all */

-      pcmap->red[i].co.local.red = nRed;

-      pcmap->red[i].co.local.green = nGreen;

-      pcmap->red[i].co.local.blue = nBlue;

-    }

-

-  /* System is using a colormap */

-  /* Set the black and white pixel indices */

-  pScreen->whitePixel = uiColorsRetrieved - 1;

-  pScreen->blackPixel = 0;

-

-  return TRUE;

-}

-

-

-/*

- * Internal function to load the standard system palette being used by DD

- */

-

-static Bool

-winGetPaletteDD (ScreenPtr pScreen, ColormapPtr pcmap)

-{

-  int			i;

-  Pixel			pixel; /* Pixel == CARD32 */

-  CARD16		nRed, nGreen, nBlue; /* CARD16 == unsigned short */

-  UINT			uiSystemPaletteEntries;

-  LPPALETTEENTRY	ppeColors = NULL;

-  HDC			hdc = NULL;

-

-  /* Get a DC to obtain the default palette */

-  hdc = GetDC (NULL);

-  if (hdc == NULL)

-    {

-      ErrorF ("winGetPaletteDD - Couldn't get a DC\n");

-      return FALSE;

-    }

-

-  /* Get the number of entries in the system palette */

-  uiSystemPaletteEntries = GetSystemPaletteEntries (hdc,

-						    0, 0, NULL);

-  if (uiSystemPaletteEntries == 0)

-    {

-      ErrorF ("winGetPaletteDD - Unable to determine number of "

-	      "system palette entries\n");

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winGetPaletteDD - uiSystemPaletteEntries %d\n",

-	  uiSystemPaletteEntries);

-#endif

-  

-  /* Allocate palette entries structure */

-  ppeColors = malloc (uiSystemPaletteEntries * sizeof (PALETTEENTRY));

-  if (ppeColors == NULL)

-    {

-      ErrorF ("winGetPaletteDD - malloc () for colormap failed\n");

-      return FALSE;

-    }

-

-  /* Get system palette entries */

-  GetSystemPaletteEntries (hdc,

-			   0, uiSystemPaletteEntries, ppeColors);

-

-  /* Allocate an X colormap entry for every system palette entry */

-  for (i = 0; i < uiSystemPaletteEntries; ++i)

-    {

-      pixel = i;

-

-      /* Extract the color values for current palette entry */

-      nRed = ppeColors[i].peRed << 8;

-      nGreen = ppeColors[i].peGreen << 8;

-      nBlue = ppeColors[i].peBlue << 8;

-#if CYGDEBUG

-      winDebug ("winGetPaletteDD - Allocating a color: %d; "

-	      "%d %d %d\n",

-	      pixel, nRed, nGreen, nBlue);

-#endif

-      if (AllocColor (pcmap,

-		      &nRed,

-		      &nGreen,

-		      &nBlue,

-		      &pixel,

-		      0) != Success)

-	{

-	  ErrorF ("winGetPaletteDD - AllocColor () failed, pixel %d\n",

-		  i);

-	  free (ppeColors);

-	  ppeColors = NULL;

-	  return FALSE;

-	}

-

-      pcmap->red[i].co.local.red = nRed;

-      pcmap->red[i].co.local.green = nGreen;

-      pcmap->red[i].co.local.blue = nBlue;

-    }

-

-  /* System is using a colormap */

-  /* Set the black and white pixel indices */

-  pScreen->whitePixel = uiSystemPaletteEntries - 1;

-  pScreen->blackPixel = 0;

-

-  /* Free colormap */

-  free(ppeColors);

-  ppeColors = NULL;

-

-  /* Free the DC */

-  if (hdc != NULL)

-    {

-      ReleaseDC (NULL, hdc);

-      hdc = NULL;

-    }

-

-  return TRUE;

-}

-

-

-/*

- * Install the standard fb colormap, or the GDI colormap,

- * depending on the current screen depth.

- */

-

-Bool

-winCreateDefColormap (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  unsigned short	zero = 0, ones = 0xFFFF;

-  VisualPtr		pVisual = pScreenPriv->pRootVisual;

-  ColormapPtr		pcmap = NULL;

-  Pixel			wp, bp;

-

-#if CYGDEBUG

-  winDebug ("winCreateDefColormap\n");

-#endif

-

-  /* Use standard fb colormaps for non palettized color modes */

-  if (pScreenInfo->dwBPP > 8)

-    {

-      winDebug ("winCreateDefColormap - Deferring to " \

-	      "fbCreateDefColormap ()\n");

-      return fbCreateDefColormap (pScreen);

-    }

-

-  /*

-   *  AllocAll for non-Dynamic visual classes,

-   *  AllocNone for Dynamic visual classes.

-   */

-

-  /*

-   * Dynamic visual classes allow the colors of the color map

-   * to be changed by clients.

-   */

-

-#if CYGDEBUG

-  winDebug ("winCreateDefColormap - defColormap: %d\n",

-	  pScreen->defColormap);

-#endif

-

-  /* Allocate an X colormap, owned by client 0 */

-  if (CreateColormap (pScreen->defColormap, 

-		      pScreen,

-		      pVisual,

-		      &pcmap,

-		      (pVisual->class & DynamicClass) ? AllocNone : AllocAll,

-		      0) != Success)

-    {

-      ErrorF ("winCreateDefColormap - CreateColormap failed\n");

-      return FALSE;

-    }

-  if (pcmap == NULL)

-    {

-      ErrorF ("winCreateDefColormap - Colormap could not be created\n");

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winCreateDefColormap - Created a colormap\n");

-#endif

-

-  /* Branch on the visual class */

-  if (!(pVisual->class & DynamicClass))

-    {

-      /* Branch on engine type */

-      if (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI)

-	{

-	  /* Load the colors being used by the Shadow DIB */

-	  if (!winGetPaletteDIB (pScreen, pcmap))

-	    {

-	      ErrorF ("winCreateDefColormap - Couldn't get DIB colors\n");

-	      return FALSE;

-	    }

-	}

-      else

-	{

-	  /* Load the colors from the default system palette */

-	  if (!winGetPaletteDD (pScreen, pcmap))

-	    {

-	      ErrorF ("winCreateDefColormap - Couldn't get colors "

-		      "for DD\n");

-	      return FALSE;

-	    }

-	}

-    }

-  else

-    {

-      wp = pScreen->whitePixel;

-      bp = pScreen->blackPixel;

-      

-      /* Allocate a black and white pixel */

-      if ((AllocColor (pcmap, &ones, &ones, &ones, &wp, 0) !=

-	   Success)

-	  ||

-	  (AllocColor (pcmap, &zero, &zero, &zero, &bp, 0) !=

-	   Success))

-	{

-	  ErrorF ("winCreateDefColormap - Couldn't allocate bp or wp\n");

-	  return FALSE;

-	}

-      

-      pScreen->whitePixel = wp;

-      pScreen->blackPixel = bp;

-

-#if 0

-      /* Have to reserve first 10 and last ten pixels in DirectDraw windowed */

-      if (pScreenInfo->dwEngine != WIN_SERVER_SHADOW_GDI)

-	{

-	  int		k;

-	  Pixel		p;

-

-	  for (k = 1; k < 10; ++k)

-	    {

-	      p = k;

-	      if (AllocColor (pcmap, &ones, &ones, &ones, &p, 0) != Success)

-		FatalError ("Foo!\n");

-	    }

-	  

-	  for (k = 245; k < 255; ++k)

-	    {

-	      p = k;

-	      if (AllocColor (pcmap, &zero, &zero, &zero, &p, 0) != Success)

-		FatalError ("Baz!\n");

-	    }

-	}

-#endif

-    }

-

-  /* Install the created colormap */

-  (*pScreen->InstallColormap)(pcmap);

-

-#if CYGDEBUG

-  winDebug ("winCreateDefColormap - Returning\n");

-#endif

-

-  return TRUE;

-}

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	Dakshinamurthy Karra
+ *		Suhaib M Siddiqi
+ *		Peter Busch
+ *		Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+/*
+ * Local prototypes
+ */
+
+static int
+ winListInstalledColormaps(ScreenPtr pScreen, Colormap * pmaps);
+
+static void
+ winStoreColors(ColormapPtr pmap, int ndef, xColorItem * pdefs);
+
+static void
+ winInstallColormap(ColormapPtr pmap);
+
+static void
+ winUninstallColormap(ColormapPtr pmap);
+
+static void
+
+winResolveColor(unsigned short *pred,
+                unsigned short *pgreen,
+                unsigned short *pblue, VisualPtr pVisual);
+
+static Bool
+ winCreateColormap(ColormapPtr pmap);
+
+static void
+ winDestroyColormap(ColormapPtr pmap);
+
+static Bool
+ winGetPaletteDIB(ScreenPtr pScreen, ColormapPtr pcmap);
+
+static Bool
+ winGetPaletteDD(ScreenPtr pScreen, ColormapPtr pcmap);
+
+/*
+ * Set screen functions for colormaps
+ */
+
+void
+winSetColormapFunctions(ScreenPtr pScreen)
+{
+    pScreen->CreateColormap = winCreateColormap;
+    pScreen->DestroyColormap = winDestroyColormap;
+    pScreen->InstallColormap = winInstallColormap;
+    pScreen->UninstallColormap = winUninstallColormap;
+    pScreen->ListInstalledColormaps = winListInstalledColormaps;
+    pScreen->StoreColors = winStoreColors;
+    pScreen->ResolveColor = winResolveColor;
+}
+
+/* See Porting Layer Definition - p. 30 */
+/*
+ * Walk the list of installed colormaps, filling the pmaps list
+ * with the resource ids of the installed maps, and return
+ * a count of the total number of installed maps.
+ */
+static int
+winListInstalledColormaps(ScreenPtr pScreen, Colormap * pmaps)
+{
+    winScreenPriv(pScreen);
+
+    /*
+     * There will only be one installed colormap, so we only need
+     * to return one id, and the count of installed maps will always
+     * be one.
+     */
+    *pmaps = pScreenPriv->pcmapInstalled->mid;
+    return 1;
+}
+
+/* See Porting Layer Definition - p. 30 */
+/* See Programming Windows - p. 663 */
+static void
+winInstallColormap(ColormapPtr pColormap)
+{
+    ScreenPtr pScreen = pColormap->pScreen;
+
+    winScreenPriv(pScreen);
+    ColormapPtr oldpmap = pScreenPriv->pcmapInstalled;
+
+#if CYGDEBUG
+    winDebug("winInstallColormap\n");
+#endif
+
+    /* Did the colormap actually change? */
+    if (pColormap != oldpmap) {
+#if CYGDEBUG
+        winDebug("winInstallColormap - Colormap has changed, attempt "
+                 "to install.\n");
+#endif
+
+        /* Was there a previous colormap? */
+        if (oldpmap != (ColormapPtr) None) {
+            /* There was a previous colormap; tell clients it is gone */
+            WalkTree(pColormap->pScreen, TellLostMap, (char *) &oldpmap->mid);
+        }
+
+        /* Install new colormap */
+        pScreenPriv->pcmapInstalled = pColormap;
+        WalkTree(pColormap->pScreen, TellGainedMap, (char *) &pColormap->mid);
+
+        /* Call the engine specific colormap install procedure */
+        if (!((*pScreenPriv->pwinInstallColormap) (pColormap))) {
+            winErrorFVerb(2,
+                          "winInstallColormap - Screen specific colormap install "
+                          "procedure failed.  Continuing, but colors may be "
+                          "messed up from now on.\n");
+        }
+    }
+
+    /* Save a pointer to the newly installed colormap */
+    pScreenPriv->pcmapInstalled = pColormap;
+}
+
+/* See Porting Layer Definition - p. 30 */
+static void
+winUninstallColormap(ColormapPtr pmap)
+{
+    winScreenPriv(pmap->pScreen);
+    ColormapPtr curpmap = pScreenPriv->pcmapInstalled;
+
+#if CYGDEBUG
+    winDebug("winUninstallColormap\n");
+#endif
+
+    /* Is the colormap currently installed? */
+    if (pmap != curpmap) {
+        /* Colormap not installed, nothing to do */
+        return;
+    }
+
+    /* Clear the installed colormap flag */
+    pScreenPriv->pcmapInstalled = NULL;
+
+    /*
+     * NOTE: The default colormap does not get "uninstalled" before
+     * it is destroyed.
+     */
+
+    /* Install the default cmap in place of the cmap to be uninstalled */
+    if (pmap->mid != pmap->pScreen->defColormap) {
+        dixLookupResourceByType((pointer) &curpmap, pmap->pScreen->defColormap,
+                                RT_COLORMAP, NullClient, DixUnknownAccess);
+        (*pmap->pScreen->InstallColormap) (curpmap);
+    }
+}
+
+/* See Porting Layer Definition - p. 30 */
+static void
+winStoreColors(ColormapPtr pmap, int ndef, xColorItem * pdefs)
+{
+    ScreenPtr pScreen = pmap->pScreen;
+
+    winScreenPriv(pScreen);
+    winCmapPriv(pmap);
+    int i;
+    unsigned short nRed, nGreen, nBlue;
+
+#if CYGDEBUG
+    if (ndef != 1)
+        winDebug("winStoreColors - ndef: %d\n", ndef);
+#endif
+
+    /* Save the new colors in the colormap privates */
+    for (i = 0; i < ndef; ++i) {
+        /* Adjust the colors from the X color spec to the Windows color spec */
+        nRed = pdefs[i].red >> 8;
+        nGreen = pdefs[i].green >> 8;
+        nBlue = pdefs[i].blue >> 8;
+
+        /* Copy the colors to a palette entry table */
+        pCmapPriv->peColors[pdefs[0].pixel + i].peRed = nRed;
+        pCmapPriv->peColors[pdefs[0].pixel + i].peGreen = nGreen;
+        pCmapPriv->peColors[pdefs[0].pixel + i].peBlue = nBlue;
+
+        /* Copy the colors to a RGBQUAD table */
+        pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbRed = nRed;
+        pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbGreen = nGreen;
+        pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbBlue = nBlue;
+
+#if CYGDEBUG
+        winDebug("winStoreColors - nRed %d nGreen %d nBlue %d\n",
+                 nRed, nGreen, nBlue);
+#endif
+    }
+
+    /* Call the engine specific store colors procedure */
+    if (!((pScreenPriv->pwinStoreColors) (pmap, ndef, pdefs))) {
+        winErrorFVerb(2,
+                      "winStoreColors - Engine cpecific color storage procedure "
+                      "failed.  Continuing, but colors may be messed up from now "
+                      "on.\n");
+    }
+}
+
+/* See Porting Layer Definition - p. 30 */
+static void
+winResolveColor(unsigned short *pred,
+                unsigned short *pgreen,
+                unsigned short *pblue, VisualPtr pVisual)
+{
+#if CYGDEBUG
+    winDebug("winResolveColor ()\n");
+#endif
+
+    miResolveColor(pred, pgreen, pblue, pVisual);
+}
+
+/* See Porting Layer Definition - p. 29 */
+static Bool
+winCreateColormap(ColormapPtr pmap)
+{
+    winPrivCmapPtr pCmapPriv = NULL;
+    ScreenPtr pScreen = pmap->pScreen;
+
+    winScreenPriv(pScreen);
+
+#if CYGDEBUG
+    winDebug("winCreateColormap\n");
+#endif
+
+    /* Allocate colormap privates */
+    if (!winAllocateCmapPrivates(pmap)) {
+        ErrorF("winCreateColorma - Couldn't allocate cmap privates\n");
+        return FALSE;
+    }
+
+    /* Get a pointer to the newly allocated privates */
+    pCmapPriv = winGetCmapPriv(pmap);
+
+    /*
+     * FIXME: This is some evil hackery to help in handling some X clients
+     * that expect the top pixel to be white.  This "help" only lasts until
+     * some client overwrites the top colormap entry.
+     * 
+     * We don't want to actually allocate the top entry, as that causes
+     * problems with X clients that need 7 planes (128 colors) in the default
+     * colormap, such as Magic 7.1.
+     */
+    pCmapPriv->rgbColors[WIN_NUM_PALETTE_ENTRIES - 1].rgbRed = 255;
+    pCmapPriv->rgbColors[WIN_NUM_PALETTE_ENTRIES - 1].rgbGreen = 255;
+    pCmapPriv->rgbColors[WIN_NUM_PALETTE_ENTRIES - 1].rgbBlue = 255;
+    pCmapPriv->peColors[WIN_NUM_PALETTE_ENTRIES - 1].peRed = 255;
+    pCmapPriv->peColors[WIN_NUM_PALETTE_ENTRIES - 1].peGreen = 255;
+    pCmapPriv->peColors[WIN_NUM_PALETTE_ENTRIES - 1].peBlue = 255;
+
+    /* Call the engine specific colormap initialization procedure */
+    if (!((*pScreenPriv->pwinCreateColormap) (pmap))) {
+        ErrorF("winCreateColormap - Engine specific colormap creation "
+               "procedure failed.  Aborting.\n");
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/* See Porting Layer Definition - p. 29, 30 */
+static void
+winDestroyColormap(ColormapPtr pColormap)
+{
+    winScreenPriv(pColormap->pScreen);
+    winCmapPriv(pColormap);
+
+    /* Call the engine specific colormap destruction procedure */
+    if (!((*pScreenPriv->pwinDestroyColormap) (pColormap))) {
+        winErrorFVerb(2,
+                      "winDestroyColormap - Engine specific colormap destruction "
+                      "procedure failed.  Continuing, but it is possible that memory "
+                      "was leaked, or that colors will be messed up from now on.\n");
+    }
+
+    /* Free the colormap privates */
+    free(pCmapPriv);
+    winSetCmapPriv(pColormap, NULL);
+
+#if CYGDEBUG
+    winDebug("winDestroyColormap - Returning\n");
+#endif
+}
+
+/*
+ * Internal function to load the palette used by the Shadow DIB
+ */
+
+static Bool
+winGetPaletteDIB(ScreenPtr pScreen, ColormapPtr pcmap)
+{
+    winScreenPriv(pScreen);
+    int i;
+    Pixel pixel;                /* Pixel == CARD32 */
+    CARD16 nRed, nGreen, nBlue; /* CARD16 == unsigned short */
+    UINT uiColorsRetrieved = 0;
+    RGBQUAD rgbColors[WIN_NUM_PALETTE_ENTRIES];
+
+    /* Get the color table for the screen */
+    uiColorsRetrieved = GetDIBColorTable(pScreenPriv->hdcScreen,
+                                         0, WIN_NUM_PALETTE_ENTRIES, rgbColors);
+    if (uiColorsRetrieved == 0) {
+        ErrorF("winGetPaletteDIB - Could not retrieve screen color table\n");
+        return FALSE;
+    }
+
+#if CYGDEBUG
+    winDebug("winGetPaletteDIB - Retrieved %d colors from DIB\n",
+             uiColorsRetrieved);
+#endif
+
+    /* Set the DIB color table to the default screen palette */
+    if (SetDIBColorTable(pScreenPriv->hdcShadow,
+                         0, uiColorsRetrieved, rgbColors) == 0) {
+        ErrorF("winGetPaletteDIB - SetDIBColorTable () failed\n");
+        return FALSE;
+    }
+
+    /* Alloc each color in the DIB color table */
+    for (i = 0; i < uiColorsRetrieved; ++i) {
+        pixel = i;
+
+        /* Extract the color values for current palette entry */
+        nRed = rgbColors[i].rgbRed << 8;
+        nGreen = rgbColors[i].rgbGreen << 8;
+        nBlue = rgbColors[i].rgbBlue << 8;
+
+#if CYGDEBUG
+        winDebug("winGetPaletteDIB - Allocating a color: %d; "
+                 "%d %d %d\n", pixel, nRed, nGreen, nBlue);
+#endif
+
+        /* Allocate a entry in the X colormap */
+        if (AllocColor(pcmap, &nRed, &nGreen, &nBlue, &pixel, 0) != Success) {
+            ErrorF("winGetPaletteDIB - AllocColor () failed, pixel %d\n", i);
+            return FALSE;
+        }
+
+        if (i != pixel
+            || nRed != rgbColors[i].rgbRed
+            || nGreen != rgbColors[i].rgbGreen
+            || nBlue != rgbColors[i].rgbBlue) {
+            winDebug("winGetPaletteDIB - Got: %d; "
+                     "%d %d %d\n", (int) pixel, nRed, nGreen, nBlue);
+        }
+
+        /* FIXME: Not sure that this bit is needed at all */
+        pcmap->red[i].co.local.red = nRed;
+        pcmap->red[i].co.local.green = nGreen;
+        pcmap->red[i].co.local.blue = nBlue;
+    }
+
+    /* System is using a colormap */
+    /* Set the black and white pixel indices */
+    pScreen->whitePixel = uiColorsRetrieved - 1;
+    pScreen->blackPixel = 0;
+
+    return TRUE;
+}
+
+/*
+ * Internal function to load the standard system palette being used by DD
+ */
+
+static Bool
+winGetPaletteDD(ScreenPtr pScreen, ColormapPtr pcmap)
+{
+    int i;
+    Pixel pixel;                /* Pixel == CARD32 */
+    CARD16 nRed, nGreen, nBlue; /* CARD16 == unsigned short */
+    UINT uiSystemPaletteEntries;
+    LPPALETTEENTRY ppeColors = NULL;
+    HDC hdc = NULL;
+
+    /* Get a DC to obtain the default palette */
+    hdc = GetDC(NULL);
+    if (hdc == NULL) {
+        ErrorF("winGetPaletteDD - Couldn't get a DC\n");
+        return FALSE;
+    }
+
+    /* Get the number of entries in the system palette */
+    uiSystemPaletteEntries = GetSystemPaletteEntries(hdc, 0, 0, NULL);
+    if (uiSystemPaletteEntries == 0) {
+        ErrorF("winGetPaletteDD - Unable to determine number of "
+               "system palette entries\n");
+        return FALSE;
+    }
+
+#if CYGDEBUG
+    winDebug("winGetPaletteDD - uiSystemPaletteEntries %d\n",
+             uiSystemPaletteEntries);
+#endif
+
+    /* Allocate palette entries structure */
+    ppeColors = malloc(uiSystemPaletteEntries * sizeof(PALETTEENTRY));
+    if (ppeColors == NULL) {
+        ErrorF("winGetPaletteDD - malloc () for colormap failed\n");
+        return FALSE;
+    }
+
+    /* Get system palette entries */
+    GetSystemPaletteEntries(hdc, 0, uiSystemPaletteEntries, ppeColors);
+
+    /* Allocate an X colormap entry for every system palette entry */
+    for (i = 0; i < uiSystemPaletteEntries; ++i) {
+        pixel = i;
+
+        /* Extract the color values for current palette entry */
+        nRed = ppeColors[i].peRed << 8;
+        nGreen = ppeColors[i].peGreen << 8;
+        nBlue = ppeColors[i].peBlue << 8;
+#if CYGDEBUG
+        winDebug("winGetPaletteDD - Allocating a color: %d; "
+                 "%d %d %d\n", pixel, nRed, nGreen, nBlue);
+#endif
+        if (AllocColor(pcmap, &nRed, &nGreen, &nBlue, &pixel, 0) != Success) {
+            ErrorF("winGetPaletteDD - AllocColor () failed, pixel %d\n", i);
+            free(ppeColors);
+            ppeColors = NULL;
+            return FALSE;
+        }
+
+        pcmap->red[i].co.local.red = nRed;
+        pcmap->red[i].co.local.green = nGreen;
+        pcmap->red[i].co.local.blue = nBlue;
+    }
+
+    /* System is using a colormap */
+    /* Set the black and white pixel indices */
+    pScreen->whitePixel = uiSystemPaletteEntries - 1;
+    pScreen->blackPixel = 0;
+
+    /* Free colormap */
+    free(ppeColors);
+    ppeColors = NULL;
+
+    /* Free the DC */
+    if (hdc != NULL) {
+        ReleaseDC(NULL, hdc);
+        hdc = NULL;
+    }
+
+    return TRUE;
+}
+
+/*
+ * Install the standard fb colormap, or the GDI colormap,
+ * depending on the current screen depth.
+ */
+
+Bool
+winCreateDefColormap(ScreenPtr pScreen)
+{
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    unsigned short zero = 0, ones = 0xFFFF;
+    VisualPtr pVisual = pScreenPriv->pRootVisual;
+    ColormapPtr pcmap = NULL;
+    Pixel wp, bp;
+
+#if CYGDEBUG
+    winDebug("winCreateDefColormap\n");
+#endif
+
+    /* Use standard fb colormaps for non palettized color modes */
+    if (pScreenInfo->dwBPP > 8) {
+        winDebug("winCreateDefColormap - Deferring to "
+                 "fbCreateDefColormap ()\n");
+        return fbCreateDefColormap(pScreen);
+    }
+
+    /*
+     *  AllocAll for non-Dynamic visual classes,
+     *  AllocNone for Dynamic visual classes.
+     */
+
+    /*
+     * Dynamic visual classes allow the colors of the color map
+     * to be changed by clients.
+     */
+
+#if CYGDEBUG
+    winDebug("winCreateDefColormap - defColormap: %d\n", pScreen->defColormap);
+#endif
+
+    /* Allocate an X colormap, owned by client 0 */
+    if (CreateColormap(pScreen->defColormap,
+                       pScreen,
+                       pVisual,
+                       &pcmap,
+                       (pVisual->class & DynamicClass) ? AllocNone : AllocAll,
+                       0) != Success) {
+        ErrorF("winCreateDefColormap - CreateColormap failed\n");
+        return FALSE;
+    }
+    if (pcmap == NULL) {
+        ErrorF("winCreateDefColormap - Colormap could not be created\n");
+        return FALSE;
+    }
+
+#if CYGDEBUG
+    winDebug("winCreateDefColormap - Created a colormap\n");
+#endif
+
+    /* Branch on the visual class */
+    if (!(pVisual->class & DynamicClass)) {
+        /* Branch on engine type */
+        if (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI) {
+            /* Load the colors being used by the Shadow DIB */
+            if (!winGetPaletteDIB(pScreen, pcmap)) {
+                ErrorF("winCreateDefColormap - Couldn't get DIB colors\n");
+                return FALSE;
+            }
+        }
+        else {
+            /* Load the colors from the default system palette */
+            if (!winGetPaletteDD(pScreen, pcmap)) {
+                ErrorF("winCreateDefColormap - Couldn't get colors "
+                       "for DD\n");
+                return FALSE;
+            }
+        }
+    }
+    else {
+        wp = pScreen->whitePixel;
+        bp = pScreen->blackPixel;
+
+        /* Allocate a black and white pixel */
+        if ((AllocColor(pcmap, &ones, &ones, &ones, &wp, 0) != Success)
+            || (AllocColor(pcmap, &zero, &zero, &zero, &bp, 0) != Success)) {
+            ErrorF("winCreateDefColormap - Couldn't allocate bp or wp\n");
+            return FALSE;
+        }
+
+        pScreen->whitePixel = wp;
+        pScreen->blackPixel = bp;
+
+#if 0
+        /* Have to reserve first 10 and last ten pixels in DirectDraw windowed */
+        if (pScreenInfo->dwEngine != WIN_SERVER_SHADOW_GDI) {
+            int k;
+            Pixel p;
+
+            for (k = 1; k < 10; ++k) {
+                p = k;
+                if (AllocColor(pcmap, &ones, &ones, &ones, &p, 0) != Success)
+                    FatalError("Foo!\n");
+            }
+
+            for (k = 245; k < 255; ++k) {
+                p = k;
+                if (AllocColor(pcmap, &zero, &zero, &zero, &p, 0) != Success)
+                    FatalError("Baz!\n");
+            }
+        }
+#endif
+    }
+
+    /* Install the created colormap */
+    (*pScreen->InstallColormap) (pcmap);
+
+#if CYGDEBUG
+    winDebug("winCreateDefColormap - Returning\n");
+#endif
+
+    return TRUE;
+}
diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c
index 4dbbe7ced..313320f1a 100644
--- a/xorg-server/hw/xwin/winconfig.c
+++ b/xorg-server/hw/xwin/winconfig.c
@@ -63,42 +63,42 @@ XF86ConfigPtr g_xf86configptr = NULL;
 
 WinCmdlineRec g_cmdline = {
 #ifdef XWIN_XF86CONFIG
-  NULL,				/* configFile */
-  NULL,				/* configDir */
+    NULL,                       /* configFile */
+    NULL,                       /* configDir */
 #endif
-  NULL,				/* fontPath */
+    NULL,                       /* fontPath */
 #ifdef XWIN_XF86CONFIG
-  NULL,				/* keyboard */
+    NULL,                       /* keyboard */
 #endif
-  NULL,             /* xkbRules */
-  NULL,             /* xkbModel */
-  NULL,             /* xkbLayout */
-  NULL,             /* xkbVariant */
-  NULL,             /* xkbOptions */
-  NULL,				/* screenname */
-  NULL,				/* mousename */
-  FALSE,			/* emulate3Buttons */
-  0				/* emulate3Timeout */
+    NULL,                       /* xkbRules */
+    NULL,                       /* xkbModel */
+    NULL,                       /* xkbLayout */
+    NULL,                       /* xkbVariant */
+    NULL,                       /* xkbOptions */
+    NULL,                       /* screenname */
+    NULL,                       /* mousename */
+    FALSE,                      /* emulate3Buttons */
+    0                           /* emulate3Timeout */
 };
 
 winInfoRec g_winInfo = {
-  {				/* keyboard */
-   0,				/* leds */
-   500,				/* delay */
-   30				/* rate */
-   }
-  ,
-  {				/* xkb */
-   NULL,			/* rules */
-   NULL,			/* model */
-   NULL,			/* layout */
-   NULL,			/* variant */
-   NULL,			/* options */
-   }
-  ,
-  {
-   FALSE,
-   50}
+    {                           /* keyboard */
+     0,                         /* leds */
+     500,                       /* delay */
+     30                         /* rate */
+     }
+    ,
+    {                           /* xkb */
+     NULL,                      /* rules */
+     NULL,                      /* model */
+     NULL,                      /* layout */
+     NULL,                      /* variant */
+     NULL,                      /* options */
+     }
+    ,
+    {
+     FALSE,
+     50}
 };
 
 #define NULL_IF_EMPTY(x) (winNameCompare(x,"")?x:NULL)
@@ -106,131 +106,112 @@ winInfoRec g_winInfo = {
 #ifdef XWIN_XF86CONFIG
 serverLayoutRec g_winConfigLayout;
 
-static Bool ParseOptionValue (int scrnIndex, pointer options,
-			      OptionInfoPtr p);
-static Bool configLayout (serverLayoutPtr, XF86ConfLayoutPtr, char *);
-static Bool configImpliedLayout (serverLayoutPtr, XF86ConfScreenPtr);
-static Bool GetBoolValue (OptionInfoPtr p, const char *s);
-
+static Bool ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p);
+static Bool configLayout(serverLayoutPtr, XF86ConfLayoutPtr, char *);
+static Bool configImpliedLayout(serverLayoutPtr, XF86ConfScreenPtr);
+static Bool GetBoolValue(OptionInfoPtr p, const char *s);
 
 Bool
-winReadConfigfile ()
+winReadConfigfile()
 {
-  Bool		retval = TRUE;
-  char		*filename, *dirname;
-  MessageType	filefrom = X_DEFAULT;
-  MessageType	dirfrom = X_DEFAULT;
-  char		*xf86ConfigFile = NULL;
-  char		*xf86ConfigDir = NULL;
-
-  if (g_cmdline.configFile)
-    {
-      filefrom = X_CMDLINE;
-      xf86ConfigFile = g_cmdline.configFile;
+    Bool retval = TRUE;
+    char *filename, *dirname;
+    MessageType filefrom = X_DEFAULT;
+    MessageType dirfrom = X_DEFAULT;
+    char *xf86ConfigFile = NULL;
+    char *xf86ConfigDir = NULL;
+
+    if (g_cmdline.configFile) {
+        filefrom = X_CMDLINE;
+        xf86ConfigFile = g_cmdline.configFile;
     }
-  if (g_cmdline.configDir)
-    {
-      dirfrom = X_CMDLINE;
-      xf86ConfigDir = g_cmdline.configDir;
+    if (g_cmdline.configDir) {
+        dirfrom = X_CMDLINE;
+        xf86ConfigDir = g_cmdline.configDir;
     }
 
-  /* Parse config file into data structure */
-  xf86initConfigFiles();
-  dirname = xf86openConfigDirFiles (CONFIGDIRPATH, xf86ConfigDir, PROJECTROOT);
-  filename = xf86openConfigFile (CONFIGPATH, xf86ConfigFile, PROJECTROOT);
+    /* Parse config file into data structure */
+    xf86initConfigFiles();
+    dirname = xf86openConfigDirFiles(CONFIGDIRPATH, xf86ConfigDir, PROJECTROOT);
+    filename = xf86openConfigFile(CONFIGPATH, xf86ConfigFile, PROJECTROOT);
 
-  /* Hack for backward compatibility */
-  if (!filename && from == X_DEFAULT)
-    filename = xf86openConfigFile (CONFIGPATH, "XF86Config", PROJECTROOT);
+    /* Hack for backward compatibility */
+    if (!filename && from == X_DEFAULT)
+        filename = xf86openConfigFile(CONFIGPATH, "XF86Config", PROJECTROOT);
 
-  if (filename)
-    {
-      winMsg (from, "Using config file: \"%s\"\n", filename);
+    if (filename) {
+        winMsg(from, "Using config file: \"%s\"\n", filename);
     }
-  else
-    {
-      winMsg (X_ERROR, "Unable to locate/open config file");
-      if (xf86ConfigFile)
-	ErrorF (": \"%s\"", xf86ConfigFile);
-      ErrorF ("\n");
+    else {
+        winMsg(X_ERROR, "Unable to locate/open config file");
+        if (xf86ConfigFile)
+            ErrorF(": \"%s\"", xf86ConfigFile);
+        ErrorF("\n");
     }
-  if (dirname)
-    {
-      winMsg (from, "Using config directory: \"%s\"\n", dirname);
+    if (dirname) {
+        winMsg(from, "Using config directory: \"%s\"\n", dirname);
     }
-  else
-    {
-      winMsg (X_ERROR, "Unable to locate/open config directory");
-      if (xf86ConfigDir)
-	ErrorF (": \"%s\"", xf86ConfigDir);
-      ErrorF ("\n");
+    else {
+        winMsg(X_ERROR, "Unable to locate/open config directory");
+        if (xf86ConfigDir)
+            ErrorF(": \"%s\"", xf86ConfigDir);
+        ErrorF("\n");
     }
-  if (!filename && !dirname)
-    {
-      return FALSE;
+    if (!filename && !dirname) {
+        return FALSE;
     }
-  free(filename);
-  free(dirname);
-  if ((g_xf86configptr = xf86readConfigFile ()) == NULL)
-    {
-      winMsg (X_ERROR, "Problem parsing the config file\n");
-      return FALSE;
+    free(filename);
+    free(dirname);
+    if ((g_xf86configptr = xf86readConfigFile()) == NULL) {
+        winMsg(X_ERROR, "Problem parsing the config file\n");
+        return FALSE;
     }
-  xf86closeConfigFile ();
+    xf86closeConfigFile();
 
-  LogPrintMarkers();
+    LogPrintMarkers();
 
-  /* set options from data structure */
+    /* set options from data structure */
 
-  if (g_xf86configptr->conf_layout_lst == NULL || g_cmdline.screenname != NULL)
-    {
-      if (g_cmdline.screenname == NULL)
-	{
-	  winMsg (X_WARNING,
-		  "No Layout section. Using the first Screen section.\n");
-	}
-      if (!configImpliedLayout (&g_winConfigLayout,
-				g_xf86configptr->conf_screen_lst))
-	{
-	  winMsg (X_ERROR, "Unable to determine the screen layout\n");
-	  return FALSE;
-	}
+    if (g_xf86configptr->conf_layout_lst == NULL ||
+        g_cmdline.screenname != NULL) {
+        if (g_cmdline.screenname == NULL) {
+            winMsg(X_WARNING,
+                   "No Layout section. Using the first Screen section.\n");
+        }
+        if (!configImpliedLayout(&g_winConfigLayout,
+                                 g_xf86configptr->conf_screen_lst)) {
+            winMsg(X_ERROR, "Unable to determine the screen layout\n");
+            return FALSE;
+        }
     }
-  else
-    {
-      /* Check if layout is given in the config file */
-      if (g_xf86configptr->conf_flags != NULL)
-	{
-	  char *dfltlayout = NULL;
-	  pointer optlist = g_xf86configptr->conf_flags->flg_option_lst;
-
-	  if (optlist && winFindOption (optlist, "defaultserverlayout"))
-	    dfltlayout =
-	      winSetStrOption (optlist, "defaultserverlayout", NULL);
-
-	  if (!configLayout (&g_winConfigLayout,
-			     g_xf86configptr->conf_layout_lst,
-			     dfltlayout))
-	    {
-	      winMsg (X_ERROR, "Unable to determine the screen layout\n");
-	      return FALSE;
-	    }
-	}
-      else
-	{
-	  if (!configLayout (&g_winConfigLayout,
-			     g_xf86configptr->conf_layout_lst,
-			     NULL))
-	    {
-	      winMsg (X_ERROR, "Unable to determine the screen layout\n");
-	      return FALSE;
-	    }
-	}
+    else {
+        /* Check if layout is given in the config file */
+        if (g_xf86configptr->conf_flags != NULL) {
+            char *dfltlayout = NULL;
+            pointer optlist = g_xf86configptr->conf_flags->flg_option_lst;
+
+            if (optlist && winFindOption(optlist, "defaultserverlayout"))
+                dfltlayout =
+                    winSetStrOption(optlist, "defaultserverlayout", NULL);
+
+            if (!configLayout(&g_winConfigLayout,
+                              g_xf86configptr->conf_layout_lst, dfltlayout)) {
+                winMsg(X_ERROR, "Unable to determine the screen layout\n");
+                return FALSE;
+            }
+        }
+        else {
+            if (!configLayout(&g_winConfigLayout,
+                              g_xf86configptr->conf_layout_lst, NULL)) {
+                winMsg(X_ERROR, "Unable to determine the screen layout\n");
+                return FALSE;
+            }
+        }
     }
 
-  /* setup special config files */
-  winConfigFiles ();
-  return retval;
+    /* setup special config files */
+    winConfigFiles();
+    return retval;
 }
 #endif
 
@@ -239,468 +220,437 @@ winReadConfigfile ()
 
 /* Set the keyboard configuration */
 Bool
-winConfigKeyboard (DeviceIntPtr pDevice)
+winConfigKeyboard(DeviceIntPtr pDevice)
 {
-  char                          layoutName[KL_NAMELENGTH];
-  unsigned char                 layoutFriendlyName[256];
-  static unsigned int           layoutNum = 0;
-  int                           keyboardType;
+    char layoutName[KL_NAMELENGTH];
+    unsigned char layoutFriendlyName[256];
+    static unsigned int layoutNum = 0;
+    int keyboardType;
+
 #ifdef XWIN_XF86CONFIG
-  XF86ConfInputPtr		kbd = NULL;
-  XF86ConfInputPtr		input_list = NULL;
-  MessageType			kbdfrom = X_CONFIG;
+    XF86ConfInputPtr kbd = NULL;
+    XF86ConfInputPtr input_list = NULL;
+    MessageType kbdfrom = X_CONFIG;
 #endif
-  MessageType			from = X_DEFAULT;
-  char				*s = NULL;
-
-  /* Setup defaults */
-  XkbGetRulesDflts(&g_winInfo.xkb);
-
-  /*
-   * Query the windows autorepeat settings and change the xserver defaults.   
-   */
-  {
-    int kbd_delay;
-    DWORD kbd_speed;
-    if (SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &kbd_delay, 0) &&
-        SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &kbd_speed, 0))
-      {
-        switch (kbd_delay) 
-          {
-            case 0:  g_winInfo.keyboard.delay = 250; break;
-            case 1:  g_winInfo.keyboard.delay = 500; break;
-            case 2:  g_winInfo.keyboard.delay = 750; break;
-            default:
-            case 3:  g_winInfo.keyboard.delay = 1000; break;
-          }
-        g_winInfo.keyboard.rate = (kbd_speed>0)?kbd_speed:1;
-        winMsgVerb(X_PROBED, 1, "Setting autorepeat to delay=%d, rate=%d\n",
-                g_winInfo.keyboard.delay, g_winInfo.keyboard.rate);
-      }
-  }
-  
-
-  keyboardType = GetKeyboardType (0);
-  if (keyboardType > 0 && GetKeyboardLayoutName (layoutName)) 
-  {
-    WinKBLayoutPtr	pLayout;
-    Bool                bfound = FALSE;
-
-    if (! layoutNum)
-      layoutNum = strtoul (layoutName, (char **)NULL, 16);
-    if ((layoutNum & 0xffff) == 0x411) {
-        /* The japanese layouts know a lot of different IMEs which all have
-	   different layout numbers set. Map them to a single entry. 
-	   Same might apply for chinese, korean and other symbol languages
-	   too */
-        layoutNum = (layoutNum & 0xffff);
-	if (keyboardType == 7)
-	  {
-	    /* Japanese layouts have problems with key event messages
-	       such as the lack of WM_KEYUP for Caps Lock key.
-	       Loading US layout fixes this problem. */
-	    if (LoadKeyboardLayout("00000409", KLF_ACTIVATE) != NULL)
-	      winMsg (X_INFO, "Loading US keyboard layout.\n");
-	    else
-	      winMsg (X_ERROR, "LoadKeyboardLayout failed.\n");
-	  }
-    }
+    MessageType from = X_DEFAULT;
+    char *s = NULL;
 
-    /* Discover the friendly name of the current layout */
+    /* Setup defaults */
+    XkbGetRulesDflts(&g_winInfo.xkb);
+
+    /*
+     * Query the windows autorepeat settings and change the xserver defaults.   
+     */
     {
-      HKEY                regkey = NULL;
-      const char          regtempl[] = "SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\";
-      char                *regpath;
-      DWORD               namesize = sizeof(layoutFriendlyName);
-
-      regpath = malloc(sizeof(regtempl) + KL_NAMELENGTH + 1);
-      strcpy(regpath, regtempl);
-      strcat(regpath, layoutName);
-
-      if (!RegOpenKey(HKEY_LOCAL_MACHINE, regpath, &regkey))
-          RegQueryValueEx(regkey, "Layout Text", 0, NULL, layoutFriendlyName, &namesize);
-
-      /* Close registry key */
-      if (regkey)
-        RegCloseKey (regkey);
-      free(regpath);
+        int kbd_delay;
+        DWORD kbd_speed;
+
+        if (SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &kbd_delay, 0) &&
+            SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &kbd_speed, 0)) {
+            switch (kbd_delay) {
+            case 0:
+                g_winInfo.keyboard.delay = 250;
+                break;
+            case 1:
+                g_winInfo.keyboard.delay = 500;
+                break;
+            case 2:
+                g_winInfo.keyboard.delay = 750;
+                break;
+            default:
+            case 3:
+                g_winInfo.keyboard.delay = 1000;
+                break;
+            }
+            g_winInfo.keyboard.rate = (kbd_speed > 0) ? kbd_speed : 1;
+            winMsgVerb(X_PROBED, 1, "Setting autorepeat to delay=%d, rate=%d\n",
+                       g_winInfo.keyboard.delay, g_winInfo.keyboard.rate);
+        }
     }
 
-    winMsg (X_PROBED, "Windows keyboard layout: \"%s\" (%08x) \"%s\", type %d\n",
-            layoutName, layoutNum, layoutFriendlyName, keyboardType);
-
-    for (pLayout = winKBLayouts; pLayout->winlayout != -1; pLayout++)
-      {
-	if (pLayout->winlayout != layoutNum)
-	  continue;
-	if (pLayout->winkbtype > 0 && pLayout->winkbtype != keyboardType)
-	  continue;
+    keyboardType = GetKeyboardType(0);
+    if (keyboardType > 0 && GetKeyboardLayoutName(layoutName)) {
+        WinKBLayoutPtr pLayout;
+        Bool bfound = FALSE;
+
+        if (!layoutNum)
+            layoutNum = strtoul(layoutName, (char **) NULL, 16);
+        if ((layoutNum & 0xffff) == 0x411) {
+            /* The japanese layouts know a lot of different IMEs which all have
+               different layout numbers set. Map them to a single entry. 
+               Same might apply for chinese, korean and other symbol languages
+               too */
+            layoutNum = (layoutNum & 0xffff);
+            if (keyboardType == 7) {
+                /* Japanese layouts have problems with key event messages
+                   such as the lack of WM_KEYUP for Caps Lock key.
+                   Loading US layout fixes this problem. */
+                if (LoadKeyboardLayout("00000409", KLF_ACTIVATE) != NULL)
+                    winMsg(X_INFO, "Loading US keyboard layout.\n");
+                else
+                    winMsg(X_ERROR, "LoadKeyboardLayout failed.\n");
+            }
+        }
 
-        bfound = TRUE;
-	winMsg (X_PROBED,
-		"Found matching XKB configuration \"%s\"\n",
-		pLayout->layoutname);
+        /* Discover the friendly name of the current layout */
+        {
+            HKEY regkey = NULL;
+            const char regtempl[] =
+                "SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\";
+            char *regpath;
+            DWORD namesize = sizeof(layoutFriendlyName);
+
+            regpath = malloc(sizeof(regtempl) + KL_NAMELENGTH + 1);
+            strcpy(regpath, regtempl);
+            strcat(regpath, layoutName);
+
+            if (!RegOpenKey(HKEY_LOCAL_MACHINE, regpath, &regkey))
+                RegQueryValueEx(regkey, "Layout Text", 0, NULL,
+                                layoutFriendlyName, &namesize);
+
+            /* Close registry key */
+            if (regkey)
+                RegCloseKey(regkey);
+            free(regpath);
+        }
 
         winMsg(X_PROBED,
-               "Model = \"%s\" Layout = \"%s\""
-               " Variant = \"%s\" Options = \"%s\"\n",
-               pLayout->xkbmodel ? pLayout->xkbmodel : "none",
-               pLayout->xkblayout ? pLayout->xkblayout : "none",
-               pLayout->xkbvariant ? pLayout->xkbvariant : "none",
-               pLayout->xkboptions ? pLayout->xkboptions : "none");
-
-	g_winInfo.xkb.model = pLayout->xkbmodel;
-	g_winInfo.xkb.layout = pLayout->xkblayout;
-	g_winInfo.xkb.variant = pLayout->xkbvariant;
-	g_winInfo.xkb.options = pLayout->xkboptions;
-
-
-	break;
-      }
+               "Windows keyboard layout: \"%s\" (%08x) \"%s\", type %d\n",
+               layoutName, layoutNum, layoutFriendlyName, keyboardType);
+
+        for (pLayout = winKBLayouts; pLayout->winlayout != -1; pLayout++) {
+            if (pLayout->winlayout != layoutNum)
+                continue;
+            if (pLayout->winkbtype > 0 && pLayout->winkbtype != keyboardType)
+                continue;
+
+            bfound = TRUE;
+            winMsg(X_PROBED,
+                   "Found matching XKB configuration \"%s\"\n",
+                   pLayout->layoutname);
+
+            winMsg(X_PROBED,
+                   "Model = \"%s\" Layout = \"%s\""
+                   " Variant = \"%s\" Options = \"%s\"\n",
+                   pLayout->xkbmodel ? pLayout->xkbmodel : "none",
+                   pLayout->xkblayout ? pLayout->xkblayout : "none",
+                   pLayout->xkbvariant ? pLayout->xkbvariant : "none",
+                   pLayout->xkboptions ? pLayout->xkboptions : "none");
+
+            g_winInfo.xkb.model = pLayout->xkbmodel;
+            g_winInfo.xkb.layout = pLayout->xkblayout;
+            g_winInfo.xkb.variant = pLayout->xkbvariant;
+            g_winInfo.xkb.options = pLayout->xkboptions;
+
+            break;
+        }
 
-    if (!bfound)
-      {
-        winMsg (X_ERROR, "Keyboardlayout \"%s\" (%s) is unknown, using X server default layout\n", layoutFriendlyName, layoutName);
-      }
-  }
+        if (!bfound) {
+            winMsg(X_ERROR,
+                   "Keyboardlayout \"%s\" (%s) is unknown, using X server default layout\n",
+                   layoutFriendlyName, layoutName);
+        }
+    }
 
-  /* parse the configuration */
+    /* parse the configuration */
 #ifdef XWIN_XF86CONFIG
-  if (g_cmdline.keyboard)
-    kbdfrom = X_CMDLINE;
-
-  /*
-   * Until the layout code is finished, I search for the keyboard 
-   * device and configure the server with it.
-   */
-
-  if (g_xf86configptr != NULL)
-    input_list = g_xf86configptr->conf_input_lst;
-
-  while (input_list != NULL)
-    {
-      if (winNameCompare (input_list->inp_driver, "keyboard") == 0)
-	{
-	  /* Check if device name matches requested name */
-	  if (g_cmdline.keyboard && winNameCompare (input_list->inp_identifier,
-						    g_cmdline.keyboard))
-	    continue;
-	  kbd = input_list;
-	}
-      input_list = input_list->list.next;
+    if (g_cmdline.keyboard)
+        kbdfrom = X_CMDLINE;
+
+    /*
+     * Until the layout code is finished, I search for the keyboard 
+     * device and configure the server with it.
+     */
+
+    if (g_xf86configptr != NULL)
+        input_list = g_xf86configptr->conf_input_lst;
+
+    while (input_list != NULL) {
+        if (winNameCompare(input_list->inp_driver, "keyboard") == 0) {
+            /* Check if device name matches requested name */
+            if (g_cmdline.keyboard && winNameCompare(input_list->inp_identifier,
+                                                     g_cmdline.keyboard))
+                continue;
+            kbd = input_list;
+        }
+        input_list = input_list->list.next;
     }
 
-  if (kbd != NULL)
-    {
-
-      if (kbd->inp_identifier)
-	winMsg (kbdfrom, "Using keyboard \"%s\" as primary keyboard\n",
-		kbd->inp_identifier);
-
-      if ((s = winSetStrOption(kbd->inp_option_lst, "AutoRepeat", NULL)))
-        {
-          if ((sscanf(s, "%ld %ld", &g_winInfo.keyboard.delay, 
-                      &g_winInfo.keyboard.rate) != 2) ||
-                  (g_winInfo.keyboard.delay < 1) || 
-                  (g_winInfo.keyboard.rate == 0) || 
-                  (1000 / g_winInfo.keyboard.rate) < 1) 
-            {
-              winErrorFVerb (2, "\"%s\" is not a valid AutoRepeat value", s);
-              free(s);
-              return FALSE;
+    if (kbd != NULL) {
+
+        if (kbd->inp_identifier)
+            winMsg(kbdfrom, "Using keyboard \"%s\" as primary keyboard\n",
+                   kbd->inp_identifier);
+
+        if ((s = winSetStrOption(kbd->inp_option_lst, "AutoRepeat", NULL))) {
+            if ((sscanf(s, "%ld %ld", &g_winInfo.keyboard.delay,
+                        &g_winInfo.keyboard.rate) != 2) ||
+                (g_winInfo.keyboard.delay < 1) ||
+                (g_winInfo.keyboard.rate == 0) ||
+                (1000 / g_winInfo.keyboard.rate) < 1) {
+                winErrorFVerb(2, "\"%s\" is not a valid AutoRepeat value", s);
+                free(s);
+                return FALSE;
             }
-          free(s);
-          winMsg (X_CONFIG, "AutoRepeat: %ld %ld\n", 
-                  g_winInfo.keyboard.delay, g_winInfo.keyboard.rate);
+            free(s);
+            winMsg(X_CONFIG, "AutoRepeat: %ld %ld\n",
+                   g_winInfo.keyboard.delay, g_winInfo.keyboard.rate);
         }
 #endif
-      
+
         s = NULL;
-        if (g_cmdline.xkbRules)
-          {
+        if (g_cmdline.xkbRules) {
             s = g_cmdline.xkbRules;
             from = X_CMDLINE;
-          }
+        }
 #ifdef XWIN_XF86CONFIG
-        else
-          {
-            s = winSetStrOption (kbd->inp_option_lst, "XkbRules", NULL);
+        else {
+            s = winSetStrOption(kbd->inp_option_lst, "XkbRules", NULL);
             from = X_CONFIG;
-          }
+        }
 #endif
-        if (s)
-          {
-            g_winInfo.xkb.rules = NULL_IF_EMPTY (s);
-            winMsg (from, "XKB: rules: \"%s\"\n", s);
-	  }
-          
+        if (s) {
+            g_winInfo.xkb.rules = NULL_IF_EMPTY(s);
+            winMsg(from, "XKB: rules: \"%s\"\n", s);
+        }
+
         s = NULL;
-        if (g_cmdline.xkbModel)
-          {
+        if (g_cmdline.xkbModel) {
             s = g_cmdline.xkbModel;
             from = X_CMDLINE;
-          }
+        }
 #ifdef XWIN_XF86CONFIG
-        else
-          {
-            s = winSetStrOption (kbd->inp_option_lst, "XkbModel", NULL);
+        else {
+            s = winSetStrOption(kbd->inp_option_lst, "XkbModel", NULL);
             from = X_CONFIG;
-          }
+        }
 #endif
-        if (s)
-	  {
-	    g_winInfo.xkb.model = NULL_IF_EMPTY (s);
-	    winMsg (from, "XKB: model: \"%s\"\n", s);
-	  }
+        if (s) {
+            g_winInfo.xkb.model = NULL_IF_EMPTY(s);
+            winMsg(from, "XKB: model: \"%s\"\n", s);
+        }
 
         s = NULL;
-        if (g_cmdline.xkbLayout)
-          {
+        if (g_cmdline.xkbLayout) {
             s = g_cmdline.xkbLayout;
             from = X_CMDLINE;
-          }
+        }
 #ifdef XWIN_XF86CONFIG
-        else
-          {
-            s = winSetStrOption (kbd->inp_option_lst, "XkbLayout", NULL);
+        else {
+            s = winSetStrOption(kbd->inp_option_lst, "XkbLayout", NULL);
             from = X_CONFIG;
-          }
+        }
 #endif
-        if (s)
-          {
-	    g_winInfo.xkb.layout = NULL_IF_EMPTY (s);
-	    winMsg (from, "XKB: layout: \"%s\"\n", s);
-	  }
+        if (s) {
+            g_winInfo.xkb.layout = NULL_IF_EMPTY(s);
+            winMsg(from, "XKB: layout: \"%s\"\n", s);
+        }
 
         s = NULL;
-        if (g_cmdline.xkbVariant)
-          {
+        if (g_cmdline.xkbVariant) {
             s = g_cmdline.xkbVariant;
             from = X_CMDLINE;
-          }
+        }
 #ifdef XWIN_XF86CONFIG
-        else
-          {
-            s = winSetStrOption (kbd->inp_option_lst, "XkbVariant", NULL);
+        else {
+            s = winSetStrOption(kbd->inp_option_lst, "XkbVariant", NULL);
             from = X_CONFIG;
-          }
+        }
 #endif
-	if (s)
-	  {
-	    g_winInfo.xkb.variant = NULL_IF_EMPTY (s);
-	    winMsg (from, "XKB: variant: \"%s\"\n", s);
-	  }
+        if (s) {
+            g_winInfo.xkb.variant = NULL_IF_EMPTY(s);
+            winMsg(from, "XKB: variant: \"%s\"\n", s);
+        }
 
         s = NULL;
-        if (g_cmdline.xkbOptions)
-          {
+        if (g_cmdline.xkbOptions) {
             s = g_cmdline.xkbOptions;
             from = X_CMDLINE;
-          }
+        }
 #ifdef XWIN_XF86CONFIG
-        else
-          {
-            s = winSetStrOption (kbd->inp_option_lst, "XkbOptions", NULL);
+        else {
+            s = winSetStrOption(kbd->inp_option_lst, "XkbOptions", NULL);
             from = X_CONFIG;
-          }
+        }
 #endif
-        if (s)
-	  {
-	    g_winInfo.xkb.options = NULL_IF_EMPTY (s);
-	    winMsg (from, "XKB: options: \"%s\"\n", s);
-	  }
+        if (s) {
+            g_winInfo.xkb.options = NULL_IF_EMPTY(s);
+            winMsg(from, "XKB: options: \"%s\"\n", s);
+        }
 
 #ifdef XWIN_XF86CONFIG
     }
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
-
 #ifdef XWIN_XF86CONFIG
 Bool
-winConfigMouse (DeviceIntPtr pDevice)
+winConfigMouse(DeviceIntPtr pDevice)
 {
-  MessageType			mousefrom = X_CONFIG;
+    MessageType mousefrom = X_CONFIG;
 
-  XF86ConfInputPtr		mouse = NULL;
-  XF86ConfInputPtr		input_list = NULL;
+    XF86ConfInputPtr mouse = NULL;
+    XF86ConfInputPtr input_list = NULL;
 
-  if (g_cmdline.mouse)
-    mousefrom = X_CMDLINE;
+    if (g_cmdline.mouse)
+        mousefrom = X_CMDLINE;
 
-  if (g_xf86configptr != NULL)
-    input_list = g_xf86configptr->conf_input_lst;
+    if (g_xf86configptr != NULL)
+        input_list = g_xf86configptr->conf_input_lst;
 
-  while (input_list != NULL)
-    {
-      if (winNameCompare (input_list->inp_driver, "mouse") == 0)
-	{
-	  /* Check if device name matches requested name */
-	  if (g_cmdline.mouse && winNameCompare (input_list->inp_identifier,
-						 g_cmdline.mouse))
-	    continue;
-	  mouse = input_list;
-	}
-      input_list = input_list->list.next;
+    while (input_list != NULL) {
+        if (winNameCompare(input_list->inp_driver, "mouse") == 0) {
+            /* Check if device name matches requested name */
+            if (g_cmdline.mouse && winNameCompare(input_list->inp_identifier,
+                                                  g_cmdline.mouse))
+                continue;
+            mouse = input_list;
+        }
+        input_list = input_list->list.next;
     }
 
-  if (mouse != NULL)
-    {
-      if (mouse->inp_identifier)
-	winMsg (mousefrom, "Using pointer \"%s\" as primary pointer\n",
-		mouse->inp_identifier);
-
-      g_winInfo.pointer.emulate3Buttons =
-	winSetBoolOption (mouse->inp_option_lst, "Emulate3Buttons", FALSE);
-      if (g_cmdline.emulate3buttons)
-	g_winInfo.pointer.emulate3Buttons = g_cmdline.emulate3buttons;
-
-      g_winInfo.pointer.emulate3Timeout =
-	winSetIntOption (mouse->inp_option_lst, "Emulate3Timeout", 50);
-      if (g_cmdline.emulate3timeout)
-	g_winInfo.pointer.emulate3Timeout = g_cmdline.emulate3timeout;
+    if (mouse != NULL) {
+        if (mouse->inp_identifier)
+            winMsg(mousefrom, "Using pointer \"%s\" as primary pointer\n",
+                   mouse->inp_identifier);
+
+        g_winInfo.pointer.emulate3Buttons =
+            winSetBoolOption(mouse->inp_option_lst, "Emulate3Buttons", FALSE);
+        if (g_cmdline.emulate3buttons)
+            g_winInfo.pointer.emulate3Buttons = g_cmdline.emulate3buttons;
+
+        g_winInfo.pointer.emulate3Timeout =
+            winSetIntOption(mouse->inp_option_lst, "Emulate3Timeout", 50);
+        if (g_cmdline.emulate3timeout)
+            g_winInfo.pointer.emulate3Timeout = g_cmdline.emulate3timeout;
     }
-  else
-    {
-      winMsg (X_ERROR, "No primary pointer configured\n");
-      winMsg (X_DEFAULT, "Using compiletime defaults for pointer\n");
+    else {
+        winMsg(X_ERROR, "No primary pointer configured\n");
+        winMsg(X_DEFAULT, "Using compiletime defaults for pointer\n");
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 Bool
-winConfigFiles ()
+winConfigFiles()
 {
-  MessageType from;
-  XF86ConfFilesPtr filesptr = NULL;
+    MessageType from;
+    XF86ConfFilesPtr filesptr = NULL;
 
-  /* set some shortcuts */
-  if (g_xf86configptr != NULL)
-    {
-      filesptr = g_xf86configptr->conf_files;
+    /* set some shortcuts */
+    if (g_xf86configptr != NULL) {
+        filesptr = g_xf86configptr->conf_files;
     }
 
+    /* Fontpath */
+    from = X_DEFAULT;
 
-  /* Fontpath */
-  from = X_DEFAULT;
-
-  if (g_cmdline.fontPath)
-    {
-      from = X_CMDLINE;
-      defaultFontPath = g_cmdline.fontPath;
+    if (g_cmdline.fontPath) {
+        from = X_CMDLINE;
+        defaultFontPath = g_cmdline.fontPath;
     }
-  else if (filesptr != NULL && filesptr->file_fontpath)
-    {
-      from = X_CONFIG;
-      defaultFontPath = strdup (filesptr->file_fontpath);
+    else if (filesptr != NULL && filesptr->file_fontpath) {
+        from = X_CONFIG;
+        defaultFontPath = strdup(filesptr->file_fontpath);
     }
-  winMsg (from, "FontPath set to \"%s\"\n", defaultFontPath);
+    winMsg(from, "FontPath set to \"%s\"\n", defaultFontPath);
 
-  return TRUE;
+    return TRUE;
 }
 #else
 Bool
-winConfigFiles (void)
+winConfigFiles(void)
 {
-  /* Fontpath */
-  if (g_cmdline.fontPath)
-    {
-      defaultFontPath = g_cmdline.fontPath;
-      winMsg (X_CMDLINE, "FontPath set to \"%s\"\n", defaultFontPath);
+    /* Fontpath */
+    if (g_cmdline.fontPath) {
+        defaultFontPath = g_cmdline.fontPath;
+        winMsg(X_CMDLINE, "FontPath set to \"%s\"\n", defaultFontPath);
     }
 
-  return TRUE;
+    return TRUE;
 }
 #endif
 
-
 Bool
-winConfigOptions (void)
+winConfigOptions(void)
 {
-  return TRUE;
+    return TRUE;
 }
 
-
 Bool
-winConfigScreens (void)
+winConfigScreens(void)
 {
-  return TRUE;
+    return TRUE;
 }
 
-
 #ifdef XWIN_XF86CONFIG
 char *
-winSetStrOption (pointer optlist, const char *name, char *deflt)
+winSetStrOption(pointer optlist, const char *name, char *deflt)
 {
-  OptionInfoRec o;
-
-  o.name = name;
-  o.type = OPTV_STRING;
-  if (ParseOptionValue (-1, optlist, &o))
-    deflt = o.value.str;
-  if (deflt)
-    return strdup (deflt);
-  else
-    return NULL;
+    OptionInfoRec o;
+
+    o.name = name;
+    o.type = OPTV_STRING;
+    if (ParseOptionValue(-1, optlist, &o))
+        deflt = o.value.str;
+    if (deflt)
+        return strdup(deflt);
+    else
+        return NULL;
 }
 
-
 int
-winSetBoolOption (pointer optlist, const char *name, int deflt)
+winSetBoolOption(pointer optlist, const char *name, int deflt)
 {
-  OptionInfoRec o;
+    OptionInfoRec o;
 
-  o.name = name;
-  o.type = OPTV_BOOLEAN;
-  if (ParseOptionValue (-1, optlist, &o))
-    deflt = o.value.bool;
-  return deflt;
+    o.name = name;
+    o.type = OPTV_BOOLEAN;
+    if (ParseOptionValue(-1, optlist, &o))
+        deflt = o.value.bool;
+    return deflt;
 }
 
-
 int
-winSetIntOption (pointer optlist, const char *name, int deflt)
+winSetIntOption(pointer optlist, const char *name, int deflt)
 {
-  OptionInfoRec o;
+    OptionInfoRec o;
 
-  o.name = name;
-  o.type = OPTV_INTEGER;
-  if (ParseOptionValue (-1, optlist, &o))
-    deflt = o.value.num;
-  return deflt;
+    o.name = name;
+    o.type = OPTV_INTEGER;
+    if (ParseOptionValue(-1, optlist, &o))
+        deflt = o.value.num;
+    return deflt;
 }
 
-
 double
-winSetRealOption (pointer optlist, const char *name, double deflt)
+winSetRealOption(pointer optlist, const char *name, double deflt)
 {
-  OptionInfoRec o;
+    OptionInfoRec o;
 
-  o.name = name;
-  o.type = OPTV_REAL;
-  if (ParseOptionValue (-1, optlist, &o))
-    deflt = o.value.realnum;
-  return deflt;
+    o.name = name;
+    o.type = OPTV_REAL;
+    if (ParseOptionValue(-1, optlist, &o))
+        deflt = o.value.realnum;
+    return deflt;
 }
 
 double
-winSetPercentOption (pointer optlist, const char *name, double deflt)
+winSetPercentOption(pointer optlist, const char *name, double deflt)
 {
-  OptionInfoRec o;
+    OptionInfoRec o;
 
-  o.name = name;
-  o.type = OPTV_PERCENT;
-  if (ParseOptionValue (-1, optlist, &o))
-    deflt = o.value.realnum;
-  return deflt;
+    o.name = name;
+    o.type = OPTV_PERCENT;
+    if (ParseOptionValue(-1, optlist, &o))
+        deflt = o.value.realnum;
+    return deflt;
 }
 #endif
 
-
 /*
  * Compare two strings for equality. This is caseinsensitive  and
  * The characters '_', ' ' (space) and '\t' (tab) are treated as 
@@ -708,45 +658,42 @@ winSetPercentOption (pointer optlist, const char *name, double deflt)
  */
 
 int
-winNameCompare (const char *s1, const char *s2)
+winNameCompare(const char *s1, const char *s2)
 {
-  char c1, c2;
+    char c1, c2;
 
-  if (!s1 || *s1 == 0)
-    {
-      if (!s2 || *s2 == 0)
-	return 0;
-      else
-	return 1;
+    if (!s1 || *s1 == 0) {
+        if (!s2 || *s2 == 0)
+            return 0;
+        else
+            return 1;
     }
 
-  while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
-    s1++;
-  while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
-    s2++;
+    while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
+        s1++;
+    while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
+        s2++;
 
-  c1 = (isupper ((int)*s1) ? tolower ((int)*s1) : *s1);
-  c2 = (isupper ((int)*s2) ? tolower ((int)*s2) : *s2);
+    c1 = (isupper((int) *s1) ? tolower((int) *s1) : *s1);
+    c2 = (isupper((int) *s2) ? tolower((int) *s2) : *s2);
 
-  while (c1 == c2)
-    {
-      if (c1 == 0)
-	return 0;
-      s1++;
-      s2++;
-
-      while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
-	s1++;
-      while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
-	s2++;
-
-      c1 = (isupper ((int)*s1) ? tolower ((int)*s1) : *s1);
-      c2 = (isupper ((int)*s2) ? tolower ((int)*s2) : *s2);
+    while (c1 == c2) {
+        if (c1 == 0)
+            return 0;
+        s1++;
+        s2++;
+
+        while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
+            s1++;
+        while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
+            s2++;
+
+        c1 = (isupper((int) *s1) ? tolower((int) *s1) : *s1);
+        c2 = (isupper((int) *s2) ? tolower((int) *s2) : *s2);
     }
-  return c1 - c2;
+    return c1 - c2;
 }
 
-
 #ifdef XWIN_XF86CONFIG
 /*
  * Find the named option in the list. 
@@ -754,361 +701,307 @@ winNameCompare (const char *s1, const char *s2)
  */
 
 XF86OptionPtr
-winFindOption (XF86OptionPtr list, const char *name)
+winFindOption(XF86OptionPtr list, const char *name)
 {
-  while (list)
-    {
-      if (winNameCompare (list->opt_name, name) == 0)
-	return list;
-      list = list->list.next;
+    while (list) {
+        if (winNameCompare(list->opt_name, name) == 0)
+            return list;
+        list = list->list.next;
     }
-  return NULL;
+    return NULL;
 }
 
-
 /*
  * Find the Value of an named option.
  * @return The option value or NULL if not found.
  */
 
 char *
-winFindOptionValue (XF86OptionPtr list, const char *name)
+winFindOptionValue(XF86OptionPtr list, const char *name)
 {
-  list = winFindOption (list, name);
-  if (list)
-    {
-      if (list->opt_val)
-	return list->opt_val;
-      else
-	return "";
+    list = winFindOption(list, name);
+    if (list) {
+        if (list->opt_val)
+            return list->opt_val;
+        else
+            return "";
     }
-  return NULL;
+    return NULL;
 }
 
-
 /*
  * Parse the option.
  */
 
 static Bool
-ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
+ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
 {
-  char *s, *end;
-
-  if ((s = winFindOptionValue (options, p->name)) != NULL)
-    {
-      switch (p->type)
-	{
-	case OPTV_INTEGER:
-	  if (*s == '\0')
-	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires an integer value\n",
-			 p->name);
-	      p->found = FALSE;
-	    }
-	  else
-	    {
-	      p->value.num = strtoul (s, &end, 0);
-	      if (*end == '\0')
-		{
-		  p->found = TRUE;
-		}
-	      else
-		{
-		  winDrvMsg (scrnIndex, X_WARNING,
-			     "Option \"%s\" requires an integer value\n",
-			     p->name);
-		  p->found = FALSE;
-		}
-	    }
-	  break;
-	case OPTV_STRING:
-	  if (*s == '\0')
-	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires an string value\n", p->name);
-	      p->found = FALSE;
-	    }
-	  else
-	    {
-	      p->value.str = s;
-	      p->found = TRUE;
-	    }
-	  break;
-	case OPTV_ANYSTR:
-	  p->value.str = s;
-	  p->found = TRUE;
-	  break;
-	case OPTV_REAL:
-	  if (*s == '\0')
-	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires a floating point value\n",
-			 p->name);
-	      p->found = FALSE;
-	    }
-	  else
-	    {
-	      p->value.realnum = strtod (s, &end);
-	      if (*end == '\0')
-		{
-		  p->found = TRUE;
-		}
-	      else
-		{
-		  winDrvMsg (scrnIndex, X_WARNING,
-			     "Option \"%s\" requires a floating point value\n",
-			     p->name);
-		  p->found = FALSE;
-		}
-	    }
-	  break;
-	case OPTV_BOOLEAN:
-	  if (GetBoolValue (p, s))
-	    {
-	      p->found = TRUE;
-	    }
-	  else
-	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires a boolean value\n", p->name);
-	      p->found = FALSE;
-	    }
-	  break;
-	case OPTV_PERCENT:
-	  if (*s == '\0')
-	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires a percent value\n",
-			 p->name);
-	      p->found = FALSE;
-	    }
-	  else
-	    {
-	       double percent = strtod (s, &end);
-
-	       if (end != s && winNameCompare (end, "%"))
-		 {
-		   p->found = TRUE;
-		   p->value.realnum = percent;
-		 }
-	       else
-		 {
-		   winDrvMsg (scrnIndex, X_WARNING,
-			      "Option \"%s\" requires a frequency value\n",
-			       p->name);
-		   p->found = FALSE;
-		 }
-	    }
-	case OPTV_FREQ:
-	  if (*s == '\0')
-	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires a frequency value\n",
-			 p->name);
-	      p->found = FALSE;
-	    }
-	  else
-	    {
-	      double freq = strtod (s, &end);
-	      int units = 0;
-
-	      if (end != s)
-		{
-		  p->found = TRUE;
-		  if (!winNameCompare (end, "Hz"))
-		    units = 1;
-		  else if (!winNameCompare (end, "kHz") ||
-			   !winNameCompare (end, "k"))
-		    units = 1000;
-		  else if (!winNameCompare (end, "MHz") ||
-			   !winNameCompare (end, "M"))
-		    units = 1000000;
-		  else
-		    {
-		      winDrvMsg (scrnIndex, X_WARNING,
-				 "Option \"%s\" requires a frequency value\n",
-				 p->name);
-		      p->found = FALSE;
-		    }
-		  if (p->found)
-		    freq *= (double) units;
-		}
-	      else
-		{
-		  winDrvMsg (scrnIndex, X_WARNING,
-			     "Option \"%s\" requires a frequency value\n",
-			     p->name);
-		  p->found = FALSE;
-		}
-	      if (p->found)
-		{
-		  p->value.freq.freq = freq;
-		  p->value.freq.units = units;
-		}
-	    }
-	  break;
-	case OPTV_NONE:
-	  /* Should never get here */
-	  p->found = FALSE;
-	  break;
-	}
-      if (p->found)
-	{
-	  winDrvMsgVerb (scrnIndex, X_CONFIG, 2, "Option \"%s\"", p->name);
-	  if (!(p->type == OPTV_BOOLEAN && *s == 0))
-	    {
-	      winErrorFVerb (2, " \"%s\"", s);
-	    }
-	  winErrorFVerb (2, "\n");
-	}
+    char *s, *end;
+
+    if ((s = winFindOptionValue(options, p->name)) != NULL) {
+        switch (p->type) {
+        case OPTV_INTEGER:
+            if (*s == '\0') {
+                winDrvMsg(scrnIndex, X_WARNING,
+                          "Option \"%s\" requires an integer value\n", p->name);
+                p->found = FALSE;
+            }
+            else {
+                p->value.num = strtoul(s, &end, 0);
+                if (*end == '\0') {
+                    p->found = TRUE;
+                }
+                else {
+                    winDrvMsg(scrnIndex, X_WARNING,
+                              "Option \"%s\" requires an integer value\n",
+                              p->name);
+                    p->found = FALSE;
+                }
+            }
+            break;
+        case OPTV_STRING:
+            if (*s == '\0') {
+                winDrvMsg(scrnIndex, X_WARNING,
+                          "Option \"%s\" requires an string value\n", p->name);
+                p->found = FALSE;
+            }
+            else {
+                p->value.str = s;
+                p->found = TRUE;
+            }
+            break;
+        case OPTV_ANYSTR:
+            p->value.str = s;
+            p->found = TRUE;
+            break;
+        case OPTV_REAL:
+            if (*s == '\0') {
+                winDrvMsg(scrnIndex, X_WARNING,
+                          "Option \"%s\" requires a floating point value\n",
+                          p->name);
+                p->found = FALSE;
+            }
+            else {
+                p->value.realnum = strtod(s, &end);
+                if (*end == '\0') {
+                    p->found = TRUE;
+                }
+                else {
+                    winDrvMsg(scrnIndex, X_WARNING,
+                              "Option \"%s\" requires a floating point value\n",
+                              p->name);
+                    p->found = FALSE;
+                }
+            }
+            break;
+        case OPTV_BOOLEAN:
+            if (GetBoolValue(p, s)) {
+                p->found = TRUE;
+            }
+            else {
+                winDrvMsg(scrnIndex, X_WARNING,
+                          "Option \"%s\" requires a boolean value\n", p->name);
+                p->found = FALSE;
+            }
+            break;
+        case OPTV_PERCENT:
+            if (*s == '\0') {
+                winDrvMsg(scrnIndex, X_WARNING,
+                          "Option \"%s\" requires a percent value\n", p->name);
+                p->found = FALSE;
+            }
+            else {
+                double percent = strtod(s, &end);
+
+                if (end != s && winNameCompare(end, "%")) {
+                    p->found = TRUE;
+                    p->value.realnum = percent;
+                }
+                else {
+                    winDrvMsg(scrnIndex, X_WARNING,
+                              "Option \"%s\" requires a frequency value\n",
+                              p->name);
+                    p->found = FALSE;
+                }
+            }
+        case OPTV_FREQ:
+            if (*s == '\0') {
+                winDrvMsg(scrnIndex, X_WARNING,
+                          "Option \"%s\" requires a frequency value\n",
+                          p->name);
+                p->found = FALSE;
+            }
+            else {
+                double freq = strtod(s, &end);
+                int units = 0;
+
+                if (end != s) {
+                    p->found = TRUE;
+                    if (!winNameCompare(end, "Hz"))
+                        units = 1;
+                    else if (!winNameCompare(end, "kHz") ||
+                             !winNameCompare(end, "k"))
+                        units = 1000;
+                    else if (!winNameCompare(end, "MHz") ||
+                             !winNameCompare(end, "M"))
+                        units = 1000000;
+                    else {
+                        winDrvMsg(scrnIndex, X_WARNING,
+                                  "Option \"%s\" requires a frequency value\n",
+                                  p->name);
+                        p->found = FALSE;
+                    }
+                    if (p->found)
+                        freq *= (double) units;
+                }
+                else {
+                    winDrvMsg(scrnIndex, X_WARNING,
+                              "Option \"%s\" requires a frequency value\n",
+                              p->name);
+                    p->found = FALSE;
+                }
+                if (p->found) {
+                    p->value.freq.freq = freq;
+                    p->value.freq.units = units;
+                }
+            }
+            break;
+        case OPTV_NONE:
+            /* Should never get here */
+            p->found = FALSE;
+            break;
+        }
+        if (p->found) {
+            winDrvMsgVerb(scrnIndex, X_CONFIG, 2, "Option \"%s\"", p->name);
+            if (!(p->type == OPTV_BOOLEAN && *s == 0)) {
+                winErrorFVerb(2, " \"%s\"", s);
+            }
+            winErrorFVerb(2, "\n");
+        }
     }
-  else if (p->type == OPTV_BOOLEAN)
-    {
-      /* Look for matches with options with or without a "No" prefix. */
-      char *n, *newn;
-      OptionInfoRec opt;
-
-      n = winNormalizeName (p->name);
-      if (!n)
-	{
-	  p->found = FALSE;
-	  return FALSE;
-	}
-      if (strncmp (n, "no", 2) == 0)
-	{
-	  newn = n + 2;
-	}
-      else
-	{
-	  free (n);
-	  n = malloc (strlen (p->name) + 2 + 1);
-	  if (!n)
-	    {
-	      p->found = FALSE;
-	      return FALSE;
-	    }
-	  strcpy (n, "No");
-	  strcat (n, p->name);
-	  newn = n;
-	}
-      if ((s = winFindOptionValue (options, newn)) != NULL)
-	{
-	  if (GetBoolValue (&opt, s))
-	    {
-	      p->value.bool = !opt.value.bool;
-	      p->found = TRUE;
-	    }
-	  else
-	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires a boolean value\n", newn);
-	      p->found = FALSE;
-	    }
-	}
-      else
-	{
-	  p->found = FALSE;
-	}
-      if (p->found)
-	{
-	  winDrvMsgVerb (scrnIndex, X_CONFIG, 2, "Option \"%s\"", newn);
-	  if (*s != 0)
-	    {
-	      winErrorFVerb (2, " \"%s\"", s);
-	    }
-	  winErrorFVerb (2, "\n");
-	}
-      free (n);
+    else if (p->type == OPTV_BOOLEAN) {
+        /* Look for matches with options with or without a "No" prefix. */
+        char *n, *newn;
+        OptionInfoRec opt;
+
+        n = winNormalizeName(p->name);
+        if (!n) {
+            p->found = FALSE;
+            return FALSE;
+        }
+        if (strncmp(n, "no", 2) == 0) {
+            newn = n + 2;
+        }
+        else {
+            free(n);
+            n = malloc(strlen(p->name) + 2 + 1);
+            if (!n) {
+                p->found = FALSE;
+                return FALSE;
+            }
+            strcpy(n, "No");
+            strcat(n, p->name);
+            newn = n;
+        }
+        if ((s = winFindOptionValue(options, newn)) != NULL) {
+            if (GetBoolValue(&opt, s)) {
+                p->value.bool = !opt.value.bool;
+                p->found = TRUE;
+            }
+            else {
+                winDrvMsg(scrnIndex, X_WARNING,
+                          "Option \"%s\" requires a boolean value\n", newn);
+                p->found = FALSE;
+            }
+        }
+        else {
+            p->found = FALSE;
+        }
+        if (p->found) {
+            winDrvMsgVerb(scrnIndex, X_CONFIG, 2, "Option \"%s\"", newn);
+            if (*s != 0) {
+                winErrorFVerb(2, " \"%s\"", s);
+            }
+            winErrorFVerb(2, "\n");
+        }
+        free(n);
     }
-  else
-    {
-      p->found = FALSE;
+    else {
+        p->found = FALSE;
     }
-  return p->found;
+    return p->found;
 }
 
-
 static Bool
-configLayout (serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
-	      char *default_layout)
+configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
+             char *default_layout)
 {
 #if 0
 #pragma warn UNIMPLEMENTED
 #endif
-  return TRUE;
+    return TRUE;
 }
 
-
 static Bool
-configImpliedLayout (serverLayoutPtr servlayoutp,
-		     XF86ConfScreenPtr conf_screen)
+configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen)
 {
 #if 0
 #pragma warn UNIMPLEMENTED
 #endif
-  return TRUE;
+    return TRUE;
 }
 
-
 static Bool
-GetBoolValue (OptionInfoPtr p, const char *s)
+GetBoolValue(OptionInfoPtr p, const char *s)
 {
-  if (*s == 0)
-    {
-      p->value.bool = TRUE;
+    if (*s == 0) {
+        p->value.bool = TRUE;
     }
-  else
-    {
-      if (winNameCompare (s, "1") == 0)
-	p->value.bool = TRUE;
-      else if (winNameCompare (s, "on") == 0)
-	p->value.bool = TRUE;
-      else if (winNameCompare (s, "true") == 0)
-	p->value.bool = TRUE;
-      else if (winNameCompare (s, "yes") == 0)
-	p->value.bool = TRUE;
-      else if (winNameCompare (s, "0") == 0)
-	p->value.bool = FALSE;
-      else if (winNameCompare (s, "off") == 0)
-	p->value.bool = FALSE;
-      else if (winNameCompare (s, "false") == 0)
-	p->value.bool = FALSE;
-      else if (winNameCompare (s, "no") == 0)
-	p->value.bool = FALSE;
+    else {
+        if (winNameCompare(s, "1") == 0)
+            p->value.bool = TRUE;
+        else if (winNameCompare(s, "on") == 0)
+            p->value.bool = TRUE;
+        else if (winNameCompare(s, "true") == 0)
+            p->value.bool = TRUE;
+        else if (winNameCompare(s, "yes") == 0)
+            p->value.bool = TRUE;
+        else if (winNameCompare(s, "0") == 0)
+            p->value.bool = FALSE;
+        else if (winNameCompare(s, "off") == 0)
+            p->value.bool = FALSE;
+        else if (winNameCompare(s, "false") == 0)
+            p->value.bool = FALSE;
+        else if (winNameCompare(s, "no") == 0)
+            p->value.bool = FALSE;
     }
-  return TRUE;
+    return TRUE;
 }
 #endif
 
-
 char *
-winNormalizeName (const char *s)
+winNormalizeName(const char *s)
 {
-  char *ret, *q;
-  const char *p;
-
-  if (s == NULL)
-    return NULL;
-
-  ret = malloc (strlen (s) + 1);
-  for (p = s, q = ret; *p != 0; p++)
-    {
-      switch (*p)
-	{
-	case '_':
-	case ' ':
-	case '\t':
-	  continue;
-	default:
-	  if (isupper ((int)*p))
-	    *q++ = tolower ((int)*p);
-	  else
-	    *q++ = *p;
-	}
+    char *ret, *q;
+    const char *p;
+
+    if (s == NULL)
+        return NULL;
+
+    ret = malloc(strlen(s) + 1);
+    for (p = s, q = ret; *p != 0; p++) {
+        switch (*p) {
+        case '_':
+        case ' ':
+        case '\t':
+            continue;
+        default:
+            if (isupper((int) *p))
+                *q++ = tolower((int) *p);
+            else
+                *q++ = *p;
+        }
     }
-  *q = '\0';
-  return ret;
+    *q = '\0';
+    return ret;
 }
-
diff --git a/xorg-server/hw/xwin/winconfig.h b/xorg-server/hw/xwin/winconfig.h
index 7f533cff0..94571ff71 100644
--- a/xorg-server/hw/xwin/winconfig.h
+++ b/xorg-server/hw/xwin/winconfig.h
@@ -1,324 +1,264 @@
-#ifndef __WIN_CONFIG_H__

-#define __WIN_CONFIG_H__

-/*

- *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors: Alexander Gottwald	

- */

-

-#include "win.h"

-#ifdef XWIN_XF86CONFIG

-#include "../xfree86/parser/xf86Parser.h"

-#endif

-

-

-/* These are taken from hw/xfree86/common/xf86str.h */

-

-typedef struct

-{

-  CARD32 red, green, blue;

-}

-rgb;

-

-

-typedef struct

-{

-  float red, green, blue;

-}

-Gamma;

-

-

-typedef struct

-{

-  char *identifier;

-  char *vendor;

-  char *board;

-  char *chipset;

-  char *ramdac;

-  char *driver;

-  struct _confscreenrec *myScreenSection;

-  Bool claimed;

-  Bool active;

-  Bool inUse;

-  int videoRam;

-  int textClockFreq;

-  pointer options;

-  int screen;			/* For multi-CRTC cards */

-}

-GDevRec, *GDevPtr;

-

-

-typedef struct

-{

-  char *identifier;

-  char *driver;

-  pointer commonOptions;

-  pointer extraOptions;

-}

-IDevRec, *IDevPtr;

-

-

-typedef struct

-{

-  int frameX0;

-  int frameY0;

-  int virtualX;

-  int virtualY;

-  int depth;

-  int fbbpp;

-  rgb weight;

-  rgb blackColour;

-  rgb whiteColour;

-  int defaultVisual;

-  char **modes;

-  pointer options;

-}

-DispRec, *DispPtr;

-

-

-typedef struct _confxvportrec

-{

-  char *identifier;

-  pointer options;

-}

-confXvPortRec, *confXvPortPtr;

-

-

-typedef struct _confxvadaptrec

-{

-  char *identifier;

-  int numports;

-  confXvPortPtr ports;

-  pointer options;

-}

-confXvAdaptorRec, *confXvAdaptorPtr;

-

-

-typedef struct _confscreenrec

-{

-  char *id;

-  int screennum;

-  int defaultdepth;

-  int defaultbpp;

-  int defaultfbbpp;

-  GDevPtr device;

-  int numdisplays;

-  DispPtr displays;

-  int numxvadaptors;

-  confXvAdaptorPtr xvadaptors;

-  pointer options;

-}

-confScreenRec, *confScreenPtr;

-

-

-typedef enum

-{

-  PosObsolete = -1,

-  PosAbsolute = 0,

-  PosRightOf,

-  PosLeftOf,

-  PosAbove,

-  PosBelow,

-  PosRelative

-}

-PositionType;

-

-

-typedef struct _screenlayoutrec

-{

-  confScreenPtr screen;

-  char *topname;

-  confScreenPtr top;

-  char *bottomname;

-  confScreenPtr bottom;

-  char *leftname;

-  confScreenPtr left;

-  char *rightname;

-  confScreenPtr right;

-  PositionType where;

-  int x;

-  int y;

-  char *refname;

-  confScreenPtr refscreen;

-}

-screenLayoutRec, *screenLayoutPtr;

-

-

-typedef struct _serverlayoutrec

-{

-  char *id;

-  screenLayoutPtr screens;

-  GDevPtr inactives;

-  IDevPtr inputs;

-  pointer options;

-}

-serverLayoutRec, *serverLayoutPtr;

-

-

-/*

- * winconfig.c

- */

-

-typedef struct

-{

-  /* Files */

-#ifdef XWIN_XF86CONFIG

-  char *configFile;

-  char *configDir;

-#endif

-  char *fontPath;

-  /* input devices - keyboard */

-#ifdef XWIN_XF86CONFIG

-  char *keyboard;

-#endif

-  char *xkbRules; 

-  char *xkbModel;

-  char *xkbLayout;

-  char *xkbVariant;

-  char *xkbOptions;

-  /* layout */

-  char *screenname;

-  /* mouse settings */

-  char *mouse;

-  Bool emulate3buttons;

-  long emulate3timeout;

-}

-WinCmdlineRec, *WinCmdlinePtr;

-

-

-extern WinCmdlineRec g_cmdline;

-#ifdef XWIN_XF86CONFIG

-extern XF86ConfigPtr g_xf86configptr;

-#endif

-extern serverLayoutRec g_winConfigLayout;

-

-

-/*

- * Function prototypes

- */

-

-Bool winReadConfigfile (void);

-Bool winConfigFiles (void);

-Bool winConfigOptions (void);

-Bool winConfigScreens (void);

-Bool winConfigKeyboard (DeviceIntPtr pDevice);

-Bool winConfigMouse (DeviceIntPtr pDevice);

-

-

-typedef struct

-{

-  double freq;

-  int units;

-}

-OptFrequency;

-

-

-typedef union

-{

-  unsigned long num;

-  char *str;

-  double realnum;

-  Bool bool;

-  OptFrequency freq;

-}

-ValueUnion;

-

-

-typedef enum

-{

-  OPTV_NONE = 0,

-  OPTV_INTEGER,

-  OPTV_STRING,			/* a non-empty string */

-  OPTV_ANYSTR,			/* Any string, including an empty one */

-  OPTV_REAL,

-  OPTV_BOOLEAN,

-  OPTV_PERCENT,

-  OPTV_FREQ

-}

-OptionValueType;

-

-

-typedef enum

-{

-  OPTUNITS_HZ = 1,

-  OPTUNITS_KHZ,

-  OPTUNITS_MHZ

-}

-OptFreqUnits;

-

-

-typedef struct

-{

-  int token;

-  const char *name;

-  OptionValueType type;

-  ValueUnion value;

-  Bool found;

-}

-OptionInfoRec, *OptionInfoPtr;

-

-

-/*

- * Function prototypes

- */

-

-char *winSetStrOption (pointer optlist, const char *name, char *deflt);

-int winSetBoolOption (pointer optlist, const char *name, int deflt);

-int winSetIntOption (pointer optlist, const char *name, int deflt);

-double winSetRealOption (pointer optlist, const char *name, double deflt);

-double winSetPercentOption (pointer optlist, const char *name, double deflt);

-#ifdef XWIN_XF86CONFIG

-XF86OptionPtr winFindOption (XF86OptionPtr list, const char *name);

-char *winFindOptionValue (XF86OptionPtr list, const char *name);

-#endif

-int winNameCompare (const char *s1, const char *s2);

-char *winNormalizeName (const char *s);

-

-

-typedef struct

-{

-  struct

-  {

-    long leds;

-    long delay;

-    long rate;

-  }

-  keyboard;

-  XkbRMLVOSet xkb;

-  struct

-  {

-    Bool emulate3Buttons;

-    long emulate3Timeout;

-  }

-  pointer;

-}

-winInfoRec, *winInfoPtr;

-

-

-extern winInfoRec g_winInfo;

-

-#endif

+#ifndef __WIN_CONFIG_H__
+#define __WIN_CONFIG_H__
+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors: Alexander Gottwald	
+ */
+
+#include "win.h"
+#ifdef XWIN_XF86CONFIG
+#include "../xfree86/parser/xf86Parser.h"
+#endif
+
+/* These are taken from hw/xfree86/common/xf86str.h */
+
+typedef struct {
+    CARD32 red, green, blue;
+} rgb;
+
+typedef struct {
+    float red, green, blue;
+} Gamma;
+
+typedef struct {
+    char *identifier;
+    char *vendor;
+    char *board;
+    char *chipset;
+    char *ramdac;
+    char *driver;
+    struct _confscreenrec *myScreenSection;
+    Bool claimed;
+    Bool active;
+    Bool inUse;
+    int videoRam;
+    int textClockFreq;
+    pointer options;
+    int screen;                 /* For multi-CRTC cards */
+} GDevRec, *GDevPtr;
+
+typedef struct {
+    char *identifier;
+    char *driver;
+    pointer commonOptions;
+    pointer extraOptions;
+} IDevRec, *IDevPtr;
+
+typedef struct {
+    int frameX0;
+    int frameY0;
+    int virtualX;
+    int virtualY;
+    int depth;
+    int fbbpp;
+    rgb weight;
+    rgb blackColour;
+    rgb whiteColour;
+    int defaultVisual;
+    char **modes;
+    pointer options;
+} DispRec, *DispPtr;
+
+typedef struct _confxvportrec {
+    char *identifier;
+    pointer options;
+} confXvPortRec, *confXvPortPtr;
+
+typedef struct _confxvadaptrec {
+    char *identifier;
+    int numports;
+    confXvPortPtr ports;
+    pointer options;
+} confXvAdaptorRec, *confXvAdaptorPtr;
+
+typedef struct _confscreenrec {
+    char *id;
+    int screennum;
+    int defaultdepth;
+    int defaultbpp;
+    int defaultfbbpp;
+    GDevPtr device;
+    int numdisplays;
+    DispPtr displays;
+    int numxvadaptors;
+    confXvAdaptorPtr xvadaptors;
+    pointer options;
+} confScreenRec, *confScreenPtr;
+
+typedef enum {
+    PosObsolete = -1,
+    PosAbsolute = 0,
+    PosRightOf,
+    PosLeftOf,
+    PosAbove,
+    PosBelow,
+    PosRelative
+} PositionType;
+
+typedef struct _screenlayoutrec {
+    confScreenPtr screen;
+    char *topname;
+    confScreenPtr top;
+    char *bottomname;
+    confScreenPtr bottom;
+    char *leftname;
+    confScreenPtr left;
+    char *rightname;
+    confScreenPtr right;
+    PositionType where;
+    int x;
+    int y;
+    char *refname;
+    confScreenPtr refscreen;
+} screenLayoutRec, *screenLayoutPtr;
+
+typedef struct _serverlayoutrec {
+    char *id;
+    screenLayoutPtr screens;
+    GDevPtr inactives;
+    IDevPtr inputs;
+    pointer options;
+} serverLayoutRec, *serverLayoutPtr;
+
+/*
+ * winconfig.c
+ */
+
+typedef struct {
+    /* Files */
+#ifdef XWIN_XF86CONFIG
+    char *configFile;
+    char *configDir;
+#endif
+    char *fontPath;
+    /* input devices - keyboard */
+#ifdef XWIN_XF86CONFIG
+    char *keyboard;
+#endif
+    char *xkbRules;
+    char *xkbModel;
+    char *xkbLayout;
+    char *xkbVariant;
+    char *xkbOptions;
+    /* layout */
+    char *screenname;
+    /* mouse settings */
+    char *mouse;
+    Bool emulate3buttons;
+    long emulate3timeout;
+} WinCmdlineRec, *WinCmdlinePtr;
+
+extern WinCmdlineRec g_cmdline;
+
+#ifdef XWIN_XF86CONFIG
+extern XF86ConfigPtr g_xf86configptr;
+#endif
+extern serverLayoutRec g_winConfigLayout;
+
+/*
+ * Function prototypes
+ */
+
+Bool winReadConfigfile(void);
+Bool winConfigFiles(void);
+Bool winConfigOptions(void);
+Bool winConfigScreens(void);
+Bool winConfigKeyboard(DeviceIntPtr pDevice);
+Bool winConfigMouse(DeviceIntPtr pDevice);
+
+typedef struct {
+    double freq;
+    int units;
+} OptFrequency;
+
+typedef union {
+    unsigned long num;
+    char *str;
+    double realnum;
+    Bool bool;
+    OptFrequency freq;
+} ValueUnion;
+
+typedef enum {
+    OPTV_NONE = 0,
+    OPTV_INTEGER,
+    OPTV_STRING,                /* a non-empty string */
+    OPTV_ANYSTR,                /* Any string, including an empty one */
+    OPTV_REAL,
+    OPTV_BOOLEAN,
+    OPTV_PERCENT,
+    OPTV_FREQ
+} OptionValueType;
+
+typedef enum {
+    OPTUNITS_HZ = 1,
+    OPTUNITS_KHZ,
+    OPTUNITS_MHZ
+} OptFreqUnits;
+
+typedef struct {
+    int token;
+    const char *name;
+    OptionValueType type;
+    ValueUnion value;
+    Bool found;
+} OptionInfoRec, *OptionInfoPtr;
+
+/*
+ * Function prototypes
+ */
+
+char *winSetStrOption(pointer optlist, const char *name, char *deflt);
+int winSetBoolOption(pointer optlist, const char *name, int deflt);
+int winSetIntOption(pointer optlist, const char *name, int deflt);
+double winSetRealOption(pointer optlist, const char *name, double deflt);
+double winSetPercentOption(pointer optlist, const char *name, double deflt);
+
+#ifdef XWIN_XF86CONFIG
+XF86OptionPtr winFindOption(XF86OptionPtr list, const char *name);
+char *winFindOptionValue(XF86OptionPtr list, const char *name);
+#endif
+int winNameCompare(const char *s1, const char *s2);
+char *winNormalizeName(const char *s);
+
+typedef struct {
+    struct {
+        long leds;
+        long delay;
+        long rate;
+    } keyboard;
+    XkbRMLVOSet xkb;
+    struct {
+        Bool emulate3Buttons;
+        long emulate3Timeout;
+    } pointer;
+} winInfoRec, *winInfoPtr;
+
+extern winInfoRec g_winInfo;
+
+#endif
diff --git a/xorg-server/hw/xwin/wincreatewnd.c b/xorg-server/hw/xwin/wincreatewnd.c
index 755373965..0a18a6a29 100644
--- a/xorg-server/hw/xwin/wincreatewnd.c
+++ b/xorg-server/hw/xwin/wincreatewnd.c
@@ -43,544 +43,518 @@
  */
 
 static Bool
-winGetWorkArea (RECT *prcWorkArea, winScreenInfo *pScreenInfo);
+ winGetWorkArea(RECT * prcWorkArea, winScreenInfo * pScreenInfo);
 
 static Bool
-winAdjustForAutoHide (RECT *prcWorkArea);
-
+ winAdjustForAutoHide(RECT * prcWorkArea);
 
 /*
  * Create a full screen window
  */
 
 Bool
-winCreateBoundingWindowFullScreen (ScreenPtr pScreen)
+winCreateBoundingWindowFullScreen(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  int			iX = pScreenInfo->dwInitialX;
-  int			iY = pScreenInfo->dwInitialY;
-  int			iWidth = pScreenInfo->dwWidth;
-  int			iHeight = pScreenInfo->dwHeight;
-  HWND			*phwnd = &pScreenPriv->hwndScreen;
-  WNDCLASSEX		wc;
-  char			szTitle[256];
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    int iX = pScreenInfo->dwInitialX;
+    int iY = pScreenInfo->dwInitialY;
+    int iWidth = pScreenInfo->dwWidth;
+    int iHeight = pScreenInfo->dwHeight;
+    HWND *phwnd = &pScreenPriv->hwndScreen;
+    WNDCLASSEX wc;
+    char szTitle[256];
 
 #if CYGDEBUG
-  winDebug ("winCreateBoundingWindowFullScreen\n");
+    winDebug("winCreateBoundingWindowFullScreen\n");
 #endif
 
-  /* Setup our window class */
-  wc.cbSize=sizeof(WNDCLASSEX);
-  wc.style = CS_HREDRAW | CS_VREDRAW;
-  wc.lpfnWndProc = winWindowProc;
-  wc.cbClsExtra = 0;
-  wc.cbWndExtra = 0;
-  wc.hInstance = g_hInstance;
-  wc.hIcon = (HICON)LoadImage (g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
-		GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), 0);
-  wc.hCursor = 0;
-  wc.hbrBackground = 0;
-  wc.lpszMenuName = NULL;
-  wc.lpszClassName = WINDOW_CLASS;
-  wc.hIconSm = (HICON)LoadImage (g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
-		GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTSIZE);
-  RegisterClassEx (&wc);
-
-  /* Set display and screen-specific tooltip text */
-  if (g_pszQueryHost != NULL)
-    snprintf (szTitle,
-	    sizeof (szTitle),
-	    WINDOW_TITLE_XDMCP,
-	    g_pszQueryHost,
-	    display,
-	    (int) pScreenInfo->dwScreen);
-  else    
-    snprintf (szTitle,
-	    sizeof (szTitle),
-	    WINDOW_TITLE,
-	    display, 
-	    (int) pScreenInfo->dwScreen);
-
-  /* Create the window */
-  *phwnd = CreateWindowExA (0,			/* Extended styles */
-			    WINDOW_CLASS,	/* Class name */
-			    szTitle,		/* Window name */
-			    WS_POPUP,
-			    iX,			/* Horizontal position */
-			    iY,			/* Vertical position */
-			    iWidth,		/* Right edge */ 
-			    iHeight,		/* Bottom edge */
-			    (HWND) NULL,	/* No parent or owner window */
-			    (HMENU) NULL,	/* No menu */
-			    GetModuleHandle (NULL),/* Instance handle */
-			    pScreenPriv);	/* ScreenPrivates */
-
-  /* Branch on the server engine */
-  switch (pScreenInfo->dwEngine)
-    {
+    /* Setup our window class */
+    wc.cbSize = sizeof(WNDCLASSEX);
+    wc.style = CS_HREDRAW | CS_VREDRAW;
+    wc.lpfnWndProc = winWindowProc;
+    wc.cbClsExtra = 0;
+    wc.cbWndExtra = 0;
+    wc.hInstance = g_hInstance;
+    wc.hIcon =
+        (HICON) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
+                          GetSystemMetrics(SM_CXICON),
+                          GetSystemMetrics(SM_CYICON), 0);
+    wc.hCursor = 0;
+    wc.hbrBackground = 0;
+    wc.lpszMenuName = NULL;
+    wc.lpszClassName = WINDOW_CLASS;
+    wc.hIconSm =
+        (HICON) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
+                          GetSystemMetrics(SM_CXSMICON),
+                          GetSystemMetrics(SM_CYSMICON), LR_DEFAULTSIZE);
+    RegisterClassEx(&wc);
+
+    /* Set display and screen-specific tooltip text */
+    if (g_pszQueryHost != NULL)
+        snprintf(szTitle,
+                 sizeof(szTitle),
+                 WINDOW_TITLE_XDMCP,
+                 g_pszQueryHost, display, (int) pScreenInfo->dwScreen);
+    else
+        snprintf(szTitle,
+                 sizeof(szTitle),
+                 WINDOW_TITLE, display, (int) pScreenInfo->dwScreen);
+
+    /* Create the window */
+    *phwnd = CreateWindowExA(0, /* Extended styles */
+                             WINDOW_CLASS,      /* Class name */
+                             szTitle,   /* Window name */
+                             WS_POPUP, iX,      /* Horizontal position */
+                             iY,        /* Vertical position */
+                             iWidth,    /* Right edge */
+                             iHeight,   /* Bottom edge */
+                             (HWND) NULL,       /* No parent or owner window */
+                             (HMENU) NULL,      /* No menu */
+                             GetModuleHandle(NULL),     /* Instance handle */
+                             pScreenPriv);      /* ScreenPrivates */
+
+    /* Branch on the server engine */
+    switch (pScreenInfo->dwEngine) {
 #ifdef XWIN_NATIVEGDI
     case WIN_SERVER_SHADOW_GDI:
-      /* Show the window */
-      ShowWindow (*phwnd, SW_SHOWMAXIMIZED);
-      break;
+        /* Show the window */
+        ShowWindow(*phwnd, SW_SHOWMAXIMIZED);
+        break;
 #endif
 
     default:
-      /* Hide the window */
-      ShowWindow (*phwnd, SW_SHOWNORMAL);
-      break;
+        /* Hide the window */
+        ShowWindow(*phwnd, SW_SHOWNORMAL);
+        break;
     }
 
-  /* Send first paint message */
-  UpdateWindow (*phwnd);
+    /* Send first paint message */
+    UpdateWindow(*phwnd);
 
-  /* Attempt to bring our window to the top of the display */
-  BringWindowToTop (*phwnd);
+    /* Attempt to bring our window to the top of the display */
+    BringWindowToTop(*phwnd);
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Create our primary Windows display window
  */
 
 Bool
-winCreateBoundingWindowWindowed (ScreenPtr pScreen)
+winCreateBoundingWindowWindowed(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  int			iWidth = pScreenInfo->dwUserWidth;
-  int			iHeight = pScreenInfo->dwUserHeight;
-  int                   iPosX;
-  int                   iPosY;
-  HWND			*phwnd = &pScreenPriv->hwndScreen;
-  WNDCLASSEX		wc;
-  RECT			rcClient, rcWorkArea;
-  DWORD			dwWindowStyle;
-  BOOL			fForceShowWindow = FALSE;
-  char			szTitle[256];
-  
-  winDebug ("winCreateBoundingWindowWindowed - User w: %d h: %d\n",
-	  (int) pScreenInfo->dwUserWidth, (int) pScreenInfo->dwUserHeight);
-  winDebug ("winCreateBoundingWindowWindowed - Current w: %d h: %d\n",
-	  (int) pScreenInfo->dwWidth, (int) pScreenInfo->dwHeight);
-
-  /* Set the common window style flags */
-  dwWindowStyle = WS_OVERLAPPED | WS_SYSMENU | WS_MINIMIZEBOX;
-  
-  /* Decorated or undecorated window */
-  if (pScreenInfo->fDecoration
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    int iWidth = pScreenInfo->dwUserWidth;
+    int iHeight = pScreenInfo->dwUserHeight;
+    int iPosX;
+    int iPosY;
+    HWND *phwnd = &pScreenPriv->hwndScreen;
+    WNDCLASSEX wc;
+    RECT rcClient, rcWorkArea;
+    DWORD dwWindowStyle;
+    BOOL fForceShowWindow = FALSE;
+    char szTitle[256];
+
+    winDebug("winCreateBoundingWindowWindowed - User w: %d h: %d\n",
+             (int) pScreenInfo->dwUserWidth, (int) pScreenInfo->dwUserHeight);
+    winDebug("winCreateBoundingWindowWindowed - Current w: %d h: %d\n",
+             (int) pScreenInfo->dwWidth, (int) pScreenInfo->dwHeight);
+
+    /* Set the common window style flags */
+    dwWindowStyle = WS_OVERLAPPED | WS_SYSMENU | WS_MINIMIZEBOX;
+
+    /* Decorated or undecorated window */
+    if (pScreenInfo->fDecoration
 #ifdef XWIN_MULTIWINDOWEXTWM
-      && !pScreenInfo->fMWExtWM
+        && !pScreenInfo->fMWExtWM
 #endif
-      && !pScreenInfo->fRootless
+        && !pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOW
-      && !pScreenInfo->fMultiWindow
+        && !pScreenInfo->fMultiWindow
 #endif
-      )
-    {
+        ) {
         /* Try to handle startup via run.exe. run.exe instructs Windows to 
          * hide all created windows. Detect this case and make sure the 
          * window is shown nevertheless */
-        STARTUPINFO   startupInfo;
+        STARTUPINFO startupInfo;
+
         GetStartupInfo(&startupInfo);
-        if (startupInfo.dwFlags & STARTF_USESHOWWINDOW && 
-                startupInfo.wShowWindow == SW_HIDE)
-        {
-          fForceShowWindow = TRUE;
-        } 
+        if (startupInfo.dwFlags & STARTF_USESHOWWINDOW &&
+            startupInfo.wShowWindow == SW_HIDE) {
+            fForceShowWindow = TRUE;
+        }
         dwWindowStyle |= WS_CAPTION;
         if (pScreenInfo->iResizeMode != notAllowed)
             dwWindowStyle |= WS_THICKFRAME | WS_MAXIMIZEBOX;
     }
-  else
-    dwWindowStyle |= WS_POPUP;
-
-  /* Setup our window class */
-  wc.cbSize=sizeof(WNDCLASSEX);
-  wc.style = CS_HREDRAW | CS_VREDRAW;
-  wc.lpfnWndProc = winWindowProc;
-  wc.cbClsExtra = 0;
-  wc.cbWndExtra = 0;
-  wc.hInstance = g_hInstance;
-  wc.hIcon = (HICON)LoadImage (g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
-		GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), 0);
-  wc.hCursor = 0;
-  wc.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH);
-  wc.lpszMenuName = NULL;
-  wc.lpszClassName = WINDOW_CLASS;
-  wc.hIconSm = (HICON)LoadImage (g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
-		GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTSIZE);
-  RegisterClassEx (&wc);
-
-  /* Get size of work area */
-  winGetWorkArea (&rcWorkArea, pScreenInfo);
-
-  /* Adjust for auto-hide taskbars */
-  winAdjustForAutoHide (&rcWorkArea);
-
-  /* Did the user specify a position? */
-  if (pScreenInfo->fUserGavePosition)
-    {
-      iPosX = pScreenInfo->dwInitialX;
-      iPosY = pScreenInfo->dwInitialY;
+    else
+        dwWindowStyle |= WS_POPUP;
+
+    /* Setup our window class */
+    wc.cbSize = sizeof(WNDCLASSEX);
+    wc.style = CS_HREDRAW | CS_VREDRAW;
+    wc.lpfnWndProc = winWindowProc;
+    wc.cbClsExtra = 0;
+    wc.cbWndExtra = 0;
+    wc.hInstance = g_hInstance;
+    wc.hIcon =
+        (HICON) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
+                          GetSystemMetrics(SM_CXICON),
+                          GetSystemMetrics(SM_CYICON), 0);
+    wc.hCursor = 0;
+    wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+    wc.lpszMenuName = NULL;
+    wc.lpszClassName = WINDOW_CLASS;
+    wc.hIconSm =
+        (HICON) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
+                          GetSystemMetrics(SM_CXSMICON),
+                          GetSystemMetrics(SM_CYSMICON), LR_DEFAULTSIZE);
+    RegisterClassEx(&wc);
+
+    /* Get size of work area */
+    winGetWorkArea(&rcWorkArea, pScreenInfo);
+
+    /* Adjust for auto-hide taskbars */
+    winAdjustForAutoHide(&rcWorkArea);
+
+    /* Did the user specify a position? */
+    if (pScreenInfo->fUserGavePosition) {
+        iPosX = pScreenInfo->dwInitialX;
+        iPosY = pScreenInfo->dwInitialY;
     }
-  else
-    {
-      iPosX = rcWorkArea.left;
-      iPosY = rcWorkArea.top;
+    else {
+        iPosX = rcWorkArea.left;
+        iPosY = rcWorkArea.top;
     }
 
-  /* Clean up the scrollbars flag, if necessary */
-  if ((!pScreenInfo->fDecoration
+    /* Clean up the scrollbars flag, if necessary */
+    if ((!pScreenInfo->fDecoration
 #ifdef XWIN_MULTIWINDOWEXTWM
-       || pScreenInfo->fMWExtWM
+         || pScreenInfo->fMWExtWM
 #endif
-       || pScreenInfo->fRootless
+         || pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOW
-       || pScreenInfo->fMultiWindow
+         || pScreenInfo->fMultiWindow
 #endif
-       )
-      && (pScreenInfo->iResizeMode == resizeWithScrollbars))
-    {
-      /* We cannot have scrollbars if we do not have a window border */
-      pScreenInfo->iResizeMode = notAllowed;
+        )
+        && (pScreenInfo->iResizeMode == resizeWithScrollbars)) {
+        /* We cannot have scrollbars if we do not have a window border */
+        pScreenInfo->iResizeMode = notAllowed;
     }
 
-  /* Did the user specify a height and width? */
-  if (pScreenInfo->fUserGaveHeightAndWidth)
-    {
-      /* User gave a desired height and width, try to accomodate */
+    /* Did the user specify a height and width? */
+    if (pScreenInfo->fUserGaveHeightAndWidth) {
+        /* User gave a desired height and width, try to accomodate */
 #if CYGDEBUG
-      winDebug ("winCreateBoundingWindowWindowed - User gave height "
-	      "and width\n");
+        winDebug("winCreateBoundingWindowWindowed - User gave height "
+                 "and width\n");
 #endif
-      
-      /* Adjust the window width and height for borders and title bar */
-      if (pScreenInfo->fDecoration
+
+        /* Adjust the window width and height for borders and title bar */
+        if (pScreenInfo->fDecoration
 #ifdef XWIN_MULTIWINDOWEXTWM
-	  && !pScreenInfo->fMWExtWM
+            && !pScreenInfo->fMWExtWM
 #endif
-	  && !pScreenInfo->fRootless
+            && !pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOW
-	  && !pScreenInfo->fMultiWindow
+            && !pScreenInfo->fMultiWindow
 #endif
-	  )
-	{
+            ) {
 #if CYGDEBUG
-	  winDebug ("winCreateBoundingWindowWindowed - Window has decoration\n");
+            winDebug
+                ("winCreateBoundingWindowWindowed - Window has decoration\n");
 #endif
 
-          /* Are we resizable */
-          if (pScreenInfo->iResizeMode != notAllowed)
-	    {
+            /* Are we resizable */
+            if (pScreenInfo->iResizeMode != notAllowed) {
 #if CYGDEBUG
-	      winDebug ("winCreateBoundingWindowWindowed - Window is resizable\n");
+                winDebug
+                    ("winCreateBoundingWindowWindowed - Window is resizable\n");
 #endif
 
-	      iWidth += 2 * GetSystemMetrics (SM_CXSIZEFRAME);
-	      iHeight += 2 * GetSystemMetrics (SM_CYSIZEFRAME) 
-		+ GetSystemMetrics (SM_CYCAPTION);
-	    }
-	  else
-	    {
+                iWidth += 2 * GetSystemMetrics(SM_CXSIZEFRAME);
+                iHeight += 2 * GetSystemMetrics(SM_CYSIZEFRAME)
+                    + GetSystemMetrics(SM_CYCAPTION);
+            }
+            else {
 #if CYGDEBUG
-	      winDebug ("winCreateBoundingWindowWindowed - Window is not resizable\n");
+                winDebug
+                    ("winCreateBoundingWindowWindowed - Window is not resizable\n");
 #endif
 
-	      iWidth += 2 * GetSystemMetrics (SM_CXFIXEDFRAME);
-	      iHeight += 2 * GetSystemMetrics (SM_CYFIXEDFRAME) 
-		+ GetSystemMetrics (SM_CYCAPTION);
-	    }
-	}
+                iWidth += 2 * GetSystemMetrics(SM_CXFIXEDFRAME);
+                iHeight += 2 * GetSystemMetrics(SM_CYFIXEDFRAME)
+                    + GetSystemMetrics(SM_CYCAPTION);
+            }
+        }
     }
-  else
-    {
-      /* By default, we are creating a window that is as large as possible */
+    else {
+        /* By default, we are creating a window that is as large as possible */
 #if CYGDEBUG
-      winDebug ("winCreateBoundingWindowWindowed - User did not give "
-	      "height and width\n");
+        winDebug("winCreateBoundingWindowWindowed - User did not give "
+                 "height and width\n");
 #endif
-      /* Defaults are wrong if we have multiple monitors */
-      if (pScreenInfo->fMultipleMonitors)
-	{
-	  iWidth = GetSystemMetrics (SM_CXVIRTUALSCREEN);
-	  iHeight = GetSystemMetrics (SM_CYVIRTUALSCREEN);
-	}
+        /* Defaults are wrong if we have multiple monitors */
+        if (pScreenInfo->fMultipleMonitors) {
+            iWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+            iHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+        }
     }
 
-  /* Make sure window is no bigger than work area */
-  if (TRUE 
+    /* Make sure window is no bigger than work area */
+    if (TRUE
 #ifdef XWIN_MULTIWINDOWEXTWM
-       && !pScreenInfo->fMWExtWM
+        && !pScreenInfo->fMWExtWM
 #endif
 #ifdef XWIN_MULTIWINDOW
-       && !pScreenInfo->fMultiWindow
+        && !pScreenInfo->fMultiWindow
 #endif
-     )
-    {
-      /* Trim window width to fit work area */
-      if (iWidth > (rcWorkArea.right - rcWorkArea.left))
-        iWidth = rcWorkArea.right - rcWorkArea.left;
-  
-      /* Trim window height to fit work area */
-      if (iHeight >= (rcWorkArea.bottom - rcWorkArea.top))
-        iHeight = rcWorkArea.bottom - rcWorkArea.top;
-  
+        ) {
+        /* Trim window width to fit work area */
+        if (iWidth > (rcWorkArea.right - rcWorkArea.left))
+            iWidth = rcWorkArea.right - rcWorkArea.left;
+
+        /* Trim window height to fit work area */
+        if (iHeight >= (rcWorkArea.bottom - rcWorkArea.top))
+            iHeight = rcWorkArea.bottom - rcWorkArea.top;
+
 #if CYGDEBUG
-      winDebug ("winCreateBoundingWindowWindowed - Adjusted width: %d "\
-	      "height: %d\n",
-    	  iWidth, iHeight);
+        winDebug("winCreateBoundingWindowWindowed - Adjusted width: %d "
+                 "height: %d\n", iWidth, iHeight);
 #endif
     }
 
-  /* Set display and screen-specific tooltip text */
-  if (g_pszQueryHost != NULL)
-    snprintf (szTitle,
-	    sizeof (szTitle),
-	    WINDOW_TITLE_XDMCP,
-	    g_pszQueryHost,
-	    display,
-	    (int) pScreenInfo->dwScreen);
-  else    
-    snprintf (szTitle,
-	    sizeof (szTitle),
-	    WINDOW_TITLE,
-	    display, 
-	    (int) pScreenInfo->dwScreen);
-
-  /* Create the window */
-  *phwnd = CreateWindowExA (0,			/* Extended styles */
-			    WINDOW_CLASS,	/* Class name */
-			    szTitle,		/* Window name */
-			    dwWindowStyle,
-			    iPosX,	        /* Horizontal position */
-			    iPosY,	        /* Vertical position */
-			    iWidth,		/* Right edge */
-			    iHeight,		/* Bottom edge */
-			    (HWND) NULL,	/* No parent or owner window */
-			    (HMENU) NULL,	/* No menu */
-			    GetModuleHandle (NULL),/* Instance handle */
-			    pScreenPriv);	/* ScreenPrivates */
-  if (*phwnd == NULL)
-    {
-      ErrorF ("winCreateBoundingWindowWindowed - CreateWindowEx () failed\n");
-      return FALSE;
+    /* Set display and screen-specific tooltip text */
+    if (g_pszQueryHost != NULL)
+        snprintf(szTitle,
+                 sizeof(szTitle),
+                 WINDOW_TITLE_XDMCP,
+                 g_pszQueryHost, display, (int) pScreenInfo->dwScreen);
+    else
+        snprintf(szTitle,
+                 sizeof(szTitle),
+                 WINDOW_TITLE, display, (int) pScreenInfo->dwScreen);
+
+    /* Create the window */
+    *phwnd = CreateWindowExA(0, /* Extended styles */
+                             WINDOW_CLASS,      /* Class name */
+                             szTitle,   /* Window name */
+                             dwWindowStyle, iPosX,      /* Horizontal position */
+                             iPosY,     /* Vertical position */
+                             iWidth,    /* Right edge */
+                             iHeight,   /* Bottom edge */
+                             (HWND) NULL,       /* No parent or owner window */
+                             (HMENU) NULL,      /* No menu */
+                             GetModuleHandle(NULL),     /* Instance handle */
+                             pScreenPriv);      /* ScreenPrivates */
+    if (*phwnd == NULL) {
+        ErrorF("winCreateBoundingWindowWindowed - CreateWindowEx () failed\n");
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winCreateBoundingWindowWindowed - CreateWindowEx () returned\n");
+    winDebug("winCreateBoundingWindowWindowed - CreateWindowEx () returned\n");
 #endif
 
-  if (fForceShowWindow)
-  {
-      ErrorF("winCreateBoundingWindowWindowed - Setting normal windowstyle\n");
-      ShowWindow(*phwnd, SW_SHOW);      
-  }
-
-  /* Get the client area coordinates */
-  if (!GetClientRect (*phwnd, &rcClient))
-    {
-      ErrorF ("winCreateBoundingWindowWindowed - GetClientRect () "
-	      "failed\n");
-      return FALSE;
+    if (fForceShowWindow) {
+        ErrorF
+            ("winCreateBoundingWindowWindowed - Setting normal windowstyle\n");
+        ShowWindow(*phwnd, SW_SHOW);
     }
 
-  winDebug ("winCreateBoundingWindowWindowed - WindowClient "
-	  "w %ld h %ld r %ld l %ld b %ld t %ld\n",
-	  rcClient.right - rcClient.left,
-	  rcClient.bottom - rcClient.top,
-	  rcClient.right, rcClient.left,
-	  rcClient.bottom, rcClient.top);
-  
-  /* We adjust the visual size if the user did not specify it */
-  if (!((pScreenInfo->iResizeMode == resizeWithScrollbars) && pScreenInfo->fUserGaveHeightAndWidth))
-    {
-      /*
-       * User did not give a height and width with scrollbars enabled,
-       * so we will resize the underlying visual to be as large as
-       * the initial view port (page size).  This way scrollbars will
-       * not appear until the user shrinks the window, if they ever do.
-       *
-       * NOTE: We have to store the viewport size here because
-       * the user may have an autohide taskbar, which would
-       * cause the viewport size to be one less in one dimension
-       * than the viewport size that we calculated by subtracting
-       * the size of the borders and caption.
-       */
-      pScreenInfo->dwWidth = rcClient.right - rcClient.left;
-      pScreenInfo->dwHeight = rcClient.bottom - rcClient.top;
+    /* Get the client area coordinates */
+    if (!GetClientRect(*phwnd, &rcClient)) {
+        ErrorF("winCreateBoundingWindowWindowed - GetClientRect () "
+               "failed\n");
+        return FALSE;
+    }
+
+    winDebug("winCreateBoundingWindowWindowed - WindowClient "
+             "w %ld h %ld r %ld l %ld b %ld t %ld\n",
+             rcClient.right - rcClient.left,
+             rcClient.bottom - rcClient.top,
+             rcClient.right, rcClient.left, rcClient.bottom, rcClient.top);
+
+    /* We adjust the visual size if the user did not specify it */
+    if (!
+        ((pScreenInfo->iResizeMode == resizeWithScrollbars) &&
+         pScreenInfo->fUserGaveHeightAndWidth)) {
+        /*
+         * User did not give a height and width with scrollbars enabled,
+         * so we will resize the underlying visual to be as large as
+         * the initial view port (page size).  This way scrollbars will
+         * not appear until the user shrinks the window, if they ever do.
+         *
+         * NOTE: We have to store the viewport size here because
+         * the user may have an autohide taskbar, which would
+         * cause the viewport size to be one less in one dimension
+         * than the viewport size that we calculated by subtracting
+         * the size of the borders and caption.
+         */
+        pScreenInfo->dwWidth = rcClient.right - rcClient.left;
+        pScreenInfo->dwHeight = rcClient.bottom - rcClient.top;
     }
 
 #if 0
-  /*
-   * NOTE: For the uninitiated, the page size is the number of pixels
-   * that we can display in the x or y direction at a time and the
-   * range is the total number of pixels in the x or y direction that we
-   * have available to display.  In other words, the page size is the
-   * size of the window area minus the space the caption, borders, and
-   * scrollbars (if any) occupy, and the range is the size of the
-   * underlying X visual.  Notice that, contrary to what some of the
-   * MSDN Library arcticles lead you to believe, the windows
-   * ``client area'' size does not include the scrollbars.  In other words,
-   * the whole client area size that is reported to you is drawable by
-   * you; you do not have to subtract the size of the scrollbars from
-   * the client area size, and if you did it would result in the size
-   * of the scrollbars being double counted.
-   */
-
-  /* Setup scrollbar page and range, if scrollbars are enabled */
-  if (pScreenInfo->fScrollbars)
-    {
-      SCROLLINFO		si;
-      
-      /* Initialize the scrollbar info structure */
-      si.cbSize = sizeof (si);
-      si.fMask = SIF_RANGE | SIF_PAGE;
-      si.nMin = 0;
-      
-      /* Setup the width range and page size */
-      si.nMax = pScreenInfo->dwWidth - 1;
-      si.nPage = rcClient.right - rcClient.left;
-      winDebug ("winCreateBoundingWindowWindowed - HORZ nMax: %d nPage :%d\n",
-	      si.nMax, si.nPage);
-      SetScrollInfo (*phwnd, SB_HORZ, &si, TRUE);
-      
-      /* Setup the height range and page size */
-      si.nMax = pScreenInfo->dwHeight - 1;
-      si.nPage = rcClient.bottom - rcClient.top;
-      winDebug ("winCreateBoundingWindowWindowed - VERT nMax: %d nPage :%d\n",
-	      si.nMax, si.nPage);
-      SetScrollInfo (*phwnd, SB_VERT, &si, TRUE);
+    /*
+     * NOTE: For the uninitiated, the page size is the number of pixels
+     * that we can display in the x or y direction at a time and the
+     * range is the total number of pixels in the x or y direction that we
+     * have available to display.  In other words, the page size is the
+     * size of the window area minus the space the caption, borders, and
+     * scrollbars (if any) occupy, and the range is the size of the
+     * underlying X visual.  Notice that, contrary to what some of the
+     * MSDN Library arcticles lead you to believe, the windows
+     * ``client area'' size does not include the scrollbars.  In other words,
+     * the whole client area size that is reported to you is drawable by
+     * you; you do not have to subtract the size of the scrollbars from
+     * the client area size, and if you did it would result in the size
+     * of the scrollbars being double counted.
+     */
+
+    /* Setup scrollbar page and range, if scrollbars are enabled */
+    if (pScreenInfo->fScrollbars) {
+        SCROLLINFO si;
+
+        /* Initialize the scrollbar info structure */
+        si.cbSize = sizeof(si);
+        si.fMask = SIF_RANGE | SIF_PAGE;
+        si.nMin = 0;
+
+        /* Setup the width range and page size */
+        si.nMax = pScreenInfo->dwWidth - 1;
+        si.nPage = rcClient.right - rcClient.left;
+        winDebug("winCreateBoundingWindowWindowed - HORZ nMax: %d nPage :%d\n",
+                 si.nMax, si.nPage);
+        SetScrollInfo(*phwnd, SB_HORZ, &si, TRUE);
+
+        /* Setup the height range and page size */
+        si.nMax = pScreenInfo->dwHeight - 1;
+        si.nPage = rcClient.bottom - rcClient.top;
+        winDebug("winCreateBoundingWindowWindowed - VERT nMax: %d nPage :%d\n",
+                 si.nMax, si.nPage);
+        SetScrollInfo(*phwnd, SB_VERT, &si, TRUE);
     }
 #endif
 
-  /* Show the window */
-  if (FALSE
+    /* Show the window */
+    if (FALSE
 #ifdef XWIN_MULTIWINDOWEXTWM
-      || pScreenInfo->fMWExtWM
+        || pScreenInfo->fMWExtWM
 #endif
 #ifdef XWIN_MULTIWINDOW
-      || pScreenInfo->fMultiWindow
+        || pScreenInfo->fMultiWindow
 #endif
-      )
-    {
+        ) {
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
-      pScreenPriv->fRootWindowShown = FALSE;
+        pScreenPriv->fRootWindowShown = FALSE;
 #endif
-      ShowWindow (*phwnd, SW_HIDE);
+        ShowWindow(*phwnd, SW_HIDE);
     }
-  else
-    ShowWindow (*phwnd, SW_SHOWNORMAL);
-  if (!UpdateWindow (*phwnd))
-    {
-      ErrorF ("winCreateBoundingWindowWindowed - UpdateWindow () failed\n");
-      return FALSE;
+    else
+        ShowWindow(*phwnd, SW_SHOWNORMAL);
+    if (!UpdateWindow(*phwnd)) {
+        ErrorF("winCreateBoundingWindowWindowed - UpdateWindow () failed\n");
+        return FALSE;
     }
-  
-  /* Attempt to bring our window to the top of the display */
-  if (TRUE
+
+    /* Attempt to bring our window to the top of the display */
+    if (TRUE
 #ifdef XWIN_MULTIWINDOWEXTWM
-      && !pScreenInfo->fMWExtWM
+        && !pScreenInfo->fMWExtWM
 #endif
-      && !pScreenInfo->fRootless
+        && !pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOW
-      && !pScreenInfo->fMultiWindow
+        && !pScreenInfo->fMultiWindow
 #endif
-      )
-    {
-      if (!BringWindowToTop (*phwnd))
-	{
-	  ErrorF ("winCreateBoundingWindowWindowed - BringWindowToTop () "
-		  "failed\n");
-	  return FALSE;
-	}
+        ) {
+        if (!BringWindowToTop(*phwnd)) {
+            ErrorF("winCreateBoundingWindowWindowed - BringWindowToTop () "
+                   "failed\n");
+            return FALSE;
+        }
     }
 
 #ifdef XWIN_NATIVEGDI
-  /* Paint window background blue */
-  if (pScreenInfo->dwEngine == WIN_SERVER_NATIVE_GDI)
-    winPaintBackground (*phwnd, RGB (0x00, 0x00, 0xFF));
+    /* Paint window background blue */
+    if (pScreenInfo->dwEngine == WIN_SERVER_NATIVE_GDI)
+        winPaintBackground(*phwnd, RGB(0x00, 0x00, 0xFF));
 #endif
 
-  winDebug ("winCreateBoundingWindowWindowed -  Returning\n");
+    winDebug("winCreateBoundingWindowWindowed -  Returning\n");
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Find the work area of all attached monitors
  */
 
 static Bool
-winGetWorkArea (RECT *prcWorkArea, winScreenInfo *pScreenInfo)
+winGetWorkArea(RECT * prcWorkArea, winScreenInfo * pScreenInfo)
 {
-  int			iPrimaryWidth, iPrimaryHeight;
-  int			iWidth, iHeight;
-  int			iLeft, iTop;
-  int			iPrimaryNonWorkAreaWidth, iPrimaryNonWorkAreaHeight;
+    int iPrimaryWidth, iPrimaryHeight;
+    int iWidth, iHeight;
+    int iLeft, iTop;
+    int iPrimaryNonWorkAreaWidth, iPrimaryNonWorkAreaHeight;
 
-  /* SPI_GETWORKAREA only gets the work area of the primary screen. */
-  SystemParametersInfo (SPI_GETWORKAREA, 0, prcWorkArea, 0);
+    /* SPI_GETWORKAREA only gets the work area of the primary screen. */
+    SystemParametersInfo(SPI_GETWORKAREA, 0, prcWorkArea, 0);
 
-  /* Bail out here if we aren't using multiple monitors */
-  if (!pScreenInfo->fMultipleMonitors)
-    return TRUE;
-  
-  winDebug ("winGetWorkArea - Original WorkArea: %d %d %d %d\n",
-	  (int) prcWorkArea->top, (int) prcWorkArea->left,
-	  (int) prcWorkArea->bottom, (int) prcWorkArea->right);
-
-  /* Get size of full virtual screen */
-  iWidth = GetSystemMetrics (SM_CXVIRTUALSCREEN);
-  iHeight = GetSystemMetrics (SM_CYVIRTUALSCREEN);
-
-  winDebug ("winGetWorkArea - Virtual screen is %d x %d\n", iWidth, iHeight);
-
-  /* Get origin of full virtual screen */
-  iLeft = GetSystemMetrics (SM_XVIRTUALSCREEN);
-  iTop = GetSystemMetrics (SM_YVIRTUALSCREEN);
-
-  winDebug ("winGetWorkArea - Virtual screen origin is %d, %d\n", iLeft, iTop);
-  
-  /* Get size of primary screen */
-  iPrimaryWidth = GetSystemMetrics (SM_CXSCREEN);
-  iPrimaryHeight = GetSystemMetrics (SM_CYSCREEN);
-
-  winDebug ("winGetWorkArea - Primary screen is %d x %d\n",
-	 iPrimaryWidth, iPrimaryHeight);
-  
-  /* Work out how much of the primary screen we aren't using */
-  iPrimaryNonWorkAreaWidth = iPrimaryWidth - (prcWorkArea->right -
-					      prcWorkArea->left);
-  iPrimaryNonWorkAreaHeight = iPrimaryHeight - (prcWorkArea->bottom
-						- prcWorkArea->top);
-  
-  /* Update the rectangle to include all monitors */
-  if (iLeft < 0) 
-    {
-      prcWorkArea->left = iLeft;
+    /* Bail out here if we aren't using multiple monitors */
+    if (!pScreenInfo->fMultipleMonitors)
+        return TRUE;
+
+    winDebug("winGetWorkArea - Original WorkArea: %d %d %d %d\n",
+             (int) prcWorkArea->top, (int) prcWorkArea->left,
+             (int) prcWorkArea->bottom, (int) prcWorkArea->right);
+
+    /* Get size of full virtual screen */
+    iWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+    iHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+
+    winDebug("winGetWorkArea - Virtual screen is %d x %d\n", iWidth, iHeight);
+
+    /* Get origin of full virtual screen */
+    iLeft = GetSystemMetrics(SM_XVIRTUALSCREEN);
+    iTop = GetSystemMetrics(SM_YVIRTUALSCREEN);
+
+    winDebug("winGetWorkArea - Virtual screen origin is %d, %d\n", iLeft, iTop);
+
+    /* Get size of primary screen */
+    iPrimaryWidth = GetSystemMetrics(SM_CXSCREEN);
+    iPrimaryHeight = GetSystemMetrics(SM_CYSCREEN);
+
+    winDebug("winGetWorkArea - Primary screen is %d x %d\n",
+             iPrimaryWidth, iPrimaryHeight);
+
+    /* Work out how much of the primary screen we aren't using */
+    iPrimaryNonWorkAreaWidth = iPrimaryWidth - (prcWorkArea->right -
+                                                prcWorkArea->left);
+    iPrimaryNonWorkAreaHeight = iPrimaryHeight - (prcWorkArea->bottom
+                                                  - prcWorkArea->top);
+
+    /* Update the rectangle to include all monitors */
+    if (iLeft < 0) {
+        prcWorkArea->left = iLeft;
     }
-  if (iTop < 0) 
-    {
-      prcWorkArea->top = iTop;
+    if (iTop < 0) {
+        prcWorkArea->top = iTop;
     }
-  prcWorkArea->right = prcWorkArea->left + iWidth -
-    iPrimaryNonWorkAreaWidth;
-  prcWorkArea->bottom = prcWorkArea->top + iHeight -
-    iPrimaryNonWorkAreaHeight;
-  
-  winDebug ("winGetWorkArea - Adjusted WorkArea for multiple "
-	  "monitors: %d %d %d %d\n",
-	  (int) prcWorkArea->top, (int) prcWorkArea->left,
-	  (int) prcWorkArea->bottom, (int) prcWorkArea->right);
-  
-  return TRUE;
-}
+    prcWorkArea->right = prcWorkArea->left + iWidth - iPrimaryNonWorkAreaWidth;
+    prcWorkArea->bottom = prcWorkArea->top + iHeight -
+        iPrimaryNonWorkAreaHeight;
 
+    winDebug("winGetWorkArea - Adjusted WorkArea for multiple "
+             "monitors: %d %d %d %d\n",
+             (int) prcWorkArea->top, (int) prcWorkArea->left,
+             (int) prcWorkArea->bottom, (int) prcWorkArea->right);
+
+    return TRUE;
+}
 
 /*
  * Adjust the client area so that any auto-hide toolbars
@@ -588,69 +562,65 @@ winGetWorkArea (RECT *prcWorkArea, winScreenInfo *pScreenInfo)
  */
 
 static Bool
-winAdjustForAutoHide (RECT *prcWorkArea)
+winAdjustForAutoHide(RECT * prcWorkArea)
 {
-  APPBARDATA		abd;
-  HWND			hwndAutoHide;
-
-  winDebug ("winAdjustForAutoHide - Original WorkArea: %d %d %d %d\n",
-	  (int) prcWorkArea->top, (int) prcWorkArea->left,
-	  (int) prcWorkArea->bottom, (int) prcWorkArea->right);
-
-  /* Find out if the Windows taskbar is set to auto-hide */
-  ZeroMemory (&abd, sizeof (abd));
-  abd.cbSize = sizeof (abd);
-  if (SHAppBarMessage (ABM_GETSTATE, &abd) & ABS_AUTOHIDE)
-    winDebug ("winAdjustForAutoHide - Taskbar is auto hide\n");
-
-  /* Look for a TOP auto-hide taskbar */
-  abd.uEdge = ABE_TOP;
-  hwndAutoHide = (HWND) SHAppBarMessage (ABM_GETAUTOHIDEBAR, &abd);
-  if (hwndAutoHide != NULL)
-    {
-      winDebug ("winAdjustForAutoHide - Found TOP auto-hide taskbar\n");
-      prcWorkArea->top += 1;
+    APPBARDATA abd;
+    HWND hwndAutoHide;
+
+    winDebug("winAdjustForAutoHide - Original WorkArea: %d %d %d %d\n",
+             (int) prcWorkArea->top, (int) prcWorkArea->left,
+             (int) prcWorkArea->bottom, (int) prcWorkArea->right);
+
+    /* Find out if the Windows taskbar is set to auto-hide */
+    ZeroMemory(&abd, sizeof(abd));
+    abd.cbSize = sizeof(abd);
+    if (SHAppBarMessage(ABM_GETSTATE, &abd) & ABS_AUTOHIDE)
+        winDebug("winAdjustForAutoHide - Taskbar is auto hide\n");
+
+    /* Look for a TOP auto-hide taskbar */
+    abd.uEdge = ABE_TOP;
+    hwndAutoHide = (HWND) SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd);
+    if (hwndAutoHide != NULL) {
+        winDebug("winAdjustForAutoHide - Found TOP auto-hide taskbar\n");
+        prcWorkArea->top += 1;
     }
 
-  /* Look for a LEFT auto-hide taskbar */
-  abd.uEdge = ABE_LEFT;
-  hwndAutoHide = (HWND) SHAppBarMessage (ABM_GETAUTOHIDEBAR, &abd);
-  if (hwndAutoHide != NULL)
-    {
-      winDebug ("winAdjustForAutoHide - Found LEFT auto-hide taskbar\n");
-      prcWorkArea->left += 1;
+    /* Look for a LEFT auto-hide taskbar */
+    abd.uEdge = ABE_LEFT;
+    hwndAutoHide = (HWND) SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd);
+    if (hwndAutoHide != NULL) {
+        winDebug("winAdjustForAutoHide - Found LEFT auto-hide taskbar\n");
+        prcWorkArea->left += 1;
     }
 
-  /* Look for a BOTTOM auto-hide taskbar */
-  abd.uEdge = ABE_BOTTOM;
-  hwndAutoHide = (HWND) SHAppBarMessage (ABM_GETAUTOHIDEBAR, &abd);
-  if (hwndAutoHide != NULL)
-    {
-      winDebug ("winAdjustForAutoHide - Found BOTTOM auto-hide taskbar\n");
-      prcWorkArea->bottom -= 1;
+    /* Look for a BOTTOM auto-hide taskbar */
+    abd.uEdge = ABE_BOTTOM;
+    hwndAutoHide = (HWND) SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd);
+    if (hwndAutoHide != NULL) {
+        winDebug("winAdjustForAutoHide - Found BOTTOM auto-hide taskbar\n");
+        prcWorkArea->bottom -= 1;
     }
 
-  /* Look for a RIGHT auto-hide taskbar */
-  abd.uEdge = ABE_RIGHT;
-  hwndAutoHide = (HWND) SHAppBarMessage (ABM_GETAUTOHIDEBAR, &abd);
-  if (hwndAutoHide != NULL)
-    {
-      winDebug ("winAdjustForAutoHide - Found RIGHT auto-hide taskbar\n");
-      prcWorkArea->right -= 1;
+    /* Look for a RIGHT auto-hide taskbar */
+    abd.uEdge = ABE_RIGHT;
+    hwndAutoHide = (HWND) SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd);
+    if (hwndAutoHide != NULL) {
+        winDebug("winAdjustForAutoHide - Found RIGHT auto-hide taskbar\n");
+        prcWorkArea->right -= 1;
     }
 
-  winDebug ("winAdjustForAutoHide - Adjusted WorkArea: %d %d %d %d\n",
-	  (int) prcWorkArea->top, (int) prcWorkArea->left,
-	  (int) prcWorkArea->bottom, (int) prcWorkArea->right);
-  
+    winDebug("winAdjustForAutoHide - Adjusted WorkArea: %d %d %d %d\n",
+             (int) prcWorkArea->top, (int) prcWorkArea->left,
+             (int) prcWorkArea->bottom, (int) prcWorkArea->right);
+
 #if 0
-  /* Obtain the task bar window dimensions */
-  abd.hWnd = hwndAutoHide;
-  hwndAutoHide = (HWND) SHAppBarMessage (ABM_GETTASKBARPOS, &abd);
-  winDebug ("hwndAutoHide %08x abd.hWnd %08x %d %d %d %d\n",
-	  hwndAutoHide, abd.hWnd,
-	  abd.rc.top, abd.rc.left, abd.rc.bottom, abd.rc.right);
+    /* Obtain the task bar window dimensions */
+    abd.hWnd = hwndAutoHide;
+    hwndAutoHide = (HWND) SHAppBarMessage(ABM_GETTASKBARPOS, &abd);
+    winDebug("hwndAutoHide %08x abd.hWnd %08x %d %d %d %d\n",
+             hwndAutoHide, abd.hWnd,
+             abd.rc.top, abd.rc.left, abd.rc.bottom, abd.rc.right);
 #endif
 
-  return TRUE;
+    return TRUE;
 }
diff --git a/xorg-server/hw/xwin/wincursor.c b/xorg-server/hw/xwin/wincursor.c
index 9f669bcf8..b56104fde 100644
--- a/xorg-server/hw/xwin/wincursor.c
+++ b/xorg-server/hw/xwin/wincursor.c
@@ -1,627 +1,613 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	Dakshinamurthy Karra

- *		Suhaib M Siddiqi

- *		Peter Busch

- *		Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-#include "winmsg.h"

-#include <cursorstr.h>

-#include <mipointrst.h>

-#include <servermd.h>

-#include "misc.h"

-

-#define BRIGHTNESS(x) (x##Red * 0.299 + x##Green * 0.587 + x##Blue * 0.114)

-

-#if 0

-# define WIN_DEBUG_MSG winDebug

-#else

-# define WIN_DEBUG_MSG(...)

-#endif

-

-/*

- * Local function prototypes

- */

-

-static void

-winPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);

-

-static Bool

-winCursorOffScreen (ScreenPtr *ppScreen, int *x, int *y);

-

-static void

-winCrossScreen (ScreenPtr pScreen, Bool fEntering);

-

-miPointerScreenFuncRec g_winPointerCursorFuncs =

-{

-  winCursorOffScreen,

-  winCrossScreen,

-  winPointerWarpCursor

-};

-

-

-static void

-winPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

-{

-  winScreenPriv(pScreen);

-  RECT			rcClient;

-  static Bool		s_fInitialWarp = TRUE;

-

-  /* Discard first warp call */

-  if (s_fInitialWarp)

-    {

-      /* First warp moves mouse to center of window, just ignore it */

-

-      /* Don't ignore subsequent warps */

-      s_fInitialWarp = FALSE;

-

-      winErrorFVerb (2, "winPointerWarpCursor - Discarding first warp: %d %d\n",

-	      x, y);

-      

-      return;

-    }

-

-  /*

-     Only update the Windows cursor position if root window is active,

-     or we are in a rootless mode

-  */

-  if ((pScreenPriv->hwndScreen == GetForegroundWindow ())

-      || pScreenPriv->pScreenInfo->fRootless

-#ifdef XWIN_MULTIWINDOW

-      || pScreenPriv->pScreenInfo->fMultiWindow

-#endif

-      )

-    {

-      /* Get the client area coordinates */

-      GetClientRect (pScreenPriv->hwndScreen, &rcClient);

-      

-      /* Translate the client area coords to screen coords */

-      MapWindowPoints (pScreenPriv->hwndScreen,

-		       HWND_DESKTOP,

-		       (LPPOINT)&rcClient,

-		       2);

-      

-      /* 

-       * Update the Windows cursor position so that we don't

-       * immediately warp back to the current position.

-       */

-      SetCursorPos (rcClient.left + x, rcClient.top + y);

-    }

-

-  /* Call the mi warp procedure to do the actual warping in X. */

-  miPointerWarpCursor (pDev, pScreen, x, y);

-}

-

-static Bool

-winCursorOffScreen (ScreenPtr *ppScreen, int *x, int *y)

-{

-  return FALSE;

-}

-

-static void

-winCrossScreen (ScreenPtr pScreen, Bool fEntering)

-{

-}

-

-static unsigned char

-reverse(unsigned char c)

-{

-  int i;

-  unsigned char ret = 0;

-  for (i = 0; i < 8; ++i)

-    {

-      ret |= ((c >> i)&1) << (7 - i);

-    }

-  return ret;

-}

-

-/*

- * Convert X cursor to Windows cursor

- * FIXME: Perhaps there are more smart code

- */

-static HCURSOR

-winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)

-{

-  winScreenPriv(pScreen);

-  HCURSOR hCursor = NULL;

-  unsigned char *pAnd;

-  unsigned char *pXor;

-  int nCX, nCY;

-  int nBytes;

-  double dForeY, dBackY;

-  BOOL fReverse;

-  HBITMAP hAnd, hXor;

-  ICONINFO ii;

-  unsigned char *pCur;

-  int x, y;

-  unsigned char bit;

-  HDC hDC;

-  BITMAPV4HEADER bi;

-  BITMAPINFO *pbmi;

-  unsigned long *lpBits;

-

-  WIN_DEBUG_MSG("winLoadCursor: Win32: %dx%d X11: %dx%d hotspot: %d,%d\n", 

-          pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,

-          pCursor->bits->width, pCursor->bits->height,

-          pCursor->bits->xhot, pCursor->bits->yhot

-          );

-

-  /* We can use only White and Black, so calc brightness of color 

-   * Also check if the cursor is inverted */  

-  dForeY = BRIGHTNESS(pCursor->fore);

-  dBackY = BRIGHTNESS(pCursor->back);

-  fReverse = dForeY < dBackY;

- 

-  /* Check wether the X11 cursor is bigger than the win32 cursor */

-  if (pScreenPriv->cursor.sm_cx < pCursor->bits->width || 

-      pScreenPriv->cursor.sm_cy < pCursor->bits->height)

-    {

-      winErrorFVerb (3, "winLoadCursor - Windows requires %dx%d cursor but X requires %dx%d\n",

-	      pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,

-	      pCursor->bits->width, pCursor->bits->height);

-    }

-

-  /* Get the number of bytes required to store the whole cursor image 

-   * This is roughly (sm_cx * sm_cy) / 8 

-   * round up to 8 pixel boundary so we can convert whole bytes */

-  nBytes = bits_to_bytes(pScreenPriv->cursor.sm_cx) * pScreenPriv->cursor.sm_cy;

-

-  /* Get the effective width and height */

-  nCX = min(pScreenPriv->cursor.sm_cx, pCursor->bits->width);

-  nCY = min(pScreenPriv->cursor.sm_cy, pCursor->bits->height);

-

-  /* Allocate memory for the bitmaps */

-  pAnd = malloc (nBytes);

-  memset (pAnd, 0xFF, nBytes);

-  pXor = calloc (1, nBytes);

-

-  /* Convert the X11 bitmap to a win32 bitmap 

-   * The first is for an empty mask */

-  if (pCursor->bits->emptyMask)

-    {

-      int x, y, xmax = bits_to_bytes(nCX);

-      for (y = 0; y < nCY; ++y)

-	for (x = 0; x < xmax; ++x)

-	  {

-	    int nWinPix = bits_to_bytes(pScreenPriv->cursor.sm_cx) * y + x;

-	    int nXPix = BitmapBytePad(pCursor->bits->width) * y + x;

-

-	    pAnd[nWinPix] = 0;

-	    if (fReverse)

-	      pXor[nWinPix] = reverse (~pCursor->bits->source[nXPix]);

-	    else

-	      pXor[nWinPix] = reverse (pCursor->bits->source[nXPix]);

-	  }

-    }

-  else

-    {

-      int x, y, xmax = bits_to_bytes(nCX);

-      for (y = 0; y < nCY; ++y)

-	for (x = 0; x < xmax; ++x)

-	  {

-	    int nWinPix = bits_to_bytes(pScreenPriv->cursor.sm_cx) * y + x;

-	    int nXPix = BitmapBytePad(pCursor->bits->width) * y + x;

-

-	    unsigned char mask = pCursor->bits->mask[nXPix];

-	    pAnd[nWinPix] = reverse (~mask);

-	    if (fReverse)

-	      pXor[nWinPix] = reverse (~pCursor->bits->source[nXPix] & mask);

-	    else

-	      pXor[nWinPix] = reverse (pCursor->bits->source[nXPix] & mask);

-	  }

-    }

-

-  /* prepare the pointers */ 

-  hCursor = NULL;

-  lpBits = NULL;

-

-  /* We have a truecolor alpha-blended cursor and can use it! */

-  if (pCursor->bits->argb) 

-    {

-      WIN_DEBUG_MSG("winLoadCursor: Trying truecolor alphablended cursor\n"); 

-      memset (&bi, 0, sizeof (BITMAPV4HEADER));

-      bi.bV4Size = sizeof(BITMAPV4HEADER);

-      bi.bV4Width = pScreenPriv->cursor.sm_cx;

-      bi.bV4Height = -(pScreenPriv->cursor.sm_cy); /* right-side up */

-      bi.bV4Planes = 1;

-      bi.bV4BitCount = 32;

-      bi.bV4V4Compression = BI_BITFIELDS;

-      bi.bV4RedMask = 0x00FF0000;

-      bi.bV4GreenMask = 0x0000FF00;

-      bi.bV4BlueMask = 0x000000FF;

-      bi.bV4AlphaMask = 0xFF000000; 

-      

-      lpBits = (unsigned long *) calloc (pScreenPriv->cursor.sm_cx*pScreenPriv->cursor.sm_cy,

-					 sizeof (unsigned long));

-      

-      if (lpBits)

-	{

-	  for (y=0; y<nCY; y++)

-	    {

-	      unsigned long *src, *dst;

-	      src = &(pCursor->bits->argb[y * pCursor->bits->width]);

-	      dst = &(lpBits[y * pScreenPriv->cursor.sm_cx]);

-	      memcpy (dst, src, 4*nCX);

-	    }

-	}

-    } /* End if-truecolor-icon */

-  

-  if (!lpBits)

-    {

-      /* Bicolor, use a palettized DIB */

-      WIN_DEBUG_MSG("winLoadCursor: Trying two color cursor\n"); 

-      pbmi = (BITMAPINFO*)&bi;

-      memset (pbmi, 0, sizeof (BITMAPINFOHEADER));

-      pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

-      pbmi->bmiHeader.biWidth = pScreenPriv->cursor.sm_cx;

-      pbmi->bmiHeader.biHeight = -abs(pScreenPriv->cursor.sm_cy); /* right-side up */

-      pbmi->bmiHeader.biPlanes = 1;

-      pbmi->bmiHeader.biBitCount = 8;

-      pbmi->bmiHeader.biCompression = BI_RGB;

-      pbmi->bmiHeader.biSizeImage = 0;

-      pbmi->bmiHeader.biClrUsed = 3;

-      pbmi->bmiHeader.biClrImportant = 3;

-      pbmi->bmiColors[0].rgbRed = 0; /* Empty */

-      pbmi->bmiColors[0].rgbGreen = 0;

-      pbmi->bmiColors[0].rgbBlue = 0;

-      pbmi->bmiColors[0].rgbReserved = 0;

-      pbmi->bmiColors[1].rgbRed = pCursor->backRed>>8; /* Background */

-      pbmi->bmiColors[1].rgbGreen = pCursor->backGreen>>8;

-      pbmi->bmiColors[1].rgbBlue = pCursor->backBlue>>8;

-      pbmi->bmiColors[1].rgbReserved = 0;

-      pbmi->bmiColors[2].rgbRed = pCursor->foreRed>>8; /* Foreground */

-      pbmi->bmiColors[2].rgbGreen = pCursor->foreGreen>>8;

-      pbmi->bmiColors[2].rgbBlue = pCursor->foreBlue>>8;

-      pbmi->bmiColors[2].rgbReserved = 0;

-      

-      lpBits = (unsigned long *) calloc (pScreenPriv->cursor.sm_cx*pScreenPriv->cursor.sm_cy,

-					 sizeof (char));

-      

-      pCur = (unsigned char *)lpBits;

-      if (lpBits)

-	{

-	  for (y=0; y<pScreenPriv->cursor.sm_cy; y++)

-	    {

-	      for (x=0; x<pScreenPriv->cursor.sm_cx; x++)

-		{

-		  if (x>=nCX || y>=nCY) /* Outside of X11 icon bounds */

-		    (*pCur++) = 0;

-		  else /* Within X11 icon bounds */

-		    {

-		      int nWinPix = bits_to_bytes(pScreenPriv->cursor.sm_cx) * y + (x/8);

-

-		      bit = pAnd[nWinPix];

-		      bit = bit & (1<<(7-(x&7)));

-		      if (!bit) /* Within the cursor mask? */

-			{

-			  int nXPix = BitmapBytePad(pCursor->bits->width) * y + (x/8);

-			  bit = ~reverse(~pCursor->bits->source[nXPix] & pCursor->bits->mask[nXPix]);

-			  bit = bit & (1<<(7-(x&7)));

-			  if (bit) /* Draw foreground */

-			    (*pCur++) = 2;

-			  else /* Draw background */

-			    (*pCur++) = 1;

-			}

-		      else /* Outside the cursor mask */

-			(*pCur++) = 0;

-		    }

-		} /* end for (x) */

-	    } /* end for (y) */

-	} /* end if (lpbits) */

-    }

-

-  /* If one of the previous two methods gave us the bitmap we need, make a cursor */

-  if (lpBits)

-    {

-      WIN_DEBUG_MSG("winLoadCursor: Creating bitmap cursor: hotspot %d,%d\n",

-              pCursor->bits->xhot, pCursor->bits->yhot);

-

-      hAnd = NULL;

-      hXor = NULL;

-

-      hAnd = CreateBitmap (pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy, 1, 1, pAnd);

-

-      hDC = GetDC (NULL);

-      if (hDC)

-	{

-	  hXor = CreateCompatibleBitmap (hDC, pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy);

-	  SetDIBits (hDC, hXor, 0, pScreenPriv->cursor.sm_cy, lpBits, (BITMAPINFO*)&bi, DIB_RGB_COLORS);

-	  ReleaseDC (NULL, hDC);

-	}

-      free (lpBits);

-      

-      

-      if (hAnd && hXor)

-	{

-	  ii.fIcon = FALSE;

-	  ii.xHotspot = pCursor->bits->xhot;

-	  ii.yHotspot = pCursor->bits->yhot;

-	  ii.hbmMask = hAnd;

-	  ii.hbmColor = hXor;

-	  hCursor = (HCURSOR) CreateIconIndirect( &ii );

-

-	  if (hCursor == NULL)

-	    winW32Error(2, "winLoadCursor - CreateIconIndirect failed:");

-	  else 

-	    {

-	      if (GetIconInfo(hCursor, &ii))

-		{

-		  if (ii.fIcon)

-		    {

-		      WIN_DEBUG_MSG("winLoadCursor: CreateIconIndirect returned  no cursor. Trying again.\n");

-		      

-		      DestroyCursor(hCursor);

-		      

-		      ii.fIcon = FALSE;

-		      ii.xHotspot = pCursor->bits->xhot;

-		      ii.yHotspot = pCursor->bits->yhot;

-		      hCursor = (HCURSOR) CreateIconIndirect( &ii );

-		      

-		      if (hCursor == NULL)

-			winW32Error(2, "winLoadCursor - CreateIconIndirect failed:");

-		    }

-		  /* GetIconInfo creates new bitmaps. Destroy them again */

-		  if (ii.hbmMask)

-     	            DeleteObject(ii.hbmMask);

-		  if (ii.hbmColor)

-		    DeleteObject(ii.hbmColor);

-		}

-	    }

-	}

-

-      if (hAnd)

-	DeleteObject (hAnd);

-      if (hXor)

-	DeleteObject (hXor);

-    }

-

-  if (!hCursor)

-    {

-      /* We couldn't make a color cursor for this screen, use

-	 black and white instead */

-      hCursor = CreateCursor (g_hInstance,

-			      pCursor->bits->xhot, pCursor->bits->yhot,

-			      pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,

-			      pAnd, pXor);

-      if (hCursor == NULL)

-	winW32Error(2, "winLoadCursor - CreateCursor failed:");

-    }

-  free (pAnd);

-  free (pXor);

-

-  return hCursor;

-}

-

-/*

-===========================================================================

-

- Pointer sprite functions

-

-===========================================================================

-*/

-

-/*

- * winRealizeCursor

- *  Convert the X cursor representation to native format if possible.

- */

-static Bool

-winRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

-{

-  if(pCursor == NULL || pCursor->bits == NULL)

-    return FALSE;

-  

-  /* FIXME: cache ARGB8888 representation? */

-

-  return TRUE;

-}

-

-

-/*

- * winUnrealizeCursor

- *  Free the storage space associated with a realized cursor.

- */

-static Bool

-winUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

-{

-  return TRUE;

-}

-

-

-/*

- * winSetCursor

- *  Set the cursor sprite and position.

- */

-static void

-winSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)

-{

-  POINT ptCurPos, ptTemp;

-  HWND  hwnd;

-  RECT  rcClient;

-  BOOL  bInhibit;

-  winScreenPriv(pScreen);

-  WIN_DEBUG_MSG("winSetCursor: cursor=%p\n", pCursor); 

-  

-  /* Inhibit changing the cursor if the mouse is not in a client area */

-  bInhibit = FALSE;

-  if (GetCursorPos (&ptCurPos))

-    {

-      hwnd = WindowFromPoint (ptCurPos);

-      if (hwnd)

-	{

-	  if (GetClientRect (hwnd, &rcClient))

-	    {

-	      ptTemp.x = rcClient.left;

-	      ptTemp.y = rcClient.top;

-	      if (ClientToScreen (hwnd, &ptTemp))

-		{

-		  rcClient.left = ptTemp.x;

-		  rcClient.top = ptTemp.y;

-		  ptTemp.x = rcClient.right;

-		  ptTemp.y = rcClient.bottom;

-		  if (ClientToScreen (hwnd, &ptTemp))

-		    {

-		      rcClient.right = ptTemp.x;

-		      rcClient.bottom = ptTemp.y;

-		      if (!PtInRect (&rcClient, ptCurPos))

-			bInhibit = TRUE;

-		    }

-		}

-	    }

-	}

-    }

-

-  if (pCursor == NULL)

-    {

-      if (pScreenPriv->cursor.visible)

-	{

-	  if (!bInhibit && g_fSoftwareCursor)

-	    ShowCursor (FALSE);

-	  pScreenPriv->cursor.visible = FALSE;

-	}

-    }

-  else

-    {

-      if (pScreenPriv->cursor.handle)

-	{

-	  if (!bInhibit)

-	    SetCursor (NULL);

-	  DestroyCursor (pScreenPriv->cursor.handle);

-	  pScreenPriv->cursor.handle = NULL;

-	}

-      pScreenPriv->cursor.handle =

-	winLoadCursor (pScreen, pCursor, pScreen->myNum);

-      WIN_DEBUG_MSG("winSetCursor: handle=%p\n", pScreenPriv->cursor.handle); 

-

-      if (!bInhibit)

-	SetCursor (pScreenPriv->cursor.handle);

-

-      if (!pScreenPriv->cursor.visible)

-	{

-	  if (!bInhibit && g_fSoftwareCursor)

-	    ShowCursor (TRUE);

-	  pScreenPriv->cursor.visible = TRUE;

-	}

-    }

-}

-

-

-/*

- * winMoveCursor

- *  Move the cursor. This is a noop for us.

- */

-static void

-winMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

-{

-}

-

-static Bool

-winDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScr)

-{

-  winScreenPriv(pScr);

-  return pScreenPriv->cursor.spriteFuncs->DeviceCursorInitialize(pDev, pScr);

-}

-

-static void

-winDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScr)

-{

-  winScreenPriv(pScr);

-  pScreenPriv->cursor.spriteFuncs->DeviceCursorCleanup(pDev, pScr);

-}

-

-static miPointerSpriteFuncRec winSpriteFuncsRec = {

-  winRealizeCursor,

-  winUnrealizeCursor,

-  winSetCursor,

-  winMoveCursor,

-  winDeviceCursorInitialize,

-  winDeviceCursorCleanup

-};

-

-

-/*

-===========================================================================

-

- Other screen functions

-

-===========================================================================

-*/

-

-/*

- * winCursorQueryBestSize

- *  Handle queries for best cursor size

- */

-static void

-winCursorQueryBestSize (int class, unsigned short *width,

-				     unsigned short *height, ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  

-  if (class == CursorShape)

-    {

-      *width = pScreenPriv->cursor.sm_cx;

-      *height = pScreenPriv->cursor.sm_cy;

-    }

-  else

-    {

-      if (pScreenPriv->cursor.QueryBestSize)

-        (*pScreenPriv->cursor.QueryBestSize)(class, width, height, pScreen);

-    }

-}

-

-/*

- * winInitCursor

- *  Initialize cursor support

- */

-Bool

-winInitCursor (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  miPointerScreenPtr pPointPriv;

-  /* override some screen procedures */

-  pScreenPriv->cursor.QueryBestSize = pScreen->QueryBestSize;

-  pScreen->QueryBestSize = winCursorQueryBestSize;

-  

-  pPointPriv = (miPointerScreenPtr)

-      dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);

-  

-  pScreenPriv->cursor.spriteFuncs = pPointPriv->spriteFuncs;

-  pPointPriv->spriteFuncs = &winSpriteFuncsRec;

-

-  pScreenPriv->cursor.handle = NULL;

-  pScreenPriv->cursor.visible = FALSE;

-  

-  pScreenPriv->cursor.sm_cx = GetSystemMetrics (SM_CXCURSOR);

-  pScreenPriv->cursor.sm_cy = GetSystemMetrics (SM_CYCURSOR);

-

-  return TRUE;

-}

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	Dakshinamurthy Karra
+ *		Suhaib M Siddiqi
+ *		Peter Busch
+ *		Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+#include "winmsg.h"
+#include <cursorstr.h>
+#include <mipointrst.h>
+#include <servermd.h>
+#include "misc.h"
+
+#define BRIGHTNESS(x) (x##Red * 0.299 + x##Green * 0.587 + x##Blue * 0.114)
+
+#if 0
+#define WIN_DEBUG_MSG winDebug
+#else
+#define WIN_DEBUG_MSG(...)
+#endif
+
+/*
+ * Local function prototypes
+ */
+
+static void
+ winPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
+
+static Bool
+ winCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y);
+
+static void
+ winCrossScreen(ScreenPtr pScreen, Bool fEntering);
+
+miPointerScreenFuncRec g_winPointerCursorFuncs = {
+    winCursorOffScreen,
+    winCrossScreen,
+    winPointerWarpCursor
+};
+
+static void
+winPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+    winScreenPriv(pScreen);
+    RECT rcClient;
+    static Bool s_fInitialWarp = TRUE;
+
+    /* Discard first warp call */
+    if (s_fInitialWarp) {
+        /* First warp moves mouse to center of window, just ignore it */
+
+        /* Don't ignore subsequent warps */
+        s_fInitialWarp = FALSE;
+
+        winErrorFVerb(2,
+                      "winPointerWarpCursor - Discarding first warp: %d %d\n",
+                      x, y);
+
+        return;
+    }
+
+    /*
+       Only update the Windows cursor position if root window is active,
+       or we are in a rootless mode
+     */
+    if ((pScreenPriv->hwndScreen == GetForegroundWindow())
+        || pScreenPriv->pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOW
+        || pScreenPriv->pScreenInfo->fMultiWindow
+#endif
+        ) {
+        /* Get the client area coordinates */
+        GetClientRect(pScreenPriv->hwndScreen, &rcClient);
+
+        /* Translate the client area coords to screen coords */
+        MapWindowPoints(pScreenPriv->hwndScreen,
+                        HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+
+        /* 
+         * Update the Windows cursor position so that we don't
+         * immediately warp back to the current position.
+         */
+        SetCursorPos(rcClient.left + x, rcClient.top + y);
+    }
+
+    /* Call the mi warp procedure to do the actual warping in X. */
+    miPointerWarpCursor(pDev, pScreen, x, y);
+}
+
+static Bool
+winCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
+{
+    return FALSE;
+}
+
+static void
+winCrossScreen(ScreenPtr pScreen, Bool fEntering)
+{
+}
+
+static unsigned char
+reverse(unsigned char c)
+{
+    int i;
+    unsigned char ret = 0;
+
+    for (i = 0; i < 8; ++i) {
+        ret |= ((c >> i) & 1) << (7 - i);
+    }
+    return ret;
+}
+
+/*
+ * Convert X cursor to Windows cursor
+ * FIXME: Perhaps there are more smart code
+ */
+static HCURSOR
+winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
+{
+    winScreenPriv(pScreen);
+    HCURSOR hCursor = NULL;
+    unsigned char *pAnd;
+    unsigned char *pXor;
+    int nCX, nCY;
+    int nBytes;
+    double dForeY, dBackY;
+    BOOL fReverse;
+    HBITMAP hAnd, hXor;
+    ICONINFO ii;
+    unsigned char *pCur;
+    int x, y;
+    unsigned char bit;
+    HDC hDC;
+    BITMAPV4HEADER bi;
+    BITMAPINFO *pbmi;
+    unsigned long *lpBits;
+
+    WIN_DEBUG_MSG("winLoadCursor: Win32: %dx%d X11: %dx%d hotspot: %d,%d\n",
+                  pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,
+                  pCursor->bits->width, pCursor->bits->height,
+                  pCursor->bits->xhot, pCursor->bits->yhot);
+
+    /* We can use only White and Black, so calc brightness of color 
+     * Also check if the cursor is inverted */
+    dForeY = BRIGHTNESS(pCursor->fore);
+    dBackY = BRIGHTNESS(pCursor->back);
+    fReverse = dForeY < dBackY;
+
+    /* Check wether the X11 cursor is bigger than the win32 cursor */
+    if (pScreenPriv->cursor.sm_cx < pCursor->bits->width ||
+        pScreenPriv->cursor.sm_cy < pCursor->bits->height) {
+        winErrorFVerb(3,
+                      "winLoadCursor - Windows requires %dx%d cursor but X requires %dx%d\n",
+                      pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,
+                      pCursor->bits->width, pCursor->bits->height);
+    }
+
+    /* Get the number of bytes required to store the whole cursor image 
+     * This is roughly (sm_cx * sm_cy) / 8 
+     * round up to 8 pixel boundary so we can convert whole bytes */
+    nBytes =
+        bits_to_bytes(pScreenPriv->cursor.sm_cx) * pScreenPriv->cursor.sm_cy;
+
+    /* Get the effective width and height */
+    nCX = min(pScreenPriv->cursor.sm_cx, pCursor->bits->width);
+    nCY = min(pScreenPriv->cursor.sm_cy, pCursor->bits->height);
+
+    /* Allocate memory for the bitmaps */
+    pAnd = malloc(nBytes);
+    memset(pAnd, 0xFF, nBytes);
+    pXor = calloc(1, nBytes);
+
+    /* Convert the X11 bitmap to a win32 bitmap 
+     * The first is for an empty mask */
+    if (pCursor->bits->emptyMask) {
+        int x, y, xmax = bits_to_bytes(nCX);
+
+        for (y = 0; y < nCY; ++y)
+            for (x = 0; x < xmax; ++x) {
+                int nWinPix = bits_to_bytes(pScreenPriv->cursor.sm_cx) * y + x;
+                int nXPix = BitmapBytePad(pCursor->bits->width) * y + x;
+
+                pAnd[nWinPix] = 0;
+                if (fReverse)
+                    pXor[nWinPix] = reverse(~pCursor->bits->source[nXPix]);
+                else
+                    pXor[nWinPix] = reverse(pCursor->bits->source[nXPix]);
+            }
+    }
+    else {
+        int x, y, xmax = bits_to_bytes(nCX);
+
+        for (y = 0; y < nCY; ++y)
+            for (x = 0; x < xmax; ++x) {
+                int nWinPix = bits_to_bytes(pScreenPriv->cursor.sm_cx) * y + x;
+                int nXPix = BitmapBytePad(pCursor->bits->width) * y + x;
+
+                unsigned char mask = pCursor->bits->mask[nXPix];
+
+                pAnd[nWinPix] = reverse(~mask);
+                if (fReverse)
+                    pXor[nWinPix] =
+                        reverse(~pCursor->bits->source[nXPix] & mask);
+                else
+                    pXor[nWinPix] =
+                        reverse(pCursor->bits->source[nXPix] & mask);
+            }
+    }
+
+    /* prepare the pointers */
+    hCursor = NULL;
+    lpBits = NULL;
+
+    /* We have a truecolor alpha-blended cursor and can use it! */
+    if (pCursor->bits->argb) {
+        WIN_DEBUG_MSG("winLoadCursor: Trying truecolor alphablended cursor\n");
+        memset(&bi, 0, sizeof(BITMAPV4HEADER));
+        bi.bV4Size = sizeof(BITMAPV4HEADER);
+        bi.bV4Width = pScreenPriv->cursor.sm_cx;
+        bi.bV4Height = -(pScreenPriv->cursor.sm_cy);    /* right-side up */
+        bi.bV4Planes = 1;
+        bi.bV4BitCount = 32;
+        bi.bV4V4Compression = BI_BITFIELDS;
+        bi.bV4RedMask = 0x00FF0000;
+        bi.bV4GreenMask = 0x0000FF00;
+        bi.bV4BlueMask = 0x000000FF;
+        bi.bV4AlphaMask = 0xFF000000;
+
+        lpBits =
+            (unsigned long *) calloc(pScreenPriv->cursor.sm_cx *
+                                     pScreenPriv->cursor.sm_cy,
+                                     sizeof(unsigned long));
+
+        if (lpBits) {
+            for (y = 0; y < nCY; y++) {
+                unsigned long *src, *dst;
+
+                src = &(pCursor->bits->argb[y * pCursor->bits->width]);
+                dst = &(lpBits[y * pScreenPriv->cursor.sm_cx]);
+                memcpy(dst, src, 4 * nCX);
+            }
+        }
+    }                           /* End if-truecolor-icon */
+
+    if (!lpBits) {
+        /* Bicolor, use a palettized DIB */
+        WIN_DEBUG_MSG("winLoadCursor: Trying two color cursor\n");
+        pbmi = (BITMAPINFO *) & bi;
+        memset(pbmi, 0, sizeof(BITMAPINFOHEADER));
+        pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+        pbmi->bmiHeader.biWidth = pScreenPriv->cursor.sm_cx;
+        pbmi->bmiHeader.biHeight = -abs(pScreenPriv->cursor.sm_cy);     /* right-side up */
+        pbmi->bmiHeader.biPlanes = 1;
+        pbmi->bmiHeader.biBitCount = 8;
+        pbmi->bmiHeader.biCompression = BI_RGB;
+        pbmi->bmiHeader.biSizeImage = 0;
+        pbmi->bmiHeader.biClrUsed = 3;
+        pbmi->bmiHeader.biClrImportant = 3;
+        pbmi->bmiColors[0].rgbRed = 0;  /* Empty */
+        pbmi->bmiColors[0].rgbGreen = 0;
+        pbmi->bmiColors[0].rgbBlue = 0;
+        pbmi->bmiColors[0].rgbReserved = 0;
+        pbmi->bmiColors[1].rgbRed = pCursor->backRed >> 8;      /* Background */
+        pbmi->bmiColors[1].rgbGreen = pCursor->backGreen >> 8;
+        pbmi->bmiColors[1].rgbBlue = pCursor->backBlue >> 8;
+        pbmi->bmiColors[1].rgbReserved = 0;
+        pbmi->bmiColors[2].rgbRed = pCursor->foreRed >> 8;      /* Foreground */
+        pbmi->bmiColors[2].rgbGreen = pCursor->foreGreen >> 8;
+        pbmi->bmiColors[2].rgbBlue = pCursor->foreBlue >> 8;
+        pbmi->bmiColors[2].rgbReserved = 0;
+
+        lpBits =
+            (unsigned long *) calloc(pScreenPriv->cursor.sm_cx *
+                                     pScreenPriv->cursor.sm_cy, sizeof(char));
+
+        pCur = (unsigned char *) lpBits;
+        if (lpBits) {
+            for (y = 0; y < pScreenPriv->cursor.sm_cy; y++) {
+                for (x = 0; x < pScreenPriv->cursor.sm_cx; x++) {
+                    if (x >= nCX || y >= nCY)   /* Outside of X11 icon bounds */
+                        (*pCur++) = 0;
+                    else {      /* Within X11 icon bounds */
+
+                        int nWinPix =
+                            bits_to_bytes(pScreenPriv->cursor.sm_cx) * y +
+                            (x / 8);
+
+                        bit = pAnd[nWinPix];
+                        bit = bit & (1 << (7 - (x & 7)));
+                        if (!bit) {     /* Within the cursor mask? */
+                            int nXPix =
+                                BitmapBytePad(pCursor->bits->width) * y +
+                                (x / 8);
+                            bit =
+                                ~reverse(~pCursor->bits->
+                                         source[nXPix] & pCursor->bits->
+                                         mask[nXPix]);
+                            bit = bit & (1 << (7 - (x & 7)));
+                            if (bit)    /* Draw foreground */
+                                (*pCur++) = 2;
+                            else        /* Draw background */
+                                (*pCur++) = 1;
+                        }
+                        else    /* Outside the cursor mask */
+                            (*pCur++) = 0;
+                    }
+                }               /* end for (x) */
+            }                   /* end for (y) */
+        }                       /* end if (lpbits) */
+    }
+
+    /* If one of the previous two methods gave us the bitmap we need, make a cursor */
+    if (lpBits) {
+        WIN_DEBUG_MSG("winLoadCursor: Creating bitmap cursor: hotspot %d,%d\n",
+                      pCursor->bits->xhot, pCursor->bits->yhot);
+
+        hAnd = NULL;
+        hXor = NULL;
+
+        hAnd =
+            CreateBitmap(pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,
+                         1, 1, pAnd);
+
+        hDC = GetDC(NULL);
+        if (hDC) {
+            hXor =
+                CreateCompatibleBitmap(hDC, pScreenPriv->cursor.sm_cx,
+                                       pScreenPriv->cursor.sm_cy);
+            SetDIBits(hDC, hXor, 0, pScreenPriv->cursor.sm_cy, lpBits,
+                      (BITMAPINFO *) & bi, DIB_RGB_COLORS);
+            ReleaseDC(NULL, hDC);
+        }
+        free(lpBits);
+
+        if (hAnd && hXor) {
+            ii.fIcon = FALSE;
+            ii.xHotspot = pCursor->bits->xhot;
+            ii.yHotspot = pCursor->bits->yhot;
+            ii.hbmMask = hAnd;
+            ii.hbmColor = hXor;
+            hCursor = (HCURSOR) CreateIconIndirect(&ii);
+
+            if (hCursor == NULL)
+                winW32Error(2, "winLoadCursor - CreateIconIndirect failed:");
+            else {
+                if (GetIconInfo(hCursor, &ii)) {
+                    if (ii.fIcon) {
+                        WIN_DEBUG_MSG
+                            ("winLoadCursor: CreateIconIndirect returned  no cursor. Trying again.\n");
+
+                        DestroyCursor(hCursor);
+
+                        ii.fIcon = FALSE;
+                        ii.xHotspot = pCursor->bits->xhot;
+                        ii.yHotspot = pCursor->bits->yhot;
+                        hCursor = (HCURSOR) CreateIconIndirect(&ii);
+
+                        if (hCursor == NULL)
+                            winW32Error(2,
+                                        "winLoadCursor - CreateIconIndirect failed:");
+                    }
+                    /* GetIconInfo creates new bitmaps. Destroy them again */
+                    if (ii.hbmMask)
+                        DeleteObject(ii.hbmMask);
+                    if (ii.hbmColor)
+                        DeleteObject(ii.hbmColor);
+                }
+            }
+        }
+
+        if (hAnd)
+            DeleteObject(hAnd);
+        if (hXor)
+            DeleteObject(hXor);
+    }
+
+    if (!hCursor) {
+        /* We couldn't make a color cursor for this screen, use
+           black and white instead */
+        hCursor = CreateCursor(g_hInstance,
+                               pCursor->bits->xhot, pCursor->bits->yhot,
+                               pScreenPriv->cursor.sm_cx,
+                               pScreenPriv->cursor.sm_cy, pAnd, pXor);
+        if (hCursor == NULL)
+            winW32Error(2, "winLoadCursor - CreateCursor failed:");
+    }
+    free(pAnd);
+    free(pXor);
+
+    return hCursor;
+}
+
+/*
+===========================================================================
+
+ Pointer sprite functions
+
+===========================================================================
+*/
+
+/*
+ * winRealizeCursor
+ *  Convert the X cursor representation to native format if possible.
+ */
+static Bool
+winRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
+{
+    if (pCursor == NULL || pCursor->bits == NULL)
+        return FALSE;
+
+    /* FIXME: cache ARGB8888 representation? */
+
+    return TRUE;
+}
+
+/*
+ * winUnrealizeCursor
+ *  Free the storage space associated with a realized cursor.
+ */
+static Bool
+winUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
+{
+    return TRUE;
+}
+
+/*
+ * winSetCursor
+ *  Set the cursor sprite and position.
+ */
+static void
+winSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x,
+             int y)
+{
+    POINT ptCurPos, ptTemp;
+    HWND hwnd;
+    RECT rcClient;
+    BOOL bInhibit;
+
+    winScreenPriv(pScreen);
+    WIN_DEBUG_MSG("winSetCursor: cursor=%p\n", pCursor);
+
+    /* Inhibit changing the cursor if the mouse is not in a client area */
+    bInhibit = FALSE;
+    if (GetCursorPos(&ptCurPos)) {
+        hwnd = WindowFromPoint(ptCurPos);
+        if (hwnd) {
+            if (GetClientRect(hwnd, &rcClient)) {
+                ptTemp.x = rcClient.left;
+                ptTemp.y = rcClient.top;
+                if (ClientToScreen(hwnd, &ptTemp)) {
+                    rcClient.left = ptTemp.x;
+                    rcClient.top = ptTemp.y;
+                    ptTemp.x = rcClient.right;
+                    ptTemp.y = rcClient.bottom;
+                    if (ClientToScreen(hwnd, &ptTemp)) {
+                        rcClient.right = ptTemp.x;
+                        rcClient.bottom = ptTemp.y;
+                        if (!PtInRect(&rcClient, ptCurPos))
+                            bInhibit = TRUE;
+                    }
+                }
+            }
+        }
+    }
+
+    if (pCursor == NULL) {
+        if (pScreenPriv->cursor.visible) {
+            if (!bInhibit && g_fSoftwareCursor)
+                ShowCursor(FALSE);
+            pScreenPriv->cursor.visible = FALSE;
+        }
+    }
+    else {
+        if (pScreenPriv->cursor.handle) {
+            if (!bInhibit)
+                SetCursor(NULL);
+            DestroyCursor(pScreenPriv->cursor.handle);
+            pScreenPriv->cursor.handle = NULL;
+        }
+        pScreenPriv->cursor.handle =
+            winLoadCursor(pScreen, pCursor, pScreen->myNum);
+        WIN_DEBUG_MSG("winSetCursor: handle=%p\n", pScreenPriv->cursor.handle);
+
+        if (!bInhibit)
+            SetCursor(pScreenPriv->cursor.handle);
+
+        if (!pScreenPriv->cursor.visible) {
+            if (!bInhibit && g_fSoftwareCursor)
+                ShowCursor(TRUE);
+            pScreenPriv->cursor.visible = TRUE;
+        }
+    }
+}
+
+/*
+ * winMoveCursor
+ *  Move the cursor. This is a noop for us.
+ */
+static void
+winMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+}
+
+static Bool
+winDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScr)
+{
+    winScreenPriv(pScr);
+    return pScreenPriv->cursor.spriteFuncs->DeviceCursorInitialize(pDev, pScr);
+}
+
+static void
+winDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScr)
+{
+    winScreenPriv(pScr);
+    pScreenPriv->cursor.spriteFuncs->DeviceCursorCleanup(pDev, pScr);
+}
+
+static miPointerSpriteFuncRec winSpriteFuncsRec = {
+    winRealizeCursor,
+    winUnrealizeCursor,
+    winSetCursor,
+    winMoveCursor,
+    winDeviceCursorInitialize,
+    winDeviceCursorCleanup
+};
+
+/*
+===========================================================================
+
+ Other screen functions
+
+===========================================================================
+*/
+
+/*
+ * winCursorQueryBestSize
+ *  Handle queries for best cursor size
+ */
+static void
+winCursorQueryBestSize(int class, unsigned short *width,
+                       unsigned short *height, ScreenPtr pScreen)
+{
+    winScreenPriv(pScreen);
+
+    if (class == CursorShape) {
+        *width = pScreenPriv->cursor.sm_cx;
+        *height = pScreenPriv->cursor.sm_cy;
+    }
+    else {
+        if (pScreenPriv->cursor.QueryBestSize)
+            (*pScreenPriv->cursor.QueryBestSize) (class, width, height,
+                                                  pScreen);
+    }
+}
+
+/*
+ * winInitCursor
+ *  Initialize cursor support
+ */
+Bool
+winInitCursor(ScreenPtr pScreen)
+{
+    winScreenPriv(pScreen);
+    miPointerScreenPtr pPointPriv;
+
+    /* override some screen procedures */
+    pScreenPriv->cursor.QueryBestSize = pScreen->QueryBestSize;
+    pScreen->QueryBestSize = winCursorQueryBestSize;
+
+    pPointPriv = (miPointerScreenPtr)
+        dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
+
+    pScreenPriv->cursor.spriteFuncs = pPointPriv->spriteFuncs;
+    pPointPriv->spriteFuncs = &winSpriteFuncsRec;
+
+    pScreenPriv->cursor.handle = NULL;
+    pScreenPriv->cursor.visible = FALSE;
+
+    pScreenPriv->cursor.sm_cx = GetSystemMetrics(SM_CXCURSOR);
+    pScreenPriv->cursor.sm_cy = GetSystemMetrics(SM_CYCURSOR);
+
+    return TRUE;
+}
diff --git a/xorg-server/hw/xwin/windialogs.c b/xorg-server/hw/xwin/windialogs.c
index bb4f447e2..c62b5dbe9 100644
--- a/xorg-server/hw/xwin/windialogs.c
+++ b/xorg-server/hw/xwin/windialogs.c
@@ -39,88 +39,80 @@
 #include <shellapi.h>
 #include "winprefs.h"
 
-
 /*
  * References to external globals
  */
 
 #ifdef XWIN_CLIPBOARD
-extern Bool			g_fClipboardStarted;
+extern Bool g_fClipboardStarted;
 #endif
 /*
  * Local function prototypes
  */
 
 static wBOOL CALLBACK
-winExitDlgProc (HWND hDialog, UINT message,
-		WPARAM wParam, LPARAM lParam);
+winExitDlgProc(HWND hDialog, UINT message, WPARAM wParam, LPARAM lParam);
 
 static wBOOL CALLBACK
-winChangeDepthDlgProc (HWND hDialog, UINT message,
-		       WPARAM wParam, LPARAM lParam);
+winChangeDepthDlgProc(HWND hDialog, UINT message, WPARAM wParam, LPARAM lParam);
 
 static wBOOL CALLBACK
-winAboutDlgProc (HWND hDialog, UINT message,
-		 WPARAM wParam, LPARAM lParam);
-
+winAboutDlgProc(HWND hDialog, UINT message, WPARAM wParam, LPARAM lParam);
 
 static void
-winDrawURLWindow (LPARAM lParam);
+ winDrawURLWindow(LPARAM lParam);
 
 static LRESULT CALLBACK
-winURLWndProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+winURLWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
 static void
-winOverrideURLButton (HWND hdlg, int id);
+ winOverrideURLButton(HWND hdlg, int id);
 
 static void
-winUnoverrideURLButton (HWND hdlg, int id);
-
+ winUnoverrideURLButton(HWND hdlg, int id);
 
 /*
  * Owner-draw a button as a URL
  */
 
 static void
-winDrawURLWindow (LPARAM lParam)
+winDrawURLWindow(LPARAM lParam)
 {
-  DRAWITEMSTRUCT *draw;
-  char str[256];
-  RECT rect;
-  HFONT font;
-  COLORREF crText;
-  
-  draw = (DRAWITEMSTRUCT *) lParam;
-  GetWindowText (draw->hwndItem, str, sizeof(str));
-  str[255] = 0;
-  GetClientRect (draw->hwndItem, &rect);
-  
-  /* Color the button depending upon its state */
-  if (draw->itemState & ODS_SELECTED)
-    crText = RGB(128+64,0,0);
-  else if (draw->itemState & ODS_FOCUS)
-    crText = RGB(0,128+64,0);
-  else
-    crText = RGB(0,0,128+64);
-  SetTextColor (draw->hDC, crText);
-  
-  /* Create font 8 high, standard dialog font */
-  font = CreateFont (-8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE,
-		     0, 0, 0, 0, 0, "MS Sans Serif");
-  if (!font)
-    {
-      ErrorF ("winDrawURLWindow: Unable to create URL font, bailing.\n");
-      return;
+    DRAWITEMSTRUCT *draw;
+    char str[256];
+    RECT rect;
+    HFONT font;
+    COLORREF crText;
+
+    draw = (DRAWITEMSTRUCT *) lParam;
+    GetWindowText(draw->hwndItem, str, sizeof(str));
+    str[255] = 0;
+    GetClientRect(draw->hwndItem, &rect);
+
+    /* Color the button depending upon its state */
+    if (draw->itemState & ODS_SELECTED)
+        crText = RGB(128 + 64, 0, 0);
+    else if (draw->itemState & ODS_FOCUS)
+        crText = RGB(0, 128 + 64, 0);
+    else
+        crText = RGB(0, 0, 128 + 64);
+    SetTextColor(draw->hDC, crText);
+
+    /* Create font 8 high, standard dialog font */
+    font = CreateFont(-8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE,
+                      0, 0, 0, 0, 0, "MS Sans Serif");
+    if (!font) {
+        ErrorF("winDrawURLWindow: Unable to create URL font, bailing.\n");
+        return;
     }
-  /* Draw it */
-  SetBkMode (draw->hDC, OPAQUE);
-  SelectObject (draw->hDC, font);
-  DrawText (draw->hDC, str, strlen (str),&rect,DT_LEFT | DT_VCENTER);
-  /* Delete the created font, replace it with stock font */
-  DeleteObject (SelectObject (draw->hDC, GetStockObject (ANSI_VAR_FONT)));
+    /* Draw it */
+    SetBkMode(draw->hDC, OPAQUE);
+    SelectObject(draw->hDC, font);
+    DrawText(draw->hDC, str, strlen(str), &rect, DT_LEFT | DT_VCENTER);
+    /* Delete the created font, replace it with stock font */
+    DeleteObject(SelectObject(draw->hDC, GetStockObject(ANSI_VAR_FONT)));
 }
 
-
 /*
  * WndProc for overridden buttons
  */
@@ -128,48 +120,47 @@ winDrawURLWindow (LPARAM lParam)
 static LRESULT CALLBACK
 winURLWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-  WNDPROC origCB = NULL;
-  HCURSOR cursor;
-  
-  /* If it's a SetCursor message, tell it to the hand */
-  if (msg==WM_SETCURSOR) {
-    cursor = LoadCursor (NULL, IDC_HAND);
-    if (cursor)
-      SetCursor (cursor);
-    return TRUE;
-  }
-  origCB = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-  /* Otherwise fall through to original WndProc */
-  if (origCB)
-    return CallWindowProc (origCB, hwnd, msg, wParam, lParam);
-  else
-    return FALSE;
+    WNDPROC origCB = NULL;
+    HCURSOR cursor;
+
+    /* If it's a SetCursor message, tell it to the hand */
+    if (msg == WM_SETCURSOR) {
+        cursor = LoadCursor(NULL, IDC_HAND);
+        if (cursor)
+            SetCursor(cursor);
+        return TRUE;
+    }
+    origCB = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_USERDATA);
+    /* Otherwise fall through to original WndProc */
+    if (origCB)
+        return CallWindowProc(origCB, hwnd, msg, wParam, lParam);
+    else
+        return FALSE;
 }
 
-
 /*
  * Register and unregister the custom WndProc
  */
 
 static void
-winOverrideURLButton (HWND hwnd, int id)
+winOverrideURLButton(HWND hwnd, int id)
 {
-  WNDPROC origCB;
-  origCB = (WNDPROC)SetWindowLongPtr(GetDlgItem (hwnd, id),
-                                     GWLP_WNDPROC, (LONG_PTR)winURLWndProc);
-  SetWindowLongPtr(GetDlgItem (hwnd, id), GWLP_USERDATA, (LONG_PTR)origCB);
+    WNDPROC origCB;
+
+    origCB = (WNDPROC) SetWindowLongPtr(GetDlgItem(hwnd, id),
+                                        GWLP_WNDPROC, (LONG_PTR) winURLWndProc);
+    SetWindowLongPtr(GetDlgItem(hwnd, id), GWLP_USERDATA, (LONG_PTR) origCB);
 }
 
 static void
-winUnoverrideURLButton (HWND hwnd, int id)
+winUnoverrideURLButton(HWND hwnd, int id)
 {
-  WNDPROC origCB;
-  origCB = (WNDPROC)SetWindowLongPtr(GetDlgItem (hwnd, id),
-                                     GWLP_USERDATA, 0);
-  if (origCB)
-    SetWindowLongPtr(GetDlgItem (hwnd, id), GWLP_WNDPROC, (LONG_PTR)origCB);
-}
+    WNDPROC origCB;
 
+    origCB = (WNDPROC) SetWindowLongPtr(GetDlgItem(hwnd, id), GWLP_USERDATA, 0);
+    if (origCB)
+        SetWindowLongPtr(GetDlgItem(hwnd, id), GWLP_WNDPROC, (LONG_PTR) origCB);
+}
 
 /*
  * Center a dialog window in the desktop window
@@ -177,597 +168,553 @@ winUnoverrideURLButton (HWND hwnd, int id)
  */
 
 static void
-winInitDialog (HWND hwndDlg)
+winInitDialog(HWND hwndDlg)
 {
-  HWND hwndDesk; 
-  RECT rc, rcDlg, rcDesk;
-  HICON hIcon, hIconSmall;
- 
-  hwndDesk = GetParent (hwndDlg);
-  if (!hwndDesk || IsIconic (hwndDesk))
-    hwndDesk = GetDesktopWindow (); 
-  
-  /* Remove minimize and maximize buttons */
-  SetWindowLongPtr(hwndDlg, GWL_STYLE,
-                   GetWindowLongPtr(hwndDlg, GWL_STYLE)
-                   & ~(WS_MAXIMIZEBOX | WS_MINIMIZEBOX));
-
-  /* Set Window not to show in the task bar */
-  SetWindowLongPtr(hwndDlg, GWL_EXSTYLE,
-                   GetWindowLongPtr(hwndDlg, GWL_EXSTYLE) & ~WS_EX_APPWINDOW );
-
-  /* Center dialog window in the screen. Not done for multi-monitor systems, where
-   * it is likely to end up split across the screens. In that case, it appears
-   * near the Tray icon.
-   */
-  if (GetSystemMetrics(SM_CMONITORS)>1) {
-    /* Still need to refresh the frame change. */
-    SetWindowPos (hwndDlg, HWND_TOPMOST, 0,0,0,0,
-		SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
-  } else {
-    GetWindowRect (hwndDesk, &rcDesk);
-    GetWindowRect (hwndDlg, &rcDlg);
-    CopyRect (&rc, &rcDesk);
-
-    OffsetRect (&rcDlg, -rcDlg.left, -rcDlg.top);
-    OffsetRect (&rc, -rc.left, -rc.top);
-    OffsetRect (&rc, -rcDlg.right, -rcDlg.bottom);
-
-    SetWindowPos (hwndDlg,
-		HWND_TOPMOST,
-		rcDesk.left + (rc.right / 2),
-		rcDesk.top + (rc.bottom / 2),
-		0, 0,
-		SWP_NOSIZE | SWP_FRAMECHANGED);
-  }
+    HWND hwndDesk;
+    RECT rc, rcDlg, rcDesk;
+    HICON hIcon, hIconSmall;
+
+    hwndDesk = GetParent(hwndDlg);
+    if (!hwndDesk || IsIconic(hwndDesk))
+        hwndDesk = GetDesktopWindow();
+
+    /* Remove minimize and maximize buttons */
+    SetWindowLongPtr(hwndDlg, GWL_STYLE, GetWindowLongPtr(hwndDlg, GWL_STYLE)
+                     & ~(WS_MAXIMIZEBOX | WS_MINIMIZEBOX));
+
+    /* Set Window not to show in the task bar */
+    SetWindowLongPtr(hwndDlg, GWL_EXSTYLE,
+                     GetWindowLongPtr(hwndDlg, GWL_EXSTYLE) & ~WS_EX_APPWINDOW);
+
+    /* Center dialog window in the screen. Not done for multi-monitor systems, where
+     * it is likely to end up split across the screens. In that case, it appears
+     * near the Tray icon.
+     */
+    if (GetSystemMetrics(SM_CMONITORS) > 1) {
+        /* Still need to refresh the frame change. */
+        SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0,
+                     SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
+    }
+    else {
+        GetWindowRect(hwndDesk, &rcDesk);
+        GetWindowRect(hwndDlg, &rcDlg);
+        CopyRect(&rc, &rcDesk);
+
+        OffsetRect(&rcDlg, -rcDlg.left, -rcDlg.top);
+        OffsetRect(&rc, -rc.left, -rc.top);
+        OffsetRect(&rc, -rcDlg.right, -rcDlg.bottom);
+
+        SetWindowPos(hwndDlg,
+                     HWND_TOPMOST,
+                     rcDesk.left + (rc.right / 2),
+                     rcDesk.top + (rc.bottom / 2),
+                     0, 0, SWP_NOSIZE | SWP_FRAMECHANGED);
+    }
 
 #ifdef XWIN_MULTIWINDOW
-  if (g_hIconX) hIcon=g_hIconX;
-  else
+    if (g_hIconX)
+        hIcon = g_hIconX;
+    else
 #endif
-  hIcon = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN));
+        hIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_XWIN));
 
 #ifdef XWIN_MULTIWINDOW
-  if (g_hSmallIconX) hIconSmall=g_hSmallIconX;
-  else
+    if (g_hSmallIconX)
+        hIconSmall = g_hSmallIconX;
+    else
 #endif
-  hIconSmall = LoadImage (g_hInstance,
-                        MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
-                        GetSystemMetrics(SM_CXSMICON),
-                        GetSystemMetrics(SM_CYSMICON),
-                        LR_SHARED);
-
-  PostMessage (hwndDlg, WM_SETICON, ICON_BIG, (LPARAM) hIcon);
-  PostMessage (hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
-}
+        hIconSmall = LoadImage(g_hInstance,
+                               MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
+                               GetSystemMetrics(SM_CXSMICON),
+                               GetSystemMetrics(SM_CYSMICON), LR_SHARED);
 
+    PostMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM) hIcon);
+    PostMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
+}
 
 /*
  * Display the Exit dialog box
  */
 
 void
-winDisplayExitDialog (winPrivScreenPtr pScreenPriv)
+winDisplayExitDialog(winPrivScreenPtr pScreenPriv)
 {
-  int i;
-  int liveClients = 0;
+    int i;
+    int liveClients = 0;
 
-  /* Count up running clients (clients[0] is serverClient) */
-  for (i = 1; i < currentMaxClients; i++)
-    if (clients[i] != NullClient)	
-      liveClients++;
+    /* Count up running clients (clients[0] is serverClient) */
+    for (i = 1; i < currentMaxClients; i++)
+        if (clients[i] != NullClient)
+            liveClients++;
 #if defined(XWIN_MULTIWINDOW)
-  /* Count down server internal clients */
-  if (pScreenPriv->pScreenInfo->fMultiWindow)
-    liveClients -= 2; /* multiwindow window manager & XMsgProc  */
+    /* Count down server internal clients */
+    if (pScreenPriv->pScreenInfo->fMultiWindow)
+        liveClients -= 2;       /* multiwindow window manager & XMsgProc  */
 #endif
 #if defined(XWIN_CLIPBOARD)
-  if (g_fClipboardStarted)
-    liveClients--; /* clipboard manager */
+    if (g_fClipboardStarted)
+        liveClients--;          /* clipboard manager */
 #endif
 
-  /* A user reported that this sometimes drops below zero. just eye-candy. */ 
-  if (liveClients < 0)
-    liveClients = 0;      
-
-  /* Don't show the exit confirmation dialog if SilentExit & no clients,
-     or ForceExit, is enabled */
-  if ((pref.fSilentExit && liveClients <= 0) || pref.fForceExit)
-    {
-      if (g_hDlgExit != NULL)
-	{
-	  DestroyWindow (g_hDlgExit);
-	  g_hDlgExit = NULL;
-	}
-      PostMessage (pScreenPriv->hwndScreen, WM_GIVEUP, 0, 0);
-      return;
+    /* A user reported that this sometimes drops below zero. just eye-candy. */
+    if (liveClients < 0)
+        liveClients = 0;
+
+    /* Don't show the exit confirmation dialog if SilentExit & no clients,
+       or ForceExit, is enabled */
+    if ((pref.fSilentExit && liveClients <= 0) || pref.fForceExit) {
+        if (g_hDlgExit != NULL) {
+            DestroyWindow(g_hDlgExit);
+            g_hDlgExit = NULL;
+        }
+        PostMessage(pScreenPriv->hwndScreen, WM_GIVEUP, 0, 0);
+        return;
     }
 
-  pScreenPriv->iConnectedClients = liveClients;
-  
-  /* Check if dialog already exists */
-  if (g_hDlgExit != NULL)
-    {
-      /* Dialog box already exists, display it */
-      ShowWindow (g_hDlgExit, SW_SHOWDEFAULT);
+    pScreenPriv->iConnectedClients = liveClients;
 
-      /* User has lost the dialog.  Show them where it is. */
-      SetForegroundWindow (g_hDlgExit);
+    /* Check if dialog already exists */
+    if (g_hDlgExit != NULL) {
+        /* Dialog box already exists, display it */
+        ShowWindow(g_hDlgExit, SW_SHOWDEFAULT);
 
-      return;
+        /* User has lost the dialog.  Show them where it is. */
+        SetForegroundWindow(g_hDlgExit);
+
+        return;
     }
 
-  /* Create dialog box */
-  g_hDlgExit = CreateDialogParam (g_hInstance,
-				  "EXIT_DIALOG",
-				  pScreenPriv->hwndScreen,
-				  winExitDlgProc,
-				  (int) pScreenPriv);
-
-  /* Show the dialog box */
-  ShowWindow (g_hDlgExit, SW_SHOW);
-  
-  /* Needed to get keyboard controls (tab, arrows, enter, esc) to work */
-  SetForegroundWindow (g_hDlgExit);
-  
-  /* Set focus to the Cancel button */
-  PostMessage (g_hDlgExit, WM_NEXTDLGCTL,
-	       (WPARAM)GetDlgItem (g_hDlgExit, IDCANCEL), TRUE);
+    /* Create dialog box */
+    g_hDlgExit = CreateDialogParam(g_hInstance,
+                                   "EXIT_DIALOG",
+                                   pScreenPriv->hwndScreen,
+                                   winExitDlgProc, (int) pScreenPriv);
+
+    /* Show the dialog box */
+    ShowWindow(g_hDlgExit, SW_SHOW);
+
+    /* Needed to get keyboard controls (tab, arrows, enter, esc) to work */
+    SetForegroundWindow(g_hDlgExit);
+
+    /* Set focus to the Cancel button */
+    PostMessage(g_hDlgExit, WM_NEXTDLGCTL,
+                (WPARAM) GetDlgItem(g_hDlgExit, IDCANCEL), TRUE);
 }
 
 #define CONNECTED_CLIENTS_FORMAT	"There %s currently %d client%s connected."
 
-
 /*
  * Exit dialog window procedure
  */
 
 static wBOOL CALLBACK
-winExitDlgProc (HWND hDialog, UINT message,
-		WPARAM wParam, LPARAM lParam)
+winExitDlgProc(HWND hDialog, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  static winPrivScreenPtr	s_pScreenPriv = NULL;
+    static winPrivScreenPtr s_pScreenPriv = NULL;
 
-  /* Branch on message type */
-  switch (message)
-    {
+    /* Branch on message type */
+    switch (message) {
     case WM_INITDIALOG:
-      {
-	char			*pszConnectedClients;
-
-	/* Store pointers to private structures for future use */
-	s_pScreenPriv = (winPrivScreenPtr) lParam;
-	
-	winInitDialog (hDialog);
-
-	/* Format the connected clients string */
-	if (asprintf (&pszConnectedClients, CONNECTED_CLIENTS_FORMAT,
-           (s_pScreenPriv->iConnectedClients == 1) ? "is" : "are",
-            s_pScreenPriv->iConnectedClients,
-           (s_pScreenPriv->iConnectedClients == 1) ? "" : "s") == -1)
-	    return TRUE;
-     
-        
-	
-	/* Set the number of connected clients */
-	SetWindowText (GetDlgItem (hDialog, IDC_CLIENTS_CONNECTED),
-		       pszConnectedClients);
-	free(pszConnectedClients);
-      }
-      return TRUE;
+    {
+        char *pszConnectedClients;
+
+        /* Store pointers to private structures for future use */
+        s_pScreenPriv = (winPrivScreenPtr) lParam;
+
+        winInitDialog(hDialog);
+
+        /* Format the connected clients string */
+        if (asprintf(&pszConnectedClients, CONNECTED_CLIENTS_FORMAT,
+                     (s_pScreenPriv->iConnectedClients == 1) ? "is" : "are",
+                     s_pScreenPriv->iConnectedClients,
+                     (s_pScreenPriv->iConnectedClients == 1) ? "" : "s") == -1)
+            return TRUE;
+
+        /* Set the number of connected clients */
+        SetWindowText(GetDlgItem(hDialog, IDC_CLIENTS_CONNECTED),
+                      pszConnectedClients);
+        free(pszConnectedClients);
+    }
+        return TRUE;
 
     case WM_COMMAND:
-      switch (LOWORD (wParam))
-	{
-	case IDOK:
-	  /* Send message to call the GiveUp function */
-	  PostMessage (s_pScreenPriv->hwndScreen, WM_GIVEUP, 0, 0);
-	  DestroyWindow (g_hDlgExit);
-	  g_hDlgExit = NULL;
-
-	  /* Fix to make sure keyboard focus isn't trapped */
-	  PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
-	  return TRUE;
-
-	case IDCANCEL:
-	  DestroyWindow (g_hDlgExit);
-	  g_hDlgExit = NULL;
-
-	  /* Fix to make sure keyboard focus isn't trapped */
-	  PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
-	  return TRUE;
-	}
-      break;
+        switch (LOWORD(wParam)) {
+        case IDOK:
+            /* Send message to call the GiveUp function */
+            PostMessage(s_pScreenPriv->hwndScreen, WM_GIVEUP, 0, 0);
+            DestroyWindow(g_hDlgExit);
+            g_hDlgExit = NULL;
+
+            /* Fix to make sure keyboard focus isn't trapped */
+            PostMessage(s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+            return TRUE;
+
+        case IDCANCEL:
+            DestroyWindow(g_hDlgExit);
+            g_hDlgExit = NULL;
+
+            /* Fix to make sure keyboard focus isn't trapped */
+            PostMessage(s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+            return TRUE;
+        }
+        break;
 
     case WM_MOUSEMOVE:
     case WM_NCMOUSEMOVE:
-      /* Show the cursor if it is hidden */
-      if (g_fSoftwareCursor && !g_fCursor)
-	{
-	  g_fCursor = TRUE;
-	  ShowCursor (TRUE);
-	}
-      return TRUE;
+        /* Show the cursor if it is hidden */
+        if (g_fSoftwareCursor && !g_fCursor) {
+            g_fCursor = TRUE;
+            ShowCursor(TRUE);
+        }
+        return TRUE;
 
     case WM_CLOSE:
-      DestroyWindow (g_hDlgExit);
-      g_hDlgExit = NULL;
+        DestroyWindow(g_hDlgExit);
+        g_hDlgExit = NULL;
 
-      /* Fix to make sure keyboard focus isn't trapped */
-      PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
-      return TRUE;
+        /* Fix to make sure keyboard focus isn't trapped */
+        PostMessage(s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+        return TRUE;
     }
 
-  return FALSE;
+    return FALSE;
 }
 
-
 /*
  * Display the Depth Change dialog box
  */
 
 void
-winDisplayDepthChangeDialog (winPrivScreenPtr pScreenPriv)
+winDisplayDepthChangeDialog(winPrivScreenPtr pScreenPriv)
 {
-  /* Check if dialog already exists */
-  if (g_hDlgDepthChange != NULL)
-    {
-      /* Dialog box already exists, display it */
-      ShowWindow (g_hDlgDepthChange, SW_SHOWDEFAULT);
+    /* Check if dialog already exists */
+    if (g_hDlgDepthChange != NULL) {
+        /* Dialog box already exists, display it */
+        ShowWindow(g_hDlgDepthChange, SW_SHOWDEFAULT);
 
-      /* User has lost the dialog.  Show them where it is. */
-      SetForegroundWindow (g_hDlgDepthChange);
+        /* User has lost the dialog.  Show them where it is. */
+        SetForegroundWindow(g_hDlgDepthChange);
 
-      return;
+        return;
     }
 
-  /*
-   * Display a notification to the user that the visual 
-   * will not be displayed until the Windows display depth 
-   * is restored to the original value.
-   */
-  g_hDlgDepthChange = CreateDialogParam (g_hInstance,
-					 "DEPTH_CHANGE_BOX",
-					 pScreenPriv->hwndScreen,
-					 winChangeDepthDlgProc,
-					 (int) pScreenPriv);
-  /* Show the dialog box */
-  ShowWindow (g_hDlgDepthChange, SW_SHOW);
-  
-  ErrorF ("winDisplayDepthChangeDialog - DialogBox returned: %d\n",
-	  (int) g_hDlgDepthChange);
-  ErrorF ("winDisplayDepthChangeDialog - GetLastError: %d\n",
-	  (int) GetLastError ());
-	      
-  /* Minimize the display window */
-  ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);
+    /*
+     * Display a notification to the user that the visual 
+     * will not be displayed until the Windows display depth 
+     * is restored to the original value.
+     */
+    g_hDlgDepthChange = CreateDialogParam(g_hInstance,
+                                          "DEPTH_CHANGE_BOX",
+                                          pScreenPriv->hwndScreen,
+                                          winChangeDepthDlgProc,
+                                          (int) pScreenPriv);
+    /* Show the dialog box */
+    ShowWindow(g_hDlgDepthChange, SW_SHOW);
+
+    ErrorF("winDisplayDepthChangeDialog - DialogBox returned: %d\n",
+           (int) g_hDlgDepthChange);
+    ErrorF("winDisplayDepthChangeDialog - GetLastError: %d\n",
+           (int) GetLastError());
+
+    /* Minimize the display window */
+    ShowWindow(pScreenPriv->hwndScreen, SW_MINIMIZE);
 }
 
-
 /*
  * Process messages for the dialog that is displayed for
  * disruptive screen depth changes. 
  */
 
 static wBOOL CALLBACK
-winChangeDepthDlgProc (HWND hwndDialog, UINT message,
-		       WPARAM wParam, LPARAM lParam)
+winChangeDepthDlgProc(HWND hwndDialog, UINT message,
+                      WPARAM wParam, LPARAM lParam)
 {
-  static winPrivScreenPtr	s_pScreenPriv = NULL;
-  static winScreenInfo		*s_pScreenInfo = NULL;
-  static ScreenPtr		s_pScreen = NULL;
+    static winPrivScreenPtr s_pScreenPriv = NULL;
+    static winScreenInfo *s_pScreenInfo = NULL;
+    static ScreenPtr s_pScreen = NULL;
 
 #if CYGDEBUG
-  winDebug ("winChangeDepthDlgProc\n");
+    winDebug("winChangeDepthDlgProc\n");
 #endif
 
-  /* Branch on message type */
-  switch (message)
-    {
+    /* Branch on message type */
+    switch (message) {
     case WM_INITDIALOG:
 #if CYGDEBUG
-      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG\n");
+        winDebug("winChangeDepthDlgProc - WM_INITDIALOG\n");
 #endif
 
-      /* Store pointers to private structures for future use */
-      s_pScreenPriv = (winPrivScreenPtr) lParam;
-      s_pScreenInfo = s_pScreenPriv->pScreenInfo;
-      s_pScreen = s_pScreenInfo->pScreen;
+        /* Store pointers to private structures for future use */
+        s_pScreenPriv = (winPrivScreenPtr) lParam;
+        s_pScreenInfo = s_pScreenPriv->pScreenInfo;
+        s_pScreen = s_pScreenInfo->pScreen;
 
 #if CYGDEBUG
-      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, "
-	      "s_pScreenInfo: %08x, s_pScreen: %08x\n",
-	      s_pScreenPriv, s_pScreenInfo, s_pScreen);
+        winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, "
+                 "s_pScreenInfo: %08x, s_pScreen: %08x\n",
+                 s_pScreenPriv, s_pScreenInfo, s_pScreen);
 #endif
 
 #if CYGDEBUG
-      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG - orig bpp: %d, "
-	      "current bpp: %d\n",
-	      s_pScreenInfo->dwBPP,
-              GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL));
+        winDebug("winChangeDepthDlgProc - WM_INITDIALOG - orig bpp: %d, "
+                 "current bpp: %d\n",
+                 s_pScreenInfo->dwBPP,
+                 GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL));
 #endif
 
-      winInitDialog( hwndDialog );
+        winInitDialog(hwndDialog);
 
-      return TRUE;
+        return TRUE;
 
     case WM_DISPLAYCHANGE:
 #if CYGDEBUG
-      winDebug ("winChangeDepthDlgProc - WM_DISPLAYCHANGE - orig bpp: %d, "
-	      "new bpp: %d\n",
-	      s_pScreenInfo->dwBPP,
-              GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL));
+        winDebug("winChangeDepthDlgProc - WM_DISPLAYCHANGE - orig bpp: %d, "
+                 "new bpp: %d\n",
+                 s_pScreenInfo->dwBPP,
+                 GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL));
 #endif
 
-      /* Dismiss the dialog if the display returns to the original depth */
-      if (GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL) == s_pScreenInfo->dwBPP)
-	{
-	  ErrorF ("winChangeDelthDlgProc - wParam == s_pScreenInfo->dwBPP\n");
+        /* Dismiss the dialog if the display returns to the original depth */
+        if (GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL) ==
+            s_pScreenInfo->dwBPP) {
+            ErrorF("winChangeDelthDlgProc - wParam == s_pScreenInfo->dwBPP\n");
 
-	  /* Depth has been restored, dismiss dialog */
-	  DestroyWindow (g_hDlgDepthChange);
-	  g_hDlgDepthChange = NULL;
+            /* Depth has been restored, dismiss dialog */
+            DestroyWindow(g_hDlgDepthChange);
+            g_hDlgDepthChange = NULL;
 
-	  /* Flag that we have a valid screen depth */
-	  s_pScreenPriv->fBadDepth = FALSE;
-	}
-      return TRUE;
+            /* Flag that we have a valid screen depth */
+            s_pScreenPriv->fBadDepth = FALSE;
+        }
+        return TRUE;
 
     case WM_COMMAND:
-      switch (LOWORD (wParam))
-	{
-	case IDOK:
-	case IDCANCEL:
-	  ErrorF ("winChangeDepthDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");
-
-	  /* 
-	   * User dismissed the dialog, hide it until the
-	   * display mode is restored.
-	   */
-	  ShowWindow (g_hDlgDepthChange, SW_HIDE);
-	  return TRUE;
-	}
-      break;
+        switch (LOWORD(wParam)) {
+        case IDOK:
+        case IDCANCEL:
+            ErrorF("winChangeDepthDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");
+
+            /* 
+             * User dismissed the dialog, hide it until the
+             * display mode is restored.
+             */
+            ShowWindow(g_hDlgDepthChange, SW_HIDE);
+            return TRUE;
+        }
+        break;
 
     case WM_CLOSE:
-      ErrorF ("winChangeDepthDlgProc - WM_CLOSE\n");
+        ErrorF("winChangeDepthDlgProc - WM_CLOSE\n");
 
-      DestroyWindow (g_hDlgAbout);
-      g_hDlgAbout = NULL;
+        DestroyWindow(g_hDlgAbout);
+        g_hDlgAbout = NULL;
 
-      /* Fix to make sure keyboard focus isn't trapped */
-      PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
-      return TRUE;
+        /* Fix to make sure keyboard focus isn't trapped */
+        PostMessage(s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+        return TRUE;
     }
 
-  return FALSE;
+    return FALSE;
 }
 
-
 /*
  * Display the About dialog box
  */
 
 void
-winDisplayAboutDialog (winPrivScreenPtr pScreenPriv)
+winDisplayAboutDialog(winPrivScreenPtr pScreenPriv)
 {
-  /* Check if dialog already exists */
-  if (g_hDlgAbout != NULL)
-    {
-      /* Dialog box already exists, display it */
-      ShowWindow (g_hDlgAbout, SW_SHOWDEFAULT);
+    /* Check if dialog already exists */
+    if (g_hDlgAbout != NULL) {
+        /* Dialog box already exists, display it */
+        ShowWindow(g_hDlgAbout, SW_SHOWDEFAULT);
 
-      /* User has lost the dialog.  Show them where it is. */
-      SetForegroundWindow (g_hDlgAbout);
+        /* User has lost the dialog.  Show them where it is. */
+        SetForegroundWindow(g_hDlgAbout);
 
-      return;
+        return;
     }
 
-  /*
-   * Display the about box
-   */
-  g_hDlgAbout = CreateDialogParam (g_hInstance,
-				   "ABOUT_BOX",
-				   pScreenPriv->hwndScreen,
-				   winAboutDlgProc,
-				   (int) pScreenPriv);
- 
-  /* Show the dialog box */
-  ShowWindow (g_hDlgAbout, SW_SHOW);
-
-  /* Needed to get keyboard controls (tab, arrows, enter, esc) to work */
-  SetForegroundWindow (g_hDlgAbout);
-  
-  /* Set focus to the OK button */
-  PostMessage (g_hDlgAbout, WM_NEXTDLGCTL,
-	       (WPARAM)GetDlgItem (g_hDlgAbout, IDOK), TRUE);
-}
+    /*
+     * Display the about box
+     */
+    g_hDlgAbout = CreateDialogParam(g_hInstance,
+                                    "ABOUT_BOX",
+                                    pScreenPriv->hwndScreen,
+                                    winAboutDlgProc, (int) pScreenPriv);
+
+    /* Show the dialog box */
+    ShowWindow(g_hDlgAbout, SW_SHOW);
 
+    /* Needed to get keyboard controls (tab, arrows, enter, esc) to work */
+    SetForegroundWindow(g_hDlgAbout);
+
+    /* Set focus to the OK button */
+    PostMessage(g_hDlgAbout, WM_NEXTDLGCTL,
+                (WPARAM) GetDlgItem(g_hDlgAbout, IDOK), TRUE);
+}
 
 /*
  * Process messages for the about dialog.
  */
 
 static wBOOL CALLBACK
-winAboutDlgProc (HWND hwndDialog, UINT message,
-		 WPARAM wParam, LPARAM lParam)
+winAboutDlgProc(HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  static winPrivScreenPtr	s_pScreenPriv = NULL;
-  static winScreenInfo		*s_pScreenInfo = NULL;
-  static ScreenPtr		s_pScreen = NULL;
+    static winPrivScreenPtr s_pScreenPriv = NULL;
+    static winScreenInfo *s_pScreenInfo = NULL;
+    static ScreenPtr s_pScreen = NULL;
 
 #if CYGDEBUG
-  winDebug ("winAboutDlgProc\n");
+    winDebug("winAboutDlgProc\n");
 #endif
 
-  /* Branch on message type */
-  switch (message)
-    {
+    /* Branch on message type */
+    switch (message) {
     case WM_INITDIALOG:
 #if CYGDEBUG
-      winDebug ("winAboutDlgProc - WM_INITDIALOG\n");
+        winDebug("winAboutDlgProc - WM_INITDIALOG\n");
 #endif
 
-      /* Store pointers to private structures for future use */
-      s_pScreenPriv = (winPrivScreenPtr) lParam;
-      s_pScreenInfo = s_pScreenPriv->pScreenInfo;
-      s_pScreen = s_pScreenInfo->pScreen;
+        /* Store pointers to private structures for future use */
+        s_pScreenPriv = (winPrivScreenPtr) lParam;
+        s_pScreenInfo = s_pScreenPriv->pScreenInfo;
+        s_pScreen = s_pScreenInfo->pScreen;
 
-      winInitDialog (hwndDialog);
+        winInitDialog(hwndDialog);
 
-      /* Override the URL buttons */
-      winOverrideURLButton (hwndDialog, ID_ABOUT_CHANGELOG);
-      winOverrideURLButton (hwndDialog, ID_ABOUT_WEBSITE);
-      winOverrideURLButton (hwndDialog, ID_ABOUT_UG);
-      winOverrideURLButton (hwndDialog, ID_ABOUT_FAQ);
+        /* Override the URL buttons */
+        winOverrideURLButton(hwndDialog, ID_ABOUT_CHANGELOG);
+        winOverrideURLButton(hwndDialog, ID_ABOUT_WEBSITE);
+        winOverrideURLButton(hwndDialog, ID_ABOUT_UG);
+        winOverrideURLButton(hwndDialog, ID_ABOUT_FAQ);
 
-      return TRUE;
+        return TRUE;
 
     case WM_DRAWITEM:
-      /* Draw the URL buttons as needed */
-      winDrawURLWindow (lParam);
-      return TRUE;
+        /* Draw the URL buttons as needed */
+        winDrawURLWindow(lParam);
+        return TRUE;
 
     case WM_MOUSEMOVE:
     case WM_NCMOUSEMOVE:
-      /* Show the cursor if it is hidden */
-      if (g_fSoftwareCursor && !g_fCursor)
-	{
-	  g_fCursor = TRUE;
-	  ShowCursor (TRUE);
-	}
-      return TRUE;
+        /* Show the cursor if it is hidden */
+        if (g_fSoftwareCursor && !g_fCursor) {
+            g_fCursor = TRUE;
+            ShowCursor(TRUE);
+        }
+        return TRUE;
 
     case WM_COMMAND:
-      switch (LOWORD (wParam))
-	{
-	case IDOK:
-	case IDCANCEL:
-	  ErrorF ("winAboutDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");
+        switch (LOWORD(wParam)) {
+        case IDOK:
+        case IDCANCEL:
+            ErrorF("winAboutDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");
+
+            DestroyWindow(g_hDlgAbout);
+            g_hDlgAbout = NULL;
 
-	  DestroyWindow (g_hDlgAbout);
-	  g_hDlgAbout = NULL;
+            /* Fix to make sure keyboard focus isn't trapped */
+            PostMessage(s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
 
-	  /* Fix to make sure keyboard focus isn't trapped */
-	  PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+            /* Restore window procedures for URL buttons */
+            winUnoverrideURLButton(hwndDialog, ID_ABOUT_CHANGELOG);
+            winUnoverrideURLButton(hwndDialog, ID_ABOUT_WEBSITE);
+            winUnoverrideURLButton(hwndDialog, ID_ABOUT_UG);
+            winUnoverrideURLButton(hwndDialog, ID_ABOUT_FAQ);
 
-	  /* Restore window procedures for URL buttons */
-	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_CHANGELOG);
-	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_WEBSITE);
-	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_UG);
-	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_FAQ);
+            return TRUE;
 
-	  return TRUE;
+        case ID_ABOUT_CHANGELOG:
+        {
+            int iReturn;
 
-	case ID_ABOUT_CHANGELOG:
-	  {
-	    int iReturn;
 #ifdef __CYGWIN__
-	    const char *	pszCygPath = "/usr/X11R6/share/doc/"
-	      "xorg-x11-xwin/changelog.html";
-	    char		pszWinPath[MAX_PATH + 1];
+            const char *pszCygPath = "/usr/X11R6/share/doc/"
+                "xorg-x11-xwin/changelog.html";
+            char pszWinPath[MAX_PATH + 1];
 
-	    /* Convert the POSIX path to a Win32 path */
-	    cygwin_conv_to_win32_path (pszCygPath, pszWinPath);
+            /* Convert the POSIX path to a Win32 path */
+            cygwin_conv_to_win32_path(pszCygPath, pszWinPath);
 #else
-	    const char *	pszWinPath = "http://x.cygwin.com/"
-		    "devel/server/changelog.html";
+            const char *pszWinPath = "http://x.cygwin.com/"
+                "devel/server/changelog.html";
 #endif
-	    
-	    iReturn = (int)ShellExecute (NULL,
-                                    "open",
-                                    pszWinPath,
-                                    NULL,
-                                    NULL,
-                                    SW_MAXIMIZE);
-	    if (iReturn < 32)
-	      {
-		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_CHANGELOG - "
-			"ShellExecute failed: %d\n",
-			iReturn);
-	      }	    
-	  }
-	  return TRUE;
-
-	case ID_ABOUT_WEBSITE:
-	  {
-	    const char *	pszPath = __VENDORDWEBSUPPORT__;
-	    int			iReturn;
-	    
-	    iReturn = (int)ShellExecute (NULL,
-                                    "open",
-                                    pszPath,
-                                    NULL,
-                                    NULL,
-                                    SW_MAXIMIZE);
-	    if (iReturn < 32)
-	      {
-		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_WEBSITE - "
-			"ShellExecute failed: %d\n",
-			iReturn);
-	      }	    
-	  }
-	  return TRUE;
-
-	case ID_ABOUT_UG:
-	  {
-	    const char *	pszPath = "http://x.cygwin.com/docs/ug/";
-	    int			iReturn;
-	    
-	    iReturn = (int)ShellExecute (NULL,
-                                    "open",
-                                    pszPath,
-                                    NULL,
-                                    NULL,
-                                    SW_MAXIMIZE);
-	    if (iReturn < 32)
-	      {
-		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_UG - "
-			"ShellExecute failed: %d\n",
-			iReturn);
-	      }	    
-	  }
-	  return TRUE;
-
-	case ID_ABOUT_FAQ:
-	  {
-	    const char *	pszPath = "http://x.cygwin.com/docs/faq/";
-	    int			iReturn;
-	    
-	    iReturn = (int)ShellExecute (NULL,
-                                    "open",
-                                    pszPath,
-                                    NULL,
-                                    NULL,
-                                    SW_MAXIMIZE);
-	    if (iReturn < 32)
-	      {
-		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_FAQ - "
-			"ShellExecute failed: %d\n",
-			iReturn);
-	      }	    
-	  }
-	  return TRUE;
-	}
-      break;
+
+            iReturn = (int) ShellExecute(NULL,
+                                         "open",
+                                         pszWinPath, NULL, NULL, SW_MAXIMIZE);
+            if (iReturn < 32) {
+                ErrorF("winAboutDlgProc - WM_COMMAND - ID_ABOUT_CHANGELOG - "
+                       "ShellExecute failed: %d\n", iReturn);
+            }
+        }
+            return TRUE;
+
+        case ID_ABOUT_WEBSITE:
+        {
+            const char *pszPath = __VENDORDWEBSUPPORT__;
+            int iReturn;
+
+            iReturn = (int) ShellExecute(NULL,
+                                         "open",
+                                         pszPath, NULL, NULL, SW_MAXIMIZE);
+            if (iReturn < 32) {
+                ErrorF("winAboutDlgProc - WM_COMMAND - ID_ABOUT_WEBSITE - "
+                       "ShellExecute failed: %d\n", iReturn);
+            }
+        }
+            return TRUE;
+
+        case ID_ABOUT_UG:
+        {
+            const char *pszPath = "http://x.cygwin.com/docs/ug/";
+            int iReturn;
+
+            iReturn = (int) ShellExecute(NULL,
+                                         "open",
+                                         pszPath, NULL, NULL, SW_MAXIMIZE);
+            if (iReturn < 32) {
+                ErrorF("winAboutDlgProc - WM_COMMAND - ID_ABOUT_UG - "
+                       "ShellExecute failed: %d\n", iReturn);
+            }
+        }
+            return TRUE;
+
+        case ID_ABOUT_FAQ:
+        {
+            const char *pszPath = "http://x.cygwin.com/docs/faq/";
+            int iReturn;
+
+            iReturn = (int) ShellExecute(NULL,
+                                         "open",
+                                         pszPath, NULL, NULL, SW_MAXIMIZE);
+            if (iReturn < 32) {
+                ErrorF("winAboutDlgProc - WM_COMMAND - ID_ABOUT_FAQ - "
+                       "ShellExecute failed: %d\n", iReturn);
+            }
+        }
+            return TRUE;
+        }
+        break;
 
     case WM_CLOSE:
-      ErrorF ("winAboutDlgProc - WM_CLOSE\n");
+        ErrorF("winAboutDlgProc - WM_CLOSE\n");
 
-      DestroyWindow (g_hDlgAbout);
-      g_hDlgAbout = NULL;
+        DestroyWindow(g_hDlgAbout);
+        g_hDlgAbout = NULL;
 
-      /* Fix to make sure keyboard focus isn't trapped */
-      PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+        /* Fix to make sure keyboard focus isn't trapped */
+        PostMessage(s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
 
-      /* Restore window procedures for URL buttons */
-      winUnoverrideURLButton (hwndDialog, ID_ABOUT_CHANGELOG);
-      winUnoverrideURLButton (hwndDialog, ID_ABOUT_WEBSITE);
-      winUnoverrideURLButton (hwndDialog, ID_ABOUT_UG);
-      winUnoverrideURLButton (hwndDialog, ID_ABOUT_FAQ);
+        /* Restore window procedures for URL buttons */
+        winUnoverrideURLButton(hwndDialog, ID_ABOUT_CHANGELOG);
+        winUnoverrideURLButton(hwndDialog, ID_ABOUT_WEBSITE);
+        winUnoverrideURLButton(hwndDialog, ID_ABOUT_UG);
+        winUnoverrideURLButton(hwndDialog, ID_ABOUT_FAQ);
 
-      return TRUE;
+        return TRUE;
     }
 
-  return FALSE;
+    return FALSE;
 }
diff --git a/xorg-server/hw/xwin/winengine.c b/xorg-server/hw/xwin/winengine.c
index bf5187bcd..67489598b 100644
--- a/xorg-server/hw/xwin/winengine.c
+++ b/xorg-server/hw/xwin/winengine.c
@@ -38,8 +38,8 @@
  * Global variables for function pointers into
  * dynamically loaded libraries
  */
-FARPROC		g_fpDirectDrawCreate = NULL;
-FARPROC		g_fpDirectDrawCreateClipper = NULL;
+FARPROC g_fpDirectDrawCreate = NULL;
+FARPROC g_fpDirectDrawCreateClipper = NULL;
 
 /*
   module handle for dynamically loaded directdraw library
@@ -52,86 +52,82 @@ static HMODULE g_hmodDirectDraw = NULL;
  */
 
 void
-winDetectSupportedEngines (void)
+winDetectSupportedEngines(void)
 {
-  OSVERSIONINFO		osvi;
+    OSVERSIONINFO osvi;
 
-  /* Initialize the engine support flags */
-  g_dwEnginesSupported = WIN_SERVER_SHADOW_GDI;
+    /* Initialize the engine support flags */
+    g_dwEnginesSupported = WIN_SERVER_SHADOW_GDI;
 
 #ifdef XWIN_NATIVEGDI
-  g_dwEnginesSupported |= WIN_SERVER_NATIVE_GDI;
+    g_dwEnginesSupported |= WIN_SERVER_NATIVE_GDI;
 #endif
 
-  /* Get operating system version information */
-  ZeroMemory (&osvi, sizeof (osvi));
-  osvi.dwOSVersionInfoSize = sizeof (osvi);
-  GetVersionEx (&osvi);
-
-  /* Do we have DirectDraw? */
-  if (g_hmodDirectDraw != NULL)
-    {
-      LPDIRECTDRAW	lpdd = NULL;
-      LPDIRECTDRAW4	lpdd4 = NULL;
-      HRESULT		ddrval;
-
-      /* Was the DirectDrawCreate function found? */
-      if (g_fpDirectDrawCreate == NULL)
-	{
-	  /* No DirectDraw support */
-	  return;
-	}
-
-      /* DirectDrawCreate exists, try to call it */
-      /* Create a DirectDraw object, store the address at lpdd */
-      ddrval = (*g_fpDirectDrawCreate) (NULL,
-					(void**) &lpdd,
-					NULL);
-      if (FAILED (ddrval))
-	{
-	  /* No DirectDraw support */
-	  winErrorFVerb (2, "winDetectSupportedEngines - DirectDraw not installed\n");
-	  return;
-	}
-      else
-	{
-	  /* We have DirectDraw */
-	  winErrorFVerb (2, "winDetectSupportedEngines - DirectDraw installed\n");
-	  g_dwEnginesSupported |= WIN_SERVER_SHADOW_DD;
+    /* Get operating system version information */
+    ZeroMemory(&osvi, sizeof(osvi));
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+    GetVersionEx(&osvi);
+
+    /* Do we have DirectDraw? */
+    if (g_hmodDirectDraw != NULL) {
+        LPDIRECTDRAW lpdd = NULL;
+        LPDIRECTDRAW4 lpdd4 = NULL;
+        HRESULT ddrval;
+
+        /* Was the DirectDrawCreate function found? */
+        if (g_fpDirectDrawCreate == NULL) {
+            /* No DirectDraw support */
+            return;
+        }
+
+        /* DirectDrawCreate exists, try to call it */
+        /* Create a DirectDraw object, store the address at lpdd */
+        ddrval = (*g_fpDirectDrawCreate) (NULL, (void **) &lpdd, NULL);
+        if (FAILED(ddrval)) {
+            /* No DirectDraw support */
+            winErrorFVerb(2,
+                          "winDetectSupportedEngines - DirectDraw not installed\n");
+            return;
+        }
+        else {
+            /* We have DirectDraw */
+            winErrorFVerb(2,
+                          "winDetectSupportedEngines - DirectDraw installed\n");
+            g_dwEnginesSupported |= WIN_SERVER_SHADOW_DD;
 
 #ifdef XWIN_PRIMARYFB
-	  /* Allow PrimaryDD engine if NT */
-	  if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)
-	    {
-	      g_dwEnginesSupported |= WIN_SERVER_PRIMARY_DD;
-	      winErrorFVerb (2, "winDetectSupportedEngines - Allowing PrimaryDD\n");
-	    }
+            /* Allow PrimaryDD engine if NT */
+            if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+                g_dwEnginesSupported |= WIN_SERVER_PRIMARY_DD;
+                winErrorFVerb(2,
+                              "winDetectSupportedEngines - Allowing PrimaryDD\n");
+            }
 #endif
-	}
-      
-      /* Try to query for DirectDraw4 interface */
-      ddrval = IDirectDraw_QueryInterface (lpdd,
-					   &IID_IDirectDraw4,
-					   (LPVOID*) &lpdd4);
-      if (SUCCEEDED (ddrval))
-	{
-	  /* We have DirectDraw4 */
-	  winErrorFVerb (2, "winDetectSupportedEngines - DirectDraw4 installed\n");
-	  g_dwEnginesSupported |= WIN_SERVER_SHADOW_DDNL;
-	}
-
-      /* Cleanup DirectDraw interfaces */
-      if (lpdd4 != NULL)
-	IDirectDraw_Release (lpdd4);
-      if (lpdd != NULL)
-	IDirectDraw_Release (lpdd);
+        }
+
+        /* Try to query for DirectDraw4 interface */
+        ddrval = IDirectDraw_QueryInterface(lpdd,
+                                            &IID_IDirectDraw4,
+                                            (LPVOID *) & lpdd4);
+        if (SUCCEEDED(ddrval)) {
+            /* We have DirectDraw4 */
+            winErrorFVerb(2,
+                          "winDetectSupportedEngines - DirectDraw4 installed\n");
+            g_dwEnginesSupported |= WIN_SERVER_SHADOW_DDNL;
+        }
+
+        /* Cleanup DirectDraw interfaces */
+        if (lpdd4 != NULL)
+            IDirectDraw_Release(lpdd4);
+        if (lpdd != NULL)
+            IDirectDraw_Release(lpdd);
     }
 
-  winErrorFVerb (2, "winDetectSupportedEngines - Returning, supported engines %08x\n",
-	  (unsigned int) g_dwEnginesSupported);
+    winErrorFVerb(2,
+                  "winDetectSupportedEngines - Returning, supported engines %08x\n",
+                  (unsigned int) g_dwEnginesSupported);
 }
 
-
 /*
  * Set the engine type, depending on the engines
  * supported for this screen, and whether the user
@@ -139,197 +135,183 @@ winDetectSupportedEngines (void)
  */
 
 Bool
-winSetEngine (ScreenPtr pScreen)
+winSetEngine(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  HDC			hdc;
-  DWORD			dwBPP;
-
-  /* Get a DC */
-  hdc = GetDC (NULL);
-  if (hdc == NULL)
-    {
-      ErrorF ("winSetEngine - Couldn't get an HDC\n");
-      return FALSE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HDC hdc;
+    DWORD dwBPP;
+
+    /* Get a DC */
+    hdc = GetDC(NULL);
+    if (hdc == NULL) {
+        ErrorF("winSetEngine - Couldn't get an HDC\n");
+        return FALSE;
     }
 
-  /*
-   * pScreenInfo->dwBPP may be 0 to indicate that the current screen
-   * depth is to be used.  Thus, we must query for the current display
-   * depth here.
-   */
-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
-
-  /* Release the DC */
-  ReleaseDC (NULL, hdc);
-  hdc = NULL;
-
-  /* ShadowGDI is the only engine that supports windowed PseudoColor */
-  if (dwBPP == 8 && !pScreenInfo->fFullScreen)
-    {
-      winErrorFVerb (2, "winSetEngine - Windowed && PseudoColor => ShadowGDI\n");
-      pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
-
-      /* Set engine function pointers */
-      winSetEngineFunctionsShadowGDI (pScreen);
-      return TRUE;
+    /*
+     * pScreenInfo->dwBPP may be 0 to indicate that the current screen
+     * depth is to be used.  Thus, we must query for the current display
+     * depth here.
+     */
+    dwBPP = GetDeviceCaps(hdc, BITSPIXEL);
+
+    /* Release the DC */
+    ReleaseDC(NULL, hdc);
+    hdc = NULL;
+
+    /* ShadowGDI is the only engine that supports windowed PseudoColor */
+    if (dwBPP == 8 && !pScreenInfo->fFullScreen) {
+        winErrorFVerb(2,
+                      "winSetEngine - Windowed && PseudoColor => ShadowGDI\n");
+        pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
+
+        /* Set engine function pointers */
+        winSetEngineFunctionsShadowGDI(pScreen);
+        return TRUE;
     }
 
-  /* ShadowGDI is the only engine that supports Multi Window Mode */
-  if (
-      FALSE
+    /* ShadowGDI is the only engine that supports Multi Window Mode */
+    if (FALSE
 #ifdef XWIN_MULTIWINDOWEXTWM
-      || pScreenInfo->fMWExtWM
+        || pScreenInfo->fMWExtWM
 #endif
 #ifdef XWIN_MULTIWINDOW
-      || pScreenInfo->fMultiWindow
+        || pScreenInfo->fMultiWindow
 #endif
-      )
-    {
-      winErrorFVerb (2, "winSetEngine - Multi Window or Rootless => ShadowGDI\n");
-      pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
-
-      /* Set engine function pointers */
-      winSetEngineFunctionsShadowGDI (pScreen);
-      return TRUE;
+        ) {
+        winErrorFVerb(2,
+                      "winSetEngine - Multi Window or Rootless => ShadowGDI\n");
+        pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
+
+        /* Set engine function pointers */
+        winSetEngineFunctionsShadowGDI(pScreen);
+        return TRUE;
     }
 
-  /* If the user's choice is supported, we'll use that */
-  if (g_dwEnginesSupported & pScreenInfo->dwEnginePreferred)
-    {
-      winErrorFVerb (2, "winSetEngine - Using user's preference: %d\n",
-	      (int) pScreenInfo->dwEnginePreferred);
-      pScreenInfo->dwEngine = pScreenInfo->dwEnginePreferred;
-
-      /* Setup engine function pointers */
-      switch (pScreenInfo->dwEngine)
-	{
-	case WIN_SERVER_SHADOW_GDI:
-	  winSetEngineFunctionsShadowGDI (pScreen);
-	  break;
-	case WIN_SERVER_SHADOW_DD:
-	  winSetEngineFunctionsShadowDD (pScreen);
-	  break;
-	case WIN_SERVER_SHADOW_DDNL:
-	  winSetEngineFunctionsShadowDDNL (pScreen);
-	  break;
+    /* If the user's choice is supported, we'll use that */
+    if (g_dwEnginesSupported & pScreenInfo->dwEnginePreferred) {
+        winErrorFVerb(2, "winSetEngine - Using user's preference: %d\n",
+                      (int) pScreenInfo->dwEnginePreferred);
+        pScreenInfo->dwEngine = pScreenInfo->dwEnginePreferred;
+
+        /* Setup engine function pointers */
+        switch (pScreenInfo->dwEngine) {
+        case WIN_SERVER_SHADOW_GDI:
+            winSetEngineFunctionsShadowGDI(pScreen);
+            break;
+        case WIN_SERVER_SHADOW_DD:
+            winSetEngineFunctionsShadowDD(pScreen);
+            break;
+        case WIN_SERVER_SHADOW_DDNL:
+            winSetEngineFunctionsShadowDDNL(pScreen);
+            break;
 #ifdef XWIN_PRIMARYFB
-	case WIN_SERVER_PRIMARY_DD:
-	  winSetEngineFunctionsPrimaryDD (pScreen);
-	  break;
+        case WIN_SERVER_PRIMARY_DD:
+            winSetEngineFunctionsPrimaryDD(pScreen);
+            break;
 #endif
 #ifdef XWIN_NATIVEGDI
-	case WIN_SERVER_NATIVE_GDI:
-	  winSetEngineFunctionsNativeGDI (pScreen);
-	  break;
+        case WIN_SERVER_NATIVE_GDI:
+            winSetEngineFunctionsNativeGDI(pScreen);
+            break;
 #endif
-	default:
-	  FatalError ("winSetEngine - Invalid engine type\n");
-	}
-      return TRUE;
+        default:
+            FatalError("winSetEngine - Invalid engine type\n");
+        }
+        return TRUE;
     }
 
-  /* ShadowDDNL has good performance, so why not */
-  if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DDNL)
-    {
-      winErrorFVerb (2, "winSetEngine - Using Shadow DirectDraw NonLocking\n");
-      pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DDNL;
+    /* ShadowDDNL has good performance, so why not */
+    if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DDNL) {
+        winErrorFVerb(2, "winSetEngine - Using Shadow DirectDraw NonLocking\n");
+        pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DDNL;
 
-      /* Set engine function pointers */
-      winSetEngineFunctionsShadowDDNL (pScreen);
-      return TRUE;
+        /* Set engine function pointers */
+        winSetEngineFunctionsShadowDDNL(pScreen);
+        return TRUE;
     }
 
-  /* ShadowDD is next in line */
-  if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DD)
-    {
-      winErrorFVerb (2, "winSetEngine - Using Shadow DirectDraw\n");
-      pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DD;
+    /* ShadowDD is next in line */
+    if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DD) {
+        winErrorFVerb(2, "winSetEngine - Using Shadow DirectDraw\n");
+        pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DD;
 
-      /* Set engine function pointers */
-      winSetEngineFunctionsShadowDD (pScreen);
-      return TRUE;
+        /* Set engine function pointers */
+        winSetEngineFunctionsShadowDD(pScreen);
+        return TRUE;
     }
 
-  /* ShadowGDI is next in line */
-  if (g_dwEnginesSupported & WIN_SERVER_SHADOW_GDI)
-    {
-      winErrorFVerb (2, "winSetEngine - Using Shadow GDI DIB\n");
-      pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
+    /* ShadowGDI is next in line */
+    if (g_dwEnginesSupported & WIN_SERVER_SHADOW_GDI) {
+        winErrorFVerb(2, "winSetEngine - Using Shadow GDI DIB\n");
+        pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
 
-      /* Set engine function pointers */
-      winSetEngineFunctionsShadowGDI (pScreen);
-      return TRUE;
+        /* Set engine function pointers */
+        winSetEngineFunctionsShadowGDI(pScreen);
+        return TRUE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Get procedure addresses for DirectDrawCreate and DirectDrawCreateClipper
  */
 
 Bool
-winGetDDProcAddresses (void)
+winGetDDProcAddresses(void)
 {
-  Bool			fReturn = TRUE;
-  
-  /* Load the DirectDraw library */
-  g_hmodDirectDraw = LoadLibraryEx ("ddraw.dll", NULL, 0);
-  if (g_hmodDirectDraw == NULL)
-    {
-      ErrorF ("winGetDDProcAddresses - Could not load ddraw.dll\n");
-      fReturn = TRUE;
-      goto winGetDDProcAddresses_Exit;
+    Bool fReturn = TRUE;
+
+    /* Load the DirectDraw library */
+    g_hmodDirectDraw = LoadLibraryEx("ddraw.dll", NULL, 0);
+    if (g_hmodDirectDraw == NULL) {
+        ErrorF("winGetDDProcAddresses - Could not load ddraw.dll\n");
+        fReturn = TRUE;
+        goto winGetDDProcAddresses_Exit;
     }
 
-  /* Try to get the DirectDrawCreate address */
-  g_fpDirectDrawCreate = GetProcAddress (g_hmodDirectDraw,
-					 "DirectDrawCreate");
-  if (g_fpDirectDrawCreate == NULL)
-    {
-      ErrorF ("winGetDDProcAddresses - Could not get DirectDrawCreate "
-	      "address\n");
-      fReturn = TRUE;
-      goto winGetDDProcAddresses_Exit;
+    /* Try to get the DirectDrawCreate address */
+    g_fpDirectDrawCreate = GetProcAddress(g_hmodDirectDraw, "DirectDrawCreate");
+    if (g_fpDirectDrawCreate == NULL) {
+        ErrorF("winGetDDProcAddresses - Could not get DirectDrawCreate "
+               "address\n");
+        fReturn = TRUE;
+        goto winGetDDProcAddresses_Exit;
     }
 
-  /* Try to get the DirectDrawCreateClipper address */
-  g_fpDirectDrawCreateClipper = GetProcAddress (g_hmodDirectDraw,
-						"DirectDrawCreateClipper");
-  if (g_fpDirectDrawCreateClipper == NULL)
-    {
-      ErrorF ("winGetDDProcAddresses - Could not get "
-	      "DirectDrawCreateClipper address\n");
-      fReturn = FALSE;
-      goto winGetDDProcAddresses_Exit;
+    /* Try to get the DirectDrawCreateClipper address */
+    g_fpDirectDrawCreateClipper = GetProcAddress(g_hmodDirectDraw,
+                                                 "DirectDrawCreateClipper");
+    if (g_fpDirectDrawCreateClipper == NULL) {
+        ErrorF("winGetDDProcAddresses - Could not get "
+               "DirectDrawCreateClipper address\n");
+        fReturn = FALSE;
+        goto winGetDDProcAddresses_Exit;
     }
 
-  /*
-   * Note: Do not unload ddraw.dll here.  Do it in GiveUp
-   */
+    /*
+     * Note: Do not unload ddraw.dll here.  Do it in GiveUp
+     */
 
  winGetDDProcAddresses_Exit:
-  /* Unload the DirectDraw library if we failed to initialize */
-  if (!fReturn && g_hmodDirectDraw != NULL)
-    {
-      FreeLibrary (g_hmodDirectDraw);
-      g_hmodDirectDraw = NULL;
+    /* Unload the DirectDraw library if we failed to initialize */
+    if (!fReturn && g_hmodDirectDraw != NULL) {
+        FreeLibrary(g_hmodDirectDraw);
+        g_hmodDirectDraw = NULL;
     }
-  
-  return fReturn;
+
+    return fReturn;
 }
 
 void
 winReleaseDDProcAddresses(void)
 {
-  if (g_hmodDirectDraw != NULL)
-    {
-      FreeLibrary (g_hmodDirectDraw);
-      g_hmodDirectDraw = NULL;
-      g_fpDirectDrawCreate = NULL;
-      g_fpDirectDrawCreateClipper = NULL;
+    if (g_hmodDirectDraw != NULL) {
+        FreeLibrary(g_hmodDirectDraw);
+        g_hmodDirectDraw = NULL;
+        g_fpDirectDrawCreate = NULL;
+        g_fpDirectDrawCreateClipper = NULL;
     }
 }
diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c
index 0440d13ff..4049e9735 100644
--- a/xorg-server/hw/xwin/winerror.c
+++ b/xorg-server/hw/xwin/winerror.c
@@ -38,31 +38,30 @@
 #ifdef DDXOSVERRORF
 /* Prototype */
 void
-OsVendorVErrorF (const char *pszFormat, va_list va_args);
+ OsVendorVErrorF(const char *pszFormat, va_list va_args);
 
 void
-OsVendorVErrorF (const char *pszFormat, va_list va_args)
+OsVendorVErrorF(const char *pszFormat, va_list va_args)
 {
 #if defined(XWIN_CLIPBOARD) || defined (XWIN_MULTIWINDOW)
-  /* make sure the clipboard and multiwindow threads do not interfere the
-   * main thread */
-  static pthread_mutex_t	s_pmPrinting = PTHREAD_MUTEX_INITIALIZER;
+    /* make sure the clipboard and multiwindow threads do not interfere the
+     * main thread */
+    static pthread_mutex_t s_pmPrinting = PTHREAD_MUTEX_INITIALIZER;
 
-  /* Lock the printing mutex */
-  pthread_mutex_lock (&s_pmPrinting);
+    /* Lock the printing mutex */
+    pthread_mutex_lock(&s_pmPrinting);
 #endif
 
-  /* Print the error message to a log file, could be stderr */
-  LogVWrite (0, pszFormat, va_args);
+    /* Print the error message to a log file, could be stderr */
+    LogVWrite(0, pszFormat, va_args);
 
 #if defined(XWIN_CLIPBOARD) || defined (XWIN_MULTIWINDOW)
-  /* Unlock the printing mutex */
-  pthread_mutex_unlock (&s_pmPrinting);
+    /* Unlock the printing mutex */
+    pthread_mutex_unlock(&s_pmPrinting);
 #endif
 }
 #endif
 
-
 /*
  * os/util.c/FatalError () calls our vendor ErrorF, so the message
  * from a FatalError will be logged.  Thus, the message for the
@@ -71,45 +70,43 @@ OsVendorVErrorF (const char *pszFormat, va_list va_args)
  * Attempt to do last-ditch, safe, important cleanup here.
  */
 void
-OsVendorFatalError (void)
+OsVendorFatalError(void)
 {
-  /* Don't give duplicate warning if UseMsg was called */
-  if (g_fSilentFatalError)
-    return;
-
-  if (!g_fLogInited) {
-    g_fLogInited = TRUE;
-    g_pszLogFile = LogInit (g_pszLogFile, NULL);
-  }
-  LogClose (EXIT_ERR_ABORT);
-
-  winMessageBoxF (
-          "A fatal error has occurred and " PROJECT_NAME " will now exit.\n" \
-		  "Please open %s for more information.\n",
-		  MB_ICONERROR, (g_pszLogFile?g_pszLogFile:"the logfile"));
+    /* Don't give duplicate warning if UseMsg was called */
+    if (g_fSilentFatalError)
+        return;
+
+    if (!g_fLogInited) {
+        g_fLogInited = TRUE;
+        g_pszLogFile = LogInit(g_pszLogFile, NULL);
+    }
+    LogClose(EXIT_ERR_ABORT);
+
+    winMessageBoxF("A fatal error has occurred and " PROJECT_NAME
+                   " will now exit.\n" "Please open %s for more information.\n",
+                   MB_ICONERROR, (g_pszLogFile ? g_pszLogFile : "the logfile"));
 }
 
-
 /*
  * winMessageBoxF - Print a formatted error message in a useful
  * message box.
  */
 
 void
-winMessageBoxF (const char *pszError, UINT uType, ...)
+winMessageBoxF(const char *pszError, UINT uType, ...)
 {
-  char *	pszErrorF = NULL;
-  char *	pszMsgBox = NULL;
-  va_list	args;
-  int		size;
-
-  va_start(args, uType);
-  size = vasprintf (&pszErrorF, pszError, args);
-  va_end(args);
-  if (size == -1) {
-    pszErrorF = NULL;
-    goto winMessageBoxF_Cleanup;
-  }
+    char *pszErrorF = NULL;
+    char *pszMsgBox = NULL;
+    va_list args;
+    int size;
+
+    va_start(args, uType);
+    size = vasprintf(&pszErrorF, pszError, args);
+    va_end(args);
+    if (size == -1) {
+        pszErrorF = NULL;
+        goto winMessageBoxF_Cleanup;
+    }
 
 #define MESSAGEBOXF \
 	"%s\n" \
@@ -120,27 +117,22 @@ winMessageBoxF (const char *pszError, UINT uType, ...)
 	"XWin was started with the following command-line:\n\n" \
 	"%s\n"
 
-  size = asprintf (&pszMsgBox, MESSAGEBOXF,
-		   pszErrorF, XVENDORNAME,
-		   XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH,
-		    XORG_VERSION_SNAP, XORG_VERSION_CURRENT,
-		   BUILDERADDR,
-		   BUILDERSTRING,
-		   g_pszCommandLine);
-
-  if (size == -1) {
-    pszMsgBox = NULL;
-    goto winMessageBoxF_Cleanup;
-  }
-
-  /* Display the message box string */
-  MessageBox (NULL,
-	      pszMsgBox,
-	      PROJECT_NAME,
-	      MB_OK | uType);
+    size = asprintf(&pszMsgBox, MESSAGEBOXF,
+                    pszErrorF, XVENDORNAME,
+                    XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH,
+                    XORG_VERSION_SNAP, XORG_VERSION_CURRENT,
+                    BUILDERADDR, BUILDERSTRING, g_pszCommandLine);
+
+    if (size == -1) {
+        pszMsgBox = NULL;
+        goto winMessageBoxF_Cleanup;
+    }
+
+    /* Display the message box string */
+    MessageBox(NULL, pszMsgBox, PROJECT_NAME, MB_OK | uType);
 
  winMessageBoxF_Cleanup:
-  free(pszErrorF);
-  free(pszMsgBox);
+    free(pszErrorF);
+    free(pszMsgBox);
 #undef MESSAGEBOXF
 }
diff --git a/xorg-server/hw/xwin/winfillsp.c b/xorg-server/hw/xwin/winfillsp.c
index 1cc91e62a..f2432ed23 100644
--- a/xorg-server/hw/xwin/winfillsp.c
+++ b/xorg-server/hw/xwin/winfillsp.c
@@ -1,831 +1,842 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	Harold L Hunt II

- * 		Alan Hourihane <alanh@fairlite.demon.co.uk>

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-extern void ROP16(HDC hdc, int rop);

-

-#define TRANSLATE_COLOR(color)						\

-{									\

-  if (pDrawable->depth == 15)						\

-    color = ((color & 0x1F) << 19) | ((color & 0x03E0) << 6) |		\

-      ((color & 0xF800) >> 8);						\

-  else if (pDrawable->depth == 16)					\

-    color = ((color & 0x1F) << 19) | ((color & 0x07E0) << 5) |		\

-      ((color & 0xF800) >> 8);						\

-  else if (pDrawable->depth == 24 || pDrawable->depth == 32)		\

-    color = ((color & 0xFF) << 16) | (color & 0xFF00) |			\

-      ((color & 0xFF0000) >> 16);					\

-}

-

-/* See Porting Layer Definition - p. 54 */

-void

-winFillSpansNativeGDI (DrawablePtr	pDrawable,

-		       GCPtr		pGC,

-		       int		iSpans,

-		       DDXPointPtr	pPoints,

-		       int		*piWidths,

-		       int		fSorted)

-{

-  winGCPriv(pGC);

-  HBITMAP		hbmpOrig = NULL, hbmpOrigStipple = NULL;

-  HBITMAP		hPenOrig = NULL;

-  HBITMAP		hBitmap = NULL;

-  PixmapPtr		pPixmap = NULL;

-  winPrivPixmapPtr	pPixmapPriv = NULL;

-  PixmapPtr		pStipple = NULL;

-  winPrivPixmapPtr	pStipplePriv = NULL;

-  PixmapPtr		pTile = NULL;

-  winPrivPixmapPtr	pTilePriv = NULL;

-  HDC			hdcStipple = NULL, hdcTile = NULL;

-  HPEN			hPen = NULL;

-  int			iX;

-  int			fg, bg;

-  RegionPtr	    	pClip = pGC->pCompositeClip;

-  BoxPtr	    	pextent, pbox;

-  int		    	nbox;

-  int		    	extentX1, extentX2, extentY1, extentY2;

-  int		    	fullX1, fullX2, fullY1;

-  HRGN			hrgn = NULL, combined = NULL;

-

-  nbox = RegionNumRects (pClip);

-  pbox = RegionRects (pClip);

-

-  if (!nbox) return;

-

-  combined = CreateRectRgn (pbox->x1, pbox->y1, pbox->x2, pbox->y2);

-  nbox--; pbox++;

-

-  while (nbox--)

-    {

-      hrgn = CreateRectRgn (pbox->x1, pbox->y1, pbox->x2, pbox->y2);

-      CombineRgn (combined, combined, hrgn, RGN_OR);

-      DeleteObject (hrgn);

-      hrgn = NULL;

-      pbox++;

-    }

-

-  pextent = RegionExtents(pClip);

-  extentX1 = pextent->x1;

-  extentY1 = pextent->y1;

-  extentX2 = pextent->x2;

-  extentY2 = pextent->y2;

-

-  /* Branch on the type of drawable we have */

-  switch (pDrawable->type)

-    {

-    case DRAWABLE_PIXMAP:

-

-      SelectClipRgn (pGCPriv->hdcMem, combined);

-      DeleteObject (combined);

-      combined = NULL;

-

-      /* Get a pixmap pointer from the drawable pointer, and fetch privates  */

-      pPixmap = (PixmapPtr) pDrawable;

-      pPixmapPriv = winGetPixmapPriv (pPixmap);

-

-      /* Select the drawable pixmap into memory hdc */

-      hbmpOrig = SelectObject (pGCPriv->hdcMem, pPixmapPriv->hBitmap);

-      if (hbmpOrig == NULL)

-	FatalError ("winFillSpans - DRAWABLE_PIXMAP - "

-		    "SelectObject () failed on\n\tpPixmapPriv->hBitmap: "

-		    "%08x\n", (unsigned int) pPixmapPriv->hBitmap);

-      

-      /* Branch on the fill type */

-      switch (pGC->fillStyle)

-	{

-	case FillSolid:

-

-          ROP16 (pGCPriv->hdcMem, pGC->alu);

-

-	  if (pDrawable->depth == 1) 

-	    {

-	      if (pGC->fgPixel == 0)

-		hPenOrig = SelectObject (pGCPriv->hdcMem, 

-					 GetStockObject (BLACK_PEN));

-	      else

-		hPenOrig = SelectObject (pGCPriv->hdcMem,

-					 GetStockObject (WHITE_PEN));

-	    } 

-	  else 

-	    {

-	      fg = pGC->fgPixel;

-	      TRANSLATE_COLOR (fg);

-	      hPen = CreatePen (PS_SOLID, 0, fg);

-	      hPenOrig = SelectObject (pGCPriv->hdcMem, hPen);

-	    }

-    	

-	  while (iSpans--)

-	    {

-	      fullX1 = pPoints->x;

-	      fullY1 = pPoints->y;

-	      fullX2 = fullX1 + (int) *piWidths;

-	      pPoints++;

-	      piWidths++;

-	

-	      if (fullY1 < extentY1 || extentY2 <= fullY1)

-		continue;

-	

-	      if (fullX1 < extentX1)

-		fullX1 = extentX1;

-	      if (fullX2 > extentX2)

-		fullX2 = extentX2;

-	

-	      if (fullX1 >= fullX2)

-		continue;

-	

-	      MoveToEx (pGCPriv->hdcMem, fullX1, fullY1, NULL);

-	      LineTo (pGCPriv->hdcMem, fullX2, fullY1);

-	    }

-

-          SetROP2 (pGCPriv->hdcMem, R2_COPYPEN);

-

-	  /* Give back the Pen */

-	  SelectObject (pGCPriv->hdcMem, hPenOrig);

-

-	  if (pDrawable->depth != 1)

-	    DeleteObject (hPen);

-	  break;

-

-	case FillOpaqueStippled:

-

-	  pStipple = pGC->stipple;

-	  pStipplePriv = winGetPixmapPriv (pStipple);

-

-	  /* Create a device-dependent bitmap for the stipple */

-	  hBitmap = CreateDIBitmap (pGCPriv->hdcMem,

-				    (BITMAPINFOHEADER *)pStipplePriv->pbmih,

-				    CBM_INIT,

-				    pStipplePriv->pbBits,

-				    (BITMAPINFO *)pStipplePriv->pbmih,

-				    DIB_RGB_COLORS);

-

-	  /* Create a memory DC to hold the stipple */

-	  hdcStipple = CreateCompatibleDC (pGCPriv->hdcMem);

-

-	  /* Select the stipple bitmap into the stipple DC */

-	  hbmpOrigStipple = SelectObject (hdcStipple, hBitmap);

-	  if (hbmpOrigStipple == NULL)

-	    FatalError ("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "

-			"SelectObject () failed on hbmpOrigStipple\n");

-

-	  /* Make a temporary copy of the foreground and background colors */

-   	  bg = pGC->bgPixel;

-   	  fg = pGC->fgPixel;

-

-	  /* Translate the depth-dependent colors to Win32 COLORREFs */

-	  TRANSLATE_COLOR (fg);

-	  TRANSLATE_COLOR (bg);

-	  SetTextColor (pGCPriv->hdcMem, fg);

-	  SetBkColor (pGCPriv->hdcMem, bg);

-

-	  while (iSpans--)

-	    {

-	      int width = pStipple->drawable.width;

-	      fullX1 = pPoints->x;

-	      fullY1 = pPoints->y;

-	      fullX2 = fullX1 + (int) *piWidths;

-	      pPoints++;

-	      piWidths++;

-	

-	      if (fullY1 < extentY1 || extentY2 <= fullY1)

-		continue;

-	

-	      if (fullX1 < extentX1)

-		fullX1 = extentX1;

-	      if (fullX2 > extentX2)

-		fullX2 = extentX2;

-	

-	      if (fullX1 >= fullX2)

-		continue;

-	

-	      for (iX = fullX1; iX < fullX2; iX += width)

-		{

-		  int xoffset;

-

-		  if ((iX + pStipple->drawable.width) > fullX2)

-		    width = fullX2 - iX;

-		  else

-		    width = pStipple->drawable.width;

-

-		  if (iX == fullX1)

-		    xoffset = (fullX1 - (pDrawable->x + (pGC->patOrg.x % pStipple->drawable.width) - pStipple->drawable.width)) % pStipple->drawable.width;

-		  else

-		    xoffset = 0;

-

-		  if (xoffset + width > pStipple->drawable.width)

-		    width = pStipple->drawable.width - xoffset;

-

-		  BitBlt (pGCPriv->hdcMem,

-			  iX, fullY1,

-			  width, 1,

-			  hdcStipple,

-			  xoffset,

-			  (fullY1 - (pDrawable->y + (pGC->patOrg.y % pStipple->drawable.height) - pStipple->drawable.height)) % pStipple->drawable.height,

-			  g_copyROP[pGC->alu]);

-		}

-	    }

-

-	  /* Clear the stipple HDC */

-	  SelectObject (hdcStipple, hbmpOrigStipple);

-	  DeleteDC (hdcStipple);

-

-	  /* Delete the device dependent stipple bitmap */

-	  DeleteObject (hBitmap);

-

-	  break;

-	case FillStippled:

-

-	  pStipple = pGC->stipple;

-	  pStipplePriv = winGetPixmapPriv (pStipple);

-

-	  /* Create a device-dependent bitmap for the stipple */

-	  hBitmap = CreateDIBitmap (pGCPriv->hdcMem,

-				    (BITMAPINFOHEADER *)pStipplePriv->pbmih,

-				    CBM_INIT,

-				    pStipplePriv->pbBits,

-				    (BITMAPINFO *)pStipplePriv->pbmih,

-				    DIB_RGB_COLORS);

-

-	  /* Create a memory DC to hold the stipple */

-	  hdcStipple = CreateCompatibleDC (pGCPriv->hdcMem);

-

-	  /* Select the stipple bitmap into the stipple DC */

-	  hbmpOrigStipple = SelectObject (hdcStipple, hBitmap);

-	  if (hbmpOrigStipple == NULL)

-	    FatalError ("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "

-			"SelectObject () failed on hbmpOrigStipple\n");

-

-	  /* Make a temporary copy of the foreground and background colors */

-   	  bg = pGC->bgPixel;

-   	  fg = pGC->fgPixel;

-

-	  /* Translate the depth-dependent colors to Win32 COLORREFs */

-	  TRANSLATE_COLOR (fg);

-	  TRANSLATE_COLOR (bg);

-

-	  /* this is fudgy, we should only invert on the last one

-	   * We need to get the black/white pixels right in the

-	   * colormap. But yeah ! it's working.. 

-	   */

-	  if (pGC->bgPixel != -1 && pGC->fgPixel != -1) 

-	    {

-	      SetTextColor (pGCPriv->hdcMem, fg);

-	      SetBkColor (pGCPriv->hdcMem, bg);

-	      BitBlt (hdcStipple,

-		      0, 0,

-		      pStipple->drawable.width, pStipple->drawable.height,

-		      hdcStipple,

-		      0, 0,

-		      0x330008);

-	    } 

-	  else if (pGC->bgPixel == -1) 

-	    {

-	      SetTextColor (pGCPriv->hdcMem, fg);

-	      SetBkMode (pGCPriv->hdcMem, TRANSPARENT);

-	      BitBlt (hdcStipple,

-		      0, 0,

-		      pStipple->drawable.width, pStipple->drawable.height,

-		      hdcStipple,

-		      0, 0,

-		      0x330008);

-	    } 

-	  else if (pGC->fgPixel == -1) 

-	    {

-	      SetTextColor (pGCPriv->hdcMem, bg);

-	      SetBkMode (pGCPriv->hdcMem, TRANSPARENT);

-#if 0

-	      BitBlt (hdcStipple,

-		      0, 0,

-		      pStipple->drawable.width, pStipple->drawable.height,

-		      hdcStipple,

-		      0, 0,

-		      0x330008);

-#endif

-	    }

-

-	  while (iSpans--)

-	    {

-	      int width = pStipple->drawable.width;

-	      fullX1 = pPoints->x;

-	      fullY1 = pPoints->y;

-	      fullX2 = fullX1 + (int) *piWidths;

-	      pPoints++;

-	      piWidths++;

-	

-	      if (fullY1 < extentY1 || extentY2 <= fullY1)

-		continue;

-	

-	      if (fullX1 < extentX1)

-		fullX1 = extentX1;

-	      if (fullX2 > extentX2)

-		fullX2 = extentX2;

-	

-	      if (fullX1 >= fullX2)

-		continue;

-	

-	      for (iX = fullX1; iX < fullX2; iX += width)

-		{

-		  int xoffset;

-

-		  if ((iX + pStipple->drawable.width) > fullX2)

-		    width = fullX2 - iX;

-		  else

-		    width = pStipple->drawable.width;

-

-		  if (iX == fullX1)

-		    xoffset = (fullX1 - (pDrawable->x + (pGC->patOrg.x % pStipple->drawable.width) - pStipple->drawable.width)) % pStipple->drawable.width;

-		  else

-		    xoffset = 0;

-

-		  if (xoffset + width > pStipple->drawable.width)

-		    width = pStipple->drawable.width - xoffset;

-

-		  BitBlt (pGCPriv->hdcMem,

-		          iX, fullY1,

-		          width, 1,

-		          hdcStipple,

-			  xoffset,

-			  (fullY1 - (pDrawable->y + (pGC->patOrg.y % pStipple->drawable.height) - pStipple->drawable.height)) % pStipple->drawable.height,

-			  g_copyROP[pGC->alu]);

-		}

-	    }

-

-	  /* Clear the stipple HDC */

-	  SelectObject (hdcStipple, hbmpOrigStipple);

-	  DeleteDC (hdcStipple);

-

-	  /* Delete the device dependent stipple bitmap */

-	  DeleteObject (hBitmap);

-

-	  /* Restore the background mode */

-	  SetBkMode (pGCPriv->hdcMem, OPAQUE);

-	  break;

-

-	case FillTiled:

-

-	  /* Get a pixmap pointer from the tile pointer, and fetch privates  */

-	  pTile = (PixmapPtr) pGC->tile.pixmap;

-	  pTilePriv = winGetPixmapPriv (pTile);

-

-	  /* Create a memory DC to hold the tile */

-	  hdcTile = CreateCompatibleDC (pGCPriv->hdcMem);

-

-	  /* Select the tile into a DC */

-	  hbmpOrig = SelectObject (hdcTile, pTilePriv->hBitmap);

-	  if (hbmpOrig == NULL)

-	    FatalError ("winFillSpans - DRAWABLE_PIXMAP - FillTiled - "

-			"SelectObject () failed on pTilePriv->hBitmap\n");

-

-	  while (iSpans--)

-	    {

-	      int width = pTile->drawable.width;

-	      fullX1 = pPoints->x;

-	      fullY1 = pPoints->y;

-	      fullX2 = fullX1 + (int) *piWidths;

-	      pPoints++;

-	      piWidths++;

-	

-	      if (fullY1 < extentY1 || extentY2 <= fullY1)

-		continue;

-	

-	      if (fullX1 < extentX1)

-		fullX1 = extentX1;

-	      if (fullX2 > extentX2)

-		fullX2 = extentX2;

-	

-	      if (fullX1 >= fullX2)

-		continue;

-	

-	      for (iX = fullX1; iX < fullX2; iX += width)

-	      	{

-		  int xoffset;

-

-		  if ((iX + pTile->drawable.width) > fullX2)

-		    width = fullX2 - iX;

-		  else

-		    width = pTile->drawable.width;

-

-		  if (iX == fullX1)

-		    xoffset = (fullX1 - (pDrawable->x + (pGC->patOrg.x % pTile->drawable.width) - pTile->drawable.width)) % pTile->drawable.width;

-		  else

-		    xoffset = 0;

-

-		  if (xoffset + width > pTile->drawable.width)

-		    width = pTile->drawable.width - xoffset;

-

-		  BitBlt (pGCPriv->hdcMem,

-			  iX, fullY1,

-			  width, 1,

-			  hdcTile,

-			  xoffset,

-			  (fullY1 - (pDrawable->y + (pGC->patOrg.y % pTile->drawable.height) - pTile->drawable.height)) % pTile->drawable.height,

-			  g_copyROP[pGC->alu]);

-		}

-	    }

-

-	  /* Push the tile pixmap out of the memory HDC */

-	  SelectObject (hdcTile, hbmpOrig);

-

-	  /* Delete the tile */

-	  DeleteDC (hdcTile);

-	  break;

-

-	default:

-	  ErrorF ("winFillSpans - DRAWABLE_PIXMAP - Unknown fillStyle\n");

-	  break;

-	}

-

-      /* Reset clip region */

-      SelectClipRgn (pGCPriv->hdcMem, NULL);

-

-      /* Push the drawable pixmap out of the GC HDC */

-      SelectObject (pGCPriv->hdcMem, hbmpOrig);

-      break;

-      

-    case DRAWABLE_WINDOW:

-

-      SelectClipRgn (pGCPriv->hdc, combined);

-      DeleteObject (combined);

-      combined = NULL;

-

-      /* Branch on fill style */

-      switch (pGC->fillStyle)

-	{

-	case FillSolid:

-

-          ROP16 (pGCPriv->hdc, pGC->alu);

-

-	  if (pDrawable->depth == 1) 

-	    {

-	      if (pGC->fgPixel == 0)

-		hPenOrig = SelectObject (pGCPriv->hdc, 

-					 GetStockObject (BLACK_PEN));

-	      else

-		hPenOrig = SelectObject (pGCPriv->hdc,

-					 GetStockObject (WHITE_PEN));

-	    } 

-	  else 

-	    {

-	      fg = pGC->fgPixel;

-	      TRANSLATE_COLOR (fg);

-	      hPen = CreatePen (PS_SOLID, 0, fg);

-	      hPenOrig = SelectObject (pGCPriv->hdc, hPen);

-	    }

-

-	  while (iSpans--)

-	    {

-	      fullX1 = pPoints->x;

-	      fullY1 = pPoints->y;

-	      fullX2 = fullX1 + (int) *piWidths;

-	      pPoints++;

-	      piWidths++;

-	

-	      if (fullY1 < extentY1 || extentY2 <= fullY1)

-		continue;

-	

-	      if (fullX1 < extentX1)

-		fullX1 = extentX1;

-	      if (fullX2 > extentX2)

-		fullX2 = extentX2;

-	

-	      if (fullX1 >= fullX2)

-		continue;

-	

-	      MoveToEx (pGCPriv->hdc, fullX1, fullY1, NULL);

-	      LineTo (pGCPriv->hdc, fullX2, fullY1);

-	    }

-

-          SetROP2 (pGCPriv->hdc, R2_COPYPEN);

-

-	  /* Give back the Brush */

-	  SelectObject (pGCPriv->hdc, hPenOrig);

-

-	  if (pDrawable->depth != 1)

-	    DeleteObject (hPen);

-	  break;

-

-	case FillOpaqueStippled:

-

-	  pStipple = pGC->stipple;

-	  pStipplePriv = winGetPixmapPriv (pStipple);

-

-	  /* Create a device-dependent bitmap for the stipple */

-	  hBitmap = CreateDIBitmap (pGCPriv->hdc,

-				    (BITMAPINFOHEADER *)pStipplePriv->pbmih,

-				    CBM_INIT,

-				    pStipplePriv->pbBits,

-				    (BITMAPINFO *)pStipplePriv->pbmih,

-				    DIB_RGB_COLORS);

-

-	  /* Create a memory DC to hold the stipple */

-	  hdcStipple = CreateCompatibleDC (pGCPriv->hdc);

-

-	  /* Select the stipple bitmap into the stipple DC */

-	  hbmpOrigStipple = SelectObject (hdcStipple, hBitmap);

-	  if (hbmpOrigStipple == NULL)

-	    FatalError ("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "

-			"SelectObject () failed on hbmpOrigStipple\n");

-

-	  /* Make a temporary copy of the foreground and background colors */

-   	  bg = pGC->bgPixel;

-   	  fg = pGC->fgPixel;

-

-	  /* Translate the depth-dependent colors to Win32 COLORREFs */

-	  TRANSLATE_COLOR (fg);

-	  TRANSLATE_COLOR (bg);

-	  SetTextColor (pGCPriv->hdc, fg);

-	  SetBkColor (pGCPriv->hdc, bg);

-

-	  while (iSpans--)

-	    {

-	      int width = pStipple->drawable.width;

-	      fullX1 = pPoints->x;

-	      fullY1 = pPoints->y;

-	      fullX2 = fullX1 + (int) *piWidths;

-	      pPoints++;

-	      piWidths++;

-	

-	      if (fullY1 < extentY1 || extentY2 <= fullY1)

-		continue;

-	

-	      if (fullX1 < extentX1)

-		fullX1 = extentX1;

-	      if (fullX2 > extentX2)

-		fullX2 = extentX2;

-	

-	      if (fullX1 >= fullX2)

-		continue;

-	

-	      for (iX = fullX1; iX < fullX2; iX += width)

-		{

-		  int xoffset;

-

-		  if ((iX + pStipple->drawable.width) > fullX2)

-		    width = fullX2 - iX;

-		  else

-		    width = pStipple->drawable.width;

-

-		  if (iX == fullX1)

-		    xoffset = (fullX1 - (pDrawable->x + (pGC->patOrg.x % pStipple->drawable.width) - pStipple->drawable.width)) % pStipple->drawable.width;

-		  else

-		    xoffset = 0;

-

-		  if (xoffset + width > pStipple->drawable.width)

-		    width = pStipple->drawable.width - xoffset;

-

-		  BitBlt (pGCPriv->hdc,

-			  iX, fullY1,

-			  width, 1,

-			  hdcStipple,

-			  xoffset,

-			  (fullY1 - (pDrawable->y + (pGC->patOrg.y % pStipple->drawable.height) - pStipple->drawable.height)) % pStipple->drawable.height,

-			  g_copyROP[pGC->alu]);

-		}

-	    }

-

-	  /* Clear the stipple HDC */

-	  SelectObject (hdcStipple, hbmpOrigStipple);

-	  DeleteDC (hdcStipple);

-

-	  /* Delete the device dependent stipple bitmap */

-	  DeleteObject (hBitmap);

-

-	  break;

-

-	case FillStippled:

-	  pStipple = pGC->stipple;

-	  pStipplePriv = winGetPixmapPriv (pStipple);

-

-	  /* Create a device-dependent bitmap for the stipple */

-	  hBitmap = CreateDIBitmap (pGCPriv->hdcMem,

-				    (BITMAPINFOHEADER *)pStipplePriv->pbmih,

-				    CBM_INIT,

-				    pStipplePriv->pbBits,

-				    (BITMAPINFO *)pStipplePriv->pbmih,

-				    DIB_RGB_COLORS);

-

-	  /* Create a memory DC to hold the stipple */

-	  hdcStipple = CreateCompatibleDC (pGCPriv->hdc);

-

-	  /* Select the stipple bitmap into the stipple DC */

-	  hbmpOrigStipple = SelectObject (hdcStipple, hBitmap);

-	  if (hbmpOrigStipple == NULL)

-	    FatalError ("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "

-			"SelectObject () failed on hbmpOrigStipple\n");

-

-	  /* Make a temporary copy of the foreground and background colors */

-   	  bg = pGC->bgPixel;

-   	  fg = pGC->fgPixel;

-

-	  /* Translate the depth-dependent colors to Win32 COLORREFs */

-	  TRANSLATE_COLOR (fg);

-	  TRANSLATE_COLOR (bg);

-

-	  /* this is fudgy, we should only invert on the last one

-	   * We need to get the black/white pixels right in the

-	   * colormap. But yeah ! it's working.. 

-	   */

-	  if (pGC->bgPixel != -1 && pGC->fgPixel != -1) 

-	    {

-	      SetTextColor (pGCPriv->hdc, fg);

-	      SetBkColor (pGCPriv->hdc, bg);

-	      BitBlt (hdcStipple,

-		      0, 0,

-		      pStipple->drawable.width, pStipple->drawable.height,

-		      hdcStipple,

-		      0,0,

-		      0x330008);

-	    } 

-	  else if (pGC->bgPixel == -1) 

-	    {

-	      SetTextColor (pGCPriv->hdc, fg);

-	      SetBkMode (pGCPriv->hdc, TRANSPARENT);

-	      BitBlt (hdcStipple,

-		      0, 0,

-		      pStipple->drawable.width, pStipple->drawable.height,

-		      hdcStipple,

-		      0,0,

-		      0x330008);

-	    } 

-	  else if (pGC->fgPixel == -1) 

-	    {

-	      SetTextColor (pGCPriv->hdc, bg);

-	      SetBkMode (pGCPriv->hdc, TRANSPARENT);

-#if 0

-	      BitBlt (hdcStipple,

-		      0, 0,

-		      pStipple->drawable.width, pStipple->drawable.height,

-		      hdcStipple,

-		      0, 0,

-		      0x330008);

-#endif

-	    }

-

-	  while (iSpans--)

-	    {

- 	      int width = pStipple->drawable.width;

-	      fullX1 = pPoints->x;

-	      fullY1 = pPoints->y;

-	      fullX2 = fullX1 + (int) *piWidths;

-	      pPoints++;

-	      piWidths++;

-	

-	      if (fullY1 < extentY1 || extentY2 <= fullY1)

-		continue;

-	

-	      if (fullX1 < extentX1)

-		fullX1 = extentX1;

-	      if (fullX2 > extentX2)

-		fullX2 = extentX2;

-	

-	      if (fullX1 >= fullX2)

-		continue;

-	

-	      for (iX = fullX1; iX < fullX2; iX += width)

-		{

-		  int xoffset;

-

-		  if ((iX + pStipple->drawable.width) > fullX2)

-		    width = fullX2 - iX;

-		  else

-		    width = pStipple->drawable.width;

-

-		  if (iX == fullX1)

-		    xoffset = (fullX1 - (pDrawable->x + (pGC->patOrg.x % pStipple->drawable.width) - pStipple->drawable.width)) % pStipple->drawable.width;

-		  else

-		    xoffset = 0;

-

-		  if (xoffset + width > pStipple->drawable.width)

-		    width = pStipple->drawable.width - xoffset;

-

-		  BitBlt (pGCPriv->hdc,

-			  iX, fullY1,

-			  width, 1,

-			  hdcStipple,

-			  xoffset,

-			  (fullY1 - (pDrawable->y + (pGC->patOrg.y % pStipple->drawable.height) - pStipple->drawable.height)) % pStipple->drawable.height,

-			  g_copyROP[pGC->alu]);

-		}

-	    }

-

-	  /* Clear the stipple HDC */

-	  SelectObject (hdcStipple, hbmpOrigStipple);

-	  DeleteDC (hdcStipple);

-

-	  /* Delete the device dependent stipple bitmap */

-	  DeleteObject (hBitmap);

-

-	  /* Restore the background mode */

-	  SetBkMode (pGCPriv->hdc, OPAQUE);	  

-	  break;

-

-	case FillTiled:

-

-	  /* Get a pixmap pointer from the tile pointer, and fetch privates  */

-	  pTile = (PixmapPtr) pGC->tile.pixmap;

-	  pTilePriv = winGetPixmapPriv (pTile);

-

-	  /* Select the tile into a DC */

-	  hbmpOrig = SelectObject (pGCPriv->hdcMem, pTilePriv->hBitmap);

-	  if (hbmpOrig == NULL)

-	    FatalError ("winFillSpans - DRAWABLE_WINDOW - FillTiled - "

-			"SelectObject () failed on pTilePriv->hBitmap\n");

-

-	  while (iSpans--)

-	    {

-	      int width = pTile->drawable.width;

-	      fullX1 = pPoints->x;

-	      fullY1 = pPoints->y;

-	      fullX2 = fullX1 + (int) *piWidths;

-	      pPoints++;

-	      piWidths++;

-	

-	      if (fullY1 < extentY1 || extentY2 <= fullY1)

-		continue;

-	

-	      if (fullX1 < extentX1)

-		fullX1 = extentX1;

-	      if (fullX2 > extentX2)

-		fullX2 = extentX2;

-	

-	      if (fullX1 >= fullX2)

-		continue;

-	

-	      for (iX = fullX1; iX < fullX2; iX += width)

-	      	{

-		  int xoffset;

-

-		  if ((iX + pTile->drawable.width) > fullX2)

-		    width = fullX2 - iX;

-		  else

-		    width = pTile->drawable.width;

-

-		  if (iX == fullX1)

-		    xoffset = (fullX1 - (pDrawable->x + (pGC->patOrg.x % pTile->drawable.width) - pTile->drawable.width)) % pTile->drawable.width;

-		  else

-		    xoffset = 0;

-

-		  if (xoffset + width > pTile->drawable.width)

-		    width = pTile->drawable.width - xoffset;

-

-		  BitBlt (pGCPriv->hdc,

-			  iX, fullY1,

-			  width, 1,

-			  pGCPriv->hdcMem,

-			  xoffset,

-			  (fullY1 - (pDrawable->y + (pGC->patOrg.y % pTile->drawable.height) - pTile->drawable.height)) % pTile->drawable.height,

-			  g_copyROP[pGC->alu]);

-		}

-	    }

-

-	  /* Push the tile pixmap out of the memory HDC */

-	  SelectObject (pGCPriv->hdcMem, hbmpOrig);

-	  break;

-

-	default:

-	  ErrorF ("winFillSpans - DRAWABLE_WINDOW - Unknown fillStyle\n");

-	  break;

-	}

-

-      /* Reset clip region */

-      SelectClipRgn (pGCPriv->hdc, NULL);

-      break;

-

-    default:

-      ErrorF ("winFillSpans - Unknown drawable type\n");

-      break;

-    }

-}

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	Harold L Hunt II
+ * 		Alan Hourihane <alanh@fairlite.demon.co.uk>
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+extern void ROP16(HDC hdc, int rop);
+
+#define TRANSLATE_COLOR(color)						\
+{									\
+  if (pDrawable->depth == 15)						\
+    color = ((color & 0x1F) << 19) | ((color & 0x03E0) << 6) |		\
+      ((color & 0xF800) >> 8);						\
+  else if (pDrawable->depth == 16)					\
+    color = ((color & 0x1F) << 19) | ((color & 0x07E0) << 5) |		\
+      ((color & 0xF800) >> 8);						\
+  else if (pDrawable->depth == 24 || pDrawable->depth == 32)		\
+    color = ((color & 0xFF) << 16) | (color & 0xFF00) |			\
+      ((color & 0xFF0000) >> 16);					\
+}
+
+/* See Porting Layer Definition - p. 54 */
+void
+winFillSpansNativeGDI(DrawablePtr pDrawable,
+                      GCPtr pGC,
+                      int iSpans,
+                      DDXPointPtr pPoints, int *piWidths, int fSorted)
+{
+    winGCPriv(pGC);
+    HBITMAP hbmpOrig = NULL, hbmpOrigStipple = NULL;
+    HBITMAP hPenOrig = NULL;
+    HBITMAP hBitmap = NULL;
+    PixmapPtr pPixmap = NULL;
+    winPrivPixmapPtr pPixmapPriv = NULL;
+    PixmapPtr pStipple = NULL;
+    winPrivPixmapPtr pStipplePriv = NULL;
+    PixmapPtr pTile = NULL;
+    winPrivPixmapPtr pTilePriv = NULL;
+    HDC hdcStipple = NULL, hdcTile = NULL;
+    HPEN hPen = NULL;
+    int iX;
+    int fg, bg;
+    RegionPtr pClip = pGC->pCompositeClip;
+    BoxPtr pextent, pbox;
+    int nbox;
+    int extentX1, extentX2, extentY1, extentY2;
+    int fullX1, fullX2, fullY1;
+    HRGN hrgn = NULL, combined = NULL;
+
+    nbox = RegionNumRects(pClip);
+    pbox = RegionRects(pClip);
+
+    if (!nbox)
+        return;
+
+    combined = CreateRectRgn(pbox->x1, pbox->y1, pbox->x2, pbox->y2);
+    nbox--;
+    pbox++;
+
+    while (nbox--) {
+        hrgn = CreateRectRgn(pbox->x1, pbox->y1, pbox->x2, pbox->y2);
+        CombineRgn(combined, combined, hrgn, RGN_OR);
+        DeleteObject(hrgn);
+        hrgn = NULL;
+        pbox++;
+    }
+
+    pextent = RegionExtents(pClip);
+    extentX1 = pextent->x1;
+    extentY1 = pextent->y1;
+    extentX2 = pextent->x2;
+    extentY2 = pextent->y2;
+
+    /* Branch on the type of drawable we have */
+    switch (pDrawable->type) {
+    case DRAWABLE_PIXMAP:
+
+        SelectClipRgn(pGCPriv->hdcMem, combined);
+        DeleteObject(combined);
+        combined = NULL;
+
+        /* Get a pixmap pointer from the drawable pointer, and fetch privates  */
+        pPixmap = (PixmapPtr) pDrawable;
+        pPixmapPriv = winGetPixmapPriv(pPixmap);
+
+        /* Select the drawable pixmap into memory hdc */
+        hbmpOrig = SelectObject(pGCPriv->hdcMem, pPixmapPriv->hBitmap);
+        if (hbmpOrig == NULL)
+            FatalError("winFillSpans - DRAWABLE_PIXMAP - "
+                       "SelectObject () failed on\n\tpPixmapPriv->hBitmap: "
+                       "%08x\n", (unsigned int) pPixmapPriv->hBitmap);
+
+        /* Branch on the fill type */
+        switch (pGC->fillStyle) {
+        case FillSolid:
+
+            ROP16(pGCPriv->hdcMem, pGC->alu);
+
+            if (pDrawable->depth == 1) {
+                if (pGC->fgPixel == 0)
+                    hPenOrig = SelectObject(pGCPriv->hdcMem,
+                                            GetStockObject(BLACK_PEN));
+                else
+                    hPenOrig = SelectObject(pGCPriv->hdcMem,
+                                            GetStockObject(WHITE_PEN));
+            }
+            else {
+                fg = pGC->fgPixel;
+                TRANSLATE_COLOR(fg);
+                hPen = CreatePen(PS_SOLID, 0, fg);
+                hPenOrig = SelectObject(pGCPriv->hdcMem, hPen);
+            }
+
+            while (iSpans--) {
+                fullX1 = pPoints->x;
+                fullY1 = pPoints->y;
+                fullX2 = fullX1 + (int) *piWidths;
+                pPoints++;
+                piWidths++;
+
+                if (fullY1 < extentY1 || extentY2 <= fullY1)
+                    continue;
+
+                if (fullX1 < extentX1)
+                    fullX1 = extentX1;
+                if (fullX2 > extentX2)
+                    fullX2 = extentX2;
+
+                if (fullX1 >= fullX2)
+                    continue;
+
+                MoveToEx(pGCPriv->hdcMem, fullX1, fullY1, NULL);
+                LineTo(pGCPriv->hdcMem, fullX2, fullY1);
+            }
+
+            SetROP2(pGCPriv->hdcMem, R2_COPYPEN);
+
+            /* Give back the Pen */
+            SelectObject(pGCPriv->hdcMem, hPenOrig);
+
+            if (pDrawable->depth != 1)
+                DeleteObject(hPen);
+            break;
+
+        case FillOpaqueStippled:
+
+            pStipple = pGC->stipple;
+            pStipplePriv = winGetPixmapPriv(pStipple);
+
+            /* Create a device-dependent bitmap for the stipple */
+            hBitmap = CreateDIBitmap(pGCPriv->hdcMem,
+                                     (BITMAPINFOHEADER *) pStipplePriv->pbmih,
+                                     CBM_INIT,
+                                     pStipplePriv->pbBits,
+                                     (BITMAPINFO *) pStipplePriv->pbmih,
+                                     DIB_RGB_COLORS);
+
+            /* Create a memory DC to hold the stipple */
+            hdcStipple = CreateCompatibleDC(pGCPriv->hdcMem);
+
+            /* Select the stipple bitmap into the stipple DC */
+            hbmpOrigStipple = SelectObject(hdcStipple, hBitmap);
+            if (hbmpOrigStipple == NULL)
+                FatalError("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "
+                           "SelectObject () failed on hbmpOrigStipple\n");
+
+            /* Make a temporary copy of the foreground and background colors */
+            bg = pGC->bgPixel;
+            fg = pGC->fgPixel;
+
+            /* Translate the depth-dependent colors to Win32 COLORREFs */
+            TRANSLATE_COLOR(fg);
+            TRANSLATE_COLOR(bg);
+            SetTextColor(pGCPriv->hdcMem, fg);
+            SetBkColor(pGCPriv->hdcMem, bg);
+
+            while (iSpans--) {
+                int width = pStipple->drawable.width;
+
+                fullX1 = pPoints->x;
+                fullY1 = pPoints->y;
+                fullX2 = fullX1 + (int) *piWidths;
+                pPoints++;
+                piWidths++;
+
+                if (fullY1 < extentY1 || extentY2 <= fullY1)
+                    continue;
+
+                if (fullX1 < extentX1)
+                    fullX1 = extentX1;
+                if (fullX2 > extentX2)
+                    fullX2 = extentX2;
+
+                if (fullX1 >= fullX2)
+                    continue;
+
+                for (iX = fullX1; iX < fullX2; iX += width) {
+                    int xoffset;
+
+                    if ((iX + pStipple->drawable.width) > fullX2)
+                        width = fullX2 - iX;
+                    else
+                        width = pStipple->drawable.width;
+
+                    if (iX == fullX1)
+                        xoffset =
+                            (fullX1 -
+                             (pDrawable->x +
+                              (pGC->patOrg.x % pStipple->drawable.width) -
+                              pStipple->drawable.width)) %
+                            pStipple->drawable.width;
+                    else
+                        xoffset = 0;
+
+                    if (xoffset + width > pStipple->drawable.width)
+                        width = pStipple->drawable.width - xoffset;
+
+                    BitBlt(pGCPriv->hdcMem,
+                           iX, fullY1,
+                           width, 1,
+                           hdcStipple,
+                           xoffset,
+                           (fullY1 -
+                            (pDrawable->y +
+                             (pGC->patOrg.y % pStipple->drawable.height) -
+                             pStipple->drawable.height)) %
+                           pStipple->drawable.height, g_copyROP[pGC->alu]);
+                }
+            }
+
+            /* Clear the stipple HDC */
+            SelectObject(hdcStipple, hbmpOrigStipple);
+            DeleteDC(hdcStipple);
+
+            /* Delete the device dependent stipple bitmap */
+            DeleteObject(hBitmap);
+
+            break;
+        case FillStippled:
+
+            pStipple = pGC->stipple;
+            pStipplePriv = winGetPixmapPriv(pStipple);
+
+            /* Create a device-dependent bitmap for the stipple */
+            hBitmap = CreateDIBitmap(pGCPriv->hdcMem,
+                                     (BITMAPINFOHEADER *) pStipplePriv->pbmih,
+                                     CBM_INIT,
+                                     pStipplePriv->pbBits,
+                                     (BITMAPINFO *) pStipplePriv->pbmih,
+                                     DIB_RGB_COLORS);
+
+            /* Create a memory DC to hold the stipple */
+            hdcStipple = CreateCompatibleDC(pGCPriv->hdcMem);
+
+            /* Select the stipple bitmap into the stipple DC */
+            hbmpOrigStipple = SelectObject(hdcStipple, hBitmap);
+            if (hbmpOrigStipple == NULL)
+                FatalError("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "
+                           "SelectObject () failed on hbmpOrigStipple\n");
+
+            /* Make a temporary copy of the foreground and background colors */
+            bg = pGC->bgPixel;
+            fg = pGC->fgPixel;
+
+            /* Translate the depth-dependent colors to Win32 COLORREFs */
+            TRANSLATE_COLOR(fg);
+            TRANSLATE_COLOR(bg);
+
+            /* this is fudgy, we should only invert on the last one
+             * We need to get the black/white pixels right in the
+             * colormap. But yeah ! it's working.. 
+             */
+            if (pGC->bgPixel != -1 && pGC->fgPixel != -1) {
+                SetTextColor(pGCPriv->hdcMem, fg);
+                SetBkColor(pGCPriv->hdcMem, bg);
+                BitBlt(hdcStipple,
+                       0, 0,
+                       pStipple->drawable.width, pStipple->drawable.height,
+                       hdcStipple, 0, 0, 0x330008);
+            }
+            else if (pGC->bgPixel == -1) {
+                SetTextColor(pGCPriv->hdcMem, fg);
+                SetBkMode(pGCPriv->hdcMem, TRANSPARENT);
+                BitBlt(hdcStipple,
+                       0, 0,
+                       pStipple->drawable.width, pStipple->drawable.height,
+                       hdcStipple, 0, 0, 0x330008);
+            }
+            else if (pGC->fgPixel == -1) {
+                SetTextColor(pGCPriv->hdcMem, bg);
+                SetBkMode(pGCPriv->hdcMem, TRANSPARENT);
+#if 0
+                BitBlt(hdcStipple,
+                       0, 0,
+                       pStipple->drawable.width, pStipple->drawable.height,
+                       hdcStipple, 0, 0, 0x330008);
+#endif
+            }
+
+            while (iSpans--) {
+                int width = pStipple->drawable.width;
+
+                fullX1 = pPoints->x;
+                fullY1 = pPoints->y;
+                fullX2 = fullX1 + (int) *piWidths;
+                pPoints++;
+                piWidths++;
+
+                if (fullY1 < extentY1 || extentY2 <= fullY1)
+                    continue;
+
+                if (fullX1 < extentX1)
+                    fullX1 = extentX1;
+                if (fullX2 > extentX2)
+                    fullX2 = extentX2;
+
+                if (fullX1 >= fullX2)
+                    continue;
+
+                for (iX = fullX1; iX < fullX2; iX += width) {
+                    int xoffset;
+
+                    if ((iX + pStipple->drawable.width) > fullX2)
+                        width = fullX2 - iX;
+                    else
+                        width = pStipple->drawable.width;
+
+                    if (iX == fullX1)
+                        xoffset =
+                            (fullX1 -
+                             (pDrawable->x +
+                              (pGC->patOrg.x % pStipple->drawable.width) -
+                              pStipple->drawable.width)) %
+                            pStipple->drawable.width;
+                    else
+                        xoffset = 0;
+
+                    if (xoffset + width > pStipple->drawable.width)
+                        width = pStipple->drawable.width - xoffset;
+
+                    BitBlt(pGCPriv->hdcMem,
+                           iX, fullY1,
+                           width, 1,
+                           hdcStipple,
+                           xoffset,
+                           (fullY1 -
+                            (pDrawable->y +
+                             (pGC->patOrg.y % pStipple->drawable.height) -
+                             pStipple->drawable.height)) %
+                           pStipple->drawable.height, g_copyROP[pGC->alu]);
+                }
+            }
+
+            /* Clear the stipple HDC */
+            SelectObject(hdcStipple, hbmpOrigStipple);
+            DeleteDC(hdcStipple);
+
+            /* Delete the device dependent stipple bitmap */
+            DeleteObject(hBitmap);
+
+            /* Restore the background mode */
+            SetBkMode(pGCPriv->hdcMem, OPAQUE);
+            break;
+
+        case FillTiled:
+
+            /* Get a pixmap pointer from the tile pointer, and fetch privates  */
+            pTile = (PixmapPtr) pGC->tile.pixmap;
+            pTilePriv = winGetPixmapPriv(pTile);
+
+            /* Create a memory DC to hold the tile */
+            hdcTile = CreateCompatibleDC(pGCPriv->hdcMem);
+
+            /* Select the tile into a DC */
+            hbmpOrig = SelectObject(hdcTile, pTilePriv->hBitmap);
+            if (hbmpOrig == NULL)
+                FatalError("winFillSpans - DRAWABLE_PIXMAP - FillTiled - "
+                           "SelectObject () failed on pTilePriv->hBitmap\n");
+
+            while (iSpans--) {
+                int width = pTile->drawable.width;
+
+                fullX1 = pPoints->x;
+                fullY1 = pPoints->y;
+                fullX2 = fullX1 + (int) *piWidths;
+                pPoints++;
+                piWidths++;
+
+                if (fullY1 < extentY1 || extentY2 <= fullY1)
+                    continue;
+
+                if (fullX1 < extentX1)
+                    fullX1 = extentX1;
+                if (fullX2 > extentX2)
+                    fullX2 = extentX2;
+
+                if (fullX1 >= fullX2)
+                    continue;
+
+                for (iX = fullX1; iX < fullX2; iX += width) {
+                    int xoffset;
+
+                    if ((iX + pTile->drawable.width) > fullX2)
+                        width = fullX2 - iX;
+                    else
+                        width = pTile->drawable.width;
+
+                    if (iX == fullX1)
+                        xoffset =
+                            (fullX1 -
+                             (pDrawable->x +
+                              (pGC->patOrg.x % pTile->drawable.width) -
+                              pTile->drawable.width)) % pTile->drawable.width;
+                    else
+                        xoffset = 0;
+
+                    if (xoffset + width > pTile->drawable.width)
+                        width = pTile->drawable.width - xoffset;
+
+                    BitBlt(pGCPriv->hdcMem,
+                           iX, fullY1,
+                           width, 1,
+                           hdcTile,
+                           xoffset,
+                           (fullY1 -
+                            (pDrawable->y +
+                             (pGC->patOrg.y % pTile->drawable.height) -
+                             pTile->drawable.height)) % pTile->drawable.height,
+                           g_copyROP[pGC->alu]);
+                }
+            }
+
+            /* Push the tile pixmap out of the memory HDC */
+            SelectObject(hdcTile, hbmpOrig);
+
+            /* Delete the tile */
+            DeleteDC(hdcTile);
+            break;
+
+        default:
+            ErrorF("winFillSpans - DRAWABLE_PIXMAP - Unknown fillStyle\n");
+            break;
+        }
+
+        /* Reset clip region */
+        SelectClipRgn(pGCPriv->hdcMem, NULL);
+
+        /* Push the drawable pixmap out of the GC HDC */
+        SelectObject(pGCPriv->hdcMem, hbmpOrig);
+        break;
+
+    case DRAWABLE_WINDOW:
+
+        SelectClipRgn(pGCPriv->hdc, combined);
+        DeleteObject(combined);
+        combined = NULL;
+
+        /* Branch on fill style */
+        switch (pGC->fillStyle) {
+        case FillSolid:
+
+            ROP16(pGCPriv->hdc, pGC->alu);
+
+            if (pDrawable->depth == 1) {
+                if (pGC->fgPixel == 0)
+                    hPenOrig = SelectObject(pGCPriv->hdc,
+                                            GetStockObject(BLACK_PEN));
+                else
+                    hPenOrig = SelectObject(pGCPriv->hdc,
+                                            GetStockObject(WHITE_PEN));
+            }
+            else {
+                fg = pGC->fgPixel;
+                TRANSLATE_COLOR(fg);
+                hPen = CreatePen(PS_SOLID, 0, fg);
+                hPenOrig = SelectObject(pGCPriv->hdc, hPen);
+            }
+
+            while (iSpans--) {
+                fullX1 = pPoints->x;
+                fullY1 = pPoints->y;
+                fullX2 = fullX1 + (int) *piWidths;
+                pPoints++;
+                piWidths++;
+
+                if (fullY1 < extentY1 || extentY2 <= fullY1)
+                    continue;
+
+                if (fullX1 < extentX1)
+                    fullX1 = extentX1;
+                if (fullX2 > extentX2)
+                    fullX2 = extentX2;
+
+                if (fullX1 >= fullX2)
+                    continue;
+
+                MoveToEx(pGCPriv->hdc, fullX1, fullY1, NULL);
+                LineTo(pGCPriv->hdc, fullX2, fullY1);
+            }
+
+            SetROP2(pGCPriv->hdc, R2_COPYPEN);
+
+            /* Give back the Brush */
+            SelectObject(pGCPriv->hdc, hPenOrig);
+
+            if (pDrawable->depth != 1)
+                DeleteObject(hPen);
+            break;
+
+        case FillOpaqueStippled:
+
+            pStipple = pGC->stipple;
+            pStipplePriv = winGetPixmapPriv(pStipple);
+
+            /* Create a device-dependent bitmap for the stipple */
+            hBitmap = CreateDIBitmap(pGCPriv->hdc,
+                                     (BITMAPINFOHEADER *) pStipplePriv->pbmih,
+                                     CBM_INIT,
+                                     pStipplePriv->pbBits,
+                                     (BITMAPINFO *) pStipplePriv->pbmih,
+                                     DIB_RGB_COLORS);
+
+            /* Create a memory DC to hold the stipple */
+            hdcStipple = CreateCompatibleDC(pGCPriv->hdc);
+
+            /* Select the stipple bitmap into the stipple DC */
+            hbmpOrigStipple = SelectObject(hdcStipple, hBitmap);
+            if (hbmpOrigStipple == NULL)
+                FatalError("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "
+                           "SelectObject () failed on hbmpOrigStipple\n");
+
+            /* Make a temporary copy of the foreground and background colors */
+            bg = pGC->bgPixel;
+            fg = pGC->fgPixel;
+
+            /* Translate the depth-dependent colors to Win32 COLORREFs */
+            TRANSLATE_COLOR(fg);
+            TRANSLATE_COLOR(bg);
+            SetTextColor(pGCPriv->hdc, fg);
+            SetBkColor(pGCPriv->hdc, bg);
+
+            while (iSpans--) {
+                int width = pStipple->drawable.width;
+
+                fullX1 = pPoints->x;
+                fullY1 = pPoints->y;
+                fullX2 = fullX1 + (int) *piWidths;
+                pPoints++;
+                piWidths++;
+
+                if (fullY1 < extentY1 || extentY2 <= fullY1)
+                    continue;
+
+                if (fullX1 < extentX1)
+                    fullX1 = extentX1;
+                if (fullX2 > extentX2)
+                    fullX2 = extentX2;
+
+                if (fullX1 >= fullX2)
+                    continue;
+
+                for (iX = fullX1; iX < fullX2; iX += width) {
+                    int xoffset;
+
+                    if ((iX + pStipple->drawable.width) > fullX2)
+                        width = fullX2 - iX;
+                    else
+                        width = pStipple->drawable.width;
+
+                    if (iX == fullX1)
+                        xoffset =
+                            (fullX1 -
+                             (pDrawable->x +
+                              (pGC->patOrg.x % pStipple->drawable.width) -
+                              pStipple->drawable.width)) %
+                            pStipple->drawable.width;
+                    else
+                        xoffset = 0;
+
+                    if (xoffset + width > pStipple->drawable.width)
+                        width = pStipple->drawable.width - xoffset;
+
+                    BitBlt(pGCPriv->hdc,
+                           iX, fullY1,
+                           width, 1,
+                           hdcStipple,
+                           xoffset,
+                           (fullY1 -
+                            (pDrawable->y +
+                             (pGC->patOrg.y % pStipple->drawable.height) -
+                             pStipple->drawable.height)) %
+                           pStipple->drawable.height, g_copyROP[pGC->alu]);
+                }
+            }
+
+            /* Clear the stipple HDC */
+            SelectObject(hdcStipple, hbmpOrigStipple);
+            DeleteDC(hdcStipple);
+
+            /* Delete the device dependent stipple bitmap */
+            DeleteObject(hBitmap);
+
+            break;
+
+        case FillStippled:
+            pStipple = pGC->stipple;
+            pStipplePriv = winGetPixmapPriv(pStipple);
+
+            /* Create a device-dependent bitmap for the stipple */
+            hBitmap = CreateDIBitmap(pGCPriv->hdcMem,
+                                     (BITMAPINFOHEADER *) pStipplePriv->pbmih,
+                                     CBM_INIT,
+                                     pStipplePriv->pbBits,
+                                     (BITMAPINFO *) pStipplePriv->pbmih,
+                                     DIB_RGB_COLORS);
+
+            /* Create a memory DC to hold the stipple */
+            hdcStipple = CreateCompatibleDC(pGCPriv->hdc);
+
+            /* Select the stipple bitmap into the stipple DC */
+            hbmpOrigStipple = SelectObject(hdcStipple, hBitmap);
+            if (hbmpOrigStipple == NULL)
+                FatalError("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "
+                           "SelectObject () failed on hbmpOrigStipple\n");
+
+            /* Make a temporary copy of the foreground and background colors */
+            bg = pGC->bgPixel;
+            fg = pGC->fgPixel;
+
+            /* Translate the depth-dependent colors to Win32 COLORREFs */
+            TRANSLATE_COLOR(fg);
+            TRANSLATE_COLOR(bg);
+
+            /* this is fudgy, we should only invert on the last one
+             * We need to get the black/white pixels right in the
+             * colormap. But yeah ! it's working.. 
+             */
+            if (pGC->bgPixel != -1 && pGC->fgPixel != -1) {
+                SetTextColor(pGCPriv->hdc, fg);
+                SetBkColor(pGCPriv->hdc, bg);
+                BitBlt(hdcStipple,
+                       0, 0,
+                       pStipple->drawable.width, pStipple->drawable.height,
+                       hdcStipple, 0, 0, 0x330008);
+            }
+            else if (pGC->bgPixel == -1) {
+                SetTextColor(pGCPriv->hdc, fg);
+                SetBkMode(pGCPriv->hdc, TRANSPARENT);
+                BitBlt(hdcStipple,
+                       0, 0,
+                       pStipple->drawable.width, pStipple->drawable.height,
+                       hdcStipple, 0, 0, 0x330008);
+            }
+            else if (pGC->fgPixel == -1) {
+                SetTextColor(pGCPriv->hdc, bg);
+                SetBkMode(pGCPriv->hdc, TRANSPARENT);
+#if 0
+                BitBlt(hdcStipple,
+                       0, 0,
+                       pStipple->drawable.width, pStipple->drawable.height,
+                       hdcStipple, 0, 0, 0x330008);
+#endif
+            }
+
+            while (iSpans--) {
+                int width = pStipple->drawable.width;
+
+                fullX1 = pPoints->x;
+                fullY1 = pPoints->y;
+                fullX2 = fullX1 + (int) *piWidths;
+                pPoints++;
+                piWidths++;
+
+                if (fullY1 < extentY1 || extentY2 <= fullY1)
+                    continue;
+
+                if (fullX1 < extentX1)
+                    fullX1 = extentX1;
+                if (fullX2 > extentX2)
+                    fullX2 = extentX2;
+
+                if (fullX1 >= fullX2)
+                    continue;
+
+                for (iX = fullX1; iX < fullX2; iX += width) {
+                    int xoffset;
+
+                    if ((iX + pStipple->drawable.width) > fullX2)
+                        width = fullX2 - iX;
+                    else
+                        width = pStipple->drawable.width;
+
+                    if (iX == fullX1)
+                        xoffset =
+                            (fullX1 -
+                             (pDrawable->x +
+                              (pGC->patOrg.x % pStipple->drawable.width) -
+                              pStipple->drawable.width)) %
+                            pStipple->drawable.width;
+                    else
+                        xoffset = 0;
+
+                    if (xoffset + width > pStipple->drawable.width)
+                        width = pStipple->drawable.width - xoffset;
+
+                    BitBlt(pGCPriv->hdc,
+                           iX, fullY1,
+                           width, 1,
+                           hdcStipple,
+                           xoffset,
+                           (fullY1 -
+                            (pDrawable->y +
+                             (pGC->patOrg.y % pStipple->drawable.height) -
+                             pStipple->drawable.height)) %
+                           pStipple->drawable.height, g_copyROP[pGC->alu]);
+                }
+            }
+
+            /* Clear the stipple HDC */
+            SelectObject(hdcStipple, hbmpOrigStipple);
+            DeleteDC(hdcStipple);
+
+            /* Delete the device dependent stipple bitmap */
+            DeleteObject(hBitmap);
+
+            /* Restore the background mode */
+            SetBkMode(pGCPriv->hdc, OPAQUE);
+            break;
+
+        case FillTiled:
+
+            /* Get a pixmap pointer from the tile pointer, and fetch privates  */
+            pTile = (PixmapPtr) pGC->tile.pixmap;
+            pTilePriv = winGetPixmapPriv(pTile);
+
+            /* Select the tile into a DC */
+            hbmpOrig = SelectObject(pGCPriv->hdcMem, pTilePriv->hBitmap);
+            if (hbmpOrig == NULL)
+                FatalError("winFillSpans - DRAWABLE_WINDOW - FillTiled - "
+                           "SelectObject () failed on pTilePriv->hBitmap\n");
+
+            while (iSpans--) {
+                int width = pTile->drawable.width;
+
+                fullX1 = pPoints->x;
+                fullY1 = pPoints->y;
+                fullX2 = fullX1 + (int) *piWidths;
+                pPoints++;
+                piWidths++;
+
+                if (fullY1 < extentY1 || extentY2 <= fullY1)
+                    continue;
+
+                if (fullX1 < extentX1)
+                    fullX1 = extentX1;
+                if (fullX2 > extentX2)
+                    fullX2 = extentX2;
+
+                if (fullX1 >= fullX2)
+                    continue;
+
+                for (iX = fullX1; iX < fullX2; iX += width) {
+                    int xoffset;
+
+                    if ((iX + pTile->drawable.width) > fullX2)
+                        width = fullX2 - iX;
+                    else
+                        width = pTile->drawable.width;
+
+                    if (iX == fullX1)
+                        xoffset =
+                            (fullX1 -
+                             (pDrawable->x +
+                              (pGC->patOrg.x % pTile->drawable.width) -
+                              pTile->drawable.width)) % pTile->drawable.width;
+                    else
+                        xoffset = 0;
+
+                    if (xoffset + width > pTile->drawable.width)
+                        width = pTile->drawable.width - xoffset;
+
+                    BitBlt(pGCPriv->hdc,
+                           iX, fullY1,
+                           width, 1,
+                           pGCPriv->hdcMem,
+                           xoffset,
+                           (fullY1 -
+                            (pDrawable->y +
+                             (pGC->patOrg.y % pTile->drawable.height) -
+                             pTile->drawable.height)) % pTile->drawable.height,
+                           g_copyROP[pGC->alu]);
+                }
+            }
+
+            /* Push the tile pixmap out of the memory HDC */
+            SelectObject(pGCPriv->hdcMem, hbmpOrig);
+            break;
+
+        default:
+            ErrorF("winFillSpans - DRAWABLE_WINDOW - Unknown fillStyle\n");
+            break;
+        }
+
+        /* Reset clip region */
+        SelectClipRgn(pGCPriv->hdc, NULL);
+        break;
+
+    default:
+        ErrorF("winFillSpans - Unknown drawable type\n");
+        break;
+    }
+}
diff --git a/xorg-server/hw/xwin/wingc.c b/xorg-server/hw/xwin/wingc.c
index a131264b9..8b7c7040c 100644
--- a/xorg-server/hw/xwin/wingc.c
+++ b/xorg-server/hw/xwin/wingc.c
@@ -1,251 +1,240 @@
-/*

- *Copyright (C) 2001-2004 Harold L Hunt II 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 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 HAROLD L HUNT II BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of Harold L Hunt II

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from Harold L Hunt II.

- *

- * Authors:	Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-void

-winPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, int dx, int dy, int xOrg, int yOrg);

-

-

-/*

- * Local prototypes

- */

-

-#if 0

-static void

-winChangeGCNativeGDI (GCPtr pGC, unsigned long ulChanges);

-#endif

-

-static void

-winValidateGCNativeGDI (GCPtr pGC,

-			unsigned long changes,

-			DrawablePtr pDrawable);

-

-#if 0

-static void

-winCopyGCNativeGDI (GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst);

-#endif

-

-static void

-winDestroyGCNativeGDI (GCPtr pGC);

-

-#if 0

-static void

-winChangeClipNativeGDI (GCPtr pGC, int nType, pointer pValue, int nRects);

-

-static void

-winDestroyClipNativeGDI (GCPtr pGC);

-

-static void

-winCopyClipNativeGDI (GCPtr pGCdst, GCPtr pGCsrc);

-#endif

-

-#if 0

-/* GC Handling Routines */

-const GCFuncs winGCFuncs = {

-  winValidateGCNativeGDI,

-  winChangeGCNativeGDI,

-  winCopyGCNativeGDI,

-  winDestroyGCNativeGDI,

-  winChangeClipNativeGDI,

-  winDestroyClipNativeGDI,

-  winCopyClipNativeGDI,

-};

-#else

-const GCFuncs winGCFuncs = {

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

-#if 0

-  winImageGlyphBltNativeGDI,

-  winPolyGlyphBltNativeGDI,

-#else

-  miImageGlyphBlt,

-  miPolyGlyphBlt,

-#endif

-  miPushPixels,

-};

-

-

-/* See Porting Layer Definition - p. 45 */

-/* See mfb/mfbgc.c - mfbCreateGC() */

-/* See Strategies for Porting - pp. 15, 16 */

-Bool

-winCreateGCNativeGDI (GCPtr pGC)

-{

-  winPrivGCPtr		pGCPriv = NULL;

-  winPrivScreenPtr	pScreenPriv = NULL;

-

-#if 0

-  ErrorF ("winCreateGCNativeGDI - depth: %d\n",

-	  pGC->depth);

-#endif

-

-  pGC->ops = (GCOps *) &winGCOps;

-  pGC->funcs = (GCFuncs *) &winGCFuncs;

-

-  /* 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;

-    }

-

-  /* 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);

-

-  return TRUE;

-}

-

-

-#if 0

-/* See Porting Layer Definition - p. 45 */

-static void

-winChangeGCNativeGDI (GCPtr pGC, unsigned long ulChanges)

-{

-#if 0

-  ErrorF ("winChangeGCNativeGDI () - Doing nothing\n");

-#endif

-}

-#endif

-

-

-static void

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

-/* See Porting Layer Definition - p. 46 */

-static void

-winCopyGCNativeGDI (GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst)

-{

-

-}

-#endif

-

-

-/* See Porting Layer Definition - p. 46 */

-static void

-winDestroyGCNativeGDI (GCPtr pGC)

-{

-  winGCPriv(pGC);

-  winScreenPriv(pGC->pScreen);

-

-  if (pGC->freeCompClip)

-	RegionDestroy(pGC->pCompositeClip);

-

-  /* 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;

-    }

-

-  /* 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)

-{

-

-}

-

-

-/* See Porting Layer Definition - p. 47 */

-static void

-winDestroyClipNativeGDI (GCPtr pGC)

-{

-

-}

-

-

-/* See Porting Layer Definition - p. 47 */

-static void

-winCopyClipNativeGDI (GCPtr pGCdst, GCPtr pGCsrc)

-{

-

-}

-#endif

+/*
+ *Copyright (C) 2001-2004 Harold L Hunt II 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 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 HAROLD L HUNT II BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of Harold L Hunt II
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from Harold L Hunt II.
+ *
+ * Authors:	Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+void
+
+winPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, int dx,
+              int dy, int xOrg, int yOrg);
+
+/*
+ * Local prototypes
+ */
+
+#if 0
+static void
+ winChangeGCNativeGDI(GCPtr pGC, unsigned long ulChanges);
+#endif
+
+static void
+
+winValidateGCNativeGDI(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable);
+
+#if 0
+static void
+ winCopyGCNativeGDI(GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst);
+#endif
+
+static void
+ winDestroyGCNativeGDI(GCPtr pGC);
+
+#if 0
+static void
+ winChangeClipNativeGDI(GCPtr pGC, int nType, pointer pValue, int nRects);
+
+static void
+ winDestroyClipNativeGDI(GCPtr pGC);
+
+static void
+ winCopyClipNativeGDI(GCPtr pGCdst, GCPtr pGCsrc);
+#endif
+
+#if 0
+/* GC Handling Routines */
+const GCFuncs winGCFuncs = {
+    winValidateGCNativeGDI,
+    winChangeGCNativeGDI,
+    winCopyGCNativeGDI,
+    winDestroyGCNativeGDI,
+    winChangeClipNativeGDI,
+    winDestroyClipNativeGDI,
+    winCopyClipNativeGDI,
+};
+#else
+const GCFuncs winGCFuncs = {
+    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,
+#if 0
+    winImageGlyphBltNativeGDI,
+    winPolyGlyphBltNativeGDI,
+#else
+    miImageGlyphBlt,
+    miPolyGlyphBlt,
+#endif
+    miPushPixels,
+};
+
+/* See Porting Layer Definition - p. 45 */
+/* See mfb/mfbgc.c - mfbCreateGC() */
+/* See Strategies for Porting - pp. 15, 16 */
+Bool
+winCreateGCNativeGDI(GCPtr pGC)
+{
+    winPrivGCPtr pGCPriv = NULL;
+    winPrivScreenPtr pScreenPriv = NULL;
+
+#if 0
+    ErrorF("winCreateGCNativeGDI - depth: %d\n", pGC->depth);
+#endif
+
+    pGC->ops = (GCOps *) & winGCOps;
+    pGC->funcs = (GCFuncs *) & winGCFuncs;
+
+    /* 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;
+    }
+
+    /* 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);
+
+    return TRUE;
+}
+
+#if 0
+/* See Porting Layer Definition - p. 45 */
+static void
+winChangeGCNativeGDI(GCPtr pGC, unsigned long ulChanges)
+{
+#if 0
+    ErrorF("winChangeGCNativeGDI () - Doing nothing\n");
+#endif
+}
+#endif
+
+static void
+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 0
+/* See Porting Layer Definition - p. 46 */
+static void
+winCopyGCNativeGDI(GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst)
+{
+
+}
+#endif
+
+/* See Porting Layer Definition - p. 46 */
+static void
+winDestroyGCNativeGDI(GCPtr pGC)
+{
+    winGCPriv(pGC);
+    winScreenPriv(pGC->pScreen);
+
+    if (pGC->freeCompClip)
+        RegionDestroy(pGC->pCompositeClip);
+
+    /* 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;
+    }
+
+    /* 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)
+{
+
+}
+
+/* See Porting Layer Definition - p. 47 */
+static void
+winDestroyClipNativeGDI(GCPtr pGC)
+{
+
+}
+
+/* See Porting Layer Definition - p. 47 */
+static void
+winCopyClipNativeGDI(GCPtr pGCdst, GCPtr pGCsrc)
+{
+
+}
+#endif
diff --git a/xorg-server/hw/xwin/wingetsp.c b/xorg-server/hw/xwin/wingetsp.c
index ab4c181c7..049e2c939 100644
--- a/xorg-server/hw/xwin/wingetsp.c
+++ b/xorg-server/hw/xwin/wingetsp.c
@@ -1,184 +1,171 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	Harold L Hunt II

- * 		Alan Hourihane <alanh@fairlite.demon.co.uk>

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-/* See Porting Layer Definition - p. 55 */

-void

-winGetSpansNativeGDI (DrawablePtr	pDrawable, 

-		      int		nMax, 

-		      DDXPointPtr	pPoints, 

-		      int		*piWidths, 

-		      int		iSpans, 

-		      char		*pDsts)

-{

-  PixmapPtr		pPixmap = NULL;

-  winPrivPixmapPtr	pPixmapPriv = NULL;

-  int			iSpan;

-  DDXPointPtr		pPoint = NULL;

-  int			*piWidth = NULL;

-  char			*pDst = pDsts;

-  HBITMAP		hbmpWindow, hbmpOrig, hbmpOrig1;

-  BYTE			*pbWindow = NULL;

-  HDC			hdcMem, hdcMem1;

-  ScreenPtr		pScreen = pDrawable->pScreen;

-  winScreenPriv(pScreen);

-

-  /* Branch on the drawable type */

-  switch (pDrawable->type)

-    {

-    case DRAWABLE_PIXMAP:

-#if 0

-      ErrorF ("winGetSpans - DRAWABLE_PIXMAP %08x\n",

-	      pDrawable);

-#endif

-

-      pPixmap = (PixmapPtr) pDrawable;

-      pPixmapPriv = winGetPixmapPriv (pPixmap);

-

-      /* Open a memory HDC */

-      hdcMem1 = CreateCompatibleDC (NULL);

-      hdcMem = CreateCompatibleDC (NULL);

-

-      /* Select the drawable pixmap into a DC */

-      hbmpOrig1 = SelectObject (hdcMem1, pPixmapPriv->hBitmap);

-

-      if (hbmpOrig1 == NULL)

-	FatalError ("winGetSpans - DRAWABLE_PIXMAP - SelectObject () "

-		    "failed on pPixmapPriv->hBitmap\n");

-

-      /* Loop through spans */

-      for (iSpan = 0; iSpan < iSpans; ++iSpan)

-	{

-	  pPoint = pPoints + iSpan;

-	  piWidth = piWidths + iSpan;

-

-      	  hbmpWindow = winCreateDIBNativeGDI (*piWidth, 1,

-					      pDrawable->depth,

-					      &pbWindow,

-					      NULL);

-

-      	  hbmpOrig = SelectObject (hdcMem, hbmpWindow);

-			       

-          /* Transfer the window bits to the window bitmap */

-          BitBlt (hdcMem,

-		  0, 0,

-		  *piWidth, 1, 

-		  hdcMem1,

-		  pPoint->x, pPoint->y,

-		  SRCCOPY);

-

-	  memcpy (pDst,

-		  (char*) pbWindow,

-		  PixmapBytePad (*piWidth, pDrawable->depth));

-

-      	  /* Pop the window bitmap out of the HDC and delete the bitmap */

-      	  SelectObject (hdcMem, hbmpOrig);

-	  DeleteObject (hbmpWindow);

-

-#if 0

-	  ErrorF ("(%dx%dx%d) (%d,%d) w: %d\n",

-		  pDrawable->width, pDrawable->height, pDrawable->depth,

-		  pPoint->x, pPoint->y, *piWidth);

-#endif

-

-	  /* Calculate offset of next bit destination */

-	  pDst += PixmapBytePad (*piWidth, pDrawable->depth);

-	}

-      

-      /* Pop the pixmap's bitmap out of the HDC */

-      SelectObject (hdcMem1, hbmpOrig1);

-

-      /* Delete the HDCs */

-      DeleteDC (hdcMem1);

-      DeleteDC (hdcMem);

-      break;

-

-    case DRAWABLE_WINDOW:

-#if 0

-      ErrorF ("winGetSpans - DRAWABLE_WINDOW\n");

-#endif

-

-      /* Open a memory HDC */

-      hdcMem = CreateCompatibleDC (NULL);

-

-      /* Loop through spans */

-      for (iSpan = 0; iSpan < iSpans; ++iSpan)

-	{

-	  pPoint = pPoints + iSpan;

-	  piWidth = piWidths + iSpan;

-

-      	  hbmpWindow = winCreateDIBNativeGDI (*piWidth, 1,

-					      pDrawable->depth,

-					      &pbWindow,

-					      NULL);

-

-      	  hbmpOrig = SelectObject (hdcMem, hbmpWindow);

-

-          /* Transfer the window bits to the window bitmap */

-          BitBlt (hdcMem,

-		  0, 0,

-		  *piWidth, 1, 

-		  pScreenPriv->hdcScreen,

-		  pPoint->x, pPoint->y,

-		  SRCCOPY);

-

-	  memcpy (pDst,

-		  (char*) pbWindow,

-		  PixmapBytePad (*piWidth, pDrawable->depth));

-

-      	  /* Pop the window bitmap out of the HDC */

-      	  SelectObject (hdcMem, hbmpOrig);

-

-	  DeleteObject (hbmpWindow);

-

-#if 0

-	  ErrorF ("(%dx%dx%d) (%d,%d) w: %d\n",

-		  pDrawable->width, pDrawable->height, pDrawable->depth,

-		  pPoint->x, pPoint->y, *piWidth);

-#endif

-

-	  /* Calculate offset of next bit destination */

-	  pDst += PixmapBytePad (*piWidth, pDrawable->depth);

-	}

-

-      /* Delete the window bitmap */

-      DeleteDC (hdcMem);

-      break;

-

-    default:

-      FatalError ("winGetSpans - Unknown drawable type\n");

-      break;

-    }

-}

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	Harold L Hunt II
+ * 		Alan Hourihane <alanh@fairlite.demon.co.uk>
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+/* See Porting Layer Definition - p. 55 */
+void
+winGetSpansNativeGDI(DrawablePtr pDrawable,
+                     int nMax,
+                     DDXPointPtr pPoints,
+                     int *piWidths, int iSpans, char *pDsts)
+{
+    PixmapPtr pPixmap = NULL;
+    winPrivPixmapPtr pPixmapPriv = NULL;
+    int iSpan;
+    DDXPointPtr pPoint = NULL;
+    int *piWidth = NULL;
+    char *pDst = pDsts;
+    HBITMAP hbmpWindow, hbmpOrig, hbmpOrig1;
+    BYTE *pbWindow = NULL;
+    HDC hdcMem, hdcMem1;
+    ScreenPtr pScreen = pDrawable->pScreen;
+
+    winScreenPriv(pScreen);
+
+    /* Branch on the drawable type */
+    switch (pDrawable->type) {
+    case DRAWABLE_PIXMAP:
+#if 0
+        ErrorF("winGetSpans - DRAWABLE_PIXMAP %08x\n", pDrawable);
+#endif
+
+        pPixmap = (PixmapPtr) pDrawable;
+        pPixmapPriv = winGetPixmapPriv(pPixmap);
+
+        /* Open a memory HDC */
+        hdcMem1 = CreateCompatibleDC(NULL);
+        hdcMem = CreateCompatibleDC(NULL);
+
+        /* Select the drawable pixmap into a DC */
+        hbmpOrig1 = SelectObject(hdcMem1, pPixmapPriv->hBitmap);
+
+        if (hbmpOrig1 == NULL)
+            FatalError("winGetSpans - DRAWABLE_PIXMAP - SelectObject () "
+                       "failed on pPixmapPriv->hBitmap\n");
+
+        /* Loop through spans */
+        for (iSpan = 0; iSpan < iSpans; ++iSpan) {
+            pPoint = pPoints + iSpan;
+            piWidth = piWidths + iSpan;
+
+            hbmpWindow = winCreateDIBNativeGDI(*piWidth, 1,
+                                               pDrawable->depth,
+                                               &pbWindow, NULL);
+
+            hbmpOrig = SelectObject(hdcMem, hbmpWindow);
+
+            /* Transfer the window bits to the window bitmap */
+            BitBlt(hdcMem,
+                   0, 0, *piWidth, 1, hdcMem1, pPoint->x, pPoint->y, SRCCOPY);
+
+            memcpy(pDst,
+                   (char *) pbWindow,
+                   PixmapBytePad(*piWidth, pDrawable->depth));
+
+            /* Pop the window bitmap out of the HDC and delete the bitmap */
+            SelectObject(hdcMem, hbmpOrig);
+            DeleteObject(hbmpWindow);
+
+#if 0
+            ErrorF("(%dx%dx%d) (%d,%d) w: %d\n",
+                   pDrawable->width, pDrawable->height, pDrawable->depth,
+                   pPoint->x, pPoint->y, *piWidth);
+#endif
+
+            /* Calculate offset of next bit destination */
+            pDst += PixmapBytePad(*piWidth, pDrawable->depth);
+        }
+
+        /* Pop the pixmap's bitmap out of the HDC */
+        SelectObject(hdcMem1, hbmpOrig1);
+
+        /* Delete the HDCs */
+        DeleteDC(hdcMem1);
+        DeleteDC(hdcMem);
+        break;
+
+    case DRAWABLE_WINDOW:
+#if 0
+        ErrorF("winGetSpans - DRAWABLE_WINDOW\n");
+#endif
+
+        /* Open a memory HDC */
+        hdcMem = CreateCompatibleDC(NULL);
+
+        /* Loop through spans */
+        for (iSpan = 0; iSpan < iSpans; ++iSpan) {
+            pPoint = pPoints + iSpan;
+            piWidth = piWidths + iSpan;
+
+            hbmpWindow = winCreateDIBNativeGDI(*piWidth, 1,
+                                               pDrawable->depth,
+                                               &pbWindow, NULL);
+
+            hbmpOrig = SelectObject(hdcMem, hbmpWindow);
+
+            /* Transfer the window bits to the window bitmap */
+            BitBlt(hdcMem,
+                   0, 0,
+                   *piWidth, 1,
+                   pScreenPriv->hdcScreen, pPoint->x, pPoint->y, SRCCOPY);
+
+            memcpy(pDst,
+                   (char *) pbWindow,
+                   PixmapBytePad(*piWidth, pDrawable->depth));
+
+            /* Pop the window bitmap out of the HDC */
+            SelectObject(hdcMem, hbmpOrig);
+
+            DeleteObject(hbmpWindow);
+
+#if 0
+            ErrorF("(%dx%dx%d) (%d,%d) w: %d\n",
+                   pDrawable->width, pDrawable->height, pDrawable->depth,
+                   pPoint->x, pPoint->y, *piWidth);
+#endif
+
+            /* Calculate offset of next bit destination */
+            pDst += PixmapBytePad(*piWidth, pDrawable->depth);
+        }
+
+        /* Delete the window bitmap */
+        DeleteDC(hdcMem);
+        break;
+
+    default:
+        FatalError("winGetSpans - Unknown drawable type\n");
+        break;
+    }
+}
diff --git a/xorg-server/hw/xwin/winkeybd.c b/xorg-server/hw/xwin/winkeybd.c
index 0496c40ab..2ffb9a943 100644
--- a/xorg-server/hw/xwin/winkeybd.c
+++ b/xorg-server/hw/xwin/winkeybd.c
@@ -31,7 +31,6 @@
  *		Harold L Hunt II
  */
 
-
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
@@ -49,12 +48,10 @@ static Bool g_winKeyState[NUM_KEYCODES];
  */
 
 static void
-winKeybdBell (int iPercent, DeviceIntPtr pDeviceInt,
-	      pointer pCtrl, int iClass);
+ winKeybdBell(int iPercent, DeviceIntPtr pDeviceInt, pointer pCtrl, int iClass);
 
 static void
-winKeybdCtrl (DeviceIntPtr pDevice, KeybdCtrl *pCtrl);
-
+ winKeybdCtrl(DeviceIntPtr pDevice, KeybdCtrl * pCtrl);
 
 /* 
  * Translate a Windows WM_[SYS]KEY(UP/DOWN) message
@@ -66,14 +63,14 @@ winKeybdCtrl (DeviceIntPtr pDevice, KeybdCtrl *pCtrl);
  */
 
 void
-winTranslateKey (WPARAM wParam, LPARAM lParam, int *piScanCode)
+winTranslateKey(WPARAM wParam, LPARAM lParam, int *piScanCode)
 {
-  int		iKeyFixup = g_iKeyMap[wParam * WIN_KEYMAP_COLS + 1];
-  int		iKeyFixupEx = g_iKeyMap[wParam * WIN_KEYMAP_COLS + 2];
-  int		iParam = HIWORD (lParam);
-  int		iParamScanCode = LOBYTE (iParam);
+    int iKeyFixup = g_iKeyMap[wParam * WIN_KEYMAP_COLS + 1];
+    int iKeyFixupEx = g_iKeyMap[wParam * WIN_KEYMAP_COLS + 2];
+    int iParam = HIWORD(lParam);
+    int iParamScanCode = LOBYTE(iParam);
 
-  winDebug("winTranslateKey: wParam %08x lParam %08x\n", wParam, lParam);
+    winDebug("winTranslateKey: wParam %08x lParam %08x\n", wParam, lParam);
 
 /* WM_ key messages faked by Vista speech recognition (WSR) don't have a
  * scan code.
@@ -82,129 +79,118 @@ winTranslateKey (WPARAM wParam, LPARAM lParam, int *piScanCode)
  * System.Windows.Forms.SendKeys.SendWait(), which appears always to give a
  * scan code of 1
  */
-  if (iParamScanCode <= 1)
-    {
-      if (VK_PRIOR <= wParam && wParam <= VK_DOWN)
-        /* Trigger special case table to translate to extended
-         * keycode, otherwise if num_lock is on, we can get keypad
-         * numbers instead of navigation keys. */
-        iParam |= KF_EXTENDED;
-      else
-        iParamScanCode = MapVirtualKeyEx(wParam,
-                         /*MAPVK_VK_TO_VSC*/0,
-                         GetKeyboardLayout(0));
+    if (iParamScanCode <= 1) {
+        if (VK_PRIOR <= wParam && wParam <= VK_DOWN)
+            /* Trigger special case table to translate to extended
+             * keycode, otherwise if num_lock is on, we can get keypad
+             * numbers instead of navigation keys. */
+            iParam |= KF_EXTENDED;
+        else
+            iParamScanCode = MapVirtualKeyEx(wParam,
+                                             /*MAPVK_VK_TO_VSC */ 0,
+                                             GetKeyboardLayout(0));
     }
 
-  /* Branch on special extended, special non-extended, or normal key */
-  if ((iParam & KF_EXTENDED) && iKeyFixupEx)
-    *piScanCode = iKeyFixupEx;
-  else if (iKeyFixup)
-    *piScanCode = iKeyFixup;
-  else if (wParam == 0 && iParamScanCode == 0x70)
-    *piScanCode = KEY_HKTG;
-  else
-    switch (iParamScanCode)
-    {
-      case 0x70:
+    /* Branch on special extended, special non-extended, or normal key */
+    if ((iParam & KF_EXTENDED) && iKeyFixupEx)
+        *piScanCode = iKeyFixupEx;
+    else if (iKeyFixup)
+        *piScanCode = iKeyFixup;
+    else if (wParam == 0 && iParamScanCode == 0x70)
         *piScanCode = KEY_HKTG;
-        break;
-      case 0x73:
-        *piScanCode = KEY_BSlash2;
-        break;
-      default: 
-        *piScanCode = iParamScanCode;
-        break;
-    }
+    else
+        switch (iParamScanCode) {
+        case 0x70:
+            *piScanCode = KEY_HKTG;
+            break;
+        case 0x73:
+            *piScanCode = KEY_BSlash2;
+            break;
+        default:
+            *piScanCode = iParamScanCode;
+            break;
+        }
 }
 
-
 /* Ring the keyboard bell (system speaker on PCs) */
 static void
-winKeybdBell (int iPercent, DeviceIntPtr pDeviceInt,
-	      pointer pCtrl, int iClass)
+winKeybdBell(int iPercent, DeviceIntPtr pDeviceInt, pointer pCtrl, int iClass)
 {
-  /*
-   * We can't use Beep () here because it uses the PC speaker
-   * on NT/2000.  MessageBeep (MB_OK) will play the default system
-   * sound on systems with a sound card or it will beep the PC speaker
-   * on systems that do not have a sound card.
-   */
-  MessageBeep (MB_OK);
+    /*
+     * We can't use Beep () here because it uses the PC speaker
+     * on NT/2000.  MessageBeep (MB_OK) will play the default system
+     * sound on systems with a sound card or it will beep the PC speaker
+     * on systems that do not have a sound card.
+     */
+    MessageBeep(MB_OK);
 }
 
-
 /* Change some keyboard configuration parameters */
 static void
-winKeybdCtrl (DeviceIntPtr pDevice, KeybdCtrl *pCtrl)
+winKeybdCtrl(DeviceIntPtr pDevice, KeybdCtrl * pCtrl)
 {
 }
 
-
 /* 
  * See Porting Layer Definition - p. 18
  * winKeybdProc is known as a DeviceProc.
  */
 
 int
-winKeybdProc (DeviceIntPtr pDeviceInt, int iState)
+winKeybdProc(DeviceIntPtr pDeviceInt, int iState)
 {
-  DevicePtr		pDevice = (DevicePtr) pDeviceInt;
-  XkbSrvInfoPtr       xkbi;
-  XkbControlsPtr      ctrl;
+    DevicePtr pDevice = (DevicePtr) pDeviceInt;
+    XkbSrvInfoPtr xkbi;
+    XkbControlsPtr ctrl;
 
-  switch (iState)
-    {
+    switch (iState) {
     case DEVICE_INIT:
-      winConfigKeyboard (pDeviceInt);
-
-      /* FIXME: Maybe we should use winGetKbdLeds () here? */
-      defaultKeyboardControl.leds = g_winInfo.keyboard.leds;
-
-      winErrorFVerb(2, "Rules = \"%s\" Model = \"%s\" Layout = \"%s\""
-                    " Variant = \"%s\" Options = \"%s\"\n",
-                    g_winInfo.xkb.rules ? g_winInfo.xkb.rules : "none",
-                    g_winInfo.xkb.model ? g_winInfo.xkb.model : "none",
-                    g_winInfo.xkb.layout ? g_winInfo.xkb.layout : "none",
-                    g_winInfo.xkb.variant ? g_winInfo.xkb.variant : "none",
-                    g_winInfo.xkb.options ? g_winInfo.xkb.options : "none");
-
-      InitKeyboardDeviceStruct (pDeviceInt,
-                                &g_winInfo.xkb,
-                                winKeybdBell,
-                                winKeybdCtrl);
-
-      xkbi = pDeviceInt->key->xkbInfo;
-      if ((xkbi != NULL) && (xkbi->desc != NULL))
-        {
-          ctrl = xkbi->desc->ctrls;
-          ctrl->repeat_delay = g_winInfo.keyboard.delay;
-          ctrl->repeat_interval = 1000/g_winInfo.keyboard.rate;
+        winConfigKeyboard(pDeviceInt);
+
+        /* FIXME: Maybe we should use winGetKbdLeds () here? */
+        defaultKeyboardControl.leds = g_winInfo.keyboard.leds;
+
+        winErrorFVerb(2, "Rules = \"%s\" Model = \"%s\" Layout = \"%s\""
+                      " Variant = \"%s\" Options = \"%s\"\n",
+                      g_winInfo.xkb.rules ? g_winInfo.xkb.rules : "none",
+                      g_winInfo.xkb.model ? g_winInfo.xkb.model : "none",
+                      g_winInfo.xkb.layout ? g_winInfo.xkb.layout : "none",
+                      g_winInfo.xkb.variant ? g_winInfo.xkb.variant : "none",
+                      g_winInfo.xkb.options ? g_winInfo.xkb.options : "none");
+
+        InitKeyboardDeviceStruct(pDeviceInt,
+                                 &g_winInfo.xkb, winKeybdBell, winKeybdCtrl);
+
+        xkbi = pDeviceInt->key->xkbInfo;
+        if ((xkbi != NULL) && (xkbi->desc != NULL)) {
+            ctrl = xkbi->desc->ctrls;
+            ctrl->repeat_delay = g_winInfo.keyboard.delay;
+            ctrl->repeat_interval = 1000 / g_winInfo.keyboard.rate;
         }
-      else
-        {
-          winErrorFVerb (1, "winKeybdProc - Error initializing keyboard AutoRepeat\n");
+        else {
+            winErrorFVerb(1,
+                          "winKeybdProc - Error initializing keyboard AutoRepeat\n");
         }
 
-      break;
-      
-    case DEVICE_ON: 
-      pDevice->on = TRUE;
+        break;
 
-      // immediately copy the state of this keyboard device to the VCK
-      // (which otherwise happens lazily after the first keypress)
-      CopyKeyClass(pDeviceInt, inputInfo.keyboard);
-      break;
+    case DEVICE_ON:
+        pDevice->on = TRUE;
+
+        // immediately copy the state of this keyboard device to the VCK
+        // (which otherwise happens lazily after the first keypress)
+        CopyKeyClass(pDeviceInt, inputInfo.keyboard);
+        break;
 
     case DEVICE_CLOSE:
-    case DEVICE_OFF: 
-      pDevice->on = FALSE;
-      break;
+    case DEVICE_OFF:
+        pDevice->on = FALSE;
+        break;
     }
 
-  return Success;
+    return Success;
 }
 
-
 /*
  * Detect current mode key states upon server startup.
  *
@@ -213,38 +199,33 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState)
  */
 
 void
-winInitializeModeKeyStates (void)
+winInitializeModeKeyStates(void)
 {
-  /* Restore NumLock */
-  if (GetKeyState (VK_NUMLOCK) & 0x0001)
-    {
-      winSendKeyEvent (KEY_NumLock, TRUE);
-      winSendKeyEvent (KEY_NumLock, FALSE);
+    /* Restore NumLock */
+    if (GetKeyState(VK_NUMLOCK) & 0x0001) {
+        winSendKeyEvent(KEY_NumLock, TRUE);
+        winSendKeyEvent(KEY_NumLock, FALSE);
     }
 
-  /* Restore CapsLock */
-  if (GetKeyState (VK_CAPITAL) & 0x0001)
-    {
-      winSendKeyEvent (KEY_CapsLock, TRUE);
-      winSendKeyEvent (KEY_CapsLock, FALSE);
+    /* Restore CapsLock */
+    if (GetKeyState(VK_CAPITAL) & 0x0001) {
+        winSendKeyEvent(KEY_CapsLock, TRUE);
+        winSendKeyEvent(KEY_CapsLock, FALSE);
     }
 
-  /* Restore ScrollLock */
-  if (GetKeyState (VK_SCROLL) & 0x0001)
-    {
-      winSendKeyEvent (KEY_ScrollLock, TRUE);
-      winSendKeyEvent (KEY_ScrollLock, FALSE);
+    /* Restore ScrollLock */
+    if (GetKeyState(VK_SCROLL) & 0x0001) {
+        winSendKeyEvent(KEY_ScrollLock, TRUE);
+        winSendKeyEvent(KEY_ScrollLock, FALSE);
     }
 
-  /* Restore KanaLock */
-  if (GetKeyState (VK_KANA) & 0x0001)
-    {
-      winSendKeyEvent (KEY_HKTG, TRUE);
-      winSendKeyEvent (KEY_HKTG, FALSE);
+    /* Restore KanaLock */
+    if (GetKeyState(VK_KANA) & 0x0001) {
+        winSendKeyEvent(KEY_HKTG, TRUE);
+        winSendKeyEvent(KEY_HKTG, FALSE);
     }
 }
 
-
 /*
  * Upon regaining the keyboard focus we must
  * resynchronize our internal mode key states
@@ -252,234 +233,214 @@ winInitializeModeKeyStates (void)
  */
 
 void
-winRestoreModeKeyStates (void)
+winRestoreModeKeyStates(void)
 {
-  DWORD			dwKeyState;
-  BOOL			processEvents = TRUE;
-  unsigned short	internalKeyStates;
-
-  /* X server is being initialized */
-  if (!inputInfo.keyboard)
-    return;
-
-  /* Only process events if the rootwindow is mapped. The keyboard events
-   * will cause segfaults otherwise */
-  if (screenInfo.screens[0]->root && screenInfo.screens[0]->root->mapped == FALSE)
-    processEvents = FALSE;    
-  
-  /* Force to process all pending events in the mi event queue */
-  if (processEvents)
-    mieqProcessInputEvents ();
-  
-  /* Read the mode key states of our X server */
-  /* (stored in the virtual core keyboard) */
-  internalKeyStates = XkbStateFieldFromRec(&inputInfo.keyboard->key->xkbInfo->state);
-  winDebug("winRestoreModeKeyStates: state %d\n", internalKeyStates);
-
-  /* 
-   * NOTE: The C XOR operator, ^, will not work here because it is
-   * a bitwise operator, not a logical operator.  C does not
-   * have a logical XOR operator, so we use a macro instead.
-   */
-
-  /* Has the key state changed? */
-  dwKeyState = GetKeyState (VK_NUMLOCK) & 0x0001;
-  if (WIN_XOR (internalKeyStates & NumLockMask, dwKeyState))
-    {
-      winSendKeyEvent (KEY_NumLock, TRUE);
-      winSendKeyEvent (KEY_NumLock, FALSE);
+    DWORD dwKeyState;
+    BOOL processEvents = TRUE;
+    unsigned short internalKeyStates;
+
+    /* X server is being initialized */
+    if (!inputInfo.keyboard)
+        return;
+
+    /* Only process events if the rootwindow is mapped. The keyboard events
+     * will cause segfaults otherwise */
+    if (screenInfo.screens[0]->root &&
+        screenInfo.screens[0]->root->mapped == FALSE)
+        processEvents = FALSE;
+
+    /* Force to process all pending events in the mi event queue */
+    if (processEvents)
+        mieqProcessInputEvents();
+
+    /* Read the mode key states of our X server */
+    /* (stored in the virtual core keyboard) */
+    internalKeyStates =
+        XkbStateFieldFromRec(&inputInfo.keyboard->key->xkbInfo->state);
+    winDebug("winRestoreModeKeyStates: state %d\n", internalKeyStates);
+
+    /* 
+     * NOTE: The C XOR operator, ^, will not work here because it is
+     * a bitwise operator, not a logical operator.  C does not
+     * have a logical XOR operator, so we use a macro instead.
+     */
+
+    /* Has the key state changed? */
+    dwKeyState = GetKeyState(VK_NUMLOCK) & 0x0001;
+    if (WIN_XOR(internalKeyStates & NumLockMask, dwKeyState)) {
+        winSendKeyEvent(KEY_NumLock, TRUE);
+        winSendKeyEvent(KEY_NumLock, FALSE);
     }
 
-  /* Has the key state changed? */
-  dwKeyState = GetKeyState (VK_CAPITAL) & 0x0001;
-  if (WIN_XOR (internalKeyStates & LockMask, dwKeyState))
-    {
-      winSendKeyEvent (KEY_CapsLock, TRUE);
-      winSendKeyEvent (KEY_CapsLock, FALSE);
+    /* Has the key state changed? */
+    dwKeyState = GetKeyState(VK_CAPITAL) & 0x0001;
+    if (WIN_XOR(internalKeyStates & LockMask, dwKeyState)) {
+        winSendKeyEvent(KEY_CapsLock, TRUE);
+        winSendKeyEvent(KEY_CapsLock, FALSE);
     }
 
-  /* Has the key state changed? */
-  dwKeyState = GetKeyState (VK_SCROLL) & 0x0001;
-  if (WIN_XOR (internalKeyStates & ScrollLockMask, dwKeyState))
-    {
-      winSendKeyEvent (KEY_ScrollLock, TRUE);
-      winSendKeyEvent (KEY_ScrollLock, FALSE);
+    /* Has the key state changed? */
+    dwKeyState = GetKeyState(VK_SCROLL) & 0x0001;
+    if (WIN_XOR(internalKeyStates & ScrollLockMask, dwKeyState)) {
+        winSendKeyEvent(KEY_ScrollLock, TRUE);
+        winSendKeyEvent(KEY_ScrollLock, FALSE);
     }
 
-  /* Has the key state changed? */
-  dwKeyState = GetKeyState (VK_KANA) & 0x0001;
-  if (WIN_XOR (internalKeyStates & KanaMask, dwKeyState))
-    {
-      winSendKeyEvent (KEY_HKTG, TRUE);
-      winSendKeyEvent (KEY_HKTG, FALSE);
+    /* Has the key state changed? */
+    dwKeyState = GetKeyState(VK_KANA) & 0x0001;
+    if (WIN_XOR(internalKeyStates & KanaMask, dwKeyState)) {
+        winSendKeyEvent(KEY_HKTG, TRUE);
+        winSendKeyEvent(KEY_HKTG, FALSE);
     }
 }
 
-
 /*
  * Look for the lovely fake Control_L press/release generated by Windows
  * when AltGr is pressed/released on a non-U.S. keyboard.
  */
 
 Bool
-winIsFakeCtrl_L (UINT message, WPARAM wParam, LPARAM lParam)
+winIsFakeCtrl_L(UINT message, WPARAM wParam, LPARAM lParam)
 {
-  MSG		msgNext;
-  LONG		lTime;
-  Bool		fReturn;
-
-  static Bool   lastWasControlL = FALSE;
-  static UINT   lastMessage;
-  static LONG   lastTime;
-
-  /*
-   * Fake Ctrl_L presses will be followed by an Alt_R press
-   * with the same timestamp as the Ctrl_L press.
-   */
-  if ((message == WM_KEYDOWN || message == WM_SYSKEYDOWN)
-      && wParam == VK_CONTROL
-      && (HIWORD (lParam) & KF_EXTENDED) == 0)
-    {
-      /* Got a Ctrl_L press */
-
-      /* Get time of current message */
-      lTime = GetMessageTime ();
-
-      /* Look for next press message */
-      fReturn = PeekMessage (&msgNext, NULL,
-			     WM_KEYDOWN, WM_SYSKEYDOWN,
-			     PM_NOREMOVE);
-
-      if (fReturn &&  msgNext.message != WM_KEYDOWN && msgNext.message != WM_SYSKEYDOWN)
-          fReturn = 0;
-
-      if (!fReturn)
-        {
-          lastWasControlL = TRUE;
-          lastMessage = message;
-          lastTime = lTime;
+    MSG msgNext;
+    LONG lTime;
+    Bool fReturn;
+
+    static Bool lastWasControlL = FALSE;
+    static UINT lastMessage;
+    static LONG lastTime;
+
+    /*
+     * Fake Ctrl_L presses will be followed by an Alt_R press
+     * with the same timestamp as the Ctrl_L press.
+     */
+    if ((message == WM_KEYDOWN || message == WM_SYSKEYDOWN)
+        && wParam == VK_CONTROL && (HIWORD(lParam) & KF_EXTENDED) == 0) {
+        /* Got a Ctrl_L press */
+
+        /* Get time of current message */
+        lTime = GetMessageTime();
+
+        /* Look for next press message */
+        fReturn = PeekMessage(&msgNext, NULL,
+                              WM_KEYDOWN, WM_SYSKEYDOWN, PM_NOREMOVE);
+
+        if (fReturn && msgNext.message != WM_KEYDOWN &&
+            msgNext.message != WM_SYSKEYDOWN)
+            fReturn = 0;
+
+        if (!fReturn) {
+            lastWasControlL = TRUE;
+            lastMessage = message;
+            lastTime = lTime;
         }
-      else
-        {
-          lastWasControlL = FALSE;
+        else {
+            lastWasControlL = FALSE;
         }
 
-      /* Is next press an Alt_R with the same timestamp? */
-      if (fReturn && msgNext.wParam == VK_MENU
-	  && msgNext.time == lTime
-	  && (HIWORD (msgNext.lParam) & KF_EXTENDED))
-	{
-	  /*
-	   * Next key press is Alt_R with same timestamp as current
-	   * Ctrl_L message.  Therefore, this Ctrl_L press is a fake
-	   * event, so discard it.
-	   */
-	  return TRUE;
-	}
+        /* Is next press an Alt_R with the same timestamp? */
+        if (fReturn && msgNext.wParam == VK_MENU
+            && msgNext.time == lTime
+            && (HIWORD(msgNext.lParam) & KF_EXTENDED)) {
+            /*
+             * Next key press is Alt_R with same timestamp as current
+             * Ctrl_L message.  Therefore, this Ctrl_L press is a fake
+             * event, so discard it.
+             */
+            return TRUE;
+        }
     }
-  /*
-   * Sometimes, the Alt_R press message is not yet posted when the
-   * fake Ctrl_L press message arrives (even though it has the
-   * same timestamp), so check for an Alt_R press message that has
-   * arrived since the last Ctrl_L message.
-   */
-  else if ((message == WM_KEYDOWN || message == WM_SYSKEYDOWN)
-      && wParam == VK_MENU
-      && (HIWORD (lParam) & KF_EXTENDED))
-    {
-      /* Got a Alt_R press */
-
-      if (lastWasControlL)
-        {
-          lTime = GetMessageTime ();
-
-          if (lastTime == lTime)
-            {
+    /*
+     * Sometimes, the Alt_R press message is not yet posted when the
+     * fake Ctrl_L press message arrives (even though it has the
+     * same timestamp), so check for an Alt_R press message that has
+     * arrived since the last Ctrl_L message.
+     */
+    else if ((message == WM_KEYDOWN || message == WM_SYSKEYDOWN)
+             && wParam == VK_MENU && (HIWORD(lParam) & KF_EXTENDED)) {
+        /* Got a Alt_R press */
+
+        if (lastWasControlL) {
+            lTime = GetMessageTime();
+
+            if (lastTime == lTime) {
                 /* Undo the fake Ctrl_L press by sending a fake Ctrl_L release */
-                winSendKeyEvent (KEY_LCtrl, FALSE);
+                winSendKeyEvent(KEY_LCtrl, FALSE);
             }
-          lastWasControlL = FALSE;
+            lastWasControlL = FALSE;
         }
     }
-  /*
-   * Fake Ctrl_L releases will be followed by an Alt_R release
-   * with the same timestamp as the Ctrl_L release.
-   */
-  else if ((message == WM_KEYUP || message == WM_SYSKEYUP)
-      && wParam == VK_CONTROL
-      && (HIWORD (lParam) & KF_EXTENDED) == 0)
-    {
-      /* Got a Ctrl_L release */
-
-      /* Get time of current message */
-      lTime = GetMessageTime ();
-
-      /* Look for next release message */
-      fReturn = PeekMessage (&msgNext, NULL,
-			     WM_KEYUP, WM_SYSKEYUP,
-			     PM_NOREMOVE);
-
-      if (fReturn && msgNext.message != WM_KEYUP && msgNext.message != WM_SYSKEYUP)
-          fReturn = 0;
-
-      lastWasControlL = FALSE;
-
-      /* Is next press an Alt_R with the same timestamp? */
-      if (fReturn
-	  && (msgNext.message == WM_KEYUP
-	      || msgNext.message == WM_SYSKEYUP)
-	  && msgNext.wParam == VK_MENU
-	  && msgNext.time == lTime
-	  && (HIWORD (msgNext.lParam) & KF_EXTENDED))
-	{
-	  /*
-	   * Next key release is Alt_R with same timestamp as current
-	   * Ctrl_L message. Therefore, this Ctrl_L release is a fake
-	   * event, so discard it.
-	   */
-	  return TRUE;
-	}
+    /*
+     * Fake Ctrl_L releases will be followed by an Alt_R release
+     * with the same timestamp as the Ctrl_L release.
+     */
+    else if ((message == WM_KEYUP || message == WM_SYSKEYUP)
+             && wParam == VK_CONTROL && (HIWORD(lParam) & KF_EXTENDED) == 0) {
+        /* Got a Ctrl_L release */
+
+        /* Get time of current message */
+        lTime = GetMessageTime();
+
+        /* Look for next release message */
+        fReturn = PeekMessage(&msgNext, NULL,
+                              WM_KEYUP, WM_SYSKEYUP, PM_NOREMOVE);
+
+        if (fReturn && msgNext.message != WM_KEYUP &&
+            msgNext.message != WM_SYSKEYUP)
+            fReturn = 0;
+
+        lastWasControlL = FALSE;
+
+        /* Is next press an Alt_R with the same timestamp? */
+        if (fReturn
+            && (msgNext.message == WM_KEYUP || msgNext.message == WM_SYSKEYUP)
+            && msgNext.wParam == VK_MENU
+            && msgNext.time == lTime
+            && (HIWORD(msgNext.lParam) & KF_EXTENDED)) {
+            /*
+             * Next key release is Alt_R with same timestamp as current
+             * Ctrl_L message. Therefore, this Ctrl_L release is a fake
+             * event, so discard it.
+             */
+            return TRUE;
+        }
     }
-  else
-    {
-      /* On any other press or release message, we don't have a
-         potentially fake Ctrl_L to worry about anymore... */
-      lastWasControlL = FALSE;
+    else {
+        /* On any other press or release message, we don't have a
+           potentially fake Ctrl_L to worry about anymore... */
+        lastWasControlL = FALSE;
     }
 
-  /* Not a fake control left press/release */
-  return FALSE;
+    /* Not a fake control left press/release */
+    return FALSE;
 }
 
-
 /*
  * Lift any modifier keys that are pressed
  */
 
 void
-winKeybdReleaseKeys (void)
+winKeybdReleaseKeys(void)
 {
-  int				i;
+    int i;
 
 #ifdef HAS_DEVWINDOWS
-  /* Verify that the mi input system has been initialized */
-  if (g_fdMessageQueue == WIN_FD_INVALID)
-    return;
+    /* Verify that the mi input system has been initialized */
+    if (g_fdMessageQueue == WIN_FD_INVALID)
+        return;
 #endif
 
-  /* Loop through all keys */
-  for (i = 0; i < NUM_KEYCODES; ++i)
-    {
-      /* Pop key if pressed */
-      if (g_winKeyState[i])
-	winSendKeyEvent (i, FALSE);
+    /* Loop through all keys */
+    for (i = 0; i < NUM_KEYCODES; ++i) {
+        /* Pop key if pressed */
+        if (g_winKeyState[i])
+            winSendKeyEvent(i, FALSE);
 
-      /* Reset pressed flag for keys */
-      g_winKeyState[i] = FALSE;
+        /* Reset pressed flag for keys */
+        g_winKeyState[i] = FALSE;
     }
 }
 
-
 /*
  * Take a raw X key code and send an up or down event for it.
  *
@@ -487,55 +448,57 @@ winKeybdReleaseKeys (void)
  */
 
 void
-winSendKeyEvent (DWORD dwKey, Bool fDown)
+winSendKeyEvent(DWORD dwKey, Bool fDown)
 {
-  /*
-   * When alt-tabing between screens we can get phantom key up messages
-   * Here we only pass them through it we think we should!
-   */
-  if (g_winKeyState[dwKey] == FALSE && fDown == FALSE) return;
+    /*
+     * When alt-tabing between screens we can get phantom key up messages
+     * Here we only pass them through it we think we should!
+     */
+    if (g_winKeyState[dwKey] == FALSE && fDown == FALSE)
+        return;
 
-  /* Update the keyState map */
-  g_winKeyState[dwKey] = fDown;
+    /* Update the keyState map */
+    g_winKeyState[dwKey] = fDown;
 
-  QueueKeyboardEvents(g_pwinKeyboard, fDown ? KeyPress : KeyRelease, dwKey + MIN_KEYCODE, NULL);
+    QueueKeyboardEvents(g_pwinKeyboard, fDown ? KeyPress : KeyRelease,
+                        dwKey + MIN_KEYCODE, NULL);
 
-  winDebug("winSendKeyEvent: dwKey: %d, fDown: %d\n",
-           dwKey, fDown);
+    winDebug("winSendKeyEvent: dwKey: %d, fDown: %d\n", dwKey, fDown);
 }
 
-BOOL winCheckKeyPressed(WPARAM wParam, LPARAM lParam)
+BOOL
+winCheckKeyPressed(WPARAM wParam, LPARAM lParam)
 {
-  switch (wParam)
-  {
+    switch (wParam) {
     case VK_CONTROL:
-      if ((lParam & 0x1ff0000) == 0x11d0000 && g_winKeyState[KEY_RCtrl])
-        return TRUE;
-      if ((lParam & 0x1ff0000) == 0x01d0000 && g_winKeyState[KEY_LCtrl])
-        return TRUE;
-      break;
+        if ((lParam & 0x1ff0000) == 0x11d0000 && g_winKeyState[KEY_RCtrl])
+            return TRUE;
+        if ((lParam & 0x1ff0000) == 0x01d0000 && g_winKeyState[KEY_LCtrl])
+            return TRUE;
+        break;
     case VK_SHIFT:
-      if ((lParam & 0x1ff0000) == 0x0360000 && g_winKeyState[KEY_ShiftR])
-        return TRUE;
-      if ((lParam & 0x1ff0000) == 0x02a0000 && g_winKeyState[KEY_ShiftL])
-        return TRUE;
-      break;
+        if ((lParam & 0x1ff0000) == 0x0360000 && g_winKeyState[KEY_ShiftR])
+            return TRUE;
+        if ((lParam & 0x1ff0000) == 0x02a0000 && g_winKeyState[KEY_ShiftL])
+            return TRUE;
+        break;
     default:
-      return TRUE;
-  }
-  return FALSE;
+        return TRUE;
+    }
+    return FALSE;
 }
 
 /* Only on shift release message is sent even if both are pressed.
  * Fix this here 
  */
-void winFixShiftKeys (int iScanCode)
+void
+winFixShiftKeys(int iScanCode)
 {
-  if (GetKeyState (VK_SHIFT) & 0x8000)
-    return;
+    if (GetKeyState(VK_SHIFT) & 0x8000)
+        return;
 
-  if (iScanCode == KEY_ShiftL && g_winKeyState[KEY_ShiftR])
-    winSendKeyEvent (KEY_ShiftR, FALSE);
-  if (iScanCode == KEY_ShiftR && g_winKeyState[KEY_ShiftL])
-    winSendKeyEvent (KEY_ShiftL, FALSE);
+    if (iScanCode == KEY_ShiftL && g_winKeyState[KEY_ShiftR])
+        winSendKeyEvent(KEY_ShiftR, FALSE);
+    if (iScanCode == KEY_ShiftR && g_winKeyState[KEY_ShiftL])
+        winSendKeyEvent(KEY_ShiftL, FALSE);
 }
diff --git a/xorg-server/hw/xwin/winkeybd.h b/xorg-server/hw/xwin/winkeybd.h
index e4df26066..6701f0959 100644
--- a/xorg-server/hw/xwin/winkeybd.h
+++ b/xorg-server/hw/xwin/winkeybd.h
@@ -43,264 +43,266 @@
  * may not be associated with the appropriate scan code.
  */
 const int
-g_iKeyMap [] = {
-  /* count	Windows VK,	ASCII,		ASCII when extended VK */
-  /* 0 */	0,		0,		0,
-  /* 1 */	0,		0,		0,
-  /* 2 */	0,		0,		0,
-  /* 3 */	VK_CANCEL,	0,		KEY_Break,
-  /* 4 */	0,		0,		0,
-  /* 5 */	0,		0,		0,
-  /* 6 */	0,		0,		0,
-  /* 7 */	0,		0,		0,
-  /* 8 */	0,		0,		0,
-  /* 9 */	0,		0,		0,
-  /* 10 */	0,		0,		0,
-  /* 11 */	0,		0,		0,
-  /* 12 */	0,		0,		0,
-  /* 13 */	VK_RETURN,	0,		KEY_KP_Enter,
-  /* 14 */	0,		0,		0,
-  /* 15 */	0,		0,		0,
-  /* 16 */	VK_SHIFT,	0,		0,
-  /* 17 */	VK_CONTROL,	0,		KEY_RCtrl,
-  /* 18 */	VK_MENU,	0,		KEY_AltLang,
-  /* 19 */	VK_PAUSE,	KEY_Pause,	0,
-  /* 20 */	0,		0,		0,
-  /* 21 */	0,		0,		0,
-  /* 22 */	0,		0,		0,
-  /* 23 */	0,		0,		0,
-  /* 24 */	0,		0,		0,
-  /* 25 */	0,		0,		0,
-  /* 26 */	0,		0,		0,
-  /* 27 */	0,		0,		0,
-  /* 28 */	0,		0,		0,
-  /* 29 */	0,		0,		0,
-  /* 30 */	0,		0,		0,
-  /* 31 */	0,		0,		0,
-  /* 32 */	0,		0,		0,
-  /* 33 */	VK_PRIOR,	0,		KEY_PgUp,
-  /* 34 */	VK_NEXT,	0,		KEY_PgDown,
-  /* 35 */	VK_END,		0,		KEY_End,
-  /* 36 */	VK_HOME,	0,		KEY_Home,
-  /* 37 */	VK_LEFT,	0,		KEY_Left,
-  /* 38 */	VK_UP,		0,		KEY_Up,
-  /* 39 */	VK_RIGHT,	0,		KEY_Right,
-  /* 40 */	VK_DOWN,	0,		KEY_Down,
-  /* 41 */	0,		0,		0,
-  /* 42 */	0,		0,		0,
-  /* 43 */	0,		0,		0,
-  /* 44 */	VK_SNAPSHOT,	0,		KEY_Print,  
-  /* 45 */	VK_INSERT,	0,		KEY_Insert,
-  /* 46 */	VK_DELETE,	0,		KEY_Delete,
-  /* 47 */	0,		0,		0,
-  /* 48 */	0,		0,		0,
-  /* 49 */	0,		0,		0,
-  /* 50 */	0,		0,		0,
-  /* 51 */	0,		0,		0,
-  /* 52 */	0,		0,		0,
-  /* 53 */	0,		0,		0,
-  /* 54 */	0,		0,		0,
-  /* 55 */	0,		0,		0,
-  /* 56 */	0,		0,		0,
-  /* 57 */	0,		0,		0,
-  /* 58 */	0,		0,		0,
-  /* 59 */	0,		0,		0,
-  /* 60 */	0,		0,		0,
-  /* 61 */	0,		0,		0,
-  /* 62 */	0,		0,		0,
-  /* 63 */	0,		0,		0,
-  /* 64 */	0,		0,		0,
-  /* 65 */	0,		0,		0,
-  /* 66 */	0,		0,		0,
-  /* 67 */	0,		0,		0,
-  /* 68 */	0,		0,		0,
-  /* 69 */	0,		0,		0,
-  /* 70 */	0,		0,		0,
-  /* 71 */	0,		0,		0,
-  /* 72 */	0,		0,		0,
-  /* 73 */	0,		0,		0,
-  /* 74 */	0,		0,		0,
-  /* 75 */	0,		0,		0,
-  /* 76 */	0,		0,		0,
-  /* 77 */	0,		0,		0,
-  /* 78 */	0,		0,		0,
-  /* 79 */	0,		0,		0,
-  /* 80 */	0,		0,		0,
-  /* 81 */	0,		0,		0,
-  /* 82 */	0,		0,		0,
-  /* 83 */	0,		0,		0,
-  /* 84 */	0,		0,		0,
-  /* 85 */	0,		0,		0,
-  /* 86 */	0,		0,		0,
-  /* 87 */	0,		0,		0,
-  /* 88 */	0,		0,		0,
-  /* 89 */	0,		0,		0,
-  /* 90 */	0,		0,		0,
-  /* 91 */	VK_LWIN,	KEY_LMeta,	0,
-  /* 92 */	VK_RWIN,	KEY_RMeta,	0,
-  /* 93 */	VK_APPS,	KEY_Menu,	0,
-  /* 94 */	0,		0,		0,
-  /* 95 */	0,		0,		0,
-  /* 96 */	0,		0,		0,
-  /* 97 */	0,		0,		0,
-  /* 98 */	0,		0,		0,
-  /* 99 */	0,		0,		0,
-  /* 100 */	0,		0,		0,
-  /* 101 */	0,		0,		0,
-  /* 102 */	0,		0,		0,
-  /* 103 */	0,		0,		0,
-  /* 104 */	0,		0,		0,
-  /* 105 */	0,		0,		0,
-  /* 106 */	0,		0,		0,
-  /* 107 */	0,		0,		0,
-  /* 108 */	0,		0,		0,
-  /* 109 */	0,		0,		0,
-  /* 110 */	0,		0,		0,
-  /* 111 */	VK_DIVIDE,	0,		KEY_KP_Divide,
-  /* 112 */	0,		0,		0,
-  /* 113 */	0,		0,		0,
-  /* 114 */	0,		0,		0,
-  /* 115 */	0,		0,		0,
-  /* 116 */	0,		0,		0,
-  /* 117 */	0,		0,		0,
-  /* 118 */	0,		0,		0,
-  /* 119 */	0,		0,		0,
-  /* 120 */	0,		0,		0,
-  /* 121 */	0,		0,		0,
-  /* 122 */	0,		0,		0,
-  /* 123 */	0,		0,		0,
-  /* 124 */	0,		0,		0,
-  /* 125 */	0,		0,		0,
-  /* 126 */	0,		0,		0,
-  /* 127 */	0,		0,		0,
-  /* 128 */	0,		0,		0,
-  /* 129 */	0,		0,		0,
-  /* 130 */	0,		0,		0,
-  /* 131 */	0,		0,		0,
-  /* 132 */	0,		0,		0,
-  /* 133 */	0,		0,		0,
-  /* 134 */	0,		0,		0,
-  /* 135 */	0,		0,		0,
-  /* 136 */	0,		0,		0,
-  /* 137 */	0,		0,		0,
-  /* 138 */	0,		0,		0,
-  /* 139 */	0,		0,		0,
-  /* 140 */	0,		0,		0,
-  /* 141 */	0,		0,		0,
-  /* 142 */	0,		0,		0,
-  /* 143 */	0,		0,		0,
-  /* 144 */	0,		0,		0,
-  /* 145 */	0,		0,		0,
-  /* 146 */	0,		0,		0,
-  /* 147 */	0,		0,		0,
-  /* 148 */	0,		0,		0,
-  /* 149 */	0,		0,		0,
-  /* 150 */	0,		0,		0,
-  /* 151 */	0,		0,		0,
-  /* 152 */	0,		0,		0,
-  /* 153 */	0,		0,		0,
-  /* 154 */	0,		0,		0,
-  /* 155 */	0,		0,		0,
-  /* 156 */	0,		0,		0,
-  /* 157 */	0,		0,		0,
-  /* 158 */	0,		0,		0,
-  /* 159 */	0,		0,		0,
-  /* 160 */	VK_LSHIFT,	KEY_ShiftL,	0,
-  /* 161 */	VK_RSHIFT,	KEY_ShiftR,	0,
-  /* 162 */	VK_LCONTROL,	KEY_LCtrl,	0,
-  /* 163 */	VK_RCONTROL,	KEY_RCtrl,	0,
-  /* 164 */	VK_LMENU,	KEY_Alt,	0,
-  /* 165 */	VK_RMENU,	KEY_AltLang,	0,
-  /* 166 */	0,		0,		0,
-  /* 167 */	0,		0,		0,
-  /* 168 */	0,		0,		0,
-  /* 169 */	0,		0,		0,
-  /* 170 */	0,		0,		0,
-  /* 171 */	0,		0,		0,
-  /* 172 */	0,		0,		0,
-  /* 173 */	VK_VOLUME_MUTE,	0,		KEY_Mute,
-  /* 174 */	VK_VOLUME_DOWN,	0,		KEY_AudioLower,
-  /* 175 */	VK_VOLUME_UP,	0,		KEY_AudioRaise,
-  /* 176 */	VK_MEDIA_NEXT_TRACK,	0,	KEY_NEXTSONG,
-  /* 177 */	VK_MEDIA_PREV_TRACK,	0,	KEY_PREVIOUSSONG,
-  /* 178 */	VK_MEDIA_STOP,	0,		KEY_STOPCD,
-  /* 179 */	VK_MEDIA_PLAY_PAUSE,	0,	KEY_PLAYPAUSE,
-  /* 180 */	0,		0,		0,
-  /* 181 */	0,		0,		0,
-  /* 182 */	0,		0,		0,
-  /* 183 */	0,		0,		0,
-  /* 184 */	0,		0,		0,
-  /* 185 */	0,		0,		0,
-  /* 186 */	0,		0,		0,
-  /* 187 */	0,		0,		0,
-  /* 188 */	0,		0,		0,
-  /* 189 */	0,		0,		0,
-  /* 190 */	0,		0,		0,
-  /* 191 */	0,		0,		0,
-  /* 192 */	0,		0,		0,
-  /* 193 */	0,		0,		0,
-  /* 194 */	0,		0,		0,
-  /* 195 */	0,		0,		0,
-  /* 196 */	0,		0,		0,
-  /* 197 */	0,		0,		0,
-  /* 198 */	0,		0,		0,
-  /* 199 */	0,		0,		0,
-  /* 200 */	0,		0,		0,
-  /* 201 */	0,		0,		0,
-  /* 202 */	0,		0,		0,
-  /* 203 */	0,		0,		0,
-  /* 204 */	0,		0,		0,
-  /* 205 */	0,		0,		0,
-  /* 206 */	0,		0,		0,
-  /* 207 */	0,		0,		0,
-  /* 208 */	0,		0,		0,
-  /* 209 */	0,		0,		0,
-  /* 210 */	0,		0,		0,
-  /* 211 */	0,		0,		0,
-  /* 212 */	0,		0,		0,
-  /* 213 */	0,		0,		0,
-  /* 214 */	0,		0,		0,
-  /* 215 */	0,		0,		0,
-  /* 216 */	0,		0,		0,
-  /* 217 */	0,		0,		0,
-  /* 218 */	0,		0,		0,
-  /* 219 */	0,		0,		0,
-  /* 220 */	0,		0,		0,
-  /* 221 */	0,		0,		0,
-  /* 222 */	0,		0,		0,
-  /* 223 */	VK_OEM_8,	0,		KEY_RCtrl,  /* at least on Canadian Multilingual Standard layout */
-  /* 224 */	0,		0,		0,
-  /* 225 */	0,		0,		0,
-  /* 226 */	0,		0,		0,
-  /* 227 */	0,		0,		0,
-  /* 228 */	0,		0,		0,
-  /* 229 */	0,		0,		0,
-  /* 230 */	0,		0,		0,
-  /* 231 */	0,		0,		0,
-  /* 232 */	0,		0,		0,
-  /* 233 */	0,		0,		0,
-  /* 234 */	0,		0,		0,
-  /* 235 */	0,		0,		0,
-  /* 236 */	0,		0,		0,
-  /* 237 */	0,		0,		0,
-  /* 238 */	0,		0,		0,
-  /* 239 */	0,		0,		0,
-  /* 240 */	0,		0,		0,
-  /* 241 */	0,		0,		0,
-  /* 242 */	0,		0,		0,
-  /* 243 */	0,		0,		0,
-  /* 244 */	0,		0,		0,
-  /* 245 */	0,		0,		0,
-  /* 246 */	0,		0,		0,
-  /* 247 */	0,		0,		0,
-  /* 248 */	0,		0,		0,
-  /* 249 */	0,		0,		0,
-  /* 250 */	0,		0,		0,
-  /* 251 */	0,		0,		0,
-  /* 252 */	0,		0,		0,
-  /* 253 */	0,		0,		0,
-  /* 254 */	0,		0,		0,
-  /* 255 */	VK_FN,		0,		KEY_Fn  /* Most keyboards don't generate a scancode for Fn, but a few do... */
+ g_iKeyMap[] = {
+    /* count      Windows VK,     ASCII,          ASCII when extended VK */
+    /* 0 */ 0, 0, 0,
+    /* 1 */ 0, 0, 0,
+    /* 2 */ 0, 0, 0,
+    /* 3 */ VK_CANCEL, 0, KEY_Break,
+    /* 4 */ 0, 0, 0,
+    /* 5 */ 0, 0, 0,
+    /* 6 */ 0, 0, 0,
+    /* 7 */ 0, 0, 0,
+    /* 8 */ 0, 0, 0,
+    /* 9 */ 0, 0, 0,
+    /* 10 */ 0, 0, 0,
+    /* 11 */ 0, 0, 0,
+    /* 12 */ 0, 0, 0,
+    /* 13 */ VK_RETURN, 0, KEY_KP_Enter,
+    /* 14 */ 0, 0, 0,
+    /* 15 */ 0, 0, 0,
+    /* 16 */ VK_SHIFT, 0, 0,
+    /* 17 */ VK_CONTROL, 0, KEY_RCtrl,
+    /* 18 */ VK_MENU, 0, KEY_AltLang,
+    /* 19 */ VK_PAUSE, KEY_Pause, 0,
+    /* 20 */ 0, 0, 0,
+    /* 21 */ 0, 0, 0,
+    /* 22 */ 0, 0, 0,
+    /* 23 */ 0, 0, 0,
+    /* 24 */ 0, 0, 0,
+    /* 25 */ 0, 0, 0,
+    /* 26 */ 0, 0, 0,
+    /* 27 */ 0, 0, 0,
+    /* 28 */ 0, 0, 0,
+    /* 29 */ 0, 0, 0,
+    /* 30 */ 0, 0, 0,
+    /* 31 */ 0, 0, 0,
+    /* 32 */ 0, 0, 0,
+    /* 33 */ VK_PRIOR, 0, KEY_PgUp,
+    /* 34 */ VK_NEXT, 0, KEY_PgDown,
+    /* 35 */ VK_END, 0, KEY_End,
+    /* 36 */ VK_HOME, 0, KEY_Home,
+    /* 37 */ VK_LEFT, 0, KEY_Left,
+    /* 38 */ VK_UP, 0, KEY_Up,
+    /* 39 */ VK_RIGHT, 0, KEY_Right,
+    /* 40 */ VK_DOWN, 0, KEY_Down,
+    /* 41 */ 0, 0, 0,
+    /* 42 */ 0, 0, 0,
+    /* 43 */ 0, 0, 0,
+    /* 44 */ VK_SNAPSHOT, 0, KEY_Print,
+    /* 45 */ VK_INSERT, 0, KEY_Insert,
+    /* 46 */ VK_DELETE, 0, KEY_Delete,
+    /* 47 */ 0, 0, 0,
+    /* 48 */ 0, 0, 0,
+    /* 49 */ 0, 0, 0,
+    /* 50 */ 0, 0, 0,
+    /* 51 */ 0, 0, 0,
+    /* 52 */ 0, 0, 0,
+    /* 53 */ 0, 0, 0,
+    /* 54 */ 0, 0, 0,
+    /* 55 */ 0, 0, 0,
+    /* 56 */ 0, 0, 0,
+    /* 57 */ 0, 0, 0,
+    /* 58 */ 0, 0, 0,
+    /* 59 */ 0, 0, 0,
+    /* 60 */ 0, 0, 0,
+    /* 61 */ 0, 0, 0,
+    /* 62 */ 0, 0, 0,
+    /* 63 */ 0, 0, 0,
+    /* 64 */ 0, 0, 0,
+    /* 65 */ 0, 0, 0,
+    /* 66 */ 0, 0, 0,
+    /* 67 */ 0, 0, 0,
+    /* 68 */ 0, 0, 0,
+    /* 69 */ 0, 0, 0,
+    /* 70 */ 0, 0, 0,
+    /* 71 */ 0, 0, 0,
+    /* 72 */ 0, 0, 0,
+    /* 73 */ 0, 0, 0,
+    /* 74 */ 0, 0, 0,
+    /* 75 */ 0, 0, 0,
+    /* 76 */ 0, 0, 0,
+    /* 77 */ 0, 0, 0,
+    /* 78 */ 0, 0, 0,
+    /* 79 */ 0, 0, 0,
+    /* 80 */ 0, 0, 0,
+    /* 81 */ 0, 0, 0,
+    /* 82 */ 0, 0, 0,
+    /* 83 */ 0, 0, 0,
+    /* 84 */ 0, 0, 0,
+    /* 85 */ 0, 0, 0,
+    /* 86 */ 0, 0, 0,
+    /* 87 */ 0, 0, 0,
+    /* 88 */ 0, 0, 0,
+    /* 89 */ 0, 0, 0,
+    /* 90 */ 0, 0, 0,
+    /* 91 */ VK_LWIN, KEY_LMeta, 0,
+    /* 92 */ VK_RWIN, KEY_RMeta, 0,
+    /* 93 */ VK_APPS, KEY_Menu, 0,
+    /* 94 */ 0, 0, 0,
+    /* 95 */ 0, 0, 0,
+    /* 96 */ 0, 0, 0,
+    /* 97 */ 0, 0, 0,
+    /* 98 */ 0, 0, 0,
+    /* 99 */ 0, 0, 0,
+    /* 100 */ 0, 0, 0,
+    /* 101 */ 0, 0, 0,
+    /* 102 */ 0, 0, 0,
+    /* 103 */ 0, 0, 0,
+    /* 104 */ 0, 0, 0,
+    /* 105 */ 0, 0, 0,
+    /* 106 */ 0, 0, 0,
+    /* 107 */ 0, 0, 0,
+    /* 108 */ 0, 0, 0,
+    /* 109 */ 0, 0, 0,
+    /* 110 */ 0, 0, 0,
+    /* 111 */ VK_DIVIDE, 0, KEY_KP_Divide,
+    /* 112 */ 0, 0, 0,
+    /* 113 */ 0, 0, 0,
+    /* 114 */ 0, 0, 0,
+    /* 115 */ 0, 0, 0,
+    /* 116 */ 0, 0, 0,
+    /* 117 */ 0, 0, 0,
+    /* 118 */ 0, 0, 0,
+    /* 119 */ 0, 0, 0,
+    /* 120 */ 0, 0, 0,
+    /* 121 */ 0, 0, 0,
+    /* 122 */ 0, 0, 0,
+    /* 123 */ 0, 0, 0,
+    /* 124 */ 0, 0, 0,
+    /* 125 */ 0, 0, 0,
+    /* 126 */ 0, 0, 0,
+    /* 127 */ 0, 0, 0,
+    /* 128 */ 0, 0, 0,
+    /* 129 */ 0, 0, 0,
+    /* 130 */ 0, 0, 0,
+    /* 131 */ 0, 0, 0,
+    /* 132 */ 0, 0, 0,
+    /* 133 */ 0, 0, 0,
+    /* 134 */ 0, 0, 0,
+    /* 135 */ 0, 0, 0,
+    /* 136 */ 0, 0, 0,
+    /* 137 */ 0, 0, 0,
+    /* 138 */ 0, 0, 0,
+    /* 139 */ 0, 0, 0,
+    /* 140 */ 0, 0, 0,
+    /* 141 */ 0, 0, 0,
+    /* 142 */ 0, 0, 0,
+    /* 143 */ 0, 0, 0,
+    /* 144 */ 0, 0, 0,
+    /* 145 */ 0, 0, 0,
+    /* 146 */ 0, 0, 0,
+    /* 147 */ 0, 0, 0,
+    /* 148 */ 0, 0, 0,
+    /* 149 */ 0, 0, 0,
+    /* 150 */ 0, 0, 0,
+    /* 151 */ 0, 0, 0,
+    /* 152 */ 0, 0, 0,
+    /* 153 */ 0, 0, 0,
+    /* 154 */ 0, 0, 0,
+    /* 155 */ 0, 0, 0,
+    /* 156 */ 0, 0, 0,
+    /* 157 */ 0, 0, 0,
+    /* 158 */ 0, 0, 0,
+    /* 159 */ 0, 0, 0,
+    /* 160 */ VK_LSHIFT, KEY_ShiftL, 0,
+    /* 161 */ VK_RSHIFT, KEY_ShiftR, 0,
+    /* 162 */ VK_LCONTROL, KEY_LCtrl, 0,
+    /* 163 */ VK_RCONTROL, KEY_RCtrl, 0,
+    /* 164 */ VK_LMENU, KEY_Alt, 0,
+    /* 165 */ VK_RMENU, KEY_AltLang, 0,
+    /* 166 */ 0, 0, 0,
+    /* 167 */ 0, 0, 0,
+    /* 168 */ 0, 0, 0,
+    /* 169 */ 0, 0, 0,
+    /* 170 */ 0, 0, 0,
+    /* 171 */ 0, 0, 0,
+    /* 172 */ 0, 0, 0,
+    /* 173 */ VK_VOLUME_MUTE, 0, KEY_Mute,
+    /* 174 */ VK_VOLUME_DOWN, 0, KEY_AudioLower,
+    /* 175 */ VK_VOLUME_UP, 0, KEY_AudioRaise,
+    /* 176 */ VK_MEDIA_NEXT_TRACK, 0, KEY_NEXTSONG,
+    /* 177 */ VK_MEDIA_PREV_TRACK, 0, KEY_PREVIOUSSONG,
+    /* 178 */ VK_MEDIA_STOP, 0, KEY_STOPCD,
+    /* 179 */ VK_MEDIA_PLAY_PAUSE, 0, KEY_PLAYPAUSE,
+    /* 180 */ 0, 0, 0,
+    /* 181 */ 0, 0, 0,
+    /* 182 */ 0, 0, 0,
+    /* 183 */ 0, 0, 0,
+    /* 184 */ 0, 0, 0,
+    /* 185 */ 0, 0, 0,
+    /* 186 */ 0, 0, 0,
+    /* 187 */ 0, 0, 0,
+    /* 188 */ 0, 0, 0,
+    /* 189 */ 0, 0, 0,
+    /* 190 */ 0, 0, 0,
+    /* 191 */ 0, 0, 0,
+    /* 192 */ 0, 0, 0,
+    /* 193 */ 0, 0, 0,
+    /* 194 */ 0, 0, 0,
+    /* 195 */ 0, 0, 0,
+    /* 196 */ 0, 0, 0,
+    /* 197 */ 0, 0, 0,
+    /* 198 */ 0, 0, 0,
+    /* 199 */ 0, 0, 0,
+    /* 200 */ 0, 0, 0,
+    /* 201 */ 0, 0, 0,
+    /* 202 */ 0, 0, 0,
+    /* 203 */ 0, 0, 0,
+    /* 204 */ 0, 0, 0,
+    /* 205 */ 0, 0, 0,
+    /* 206 */ 0, 0, 0,
+    /* 207 */ 0, 0, 0,
+    /* 208 */ 0, 0, 0,
+    /* 209 */ 0, 0, 0,
+    /* 210 */ 0, 0, 0,
+    /* 211 */ 0, 0, 0,
+    /* 212 */ 0, 0, 0,
+    /* 213 */ 0, 0, 0,
+    /* 214 */ 0, 0, 0,
+    /* 215 */ 0, 0, 0,
+    /* 216 */ 0, 0, 0,
+    /* 217 */ 0, 0, 0,
+    /* 218 */ 0, 0, 0,
+    /* 219 */ 0, 0, 0,
+    /* 220 */ 0, 0, 0,
+    /* 221 */ 0, 0, 0,
+    /* 222 */ 0, 0, 0,
+                                        /* 223 */ VK_OEM_8, 0, KEY_RCtrl,
+                                        /* at least on Canadian Multilingual Standard layout */
+    /* 224 */ 0, 0, 0,
+    /* 225 */ 0, 0, 0,
+    /* 226 */ 0, 0, 0,
+    /* 227 */ 0, 0, 0,
+    /* 228 */ 0, 0, 0,
+    /* 229 */ 0, 0, 0,
+    /* 230 */ 0, 0, 0,
+    /* 231 */ 0, 0, 0,
+    /* 232 */ 0, 0, 0,
+    /* 233 */ 0, 0, 0,
+    /* 234 */ 0, 0, 0,
+    /* 235 */ 0, 0, 0,
+    /* 236 */ 0, 0, 0,
+    /* 237 */ 0, 0, 0,
+    /* 238 */ 0, 0, 0,
+    /* 239 */ 0, 0, 0,
+    /* 240 */ 0, 0, 0,
+    /* 241 */ 0, 0, 0,
+    /* 242 */ 0, 0, 0,
+    /* 243 */ 0, 0, 0,
+    /* 244 */ 0, 0, 0,
+    /* 245 */ 0, 0, 0,
+    /* 246 */ 0, 0, 0,
+    /* 247 */ 0, 0, 0,
+    /* 248 */ 0, 0, 0,
+    /* 249 */ 0, 0, 0,
+    /* 250 */ 0, 0, 0,
+    /* 251 */ 0, 0, 0,
+    /* 252 */ 0, 0, 0,
+    /* 253 */ 0, 0, 0,
+    /* 254 */ 0, 0, 0,
+                                /* 255 */ VK_FN, 0, KEY_Fn
+                                /* Most keyboards don't generate a scancode for Fn, but a few do... */
 };
 
-#endif /* WINKEYBD_H */
+#endif                          /* WINKEYBD_H */
diff --git a/xorg-server/hw/xwin/winkeyhook.c b/xorg-server/hw/xwin/winkeyhook.c
index e452fa5f7..124150850 100644
--- a/xorg-server/hw/xwin/winkeyhook.c
+++ b/xorg-server/hw/xwin/winkeyhook.c
@@ -1,186 +1,173 @@
-/*

- *Copyright (C) 2004 Harold L Hunt II 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 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 HAROLD L HUNT II BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of Harold L Hunt II

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from Harold L Hunt II.

- *

- * Authors:	Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-static HHOOK g_hhookKeyboardLL = NULL;

-

-

-/*

- * Function prototypes

- */

-

-static LRESULT CALLBACK

-winKeyboardMessageHookLL (int iCode, WPARAM wParam, LPARAM lParam);

-

-

-#ifndef LLKHF_EXTENDED

-# define LLKHF_EXTENDED  0x00000001

-#endif

-#ifndef LLKHF_UP

-# define LLKHF_UP  0x00000080

-#endif

-

-

-/*

- * KeyboardMessageHook

- */

-

-static LRESULT CALLBACK

-winKeyboardMessageHookLL (int iCode, WPARAM wParam, LPARAM lParam)

-{

-  BOOL			fPassKeystroke = FALSE;

-  BOOL			fPassAltTab = TRUE;

-  PKBDLLHOOKSTRUCT	p = (PKBDLLHOOKSTRUCT) lParam;

-  HWND			hwnd = GetActiveWindow(); 

-#ifdef XWIN_MULTIWINDOW

-  WindowPtr		pWin = NULL;

-  winPrivWinPtr	        pWinPriv = NULL;

-  winPrivScreenPtr	pScreenPriv = NULL;

-  winScreenInfo		*pScreenInfo = NULL;

-

-  /* Check if the Windows window property for our X window pointer is valid */

-  if ((pWin = GetProp (hwnd, WIN_WINDOW_PROP)) != NULL)

-    {

-      /* Get a pointer to our window privates */

-      pWinPriv		= winGetWindowPriv(pWin);

-

-      /* Get pointers to our screen privates and screen info */

-      pScreenPriv	= pWinPriv->pScreenPriv;

-      pScreenInfo	= pScreenPriv->pScreenInfo;

-

-      if (pScreenInfo->fMultiWindow)

-          fPassAltTab = FALSE;

-    }

-#endif

-

-  /* Pass keystrokes on to our main message loop */

-  if (iCode == HC_ACTION)

-    {

-      winDebug("winKeyboardMessageHook: vkCode: %08x scanCode: %08x\n", p->vkCode, p->scanCode);

-

-      switch (wParam)

-	{

-	case WM_KEYDOWN:  case WM_SYSKEYDOWN:

-	case WM_KEYUP:    case WM_SYSKEYUP: 

-	  fPassKeystroke = 

-	    (fPassAltTab && 

-                (p->vkCode == VK_TAB) && ((p->flags & LLKHF_ALTDOWN) != 0))

-	    || (p->vkCode == VK_LWIN) || (p->vkCode == VK_RWIN)

-	    ;

-	  break;

-	}

-    }

-

-  /*

-   * Pass message on to our main message loop.

-   * We process this immediately with SendMessage so that the keystroke

-   * appears in, hopefully, the correct order.

-   */

-  if (fPassKeystroke)

-    {

-      LPARAM		lParamKey = 0x0;

-

-      /* Construct the lParam from KBDLLHOOKSTRUCT */

-      lParamKey = lParamKey | (0x0000FFFF & 0x00000001); /* Repeat count */

-      lParamKey = lParamKey | (0x00FF0000 & (p->scanCode << 16));

-      lParamKey = lParamKey

-	| (0x01000000 & ((p->flags & LLKHF_EXTENDED) << 23));

-      lParamKey = lParamKey

-	| (0x20000000

-	   & ((p->flags & LLKHF_ALTDOWN) << 24));

-      lParamKey = lParamKey | (0x80000000 & ((p->flags & LLKHF_UP) << 24));

-

-      /* Send message to our main window that has the keyboard focus */

-      PostMessage (hwnd,

-		   (UINT) wParam,

-		   (WPARAM) p->vkCode,

-		   lParamKey);

-

-      return 1;

-    }

-

-  /* Call next hook */

-  return CallNextHookEx (NULL, iCode, wParam, lParam);

-}

-

-

-/*

- * Attempt to install the keyboard hook, return FALSE if it was not installed

- */

-

-Bool

-winInstallKeyboardHookLL (void)

-{

-  OSVERSIONINFO		osvi = {0};

-  

-  /* Get operating system version information */

-  osvi.dwOSVersionInfoSize = sizeof (osvi);

-  GetVersionEx (&osvi);

-

-  /* Branch on platform ID */

-  switch (osvi.dwPlatformId)

-    {

-    case VER_PLATFORM_WIN32_NT:

-      /* Low-level is supported on NT 4.0 SP3+ only */

-      /* TODO: Return FALSE on NT 4.0 with no SP, SP1, or SP2 */

-      break;

-

-    case VER_PLATFORM_WIN32_WINDOWS:

-      /* Low-level hook is not supported on non-NT */

-      return FALSE;

-    }

-

-  /* Install the hook only once */

-  if (!g_hhookKeyboardLL)

-    g_hhookKeyboardLL = SetWindowsHookEx (WH_KEYBOARD_LL,

-					  winKeyboardMessageHookLL,

-					  g_hInstance,

-					  0);

-

-  return TRUE;

-}

-

-

-/*

- * Remove the keyboard hook if it is installed

- */

-

-void

-winRemoveKeyboardHookLL (void)

-{

-  if (g_hhookKeyboardLL)

-    UnhookWindowsHookEx (g_hhookKeyboardLL);

-  g_hhookKeyboardLL = NULL;

-}

+/*
+ *Copyright (C) 2004 Harold L Hunt II 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 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 HAROLD L HUNT II BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of Harold L Hunt II
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from Harold L Hunt II.
+ *
+ * Authors:	Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+static HHOOK g_hhookKeyboardLL = NULL;
+
+/*
+ * Function prototypes
+ */
+
+static LRESULT CALLBACK
+winKeyboardMessageHookLL(int iCode, WPARAM wParam, LPARAM lParam);
+
+#ifndef LLKHF_EXTENDED
+#define LLKHF_EXTENDED  0x00000001
+#endif
+#ifndef LLKHF_UP
+#define LLKHF_UP  0x00000080
+#endif
+
+/*
+ * KeyboardMessageHook
+ */
+
+static LRESULT CALLBACK
+winKeyboardMessageHookLL(int iCode, WPARAM wParam, LPARAM lParam)
+{
+    BOOL fPassKeystroke = FALSE;
+    BOOL fPassAltTab = TRUE;
+    PKBDLLHOOKSTRUCT p = (PKBDLLHOOKSTRUCT) lParam;
+    HWND hwnd = GetActiveWindow();
+
+#ifdef XWIN_MULTIWINDOW
+    WindowPtr pWin = NULL;
+    winPrivWinPtr pWinPriv = NULL;
+    winPrivScreenPtr pScreenPriv = NULL;
+    winScreenInfo *pScreenInfo = NULL;
+
+    /* Check if the Windows window property for our X window pointer is valid */
+    if ((pWin = GetProp(hwnd, WIN_WINDOW_PROP)) != NULL) {
+        /* Get a pointer to our window privates */
+        pWinPriv = winGetWindowPriv(pWin);
+
+        /* Get pointers to our screen privates and screen info */
+        pScreenPriv = pWinPriv->pScreenPriv;
+        pScreenInfo = pScreenPriv->pScreenInfo;
+
+        if (pScreenInfo->fMultiWindow)
+            fPassAltTab = FALSE;
+    }
+#endif
+
+    /* Pass keystrokes on to our main message loop */
+    if (iCode == HC_ACTION) {
+        winDebug("winKeyboardMessageHook: vkCode: %08x scanCode: %08x\n",
+                 p->vkCode, p->scanCode);
+
+        switch (wParam) {
+        case WM_KEYDOWN:
+        case WM_SYSKEYDOWN:
+        case WM_KEYUP:
+        case WM_SYSKEYUP:
+            fPassKeystroke =
+                (fPassAltTab &&
+                 (p->vkCode == VK_TAB) && ((p->flags & LLKHF_ALTDOWN) != 0))
+                || (p->vkCode == VK_LWIN) || (p->vkCode == VK_RWIN);
+            break;
+        }
+    }
+
+    /*
+     * Pass message on to our main message loop.
+     * We process this immediately with SendMessage so that the keystroke
+     * appears in, hopefully, the correct order.
+     */
+    if (fPassKeystroke) {
+        LPARAM lParamKey = 0x0;
+
+        /* Construct the lParam from KBDLLHOOKSTRUCT */
+        lParamKey = lParamKey | (0x0000FFFF & 0x00000001);      /* Repeat count */
+        lParamKey = lParamKey | (0x00FF0000 & (p->scanCode << 16));
+        lParamKey = lParamKey
+            | (0x01000000 & ((p->flags & LLKHF_EXTENDED) << 23));
+        lParamKey = lParamKey
+            | (0x20000000 & ((p->flags & LLKHF_ALTDOWN) << 24));
+        lParamKey = lParamKey | (0x80000000 & ((p->flags & LLKHF_UP) << 24));
+
+        /* Send message to our main window that has the keyboard focus */
+        PostMessage(hwnd, (UINT) wParam, (WPARAM) p->vkCode, lParamKey);
+
+        return 1;
+    }
+
+    /* Call next hook */
+    return CallNextHookEx(NULL, iCode, wParam, lParam);
+}
+
+/*
+ * Attempt to install the keyboard hook, return FALSE if it was not installed
+ */
+
+Bool
+winInstallKeyboardHookLL(void)
+{
+    OSVERSIONINFO osvi = { 0 };
+
+    /* Get operating system version information */
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+    GetVersionEx(&osvi);
+
+    /* Branch on platform ID */
+    switch (osvi.dwPlatformId) {
+    case VER_PLATFORM_WIN32_NT:
+        /* Low-level is supported on NT 4.0 SP3+ only */
+        /* TODO: Return FALSE on NT 4.0 with no SP, SP1, or SP2 */
+        break;
+
+    case VER_PLATFORM_WIN32_WINDOWS:
+        /* Low-level hook is not supported on non-NT */
+        return FALSE;
+    }
+
+    /* Install the hook only once */
+    if (!g_hhookKeyboardLL)
+        g_hhookKeyboardLL = SetWindowsHookEx(WH_KEYBOARD_LL,
+                                             winKeyboardMessageHookLL,
+                                             g_hInstance, 0);
+
+    return TRUE;
+}
+
+/*
+ * Remove the keyboard hook if it is installed
+ */
+
+void
+winRemoveKeyboardHookLL(void)
+{
+    if (g_hhookKeyboardLL)
+        UnhookWindowsHookEx(g_hhookKeyboardLL);
+    g_hhookKeyboardLL = NULL;
+}
diff --git a/xorg-server/hw/xwin/winlayouts.h b/xorg-server/hw/xwin/winlayouts.h
index 743f03c39..d8875ceb5 100644
--- a/xorg-server/hw/xwin/winlayouts.h
+++ b/xorg-server/hw/xwin/winlayouts.h
@@ -1,95 +1,97 @@
-/*

- * Copyright (c) 2005 Alexander Gottwald

- *

- * 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-/* Definitions for various keyboard layouts from windows and their 

- * XKB settings.

- */

-

-typedef struct 

-{

-    unsigned int winlayout;

-    int winkbtype;

-    char *xkbmodel;

-    char *xkblayout;

-    char *xkbvariant;

-    char *xkboptions;

-    char *layoutname;

-} WinKBLayoutRec, *WinKBLayoutPtr;

-

-/*

-   This table is sorted by low byte of winlayout, then by next byte, etc.

-*/

-

-WinKBLayoutRec winKBLayouts[] =

-{

-    {  0x00000404, -1, "pc105",     "zh_TW",     NULL,        NULL, "Chinese (Taiwan)"},

-    {  0x00000405, -1, "pc105",     "cz",        NULL,        NULL, "Czech"},

-    {  0x00010405, -1, "pc105",     "cz_qwerty", NULL,        NULL, "Czech (QWERTY)"},

-    {  0x00000406, -1, "pc105",     "dk",        NULL,        NULL, "Danish"},

-    {  0x00000407, -1, "pc105",     "de",        NULL,        NULL, "German (Germany)"},

-    {  0x00010407, -1, "pc105",     "de",        NULL,        NULL, "German (Germany,IBM)"},

-    {  0x00000807, -1, "pc105",     "ch",        "de",        NULL, "German (Switzerland)"},

-    {  0x00000409, -1, "pc105",     "us",        NULL,        NULL, "English (USA)"},

-    {  0x00010409, -1, "pc105",     "dvorak",    NULL,        NULL, "English (USA,Dvorak)"},

-    {  0x00020409, -1, "pc105",     "us_intl",   NULL,        NULL, "English (USA,International)"},

-    {  0x00000809, -1, "pc105",     "gb",        NULL,        NULL, "English (United Kingdom)"},

-    {  0x00001009, -1, "pc105",     "ca",        "fr",        NULL, "French (Canada)"},

-    {  0x00011009, -1, "pc105",     "ca",        "multix",    NULL, "Canadian Multilingual Standard"},

-    {  0x00001809, -1, "pc105",     "ie",        NULL,        NULL, "Irish"},

-    {  0x0000040a, -1, "pc105",     "es",        NULL,        NULL, "Spanish (Spain,Traditional Sort)"},

-    {  0x0000080a, -1, "pc105",     "latam",     NULL,        NULL, "Latin American"},

-    {  0x0000040b, -1, "pc105",     "fi",        NULL,        NULL, "Finnish"},

-    {  0x0000040c, -1, "pc105",     "fr",        NULL,        NULL, "French (Standard)"},

-    {  0x0000080c, -1, "pc105",     "be",        NULL,        NULL, "French (Belgian)"},

-    {  0x00000c0c, -1, "pc105",     "ca",        "fr-legacy", NULL, "French (Canada, Legacy)"},

-    {  0x0000100c, -1, "pc105",     "ch",        "fr",        NULL, "French (Switzerland)"},

-    {  0x0000040d, -1, "pc105",     "il",        NULL,        NULL, "Hebrew"},

-    {  0x0000040e, -1, "pc105",     "hu",        NULL,        NULL, "Hungarian"},

-    {  0x0000040f, -1, "pc105",     "is",        NULL,        NULL, "Icelandic"},

-    {  0x00000410, -1, "pc105",     "it",        NULL,        NULL, "Italian"},

-    {  0x00010410, -1, "pc105",     "it",        NULL,        NULL, "Italian (142)"},

-    {  0xa0000410, -1, "macbook79", "it",        "mac",       NULL, "Italiano (Apple)"},

-    {  0x00000411,  7, "jp106",     "jp",        NULL,        NULL, "Japanese"},

-    {  0x00000413, -1, "pc105",     "nl",        NULL,        NULL, "Dutch"},

-    {  0x00000813, -1, "pc105",     "be",        NULL,        NULL, "Dutch (Belgian)"},

-    {  0x00000414, -1, "pc105",     "no",        NULL,        NULL, "Norwegian"},

-    {  0x00000415, -1, "pc105",     "pl",        NULL,        NULL, "Polish (Programmers)"},

-    {  0x00000416, -1, "pc105",     "br",        NULL,        NULL, "Portuguese (Brazil,ABNT)"},

-    {  0x00010416, -1, "abnt2",     "br",        NULL,        NULL, "Portuguese (Brazil,ABNT2)"},

-    {  0x00000816, -1, "pc105",     "pt",        NULL,        NULL, "Portuguese (Portugal)"},

-    {  0x0000041a, -1, "pc105",     "hr",        NULL,        NULL, "Croatian"},

-    {  0x0000041d, -1, "pc105",     "se",        NULL,        NULL, "Swedish (Sweden)"},

-    {  0x0000041f, -1, "pc105",     "tr",        NULL,        NULL, "Turkish (Q)"},

-    {  0x0001041f, -1, "pc105",     "tr",        "f",         NULL, "Turkish (F)"},

-    {  0x00000424, -1, "pc105",     "si",        NULL,        NULL, "Slovenian"},

-    {  0x00000425, -1, "pc105",     "ee",        NULL,        NULL, "Estonian"},

-    {  0x00000452, -1, "pc105",     "gb",        "intl",      NULL, "United Kingdom (Extended)"},

-    {          -1, -1, NULL,        NULL,        NULL,        NULL, NULL}

-};

-

-/*

-  See http://technet.microsoft.com/en-us/library/cc766503%28WS.10%29.aspx

-  for a listing of input locale (keyboard layout) codes

-*/

+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+/* Definitions for various keyboard layouts from windows and their 
+ * XKB settings.
+ */
+
+typedef struct {
+    unsigned int winlayout;
+    int winkbtype;
+    char *xkbmodel;
+    char *xkblayout;
+    char *xkbvariant;
+    char *xkboptions;
+    char *layoutname;
+} WinKBLayoutRec, *WinKBLayoutPtr;
+
+/*
+   This table is sorted by low byte of winlayout, then by next byte, etc.
+*/
+
+WinKBLayoutRec winKBLayouts[] = {
+    {0x00000404, -1, "pc105", "zh_TW", NULL, NULL, "Chinese (Taiwan)"},
+    {0x00000405, -1, "pc105", "cz", NULL, NULL, "Czech"},
+    {0x00010405, -1, "pc105", "cz_qwerty", NULL, NULL, "Czech (QWERTY)"},
+    {0x00000406, -1, "pc105", "dk", NULL, NULL, "Danish"},
+    {0x00000407, -1, "pc105", "de", NULL, NULL, "German (Germany)"},
+    {0x00010407, -1, "pc105", "de", NULL, NULL, "German (Germany,IBM)"},
+    {0x00000807, -1, "pc105", "ch", "de", NULL, "German (Switzerland)"},
+    {0x00000409, -1, "pc105", "us", NULL, NULL, "English (USA)"},
+    {0x00010409, -1, "pc105", "dvorak", NULL, NULL, "English (USA,Dvorak)"},
+    {0x00020409, -1, "pc105", "us_intl", NULL, NULL,
+     "English (USA,International)"},
+    {0x00000809, -1, "pc105", "gb", NULL, NULL, "English (United Kingdom)"},
+    {0x00001009, -1, "pc105", "ca", "fr", NULL, "French (Canada)"},
+    {0x00011009, -1, "pc105", "ca", "multix", NULL,
+     "Canadian Multilingual Standard"},
+    {0x00001809, -1, "pc105", "ie", NULL, NULL, "Irish"},
+    {0x0000040a, -1, "pc105", "es", NULL, NULL,
+     "Spanish (Spain,Traditional Sort)"},
+    {0x0000080a, -1, "pc105", "latam", NULL, NULL, "Latin American"},
+    {0x0000040b, -1, "pc105", "fi", NULL, NULL, "Finnish"},
+    {0x0000040c, -1, "pc105", "fr", NULL, NULL, "French (Standard)"},
+    {0x0000080c, -1, "pc105", "be", NULL, NULL, "French (Belgian)"},
+    {0x00000c0c, -1, "pc105", "ca", "fr-legacy", NULL,
+     "French (Canada, Legacy)"},
+    {0x0000100c, -1, "pc105", "ch", "fr", NULL, "French (Switzerland)"},
+    {0x0000040d, -1, "pc105", "il", NULL, NULL, "Hebrew"},
+    {0x0000040e, -1, "pc105", "hu", NULL, NULL, "Hungarian"},
+    {0x0000040f, -1, "pc105", "is", NULL, NULL, "Icelandic"},
+    {0x00000410, -1, "pc105", "it", NULL, NULL, "Italian"},
+    {0x00010410, -1, "pc105", "it", NULL, NULL, "Italian (142)"},
+    {0xa0000410, -1, "macbook79", "it", "mac", NULL, "Italiano (Apple)"},
+    {0x00000411, 7, "jp106", "jp", NULL, NULL, "Japanese"},
+    {0x00000413, -1, "pc105", "nl", NULL, NULL, "Dutch"},
+    {0x00000813, -1, "pc105", "be", NULL, NULL, "Dutch (Belgian)"},
+    {0x00000414, -1, "pc105", "no", NULL, NULL, "Norwegian"},
+    {0x00000415, -1, "pc105", "pl", NULL, NULL, "Polish (Programmers)"},
+    {0x00000416, -1, "pc105", "br", NULL, NULL, "Portuguese (Brazil,ABNT)"},
+    {0x00010416, -1, "abnt2", "br", NULL, NULL, "Portuguese (Brazil,ABNT2)"},
+    {0x00000816, -1, "pc105", "pt", NULL, NULL, "Portuguese (Portugal)"},
+    {0x0000041a, -1, "pc105", "hr", NULL, NULL, "Croatian"},
+    {0x0000041d, -1, "pc105", "se", NULL, NULL, "Swedish (Sweden)"},
+    {0x0000041f, -1, "pc105", "tr", NULL, NULL, "Turkish (Q)"},
+    {0x0001041f, -1, "pc105", "tr", "f", NULL, "Turkish (F)"},
+    {0x00000424, -1, "pc105", "si", NULL, NULL, "Slovenian"},
+    {0x00000425, -1, "pc105", "ee", NULL, NULL, "Estonian"},
+    {0x00000452, -1, "pc105", "gb", "intl", NULL, "United Kingdom (Extended)"},
+    {-1, -1, NULL, NULL, NULL, NULL, NULL}
+};
+
+/*
+  See http://technet.microsoft.com/en-us/library/cc766503%28WS.10%29.aspx
+  for a listing of input locale (keyboard layout) codes
+*/
diff --git a/xorg-server/hw/xwin/winmisc.c b/xorg-server/hw/xwin/winmisc.c
index 8e6698118..10f97322f 100644
--- a/xorg-server/hw/xwin/winmisc.c
+++ b/xorg-server/hw/xwin/winmisc.c
@@ -41,112 +41,103 @@
  */
 
 void
-winQueryBestSizeNativeGDI (int class, unsigned short *pWidth,
-			   unsigned short *pHeight, ScreenPtr pScreen)
+winQueryBestSizeNativeGDI(int class, unsigned short *pWidth,
+                          unsigned short *pHeight, ScreenPtr pScreen)
 {
-  ErrorF ("winQueryBestSizeNativeGDI\n");
+    ErrorF("winQueryBestSizeNativeGDI\n");
 }
 #endif
 
-
 /*
  * Count the number of one bits in a color mask.
  */
 
 CARD8
-winCountBits (DWORD dw)
+winCountBits(DWORD dw)
 {
-  DWORD		dwBits = 0;
+    DWORD dwBits = 0;
 
-  while (dw)
-    {
-      dwBits += (dw & 1);
-      dw >>= 1;
+    while (dw) {
+        dwBits += (dw & 1);
+        dw >>= 1;
     }
 
-  return dwBits;
+    return dwBits;
 }
 
-
 /*
  * Modify the screen pixmap to point to the new framebuffer address
  */
 
 Bool
-winUpdateFBPointer (ScreenPtr pScreen, void *pbits)
+winUpdateFBPointer(ScreenPtr pScreen, void *pbits)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-
-  /* Location of shadow framebuffer has changed */
-  pScreenInfo->pfb = pbits;
-
-  /* Update the screen pixmap */
-  if (!(*pScreen->ModifyPixmapHeader) (pScreen->devPrivate,
-				       pScreen->width,
-				       pScreen->height,
-				       pScreen->rootDepth,
-				       BitsPerPixel (pScreen->rootDepth),
-				       PixmapBytePad (pScreenInfo->dwStride,
-						      pScreenInfo->dwBPP),
-				       pScreenInfo->pfb))
-    {
-      FatalError ("winUpdateFramebufferPointer - Failed modifying "\
-		  "screen pixmap\n");
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /* Location of shadow framebuffer has changed */
+    pScreenInfo->pfb = pbits;
+
+    /* Update the screen pixmap */
+    if (!(*pScreen->ModifyPixmapHeader) (pScreen->devPrivate,
+                                         pScreen->width,
+                                         pScreen->height,
+                                         pScreen->rootDepth,
+                                         BitsPerPixel(pScreen->rootDepth),
+                                         PixmapBytePad(pScreenInfo->dwStride,
+                                                       pScreenInfo->dwBPP),
+                                         pScreenInfo->pfb)) {
+        FatalError("winUpdateFramebufferPointer - Failed modifying "
+                   "screen pixmap\n");
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 #ifdef XWIN_NATIVEGDI
 /*
  * Paint the window background with the specified color
  */
 
 BOOL
-winPaintBackground (HWND hwnd, COLORREF colorref)
+winPaintBackground(HWND hwnd, COLORREF colorref)
 {
-  HDC			hdc;
-  HBRUSH		hbrush;
-  RECT			rect;
-
-  /* Create an hdc */
-  hdc = GetDC (hwnd);
-  if (hdc == NULL)
-    {
-      printf ("gdiWindowProc - GetDC failed\n");
-      exit (1);
+    HDC hdc;
+    HBRUSH hbrush;
+    RECT rect;
+
+    /* Create an hdc */
+    hdc = GetDC(hwnd);
+    if (hdc == NULL) {
+        printf("gdiWindowProc - GetDC failed\n");
+        exit(1);
     }
 
-  /* Create and select blue brush */
-  hbrush = CreateSolidBrush (colorref);
-  if (hbrush == NULL)
-    {
-      printf ("gdiWindowProc - CreateSolidBrush failed\n");
-      exit (1);
+    /* Create and select blue brush */
+    hbrush = CreateSolidBrush(colorref);
+    if (hbrush == NULL) {
+        printf("gdiWindowProc - CreateSolidBrush failed\n");
+        exit(1);
     }
 
-  /* Get window extents */
-  if (GetClientRect (hwnd, &rect) == FALSE)
-    {
-      printf ("gdiWindowProc - GetClientRect failed\n");
-      exit (1);
+    /* Get window extents */
+    if (GetClientRect(hwnd, &rect) == FALSE) {
+        printf("gdiWindowProc - GetClientRect failed\n");
+        exit(1);
     }
 
-  /* Fill window with blue brush */
-  if (FillRect (hdc, &rect, hbrush) == 0)
-    {
-      printf ("gdiWindowProc - FillRect failed\n");
-      exit (1);
+    /* Fill window with blue brush */
+    if (FillRect(hdc, &rect, hbrush) == 0) {
+        printf("gdiWindowProc - FillRect failed\n");
+        exit(1);
     }
 
-  /* Delete blue brush */
-  DeleteObject (hbrush);
+    /* Delete blue brush */
+    DeleteObject(hbrush);
 
-  /* Release the hdc */
-  ReleaseDC (hwnd, hdc);
+    /* Release the hdc */
+    ReleaseDC(hwnd, hdc);
 
-  return TRUE;
+    return TRUE;
 }
 #endif
diff --git a/xorg-server/hw/xwin/winmonitors.c b/xorg-server/hw/xwin/winmonitors.c
index 967ae6d35..26e20b743 100644
--- a/xorg-server/hw/xwin/winmonitors.c
+++ b/xorg-server/hw/xwin/winmonitors.c
@@ -27,7 +27,6 @@ from The Open Group.
 
 */
 
-
 #include "win.h"
 #include "winmonitors.h"
 
@@ -36,24 +35,26 @@ from The Open Group.
  */
 
 static
-wBOOL CALLBACK getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data)
+    wBOOL CALLBACK
+getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data)
 {
-  struct GetMonitorInfoData* data = (struct GetMonitorInfoData*)_data;
-  // only get data for monitor number specified in <data>
-  data->monitorNum++;
-  if (data->monitorNum == data->requestedMonitor)
-  {
-	data->bMonitorSpecifiedExists = TRUE;
-	data->monitorOffsetX = rect->left;
-	data->monitorOffsetY = rect->top;
-	data->monitorHeight  = rect->bottom - rect->top;
-	data->monitorWidth   = rect->right  - rect->left;
-    return FALSE;
-  }
-  return TRUE;
+    struct GetMonitorInfoData *data = (struct GetMonitorInfoData *) _data;
+
+    // only get data for monitor number specified in <data>
+    data->monitorNum++;
+    if (data->monitorNum == data->requestedMonitor) {
+        data->bMonitorSpecifiedExists = TRUE;
+        data->monitorOffsetX = rect->left;
+        data->monitorOffsetY = rect->top;
+        data->monitorHeight = rect->bottom - rect->top;
+        data->monitorWidth = rect->right - rect->left;
+        return FALSE;
+    }
+    return TRUE;
 }
 
-Bool QueryMonitor(int index, struct GetMonitorInfoData *data)
+Bool
+QueryMonitor(int index, struct GetMonitorInfoData *data)
 {
     /* prepare data */
     if (data == NULL)
diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c
index 99509f28e..9d896c90e 100644
--- a/xorg-server/hw/xwin/winmouse.c
+++ b/xorg-server/hw/xwin/winmouse.c
@@ -37,336 +37,308 @@
 #include "win.h"
 
 #include "inputstr.h"
-#include "exevents.h" /* for button/axes labels */
+#include "exevents.h"           /* for button/axes labels */
 #include "xserver-properties.h"
 #include "inpututils.h"
 
 /* Peek the internal button mapping */
 static CARD8 const *g_winMouseButtonMap = NULL;
 
-
 /*
  * Local prototypes
  */
 
 static void
-winMouseCtrl (DeviceIntPtr pDevice, PtrCtrl *pCtrl);
-
+ winMouseCtrl(DeviceIntPtr pDevice, PtrCtrl * pCtrl);
 
 static void
-winMouseCtrl (DeviceIntPtr pDevice, PtrCtrl *pCtrl)
+winMouseCtrl(DeviceIntPtr pDevice, PtrCtrl * pCtrl)
 {
 }
 
-
 /*
  * See Porting Layer Definition - p. 18
  * This is known as a DeviceProc
  */
 
 int
-winMouseProc (DeviceIntPtr pDeviceInt, int iState)
+winMouseProc(DeviceIntPtr pDeviceInt, int iState)
 {
-  int 			lngMouseButtons, i;
-  int			lngWheelEvents = 2;
-  CARD8			*map;
-  DevicePtr		pDevice = (DevicePtr) pDeviceInt;
-  Atom *btn_labels;
-  Atom axes_labels[2];
-
-  switch (iState)
-    {
+    int lngMouseButtons, i;
+    int lngWheelEvents = 2;
+    CARD8 *map;
+    DevicePtr pDevice = (DevicePtr) pDeviceInt;
+    Atom *btn_labels;
+    Atom axes_labels[2];
+
+    switch (iState) {
     case DEVICE_INIT:
-      /* Get number of mouse buttons */
-      lngMouseButtons = GetSystemMetrics(SM_CMOUSEBUTTONS);
-      winMsg(X_PROBED, "%d mouse buttons found\n", lngMouseButtons);
-
-      /* Mapping of windows events to X events:
-       * LEFT:1 MIDDLE:2 RIGHT:3
-       * SCROLL_UP:4 SCROLL_DOWN:5
-       * XBUTTON 1:6 XBUTTON 2:7 ...
-       *
-       * To map scroll wheel correctly we need at least the 3 normal buttons
-       */
-      if (lngMouseButtons < 3)
-        lngMouseButtons = 3;
-
-      /* allocate memory: 
-       * number of buttons + 2x mouse wheel event + 1 extra (offset for map) 
-       */
-      map = malloc(sizeof(CARD8) * (lngMouseButtons + lngWheelEvents + 1));
-    
-      /* initalize button map */ 
-      map[0] = 0;
-      for (i=1; i <= lngMouseButtons + lngWheelEvents; i++)
-      	map[i] = i;
-
-      btn_labels = calloc((lngMouseButtons + lngWheelEvents), sizeof(Atom));
-      btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
-      btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
-      btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
-      btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
-      btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
-
-      axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
-      axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
-
-      InitPointerDeviceStruct (pDevice,
-			       map,
-			       lngMouseButtons + lngWheelEvents,
-			       btn_labels,
-			       winMouseCtrl,
-			       GetMotionHistorySize(),
-			       2,
-			       axes_labels);
-      free(map);
-      free(btn_labels);
-
-      g_winMouseButtonMap = pDeviceInt->button->map;
-      break;
+        /* Get number of mouse buttons */
+        lngMouseButtons = GetSystemMetrics(SM_CMOUSEBUTTONS);
+        winMsg(X_PROBED, "%d mouse buttons found\n", lngMouseButtons);
+
+        /* Mapping of windows events to X events:
+         * LEFT:1 MIDDLE:2 RIGHT:3
+         * SCROLL_UP:4 SCROLL_DOWN:5
+         * XBUTTON 1:6 XBUTTON 2:7 ...
+         *
+         * To map scroll wheel correctly we need at least the 3 normal buttons
+         */
+        if (lngMouseButtons < 3)
+            lngMouseButtons = 3;
+
+        /* allocate memory: 
+         * number of buttons + 2x mouse wheel event + 1 extra (offset for map) 
+         */
+        map = malloc(sizeof(CARD8) * (lngMouseButtons + lngWheelEvents + 1));
+
+        /* initalize button map */
+        map[0] = 0;
+        for (i = 1; i <= lngMouseButtons + lngWheelEvents; i++)
+            map[i] = i;
+
+        btn_labels = calloc((lngMouseButtons + lngWheelEvents), sizeof(Atom));
+        btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+        btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+        btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+        btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+        btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+
+        axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+        axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+
+        InitPointerDeviceStruct(pDevice,
+                                map,
+                                lngMouseButtons + lngWheelEvents,
+                                btn_labels,
+                                winMouseCtrl,
+                                GetMotionHistorySize(), 2, axes_labels);
+        free(map);
+        free(btn_labels);
+
+        g_winMouseButtonMap = pDeviceInt->button->map;
+        break;
 
     case DEVICE_ON:
-      pDevice->on = TRUE;
-      break;
+        pDevice->on = TRUE;
+        break;
 
     case DEVICE_CLOSE:
-      g_winMouseButtonMap = NULL;
+        g_winMouseButtonMap = NULL;
 
     case DEVICE_OFF:
-      pDevice->on = FALSE;
-      break;
+        pDevice->on = FALSE;
+        break;
     }
-  return Success;
+    return Success;
 }
 
-
 /* Handle the mouse wheel */
 int
-winMouseWheel (ScreenPtr pScreen, int iDeltaZ)
+winMouseWheel(ScreenPtr pScreen, int iDeltaZ)
 {
-  winScreenPriv(pScreen);
-  int button; /* Button4 or Button5 */
-
-  /* Button4 = WheelUp */
-  /* Button5 = WheelDown */
-
-  /* Do we have any previous delta stored? */
-  if ((pScreenPriv->iDeltaZ > 0
-       && iDeltaZ > 0)
-      || (pScreenPriv->iDeltaZ < 0
-	  && iDeltaZ < 0))
-    {
-      /* Previous delta and of same sign as current delta */
-      iDeltaZ += pScreenPriv->iDeltaZ;
-      pScreenPriv->iDeltaZ = 0;
+    winScreenPriv(pScreen);
+    int button;                 /* Button4 or Button5 */
+
+    /* Button4 = WheelUp */
+    /* Button5 = WheelDown */
+
+    /* Do we have any previous delta stored? */
+    if ((pScreenPriv->iDeltaZ > 0 && iDeltaZ > 0)
+        || (pScreenPriv->iDeltaZ < 0 && iDeltaZ < 0)) {
+        /* Previous delta and of same sign as current delta */
+        iDeltaZ += pScreenPriv->iDeltaZ;
+        pScreenPriv->iDeltaZ = 0;
     }
-  else
-    {
-      /*
-       * Previous delta of different sign, or zero.
-       * We will set it to zero for either case,
-       * as blindly setting takes just as much time
-       * as checking, then setting if necessary :)
-       */
-      pScreenPriv->iDeltaZ = 0;
+    else {
+        /*
+         * Previous delta of different sign, or zero.
+         * We will set it to zero for either case,
+         * as blindly setting takes just as much time
+         * as checking, then setting if necessary :)
+         */
+        pScreenPriv->iDeltaZ = 0;
     }
 
-  /*
-   * Only process this message if the wheel has moved further than
-   * WHEEL_DELTA
-   */
-  if (iDeltaZ >= WHEEL_DELTA || (-1 * iDeltaZ) >= WHEEL_DELTA)
-    {
-      pScreenPriv->iDeltaZ = 0;
-	  
-      /* Figure out how many whole deltas of the wheel we have */
-      iDeltaZ /= WHEEL_DELTA;
+    /*
+     * Only process this message if the wheel has moved further than
+     * WHEEL_DELTA
+     */
+    if (iDeltaZ >= WHEEL_DELTA || (-1 * iDeltaZ) >= WHEEL_DELTA) {
+        pScreenPriv->iDeltaZ = 0;
+
+        /* Figure out how many whole deltas of the wheel we have */
+        iDeltaZ /= WHEEL_DELTA;
     }
-  else
-    {
-      /*
-       * Wheel has not moved past WHEEL_DELTA threshold;
-       * we will store the wheel delta until the threshold
-       * has been reached.
-       */
-      pScreenPriv->iDeltaZ = iDeltaZ;
-      return 0;
+    else {
+        /*
+         * Wheel has not moved past WHEEL_DELTA threshold;
+         * we will store the wheel delta until the threshold
+         * has been reached.
+         */
+        pScreenPriv->iDeltaZ = iDeltaZ;
+        return 0;
     }
 
-  /* Set the button to indicate up or down wheel delta */
-  if (iDeltaZ > 0)
-    {
-      button = Button4;
+    /* Set the button to indicate up or down wheel delta */
+    if (iDeltaZ > 0) {
+        button = Button4;
     }
-  else
-    {
-      button = Button5;
+    else {
+        button = Button5;
     }
 
-  /*
-   * Flip iDeltaZ to positive, if negative,
-   * because always need to generate a *positive* number of
-   * button clicks for the Z axis.
-   */
-  if (iDeltaZ < 0)
-    {
-      iDeltaZ *= -1;
+    /*
+     * Flip iDeltaZ to positive, if negative,
+     * because always need to generate a *positive* number of
+     * button clicks for the Z axis.
+     */
+    if (iDeltaZ < 0) {
+        iDeltaZ *= -1;
     }
 
-  /* Generate X input messages for each wheel delta we have seen */
-  while (iDeltaZ--)
-    {
-      /* Push the wheel button */
-      winMouseButtonsSendEvent (ButtonPress, button);
+    /* Generate X input messages for each wheel delta we have seen */
+    while (iDeltaZ--) {
+        /* Push the wheel button */
+        winMouseButtonsSendEvent(ButtonPress, button);
 
-      /* Release the wheel button */
-      winMouseButtonsSendEvent (ButtonRelease, button);
+        /* Release the wheel button */
+        winMouseButtonsSendEvent(ButtonRelease, button);
     }
 
-  return 0;
+    return 0;
 }
 
-
 /*
  * Enqueue a mouse button event
  */
 
 void
-winMouseButtonsSendEvent (int iEventType, int iButton)
+winMouseButtonsSendEvent(int iEventType, int iButton)
 {
-  ValuatorMask mask;
+    ValuatorMask mask;
 
-  if (g_winMouseButtonMap)
-    iButton = g_winMouseButtonMap[iButton];
+    if (g_winMouseButtonMap)
+        iButton = g_winMouseButtonMap[iButton];
 
-  valuator_mask_zero(&mask);
-  QueuePointerEvents(g_pwinPointer, iEventType, iButton,
-		     POINTER_RELATIVE, &mask);
+    valuator_mask_zero(&mask);
+    QueuePointerEvents(g_pwinPointer, iEventType, iButton,
+                       POINTER_RELATIVE, &mask);
 
 #if CYGDEBUG
-  ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n",
-          iEventType, iButton);
+    ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n",
+           iEventType, iButton);
 #endif
 }
 
-
 /*
  * Decide what to do with a Windows mouse message
  */
 
 int
-winMouseButtonsHandle (ScreenPtr pScreen,
-		       int iEventType, int iButton,
-		       WPARAM wParam)
+winMouseButtonsHandle(ScreenPtr pScreen,
+                      int iEventType, int iButton, WPARAM wParam)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-
-  /* Send button events right away if emulate 3 buttons is off */
-  if (pScreenInfo->iE3BTimeout == WIN_E3B_OFF)
-    {
-      /* Emulate 3 buttons is off, send the button event */
-      winMouseButtonsSendEvent (iEventType, iButton);
-      return 0;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /* Send button events right away if emulate 3 buttons is off */
+    if (pScreenInfo->iE3BTimeout == WIN_E3B_OFF) {
+        /* Emulate 3 buttons is off, send the button event */
+        winMouseButtonsSendEvent(iEventType, iButton);
+        return 0;
     }
 
-  /* Emulate 3 buttons is on, let the fun begin */
-  if (iEventType == ButtonPress
-      && pScreenPriv->iE3BCachedPress == 0
-      && !pScreenPriv->fE3BFakeButton2Sent)
-    {
-      /*
-       * Button was pressed, no press is cached,
-       * and there is no fake button 2 release pending.
-       */
-
-      /* Store button press type */
-      pScreenPriv->iE3BCachedPress = iButton;
-
-      /*
-       * Set a timer to send this button press if the other button
-       * is not pressed within the timeout time.
-       */
-      SetTimer (pScreenPriv->hwndScreen,
-		WIN_E3B_TIMER_ID,
-		pScreenInfo->iE3BTimeout,
-		NULL);
+    /* Emulate 3 buttons is on, let the fun begin */
+    if (iEventType == ButtonPress
+        && pScreenPriv->iE3BCachedPress == 0
+        && !pScreenPriv->fE3BFakeButton2Sent) {
+        /*
+         * Button was pressed, no press is cached,
+         * and there is no fake button 2 release pending.
+         */
+
+        /* Store button press type */
+        pScreenPriv->iE3BCachedPress = iButton;
+
+        /*
+         * Set a timer to send this button press if the other button
+         * is not pressed within the timeout time.
+         */
+        SetTimer(pScreenPriv->hwndScreen,
+                 WIN_E3B_TIMER_ID, pScreenInfo->iE3BTimeout, NULL);
     }
-  else if (iEventType == ButtonPress
-	   && pScreenPriv->iE3BCachedPress != 0
-	   && pScreenPriv->iE3BCachedPress != iButton
-	   && !pScreenPriv->fE3BFakeButton2Sent)
-    {
-      /*
-       * Button press is cached, other button was pressed,
-       * and there is no fake button 2 release pending.
-       */
-
-      /* Mouse button was cached and other button was pressed */
-      KillTimer (pScreenPriv->hwndScreen, WIN_E3B_TIMER_ID);
-      pScreenPriv->iE3BCachedPress = 0;
-
-      /* Send fake middle button */
-      winMouseButtonsSendEvent (ButtonPress, Button2);
-
-      /* Indicate that a fake middle button event was sent */
-      pScreenPriv->fE3BFakeButton2Sent = TRUE;
+    else if (iEventType == ButtonPress
+             && pScreenPriv->iE3BCachedPress != 0
+             && pScreenPriv->iE3BCachedPress != iButton
+             && !pScreenPriv->fE3BFakeButton2Sent) {
+        /*
+         * Button press is cached, other button was pressed,
+         * and there is no fake button 2 release pending.
+         */
+
+        /* Mouse button was cached and other button was pressed */
+        KillTimer(pScreenPriv->hwndScreen, WIN_E3B_TIMER_ID);
+        pScreenPriv->iE3BCachedPress = 0;
+
+        /* Send fake middle button */
+        winMouseButtonsSendEvent(ButtonPress, Button2);
+
+        /* Indicate that a fake middle button event was sent */
+        pScreenPriv->fE3BFakeButton2Sent = TRUE;
     }
-  else if (iEventType == ButtonRelease
-	   && pScreenPriv->iE3BCachedPress == iButton)
-    {
-      /*
-       * Cached button was released before timer ran out,
-       * and before the other mouse button was pressed.
-       */
-      KillTimer (pScreenPriv->hwndScreen, WIN_E3B_TIMER_ID);
-      pScreenPriv->iE3BCachedPress = 0;
-
-      /* Send cached press, then send release */
-      winMouseButtonsSendEvent (ButtonPress, iButton);
-      winMouseButtonsSendEvent (ButtonRelease, iButton);
+    else if (iEventType == ButtonRelease
+             && pScreenPriv->iE3BCachedPress == iButton) {
+        /*
+         * Cached button was released before timer ran out,
+         * and before the other mouse button was pressed.
+         */
+        KillTimer(pScreenPriv->hwndScreen, WIN_E3B_TIMER_ID);
+        pScreenPriv->iE3BCachedPress = 0;
+
+        /* Send cached press, then send release */
+        winMouseButtonsSendEvent(ButtonPress, iButton);
+        winMouseButtonsSendEvent(ButtonRelease, iButton);
     }
-  else if (iEventType == ButtonRelease
-	   && pScreenPriv->fE3BFakeButton2Sent
-	   && !(wParam & MK_LBUTTON)
-	   && !(wParam & MK_RBUTTON))
-    {
-      /*
-       * Fake button 2 was sent and both mouse buttons have now been released
-       */
-      pScreenPriv->fE3BFakeButton2Sent = FALSE;
-      
-      /* Send middle mouse button release */
-      winMouseButtonsSendEvent (ButtonRelease, Button2);
+    else if (iEventType == ButtonRelease
+             && pScreenPriv->fE3BFakeButton2Sent && !(wParam & MK_LBUTTON)
+             && !(wParam & MK_RBUTTON)) {
+        /*
+         * Fake button 2 was sent and both mouse buttons have now been released
+         */
+        pScreenPriv->fE3BFakeButton2Sent = FALSE;
+
+        /* Send middle mouse button release */
+        winMouseButtonsSendEvent(ButtonRelease, Button2);
     }
-  else if (iEventType == ButtonRelease
-	   && pScreenPriv->iE3BCachedPress == 0
-	   && !pScreenPriv->fE3BFakeButton2Sent)
-    {
-      /*
-       * Button was release, no button is cached,
-       * and there is no fake button 2 release is pending.
-       */
-      winMouseButtonsSendEvent (ButtonRelease, iButton);
+    else if (iEventType == ButtonRelease
+             && pScreenPriv->iE3BCachedPress == 0
+             && !pScreenPriv->fE3BFakeButton2Sent) {
+        /*
+         * Button was release, no button is cached,
+         * and there is no fake button 2 release is pending.
+         */
+        winMouseButtonsSendEvent(ButtonRelease, iButton);
     }
 
-  return 0;
+    return 0;
 }
 
 /**
  * Enqueue a motion event.
  *
  */
-void winEnqueueMotion(int x, int y)
+void
+winEnqueueMotion(int x, int y)
 {
-  int valuators[2];
-  ValuatorMask mask;
+    int valuators[2];
+    ValuatorMask mask;
 
-  valuators[0] = x;
-  valuators[1] = y;
+    valuators[0] = x;
+    valuators[1] = y;
 
-  valuator_mask_set_range(&mask, 0, 2, valuators);
-  QueuePointerEvents(g_pwinPointer, MotionNotify, 0,
-		     POINTER_ABSOLUTE | POINTER_SCREEN, &mask);
+    valuator_mask_set_range(&mask, 0, 2, valuators);
+    QueuePointerEvents(g_pwinPointer, MotionNotify, 0,
+                       POINTER_ABSOLUTE | POINTER_SCREEN, &mask);
 
 }
diff --git a/xorg-server/hw/xwin/winmsg.c b/xorg-server/hw/xwin/winmsg.c
index d0464f71b..07c2f30eb 100644
--- a/xorg-server/hw/xwin/winmsg.c
+++ b/xorg-server/hw/xwin/winmsg.c
@@ -38,82 +38,84 @@
 #endif
 #include <stdarg.h>
 
-void winVMsg (int, MessageType, int verb, const char *, va_list);
+void winVMsg(int, MessageType, int verb, const char *, va_list);
 
 void
-winVMsg (int scrnIndex, MessageType type, int verb, const char *format,
-	 va_list ap)
+winVMsg(int scrnIndex, MessageType type, int verb, const char *format,
+        va_list ap)
 {
-  LogVMessageVerb(type, verb, format, ap);
+    LogVMessageVerb(type, verb, format, ap);
 }
 
-
 void
-winDrvMsg (int scrnIndex, MessageType type, const char *format, ...)
+winDrvMsg(int scrnIndex, MessageType type, const char *format, ...)
 {
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(type, 0, format, ap);
-  va_end (ap);
-}
+    va_list ap;
 
+    va_start(ap, format);
+    LogVMessageVerb(type, 0, format, ap);
+    va_end(ap);
+}
 
 void
-winMsg (MessageType type, const char *format, ...)
+winMsg(MessageType type, const char *format, ...)
 {
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(type, 1, format, ap);
-  va_end (ap);
-}
+    va_list ap;
 
+    va_start(ap, format);
+    LogVMessageVerb(type, 1, format, ap);
+    va_end(ap);
+}
 
 void
-winDrvMsgVerb (int scrnIndex, MessageType type, int verb, const char *format,
-	       ...)
+winDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,
+              ...)
 {
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(type, verb, format, ap);
-  va_end (ap);
-}
+    va_list ap;
 
+    va_start(ap, format);
+    LogVMessageVerb(type, verb, format, ap);
+    va_end(ap);
+}
 
 void
-winMsgVerb (MessageType type, int verb, const char *format, ...)
+winMsgVerb(MessageType type, int verb, const char *format, ...)
 {
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(type, verb, format, ap);
-  va_end (ap);
-}
+    va_list ap;
 
+    va_start(ap, format);
+    LogVMessageVerb(type, verb, format, ap);
+    va_end(ap);
+}
 
 void
-winErrorFVerb (int verb, const char *format, ...)
+winErrorFVerb(int verb, const char *format, ...)
 {
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(X_NONE, verb, format, ap);
-  va_end (ap);
+    va_list ap;
+
+    va_start(ap, format);
+    LogVMessageVerb(X_NONE, verb, format, ap);
+    va_end(ap);
 }
 
 void
-winDebug (const char *format, ...)
+winDebug(const char *format, ...)
 {
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(X_NONE, 3, format, ap);
-  va_end (ap);
+    va_list ap;
+
+    va_start(ap, format);
+    LogVMessageVerb(X_NONE, 3, format, ap);
+    va_end(ap);
 }
 
 void
-winTrace (const char *format, ...)
+winTrace(const char *format, ...)
 {
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(X_NONE, 10, format, ap);
-  va_end (ap);
+    va_list ap;
+
+    va_start(ap, format);
+    LogVMessageVerb(X_NONE, 10, format, ap);
+    va_end(ap);
 }
 
 void
@@ -126,54 +128,55 @@ void
 winW32ErrorEx(int verb, const char *msg, DWORD errorcode)
 {
     LPVOID buffer;
-    if (!FormatMessage( 
-                FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-                FORMAT_MESSAGE_FROM_SYSTEM | 
-                FORMAT_MESSAGE_IGNORE_INSERTS,
-                NULL,
-                errorcode,
-                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                (LPTSTR) &buffer,
-                0,
-                NULL ))
-    {
-        winErrorFVerb(verb, "Unknown error in FormatMessage!\n"); 
+
+    if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                       FORMAT_MESSAGE_FROM_SYSTEM |
+                       FORMAT_MESSAGE_IGNORE_INSERTS,
+                       NULL,
+                       errorcode,
+                       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                       (LPTSTR) & buffer, 0, NULL)) {
+        winErrorFVerb(verb, "Unknown error in FormatMessage!\n");
     }
-    else
-    {
-        winErrorFVerb(verb, "%s %s", msg, (char *)buffer); 
+    else {
+        winErrorFVerb(verb, "%s %s", msg, (char *) buffer);
         LocalFree(buffer);
     }
 }
 
 #if CYGDEBUG
-void winDebugWin32Message(const char* function, HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
+void
+winDebugWin32Message(const char *function, HWND hwnd, UINT message,
+                     WPARAM wParam, LPARAM lParam)
 {
-  static int force = 0;
-
-  if (message >= WM_USER)
-    {
-      if (force || getenv("WIN_DEBUG_MESSAGES") || getenv("WIN_DEBUG_WM_USER"))
-      {
-        winDebug("%s - Message WM_USER + %d\n", function, message - WM_USER);
-        winDebug("\thwnd 0x%x wParam 0x%x lParam 0x%x\n", hwnd, wParam, lParam);
-      }
+    static int force = 0;
+
+    if (message >= WM_USER) {
+        if (force || getenv("WIN_DEBUG_MESSAGES") ||
+            getenv("WIN_DEBUG_WM_USER")) {
+            winDebug("%s - Message WM_USER + %d\n", function,
+                     message - WM_USER);
+            winDebug("\thwnd 0x%x wParam 0x%x lParam 0x%x\n", hwnd, wParam,
+                     lParam);
+        }
     }
-  else if (message < MESSAGE_NAMES_LEN && MESSAGE_NAMES[message])
-    {
-      const char *msgname = MESSAGE_NAMES[message];
-      char buffer[64];
-      snprintf(buffer, sizeof(buffer), "WIN_DEBUG_%s", msgname);
-      buffer[63] = 0;
-      if (force || getenv("WIN_DEBUG_MESSAGES") || getenv(buffer))
-      {
-        winDebug("%s - Message %s\n", function, MESSAGE_NAMES[message]);
-        winDebug("\thwnd 0x%x wParam 0x%x lParam 0x%x\n", hwnd, wParam, lParam);
-      }
+    else if (message < MESSAGE_NAMES_LEN && MESSAGE_NAMES[message]) {
+        const char *msgname = MESSAGE_NAMES[message];
+        char buffer[64];
+
+        snprintf(buffer, sizeof(buffer), "WIN_DEBUG_%s", msgname);
+        buffer[63] = 0;
+        if (force || getenv("WIN_DEBUG_MESSAGES") || getenv(buffer)) {
+            winDebug("%s - Message %s\n", function, MESSAGE_NAMES[message]);
+            winDebug("\thwnd 0x%x wParam 0x%x lParam 0x%x\n", hwnd, wParam,
+                     lParam);
+        }
     }
 }
 #else
-void winDebugWin32Message(const char* function, HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
+void
+winDebugWin32Message(const char *function, HWND hwnd, UINT message,
+                     WPARAM wParam, LPARAM lParam)
 {
 }
 #endif
diff --git a/xorg-server/hw/xwin/winmsg.h b/xorg-server/hw/xwin/winmsg.h
index 611dd6962..ec285ba1f 100644
--- a/xorg-server/hw/xwin/winmsg.h
+++ b/xorg-server/hw/xwin/winmsg.h
@@ -34,17 +34,18 @@
  * Function prototypes
  */
 
-void winDrvMsgVerb (int scrnIndex,
-		    MessageType type, int verb, const char *format, ...);
-void winDrvMsg (int scrnIndex, MessageType type, const char *format, ...);
-void winMsgVerb (MessageType type, int verb, const char *format, ...);
-void winMsg (MessageType type, const char *format, ...);
-void winDebug (const char *format, ...);
-void winTrace (const char *format, ...);
+void winDrvMsgVerb(int scrnIndex,
+                   MessageType type, int verb, const char *format, ...);
+void winDrvMsg(int scrnIndex, MessageType type, const char *format, ...);
+void winMsgVerb(MessageType type, int verb, const char *format, ...);
+void winMsg(MessageType type, const char *format, ...);
+void winDebug(const char *format, ...);
+void winTrace(const char *format, ...);
 
-void winErrorFVerb (int verb, const char *format, ...);
+void winErrorFVerb(int verb, const char *format, ...);
 void winW32Error(int verb, const char *message);
 void winW32ErrorEx(int verb, const char *message, DWORD errorcode);
-void winDebugWin32Message(const char* function, HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
+void winDebugWin32Message(const char *function, HWND hwnd, UINT message,
+                          WPARAM wParam, LPARAM lParam);
 
 #endif
diff --git a/xorg-server/hw/xwin/winmultiwindowclass.c b/xorg-server/hw/xwin/winmultiwindowclass.c
index a5cf2120a..1af104df9 100644
--- a/xorg-server/hw/xwin/winmultiwindowclass.c
+++ b/xorg-server/hw/xwin/winmultiwindowclass.c
@@ -43,283 +43,251 @@
 
 DEFINE_ATOM_HELPER(AtmWmWindowRole, "WM_WINDOW_ROLE")
 
-
 int
-winMultiWindowGetClassHint (WindowPtr pWin, char **res_name, char **res_class)
+winMultiWindowGetClassHint(WindowPtr pWin, char **res_name, char **res_class)
 {
-  struct _Window	*pwin;
-  struct _Property	*prop;
-  int			len_name, len_class;
-
-  if (!pWin || !res_name || !res_class)
-    {
-      ErrorF ("winMultiWindowGetClassHint - pWin, res_name, or res_class was "
-	      "NULL\n");
-      return 0;  
+    struct _Window *pwin;
+    struct _Property *prop;
+    int len_name, len_class;
+
+    if (!pWin || !res_name || !res_class) {
+        ErrorF("winMultiWindowGetClassHint - pWin, res_name, or res_class was "
+               "NULL\n");
+        return 0;
     }
-  
-  pwin = (struct _Window*) pWin;
-
-  if (pwin->optional)
-    prop = (struct _Property *) pwin->optional->userProps;
-  else
-    prop = NULL;
-  
-  *res_name = *res_class = NULL;
-
-  while (prop)
-    {
-      if (prop->propertyName == XA_WM_CLASS
-	  && prop->type == XA_STRING
-	  && prop->format == 8
-	  && prop->data)
-	{
-	  len_name = strlen ((char *) prop->data);
-
-	  (*res_name) = malloc (len_name + 1);
-	  
-	  if (!*res_name)
-	    {
-	      ErrorF ("winMultiWindowGetClassHint - *res_name was NULL\n");
-	      return 0;
-	    }
-
-	  /* Add one to len_name to allow copying of trailing 0 */
-	  strncpy ((*res_name), prop->data, len_name + 1);
-
-	  if (len_name == prop->size)
-	    len_name--;
-
-	  len_class = strlen (((char *)prop->data) + 1 + len_name);
-
-	  (*res_class) = malloc (len_class + 1);
-
-	  if (!*res_class)
-	    {
-	      ErrorF ("winMultiWindowGetClassHint - *res_class was NULL\n");
-	      
-	      /* Free the previously allocated res_name */
-	      free (*res_name);
-	      return 0;
-	    }
-
-	  strcpy ((*res_class), ((char *)prop->data) + 1 + len_name);
-
-	  return 1;
-	}
-      else
-	prop = prop->next;
+
+    pwin = (struct _Window *) pWin;
+
+    if (pwin->optional)
+        prop = (struct _Property *) pwin->optional->userProps;
+    else
+        prop = NULL;
+
+    *res_name = *res_class = NULL;
+
+    while (prop) {
+        if (prop->propertyName == XA_WM_CLASS
+            && prop->type == XA_STRING && prop->format == 8 && prop->data) {
+            len_name = strlen((char *) prop->data);
+
+            (*res_name) = malloc(len_name + 1);
+
+            if (!*res_name) {
+                ErrorF("winMultiWindowGetClassHint - *res_name was NULL\n");
+                return 0;
+            }
+
+            /* Add one to len_name to allow copying of trailing 0 */
+            strncpy((*res_name), prop->data, len_name + 1);
+
+            if (len_name == prop->size)
+                len_name--;
+
+            len_class = strlen(((char *) prop->data) + 1 + len_name);
+
+            (*res_class) = malloc(len_class + 1);
+
+            if (!*res_class) {
+                ErrorF("winMultiWindowGetClassHint - *res_class was NULL\n");
+
+                /* Free the previously allocated res_name */
+                free(*res_name);
+                return 0;
+            }
+
+            strcpy((*res_class), ((char *) prop->data) + 1 + len_name);
+
+            return 1;
+        }
+        else
+            prop = prop->next;
     }
-  
-  return 0;
-}
 
+    return 0;
+}
 
 int
-winMultiWindowGetWMHints (WindowPtr pWin, WinXWMHints *hints)
+winMultiWindowGetWMHints(WindowPtr pWin, WinXWMHints * hints)
 {
-  struct _Window	*pwin;
-  struct _Property	*prop;
+    struct _Window *pwin;
+    struct _Property *prop;
 
-  if (!pWin || !hints)
-    {
-      ErrorF ("winMultiWindowGetWMHints - pWin or hints was NULL\n");
-      return 0; 
+    if (!pWin || !hints) {
+        ErrorF("winMultiWindowGetWMHints - pWin or hints was NULL\n");
+        return 0;
     }
 
-  pwin = (struct _Window*) pWin;
-
-  if (pwin->optional)
-    prop = (struct _Property *) pwin->optional->userProps;
-  else
-    prop = NULL;
-  
-  memset (hints, 0, sizeof (WinXWMHints));
-
-  while (prop)
-    {
-      if (prop->propertyName == XA_WM_HINTS
-	  && prop->data)
-	{
-	  memcpy (hints, prop->data, sizeof (WinXWMHints));
-	  return 1;
-	}
-      else
-	prop = prop->next;
+    pwin = (struct _Window *) pWin;
+
+    if (pwin->optional)
+        prop = (struct _Property *) pwin->optional->userProps;
+    else
+        prop = NULL;
+
+    memset(hints, 0, sizeof(WinXWMHints));
+
+    while (prop) {
+        if (prop->propertyName == XA_WM_HINTS && prop->data) {
+            memcpy(hints, prop->data, sizeof(WinXWMHints));
+            return 1;
+        }
+        else
+            prop = prop->next;
     }
-  
-  return 0;
-}
 
+    return 0;
+}
 
 int
-winMultiWindowGetWindowRole (WindowPtr pWin, char **res_role)
+winMultiWindowGetWindowRole(WindowPtr pWin, char **res_role)
 {
-  struct _Window	*pwin;
-  struct _Property	*prop;
-  int			len_role;
-
-  if (!pWin || !res_role) 
-    return 0; 
-
-  pwin = (struct _Window*) pWin;
-  
-  if (pwin->optional)
-    prop = (struct _Property *) pwin->optional->userProps;
-  else
-    prop = NULL;
-  
-  *res_role = NULL;
-  while (prop)
-    {
-      if (prop->propertyName == AtmWmWindowRole ()
-	  && prop->type == XA_STRING
-	  && prop->format == 8
-	  && prop->data)
-	{
-	  len_role= prop->size;
-
-	  (*res_role) = malloc (len_role + 1);
-
-	  if (!*res_role)
-	    {
-	      ErrorF ("winMultiWindowGetWindowRole - *res_role was NULL\n");
-	      return 0; 
-	    }
-
-	  strncpy ((*res_role), prop->data, len_role);
-	  (*res_role)[len_role] = 0;
-
-	  return 1;
-	}
-      else
-	prop = prop->next;
+    struct _Window *pwin;
+    struct _Property *prop;
+    int len_role;
+
+    if (!pWin || !res_role)
+        return 0;
+
+    pwin = (struct _Window *) pWin;
+
+    if (pwin->optional)
+        prop = (struct _Property *) pwin->optional->userProps;
+    else
+        prop = NULL;
+
+    *res_role = NULL;
+    while (prop) {
+        if (prop->propertyName == AtmWmWindowRole()
+            && prop->type == XA_STRING && prop->format == 8 && prop->data) {
+            len_role = prop->size;
+
+            (*res_role) = malloc(len_role + 1);
+
+            if (!*res_role) {
+                ErrorF("winMultiWindowGetWindowRole - *res_role was NULL\n");
+                return 0;
+            }
+
+            strncpy((*res_role), prop->data, len_role);
+            (*res_role)[len_role] = 0;
+
+            return 1;
+        }
+        else
+            prop = prop->next;
     }
-  
-  return 0;
-}
 
+    return 0;
+}
 
 int
-winMultiWindowGetWMNormalHints (WindowPtr pWin, WinXSizeHints *hints)
+winMultiWindowGetWMNormalHints(WindowPtr pWin, WinXSizeHints * hints)
 {
-  struct _Window	*pwin;
-  struct _Property	*prop;
+    struct _Window *pwin;
+    struct _Property *prop;
 
-  if (!pWin || !hints)
-    {
-      ErrorF ("winMultiWindowGetWMNormalHints - pWin or hints was NULL\n");
-      return 0; 
+    if (!pWin || !hints) {
+        ErrorF("winMultiWindowGetWMNormalHints - pWin or hints was NULL\n");
+        return 0;
     }
 
-  pwin = (struct _Window*) pWin;
-
-  if (pwin->optional)
-    prop = (struct _Property *) pwin->optional->userProps;
-  else
-    prop = NULL;
-  
-  memset (hints, 0, sizeof (WinXSizeHints));
-
-  while (prop)
-    {
-      if (prop->propertyName == XA_WM_NORMAL_HINTS
-	  && prop->data)
-	{
-	  memcpy (hints, prop->data, sizeof (WinXSizeHints));
-	  return 1;
-	}
-      else
-	prop = prop->next;
+    pwin = (struct _Window *) pWin;
+
+    if (pwin->optional)
+        prop = (struct _Property *) pwin->optional->userProps;
+    else
+        prop = NULL;
+
+    memset(hints, 0, sizeof(WinXSizeHints));
+
+    while (prop) {
+        if (prop->propertyName == XA_WM_NORMAL_HINTS && prop->data) {
+            memcpy(hints, prop->data, sizeof(WinXSizeHints));
+            return 1;
+        }
+        else
+            prop = prop->next;
     }
 
-  return 0;
+    return 0;
 }
 
 int
-winMultiWindowGetTransientFor (WindowPtr pWin, WindowPtr *ppDaddy)
+winMultiWindowGetTransientFor(WindowPtr pWin, WindowPtr *ppDaddy)
 {
-  struct _Window        *pwin;
-  struct _Property      *prop;
+    struct _Window *pwin;
+    struct _Property *prop;
 
-  if (!pWin)
-    {
-      ErrorF ("winMultiWindowGetTransientFor - pWin was NULL\n");
-      return 0;
+    if (!pWin) {
+        ErrorF("winMultiWindowGetTransientFor - pWin was NULL\n");
+        return 0;
     }
 
-  pwin = (struct _Window*) pWin;
+    pwin = (struct _Window *) pWin;
 
-  if (pwin->optional)
-    prop = (struct _Property *) pwin->optional->userProps;
-  else
-    prop = NULL;
+    if (pwin->optional)
+        prop = (struct _Property *) pwin->optional->userProps;
+    else
+        prop = NULL;
 
-  if (ppDaddy)
-    *ppDaddy = NULL;
+    if (ppDaddy)
+        *ppDaddy = NULL;
 
-  while (prop)
-    {
-      if (prop->propertyName == XA_WM_TRANSIENT_FOR)
-        {
-          if (ppDaddy)
-            memcpy (ppDaddy, prop->data, sizeof (WindowPtr));
-          return 1;
+    while (prop) {
+        if (prop->propertyName == XA_WM_TRANSIENT_FOR) {
+            if (ppDaddy)
+                memcpy(ppDaddy, prop->data, sizeof(WindowPtr));
+            return 1;
         }
-      else
-        prop = prop->next;
+        else
+            prop = prop->next;
     }
 
-  return 0;
+    return 0;
 }
 
 int
-winMultiWindowGetWMName (WindowPtr pWin, char **wmName)
+winMultiWindowGetWMName(WindowPtr pWin, char **wmName)
 {
-  struct _Window	*pwin;
-  struct _Property	*prop;
-  int			len_name;
-
-  if (!pWin || !wmName)
-    {
-      ErrorF ("winMultiWindowGetClassHint - pWin, res_name, or res_class was "
-	      "NULL\n");
-      return 0;  
+    struct _Window *pwin;
+    struct _Property *prop;
+    int len_name;
+
+    if (!pWin || !wmName) {
+        ErrorF("winMultiWindowGetClassHint - pWin, res_name, or res_class was "
+               "NULL\n");
+        return 0;
     }
-  
-  pwin = (struct _Window*) pWin;
-
-  if (pwin->optional)
-    prop = (struct _Property *) pwin->optional->userProps;
-  else
-    prop = NULL;
-  
-  *wmName = NULL;
-
-  while (prop)
-    {
-      if (prop->propertyName == XA_WM_NAME
-	  && prop->type == XA_STRING
-	  && prop->data)
-	{
-	  len_name = prop->size;
-
-	  (*wmName) = malloc (len_name + 1);
-	  
-	  if (!*wmName)
-	    {
-	      ErrorF ("winMultiWindowGetWMName - *wmName was NULL\n");
-	      return 0;
-	    }
-
-	  strncpy ((*wmName), prop->data, len_name);
-	  (*wmName)[len_name] = 0;
-
-	  return 1;
-	}
-      else
-	prop = prop->next;
+
+    pwin = (struct _Window *) pWin;
+
+    if (pwin->optional)
+        prop = (struct _Property *) pwin->optional->userProps;
+    else
+        prop = NULL;
+
+    *wmName = NULL;
+
+    while (prop) {
+        if (prop->propertyName == XA_WM_NAME
+            && prop->type == XA_STRING && prop->data) {
+            len_name = prop->size;
+
+            (*wmName) = malloc(len_name + 1);
+
+            if (!*wmName) {
+                ErrorF("winMultiWindowGetWMName - *wmName was NULL\n");
+                return 0;
+            }
+
+            strncpy((*wmName), prop->data, len_name);
+            (*wmName)[len_name] = 0;
+
+            return 1;
+        }
+        else
+            prop = prop->next;
     }
-  
-  return 0;
+
+    return 0;
 }
diff --git a/xorg-server/hw/xwin/winmultiwindowicons.c b/xorg-server/hw/xwin/winmultiwindowicons.c
index 763cb7e08..df59f6066 100644
--- a/xorg-server/hw/xwin/winmultiwindowicons.c
+++ b/xorg-server/hw/xwin/winmultiwindowicons.c
@@ -39,359 +39,353 @@
 #include "propertyst.h"
 #include "windowstr.h"
 
-
 /*
  * Prototypes for local functions
  */
 
 static void
-winScaleXBitmapToWindows (int iconSize, int effBPP,
-			  PixmapPtr pixmap, unsigned char *image);
 
+winScaleXBitmapToWindows(int iconSize, int effBPP,
+                         PixmapPtr pixmap, unsigned char *image);
 
 /*
  * Scale an X icon bitmap into a Windoze icon bitmap
  */
 
 static void
-winScaleXBitmapToWindows (int iconSize,
-			  int effBPP,
-			  PixmapPtr pixmap,
-			  unsigned char *image)
+winScaleXBitmapToWindows(int iconSize,
+                         int effBPP, PixmapPtr pixmap, unsigned char *image)
 {
-  int			row, column, effXBPP, effXDepth;
-  unsigned char		*outPtr;
-  char		*iconData = 0;
-  int			stride, xStride;
-  float			factX, factY;
-  int			posX, posY;
-  unsigned char		*ptr;
-  unsigned int		zero;
-  unsigned int		color;
-
-  effXBPP = BitsPerPixel(pixmap->drawable.depth);
-  effXDepth = pixmap->drawable.depth;
-
-  if (pixmap->drawable.bitsPerPixel == 15)
-    effXBPP = 16;
-  
-  if (pixmap->drawable.depth == 15)
-    effXDepth = 16;
-
-  /* Need 16-bit aligned rows for DDBitmaps */
-  stride = ((iconSize * effBPP + 15) & (~15)) / 8;
-  xStride = PixmapBytePad (pixmap->drawable.width, pixmap->drawable.depth);
-  if (stride == 0 || xStride == 0)
-    {
-      ErrorF ("winScaleXBitmapToWindows - stride or xStride is zero.  "
-	      "Bailing.\n");
-      return;
+    int row, column, effXBPP, effXDepth;
+    unsigned char *outPtr;
+    char *iconData = 0;
+    int stride, xStride;
+    float factX, factY;
+    int posX, posY;
+    unsigned char *ptr;
+    unsigned int zero;
+    unsigned int color;
+
+    effXBPP = BitsPerPixel(pixmap->drawable.depth);
+    effXDepth = pixmap->drawable.depth;
+
+    if (pixmap->drawable.bitsPerPixel == 15)
+        effXBPP = 16;
+
+    if (pixmap->drawable.depth == 15)
+        effXDepth = 16;
+
+    /* Need 16-bit aligned rows for DDBitmaps */
+    stride = ((iconSize * effBPP + 15) & (~15)) / 8;
+    xStride = PixmapBytePad(pixmap->drawable.width, pixmap->drawable.depth);
+    if (stride == 0 || xStride == 0) {
+        ErrorF("winScaleXBitmapToWindows - stride or xStride is zero.  "
+               "Bailing.\n");
+        return;
     }
 
-  /* Allocate memory for icon data */
-  iconData = malloc (xStride * pixmap->drawable.height);
-  if (!iconData)
-    {
-      ErrorF ("winScaleXBitmapToWindows - malloc failed for iconData.  "
-	      "Bailing.\n");
-      return;
+    /* Allocate memory for icon data */
+    iconData = malloc(xStride * pixmap->drawable.height);
+    if (!iconData) {
+        ErrorF("winScaleXBitmapToWindows - malloc failed for iconData.  "
+               "Bailing.\n");
+        return;
     }
 
-  /* Get icon data */
-  miGetImage ((DrawablePtr) &(pixmap->drawable), 0, 0,
-	      pixmap->drawable.width, pixmap->drawable.height,
-	      ZPixmap, 0xffffffff, iconData);
-
-  /* Keep aspect ratio */
-  factX = ((float)pixmap->drawable.width) / ((float)iconSize);
-  factY = ((float)pixmap->drawable.height) / ((float)iconSize);
-  if (factX > factY)
-    factY = factX;
-  else
-    factX = factY;
-  
-  /* Out-of-bounds, fill icon with zero */
-  zero = 0;
- 
-  for (row = 0; row < iconSize; row++)
-    {
-      outPtr = image + stride * row;
-      for (column = 0; column < iconSize; column++)
-	{
-	  posX = factX * column;
-	  posY = factY * row;
-	  
-	  ptr = (unsigned char*) iconData + posY*xStride;
-	  if (effXBPP == 1)
-	    {
-	      ptr += posX / 8;
-	      
-	      /* Out of X icon bounds, leave space blank */
-	      if (posX >= pixmap->drawable.width
-		  || posY >= pixmap->drawable.height)
-		ptr = (unsigned char *) &zero;
-	      
-	      if ((*ptr) & (1 << (posX & 7)))
-		switch (effBPP)
-		  {
-		  case 32:
-		    *(outPtr++) = 0;
-		  case 24:
-		    *(outPtr++) = 0;
-		  case 16:
-		    *(outPtr++) = 0;
-		  case 8:
-		    *(outPtr++) = 0;
-		    break;
-		  case 1:
-		    outPtr[column / 8] &= ~(1 << (7 - (column & 7)));
-		    break;
-		  }
-	      else
-		switch (effBPP)
-		  {
-		  case 32:
-		    *(outPtr++) = 255;
-		    *(outPtr++) = 255;
-		    *(outPtr++) = 255;
-		    *(outPtr++) = 0;
-		    break;
-		  case 24:
-		    *(outPtr++) = 255;
-		  case 16:
-		    *(outPtr++) = 255;
-		  case 8: 
-		    *(outPtr++) = 255;
-		    break;
-		  case 1:
-		    outPtr[column / 8] |= (1 << (7 - (column & 7)));
-		    break;
-		  }
-	    }
-	  else if (effXDepth == 24 || effXDepth == 32)
-	    {
-	      ptr += posX * (effXBPP / 8);
-
-	      /* Out of X icon bounds, leave space blank */
-	      if (posX >= pixmap->drawable.width
-		  || posY >= pixmap->drawable.height)
-		ptr = (unsigned char *) &zero;
-	      color = (((*ptr) << 16)
-		       + ((*(ptr + 1)) << 8)
-		       + ((*(ptr + 2)) << 0));
-	      switch (effBPP)
-		{
-		case 32:
-		  *(outPtr++) = *(ptr++); /* b */
-		  *(outPtr++) = *(ptr++); /* g */
-		  *(outPtr++) = *(ptr++); /* r */
-		  *(outPtr++) = (effXDepth == 32) ? *(ptr++) : 0x0; /* alpha */
-		  break;
-		case 24:
-		  *(outPtr++) = *(ptr++);
-		  *(outPtr++) = *(ptr++);
-		  *(outPtr++) = *(ptr++);
-		  break;
-		case 16:
-		  color = ((((*ptr) >> 2) << 10)
-			   + (((*(ptr + 1)) >> 2) << 5)
-			   + (((*(ptr + 2)) >> 2)));
-		  *(outPtr++) = (color >> 8);
-		  *(outPtr++) = (color & 255);
-		  break;
-		case 8:
-		  color = (((*ptr))) + (((*(ptr + 1)))) + (((*(ptr + 2))));
-		  color /= 3;
-		  *(outPtr++) = color;
-		  break;
-		case 1:
-		  if (color)
-		    outPtr[column / 8] |= (1 << (7 - (column & 7)));
-		  else
-		    outPtr[column / 8] &= ~(1 << (7 - (column & 7)));
-		}
-	    }
-	  else if (effXDepth == 16)
-	    {
-	      ptr += posX * (effXBPP / 8);
-	
-	      /* Out of X icon bounds, leave space blank */
-	      if (posX >= pixmap->drawable.width
-		  || posY >= pixmap->drawable.height)
-		ptr = (unsigned char *) &zero;
-	      color = ((*ptr) << 8) + (*(ptr + 1));
-	      switch (effBPP)
-		{
-		case 32:
-		  *(outPtr++) = (color & 31) << 2;
-		  *(outPtr++) = ((color >> 5) & 31) << 2;
-		  *(outPtr++) = ((color >> 10) & 31) << 2;
-		  *(outPtr++) = 0; /* resvd */
-		  break;
-		case 24:
-		  *(outPtr++) = (color & 31) << 2;
-		  *(outPtr++) = ((color >> 5) & 31) << 2;
-		  *(outPtr++) = ((color >> 10) & 31) << 2;
-		  break;
-		case 16:
-		  *(outPtr++) = *(ptr++);
-		  *(outPtr++) = *(ptr++);
-		  break;
-		case 8:
-		  *(outPtr++) = (((color & 31)
-				  + ((color >> 5) & 31)
-				  + ((color >> 10) & 31)) / 3) << 2;
-		  break;
-		case 1:
-		  if (color)
-		    outPtr[column / 8] |= (1 << (7 - (column & 7)));
-		  else
-		    outPtr[column / 8] &= ~(1 << (7 - (column & 7)));
-		  break;
-		} /* end switch(effbpp) */
-	    } /* end if effxbpp==16) */
-	} /* end for column */
-    } /* end for row */
-  free (iconData);
+    /* Get icon data */
+    miGetImage((DrawablePtr) &(pixmap->drawable), 0, 0,
+               pixmap->drawable.width, pixmap->drawable.height,
+               ZPixmap, 0xffffffff, iconData);
+
+    /* Keep aspect ratio */
+    factX = ((float) pixmap->drawable.width) / ((float) iconSize);
+    factY = ((float) pixmap->drawable.height) / ((float) iconSize);
+    if (factX > factY)
+        factY = factX;
+    else
+        factX = factY;
+
+    /* Out-of-bounds, fill icon with zero */
+    zero = 0;
+
+    for (row = 0; row < iconSize; row++) {
+        outPtr = image + stride * row;
+        for (column = 0; column < iconSize; column++) {
+            posX = factX * column;
+            posY = factY * row;
+
+            ptr = (unsigned char *) iconData + posY * xStride;
+            if (effXBPP == 1) {
+                ptr += posX / 8;
+
+                /* Out of X icon bounds, leave space blank */
+                if (posX >= pixmap->drawable.width
+                    || posY >= pixmap->drawable.height)
+                    ptr = (unsigned char *) &zero;
+
+                if ((*ptr) & (1 << (posX & 7)))
+                    switch (effBPP) {
+                    case 32:
+                        *(outPtr++) = 0;
+                    case 24:
+                        *(outPtr++) = 0;
+                    case 16:
+                        *(outPtr++) = 0;
+                    case 8:
+                        *(outPtr++) = 0;
+                        break;
+                    case 1:
+                        outPtr[column / 8] &= ~(1 << (7 - (column & 7)));
+                        break;
+                    }
+                else
+                    switch (effBPP) {
+                    case 32:
+                        *(outPtr++) = 255;
+                        *(outPtr++) = 255;
+                        *(outPtr++) = 255;
+                        *(outPtr++) = 0;
+                        break;
+                    case 24:
+                        *(outPtr++) = 255;
+                    case 16:
+                        *(outPtr++) = 255;
+                    case 8:
+                        *(outPtr++) = 255;
+                        break;
+                    case 1:
+                        outPtr[column / 8] |= (1 << (7 - (column & 7)));
+                        break;
+                    }
+            }
+            else if (effXDepth == 24 || effXDepth == 32) {
+                ptr += posX * (effXBPP / 8);
+
+                /* Out of X icon bounds, leave space blank */
+                if (posX >= pixmap->drawable.width
+                    || posY >= pixmap->drawable.height)
+                    ptr = (unsigned char *) &zero;
+                color = (((*ptr) << 16)
+                         + ((*(ptr + 1)) << 8)
+                         + ((*(ptr + 2)) << 0));
+                switch (effBPP) {
+                case 32:
+                    *(outPtr++) = *(ptr++);     /* b */
+                    *(outPtr++) = *(ptr++);     /* g */
+                    *(outPtr++) = *(ptr++);     /* r */
+                    *(outPtr++) = (effXDepth == 32) ? *(ptr++) : 0x0;   /* alpha */
+                    break;
+                case 24:
+                    *(outPtr++) = *(ptr++);
+                    *(outPtr++) = *(ptr++);
+                    *(outPtr++) = *(ptr++);
+                    break;
+                case 16:
+                    color = ((((*ptr) >> 2) << 10)
+                             + (((*(ptr + 1)) >> 2) << 5)
+                             + (((*(ptr + 2)) >> 2)));
+                    *(outPtr++) = (color >> 8);
+                    *(outPtr++) = (color & 255);
+                    break;
+                case 8:
+                    color = (((*ptr))) + (((*(ptr + 1)))) + (((*(ptr + 2))));
+                    color /= 3;
+                    *(outPtr++) = color;
+                    break;
+                case 1:
+                    if (color)
+                        outPtr[column / 8] |= (1 << (7 - (column & 7)));
+                    else
+                        outPtr[column / 8] &= ~(1 << (7 - (column & 7)));
+                }
+            }
+            else if (effXDepth == 16) {
+                ptr += posX * (effXBPP / 8);
+
+                /* Out of X icon bounds, leave space blank */
+                if (posX >= pixmap->drawable.width
+                    || posY >= pixmap->drawable.height)
+                    ptr = (unsigned char *) &zero;
+                color = ((*ptr) << 8) + (*(ptr + 1));
+                switch (effBPP) {
+                case 32:
+                    *(outPtr++) = (color & 31) << 2;
+                    *(outPtr++) = ((color >> 5) & 31) << 2;
+                    *(outPtr++) = ((color >> 10) & 31) << 2;
+                    *(outPtr++) = 0;    /* resvd */
+                    break;
+                case 24:
+                    *(outPtr++) = (color & 31) << 2;
+                    *(outPtr++) = ((color >> 5) & 31) << 2;
+                    *(outPtr++) = ((color >> 10) & 31) << 2;
+                    break;
+                case 16:
+                    *(outPtr++) = *(ptr++);
+                    *(outPtr++) = *(ptr++);
+                    break;
+                case 8:
+                    *(outPtr++) = (((color & 31)
+                                    + ((color >> 5) & 31)
+                                    + ((color >> 10) & 31)) / 3) << 2;
+                    break;
+                case 1:
+                    if (color)
+                        outPtr[column / 8] |= (1 << (7 - (column & 7)));
+                    else
+                        outPtr[column / 8] &= ~(1 << (7 - (column & 7)));
+                    break;
+                }               /* end switch(effbpp) */
+            }                   /* end if effxbpp==16) */
+        }                       /* end for column */
+    }                           /* end for row */
+    free(iconData);
 }
 
 static HICON
-NetWMToWinIconAlpha(uint32_t *icon)
+NetWMToWinIconAlpha(uint32_t * icon)
 {
-  int width = icon[0];
-  int height = icon[1];
-  uint32_t *pixels = &icon[2];
-  HICON result;
-  HDC hdc = GetDC(NULL);
-  uint32_t *DIB_pixels;
-  ICONINFO ii = {TRUE};
-  BITMAPV4HEADER bmh = {sizeof(bmh)};
-
-  /* Define an ARGB pixel format used for Color+Alpha icons */
-  bmh.bV4Width = width;
-  bmh.bV4Height = -height; /* Invert the image */
-  bmh.bV4Planes = 1;
-  bmh.bV4BitCount = 32;
-  bmh.bV4V4Compression = BI_BITFIELDS;
-  bmh.bV4AlphaMask = 0xFF000000;
-  bmh.bV4RedMask =   0x00FF0000;
-  bmh.bV4GreenMask = 0x0000FF00;
-  bmh.bV4BlueMask =  0x000000FF;
-
-  ii.hbmColor = CreateDIBSection(hdc, (BITMAPINFO*)&bmh,
-                DIB_RGB_COLORS, (void**)&DIB_pixels, NULL, 0);
-  ReleaseDC(NULL, hdc);
-  ii.hbmMask = CreateBitmap(width, height, 1, 1, NULL);
-  memcpy(DIB_pixels, pixels, height*width*4);
-
-  /* CreateIconIndirect() traditionally required DDBitmaps */
-  /* Systems from WinXP accept 32-bit ARGB DIBitmaps with full 8-bit alpha support */
-  /* The icon is created with a DIB + empty DDB mask (an MS example does the same) */
-  result = CreateIconIndirect(&ii);
-
-  DeleteObject(ii.hbmColor);
-  DeleteObject(ii.hbmMask);
-
-  winDebug("NetWMToWinIconAlpha - %d x %d = %p\n", icon[0], icon[1], result);
-  return result;
+    int width = icon[0];
+    int height = icon[1];
+    uint32_t *pixels = &icon[2];
+    HICON result;
+    HDC hdc = GetDC(NULL);
+    uint32_t *DIB_pixels;
+    ICONINFO ii = { TRUE };
+    BITMAPV4HEADER bmh = { sizeof(bmh) };
+
+    /* Define an ARGB pixel format used for Color+Alpha icons */
+    bmh.bV4Width = width;
+    bmh.bV4Height = -height;    /* Invert the image */
+    bmh.bV4Planes = 1;
+    bmh.bV4BitCount = 32;
+    bmh.bV4V4Compression = BI_BITFIELDS;
+    bmh.bV4AlphaMask = 0xFF000000;
+    bmh.bV4RedMask = 0x00FF0000;
+    bmh.bV4GreenMask = 0x0000FF00;
+    bmh.bV4BlueMask = 0x000000FF;
+
+    ii.hbmColor = CreateDIBSection(hdc, (BITMAPINFO *) & bmh,
+                                   DIB_RGB_COLORS, (void **) &DIB_pixels, NULL,
+                                   0);
+    ReleaseDC(NULL, hdc);
+    ii.hbmMask = CreateBitmap(width, height, 1, 1, NULL);
+    memcpy(DIB_pixels, pixels, height * width * 4);
+
+    /* CreateIconIndirect() traditionally required DDBitmaps */
+    /* Systems from WinXP accept 32-bit ARGB DIBitmaps with full 8-bit alpha support */
+    /* The icon is created with a DIB + empty DDB mask (an MS example does the same) */
+    result = CreateIconIndirect(&ii);
+
+    DeleteObject(ii.hbmColor);
+    DeleteObject(ii.hbmMask);
+
+    winDebug("NetWMToWinIconAlpha - %d x %d = %p\n", icon[0], icon[1], result);
+    return result;
 }
 
 static HICON
-NetWMToWinIconThreshold(uint32_t *icon)
+NetWMToWinIconThreshold(uint32_t * icon)
 {
-  int width = icon[0];
-  int height = icon[1];
-  uint32_t *pixels = &icon[2];
-  int row, col;
-  HICON result;
-  ICONINFO ii = {TRUE};
-
-  HDC hdc = GetDC(NULL);
-  HDC xorDC = CreateCompatibleDC(hdc);
-  HDC andDC = CreateCompatibleDC(hdc);
-  ii.hbmColor = CreateCompatibleBitmap(hdc, width, height);
-  ii.hbmMask = CreateCompatibleBitmap(hdc, width, height);
-  ReleaseDC(NULL, hdc);
-  SelectObject(xorDC, ii.hbmColor);
-  SelectObject(andDC, ii.hbmMask);
-
-  for (row = 0; row < height; row++) {
-    for (col = 0; col < width; col++) {
-      if ((*pixels & 0xFF000000) > 31<<24) { /* 31 alpha threshold, i.e. opaque above, transparent below */
-	SetPixelV(xorDC, col, row, RGB(((char*)pixels)[2], ((char*)pixels)[1],
-		((char*)pixels)[0]));
-	SetPixelV(andDC, col, row, RGB(0, 0, 0)); /* black mask */
-      }
-      else {
-	SetPixelV(xorDC, col, row, RGB(0, 0, 0));
-	SetPixelV(andDC, col, row, RGB(255, 255, 255)); /* white mask */
-      }
-      pixels++;
+    int width = icon[0];
+    int height = icon[1];
+    uint32_t *pixels = &icon[2];
+    int row, col;
+    HICON result;
+    ICONINFO ii = { TRUE };
+
+    HDC hdc = GetDC(NULL);
+    HDC xorDC = CreateCompatibleDC(hdc);
+    HDC andDC = CreateCompatibleDC(hdc);
+
+    ii.hbmColor = CreateCompatibleBitmap(hdc, width, height);
+    ii.hbmMask = CreateCompatibleBitmap(hdc, width, height);
+    ReleaseDC(NULL, hdc);
+    SelectObject(xorDC, ii.hbmColor);
+    SelectObject(andDC, ii.hbmMask);
+
+    for (row = 0; row < height; row++) {
+        for (col = 0; col < width; col++) {
+            if ((*pixels & 0xFF000000) > 31 << 24) {    /* 31 alpha threshold, i.e. opaque above, transparent below */
+                SetPixelV(xorDC, col, row,
+                          RGB(((char *) pixels)[2], ((char *) pixels)[1],
+                              ((char *) pixels)[0]));
+                SetPixelV(andDC, col, row, RGB(0, 0, 0));       /* black mask */
+            }
+            else {
+                SetPixelV(xorDC, col, row, RGB(0, 0, 0));
+                SetPixelV(andDC, col, row, RGB(255, 255, 255)); /* white mask */
+            }
+            pixels++;
+        }
     }
-  }
-  DeleteDC(xorDC);
-  DeleteDC(andDC);
+    DeleteDC(xorDC);
+    DeleteDC(andDC);
 
-  result = CreateIconIndirect(&ii);
+    result = CreateIconIndirect(&ii);
 
-  DeleteObject(ii.hbmColor);
-  DeleteObject(ii.hbmMask );
+    DeleteObject(ii.hbmColor);
+    DeleteObject(ii.hbmMask);
 
-  winDebug("NetWMToWinIconThreshold - %d x %d = %p\n", icon[0], icon[1], result);
-  return result;
+    winDebug("NetWMToWinIconThreshold - %d x %d = %p\n", icon[0], icon[1],
+             result);
+    return result;
 }
 
 static HICON
-NetWMToWinIcon(int bpp, uint32_t *icon)
+NetWMToWinIcon(int bpp, uint32_t * icon)
 {
-  static Bool hasIconAlphaChannel = FALSE;
-  static BOOL versionChecked = FALSE;
-
-  if (!versionChecked)
-    {
-      OSVERSIONINFOEX osvi = {0};
-      ULONGLONG dwlConditionMask = 0;
-
-      osvi.dwOSVersionInfoSize = sizeof (osvi);
-      osvi.dwMajorVersion = 5;
-      osvi.dwMinorVersion = 1;
-
-      /* Windows versions later than XP have icon alpha channel suport, 2000 does not */
-      VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
-      VER_SET_CONDITION(dwlConditionMask, VER_MINORVERSION, VER_GREATER_EQUAL);
-      hasIconAlphaChannel = VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION, dwlConditionMask);
-      versionChecked = TRUE;
-
-      ErrorF("OS has icon alpha channel support: %s\n", hasIconAlphaChannel ? "yes" : "no");
+    static Bool hasIconAlphaChannel = FALSE;
+    static BOOL versionChecked = FALSE;
+
+    if (!versionChecked) {
+        OSVERSIONINFOEX osvi = { 0 };
+        ULONGLONG dwlConditionMask = 0;
+
+        osvi.dwOSVersionInfoSize = sizeof(osvi);
+        osvi.dwMajorVersion = 5;
+        osvi.dwMinorVersion = 1;
+
+        /* Windows versions later than XP have icon alpha channel suport, 2000 does not */
+        VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION,
+                          VER_GREATER_EQUAL);
+        VER_SET_CONDITION(dwlConditionMask, VER_MINORVERSION,
+                          VER_GREATER_EQUAL);
+        hasIconAlphaChannel =
+            VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION,
+                              dwlConditionMask);
+        versionChecked = TRUE;
+
+        ErrorF("OS has icon alpha channel support: %s\n",
+               hasIconAlphaChannel ? "yes" : "no");
     }
 
-  if (hasIconAlphaChannel && (bpp==32))
-    return NetWMToWinIconAlpha(icon);
-  else
-    return NetWMToWinIconThreshold(icon);
+    if (hasIconAlphaChannel && (bpp == 32))
+        return NetWMToWinIconAlpha(icon);
+    else
+        return NetWMToWinIconThreshold(icon);
 }
 
 static pointer
 GetWindowProp(WindowPtr pWin, Atom name, long int *size_return)
 {
-  struct _Window	*pwin;
-  struct _Property	*prop;
-
-  if (!pWin || !name) {
-    ErrorF ("GetWindowProp - pWin or name was NULL\n");
-    return 0;
-  }
-  pwin = (struct _Window*) pWin;
-  if (!pwin->optional) return NULL;
-  for (prop = (struct _Property *) pwin->optional->userProps;
-       prop;
-       prop=prop->next){
-    if (prop->propertyName == name) {
-      *size_return=prop->size;
-      return prop->data;
+    struct _Window *pwin;
+    struct _Property *prop;
+
+    if (!pWin || !name) {
+        ErrorF("GetWindowProp - pWin or name was NULL\n");
+        return 0;
+    }
+    pwin = (struct _Window *) pWin;
+    if (!pwin->optional)
+        return NULL;
+    for (prop = (struct _Property *) pwin->optional->userProps;
+         prop; prop = prop->next) {
+        if (prop->propertyName == name) {
+            *size_return = prop->size;
+            return prop->data;
+        }
     }
-  }
-  return NULL;
+    return NULL;
 }
 
 /*
@@ -399,130 +393,128 @@ GetWindowProp(WindowPtr pWin, Atom name, long int *size_return)
  */
 
 HICON
-winXIconToHICON (WindowPtr pWin, int iconSize)
+winXIconToHICON(WindowPtr pWin, int iconSize)
 {
-  unsigned char		*mask, *image, *imageMask;
-  unsigned char		*dst, *src;
-  PixmapPtr		iconPtr;
-  PixmapPtr		maskPtr;
-  int			planes, bpp, effBPP, stride, maskStride, i;
-  int			biggest_size = 0;
-  HDC			hDC;
-  ICONINFO		ii;
-  WinXWMHints		hints;
-  HICON			hIcon = NULL;
-  uint32_t		*biggest_icon = NULL;
-
-  /* Try to get _NET_WM_ICON icons first */
-  static Atom _XA_NET_WM_ICON;
-  static int generation;
-  uint32_t *icon, *icon_data = NULL;
-  long int size=0;
-
-  hDC = GetDC (GetDesktopWindow ());
-  planes = GetDeviceCaps (hDC, PLANES);
-  bpp = GetDeviceCaps (hDC, BITSPIXEL);
-  ReleaseDC (GetDesktopWindow (), hDC);
-
-  if (generation != serverGeneration) {
-     generation = serverGeneration;
-     _XA_NET_WM_ICON = MakeAtom("_NET_WM_ICON", 12, TRUE);
-  }
-
-  if (_XA_NET_WM_ICON) icon_data = GetWindowProp(pWin, _XA_NET_WM_ICON, &size);
-  if (icon_data)
-    {
-      for(icon = icon_data;
-	  icon < &icon_data[size] && *icon;
-	  icon = &icon[icon[0]*icon[1]+2])
-	{
-	  if (icon[0]==iconSize && icon[1]==iconSize)
-            return NetWMToWinIcon(bpp, icon);
-	  /* Find the biggest icon and let Windows scale the size */
-	  else if (biggest_size < icon[0])
-	    {
-	      biggest_icon = icon;
-	      biggest_size = icon[0];
-	    }
-	}
-      if (biggest_icon)
-	return NetWMToWinIcon(bpp, biggest_icon);
+    unsigned char *mask, *image, *imageMask;
+    unsigned char *dst, *src;
+    PixmapPtr iconPtr;
+    PixmapPtr maskPtr;
+    int planes, bpp, effBPP, stride, maskStride, i;
+    int biggest_size = 0;
+    HDC hDC;
+    ICONINFO ii;
+    WinXWMHints hints;
+    HICON hIcon = NULL;
+    uint32_t *biggest_icon = NULL;
+
+    /* Try to get _NET_WM_ICON icons first */
+    static Atom _XA_NET_WM_ICON;
+    static int generation;
+    uint32_t *icon, *icon_data = NULL;
+    long int size = 0;
+
+    hDC = GetDC(GetDesktopWindow());
+    planes = GetDeviceCaps(hDC, PLANES);
+    bpp = GetDeviceCaps(hDC, BITSPIXEL);
+    ReleaseDC(GetDesktopWindow(), hDC);
+
+    if (generation != serverGeneration) {
+        generation = serverGeneration;
+        _XA_NET_WM_ICON = MakeAtom("_NET_WM_ICON", 12, TRUE);
     }
-  winDebug("winXIconToHICON - pWin %x: no suitable NetIcon\n",(int)pWin, iconSize);
-
-  winMultiWindowGetWMHints (pWin, &hints);
-  if (!hints.icon_pixmap) return NULL;
-
-  dixLookupResourceByType((pointer) &iconPtr, hints.icon_pixmap, RT_PIXMAP,
-				NullClient, DixUnknownAccess);
-  
-  if (!iconPtr) return NULL;
-
-  /* 15 BPP is really 16BPP as far as we care */
-  if (bpp == 15)
-    effBPP = 16;
-  else
-    effBPP = bpp;
-  
-  /* Need 16-bit aligned rows for DDBitmaps */
-  stride = ((iconSize * effBPP + 15) & (~15)) / 8;
-
-  /* Mask is 1-bit deep */
-  maskStride = ((iconSize * 1 + 15) & (~15)) / 8;
-
-  image = malloc (stride * iconSize);
-  imageMask = malloc (stride * iconSize);
-  /* Default to a completely black mask */
-  mask = calloc (maskStride, iconSize);
-  
-  winScaleXBitmapToWindows (iconSize, effBPP, iconPtr, image);
-  dixLookupResourceByType((pointer) &maskPtr, hints.icon_mask, RT_PIXMAP,
-				NullClient, DixUnknownAccess);
-
-  if (maskPtr) 
-    {
-      winScaleXBitmapToWindows (iconSize, 1, maskPtr, mask);
-      
-      winScaleXBitmapToWindows (iconSize, effBPP, maskPtr, imageMask);
-      
-      /* Now we need to set all bits of the icon which are not masked */
-      /* on to 0 because Color is really an XOR, not an OR function */
-      dst = image;
-      src = imageMask;
-
-      for (i = 0; i < (stride * iconSize); i++)
-	if ((*(src++)))
-	  *(dst++) = 0;
-	else
-	  dst++;
+
+    if (_XA_NET_WM_ICON)
+        icon_data = GetWindowProp(pWin, _XA_NET_WM_ICON, &size);
+    if (icon_data) {
+        for (icon = icon_data;
+             icon < &icon_data[size] && *icon;
+             icon = &icon[icon[0] * icon[1] + 2]) {
+            if (icon[0] == iconSize && icon[1] == iconSize)
+                return NetWMToWinIcon(bpp, icon);
+            /* Find the biggest icon and let Windows scale the size */
+            else if (biggest_size < icon[0]) {
+                biggest_icon = icon;
+                biggest_size = icon[0];
+            }
+        }
+        if (biggest_icon)
+            return NetWMToWinIcon(bpp, biggest_icon);
     }
-  
-  ii.fIcon = TRUE;
-  ii.xHotspot = 0; /* ignored */
-  ii.yHotspot = 0; /* ignored */
-  
-  /* Create Win32 mask from pixmap shape */
-  ii.hbmMask = CreateBitmap (iconSize, iconSize, planes, 1, mask);
-
-  /* Create Win32 bitmap from pixmap */
-  ii.hbmColor = CreateBitmap (iconSize, iconSize, planes, bpp, image);
-
-  /* Merge Win32 mask and bitmap into icon */
-  hIcon = CreateIconIndirect (&ii);
-
-  /* Release Win32 mask and bitmap */
-  DeleteObject (ii.hbmMask);
-  DeleteObject (ii.hbmColor);
-
-  /* Free X mask and bitmap */
-  free (mask);
-  free (image);
-  free (imageMask);
-
-  return hIcon;
-}
+    winDebug("winXIconToHICON - pWin %x: no suitable NetIcon\n", (int) pWin,
+             iconSize);
+
+    winMultiWindowGetWMHints(pWin, &hints);
+    if (!hints.icon_pixmap)
+        return NULL;
+
+    dixLookupResourceByType((pointer) &iconPtr, hints.icon_pixmap, RT_PIXMAP,
+                            NullClient, DixUnknownAccess);
+
+    if (!iconPtr)
+        return NULL;
+
+    /* 15 BPP is really 16BPP as far as we care */
+    if (bpp == 15)
+        effBPP = 16;
+    else
+        effBPP = bpp;
+
+    /* Need 16-bit aligned rows for DDBitmaps */
+    stride = ((iconSize * effBPP + 15) & (~15)) / 8;
+
+    /* Mask is 1-bit deep */
+    maskStride = ((iconSize * 1 + 15) & (~15)) / 8;
+
+    image = malloc(stride * iconSize);
+    imageMask = malloc(stride * iconSize);
+    /* Default to a completely black mask */
+    mask = calloc(maskStride, iconSize);
+
+    winScaleXBitmapToWindows(iconSize, effBPP, iconPtr, image);
+    dixLookupResourceByType((pointer) &maskPtr, hints.icon_mask, RT_PIXMAP,
+                            NullClient, DixUnknownAccess);
+
+    if (maskPtr) {
+        winScaleXBitmapToWindows(iconSize, 1, maskPtr, mask);
+
+        winScaleXBitmapToWindows(iconSize, effBPP, maskPtr, imageMask);
+
+        /* Now we need to set all bits of the icon which are not masked */
+        /* on to 0 because Color is really an XOR, not an OR function */
+        dst = image;
+        src = imageMask;
 
+        for (i = 0; i < (stride * iconSize); i++)
+            if ((*(src++)))
+                *(dst++) = 0;
+            else
+                dst++;
+    }
+
+    ii.fIcon = TRUE;
+    ii.xHotspot = 0;            /* ignored */
+    ii.yHotspot = 0;            /* ignored */
+
+    /* Create Win32 mask from pixmap shape */
+    ii.hbmMask = CreateBitmap(iconSize, iconSize, planes, 1, mask);
+
+    /* Create Win32 bitmap from pixmap */
+    ii.hbmColor = CreateBitmap(iconSize, iconSize, planes, bpp, image);
+
+    /* Merge Win32 mask and bitmap into icon */
+    hIcon = CreateIconIndirect(&ii);
+
+    /* Release Win32 mask and bitmap */
+    DeleteObject(ii.hbmMask);
+    DeleteObject(ii.hbmColor);
 
+    /* Free X mask and bitmap */
+    free(mask);
+    free(image);
+    free(imageMask);
+
+    return hIcon;
+}
 
 /*
  * Change the Windows window icon 
@@ -530,112 +522,115 @@ winXIconToHICON (WindowPtr pWin, int iconSize)
 
 #ifdef XWIN_MULTIWINDOW
 void
-winUpdateIcon (Window id)
+winUpdateIcon(Window id)
 {
-  WindowPtr		pWin;
-  HICON			hIcon, hIconSmall=NULL, hIconOld;
-
-  dixLookupResourceByType((pointer) &pWin, id, RT_WINDOW, NullClient, DixUnknownAccess);
-  if (pWin)
-    {
-      winWindowPriv(pWin);
-      if (pWinPriv->hWnd) {
-        hIcon = winOverrideIcon ((unsigned long)pWin);
-        if (!hIcon) {
-          hIcon = winXIconToHICON (pWin, GetSystemMetrics(SM_CXICON));
-          if (!hIcon) {
-            hIcon = g_hIconX;
-            hIconSmall = g_hSmallIconX;
-          } else {
-            /* Leave undefined if not found */
-            hIconSmall = winXIconToHICON (pWin, GetSystemMetrics(SM_CXSMICON));
-          }
+    WindowPtr pWin;
+    HICON hIcon, hIconSmall = NULL, hIconOld;
+
+    dixLookupResourceByType((pointer) &pWin, id, RT_WINDOW, NullClient,
+                            DixUnknownAccess);
+    if (pWin) {
+        winWindowPriv(pWin);
+        if (pWinPriv->hWnd) {
+            hIcon = winOverrideIcon((unsigned long) pWin);
+            if (!hIcon) {
+                hIcon = winXIconToHICON(pWin, GetSystemMetrics(SM_CXICON));
+                if (!hIcon) {
+                    hIcon = g_hIconX;
+                    hIconSmall = g_hSmallIconX;
+                }
+                else {
+                    /* Leave undefined if not found */
+                    hIconSmall =
+                        winXIconToHICON(pWin, GetSystemMetrics(SM_CXSMICON));
+                }
+            }
+
+            /* Set the large icon */
+            hIconOld = (HICON) SendMessage(pWinPriv->hWnd,
+                                           WM_SETICON, ICON_BIG,
+                                           (LPARAM) hIcon);
+
+            /* Delete the icon if its not the default */
+            winDestroyIcon(hIconOld);
+
+            /* Same for the small icon */
+            hIconOld = (HICON) SendMessage(pWinPriv->hWnd,
+                                           WM_SETICON, ICON_SMALL,
+                                           (LPARAM) hIconSmall);
+            winDestroyIcon(hIconOld);
         }
+    }
+}
 
-        /* Set the large icon */
-        hIconOld = (HICON) SendMessage (pWinPriv->hWnd,
-                                        WM_SETICON, ICON_BIG, (LPARAM) hIcon);
+void
+winInitGlobalIcons(void)
+{
+    int sm_cx = GetSystemMetrics(SM_CXICON);
+    int sm_cxsm = GetSystemMetrics(SM_CXSMICON);
 
-        /* Delete the icon if its not the default */
-        winDestroyIcon(hIconOld);
+    /* Load default X icon in case it's not ready yet */
+    if (!g_hIconX) {
+        g_hIconX = winOverrideDefaultIcon(sm_cx);
+        g_hSmallIconX = winOverrideDefaultIcon(sm_cxsm);
+    }
 
-        /* Same for the small icon */
-        hIconOld = (HICON) SendMessage (pWinPriv->hWnd,
-                                        WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
-        winDestroyIcon(hIconOld);
-      }
-  }
+    if (!g_hIconX) {
+        g_hIconX = (HICON) LoadImage(g_hInstance,
+                                     MAKEINTRESOURCE(IDI_XWIN),
+                                     IMAGE_ICON,
+                                     GetSystemMetrics(SM_CXICON),
+                                     GetSystemMetrics(SM_CYICON), 0);
+        g_hSmallIconX = (HICON) LoadImage(g_hInstance,
+                                          MAKEINTRESOURCE(IDI_XWIN),
+                                          IMAGE_ICON,
+                                          GetSystemMetrics(SM_CXSMICON),
+                                          GetSystemMetrics(SM_CYSMICON),
+                                          LR_DEFAULTSIZE);
+    }
 }
 
-void winInitGlobalIcons (void)
+void
+winSelectIcons(WindowPtr pWin, HICON * pIcon, HICON * pSmallIcon)
 {
-  int sm_cx = GetSystemMetrics(SM_CXICON);
-  int sm_cxsm = GetSystemMetrics(SM_CXSMICON);
-  /* Load default X icon in case it's not ready yet */
-  if (!g_hIconX) 
-    {  
-      g_hIconX = winOverrideDefaultIcon(sm_cx);
-      g_hSmallIconX = winOverrideDefaultIcon(sm_cxsm);
+    HICON hIcon, hSmallIcon;
+
+    winInitGlobalIcons();
+
+    /* Try and get the icon from WM_HINTS */
+    hIcon = winXIconToHICON(pWin, GetSystemMetrics(SM_CXICON));
+    hSmallIcon = winXIconToHICON(pWin, GetSystemMetrics(SM_CXSMICON));
+
+    /* If we got the small, but not the large one swap them */
+    if (!hIcon && hSmallIcon) {
+        hIcon = hSmallIcon;
+        hSmallIcon = NULL;
     }
-  
-  if (!g_hIconX)
-    {   
-      g_hIconX = (HICON)LoadImage (g_hInstance,
-	      MAKEINTRESOURCE(IDI_XWIN),
-	      IMAGE_ICON,
-	      GetSystemMetrics(SM_CXICON),
-	      GetSystemMetrics(SM_CYICON),
-	      0);
-      g_hSmallIconX = (HICON)LoadImage (g_hInstance,
-	      MAKEINTRESOURCE(IDI_XWIN),
-	      IMAGE_ICON,
-	      GetSystemMetrics(SM_CXSMICON),
-	      GetSystemMetrics(SM_CYSMICON),
-	      LR_DEFAULTSIZE);
+
+    /* Use default X icon if no icon loaded from WM_HINTS */
+    if (!hIcon) {
+        hIcon = g_hIconX;
+        hSmallIcon = g_hSmallIconX;
     }
-}
 
-void winSelectIcons(WindowPtr pWin, HICON *pIcon, HICON *pSmallIcon)
-{
-  HICON hIcon, hSmallIcon;
-  
-  winInitGlobalIcons();  
-  
-  /* Try and get the icon from WM_HINTS */
-  hIcon = winXIconToHICON (pWin, GetSystemMetrics(SM_CXICON));
-  hSmallIcon = winXIconToHICON (pWin, GetSystemMetrics(SM_CXSMICON));
-
-  /* If we got the small, but not the large one swap them */
-  if (!hIcon && hSmallIcon) 
-  {
-      hIcon = hSmallIcon;
-      hSmallIcon = NULL;
-  }
-  
-  /* Use default X icon if no icon loaded from WM_HINTS */
-  if (!hIcon) {
-    hIcon = g_hIconX;
-    hSmallIcon = g_hSmallIconX;
-  }
-
-  if (pIcon)
-    *pIcon = hIcon;
-  else
-    winDestroyIcon(hIcon);
-
-  if (pSmallIcon)
-    *pSmallIcon = hSmallIcon;
-  else
-    winDestroyIcon(hSmallIcon);
+    if (pIcon)
+        *pIcon = hIcon;
+    else
+        winDestroyIcon(hIcon);
+
+    if (pSmallIcon)
+        *pSmallIcon = hSmallIcon;
+    else
+        winDestroyIcon(hSmallIcon);
 }
 
-void winDestroyIcon(HICON hIcon)
+void
+winDestroyIcon(HICON hIcon)
 {
-  /* Delete the icon if its not one of the application defaults or an override */
-  if (hIcon &&
-      hIcon != g_hIconX &&
-      hIcon != g_hSmallIconX &&
-      !winIconIsOverride((unsigned long)hIcon))
-    DestroyIcon (hIcon);
+    /* Delete the icon if its not one of the application defaults or an override */
+    if (hIcon &&
+        hIcon != g_hIconX &&
+        hIcon != g_hSmallIconX && !winIconIsOverride((unsigned long) hIcon))
+        DestroyIcon(hIcon);
 }
 #endif
diff --git a/xorg-server/hw/xwin/winmultiwindowshape.c b/xorg-server/hw/xwin/winmultiwindowshape.c
index b622db95a..d5200cdb6 100644
--- a/xorg-server/hw/xwin/winmultiwindowshape.c
+++ b/xorg-server/hw/xwin/winmultiwindowshape.c
@@ -1,208 +1,199 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	Kensuke Matsuzaki

- *		Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-

-#include "win.h"

-

-

-/*

- * winSetShapeMultiWindow - See Porting Layer Definition - p. 42

- */

-

-void

-winSetShapeMultiWindow (WindowPtr pWin, int kind)

-{

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winScreenPriv(pScreen);

-

-#if CYGMULTIWINDOW_DEBUG

-  ErrorF ("winSetShapeMultiWindow - pWin: %08x kind: %i\n", pWin, kind);

-#endif

-  

-  WIN_UNWRAP(SetShape); 

-  (*pScreen->SetShape)(pWin, kind);

-  WIN_WRAP(SetShape, winSetShapeMultiWindow);

-  

-  /* Update the Windows window's shape */

-  winReshapeMultiWindow (pWin);

-  winUpdateRgnMultiWindow (pWin);

-

-  return;

-}

-

-

-/*

- * winUpdateRgnMultiWindow - Local function to update a Windows window region

- */

-

-void

-winUpdateRgnMultiWindow (WindowPtr pWin)

-{

-  SetWindowRgn (winGetWindowPriv(pWin)->hWnd,

-		winGetWindowPriv(pWin)->hRgn, TRUE);

-

-  /* The system now owns the region specified by the region handle and will delete it when it is no longer needed. */

-  winGetWindowPriv(pWin)->hRgn = NULL;

-}

-

-

-/*

- * winReshapeMultiWindow - Computes the composite clipping region for a window

- */

-

-void

-winReshapeMultiWindow (WindowPtr pWin)

-{

-  int		nRects;

-  RegionRec	rrNewShape;

-  BoxPtr	pShape, pRects, pEnd;

-  HRGN		hRgn, hRgnRect;

-  winWindowPriv(pWin);

-

-#if CYGDEBUG

-  winDebug ("winReshape ()\n");

-#endif

-  

-  /* Bail if the window is the root window */

-  if (pWin->parent == NULL)

-    return;

-

-  /* Bail if the window is not top level */

-  if (pWin->parent->parent != NULL)

-    return;

-

-  /* Bail if Windows window handle is invalid */

-  if (pWinPriv->hWnd == NULL)

-    return;

-  

-  /* Free any existing window region stored in the window privates */

-  if (pWinPriv->hRgn != NULL)

-    {

-      DeleteObject (pWinPriv->hRgn);

-      pWinPriv->hRgn = NULL;

-    }

-  

-  /* Bail if the window has no bounding region defined */

-  if (!wBoundingShape (pWin))

-    return;

-

-  RegionNull(&rrNewShape);

-  RegionCopy(&rrNewShape, wBoundingShape(pWin));

-  RegionTranslate(&rrNewShape, pWin->borderWidth, pWin->borderWidth);

-  

-  nRects = RegionNumRects(&rrNewShape);

-  pShape = RegionRects(&rrNewShape);

-  

-  /* Don't do anything if there are no rectangles in the region */

-  if (nRects > 0)

-    {

-      RECT			rcClient;

-      RECT			rcWindow;

-      int			iOffsetX, iOffsetY;

-      

-      /* Get client rectangle */

-      if (!GetClientRect (pWinPriv->hWnd, &rcClient))

-	{

-	  ErrorF ("winReshape - GetClientRect failed, bailing: %d\n",

-		  (int) GetLastError ());

-	  return;

-	}

-

-      /* Translate client rectangle coords to screen coords */

-      /* NOTE: Only transforms top and left members */

-      ClientToScreen (pWinPriv->hWnd, (LPPOINT) &rcClient);

-

-      /* Get window rectangle */

-      if (!GetWindowRect (pWinPriv->hWnd, &rcWindow))

-	{

-	  ErrorF ("winReshape - GetWindowRect failed, bailing: %d\n",

-		  (int) GetLastError ());

-	  return;

-	}

-

-      /* Calculate offset from window upper-left to client upper-left */

-      iOffsetX = rcClient.left - rcWindow.left;

-      iOffsetY = rcClient.top - rcWindow.top;

-

-      /* Create initial Windows region for title bar */

-      /* FIXME: Mean, nasty, ugly hack!!! */

-      hRgn = CreateRectRgn (0, 0, rcWindow.right, iOffsetY);

-      if (hRgn == NULL)

-	{

-	  ErrorF ("winReshape - Initial CreateRectRgn (%d, %d, %d, %d) "

-		  "failed: %d\n",

-		  0, 0, (int) rcWindow.right, iOffsetY, (int) GetLastError ());

-	}

-

-      /* Loop through all rectangles in the X region */

-      for (pRects = pShape, pEnd = pShape + nRects; pRects < pEnd; pRects++)

-        {

-	  /* Create a Windows region for the X rectangle */

-	  hRgnRect = CreateRectRgn (pRects->x1 + iOffsetX,

-				    pRects->y1 + iOffsetY,

-				    pRects->x2 + iOffsetX,

-				    pRects->y2 + iOffsetY);

-	  if (hRgnRect == NULL)

-	    {

-	      ErrorF ("winReshape - Loop CreateRectRgn (%d, %d, %d, %d) "

-		      "failed: %d\n"

-		      "\tx1: %d x2: %d xOff: %d y1: %d y2: %d yOff: %d\n",

-		      pRects->x1 + iOffsetX,

-		      pRects->y1 + iOffsetY,

-		      pRects->x2 + iOffsetX,

-		      pRects->y2 + iOffsetY,

-		      (int) GetLastError (),

-		      pRects->x1, pRects->x2, iOffsetX,

-		      pRects->y1, pRects->y2, iOffsetY);

-	    }

-

-	  /* Merge the Windows region with the accumulated region */

-	  if (CombineRgn (hRgn, hRgn, hRgnRect, RGN_OR) == ERROR)

-	    {

-	      ErrorF ("winReshape - CombineRgn () failed: %d\n",

-		      (int) GetLastError ());

-	    }

-

-	  /* Delete the temporary Windows region */

-	  DeleteObject (hRgnRect);

-        }

-      

-      /* Save a handle to the composite region in the window privates */

-      pWinPriv->hRgn = hRgn;

-    }

-

-  RegionUninit(&rrNewShape);

-  

-  return;

-}

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	Kensuke Matsuzaki
+ *		Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+
+#include "win.h"
+
+/*
+ * winSetShapeMultiWindow - See Porting Layer Definition - p. 42
+ */
+
+void
+winSetShapeMultiWindow(WindowPtr pWin, int kind)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winScreenPriv(pScreen);
+
+#if CYGMULTIWINDOW_DEBUG
+    ErrorF("winSetShapeMultiWindow - pWin: %08x kind: %i\n", pWin, kind);
+#endif
+
+    WIN_UNWRAP(SetShape);
+    (*pScreen->SetShape) (pWin, kind);
+    WIN_WRAP(SetShape, winSetShapeMultiWindow);
+
+    /* Update the Windows window's shape */
+    winReshapeMultiWindow(pWin);
+    winUpdateRgnMultiWindow(pWin);
+
+    return;
+}
+
+/*
+ * winUpdateRgnMultiWindow - Local function to update a Windows window region
+ */
+
+void
+winUpdateRgnMultiWindow(WindowPtr pWin)
+{
+    SetWindowRgn(winGetWindowPriv(pWin)->hWnd,
+                 winGetWindowPriv(pWin)->hRgn, TRUE);
+
+    /* The system now owns the region specified by the region handle and will delete it when it is no longer needed. */
+    winGetWindowPriv(pWin)->hRgn = NULL;
+}
+
+/*
+ * winReshapeMultiWindow - Computes the composite clipping region for a window
+ */
+
+void
+winReshapeMultiWindow(WindowPtr pWin)
+{
+    int nRects;
+    RegionRec rrNewShape;
+    BoxPtr pShape, pRects, pEnd;
+    HRGN hRgn, hRgnRect;
+
+    winWindowPriv(pWin);
+
+#if CYGDEBUG
+    winDebug("winReshape ()\n");
+#endif
+
+    /* Bail if the window is the root window */
+    if (pWin->parent == NULL)
+        return;
+
+    /* Bail if the window is not top level */
+    if (pWin->parent->parent != NULL)
+        return;
+
+    /* Bail if Windows window handle is invalid */
+    if (pWinPriv->hWnd == NULL)
+        return;
+
+    /* Free any existing window region stored in the window privates */
+    if (pWinPriv->hRgn != NULL) {
+        DeleteObject(pWinPriv->hRgn);
+        pWinPriv->hRgn = NULL;
+    }
+
+    /* Bail if the window has no bounding region defined */
+    if (!wBoundingShape(pWin))
+        return;
+
+    RegionNull(&rrNewShape);
+    RegionCopy(&rrNewShape, wBoundingShape(pWin));
+    RegionTranslate(&rrNewShape, pWin->borderWidth, pWin->borderWidth);
+
+    nRects = RegionNumRects(&rrNewShape);
+    pShape = RegionRects(&rrNewShape);
+
+    /* Don't do anything if there are no rectangles in the region */
+    if (nRects > 0) {
+        RECT rcClient;
+        RECT rcWindow;
+        int iOffsetX, iOffsetY;
+
+        /* Get client rectangle */
+        if (!GetClientRect(pWinPriv->hWnd, &rcClient)) {
+            ErrorF("winReshape - GetClientRect failed, bailing: %d\n",
+                   (int) GetLastError());
+            return;
+        }
+
+        /* Translate client rectangle coords to screen coords */
+        /* NOTE: Only transforms top and left members */
+        ClientToScreen(pWinPriv->hWnd, (LPPOINT) & rcClient);
+
+        /* Get window rectangle */
+        if (!GetWindowRect(pWinPriv->hWnd, &rcWindow)) {
+            ErrorF("winReshape - GetWindowRect failed, bailing: %d\n",
+                   (int) GetLastError());
+            return;
+        }
+
+        /* Calculate offset from window upper-left to client upper-left */
+        iOffsetX = rcClient.left - rcWindow.left;
+        iOffsetY = rcClient.top - rcWindow.top;
+
+        /* Create initial Windows region for title bar */
+        /* FIXME: Mean, nasty, ugly hack!!! */
+        hRgn = CreateRectRgn(0, 0, rcWindow.right, iOffsetY);
+        if (hRgn == NULL) {
+            ErrorF("winReshape - Initial CreateRectRgn (%d, %d, %d, %d) "
+                   "failed: %d\n",
+                   0, 0, (int) rcWindow.right, iOffsetY, (int) GetLastError());
+        }
+
+        /* Loop through all rectangles in the X region */
+        for (pRects = pShape, pEnd = pShape + nRects; pRects < pEnd; pRects++) {
+            /* Create a Windows region for the X rectangle */
+            hRgnRect = CreateRectRgn(pRects->x1 + iOffsetX,
+                                     pRects->y1 + iOffsetY,
+                                     pRects->x2 + iOffsetX,
+                                     pRects->y2 + iOffsetY);
+            if (hRgnRect == NULL) {
+                ErrorF("winReshape - Loop CreateRectRgn (%d, %d, %d, %d) "
+                       "failed: %d\n"
+                       "\tx1: %d x2: %d xOff: %d y1: %d y2: %d yOff: %d\n",
+                       pRects->x1 + iOffsetX,
+                       pRects->y1 + iOffsetY,
+                       pRects->x2 + iOffsetX,
+                       pRects->y2 + iOffsetY,
+                       (int) GetLastError(),
+                       pRects->x1, pRects->x2, iOffsetX,
+                       pRects->y1, pRects->y2, iOffsetY);
+            }
+
+            /* Merge the Windows region with the accumulated region */
+            if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == ERROR) {
+                ErrorF("winReshape - CombineRgn () failed: %d\n",
+                       (int) GetLastError());
+            }
+
+            /* Delete the temporary Windows region */
+            DeleteObject(hRgnRect);
+        }
+
+        /* Save a handle to the composite region in the window privates */
+        pWinPriv->hRgn = hRgn;
+    }
+
+    RegionUninit(&rrNewShape);
+
+    return;
+}
diff --git a/xorg-server/hw/xwin/winmultiwindowwindow.c b/xorg-server/hw/xwin/winmultiwindowwindow.c
index aabde6b4a..0093fcbb1 100644
--- a/xorg-server/hw/xwin/winmultiwindowwindow.c
+++ b/xorg-server/hw/xwin/winmultiwindowwindow.c
@@ -44,45 +44,45 @@
  */
 
 void
-winCreateWindowsWindow (WindowPtr pWin);
+ winCreateWindowsWindow(WindowPtr pWin);
 
 static void
-winDestroyWindowsWindow (WindowPtr pWin);
+ winDestroyWindowsWindow(WindowPtr pWin);
 
 static void
-winUpdateWindowsWindow (WindowPtr pWin);
+ winUpdateWindowsWindow(WindowPtr pWin);
 
 static void
-winFindWindow (pointer value, XID id, pointer cdata);
+ winFindWindow(pointer value, XID id, pointer cdata);
 
 static
-void winInitMultiWindowClass(void)
+    void
+winInitMultiWindowClass(void)
 {
-  static wATOM atomXWinClass=0;
-  WNDCLASSEX wcx;
-
-  if (atomXWinClass==0)
-  {
-    /* Setup our window class */
-    wcx.cbSize=sizeof(WNDCLASSEX);
-    wcx.style = CS_HREDRAW | CS_VREDRAW | (g_fNativeGl ? CS_OWNDC : 0);
-    wcx.lpfnWndProc = winTopLevelWindowProc;
-    wcx.cbClsExtra = 0;
-    wcx.cbWndExtra = 0;
-    wcx.hInstance = g_hInstance;
-    wcx.hIcon = g_hIconX;
-    wcx.hCursor = 0;
-    wcx.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH);
-    wcx.lpszMenuName = NULL;
-    wcx.lpszClassName = WINDOW_CLASS_X;
-    wcx.hIconSm = g_hSmallIconX;
+    static wATOM atomXWinClass = 0;
+    WNDCLASSEX wcx;
+
+    if (atomXWinClass == 0) {
+        /* Setup our window class */
+        wcx.cbSize = sizeof(WNDCLASSEX);
+        wcx.style = CS_HREDRAW | CS_VREDRAW | (g_fNativeGl ? CS_OWNDC : 0);
+        wcx.lpfnWndProc = winTopLevelWindowProc;
+        wcx.cbClsExtra = 0;
+        wcx.cbWndExtra = 0;
+        wcx.hInstance = g_hInstance;
+        wcx.hIcon = g_hIconX;
+        wcx.hCursor = 0;
+        wcx.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+        wcx.lpszMenuName = NULL;
+        wcx.lpszClassName = WINDOW_CLASS_X;
+        wcx.hIconSm = g_hSmallIconX;
 
 #if CYGMULTIWINDOW_DEBUG
-    ErrorF ("winCreateWindowsWindow - Creating class: %s\n", WINDOW_CLASS_X);
+        ErrorF("winCreateWindowsWindow - Creating class: %s\n", WINDOW_CLASS_X);
 #endif
 
-    atomXWinClass = RegisterClassEx (&wcx);
-  }
+        atomXWinClass = RegisterClassEx(&wcx);
+    }
 }
 
 /*
@@ -90,63 +90,63 @@ void winInitMultiWindowClass(void)
  */
 
 Bool
-winCreateWindowMultiWindow (WindowPtr pWin)
+winCreateWindowMultiWindow(WindowPtr pWin)
 {
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = TRUE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-  winTrace ("winCreateWindowMultiWindow - pWin: %p\n", pWin);
+    winTrace("winCreateWindowMultiWindow - pWin: %p\n", pWin);
 #endif
-  
-  WIN_UNWRAP(CreateWindow);
-  fResult = (*pScreen->CreateWindow) (pWin);
-  WIN_WRAP(CreateWindow, winCreateWindowMultiWindow);
-  
-  /* Initialize some privates values */
-  pWinPriv->hRgn = NULL;
-  pWinPriv->hWnd = NULL;
-  pWinPriv->pScreenPriv = winGetScreenPriv(pWin->drawable.pScreen);
-  pWinPriv->fXKilled = FALSE;
+
+    WIN_UNWRAP(CreateWindow);
+    fResult = (*pScreen->CreateWindow) (pWin);
+    WIN_WRAP(CreateWindow, winCreateWindowMultiWindow);
+
+    /* Initialize some privates values */
+    pWinPriv->hRgn = NULL;
+    pWinPriv->hWnd = NULL;
+    pWinPriv->pScreenPriv = winGetScreenPriv(pWin->drawable.pScreen);
+    pWinPriv->fXKilled = FALSE;
 #ifdef XWIN_GLX_WINDOWS
-  pWinPriv->fWglUsed = FALSE;
+    pWinPriv->fWglUsed = FALSE;
 #endif
 
-  return fResult;
+    return fResult;
 }
 
-
 /*
  * DestroyWindow - See Porting Layer Definition - p. 37
  */
 
 Bool
-winDestroyWindowMultiWindow (WindowPtr pWin)
+winDestroyWindowMultiWindow(WindowPtr pWin)
 {
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = TRUE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winDestroyWindowMultiWindow - pWin: %p\n", pWin);
+    ErrorF("winDestroyWindowMultiWindow - pWin: %p\n", pWin);
 #endif
-  
-  WIN_UNWRAP(DestroyWindow); 
-  fResult = (*pScreen->DestroyWindow)(pWin);
-  WIN_WRAP(DestroyWindow, winDestroyWindowMultiWindow);
-  
-  /* Flag that the window has been destroyed */
-  pWinPriv->fXKilled = TRUE;
-  
-  /* Kill the MS Windows window associated with this window */
-  winDestroyWindowsWindow (pWin); 
-
-  return fResult;
-}
 
+    WIN_UNWRAP(DestroyWindow);
+    fResult = (*pScreen->DestroyWindow) (pWin);
+    WIN_WRAP(DestroyWindow, winDestroyWindowMultiWindow);
+
+    /* Flag that the window has been destroyed */
+    pWinPriv->fXKilled = TRUE;
+
+    /* Kill the MS Windows window associated with this window */
+    winDestroyWindowsWindow(pWin);
+
+    return fResult;
+}
 
 /*
  * PositionWindow - See Porting Layer Definition - p. 37
@@ -157,147 +157,143 @@ winDestroyWindowMultiWindow (WindowPtr pWin)
  */
 
 Bool
-winPositionWindowMultiWindow (WindowPtr pWin, int x, int y)
+winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
 {
-  Bool			fResult = TRUE;
-  int		        iX, iY, iWidth, iHeight;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
-
-  HWND hWnd = pWinPriv->hWnd;
-  RECT rcNew;
-  RECT rcOld;
+    Bool fResult = TRUE;
+    int iX, iY, iWidth, iHeight;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
+
+    HWND hWnd = pWinPriv->hWnd;
+    RECT rcNew;
+    RECT rcOld;
+
 #if CYGMULTIWINDOW_DEBUG
-  RECT rcClient;
-  RECT *lpRc;
+    RECT rcClient;
+    RECT *lpRc;
 #endif
-  DWORD dwExStyle;
-  DWORD dwStyle;
+    DWORD dwExStyle;
+    DWORD dwStyle;
 
 #if CYGMULTIWINDOW_DEBUG
-  winTrace ("winPositionWindowMultiWindow - pWin: %p\n", pWin);
+    winTrace("winPositionWindowMultiWindow - pWin: %p\n", pWin);
 #endif
-  
-  WIN_UNWRAP(PositionWindow);
-  fResult = (*pScreen->PositionWindow)(pWin, x, y);
-  WIN_WRAP(PositionWindow, winPositionWindowMultiWindow);
-  
+
+    WIN_UNWRAP(PositionWindow);
+    fResult = (*pScreen->PositionWindow) (pWin, x, y);
+    WIN_WRAP(PositionWindow, winPositionWindowMultiWindow);
+
 #if CYGWINDOWING_DEBUG
-  ErrorF ("winPositionWindowMultiWindow: (x, y) = (%d, %d)\n",
-	  x, y);
+    ErrorF("winPositionWindowMultiWindow: (x, y) = (%d, %d)\n", x, y);
 #endif
 
-  /* Bail out if the Windows window handle is bad */
-  if (!hWnd)
-    {
+    /* Bail out if the Windows window handle is bad */
+    if (!hWnd) {
 #if CYGWINDOWING_DEBUG
-      ErrorF ("\timmediately return since hWnd is NULL\n");
+        ErrorF("\timmediately return since hWnd is NULL\n");
 #endif
-      return fResult;
+        return fResult;
     }
 
-  /* Get the Windows window style and extended style */
-  dwExStyle = GetWindowLongPtr (hWnd, GWL_EXSTYLE);
-  dwStyle = GetWindowLongPtr (hWnd, GWL_STYLE);
+    /* Get the Windows window style and extended style */
+    dwExStyle = GetWindowLongPtr(hWnd, GWL_EXSTYLE);
+    dwStyle = GetWindowLongPtr(hWnd, GWL_STYLE);
 
-  /* Get the X and Y location of the X window */
-  iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
-  iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);
+    /* Get the X and Y location of the X window */
+    iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN);
+    iY = pWin->drawable.y + GetSystemMetrics(SM_YVIRTUALSCREEN);
 
-  /* Get the height and width of the X window */
-  iWidth = pWin->drawable.width;
-  iHeight = pWin->drawable.height;
+    /* Get the height and width of the X window */
+    iWidth = pWin->drawable.width;
+    iHeight = pWin->drawable.height;
 
-  /* Store the origin, height, and width in a rectangle structure */
-  SetRect (&rcNew, iX, iY, iX + iWidth, iY + iHeight);
+    /* Store the origin, height, and width in a rectangle structure */
+    SetRect(&rcNew, iX, iY, iX + iWidth, iY + iHeight);
 
 #if CYGMULTIWINDOW_DEBUG
-  lpRc = &rcNew;
-  ErrorF ("winPositionWindowMultiWindow - (%d ms)drawable (%d, %d)-(%d, %d)\n",
-	  GetTickCount (), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
+    lpRc = &rcNew;
+    ErrorF("winPositionWindowMultiWindow - (%d ms)drawable (%d, %d)-(%d, %d)\n",
+           GetTickCount(), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
 #endif
 
-  /*
-   * Calculate the required size of the Windows window rectangle,
-   * given the size of the Windows window client area.
-   */
-  AdjustWindowRectEx (&rcNew, dwStyle, FALSE, dwExStyle);
+    /*
+     * Calculate the required size of the Windows window rectangle,
+     * given the size of the Windows window client area.
+     */
+    AdjustWindowRectEx(&rcNew, dwStyle, FALSE, dwExStyle);
 
-  /* Get a rectangle describing the old Windows window */
-  GetWindowRect (hWnd, &rcOld);
+    /* Get a rectangle describing the old Windows window */
+    GetWindowRect(hWnd, &rcOld);
 
 #if CYGMULTIWINDOW_DEBUG
-  /* Get a rectangle describing the Windows window client area */
-  GetClientRect (hWnd, &rcClient);
-
-  lpRc = &rcNew;
-  ErrorF ("winPositionWindowMultiWindow - (%d ms)rcNew (%d, %d)-(%d, %d)\n",
-	  GetTickCount (), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
-      
-  lpRc = &rcOld;
-  ErrorF ("winPositionWindowMultiWindow - (%d ms)rcOld (%d, %d)-(%d, %d)\n",
-	  GetTickCount (), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
-      
-  lpRc = &rcClient;
-  ErrorF ("(%d ms)rcClient (%d, %d)-(%d, %d)\n",
-	  GetTickCount (), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
+    /* Get a rectangle describing the Windows window client area */
+    GetClientRect(hWnd, &rcClient);
+
+    lpRc = &rcNew;
+    ErrorF("winPositionWindowMultiWindow - (%d ms)rcNew (%d, %d)-(%d, %d)\n",
+           GetTickCount(), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
+
+    lpRc = &rcOld;
+    ErrorF("winPositionWindowMultiWindow - (%d ms)rcOld (%d, %d)-(%d, %d)\n",
+           GetTickCount(), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
+
+    lpRc = &rcClient;
+    ErrorF("(%d ms)rcClient (%d, %d)-(%d, %d)\n",
+           GetTickCount(), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
 #endif
 
-  /* Check if the old rectangle and new rectangle are the same */
-  if (!EqualRect (&rcNew, &rcOld))
-    {
+    /* Check if the old rectangle and new rectangle are the same */
+    if (!EqualRect(&rcNew, &rcOld)) {
 #if CYGMULTIWINDOW_DEBUG
-      ErrorF ("winPositionWindowMultiWindow - Need to move\n");
+        ErrorF("winPositionWindowMultiWindow - Need to move\n");
 #endif
 
 #if CYGWINDOWING_DEBUG
-      ErrorF ("\tMoveWindow to (%ld, %ld) - %ldx%ld\n", rcNew.left, rcNew.top,
-	      rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
+        ErrorF("\tMoveWindow to (%ld, %ld) - %ldx%ld\n", rcNew.left, rcNew.top,
+               rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
 #endif
-      /* Change the position and dimensions of the Windows window */
-      MoveWindow (hWnd,
-		  rcNew.left, rcNew.top,
-		  rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
-		  TRUE);
+        /* Change the position and dimensions of the Windows window */
+        MoveWindow(hWnd,
+                   rcNew.left, rcNew.top,
+                   rcNew.right - rcNew.left, rcNew.bottom - rcNew.top, TRUE);
     }
-  else
-    {
+    else {
 #if CYGMULTIWINDOW_DEBUG
-      ErrorF ("winPositionWindowMultiWindow - Not need to move\n");
+        ErrorF("winPositionWindowMultiWindow - Not need to move\n");
 #endif
     }
 
-  return fResult;
+    return fResult;
 }
 
-
 /*
  * ChangeWindowAttributes - See Porting Layer Definition - p. 37
  */
 
 Bool
-winChangeWindowAttributesMultiWindow (WindowPtr pWin, unsigned long mask)
+winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask)
 {
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
+    Bool fResult = TRUE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winChangeWindowAttributesMultiWindow - pWin: %08x\n", pWin);
+    ErrorF("winChangeWindowAttributesMultiWindow - pWin: %08x\n", pWin);
 #endif
-  
-  WIN_UNWRAP(ChangeWindowAttributes); 
-  fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);
-  WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesMultiWindow);
-  
-  /*
-   * NOTE: We do not currently need to do anything here.
-   */
-
-  return fResult;
-}
 
+    WIN_UNWRAP(ChangeWindowAttributes);
+    fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
+    WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesMultiWindow);
+
+    /*
+     * NOTE: We do not currently need to do anything here.
+     */
+
+    return fResult;
+}
 
 /*
  * UnmapWindow - See Porting Layer Definition - p. 37
@@ -305,30 +301,30 @@ winChangeWindowAttributesMultiWindow (WindowPtr pWin, unsigned long mask)
  */
 
 Bool
-winUnmapWindowMultiWindow (WindowPtr pWin)
+winUnmapWindowMultiWindow(WindowPtr pWin)
 {
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = TRUE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winUnmapWindowMultiWindow - pWin: %08x\n", pWin);
+    ErrorF("winUnmapWindowMultiWindow - pWin: %08x\n", pWin);
 #endif
-  
-  WIN_UNWRAP(UnrealizeWindow); 
-  fResult = (*pScreen->UnrealizeWindow)(pWin);
-  WIN_WRAP(UnrealizeWindow, winUnmapWindowMultiWindow);
-  
-  /* Flag that the window has been killed */
-  pWinPriv->fXKilled = TRUE;
- 
-  /* Destroy the Windows window associated with this X window */
-  winDestroyWindowsWindow (pWin);
-
-  return fResult;
-}
 
+    WIN_UNWRAP(UnrealizeWindow);
+    fResult = (*pScreen->UnrealizeWindow) (pWin);
+    WIN_WRAP(UnrealizeWindow, winUnmapWindowMultiWindow);
+
+    /* Flag that the window has been killed */
+    pWinPriv->fXKilled = TRUE;
+
+    /* Destroy the Windows window associated with this X window */
+    winDestroyWindowsWindow(pWin);
+
+    return fResult;
+}
 
 /*
  * MapWindow - See Porting Layer Definition - p. 37
@@ -336,597 +332,580 @@ winUnmapWindowMultiWindow (WindowPtr pWin)
  */
 
 Bool
-winMapWindowMultiWindow (WindowPtr pWin)
+winMapWindowMultiWindow(WindowPtr pWin)
 {
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = TRUE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winMapWindowMultiWindow - pWin: %08x\n", pWin);
+    ErrorF("winMapWindowMultiWindow - pWin: %08x\n", pWin);
 #endif
-  
-  WIN_UNWRAP(RealizeWindow); 
-  fResult = (*pScreen->RealizeWindow)(pWin);
-  WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);
-  
-  /* Flag that this window has not been destroyed */
-  pWinPriv->fXKilled = FALSE;
-
-  /* Refresh/redisplay the Windows window associated with this X window */
-  winUpdateWindowsWindow (pWin);
-
-  /* Update the Windows window's shape */
-  winReshapeMultiWindow (pWin);
-  winUpdateRgnMultiWindow (pWin);
-
-  return fResult;
-}
 
+    WIN_UNWRAP(RealizeWindow);
+    fResult = (*pScreen->RealizeWindow) (pWin);
+    WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);
+
+    /* Flag that this window has not been destroyed */
+    pWinPriv->fXKilled = FALSE;
+
+    /* Refresh/redisplay the Windows window associated with this X window */
+    winUpdateWindowsWindow(pWin);
+
+    /* Update the Windows window's shape */
+    winReshapeMultiWindow(pWin);
+    winUpdateRgnMultiWindow(pWin);
+
+    return fResult;
+}
 
 /*
  * ReparentWindow - See Porting Layer Definition - p. 42
  */
 
 void
-winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent)
+winReparentWindowMultiWindow(WindowPtr pWin, WindowPtr pPriorParent)
 {
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
-
-  winDebug("winReparentMultiWindow - pWin:%08x XID:0x%x, reparent from pWin:%08x XID:0x%x to pWin:%08x XID:0x%x\n",
-           pWin, pWin->drawable.id, pPriorParent, pPriorParent->drawable.id, pWin->parent, pWin->parent->drawable.id);
-
-  WIN_UNWRAP(ReparentWindow);
-  if (pScreen->ReparentWindow) 
-    (*pScreen->ReparentWindow)(pWin, pPriorParent);
-  WIN_WRAP(ReparentWindow, winReparentWindowMultiWindow);
-  
-  /* Update the Windows window associated with this X window */
-  winUpdateWindowsWindow (pWin);
-}
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winScreenPriv(pScreen);
+
+    winDebug
+        ("winReparentMultiWindow - pWin:%08x XID:0x%x, reparent from pWin:%08x XID:0x%x to pWin:%08x XID:0x%x\n",
+         pWin, pWin->drawable.id, pPriorParent, pPriorParent->drawable.id,
+         pWin->parent, pWin->parent->drawable.id);
+
+    WIN_UNWRAP(ReparentWindow);
+    if (pScreen->ReparentWindow)
+        (*pScreen->ReparentWindow) (pWin, pPriorParent);
+    WIN_WRAP(ReparentWindow, winReparentWindowMultiWindow);
 
+    /* Update the Windows window associated with this X window */
+    winUpdateWindowsWindow(pWin);
+}
 
 /*
  * RestackWindow - Shuffle the z-order of a window
  */
 
 void
-winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib)
+winRestackWindowMultiWindow(WindowPtr pWin, WindowPtr pOldNextSib)
 {
 #if 0
-  WindowPtr		pPrevWin;
-  UINT			uFlags;
-  HWND			hInsertAfter;
-  HWND                  hWnd = NULL;
+    WindowPtr pPrevWin;
+    UINT uFlags;
+    HWND hInsertAfter;
+    HWND hWnd = NULL;
 #endif
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
-  winTrace ("winRestackMultiWindow - %08x\n", pWin);
+    winTrace("winRestackMultiWindow - %08x\n", pWin);
 #endif
-  
-   WIN_UNWRAP(RestackWindow);
-   if (pScreen->RestackWindow) 
-     (*pScreen->RestackWindow)(pWin, pOldNextSib);
-   WIN_WRAP(RestackWindow, winRestackWindowMultiWindow);
-  
+
+    WIN_UNWRAP(RestackWindow);
+    if (pScreen->RestackWindow)
+        (*pScreen->RestackWindow) (pWin, pOldNextSib);
+    WIN_WRAP(RestackWindow, winRestackWindowMultiWindow);
+
 #if 1
-  /*
-   * Calling winReorderWindowsMultiWindow here means our window manager
-   * (i.e. Windows Explorer) has initiative to determine Z order.
-   */
-  if (pWin->nextSib != pOldNextSib)
-    winReorderWindowsMultiWindow ();
+    /*
+     * Calling winReorderWindowsMultiWindow here means our window manager
+     * (i.e. Windows Explorer) has initiative to determine Z order.
+     */
+    if (pWin->nextSib != pOldNextSib)
+        winReorderWindowsMultiWindow();
 #else
-  /* Bail out if no window privates or window handle is invalid */
-  if (!pWinPriv || !pWinPriv->hWnd)
-    return;
-
-  /* Get a pointer to our previous sibling window */
-  pPrevWin = pWin->prevSib;
-
-  /*
-   * Look for a sibling window with
-   * valid privates and window handle
-   */
-  while (pPrevWin
-	 && !winGetWindowPriv(pPrevWin)
-	 && !winGetWindowPriv(pPrevWin)->hWnd)
-    pPrevWin = pPrevWin->prevSib;
-      
-  /* Check if we found a valid sibling */
-  if (pPrevWin)
-    {
-      /* Valid sibling - get handle to insert window after */
-      hInsertAfter = winGetWindowPriv(pPrevWin)->hWnd;
-      uFlags = SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE;
-  
-      hWnd = GetNextWindow (pWinPriv->hWnd, GW_HWNDPREV);
-
-      do
-	{
-	  if (GetProp (hWnd, WIN_WINDOW_PROP))
-	    {
-	      if (hWnd == winGetWindowPriv(pPrevWin)->hWnd)
-		{
-		  uFlags |= SWP_NOZORDER;
-		}
-	      break;
-	    }
-	  hWnd = GetNextWindow (hWnd, GW_HWNDPREV);
-	}
-      while (hWnd);
+    /* Bail out if no window privates or window handle is invalid */
+    if (!pWinPriv || !pWinPriv->hWnd)
+        return;
+
+    /* Get a pointer to our previous sibling window */
+    pPrevWin = pWin->prevSib;
+
+    /*
+     * Look for a sibling window with
+     * valid privates and window handle
+     */
+    while (pPrevWin && !winGetWindowPriv(pPrevWin)
+           && !winGetWindowPriv(pPrevWin)->hWnd)
+        pPrevWin = pPrevWin->prevSib;
+
+    /* Check if we found a valid sibling */
+    if (pPrevWin) {
+        /* Valid sibling - get handle to insert window after */
+        hInsertAfter = winGetWindowPriv(pPrevWin)->hWnd;
+        uFlags = SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE;
+
+        hWnd = GetNextWindow(pWinPriv->hWnd, GW_HWNDPREV);
+
+        do {
+            if (GetProp(hWnd, WIN_WINDOW_PROP)) {
+                if (hWnd == winGetWindowPriv(pPrevWin)->hWnd) {
+                    uFlags |= SWP_NOZORDER;
+                }
+                break;
+            }
+            hWnd = GetNextWindow(hWnd, GW_HWNDPREV);
+        }
+        while (hWnd);
     }
-  else
-    {
-      /* No valid sibling - make this window the top window */
-      hInsertAfter = HWND_TOP;
-      uFlags = SWP_NOMOVE | SWP_NOSIZE;
+    else {
+        /* No valid sibling - make this window the top window */
+        hInsertAfter = HWND_TOP;
+        uFlags = SWP_NOMOVE | SWP_NOSIZE;
     }
-      
-  /* Perform the restacking operation in Windows */
-  SetWindowPos (pWinPriv->hWnd,
-		hInsertAfter,
-		0, 0,
-		0, 0,
-		uFlags);
+
+    /* Perform the restacking operation in Windows */
+    SetWindowPos(pWinPriv->hWnd, hInsertAfter, 0, 0, 0, 0, uFlags);
 #endif
 }
 
-
 /*
  * winCreateWindowsWindow - Create a Windows window associated with an X window
  */
 
 void
-winCreateWindowsWindow (WindowPtr pWin)
+winCreateWindowsWindow(WindowPtr pWin)
 {
-  int                   iX, iY;
-  int			iWidth;
-  int			iHeight;
-  HWND			hWnd;
-  HWND			hFore = NULL;
-  winWindowPriv(pWin);
-  HICON			hIcon;
-  HICON			hIconSmall;
-  winPrivScreenPtr	pScreenPriv = pWinPriv->pScreenPriv;
-  WinXSizeHints         hints;
-  WindowPtr		pDaddy;
-  DWORD dwStyle, dwExStyle;
-  RECT rc;
-
-  winInitMultiWindowClass();
-
-  winDebug("winCreateWindowsTopLevelWindow - pWin:%08x XID:0x%x \n", pWin, pWin->drawable.id);
-
-  iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
-  iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);
-
-  iWidth = pWin->drawable.width;
-  iHeight = pWin->drawable.height;
-
-  /* If it's an InputOutput window, and so is going to end up being made visible,
-     make sure the window actually ends up somewhere where it will be visible */
-  if (pWin->drawable.class != InputOnly)
-    {
-      if ((iX < GetSystemMetrics (SM_XVIRTUALSCREEN)) || (iX > GetSystemMetrics (SM_CXVIRTUALSCREEN)))
-        iX = CW_USEDEFAULT;
-
-      if ((iY < GetSystemMetrics (SM_YVIRTUALSCREEN)) || (iY > GetSystemMetrics (SM_CYVIRTUALSCREEN)))
-        iY = CW_USEDEFAULT;
+    int iX, iY;
+    int iWidth;
+    int iHeight;
+    HWND hWnd;
+    HWND hFore = NULL;
+
+    winWindowPriv(pWin);
+    HICON hIcon;
+    HICON hIconSmall;
+    winPrivScreenPtr pScreenPriv = pWinPriv->pScreenPriv;
+    WinXSizeHints hints;
+    WindowPtr pDaddy;
+    DWORD dwStyle, dwExStyle;
+    RECT rc;
+
+    winInitMultiWindowClass();
+
+    winDebug("winCreateWindowsTopLevelWindow - pWin:%08x XID:0x%x \n", pWin,
+             pWin->drawable.id);
+
+    iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN);
+    iY = pWin->drawable.y + GetSystemMetrics(SM_YVIRTUALSCREEN);
+
+    iWidth = pWin->drawable.width;
+    iHeight = pWin->drawable.height;
+
+    /* If it's an InputOutput window, and so is going to end up being made visible,
+       make sure the window actually ends up somewhere where it will be visible */
+    if (pWin->drawable.class != InputOnly) {
+        if ((iX < GetSystemMetrics(SM_XVIRTUALSCREEN)) ||
+            (iX > GetSystemMetrics(SM_CXVIRTUALSCREEN)))
+            iX = CW_USEDEFAULT;
+
+        if ((iY < GetSystemMetrics(SM_YVIRTUALSCREEN)) ||
+            (iY > GetSystemMetrics(SM_CYVIRTUALSCREEN)))
+            iY = CW_USEDEFAULT;
     }
 
-  winDebug("winCreateWindowsWindow - %dx%d @ %dx%d\n", iWidth, iHeight, iX, iY);
+    winDebug("winCreateWindowsWindow - %dx%d @ %dx%d\n", iWidth, iHeight, iX,
+             iY);
 
-  if (winMultiWindowGetTransientFor (pWin, &pDaddy))
-    {
-      if (pDaddy)
-      {
-        hFore = GetForegroundWindow();
-        if (hFore && (pDaddy != (WindowPtr)GetProp(hFore, WIN_WID_PROP))) hFore = NULL;
-      }
+    if (winMultiWindowGetTransientFor(pWin, &pDaddy)) {
+        if (pDaddy) {
+            hFore = GetForegroundWindow();
+            if (hFore && (pDaddy != (WindowPtr) GetProp(hFore, WIN_WID_PROP)))
+                hFore = NULL;
+        }
     }
-  else
-    {
-      /* Default positions if none specified */
-      if (!winMultiWindowGetWMNormalHints(pWin, &hints))
-        hints.flags = 0;
-      if (!(hints.flags & (USPosition|PPosition)) &&
-          !pWin->overrideRedirect)
-      {
-        iX = CW_USEDEFAULT;
-        iY = CW_USEDEFAULT;
-      }
+    else {
+        /* Default positions if none specified */
+        if (!winMultiWindowGetWMNormalHints(pWin, &hints))
+            hints.flags = 0;
+        if (!(hints.flags & (USPosition | PPosition)) &&
+            !pWin->overrideRedirect) {
+            iX = CW_USEDEFAULT;
+            iY = CW_USEDEFAULT;
+        }
     }
 
-  /* Make it WS_OVERLAPPED in create call since WS_POPUP doesn't support */
-  /* CW_USEDEFAULT, change back to popup after creation */
-  dwStyle = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
-  dwExStyle = WS_EX_TOOLWINDOW;
-
-  /*
-     Calculate the window coordinates containing the requested client area,
-     being careful to preseve CW_USEDEFAULT
-  */
-  rc.top = (iY != CW_USEDEFAULT) ? iY : 0;
-  rc.left = (iX != CW_USEDEFAULT) ? iX : 0;
-  rc.bottom = rc.top + iHeight;
-  rc.right = rc.left + iWidth;
-  AdjustWindowRectEx(&rc, dwStyle, FALSE, dwExStyle);
-  if (iY != CW_USEDEFAULT) iY = rc.top;
-  if (iX != CW_USEDEFAULT) iX = rc.left;
-  iHeight = rc.bottom - rc.top;
-  iWidth = rc.right - rc.left;
-
-  winDebug("winCreateWindowsWindow - %dx%d @ %dx%d\n", iWidth, iHeight, iX, iY);
-
-  /* Create the window */
-  hWnd = CreateWindowExA (dwExStyle,		/* Extended styles */
-			  WINDOW_CLASS_X,	/* Class name */
-			  WINDOW_TITLE_X,	/* Window name */
-			  dwStyle,		/* Styles */
-			  iX,			/* Horizontal position */
-			  iY,			/* Vertical position */
-			  iWidth,		/* Right edge */
-			  iHeight,		/* Bottom edge */
-			  hFore,		/* Null or Parent window if transient*/
-			  (HMENU) NULL,		/* No menu */
-			  GetModuleHandle (NULL), /* Instance handle */
-			  pWin);		/* ScreenPrivates */
-  if (hWnd == NULL)
-    {
-      ErrorF ("winCreateWindowsWindow - CreateWindowExA () failed: %d\n",
-	      (int) GetLastError ());
+    /* Make it WS_OVERLAPPED in create call since WS_POPUP doesn't support */
+    /* CW_USEDEFAULT, change back to popup after creation */
+    dwStyle = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+    dwExStyle = WS_EX_TOOLWINDOW;
+
+    /*
+       Calculate the window coordinates containing the requested client area,
+       being careful to preseve CW_USEDEFAULT
+     */
+    rc.top = (iY != CW_USEDEFAULT) ? iY : 0;
+    rc.left = (iX != CW_USEDEFAULT) ? iX : 0;
+    rc.bottom = rc.top + iHeight;
+    rc.right = rc.left + iWidth;
+    AdjustWindowRectEx(&rc, dwStyle, FALSE, dwExStyle);
+    if (iY != CW_USEDEFAULT)
+        iY = rc.top;
+    if (iX != CW_USEDEFAULT)
+        iX = rc.left;
+    iHeight = rc.bottom - rc.top;
+    iWidth = rc.right - rc.left;
+
+    winDebug("winCreateWindowsWindow - %dx%d @ %dx%d\n", iWidth, iHeight, iX,
+             iY);
+
+    /* Create the window */
+    hWnd = CreateWindowExA(dwExStyle,   /* Extended styles */
+                           WINDOW_CLASS_X,      /* Class name */
+                           WINDOW_TITLE_X,      /* Window name */
+                           dwStyle,     /* Styles */
+                           iX,  /* Horizontal position */
+                           iY,  /* Vertical position */
+                           iWidth,      /* Right edge */
+                           iHeight,     /* Bottom edge */
+                           hFore,       /* Null or Parent window if transient */
+                           (HMENU) NULL,        /* No menu */
+                           GetModuleHandle(NULL),       /* Instance handle */
+                           pWin);       /* ScreenPrivates */
+    if (hWnd == NULL) {
+        ErrorF("winCreateWindowsWindow - CreateWindowExA () failed: %d\n",
+               (int) GetLastError());
     }
-  pWinPriv->hWnd = hWnd;
-
-  /* Set application or .XWinrc defined Icons */
-  winSelectIcons(pWin, &hIcon, &hIconSmall);
-  if (hIcon) SendMessage (hWnd, WM_SETICON, ICON_BIG, (LPARAM) hIcon);
-  if (hIconSmall) SendMessage (hWnd, WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
- 
-  /* Change style back to popup, already placed... */
-  SetWindowLongPtr(hWnd, GWL_STYLE, WS_POPUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
-  SetWindowPos (hWnd, 0, 0, 0, 0, 0,
-		SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
-
-  /* Adjust the X window to match the window placement we actually got... */
-  winAdjustXWindow (pWin, hWnd);
-
-  /* Make sure it gets the proper system menu for a WS_POPUP, too */
-  GetSystemMenu (hWnd, TRUE);
-
-  /* Cause any .XWinrc menus to be added in main WNDPROC */
-  PostMessage (hWnd, WM_INIT_SYS_MENU, 0, 0);
-  
-  SetProp (hWnd, WIN_WID_PROP, (HANDLE) winGetWindowID(pWin));
-
-  /* Flag that this Windows window handles its own activation */
-  SetProp (hWnd, WIN_NEEDMANAGE_PROP, (HANDLE) 0);
-
-  /* Call engine-specific create window procedure */
-  (*pScreenPriv->pwinFinishCreateWindowsWindow) (pWin);
-}
+    pWinPriv->hWnd = hWnd;
+
+    /* Set application or .XWinrc defined Icons */
+    winSelectIcons(pWin, &hIcon, &hIconSmall);
+    if (hIcon)
+        SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM) hIcon);
+    if (hIconSmall)
+        SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
+
+    /* Change style back to popup, already placed... */
+    SetWindowLongPtr(hWnd, GWL_STYLE,
+                     WS_POPUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
+    SetWindowPos(hWnd, 0, 0, 0, 0, 0,
+                 SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE |
+                 SWP_NOACTIVATE);
+
+    /* Adjust the X window to match the window placement we actually got... */
+    winAdjustXWindow(pWin, hWnd);
+
+    /* Make sure it gets the proper system menu for a WS_POPUP, too */
+    GetSystemMenu(hWnd, TRUE);
+
+    /* Cause any .XWinrc menus to be added in main WNDPROC */
+    PostMessage(hWnd, WM_INIT_SYS_MENU, 0, 0);
 
+    SetProp(hWnd, WIN_WID_PROP, (HANDLE) winGetWindowID(pWin));
+
+    /* Flag that this Windows window handles its own activation */
+    SetProp(hWnd, WIN_NEEDMANAGE_PROP, (HANDLE) 0);
+
+    /* Call engine-specific create window procedure */
+    (*pScreenPriv->pwinFinishCreateWindowsWindow) (pWin);
+}
 
 Bool winInDestroyWindowsWindow = FALSE;
+
 /*
  * winDestroyWindowsWindow - Destroy a Windows window associated
  * with an X window
  */
 static void
-winDestroyWindowsWindow (WindowPtr pWin)
+winDestroyWindowsWindow(WindowPtr pWin)
 {
-  MSG			msg;
-  winWindowPriv(pWin);
-  BOOL			oldstate = winInDestroyWindowsWindow;
-  HICON hIcon;
-  HICON hIconSm;
+    MSG msg;
 
-  winDebug("winDestroyWindowsWindow - pWin:%08x XID:0x%x \n", pWin, pWin->drawable.id);
+    winWindowPriv(pWin);
+    BOOL oldstate = winInDestroyWindowsWindow;
+    HICON hIcon;
+    HICON hIconSm;
 
-  /* Bail out if the Windows window handle is invalid */
-  if (pWinPriv->hWnd == NULL)
-    return;
+    winDebug("winDestroyWindowsWindow - pWin:%08x XID:0x%x \n", pWin,
+             pWin->drawable.id);
 
-  winInDestroyWindowsWindow = TRUE;
+    /* Bail out if the Windows window handle is invalid */
+    if (pWinPriv->hWnd == NULL)
+        return;
 
-  /* Store the info we need to destroy after this window is gone */
-  hIcon = (HICON)SendMessage(pWinPriv->hWnd, WM_GETICON, ICON_BIG, 0);
-  hIconSm = (HICON)SendMessage(pWinPriv->hWnd, WM_GETICON, ICON_SMALL, 0);
+    winInDestroyWindowsWindow = TRUE;
 
-  /* Destroy the Windows window */
-  DestroyWindow (pWinPriv->hWnd);
+    /* Store the info we need to destroy after this window is gone */
+    hIcon = (HICON) SendMessage(pWinPriv->hWnd, WM_GETICON, ICON_BIG, 0);
+    hIconSm = (HICON) SendMessage(pWinPriv->hWnd, WM_GETICON, ICON_SMALL, 0);
 
-  /* Null our handle to the Window so referencing it will cause an error */
-  pWinPriv->hWnd = NULL;
+    /* Destroy the Windows window */
+    DestroyWindow(pWinPriv->hWnd);
 
-  /* Destroy any icons we created for this window */
-  winDestroyIcon(hIcon);
-  winDestroyIcon(hIconSm);
+    /* Null our handle to the Window so referencing it will cause an error */
+    pWinPriv->hWnd = NULL;
+
+    /* Destroy any icons we created for this window */
+    winDestroyIcon(hIcon);
+    winDestroyIcon(hIconSm);
 
 #ifdef XWIN_GLX_WINDOWS
-  /* No longer note WGL used on this window */
-  pWinPriv->fWglUsed = FALSE;
+    /* No longer note WGL used on this window */
+    pWinPriv->fWglUsed = FALSE;
 #endif
 
-  /* Process all messages on our queue */
-  while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
-    {
-      if (g_hDlgDepthChange == 0 || !IsDialogMessage (g_hDlgDepthChange, &msg))
-	{
-	  DispatchMessage (&msg);
-	}
+    /* Process all messages on our queue */
+    while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+        if (g_hDlgDepthChange == 0 || !IsDialogMessage(g_hDlgDepthChange, &msg)) {
+            DispatchMessage(&msg);
+        }
     }
 
-  winInDestroyWindowsWindow = oldstate;
+    winInDestroyWindowsWindow = oldstate;
 
-  winDebug("winDestroyWindowsWindow - done\n");
+    winDebug("winDestroyWindowsWindow - done\n");
 }
 
-
 /*
  * winUpdateWindowsWindow - Redisplay/redraw a Windows window
  * associated with an X window
  */
 
 static void
-winUpdateWindowsWindow (WindowPtr pWin)
+winUpdateWindowsWindow(WindowPtr pWin)
 {
-  winWindowPriv(pWin);
-  HWND			hWnd = pWinPriv->hWnd;
+    winWindowPriv(pWin);
+    HWND hWnd = pWinPriv->hWnd;
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winUpdateWindowsWindow\n");
+    ErrorF("winUpdateWindowsWindow\n");
 #endif
 
-  /* Check if the Windows window's parents have been destroyed */
-  if (pWin->parent != NULL
-      && pWin->parent->parent == NULL
-      && pWin->mapped)
-    {
-      /* Create the Windows window if it has been destroyed */
-      if (hWnd == NULL)
-	{
-	  winCreateWindowsWindow (pWin);
-	  assert (pWinPriv->hWnd != NULL);
-	}
-
-      /* Display the window without activating it */
-      if (pWin->drawable.class != InputOnly)
-        ShowWindow (pWinPriv->hWnd, SW_SHOWNOACTIVATE);
-
-      /* Send first paint message */
-      UpdateWindow (pWinPriv->hWnd);
+    /* Check if the Windows window's parents have been destroyed */
+    if (pWin->parent != NULL && pWin->parent->parent == NULL && pWin->mapped) {
+        /* Create the Windows window if it has been destroyed */
+        if (hWnd == NULL) {
+            winCreateWindowsWindow(pWin);
+            assert(pWinPriv->hWnd != NULL);
+        }
+
+        /* Display the window without activating it */
+        if (pWin->drawable.class != InputOnly)
+            ShowWindow(pWinPriv->hWnd, SW_SHOWNOACTIVATE);
+
+        /* Send first paint message */
+        UpdateWindow(pWinPriv->hWnd);
     }
-  else if (hWnd != NULL)
-    {
-      /* Destroy the Windows window if its parents are destroyed */
-      winDestroyWindowsWindow (pWin);
-      assert (pWinPriv->hWnd == NULL);
+    else if (hWnd != NULL) {
+        /* Destroy the Windows window if its parents are destroyed */
+        winDestroyWindowsWindow(pWin);
+        assert(pWinPriv->hWnd == NULL);
     }
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("-winUpdateWindowsWindow\n");
+    ErrorF("-winUpdateWindowsWindow\n");
 #endif
 }
 
-
 /*
  * winGetWindowID - 
  */
 
 XID
-winGetWindowID (WindowPtr pWin)
+winGetWindowID(WindowPtr pWin)
 {
-  WindowIDPairRec	wi = {pWin, 0};
-  ClientPtr		c = wClient(pWin);
-  
-  /* */
-  FindClientResourcesByType (c, RT_WINDOW, winFindWindow, &wi);
+    WindowIDPairRec wi = { pWin, 0 };
+    ClientPtr c = wClient(pWin);
+
+    /* */
+    FindClientResourcesByType(c, RT_WINDOW, winFindWindow, &wi);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winGetWindowID - Window ID: %d\n", wi.id);
+    ErrorF("winGetWindowID - Window ID: %d\n", wi.id);
 #endif
 
-  return wi.id;
+    return wi.id;
 }
 
-
 /*
  * winFindWindow - 
  */
 
 static void
-winFindWindow (pointer value, XID id, pointer cdata)
+winFindWindow(pointer value, XID id, pointer cdata)
 {
-  WindowIDPairPtr	wi = (WindowIDPairPtr)cdata;
+    WindowIDPairPtr wi = (WindowIDPairPtr) cdata;
 
-  if (value == wi->value)
-    {
-      wi->id = id;
+    if (value == wi->value) {
+        wi->id = id;
     }
 }
 
-
 /*
  * winReorderWindowsMultiWindow - 
  */
 
 void
-winReorderWindowsMultiWindow (void)
+winReorderWindowsMultiWindow(void)
 {
-  HWND hwnd = NULL;
-  WindowPtr pWin = NULL;
-  WindowPtr pWinSib = NULL;
-  XID vlist[2];
-  static Bool fRestacking = FALSE; /* Avoid recusive calls to this function */
-  DWORD dwCurrentProcessID = GetCurrentProcessId ();
-  DWORD dwWindowProcessID = 0;
+    HWND hwnd = NULL;
+    WindowPtr pWin = NULL;
+    WindowPtr pWinSib = NULL;
+    XID vlist[2];
+    static Bool fRestacking = FALSE;    /* Avoid recusive calls to this function */
+    DWORD dwCurrentProcessID = GetCurrentProcessId();
+    DWORD dwWindowProcessID = 0;
 
 #if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
-  winTrace ("winReorderWindowsMultiWindow\n");
+    winTrace("winReorderWindowsMultiWindow\n");
 #endif
 
-  if (fRestacking)
-    {
-      /* It is a recusive call so immediately exit */
+    if (fRestacking) {
+        /* It is a recusive call so immediately exit */
 #if CYGWINDOWING_DEBUG
-      ErrorF ("winReorderWindowsMultiWindow - "
-	      "exit because fRestacking == TRUE\n");
+        ErrorF("winReorderWindowsMultiWindow - "
+               "exit because fRestacking == TRUE\n");
 #endif
-      return;
+        return;
     }
-  fRestacking = TRUE;
-
-  /* Loop through top level Window windows, descending in Z order */
-  for ( hwnd = GetTopWindow (NULL);
-	hwnd;
-	hwnd = GetNextWindow (hwnd, GW_HWNDNEXT) )
-    {
-      /* Don't take care of other Cygwin/X process's windows */
-      GetWindowThreadProcessId (hwnd, &dwWindowProcessID);
-
-      if ( GetProp (hwnd, WIN_WINDOW_PROP)
-	   && (dwWindowProcessID == dwCurrentProcessID)
-	   && !IsIconic (hwnd) ) /* ignore minimized windows */
-	{
-	  pWinSib = pWin;
-	  pWin = GetProp (hwnd, WIN_WINDOW_PROP);
-	      
-	  if (!pWinSib)
-	    { /* 1st window - raise to the top */
-	      vlist[0] = Above;
-		  
-	      ConfigureWindow (pWin, CWStackMode, vlist, wClient(pWin));
-	    }
-	  else
-	    { /* 2nd or deeper windows - just below the previous one */
-	      vlist[0] = winGetWindowID (pWinSib);
-	      vlist[1] = Below;
-
-	      ConfigureWindow (pWin, CWSibling | CWStackMode,
-			       vlist, wClient(pWin));
-	    }
-	}
+    fRestacking = TRUE;
+
+    /* Loop through top level Window windows, descending in Z order */
+    for (hwnd = GetTopWindow(NULL);
+         hwnd; hwnd = GetNextWindow(hwnd, GW_HWNDNEXT)) {
+        /* Don't take care of other Cygwin/X process's windows */
+        GetWindowThreadProcessId(hwnd, &dwWindowProcessID);
+
+        if (GetProp(hwnd, WIN_WINDOW_PROP)
+            && (dwWindowProcessID == dwCurrentProcessID)
+            && !IsIconic(hwnd)) {       /* ignore minimized windows */
+            pWinSib = pWin;
+            pWin = GetProp(hwnd, WIN_WINDOW_PROP);
+
+            if (!pWinSib) {     /* 1st window - raise to the top */
+                vlist[0] = Above;
+
+                ConfigureWindow(pWin, CWStackMode, vlist, wClient(pWin));
+            }
+            else {              /* 2nd or deeper windows - just below the previous one */
+                vlist[0] = winGetWindowID(pWinSib);
+                vlist[1] = Below;
+
+                ConfigureWindow(pWin, CWSibling | CWStackMode,
+                                vlist, wClient(pWin));
+            }
+        }
     }
 
-  fRestacking = FALSE;
+    fRestacking = FALSE;
 }
 
-
 /*
  * winMinimizeWindow - Minimize in response to WM_CHANGE_STATE
  */
 
 void
-winMinimizeWindow (Window id)
+winMinimizeWindow(Window id)
 {
-  WindowPtr		pWin;
-  winPrivWinPtr	pWinPriv;
+    WindowPtr pWin;
+    winPrivWinPtr pWinPriv;
+
 #ifdef XWIN_MULTIWINDOWEXTWM
-  win32RootlessWindowPtr pRLWinPriv;
+    win32RootlessWindowPtr pRLWinPriv;
 #endif
-  HWND hWnd;
-  ScreenPtr pScreen = NULL;
-  winPrivScreenPtr pScreenPriv = NULL;
-  winScreenInfo *pScreenInfo = NULL;
+    HWND hWnd;
+    ScreenPtr pScreen = NULL;
+    winPrivScreenPtr pScreenPriv = NULL;
+    winScreenInfo *pScreenInfo = NULL;
 
 #if CYGWINDOWING_DEBUG
-  ErrorF ("winMinimizeWindow\n");
+    ErrorF("winMinimizeWindow\n");
 #endif
 
-  dixLookupResourceByType((pointer) &pWin, id, RT_WINDOW, NullClient, DixUnknownAccess);
-  if (!pWin) 
-  { 
-      ErrorF("%s: NULL pWin. Leaving\n", __FUNCTION__); 
-      return; 
-  }
+    dixLookupResourceByType((pointer) &pWin, id, RT_WINDOW, NullClient,
+                            DixUnknownAccess);
+    if (!pWin) {
+        ErrorF("%s: NULL pWin. Leaving\n", __FUNCTION__);
+        return;
+    }
 
-  pScreen = pWin->drawable.pScreen;
-  if (pScreen) pScreenPriv = winGetScreenPriv(pScreen);
-  if (pScreenPriv) pScreenInfo = pScreenPriv->pScreenInfo;
+    pScreen = pWin->drawable.pScreen;
+    if (pScreen)
+        pScreenPriv = winGetScreenPriv(pScreen);
+    if (pScreenPriv)
+        pScreenInfo = pScreenPriv->pScreenInfo;
 
 #ifdef XWIN_MULTIWINDOWEXTWM
-  if (pScreenPriv && pScreenInfo->fInternalWM)
-    {
-      pRLWinPriv  = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, FALSE);
-      hWnd = pRLWinPriv->hWnd;
+    if (pScreenPriv && pScreenInfo->fInternalWM) {
+        pRLWinPriv =
+            (win32RootlessWindowPtr) RootlessFrameForWindow(pWin, FALSE);
+        hWnd = pRLWinPriv->hWnd;
     }
-  else
+    else
 #else
-  if (pScreenPriv)
+    if (pScreenPriv)
 #endif
     {
-      pWinPriv = winGetWindowPriv (pWin);
-      hWnd = pWinPriv->hWnd;
+        pWinPriv = winGetWindowPriv(pWin);
+        hWnd = pWinPriv->hWnd;
     }
 
-  ShowWindow (hWnd, SW_MINIMIZE);
+    ShowWindow(hWnd, SW_MINIMIZE);
 }
 
-
 /*
  * CopyWindow - See Porting Layer Definition - p. 39
  */
 void
-winCopyWindowMultiWindow (WindowPtr pWin, DDXPointRec oldpt,
-			  RegionPtr oldRegion)
+winCopyWindowMultiWindow(WindowPtr pWin, DDXPointRec oldpt, RegionPtr oldRegion)
 {
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winScreenPriv(pScreen);
 
 #if CYGWINDOWING_DEBUG
-  ErrorF ("CopyWindowMultiWindow\n");
+    ErrorF("CopyWindowMultiWindow\n");
 #endif
-  WIN_UNWRAP(CopyWindow); 
-  (*pScreen->CopyWindow)(pWin, oldpt, oldRegion);
-  WIN_WRAP(CopyWindow, winCopyWindowMultiWindow);
+    WIN_UNWRAP(CopyWindow);
+    (*pScreen->CopyWindow) (pWin, oldpt, oldRegion);
+    WIN_WRAP(CopyWindow, winCopyWindowMultiWindow);
 }
 
-
 /*
  * MoveWindow - See Porting Layer Definition - p. 42
  */
 void
-winMoveWindowMultiWindow (WindowPtr pWin, int x, int y,
-			  WindowPtr pSib, VTKind kind)
+winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
+                         WindowPtr pSib, VTKind kind)
 {
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winScreenPriv(pScreen);
 
 #if CYGWINDOWING_DEBUG
-  ErrorF ("MoveWindowMultiWindow to (%d, %d)\n", x, y);
+    ErrorF("MoveWindowMultiWindow to (%d, %d)\n", x, y);
 #endif
 
-  WIN_UNWRAP(MoveWindow); 
-  (*pScreen->MoveWindow)(pWin, x, y, pSib, kind);
-  WIN_WRAP(MoveWindow, winMoveWindowMultiWindow);
+    WIN_UNWRAP(MoveWindow);
+    (*pScreen->MoveWindow) (pWin, x, y, pSib, kind);
+    WIN_WRAP(MoveWindow, winMoveWindowMultiWindow);
 }
 
-
 /*
  * ResizeWindow - See Porting Layer Definition - p. 42
  */
 void
-winResizeWindowMultiWindow (WindowPtr pWin, int x, int y, unsigned int w,
-			    unsigned int h, WindowPtr pSib)
+winResizeWindowMultiWindow(WindowPtr pWin, int x, int y, unsigned int w,
+                           unsigned int h, WindowPtr pSib)
 {
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winScreenPriv(pScreen);
 
 #if CYGWINDOWING_DEBUG
-  ErrorF ("ResizeWindowMultiWindow to (%d, %d) - %dx%d\n", x, y, w, h);
+    ErrorF("ResizeWindowMultiWindow to (%d, %d) - %dx%d\n", x, y, w, h);
 #endif
-  WIN_UNWRAP(ResizeWindow); 
-  (*pScreen->ResizeWindow)(pWin, x, y, w, h, pSib);
-  WIN_WRAP(ResizeWindow, winResizeWindowMultiWindow);
+    WIN_UNWRAP(ResizeWindow);
+    (*pScreen->ResizeWindow) (pWin, x, y, w, h, pSib);
+    WIN_WRAP(ResizeWindow, winResizeWindowMultiWindow);
 }
 
-
 /*
  * winAdjustXWindow
  *
@@ -938,97 +917,95 @@ winResizeWindowMultiWindow (WindowPtr pWin, int x, int y, unsigned int w,
  * adjusts Windows window with respect to X window.
  */
 int
-winAdjustXWindow (WindowPtr pWin, HWND hwnd)
+winAdjustXWindow(WindowPtr pWin, HWND hwnd)
 {
-  RECT rcDraw; /* Rect made from pWin->drawable to be adjusted */
-  RECT rcWin;  /* The source: WindowRect from hwnd */
-  DrawablePtr pDraw;
-  XID vlist[4];
-  LONG dX, dY, dW, dH, x, y;
-  DWORD dwStyle, dwExStyle;
+    RECT rcDraw;                /* Rect made from pWin->drawable to be adjusted */
+    RECT rcWin;                 /* The source: WindowRect from hwnd */
+    DrawablePtr pDraw;
+    XID vlist[4];
+    LONG dX, dY, dW, dH, x, y;
+    DWORD dwStyle, dwExStyle;
 
 #define WIDTH(rc) (rc.right - rc.left)
 #define HEIGHT(rc) (rc.bottom - rc.top)
-  
+
 #if CYGWINDOWING_DEBUG
-  ErrorF ("winAdjustXWindow\n");
+    ErrorF("winAdjustXWindow\n");
 #endif
 
-  if (IsIconic (hwnd))
-    {
+    if (IsIconic(hwnd)) {
 #if CYGWINDOWING_DEBUG
-      ErrorF ("\timmediately return because the window is iconized\n");
-#endif
-      /*
-       * If the Windows window is minimized, its WindowRect has
-       * meaningless values so we don't adjust X window to it.
-       */
-      vlist[0] = 0;
-      vlist[1] = 0;
-      return ConfigureWindow (pWin, CWX | CWY, vlist, wClient(pWin));
+        ErrorF("\timmediately return because the window is iconized\n");
+#endif
+        /*
+         * If the Windows window is minimized, its WindowRect has
+         * meaningless values so we don't adjust X window to it.
+         */
+        vlist[0] = 0;
+        vlist[1] = 0;
+        return ConfigureWindow(pWin, CWX | CWY, vlist, wClient(pWin));
     }
-  
-  pDraw = &pWin->drawable;
 
-  /* Calculate the window rect from the drawable */
-  x = pDraw->x + GetSystemMetrics (SM_XVIRTUALSCREEN);
-  y = pDraw->y + GetSystemMetrics (SM_YVIRTUALSCREEN);
-  SetRect (&rcDraw, x, y, x + pDraw->width, y + pDraw->height);
+    pDraw = &pWin->drawable;
+
+    /* Calculate the window rect from the drawable */
+    x = pDraw->x + GetSystemMetrics(SM_XVIRTUALSCREEN);
+    y = pDraw->y + GetSystemMetrics(SM_YVIRTUALSCREEN);
+    SetRect(&rcDraw, x, y, x + pDraw->width, y + pDraw->height);
 #ifdef CYGMULTIWINDOW_DEBUG
-          winDebug("\tDrawable extend {%d, %d, %d, %d}, {%d, %d}\n", 
-              rcDraw.left, rcDraw.top, rcDraw.right, rcDraw.bottom,
-              rcDraw.right - rcDraw.left, rcDraw.bottom - rcDraw.top);
+    winDebug("\tDrawable extend {%d, %d, %d, %d}, {%d, %d}\n",
+             rcDraw.left, rcDraw.top, rcDraw.right, rcDraw.bottom,
+             rcDraw.right - rcDraw.left, rcDraw.bottom - rcDraw.top);
 #endif
-  dwExStyle = GetWindowLongPtr (hwnd, GWL_EXSTYLE);
-  dwStyle = GetWindowLongPtr (hwnd, GWL_STYLE);
+    dwExStyle = GetWindowLongPtr(hwnd, GWL_EXSTYLE);
+    dwStyle = GetWindowLongPtr(hwnd, GWL_STYLE);
 #ifdef CYGMULTIWINDOW_DEBUG
-          winDebug("\tWindowStyle: %08x %08x\n", dwStyle, dwExStyle);
+    winDebug("\tWindowStyle: %08x %08x\n", dwStyle, dwExStyle);
 #endif
-  AdjustWindowRectEx (&rcDraw, dwStyle, FALSE, dwExStyle);
+    AdjustWindowRectEx(&rcDraw, dwStyle, FALSE, dwExStyle);
 
-  /* The source of adjust */
-  GetWindowRect (hwnd, &rcWin);
+    /* The source of adjust */
+    GetWindowRect(hwnd, &rcWin);
 #ifdef CYGMULTIWINDOW_DEBUG
-          winDebug("\tWindow extend {%d, %d, %d, %d}, {%d, %d}\n", 
-              rcWin.left, rcWin.top, rcWin.right, rcWin.bottom,
-              rcWin.right - rcWin.left, rcWin.bottom - rcWin.top);
-          winDebug("\tDraw extend {%d, %d, %d, %d}, {%d, %d}\n", 
-              rcDraw.left, rcDraw.top, rcDraw.right, rcDraw.bottom,
-              rcDraw.right - rcDraw.left, rcDraw.bottom - rcDraw.top);
+    winDebug("\tWindow extend {%d, %d, %d, %d}, {%d, %d}\n",
+             rcWin.left, rcWin.top, rcWin.right, rcWin.bottom,
+             rcWin.right - rcWin.left, rcWin.bottom - rcWin.top);
+    winDebug("\tDraw extend {%d, %d, %d, %d}, {%d, %d}\n",
+             rcDraw.left, rcDraw.top, rcDraw.right, rcDraw.bottom,
+             rcDraw.right - rcDraw.left, rcDraw.bottom - rcDraw.top);
 #endif
 
-  if (EqualRect (&rcDraw, &rcWin)) {
-    /* Bail if no adjust is needed */
+    if (EqualRect(&rcDraw, &rcWin)) {
+        /* Bail if no adjust is needed */
 #if CYGWINDOWING_DEBUG
-    ErrorF ("\treturn because already adjusted\n");
+        ErrorF("\treturn because already adjusted\n");
 #endif
-    return 0;
-  }
-  
-  /* Calculate delta values */
-  dX = rcWin.left - rcDraw.left;
-  dY = rcWin.top - rcDraw.top;
-  dW = WIDTH(rcWin) - WIDTH(rcDraw);
-  dH = HEIGHT(rcWin) - HEIGHT(rcDraw);
-
-  /*
-   * Adjust.
-   * We may only need to move (vlist[0] and [1]), or only resize
-   * ([2] and [3]) but currently we set all the parameters and leave
-   * the decision to ConfigureWindow.  The reason is code simplicity.
-  */
-  vlist[0] = pDraw->x + dX - wBorderWidth(pWin);
-  vlist[1] = pDraw->y + dY - wBorderWidth(pWin);
-  vlist[2] = pDraw->width + dW;
-  vlist[3] = pDraw->height + dH;
+        return 0;
+    }
+
+    /* Calculate delta values */
+    dX = rcWin.left - rcDraw.left;
+    dY = rcWin.top - rcDraw.top;
+    dW = WIDTH(rcWin) - WIDTH(rcDraw);
+    dH = HEIGHT(rcWin) - HEIGHT(rcDraw);
+
+    /*
+     * Adjust.
+     * We may only need to move (vlist[0] and [1]), or only resize
+     * ([2] and [3]) but currently we set all the parameters and leave
+     * the decision to ConfigureWindow.  The reason is code simplicity.
+     */
+    vlist[0] = pDraw->x + dX - wBorderWidth(pWin);
+    vlist[1] = pDraw->y + dY - wBorderWidth(pWin);
+    vlist[2] = pDraw->width + dW;
+    vlist[3] = pDraw->height + dH;
 #if CYGWINDOWING_DEBUG
-  ErrorF ("\tConfigureWindow to (%ld, %ld) - %ldx%ld\n", vlist[0], vlist[1],
-	  vlist[2], vlist[3]);
+    ErrorF("\tConfigureWindow to (%ld, %ld) - %ldx%ld\n", vlist[0], vlist[1],
+           vlist[2], vlist[3]);
 #endif
-  return ConfigureWindow (pWin, CWX | CWY | CWWidth | CWHeight,
-			  vlist, wClient(pWin));
-  
+    return ConfigureWindow(pWin, CWX | CWY | CWWidth | CWHeight,
+                           vlist, wClient(pWin));
+
 #undef WIDTH
 #undef HEIGHT
 }
-
diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c
index 70f53854c..c355e8919 100644
--- a/xorg-server/hw/xwin/winmultiwindowwm.c
+++ b/xorg-server/hw/xwin/winmultiwindowwm.c
@@ -86,7 +86,7 @@ extern void winUpdateRgnMultiWindow(WindowPtr pWin);
 #define WIN_CONNECT_RETRIES	5
 #define WIN_CONNECT_DELAY	5
 #ifdef HAS_DEVWINDOWS
-# define WIN_MSG_QUEUE_FNAME	"/dev/windows"
+#define WIN_MSG_QUEUE_FNAME	"/dev/windows"
 #endif
 #define WIN_JMP_OKAY		0
 #define WIN_JMP_ERROR_IO	2
@@ -96,260 +96,248 @@ extern void winUpdateRgnMultiWindow(WindowPtr pWin);
  */
 
 typedef struct _WMMsgNodeRec {
-  winWMMessageRec	msg;
-  struct _WMMsgNodeRec	*pNext;
+    winWMMessageRec msg;
+    struct _WMMsgNodeRec *pNext;
 } WMMsgNodeRec, *WMMsgNodePtr;
 
 typedef struct _WMMsgQueueRec {
-  struct _WMMsgNodeRec	*pHead;
-  struct _WMMsgNodeRec	*pTail;
-  pthread_mutex_t	pmMutex;
-  pthread_cond_t	pcNotEmpty;
-  int			nQueueSize;
+    struct _WMMsgNodeRec *pHead;
+    struct _WMMsgNodeRec *pTail;
+    pthread_mutex_t pmMutex;
+    pthread_cond_t pcNotEmpty;
+    int nQueueSize;
 } WMMsgQueueRec, *WMMsgQueuePtr;
 
 typedef struct _WMInfo {
-  Display		*pDisplay;
-  WMMsgQueueRec		wmMsgQueue;
-  Atom			atmWmProtos;
-  Atom			atmWmDelete;
-  Atom			atmPrivMap;
-  Bool			fAllowOtherWM;
+    Display *pDisplay;
+    WMMsgQueueRec wmMsgQueue;
+    Atom atmWmProtos;
+    Atom atmWmDelete;
+    Atom atmPrivMap;
+    Bool fAllowOtherWM;
 } WMInfoRec, *WMInfoPtr;
 
 typedef struct _WMProcArgRec {
-  DWORD			dwScreen;
-  WMInfoPtr		pWMInfo;
-  pthread_mutex_t	*ppmServerStarted;
+    DWORD dwScreen;
+    WMInfoPtr pWMInfo;
+    pthread_mutex_t *ppmServerStarted;
 } WMProcArgRec, *WMProcArgPtr;
 
 typedef struct _XMsgProcArgRec {
-  Display		*pDisplay;
-  DWORD			dwScreen;
-  WMInfoPtr		pWMInfo;
-  pthread_mutex_t	*ppmServerStarted;
-  HWND			hwndScreen;
+    Display *pDisplay;
+    DWORD dwScreen;
+    WMInfoPtr pWMInfo;
+    pthread_mutex_t *ppmServerStarted;
+    HWND hwndScreen;
 } XMsgProcArgRec, *XMsgProcArgPtr;
 
-
 /*
  * References to external symbols
  */
 
 extern char *display;
-extern void ErrorF (const char* /*f*/, ...);
+extern void ErrorF(const char * /*f */ , ...);
 
 /*
  * Prototypes for local functions
  */
 
 static void
-PushMessage (WMMsgQueuePtr pQueue, WMMsgNodePtr pNode);
+ PushMessage(WMMsgQueuePtr pQueue, WMMsgNodePtr pNode);
 
-static WMMsgNodePtr
-PopMessage (WMMsgQueuePtr pQueue, WMInfoPtr pWMInfo);
+static WMMsgNodePtr PopMessage(WMMsgQueuePtr pQueue, WMInfoPtr pWMInfo);
 
 static Bool
-InitQueue (WMMsgQueuePtr pQueue);
+ InitQueue(WMMsgQueuePtr pQueue);
 
 static void
-GetWindowName (Display * pDpy, Window iWin, wchar_t **ppName);
+ GetWindowName(Display * pDpy, Window iWin, wchar_t ** ppName);
 
 static int
-SendXMessage (Display *pDisplay, Window iWin, Atom atmType, long nData);
+ SendXMessage(Display * pDisplay, Window iWin, Atom atmType, long nData);
 
 static void
-UpdateName (WMInfoPtr pWMInfo, Window iWindow);
+ UpdateName(WMInfoPtr pWMInfo, Window iWindow);
 
-static void*
-winMultiWindowWMProc (void* pArg);
+static void *winMultiWindowWMProc(void *pArg);
 
 static int
-winMultiWindowWMErrorHandler (Display *pDisplay, XErrorEvent *pErr);
+ winMultiWindowWMErrorHandler(Display * pDisplay, XErrorEvent * pErr);
 
 static int
-winMultiWindowWMIOErrorHandler (Display *pDisplay);
+ winMultiWindowWMIOErrorHandler(Display * pDisplay);
 
-static void *
-winMultiWindowXMsgProc (void *pArg);
+static void *winMultiWindowXMsgProc(void *pArg);
 
 static int
-winMultiWindowXMsgProcErrorHandler (Display *pDisplay, XErrorEvent *pErr);
+ winMultiWindowXMsgProcErrorHandler(Display * pDisplay, XErrorEvent * pErr);
 
 static int
-winMultiWindowXMsgProcIOErrorHandler (Display *pDisplay);
+ winMultiWindowXMsgProcIOErrorHandler(Display * pDisplay);
 
 static int
-winRedirectErrorHandler (Display *pDisplay, XErrorEvent *pErr);
+ winRedirectErrorHandler(Display * pDisplay, XErrorEvent * pErr);
 
 static void
-winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg);
+ winInitMultiWindowWM(WMInfoPtr pWMInfo, WMProcArgPtr pProcArg);
 
 #if 0
 static void
-PreserveWin32Stack(WMInfoPtr pWMInfo, Window iWindow, UINT direction);
+ PreserveWin32Stack(WMInfoPtr pWMInfo, Window iWindow, UINT direction);
 #endif
 
 static Bool
-CheckAnotherWindowManager (Display *pDisplay, DWORD dwScreen, Bool fAllowOtherWM);
+
+CheckAnotherWindowManager(Display * pDisplay, DWORD dwScreen,
+                          Bool fAllowOtherWM);
 
 static void
-winApplyHints (Display *pDisplay, Window iWindow, HWND hWnd, HWND *zstyle);
+ winApplyHints(Display * pDisplay, Window iWindow, HWND hWnd, HWND * zstyle);
 
 void
-winUpdateWindowPosition (HWND hWnd, Bool reshape, HWND *zstyle);
+ winUpdateWindowPosition(HWND hWnd, Bool reshape, HWND * zstyle);
 
 /*
  * Local globals
  */
 
-static jmp_buf			g_jmpWMEntry;
+static jmp_buf g_jmpWMEntry;
 static XIOErrorHandler g_winMultiWindowWMOldIOErrorHandler;
 static pthread_t g_winMultiWindowWMThread;
-static jmp_buf			g_jmpXMsgProcEntry;
+static jmp_buf g_jmpXMsgProcEntry;
 static XIOErrorHandler g_winMultiWindowXMsgProcOldIOErrorHandler;
 static pthread_t g_winMultiWindowXMsgProcThread;
-static Bool			g_shutdown = FALSE;
-static Bool			redirectError = FALSE;
-static Bool			g_fAnotherWMRunning = FALSE;
+static Bool g_shutdown = FALSE;
+static Bool redirectError = FALSE;
+static Bool g_fAnotherWMRunning = FALSE;
 
 /*
  * PushMessage - Push a message onto the queue
  */
 
 static void
-PushMessage (WMMsgQueuePtr pQueue, WMMsgNodePtr pNode)
+PushMessage(WMMsgQueuePtr pQueue, WMMsgNodePtr pNode)
 {
 
-  /* Lock the queue mutex */
-  pthread_mutex_lock (&pQueue->pmMutex);
+    /* Lock the queue mutex */
+    pthread_mutex_lock(&pQueue->pmMutex);
 
-  pNode->pNext = NULL;
-  
-  if (pQueue->pTail != NULL)
-    {
-      pQueue->pTail->pNext = pNode;
-    }
-  pQueue->pTail = pNode;
-  
-  if (pQueue->pHead == NULL)
-    {
-      pQueue->pHead = pNode;
+    pNode->pNext = NULL;
+
+    if (pQueue->pTail != NULL) {
+        pQueue->pTail->pNext = pNode;
     }
+    pQueue->pTail = pNode;
 
+    if (pQueue->pHead == NULL) {
+        pQueue->pHead = pNode;
+    }
 
 #if 0
-  switch (pNode->msg.msg)
-    {
+    switch (pNode->msg.msg) {
     case WM_WM_MOVE:
-      ErrorF ("\tWM_WM_MOVE\n");
-      break;
+        ErrorF("\tWM_WM_MOVE\n");
+        break;
     case WM_WM_SIZE:
-      ErrorF ("\tWM_WM_SIZE\n");
-      break;
+        ErrorF("\tWM_WM_SIZE\n");
+        break;
     case WM_WM_RAISE:
-      ErrorF ("\tWM_WM_RAISE\n");
-      break;
+        ErrorF("\tWM_WM_RAISE\n");
+        break;
     case WM_WM_LOWER:
-      ErrorF ("\tWM_WM_LOWER\n");
-      break;
+        ErrorF("\tWM_WM_LOWER\n");
+        break;
     case WM_WM_MAP:
-      ErrorF ("\tWM_WM_MAP\n");
-      break;
+        ErrorF("\tWM_WM_MAP\n");
+        break;
     case WM_WM_MAP2:
-      ErrorF ("\tWM_WM_MAP2\n");
-      break;
+        ErrorF("\tWM_WM_MAP2\n");
+        break;
     case WM_WM_MAP3:
-      ErrorF ("\tWM_WM_MAP3\n");
-      break;
+        ErrorF("\tWM_WM_MAP3\n");
+        break;
     case WM_WM_UNMAP:
-      ErrorF ("\tWM_WM_UNMAP\n");
-      break;
+        ErrorF("\tWM_WM_UNMAP\n");
+        break;
     case WM_WM_KILL:
-      ErrorF ("\tWM_WM_KILL\n");
-      break;
+        ErrorF("\tWM_WM_KILL\n");
+        break;
     case WM_WM_ACTIVATE:
-      ErrorF ("\tWM_WM_ACTIVATE\n");
-      break;
+        ErrorF("\tWM_WM_ACTIVATE\n");
+        break;
     default:
-      ErrorF ("\tUnknown Message.\n");
-      break;
+        ErrorF("\tUnknown Message.\n");
+        break;
     }
 #endif
 
-  /* Increase the count of elements in the queue by one */
-  ++(pQueue->nQueueSize);
+    /* Increase the count of elements in the queue by one */
+    ++(pQueue->nQueueSize);
 
-  /* Release the queue mutex */
-  pthread_mutex_unlock (&pQueue->pmMutex);
+    /* Release the queue mutex */
+    pthread_mutex_unlock(&pQueue->pmMutex);
 
-  /* Signal that the queue is not empty */
-  pthread_cond_signal (&pQueue->pcNotEmpty);
+    /* Signal that the queue is not empty */
+    pthread_cond_signal(&pQueue->pcNotEmpty);
 }
 
-
 #if CYGMULTIWINDOW_DEBUG
 /*
  * QueueSize - Return the size of the queue
  */
 
 static int
-QueueSize (WMMsgQueuePtr pQueue)
+QueueSize(WMMsgQueuePtr pQueue)
 {
-  WMMsgNodePtr		pNode;
-  int			nSize = 0;
-  
-  /* Loop through all elements in the queue */
-  for (pNode = pQueue->pHead; pNode != NULL; pNode = pNode->pNext)
-    ++nSize;
-
-  return nSize;
+    WMMsgNodePtr pNode;
+    int nSize = 0;
+
+    /* Loop through all elements in the queue */
+    for (pNode = pQueue->pHead; pNode != NULL; pNode = pNode->pNext)
+        ++nSize;
+
+    return nSize;
 }
 #endif
 
-
 /*
  * PopMessage - Pop a message from the queue
  */
 
 static WMMsgNodePtr
-PopMessage (WMMsgQueuePtr pQueue, WMInfoPtr pWMInfo)
+PopMessage(WMMsgQueuePtr pQueue, WMInfoPtr pWMInfo)
 {
-  WMMsgNodePtr		pNode;
+    WMMsgNodePtr pNode;
 
-  /* Lock the queue mutex */
-  pthread_mutex_lock (&pQueue->pmMutex);
+    /* Lock the queue mutex */
+    pthread_mutex_lock(&pQueue->pmMutex);
 
-  /* Wait for --- */
-  while (pQueue->pHead == NULL)
-    {
-      pthread_cond_wait (&pQueue->pcNotEmpty, &pQueue->pmMutex);
+    /* Wait for --- */
+    while (pQueue->pHead == NULL) {
+        pthread_cond_wait(&pQueue->pcNotEmpty, &pQueue->pmMutex);
     }
-  
-  pNode = pQueue->pHead;
-  if (pQueue->pHead != NULL)
-    {
-      pQueue->pHead = pQueue->pHead->pNext;
+
+    pNode = pQueue->pHead;
+    if (pQueue->pHead != NULL) {
+        pQueue->pHead = pQueue->pHead->pNext;
     }
 
-  if (pQueue->pTail == pNode)
-    {
-      pQueue->pTail = NULL;
+    if (pQueue->pTail == pNode) {
+        pQueue->pTail = NULL;
     }
 
-  /* Drop the number of elements in the queue by one */
-  --(pQueue->nQueueSize);
+    /* Drop the number of elements in the queue by one */
+    --(pQueue->nQueueSize);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("Queue Size %d %d\n", pQueue->nQueueSize, QueueSize(pQueue));
+    ErrorF("Queue Size %d %d\n", pQueue->nQueueSize, QueueSize(pQueue));
 #endif
-  
-  /* Release the queue mutex */
-  pthread_mutex_unlock (&pQueue->pmMutex);
 
-  return pNode;
-}
+    /* Release the queue mutex */
+    pthread_mutex_unlock(&pQueue->pmMutex);
 
+    return pNode;
+}
 
 #if 0
 /*
@@ -357,202 +345,185 @@ PopMessage (WMMsgQueuePtr pQueue, WMInfoPtr pWMInfo)
  */
 
 static Bool
-HaveMessage (WMMsgQueuePtr pQueue, UINT msg, Window iWindow)
+HaveMessage(WMMsgQueuePtr pQueue, UINT msg, Window iWindow)
 {
-  WMMsgNodePtr pNode;
-  
-  for (pNode = pQueue->pHead; pNode != NULL; pNode = pNode->pNext)
-    {
-      if (pNode->msg.msg==msg && pNode->msg.iWindow==iWindow)
-	return True;
+    WMMsgNodePtr pNode;
+
+    for (pNode = pQueue->pHead; pNode != NULL; pNode = pNode->pNext) {
+        if (pNode->msg.msg == msg && pNode->msg.iWindow == iWindow)
+            return True;
     }
-  
-  return False;
+
+    return False;
 }
 #endif
 
-
 /*
  * InitQueue - Initialize the Window Manager message queue
  */
 
 static
-Bool
-InitQueue (WMMsgQueuePtr pQueue)
+    Bool
+InitQueue(WMMsgQueuePtr pQueue)
 {
-  /* Check if the pQueue pointer is NULL */
-  if (pQueue == NULL)
-    {
-      ErrorF ("InitQueue - pQueue is NULL.  Exiting.\n");
-      return FALSE;
+    /* Check if the pQueue pointer is NULL */
+    if (pQueue == NULL) {
+        ErrorF("InitQueue - pQueue is NULL.  Exiting.\n");
+        return FALSE;
     }
 
-  /* Set the head and tail to NULL */
-  pQueue->pHead = NULL;
-  pQueue->pTail = NULL;
+    /* Set the head and tail to NULL */
+    pQueue->pHead = NULL;
+    pQueue->pTail = NULL;
 
-  /* There are no elements initially */
-  pQueue->nQueueSize = 0;
+    /* There are no elements initially */
+    pQueue->nQueueSize = 0;
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("InitQueue - Queue Size %d %d\n", pQueue->nQueueSize,
-	  QueueSize(pQueue));
+    ErrorF("InitQueue - Queue Size %d %d\n", pQueue->nQueueSize,
+           QueueSize(pQueue));
 #endif
 
-  ErrorF ("InitQueue - Calling pthread_mutex_init\n");
+    ErrorF("InitQueue - Calling pthread_mutex_init\n");
 
-  /* Create synchronization objects */
-  pthread_mutex_init (&pQueue->pmMutex, NULL);
+    /* Create synchronization objects */
+    pthread_mutex_init(&pQueue->pmMutex, NULL);
 
-  ErrorF ("InitQueue - pthread_mutex_init returned\n");
-  ErrorF ("InitQueue - Calling pthread_cond_init\n");
+    ErrorF("InitQueue - pthread_mutex_init returned\n");
+    ErrorF("InitQueue - Calling pthread_cond_init\n");
 
-  pthread_cond_init (&pQueue->pcNotEmpty, NULL);
+    pthread_cond_init(&pQueue->pcNotEmpty, NULL);
 
-  ErrorF ("InitQueue - pthread_cond_init returned\n");
+    ErrorF("InitQueue - pthread_cond_init returned\n");
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * GetWindowName - Retrieve the title of an X Window
  */
 
 static void
-GetWindowName (Display *pDisplay, Window iWin, wchar_t **ppName)
+GetWindowName(Display * pDisplay, Window iWin, wchar_t ** ppName)
 {
-  int			nResult, nNum;
-  char			**ppList;
-  char			*pszReturnData;
-  int			iLen, i;
-  XTextProperty		xtpName;
-  
+    int nResult, nNum;
+    char **ppList;
+    char *pszReturnData;
+    int iLen, i;
+    XTextProperty xtpName;
+
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("GetWindowName\n");
+    ErrorF("GetWindowName\n");
 #endif
 
-  /* Intialize ppName to NULL */
-  *ppName = NULL;
+    /* Intialize ppName to NULL */
+    *ppName = NULL;
 
-  /* Try to get --- */
-  nResult = XGetWMName (pDisplay, iWin, &xtpName);
-  if (!nResult || !xtpName.value || !xtpName.nitems)
-    {
+    /* Try to get --- */
+    nResult = XGetWMName(pDisplay, iWin, &xtpName);
+    if (!nResult || !xtpName.value || !xtpName.nitems) {
 #if CYGMULTIWINDOW_DEBUG
-      ErrorF ("GetWindowName - XGetWMName failed.  No name.\n");
+        ErrorF("GetWindowName - XGetWMName failed.  No name.\n");
 #endif
-      return;
+        return;
     }
 
-   if (Xutf8TextPropertyToTextList (pDisplay, &xtpName, &ppList, &nNum) >= Success && nNum > 0 && *ppList)
-   {
- 	iLen = 0;
- 	for (i = 0; i < nNum; i++) iLen += strlen(ppList[i]);
- 	pszReturnData = (char *) malloc (iLen + 1);
- 	pszReturnData[0] = '\0';
- 	for (i = 0; i < nNum; i++) strcat (pszReturnData, ppList[i]);
- 	if (ppList) XFreeStringList (ppList);
-   }
-   else
-   {
- 	pszReturnData = (char *) malloc (1);
- 	pszReturnData[0] = '\0';
-   }
-   iLen = MultiByteToWideChar (CP_UTF8, 0, pszReturnData, -1, NULL, 0);
-   *ppName = (wchar_t*)malloc(sizeof(wchar_t)*(iLen + 1));
-   MultiByteToWideChar (CP_UTF8, 0, pszReturnData, -1, *ppName, iLen);
-   XFree (xtpName.value);
-   free (pszReturnData);
+    if (Xutf8TextPropertyToTextList(pDisplay, &xtpName, &ppList, &nNum) >=
+        Success && nNum > 0 && *ppList) {
+        iLen = 0;
+        for (i = 0; i < nNum; i++)
+            iLen += strlen(ppList[i]);
+        pszReturnData = (char *) malloc(iLen + 1);
+        pszReturnData[0] = '\0';
+        for (i = 0; i < nNum; i++)
+            strcat(pszReturnData, ppList[i]);
+        if (ppList)
+            XFreeStringList(ppList);
+    }
+    else {
+        pszReturnData = (char *) malloc(1);
+        pszReturnData[0] = '\0';
+    }
+    iLen = MultiByteToWideChar(CP_UTF8, 0, pszReturnData, -1, NULL, 0);
+    *ppName = (wchar_t *) malloc(sizeof(wchar_t) * (iLen + 1));
+    MultiByteToWideChar(CP_UTF8, 0, pszReturnData, -1, *ppName, iLen);
+    XFree(xtpName.value);
+    free(pszReturnData);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("GetWindowName - Returning\n");
+    ErrorF("GetWindowName - Returning\n");
 #endif
 }
 
-
 /*
  * Send a message to the X server from the WM thread
  */
 
 static int
-SendXMessage (Display *pDisplay, Window iWin, Atom atmType, long nData)
+SendXMessage(Display * pDisplay, Window iWin, Atom atmType, long nData)
 {
-  XEvent		e;
-
-  /* Prepare the X event structure */
-  e.type = ClientMessage;
-  e.xclient.window = iWin;
-  e.xclient.message_type = atmType;
-  e.xclient.format = 32;
-  e.xclient.data.l[0] = nData;
-  e.xclient.data.l[1] = CurrentTime;
-
-  /* Send the event to X */
-  return XSendEvent (pDisplay, iWin, False, NoEventMask, &e);
+    XEvent e;
+
+    /* Prepare the X event structure */
+    e.type = ClientMessage;
+    e.xclient.window = iWin;
+    e.xclient.message_type = atmType;
+    e.xclient.format = 32;
+    e.xclient.data.l[0] = nData;
+    e.xclient.data.l[1] = CurrentTime;
+
+    /* Send the event to X */
+    return XSendEvent(pDisplay, iWin, False, NoEventMask, &e);
 }
 
-
 /*
  * Updates the name of a HWND according to its X WM_NAME property
  */
 
 static void
-UpdateName (WMInfoPtr pWMInfo, Window iWindow)
+UpdateName(WMInfoPtr pWMInfo, Window iWindow)
 {
-  wchar_t		*pszName;
-  Atom			atmType;
-  int			fmtRet;
-  unsigned long		items, remain;
-  HWND			*retHwnd, hWnd;
-  XWindowAttributes	attr;
-
-  hWnd = 0;
-
-  /* See if we can get the cached HWND for this window... */
-  if (XGetWindowProperty (pWMInfo->pDisplay,
-			  iWindow,
-			  pWMInfo->atmPrivMap,
-			  0,
-			  1,
-			  False,
-			  XA_INTEGER,//pWMInfo->atmPrivMap,
-			  &atmType,
-			  &fmtRet,
-			  &items,
-			  &remain,
-			  (unsigned char **) &retHwnd) == Success)
-    {
-      if (retHwnd)
-	{
-	  hWnd = *retHwnd;
-	  XFree (retHwnd);
-	}
+    wchar_t *pszName;
+    Atom atmType;
+    int fmtRet;
+    unsigned long items, remain;
+    HWND *retHwnd, hWnd;
+    XWindowAttributes attr;
+
+    hWnd = 0;
+
+    /* See if we can get the cached HWND for this window... */
+    if (XGetWindowProperty(pWMInfo->pDisplay, iWindow, pWMInfo->atmPrivMap, 0, 1, False, XA_INTEGER,    //pWMInfo->atmPrivMap,
+                           &atmType,
+                           &fmtRet,
+                           &items,
+                           &remain, (unsigned char **) &retHwnd) == Success) {
+        if (retHwnd) {
+            hWnd = *retHwnd;
+            XFree(retHwnd);
+        }
     }
-  
-  /* Some sanity checks */
-  if (!hWnd) return;
-  if (!IsWindow (hWnd)) return;
-
-  /* Set the Windows window name */
-  GetWindowName (pWMInfo->pDisplay, iWindow, &pszName);
-  if (pszName)
-    {
-      /* Get the window attributes */
-      XGetWindowAttributes (pWMInfo->pDisplay,
-			    iWindow,
-			    &attr);
-      if (!attr.override_redirect)
-	{
-	  SetWindowTextW (hWnd, pszName);
-	  winUpdateIcon (iWindow);
-	}
-
-      free (pszName);
+
+    /* Some sanity checks */
+    if (!hWnd)
+        return;
+    if (!IsWindow(hWnd))
+        return;
+
+    /* Set the Windows window name */
+    GetWindowName(pWMInfo->pDisplay, iWindow, &pszName);
+    if (pszName) {
+        /* Get the window attributes */
+        XGetWindowAttributes(pWMInfo->pDisplay, iWindow, &attr);
+        if (!attr.override_redirect) {
+            SetWindowTextW(hWnd, pszName);
+            winUpdateIcon(iWindow);
+        }
+
+        free(pszName);
     }
 }
 
-
 #if 0
 /*
  * Fix up any differences between the X11 and Win32 window stacks
@@ -561,631 +532,564 @@ UpdateName (WMInfoPtr pWMInfo, Window iWindow)
 static void
 PreserveWin32Stack(WMInfoPtr pWMInfo, Window iWindow, UINT direction)
 {
-  Atom                  atmType;
-  int                   fmtRet;
-  unsigned long         items, remain;
-  HWND                  hWnd, *retHwnd;
-  DWORD                 myWinProcID, winProcID;
-  Window                xWindow;
-  WINDOWPLACEMENT       wndPlace;
-  
-  hWnd = NULL;
-  /* See if we can get the cached HWND for this window... */
-  if (XGetWindowProperty (pWMInfo->pDisplay,
-			  iWindow,
-			  pWMInfo->atmPrivMap,
-			  0,
-			  1,
-			  False,
-			  XA_INTEGER,//pWMInfo->atmPrivMap,
-			  &atmType,
-			  &fmtRet,
-			  &items,
-			  &remain,
-			  (unsigned char **) &retHwnd) == Success)
-    {
-      if (retHwnd)
-	{
-	  hWnd = *retHwnd;
-	  XFree (retHwnd);
-	}
+    Atom atmType;
+    int fmtRet;
+    unsigned long items, remain;
+    HWND hWnd, *retHwnd;
+    DWORD myWinProcID, winProcID;
+    Window xWindow;
+    WINDOWPLACEMENT wndPlace;
+
+    hWnd = NULL;
+    /* See if we can get the cached HWND for this window... */
+    if (XGetWindowProperty(pWMInfo->pDisplay, iWindow, pWMInfo->atmPrivMap, 0, 1, False, XA_INTEGER,    //pWMInfo->atmPrivMap,
+                           &atmType,
+                           &fmtRet,
+                           &items,
+                           &remain, (unsigned char **) &retHwnd) == Success) {
+        if (retHwnd) {
+            hWnd = *retHwnd;
+            XFree(retHwnd);
+        }
     }
-  
-  if (!hWnd) return;
-  
-  GetWindowThreadProcessId (hWnd, &myWinProcID);
-  hWnd = GetNextWindow (hWnd, direction);
-  
-  while (hWnd) {
-    GetWindowThreadProcessId (hWnd, &winProcID);
-    if (winProcID == myWinProcID)
-      {
-	wndPlace.length = sizeof(WINDOWPLACEMENT);
-	GetWindowPlacement (hWnd, &wndPlace);
-	if ( !(wndPlace.showCmd==SW_HIDE ||
-	       wndPlace.showCmd==SW_MINIMIZE) )
-	  {
-	    xWindow = (Window)GetProp (hWnd, WIN_WID_PROP);
-	    if (xWindow)
-	      {
-		if (direction==GW_HWNDPREV)
-		  XRaiseWindow (pWMInfo->pDisplay, xWindow);
-		else
-		  XLowerWindow (pWMInfo->pDisplay, xWindow);
-	      }
-	  }
-      }
+
+    if (!hWnd)
+        return;
+
+    GetWindowThreadProcessId(hWnd, &myWinProcID);
     hWnd = GetNextWindow(hWnd, direction);
-  }
-}
-#endif /* PreserveWin32Stack */
 
+    while (hWnd) {
+        GetWindowThreadProcessId(hWnd, &winProcID);
+        if (winProcID == myWinProcID) {
+            wndPlace.length = sizeof(WINDOWPLACEMENT);
+            GetWindowPlacement(hWnd, &wndPlace);
+            if (!(wndPlace.showCmd == SW_HIDE ||
+                  wndPlace.showCmd == SW_MINIMIZE)) {
+                xWindow = (Window) GetProp(hWnd, WIN_WID_PROP);
+                if (xWindow) {
+                    if (direction == GW_HWNDPREV)
+                        XRaiseWindow(pWMInfo->pDisplay, xWindow);
+                    else
+                        XLowerWindow(pWMInfo->pDisplay, xWindow);
+                }
+            }
+        }
+        hWnd = GetNextWindow(hWnd, direction);
+    }
+}
+#endif                          /* PreserveWin32Stack */
 
 /*
  * winMultiWindowWMProc
  */
 
 static void *
-winMultiWindowWMProc (void *pArg)
+winMultiWindowWMProc(void *pArg)
 {
-  WMProcArgPtr		pProcArg = (WMProcArgPtr)pArg;
-  WMInfoPtr		pWMInfo = pProcArg->pWMInfo;
-  
-  /* Initialize the Window Manager */
-  winInitMultiWindowWM (pWMInfo, pProcArg);
-  
+    WMProcArgPtr pProcArg = (WMProcArgPtr) pArg;
+    WMInfoPtr pWMInfo = pProcArg->pWMInfo;
+
+    /* Initialize the Window Manager */
+    winInitMultiWindowWM(pWMInfo, pProcArg);
+
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winMultiWindowWMProc ()\n");
+    ErrorF("winMultiWindowWMProc ()\n");
 #endif
 
-  /* Loop until we explicitly break out */
-  for (;;)
-    {
-      WMMsgNodePtr	pNode;
-
-      if(g_fAnotherWMRunning)/* Another Window manager exists. */
-	{
-	  Sleep (1000);
-	  continue;
-	}
-
-      /* Pop a message off of our queue */
-      pNode = PopMessage (&pWMInfo->wmMsgQueue, pWMInfo);
-      if (pNode == NULL)
-	{
-	  /* Bail if PopMessage returns without a message */
-	  /* NOTE: Remember that PopMessage is a blocking function. */
-	  ErrorF ("winMultiWindowWMProc - Queue is Empty?  Exiting.\n");
-	  pthread_exit (NULL);
-	}
+    /* Loop until we explicitly break out */
+    for (;;) {
+        WMMsgNodePtr pNode;
+
+        if (g_fAnotherWMRunning) {      /* Another Window manager exists. */
+            Sleep(1000);
+            continue;
+        }
+
+        /* Pop a message off of our queue */
+        pNode = PopMessage(&pWMInfo->wmMsgQueue, pWMInfo);
+        if (pNode == NULL) {
+            /* Bail if PopMessage returns without a message */
+            /* NOTE: Remember that PopMessage is a blocking function. */
+            ErrorF("winMultiWindowWMProc - Queue is Empty?  Exiting.\n");
+            pthread_exit(NULL);
+        }
 
 #if CYGMULTIWINDOW_DEBUG
-      ErrorF ("winMultiWindowWMProc - %d ms MSG: %d ID: %d\n",
-	      GetTickCount (), (int)pNode->msg.msg, (int)pNode->msg.dwID);
+        ErrorF("winMultiWindowWMProc - %d ms MSG: %d ID: %d\n",
+               GetTickCount(), (int) pNode->msg.msg, (int) pNode->msg.dwID);
 #endif
 
-      /* Branch on the message type */
-      switch (pNode->msg.msg)
-	{
+        /* Branch on the message type */
+        switch (pNode->msg.msg) {
 #if 0
-	case WM_WM_MOVE:
-	  ErrorF ("\tWM_WM_MOVE\n");
-	  break;
+        case WM_WM_MOVE:
+            ErrorF("\tWM_WM_MOVE\n");
+            break;
 
-	case WM_WM_SIZE:
-	  ErrorF ("\tWM_WM_SIZE\n");
-	  break;
+        case WM_WM_SIZE:
+            ErrorF("\tWM_WM_SIZE\n");
+            break;
 #endif
 
-	case WM_WM_RAISE:
+        case WM_WM_RAISE:
 #if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_RAISE\n");
+            ErrorF("\tWM_WM_RAISE\n");
 #endif
-	  /* Raise the window */
-	  XRaiseWindow (pWMInfo->pDisplay, pNode->msg.iWindow);
+            /* Raise the window */
+            XRaiseWindow(pWMInfo->pDisplay, pNode->msg.iWindow);
 #if 0
-	  PreserveWin32Stack (pWMInfo, pNode->msg.iWindow, GW_HWNDPREV);
+            PreserveWin32Stack(pWMInfo, pNode->msg.iWindow, GW_HWNDPREV);
 #endif
-	  break;
+            break;
 
-	case WM_WM_LOWER:
+        case WM_WM_LOWER:
 #if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_LOWER\n");
+            ErrorF("\tWM_WM_LOWER\n");
 #endif
 
-	  /* Lower the window */
-	  XLowerWindow (pWMInfo->pDisplay, pNode->msg.iWindow);
-	  break;
+            /* Lower the window */
+            XLowerWindow(pWMInfo->pDisplay, pNode->msg.iWindow);
+            break;
 
-	case WM_WM_MAP:
+        case WM_WM_MAP:
 #if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_MAP\n");
+            ErrorF("\tWM_WM_MAP\n");
 #endif
-	  /* Put a note as to the HWND associated with this Window */
-	  XChangeProperty (pWMInfo->pDisplay,
-			   pNode->msg.iWindow,
-			   pWMInfo->atmPrivMap,
-			   XA_INTEGER,//pWMInfo->atmPrivMap,
-			   32,
-			   PropModeReplace,
-			   (unsigned char *) &(pNode->msg.hwndWindow),
-			   1);
-	  UpdateName (pWMInfo, pNode->msg.iWindow);
-	  winUpdateIcon (pNode->msg.iWindow);
-	  break;
-
-	case WM_WM_MAP2:
+            /* Put a note as to the HWND associated with this Window */
+            XChangeProperty(pWMInfo->pDisplay, pNode->msg.iWindow, pWMInfo->atmPrivMap, XA_INTEGER,     //pWMInfo->atmPrivMap,
+                            32,
+                            PropModeReplace,
+                            (unsigned char *) &(pNode->msg.hwndWindow), 1);
+            UpdateName(pWMInfo, pNode->msg.iWindow);
+            winUpdateIcon(pNode->msg.iWindow);
+            break;
+
+        case WM_WM_MAP2:
 #if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_MAP2\n");
+            ErrorF("\tWM_WM_MAP2\n");
 #endif
-	  XChangeProperty (pWMInfo->pDisplay,
-			   pNode->msg.iWindow,
-			   pWMInfo->atmPrivMap,
-			   XA_INTEGER,//pWMInfo->atmPrivMap,
-			   32,
-			   PropModeReplace,
-			   (unsigned char *) &(pNode->msg.hwndWindow),
-			   1);
-	  break;
-
-	case WM_WM_MAP3:
+            XChangeProperty(pWMInfo->pDisplay, pNode->msg.iWindow, pWMInfo->atmPrivMap, XA_INTEGER,     //pWMInfo->atmPrivMap,
+                            32,
+                            PropModeReplace,
+                            (unsigned char *) &(pNode->msg.hwndWindow), 1);
+            break;
+
+        case WM_WM_MAP3:
 #if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_MAP3\n");
+            ErrorF("\tWM_WM_MAP3\n");
 #endif
-	  /* Put a note as to the HWND associated with this Window */
-	  XChangeProperty (pWMInfo->pDisplay,
-			   pNode->msg.iWindow,
-			   pWMInfo->atmPrivMap,
-			   XA_INTEGER,//pWMInfo->atmPrivMap,
-			   32,
-			   PropModeReplace,
-			   (unsigned char *) &(pNode->msg.hwndWindow),
-			   1);
-	  UpdateName (pWMInfo, pNode->msg.iWindow);
-	  winUpdateIcon (pNode->msg.iWindow);
-	  {
-	    HWND zstyle = HWND_NOTOPMOST;
-	    winApplyHints (pWMInfo->pDisplay, pNode->msg.iWindow, pNode->msg.hwndWindow, &zstyle);
-	    winUpdateWindowPosition (pNode->msg.hwndWindow, TRUE, &zstyle);
-	  }
-	  break;
-
-	case WM_WM_UNMAP:
+            /* Put a note as to the HWND associated with this Window */
+            XChangeProperty(pWMInfo->pDisplay, pNode->msg.iWindow, pWMInfo->atmPrivMap, XA_INTEGER,     //pWMInfo->atmPrivMap,
+                            32,
+                            PropModeReplace,
+                            (unsigned char *) &(pNode->msg.hwndWindow), 1);
+            UpdateName(pWMInfo, pNode->msg.iWindow);
+            winUpdateIcon(pNode->msg.iWindow);
+            {
+                HWND zstyle = HWND_NOTOPMOST;
+
+                winApplyHints(pWMInfo->pDisplay, pNode->msg.iWindow,
+                              pNode->msg.hwndWindow, &zstyle);
+                winUpdateWindowPosition(pNode->msg.hwndWindow, TRUE, &zstyle);
+            }
+            break;
+
+        case WM_WM_UNMAP:
 #if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_UNMAP\n");
+            ErrorF("\tWM_WM_UNMAP\n");
 #endif
-	  
-	  /* Unmap the window */
-	  XUnmapWindow (pWMInfo->pDisplay, pNode->msg.iWindow);
-	  break;
 
-	case WM_WM_KILL:
+            /* Unmap the window */
+            XUnmapWindow(pWMInfo->pDisplay, pNode->msg.iWindow);
+            break;
+
+        case WM_WM_KILL:
 #if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_KILL\n");
+            ErrorF("\tWM_WM_KILL\n");
 #endif
-	  {
-	    int				i, n, found = 0;
-	    Atom			*protocols;
-	    
-	    /* --- */
-	    if (XGetWMProtocols (pWMInfo->pDisplay,
-				 pNode->msg.iWindow,
-				 &protocols,
-				 &n))
-	      {
-		for (i = 0; i < n; ++i)
-		  if (protocols[i] == pWMInfo->atmWmDelete)
-		    ++found;
-		
-		XFree (protocols);
-	      }
-
-	    /* --- */
-	    if (found)
-	      SendXMessage (pWMInfo->pDisplay,
-			    pNode->msg.iWindow,
-			    pWMInfo->atmWmProtos,
-			    pWMInfo->atmWmDelete);
-	    else
-	      XKillClient (pWMInfo->pDisplay,
-			   pNode->msg.iWindow);
-	  }
-	  break;
-
-	case WM_WM_ACTIVATE:
+            {
+                int i, n, found = 0;
+                Atom *protocols;
+
+                /* --- */
+                if (XGetWMProtocols(pWMInfo->pDisplay,
+                                    pNode->msg.iWindow, &protocols, &n)) {
+                    for (i = 0; i < n; ++i)
+                        if (protocols[i] == pWMInfo->atmWmDelete)
+                            ++found;
+
+                    XFree(protocols);
+                }
+
+                /* --- */
+                if (found)
+                    SendXMessage(pWMInfo->pDisplay,
+                                 pNode->msg.iWindow,
+                                 pWMInfo->atmWmProtos, pWMInfo->atmWmDelete);
+                else
+                    XKillClient(pWMInfo->pDisplay, pNode->msg.iWindow);
+            }
+            break;
+
+        case WM_WM_ACTIVATE:
 #if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_ACTIVATE\n");
+            ErrorF("\tWM_WM_ACTIVATE\n");
 #endif
-	  
-	  /* Set the input focus */
-	  XSetInputFocus (pWMInfo->pDisplay,
-			  pNode->msg.iWindow,
-			  RevertToPointerRoot,
-			  CurrentTime);
-	  break;
-
-	case WM_WM_NAME_EVENT:
-	  UpdateName (pWMInfo, pNode->msg.iWindow);
-	  break;
-
-	case WM_WM_HINTS_EVENT:
-	  winUpdateIcon (pNode->msg.iWindow);
-	  break;
-
-	case WM_WM_CHANGE_STATE:
-	  /* Minimize the window in Windows */
-	  winMinimizeWindow (pNode->msg.iWindow);
-	  break;
-
-	default:
-	  ErrorF ("winMultiWindowWMProc - Unknown Message.  Exiting.\n");
-	  pthread_exit (NULL);
-	  break;
-	}
-
-      /* Free the retrieved message */
-      free (pNode);
-
-      /* Flush any pending events on our display */
-      XFlush (pWMInfo->pDisplay);
+
+            /* Set the input focus */
+            XSetInputFocus(pWMInfo->pDisplay,
+                           pNode->msg.iWindow,
+                           RevertToPointerRoot, CurrentTime);
+            break;
+
+        case WM_WM_NAME_EVENT:
+            UpdateName(pWMInfo, pNode->msg.iWindow);
+            break;
+
+        case WM_WM_HINTS_EVENT:
+            winUpdateIcon(pNode->msg.iWindow);
+            break;
+
+        case WM_WM_CHANGE_STATE:
+            /* Minimize the window in Windows */
+            winMinimizeWindow(pNode->msg.iWindow);
+            break;
+
+        default:
+            ErrorF("winMultiWindowWMProc - Unknown Message.  Exiting.\n");
+            pthread_exit(NULL);
+            break;
+        }
+
+        /* Free the retrieved message */
+        free(pNode);
+
+        /* Flush any pending events on our display */
+        XFlush(pWMInfo->pDisplay);
     }
 
-  /* Free the condition variable */
-  pthread_cond_destroy (&pWMInfo->wmMsgQueue.pcNotEmpty);
-  
-  /* Free the mutex variable */
-  pthread_mutex_destroy (&pWMInfo->wmMsgQueue.pmMutex);
-  
-  /* Free the passed-in argument */
-  free (pProcArg);
-  
+    /* Free the condition variable */
+    pthread_cond_destroy(&pWMInfo->wmMsgQueue.pcNotEmpty);
+
+    /* Free the mutex variable */
+    pthread_mutex_destroy(&pWMInfo->wmMsgQueue.pmMutex);
+
+    /* Free the passed-in argument */
+    free(pProcArg);
+
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF("-winMultiWindowWMProc ()\n");
+    ErrorF("-winMultiWindowWMProc ()\n");
 #endif
-  return NULL;
+    return NULL;
 }
 
-
 /*
  * X message procedure
  */
 
 static void *
-winMultiWindowXMsgProc (void *pArg)
+winMultiWindowXMsgProc(void *pArg)
 {
-  winWMMessageRec       msg;
-  XMsgProcArgPtr	pProcArg = (XMsgProcArgPtr) pArg;
-  char			pszDisplay[512];
-  int                   iRetries;
-  XEvent		event;
-  Atom                  atmWmName;
-  Atom                  atmWmHints;
-  Atom			atmWmChange;
-  int			iReturn;
-  XIconSize		*xis;
-
-  ErrorF ("winMultiWindowXMsgProc - Hello\n");
-
-  /* Check that argument pointer is not invalid */
-  if (pProcArg == NULL)
-    {
-      ErrorF ("winMultiWindowXMsgProc - pProcArg is NULL.  Exiting.\n");
-      pthread_exit (NULL);
+    winWMMessageRec msg;
+    XMsgProcArgPtr pProcArg = (XMsgProcArgPtr) pArg;
+    char pszDisplay[512];
+    int iRetries;
+    XEvent event;
+    Atom atmWmName;
+    Atom atmWmHints;
+    Atom atmWmChange;
+    int iReturn;
+    XIconSize *xis;
+
+    ErrorF("winMultiWindowXMsgProc - Hello\n");
+
+    /* Check that argument pointer is not invalid */
+    if (pProcArg == NULL) {
+        ErrorF("winMultiWindowXMsgProc - pProcArg is NULL.  Exiting.\n");
+        pthread_exit(NULL);
     }
 
-  ErrorF ("winMultiWindowXMsgProc - Calling pthread_mutex_lock ()\n");
+    ErrorF("winMultiWindowXMsgProc - Calling pthread_mutex_lock ()\n");
 
-  /* Grab the server started mutex - pause until we get it */
-  iReturn = pthread_mutex_lock (pProcArg->ppmServerStarted);
-  if (iReturn != 0)
-    {
-      ErrorF ("winMultiWindowXMsgProc - pthread_mutex_lock () failed: %d.  "
-	      "Exiting.\n",
-	      iReturn);
-      pthread_exit (NULL);
+    /* Grab the server started mutex - pause until we get it */
+    iReturn = pthread_mutex_lock(pProcArg->ppmServerStarted);
+    if (iReturn != 0) {
+        ErrorF("winMultiWindowXMsgProc - pthread_mutex_lock () failed: %d.  "
+               "Exiting.\n", iReturn);
+        pthread_exit(NULL);
     }
 
-  ErrorF ("winMultiWindowXMsgProc - pthread_mutex_lock () returned.\n");
+    ErrorF("winMultiWindowXMsgProc - pthread_mutex_lock () returned.\n");
 
-  /* Allow multiple threads to access Xlib */
-  if (XInitThreads () == 0)
-    {
-      ErrorF ("winMultiWindowXMsgProc - XInitThreads () failed.  Exiting.\n");
-      pthread_exit (NULL);
+    /* Allow multiple threads to access Xlib */
+    if (XInitThreads() == 0) {
+        ErrorF("winMultiWindowXMsgProc - XInitThreads () failed.  Exiting.\n");
+        pthread_exit(NULL);
     }
 
-  /* See if X supports the current locale */
-  if (XSupportsLocale () == False)
-    {
-      ErrorF ("winMultiWindowXMsgProc - Warning: locale not supported by X\n");
+    /* See if X supports the current locale */
+    if (XSupportsLocale() == False) {
+        ErrorF("winMultiWindowXMsgProc - Warning: locale not supported by X\n");
     }
 
-  /* Release the server started mutex */
-  pthread_mutex_unlock (pProcArg->ppmServerStarted);
+    /* Release the server started mutex */
+    pthread_mutex_unlock(pProcArg->ppmServerStarted);
 
-  ErrorF ("winMultiWindowXMsgProc - pthread_mutex_unlock () returned.\n");
+    ErrorF("winMultiWindowXMsgProc - pthread_mutex_unlock () returned.\n");
 
-  /* Install our error handler */
-  XSetErrorHandler (winMultiWindowXMsgProcErrorHandler);
-  g_winMultiWindowXMsgProcThread = pthread_self();
-  g_winMultiWindowXMsgProcOldIOErrorHandler = XSetIOErrorHandler (winMultiWindowXMsgProcIOErrorHandler);
+    /* Install our error handler */
+    XSetErrorHandler(winMultiWindowXMsgProcErrorHandler);
+    g_winMultiWindowXMsgProcThread = pthread_self();
+    g_winMultiWindowXMsgProcOldIOErrorHandler =
+        XSetIOErrorHandler(winMultiWindowXMsgProcIOErrorHandler);
 
-  /* Set jump point for IO Error exits */
-  iReturn = setjmp (g_jmpXMsgProcEntry);
+    /* Set jump point for IO Error exits */
+    iReturn = setjmp(g_jmpXMsgProcEntry);
 
-  /* Check if we should continue operations */
-  if (iReturn != WIN_JMP_ERROR_IO
-      && iReturn != WIN_JMP_OKAY)
-    {
-      /* setjmp returned an unknown value, exit */
-      ErrorF ("winInitMultiWindowXMsgProc - setjmp returned: %d.  Exiting.\n",
-	      iReturn);
-      pthread_exit (NULL);
+    /* Check if we should continue operations */
+    if (iReturn != WIN_JMP_ERROR_IO && iReturn != WIN_JMP_OKAY) {
+        /* setjmp returned an unknown value, exit */
+        ErrorF("winInitMultiWindowXMsgProc - setjmp returned: %d.  Exiting.\n",
+               iReturn);
+        pthread_exit(NULL);
     }
-  else if (iReturn == WIN_JMP_ERROR_IO)
-    {
-      ErrorF ("winInitMultiWindowXMsgProc - Caught IO Error.  Exiting.\n");
-      pthread_exit (NULL);
+    else if (iReturn == WIN_JMP_ERROR_IO) {
+        ErrorF("winInitMultiWindowXMsgProc - Caught IO Error.  Exiting.\n");
+        pthread_exit(NULL);
     }
 
-  /* Setup the display connection string x */
-  snprintf (pszDisplay,
-	    512, "127.0.0.1:%s.%d", display, (int)pProcArg->dwScreen);
+    /* Setup the display connection string x */
+    snprintf(pszDisplay,
+             512, "127.0.0.1:%s.%d", display, (int) pProcArg->dwScreen);
+
+    /* Print the display connection string */
+    ErrorF("winMultiWindowXMsgProc - DISPLAY=%s\n", pszDisplay);
+
+    /* Use our generated cookie for authentication */
+    winSetAuthorization();
+
+    /* Initialize retry count */
+    iRetries = 0;
+
+    /* Open the X display */
+    do {
+        /* Try to open the display */
+        pProcArg->pDisplay = XOpenDisplay(pszDisplay);
+        if (pProcArg->pDisplay == NULL) {
+            ErrorF("winMultiWindowXMsgProc - Could not open display, try: %d, "
+                   "sleeping: %d\n", iRetries + 1, WIN_CONNECT_DELAY);
+            ++iRetries;
+            sleep(WIN_CONNECT_DELAY);
+            continue;
+        }
+        else
+            break;
+    }
+    while (pProcArg->pDisplay == NULL && iRetries < WIN_CONNECT_RETRIES);
 
-  /* Print the display connection string */
-  ErrorF ("winMultiWindowXMsgProc - DISPLAY=%s\n", pszDisplay);
+    /* Make sure that the display opened */
+    if (pProcArg->pDisplay == NULL) {
+        ErrorF("winMultiWindowXMsgProc - Failed opening the display.  "
+               "Exiting.\n");
+        pthread_exit(NULL);
+    }
 
-  /* Use our generated cookie for authentication */
-  winSetAuthorization();
-  
-  /* Initialize retry count */
-  iRetries = 0;
+    ErrorF("winMultiWindowXMsgProc - XOpenDisplay () returned and "
+           "successfully opened the display.\n");
 
-  /* Open the X display */
-  do
-    {
-      /* Try to open the display */
-      pProcArg->pDisplay = XOpenDisplay (pszDisplay);
-      if (pProcArg->pDisplay == NULL)
-	{
-	  ErrorF ("winMultiWindowXMsgProc - Could not open display, try: %d, "
-		  "sleeping: %d\n",
-		  iRetries + 1, WIN_CONNECT_DELAY);
-	  ++iRetries;
-	  sleep (WIN_CONNECT_DELAY);
-	  continue;
-	}
-      else
-	break;
+    /* Check if another window manager is already running */
+    g_fAnotherWMRunning =
+        CheckAnotherWindowManager(pProcArg->pDisplay, pProcArg->dwScreen,
+                                  pProcArg->pWMInfo->fAllowOtherWM);
+
+    if (g_fAnotherWMRunning && !pProcArg->pWMInfo->fAllowOtherWM) {
+        ErrorF("winMultiWindowXMsgProc - "
+               "another window manager is running.  Exiting.\n");
+        pthread_exit(NULL);
     }
-  while (pProcArg->pDisplay == NULL && iRetries < WIN_CONNECT_RETRIES);
-  
-  /* Make sure that the display opened */
-  if (pProcArg->pDisplay == NULL)
-    {
-      ErrorF ("winMultiWindowXMsgProc - Failed opening the display.  "
-	      "Exiting.\n");
-      pthread_exit (NULL);
+
+    /* Set up the supported icon sizes */
+    xis = XAllocIconSize();
+    if (xis) {
+        xis->min_width = xis->min_height = 16;
+        xis->max_width = xis->max_height = 48;
+        xis->width_inc = xis->height_inc = 16;
+        XSetIconSizes(pProcArg->pDisplay,
+                      RootWindow(pProcArg->pDisplay, pProcArg->dwScreen),
+                      xis, 1);
+        XFree(xis);
     }
 
-  ErrorF ("winMultiWindowXMsgProc - XOpenDisplay () returned and "
-	  "successfully opened the display.\n");
+    atmWmName = XInternAtom(pProcArg->pDisplay, "WM_NAME", False);
+    atmWmHints = XInternAtom(pProcArg->pDisplay, "WM_HINTS", False);
+    atmWmChange = XInternAtom(pProcArg->pDisplay, "WM_CHANGE_STATE", False);
+
+    /*
+       iiimxcf had a bug until 2009-04-27, assuming that the
+       WM_STATE atom exists, causing clients to fail with
+       a BadAtom X error if it doesn't.
+
+       Since this is on in the default Solaris 10 install,
+       workaround this by making sure it does exist...
+     */
+    XInternAtom(pProcArg->pDisplay, "WM_STATE", 0);
+
+    /* Loop until we explicitly break out */
+    while (1) {
+        if (g_shutdown)
+            break;
+
+        if (pProcArg->pWMInfo->fAllowOtherWM && !XPending(pProcArg->pDisplay)) {
+            if (CheckAnotherWindowManager
+                (pProcArg->pDisplay, pProcArg->dwScreen, TRUE)) {
+                if (!g_fAnotherWMRunning) {
+                    g_fAnotherWMRunning = TRUE;
+                    SendMessage(*(HWND *) pProcArg->hwndScreen, WM_UNMANAGE, 0,
+                                0);
+                }
+            }
+            else {
+                if (g_fAnotherWMRunning) {
+                    g_fAnotherWMRunning = FALSE;
+                    SendMessage(*(HWND *) pProcArg->hwndScreen, WM_MANAGE, 0,
+                                0);
+                }
+            }
+            Sleep(500);
+            continue;
+        }
 
-  /* Check if another window manager is already running */
-  g_fAnotherWMRunning = CheckAnotherWindowManager (pProcArg->pDisplay, pProcArg->dwScreen, pProcArg->pWMInfo->fAllowOtherWM);
+        /* Fetch next event */
+        XNextEvent(pProcArg->pDisplay, &event);
 
-  if (g_fAnotherWMRunning && !pProcArg->pWMInfo->fAllowOtherWM)
-    {
-      ErrorF ("winMultiWindowXMsgProc - "
-          "another window manager is running.  Exiting.\n");
-      pthread_exit (NULL);
-    }
+        /* Branch on event type */
+        if (event.type == CreateNotify) {
+            XWindowAttributes attr;
 
-  /* Set up the supported icon sizes */
-  xis = XAllocIconSize ();
-  if (xis)
-    {
-      xis->min_width = xis->min_height = 16;
-      xis->max_width = xis->max_height = 48;
-      xis->width_inc = xis->height_inc = 16;
-      XSetIconSizes (pProcArg->pDisplay,
-		     RootWindow (pProcArg->pDisplay, pProcArg->dwScreen),
-		     xis,
-		     1);
-      XFree (xis);
-    }
+            XSelectInput(pProcArg->pDisplay,
+                         event.xcreatewindow.window, PropertyChangeMask);
 
-  atmWmName   = XInternAtom (pProcArg->pDisplay,
-			     "WM_NAME",
-			     False);
-  atmWmHints   = XInternAtom (pProcArg->pDisplay,
-			      "WM_HINTS",
-			      False);
-  atmWmChange  = XInternAtom (pProcArg->pDisplay,
-			      "WM_CHANGE_STATE",
-			      False);
-
-  /*
-    iiimxcf had a bug until 2009-04-27, assuming that the
-    WM_STATE atom exists, causing clients to fail with
-    a BadAtom X error if it doesn't.
-
-    Since this is on in the default Solaris 10 install,
-    workaround this by making sure it does exist...
-   */
-  XInternAtom(pProcArg->pDisplay, "WM_STATE", 0);
-
-  /* Loop until we explicitly break out */
-  while (1)
-    {
-      if (g_shutdown)
-        break;
+            /* Get the window attributes */
+            XGetWindowAttributes(pProcArg->pDisplay,
+                                 event.xcreatewindow.window, &attr);
 
-      if (pProcArg->pWMInfo->fAllowOtherWM && !XPending (pProcArg->pDisplay))
-	{
-	  if (CheckAnotherWindowManager (pProcArg->pDisplay, pProcArg->dwScreen, TRUE))
-	    {
-	      if (!g_fAnotherWMRunning)
-		{
-		  g_fAnotherWMRunning = TRUE;
-		  SendMessage(*(HWND*)pProcArg->hwndScreen, WM_UNMANAGE, 0, 0);
-		}
-	    }
-	  else
-	    {
-	      if (g_fAnotherWMRunning)
-		{
-		  g_fAnotherWMRunning = FALSE;
-		  SendMessage(*(HWND*)pProcArg->hwndScreen, WM_MANAGE, 0, 0);
-		}
-	    }
-	  Sleep (500);
-	  continue;
-	}
-
-      /* Fetch next event */
-      XNextEvent (pProcArg->pDisplay, &event);
-
-      /* Branch on event type */
-      if (event.type == CreateNotify)
-	{
-	  XWindowAttributes	attr;
-
-	  XSelectInput (pProcArg->pDisplay,
-			event.xcreatewindow.window,
-			PropertyChangeMask);
-
-	  /* Get the window attributes */
-	  XGetWindowAttributes (pProcArg->pDisplay,
-				event.xcreatewindow.window,
-				&attr);
-
-	  if (!attr.override_redirect)
-	    XSetWindowBorderWidth(pProcArg->pDisplay,
-				  event.xcreatewindow.window,
-				  0);
-	}
-      else if (event.type == MapNotify)
-        {
-          /* Fake a reparentNotify event as SWT/Motif expects a
-             Window Manager to reparent a top-level window when
-             it is mapped and waits until they do.
-
-             We don't actually need to reparent, as the frame is
-             a native window, not an X window
-
-             We do this on MapNotify, not MapRequest like a real
-             Window Manager would, so we don't have do get involved
-             in actually mapping the window via it's (non-existent)
-             parent...
-
-             See sourceware bugzilla #9848
-          */
-
-          XWindowAttributes attr;
-          Window root;
-          Window parent;
-          Window *children;
-          unsigned int nchildren;
-
-          if (XGetWindowAttributes(event.xmap.display,
-                                   event.xmap.window,
-                                   &attr) &&
-              XQueryTree(event.xmap.display,
-                         event.xmap.window,
-                         &root, &parent, &children, &nchildren))
-            {
-              if (children) XFree(children);
-
-              /*
-                It's a top-level window if the parent window is a root window
-                Only non-override_redirect windows can get reparented
-              */
-              if ((attr.root == parent) && !event.xmap.override_redirect)
-                {
-                  XEvent event_send;
-
-                  event_send.type = ReparentNotify;
-                  event_send.xreparent.event = event.xmap.window;
-                  event_send.xreparent.window = event.xmap.window;
-                  event_send.xreparent.parent = parent;
-                  event_send.xreparent.x = attr.x;
-                  event_send.xreparent.y = attr.y;
-
-                  XSendEvent(event.xmap.display,
-                             event.xmap.window,
-                             True, StructureNotifyMask,
-                             &event_send);
+            if (!attr.override_redirect)
+                XSetWindowBorderWidth(pProcArg->pDisplay,
+                                      event.xcreatewindow.window, 0);
+        }
+        else if (event.type == MapNotify) {
+            /* Fake a reparentNotify event as SWT/Motif expects a
+               Window Manager to reparent a top-level window when
+               it is mapped and waits until they do.
+
+               We don't actually need to reparent, as the frame is
+               a native window, not an X window
+
+               We do this on MapNotify, not MapRequest like a real
+               Window Manager would, so we don't have do get involved
+               in actually mapping the window via it's (non-existent)
+               parent...
+
+               See sourceware bugzilla #9848
+             */
+
+            XWindowAttributes attr;
+            Window root;
+            Window parent;
+            Window *children;
+            unsigned int nchildren;
+
+            if (XGetWindowAttributes(event.xmap.display,
+                                     event.xmap.window,
+                                     &attr) &&
+                XQueryTree(event.xmap.display,
+                           event.xmap.window,
+                           &root, &parent, &children, &nchildren)) {
+                if (children)
+                    XFree(children);
+
+                /*
+                   It's a top-level window if the parent window is a root window
+                   Only non-override_redirect windows can get reparented
+                 */
+                if ((attr.root == parent) && !event.xmap.override_redirect) {
+                    XEvent event_send;
+
+                    event_send.type = ReparentNotify;
+                    event_send.xreparent.event = event.xmap.window;
+                    event_send.xreparent.window = event.xmap.window;
+                    event_send.xreparent.parent = parent;
+                    event_send.xreparent.x = attr.x;
+                    event_send.xreparent.y = attr.y;
+
+                    XSendEvent(event.xmap.display,
+                               event.xmap.window,
+                               True, StructureNotifyMask, &event_send);
                 }
             }
         }
-      else if (event.type == ConfigureNotify)
-        {
-          if (!event.xconfigure.send_event)
-            {
-              /*
-                Java applications using AWT on JRE 1.6.0 break with non-reparenting WMs AWT
-                doesn't explicitly know about (See sun bug #6434227)
-
-                XDecoratedPeer.handleConfigureNotifyEvent() only processes non-synthetic
-                ConfigureNotify events to update window location if it's identified the
-                WM as a non-reparenting WM it knows about (compiz or lookingglass)
-
-                Rather than tell all sorts of lies to get XWM to recognize us as one of
-                those, simply send a synthetic ConfigureNotify for every non-synthetic one
-               */
-              XEvent event_send = event;
-              event_send.xconfigure.send_event = TRUE;
-              event_send.xconfigure.event = event.xconfigure.window;
-              XSendEvent(event.xconfigure.display,
-                         event.xconfigure.window,
-                         True, StructureNotifyMask,
-                         &event_send);
+        else if (event.type == ConfigureNotify) {
+            if (!event.xconfigure.send_event) {
+                /*
+                   Java applications using AWT on JRE 1.6.0 break with non-reparenting WMs AWT
+                   doesn't explicitly know about (See sun bug #6434227)
+
+                   XDecoratedPeer.handleConfigureNotifyEvent() only processes non-synthetic
+                   ConfigureNotify events to update window location if it's identified the
+                   WM as a non-reparenting WM it knows about (compiz or lookingglass)
+
+                   Rather than tell all sorts of lies to get XWM to recognize us as one of
+                   those, simply send a synthetic ConfigureNotify for every non-synthetic one
+                 */
+                XEvent event_send = event;
+
+                event_send.xconfigure.send_event = TRUE;
+                event_send.xconfigure.event = event.xconfigure.window;
+                XSendEvent(event.xconfigure.display,
+                           event.xconfigure.window,
+                           True, StructureNotifyMask, &event_send);
             }
         }
-      else if (event.type == PropertyNotify
-	       && event.xproperty.atom == atmWmName)
-	{
-	  memset (&msg, 0, sizeof (msg));
-
-	  msg.msg = WM_WM_NAME_EVENT;
-	  msg.iWindow = event.xproperty.window;
-
-	  /* Other fields ignored */
-	  winSendMessageToWM (pProcArg->pWMInfo, &msg);
-	}
-      else if (event.type == PropertyNotify
-	       && event.xproperty.atom == atmWmHints)
-	{
-	  memset (&msg, 0, sizeof (msg));
-
-	  msg.msg = WM_WM_HINTS_EVENT;
-	  msg.iWindow = event.xproperty.window;
-
-	  /* Other fields ignored */
-	  winSendMessageToWM (pProcArg->pWMInfo, &msg);
-	}
-      else if (event.type == ClientMessage
-	       && event.xclient.message_type == atmWmChange
-	       && event.xclient.data.l[0] == IconicState)
-	{
-	  ErrorF ("winMultiWindowXMsgProc - WM_CHANGE_STATE - IconicState\n");
-
-	  memset (&msg, 0, sizeof (msg));
-
-	  msg.msg = WM_WM_CHANGE_STATE;
-	  msg.iWindow = event.xclient.window;
-
-	  winSendMessageToWM (pProcArg->pWMInfo, &msg);
-	}
+        else if (event.type == PropertyNotify
+                 && event.xproperty.atom == atmWmName) {
+            memset(&msg, 0, sizeof(msg));
+
+            msg.msg = WM_WM_NAME_EVENT;
+            msg.iWindow = event.xproperty.window;
+
+            /* Other fields ignored */
+            winSendMessageToWM(pProcArg->pWMInfo, &msg);
+        }
+        else if (event.type == PropertyNotify
+                 && event.xproperty.atom == atmWmHints) {
+            memset(&msg, 0, sizeof(msg));
+
+            msg.msg = WM_WM_HINTS_EVENT;
+            msg.iWindow = event.xproperty.window;
+
+            /* Other fields ignored */
+            winSendMessageToWM(pProcArg->pWMInfo, &msg);
+        }
+        else if (event.type == ClientMessage
+                 && event.xclient.message_type == atmWmChange
+                 && event.xclient.data.l[0] == IconicState) {
+            ErrorF("winMultiWindowXMsgProc - WM_CHANGE_STATE - IconicState\n");
+
+            memset(&msg, 0, sizeof(msg));
+
+            msg.msg = WM_WM_CHANGE_STATE;
+            msg.iWindow = event.xclient.window;
+
+            winSendMessageToWM(pProcArg->pWMInfo, &msg);
+        }
     }
 
-  XCloseDisplay (pProcArg->pDisplay);
-  pthread_exit (NULL);
-  return NULL;
+    XCloseDisplay(pProcArg->pDisplay);
+    pthread_exit(NULL);
+    return NULL;
 }
 
-
 /*
  * winInitWM - Entry point for the X server to spawn
  * the Window Manager thread.  Called from
@@ -1193,376 +1097,338 @@ winMultiWindowXMsgProc (void *pArg)
  */
 
 Bool
-winInitWM (void **ppWMInfo,
-	   pthread_t *ptWMProc,
-	   pthread_t *ptXMsgProc,
-	   pthread_mutex_t *ppmServerStarted,
-	   int dwScreen,
-	   HWND hwndScreen,
-	   BOOL allowOtherWM)
+winInitWM(void **ppWMInfo,
+          pthread_t * ptWMProc,
+          pthread_t * ptXMsgProc,
+          pthread_mutex_t * ppmServerStarted,
+          int dwScreen, HWND hwndScreen, BOOL allowOtherWM)
 {
-  WMProcArgPtr		pArg = (WMProcArgPtr) malloc (sizeof(WMProcArgRec));
-  WMInfoPtr		pWMInfo = (WMInfoPtr) malloc (sizeof(WMInfoRec));
-  XMsgProcArgPtr	pXMsgArg = (XMsgProcArgPtr) malloc (sizeof(XMsgProcArgRec));
-
-  /* Bail if the input parameters are bad */
-  if (pArg == NULL || pWMInfo == NULL || pXMsgArg == NULL) {
-    ErrorF ("winInitWM - malloc failed.\n");
-    free(pArg);
-    free(pWMInfo);
-    free(pXMsgArg);
-    return FALSE;
-  }
-  
-  /* Zero the allocated memory */
-  ZeroMemory (pArg, sizeof (WMProcArgRec));
-  ZeroMemory (pWMInfo, sizeof (WMInfoRec));
-  ZeroMemory (pXMsgArg, sizeof (XMsgProcArgRec));
-
-  /* Set a return pointer to the Window Manager info structure */
-  *ppWMInfo = pWMInfo;
-  pWMInfo->fAllowOtherWM = allowOtherWM;
-
-  /* Setup the argument structure for the thread function */
-  pArg->dwScreen = dwScreen;
-  pArg->pWMInfo = pWMInfo;
-  pArg->ppmServerStarted = ppmServerStarted;
-  
-  /* Intialize the message queue */
-  if (!InitQueue (&pWMInfo->wmMsgQueue))
-    {
-      ErrorF ("winInitWM - InitQueue () failed.\n");
-      return FALSE;
+    WMProcArgPtr pArg = (WMProcArgPtr) malloc(sizeof(WMProcArgRec));
+    WMInfoPtr pWMInfo = (WMInfoPtr) malloc(sizeof(WMInfoRec));
+    XMsgProcArgPtr pXMsgArg = (XMsgProcArgPtr) malloc(sizeof(XMsgProcArgRec));
+
+    /* Bail if the input parameters are bad */
+    if (pArg == NULL || pWMInfo == NULL || pXMsgArg == NULL) {
+        ErrorF("winInitWM - malloc failed.\n");
+        free(pArg);
+        free(pWMInfo);
+        free(pXMsgArg);
+        return FALSE;
     }
-  
-  /* Spawn a thread for the Window Manager */
-  if (pthread_create (ptWMProc, NULL, winMultiWindowWMProc, pArg))
-    {
-      /* Bail if thread creation failed */
-      ErrorF ("winInitWM - pthread_create failed for Window Manager.\n");
-      return FALSE;
+
+    /* Zero the allocated memory */
+    ZeroMemory(pArg, sizeof(WMProcArgRec));
+    ZeroMemory(pWMInfo, sizeof(WMInfoRec));
+    ZeroMemory(pXMsgArg, sizeof(XMsgProcArgRec));
+
+    /* Set a return pointer to the Window Manager info structure */
+    *ppWMInfo = pWMInfo;
+    pWMInfo->fAllowOtherWM = allowOtherWM;
+
+    /* Setup the argument structure for the thread function */
+    pArg->dwScreen = dwScreen;
+    pArg->pWMInfo = pWMInfo;
+    pArg->ppmServerStarted = ppmServerStarted;
+
+    /* Intialize the message queue */
+    if (!InitQueue(&pWMInfo->wmMsgQueue)) {
+        ErrorF("winInitWM - InitQueue () failed.\n");
+        return FALSE;
     }
 
-  /* Spawn the XNextEvent thread, will send messages to WM */
-  pXMsgArg->dwScreen = dwScreen;
-  pXMsgArg->pWMInfo = pWMInfo;
-  pXMsgArg->ppmServerStarted = ppmServerStarted;
-  pXMsgArg->hwndScreen = hwndScreen;
-  if (pthread_create (ptXMsgProc, NULL, winMultiWindowXMsgProc, pXMsgArg))
-    {
-      /* Bail if thread creation failed */
-      ErrorF ("winInitWM - pthread_create failed on XMSG.\n");
-      return FALSE;
+    /* Spawn a thread for the Window Manager */
+    if (pthread_create(ptWMProc, NULL, winMultiWindowWMProc, pArg)) {
+        /* Bail if thread creation failed */
+        ErrorF("winInitWM - pthread_create failed for Window Manager.\n");
+        return FALSE;
+    }
+
+    /* Spawn the XNextEvent thread, will send messages to WM */
+    pXMsgArg->dwScreen = dwScreen;
+    pXMsgArg->pWMInfo = pWMInfo;
+    pXMsgArg->ppmServerStarted = ppmServerStarted;
+    pXMsgArg->hwndScreen = hwndScreen;
+    if (pthread_create(ptXMsgProc, NULL, winMultiWindowXMsgProc, pXMsgArg)) {
+        /* Bail if thread creation failed */
+        ErrorF("winInitWM - pthread_create failed on XMSG.\n");
+        return FALSE;
     }
 
 #if CYGDEBUG || YES
-  winDebug ("winInitWM - Returning.\n");
+    winDebug("winInitWM - Returning.\n");
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Window manager thread - setup
  */
 
 static void
-winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
+winInitMultiWindowWM(WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
 {
-  int                   iRetries = 0;
-  char			pszDisplay[512];
-  int			iReturn;
+    int iRetries = 0;
+    char pszDisplay[512];
+    int iReturn;
 
-  ErrorF ("winInitMultiWindowWM - Hello\n");
+    ErrorF("winInitMultiWindowWM - Hello\n");
 
-  /* Check that argument pointer is not invalid */
-  if (pProcArg == NULL)
-    {
-      ErrorF ("winInitMultiWindowWM - pProcArg is NULL.  Exiting.\n");
-      pthread_exit (NULL);
+    /* Check that argument pointer is not invalid */
+    if (pProcArg == NULL) {
+        ErrorF("winInitMultiWindowWM - pProcArg is NULL.  Exiting.\n");
+        pthread_exit(NULL);
     }
 
-  ErrorF ("winInitMultiWindowWM - Calling pthread_mutex_lock ()\n");
+    ErrorF("winInitMultiWindowWM - Calling pthread_mutex_lock ()\n");
 
-  /* Grab our garbage mutex to satisfy pthread_cond_wait */
-  iReturn = pthread_mutex_lock (pProcArg->ppmServerStarted);
-  if (iReturn != 0)
-    {
-      ErrorF ("winInitMultiWindowWM - pthread_mutex_lock () failed: %d.  "
-	      "Exiting.\n",
-	      iReturn);
-      pthread_exit (NULL);
+    /* Grab our garbage mutex to satisfy pthread_cond_wait */
+    iReturn = pthread_mutex_lock(pProcArg->ppmServerStarted);
+    if (iReturn != 0) {
+        ErrorF("winInitMultiWindowWM - pthread_mutex_lock () failed: %d.  "
+               "Exiting.\n", iReturn);
+        pthread_exit(NULL);
     }
 
-  ErrorF ("winInitMultiWindowWM - pthread_mutex_lock () returned.\n");
+    ErrorF("winInitMultiWindowWM - pthread_mutex_lock () returned.\n");
 
-  /* Allow multiple threads to access Xlib */
-  if (XInitThreads () == 0)
-    {
-      ErrorF ("winInitMultiWindowWM - XInitThreads () failed.  Exiting.\n");
-      pthread_exit (NULL);
+    /* Allow multiple threads to access Xlib */
+    if (XInitThreads() == 0) {
+        ErrorF("winInitMultiWindowWM - XInitThreads () failed.  Exiting.\n");
+        pthread_exit(NULL);
     }
 
-  /* See if X supports the current locale */
-  if (XSupportsLocale () == False)
-    {
-      ErrorF ("winInitMultiWindowWM - Warning: Locale not supported by X.\n");
+    /* See if X supports the current locale */
+    if (XSupportsLocale() == False) {
+        ErrorF("winInitMultiWindowWM - Warning: Locale not supported by X.\n");
     }
 
-  /* Release the server started mutex */
-  pthread_mutex_unlock (pProcArg->ppmServerStarted);
+    /* Release the server started mutex */
+    pthread_mutex_unlock(pProcArg->ppmServerStarted);
 
-  ErrorF ("winInitMultiWindowWM - pthread_mutex_unlock () returned.\n");
+    ErrorF("winInitMultiWindowWM - pthread_mutex_unlock () returned.\n");
 
-  /* Install our error handler */
-  XSetErrorHandler (winMultiWindowWMErrorHandler);
-  g_winMultiWindowWMThread = pthread_self();
-  g_winMultiWindowWMOldIOErrorHandler = XSetIOErrorHandler (winMultiWindowWMIOErrorHandler);
+    /* Install our error handler */
+    XSetErrorHandler(winMultiWindowWMErrorHandler);
+    g_winMultiWindowWMThread = pthread_self();
+    g_winMultiWindowWMOldIOErrorHandler =
+        XSetIOErrorHandler(winMultiWindowWMIOErrorHandler);
 
-  /* Set jump point for IO Error exits */
-  iReturn = setjmp (g_jmpWMEntry);
+    /* Set jump point for IO Error exits */
+    iReturn = setjmp(g_jmpWMEntry);
 
-  /* Check if we should continue operations */
-  if (iReturn != WIN_JMP_ERROR_IO
-      && iReturn != WIN_JMP_OKAY)
-    {
-      /* setjmp returned an unknown value, exit */
-      ErrorF ("winInitMultiWindowWM - setjmp returned: %d.  Exiting.\n",
-	      iReturn);
-      pthread_exit (NULL);
+    /* Check if we should continue operations */
+    if (iReturn != WIN_JMP_ERROR_IO && iReturn != WIN_JMP_OKAY) {
+        /* setjmp returned an unknown value, exit */
+        ErrorF("winInitMultiWindowWM - setjmp returned: %d.  Exiting.\n",
+               iReturn);
+        pthread_exit(NULL);
     }
-  else if (iReturn == WIN_JMP_ERROR_IO)
-    {
-      ErrorF ("winInitMultiWindowWM - Caught IO Error.  Exiting.\n");
-      pthread_exit (NULL);
+    else if (iReturn == WIN_JMP_ERROR_IO) {
+        ErrorF("winInitMultiWindowWM - Caught IO Error.  Exiting.\n");
+        pthread_exit(NULL);
     }
 
-  /* Setup the display connection string x */
-  snprintf (pszDisplay,
-	    512,
-	    "127.0.0.1:%s.%d",
-	    display,
-	    (int) pProcArg->dwScreen);
-
-  /* Print the display connection string */
-  ErrorF ("winInitMultiWindowWM - DISPLAY=%s\n", pszDisplay);
-
-  /* Use our generated cookie for authentication */
-  winSetAuthorization();
-
-  /* Open the X display */
-  do
-    {
-      /* Try to open the display */
-      pWMInfo->pDisplay = XOpenDisplay (pszDisplay);
-      if (pWMInfo->pDisplay == NULL)
-	{
-	  ErrorF ("winInitMultiWindowWM - Could not open display, try: %d, "
-		  "sleeping: %d\n",
-		  iRetries + 1, WIN_CONNECT_DELAY);
-	  ++iRetries;
-	  sleep (WIN_CONNECT_DELAY);
-	  continue;
-	}
-      else
-	break;
+    /* Setup the display connection string x */
+    snprintf(pszDisplay,
+             512, "127.0.0.1:%s.%d", display, (int) pProcArg->dwScreen);
+
+    /* Print the display connection string */
+    ErrorF("winInitMultiWindowWM - DISPLAY=%s\n", pszDisplay);
+
+    /* Use our generated cookie for authentication */
+    winSetAuthorization();
+
+    /* Open the X display */
+    do {
+        /* Try to open the display */
+        pWMInfo->pDisplay = XOpenDisplay(pszDisplay);
+        if (pWMInfo->pDisplay == NULL) {
+            ErrorF("winInitMultiWindowWM - Could not open display, try: %d, "
+                   "sleeping: %d\n", iRetries + 1, WIN_CONNECT_DELAY);
+            ++iRetries;
+            sleep(WIN_CONNECT_DELAY);
+            continue;
+        }
+        else
+            break;
     }
-  while (pWMInfo->pDisplay == NULL && iRetries < WIN_CONNECT_RETRIES);
-  
-  /* Make sure that the display opened */
-  if (pWMInfo->pDisplay == NULL)
-    {
-      ErrorF ("winInitMultiWindowWM - Failed opening the display.  "
-	      "Exiting.\n");
-      pthread_exit (NULL);
+    while (pWMInfo->pDisplay == NULL && iRetries < WIN_CONNECT_RETRIES);
+
+    /* Make sure that the display opened */
+    if (pWMInfo->pDisplay == NULL) {
+        ErrorF("winInitMultiWindowWM - Failed opening the display.  "
+               "Exiting.\n");
+        pthread_exit(NULL);
     }
 
-  ErrorF ("winInitMultiWindowWM - XOpenDisplay () returned and "
-	  "successfully opened the display.\n");
-  
+    ErrorF("winInitMultiWindowWM - XOpenDisplay () returned and "
+           "successfully opened the display.\n");
 
-  /* Create some atoms */
-  pWMInfo->atmWmProtos = XInternAtom (pWMInfo->pDisplay,
-				      "WM_PROTOCOLS",
-				      False);
-  pWMInfo->atmWmDelete = XInternAtom (pWMInfo->pDisplay,
-				      "WM_DELETE_WINDOW",
-				      False);
+    /* Create some atoms */
+    pWMInfo->atmWmProtos = XInternAtom(pWMInfo->pDisplay,
+                                       "WM_PROTOCOLS", False);
+    pWMInfo->atmWmDelete = XInternAtom(pWMInfo->pDisplay,
+                                       "WM_DELETE_WINDOW", False);
 
-  pWMInfo->atmPrivMap  = XInternAtom (pWMInfo->pDisplay,
-				      WINDOWSWM_NATIVE_HWND,
-				      False);
+    pWMInfo->atmPrivMap = XInternAtom(pWMInfo->pDisplay,
+                                      WINDOWSWM_NATIVE_HWND, False);
 
+    if (1) {
+        Cursor cursor = XCreateFontCursor(pWMInfo->pDisplay, XC_left_ptr);
 
-  if (1) {
-    Cursor cursor = XCreateFontCursor (pWMInfo->pDisplay, XC_left_ptr);
-    if (cursor)
-    {
-      XDefineCursor (pWMInfo->pDisplay, DefaultRootWindow(pWMInfo->pDisplay), cursor);
-      XFreeCursor (pWMInfo->pDisplay, cursor);
+        if (cursor) {
+            XDefineCursor(pWMInfo->pDisplay,
+                          DefaultRootWindow(pWMInfo->pDisplay), cursor);
+            XFreeCursor(pWMInfo->pDisplay, cursor);
+        }
     }
-  }
 }
 
-
 /*
  * winSendMessageToWM - Send a message from the X thread to the WM thread
  */
 
 void
-winSendMessageToWM (void *pWMInfo, winWMMessagePtr pMsg)
+winSendMessageToWM(void *pWMInfo, winWMMessagePtr pMsg)
 {
-  WMMsgNodePtr pNode;
-  
+    WMMsgNodePtr pNode;
+
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winSendMessageToWM ()\n");
+    ErrorF("winSendMessageToWM ()\n");
 #endif
-  
-  pNode = (WMMsgNodePtr)malloc(sizeof(WMMsgNodeRec));
-  if (pNode != NULL)
-    {
-      memcpy (&pNode->msg, pMsg, sizeof(winWMMessageRec));
-      PushMessage (&((WMInfoPtr)pWMInfo)->wmMsgQueue, pNode);
+
+    pNode = (WMMsgNodePtr) malloc(sizeof(WMMsgNodeRec));
+    if (pNode != NULL) {
+        memcpy(&pNode->msg, pMsg, sizeof(winWMMessageRec));
+        PushMessage(&((WMInfoPtr) pWMInfo)->wmMsgQueue, pNode);
     }
 }
 
-
 /*
  * Window manager error handler
  */
 
 static int
-winMultiWindowWMErrorHandler (Display *pDisplay, XErrorEvent *pErr)
+winMultiWindowWMErrorHandler(Display * pDisplay, XErrorEvent * pErr)
 {
-  char pszErrorMsg[100];
+    char pszErrorMsg[100];
 
-  if (pErr->request_code == X_ChangeWindowAttributes
-      && pErr->error_code == BadAccess)
-    {
-      ErrorF ("winMultiWindowWMErrorHandler - ChangeWindowAttributes "
-	      "BadAccess.\n");
-      return 0;
+    if (pErr->request_code == X_ChangeWindowAttributes
+        && pErr->error_code == BadAccess) {
+        ErrorF("winMultiWindowWMErrorHandler - ChangeWindowAttributes "
+               "BadAccess.\n");
+        return 0;
     }
-  
-  XGetErrorText (pDisplay,
-		 pErr->error_code,
-		 pszErrorMsg,
-		 sizeof (pszErrorMsg));
-  ErrorF ("winMultiWindowWMErrorHandler - ERROR: %s\n", pszErrorMsg);
-
-  return 0;
-}
 
+    XGetErrorText(pDisplay, pErr->error_code, pszErrorMsg, sizeof(pszErrorMsg));
+    ErrorF("winMultiWindowWMErrorHandler - ERROR: %s\n", pszErrorMsg);
+
+    return 0;
+}
 
 /*
  * Window manager IO error handler
  */
 
 static int
-winMultiWindowWMIOErrorHandler (Display *pDisplay)
+winMultiWindowWMIOErrorHandler(Display * pDisplay)
 {
-  ErrorF ("winMultiWindowWMIOErrorHandler!\n\n");
+    ErrorF("winMultiWindowWMIOErrorHandler!\n\n");
 
-  if (pthread_equal(pthread_self(),g_winMultiWindowWMThread))
-    {
-      if (g_shutdown)
-        pthread_exit(NULL);
+    if (pthread_equal(pthread_self(), g_winMultiWindowWMThread)) {
+        if (g_shutdown)
+            pthread_exit(NULL);
 
-      /* Restart at the main entry point */
-      longjmp (g_jmpWMEntry, WIN_JMP_ERROR_IO);
+        /* Restart at the main entry point */
+        longjmp(g_jmpWMEntry, WIN_JMP_ERROR_IO);
     }
 
-  if (g_winMultiWindowWMOldIOErrorHandler)
-    g_winMultiWindowWMOldIOErrorHandler(pDisplay);
+    if (g_winMultiWindowWMOldIOErrorHandler)
+        g_winMultiWindowWMOldIOErrorHandler(pDisplay);
 
-  return 0;
+    return 0;
 }
 
-
 /*
  * X message procedure error handler
  */
 
 static int
-winMultiWindowXMsgProcErrorHandler (Display *pDisplay, XErrorEvent *pErr)
+winMultiWindowXMsgProcErrorHandler(Display * pDisplay, XErrorEvent * pErr)
 {
-  char pszErrorMsg[100];
-  
-  XGetErrorText (pDisplay,
-		 pErr->error_code,
-		 pszErrorMsg,
-		 sizeof (pszErrorMsg));
+    char pszErrorMsg[100];
+
+    XGetErrorText(pDisplay, pErr->error_code, pszErrorMsg, sizeof(pszErrorMsg));
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winMultiWindowXMsgProcErrorHandler - ERROR: %s\n", pszErrorMsg);
+    ErrorF("winMultiWindowXMsgProcErrorHandler - ERROR: %s\n", pszErrorMsg);
 #endif
-  
-  return 0;
-}
 
+    return 0;
+}
 
 /*
  * X message procedure IO error handler
  */
 
 static int
-winMultiWindowXMsgProcIOErrorHandler (Display *pDisplay)
+winMultiWindowXMsgProcIOErrorHandler(Display * pDisplay)
 {
-  ErrorF ("winMultiWindowXMsgProcIOErrorHandler!\n\n");
+    ErrorF("winMultiWindowXMsgProcIOErrorHandler!\n\n");
 
-  if (pthread_equal(pthread_self(),g_winMultiWindowXMsgProcThread))
-    {
-      /* Restart at the main entry point */
-      longjmp (g_jmpXMsgProcEntry, WIN_JMP_ERROR_IO);
+    if (pthread_equal(pthread_self(), g_winMultiWindowXMsgProcThread)) {
+        /* Restart at the main entry point */
+        longjmp(g_jmpXMsgProcEntry, WIN_JMP_ERROR_IO);
     }
 
-  if (g_winMultiWindowXMsgProcOldIOErrorHandler)
-    g_winMultiWindowXMsgProcOldIOErrorHandler(pDisplay);
+    if (g_winMultiWindowXMsgProcOldIOErrorHandler)
+        g_winMultiWindowXMsgProcOldIOErrorHandler(pDisplay);
 
-  return 0;
+    return 0;
 }
 
-
 /*
  * Catch RedirectError to detect other window manager running
  */
 
 static int
-winRedirectErrorHandler (Display *pDisplay, XErrorEvent *pErr)
+winRedirectErrorHandler(Display * pDisplay, XErrorEvent * pErr)
 {
-  redirectError = TRUE;
-  return 0;
+    redirectError = TRUE;
+    return 0;
 }
 
-
 /*
  * Check if another window manager is running
  */
 
 static Bool
-CheckAnotherWindowManager (Display *pDisplay, DWORD dwScreen, Bool fAllowOtherWM)
+CheckAnotherWindowManager(Display * pDisplay, DWORD dwScreen,
+                          Bool fAllowOtherWM)
 {
-  /*
-    Try to select the events which only one client at a time is allowed to select.
-    If this causes an error, another window manager is already running...
-   */
-  redirectError = FALSE;
-  XSetErrorHandler (winRedirectErrorHandler);
-  XSelectInput(pDisplay, RootWindow (pDisplay, dwScreen),
-               ResizeRedirectMask | SubstructureRedirectMask | ButtonPressMask);
-  XSync (pDisplay, 0);
-  XSetErrorHandler (winMultiWindowXMsgProcErrorHandler);
-
-  /*
-    Side effect: select the events we are actually interested in...
-
-    If other WMs are not allowed, also select one of the events which only one client
-    at a time is allowed to select, so other window managers won't start...
-  */
-  XSelectInput(pDisplay, RootWindow (pDisplay, dwScreen),
-               SubstructureNotifyMask | ( !fAllowOtherWM ? ButtonPressMask : 0));
-  XSync (pDisplay, 0);
-  return redirectError;
+    /*
+       Try to select the events which only one client at a time is allowed to select.
+       If this causes an error, another window manager is already running...
+     */
+    redirectError = FALSE;
+    XSetErrorHandler(winRedirectErrorHandler);
+    XSelectInput(pDisplay, RootWindow(pDisplay, dwScreen),
+                 ResizeRedirectMask | SubstructureRedirectMask |
+                 ButtonPressMask);
+    XSync(pDisplay, 0);
+    XSetErrorHandler(winMultiWindowXMsgProcErrorHandler);
+
+    /*
+       Side effect: select the events we are actually interested in...
+
+       If other WMs are not allowed, also select one of the events which only one client
+       at a time is allowed to select, so other window managers won't start...
+     */
+    XSelectInput(pDisplay, RootWindow(pDisplay, dwScreen),
+                 SubstructureNotifyMask | (!fAllowOtherWM ? ButtonPressMask :
+                                           0));
+    XSync(pDisplay, 0);
+    return redirectError;
 }
 
 /*
@@ -1570,10 +1436,10 @@ CheckAnotherWindowManager (Display *pDisplay, DWORD dwScreen, Bool fAllowOtherWM
  */
 
 void
-winDeinitMultiWindowWM (void)
+winDeinitMultiWindowWM(void)
 {
-  ErrorF ("winDeinitMultiWindowWM - Noting shutdown in progress\n");
-  g_shutdown = TRUE;
+    ErrorF("winDeinitMultiWindowWM - Noting shutdown in progress\n");
+    g_shutdown = TRUE;
 }
 
 /* Windows window styles */
@@ -1589,237 +1455,263 @@ winDeinitMultiWindowWM (void)
 #define HINT_MIN	(1L<<1)
 
 static void
-winApplyHints (Display *pDisplay, Window iWindow, HWND hWnd, HWND *zstyle)
+winApplyHints(Display * pDisplay, Window iWindow, HWND hWnd, HWND * zstyle)
 {
-  static Atom		windowState, motif_wm_hints, windowType;
-  static Atom		hiddenState, fullscreenState, belowState, aboveState;
-  static Atom		dockWindow;
-  static int		generation;
-  Atom			type, *pAtom = NULL;
-  int			format;
-  unsigned long		hint = 0, maxmin = 0, style, nitems = 0 , left = 0;
-  MwmHints              *mwm_hint = NULL;
-
-  if (!hWnd) return;
-  if (!IsWindow (hWnd)) return;
-
-  if (generation != serverGeneration) {
-      generation = serverGeneration;
-      windowState = XInternAtom(pDisplay, "_NET_WM_STATE", False);
-      motif_wm_hints = XInternAtom(pDisplay, "_MOTIF_WM_HINTS", False);
-      windowType = XInternAtom(pDisplay, "_NET_WM_WINDOW_TYPE", False);
-      hiddenState = XInternAtom(pDisplay, "_NET_WM_STATE_HIDDEN", False);
-      fullscreenState = XInternAtom(pDisplay, "_NET_WM_STATE_FULLSCREEN", False);
-      belowState = XInternAtom(pDisplay, "_NET_WM_STATE_BELOW", False);
-      aboveState = XInternAtom(pDisplay, "_NET_WM_STATE_ABOVE", False);
-      dockWindow = XInternAtom(pDisplay, "_NET_WM_WINDOW_TYPE_DOCK", False);
-  }
-
-  if (XGetWindowProperty(pDisplay, iWindow, windowState, 0L,
-			 1L, False, XA_ATOM, &type, &format,
-			 &nitems, &left, (unsigned char **)&pAtom) == Success)
-  {
-    if (pAtom && nitems == 1)
-    {
-      if (*pAtom == hiddenState) maxmin |= HINT_MIN;
-      else if (*pAtom == fullscreenState) maxmin |= HINT_MAX;
-      if (*pAtom == belowState) *zstyle = HWND_BOTTOM;
-      else if (*pAtom == aboveState) *zstyle = HWND_TOPMOST;
+    static Atom windowState, motif_wm_hints, windowType;
+    static Atom hiddenState, fullscreenState, belowState, aboveState;
+    static Atom dockWindow;
+    static int generation;
+    Atom type, *pAtom = NULL;
+    int format;
+    unsigned long hint = 0, maxmin = 0, style, nitems = 0, left = 0;
+    MwmHints *mwm_hint = NULL;
+
+    if (!hWnd)
+        return;
+    if (!IsWindow(hWnd))
+        return;
+
+    if (generation != serverGeneration) {
+        generation = serverGeneration;
+        windowState = XInternAtom(pDisplay, "_NET_WM_STATE", False);
+        motif_wm_hints = XInternAtom(pDisplay, "_MOTIF_WM_HINTS", False);
+        windowType = XInternAtom(pDisplay, "_NET_WM_WINDOW_TYPE", False);
+        hiddenState = XInternAtom(pDisplay, "_NET_WM_STATE_HIDDEN", False);
+        fullscreenState =
+            XInternAtom(pDisplay, "_NET_WM_STATE_FULLSCREEN", False);
+        belowState = XInternAtom(pDisplay, "_NET_WM_STATE_BELOW", False);
+        aboveState = XInternAtom(pDisplay, "_NET_WM_STATE_ABOVE", False);
+        dockWindow = XInternAtom(pDisplay, "_NET_WM_WINDOW_TYPE_DOCK", False);
+    }
+
+    if (XGetWindowProperty(pDisplay, iWindow, windowState, 0L,
+                           1L, False, XA_ATOM, &type, &format,
+                           &nitems, &left,
+                           (unsigned char **) &pAtom) == Success) {
+        if (pAtom && nitems == 1) {
+            if (*pAtom == hiddenState)
+                maxmin |= HINT_MIN;
+            else if (*pAtom == fullscreenState)
+                maxmin |= HINT_MAX;
+            if (*pAtom == belowState)
+                *zstyle = HWND_BOTTOM;
+            else if (*pAtom == aboveState)
+                *zstyle = HWND_TOPMOST;
+        }
+        if (pAtom)
+            XFree(pAtom);
+    }
+
+    nitems = left = 0;
+    if (XGetWindowProperty(pDisplay, iWindow, motif_wm_hints, 0L,
+                           PropMwmHintsElements, False, motif_wm_hints, &type,
+                           &format, &nitems, &left,
+                           (unsigned char **) &mwm_hint) == Success) {
+        if (mwm_hint && nitems == PropMwmHintsElements &&
+            (mwm_hint->flags & MwmHintsDecorations)) {
+            if (!mwm_hint->decorations)
+                hint |= HINT_NOFRAME;
+            else if (!(mwm_hint->decorations & MwmDecorAll)) {
+                if (mwm_hint->decorations & MwmDecorBorder)
+                    hint |= HINT_BORDER;
+                if (mwm_hint->decorations & MwmDecorHandle)
+                    hint |= HINT_SIZEBOX;
+                if (mwm_hint->decorations & MwmDecorTitle)
+                    hint |= HINT_CAPTION;
+                if (!(mwm_hint->decorations & MwmDecorMenu))
+                    hint |= HINT_NOSYSMENU;
+                if (!(mwm_hint->decorations & MwmDecorMinimize))
+                    hint |= HINT_NOMINIMIZE;
+                if (!(mwm_hint->decorations & MwmDecorMaximize))
+                    hint |= HINT_NOMAXIMIZE;
+            }
+            else {
+                /*
+                   MwmDecorAll means all decorations *except* those specified by other flag
+                   bits that are set.  Not yet implemented.
+                 */
+            }
+        }
+        if (mwm_hint)
+            XFree(mwm_hint);
     }
-    if (pAtom) XFree(pAtom);
-  }
-
-  nitems = left = 0;
-  if (XGetWindowProperty(pDisplay, iWindow, motif_wm_hints, 0L,
-			 PropMwmHintsElements, False, motif_wm_hints, &type, &format,
-			 &nitems, &left, (unsigned char **)&mwm_hint) == Success)
-  {
-    if (mwm_hint && nitems == PropMwmHintsElements && (mwm_hint->flags & MwmHintsDecorations))
+
+    nitems = left = 0;
+    pAtom = NULL;
+    if (XGetWindowProperty(pDisplay, iWindow, windowType, 0L,
+                           1L, False, XA_ATOM, &type, &format,
+                           &nitems, &left,
+                           (unsigned char **) &pAtom) == Success) {
+        if (pAtom && nitems == 1) {
+            if (*pAtom == dockWindow) {
+                hint = (hint & ~HINT_NOFRAME) | HINT_SIZEBOX;   /* Xming puts a sizebox on dock windows */
+                *zstyle = HWND_TOPMOST;
+            }
+        }
+        if (pAtom)
+            XFree(pAtom);
+    }
+
     {
-      if (!mwm_hint->decorations) hint |= HINT_NOFRAME;
-      else if (!(mwm_hint->decorations & MwmDecorAll))
-      {
-	if (mwm_hint->decorations & MwmDecorBorder) hint |= HINT_BORDER;
-	if (mwm_hint->decorations & MwmDecorHandle) hint |= HINT_SIZEBOX;
-	if (mwm_hint->decorations & MwmDecorTitle) hint |= HINT_CAPTION;
-	if (!(mwm_hint->decorations & MwmDecorMenu)) hint |= HINT_NOSYSMENU;
-	if (!(mwm_hint->decorations & MwmDecorMinimize)) hint |= HINT_NOMINIMIZE;
-	if (!(mwm_hint->decorations & MwmDecorMaximize)) hint |= HINT_NOMAXIMIZE;
-      }
-      else
-      {
-        /*
-           MwmDecorAll means all decorations *except* those specified by other flag
-           bits that are set.  Not yet implemented.
-        */
-      }
+        XSizeHints *normal_hint = XAllocSizeHints();
+        long supplied;
+
+        if (normal_hint &&
+            (XGetWMNormalHints(pDisplay, iWindow, normal_hint, &supplied) ==
+             Success)) {
+            if (normal_hint->flags & PMaxSize) {
+                /* Not maximizable if a maximum size is specified */
+                hint |= HINT_NOMAXIMIZE;
+
+                if (normal_hint->flags & PMinSize) {
+                    /*
+                       If both minimum size and maximum size are specified and are the same,
+                       don't bother with a resizing frame
+                     */
+                    if ((normal_hint->min_width == normal_hint->max_width)
+                        && (normal_hint->min_height == normal_hint->max_height))
+                        hint = (hint & ~HINT_SIZEBOX);
+                }
+            }
+        }
+        XFree(normal_hint);
     }
-    if (mwm_hint) XFree(mwm_hint);
-  }
-
-  nitems = left = 0;
-  pAtom = NULL;
-  if (XGetWindowProperty(pDisplay, iWindow, windowType, 0L,
-			 1L, False, XA_ATOM, &type, &format,
-			 &nitems, &left, (unsigned char **)&pAtom) == Success)
-  {
-    if (pAtom && nitems == 1)
+
+    /* Override hint settings from above with settings from config file */
     {
-      if (*pAtom == dockWindow)
-      {
-	hint = (hint & ~HINT_NOFRAME) | HINT_SIZEBOX; /* Xming puts a sizebox on dock windows */
-	*zstyle = HWND_TOPMOST;
-      }
+        XClassHint class_hint = { 0, 0 };
+        char *window_name = 0;
+
+        if (XGetClassHint(pDisplay, iWindow, &class_hint)) {
+            XFetchName(pDisplay, iWindow, &window_name);
+
+            style =
+                winOverrideStyle(class_hint.res_name, class_hint.res_class,
+                                 window_name);
+
+            if (class_hint.res_name)
+                XFree(class_hint.res_name);
+            if (class_hint.res_class)
+                XFree(class_hint.res_class);
+            if (window_name)
+                XFree(window_name);
+        }
+        else {
+            style = STYLE_NONE;
+        }
     }
-    if (pAtom) XFree(pAtom);
-  }
-
-  {
-    XSizeHints *normal_hint = XAllocSizeHints();
-    long supplied;
-    if (normal_hint && (XGetWMNormalHints(pDisplay, iWindow, normal_hint, &supplied) == Success))
-      {
-        if (normal_hint->flags & PMaxSize)
-          {
-            /* Not maximizable if a maximum size is specified */
-            hint |= HINT_NOMAXIMIZE;
-
-            if (normal_hint->flags & PMinSize)
-              {
-                /*
-                  If both minimum size and maximum size are specified and are the same,
-                  don't bother with a resizing frame
-                */
-                if ((normal_hint->min_width == normal_hint->max_width)
-                    && (normal_hint->min_height == normal_hint->max_height))
-                  hint = (hint & ~HINT_SIZEBOX);
-              }
-          }
-      }
-    XFree(normal_hint);
-  }
-
-  /* Override hint settings from above with settings from config file */
-  {
-    XClassHint class_hint = {0,0};
-    char *window_name = 0;
-
-    if (XGetClassHint(pDisplay, iWindow, &class_hint))
-      {
-        XFetchName(pDisplay, iWindow, &window_name);
-
-        style = winOverrideStyle(class_hint.res_name, class_hint.res_class, window_name);
-
-        if (class_hint.res_name) XFree(class_hint.res_name);
-        if (class_hint.res_class) XFree(class_hint.res_class);
-        if (window_name) XFree(window_name);
-      }
+
+    if (style & STYLE_TOPMOST)
+        *zstyle = HWND_TOPMOST;
+    else if (style & STYLE_MAXIMIZE)
+        maxmin = (hint & ~HINT_MIN) | HINT_MAX;
+    else if (style & STYLE_MINIMIZE)
+        maxmin = (hint & ~HINT_MAX) | HINT_MIN;
+    else if (style & STYLE_BOTTOM)
+        *zstyle = HWND_BOTTOM;
+
+    if (maxmin & HINT_MAX)
+        SendMessage(hWnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0);
+    else if (maxmin & HINT_MIN)
+        SendMessage(hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0);
+
+    if (style & STYLE_NOTITLE)
+        hint =
+            (hint & ~HINT_NOFRAME & ~HINT_BORDER & ~HINT_CAPTION) |
+            HINT_SIZEBOX;
+    else if (style & STYLE_OUTLINE)
+        hint =
+            (hint & ~HINT_NOFRAME & ~HINT_SIZEBOX & ~HINT_CAPTION) |
+            HINT_BORDER;
+    else if (style & STYLE_NOFRAME)
+        hint =
+            (hint & ~HINT_BORDER & ~HINT_CAPTION & ~HINT_SIZEBOX) |
+            HINT_NOFRAME;
+
+    /* Now apply styles to window */
+    style = GetWindowLongPtr(hWnd, GWL_STYLE) & ~WS_CAPTION & ~WS_SIZEBOX;      /* Just in case */
+    if (!style)
+        return;
+
+    if (!hint)                  /* All on */
+        style = style | WS_CAPTION | WS_SIZEBOX;
+    else if (hint & HINT_NOFRAME)       /* All off */
+        style = style & ~WS_CAPTION & ~WS_SIZEBOX;
     else
-      {
-        style = STYLE_NONE;
-      }
-  }
-
-  if (style & STYLE_TOPMOST) *zstyle = HWND_TOPMOST;
-  else if (style & STYLE_MAXIMIZE) maxmin = (hint & ~HINT_MIN) | HINT_MAX;
-  else if (style & STYLE_MINIMIZE) maxmin = (hint & ~HINT_MAX) | HINT_MIN;
-  else if (style & STYLE_BOTTOM) *zstyle = HWND_BOTTOM;
-
-  if (maxmin & HINT_MAX) SendMessage(hWnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0);
-  else if (maxmin & HINT_MIN) SendMessage(hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0);
-
-  if (style & STYLE_NOTITLE)
-	hint = (hint & ~HINT_NOFRAME & ~HINT_BORDER & ~HINT_CAPTION) | HINT_SIZEBOX;
-  else if (style & STYLE_OUTLINE)
-	hint = (hint & ~HINT_NOFRAME & ~HINT_SIZEBOX & ~HINT_CAPTION) | HINT_BORDER;
-  else if (style & STYLE_NOFRAME)
-	hint = (hint & ~HINT_BORDER & ~HINT_CAPTION & ~HINT_SIZEBOX) | HINT_NOFRAME;
-
-  /* Now apply styles to window */
-  style = GetWindowLongPtr(hWnd, GWL_STYLE) & ~WS_CAPTION & ~WS_SIZEBOX; /* Just in case */
-  if (!style) return;
-
-  if (!hint) /* All on */
-    style = style | WS_CAPTION | WS_SIZEBOX;
-  else if (hint & HINT_NOFRAME) /* All off */
-    style = style & ~WS_CAPTION & ~WS_SIZEBOX;
-  else style = style | ((hint & HINT_BORDER) ? WS_BORDER : 0) |
-		((hint & HINT_SIZEBOX) ? WS_SIZEBOX : 0) |
-		((hint & HINT_CAPTION) ? WS_CAPTION : 0);
-
-  if (hint & HINT_NOMAXIMIZE)
-    style = style & ~WS_MAXIMIZEBOX;
-
-  if (hint & HINT_NOMINIMIZE)
-    style = style & ~WS_MINIMIZEBOX;
-
-  if (hint & HINT_NOSYSMENU)
-    style = style & ~WS_SYSMENU;
-
-  SetWindowLongPtr (hWnd, GWL_STYLE, style);
+        style = style | ((hint & HINT_BORDER) ? WS_BORDER : 0) |
+            ((hint & HINT_SIZEBOX) ? WS_SIZEBOX : 0) |
+            ((hint & HINT_CAPTION) ? WS_CAPTION : 0);
+
+    if (hint & HINT_NOMAXIMIZE)
+        style = style & ~WS_MAXIMIZEBOX;
+
+    if (hint & HINT_NOMINIMIZE)
+        style = style & ~WS_MINIMIZEBOX;
+
+    if (hint & HINT_NOSYSMENU)
+        style = style & ~WS_SYSMENU;
+
+    SetWindowLongPtr(hWnd, GWL_STYLE, style);
 }
 
 void
-winUpdateWindowPosition (HWND hWnd, Bool reshape, HWND *zstyle)
+winUpdateWindowPosition(HWND hWnd, Bool reshape, HWND * zstyle)
 {
-  int iX, iY, iWidth, iHeight;
-  int	iDx, iDy;
-  RECT	rcNew;
-  WindowPtr	pWin = GetProp (hWnd, WIN_WINDOW_PROP);
-  DrawablePtr	pDraw = NULL;
+    int iX, iY, iWidth, iHeight;
+    int iDx, iDy;
+    RECT rcNew;
+    WindowPtr pWin = GetProp(hWnd, WIN_WINDOW_PROP);
+    DrawablePtr pDraw = NULL;
 
-  if (!pWin) return;
-  pDraw = &pWin->drawable;
-  if (!pDraw) return;
+    if (!pWin)
+        return;
+    pDraw = &pWin->drawable;
+    if (!pDraw)
+        return;
 
-  /* Get the X and Y location of the X window */
-  iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
-  iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);
+    /* Get the X and Y location of the X window */
+    iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN);
+    iY = pWin->drawable.y + GetSystemMetrics(SM_YVIRTUALSCREEN);
 
-  /* Get the height and width of the X window */
-  iWidth = pWin->drawable.width;
-  iHeight = pWin->drawable.height;
+    /* Get the height and width of the X window */
+    iWidth = pWin->drawable.width;
+    iHeight = pWin->drawable.height;
 
-  /* Setup a rectangle with the X window position and size */
-  SetRect (&rcNew, iX, iY, iX + iWidth, iY + iHeight);
+    /* Setup a rectangle with the X window position and size */
+    SetRect(&rcNew, iX, iY, iX + iWidth, iY + iHeight);
 
 #if 0
-  ErrorF ("winUpdateWindowPosition - (%d, %d)-(%d, %d)\n",
-	  rcNew.left, rcNew.top,
-	  rcNew.right, rcNew.bottom);
+    ErrorF("winUpdateWindowPosition - (%d, %d)-(%d, %d)\n",
+           rcNew.left, rcNew.top, rcNew.right, rcNew.bottom);
 #endif
 
-  AdjustWindowRectEx (&rcNew, GetWindowLongPtr (hWnd, GWL_STYLE), FALSE, WS_EX_APPWINDOW);
+    AdjustWindowRectEx(&rcNew, GetWindowLongPtr(hWnd, GWL_STYLE), FALSE,
+                       WS_EX_APPWINDOW);
 
-  /* Don't allow window decoration to disappear off to top-left as a result of this adjustment */
-  if (rcNew.left < GetSystemMetrics(SM_XVIRTUALSCREEN))
-    {
-      iDx = GetSystemMetrics(SM_XVIRTUALSCREEN) - rcNew.left;
-      rcNew.left += iDx;
-      rcNew.right += iDx;
+    /* Don't allow window decoration to disappear off to top-left as a result of this adjustment */
+    if (rcNew.left < GetSystemMetrics(SM_XVIRTUALSCREEN)) {
+        iDx = GetSystemMetrics(SM_XVIRTUALSCREEN) - rcNew.left;
+        rcNew.left += iDx;
+        rcNew.right += iDx;
     }
 
-  if (rcNew.top < GetSystemMetrics(SM_YVIRTUALSCREEN))
-    {
-      iDy = GetSystemMetrics(SM_YVIRTUALSCREEN) - rcNew.top;
-      rcNew.top += iDy;
-      rcNew.bottom += iDy;
+    if (rcNew.top < GetSystemMetrics(SM_YVIRTUALSCREEN)) {
+        iDy = GetSystemMetrics(SM_YVIRTUALSCREEN) - rcNew.top;
+        rcNew.top += iDy;
+        rcNew.bottom += iDy;
     }
 
 #if 0
-  ErrorF ("winUpdateWindowPosition - (%d, %d)-(%d, %d)\n",
-	  rcNew.left, rcNew.top,
-	  rcNew.right, rcNew.bottom);
+    ErrorF("winUpdateWindowPosition - (%d, %d)-(%d, %d)\n",
+           rcNew.left, rcNew.top, rcNew.right, rcNew.bottom);
 #endif
 
-  /* Position the Windows window */
-  SetWindowPos (hWnd, *zstyle, rcNew.left, rcNew.top,
-	rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
-	0);
+    /* Position the Windows window */
+    SetWindowPos(hWnd, *zstyle, rcNew.left, rcNew.top,
+                 rcNew.right - rcNew.left, rcNew.bottom - rcNew.top, 0);
 
-  if (reshape)
-  {
-    winReshapeMultiWindow(pWin);
-    winUpdateRgnMultiWindow(pWin);
-  }
+    if (reshape) {
+        winReshapeMultiWindow(pWin);
+        winUpdateRgnMultiWindow(pWin);
+    }
 }
diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c
index 19dad579c..af917d6fc 100644
--- a/xorg-server/hw/xwin/winmultiwindowwndproc.c
+++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c
@@ -42,15 +42,13 @@
 #include "winmsg.h"
 #include "inputstr.h"
 
-extern void winUpdateWindowPosition (HWND hWnd, Bool reshape, HWND *zstyle);
-
+extern void winUpdateWindowPosition(HWND hWnd, Bool reshape, HWND * zstyle);
 
 /*
  * Local globals
  */
 
-static UINT_PTR		g_uipMousePollingTimerID = 0;
-
+static UINT_PTR g_uipMousePollingTimerID = 0;
 
 /*
  * Constant defines
@@ -58,244 +56,242 @@ static UINT_PTR		g_uipMousePollingTimerID = 0;
 
 #define WIN_MULTIWINDOW_SHAPE		YES
 
-
 /*
  * ConstrainSize - Taken from TWM sources - Respects hints for sizing
  */
 #define makemult(a,b) ((b==1) ? (a) : (((int)((a)/(b))) * (b)) )
 static void
-ConstrainSize (WinXSizeHints hints, int *widthp, int *heightp)
+ConstrainSize(WinXSizeHints hints, int *widthp, int *heightp)
 {
-  int minWidth, minHeight, maxWidth, maxHeight, xinc, yinc, delta;
-  int baseWidth, baseHeight;
-  int dwidth = *widthp, dheight = *heightp;
-  
-  if (hints.flags & PMinSize)
-    {
-      minWidth = hints.min_width;
-      minHeight = hints.min_height;
+    int minWidth, minHeight, maxWidth, maxHeight, xinc, yinc, delta;
+    int baseWidth, baseHeight;
+    int dwidth = *widthp, dheight = *heightp;
+
+    if (hints.flags & PMinSize) {
+        minWidth = hints.min_width;
+        minHeight = hints.min_height;
     }
-  else if (hints.flags & PBaseSize)
-    {
-      minWidth = hints.base_width;
-      minHeight = hints.base_height;
+    else if (hints.flags & PBaseSize) {
+        minWidth = hints.base_width;
+        minHeight = hints.base_height;
     }
-  else
-    minWidth = minHeight = 1;
-  
-  if (hints.flags & PBaseSize)
-    {
-      baseWidth = hints.base_width;
-      baseHeight = hints.base_height;
-    } 
-  else if (hints.flags & PMinSize)
-    {
-      baseWidth = hints.min_width;
-      baseHeight = hints.min_height;
+    else
+        minWidth = minHeight = 1;
+
+    if (hints.flags & PBaseSize) {
+        baseWidth = hints.base_width;
+        baseHeight = hints.base_height;
     }
-  else
-    baseWidth = baseHeight = 0;
+    else if (hints.flags & PMinSize) {
+        baseWidth = hints.min_width;
+        baseHeight = hints.min_height;
+    }
+    else
+        baseWidth = baseHeight = 0;
 
-  if (hints.flags & PMaxSize)
-    {
-      maxWidth = hints.max_width;
-      maxHeight = hints.max_height;
+    if (hints.flags & PMaxSize) {
+        maxWidth = hints.max_width;
+        maxHeight = hints.max_height;
     }
-  else
-    {
-      maxWidth = MAXINT;
-      maxHeight = MAXINT;
+    else {
+        maxWidth = MAXINT;
+        maxHeight = MAXINT;
     }
 
-  if (hints.flags & PResizeInc)
-    {
-      xinc = hints.width_inc;
-      yinc = hints.height_inc;
+    if (hints.flags & PResizeInc) {
+        xinc = hints.width_inc;
+        yinc = hints.height_inc;
     }
-  else
-    xinc = yinc = 1;
-
-  /*
-   * First, clamp to min and max values
-   */
-  if (dwidth < minWidth)
-    dwidth = minWidth;
-  if (dheight < minHeight)
-    dheight = minHeight;
-
-  if (dwidth > maxWidth)
-    dwidth = maxWidth;
-  if (dheight > maxHeight)
-    dheight = maxHeight;
-
-  /*
-   * Second, fit to base + N * inc
-   */
-  dwidth = ((dwidth - baseWidth) / xinc * xinc) + baseWidth;
-  dheight = ((dheight - baseHeight) / yinc * yinc) + baseHeight;
-  
-  /*
-   * Third, adjust for aspect ratio
-   */
-
-  /*
-   * The math looks like this:
-   *
-   * minAspectX    dwidth     maxAspectX
-   * ---------- <= ------- <= ----------
-   * minAspectY    dheight    maxAspectY
-   *
-   * If that is multiplied out, then the width and height are
-   * invalid in the following situations:
-   *
-   * minAspectX * dheight > minAspectY * dwidth
-   * maxAspectX * dheight < maxAspectY * dwidth
-   * 
-   */
-  
-  if (hints.flags & PAspect)
-    {
-      if (hints.min_aspect.x * dheight > hints.min_aspect.y * dwidth)
-        {
-	  delta = makemult(hints.min_aspect.x * dheight / hints.min_aspect.y - dwidth, xinc);
-	  if (dwidth + delta <= maxWidth)
-	    dwidth += delta;
-	  else
-            {
-	      delta = makemult(dheight - dwidth*hints.min_aspect.y/hints.min_aspect.x, yinc);
-	      if (dheight - delta >= minHeight)
-		dheight -= delta;
+    else
+        xinc = yinc = 1;
+
+    /*
+     * First, clamp to min and max values
+     */
+    if (dwidth < minWidth)
+        dwidth = minWidth;
+    if (dheight < minHeight)
+        dheight = minHeight;
+
+    if (dwidth > maxWidth)
+        dwidth = maxWidth;
+    if (dheight > maxHeight)
+        dheight = maxHeight;
+
+    /*
+     * Second, fit to base + N * inc
+     */
+    dwidth = ((dwidth - baseWidth) / xinc * xinc) + baseWidth;
+    dheight = ((dheight - baseHeight) / yinc * yinc) + baseHeight;
+
+    /*
+     * Third, adjust for aspect ratio
+     */
+
+    /*
+     * The math looks like this:
+     *
+     * minAspectX    dwidth     maxAspectX
+     * ---------- <= ------- <= ----------
+     * minAspectY    dheight    maxAspectY
+     *
+     * If that is multiplied out, then the width and height are
+     * invalid in the following situations:
+     *
+     * minAspectX * dheight > minAspectY * dwidth
+     * maxAspectX * dheight < maxAspectY * dwidth
+     * 
+     */
+
+    if (hints.flags & PAspect) {
+        if (hints.min_aspect.x * dheight > hints.min_aspect.y * dwidth) {
+            delta =
+                makemult(hints.min_aspect.x * dheight / hints.min_aspect.y -
+                         dwidth, xinc);
+            if (dwidth + delta <= maxWidth)
+                dwidth += delta;
+            else {
+                delta =
+                    makemult(dheight -
+                             dwidth * hints.min_aspect.y / hints.min_aspect.x,
+                             yinc);
+                if (dheight - delta >= minHeight)
+                    dheight -= delta;
             }
         }
-      
-      if (hints.max_aspect.x * dheight < hints.max_aspect.y * dwidth)
-        {
-	  delta = makemult(dwidth * hints.max_aspect.y / hints.max_aspect.x - dheight, yinc);
-	  if (dheight + delta <= maxHeight)
-	    dheight += delta;
-	  else
-            {
-	      delta = makemult(dwidth - hints.max_aspect.x*dheight/hints.max_aspect.y, xinc);
-	      if (dwidth - delta >= minWidth)
-		dwidth -= delta;
+
+        if (hints.max_aspect.x * dheight < hints.max_aspect.y * dwidth) {
+            delta =
+                makemult(dwidth * hints.max_aspect.y / hints.max_aspect.x -
+                         dheight, yinc);
+            if (dheight + delta <= maxHeight)
+                dheight += delta;
+            else {
+                delta =
+                    makemult(dwidth -
+                             hints.max_aspect.x * dheight / hints.max_aspect.y,
+                             xinc);
+                if (dwidth - delta >= minWidth)
+                    dwidth -= delta;
             }
         }
     }
-  
-  /* Return computed values */
-  *widthp = dwidth;
-  *heightp = dheight;
-}
-#undef makemult
 
+    /* Return computed values */
+    *widthp = dwidth;
+    *heightp = dheight;
+}
 
+#undef makemult
 
 /*
  * ValidateSizing - Ensures size request respects hints
  */
 static int
-ValidateSizing (HWND hwnd, WindowPtr pWin,
-		WPARAM wParam, LPARAM lParam)
+ValidateSizing(HWND hwnd, WindowPtr pWin, WPARAM wParam, LPARAM lParam)
 {
-  WinXSizeHints sizeHints;
-  RECT *rect;
-  int iWidth, iHeight;
-  RECT rcClient, rcWindow;
-  int iBorderWidthX, iBorderWidthY;
-
-  /* Invalid input checking */
-  if (pWin==NULL || lParam==0)
-    return FALSE;
-
-  /* No size hints, no checking */
-  if (!winMultiWindowGetWMNormalHints (pWin, &sizeHints))
-    return FALSE;
-  
-  /* Avoid divide-by-zero */
-  if (sizeHints.flags & PResizeInc)
-    {
-      if (sizeHints.width_inc == 0) sizeHints.width_inc = 1;
-      if (sizeHints.height_inc == 0) sizeHints.height_inc = 1;
+    WinXSizeHints sizeHints;
+    RECT *rect;
+    int iWidth, iHeight;
+    RECT rcClient, rcWindow;
+    int iBorderWidthX, iBorderWidthY;
+
+    /* Invalid input checking */
+    if (pWin == NULL || lParam == 0)
+        return FALSE;
+
+    /* No size hints, no checking */
+    if (!winMultiWindowGetWMNormalHints(pWin, &sizeHints))
+        return FALSE;
+
+    /* Avoid divide-by-zero */
+    if (sizeHints.flags & PResizeInc) {
+        if (sizeHints.width_inc == 0)
+            sizeHints.width_inc = 1;
+        if (sizeHints.height_inc == 0)
+            sizeHints.height_inc = 1;
     }
-  
-  rect = (RECT*)lParam;
-  
-  iWidth = rect->right - rect->left;
-  iHeight = rect->bottom - rect->top;
-
-  /* Now remove size of any borders and title bar */
-  GetClientRect(hwnd, &rcClient);
-  GetWindowRect(hwnd, &rcWindow);
-  iBorderWidthX = (rcWindow.right - rcWindow.left) - (rcClient.right - rcClient.left);
-  iBorderWidthY = (rcWindow.bottom - rcWindow.top) - (rcClient.bottom - rcClient.top);
-  iWidth -= iBorderWidthX;
-  iHeight -= iBorderWidthY;
-
-  /* Constrain the size to legal values */
-  ConstrainSize (sizeHints, &iWidth, &iHeight);
-
-  /* Add back the size of borders and title bar */
-  iWidth += iBorderWidthX;
-  iHeight += iBorderWidthY;
-
-  /* Adjust size according to where we're dragging from */
-  switch(wParam) {
-  case WMSZ_TOP:
-  case WMSZ_TOPRIGHT:
-  case WMSZ_BOTTOM:
-  case WMSZ_BOTTOMRIGHT:
-  case WMSZ_RIGHT:
-    rect->right = rect->left + iWidth;
-    break;
-  default:
-    rect->left = rect->right - iWidth;
-    break;
-  }
-  switch(wParam) {
-  case WMSZ_BOTTOM:
-  case WMSZ_BOTTOMRIGHT:
-  case WMSZ_BOTTOMLEFT:
-  case WMSZ_RIGHT:
-  case WMSZ_LEFT:
-    rect->bottom = rect->top + iHeight;
-    break;
-  default:
-    rect->top = rect->bottom - iHeight;
-    break;
-  }
-  return TRUE;
+
+    rect = (RECT *) lParam;
+
+    iWidth = rect->right - rect->left;
+    iHeight = rect->bottom - rect->top;
+
+    /* Now remove size of any borders and title bar */
+    GetClientRect(hwnd, &rcClient);
+    GetWindowRect(hwnd, &rcWindow);
+    iBorderWidthX =
+        (rcWindow.right - rcWindow.left) - (rcClient.right - rcClient.left);
+    iBorderWidthY =
+        (rcWindow.bottom - rcWindow.top) - (rcClient.bottom - rcClient.top);
+    iWidth -= iBorderWidthX;
+    iHeight -= iBorderWidthY;
+
+    /* Constrain the size to legal values */
+    ConstrainSize(sizeHints, &iWidth, &iHeight);
+
+    /* Add back the size of borders and title bar */
+    iWidth += iBorderWidthX;
+    iHeight += iBorderWidthY;
+
+    /* Adjust size according to where we're dragging from */
+    switch (wParam) {
+    case WMSZ_TOP:
+    case WMSZ_TOPRIGHT:
+    case WMSZ_BOTTOM:
+    case WMSZ_BOTTOMRIGHT:
+    case WMSZ_RIGHT:
+        rect->right = rect->left + iWidth;
+        break;
+    default:
+        rect->left = rect->right - iWidth;
+        break;
+    }
+    switch (wParam) {
+    case WMSZ_BOTTOM:
+    case WMSZ_BOTTOMRIGHT:
+    case WMSZ_BOTTOMLEFT:
+    case WMSZ_RIGHT:
+    case WMSZ_LEFT:
+        rect->bottom = rect->top + iHeight;
+        break;
+    default:
+        rect->top = rect->bottom - iHeight;
+        break;
+    }
+    return TRUE;
 }
 
 extern Bool winInDestroyWindowsWindow;
 static Bool winInRaiseWindow = FALSE;
-static void winRaiseWindow(WindowPtr pWin)
+static void
+winRaiseWindow(WindowPtr pWin)
 {
-  if (!winInDestroyWindowsWindow && !winInRaiseWindow)
-  {
-    BOOL oldstate = winInRaiseWindow;
-    XID vlist[1] = { 0 };
-    winInRaiseWindow = TRUE;
-    /* Call configure window directly to make sure it gets processed 
-     * in time
-     */
-    ConfigureWindow(pWin, CWStackMode, vlist, serverClient); 
-    winInRaiseWindow = oldstate;
-  }
+    if (!winInDestroyWindowsWindow && !winInRaiseWindow) {
+        BOOL oldstate = winInRaiseWindow;
+        XID vlist[1] = { 0 };
+        winInRaiseWindow = TRUE;
+        /* Call configure window directly to make sure it gets processed 
+         * in time
+         */
+        ConfigureWindow(pWin, CWStackMode, vlist, serverClient);
+        winInRaiseWindow = oldstate;
+    }
 }
 
 static
-void winStartMousePolling(winPrivScreenPtr s_pScreenPriv)
+    void
+winStartMousePolling(winPrivScreenPtr s_pScreenPriv)
 {
-  /*
-   * Timer to poll mouse position.  This is needed to make
-   * programs like xeyes follow the mouse properly when the
-   * mouse pointer is outside of any X window.
-   */
-  if (g_uipMousePollingTimerID == 0)
-    g_uipMousePollingTimerID = SetTimer (s_pScreenPriv->hwndScreen,
-					 WIN_POLLING_MOUSE_TIMER_ID,
-					 MOUSE_POLLING_INTERVAL,
-					 NULL);
+    /*
+     * Timer to poll mouse position.  This is needed to make
+     * programs like xeyes follow the mouse properly when the
+     * mouse pointer is outside of any X window.
+     */
+    if (g_uipMousePollingTimerID == 0)
+        g_uipMousePollingTimerID = SetTimer(s_pScreenPriv->hwndScreen,
+                                            WIN_POLLING_MOUSE_TIMER_ID,
+                                            MOUSE_POLLING_INTERVAL, NULL);
 }
 
 /*
@@ -303,833 +299,835 @@ void winStartMousePolling(winPrivScreenPtr s_pScreenPriv)
  */
 
 LRESULT CALLBACK
-winTopLevelWindowProc (HWND hwnd, UINT message, 
-		       WPARAM wParam, LPARAM lParam)
+winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  POINT			ptMouse;
-  HDC			hdcUpdate;
-  PAINTSTRUCT		ps;
-  WindowPtr		pWin = NULL;
-  winPrivWinPtr	        pWinPriv = NULL;
-  ScreenPtr		s_pScreen = NULL;
-  winPrivScreenPtr	s_pScreenPriv = NULL;
-  winScreenInfo		*s_pScreenInfo = NULL;
-  HWND			hwndScreen = NULL;
-  DrawablePtr		pDraw = NULL;
-  winWMMessageRec	wmMsg;
-  Bool                  fWMMsgInitialized = FALSE;
-  static Bool		s_fTracking = FALSE;
-  Bool			needRestack = FALSE;
-  LRESULT		ret;
+    POINT ptMouse;
+    HDC hdcUpdate;
+    PAINTSTRUCT ps;
+    WindowPtr pWin = NULL;
+    winPrivWinPtr pWinPriv = NULL;
+    ScreenPtr s_pScreen = NULL;
+    winPrivScreenPtr s_pScreenPriv = NULL;
+    winScreenInfo *s_pScreenInfo = NULL;
+    HWND hwndScreen = NULL;
+    DrawablePtr pDraw = NULL;
+    winWMMessageRec wmMsg;
+    Bool fWMMsgInitialized = FALSE;
+    static Bool s_fTracking = FALSE;
+    Bool needRestack = FALSE;
+    LRESULT ret;
 
 #if CYGDEBUG
-  winDebugWin32Message("winTopLevelWindowProc", hwnd, message, wParam, lParam);
+    winDebugWin32Message("winTopLevelWindowProc", hwnd, message, wParam,
+                         lParam);
 #endif
-  
-  /* Check if the Windows window property for our X window pointer is valid */
-  if ((pWin = GetProp (hwnd, WIN_WINDOW_PROP)) != NULL)
-    {
-      /* Our X window pointer is valid */
 
-      /* Get pointers to the drawable and the screen */
-      pDraw		= &pWin->drawable;
-      s_pScreen		= pWin->drawable.pScreen;
+    /* Check if the Windows window property for our X window pointer is valid */
+    if ((pWin = GetProp(hwnd, WIN_WINDOW_PROP)) != NULL) {
+        /* Our X window pointer is valid */
+
+        /* Get pointers to the drawable and the screen */
+        pDraw = &pWin->drawable;
+        s_pScreen = pWin->drawable.pScreen;
 
-      /* Get a pointer to our window privates */
-      pWinPriv		= winGetWindowPriv(pWin);
+        /* Get a pointer to our window privates */
+        pWinPriv = winGetWindowPriv(pWin);
 
-      /* Get pointers to our screen privates and screen info */
-      s_pScreenPriv	= pWinPriv->pScreenPriv;
-      s_pScreenInfo	= s_pScreenPriv->pScreenInfo;
+        /* Get pointers to our screen privates and screen info */
+        s_pScreenPriv = pWinPriv->pScreenPriv;
+        s_pScreenInfo = s_pScreenPriv->pScreenInfo;
 
-      /* Get the handle for our screen-sized window */
-      hwndScreen	= s_pScreenPriv->hwndScreen;
+        /* Get the handle for our screen-sized window */
+        hwndScreen = s_pScreenPriv->hwndScreen;
 
-      /* */
-      wmMsg.msg		= 0;
-      wmMsg.hwndWindow	= hwnd;
-      wmMsg.iWindow	= (Window)GetProp (hwnd, WIN_WID_PROP);
+        /* */
+        wmMsg.msg = 0;
+        wmMsg.hwndWindow = hwnd;
+        wmMsg.iWindow = (Window) GetProp(hwnd, WIN_WID_PROP);
 
-      wmMsg.iX		= pDraw->x;
-      wmMsg.iY		= pDraw->y;
-      wmMsg.iWidth	= pDraw->width;
-      wmMsg.iHeight	= pDraw->height;
+        wmMsg.iX = pDraw->x;
+        wmMsg.iY = pDraw->y;
+        wmMsg.iWidth = pDraw->width;
+        wmMsg.iHeight = pDraw->height;
 
-      fWMMsgInitialized = TRUE;
+        fWMMsgInitialized = TRUE;
 
 #if 0
-      /*
-       * Print some debugging information
-       */
-
-      ErrorF ("hWnd %08X\n", hwnd);
-      ErrorF ("pWin %08X\n", pWin);
-      ErrorF ("pDraw %08X\n", pDraw);
-      ErrorF ("\ttype %08X\n", pWin->drawable.type);
-      ErrorF ("\tclass %08X\n", pWin->drawable.class);
-      ErrorF ("\tdepth %08X\n", pWin->drawable.depth);
-      ErrorF ("\tbitsPerPixel %08X\n", pWin->drawable.bitsPerPixel);
-      ErrorF ("\tid %08X\n", pWin->drawable.id);
-      ErrorF ("\tx %08X\n", pWin->drawable.x);
-      ErrorF ("\ty %08X\n", pWin->drawable.y);
-      ErrorF ("\twidth %08X\n", pWin->drawable.width);
-      ErrorF ("\thenght %08X\n", pWin->drawable.height);
-      ErrorF ("\tpScreen %08X\n", pWin->drawable.pScreen);
-      ErrorF ("\tserialNumber %08X\n", pWin->drawable.serialNumber);
-      ErrorF ("g_iWindowPrivateKey %p\n", g_iWindowPrivateKey);
-      ErrorF ("pWinPriv %08X\n", pWinPriv);
-      ErrorF ("s_pScreenPriv %08X\n", s_pScreenPriv);
-      ErrorF ("s_pScreenInfo %08X\n", s_pScreenInfo);
-      ErrorF ("hwndScreen %08X\n", hwndScreen);
+        /*
+         * Print some debugging information
+         */
+
+        ErrorF("hWnd %08X\n", hwnd);
+        ErrorF("pWin %08X\n", pWin);
+        ErrorF("pDraw %08X\n", pDraw);
+        ErrorF("\ttype %08X\n", pWin->drawable.type);
+        ErrorF("\tclass %08X\n", pWin->drawable.class);
+        ErrorF("\tdepth %08X\n", pWin->drawable.depth);
+        ErrorF("\tbitsPerPixel %08X\n", pWin->drawable.bitsPerPixel);
+        ErrorF("\tid %08X\n", pWin->drawable.id);
+        ErrorF("\tx %08X\n", pWin->drawable.x);
+        ErrorF("\ty %08X\n", pWin->drawable.y);
+        ErrorF("\twidth %08X\n", pWin->drawable.width);
+        ErrorF("\thenght %08X\n", pWin->drawable.height);
+        ErrorF("\tpScreen %08X\n", pWin->drawable.pScreen);
+        ErrorF("\tserialNumber %08X\n", pWin->drawable.serialNumber);
+        ErrorF("g_iWindowPrivateKey %p\n", g_iWindowPrivateKey);
+        ErrorF("pWinPriv %08X\n", pWinPriv);
+        ErrorF("s_pScreenPriv %08X\n", s_pScreenPriv);
+        ErrorF("s_pScreenInfo %08X\n", s_pScreenInfo);
+        ErrorF("hwndScreen %08X\n", hwndScreen);
 #endif
     }
 
-  /* Branch on message type */
-  switch (message)
-    {
+    /* Branch on message type */
+    switch (message) {
     case WM_CREATE:
 
-      /* */
-      SetProp (hwnd,
-	       WIN_WINDOW_PROP,
-	       (HANDLE)((LPCREATESTRUCT) lParam)->lpCreateParams);
-      
-      /* */
-      SetProp (hwnd,
-	       WIN_WID_PROP,
-	       (HANDLE)winGetWindowID (((LPCREATESTRUCT) lParam)->lpCreateParams));
-
-      /*
-       * Make X windows' Z orders sync with Windows windows because
-       * there can be AlwaysOnTop windows overlapped on the window
-       * currently being created.
-       */
-      winReorderWindowsMultiWindow ();
-
-      /* Fix a 'round title bar corner background should be transparent not black' problem when first painted */
-      {
-        RECT rWindow;
-        HRGN hRgnWindow;
-        GetWindowRect(hwnd, &rWindow);
-        hRgnWindow = CreateRectRgnIndirect(&rWindow);
-        SetWindowRgn (hwnd, hRgnWindow, TRUE);
-        DeleteObject(hRgnWindow);
-      }
-
-      SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)XMING_SIGNATURE);
-
-      return 0;
+        /* */
+        SetProp(hwnd,
+                WIN_WINDOW_PROP,
+                (HANDLE) ((LPCREATESTRUCT) lParam)->lpCreateParams);
+
+        /* */
+        SetProp(hwnd,
+                WIN_WID_PROP,
+                (HANDLE) winGetWindowID(((LPCREATESTRUCT) lParam)->
+                                        lpCreateParams));
+
+        /*
+         * Make X windows' Z orders sync with Windows windows because
+         * there can be AlwaysOnTop windows overlapped on the window
+         * currently being created.
+         */
+        winReorderWindowsMultiWindow();
+
+        /* Fix a 'round title bar corner background should be transparent not black' problem when first painted */
+        {
+            RECT rWindow;
+            HRGN hRgnWindow;
+
+            GetWindowRect(hwnd, &rWindow);
+            hRgnWindow = CreateRectRgnIndirect(&rWindow);
+            SetWindowRgn(hwnd, hRgnWindow, TRUE);
+            DeleteObject(hRgnWindow);
+        }
+
+        SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR) XMING_SIGNATURE);
+
+        return 0;
 
     case WM_INIT_SYS_MENU:
-      /*
-       * Add whatever the setup file wants to for this window
-       */
-      SetupSysMenu ((unsigned long)hwnd);
-      return 0;
+        /*
+         * Add whatever the setup file wants to for this window
+         */
+        SetupSysMenu((unsigned long) hwnd);
+        return 0;
 
     case WM_SYSCOMMAND:
-      /*
-       * Any window menu items go through here
-       */
-      if (HandleCustomWM_COMMAND ((unsigned long)hwnd, LOWORD(wParam)))
-      {
-        /* Don't pass customized menus to DefWindowProc */
-        return 0;
-      }
-      if (wParam == SC_RESTORE || wParam == SC_MAXIMIZE)
-      {
-        WINDOWPLACEMENT wndpl;
-	wndpl.length = sizeof(wndpl);
-	if (GetWindowPlacement(hwnd, &wndpl) && wndpl.showCmd == SW_SHOWMINIMIZED)
-          needRestack = TRUE;
-      }
-      break;
+        /*
+         * Any window menu items go through here
+         */
+        if (HandleCustomWM_COMMAND((unsigned long) hwnd, LOWORD(wParam))) {
+            /* Don't pass customized menus to DefWindowProc */
+            return 0;
+        }
+        if (wParam == SC_RESTORE || wParam == SC_MAXIMIZE) {
+            WINDOWPLACEMENT wndpl;
+
+            wndpl.length = sizeof(wndpl);
+            if (GetWindowPlacement(hwnd, &wndpl) &&
+                wndpl.showCmd == SW_SHOWMINIMIZED)
+                needRestack = TRUE;
+        }
+        break;
 
     case WM_INITMENU:
-      /* Checks/Unchecks any menu items before they are displayed */
-      HandleCustomWM_INITMENU ((unsigned long)hwnd, wParam);
-      break;
+        /* Checks/Unchecks any menu items before they are displayed */
+        HandleCustomWM_INITMENU((unsigned long) hwnd, wParam);
+        break;
 
     case WM_ERASEBKGND:
-      /*
-       * Pretend that we did erase the background but we don't care,
-       * since we repaint the entire region anyhow
-       * This avoids some flickering when resizing.
-       */
-      return TRUE;
+        /*
+         * Pretend that we did erase the background but we don't care,
+         * since we repaint the entire region anyhow
+         * This avoids some flickering when resizing.
+         */
+        return TRUE;
 
     case WM_PAINT:
-      /* Only paint if our window handle is valid */
-      if (hwndScreen == NULL)
-	break;
-
-      /* BeginPaint gives us an hdc that clips to the invalidated region */
-      hdcUpdate = BeginPaint (hwnd, &ps);
-      /* Avoid the BitBlt's if the PAINTSTRUCT is bogus */
-      if (ps.rcPaint.right==0 && ps.rcPaint.bottom==0 && ps.rcPaint.left==0 && ps.rcPaint.top==0)
-      {
-	EndPaint (hwnd, &ps);
-	return 0;
-      }
+        /* Only paint if our window handle is valid */
+        if (hwndScreen == NULL)
+            break;
+
+        /* BeginPaint gives us an hdc that clips to the invalidated region */
+        hdcUpdate = BeginPaint(hwnd, &ps);
+        /* Avoid the BitBlt's if the PAINTSTRUCT is bogus */
+        if (ps.rcPaint.right == 0 && ps.rcPaint.bottom == 0 &&
+            ps.rcPaint.left == 0 && ps.rcPaint.top == 0) {
+            EndPaint(hwnd, &ps);
+            return 0;
+        }
 
 #ifdef XWIN_GLX_WINDOWS
-      if (pWinPriv->fWglUsed)
-        {
-          /*
-             For regions which are being drawn by GL, the shadow framebuffer doesn't have the
-             correct bits, so don't bitblt from the shadow framebuffer
-
-             XXX: For now, just leave it alone, but ideally we want to send an expose event to
-             the window so it really redraws the affected region...
-          */
-          ValidateRect(hwnd, &(ps.rcPaint));
+        if (pWinPriv->fWglUsed) {
+            /*
+               For regions which are being drawn by GL, the shadow framebuffer doesn't have the
+               correct bits, so don't bitblt from the shadow framebuffer
+
+               XXX: For now, just leave it alone, but ideally we want to send an expose event to
+               the window so it really redraws the affected region...
+             */
+            ValidateRect(hwnd, &(ps.rcPaint));
         }
-      else
+        else
 #endif
-      /* Try to copy from the shadow buffer */
-      if (!BitBlt (hdcUpdate,
-		   ps.rcPaint.left, ps.rcPaint.top,
-		   ps.rcPaint.right - ps.rcPaint.left, ps.rcPaint.bottom - ps.rcPaint.top,
-		   s_pScreenPriv->hdcShadow,
-		   ps.rcPaint.left + pWin->drawable.x, ps.rcPaint.top + pWin->drawable.y,
-		   SRCCOPY))
-	{
-	  LPVOID lpMsgBuf;
-	  
-	  /* Display a fancy error message */
-	  FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-			 FORMAT_MESSAGE_FROM_SYSTEM | 
-			 FORMAT_MESSAGE_IGNORE_INSERTS,
-			 NULL,
-			 GetLastError (),
-			 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-			 (LPTSTR) &lpMsgBuf,
-			 0, NULL);
-
-	  ErrorF ("winTopLevelWindowProc - BitBlt failed: %s\n",
-		  (LPSTR)lpMsgBuf);
-	  LocalFree (lpMsgBuf);
-	}
-
-      /* EndPaint frees the DC */
-      EndPaint (hwnd, &ps);
-      return 0;
+            /* Try to copy from the shadow buffer */
+        if (!BitBlt(hdcUpdate,
+                        ps.rcPaint.left, ps.rcPaint.top,
+                        ps.rcPaint.right - ps.rcPaint.left,
+                        ps.rcPaint.bottom - ps.rcPaint.top,
+                        s_pScreenPriv->hdcShadow,
+                        ps.rcPaint.left + pWin->drawable.x,
+                        ps.rcPaint.top + pWin->drawable.y, SRCCOPY)) {
+            LPVOID lpMsgBuf;
+
+            /* Display a fancy error message */
+            FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                          FORMAT_MESSAGE_FROM_SYSTEM |
+                          FORMAT_MESSAGE_IGNORE_INSERTS,
+                          NULL,
+                          GetLastError(),
+                          MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                          (LPTSTR) & lpMsgBuf, 0, NULL);
+
+            ErrorF("winTopLevelWindowProc - BitBlt failed: %s\n",
+                   (LPSTR) lpMsgBuf);
+            LocalFree(lpMsgBuf);
+        }
+
+        /* EndPaint frees the DC */
+        EndPaint(hwnd, &ps);
+        return 0;
 
     case WM_MOUSEMOVE:
-      /* Unpack the client area mouse coordinates */
-      ptMouse.x = GET_X_LPARAM(lParam);
-      ptMouse.y = GET_Y_LPARAM(lParam);
-
-      /* Translate the client area mouse coordinates to screen coordinates */
-      ClientToScreen (hwnd, &ptMouse);
-
-      /* Screen Coords from (-X, -Y) -> Root Window (0, 0) */
-      ptMouse.x -= GetSystemMetrics (SM_XVIRTUALSCREEN);
-      ptMouse.y -= GetSystemMetrics (SM_YVIRTUALSCREEN);
-
-      /* We can't do anything without privates */
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-
-      /* Has the mouse pointer crossed screens? */
-      if (s_pScreen != miPointerGetScreen(g_pwinPointer))
-	miPointerSetScreen (g_pwinPointer, s_pScreenInfo->dwScreen,
-			       ptMouse.x - s_pScreenInfo->dwXOffset,
-			       ptMouse.y - s_pScreenInfo->dwYOffset);
-
-      /* Are we tracking yet? */
-      if (!s_fTracking)
-	{
-	  TRACKMOUSEEVENT		tme;
-	  
-	  /* Setup data structure */
-	  ZeroMemory (&tme, sizeof (tme));
-	  tme.cbSize = sizeof (tme);
-	  tme.dwFlags = TME_LEAVE;
-	  tme.hwndTrack = hwnd;
-
-	  /* Call the tracking function */
-	  if (!TrackMouseEvent(&tme))
-	    ErrorF ("winTopLevelWindowProc - TrackMouseEvent failed\n");
-
-	  /* Flag that we are tracking now */
-	  s_fTracking = TRUE;
-	}
-      
-      /* Hide or show the Windows mouse cursor */
-      if (g_fSoftwareCursor && g_fCursor)
-	{
-	  /* Hide Windows cursor */
-	  g_fCursor = FALSE;
-	  ShowCursor (FALSE);
-	}
-
-      /* Kill the timer used to poll mouse events */
-      if (g_uipMousePollingTimerID != 0)
-	{
-	  KillTimer (s_pScreenPriv->hwndScreen, WIN_POLLING_MOUSE_TIMER_ID);
-	  g_uipMousePollingTimerID = 0;
-	}
-
-      /* Deliver absolute cursor position to X Server */
-      winEnqueueMotion(ptMouse.x - s_pScreenInfo->dwXOffset,
-		       ptMouse.y - s_pScreenInfo->dwYOffset);
-
-      return 0;
-      
+        /* Unpack the client area mouse coordinates */
+        ptMouse.x = GET_X_LPARAM(lParam);
+        ptMouse.y = GET_Y_LPARAM(lParam);
+
+        /* Translate the client area mouse coordinates to screen coordinates */
+        ClientToScreen(hwnd, &ptMouse);
+
+        /* Screen Coords from (-X, -Y) -> Root Window (0, 0) */
+        ptMouse.x -= GetSystemMetrics(SM_XVIRTUALSCREEN);
+        ptMouse.y -= GetSystemMetrics(SM_YVIRTUALSCREEN);
+
+        /* We can't do anything without privates */
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+
+        /* Has the mouse pointer crossed screens? */
+        if (s_pScreen != miPointerGetScreen(g_pwinPointer))
+            miPointerSetScreen(g_pwinPointer, s_pScreenInfo->dwScreen,
+                               ptMouse.x - s_pScreenInfo->dwXOffset,
+                               ptMouse.y - s_pScreenInfo->dwYOffset);
+
+        /* Are we tracking yet? */
+        if (!s_fTracking) {
+            TRACKMOUSEEVENT tme;
+
+            /* Setup data structure */
+            ZeroMemory(&tme, sizeof(tme));
+            tme.cbSize = sizeof(tme);
+            tme.dwFlags = TME_LEAVE;
+            tme.hwndTrack = hwnd;
+
+            /* Call the tracking function */
+            if (!TrackMouseEvent(&tme))
+                ErrorF("winTopLevelWindowProc - TrackMouseEvent failed\n");
+
+            /* Flag that we are tracking now */
+            s_fTracking = TRUE;
+        }
+
+        /* Hide or show the Windows mouse cursor */
+        if (g_fSoftwareCursor && g_fCursor) {
+            /* Hide Windows cursor */
+            g_fCursor = FALSE;
+            ShowCursor(FALSE);
+        }
+
+        /* Kill the timer used to poll mouse events */
+        if (g_uipMousePollingTimerID != 0) {
+            KillTimer(s_pScreenPriv->hwndScreen, WIN_POLLING_MOUSE_TIMER_ID);
+            g_uipMousePollingTimerID = 0;
+        }
+
+        /* Deliver absolute cursor position to X Server */
+        winEnqueueMotion(ptMouse.x - s_pScreenInfo->dwXOffset,
+                         ptMouse.y - s_pScreenInfo->dwYOffset);
+
+        return 0;
+
     case WM_NCMOUSEMOVE:
-      /*
-       * We break instead of returning 0 since we need to call
-       * DefWindowProc to get the mouse cursor changes
-       * and min/max/close button highlighting in Windows XP.
-       * The Platform SDK says that you should return 0 if you
-       * process this message, but it fails to mention that you
-       * will give up any default functionality if you do return 0.
-       */
-      
-      /* We can't do anything without privates */
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-
-      /* Non-client mouse movement, show Windows cursor */
-      if (g_fSoftwareCursor && !g_fCursor)
-	{
-	  g_fCursor = TRUE;
-	  ShowCursor (TRUE);
-	}
-
-      winStartMousePolling(s_pScreenPriv);
-
-      break;
+        /*
+         * We break instead of returning 0 since we need to call
+         * DefWindowProc to get the mouse cursor changes
+         * and min/max/close button highlighting in Windows XP.
+         * The Platform SDK says that you should return 0 if you
+         * process this message, but it fails to mention that you
+         * will give up any default functionality if you do return 0.
+         */
+
+        /* We can't do anything without privates */
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+
+        /* Non-client mouse movement, show Windows cursor */
+        if (g_fSoftwareCursor && !g_fCursor) {
+            g_fCursor = TRUE;
+            ShowCursor(TRUE);
+        }
+
+        winStartMousePolling(s_pScreenPriv);
+
+        break;
 
     case WM_MOUSELEAVE:
-      /* Mouse has left our client area */
+        /* Mouse has left our client area */
 
-      /* Flag that we are no longer tracking */
-      s_fTracking = FALSE;
+        /* Flag that we are no longer tracking */
+        s_fTracking = FALSE;
 
-      /* Show the mouse cursor, if necessary */
-      if (g_fSoftwareCursor && !g_fCursor)
-	{
-	  g_fCursor = TRUE;
-	  ShowCursor (TRUE);
-	}
+        /* Show the mouse cursor, if necessary */
+        if (g_fSoftwareCursor && !g_fCursor) {
+            g_fCursor = TRUE;
+            ShowCursor(TRUE);
+        }
 
-      winStartMousePolling(s_pScreenPriv);
+        winStartMousePolling(s_pScreenPriv);
 
-      return 0;
+        return 0;
 
     case WM_LBUTTONDBLCLK:
     case WM_LBUTTONDOWN:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      g_fButton[0] = TRUE;
-      SetCapture(hwnd);
-      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button1, wParam);
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        g_fButton[0] = TRUE;
+        SetCapture(hwnd);
+        return winMouseButtonsHandle(s_pScreen, ButtonPress, Button1, wParam);
 
     case WM_LBUTTONUP:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      g_fButton[0] = FALSE;
-      ReleaseCapture();
-      winStartMousePolling(s_pScreenPriv);
-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button1, wParam);
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        g_fButton[0] = FALSE;
+        ReleaseCapture();
+        winStartMousePolling(s_pScreenPriv);
+        return winMouseButtonsHandle(s_pScreen, ButtonRelease, Button1, wParam);
 
     case WM_MBUTTONDBLCLK:
     case WM_MBUTTONDOWN:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      g_fButton[1] = TRUE;
-      SetCapture(hwnd);
-      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button2, wParam);
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        g_fButton[1] = TRUE;
+        SetCapture(hwnd);
+        return winMouseButtonsHandle(s_pScreen, ButtonPress, Button2, wParam);
 
     case WM_MBUTTONUP:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      g_fButton[1] = FALSE;
-      ReleaseCapture();
-      winStartMousePolling(s_pScreenPriv);
-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button2, wParam);
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        g_fButton[1] = FALSE;
+        ReleaseCapture();
+        winStartMousePolling(s_pScreenPriv);
+        return winMouseButtonsHandle(s_pScreen, ButtonRelease, Button2, wParam);
 
     case WM_RBUTTONDBLCLK:
     case WM_RBUTTONDOWN:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      g_fButton[2] = TRUE;
-      SetCapture(hwnd);
-      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button3, wParam);
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        g_fButton[2] = TRUE;
+        SetCapture(hwnd);
+        return winMouseButtonsHandle(s_pScreen, ButtonPress, Button3, wParam);
 
     case WM_RBUTTONUP:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      g_fButton[2] = FALSE;
-      ReleaseCapture();
-      winStartMousePolling(s_pScreenPriv);
-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button3, wParam);
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        g_fButton[2] = FALSE;
+        ReleaseCapture();
+        winStartMousePolling(s_pScreenPriv);
+        return winMouseButtonsHandle(s_pScreen, ButtonRelease, Button3, wParam);
 
     case WM_XBUTTONDBLCLK:
     case WM_XBUTTONDOWN:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-	SetCapture(hwnd);
-      return winMouseButtonsHandle (s_pScreen, ButtonPress, HIWORD(wParam) + 5, wParam);
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        SetCapture(hwnd);
+        return winMouseButtonsHandle(s_pScreen, ButtonPress, HIWORD(wParam) + 5,
+                                     wParam);
 
     case WM_XBUTTONUP:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      ReleaseCapture();
-      winStartMousePolling(s_pScreenPriv);
-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, HIWORD(wParam) + 5, wParam);
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        ReleaseCapture();
+        winStartMousePolling(s_pScreenPriv);
+        return winMouseButtonsHandle(s_pScreen, ButtonRelease,
+                                     HIWORD(wParam) + 5, wParam);
 
     case WM_MOUSEWHEEL:
-      if (SendMessage(hwnd, WM_NCHITTEST, 0, MAKELONG(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam))) == HTCLIENT)
-	{
-	  /* Pass the message to the root window */
-	  SendMessage (hwndScreen, message, wParam, lParam);
-	  return 0;
-	}
-      else break;
+        if (SendMessage
+            (hwnd, WM_NCHITTEST, 0,
+             MAKELONG(GET_X_LPARAM(lParam),
+                      GET_Y_LPARAM(lParam))) == HTCLIENT) {
+            /* Pass the message to the root window */
+            SendMessage(hwndScreen, message, wParam, lParam);
+            return 0;
+        }
+        else
+            break;
 
     case WM_SETFOCUS:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-
-      {
-	/* Get the parent window for transient handling */
-	HWND hParent = GetParent(hwnd);
-	if (hParent && IsIconic(hParent)) ShowWindow (hParent, SW_RESTORE);
-      }
-
-      winRestoreModeKeyStates ();
-
-      /* Add the keyboard hook if possible */
-      if (g_fKeyboardHookLL)
-	g_fKeyboardHookLL = winInstallKeyboardHookLL ();
-      return 0;
-      
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+
+        {
+            /* Get the parent window for transient handling */
+            HWND hParent = GetParent(hwnd);
+
+            if (hParent && IsIconic(hParent))
+                ShowWindow(hParent, SW_RESTORE);
+        }
+
+        winRestoreModeKeyStates();
+
+        /* Add the keyboard hook if possible */
+        if (g_fKeyboardHookLL)
+            g_fKeyboardHookLL = winInstallKeyboardHookLL();
+        return 0;
+
     case WM_KILLFOCUS:
-      /* Pop any pressed keys since we are losing keyboard focus */
-      winKeybdReleaseKeys ();
+        /* Pop any pressed keys since we are losing keyboard focus */
+        winKeybdReleaseKeys();
 
-      /* Remove our keyboard hook if it is installed */
-      winRemoveKeyboardHookLL ();
+        /* Remove our keyboard hook if it is installed */
+        winRemoveKeyboardHookLL();
 
-      /* Revert the X focus as well, but only if the Windows focus is going to another window */
-      if (!wParam && pWin)
-          DeleteWindowFromAnyEvents(pWin, FALSE);
+        /* Revert the X focus as well, but only if the Windows focus is going to another window */
+        if (!wParam && pWin)
+            DeleteWindowFromAnyEvents(pWin, FALSE);
 
-      return 0;
+        return 0;
 
-    case WM_SYSDEADCHAR:      
+    case WM_SYSDEADCHAR:
     case WM_DEADCHAR:
-      /*
-       * NOTE: We do nothing with WM_*CHAR messages,
-       * nor does the root window, so we can just toss these messages.
-       */
-      return 0;
+        /*
+         * NOTE: We do nothing with WM_*CHAR messages,
+         * nor does the root window, so we can just toss these messages.
+         */
+        return 0;
 
     case WM_SYSKEYDOWN:
     case WM_KEYDOWN:
 
-      /*
-       * Don't pass Alt-F4 key combo to root window,
-       * let Windows translate to WM_CLOSE and close this top-level window.
-       *
-       * NOTE: We purposely don't check the fUseWinKillKey setting because
-       * it should only apply to the key handling for the root window,
-       * not for top-level window-manager windows.
-       *
-       * ALSO NOTE: We do pass Ctrl-Alt-Backspace to the root window
-       * because that is a key combo that no X app should be expecting to
-       * receive, since it has historically been used to shutdown the X server.
-       * Passing Ctrl-Alt-Backspace to the root window preserves that
-       * behavior, assuming that -unixkill has been passed as a parameter.
-       */
-      if (wParam == VK_F4 && (GetKeyState (VK_MENU) & 0x8000))
-	  break;
+        /*
+         * Don't pass Alt-F4 key combo to root window,
+         * let Windows translate to WM_CLOSE and close this top-level window.
+         *
+         * NOTE: We purposely don't check the fUseWinKillKey setting because
+         * it should only apply to the key handling for the root window,
+         * not for top-level window-manager windows.
+         *
+         * ALSO NOTE: We do pass Ctrl-Alt-Backspace to the root window
+         * because that is a key combo that no X app should be expecting to
+         * receive, since it has historically been used to shutdown the X server.
+         * Passing Ctrl-Alt-Backspace to the root window preserves that
+         * behavior, assuming that -unixkill has been passed as a parameter.
+         */
+        if (wParam == VK_F4 && (GetKeyState(VK_MENU) & 0x8000))
+            break;
 
 #if CYGWINDOWING_DEBUG
-      if (wParam == VK_ESCAPE)
-	{
-	  /* Place for debug: put any tests and dumps here */
-	  WINDOWPLACEMENT windPlace;
-	  RECT rc;
-	  LPRECT pRect;
-	  
-	  windPlace.length = sizeof (WINDOWPLACEMENT);
-	  GetWindowPlacement (hwnd, &windPlace);
-	  pRect = &windPlace.rcNormalPosition;
-	  ErrorF ("\nCYGWINDOWING Dump:\n"
-		  "\tdrawable: (%hd, %hd) - %hdx%hd\n", pDraw->x,
-		  pDraw->y, pDraw->width, pDraw->height);
-	  ErrorF ("\twindPlace: (%ld, %ld) - %ldx%ld\n", pRect->left,
-		  pRect->top, pRect->right - pRect->left,
-		  pRect->bottom - pRect->top);
-	  if (GetClientRect (hwnd, &rc))
-	    {
-	      pRect = &rc;
-	      ErrorF ("\tClientRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
-		      pRect->top, pRect->right - pRect->left,
-		      pRect->bottom - pRect->top);
-	    }
-	  if (GetWindowRect (hwnd, &rc))
-	    {
-	      pRect = &rc;
-	      ErrorF ("\tWindowRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
-		      pRect->top, pRect->right - pRect->left,
-		      pRect->bottom - pRect->top);
-	    }
-	  ErrorF ("\n");
-	}
+        if (wParam == VK_ESCAPE) {
+            /* Place for debug: put any tests and dumps here */
+            WINDOWPLACEMENT windPlace;
+            RECT rc;
+            LPRECT pRect;
+
+            windPlace.length = sizeof(WINDOWPLACEMENT);
+            GetWindowPlacement(hwnd, &windPlace);
+            pRect = &windPlace.rcNormalPosition;
+            ErrorF("\nCYGWINDOWING Dump:\n"
+                   "\tdrawable: (%hd, %hd) - %hdx%hd\n", pDraw->x,
+                   pDraw->y, pDraw->width, pDraw->height);
+            ErrorF("\twindPlace: (%ld, %ld) - %ldx%ld\n", pRect->left,
+                   pRect->top, pRect->right - pRect->left,
+                   pRect->bottom - pRect->top);
+            if (GetClientRect(hwnd, &rc)) {
+                pRect = &rc;
+                ErrorF("\tClientRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
+                       pRect->top, pRect->right - pRect->left,
+                       pRect->bottom - pRect->top);
+            }
+            if (GetWindowRect(hwnd, &rc)) {
+                pRect = &rc;
+                ErrorF("\tWindowRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
+                       pRect->top, pRect->right - pRect->left,
+                       pRect->bottom - pRect->top);
+            }
+            ErrorF("\n");
+        }
 #endif
-      
-      /* Pass the message to the root window */
-      return winWindowProc(hwndScreen, message, wParam, lParam);
+
+        /* Pass the message to the root window */
+        return winWindowProc(hwndScreen, message, wParam, lParam);
 
     case WM_SYSKEYUP:
     case WM_KEYUP:
 
-
-      /* Pass the message to the root window */
-      return winWindowProc(hwndScreen, message, wParam, lParam);
+        /* Pass the message to the root window */
+        return winWindowProc(hwndScreen, message, wParam, lParam);
 
     case WM_HOTKEY:
 
-      /* Pass the message to the root window */
-      SendMessage (hwndScreen, message, wParam, lParam);
-      return 0;
+        /* Pass the message to the root window */
+        SendMessage(hwndScreen, message, wParam, lParam);
+        return 0;
 
     case WM_ACTIVATE:
 
-      /* Pass the message to the root window */
-      SendMessage (hwndScreen, message, wParam, lParam);
-
-      if (LOWORD(wParam) != WA_INACTIVE)
-	{
-	  /* Raise the window to the top in Z order */
-          /* ago: Activate does not mean putting it to front! */
-          /*
-	  wmMsg.msg = WM_WM_RAISE;
-	  if (fWMMsgInitialized)
-	    winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
-          */
-	  
-	  /* Tell our Window Manager thread to activate the window */
-	  wmMsg.msg = WM_WM_ACTIVATE;
-	  if (fWMMsgInitialized)
-	    if (!pWin || !pWin->overrideRedirect) /* for OOo menus */
-	      winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
-	}
-      /* Prevent the mouse wheel from stalling when another window is minimized */
-      if (HIWORD(wParam) == 0 && LOWORD(wParam) == WA_ACTIVE &&
-	  (HWND)lParam != NULL && (HWND)lParam != (HWND)GetParent(hwnd))
-	SetFocus(hwnd);
-      return 0;
+        /* Pass the message to the root window */
+        SendMessage(hwndScreen, message, wParam, lParam);
+
+        if (LOWORD(wParam) != WA_INACTIVE) {
+            /* Raise the window to the top in Z order */
+            /* ago: Activate does not mean putting it to front! */
+            /*
+               wmMsg.msg = WM_WM_RAISE;
+               if (fWMMsgInitialized)
+               winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
+             */
+
+            /* Tell our Window Manager thread to activate the window */
+            wmMsg.msg = WM_WM_ACTIVATE;
+            if (fWMMsgInitialized)
+                if (!pWin || !pWin->overrideRedirect)   /* for OOo menus */
+                    winSendMessageToWM(s_pScreenPriv->pWMInfo, &wmMsg);
+        }
+        /* Prevent the mouse wheel from stalling when another window is minimized */
+        if (HIWORD(wParam) == 0 && LOWORD(wParam) == WA_ACTIVE &&
+            (HWND) lParam != NULL && (HWND) lParam != (HWND) GetParent(hwnd))
+            SetFocus(hwnd);
+        return 0;
 
     case WM_ACTIVATEAPP:
-      /*
-       * This message is also sent to the root window
-       * so we do nothing for individual multiwindow windows
-       */
-      break;
+        /*
+         * This message is also sent to the root window
+         * so we do nothing for individual multiwindow windows
+         */
+        break;
 
     case WM_CLOSE:
-      /* Branch on if the window was killed in X already */
-      if (pWinPriv->fXKilled)
-        {
-	  /* Window was killed, go ahead and destroy the window */
-	  DestroyWindow (hwnd);
-	}
-      else
-	{
-	  /* Tell our Window Manager thread to kill the window */
-	  wmMsg.msg = WM_WM_KILL;
-	  if (fWMMsgInitialized)
-	    winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
-	}
-      return 0;
+        /* Branch on if the window was killed in X already */
+        if (pWinPriv->fXKilled) {
+            /* Window was killed, go ahead and destroy the window */
+            DestroyWindow(hwnd);
+        }
+        else {
+            /* Tell our Window Manager thread to kill the window */
+            wmMsg.msg = WM_WM_KILL;
+            if (fWMMsgInitialized)
+                winSendMessageToWM(s_pScreenPriv->pWMInfo, &wmMsg);
+        }
+        return 0;
 
     case WM_DESTROY:
 
-      /* Branch on if the window was killed in X already */
-      if (pWinPriv && !pWinPriv->fXKilled)
-	{
-	  ErrorF ("winTopLevelWindowProc - WM_DESTROY - WM_WM_KILL\n");
-	  
-	  /* Tell our Window Manager thread to kill the window */
-	  wmMsg.msg = WM_WM_KILL;
-	  if (fWMMsgInitialized)
-	    winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
-	}
+        /* Branch on if the window was killed in X already */
+        if (pWinPriv && !pWinPriv->fXKilled) {
+            ErrorF("winTopLevelWindowProc - WM_DESTROY - WM_WM_KILL\n");
+
+            /* Tell our Window Manager thread to kill the window */
+            wmMsg.msg = WM_WM_KILL;
+            if (fWMMsgInitialized)
+                winSendMessageToWM(s_pScreenPriv->pWMInfo, &wmMsg);
+        }
 
-      RemoveProp (hwnd, WIN_WINDOW_PROP);
-      RemoveProp (hwnd, WIN_WID_PROP);
-      RemoveProp (hwnd, WIN_NEEDMANAGE_PROP);
+        RemoveProp(hwnd, WIN_WINDOW_PROP);
+        RemoveProp(hwnd, WIN_WID_PROP);
+        RemoveProp(hwnd, WIN_NEEDMANAGE_PROP);
 
-      break;
+        break;
 
     case WM_MOVE:
-      /* Adjust the X Window to the moved Windows window */
-      winAdjustXWindow (pWin, hwnd);
-      return 0;
+        /* Adjust the X Window to the moved Windows window */
+        winAdjustXWindow(pWin, hwnd);
+        return 0;
 
     case WM_SHOWWINDOW:
-      /* Bail out if the window is being hidden */
-      if (!wParam)
-	return 0;
-
-      /* */
-      if (!pWin->overrideRedirect)
-	{
-	  /* Flag that this window needs to be made active when clicked */
-	  SetProp (hwnd, WIN_NEEDMANAGE_PROP, (HANDLE) 1);
-
-	  if (!(GetWindowLongPtr (hwnd, GWL_EXSTYLE) & WS_EX_APPWINDOW))
-	    {
-	      HWND		zstyle = HWND_NOTOPMOST;
-
-	      /* Set the window extended style flags */
-	      SetWindowLongPtr (hwnd, GWL_EXSTYLE, WS_EX_APPWINDOW);
-
-	      /* Set the transient style flags */
-	      if (GetParent(hwnd)) SetWindowLongPtr (hwnd, GWL_STYLE,
-		   WS_POPUP | WS_OVERLAPPED | WS_SYSMENU | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
-	      /* Set the window standard style flags */
-	      else SetWindowLongPtr (hwnd, GWL_STYLE,
-		   (WS_POPUP | WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS)
-		   & ~WS_CAPTION & ~WS_SIZEBOX);
-
-	      winUpdateWindowPosition (hwnd, FALSE, &zstyle);
-
-              {
-                WinXWMHints hints;
-                if (winMultiWindowGetWMHints(pWin, &hints))
-                  {
-                    /*
-                      Give the window focus, unless it has an InputHint
-                      which is FALSE (this is used by e.g. glean to
-                      avoid every test window grabbing the focus)
-                     */
-                    if (!((hints.flags & InputHint) && (!hints.input)))
-                      {
-                        SetForegroundWindow (hwnd);
-                      }
-                  }
-              }
-	    }
-	  wmMsg.msg = WM_WM_MAP3;
-	}
-      else /* It is an overridden window so make it top of Z stack */
-	{
-	  HWND forHwnd = GetForegroundWindow();
+        /* Bail out if the window is being hidden */
+        if (!wParam)
+            return 0;
+
+        /* */
+        if (!pWin->overrideRedirect) {
+            /* Flag that this window needs to be made active when clicked */
+            SetProp(hwnd, WIN_NEEDMANAGE_PROP, (HANDLE) 1);
+
+            if (!(GetWindowLongPtr(hwnd, GWL_EXSTYLE) & WS_EX_APPWINDOW)) {
+                HWND zstyle = HWND_NOTOPMOST;
+
+                /* Set the window extended style flags */
+                SetWindowLongPtr(hwnd, GWL_EXSTYLE, WS_EX_APPWINDOW);
+
+                /* Set the transient style flags */
+                if (GetParent(hwnd))
+                    SetWindowLongPtr(hwnd, GWL_STYLE,
+                                     WS_POPUP | WS_OVERLAPPED | WS_SYSMENU |
+                                     WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
+                /* Set the window standard style flags */
+                else
+                    SetWindowLongPtr(hwnd, GWL_STYLE,
+                                     (WS_POPUP | WS_OVERLAPPEDWINDOW |
+                                      WS_CLIPCHILDREN | WS_CLIPSIBLINGS)
+                                     & ~WS_CAPTION & ~WS_SIZEBOX);
+
+                winUpdateWindowPosition(hwnd, FALSE, &zstyle);
+
+                {
+                    WinXWMHints hints;
+
+                    if (winMultiWindowGetWMHints(pWin, &hints)) {
+                        /*
+                           Give the window focus, unless it has an InputHint
+                           which is FALSE (this is used by e.g. glean to
+                           avoid every test window grabbing the focus)
+                         */
+                        if (!((hints.flags & InputHint) && (!hints.input))) {
+                            SetForegroundWindow(hwnd);
+                        }
+                    }
+                }
+            }
+            wmMsg.msg = WM_WM_MAP3;
+        }
+        else {                  /* It is an overridden window so make it top of Z stack */
+
+            HWND forHwnd = GetForegroundWindow();
+
 #if CYGWINDOWING_DEBUG
-	  ErrorF ("overridden window is shown\n");
+            ErrorF("overridden window is shown\n");
 #endif
-	  if (forHwnd != NULL)
-	  {
-	    if (GetWindowLongPtr(forHwnd, GWLP_USERDATA) & (LONG_PTR)XMING_SIGNATURE)
-	    {
-	      if (GetWindowLongPtr(forHwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)
-		SetWindowPos (hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
-	      else
-		SetWindowPos (hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
-	    }
-	  }
-	  wmMsg.msg = WM_WM_MAP2;
-	}
-	  
-      /* Tell our Window Manager thread to map the window */
-      if (fWMMsgInitialized)
-	winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
-
-      winStartMousePolling(s_pScreenPriv);
-
-      return 0;
+            if (forHwnd != NULL) {
+                if (GetWindowLongPtr(forHwnd, GWLP_USERDATA) & (LONG_PTR)
+                    XMING_SIGNATURE) {
+                    if (GetWindowLongPtr(forHwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)
+                        SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
+                                     SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+                    else
+                        SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0,
+                                     SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+                }
+            }
+            wmMsg.msg = WM_WM_MAP2;
+        }
+
+        /* Tell our Window Manager thread to map the window */
+        if (fWMMsgInitialized)
+            winSendMessageToWM(s_pScreenPriv->pWMInfo, &wmMsg);
+
+        winStartMousePolling(s_pScreenPriv);
+
+        return 0;
 
     case WM_SIZING:
-      /* Need to legalize the size according to WM_NORMAL_HINTS */
-      /* for applications like xterm */
-      return ValidateSizing (hwnd, pWin, wParam, lParam);
+        /* Need to legalize the size according to WM_NORMAL_HINTS */
+        /* for applications like xterm */
+        return ValidateSizing(hwnd, pWin, wParam, lParam);
 
     case WM_WINDOWPOSCHANGED:
-      {
-	LPWINDOWPOS pWinPos = (LPWINDOWPOS) lParam;
+    {
+        LPWINDOWPOS pWinPos = (LPWINDOWPOS) lParam;
 
-	if (!(pWinPos->flags & SWP_NOZORDER))
-	  {
+        if (!(pWinPos->flags & SWP_NOZORDER)) {
 #if CYGWINDOWING_DEBUG
-	    winDebug ("\twindow z order was changed\n");
+            winDebug("\twindow z order was changed\n");
 #endif
-	    if (pWinPos->hwndInsertAfter == HWND_TOP
-		||pWinPos->hwndInsertAfter == HWND_TOPMOST
-		||pWinPos->hwndInsertAfter == HWND_NOTOPMOST)
-	      {
+            if (pWinPos->hwndInsertAfter == HWND_TOP
+                || pWinPos->hwndInsertAfter == HWND_TOPMOST
+                || pWinPos->hwndInsertAfter == HWND_NOTOPMOST) {
 #if CYGWINDOWING_DEBUG
-		winDebug ("\traise to top\n");
+                winDebug("\traise to top\n");
 #endif
-		/* Raise the window to the top in Z order */
-		winRaiseWindow(pWin);
-	      }
-	    else if (pWinPos->hwndInsertAfter == HWND_BOTTOM)
-	      {
-	      }
-	    else
-	      {
-		/* Check if this window is top of X windows. */
-		HWND hWndAbove = NULL;
-		DWORD dwCurrentProcessID = GetCurrentProcessId ();
-		DWORD dwWindowProcessID = 0;
-
-		for (hWndAbove = pWinPos->hwndInsertAfter;
-		     hWndAbove != NULL;
-		     hWndAbove = GetNextWindow (hWndAbove, GW_HWNDPREV))
-		  {
-		    /* Ignore other XWin process's window */
-		    GetWindowThreadProcessId (hWndAbove, &dwWindowProcessID);
-
-		    if ((dwWindowProcessID == dwCurrentProcessID)
-			&& GetProp (hWndAbove, WIN_WINDOW_PROP)
-			&& !IsWindowVisible (hWndAbove)
-			&& !IsIconic (hWndAbove) ) /* ignore minimized windows */
-		      break;
-		  }
-		/* If this is top of X windows in Windows stack,
-		   raise it in X stack. */
-		if (hWndAbove == NULL)
-		  {
+                /* Raise the window to the top in Z order */
+                winRaiseWindow(pWin);
+            }
+            else if (pWinPos->hwndInsertAfter == HWND_BOTTOM) {
+            }
+            else {
+                /* Check if this window is top of X windows. */
+                HWND hWndAbove = NULL;
+                DWORD dwCurrentProcessID = GetCurrentProcessId();
+                DWORD dwWindowProcessID = 0;
+
+                for (hWndAbove = pWinPos->hwndInsertAfter;
+                     hWndAbove != NULL;
+                     hWndAbove = GetNextWindow(hWndAbove, GW_HWNDPREV)) {
+                    /* Ignore other XWin process's window */
+                    GetWindowThreadProcessId(hWndAbove, &dwWindowProcessID);
+
+                    if ((dwWindowProcessID == dwCurrentProcessID)
+                        && GetProp(hWndAbove, WIN_WINDOW_PROP)
+                        && !IsWindowVisible(hWndAbove)
+                        && !IsIconic(hWndAbove))        /* ignore minimized windows */
+                        break;
+                }
+                /* If this is top of X windows in Windows stack,
+                   raise it in X stack. */
+                if (hWndAbove == NULL) {
 #if CYGWINDOWING_DEBUG
-		    winDebug ("\traise to top\n");
+                    winDebug("\traise to top\n");
 #endif
-		    winRaiseWindow(pWin);
-		  }
-	      }
-	  }
-      }
-      /*
-       * Pass the message to DefWindowProc to let the function
-       * break down WM_WINDOWPOSCHANGED to WM_MOVE and WM_SIZE.
-      */
-      break; 
+                    winRaiseWindow(pWin);
+                }
+            }
+        }
+    }
+        /*
+         * Pass the message to DefWindowProc to let the function
+         * break down WM_WINDOWPOSCHANGED to WM_MOVE and WM_SIZE.
+         */
+        break;
 
     case WM_SIZE:
-      /* see dix/window.c */
+        /* see dix/window.c */
 #if CYGWINDOWING_DEBUG
-      {
-	char buf[64];
-	switch (wParam)
-	  {
-	  case SIZE_MINIMIZED:
-	    strcpy(buf, "SIZE_MINIMIZED");
-	    break;
-	  case SIZE_MAXIMIZED:
-	    strcpy(buf, "SIZE_MAXIMIZED");
-	    break;
-	  case SIZE_RESTORED:
-	    strcpy(buf, "SIZE_RESTORED");
-	    break;
-	  default:
-	    strcpy(buf, "UNKNOWN_FLAG");
-	  }
-	ErrorF ("winTopLevelWindowProc - WM_SIZE to %dx%d (%s) - %d ms\n",
-		(int)LOWORD(lParam), (int)HIWORD(lParam), buf,
-		(int)(GetTickCount ()));
-      }
+    {
+        char buf[64];
+
+        switch (wParam) {
+        case SIZE_MINIMIZED:
+            strcpy(buf, "SIZE_MINIMIZED");
+            break;
+        case SIZE_MAXIMIZED:
+            strcpy(buf, "SIZE_MAXIMIZED");
+            break;
+        case SIZE_RESTORED:
+            strcpy(buf, "SIZE_RESTORED");
+            break;
+        default:
+            strcpy(buf, "UNKNOWN_FLAG");
+        }
+        ErrorF("winTopLevelWindowProc - WM_SIZE to %dx%d (%s) - %d ms\n",
+               (int) LOWORD(lParam), (int) HIWORD(lParam), buf,
+               (int) (GetTickCount()));
+    }
 #endif
-      /* Adjust the X Window to the moved Windows window */
-      winAdjustXWindow (pWin, hwnd);
-      return 0; /* end of WM_SIZE handler */
+        /* Adjust the X Window to the moved Windows window */
+        winAdjustXWindow(pWin, hwnd);
+        return 0;               /* end of WM_SIZE handler */
 
     case WM_STYLECHANGING:
-      /*
-        When the style changes, adjust the Windows window size so the client area remains the same size,
-        and adjust the Windows window position so that the client area remains in the same place.
-      */
-      {
+        /*
+           When the style changes, adjust the Windows window size so the client area remains the same size,
+           and adjust the Windows window position so that the client area remains in the same place.
+         */
+    {
         RECT newWinRect;
         DWORD dwExStyle;
         DWORD dwStyle;
-        DWORD newStyle = ((STYLESTRUCT *)lParam)->styleNew;
+        DWORD newStyle = ((STYLESTRUCT *) lParam)->styleNew;
         WINDOWINFO wi;
 
-        dwExStyle = GetWindowLongPtr (hwnd, GWL_EXSTYLE);
-        dwStyle = GetWindowLongPtr (hwnd, GWL_STYLE);
+        dwExStyle = GetWindowLongPtr(hwnd, GWL_EXSTYLE);
+        dwStyle = GetWindowLongPtr(hwnd, GWL_STYLE);
 
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGING from %08x %08x\n", dwStyle, dwExStyle);
+        winDebug("winTopLevelWindowProc - WM_STYLECHANGING from %08x %08x\n",
+                 dwStyle, dwExStyle);
 
         if (wParam == GWL_EXSTYLE)
-          dwExStyle = newStyle;
+            dwExStyle = newStyle;
 
         if (wParam == GWL_STYLE)
-          dwStyle = newStyle;
+            dwStyle = newStyle;
 
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGING to %08x %08x\n", dwStyle, dwExStyle);
+        winDebug("winTopLevelWindowProc - WM_STYLECHANGING to %08x %08x\n",
+                 dwStyle, dwExStyle);
 
         /* Get client rect in screen coordinates */
         wi.cbSize = sizeof(WINDOWINFO);
         GetWindowInfo(hwnd, &wi);
 
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGING client area {%d, %d, %d, %d}, {%d x %d}\n", wi.rcClient.left, wi.rcClient.top, wi.rcClient.right, wi.rcClient.bottom, wi.rcClient.right - wi.rcClient.left, wi.rcClient.bottom - wi.rcClient.top);
+        winDebug
+            ("winTopLevelWindowProc - WM_STYLECHANGING client area {%d, %d, %d, %d}, {%d x %d}\n",
+             wi.rcClient.left, wi.rcClient.top, wi.rcClient.right,
+             wi.rcClient.bottom, wi.rcClient.right - wi.rcClient.left,
+             wi.rcClient.bottom - wi.rcClient.top);
 
         newWinRect = wi.rcClient;
         if (!AdjustWindowRectEx(&newWinRect, dwStyle, FALSE, dwExStyle))
-          winDebug("winTopLevelWindowProc - WM_STYLECHANGING AdjustWindowRectEx failed\n");
+            winDebug
+                ("winTopLevelWindowProc - WM_STYLECHANGING AdjustWindowRectEx failed\n");
 
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGING window area should be {%d, %d, %d, %d}, {%d x %d}\n", newWinRect.left, newWinRect.top, newWinRect.right, newWinRect.bottom, newWinRect.right - newWinRect.left, newWinRect.bottom - newWinRect.top);
+        winDebug
+            ("winTopLevelWindowProc - WM_STYLECHANGING window area should be {%d, %d, %d, %d}, {%d x %d}\n",
+             newWinRect.left, newWinRect.top, newWinRect.right,
+             newWinRect.bottom, newWinRect.right - newWinRect.left,
+             newWinRect.bottom - newWinRect.top);
 
         /*
-          Style change hasn't happened yet, so we can't adjust the window size yet, as the winAdjustXWindow()
-          which WM_SIZE does will use the current (unchanged) style.  Instead make a note to change it when
-          WM_STYLECHANGED is received...
-        */
+           Style change hasn't happened yet, so we can't adjust the window size yet, as the winAdjustXWindow()
+           which WM_SIZE does will use the current (unchanged) style.  Instead make a note to change it when
+           WM_STYLECHANGED is received...
+         */
         pWinPriv->hDwp = BeginDeferWindowPos(1);
-        pWinPriv->hDwp = DeferWindowPos(pWinPriv->hDwp, hwnd, NULL, newWinRect.left, newWinRect.top, newWinRect.right - newWinRect.left, newWinRect.bottom - newWinRect.top, SWP_NOACTIVATE | SWP_NOZORDER);
-      }
-      return 0;
+        pWinPriv->hDwp =
+            DeferWindowPos(pWinPriv->hDwp, hwnd, NULL, newWinRect.left,
+                           newWinRect.top, newWinRect.right - newWinRect.left,
+                           newWinRect.bottom - newWinRect.top,
+                           SWP_NOACTIVATE | SWP_NOZORDER);
+    }
+        return 0;
 
     case WM_STYLECHANGED:
-      {
-        if (pWinPriv->hDwp)
-          {
+    {
+        if (pWinPriv->hDwp) {
             EndDeferWindowPos(pWinPriv->hDwp);
             pWinPriv->hDwp = NULL;
-          }
+        }
         winDebug("winTopLevelWindowProc - WM_STYLECHANGED done\n");
-      }
-      return 0;
+    }
+        return 0;
 
     case WM_MOUSEACTIVATE:
 
-      /* Check if this window needs to be made active when clicked */
-      if (!GetProp (pWinPriv->hWnd, WIN_NEEDMANAGE_PROP))
-	{
+        /* Check if this window needs to be made active when clicked */
+        if (!GetProp(pWinPriv->hWnd, WIN_NEEDMANAGE_PROP)) {
 #if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("winTopLevelWindowProc - WM_MOUSEACTIVATE - "
-		  "MA_NOACTIVATE\n");
+            ErrorF("winTopLevelWindowProc - WM_MOUSEACTIVATE - "
+                   "MA_NOACTIVATE\n");
 #endif
 
-	  /* */
-	  return MA_NOACTIVATE;
-	}
-      break;
+            /* */
+            return MA_NOACTIVATE;
+        }
+        break;
 
     case WM_SETCURSOR:
-      if (LOWORD(lParam) == HTCLIENT)
-	{
-	  if (!g_fSoftwareCursor) SetCursor (s_pScreenPriv->cursor.handle);
-	  return TRUE;
-	}
-      break;
+        if (LOWORD(lParam) == HTCLIENT) {
+            if (!g_fSoftwareCursor)
+                SetCursor(s_pScreenPriv->cursor.handle);
+            return TRUE;
+        }
+        break;
 
     default:
-      break;
+        break;
     }
 
-  ret = DefWindowProc (hwnd, message, wParam, lParam);
-  /*
-   * If the window was minized we get the stack change before the window is restored
-   * and so it gets lost. Ensure there stacking order is correct.
-   */
-  if (needRestack)
-    winReorderWindowsMultiWindow();
-  return ret;
+    ret = DefWindowProc(hwnd, message, wParam, lParam);
+    /*
+     * If the window was minized we get the stack change before the window is restored
+     * and so it gets lost. Ensure there stacking order is correct.
+     */
+    if (needRestack)
+        winReorderWindowsMultiWindow();
+    return ret;
 }
diff --git a/xorg-server/hw/xwin/winnativegdi.c b/xorg-server/hw/xwin/winnativegdi.c
index 68f802005..8a1455b90 100644
--- a/xorg-server/hw/xwin/winnativegdi.c
+++ b/xorg-server/hw/xwin/winnativegdi.c
@@ -33,76 +33,69 @@
 #endif
 #include "win.h"
 
-
 /*
  * Local function prototypes
  */
 
 static Bool
-winAllocateFBNativeGDI (ScreenPtr pScreen);
+ winAllocateFBNativeGDI(ScreenPtr pScreen);
 
 static void
-winShadowUpdateNativeGDI (ScreenPtr pScreen, 
-			  shadowBufPtr pBuf);
+ winShadowUpdateNativeGDI(ScreenPtr pScreen, shadowBufPtr pBuf);
 
 static Bool
-winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen);
+ winCloseScreenNativeGDI(int nIndex, ScreenPtr pScreen);
 
 static Bool
-winInitVisualsNativeGDI (ScreenPtr pScreen);
+ winInitVisualsNativeGDI(ScreenPtr pScreen);
 
 static Bool
-winAdjustVideoModeNativeGDI (ScreenPtr pScreen);
+ winAdjustVideoModeNativeGDI(ScreenPtr pScreen);
 
 #if 0
 static Bool
-winBltExposedRegionsNativeGDI (ScreenPtr pScreen);
+ winBltExposedRegionsNativeGDI(ScreenPtr pScreen);
 #endif
 
 static Bool
-winActivateAppNativeGDI (ScreenPtr pScreen);
+ winActivateAppNativeGDI(ScreenPtr pScreen);
 
 static Bool
-winRedrawScreenNativeGDI (ScreenPtr pScreen);
+ winRedrawScreenNativeGDI(ScreenPtr pScreen);
 
 static Bool
-winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen);
+ winRealizeInstalledPaletteNativeGDI(ScreenPtr pScreen);
 
 static Bool
-winInstallColormapNativeGDI (ColormapPtr pColormap);
+ winInstallColormapNativeGDI(ColormapPtr pColormap);
 
 static Bool
-winStoreColorsNativeGDI (ColormapPtr pmap, 
-			 int ndef,
-			 xColorItem *pdefs);
+ winStoreColorsNativeGDI(ColormapPtr pmap, int ndef, xColorItem * pdefs);
 
 static Bool
-winCreateColormapNativeGDI (ColormapPtr pColormap);
+ winCreateColormapNativeGDI(ColormapPtr pColormap);
 
 static Bool
-winDestroyColormapNativeGDI (ColormapPtr pColormap);
-
-
+ winDestroyColormapNativeGDI(ColormapPtr pColormap);
 
 static Bool
-winAllocateFBNativeGDI (ScreenPtr pScreen)
+winAllocateFBNativeGDI(ScreenPtr pScreen)
 {
-  FatalError ("winAllocateFBNativeGDI\n");
+    FatalError("winAllocateFBNativeGDI\n");
 
-  return TRUE;
+    return TRUE;
 }
 
 static void
-winFreeFBNativeGDI (ScreenPtr pScreen)
+winFreeFBNativeGDI(ScreenPtr pScreen)
 {
-  FatalError ("winFreeFBNativeGDI\n");
+    FatalError("winFreeFBNativeGDI\n");
 }
 
-
 static Bool
 winInitScreenNativeGDI(ScreenPtr pScreen)
 {
-  FatalError ("winInitScreenNativeGDI\n");
+    FatalError("winInitScreenNativeGDI\n");
 }
 
 /*
@@ -111,425 +104,389 @@ winInitScreenNativeGDI(ScreenPtr pScreen)
  */
 
 static Bool
-winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)
+winCloseScreenNativeGDI(int nIndex, ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-
-  ErrorF ("winCloseScreenNativeGDI - Freeing screen resources\n");
-
-  /* Flag that the screen is closed */
-  pScreenPriv->fClosed = TRUE;
-  pScreenPriv->fActive = FALSE;
-
-  /* 
-   * NOTE: mi doesn't use a CloseScreen procedure, so we do not
-   * need to call a wrapped procedure here.
-   */
-
-  /* Delete the window property */
-  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);
-  
-  ErrorF ("winCloseScreenNativeGDI - Destroying window\n");
-  
-  /* Delete tray icon, if we have one */
-  if (!pScreenInfo->fNoTrayIcon)
-    winDeleteNotifyIcon (pScreenPriv);
-
-  /* Free the exit confirmation dialog box, if it exists */
-  if (g_hDlgExit != NULL)
-    {
-      DestroyWindow (g_hDlgExit);
-      g_hDlgExit = NULL;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    ErrorF("winCloseScreenNativeGDI - Freeing screen resources\n");
+
+    /* Flag that the screen is closed */
+    pScreenPriv->fClosed = TRUE;
+    pScreenPriv->fActive = FALSE;
+
+    /* 
+     * NOTE: mi doesn't use a CloseScreen procedure, so we do not
+     * need to call a wrapped procedure here.
+     */
+
+    /* Delete the window property */
+    RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);
+
+    ErrorF("winCloseScreenNativeGDI - Destroying window\n");
+
+    /* Delete tray icon, if we have one */
+    if (!pScreenInfo->fNoTrayIcon)
+        winDeleteNotifyIcon(pScreenPriv);
+
+    /* Free the exit confirmation dialog box, if it exists */
+    if (g_hDlgExit != NULL) {
+        DestroyWindow(g_hDlgExit);
+        g_hDlgExit = NULL;
     }
 
-  /* Kill our window */
-  if (pScreenPriv->hwndScreen)
-    {
-      DestroyWindow (pScreenPriv->hwndScreen);
-      pScreenPriv->hwndScreen = NULL;
+    /* Kill our window */
+    if (pScreenPriv->hwndScreen) {
+        DestroyWindow(pScreenPriv->hwndScreen);
+        pScreenPriv->hwndScreen = NULL;
     }
 
-  /* Invalidate our screeninfo's pointer to the screen */
-  pScreenInfo->pScreen = NULL;
+    /* Invalidate our screeninfo's pointer to the screen */
+    pScreenInfo->pScreen = NULL;
 
-  /* Free the screen privates for this screen */
-  free (pScreenPriv);
+    /* Free the screen privates for this screen */
+    free(pScreenPriv);
 
-  ErrorF ("winCloseScreenNativeGDI - Returning\n");
+    ErrorF("winCloseScreenNativeGDI - Returning\n");
 
-  return TRUE;
+    return TRUE;
 }
 
-
 static void
-winShadowUpdateNativeGDI (ScreenPtr pScreen, 
-			  shadowBufPtr pBuf)
+winShadowUpdateNativeGDI(ScreenPtr pScreen, shadowBufPtr pBuf)
 {
-  FatalError ("winShadowUpdateNativeGDI\n");
-  return;
+    FatalError("winShadowUpdateNativeGDI\n");
+    return;
 }
 
-
 static Bool
-winInitVisualsNativeGDI (ScreenPtr pScreen)
+winInitVisualsNativeGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
 
-  /* Set the bitsPerRGB and bit masks */
-  switch (pScreenInfo->dwDepth)
-    {
+    /* Set the bitsPerRGB and bit masks */
+    switch (pScreenInfo->dwDepth) {
     case 24:
-      pScreenPriv->dwBitsPerRGB = 8;
-      pScreenPriv->dwRedMask = 0x00FF0000;
-      pScreenPriv->dwGreenMask = 0x0000FF00;
-      pScreenPriv->dwBlueMask = 0x000000FF;
-      break;
-      
+        pScreenPriv->dwBitsPerRGB = 8;
+        pScreenPriv->dwRedMask = 0x00FF0000;
+        pScreenPriv->dwGreenMask = 0x0000FF00;
+        pScreenPriv->dwBlueMask = 0x000000FF;
+        break;
+
     case 16:
-      pScreenPriv->dwBitsPerRGB = 6;
-      pScreenPriv->dwRedMask = 0xF800;
-      pScreenPriv->dwGreenMask = 0x07E0;
-      pScreenPriv->dwBlueMask = 0x001F;
-      break;
-      
+        pScreenPriv->dwBitsPerRGB = 6;
+        pScreenPriv->dwRedMask = 0xF800;
+        pScreenPriv->dwGreenMask = 0x07E0;
+        pScreenPriv->dwBlueMask = 0x001F;
+        break;
+
     case 15:
-      pScreenPriv->dwBitsPerRGB = 5;
-      pScreenPriv->dwRedMask = 0x7C00;
-      pScreenPriv->dwGreenMask = 0x03E0;
-      pScreenPriv->dwBlueMask = 0x001F;
-      break;
-      
+        pScreenPriv->dwBitsPerRGB = 5;
+        pScreenPriv->dwRedMask = 0x7C00;
+        pScreenPriv->dwGreenMask = 0x03E0;
+        pScreenPriv->dwBlueMask = 0x001F;
+        break;
+
     case 8:
-      pScreenPriv->dwBitsPerRGB = 8;
-      pScreenPriv->dwRedMask = 0;
-      pScreenPriv->dwGreenMask = 0;
-      pScreenPriv->dwBlueMask = 0;
-      break;
+        pScreenPriv->dwBitsPerRGB = 8;
+        pScreenPriv->dwRedMask = 0;
+        pScreenPriv->dwGreenMask = 0;
+        pScreenPriv->dwBlueMask = 0;
+        break;
 
     default:
-      ErrorF ("winInitVisualsNativeGDI - Unknown screen depth\n");
-      return FALSE;
-      break;
+        ErrorF("winInitVisualsNativeGDI - Unknown screen depth\n");
+        return FALSE;
+        break;
     }
 
-  /* Tell the user how many bits per RGB we are using */
-  ErrorF ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",
-	  (int) pScreenPriv->dwBitsPerRGB);
+    /* Tell the user how many bits per RGB we are using */
+    ErrorF("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",
+           (int) pScreenPriv->dwBitsPerRGB);
 
-  /* Create a single visual according to the Windows screen depth */
-  switch (pScreenInfo->dwDepth)
-    {
+    /* Create a single visual according to the Windows screen depth */
+    switch (pScreenInfo->dwDepth) {
     case 24:
     case 16:
     case 15:
-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
-				     TrueColorMask,
-				     pScreenPriv->dwBitsPerRGB,
-				     TrueColor,
-				     pScreenPriv->dwRedMask,
-				     pScreenPriv->dwGreenMask,
-				     pScreenPriv->dwBlueMask))
-	{
-	  ErrorF ("winInitVisuals - miSetVisualTypesAndMasks failed\n");
-	  return FALSE;
-	}
-      break;
+        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
+                                      TrueColorMask,
+                                      pScreenPriv->dwBitsPerRGB,
+                                      TrueColor,
+                                      pScreenPriv->dwRedMask,
+                                      pScreenPriv->dwGreenMask,
+                                      pScreenPriv->dwBlueMask)) {
+            ErrorF("winInitVisuals - miSetVisualTypesAndMasks failed\n");
+            return FALSE;
+        }
+        break;
 
     case 8:
-      ErrorF ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
-				     StaticColorMask,
-				     pScreenPriv->dwBitsPerRGB,
-				     StaticColor,
-				     pScreenPriv->dwRedMask,
-				     pScreenPriv->dwGreenMask,
-				     pScreenPriv->dwBlueMask))
-	{
-	  ErrorF ("winInitVisuals - miSetVisualTypesAndMasks failed\n");
-	  return FALSE;
-	}
-      break;
+        ErrorF("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
+        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
+                                      StaticColorMask,
+                                      pScreenPriv->dwBitsPerRGB,
+                                      StaticColor,
+                                      pScreenPriv->dwRedMask,
+                                      pScreenPriv->dwGreenMask,
+                                      pScreenPriv->dwBlueMask)) {
+            ErrorF("winInitVisuals - miSetVisualTypesAndMasks failed\n");
+            return FALSE;
+        }
+        break;
 
     default:
-      ErrorF ("winInitVisualsNativeGDI - Unknown screen depth\n");
-      return FALSE;
+        ErrorF("winInitVisualsNativeGDI - Unknown screen depth\n");
+        return FALSE;
     }
 
 #if 1
-  ErrorF ("winInitVisualsNativeGDI - Returning\n");
+    ErrorF("winInitVisualsNativeGDI - Returning\n");
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /* Adjust the video mode */
 static Bool
-winAdjustVideoModeNativeGDI (ScreenPtr pScreen)
+winAdjustVideoModeNativeGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  HDC			hdc = NULL;
-  DWORD			dwBPP;
-  
-  hdc = GetDC (NULL);
-
-  /* We're in serious trouble if we can't get a DC */
-  if (hdc == NULL)
-    {
-      ErrorF ("winAdjustVideoModeNativeGDI - GetDC () failed\n");
-      return FALSE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HDC hdc = NULL;
+    DWORD dwBPP;
+
+    hdc = GetDC(NULL);
+
+    /* We're in serious trouble if we can't get a DC */
+    if (hdc == NULL) {
+        ErrorF("winAdjustVideoModeNativeGDI - GetDC () failed\n");
+        return FALSE;
     }
 
-  /* Query GDI for current display depth */
-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
-  pScreenInfo->dwDepth = GetDeviceCaps (hdc, PLANES);
+    /* Query GDI for current display depth */
+    dwBPP = GetDeviceCaps(hdc, BITSPIXEL);
+    pScreenInfo->dwDepth = GetDeviceCaps(hdc, PLANES);
 
-  switch (pScreenInfo->dwDepth) {
+    switch (pScreenInfo->dwDepth) {
     case 24:
     case 16:
     case 15:
     case 8:
-      break;
+        break;
     default:
-      if (dwBPP == 32)
-        pScreenInfo->dwDepth = 24;
-      else
-        pScreenInfo->dwDepth = dwBPP; 
-      break;
-  }
+        if (dwBPP == 32)
+            pScreenInfo->dwDepth = 24;
+        else
+            pScreenInfo->dwDepth = dwBPP;
+        break;
+    }
 
-  /* GDI cannot change the screen depth, so we'll use GDI's depth */
-  pScreenInfo->dwBPP = dwBPP;
+    /* GDI cannot change the screen depth, so we'll use GDI's depth */
+    pScreenInfo->dwBPP = dwBPP;
 
-  /* Release our DC */
-  ReleaseDC (NULL, hdc);
+    /* Release our DC */
+    ReleaseDC(NULL, hdc);
 
-  return TRUE;
+    return TRUE;
 }
 
-
 static Bool
-winActivateAppNativeGDI (ScreenPtr pScreen)
+winActivateAppNativeGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-
-  /*
-   * Are we active?
-   * Are we fullscreen?
-   */
-  if (pScreenPriv != NULL
-      && pScreenPriv->fActive
-      && pScreenPriv->pScreenInfo
-      && pScreenPriv->pScreenInfo->fFullScreen)
-    {
-      /*
-       * Activating, attempt to bring our window 
-       * to the top of the display
-       */
-      ShowWindow (pScreenPriv->hwndScreen, SW_RESTORE);
+    winScreenPriv(pScreen);
+
+    /*
+     * Are we active?
+     * Are we fullscreen?
+     */
+    if (pScreenPriv != NULL
+        && pScreenPriv->fActive
+        && pScreenPriv->pScreenInfo && pScreenPriv->pScreenInfo->fFullScreen) {
+        /*
+         * Activating, attempt to bring our window 
+         * to the top of the display
+         */
+        ShowWindow(pScreenPriv->hwndScreen, SW_RESTORE);
     }
 
-  /*
-   * Are we inactive?
-   * Are we fullscreen?
-   */
-  if (pScreenPriv != NULL
-      && !pScreenPriv->fActive
-      && pScreenPriv->pScreenInfo
-      && pScreenPriv->pScreenInfo->fFullScreen)
-    {
-      /*
-       * Deactivating, stuff our window onto the
-       * task bar.
-       */
-      ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);
+    /*
+     * Are we inactive?
+     * Are we fullscreen?
+     */
+    if (pScreenPriv != NULL
+        && !pScreenPriv->fActive
+        && pScreenPriv->pScreenInfo && pScreenPriv->pScreenInfo->fFullScreen) {
+        /*
+         * Deactivating, stuff our window onto the
+         * task bar.
+         */
+        ShowWindow(pScreenPriv->hwndScreen, SW_MINIMIZE);
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 HBITMAP
-winCreateDIBNativeGDI (int iWidth, int iHeight, int iDepth,
-		       BYTE **ppbBits, BITMAPINFO **ppbmi)
+winCreateDIBNativeGDI(int iWidth, int iHeight, int iDepth,
+                      BYTE ** ppbBits, BITMAPINFO ** ppbmi)
 {
-  BITMAPINFOHEADER	*pbmih = NULL;
-  HBITMAP		hBitmap = NULL;
-  BITMAPINFO		*pbmi = NULL;
-
-  /* Don't create an invalid bitmap */
-  if (iWidth == 0
-      || iHeight == 0
-      || iDepth == 0)
-    {
-      ErrorF ("\nwinCreateDIBNativeGDI - Invalid specs w %d h %d d %d\n\n",
-	      iWidth, iHeight, iDepth);
-      return NULL;
+    BITMAPINFOHEADER *pbmih = NULL;
+    HBITMAP hBitmap = NULL;
+    BITMAPINFO *pbmi = NULL;
+
+    /* Don't create an invalid bitmap */
+    if (iWidth == 0 || iHeight == 0 || iDepth == 0) {
+        ErrorF("\nwinCreateDIBNativeGDI - Invalid specs w %d h %d d %d\n\n",
+               iWidth, iHeight, iDepth);
+        return NULL;
     }
 
-  /* Allocate bitmap info header */
-  pbmih = (BITMAPINFOHEADER*) malloc (sizeof (BITMAPINFOHEADER)
-				      + 256 * sizeof (RGBQUAD));
-  if (pbmih == NULL)
-    {
-      ErrorF ("winCreateDIBNativeGDI - malloc () failed\n");
-      return FALSE;
+    /* Allocate bitmap info header */
+    pbmih = (BITMAPINFOHEADER *) malloc(sizeof(BITMAPINFOHEADER)
+                                        + 256 * sizeof(RGBQUAD));
+    if (pbmih == NULL) {
+        ErrorF("winCreateDIBNativeGDI - malloc () failed\n");
+        return FALSE;
     }
-  ZeroMemory (pbmih, sizeof(BITMAPINFOHEADER) + 256 * sizeof (RGBQUAD));
-
-  /* Describe bitmap to be created */
-  pbmih->biSize = sizeof (BITMAPINFOHEADER);
-  pbmih->biWidth = iWidth;
-  pbmih->biHeight = -iHeight;
-  pbmih->biPlanes = 1;
-  pbmih->biBitCount = iDepth;
-  pbmih->biCompression = BI_RGB;
-  pbmih->biSizeImage = 0;
-  pbmih->biXPelsPerMeter = 0;
-  pbmih->biYPelsPerMeter = 0;
-  pbmih->biClrUsed = 0;
-  pbmih->biClrImportant = 0;
-
-  /* Setup color table for mono DIBs */
-  if (iDepth == 1)
-    {
-      pbmi = (BITMAPINFO*) pbmih;
-      pbmi->bmiColors[1].rgbBlue = 255;
-      pbmi->bmiColors[1].rgbGreen = 255;
-      pbmi->bmiColors[1].rgbRed = 255;
+    ZeroMemory(pbmih, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD));
+
+    /* Describe bitmap to be created */
+    pbmih->biSize = sizeof(BITMAPINFOHEADER);
+    pbmih->biWidth = iWidth;
+    pbmih->biHeight = -iHeight;
+    pbmih->biPlanes = 1;
+    pbmih->biBitCount = iDepth;
+    pbmih->biCompression = BI_RGB;
+    pbmih->biSizeImage = 0;
+    pbmih->biXPelsPerMeter = 0;
+    pbmih->biYPelsPerMeter = 0;
+    pbmih->biClrUsed = 0;
+    pbmih->biClrImportant = 0;
+
+    /* Setup color table for mono DIBs */
+    if (iDepth == 1) {
+        pbmi = (BITMAPINFO *) pbmih;
+        pbmi->bmiColors[1].rgbBlue = 255;
+        pbmi->bmiColors[1].rgbGreen = 255;
+        pbmi->bmiColors[1].rgbRed = 255;
     }
 
-  /* Create a DIB with a bit pointer */
-  hBitmap = CreateDIBSection (NULL,
-			      (BITMAPINFO *) pbmih,
-			      DIB_RGB_COLORS,
-			      (void **) ppbBits,
-			      NULL,
-			      0);
-  if (hBitmap == NULL)
-    {
-      ErrorF ("winCreateDIBNativeGDI - CreateDIBSection () failed\n");
-      return NULL;
+    /* Create a DIB with a bit pointer */
+    hBitmap = CreateDIBSection(NULL,
+                               (BITMAPINFO *) pbmih,
+                               DIB_RGB_COLORS, (void **) ppbBits, NULL, 0);
+    if (hBitmap == NULL) {
+        ErrorF("winCreateDIBNativeGDI - CreateDIBSection () failed\n");
+        return NULL;
     }
 
-  /* Free the bitmap info header memory */
-  if (ppbmi != NULL)
-    {
-      /* Store the address of the BMIH in the ppbmih parameter */
-      *ppbmi = (BITMAPINFO *) pbmih;
+    /* Free the bitmap info header memory */
+    if (ppbmi != NULL) {
+        /* Store the address of the BMIH in the ppbmih parameter */
+        *ppbmi = (BITMAPINFO *) pbmih;
     }
-  else
-    {
-      free (pbmih);
-      pbmih = NULL;
+    else {
+        free(pbmih);
+        pbmih = NULL;
     }
 
-  return hBitmap;
+    return hBitmap;
 }
 
-
 #if 0
 static Bool
-winBltExposedRegionsNativeGDI (ScreenPtr pScreen)
+winBltExposedRegionsNativeGDI(ScreenPtr pScreen)
 {
-  
-  return TRUE;
+
+    return TRUE;
 }
 #endif
 
-
 static Bool
-winRedrawScreenNativeGDI (ScreenPtr pScreen)
+winRedrawScreenNativeGDI(ScreenPtr pScreen)
 {
-  FatalError ("winRedrawScreenNativeGDI\n");
-  return TRUE;
+    FatalError("winRedrawScreenNativeGDI\n");
+    return TRUE;
 }
 
-
 static Bool
-winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen)
+winRealizeInstalledPaletteNativeGDI(ScreenPtr pScreen)
 {
-  FatalError ("winRealizeInstalledPaletteNativeGDI\n");
-  return TRUE;
+    FatalError("winRealizeInstalledPaletteNativeGDI\n");
+    return TRUE;
 }
 
-
 static Bool
-winInstallColormapNativeGDI (ColormapPtr pColormap)
+winInstallColormapNativeGDI(ColormapPtr pColormap)
 {
-  FatalError ("winInstallColormapNativeGDI\n");
-  return TRUE;
+    FatalError("winInstallColormapNativeGDI\n");
+    return TRUE;
 }
 
-
 static Bool
-winStoreColorsNativeGDI (ColormapPtr pmap, 
-			 int ndef,
-			 xColorItem *pdefs)
+winStoreColorsNativeGDI(ColormapPtr pmap, int ndef, xColorItem * pdefs)
 {
-  FatalError ("winStoreColorsNativeGDI\n");
-  return TRUE;
+    FatalError("winStoreColorsNativeGDI\n");
+    return TRUE;
 }
 
-
 static Bool
-winCreateColormapNativeGDI (ColormapPtr pColormap)
+winCreateColormapNativeGDI(ColormapPtr pColormap)
 {
-  FatalError ("winCreateColormapNativeGDI\n");
-  return TRUE;
+    FatalError("winCreateColormapNativeGDI\n");
+    return TRUE;
 }
 
-
 static Bool
-winDestroyColormapNativeGDI (ColormapPtr pColormap)
+winDestroyColormapNativeGDI(ColormapPtr pColormap)
 {
-  FatalError ("winDestroyColormapNativeGDI\n");
-  return TRUE;
+    FatalError("winDestroyColormapNativeGDI\n");
+    return TRUE;
 }
 
-
 /* Set engine specific funtions */
 Bool
-winSetEngineFunctionsNativeGDI (ScreenPtr pScreen)
+winSetEngineFunctionsNativeGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  
-  /* Set our pointers */
-  pScreenPriv->pwinAllocateFB = winAllocateFBNativeGDI;
-  pScreenPriv->pwinFreeFB = winFreeFBNativeGDI;
-  pScreenPriv->pwinShadowUpdate = winShadowUpdateNativeGDI;
-  pScreenPriv->pwinInitScreen = winInitScreenNativeGDI;
-  pScreenPriv->pwinCloseScreen = winCloseScreenNativeGDI;
-  pScreenPriv->pwinInitVisuals = winInitVisualsNativeGDI;
-  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeNativeGDI;
-  if (pScreenInfo->fFullScreen)
-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;
-  else
-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
-  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitNativeGDI;
-  /*
-   * WARNING: Do not set the BltExposedRegions procedure pointer to anything
-   * other than NULL until a working painting procedure is in place.
-   * Else, winWindowProc will get stuck in an infinite loop because
-   * Windows expects the BeginPaint and EndPaint functions to be called
-   * before a WM_PAINT message can be removed from the queue.  We are
-   * using NULL here as a signal for winWindowProc that it should
-   * not signal that the WM_PAINT message has been processed.
-   */
-  pScreenPriv->pwinBltExposedRegions = NULL;
-  pScreenPriv->pwinActivateApp = winActivateAppNativeGDI;
-  pScreenPriv->pwinRedrawScreen = winRedrawScreenNativeGDI;
-  pScreenPriv->pwinRealizeInstalledPalette = 
-    winRealizeInstalledPaletteNativeGDI;
-  pScreenPriv->pwinInstallColormap = winInstallColormapNativeGDI;
-  pScreenPriv->pwinStoreColors = winStoreColorsNativeGDI;
-  pScreenPriv->pwinCreateColormap = winCreateColormapNativeGDI;
-  pScreenPriv->pwinDestroyColormap = winDestroyColormapNativeGDI;
-  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;
-
-  return TRUE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /* Set our pointers */
+    pScreenPriv->pwinAllocateFB = winAllocateFBNativeGDI;
+    pScreenPriv->pwinFreeFB = winFreeFBNativeGDI;
+    pScreenPriv->pwinShadowUpdate = winShadowUpdateNativeGDI;
+    pScreenPriv->pwinInitScreen = winInitScreenNativeGDI;
+    pScreenPriv->pwinCloseScreen = winCloseScreenNativeGDI;
+    pScreenPriv->pwinInitVisuals = winInitVisualsNativeGDI;
+    pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeNativeGDI;
+    if (pScreenInfo->fFullScreen)
+        pScreenPriv->pwinCreateBoundingWindow =
+            winCreateBoundingWindowFullScreen;
+    else
+        pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
+    pScreenPriv->pwinFinishScreenInit = winFinishScreenInitNativeGDI;
+    /*
+     * WARNING: Do not set the BltExposedRegions procedure pointer to anything
+     * other than NULL until a working painting procedure is in place.
+     * Else, winWindowProc will get stuck in an infinite loop because
+     * Windows expects the BeginPaint and EndPaint functions to be called
+     * before a WM_PAINT message can be removed from the queue.  We are
+     * using NULL here as a signal for winWindowProc that it should
+     * not signal that the WM_PAINT message has been processed.
+     */
+    pScreenPriv->pwinBltExposedRegions = NULL;
+    pScreenPriv->pwinActivateApp = winActivateAppNativeGDI;
+    pScreenPriv->pwinRedrawScreen = winRedrawScreenNativeGDI;
+    pScreenPriv->pwinRealizeInstalledPalette =
+        winRealizeInstalledPaletteNativeGDI;
+    pScreenPriv->pwinInstallColormap = winInstallColormapNativeGDI;
+    pScreenPriv->pwinStoreColors = winStoreColorsNativeGDI;
+    pScreenPriv->pwinCreateColormap = winCreateColormapNativeGDI;
+    pScreenPriv->pwinDestroyColormap = winDestroyColormapNativeGDI;
+    pScreenPriv->pwinHotKeyAltTab =
+        (winHotKeyAltTabProcPtr) (void (*)(void)) NoopDDA;
+
+    return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winpfbdd.c b/xorg-server/hw/xwin/winpfbdd.c
index 1a5a0e7aa..3fddd85f4 100644
--- a/xorg-server/hw/xwin/winpfbdd.c
+++ b/xorg-server/hw/xwin/winpfbdd.c
@@ -36,241 +36,225 @@
 #endif
 #include "win.h"
 
-
 /*
  * Local function prototypes
  */
 
 static Bool
-winAllocateFBPrimaryDD (ScreenPtr pScreen);
+ winAllocateFBPrimaryDD(ScreenPtr pScreen);
 
 static Bool
-winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen);
+ winCloseScreenPrimaryDD(int nIndex, ScreenPtr pScreen);
 
 static Bool
-winInitVisualsPrimaryDD (ScreenPtr pScreen);
+ winInitVisualsPrimaryDD(ScreenPtr pScreen);
 
 static Bool
-winAdjustVideoModePrimaryDD (ScreenPtr pScreen);
+ winAdjustVideoModePrimaryDD(ScreenPtr pScreen);
 
 static Bool
-winActivateAppPrimaryDD (ScreenPtr pScreen);
+ winActivateAppPrimaryDD(ScreenPtr pScreen);
 
 static Bool
-winHotKeyAltTabPrimaryDD (ScreenPtr pScreen);
-
+ winHotKeyAltTabPrimaryDD(ScreenPtr pScreen);
 
 /*
  * Create a DirectDraw primary surface 
  */
 
 static Bool
-winAllocateFBPrimaryDD (ScreenPtr pScreen)
+winAllocateFBPrimaryDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;  
-  HRESULT		ddrval = DD_OK;
-  DDSURFACEDESC		ddsd;
-  DDSURFACEDESC		*pddsdPrimary = NULL;
-  DDSURFACEDESC		*pddsdOffscreen = NULL;
-  RECT			rcClient;
-
-  ErrorF ("winAllocateFBPrimaryDD\n");
-
-  /* Get client area location in screen coords */
-  GetClientRect (pScreenPriv->hwndScreen, &rcClient);
-  MapWindowPoints (pScreenPriv->hwndScreen,
-		   HWND_DESKTOP,
-		   (LPPOINT)&rcClient, 2);
-
-  /* Create a DirectDraw object, store the address at lpdd */
-  ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);
-  if (ddrval != DD_OK)
-    FatalError ("winAllocateFBPrimaryDD - Could not start DirectDraw\n");
-  
-  /* Get a DirectDraw2 interface pointer */
-  ddrval = IDirectDraw_QueryInterface (pScreenPriv->pdd,
-				       &IID_IDirectDraw2,
-				       (LPVOID*) &pScreenPriv->pdd2);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDD - Failed DD2 query: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HRESULT ddrval = DD_OK;
+    DDSURFACEDESC ddsd;
+    DDSURFACEDESC *pddsdPrimary = NULL;
+    DDSURFACEDESC *pddsdOffscreen = NULL;
+    RECT rcClient;
+
+    ErrorF("winAllocateFBPrimaryDD\n");
+
+    /* Get client area location in screen coords */
+    GetClientRect(pScreenPriv->hwndScreen, &rcClient);
+    MapWindowPoints(pScreenPriv->hwndScreen,
+                    HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+
+    /* Create a DirectDraw object, store the address at lpdd */
+    ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);
+    if (ddrval != DD_OK)
+        FatalError("winAllocateFBPrimaryDD - Could not start DirectDraw\n");
+
+    /* Get a DirectDraw2 interface pointer */
+    ddrval = IDirectDraw_QueryInterface(pScreenPriv->pdd,
+                                        &IID_IDirectDraw2,
+                                        (LPVOID *) & pScreenPriv->pdd2);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDD - Failed DD2 query: %08x\n",
+               (unsigned int) ddrval);
+        return FALSE;
     }
 
-
-  ErrorF ("winAllocateFBPrimaryDD - Created and initialized DD\n");
-
-  /* Are we windowed or fullscreen? */
-  if (pScreenInfo->fFullScreen)
-    {
-      /* Full screen mode */
-      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,
-						 pScreenPriv->hwndScreen,
-						 DDSCL_FULLSCREEN
-						 | DDSCL_EXCLUSIVE);
-      if (FAILED (ddrval))
-	FatalError ("winAllocateFBPrimaryDD - Could not set "
-		    "cooperative level\n");
-
-      /* Change the video mode to the mode requested */
-      ddrval = IDirectDraw2_SetDisplayMode (pScreenPriv->pdd2,
-					    pScreenInfo->dwWidth,
-					    pScreenInfo->dwHeight,
-					    pScreenInfo->dwBPP,
-					    pScreenInfo->dwRefreshRate,
-					    0);
-       if (FAILED (ddrval))
-	FatalError ("winAllocateFBPrimaryDD - Could not set "
-		    "full screen display mode\n");
+    ErrorF("winAllocateFBPrimaryDD - Created and initialized DD\n");
+
+    /* Are we windowed or fullscreen? */
+    if (pScreenInfo->fFullScreen) {
+        /* Full screen mode */
+        ddrval = IDirectDraw2_SetCooperativeLevel(pScreenPriv->pdd2,
+                                                  pScreenPriv->hwndScreen,
+                                                  DDSCL_FULLSCREEN
+                                                  | DDSCL_EXCLUSIVE);
+        if (FAILED(ddrval))
+            FatalError("winAllocateFBPrimaryDD - Could not set "
+                       "cooperative level\n");
+
+        /* Change the video mode to the mode requested */
+        ddrval = IDirectDraw2_SetDisplayMode(pScreenPriv->pdd2,
+                                             pScreenInfo->dwWidth,
+                                             pScreenInfo->dwHeight,
+                                             pScreenInfo->dwBPP,
+                                             pScreenInfo->dwRefreshRate, 0);
+        if (FAILED(ddrval))
+            FatalError("winAllocateFBPrimaryDD - Could not set "
+                       "full screen display mode\n");
     }
-  else
-    {
-      /* Windowed mode */
-      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,
-						 pScreenPriv->hwndScreen,
-						 DDSCL_NORMAL);
-      if (FAILED (ddrval))
-	FatalError ("winAllocateFBPrimaryDD - Could not set "
-		    "cooperative level\n");
+    else {
+        /* Windowed mode */
+        ddrval = IDirectDraw2_SetCooperativeLevel(pScreenPriv->pdd2,
+                                                  pScreenPriv->hwndScreen,
+                                                  DDSCL_NORMAL);
+        if (FAILED(ddrval))
+            FatalError("winAllocateFBPrimaryDD - Could not set "
+                       "cooperative level\n");
     }
 
-  /* Describe the primary surface */
-  ZeroMemory (&ddsd, sizeof (ddsd));
-  ddsd.dwSize = sizeof (ddsd);
-  ddsd.dwFlags = DDSD_CAPS;
-  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-  
-  /* Create the primary surface */
-  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,
-				       &ddsd,
-				       &pScreenPriv->pddsPrimary,
-				       NULL);
-  if (FAILED (ddrval))
-       FatalError ("winAllocateFBPrimaryDD - Could not create primary "
-		  "surface %08x\n", (unsigned int) ddrval);
-
-  ErrorF ("winAllocateFBPrimaryDD - Created primary\n");
-
-  /* Allocate a DD surface description for our screen privates */
-  pddsdPrimary = pScreenPriv->pddsdPrimary
-    = malloc (sizeof (DDSURFACEDESC));
-  if (pddsdPrimary == NULL)
-    FatalError ("winAllocateFBPrimaryDD - Could not allocate surface "
-		"description memory\n");
-  ZeroMemory (pddsdPrimary, sizeof (*pddsdPrimary));
-  pddsdPrimary->dwSize = sizeof (*pddsdPrimary);
-
-  /* Describe the offscreen surface to be created */
-  /*
-   * NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,
-   * as drawing, locking, and unlocking take forever
-   * with video memory surfaces.  In addition,
-   * video memory is a somewhat scarce resource,
-   * so you shouldn't be allocating video memory when
-   * you have the option of using system memory instead.
-   */
-  ZeroMemory (&ddsd, sizeof (ddsd));
-  ddsd.dwSize = sizeof (ddsd);
-  ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-  ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
-  ddsd.dwHeight = pScreenInfo->dwHeight;
-  ddsd.dwWidth = pScreenInfo->dwWidth;
-
-  /* Create the shadow surface */
-  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,
-				       &ddsd,
-				       &pScreenPriv->pddsOffscreen,
-				       NULL);
-  if (ddrval != DD_OK)
-    FatalError ("winAllocateFBPrimaryDD - Could not create shadow "
-		"surface\n");
-  
-  ErrorF ("winAllocateFBPrimaryDD - Created offscreen\n");
-
-  /* Allocate a DD surface description for our screen privates */
-  pddsdOffscreen = pScreenPriv->pddsdOffscreen
-    = malloc (sizeof (DDSURFACEDESC));
-  if (pddsdOffscreen == NULL)
-    FatalError ("winAllocateFBPrimaryDD - Could not allocate surface "
-		"description memory\n");
-  ZeroMemory (pddsdOffscreen, sizeof (*pddsdOffscreen));
-  pddsdOffscreen->dwSize = sizeof (*pddsdOffscreen);
-
-  ErrorF ("winAllocateFBPrimaryDD - Locking primary\n");
-
-  /* Lock the primary surface */
-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsPrimary,
-				    pScreenInfo->fFullScreen ? NULL:&rcClient,
-				    pddsdPrimary,
-				    DDLOCK_WAIT,
-				    NULL);
-  if (ddrval != DD_OK || pddsdPrimary->lpSurface == NULL)
-    FatalError ("winAllocateFBPrimaryDD - Could not lock "
-		"primary surface\n");
-
-  ErrorF ("winAllocateFBPrimaryDD - Locked primary\n");
-
-  /* We don't know how to deal with anything other than RGB */
-  if (!(pddsdPrimary->ddpfPixelFormat.dwFlags & DDPF_RGB))
-    FatalError ("winAllocateFBPrimaryDD - Color format other than RGB\n");
-
-  /* Grab the pitch from the surface desc */
-  pScreenInfo->dwStride = (pddsdPrimary->u1.lPitch * 8)
-    / pScreenInfo->dwBPP;
-
-  /* Save the pointer to our surface memory */
-  pScreenInfo->pfb = pddsdPrimary->lpSurface;
-  
-  /* Grab the color depth and masks from the surface description */
-  pScreenPriv->dwRedMask = pddsdPrimary->ddpfPixelFormat.u2.dwRBitMask;
-  pScreenPriv->dwGreenMask = pddsdPrimary->ddpfPixelFormat.u3.dwGBitMask;
-  pScreenPriv->dwBlueMask = pddsdPrimary->ddpfPixelFormat.u4.dwBBitMask;
-
-  ErrorF ("winAllocateFBPrimaryDD - Returning\n");
-
-  return TRUE;
+    /* Describe the primary surface */
+    ZeroMemory(&ddsd, sizeof(ddsd));
+    ddsd.dwSize = sizeof(ddsd);
+    ddsd.dwFlags = DDSD_CAPS;
+    ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
+
+    /* Create the primary surface */
+    ddrval = IDirectDraw2_CreateSurface(pScreenPriv->pdd2,
+                                        &ddsd, &pScreenPriv->pddsPrimary, NULL);
+    if (FAILED(ddrval))
+        FatalError("winAllocateFBPrimaryDD - Could not create primary "
+                   "surface %08x\n", (unsigned int) ddrval);
+
+    ErrorF("winAllocateFBPrimaryDD - Created primary\n");
+
+    /* Allocate a DD surface description for our screen privates */
+    pddsdPrimary = pScreenPriv->pddsdPrimary = malloc(sizeof(DDSURFACEDESC));
+    if (pddsdPrimary == NULL)
+        FatalError("winAllocateFBPrimaryDD - Could not allocate surface "
+                   "description memory\n");
+    ZeroMemory(pddsdPrimary, sizeof(*pddsdPrimary));
+    pddsdPrimary->dwSize = sizeof(*pddsdPrimary);
+
+    /* Describe the offscreen surface to be created */
+    /*
+     * NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,
+     * as drawing, locking, and unlocking take forever
+     * with video memory surfaces.  In addition,
+     * video memory is a somewhat scarce resource,
+     * so you shouldn't be allocating video memory when
+     * you have the option of using system memory instead.
+     */
+    ZeroMemory(&ddsd, sizeof(ddsd));
+    ddsd.dwSize = sizeof(ddsd);
+    ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
+    ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
+    ddsd.dwHeight = pScreenInfo->dwHeight;
+    ddsd.dwWidth = pScreenInfo->dwWidth;
+
+    /* Create the shadow surface */
+    ddrval = IDirectDraw2_CreateSurface(pScreenPriv->pdd2,
+                                        &ddsd,
+                                        &pScreenPriv->pddsOffscreen, NULL);
+    if (ddrval != DD_OK)
+        FatalError("winAllocateFBPrimaryDD - Could not create shadow "
+                   "surface\n");
+
+    ErrorF("winAllocateFBPrimaryDD - Created offscreen\n");
+
+    /* Allocate a DD surface description for our screen privates */
+    pddsdOffscreen = pScreenPriv->pddsdOffscreen
+        = malloc(sizeof(DDSURFACEDESC));
+    if (pddsdOffscreen == NULL)
+        FatalError("winAllocateFBPrimaryDD - Could not allocate surface "
+                   "description memory\n");
+    ZeroMemory(pddsdOffscreen, sizeof(*pddsdOffscreen));
+    pddsdOffscreen->dwSize = sizeof(*pddsdOffscreen);
+
+    ErrorF("winAllocateFBPrimaryDD - Locking primary\n");
+
+    /* Lock the primary surface */
+    ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsPrimary,
+                                      pScreenInfo->
+                                      fFullScreen ? NULL : &rcClient,
+                                      pddsdPrimary, DDLOCK_WAIT, NULL);
+    if (ddrval != DD_OK || pddsdPrimary->lpSurface == NULL)
+        FatalError("winAllocateFBPrimaryDD - Could not lock "
+                   "primary surface\n");
+
+    ErrorF("winAllocateFBPrimaryDD - Locked primary\n");
+
+    /* We don't know how to deal with anything other than RGB */
+    if (!(pddsdPrimary->ddpfPixelFormat.dwFlags & DDPF_RGB))
+        FatalError("winAllocateFBPrimaryDD - Color format other than RGB\n");
+
+    /* Grab the pitch from the surface desc */
+    pScreenInfo->dwStride = (pddsdPrimary->u1.lPitch * 8)
+        / pScreenInfo->dwBPP;
+
+    /* Save the pointer to our surface memory */
+    pScreenInfo->pfb = pddsdPrimary->lpSurface;
+
+    /* Grab the color depth and masks from the surface description */
+    pScreenPriv->dwRedMask = pddsdPrimary->ddpfPixelFormat.u2.dwRBitMask;
+    pScreenPriv->dwGreenMask = pddsdPrimary->ddpfPixelFormat.u3.dwGBitMask;
+    pScreenPriv->dwBlueMask = pddsdPrimary->ddpfPixelFormat.u4.dwBBitMask;
+
+    ErrorF("winAllocateFBPrimaryDD - Returning\n");
+
+    return TRUE;
 }
 
 static void
-winFreeFBPrimaryDD (ScreenPtr pScreen)
+winFreeFBPrimaryDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-
-  /* Free the offscreen surface, if there is one */
-  if (pScreenPriv->pddsOffscreen)
-    {
-      IDirectDrawSurface2_Unlock (pScreenPriv->pddsOffscreen, NULL);
-      IDirectDrawSurface2_Release (pScreenPriv->pddsOffscreen);
-      pScreenPriv->pddsOffscreen = NULL;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /* Free the offscreen surface, if there is one */
+    if (pScreenPriv->pddsOffscreen) {
+        IDirectDrawSurface2_Unlock(pScreenPriv->pddsOffscreen, NULL);
+        IDirectDrawSurface2_Release(pScreenPriv->pddsOffscreen);
+        pScreenPriv->pddsOffscreen = NULL;
     }
 
-  /* Release the primary surface, if there is one */
-  if (pScreenPriv->pddsPrimary)
-    {
-      IDirectDrawSurface2_Unlock (pScreenPriv->pddsPrimary, NULL);
-      IDirectDrawSurface2_Release (pScreenPriv->pddsPrimary);
-      pScreenPriv->pddsPrimary = NULL;
+    /* Release the primary surface, if there is one */
+    if (pScreenPriv->pddsPrimary) {
+        IDirectDrawSurface2_Unlock(pScreenPriv->pddsPrimary, NULL);
+        IDirectDrawSurface2_Release(pScreenPriv->pddsPrimary);
+        pScreenPriv->pddsPrimary = NULL;
     }
 
-  /* Free the DirectDraw object, if there is one */
-  if (pScreenPriv->pdd)
-    {
-      IDirectDraw2_RestoreDisplayMode (pScreenPriv->pdd);
-      IDirectDraw2_Release (pScreenPriv->pdd);
-      pScreenPriv->pdd = NULL;
+    /* Free the DirectDraw object, if there is one */
+    if (pScreenPriv->pdd) {
+        IDirectDraw2_RestoreDisplayMode(pScreenPriv->pdd);
+        IDirectDraw2_Release(pScreenPriv->pdd);
+        pScreenPriv->pdd = NULL;
     }
 
-  /* Invalidate the ScreenInfo's fb pointer */
-  pScreenInfo->pfb = NULL;
+    /* Invalidate the ScreenInfo's fb pointer */
+    pScreenInfo->pfb = NULL;
 }
 
 static Bool
 winInitScreenPrimaryDD(ScreenPtr pScreen)
 {
-  return winAllocateFBPrimaryDD(pScreen);
+    return winAllocateFBPrimaryDD(pScreen);
 }
 
 /*
@@ -280,56 +264,53 @@ winInitScreenPrimaryDD(ScreenPtr pScreen)
  */
 
 static Bool
-winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen)
+winCloseScreenPrimaryDD(int nIndex, ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  Bool			fReturn;
-  
-  ErrorF ("winCloseScreenPrimaryDD - Freeing screen resources\n");
-
-  /* Flag that the screen is closed */
-  pScreenPriv->fClosed = TRUE;
-  pScreenPriv->fActive = FALSE;
-
-  /* Call the wrapped CloseScreen procedure */
-  WIN_UNWRAP(CloseScreen);
-  if (pScreen->CloseScreen)
-    fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
-
-  /* Delete the window property */
-  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);
-
-  winFreeFBPrimaryDD(pScreen);
-
-  /* Delete tray icon, if we have one */
-  if (!pScreenInfo->fNoTrayIcon)
-    winDeleteNotifyIcon (pScreenPriv);
-
-  /* Free the exit confirmation dialog box, if it exists */
-  if (g_hDlgExit != NULL)
-    {
-      DestroyWindow (g_hDlgExit);
-      g_hDlgExit = NULL;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    Bool fReturn;
+
+    ErrorF("winCloseScreenPrimaryDD - Freeing screen resources\n");
+
+    /* Flag that the screen is closed */
+    pScreenPriv->fClosed = TRUE;
+    pScreenPriv->fActive = FALSE;
+
+    /* Call the wrapped CloseScreen procedure */
+    WIN_UNWRAP(CloseScreen);
+    if (pScreen->CloseScreen)
+        fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+
+    /* Delete the window property */
+    RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);
+
+    winFreeFBPrimaryDD(pScreen);
+
+    /* Delete tray icon, if we have one */
+    if (!pScreenInfo->fNoTrayIcon)
+        winDeleteNotifyIcon(pScreenPriv);
+
+    /* Free the exit confirmation dialog box, if it exists */
+    if (g_hDlgExit != NULL) {
+        DestroyWindow(g_hDlgExit);
+        g_hDlgExit = NULL;
     }
 
-  /* Kill our window */
-  if (pScreenPriv->hwndScreen)
-    {
-      DestroyWindow (pScreenPriv->hwndScreen);
-      pScreenPriv->hwndScreen = NULL;
+    /* Kill our window */
+    if (pScreenPriv->hwndScreen) {
+        DestroyWindow(pScreenPriv->hwndScreen);
+        pScreenPriv->hwndScreen = NULL;
     }
 
-  /* Kill our screeninfo's pointer to the screen */
-  pScreenInfo->pScreen = NULL;
+    /* Kill our screeninfo's pointer to the screen */
+    pScreenInfo->pScreen = NULL;
 
-  /* Free the screen privates for this screen */
-  free ((pointer) pScreenPriv);
+    /* Free the screen privates for this screen */
+    free((pointer) pScreenPriv);
 
-  return fReturn;
+    return fReturn;
 }
 
-
 /*
  * Tell mi what sort of visuals we need.
  * 
@@ -339,118 +320,110 @@ winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen)
  */
 
 static Bool
-winInitVisualsPrimaryDD (ScreenPtr pScreen)
+winInitVisualsPrimaryDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  DWORD			dwRedBits, dwGreenBits, dwBlueBits;
-
-  /* Count the number of ones in each color mask */
-  dwRedBits = winCountBits (pScreenPriv->dwRedMask);
-  dwGreenBits = winCountBits (pScreenPriv->dwGreenMask);
-  dwBlueBits = winCountBits (pScreenPriv->dwBlueMask);
-  
-  /* Store the maximum number of ones in a color mask as the bitsPerRGB */
-  if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
-    pScreenPriv->dwBitsPerRGB = dwRedBits;
-  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
-    pScreenPriv->dwBitsPerRGB = dwGreenBits;
-  else
-    pScreenPriv->dwBitsPerRGB = dwBlueBits;
-  
-  ErrorF ("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n",
-	  (unsigned int) pScreenPriv->dwRedMask,
-	  (unsigned int) pScreenPriv->dwGreenMask,
-	  (unsigned int) pScreenPriv->dwBlueMask,
-	  (int) pScreenPriv->dwBitsPerRGB);
-
-  /* Create a single visual according to the Windows screen depth */
-  switch (pScreenInfo->dwDepth)
-    {
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    DWORD dwRedBits, dwGreenBits, dwBlueBits;
+
+    /* Count the number of ones in each color mask */
+    dwRedBits = winCountBits(pScreenPriv->dwRedMask);
+    dwGreenBits = winCountBits(pScreenPriv->dwGreenMask);
+    dwBlueBits = winCountBits(pScreenPriv->dwBlueMask);
+
+    /* Store the maximum number of ones in a color mask as the bitsPerRGB */
+    if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
+        pScreenPriv->dwBitsPerRGB = dwRedBits;
+    else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
+        pScreenPriv->dwBitsPerRGB = dwGreenBits;
+    else
+        pScreenPriv->dwBitsPerRGB = dwBlueBits;
+
+    ErrorF("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n",
+           (unsigned int) pScreenPriv->dwRedMask,
+           (unsigned int) pScreenPriv->dwGreenMask,
+           (unsigned int) pScreenPriv->dwBlueMask,
+           (int) pScreenPriv->dwBitsPerRGB);
+
+    /* Create a single visual according to the Windows screen depth */
+    switch (pScreenInfo->dwDepth) {
     case 24:
     case 16:
     case 15:
-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
-				     TrueColorMask,
-				     pScreenPriv->dwBitsPerRGB,
-				     TrueColor,
-				     pScreenPriv->dwRedMask,
-				     pScreenPriv->dwGreenMask,
-				     pScreenPriv->dwBlueMask))
-	{
-	  ErrorF ("winInitVisualsPrimaryDD - " 
-		  "miSetVisualTypesAndMasks failed\n");
-	  return FALSE;
-	}
-      break;
+        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
+                                      TrueColorMask,
+                                      pScreenPriv->dwBitsPerRGB,
+                                      TrueColor,
+                                      pScreenPriv->dwRedMask,
+                                      pScreenPriv->dwGreenMask,
+                                      pScreenPriv->dwBlueMask)) {
+            ErrorF("winInitVisualsPrimaryDD - "
+                   "miSetVisualTypesAndMasks failed\n");
+            return FALSE;
+        }
+        break;
 
     case 8:
 #if CYGDEBUG
-      winDebug ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
-#endif /* CYGDEBUG */
-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
-				     PseudoColorMask,
-				     pScreenPriv->dwBitsPerRGB,
-				     PseudoColor,
-				     pScreenPriv->dwRedMask,
-				     pScreenPriv->dwGreenMask,
-				     pScreenPriv->dwBlueMask))
-	{
-	  ErrorF ("winInitVisualsPrimaryDD - "
-		  "miSetVisualTypesAndMasks failed\n");
-	  return FALSE;
-	}
+        winDebug("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
+#endif                          /* CYGDEBUG */
+        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
+                                      PseudoColorMask,
+                                      pScreenPriv->dwBitsPerRGB,
+                                      PseudoColor,
+                                      pScreenPriv->dwRedMask,
+                                      pScreenPriv->dwGreenMask,
+                                      pScreenPriv->dwBlueMask)) {
+            ErrorF("winInitVisualsPrimaryDD - "
+                   "miSetVisualTypesAndMasks failed\n");
+            return FALSE;
+        }
 #if CYGDEBUG
-      winDebug ("winInitVisualsPrimaryDD - Returned from "
-	      "miSetVisualTypesAndMasks\n");
-#endif /* CYGDEBUG */
-      break;
+        winDebug("winInitVisualsPrimaryDD - Returned from "
+                 "miSetVisualTypesAndMasks\n");
+#endif                          /* CYGDEBUG */
+        break;
 
     default:
-      ErrorF ("winInitVisualsPrimaryDD - Unknown screen depth\n");
-      return FALSE;
+        ErrorF("winInitVisualsPrimaryDD - Unknown screen depth\n");
+        return FALSE;
     }
 
-  ErrorF ("winInitVisualsPrimaryDD - Returning\n");
+    ErrorF("winInitVisualsPrimaryDD - Returning\n");
 
-  return TRUE;
+    return TRUE;
 }
 
-
 static Bool
-winAdjustVideoModePrimaryDD (ScreenPtr pScreen)
+winAdjustVideoModePrimaryDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  HDC			hdc = NULL;
-  DWORD			dwBPP;
-
-  /* We're in serious trouble if we can't get a DC */
-  hdc = GetDC (NULL);
-  if (hdc == NULL)
-    {
-      ErrorF ("winAdjustVideoModePrimaryDD - GetDC failed\n");
-      return FALSE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HDC hdc = NULL;
+    DWORD dwBPP;
+
+    /* We're in serious trouble if we can't get a DC */
+    hdc = GetDC(NULL);
+    if (hdc == NULL) {
+        ErrorF("winAdjustVideoModePrimaryDD - GetDC failed\n");
+        return FALSE;
     }
 
-  /* Query GDI for current display depth */
-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
+    /* Query GDI for current display depth */
+    dwBPP = GetDeviceCaps(hdc, BITSPIXEL);
 
-  /* DirectDraw can only change the depth in fullscreen mode */
-  if (!(pScreenInfo->fFullScreen &&
-        (pScreenInfo->dwBPP != WIN_DEFAULT_BPP)))
-    {
-      /* Otherwise, We'll use GDI's depth */
-      pScreenInfo->dwBPP = dwBPP;
+    /* DirectDraw can only change the depth in fullscreen mode */
+    if (!(pScreenInfo->fFullScreen && (pScreenInfo->dwBPP != WIN_DEFAULT_BPP))) {
+        /* Otherwise, We'll use GDI's depth */
+        pScreenInfo->dwBPP = dwBPP;
     }
 
-  /* Release our DC */
-  ReleaseDC (NULL, hdc);
+    /* Release our DC */
+    ReleaseDC(NULL, hdc);
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * We need to blit our offscreen fb to
  * the screen when we are activated, and we need to point
@@ -458,85 +431,76 @@ winAdjustVideoModePrimaryDD (ScreenPtr pScreen)
  */
 
 static Bool
-winActivateAppPrimaryDD (ScreenPtr pScreen)
+winActivateAppPrimaryDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  RECT			rcSrc, rcClient;
-  HRESULT		ddrval = DD_OK;
-
-  /* Check for errors */
-  if (pScreenPriv == NULL
-      || pScreenPriv->pScreenInfo == NULL
-      || pScreenPriv->pddsPrimary == NULL
-      || pScreenPriv->pddsOffscreen == NULL)
-    return FALSE;
-
-  /* Check for do-nothing */
-  if (!pScreenPriv->fActive)
-    return TRUE;
-  
-  /* We are activating */
-  ddrval = IDirectDrawSurface2_IsLost (pScreenPriv->pddsOffscreen);
-  if (ddrval == DD_OK)
-    {
-      IDirectDrawSurface2_Unlock (pScreenPriv->pddsOffscreen,
-				  NULL);
-      /*
-       * We don't check for an error from Unlock, because it
-       * doesn't matter if the Unlock failed.
-       */
+    winScreenPriv(pScreen);
+    RECT rcSrc, rcClient;
+    HRESULT ddrval = DD_OK;
+
+    /* Check for errors */
+    if (pScreenPriv == NULL
+        || pScreenPriv->pScreenInfo == NULL
+        || pScreenPriv->pddsPrimary == NULL
+        || pScreenPriv->pddsOffscreen == NULL)
+        return FALSE;
+
+    /* Check for do-nothing */
+    if (!pScreenPriv->fActive)
+        return TRUE;
+
+    /* We are activating */
+    ddrval = IDirectDrawSurface2_IsLost(pScreenPriv->pddsOffscreen);
+    if (ddrval == DD_OK) {
+        IDirectDrawSurface2_Unlock(pScreenPriv->pddsOffscreen, NULL);
+        /*
+         * We don't check for an error from Unlock, because it
+         * doesn't matter if the Unlock failed.
+         */
     }
 
-  /* Restore both surfaces, just cause I like it that way */
-  IDirectDrawSurface2_Restore (pScreenPriv->pddsOffscreen);
-  IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);
-			      
-  /* Get client area in screen coords */
-  GetClientRect (pScreenPriv->hwndScreen, &rcClient);
-  MapWindowPoints (pScreenPriv->hwndScreen,
-		   HWND_DESKTOP,
-		   (LPPOINT)&rcClient, 2);
-
-  /* Setup a source rectangle */
-  rcSrc.left = 0;
-  rcSrc.top = 0;
-  rcSrc.right = pScreenPriv->pScreenInfo->dwWidth;
-  rcSrc.bottom = pScreenPriv->pScreenInfo->dwHeight;
-
-  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,
-				    &rcClient,
-				    pScreenPriv->pddsOffscreen,
-				    &rcSrc,
-				    DDBLT_WAIT,
-				    NULL);
-  if (ddrval != DD_OK)
-    FatalError ("winActivateAppPrimaryDD () - Failed blitting offscreen "
-		"surface to primary surface %08x\n", (unsigned int) ddrval);
-  
-  /* Lock the primary surface */
-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsPrimary,
-				     &rcClient,
-				     pScreenPriv->pddsdPrimary,
-				     DDLOCK_WAIT,
-				     NULL);
-  if (ddrval != DD_OK
-      || pScreenPriv->pddsdPrimary->lpSurface == NULL)
-    FatalError ("winActivateAppPrimaryDD () - Could not lock "
-		"primary surface\n");
-
-  /* Notify FB of the new memory pointer */
-  winUpdateFBPointer (pScreen,
-		      pScreenPriv->pddsdPrimary->lpSurface);
-
-  /*
-   * Register the Alt-Tab combo as a hotkey so we can copy
-   * the primary framebuffer before the display mode changes
-   */
-  RegisterHotKey (pScreenPriv->hwndScreen, 1, MOD_ALT, 9);
-
-  return TRUE;
-}
+    /* Restore both surfaces, just cause I like it that way */
+    IDirectDrawSurface2_Restore(pScreenPriv->pddsOffscreen);
+    IDirectDrawSurface2_Restore(pScreenPriv->pddsPrimary);
+
+    /* Get client area in screen coords */
+    GetClientRect(pScreenPriv->hwndScreen, &rcClient);
+    MapWindowPoints(pScreenPriv->hwndScreen,
+                    HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+
+    /* Setup a source rectangle */
+    rcSrc.left = 0;
+    rcSrc.top = 0;
+    rcSrc.right = pScreenPriv->pScreenInfo->dwWidth;
+    rcSrc.bottom = pScreenPriv->pScreenInfo->dwHeight;
+
+    ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsPrimary,
+                                     &rcClient,
+                                     pScreenPriv->pddsOffscreen,
+                                     &rcSrc, DDBLT_WAIT, NULL);
+    if (ddrval != DD_OK)
+        FatalError("winActivateAppPrimaryDD () - Failed blitting offscreen "
+                   "surface to primary surface %08x\n", (unsigned int) ddrval);
+
+    /* Lock the primary surface */
+    ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsPrimary,
+                                      &rcClient,
+                                      pScreenPriv->pddsdPrimary,
+                                      DDLOCK_WAIT, NULL);
+    if (ddrval != DD_OK || pScreenPriv->pddsdPrimary->lpSurface == NULL)
+        FatalError("winActivateAppPrimaryDD () - Could not lock "
+                   "primary surface\n");
+
+    /* Notify FB of the new memory pointer */
+    winUpdateFBPointer(pScreen, pScreenPriv->pddsdPrimary->lpSurface);
+
+    /*
+     * Register the Alt-Tab combo as a hotkey so we can copy
+     * the primary framebuffer before the display mode changes
+     */
+    RegisterHotKey(pScreenPriv->hwndScreen, 1, MOD_ALT, 9);
 
+    return TRUE;
+}
 
 /*
  * Handle the Alt+Tab hotkey.
@@ -547,133 +511,123 @@ winActivateAppPrimaryDD (ScreenPtr pScreen)
  */
 
 static Bool
-winHotKeyAltTabPrimaryDD (ScreenPtr pScreen)
+winHotKeyAltTabPrimaryDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  RECT			rcClient, rcSrc;
-  HRESULT		ddrval = DD_OK;
-
-  ErrorF ("\nwinHotKeyAltTabPrimaryDD\n\n");
-
-  /* Alt+Tab was pressed, we will lose focus very soon */
-  pScreenPriv->fActive = FALSE;
-  
-  /* Check for error conditions */
-  if (pScreenPriv->pddsPrimary == NULL
-      || pScreenPriv->pddsOffscreen == NULL)
-    return FALSE;
-
-  /* Get client area in screen coords */
-  GetClientRect (pScreenPriv->hwndScreen, &rcClient);
-  MapWindowPoints (pScreenPriv->hwndScreen,
-		   HWND_DESKTOP,
-		   (LPPOINT)&rcClient, 2);
-
-  /* Did we loose the primary surface? */
-  ddrval = IDirectDrawSurface2_IsLost (pScreenPriv->pddsPrimary);
-  if (ddrval == DD_OK)
-    {
-      ddrval = IDirectDrawSurface2_Unlock (pScreenPriv->pddsPrimary,
-					   NULL);
-      if (FAILED (ddrval))
-	FatalError ("winHotKeyAltTabPrimaryDD - Failed unlocking primary "
-		    "surface\n");
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    RECT rcClient, rcSrc;
+    HRESULT ddrval = DD_OK;
+
+    ErrorF("\nwinHotKeyAltTabPrimaryDD\n\n");
+
+    /* Alt+Tab was pressed, we will lose focus very soon */
+    pScreenPriv->fActive = FALSE;
+
+    /* Check for error conditions */
+    if (pScreenPriv->pddsPrimary == NULL || pScreenPriv->pddsOffscreen == NULL)
+        return FALSE;
+
+    /* Get client area in screen coords */
+    GetClientRect(pScreenPriv->hwndScreen, &rcClient);
+    MapWindowPoints(pScreenPriv->hwndScreen,
+                    HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+
+    /* Did we loose the primary surface? */
+    ddrval = IDirectDrawSurface2_IsLost(pScreenPriv->pddsPrimary);
+    if (ddrval == DD_OK) {
+        ddrval = IDirectDrawSurface2_Unlock(pScreenPriv->pddsPrimary, NULL);
+        if (FAILED(ddrval))
+            FatalError("winHotKeyAltTabPrimaryDD - Failed unlocking primary "
+                       "surface\n");
     }
 
-  /* Setup a source rectangle */
-  rcSrc.left = 0;
-  rcSrc.top = 0;
-  rcSrc.right = pScreenInfo->dwWidth;
-  rcSrc.bottom = pScreenInfo->dwHeight;
-
-      /* Blit the primary surface to the offscreen surface */
-  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsOffscreen,
-				    NULL, /* should be rcDest */
-				    pScreenPriv->pddsPrimary,
-				    NULL,
-				    DDBLT_WAIT,
-				    NULL);
-  if (ddrval == DDERR_SURFACELOST)
-    {
-      IDirectDrawSurface2_Restore (pScreenPriv->pddsOffscreen);  
-      IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);
-		  		  
-      /* Blit the primary surface to the offscreen surface */
-      ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsOffscreen,
-					NULL,
-					pScreenPriv->pddsPrimary,
-					NULL,
-					DDBLT_WAIT,
-					NULL);
-      if (FAILED (ddrval))
-	FatalError ("winHotKeyAltTabPrimaryDD - Failed blitting primary "
-		    "surface to offscreen surface: %08x\n",
-		    (unsigned int) ddrval);
+    /* Setup a source rectangle */
+    rcSrc.left = 0;
+    rcSrc.top = 0;
+    rcSrc.right = pScreenInfo->dwWidth;
+    rcSrc.bottom = pScreenInfo->dwHeight;
+
+    /* Blit the primary surface to the offscreen surface */
+    ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsOffscreen, NULL,  /* should be rcDest */
+                                     pScreenPriv->pddsPrimary,
+                                     NULL, DDBLT_WAIT, NULL);
+    if (ddrval == DDERR_SURFACELOST) {
+        IDirectDrawSurface2_Restore(pScreenPriv->pddsOffscreen);
+        IDirectDrawSurface2_Restore(pScreenPriv->pddsPrimary);
+
+        /* Blit the primary surface to the offscreen surface */
+        ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsOffscreen,
+                                         NULL,
+                                         pScreenPriv->pddsPrimary,
+                                         NULL, DDBLT_WAIT, NULL);
+        if (FAILED(ddrval))
+            FatalError("winHotKeyAltTabPrimaryDD - Failed blitting primary "
+                       "surface to offscreen surface: %08x\n",
+                       (unsigned int) ddrval);
     }
-  else
-    {
-      FatalError ("winHotKeyAltTabPrimaryDD - Unknown error from "
-		  "Blt: %08dx\n", (unsigned int) ddrval);
+    else {
+        FatalError("winHotKeyAltTabPrimaryDD - Unknown error from "
+                   "Blt: %08dx\n", (unsigned int) ddrval);
     }
 
-  /* Lock the offscreen surface */
-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsOffscreen,
-				     NULL,
-				     pScreenPriv->pddsdOffscreen,
-				     DDLOCK_WAIT,
-				     NULL);
-  if (ddrval != DD_OK
-      || pScreenPriv->pddsdPrimary->lpSurface == NULL)
-    FatalError ("winHotKeyAltTabPrimaryDD - Could not lock "
-		"offscreen surface\n");
-
-  /* Notify FB of the new memory pointer */
-  winUpdateFBPointer (pScreen,
-		      pScreenPriv->pddsdOffscreen->lpSurface);
-
-  /* Unregister our hotkey */
-  UnregisterHotKey (pScreenPriv->hwndScreen, 1);
-
-  return TRUE;
-}
+    /* Lock the offscreen surface */
+    ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsOffscreen,
+                                      NULL,
+                                      pScreenPriv->pddsdOffscreen,
+                                      DDLOCK_WAIT, NULL);
+    if (ddrval != DD_OK || pScreenPriv->pddsdPrimary->lpSurface == NULL)
+        FatalError("winHotKeyAltTabPrimaryDD - Could not lock "
+                   "offscreen surface\n");
+
+    /* Notify FB of the new memory pointer */
+    winUpdateFBPointer(pScreen, pScreenPriv->pddsdOffscreen->lpSurface);
+
+    /* Unregister our hotkey */
+    UnregisterHotKey(pScreenPriv->hwndScreen, 1);
 
+    return TRUE;
+}
 
 /* Set engine specific functions */
 Bool
-winSetEngineFunctionsPrimaryDD (ScreenPtr pScreen)
+winSetEngineFunctionsPrimaryDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  
-  /* Set our pointers */
-  pScreenPriv->pwinAllocateFB = winAllocateFBPrimaryDD;
-  pScreenPriv->pwinFreeFB = winFreeFBPrimaryDD;
-  pScreenPriv->pwinShadowUpdate = (winShadowUpdateProcPtr) (void (*)(void))NoopDDA;
-  pScreenPriv->pwinInitScreen = winInitScreenPrimaryDD;
-  pScreenPriv->pwinCloseScreen = winCloseScreenPrimaryDD;
-  pScreenPriv->pwinInitVisuals = winInitVisualsPrimaryDD;
-  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModePrimaryDD;
-  if (pScreenInfo->fFullScreen)
-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;
-  else
-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
-  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
-  pScreenPriv->pwinBltExposedRegions = (winBltExposedRegionsProcPtr) (void (*)(void))NoopDDA;
-  pScreenPriv->pwinActivateApp = winActivateAppPrimaryDD;
-  pScreenPriv->pwinRedrawScreen = NULL;
-  pScreenPriv->pwinRealizeInstalledPalette = NULL;
-  pScreenPriv->pwinInstallColormap = NULL;
-  pScreenPriv->pwinStoreColors = NULL;
-  pScreenPriv->pwinCreateColormap = NULL;
-  pScreenPriv->pwinDestroyColormap = NULL;
-  pScreenPriv->pwinHotKeyAltTab = winHotKeyAltTabPrimaryDD;
-  pScreenPriv->pwinCreatePrimarySurface = (winCreatePrimarySurfaceProcPtr) (void (*)(void))NoopDDA;
-  pScreenPriv->pwinReleasePrimarySurface = (winReleasePrimarySurfaceProcPtr) (void (*)(void))NoopDDA;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /* Set our pointers */
+    pScreenPriv->pwinAllocateFB = winAllocateFBPrimaryDD;
+    pScreenPriv->pwinFreeFB = winFreeFBPrimaryDD;
+    pScreenPriv->pwinShadowUpdate =
+        (winShadowUpdateProcPtr) (void (*)(void)) NoopDDA;
+    pScreenPriv->pwinInitScreen = winInitScreenPrimaryDD;
+    pScreenPriv->pwinCloseScreen = winCloseScreenPrimaryDD;
+    pScreenPriv->pwinInitVisuals = winInitVisualsPrimaryDD;
+    pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModePrimaryDD;
+    if (pScreenInfo->fFullScreen)
+        pScreenPriv->pwinCreateBoundingWindow =
+            winCreateBoundingWindowFullScreen;
+    else
+        pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
+    pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
+    pScreenPriv->pwinBltExposedRegions =
+        (winBltExposedRegionsProcPtr) (void (*)(void)) NoopDDA;
+    pScreenPriv->pwinActivateApp = winActivateAppPrimaryDD;
+    pScreenPriv->pwinRedrawScreen = NULL;
+    pScreenPriv->pwinRealizeInstalledPalette = NULL;
+    pScreenPriv->pwinInstallColormap = NULL;
+    pScreenPriv->pwinStoreColors = NULL;
+    pScreenPriv->pwinCreateColormap = NULL;
+    pScreenPriv->pwinDestroyColormap = NULL;
+    pScreenPriv->pwinHotKeyAltTab = winHotKeyAltTabPrimaryDD;
+    pScreenPriv->pwinCreatePrimarySurface =
+        (winCreatePrimarySurfaceProcPtr) (void (*)(void)) NoopDDA;
+    pScreenPriv->pwinReleasePrimarySurface =
+        (winReleasePrimarySurfaceProcPtr) (void (*)(void)) NoopDDA;
 #ifdef XWIN_MULTIWINDOW
-  pScreenPriv->pwinFinishCreateWindowsWindow =
-    (winFinishCreateWindowsWindowProcPtr) (void (*)(void))NoopDDA;
+    pScreenPriv->pwinFinishCreateWindowsWindow =
+        (winFinishCreateWindowsWindowProcPtr) (void (*)(void)) NoopDDA;
 #endif
 
-  return TRUE;
+    return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winpixmap.c b/xorg-server/hw/xwin/winpixmap.c
index 82b6bbb5c..cb8ba9103 100644
--- a/xorg-server/hw/xwin/winpixmap.c
+++ b/xorg-server/hw/xwin/winpixmap.c
@@ -1,232 +1,223 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	drewry, september 1986

- *		Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-/*

- * Local prototypes

- */

-

-#if 0

-static void

-winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw);

-

-static void

-winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh);

-

-static void

-winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,

-			      int xrot, int yrot);

-#endif

-

-

-/* See Porting Layer Definition - p. 34 */

-/* See mfb/mfbpixmap.c - mfbCreatePixmap() */

-PixmapPtr

-winCreatePixmapNativeGDI (ScreenPtr pScreen,

-			  int iWidth, int iHeight,

-			  int iDepth, unsigned usage_hint)

-{

-  winPrivPixmapPtr	pPixmapPriv = NULL;

-  PixmapPtr		pPixmap = NULL;

-

-  /* Allocate pixmap memory */

-  pPixmap = AllocatePixmap (pScreen, 0);

-  if (!pPixmap)

-    {

-      ErrorF ("winCreatePixmapNativeGDI () - Couldn't allocate a pixmap\n");

-      return NullPixmap;

-    }

-

-#if CYGDEBUG

-  winDebug ("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",

-	  iWidth, iHeight, iDepth, usage_hint,

-	  PixmapBytePad (iWidth, iDepth));

-#endif

-

-  /* Setup pixmap values */

-  pPixmap->drawable.type = DRAWABLE_PIXMAP;

-  pPixmap->drawable.class = 0;

-  pPixmap->drawable.pScreen = pScreen;

-  pPixmap->drawable.depth = iDepth;

-  pPixmap->drawable.bitsPerPixel = BitsPerPixel (iDepth);

-  pPixmap->drawable.id = 0;

-  pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;

-  pPixmap->drawable.x = 0;

-  pPixmap->drawable.y = 0;

-  pPixmap->drawable.width = iWidth;

-  pPixmap->drawable.height = iHeight;

-  pPixmap->devKind = 0;

-  pPixmap->refcnt = 1;

-  pPixmap->devPrivate.ptr = NULL;

-  pPixmap->usage_hint = usage_hint;

-

-  /* Pixmap privates are allocated by AllocatePixmap */

-  pPixmapPriv = winGetPixmapPriv (pPixmap);

-

-  /* Initialize pixmap privates */

-  pPixmapPriv->hBitmap = NULL;

-  pPixmapPriv->hdcSelected = NULL;

-  pPixmapPriv->pbBits = NULL;

-  pPixmapPriv->dwScanlineBytes = PixmapBytePad (iWidth, iDepth);

-

-  /* Check for zero width or height pixmaps */

-  if (iWidth == 0 || iHeight == 0)

-    {

-      /* Don't allocate a real pixmap, just set fields and return */

-      return pPixmap;

-    }

-

-  /* Create a DIB for the pixmap */

-  pPixmapPriv->hBitmap = winCreateDIBNativeGDI (iWidth, iHeight, iDepth,

-						&pPixmapPriv->pbBits,

-						(BITMAPINFO **) &pPixmapPriv->pbmih);

-

-#if CYGDEBUG

-  winDebug ("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " \

-	  "screen: %08x\n",

-	  pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);

-#endif

-

-  return pPixmap;

-}

-

-

-/* 

- * See Porting Layer Definition - p. 35

- *

- * See mfb/mfbpixmap.c - mfbDestroyPixmap()

- */

-

-Bool

-winDestroyPixmapNativeGDI (PixmapPtr pPixmap)

-{

-  winPrivPixmapPtr		pPixmapPriv = NULL;

-  

-#if CYGDEBUG

-  winDebug ("winDestroyPixmapNativeGDI ()\n");

-#endif

-

-  /* Bail early if there is not a pixmap to destroy */

-  if (pPixmap == NULL)

-    {

-      ErrorF ("winDestroyPixmapNativeGDI () - No pixmap to destroy\n");

-      return TRUE;

-    }

-

-  /* Get a handle to the pixmap privates */

-  pPixmapPriv = winGetPixmapPriv (pPixmap);

-

-#if CYGDEBUG

-  winDebug ("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",

-	  pPixmapPriv->hBitmap);

-#endif

-

-  /* Decrement reference count, return if nonzero */

-  --pPixmap->refcnt;

-  if (pPixmap->refcnt != 0)

-    return TRUE;

-

-  /* Free GDI bitmap */

-  if (pPixmapPriv->hBitmap) DeleteObject (pPixmapPriv->hBitmap);

-  

-  /* Free the bitmap info header memory */

-  free(pPixmapPriv->pbmih);

-  pPixmapPriv->pbmih = NULL;

-

-  /* Free the pixmap memory */

-  free (pPixmap);

-  pPixmap = NULL;

-

-  return TRUE;

-}

-

-

-/* 

- * Not used yet

- */

-

-Bool

-winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,

-				int iWidth, int iHeight,

-				int iDepth,

-				int iBitsPerPixel,

-				int devKind,

-				pointer pPixData)

-{

-  FatalError ("winModifyPixmapHeaderNativeGDI ()\n");

-  return TRUE;

-}

-

-

-#if 0

-/* 

- * Not used yet.

- * See cfb/cfbpixmap.c

- */

-

-static void

-winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw)

-{

-  ErrorF ("winXRotatePixmap()\n");

-  /* fill in this function, look at CFB */

-}

-

-

-/*

- * Not used yet.

- * See cfb/cfbpixmap.c

- */

-static void

-winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh)

-{

-  ErrorF ("winYRotatePixmap()\n");

-  /* fill in this function, look at CFB */

-}

-

-

-/* 

- * Not used yet.

- * See cfb/cfbpixmap.c

- */

-

-static void

-winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,

-			      int xrot, int yrot)

-{

-  ErrorF ("winCopyRotatePixmap()\n");

-  /* fill in this function, look at CFB */

-}

-#endif

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	drewry, september 1986
+ *		Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+/*
+ * Local prototypes
+ */
+
+#if 0
+static void
+ winXRotatePixmapNativeGDI(PixmapPtr pPix, int rw);
+
+static void
+ winYRotatePixmapNativeGDI(PixmapPtr pPix, int rh);
+
+static void
+
+winCopyRotatePixmapNativeGDI(PixmapPtr psrcPix, PixmapPtr *ppdstPix,
+                             int xrot, int yrot);
+#endif
+
+/* See Porting Layer Definition - p. 34 */
+/* See mfb/mfbpixmap.c - mfbCreatePixmap() */
+PixmapPtr
+winCreatePixmapNativeGDI(ScreenPtr pScreen,
+                         int iWidth, int iHeight,
+                         int iDepth, unsigned usage_hint)
+{
+    winPrivPixmapPtr pPixmapPriv = NULL;
+    PixmapPtr pPixmap = NULL;
+
+    /* Allocate pixmap memory */
+    pPixmap = AllocatePixmap(pScreen, 0);
+    if (!pPixmap) {
+        ErrorF("winCreatePixmapNativeGDI () - Couldn't allocate a pixmap\n");
+        return NullPixmap;
+    }
+
+#if CYGDEBUG
+    winDebug("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",
+             iWidth, iHeight, iDepth, usage_hint,
+             PixmapBytePad(iWidth, iDepth));
+#endif
+
+    /* Setup pixmap values */
+    pPixmap->drawable.type = DRAWABLE_PIXMAP;
+    pPixmap->drawable.class = 0;
+    pPixmap->drawable.pScreen = pScreen;
+    pPixmap->drawable.depth = iDepth;
+    pPixmap->drawable.bitsPerPixel = BitsPerPixel(iDepth);
+    pPixmap->drawable.id = 0;
+    pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+    pPixmap->drawable.x = 0;
+    pPixmap->drawable.y = 0;
+    pPixmap->drawable.width = iWidth;
+    pPixmap->drawable.height = iHeight;
+    pPixmap->devKind = 0;
+    pPixmap->refcnt = 1;
+    pPixmap->devPrivate.ptr = NULL;
+    pPixmap->usage_hint = usage_hint;
+
+    /* Pixmap privates are allocated by AllocatePixmap */
+    pPixmapPriv = winGetPixmapPriv(pPixmap);
+
+    /* Initialize pixmap privates */
+    pPixmapPriv->hBitmap = NULL;
+    pPixmapPriv->hdcSelected = NULL;
+    pPixmapPriv->pbBits = NULL;
+    pPixmapPriv->dwScanlineBytes = PixmapBytePad(iWidth, iDepth);
+
+    /* Check for zero width or height pixmaps */
+    if (iWidth == 0 || iHeight == 0) {
+        /* Don't allocate a real pixmap, just set fields and return */
+        return pPixmap;
+    }
+
+    /* Create a DIB for the pixmap */
+    pPixmapPriv->hBitmap = winCreateDIBNativeGDI(iWidth, iHeight, iDepth,
+                                                 &pPixmapPriv->pbBits,
+                                                 (BITMAPINFO **) & pPixmapPriv->
+                                                 pbmih);
+
+#if CYGDEBUG
+    winDebug("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for "
+             "screen: %08x\n",
+             pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
+#endif
+
+    return pPixmap;
+}
+
+/* 
+ * See Porting Layer Definition - p. 35
+ *
+ * See mfb/mfbpixmap.c - mfbDestroyPixmap()
+ */
+
+Bool
+winDestroyPixmapNativeGDI(PixmapPtr pPixmap)
+{
+    winPrivPixmapPtr pPixmapPriv = NULL;
+
+#if CYGDEBUG
+    winDebug("winDestroyPixmapNativeGDI ()\n");
+#endif
+
+    /* Bail early if there is not a pixmap to destroy */
+    if (pPixmap == NULL) {
+        ErrorF("winDestroyPixmapNativeGDI () - No pixmap to destroy\n");
+        return TRUE;
+    }
+
+    /* Get a handle to the pixmap privates */
+    pPixmapPriv = winGetPixmapPriv(pPixmap);
+
+#if CYGDEBUG
+    winDebug("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
+             pPixmapPriv->hBitmap);
+#endif
+
+    /* Decrement reference count, return if nonzero */
+    --pPixmap->refcnt;
+    if (pPixmap->refcnt != 0)
+        return TRUE;
+
+    /* Free GDI bitmap */
+    if (pPixmapPriv->hBitmap)
+        DeleteObject(pPixmapPriv->hBitmap);
+
+    /* Free the bitmap info header memory */
+    free(pPixmapPriv->pbmih);
+    pPixmapPriv->pbmih = NULL;
+
+    /* Free the pixmap memory */
+    free(pPixmap);
+    pPixmap = NULL;
+
+    return TRUE;
+}
+
+/* 
+ * Not used yet
+ */
+
+Bool
+winModifyPixmapHeaderNativeGDI(PixmapPtr pPixmap,
+                               int iWidth, int iHeight,
+                               int iDepth,
+                               int iBitsPerPixel, int devKind, pointer pPixData)
+{
+    FatalError("winModifyPixmapHeaderNativeGDI ()\n");
+    return TRUE;
+}
+
+#if 0
+/* 
+ * Not used yet.
+ * See cfb/cfbpixmap.c
+ */
+
+static void
+winXRotatePixmapNativeGDI(PixmapPtr pPix, int rw)
+{
+    ErrorF("winXRotatePixmap()\n");
+    /* fill in this function, look at CFB */
+}
+
+/*
+ * Not used yet.
+ * See cfb/cfbpixmap.c
+ */
+static void
+winYRotatePixmapNativeGDI(PixmapPtr pPix, int rh)
+{
+    ErrorF("winYRotatePixmap()\n");
+    /* fill in this function, look at CFB */
+}
+
+/* 
+ * Not used yet.
+ * See cfb/cfbpixmap.c
+ */
+
+static void
+winCopyRotatePixmapNativeGDI(PixmapPtr psrcPix, PixmapPtr *ppdstPix,
+                             int xrot, int yrot)
+{
+    ErrorF("winCopyRotatePixmap()\n");
+    /* fill in this function, look at CFB */
+}
+#endif
diff --git a/xorg-server/hw/xwin/winpolyline.c b/xorg-server/hw/xwin/winpolyline.c
index db9dd345b..8b7e10645 100644
--- a/xorg-server/hw/xwin/winpolyline.c
+++ b/xorg-server/hw/xwin/winpolyline.c
@@ -35,23 +35,19 @@
 
 /* See Porting Layer Definition - p. 50 */
 void
-winPolyLineNativeGDI (DrawablePtr	pDrawable,
-		      GCPtr		pGC,
-		      int		mode,
-		      int		npt,
-		      DDXPointPtr	ppt)
+winPolyLineNativeGDI(DrawablePtr pDrawable,
+                     GCPtr pGC, int mode, int npt, DDXPointPtr ppt)
 {
-  switch (pGC->lineStyle)
-    {
+    switch (pGC->lineStyle) {
     case LineSolid:
-      if (pGC->lineWidth == 0)
-	return miZeroLine (pDrawable, pGC, mode, npt, ppt);
-      else
-	miWideLine (pDrawable, pGC, mode, npt, ppt);
-      break;
+        if (pGC->lineWidth == 0)
+            return miZeroLine(pDrawable, pGC, mode, npt, ppt);
+        else
+            miWideLine(pDrawable, pGC, mode, npt, ppt);
+        break;
     case LineOnOffDash:
     case LineDoubleDash:
-      miWideDash (pDrawable, pGC, mode, npt, ppt);
-      break;
+        miWideDash(pDrawable, pGC, mode, npt, ppt);
+        break;
     }
 }
diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c
index 76c30e9e3..86a788287 100644
--- a/xorg-server/hw/xwin/winprefs.c
+++ b/xorg-server/hw/xwin/winprefs.c
@@ -52,165 +52,142 @@
 extern const char *winGetBaseDir(void);
 
 /* From winprefslex.l, the real parser */
-extern int parse_file (FILE *fp);
-
+extern int parse_file(FILE * fp);
 
 /* Currently in use command ID, incremented each new menu item created */
 static int g_cmdid = STARTMENUID;
 
-
 /* Defined in DIX */
 extern char *display;
 
 /* Local function to handle comma-ified icon names */
-static HICON
-LoadImageComma (char *fname, int sx, int sy, int flags);
-
+static HICON LoadImageComma(char *fname, int sx, int sy, int flags);
 
 /*
  * Creates or appends a menu from a MENUPARSED structure
  */
 static HMENU
-MakeMenu (char *name,
-	  HMENU editMenu,
-	  int editItem)
+MakeMenu(char *name, HMENU editMenu, int editItem)
 {
-  int i;
-  int item;
-  MENUPARSED *m;
-  HMENU hmenu, hsub;
-
-  for (i=0; i<pref.menuItems; i++)
-    {
-      if (!strcmp(name, pref.menu[i].menuName))
-	break;
+    int i;
+    int item;
+    MENUPARSED *m;
+    HMENU hmenu, hsub;
+
+    for (i = 0; i < pref.menuItems; i++) {
+        if (!strcmp(name, pref.menu[i].menuName))
+            break;
     }
-  
-  /* Didn't find a match, bummer */
-  if (i==pref.menuItems)
-    {
-      ErrorF("MakeMenu: Can't find menu %s\n", name);
-      return NULL;
+
+    /* Didn't find a match, bummer */
+    if (i == pref.menuItems) {
+        ErrorF("MakeMenu: Can't find menu %s\n", name);
+        return NULL;
     }
-  
-  m = &(pref.menu[i]);
 
-  if (editMenu)
-    {
-      hmenu = editMenu;
-      item = editItem;
+    m = &(pref.menu[i]);
+
+    if (editMenu) {
+        hmenu = editMenu;
+        item = editItem;
     }
-  else
-    {
-      hmenu = CreatePopupMenu();
-      if (!hmenu)
-	{
-	  ErrorF("MakeMenu: Unable to CreatePopupMenu() %s\n", name);
-	  return NULL;
-	}
-      item = 0;
+    else {
+        hmenu = CreatePopupMenu();
+        if (!hmenu) {
+            ErrorF("MakeMenu: Unable to CreatePopupMenu() %s\n", name);
+            return NULL;
+        }
+        item = 0;
     }
 
-  /* Add the menu items */
-  for (i=0; i<m->menuItems; i++)
-    {
-      /* Only assign IDs one time... */
-      if ( m->menuItem[i].commandID == 0 )
-	m->menuItem[i].commandID = g_cmdid++;
-
-      switch (m->menuItem[i].cmd)
-	{
-	case CMD_EXEC:
-	case CMD_ALWAYSONTOP:
-	case CMD_RELOAD:
-	  InsertMenu (hmenu,
-		      item,
-		      MF_BYPOSITION|MF_ENABLED|MF_STRING,
-		      m->menuItem[i].commandID,
-		      m->menuItem[i].text);
-	  break;
-	  
-	case CMD_SEPARATOR:
-	  InsertMenu (hmenu,
-		      item,
-		      MF_BYPOSITION|MF_SEPARATOR,
-		      0,
-		      NULL);
-	  break;
-	  
-	case CMD_MENU:
-	  /* Recursive! */
-	  hsub = MakeMenu (m->menuItem[i].param, 0, 0);
-	  if (hsub)
-	    InsertMenu (hmenu,
-			item,
-			MF_BYPOSITION|MF_POPUP|MF_ENABLED|MF_STRING,
-			(UINT_PTR)hsub,
-			m->menuItem[i].text);
-	  break;
-	}
-
-      /* If item==-1 (means to add at end of menu) don't increment) */
-      if (item>=0)
-	item++;
+    /* Add the menu items */
+    for (i = 0; i < m->menuItems; i++) {
+        /* Only assign IDs one time... */
+        if (m->menuItem[i].commandID == 0)
+            m->menuItem[i].commandID = g_cmdid++;
+
+        switch (m->menuItem[i].cmd) {
+        case CMD_EXEC:
+        case CMD_ALWAYSONTOP:
+        case CMD_RELOAD:
+            InsertMenu(hmenu,
+                       item,
+                       MF_BYPOSITION | MF_ENABLED | MF_STRING,
+                       m->menuItem[i].commandID, m->menuItem[i].text);
+            break;
+
+        case CMD_SEPARATOR:
+            InsertMenu(hmenu, item, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+            break;
+
+        case CMD_MENU:
+            /* Recursive! */
+            hsub = MakeMenu(m->menuItem[i].param, 0, 0);
+            if (hsub)
+                InsertMenu(hmenu,
+                           item,
+                           MF_BYPOSITION | MF_POPUP | MF_ENABLED | MF_STRING,
+                           (UINT_PTR) hsub, m->menuItem[i].text);
+            break;
+        }
+
+        /* If item==-1 (means to add at end of menu) don't increment) */
+        if (item >= 0)
+            item++;
     }
 
-  return hmenu;
+    return hmenu;
 }
 
-
 #ifdef XWIN_MULTIWINDOW
 /*
  * Callback routine that is executed once per window class.
  * Removes or creates custom window settings depending on LPARAM
  */
 static wBOOL CALLBACK
-ReloadEnumWindowsProc (HWND hwnd, LPARAM lParam)
+ReloadEnumWindowsProc(HWND hwnd, LPARAM lParam)
 {
-  HICON   hicon;
-  Window  wid;
+    HICON hicon;
+    Window wid;
 
-  if (!hwnd) {
-    ErrorF("ReloadEnumWindowsProc: hwnd==NULL!\n");
-    return FALSE;
-  }
+    if (!hwnd) {
+        ErrorF("ReloadEnumWindowsProc: hwnd==NULL!\n");
+        return FALSE;
+    }
 
-  /* It's our baby, either clean or dirty it */
-  if (lParam==FALSE) 
-    {
-      /* Reset the window's icon to undefined. */
-      hicon = (HICON)SendMessage(hwnd, WM_SETICON, ICON_BIG, 0);
+    /* It's our baby, either clean or dirty it */
+    if (lParam == FALSE) {
+        /* Reset the window's icon to undefined. */
+        hicon = (HICON) SendMessage(hwnd, WM_SETICON, ICON_BIG, 0);
 
-      /* If the old icon is generated on-the-fly, get rid of it, will regen */
-      winDestroyIcon (hicon);
+        /* If the old icon is generated on-the-fly, get rid of it, will regen */
+        winDestroyIcon(hicon);
 
-      /* Same for the small icon */
-      hicon = (HICON)SendMessage(hwnd, WM_SETICON, ICON_SMALL, 0);
-      winDestroyIcon (hicon);
+        /* Same for the small icon */
+        hicon = (HICON) SendMessage(hwnd, WM_SETICON, ICON_SMALL, 0);
+        winDestroyIcon(hicon);
 
-      /* Remove any menu additions; bRevert=TRUE destroys any modified menus */
-      GetSystemMenu (hwnd, TRUE);
-      
-      /* This window is now clean of our taint (but with undefined icons) */
+        /* Remove any menu additions; bRevert=TRUE destroys any modified menus */
+        GetSystemMenu(hwnd, TRUE);
+
+        /* This window is now clean of our taint (but with undefined icons) */
     }
-  else
-    {
-      /* winUpdateIcon() will set the icon default, dynamic, or from xwinrc */
-      wid = (Window)GetProp (hwnd, WIN_WID_PROP);
-      if (wid)
-	winUpdateIcon (wid);
+    else {
+        /* winUpdateIcon() will set the icon default, dynamic, or from xwinrc */
+        wid = (Window) GetProp(hwnd, WIN_WID_PROP);
+        if (wid)
+            winUpdateIcon(wid);
 
-      /* Update the system menu for this window */
-      SetupSysMenu ((unsigned long)hwnd);
+        /* Update the system menu for this window */
+        SetupSysMenu((unsigned long) hwnd);
 
-      /* That was easy... */
+        /* That was easy... */
     }
 
-  return TRUE;
+    return TRUE;
 }
 #endif
 
-
 /*
  * Removes any custom icons in classes, custom menus, etc.
  * Frees all members in pref structure.
@@ -218,353 +195,327 @@ ReloadEnumWindowsProc (HWND hwnd, LPARAM lParam)
  * Set custom icons and menus again.
  */
 static void
-ReloadPrefs (void)
+ReloadPrefs(void)
 {
-  int i;
+    int i;
 
 #ifdef XWIN_MULTIWINDOW
-  /* First, iterate over all windows, deleting their icons and custom menus.
-   * This is really only needed because winDestroyIcon() will try to
-   * destroy the old global icons, which will have changed.
-   * It is probably better to set a windows USER_DATA to flag locally defined
-   * icons, and use that to accurately know when to destroy old icons.
-   */
-  EnumThreadWindows (g_dwCurrentThreadID, ReloadEnumWindowsProc, FALSE);
+    /* First, iterate over all windows, deleting their icons and custom menus.
+     * This is really only needed because winDestroyIcon() will try to
+     * destroy the old global icons, which will have changed.
+     * It is probably better to set a windows USER_DATA to flag locally defined
+     * icons, and use that to accurately know when to destroy old icons.
+     */
+    EnumThreadWindows(g_dwCurrentThreadID, ReloadEnumWindowsProc, FALSE);
 #endif
-  
-  /* Now, free/clear all info from our prefs structure */
-  for (i=0; i<pref.menuItems; i++)
-    free (pref.menu[i].menuItem);
-  free (pref.menu);
-  pref.menu = NULL;
-  pref.menuItems = 0;
-
-  pref.rootMenuName[0] = 0;
-
-  free (pref.sysMenu);
-  pref.sysMenuItems = 0;
-
-  pref.defaultSysMenuName[0] = 0;
-  pref.defaultSysMenuPos = 0;
-
-  pref.iconDirectory[0] = 0;
-  pref.defaultIconName[0] = 0;
-  pref.trayIconName[0] = 0;
-
-  for (i=0; i<pref.iconItems; i++)
-    if (pref.icon[i].hicon)
-      DestroyIcon ((HICON)pref.icon[i].hicon);
-  free (pref.icon);
-  pref.icon = NULL;
-  pref.iconItems = 0;
-  
-  /* Free global default X icon */
-  if (g_hIconX) 
-    DestroyIcon (g_hIconX);
-  if (g_hSmallIconX)
-    DestroyIcon (g_hSmallIconX);  
-
-  /* Reset the custom command IDs */
-  g_cmdid = STARTMENUID;
-
-  /* Load the updated resource file */
-  LoadPreferences();
-
-  g_hIconX = NULL;
-  g_hSmallIconX = NULL;
+
+    /* Now, free/clear all info from our prefs structure */
+    for (i = 0; i < pref.menuItems; i++)
+        free(pref.menu[i].menuItem);
+    free(pref.menu);
+    pref.menu = NULL;
+    pref.menuItems = 0;
+
+    pref.rootMenuName[0] = 0;
+
+    free(pref.sysMenu);
+    pref.sysMenuItems = 0;
+
+    pref.defaultSysMenuName[0] = 0;
+    pref.defaultSysMenuPos = 0;
+
+    pref.iconDirectory[0] = 0;
+    pref.defaultIconName[0] = 0;
+    pref.trayIconName[0] = 0;
+
+    for (i = 0; i < pref.iconItems; i++)
+        if (pref.icon[i].hicon)
+            DestroyIcon((HICON) pref.icon[i].hicon);
+    free(pref.icon);
+    pref.icon = NULL;
+    pref.iconItems = 0;
+
+    /* Free global default X icon */
+    if (g_hIconX)
+        DestroyIcon(g_hIconX);
+    if (g_hSmallIconX)
+        DestroyIcon(g_hSmallIconX);
+
+    /* Reset the custom command IDs */
+    g_cmdid = STARTMENUID;
+
+    /* Load the updated resource file */
+    LoadPreferences();
+
+    g_hIconX = NULL;
+    g_hSmallIconX = NULL;
 
 #ifdef XWIN_MULTIWINDOW
-  winInitGlobalIcons();
+    winInitGlobalIcons();
 #endif
-  
+
 #ifdef XWIN_MULTIWINDOW
-  /* Rebuild the icons and menus */
-  EnumThreadWindows (g_dwCurrentThreadID, ReloadEnumWindowsProc, TRUE);
+    /* Rebuild the icons and menus */
+    EnumThreadWindows(g_dwCurrentThreadID, ReloadEnumWindowsProc, TRUE);
 #endif
 
-  /* Whew, done */
+    /* Whew, done */
 }
 
 /*
  * Check/uncheck the ALWAYSONTOP items in this menu
  */
 void
-HandleCustomWM_INITMENU(unsigned long hwndIn,
-			unsigned long hmenuIn)
+HandleCustomWM_INITMENU(unsigned long hwndIn, unsigned long hmenuIn)
 {
-  HWND    hwnd;
-  HMENU   hmenu;
-  DWORD   dwExStyle;
-  int     i, j;
-
-  hwnd = (HWND)hwndIn;
-  hmenu = (HMENU)hmenuIn;
-  if (!hwnd || !hmenu) 
-    return;
-  
-  if (GetWindowLongPtr(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)
-    dwExStyle = MF_BYCOMMAND | MF_CHECKED;
-  else
-    dwExStyle = MF_BYCOMMAND | MF_UNCHECKED;
-
-  for (i=0; i<pref.menuItems; i++)
-    for (j=0; j<pref.menu[i].menuItems; j++)
-      if (pref.menu[i].menuItem[j].cmd==CMD_ALWAYSONTOP)
-	CheckMenuItem (hmenu, pref.menu[i].menuItem[j].commandID, dwExStyle );
-  
+    HWND hwnd;
+    HMENU hmenu;
+    DWORD dwExStyle;
+    int i, j;
+
+    hwnd = (HWND) hwndIn;
+    hmenu = (HMENU) hmenuIn;
+    if (!hwnd || !hmenu)
+        return;
+
+    if (GetWindowLongPtr(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)
+        dwExStyle = MF_BYCOMMAND | MF_CHECKED;
+    else
+        dwExStyle = MF_BYCOMMAND | MF_UNCHECKED;
+
+    for (i = 0; i < pref.menuItems; i++)
+        for (j = 0; j < pref.menu[i].menuItems; j++)
+            if (pref.menu[i].menuItem[j].cmd == CMD_ALWAYSONTOP)
+                CheckMenuItem(hmenu, pref.menu[i].menuItem[j].commandID,
+                              dwExStyle);
+
 }
-    
+
 /*
  * Searches for the custom WM_COMMAND command ID and performs action.
  * Return TRUE if command is proccessed, FALSE otherwise.
  */
 Bool
-HandleCustomWM_COMMAND (unsigned long hwndIn,
-			int           command)
+HandleCustomWM_COMMAND(unsigned long hwndIn, int command)
 {
-  HWND hwnd;
-  int i, j;
-  MENUPARSED *m;
-  DWORD			dwExStyle;
-
-  hwnd = (HWND)hwndIn;
-
-  if (!command)
-    return FALSE;
-
-  for (i=0; i<pref.menuItems; i++)
-    {
-      m = &(pref.menu[i]);
-      for (j=0; j<m->menuItems; j++)
-	{
-	  if (command==m->menuItem[j].commandID)
-	    {
-	      /* Match! */
-	      switch(m->menuItem[j].cmd)
-		{
+    HWND hwnd;
+    int i, j;
+    MENUPARSED *m;
+    DWORD dwExStyle;
+
+    hwnd = (HWND) hwndIn;
+
+    if (!command)
+        return FALSE;
+
+    for (i = 0; i < pref.menuItems; i++) {
+        m = &(pref.menu[i]);
+        for (j = 0; j < m->menuItems; j++) {
+            if (command == m->menuItem[j].commandID) {
+                /* Match! */
+                switch (m->menuItem[j].cmd) {
 #ifdef __CYGWIN__
-		case CMD_EXEC:
-		  if (fork()==0)
-		    {
-		      struct rlimit rl;
-		      unsigned long i;
-
-		      /* Close any open descriptors except for STD* */
-		      getrlimit (RLIMIT_NOFILE, &rl);
-		      for (i = STDERR_FILENO+1; i < rl.rlim_cur; i++)
-			close(i);
-
-		      /* Disassociate any TTYs */
-		      setsid();
-
-		      execl ("/bin/sh",
-			     "/bin/sh",
-			     "-c",
-			     m->menuItem[j].param,
-			     NULL);
-		      exit (0);
-		    }
-		  else
-		    return TRUE;
-		  break;
+                case CMD_EXEC:
+                    if (fork() == 0) {
+                        struct rlimit rl;
+                        unsigned long i;
+
+                        /* Close any open descriptors except for STD* */
+                        getrlimit(RLIMIT_NOFILE, &rl);
+                        for (i = STDERR_FILENO + 1; i < rl.rlim_cur; i++)
+                            close(i);
+
+                        /* Disassociate any TTYs */
+                        setsid();
+
+                        execl("/bin/sh",
+                              "/bin/sh", "-c", m->menuItem[j].param, NULL);
+                        exit(0);
+                    }
+                    else
+                        return TRUE;
+                    break;
 #else
-		case CMD_EXEC:
-                  {
-		    /* Start process without console window */
-		    STARTUPINFO start;
-		    PROCESS_INFORMATION child;
-
-		    memset (&start, 0, sizeof (start));
-		    start.cb = sizeof (start);
-		    start.dwFlags = STARTF_USESHOWWINDOW;
-		    start.wShowWindow = SW_HIDE;
-
-		    memset (&child, 0, sizeof (child));
-
-		    if (CreateProcess (NULL, m->menuItem[j].param, NULL, NULL, FALSE, 0,
-				       NULL, NULL, &start, &child))
-		    {
-			CloseHandle (child.hThread);
-			CloseHandle (child.hProcess);
-		    }
-		    else
-			MessageBox(NULL, m->menuItem[j].param, "Mingrc Exec Command Error!", MB_OK | MB_ICONEXCLAMATION);
-                  }
-		  return TRUE;
+                case CMD_EXEC:
+                {
+                    /* Start process without console window */
+                    STARTUPINFO start;
+                    PROCESS_INFORMATION child;
+
+                    memset(&start, 0, sizeof(start));
+                    start.cb = sizeof(start);
+                    start.dwFlags = STARTF_USESHOWWINDOW;
+                    start.wShowWindow = SW_HIDE;
+
+                    memset(&child, 0, sizeof(child));
+
+                    if (CreateProcess
+                        (NULL, m->menuItem[j].param, NULL, NULL, FALSE, 0, NULL,
+                         NULL, &start, &child)) {
+                        CloseHandle(child.hThread);
+                        CloseHandle(child.hProcess);
+                    }
+                    else
+                        MessageBox(NULL, m->menuItem[j].param,
+                                   "Mingrc Exec Command Error!",
+                                   MB_OK | MB_ICONEXCLAMATION);
+                }
+                    return TRUE;
 #endif
-		case CMD_ALWAYSONTOP:
-		  if (!hwnd)
-		    return FALSE;
-
-		  /* Get extended window style */
-		  dwExStyle = GetWindowLongPtr(hwnd, GWL_EXSTYLE);
-		  
-		  /* Handle topmost windows */
-		  if (dwExStyle & WS_EX_TOPMOST)
-		    SetWindowPos (hwnd,
-				  HWND_NOTOPMOST,
-				  0, 0,
-				  0, 0,
-				  SWP_NOSIZE | SWP_NOMOVE);
-		  else
-		    SetWindowPos (hwnd,
-				  HWND_TOPMOST,
-				  0, 0,
-				  0, 0,
-				  SWP_NOSIZE | SWP_NOMOVE);
+                case CMD_ALWAYSONTOP:
+                    if (!hwnd)
+                        return FALSE;
+
+                    /* Get extended window style */
+                    dwExStyle = GetWindowLongPtr(hwnd, GWL_EXSTYLE);
+
+                    /* Handle topmost windows */
+                    if (dwExStyle & WS_EX_TOPMOST)
+                        SetWindowPos(hwnd,
+                                     HWND_NOTOPMOST,
+                                     0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
+                    else
+                        SetWindowPos(hwnd,
+                                     HWND_TOPMOST,
+                                     0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
 #if XWIN_MULTIWINDOW
-		  /* Reflect the changed Z order */
-		  winReorderWindowsMultiWindow ();
+                    /* Reflect the changed Z order */
+                    winReorderWindowsMultiWindow();
 #endif
-		  return TRUE;
-		  
-		case CMD_RELOAD:
-		  ReloadPrefs();
-		  return TRUE;
-
-		default:
-		  return FALSE;
-	      }
-	    } /* match */
-	} /* for j */
-    } /* for i */
-
-  return FALSE;
-}
+                    return TRUE;
 
+                case CMD_RELOAD:
+                    ReloadPrefs();
+                    return TRUE;
+
+                default:
+                    return FALSE;
+                }
+            }                   /* match */
+        }                       /* for j */
+    }                           /* for i */
+
+    return FALSE;
+}
 
 #ifdef XWIN_MULTIWINDOW
 /*
  * Add the default or a custom menu depending on the class match
  */
 void
-SetupSysMenu (unsigned long hwndIn)
+SetupSysMenu(unsigned long hwndIn)
 {
-  HWND    hwnd;
-  HMENU	  sys;
-  int     i;
-  WindowPtr pWin;
-  char *res_name, *res_class;
-
-  hwnd = (HWND)hwndIn;
-  if (!hwnd)
-    return;
-
-  pWin = GetProp (hwnd, WIN_WINDOW_PROP);
-  
-  sys = GetSystemMenu (hwnd, FALSE);
-  if (!sys)
-    return;
-
-  if (pWin)
-    {
-      /* First see if there's a class match... */
-      if (winMultiWindowGetClassHint (pWin, &res_name, &res_class))
-	{
-	  for (i=0; i<pref.sysMenuItems; i++)
-	    {
-	      if (!strcmp(pref.sysMenu[i].match, res_name) ||
-		  !strcmp(pref.sysMenu[i].match, res_class) ) 
-		{
-		  free(res_name);
-		  free(res_class);
-  
-		  MakeMenu (pref.sysMenu[i].menuName, sys,
-			    pref.sysMenu[i].menuPos==AT_START?0:-1);
-		  return;
-		}
-	    }
-	  
-	  /* No match, just free alloc'd strings */
-	  free(res_name);
-	  free(res_class);
-	} /* Found wm_class */
-    } /* if pwin */
-
-  /* Fallback to system default */
-  if (pref.defaultSysMenuName[0])
-    {
-      if (pref.defaultSysMenuPos==AT_START)
-	MakeMenu (pref.defaultSysMenuName, sys, 0);
-      else
-	MakeMenu (pref.defaultSysMenuName, sys, -1);
+    HWND hwnd;
+    HMENU sys;
+    int i;
+    WindowPtr pWin;
+    char *res_name, *res_class;
+
+    hwnd = (HWND) hwndIn;
+    if (!hwnd)
+        return;
+
+    pWin = GetProp(hwnd, WIN_WINDOW_PROP);
+
+    sys = GetSystemMenu(hwnd, FALSE);
+    if (!sys)
+        return;
+
+    if (pWin) {
+        /* First see if there's a class match... */
+        if (winMultiWindowGetClassHint(pWin, &res_name, &res_class)) {
+            for (i = 0; i < pref.sysMenuItems; i++) {
+                if (!strcmp(pref.sysMenu[i].match, res_name) ||
+                    !strcmp(pref.sysMenu[i].match, res_class)) {
+                    free(res_name);
+                    free(res_class);
+
+                    MakeMenu(pref.sysMenu[i].menuName, sys,
+                             pref.sysMenu[i].menuPos == AT_START ? 0 : -1);
+                    return;
+                }
+            }
+
+            /* No match, just free alloc'd strings */
+            free(res_name);
+            free(res_class);
+        }                       /* Found wm_class */
+    }                           /* if pwin */
+
+    /* Fallback to system default */
+    if (pref.defaultSysMenuName[0]) {
+        if (pref.defaultSysMenuPos == AT_START)
+            MakeMenu(pref.defaultSysMenuName, sys, 0);
+        else
+            MakeMenu(pref.defaultSysMenuName, sys, -1);
     }
 }
 #endif
 
-
 /*
  * Possibly add a menu to the toolbar icon
  */
 void
-SetupRootMenu (unsigned long hmenuRoot)
+SetupRootMenu(unsigned long hmenuRoot)
 {
-  HMENU root;
+    HMENU root;
 
-  root = (HMENU)hmenuRoot;
-  if (!root)
-    return;
+    root = (HMENU) hmenuRoot;
+    if (!root)
+        return;
 
-  if (pref.rootMenuName[0])
-    {
-      MakeMenu(pref.rootMenuName, root, 0);
+    if (pref.rootMenuName[0]) {
+        MakeMenu(pref.rootMenuName, root, 0);
     }
 }
 
-
 /*
  * Check for and return an overridden default ICON specified in the prefs
  */
 HICON
 winOverrideDefaultIcon(int size)
 {
-  HICON hicon;
-  
-  if (pref.defaultIconName[0])
-    {
-      hicon = LoadImageComma (pref.defaultIconName, size, size, 0);
-      if (hicon==NULL)
-        ErrorF ("winOverrideDefaultIcon: LoadImageComma(%s) failed\n",
-		pref.defaultIconName);
-
-      return hicon;
+    HICON hicon;
+
+    if (pref.defaultIconName[0]) {
+        hicon = LoadImageComma(pref.defaultIconName, size, size, 0);
+        if (hicon == NULL)
+            ErrorF("winOverrideDefaultIcon: LoadImageComma(%s) failed\n",
+                   pref.defaultIconName);
+
+        return hicon;
     }
 
-  return 0;
+    return 0;
 }
 
-
 /*
  * Return the HICON to use in the taskbar notification area
  */
 HICON
 winTaskbarIcon(void)
 {
-  HICON hicon;
-
-  hicon = 0;
-  /* First try and load an overridden, if success then return it */
-  if (pref.trayIconName[0])
-    {
-      hicon = LoadImageComma (pref.trayIconName,
-			      GetSystemMetrics (SM_CXSMICON),
-			      GetSystemMetrics (SM_CYSMICON),
-			      0 );
+    HICON hicon;
+
+    hicon = 0;
+    /* First try and load an overridden, if success then return it */
+    if (pref.trayIconName[0]) {
+        hicon = LoadImageComma(pref.trayIconName,
+                               GetSystemMetrics(SM_CXSMICON),
+                               GetSystemMetrics(SM_CYSMICON), 0);
     }
 
-  /* Otherwise return the default */
-  if (!hicon)
-    hicon =  (HICON) LoadImage (g_hInstance,
-				MAKEINTRESOURCE(IDI_XWIN),
-				IMAGE_ICON,
-				GetSystemMetrics (SM_CXSMICON),
-				GetSystemMetrics (SM_CYSMICON),
-				0);
+    /* Otherwise return the default */
+    if (!hicon)
+        hicon = (HICON) LoadImage(g_hInstance,
+                                  MAKEINTRESOURCE(IDI_XWIN),
+                                  IMAGE_ICON,
+                                  GetSystemMetrics(SM_CXSMICON),
+                                  GetSystemMetrics(SM_CYSMICON), 0);
 
-  return hicon;
+    return hicon;
 }
 
-
 /*
  * Parse a filename to extract an icon:
  *  If fname is exactly ",nnn" then extract icon from our resource
@@ -572,64 +523,53 @@ winTaskbarIcon(void)
  *  else try to load it as an .ico file and if that fails return NULL
  */
 static HICON
-LoadImageComma (char *fname, int sx, int sy, int flags)
+LoadImageComma(char *fname, int sx, int sy, int flags)
 {
-  HICON  hicon;
-  int    index;
-  char   file[PATH_MAX+NAME_MAX+2];
-
-  /* Some input error checking */
-  if (!fname || !fname[0])
-    return NULL;
-
-  index = 0;
-  hicon = NULL;
-
-  if (fname[0]==',')
-    {
-      /* It's the XWIN.EXE resource they want */
-      index = atoi (fname+1);
-      hicon = LoadImage (g_hInstance,
-                        MAKEINTRESOURCE(index),
-                        IMAGE_ICON,
-                        sx,
-                        sy,
-                        flags);
+    HICON hicon;
+    int index;
+    char file[PATH_MAX + NAME_MAX + 2];
+
+    /* Some input error checking */
+    if (!fname || !fname[0])
+        return NULL;
+
+    index = 0;
+    hicon = NULL;
+
+    if (fname[0] == ',') {
+        /* It's the XWIN.EXE resource they want */
+        index = atoi(fname + 1);
+        hicon = LoadImage(g_hInstance,
+                          MAKEINTRESOURCE(index), IMAGE_ICON, sx, sy, flags);
     }
-  else
-    {
-      file[0] = 0;
-      /* Prepend path if not given a "X:\" filename */
-      if ( !(fname[0] && fname[1]==':' && fname[2]=='\\') )
-        {
-         strcpy (file, pref.iconDirectory);
-         if (pref.iconDirectory[0])
-           if (fname[strlen(fname)-1]!='\\')
-             strcat (file, "\\");
+    else {
+        file[0] = 0;
+        /* Prepend path if not given a "X:\" filename */
+        if (!(fname[0] && fname[1] == ':' && fname[2] == '\\')) {
+            strcpy(file, pref.iconDirectory);
+            if (pref.iconDirectory[0])
+                if (fname[strlen(fname) - 1] != '\\')
+                    strcat(file, "\\");
+        }
+        strcat(file, fname);
+
+        if (strrchr(file, ',')) {
+            /* Specified as <fname>,<index> */
+
+            *(strrchr(file, ',')) = 0;  /* End string at comma */
+            index = atoi(strrchr(fname, ',') + 1);
+            hicon = ExtractIcon(g_hInstance, file, index);
+        }
+        else {
+            /* Just an .ico file... */
+
+            hicon = (HICON) LoadImage(NULL,
+                                      file,
+                                      IMAGE_ICON,
+                                      sx, sy, LR_LOADFROMFILE | flags);
         }
-      strcat (file, fname);
-
-      if (strrchr (file, ','))
-       {
-         /* Specified as <fname>,<index> */
-
-         *(strrchr (file, ',')) = 0; /* End string at comma */
-         index = atoi (strrchr (fname, ',') + 1);
-         hicon = ExtractIcon (g_hInstance, file, index);
-       }
-      else
-       {
-         /* Just an .ico file... */
-
-         hicon = (HICON)LoadImage (NULL,
-                                   file,
-                                   IMAGE_ICON,
-                                   sx,
-                                   sy,
-                                   LR_LOADFROMFILE|flags);
-       }
     }
-  return hicon;
+    return hicon;
 }
 
 /*
@@ -637,54 +577,52 @@ LoadImageComma (char *fname, int sx, int sy, int flags)
  * ICONS{} section in the prefs file, and load the icon from a file
  */
 HICON
-winOverrideIcon (unsigned long longWin)
+winOverrideIcon(unsigned long longWin)
 {
-  WindowPtr pWin = (WindowPtr) longWin;
-  char *res_name, *res_class;
-  int i;
-  HICON hicon;
-  char *wmName;
+    WindowPtr pWin = (WindowPtr) longWin;
+    char *res_name, *res_class;
+    int i;
+    HICON hicon;
+    char *wmName;
+
+    if (pWin == NULL)
+        return 0;
+
+    /* If we can't find the class, we can't override from default! */
+    if (!winMultiWindowGetClassHint(pWin, &res_name, &res_class))
+        return 0;
+
+    winMultiWindowGetWMName(pWin, &wmName);
+
+    for (i = 0; i < pref.iconItems; i++) {
+        if (!strcmp(pref.icon[i].match, res_name) ||
+            !strcmp(pref.icon[i].match, res_class) ||
+            (wmName && strstr(wmName, pref.icon[i].match))) {
+            free(res_name);
+            free(res_class);
+            free(wmName);
+
+            if (pref.icon[i].hicon)
+                return pref.icon[i].hicon;
+
+            hicon = LoadImageComma(pref.icon[i].iconFile, 0, 0, LR_DEFAULTSIZE);
+            if (hicon == NULL)
+                ErrorF("winOverrideIcon: LoadImageComma(%s) failed\n",
+                       pref.icon[i].iconFile);
+
+            pref.icon[i].hicon = hicon;
+            return hicon;
+        }
+    }
 
-  if (pWin==NULL)
-    return 0;
+    /* Didn't find the icon, fail gracefully */
+    free(res_name);
+    free(res_class);
+    free(wmName);
 
-  /* If we can't find the class, we can't override from default! */
-  if (!winMultiWindowGetClassHint (pWin, &res_name, &res_class))
     return 0;
-
-  winMultiWindowGetWMName (pWin, &wmName);
-  
-  for (i=0; i<pref.iconItems; i++) {
-    if (!strcmp(pref.icon[i].match, res_name) ||
-	!strcmp(pref.icon[i].match, res_class) ||
-	(wmName && strstr(wmName, pref.icon[i].match))) 
-      {
-	free (res_name);
-	free (res_class);
-	free(wmName);
-
-	if (pref.icon[i].hicon)
-	  return pref.icon[i].hicon;
-
-       hicon = LoadImageComma (pref.icon[i].iconFile, 0, 0, LR_DEFAULTSIZE);
-       if (hicon==NULL)
-         ErrorF ("winOverrideIcon: LoadImageComma(%s) failed\n",
-                  pref.icon[i].iconFile);
-
-	pref.icon[i].hicon = hicon;
-	return hicon;
-      }
-  }
-  
-  /* Didn't find the icon, fail gracefully */
-  free (res_name);
-  free (res_class);
-  free(wmName);
-
-  return 0;
 }
 
-
 /*
  * Should we free this icon or leave it in memory (is it part of our
  * ICONS{} overrides)?
@@ -692,183 +630,164 @@ winOverrideIcon (unsigned long longWin)
 int
 winIconIsOverride(unsigned hiconIn)
 {
-  HICON hicon;
-  int i;
+    HICON hicon;
+    int i;
 
-  hicon = (HICON)hiconIn;
+    hicon = (HICON) hiconIn;
 
-  if (!hicon)
-    return 0;
-  
-  for (i=0; i<pref.iconItems; i++)
-    if ((HICON)pref.icon[i].hicon == hicon)
-      return 1;
-  
-  return 0;
-}
+    if (!hicon)
+        return 0;
 
+    for (i = 0; i < pref.iconItems; i++)
+        if ((HICON) pref.icon[i].hicon == hicon)
+            return 1;
 
+    return 0;
+}
 
 /*
  * Open and parse the XWinrc config file @path.
  * If @path is NULL, use the built-in default.
  */
 static int
-winPrefsLoadPreferences (char *path)
+winPrefsLoadPreferences(char *path)
 {
-  FILE *prefFile = NULL;
-
-  if (path)
-    prefFile = fopen (path, "r");
-  else
-    {
-      char defaultPrefs[] =
-        "MENU rmenu {\n"
-        "  \"How to customize this menu\" EXEC \"xterm +tb -e man XWinrc\"\n"
-        "  \"Launch xterm\" EXEC xterm\n"
-        "  \"Load .XWinrc\" RELOAD\n"
-        "  SEPARATOR\n"
-        "}\n"
-        "\n"
-        "ROOTMENU rmenu\n";
-
-      path = "built-in default";
-      prefFile = fmemopen(defaultPrefs, strlen(defaultPrefs), "r");
+    FILE *prefFile = NULL;
+
+    if (path)
+        prefFile = fopen(path, "r");
+    else {
+        char defaultPrefs[] =
+            "MENU rmenu {\n"
+            "  \"How to customize this menu\" EXEC \"xterm +tb -e man XWinrc\"\n"
+            "  \"Launch xterm\" EXEC xterm\n"
+            "  \"Load .XWinrc\" RELOAD\n"
+            "  SEPARATOR\n" "}\n" "\n" "ROOTMENU rmenu\n";
+
+        path = "built-in default";
+        prefFile = fmemopen(defaultPrefs, strlen(defaultPrefs), "r");
     }
 
-  if (!prefFile)
-    {
-      ErrorF ("LoadPreferences: %s not found\n", path);
-      return FALSE;
+    if (!prefFile) {
+        ErrorF("LoadPreferences: %s not found\n", path);
+        return FALSE;
     }
 
-  ErrorF ("LoadPreferences: Loading %s\n", path);
+    ErrorF("LoadPreferences: Loading %s\n", path);
 
-  if((parse_file (prefFile)) != 0)
-    {
-      ErrorF ("LoadPreferences: %s is badly formed!\n", path);
-      fclose (prefFile);
-      return FALSE;
+    if ((parse_file(prefFile)) != 0) {
+        ErrorF("LoadPreferences: %s is badly formed!\n", path);
+        fclose(prefFile);
+        return FALSE;
     }
 
-  fclose (prefFile);
-  return TRUE;
+    fclose(prefFile);
+    return TRUE;
 }
 
-
-
 /*
  * Try and open ~/.XWinrc and system.XWinrc
  * Load it into prefs structure for use by other functions
  */
 void
-LoadPreferences (void)
+LoadPreferences(void)
 {
-  char *home;
-  char fname[PATH_MAX+NAME_MAX+2];
-  char szDisplay[512];
-  char *szEnvDisplay;
-  int i, j;
-  char param[PARAM_MAX+1];
-  char *srcParam, *dstParam;
-  int parsed = FALSE;
-
-  /* First, clear all preference settings */
-  memset (&pref, 0, sizeof(pref));
-
-  /* Now try and find a ~/.xwinrc file */
-  home = getenv ("HOME");
-  if (home)
-    {
-      strcpy (fname, home);
-      if (fname[strlen(fname)-1]!='/')
-	strcat (fname, "/");
-      strcat (fname, ".XWinrc");
-      parsed = winPrefsLoadPreferences(fname);
+    char *home;
+    char fname[PATH_MAX + NAME_MAX + 2];
+    char szDisplay[512];
+    char *szEnvDisplay;
+    int i, j;
+    char param[PARAM_MAX + 1];
+    char *srcParam, *dstParam;
+    int parsed = FALSE;
+
+    /* First, clear all preference settings */
+    memset(&pref, 0, sizeof(pref));
+
+    /* Now try and find a ~/.xwinrc file */
+    home = getenv("HOME");
+    if (home) {
+        strcpy(fname, home);
+        if (fname[strlen(fname) - 1] != '/')
+            strcat(fname, "/");
+        strcat(fname, ".XWinrc");
+        parsed = winPrefsLoadPreferences(fname);
     }
 
-  /* No home file found, check system default */
-  if (!parsed)
-    {
-      char buffer[MAX_PATH];
+    /* No home file found, check system default */
+    if (!parsed) {
+        char buffer[MAX_PATH];
+
 #ifdef RELOCATE_PROJECTROOT
-      snprintf(buffer, sizeof(buffer), "%s\\system.XWinrc", winGetBaseDir());
+        snprintf(buffer, sizeof(buffer), "%s\\system.XWinrc", winGetBaseDir());
 #else
-      strncpy(buffer, SYSCONFDIR"/X11/system.XWinrc", sizeof(buffer));
+        strncpy(buffer, SYSCONFDIR "/X11/system.XWinrc", sizeof(buffer));
 #endif
-      buffer[sizeof(buffer)-1] = 0;
-      parsed = winPrefsLoadPreferences(buffer);
+        buffer[sizeof(buffer) - 1] = 0;
+        parsed = winPrefsLoadPreferences(buffer);
     }
 
-  /* Neither user nor system configuration found, or were badly formed */
-  if (!parsed)
-    {
-      ErrorF ("LoadPreferences: See \"man XWinrc\" to customize the XWin menu.\n");
-      parsed = winPrefsLoadPreferences(NULL);
+    /* Neither user nor system configuration found, or were badly formed */
+    if (!parsed) {
+        ErrorF
+            ("LoadPreferences: See \"man XWinrc\" to customize the XWin menu.\n");
+        parsed = winPrefsLoadPreferences(NULL);
     }
 
-  /* Setup a DISPLAY environment variable, need to allocate on heap */
-  /* because putenv doesn't copy the argument... */
-  snprintf (szDisplay, 512, "DISPLAY=127.0.0.1:%s.0", display);
-  szEnvDisplay = (char *)(malloc (strlen(szDisplay)+1));
-  if (szEnvDisplay)
-    {
-      strcpy (szEnvDisplay, szDisplay);
-      putenv (szEnvDisplay);
+    /* Setup a DISPLAY environment variable, need to allocate on heap */
+    /* because putenv doesn't copy the argument... */
+    snprintf(szDisplay, 512, "DISPLAY=127.0.0.1:%s.0", display);
+    szEnvDisplay = (char *) (malloc(strlen(szDisplay) + 1));
+    if (szEnvDisplay) {
+        strcpy(szEnvDisplay, szDisplay);
+        putenv(szEnvDisplay);
     }
 
-  /* Replace any "%display%" in menu commands with display string */
-  snprintf (szDisplay, 512, "127.0.0.1:%s.0", display);
-  for (i=0; i<pref.menuItems; i++)
-    {
-      for (j=0; j<pref.menu[i].menuItems; j++)
-	{
-	  if (pref.menu[i].menuItem[j].cmd==CMD_EXEC)
-	    {
-	      srcParam = pref.menu[i].menuItem[j].param;
-	      dstParam = param;
-	      while (*srcParam) {
-		if (!strncmp(srcParam, "%display%", 9))
-		  {
-		    memcpy (dstParam, szDisplay, strlen(szDisplay));
-		    dstParam += strlen(szDisplay);
-		    srcParam += 9;
-		  }
-		else
-		  {
-		    *dstParam = *srcParam;
-		    dstParam++;
-		    srcParam++;
-		  }
-	      }
-	      *dstParam = 0;
-	      strcpy (pref.menu[i].menuItem[j].param, param);
-	    } /* cmd==cmd_exec */
-	} /* for all menuitems */
-    } /* for all menus */
+    /* Replace any "%display%" in menu commands with display string */
+    snprintf(szDisplay, 512, "127.0.0.1:%s.0", display);
+    for (i = 0; i < pref.menuItems; i++) {
+        for (j = 0; j < pref.menu[i].menuItems; j++) {
+            if (pref.menu[i].menuItem[j].cmd == CMD_EXEC) {
+                srcParam = pref.menu[i].menuItem[j].param;
+                dstParam = param;
+                while (*srcParam) {
+                    if (!strncmp(srcParam, "%display%", 9)) {
+                        memcpy(dstParam, szDisplay, strlen(szDisplay));
+                        dstParam += strlen(szDisplay);
+                        srcParam += 9;
+                    }
+                    else {
+                        *dstParam = *srcParam;
+                        dstParam++;
+                        srcParam++;
+                    }
+                }
+                *dstParam = 0;
+                strcpy(pref.menu[i].menuItem[j].param, param);
+            }                   /* cmd==cmd_exec */
+        }                       /* for all menuitems */
+    }                           /* for all menus */
 
 }
 
-
 /*
  * Check for a match of the window class to one specified in the
  * STYLES{} section in the prefs file, and return the style type
  */
 unsigned long
-winOverrideStyle (char *res_name, char *res_class, char *wmName)
+winOverrideStyle(char *res_name, char *res_class, char *wmName)
 {
-  int i;
-
-  for (i=0; i<pref.styleItems; i++) {
-    if ((res_name && !strcmp(pref.style[i].match, res_name)) ||
-	(res_class && !strcmp(pref.style[i].match, res_class)) ||
-	(wmName && strstr(wmName, pref.style[i].match)))
-      {
-	if (pref.style[i].type)
-	  return pref.style[i].type;
-      }
-  }
-
-  /* Didn't find the style, fail gracefully */
-  return STYLE_NONE;
+    int i;
+
+    for (i = 0; i < pref.styleItems; i++) {
+        if ((res_name && !strcmp(pref.style[i].match, res_name)) ||
+            (res_class && !strcmp(pref.style[i].match, res_class)) ||
+            (wmName && strstr(wmName, pref.style[i].match))) {
+            if (pref.style[i].type)
+                return pref.style[i].type;
+        }
+    }
+
+    /* Didn't find the style, fail gracefully */
+    return STYLE_NONE;
 }
diff --git a/xorg-server/hw/xwin/winprefs.h b/xorg-server/hw/xwin/winprefs.h
index ecd0a3fbd..fcce8d840 100644
--- a/xorg-server/hw/xwin/winprefs.h
+++ b/xorg-server/hw/xwin/winprefs.h
@@ -45,146 +45,131 @@
 #ifndef NAME_MAX
 #define NAME_MAX PATH_MAX
 #endif
-#define MENU_MAX 128   /* Maximum string length of a menu name or item */
+#define MENU_MAX 128            /* Maximum string length of a menu name or item */
 #define PARAM_MAX (4*PATH_MAX)  /* Maximum length of a parameter to a MENU */
 
-
 /* Supported commands in a MENU {} statement */
-typedef enum MENUCOMMANDTYPE
-{
-  CMD_EXEC,         /* /bin/sh -c the parameter            */
-  CMD_MENU,         /* Display a popup menu named param    */
-  CMD_SEPARATOR,    /* Menu separator                      */
-  CMD_ALWAYSONTOP,  /* Toggle always-on-top mode           */
-  CMD_RELOAD        /* Reparse the .XWINRC file            */
+typedef enum MENUCOMMANDTYPE {
+    CMD_EXEC,                   /* /bin/sh -c the parameter            */
+    CMD_MENU,                   /* Display a popup menu named param    */
+    CMD_SEPARATOR,              /* Menu separator                      */
+    CMD_ALWAYSONTOP,            /* Toggle always-on-top mode           */
+    CMD_RELOAD                  /* Reparse the .XWINRC file            */
 } MENUCOMMANDTYPE;
 
-#define STYLE_NONE     (0L)    /* Dummy the first entry                      */
-#define STYLE_NOTITLE  (1L)    /* Force window style no titlebar             */
-#define STYLE_OUTLINE  (1L<<1) /* Force window style just thin-line border   */
-#define STYLE_NOFRAME  (1L<<2) /* Force window style no frame                */
-#define STYLE_TOPMOST  (1L<<3) /* Open a window always-on-top                */
-#define STYLE_MAXIMIZE (1L<<4) /* Open a window maximized                    */
-#define STYLE_MINIMIZE (1L<<5) /* Open a window minimized                    */
-#define STYLE_BOTTOM   (1L<<6) /* Open a window at the bottom of the Z order */
+#define STYLE_NONE     (0L)     /* Dummy the first entry                      */
+#define STYLE_NOTITLE  (1L)     /* Force window style no titlebar             */
+#define STYLE_OUTLINE  (1L<<1)  /* Force window style just thin-line border   */
+#define STYLE_NOFRAME  (1L<<2)  /* Force window style no frame                */
+#define STYLE_TOPMOST  (1L<<3)  /* Open a window always-on-top                */
+#define STYLE_MAXIMIZE (1L<<4)  /* Open a window maximized                    */
+#define STYLE_MINIMIZE (1L<<5)  /* Open a window minimized                    */
+#define STYLE_BOTTOM   (1L<<6)  /* Open a window at the bottom of the Z order */
 
 /* Where to place a system menu */
-typedef enum MENUPOSITION
-{
-  AT_START,   /* Place menu at the top of the system menu   */
-  AT_END      /* Put it at the bottom of the menu (default) */
+typedef enum MENUPOSITION {
+    AT_START,                   /* Place menu at the top of the system menu   */
+    AT_END                      /* Put it at the bottom of the menu (default) */
 } MENUPOSITION;
 
 /* Menu item definitions */
-typedef struct MENUITEM
-{
-  char text[MENU_MAX+1];   /* To be displayed in menu */
-  MENUCOMMANDTYPE cmd;     /* What should it do? */
-  char param[PARAM_MAX+1]; /* Any parameters? */
-  unsigned long commandID; /* Windows WM_COMMAND ID assigned at runtime */
+typedef struct MENUITEM {
+    char text[MENU_MAX + 1];    /* To be displayed in menu */
+    MENUCOMMANDTYPE cmd;        /* What should it do? */
+    char param[PARAM_MAX + 1];  /* Any parameters? */
+    unsigned long commandID;    /* Windows WM_COMMAND ID assigned at runtime */
 } MENUITEM;
 
 /* A completely read in menu... */
-typedef struct MENUPARSED
-{
-  char menuName[MENU_MAX+1]; /* What's it called in the text? */
-  MENUITEM *menuItem;        /* Array of items */
-  int menuItems;             /* How big's the array? */
+typedef struct MENUPARSED {
+    char menuName[MENU_MAX + 1];        /* What's it called in the text? */
+    MENUITEM *menuItem;         /* Array of items */
+    int menuItems;              /* How big's the array? */
 } MENUPARSED;
 
 /* To map between a window and a system menu to add for it */
-typedef struct SYSMENUITEM
-{
-  char match[MENU_MAX+1];    /* String to look for to apply this sysmenu */
-  char menuName[MENU_MAX+1]; /* Which menu to show? Used to set *menu */
-  MENUPOSITION menuPos;      /* Where to place it (ignored in root) */
+typedef struct SYSMENUITEM {
+    char match[MENU_MAX + 1];   /* String to look for to apply this sysmenu */
+    char menuName[MENU_MAX + 1];        /* Which menu to show? Used to set *menu */
+    MENUPOSITION menuPos;       /* Where to place it (ignored in root) */
 } SYSMENUITEM;
 
 /* To redefine icons for certain window types */
-typedef struct ICONITEM
-{
-  char match[MENU_MAX+1];             /* What string to search for? */
-  char iconFile[PATH_MAX+NAME_MAX+2]; /* Icon location, WIN32 path */
-  HICON hicon;                /* LoadImage() result */
+typedef struct ICONITEM {
+    char match[MENU_MAX + 1];   /* What string to search for? */
+    char iconFile[PATH_MAX + NAME_MAX + 2];     /* Icon location, WIN32 path */
+    HICON hicon;                /* LoadImage() result */
 } ICONITEM;
 
 /* To redefine styles for certain window types */
-typedef struct STYLEITEM
-{
-  char match[MENU_MAX+1];    /* What string to search for? */
-  unsigned long type;                 /* What should it do? */
+typedef struct STYLEITEM {
+    char match[MENU_MAX + 1];   /* What string to search for? */
+    unsigned long type;         /* What should it do? */
 } STYLEITEM;
 
-typedef struct WINPREFS
-{
-  /* Menu information */
-  MENUPARSED *menu; /* Array of created menus */
-  int menuItems;      /* How big? */
+typedef struct WINPREFS {
+    /* Menu information */
+    MENUPARSED *menu;           /* Array of created menus */
+    int menuItems;              /* How big? */
 
-  /* Taskbar menu settings */
-  char rootMenuName[MENU_MAX+1];  /* Menu for taskbar icon */
+    /* Taskbar menu settings */
+    char rootMenuName[MENU_MAX + 1];    /* Menu for taskbar icon */
 
-  /* System menu addition menus */
-  SYSMENUITEM *sysMenu;
-  int sysMenuItems;
+    /* System menu addition menus */
+    SYSMENUITEM *sysMenu;
+    int sysMenuItems;
 
-  /* Which menu to add to unmatched windows? */
-  char defaultSysMenuName[MENU_MAX+1];
-  MENUPOSITION defaultSysMenuPos;   /* Where to place it */
+    /* Which menu to add to unmatched windows? */
+    char defaultSysMenuName[MENU_MAX + 1];
+    MENUPOSITION defaultSysMenuPos;     /* Where to place it */
 
-  /* Icon information */
-  char iconDirectory[PATH_MAX+1]; /* Where do the .icos lie? (Win32 path) */
-  char defaultIconName[NAME_MAX+1];   /* Replacement for x.ico */
-  char trayIconName[NAME_MAX+1]; /* Replacement for tray icon */
+    /* Icon information */
+    char iconDirectory[PATH_MAX + 1];   /* Where do the .icos lie? (Win32 path) */
+    char defaultIconName[NAME_MAX + 1]; /* Replacement for x.ico */
+    char trayIconName[NAME_MAX + 1];    /* Replacement for tray icon */
 
-  ICONITEM *icon;
-  int iconItems;
+    ICONITEM *icon;
+    int iconItems;
 
-  STYLEITEM *style;
-  int styleItems;
+    STYLEITEM *style;
+    int styleItems;
 
-  /* Force exit flag */
-  Bool fForceExit;
+    /* Force exit flag */
+    Bool fForceExit;
 
-  /* Silent exit flag */
-  Bool fSilentExit;
+    /* Silent exit flag */
+    Bool fSilentExit;
 
 } WINPREFS;
 
 /* The global pref settings structure loaded by the winprefyacc.y parser */
 extern WINPREFS pref;
 
-
 /* Functions */
 void
-LoadPreferences(void);
+ LoadPreferences(void);
 
 void
-SetupRootMenu (unsigned long hmenuRoot);
+ SetupRootMenu(unsigned long hmenuRoot);
 
 void
-SetupSysMenu (unsigned long hwndIn);
+ SetupSysMenu(unsigned long hwndIn);
 
 void
-HandleCustomWM_INITMENU(unsigned long hwndIn,
-			unsigned long hmenuIn);
+ HandleCustomWM_INITMENU(unsigned long hwndIn, unsigned long hmenuIn);
 
 Bool
-HandleCustomWM_COMMAND (unsigned long hwndIn,
-			int           command);
+ HandleCustomWM_COMMAND(unsigned long hwndIn, int command);
 
 int
-winIconIsOverride (unsigned hiconIn);
+ winIconIsOverride(unsigned hiconIn);
 
-HICON
-winOverrideIcon (unsigned long longpWin);
+HICON winOverrideIcon(unsigned long longpWin);
 
 unsigned long
-winOverrideStyle (char *res_name, char *res_class, char *wmName);
+ winOverrideStyle(char *res_name, char *res_class, char *wmName);
 
-HICON
-winTaskbarIcon(void);
+HICON winTaskbarIcon(void);
 
-HICON
-winOverrideDefaultIcon(int size);
+HICON winOverrideDefaultIcon(int size);
 #endif
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index 9bec84141..0f789f09d 100644
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -42,8 +42,8 @@ from The Open Group.
  */
 
 #ifdef XWIN_CLIPBOARD
-extern Bool			g_fUnicodeClipboard;
-extern Bool			g_fClipboard;
+extern Bool g_fUnicodeClipboard;
+extern Bool g_fClipboard;
 #endif
 
 /*
@@ -51,13 +51,13 @@ extern Bool			g_fClipboard;
  */
 
 void
-winLogCommandLine (int argc, char *argv[]);
+ winLogCommandLine(int argc, char *argv[]);
 
 void
-winLogVersionInfo (void);
+ winLogVersionInfo(void);
 
 #ifdef DDXOSVERRORF
-void OsVendorVErrorF (const char *pszFormat, va_list va_args);
+void OsVendorVErrorF(const char *pszFormat, va_list va_args);
 #endif
 
 /*
@@ -70,119 +70,125 @@ static winScreenInfo defaultScreenInfo;
 static void
 winInitializeScreenDefaults(void)
 {
-  DWORD dwWidth, dwHeight;
-  static Bool fInitializedScreenDefaults = FALSE;
-
-  /* Bail out early if default screen has already been initialized */
-  if (fInitializedScreenDefaults)
-    return;
-
-  /* Zero the memory used for storing the screen info */
-  memset(&defaultScreenInfo, 0, sizeof(winScreenInfo));
-
-  /* Get default width and height */
-  /*
-   * NOTE: These defaults will cause the window to cover only
-   * the primary monitor in the case that we have multiple monitors.
-   */
-  dwWidth = GetSystemMetrics (SM_CXSCREEN);
-  dwHeight = GetSystemMetrics (SM_CYSCREEN);
-
-  winErrorFVerb(2, "winInitializeScreenDefaults - primary monitor w %d h %d\n", (int) dwWidth, (int) dwHeight);
-
-  /* Set a default DPI, if no '-dpi' option was used */
-  if (monitorResolution == 0)
-    {
-      HDC hdc = GetDC(NULL);
-      if (hdc)
-        {
-          int dpiX = GetDeviceCaps(hdc, LOGPIXELSX);
-          int dpiY = GetDeviceCaps(hdc, LOGPIXELSY);
-
-          winErrorFVerb(2, "winInitializeDefaultScreens - native DPI x %d y %d\n", dpiX, dpiY);
-          monitorResolution = dpiY;
-          ReleaseDC(NULL, hdc);
+    DWORD dwWidth, dwHeight;
+    static Bool fInitializedScreenDefaults = FALSE;
+
+    /* Bail out early if default screen has already been initialized */
+    if (fInitializedScreenDefaults)
+        return;
+
+    /* Zero the memory used for storing the screen info */
+    memset(&defaultScreenInfo, 0, sizeof(winScreenInfo));
+
+    /* Get default width and height */
+    /*
+     * NOTE: These defaults will cause the window to cover only
+     * the primary monitor in the case that we have multiple monitors.
+     */
+    dwWidth = GetSystemMetrics(SM_CXSCREEN);
+    dwHeight = GetSystemMetrics(SM_CYSCREEN);
+
+    winErrorFVerb(2,
+                  "winInitializeScreenDefaults - primary monitor w %d h %d\n",
+                  (int) dwWidth, (int) dwHeight);
+
+    /* Set a default DPI, if no '-dpi' option was used */
+    if (monitorResolution == 0) {
+        HDC hdc = GetDC(NULL);
+
+        if (hdc) {
+            int dpiX = GetDeviceCaps(hdc, LOGPIXELSX);
+            int dpiY = GetDeviceCaps(hdc, LOGPIXELSY);
+
+            winErrorFVerb(2,
+                          "winInitializeDefaultScreens - native DPI x %d y %d\n",
+                          dpiX, dpiY);
+            monitorResolution = dpiY;
+            ReleaseDC(NULL, hdc);
         }
-      else
-        {
-          winErrorFVerb(1, "winInitializeDefaultScreens - Failed to retrieve native DPI, falling back to default of %d DPI\n", WIN_DEFAULT_DPI);
-          monitorResolution = WIN_DEFAULT_DPI;
+        else {
+            winErrorFVerb(1,
+                          "winInitializeDefaultScreens - Failed to retrieve native DPI, falling back to default of %d DPI\n",
+                          WIN_DEFAULT_DPI);
+            monitorResolution = WIN_DEFAULT_DPI;
         }
     }
 
-  defaultScreenInfo.iMonitor = 1;
-  defaultScreenInfo.dwWidth  = dwWidth;
-  defaultScreenInfo.dwHeight = dwHeight;
-  defaultScreenInfo.dwUserWidth  = dwWidth;
-  defaultScreenInfo.dwUserHeight = dwHeight;
-  defaultScreenInfo.fUserGaveHeightAndWidth = WIN_DEFAULT_USER_GAVE_HEIGHT_AND_WIDTH;
-  defaultScreenInfo.fUserGavePosition = FALSE;
-  defaultScreenInfo.dwBPP = WIN_DEFAULT_BPP;
-  defaultScreenInfo.dwClipUpdatesNBoxes = WIN_DEFAULT_CLIP_UPDATES_NBOXES;
+    defaultScreenInfo.iMonitor = 1;
+    defaultScreenInfo.dwWidth = dwWidth;
+    defaultScreenInfo.dwHeight = dwHeight;
+    defaultScreenInfo.dwUserWidth = dwWidth;
+    defaultScreenInfo.dwUserHeight = dwHeight;
+    defaultScreenInfo.fUserGaveHeightAndWidth =
+        WIN_DEFAULT_USER_GAVE_HEIGHT_AND_WIDTH;
+    defaultScreenInfo.fUserGavePosition = FALSE;
+    defaultScreenInfo.dwBPP = WIN_DEFAULT_BPP;
+    defaultScreenInfo.dwClipUpdatesNBoxes = WIN_DEFAULT_CLIP_UPDATES_NBOXES;
 #ifdef XWIN_EMULATEPSEUDO
-  defaultScreenInfo.fEmulatePseudo = WIN_DEFAULT_EMULATE_PSEUDO;
+    defaultScreenInfo.fEmulatePseudo = WIN_DEFAULT_EMULATE_PSEUDO;
 #endif
-  defaultScreenInfo.dwRefreshRate = WIN_DEFAULT_REFRESH;
-  defaultScreenInfo.pfb = NULL;
-  defaultScreenInfo.fFullScreen = FALSE;
-  defaultScreenInfo.fDecoration = TRUE;
+    defaultScreenInfo.dwRefreshRate = WIN_DEFAULT_REFRESH;
+    defaultScreenInfo.pfb = NULL;
+    defaultScreenInfo.fFullScreen = FALSE;
+    defaultScreenInfo.fDecoration = TRUE;
 #ifdef XWIN_MULTIWINDOWEXTWM
-  defaultScreenInfo.fMWExtWM = FALSE;
-  defaultScreenInfo.fInternalWM = FALSE;
+    defaultScreenInfo.fMWExtWM = FALSE;
+    defaultScreenInfo.fInternalWM = FALSE;
 #endif
-  defaultScreenInfo.fRootless = FALSE;
+    defaultScreenInfo.fRootless = FALSE;
 #ifdef XWIN_MULTIWINDOW
-  defaultScreenInfo.fMultiWindow = FALSE;
+    defaultScreenInfo.fMultiWindow = FALSE;
 #endif
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
-  defaultScreenInfo.fMultiMonitorOverride = FALSE;
+    defaultScreenInfo.fMultiMonitorOverride = FALSE;
 #endif
-  defaultScreenInfo.fMultipleMonitors = FALSE;
-  defaultScreenInfo.fLessPointer = FALSE;
-  defaultScreenInfo.iResizeMode = notAllowed;
-  defaultScreenInfo.fNoTrayIcon = FALSE;
-  defaultScreenInfo.iE3BTimeout = WIN_E3B_DEFAULT;
-  defaultScreenInfo.fUseWinKillKey = WIN_DEFAULT_WIN_KILL;
-  defaultScreenInfo.fUseUnixKillKey = WIN_DEFAULT_UNIX_KILL;
-  defaultScreenInfo.fIgnoreInput = FALSE;
-  defaultScreenInfo.fExplicitScreen = FALSE;
-
-  /* Note that the default screen has been initialized */
-  fInitializedScreenDefaults = TRUE;
+    defaultScreenInfo.fMultipleMonitors = FALSE;
+    defaultScreenInfo.fLessPointer = FALSE;
+    defaultScreenInfo.iResizeMode = notAllowed;
+    defaultScreenInfo.fNoTrayIcon = FALSE;
+    defaultScreenInfo.iE3BTimeout = WIN_E3B_DEFAULT;
+    defaultScreenInfo.fUseWinKillKey = WIN_DEFAULT_WIN_KILL;
+    defaultScreenInfo.fUseUnixKillKey = WIN_DEFAULT_UNIX_KILL;
+    defaultScreenInfo.fIgnoreInput = FALSE;
+    defaultScreenInfo.fExplicitScreen = FALSE;
+
+    /* Note that the default screen has been initialized */
+    fInitializedScreenDefaults = TRUE;
 }
 
 static void
 winInitializeScreen(int i)
 {
-  winErrorFVerb (2, "winInitializeScreen - %d\n",i);
+    winErrorFVerb(2, "winInitializeScreen - %d\n", i);
 
-  /* Initialize default screen values, if needed */
-  winInitializeScreenDefaults();
+    /* Initialize default screen values, if needed */
+    winInitializeScreenDefaults();
 
-  /* Copy the default screen info */
-  g_ScreenInfo[i] = defaultScreenInfo;
+    /* Copy the default screen info */
+    g_ScreenInfo[i] = defaultScreenInfo;
 
-  /* Set the screen number */
-  g_ScreenInfo[i].dwScreen = i;
+    /* Set the screen number */
+    g_ScreenInfo[i].dwScreen = i;
 }
 
 void
 winInitializeScreens(int maxscreens)
 {
-  int i;
-  winErrorFVerb (2, "winInitializeScreens - %i\n", maxscreens);
+    int i;
 
-  if (maxscreens > g_iNumScreens)
-    {
-      /* Reallocate the memory for DDX-specific screen info */
-      g_ScreenInfo = realloc(g_ScreenInfo, maxscreens * sizeof (winScreenInfo));
+    winErrorFVerb(2, "winInitializeScreens - %i\n", maxscreens);
 
-      /* Set default values for any new screens */
-      for (i = g_iNumScreens; i < maxscreens ; i++)
-        winInitializeScreen(i);
+    if (maxscreens > g_iNumScreens) {
+        /* Reallocate the memory for DDX-specific screen info */
+        g_ScreenInfo =
+            realloc(g_ScreenInfo, maxscreens * sizeof(winScreenInfo));
 
-      /* Keep a count of the number of screens */
-      g_iNumScreens = maxscreens;
+        /* Set default values for any new screens */
+        for (i = g_iNumScreens; i < maxscreens; i++)
+            winInitializeScreen(i);
+
+        /* Keep a count of the number of screens */
+        g_iNumScreens = maxscreens;
     }
 }
 
@@ -208,1033 +214,953 @@ winInitializeScreens(int maxscreens)
 /* Check if enough arguments are given for the option */
 #define CHECK_ARGS(count) if (i + count >= argc) { UseMsg (); return 0; }
 
-/* Compare the current option with the string. */ 
+/* Compare the current option with the string. */
 #define IS_OPTION(name) (strcmp (argv[i], name) == 0)
 
 int
-ddxProcessArgument (int argc, char *argv[], int i)
+ddxProcessArgument(int argc, char *argv[], int i)
 {
-  static Bool		s_fBeenHere = FALSE;
-  winScreenInfo	*screenInfoPtr = NULL;
+    static Bool s_fBeenHere = FALSE;
+    winScreenInfo *screenInfoPtr = NULL;
 
-  /* Initialize once */
-  if (!s_fBeenHere)
-    {
+    /* Initialize once */
+    if (!s_fBeenHere) {
 #ifdef DDXOSVERRORF
-      /*
-       * This initialises our hook into VErrorF () for catching log messages
-       * that are generated before OsInit () is called.
-       */
-      OsVendorVErrorFProc = OsVendorVErrorF;
+        /*
+         * This initialises our hook into VErrorF () for catching log messages
+         * that are generated before OsInit () is called.
+         */
+        OsVendorVErrorFProc = OsVendorVErrorF;
 #endif
 
-      s_fBeenHere = TRUE;
+        s_fBeenHere = TRUE;
 
-      /* Initialize only if option is not -help */
-      if (!IS_OPTION("-help") && !IS_OPTION("-h") && !IS_OPTION("--help") &&
-          !IS_OPTION("-version") && !IS_OPTION("--version"))
-	{
+        /* Initialize only if option is not -help */
+        if (!IS_OPTION("-help") && !IS_OPTION("-h") && !IS_OPTION("--help") &&
+            !IS_OPTION("-version") && !IS_OPTION("--version")) {
 
-          /* Log the version information */
-          winLogVersionInfo ();
+            /* Log the version information */
+            winLogVersionInfo();
 
-          /* Log the command line */
-          winLogCommandLine (argc, argv);
+            /* Log the command line */
+            winLogCommandLine(argc, argv);
 
-	  /*
-	   * Initialize default screen settings.  We have to do this before
-	   * OsVendorInit () gets called, otherwise we will overwrite
-	   * settings changed by parameters such as -fullscreen, etc.
-	   */
-	  winErrorFVerb (2, "ddxProcessArgument - Initializing default "
-			 "screens\n");
-	  winInitializeScreenDefaults();
-	}
+            /*
+             * Initialize default screen settings.  We have to do this before
+             * OsVendorInit () gets called, otherwise we will overwrite
+             * settings changed by parameters such as -fullscreen, etc.
+             */
+            winErrorFVerb(2, "ddxProcessArgument - Initializing default "
+                          "screens\n");
+            winInitializeScreenDefaults();
+        }
     }
 
 #if CYGDEBUG
-  winDebug ("ddxProcessArgument - arg: %s\n", argv[i]);
+    winDebug("ddxProcessArgument - arg: %s\n", argv[i]);
 #endif
 
-  /*
-   * Look for the '-help' and similar options
-   */ 
-  if (IS_OPTION ("-help") || IS_OPTION("-h") || IS_OPTION("--help"))
-    {
-      /* Reset logfile. We don't need that helpmessage in the logfile */  
-      g_pszLogFile = NULL;
-      g_fNoHelpMessageBox = TRUE;
-      UseMsg();
-      exit (0);
-      return 1;
+    /*
+     * Look for the '-help' and similar options
+     */
+    if (IS_OPTION("-help") || IS_OPTION("-h") || IS_OPTION("--help")) {
+        /* Reset logfile. We don't need that helpmessage in the logfile */
+        g_pszLogFile = NULL;
+        g_fNoHelpMessageBox = TRUE;
+        UseMsg();
+        exit(0);
+        return 1;
     }
 
-  if (IS_OPTION ("-version") || IS_OPTION("--version"))
-    {
-      /* Reset logfile. We don't need that versioninfo in the logfile */  
-      g_pszLogFile = NULL;
-      winLogVersionInfo ();
-      exit (0);
-      return 1;
+    if (IS_OPTION("-version") || IS_OPTION("--version")) {
+        /* Reset logfile. We don't need that versioninfo in the logfile */
+        g_pszLogFile = NULL;
+        winLogVersionInfo();
+        exit(0);
+        return 1;
     }
 
-  /*
-   * Look for the '-screen scr_num [width height]' argument
-   */
-  if (IS_OPTION ("-screen"))
-    {
-      int		iArgsProcessed = 1;
-      int		nScreenNum;
-      int		iWidth, iHeight, iX, iY;
-      int		iMonitor;
+    /*
+     * Look for the '-screen scr_num [width height]' argument
+     */
+    if (IS_OPTION("-screen")) {
+        int iArgsProcessed = 1;
+        int nScreenNum;
+        int iWidth, iHeight, iX, iY;
+        int iMonitor;
 
 #if CYGDEBUG
-      winDebug ("ddxProcessArgument - screen - argc: %d i: %d\n",
-	      argc, i);
+        winDebug("ddxProcessArgument - screen - argc: %d i: %d\n", argc, i);
 #endif
 
-      /* Display the usage message if the argument is malformed */
-      if (i + 1 >= argc)
-	{
-	  return 0;
-	}
-      
-      /* Grab screen number */
-      nScreenNum = atoi (argv[i + 1]);
-
-      /* Validate the specified screen number */
-      if (nScreenNum < 0)
-        {
-          ErrorF ("ddxProcessArgument - screen - Invalid screen number %d\n",
-		  nScreenNum);
-          UseMsg ();
-	  return 0;
+        /* Display the usage message if the argument is malformed */
+        if (i + 1 >= argc) {
+            return 0;
         }
 
-      /*
-        Initialize default values for any new screens
-
-        Note that default values can't change after a -screen option is
-        seen, so it's safe to do this for each screen as it is introduced
-      */
-      winInitializeScreens(nScreenNum+1);
-
-	  /* look for @m where m is monitor number */
-	  if (i + 2 < argc
-		  && 1 == sscanf(argv[i + 2], "@%d", (int *) &iMonitor)) 
-      {
-        struct GetMonitorInfoData data;
-        if (!QueryMonitor(iMonitor, &data))
-        {
-            ErrorF ("ddxProcessArgument - screen - Querying monitors failed\n");
-        } else if (data.bMonitorSpecifiedExists == TRUE) 
-        {
-		  winErrorFVerb(2, "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor);
-		  iArgsProcessed = 3;
-		  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;
-		  g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
-		  g_ScreenInfo[nScreenNum].iMonitor = iMonitor;
-		  g_ScreenInfo[nScreenNum].dwWidth = data.monitorWidth;
-		  g_ScreenInfo[nScreenNum].dwHeight = data.monitorHeight;
-		  g_ScreenInfo[nScreenNum].dwUserWidth = data.monitorWidth;
-		  g_ScreenInfo[nScreenNum].dwUserHeight = data.monitorHeight;
-		  g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX;
-		  g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY;
-		}
-		else 
-        {
-		  /* monitor does not exist, error out */
-		  ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n",
-				  iMonitor);
-		  UseMsg ();
-		  exit (0);
-		  return 0;
-		}
-	  }
-
-      /* Look for 'WxD' or 'W D' */
-      else if (i + 2 < argc
-	  && 2 == sscanf (argv[i + 2], "%dx%d",
-			  (int *) &iWidth,
-			  (int *) &iHeight))
-	{
-	  winErrorFVerb (2, "ddxProcessArgument - screen - Found ``WxD'' arg\n");
-	  iArgsProcessed = 3;
-	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;
-	  g_ScreenInfo[nScreenNum].dwWidth = iWidth;
-	  g_ScreenInfo[nScreenNum].dwHeight = iHeight;
-	  g_ScreenInfo[nScreenNum].dwUserWidth = iWidth;
-	  g_ScreenInfo[nScreenNum].dwUserHeight = iHeight;
-	  /* Look for WxD+X+Y */
-	  if (2 == sscanf (argv[i + 2], "%*dx%*d+%d+%d",
-			   (int *) &iX,
-			   (int *) &iY))
-	  {
-	    winErrorFVerb (2, "ddxProcessArgument - screen - Found ``X+Y'' arg\n");
-	    g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
-	    g_ScreenInfo[nScreenNum].dwInitialX = iX;
-	    g_ScreenInfo[nScreenNum].dwInitialY = iY;
-
-		/* look for WxD+X+Y@m where m is monitor number. take X,Y to be offsets from monitor's root position */
-		if (1 == sscanf (argv[i + 2], "%*dx%*d+%*d+%*d@%d",
-						 (int *) &iMonitor)) 
-        {
-          struct GetMonitorInfoData data;
-          if (!QueryMonitor(iMonitor, &data))
-          {
-              ErrorF ("ddxProcessArgument - screen - Querying monitors failed\n");
-          } else if (data.bMonitorSpecifiedExists == TRUE) 
-          {
-			g_ScreenInfo[nScreenNum].iMonitor = iMonitor;
-			g_ScreenInfo[nScreenNum].dwInitialX += data.monitorOffsetX;
-			g_ScreenInfo[nScreenNum].dwInitialY += data.monitorOffsetY;
-		  }
-		  else 
-          {
-			/* monitor does not exist, error out */
-			ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n",
-					iMonitor);
-			UseMsg ();
-			exit (0);
-			return 0;
-		  }
-
-		}
-	  }
-
-	  /* look for WxD@m where m is monitor number */
-	  else if (1 == sscanf(argv[i + 2], "%*dx%*d@%d",
-						   (int *) &iMonitor)) 
-      {
-        struct GetMonitorInfoData data;
-        if (!QueryMonitor(iMonitor, &data))
-        {
-		  ErrorF ("ddxProcessArgument - screen - Querying monitors failed\n");
-        } else if (data.bMonitorSpecifiedExists == TRUE) 
-        {
-		  winErrorFVerb (2, "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor);
-		  g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
-		  g_ScreenInfo[nScreenNum].iMonitor = iMonitor;
-		  g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX;
-		  g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY;
-		}
-		else 
-        {
-		  /* monitor does not exist, error out */
-		  ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n",
-				  iMonitor);
-		  UseMsg ();
-		  exit (0);
-		  return 0;
-		}
-
-	  }
-	}
-      else if (i + 3 < argc
-	       && 1 == sscanf (argv[i + 2], "%d",
-			       (int *) &iWidth)
-	       && 1 == sscanf (argv[i + 3], "%d",
-			       (int *) &iHeight))
-	{
-	  winErrorFVerb (2, "ddxProcessArgument - screen - Found ``W D'' arg\n");
-	  iArgsProcessed = 4;
-	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;
-	  g_ScreenInfo[nScreenNum].dwWidth = iWidth;
-	  g_ScreenInfo[nScreenNum].dwHeight = iHeight;
-	  g_ScreenInfo[nScreenNum].dwUserWidth = iWidth;
-	  g_ScreenInfo[nScreenNum].dwUserHeight = iHeight;
-	  if (i + 5 < argc
-	      && 1 == sscanf (argv[i + 4], "%d",
-			      (int *) &iX)
-	      && 1 == sscanf (argv[i + 5], "%d",
-			      (int *) &iY))
-	  {
-	    winErrorFVerb (2, "ddxProcessArgument - screen - Found ``X Y'' arg\n");
-	    iArgsProcessed = 6;
-	    g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
-	    g_ScreenInfo[nScreenNum].dwInitialX = iX;
-	    g_ScreenInfo[nScreenNum].dwInitialY = iY;
-	  }
-	}
-      else
-	{
-	  winErrorFVerb (2, "ddxProcessArgument - screen - Did not find size arg. "
-		  "dwWidth: %d dwHeight: %d\n",
-		  (int) g_ScreenInfo[nScreenNum].dwWidth,
-		  (int) g_ScreenInfo[nScreenNum].dwHeight);
-	  iArgsProcessed = 2;
-	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;
-	}
-
-      /* Flag that this screen was explicity specified by the user */
-      g_ScreenInfo[nScreenNum].fExplicitScreen = TRUE;
-
-      /*
-       * Keep track of the last screen number seen, as parameters seen
-       * before a screen number apply to all screens, whereas parameters
-       * seen after a screen number apply to that screen number only.
-       */
-      iLastScreen = nScreenNum;
-
-      return iArgsProcessed;
-    }
+        /* Grab screen number */
+        nScreenNum = atoi(argv[i + 1]);
+
+        /* Validate the specified screen number */
+        if (nScreenNum < 0) {
+            ErrorF("ddxProcessArgument - screen - Invalid screen number %d\n",
+                   nScreenNum);
+            UseMsg();
+            return 0;
+        }
+
+        /*
+           Initialize default values for any new screens
+
+           Note that default values can't change after a -screen option is
+           seen, so it's safe to do this for each screen as it is introduced
+         */
+        winInitializeScreens(nScreenNum + 1);
+
+        /* look for @m where m is monitor number */
+        if (i + 2 < argc && 1 == sscanf(argv[i + 2], "@%d", (int *) &iMonitor)) {
+            struct GetMonitorInfoData data;
+
+            if (!QueryMonitor(iMonitor, &data)) {
+                ErrorF
+                    ("ddxProcessArgument - screen - Querying monitors failed\n");
+            }
+            else if (data.bMonitorSpecifiedExists == TRUE) {
+                winErrorFVerb(2,
+                              "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n",
+                              iMonitor);
+                iArgsProcessed = 3;
+                g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;
+                g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
+                g_ScreenInfo[nScreenNum].iMonitor = iMonitor;
+                g_ScreenInfo[nScreenNum].dwWidth = data.monitorWidth;
+                g_ScreenInfo[nScreenNum].dwHeight = data.monitorHeight;
+                g_ScreenInfo[nScreenNum].dwUserWidth = data.monitorWidth;
+                g_ScreenInfo[nScreenNum].dwUserHeight = data.monitorHeight;
+                g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX;
+                g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY;
+            }
+            else {
+                /* monitor does not exist, error out */
+                ErrorF
+                    ("ddxProcessArgument - screen - Invalid monitor number %d\n",
+                     iMonitor);
+                UseMsg();
+                exit(0);
+                return 0;
+            }
+        }
+
+        /* Look for 'WxD' or 'W D' */
+        else if (i + 2 < argc
+                 && 2 == sscanf(argv[i + 2], "%dx%d",
+                                (int *) &iWidth, (int *) &iHeight)) {
+            winErrorFVerb(2,
+                          "ddxProcessArgument - screen - Found ``WxD'' arg\n");
+            iArgsProcessed = 3;
+            g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;
+            g_ScreenInfo[nScreenNum].dwWidth = iWidth;
+            g_ScreenInfo[nScreenNum].dwHeight = iHeight;
+            g_ScreenInfo[nScreenNum].dwUserWidth = iWidth;
+            g_ScreenInfo[nScreenNum].dwUserHeight = iHeight;
+            /* Look for WxD+X+Y */
+            if (2 == sscanf(argv[i + 2], "%*dx%*d+%d+%d",
+                            (int *) &iX, (int *) &iY)) {
+                winErrorFVerb(2,
+                              "ddxProcessArgument - screen - Found ``X+Y'' arg\n");
+                g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
+                g_ScreenInfo[nScreenNum].dwInitialX = iX;
+                g_ScreenInfo[nScreenNum].dwInitialY = iY;
+
+                /* look for WxD+X+Y@m where m is monitor number. take X,Y to be offsets from monitor's root position */
+                if (1 == sscanf(argv[i + 2], "%*dx%*d+%*d+%*d@%d",
+                                (int *) &iMonitor)) {
+                    struct GetMonitorInfoData data;
+
+                    if (!QueryMonitor(iMonitor, &data)) {
+                        ErrorF
+                            ("ddxProcessArgument - screen - Querying monitors failed\n");
+                    }
+                    else if (data.bMonitorSpecifiedExists == TRUE) {
+                        g_ScreenInfo[nScreenNum].iMonitor = iMonitor;
+                        g_ScreenInfo[nScreenNum].dwInitialX +=
+                            data.monitorOffsetX;
+                        g_ScreenInfo[nScreenNum].dwInitialY +=
+                            data.monitorOffsetY;
+                    }
+                    else {
+                        /* monitor does not exist, error out */
+                        ErrorF
+                            ("ddxProcessArgument - screen - Invalid monitor number %d\n",
+                             iMonitor);
+                        UseMsg();
+                        exit(0);
+                        return 0;
+                    }
+
+                }
+            }
+
+            /* look for WxD@m where m is monitor number */
+            else if (1 == sscanf(argv[i + 2], "%*dx%*d@%d", (int *) &iMonitor)) {
+                struct GetMonitorInfoData data;
+
+                if (!QueryMonitor(iMonitor, &data)) {
+                    ErrorF
+                        ("ddxProcessArgument - screen - Querying monitors failed\n");
+                }
+                else if (data.bMonitorSpecifiedExists == TRUE) {
+                    winErrorFVerb(2,
+                                  "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n",
+                                  iMonitor);
+                    g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
+                    g_ScreenInfo[nScreenNum].iMonitor = iMonitor;
+                    g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX;
+                    g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY;
+                }
+                else {
+                    /* monitor does not exist, error out */
+                    ErrorF
+                        ("ddxProcessArgument - screen - Invalid monitor number %d\n",
+                         iMonitor);
+                    UseMsg();
+                    exit(0);
+                    return 0;
+                }
+
+            }
+        }
+        else if (i + 3 < argc && 1 == sscanf(argv[i + 2], "%d", (int *) &iWidth)
+                 && 1 == sscanf(argv[i + 3], "%d", (int *) &iHeight)) {
+            winErrorFVerb(2,
+                          "ddxProcessArgument - screen - Found ``W D'' arg\n");
+            iArgsProcessed = 4;
+            g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;
+            g_ScreenInfo[nScreenNum].dwWidth = iWidth;
+            g_ScreenInfo[nScreenNum].dwHeight = iHeight;
+            g_ScreenInfo[nScreenNum].dwUserWidth = iWidth;
+            g_ScreenInfo[nScreenNum].dwUserHeight = iHeight;
+            if (i + 5 < argc && 1 == sscanf(argv[i + 4], "%d", (int *) &iX)
+                && 1 == sscanf(argv[i + 5], "%d", (int *) &iY)) {
+                winErrorFVerb(2,
+                              "ddxProcessArgument - screen - Found ``X Y'' arg\n");
+                iArgsProcessed = 6;
+                g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
+                g_ScreenInfo[nScreenNum].dwInitialX = iX;
+                g_ScreenInfo[nScreenNum].dwInitialY = iY;
+            }
+        }
+        else {
+            winErrorFVerb(2,
+                          "ddxProcessArgument - screen - Did not find size arg. "
+                          "dwWidth: %d dwHeight: %d\n",
+                          (int) g_ScreenInfo[nScreenNum].dwWidth,
+                          (int) g_ScreenInfo[nScreenNum].dwHeight);
+            iArgsProcessed = 2;
+            g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;
+        }
+
+        /* Flag that this screen was explicity specified by the user */
+        g_ScreenInfo[nScreenNum].fExplicitScreen = TRUE;
 
+        /*
+         * Keep track of the last screen number seen, as parameters seen
+         * before a screen number apply to all screens, whereas parameters
+         * seen after a screen number apply to that screen number only.
+         */
+        iLastScreen = nScreenNum;
+
+        return iArgsProcessed;
+    }
 
-  /*
-   * Is this parameter attached to a screen or global?
-   *
-   * If the parameter is for all screens (appears before
-   * any -screen option), store it in the default screen
-   * info
-   *
-   * If the parameter is for a single screen (appears
-   * after a -screen option), store it in the screen info
-   * for that screen
-   *
-   */
-  if (iLastScreen == -1)
-    {
-      screenInfoPtr = &defaultScreenInfo;
+    /*
+     * Is this parameter attached to a screen or global?
+     *
+     * If the parameter is for all screens (appears before
+     * any -screen option), store it in the default screen
+     * info
+     *
+     * If the parameter is for a single screen (appears
+     * after a -screen option), store it in the screen info
+     * for that screen
+     *
+     */
+    if (iLastScreen == -1) {
+        screenInfoPtr = &defaultScreenInfo;
     }
-  else
-    {
-      screenInfoPtr = &(g_ScreenInfo[iLastScreen]);
+    else {
+        screenInfoPtr = &(g_ScreenInfo[iLastScreen]);
     }
 
-  /*
-   * Look for the '-engine n' argument
-   */
-  if (IS_OPTION ("-engine"))
-    {
-      DWORD		dwEngine = 0;
-      CARD8		c8OnBits = 0;
-      
-      /* Display the usage message if the argument is malformed */
-      if (++i >= argc)
-	{
-	  UseMsg ();
-	  return 0;
-	}
-
-      /* Grab the argument */
-      dwEngine = atoi (argv[i]);
-
-      /* Count the one bits in the engine argument */
-      c8OnBits = winCountBits (dwEngine);
-
-      /* Argument should only have a single bit on */
-      if (c8OnBits != 1)
-	{
-	  UseMsg ();
-	  return 0;
-	}
-
-      screenInfoPtr->dwEnginePreferred = dwEngine;
-      
-      /* Indicate that we have processed the argument */
-      return 2;
+    /*
+     * Look for the '-engine n' argument
+     */
+    if (IS_OPTION("-engine")) {
+        DWORD dwEngine = 0;
+        CARD8 c8OnBits = 0;
+
+        /* Display the usage message if the argument is malformed */
+        if (++i >= argc) {
+            UseMsg();
+            return 0;
+        }
+
+        /* Grab the argument */
+        dwEngine = atoi(argv[i]);
+
+        /* Count the one bits in the engine argument */
+        c8OnBits = winCountBits(dwEngine);
+
+        /* Argument should only have a single bit on */
+        if (c8OnBits != 1) {
+            UseMsg();
+            return 0;
+        }
+
+        screenInfoPtr->dwEnginePreferred = dwEngine;
+
+        /* Indicate that we have processed the argument */
+        return 2;
     }
 
-  /*
-   * Look for the '-fullscreen' argument
-   */
-  if (IS_OPTION ("-fullscreen"))
-    {
+    /*
+     * Look for the '-fullscreen' argument
+     */
+    if (IS_OPTION("-fullscreen")) {
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
-          if (!screenInfoPtr->fMultiMonitorOverride)
+        if (!screenInfoPtr->fMultiMonitorOverride)
             screenInfoPtr->fMultipleMonitors = FALSE;
 #endif
-	  screenInfoPtr->fFullScreen = TRUE;
+        screenInfoPtr->fFullScreen = TRUE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-lesspointer' argument
-   */
-  if (IS_OPTION ("-lesspointer"))
-    {
-      screenInfoPtr->fLessPointer = TRUE;
+    /*
+     * Look for the '-lesspointer' argument
+     */
+    if (IS_OPTION("-lesspointer")) {
+        screenInfoPtr->fLessPointer = TRUE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-nodecoration' argument
-   */
-  if (IS_OPTION ("-nodecoration"))
-    {
+    /*
+     * Look for the '-nodecoration' argument
+     */
+    if (IS_OPTION("-nodecoration")) {
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
-      if (!screenInfoPtr->fMultiMonitorOverride)
-        screenInfoPtr->fMultipleMonitors = FALSE;
+        if (!screenInfoPtr->fMultiMonitorOverride)
+            screenInfoPtr->fMultipleMonitors = FALSE;
 #endif
-      screenInfoPtr->fDecoration = FALSE;
+        screenInfoPtr->fDecoration = FALSE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
 #ifdef XWIN_MULTIWINDOWEXTWM
-  /*
-   * Look for the '-mwextwm' argument
-   */
-  if (IS_OPTION ("-mwextwm"))
-    {
-      if (!screenInfoPtr->fMultiMonitorOverride)
-        screenInfoPtr->fMultipleMonitors = TRUE;
-      screenInfoPtr->fMWExtWM = TRUE;
-
-      /* Indicate that we have processed this argument */
-      return 1;
+    /*
+     * Look for the '-mwextwm' argument
+     */
+    if (IS_OPTION("-mwextwm")) {
+        if (!screenInfoPtr->fMultiMonitorOverride)
+            screenInfoPtr->fMultipleMonitors = TRUE;
+        screenInfoPtr->fMWExtWM = TRUE;
+
+        /* Indicate that we have processed this argument */
+        return 1;
     }
-  /*
-   * Look for the '-internalwm' argument
-   */
-  if (IS_OPTION ("-internalwm"))
-    {
-      if (!screenInfoPtr->fMultiMonitorOverride)
-        screenInfoPtr->fMultipleMonitors = TRUE;
-      screenInfoPtr->fMWExtWM = TRUE;
-      screenInfoPtr->fInternalWM = TRUE;
-
-      /* Indicate that we have processed this argument */
-      return 1;
+    /*
+     * Look for the '-internalwm' argument
+     */
+    if (IS_OPTION("-internalwm")) {
+        if (!screenInfoPtr->fMultiMonitorOverride)
+            screenInfoPtr->fMultipleMonitors = TRUE;
+        screenInfoPtr->fMWExtWM = TRUE;
+        screenInfoPtr->fInternalWM = TRUE;
+
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 #endif
 
-  /*
-   * Look for the '-rootless' argument
-   */
-  if (IS_OPTION ("-rootless"))
-    {
+    /*
+     * Look for the '-rootless' argument
+     */
+    if (IS_OPTION("-rootless")) {
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
-      if (!screenInfoPtr->fMultiMonitorOverride)
-        screenInfoPtr->fMultipleMonitors = FALSE;
+        if (!screenInfoPtr->fMultiMonitorOverride)
+            screenInfoPtr->fMultipleMonitors = FALSE;
 #endif
-      screenInfoPtr->fRootless = TRUE;
+        screenInfoPtr->fRootless = TRUE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
 #ifdef XWIN_MULTIWINDOW
-  /*
-   * Look for the '-multiwindow' argument
-   */
-  if (IS_OPTION ("-multiwindow"))
-    {
+    /*
+     * Look for the '-multiwindow' argument
+     */
+    if (IS_OPTION("-multiwindow")) {
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
-      if (!screenInfoPtr->fMultiMonitorOverride)
-        screenInfoPtr->fMultipleMonitors = TRUE;
+        if (!screenInfoPtr->fMultiMonitorOverride)
+            screenInfoPtr->fMultipleMonitors = TRUE;
 #endif
-      screenInfoPtr->fMultiWindow = TRUE;
+        screenInfoPtr->fMultiWindow = TRUE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 #endif
 
-  /*
-   * Look for the '-multiplemonitors' argument
-   */
-  if (IS_OPTION ("-multiplemonitors")
-      || IS_OPTION ("-multimonitors"))
-    {
+    /*
+     * Look for the '-multiplemonitors' argument
+     */
+    if (IS_OPTION("-multiplemonitors")
+        || IS_OPTION("-multimonitors")) {
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
-      screenInfoPtr->fMultiMonitorOverride = TRUE;
+        screenInfoPtr->fMultiMonitorOverride = TRUE;
 #endif
-      screenInfoPtr->fMultipleMonitors = TRUE;
+        screenInfoPtr->fMultipleMonitors = TRUE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-nomultiplemonitors' argument
-   */
-  if (IS_OPTION ("-nomultiplemonitors")
-      || IS_OPTION ("-nomultimonitors"))
-    {
+    /*
+     * Look for the '-nomultiplemonitors' argument
+     */
+    if (IS_OPTION("-nomultiplemonitors")
+        || IS_OPTION("-nomultimonitors")) {
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
-      screenInfoPtr->fMultiMonitorOverride = TRUE;
+        screenInfoPtr->fMultiMonitorOverride = TRUE;
 #endif
-      screenInfoPtr->fMultipleMonitors = FALSE;
+        screenInfoPtr->fMultipleMonitors = FALSE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
+    /*
+     * Look for the '-scrollbars' argument
+     */
+    if (IS_OPTION("-scrollbars")) {
 
-  /*
-   * Look for the '-scrollbars' argument
-   */
-  if (IS_OPTION ("-scrollbars"))
-    {
+        screenInfoPtr->iResizeMode = resizeWithScrollbars;
 
-      screenInfoPtr->iResizeMode = resizeWithScrollbars;
-
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-resize' argument
-   */
-  if (IS_OPTION ("-resize") || IS_OPTION ("-noresize") ||
-      (strncmp(argv[i], "-resize=",strlen("-resize=")) == 0))
-    {
-      winResizeMode mode;
-
-      if (IS_OPTION ("-resize"))
-        mode = resizeWithRandr;
-      else if (IS_OPTION ("-noresize"))
-        mode = notAllowed;
-      else if (strncmp(argv[i], "-resize=",strlen("-resize=")) == 0)
-        {
-          char *option = argv[i] + strlen("-resize=");
-          if (strcmp(option, "randr") == 0)
+    /*
+     * Look for the '-resize' argument
+     */
+    if (IS_OPTION("-resize") || IS_OPTION("-noresize") ||
+        (strncmp(argv[i], "-resize=", strlen("-resize=")) == 0)) {
+        winResizeMode mode;
+
+        if (IS_OPTION("-resize"))
             mode = resizeWithRandr;
-          else if (strcmp(option, "scrollbars") == 0)
-            mode = resizeWithScrollbars;
-          else if (strcmp(option, "none") == 0)
+        else if (IS_OPTION("-noresize"))
             mode = notAllowed;
-          else
-            {
-              ErrorF ("ddxProcessArgument - resize - Invalid resize mode %s\n", option);
-              return 0;
+        else if (strncmp(argv[i], "-resize=", strlen("-resize=")) == 0) {
+            char *option = argv[i] + strlen("-resize=");
+
+            if (strcmp(option, "randr") == 0)
+                mode = resizeWithRandr;
+            else if (strcmp(option, "scrollbars") == 0)
+                mode = resizeWithScrollbars;
+            else if (strcmp(option, "none") == 0)
+                mode = notAllowed;
+            else {
+                ErrorF("ddxProcessArgument - resize - Invalid resize mode %s\n",
+                       option);
+                return 0;
             }
         }
-      else
-        {
-          ErrorF ("ddxProcessArgument - resize - Invalid resize option %s\n", argv[i]);
-          return 0;
+        else {
+            ErrorF("ddxProcessArgument - resize - Invalid resize option %s\n",
+                   argv[i]);
+            return 0;
         }
 
-      screenInfoPtr->iResizeMode = mode;
+        screenInfoPtr->iResizeMode = mode;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
 #ifdef XWIN_CLIPBOARD
-  /*
-   * Look for the '-clipboard' argument
-   */
-  if (IS_OPTION ("-clipboard"))
-    {
-      /* Now the default, we still accept the arg for backwards compatibility */
-      g_fClipboard = TRUE;
-
-      /* Indicate that we have processed this argument */
-      return 1;
+    /*
+     * Look for the '-clipboard' argument
+     */
+    if (IS_OPTION("-clipboard")) {
+        /* Now the default, we still accept the arg for backwards compatibility */
+        g_fClipboard = TRUE;
+
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-noclipboard' argument
-   */
-  if (IS_OPTION ("-noclipboard"))
-    {
-      g_fClipboard = FALSE;
+    /*
+     * Look for the '-noclipboard' argument
+     */
+    if (IS_OPTION("-noclipboard")) {
+        g_fClipboard = FALSE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 #endif
 
+    /*
+     * Look for the '-ignoreinput' argument
+     */
+    if (IS_OPTION("-ignoreinput")) {
+        screenInfoPtr->fIgnoreInput = TRUE;
 
-  /*
-   * Look for the '-ignoreinput' argument
-   */
-  if (IS_OPTION ("-ignoreinput"))
-    {
-      screenInfoPtr->fIgnoreInput = TRUE;
-
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-emulate3buttons' argument
-   */
-  if (IS_OPTION ("-emulate3buttons"))
-    {
-      int	iArgsProcessed = 1;
-      int	iE3BTimeout = WIN_DEFAULT_E3B_TIME;
-
-      /* Grab the optional timeout value */
-      if (i + 1 < argc
-	  && 1 == sscanf (argv[i + 1], "%d",
-			  &iE3BTimeout))
-        {
-	  /* Indicate that we have processed the next argument */
-	  iArgsProcessed++;
+    /*
+     * Look for the '-emulate3buttons' argument
+     */
+    if (IS_OPTION("-emulate3buttons")) {
+        int iArgsProcessed = 1;
+        int iE3BTimeout = WIN_DEFAULT_E3B_TIME;
+
+        /* Grab the optional timeout value */
+        if (i + 1 < argc && 1 == sscanf(argv[i + 1], "%d", &iE3BTimeout)) {
+            /* Indicate that we have processed the next argument */
+            iArgsProcessed++;
+        }
+        else {
+            /*
+             * sscanf () won't modify iE3BTimeout if it doesn't find
+             * the specified format; however, I want to be explicit
+             * about setting the default timeout in such cases to
+             * prevent some programs (me) from getting confused.
+             */
+            iE3BTimeout = WIN_DEFAULT_E3B_TIME;
         }
-      else
-	{
-	  /*
-	   * sscanf () won't modify iE3BTimeout if it doesn't find
-	   * the specified format; however, I want to be explicit
-	   * about setting the default timeout in such cases to
-	   * prevent some programs (me) from getting confused.
-	   */
-	  iE3BTimeout = WIN_DEFAULT_E3B_TIME;
-	}
-
-      screenInfoPtr->iE3BTimeout = iE3BTimeout;
-
-      /* Indicate that we have processed this argument */
-      return iArgsProcessed;
+
+        screenInfoPtr->iE3BTimeout = iE3BTimeout;
+
+        /* Indicate that we have processed this argument */
+        return iArgsProcessed;
     }
 
-  /*
-   * Look for the '-noemulate3buttons' argument
-   */
-  if (IS_OPTION ("-noemulate3buttons"))
-    {
-      screenInfoPtr->iE3BTimeout = WIN_E3B_OFF;
+    /*
+     * Look for the '-noemulate3buttons' argument
+     */
+    if (IS_OPTION("-noemulate3buttons")) {
+        screenInfoPtr->iE3BTimeout = WIN_E3B_OFF;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-depth n' argument
-   */
-  if (IS_OPTION ("-depth"))
-    {
-      DWORD		dwBPP = 0;
-      
-      /* Display the usage message if the argument is malformed */
-      if (++i >= argc)
-	{
-	  UseMsg ();
-	  return 0;
-	}
-
-      /* Grab the argument */
-      dwBPP = atoi (argv[i]);
-
-      screenInfoPtr->dwBPP = dwBPP;
-
-      /* Indicate that we have processed the argument */
-      return 2;
+    /*
+     * Look for the '-depth n' argument
+     */
+    if (IS_OPTION("-depth")) {
+        DWORD dwBPP = 0;
+
+        /* Display the usage message if the argument is malformed */
+        if (++i >= argc) {
+            UseMsg();
+            return 0;
+        }
+
+        /* Grab the argument */
+        dwBPP = atoi(argv[i]);
+
+        screenInfoPtr->dwBPP = dwBPP;
+
+        /* Indicate that we have processed the argument */
+        return 2;
     }
 
-  /*
-   * Look for the '-refresh n' argument
-   */
-  if (IS_OPTION ("-refresh"))
-    {
-      DWORD		dwRefreshRate = 0;
-      
-      /* Display the usage message if the argument is malformed */
-      if (++i >= argc)
-	{
-	  UseMsg ();
-	  return 0;
-	}
-
-      /* Grab the argument */
-      dwRefreshRate = atoi (argv[i]);
-
-      screenInfoPtr->dwRefreshRate = dwRefreshRate;
-
-      /* Indicate that we have processed the argument */
-      return 2;
+    /*
+     * Look for the '-refresh n' argument
+     */
+    if (IS_OPTION("-refresh")) {
+        DWORD dwRefreshRate = 0;
+
+        /* Display the usage message if the argument is malformed */
+        if (++i >= argc) {
+            UseMsg();
+            return 0;
+        }
+
+        /* Grab the argument */
+        dwRefreshRate = atoi(argv[i]);
+
+        screenInfoPtr->dwRefreshRate = dwRefreshRate;
+
+        /* Indicate that we have processed the argument */
+        return 2;
     }
 
-  /*
-   * Look for the '-clipupdates num_boxes' argument
-   */
-  if (IS_OPTION ("-clipupdates"))
-    {
-      DWORD		dwNumBoxes = 0;
-      
-      /* Display the usage message if the argument is malformed */
-      if (++i >= argc)
-	{
-	  UseMsg ();
-	  return 0;
-	}
-
-      /* Grab the argument */
-      dwNumBoxes = atoi (argv[i]);
-
-      screenInfoPtr->dwClipUpdatesNBoxes = dwNumBoxes;
-
-      /* Indicate that we have processed the argument */
-      return 2;
+    /*
+     * Look for the '-clipupdates num_boxes' argument
+     */
+    if (IS_OPTION("-clipupdates")) {
+        DWORD dwNumBoxes = 0;
+
+        /* Display the usage message if the argument is malformed */
+        if (++i >= argc) {
+            UseMsg();
+            return 0;
+        }
+
+        /* Grab the argument */
+        dwNumBoxes = atoi(argv[i]);
+
+        screenInfoPtr->dwClipUpdatesNBoxes = dwNumBoxes;
+
+        /* Indicate that we have processed the argument */
+        return 2;
     }
 
 #ifdef XWIN_EMULATEPSEUDO
-  /*
-   * Look for the '-emulatepseudo' argument
-   */
-  if (IS_OPTION ("-emulatepseudo"))
-    {
-      screenInfoPtr->fEmulatePseudo = TRUE;
-
-      /* Indicate that we have processed this argument */
-      return 1;
+    /*
+     * Look for the '-emulatepseudo' argument
+     */
+    if (IS_OPTION("-emulatepseudo")) {
+        screenInfoPtr->fEmulatePseudo = TRUE;
+
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 #endif
 
-  /*
-   * Look for the '-nowinkill' argument
-   */
-  if (IS_OPTION ("-nowinkill"))
-    {
-      screenInfoPtr->fUseWinKillKey = FALSE;
+    /*
+     * Look for the '-nowinkill' argument
+     */
+    if (IS_OPTION("-nowinkill")) {
+        screenInfoPtr->fUseWinKillKey = FALSE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-winkill' argument
-   */
-  if (IS_OPTION ("-winkill"))
-    {
-      screenInfoPtr->fUseWinKillKey = TRUE;
+    /*
+     * Look for the '-winkill' argument
+     */
+    if (IS_OPTION("-winkill")) {
+        screenInfoPtr->fUseWinKillKey = TRUE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-nounixkill' argument
-   */
-  if (IS_OPTION ("-nounixkill"))
-    {
-      screenInfoPtr->fUseUnixKillKey = FALSE;
+    /*
+     * Look for the '-nounixkill' argument
+     */
+    if (IS_OPTION("-nounixkill")) {
+        screenInfoPtr->fUseUnixKillKey = FALSE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-unixkill' argument
-   */
-  if (IS_OPTION ("-unixkill"))
-    {
-      screenInfoPtr->fUseUnixKillKey = TRUE;
+    /*
+     * Look for the '-unixkill' argument
+     */
+    if (IS_OPTION("-unixkill")) {
+        screenInfoPtr->fUseUnixKillKey = TRUE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-notrayicon' argument
-   */
-  if (IS_OPTION ("-notrayicon"))
-    {
-      screenInfoPtr->fNoTrayIcon = TRUE;
+    /*
+     * Look for the '-notrayicon' argument
+     */
+    if (IS_OPTION("-notrayicon")) {
+        screenInfoPtr->fNoTrayIcon = TRUE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-trayicon' argument
-   */
-  if (IS_OPTION ("-trayicon"))
-    {
-      screenInfoPtr->fNoTrayIcon = FALSE;
+    /*
+     * Look for the '-trayicon' argument
+     */
+    if (IS_OPTION("-trayicon")) {
+        screenInfoPtr->fNoTrayIcon = FALSE;
 
-      /* Indicate that we have processed this argument */
-      return 1;
+        /* Indicate that we have processed this argument */
+        return 1;
     }
 
-  /*
-   * Look for the '-fp' argument
-   */
-  if (IS_OPTION ("-fp"))
-    {
-      CHECK_ARGS (1);
-      g_cmdline.fontPath = argv[++i];
-      return 0; /* Let DIX parse this again */
+    /*
+     * Look for the '-fp' argument
+     */
+    if (IS_OPTION("-fp")) {
+        CHECK_ARGS(1);
+        g_cmdline.fontPath = argv[++i];
+        return 0;               /* Let DIX parse this again */
     }
 
-  /*
-   * Look for the '-query' argument
-   */
-  if (IS_OPTION ("-query"))
-    {
-      CHECK_ARGS (1);
-      g_fXdmcpEnabled = TRUE;
-      g_pszQueryHost = argv[++i];
-      return 0; /* Let DIX parse this again */
+    /*
+     * Look for the '-query' argument
+     */
+    if (IS_OPTION("-query")) {
+        CHECK_ARGS(1);
+        g_fXdmcpEnabled = TRUE;
+        g_pszQueryHost = argv[++i];
+        return 0;               /* Let DIX parse this again */
     }
 
-  /*
-   * Look for the '-auth' argument
-   */
-  if (IS_OPTION ("-auth"))
-    {
-      g_fAuthEnabled = TRUE;
-      return 0; /* Let DIX parse this again */
+    /*
+     * Look for the '-auth' argument
+     */
+    if (IS_OPTION("-auth")) {
+        g_fAuthEnabled = TRUE;
+        return 0;               /* Let DIX parse this again */
     }
 
-  /*
-   * Look for the '-indirect' or '-broadcast' arguments
-   */
-  if (IS_OPTION ("-indirect")
-      || IS_OPTION ("-broadcast"))
-    {
-      g_fXdmcpEnabled = TRUE;
-      return 0; /* Let DIX parse this again */
+    /*
+     * Look for the '-indirect' or '-broadcast' arguments
+     */
+    if (IS_OPTION("-indirect")
+        || IS_OPTION("-broadcast")) {
+        g_fXdmcpEnabled = TRUE;
+        return 0;               /* Let DIX parse this again */
     }
 
-  /*
-   * Look for the '-config' argument
-   */
-  if (IS_OPTION ("-config")
-      || IS_OPTION ("-xf86config"))
-    {
-      CHECK_ARGS (1);
+    /*
+     * Look for the '-config' argument
+     */
+    if (IS_OPTION("-config")
+        || IS_OPTION("-xf86config")) {
+        CHECK_ARGS(1);
 #ifdef XWIN_XF86CONFIG
-      g_cmdline.configFile = argv[++i];
+        g_cmdline.configFile = argv[++i];
 #else
-      winMessageBoxF ("The %s option is not supported in this "
-		      "release.\n"
-		      "Ignoring this option and continuing.\n",
-		      MB_ICONINFORMATION,
-		      argv[i]);
+        winMessageBoxF("The %s option is not supported in this "
+                       "release.\n"
+                       "Ignoring this option and continuing.\n",
+                       MB_ICONINFORMATION, argv[i]);
 #endif
-      return 2;
+        return 2;
     }
 
-  /*
-   * Look for the '-configdir' argument
-   */
-  if (IS_OPTION ("-configdir"))
-    {
-      CHECK_ARGS (1);
+    /*
+     * Look for the '-configdir' argument
+     */
+    if (IS_OPTION("-configdir")) {
+        CHECK_ARGS(1);
 #ifdef XWIN_XF86CONFIG
-      g_cmdline.configDir = argv[++i];
+        g_cmdline.configDir = argv[++i];
 #else
-      winMessageBoxF ("The %s option is not supported in this "
-		      "release.\n"
-		      "Ignoring this option and continuing.\n",
-		      MB_ICONINFORMATION,
-		      argv[i]);
+        winMessageBoxF("The %s option is not supported in this "
+                       "release.\n"
+                       "Ignoring this option and continuing.\n",
+                       MB_ICONINFORMATION, argv[i]);
 #endif
-      return 2;
+        return 2;
     }
 
-  /*
-   * Look for the '-keyboard' argument
-   */
-  if (IS_OPTION ("-keyboard"))
-    {
+    /*
+     * Look for the '-keyboard' argument
+     */
+    if (IS_OPTION("-keyboard")) {
 #ifdef XWIN_XF86CONFIG
-      CHECK_ARGS (1);
-      g_cmdline.keyboard = argv[++i];
+        CHECK_ARGS(1);
+        g_cmdline.keyboard = argv[++i];
 #else
-      winMessageBoxF ("The -keyboard option is not supported in this "
-		      "release.\n"
-		      "Ignoring this option and continuing.\n",
-		      MB_ICONINFORMATION);
+        winMessageBoxF("The -keyboard option is not supported in this "
+                       "release.\n"
+                       "Ignoring this option and continuing.\n",
+                       MB_ICONINFORMATION);
 #endif
-      return 2;
+        return 2;
     }
 
-  /*
-   * Look for the '-logfile' argument
-   */
-  if (IS_OPTION ("-logfile"))
-    {
-      CHECK_ARGS (1);
-      g_pszLogFile = argv[++i];
+    /*
+     * Look for the '-logfile' argument
+     */
+    if (IS_OPTION("-logfile")) {
+        CHECK_ARGS(1);
+        g_pszLogFile = argv[++i];
 #ifdef RELOCATE_PROJECTROOT
-      g_fLogFileChanged = TRUE;
+        g_fLogFileChanged = TRUE;
 #endif
-      return 2;
+        return 2;
     }
 
-  /*
-   * Look for the '-logverbose' argument
-   */
-  if (IS_OPTION ("-logverbose"))
-    {
-      CHECK_ARGS (1);
-      g_iLogVerbose = atoi(argv[++i]);
-      return 2;
+    /*
+     * Look for the '-logverbose' argument
+     */
+    if (IS_OPTION("-logverbose")) {
+        CHECK_ARGS(1);
+        g_iLogVerbose = atoi(argv[++i]);
+        return 2;
     }
 
 #ifdef XWIN_CLIPBOARD
-  /*
-   * Look for the '-nounicodeclipboard' argument
-   */
-  if (IS_OPTION ("-nounicodeclipboard"))
-    {
-      g_fUnicodeClipboard = FALSE;
-      /* Indicate that we have processed the argument */
-      return 1;
+    /*
+     * Look for the '-nounicodeclipboard' argument
+     */
+    if (IS_OPTION("-nounicodeclipboard")) {
+        g_fUnicodeClipboard = FALSE;
+        /* Indicate that we have processed the argument */
+        return 1;
     }
 #endif
 
-  if (IS_OPTION ("-xkbrules"))
-    {
-      CHECK_ARGS (1);
-      g_cmdline.xkbRules = argv[++i];
-      return 2;
+    if (IS_OPTION("-xkbrules")) {
+        CHECK_ARGS(1);
+        g_cmdline.xkbRules = argv[++i];
+        return 2;
     }
-  if (IS_OPTION ("-xkbmodel"))
-    {
-      CHECK_ARGS (1);
-      g_cmdline.xkbModel = argv[++i];
-      return 2;
+    if (IS_OPTION("-xkbmodel")) {
+        CHECK_ARGS(1);
+        g_cmdline.xkbModel = argv[++i];
+        return 2;
     }
-  if (IS_OPTION ("-xkblayout"))
-    {
-      CHECK_ARGS (1);
-      g_cmdline.xkbLayout = argv[++i];
-      return 2;
+    if (IS_OPTION("-xkblayout")) {
+        CHECK_ARGS(1);
+        g_cmdline.xkbLayout = argv[++i];
+        return 2;
     }
-  if (IS_OPTION ("-xkbvariant"))
-    {
-      CHECK_ARGS (1);
-      g_cmdline.xkbVariant = argv[++i];
-      return 2;
+    if (IS_OPTION("-xkbvariant")) {
+        CHECK_ARGS(1);
+        g_cmdline.xkbVariant = argv[++i];
+        return 2;
     }
-  if (IS_OPTION ("-xkboptions"))
-    {
-      CHECK_ARGS (1);
-      g_cmdline.xkbOptions = argv[++i];
-      return 2;
+    if (IS_OPTION("-xkboptions")) {
+        CHECK_ARGS(1);
+        g_cmdline.xkbOptions = argv[++i];
+        return 2;
     }
 
-  if (IS_OPTION ("-keyhook"))
-    {
-      g_fKeyboardHookLL = TRUE;
-      return 1;
+    if (IS_OPTION("-keyhook")) {
+        g_fKeyboardHookLL = TRUE;
+        return 1;
     }
-  
-  if (IS_OPTION ("-nokeyhook"))
-    {
-      g_fKeyboardHookLL = FALSE;
-      return 1;
+
+    if (IS_OPTION("-nokeyhook")) {
+        g_fKeyboardHookLL = FALSE;
+        return 1;
     }
-  
-  if (IS_OPTION ("-swcursor"))
-    {
-      g_fSoftwareCursor = TRUE;
-      return 1;
+
+    if (IS_OPTION("-swcursor")) {
+        g_fSoftwareCursor = TRUE;
+        return 1;
     }
-  
-  if (IS_OPTION ("-silent-dup-error"))
-    {
-      g_fSilentDupError = TRUE;
-      return 1;
+
+    if (IS_OPTION("-silent-dup-error")) {
+        g_fSilentDupError = TRUE;
+        return 1;
     }
 
-  if (IS_OPTION("-wgl"))
-    {
-      g_fNativeGl = TRUE;
-      return 1;
+    if (IS_OPTION("-wgl")) {
+        g_fNativeGl = TRUE;
+        return 1;
     }
 
-  if (IS_OPTION("-nowgl"))
-    {
-      g_fNativeGl = FALSE;
-      return 1;
+    if (IS_OPTION("-nowgl")) {
+        g_fNativeGl = FALSE;
+        return 1;
     }
 
-  return 0;
+    return 0;
 }
 
-
 /*
  * winLogCommandLine - Write entire command line to the log file
  */
 
 void
-winLogCommandLine (int argc, char *argv[])
+winLogCommandLine(int argc, char *argv[])
 {
-  int		i;
-  int		iSize = 0;
-  int		iCurrLen = 0;
+    int i;
+    int iSize = 0;
+    int iCurrLen = 0;
 
 #define CHARS_PER_LINE 60
 
-  /* Bail if command line has already been logged */
-  if (g_pszCommandLine)
-    return;
-
-  /* Count how much memory is needed for concatenated command line */
-  for (i = 0, iCurrLen = 0; i < argc; ++i)
-    if (argv[i])
-      {
-	/* Adds two characters for lines that overflow */
-	if ((strlen (argv[i]) < CHARS_PER_LINE
-	    && iCurrLen + strlen (argv[i]) > CHARS_PER_LINE)
-	    || strlen (argv[i]) > CHARS_PER_LINE)
-	  {
-	    iCurrLen = 0;
-	    iSize += 2;
-	  }
-	
-	/* Add space for item and trailing space */
-	iSize += strlen (argv[i]) + 1;
-
-	/* Update current line length */
-	iCurrLen += strlen (argv[i]);
-      }
-
-  /* Allocate memory for concatenated command line */
-  g_pszCommandLine = malloc (iSize + 1);
-  if (!g_pszCommandLine)
-    FatalError ("winLogCommandLine - Could not allocate memory for "
-		"command line string.  Exiting.\n");
-  
-  /* Set first character to concatenated command line to null */
-  g_pszCommandLine[0] = '\0';
-
-  /* Loop through all args */
-  for (i = 0, iCurrLen = 0; i < argc; ++i)
-    {
-      /* Add a character for lines that overflow */
-      if ((strlen (argv[i]) < CHARS_PER_LINE
-	   && iCurrLen + strlen (argv[i]) > CHARS_PER_LINE)
-	  || strlen (argv[i]) > CHARS_PER_LINE)
-      {
-	iCurrLen = 0;
-	
-	/* Add line break if it fits */
-	strncat (g_pszCommandLine, "\n ", iSize - strlen (g_pszCommandLine));
-      }
-      
-      strncat (g_pszCommandLine, argv[i], iSize - strlen (g_pszCommandLine));
-      strncat (g_pszCommandLine, " ", iSize - strlen (g_pszCommandLine));
-
-      /* Save new line length */
-      iCurrLen += strlen (argv[i]);
+    /* Bail if command line has already been logged */
+    if (g_pszCommandLine)
+        return;
+
+    /* Count how much memory is needed for concatenated command line */
+    for (i = 0, iCurrLen = 0; i < argc; ++i)
+        if (argv[i]) {
+            /* Adds two characters for lines that overflow */
+            if ((strlen(argv[i]) < CHARS_PER_LINE
+                 && iCurrLen + strlen(argv[i]) > CHARS_PER_LINE)
+                || strlen(argv[i]) > CHARS_PER_LINE) {
+                iCurrLen = 0;
+                iSize += 2;
+            }
+
+            /* Add space for item and trailing space */
+            iSize += strlen(argv[i]) + 1;
+
+            /* Update current line length */
+            iCurrLen += strlen(argv[i]);
+        }
+
+    /* Allocate memory for concatenated command line */
+    g_pszCommandLine = malloc(iSize + 1);
+    if (!g_pszCommandLine)
+        FatalError("winLogCommandLine - Could not allocate memory for "
+                   "command line string.  Exiting.\n");
+
+    /* Set first character to concatenated command line to null */
+    g_pszCommandLine[0] = '\0';
+
+    /* Loop through all args */
+    for (i = 0, iCurrLen = 0; i < argc; ++i) {
+        /* Add a character for lines that overflow */
+        if ((strlen(argv[i]) < CHARS_PER_LINE
+             && iCurrLen + strlen(argv[i]) > CHARS_PER_LINE)
+            || strlen(argv[i]) > CHARS_PER_LINE) {
+            iCurrLen = 0;
+
+            /* Add line break if it fits */
+            strncat(g_pszCommandLine, "\n ", iSize - strlen(g_pszCommandLine));
+        }
+
+        strncat(g_pszCommandLine, argv[i], iSize - strlen(g_pszCommandLine));
+        strncat(g_pszCommandLine, " ", iSize - strlen(g_pszCommandLine));
+
+        /* Save new line length */
+        iCurrLen += strlen(argv[i]);
     }
 
-  ErrorF ("XWin was started with the following command line:\n\n"
-	  "%s\n\n", g_pszCommandLine);
+    ErrorF("XWin was started with the following command line:\n\n"
+           "%s\n\n", g_pszCommandLine);
 }
 
-
 /*
  * winLogVersionInfo - Log version information
  */
 
 void
-winLogVersionInfo (void)
+winLogVersionInfo(void)
 {
-  static Bool		s_fBeenHere = FALSE;
-
-  if (s_fBeenHere)
-    return;
-  s_fBeenHere = TRUE;
-
-  ErrorF ("Welcome to the XWin X Server\n");
-  ErrorF ("Vendor: %s\n", XVENDORNAME);
-  ErrorF ("Release: %d.%d.%d.%d (%d)\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT);
-  ErrorF ("%s\n\n", BUILDERSTRING);
-  ErrorF ("Contact: %s\n", BUILDERADDR);
+    static Bool s_fBeenHere = FALSE;
+
+    if (s_fBeenHere)
+        return;
+    s_fBeenHere = TRUE;
+
+    ErrorF("Welcome to the XWin X Server\n");
+    ErrorF("Vendor: %s\n", XVENDORNAME);
+    ErrorF("Release: %d.%d.%d.%d (%d)\n", XORG_VERSION_MAJOR,
+           XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP,
+           XORG_VERSION_CURRENT);
+    ErrorF("%s\n\n", BUILDERSTRING);
+    ErrorF("Contact: %s\n", BUILDERADDR);
 }
diff --git a/xorg-server/hw/xwin/winrandr.c b/xorg-server/hw/xwin/winrandr.c
index 596c1ab9d..1b340850c 100644
--- a/xorg-server/hw/xwin/winrandr.c
+++ b/xorg-server/hw/xwin/winrandr.c
@@ -34,163 +34,159 @@
 #include <xwin-config.h>
 #endif
 #include "win.h"
-#include "mivalidate.h" // for union _Validate used by windowstr.h
+#include "mivalidate.h"         // for union _Validate used by windowstr.h
 
 #ifndef RANDR_12_INTERFACE
 #error X server must have RandR 1.2 interface
 #endif
 
-
 /*
  * Answer queries about the RandR features supported.
  */
 
 static Bool
-winRandRGetInfo (ScreenPtr pScreen, Rotation *pRotations)
+winRandRGetInfo(ScreenPtr pScreen, Rotation * pRotations)
 {
-  winDebug ("winRandRGetInfo ()\n");
+    winDebug("winRandRGetInfo ()\n");
 
-  /* Don't support rotations */
-  *pRotations = RR_Rotate_0;
+    /* Don't support rotations */
+    *pRotations = RR_Rotate_0;
 
-  /*
-    The screen doesn't have to be limited to the actual
-    monitor size (we can have scrollbars :-), so what is
-    the upper limit?
-  */
-  RRScreenSetSizeRange(pScreen, 0, 0, 4096, 4096);
+    /*
+       The screen doesn't have to be limited to the actual
+       monitor size (we can have scrollbars :-), so what is
+       the upper limit?
+     */
+    RRScreenSetSizeRange(pScreen, 0, 0, 4096, 4096);
 
-  return TRUE;
+    return TRUE;
 }
 
 /*
 
 */
 void
-winDoRandRScreenSetSize (ScreenPtr  pScreen,
-                         CARD16	    width,
-                         CARD16	    height,
-                         CARD32	    mmWidth,
-                         CARD32	    mmHeight)
+winDoRandRScreenSetSize(ScreenPtr pScreen,
+                        CARD16 width,
+                        CARD16 height, CARD32 mmWidth, CARD32 mmHeight)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-  WindowPtr pRoot = pScreen->root;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    WindowPtr pRoot = pScreen->root;
 
-  // Prevent screen updates while we change things around
-  SetRootClip(pScreen, FALSE);
+    // Prevent screen updates while we change things around
+    SetRootClip(pScreen, FALSE);
 
-  /* Update the screen size as requested */
-  pScreenInfo->dwWidth = width;
-  pScreenInfo->dwHeight = height;
+    /* Update the screen size as requested */
+    pScreenInfo->dwWidth = width;
+    pScreenInfo->dwHeight = height;
 
-  /* Reallocate the framebuffer used by the drawing engine */
-  (*pScreenPriv->pwinFreeFB)(pScreen);
-  if (!(*pScreenPriv->pwinAllocateFB)(pScreen))
-    {
-      ErrorF ("winDoRandRScreenSetSize - Could not reallocate framebuffer\n");
+    /* Reallocate the framebuffer used by the drawing engine */
+    (*pScreenPriv->pwinFreeFB) (pScreen);
+    if (!(*pScreenPriv->pwinAllocateFB) (pScreen)) {
+        ErrorF("winDoRandRScreenSetSize - Could not reallocate framebuffer\n");
     }
 
-  pScreen->width = width;
-  pScreen->height = height;
-  pScreen->mmWidth = mmWidth;
-  pScreen->mmHeight = mmHeight;
+    pScreen->width = width;
+    pScreen->height = height;
+    pScreen->mmWidth = mmWidth;
+    pScreen->mmHeight = mmHeight;
 
-  /* Update the screen pixmap to point to the new framebuffer */
-  winUpdateFBPointer(pScreen, pScreenInfo->pfb);
+    /* Update the screen pixmap to point to the new framebuffer */
+    winUpdateFBPointer(pScreen, pScreenInfo->pfb);
 
-  // pScreen->devPrivate == pScreen->GetScreenPixmap(screen) ?
-  // resize the root window
-  //pScreen->ResizeWindow(pRoot, 0, 0, width, height, NULL);
-  // does this emit a ConfigureNotify??
+    // pScreen->devPrivate == pScreen->GetScreenPixmap(screen) ?
+    // resize the root window
+    //pScreen->ResizeWindow(pRoot, 0, 0, width, height, NULL);
+    // does this emit a ConfigureNotify??
 
-  // Restore the ability to update screen, now with new dimensions
-  SetRootClip(pScreen, TRUE);
+    // Restore the ability to update screen, now with new dimensions
+    SetRootClip(pScreen, TRUE);
 
-  // and arrange for it to be repainted
-  miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);
+    // and arrange for it to be repainted
+    miPaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND);
 
-  /* Indicate that a screen size change took place */
-  RRScreenSizeNotify(pScreen);
+    /* Indicate that a screen size change took place */
+    RRScreenSizeNotify(pScreen);
 }
 
 /*
  * Respond to resize request
  */
 static
-Bool
-winRandRScreenSetSize (ScreenPtr  pScreen,
-		       CARD16	    width,
-		       CARD16	    height,
-		       CARD32	    mmWidth,
-		       CARD32	    mmHeight)
+    Bool
+winRandRScreenSetSize(ScreenPtr pScreen,
+                      CARD16 width,
+                      CARD16 height, CARD32 mmWidth, CARD32 mmHeight)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
 
-  winDebug ("winRandRScreenSetSize ()\n");
+    winDebug("winRandRScreenSetSize ()\n");
 
-  /*
-    It doesn't currently make sense to allow resize in fullscreen mode
-    (we'd actually have to list the supported resolutions)
-  */
-  if (pScreenInfo->fFullScreen)
-    {
-      ErrorF ("winRandRScreenSetSize - resize not supported in fullscreen mode\n");
-      return FALSE;
+    /*
+       It doesn't currently make sense to allow resize in fullscreen mode
+       (we'd actually have to list the supported resolutions)
+     */
+    if (pScreenInfo->fFullScreen) {
+        ErrorF
+            ("winRandRScreenSetSize - resize not supported in fullscreen mode\n");
+        return FALSE;
     }
 
-  /*
-    Client resize requests aren't allowed in rootless modes, even if
-    the X screen is monitor or virtual desktop size, we'd need to
-    resize the native display size
-  */
-  if (FALSE
+    /*
+       Client resize requests aren't allowed in rootless modes, even if
+       the X screen is monitor or virtual desktop size, we'd need to
+       resize the native display size
+     */
+    if (FALSE
 #ifdef XWIN_MULTIWINDOWEXTWM
-      || pScreenInfo->fMWExtWM
+        || pScreenInfo->fMWExtWM
 #endif
-      || pScreenInfo->fRootless
+        || pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOW
-      || pScreenInfo->fMultiWindow
+        || pScreenInfo->fMultiWindow
 #endif
-      )
-    {
-      ErrorF ("winRandRScreenSetSize - resize not supported in rootless modes\n");
-      return FALSE;
+        ) {
+        ErrorF
+            ("winRandRScreenSetSize - resize not supported in rootless modes\n");
+        return FALSE;
     }
 
-  winDoRandRScreenSetSize(pScreen, width, height, mmWidth, mmHeight);
+    winDoRandRScreenSetSize(pScreen, width, height, mmWidth, mmHeight);
 
-  /* Cause the native window for the screen to resize itself */
-  {
-    DWORD dwStyle, dwExStyle;
-    RECT rcClient;
+    /* Cause the native window for the screen to resize itself */
+    {
+        DWORD dwStyle, dwExStyle;
+        RECT rcClient;
 
-    rcClient.left = 0;
-    rcClient.top = 0;
-    rcClient.right = width;
-    rcClient.bottom = height;
+        rcClient.left = 0;
+        rcClient.top = 0;
+        rcClient.right = width;
+        rcClient.bottom = height;
 
-    ErrorF ("winRandRScreenSetSize new client area w: %d h: %d\n", width, height);
+        ErrorF("winRandRScreenSetSize new client area w: %d h: %d\n", width,
+               height);
 
-    /* Get the Windows window style and extended style */
-    dwExStyle = GetWindowLongPtr(pScreenPriv->hwndScreen, GWL_EXSTYLE);
-    dwStyle = GetWindowLongPtr(pScreenPriv->hwndScreen, GWL_STYLE);
+        /* Get the Windows window style and extended style */
+        dwExStyle = GetWindowLongPtr(pScreenPriv->hwndScreen, GWL_EXSTYLE);
+        dwStyle = GetWindowLongPtr(pScreenPriv->hwndScreen, GWL_STYLE);
 
-    /*
-     * Calculate the window size needed for the given client area
-     * adjusting for any decorations it will have
-     */
-    AdjustWindowRectEx(&rcClient, dwStyle, FALSE, dwExStyle);
+        /*
+         * Calculate the window size needed for the given client area
+         * adjusting for any decorations it will have
+         */
+        AdjustWindowRectEx(&rcClient, dwStyle, FALSE, dwExStyle);
 
-    ErrorF ("winRandRScreenSetSize new window area w: %ld h: %ld\n", rcClient.right-rcClient.left, rcClient.bottom-rcClient.top);
+        ErrorF("winRandRScreenSetSize new window area w: %ld h: %ld\n",
+               rcClient.right - rcClient.left, rcClient.bottom - rcClient.top);
 
-    SetWindowPos(pScreenPriv->hwndScreen, NULL,
-                 0, 0, rcClient.right-rcClient.left, rcClient.bottom-rcClient.top,
-                 SWP_NOZORDER | SWP_NOMOVE);
-  }
+        SetWindowPos(pScreenPriv->hwndScreen, NULL,
+                     0, 0, rcClient.right - rcClient.left,
+                     rcClient.bottom - rcClient.top, SWP_NOZORDER | SWP_NOMOVE);
+    }
 
-  return TRUE;
+    return TRUE;
 }
 
 /*
@@ -198,24 +194,24 @@ winRandRScreenSetSize (ScreenPtr  pScreen,
  */
 
 Bool
-winRandRInit (ScreenPtr pScreen)
+winRandRInit(ScreenPtr pScreen)
 {
-  rrScrPrivPtr pRRScrPriv;
-  winDebug ("winRandRInit ()\n");
+    rrScrPrivPtr pRRScrPriv;
 
-  if (!RRScreenInit (pScreen))
-    {
-      ErrorF ("winRandRInit () - RRScreenInit () failed\n");
-      return FALSE;
+    winDebug("winRandRInit ()\n");
+
+    if (!RRScreenInit(pScreen)) {
+        ErrorF("winRandRInit () - RRScreenInit () failed\n");
+        return FALSE;
     }
 
-  /* Set some RandR function pointers */
-  pRRScrPriv = rrGetScrPriv (pScreen);
-  pRRScrPriv->rrGetInfo = winRandRGetInfo;
-  pRRScrPriv->rrSetConfig = NULL;
-  pRRScrPriv->rrScreenSetSize = winRandRScreenSetSize;
-  pRRScrPriv->rrCrtcSet = NULL;
-  pRRScrPriv->rrCrtcSetGamma = NULL;
+    /* Set some RandR function pointers */
+    pRRScrPriv = rrGetScrPriv(pScreen);
+    pRRScrPriv->rrGetInfo = winRandRGetInfo;
+    pRRScrPriv->rrSetConfig = NULL;
+    pRRScrPriv->rrScreenSetSize = winRandRScreenSetSize;
+    pRRScrPriv->rrCrtcSet = NULL;
+    pRRScrPriv->rrCrtcSetGamma = NULL;
 
-  return TRUE;
+    return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winregistry.c b/xorg-server/hw/xwin/winregistry.c
index 3571b14d7..d33f8c363 100644
--- a/xorg-server/hw/xwin/winregistry.c
+++ b/xorg-server/hw/xwin/winregistry.c
@@ -34,38 +34,32 @@
 #include "win.h"
 
 /* Prototypes */
-DWORD
-winGetRegistryDWORD (HKEY hkey, char *pszRegistryKey);
+DWORD winGetRegistryDWORD(HKEY hkey, char *pszRegistryKey);
 
 DWORD
-winGetRegistryDWORD (HKEY hkey, char *pszRegistryKey)
+winGetRegistryDWORD(HKEY hkey, char *pszRegistryKey)
 {
-  HKEY		hkResult;
-  DWORD		dwDisposition;
+    HKEY hkResult;
+    DWORD dwDisposition;
 
-  RegCreateKeyEx (hkey,
-		  pszRegistryKey,
-		  0,
-		  '\0',
-		  REG_OPTION_NON_VOLATILE,
-		  KEY_READ,
-		  NULL,
-		  &hkResult,
-		  &dwDisposition);
+    RegCreateKeyEx(hkey,
+                   pszRegistryKey,
+                   0,
+                   '\0',
+                   REG_OPTION_NON_VOLATILE,
+                   KEY_READ, NULL, &hkResult, &dwDisposition);
 
-  if (dwDisposition == REG_CREATED_NEW_KEY)
-    {
-      ErrorF ("winGetRegistryDWORD - Created new key: %s\n", pszRegistryKey);
+    if (dwDisposition == REG_CREATED_NEW_KEY) {
+        ErrorF("winGetRegistryDWORD - Created new key: %s\n", pszRegistryKey);
     }
-  else if (dwDisposition == REG_OPENED_EXISTING_KEY)
-    {
-      ErrorF ("winGetRegistryDWORD - Opened existing key: %s\n",
-	      pszRegistryKey);
+    else if (dwDisposition == REG_OPENED_EXISTING_KEY) {
+        ErrorF("winGetRegistryDWORD - Opened existing key: %s\n",
+               pszRegistryKey);
     }
 
-  /* Free the registry key handle */
-  RegCloseKey (hkResult);
-  hkResult = NULL;
+    /* Free the registry key handle */
+    RegCloseKey(hkResult);
+    hkResult = NULL;
 
-  return 0;
+    return 0;
 }
diff --git a/xorg-server/hw/xwin/winrop.c b/xorg-server/hw/xwin/winrop.c
index f4818920a..1f9ff7320 100644
--- a/xorg-server/hw/xwin/winrop.c
+++ b/xorg-server/hw/xwin/winrop.c
@@ -37,108 +37,106 @@
 #include "win.h"
 
 void
-ROP16 (HDC hdc, int rop);
-
-int g_copyROP[16] = { 	0xFF0062, /* GXclear 		- 0 */
-		 	0x8800C6, /* GXand 		- S & D */
-		 	0x440328, /* GXandReverse  	- S & !D */
-		 	0xCC0020, /* GXcopy 		- S */
-		 	0x220326, /* GXandInverted 	- !S & D */
-		 	0xAA0029, /* GXnoop		- D */
-		 	0x660046, /* GXxor 		- S ^ D */
-		 	0xEE0086, /* GXor		- S | D */
-		 	0x1100A6, /* GXnor 		- !S & !D */
-		 	0x990126, /* GXequiv		- !S ^ D */
-		 	0x550009, /* GXinvert		- !D */
-		 	0xDD0228, /* GXorReverse	- S | !D */
-		 	0x330008, /* GXcopyInverted	- !S */
-		 	0xBB0226, /* GXorInverted	- !S | D */
-		 	0x7700C6, /* GXnand		- !S | !D */
-		 	0x000042  /* GXset		- 1 */
+ ROP16(HDC hdc, int rop);
+
+int g_copyROP[16] = { 0xFF0062, /* GXclear            - 0 */
+    0x8800C6,                   /* GXand              - S & D */
+    0x440328,                   /* GXandReverse       - S & !D */
+    0xCC0020,                   /* GXcopy             - S */
+    0x220326,                   /* GXandInverted      - !S & D */
+    0xAA0029,                   /* GXnoop             - D */
+    0x660046,                   /* GXxor              - S ^ D */
+    0xEE0086,                   /* GXor               - S | D */
+    0x1100A6,                   /* GXnor              - !S & !D */
+    0x990126,                   /* GXequiv            - !S ^ D */
+    0x550009,                   /* GXinvert           - !D */
+    0xDD0228,                   /* GXorReverse        - S | !D */
+    0x330008,                   /* GXcopyInverted     - !S */
+    0xBB0226,                   /* GXorInverted       - !S | D */
+    0x7700C6,                   /* GXnand             - !S | !D */
+    0x000042                    /* GXset              - 1 */
 };
 
-int g_patternROP[16] = {0xFF0062, /* GXclear		- 0 */
-		 	0xA000C9, /* GXand 		- P & D */
-		 	0xF50225, /* GXandReverse	- P & !D */
-		 	0xF00021, /* GXcopy 		- P */
-		 	0x5F00E9, /* GXandInverted 	- !P & D */
-		 	0xAA0029, /* GXnoop		- D */
-		 	0xA50065, /* GXxor		- P ^ D */
-		 	0xA000C9, /* GXor		- P | D */
-		 	0x5F00E9, /* GXnor		- !P & !D */
-		 	0x5A0049, /* GXequiv		- !P ^ D */
-		 	0x550009, /* GXinvert		- !D */
-		 	0x500325, /* GXorReverse	- P | !D */
-		 	0x0F0001, /* GXcopyInverted	- !P */
-		 	0x0A0329, /* GXorInverted	- !P | D */
-		 	0x0500A9, /* GXnand		- !P | !D */
-		 	0x000042  /* GXset		- 1 */
+int g_patternROP[16] = { 0xFF0062,      /* GXclear            - 0 */
+    0xA000C9,                   /* GXand              - P & D */
+    0xF50225,                   /* GXandReverse       - P & !D */
+    0xF00021,                   /* GXcopy             - P */
+    0x5F00E9,                   /* GXandInverted      - !P & D */
+    0xAA0029,                   /* GXnoop             - D */
+    0xA50065,                   /* GXxor              - P ^ D */
+    0xA000C9,                   /* GXor               - P | D */
+    0x5F00E9,                   /* GXnor              - !P & !D */
+    0x5A0049,                   /* GXequiv            - !P ^ D */
+    0x550009,                   /* GXinvert           - !D */
+    0x500325,                   /* GXorReverse        - P | !D */
+    0x0F0001,                   /* GXcopyInverted     - !P */
+    0x0A0329,                   /* GXorInverted       - !P | D */
+    0x0500A9,                   /* GXnand             - !P | !D */
+    0x000042                    /* GXset              - 1 */
 };
 
-
 void
-ROP16 (HDC hdc, int rop)
+ROP16(HDC hdc, int rop)
 {
-  switch (rop)
-    {
+    switch (rop) {
     case GXclear:
-      SetROP2 (hdc, R2_BLACK);
-      break;
+        SetROP2(hdc, R2_BLACK);
+        break;
 
     case GXand:
-      SetROP2 (hdc, R2_MASKPEN);
-      break;
+        SetROP2(hdc, R2_MASKPEN);
+        break;
 
     case GXandReverse:
-      SetROP2 (hdc, R2_MASKPENNOT);
-      break;
+        SetROP2(hdc, R2_MASKPENNOT);
+        break;
 
     case GXcopy:
-      SetROP2 (hdc, R2_COPYPEN);
-      break;
+        SetROP2(hdc, R2_COPYPEN);
+        break;
 
     case GXnoop:
-      SetROP2 (hdc, R2_NOP);
-      break;
+        SetROP2(hdc, R2_NOP);
+        break;
 
     case GXxor:
-      SetROP2 (hdc, R2_XORPEN);
-      break;
+        SetROP2(hdc, R2_XORPEN);
+        break;
 
     case GXor:
-      SetROP2 (hdc, R2_MERGEPEN);
-      break;
+        SetROP2(hdc, R2_MERGEPEN);
+        break;
 
     case GXnor:
-      SetROP2 (hdc, R2_NOTMERGEPEN);
-      break;
+        SetROP2(hdc, R2_NOTMERGEPEN);
+        break;
 
     case GXequiv:
-      SetROP2 (hdc, R2_NOTXORPEN);
-      break;
+        SetROP2(hdc, R2_NOTXORPEN);
+        break;
 
     case GXinvert:
-      SetROP2 (hdc, R2_NOT);
-      break;
+        SetROP2(hdc, R2_NOT);
+        break;
 
     case GXorReverse:
-      SetROP2 (hdc, R2_MERGEPENNOT);
-      break;
+        SetROP2(hdc, R2_MERGEPENNOT);
+        break;
 
     case GXcopyInverted:
-      SetROP2 (hdc, R2_NOTCOPYPEN);
-      break;
+        SetROP2(hdc, R2_NOTCOPYPEN);
+        break;
 
     case GXorInverted:
-      SetROP2 (hdc, R2_MERGENOTPEN);
-      break;
+        SetROP2(hdc, R2_MERGENOTPEN);
+        break;
 
     case GXnand:
-      SetROP2 (hdc, R2_NOTMASKPEN);
-      break;
+        SetROP2(hdc, R2_NOTMASKPEN);
+        break;
 
     case GXset:
-      SetROP2 (hdc, R2_WHITE);
-      break;
+        SetROP2(hdc, R2_WHITE);
+        break;
     }
 }
diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c
index 983ff5730..cf7d2c0f8 100644
--- a/xorg-server/hw/xwin/winscrinit.c
+++ b/xorg-server/hw/xwin/winscrinit.c
@@ -38,30 +38,28 @@
 #include "win.h"
 #include "winmsg.h"
 
-
 #ifdef XWIN_MULTIWINDOWEXTWM
-static RootlessFrameProcsRec
-winMWExtWMProcs = {	
-  winMWExtWMCreateFrame,
-  winMWExtWMDestroyFrame,
-  
-  winMWExtWMMoveFrame,
-  winMWExtWMResizeFrame,
-  winMWExtWMRestackFrame,
-  winMWExtWMReshapeFrame,
-  winMWExtWMUnmapFrame,
-  
-  winMWExtWMStartDrawing,
-  winMWExtWMStopDrawing,
-  winMWExtWMUpdateRegion,
-  winMWExtWMDamageRects,
-  winMWExtWMRootlessSwitchWindow,
-  NULL,//winMWExtWMDoReorderWindow,
-  NULL,//winMWExtWMHideWindow,
-  NULL,//winMWExtWMUpdateColorMap,
-
-  NULL,//winMWExtWMCopyBytes,
-  winMWExtWMCopyWindow
+static RootlessFrameProcsRec winMWExtWMProcs = {
+    winMWExtWMCreateFrame,
+    winMWExtWMDestroyFrame,
+
+    winMWExtWMMoveFrame,
+    winMWExtWMResizeFrame,
+    winMWExtWMRestackFrame,
+    winMWExtWMReshapeFrame,
+    winMWExtWMUnmapFrame,
+
+    winMWExtWMStartDrawing,
+    winMWExtWMStopDrawing,
+    winMWExtWMUpdateRegion,
+    winMWExtWMDamageRects,
+    winMWExtWMRootlessSwitchWindow,
+    NULL,                       //winMWExtWMDoReorderWindow,
+    NULL,                       //winMWExtWMHideWindow,
+    NULL,                       //winMWExtWMUpdateColorMap,
+
+    NULL,                       //winMWExtWMCopyBytes,
+    winMWExtWMCopyWindow
 };
 #endif
 
@@ -74,8 +72,7 @@ winMWExtWMProcs = {
  */
 
 static Bool
-winSaveScreen (ScreenPtr pScreen, int on);
-
+ winSaveScreen(ScreenPtr pScreen, int on);
 
 /*
  * Determine what type of screen we are initializing
@@ -84,385 +81,355 @@ winSaveScreen (ScreenPtr pScreen, int on);
  */
 
 Bool
-winScreenInit (int index,
-	       ScreenPtr pScreen,
-	       int argc, char **argv)
+winScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
 {
-  winScreenInfoPtr      pScreenInfo = &g_ScreenInfo[index];
-  winPrivScreenPtr	pScreenPriv;
-  HDC			hdc;
-  DWORD dwInitialBPP;
+    winScreenInfoPtr pScreenInfo = &g_ScreenInfo[index];
+    winPrivScreenPtr pScreenPriv;
+    HDC hdc;
+    DWORD dwInitialBPP;
 
 #if CYGDEBUG || YES
-  winDebug ("winScreenInit - dwWidth: %ld dwHeight: %ld\n",
-	  pScreenInfo->dwWidth, pScreenInfo->dwHeight);
+    winDebug("winScreenInit - dwWidth: %ld dwHeight: %ld\n",
+             pScreenInfo->dwWidth, pScreenInfo->dwHeight);
 #endif
 
-  /* Allocate privates for this screen */
-  if (!winAllocatePrivates (pScreen))
-    {
-      ErrorF ("winScreenInit - Couldn't allocate screen privates\n");
-      return FALSE;
+    /* Allocate privates for this screen */
+    if (!winAllocatePrivates(pScreen)) {
+        ErrorF("winScreenInit - Couldn't allocate screen privates\n");
+        return FALSE;
     }
 
-  /* Get a pointer to the privates structure that was allocated */
-  pScreenPriv = winGetScreenPriv (pScreen);
+    /* Get a pointer to the privates structure that was allocated */
+    pScreenPriv = winGetScreenPriv(pScreen);
 
-  /* Save a pointer to this screen in the screen info structure */
-  pScreenInfo->pScreen = pScreen;
+    /* Save a pointer to this screen in the screen info structure */
+    pScreenInfo->pScreen = pScreen;
 
-  /* Save a pointer to the screen info in the screen privates structure */
-  /* This allows us to get back to the screen info from a screen pointer */
-  pScreenPriv->pScreenInfo = pScreenInfo;
+    /* Save a pointer to the screen info in the screen privates structure */
+    /* This allows us to get back to the screen info from a screen pointer */
+    pScreenPriv->pScreenInfo = pScreenInfo;
 
-  /*
-   * Determine which engine to use.
-   *
-   * NOTE: This is done once per screen because each screen possibly has
-   * a preferred engine specified on the command line.
-   */
-  if (!winSetEngine (pScreen))
-    {
-      ErrorF ("winScreenInit - winSetEngine () failed\n");
-      return FALSE;
+    /*
+     * Determine which engine to use.
+     *
+     * NOTE: This is done once per screen because each screen possibly has
+     * a preferred engine specified on the command line.
+     */
+    if (!winSetEngine(pScreen)) {
+        ErrorF("winScreenInit - winSetEngine () failed\n");
+        return FALSE;
     }
 
-  /* Horribly misnamed function: Allow engine to adjust BPP for screen */
-  dwInitialBPP = pScreenInfo->dwBPP;
+    /* Horribly misnamed function: Allow engine to adjust BPP for screen */
+    dwInitialBPP = pScreenInfo->dwBPP;
 
-  if (!(*pScreenPriv->pwinAdjustVideoMode) (pScreen))
-    {
-      ErrorF ("winScreenInit - winAdjustVideoMode () failed\n");
-      return FALSE;
+    if (!(*pScreenPriv->pwinAdjustVideoMode) (pScreen)) {
+        ErrorF("winScreenInit - winAdjustVideoMode () failed\n");
+        return FALSE;
     }
 
-  if (dwInitialBPP == WIN_DEFAULT_BPP)
-    {
-      /* No -depth parameter was passed, let the user know the depth being used */
-      ErrorF ("winScreenInit - Using Windows display depth of %d bits per pixel\n", (int) pScreenInfo->dwBPP);
+    if (dwInitialBPP == WIN_DEFAULT_BPP) {
+        /* No -depth parameter was passed, let the user know the depth being used */
+        ErrorF
+            ("winScreenInit - Using Windows display depth of %d bits per pixel\n",
+             (int) pScreenInfo->dwBPP);
     }
-  else if (dwInitialBPP != pScreenInfo->dwBPP)
-    {
-      /* Warn user if engine forced a depth different to -depth parameter */
-      ErrorF ("winScreenInit - Command line depth of %d bpp overidden by engine, using %d bpp\n", (int) dwInitialBPP, (int) pScreenInfo->dwBPP);
+    else if (dwInitialBPP != pScreenInfo->dwBPP) {
+        /* Warn user if engine forced a depth different to -depth parameter */
+        ErrorF
+            ("winScreenInit - Command line depth of %d bpp overidden by engine, using %d bpp\n",
+             (int) dwInitialBPP, (int) pScreenInfo->dwBPP);
     }
-  else
-    {
-      ErrorF ("winScreenInit - Using command line depth of %d bpp\n", (int) pScreenInfo->dwBPP);
+    else {
+        ErrorF("winScreenInit - Using command line depth of %d bpp\n",
+               (int) pScreenInfo->dwBPP);
     }
 
-  /* Check for supported display depth */
-  if (!(WIN_SUPPORTED_BPPS & (1 << (pScreenInfo->dwBPP - 1))))
-    {
-      ErrorF ("winScreenInit - Unsupported display depth: %d\n" \
-	      "Change your Windows display depth to 15, 16, 24, or 32 bits "
-	      "per pixel.\n",
-	      (int) pScreenInfo->dwBPP);
-      ErrorF ("winScreenInit - Supported depths: %08x\n",
-	      WIN_SUPPORTED_BPPS);
+    /* Check for supported display depth */
+    if (!(WIN_SUPPORTED_BPPS & (1 << (pScreenInfo->dwBPP - 1)))) {
+        ErrorF("winScreenInit - Unsupported display depth: %d\n"
+               "Change your Windows display depth to 15, 16, 24, or 32 bits "
+               "per pixel.\n", (int) pScreenInfo->dwBPP);
+        ErrorF("winScreenInit - Supported depths: %08x\n", WIN_SUPPORTED_BPPS);
 #if WIN_CHECK_DEPTH
-      return FALSE;
+        return FALSE;
 #endif
     }
 
-  /*
-   * Check that all monitors have the same display depth if we are using
-   * multiple monitors
-   */
-  if (pScreenInfo->fMultipleMonitors
-      && !GetSystemMetrics (SM_SAMEDISPLAYFORMAT))
-    {
-      ErrorF ("winScreenInit - Monitors do not all have same pixel format / "
-	      "display depth.\n");
-      if (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI)
-        {
-          ErrorF ("winScreenInit - Performance may suffer off primary display.\n");
+    /*
+     * Check that all monitors have the same display depth if we are using
+     * multiple monitors
+     */
+    if (pScreenInfo->fMultipleMonitors
+        && !GetSystemMetrics(SM_SAMEDISPLAYFORMAT)) {
+        ErrorF("winScreenInit - Monitors do not all have same pixel format / "
+               "display depth.\n");
+        if (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI) {
+            ErrorF
+                ("winScreenInit - Performance may suffer off primary display.\n");
         }
-      else
-        {
-          ErrorF ("winScreenInit - Using primary display only.\n");
-          pScreenInfo->fMultipleMonitors = FALSE;
+        else {
+            ErrorF("winScreenInit - Using primary display only.\n");
+            pScreenInfo->fMultipleMonitors = FALSE;
         }
     }
 
-  /* Create display window */
-  if (!(*pScreenPriv->pwinCreateBoundingWindow) (pScreen))
-    {
-      ErrorF ("winScreenInit - pwinCreateBoundingWindow () "
-	      "failed\n");
-      return FALSE;
+    /* Create display window */
+    if (!(*pScreenPriv->pwinCreateBoundingWindow) (pScreen)) {
+        ErrorF("winScreenInit - pwinCreateBoundingWindow () " "failed\n");
+        return FALSE;
     }
 
-  /* Get a device context */
-  hdc = GetDC (pScreenPriv->hwndScreen);
+    /* Get a device context */
+    hdc = GetDC(pScreenPriv->hwndScreen);
 
-  /* Are we using multiple monitors? */
-  if (pScreenInfo->fMultipleMonitors)
-    {
-      /* 
-       * In this case, some of the defaults set in
-       * winInitializeScreenDefaults() are not correct ...
-       */
-      if (!pScreenInfo->fUserGaveHeightAndWidth)
-	{
-	  pScreenInfo->dwWidth = GetSystemMetrics (SM_CXVIRTUALSCREEN);
-	  pScreenInfo->dwHeight = GetSystemMetrics (SM_CYVIRTUALSCREEN);
-	}
+    /* Are we using multiple monitors? */
+    if (pScreenInfo->fMultipleMonitors) {
+        /* 
+         * In this case, some of the defaults set in
+         * winInitializeScreenDefaults() are not correct ...
+         */
+        if (!pScreenInfo->fUserGaveHeightAndWidth) {
+            pScreenInfo->dwWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+            pScreenInfo->dwHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+        }
     }
 
-  /* Release the device context */
-  ReleaseDC (pScreenPriv->hwndScreen, hdc);
-    
-  /* Clear the visuals list */
-  miClearVisualTypes ();
+    /* Release the device context */
+    ReleaseDC(pScreenPriv->hwndScreen, hdc);
 
-  /* Call the engine dependent screen initialization procedure */
-  if (!((*pScreenPriv->pwinFinishScreenInit) (index, pScreen, argc, argv)))
-    {
-      ErrorF ("winScreenInit - winFinishScreenInit () failed\n");
+    /* Clear the visuals list */
+    miClearVisualTypes();
 
-      /* call the engine dependent screen close procedure to clean up from a failure */
-      pScreenPriv->pwinCloseScreen(index, pScreen);
+    /* Call the engine dependent screen initialization procedure */
+    if (!((*pScreenPriv->pwinFinishScreenInit) (index, pScreen, argc, argv))) {
+        ErrorF("winScreenInit - winFinishScreenInit () failed\n");
 
-      return FALSE;
+        /* call the engine dependent screen close procedure to clean up from a failure */
+        pScreenPriv->pwinCloseScreen(index, pScreen);
+
+        return FALSE;
     }
 
-  if (!g_fSoftwareCursor)
-    winInitCursor(pScreen);
-  else
-    winErrorFVerb(2, "winScreenInit - Using software cursor\n");  
+    if (!g_fSoftwareCursor)
+        winInitCursor(pScreen);
+    else
+        winErrorFVerb(2, "winScreenInit - Using software cursor\n");
 
-  /*
-     Note the screen origin in a normalized coordinate space where (0,0) is at the top left
-     of the native virtual desktop area
-  */
-  pScreen->x = pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN);
-  pScreen->y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);
+    /*
+       Note the screen origin in a normalized coordinate space where (0,0) is at the top left
+       of the native virtual desktop area
+     */
+    pScreen->x = pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN);
+    pScreen->y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);
 
-  ErrorF("Screen %d added at virtual desktop coordinate (%d,%d).\n",
-         index, pScreen->x, pScreen->y);
+    ErrorF("Screen %d added at virtual desktop coordinate (%d,%d).\n",
+           index, pScreen->x, pScreen->y);
 
 #if CYGDEBUG || YES
-  winDebug ("winScreenInit - returning\n");
+    winDebug("winScreenInit - returning\n");
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
 static Bool
 winCreateScreenResources(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  Bool result;
+    winScreenPriv(pScreen);
+    Bool result;
 
-  result = pScreenPriv->pwinCreateScreenResources(pScreen);
+    result = pScreenPriv->pwinCreateScreenResources(pScreen);
 
-  /* Now the screen bitmap has been wrapped in a pixmap,
-     add that to the Shadow framebuffer */
-  if (!shadowAdd(pScreen, pScreen->devPrivate,
-		 pScreenPriv->pwinShadowUpdate, NULL, 0, 0))
-    {
-      ErrorF ("winCreateScreenResources - shadowAdd () failed\n");
-      return FALSE;
+    /* Now the screen bitmap has been wrapped in a pixmap,
+       add that to the Shadow framebuffer */
+    if (!shadowAdd(pScreen, pScreen->devPrivate,
+                   pScreenPriv->pwinShadowUpdate, NULL, 0, 0)) {
+        ErrorF("winCreateScreenResources - shadowAdd () failed\n");
+        return FALSE;
     }
 
-  return result;
+    return result;
 }
 
 /* See Porting Layer Definition - p. 20 */
 Bool
-winFinishScreenInitFB (int index,
-		       ScreenPtr pScreen,
-		       int argc, char **argv)
+winFinishScreenInitFB(int index, ScreenPtr pScreen, int argc, char **argv)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  VisualPtr		pVisual = NULL;
-  char			*pbits = NULL;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    VisualPtr pVisual = NULL;
+    char *pbits = NULL;
+
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
-  int			iReturn;
+    int iReturn;
 #endif
 
-  /* Create framebuffer */
-  if (!(*pScreenPriv->pwinInitScreen) (pScreen))
-    {
-      ErrorF ("winFinishScreenInitFB - Could not allocate framebuffer\n");
-      return FALSE;
-    }
-
-  /*
-   * Calculate the number of bits that are used to represent color in each pixel,
-   * the color depth for the screen
-   */
-  if (pScreenInfo->dwBPP == 8)
-    pScreenInfo->dwDepth = 8;
-  else
-    pScreenInfo->dwDepth = winCountBits (pScreenPriv->dwRedMask)
-      + winCountBits (pScreenPriv->dwGreenMask)
-      + winCountBits (pScreenPriv->dwBlueMask);
-
-  winErrorFVerb (2, "winFinishScreenInitFB - Masks: %08x %08x %08x\n",
-	  (unsigned int) pScreenPriv->dwRedMask,
-	  (unsigned int) pScreenPriv->dwGreenMask,
-	  (unsigned int) pScreenPriv->dwBlueMask);
-
-  /* Init visuals */
-  if (!(*pScreenPriv->pwinInitVisuals) (pScreen))
-    {
-      ErrorF ("winFinishScreenInitFB - winInitVisuals failed\n");
-      return FALSE;
-    }
-
-  /* Setup a local variable to point to the framebuffer */
-  pbits = pScreenInfo->pfb;
-  
-  /* Apparently we need this for the render extension */
-  miSetPixmapDepths ();
-
-  /* Start fb initialization */
-  if (!fbSetupScreen (pScreen,
-		      pScreenInfo->pfb,
-		      pScreenInfo->dwWidth, pScreenInfo->dwHeight,
-		      monitorResolution, monitorResolution,
-		      pScreenInfo->dwStride,
-		      pScreenInfo->dwBPP))
-    {
-      ErrorF ("winFinishScreenInitFB - fbSetupScreen failed\n");
-      return FALSE;
-    }
-
-  /* Override default colormap routines if visual class is dynamic */
-  if (pScreenInfo->dwDepth == 8
-      && (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI
-	  || (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
-	      && pScreenInfo->fFullScreen)
-	  || (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
-	      && pScreenInfo->fFullScreen)))
-    {
-      winSetColormapFunctions (pScreen);
-
-      /*
-       * NOTE: Setting whitePixel to 255 causes Magic 7.1 to allocate its
-       * own colormap, as it cannot allocate 7 planes in the default
-       * colormap.  Setting whitePixel to 1 allows Magic to get 7
-       * planes in the default colormap, so it doesn't create its
-       * own colormap.  This latter situation is highly desireable,
-       * as it keeps the Magic window viewable when switching to
-       * other X clients that use the default colormap.
-       */
-      pScreen->blackPixel = 0;
-      pScreen->whitePixel = 1;
-    }
-
-  /* Place our save screen function */
-  pScreen->SaveScreen = winSaveScreen;
-
-  /* Finish fb initialization */
-  if (!fbFinishScreenInit (pScreen,
-			   pScreenInfo->pfb,
-			   pScreenInfo->dwWidth, pScreenInfo->dwHeight,
-			   monitorResolution, monitorResolution,
-			   pScreenInfo->dwStride,
-			   pScreenInfo->dwBPP))
-    {
-      ErrorF ("winFinishScreenInitFB - fbFinishScreenInit failed\n");
-      return FALSE;
-    }
-
-  /* Save a pointer to the root visual */
-  for (pVisual = pScreen->visuals;
-       pVisual->vid != pScreen->rootVisual;
-       pVisual++);
-  pScreenPriv->pRootVisual = pVisual;
-
-  /* 
-   * Setup points to the block and wakeup handlers.  Pass a pointer
-   * to the current screen as pWakeupdata.
-   */
-  pScreen->BlockHandler = winBlockHandler;
-  pScreen->WakeupHandler = winWakeupHandler;
-  pScreen->blockData = pScreen;
-  pScreen->wakeupData = pScreen;
-
-  /* Render extension initialization, calls miPictureInit */
-  if (!fbPictureInit (pScreen, NULL, 0))
-    {
-      ErrorF ("winFinishScreenInitFB - fbPictureInit () failed\n");
-      return FALSE;
+    /* Create framebuffer */
+    if (!(*pScreenPriv->pwinInitScreen) (pScreen)) {
+        ErrorF("winFinishScreenInitFB - Could not allocate framebuffer\n");
+        return FALSE;
+    }
+
+    /*
+     * Calculate the number of bits that are used to represent color in each pixel,
+     * the color depth for the screen
+     */
+    if (pScreenInfo->dwBPP == 8)
+        pScreenInfo->dwDepth = 8;
+    else
+        pScreenInfo->dwDepth = winCountBits(pScreenPriv->dwRedMask)
+            + winCountBits(pScreenPriv->dwGreenMask)
+            + winCountBits(pScreenPriv->dwBlueMask);
+
+    winErrorFVerb(2, "winFinishScreenInitFB - Masks: %08x %08x %08x\n",
+                  (unsigned int) pScreenPriv->dwRedMask,
+                  (unsigned int) pScreenPriv->dwGreenMask,
+                  (unsigned int) pScreenPriv->dwBlueMask);
+
+    /* Init visuals */
+    if (!(*pScreenPriv->pwinInitVisuals) (pScreen)) {
+        ErrorF("winFinishScreenInitFB - winInitVisuals failed\n");
+        return FALSE;
+    }
+
+    /* Setup a local variable to point to the framebuffer */
+    pbits = pScreenInfo->pfb;
+
+    /* Apparently we need this for the render extension */
+    miSetPixmapDepths();
+
+    /* Start fb initialization */
+    if (!fbSetupScreen(pScreen,
+                       pScreenInfo->pfb,
+                       pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+                       monitorResolution, monitorResolution,
+                       pScreenInfo->dwStride, pScreenInfo->dwBPP)) {
+        ErrorF("winFinishScreenInitFB - fbSetupScreen failed\n");
+        return FALSE;
+    }
+
+    /* Override default colormap routines if visual class is dynamic */
+    if (pScreenInfo->dwDepth == 8
+        && (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI
+            || (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
+                && pScreenInfo->fFullScreen)
+            || (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
+                && pScreenInfo->fFullScreen))) {
+        winSetColormapFunctions(pScreen);
+
+        /*
+         * NOTE: Setting whitePixel to 255 causes Magic 7.1 to allocate its
+         * own colormap, as it cannot allocate 7 planes in the default
+         * colormap.  Setting whitePixel to 1 allows Magic to get 7
+         * planes in the default colormap, so it doesn't create its
+         * own colormap.  This latter situation is highly desireable,
+         * as it keeps the Magic window viewable when switching to
+         * other X clients that use the default colormap.
+         */
+        pScreen->blackPixel = 0;
+        pScreen->whitePixel = 1;
+    }
+
+    /* Place our save screen function */
+    pScreen->SaveScreen = winSaveScreen;
+
+    /* Finish fb initialization */
+    if (!fbFinishScreenInit(pScreen,
+                            pScreenInfo->pfb,
+                            pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+                            monitorResolution, monitorResolution,
+                            pScreenInfo->dwStride, pScreenInfo->dwBPP)) {
+        ErrorF("winFinishScreenInitFB - fbFinishScreenInit failed\n");
+        return FALSE;
+    }
+
+    /* Save a pointer to the root visual */
+    for (pVisual = pScreen->visuals;
+         pVisual->vid != pScreen->rootVisual; pVisual++);
+    pScreenPriv->pRootVisual = pVisual;
+
+    /* 
+     * Setup points to the block and wakeup handlers.  Pass a pointer
+     * to the current screen as pWakeupdata.
+     */
+    pScreen->BlockHandler = winBlockHandler;
+    pScreen->WakeupHandler = winWakeupHandler;
+    pScreen->blockData = pScreen;
+    pScreen->wakeupData = pScreen;
+
+    /* Render extension initialization, calls miPictureInit */
+    if (!fbPictureInit(pScreen, NULL, 0)) {
+        ErrorF("winFinishScreenInitFB - fbPictureInit () failed\n");
+        return FALSE;
     }
 
 #ifdef RANDR
-  /* Initialize resize and rotate support */
-  if (!winRandRInit (pScreen))
-    {
-      ErrorF ("winFinishScreenInitFB - winRandRInit () failed\n");
-      return FALSE;
+    /* Initialize resize and rotate support */
+    if (!winRandRInit(pScreen)) {
+        ErrorF("winFinishScreenInitFB - winRandRInit () failed\n");
+        return FALSE;
     }
 #endif
 
-  /* Setup the cursor routines */
+    /* Setup the cursor routines */
 #if CYGDEBUG
-  winDebug ("winFinishScreenInitFB - Calling miDCInitialize ()\n");
+    winDebug("winFinishScreenInitFB - Calling miDCInitialize ()\n");
 #endif
-  miDCInitialize (pScreen, &g_winPointerCursorFuncs);
+    miDCInitialize(pScreen, &g_winPointerCursorFuncs);
 
-  /* KDrive does winCreateDefColormap right after miDCInitialize */
-  /* Create a default colormap */
+    /* KDrive does winCreateDefColormap right after miDCInitialize */
+    /* Create a default colormap */
 #if CYGDEBUG
-  winDebug ("winFinishScreenInitFB - Calling winCreateDefColormap ()\n");
+    winDebug("winFinishScreenInitFB - Calling winCreateDefColormap ()\n");
 #endif
-  if (!winCreateDefColormap (pScreen))
-    {
-      ErrorF ("winFinishScreenInitFB - Could not create colormap\n");
-      return FALSE;
+    if (!winCreateDefColormap(pScreen)) {
+        ErrorF("winFinishScreenInitFB - Could not create colormap\n");
+        return FALSE;
     }
 
-  /* Initialize the shadow framebuffer layer */
-  if ((pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI
-       || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
-       || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL)
+    /* Initialize the shadow framebuffer layer */
+    if ((pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI
+         || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
+         || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL)
 #ifdef XWIN_MULTIWINDOWEXTWM
-      && !pScreenInfo->fMWExtWM
+        && !pScreenInfo->fMWExtWM
 #endif
-      )
-    {
+        ) {
 #if CYGDEBUG
-      winDebug ("winFinishScreenInitFB - Calling shadowSetup ()\n");
+        winDebug("winFinishScreenInitFB - Calling shadowSetup ()\n");
 #endif
-      if (!shadowSetup(pScreen))
-	{
-	  ErrorF ("winFinishScreenInitFB - shadowSetup () failed\n");
-	  return FALSE;
-	}
+        if (!shadowSetup(pScreen)) {
+            ErrorF("winFinishScreenInitFB - shadowSetup () failed\n");
+            return FALSE;
+        }
 
-      /* Wrap CreateScreenResources so we can add the screen pixmap
-         to the Shadow framebuffer after it's been created */
-      pScreenPriv->pwinCreateScreenResources = pScreen->CreateScreenResources;
-      pScreen->CreateScreenResources = winCreateScreenResources;
+        /* Wrap CreateScreenResources so we can add the screen pixmap
+           to the Shadow framebuffer after it's been created */
+        pScreenPriv->pwinCreateScreenResources = pScreen->CreateScreenResources;
+        pScreen->CreateScreenResources = winCreateScreenResources;
     }
 
 #ifdef XWIN_MULTIWINDOWEXTWM
-  /* Handle multi-window external window manager mode */
-  if (pScreenInfo->fMWExtWM)
-    {
-      winDebug ("winScreenInit - MultiWindowExtWM - Calling RootlessInit\n");
-      
-      RootlessInit(pScreen, &winMWExtWMProcs);
-      
-      winDebug ("winScreenInit - MultiWindowExtWM - RootlessInit returned\n");
-      
-      rootless_CopyBytes_threshold = 0;
-      /* FIXME: How many? Profiling needed? */
-      rootless_CopyWindow_threshold = 1;
-
-      winWindowsWMExtensionInit ();
+    /* Handle multi-window external window manager mode */
+    if (pScreenInfo->fMWExtWM) {
+        winDebug("winScreenInit - MultiWindowExtWM - Calling RootlessInit\n");
+
+        RootlessInit(pScreen, &winMWExtWMProcs);
+
+        winDebug("winScreenInit - MultiWindowExtWM - RootlessInit returned\n");
+
+        rootless_CopyBytes_threshold = 0;
+        /* FIXME: How many? Profiling needed? */
+        rootless_CopyWindow_threshold = 1;
+
+        winWindowsWMExtensionInit();
     }
 #endif
 
-  /* Handle rootless mode */
-  if (pScreenInfo->fRootless)
-    {
-      /* Define the WRAP macro temporarily for local use */
+    /* Handle rootless mode */
+    if (pScreenInfo->fRootless) {
+        /* Define the WRAP macro temporarily for local use */
 #define WRAP(a) \
     if (pScreen->a) { \
         pScreenPriv->a = pScreen->a; \
@@ -471,34 +438,32 @@ winFinishScreenInitFB (int index,
         pScreenPriv->a = NULL; \
     }
 
-      /* Save a pointer to each lower-level window procedure */
-      WRAP(CreateWindow);
-      WRAP(DestroyWindow);
-      WRAP(RealizeWindow);
-      WRAP(UnrealizeWindow);
-      WRAP(PositionWindow);
-      WRAP(ChangeWindowAttributes);
-      WRAP(SetShape);
-
-      /* Assign rootless window procedures to be top level procedures */
-      pScreen->CreateWindow = winCreateWindowRootless;
-      pScreen->DestroyWindow = winDestroyWindowRootless;
-      pScreen->PositionWindow = winPositionWindowRootless;
-      /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesRootless;*/
-      pScreen->RealizeWindow = winMapWindowRootless;
-      pScreen->UnrealizeWindow = winUnmapWindowRootless;
-      pScreen->SetShape = winSetShapeRootless;
-
-      /* Undefine the WRAP macro, as it is not needed elsewhere */
+        /* Save a pointer to each lower-level window procedure */
+        WRAP(CreateWindow);
+        WRAP(DestroyWindow);
+        WRAP(RealizeWindow);
+        WRAP(UnrealizeWindow);
+        WRAP(PositionWindow);
+        WRAP(ChangeWindowAttributes);
+        WRAP(SetShape);
+
+        /* Assign rootless window procedures to be top level procedures */
+        pScreen->CreateWindow = winCreateWindowRootless;
+        pScreen->DestroyWindow = winDestroyWindowRootless;
+        pScreen->PositionWindow = winPositionWindowRootless;
+        /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesRootless; */
+        pScreen->RealizeWindow = winMapWindowRootless;
+        pScreen->UnrealizeWindow = winUnmapWindowRootless;
+        pScreen->SetShape = winSetShapeRootless;
+
+        /* Undefine the WRAP macro, as it is not needed elsewhere */
 #undef WRAP
     }
 
-
 #ifdef XWIN_MULTIWINDOW
-  /* Handle multi window mode */
-  else if (pScreenInfo->fMultiWindow)
-    {
-      /* Define the WRAP macro temporarily for local use */
+    /* Handle multi window mode */
+    else if (pScreenInfo->fMultiWindow) {
+        /* Define the WRAP macro temporarily for local use */
 #define WRAP(a) \
     if (pScreen->a) { \
         pScreenPriv->a = pScreen->a; \
@@ -507,267 +472,254 @@ winFinishScreenInitFB (int index,
         pScreenPriv->a = NULL; \
     }
 
-      /* Save a pointer to each lower-level window procedure */
-      WRAP(CreateWindow);
-      WRAP(DestroyWindow);
-      WRAP(RealizeWindow);
-      WRAP(UnrealizeWindow);
-      WRAP(PositionWindow);
-      WRAP(ChangeWindowAttributes);
-      WRAP(ReparentWindow);
-      WRAP(RestackWindow);
-      WRAP(ResizeWindow);
-      WRAP(MoveWindow);
-      WRAP(CopyWindow);
-      WRAP(SetShape);
-
-      /* Assign multi-window window procedures to be top level procedures */
-      pScreen->CreateWindow = winCreateWindowMultiWindow;
-      pScreen->DestroyWindow = winDestroyWindowMultiWindow;
-      pScreen->PositionWindow = winPositionWindowMultiWindow;
-      /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesMultiWindow;*/
-      pScreen->RealizeWindow = winMapWindowMultiWindow;
-      pScreen->UnrealizeWindow = winUnmapWindowMultiWindow;
-      pScreen->ReparentWindow = winReparentWindowMultiWindow;
-      pScreen->RestackWindow = winRestackWindowMultiWindow;
-      pScreen->ResizeWindow = winResizeWindowMultiWindow;
-      pScreen->MoveWindow = winMoveWindowMultiWindow;
-      pScreen->CopyWindow = winCopyWindowMultiWindow;
-      pScreen->SetShape = winSetShapeMultiWindow;
-
-      /* Undefine the WRAP macro, as it is not needed elsewhere */
+        /* Save a pointer to each lower-level window procedure */
+        WRAP(CreateWindow);
+        WRAP(DestroyWindow);
+        WRAP(RealizeWindow);
+        WRAP(UnrealizeWindow);
+        WRAP(PositionWindow);
+        WRAP(ChangeWindowAttributes);
+        WRAP(ReparentWindow);
+        WRAP(RestackWindow);
+        WRAP(ResizeWindow);
+        WRAP(MoveWindow);
+        WRAP(CopyWindow);
+        WRAP(SetShape);
+
+        /* Assign multi-window window procedures to be top level procedures */
+        pScreen->CreateWindow = winCreateWindowMultiWindow;
+        pScreen->DestroyWindow = winDestroyWindowMultiWindow;
+        pScreen->PositionWindow = winPositionWindowMultiWindow;
+        /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesMultiWindow; */
+        pScreen->RealizeWindow = winMapWindowMultiWindow;
+        pScreen->UnrealizeWindow = winUnmapWindowMultiWindow;
+        pScreen->ReparentWindow = winReparentWindowMultiWindow;
+        pScreen->RestackWindow = winRestackWindowMultiWindow;
+        pScreen->ResizeWindow = winResizeWindowMultiWindow;
+        pScreen->MoveWindow = winMoveWindowMultiWindow;
+        pScreen->CopyWindow = winCopyWindowMultiWindow;
+        pScreen->SetShape = winSetShapeMultiWindow;
+
+        /* Undefine the WRAP macro, as it is not needed elsewhere */
 #undef WRAP
     }
 #endif
 
-  /* Wrap either fb's or shadow's CloseScreen with our CloseScreen */
-  pScreenPriv->CloseScreen = pScreen->CloseScreen;
-  pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;
+    /* Wrap either fb's or shadow's CloseScreen with our CloseScreen */
+    pScreenPriv->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;
 
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
-  /* Create a mutex for modules in separate threads to wait for */
-  iReturn = pthread_mutex_init (&pScreenPriv->pmServerStarted, NULL);
-  if (iReturn != 0)
-    {
-      ErrorF ("winFinishScreenInitFB - pthread_mutex_init () failed: %d\n",
-	      iReturn);
-      return FALSE;
-    }
-
-  /* Own the mutex for modules in separate threads */
-  iReturn = pthread_mutex_lock (&pScreenPriv->pmServerStarted);
-  if (iReturn != 0)
-    {
-      ErrorF ("winFinishScreenInitFB - pthread_mutex_lock () failed: %d\n",
-	      iReturn);
-      return FALSE;
-    }
-
-  /* Set the ServerStarted flag to false */
-  pScreenPriv->fServerStarted = FALSE;
+    /* Create a mutex for modules in separate threads to wait for */
+    iReturn = pthread_mutex_init(&pScreenPriv->pmServerStarted, NULL);
+    if (iReturn != 0) {
+        ErrorF("winFinishScreenInitFB - pthread_mutex_init () failed: %d\n",
+               iReturn);
+        return FALSE;
+    }
+
+    /* Own the mutex for modules in separate threads */
+    iReturn = pthread_mutex_lock(&pScreenPriv->pmServerStarted);
+    if (iReturn != 0) {
+        ErrorF("winFinishScreenInitFB - pthread_mutex_lock () failed: %d\n",
+               iReturn);
+        return FALSE;
+    }
+
+    /* Set the ServerStarted flag to false */
+    pScreenPriv->fServerStarted = FALSE;
 #endif
 
 #ifdef XWIN_MULTIWINDOWEXTWM
-  pScreenPriv->fRestacking = FALSE;
+    pScreenPriv->fRestacking = FALSE;
 #endif
 
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
-  if (FALSE
+    if (FALSE
 #ifdef XWIN_MULTIWINDOW
-      || pScreenInfo->fMultiWindow
+        || pScreenInfo->fMultiWindow
 #endif
 #ifdef XWIN_MULTIWINDOWEXTWM
-      || pScreenInfo->fInternalWM
+        || pScreenInfo->fInternalWM
 #endif
-      )
-    { 
+        ) {
 #if CYGDEBUG || YES
-      winDebug ("winFinishScreenInitFB - Calling winInitWM.\n");
+        winDebug("winFinishScreenInitFB - Calling winInitWM.\n");
 #endif
 
-      /* Initialize multi window mode */
-      if (!winInitWM (&pScreenPriv->pWMInfo,
-		      &pScreenPriv->ptWMProc,
-		      &pScreenPriv->ptXMsgProc,
-		      &pScreenPriv->pmServerStarted,
-		      pScreenInfo->dwScreen,
-		      (HWND)&pScreenPriv->hwndScreen,
+        /* Initialize multi window mode */
+        if (!winInitWM(&pScreenPriv->pWMInfo,
+                       &pScreenPriv->ptWMProc,
+                       &pScreenPriv->ptXMsgProc,
+                       &pScreenPriv->pmServerStarted,
+                       pScreenInfo->dwScreen, (HWND) & pScreenPriv->hwndScreen,
 #ifdef XWIN_MULTIWINDOWEXTWM
-		      pScreenInfo->fInternalWM ||
+                       pScreenInfo->fInternalWM ||
 #endif
-		      FALSE))
-        {
-          ErrorF ("winFinishScreenInitFB - winInitWM () failed.\n");
-          return FALSE;
+                       FALSE)) {
+            ErrorF("winFinishScreenInitFB - winInitWM () failed.\n");
+            return FALSE;
         }
-    }      
+    }
 #endif
 
-  /* Tell the server that we are enabled */
-  pScreenPriv->fEnabled = TRUE;
+    /* Tell the server that we are enabled */
+    pScreenPriv->fEnabled = TRUE;
 
-  /* Tell the server that we have a valid depth */
-  pScreenPriv->fBadDepth = FALSE;
+    /* Tell the server that we have a valid depth */
+    pScreenPriv->fBadDepth = FALSE;
 
 #if CYGDEBUG || YES
-  winDebug ("winFinishScreenInitFB - returning\n");
+    winDebug("winFinishScreenInitFB - returning\n");
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
 #ifdef XWIN_NATIVEGDI
 /* See Porting Layer Definition - p. 20 */
 
 Bool
-winFinishScreenInitNativeGDI (int index,
-			      ScreenPtr pScreen,
-			      int argc, char **argv)
+winFinishScreenInitNativeGDI(int index,
+                             ScreenPtr pScreen, int argc, char **argv)
 {
-  winScreenPriv(pScreen);
-  winScreenInfoPtr      pScreenInfo = &g_ScreenInfo[index];
-  VisualPtr		pVisuals = NULL;
-  DepthPtr		pDepths = NULL;
-  VisualID		rootVisual = 0;
-  int			nVisuals = 0, nDepths = 0, nRootDepth = 0;
-
-  /* Ignore user input (mouse, keyboard) */
-  pScreenInfo->fIgnoreInput = FALSE;
-
-  /* Get device contexts for the screen and shadow bitmap */
-  pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen);
-  if (pScreenPriv->hdcScreen == NULL)
-    FatalError ("winFinishScreenInitNativeGDI - Couldn't get a DC\n");
-
-  /* Init visuals */
-  if (!(*pScreenPriv->pwinInitVisuals) (pScreen))
-    {
-      ErrorF ("winFinishScreenInitNativeGDI - pwinInitVisuals failed\n");
-      return FALSE;
-    }
-
-  /* Initialize the mi visuals */
-  if (!miInitVisuals (&pVisuals, &pDepths, &nVisuals, &nDepths, &nRootDepth,
-		      &rootVisual,
-		      ((unsigned long)1 << (pScreenInfo->dwDepth - 1)), 8,
-		      TrueColor))
-    {
-      ErrorF ("winFinishScreenInitNativeGDI - miInitVisuals () failed\n");
-      return FALSE;
-    }
-
-  /* Initialize the CloseScreen procedure pointer */
-  pScreen->CloseScreen = NULL;
-
-  /* Initialize the mi code */
-  if (!miScreenInit (pScreen,
-		     NULL, /* No framebuffer */
-		     pScreenInfo->dwWidth, pScreenInfo->dwHeight,
-		     monitorResolution, monitorResolution,
-		     pScreenInfo->dwStride,
-		     nRootDepth, nDepths, pDepths, rootVisual,
-		     nVisuals, pVisuals))
-    {
-      ErrorF ("winFinishScreenInitNativeGDI - miScreenInit failed\n");
-      return FALSE;
-    }
-
-  pScreen->defColormap = FakeClientID(0);
-
-  /*
-   * Register our block and wakeup handlers; these procedures
-   * process messages in our Windows message queue; specifically,
-   * they process mouse and keyboard input.
-   */
-  pScreen->BlockHandler = winBlockHandler;
-  pScreen->WakeupHandler = winWakeupHandler;
-  pScreen->blockData = pScreen;
-  pScreen->wakeupData = pScreen;
-
-  /* Place our save screen function */
-  pScreen->SaveScreen = winSaveScreen;
-
-  /* Pixmaps */
-  pScreen->CreatePixmap = winCreatePixmapNativeGDI;
-  pScreen->DestroyPixmap = winDestroyPixmapNativeGDI;
-
-  /* Other Screen Routines */
-  pScreen->QueryBestSize = winQueryBestSizeNativeGDI;
-  pScreen->SaveScreen = winSaveScreen;  
-  pScreen->GetImage = miGetImage;
-  pScreen->GetSpans = winGetSpansNativeGDI;
-
-  /* Window Procedures */
-  pScreen->CreateWindow = winCreateWindowNativeGDI;
-  pScreen->DestroyWindow = winDestroyWindowNativeGDI;
-  pScreen->PositionWindow = winPositionWindowNativeGDI;
-  /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesNativeGDI;*/
-  pScreen->RealizeWindow = winMapWindowNativeGDI;
-  pScreen->UnrealizeWindow = winUnmapWindowNativeGDI;
-
-  /* Paint window */
-  pScreen->CopyWindow = winCopyWindowNativeGDI;
-
-  /* Fonts */
-  pScreen->RealizeFont = winRealizeFontNativeGDI;
-  pScreen->UnrealizeFont = winUnrealizeFontNativeGDI;
-
-  /* GC */
-  pScreen->CreateGC = winCreateGCNativeGDI;
-
-  /* Colormap Routines */
-  pScreen->CreateColormap = miInitializeColormap;
-  pScreen->DestroyColormap = (DestroyColormapProcPtr) (void (*)(void)) NoopDDA;
-  pScreen->InstallColormap = miInstallColormap;
-  pScreen->UninstallColormap = miUninstallColormap;
-  pScreen->ListInstalledColormaps = miListInstalledColormaps;
-  pScreen->StoreColors = (StoreColorsProcPtr) (void (*)(void)) NoopDDA;
-  pScreen->ResolveColor = miResolveColor;
-
-  /* Bitmap */
-  pScreen->BitmapToRegion = winPixmapToRegionNativeGDI;
-
-  ErrorF ("winFinishScreenInitNativeGDI - calling miDCInitialize\n");
-
-  /* Set the default white and black pixel positions */
-  pScreen->whitePixel = pScreen->blackPixel = (Pixel) 0;
-
-  /* Initialize the cursor */
-  if (!miDCInitialize (pScreen, &g_winPointerCursorFuncs))
-    {
-      ErrorF ("winFinishScreenInitNativeGDI - miDCInitialize failed\n");
-      return FALSE;
-    }
-  
-  /* Create a default colormap */
-  if (!miCreateDefColormap (pScreen))
-    {
-        ErrorF ("winFinishScreenInitNativeGDI - miCreateDefColormap () "
-		"failed\n");
-	return FALSE;
-    }
-
-  ErrorF ("winFinishScreenInitNativeGDI - miCreateDefColormap () "
-	  "returned\n");
-  
-  /* mi doesn't use a CloseScreen procedure, so no need to wrap */
-  pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;
-
-  /* Tell the server that we are enabled */
-  pScreenPriv->fEnabled = TRUE;
-
-  ErrorF ("winFinishScreenInitNativeGDI - Successful addition of "
-	  "screen %08x\n",
-	  (unsigned int) pScreen);
-
-  return TRUE;
+    winScreenPriv(pScreen);
+    winScreenInfoPtr pScreenInfo = &g_ScreenInfo[index];
+    VisualPtr pVisuals = NULL;
+    DepthPtr pDepths = NULL;
+    VisualID rootVisual = 0;
+    int nVisuals = 0, nDepths = 0, nRootDepth = 0;
+
+    /* Ignore user input (mouse, keyboard) */
+    pScreenInfo->fIgnoreInput = FALSE;
+
+    /* Get device contexts for the screen and shadow bitmap */
+    pScreenPriv->hdcScreen = GetDC(pScreenPriv->hwndScreen);
+    if (pScreenPriv->hdcScreen == NULL)
+        FatalError("winFinishScreenInitNativeGDI - Couldn't get a DC\n");
+
+    /* Init visuals */
+    if (!(*pScreenPriv->pwinInitVisuals) (pScreen)) {
+        ErrorF("winFinishScreenInitNativeGDI - pwinInitVisuals failed\n");
+        return FALSE;
+    }
+
+    /* Initialize the mi visuals */
+    if (!miInitVisuals(&pVisuals, &pDepths, &nVisuals, &nDepths, &nRootDepth,
+                       &rootVisual,
+                       ((unsigned long) 1 << (pScreenInfo->dwDepth - 1)), 8,
+                       TrueColor)) {
+        ErrorF("winFinishScreenInitNativeGDI - miInitVisuals () failed\n");
+        return FALSE;
+    }
+
+    /* Initialize the CloseScreen procedure pointer */
+    pScreen->CloseScreen = NULL;
+
+    /* Initialize the mi code */
+    if (!miScreenInit(pScreen, NULL,    /* No framebuffer */
+                      pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+                      monitorResolution, monitorResolution,
+                      pScreenInfo->dwStride,
+                      nRootDepth, nDepths, pDepths, rootVisual,
+                      nVisuals, pVisuals)) {
+        ErrorF("winFinishScreenInitNativeGDI - miScreenInit failed\n");
+        return FALSE;
+    }
+
+    pScreen->defColormap = FakeClientID(0);
+
+    /*
+     * Register our block and wakeup handlers; these procedures
+     * process messages in our Windows message queue; specifically,
+     * they process mouse and keyboard input.
+     */
+    pScreen->BlockHandler = winBlockHandler;
+    pScreen->WakeupHandler = winWakeupHandler;
+    pScreen->blockData = pScreen;
+    pScreen->wakeupData = pScreen;
+
+    /* Place our save screen function */
+    pScreen->SaveScreen = winSaveScreen;
+
+    /* Pixmaps */
+    pScreen->CreatePixmap = winCreatePixmapNativeGDI;
+    pScreen->DestroyPixmap = winDestroyPixmapNativeGDI;
+
+    /* Other Screen Routines */
+    pScreen->QueryBestSize = winQueryBestSizeNativeGDI;
+    pScreen->SaveScreen = winSaveScreen;
+    pScreen->GetImage = miGetImage;
+    pScreen->GetSpans = winGetSpansNativeGDI;
+
+    /* Window Procedures */
+    pScreen->CreateWindow = winCreateWindowNativeGDI;
+    pScreen->DestroyWindow = winDestroyWindowNativeGDI;
+    pScreen->PositionWindow = winPositionWindowNativeGDI;
+    /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesNativeGDI; */
+    pScreen->RealizeWindow = winMapWindowNativeGDI;
+    pScreen->UnrealizeWindow = winUnmapWindowNativeGDI;
+
+    /* Paint window */
+    pScreen->CopyWindow = winCopyWindowNativeGDI;
+
+    /* Fonts */
+    pScreen->RealizeFont = winRealizeFontNativeGDI;
+    pScreen->UnrealizeFont = winUnrealizeFontNativeGDI;
+
+    /* GC */
+    pScreen->CreateGC = winCreateGCNativeGDI;
+
+    /* Colormap Routines */
+    pScreen->CreateColormap = miInitializeColormap;
+    pScreen->DestroyColormap =
+        (DestroyColormapProcPtr) (void (*)(void)) NoopDDA;
+    pScreen->InstallColormap = miInstallColormap;
+    pScreen->UninstallColormap = miUninstallColormap;
+    pScreen->ListInstalledColormaps = miListInstalledColormaps;
+    pScreen->StoreColors = (StoreColorsProcPtr) (void (*)(void)) NoopDDA;
+    pScreen->ResolveColor = miResolveColor;
+
+    /* Bitmap */
+    pScreen->BitmapToRegion = winPixmapToRegionNativeGDI;
+
+    ErrorF("winFinishScreenInitNativeGDI - calling miDCInitialize\n");
+
+    /* Set the default white and black pixel positions */
+    pScreen->whitePixel = pScreen->blackPixel = (Pixel) 0;
+
+    /* Initialize the cursor */
+    if (!miDCInitialize(pScreen, &g_winPointerCursorFuncs)) {
+        ErrorF("winFinishScreenInitNativeGDI - miDCInitialize failed\n");
+        return FALSE;
+    }
+
+    /* Create a default colormap */
+    if (!miCreateDefColormap(pScreen)) {
+        ErrorF("winFinishScreenInitNativeGDI - miCreateDefColormap () "
+               "failed\n");
+        return FALSE;
+    }
+
+    ErrorF("winFinishScreenInitNativeGDI - miCreateDefColormap () "
+           "returned\n");
+
+    /* mi doesn't use a CloseScreen procedure, so no need to wrap */
+    pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;
+
+    /* Tell the server that we are enabled */
+    pScreenPriv->fEnabled = TRUE;
+
+    ErrorF("winFinishScreenInitNativeGDI - Successful addition of "
+           "screen %08x\n", (unsigned int) pScreen);
+
+    return TRUE;
 }
 #endif
 
-
 /* See Porting Layer Definition - p. 33 */
 static Bool
-winSaveScreen (ScreenPtr pScreen, int on)
+winSaveScreen(ScreenPtr pScreen, int on)
 {
-  return TRUE;
+    return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winsetsp.c b/xorg-server/hw/xwin/winsetsp.c
index fa492b479..8f75991ff 100644
--- a/xorg-server/hw/xwin/winsetsp.c
+++ b/xorg-server/hw/xwin/winsetsp.c
@@ -1,178 +1,169 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	Harold L Hunt II

- * 		Alan Hourihane <alanh@fairlite.demon.co.uk>

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-/* See Porting Layer Definition - p. 55 */

-void

-winSetSpansNativeGDI (DrawablePtr	pDrawable,

-		      GCPtr		pGC,

-		      char		*pSrcs,

-		      DDXPointPtr	pPoints,

-		      int		*piWidths,

-		      int		iSpans,

-		      int		fSorted)

-{

-  winGCPriv(pGC);

-  PixmapPtr		pPixmap = NULL;

-  winPrivPixmapPtr	pPixmapPriv = NULL;

-  HBITMAP		hbmpOrig = NULL;

-  BITMAPINFO		bmi;

-  HRGN			hrgn = NULL, combined = NULL;

-  int			nbox;

-  BoxPtr	 	pbox;

-

-  nbox = RegionNumRects (pGC->pCompositeClip);

-  pbox = RegionRects (pGC->pCompositeClip);

-

-  if (!nbox) return;

-

-  combined = CreateRectRgn (pbox->x1, pbox->y1, pbox->x2, pbox->y2);

-  nbox--; pbox++;

-  while (nbox--)

-    {

-      hrgn = CreateRectRgn (pbox->x1, pbox->y1, pbox->x2, pbox->y2);

-      CombineRgn (combined, combined, hrgn, RGN_OR);

-      DeleteObject (hrgn);

-      hrgn = NULL;

-      pbox++;

-    }

-

-  /* Branch on the drawable type */

-  switch (pDrawable->type)

-    {

-    case DRAWABLE_PIXMAP:

-

-      SelectClipRgn (pGCPriv->hdcMem, combined);

-      DeleteObject (combined);

-      combined = NULL;

-

-      pPixmap = (PixmapPtr) pDrawable;

-      pPixmapPriv = winGetPixmapPriv (pPixmap);

-      

-      /* Select the drawable pixmap into a DC */

-      hbmpOrig = SelectObject (pGCPriv->hdcMem, pPixmapPriv->hBitmap);

-      if (hbmpOrig == NULL)

-	FatalError ("winSetSpans - DRAWABLE_PIXMAP - SelectObject () "

-		    "failed on pPixmapPriv->hBitmap\n");

-

-      while (iSpans--)

-        {

-	  ZeroMemory (&bmi, sizeof (BITMAPINFO));

-	  bmi.bmiHeader.biSize = sizeof (BITMAPINFOHEADER);

-	  bmi.bmiHeader.biWidth = *piWidths;

-	  bmi.bmiHeader.biHeight = 1;

-	  bmi.bmiHeader.biPlanes = 1;

-	  bmi.bmiHeader.biBitCount = pDrawable->depth;

-	  bmi.bmiHeader.biCompression = BI_RGB;

-

-  	  /* Setup color table for mono DIBs */

-  	  if (pDrawable->depth == 1)

-    	    {

-      	      bmi.bmiColors[1].rgbBlue = 255;

-      	      bmi.bmiColors[1].rgbGreen = 255;

-      	      bmi.bmiColors[1].rgbRed = 255;

-    	    }

-

-	  StretchDIBits (pGCPriv->hdcMem, 

-			 pPoints->x, pPoints->y,

-			 *piWidths, 1,

-			 0, 0,

-			 *piWidths, 1,

-			 pSrcs,

-			 (BITMAPINFO *) &bmi,

-			 DIB_RGB_COLORS,

-			 g_copyROP[pGC->alu]);

-

-	  pSrcs += PixmapBytePad (*piWidths, pDrawable->depth);

-	  pPoints++;

-	  piWidths++;

-        }

-      

-      /* Reset the clip region */

-      SelectClipRgn (pGCPriv->hdcMem, NULL);

-

-      /* Push the drawable pixmap out of the GC HDC */

-      SelectObject (pGCPriv->hdcMem, hbmpOrig);

-      break;

-

-    case DRAWABLE_WINDOW:

-

-      SelectClipRgn (pGCPriv->hdc, combined);

-      DeleteObject (combined);

-      combined = NULL;

-

-      while (iSpans--)

-        {

-	  ZeroMemory (&bmi, sizeof (BITMAPINFO));

-	  bmi.bmiHeader.biSize = sizeof (BITMAPINFOHEADER);

-	  bmi.bmiHeader.biWidth = *piWidths;

-	  bmi.bmiHeader.biHeight = 1;

-	  bmi.bmiHeader.biPlanes = 1;

-	  bmi.bmiHeader.biBitCount = pDrawable->depth;

-	  bmi.bmiHeader.biCompression = BI_RGB;

-

-  	  /* Setup color table for mono DIBs */

-  	  if (pDrawable->depth == 1)

-    	    {

-      	      bmi.bmiColors[1].rgbBlue = 255;

-      	      bmi.bmiColors[1].rgbGreen = 255;

-      	      bmi.bmiColors[1].rgbRed = 255;

-    	    }

-

-	  StretchDIBits (pGCPriv->hdc, 

-			 pPoints->x, pPoints->y,

-			 *piWidths, 1,

-			 0, 0,

-			 *piWidths, 1,

-			 pSrcs,

-			 (BITMAPINFO *) &bmi,

-			 DIB_RGB_COLORS,

-			 g_copyROP[pGC->alu]);

-

-	  pSrcs += PixmapBytePad (*piWidths, pDrawable->depth);

-	  pPoints++;

-	  piWidths++;

-        }

-

-      /* Reset the clip region */

-      SelectClipRgn (pGCPriv->hdc, NULL);

-      break;

-

-    default:

-      FatalError ("\nwinSetSpansNativeGDI - Unknown drawable type\n\n");

-      break;

-    }

-}

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	Harold L Hunt II
+ * 		Alan Hourihane <alanh@fairlite.demon.co.uk>
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+/* See Porting Layer Definition - p. 55 */
+void
+winSetSpansNativeGDI(DrawablePtr pDrawable,
+                     GCPtr pGC,
+                     char *pSrcs,
+                     DDXPointPtr pPoints,
+                     int *piWidths, int iSpans, int fSorted)
+{
+    winGCPriv(pGC);
+    PixmapPtr pPixmap = NULL;
+    winPrivPixmapPtr pPixmapPriv = NULL;
+    HBITMAP hbmpOrig = NULL;
+    BITMAPINFO bmi;
+    HRGN hrgn = NULL, combined = NULL;
+    int nbox;
+    BoxPtr pbox;
+
+    nbox = RegionNumRects(pGC->pCompositeClip);
+    pbox = RegionRects(pGC->pCompositeClip);
+
+    if (!nbox)
+        return;
+
+    combined = CreateRectRgn(pbox->x1, pbox->y1, pbox->x2, pbox->y2);
+    nbox--;
+    pbox++;
+    while (nbox--) {
+        hrgn = CreateRectRgn(pbox->x1, pbox->y1, pbox->x2, pbox->y2);
+        CombineRgn(combined, combined, hrgn, RGN_OR);
+        DeleteObject(hrgn);
+        hrgn = NULL;
+        pbox++;
+    }
+
+    /* Branch on the drawable type */
+    switch (pDrawable->type) {
+    case DRAWABLE_PIXMAP:
+
+        SelectClipRgn(pGCPriv->hdcMem, combined);
+        DeleteObject(combined);
+        combined = NULL;
+
+        pPixmap = (PixmapPtr) pDrawable;
+        pPixmapPriv = winGetPixmapPriv(pPixmap);
+
+        /* Select the drawable pixmap into a DC */
+        hbmpOrig = SelectObject(pGCPriv->hdcMem, pPixmapPriv->hBitmap);
+        if (hbmpOrig == NULL)
+            FatalError("winSetSpans - DRAWABLE_PIXMAP - SelectObject () "
+                       "failed on pPixmapPriv->hBitmap\n");
+
+        while (iSpans--) {
+            ZeroMemory(&bmi, sizeof(BITMAPINFO));
+            bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+            bmi.bmiHeader.biWidth = *piWidths;
+            bmi.bmiHeader.biHeight = 1;
+            bmi.bmiHeader.biPlanes = 1;
+            bmi.bmiHeader.biBitCount = pDrawable->depth;
+            bmi.bmiHeader.biCompression = BI_RGB;
+
+            /* Setup color table for mono DIBs */
+            if (pDrawable->depth == 1) {
+                bmi.bmiColors[1].rgbBlue = 255;
+                bmi.bmiColors[1].rgbGreen = 255;
+                bmi.bmiColors[1].rgbRed = 255;
+            }
+
+            StretchDIBits(pGCPriv->hdcMem,
+                          pPoints->x, pPoints->y,
+                          *piWidths, 1,
+                          0, 0,
+                          *piWidths, 1,
+                          pSrcs,
+                          (BITMAPINFO *) & bmi,
+                          DIB_RGB_COLORS, g_copyROP[pGC->alu]);
+
+            pSrcs += PixmapBytePad(*piWidths, pDrawable->depth);
+            pPoints++;
+            piWidths++;
+        }
+
+        /* Reset the clip region */
+        SelectClipRgn(pGCPriv->hdcMem, NULL);
+
+        /* Push the drawable pixmap out of the GC HDC */
+        SelectObject(pGCPriv->hdcMem, hbmpOrig);
+        break;
+
+    case DRAWABLE_WINDOW:
+
+        SelectClipRgn(pGCPriv->hdc, combined);
+        DeleteObject(combined);
+        combined = NULL;
+
+        while (iSpans--) {
+            ZeroMemory(&bmi, sizeof(BITMAPINFO));
+            bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+            bmi.bmiHeader.biWidth = *piWidths;
+            bmi.bmiHeader.biHeight = 1;
+            bmi.bmiHeader.biPlanes = 1;
+            bmi.bmiHeader.biBitCount = pDrawable->depth;
+            bmi.bmiHeader.biCompression = BI_RGB;
+
+            /* Setup color table for mono DIBs */
+            if (pDrawable->depth == 1) {
+                bmi.bmiColors[1].rgbBlue = 255;
+                bmi.bmiColors[1].rgbGreen = 255;
+                bmi.bmiColors[1].rgbRed = 255;
+            }
+
+            StretchDIBits(pGCPriv->hdc,
+                          pPoints->x, pPoints->y,
+                          *piWidths, 1,
+                          0, 0,
+                          *piWidths, 1,
+                          pSrcs,
+                          (BITMAPINFO *) & bmi,
+                          DIB_RGB_COLORS, g_copyROP[pGC->alu]);
+
+            pSrcs += PixmapBytePad(*piWidths, pDrawable->depth);
+            pPoints++;
+            piWidths++;
+        }
+
+        /* Reset the clip region */
+        SelectClipRgn(pGCPriv->hdc, NULL);
+        break;
+
+    default:
+        FatalError("\nwinSetSpansNativeGDI - Unknown drawable type\n\n");
+        break;
+    }
+}
diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c
index 6dad2782f..a2aaa395e 100644
--- a/xorg-server/hw/xwin/winshaddd.c
+++ b/xorg-server/hw/xwin/winshaddd.c
@@ -36,7 +36,6 @@
 #endif
 #include "win.h"
 
-
 /*
  * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,
  * so we have to redefine it here.
@@ -44,70 +43,65 @@
 #ifdef DEFINE_GUID
 #undef DEFINE_GUID
 #define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-#endif /* DEFINE_GUID */
-
+#endif                          /* DEFINE_GUID */
 
 /*
  * FIXME: Headers are broken, IID_IDirectDraw2 has to be defined
  * here manually.  Should be handled by ddraw.h
  */
 #ifndef IID_IDirectDraw2
-DEFINE_GUID( IID_IDirectDraw2,0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 );
-#endif /* IID_IDirectDraw2 */
-
+DEFINE_GUID(IID_IDirectDraw2, 0xB3A6F3E0, 0x2B43, 0x11CF, 0xA2, 0xDE, 0x00,
+            0xAA, 0x00, 0xB9, 0x33, 0x56);
+#endif                          /* IID_IDirectDraw2 */
 
 /*
  * Local prototypes
  */
 
 static Bool
-winAllocateFBShadowDD (ScreenPtr pScreen);
+ winAllocateFBShadowDD(ScreenPtr pScreen);
 
 static void
-winShadowUpdateDD (ScreenPtr pScreen, 
-		   shadowBufPtr pBuf);
+ winShadowUpdateDD(ScreenPtr pScreen, shadowBufPtr pBuf);
 
 static Bool
-winCloseScreenShadowDD (int nIndex, ScreenPtr pScreen);
+ winCloseScreenShadowDD(int nIndex, ScreenPtr pScreen);
 
 static Bool
-winInitVisualsShadowDD (ScreenPtr pScreen);
+ winInitVisualsShadowDD(ScreenPtr pScreen);
 
 static Bool
-winAdjustVideoModeShadowDD (ScreenPtr pScreen);
+ winAdjustVideoModeShadowDD(ScreenPtr pScreen);
 
 static Bool
-winBltExposedRegionsShadowDD (ScreenPtr pScreen);
+ winBltExposedRegionsShadowDD(ScreenPtr pScreen);
 
 static Bool
-winActivateAppShadowDD (ScreenPtr pScreen);
+ winActivateAppShadowDD(ScreenPtr pScreen);
 
 static Bool
-winRedrawScreenShadowDD (ScreenPtr pScreen);
+ winRedrawScreenShadowDD(ScreenPtr pScreen);
 
 static Bool
-winRealizeInstalledPaletteShadowDD (ScreenPtr pScreen);
+ winRealizeInstalledPaletteShadowDD(ScreenPtr pScreen);
 
 static Bool
-winInstallColormapShadowDD (ColormapPtr pColormap);
+ winInstallColormapShadowDD(ColormapPtr pColormap);
 
 static Bool
-winStoreColorsShadowDD (ColormapPtr pmap, 
-			int ndef,
-			xColorItem *pdefs);
+ winStoreColorsShadowDD(ColormapPtr pmap, int ndef, xColorItem * pdefs);
 
 static Bool
-winCreateColormapShadowDD (ColormapPtr pColormap);
+ winCreateColormapShadowDD(ColormapPtr pColormap);
 
 static Bool
-winDestroyColormapShadowDD (ColormapPtr pColormap);
+ winDestroyColormapShadowDD(ColormapPtr pColormap);
 
 static Bool
-winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen);
+ winCreatePrimarySurfaceShadowDD(ScreenPtr pScreen);
 
 static Bool
-winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen);
-
+ winReleasePrimarySurfaceShadowDD(ScreenPtr pScreen);
 
 /*
  * Create the primary surface and attach the clipper.
@@ -116,93 +110,84 @@ winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen);
  */
 
 static Bool
-winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen)
+winCreatePrimarySurfaceShadowDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  HRESULT		ddrval = DD_OK;
-  DDSURFACEDESC		ddsd;
-
-  /* Describe the primary surface */
-  ZeroMemory (&ddsd, sizeof (ddsd));
-  ddsd.dwSize = sizeof (ddsd);
-  ddsd.dwFlags = DDSD_CAPS;
-  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-  
-  /* Create the primary surface */
-  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,
-				       &ddsd,
-				       &pScreenPriv->pddsPrimary,
-				       NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winCreatePrimarySurfaceShadowDD - Could not create primary "
-	      "surface: %08x\n", (unsigned int) ddrval);
-      return FALSE;
+    winScreenPriv(pScreen);
+    HRESULT ddrval = DD_OK;
+    DDSURFACEDESC ddsd;
+
+    /* Describe the primary surface */
+    ZeroMemory(&ddsd, sizeof(ddsd));
+    ddsd.dwSize = sizeof(ddsd);
+    ddsd.dwFlags = DDSD_CAPS;
+    ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
+
+    /* Create the primary surface */
+    ddrval = IDirectDraw2_CreateSurface(pScreenPriv->pdd2,
+                                        &ddsd, &pScreenPriv->pddsPrimary, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winCreatePrimarySurfaceShadowDD - Could not create primary "
+               "surface: %08x\n", (unsigned int) ddrval);
+        return FALSE;
     }
-  
+
 #if CYGDEBUG
-  winDebug ("winCreatePrimarySurfaceShadowDD - Created primary surface\n");
+    winDebug("winCreatePrimarySurfaceShadowDD - Created primary surface\n");
 #endif
 
-  /*
-   * Attach a clipper to the primary surface that will clip our blits to our
-   * display window.
-   */
-  ddrval = IDirectDrawSurface2_SetClipper (pScreenPriv->pddsPrimary,
-					   pScreenPriv->pddcPrimary);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winCreatePrimarySurfaceShadowDD - Primary attach clipper "
-	      "failed: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    /*
+     * Attach a clipper to the primary surface that will clip our blits to our
+     * display window.
+     */
+    ddrval = IDirectDrawSurface2_SetClipper(pScreenPriv->pddsPrimary,
+                                            pScreenPriv->pddcPrimary);
+    if (FAILED(ddrval)) {
+        ErrorF("winCreatePrimarySurfaceShadowDD - Primary attach clipper "
+               "failed: %08x\n", (unsigned int) ddrval);
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winCreatePrimarySurfaceShadowDD - Attached clipper to "
-	  "primary surface\n");
+    winDebug("winCreatePrimarySurfaceShadowDD - Attached clipper to "
+             "primary surface\n");
 #endif
 
-  /* Everything was correct */
-  return TRUE;
+    /* Everything was correct */
+    return TRUE;
 }
 
-
 /*
  * Detach the clipper and release the primary surface.
  * Called from WM_DISPLAYCHANGE.
  */
 
 static Bool
-winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen)
+winReleasePrimarySurfaceShadowDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
+    winScreenPriv(pScreen);
 
-  ErrorF ("winReleasePrimarySurfaceShadowDD - Hello\n");
+    ErrorF("winReleasePrimarySurfaceShadowDD - Hello\n");
 
-  /* Release the primary surface and clipper, if they exist */
-  if (pScreenPriv->pddsPrimary)
-    {
-      /*
-       * Detach the clipper from the primary surface.
-       * NOTE: We do this explicity for clarity.  The Clipper is not released.
-       */
-      IDirectDrawSurface2_SetClipper (pScreenPriv->pddsPrimary,
-				      NULL);
+    /* Release the primary surface and clipper, if they exist */
+    if (pScreenPriv->pddsPrimary) {
+        /*
+         * Detach the clipper from the primary surface.
+         * NOTE: We do this explicity for clarity.  The Clipper is not released.
+         */
+        IDirectDrawSurface2_SetClipper(pScreenPriv->pddsPrimary, NULL);
 
-      ErrorF ("winReleasePrimarySurfaceShadowDD - Detached clipper\n");
+        ErrorF("winReleasePrimarySurfaceShadowDD - Detached clipper\n");
 
-      /* Release the primary surface */
-      IDirectDrawSurface2_Release (pScreenPriv->pddsPrimary);
-      pScreenPriv->pddsPrimary = NULL;
+        /* Release the primary surface */
+        IDirectDrawSurface2_Release(pScreenPriv->pddsPrimary);
+        pScreenPriv->pddsPrimary = NULL;
     }
 
-  ErrorF ("winReleasePrimarySurfaceShadowDD - Released primary surface\n");
+    ErrorF("winReleasePrimarySurfaceShadowDD - Released primary surface\n");
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Create a DirectDraw surface for the shadow framebuffer; also create
  * a primary surface object so we can blit to the display.
@@ -212,335 +197,299 @@ winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen)
  */
 
 static Bool
-winAllocateFBShadowDD (ScreenPtr pScreen)
+winAllocateFBShadowDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;  
-  HRESULT		ddrval = DD_OK;
-  DDSURFACEDESC		ddsd;
-  DDSURFACEDESC		*pddsdShadow = NULL;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HRESULT ddrval = DD_OK;
+    DDSURFACEDESC ddsd;
+    DDSURFACEDESC *pddsdShadow = NULL;
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDD\n");
+    winDebug("winAllocateFBShadowDD\n");
 #endif
 
-  /* Create a clipper */
-  ddrval = (*g_fpDirectDrawCreateClipper) (0,
-					   &pScreenPriv->pddcPrimary,
-					   NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDD - Could not create clipper: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    /* Create a clipper */
+    ddrval = (*g_fpDirectDrawCreateClipper) (0,
+                                             &pScreenPriv->pddcPrimary, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDD - Could not create clipper: %08x\n",
+               (unsigned int) ddrval);
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDD - Created a clipper\n");
+    winDebug("winAllocateFBShadowDD - Created a clipper\n");
 #endif
 
-  /* Attach the clipper to our display window */
-  ddrval = IDirectDrawClipper_SetHWnd (pScreenPriv->pddcPrimary,
-				       0,
-				       pScreenPriv->hwndScreen);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDD - Clipper not attached to "
-	      "window: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    /* Attach the clipper to our display window */
+    ddrval = IDirectDrawClipper_SetHWnd(pScreenPriv->pddcPrimary,
+                                        0, pScreenPriv->hwndScreen);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDD - Clipper not attached to "
+               "window: %08x\n", (unsigned int) ddrval);
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDD - Attached clipper to window\n");
+    winDebug("winAllocateFBShadowDD - Attached clipper to window\n");
 #endif
 
-  /* Create a DirectDraw object, store the address at lpdd */
-  ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDD - Could not start DirectDraw: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    /* Create a DirectDraw object, store the address at lpdd */
+    ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDD - Could not start DirectDraw: %08x\n",
+               (unsigned int) ddrval);
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDD () - Created and initialized DD\n");
+    winDebug("winAllocateFBShadowDD () - Created and initialized DD\n");
 #endif
 
-  /* Get a DirectDraw2 interface pointer */
-  ddrval = IDirectDraw_QueryInterface (pScreenPriv->pdd,
-				       &IID_IDirectDraw2,
-				       (LPVOID*) &pScreenPriv->pdd2);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDD - Failed DD2 query: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    /* Get a DirectDraw2 interface pointer */
+    ddrval = IDirectDraw_QueryInterface(pScreenPriv->pdd,
+                                        &IID_IDirectDraw2,
+                                        (LPVOID *) & pScreenPriv->pdd2);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDD - Failed DD2 query: %08x\n",
+               (unsigned int) ddrval);
+        return FALSE;
     }
 
-  /* Are we full screen? */
-  if (pScreenInfo->fFullScreen)
-    {
-      DDSURFACEDESC	ddsdCurrent;
-      DWORD		dwRefreshRateCurrent = 0;
-      HDC		hdc = NULL;
-
-      /* Set the cooperative level to full screen */
-      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,
-						 pScreenPriv->hwndScreen,
-						 DDSCL_EXCLUSIVE
-						 | DDSCL_FULLSCREEN);
-      if (FAILED (ddrval))
-	{
-	  ErrorF ("winAllocateFBShadowDD - Could not set "
-		  "cooperative level: %08x\n",
-		  (unsigned int) ddrval);
-	  return FALSE;
-	}
-
-      /*
-       * We only need to get the current refresh rate for comparison
-       * if a refresh rate has been passed on the command line.
-       */
-      if (pScreenInfo->dwRefreshRate != 0)
-	{
-	  ZeroMemory (&ddsdCurrent, sizeof (ddsdCurrent));
-	  ddsdCurrent.dwSize = sizeof (ddsdCurrent);
-	  
-	  /* Get information about current display settings */
-	  ddrval = IDirectDraw2_GetDisplayMode (pScreenPriv->pdd2,
-						&ddsdCurrent);
-	  if (FAILED (ddrval))
-	    {
-	      ErrorF ("winAllocateFBShadowDD - Could not get current "
-		      "refresh rate: %08x.  Continuing.\n",
-		      (unsigned int) ddrval);
-	      dwRefreshRateCurrent = 0;
-	    }
-	  else
-	    {
-	      /* Grab the current refresh rate */
-	      dwRefreshRateCurrent = ddsdCurrent.u2.dwRefreshRate;
-	    }
-	}
-
-      /* Clean up the refresh rate */
-      if (dwRefreshRateCurrent == pScreenInfo->dwRefreshRate)
-	{
-	  /*
-	   * Refresh rate is non-specified or equal to current.
-	   */
-	  pScreenInfo->dwRefreshRate = 0;
-	}
-
-      /* Grab a device context for the screen */
-      hdc = GetDC (NULL);
-      if (hdc == NULL)
-	{
-	  ErrorF ("winAllocateFBShadowDD - GetDC () failed\n");
-	  return FALSE;
-	}
-
-      /* Only change the video mode when different than current mode */
-      if (!pScreenInfo->fMultipleMonitors
-	  && (pScreenInfo->dwWidth != GetSystemMetrics (SM_CXSCREEN)
-	      || pScreenInfo->dwHeight != GetSystemMetrics (SM_CYSCREEN)
-	      || pScreenInfo->dwBPP != GetDeviceCaps (hdc, BITSPIXEL)
-	      || pScreenInfo->dwRefreshRate != 0))
-	{
-	  ErrorF ("winAllocateFBShadowDD - Changing video mode\n");
-
-	  /* Change the video mode to the mode requested, and use the driver default refresh rate on failure */
-	  ddrval = IDirectDraw2_SetDisplayMode (pScreenPriv->pdd2,
-						pScreenInfo->dwWidth,
-						pScreenInfo->dwHeight,
-						pScreenInfo->dwBPP,
-						pScreenInfo->dwRefreshRate,
-						0);
-	  if (FAILED (ddrval))
-	    {
-	      ErrorF ("winAllocateFBShadowDD - Could not set "\
-		      "full screen display mode: %08x\n",
-		      (unsigned int) ddrval);
-	      ErrorF ("winAllocateFBShadowDD - Using default driver refresh rate\n");
-	      ddrval = IDirectDraw2_SetDisplayMode (pScreenPriv->pdd2,
-						    pScreenInfo->dwWidth,
-						    pScreenInfo->dwHeight,
-						    pScreenInfo->dwBPP,
-						    0,
-						    0);
-	      if (FAILED(ddrval))
-		{
-			ErrorF ("winAllocateFBShadowDD - Could not set default refresh rate "
-				"full screen display mode: %08x\n",
-				(unsigned int) ddrval);
-			return FALSE;
-		}
-	    }
-	}
-      else
-	{
-	  ErrorF ("winAllocateFBShadowDD - Not changing video mode\n");
-	}
-
-      /* Release our DC */
-      ReleaseDC (NULL, hdc);
-      hdc = NULL;
+    /* Are we full screen? */
+    if (pScreenInfo->fFullScreen) {
+        DDSURFACEDESC ddsdCurrent;
+        DWORD dwRefreshRateCurrent = 0;
+        HDC hdc = NULL;
+
+        /* Set the cooperative level to full screen */
+        ddrval = IDirectDraw2_SetCooperativeLevel(pScreenPriv->pdd2,
+                                                  pScreenPriv->hwndScreen,
+                                                  DDSCL_EXCLUSIVE
+                                                  | DDSCL_FULLSCREEN);
+        if (FAILED(ddrval)) {
+            ErrorF("winAllocateFBShadowDD - Could not set "
+                   "cooperative level: %08x\n", (unsigned int) ddrval);
+            return FALSE;
+        }
+
+        /*
+         * We only need to get the current refresh rate for comparison
+         * if a refresh rate has been passed on the command line.
+         */
+        if (pScreenInfo->dwRefreshRate != 0) {
+            ZeroMemory(&ddsdCurrent, sizeof(ddsdCurrent));
+            ddsdCurrent.dwSize = sizeof(ddsdCurrent);
+
+            /* Get information about current display settings */
+            ddrval = IDirectDraw2_GetDisplayMode(pScreenPriv->pdd2,
+                                                 &ddsdCurrent);
+            if (FAILED(ddrval)) {
+                ErrorF("winAllocateFBShadowDD - Could not get current "
+                       "refresh rate: %08x.  Continuing.\n",
+                       (unsigned int) ddrval);
+                dwRefreshRateCurrent = 0;
+            }
+            else {
+                /* Grab the current refresh rate */
+                dwRefreshRateCurrent = ddsdCurrent.u2.dwRefreshRate;
+            }
+        }
+
+        /* Clean up the refresh rate */
+        if (dwRefreshRateCurrent == pScreenInfo->dwRefreshRate) {
+            /*
+             * Refresh rate is non-specified or equal to current.
+             */
+            pScreenInfo->dwRefreshRate = 0;
+        }
+
+        /* Grab a device context for the screen */
+        hdc = GetDC(NULL);
+        if (hdc == NULL) {
+            ErrorF("winAllocateFBShadowDD - GetDC () failed\n");
+            return FALSE;
+        }
+
+        /* Only change the video mode when different than current mode */
+        if (!pScreenInfo->fMultipleMonitors
+            && (pScreenInfo->dwWidth != GetSystemMetrics(SM_CXSCREEN)
+                || pScreenInfo->dwHeight != GetSystemMetrics(SM_CYSCREEN)
+                || pScreenInfo->dwBPP != GetDeviceCaps(hdc, BITSPIXEL)
+                || pScreenInfo->dwRefreshRate != 0)) {
+            ErrorF("winAllocateFBShadowDD - Changing video mode\n");
+
+            /* Change the video mode to the mode requested, and use the driver default refresh rate on failure */
+            ddrval = IDirectDraw2_SetDisplayMode(pScreenPriv->pdd2,
+                                                 pScreenInfo->dwWidth,
+                                                 pScreenInfo->dwHeight,
+                                                 pScreenInfo->dwBPP,
+                                                 pScreenInfo->dwRefreshRate, 0);
+            if (FAILED(ddrval)) {
+                ErrorF("winAllocateFBShadowDD - Could not set "
+                       "full screen display mode: %08x\n",
+                       (unsigned int) ddrval);
+                ErrorF
+                    ("winAllocateFBShadowDD - Using default driver refresh rate\n");
+                ddrval =
+                    IDirectDraw2_SetDisplayMode(pScreenPriv->pdd2,
+                                                pScreenInfo->dwWidth,
+                                                pScreenInfo->dwHeight,
+                                                pScreenInfo->dwBPP, 0, 0);
+                if (FAILED(ddrval)) {
+                    ErrorF
+                        ("winAllocateFBShadowDD - Could not set default refresh rate "
+                         "full screen display mode: %08x\n",
+                         (unsigned int) ddrval);
+                    return FALSE;
+                }
+            }
+        }
+        else {
+            ErrorF("winAllocateFBShadowDD - Not changing video mode\n");
+        }
+
+        /* Release our DC */
+        ReleaseDC(NULL, hdc);
+        hdc = NULL;
     }
-  else
-    {
-      /* Set the cooperative level for windowed mode */
-      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,
-						 pScreenPriv->hwndScreen,
-						 DDSCL_NORMAL);
-      if (FAILED (ddrval))
-	{
-	  ErrorF ("winAllocateFBShadowDD - Could not set "\
-		  "cooperative level: %08x\n",
-		  (unsigned int) ddrval);
-	  return FALSE;
-	}
+    else {
+        /* Set the cooperative level for windowed mode */
+        ddrval = IDirectDraw2_SetCooperativeLevel(pScreenPriv->pdd2,
+                                                  pScreenPriv->hwndScreen,
+                                                  DDSCL_NORMAL);
+        if (FAILED(ddrval)) {
+            ErrorF("winAllocateFBShadowDD - Could not set "
+                   "cooperative level: %08x\n", (unsigned int) ddrval);
+            return FALSE;
+        }
     }
 
-  /* Create the primary surface */
-  if (!winCreatePrimarySurfaceShadowDD (pScreen))
-    {
-      ErrorF ("winAllocateFBShadowDD - winCreatePrimarySurfaceShadowDD "
-	      "failed\n");
-      return FALSE;
+    /* Create the primary surface */
+    if (!winCreatePrimarySurfaceShadowDD(pScreen)) {
+        ErrorF("winAllocateFBShadowDD - winCreatePrimarySurfaceShadowDD "
+               "failed\n");
+        return FALSE;
     }
 
-  /* Describe the shadow surface to be created */
-  /* NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,
-   * as drawing, locking, and unlocking take forever
-   * with video memory surfaces.  In addition,
-   * video memory is a somewhat scarce resource,
-   * so you shouldn't be allocating video memory when
-   * you have the option of using system memory instead.
-   */
-  ZeroMemory (&ddsd, sizeof (ddsd));
-  ddsd.dwSize = sizeof (ddsd);
-  ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-  ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
-  ddsd.dwHeight = pScreenInfo->dwHeight;
-  ddsd.dwWidth = pScreenInfo->dwWidth;
-
-  /* Create the shadow surface */
-  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,
-				       &ddsd,
-				       &pScreenPriv->pddsShadow,
-				       NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDD - Could not create shadow "\
-	      "surface: %08x\n", (unsigned int) ddrval);
-      return FALSE;
+    /* Describe the shadow surface to be created */
+    /* NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,
+     * as drawing, locking, and unlocking take forever
+     * with video memory surfaces.  In addition,
+     * video memory is a somewhat scarce resource,
+     * so you shouldn't be allocating video memory when
+     * you have the option of using system memory instead.
+     */
+    ZeroMemory(&ddsd, sizeof(ddsd));
+    ddsd.dwSize = sizeof(ddsd);
+    ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
+    ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
+    ddsd.dwHeight = pScreenInfo->dwHeight;
+    ddsd.dwWidth = pScreenInfo->dwWidth;
+
+    /* Create the shadow surface */
+    ddrval = IDirectDraw2_CreateSurface(pScreenPriv->pdd2,
+                                        &ddsd, &pScreenPriv->pddsShadow, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDD - Could not create shadow "
+               "surface: %08x\n", (unsigned int) ddrval);
+        return FALSE;
     }
-  
+
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDD - Created shadow\n");
+    winDebug("winAllocateFBShadowDD - Created shadow\n");
 #endif
 
-  /* Allocate a DD surface description for our screen privates */
-  pddsdShadow = pScreenPriv->pddsdShadow = malloc (sizeof (DDSURFACEDESC));
-  if (pddsdShadow == NULL)
-    {
-      ErrorF ("winAllocateFBShadowDD - Could not allocate surface "\
-	      "description memory\n");
-      return FALSE;
+    /* Allocate a DD surface description for our screen privates */
+    pddsdShadow = pScreenPriv->pddsdShadow = malloc(sizeof(DDSURFACEDESC));
+    if (pddsdShadow == NULL) {
+        ErrorF("winAllocateFBShadowDD - Could not allocate surface "
+               "description memory\n");
+        return FALSE;
     }
-  ZeroMemory (pddsdShadow, sizeof (*pddsdShadow));
-  pddsdShadow->dwSize = sizeof (*pddsdShadow);
+    ZeroMemory(pddsdShadow, sizeof(*pddsdShadow));
+    pddsdShadow->dwSize = sizeof(*pddsdShadow);
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDD - Locking shadow\n");
+    winDebug("winAllocateFBShadowDD - Locking shadow\n");
 #endif
 
-  /* Lock the shadow surface */
-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,
-				     NULL,
-				     pddsdShadow,
-				     DDLOCK_WAIT,
-				     NULL);
-  if (FAILED (ddrval) || pddsdShadow->lpSurface == NULL)
-    {
-      ErrorF ("winAllocateFBShadowDD - Could not lock shadow "\
-	      "surface: %08x\n", (unsigned int) ddrval);
-      return FALSE;
+    /* Lock the shadow surface */
+    ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsShadow,
+                                      NULL, pddsdShadow, DDLOCK_WAIT, NULL);
+    if (FAILED(ddrval) || pddsdShadow->lpSurface == NULL) {
+        ErrorF("winAllocateFBShadowDD - Could not lock shadow "
+               "surface: %08x\n", (unsigned int) ddrval);
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDD - Locked shadow\n");
+    winDebug("winAllocateFBShadowDD - Locked shadow\n");
 #endif
 
-  /* We don't know how to deal with anything other than RGB */
-  if (!(pddsdShadow->ddpfPixelFormat.dwFlags & DDPF_RGB))
-    {
-      ErrorF ("winAllocateFBShadowDD - Color format other than RGB\n");
-      return FALSE;
+    /* We don't know how to deal with anything other than RGB */
+    if (!(pddsdShadow->ddpfPixelFormat.dwFlags & DDPF_RGB)) {
+        ErrorF("winAllocateFBShadowDD - Color format other than RGB\n");
+        return FALSE;
     }
 
-  /* Grab the pitch from the surface desc */
-  pScreenInfo->dwStride = (pddsdShadow->u1.lPitch * 8)
-    / pScreenInfo->dwBPP;
+    /* Grab the pitch from the surface desc */
+    pScreenInfo->dwStride = (pddsdShadow->u1.lPitch * 8)
+        / pScreenInfo->dwBPP;
+
+    /* Save the pointer to our surface memory */
+    pScreenInfo->pfb = pddsdShadow->lpSurface;
 
-  /* Save the pointer to our surface memory */
-  pScreenInfo->pfb = pddsdShadow->lpSurface;
-  
-  /* Grab the color depth and masks from the surface description */
-  pScreenPriv->dwRedMask = pddsdShadow->ddpfPixelFormat.u2.dwRBitMask;
-  pScreenPriv->dwGreenMask = pddsdShadow->ddpfPixelFormat.u3.dwGBitMask;
-  pScreenPriv->dwBlueMask = pddsdShadow->ddpfPixelFormat.u4.dwBBitMask;
+    /* Grab the color depth and masks from the surface description */
+    pScreenPriv->dwRedMask = pddsdShadow->ddpfPixelFormat.u2.dwRBitMask;
+    pScreenPriv->dwGreenMask = pddsdShadow->ddpfPixelFormat.u3.dwGBitMask;
+    pScreenPriv->dwBlueMask = pddsdShadow->ddpfPixelFormat.u4.dwBBitMask;
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDD - Returning\n");
+    winDebug("winAllocateFBShadowDD - Returning\n");
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
 static void
-winFreeFBShadowDD (ScreenPtr pScreen)
+winFreeFBShadowDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-
-  /* Free the shadow surface, if there is one */
-  if (pScreenPriv->pddsShadow)
-    {
-      IDirectDrawSurface2_Unlock (pScreenPriv->pddsShadow, NULL);
-      IDirectDrawSurface2_Release (pScreenPriv->pddsShadow);
-      pScreenPriv->pddsShadow = NULL;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /* Free the shadow surface, if there is one */
+    if (pScreenPriv->pddsShadow) {
+        IDirectDrawSurface2_Unlock(pScreenPriv->pddsShadow, NULL);
+        IDirectDrawSurface2_Release(pScreenPriv->pddsShadow);
+        pScreenPriv->pddsShadow = NULL;
     }
 
-  /* Detach the clipper from the primary surface and release the primary surface, if there is one */
-  winReleasePrimarySurfaceShadowDD(pScreen);
+    /* Detach the clipper from the primary surface and release the primary surface, if there is one */
+    winReleasePrimarySurfaceShadowDD(pScreen);
 
-  /* Release the clipper object */
-  if (pScreenPriv->pddcPrimary)
-    {
-      IDirectDrawClipper_Release (pScreenPriv->pddcPrimary);
-      pScreenPriv->pddcPrimary = NULL;
+    /* Release the clipper object */
+    if (pScreenPriv->pddcPrimary) {
+        IDirectDrawClipper_Release(pScreenPriv->pddcPrimary);
+        pScreenPriv->pddcPrimary = NULL;
     }
 
-  /* Free the DirectDraw2 object, if there is one */
-  if (pScreenPriv->pdd2)
-    {
-      IDirectDraw2_RestoreDisplayMode (pScreenPriv->pdd2);
-      IDirectDraw2_Release (pScreenPriv->pdd2);
-      pScreenPriv->pdd2 = NULL;
+    /* Free the DirectDraw2 object, if there is one */
+    if (pScreenPriv->pdd2) {
+        IDirectDraw2_RestoreDisplayMode(pScreenPriv->pdd2);
+        IDirectDraw2_Release(pScreenPriv->pdd2);
+        pScreenPriv->pdd2 = NULL;
     }
 
-  /* Free the DirectDraw object, if there is one */
-  if (pScreenPriv->pdd)
-    {
-      IDirectDraw_Release (pScreenPriv->pdd);
-      pScreenPriv->pdd = NULL;
+    /* Free the DirectDraw object, if there is one */
+    if (pScreenPriv->pdd) {
+        IDirectDraw_Release(pScreenPriv->pdd);
+        pScreenPriv->pdd = NULL;
     }
 
-  /* Invalidate the ScreenInfo's fb pointer */
-  pScreenInfo->pfb = NULL;
+    /* Invalidate the ScreenInfo's fb pointer */
+    pScreenInfo->pfb = NULL;
 }
 
 /*
@@ -548,161 +497,148 @@ winFreeFBShadowDD (ScreenPtr pScreen)
  */
 
 static void
-winShadowUpdateDD (ScreenPtr pScreen, 
-		   shadowBufPtr pBuf)
+winShadowUpdateDD(ScreenPtr pScreen, shadowBufPtr pBuf)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  RegionPtr		damage = shadowDamage(pBuf);
-  HRESULT		ddrval = DD_OK;
-  RECT			rcDest, rcSrc;
-  POINT			ptOrigin;
-  DWORD			dwBox = RegionNumRects (damage);
-  BoxPtr		pBox = RegionRects (damage);
-  HRGN			hrgnTemp = NULL, hrgnCombined = NULL;
-
-  /*
-   * Return immediately if the app is not active
-   * and we are fullscreen, or if we have a bad display depth
-   */
-  if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)
-      || pScreenPriv->fBadDepth) return;
-
-  /* Return immediately if we didn't get needed surfaces */
-  if (!pScreenPriv->pddsPrimary || !pScreenPriv->pddsShadow)
-    return;
-
-  /* Get the origin of the window in the screen coords */
-  ptOrigin.x = pScreenInfo->dwXOffset;
-  ptOrigin.y = pScreenInfo->dwYOffset;
-  MapWindowPoints (pScreenPriv->hwndScreen,
-		   HWND_DESKTOP,
-		   (LPPOINT)&ptOrigin, 1);
-
-  /* Unlock the shadow surface, so we can blit */
-  ddrval = IDirectDrawSurface2_Unlock (pScreenPriv->pddsShadow, NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winShadowUpdateDD - Unlock failed\n");
-      return;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    RegionPtr damage = shadowDamage(pBuf);
+    HRESULT ddrval = DD_OK;
+    RECT rcDest, rcSrc;
+    POINT ptOrigin;
+    DWORD dwBox = RegionNumRects(damage);
+    BoxPtr pBox = RegionRects(damage);
+    HRGN hrgnTemp = NULL, hrgnCombined = NULL;
+
+    /*
+     * Return immediately if the app is not active
+     * and we are fullscreen, or if we have a bad display depth
+     */
+    if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)
+        || pScreenPriv->fBadDepth)
+        return;
+
+    /* Return immediately if we didn't get needed surfaces */
+    if (!pScreenPriv->pddsPrimary || !pScreenPriv->pddsShadow)
+        return;
+
+    /* Get the origin of the window in the screen coords */
+    ptOrigin.x = pScreenInfo->dwXOffset;
+    ptOrigin.y = pScreenInfo->dwYOffset;
+    MapWindowPoints(pScreenPriv->hwndScreen,
+                    HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+
+    /* Unlock the shadow surface, so we can blit */
+    ddrval = IDirectDrawSurface2_Unlock(pScreenPriv->pddsShadow, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winShadowUpdateDD - Unlock failed\n");
+        return;
     }
 
-  /*
-   * Handle small regions with multiple blits,
-   * handle large regions by creating a clipping region and 
-   * doing a single blit constrained to that clipping region.
-   */
-  if (pScreenInfo->dwClipUpdatesNBoxes == 0
-      || dwBox < pScreenInfo->dwClipUpdatesNBoxes)
-    {
-      /* Loop through all boxes in the damaged region */
-      while (dwBox--)
-	{
-	  /* Assign damage box to source rectangle */
-	  rcSrc.left = pBox->x1;
-	  rcSrc.top = pBox->y1;
-	  rcSrc.right = pBox->x2;
-	  rcSrc.bottom = pBox->y2;
-	  
-	  /* Calculate destination rectange */
-	  rcDest.left = ptOrigin.x + rcSrc.left;
-	  rcDest.top = ptOrigin.y + rcSrc.top;
-	  rcDest.right = ptOrigin.x + rcSrc.right;
-	  rcDest.bottom = ptOrigin.y + rcSrc.bottom;
-	  
-	  /* Blit the damaged areas */
-	  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,
-					    &rcDest,
-					    pScreenPriv->pddsShadow,
-					    &rcSrc,
-					    DDBLT_WAIT,
-					    NULL);
-	  
-	  /* Get a pointer to the next box */
-	  ++pBox;
-	}
+    /*
+     * Handle small regions with multiple blits,
+     * handle large regions by creating a clipping region and 
+     * doing a single blit constrained to that clipping region.
+     */
+    if (pScreenInfo->dwClipUpdatesNBoxes == 0
+        || dwBox < pScreenInfo->dwClipUpdatesNBoxes) {
+        /* Loop through all boxes in the damaged region */
+        while (dwBox--) {
+            /* Assign damage box to source rectangle */
+            rcSrc.left = pBox->x1;
+            rcSrc.top = pBox->y1;
+            rcSrc.right = pBox->x2;
+            rcSrc.bottom = pBox->y2;
+
+            /* Calculate destination rectange */
+            rcDest.left = ptOrigin.x + rcSrc.left;
+            rcDest.top = ptOrigin.y + rcSrc.top;
+            rcDest.right = ptOrigin.x + rcSrc.right;
+            rcDest.bottom = ptOrigin.y + rcSrc.bottom;
+
+            /* Blit the damaged areas */
+            ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsPrimary,
+                                             &rcDest,
+                                             pScreenPriv->pddsShadow,
+                                             &rcSrc, DDBLT_WAIT, NULL);
+
+            /* Get a pointer to the next box */
+            ++pBox;
+        }
     }
-  else
-    {
-      BoxPtr		pBoxExtents = RegionExtents(damage);
-
-      /* Compute a GDI region from the damaged region */
-      hrgnCombined = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
-      dwBox--;
-      pBox++;
-      while (dwBox--)
-	{
-	  hrgnTemp = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
-	  CombineRgn (hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);
-	  DeleteObject (hrgnTemp);
-	  pBox++;
-	}  
-
-      /* Install the GDI region as a clipping region */
-      SelectClipRgn (pScreenPriv->hdcScreen, hrgnCombined);
-      DeleteObject (hrgnCombined);
-      hrgnCombined = NULL;
-
-      /* Calculating a bounding box for the source is easy */
-      rcSrc.left = pBoxExtents->x1;
-      rcSrc.top = pBoxExtents->y1;
-      rcSrc.right = pBoxExtents->x2;
-      rcSrc.bottom = pBoxExtents->y2;
-
-      /* Calculating a bounding box for the destination is trickier */
-      rcDest.left = ptOrigin.x + rcSrc.left;
-      rcDest.top = ptOrigin.y + rcSrc.top;
-      rcDest.right = ptOrigin.x + rcSrc.right;
-      rcDest.bottom = ptOrigin.y + rcSrc.bottom;
-      
-      /* Our Blt should be clipped to the invalidated region */
-      ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,
-					&rcDest,
-					pScreenPriv->pddsShadow,
-					&rcSrc,
-					DDBLT_WAIT,
-					NULL);
-
-      /* Reset the clip region */
-      SelectClipRgn (pScreenPriv->hdcScreen, NULL);
+    else {
+        BoxPtr pBoxExtents = RegionExtents(damage);
+
+        /* Compute a GDI region from the damaged region */
+        hrgnCombined = CreateRectRgn(pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+        dwBox--;
+        pBox++;
+        while (dwBox--) {
+            hrgnTemp = CreateRectRgn(pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+            CombineRgn(hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);
+            DeleteObject(hrgnTemp);
+            pBox++;
+        }
+
+        /* Install the GDI region as a clipping region */
+        SelectClipRgn(pScreenPriv->hdcScreen, hrgnCombined);
+        DeleteObject(hrgnCombined);
+        hrgnCombined = NULL;
+
+        /* Calculating a bounding box for the source is easy */
+        rcSrc.left = pBoxExtents->x1;
+        rcSrc.top = pBoxExtents->y1;
+        rcSrc.right = pBoxExtents->x2;
+        rcSrc.bottom = pBoxExtents->y2;
+
+        /* Calculating a bounding box for the destination is trickier */
+        rcDest.left = ptOrigin.x + rcSrc.left;
+        rcDest.top = ptOrigin.y + rcSrc.top;
+        rcDest.right = ptOrigin.x + rcSrc.right;
+        rcDest.bottom = ptOrigin.y + rcSrc.bottom;
+
+        /* Our Blt should be clipped to the invalidated region */
+        ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsPrimary,
+                                         &rcDest,
+                                         pScreenPriv->pddsShadow,
+                                         &rcSrc, DDBLT_WAIT, NULL);
+
+        /* Reset the clip region */
+        SelectClipRgn(pScreenPriv->hdcScreen, NULL);
     }
 
-  /* Relock the shadow surface */
-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,
-				     NULL,
-				     pScreenPriv->pddsdShadow,
-				     DDLOCK_WAIT,
-				     NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winShadowUpdateDD - Lock failed\n");
-      return;
+    /* Relock the shadow surface */
+    ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsShadow,
+                                      NULL,
+                                      pScreenPriv->pddsdShadow,
+                                      DDLOCK_WAIT, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winShadowUpdateDD - Lock failed\n");
+        return;
     }
 
-  /* Has our memory pointer changed? */
-  if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)
-    {
-      ErrorF ("winShadowUpdateDD - Memory location of the shadow "
-	      "surface has changed, trying to update the root window "
-	      "pixmap header to point to the new address.  If you get "
-	      "this message and "PROJECT_NAME" freezes or crashes "
-	      "after this message then send a problem report and your "
-	      "%s file to " BUILDERADDR "\n", g_pszLogFile);
-
-      /* Location of shadow framebuffer has changed */
-      winUpdateFBPointer(pScreen, pScreenPriv->pddsdShadow->lpSurface);
+    /* Has our memory pointer changed? */
+    if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface) {
+        ErrorF("winShadowUpdateDD - Memory location of the shadow "
+               "surface has changed, trying to update the root window "
+               "pixmap header to point to the new address.  If you get "
+               "this message and " PROJECT_NAME " freezes or crashes "
+               "after this message then send a problem report and your "
+               "%s file to " BUILDERADDR "\n", g_pszLogFile);
+
+        /* Location of shadow framebuffer has changed */
+        winUpdateFBPointer(pScreen, pScreenPriv->pddsdShadow->lpSurface);
     }
 }
 
 static Bool
-winInitScreenShadowDD (ScreenPtr pScreen)
+winInitScreenShadowDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
+    winScreenPriv(pScreen);
 
-  /* Get a device context for the screen  */
-  pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen);
+    /* Get a device context for the screen  */
+    pScreenPriv->hdcScreen = GetDC(pScreenPriv->hwndScreen);
 
-  return winAllocateFBShadowDD(pScreen);
+    return winAllocateFBShadowDD(pScreen);
 }
 
 /*
@@ -712,66 +648,63 @@ winInitScreenShadowDD (ScreenPtr pScreen)
  */
 
 static Bool
-winCloseScreenShadowDD (int nIndex, ScreenPtr pScreen)
+winCloseScreenShadowDD(int nIndex, ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  Bool			fReturn;
-  
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    Bool fReturn;
+
 #if CYGDEBUG
-  winDebug ("winCloseScreenShadowDD - Freeing screen resources\n");
+    winDebug("winCloseScreenShadowDD - Freeing screen resources\n");
 #endif
 
-  /* Flag that the screen is closed */
-  pScreenPriv->fClosed = TRUE;
-  pScreenPriv->fActive = FALSE;
+    /* Flag that the screen is closed */
+    pScreenPriv->fClosed = TRUE;
+    pScreenPriv->fActive = FALSE;
 
-  /* Call the wrapped CloseScreen procedure */
-  WIN_UNWRAP(CloseScreen);
-  if (pScreen->CloseScreen)
-    fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+    /* Call the wrapped CloseScreen procedure */
+    WIN_UNWRAP(CloseScreen);
+    if (pScreen->CloseScreen)
+        fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
 
-  winFreeFBShadowDD(pScreen);
+    winFreeFBShadowDD(pScreen);
 
-  /* Free the screen DC */
-  ReleaseDC (pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);
+    /* Free the screen DC */
+    ReleaseDC(pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);
 
-  /* Delete the window property */
-  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);
+    /* Delete the window property */
+    RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);
 
-  /* Delete tray icon, if we have one */
-  if (!pScreenInfo->fNoTrayIcon)
-    winDeleteNotifyIcon (pScreenPriv);
+    /* Delete tray icon, if we have one */
+    if (!pScreenInfo->fNoTrayIcon)
+        winDeleteNotifyIcon(pScreenPriv);
 
-  /* Free the exit confirmation dialog box, if it exists */
-  if (g_hDlgExit != NULL)
-    {
-      DestroyWindow (g_hDlgExit);
-      g_hDlgExit = NULL;
+    /* Free the exit confirmation dialog box, if it exists */
+    if (g_hDlgExit != NULL) {
+        DestroyWindow(g_hDlgExit);
+        g_hDlgExit = NULL;
     }
 
-  /* Kill our window */
-  if (pScreenPriv->hwndScreen)
-    {
-      DestroyWindow (pScreenPriv->hwndScreen);
-      pScreenPriv->hwndScreen = NULL;
+    /* Kill our window */
+    if (pScreenPriv->hwndScreen) {
+        DestroyWindow(pScreenPriv->hwndScreen);
+        pScreenPriv->hwndScreen = NULL;
     }
 
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
-  /* Destroy the thread startup mutex */
-  pthread_mutex_destroy (&pScreenPriv->pmServerStarted);
+    /* Destroy the thread startup mutex */
+    pthread_mutex_destroy(&pScreenPriv->pmServerStarted);
 #endif
 
-  /* Kill our screeninfo's pointer to the screen */
-  pScreenInfo->pScreen = NULL;
+    /* Kill our screeninfo's pointer to the screen */
+    pScreenInfo->pScreen = NULL;
 
-  /* Free the screen privates for this screen */
-  free ((pointer) pScreenPriv);
+    /* Free the screen privates for this screen */
+    free((pointer) pScreenPriv);
 
-  return fReturn;
+    return fReturn;
 }
 
-
 /*
  * Tell mi what sort of visuals we need.
  * 
@@ -781,587 +714,532 @@ winCloseScreenShadowDD (int nIndex, ScreenPtr pScreen)
  */
 
 static Bool
-winInitVisualsShadowDD (ScreenPtr pScreen)
+winInitVisualsShadowDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  DWORD			dwRedBits, dwGreenBits, dwBlueBits;
-
-  /* Count the number of ones in each color mask */
-  dwRedBits = winCountBits (pScreenPriv->dwRedMask);
-  dwGreenBits = winCountBits (pScreenPriv->dwGreenMask);
-  dwBlueBits = winCountBits (pScreenPriv->dwBlueMask);
-  
-  /* Store the maximum number of ones in a color mask as the bitsPerRGB */
-  if (dwRedBits == 0 || dwGreenBits == 0 || dwBlueBits == 0)
-    pScreenPriv->dwBitsPerRGB = 8;
-  else if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
-    pScreenPriv->dwBitsPerRGB = dwRedBits;
-  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
-    pScreenPriv->dwBitsPerRGB = dwGreenBits;
-  else
-    pScreenPriv->dwBitsPerRGB = dwBlueBits;
-  
-  ErrorF ("winInitVisualsShadowDD - Masks %08x %08x %08x BPRGB %d d %d "
-	  "bpp %d\n",
-	  (unsigned int) pScreenPriv->dwRedMask,
-	  (unsigned int) pScreenPriv->dwGreenMask,
-	  (unsigned int) pScreenPriv->dwBlueMask,
-	  (int) pScreenPriv->dwBitsPerRGB,
-	  (int) pScreenInfo->dwDepth,
-	  (int) pScreenInfo->dwBPP);
-
-  /* Create a single visual according to the Windows screen depth */
-  switch (pScreenInfo->dwDepth)
-    {
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    DWORD dwRedBits, dwGreenBits, dwBlueBits;
+
+    /* Count the number of ones in each color mask */
+    dwRedBits = winCountBits(pScreenPriv->dwRedMask);
+    dwGreenBits = winCountBits(pScreenPriv->dwGreenMask);
+    dwBlueBits = winCountBits(pScreenPriv->dwBlueMask);
+
+    /* Store the maximum number of ones in a color mask as the bitsPerRGB */
+    if (dwRedBits == 0 || dwGreenBits == 0 || dwBlueBits == 0)
+        pScreenPriv->dwBitsPerRGB = 8;
+    else if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
+        pScreenPriv->dwBitsPerRGB = dwRedBits;
+    else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
+        pScreenPriv->dwBitsPerRGB = dwGreenBits;
+    else
+        pScreenPriv->dwBitsPerRGB = dwBlueBits;
+
+    ErrorF("winInitVisualsShadowDD - Masks %08x %08x %08x BPRGB %d d %d "
+           "bpp %d\n",
+           (unsigned int) pScreenPriv->dwRedMask,
+           (unsigned int) pScreenPriv->dwGreenMask,
+           (unsigned int) pScreenPriv->dwBlueMask,
+           (int) pScreenPriv->dwBitsPerRGB,
+           (int) pScreenInfo->dwDepth, (int) pScreenInfo->dwBPP);
+
+    /* Create a single visual according to the Windows screen depth */
+    switch (pScreenInfo->dwDepth) {
     case 24:
     case 16:
     case 15:
-      /* Create the real visual */
-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
-				     TrueColorMask,
-				     pScreenPriv->dwBitsPerRGB,
-				     TrueColor,
-				     pScreenPriv->dwRedMask,
-				     pScreenPriv->dwGreenMask,
-				     pScreenPriv->dwBlueMask))
-	{
-	  ErrorF ("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
-		  "failed for TrueColor\n");
-	  return FALSE;
-	}
+        /* Create the real visual */
+        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
+                                      TrueColorMask,
+                                      pScreenPriv->dwBitsPerRGB,
+                                      TrueColor,
+                                      pScreenPriv->dwRedMask,
+                                      pScreenPriv->dwGreenMask,
+                                      pScreenPriv->dwBlueMask)) {
+            ErrorF("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
+                   "failed for TrueColor\n");
+            return FALSE;
+        }
 
 #ifdef XWIN_EMULATEPSEUDO
-      if (!pScreenInfo->fEmulatePseudo)
-	break;
-
-      /* Setup a pseudocolor visual */
-      if (!miSetVisualTypesAndMasks (8,
-				     PseudoColorMask,
-				     8,
-				     -1,
-				     0,
-				     0,
-				     0))
-	{
-	  ErrorF ("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
-		  "failed for PseudoColor\n");
-	  return FALSE;
-	}
+        if (!pScreenInfo->fEmulatePseudo)
+            break;
+
+        /* Setup a pseudocolor visual */
+        if (!miSetVisualTypesAndMasks(8, PseudoColorMask, 8, -1, 0, 0, 0)) {
+            ErrorF("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
+                   "failed for PseudoColor\n");
+            return FALSE;
+        }
 #endif
-      break;
+        break;
 
     case 8:
-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
-				     pScreenInfo->fFullScreen 
-				     ? PseudoColorMask : StaticColorMask,
-				     pScreenPriv->dwBitsPerRGB,
-				     pScreenInfo->fFullScreen 
-				     ? PseudoColor : StaticColor,
-				     pScreenPriv->dwRedMask,
-				     pScreenPriv->dwGreenMask,
-				     pScreenPriv->dwBlueMask))
-	{
-	  ErrorF ("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
-		  "failed\n");
-	  return FALSE;
-	}
-      break;
+        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
+                                      pScreenInfo->fFullScreen
+                                      ? PseudoColorMask : StaticColorMask,
+                                      pScreenPriv->dwBitsPerRGB,
+                                      pScreenInfo->fFullScreen
+                                      ? PseudoColor : StaticColor,
+                                      pScreenPriv->dwRedMask,
+                                      pScreenPriv->dwGreenMask,
+                                      pScreenPriv->dwBlueMask)) {
+            ErrorF("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
+                   "failed\n");
+            return FALSE;
+        }
+        break;
 
     default:
-      ErrorF ("winInitVisualsShadowDD - Unknown screen depth\n");
-      return FALSE;
+        ErrorF("winInitVisualsShadowDD - Unknown screen depth\n");
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winInitVisualsShadowDD - Returning\n");
+    winDebug("winInitVisualsShadowDD - Returning\n");
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Adjust the user proposed video mode
  */
 
 static Bool
-winAdjustVideoModeShadowDD (ScreenPtr pScreen)
+winAdjustVideoModeShadowDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  HDC			hdc = NULL;
-  DWORD			dwBPP;
-
-  /* We're in serious trouble if we can't get a DC */
-  hdc = GetDC (NULL);
-  if (hdc == NULL)
-    {
-      ErrorF ("winAdjustVideoModeShadowDD - GetDC () failed\n");
-      return FALSE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HDC hdc = NULL;
+    DWORD dwBPP;
+
+    /* We're in serious trouble if we can't get a DC */
+    hdc = GetDC(NULL);
+    if (hdc == NULL) {
+        ErrorF("winAdjustVideoModeShadowDD - GetDC () failed\n");
+        return FALSE;
     }
 
-  /* Query GDI for current display depth */
-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
+    /* Query GDI for current display depth */
+    dwBPP = GetDeviceCaps(hdc, BITSPIXEL);
 
-  /* DirectDraw can only change the depth in fullscreen mode */
-  if (!(pScreenInfo->fFullScreen &&
-        (pScreenInfo->dwBPP != WIN_DEFAULT_BPP)))
-    {
-      /* Otherwise, We'll use GDI's depth */
-      pScreenInfo->dwBPP = dwBPP;
+    /* DirectDraw can only change the depth in fullscreen mode */
+    if (!(pScreenInfo->fFullScreen && (pScreenInfo->dwBPP != WIN_DEFAULT_BPP))) {
+        /* Otherwise, We'll use GDI's depth */
+        pScreenInfo->dwBPP = dwBPP;
     }
 
-  /* Release our DC */
-  ReleaseDC (NULL, hdc);
-  return TRUE;
+    /* Release our DC */
+    ReleaseDC(NULL, hdc);
+    return TRUE;
 }
 
-
 /*
  * Blt exposed regions to the screen
  */
 
 static Bool
-winBltExposedRegionsShadowDD (ScreenPtr pScreen)
+winBltExposedRegionsShadowDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  RECT			rcSrc, rcDest;
-  POINT			ptOrigin;
-  HDC			hdcUpdate = NULL;
-  PAINTSTRUCT		ps;
-  HRESULT		ddrval = DD_OK;
-  Bool			fReturn = TRUE;
-  Bool			fLocked = TRUE;
-  int			i;
-
-  /* BeginPaint gives us an hdc that clips to the invalidated region */
-  hdcUpdate = BeginPaint (pScreenPriv->hwndScreen, &ps);
-  if (hdcUpdate == NULL)
-    {
-      ErrorF ("winBltExposedRegionsShadowDD - BeginPaint () returned "
-	      "a NULL device context handle.  Aborting blit attempt.\n");
-      return FALSE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    RECT rcSrc, rcDest;
+    POINT ptOrigin;
+    HDC hdcUpdate = NULL;
+    PAINTSTRUCT ps;
+    HRESULT ddrval = DD_OK;
+    Bool fReturn = TRUE;
+    Bool fLocked = TRUE;
+    int i;
+
+    /* BeginPaint gives us an hdc that clips to the invalidated region */
+    hdcUpdate = BeginPaint(pScreenPriv->hwndScreen, &ps);
+    if (hdcUpdate == NULL) {
+        ErrorF("winBltExposedRegionsShadowDD - BeginPaint () returned "
+               "a NULL device context handle.  Aborting blit attempt.\n");
+        return FALSE;
     }
-  
-  /* Unlock the shadow surface, so we can blit */
-  ddrval = IDirectDrawSurface2_Unlock (pScreenPriv->pddsShadow, NULL);
-  if (FAILED (ddrval))
-    {
-      fReturn = FALSE;
-      goto winBltExposedRegionsShadowDD_Exit;
+
+    /* Unlock the shadow surface, so we can blit */
+    ddrval = IDirectDrawSurface2_Unlock(pScreenPriv->pddsShadow, NULL);
+    if (FAILED(ddrval)) {
+        fReturn = FALSE;
+        goto winBltExposedRegionsShadowDD_Exit;
     }
-  else
-    {
-      /* Flag that we have unlocked the shadow surface */
-      fLocked = FALSE;
+    else {
+        /* Flag that we have unlocked the shadow surface */
+        fLocked = FALSE;
     }
 
-  /* Get the origin of the window in the screen coords */
-  ptOrigin.x = pScreenInfo->dwXOffset;
-  ptOrigin.y = pScreenInfo->dwYOffset;
-
-  MapWindowPoints (pScreenPriv->hwndScreen,
-		   HWND_DESKTOP,
-		   (LPPOINT)&ptOrigin, 1);
-  rcDest.left = ptOrigin.x;
-  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
-  rcDest.top = ptOrigin.y;
-  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
-
-  /* Source can be enter shadow surface, as Blt should clip */
-  rcSrc.left = 0;
-  rcSrc.top = 0;
-  rcSrc.right = pScreenInfo->dwWidth;
-  rcSrc.bottom = pScreenInfo->dwHeight;
-
-  /* Try to regain the primary surface and blit again if we've lost it */
-  for (i = 0; i <= WIN_REGAIN_SURFACE_RETRIES; ++i)
-    {
-      /* Our Blt should be clipped to the invalidated region */
-      ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,
-					&rcDest,
-					pScreenPriv->pddsShadow,
-					&rcSrc,
-					DDBLT_WAIT,
-					NULL);
-      if (ddrval == DDERR_SURFACELOST)
-	{
-	  /* Surface was lost */
-	  ErrorF ("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Blt "
-		  "reported that the primary surface was lost, "
-		  "trying to restore, retry: %d\n", i + 1);
-
-	  /* Try to restore the surface, once */
-	  ddrval = IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);
-	  ErrorF ("winBltExposedRegionsShadowDD - "
-		  "IDirectDrawSurface2_Restore returned: ");
-	  if (ddrval == DD_OK)
-	    ErrorF ("DD_OK\n");
-	  else if (ddrval == DDERR_WRONGMODE)
-	    ErrorF ("DDERR_WRONGMODE\n");
-	  else if (ddrval == DDERR_INCOMPATIBLEPRIMARY)
-	    ErrorF ("DDERR_INCOMPATIBLEPRIMARY\n");
-	  else if (ddrval == DDERR_UNSUPPORTED)
-	    ErrorF ("DDERR_UNSUPPORTED\n");
-	  else if (ddrval == DDERR_INVALIDPARAMS)
-	    ErrorF ("DDERR_INVALIDPARAMS\n");
-	  else if (ddrval == DDERR_INVALIDOBJECT)
-	    ErrorF ("DDERR_INVALIDOBJECT\n");
-	  else
-	    ErrorF ("unknown error: %08x\n", (unsigned int) ddrval);
-
-	  /* Loop around to try the blit one more time */
-	  continue;
-	}
-      else if (FAILED (ddrval))
-	{
-	  fReturn = FALSE;
-	  ErrorF ("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Blt "
-		  "failed, but surface not lost: %08x %d\n",
-		  (unsigned int) ddrval, (int) ddrval);
-	  goto winBltExposedRegionsShadowDD_Exit;
-	}
-      else
-	{
-	  /* Success, stop looping */
-	  break;
-	}
+    /* Get the origin of the window in the screen coords */
+    ptOrigin.x = pScreenInfo->dwXOffset;
+    ptOrigin.y = pScreenInfo->dwYOffset;
+
+    MapWindowPoints(pScreenPriv->hwndScreen,
+                    HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+    rcDest.left = ptOrigin.x;
+    rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
+    rcDest.top = ptOrigin.y;
+    rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
+
+    /* Source can be enter shadow surface, as Blt should clip */
+    rcSrc.left = 0;
+    rcSrc.top = 0;
+    rcSrc.right = pScreenInfo->dwWidth;
+    rcSrc.bottom = pScreenInfo->dwHeight;
+
+    /* Try to regain the primary surface and blit again if we've lost it */
+    for (i = 0; i <= WIN_REGAIN_SURFACE_RETRIES; ++i) {
+        /* Our Blt should be clipped to the invalidated region */
+        ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsPrimary,
+                                         &rcDest,
+                                         pScreenPriv->pddsShadow,
+                                         &rcSrc, DDBLT_WAIT, NULL);
+        if (ddrval == DDERR_SURFACELOST) {
+            /* Surface was lost */
+            ErrorF("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Blt "
+                   "reported that the primary surface was lost, "
+                   "trying to restore, retry: %d\n", i + 1);
+
+            /* Try to restore the surface, once */
+            ddrval = IDirectDrawSurface2_Restore(pScreenPriv->pddsPrimary);
+            ErrorF("winBltExposedRegionsShadowDD - "
+                   "IDirectDrawSurface2_Restore returned: ");
+            if (ddrval == DD_OK)
+                ErrorF("DD_OK\n");
+            else if (ddrval == DDERR_WRONGMODE)
+                ErrorF("DDERR_WRONGMODE\n");
+            else if (ddrval == DDERR_INCOMPATIBLEPRIMARY)
+                ErrorF("DDERR_INCOMPATIBLEPRIMARY\n");
+            else if (ddrval == DDERR_UNSUPPORTED)
+                ErrorF("DDERR_UNSUPPORTED\n");
+            else if (ddrval == DDERR_INVALIDPARAMS)
+                ErrorF("DDERR_INVALIDPARAMS\n");
+            else if (ddrval == DDERR_INVALIDOBJECT)
+                ErrorF("DDERR_INVALIDOBJECT\n");
+            else
+                ErrorF("unknown error: %08x\n", (unsigned int) ddrval);
+
+            /* Loop around to try the blit one more time */
+            continue;
+        }
+        else if (FAILED(ddrval)) {
+            fReturn = FALSE;
+            ErrorF("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Blt "
+                   "failed, but surface not lost: %08x %d\n",
+                   (unsigned int) ddrval, (int) ddrval);
+            goto winBltExposedRegionsShadowDD_Exit;
+        }
+        else {
+            /* Success, stop looping */
+            break;
+        }
     }
 
-  /* Relock the shadow surface */
-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,
-				     NULL,
-				     pScreenPriv->pddsdShadow,
-				     DDLOCK_WAIT,
-				     NULL);
-  if (FAILED (ddrval))
-    {
-      fReturn = FALSE;
-      ErrorF ("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Lock "
-	      "failed\n");
-      goto winBltExposedRegionsShadowDD_Exit;
+    /* Relock the shadow surface */
+    ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsShadow,
+                                      NULL,
+                                      pScreenPriv->pddsdShadow,
+                                      DDLOCK_WAIT, NULL);
+    if (FAILED(ddrval)) {
+        fReturn = FALSE;
+        ErrorF("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Lock "
+               "failed\n");
+        goto winBltExposedRegionsShadowDD_Exit;
     }
-  else
-    {
-      /* Indicate that we have relocked the shadow surface */
-      fLocked = TRUE;
+    else {
+        /* Indicate that we have relocked the shadow surface */
+        fLocked = TRUE;
     }
 
-  /* Has our memory pointer changed? */
-  if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)
-    winUpdateFBPointer (pScreen,
-			pScreenPriv->pddsdShadow->lpSurface);
+    /* Has our memory pointer changed? */
+    if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)
+        winUpdateFBPointer(pScreen, pScreenPriv->pddsdShadow->lpSurface);
 
  winBltExposedRegionsShadowDD_Exit:
-  /* EndPaint frees the DC */
-  if (hdcUpdate != NULL)
-    EndPaint (pScreenPriv->hwndScreen, &ps);
-
-  /*
-   * Relock the surface if it is not locked.  We don't care if locking fails,
-   * as it will cause the server to shutdown within a few more operations.
-   */
-  if (!fLocked)
-    {
-      IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,
-				NULL,
-				pScreenPriv->pddsdShadow,
-				DDLOCK_WAIT,
-				NULL);
-
-      /* Has our memory pointer changed? */
-      if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)
-	winUpdateFBPointer (pScreen,
-			    pScreenPriv->pddsdShadow->lpSurface);
-      
-      fLocked = TRUE;
+    /* EndPaint frees the DC */
+    if (hdcUpdate != NULL)
+        EndPaint(pScreenPriv->hwndScreen, &ps);
+
+    /*
+     * Relock the surface if it is not locked.  We don't care if locking fails,
+     * as it will cause the server to shutdown within a few more operations.
+     */
+    if (!fLocked) {
+        IDirectDrawSurface2_Lock(pScreenPriv->pddsShadow,
+                                 NULL,
+                                 pScreenPriv->pddsdShadow, DDLOCK_WAIT, NULL);
+
+        /* Has our memory pointer changed? */
+        if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)
+            winUpdateFBPointer(pScreen, pScreenPriv->pddsdShadow->lpSurface);
+
+        fLocked = TRUE;
     }
-  return fReturn;
+    return fReturn;
 }
 
-
 /*
  * Do any engine-specific appliation-activation processing
  */
 
 static Bool
-winActivateAppShadowDD (ScreenPtr pScreen)
+winActivateAppShadowDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-
-  /*
-   * Do we have a surface?
-   * Are we active?
-   * Are we fullscreen?
-   */
-  if (pScreenPriv != NULL
-      && pScreenPriv->pddsPrimary != NULL
-      && pScreenPriv->fActive)
-    {
-      /* Primary surface was lost, restore it */
-      IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);
+    winScreenPriv(pScreen);
+
+    /*
+     * Do we have a surface?
+     * Are we active?
+     * Are we fullscreen?
+     */
+    if (pScreenPriv != NULL
+        && pScreenPriv->pddsPrimary != NULL && pScreenPriv->fActive) {
+        /* Primary surface was lost, restore it */
+        IDirectDrawSurface2_Restore(pScreenPriv->pddsPrimary);
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Reblit the shadow framebuffer to the screen.
  */
 
 static Bool
-winRedrawScreenShadowDD (ScreenPtr pScreen)
+winRedrawScreenShadowDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  HRESULT		ddrval = DD_OK;
-  RECT			rcSrc, rcDest;
-  POINT			ptOrigin;
-
-  /* Get the origin of the window in the screen coords */
-  ptOrigin.x = pScreenInfo->dwXOffset;
-  ptOrigin.y = pScreenInfo->dwYOffset;
-  MapWindowPoints (pScreenPriv->hwndScreen,
-		   HWND_DESKTOP,
-		   (LPPOINT)&ptOrigin, 1);
-  rcDest.left = ptOrigin.x;
-  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
-  rcDest.top = ptOrigin.y;
-  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
-
-  /* Source can be entire shadow surface, as Blt should clip for us */
-  rcSrc.left = 0;
-  rcSrc.top = 0;
-  rcSrc.right = pScreenInfo->dwWidth;
-  rcSrc.bottom = pScreenInfo->dwHeight;
-
-  /* Redraw the whole window, to take account for the new colors */
-  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,
-				    &rcDest,
-				    pScreenPriv->pddsShadow,
-				    &rcSrc,
-				    DDBLT_WAIT,
-				    NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winRedrawScreenShadowDD - IDirectDrawSurface_Blt () "
-	      "failed: %08x\n",
-	      (unsigned int) ddrval);
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HRESULT ddrval = DD_OK;
+    RECT rcSrc, rcDest;
+    POINT ptOrigin;
+
+    /* Get the origin of the window in the screen coords */
+    ptOrigin.x = pScreenInfo->dwXOffset;
+    ptOrigin.y = pScreenInfo->dwYOffset;
+    MapWindowPoints(pScreenPriv->hwndScreen,
+                    HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+    rcDest.left = ptOrigin.x;
+    rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
+    rcDest.top = ptOrigin.y;
+    rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
+
+    /* Source can be entire shadow surface, as Blt should clip for us */
+    rcSrc.left = 0;
+    rcSrc.top = 0;
+    rcSrc.right = pScreenInfo->dwWidth;
+    rcSrc.bottom = pScreenInfo->dwHeight;
+
+    /* Redraw the whole window, to take account for the new colors */
+    ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsPrimary,
+                                     &rcDest,
+                                     pScreenPriv->pddsShadow,
+                                     &rcSrc, DDBLT_WAIT, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winRedrawScreenShadowDD - IDirectDrawSurface_Blt () "
+               "failed: %08x\n", (unsigned int) ddrval);
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Realize the currently installed colormap
  */
 
 static Bool
-winRealizeInstalledPaletteShadowDD (ScreenPtr pScreen)
+winRealizeInstalledPaletteShadowDD(ScreenPtr pScreen)
 {
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Install the specified colormap
  */
 
 static Bool
-winInstallColormapShadowDD (ColormapPtr pColormap)
+winInstallColormapShadowDD(ColormapPtr pColormap)
 {
-  ScreenPtr		pScreen = pColormap->pScreen;
-  winScreenPriv(pScreen);
-  winCmapPriv(pColormap);
-  HRESULT		ddrval = DD_OK;
-
-  /* Install the DirectDraw palette on the primary surface */
-  ddrval = IDirectDrawSurface2_SetPalette (pScreenPriv->pddsPrimary,
-					   pCmapPriv->lpDDPalette);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winInstallColormapShadowDD - Failed installing the "
-	      "DirectDraw palette.\n");
-      return FALSE;
+    ScreenPtr pScreen = pColormap->pScreen;
+
+    winScreenPriv(pScreen);
+    winCmapPriv(pColormap);
+    HRESULT ddrval = DD_OK;
+
+    /* Install the DirectDraw palette on the primary surface */
+    ddrval = IDirectDrawSurface2_SetPalette(pScreenPriv->pddsPrimary,
+                                            pCmapPriv->lpDDPalette);
+    if (FAILED(ddrval)) {
+        ErrorF("winInstallColormapShadowDD - Failed installing the "
+               "DirectDraw palette.\n");
+        return FALSE;
     }
 
-  /* Save a pointer to the newly installed colormap */
-  pScreenPriv->pcmapInstalled = pColormap;
+    /* Save a pointer to the newly installed colormap */
+    pScreenPriv->pcmapInstalled = pColormap;
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Store the specified colors in the specified colormap
  */
 
 static Bool
-winStoreColorsShadowDD (ColormapPtr pColormap, 
-			int ndef,
-			xColorItem *pdefs)
+winStoreColorsShadowDD(ColormapPtr pColormap, int ndef, xColorItem * pdefs)
 {
-  ScreenPtr		pScreen = pColormap->pScreen;
-  winScreenPriv(pScreen);
-  winCmapPriv(pColormap);
-  ColormapPtr		curpmap = pScreenPriv->pcmapInstalled;
-  HRESULT		ddrval = DD_OK;
-  
-  /* Put the X colormap entries into the Windows logical palette */
-  ddrval = IDirectDrawPalette_SetEntries (pCmapPriv->lpDDPalette,
-					  0,
-					  pdefs[0].pixel,
-					  ndef,
-					  pCmapPriv->peColors 
-					  + pdefs[0].pixel);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winStoreColorsShadowDD - SetEntries () failed\n");
-      return FALSE;
+    ScreenPtr pScreen = pColormap->pScreen;
+
+    winScreenPriv(pScreen);
+    winCmapPriv(pColormap);
+    ColormapPtr curpmap = pScreenPriv->pcmapInstalled;
+    HRESULT ddrval = DD_OK;
+
+    /* Put the X colormap entries into the Windows logical palette */
+    ddrval = IDirectDrawPalette_SetEntries(pCmapPriv->lpDDPalette,
+                                           0,
+                                           pdefs[0].pixel,
+                                           ndef,
+                                           pCmapPriv->peColors
+                                           + pdefs[0].pixel);
+    if (FAILED(ddrval)) {
+        ErrorF("winStoreColorsShadowDD - SetEntries () failed\n");
+        return FALSE;
     }
 
-  /* Don't install the DirectDraw palette if the colormap is not installed */
-  if (pColormap != curpmap)
-    {
-      return TRUE;
+    /* Don't install the DirectDraw palette if the colormap is not installed */
+    if (pColormap != curpmap) {
+        return TRUE;
     }
 
-  if (!winInstallColormapShadowDD (pColormap))
-    {
-      ErrorF ("winStoreColorsShadowDD - Failed installing colormap\n");
-      return FALSE;
+    if (!winInstallColormapShadowDD(pColormap)) {
+        ErrorF("winStoreColorsShadowDD - Failed installing colormap\n");
+        return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Colormap initialization procedure
  */
 
 static Bool
-winCreateColormapShadowDD (ColormapPtr pColormap)
+winCreateColormapShadowDD(ColormapPtr pColormap)
 {
-  HRESULT		ddrval = DD_OK;
-  ScreenPtr		pScreen = pColormap->pScreen;
-  winScreenPriv(pScreen);
-  winCmapPriv(pColormap);
-  
-  /* Create a DirectDraw palette */
-  ddrval = IDirectDraw2_CreatePalette (pScreenPriv->pdd,
-				       DDPCAPS_8BIT | DDPCAPS_ALLOW256,
-				       pCmapPriv->peColors,
-				       &pCmapPriv->lpDDPalette,
-				       NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winCreateColormapShadowDD - CreatePalette failed\n");
-      return FALSE;
+    HRESULT ddrval = DD_OK;
+    ScreenPtr pScreen = pColormap->pScreen;
+
+    winScreenPriv(pScreen);
+    winCmapPriv(pColormap);
+
+    /* Create a DirectDraw palette */
+    ddrval = IDirectDraw2_CreatePalette(pScreenPriv->pdd,
+                                        DDPCAPS_8BIT | DDPCAPS_ALLOW256,
+                                        pCmapPriv->peColors,
+                                        &pCmapPriv->lpDDPalette, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winCreateColormapShadowDD - CreatePalette failed\n");
+        return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Colormap destruction procedure
  */
 
 static Bool
-winDestroyColormapShadowDD (ColormapPtr pColormap)
+winDestroyColormapShadowDD(ColormapPtr pColormap)
 {
-  winScreenPriv(pColormap->pScreen);
-  winCmapPriv(pColormap);
-  HRESULT		ddrval = DD_OK;
-
-  /*
-   * Is colormap to be destroyed the default?
-   *
-   * Non-default colormaps should have had winUninstallColormap
-   * called on them before we get here.  The default colormap
-   * will not have had winUninstallColormap called on it.  Thus,
-   * we need to handle the default colormap in a special way.
-   */
-  if (pColormap->flags & IsDefault)
-    {
+    winScreenPriv(pColormap->pScreen);
+    winCmapPriv(pColormap);
+    HRESULT ddrval = DD_OK;
+
+    /*
+     * Is colormap to be destroyed the default?
+     *
+     * Non-default colormaps should have had winUninstallColormap
+     * called on them before we get here.  The default colormap
+     * will not have had winUninstallColormap called on it.  Thus,
+     * we need to handle the default colormap in a special way.
+     */
+    if (pColormap->flags & IsDefault) {
 #if CYGDEBUG
-      winDebug ("winDestroyColormapShadowDD - Destroying default "
-	      "colormap\n");
+        winDebug("winDestroyColormapShadowDD - Destroying default "
+                 "colormap\n");
 #endif
-      
-      /*
-       * FIXME: Walk the list of all screens, popping the default
-       * palette out of each screen device context.
-       */
-      
-      /* Pop the palette out of the primary surface */
-      ddrval = IDirectDrawSurface2_SetPalette (pScreenPriv->pddsPrimary,
-					       NULL);
-      if (FAILED (ddrval))
-	{
-	  ErrorF ("winDestroyColormapShadowDD - Failed freeing the "
-		  "default colormap DirectDraw palette.\n");
-	  return FALSE;
-	}
-
-      /* Clear our private installed colormap pointer */
-      pScreenPriv->pcmapInstalled = NULL;
+
+        /*
+         * FIXME: Walk the list of all screens, popping the default
+         * palette out of each screen device context.
+         */
+
+        /* Pop the palette out of the primary surface */
+        ddrval = IDirectDrawSurface2_SetPalette(pScreenPriv->pddsPrimary, NULL);
+        if (FAILED(ddrval)) {
+            ErrorF("winDestroyColormapShadowDD - Failed freeing the "
+                   "default colormap DirectDraw palette.\n");
+            return FALSE;
+        }
+
+        /* Clear our private installed colormap pointer */
+        pScreenPriv->pcmapInstalled = NULL;
     }
-  
-  /* Release the palette */
-  IDirectDrawPalette_Release (pCmapPriv->lpDDPalette);
- 
-  /* Invalidate the colormap privates */
-  pCmapPriv->lpDDPalette = NULL;
-
-  return TRUE;
-}
 
+    /* Release the palette */
+    IDirectDrawPalette_Release(pCmapPriv->lpDDPalette);
+
+    /* Invalidate the colormap privates */
+    pCmapPriv->lpDDPalette = NULL;
+
+    return TRUE;
+}
 
 /*
  * Set engine specific functions
  */
 
 Bool
-winSetEngineFunctionsShadowDD (ScreenPtr pScreen)
+winSetEngineFunctionsShadowDD(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  
-  /* Set our pointers */
-  pScreenPriv->pwinAllocateFB = winAllocateFBShadowDD;
-  pScreenPriv->pwinFreeFB = winFreeFBShadowDD;
-  pScreenPriv->pwinShadowUpdate = winShadowUpdateDD;
-  pScreenPriv->pwinInitScreen = winInitScreenShadowDD;
-  pScreenPriv->pwinCloseScreen = winCloseScreenShadowDD;
-  pScreenPriv->pwinInitVisuals = winInitVisualsShadowDD;
-  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowDD;
-  if (pScreenInfo->fFullScreen)
-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;
-  else
-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
-  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
-  pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowDD;
-  pScreenPriv->pwinActivateApp = winActivateAppShadowDD;
-  pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowDD;
-  pScreenPriv->pwinRealizeInstalledPalette
-    = winRealizeInstalledPaletteShadowDD;
-  pScreenPriv->pwinInstallColormap = winInstallColormapShadowDD;
-  pScreenPriv->pwinStoreColors = winStoreColorsShadowDD;
-  pScreenPriv->pwinCreateColormap = winCreateColormapShadowDD;
-  pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowDD;
-  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;
-  pScreenPriv->pwinCreatePrimarySurface = winCreatePrimarySurfaceShadowDD;
-  pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDD;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /* Set our pointers */
+    pScreenPriv->pwinAllocateFB = winAllocateFBShadowDD;
+    pScreenPriv->pwinFreeFB = winFreeFBShadowDD;
+    pScreenPriv->pwinShadowUpdate = winShadowUpdateDD;
+    pScreenPriv->pwinInitScreen = winInitScreenShadowDD;
+    pScreenPriv->pwinCloseScreen = winCloseScreenShadowDD;
+    pScreenPriv->pwinInitVisuals = winInitVisualsShadowDD;
+    pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowDD;
+    if (pScreenInfo->fFullScreen)
+        pScreenPriv->pwinCreateBoundingWindow =
+            winCreateBoundingWindowFullScreen;
+    else
+        pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
+    pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
+    pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowDD;
+    pScreenPriv->pwinActivateApp = winActivateAppShadowDD;
+    pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowDD;
+    pScreenPriv->pwinRealizeInstalledPalette
+        = winRealizeInstalledPaletteShadowDD;
+    pScreenPriv->pwinInstallColormap = winInstallColormapShadowDD;
+    pScreenPriv->pwinStoreColors = winStoreColorsShadowDD;
+    pScreenPriv->pwinCreateColormap = winCreateColormapShadowDD;
+    pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowDD;
+    pScreenPriv->pwinHotKeyAltTab =
+        (winHotKeyAltTabProcPtr) (void (*)(void)) NoopDDA;
+    pScreenPriv->pwinCreatePrimarySurface = winCreatePrimarySurfaceShadowDD;
+    pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDD;
 #ifdef XWIN_MULTIWINDOW
-  pScreenPriv->pwinFinishCreateWindowsWindow =
-    (winFinishCreateWindowsWindowProcPtr) (void (*)(void))NoopDDA;
+    pScreenPriv->pwinFinishCreateWindowsWindow =
+        (winFinishCreateWindowsWindowProcPtr) (void (*)(void)) NoopDDA;
 #endif
 
-  return TRUE;
+    return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c
index 63d48adb6..6e71dd24c 100644
--- a/xorg-server/hw/xwin/winshadddnl.c
+++ b/xorg-server/hw/xwin/winshadddnl.c
@@ -36,7 +36,6 @@
 #endif
 #include "win.h"
 
-
 /*
  * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,
  * so we have to redefine it here.
@@ -44,71 +43,67 @@
 #ifdef DEFINE_GUID
 #undef DEFINE_GUID
 #define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-#endif /* DEFINE_GUID */
+#endif                          /* DEFINE_GUID */
 
 /*
  * FIXME: Headers are broken, IID_IDirectDraw4 has to be defined
  * here manually.  Should be handled by ddraw.h
  */
 #ifndef IID_IDirectDraw4
-DEFINE_GUID( IID_IDirectDraw4, 0x9c59509a,0x39bd,0x11d1,0x8c,0x4a,0x00,0xc0,0x4f,0xd9,0x30,0xc5 );
-#endif /* IID_IDirectDraw4 */
+DEFINE_GUID(IID_IDirectDraw4, 0x9c59509a, 0x39bd, 0x11d1, 0x8c, 0x4a, 0x00,
+            0xc0, 0x4f, 0xd9, 0x30, 0xc5);
+#endif                          /* IID_IDirectDraw4 */
 
 #define FAIL_MSG_MAX_BLT	10
 
-
 /*
  * Local prototypes
  */
 
 static Bool
-winAllocateFBShadowDDNL (ScreenPtr pScreen);
+ winAllocateFBShadowDDNL(ScreenPtr pScreen);
 
 static void
-winShadowUpdateDDNL (ScreenPtr pScreen, 
-		     shadowBufPtr pBuf);
+ winShadowUpdateDDNL(ScreenPtr pScreen, shadowBufPtr pBuf);
 
 static Bool
-winCloseScreenShadowDDNL (int nIndex, ScreenPtr pScreen);
+ winCloseScreenShadowDDNL(int nIndex, ScreenPtr pScreen);
 
 static Bool
-winInitVisualsShadowDDNL (ScreenPtr pScreen);
+ winInitVisualsShadowDDNL(ScreenPtr pScreen);
 
 static Bool
-winAdjustVideoModeShadowDDNL (ScreenPtr pScreen);
+ winAdjustVideoModeShadowDDNL(ScreenPtr pScreen);
 
 static Bool
-winBltExposedRegionsShadowDDNL (ScreenPtr pScreen);
+ winBltExposedRegionsShadowDDNL(ScreenPtr pScreen);
 
 static Bool
-winActivateAppShadowDDNL (ScreenPtr pScreen);
+ winActivateAppShadowDDNL(ScreenPtr pScreen);
 
 static Bool
-winRedrawScreenShadowDDNL (ScreenPtr pScreen);
+ winRedrawScreenShadowDDNL(ScreenPtr pScreen);
 
 static Bool
-winRealizeInstalledPaletteShadowDDNL (ScreenPtr pScreen);
+ winRealizeInstalledPaletteShadowDDNL(ScreenPtr pScreen);
 
 static Bool
-winInstallColormapShadowDDNL (ColormapPtr pColormap);
+ winInstallColormapShadowDDNL(ColormapPtr pColormap);
 
 static Bool
-winStoreColorsShadowDDNL (ColormapPtr pmap, 
-			  int ndef,
-			  xColorItem *pdefs);
+ winStoreColorsShadowDDNL(ColormapPtr pmap, int ndef, xColorItem * pdefs);
 
 static Bool
-winCreateColormapShadowDDNL (ColormapPtr pColormap);
+ winCreateColormapShadowDDNL(ColormapPtr pColormap);
 
 static Bool
-winDestroyColormapShadowDDNL (ColormapPtr pColormap);
+ winDestroyColormapShadowDDNL(ColormapPtr pColormap);
 
 static Bool
-winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen);
+ winCreatePrimarySurfaceShadowDDNL(ScreenPtr pScreen);
 
 static Bool
-winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen);
-
+ winReleasePrimarySurfaceShadowDDNL(ScreenPtr pScreen);
 
 /*
  * Create the primary surface and attach the clipper.
@@ -117,102 +112,92 @@ winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen);
  */
 
 static Bool
-winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen)
+winCreatePrimarySurfaceShadowDDNL(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  HRESULT		ddrval = DD_OK;
-  DDSURFACEDESC2	ddsd;
-
-  winDebug ("winCreatePrimarySurfaceShadowDDNL - Creating primary surface\n");
-
-  /* Describe the primary surface */
-  ZeroMemory (&ddsd, sizeof (ddsd));
-  ddsd.dwSize = sizeof (ddsd);
-  ddsd.dwFlags = DDSD_CAPS;
-  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-  
-  /* Create the primary surface */
-  ddrval = IDirectDraw4_CreateSurface (pScreenPriv->pdd4,
-				       &ddsd,
-				       &pScreenPriv->pddsPrimary4,
-				       NULL);
-  pScreenPriv->fRetryCreateSurface = FALSE;
-  if (FAILED (ddrval))
-    {
-      if (ddrval == DDERR_NOEXCLUSIVEMODE)
-        {
-          /* Recreating the surface failed. Mark screen to retry later */ 
-          pScreenPriv->fRetryCreateSurface = TRUE;
-          winDebug ("winCreatePrimarySurfaceShadowDDNL - Could not create "
-	          "primary surface: DDERR_NOEXCLUSIVEMODE\n");
+    winScreenPriv(pScreen);
+    HRESULT ddrval = DD_OK;
+    DDSURFACEDESC2 ddsd;
+
+    winDebug("winCreatePrimarySurfaceShadowDDNL - Creating primary surface\n");
+
+    /* Describe the primary surface */
+    ZeroMemory(&ddsd, sizeof(ddsd));
+    ddsd.dwSize = sizeof(ddsd);
+    ddsd.dwFlags = DDSD_CAPS;
+    ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
+
+    /* Create the primary surface */
+    ddrval = IDirectDraw4_CreateSurface(pScreenPriv->pdd4,
+                                        &ddsd,
+                                        &pScreenPriv->pddsPrimary4, NULL);
+    pScreenPriv->fRetryCreateSurface = FALSE;
+    if (FAILED(ddrval)) {
+        if (ddrval == DDERR_NOEXCLUSIVEMODE) {
+            /* Recreating the surface failed. Mark screen to retry later */
+            pScreenPriv->fRetryCreateSurface = TRUE;
+            winDebug("winCreatePrimarySurfaceShadowDDNL - Could not create "
+                     "primary surface: DDERR_NOEXCLUSIVEMODE\n");
         }
-      else
-        {
-          ErrorF ("winCreatePrimarySurfaceShadowDDNL - Could not create "
-	          "primary surface: %08x\n", (unsigned int) ddrval);
+        else {
+            ErrorF("winCreatePrimarySurfaceShadowDDNL - Could not create "
+                   "primary surface: %08x\n", (unsigned int) ddrval);
         }
-      return FALSE;
+        return FALSE;
     }
-  
+
 #if 1
-  winDebug ("winCreatePrimarySurfaceShadowDDNL - Created primary surface\n");
+    winDebug("winCreatePrimarySurfaceShadowDDNL - Created primary surface\n");
 #endif
 
-  /* Attach our clipper to our primary surface handle */
-  ddrval = IDirectDrawSurface4_SetClipper (pScreenPriv->pddsPrimary4,
-					   pScreenPriv->pddcPrimary);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winCreatePrimarySurfaceShadowDDNL - Primary attach clipper "
-	      "failed: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    /* Attach our clipper to our primary surface handle */
+    ddrval = IDirectDrawSurface4_SetClipper(pScreenPriv->pddsPrimary4,
+                                            pScreenPriv->pddcPrimary);
+    if (FAILED(ddrval)) {
+        ErrorF("winCreatePrimarySurfaceShadowDDNL - Primary attach clipper "
+               "failed: %08x\n", (unsigned int) ddrval);
+        return FALSE;
     }
 
 #if 1
-  winDebug ("winCreatePrimarySurfaceShadowDDNL - Attached clipper to primary "
-	  "surface\n");
+    winDebug("winCreatePrimarySurfaceShadowDDNL - Attached clipper to primary "
+             "surface\n");
 #endif
 
-  /* Everything was correct */
-  return TRUE;
+    /* Everything was correct */
+    return TRUE;
 }
 
-
 /*
  * Detach the clipper and release the primary surface.
  * Called from WM_DISPLAYCHANGE.
  */
 
 static Bool
-winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen)
+winReleasePrimarySurfaceShadowDDNL(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-
-  winDebug ("winReleasePrimarySurfaceShadowDDNL - Hello\n");
-
-  /* Release the primary surface and clipper, if they exist */
-  if (pScreenPriv->pddsPrimary4)
-    {
-      /*
-       * Detach the clipper from the primary surface.
-       * NOTE: We do this explicity for clarity.  The Clipper is not released.
-       */
-      IDirectDrawSurface4_SetClipper (pScreenPriv->pddsPrimary4,
-				      NULL);
-  
-      winDebug ("winReleasePrimarySurfaceShadowDDNL - Detached clipper\n");
-
-      /* Release the primary surface */
-      IDirectDrawSurface4_Release (pScreenPriv->pddsPrimary4);
-      pScreenPriv->pddsPrimary4 = NULL;
+    winScreenPriv(pScreen);
+
+    winDebug("winReleasePrimarySurfaceShadowDDNL - Hello\n");
+
+    /* Release the primary surface and clipper, if they exist */
+    if (pScreenPriv->pddsPrimary4) {
+        /*
+         * Detach the clipper from the primary surface.
+         * NOTE: We do this explicity for clarity.  The Clipper is not released.
+         */
+        IDirectDrawSurface4_SetClipper(pScreenPriv->pddsPrimary4, NULL);
+
+        winDebug("winReleasePrimarySurfaceShadowDDNL - Detached clipper\n");
+
+        /* Release the primary surface */
+        IDirectDrawSurface4_Release(pScreenPriv->pddsPrimary4);
+        pScreenPriv->pddsPrimary4 = NULL;
     }
 
-  winDebug ("winReleasePrimarySurfaceShadowDDNL - Released primary surface\n");
-  
-  return TRUE;
-}
+    winDebug("winReleasePrimarySurfaceShadowDDNL - Released primary surface\n");
 
+    return TRUE;
+}
 
 /*
  * Create a DirectDraw surface for the shadow framebuffer; also create
@@ -223,356 +208,322 @@ winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen)
  */
 
 Bool
-winAllocateFBShadowDDNL (ScreenPtr pScreen)
+winAllocateFBShadowDDNL(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;  
-  HRESULT		ddrval = DD_OK;
-  DDSURFACEDESC2	ddsdShadow;
-  char			*lpSurface = NULL;
-  DDPIXELFORMAT		ddpfPrimary;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HRESULT ddrval = DD_OK;
+    DDSURFACEDESC2 ddsdShadow;
+    char *lpSurface = NULL;
+    DDPIXELFORMAT ddpfPrimary;
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDDNL - w %d h %d d %d\n",
-	  pScreenInfo->dwWidth, pScreenInfo->dwHeight, pScreenInfo->dwDepth);
+    winDebug("winAllocateFBShadowDDNL - w %d h %d d %d\n",
+             pScreenInfo->dwWidth, pScreenInfo->dwHeight, pScreenInfo->dwDepth);
 #endif
 
-  /* Set the padded screen width */
-  pScreenInfo->dwPaddedWidth = PixmapBytePad (pScreenInfo->dwWidth,
-					      pScreenInfo->dwBPP);
+    /* Set the padded screen width */
+    pScreenInfo->dwPaddedWidth = PixmapBytePad(pScreenInfo->dwWidth,
+                                               pScreenInfo->dwBPP);
 
-  /* Allocate memory for our shadow surface */
-  lpSurface = malloc (pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);
-  if (lpSurface == NULL)
-    {
-      ErrorF ("winAllocateFBShadowDDNL - Could not allocate bits\n");
-      return FALSE;
+    /* Allocate memory for our shadow surface */
+    lpSurface = malloc(pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);
+    if (lpSurface == NULL) {
+        ErrorF("winAllocateFBShadowDDNL - Could not allocate bits\n");
+        return FALSE;
     }
 
-  /*
-   * Initialize the framebuffer memory so we don't get a 
-   * strange display at startup
-   */
-  ZeroMemory (lpSurface, pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);
-  
-  /* Create a clipper */
-  ddrval = (*g_fpDirectDrawCreateClipper) (0,
-					   &pScreenPriv->pddcPrimary,
-					   NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDDNL - Could not attach clipper: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    /*
+     * Initialize the framebuffer memory so we don't get a 
+     * strange display at startup
+     */
+    ZeroMemory(lpSurface, pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);
+
+    /* Create a clipper */
+    ddrval = (*g_fpDirectDrawCreateClipper) (0,
+                                             &pScreenPriv->pddcPrimary, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDDNL - Could not attach clipper: %08x\n",
+               (unsigned int) ddrval);
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDDNL - Created a clipper\n");
+    winDebug("winAllocateFBShadowDDNL - Created a clipper\n");
 #endif
 
-  /* Attach the clipper to our display window */
-  ddrval = IDirectDrawClipper_SetHWnd (pScreenPriv->pddcPrimary,
-				       0,
-				       pScreenPriv->hwndScreen);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDDNL - Clipper not attached "
-	      "to window: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    /* Attach the clipper to our display window */
+    ddrval = IDirectDrawClipper_SetHWnd(pScreenPriv->pddcPrimary,
+                                        0, pScreenPriv->hwndScreen);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDDNL - Clipper not attached "
+               "to window: %08x\n", (unsigned int) ddrval);
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDDNL - Attached clipper to window\n");
+    winDebug("winAllocateFBShadowDDNL - Attached clipper to window\n");
 #endif
 
-  /* Create a DirectDraw object, store the address at lpdd */
-  ddrval = (*g_fpDirectDrawCreate) (NULL,
-				    (LPDIRECTDRAW*) &pScreenPriv->pdd,
-				    NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDDNL - Could not start "
-	      "DirectDraw: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    /* Create a DirectDraw object, store the address at lpdd */
+    ddrval = (*g_fpDirectDrawCreate) (NULL,
+                                      (LPDIRECTDRAW *) & pScreenPriv->pdd,
+                                      NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDDNL - Could not start "
+               "DirectDraw: %08x\n", (unsigned int) ddrval);
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDDNL - Created and initialized DD\n");
+    winDebug("winAllocateFBShadowDDNL - Created and initialized DD\n");
 #endif
 
-  /* Get a DirectDraw4 interface pointer */
-  ddrval = IDirectDraw_QueryInterface (pScreenPriv->pdd,
-				       &IID_IDirectDraw4,
-				       (LPVOID*) &pScreenPriv->pdd4);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDDNL - Failed DD4 query: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    /* Get a DirectDraw4 interface pointer */
+    ddrval = IDirectDraw_QueryInterface(pScreenPriv->pdd,
+                                        &IID_IDirectDraw4,
+                                        (LPVOID *) & pScreenPriv->pdd4);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDDNL - Failed DD4 query: %08x\n",
+               (unsigned int) ddrval);
+        return FALSE;
     }
 
-  /* Are we full screen? */
-  if (pScreenInfo->fFullScreen)
-    {
-      DDSURFACEDESC2	ddsdCurrent;
-      DWORD		dwRefreshRateCurrent = 0;
-      HDC		hdc = NULL;
-
-      /* Set the cooperative level to full screen */
-      ddrval = IDirectDraw4_SetCooperativeLevel (pScreenPriv->pdd4,
-						 pScreenPriv->hwndScreen,
-						 DDSCL_EXCLUSIVE
-						 | DDSCL_FULLSCREEN);
-      if (FAILED (ddrval))
-	{
-	  ErrorF ("winAllocateFBShadowDDNL - Could not set "
-		  "cooperative level: %08x\n",
-		  (unsigned int) ddrval);
-	  return FALSE;
-	}
-
-      /*
-       * We only need to get the current refresh rate for comparison
-       * if a refresh rate has been passed on the command line.
-       */
-      if (pScreenInfo->dwRefreshRate != 0)
-	{
-	  ZeroMemory (&ddsdCurrent, sizeof (ddsdCurrent));
-	  ddsdCurrent.dwSize = sizeof (ddsdCurrent);
-
-	  /* Get information about current display settings */
-	  ddrval = IDirectDraw4_GetDisplayMode (pScreenPriv->pdd4,
-						&ddsdCurrent);
-	  if (FAILED (ddrval))
-	    {
-	      ErrorF ("winAllocateFBShadowDDNL - Could not get current "
-		      "refresh rate: %08x.  Continuing.\n",
-		      (unsigned int) ddrval);
-	      dwRefreshRateCurrent = 0;
-	    }
-	  else
-	    {
-	      /* Grab the current refresh rate */
-	      dwRefreshRateCurrent = ddsdCurrent.u2.dwRefreshRate;
-	    }
-	}
-
-      /* Clean up the refresh rate */
-      if (dwRefreshRateCurrent == pScreenInfo->dwRefreshRate)
-	{
-	  /*
-	   * Refresh rate is non-specified or equal to current.
-	   */
-	  pScreenInfo->dwRefreshRate = 0;
-	}
-
-      /* Grab a device context for the screen */
-      hdc = GetDC (NULL);
-      if (hdc == NULL)
-	{
-	  ErrorF ("winAllocateFBShadowDDNL - GetDC () failed\n");
-	  return FALSE;
-	}
-
-      /* Only change the video mode when different than current mode */
-      if (!pScreenInfo->fMultipleMonitors
-	  && (pScreenInfo->dwWidth != GetSystemMetrics (SM_CXSCREEN)
-	      || pScreenInfo->dwHeight != GetSystemMetrics (SM_CYSCREEN)
-	      || pScreenInfo->dwBPP != GetDeviceCaps (hdc, BITSPIXEL)
-	      || pScreenInfo->dwRefreshRate != 0))
-	{
-	  winDebug ("winAllocateFBShadowDDNL - Changing video mode\n");
-
-	  /* Change the video mode to the mode requested, and use the driver default refresh rate on failure */
-	  ddrval = IDirectDraw4_SetDisplayMode (pScreenPriv->pdd4,
-						pScreenInfo->dwWidth,
-						pScreenInfo->dwHeight,
-						pScreenInfo->dwBPP,
-						pScreenInfo->dwRefreshRate,
-						0);	       
-	  if (FAILED (ddrval))
-	    {
-	      ErrorF ("winAllocateFBShadowDDNL - Could not set "
-		      "full screen display mode: %08x\n",
-		      (unsigned int) ddrval);
-	      ErrorF ("winAllocateFBShadowDDNL - Using default driver refresh rate\n");
-	      ddrval = IDirectDraw4_SetDisplayMode (pScreenPriv->pdd4,
-						    pScreenInfo->dwWidth,
-						    pScreenInfo->dwHeight,
-						    pScreenInfo->dwBPP,
-						    0,
-						    0);
-	      if (FAILED(ddrval))
-		{
-			ErrorF ("winAllocateFBShadowDDNL - Could not set default refresh rate "
-				"full screen display mode: %08x\n",
-				(unsigned int) ddrval);
-			return FALSE;
-		}
-	    }
-	}
-      else
-	{
-	  winDebug ("winAllocateFBShadowDDNL - Not changing video mode\n");
-	}
-
-      /* Release our DC */
-      ReleaseDC (NULL, hdc);
-      hdc = NULL;
+    /* Are we full screen? */
+    if (pScreenInfo->fFullScreen) {
+        DDSURFACEDESC2 ddsdCurrent;
+        DWORD dwRefreshRateCurrent = 0;
+        HDC hdc = NULL;
+
+        /* Set the cooperative level to full screen */
+        ddrval = IDirectDraw4_SetCooperativeLevel(pScreenPriv->pdd4,
+                                                  pScreenPriv->hwndScreen,
+                                                  DDSCL_EXCLUSIVE
+                                                  | DDSCL_FULLSCREEN);
+        if (FAILED(ddrval)) {
+            ErrorF("winAllocateFBShadowDDNL - Could not set "
+                   "cooperative level: %08x\n", (unsigned int) ddrval);
+            return FALSE;
+        }
+
+        /*
+         * We only need to get the current refresh rate for comparison
+         * if a refresh rate has been passed on the command line.
+         */
+        if (pScreenInfo->dwRefreshRate != 0) {
+            ZeroMemory(&ddsdCurrent, sizeof(ddsdCurrent));
+            ddsdCurrent.dwSize = sizeof(ddsdCurrent);
+
+            /* Get information about current display settings */
+            ddrval = IDirectDraw4_GetDisplayMode(pScreenPriv->pdd4,
+                                                 &ddsdCurrent);
+            if (FAILED(ddrval)) {
+                ErrorF("winAllocateFBShadowDDNL - Could not get current "
+                       "refresh rate: %08x.  Continuing.\n",
+                       (unsigned int) ddrval);
+                dwRefreshRateCurrent = 0;
+            }
+            else {
+                /* Grab the current refresh rate */
+                dwRefreshRateCurrent = ddsdCurrent.u2.dwRefreshRate;
+            }
+        }
+
+        /* Clean up the refresh rate */
+        if (dwRefreshRateCurrent == pScreenInfo->dwRefreshRate) {
+            /*
+             * Refresh rate is non-specified or equal to current.
+             */
+            pScreenInfo->dwRefreshRate = 0;
+        }
+
+        /* Grab a device context for the screen */
+        hdc = GetDC(NULL);
+        if (hdc == NULL) {
+            ErrorF("winAllocateFBShadowDDNL - GetDC () failed\n");
+            return FALSE;
+        }
+
+        /* Only change the video mode when different than current mode */
+        if (!pScreenInfo->fMultipleMonitors
+            && (pScreenInfo->dwWidth != GetSystemMetrics(SM_CXSCREEN)
+                || pScreenInfo->dwHeight != GetSystemMetrics(SM_CYSCREEN)
+                || pScreenInfo->dwBPP != GetDeviceCaps(hdc, BITSPIXEL)
+                || pScreenInfo->dwRefreshRate != 0)) {
+            winDebug("winAllocateFBShadowDDNL - Changing video mode\n");
+
+            /* Change the video mode to the mode requested, and use the driver default refresh rate on failure */
+            ddrval = IDirectDraw4_SetDisplayMode(pScreenPriv->pdd4,
+                                                 pScreenInfo->dwWidth,
+                                                 pScreenInfo->dwHeight,
+                                                 pScreenInfo->dwBPP,
+                                                 pScreenInfo->dwRefreshRate, 0);
+            if (FAILED(ddrval)) {
+                ErrorF("winAllocateFBShadowDDNL - Could not set "
+                       "full screen display mode: %08x\n",
+                       (unsigned int) ddrval);
+                ErrorF
+                    ("winAllocateFBShadowDDNL - Using default driver refresh rate\n");
+                ddrval =
+                    IDirectDraw4_SetDisplayMode(pScreenPriv->pdd4,
+                                                pScreenInfo->dwWidth,
+                                                pScreenInfo->dwHeight,
+                                                pScreenInfo->dwBPP, 0, 0);
+                if (FAILED(ddrval)) {
+                    ErrorF
+                        ("winAllocateFBShadowDDNL - Could not set default refresh rate "
+                         "full screen display mode: %08x\n",
+                         (unsigned int) ddrval);
+                    return FALSE;
+                }
+            }
+        }
+        else {
+            winDebug("winAllocateFBShadowDDNL - Not changing video mode\n");
+        }
+
+        /* Release our DC */
+        ReleaseDC(NULL, hdc);
+        hdc = NULL;
     }
-  else
-    {
-      /* Set the cooperative level for windowed mode */
-      ddrval = IDirectDraw4_SetCooperativeLevel (pScreenPriv->pdd4,
-						 pScreenPriv->hwndScreen,
-						 DDSCL_NORMAL);
-      if (FAILED (ddrval))
-	{
-	  ErrorF ("winAllocateFBShadowDDNL - Could not set "
-		  "cooperative level: %08x\n",
-		  (unsigned int) ddrval);
-	  return FALSE;
-	}
+    else {
+        /* Set the cooperative level for windowed mode */
+        ddrval = IDirectDraw4_SetCooperativeLevel(pScreenPriv->pdd4,
+                                                  pScreenPriv->hwndScreen,
+                                                  DDSCL_NORMAL);
+        if (FAILED(ddrval)) {
+            ErrorF("winAllocateFBShadowDDNL - Could not set "
+                   "cooperative level: %08x\n", (unsigned int) ddrval);
+            return FALSE;
+        }
     }
 
-  /* Create the primary surface */
-  if (!winCreatePrimarySurfaceShadowDDNL (pScreen))
-    {
-      ErrorF ("winAllocateFBShadowDDNL - winCreatePrimarySurfaceShadowDDNL "
-	      "failed\n");
-      return FALSE;
+    /* Create the primary surface */
+    if (!winCreatePrimarySurfaceShadowDDNL(pScreen)) {
+        ErrorF("winAllocateFBShadowDDNL - winCreatePrimarySurfaceShadowDDNL "
+               "failed\n");
+        return FALSE;
     }
 
-  /* Get primary surface's pixel format */
-  ZeroMemory (&ddpfPrimary, sizeof (ddpfPrimary));
-  ddpfPrimary.dwSize = sizeof (ddpfPrimary);
-  ddrval = IDirectDrawSurface4_GetPixelFormat (pScreenPriv->pddsPrimary4,
-					       &ddpfPrimary);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDDNL - Could not get primary "
-	      "pixformat: %08x\n",
-	      (unsigned int) ddrval);
-      return FALSE;
+    /* Get primary surface's pixel format */
+    ZeroMemory(&ddpfPrimary, sizeof(ddpfPrimary));
+    ddpfPrimary.dwSize = sizeof(ddpfPrimary);
+    ddrval = IDirectDrawSurface4_GetPixelFormat(pScreenPriv->pddsPrimary4,
+                                                &ddpfPrimary);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDDNL - Could not get primary "
+               "pixformat: %08x\n", (unsigned int) ddrval);
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDDNL - Primary masks: %08x %08x %08x "
-	  "dwRGBBitCount: %d\n",
-	  ddpfPrimary.u2.dwRBitMask,
-	  ddpfPrimary.u3.dwGBitMask,
-	  ddpfPrimary.u4.dwBBitMask,
-	  ddpfPrimary.u1.dwRGBBitCount);
+    winDebug("winAllocateFBShadowDDNL - Primary masks: %08x %08x %08x "
+             "dwRGBBitCount: %d\n",
+             ddpfPrimary.u2.dwRBitMask,
+             ddpfPrimary.u3.dwGBitMask,
+             ddpfPrimary.u4.dwBBitMask, ddpfPrimary.u1.dwRGBBitCount);
 #endif
 
-  /* Describe the shadow surface to be created */
-  /*
-   * NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,
-   * as drawing, locking, and unlocking take forever
-   * with video memory surfaces.  In addition,
-   * video memory is a somewhat scarce resource,
-   * so you shouldn't be allocating video memory when
-   * you have the option of using system memory instead.
-   */
-  ZeroMemory (&ddsdShadow, sizeof (ddsdShadow));
-  ddsdShadow.dwSize = sizeof (ddsdShadow);
-  ddsdShadow.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH
-    | DDSD_LPSURFACE | DDSD_PITCH | DDSD_PIXELFORMAT;
-  ddsdShadow.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
-  ddsdShadow.dwHeight = pScreenInfo->dwHeight;
-  ddsdShadow.dwWidth = pScreenInfo->dwWidth;
-  ddsdShadow.u1.lPitch = pScreenInfo->dwPaddedWidth;
-  ddsdShadow.lpSurface = lpSurface;
-  ddsdShadow.u4.ddpfPixelFormat = ddpfPrimary;
-  
-  winDebug ("winAllocateFBShadowDDNL - lPitch: %d\n",
-	  (int) pScreenInfo->dwPaddedWidth);
-
-  /* Create the shadow surface */
-  ddrval = IDirectDraw4_CreateSurface (pScreenPriv->pdd4,
-				       &ddsdShadow,
-				       &pScreenPriv->pddsShadow4,
-				       NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winAllocateFBShadowDDNL - Could not create shadow "
-	      "surface: %08x\n", (unsigned int) ddrval);
-      return FALSE;
+    /* Describe the shadow surface to be created */
+    /*
+     * NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,
+     * as drawing, locking, and unlocking take forever
+     * with video memory surfaces.  In addition,
+     * video memory is a somewhat scarce resource,
+     * so you shouldn't be allocating video memory when
+     * you have the option of using system memory instead.
+     */
+    ZeroMemory(&ddsdShadow, sizeof(ddsdShadow));
+    ddsdShadow.dwSize = sizeof(ddsdShadow);
+    ddsdShadow.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH
+        | DDSD_LPSURFACE | DDSD_PITCH | DDSD_PIXELFORMAT;
+    ddsdShadow.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
+    ddsdShadow.dwHeight = pScreenInfo->dwHeight;
+    ddsdShadow.dwWidth = pScreenInfo->dwWidth;
+    ddsdShadow.u1.lPitch = pScreenInfo->dwPaddedWidth;
+    ddsdShadow.lpSurface = lpSurface;
+    ddsdShadow.u4.ddpfPixelFormat = ddpfPrimary;
+
+    winDebug("winAllocateFBShadowDDNL - lPitch: %d\n",
+             (int) pScreenInfo->dwPaddedWidth);
+
+    /* Create the shadow surface */
+    ddrval = IDirectDraw4_CreateSurface(pScreenPriv->pdd4,
+                                        &ddsdShadow,
+                                        &pScreenPriv->pddsShadow4, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winAllocateFBShadowDDNL - Could not create shadow "
+               "surface: %08x\n", (unsigned int) ddrval);
+        return FALSE;
     }
-  
+
 #if CYGDEBUG || YES
-  winDebug ("winAllocateFBShadowDDNL - Created shadow pitch: %d\n",
-	  (int) ddsdShadow.u1.lPitch);
+    winDebug("winAllocateFBShadowDDNL - Created shadow pitch: %d\n",
+             (int) ddsdShadow.u1.lPitch);
 #endif
 
-  /* Grab the pitch from the surface desc */
-  pScreenInfo->dwStride = (ddsdShadow.u1.lPitch * 8)
-    / pScreenInfo->dwBPP;
+    /* Grab the pitch from the surface desc */
+    pScreenInfo->dwStride = (ddsdShadow.u1.lPitch * 8)
+        / pScreenInfo->dwBPP;
 
 #if CYGDEBUG || YES
-  winDebug ("winAllocateFBShadowDDNL - Created shadow stride: %d\n",
-	  (int) pScreenInfo->dwStride);
+    winDebug("winAllocateFBShadowDDNL - Created shadow stride: %d\n",
+             (int) pScreenInfo->dwStride);
 #endif
 
-  /* Save the pointer to our surface memory */
-  pScreenInfo->pfb = lpSurface;
-  
-  /* Grab the masks from the surface description */
-  pScreenPriv->dwRedMask = ddsdShadow.u4.ddpfPixelFormat.u2.dwRBitMask;
-  pScreenPriv->dwGreenMask = ddsdShadow.u4.ddpfPixelFormat.u3.dwGBitMask;
-  pScreenPriv->dwBlueMask = ddsdShadow.u4.ddpfPixelFormat.u4.dwBBitMask;
+    /* Save the pointer to our surface memory */
+    pScreenInfo->pfb = lpSurface;
+
+    /* Grab the masks from the surface description */
+    pScreenPriv->dwRedMask = ddsdShadow.u4.ddpfPixelFormat.u2.dwRBitMask;
+    pScreenPriv->dwGreenMask = ddsdShadow.u4.ddpfPixelFormat.u3.dwGBitMask;
+    pScreenPriv->dwBlueMask = ddsdShadow.u4.ddpfPixelFormat.u4.dwBBitMask;
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowDDNL - Returning\n");
+    winDebug("winAllocateFBShadowDDNL - Returning\n");
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
 static void
 winFreeFBShadowDDNL(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-
-  /* Free the shadow surface, if there is one */
-  if (pScreenPriv->pddsShadow4)
-    {
-      IDirectDrawSurface4_Release (pScreenPriv->pddsShadow4);
-      free (pScreenInfo->pfb);
-      pScreenInfo->pfb = NULL;
-      pScreenPriv->pddsShadow4 = NULL;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /* Free the shadow surface, if there is one */
+    if (pScreenPriv->pddsShadow4) {
+        IDirectDrawSurface4_Release(pScreenPriv->pddsShadow4);
+        free(pScreenInfo->pfb);
+        pScreenInfo->pfb = NULL;
+        pScreenPriv->pddsShadow4 = NULL;
     }
 
-  /* Detach the clipper from the primary surface and release the primary surface, if there is one */
-  winReleasePrimarySurfaceShadowDDNL(pScreen);
+    /* Detach the clipper from the primary surface and release the primary surface, if there is one */
+    winReleasePrimarySurfaceShadowDDNL(pScreen);
 
-  /* Release the clipper object */
-  if (pScreenPriv->pddcPrimary)
-    {
-      IDirectDrawClipper_Release (pScreenPriv->pddcPrimary);
-      pScreenPriv->pddcPrimary = NULL;
+    /* Release the clipper object */
+    if (pScreenPriv->pddcPrimary) {
+        IDirectDrawClipper_Release(pScreenPriv->pddcPrimary);
+        pScreenPriv->pddcPrimary = NULL;
     }
 
-  /* Free the DirectDraw4 object, if there is one */
-  if (pScreenPriv->pdd4)
-    {
-      IDirectDraw4_RestoreDisplayMode (pScreenPriv->pdd4);
-      IDirectDraw4_Release (pScreenPriv->pdd4);
-      pScreenPriv->pdd4 = NULL;
+    /* Free the DirectDraw4 object, if there is one */
+    if (pScreenPriv->pdd4) {
+        IDirectDraw4_RestoreDisplayMode(pScreenPriv->pdd4);
+        IDirectDraw4_Release(pScreenPriv->pdd4);
+        pScreenPriv->pdd4 = NULL;
     }
 
-  /* Free the DirectDraw object, if there is one */
-  if (pScreenPriv->pdd)
-    {
-      IDirectDraw_Release (pScreenPriv->pdd);
-      pScreenPriv->pdd = NULL;
+    /* Free the DirectDraw object, if there is one */
+    if (pScreenPriv->pdd) {
+        IDirectDraw_Release(pScreenPriv->pdd);
+        pScreenPriv->pdd = NULL;
     }
 
-  /* Invalidate the ScreenInfo's fb pointer */
-  pScreenInfo->pfb = NULL;
+    /* Invalidate the ScreenInfo's fb pointer */
+    pScreenInfo->pfb = NULL;
 }
 
 #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
@@ -581,202 +532,184 @@ winFreeFBShadowDDNL(ScreenPtr pScreen)
  */
 
 static
-Bool
-winFinishCreateWindowsWindowDDNL (WindowPtr pWin)
+    Bool
+winFinishCreateWindowsWindowDDNL(WindowPtr pWin)
 {
-  winWindowPriv(pWin);
-  winPrivScreenPtr	pScreenPriv = pWinPriv->pScreenPriv;
-  HRESULT		ddrval = DD_OK;
-  DDSURFACEDESC2	ddsd;
-  int			iWidth, iHeight;
-  int			iX, iY;
-
-  winDebug ("winFinishCreateWindowsWindowDDNL!\n\n");
-
-  iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
-  iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);
-  
-  iWidth = pWin->drawable.width;
-  iHeight = pWin->drawable.height;
-
-  /* Describe the primary surface */
-  ZeroMemory (&ddsd, sizeof (ddsd));
-  ddsd.dwSize = sizeof (ddsd);
-  ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
-  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-  ddsd.dwHeight = iHeight;
-  ddsd.dwWidth = iWidth;
-
-  /* Create the primary surface */
-  ddrval = IDirectDraw4_CreateSurface (pScreenPriv->pdd4,
-				       &ddsd,
-				       &pWinPriv->pddsPrimary4,
-				       NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winFinishCreateWindowsWindowDDNL - Could not create primary "
-	      "surface: %08x\n",
-	      (unsigned int)ddrval);
-      return FALSE;
+    winWindowPriv(pWin);
+    winPrivScreenPtr pScreenPriv = pWinPriv->pScreenPriv;
+    HRESULT ddrval = DD_OK;
+    DDSURFACEDESC2 ddsd;
+    int iWidth, iHeight;
+    int iX, iY;
+
+    winDebug("winFinishCreateWindowsWindowDDNL!\n\n");
+
+    iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN);
+    iY = pWin->drawable.y + GetSystemMetrics(SM_YVIRTUALSCREEN);
+
+    iWidth = pWin->drawable.width;
+    iHeight = pWin->drawable.height;
+
+    /* Describe the primary surface */
+    ZeroMemory(&ddsd, sizeof(ddsd));
+    ddsd.dwSize = sizeof(ddsd);
+    ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
+    ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
+    ddsd.dwHeight = iHeight;
+    ddsd.dwWidth = iWidth;
+
+    /* Create the primary surface */
+    ddrval = IDirectDraw4_CreateSurface(pScreenPriv->pdd4,
+                                        &ddsd, &pWinPriv->pddsPrimary4, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winFinishCreateWindowsWindowDDNL - Could not create primary "
+               "surface: %08x\n", (unsigned int) ddrval);
+        return FALSE;
     }
-  return TRUE;
+    return TRUE;
 }
 #endif
 
-
 /*
  * Transfer the damaged regions of the shadow framebuffer to the display.
  */
 
 static void
-winShadowUpdateDDNL (ScreenPtr pScreen, 
-		     shadowBufPtr pBuf)
+winShadowUpdateDDNL(ScreenPtr pScreen, shadowBufPtr pBuf)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  RegionPtr		damage = shadowDamage(pBuf);
-  HRESULT		ddrval = DD_OK;
-  RECT			rcDest, rcSrc;
-  POINT			ptOrigin;
-  DWORD			dwBox = RegionNumRects (damage);
-  BoxPtr		pBox = RegionRects (damage);
-  HRGN			hrgnTemp = NULL, hrgnCombined = NULL;
-
-  /*
-   * Return immediately if the app is not active
-   * and we are fullscreen, or if we have a bad display depth
-   */
-  if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)
-      || pScreenPriv->fBadDepth) return;
-
-  /* Return immediately if we didn't get needed surfaces */
-  if (!pScreenPriv->pddsPrimary4 || !pScreenPriv->pddsShadow4)
-    return;
-
-  /* Get the origin of the window in the screen coords */
-  ptOrigin.x = pScreenInfo->dwXOffset;
-  ptOrigin.y = pScreenInfo->dwYOffset;
-  MapWindowPoints (pScreenPriv->hwndScreen,
-		   HWND_DESKTOP,
-		   (LPPOINT)&ptOrigin, 1);
-
-  /*
-   * Handle small regions with multiple blits,
-   * handle large regions by creating a clipping region and 
-   * doing a single blit constrained to that clipping region.
-   */
-  if (pScreenInfo->dwClipUpdatesNBoxes == 0
-      || dwBox < pScreenInfo->dwClipUpdatesNBoxes)
-    {
-      /* Loop through all boxes in the damaged region */
-      while (dwBox--)
-	{
-	  /* Assign damage box to source rectangle */
-	  rcSrc.left = pBox->x1;
-	  rcSrc.top = pBox->y1;
-	  rcSrc.right = pBox->x2;
-	  rcSrc.bottom = pBox->y2;
-	  
-	  /* Calculate destination rectangle */
-	  rcDest.left = ptOrigin.x + rcSrc.left;
-	  rcDest.top = ptOrigin.y + rcSrc.top;
-	  rcDest.right = ptOrigin.x + rcSrc.right;
-	  rcDest.bottom = ptOrigin.y + rcSrc.bottom;
-	  
-	  /* Blit the damaged areas */
-	  ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,
-					    &rcDest,
-					    pScreenPriv->pddsShadow4,
-					    &rcSrc,
-					    DDBLT_WAIT,
-					    NULL);
-	  if (FAILED (ddrval))
-	    {
-	      static int	s_iFailCount = 0;
-	      
-	      if (s_iFailCount < FAIL_MSG_MAX_BLT)
-		{
-		  ErrorF ("winShadowUpdateDDNL - IDirectDrawSurface4_Blt () "
-			  "failed: %08x\n",
-			  (unsigned int) ddrval);
-		  
-		  ++s_iFailCount;
-
-		  if (s_iFailCount == FAIL_MSG_MAX_BLT)
-		    {
-		      ErrorF ("winShadowUpdateDDNL - IDirectDrawSurface4_Blt "
-			      "failure message maximum (%d) reached.  No "
-			      "more failure messages will be printed.\n",
-			      FAIL_MSG_MAX_BLT);
-		    }
-		}
-	    }
-	  
-	  /* Get a pointer to the next box */
-	  ++pBox;
-	}
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    RegionPtr damage = shadowDamage(pBuf);
+    HRESULT ddrval = DD_OK;
+    RECT rcDest, rcSrc;
+    POINT ptOrigin;
+    DWORD dwBox = RegionNumRects(damage);
+    BoxPtr pBox = RegionRects(damage);
+    HRGN hrgnTemp = NULL, hrgnCombined = NULL;
+
+    /*
+     * Return immediately if the app is not active
+     * and we are fullscreen, or if we have a bad display depth
+     */
+    if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)
+        || pScreenPriv->fBadDepth)
+        return;
+
+    /* Return immediately if we didn't get needed surfaces */
+    if (!pScreenPriv->pddsPrimary4 || !pScreenPriv->pddsShadow4)
+        return;
+
+    /* Get the origin of the window in the screen coords */
+    ptOrigin.x = pScreenInfo->dwXOffset;
+    ptOrigin.y = pScreenInfo->dwYOffset;
+    MapWindowPoints(pScreenPriv->hwndScreen,
+                    HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+
+    /*
+     * Handle small regions with multiple blits,
+     * handle large regions by creating a clipping region and 
+     * doing a single blit constrained to that clipping region.
+     */
+    if (pScreenInfo->dwClipUpdatesNBoxes == 0
+        || dwBox < pScreenInfo->dwClipUpdatesNBoxes) {
+        /* Loop through all boxes in the damaged region */
+        while (dwBox--) {
+            /* Assign damage box to source rectangle */
+            rcSrc.left = pBox->x1;
+            rcSrc.top = pBox->y1;
+            rcSrc.right = pBox->x2;
+            rcSrc.bottom = pBox->y2;
+
+            /* Calculate destination rectangle */
+            rcDest.left = ptOrigin.x + rcSrc.left;
+            rcDest.top = ptOrigin.y + rcSrc.top;
+            rcDest.right = ptOrigin.x + rcSrc.right;
+            rcDest.bottom = ptOrigin.y + rcSrc.bottom;
+
+            /* Blit the damaged areas */
+            ddrval = IDirectDrawSurface4_Blt(pScreenPriv->pddsPrimary4,
+                                             &rcDest,
+                                             pScreenPriv->pddsShadow4,
+                                             &rcSrc, DDBLT_WAIT, NULL);
+            if (FAILED(ddrval)) {
+                static int s_iFailCount = 0;
+
+                if (s_iFailCount < FAIL_MSG_MAX_BLT) {
+                    ErrorF("winShadowUpdateDDNL - IDirectDrawSurface4_Blt () "
+                           "failed: %08x\n", (unsigned int) ddrval);
+
+                    ++s_iFailCount;
+
+                    if (s_iFailCount == FAIL_MSG_MAX_BLT) {
+                        ErrorF("winShadowUpdateDDNL - IDirectDrawSurface4_Blt "
+                               "failure message maximum (%d) reached.  No "
+                               "more failure messages will be printed.\n",
+                               FAIL_MSG_MAX_BLT);
+                    }
+                }
+            }
+
+            /* Get a pointer to the next box */
+            ++pBox;
+        }
     }
-  else
-    {
-      BoxPtr		pBoxExtents = RegionExtents(damage);
-
-      /* Compute a GDI region from the damaged region */
-      hrgnCombined = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
-      dwBox--;
-      pBox++;
-      while (dwBox--)
-	{
-	  hrgnTemp = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
-	  CombineRgn (hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);
-	  DeleteObject (hrgnTemp);
-	  pBox++;
-	}
-
-      /* Install the GDI region as a clipping region */
-      SelectClipRgn (pScreenPriv->hdcScreen, hrgnCombined);
-      DeleteObject (hrgnCombined);
-      hrgnCombined = NULL;
+    else {
+        BoxPtr pBoxExtents = RegionExtents(damage);
+
+        /* Compute a GDI region from the damaged region */
+        hrgnCombined = CreateRectRgn(pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+        dwBox--;
+        pBox++;
+        while (dwBox--) {
+            hrgnTemp = CreateRectRgn(pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+            CombineRgn(hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);
+            DeleteObject(hrgnTemp);
+            pBox++;
+        }
+
+        /* Install the GDI region as a clipping region */
+        SelectClipRgn(pScreenPriv->hdcScreen, hrgnCombined);
+        DeleteObject(hrgnCombined);
+        hrgnCombined = NULL;
 
 #if CYGDEBUG
-      winDebug ("winShadowUpdateDDNL - be x1 %d y1 %d x2 %d y2 %d\n",
-	      pBoxExtents->x1, pBoxExtents->y1,
-	      pBoxExtents->x2, pBoxExtents->y2);
+        winDebug("winShadowUpdateDDNL - be x1 %d y1 %d x2 %d y2 %d\n",
+                 pBoxExtents->x1, pBoxExtents->y1,
+                 pBoxExtents->x2, pBoxExtents->y2);
 #endif
 
-      /* Calculating a bounding box for the source is easy */
-      rcSrc.left = pBoxExtents->x1;
-      rcSrc.top = pBoxExtents->y1;
-      rcSrc.right = pBoxExtents->x2;
-      rcSrc.bottom = pBoxExtents->y2;
-
-      /* Calculating a bounding box for the destination is trickier */
-      rcDest.left = ptOrigin.x + rcSrc.left;
-      rcDest.top = ptOrigin.y + rcSrc.top;
-      rcDest.right = ptOrigin.x + rcSrc.right;
-      rcDest.bottom = ptOrigin.y + rcSrc.bottom;
-
-      /* Our Blt should be clipped to the invalidated region */
-      ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,
-					&rcDest,
-					pScreenPriv->pddsShadow4,
-					&rcSrc,
-					DDBLT_WAIT,
-					NULL);
-
-      /* Reset the clip region */
-      SelectClipRgn (pScreenPriv->hdcScreen, NULL);
+        /* Calculating a bounding box for the source is easy */
+        rcSrc.left = pBoxExtents->x1;
+        rcSrc.top = pBoxExtents->y1;
+        rcSrc.right = pBoxExtents->x2;
+        rcSrc.bottom = pBoxExtents->y2;
+
+        /* Calculating a bounding box for the destination is trickier */
+        rcDest.left = ptOrigin.x + rcSrc.left;
+        rcDest.top = ptOrigin.y + rcSrc.top;
+        rcDest.right = ptOrigin.x + rcSrc.right;
+        rcDest.bottom = ptOrigin.y + rcSrc.bottom;
+
+        /* Our Blt should be clipped to the invalidated region */
+        ddrval = IDirectDrawSurface4_Blt(pScreenPriv->pddsPrimary4,
+                                         &rcDest,
+                                         pScreenPriv->pddsShadow4,
+                                         &rcSrc, DDBLT_WAIT, NULL);
+
+        /* Reset the clip region */
+        SelectClipRgn(pScreenPriv->hdcScreen, NULL);
     }
 }
 
 static Bool
 winInitScreenShadowDDNL(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
+    winScreenPriv(pScreen);
 
-  /* Get a device context for the screen  */
-  pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen);
+    /* Get a device context for the screen  */
+    pScreenPriv->hdcScreen = GetDC(pScreenPriv->hwndScreen);
 
-  return winAllocateFBShadowDDNL(pScreen);
+    return winAllocateFBShadowDDNL(pScreen);
 }
 
 /*
@@ -786,66 +719,63 @@ winInitScreenShadowDDNL(ScreenPtr pScreen)
  */
 
 static Bool
-winCloseScreenShadowDDNL (int nIndex, ScreenPtr pScreen)
+winCloseScreenShadowDDNL(int nIndex, ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  Bool			fReturn;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    Bool fReturn;
 
 #if CYGDEBUG
-  winDebug ("winCloseScreenShadowDDNL - Freeing screen resources\n");
+    winDebug("winCloseScreenShadowDDNL - Freeing screen resources\n");
 #endif
 
-  /* Flag that the screen is closed */
-  pScreenPriv->fClosed = TRUE;
-  pScreenPriv->fActive = FALSE;
+    /* Flag that the screen is closed */
+    pScreenPriv->fClosed = TRUE;
+    pScreenPriv->fActive = FALSE;
 
-  /* Call the wrapped CloseScreen procedure */
-  WIN_UNWRAP(CloseScreen);
-  if (pScreen->CloseScreen)
-    fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+    /* Call the wrapped CloseScreen procedure */
+    WIN_UNWRAP(CloseScreen);
+    if (pScreen->CloseScreen)
+        fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
 
-  winFreeFBShadowDDNL(pScreen);
+    winFreeFBShadowDDNL(pScreen);
 
-  /* Free the screen DC */
-  ReleaseDC (pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);
+    /* Free the screen DC */
+    ReleaseDC(pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);
 
-  /* Delete the window property */
-  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);
+    /* Delete the window property */
+    RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);
 
-  /* Delete tray icon, if we have one */
-  if (!pScreenInfo->fNoTrayIcon)
-    winDeleteNotifyIcon (pScreenPriv);
+    /* Delete tray icon, if we have one */
+    if (!pScreenInfo->fNoTrayIcon)
+        winDeleteNotifyIcon(pScreenPriv);
 
-  /* Free the exit confirmation dialog box, if it exists */
-  if (g_hDlgExit != NULL)
-    {
-      DestroyWindow (g_hDlgExit);
-      g_hDlgExit = NULL;
+    /* Free the exit confirmation dialog box, if it exists */
+    if (g_hDlgExit != NULL) {
+        DestroyWindow(g_hDlgExit);
+        g_hDlgExit = NULL;
     }
 
-  /* Kill our window */
-  if (pScreenPriv->hwndScreen)
-    {
-      DestroyWindow (pScreenPriv->hwndScreen);
-      pScreenPriv->hwndScreen = NULL;
+    /* Kill our window */
+    if (pScreenPriv->hwndScreen) {
+        DestroyWindow(pScreenPriv->hwndScreen);
+        pScreenPriv->hwndScreen = NULL;
     }
 
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
-  /* Destroy the thread startup mutex */
-  pthread_mutex_destroy (&pScreenPriv->pmServerStarted);
+    /* Destroy the thread startup mutex */
+    pthread_mutex_destroy(&pScreenPriv->pmServerStarted);
 #endif
 
-  /* Kill our screeninfo's pointer to the screen */
-  pScreenInfo->pScreen = NULL;
+    /* Kill our screeninfo's pointer to the screen */
+    pScreenInfo->pScreen = NULL;
 
-  /* Free the screen privates for this screen */
-  free ((pointer) pScreenPriv);
+    /* Free the screen privates for this screen */
+    free((pointer) pScreenPriv);
 
-  return fReturn;
+    return fReturn;
 }
 
-
 /*
  * Tell mi what sort of visuals we need.
  *
@@ -855,543 +785,501 @@ winCloseScreenShadowDDNL (int nIndex, ScreenPtr pScreen)
  */
 
 static Bool
-winInitVisualsShadowDDNL (ScreenPtr pScreen)
+winInitVisualsShadowDDNL(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  DWORD			dwRedBits, dwGreenBits, dwBlueBits;
-
-  /* Count the number of ones in each color mask */
-  dwRedBits = winCountBits (pScreenPriv->dwRedMask);
-  dwGreenBits = winCountBits (pScreenPriv->dwGreenMask);
-  dwBlueBits = winCountBits (pScreenPriv->dwBlueMask);
-  
-  /* Store the maximum number of ones in a color mask as the bitsPerRGB */
-  if (dwRedBits == 0 || dwGreenBits == 0 || dwBlueBits == 0)
-    pScreenPriv->dwBitsPerRGB = 8;
-  else if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
-    pScreenPriv->dwBitsPerRGB = dwRedBits;
-  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
-    pScreenPriv->dwBitsPerRGB = dwGreenBits;
-  else
-    pScreenPriv->dwBitsPerRGB = dwBlueBits;
-
-  winDebug ("winInitVisualsShadowDDNL - Masks %08x %08x %08x BPRGB %d d %d "
-	  "bpp %d\n",
-	  (unsigned int) pScreenPriv->dwRedMask,
-	  (unsigned int) pScreenPriv->dwGreenMask,
-	  (unsigned int) pScreenPriv->dwBlueMask,
-	  (int) pScreenPriv->dwBitsPerRGB,
-	  (int) pScreenInfo->dwDepth,
-	  (int) pScreenInfo->dwBPP);
-
-  /* Create a single visual according to the Windows screen depth */
-  switch (pScreenInfo->dwDepth)
-    {
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    DWORD dwRedBits, dwGreenBits, dwBlueBits;
+
+    /* Count the number of ones in each color mask */
+    dwRedBits = winCountBits(pScreenPriv->dwRedMask);
+    dwGreenBits = winCountBits(pScreenPriv->dwGreenMask);
+    dwBlueBits = winCountBits(pScreenPriv->dwBlueMask);
+
+    /* Store the maximum number of ones in a color mask as the bitsPerRGB */
+    if (dwRedBits == 0 || dwGreenBits == 0 || dwBlueBits == 0)
+        pScreenPriv->dwBitsPerRGB = 8;
+    else if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
+        pScreenPriv->dwBitsPerRGB = dwRedBits;
+    else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
+        pScreenPriv->dwBitsPerRGB = dwGreenBits;
+    else
+        pScreenPriv->dwBitsPerRGB = dwBlueBits;
+
+    winDebug("winInitVisualsShadowDDNL - Masks %08x %08x %08x BPRGB %d d %d "
+             "bpp %d\n",
+             (unsigned int) pScreenPriv->dwRedMask,
+             (unsigned int) pScreenPriv->dwGreenMask,
+             (unsigned int) pScreenPriv->dwBlueMask,
+             (int) pScreenPriv->dwBitsPerRGB,
+             (int) pScreenInfo->dwDepth, (int) pScreenInfo->dwBPP);
+
+    /* Create a single visual according to the Windows screen depth */
+    switch (pScreenInfo->dwDepth) {
     case 24:
     case 16:
     case 15:
-      /* Setup the real visual */
-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
-				     TrueColorMask,
-				     pScreenPriv->dwBitsPerRGB,
-				     -1,
-				     pScreenPriv->dwRedMask,
-				     pScreenPriv->dwGreenMask,
-				     pScreenPriv->dwBlueMask))
-	{
-	  ErrorF ("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "
-		  "failed for TrueColor\n");
-	  return FALSE;
-	}
+        /* Setup the real visual */
+        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
+                                      TrueColorMask,
+                                      pScreenPriv->dwBitsPerRGB,
+                                      -1,
+                                      pScreenPriv->dwRedMask,
+                                      pScreenPriv->dwGreenMask,
+                                      pScreenPriv->dwBlueMask)) {
+            ErrorF("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "
+                   "failed for TrueColor\n");
+            return FALSE;
+        }
 
 #ifdef XWIN_EMULATEPSEUDO
-      if (!pScreenInfo->fEmulatePseudo)
-	break;
-
-      /* Setup a pseudocolor visual */
-      if (!miSetVisualTypesAndMasks (8,
-				     PseudoColorMask,
-				     8,
-				     -1,
-				     0,
-				     0,
-				     0))
-	{
-	  ErrorF ("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "
-		  "failed for PseudoColor\n");
-	  return FALSE;
-	}
+        if (!pScreenInfo->fEmulatePseudo)
+            break;
+
+        /* Setup a pseudocolor visual */
+        if (!miSetVisualTypesAndMasks(8, PseudoColorMask, 8, -1, 0, 0, 0)) {
+            ErrorF("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "
+                   "failed for PseudoColor\n");
+            return FALSE;
+        }
 #endif
-      break;
+        break;
 
     case 8:
-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
-				     pScreenInfo->fFullScreen 
-				     ? PseudoColorMask : StaticColorMask,
-				     pScreenPriv->dwBitsPerRGB,
-				     pScreenInfo->fFullScreen 
-				     ? PseudoColor : StaticColor,
-				     pScreenPriv->dwRedMask,
-				     pScreenPriv->dwGreenMask,
-				     pScreenPriv->dwBlueMask))
-	{
-	  ErrorF ("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "
-		  "failed\n");
-	  return FALSE;
-	}
-      break;
+        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
+                                      pScreenInfo->fFullScreen
+                                      ? PseudoColorMask : StaticColorMask,
+                                      pScreenPriv->dwBitsPerRGB,
+                                      pScreenInfo->fFullScreen
+                                      ? PseudoColor : StaticColor,
+                                      pScreenPriv->dwRedMask,
+                                      pScreenPriv->dwGreenMask,
+                                      pScreenPriv->dwBlueMask)) {
+            ErrorF("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "
+                   "failed\n");
+            return FALSE;
+        }
+        break;
 
     default:
-      ErrorF ("winInitVisualsShadowDDNL - Unknown screen depth\n");
-      return FALSE;
+        ErrorF("winInitVisualsShadowDDNL - Unknown screen depth\n");
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winInitVisualsShadowDDNL - Returning\n");
+    winDebug("winInitVisualsShadowDDNL - Returning\n");
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Adjust the user proposed video mode
  */
 
 static Bool
-winAdjustVideoModeShadowDDNL (ScreenPtr pScreen)
+winAdjustVideoModeShadowDDNL(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  HDC			hdc = NULL;
-  DWORD			dwBPP;
-
-  /* We're in serious trouble if we can't get a DC */
-  hdc = GetDC (NULL);
-  if (hdc == NULL)
-    {
-      ErrorF ("winAdjustVideoModeShadowDDNL - GetDC () failed\n");
-      return FALSE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HDC hdc = NULL;
+    DWORD dwBPP;
+
+    /* We're in serious trouble if we can't get a DC */
+    hdc = GetDC(NULL);
+    if (hdc == NULL) {
+        ErrorF("winAdjustVideoModeShadowDDNL - GetDC () failed\n");
+        return FALSE;
     }
 
-  /* Query GDI for current display depth */
-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
+    /* Query GDI for current display depth */
+    dwBPP = GetDeviceCaps(hdc, BITSPIXEL);
 
-  /* DirectDraw can only change the depth in fullscreen mode */
-  if (!(pScreenInfo->fFullScreen &&
-        (pScreenInfo->dwBPP != WIN_DEFAULT_BPP)))
-    {
-      /* Otherwise, We'll use GDI's depth */
-      pScreenInfo->dwBPP = dwBPP;
+    /* DirectDraw can only change the depth in fullscreen mode */
+    if (!(pScreenInfo->fFullScreen && (pScreenInfo->dwBPP != WIN_DEFAULT_BPP))) {
+        /* Otherwise, We'll use GDI's depth */
+        pScreenInfo->dwBPP = dwBPP;
     }
 
-  /* Release our DC */
-  ReleaseDC (NULL, hdc);
+    /* Release our DC */
+    ReleaseDC(NULL, hdc);
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Blt exposed regions to the screen
  */
 
 static Bool
-winBltExposedRegionsShadowDDNL (ScreenPtr pScreen)
+winBltExposedRegionsShadowDDNL(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  RECT			rcSrc, rcDest;
-  POINT			ptOrigin;
-  HDC			hdcUpdate;
-  PAINTSTRUCT		ps;
-  HRESULT		ddrval = DD_OK;
-  Bool			fReturn = TRUE;
-  int			i;
-
-  /* Quite common case. The primary surface was lost (maybe because of depth
-   * change). Try to create a new primary surface. Bail out if this fails */
-  if (pScreenPriv->pddsPrimary4 == NULL && pScreenPriv->fRetryCreateSurface &&
-      !winCreatePrimarySurfaceShadowDDNL(pScreen))
-    {
-      Sleep(100);
-      return FALSE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    RECT rcSrc, rcDest;
+    POINT ptOrigin;
+    HDC hdcUpdate;
+    PAINTSTRUCT ps;
+    HRESULT ddrval = DD_OK;
+    Bool fReturn = TRUE;
+    int i;
+
+    /* Quite common case. The primary surface was lost (maybe because of depth
+     * change). Try to create a new primary surface. Bail out if this fails */
+    if (pScreenPriv->pddsPrimary4 == NULL && pScreenPriv->fRetryCreateSurface &&
+        !winCreatePrimarySurfaceShadowDDNL(pScreen)) {
+        Sleep(100);
+        return FALSE;
     }
-  if (pScreenPriv->pddsPrimary4 == NULL)
-    return FALSE;  
-  
-  /* BeginPaint gives us an hdc that clips to the invalidated region */
-  hdcUpdate = BeginPaint (pScreenPriv->hwndScreen, &ps);
-  if (hdcUpdate == NULL)
-    {
-      fReturn = FALSE;
-      ErrorF ("winBltExposedRegionsShadowDDNL - BeginPaint () returned "
-	      "a NULL device context handle.  Aborting blit attempt.\n");
-      goto winBltExposedRegionsShadowDDNL_Exit;
+    if (pScreenPriv->pddsPrimary4 == NULL)
+        return FALSE;
+
+    /* BeginPaint gives us an hdc that clips to the invalidated region */
+    hdcUpdate = BeginPaint(pScreenPriv->hwndScreen, &ps);
+    if (hdcUpdate == NULL) {
+        fReturn = FALSE;
+        ErrorF("winBltExposedRegionsShadowDDNL - BeginPaint () returned "
+               "a NULL device context handle.  Aborting blit attempt.\n");
+        goto winBltExposedRegionsShadowDDNL_Exit;
     }
 
-  /* Get the origin of the window in the screen coords */
-  ptOrigin.x = pScreenInfo->dwXOffset;
-  ptOrigin.y = pScreenInfo->dwYOffset;
-
-  MapWindowPoints (pScreenPriv->hwndScreen,
-		   HWND_DESKTOP,
-		   (LPPOINT)&ptOrigin, 1);
-  rcDest.left = ptOrigin.x;
-  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
-  rcDest.top = ptOrigin.y;
-  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
-
-  /* Source can be entire shadow surface, as Blt should clip for us */
-  rcSrc.left = 0;
-  rcSrc.top = 0;
-  rcSrc.right = pScreenInfo->dwWidth;
-  rcSrc.bottom = pScreenInfo->dwHeight;
-
-  /* Try to regain the primary surface and blit again if we've lost it */
-  for (i = 0; i <= WIN_REGAIN_SURFACE_RETRIES; ++i)
-    {
-      /* Our Blt should be clipped to the invalidated region */
-      ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,
-					&rcDest,
-					pScreenPriv->pddsShadow4,
-					&rcSrc,
-					DDBLT_WAIT,
-					NULL);
-      if (ddrval == DDERR_SURFACELOST)
-	{
-	  /* Surface was lost */
-	  winErrorFVerb (1, "winBltExposedRegionsShadowDDNL - "
-          "IDirectDrawSurface4_Blt reported that the primary "
-          "surface was lost, trying to restore, retry: %d\n", i + 1);
-
-	  /* Try to restore the surface, once */
-	  
-	  ddrval = IDirectDrawSurface4_Restore (pScreenPriv->pddsPrimary4);
-	  winDebug ("winBltExposedRegionsShadowDDNL - "
-		  "IDirectDrawSurface4_Restore returned: ");
-	  if (ddrval == DD_OK)
-	    winDebug ("DD_OK\n");
-	  else if (ddrval == DDERR_WRONGMODE)
-	    winDebug ("DDERR_WRONGMODE\n");
-	  else if (ddrval == DDERR_INCOMPATIBLEPRIMARY)
-	    winDebug ("DDERR_INCOMPATIBLEPRIMARY\n");
-	  else if (ddrval == DDERR_UNSUPPORTED)
-	    winDebug ("DDERR_UNSUPPORTED\n");
-	  else if (ddrval == DDERR_INVALIDPARAMS)
-	    winDebug ("DDERR_INVALIDPARAMS\n");
-	  else if (ddrval == DDERR_INVALIDOBJECT)
-	    winDebug ("DDERR_INVALIDOBJECT\n");
-	  else
-	    winDebug ("unknown error: %08x\n", (unsigned int) ddrval);
-	  
-	  /* Loop around to try the blit one more time */
-	  continue;
-	}  
-      else if (FAILED (ddrval))
-	{
-	  fReturn = FALSE;
-	  winErrorFVerb (1, "winBltExposedRegionsShadowDDNL - "
-		  "IDirectDrawSurface4_Blt failed, but surface not "
-		  "lost: %08x %d\n",
-		  (unsigned int) ddrval, (int) ddrval);
-	  goto winBltExposedRegionsShadowDDNL_Exit;
-	}
-      else
-	{
-	  /* Success, stop looping */
-	  break;
-	}
+    /* Get the origin of the window in the screen coords */
+    ptOrigin.x = pScreenInfo->dwXOffset;
+    ptOrigin.y = pScreenInfo->dwYOffset;
+
+    MapWindowPoints(pScreenPriv->hwndScreen,
+                    HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+    rcDest.left = ptOrigin.x;
+    rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
+    rcDest.top = ptOrigin.y;
+    rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
+
+    /* Source can be entire shadow surface, as Blt should clip for us */
+    rcSrc.left = 0;
+    rcSrc.top = 0;
+    rcSrc.right = pScreenInfo->dwWidth;
+    rcSrc.bottom = pScreenInfo->dwHeight;
+
+    /* Try to regain the primary surface and blit again if we've lost it */
+    for (i = 0; i <= WIN_REGAIN_SURFACE_RETRIES; ++i) {
+        /* Our Blt should be clipped to the invalidated region */
+        ddrval = IDirectDrawSurface4_Blt(pScreenPriv->pddsPrimary4,
+                                         &rcDest,
+                                         pScreenPriv->pddsShadow4,
+                                         &rcSrc, DDBLT_WAIT, NULL);
+        if (ddrval == DDERR_SURFACELOST) {
+            /* Surface was lost */
+            winErrorFVerb(1, "winBltExposedRegionsShadowDDNL - "
+                          "IDirectDrawSurface4_Blt reported that the primary "
+                          "surface was lost, trying to restore, retry: %d\n",
+                          i + 1);
+
+            /* Try to restore the surface, once */
+
+            ddrval = IDirectDrawSurface4_Restore(pScreenPriv->pddsPrimary4);
+            winDebug("winBltExposedRegionsShadowDDNL - "
+                     "IDirectDrawSurface4_Restore returned: ");
+            if (ddrval == DD_OK)
+                winDebug("DD_OK\n");
+            else if (ddrval == DDERR_WRONGMODE)
+                winDebug("DDERR_WRONGMODE\n");
+            else if (ddrval == DDERR_INCOMPATIBLEPRIMARY)
+                winDebug("DDERR_INCOMPATIBLEPRIMARY\n");
+            else if (ddrval == DDERR_UNSUPPORTED)
+                winDebug("DDERR_UNSUPPORTED\n");
+            else if (ddrval == DDERR_INVALIDPARAMS)
+                winDebug("DDERR_INVALIDPARAMS\n");
+            else if (ddrval == DDERR_INVALIDOBJECT)
+                winDebug("DDERR_INVALIDOBJECT\n");
+            else
+                winDebug("unknown error: %08x\n", (unsigned int) ddrval);
+
+            /* Loop around to try the blit one more time */
+            continue;
+        }
+        else if (FAILED(ddrval)) {
+            fReturn = FALSE;
+            winErrorFVerb(1, "winBltExposedRegionsShadowDDNL - "
+                          "IDirectDrawSurface4_Blt failed, but surface not "
+                          "lost: %08x %d\n",
+                          (unsigned int) ddrval, (int) ddrval);
+            goto winBltExposedRegionsShadowDDNL_Exit;
+        }
+        else {
+            /* Success, stop looping */
+            break;
+        }
     }
 
  winBltExposedRegionsShadowDDNL_Exit:
-  /* EndPaint frees the DC */
-  if (hdcUpdate != NULL)
-    EndPaint (pScreenPriv->hwndScreen, &ps);
-  return fReturn;
+    /* EndPaint frees the DC */
+    if (hdcUpdate != NULL)
+        EndPaint(pScreenPriv->hwndScreen, &ps);
+    return fReturn;
 }
 
-
 /*
  * Do any engine-specific application-activation processing
  */
 
 static Bool
-winActivateAppShadowDDNL (ScreenPtr pScreen)
+winActivateAppShadowDDNL(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-
-  /*
-   * Do we have a surface?
-   * Are we active?
-   * Are we full screen?
-   */
-  if (pScreenPriv != NULL
-      && pScreenPriv->pddsPrimary4 != NULL
-      && pScreenPriv->fActive)
-    {
-      /* Primary surface was lost, restore it */
-      IDirectDrawSurface4_Restore (pScreenPriv->pddsPrimary4);
+    winScreenPriv(pScreen);
+
+    /*
+     * Do we have a surface?
+     * Are we active?
+     * Are we full screen?
+     */
+    if (pScreenPriv != NULL
+        && pScreenPriv->pddsPrimary4 != NULL && pScreenPriv->fActive) {
+        /* Primary surface was lost, restore it */
+        IDirectDrawSurface4_Restore(pScreenPriv->pddsPrimary4);
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Reblit the shadow framebuffer to the screen.
  */
 
 static Bool
-winRedrawScreenShadowDDNL (ScreenPtr pScreen)
+winRedrawScreenShadowDDNL(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  HRESULT		ddrval = DD_OK;
-  RECT			rcSrc, rcDest;
-  POINT			ptOrigin;
-
-  /* Get the origin of the window in the screen coords */
-  ptOrigin.x = pScreenInfo->dwXOffset;
-  ptOrigin.y = pScreenInfo->dwYOffset;
-  MapWindowPoints (pScreenPriv->hwndScreen,
-		   HWND_DESKTOP,
-		   (LPPOINT)&ptOrigin, 1);
-  rcDest.left = ptOrigin.x;
-  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
-  rcDest.top = ptOrigin.y;
-  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
-
-  /* Source can be entire shadow surface, as Blt should clip for us */
-  rcSrc.left = 0;
-  rcSrc.top = 0;
-  rcSrc.right = pScreenInfo->dwWidth;
-  rcSrc.bottom = pScreenInfo->dwHeight;
-
-  /* Redraw the whole window, to take account for the new colors */
-  ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,
-				    &rcDest,
-				    pScreenPriv->pddsShadow4,
-				    &rcSrc,
-				    DDBLT_WAIT,
-				    NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winRedrawScreenShadowDDNL - IDirectDrawSurface4_Blt () "
-	      "failed: %08x\n",
-	      (unsigned int) ddrval);
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HRESULT ddrval = DD_OK;
+    RECT rcSrc, rcDest;
+    POINT ptOrigin;
+
+    /* Get the origin of the window in the screen coords */
+    ptOrigin.x = pScreenInfo->dwXOffset;
+    ptOrigin.y = pScreenInfo->dwYOffset;
+    MapWindowPoints(pScreenPriv->hwndScreen,
+                    HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+    rcDest.left = ptOrigin.x;
+    rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
+    rcDest.top = ptOrigin.y;
+    rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
+
+    /* Source can be entire shadow surface, as Blt should clip for us */
+    rcSrc.left = 0;
+    rcSrc.top = 0;
+    rcSrc.right = pScreenInfo->dwWidth;
+    rcSrc.bottom = pScreenInfo->dwHeight;
+
+    /* Redraw the whole window, to take account for the new colors */
+    ddrval = IDirectDrawSurface4_Blt(pScreenPriv->pddsPrimary4,
+                                     &rcDest,
+                                     pScreenPriv->pddsShadow4,
+                                     &rcSrc, DDBLT_WAIT, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winRedrawScreenShadowDDNL - IDirectDrawSurface4_Blt () "
+               "failed: %08x\n", (unsigned int) ddrval);
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Realize the currently installed colormap
  */
 
 static Bool
-winRealizeInstalledPaletteShadowDDNL (ScreenPtr pScreen)
+winRealizeInstalledPaletteShadowDDNL(ScreenPtr pScreen)
 {
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Install the specified colormap
  */
 
 static Bool
-winInstallColormapShadowDDNL (ColormapPtr pColormap)
+winInstallColormapShadowDDNL(ColormapPtr pColormap)
 {
-  ScreenPtr		pScreen = pColormap->pScreen;
-  winScreenPriv(pScreen);
-  winCmapPriv(pColormap);
-  HRESULT		ddrval = DD_OK;
-
-  /* Install the DirectDraw palette on the primary surface */
-  ddrval = IDirectDrawSurface4_SetPalette (pScreenPriv->pddsPrimary4,
-					   pCmapPriv->lpDDPalette);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winInstallColormapShadowDDNL - Failed installing the "
-	      "DirectDraw palette.\n");
-      return FALSE;
+    ScreenPtr pScreen = pColormap->pScreen;
+
+    winScreenPriv(pScreen);
+    winCmapPriv(pColormap);
+    HRESULT ddrval = DD_OK;
+
+    /* Install the DirectDraw palette on the primary surface */
+    ddrval = IDirectDrawSurface4_SetPalette(pScreenPriv->pddsPrimary4,
+                                            pCmapPriv->lpDDPalette);
+    if (FAILED(ddrval)) {
+        ErrorF("winInstallColormapShadowDDNL - Failed installing the "
+               "DirectDraw palette.\n");
+        return FALSE;
     }
 
-  /* Save a pointer to the newly installed colormap */
-  pScreenPriv->pcmapInstalled = pColormap;
+    /* Save a pointer to the newly installed colormap */
+    pScreenPriv->pcmapInstalled = pColormap;
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Store the specified colors in the specified colormap
  */
 
 static Bool
-winStoreColorsShadowDDNL (ColormapPtr pColormap, 
-			  int ndef,
-			  xColorItem *pdefs)
+winStoreColorsShadowDDNL(ColormapPtr pColormap, int ndef, xColorItem * pdefs)
 {
-  ScreenPtr		pScreen = pColormap->pScreen;
-  winScreenPriv(pScreen);
-  winCmapPriv(pColormap);
-  ColormapPtr		curpmap = pScreenPriv->pcmapInstalled;
-  HRESULT		ddrval = DD_OK;
-  
-  /* Put the X colormap entries into the Windows logical palette */
-  ddrval = IDirectDrawPalette_SetEntries (pCmapPriv->lpDDPalette,
-					  0,
-					  pdefs[0].pixel,
-					  ndef,
-					  pCmapPriv->peColors 
-					  + pdefs[0].pixel);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winStoreColorsShadowDDNL - SetEntries () failed: %08x\n", (unsigned int) ddrval);
-      return FALSE;
+    ScreenPtr pScreen = pColormap->pScreen;
+
+    winScreenPriv(pScreen);
+    winCmapPriv(pColormap);
+    ColormapPtr curpmap = pScreenPriv->pcmapInstalled;
+    HRESULT ddrval = DD_OK;
+
+    /* Put the X colormap entries into the Windows logical palette */
+    ddrval = IDirectDrawPalette_SetEntries(pCmapPriv->lpDDPalette,
+                                           0,
+                                           pdefs[0].pixel,
+                                           ndef,
+                                           pCmapPriv->peColors
+                                           + pdefs[0].pixel);
+    if (FAILED(ddrval)) {
+        ErrorF("winStoreColorsShadowDDNL - SetEntries () failed: %08x\n",
+               (unsigned int) ddrval);
+        return FALSE;
     }
 
-  /* Don't install the DirectDraw palette if the colormap is not installed */
-  if (pColormap != curpmap)
-    {
-      return TRUE;
+    /* Don't install the DirectDraw palette if the colormap is not installed */
+    if (pColormap != curpmap) {
+        return TRUE;
     }
 
-  if (!winInstallColormapShadowDDNL (pColormap))
-    {
-      ErrorF ("winStoreColorsShadowDDNL - Failed installing colormap\n");
-      return FALSE;
+    if (!winInstallColormapShadowDDNL(pColormap)) {
+        ErrorF("winStoreColorsShadowDDNL - Failed installing colormap\n");
+        return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Colormap initialization procedure
  */
 
 static Bool
-winCreateColormapShadowDDNL (ColormapPtr pColormap)
+winCreateColormapShadowDDNL(ColormapPtr pColormap)
 {
-  HRESULT		ddrval = DD_OK;
-  ScreenPtr		pScreen = pColormap->pScreen;
-  winScreenPriv(pScreen);
-  winCmapPriv(pColormap);
-  
-  /* Create a DirectDraw palette */
-  ddrval = IDirectDraw4_CreatePalette (pScreenPriv->pdd4,
-				       DDPCAPS_8BIT | DDPCAPS_ALLOW256,
-				       pCmapPriv->peColors,
-				       &pCmapPriv->lpDDPalette,
-				       NULL);
-  if (FAILED (ddrval))
-    {
-      ErrorF ("winCreateColormapShadowDDNL - CreatePalette failed\n");
-      return FALSE;
+    HRESULT ddrval = DD_OK;
+    ScreenPtr pScreen = pColormap->pScreen;
+
+    winScreenPriv(pScreen);
+    winCmapPriv(pColormap);
+
+    /* Create a DirectDraw palette */
+    ddrval = IDirectDraw4_CreatePalette(pScreenPriv->pdd4,
+                                        DDPCAPS_8BIT | DDPCAPS_ALLOW256,
+                                        pCmapPriv->peColors,
+                                        &pCmapPriv->lpDDPalette, NULL);
+    if (FAILED(ddrval)) {
+        ErrorF("winCreateColormapShadowDDNL - CreatePalette failed\n");
+        return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Colormap destruction procedure
  */
 
 static Bool
-winDestroyColormapShadowDDNL (ColormapPtr pColormap)
+winDestroyColormapShadowDDNL(ColormapPtr pColormap)
 {
-  winScreenPriv(pColormap->pScreen);
-  winCmapPriv(pColormap);
-  HRESULT		ddrval = DD_OK;
-
-  /*
-   * Is colormap to be destroyed the default?
-   *
-   * Non-default colormaps should have had winUninstallColormap
-   * called on them before we get here.  The default colormap
-   * will not have had winUninstallColormap called on it.  Thus,
-   * we need to handle the default colormap in a special way.
-   */
-  if (pColormap->flags & IsDefault)
-    {
+    winScreenPriv(pColormap->pScreen);
+    winCmapPriv(pColormap);
+    HRESULT ddrval = DD_OK;
+
+    /*
+     * Is colormap to be destroyed the default?
+     *
+     * Non-default colormaps should have had winUninstallColormap
+     * called on them before we get here.  The default colormap
+     * will not have had winUninstallColormap called on it.  Thus,
+     * we need to handle the default colormap in a special way.
+     */
+    if (pColormap->flags & IsDefault) {
 #if CYGDEBUG
-      winDebug ("winDestroyColormapShadowDDNL - Destroying default colormap\n");
+        winDebug
+            ("winDestroyColormapShadowDDNL - Destroying default colormap\n");
 #endif
-      
-      /*
-       * FIXME: Walk the list of all screens, popping the default
-       * palette out of each screen device context.
-       */
-      
-      /* Pop the palette out of the primary surface */
-      ddrval = IDirectDrawSurface4_SetPalette (pScreenPriv->pddsPrimary4,
-					       NULL);
-      if (FAILED (ddrval))
-	{
-	  ErrorF ("winDestroyColormapShadowDDNL - Failed freeing the "
-		  "default colormap DirectDraw palette.\n");
-	  return FALSE;
-	}
-
-      /* Clear our private installed colormap pointer */
-      pScreenPriv->pcmapInstalled = NULL;
+
+        /*
+         * FIXME: Walk the list of all screens, popping the default
+         * palette out of each screen device context.
+         */
+
+        /* Pop the palette out of the primary surface */
+        ddrval = IDirectDrawSurface4_SetPalette(pScreenPriv->pddsPrimary4,
+                                                NULL);
+        if (FAILED(ddrval)) {
+            ErrorF("winDestroyColormapShadowDDNL - Failed freeing the "
+                   "default colormap DirectDraw palette.\n");
+            return FALSE;
+        }
+
+        /* Clear our private installed colormap pointer */
+        pScreenPriv->pcmapInstalled = NULL;
     }
-  
-  /* Release the palette */
-  IDirectDrawPalette_Release (pCmapPriv->lpDDPalette);
- 
-  /* Invalidate the colormap privates */
-  pCmapPriv->lpDDPalette = NULL;
-
-  return TRUE;
-}
 
+    /* Release the palette */
+    IDirectDrawPalette_Release(pCmapPriv->lpDDPalette);
+
+    /* Invalidate the colormap privates */
+    pCmapPriv->lpDDPalette = NULL;
+
+    return TRUE;
+}
 
 /*
  * Set pointers to our engine specific functions
  */
 
 Bool
-winSetEngineFunctionsShadowDDNL (ScreenPtr pScreen)
+winSetEngineFunctionsShadowDDNL(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  
-  /* Set our pointers */
-  pScreenPriv->pwinAllocateFB = winAllocateFBShadowDDNL;
-  pScreenPriv->pwinFreeFB = winFreeFBShadowDDNL;
-  pScreenPriv->pwinShadowUpdate = winShadowUpdateDDNL;
-  pScreenPriv->pwinInitScreen = winInitScreenShadowDDNL;
-  pScreenPriv->pwinCloseScreen = winCloseScreenShadowDDNL;
-  pScreenPriv->pwinInitVisuals = winInitVisualsShadowDDNL;
-  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowDDNL;
-  if (pScreenInfo->fFullScreen)
-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;
-  else
-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
-  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
-  pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowDDNL;
-  pScreenPriv->pwinActivateApp = winActivateAppShadowDDNL;
-  pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowDDNL;
-  pScreenPriv->pwinRealizeInstalledPalette
-    = winRealizeInstalledPaletteShadowDDNL;
-  pScreenPriv->pwinInstallColormap = winInstallColormapShadowDDNL;
-  pScreenPriv->pwinStoreColors = winStoreColorsShadowDDNL;
-  pScreenPriv->pwinCreateColormap = winCreateColormapShadowDDNL;
-  pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowDDNL;
-  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;
-  pScreenPriv->pwinCreatePrimarySurface = winCreatePrimarySurfaceShadowDDNL;
-  pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDDNL;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /* Set our pointers */
+    pScreenPriv->pwinAllocateFB = winAllocateFBShadowDDNL;
+    pScreenPriv->pwinFreeFB = winFreeFBShadowDDNL;
+    pScreenPriv->pwinShadowUpdate = winShadowUpdateDDNL;
+    pScreenPriv->pwinInitScreen = winInitScreenShadowDDNL;
+    pScreenPriv->pwinCloseScreen = winCloseScreenShadowDDNL;
+    pScreenPriv->pwinInitVisuals = winInitVisualsShadowDDNL;
+    pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowDDNL;
+    if (pScreenInfo->fFullScreen)
+        pScreenPriv->pwinCreateBoundingWindow =
+            winCreateBoundingWindowFullScreen;
+    else
+        pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
+    pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
+    pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowDDNL;
+    pScreenPriv->pwinActivateApp = winActivateAppShadowDDNL;
+    pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowDDNL;
+    pScreenPriv->pwinRealizeInstalledPalette
+        = winRealizeInstalledPaletteShadowDDNL;
+    pScreenPriv->pwinInstallColormap = winInstallColormapShadowDDNL;
+    pScreenPriv->pwinStoreColors = winStoreColorsShadowDDNL;
+    pScreenPriv->pwinCreateColormap = winCreateColormapShadowDDNL;
+    pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowDDNL;
+    pScreenPriv->pwinHotKeyAltTab =
+        (winHotKeyAltTabProcPtr) (void (*)(void)) NoopDDA;
+    pScreenPriv->pwinCreatePrimarySurface = winCreatePrimarySurfaceShadowDDNL;
+    pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDDNL;
 #ifdef XWIN_MULTIWINDOW
-  pScreenPriv->pwinFinishCreateWindowsWindow
-    = winFinishCreateWindowsWindowDDNL;
+    pScreenPriv->pwinFinishCreateWindowsWindow
+        = winFinishCreateWindowsWindowDDNL;
 #endif
 
-  return TRUE;
+    return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winshadgdi.c b/xorg-server/hw/xwin/winshadgdi.c
index 6339010b6..3b7b8b5a8 100644
--- a/xorg-server/hw/xwin/winshadgdi.c
+++ b/xorg-server/hw/xwin/winshadgdi.c
@@ -33,424 +33,397 @@
 #endif
 #include "win.h"
 
-
 /*
  * Local function prototypes
  */
 
 #ifdef XWIN_MULTIWINDOW
-static wBOOL CALLBACK
-winRedrawAllProcShadowGDI (HWND hwnd, LPARAM lParam);
+static wBOOL CALLBACK winRedrawAllProcShadowGDI(HWND hwnd, LPARAM lParam);
 
-static wBOOL CALLBACK
-winRedrawDamagedWindowShadowGDI (HWND hwnd, LPARAM lParam);
+static wBOOL CALLBACK winRedrawDamagedWindowShadowGDI(HWND hwnd, LPARAM lParam);
 #endif
 
 static Bool
-winAllocateFBShadowGDI (ScreenPtr pScreen);
+ winAllocateFBShadowGDI(ScreenPtr pScreen);
 
 static void
-winShadowUpdateGDI (ScreenPtr pScreen, 
-		    shadowBufPtr pBuf);
+ winShadowUpdateGDI(ScreenPtr pScreen, shadowBufPtr pBuf);
 
 static Bool
-winCloseScreenShadowGDI (int nIndex, ScreenPtr pScreen);
+ winCloseScreenShadowGDI(int nIndex, ScreenPtr pScreen);
 
 static Bool
-winInitVisualsShadowGDI (ScreenPtr pScreen);
+ winInitVisualsShadowGDI(ScreenPtr pScreen);
 
 static Bool
-winAdjustVideoModeShadowGDI (ScreenPtr pScreen);
+ winAdjustVideoModeShadowGDI(ScreenPtr pScreen);
 
 static Bool
-winBltExposedRegionsShadowGDI (ScreenPtr pScreen);
+ winBltExposedRegionsShadowGDI(ScreenPtr pScreen);
 
 static Bool
-winActivateAppShadowGDI (ScreenPtr pScreen);
+ winActivateAppShadowGDI(ScreenPtr pScreen);
 
 static Bool
-winRedrawScreenShadowGDI (ScreenPtr pScreen);
+ winRedrawScreenShadowGDI(ScreenPtr pScreen);
 
 static Bool
-winRealizeInstalledPaletteShadowGDI (ScreenPtr pScreen);
+ winRealizeInstalledPaletteShadowGDI(ScreenPtr pScreen);
 
 static Bool
-winInstallColormapShadowGDI (ColormapPtr pColormap);
+ winInstallColormapShadowGDI(ColormapPtr pColormap);
 
 static Bool
-winStoreColorsShadowGDI (ColormapPtr pmap, 
-			 int ndef,
-			 xColorItem *pdefs);
+ winStoreColorsShadowGDI(ColormapPtr pmap, int ndef, xColorItem * pdefs);
 
 static Bool
-winCreateColormapShadowGDI (ColormapPtr pColormap);
+ winCreateColormapShadowGDI(ColormapPtr pColormap);
 
 static Bool
-winDestroyColormapShadowGDI (ColormapPtr pColormap);
-
+ winDestroyColormapShadowGDI(ColormapPtr pColormap);
 
 /*
  * Internal function to get the DIB format that is compatible with the screen
  */
 
 static
-Bool
-winQueryScreenDIBFormat (ScreenPtr pScreen, BITMAPINFOHEADER *pbmih)
+    Bool
+winQueryScreenDIBFormat(ScreenPtr pScreen, BITMAPINFOHEADER * pbmih)
 {
-  winScreenPriv(pScreen);
-  HBITMAP		hbmp;
+    winScreenPriv(pScreen);
+    HBITMAP hbmp;
+
 #if CYGDEBUG
-  LPDWORD		pdw = NULL;
+    LPDWORD pdw = NULL;
 #endif
-  
-  /* Create a memory bitmap compatible with the screen */
-  hbmp = CreateCompatibleBitmap (pScreenPriv->hdcScreen, 1, 1);
-  if (hbmp == NULL)
-    {
-      ErrorF ("winQueryScreenDIBFormat - CreateCompatibleBitmap failed\n");
-      return FALSE;
+
+    /* Create a memory bitmap compatible with the screen */
+    hbmp = CreateCompatibleBitmap(pScreenPriv->hdcScreen, 1, 1);
+    if (hbmp == NULL) {
+        ErrorF("winQueryScreenDIBFormat - CreateCompatibleBitmap failed\n");
+        return FALSE;
     }
-  
-  /* Initialize our bitmap info header */
-  ZeroMemory (pbmih, sizeof (BITMAPINFOHEADER) + 256 * sizeof (RGBQUAD));
-  pbmih->biSize = sizeof (BITMAPINFOHEADER);
-
-  /* Get the biBitCount */
-  if (!GetDIBits (pScreenPriv->hdcScreen,
-		  hbmp,
-		  0, 1,
-		  NULL,
-		  (BITMAPINFO*) pbmih,
-		  DIB_RGB_COLORS))
-    {
-      ErrorF ("winQueryScreenDIBFormat - First call to GetDIBits failed\n");
-      DeleteObject (hbmp);
-      return FALSE;
+
+    /* Initialize our bitmap info header */
+    ZeroMemory(pbmih, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD));
+    pbmih->biSize = sizeof(BITMAPINFOHEADER);
+
+    /* Get the biBitCount */
+    if (!GetDIBits(pScreenPriv->hdcScreen,
+                   hbmp, 0, 1, NULL, (BITMAPINFO *) pbmih, DIB_RGB_COLORS)) {
+        ErrorF("winQueryScreenDIBFormat - First call to GetDIBits failed\n");
+        DeleteObject(hbmp);
+        return FALSE;
     }
 
 #if CYGDEBUG
-  /* Get a pointer to bitfields */
-  pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));
+    /* Get a pointer to bitfields */
+    pdw = (DWORD *) ((CARD8 *) pbmih + sizeof(BITMAPINFOHEADER));
 
-  winDebug ("winQueryScreenDIBFormat - First call masks: %08x %08x %08x\n",
-	  pdw[0], pdw[1], pdw[2]);
+    winDebug("winQueryScreenDIBFormat - First call masks: %08x %08x %08x\n",
+             pdw[0], pdw[1], pdw[2]);
 #endif
 
-  /* Get optimal color table, or the optimal bitfields */
-  if (!GetDIBits (pScreenPriv->hdcScreen,
-		  hbmp,
-		  0, 1,
-		  NULL,
-		  (BITMAPINFO*)pbmih,
-		  DIB_RGB_COLORS))
-    {
-      ErrorF ("winQueryScreenDIBFormat - Second call to GetDIBits "
-	      "failed\n");
-      DeleteObject (hbmp);
-      return FALSE;
+    /* Get optimal color table, or the optimal bitfields */
+    if (!GetDIBits(pScreenPriv->hdcScreen,
+                   hbmp, 0, 1, NULL, (BITMAPINFO *) pbmih, DIB_RGB_COLORS)) {
+        ErrorF("winQueryScreenDIBFormat - Second call to GetDIBits "
+               "failed\n");
+        DeleteObject(hbmp);
+        return FALSE;
     }
 
-  /* Free memory */
-  DeleteObject (hbmp);
-  
-  return TRUE;
-}
+    /* Free memory */
+    DeleteObject(hbmp);
 
+    return TRUE;
+}
 
 /*
  * Internal function to determine the GDI bits per rgb and bit masks
  */
 
 static
-Bool
-winQueryRGBBitsAndMasks (ScreenPtr pScreen)
+    Bool
+winQueryRGBBitsAndMasks(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  BITMAPINFOHEADER	*pbmih = NULL;
-  Bool			fReturn = TRUE;
-  LPDWORD		pdw = NULL;
-  DWORD			dwRedBits, dwGreenBits, dwBlueBits;
-
-  /* Color masks for 8 bpp are standardized */
-  if (GetDeviceCaps (pScreenPriv->hdcScreen, RASTERCAPS) & RC_PALETTE)
-    {
-      /* 
-       * RGB BPP for 8 bit palletes is always 8
-       * and the color masks are always 0.
-       */
-      pScreenPriv->dwBitsPerRGB = 8;
-      pScreenPriv->dwRedMask = 0x0L;
-      pScreenPriv->dwGreenMask = 0x0L;
-      pScreenPriv->dwBlueMask = 0x0L;
-      return TRUE;
+    winScreenPriv(pScreen);
+    BITMAPINFOHEADER *pbmih = NULL;
+    Bool fReturn = TRUE;
+    LPDWORD pdw = NULL;
+    DWORD dwRedBits, dwGreenBits, dwBlueBits;
+
+    /* Color masks for 8 bpp are standardized */
+    if (GetDeviceCaps(pScreenPriv->hdcScreen, RASTERCAPS) & RC_PALETTE) {
+        /* 
+         * RGB BPP for 8 bit palletes is always 8
+         * and the color masks are always 0.
+         */
+        pScreenPriv->dwBitsPerRGB = 8;
+        pScreenPriv->dwRedMask = 0x0L;
+        pScreenPriv->dwGreenMask = 0x0L;
+        pScreenPriv->dwBlueMask = 0x0L;
+        return TRUE;
     }
 
-  /* Color masks for 24 bpp are standardized */
-  if (GetDeviceCaps (pScreenPriv->hdcScreen, PLANES)
-      * GetDeviceCaps (pScreenPriv->hdcScreen, BITSPIXEL) == 24)
-    {
-      ErrorF ("winQueryRGBBitsAndMasks - GetDeviceCaps (BITSPIXEL) "
-	      "returned 24 for the screen.  Using default 24bpp masks.\n");
-
-      /* 8 bits per primary color */
-      pScreenPriv->dwBitsPerRGB = 8;
-
-      /* Set screen privates masks */
-      pScreenPriv->dwRedMask = WIN_24BPP_MASK_RED;
-      pScreenPriv->dwGreenMask = WIN_24BPP_MASK_GREEN;
-      pScreenPriv->dwBlueMask = WIN_24BPP_MASK_BLUE;
-      
-      return TRUE;
+    /* Color masks for 24 bpp are standardized */
+    if (GetDeviceCaps(pScreenPriv->hdcScreen, PLANES)
+        * GetDeviceCaps(pScreenPriv->hdcScreen, BITSPIXEL) == 24) {
+        ErrorF("winQueryRGBBitsAndMasks - GetDeviceCaps (BITSPIXEL) "
+               "returned 24 for the screen.  Using default 24bpp masks.\n");
+
+        /* 8 bits per primary color */
+        pScreenPriv->dwBitsPerRGB = 8;
+
+        /* Set screen privates masks */
+        pScreenPriv->dwRedMask = WIN_24BPP_MASK_RED;
+        pScreenPriv->dwGreenMask = WIN_24BPP_MASK_GREEN;
+        pScreenPriv->dwBlueMask = WIN_24BPP_MASK_BLUE;
+
+        return TRUE;
     }
 
-  /* Allocate a bitmap header and color table */
-  pbmih = (BITMAPINFOHEADER*) malloc (sizeof (BITMAPINFOHEADER)
-				      + 256  * sizeof (RGBQUAD));
-  if (pbmih == NULL)
-    {
-      ErrorF ("winQueryRGBBitsAndMasks - malloc failed\n");
-      return FALSE;
+    /* Allocate a bitmap header and color table */
+    pbmih = (BITMAPINFOHEADER *) malloc(sizeof(BITMAPINFOHEADER)
+                                        + 256 * sizeof(RGBQUAD));
+    if (pbmih == NULL) {
+        ErrorF("winQueryRGBBitsAndMasks - malloc failed\n");
+        return FALSE;
     }
 
-  /* Get screen description */
-  if (winQueryScreenDIBFormat (pScreen, pbmih))
-    {
-      /* Get a pointer to bitfields */
-      pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));
-      
+    /* Get screen description */
+    if (winQueryScreenDIBFormat(pScreen, pbmih)) {
+        /* Get a pointer to bitfields */
+        pdw = (DWORD *) ((CARD8 *) pbmih + sizeof(BITMAPINFOHEADER));
+
 #if CYGDEBUG
-      winDebug ("%s - Masks: %08x %08x %08x\n", __FUNCTION__,
-	      pdw[0], pdw[1], pdw[2]);
-      winDebug ("%s - Bitmap: %dx%d %d bpp %d planes\n", __FUNCTION__,
-              pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount, pbmih->biPlanes);
-      winDebug ("%s - Compression: %d %s\n", __FUNCTION__,
-              pbmih->biCompression,
-              (pbmih->biCompression == BI_RGB?"(BI_RGB)":
-               (pbmih->biCompression == BI_RLE8?"(BI_RLE8)":
-                (pbmih->biCompression == BI_RLE4?"(BI_RLE4)":
-                 (pbmih->biCompression == BI_BITFIELDS?"(BI_BITFIELDS)":""
-                 )))));
+        winDebug("%s - Masks: %08x %08x %08x\n", __FUNCTION__,
+                 pdw[0], pdw[1], pdw[2]);
+        winDebug("%s - Bitmap: %dx%d %d bpp %d planes\n", __FUNCTION__,
+                 pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount,
+                 pbmih->biPlanes);
+        winDebug("%s - Compression: %d %s\n", __FUNCTION__,
+                 pbmih->biCompression,
+                 (pbmih->biCompression ==
+                  BI_RGB ? "(BI_RGB)" : (pbmih->biCompression ==
+                                         BI_RLE8 ? "(BI_RLE8)" : (pbmih->
+                                                                  biCompression
+                                                                  ==
+                                                                  BI_RLE4 ?
+                                                                  "(BI_RLE4)"
+                                                                  : (pbmih->
+                                                                     biCompression
+                                                                     ==
+                                                                     BI_BITFIELDS
+                                                                     ?
+                                                                     "(BI_BITFIELDS)"
+                                                                     : "")))));
 #endif
 
-      /* Handle BI_RGB case, which is returned by Wine */
-      if (pbmih->biCompression == BI_RGB)
-        {
-	  dwRedBits = 5;
-	  dwGreenBits = 5;
-	  dwBlueBits = 5;
-	  
-	  pScreenPriv->dwBitsPerRGB = 5;
-	  
-	  /* Set screen privates masks */
-	  pScreenPriv->dwRedMask = 0x7c00;
-	  pScreenPriv->dwGreenMask = 0x03e0;
-	  pScreenPriv->dwBlueMask = 0x001f;
+        /* Handle BI_RGB case, which is returned by Wine */
+        if (pbmih->biCompression == BI_RGB) {
+            dwRedBits = 5;
+            dwGreenBits = 5;
+            dwBlueBits = 5;
+
+            pScreenPriv->dwBitsPerRGB = 5;
+
+            /* Set screen privates masks */
+            pScreenPriv->dwRedMask = 0x7c00;
+            pScreenPriv->dwGreenMask = 0x03e0;
+            pScreenPriv->dwBlueMask = 0x001f;
+        }
+        else {
+            /* Count the number of bits in each mask */
+            dwRedBits = winCountBits(pdw[0]);
+            dwGreenBits = winCountBits(pdw[1]);
+            dwBlueBits = winCountBits(pdw[2]);
+
+            /* Find maximum bits per red, green, blue */
+            if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
+                pScreenPriv->dwBitsPerRGB = dwRedBits;
+            else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
+                pScreenPriv->dwBitsPerRGB = dwGreenBits;
+            else
+                pScreenPriv->dwBitsPerRGB = dwBlueBits;
+
+            /* Set screen privates masks */
+            pScreenPriv->dwRedMask = pdw[0];
+            pScreenPriv->dwGreenMask = pdw[1];
+            pScreenPriv->dwBlueMask = pdw[2];
         }
-      else 
-        {
-          /* Count the number of bits in each mask */
-          dwRedBits = winCountBits (pdw[0]);
-          dwGreenBits = winCountBits (pdw[1]);
-          dwBlueBits = winCountBits (pdw[2]);
-
-	  /* Find maximum bits per red, green, blue */
-	  if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
-	    pScreenPriv->dwBitsPerRGB = dwRedBits;
-	  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
-	    pScreenPriv->dwBitsPerRGB = dwGreenBits;
-	  else
-	    pScreenPriv->dwBitsPerRGB = dwBlueBits;
-
-	  /* Set screen privates masks */
-	  pScreenPriv->dwRedMask = pdw[0];
-	  pScreenPriv->dwGreenMask = pdw[1];
-	  pScreenPriv->dwBlueMask = pdw[2];
-	}
     }
-  else
-    {
-      ErrorF ("winQueryRGBBitsAndMasks - winQueryScreenDIBFormat failed\n");
-      fReturn = FALSE;
+    else {
+        ErrorF("winQueryRGBBitsAndMasks - winQueryScreenDIBFormat failed\n");
+        fReturn = FALSE;
     }
 
-  /* Free memory */
-  free (pbmih);
+    /* Free memory */
+    free(pbmih);
 
-  return fReturn;
+    return fReturn;
 }
 
-
 #ifdef XWIN_MULTIWINDOW
 /*
  * Redraw all ---?
  */
 
 static wBOOL CALLBACK
-winRedrawAllProcShadowGDI (HWND hwnd, LPARAM lParam)
+winRedrawAllProcShadowGDI(HWND hwnd, LPARAM lParam)
 {
-  if (hwnd == (HWND)lParam)
-    return TRUE;  
-  InvalidateRect (hwnd, NULL, FALSE);
-  UpdateWindow (hwnd);
-  return TRUE;
+    if (hwnd == (HWND) lParam)
+        return TRUE;
+    InvalidateRect(hwnd, NULL, FALSE);
+    UpdateWindow(hwnd);
+    return TRUE;
 }
 
 static wBOOL CALLBACK
-winRedrawDamagedWindowShadowGDI (HWND hwnd, LPARAM lParam)
+winRedrawDamagedWindowShadowGDI(HWND hwnd, LPARAM lParam)
 {
-  BoxPtr pDamage = (BoxPtr)lParam;
-  RECT rcClient, rcDamage, rcRedraw;
-  POINT topLeft, bottomRight;
-  
-  if (IsIconic (hwnd))
-    return TRUE; /* Don't care minimized windows */
-  
-  /* Convert the damaged area from Screen coords to Client coords */
-  topLeft.x = pDamage->x1; topLeft.y = pDamage->y1;
-  bottomRight.x = pDamage->x2; bottomRight.y = pDamage->y2;
-  topLeft.x += GetSystemMetrics (SM_XVIRTUALSCREEN);
-  bottomRight.x += GetSystemMetrics (SM_XVIRTUALSCREEN);
-  topLeft.y += GetSystemMetrics (SM_YVIRTUALSCREEN);
-  bottomRight.y += GetSystemMetrics (SM_YVIRTUALSCREEN);
-  ScreenToClient (hwnd, &topLeft);
-  ScreenToClient (hwnd, &bottomRight);
-  SetRect (&rcDamage, topLeft.x, topLeft.y, bottomRight.x, bottomRight.y);
-
-  GetClientRect (hwnd, &rcClient);
-
-  if (IntersectRect (&rcRedraw, &rcClient, &rcDamage))
-    {
-      InvalidateRect (hwnd, &rcRedraw, FALSE);
-      UpdateWindow (hwnd);
+    BoxPtr pDamage = (BoxPtr) lParam;
+    RECT rcClient, rcDamage, rcRedraw;
+    POINT topLeft, bottomRight;
+
+    if (IsIconic(hwnd))
+        return TRUE;            /* Don't care minimized windows */
+
+    /* Convert the damaged area from Screen coords to Client coords */
+    topLeft.x = pDamage->x1;
+    topLeft.y = pDamage->y1;
+    bottomRight.x = pDamage->x2;
+    bottomRight.y = pDamage->y2;
+    topLeft.x += GetSystemMetrics(SM_XVIRTUALSCREEN);
+    bottomRight.x += GetSystemMetrics(SM_XVIRTUALSCREEN);
+    topLeft.y += GetSystemMetrics(SM_YVIRTUALSCREEN);
+    bottomRight.y += GetSystemMetrics(SM_YVIRTUALSCREEN);
+    ScreenToClient(hwnd, &topLeft);
+    ScreenToClient(hwnd, &bottomRight);
+    SetRect(&rcDamage, topLeft.x, topLeft.y, bottomRight.x, bottomRight.y);
+
+    GetClientRect(hwnd, &rcClient);
+
+    if (IntersectRect(&rcRedraw, &rcClient, &rcDamage)) {
+        InvalidateRect(hwnd, &rcRedraw, FALSE);
+        UpdateWindow(hwnd);
     }
-  return TRUE;
+    return TRUE;
 }
 #endif
 
-
 /*
  * Allocate a DIB for the shadow framebuffer GDI server
  */
 
 static Bool
-winAllocateFBShadowGDI (ScreenPtr pScreen)
+winAllocateFBShadowGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  DIBSECTION		dibsection;
-  Bool			fReturn = TRUE;
-
-  /* Describe shadow bitmap to be created */
-  pScreenPriv->pbmih->biWidth = pScreenInfo->dwWidth;
-  pScreenPriv->pbmih->biHeight = -pScreenInfo->dwHeight;
-
-  ErrorF ("winAllocateFBShadowGDI - Creating DIB with width: %d height: %d "
-	  "depth: %d\n",
-	  (int) pScreenPriv->pbmih->biWidth, (int) -pScreenPriv->pbmih->biHeight, pScreenPriv->pbmih->biBitCount);
-
-  /* Create a DI shadow bitmap with a bit pointer */
-  pScreenPriv->hbmpShadow = CreateDIBSection (pScreenPriv->hdcScreen,
-					      (BITMAPINFO *) pScreenPriv->pbmih,
-					      DIB_RGB_COLORS,
-					      (VOID**) &pScreenInfo->pfb,
-					      NULL,
-					      0);
-  if (pScreenPriv->hbmpShadow == NULL || pScreenInfo->pfb == NULL)
-    {
-      winW32Error (2, "winAllocateFBShadowGDI - CreateDIBSection failed:");
-      return FALSE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    DIBSECTION dibsection;
+    Bool fReturn = TRUE;
+
+    /* Describe shadow bitmap to be created */
+    pScreenPriv->pbmih->biWidth = pScreenInfo->dwWidth;
+    pScreenPriv->pbmih->biHeight = -pScreenInfo->dwHeight;
+
+    ErrorF("winAllocateFBShadowGDI - Creating DIB with width: %d height: %d "
+           "depth: %d\n",
+           (int) pScreenPriv->pbmih->biWidth,
+           (int) -pScreenPriv->pbmih->biHeight, pScreenPriv->pbmih->biBitCount);
+
+    /* Create a DI shadow bitmap with a bit pointer */
+    pScreenPriv->hbmpShadow = CreateDIBSection(pScreenPriv->hdcScreen,
+                                               (BITMAPINFO *) pScreenPriv->
+                                               pbmih, DIB_RGB_COLORS,
+                                               (VOID **) & pScreenInfo->pfb,
+                                               NULL, 0);
+    if (pScreenPriv->hbmpShadow == NULL || pScreenInfo->pfb == NULL) {
+        winW32Error(2, "winAllocateFBShadowGDI - CreateDIBSection failed:");
+        return FALSE;
     }
-  else
-    {
+    else {
 #if CYGDEBUG
-      winDebug ("winAllocateFBShadowGDI - Shadow buffer allocated\n");
+        winDebug("winAllocateFBShadowGDI - Shadow buffer allocated\n");
 #endif
     }
 
-  /* Get information about the bitmap that was allocated */
-  GetObject (pScreenPriv->hbmpShadow,
-	     sizeof (dibsection),
-	     &dibsection);
+    /* Get information about the bitmap that was allocated */
+    GetObject(pScreenPriv->hbmpShadow, sizeof(dibsection), &dibsection);
 
 #if CYGDEBUG || YES
-  /* Print information about bitmap allocated */
-  winDebug ("winAllocateFBShadowGDI - Dibsection width: %d height: %d "
-	  "depth: %d size image: %d\n",
-	  (int) dibsection.dsBmih.biWidth, (int) dibsection.dsBmih.biHeight,
-	  dibsection.dsBmih.biBitCount,
-	  (int) dibsection.dsBmih.biSizeImage);
+    /* Print information about bitmap allocated */
+    winDebug("winAllocateFBShadowGDI - Dibsection width: %d height: %d "
+             "depth: %d size image: %d\n",
+             (int) dibsection.dsBmih.biWidth, (int) dibsection.dsBmih.biHeight,
+             dibsection.dsBmih.biBitCount, (int) dibsection.dsBmih.biSizeImage);
 #endif
 
-  /* Select the shadow bitmap into the shadow DC */
-  SelectObject (pScreenPriv->hdcShadow,
-		pScreenPriv->hbmpShadow);
+    /* Select the shadow bitmap into the shadow DC */
+    SelectObject(pScreenPriv->hdcShadow, pScreenPriv->hbmpShadow);
 
 #if CYGDEBUG
-  winDebug ("winAllocateFBShadowGDI - Attempting a shadow blit\n");
+    winDebug("winAllocateFBShadowGDI - Attempting a shadow blit\n");
 #endif
 
-  /* Do a test blit from the shadow to the screen, I think */
-  fReturn = BitBlt (pScreenPriv->hdcScreen,
-		    0, 0,
-		    pScreenInfo->dwWidth, pScreenInfo->dwHeight,
-		    pScreenPriv->hdcShadow,
-		    0, 0,
-		    SRCCOPY);
-  if (fReturn)
-    {
+    /* Do a test blit from the shadow to the screen, I think */
+    fReturn = BitBlt(pScreenPriv->hdcScreen,
+                     0, 0,
+                     pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+                     pScreenPriv->hdcShadow, 0, 0, SRCCOPY);
+    if (fReturn) {
 #if CYGDEBUG
-      winDebug ("winAllocateFBShadowGDI - Shadow blit success\n");
+        winDebug("winAllocateFBShadowGDI - Shadow blit success\n");
 #endif
     }
-  else
-    {
-      winW32Error (2, "winAllocateFBShadowGDI - Shadow blit failure\n");
-#if 0      
-      return FALSE;
-#else 
-      /* ago: ignore this error. The blit fails with wine, but does not 
-       * cause any problems later. */
-
-      fReturn = TRUE;
-#endif      
+    else {
+        winW32Error(2, "winAllocateFBShadowGDI - Shadow blit failure\n");
+#if 0
+        return FALSE;
+#else
+        /* ago: ignore this error. The blit fails with wine, but does not 
+         * cause any problems later. */
+
+        fReturn = TRUE;
+#endif
     }
 
-  /* Look for height weirdness */
-  if (dibsection.dsBmih.biHeight < 0)
-    {
-      dibsection.dsBmih.biHeight = -dibsection.dsBmih.biHeight;
+    /* Look for height weirdness */
+    if (dibsection.dsBmih.biHeight < 0) {
+        dibsection.dsBmih.biHeight = -dibsection.dsBmih.biHeight;
     }
 
-  /* Set screeninfo stride */
-  pScreenInfo->dwStride = ((dibsection.dsBmih.biSizeImage
-			    / dibsection.dsBmih.biHeight)
-			   * 8) / pScreenInfo->dwBPP;
+    /* Set screeninfo stride */
+    pScreenInfo->dwStride = ((dibsection.dsBmih.biSizeImage
+                              / dibsection.dsBmih.biHeight)
+                             * 8) / pScreenInfo->dwBPP;
 
 #if CYGDEBUG || YES
-  winDebug ("winAllocateFBShadowGDI - Created shadow stride: %d\n",
-	  (int) pScreenInfo->dwStride);
+    winDebug("winAllocateFBShadowGDI - Created shadow stride: %d\n",
+             (int) pScreenInfo->dwStride);
 #endif
 
 #ifdef XWIN_MULTIWINDOW
-  /* Redraw all windows */
-  if (pScreenInfo->fMultiWindow)
-    EnumThreadWindows (g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);
+    /* Redraw all windows */
+    if (pScreenInfo->fMultiWindow)
+        EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);
 #endif
 
-  return fReturn;
+    return fReturn;
 }
 
 static void
-winFreeFBShadowGDI (ScreenPtr pScreen)
+winFreeFBShadowGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
 
-  /* Free the shadow bitmap */
-  DeleteObject (pScreenPriv->hbmpShadow);
+    /* Free the shadow bitmap */
+    DeleteObject(pScreenPriv->hbmpShadow);
 
-  /* Invalidate the ScreenInfo's fb pointer */
-  pScreenInfo->pfb = NULL;
+    /* Invalidate the ScreenInfo's fb pointer */
+    pScreenInfo->pfb = NULL;
 }
 
 /*
@@ -458,158 +431,145 @@ winFreeFBShadowGDI (ScreenPtr pScreen)
  */
 
 static void
-winShadowUpdateGDI (ScreenPtr pScreen, 
-		    shadowBufPtr pBuf)
+winShadowUpdateGDI(ScreenPtr pScreen, shadowBufPtr pBuf)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  RegionPtr		damage = shadowDamage(pBuf);
-  DWORD			dwBox = RegionNumRects (damage);
-  BoxPtr		pBox = RegionRects (damage);
-  int			x, y, w, h;
-  HRGN			hrgnTemp = NULL, hrgnCombined = NULL;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    RegionPtr damage = shadowDamage(pBuf);
+    DWORD dwBox = RegionNumRects(damage);
+    BoxPtr pBox = RegionRects(damage);
+    int x, y, w, h;
+    HRGN hrgnTemp = NULL, hrgnCombined = NULL;
+
 #ifdef XWIN_UPDATESTATS
-  static DWORD		s_dwNonUnitRegions = 0;
-  static DWORD		s_dwTotalUpdates = 0;
-  static DWORD		s_dwTotalBoxes = 0;
+    static DWORD s_dwNonUnitRegions = 0;
+    static DWORD s_dwTotalUpdates = 0;
+    static DWORD s_dwTotalBoxes = 0;
 #endif
-  BoxPtr		pBoxExtents = RegionExtents(damage);
+    BoxPtr pBoxExtents = RegionExtents(damage);
 
-  /*
-   * Return immediately if the app is not active
-   * and we are fullscreen, or if we have a bad display depth
-   */
-  if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)
-      || pScreenPriv->fBadDepth) return;
+    /*
+     * Return immediately if the app is not active
+     * and we are fullscreen, or if we have a bad display depth
+     */
+    if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)
+        || pScreenPriv->fBadDepth)
+        return;
 
 #ifdef XWIN_UPDATESTATS
-  ++s_dwTotalUpdates;
-  s_dwTotalBoxes += dwBox;
+    ++s_dwTotalUpdates;
+    s_dwTotalBoxes += dwBox;
 
-  if (dwBox != 1)
-    {
-      ++s_dwNonUnitRegions;
-      ErrorF ("winShadowUpdatGDI - dwBox: %d\n", dwBox);
+    if (dwBox != 1) {
+        ++s_dwNonUnitRegions;
+        ErrorF("winShadowUpdatGDI - dwBox: %d\n", dwBox);
     }
-  
-  if ((s_dwTotalUpdates % 100) == 0)
-    ErrorF ("winShadowUpdateGDI - %d%% non-unity regions, avg boxes: %d "
-	    "nu: %d tu: %d\n",
-	    (s_dwNonUnitRegions * 100) / s_dwTotalUpdates,
-	    s_dwTotalBoxes / s_dwTotalUpdates,
-	    s_dwNonUnitRegions, s_dwTotalUpdates);
-#endif /* XWIN_UPDATESTATS */
-
-  /*
-   * Handle small regions with multiple blits,
-   * handle large regions by creating a clipping region and 
-   * doing a single blit constrained to that clipping region.
-   */
-  if (!pScreenInfo->fMultiWindow &&
-      (pScreenInfo->dwClipUpdatesNBoxes == 0 ||
-      dwBox < pScreenInfo->dwClipUpdatesNBoxes))
-    {
-      /* Loop through all boxes in the damaged region */
-      while (dwBox--)
-	{
-	  /*
-	   * Calculate x offset, y offset, width, and height for
-	   * current damage box
-	   */
-	  x = pBox->x1;
-	  y = pBox->y1;
-	  w = pBox->x2 - pBox->x1;
-	  h = pBox->y2 - pBox->y1;
-	  
-	  BitBlt (pScreenPriv->hdcScreen,
-		  x, y,
-		  w, h,
-		  pScreenPriv->hdcShadow,
-		  x, y,
-		  SRCCOPY);
-	  
-	  /* Get a pointer to the next box */
-	  ++pBox;
-	}
+
+    if ((s_dwTotalUpdates % 100) == 0)
+        ErrorF("winShadowUpdateGDI - %d%% non-unity regions, avg boxes: %d "
+               "nu: %d tu: %d\n",
+               (s_dwNonUnitRegions * 100) / s_dwTotalUpdates,
+               s_dwTotalBoxes / s_dwTotalUpdates,
+               s_dwNonUnitRegions, s_dwTotalUpdates);
+#endif                          /* XWIN_UPDATESTATS */
+
+    /*
+     * Handle small regions with multiple blits,
+     * handle large regions by creating a clipping region and 
+     * doing a single blit constrained to that clipping region.
+     */
+    if (!pScreenInfo->fMultiWindow &&
+        (pScreenInfo->dwClipUpdatesNBoxes == 0 ||
+         dwBox < pScreenInfo->dwClipUpdatesNBoxes)) {
+        /* Loop through all boxes in the damaged region */
+        while (dwBox--) {
+            /*
+             * Calculate x offset, y offset, width, and height for
+             * current damage box
+             */
+            x = pBox->x1;
+            y = pBox->y1;
+            w = pBox->x2 - pBox->x1;
+            h = pBox->y2 - pBox->y1;
+
+            BitBlt(pScreenPriv->hdcScreen,
+                   x, y, w, h, pScreenPriv->hdcShadow, x, y, SRCCOPY);
+
+            /* Get a pointer to the next box */
+            ++pBox;
+        }
     }
-  else if (!pScreenInfo->fMultiWindow)
-    {
-      /* Compute a GDI region from the damaged region */
-      hrgnCombined = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
-      dwBox--;
-      pBox++;
-      while (dwBox--)
-	{
-	  hrgnTemp = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
-	  CombineRgn (hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);
-	  DeleteObject (hrgnTemp);
-	  pBox++;
-	}
-      
-      /* Install the GDI region as a clipping region */
-      SelectClipRgn (pScreenPriv->hdcScreen, hrgnCombined);
-      DeleteObject (hrgnCombined);
-      hrgnCombined = NULL;
-      
-      /*
-       * Blit the shadow buffer to the screen,
-       * constrained to the clipping region.
-       */
-      BitBlt (pScreenPriv->hdcScreen,
-	      pBoxExtents->x1, pBoxExtents->y1,
-	      pBoxExtents->x2 - pBoxExtents->x1,
-	      pBoxExtents->y2 - pBoxExtents->y1,
-	      pScreenPriv->hdcShadow,
-	      pBoxExtents->x1, pBoxExtents->y1,
-	      SRCCOPY);
-
-      /* Reset the clip region */
-      SelectClipRgn (pScreenPriv->hdcScreen, NULL);
+    else if (!pScreenInfo->fMultiWindow) {
+        /* Compute a GDI region from the damaged region */
+        hrgnCombined = CreateRectRgn(pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+        dwBox--;
+        pBox++;
+        while (dwBox--) {
+            hrgnTemp = CreateRectRgn(pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+            CombineRgn(hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);
+            DeleteObject(hrgnTemp);
+            pBox++;
+        }
+
+        /* Install the GDI region as a clipping region */
+        SelectClipRgn(pScreenPriv->hdcScreen, hrgnCombined);
+        DeleteObject(hrgnCombined);
+        hrgnCombined = NULL;
+
+        /*
+         * Blit the shadow buffer to the screen,
+         * constrained to the clipping region.
+         */
+        BitBlt(pScreenPriv->hdcScreen,
+               pBoxExtents->x1, pBoxExtents->y1,
+               pBoxExtents->x2 - pBoxExtents->x1,
+               pBoxExtents->y2 - pBoxExtents->y1,
+               pScreenPriv->hdcShadow,
+               pBoxExtents->x1, pBoxExtents->y1, SRCCOPY);
+
+        /* Reset the clip region */
+        SelectClipRgn(pScreenPriv->hdcScreen, NULL);
     }
 
 #ifdef XWIN_MULTIWINDOW
-  /* Redraw all multiwindow windows */
-  if (pScreenInfo->fMultiWindow)
-    EnumThreadWindows (g_dwCurrentThreadID,
-		       winRedrawDamagedWindowShadowGDI,
-		       (LPARAM)pBoxExtents);
+    /* Redraw all multiwindow windows */
+    if (pScreenInfo->fMultiWindow)
+        EnumThreadWindows(g_dwCurrentThreadID,
+                          winRedrawDamagedWindowShadowGDI,
+                          (LPARAM) pBoxExtents);
 #endif
 }
 
-
 static Bool
-winInitScreenShadowGDI (ScreenPtr pScreen)
+winInitScreenShadowGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-
-  /* Get device contexts for the screen and shadow bitmap */
-  pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen);
-  pScreenPriv->hdcShadow = CreateCompatibleDC (pScreenPriv->hdcScreen);
-
-  /* Allocate bitmap info header */
-  pScreenPriv->pbmih = (BITMAPINFOHEADER*) malloc (sizeof (BITMAPINFOHEADER)
-                                                   + 256 * sizeof (RGBQUAD));
-  if (pScreenPriv->pbmih == NULL)
-    {
-      ErrorF ("winInitScreenShadowGDI - malloc () failed\n");
-      return FALSE;
+    winScreenPriv(pScreen);
+
+    /* Get device contexts for the screen and shadow bitmap */
+    pScreenPriv->hdcScreen = GetDC(pScreenPriv->hwndScreen);
+    pScreenPriv->hdcShadow = CreateCompatibleDC(pScreenPriv->hdcScreen);
+
+    /* Allocate bitmap info header */
+    pScreenPriv->pbmih = (BITMAPINFOHEADER *) malloc(sizeof(BITMAPINFOHEADER)
+                                                     + 256 * sizeof(RGBQUAD));
+    if (pScreenPriv->pbmih == NULL) {
+        ErrorF("winInitScreenShadowGDI - malloc () failed\n");
+        return FALSE;
     }
 
-  /* Query the screen format */
-  if (!winQueryScreenDIBFormat (pScreen, pScreenPriv->pbmih))
-    {
-      ErrorF ("winInitScreenShadowGDI - winQueryScreenDIBFormat failed\n");
-      return FALSE;
+    /* Query the screen format */
+    if (!winQueryScreenDIBFormat(pScreen, pScreenPriv->pbmih)) {
+        ErrorF("winInitScreenShadowGDI - winQueryScreenDIBFormat failed\n");
+        return FALSE;
     }
 
-  /* Determine our color masks */
-  if (!winQueryRGBBitsAndMasks (pScreen))
-    {
-      ErrorF ("winInitScreenShadowGDI - winQueryRGBBitsAndMasks failed\n");
-      return FALSE;
+    /* Determine our color masks */
+    if (!winQueryRGBBitsAndMasks(pScreen)) {
+        ErrorF("winInitScreenShadowGDI - winQueryRGBBitsAndMasks failed\n");
+        return FALSE;
     }
 
-  return winAllocateFBShadowGDI(pScreen);
+    return winAllocateFBShadowGDI(pScreen);
 }
 
 /* See Porting Layer Definition - p. 33 */
@@ -619,69 +579,66 @@ winInitScreenShadowGDI (ScreenPtr pScreen)
  */
 
 static Bool
-winCloseScreenShadowGDI (int nIndex, ScreenPtr pScreen)
+winCloseScreenShadowGDI(int nIndex, ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  Bool			fReturn;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    Bool fReturn;
 
 #if CYGDEBUG
-  winDebug ("winCloseScreenShadowGDI - Freeing screen resources\n");
+    winDebug("winCloseScreenShadowGDI - Freeing screen resources\n");
 #endif
 
-  /* Flag that the screen is closed */
-  pScreenPriv->fClosed = TRUE;
-  pScreenPriv->fActive = FALSE;
+    /* Flag that the screen is closed */
+    pScreenPriv->fClosed = TRUE;
+    pScreenPriv->fActive = FALSE;
 
-  /* Call the wrapped CloseScreen procedure */
-  WIN_UNWRAP(CloseScreen);
-  if (pScreen->CloseScreen)
-    fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+    /* Call the wrapped CloseScreen procedure */
+    WIN_UNWRAP(CloseScreen);
+    if (pScreen->CloseScreen)
+        fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
 
-  /* Delete the window property */
-  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);
+    /* Delete the window property */
+    RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);
 
-  /* Free the shadow DC; which allows the bitmap to be freed */
-  DeleteDC (pScreenPriv->hdcShadow);
+    /* Free the shadow DC; which allows the bitmap to be freed */
+    DeleteDC(pScreenPriv->hdcShadow);
 
-  winFreeFBShadowGDI(pScreen);
+    winFreeFBShadowGDI(pScreen);
 
-  /* Free the screen DC */
-  ReleaseDC (pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);
+    /* Free the screen DC */
+    ReleaseDC(pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);
 
-  /* Delete tray icon, if we have one */
-  if (!pScreenInfo->fNoTrayIcon)
-    winDeleteNotifyIcon (pScreenPriv);
+    /* Delete tray icon, if we have one */
+    if (!pScreenInfo->fNoTrayIcon)
+        winDeleteNotifyIcon(pScreenPriv);
 
-  /* Free the exit confirmation dialog box, if it exists */
-  if (g_hDlgExit != NULL)
-    {
-      DestroyWindow (g_hDlgExit);
-      g_hDlgExit = NULL;
+    /* Free the exit confirmation dialog box, if it exists */
+    if (g_hDlgExit != NULL) {
+        DestroyWindow(g_hDlgExit);
+        g_hDlgExit = NULL;
     }
 
-  /* Kill our window */
-  if (pScreenPriv->hwndScreen)
-    {
-      DestroyWindow (pScreenPriv->hwndScreen);
-      pScreenPriv->hwndScreen = NULL;
+    /* Kill our window */
+    if (pScreenPriv->hwndScreen) {
+        DestroyWindow(pScreenPriv->hwndScreen);
+        pScreenPriv->hwndScreen = NULL;
     }
 
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
-  /* Destroy the thread startup mutex */
-  pthread_mutex_destroy (&pScreenPriv->pmServerStarted);
+    /* Destroy the thread startup mutex */
+    pthread_mutex_destroy(&pScreenPriv->pmServerStarted);
 #endif
 
-  /* Invalidate our screeninfo's pointer to the screen */
-  pScreenInfo->pScreen = NULL;
+    /* Invalidate our screeninfo's pointer to the screen */
+    pScreenInfo->pScreen = NULL;
 
-  /* Free the screen privates for this screen */
-  free ((pointer) pScreenPriv);
+    /* Free the screen privates for this screen */
+    free((pointer) pScreenPriv);
 
-  return fReturn;
+    return fReturn;
 }
 
-
 /*
  * Tell mi what sort of visuals we need.
  * 
@@ -691,569 +648,518 @@ winCloseScreenShadowGDI (int nIndex, ScreenPtr pScreen)
  */
 
 static Bool
-winInitVisualsShadowGDI (ScreenPtr pScreen)
+winInitVisualsShadowGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-
-  /* Display debugging information */
-  ErrorF ("winInitVisualsShadowGDI - Masks %08x %08x %08x BPRGB %d d %d "
-	  "bpp %d\n",
-	  (unsigned int) pScreenPriv->dwRedMask,
-	  (unsigned int) pScreenPriv->dwGreenMask,
-	  (unsigned int) pScreenPriv->dwBlueMask,
-	  (int) pScreenPriv->dwBitsPerRGB,
-	  (int) pScreenInfo->dwDepth,
-	  (int) pScreenInfo->dwBPP);
-
-  /* Create a single visual according to the Windows screen depth */
-  switch (pScreenInfo->dwDepth)
-    {
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /* Display debugging information */
+    ErrorF("winInitVisualsShadowGDI - Masks %08x %08x %08x BPRGB %d d %d "
+           "bpp %d\n",
+           (unsigned int) pScreenPriv->dwRedMask,
+           (unsigned int) pScreenPriv->dwGreenMask,
+           (unsigned int) pScreenPriv->dwBlueMask,
+           (int) pScreenPriv->dwBitsPerRGB,
+           (int) pScreenInfo->dwDepth, (int) pScreenInfo->dwBPP);
+
+    /* Create a single visual according to the Windows screen depth */
+    switch (pScreenInfo->dwDepth) {
     case 24:
     case 16:
     case 15:
-      /* Setup the real visual */
-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
-				     TrueColorMask,
-				     pScreenPriv->dwBitsPerRGB,
-				     -1,
-				     pScreenPriv->dwRedMask,
-				     pScreenPriv->dwGreenMask,
-				     pScreenPriv->dwBlueMask))
-	{
-	  ErrorF ("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "
-		  "failed\n");
-	  return FALSE;
-	}
+        /* Setup the real visual */
+        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
+                                      TrueColorMask,
+                                      pScreenPriv->dwBitsPerRGB,
+                                      -1,
+                                      pScreenPriv->dwRedMask,
+                                      pScreenPriv->dwGreenMask,
+                                      pScreenPriv->dwBlueMask)) {
+            ErrorF("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "
+                   "failed\n");
+            return FALSE;
+        }
 
 #ifdef XWIN_EMULATEPSEUDO
-      if (!pScreenInfo->fEmulatePseudo)
-	break;
-
-      /* Setup a pseudocolor visual */
-      if (!miSetVisualTypesAndMasks (8,
-				     PseudoColorMask,
-				     8,
-				     -1,
-				     0,
-				     0,
-				     0))
-	{
-	  ErrorF ("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "
-		  "failed for PseudoColor\n");
-	  return FALSE;
-	}
+        if (!pScreenInfo->fEmulatePseudo)
+            break;
+
+        /* Setup a pseudocolor visual */
+        if (!miSetVisualTypesAndMasks(8, PseudoColorMask, 8, -1, 0, 0, 0)) {
+            ErrorF("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "
+                   "failed for PseudoColor\n");
+            return FALSE;
+        }
 #endif
-      break;
+        break;
 
     case 8:
-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
-				     PseudoColorMask,
-				     pScreenPriv->dwBitsPerRGB,
-				     PseudoColor,
-				     pScreenPriv->dwRedMask,
-				     pScreenPriv->dwGreenMask,
-				     pScreenPriv->dwBlueMask))
-	{
-	  ErrorF ("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "
-		  "failed\n");
-	  return FALSE;
-	}
-      break;
+        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
+                                      PseudoColorMask,
+                                      pScreenPriv->dwBitsPerRGB,
+                                      PseudoColor,
+                                      pScreenPriv->dwRedMask,
+                                      pScreenPriv->dwGreenMask,
+                                      pScreenPriv->dwBlueMask)) {
+            ErrorF("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "
+                   "failed\n");
+            return FALSE;
+        }
+        break;
 
     default:
-      ErrorF ("winInitVisualsShadowGDI - Unknown screen depth\n");
-      return FALSE;
+        ErrorF("winInitVisualsShadowGDI - Unknown screen depth\n");
+        return FALSE;
     }
 
 #if CYGDEBUG
-  winDebug ("winInitVisualsShadowGDI - Returning\n");
+    winDebug("winInitVisualsShadowGDI - Returning\n");
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Adjust the proposed video mode
  */
 
 static Bool
-winAdjustVideoModeShadowGDI (ScreenPtr pScreen)
+winAdjustVideoModeShadowGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  HDC			hdc;
-  DWORD			dwBPP;
-  
-  hdc = GetDC (NULL);
-
-  /* We're in serious trouble if we can't get a DC */
-  if (hdc == NULL)
-    {
-      ErrorF ("winAdjustVideoModeShadowGDI - GetDC () failed\n");
-      return FALSE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HDC hdc;
+    DWORD dwBPP;
+
+    hdc = GetDC(NULL);
+
+    /* We're in serious trouble if we can't get a DC */
+    if (hdc == NULL) {
+        ErrorF("winAdjustVideoModeShadowGDI - GetDC () failed\n");
+        return FALSE;
     }
 
-  /* Query GDI for current display depth */
-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
+    /* Query GDI for current display depth */
+    dwBPP = GetDeviceCaps(hdc, BITSPIXEL);
 
-  /* GDI cannot change the screen depth, so always use GDI's depth */
-  pScreenInfo->dwBPP = dwBPP;
+    /* GDI cannot change the screen depth, so always use GDI's depth */
+    pScreenInfo->dwBPP = dwBPP;
 
-  /* Release our DC */
-  ReleaseDC (NULL, hdc);
-  hdc = NULL;
+    /* Release our DC */
+    ReleaseDC(NULL, hdc);
+    hdc = NULL;
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Blt exposed regions to the screen
  */
 
 static Bool
-winBltExposedRegionsShadowGDI (ScreenPtr pScreen)
+winBltExposedRegionsShadowGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  winPrivCmapPtr	pCmapPriv = NULL;
-  HDC			hdcUpdate;
-  PAINTSTRUCT		ps;
-
-  /* BeginPaint gives us an hdc that clips to the invalidated region */
-  hdcUpdate = BeginPaint (pScreenPriv->hwndScreen, &ps);
-
-  /* Realize the palette, if we have one */
-  if (pScreenPriv->pcmapInstalled != NULL)
-    {
-      pCmapPriv = winGetCmapPriv (pScreenPriv->pcmapInstalled);
-      
-      SelectPalette (hdcUpdate, pCmapPriv->hPalette, FALSE);
-      RealizePalette (hdcUpdate);
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    winPrivCmapPtr pCmapPriv = NULL;
+    HDC hdcUpdate;
+    PAINTSTRUCT ps;
+
+    /* BeginPaint gives us an hdc that clips to the invalidated region */
+    hdcUpdate = BeginPaint(pScreenPriv->hwndScreen, &ps);
+
+    /* Realize the palette, if we have one */
+    if (pScreenPriv->pcmapInstalled != NULL) {
+        pCmapPriv = winGetCmapPriv(pScreenPriv->pcmapInstalled);
+
+        SelectPalette(hdcUpdate, pCmapPriv->hPalette, FALSE);
+        RealizePalette(hdcUpdate);
     }
 
-  /* Our BitBlt will be clipped to the invalidated region */
-  BitBlt (hdcUpdate,
-	  0, 0,
-	  pScreenInfo->dwWidth, pScreenInfo->dwHeight,
-	  pScreenPriv->hdcShadow,
-	  0, 0,
-	  SRCCOPY);
+    /* Our BitBlt will be clipped to the invalidated region */
+    BitBlt(hdcUpdate,
+           0, 0,
+           pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+           pScreenPriv->hdcShadow, 0, 0, SRCCOPY);
 
-  /* EndPaint frees the DC */
-  EndPaint (pScreenPriv->hwndScreen, &ps);
+    /* EndPaint frees the DC */
+    EndPaint(pScreenPriv->hwndScreen, &ps);
 
 #ifdef XWIN_MULTIWINDOW
-  /* Redraw all windows */
-  if (pScreenInfo->fMultiWindow)
-    EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 
-            (LPARAM)pScreenPriv->hwndScreen);
+    /* Redraw all windows */
+    if (pScreenInfo->fMultiWindow)
+        EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI,
+                          (LPARAM) pScreenPriv->hwndScreen);
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Do any engine-specific appliation-activation processing
  */
 
 static Bool
-winActivateAppShadowGDI (ScreenPtr pScreen)
+winActivateAppShadowGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-
-  /*
-   * 2004/04/12 - Harold - We perform the restoring or minimizing
-   * manually for ShadowGDI in fullscreen modes so that this engine
-   * will perform just like ShadowDD and ShadowDDNL in fullscreen mode;
-   * if we do not do this then our fullscreen window will appear in the
-   * z-order when it is deactivated and it can be uncovered by resizing
-   * or minimizing another window that is on top of it, which is not how
-   * the DirectDraw engines work.  Therefore we keep this code here to
-   * make sure that all engines work the same in fullscreen mode.
-   */
-
-  /*
-   * Are we active?
-   * Are we fullscreen?
-   */
-  if (pScreenPriv->fActive
-      && pScreenInfo->fFullScreen)
-    {
-      /*
-       * Activating, attempt to bring our window 
-       * to the top of the display
-       */
-      ShowWindow (pScreenPriv->hwndScreen, SW_RESTORE);
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /*
+     * 2004/04/12 - Harold - We perform the restoring or minimizing
+     * manually for ShadowGDI in fullscreen modes so that this engine
+     * will perform just like ShadowDD and ShadowDDNL in fullscreen mode;
+     * if we do not do this then our fullscreen window will appear in the
+     * z-order when it is deactivated and it can be uncovered by resizing
+     * or minimizing another window that is on top of it, which is not how
+     * the DirectDraw engines work.  Therefore we keep this code here to
+     * make sure that all engines work the same in fullscreen mode.
+     */
+
+    /*
+     * Are we active?
+     * Are we fullscreen?
+     */
+    if (pScreenPriv->fActive && pScreenInfo->fFullScreen) {
+        /*
+         * Activating, attempt to bring our window 
+         * to the top of the display
+         */
+        ShowWindow(pScreenPriv->hwndScreen, SW_RESTORE);
     }
-  else if (!pScreenPriv->fActive
-	   && pScreenInfo->fFullScreen)
-    {
-      /*
-       * Deactivating, stuff our window onto the
-       * task bar.
-       */
-      ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);
+    else if (!pScreenPriv->fActive && pScreenInfo->fFullScreen) {
+        /*
+         * Deactivating, stuff our window onto the
+         * task bar.
+         */
+        ShowWindow(pScreenPriv->hwndScreen, SW_MINIMIZE);
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Reblit the shadow framebuffer to the screen.
  */
 
 static Bool
-winRedrawScreenShadowGDI (ScreenPtr pScreen)
+winRedrawScreenShadowGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
 
-  /* Redraw the whole window, to take account for the new colors */
-  BitBlt (pScreenPriv->hdcScreen,
-	  0, 0,
-	  pScreenInfo->dwWidth, pScreenInfo->dwHeight,
-	  pScreenPriv->hdcShadow,
-	  0, 0,
-	  SRCCOPY);
+    /* Redraw the whole window, to take account for the new colors */
+    BitBlt(pScreenPriv->hdcScreen,
+           0, 0,
+           pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+           pScreenPriv->hdcShadow, 0, 0, SRCCOPY);
 
 #ifdef XWIN_MULTIWINDOW
-  /* Redraw all windows */
-  if (pScreenInfo->fMultiWindow)
-    EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);
+    /* Redraw all windows */
+    if (pScreenInfo->fMultiWindow)
+        EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
-
-
 /*
  * Realize the currently installed colormap
  */
 
 static Bool
-winRealizeInstalledPaletteShadowGDI (ScreenPtr pScreen)
+winRealizeInstalledPaletteShadowGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winPrivCmapPtr	pCmapPriv = NULL;
+    winScreenPriv(pScreen);
+    winPrivCmapPtr pCmapPriv = NULL;
 
 #if CYGDEBUG
-  winDebug ("winRealizeInstalledPaletteShadowGDI\n");
+    winDebug("winRealizeInstalledPaletteShadowGDI\n");
 #endif
 
-  /* Don't do anything if there is not a colormap */
-  if (pScreenPriv->pcmapInstalled == NULL)
-    {
+    /* Don't do anything if there is not a colormap */
+    if (pScreenPriv->pcmapInstalled == NULL) {
 #if CYGDEBUG
-      winDebug ("winRealizeInstalledPaletteShadowGDI - No colormap "
-	      "installed\n");
+        winDebug("winRealizeInstalledPaletteShadowGDI - No colormap "
+                 "installed\n");
 #endif
-      return TRUE;
+        return TRUE;
     }
 
-  pCmapPriv = winGetCmapPriv (pScreenPriv->pcmapInstalled);
-  
-  /* Realize our palette for the screen */
-  if (RealizePalette (pScreenPriv->hdcScreen) == GDI_ERROR)
-    {
-      ErrorF ("winRealizeInstalledPaletteShadowGDI - RealizePalette () "
-	      "failed\n");
-      return FALSE;
+    pCmapPriv = winGetCmapPriv(pScreenPriv->pcmapInstalled);
+
+    /* Realize our palette for the screen */
+    if (RealizePalette(pScreenPriv->hdcScreen) == GDI_ERROR) {
+        ErrorF("winRealizeInstalledPaletteShadowGDI - RealizePalette () "
+               "failed\n");
+        return FALSE;
     }
-  
-  /* Set the DIB color table */
-  if (SetDIBColorTable (pScreenPriv->hdcShadow,
-			0,
-			WIN_NUM_PALETTE_ENTRIES,
-			pCmapPriv->rgbColors) == 0)
-    {
-      ErrorF ("winRealizeInstalledPaletteShadowGDI - SetDIBColorTable () "
-	      "failed\n");
-      return FALSE;
+
+    /* Set the DIB color table */
+    if (SetDIBColorTable(pScreenPriv->hdcShadow,
+                         0,
+                         WIN_NUM_PALETTE_ENTRIES, pCmapPriv->rgbColors) == 0) {
+        ErrorF("winRealizeInstalledPaletteShadowGDI - SetDIBColorTable () "
+               "failed\n");
+        return FALSE;
     }
-  
-  return TRUE;
-}
 
+    return TRUE;
+}
 
 /*
  * Install the specified colormap
  */
 
 static Bool
-winInstallColormapShadowGDI (ColormapPtr pColormap)
+winInstallColormapShadowGDI(ColormapPtr pColormap)
 {
-  ScreenPtr		pScreen = pColormap->pScreen;
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  winCmapPriv(pColormap);
-
-  /*
-   * Tell Windows to install the new colormap
-   */
-  if (SelectPalette (pScreenPriv->hdcScreen,
-		     pCmapPriv->hPalette,
-		     FALSE) == NULL)
-    {
-      ErrorF ("winInstallColormapShadowGDI - SelectPalette () failed\n");
-      return FALSE;
+    ScreenPtr pScreen = pColormap->pScreen;
+
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    winCmapPriv(pColormap);
+
+    /*
+     * Tell Windows to install the new colormap
+     */
+    if (SelectPalette(pScreenPriv->hdcScreen,
+                      pCmapPriv->hPalette, FALSE) == NULL) {
+        ErrorF("winInstallColormapShadowGDI - SelectPalette () failed\n");
+        return FALSE;
     }
-      
-  /* Realize the palette */
-  if (GDI_ERROR == RealizePalette (pScreenPriv->hdcScreen))
-    {
-      ErrorF ("winInstallColormapShadowGDI - RealizePalette () failed\n");
-      return FALSE;
+
+    /* Realize the palette */
+    if (GDI_ERROR == RealizePalette(pScreenPriv->hdcScreen)) {
+        ErrorF("winInstallColormapShadowGDI - RealizePalette () failed\n");
+        return FALSE;
     }
 
-  /* Set the DIB color table */
-  if (SetDIBColorTable (pScreenPriv->hdcShadow,
-			0,
-			WIN_NUM_PALETTE_ENTRIES,
-			pCmapPriv->rgbColors) == 0)
-    {
-      ErrorF ("winInstallColormapShadowGDI - SetDIBColorTable () failed\n");
-      return FALSE;
+    /* Set the DIB color table */
+    if (SetDIBColorTable(pScreenPriv->hdcShadow,
+                         0,
+                         WIN_NUM_PALETTE_ENTRIES, pCmapPriv->rgbColors) == 0) {
+        ErrorF("winInstallColormapShadowGDI - SetDIBColorTable () failed\n");
+        return FALSE;
     }
 
-  /* Redraw the whole window, to take account for the new colors */
-  BitBlt (pScreenPriv->hdcScreen,
-	  0, 0,
-	  pScreenInfo->dwWidth, pScreenInfo->dwHeight,
-	  pScreenPriv->hdcShadow,
-	  0, 0,
-	  SRCCOPY);
+    /* Redraw the whole window, to take account for the new colors */
+    BitBlt(pScreenPriv->hdcScreen,
+           0, 0,
+           pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+           pScreenPriv->hdcShadow, 0, 0, SRCCOPY);
 
-  /* Save a pointer to the newly installed colormap */
-  pScreenPriv->pcmapInstalled = pColormap;
+    /* Save a pointer to the newly installed colormap */
+    pScreenPriv->pcmapInstalled = pColormap;
 
 #ifdef XWIN_MULTIWINDOW
-  /* Redraw all windows */
-  if (pScreenInfo->fMultiWindow)
-    EnumThreadWindows (g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);
+    /* Redraw all windows */
+    if (pScreenInfo->fMultiWindow)
+        EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Store the specified colors in the specified colormap
  */
 
 static Bool
-winStoreColorsShadowGDI (ColormapPtr pColormap,
-			 int ndef,
-			 xColorItem *pdefs)
+winStoreColorsShadowGDI(ColormapPtr pColormap, int ndef, xColorItem * pdefs)
 {
-  ScreenPtr		pScreen = pColormap->pScreen;
-  winScreenPriv(pScreen);
-  winCmapPriv(pColormap);
-  ColormapPtr curpmap = pScreenPriv->pcmapInstalled;
-  
-  /* Put the X colormap entries into the Windows logical palette */
-  if (SetPaletteEntries (pCmapPriv->hPalette,
-			 pdefs[0].pixel,
-			 ndef,
-			 pCmapPriv->peColors + pdefs[0].pixel) == 0)
-    {
-      ErrorF ("winStoreColorsShadowGDI - SetPaletteEntries () failed\n");
-      return FALSE;
+    ScreenPtr pScreen = pColormap->pScreen;
+
+    winScreenPriv(pScreen);
+    winCmapPriv(pColormap);
+    ColormapPtr curpmap = pScreenPriv->pcmapInstalled;
+
+    /* Put the X colormap entries into the Windows logical palette */
+    if (SetPaletteEntries(pCmapPriv->hPalette,
+                          pdefs[0].pixel,
+                          ndef, pCmapPriv->peColors + pdefs[0].pixel) == 0) {
+        ErrorF("winStoreColorsShadowGDI - SetPaletteEntries () failed\n");
+        return FALSE;
     }
 
-  /* Don't install the Windows palette if the colormap is not installed */
-  if (pColormap != curpmap)
-    {
-      return TRUE;
+    /* Don't install the Windows palette if the colormap is not installed */
+    if (pColormap != curpmap) {
+        return TRUE;
     }
 
-  /* Try to install the newly modified colormap */
-  if (!winInstallColormapShadowGDI (pColormap))
-    {
-      ErrorF ("winInstallColormapShadowGDI - winInstallColormapShadowGDI "
-	      "failed\n");
-      return FALSE;
+    /* Try to install the newly modified colormap */
+    if (!winInstallColormapShadowGDI(pColormap)) {
+        ErrorF("winInstallColormapShadowGDI - winInstallColormapShadowGDI "
+               "failed\n");
+        return FALSE;
     }
 
 #if 0
-  /* Tell Windows that the palette has changed */
-  RealizePalette (pScreenPriv->hdcScreen);
-  
-  /* Set the DIB color table */
-  if (SetDIBColorTable (pScreenPriv->hdcShadow,
-			pdefs[0].pixel,
-			ndef,
-			pCmapPriv->rgbColors + pdefs[0].pixel) == 0)
-    {
-      ErrorF ("winInstallColormapShadowGDI - SetDIBColorTable () failed\n");
-      return FALSE;
+    /* Tell Windows that the palette has changed */
+    RealizePalette(pScreenPriv->hdcScreen);
+
+    /* Set the DIB color table */
+    if (SetDIBColorTable(pScreenPriv->hdcShadow,
+                         pdefs[0].pixel,
+                         ndef, pCmapPriv->rgbColors + pdefs[0].pixel) == 0) {
+        ErrorF("winInstallColormapShadowGDI - SetDIBColorTable () failed\n");
+        return FALSE;
     }
 
-  /* Save a pointer to the newly installed colormap */
-  pScreenPriv->pcmapInstalled = pColormap;
+    /* Save a pointer to the newly installed colormap */
+    pScreenPriv->pcmapInstalled = pColormap;
 #endif
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Colormap initialization procedure
  */
 
 static Bool
-winCreateColormapShadowGDI (ColormapPtr pColormap)
+winCreateColormapShadowGDI(ColormapPtr pColormap)
 {
-  LPLOGPALETTE		lpPaletteNew = NULL;
-  DWORD			dwEntriesMax;
-  VisualPtr		pVisual;
-  HPALETTE		hpalNew = NULL;
-  winCmapPriv(pColormap);
-
-  /* Get a pointer to the visual that the colormap belongs to */
-  pVisual = pColormap->pVisual;
-
-  /* Get the maximum number of palette entries for this visual */
-  dwEntriesMax = pVisual->ColormapEntries;
-
-  /* Allocate a Windows logical color palette with max entries */
-  lpPaletteNew = malloc (sizeof (LOGPALETTE)
-			 + (dwEntriesMax - 1) * sizeof (PALETTEENTRY));
-  if (lpPaletteNew == NULL)
-    {
-      ErrorF ("winCreateColormapShadowGDI - Couldn't allocate palette "
-	      "with %d entries\n",
-	      (int) dwEntriesMax);
-      return FALSE;
+    LPLOGPALETTE lpPaletteNew = NULL;
+    DWORD dwEntriesMax;
+    VisualPtr pVisual;
+    HPALETTE hpalNew = NULL;
+
+    winCmapPriv(pColormap);
+
+    /* Get a pointer to the visual that the colormap belongs to */
+    pVisual = pColormap->pVisual;
+
+    /* Get the maximum number of palette entries for this visual */
+    dwEntriesMax = pVisual->ColormapEntries;
+
+    /* Allocate a Windows logical color palette with max entries */
+    lpPaletteNew = malloc(sizeof(LOGPALETTE)
+                          + (dwEntriesMax - 1) * sizeof(PALETTEENTRY));
+    if (lpPaletteNew == NULL) {
+        ErrorF("winCreateColormapShadowGDI - Couldn't allocate palette "
+               "with %d entries\n", (int) dwEntriesMax);
+        return FALSE;
     }
 
-  /* Zero out the colormap */
-  ZeroMemory (lpPaletteNew, sizeof (LOGPALETTE)
-	      + (dwEntriesMax - 1) * sizeof (PALETTEENTRY));
-  
-  /* Set the logical palette structure */
-  lpPaletteNew->palVersion = 0x0300;
-  lpPaletteNew->palNumEntries = dwEntriesMax;
-
-  /* Tell Windows to create the palette */
-  hpalNew = CreatePalette (lpPaletteNew);
-  if (hpalNew == NULL)
-    {
-      ErrorF ("winCreateColormapShadowGDI - CreatePalette () failed\n");
-      free (lpPaletteNew);
-      return FALSE;
+    /* Zero out the colormap */
+    ZeroMemory(lpPaletteNew, sizeof(LOGPALETTE)
+               + (dwEntriesMax - 1) * sizeof(PALETTEENTRY));
+
+    /* Set the logical palette structure */
+    lpPaletteNew->palVersion = 0x0300;
+    lpPaletteNew->palNumEntries = dwEntriesMax;
+
+    /* Tell Windows to create the palette */
+    hpalNew = CreatePalette(lpPaletteNew);
+    if (hpalNew == NULL) {
+        ErrorF("winCreateColormapShadowGDI - CreatePalette () failed\n");
+        free(lpPaletteNew);
+        return FALSE;
     }
 
-  /* Save the Windows logical palette handle in the X colormaps' privates */
-  pCmapPriv->hPalette = hpalNew;
+    /* Save the Windows logical palette handle in the X colormaps' privates */
+    pCmapPriv->hPalette = hpalNew;
 
-  /* Free the palette initialization memory */
-  free (lpPaletteNew);
+    /* Free the palette initialization memory */
+    free(lpPaletteNew);
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Colormap destruction procedure
  */
 
 static Bool
-winDestroyColormapShadowGDI (ColormapPtr pColormap)
+winDestroyColormapShadowGDI(ColormapPtr pColormap)
 {
-  winScreenPriv(pColormap->pScreen);
-  winCmapPriv(pColormap);
-
-  /*
-   * Is colormap to be destroyed the default?
-   *
-   * Non-default colormaps should have had winUninstallColormap
-   * called on them before we get here.  The default colormap
-   * will not have had winUninstallColormap called on it.  Thus,
-   * we need to handle the default colormap in a special way.
-   */
-  if (pColormap->flags & IsDefault)
-    {
+    winScreenPriv(pColormap->pScreen);
+    winCmapPriv(pColormap);
+
+    /*
+     * Is colormap to be destroyed the default?
+     *
+     * Non-default colormaps should have had winUninstallColormap
+     * called on them before we get here.  The default colormap
+     * will not have had winUninstallColormap called on it.  Thus,
+     * we need to handle the default colormap in a special way.
+     */
+    if (pColormap->flags & IsDefault) {
 #if CYGDEBUG
-      winDebug ("winDestroyColormapShadowGDI - Destroying default "
-	      "colormap\n");
+        winDebug("winDestroyColormapShadowGDI - Destroying default "
+                 "colormap\n");
 #endif
-      
-      /*
-       * FIXME: Walk the list of all screens, popping the default
-       * palette out of each screen device context.
-       */
-      
-      /* Pop the palette out of the device context */
-      SelectPalette (pScreenPriv->hdcScreen,
-		     GetStockObject (DEFAULT_PALETTE),
-		     FALSE);
-
-      /* Clear our private installed colormap pointer */
-      pScreenPriv->pcmapInstalled = NULL;
+
+        /*
+         * FIXME: Walk the list of all screens, popping the default
+         * palette out of each screen device context.
+         */
+
+        /* Pop the palette out of the device context */
+        SelectPalette(pScreenPriv->hdcScreen,
+                      GetStockObject(DEFAULT_PALETTE), FALSE);
+
+        /* Clear our private installed colormap pointer */
+        pScreenPriv->pcmapInstalled = NULL;
     }
-  
-  /* Try to delete the logical palette */
-  if (DeleteObject (pCmapPriv->hPalette) == 0)
-    {
-      ErrorF ("winDestroyColormap - DeleteObject () failed\n");
-      return FALSE;
+
+    /* Try to delete the logical palette */
+    if (DeleteObject(pCmapPriv->hPalette) == 0) {
+        ErrorF("winDestroyColormap - DeleteObject () failed\n");
+        return FALSE;
     }
-  
-  /* Invalidate the colormap privates */
-  pCmapPriv->hPalette = NULL;
 
-  return TRUE;
-}
+    /* Invalidate the colormap privates */
+    pCmapPriv->hPalette = NULL;
 
+    return TRUE;
+}
 
 /*
  * Set engine specific funtions
  */
 
 Bool
-winSetEngineFunctionsShadowGDI (ScreenPtr pScreen)
+winSetEngineFunctionsShadowGDI(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  
-  /* Set our pointers */
-  pScreenPriv->pwinAllocateFB = winAllocateFBShadowGDI;
-  pScreenPriv->pwinFreeFB = winFreeFBShadowGDI;
-  pScreenPriv->pwinShadowUpdate = winShadowUpdateGDI;
-  pScreenPriv->pwinInitScreen = winInitScreenShadowGDI;
-  pScreenPriv->pwinCloseScreen = winCloseScreenShadowGDI;
-  pScreenPriv->pwinInitVisuals = winInitVisualsShadowGDI;
-  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowGDI;
-  if (pScreenInfo->fFullScreen)
-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;
-  else
-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
-  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
-  pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowGDI;
-  pScreenPriv->pwinActivateApp = winActivateAppShadowGDI;
-  pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowGDI;
-  pScreenPriv->pwinRealizeInstalledPalette = 
-    winRealizeInstalledPaletteShadowGDI;
-  pScreenPriv->pwinInstallColormap = winInstallColormapShadowGDI;
-  pScreenPriv->pwinStoreColors = winStoreColorsShadowGDI;
-  pScreenPriv->pwinCreateColormap = winCreateColormapShadowGDI;
-  pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowGDI;
-  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;
-  pScreenPriv->pwinCreatePrimarySurface
-    = (winCreatePrimarySurfaceProcPtr) (void (*)(void))NoopDDA;
-  pScreenPriv->pwinReleasePrimarySurface
-    = (winReleasePrimarySurfaceProcPtr) (void (*)(void))NoopDDA;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    /* Set our pointers */
+    pScreenPriv->pwinAllocateFB = winAllocateFBShadowGDI;
+    pScreenPriv->pwinFreeFB = winFreeFBShadowGDI;
+    pScreenPriv->pwinShadowUpdate = winShadowUpdateGDI;
+    pScreenPriv->pwinInitScreen = winInitScreenShadowGDI;
+    pScreenPriv->pwinCloseScreen = winCloseScreenShadowGDI;
+    pScreenPriv->pwinInitVisuals = winInitVisualsShadowGDI;
+    pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowGDI;
+    if (pScreenInfo->fFullScreen)
+        pScreenPriv->pwinCreateBoundingWindow =
+            winCreateBoundingWindowFullScreen;
+    else
+        pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
+    pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
+    pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowGDI;
+    pScreenPriv->pwinActivateApp = winActivateAppShadowGDI;
+    pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowGDI;
+    pScreenPriv->pwinRealizeInstalledPalette =
+        winRealizeInstalledPaletteShadowGDI;
+    pScreenPriv->pwinInstallColormap = winInstallColormapShadowGDI;
+    pScreenPriv->pwinStoreColors = winStoreColorsShadowGDI;
+    pScreenPriv->pwinCreateColormap = winCreateColormapShadowGDI;
+    pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowGDI;
+    pScreenPriv->pwinHotKeyAltTab =
+        (winHotKeyAltTabProcPtr) (void (*)(void)) NoopDDA;
+    pScreenPriv->pwinCreatePrimarySurface =
+        (winCreatePrimarySurfaceProcPtr) (void (*)(void)) NoopDDA;
+    pScreenPriv->pwinReleasePrimarySurface =
+        (winReleasePrimarySurfaceProcPtr) (void (*)(void)) NoopDDA;
 #ifdef XWIN_MULTIWINDOW
-  pScreenPriv->pwinFinishCreateWindowsWindow =
-    (winFinishCreateWindowsWindowProcPtr) (void (*)(void))NoopDDA;
+    pScreenPriv->pwinFinishCreateWindowsWindow =
+        (winFinishCreateWindowsWindowProcPtr) (void (*)(void)) NoopDDA;
 #endif
 
-  return TRUE;
+    return TRUE;
 }
diff --git a/xorg-server/hw/xwin/wintrayicon.c b/xorg-server/hw/xwin/wintrayicon.c
index 895b47caf..dbc47257b 100644
--- a/xorg-server/hw/xwin/wintrayicon.c
+++ b/xorg-server/hw/xwin/wintrayicon.c
@@ -41,170 +41,157 @@
  */
 
 void
-winInitNotifyIcon (winPrivScreenPtr pScreenPriv)
+winInitNotifyIcon(winPrivScreenPtr pScreenPriv)
 {
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  NOTIFYICONDATA	nid = {0};
-  
-  nid.cbSize = sizeof (NOTIFYICONDATA);
-  nid.hWnd = pScreenPriv->hwndScreen;
-  nid.uID = pScreenInfo->dwScreen;
-  nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
-  nid.uCallbackMessage = WM_TRAYICON;
-  nid.hIcon = winTaskbarIcon ();
-
-  /* Save handle to the icon so it can be freed later */
-  pScreenPriv->hiconNotifyIcon = nid.hIcon;
-
-  /* Set display and screen-specific tooltip text */
-  snprintf (nid.szTip,
-	    sizeof (nid.szTip),
-	    PROJECT_NAME " Server:%s.%d",
-	    display, 
-	    (int) pScreenInfo->dwScreen);
-
-  /* Add the tray icon */
-  if (!Shell_NotifyIcon (NIM_ADD, &nid))
-    ErrorF ("winInitNotifyIcon - Shell_NotifyIcon Failed\n");
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    NOTIFYICONDATA nid = { 0 };
+
+    nid.cbSize = sizeof(NOTIFYICONDATA);
+    nid.hWnd = pScreenPriv->hwndScreen;
+    nid.uID = pScreenInfo->dwScreen;
+    nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
+    nid.uCallbackMessage = WM_TRAYICON;
+    nid.hIcon = winTaskbarIcon();
+
+    /* Save handle to the icon so it can be freed later */
+    pScreenPriv->hiconNotifyIcon = nid.hIcon;
+
+    /* Set display and screen-specific tooltip text */
+    snprintf(nid.szTip,
+             sizeof(nid.szTip),
+             PROJECT_NAME " Server:%s.%d",
+             display, (int) pScreenInfo->dwScreen);
+
+    /* Add the tray icon */
+    if (!Shell_NotifyIcon(NIM_ADD, &nid))
+        ErrorF("winInitNotifyIcon - Shell_NotifyIcon Failed\n");
 }
 
-
 /*
  * Delete the tray icon
  */
 
 void
-winDeleteNotifyIcon (winPrivScreenPtr pScreenPriv)
+winDeleteNotifyIcon(winPrivScreenPtr pScreenPriv)
 {
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  NOTIFYICONDATA	nid = {0};
-  
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    NOTIFYICONDATA nid = { 0 };
+
 #if 0
-  ErrorF ("winDeleteNotifyIcon\n");
+    ErrorF("winDeleteNotifyIcon\n");
 #endif
 
-  nid.cbSize = sizeof (NOTIFYICONDATA);
-  nid.hWnd = pScreenPriv->hwndScreen;
-  nid.uID = pScreenInfo->dwScreen;
-  
-  /* Delete the tray icon */
-  if (!Shell_NotifyIcon (NIM_DELETE, &nid))
-    {
-      ErrorF ("winDeleteNotifyIcon - Shell_NotifyIcon failed\n");
-      return;
+    nid.cbSize = sizeof(NOTIFYICONDATA);
+    nid.hWnd = pScreenPriv->hwndScreen;
+    nid.uID = pScreenInfo->dwScreen;
+
+    /* Delete the tray icon */
+    if (!Shell_NotifyIcon(NIM_DELETE, &nid)) {
+        ErrorF("winDeleteNotifyIcon - Shell_NotifyIcon failed\n");
+        return;
     }
 
-  /* Free the icon that was loaded */
-  if (pScreenPriv->hiconNotifyIcon != NULL
-      && DestroyIcon (pScreenPriv->hiconNotifyIcon) == 0)
-    {
-      ErrorF ("winDeleteNotifyIcon - DestroyIcon failed\n");
+    /* Free the icon that was loaded */
+    if (pScreenPriv->hiconNotifyIcon != NULL
+        && DestroyIcon(pScreenPriv->hiconNotifyIcon) == 0) {
+        ErrorF("winDeleteNotifyIcon - DestroyIcon failed\n");
     }
-  pScreenPriv->hiconNotifyIcon = NULL;
+    pScreenPriv->hiconNotifyIcon = NULL;
 }
 
-
 /*
  * Process messages intended for the tray icon
  */
 
 LRESULT
-winHandleIconMessage (HWND hwnd, UINT message,
-		      WPARAM wParam, LPARAM lParam,
-		      winPrivScreenPtr pScreenPriv)
+winHandleIconMessage(HWND hwnd, UINT message,
+                     WPARAM wParam, LPARAM lParam, winPrivScreenPtr pScreenPriv)
 {
 #if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_MULTIWINDOW)
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
 #endif
 
-  switch (lParam)
-    {
+    switch (lParam) {
     case WM_LBUTTONUP:
-      /* Restack and bring all windows to top */
-      SetForegroundWindow (hwnd);
+        /* Restack and bring all windows to top */
+        SetForegroundWindow(hwnd);
 
 #ifdef XWIN_MULTIWINDOWEXTWM
-      if (pScreenInfo->fMWExtWM)
-	winMWExtWMRestackWindows (pScreenInfo->pScreen);
+        if (pScreenInfo->fMWExtWM)
+            winMWExtWMRestackWindows(pScreenInfo->pScreen);
 #endif
-      break;
+        break;
 
     case WM_LBUTTONDBLCLK:
-      /* Display Exit dialog box */
-      winDisplayExitDialog (pScreenPriv);
-      break;
+        /* Display Exit dialog box */
+        winDisplayExitDialog(pScreenPriv);
+        break;
 
     case WM_RBUTTONUP:
-      {
-	POINT		ptCursor;
-	HMENU		hmenuPopup;
-	HMENU		hmenuTray;
+    {
+        POINT ptCursor;
+        HMENU hmenuPopup;
+        HMENU hmenuTray;
 
-	/* Get cursor position */
-	GetCursorPos (&ptCursor);
+        /* Get cursor position */
+        GetCursorPos(&ptCursor);
 
-	/* Load tray icon menu resource */
-	hmenuPopup = LoadMenu (g_hInstance,
-			       MAKEINTRESOURCE(IDM_TRAYICON_MENU));
-	if (!hmenuPopup)
-	  ErrorF ("winHandleIconMessage - LoadMenu failed\n");
+        /* Load tray icon menu resource */
+        hmenuPopup = LoadMenu(g_hInstance, MAKEINTRESOURCE(IDM_TRAYICON_MENU));
+        if (!hmenuPopup)
+            ErrorF("winHandleIconMessage - LoadMenu failed\n");
 
-	/* Get actual tray icon menu */
-	hmenuTray = GetSubMenu (hmenuPopup, 0);
+        /* Get actual tray icon menu */
+        hmenuTray = GetSubMenu(hmenuPopup, 0);
 
 #ifdef XWIN_MULTIWINDOW
-	/* Check for MultiWindow mode */
-	if (pScreenInfo->fMultiWindow)
-	  {
-	    MENUITEMINFO		mii = {0};
-	    
-	    /* Root is shown, remove the check box */
-	    
-	    /* Setup menu item info structure */
-	    mii.cbSize = sizeof (MENUITEMINFO);
-	    mii.fMask = MIIM_STATE;
-	    mii.fState = MFS_CHECKED;
-	    
-	    /* Unheck box if root is shown */
-	    if (pScreenPriv->fRootWindowShown)
-	      mii.fState = MFS_UNCHECKED;
-
-	    /* Set menu state */
-	    SetMenuItemInfo (hmenuTray, ID_APP_HIDE_ROOT, FALSE, &mii);
-	  }
-	else
+        /* Check for MultiWindow mode */
+        if (pScreenInfo->fMultiWindow) {
+            MENUITEMINFO mii = { 0 };
+
+            /* Root is shown, remove the check box */
+
+            /* Setup menu item info structure */
+            mii.cbSize = sizeof(MENUITEMINFO);
+            mii.fMask = MIIM_STATE;
+            mii.fState = MFS_CHECKED;
+
+            /* Unheck box if root is shown */
+            if (pScreenPriv->fRootWindowShown)
+                mii.fState = MFS_UNCHECKED;
+
+            /* Set menu state */
+            SetMenuItemInfo(hmenuTray, ID_APP_HIDE_ROOT, FALSE, &mii);
+        }
+        else
 #endif
-	  {
-	    /* Remove Hide Root Window button */
-	    RemoveMenu (hmenuTray,
-			ID_APP_HIDE_ROOT,
-			MF_BYCOMMAND);
-	  }
-
-	SetupRootMenu ((unsigned long)hmenuTray);
-
-	/*
-	 * NOTE: This three-step procedure is required for
-	 * proper popup menu operation.  Without the
-	 * call to SetForegroundWindow the
-	 * popup menu will often not disappear when you click
-	 * outside of it.  Without the PostMessage the second
-	 * time you display the popup menu it might immediately
-	 * disappear.
-	 */
-	SetForegroundWindow (hwnd);
-	TrackPopupMenuEx (hmenuTray,
-			  TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_RIGHTBUTTON,
-			  ptCursor.x, ptCursor.y,
-			  hwnd,
-			  NULL);
-	PostMessage (hwnd, WM_NULL, 0, 0);
-
-	/* Free menu */
-	DestroyMenu (hmenuPopup);
-      }
-      break;
+        {
+            /* Remove Hide Root Window button */
+            RemoveMenu(hmenuTray, ID_APP_HIDE_ROOT, MF_BYCOMMAND);
+        }
+
+        SetupRootMenu((unsigned long) hmenuTray);
+
+        /*
+         * NOTE: This three-step procedure is required for
+         * proper popup menu operation.  Without the
+         * call to SetForegroundWindow the
+         * popup menu will often not disappear when you click
+         * outside of it.  Without the PostMessage the second
+         * time you display the popup menu it might immediately
+         * disappear.
+         */
+        SetForegroundWindow(hwnd);
+        TrackPopupMenuEx(hmenuTray,
+                         TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_RIGHTBUTTON,
+                         ptCursor.x, ptCursor.y, hwnd, NULL);
+        PostMessage(hwnd, WM_NULL, 0, 0);
+
+        /* Free menu */
+        DestroyMenu(hmenuPopup);
+    }
+        break;
     }
 
-  return 0;
+    return 0;
 }
diff --git a/xorg-server/hw/xwin/winvalargs.c b/xorg-server/hw/xwin/winvalargs.c
index 04db777b0..eb6e973b8 100644
--- a/xorg-server/hw/xwin/winvalargs.c
+++ b/xorg-server/hw/xwin/winvalargs.c
@@ -34,22 +34,19 @@
 #include "win.h"
 #include "winmsg.h"
 
-
-
-
 /*
  * Verify all screens have been explicitly specified
  */
 static BOOL
 isEveryScreenExplicit(void)
 {
-  int i;
+    int i;
 
-  for (i = 0; i < g_iNumScreens; i++)
-    if (!g_ScreenInfo[i].fExplicitScreen)
-      return FALSE;
+    for (i = 0; i < g_iNumScreens; i++)
+        if (!g_ScreenInfo[i].fExplicitScreen)
+            return FALSE;
 
-  return TRUE;
+    return TRUE;
 }
 
 /*
@@ -57,124 +54,117 @@ isEveryScreenExplicit(void)
  */
 
 Bool
-winValidateArgs (void)
+winValidateArgs(void)
 {
-  int		i;
-  int		iMaxConsecutiveScreen = 0;
-  BOOL		fHasNormalScreen0 = FALSE;
-  BOOL		fImplicitScreenFound = FALSE;
-
-  /*
-   * Check for a malformed set of -screen parameters.
-   * Examples of malformed parameters:
-   *	XWin -screen 1
-   *	XWin -screen 0 -screen 2
-   *	XWin -screen 1 -screen 2
-   */
-  if (!isEveryScreenExplicit())
-    {
-      ErrorF ("winValidateArgs - Malformed set of screen parameter(s).  "
-	      "Screens must be specified consecutively starting with "
-	      "screen 0.  That is, you cannot have only a screen 1, nor "
-	      "could you have screen 0 and screen 2.  You instead must "
-	      "have screen 0, or screen 0 and screen 1, respectively.  "
-	      "You can specify as many screens as you want.\n");
-      return FALSE;
+    int i;
+    int iMaxConsecutiveScreen = 0;
+    BOOL fHasNormalScreen0 = FALSE;
+    BOOL fImplicitScreenFound = FALSE;
+
+    /*
+     * Check for a malformed set of -screen parameters.
+     * Examples of malformed parameters:
+     *    XWin -screen 1
+     *    XWin -screen 0 -screen 2
+     *    XWin -screen 1 -screen 2
+     */
+    if (!isEveryScreenExplicit()) {
+        ErrorF("winValidateArgs - Malformed set of screen parameter(s).  "
+               "Screens must be specified consecutively starting with "
+               "screen 0.  That is, you cannot have only a screen 1, nor "
+               "could you have screen 0 and screen 2.  You instead must "
+               "have screen 0, or screen 0 and screen 1, respectively.  "
+               "You can specify as many screens as you want.\n");
+        return FALSE;
     }
 
-  /* Loop through all screens */
-  for (i = 0; i < g_iNumScreens; ++i)
-    {
-      /*
-       * Check for any combination of
-       * -multiwindow, -mwextwm, and -rootless.
-       */
-      {
-	int		iCount = 0;
-
-	/* Count conflicting options */
+    /* Loop through all screens */
+    for (i = 0; i < g_iNumScreens; ++i) {
+        /*
+         * Check for any combination of
+         * -multiwindow, -mwextwm, and -rootless.
+         */
+        {
+            int iCount = 0;
+
+            /* Count conflicting options */
 #ifdef XWIN_MULTIWINDOW
-	if (g_ScreenInfo[i].fMultiWindow)
-	  ++iCount;
+            if (g_ScreenInfo[i].fMultiWindow)
+                ++iCount;
 #endif
 #ifdef XWIN_MULTIWINDOWEXTWM
-	if (g_ScreenInfo[i].fMWExtWM)
-	  ++iCount;
+            if (g_ScreenInfo[i].fMWExtWM)
+                ++iCount;
 #endif
-	if (g_ScreenInfo[i].fRootless)
-	  ++iCount;
-
-	/* Check if the first screen is without rootless and multiwindow */ 
-	if (iCount == 0 && i == 0)
-	  fHasNormalScreen0 = TRUE;  
-
-	/* Fail if two or more conflicting options */
-	if (iCount > 1)
-	  {
-	    ErrorF ("winValidateArgs - Only one of -multiwindow, -mwextwm, "
-		    "and -rootless can be specific at a time.\n");
-	    return FALSE;
-	  }
-      }
-
-      /* Check for -multiwindow or -mwextwm and Xdmcp */
-      /* allow xdmcp if screen 0 is normal. */
-      if (g_fXdmcpEnabled && !fHasNormalScreen0
-	  && (FALSE
+            if (g_ScreenInfo[i].fRootless)
+                ++iCount;
+
+            /* Check if the first screen is without rootless and multiwindow */
+            if (iCount == 0 && i == 0)
+                fHasNormalScreen0 = TRUE;
+
+            /* Fail if two or more conflicting options */
+            if (iCount > 1) {
+                ErrorF("winValidateArgs - Only one of -multiwindow, -mwextwm, "
+                       "and -rootless can be specific at a time.\n");
+                return FALSE;
+            }
+        }
+
+        /* Check for -multiwindow or -mwextwm and Xdmcp */
+        /* allow xdmcp if screen 0 is normal. */
+        if (g_fXdmcpEnabled && !fHasNormalScreen0 && (FALSE
 #ifdef XWIN_MULTIWINDOW
-	      || g_ScreenInfo[i].fMultiWindow
+                                                      || g_ScreenInfo[i].
+                                                      fMultiWindow
 #endif
 #ifdef XWIN_MULTIWINDOWEXTWM
-	      || g_ScreenInfo[i].fMWExtWM
+                                                      || g_ScreenInfo[i].
+                                                      fMWExtWM
 #endif
-	      )
-	  )
-	{
-	  ErrorF ("winValidateArgs - Xdmcp (-query, -broadcast, or -indirect) "
-		  "is invalid with -multiwindow or -mwextwm.\n");
-	  return FALSE;
-	}
-
-      /* Check for -multiwindow, -mwextwm, or -rootless and fullscreen */
-      if (g_ScreenInfo[i].fFullScreen
-	  && (FALSE
+            )
+            ) {
+            ErrorF("winValidateArgs - Xdmcp (-query, -broadcast, or -indirect) "
+                   "is invalid with -multiwindow or -mwextwm.\n");
+            return FALSE;
+        }
+
+        /* Check for -multiwindow, -mwextwm, or -rootless and fullscreen */
+        if (g_ScreenInfo[i].fFullScreen && (FALSE
 #ifdef XWIN_MULTIWINDOW
-	      || g_ScreenInfo[i].fMultiWindow
+                                            || g_ScreenInfo[i].fMultiWindow
 #endif
 #ifdef XWIN_MULTIWINDOWEXTWM
-	      || g_ScreenInfo[i].fMWExtWM
+                                            || g_ScreenInfo[i].fMWExtWM
 #endif
-	      || g_ScreenInfo[i].fRootless)
-	  )
-	{
-	  ErrorF ("winValidateArgs - -fullscreen is invalid with "
-		  "-multiwindow, -mwextwm, or -rootless.\n");
-	  return FALSE;
-	}
-      
-      /* Check for !fullscreen and any fullscreen-only parameters */
-      if (!g_ScreenInfo[i].fFullScreen
-	  && (g_ScreenInfo[i].dwRefreshRate != WIN_DEFAULT_REFRESH
-	      || g_ScreenInfo[i].dwBPP != WIN_DEFAULT_BPP))
-	{
-	  ErrorF ("winValidateArgs - -refresh and -depth are only valid "
-		  "with -fullscreen.\n");
-	  return FALSE;
-	}
-
-      /* Check for fullscreen and any non-fullscreen parameters */
-      if (g_ScreenInfo[i].fFullScreen
-	  && ((g_ScreenInfo[i].iResizeMode != notAllowed)
-	      || !g_ScreenInfo[i].fDecoration
-	      || g_ScreenInfo[i].fLessPointer))
-	{
-	  ErrorF ("winValidateArgs - -fullscreen is invalid with "
-		  "-scrollbars, -resize, -nodecoration, or -lesspointer.\n");
-	  return FALSE;
-	}
+                                            || g_ScreenInfo[i].fRootless)
+            ) {
+            ErrorF("winValidateArgs - -fullscreen is invalid with "
+                   "-multiwindow, -mwextwm, or -rootless.\n");
+            return FALSE;
+        }
+
+        /* Check for !fullscreen and any fullscreen-only parameters */
+        if (!g_ScreenInfo[i].fFullScreen
+            && (g_ScreenInfo[i].dwRefreshRate != WIN_DEFAULT_REFRESH
+                || g_ScreenInfo[i].dwBPP != WIN_DEFAULT_BPP)) {
+            ErrorF("winValidateArgs - -refresh and -depth are only valid "
+                   "with -fullscreen.\n");
+            return FALSE;
+        }
+
+        /* Check for fullscreen and any non-fullscreen parameters */
+        if (g_ScreenInfo[i].fFullScreen
+            && ((g_ScreenInfo[i].iResizeMode != notAllowed)
+                || !g_ScreenInfo[i].fDecoration
+                || g_ScreenInfo[i].fLessPointer)) {
+            ErrorF("winValidateArgs - -fullscreen is invalid with "
+                   "-scrollbars, -resize, -nodecoration, or -lesspointer.\n");
+            return FALSE;
+        }
     }
 
-  winDebug ("winValidateArgs - Returning.\n");
+    winDebug("winValidateArgs - Returning.\n");
 
-  return TRUE;
+    return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winvideo.c b/xorg-server/hw/xwin/winvideo.c
index ed205448d..151538d10 100644
--- a/xorg-server/hw/xwin/winvideo.c
+++ b/xorg-server/hw/xwin/winvideo.c
@@ -36,32 +36,24 @@
 #include <X11/extensions/Xvproto.h>
 
 void
-winInitVideo (ScreenPtr pScreen);
+ winInitVideo(ScreenPtr pScreen);
 
 /*
  * winInitVideo - Initialize support for the X Video (Xv) Extension.
  */
 
 void
-winInitVideo (ScreenPtr pScreen)
+winInitVideo(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo; 
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+    if (pScreenInfo->dwBPP > 8) {
 
-  if (pScreenInfo->dwBPP > 8) 
-    {
-      
     }
-  
 
 }
 
-
-
-
-
-
-
 #if 0
 #include "../xfree86/common/xf86.h"
 #include "../Xext/xvdix.h"
@@ -69,80 +61,71 @@ winInitVideo (ScreenPtr pScreen)
 #include <X11/extensions/Xv.h>
 #endif
 
-
-
 #if 0
 /* client libraries expect an encoding */
-static XF86VideoEncodingRec DummyEncoding[1] =
-{
- {
-   0,
-   "XV_IMAGE",
-   IMAGE_MAX_WIDTH, IMAGE_MAX_HEIGHT,
-   {1, 1}
- }
+static XF86VideoEncodingRec DummyEncoding[1] = {
+    {
+     0,
+     "XV_IMAGE",
+     IMAGE_MAX_WIDTH, IMAGE_MAX_HEIGHT,
+     {1, 1}
+     }
 };
 
 #define NUM_FORMATS 3
 
-static XF86VideoFormatRec Formats[NUM_FORMATS] = 
-{
-  {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
+static XF86VideoFormatRec Formats[NUM_FORMATS] = {
+    {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
 };
 
 #define NUM_ATTRIBUTES 3
 
-static XF86AttributeRec Attributes[NUM_ATTRIBUTES] =
-{
-   {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
-   {XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
-   {XvSettable | XvGettable, 0, 255, "XV_CONTRAST"}
+static XF86AttributeRec Attributes[NUM_ATTRIBUTES] = {
+    {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
+    {XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
+    {XvSettable | XvGettable, 0, 255, "XV_CONTRAST"}
 };
 
 #define NUM_IMAGES 4
 
-static XF86ImageRec Images[NUM_IMAGES] =
-{
-	XVIMAGE_YUY2,
-	XVIMAGE_YV12,
-	XVIMAGE_I420,
-	XVIMAGE_UYVY
+static XF86ImageRec Images[NUM_IMAGES] = {
+    XVIMAGE_YUY2,
+    XVIMAGE_YV12,
+    XVIMAGE_I420,
+    XVIMAGE_UYVY
 };
 
-
-
 /*
  * winInitVideo - Initialize support for the X Video (Xv) Extension.
  */
 
 void
-winInitVideo (ScreenPtr pScreen)
+winInitVideo(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo; 
-  XF86VideoAdaptorPtr	newAdaptor = NULL;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    XF86VideoAdaptorPtr newAdaptor = NULL;
 
-  if (pScreenInfo->dwBPP > 8) 
-    {
-      newAdaptor = I810SetupImageVideo (pScreen);
-      I810InitOffscreenImages (pScreen);
+    if (pScreenInfo->dwBPP > 8) {
+        newAdaptor = I810SetupImageVideo(pScreen);
+        I810InitOffscreenImages(pScreen);
     }
-  
-    xf86XVScreenInit (pScreen, adaptors, 1);
-}
 
+    xf86XVScreenInit(pScreen, adaptors, 1);
+}
 
-static XF86VideoAdaptorPtr 
-winSetupImageVideo (ScreenPtr pScreen)
+static XF86VideoAdaptorPtr
+winSetupImageVideo(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+
 #if 0
     I810Ptr pI810 = I810PTR(pScrn);
 #endif
     XF86VideoAdaptorPtr adapt;
 
     if (!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec))))
-      return NULL;
+        return NULL;
 
     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
     adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
@@ -195,8 +178,8 @@ winSetupImageVideo (ScreenPtr pScreen)
 
 #if 0
     xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
-    xvContrast   = MAKE_ATOM("XV_CONTRAST");
-    xvColorKey   = MAKE_ATOM("XV_COLORKEY");
+    xvContrast = MAKE_ATOM("XV_CONTRAST");
+    xvColorKey = MAKE_ATOM("XV_COLORKEY");
 #endif
 
 #if 0
diff --git a/xorg-server/hw/xwin/winwakeup.c b/xorg-server/hw/xwin/winwakeup.c
index 64c202fed..1d2bfedbe 100644
--- a/xorg-server/hw/xwin/winwakeup.c
+++ b/xorg-server/hw/xwin/winwakeup.c
@@ -1,61 +1,55 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	Dakshinamurthy Karra

- *		Suhaib M Siddiqi

- *		Peter Busch

- *		Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-/* See Porting Layer Definition - p. 7 */

-void

-winWakeupHandler (int nScreen,

-		  pointer pWakeupData,

-		  unsigned long ulResult,

-		  pointer pReadmask)

-{

-  MSG			msg;

-

-  /* Process all messages on our queue */

-  while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))

-    {

-      if ((g_hDlgDepthChange == 0

-	   || !IsDialogMessage (g_hDlgDepthChange, &msg))

-	  && (g_hDlgExit == 0

-	      || !IsDialogMessage (g_hDlgExit, &msg))

-	  && (g_hDlgAbout == 0

-	      || !IsDialogMessage (g_hDlgAbout, &msg)))

-	{

-	  DispatchMessage (&msg);

-	}

-    }

-}

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, 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 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 XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	Dakshinamurthy Karra
+ *		Suhaib M Siddiqi
+ *		Peter Busch
+ *		Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+/* See Porting Layer Definition - p. 7 */
+void
+winWakeupHandler(int nScreen,
+                 pointer pWakeupData, unsigned long ulResult, pointer pReadmask)
+{
+    MSG msg;
+
+    /* Process all messages on our queue */
+    while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+        if ((g_hDlgDepthChange == 0
+             || !IsDialogMessage(g_hDlgDepthChange, &msg))
+            && (g_hDlgExit == 0 || !IsDialogMessage(g_hDlgExit, &msg))
+            && (g_hDlgAbout == 0 || !IsDialogMessage(g_hDlgAbout, &msg))) {
+            DispatchMessage(&msg);
+        }
+    }
+}
diff --git a/xorg-server/hw/xwin/winwin32rootless.c b/xorg-server/hw/xwin/winwin32rootless.c
index 91399c248..cef49b57c 100644
--- a/xorg-server/hw/xwin/winwin32rootless.c
+++ b/xorg-server/hw/xwin/winwin32rootless.c
@@ -43,7 +43,6 @@
 #include "winmultiwindowclass.h"
 #include <X11/Xatom.h>
 
-
 /*
  * Constant defines
  */
@@ -65,13 +64,13 @@
 
 DEFINE_ATOM_HELPER(AtmWindowsWmNativeHwnd, WINDOWSWM_NATIVE_HWND)
 static void
-winMWExtWMSetNativeProperty (RootlessWindowPtr pFrame);
+winMWExtWMSetNativeProperty(RootlessWindowPtr pFrame);
 
 /*
  * Global variables
  */
 
-Bool			g_fNoConfigureWindow = FALSE;
+Bool g_fNoConfigureWindow = FALSE;
 
 /*
  * Internal function to get the DIB format that is compatible with the screen
@@ -80,989 +79,953 @@ Bool			g_fNoConfigureWindow = FALSE;
 
 static
 Bool
-winMWExtWMQueryDIBFormat (win32RootlessWindowPtr pRLWinPriv, BITMAPINFOHEADER *pbmih)
+winMWExtWMQueryDIBFormat(win32RootlessWindowPtr pRLWinPriv,
+                         BITMAPINFOHEADER * pbmih)
 {
-  HBITMAP		hbmp;
+    HBITMAP hbmp;
+
 #if CYGMULTIWINDOW_DEBUG
-  LPDWORD		pdw = NULL;
+    LPDWORD pdw = NULL;
 #endif
-  
-  /* Create a memory bitmap compatible with the screen */
-  hbmp = CreateCompatibleBitmap (pRLWinPriv->hdcScreen, 1, 1);
-  if (hbmp == NULL)
-    {
-      ErrorF ("winMWExtWMQueryDIBFormat - CreateCompatibleBitmap failed\n");
-      return FALSE;
+
+    /* Create a memory bitmap compatible with the screen */
+    hbmp = CreateCompatibleBitmap(pRLWinPriv->hdcScreen, 1, 1);
+    if (hbmp == NULL) {
+        ErrorF("winMWExtWMQueryDIBFormat - CreateCompatibleBitmap failed\n");
+        return FALSE;
     }
-  
-  /* Initialize our bitmap info header */
-  ZeroMemory (pbmih, sizeof (BITMAPINFOHEADER) + 256 * sizeof (RGBQUAD));
-  pbmih->biSize = sizeof (BITMAPINFOHEADER);
-
-  /* Get the biBitCount */
-  if (!GetDIBits (pRLWinPriv->hdcScreen,
-		  hbmp,
-		  0, 1,
-		  NULL,
-		  (BITMAPINFO*) pbmih,
-		  DIB_RGB_COLORS))
-    {
-      ErrorF ("winMWExtWMQueryDIBFormat - First call to GetDIBits failed\n");
-      DeleteObject (hbmp);
-      return FALSE;
+
+    /* Initialize our bitmap info header */
+    ZeroMemory(pbmih, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD));
+    pbmih->biSize = sizeof(BITMAPINFOHEADER);
+
+    /* Get the biBitCount */
+    if (!GetDIBits(pRLWinPriv->hdcScreen,
+                   hbmp, 0, 1, NULL, (BITMAPINFO *) pbmih, DIB_RGB_COLORS)) {
+        ErrorF("winMWExtWMQueryDIBFormat - First call to GetDIBits failed\n");
+        DeleteObject(hbmp);
+        return FALSE;
     }
 
 #if CYGMULTIWINDOW_DEBUG
-  /* Get a pointer to bitfields */
-  pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));
+    /* Get a pointer to bitfields */
+    pdw = (DWORD *) ((CARD8 *) pbmih + sizeof(BITMAPINFOHEADER));
 
-  winDebug ("winMWExtWMQueryDIBFormat - First call masks: %08x %08x %08x\n",
-	  (unsigned int)pdw[0], (unsigned int)pdw[1], (unsigned int)pdw[2]);
+    winDebug("winMWExtWMQueryDIBFormat - First call masks: %08x %08x %08x\n",
+             (unsigned int) pdw[0], (unsigned int) pdw[1],
+             (unsigned int) pdw[2]);
 #endif
 
-  /* Get optimal color table, or the optimal bitfields */
-  if (!GetDIBits (pRLWinPriv->hdcScreen,
-		  hbmp,
-		  0, 1,
-		  NULL,
-		  (BITMAPINFO*)pbmih,
-		  DIB_RGB_COLORS))
-    {
-      ErrorF ("winMWExtWMQueryDIBFormat - Second call to GetDIBits "
-	      "failed\n");
-      DeleteObject (hbmp);
-      return FALSE;
+    /* Get optimal color table, or the optimal bitfields */
+    if (!GetDIBits(pRLWinPriv->hdcScreen,
+                   hbmp, 0, 1, NULL, (BITMAPINFO *) pbmih, DIB_RGB_COLORS)) {
+        ErrorF("winMWExtWMQueryDIBFormat - Second call to GetDIBits "
+               "failed\n");
+        DeleteObject(hbmp);
+        return FALSE;
     }
 
-  /* Free memory */
-  DeleteObject (hbmp);
-  
-  return TRUE;
+    /* Free memory */
+    DeleteObject(hbmp);
+
+    return TRUE;
 }
 
 static HRGN
-winMWExtWMCreateRgnFromRegion (RegionPtr pShape)
+winMWExtWMCreateRgnFromRegion(RegionPtr pShape)
 {
-  int		nRects;
-  BoxPtr	pRects, pEnd;
-  HRGN		hRgn, hRgnRect;
+    int nRects;
+    BoxPtr pRects, pEnd;
+    HRGN hRgn, hRgnRect;
 
-  if (pShape == NULL) return NULL;
+    if (pShape == NULL)
+        return NULL;
 
-  nRects = RegionNumRects(pShape);
-  pRects = RegionRects(pShape);
-  
-  hRgn = CreateRectRgn (0, 0, 0, 0);
-  if (hRgn == NULL)
-    {
-      ErrorF ("winReshape - Initial CreateRectRgn (%d, %d, %d, %d) "
-	      "failed: %d\n",
-	      0, 0, 0, 0, (int) GetLastError ());
+    nRects = RegionNumRects(pShape);
+    pRects = RegionRects(pShape);
+
+    hRgn = CreateRectRgn(0, 0, 0, 0);
+    if (hRgn == NULL) {
+        ErrorF("winReshape - Initial CreateRectRgn (%d, %d, %d, %d) "
+               "failed: %d\n", 0, 0, 0, 0, (int) GetLastError());
     }
 
-  /* Loop through all rectangles in the X region */
-  for (pEnd = pRects + nRects; pRects < pEnd; pRects++)
-    {
-      /* Create a Windows region for the X rectangle */
-      hRgnRect = CreateRectRgn (pRects->x1,
-				pRects->y1,
-				pRects->x2,
-				pRects->y2);
-      if (hRgnRect == NULL)
-	{
-	  ErrorF ("winReshape - Loop CreateRectRgn (%d, %d, %d, %d) "
-		  "failed: %d\n",
-		  pRects->x1,
-		  pRects->y1,
-		  pRects->x2,
-		  pRects->y2,
-		  (int) GetLastError ());
-	}
-      
-      /* Merge the Windows region with the accumulated region */
-      if (CombineRgn (hRgn, hRgn, hRgnRect, RGN_OR) == ERROR)
-	{
-	  ErrorF ("winReshape - CombineRgn () failed: %d\n",
-		  (int) GetLastError ());
-	}
-      
-      /* Delete the temporary Windows region */
-      DeleteObject (hRgnRect);
+    /* Loop through all rectangles in the X region */
+    for (pEnd = pRects + nRects; pRects < pEnd; pRects++) {
+        /* Create a Windows region for the X rectangle */
+        hRgnRect = CreateRectRgn(pRects->x1,
+                                 pRects->y1, pRects->x2, pRects->y2);
+        if (hRgnRect == NULL) {
+            ErrorF("winReshape - Loop CreateRectRgn (%d, %d, %d, %d) "
+                   "failed: %d\n",
+                   pRects->x1,
+                   pRects->y1, pRects->x2, pRects->y2, (int) GetLastError());
+        }
+
+        /* Merge the Windows region with the accumulated region */
+        if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == ERROR) {
+            ErrorF("winReshape - CombineRgn () failed: %d\n",
+                   (int) GetLastError());
+        }
+
+        /* Delete the temporary Windows region */
+        DeleteObject(hRgnRect);
     }
-  
-  return hRgn;
+
+    return hRgn;
 }
 
 static void
-InitWin32RootlessEngine (win32RootlessWindowPtr pRLWinPriv)
+InitWin32RootlessEngine(win32RootlessWindowPtr pRLWinPriv)
 {
-  pRLWinPriv->hdcScreen = GetDC (pRLWinPriv->hWnd);
-  pRLWinPriv->hdcShadow = CreateCompatibleDC (pRLWinPriv->hdcScreen);
-  pRLWinPriv->hbmpShadow = NULL;
-
-  /* Allocate bitmap info header */
-  pRLWinPriv->pbmihShadow = (BITMAPINFOHEADER*) malloc (sizeof (BITMAPINFOHEADER)
-							+ 256 * sizeof (RGBQUAD));
-  if (pRLWinPriv->pbmihShadow == NULL)
-    {
-      ErrorF ("InitWin32RootlessEngine - malloc () failed\n");
-      return;
+    pRLWinPriv->hdcScreen = GetDC(pRLWinPriv->hWnd);
+    pRLWinPriv->hdcShadow = CreateCompatibleDC(pRLWinPriv->hdcScreen);
+    pRLWinPriv->hbmpShadow = NULL;
+
+    /* Allocate bitmap info header */
+    pRLWinPriv->pbmihShadow =
+        (BITMAPINFOHEADER *) malloc(sizeof(BITMAPINFOHEADER)
+                                    + 256 * sizeof(RGBQUAD));
+    if (pRLWinPriv->pbmihShadow == NULL) {
+        ErrorF("InitWin32RootlessEngine - malloc () failed\n");
+        return;
     }
-  
-  /* Query the screen format */
-  winMWExtWMQueryDIBFormat (pRLWinPriv,
-				  pRLWinPriv->pbmihShadow);
+
+    /* Query the screen format */
+    winMWExtWMQueryDIBFormat(pRLWinPriv, pRLWinPriv->pbmihShadow);
 }
 
 Bool
-winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,
-			     int newX, int newY, RegionPtr pShape)
+winMWExtWMCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
+                      int newX, int newY, RegionPtr pShape)
 {
 #define CLASS_NAME_LENGTH 512
-  Bool				fResult = TRUE;
-  win32RootlessWindowPtr	pRLWinPriv;
-  WNDCLASSEX			wc;
-  char				pszClass[CLASS_NAME_LENGTH], pszWindowID[12];
-  HICON				hIcon;
-  HICON				hIconSmall;
-  char				*res_name, *res_class, *res_role;
-  static int			s_iWindowID = 0;
- 
+    Bool fResult = TRUE;
+    win32RootlessWindowPtr pRLWinPriv;
+    WNDCLASSEX wc;
+    char pszClass[CLASS_NAME_LENGTH], pszWindowID[12];
+    HICON hIcon;
+    HICON hIconSmall;
+    char *res_name, *res_class, *res_role;
+    static int s_iWindowID = 0;
+
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMCreateFrame %d %d - %d %d\n",
-	  newX, newY, pFrame->width, pFrame->height);
+    winDebug("winMWExtWMCreateFrame %d %d - %d %d\n",
+             newX, newY, pFrame->width, pFrame->height);
 #endif
 
-  pRLWinPriv = (win32RootlessWindowPtr) malloc (sizeof (win32RootlessWindowRec));
-  pRLWinPriv->pFrame = pFrame;
-  pRLWinPriv->pfb = NULL;
-  pRLWinPriv->hbmpShadow = NULL;
-  pRLWinPriv->hdcShadow = NULL;
-  pRLWinPriv->hdcScreen = NULL;
-  pRLWinPriv->pbmihShadow = NULL;
-  pRLWinPriv->fResized = TRUE;
-  pRLWinPriv->fClose = FALSE;
-  pRLWinPriv->fRestackingNow = FALSE;
-  pRLWinPriv->fDestroyed = FALSE;
-  pRLWinPriv->fMovingOrSizing = FALSE;
-  
-  // Store the implementation private frame ID
-  pFrame->wid = (RootlessFrameID) pRLWinPriv;
-
-  winSelectIcons(pFrame->win, &hIcon, &hIconSmall); 
-  
-  /* Set standard class name prefix so we can identify window easily */
-  strncpy (pszClass, WINDOW_CLASS_X, sizeof(pszClass));
-
-  if (winMultiWindowGetClassHint (pFrame->win, &res_name, &res_class))
-    {
-      strncat (pszClass, "-", 1);
-      strncat (pszClass, res_name, CLASS_NAME_LENGTH - strlen (pszClass));
-      strncat (pszClass, "-", 1);
-      strncat (pszClass, res_class, CLASS_NAME_LENGTH - strlen (pszClass));
-      
-      /* Check if a window class is provided by the WM_WINDOW_ROLE property,
-       * if not use the WM_CLASS information.
-       * For further information see:
-       * http://tronche.com/gui/x/icccm/sec-5.html
-       */
-      if (winMultiWindowGetWindowRole (pFrame->win, &res_role) )
-	{
-	  strcat (pszClass, "-");
-	  strcat (pszClass, res_role);
-	  free (res_role);
-	}
-
-      free (res_name);
-      free (res_class);
+    pRLWinPriv =
+        (win32RootlessWindowPtr) malloc(sizeof(win32RootlessWindowRec));
+    pRLWinPriv->pFrame = pFrame;
+    pRLWinPriv->pfb = NULL;
+    pRLWinPriv->hbmpShadow = NULL;
+    pRLWinPriv->hdcShadow = NULL;
+    pRLWinPriv->hdcScreen = NULL;
+    pRLWinPriv->pbmihShadow = NULL;
+    pRLWinPriv->fResized = TRUE;
+    pRLWinPriv->fClose = FALSE;
+    pRLWinPriv->fRestackingNow = FALSE;
+    pRLWinPriv->fDestroyed = FALSE;
+    pRLWinPriv->fMovingOrSizing = FALSE;
+
+    // Store the implementation private frame ID
+    pFrame->wid = (RootlessFrameID) pRLWinPriv;
+
+    winSelectIcons(pFrame->win, &hIcon, &hIconSmall);
+
+    /* Set standard class name prefix so we can identify window easily */
+    strncpy(pszClass, WINDOW_CLASS_X, sizeof(pszClass));
+
+    if (winMultiWindowGetClassHint(pFrame->win, &res_name, &res_class)) {
+        strncat(pszClass, "-", 1);
+        strncat(pszClass, res_name, CLASS_NAME_LENGTH - strlen(pszClass));
+        strncat(pszClass, "-", 1);
+        strncat(pszClass, res_class, CLASS_NAME_LENGTH - strlen(pszClass));
+
+        /* Check if a window class is provided by the WM_WINDOW_ROLE property,
+         * if not use the WM_CLASS information.
+         * For further information see:
+         * http://tronche.com/gui/x/icccm/sec-5.html
+         */
+        if (winMultiWindowGetWindowRole(pFrame->win, &res_role)) {
+            strcat(pszClass, "-");
+            strcat(pszClass, res_role);
+            free(res_role);
+        }
+
+        free(res_name);
+        free(res_class);
     }
 
-  /* Add incrementing window ID to make unique class name */
-  snprintf (pszWindowID, sizeof(pszWindowID), "-%x", s_iWindowID++);
-  pszWindowID[sizeof(pszWindowID)-1] = 0;
-  strcat (pszClass, pszWindowID);
+    /* Add incrementing window ID to make unique class name */
+    snprintf(pszWindowID, sizeof(pszWindowID), "-%x", s_iWindowID++);
+    pszWindowID[sizeof(pszWindowID) - 1] = 0;
+    strcat(pszClass, pszWindowID);
 
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winCreateWindowsWindow - Creating class: %s\n", pszClass);
+    winDebug("winCreateWindowsWindow - Creating class: %s\n", pszClass);
 #endif
 
-  /* Setup our window class */
-  wc.cbSize = sizeof(wc);
-  wc.style = CS_HREDRAW | CS_VREDRAW;
-  wc.lpfnWndProc = winMWExtWMWindowProc;
-  wc.cbClsExtra = 0;
-  wc.cbWndExtra = 0;
-  wc.hInstance = g_hInstance;
-  wc.hIcon = hIcon;
-  wc.hIconSm = hIconSmall;
-  wc.hCursor = 0;
-  wc.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH);
-  wc.lpszMenuName = NULL;
-  wc.lpszClassName = pszClass;
-  RegisterClassEx (&wc);
-
-  /* Create the window */
-  g_fNoConfigureWindow = TRUE;
-  pRLWinPriv->hWnd = CreateWindowExA (WS_EX_TOOLWINDOW,		/* Extended styles */
-				      pszClass,			/* Class name */
-				      WINDOW_TITLE_X,		/* Window name */
-				      WS_POPUP | WS_CLIPCHILDREN,
-				      newX,			/* Horizontal position */
-				      newY,			/* Vertical position */
-				      pFrame->width,		/* Right edge */ 
-				      pFrame->height,		/* Bottom edge */
-				      (HWND) NULL,		/* No parent or owner window */
-				      (HMENU) NULL,		/* No menu */
-				      GetModuleHandle (NULL),	/* Instance handle */
-				      pRLWinPriv);		/* ScreenPrivates */
-  if (pRLWinPriv->hWnd == NULL)
-    {
-      ErrorF ("winMWExtWMCreateFrame - CreateWindowExA () failed: %d\n",
-	      (int) GetLastError ());
-      fResult = FALSE;
+    /* Setup our window class */
+    wc.cbSize = sizeof(wc);
+    wc.style = CS_HREDRAW | CS_VREDRAW;
+    wc.lpfnWndProc = winMWExtWMWindowProc;
+    wc.cbClsExtra = 0;
+    wc.cbWndExtra = 0;
+    wc.hInstance = g_hInstance;
+    wc.hIcon = hIcon;
+    wc.hIconSm = hIconSmall;
+    wc.hCursor = 0;
+    wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+    wc.lpszMenuName = NULL;
+    wc.lpszClassName = pszClass;
+    RegisterClassEx(&wc);
+
+    /* Create the window */
+    g_fNoConfigureWindow = TRUE;
+    pRLWinPriv->hWnd = CreateWindowExA(WS_EX_TOOLWINDOW,        /* Extended styles */
+                                       pszClass,        /* Class name */
+                                       WINDOW_TITLE_X,  /* Window name */
+                                       WS_POPUP | WS_CLIPCHILDREN, newX,        /* Horizontal position */
+                                       newY,    /* Vertical position */
+                                       pFrame->width,   /* Right edge */
+                                       pFrame->height,  /* Bottom edge */
+                                       (HWND) NULL,     /* No parent or owner window */
+                                       (HMENU) NULL,    /* No menu */
+                                       GetModuleHandle(NULL),   /* Instance handle */
+                                       pRLWinPriv);     /* ScreenPrivates */
+    if (pRLWinPriv->hWnd == NULL) {
+        ErrorF("winMWExtWMCreateFrame - CreateWindowExA () failed: %d\n",
+               (int) GetLastError());
+        fResult = FALSE;
     }
 
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMCreateFrame - ShowWindow\n");
+    winDebug("winMWExtWMCreateFrame - ShowWindow\n");
 #endif
 
-  //ShowWindow (pRLWinPriv->hWnd, SW_SHOWNOACTIVATE);
-  g_fNoConfigureWindow = FALSE;
-  
-  if (pShape != NULL)
-    {
-      winMWExtWMReshapeFrame (pFrame->wid, pShape);
+    //ShowWindow (pRLWinPriv->hWnd, SW_SHOWNOACTIVATE);
+    g_fNoConfigureWindow = FALSE;
+
+    if (pShape != NULL) {
+        winMWExtWMReshapeFrame(pFrame->wid, pShape);
     }
 
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMCreateFrame - (%08x) %08x\n",
-	  (int) pFrame->wid, (int) pRLWinPriv->hWnd);
+    winDebug("winMWExtWMCreateFrame - (%08x) %08x\n",
+             (int) pFrame->wid, (int) pRLWinPriv->hWnd);
 #if 0
-  {
-   WindowPtr		pWin2 = NULL;
-   win32RootlessWindowPtr pRLWinPriv2 = NULL;
-
-   /* Check if the Windows window property for our X window pointer is valid */
-   if ((pWin2 = (WindowPtr)GetProp (pRLWinPriv->hWnd, WIN_WINDOW_PROP)) != NULL)
-     {
-       pRLWinPriv2 = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin2, FALSE);
-     }
-   winDebug ("winMWExtWMCreateFrame2 (%08x) %08x\n",
-	   pRLWinPriv2, pRLWinPriv2->hWnd);
-   if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd)
-     {
-       winDebug ("Error param missmatch\n");
-     }
- }
+    {
+        WindowPtr pWin2 = NULL;
+        win32RootlessWindowPtr pRLWinPriv2 = NULL;
+
+        /* Check if the Windows window property for our X window pointer is valid */
+        if ((pWin2 =
+             (WindowPtr) GetProp(pRLWinPriv->hWnd, WIN_WINDOW_PROP)) != NULL) {
+            pRLWinPriv2 =
+                (win32RootlessWindowPtr) RootlessFrameForWindow(pWin2, FALSE);
+        }
+        winDebug("winMWExtWMCreateFrame2 (%08x) %08x\n",
+                 pRLWinPriv2, pRLWinPriv2->hWnd);
+        if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd) {
+            winDebug("Error param missmatch\n");
+        }
+    }
 #endif
 #endif
 
-  winMWExtWMSetNativeProperty (pFrame);
+    winMWExtWMSetNativeProperty(pFrame);
 
-  return fResult;
+    return fResult;
 }
 
 void
-winMWExtWMDestroyFrame (RootlessFrameID wid)
+winMWExtWMDestroyFrame(RootlessFrameID wid)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-  HICON			hIcon;
-  HICON			hIconSm;
-  HMODULE		hInstance;
-  int			iReturn;
-  char			pszClass[CLASS_NAME_LENGTH];
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+    HICON hIcon;
+    HICON hIconSm;
+    HMODULE hInstance;
+    int iReturn;
+    char pszClass[CLASS_NAME_LENGTH];
 
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMDestroyFrame (%08x) %08x\n",
-	  (int) pRLWinPriv, (int) pRLWinPriv->hWnd);
+    winDebug("winMWExtWMDestroyFrame (%08x) %08x\n",
+             (int) pRLWinPriv, (int) pRLWinPriv->hWnd);
 #if 0
- {
-   WindowPtr		pWin2 = NULL;
-   win32RootlessWindowPtr pRLWinPriv2 = NULL;
-
-   /* Check if the Windows window property for our X window pointer is valid */
-   if ((pWin2 = (WindowPtr)GetProp (pRLWinPriv->hWnd, WIN_WINDOW_PROP)) != NULL)
-     {
-       pRLWinPriv2 = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin2, FALSE);
-     }
-   winDebug ("winMWExtWMDestroyFrame2 (%08x) %08x\n",
-	   pRLWinPriv2, pRLWinPriv2->hWnd);
-   if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd)
-     {
-       winDebug ("Error param missmatch\n");
-       *(int*)0 = 1;//raise exseption
-     }
- }
+    {
+        WindowPtr pWin2 = NULL;
+        win32RootlessWindowPtr pRLWinPriv2 = NULL;
+
+        /* Check if the Windows window property for our X window pointer is valid */
+        if ((pWin2 =
+             (WindowPtr) GetProp(pRLWinPriv->hWnd, WIN_WINDOW_PROP)) != NULL) {
+            pRLWinPriv2 =
+                (win32RootlessWindowPtr) RootlessFrameForWindow(pWin2, FALSE);
+        }
+        winDebug("winMWExtWMDestroyFrame2 (%08x) %08x\n",
+                 pRLWinPriv2, pRLWinPriv2->hWnd);
+        if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd) {
+            winDebug("Error param missmatch\n");
+            *(int *) 0 = 1;     //raise exseption
+        }
+    }
 #endif
 #endif
 
-  /* Store the info we need to destroy after this window is gone */
-  hInstance = (HINSTANCE) GetClassLongPtr (pRLWinPriv->hWnd, GCLP_HMODULE);
-  hIcon = (HICON)SendMessage(pRLWinPriv->hWnd, WM_GETICON, ICON_BIG, 0);
-  hIconSm = (HICON)SendMessage(pRLWinPriv->hWnd, WM_GETICON, ICON_SMALL, 0);
-  iReturn = GetClassName (pRLWinPriv->hWnd, pszClass, CLASS_NAME_LENGTH);
+    /* Store the info we need to destroy after this window is gone */
+    hInstance = (HINSTANCE) GetClassLongPtr(pRLWinPriv->hWnd, GCLP_HMODULE);
+    hIcon = (HICON) SendMessage(pRLWinPriv->hWnd, WM_GETICON, ICON_BIG, 0);
+    hIconSm = (HICON) SendMessage(pRLWinPriv->hWnd, WM_GETICON, ICON_SMALL, 0);
+    iReturn = GetClassName(pRLWinPriv->hWnd, pszClass, CLASS_NAME_LENGTH);
 
-  pRLWinPriv->fClose = TRUE;
-  pRLWinPriv->fDestroyed = TRUE;
+    pRLWinPriv->fClose = TRUE;
+    pRLWinPriv->fDestroyed = TRUE;
 
-  /* Destroy the Windows window */
-  DestroyWindow (pRLWinPriv->hWnd);
+    /* Destroy the Windows window */
+    DestroyWindow(pRLWinPriv->hWnd);
 
-  /* Only if we were able to get the name */
-  if (iReturn)
-    { 
+    /* Only if we were able to get the name */
+    if (iReturn) {
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMDestroyFrame - Unregistering %s: ", pszClass);
+        winDebug("winMWExtWMDestroyFrame - Unregistering %s: ", pszClass);
 #endif
-      iReturn = UnregisterClass (pszClass, hInstance);
+        iReturn = UnregisterClass(pszClass, hInstance);
     }
 
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMDestroyFramew - Deleting Icon\n");
+    winDebug("winMWExtWMDestroyFramew - Deleting Icon\n");
 #endif
 
-  winDestroyIcon(hIcon);
-  winDestroyIcon(hIconSm);
+    winDestroyIcon(hIcon);
+    winDestroyIcon(hIconSm);
 
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMDestroyFrame - done\n");
+    winDebug("winMWExtWMDestroyFrame - done\n");
 #endif
 }
 
 void
-winMWExtWMMoveFrame (RootlessFrameID wid, ScreenPtr pScreen, int iNewX, int iNewY)
+winMWExtWMMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int iNewX,
+                    int iNewY)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-  RECT rcNew;
-  DWORD dwExStyle;
-  DWORD dwStyle;
-  int iX, iY, iWidth, iHeight;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+    RECT rcNew;
+    DWORD dwExStyle;
+    DWORD dwStyle;
+    int iX, iY, iWidth, iHeight;
 
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMMoveFrame (%08x) (%d %d)\n", (int) pRLWinPriv, iNewX, iNewY);
+    winDebug("winMWExtWMMoveFrame (%08x) (%d %d)\n", (int) pRLWinPriv, iNewX,
+             iNewY);
 #endif
 
-  /* Get the Windows window style and extended style */
-  dwExStyle = GetWindowLongPtr (pRLWinPriv->hWnd, GWL_EXSTYLE);
-  dwStyle = GetWindowLongPtr (pRLWinPriv->hWnd, GWL_STYLE);
+    /* Get the Windows window style and extended style */
+    dwExStyle = GetWindowLongPtr(pRLWinPriv->hWnd, GWL_EXSTYLE);
+    dwStyle = GetWindowLongPtr(pRLWinPriv->hWnd, GWL_STYLE);
 
-  /* Get the X and Y location of the X window */
-  iX = iNewX + GetSystemMetrics (SM_XVIRTUALSCREEN);
-  iY = iNewY + GetSystemMetrics (SM_YVIRTUALSCREEN);
+    /* Get the X and Y location of the X window */
+    iX = iNewX + GetSystemMetrics(SM_XVIRTUALSCREEN);
+    iY = iNewY + GetSystemMetrics(SM_YVIRTUALSCREEN);
 
-  /* Get the height and width of the X window */
-  iWidth = pRLWinPriv->pFrame->width;
-  iHeight = pRLWinPriv->pFrame->height;
+    /* Get the height and width of the X window */
+    iWidth = pRLWinPriv->pFrame->width;
+    iHeight = pRLWinPriv->pFrame->height;
 
-  /* Store the origin, height, and width in a rectangle structure */
-  SetRect (&rcNew, iX, iY, iX + iWidth, iY + iHeight);
+    /* Store the origin, height, and width in a rectangle structure */
+    SetRect(&rcNew, iX, iY, iX + iWidth, iY + iHeight);
 
 #ifdef CYGMULTIWINDOW_DEBUG
-          winDebug("\tWindow {%d, %d, %d, %d}, {%d, %d}\n", 
-              rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
-              rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
+    winDebug("\tWindow {%d, %d, %d, %d}, {%d, %d}\n",
+             rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
+             rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
 #endif
-  /*
-   * Calculate the required size of the Windows window rectangle,
-   * given the size of the Windows window client area.
-   */
-  AdjustWindowRectEx (&rcNew, dwStyle, FALSE, dwExStyle);
+    /*
+     * Calculate the required size of the Windows window rectangle,
+     * given the size of the Windows window client area.
+     */
+    AdjustWindowRectEx(&rcNew, dwStyle, FALSE, dwExStyle);
 
 #ifdef CYGMULTIWINDOW_DEBUG
-          winDebug("\tAdjusted {%d, %d, %d, %d}, {%d, %d}\n", 
-              rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
-              rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
+    winDebug("\tAdjusted {%d, %d, %d, %d}, {%d, %d}\n",
+             rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
+             rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
 #endif
-  g_fNoConfigureWindow = TRUE;
-  SetWindowPos (pRLWinPriv->hWnd, NULL, rcNew.left, rcNew.top, 0, 0,
-		SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER);
-  g_fNoConfigureWindow = FALSE;
+    g_fNoConfigureWindow = TRUE;
+    SetWindowPos(pRLWinPriv->hWnd, NULL, rcNew.left, rcNew.top, 0, 0,
+                 SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER);
+    g_fNoConfigureWindow = FALSE;
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMMoveFrame (%08x) done\n", (int) pRLWinPriv);
+    winDebug("winMWExtWMMoveFrame (%08x) done\n", (int) pRLWinPriv);
 #endif
 }
 
 void
-winMWExtWMResizeFrame (RootlessFrameID wid, ScreenPtr pScreen,
-			     int iNewX, int iNewY,
-			     unsigned int uiNewWidth, unsigned int uiNewHeight,
-			     unsigned int uiGravity)
+winMWExtWMResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,
+                      int iNewX, int iNewY,
+                      unsigned int uiNewWidth, unsigned int uiNewHeight,
+                      unsigned int uiGravity)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-  RECT rcNew;
-  RECT rcOld;
-  DWORD dwExStyle;
-  DWORD dwStyle;
-  int iX, iY;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+    RECT rcNew;
+    RECT rcOld;
+    DWORD dwExStyle;
+    DWORD dwStyle;
+    int iX, iY;
 
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMResizeFrame (%08x) (%d %d)-(%d %d)\n",
-	  (int) pRLWinPriv, iNewX, iNewY, uiNewWidth, uiNewHeight);
+    winDebug("winMWExtWMResizeFrame (%08x) (%d %d)-(%d %d)\n",
+             (int) pRLWinPriv, iNewX, iNewY, uiNewWidth, uiNewHeight);
 #endif
 
-  pRLWinPriv->fResized = TRUE;
+    pRLWinPriv->fResized = TRUE;
 
-  /* Get the Windows window style and extended style */
-  dwExStyle = GetWindowLongPtr (pRLWinPriv->hWnd, GWL_EXSTYLE);
-  dwStyle = GetWindowLongPtr (pRLWinPriv->hWnd, GWL_STYLE);
+    /* Get the Windows window style and extended style */
+    dwExStyle = GetWindowLongPtr(pRLWinPriv->hWnd, GWL_EXSTYLE);
+    dwStyle = GetWindowLongPtr(pRLWinPriv->hWnd, GWL_STYLE);
 
-  /* Get the X and Y location of the X window */
-  iX = iNewX + GetSystemMetrics (SM_XVIRTUALSCREEN);
-  iY = iNewY + GetSystemMetrics (SM_YVIRTUALSCREEN);
+    /* Get the X and Y location of the X window */
+    iX = iNewX + GetSystemMetrics(SM_XVIRTUALSCREEN);
+    iY = iNewY + GetSystemMetrics(SM_YVIRTUALSCREEN);
 
-  /* Store the origin, height, and width in a rectangle structure */
-  SetRect (&rcNew, iX, iY, iX + uiNewWidth, iY + uiNewHeight);
+    /* Store the origin, height, and width in a rectangle structure */
+    SetRect(&rcNew, iX, iY, iX + uiNewWidth, iY + uiNewHeight);
 
-  /*
-   * Calculate the required size of the Windows window rectangle,
-   * given the size of the Windows window client area.
-   */
-  AdjustWindowRectEx (&rcNew, dwStyle, FALSE, dwExStyle);
+    /*
+     * Calculate the required size of the Windows window rectangle,
+     * given the size of the Windows window client area.
+     */
+    AdjustWindowRectEx(&rcNew, dwStyle, FALSE, dwExStyle);
 
-  /* Get a rectangle describing the old Windows window */
-  GetWindowRect (pRLWinPriv->hWnd, &rcOld);
+    /* Get a rectangle describing the old Windows window */
+    GetWindowRect(pRLWinPriv->hWnd, &rcOld);
 
-  /* Check if the old rectangle and new rectangle are the same */
-  if (!EqualRect (&rcNew, &rcOld))
-    {
+    /* Check if the old rectangle and new rectangle are the same */
+    if (!EqualRect(&rcNew, &rcOld)) {
 
-      g_fNoConfigureWindow = TRUE;
-      MoveWindow (pRLWinPriv->hWnd,
-		  rcNew.left, rcNew.top,
-		  rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
-		  TRUE);
-      g_fNoConfigureWindow = FALSE;
+        g_fNoConfigureWindow = TRUE;
+        MoveWindow(pRLWinPriv->hWnd,
+                   rcNew.left, rcNew.top,
+                   rcNew.right - rcNew.left, rcNew.bottom - rcNew.top, TRUE);
+        g_fNoConfigureWindow = FALSE;
     }
 }
 
 void
-winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid)
+winMWExtWMRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-  win32RootlessWindowPtr pRLNextWinPriv = (win32RootlessWindowPtr) nextWid;
-  winScreenPriv(pRLWinPriv->pFrame->win->drawable.pScreen);
-  winScreenInfo *pScreenInfo = NULL;
-  DWORD dwCurrentProcessID = GetCurrentProcessId ();
-  DWORD dwWindowProcessID = 0;
-  HWND hWnd;
-  Bool fFirst = TRUE;
-  Bool fNeedRestack = TRUE;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+    win32RootlessWindowPtr pRLNextWinPriv = (win32RootlessWindowPtr) nextWid;
+
+    winScreenPriv(pRLWinPriv->pFrame->win->drawable.pScreen);
+    winScreenInfo *pScreenInfo = NULL;
+    DWORD dwCurrentProcessID = GetCurrentProcessId();
+    DWORD dwWindowProcessID = 0;
+    HWND hWnd;
+    Bool fFirst = TRUE;
+    Bool fNeedRestack = TRUE;
+
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMRestackFrame (%08x)\n", (int) pRLWinPriv);
+    winDebug("winMWExtWMRestackFrame (%08x)\n", (int) pRLWinPriv);
 #endif
 
-  if (pScreenPriv && pScreenPriv->fRestacking) return;
+    if (pScreenPriv && pScreenPriv->fRestacking)
+        return;
 
-  if (pScreenPriv) pScreenInfo = pScreenPriv->pScreenInfo;
+    if (pScreenPriv)
+        pScreenInfo = pScreenPriv->pScreenInfo;
 
-  pRLWinPriv->fRestackingNow = TRUE;
+    pRLWinPriv->fRestackingNow = TRUE;
 
-  /* Show window */
-  if(!IsWindowVisible (pRLWinPriv->hWnd))
-    ShowWindow (pRLWinPriv->hWnd, SW_SHOWNOACTIVATE);
+    /* Show window */
+    if (!IsWindowVisible(pRLWinPriv->hWnd))
+        ShowWindow(pRLWinPriv->hWnd, SW_SHOWNOACTIVATE);
 
-  if (pRLNextWinPriv == NULL)
-    {
+    if (pRLNextWinPriv == NULL) {
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("Win %08x is top\n", pRLWinPriv);
+        winDebug("Win %08x is top\n", pRLWinPriv);
 #endif
-      pScreenPriv->widTop = wid;
-      SetWindowPos (pRLWinPriv->hWnd, HWND_TOP,
-		    0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
+        pScreenPriv->widTop = wid;
+        SetWindowPos(pRLWinPriv->hWnd, HWND_TOP,
+                     0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
     }
-  else if (winIsInternalWMRunning(pScreenInfo))
-    {
-      /* using mulwinidow wm */
+    else if (winIsInternalWMRunning(pScreenInfo)) {
+        /* using mulwinidow wm */
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("Win %08x is not top\n", pRLWinPriv);
+        winDebug("Win %08x is not top\n", pRLWinPriv);
 #endif
-      for (hWnd = GetNextWindow (pRLWinPriv->hWnd, GW_HWNDPREV);
-	   fNeedRestack && hWnd != NULL;
-	   hWnd = GetNextWindow (hWnd, GW_HWNDPREV))
-	{
-	  GetWindowThreadProcessId (hWnd, &dwWindowProcessID);
-
-	  if ((dwWindowProcessID == dwCurrentProcessID)
-	      && GetProp (hWnd, WIN_WINDOW_PROP))
-	    {
-	      if (hWnd == pRLNextWinPriv->hWnd)
-		{
-		  /* Enable interleave X window and Windows window */
-		  if (!fFirst)
-		    {
+        for (hWnd = GetNextWindow(pRLWinPriv->hWnd, GW_HWNDPREV);
+             fNeedRestack && hWnd != NULL;
+             hWnd = GetNextWindow(hWnd, GW_HWNDPREV)) {
+            GetWindowThreadProcessId(hWnd, &dwWindowProcessID);
+
+            if ((dwWindowProcessID == dwCurrentProcessID)
+                && GetProp(hWnd, WIN_WINDOW_PROP)) {
+                if (hWnd == pRLNextWinPriv->hWnd) {
+                    /* Enable interleave X window and Windows window */
+                    if (!fFirst) {
 #if CYGMULTIWINDOW_DEBUG
-		      winDebug ("raise: Insert after Win %08x\n", pRLNextWinPriv);
+                        winDebug("raise: Insert after Win %08x\n",
+                                 pRLNextWinPriv);
 #endif
-		      SetWindowPos (pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
-				    0, 0, 0, 0,
-				    SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
-		    }
-		  else
-		    {
+                        SetWindowPos(pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
+                                     0, 0, 0, 0,
+                                     SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+                    }
+                    else {
 #if CYGMULTIWINDOW_DEBUG
-		      winDebug ("No change\n");
+                        winDebug("No change\n");
 #endif
-		    }
-		  fNeedRestack = FALSE;
-		  break;
-		}
-	      if (fFirst) fFirst = FALSE;
-	    }
-	}
-
-      for (hWnd = GetNextWindow (pRLWinPriv->hWnd, GW_HWNDNEXT);
-	   fNeedRestack && hWnd != NULL;
-	   hWnd = GetNextWindow (hWnd, GW_HWNDNEXT))
-	{
-	  GetWindowThreadProcessId (hWnd, &dwWindowProcessID);
-
-	  if ((dwWindowProcessID == dwCurrentProcessID)
-	      && GetProp (hWnd, WIN_WINDOW_PROP))
-	    {
-	      if (hWnd == pRLNextWinPriv->hWnd)
-		{
+                    }
+                    fNeedRestack = FALSE;
+                    break;
+                }
+                if (fFirst)
+                    fFirst = FALSE;
+            }
+        }
+
+        for (hWnd = GetNextWindow(pRLWinPriv->hWnd, GW_HWNDNEXT);
+             fNeedRestack && hWnd != NULL;
+             hWnd = GetNextWindow(hWnd, GW_HWNDNEXT)) {
+            GetWindowThreadProcessId(hWnd, &dwWindowProcessID);
+
+            if ((dwWindowProcessID == dwCurrentProcessID)
+                && GetProp(hWnd, WIN_WINDOW_PROP)) {
+                if (hWnd == pRLNextWinPriv->hWnd) {
 #if CYGMULTIWINDOW_DEBUG
-		  winDebug ("lower: Insert after Win %08x\n", pRLNextWinPriv);
+                    winDebug("lower: Insert after Win %08x\n", pRLNextWinPriv);
 #endif
-		  SetWindowPos (pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
-				0, 0, 0, 0,
-				SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
-		  fNeedRestack = FALSE;
-		  break;
-		}
-	    }
-	}
+                    SetWindowPos(pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
+                                 0, 0, 0, 0,
+                                 SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+                    fNeedRestack = FALSE;
+                    break;
+                }
+            }
+        }
     }
-  else
-    {
-      /* using general wm like twm, wmaker etc.
-	 Interleave X window and Windows window will cause problem. */
-      SetWindowPos (pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
-		    0, 0, 0, 0,
-		    SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
+    else {
+        /* using general wm like twm, wmaker etc.
+           Interleave X window and Windows window will cause problem. */
+        SetWindowPos(pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
+                     0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
     }
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMRestackFrame - done (%08x)\n", (int) pRLWinPriv);
+    winDebug("winMWExtWMRestackFrame - done (%08x)\n", (int) pRLWinPriv);
 #endif
 
-  pRLWinPriv->fRestackingNow = FALSE;
+    pRLWinPriv->fRestackingNow = FALSE;
 }
 
 void
-winMWExtWMReshapeFrame (RootlessFrameID wid, RegionPtr pShape)
+winMWExtWMReshapeFrame(RootlessFrameID wid, RegionPtr pShape)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-  HRGN hRgn, hRgnWindow, hRgnClient;
-  RECT rcWindow, rcClient;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+    HRGN hRgn, hRgnWindow, hRgnClient;
+    RECT rcWindow, rcClient;
+
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMReshapeFrame (%08x)\n", (int) pRLWinPriv);
+    winDebug("winMWExtWMReshapeFrame (%08x)\n", (int) pRLWinPriv);
 #endif
 
-  hRgn = winMWExtWMCreateRgnFromRegion (pShape);
-  
-  /* Create region for non-client area */
-  GetWindowRect (pRLWinPriv->hWnd, &rcWindow);
-  GetClientRect (pRLWinPriv->hWnd, &rcClient);
-  MapWindowPoints (pRLWinPriv->hWnd, HWND_DESKTOP, (LPPOINT)&rcClient, 2);
-  OffsetRgn (hRgn, rcClient.left - rcWindow.left, rcClient.top - rcWindow.top);
-  OffsetRect (&rcClient, -rcWindow.left, -rcWindow.top);
-  OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
-  hRgnWindow = CreateRectRgnIndirect (&rcWindow);
-  hRgnClient = CreateRectRgnIndirect (&rcClient);
-  CombineRgn (hRgnWindow, hRgnWindow, hRgnClient, RGN_DIFF);
-  CombineRgn (hRgn, hRgnWindow, hRgn, RGN_OR);
-
-
-  SetWindowRgn (pRLWinPriv->hWnd, hRgn, TRUE);
-
-  DeleteObject (hRgnWindow);
-  DeleteObject (hRgnClient);
+    hRgn = winMWExtWMCreateRgnFromRegion(pShape);
+
+    /* Create region for non-client area */
+    GetWindowRect(pRLWinPriv->hWnd, &rcWindow);
+    GetClientRect(pRLWinPriv->hWnd, &rcClient);
+    MapWindowPoints(pRLWinPriv->hWnd, HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+    OffsetRgn(hRgn, rcClient.left - rcWindow.left, rcClient.top - rcWindow.top);
+    OffsetRect(&rcClient, -rcWindow.left, -rcWindow.top);
+    OffsetRect(&rcWindow, -rcWindow.left, -rcWindow.top);
+    hRgnWindow = CreateRectRgnIndirect(&rcWindow);
+    hRgnClient = CreateRectRgnIndirect(&rcClient);
+    CombineRgn(hRgnWindow, hRgnWindow, hRgnClient, RGN_DIFF);
+    CombineRgn(hRgn, hRgnWindow, hRgn, RGN_OR);
+
+    SetWindowRgn(pRLWinPriv->hWnd, hRgn, TRUE);
+
+    DeleteObject(hRgnWindow);
+    DeleteObject(hRgnClient);
 }
 
 void
-winMWExtWMUnmapFrame (RootlessFrameID wid)
+winMWExtWMUnmapFrame(RootlessFrameID wid)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMUnmapFrame (%08x)\n", (int) pRLWinPriv);
+    winDebug("winMWExtWMUnmapFrame (%08x)\n", (int) pRLWinPriv);
 #endif
 
-  g_fNoConfigureWindow = TRUE;
-  //ShowWindow (pRLWinPriv->hWnd, SW_MINIMIZE);
-  ShowWindow (pRLWinPriv->hWnd, SW_HIDE);
-  g_fNoConfigureWindow = FALSE;
+    g_fNoConfigureWindow = TRUE;
+    //ShowWindow (pRLWinPriv->hWnd, SW_MINIMIZE);
+    ShowWindow(pRLWinPriv->hWnd, SW_HIDE);
+    g_fNoConfigureWindow = FALSE;
 }
 
 /*
  * Fixme: Code sharing with winshadgdi.c and other engine support
  */
 void
-winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
+winMWExtWMStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-  winPrivScreenPtr	pScreenPriv = NULL;
-  winScreenInfo		*pScreenInfo = NULL;
-  ScreenPtr		pScreen = NULL;
-  DIBSECTION		dibsection;
-  Bool			fReturn = TRUE;
-  HDC			hdcNew;
-  HBITMAP		hbmpNew;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+    winPrivScreenPtr pScreenPriv = NULL;
+    winScreenInfo *pScreenInfo = NULL;
+    ScreenPtr pScreen = NULL;
+    DIBSECTION dibsection;
+    Bool fReturn = TRUE;
+    HDC hdcNew;
+    HBITMAP hbmpNew;
+
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMStartDrawing (%08x) %08x\n", (int) pRLWinPriv, pRLWinPriv->fDestroyed);
+    winDebug("winMWExtWMStartDrawing (%08x) %08x\n", (int) pRLWinPriv,
+             pRLWinPriv->fDestroyed);
 #endif
 
-  if (!pRLWinPriv->fDestroyed)
-    {
-      pScreen = pRLWinPriv->pFrame->win->drawable.pScreen;
-      if (pScreen) pScreenPriv = winGetScreenPriv(pScreen);
-      if (pScreenPriv) pScreenInfo = pScreenPriv->pScreenInfo;
-      
+    if (!pRLWinPriv->fDestroyed) {
+        pScreen = pRLWinPriv->pFrame->win->drawable.pScreen;
+        if (pScreen)
+            pScreenPriv = winGetScreenPriv(pScreen);
+        if (pScreenPriv)
+            pScreenInfo = pScreenPriv->pScreenInfo;
+
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("\tpScreenPriv %08X\n", (int) pScreenPriv);
-      winDebug ("\tpScreenInfo %08X\n", (int) pScreenInfo);
-      winDebug ("\t(%d, %d)\n", (int)pRLWinPriv->pFrame->width,
-		(int) pRLWinPriv->pFrame->height);
+        winDebug("\tpScreenPriv %08X\n", (int) pScreenPriv);
+        winDebug("\tpScreenInfo %08X\n", (int) pScreenInfo);
+        winDebug("\t(%d, %d)\n", (int) pRLWinPriv->pFrame->width,
+                 (int) pRLWinPriv->pFrame->height);
 #endif
-      if (pRLWinPriv->hdcScreen == NULL)
-	{
-	  InitWin32RootlessEngine (pRLWinPriv);
-	}
-      
-      if (pRLWinPriv->fResized)
-	{
-          /* width * bpp must be multiple of 4 to match 32bit alignment */
-	  int stridesize;
-	  int misalignment;
-         
-	  pRLWinPriv->pbmihShadow->biWidth = pRLWinPriv->pFrame->width;
-	  pRLWinPriv->pbmihShadow->biHeight = -pRLWinPriv->pFrame->height;
- 
-	  stridesize = pRLWinPriv->pFrame->width * (pScreenInfo->dwBPP >> 3);
-	  misalignment = stridesize & 3; 
-	  if (misalignment != 0)
-	  {
-	    stridesize += 4 - misalignment;
-	    pRLWinPriv->pbmihShadow->biWidth = stridesize / (pScreenInfo->dwBPP >> 3);
-	    winDebug("\tresizing to %d (was %d)\n", 
-		    pRLWinPriv->pbmihShadow->biWidth, pRLWinPriv->pFrame->width);
-	  }
-	  
-	  hdcNew = CreateCompatibleDC (pRLWinPriv->hdcScreen);
-	  /* Create a DI shadow bitmap with a bit pointer */
-	  hbmpNew = CreateDIBSection (pRLWinPriv->hdcScreen,
-				      (BITMAPINFO *) pRLWinPriv->pbmihShadow,
-				      DIB_RGB_COLORS,
-				      (VOID**) &pRLWinPriv->pfb,
-				      NULL,
-				      0);
-	  if (hbmpNew == NULL || pRLWinPriv->pfb == NULL)
-	    {
-	      ErrorF ("winMWExtWMStartDrawing - CreateDIBSection failed\n");
-	      //return FALSE;
-	    }
-	  else
-	    {
+        if (pRLWinPriv->hdcScreen == NULL) {
+            InitWin32RootlessEngine(pRLWinPriv);
+        }
+
+        if (pRLWinPriv->fResized) {
+            /* width * bpp must be multiple of 4 to match 32bit alignment */
+            int stridesize;
+            int misalignment;
+
+            pRLWinPriv->pbmihShadow->biWidth = pRLWinPriv->pFrame->width;
+            pRLWinPriv->pbmihShadow->biHeight = -pRLWinPriv->pFrame->height;
+
+            stridesize = pRLWinPriv->pFrame->width * (pScreenInfo->dwBPP >> 3);
+            misalignment = stridesize & 3;
+            if (misalignment != 0) {
+                stridesize += 4 - misalignment;
+                pRLWinPriv->pbmihShadow->biWidth =
+                    stridesize / (pScreenInfo->dwBPP >> 3);
+                winDebug("\tresizing to %d (was %d)\n",
+                         pRLWinPriv->pbmihShadow->biWidth,
+                         pRLWinPriv->pFrame->width);
+            }
+
+            hdcNew = CreateCompatibleDC(pRLWinPriv->hdcScreen);
+            /* Create a DI shadow bitmap with a bit pointer */
+            hbmpNew = CreateDIBSection(pRLWinPriv->hdcScreen,
+                                       (BITMAPINFO *) pRLWinPriv->pbmihShadow,
+                                       DIB_RGB_COLORS,
+                                       (VOID **) & pRLWinPriv->pfb, NULL, 0);
+            if (hbmpNew == NULL || pRLWinPriv->pfb == NULL) {
+                ErrorF("winMWExtWMStartDrawing - CreateDIBSection failed\n");
+                //return FALSE;
+            }
+            else {
 #if CYGMULTIWINDOW_DEBUG
-	      winDebug ("winMWExtWMStartDrawing - Shadow buffer allocated\n");
+                winDebug("winMWExtWMStartDrawing - Shadow buffer allocated\n");
 #endif
-	    }
-	  
-	  /* Get information about the bitmap that was allocated */
-	  GetObject (hbmpNew, sizeof (dibsection), &dibsection);
-	  
+            }
+
+            /* Get information about the bitmap that was allocated */
+            GetObject(hbmpNew, sizeof(dibsection), &dibsection);
+
 #if CYGMULTIWINDOW_DEBUG
-	  /* Print information about bitmap allocated */
-	  winDebug ("winMWExtWMStartDrawing - Dibsection width: %d height: %d "
-		    "depth: %d size image: %d\n",
-		    (unsigned int)dibsection.dsBmih.biWidth,
-		    (unsigned int)dibsection.dsBmih.biHeight,
-		    (unsigned int)dibsection.dsBmih.biBitCount,
-		    (unsigned int)dibsection.dsBmih.biSizeImage);
+            /* Print information about bitmap allocated */
+            winDebug("winMWExtWMStartDrawing - Dibsection width: %d height: %d "
+                     "depth: %d size image: %d\n",
+                     (unsigned int) dibsection.dsBmih.biWidth,
+                     (unsigned int) dibsection.dsBmih.biHeight,
+                     (unsigned int) dibsection.dsBmih.biBitCount,
+                     (unsigned int) dibsection.dsBmih.biSizeImage);
 #endif
-	  
-	  /* Select the shadow bitmap into the shadow DC */
-	  SelectObject (hdcNew, hbmpNew);
-	  
+
+            /* Select the shadow bitmap into the shadow DC */
+            SelectObject(hdcNew, hbmpNew);
+
 #if CYGMULTIWINDOW_DEBUG
-	  winDebug ("winMWExtWMStartDrawing - Attempting a shadow blit\n");
+            winDebug("winMWExtWMStartDrawing - Attempting a shadow blit\n");
 #endif
-	  
-	  /* Blit from the old shadow to the new shadow */
-	  fReturn = BitBlt (hdcNew,
-			    0, 0,
-			    pRLWinPriv->pFrame->width, pRLWinPriv->pFrame->height,
-			    pRLWinPriv->hdcShadow,
-			    0, 0,
-			    SRCCOPY);
-	  if (fReturn)
-	    {
+
+            /* Blit from the old shadow to the new shadow */
+            fReturn = BitBlt(hdcNew,
+                             0, 0,
+                             pRLWinPriv->pFrame->width,
+                             pRLWinPriv->pFrame->height, pRLWinPriv->hdcShadow,
+                             0, 0, SRCCOPY);
+            if (fReturn) {
 #if CYGMULTIWINDOW_DEBUG
-	      winDebug ("winMWExtWMStartDrawing - Shadow blit success\n");
+                winDebug("winMWExtWMStartDrawing - Shadow blit success\n");
 #endif
-	    }
-	  else
-	    {
-	      ErrorF ("winMWExtWMStartDrawing - Shadow blit failure\n");
-	    }
-	  
-	  /* Look for height weirdness */
-	  if (dibsection.dsBmih.biHeight < 0)
-	    {
-	      /* FIXME: Figure out why biHeight is sometimes negative */
-	      ErrorF ("winMWExtWMStartDrawing - WEIRDNESS - "
-                  "biHeight still negative: %d\n", 
-                  (int) dibsection.dsBmih.biHeight);
-	      ErrorF ("winMWExtWMStartDrawing - WEIRDNESS - "
-                  "Flipping biHeight sign\n");
-	      dibsection.dsBmih.biHeight = -dibsection.dsBmih.biHeight;
-	    }
-	  
-	  pRLWinPriv->dwWidthBytes = dibsection.dsBm.bmWidthBytes;
-	  
+            }
+            else {
+                ErrorF("winMWExtWMStartDrawing - Shadow blit failure\n");
+            }
+
+            /* Look for height weirdness */
+            if (dibsection.dsBmih.biHeight < 0) {
+                /* FIXME: Figure out why biHeight is sometimes negative */
+                ErrorF("winMWExtWMStartDrawing - WEIRDNESS - "
+                       "biHeight still negative: %d\n",
+                       (int) dibsection.dsBmih.biHeight);
+                ErrorF("winMWExtWMStartDrawing - WEIRDNESS - "
+                       "Flipping biHeight sign\n");
+                dibsection.dsBmih.biHeight = -dibsection.dsBmih.biHeight;
+            }
+
+            pRLWinPriv->dwWidthBytes = dibsection.dsBm.bmWidthBytes;
+
 #if CYGMULTIWINDOW_DEBUG
-	  winDebug ("winMWExtWMStartDrawing - bytesPerRow: %d\n",
-		    (unsigned int)dibsection.dsBm.bmWidthBytes);
+            winDebug("winMWExtWMStartDrawing - bytesPerRow: %d\n",
+                     (unsigned int) dibsection.dsBm.bmWidthBytes);
 #endif
-	  
-	  /* Free the old shadow bitmap */
-	  DeleteObject (pRLWinPriv->hdcShadow);
-	  DeleteObject (pRLWinPriv->hbmpShadow);
-	  
-	  pRLWinPriv->hdcShadow = hdcNew;
-	  pRLWinPriv->hbmpShadow = hbmpNew;
-	  
-	  pRLWinPriv->fResized = FALSE;
+
+            /* Free the old shadow bitmap */
+            DeleteObject(pRLWinPriv->hdcShadow);
+            DeleteObject(pRLWinPriv->hbmpShadow);
+
+            pRLWinPriv->hdcShadow = hdcNew;
+            pRLWinPriv->hbmpShadow = hbmpNew;
+
+            pRLWinPriv->fResized = FALSE;
 #if CYGMULTIWINDOW_DEBUG && FALSE
-	  winDebug ("winMWExtWMStartDrawing - 0x%08x %d\n",
-		(unsigned int)pRLWinPriv->pfb, 
-		(unsigned int)dibsection.dsBm.bmWidthBytes);
+            winDebug("winMWExtWMStartDrawing - 0x%08x %d\n",
+                     (unsigned int) pRLWinPriv->pfb,
+                     (unsigned int) dibsection.dsBm.bmWidthBytes);
 #endif
-	}
+        }
     }
-  else
-    {
-      ErrorF ("winMWExtWMStartDrawing - Already window was destroyed \n"); 
+    else {
+        ErrorF("winMWExtWMStartDrawing - Already window was destroyed \n");
     }
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMStartDrawing - done (0x%08x) 0x%08x %d\n",
-	    (int) pRLWinPriv,
-	    (unsigned int)pRLWinPriv->pfb, (unsigned int)pRLWinPriv->dwWidthBytes);
+    winDebug("winMWExtWMStartDrawing - done (0x%08x) 0x%08x %d\n",
+             (int) pRLWinPriv,
+             (unsigned int) pRLWinPriv->pfb,
+             (unsigned int) pRLWinPriv->dwWidthBytes);
 #endif
-  *pixelData = pRLWinPriv->pfb;
-  *bytesPerRow = pRLWinPriv->dwWidthBytes;
+    *pixelData = pRLWinPriv->pfb;
+    *bytesPerRow = pRLWinPriv->dwWidthBytes;
 }
 
 void
-winMWExtWMStopDrawing (RootlessFrameID wid, Bool fFlush)
+winMWExtWMStopDrawing(RootlessFrameID wid, Bool fFlush)
 {
 #if 0
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-  BLENDFUNCTION bfBlend;
-  SIZE szWin;
-  POINT ptSrc;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+    BLENDFUNCTION bfBlend;
+    SIZE szWin;
+    POINT ptSrc;
+
 #if CYGMULTIWINDOW_DEBUG || TRUE
-  winDebug ("winMWExtWMStopDrawing (%08x)\n", pRLWinPriv);
+    winDebug("winMWExtWMStopDrawing (%08x)\n", pRLWinPriv);
 #endif
-  szWin.cx = pRLWinPriv->dwWidth;
-  szWin.cy = pRLWinPriv->dwHeight;
-  ptSrc.x = 0;
-  ptSrc.y = 0;
-  bfBlend.BlendOp = AC_SRC_OVER;
-  bfBlend.BlendFlags = 0;
-  bfBlend.SourceConstantAlpha = 255;
-  bfBlend.AlphaFormat = AC_SRC_ALPHA;
-
-  if (!UpdateLayeredWindow (pRLWinPriv->hWnd,
-			    NULL, NULL, &szWin,
-			    pRLWinPriv->hdcShadow, &ptSrc,
-			    0, &bfBlend, ULW_ALPHA))
-    {
-      ErrorF ("winMWExtWMStopDrawing - UpdateLayeredWindow failed\n");
+    szWin.cx = pRLWinPriv->dwWidth;
+    szWin.cy = pRLWinPriv->dwHeight;
+    ptSrc.x = 0;
+    ptSrc.y = 0;
+    bfBlend.BlendOp = AC_SRC_OVER;
+    bfBlend.BlendFlags = 0;
+    bfBlend.SourceConstantAlpha = 255;
+    bfBlend.AlphaFormat = AC_SRC_ALPHA;
+
+    if (!UpdateLayeredWindow(pRLWinPriv->hWnd,
+                             NULL, NULL, &szWin,
+                             pRLWinPriv->hdcShadow, &ptSrc,
+                             0, &bfBlend, ULW_ALPHA)) {
+        ErrorF("winMWExtWMStopDrawing - UpdateLayeredWindow failed\n");
     }
 #endif
 }
 
 void
-winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage)
+winMWExtWMUpdateRegion(RootlessFrameID wid, RegionPtr pDamage)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+
 #if 0
-  BLENDFUNCTION bfBlend;
-  SIZE szWin;
-  POINT ptSrc;
+    BLENDFUNCTION bfBlend;
+    SIZE szWin;
+    POINT ptSrc;
 #endif
 #if CYGMULTIWINDOW_DEBUG && 0
-  winDebug ("winMWExtWMUpdateRegion (%08x)\n", pRLWinPriv);
+    winDebug("winMWExtWMUpdateRegion (%08x)\n", pRLWinPriv);
 #endif
 #if 0
-  szWin.cx = pRLWinPriv->dwWidth;
-  szWin.cy = pRLWinPriv->dwHeight;
-  ptSrc.x = 0;
-  ptSrc.y = 0;
-  bfBlend.BlendOp = AC_SRC_OVER;
-  bfBlend.BlendFlags = 0;
-  bfBlend.SourceConstantAlpha = 255;
-  bfBlend.AlphaFormat = AC_SRC_ALPHA;
-
-  if (!UpdateLayeredWindow (pRLWinPriv->hWnd,
-			    NULL, NULL, &szWin,
-			    pRLWinPriv->hdcShadow, &ptSrc,
-			    0, &bfBlend, ULW_ALPHA))
-    {
-      LPVOID lpMsgBuf;
-      
-      /* Display a fancy error message */
-      FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-		     FORMAT_MESSAGE_FROM_SYSTEM | 
-		     FORMAT_MESSAGE_IGNORE_INSERTS,
-		     NULL,
-		     GetLastError (),
-		     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-		     (LPTSTR) &lpMsgBuf,
-		     0, NULL);
-      
-      ErrorF ("winMWExtWMUpdateRegion - UpdateLayeredWindow failed: %s\n",
-	      (LPSTR)lpMsgBuf);
-      LocalFree (lpMsgBuf);
+    szWin.cx = pRLWinPriv->dwWidth;
+    szWin.cy = pRLWinPriv->dwHeight;
+    ptSrc.x = 0;
+    ptSrc.y = 0;
+    bfBlend.BlendOp = AC_SRC_OVER;
+    bfBlend.BlendFlags = 0;
+    bfBlend.SourceConstantAlpha = 255;
+    bfBlend.AlphaFormat = AC_SRC_ALPHA;
+
+    if (!UpdateLayeredWindow(pRLWinPriv->hWnd,
+                             NULL, NULL, &szWin,
+                             pRLWinPriv->hdcShadow, &ptSrc,
+                             0, &bfBlend, ULW_ALPHA)) {
+        LPVOID lpMsgBuf;
+
+        /* Display a fancy error message */
+        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                      FORMAT_MESSAGE_FROM_SYSTEM |
+                      FORMAT_MESSAGE_IGNORE_INSERTS,
+                      NULL,
+                      GetLastError(),
+                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                      (LPTSTR) & lpMsgBuf, 0, NULL);
+
+        ErrorF("winMWExtWMUpdateRegion - UpdateLayeredWindow failed: %s\n",
+               (LPSTR) lpMsgBuf);
+        LocalFree(lpMsgBuf);
     }
 #endif
-  if (!g_fNoConfigureWindow) UpdateWindow (pRLWinPriv->hWnd);
+    if (!g_fNoConfigureWindow)
+        UpdateWindow(pRLWinPriv->hWnd);
 }
 
 void
-winMWExtWMDamageRects (RootlessFrameID wid, int nCount, const BoxRec *pRects,
-			     int shift_x, int shift_y)
+winMWExtWMDamageRects(RootlessFrameID wid, int nCount, const BoxRec * pRects,
+                      int shift_x, int shift_y)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-  const BoxRec *pEnd;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+    const BoxRec *pEnd;
+
 #if CYGMULTIWINDOW_DEBUG && 0
-  winDebug ("winMWExtWMDamageRects (%08x, %d, %08x, %d, %d)\n",
-	    pRLWinPriv, nCount, pRects, shift_x, shift_y);
+    winDebug("winMWExtWMDamageRects (%08x, %d, %08x, %d, %d)\n",
+             pRLWinPriv, nCount, pRects, shift_x, shift_y);
 #endif
 
-  for (pEnd = pRects + nCount; pRects < pEnd; pRects++) {
+    for (pEnd = pRects + nCount; pRects < pEnd; pRects++) {
         RECT rcDmg;
+
         rcDmg.left = pRects->x1 + shift_x;
         rcDmg.top = pRects->y1 + shift_y;
         rcDmg.right = pRects->x2 + shift_x;
         rcDmg.bottom = pRects->y2 + shift_y;
 
-	InvalidateRect (pRLWinPriv->hWnd, &rcDmg, FALSE);
+        InvalidateRect(pRLWinPriv->hWnd, &rcDmg, FALSE);
     }
 }
 
 void
-winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin)
+winMWExtWMRootlessSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) pFrame->wid;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) pFrame->wid;
+
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMRootlessSwitchWindow (%08x) %08x\n",
-	    (int) pRLWinPriv, (int) pRLWinPriv->hWnd);
+    winDebug("winMWExtWMRootlessSwitchWindow (%08x) %08x\n",
+             (int) pRLWinPriv, (int) pRLWinPriv->hWnd);
 #endif
-  pRLWinPriv->pFrame = pFrame;
-  pRLWinPriv->fResized = TRUE;
+    pRLWinPriv->pFrame = pFrame;
+    pRLWinPriv->fResized = TRUE;
 
-  /* Set the window extended style flags */
-  SetWindowLongPtr (pRLWinPriv->hWnd, GWL_EXSTYLE, WS_EX_TOOLWINDOW);
+    /* Set the window extended style flags */
+    SetWindowLongPtr(pRLWinPriv->hWnd, GWL_EXSTYLE, WS_EX_TOOLWINDOW);
 
-  /* Set the window standard style flags */
-  SetWindowLongPtr (pRLWinPriv->hWnd, GWL_STYLE,
-		    WS_POPUP | WS_CLIPCHILDREN);
+    /* Set the window standard style flags */
+    SetWindowLongPtr(pRLWinPriv->hWnd, GWL_STYLE, WS_POPUP | WS_CLIPCHILDREN);
 
-  DeleteProperty (serverClient, oldWin, AtmWindowsWmNativeHwnd ());
-  winMWExtWMSetNativeProperty (pFrame);
+    DeleteProperty(serverClient, oldWin, AtmWindowsWmNativeHwnd());
+    winMWExtWMSetNativeProperty(pFrame);
 #if CYGMULTIWINDOW_DEBUG
 #if 0
- {
-   WindowPtr		pWin2 = NULL;
-   win32RootlessWindowPtr pRLWinPriv2 = NULL;
-
-   /* Check if the Windows window property for our X window pointer is valid */
-   if ((pWin2 = (WindowPtr)GetProp (pRLWinPriv->hWnd, WIN_WINDOW_PROP)) != NULL)
-     {
-       pRLWinPriv2 = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin2, FALSE);
-     }
-   winDebug ("winMWExtWMSwitchFrame2 (%08x) %08x\n",
-	   pRLWinPriv2, pRLWinPriv2->hWnd);
-   if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd)
-     {
-       winDebug ("Error param missmatch\n");
-     }
- }
+    {
+        WindowPtr pWin2 = NULL;
+        win32RootlessWindowPtr pRLWinPriv2 = NULL;
+
+        /* Check if the Windows window property for our X window pointer is valid */
+        if ((pWin2 =
+             (WindowPtr) GetProp(pRLWinPriv->hWnd, WIN_WINDOW_PROP)) != NULL) {
+            pRLWinPriv2 =
+                (win32RootlessWindowPtr) RootlessFrameForWindow(pWin2, FALSE);
+        }
+        winDebug("winMWExtWMSwitchFrame2 (%08x) %08x\n",
+                 pRLWinPriv2, pRLWinPriv2->hWnd);
+        if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd) {
+            winDebug("Error param missmatch\n");
+        }
+    }
 #endif
 #endif
 }
 
 void
-winMWExtWMCopyBytes (unsigned int width, unsigned int height,
-			   const void *src, unsigned int srcRowBytes,
-			   void *dst, unsigned int dstRowBytes)
+winMWExtWMCopyBytes(unsigned int width, unsigned int height,
+                    const void *src, unsigned int srcRowBytes,
+                    void *dst, unsigned int dstRowBytes)
 {
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMCopyBytes - Not implemented\n");
+    winDebug("winMWExtWMCopyBytes - Not implemented\n");
 #endif
 }
 
 void
-winMWExtWMCopyWindow (RootlessFrameID wid, int nDstRects, const BoxRec *pDstRects,
-			    int nDx, int nDy)
+winMWExtWMCopyWindow(RootlessFrameID wid, int nDstRects,
+                     const BoxRec * pDstRects, int nDx, int nDy)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-  const BoxRec *pEnd;
-  RECT rcDmg;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
+    const BoxRec *pEnd;
+    RECT rcDmg;
+
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMCopyWindow (%08x, %d, %08x, %d, %d)\n",
-	  (int) pRLWinPriv, nDstRects, (int) pDstRects, nDx, nDy);
+    winDebug("winMWExtWMCopyWindow (%08x, %d, %08x, %d, %d)\n",
+             (int) pRLWinPriv, nDstRects, (int) pDstRects, nDx, nDy);
 #endif
 
-  for (pEnd = pDstRects + nDstRects; pDstRects < pEnd; pDstRects++)
-    {
+    for (pEnd = pDstRects + nDstRects; pDstRects < pEnd; pDstRects++) {
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("BitBlt (%d, %d, %d, %d) (%d, %d)\n",
-	      pDstRects->x1, pDstRects->y1,
-	      pDstRects->x2 - pDstRects->x1,
-	      pDstRects->y2 - pDstRects->y1,
-	      pDstRects->x1 + nDx,
-	      pDstRects->y1 + nDy);
+        winDebug("BitBlt (%d, %d, %d, %d) (%d, %d)\n",
+                 pDstRects->x1, pDstRects->y1,
+                 pDstRects->x2 - pDstRects->x1,
+                 pDstRects->y2 - pDstRects->y1,
+                 pDstRects->x1 + nDx, pDstRects->y1 + nDy);
 #endif
 
-      if (!BitBlt (pRLWinPriv->hdcShadow,
-		   pDstRects->x1, pDstRects->y1,
-		   pDstRects->x2 - pDstRects->x1,
-		   pDstRects->y2 - pDstRects->y1,
-		   pRLWinPriv->hdcShadow,
-		   pDstRects->x1 + nDx,  pDstRects->y1 + nDy,
-		   SRCCOPY))
-	{
-	  ErrorF ("winMWExtWMCopyWindow - BitBlt failed.\n");
-	}
-      
-      rcDmg.left = pDstRects->x1;
-      rcDmg.top = pDstRects->y1;
-      rcDmg.right = pDstRects->x2;
-      rcDmg.bottom = pDstRects->y2;
-      
-      InvalidateRect (pRLWinPriv->hWnd, &rcDmg, FALSE);
+        if (!BitBlt(pRLWinPriv->hdcShadow,
+                    pDstRects->x1, pDstRects->y1,
+                    pDstRects->x2 - pDstRects->x1,
+                    pDstRects->y2 - pDstRects->y1,
+                    pRLWinPriv->hdcShadow,
+                    pDstRects->x1 + nDx, pDstRects->y1 + nDy, SRCCOPY)) {
+            ErrorF("winMWExtWMCopyWindow - BitBlt failed.\n");
+        }
+
+        rcDmg.left = pDstRects->x1;
+        rcDmg.top = pDstRects->y1;
+        rcDmg.right = pDstRects->x2;
+        rcDmg.bottom = pDstRects->y2;
+
+        InvalidateRect(pRLWinPriv->hWnd, &rcDmg, FALSE);
     }
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMCopyWindow - done\n");
+    winDebug("winMWExtWMCopyWindow - done\n");
 #endif
 }
 
-
 /*
  * winMWExtWMSetNativeProperty
  */
 
 static void
-winMWExtWMSetNativeProperty (RootlessWindowPtr pFrame)
+winMWExtWMSetNativeProperty(RootlessWindowPtr pFrame)
 {
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) pFrame->wid;
-  long lData;
+    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) pFrame->wid;
+    long lData;
 
-  /* FIXME: move this to WindowsWM extension */
+    /* FIXME: move this to WindowsWM extension */
 
-  lData = (long) pRLWinPriv->hWnd;
-  dixChangeWindowProperty(serverClient, pFrame->win, AtmWindowsWmNativeHwnd(),
-			  XA_INTEGER, 32, PropModeReplace, 1, &lData, TRUE);
+    lData = (long) pRLWinPriv->hWnd;
+    dixChangeWindowProperty(serverClient, pFrame->win, AtmWindowsWmNativeHwnd(),
+                            XA_INTEGER, 32, PropModeReplace, 1, &lData, TRUE);
 }
diff --git a/xorg-server/hw/xwin/winwin32rootlesswindow.c b/xorg-server/hw/xwin/winwin32rootlesswindow.c
index fbff83888..bfba1bfd0 100644
--- a/xorg-server/hw/xwin/winwin32rootlesswindow.c
+++ b/xorg-server/hw/xwin/winwin32rootlesswindow.c
@@ -42,436 +42,425 @@
  */
 
 void
-winMWExtWMReorderWindows (ScreenPtr pScreen)
+winMWExtWMReorderWindows(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  HWND hwnd = NULL;
-  win32RootlessWindowPtr pRLWin = NULL;
-  win32RootlessWindowPtr pRLWinSib = NULL;
-  DWORD dwCurrentProcessID = GetCurrentProcessId ();
-  DWORD dwWindowProcessID = 0;
-  XID vlist[2];
+    winScreenPriv(pScreen);
+    HWND hwnd = NULL;
+    win32RootlessWindowPtr pRLWin = NULL;
+    win32RootlessWindowPtr pRLWinSib = NULL;
+    DWORD dwCurrentProcessID = GetCurrentProcessId();
+    DWORD dwWindowProcessID = 0;
+    XID vlist[2];
 
 #if CYGMULTIWINDOW_DEBUG && FALSE
-  winDebug ("winMWExtWMReorderWindows\n");
+    winDebug("winMWExtWMReorderWindows\n");
 #endif
 
-  pScreenPriv->fRestacking = TRUE;
+    pScreenPriv->fRestacking = TRUE;
 
-  if (pScreenPriv->fWindowOrderChanged)
-    {
+    if (pScreenPriv->fWindowOrderChanged) {
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMReorderWindows - Need to restack\n");
+        winDebug("winMWExtWMReorderWindows - Need to restack\n");
 #endif
-      hwnd = GetTopWindow (NULL);
-
-      while (hwnd)
-	{
-	  GetWindowThreadProcessId (hwnd, &dwWindowProcessID);
-
-	  if ((dwWindowProcessID == dwCurrentProcessID)
-	      && GetProp (hwnd, WIN_WINDOW_PROP))
-	    {
-	      pRLWinSib = pRLWin;
-	      pRLWin = (win32RootlessWindowPtr)GetProp (hwnd, WIN_WINDOW_PROP);
-	      
-	      if (pRLWinSib)
-		{
-		  vlist[0] = pRLWinSib->pFrame->win->drawable.id;
-		  vlist[1] = Below;
-
-		  ConfigureWindow (pRLWin->pFrame->win, CWSibling | CWStackMode,
-				   vlist, wClient(pRLWin->pFrame->win));
-		}
-	      else
-		{
-		  /* 1st window - raise to the top */
-		  vlist[0] = Above;
-
-		  ConfigureWindow (pRLWin->pFrame->win, CWStackMode,
-				   vlist, wClient(pRLWin->pFrame->win));
-		}
-	    }
-	  hwnd = GetNextWindow (hwnd, GW_HWNDNEXT);
-	}
+        hwnd = GetTopWindow(NULL);
+
+        while (hwnd) {
+            GetWindowThreadProcessId(hwnd, &dwWindowProcessID);
+
+            if ((dwWindowProcessID == dwCurrentProcessID)
+                && GetProp(hwnd, WIN_WINDOW_PROP)) {
+                pRLWinSib = pRLWin;
+                pRLWin =
+                    (win32RootlessWindowPtr) GetProp(hwnd, WIN_WINDOW_PROP);
+
+                if (pRLWinSib) {
+                    vlist[0] = pRLWinSib->pFrame->win->drawable.id;
+                    vlist[1] = Below;
+
+                    ConfigureWindow(pRLWin->pFrame->win,
+                                    CWSibling | CWStackMode, vlist,
+                                    wClient(pRLWin->pFrame->win));
+                }
+                else {
+                    /* 1st window - raise to the top */
+                    vlist[0] = Above;
+
+                    ConfigureWindow(pRLWin->pFrame->win, CWStackMode,
+                                    vlist, wClient(pRLWin->pFrame->win));
+                }
+            }
+            hwnd = GetNextWindow(hwnd, GW_HWNDNEXT);
+        }
     }
 
-  pScreenPriv->fRestacking = FALSE;
-  pScreenPriv->fWindowOrderChanged = FALSE;
+    pScreenPriv->fRestacking = FALSE;
+    pScreenPriv->fWindowOrderChanged = FALSE;
 }
 #endif
 
-
 /*
  * winMWExtWMMoveXWindow
  */
 
 void
-winMWExtWMMoveXWindow (WindowPtr pWin, int x, int y)
+winMWExtWMMoveXWindow(WindowPtr pWin, int x, int y)
 {
-  CARD32 *vlist = malloc(sizeof(CARD32)*2);
+    CARD32 *vlist = malloc(sizeof(CARD32) * 2);
 
-  vlist[0] = x;
-  vlist[1] = y;
-  ConfigureWindow (pWin, CWX | CWY, vlist, wClient(pWin));
-  free(vlist);
+    vlist[0] = x;
+    vlist[1] = y;
+    ConfigureWindow(pWin, CWX | CWY, vlist, wClient(pWin));
+    free(vlist);
 }
 
-
 /*
  * winMWExtWMResizeXWindow
  */
 
 void
-winMWExtWMResizeXWindow (WindowPtr pWin, int w, int h)
+winMWExtWMResizeXWindow(WindowPtr pWin, int w, int h)
 {
-  CARD32 *vlist = malloc(sizeof(CARD32)*2);
+    CARD32 *vlist = malloc(sizeof(CARD32) * 2);
 
-  vlist[0] = w;
-  vlist[1] = h;
-  ConfigureWindow (pWin, CWWidth | CWHeight, vlist, wClient(pWin));
-  free(vlist);
+    vlist[0] = w;
+    vlist[1] = h;
+    ConfigureWindow(pWin, CWWidth | CWHeight, vlist, wClient(pWin));
+    free(vlist);
 }
 
-
 /*
  * winMWExtWMMoveResizeXWindow
  */
 
 void
-winMWExtWMMoveResizeXWindow (WindowPtr pWin, int x, int y, int w, int h)
+winMWExtWMMoveResizeXWindow(WindowPtr pWin, int x, int y, int w, int h)
 {
-  CARD32 *vlist = malloc(sizeof(long)*4);
+    CARD32 *vlist = malloc(sizeof(long) * 4);
 
-  vlist[0] = x;
-  vlist[1] = y;
-  vlist[2] = w;
-  vlist[3] = h;
+    vlist[0] = x;
+    vlist[1] = y;
+    vlist[2] = w;
+    vlist[3] = h;
 
-  ConfigureWindow (pWin, CWX | CWY | CWWidth | CWHeight, vlist, wClient(pWin));
-  free(vlist);
+    ConfigureWindow(pWin, CWX | CWY | CWWidth | CWHeight, vlist, wClient(pWin));
+    free(vlist);
 }
 
-
 /*
  * winMWExtWMUpdateIcon
  * Change the Windows window icon
  */
 
 void
-winMWExtWMUpdateIcon (Window id)
+winMWExtWMUpdateIcon(Window id)
 {
-  WindowPtr		pWin;
-  HICON			hIcon, hiconOld;
+    WindowPtr pWin;
+    HICON hIcon, hiconOld;
 
-  dixLookupResourceByType((pointer) &pWin, id, RT_WINDOW, NullClient, DixUnknownAccess);
-  hIcon = winOverrideIcon ((unsigned long)pWin);
+    dixLookupResourceByType((pointer) &pWin, id, RT_WINDOW, NullClient,
+                            DixUnknownAccess);
+    hIcon = winOverrideIcon((unsigned long) pWin);
 
-  if (!hIcon)
-    hIcon = winXIconToHICON (pWin, GetSystemMetrics(SM_CXICON));
+    if (!hIcon)
+        hIcon = winXIconToHICON(pWin, GetSystemMetrics(SM_CXICON));
 
-  if (hIcon)
-    {
-      win32RootlessWindowPtr pRLWinPriv
-	= (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, FALSE);
+    if (hIcon) {
+        win32RootlessWindowPtr pRLWinPriv
+            = (win32RootlessWindowPtr) RootlessFrameForWindow(pWin, FALSE);
 
-      if (pRLWinPriv->hWnd)
-	{
+        if (pRLWinPriv->hWnd) {
 
-          hiconOld = (HICON) SendMessage (pRLWinPriv->hWnd,
-                     WM_SETICON, ICON_BIG, (LPARAM) hIcon);
-          winDestroyIcon(hiconOld);
-	}
-      hIcon=NULL;
+            hiconOld = (HICON) SendMessage(pRLWinPriv->hWnd,
+                                           WM_SETICON, ICON_BIG,
+                                           (LPARAM) hIcon);
+            winDestroyIcon(hiconOld);
+        }
+        hIcon = NULL;
     }
 }
 
-
 /*
  * winMWExtWMDecorateWindow - Update window style. Called by EnumWindows.
  */
 
 wBOOL CALLBACK
-winMWExtWMDecorateWindow (HWND hwnd, LPARAM lParam)
+winMWExtWMDecorateWindow(HWND hwnd, LPARAM lParam)
 {
-  win32RootlessWindowPtr pRLWinPriv = NULL;
-  ScreenPtr		pScreen = NULL;
-  winPrivScreenPtr	pScreenPriv = NULL;
-  winScreenInfo		*pScreenInfo = NULL;
-
-  /* Check if the Windows window property for our X window pointer is valid */
-  if ((pRLWinPriv = (win32RootlessWindowPtr)GetProp (hwnd, WIN_WINDOW_PROP)) != NULL)
-    {
-      if (pRLWinPriv != NULL && pRLWinPriv->pFrame != NULL && pRLWinPriv->pFrame->win != NULL)
-        pScreen				= pRLWinPriv->pFrame->win->drawable.pScreen;
-      if (pScreen) pScreenPriv		= winGetScreenPriv(pScreen);
-      if (pScreenPriv) pScreenInfo	= pScreenPriv->pScreenInfo;
-      if (pRLWinPriv && pScreenInfo) winMWExtWMUpdateWindowDecoration (pRLWinPriv, pScreenInfo);
+    win32RootlessWindowPtr pRLWinPriv = NULL;
+    ScreenPtr pScreen = NULL;
+    winPrivScreenPtr pScreenPriv = NULL;
+    winScreenInfo *pScreenInfo = NULL;
+
+    /* Check if the Windows window property for our X window pointer is valid */
+    if ((pRLWinPriv =
+         (win32RootlessWindowPtr) GetProp(hwnd, WIN_WINDOW_PROP)) != NULL) {
+        if (pRLWinPriv != NULL && pRLWinPriv->pFrame != NULL &&
+            pRLWinPriv->pFrame->win != NULL)
+            pScreen = pRLWinPriv->pFrame->win->drawable.pScreen;
+        if (pScreen)
+            pScreenPriv = winGetScreenPriv(pScreen);
+        if (pScreenPriv)
+            pScreenInfo = pScreenPriv->pScreenInfo;
+        if (pRLWinPriv && pScreenInfo)
+            winMWExtWMUpdateWindowDecoration(pRLWinPriv, pScreenInfo);
     }
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * winMWExtWMUpdateWindowDecoration - Update window style.
  */
 
 void
-winMWExtWMUpdateWindowDecoration (win32RootlessWindowPtr pRLWinPriv,
-				  winScreenInfoPtr pScreenInfo)
+winMWExtWMUpdateWindowDecoration(win32RootlessWindowPtr pRLWinPriv,
+                                 winScreenInfoPtr pScreenInfo)
 {
-  Bool		fDecorate = FALSE;
-  DWORD		dwExStyle = 0;
-  DWORD		dwStyle = 0;
-  WINDOWPLACEMENT wndPlace;
-  UINT		showCmd = 0;
+    Bool fDecorate = FALSE;
+    DWORD dwExStyle = 0;
+    DWORD dwStyle = 0;
+    WINDOWPLACEMENT wndPlace;
+    UINT showCmd = 0;
 
-  wndPlace.length = sizeof (WINDOWPLACEMENT);
+    wndPlace.length = sizeof(WINDOWPLACEMENT);
 
-  /* Get current window placement */
-  GetWindowPlacement (pRLWinPriv->hWnd, &wndPlace);
+    /* Get current window placement */
+    GetWindowPlacement(pRLWinPriv->hWnd, &wndPlace);
 
-  if (winIsInternalWMRunning(pScreenInfo))
-    {
-      if (!pRLWinPriv->pFrame->win->overrideRedirect)
-	fDecorate = TRUE;
+    if (winIsInternalWMRunning(pScreenInfo)) {
+        if (!pRLWinPriv->pFrame->win->overrideRedirect)
+            fDecorate = TRUE;
     }
 #if 0
-  if (wndPlace.showCmd == SW_HIDE)
-    return;//showCmd = SWP_HIDEWINDOW;
-  else
-    showCmd = SWP_SHOWWINDOW;
+    if (wndPlace.showCmd == SW_HIDE)
+        return;                 //showCmd = SWP_HIDEWINDOW;
+    else
+        showCmd = SWP_SHOWWINDOW;
 #else
-  if (wndPlace.showCmd == SW_HIDE)
-    return;
+    if (wndPlace.showCmd == SW_HIDE)
+        return;
 
-  if (IsWindowVisible (pRLWinPriv->hWnd))
-    showCmd = SWP_SHOWWINDOW;
+    if (IsWindowVisible(pRLWinPriv->hWnd))
+        showCmd = SWP_SHOWWINDOW;
 #endif
 
-  showCmd |= SWP_NOMOVE | SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER;
-
-  winDebug ("winMWExtWMUpdateWindowDecoration %08x %s\n",
-	    (int)pRLWinPriv, fDecorate?"Decorate":"Bare");
-
-  /* Get the standard and extended window style information */
-  dwExStyle = GetWindowLongPtr (pRLWinPriv->hWnd, GWL_EXSTYLE);
-  dwStyle = GetWindowLongPtr (pRLWinPriv->hWnd, GWL_STYLE);
-
-  if (fDecorate)
-    {
-      RECT		rcNew;
-      int		iDx, iDy;
-      winWMMessageRec	wmMsg;
-      winScreenPriv(pScreenInfo->pScreen);
-
-      /* */
-      if (!(dwExStyle & WS_EX_APPWINDOW))
-	{
-	  winDebug ("\tBare=>Decorate\n");
-	  /* Setup a rectangle with the X window position and size */
-	  SetRect (&rcNew,
-		   pRLWinPriv->pFrame->x,
-		   pRLWinPriv->pFrame->y,
-		   pRLWinPriv->pFrame->x + pRLWinPriv->pFrame->width,
-		   pRLWinPriv->pFrame->y + pRLWinPriv->pFrame->height);
+    showCmd |= SWP_NOMOVE | SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER;
+
+    winDebug("winMWExtWMUpdateWindowDecoration %08x %s\n",
+             (int) pRLWinPriv, fDecorate ? "Decorate" : "Bare");
+
+    /* Get the standard and extended window style information */
+    dwExStyle = GetWindowLongPtr(pRLWinPriv->hWnd, GWL_EXSTYLE);
+    dwStyle = GetWindowLongPtr(pRLWinPriv->hWnd, GWL_STYLE);
+
+    if (fDecorate) {
+        RECT rcNew;
+        int iDx, iDy;
+        winWMMessageRec wmMsg;
+
+        winScreenPriv(pScreenInfo->pScreen);
+
+        /* */
+        if (!(dwExStyle & WS_EX_APPWINDOW)) {
+            winDebug("\tBare=>Decorate\n");
+            /* Setup a rectangle with the X window position and size */
+            SetRect(&rcNew,
+                    pRLWinPriv->pFrame->x,
+                    pRLWinPriv->pFrame->y,
+                    pRLWinPriv->pFrame->x + pRLWinPriv->pFrame->width,
+                    pRLWinPriv->pFrame->y + pRLWinPriv->pFrame->height);
 
 #ifdef CYGMULTIWINDOW_DEBUG
-          winDebug("\tWindow extend {%d, %d, %d, %d}, {%d, %d}\n", 
-              rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
-              rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
+            winDebug("\tWindow extend {%d, %d, %d, %d}, {%d, %d}\n",
+                     rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
+                     rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
 #endif
-	  /* */
-	  AdjustWindowRectEx (&rcNew,
-			      WS_POPUP | WS_SIZEBOX | WS_OVERLAPPEDWINDOW,
-			      FALSE,
-			      WS_EX_APPWINDOW);
+            /* */
+            AdjustWindowRectEx(&rcNew,
+                               WS_POPUP | WS_SIZEBOX | WS_OVERLAPPEDWINDOW,
+                               FALSE, WS_EX_APPWINDOW);
 
 #ifdef CYGMULTIWINDOW_DEBUG
-          winDebug("\tAdjusted {%d, %d, %d, %d}, {%d, %d}\n", 
-              rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
-              rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
+            winDebug("\tAdjusted {%d, %d, %d, %d}, {%d, %d}\n",
+                     rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
+                     rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
 #endif
-	  /* Calculate position deltas */
-	  iDx = pRLWinPriv->pFrame->x - rcNew.left;
-	  iDy = pRLWinPriv->pFrame->y - rcNew.top;
+            /* Calculate position deltas */
+            iDx = pRLWinPriv->pFrame->x - rcNew.left;
+            iDy = pRLWinPriv->pFrame->y - rcNew.top;
 
-	  /* Calculate new rectangle */
-	  rcNew.left += iDx;
-	  rcNew.right += iDx;
-	  rcNew.top += iDy;
-	  rcNew.bottom += iDy;
+            /* Calculate new rectangle */
+            rcNew.left += iDx;
+            rcNew.right += iDx;
+            rcNew.top += iDy;
+            rcNew.bottom += iDy;
 
-	  /* Set the window extended style flags */
-	  SetWindowLongPtr (pRLWinPriv->hWnd, GWL_EXSTYLE, WS_EX_APPWINDOW);
+            /* Set the window extended style flags */
+            SetWindowLongPtr(pRLWinPriv->hWnd, GWL_EXSTYLE, WS_EX_APPWINDOW);
 
-	  /* Set the window standard style flags */
-	  SetWindowLongPtr (pRLWinPriv->hWnd, GWL_STYLE,
-			    WS_POPUP | WS_SIZEBOX | WS_OVERLAPPEDWINDOW);
+            /* Set the window standard style flags */
+            SetWindowLongPtr(pRLWinPriv->hWnd, GWL_STYLE,
+                             WS_POPUP | WS_SIZEBOX | WS_OVERLAPPEDWINDOW);
 
 #ifdef CYGMULTIWINDOW_DEBUG
-          winDebug("\tWindowStyle: %08x %08x\n",
-              WS_POPUP | WS_SIZEBOX | WS_OVERLAPPEDWINDOW,
-              WS_EX_APPWINDOW);
+            winDebug("\tWindowStyle: %08x %08x\n",
+                     WS_POPUP | WS_SIZEBOX | WS_OVERLAPPEDWINDOW,
+                     WS_EX_APPWINDOW);
 #endif
-	  /* Position the Windows window */
+            /* Position the Windows window */
 #ifdef CYGMULTIWINDOW_DEBUG
-          winDebug("\tMoved {%d, %d, %d, %d}, {%d, %d}\n", 
-              rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
-              rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
+            winDebug("\tMoved {%d, %d, %d, %d}, {%d, %d}\n",
+                     rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
+                     rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
 #endif
-	  SetWindowPos (pRLWinPriv->hWnd, NULL,
-			rcNew.left, rcNew.top,
-			rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
-			showCmd);
-            
-
-	  wmMsg.hwndWindow = pRLWinPriv->hWnd;
-	  wmMsg.iWindow	= (Window)pRLWinPriv->pFrame->win->drawable.id;
-	  wmMsg.msg = WM_WM_NAME_EVENT;
-	  winSendMessageToWM (pScreenPriv->pWMInfo, &wmMsg);
-
-	  winMWExtWMReshapeFrame ((RootlessFrameID)pRLWinPriv ,
-				  wBoundingShape(pRLWinPriv->pFrame->win));
-	}
+            SetWindowPos(pRLWinPriv->hWnd, NULL,
+                         rcNew.left, rcNew.top,
+                         rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
+                         showCmd);
+
+            wmMsg.hwndWindow = pRLWinPriv->hWnd;
+            wmMsg.iWindow = (Window) pRLWinPriv->pFrame->win->drawable.id;
+            wmMsg.msg = WM_WM_NAME_EVENT;
+            winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
+
+            winMWExtWMReshapeFrame((RootlessFrameID) pRLWinPriv,
+                                   wBoundingShape(pRLWinPriv->pFrame->win));
+        }
     }
-  else
-    {
-      RECT		rcNew;
-
-      /* */
-      if (dwExStyle & WS_EX_APPWINDOW)
-	{
-	  winDebug ("\tDecorate=>Bare\n");
-	  /* Setup a rectangle with the X window position and size */
-	  SetRect (&rcNew,
-		   pRLWinPriv->pFrame->x,
-		   pRLWinPriv->pFrame->y,
-		   pRLWinPriv->pFrame->x + pRLWinPriv->pFrame->width,
-		   pRLWinPriv->pFrame->y + pRLWinPriv->pFrame->height);
+    else {
+        RECT rcNew;
+
+        /* */
+        if (dwExStyle & WS_EX_APPWINDOW) {
+            winDebug("\tDecorate=>Bare\n");
+            /* Setup a rectangle with the X window position and size */
+            SetRect(&rcNew,
+                    pRLWinPriv->pFrame->x,
+                    pRLWinPriv->pFrame->y,
+                    pRLWinPriv->pFrame->x + pRLWinPriv->pFrame->width,
+                    pRLWinPriv->pFrame->y + pRLWinPriv->pFrame->height);
 #if 0
-	  /* */
-	  AdjustWindowRectEx (&rcNew,
-			      WS_POPUP | WS_CLIPCHILDREN,
-			      FALSE,
-			      WS_EX_TOOLWINDOW);
-
-	  /* Calculate position deltas */
-	  iDx = pRLWinPriv->pFrame->x - rcNew.left;
-	  iDy = pRLWinPriv->pFrame->y - rcNew.top;
-
-	  /* Calculate new rectangle */
-	  rcNew.left += iDx;
-	  rcNew.right += iDx;
-	  rcNew.top += iDy;
-	  rcNew.bottom += iDy;
+            /* */
+            AdjustWindowRectEx(&rcNew,
+                               WS_POPUP | WS_CLIPCHILDREN,
+                               FALSE, WS_EX_TOOLWINDOW);
+
+            /* Calculate position deltas */
+            iDx = pRLWinPriv->pFrame->x - rcNew.left;
+            iDy = pRLWinPriv->pFrame->y - rcNew.top;
+
+            /* Calculate new rectangle */
+            rcNew.left += iDx;
+            rcNew.right += iDx;
+            rcNew.top += iDy;
+            rcNew.bottom += iDy;
 #endif
 
-	  /* Hide window temporary to remove from taskbar. */
-	  ShowWindow( pRLWinPriv->hWnd, SW_HIDE );
+            /* Hide window temporary to remove from taskbar. */
+            ShowWindow(pRLWinPriv->hWnd, SW_HIDE);
 
-	  /* Set the window extended style flags */
-	  SetWindowLongPtr (pRLWinPriv->hWnd, GWL_EXSTYLE, WS_EX_TOOLWINDOW);
+            /* Set the window extended style flags */
+            SetWindowLongPtr(pRLWinPriv->hWnd, GWL_EXSTYLE, WS_EX_TOOLWINDOW);
 
-	  /* Set the window standard style flags */
-	  SetWindowLongPtr (pRLWinPriv->hWnd, GWL_STYLE,
-			    WS_POPUP | WS_CLIPCHILDREN);
+            /* Set the window standard style flags */
+            SetWindowLongPtr(pRLWinPriv->hWnd, GWL_STYLE,
+                             WS_POPUP | WS_CLIPCHILDREN);
 
-	  /* Position the Windows window */
-	  SetWindowPos (pRLWinPriv->hWnd, NULL,
-			rcNew.left, rcNew.top,
-			rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
-			showCmd);
+            /* Position the Windows window */
+            SetWindowPos(pRLWinPriv->hWnd, NULL,
+                         rcNew.left, rcNew.top,
+                         rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
+                         showCmd);
 
-	  winMWExtWMReshapeFrame ((RootlessFrameID)pRLWinPriv ,
-				  wBoundingShape(pRLWinPriv->pFrame->win));
-	}
+            winMWExtWMReshapeFrame((RootlessFrameID) pRLWinPriv,
+                                   wBoundingShape(pRLWinPriv->pFrame->win));
+        }
     }
 }
 
-
 /*
  * winIsInternalWMRunning (winScreenInfoPtr pScreenInfo)
  */
 Bool
-winIsInternalWMRunning (winScreenInfoPtr pScreenInfo)
+winIsInternalWMRunning(winScreenInfoPtr pScreenInfo)
 {
-  return pScreenInfo->fInternalWM && !pScreenInfo->fAnotherWMRunning;
+    return pScreenInfo->fInternalWM && !pScreenInfo->fAnotherWMRunning;
 }
 
-
 /*
  * winMWExtWMRestackWindows
  */
 
 void
-winMWExtWMRestackWindows (ScreenPtr pScreen)
+winMWExtWMRestackWindows(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  WindowPtr pRoot = pScreen->root;
-  WindowPtr pWin = NULL;
-  WindowPtr pWinPrev = NULL;
-  win32RootlessWindowPtr pRLWin = NULL;
-  win32RootlessWindowPtr pRLWinPrev = NULL;
-  int  nWindow = 0;
-  HDWP hWinPosInfo = NULL;
+    winScreenPriv(pScreen);
+    WindowPtr pRoot = pScreen->root;
+    WindowPtr pWin = NULL;
+    WindowPtr pWinPrev = NULL;
+    win32RootlessWindowPtr pRLWin = NULL;
+    win32RootlessWindowPtr pRLWinPrev = NULL;
+    int nWindow = 0;
+    HDWP hWinPosInfo = NULL;
 
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMRestackWindows\n");
+    winDebug("winMWExtWMRestackWindows\n");
 #endif
 
-  pScreenPriv->fRestacking = TRUE;
+    pScreenPriv->fRestacking = TRUE;
 
-  if (pRoot != NULL)
-    {
-      for (pWin = pRoot->firstChild; pWin; pWin = pWin->nextSib)
-	nWindow ++;
+    if (pRoot != NULL) {
+        for (pWin = pRoot->firstChild; pWin; pWin = pWin->nextSib)
+            nWindow++;
 
-      hWinPosInfo = BeginDeferWindowPos(nWindow);
+        hWinPosInfo = BeginDeferWindowPos(nWindow);
 
-      for (pWin = pRoot->firstChild; pWin; pWin = pWin->nextSib)
-	{
-	  if (pWin->realized)
-	    {
-	      UINT uFlags;
+        for (pWin = pRoot->firstChild; pWin; pWin = pWin->nextSib) {
+            if (pWin->realized) {
+                UINT uFlags;
 
-	      pRLWin = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, FALSE);
-	      if (pRLWin == NULL) continue;
+                pRLWin =
+                    (win32RootlessWindowPtr) RootlessFrameForWindow(pWin,
+                                                                    FALSE);
+                if (pRLWin == NULL)
+                    continue;
 
-	      if (pWinPrev)
-		pRLWinPrev = (win32RootlessWindowPtr) RootlessFrameForWindow (pWinPrev, FALSE);
+                if (pWinPrev)
+                    pRLWinPrev =
+                        (win32RootlessWindowPtr)
+                        RootlessFrameForWindow(pWinPrev, FALSE);
 
-	      uFlags = SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW;
-	      if (pRLWinPrev != NULL) uFlags |= SWP_NOACTIVATE;
+                uFlags = SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW;
+                if (pRLWinPrev != NULL)
+                    uFlags |= SWP_NOACTIVATE;
 
 #if CYGMULTIWINDOW_DEBUG
-	      winDebug ("winMWExtWMRestackWindows - DeferWindowPos (%08x, %08x)\n",
-			pRLWin->hWnd,
-			pRLWinPrev ? pRLWinPrev->hWnd : HWND_TOP);
+                winDebug
+                    ("winMWExtWMRestackWindows - DeferWindowPos (%08x, %08x)\n",
+                     pRLWin->hWnd, pRLWinPrev ? pRLWinPrev->hWnd : HWND_TOP);
 #endif
-	      hWinPosInfo = DeferWindowPos (hWinPosInfo, pRLWin->hWnd,
-					    pRLWinPrev ? pRLWinPrev->hWnd : HWND_TOP,
-					    0, 0, 0, 0,
-					    uFlags);
-	      if (hWinPosInfo == NULL)
-		{
-		  ErrorF ("winMWExtWMRestackWindows - DeferWindowPos () failed: %d\n",
-			  (int) GetLastError ());
-		  return;
-		}
-	      pWinPrev = pWin;
-	    }
-	}
-      if (!EndDeferWindowPos (hWinPosInfo))
-	{
-	  ErrorF ("winMWExtWMRestackWindows - EndDeferWindowPos () failed: %d\n",
-		  (int) GetLastError ());
-	  return;
-	}
+                hWinPosInfo = DeferWindowPos(hWinPosInfo, pRLWin->hWnd,
+                                             pRLWinPrev ? pRLWinPrev->
+                                             hWnd : HWND_TOP, 0, 0, 0, 0,
+                                             uFlags);
+                if (hWinPosInfo == NULL) {
+                    ErrorF
+                        ("winMWExtWMRestackWindows - DeferWindowPos () failed: %d\n",
+                         (int) GetLastError());
+                    return;
+                }
+                pWinPrev = pWin;
+            }
+        }
+        if (!EndDeferWindowPos(hWinPosInfo)) {
+            ErrorF
+                ("winMWExtWMRestackWindows - EndDeferWindowPos () failed: %d\n",
+                 (int) GetLastError());
+            return;
+        }
     }
 
 #if CYGMULTIWINDOW_DEBUG
-  winDebug ("winMWExtWMRestackWindows - done\n");
+    winDebug("winMWExtWMRestackWindows - done\n");
 #endif
-  pScreenPriv->fRestacking = FALSE;
+    pScreenPriv->fRestacking = FALSE;
 }
diff --git a/xorg-server/hw/xwin/winwin32rootlesswndproc.c b/xorg-server/hw/xwin/winwin32rootlesswndproc.c
index c60a76cba..436f9edd6 100644
--- a/xorg-server/hw/xwin/winwin32rootlesswndproc.c
+++ b/xorg-server/hw/xwin/winwin32rootlesswndproc.c
@@ -43,7 +43,6 @@
 #include "winmsg.h"
 #include "inputstr.h"
 
-
 /*
  * Constant defines
  */
@@ -51,1281 +50,1245 @@
 #define MOUSE_ACTIVATE_DEFAULT		TRUE
 #define RAISE_ON_CLICK_DEFAULT		FALSE
 
-
 /*
  * Local globals
  */
 
-static UINT_PTR		g_uipMousePollingTimerID = 0;
-
+static UINT_PTR g_uipMousePollingTimerID = 0;
 
 /*
  * Local function
  */
 
 DEFINE_ATOM_HELPER(AtmWindowsWmRaiseOnClick, WINDOWSWM_RAISE_ON_CLICK)
-DEFINE_ATOM_HELPER(AtmWindowsWMMouseActivate, WINDOWSWM_MOUSE_ACTIVATE)
+    DEFINE_ATOM_HELPER(AtmWindowsWMMouseActivate, WINDOWSWM_MOUSE_ACTIVATE)
 /* DEFINE_ATOM_HELPER(AtmWindowsWMClientWindow, WINDOWSWM_CLIENT_WINDOW) */
-
 /*
  * ConstrainSize - Taken from TWM sources - Respects hints for sizing
  */
 #define makemult(a,b) ((b==1) ? (a) : (((int)((a)/(b))) * (b)) )
 static void
-ConstrainSize (WinXSizeHints hints, int *widthp, int *heightp)
+ConstrainSize(WinXSizeHints hints, int *widthp, int *heightp)
 {
-  int minWidth, minHeight, maxWidth, maxHeight, xinc, yinc, delta;
-  int baseWidth, baseHeight;
-  int dwidth = *widthp, dheight = *heightp;
-  
-  if (hints.flags & PMinSize)
-    {
-      minWidth = hints.min_width;
-      minHeight = hints.min_height;
+    int minWidth, minHeight, maxWidth, maxHeight, xinc, yinc, delta;
+    int baseWidth, baseHeight;
+    int dwidth = *widthp, dheight = *heightp;
+
+    if (hints.flags & PMinSize) {
+        minWidth = hints.min_width;
+        minHeight = hints.min_height;
     }
-  else if (hints.flags & PBaseSize)
-    {
-      minWidth = hints.base_width;
-      minHeight = hints.base_height;
+    else if (hints.flags & PBaseSize) {
+        minWidth = hints.base_width;
+        minHeight = hints.base_height;
     }
-  else
-    minWidth = minHeight = 1;
-  
-  if (hints.flags & PBaseSize)
-    {
-      baseWidth = hints.base_width;
-      baseHeight = hints.base_height;
-    } 
-  else if (hints.flags & PMinSize)
-    {
-      baseWidth = hints.min_width;
-      baseHeight = hints.min_height;
+    else
+        minWidth = minHeight = 1;
+
+    if (hints.flags & PBaseSize) {
+        baseWidth = hints.base_width;
+        baseHeight = hints.base_height;
     }
-  else
-    baseWidth = baseHeight = 0;
+    else if (hints.flags & PMinSize) {
+        baseWidth = hints.min_width;
+        baseHeight = hints.min_height;
+    }
+    else
+        baseWidth = baseHeight = 0;
 
-  if (hints.flags & PMaxSize)
-    {
-      maxWidth = hints.max_width;
-      maxHeight = hints.max_height;
+    if (hints.flags & PMaxSize) {
+        maxWidth = hints.max_width;
+        maxHeight = hints.max_height;
     }
-  else
-    {
-      maxWidth = MAXINT;
-      maxHeight = MAXINT;
+    else {
+        maxWidth = MAXINT;
+        maxHeight = MAXINT;
     }
 
-  if (hints.flags & PResizeInc)
-    {
-      xinc = hints.width_inc;
-      yinc = hints.height_inc;
+    if (hints.flags & PResizeInc) {
+        xinc = hints.width_inc;
+        yinc = hints.height_inc;
     }
-  else
-    xinc = yinc = 1;
-
-  /*
-   * First, clamp to min and max values
-   */
-  if (dwidth < minWidth)
-    dwidth = minWidth;
-  if (dheight < minHeight)
-    dheight = minHeight;
-
-  if (dwidth > maxWidth)
-    dwidth = maxWidth;
-  if (dheight > maxHeight)
-    dheight = maxHeight;
-
-  /*
-   * Second, fit to base + N * inc
-   */
-  dwidth = ((dwidth - baseWidth) / xinc * xinc) + baseWidth;
-  dheight = ((dheight - baseHeight) / yinc * yinc) + baseHeight;
-  
-  /*
-   * Third, adjust for aspect ratio
-   */
-
-  /*
-   * The math looks like this:
-   *
-   * minAspectX    dwidth     maxAspectX
-   * ---------- <= ------- <= ----------
-   * minAspectY    dheight    maxAspectY
-   *
-   * If that is multiplied out, then the width and height are
-   * invalid in the following situations:
-   *
-   * minAspectX * dheight > minAspectY * dwidth
-   * maxAspectX * dheight < maxAspectY * dwidth
-   * 
-   */
-  
-  if (hints.flags & PAspect)
-    {
-      if (hints.min_aspect.x * dheight > hints.min_aspect.y * dwidth)
-        {
-	  delta = makemult(hints.min_aspect.x * dheight / hints.min_aspect.y - dwidth, xinc);
-	  if (dwidth + delta <= maxWidth)
-	    dwidth += delta;
-	  else
-            {
-	      delta = makemult(dheight - dwidth*hints.min_aspect.y/hints.min_aspect.x, yinc);
-	      if (dheight - delta >= minHeight)
-		dheight -= delta;
+    else
+        xinc = yinc = 1;
+
+    /*
+     * First, clamp to min and max values
+     */
+    if (dwidth < minWidth)
+        dwidth = minWidth;
+    if (dheight < minHeight)
+        dheight = minHeight;
+
+    if (dwidth > maxWidth)
+        dwidth = maxWidth;
+    if (dheight > maxHeight)
+        dheight = maxHeight;
+
+    /*
+     * Second, fit to base + N * inc
+     */
+    dwidth = ((dwidth - baseWidth) / xinc * xinc) + baseWidth;
+    dheight = ((dheight - baseHeight) / yinc * yinc) + baseHeight;
+
+    /*
+     * Third, adjust for aspect ratio
+     */
+
+    /*
+     * The math looks like this:
+     *
+     * minAspectX    dwidth     maxAspectX
+     * ---------- <= ------- <= ----------
+     * minAspectY    dheight    maxAspectY
+     *
+     * If that is multiplied out, then the width and height are
+     * invalid in the following situations:
+     *
+     * minAspectX * dheight > minAspectY * dwidth
+     * maxAspectX * dheight < maxAspectY * dwidth
+     * 
+     */
+
+    if (hints.flags & PAspect) {
+        if (hints.min_aspect.x * dheight > hints.min_aspect.y * dwidth) {
+            delta =
+                makemult(hints.min_aspect.x * dheight / hints.min_aspect.y -
+                         dwidth, xinc);
+            if (dwidth + delta <= maxWidth)
+                dwidth += delta;
+            else {
+                delta =
+                    makemult(dheight -
+                             dwidth * hints.min_aspect.y / hints.min_aspect.x,
+                             yinc);
+                if (dheight - delta >= minHeight)
+                    dheight -= delta;
             }
         }
-      
-      if (hints.max_aspect.x * dheight < hints.max_aspect.y * dwidth)
-        {
-	  delta = makemult(dwidth * hints.max_aspect.y / hints.max_aspect.x - dheight, yinc);
-	  if (dheight + delta <= maxHeight)
-	    dheight += delta;
-	  else
-            {
-	      delta = makemult(dwidth - hints.max_aspect.x*dheight/hints.max_aspect.y, xinc);
-	      if (dwidth - delta >= minWidth)
-		dwidth -= delta;
+
+        if (hints.max_aspect.x * dheight < hints.max_aspect.y * dwidth) {
+            delta =
+                makemult(dwidth * hints.max_aspect.y / hints.max_aspect.x -
+                         dheight, yinc);
+            if (dheight + delta <= maxHeight)
+                dheight += delta;
+            else {
+                delta =
+                    makemult(dwidth -
+                             hints.max_aspect.x * dheight / hints.max_aspect.y,
+                             xinc);
+                if (dwidth - delta >= minWidth)
+                    dwidth -= delta;
             }
         }
     }
-  
-  /* Return computed values */
-  *widthp = dwidth;
-  *heightp = dheight;
-}
-#undef makemult
 
+    /* Return computed values */
+    *widthp = dwidth;
+    *heightp = dheight;
+}
 
+#undef makemult
 
 /*
  * ValidateSizing - Ensures size request respects hints
  */
 static int
-ValidateSizing (HWND hwnd, WindowPtr pWin,
-		WPARAM wParam, LPARAM lParam)
+ValidateSizing(HWND hwnd, WindowPtr pWin, WPARAM wParam, LPARAM lParam)
 {
-  WinXSizeHints sizeHints;
-  RECT *rect;
-  int iWidth, iHeight, iTopBorder;
-  POINT pt;
+    WinXSizeHints sizeHints;
+    RECT *rect;
+    int iWidth, iHeight, iTopBorder;
+    POINT pt;
+
+    /* Invalid input checking */
+    if (pWin == NULL || lParam == 0) {
+        ErrorF("Invalid input checking\n");
+        return FALSE;
+    }
 
-  /* Invalid input checking */
-  if (pWin==NULL || lParam==0)
-    {
-      ErrorF ("Invalid input checking\n");
-      return FALSE;
+    /* No size hints, no checking */
+    if (!winMultiWindowGetWMNormalHints(pWin, &sizeHints)) {
+        ErrorF("No size hints, no checking\n");
+        return FALSE;
     }
 
-  /* No size hints, no checking */
-  if (!winMultiWindowGetWMNormalHints (pWin, &sizeHints))
-    {
-      ErrorF ("No size hints, no checking\n");
-      return FALSE;
+    /* Avoid divide-by-zero */
+    if (sizeHints.flags & PResizeInc) {
+        if (sizeHints.width_inc == 0)
+            sizeHints.width_inc = 1;
+        if (sizeHints.height_inc == 0)
+            sizeHints.height_inc = 1;
     }
-  
-  /* Avoid divide-by-zero */
-  if (sizeHints.flags & PResizeInc)
-    {
-      if (sizeHints.width_inc == 0) sizeHints.width_inc = 1;
-      if (sizeHints.height_inc == 0) sizeHints.height_inc = 1;
+
+    rect = (RECT *) lParam;
+
+    iWidth = rect->right - rect->left;
+    iHeight = rect->bottom - rect->top;
+
+    /* Get title bar height, there must be an easier way?! */
+    pt.x = pt.y = 0;
+    ClientToScreen(hwnd, &pt);
+    iTopBorder = pt.y - rect->top;
+
+    /* Now remove size of any borders */
+    iWidth -= 2 * GetSystemMetrics(SM_CXSIZEFRAME);
+    iHeight -= GetSystemMetrics(SM_CYSIZEFRAME) + iTopBorder;
+
+    /* Constrain the size to legal values */
+    ConstrainSize(sizeHints, &iWidth, &iHeight);
+
+    /* Add back the borders */
+    iWidth += 2 * GetSystemMetrics(SM_CXSIZEFRAME);
+    iHeight += GetSystemMetrics(SM_CYSIZEFRAME) + iTopBorder;
+
+    /* Adjust size according to where we're dragging from */
+    switch (wParam) {
+    case WMSZ_TOP:
+    case WMSZ_TOPRIGHT:
+    case WMSZ_BOTTOM:
+    case WMSZ_BOTTOMRIGHT:
+    case WMSZ_RIGHT:
+        rect->right = rect->left + iWidth;
+        break;
+    default:
+        rect->left = rect->right - iWidth;
+        break;
+    }
+    switch (wParam) {
+    case WMSZ_BOTTOM:
+    case WMSZ_BOTTOMRIGHT:
+    case WMSZ_BOTTOMLEFT:
+    case WMSZ_RIGHT:
+    case WMSZ_LEFT:
+        rect->bottom = rect->top + iHeight;
+        break;
+    default:
+        rect->top = rect->bottom - iHeight;
+        break;
     }
-  
-  rect = (RECT*)lParam;
-  
-  iWidth = rect->right - rect->left;
-  iHeight = rect->bottom - rect->top;
-
-  /* Get title bar height, there must be an easier way?! */
-  pt.x = pt.y = 0;
-  ClientToScreen(hwnd, &pt);
-  iTopBorder = pt.y - rect->top;
-  
-  /* Now remove size of any borders */
-  iWidth -= 2 * GetSystemMetrics(SM_CXSIZEFRAME);
-  iHeight -= GetSystemMetrics(SM_CYSIZEFRAME) + iTopBorder;
-
-  /* Constrain the size to legal values */
-  ConstrainSize (sizeHints, &iWidth, &iHeight);
-
-  /* Add back the borders */
-  iWidth += 2 * GetSystemMetrics(SM_CXSIZEFRAME);
-  iHeight += GetSystemMetrics(SM_CYSIZEFRAME) + iTopBorder;
-
-  /* Adjust size according to where we're dragging from */
-  switch(wParam) {
-  case WMSZ_TOP:
-  case WMSZ_TOPRIGHT:
-  case WMSZ_BOTTOM:
-  case WMSZ_BOTTOMRIGHT:
-  case WMSZ_RIGHT:
-    rect->right = rect->left + iWidth;
-    break;
-  default:
-    rect->left = rect->right - iWidth;
-    break;
-  }
-  switch(wParam) {
-  case WMSZ_BOTTOM:
-  case WMSZ_BOTTOMRIGHT:
-  case WMSZ_BOTTOMLEFT:
-  case WMSZ_RIGHT:
-  case WMSZ_LEFT:
-    rect->bottom = rect->top + iHeight;
-    break;
-  default:
-    rect->top = rect->bottom - iHeight;
-    break;
-  }
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * IsRaiseOnClick
  */
 
 static Bool
-IsRaiseOnClick (WindowPtr pWin)
+IsRaiseOnClick(WindowPtr pWin)
 {
 
-  struct _Window	*pwin;
-  struct _Property	*prop;  
-  /* XXX We're getting inputInfo.poniter here, but this might be really wrong.
-   * Which pointer's current window do we want? */
-  WindowPtr		pRoot = GetCurrentRootWindow (inputInfo.pointer);
+    struct _Window *pwin;
+    struct _Property *prop;
 
-  if (!pWin)
-    {
-      ErrorF ("IsRaiseOnClick - no prop use default value:%d\n",
-	      RAISE_ON_CLICK_DEFAULT);
-      return RAISE_ON_CLICK_DEFAULT;
-    } 
+    /* XXX We're getting inputInfo.poniter here, but this might be really wrong.
+     * Which pointer's current window do we want? */
+    WindowPtr pRoot = GetCurrentRootWindow(inputInfo.pointer);
+
+    if (!pWin) {
+        ErrorF("IsRaiseOnClick - no prop use default value:%d\n",
+               RAISE_ON_CLICK_DEFAULT);
+        return RAISE_ON_CLICK_DEFAULT;
+    }
 
-  pwin = (struct _Window*) pWin;
+    pwin = (struct _Window *) pWin;
 
-  if (pwin->optional)
-    prop = (struct _Property *) pwin->optional->userProps;
-  else
-    prop = NULL;
+    if (pwin->optional)
+        prop = (struct _Property *) pwin->optional->userProps;
+    else
+        prop = NULL;
 
-  while (prop)
-    {
-      if (prop->propertyName == AtmWindowsWmRaiseOnClick ()
-	  && prop->type == XA_INTEGER
-	  && prop->format == 32)
-	{
-	  return *(int*)prop->data;
-	}
-      else
-	prop = prop->next;
+    while (prop) {
+        if (prop->propertyName == AtmWindowsWmRaiseOnClick()
+            && prop->type == XA_INTEGER && prop->format == 32) {
+            return *(int *) prop->data;
+        }
+        else
+            prop = prop->next;
     }
 
-  if (pWin != pRoot)
-    {
-      return IsRaiseOnClick (pRoot);
+    if (pWin != pRoot) {
+        return IsRaiseOnClick(pRoot);
     }
-  else
-    {
+    else {
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("IsRaiseOnClick - no prop use default value:%d\n",
-		RAISE_ON_CLICK_DEFAULT);
+        winDebug("IsRaiseOnClick - no prop use default value:%d\n",
+                 RAISE_ON_CLICK_DEFAULT);
 #endif
-      return RAISE_ON_CLICK_DEFAULT;
+        return RAISE_ON_CLICK_DEFAULT;
     }
 }
 
-
 /*
  * IsMouseActive
  */
 
 static Bool
-IsMouseActive (WindowPtr pWin)
+IsMouseActive(WindowPtr pWin)
 {
 
-  struct _Window	*pwin;
-  struct _Property	*prop;
-  /* XXX We're getting inputInfo.poniter here, but this might be really wrong.
-   * Which pointer's current window do we want? */
-  WindowPtr		pRoot = GetCurrentRootWindow (inputInfo.pointer);
+    struct _Window *pwin;
+    struct _Property *prop;
 
-  if (!pWin)
-    {
-      ErrorF ("IsMouseActive - pWin was NULL use default value:%d\n",
-	      MOUSE_ACTIVATE_DEFAULT);
-      return MOUSE_ACTIVATE_DEFAULT;
-    } 
+    /* XXX We're getting inputInfo.poniter here, but this might be really wrong.
+     * Which pointer's current window do we want? */
+    WindowPtr pRoot = GetCurrentRootWindow(inputInfo.pointer);
 
-  pwin = (struct _Window*) pWin;
+    if (!pWin) {
+        ErrorF("IsMouseActive - pWin was NULL use default value:%d\n",
+               MOUSE_ACTIVATE_DEFAULT);
+        return MOUSE_ACTIVATE_DEFAULT;
+    }
 
-  if (pwin->optional)
-    prop = (struct _Property *) pwin->optional->userProps;
-  else
-    prop = NULL;
+    pwin = (struct _Window *) pWin;
 
-  while (prop)
-    {
-      if (prop->propertyName == AtmWindowsWMMouseActivate ()
-	  && prop->type == XA_INTEGER
-	  && prop->format == 32)
-	{
-	  return *(int*)prop->data;
-	}
-      else
-	prop = prop->next;
+    if (pwin->optional)
+        prop = (struct _Property *) pwin->optional->userProps;
+    else
+        prop = NULL;
+
+    while (prop) {
+        if (prop->propertyName == AtmWindowsWMMouseActivate()
+            && prop->type == XA_INTEGER && prop->format == 32) {
+            return *(int *) prop->data;
+        }
+        else
+            prop = prop->next;
     }
 
-  if (pWin != pRoot)
-    {
-      return IsMouseActive (pRoot);
+    if (pWin != pRoot) {
+        return IsMouseActive(pRoot);
     }
-  else
-    {
+    else {
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("IsMouseActive - no prop use default value:%d\n",
-		MOUSE_ACTIVATE_DEFAULT);
+        winDebug("IsMouseActive - no prop use default value:%d\n",
+                 MOUSE_ACTIVATE_DEFAULT);
 #endif
-      return MOUSE_ACTIVATE_DEFAULT;
+        return MOUSE_ACTIVATE_DEFAULT;
     }
 }
 
-
 /*
  * winMWExtWMWindowProc - Window procedure
  */
 
 LRESULT CALLBACK
-winMWExtWMWindowProc (HWND hwnd, UINT message, 
-			    WPARAM wParam, LPARAM lParam)
+winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  WindowPtr		pWin = NULL;
-  win32RootlessWindowPtr pRLWinPriv = NULL;
-  ScreenPtr		pScreen = NULL;
-  winPrivScreenPtr	pScreenPriv = NULL;
-  winScreenInfo		*pScreenInfo = NULL;
-  HWND			hwndScreen = NULL;
-  POINT			ptMouse;
-  static Bool		s_fTracking = FALSE;
-  HDC			hdcUpdate;
-  PAINTSTRUCT		ps;
-  LPWINDOWPOS		pWinPos = NULL;
-  RECT			rcClient;
-  winWMMessageRec	wmMsg;
-  Bool			fWMMsgInitialized = FALSE;
-
-  /* Check if the Windows window property for our X window pointer is valid */
-  if ((pRLWinPriv = (win32RootlessWindowPtr)GetProp (hwnd, WIN_WINDOW_PROP)) != NULL)
-    {
-      pWin = pRLWinPriv->pFrame->win;
-      pScreen				= pWin->drawable.pScreen;
-      if (pScreen) pScreenPriv		= winGetScreenPriv(pScreen);
-      if (pScreenPriv) pScreenInfo	= pScreenPriv->pScreenInfo;
-      if (pScreenPriv) hwndScreen	= pScreenPriv->hwndScreen;
-
-      wmMsg.msg		= 0;
-      wmMsg.hwndWindow	= hwnd;
-      wmMsg.iWindow	= (Window)pWin->drawable.id;
-
-      wmMsg.iX		= pRLWinPriv->pFrame->x;
-      wmMsg.iY		= pRLWinPriv->pFrame->y;
-      wmMsg.iWidth	= pRLWinPriv->pFrame->width;
-      wmMsg.iHeight	= pRLWinPriv->pFrame->height;
-
-      fWMMsgInitialized = TRUE;
+    WindowPtr pWin = NULL;
+    win32RootlessWindowPtr pRLWinPriv = NULL;
+    ScreenPtr pScreen = NULL;
+    winPrivScreenPtr pScreenPriv = NULL;
+    winScreenInfo *pScreenInfo = NULL;
+    HWND hwndScreen = NULL;
+    POINT ptMouse;
+    static Bool s_fTracking = FALSE;
+    HDC hdcUpdate;
+    PAINTSTRUCT ps;
+    LPWINDOWPOS pWinPos = NULL;
+    RECT rcClient;
+    winWMMessageRec wmMsg;
+    Bool fWMMsgInitialized = FALSE;
+
+    /* Check if the Windows window property for our X window pointer is valid */
+    if ((pRLWinPriv =
+         (win32RootlessWindowPtr) GetProp(hwnd, WIN_WINDOW_PROP)) != NULL) {
+        pWin = pRLWinPriv->pFrame->win;
+        pScreen = pWin->drawable.pScreen;
+        if (pScreen)
+            pScreenPriv = winGetScreenPriv(pScreen);
+        if (pScreenPriv)
+            pScreenInfo = pScreenPriv->pScreenInfo;
+        if (pScreenPriv)
+            hwndScreen = pScreenPriv->hwndScreen;
+
+        wmMsg.msg = 0;
+        wmMsg.hwndWindow = hwnd;
+        wmMsg.iWindow = (Window) pWin->drawable.id;
+
+        wmMsg.iX = pRLWinPriv->pFrame->x;
+        wmMsg.iY = pRLWinPriv->pFrame->y;
+        wmMsg.iWidth = pRLWinPriv->pFrame->width;
+        wmMsg.iHeight = pRLWinPriv->pFrame->height;
+
+        fWMMsgInitialized = TRUE;
 #if CYGDEBUG
-      winDebugWin32Message("winMWExtWMWindowProc", hwnd, message, wParam, lParam);
-
-      winDebug ("\thWnd %08X\n", hwnd);
-      winDebug ("\tpScreenPriv %08X\n", pScreenPriv);
-      winDebug ("\tpScreenInfo %08X\n", pScreenInfo);
-      winDebug ("\thwndScreen %08X\n", hwndScreen);
-      winDebug ("winMWExtWMWindowProc (%08x) %08x %08x %08x\n",
-	      pRLWinPriv, message, wParam, lParam);
+        winDebugWin32Message("winMWExtWMWindowProc", hwnd, message, wParam,
+                             lParam);
+
+        winDebug("\thWnd %08X\n", hwnd);
+        winDebug("\tpScreenPriv %08X\n", pScreenPriv);
+        winDebug("\tpScreenInfo %08X\n", pScreenInfo);
+        winDebug("\thwndScreen %08X\n", hwndScreen);
+        winDebug("winMWExtWMWindowProc (%08x) %08x %08x %08x\n",
+                 pRLWinPriv, message, wParam, lParam);
 #endif
     }
-  /* Branch on message type */
-  switch (message)
-    {
+    /* Branch on message type */
+    switch (message) {
     case WM_CREATE:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_CREATE\n");
+        winDebug("winMWExtWMWindowProc - WM_CREATE\n");
 #endif
-      /* */
-      SetProp (hwnd,
-	       WIN_WINDOW_PROP,
-	       (HANDLE)((LPCREATESTRUCT) lParam)->lpCreateParams);
-      return 0;
+        /* */
+        SetProp(hwnd,
+                WIN_WINDOW_PROP,
+                (HANDLE) ((LPCREATESTRUCT) lParam)->lpCreateParams);
+        return 0;
 
     case WM_CLOSE:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_CLOSE %d\n", pRLWinPriv->fClose);
+        winDebug("winMWExtWMWindowProc - WM_CLOSE %d\n", pRLWinPriv->fClose);
 #endif
-      /* Tell window-manager to close window */
-      if (pRLWinPriv->fClose)
-	{
-	  DestroyWindow (hwnd);
-	}
-      else
-	{
-	  if (winIsInternalWMRunning(pScreenInfo))
-	    {
-	      /* Tell our Window Manager thread to kill the window */
-	      wmMsg.msg = WM_WM_KILL;
-	      if (fWMMsgInitialized)
-		winSendMessageToWM (pScreenPriv->pWMInfo, &wmMsg);
-	    }
-	  winWindowsWMSendEvent(WindowsWMControllerNotify,
-				WindowsWMControllerNotifyMask,
-				1,
-				WindowsWMCloseWindow,
-				pWin->drawable.id,
-				0, 0, 0, 0);
-	}
-      return 0;
+        /* Tell window-manager to close window */
+        if (pRLWinPriv->fClose) {
+            DestroyWindow(hwnd);
+        }
+        else {
+            if (winIsInternalWMRunning(pScreenInfo)) {
+                /* Tell our Window Manager thread to kill the window */
+                wmMsg.msg = WM_WM_KILL;
+                if (fWMMsgInitialized)
+                    winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
+            }
+            winWindowsWMSendEvent(WindowsWMControllerNotify,
+                                  WindowsWMControllerNotifyMask,
+                                  1,
+                                  WindowsWMCloseWindow,
+                                  pWin->drawable.id, 0, 0, 0, 0);
+        }
+        return 0;
 
     case WM_DESTROY:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_DESTROY\n");
+        winDebug("winMWExtWMWindowProc - WM_DESTROY\n");
 #endif
-      /* Free the shaodw DC; which allows the bitmap to be freed */
-      DeleteDC (pRLWinPriv->hdcShadow);
-      pRLWinPriv->hdcShadow = NULL;
-      
-      /* Free the shadow bitmap */
-      DeleteObject (pRLWinPriv->hbmpShadow);
-      pRLWinPriv->hbmpShadow = NULL;
-      
-      /* Free the screen DC */
-      ReleaseDC (pRLWinPriv->hWnd, pRLWinPriv->hdcScreen);
-      pRLWinPriv->hdcScreen = NULL;
-
-      /* Free shadow buffer info header */
-      free (pRLWinPriv->pbmihShadow);
-      pRLWinPriv->pbmihShadow = NULL;
-      
-      pRLWinPriv->fResized = FALSE;
-      pRLWinPriv->pfb = NULL;
-      free (pRLWinPriv);
-      RemoveProp (hwnd, WIN_WINDOW_PROP);
-      break;
+        /* Free the shaodw DC; which allows the bitmap to be freed */
+        DeleteDC(pRLWinPriv->hdcShadow);
+        pRLWinPriv->hdcShadow = NULL;
+
+        /* Free the shadow bitmap */
+        DeleteObject(pRLWinPriv->hbmpShadow);
+        pRLWinPriv->hbmpShadow = NULL;
+
+        /* Free the screen DC */
+        ReleaseDC(pRLWinPriv->hWnd, pRLWinPriv->hdcScreen);
+        pRLWinPriv->hdcScreen = NULL;
+
+        /* Free shadow buffer info header */
+        free(pRLWinPriv->pbmihShadow);
+        pRLWinPriv->pbmihShadow = NULL;
+
+        pRLWinPriv->fResized = FALSE;
+        pRLWinPriv->pfb = NULL;
+        free(pRLWinPriv);
+        RemoveProp(hwnd, WIN_WINDOW_PROP);
+        break;
 
     case WM_MOUSEMOVE:
 #if CYGMULTIWINDOW_DEBUG && 0
-      winDebug ("winMWExtWMWindowProc - WM_MOUSEMOVE\n");
+        winDebug("winMWExtWMWindowProc - WM_MOUSEMOVE\n");
 #endif
-      /* Unpack the client area mouse coordinates */
-      ptMouse.x = GET_X_LPARAM(lParam);
-      ptMouse.y = GET_Y_LPARAM(lParam);
-
-      /* Translate the client area mouse coordinates to screen coordinates */
-      ClientToScreen (hwnd, &ptMouse);
-
-      /* Screen Coords from (-X, -Y) -> Root Window (0, 0) */
-      ptMouse.x -= GetSystemMetrics (SM_XVIRTUALSCREEN);
-      ptMouse.y -= GetSystemMetrics (SM_YVIRTUALSCREEN);
-
-      /* We can't do anything without privates */
-      if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
-	break;
-
-      /* Has the mouse pointer crossed screens? */
-      if (pScreen != miPointerGetScreen(inputInfo.pointer))
-	miPointerSetScreen (inputInfo.pointer, pScreenInfo->dwScreen,
-			       ptMouse.x - pScreenInfo->dwXOffset,
-			       ptMouse.y - pScreenInfo->dwYOffset);
-
-      /* Are we tracking yet? */
-      if (!s_fTracking)
-	{
-	  TRACKMOUSEEVENT		tme;
-	  
-	  /* Setup data structure */
-	  ZeroMemory (&tme, sizeof (tme));
-	  tme.cbSize = sizeof (tme);
-	  tme.dwFlags = TME_LEAVE;
-	  tme.hwndTrack = hwnd;
-
-	  /* Call the tracking function */
-	  if (!TrackMouseEvent(&tme))
-	    ErrorF ("winMWExtWMWindowProc - TrackMouseEvent failed\n");
-
-	  /* Flag that we are tracking now */
-	  s_fTracking = TRUE;
-	}
-      
-      /* Kill the timer used to poll mouse events */
-      if (g_uipMousePollingTimerID != 0)
-	{
-	  KillTimer (pScreenPriv->hwndScreen, WIN_POLLING_MOUSE_TIMER_ID);
-	  g_uipMousePollingTimerID = 0;
-	}
-
-      /* Deliver absolute cursor position to X Server */
-      winEnqueueMotion(ptMouse.x - pScreenInfo->dwXOffset,
-		       ptMouse.y - pScreenInfo->dwYOffset);
-
-      return 0;
-      
+        /* Unpack the client area mouse coordinates */
+        ptMouse.x = GET_X_LPARAM(lParam);
+        ptMouse.y = GET_Y_LPARAM(lParam);
+
+        /* Translate the client area mouse coordinates to screen coordinates */
+        ClientToScreen(hwnd, &ptMouse);
+
+        /* Screen Coords from (-X, -Y) -> Root Window (0, 0) */
+        ptMouse.x -= GetSystemMetrics(SM_XVIRTUALSCREEN);
+        ptMouse.y -= GetSystemMetrics(SM_YVIRTUALSCREEN);
+
+        /* We can't do anything without privates */
+        if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
+            break;
+
+        /* Has the mouse pointer crossed screens? */
+        if (pScreen != miPointerGetScreen(inputInfo.pointer))
+             miPointerSetScreen(inputInfo.pointer, pScreenInfo->dwScreen,
+                                ptMouse.x - pScreenInfo->dwXOffset,
+                                ptMouse.y - pScreenInfo->dwYOffset);
+
+        /* Are we tracking yet? */
+        if (!s_fTracking) {
+            TRACKMOUSEEVENT tme;
+
+            /* Setup data structure */
+            ZeroMemory(&tme, sizeof(tme));
+            tme.cbSize = sizeof(tme);
+            tme.dwFlags = TME_LEAVE;
+            tme.hwndTrack = hwnd;
+
+            /* Call the tracking function */
+            if (!TrackMouseEvent(&tme))
+                ErrorF("winMWExtWMWindowProc - TrackMouseEvent failed\n");
+
+            /* Flag that we are tracking now */
+            s_fTracking = TRUE;
+        }
+
+        /* Kill the timer used to poll mouse events */
+        if (g_uipMousePollingTimerID != 0) {
+            KillTimer(pScreenPriv->hwndScreen, WIN_POLLING_MOUSE_TIMER_ID);
+            g_uipMousePollingTimerID = 0;
+        }
+
+        /* Deliver absolute cursor position to X Server */
+        winEnqueueMotion(ptMouse.x - pScreenInfo->dwXOffset,
+                         ptMouse.y - pScreenInfo->dwYOffset);
+
+        return 0;
+
     case WM_NCMOUSEMOVE:
 #if CYGMULTIWINDOW_DEBUG && 0
-      winDebug ("winMWExtWMWindowProc - WM_NCMOUSEMOVE\n");
+        winDebug("winMWExtWMWindowProc - WM_NCMOUSEMOVE\n");
 #endif
-      /*
-       * We break instead of returning 0 since we need to call
-       * DefWindowProc to get the mouse cursor changes
-       * and min/max/close button highlighting in Windows XP.
-       * The Platform SDK says that you should return 0 if you
-       * process this message, but it fails to mention that you
-       * will give up any default functionality if you do return 0.
-       */
-      
-      /* We can't do anything without privates */
-      if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
-	break;
-
-      /*
-       * Timer to poll mouse events.  This is needed to make
-       * programs like xeyes follow the mouse properly.
-       */
-      if (g_uipMousePollingTimerID == 0)
-	g_uipMousePollingTimerID = SetTimer (pScreenPriv->hwndScreen,
-					     WIN_POLLING_MOUSE_TIMER_ID,
-					     MOUSE_POLLING_INTERVAL,
-					     NULL);
-      break;
+        /*
+         * We break instead of returning 0 since we need to call
+         * DefWindowProc to get the mouse cursor changes
+         * and min/max/close button highlighting in Windows XP.
+         * The Platform SDK says that you should return 0 if you
+         * process this message, but it fails to mention that you
+         * will give up any default functionality if you do return 0.
+         */
+
+        /* We can't do anything without privates */
+        if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
+            break;
+
+        /*
+         * Timer to poll mouse events.  This is needed to make
+         * programs like xeyes follow the mouse properly.
+         */
+        if (g_uipMousePollingTimerID == 0)
+            g_uipMousePollingTimerID = SetTimer(pScreenPriv->hwndScreen,
+                                                WIN_POLLING_MOUSE_TIMER_ID,
+                                                MOUSE_POLLING_INTERVAL, NULL);
+        break;
 
     case WM_MOUSELEAVE:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_MOUSELEAVE\n");
+        winDebug("winMWExtWMWindowProc - WM_MOUSELEAVE\n");
 #endif
-      /* Mouse has left our client area */
-
-      /* Flag that we are no longer tracking */
-      s_fTracking = FALSE;
-
-      /*
-       * Timer to poll mouse events.  This is needed to make
-       * programs like xeyes follow the mouse properly.
-       */
-      if (g_uipMousePollingTimerID == 0)
-	g_uipMousePollingTimerID = SetTimer (pScreenPriv->hwndScreen,
-					     WIN_POLLING_MOUSE_TIMER_ID,
-					     MOUSE_POLLING_INTERVAL,
-					     NULL);
-      return 0;
+        /* Mouse has left our client area */
+
+        /* Flag that we are no longer tracking */
+        s_fTracking = FALSE;
+
+        /*
+         * Timer to poll mouse events.  This is needed to make
+         * programs like xeyes follow the mouse properly.
+         */
+        if (g_uipMousePollingTimerID == 0)
+            g_uipMousePollingTimerID = SetTimer(pScreenPriv->hwndScreen,
+                                                WIN_POLLING_MOUSE_TIMER_ID,
+                                                MOUSE_POLLING_INTERVAL, NULL);
+        return 0;
 
     case WM_LBUTTONDBLCLK:
     case WM_LBUTTONDOWN:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_LBUTTONDBLCLK\n");
+        winDebug("winMWExtWMWindowProc - WM_LBUTTONDBLCLK\n");
 #endif
-      if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
-	break;
-      SetCapture (hwnd);
-      return winMouseButtonsHandle (pScreen, ButtonPress, Button1, wParam);
-      
+        if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
+            break;
+        SetCapture(hwnd);
+        return winMouseButtonsHandle(pScreen, ButtonPress, Button1, wParam);
+
     case WM_LBUTTONUP:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_LBUTTONUP\n");
+        winDebug("winMWExtWMWindowProc - WM_LBUTTONUP\n");
 #endif
-      if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
-	break;
-      ReleaseCapture ();
-      return winMouseButtonsHandle (pScreen, ButtonRelease, Button1, wParam);
+        if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
+            break;
+        ReleaseCapture();
+        return winMouseButtonsHandle(pScreen, ButtonRelease, Button1, wParam);
 
     case WM_MBUTTONDBLCLK:
     case WM_MBUTTONDOWN:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_MBUTTONDBLCLK\n");
+        winDebug("winMWExtWMWindowProc - WM_MBUTTONDBLCLK\n");
 #endif
-      if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
-	break;
-      SetCapture (hwnd);
-      return winMouseButtonsHandle (pScreen, ButtonPress, Button2, wParam);
-      
+        if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
+            break;
+        SetCapture(hwnd);
+        return winMouseButtonsHandle(pScreen, ButtonPress, Button2, wParam);
+
     case WM_MBUTTONUP:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_MBUTTONUP\n");
+        winDebug("winMWExtWMWindowProc - WM_MBUTTONUP\n");
 #endif
-      if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
-	break;
-      ReleaseCapture ();
-      return winMouseButtonsHandle (pScreen, ButtonRelease, Button2, wParam);
-      
+        if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
+            break;
+        ReleaseCapture();
+        return winMouseButtonsHandle(pScreen, ButtonRelease, Button2, wParam);
+
     case WM_RBUTTONDBLCLK:
     case WM_RBUTTONDOWN:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_RBUTTONDBLCLK\n");
+        winDebug("winMWExtWMWindowProc - WM_RBUTTONDBLCLK\n");
 #endif
-      if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
-	break;
-      SetCapture (hwnd);
-      return winMouseButtonsHandle (pScreen, ButtonPress, Button3, wParam);
-      
+        if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
+            break;
+        SetCapture(hwnd);
+        return winMouseButtonsHandle(pScreen, ButtonPress, Button3, wParam);
+
     case WM_RBUTTONUP:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_RBUTTONUP\n");
+        winDebug("winMWExtWMWindowProc - WM_RBUTTONUP\n");
 #endif
-      if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
-	break;
-      ReleaseCapture ();
-      return winMouseButtonsHandle (pScreen, ButtonRelease, Button3, wParam);
+        if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
+            break;
+        ReleaseCapture();
+        return winMouseButtonsHandle(pScreen, ButtonRelease, Button3, wParam);
 
     case WM_XBUTTONDBLCLK:
     case WM_XBUTTONDOWN:
-      if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
-	break;
-      SetCapture (hwnd);
-      return winMouseButtonsHandle (pScreen, ButtonPress, HIWORD(wParam) + 5, wParam);
+        if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
+            break;
+        SetCapture(hwnd);
+        return winMouseButtonsHandle(pScreen, ButtonPress, HIWORD(wParam) + 5,
+                                     wParam);
     case WM_XBUTTONUP:
-      if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
-	break;
-      ReleaseCapture ();
-      return winMouseButtonsHandle (pScreen, ButtonRelease, HIWORD(wParam) + 5, wParam);
+        if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput)
+            break;
+        ReleaseCapture();
+        return winMouseButtonsHandle(pScreen, ButtonRelease, HIWORD(wParam) + 5,
+                                     wParam);
 
     case WM_MOUSEWHEEL:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_MOUSEWHEEL\n");
+        winDebug("winMWExtWMWindowProc - WM_MOUSEWHEEL\n");
 #endif
-      
-      /* Pass the message to the root window */
-      SendMessage (hwndScreen, message, wParam, lParam);
-      return 0;
+
+        /* Pass the message to the root window */
+        SendMessage(hwndScreen, message, wParam, lParam);
+        return 0;
 
     case WM_MOUSEACTIVATE:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_MOUSEACTIVATE\n");
+        winDebug("winMWExtWMWindowProc - WM_MOUSEACTIVATE\n");
 #endif
 #if 1
-      /* Check if this window needs to be made active when clicked */
-      if (winIsInternalWMRunning(pScreenInfo) && pWin->overrideRedirect)
-	{
+        /* Check if this window needs to be made active when clicked */
+        if (winIsInternalWMRunning(pScreenInfo) && pWin->overrideRedirect) {
 #if CYGMULTIWINDOW_DEBUG
-	  winDebug ("winMWExtWMWindowProc - WM_MOUSEACTIVATE - "
-		    "MA_NOACTIVATE\n");
+            winDebug("winMWExtWMWindowProc - WM_MOUSEACTIVATE - "
+                     "MA_NOACTIVATE\n");
 #endif
 
-	  /* */
-	  return MA_NOACTIVATE;
-	}
+            /* */
+            return MA_NOACTIVATE;
+        }
 #endif
-      if (!winIsInternalWMRunning(pScreenInfo) && !IsMouseActive (pWin))
-	return MA_NOACTIVATE;
+        if (!winIsInternalWMRunning(pScreenInfo) && !IsMouseActive(pWin))
+            return MA_NOACTIVATE;
 
-      break;
+        break;
 
     case WM_KILLFOCUS:
-      /* Pop any pressed keys since we are losing keyboard focus */
-      winKeybdReleaseKeys ();
-      return 0;
+        /* Pop any pressed keys since we are losing keyboard focus */
+        winKeybdReleaseKeys();
+        return 0;
 
     case WM_SYSDEADCHAR:
     case WM_DEADCHAR:
-      /*
-       * NOTE: We do nothing with WM_*CHAR messages,
-       * nor does the root window, so we can just toss these messages.
-       */
-      return 0;
+        /*
+         * NOTE: We do nothing with WM_*CHAR messages,
+         * nor does the root window, so we can just toss these messages.
+         */
+        return 0;
 
     case WM_SYSKEYDOWN:
     case WM_KEYDOWN:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_*KEYDOWN\n");
+        winDebug("winMWExtWMWindowProc - WM_*KEYDOWN\n");
 #endif
 
-      /*
-       * Don't pass Alt-F4 key combo to root window,
-       * let Windows translate to WM_CLOSE and close this top-level window.
-       *
-       * NOTE: We purposely don't check the fUseWinKillKey setting because
-       * it should only apply to the key handling for the root window,
-       * not for top-level window-manager windows.
-       *
-       * ALSO NOTE: We do pass Ctrl-Alt-Backspace to the root window
-       * because that is a key combo that no X app should be expecting to
-       * receive, since it has historically been used to shutdown the X server.
-       * Passing Ctrl-Alt-Backspace to the root window preserves that
-       * behavior, assuming that -unixkill has been passed as a parameter.
-       */
-      if (wParam == VK_F4 && (GetKeyState (VK_MENU) & 0x8000))
-	  break;
-
-      /* Pass the message to the root window */
-      SendMessage (hwndScreen, message, wParam, lParam);
-      return 0;
+        /*
+         * Don't pass Alt-F4 key combo to root window,
+         * let Windows translate to WM_CLOSE and close this top-level window.
+         *
+         * NOTE: We purposely don't check the fUseWinKillKey setting because
+         * it should only apply to the key handling for the root window,
+         * not for top-level window-manager windows.
+         *
+         * ALSO NOTE: We do pass Ctrl-Alt-Backspace to the root window
+         * because that is a key combo that no X app should be expecting to
+         * receive, since it has historically been used to shutdown the X server.
+         * Passing Ctrl-Alt-Backspace to the root window preserves that
+         * behavior, assuming that -unixkill has been passed as a parameter.
+         */
+        if (wParam == VK_F4 && (GetKeyState(VK_MENU) & 0x8000))
+            break;
+
+        /* Pass the message to the root window */
+        SendMessage(hwndScreen, message, wParam, lParam);
+        return 0;
 
     case WM_SYSKEYUP:
     case WM_KEYUP:
 
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_*KEYUP\n");
+        winDebug("winMWExtWMWindowProc - WM_*KEYUP\n");
 #endif
 
-      /* Pass the message to the root window */
-      SendMessage (hwndScreen, message, wParam, lParam);
-      return 0;
+        /* Pass the message to the root window */
+        SendMessage(hwndScreen, message, wParam, lParam);
+        return 0;
 
     case WM_HOTKEY:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_HOTKEY\n");
+        winDebug("winMWExtWMWindowProc - WM_HOTKEY\n");
 #endif
 
-      /* Pass the message to the root window */
-      SendMessage (hwndScreen, message, wParam, lParam);
-      return 0;
+        /* Pass the message to the root window */
+        SendMessage(hwndScreen, message, wParam, lParam);
+        return 0;
 
     case WM_ERASEBKGND:
 #if CYGDEBUG
-      winDebug ("winMWExtWMWindowProc - WM_ERASEBKGND\n");
+        winDebug("winMWExtWMWindowProc - WM_ERASEBKGND\n");
 #endif
-      /*
-       * Pretend that we did erase the background but we don't care,
-       * since we repaint the entire region anyhow
-       * This avoids some flickering when resizing.
-       */
-      return TRUE;
+        /*
+         * Pretend that we did erase the background but we don't care,
+         * since we repaint the entire region anyhow
+         * This avoids some flickering when resizing.
+         */
+        return TRUE;
 
     case WM_PAINT:
-    
-      /* BeginPaint gives us an hdc that clips to the invalidated region */
-      hdcUpdate = BeginPaint (hwnd, &ps);
-
-      /* Try to copy from the shadow buffer */
-      if (!BitBlt (hdcUpdate,
-		   ps.rcPaint.left, ps.rcPaint.top,
-		   ps.rcPaint.right - ps.rcPaint.left,
-		   ps.rcPaint.bottom - ps.rcPaint.top,
-		   pRLWinPriv->hdcShadow,
-		   ps.rcPaint.left, ps.rcPaint.top,
-		   SRCCOPY))
-	{
-	  LPVOID lpMsgBuf;
-	  
-	  /* Display a fancy error message */
-	  FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-			 FORMAT_MESSAGE_FROM_SYSTEM | 
-			 FORMAT_MESSAGE_IGNORE_INSERTS,
-			 NULL,
-			 GetLastError (),
-			 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-			 (LPTSTR) &lpMsgBuf,
-			 0, NULL);
-
-	  ErrorF ("winMWExtWMWindowProc - BitBlt failed: %s\n",
-		  (LPSTR)lpMsgBuf);
-	  LocalFree (lpMsgBuf);
-	}
-
-      /* EndPaint frees the DC */
-      EndPaint (hwnd, &ps);
-      break;
+
+        /* BeginPaint gives us an hdc that clips to the invalidated region */
+        hdcUpdate = BeginPaint(hwnd, &ps);
+
+        /* Try to copy from the shadow buffer */
+        if (!BitBlt(hdcUpdate,
+                    ps.rcPaint.left, ps.rcPaint.top,
+                    ps.rcPaint.right - ps.rcPaint.left,
+                    ps.rcPaint.bottom - ps.rcPaint.top,
+                    pRLWinPriv->hdcShadow,
+                    ps.rcPaint.left, ps.rcPaint.top, SRCCOPY)) {
+            LPVOID lpMsgBuf;
+
+            /* Display a fancy error message */
+            FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                          FORMAT_MESSAGE_FROM_SYSTEM |
+                          FORMAT_MESSAGE_IGNORE_INSERTS,
+                          NULL,
+                          GetLastError(),
+                          MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                          (LPTSTR) & lpMsgBuf, 0, NULL);
+
+            ErrorF("winMWExtWMWindowProc - BitBlt failed: %s\n",
+                   (LPSTR) lpMsgBuf);
+            LocalFree(lpMsgBuf);
+        }
+
+        /* EndPaint frees the DC */
+        EndPaint(hwnd, &ps);
+        break;
 
     case WM_ACTIVATE:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_ACTIVATE\n");
+        winDebug("winMWExtWMWindowProc - WM_ACTIVATE\n");
 #endif
-      if (LOWORD(wParam) != WA_INACTIVE)
-	{
-	  if (winIsInternalWMRunning(pScreenInfo))
-	    {
+        if (LOWORD(wParam) != WA_INACTIVE) {
+            if (winIsInternalWMRunning(pScreenInfo)) {
 #if 0
-	      /* Raise the window to the top in Z order */
-	      wmMsg.msg = WM_WM_RAISE;
-	      if (fWMMsgInitialized)
-		winSendMessageToWM (pScreenPriv->pWMInfo, &wmMsg);
+                /* Raise the window to the top in Z order */
+                wmMsg.msg = WM_WM_RAISE;
+                if (fWMMsgInitialized)
+                    winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
 #endif
-	      /* Tell our Window Manager thread to activate the window */
-	      wmMsg.msg = WM_WM_ACTIVATE;
-	      if (fWMMsgInitialized)
-		if (!pWin || !pWin->overrideRedirect) /* for OOo menus */
-		  winSendMessageToWM (pScreenPriv->pWMInfo, &wmMsg);
-	    }
-	  winWindowsWMSendEvent(WindowsWMControllerNotify,
-				WindowsWMControllerNotifyMask,
-				1,
-				WindowsWMActivateWindow,
-				pWin->drawable.id,
-				0, 0,
-				0, 0);
-	}
-      return 0;
+                /* Tell our Window Manager thread to activate the window */
+                wmMsg.msg = WM_WM_ACTIVATE;
+                if (fWMMsgInitialized)
+                    if (!pWin || !pWin->overrideRedirect)       /* for OOo menus */
+                        winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
+            }
+            winWindowsWMSendEvent(WindowsWMControllerNotify,
+                                  WindowsWMControllerNotifyMask,
+                                  1,
+                                  WindowsWMActivateWindow,
+                                  pWin->drawable.id, 0, 0, 0, 0);
+        }
+        return 0;
 
 #if 1
     case WM_WINDOWPOSCHANGING:
-      pWinPos = (LPWINDOWPOS)lParam;
-      if (!(pWinPos->flags & SWP_NOZORDER))
-	{
-	  if (pRLWinPriv->fRestackingNow || pScreenPriv->fRestacking)
-	    {
+        pWinPos = (LPWINDOWPOS) lParam;
+        if (!(pWinPos->flags & SWP_NOZORDER)) {
+            if (pRLWinPriv->fRestackingNow || pScreenPriv->fRestacking) {
 #if CYGMULTIWINDOW_DEBUG
-	      winDebug ("Win %08x is now restacking.\n", (unsigned int)pRLWinPriv);
+                winDebug("Win %08x is now restacking.\n",
+                         (unsigned int) pRLWinPriv);
 #endif
-	      break;
-	    }
+                break;
+            }
 
-	  if (winIsInternalWMRunning(pScreenInfo) || IsRaiseOnClick (pWin))
-	    {
+            if (winIsInternalWMRunning(pScreenInfo) || IsRaiseOnClick(pWin)) {
 #if CYGMULTIWINDOW_DEBUG
-	      winDebug ("Win %08x has WINDOWSWM_RAISE_ON_CLICK.\n", (unsigned int)pRLWinPriv);
+                winDebug("Win %08x has WINDOWSWM_RAISE_ON_CLICK.\n",
+                         (unsigned int) pRLWinPriv);
 #endif
-	      break;
-	    }
+                break;
+            }
 
 #if CYGMULTIWINDOW_DEBUG
-	  winDebug ("Win %08x forbid to change z order (%08x).\n",
-		    (unsigned int)pRLWinPriv, (unsigned int)pWinPos->hwndInsertAfter);
+            winDebug("Win %08x forbid to change z order (%08x).\n",
+                     (unsigned int) pRLWinPriv,
+                     (unsigned int) pWinPos->hwndInsertAfter);
 #endif
-	  pWinPos->flags |= SWP_NOZORDER;
-	}
-      break;
+            pWinPos->flags |= SWP_NOZORDER;
+        }
+        break;
 #endif
 
     case WM_MOVE:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_MOVE - %d ms\n",
-		(unsigned int)GetTickCount ());
+        winDebug("winMWExtWMWindowProc - WM_MOVE - %d ms\n",
+                 (unsigned int) GetTickCount());
 #endif
-      if (g_fNoConfigureWindow) break;
+        if (g_fNoConfigureWindow)
+            break;
 #if 0
-      /* Bail if Windows window is not actually moving */
-      if (pRLWinPriv->dwX == (short) LOWORD(lParam)
-	  && pRLWinPriv->dwY == (short) HIWORD(lParam))
-	break;
-
-      /* Also bail if we're maximizing, we'll do the whole thing in WM_SIZE */
-      {
-	WINDOWPLACEMENT windPlace;
-	windPlace.length = sizeof (WINDOWPLACEMENT);
-
-	/* Get current window placement */
-	GetWindowPlacement (hwnd, &windPlace);
-
-	/* Bail if maximizing */
-	if (windPlace.showCmd == SW_MAXIMIZE
-	    || windPlace.showCmd == SW_SHOWMAXIMIZED)
-	  break;
-      }
+        /* Bail if Windows window is not actually moving */
+        if (pRLWinPriv->dwX == (short) LOWORD(lParam)
+            && pRLWinPriv->dwY == (short) HIWORD(lParam))
+            break;
+
+        /* Also bail if we're maximizing, we'll do the whole thing in WM_SIZE */
+        {
+            WINDOWPLACEMENT windPlace;
+
+            windPlace.length = sizeof(WINDOWPLACEMENT);
+
+            /* Get current window placement */
+            GetWindowPlacement(hwnd, &windPlace);
+
+            /* Bail if maximizing */
+            if (windPlace.showCmd == SW_MAXIMIZE
+                || windPlace.showCmd == SW_SHOWMAXIMIZED)
+                break;
+        }
 #endif
 
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("\t(%d, %d)\n", (short) LOWORD(lParam), (short) HIWORD(lParam));
+        winDebug("\t(%d, %d)\n", (short) LOWORD(lParam),
+                 (short) HIWORD(lParam));
 #endif
-      if (!pRLWinPriv->fMovingOrSizing)
-	{
-	  if (winIsInternalWMRunning(pScreenInfo))
-	    winAdjustXWindow (pWin, hwnd);
-
-	  winMWExtWMMoveXWindow (pWin,
-				 (LOWORD(lParam) - wBorderWidth (pWin)
-				  - GetSystemMetrics (SM_XVIRTUALSCREEN)),
-				 (HIWORD(lParam) - wBorderWidth (pWin)
-				  - GetSystemMetrics (SM_YVIRTUALSCREEN)));
-	}
-      return 0;
+        if (!pRLWinPriv->fMovingOrSizing) {
+            if (winIsInternalWMRunning(pScreenInfo))
+                winAdjustXWindow(pWin, hwnd);
+
+            winMWExtWMMoveXWindow(pWin, (LOWORD(lParam) - wBorderWidth(pWin)
+                                         - GetSystemMetrics(SM_XVIRTUALSCREEN)),
+                                  (HIWORD(lParam) - wBorderWidth(pWin)
+                                   - GetSystemMetrics(SM_YVIRTUALSCREEN)));
+        }
+        return 0;
 
     case WM_SHOWWINDOW:
 #if CYGMULTIWINDOW_DEBUG || TRUE
-      winDebug ("winMWExtWMWindowProc - WM_SHOWWINDOW - %d ms\n",
-		(unsigned int)GetTickCount ());
+        winDebug("winMWExtWMWindowProc - WM_SHOWWINDOW - %d ms\n",
+                 (unsigned int) GetTickCount());
 #endif
-      /* Bail out if the window is being hidden */
-      if (!wParam)
-	return 0;
+        /* Bail out if the window is being hidden */
+        if (!wParam)
+            return 0;
 
-      if (!pScreenInfo->fInternalWM)//XXXX
-	return 0;
+        if (!pScreenInfo->fInternalWM)  //XXXX
+            return 0;
 
-      winMWExtWMUpdateWindowDecoration (pRLWinPriv, pScreenInfo);
+        winMWExtWMUpdateWindowDecoration(pRLWinPriv, pScreenInfo);
 
-      if (winIsInternalWMRunning(pScreenInfo))
-	{
+        if (winIsInternalWMRunning(pScreenInfo)) {
 #if CYGMULTIWINDOW_DEBUG || TRUE
-	  winDebug ("\tMapWindow\n");
+            winDebug("\tMapWindow\n");
 #endif
-	  /* Tell X to map the window */
-	   MapWindow (pWin, wClient(pWin));
+            /* Tell X to map the window */
+            MapWindow(pWin, wClient(pWin));
 
-	  if (!pRLWinPriv->pFrame->win->overrideRedirect)
-	    /* Bring the Windows window to the foreground */
-	    SetForegroundWindow (hwnd);
+            if (!pRLWinPriv->pFrame->win->overrideRedirect)
+                /* Bring the Windows window to the foreground */
+                SetForegroundWindow(hwnd);
 
-	  /* Setup the Window Manager message */
-	  wmMsg.msg = WM_WM_MAP;
-	  wmMsg.iWidth = pRLWinPriv->pFrame->width;
-	  wmMsg.iHeight = pRLWinPriv->pFrame->height;
+            /* Setup the Window Manager message */
+            wmMsg.msg = WM_WM_MAP;
+            wmMsg.iWidth = pRLWinPriv->pFrame->width;
+            wmMsg.iHeight = pRLWinPriv->pFrame->height;
 
-	  /* Tell our Window Manager thread to map the window */
-	  if (fWMMsgInitialized)
-	    winSendMessageToWM (pScreenPriv->pWMInfo, &wmMsg);
-	}
-      break;
+            /* Tell our Window Manager thread to map the window */
+            if (fWMMsgInitialized)
+                winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
+        }
+        break;
 
     case WM_SIZING:
-      /* Need to legalize the size according to WM_NORMAL_HINTS */
-      /* for applications like xterm */
-      return ValidateSizing (hwnd, pWin, wParam, lParam);
+        /* Need to legalize the size according to WM_NORMAL_HINTS */
+        /* for applications like xterm */
+        return ValidateSizing(hwnd, pWin, wParam, lParam);
 
     case WM_WINDOWPOSCHANGED:
-      {
-	pWinPos = (LPWINDOWPOS) lParam;
+    {
+        pWinPos = (LPWINDOWPOS) lParam;
 #if CYGMULTIWINDOW_DEBUG
         winDebug("winMWExtWMWindowProc - WM_WINDOWPOSCHANGED\n");
-	winDebug("\tflags: %s%s%s%s%s%s%s%s%s%s%s%s\n",
-	(pWinPos->flags & SWP_DRAWFRAME)?"SWP_DRAWFRAME ":"",
-	(pWinPos->flags & SWP_FRAMECHANGED)?"SWP_FRAMECHANGED ":"",
-	(pWinPos->flags & SWP_HIDEWINDOW)?"SWP_HIDEWINDOW ":"",
-	(pWinPos->flags & SWP_NOACTIVATE)?"SWP_NOACTIVATE ":"",
-	(pWinPos->flags & SWP_NOCOPYBITS)?"SWP_NOCOPYBITS ":"",
-	(pWinPos->flags & SWP_NOMOVE)?"SWP_NOMOVE ":"",
-	(pWinPos->flags & SWP_NOOWNERZORDER)?"SWP_NOOWNERZORDER ":"",
-	(pWinPos->flags & SWP_NOSIZE)?"SWP_NOSIZE ":"",
-	(pWinPos->flags & SWP_NOREDRAW)?"SWP_NOREDRAW ":"",
-	(pWinPos->flags & SWP_NOSENDCHANGING)?"SWP_NOSENDCHANGING ":"",
-	(pWinPos->flags & SWP_NOZORDER)?"SWP_NOZORDER ":"",
-	(pWinPos->flags & SWP_SHOWWINDOW)?"SWP_SHOWWINDOW ":"");
-	winDebug("\tno_configure: %s\n", (g_fNoConfigureWindow?"Yes":"No"));
-	winDebug("\textend: (%d, %d, %d, %d)\n",
-            pWinPos->x, pWinPos->y, pWinPos->cx, pWinPos->cy);
+        winDebug("\tflags: %s%s%s%s%s%s%s%s%s%s%s%s\n",
+                 (pWinPos->flags & SWP_DRAWFRAME) ? "SWP_DRAWFRAME " : "",
+                 (pWinPos->flags & SWP_FRAMECHANGED) ? "SWP_FRAMECHANGED " : "",
+                 (pWinPos->flags & SWP_HIDEWINDOW) ? "SWP_HIDEWINDOW " : "",
+                 (pWinPos->flags & SWP_NOACTIVATE) ? "SWP_NOACTIVATE " : "",
+                 (pWinPos->flags & SWP_NOCOPYBITS) ? "SWP_NOCOPYBITS " : "",
+                 (pWinPos->flags & SWP_NOMOVE) ? "SWP_NOMOVE " : "",
+                 (pWinPos->
+                  flags & SWP_NOOWNERZORDER) ? "SWP_NOOWNERZORDER " : "",
+                 (pWinPos->flags & SWP_NOSIZE) ? "SWP_NOSIZE " : "",
+                 (pWinPos->flags & SWP_NOREDRAW) ? "SWP_NOREDRAW " : "",
+                 (pWinPos->
+                  flags & SWP_NOSENDCHANGING) ? "SWP_NOSENDCHANGING " : "",
+                 (pWinPos->flags & SWP_NOZORDER) ? "SWP_NOZORDER " : "",
+                 (pWinPos->flags & SWP_SHOWWINDOW) ? "SWP_SHOWWINDOW " : "");
+        winDebug("\tno_configure: %s\n", (g_fNoConfigureWindow ? "Yes" : "No"));
+        winDebug("\textend: (%d, %d, %d, %d)\n",
+                 pWinPos->x, pWinPos->y, pWinPos->cx, pWinPos->cy);
 
 #endif
-	if (pWinPos->flags & SWP_HIDEWINDOW) break;
-
-	/* Reorder if window z order was changed */
-	if ((pScreenPriv != NULL)
-	    && !(pWinPos->flags & SWP_NOZORDER)
-	    && !(pWinPos->flags & SWP_SHOWWINDOW)
-	    && winIsInternalWMRunning(pScreenInfo))
-	  {
+        if (pWinPos->flags & SWP_HIDEWINDOW)
+            break;
+
+        /* Reorder if window z order was changed */
+        if ((pScreenPriv != NULL)
+            && !(pWinPos->flags & SWP_NOZORDER)
+            && !(pWinPos->flags & SWP_SHOWWINDOW)
+            && winIsInternalWMRunning(pScreenInfo)) {
 #if CYGMULTIWINDOW_DEBUG
-	    winDebug ("\twindow z order was changed\n");
+            winDebug("\twindow z order was changed\n");
 #endif
-	    if (pWinPos->hwndInsertAfter == HWND_TOP
-		||pWinPos->hwndInsertAfter == HWND_TOPMOST
-		||pWinPos->hwndInsertAfter == HWND_NOTOPMOST)
-	      {
+            if (pWinPos->hwndInsertAfter == HWND_TOP
+                || pWinPos->hwndInsertAfter == HWND_TOPMOST
+                || pWinPos->hwndInsertAfter == HWND_NOTOPMOST) {
 #if CYGMULTIWINDOW_DEBUG
-		winDebug ("\traise to top\n");
+                winDebug("\traise to top\n");
 #endif
-		/* Raise the window to the top in Z order */
-		wmMsg.msg = WM_WM_RAISE;
-		if (fWMMsgInitialized)
-		  winSendMessageToWM (pScreenPriv->pWMInfo, &wmMsg);
-	      }
+                /* Raise the window to the top in Z order */
+                wmMsg.msg = WM_WM_RAISE;
+                if (fWMMsgInitialized)
+                    winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
+            }
 #if 1
-	    else if (pWinPos->hwndInsertAfter == HWND_BOTTOM)
-	      {
-	      }
-	    else
-	      {
-		/* Check if this window is top of X windows. */
-		HWND hWndAbove = NULL;
-		DWORD dwCurrentProcessID = GetCurrentProcessId ();
-		DWORD dwWindowProcessID = 0;
-
-		for (hWndAbove = pWinPos->hwndInsertAfter;
-		     hWndAbove != NULL;
-		     hWndAbove = GetNextWindow (hWndAbove, GW_HWNDPREV))
-		  {
-		    /* Ignore other XWin process's window */
-		    GetWindowThreadProcessId (hWndAbove, &dwWindowProcessID);
-
-		    if ((dwWindowProcessID == dwCurrentProcessID)
-			&& GetProp (hWndAbove, WIN_WINDOW_PROP)
-			&& !IsWindowVisible (hWndAbove)
-			&& !IsIconic (hWndAbove) ) /* ignore minimized windows */
-		      break;
-		  }
-		/* If this is top of X windows in Windows stack,
-		   raise it in X stack. */
-		if (hWndAbove == NULL)
-		  {
+            else if (pWinPos->hwndInsertAfter == HWND_BOTTOM) {
+            }
+            else {
+                /* Check if this window is top of X windows. */
+                HWND hWndAbove = NULL;
+                DWORD dwCurrentProcessID = GetCurrentProcessId();
+                DWORD dwWindowProcessID = 0;
+
+                for (hWndAbove = pWinPos->hwndInsertAfter;
+                     hWndAbove != NULL;
+                     hWndAbove = GetNextWindow(hWndAbove, GW_HWNDPREV)) {
+                    /* Ignore other XWin process's window */
+                    GetWindowThreadProcessId(hWndAbove, &dwWindowProcessID);
+
+                    if ((dwWindowProcessID == dwCurrentProcessID)
+                        && GetProp(hWndAbove, WIN_WINDOW_PROP)
+                        && !IsWindowVisible(hWndAbove)
+                        && !IsIconic(hWndAbove))        /* ignore minimized windows */
+                        break;
+                }
+                /* If this is top of X windows in Windows stack,
+                   raise it in X stack. */
+                if (hWndAbove == NULL) {
 #if CYGMULTIWINDOW_DEBUG
-		    winDebug ("\traise to top\n");
+                    winDebug("\traise to top\n");
 #endif
-		    /* Raise the window to the top in Z order */
-		    wmMsg.msg = WM_WM_RAISE;
-		    if (fWMMsgInitialized)
-		      winSendMessageToWM (pScreenPriv->pWMInfo, &wmMsg);
-		  }
-	      }
+                    /* Raise the window to the top in Z order */
+                    wmMsg.msg = WM_WM_RAISE;
+                    if (fWMMsgInitialized)
+                        winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
+                }
+            }
 #endif
-	  }
+        }
 
-	if (!(pWinPos->flags & SWP_NOSIZE)) {
-	  if (IsIconic(hwnd)){
+        if (!(pWinPos->flags & SWP_NOSIZE)) {
+            if (IsIconic(hwnd)) {
 #if CYGMULTIWINDOW_DEBUG
-	    winDebug ("\tIconic -> MINIMIZED\n");
+                winDebug("\tIconic -> MINIMIZED\n");
 #endif
-	    if (winIsInternalWMRunning(pScreenInfo))
-	      {
-	      /* Raise the window to the top in Z order */
-		wmMsg.msg = WM_WM_LOWER;
-		if (fWMMsgInitialized)
-		  winSendMessageToWM (pScreenPriv->pWMInfo, &wmMsg);
-	      }
-	    winWindowsWMSendEvent(WindowsWMControllerNotify,
-				  WindowsWMControllerNotifyMask,
-				  1,
-				  WindowsWMMinimizeWindow,
-				  pWin->drawable.id,
-				  0, 0, 0, 0);
-	  } else if (IsZoomed(hwnd)){
+                if (winIsInternalWMRunning(pScreenInfo)) {
+                    /* Raise the window to the top in Z order */
+                    wmMsg.msg = WM_WM_LOWER;
+                    if (fWMMsgInitialized)
+                        winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
+                }
+                winWindowsWMSendEvent(WindowsWMControllerNotify,
+                                      WindowsWMControllerNotifyMask,
+                                      1,
+                                      WindowsWMMinimizeWindow,
+                                      pWin->drawable.id, 0, 0, 0, 0);
+            }
+            else if (IsZoomed(hwnd)) {
 #if CYGMULTIWINDOW_DEBUG
-	    winDebug ("\tZoomed -> MAXIMIZED\n");
+                winDebug("\tZoomed -> MAXIMIZED\n");
 #endif
-	    winWindowsWMSendEvent(WindowsWMControllerNotify,
-				  WindowsWMControllerNotifyMask,
-				  1,
-				  WindowsWMMaximizeWindow,
-				  pWin->drawable.id,
-				  0, 0, 0, 0);
-	  } else {
+                winWindowsWMSendEvent(WindowsWMControllerNotify,
+                                      WindowsWMControllerNotifyMask,
+                                      1,
+                                      WindowsWMMaximizeWindow,
+                                      pWin->drawable.id, 0, 0, 0, 0);
+            }
+            else {
 #if CYGMULTIWINDOW_DEBUG
-	    winDebug ("\tnone -> RESTORED\n");
+                winDebug("\tnone -> RESTORED\n");
 #endif
-	    winWindowsWMSendEvent(WindowsWMControllerNotify,
-				  WindowsWMControllerNotifyMask,
-				  1,
-				  WindowsWMRestoreWindow,
-				  pWin->drawable.id,
-				  0, 0, 0, 0);
-	  }
-	}
-	if (!g_fNoConfigureWindow ) {
-
-	  if (!pRLWinPriv->fMovingOrSizing
-	      /*&& (pWinPos->flags & SWP_SHOWWINDOW)*/) {
-	    GetClientRect (hwnd, &rcClient);
-	    MapWindowPoints (hwnd, HWND_DESKTOP, (LPPOINT)&rcClient, 2);
-
-	    if (!(pWinPos->flags & SWP_NOMOVE)
-		&&!(pWinPos->flags & SWP_NOSIZE)) {
+                winWindowsWMSendEvent(WindowsWMControllerNotify,
+                                      WindowsWMControllerNotifyMask,
+                                      1,
+                                      WindowsWMRestoreWindow,
+                                      pWin->drawable.id, 0, 0, 0, 0);
+            }
+        }
+        if (!g_fNoConfigureWindow) {
+
+            if (!pRLWinPriv->fMovingOrSizing
+                /*&& (pWinPos->flags & SWP_SHOWWINDOW) */ ) {
+                GetClientRect(hwnd, &rcClient);
+                MapWindowPoints(hwnd, HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+
+                if (!(pWinPos->flags & SWP_NOMOVE)
+                    && !(pWinPos->flags & SWP_NOSIZE)) {
 #if CYGMULTIWINDOW_DEBUG
-	      winDebug ("\tmove & resize\n");
+                    winDebug("\tmove & resize\n");
 #endif
-	      if (winIsInternalWMRunning(pScreenInfo))
-                winAdjustXWindow (pWin, hwnd);
-
-	      winMWExtWMMoveResizeXWindow (pWin,
-					   rcClient.left - wBorderWidth (pWin)
-					   - GetSystemMetrics (SM_XVIRTUALSCREEN),
-					   rcClient.top - wBorderWidth (pWin)
-					   - GetSystemMetrics (SM_YVIRTUALSCREEN),
-					   rcClient.right - rcClient.left
-					   - wBorderWidth (pWin)*2,
-					   rcClient.bottom - rcClient.top
-					   - wBorderWidth (pWin)*2);
-	    } else if (!(pWinPos->flags & SWP_NOMOVE)) {
+                    if (winIsInternalWMRunning(pScreenInfo))
+                        winAdjustXWindow(pWin, hwnd);
+
+                    winMWExtWMMoveResizeXWindow(pWin,
+                                                rcClient.left -
+                                                wBorderWidth(pWin)
+                                                -
+                                                GetSystemMetrics
+                                                (SM_XVIRTUALSCREEN),
+                                                rcClient.top -
+                                                wBorderWidth(pWin)
+                                                -
+                                                GetSystemMetrics
+                                                (SM_YVIRTUALSCREEN),
+                                                rcClient.right - rcClient.left -
+                                                wBorderWidth(pWin) * 2,
+                                                rcClient.bottom - rcClient.top -
+                                                wBorderWidth(pWin) * 2);
+                }
+                else if (!(pWinPos->flags & SWP_NOMOVE)) {
 #if CYGMULTIWINDOW_DEBUG
-	      winDebug ("\tmove\n");
+                    winDebug("\tmove\n");
 #endif
-	      if (winIsInternalWMRunning(pScreenInfo))
-                winAdjustXWindow (pWin, hwnd);
-
-	      winMWExtWMMoveResizeXWindow (pWin,
-					   rcClient.left - wBorderWidth (pWin)
-					   - GetSystemMetrics (SM_XVIRTUALSCREEN),
-					   rcClient.top - wBorderWidth (pWin)
-					   - GetSystemMetrics (SM_YVIRTUALSCREEN),
-					   rcClient.right - rcClient.left
-					   - wBorderWidth (pWin)*2,
-					   rcClient.bottom - rcClient.top
-					   - wBorderWidth (pWin)*2);
-	    } else if (!(pWinPos->flags & SWP_NOMOVE)) {
+                    if (winIsInternalWMRunning(pScreenInfo))
+                        winAdjustXWindow(pWin, hwnd);
+
+                    winMWExtWMMoveResizeXWindow(pWin,
+                                                rcClient.left -
+                                                wBorderWidth(pWin)
+                                                -
+                                                GetSystemMetrics
+                                                (SM_XVIRTUALSCREEN),
+                                                rcClient.top -
+                                                wBorderWidth(pWin)
+                                                -
+                                                GetSystemMetrics
+                                                (SM_YVIRTUALSCREEN),
+                                                rcClient.right - rcClient.left -
+                                                wBorderWidth(pWin) * 2,
+                                                rcClient.bottom - rcClient.top -
+                                                wBorderWidth(pWin) * 2);
+                }
+                else if (!(pWinPos->flags & SWP_NOMOVE)) {
 #if CYGMULTIWINDOW_DEBUG
-	      winDebug ("\tmove\n");
+                    winDebug("\tmove\n");
 #endif
-	      if (winIsInternalWMRunning(pScreenInfo))
-                winAdjustXWindow (pWin, hwnd); 
-
-	      winMWExtWMMoveXWindow (pWin,
-				     rcClient.left - wBorderWidth (pWin)
-				     - GetSystemMetrics (SM_XVIRTUALSCREEN),
-				     rcClient.top - wBorderWidth (pWin)
-				     - GetSystemMetrics (SM_YVIRTUALSCREEN));
-	    } else if (!(pWinPos->flags & SWP_NOSIZE)) {
+                    if (winIsInternalWMRunning(pScreenInfo))
+                        winAdjustXWindow(pWin, hwnd);
+
+                    winMWExtWMMoveXWindow(pWin,
+                                          rcClient.left - wBorderWidth(pWin)
+                                          - GetSystemMetrics(SM_XVIRTUALSCREEN),
+                                          rcClient.top - wBorderWidth(pWin)
+                                          -
+                                          GetSystemMetrics(SM_YVIRTUALSCREEN));
+                }
+                else if (!(pWinPos->flags & SWP_NOSIZE)) {
 #if CYGMULTIWINDOW_DEBUG
-	      winDebug ("\tresize\n");
+                    winDebug("\tresize\n");
 #endif
-	      if (winIsInternalWMRunning(pScreenInfo))
-                winAdjustXWindow (pWin, hwnd); 
-
-	      winMWExtWMResizeXWindow (pWin,
-				       rcClient.right - rcClient.left
-				       - wBorderWidth (pWin)*2,
-				       rcClient.bottom - rcClient.top
-				       - wBorderWidth (pWin)*2);
-	    }
-	  }
-	}
-      }
+                    if (winIsInternalWMRunning(pScreenInfo))
+                        winAdjustXWindow(pWin, hwnd);
+
+                    winMWExtWMResizeXWindow(pWin,
+                                            rcClient.right - rcClient.left
+                                            - wBorderWidth(pWin) * 2,
+                                            rcClient.bottom - rcClient.top
+                                            - wBorderWidth(pWin) * 2);
+                }
+            }
+        }
+    }
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_WINDOWPOSCHANGED - done.\n");
+        winDebug("winMWExtWMWindowProc - WM_WINDOWPOSCHANGED - done.\n");
 #endif
-      return 0;
+        return 0;
 
     case WM_SIZE:
-      /* see dix/window.c */
-      /* FIXME: Maximize/Restore? */
+        /* see dix/window.c */
+        /* FIXME: Maximize/Restore? */
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_SIZE - %d ms\n",
-		(unsigned int)GetTickCount ());
+        winDebug("winMWExtWMWindowProc - WM_SIZE - %d ms\n",
+                 (unsigned int) GetTickCount());
 #endif
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("\t(%d, %d) %d\n", (short) LOWORD(lParam), (short) HIWORD(lParam), g_fNoConfigureWindow);
+        winDebug("\t(%d, %d) %d\n", (short) LOWORD(lParam),
+                 (short) HIWORD(lParam), g_fNoConfigureWindow);
 #endif
-      if (g_fNoConfigureWindow) break;
+        if (g_fNoConfigureWindow)
+            break;
 
-      /* Branch on type of resizing occurring */
-      switch (wParam)
-	{
-	case SIZE_MINIMIZED:
+        /* Branch on type of resizing occurring */
+        switch (wParam) {
+        case SIZE_MINIMIZED:
 #if CYGMULTIWINDOW_DEBUG
-	  winDebug ("\tSIZE_MINIMIZED\n");
+            winDebug("\tSIZE_MINIMIZED\n");
 #endif
-	  if (winIsInternalWMRunning(pScreenInfo))
-	    {
-	      /* Raise the window to the top in Z order */
-	      wmMsg.msg = WM_WM_LOWER;
-	      if (fWMMsgInitialized)
-		winSendMessageToWM (pScreenPriv->pWMInfo, &wmMsg);
-	    }
-	  winWindowsWMSendEvent(WindowsWMControllerNotify,
-				WindowsWMControllerNotifyMask,
-				1,
-				WindowsWMMinimizeWindow,
-				pWin->drawable.id,
-				0, 0,
-				LOWORD(lParam), HIWORD(lParam));
-	  break;
-
-	case SIZE_RESTORED:
+            if (winIsInternalWMRunning(pScreenInfo)) {
+                /* Raise the window to the top in Z order */
+                wmMsg.msg = WM_WM_LOWER;
+                if (fWMMsgInitialized)
+                    winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
+            }
+            winWindowsWMSendEvent(WindowsWMControllerNotify,
+                                  WindowsWMControllerNotifyMask,
+                                  1,
+                                  WindowsWMMinimizeWindow,
+                                  pWin->drawable.id,
+                                  0, 0, LOWORD(lParam), HIWORD(lParam));
+            break;
+
+        case SIZE_RESTORED:
 #if CYGMULTIWINDOW_DEBUG
-	  winDebug ("\tSIZE_RESTORED\n");
+            winDebug("\tSIZE_RESTORED\n");
 #endif
-	  winWindowsWMSendEvent(WindowsWMControllerNotify,
-				WindowsWMControllerNotifyMask,
-				1,
-				WindowsWMRestoreWindow,
-				pWin->drawable.id,
-				0, 0,
-				LOWORD(lParam), HIWORD(lParam));
-	  break;
-
-	case SIZE_MAXIMIZED:
+            winWindowsWMSendEvent(WindowsWMControllerNotify,
+                                  WindowsWMControllerNotifyMask,
+                                  1,
+                                  WindowsWMRestoreWindow,
+                                  pWin->drawable.id,
+                                  0, 0, LOWORD(lParam), HIWORD(lParam));
+            break;
+
+        case SIZE_MAXIMIZED:
 #if CYGMULTIWINDOW_DEBUG
-	  winDebug ("\tSIZE_MAXIMIZED\n");
+            winDebug("\tSIZE_MAXIMIZED\n");
 #endif
-	  winWindowsWMSendEvent(WindowsWMControllerNotify,
-				WindowsWMControllerNotifyMask,
-				1,
-				WindowsWMMaximizeWindow,
-				pWin->drawable.id,
-				0, 0,
-				LOWORD(lParam), HIWORD(lParam));
-	  break;
-	}
-
-      /* Perform the resize and notify the X client */
-      if (!pRLWinPriv->fMovingOrSizing)
-	{
-	  if (winIsInternalWMRunning(pScreenInfo))
-            winAdjustXWindow (pWin, hwnd);
-
-	  winMWExtWMResizeXWindow (pWin,
-				   (short) LOWORD(lParam)
-				   - wBorderWidth (pWin)*2,
-				   (short) HIWORD(lParam)
-				   - wBorderWidth (pWin)*2);
-	}
-      break;
+            winWindowsWMSendEvent(WindowsWMControllerNotify,
+                                  WindowsWMControllerNotifyMask,
+                                  1,
+                                  WindowsWMMaximizeWindow,
+                                  pWin->drawable.id,
+                                  0, 0, LOWORD(lParam), HIWORD(lParam));
+            break;
+        }
+
+        /* Perform the resize and notify the X client */
+        if (!pRLWinPriv->fMovingOrSizing) {
+            if (winIsInternalWMRunning(pScreenInfo))
+                winAdjustXWindow(pWin, hwnd);
+
+            winMWExtWMResizeXWindow(pWin, (short) LOWORD(lParam)
+                                    - wBorderWidth(pWin) * 2,
+                                    (short) HIWORD(lParam)
+                                    - wBorderWidth(pWin) * 2);
+        }
+        break;
 
     case WM_ACTIVATEAPP:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_ACTIVATEAPP - %d ms\n",
-		(unsigned int)GetTickCount ());
+        winDebug("winMWExtWMWindowProc - WM_ACTIVATEAPP - %d ms\n",
+                 (unsigned int) GetTickCount());
 #endif
-      if (wParam)
-	{
-	  if (winIsInternalWMRunning(pScreenInfo))
-	    {
-	    }
-	  else
-	    {
-	    }
-	  winWindowsWMSendEvent(WindowsWMActivationNotify,
-				WindowsWMActivationNotifyMask,
-				1,
-				WindowsWMIsActive,
-				pWin->drawable.id,
-				0, 0,
-				0, 0);
-	}
-      else
-	{
-	  winWindowsWMSendEvent(WindowsWMActivationNotify,
-				WindowsWMActivationNotifyMask,
-				1,
-				WindowsWMIsInactive,
-				pWin->drawable.id,
-				0, 0,
-				0, 0);
-	}
-      break;
+        if (wParam) {
+            if (winIsInternalWMRunning(pScreenInfo)) {
+            }
+            else {
+            }
+            winWindowsWMSendEvent(WindowsWMActivationNotify,
+                                  WindowsWMActivationNotifyMask,
+                                  1,
+                                  WindowsWMIsActive,
+                                  pWin->drawable.id, 0, 0, 0, 0);
+        }
+        else {
+            winWindowsWMSendEvent(WindowsWMActivationNotify,
+                                  WindowsWMActivationNotifyMask,
+                                  1,
+                                  WindowsWMIsInactive,
+                                  pWin->drawable.id, 0, 0, 0, 0);
+        }
+        break;
 
     case WM_SETCURSOR:
-      if (LOWORD(lParam) == HTCLIENT)
-	{
-	  if (!g_fSoftwareCursor) SetCursor (pScreenPriv->cursor.handle);
-	  return TRUE;
-	}
-      break;
+        if (LOWORD(lParam) == HTCLIENT) {
+            if (!g_fSoftwareCursor)
+                SetCursor(pScreenPriv->cursor.handle);
+            return TRUE;
+        }
+        break;
 
     case WM_ENTERSIZEMOVE:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_ENTERSIZEMOVE - %d ms\n",
-		(unsigned int)GetTickCount ());
+        winDebug("winMWExtWMWindowProc - WM_ENTERSIZEMOVE - %d ms\n",
+                 (unsigned int) GetTickCount());
 #endif
-      pRLWinPriv->fMovingOrSizing = TRUE;
-      break;
+        pRLWinPriv->fMovingOrSizing = TRUE;
+        break;
 
     case WM_EXITSIZEMOVE:
 #if CYGMULTIWINDOW_DEBUG
-      winDebug ("winMWExtWMWindowProc - WM_EXITSIZEMOVE - %d ms\n",
-		(unsigned int)GetTickCount ());
+        winDebug("winMWExtWMWindowProc - WM_EXITSIZEMOVE - %d ms\n",
+                 (unsigned int) GetTickCount());
 #endif
-      pRLWinPriv->fMovingOrSizing = FALSE;
+        pRLWinPriv->fMovingOrSizing = FALSE;
 
-      GetClientRect (hwnd, &rcClient);
+        GetClientRect(hwnd, &rcClient);
 
-      MapWindowPoints (hwnd, HWND_DESKTOP, (LPPOINT)&rcClient, 2);
+        MapWindowPoints(hwnd, HWND_DESKTOP, (LPPOINT) & rcClient, 2);
 
-      if (winIsInternalWMRunning(pScreenInfo))
-        winAdjustXWindow (pWin, hwnd); 
+        if (winIsInternalWMRunning(pScreenInfo))
+            winAdjustXWindow(pWin, hwnd);
 
-      winMWExtWMMoveResizeXWindow (pWin,
-				   rcClient.left - wBorderWidth (pWin)
-				   - GetSystemMetrics (SM_XVIRTUALSCREEN),
-				   rcClient.top - wBorderWidth (pWin)
-				   - GetSystemMetrics (SM_YVIRTUALSCREEN),
-				   rcClient.right - rcClient.left
-				   - wBorderWidth (pWin)*2,
-				   rcClient.bottom - rcClient.top
-				   - wBorderWidth (pWin)*2);
-      break;
+        winMWExtWMMoveResizeXWindow(pWin, rcClient.left - wBorderWidth(pWin)
+                                    - GetSystemMetrics(SM_XVIRTUALSCREEN),
+                                    rcClient.top - wBorderWidth(pWin)
+                                    - GetSystemMetrics(SM_YVIRTUALSCREEN),
+                                    rcClient.right - rcClient.left
+                                    - wBorderWidth(pWin) * 2,
+                                    rcClient.bottom - rcClient.top
+                                    - wBorderWidth(pWin) * 2);
+        break;
 
     case WM_MANAGE:
-      ErrorF ("winMWExtWMWindowProc - WM_MANAGE\n");
-      break;
+        ErrorF("winMWExtWMWindowProc - WM_MANAGE\n");
+        break;
 
     case WM_UNMANAGE:
-      ErrorF ("winMWExtWMWindowProc - WM_UNMANAGE\n");
-      break;
+        ErrorF("winMWExtWMWindowProc - WM_UNMANAGE\n");
+        break;
 
     default:
-      break;
+        break;
     }
 
-  return DefWindowProc (hwnd, message, wParam, lParam);
+    return DefWindowProc(hwnd, message, wParam, lParam);
 }
diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c
index 7975d71a9..594791789 100644
--- a/xorg-server/hw/xwin/winwindow.c
+++ b/xorg-server/hw/xwin/winwindow.c
@@ -34,604 +34,577 @@
 #endif
 #include "win.h"
 
-
 /*
  * Prototypes for local functions
  */
 
 static int
-winAddRgn (WindowPtr pWindow, pointer data);
+ winAddRgn(WindowPtr pWindow, pointer data);
 
 static
-void
-winUpdateRgnRootless (WindowPtr pWindow);
+    void
+ winUpdateRgnRootless(WindowPtr pWindow);
 
 static
-void
-winReshapeRootless (WindowPtr pWin);
-
+    void
+ winReshapeRootless(WindowPtr pWin);
 
 #ifdef XWIN_NATIVEGDI
 /* See Porting Layer Definition - p. 37 */
 /* See mfb/mfbwindow.c - mfbCreateWindow() */
 
 Bool
-winCreateWindowNativeGDI (WindowPtr pWin)
+winCreateWindowNativeGDI(WindowPtr pWin)
 {
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = TRUE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winCreateWindowNativeGDI (%p)\n", pWin);
+    winTrace("winCreateWindowNativeGDI (%p)\n", pWin);
 #endif
 
-  WIN_UNWRAP(CreateWindow);
-  fResult = (*pScreen->CreateWindow) (pWin);
-  WIN_WRAP(CreateWindow, winCreateWindowNativeGDI);
+    WIN_UNWRAP(CreateWindow);
+    fResult = (*pScreen->CreateWindow) (pWin);
+    WIN_WRAP(CreateWindow, winCreateWindowNativeGDI);
 
-  return fResult;
+    return fResult;
 }
 
-
 /* See Porting Layer Definition - p. 37 */
 /* See mfb/mfbwindow.c - mfbDestroyWindow() */
 
 Bool
-winDestroyWindowNativeGDI (WindowPtr pWin)
+winDestroyWindowNativeGDI(WindowPtr pWin)
 {
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = TRUE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winDestroyWindowNativeGDI (%p)\n", pWin);
+    winTrace("winDestroyWindowNativeGDI (%p)\n", pWin);
 #endif
 
-  WIN_UNWRAP(DestroyWindow); 
-  fResult = (*pScreen->DestroyWindow)(pWin);
-  WIN_WRAP(DestroyWindow, winDestroyWindowNativeGDI);
+    WIN_UNWRAP(DestroyWindow);
+    fResult = (*pScreen->DestroyWindow) (pWin);
+    WIN_WRAP(DestroyWindow, winDestroyWindowNativeGDI);
 
-  return fResult;
+    return fResult;
 }
 
-
 /* See Porting Layer Definition - p. 37 */
 /* See mfb/mfbwindow.c - mfbPositionWindow() */
 
 Bool
-winPositionWindowNativeGDI (WindowPtr pWin, int x, int y)
+winPositionWindowNativeGDI(WindowPtr pWin, int x, int y)
 {
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = TRUE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winPositionWindowNativeGDI (%p)\n", pWin);
+    winTrace("winPositionWindowNativeGDI (%p)\n", pWin);
 #endif
 
-  WIN_UNWRAP(PositionWindow);
-  fResult = (*pScreen->PositionWindow)(pWin, x, y);
-  WIN_WRAP(PositionWindow, winPositionWindowNativeGDI);
+    WIN_UNWRAP(PositionWindow);
+    fResult = (*pScreen->PositionWindow) (pWin, x, y);
+    WIN_WRAP(PositionWindow, winPositionWindowNativeGDI);
 
-  return fResult;
+    return fResult;
 }
 
-
 /* See Porting Layer Definition - p. 39 */
 /* See mfb/mfbwindow.c - mfbCopyWindow() */
 
-void 
-winCopyWindowNativeGDI (WindowPtr pWin,
-			DDXPointRec ptOldOrg,
-			RegionPtr prgnSrc)
+void
+winCopyWindowNativeGDI(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
-  DDXPointPtr		pptSrc;
-  DDXPointPtr		ppt;
-  RegionPtr		prgnDst;
-  BoxPtr		pBox;
-  int			dx, dy;
-  int			i, nbox;
-  WindowPtr		pwinRoot;
-  BoxPtr		pBoxDst;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
+    DDXPointPtr pptSrc;
+    DDXPointPtr ppt;
+    RegionPtr prgnDst;
+    BoxPtr pBox;
+    int dx, dy;
+    int i, nbox;
+    WindowPtr pwinRoot;
+    BoxPtr pBoxDst;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winScreenPriv(pScreen);
 
 #if 0
-  ErrorF ("winCopyWindow\n");
+    ErrorF("winCopyWindow\n");
 #endif
 
-  /* Get a pointer to the root window */
-  pwinRoot = pWin->drawable.pScreen->root;
+    /* Get a pointer to the root window */
+    pwinRoot = pWin->drawable.pScreen->root;
 
-  /* Create a region for the destination */
-  prgnDst = RegionCreate(NULL, 1);
+    /* Create a region for the destination */
+    prgnDst = RegionCreate(NULL, 1);
 
-  /* Calculate the shift from the source to the destination */
-  dx = ptOldOrg.x - pWin->drawable.x;
-  dy = ptOldOrg.y - pWin->drawable.y;
+    /* Calculate the shift from the source to the destination */
+    dx = ptOldOrg.x - pWin->drawable.x;
+    dy = ptOldOrg.y - pWin->drawable.y;
 
-  /* Translate the region from the destination to the source? */
-  RegionTranslate(prgnSrc, -dx, -dy);
-  RegionIntersect(prgnDst, &pWin->borderClip,
-		   prgnSrc);
+    /* Translate the region from the destination to the source? */
+    RegionTranslate(prgnSrc, -dx, -dy);
+    RegionIntersect(prgnDst, &pWin->borderClip, prgnSrc);
 
-  /* Get a pointer to the first box in the region to be copied */
-  pBox = RegionRects(prgnDst);
-  
-  /* Get the number of boxes in the region */
-  nbox = RegionNumRects(prgnDst);
+    /* Get a pointer to the first box in the region to be copied */
+    pBox = RegionRects(prgnDst);
 
-  /* Allocate source points for each box */
-  if(!(pptSrc = (DDXPointPtr )malloc(nbox * sizeof(DDXPointRec))))
-    return;
+    /* Get the number of boxes in the region */
+    nbox = RegionNumRects(prgnDst);
+
+    /* Allocate source points for each box */
+    if (!(pptSrc = (DDXPointPtr) malloc(nbox * sizeof(DDXPointRec))))
+        return;
 
-  /* Set an iterator pointer */
-  ppt = pptSrc;
+    /* Set an iterator pointer */
+    ppt = pptSrc;
 
-  /* Calculate the source point of each box? */
-  for (i = nbox; --i >= 0; ppt++, pBox++)
-    {
-      ppt->x = pBox->x1 + dx;
-      ppt->y = pBox->y1 + dy;
+    /* Calculate the source point of each box? */
+    for (i = nbox; --i >= 0; ppt++, pBox++) {
+        ppt->x = pBox->x1 + dx;
+        ppt->y = pBox->y1 + dy;
     }
 
-  /* Setup loop pointers again */
-  pBoxDst = RegionRects(prgnDst);
-  ppt = pptSrc;
+    /* Setup loop pointers again */
+    pBoxDst = RegionRects(prgnDst);
+    ppt = pptSrc;
 
 #if 0
-  ErrorF ("winCopyWindow - x1\tx2\ty1\ty2\tx\ty\n");
+    ErrorF("winCopyWindow - x1\tx2\ty1\ty2\tx\ty\n");
 #endif
 
-  /* BitBlt each source to the destination point */
-  for (i = nbox; --i >= 0; pBoxDst++, ppt++)
-    {
+    /* BitBlt each source to the destination point */
+    for (i = nbox; --i >= 0; pBoxDst++, ppt++) {
 #if 0
-      ErrorF ("winCopyWindow - %d\t%d\t%d\t%d\t%d\t%d\n",
-	      pBoxDst->x1, pBoxDst->x2, pBoxDst->y1, pBoxDst->y2,
-	      ppt->x, ppt->y);
+        ErrorF("winCopyWindow - %d\t%d\t%d\t%d\t%d\t%d\n",
+               pBoxDst->x1, pBoxDst->x2, pBoxDst->y1, pBoxDst->y2,
+               ppt->x, ppt->y);
 #endif
 
-      BitBlt (pScreenPriv->hdcScreen,
-	      pBoxDst->x1, pBoxDst->y1,
-	      pBoxDst->x2 - pBoxDst->x1, pBoxDst->y2 - pBoxDst->y1,
-	      pScreenPriv->hdcScreen,
-	      ppt->x, ppt->y,
-	      SRCCOPY);
+        BitBlt(pScreenPriv->hdcScreen,
+               pBoxDst->x1, pBoxDst->y1,
+               pBoxDst->x2 - pBoxDst->x1, pBoxDst->y2 - pBoxDst->y1,
+               pScreenPriv->hdcScreen, ppt->x, ppt->y, SRCCOPY);
     }
 
-  /* Cleanup the regions, etc. */
-  free(pptSrc);
-  RegionDestroy(prgnDst);
+    /* Cleanup the regions, etc. */
+    free(pptSrc);
+    RegionDestroy(prgnDst);
 }
 
-
 /* See Porting Layer Definition - p. 37 */
 /* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */
 
 Bool
-winChangeWindowAttributesNativeGDI (WindowPtr pWin, unsigned long mask)
+winChangeWindowAttributesNativeGDI(WindowPtr pWin, unsigned long mask)
 {
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = TRUE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winChangeWindowAttributesNativeGDI (%p)\n", pWin);
+    winTrace("winChangeWindowAttributesNativeGDI (%p)\n", pWin);
 #endif
-  
-  WIN_UNWRAP(ChangeWindowAttributes); 
-  fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);
-  WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesNativeGDI);
-  
-  /*
-   * NOTE: We do not currently need to do anything here.
-   */
-
-  return fResult;
-}
 
+    WIN_UNWRAP(ChangeWindowAttributes);
+    fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
+    WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesNativeGDI);
+
+    /*
+     * NOTE: We do not currently need to do anything here.
+     */
+
+    return fResult;
+}
 
 /* See Porting Layer Definition - p. 37
  * Also referred to as UnrealizeWindow
  */
 
 Bool
-winUnmapWindowNativeGDI (WindowPtr pWin)
+winUnmapWindowNativeGDI(WindowPtr pWin)
 {
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = TRUE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winUnmapWindowNativeGDI (%p)\n", pWin);
+    winTrace("winUnmapWindowNativeGDI (%p)\n", pWin);
 #endif
 
-  WIN_UNWRAP(UnrealizeWindow); 
-  fResult = (*pScreen->UnrealizeWindow)(pWin);
-  WIN_WRAP(UnrealizeWindow, winUnmapWindowNativeGDI);
-  
-  return fResult;
-}
+    WIN_UNWRAP(UnrealizeWindow);
+    fResult = (*pScreen->UnrealizeWindow) (pWin);
+    WIN_WRAP(UnrealizeWindow, winUnmapWindowNativeGDI);
 
+    return fResult;
+}
 
 /* See Porting Layer Definition - p. 37
  * Also referred to as RealizeWindow
  */
 
 Bool
-winMapWindowNativeGDI (WindowPtr pWin)
+winMapWindowNativeGDI(WindowPtr pWin)
 {
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = TRUE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winMapWindowNativeGDI (%p)\n", pWin);
+    winTrace("winMapWindowNativeGDI (%p)\n", pWin);
 #endif
 
-  WIN_UNWRAP(RealizeWindow); 
-  fResult = (*pScreen->RealizeWindow)(pWin);
-  WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);
-  
-  return fResult;
+    WIN_UNWRAP(RealizeWindow);
+    fResult = (*pScreen->RealizeWindow) (pWin);
+    WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);
+
+    return fResult;
 
 }
 #endif
 
-
 /* See Porting Layer Definition - p. 37 */
 /* See mfb/mfbwindow.c - mfbCreateWindow() */
 
 Bool
-winCreateWindowRootless (WindowPtr pWin)
+winCreateWindowRootless(WindowPtr pWin)
 {
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = FALSE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winCreateWindowRootless (%p)\n", pWin);
+    winTrace("winCreateWindowRootless (%p)\n", pWin);
 #endif
 
-  WIN_UNWRAP(CreateWindow);
-  fResult = (*pScreen->CreateWindow) (pWin);
-  WIN_WRAP(CreateWindow, winCreateWindowRootless);
-  
-  pWinPriv->hRgn = NULL;
-  
-  return fResult;
-}
+    WIN_UNWRAP(CreateWindow);
+    fResult = (*pScreen->CreateWindow) (pWin);
+    WIN_WRAP(CreateWindow, winCreateWindowRootless);
 
+    pWinPriv->hRgn = NULL;
+
+    return fResult;
+}
 
 /* See Porting Layer Definition - p. 37 */
 /* See mfb/mfbwindow.c - mfbDestroyWindow() */
 
 Bool
-winDestroyWindowRootless (WindowPtr pWin)
+winDestroyWindowRootless(WindowPtr pWin)
 {
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = FALSE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winDestroyWindowRootless (%p)\n", pWin);
+    winTrace("winDestroyWindowRootless (%p)\n", pWin);
 #endif
 
-  WIN_UNWRAP(DestroyWindow); 
-  fResult = (*pScreen->DestroyWindow)(pWin);
-  WIN_WRAP(DestroyWindow, winDestroyWindowRootless);
-  
-  if (pWinPriv->hRgn != NULL)
-    {
-      DeleteObject(pWinPriv->hRgn);
-      pWinPriv->hRgn = NULL;
+    WIN_UNWRAP(DestroyWindow);
+    fResult = (*pScreen->DestroyWindow) (pWin);
+    WIN_WRAP(DestroyWindow, winDestroyWindowRootless);
+
+    if (pWinPriv->hRgn != NULL) {
+        DeleteObject(pWinPriv->hRgn);
+        pWinPriv->hRgn = NULL;
     }
-  
-  winUpdateRgnRootless (pWin);
-  
-  return fResult;
-}
 
+    winUpdateRgnRootless(pWin);
+
+    return fResult;
+}
 
 /* See Porting Layer Definition - p. 37 */
 /* See mfb/mfbwindow.c - mfbPositionWindow() */
 
 Bool
-winPositionWindowRootless (WindowPtr pWin, int x, int y)
+winPositionWindowRootless(WindowPtr pWin, int x, int y)
 {
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
+    Bool fResult = FALSE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
 
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winPositionWindowRootless (%p)\n", pWin);
+    winTrace("winPositionWindowRootless (%p)\n", pWin);
 #endif
 
-  WIN_UNWRAP(PositionWindow);
-  fResult = (*pScreen->PositionWindow)(pWin, x, y);
-  WIN_WRAP(PositionWindow, winPositionWindowRootless);
-  
-  winUpdateRgnRootless (pWin);
-  
-  return fResult;
-}
+    WIN_UNWRAP(PositionWindow);
+    fResult = (*pScreen->PositionWindow) (pWin, x, y);
+    WIN_WRAP(PositionWindow, winPositionWindowRootless);
 
+    winUpdateRgnRootless(pWin);
+
+    return fResult;
+}
 
 /* See Porting Layer Definition - p. 37 */
 /* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */
 
 Bool
-winChangeWindowAttributesRootless (WindowPtr pWin, unsigned long mask)
+winChangeWindowAttributesRootless(WindowPtr pWin, unsigned long mask)
 {
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
+    Bool fResult = FALSE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winChangeWindowAttributesRootless (%p)\n", pWin);
+    winTrace("winChangeWindowAttributesRootless (%p)\n", pWin);
 #endif
 
-  WIN_UNWRAP(ChangeWindowAttributes); 
-  fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);
-  WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesRootless);
+    WIN_UNWRAP(ChangeWindowAttributes);
+    fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
+    WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesRootless);
 
-  winUpdateRgnRootless (pWin);
-  
-  return fResult;
-}
+    winUpdateRgnRootless(pWin);
 
+    return fResult;
+}
 
 /* See Porting Layer Definition - p. 37
  * Also referred to as UnrealizeWindow
  */
 
 Bool
-winUnmapWindowRootless (WindowPtr pWin)
+winUnmapWindowRootless(WindowPtr pWin)
 {
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
+    Bool fResult = FALSE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winWindowPriv(pWin);
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winUnmapWindowRootless (%p)\n", pWin);
+    winTrace("winUnmapWindowRootless (%p)\n", pWin);
 #endif
 
-  WIN_UNWRAP(UnrealizeWindow); 
-  fResult = (*pScreen->UnrealizeWindow)(pWin);
-  WIN_WRAP(UnrealizeWindow, winUnmapWindowRootless);
-  
-  if (pWinPriv->hRgn != NULL)
-    {
-      DeleteObject(pWinPriv->hRgn);
-      pWinPriv->hRgn = NULL;
+    WIN_UNWRAP(UnrealizeWindow);
+    fResult = (*pScreen->UnrealizeWindow) (pWin);
+    WIN_WRAP(UnrealizeWindow, winUnmapWindowRootless);
+
+    if (pWinPriv->hRgn != NULL) {
+        DeleteObject(pWinPriv->hRgn);
+        pWinPriv->hRgn = NULL;
     }
-  
-  winUpdateRgnRootless (pWin);
-  
-  return fResult;
-}
 
+    winUpdateRgnRootless(pWin);
+
+    return fResult;
+}
 
 /* See Porting Layer Definition - p. 37
  * Also referred to as RealizeWindow
  */
 
 Bool
-winMapWindowRootless (WindowPtr pWin)
+winMapWindowRootless(WindowPtr pWin)
 {
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
+    Bool fResult = FALSE;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winMapWindowRootless (%p)\n", pWin);
+    winTrace("winMapWindowRootless (%p)\n", pWin);
 #endif
 
-  WIN_UNWRAP(RealizeWindow); 
-  fResult = (*pScreen->RealizeWindow)(pWin);
-  WIN_WRAP(RealizeWindow, winMapWindowRootless);
+    WIN_UNWRAP(RealizeWindow);
+    fResult = (*pScreen->RealizeWindow) (pWin);
+    WIN_WRAP(RealizeWindow, winMapWindowRootless);
 
-  winReshapeRootless (pWin);
-  
-  winUpdateRgnRootless (pWin);
-  
-  return fResult;
-}
+    winReshapeRootless(pWin);
 
+    winUpdateRgnRootless(pWin);
+
+    return fResult;
+}
 
 void
-winSetShapeRootless (WindowPtr pWin, int kind)
+winSetShapeRootless(WindowPtr pWin, int kind)
 {
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    winScreenPriv(pScreen);
 
 #if CYGDEBUG
-  winTrace ("winSetShapeRootless (%p, %i)\n", pWin, kind);
+    winTrace("winSetShapeRootless (%p, %i)\n", pWin, kind);
 #endif
 
-  WIN_UNWRAP(SetShape); 
-  (*pScreen->SetShape)(pWin, kind);
-  WIN_WRAP(SetShape, winSetShapeRootless);
-  
-  winReshapeRootless (pWin);
-  winUpdateRgnRootless (pWin);
-  
-  return;
-}
+    WIN_UNWRAP(SetShape);
+    (*pScreen->SetShape) (pWin, kind);
+    WIN_WRAP(SetShape, winSetShapeRootless);
+
+    winReshapeRootless(pWin);
+    winUpdateRgnRootless(pWin);
 
+    return;
+}
 
 /*
  * Local function for adding a region to the Windows window region
  */
 
 static
-int
-winAddRgn (WindowPtr pWin, pointer data)
+    int
+winAddRgn(WindowPtr pWin, pointer data)
 {
-  int		iX, iY, iWidth, iHeight, iBorder;
-  HRGN		hRgn = *(HRGN*)data;
-  HRGN		hRgnWin;
-  winWindowPriv(pWin);
-  
-  /* If pWin is not Root */
-  if (pWin->parent != NULL) 
-    {
+    int iX, iY, iWidth, iHeight, iBorder;
+    HRGN hRgn = *(HRGN *) data;
+    HRGN hRgnWin;
+
+    winWindowPriv(pWin);
+
+    /* If pWin is not Root */
+    if (pWin->parent != NULL) {
 #if CYGDEBUG
-      winDebug ("winAddRgn ()\n");
+        winDebug("winAddRgn ()\n");
 #endif
-      if (pWin->mapped)
-	{
-	  iBorder = wBorderWidth (pWin);
-	  
-	  iX = pWin->drawable.x - iBorder;
-	  iY = pWin->drawable.y - iBorder;
-	  
-	  iWidth = pWin->drawable.width + iBorder * 2;
-	  iHeight = pWin->drawable.height + iBorder * 2;
-	  
-	  hRgnWin = CreateRectRgn (0, 0, iWidth, iHeight);
-	  
-	  if (hRgnWin == NULL)
-	    {
-	      ErrorF ("winAddRgn - CreateRectRgn () failed\n");
-	      ErrorF ("  Rect %d %d %d %d\n",
-		      iX, iY, iX + iWidth, iY + iHeight);
-	    }
-	  
-	  if (pWinPriv->hRgn)
-	    {
-	      if (CombineRgn (hRgnWin, hRgnWin, pWinPriv->hRgn, RGN_AND)
-		  == ERROR)
-		{
-		  ErrorF ("winAddRgn - CombineRgn () failed\n");
-		}
-	    }
-	  
-	  OffsetRgn (hRgnWin, iX, iY);
-
-	  if (CombineRgn (hRgn, hRgn, hRgnWin, RGN_OR) == ERROR)
-	    {
-	      ErrorF ("winAddRgn - CombineRgn () failed\n");
-	    }
-	  
-	  DeleteObject (hRgnWin);
-	}
-      return WT_DONTWALKCHILDREN;
+        if (pWin->mapped) {
+            iBorder = wBorderWidth(pWin);
+
+            iX = pWin->drawable.x - iBorder;
+            iY = pWin->drawable.y - iBorder;
+
+            iWidth = pWin->drawable.width + iBorder * 2;
+            iHeight = pWin->drawable.height + iBorder * 2;
+
+            hRgnWin = CreateRectRgn(0, 0, iWidth, iHeight);
+
+            if (hRgnWin == NULL) {
+                ErrorF("winAddRgn - CreateRectRgn () failed\n");
+                ErrorF("  Rect %d %d %d %d\n",
+                       iX, iY, iX + iWidth, iY + iHeight);
+            }
+
+            if (pWinPriv->hRgn) {
+                if (CombineRgn(hRgnWin, hRgnWin, pWinPriv->hRgn, RGN_AND)
+                    == ERROR) {
+                    ErrorF("winAddRgn - CombineRgn () failed\n");
+                }
+            }
+
+            OffsetRgn(hRgnWin, iX, iY);
+
+            if (CombineRgn(hRgn, hRgn, hRgnWin, RGN_OR) == ERROR) {
+                ErrorF("winAddRgn - CombineRgn () failed\n");
+            }
+
+            DeleteObject(hRgnWin);
+        }
+        return WT_DONTWALKCHILDREN;
     }
-  else
-    {
-      return WT_WALKCHILDREN;
+    else {
+        return WT_WALKCHILDREN;
     }
 }
 
-
 /*
  * Local function to update the Windows window's region
  */
 
 static
-void
-winUpdateRgnRootless (WindowPtr pWin)
+    void
+winUpdateRgnRootless(WindowPtr pWin)
 {
-  HRGN		hRgn = CreateRectRgn (0, 0, 0, 0);
-  
-  if (hRgn != NULL)
-    {
-      WalkTree (pWin->drawable.pScreen, winAddRgn, &hRgn);
-      SetWindowRgn (winGetScreenPriv(pWin->drawable.pScreen)->hwndScreen,
-		    hRgn, TRUE);
+    HRGN hRgn = CreateRectRgn(0, 0, 0, 0);
+
+    if (hRgn != NULL) {
+        WalkTree(pWin->drawable.pScreen, winAddRgn, &hRgn);
+        SetWindowRgn(winGetScreenPriv(pWin->drawable.pScreen)->hwndScreen,
+                     hRgn, TRUE);
     }
-  else
-    {
-      ErrorF ("winUpdateRgnRootless - CreateRectRgn failed.\n");
+    else {
+        ErrorF("winUpdateRgnRootless - CreateRectRgn failed.\n");
     }
 }
 
-
 static
-void
-winReshapeRootless (WindowPtr pWin)
+    void
+winReshapeRootless(WindowPtr pWin)
 {
-  int		nRects;
-  RegionRec	rrNewShape;
-  BoxPtr	pShape, pRects, pEnd;
-  HRGN		hRgn, hRgnRect;
-  winWindowPriv(pWin);
+    int nRects;
+    RegionRec rrNewShape;
+    BoxPtr pShape, pRects, pEnd;
+    HRGN hRgn, hRgnRect;
+
+    winWindowPriv(pWin);
 
 #if CYGDEBUG
-  winDebug ("winReshapeRootless ()\n");
+    winDebug("winReshapeRootless ()\n");
 #endif
 
-  /* Bail if the window is the root window */
-  if (pWin->parent == NULL)
-    return;
+    /* Bail if the window is the root window */
+    if (pWin->parent == NULL)
+        return;
 
-  /* Bail if the window is not top level */
-  if (pWin->parent->parent != NULL)
-    return;
+    /* Bail if the window is not top level */
+    if (pWin->parent->parent != NULL)
+        return;
 
-  /* Free any existing window region stored in the window privates */
-  if (pWinPriv->hRgn != NULL)
-    {
-      DeleteObject (pWinPriv->hRgn);
-      pWinPriv->hRgn = NULL;
+    /* Free any existing window region stored in the window privates */
+    if (pWinPriv->hRgn != NULL) {
+        DeleteObject(pWinPriv->hRgn);
+        pWinPriv->hRgn = NULL;
     }
-  
-  /* Bail if the window has no bounding region defined */
-  if (!wBoundingShape (pWin))
-    return;
 
-  RegionNull(&rrNewShape);
-  RegionCopy(&rrNewShape, wBoundingShape(pWin));
-  RegionTranslate(&rrNewShape, pWin->borderWidth,
-                   pWin->borderWidth);
-  
-  nRects = RegionNumRects(&rrNewShape);
-  pShape = RegionRects(&rrNewShape);
-  
-  if (nRects > 0)
-    {
-      /* Create initial empty Windows region */
-      hRgn = CreateRectRgn (0, 0, 0, 0);
-
-      /* Loop through all rectangles in the X region */
-      for (pRects = pShape, pEnd = pShape + nRects; pRects < pEnd; pRects++)
-        {
-	  /* Create a Windows region for the X rectangle */
-	  hRgnRect = CreateRectRgn (pRects->x1, pRects->y1,
-				    pRects->x2, pRects->y2);
-	  if (hRgnRect == NULL)
-	    {
-	      ErrorF("winReshapeRootless - CreateRectRgn() failed\n");
-	    }
-
-	  /* Merge the Windows region with the accumulated region */
-	  if (CombineRgn (hRgn, hRgn, hRgnRect, RGN_OR) == ERROR)
-	    {
-	      ErrorF("winReshapeRootless - CombineRgn() failed\n");
-	    }
-
-	  /* Delete the temporary Windows region */
-	  DeleteObject (hRgnRect);
+    /* Bail if the window has no bounding region defined */
+    if (!wBoundingShape(pWin))
+        return;
+
+    RegionNull(&rrNewShape);
+    RegionCopy(&rrNewShape, wBoundingShape(pWin));
+    RegionTranslate(&rrNewShape, pWin->borderWidth, pWin->borderWidth);
+
+    nRects = RegionNumRects(&rrNewShape);
+    pShape = RegionRects(&rrNewShape);
+
+    if (nRects > 0) {
+        /* Create initial empty Windows region */
+        hRgn = CreateRectRgn(0, 0, 0, 0);
+
+        /* Loop through all rectangles in the X region */
+        for (pRects = pShape, pEnd = pShape + nRects; pRects < pEnd; pRects++) {
+            /* Create a Windows region for the X rectangle */
+            hRgnRect = CreateRectRgn(pRects->x1, pRects->y1,
+                                     pRects->x2, pRects->y2);
+            if (hRgnRect == NULL) {
+                ErrorF("winReshapeRootless - CreateRectRgn() failed\n");
+            }
+
+            /* Merge the Windows region with the accumulated region */
+            if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == ERROR) {
+                ErrorF("winReshapeRootless - CombineRgn() failed\n");
+            }
+
+            /* Delete the temporary Windows region */
+            DeleteObject(hRgnRect);
         }
-      
-      /* Save a handle to the composite region in the window privates */
-      pWinPriv->hRgn = hRgn;
+
+        /* Save a handle to the composite region in the window privates */
+        pWinPriv->hRgn = hRgn;
     }
 
-  RegionUninit(&rrNewShape);
-  
-  return;
+    RegionUninit(&rrNewShape);
+
+    return;
 }
diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h
index 229696ae4..c357f8d08 100644
--- a/xorg-server/hw/xwin/winwindow.h
+++ b/xorg-server/hw/xwin/winwindow.h
@@ -41,7 +41,7 @@
 
 /* Constant strings */
 #ifndef PROJECT_NAME
-#  define PROJECT_NAME		"Cygwin/X"
+#define PROJECT_NAME		"Cygwin/X"
 #endif
 #define EXECUTABLE_NAME         "XWin"
 #define WINDOW_CLASS		"cygwin/x"
@@ -52,7 +52,7 @@
 #define WINDOW_TITLE_X		PROJECT_NAME " X"
 #define WIN_WINDOW_PROP		"cyg_window_prop_rl"
 #ifdef HAS_DEVWINDOWS
-# define WIN_MSG_QUEUE_FNAME	"/dev/windows"
+#define WIN_MSG_QUEUE_FNAME	"/dev/windows"
 #endif
 #define WIN_WID_PROP		"cyg_wid_prop_rl"
 #define WIN_NEEDMANAGE_PROP	"cyg_override_redirect_prop_rl"
@@ -67,44 +67,41 @@
 
 typedef struct _winPrivScreenRec *winPrivScreenPtr;
 
-
 /*
  * Window privates
  */
 
-typedef struct
-{
-  DWORD			dwDummy;
-  HRGN			hRgn;
-  HWND			hWnd;
-  winPrivScreenPtr	pScreenPriv;
-  Bool			fXKilled;
-  HDWP                  hDwp;
+typedef struct {
+    DWORD dwDummy;
+    HRGN hRgn;
+    HWND hWnd;
+    winPrivScreenPtr pScreenPriv;
+    Bool fXKilled;
+    HDWP hDwp;
 #ifdef XWIN_GLX_WINDOWS
-  Bool			fWglUsed;
+    Bool fWglUsed;
 #endif
 
-  /* Privates used by primary fb DirectDraw server */
-  LPDDSURFACEDESC	pddsdPrimary;
+    /* Privates used by primary fb DirectDraw server */
+    LPDDSURFACEDESC pddsdPrimary;
 
-  /* Privates used by shadow fb DirectDraw Nonlocking server */
-  LPDIRECTDRAWSURFACE4	pddsPrimary4;
+    /* Privates used by shadow fb DirectDraw Nonlocking server */
+    LPDIRECTDRAWSURFACE4 pddsPrimary4;
 
-  /* Privates used by both shadow fb DirectDraw servers */
-  LPDIRECTDRAWCLIPPER	pddcPrimary;
+    /* Privates used by both shadow fb DirectDraw servers */
+    LPDIRECTDRAWCLIPPER pddcPrimary;
 } winPrivWinRec, *winPrivWinPtr;
 
 #ifdef XWIN_MULTIWINDOW
-typedef struct _winWMMessageRec{
-  DWORD			dwID;
-  DWORD			msg;
-  int			iWindow;
-  HWND			hwndWindow;
-  int			iX, iY;
-  int			iWidth, iHeight;
+typedef struct _winWMMessageRec {
+    DWORD dwID;
+    DWORD msg;
+    int iWindow;
+    HWND hwndWindow;
+    int iX, iY;
+    int iWidth, iHeight;
 } winWMMessageRec, *winWMMessagePtr;
 
-
 /*
  * winmultiwindowwm.c
  */
@@ -138,41 +135,40 @@ typedef struct _winWMMessageRec{
 /* This structure only contains 3 elements... the Motif 2.0 structure
 contains 5... we only need the first 3... so that is all we will define */
 typedef struct MwmHints {
-  unsigned long		flags, functions, decorations;
+    unsigned long flags, functions, decorations;
 } MwmHints;
+
 #define		PropMwmHintsElements	3
 
 void
-winSendMessageToWM (void *pWMInfo, winWMMessagePtr msg);
+ winSendMessageToWM(void *pWMInfo, winWMMessagePtr msg);
 
 Bool
-winInitWM (void **ppWMInfo,
-	   pthread_t *ptWMProc,
-	   pthread_t *ptXMsgProc,
-	   pthread_mutex_t *ppmServerStarted,
-	   int dwScreen,
-	   HWND hwndScreen,
-	   BOOL allowOtherWM);
 
-void
-winDeinitMultiWindowWM (void);
+winInitWM(void **ppWMInfo,
+          pthread_t * ptWMProc,
+          pthread_t * ptXMsgProc,
+          pthread_mutex_t * ppmServerStarted,
+          int dwScreen, HWND hwndScreen, BOOL allowOtherWM);
 
 void
-winMinimizeWindow (Window id);
+ winDeinitMultiWindowWM(void);
 
+void
+ winMinimizeWindow(Window id);
 
 /*
  * winmultiwindowicons.c
  */
 
 void
-winUpdateIcon (Window id);
+ winUpdateIcon(Window id);
 
-void 
-winInitGlobalIcons (void);
+void
+ winInitGlobalIcons(void);
 
-void 
-winDestroyIcon(HICON hIcon);
+void
+ winDestroyIcon(HICON hIcon);
 
-#endif /* XWIN_MULTIWINDOW */
+#endif                          /* XWIN_MULTIWINDOW */
 #endif
diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c
index 577614db6..f67c383f3 100644
--- a/xorg-server/hw/xwin/winwindowswm.c
+++ b/xorg-server/hw/xwin/winwindowswm.c
@@ -47,207 +47,193 @@ static int WMErrorBase;
 static unsigned char WMReqCode = 0;
 static int WMEventBase = 0;
 
-static RESTYPE ClientType, eventResourceType; /* resource types for event masks */
+static RESTYPE ClientType, eventResourceType;   /* resource types for event masks */
 static XID eventResource;
 
 /* Currently selected events */
 static unsigned int eventMask = 0;
 
-static int WMFreeClient (pointer data, XID id);
-static int WMFreeEvents (pointer data, XID id);
-static void SNotifyEvent(xWindowsWMNotifyEvent *from, xWindowsWMNotifyEvent *to);
+static int WMFreeClient(pointer data, XID id);
+static int WMFreeEvents(pointer data, XID id);
+static void SNotifyEvent(xWindowsWMNotifyEvent * from,
+                         xWindowsWMNotifyEvent * to);
 
 typedef struct _WMEvent *WMEventPtr;
 typedef struct _WMEvent {
-  WMEventPtr      next;
-  ClientPtr	    client;
-  XID		    clientResource;
-  unsigned int    mask;
+    WMEventPtr next;
+    ClientPtr client;
+    XID clientResource;
+    unsigned int mask;
 } WMEventRec;
 
 static inline BoxRec
-make_box (int x, int y, int w, int h)
+make_box(int x, int y, int w, int h)
 {
-  BoxRec r;
-  r.x1 = x;
-  r.y1 = y;
-  r.x2 = x + w;
-  r.y2 = y + h;
-  return r;
+    BoxRec r;
+
+    r.x1 = x;
+    r.y1 = y;
+    r.x2 = x + w;
+    r.y2 = y + h;
+    return r;
 }
 
 static int
 ProcWindowsWMQueryVersion(ClientPtr client)
 {
-  xWindowsWMQueryVersionReply rep;
-  int n;
-
-  REQUEST_SIZE_MATCH(xWindowsWMQueryVersionReq);
-  rep.type = X_Reply;
-  rep.length = 0;
-  rep.sequenceNumber = client->sequence;
-  rep.majorVersion = SERVER_WINDOWSWM_MAJOR_VERSION;
-  rep.minorVersion = SERVER_WINDOWSWM_MINOR_VERSION;
-  rep.patchVersion = SERVER_WINDOWSWM_PATCH_VERSION;
-  if (client->swapped)
-    {
-      swaps(&rep.sequenceNumber);
-      swapl(&rep.length);
+    xWindowsWMQueryVersionReply rep;
+    int n;
+
+    REQUEST_SIZE_MATCH(xWindowsWMQueryVersionReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.majorVersion = SERVER_WINDOWSWM_MAJOR_VERSION;
+    rep.minorVersion = SERVER_WINDOWSWM_MINOR_VERSION;
+    rep.patchVersion = SERVER_WINDOWSWM_PATCH_VERSION;
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
     }
-  WriteToClient(client, sizeof(xWindowsWMQueryVersionReply), (char *)&rep);
-  return Success;
+    WriteToClient(client, sizeof(xWindowsWMQueryVersionReply), (char *) &rep);
+    return Success;
 }
 
-
 /* events */
 
 static inline void
-updateEventMask (WMEventPtr *pHead)
+updateEventMask(WMEventPtr * pHead)
 {
-  WMEventPtr pCur;
+    WMEventPtr pCur;
 
-  eventMask = 0;
-  for (pCur = *pHead; pCur != NULL; pCur = pCur->next)
-    eventMask |= pCur->mask;
+    eventMask = 0;
+    for (pCur = *pHead; pCur != NULL; pCur = pCur->next)
+        eventMask |= pCur->mask;
 }
 
-/*ARGSUSED*/
-static int
-WMFreeClient (pointer data, XID id)
+ /*ARGSUSED*/ static int
+WMFreeClient(pointer data, XID id)
 {
-  WMEventPtr   pEvent;
-  WMEventPtr   *pHead, pCur, pPrev;
-
-  pEvent = (WMEventPtr) data;
-  dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
-				NullClient, DixUnknownAccess);
-  if (pHead)
-    {
-      pPrev = 0;
-      for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next)
-	pPrev = pCur;
-      if (pCur)
-	{
-	  if (pPrev)
-	    pPrev->next = pEvent->next;
-	  else
-	    *pHead = pEvent->next;
-	}
-      updateEventMask (pHead);
+    WMEventPtr pEvent;
+    WMEventPtr *pHead, pCur, pPrev;
+
+    pEvent = (WMEventPtr) data;
+    dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+                            NullClient, DixUnknownAccess);
+    if (pHead) {
+        pPrev = 0;
+        for (pCur = *pHead; pCur && pCur != pEvent; pCur = pCur->next)
+            pPrev = pCur;
+        if (pCur) {
+            if (pPrev)
+                pPrev->next = pEvent->next;
+            else
+                *pHead = pEvent->next;
+        }
+        updateEventMask(pHead);
     }
-  free((pointer) pEvent);
-  return 1;
+    free((pointer) pEvent);
+    return 1;
 }
 
-/*ARGSUSED*/
-static int
-WMFreeEvents (pointer data, XID id)
+ /*ARGSUSED*/ static int
+WMFreeEvents(pointer data, XID id)
 {
-  WMEventPtr   *pHead, pCur, pNext;
-  
-  pHead = (WMEventPtr *) data;
-  for (pCur = *pHead; pCur; pCur = pNext)
-    {
-      pNext = pCur->next;
-      FreeResource (pCur->clientResource, ClientType);
-      free((pointer) pCur);
+    WMEventPtr *pHead, pCur, pNext;
+
+    pHead = (WMEventPtr *) data;
+    for (pCur = *pHead; pCur; pCur = pNext) {
+        pNext = pCur->next;
+        FreeResource(pCur->clientResource, ClientType);
+        free((pointer) pCur);
     }
-  free((pointer) pHead);
-  eventMask = 0;
-  return 1;
+    free((pointer) pHead);
+    eventMask = 0;
+    return 1;
 }
 
 static int
-ProcWindowsWMSelectInput (ClientPtr client)
+ProcWindowsWMSelectInput(ClientPtr client)
 {
-  REQUEST(xWindowsWMSelectInputReq);
-  WMEventPtr		pEvent, pNewEvent, *pHead;
-  XID			clientResource;
-
-  REQUEST_SIZE_MATCH (xWindowsWMSelectInputReq);
-  dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType, client, DixWriteAccess);
-  if (stuff->mask != 0)
-    {
-      if (pHead)
-	{
-	  /* check for existing entry. */
-	  for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
-	    {
-	      if (pEvent->client == client)
-		{
-		  pEvent->mask = stuff->mask;
-		  updateEventMask (pHead);
-		  return Success;
-		}
-	    }
-	}
-      
-      /* build the entry */
-      pNewEvent = (WMEventPtr) malloc(sizeof (WMEventRec));
-      if (!pNewEvent)
-	return BadAlloc;
-      pNewEvent->next = 0;
-      pNewEvent->client = client;
-      pNewEvent->mask = stuff->mask;
-      /*
-       * add a resource that will be deleted when
-       * the client goes away
-       */
-      clientResource = FakeClientID (client->index);
-      pNewEvent->clientResource = clientResource;
-      if (!AddResource (clientResource, ClientType, (pointer)pNewEvent))
-	return BadAlloc;
-      /*
-       * create a resource to contain a pointer to the list
-       * of clients selecting input.  This must be indirect as
-       * the list may be arbitrarily rearranged which cannot be
-       * done through the resource database.
-       */
-      if (!pHead)
-	{
-	  pHead = (WMEventPtr *) malloc(sizeof (WMEventPtr));
-	  if (!pHead ||
-	      !AddResource (eventResource, eventResourceType, (pointer)pHead))
-	    {
-	      FreeResource (clientResource, RT_NONE);
-	      return BadAlloc;
-	    }
-	  *pHead = 0;
-	}
-      pNewEvent->next = *pHead;
-      *pHead = pNewEvent;
-      updateEventMask (pHead);
+    REQUEST(xWindowsWMSelectInputReq);
+    WMEventPtr pEvent, pNewEvent, *pHead;
+    XID clientResource;
+
+    REQUEST_SIZE_MATCH(xWindowsWMSelectInputReq);
+    dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+                            client, DixWriteAccess);
+    if (stuff->mask != 0) {
+        if (pHead) {
+            /* check for existing entry. */
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+                if (pEvent->client == client) {
+                    pEvent->mask = stuff->mask;
+                    updateEventMask(pHead);
+                    return Success;
+                }
+            }
+        }
+
+        /* build the entry */
+        pNewEvent = (WMEventPtr) malloc(sizeof(WMEventRec));
+        if (!pNewEvent)
+            return BadAlloc;
+        pNewEvent->next = 0;
+        pNewEvent->client = client;
+        pNewEvent->mask = stuff->mask;
+        /*
+         * add a resource that will be deleted when
+         * the client goes away
+         */
+        clientResource = FakeClientID(client->index);
+        pNewEvent->clientResource = clientResource;
+        if (!AddResource(clientResource, ClientType, (pointer) pNewEvent))
+            return BadAlloc;
+        /*
+         * create a resource to contain a pointer to the list
+         * of clients selecting input.  This must be indirect as
+         * the list may be arbitrarily rearranged which cannot be
+         * done through the resource database.
+         */
+        if (!pHead) {
+            pHead = (WMEventPtr *) malloc(sizeof(WMEventPtr));
+            if (!pHead ||
+                !AddResource(eventResource, eventResourceType, (pointer) pHead))
+            {
+                FreeResource(clientResource, RT_NONE);
+                return BadAlloc;
+            }
+            *pHead = 0;
+        }
+        pNewEvent->next = *pHead;
+        *pHead = pNewEvent;
+        updateEventMask(pHead);
     }
-  else if (stuff->mask == 0)
-    {
-      /* delete the interest */
-      if (pHead)
-	{
-	  pNewEvent = 0;
-	  for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
-	    {
-	      if (pEvent->client == client)
-		break;
-	      pNewEvent = pEvent;
-	    }
-	  if (pEvent)
-	    {
-	      FreeResource (pEvent->clientResource, ClientType);
-	      if (pNewEvent)
-		pNewEvent->next = pEvent->next;
-	      else
-		*pHead = pEvent->next;
-	      free(pEvent);
-	      updateEventMask (pHead);
-	    }
-	}
+    else if (stuff->mask == 0) {
+        /* delete the interest */
+        if (pHead) {
+            pNewEvent = 0;
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+                if (pEvent->client == client)
+                    break;
+                pNewEvent = pEvent;
+            }
+            if (pEvent) {
+                FreeResource(pEvent->clientResource, ClientType);
+                if (pNewEvent)
+                    pNewEvent->next = pEvent->next;
+                else
+                    *pHead = pEvent->next;
+                free(pEvent);
+                updateEventMask(pHead);
+            }
+        }
     }
-  else
-    {
-      client->errorValue = stuff->mask;
-      return BadValue;
+    else {
+        client->errorValue = stuff->mask;
+        return BadValue;
     }
-  return Success;
+    return Success;
 }
 
 /*
@@ -255,385 +241,376 @@ ProcWindowsWMSelectInput (ClientPtr client)
  */
 
 void
-winWindowsWMSendEvent (int type, unsigned int mask, int which, int arg,
-		       Window window, int x, int y, int w, int h)
+winWindowsWMSendEvent(int type, unsigned int mask, int which, int arg,
+                      Window window, int x, int y, int w, int h)
 {
-  WMEventPtr		*pHead, pEvent;
-  ClientPtr		client;
-  xWindowsWMNotifyEvent se;
+    WMEventPtr *pHead, pEvent;
+    ClientPtr client;
+    xWindowsWMNotifyEvent se;
+
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winWindowsWMSendEvent %d %d %d %d,  %d %d - %d %d\n",
-	  type, mask, which, arg, x, y, w, h);
+    ErrorF("winWindowsWMSendEvent %d %d %d %d,  %d %d - %d %d\n",
+           type, mask, which, arg, x, y, w, h);
 #endif
-  dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
-				NullClient, DixUnknownAccess);
-  if (!pHead)
-    return;
-  for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
-    {
-      client = pEvent->client;
+    dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+                            NullClient, DixUnknownAccess);
+    if (!pHead)
+        return;
+    for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+        client = pEvent->client;
 #if CYGMULTIWINDOW_DEBUG
-      ErrorF ("winWindowsWMSendEvent - x%08x\n", (int) client);
+        ErrorF("winWindowsWMSendEvent - x%08x\n", (int) client);
 #endif
-      if ((pEvent->mask & mask) == 0)
-	{
-	  continue;
-	}
-#if CYGMULTIWINDOW_DEBUG 
-      ErrorF ("winWindowsWMSendEvent - send\n");
+        if ((pEvent->mask & mask) == 0) {
+            continue;
+        }
+#if CYGMULTIWINDOW_DEBUG
+        ErrorF("winWindowsWMSendEvent - send\n");
 #endif
-      se.type = type + WMEventBase;
-      se.kind = which;
-      se.window = window;
-      se.arg = arg;
-      se.x = x;
-      se.y = y;
-      se.w = w;
-      se.h = h;
-      se.time = currentTime.milliseconds;
-      WriteEventsToClient (client, 1, (xEvent *) &se);
+        se.type = type + WMEventBase;
+        se.kind = which;
+        se.window = window;
+        se.arg = arg;
+        se.x = x;
+        se.y = y;
+        se.w = w;
+        se.h = h;
+        se.time = currentTime.milliseconds;
+        WriteEventsToClient(client, 1, (xEvent *) &se);
     }
 }
 
 /* general utility functions */
 
 static int
-ProcWindowsWMDisableUpdate (ClientPtr client)
+ProcWindowsWMDisableUpdate(ClientPtr client)
 {
-  REQUEST_SIZE_MATCH(xWindowsWMDisableUpdateReq);
+    REQUEST_SIZE_MATCH(xWindowsWMDisableUpdateReq);
 
-  //winDisableUpdate();
+    //winDisableUpdate();
 
-  return Success;
+    return Success;
 }
 
 static int
-ProcWindowsWMReenableUpdate (ClientPtr client)
+ProcWindowsWMReenableUpdate(ClientPtr client)
 {
-  REQUEST_SIZE_MATCH(xWindowsWMReenableUpdateReq);
+    REQUEST_SIZE_MATCH(xWindowsWMReenableUpdateReq);
 
-  //winEnableUpdate(); 
+    //winEnableUpdate(); 
 
-  return Success;
+    return Success;
 }
 
-
 /* window functions */
 
 static int
-ProcWindowsWMSetFrontProcess (ClientPtr client)
+ProcWindowsWMSetFrontProcess(ClientPtr client)
 {
-  REQUEST_SIZE_MATCH(xWindowsWMSetFrontProcessReq);
-  
-  //QuartzMessageMainThread(kWindowsSetFrontProcess, NULL, 0);
-  
-  return Success;
-}
+    REQUEST_SIZE_MATCH(xWindowsWMSetFrontProcessReq);
 
+    //QuartzMessageMainThread(kWindowsSetFrontProcess, NULL, 0);
+
+    return Success;
+}
 
 /* frame functions */
 
 static int
-ProcWindowsWMFrameGetRect (ClientPtr client)
+ProcWindowsWMFrameGetRect(ClientPtr client)
 {
-  xWindowsWMFrameGetRectReply rep;
-  BoxRec ir;
-  RECT rcNew;
-  REQUEST(xWindowsWMFrameGetRectReq);
+    xWindowsWMFrameGetRectReply rep;
+    BoxRec ir;
+    RECT rcNew;
+
+    REQUEST(xWindowsWMFrameGetRectReq);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameGetRect %d %d\n",
-	  (sizeof(xWindowsWMFrameGetRectReq) >> 2), (int) client->req_len);
+    ErrorF("ProcWindowsWMFrameGetRect %d %d\n",
+           (sizeof(xWindowsWMFrameGetRectReq) >> 2), (int) client->req_len);
 #endif
-  
-  REQUEST_SIZE_MATCH(xWindowsWMFrameGetRectReq);
-  rep.type = X_Reply;
-  rep.length = 0;
-  rep.sequenceNumber = client->sequence;
-
-  ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
-
-  if (stuff->frame_rect != 0)
-    {
-      ErrorF ("ProcWindowsWMFrameGetRect - stuff->frame_rect != 0\n");
-      return BadValue;
+
+    REQUEST_SIZE_MATCH(xWindowsWMFrameGetRectReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    ir = make_box(stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+
+    if (stuff->frame_rect != 0) {
+        ErrorF("ProcWindowsWMFrameGetRect - stuff->frame_rect != 0\n");
+        return BadValue;
     }
 
-  /* Store the origin, height, and width in a rectangle structure */
-  SetRect (&rcNew, stuff->ix, stuff->iy,
-	   stuff->ix + stuff->iw, stuff->iy + stuff->ih);
-    
+    /* Store the origin, height, and width in a rectangle structure */
+    SetRect(&rcNew, stuff->ix, stuff->iy,
+            stuff->ix + stuff->iw, stuff->iy + stuff->ih);
+
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
-	  stuff->ix, stuff->iy, stuff->ix + stuff->iw, stuff->iy + stuff->ih);
+    ErrorF("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
+           stuff->ix, stuff->iy, stuff->ix + stuff->iw, stuff->iy + stuff->ih);
 #endif
 
-  /*
-   * Calculate the required size of the Windows window rectangle,
-   * given the size of the Windows window client area.
-   */
-  AdjustWindowRectEx (&rcNew, stuff->frame_style, FALSE, stuff->frame_style_ex);
-  rep.x = rcNew.left;
-  rep.y = rcNew.top;
-  rep.w = rcNew.right - rcNew.left;
-  rep.h = rcNew.bottom - rcNew.top;
+    /*
+     * Calculate the required size of the Windows window rectangle,
+     * given the size of the Windows window client area.
+     */
+    AdjustWindowRectEx(&rcNew, stuff->frame_style, FALSE,
+                       stuff->frame_style_ex);
+    rep.x = rcNew.left;
+    rep.y = rcNew.top;
+    rep.w = rcNew.right - rcNew.left;
+    rep.h = rcNew.bottom - rcNew.top;
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
-	  rep.x, rep.y, rep.w, rep.h);
+    ErrorF("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
+           rep.x, rep.y, rep.w, rep.h);
 #endif
 
-  WriteToClient(client, sizeof(xWindowsWMFrameGetRectReply), (char *)&rep);
-  return Success;
+    WriteToClient(client, sizeof(xWindowsWMFrameGetRectReply), (char *) &rep);
+    return Success;
 }
 
-
 static int
-ProcWindowsWMFrameDraw (ClientPtr client)
+ProcWindowsWMFrameDraw(ClientPtr client)
 {
-  REQUEST(xWindowsWMFrameDrawReq);
-  WindowPtr pWin;
-  win32RootlessWindowPtr pRLWinPriv;
-  RECT rcNew;
-  int nCmdShow, rc;
-  RegionRec newShape;
+    REQUEST(xWindowsWMFrameDrawReq);
+    WindowPtr pWin;
+    win32RootlessWindowPtr pRLWinPriv;
+    RECT rcNew;
+    int nCmdShow, rc;
+    RegionRec newShape;
 
-  REQUEST_SIZE_MATCH (xWindowsWMFrameDrawReq);
+    REQUEST_SIZE_MATCH(xWindowsWMFrameDrawReq);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw\n");
+    ErrorF("ProcWindowsWMFrameDraw\n");
 #endif
-  rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
-  if (rc != Success)
-      return rc;
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+    if (rc != Success)
+        return rc;
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw - Window found\n");
+    ErrorF("ProcWindowsWMFrameDraw - Window found\n");
 #endif
 
-  pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, TRUE);
-  if (pRLWinPriv == 0) return BadWindow;
+    pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow(pWin, TRUE);
+    if (pRLWinPriv == 0)
+        return BadWindow;
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw - HWND 0x%08x 0x%08x 0x%08x\n",
-	  (int) pRLWinPriv->hWnd, (int) stuff->frame_style,
-	  (int) stuff->frame_style_ex);
-  ErrorF ("ProcWindowsWMFrameDraw - %d %d %d %d\n",
-	  stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    ErrorF("ProcWindowsWMFrameDraw - HWND 0x%08x 0x%08x 0x%08x\n",
+           (int) pRLWinPriv->hWnd, (int) stuff->frame_style,
+           (int) stuff->frame_style_ex);
+    ErrorF("ProcWindowsWMFrameDraw - %d %d %d %d\n",
+           stuff->ix, stuff->iy, stuff->iw, stuff->ih);
 #endif
 
-  /* Store the origin, height, and width in a rectangle structure */
-  SetRect (&rcNew, stuff->ix, stuff->iy,
-	   stuff->ix + stuff->iw, stuff->iy + stuff->ih);
-
-  /*
-   * Calculate the required size of the Windows window rectangle,
-   * given the size of the Windows window client area.
-   */
-  AdjustWindowRectEx (&rcNew, stuff->frame_style, FALSE, stuff->frame_style_ex);
-  
-  /* Set the window extended style flags */
-  if (!SetWindowLongPtr (pRLWinPriv->hWnd, GWL_EXSTYLE, stuff->frame_style_ex))
-    {
-      return BadValue;
+    /* Store the origin, height, and width in a rectangle structure */
+    SetRect(&rcNew, stuff->ix, stuff->iy,
+            stuff->ix + stuff->iw, stuff->iy + stuff->ih);
+
+    /*
+     * Calculate the required size of the Windows window rectangle,
+     * given the size of the Windows window client area.
+     */
+    AdjustWindowRectEx(&rcNew, stuff->frame_style, FALSE,
+                       stuff->frame_style_ex);
+
+    /* Set the window extended style flags */
+    if (!SetWindowLongPtr(pRLWinPriv->hWnd, GWL_EXSTYLE, stuff->frame_style_ex)) {
+        return BadValue;
     }
 
-  /* Set the window standard style flags */
-  if (!SetWindowLongPtr (pRLWinPriv->hWnd, GWL_STYLE, stuff->frame_style))
-    {
-      return BadValue;
+    /* Set the window standard style flags */
+    if (!SetWindowLongPtr(pRLWinPriv->hWnd, GWL_STYLE, stuff->frame_style)) {
+        return BadValue;
     }
 
-  /* Flush the window style */
-  if (!SetWindowPos (pRLWinPriv->hWnd, NULL,
-		     rcNew.left, rcNew.top,
-		     rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
-		     SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOACTIVATE))
-    {
-      return BadValue;
+    /* Flush the window style */
+    if (!SetWindowPos(pRLWinPriv->hWnd, NULL,
+                      rcNew.left, rcNew.top,
+                      rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
+                      SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOACTIVATE)) {
+        return BadValue;
     }
-  if (!IsWindowVisible(pRLWinPriv->hWnd))
-    nCmdShow = SW_HIDE;
-  else 
-    nCmdShow = SW_SHOWNA;
-
-  ShowWindow (pRLWinPriv->hWnd, nCmdShow);
-
-  winMWExtWMUpdateIcon (pWin->drawable.id);
-
-  if (wBoundingShape(pWin) != NULL)
-    {
-      /* wBoundingShape is relative to *inner* origin of window.
-	 Translate by borderWidth to get the outside-relative position. */
-      
-      RegionNull(&newShape);
-      RegionCopy(&newShape, wBoundingShape(pWin));
-      RegionTranslate(&newShape, pWin->borderWidth, pWin->borderWidth);
-      winMWExtWMReshapeFrame (pRLWinPriv, &newShape);
-      RegionUninit(&newShape);
+    if (!IsWindowVisible(pRLWinPriv->hWnd))
+        nCmdShow = SW_HIDE;
+    else
+        nCmdShow = SW_SHOWNA;
+
+    ShowWindow(pRLWinPriv->hWnd, nCmdShow);
+
+    winMWExtWMUpdateIcon(pWin->drawable.id);
+
+    if (wBoundingShape(pWin) != NULL) {
+        /* wBoundingShape is relative to *inner* origin of window.
+           Translate by borderWidth to get the outside-relative position. */
+
+        RegionNull(&newShape);
+        RegionCopy(&newShape, wBoundingShape(pWin));
+        RegionTranslate(&newShape, pWin->borderWidth, pWin->borderWidth);
+        winMWExtWMReshapeFrame(pRLWinPriv, &newShape);
+        RegionUninit(&newShape);
     }
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw - done\n");
+    ErrorF("ProcWindowsWMFrameDraw - done\n");
 #endif
 
-  return Success;
+    return Success;
 }
 
 static int
 ProcWindowsWMFrameSetTitle(ClientPtr client)
 {
-  unsigned int title_length, title_max;
-  char *title_bytes;
-  REQUEST(xWindowsWMFrameSetTitleReq);
-  WindowPtr pWin;
-  win32RootlessWindowPtr pRLWinPriv;
-  int rc;
+    unsigned int title_length, title_max;
+    char *title_bytes;
+
+    REQUEST(xWindowsWMFrameSetTitleReq);
+    WindowPtr pWin;
+    win32RootlessWindowPtr pRLWinPriv;
+    int rc;
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle\n");
+    ErrorF("ProcWindowsWMFrameSetTitle\n");
 #endif
 
-  REQUEST_AT_LEAST_SIZE(xWindowsWMFrameSetTitleReq);
+    REQUEST_AT_LEAST_SIZE(xWindowsWMFrameSetTitleReq);
 
-  rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
-  if (rc != Success)
-      return rc;
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+    if (rc != Success)
+        return rc;
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle - Window found\n");
+    ErrorF("ProcWindowsWMFrameSetTitle - Window found\n");
 #endif
 
-  title_length = stuff->title_length;
-  title_max = (stuff->length << 2) - sizeof(xWindowsWMFrameSetTitleReq);
+    title_length = stuff->title_length;
+    title_max = (stuff->length << 2) - sizeof(xWindowsWMFrameSetTitleReq);
 
-  if (title_max < title_length)
-    return BadValue;
+    if (title_max < title_length)
+        return BadValue;
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle - length is valid\n");
+    ErrorF("ProcWindowsWMFrameSetTitle - length is valid\n");
 #endif
 
-  title_bytes = malloc (title_length+1);
-  strncpy (title_bytes, (unsigned char *) &stuff[1], title_length);
-  title_bytes[title_length] = '\0';
+    title_bytes = malloc(title_length + 1);
+    strncpy(title_bytes, (unsigned char *) &stuff[1], title_length);
+    title_bytes[title_length] = '\0';
 
-  pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, FALSE);
+    pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow(pWin, FALSE);
 
-  if (pRLWinPriv == 0)
-    {
-      free (title_bytes);
-      return BadWindow;
+    if (pRLWinPriv == 0) {
+        free(title_bytes);
+        return BadWindow;
     }
-    
-  /* Flush the window style */
-  SetWindowText (pRLWinPriv->hWnd, title_bytes);
 
-  free (title_bytes);
+    /* Flush the window style */
+    SetWindowText(pRLWinPriv->hWnd, title_bytes);
+
+    free(title_bytes);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle - done\n");
+    ErrorF("ProcWindowsWMFrameSetTitle - done\n");
 #endif
 
-  return Success;
+    return Success;
 }
 
-
 /* dispatch */
 
 static int
-ProcWindowsWMDispatch (ClientPtr client)
+ProcWindowsWMDispatch(ClientPtr client)
 {
-  REQUEST(xReq);
+    REQUEST(xReq);
 
-  switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_WindowsWMQueryVersion:
-      return ProcWindowsWMQueryVersion(client);
+        return ProcWindowsWMQueryVersion(client);
     }
 
-  if (!LocalClient(client))
-    return WMErrorBase + WindowsWMClientNotLocal;
+    if (!LocalClient(client))
+        return WMErrorBase + WindowsWMClientNotLocal;
 
-  switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_WindowsWMSelectInput:
-      return ProcWindowsWMSelectInput(client);
+        return ProcWindowsWMSelectInput(client);
     case X_WindowsWMDisableUpdate:
-      return ProcWindowsWMDisableUpdate(client);
+        return ProcWindowsWMDisableUpdate(client);
     case X_WindowsWMReenableUpdate:
-      return ProcWindowsWMReenableUpdate(client);
+        return ProcWindowsWMReenableUpdate(client);
     case X_WindowsWMSetFrontProcess:
-      return ProcWindowsWMSetFrontProcess(client);
+        return ProcWindowsWMSetFrontProcess(client);
     case X_WindowsWMFrameGetRect:
-      return ProcWindowsWMFrameGetRect(client);
+        return ProcWindowsWMFrameGetRect(client);
     case X_WindowsWMFrameDraw:
-      return ProcWindowsWMFrameDraw(client);
+        return ProcWindowsWMFrameDraw(client);
     case X_WindowsWMFrameSetTitle:
-      return ProcWindowsWMFrameSetTitle(client);
+        return ProcWindowsWMFrameSetTitle(client);
     default:
-      return BadRequest;
+        return BadRequest;
     }
 }
 
 static void
-SNotifyEvent (xWindowsWMNotifyEvent *from, xWindowsWMNotifyEvent *to)
+SNotifyEvent(xWindowsWMNotifyEvent * from, xWindowsWMNotifyEvent * to)
 {
-  to->type = from->type;
-  to->kind = from->kind;
-  cpswaps (from->sequenceNumber, to->sequenceNumber);
-  cpswapl (from->window, to->window);
-  cpswapl (from->time, to->time);
-  cpswapl (from->arg, to->arg);
+    to->type = from->type;
+    to->kind = from->kind;
+    cpswaps(from->sequenceNumber, to->sequenceNumber);
+    cpswapl(from->window, to->window);
+    cpswapl(from->time, to->time);
+    cpswapl(from->arg, to->arg);
 }
 
 static int
-SProcWindowsWMQueryVersion (ClientPtr client)
+SProcWindowsWMQueryVersion(ClientPtr client)
 {
-  int n;
-  REQUEST(xWindowsWMQueryVersionReq);
-  swaps(&stuff->length);
-  return ProcWindowsWMQueryVersion(client);
+    int n;
+
+    REQUEST(xWindowsWMQueryVersionReq);
+    swaps(&stuff->length);
+    return ProcWindowsWMQueryVersion(client);
 }
 
 static int
-SProcWindowsWMDispatch (ClientPtr client)
+SProcWindowsWMDispatch(ClientPtr client)
 {
-  REQUEST(xReq);
+    REQUEST(xReq);
 
-  /* It is bound to be non-local when there is byte swapping */
-  if (!LocalClient(client))
-    return WMErrorBase + WindowsWMClientNotLocal;
+    /* It is bound to be non-local when there is byte swapping */
+    if (!LocalClient(client))
+        return WMErrorBase + WindowsWMClientNotLocal;
 
-  /* only local clients are allowed WM access */
-  switch (stuff->data)
-    {
+    /* only local clients are allowed WM access */
+    switch (stuff->data) {
     case X_WindowsWMQueryVersion:
-      return SProcWindowsWMQueryVersion(client);
+        return SProcWindowsWMQueryVersion(client);
     default:
-      return BadRequest;
+        return BadRequest;
     }
 }
 
 void
-winWindowsWMExtensionInit (void)
+winWindowsWMExtensionInit(void)
 {
-  ExtensionEntry* extEntry;
-
-  ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
-  eventResourceType = CreateNewResourceType(WMFreeEvents, "WMEvent");
-  eventResource = FakeClientID(0);
-
-  if (ClientType && eventResourceType &&
-      (extEntry = AddExtension(WINDOWSWMNAME,
-			       WindowsWMNumberEvents,
-			       WindowsWMNumberErrors,
-			       ProcWindowsWMDispatch,
-			       SProcWindowsWMDispatch,
-			       NULL,
-			       StandardMinorOpcode)))
-    {
-      size_t i;
-      WMReqCode = (unsigned char)extEntry->base;
-      WMErrorBase = extEntry->errorBase;
-      WMEventBase = extEntry->eventBase;
-      for (i=0; i < WindowsWMNumberEvents; i++)
-        EventSwapVector[WMEventBase + i] = (EventSwapPtr) SNotifyEvent;
+    ExtensionEntry *extEntry;
+
+    ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
+    eventResourceType = CreateNewResourceType(WMFreeEvents, "WMEvent");
+    eventResource = FakeClientID(0);
+
+    if (ClientType && eventResourceType &&
+        (extEntry = AddExtension(WINDOWSWMNAME,
+                                 WindowsWMNumberEvents,
+                                 WindowsWMNumberErrors,
+                                 ProcWindowsWMDispatch,
+                                 SProcWindowsWMDispatch,
+                                 NULL, StandardMinorOpcode))) {
+        size_t i;
+
+        WMReqCode = (unsigned char) extEntry->base;
+        WMErrorBase = extEntry->errorBase;
+        WMEventBase = extEntry->eventBase;
+        for (i = 0; i < WindowsWMNumberEvents; i++)
+            EventSwapVector[WMEventBase + i] = (EventSwapPtr) SNotifyEvent;
     }
 }
diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c
index 88b506891..3f5d66b96 100644
--- a/xorg-server/hw/xwin/winwndproc.c
+++ b/xorg-server/hw/xwin/winwndproc.c
@@ -47,9 +47,8 @@
  * Global variables
  */
 
-Bool				g_fCursor = TRUE;
-Bool				g_fButton[3] = { FALSE, FALSE, FALSE };
-
+Bool g_fCursor = TRUE;
+Bool g_fButton[3] = { FALSE, FALSE, FALSE };
 
 /*
  * Called by winWakeupHandler
@@ -57,1260 +56,1212 @@ Bool				g_fButton[3] = { FALSE, FALSE, FALSE };
  */
 
 LRESULT CALLBACK
-winWindowProc (HWND hwnd, UINT message, 
-	       WPARAM wParam, LPARAM lParam)
+winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  static winPrivScreenPtr	s_pScreenPriv = NULL;
-  static winScreenInfo		*s_pScreenInfo = NULL;
-  static ScreenPtr		s_pScreen = NULL;
-  static HWND			s_hwndLastPrivates = NULL;
-  static HINSTANCE		s_hInstance;
-  static Bool			s_fTracking = FALSE;
-  static unsigned long		s_ulServerGeneration = 0;
-  static UINT			s_uTaskbarRestart = 0;
-  int				iScanCode;
-  int				i;
+    static winPrivScreenPtr s_pScreenPriv = NULL;
+    static winScreenInfo *s_pScreenInfo = NULL;
+    static ScreenPtr s_pScreen = NULL;
+    static HWND s_hwndLastPrivates = NULL;
+    static HINSTANCE s_hInstance;
+    static Bool s_fTracking = FALSE;
+    static unsigned long s_ulServerGeneration = 0;
+    static UINT s_uTaskbarRestart = 0;
+    int iScanCode;
+    int i;
 
 #if CYGDEBUG
-  winDebugWin32Message("winWindowProc", hwnd, message, wParam, lParam);
+    winDebugWin32Message("winWindowProc", hwnd, message, wParam, lParam);
 #endif
-  
-  /* Watch for server regeneration */
-  if (g_ulServerGeneration != s_ulServerGeneration)
-    {
-      /* Store new server generation */
-      s_ulServerGeneration = g_ulServerGeneration;
+
+    /* Watch for server regeneration */
+    if (g_ulServerGeneration != s_ulServerGeneration) {
+        /* Store new server generation */
+        s_ulServerGeneration = g_ulServerGeneration;
     }
 
-  /* Only retrieve new privates pointers if window handle is null or changed */
-  if ((s_pScreenPriv == NULL || hwnd != s_hwndLastPrivates)
-      && (s_pScreenPriv = GetProp (hwnd, WIN_SCR_PROP)) != NULL)
-    {
+    /* Only retrieve new privates pointers if window handle is null or changed */
+    if ((s_pScreenPriv == NULL || hwnd != s_hwndLastPrivates)
+        && (s_pScreenPriv = GetProp(hwnd, WIN_SCR_PROP)) != NULL) {
 #if CYGDEBUG
-      winDebug ("winWindowProc - Setting privates handle\n");
+        winDebug("winWindowProc - Setting privates handle\n");
 #endif
-      s_pScreenInfo = s_pScreenPriv->pScreenInfo;
-      s_pScreen = s_pScreenInfo->pScreen;
-      s_hwndLastPrivates = hwnd;
+        s_pScreenInfo = s_pScreenPriv->pScreenInfo;
+        s_pScreen = s_pScreenInfo->pScreen;
+        s_hwndLastPrivates = hwnd;
     }
-  else if (s_pScreenPriv == NULL)
-    {
-      /* For safety, handle case that should never happen */
-      s_pScreenInfo = NULL;
-      s_pScreen = NULL;
-      s_hwndLastPrivates = NULL;
+    else if (s_pScreenPriv == NULL) {
+        /* For safety, handle case that should never happen */
+        s_pScreenInfo = NULL;
+        s_pScreen = NULL;
+        s_hwndLastPrivates = NULL;
     }
 
-  /* Branch on message type */
-  switch (message)
-    {
+    /* Branch on message type */
+    switch (message) {
     case WM_TRAYICON:
-      return winHandleIconMessage (hwnd, message, wParam, lParam,
-				   s_pScreenPriv);
+        return winHandleIconMessage(hwnd, message, wParam, lParam,
+                                    s_pScreenPriv);
 
     case WM_CREATE:
 #if CYGDEBUG
-      winDebug ("winWindowProc - WM_CREATE\n");
+        winDebug("winWindowProc - WM_CREATE\n");
 #endif
-      
-      /*
-       * Add a property to our display window that references
-       * this screens' privates.
-       *
-       * This allows the window procedure to refer to the
-       * appropriate window DC and shadow DC for the window that
-       * it is processing.  We use this to repaint exposed
-       * areas of our display window.
-       */
-      s_pScreenPriv = ((LPCREATESTRUCT) lParam)->lpCreateParams;
-      s_hInstance = ((LPCREATESTRUCT) lParam)->hInstance;
-      s_pScreenInfo = s_pScreenPriv->pScreenInfo;
-      s_pScreen = s_pScreenInfo->pScreen;
-      s_hwndLastPrivates = hwnd;
-      s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated"));
-      SetProp (hwnd, WIN_SCR_PROP, s_pScreenPriv);
-
-      /* Setup tray icon */
-      if (!s_pScreenInfo->fNoTrayIcon)
-	{
-	  /*
-	   * NOTE: The WM_CREATE message is processed before CreateWindowEx
-	   * returns, so s_pScreenPriv->hwndScreen is invalid at this point.
-	   * We go ahead and copy our hwnd parameter over top of the screen
-	   * privates hwndScreen so that we have a valid value for
-	   * that member.  Otherwise, the tray icon will disappear
-	   * the first time you move the mouse over top of it.
-	   */
-	  
-	  s_pScreenPriv->hwndScreen = hwnd;
-
-	  winInitNotifyIcon (s_pScreenPriv);
-	}
-      return 0;
+
+        /*
+         * Add a property to our display window that references
+         * this screens' privates.
+         *
+         * This allows the window procedure to refer to the
+         * appropriate window DC and shadow DC for the window that
+         * it is processing.  We use this to repaint exposed
+         * areas of our display window.
+         */
+        s_pScreenPriv = ((LPCREATESTRUCT) lParam)->lpCreateParams;
+        s_hInstance = ((LPCREATESTRUCT) lParam)->hInstance;
+        s_pScreenInfo = s_pScreenPriv->pScreenInfo;
+        s_pScreen = s_pScreenInfo->pScreen;
+        s_hwndLastPrivates = hwnd;
+        s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated"));
+        SetProp(hwnd, WIN_SCR_PROP, s_pScreenPriv);
+
+        /* Setup tray icon */
+        if (!s_pScreenInfo->fNoTrayIcon) {
+            /*
+             * NOTE: The WM_CREATE message is processed before CreateWindowEx
+             * returns, so s_pScreenPriv->hwndScreen is invalid at this point.
+             * We go ahead and copy our hwnd parameter over top of the screen
+             * privates hwndScreen so that we have a valid value for
+             * that member.  Otherwise, the tray icon will disappear
+             * the first time you move the mouse over top of it.
+             */
+
+            s_pScreenPriv->hwndScreen = hwnd;
+
+            winInitNotifyIcon(s_pScreenPriv);
+        }
+        return 0;
 
     case WM_DISPLAYCHANGE:
-      /*
-        WM_DISPLAYCHANGE seems to be sent when the monitor layout or
-        any monitor's resolution or depth changes, but it's lParam and
-        wParam always indicate the resolution and bpp for the primary
-        monitor (so ignore that as we could be on any monitor...)
-       */
-
-      /* We cannot handle a display mode change during initialization */
-      if (s_pScreenInfo == NULL)
-	FatalError ("winWindowProc - WM_DISPLAYCHANGE - The display "
-		    "mode changed while we were intializing.  This is "
-		    "very bad and unexpected.  Exiting.\n");
-
-      /*
-       * We do not care about display changes with
-       * fullscreen DirectDraw engines, because those engines set
-       * their own mode when they become active.
-       */
-      if (s_pScreenInfo->fFullScreen
-	  && (s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
-	      || s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
+        /*
+           WM_DISPLAYCHANGE seems to be sent when the monitor layout or
+           any monitor's resolution or depth changes, but it's lParam and
+           wParam always indicate the resolution and bpp for the primary
+           monitor (so ignore that as we could be on any monitor...)
+         */
+
+        /* We cannot handle a display mode change during initialization */
+        if (s_pScreenInfo == NULL)
+            FatalError("winWindowProc - WM_DISPLAYCHANGE - The display "
+                       "mode changed while we were intializing.  This is "
+                       "very bad and unexpected.  Exiting.\n");
+
+        /*
+         * We do not care about display changes with
+         * fullscreen DirectDraw engines, because those engines set
+         * their own mode when they become active.
+         */
+        if (s_pScreenInfo->fFullScreen
+            && (s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
+                || s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
 #ifdef XWIN_PRIMARYFB
-	      || s_pScreenInfo->dwEngine == WIN_SERVER_PRIMARY_DD
+                || s_pScreenInfo->dwEngine == WIN_SERVER_PRIMARY_DD
 #endif
-	      ))
-	{
-	  break;
-	}
+            )) {
+            break;
+        }
 
-      ErrorF ("winWindowProc - WM_DISPLAYCHANGE - new width: %d "
-	      "new height: %d new bpp: %d\n",
-	      LOWORD (lParam), HIWORD (lParam), wParam);
+        ErrorF("winWindowProc - WM_DISPLAYCHANGE - new width: %d "
+               "new height: %d new bpp: %d\n",
+               LOWORD(lParam), HIWORD(lParam), wParam);
 
-      /* 0 bpp has no defined meaning, ignore this message */
-      if (wParam == 0)
-        break;
+        /* 0 bpp has no defined meaning, ignore this message */
+        if (wParam == 0)
+            break;
 
-      /*
-       * Check for a disruptive change in depth.
-       * We can only display a message for a disruptive depth change,
-       * we cannot do anything to correct the situation.
-       */
-      /*
-        XXX: maybe we need to check if GetSystemMetrics(SM_SAMEDISPLAYFORMAT)
-        has changed as well...
-      */
-      if (s_pScreenInfo->dwBPP != GetDeviceCaps (s_pScreenPriv->hdcScreen, BITSPIXEL))
-        {
-          if ((s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
-               || s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
+        /*
+         * Check for a disruptive change in depth.
+         * We can only display a message for a disruptive depth change,
+         * we cannot do anything to correct the situation.
+         */
+        /*
+           XXX: maybe we need to check if GetSystemMetrics(SM_SAMEDISPLAYFORMAT)
+           has changed as well...
+         */
+        if (s_pScreenInfo->dwBPP !=
+            GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL)) {
+            if ((s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD ||
+                 s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
 #ifdef XWIN_PRIMARYFB
-               || s_pScreenInfo->dwEngine == WIN_SERVER_PRIMARY_DD
+                 || s_pScreenInfo->dwEngine == WIN_SERVER_PRIMARY_DD
 #endif
-               ))
-            {
-              /* Cannot display the visual until the depth is restored */
-              ErrorF ("winWindowProc - Disruptive change in depth\n");
+                )) {
+                /* Cannot display the visual until the depth is restored */
+                ErrorF("winWindowProc - Disruptive change in depth\n");
 
-              /* Display depth change dialog */
-              winDisplayDepthChangeDialog (s_pScreenPriv);
+                /* Display depth change dialog */
+                winDisplayDepthChangeDialog(s_pScreenPriv);
 
-              /* Flag that we have an invalid screen depth */
-              s_pScreenPriv->fBadDepth = TRUE;
+                /* Flag that we have an invalid screen depth */
+                s_pScreenPriv->fBadDepth = TRUE;
 
-              /* Minimize the display window */
-              ShowWindow (hwnd, SW_MINIMIZE);
+                /* Minimize the display window */
+                ShowWindow(hwnd, SW_MINIMIZE);
             }
-          else
-            {
-              /* For GDI, performance may suffer until original depth is restored */
-              ErrorF ("winWindowProc - Performance may be non-optimal after change in depth\n");
+            else {
+                /* For GDI, performance may suffer until original depth is restored */
+                ErrorF
+                    ("winWindowProc - Performance may be non-optimal after change in depth\n");
             }
         }
-      else
-        {
-          /* Flag that we have a valid screen depth */
-          s_pScreenPriv->fBadDepth = FALSE;
+        else {
+            /* Flag that we have a valid screen depth */
+            s_pScreenPriv->fBadDepth = FALSE;
         }
 
-      /*
-        If we could cheaply check if this WM_DISPLAYCHANGE change
-        affects the monitor(s) which this X screen is displayed on
-        then we should do so here.  For the moment, assume it does.
-        (this is probably usually the case so that might be an
-        overoptimization)
-      */
-	{
-	  /*
-             In rootless modes which are monitor or virtual desktop size
-             use RandR to resize the X screen
-          */
-          if ((!s_pScreenInfo->fUserGaveHeightAndWidth) &&
-              (s_pScreenInfo->iResizeMode == resizeWithRandr) &&
-              (FALSE
+        /*
+           If we could cheaply check if this WM_DISPLAYCHANGE change
+           affects the monitor(s) which this X screen is displayed on
+           then we should do so here.  For the moment, assume it does.
+           (this is probably usually the case so that might be an
+           overoptimization)
+         */
+        {
+            /*
+               In rootless modes which are monitor or virtual desktop size
+               use RandR to resize the X screen
+             */
+            if ((!s_pScreenInfo->fUserGaveHeightAndWidth) &&
+                (s_pScreenInfo->iResizeMode == resizeWithRandr) && (FALSE
 #ifdef XWIN_MULTIWINDOWEXTWM
-               || s_pScreenInfo->fMWExtWM
+                                                                    ||
+                                                                    s_pScreenInfo->
+                                                                    fMWExtWM
 #endif
-               || s_pScreenInfo->fRootless
+                                                                    ||
+                                                                    s_pScreenInfo->
+                                                                    fRootless
 #ifdef XWIN_MULTIWINDOW
-               || s_pScreenInfo->fMultiWindow
+                                                                    ||
+                                                                    s_pScreenInfo->
+                                                                    fMultiWindow
 #endif
-               ))
-	    {
-              DWORD dwWidth, dwHeight;
-
-              if (s_pScreenInfo->fMultipleMonitors)
-                {
-                  /* resize to new virtual desktop size */
-                  dwWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
-                  dwHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+                )) {
+                DWORD dwWidth, dwHeight;
+
+                if (s_pScreenInfo->fMultipleMonitors) {
+                    /* resize to new virtual desktop size */
+                    dwWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+                    dwHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
                 }
-              else
-                {
-                  /* resize to new size of specified monitor */
-                  struct GetMonitorInfoData data;
-                  if (QueryMonitor(s_pScreenInfo->iMonitor, &data))
-                    {
-                      if (data.bMonitorSpecifiedExists == TRUE)
-                        {
-                          dwWidth = data.monitorWidth;
-                          dwHeight = data.monitorHeight;
-                          /*
-                             XXX: monitor may have changed position,
-                             so we might need to update xinerama data
-                          */
+                else {
+                    /* resize to new size of specified monitor */
+                    struct GetMonitorInfoData data;
+
+                    if (QueryMonitor(s_pScreenInfo->iMonitor, &data)) {
+                        if (data.bMonitorSpecifiedExists == TRUE) {
+                            dwWidth = data.monitorWidth;
+                            dwHeight = data.monitorHeight;
+                            /*
+                               XXX: monitor may have changed position,
+                               so we might need to update xinerama data
+                             */
                         }
-                      else
-                        {
-                          ErrorF ("Monitor number %d no longer exists!\n", s_pScreenInfo->iMonitor);
+                        else {
+                            ErrorF("Monitor number %d no longer exists!\n",
+                                   s_pScreenInfo->iMonitor);
                         }
                     }
                 }
 
-              /*
-                XXX: probably a small bug here: we don't compute the work area
-                and allow for task bar
-
-                XXX: generally, we don't allow for the task bar being moved after
-                the server is started
-               */
-
-              /* Set screen size to match new size, if it is different to current */
-              if ((s_pScreenInfo->dwWidth != dwWidth) ||
-                  (s_pScreenInfo->dwHeight != dwHeight))
-                {
-                  winDoRandRScreenSetSize(s_pScreen,
-                                          dwWidth,
-                                          dwHeight,
-                                          (dwWidth * 25.4) / monitorResolution,
-                                          (dwHeight * 25.4) / monitorResolution);
+                /*
+                   XXX: probably a small bug here: we don't compute the work area
+                   and allow for task bar
+
+                   XXX: generally, we don't allow for the task bar being moved after
+                   the server is started
+                 */
+
+                /* Set screen size to match new size, if it is different to current */
+                if ((s_pScreenInfo->dwWidth != dwWidth) ||
+                    (s_pScreenInfo->dwHeight != dwHeight)) {
+                    winDoRandRScreenSetSize(s_pScreen,
+                                            dwWidth,
+                                            dwHeight,
+                                            (dwWidth * 25.4) /
+                                            monitorResolution,
+                                            (dwHeight * 25.4) /
+                                            monitorResolution);
                 }
-	    }
-          else
-            {
-              /*
-               * We can simply recreate the same-sized primary surface when
-               * the display dimensions change.
-               */
-
-              /*
-               * NOTE: The non-DirectDraw engines set the ReleasePrimarySurface
-               * and CreatePrimarySurface function pointers to point
-               * to the no operation function, NoopDDA.  This allows us
-               * to blindly call these functions, even if they are not
-               * relevant to the current engine (e.g., Shadow GDI).
-               */
-
-              winDebug ("winWindowProc - WM_DISPLAYCHANGE - Releasing and recreating primary surface\n");
-
-              /* Release the old primary surface */
-              (*s_pScreenPriv->pwinReleasePrimarySurface) (s_pScreen);
-
-              /* Create the new primary surface */
-              (*s_pScreenPriv->pwinCreatePrimarySurface) (s_pScreen);
             }
-	}
+            else {
+                /*
+                 * We can simply recreate the same-sized primary surface when
+                 * the display dimensions change.
+                 */
+
+                /*
+                 * NOTE: The non-DirectDraw engines set the ReleasePrimarySurface
+                 * and CreatePrimarySurface function pointers to point
+                 * to the no operation function, NoopDDA.  This allows us
+                 * to blindly call these functions, even if they are not
+                 * relevant to the current engine (e.g., Shadow GDI).
+                 */
+
+                winDebug
+                    ("winWindowProc - WM_DISPLAYCHANGE - Releasing and recreating primary surface\n");
+
+                /* Release the old primary surface */
+                (*s_pScreenPriv->pwinReleasePrimarySurface) (s_pScreen);
+
+                /* Create the new primary surface */
+                (*s_pScreenPriv->pwinCreatePrimarySurface) (s_pScreen);
+            }
+        }
 
-      break;
+        break;
 
     case WM_SIZE:
-      {
-	SCROLLINFO		si;
-	RECT			rcWindow;
-	int			iWidth, iHeight;
+    {
+        SCROLLINFO si;
+        RECT rcWindow;
+        int iWidth, iHeight;
 
 #if CYGDEBUG
-	winDebug ("winWindowProc - WM_SIZE\n");
+        winDebug("winWindowProc - WM_SIZE\n");
 #endif
 
-	/* Break if we do not allow resizing */
-	if ((s_pScreenInfo->iResizeMode == notAllowed)
-	    || !s_pScreenInfo->fDecoration
+        /* Break if we do not allow resizing */
+        if ((s_pScreenInfo->iResizeMode == notAllowed)
+            || !s_pScreenInfo->fDecoration
 #ifdef XWIN_MULTIWINDOWEXTWM
-	    || s_pScreenInfo->fMWExtWM
+            || s_pScreenInfo->fMWExtWM
 #endif
-	    || s_pScreenInfo->fRootless
+            || s_pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOW
-	    || s_pScreenInfo->fMultiWindow
+            || s_pScreenInfo->fMultiWindow
 #endif
-	    || s_pScreenInfo->fFullScreen)
-	  break;
+            || s_pScreenInfo->fFullScreen)
+            break;
 
-	/* No need to resize if we get minimized */
-	if (wParam == SIZE_MINIMIZED)
-	  return 0;
+        /* No need to resize if we get minimized */
+        if (wParam == SIZE_MINIMIZED)
+            return 0;
 
-        ErrorF ("winWindowProc - WM_SIZE - new client area w: %d h: %d\n",
-                LOWORD (lParam), HIWORD (lParam));
+        ErrorF("winWindowProc - WM_SIZE - new client area w: %d h: %d\n",
+               LOWORD(lParam), HIWORD(lParam));
 
-        if (s_pScreenInfo->iResizeMode == resizeWithRandr)
-          {
+        if (s_pScreenInfo->iResizeMode == resizeWithRandr) {
             /* Actual resizing is done on WM_EXITSIZEMOVE */
             return 0;
-          }
+        }
 
         /* Otherwise iResizeMode == resizeWithScrollbars */
 
-	/*
-	 * Get the size of the whole window, including client area,
-	 * scrollbars, and non-client area decorations (caption, borders).
-	 * We do this because we need to check if the client area
-	 * without scrollbars is large enough to display the whole visual.
-	 * The new client area size passed by lParam already subtracts
-	 * the size of the scrollbars if they are currently displayed.
-	 * So checking is LOWORD(lParam) == visual_width and
-	 * HIWORD(lParam) == visual_height will never tell us to hide
-	 * the scrollbars because the client area would always be too small.
-	 * GetClientRect returns the same sizes given by lParam, so we
-	 * cannot use GetClientRect either.
-	 */
-	GetWindowRect (hwnd, &rcWindow);
-	iWidth = rcWindow.right - rcWindow.left;
-	iHeight = rcWindow.bottom - rcWindow.top;
-
-	/* Subtract the frame size from the window size. */
-	iWidth -= 2 * GetSystemMetrics (SM_CXSIZEFRAME);
-	iHeight -= (2 * GetSystemMetrics (SM_CYSIZEFRAME)
-		    + GetSystemMetrics (SM_CYCAPTION));
-
-	/*
-	 * Update scrollbar page sizes.
-	 * NOTE: If page size == range, then the scrollbar is
-	 * automatically hidden.
-	 */
-
-	/* Is the naked client area large enough to show the whole visual? */
-	if (iWidth < s_pScreenInfo->dwWidth
-	    || iHeight < s_pScreenInfo->dwHeight)
-	  {
-	    /* Client area too small to display visual, use scrollbars */
-	    iWidth -= GetSystemMetrics (SM_CXVSCROLL);
-	    iHeight -= GetSystemMetrics (SM_CYHSCROLL);
-	  }
-	
-	/* Set the horizontal scrollbar page size */
-	si.cbSize = sizeof (si);
-	si.fMask = SIF_PAGE | SIF_RANGE;
-	si.nMin = 0;
-	si.nMax = s_pScreenInfo->dwWidth - 1;
-	si.nPage = iWidth;
-	SetScrollInfo (hwnd, SB_HORZ, &si, TRUE);
-	
-	/* Set the vertical scrollbar page size */
-	si.cbSize = sizeof (si);
-	si.fMask = SIF_PAGE | SIF_RANGE;
-	si.nMin = 0;
-	si.nMax = s_pScreenInfo->dwHeight - 1;
-	si.nPage = iHeight;
-	SetScrollInfo (hwnd, SB_VERT, &si, TRUE);
-
-	/*
-	 * NOTE: Scrollbars may have moved if they were at the 
-	 * far right/bottom, so we query their current position.
-	 */
-	
-	/* Get the horizontal scrollbar position and set the offset */
-	si.cbSize = sizeof (si);
-	si.fMask = SIF_POS;
-	GetScrollInfo (hwnd, SB_HORZ, &si);
-	s_pScreenInfo->dwXOffset = -si.nPos;
-	
-	/* Get the vertical scrollbar position and set the offset */
-	si.cbSize = sizeof (si);
-	si.fMask = SIF_POS;
-	GetScrollInfo (hwnd, SB_VERT, &si);
-	s_pScreenInfo->dwYOffset = -si.nPos;
-      }
-      return 0;
+        /*
+         * Get the size of the whole window, including client area,
+         * scrollbars, and non-client area decorations (caption, borders).
+         * We do this because we need to check if the client area
+         * without scrollbars is large enough to display the whole visual.
+         * The new client area size passed by lParam already subtracts
+         * the size of the scrollbars if they are currently displayed.
+         * So checking is LOWORD(lParam) == visual_width and
+         * HIWORD(lParam) == visual_height will never tell us to hide
+         * the scrollbars because the client area would always be too small.
+         * GetClientRect returns the same sizes given by lParam, so we
+         * cannot use GetClientRect either.
+         */
+        GetWindowRect(hwnd, &rcWindow);
+        iWidth = rcWindow.right - rcWindow.left;
+        iHeight = rcWindow.bottom - rcWindow.top;
+
+        /* Subtract the frame size from the window size. */
+        iWidth -= 2 * GetSystemMetrics(SM_CXSIZEFRAME);
+        iHeight -= (2 * GetSystemMetrics(SM_CYSIZEFRAME)
+                    + GetSystemMetrics(SM_CYCAPTION));
+
+        /*
+         * Update scrollbar page sizes.
+         * NOTE: If page size == range, then the scrollbar is
+         * automatically hidden.
+         */
+
+        /* Is the naked client area large enough to show the whole visual? */
+        if (iWidth < s_pScreenInfo->dwWidth
+            || iHeight < s_pScreenInfo->dwHeight) {
+            /* Client area too small to display visual, use scrollbars */
+            iWidth -= GetSystemMetrics(SM_CXVSCROLL);
+            iHeight -= GetSystemMetrics(SM_CYHSCROLL);
+        }
+
+        /* Set the horizontal scrollbar page size */
+        si.cbSize = sizeof(si);
+        si.fMask = SIF_PAGE | SIF_RANGE;
+        si.nMin = 0;
+        si.nMax = s_pScreenInfo->dwWidth - 1;
+        si.nPage = iWidth;
+        SetScrollInfo(hwnd, SB_HORZ, &si, TRUE);
+
+        /* Set the vertical scrollbar page size */
+        si.cbSize = sizeof(si);
+        si.fMask = SIF_PAGE | SIF_RANGE;
+        si.nMin = 0;
+        si.nMax = s_pScreenInfo->dwHeight - 1;
+        si.nPage = iHeight;
+        SetScrollInfo(hwnd, SB_VERT, &si, TRUE);
+
+        /*
+         * NOTE: Scrollbars may have moved if they were at the 
+         * far right/bottom, so we query their current position.
+         */
+
+        /* Get the horizontal scrollbar position and set the offset */
+        si.cbSize = sizeof(si);
+        si.fMask = SIF_POS;
+        GetScrollInfo(hwnd, SB_HORZ, &si);
+        s_pScreenInfo->dwXOffset = -si.nPos;
+
+        /* Get the vertical scrollbar position and set the offset */
+        si.cbSize = sizeof(si);
+        si.fMask = SIF_POS;
+        GetScrollInfo(hwnd, SB_VERT, &si);
+        s_pScreenInfo->dwYOffset = -si.nPos;
+    }
+        return 0;
 
     case WM_ENTERSIZEMOVE:
-      ErrorF("winWindowProc - WM_ENTERSIZEMOVE\n");
-      break;
+        ErrorF("winWindowProc - WM_ENTERSIZEMOVE\n");
+        break;
 
     case WM_EXITSIZEMOVE:
-      ErrorF("winWindowProc - WM_EXITSIZEMOVE\n");
-
-      if (s_pScreenInfo->iResizeMode == resizeWithRandr)
-        {
-          /* Set screen size to match new client area, if it is different to current */
-          RECT rcClient;
-          DWORD dwWidth, dwHeight;
-
-          GetClientRect (hwnd, &rcClient);
-          dwWidth = rcClient.right - rcClient.left;
-          dwHeight = rcClient.bottom - rcClient.top;
-
-          if ((s_pScreenInfo->dwWidth != dwWidth) ||
-              (s_pScreenInfo->dwHeight != dwHeight))
-            {
-              /* mm = dots * (25.4 mm / inch) / (dots / inch) */
-              winDoRandRScreenSetSize(s_pScreen,
-                                      dwWidth,
-                                      dwHeight,
-                                      (dwWidth * 25.4) / monitorResolution,
-                                      (dwHeight * 25.4) / monitorResolution);
+        ErrorF("winWindowProc - WM_EXITSIZEMOVE\n");
+
+        if (s_pScreenInfo->iResizeMode == resizeWithRandr) {
+            /* Set screen size to match new client area, if it is different to current */
+            RECT rcClient;
+            DWORD dwWidth, dwHeight;
+
+            GetClientRect(hwnd, &rcClient);
+            dwWidth = rcClient.right - rcClient.left;
+            dwHeight = rcClient.bottom - rcClient.top;
+
+            if ((s_pScreenInfo->dwWidth != dwWidth) ||
+                (s_pScreenInfo->dwHeight != dwHeight)) {
+                /* mm = dots * (25.4 mm / inch) / (dots / inch) */
+                winDoRandRScreenSetSize(s_pScreen,
+                                        dwWidth,
+                                        dwHeight,
+                                        (dwWidth * 25.4) / monitorResolution,
+                                        (dwHeight * 25.4) / monitorResolution);
             }
         }
 
-      break;
+        break;
 
     case WM_VSCROLL:
-      {
-	SCROLLINFO		si;
-	int			iVertPos;
+    {
+        SCROLLINFO si;
+        int iVertPos;
 
 #if CYGDEBUG
-	winDebug ("winWindowProc - WM_VSCROLL\n");
+        winDebug("winWindowProc - WM_VSCROLL\n");
 #endif
-      
-	/* Get vertical scroll bar info */
-	si.cbSize = sizeof (si);
-	si.fMask = SIF_ALL;
-	GetScrollInfo (hwnd, SB_VERT, &si);
-
-	/* Save the vertical position for comparison later */
-	iVertPos = si.nPos;
-
-	/*
-	 * Don't forget:
-	 * moving the scrollbar to the DOWN, scroll the content UP
-	 */
-	switch (LOWORD(wParam))
-	  {
-	  case SB_TOP:
-	    si.nPos = si.nMin;
-	    break;
-	  
-	  case SB_BOTTOM:
-	    si.nPos = si.nMax - si.nPage + 1;
-	    break;
-
-	  case SB_LINEUP:
-	    si.nPos -= 1;
-	    break;
-	  
-	  case SB_LINEDOWN:
-	    si.nPos += 1;
-	    break;
-	  
-	  case SB_PAGEUP:
-	    si.nPos -= si.nPage;
-	    break;
-	  
-	  case SB_PAGEDOWN:
-	    si.nPos += si.nPage;
-	    break;
-
-	  case SB_THUMBTRACK:
-	    si.nPos = si.nTrackPos;
-	    break;
-
-	  default:
-	    break;
-	  }
-
-	/*
-	 * We retrieve the position after setting it,
-	 * because Windows may adjust it.
-	 */
-	si.fMask = SIF_POS;
-	SetScrollInfo (hwnd, SB_VERT, &si, TRUE);
-	GetScrollInfo (hwnd, SB_VERT, &si);
-      
-	/* Scroll the window if the position has changed */
-	if (si.nPos != iVertPos)
-	  {
-	    /* Save the new offset for bit block transfers, etc. */
-	    s_pScreenInfo->dwYOffset = -si.nPos;
-
-	    /* Change displayed region in the window */
-	    ScrollWindowEx (hwnd,
-			    0,
-			    iVertPos - si.nPos,
-			    NULL,
-			    NULL,
-			    NULL,
-			    NULL,
-			    SW_INVALIDATE);
-	  
-	    /* Redraw the window contents */
-	    UpdateWindow (hwnd);
-	  }
-      }
-      return 0;
+
+        /* Get vertical scroll bar info */
+        si.cbSize = sizeof(si);
+        si.fMask = SIF_ALL;
+        GetScrollInfo(hwnd, SB_VERT, &si);
+
+        /* Save the vertical position for comparison later */
+        iVertPos = si.nPos;
+
+        /*
+         * Don't forget:
+         * moving the scrollbar to the DOWN, scroll the content UP
+         */
+        switch (LOWORD(wParam)) {
+        case SB_TOP:
+            si.nPos = si.nMin;
+            break;
+
+        case SB_BOTTOM:
+            si.nPos = si.nMax - si.nPage + 1;
+            break;
+
+        case SB_LINEUP:
+            si.nPos -= 1;
+            break;
+
+        case SB_LINEDOWN:
+            si.nPos += 1;
+            break;
+
+        case SB_PAGEUP:
+            si.nPos -= si.nPage;
+            break;
+
+        case SB_PAGEDOWN:
+            si.nPos += si.nPage;
+            break;
+
+        case SB_THUMBTRACK:
+            si.nPos = si.nTrackPos;
+            break;
+
+        default:
+            break;
+        }
+
+        /*
+         * We retrieve the position after setting it,
+         * because Windows may adjust it.
+         */
+        si.fMask = SIF_POS;
+        SetScrollInfo(hwnd, SB_VERT, &si, TRUE);
+        GetScrollInfo(hwnd, SB_VERT, &si);
+
+        /* Scroll the window if the position has changed */
+        if (si.nPos != iVertPos) {
+            /* Save the new offset for bit block transfers, etc. */
+            s_pScreenInfo->dwYOffset = -si.nPos;
+
+            /* Change displayed region in the window */
+            ScrollWindowEx(hwnd,
+                           0,
+                           iVertPos - si.nPos,
+                           NULL, NULL, NULL, NULL, SW_INVALIDATE);
+
+            /* Redraw the window contents */
+            UpdateWindow(hwnd);
+        }
+    }
+        return 0;
 
     case WM_HSCROLL:
-      {
-	SCROLLINFO		si;
-	int			iHorzPos;
+    {
+        SCROLLINFO si;
+        int iHorzPos;
 
 #if CYGDEBUG
-	winDebug ("winWindowProc - WM_HSCROLL\n");
+        winDebug("winWindowProc - WM_HSCROLL\n");
 #endif
-      
-	/* Get horizontal scroll bar info */
-	si.cbSize = sizeof (si);
-	si.fMask = SIF_ALL;
-	GetScrollInfo (hwnd, SB_HORZ, &si);
-
-	/* Save the horizontal position for comparison later */
-	iHorzPos = si.nPos;
-
-	/*
-	 * Don't forget:
-	 * moving the scrollbar to the RIGHT, scroll the content LEFT
-	 */
-	switch (LOWORD(wParam))
-	  {
-	  case SB_LEFT:
-	    si.nPos = si.nMin;
-	    break;
-	  
-	  case SB_RIGHT:
-	    si.nPos = si.nMax - si.nPage + 1;
-	    break;
-
-	  case SB_LINELEFT:
-	    si.nPos -= 1;
-	    break;
-	  
-	  case SB_LINERIGHT:
-	    si.nPos += 1;
-	    break;
-	  
-	  case SB_PAGELEFT:
-	    si.nPos -= si.nPage;
-	    break;
-	  
-	  case SB_PAGERIGHT:
-	    si.nPos += si.nPage;
-	    break;
-
-	  case SB_THUMBTRACK:
-	    si.nPos = si.nTrackPos;
-	    break;
-
-	  default:
-	    break;
-	  }
-
-	/*
-	 * We retrieve the position after setting it,
-	 * because Windows may adjust it.
-	 */
-	si.fMask = SIF_POS;
-	SetScrollInfo (hwnd, SB_HORZ, &si, TRUE);
-	GetScrollInfo (hwnd, SB_HORZ, &si);
-      
-	/* Scroll the window if the position has changed */
-	if (si.nPos != iHorzPos)
-	  {
-	    /* Save the new offset for bit block transfers, etc. */
-	    s_pScreenInfo->dwXOffset = -si.nPos;
-
-	    /* Change displayed region in the window */
-	    ScrollWindowEx (hwnd,
-			    iHorzPos - si.nPos,
-			    0,
-			    NULL,
-			    NULL,
-			    NULL,
-			    NULL,
-			    SW_INVALIDATE);
-	  
-	    /* Redraw the window contents */
-	    UpdateWindow (hwnd);
-	  }
-      }
-      return 0;
+
+        /* Get horizontal scroll bar info */
+        si.cbSize = sizeof(si);
+        si.fMask = SIF_ALL;
+        GetScrollInfo(hwnd, SB_HORZ, &si);
+
+        /* Save the horizontal position for comparison later */
+        iHorzPos = si.nPos;
+
+        /*
+         * Don't forget:
+         * moving the scrollbar to the RIGHT, scroll the content LEFT
+         */
+        switch (LOWORD(wParam)) {
+        case SB_LEFT:
+            si.nPos = si.nMin;
+            break;
+
+        case SB_RIGHT:
+            si.nPos = si.nMax - si.nPage + 1;
+            break;
+
+        case SB_LINELEFT:
+            si.nPos -= 1;
+            break;
+
+        case SB_LINERIGHT:
+            si.nPos += 1;
+            break;
+
+        case SB_PAGELEFT:
+            si.nPos -= si.nPage;
+            break;
+
+        case SB_PAGERIGHT:
+            si.nPos += si.nPage;
+            break;
+
+        case SB_THUMBTRACK:
+            si.nPos = si.nTrackPos;
+            break;
+
+        default:
+            break;
+        }
+
+        /*
+         * We retrieve the position after setting it,
+         * because Windows may adjust it.
+         */
+        si.fMask = SIF_POS;
+        SetScrollInfo(hwnd, SB_HORZ, &si, TRUE);
+        GetScrollInfo(hwnd, SB_HORZ, &si);
+
+        /* Scroll the window if the position has changed */
+        if (si.nPos != iHorzPos) {
+            /* Save the new offset for bit block transfers, etc. */
+            s_pScreenInfo->dwXOffset = -si.nPos;
+
+            /* Change displayed region in the window */
+            ScrollWindowEx(hwnd,
+                           iHorzPos - si.nPos,
+                           0, NULL, NULL, NULL, NULL, SW_INVALIDATE);
+
+            /* Redraw the window contents */
+            UpdateWindow(hwnd);
+        }
+    }
+        return 0;
 
     case WM_GETMINMAXINFO:
-      {
-	MINMAXINFO		*pMinMaxInfo = (MINMAXINFO *) lParam;
-	int			iCaptionHeight;
-	int			iBorderHeight, iBorderWidth;
-
-#if CYGDEBUG	
-	winDebug ("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n",
-		s_pScreenInfo);
+    {
+        MINMAXINFO *pMinMaxInfo = (MINMAXINFO *) lParam;
+        int iCaptionHeight;
+        int iBorderHeight, iBorderWidth;
+
+#if CYGDEBUG
+        winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n",
+                 s_pScreenInfo);
 #endif
 
-	/* Can't do anything without screen info */
-	if (s_pScreenInfo == NULL
-	    || (s_pScreenInfo->iResizeMode != resizeWithScrollbars)
-	    || s_pScreenInfo->fFullScreen
-	    || !s_pScreenInfo->fDecoration
+        /* Can't do anything without screen info */
+        if (s_pScreenInfo == NULL
+            || (s_pScreenInfo->iResizeMode != resizeWithScrollbars)
+            || s_pScreenInfo->fFullScreen || !s_pScreenInfo->fDecoration
 #ifdef XWIN_MULTIWINDOWEXTWM
-	    || s_pScreenInfo->fMWExtWM
+            || s_pScreenInfo->fMWExtWM
 #endif
-	    || s_pScreenInfo->fRootless
+            || s_pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOW
-	    || s_pScreenInfo->fMultiWindow
+            || s_pScreenInfo->fMultiWindow
 #endif
-	    )
-	  break;
-
-	/*
-	 * Here we can override the maximum tracking size, which
-	 * is the largest size that can be assigned to our window
-	 * via the sizing border.
-	 */
-
-	/*
-	 * FIXME: Do we only need to do this once, since our visual size
-	 * does not change?  Does Windows store this value statically
-	 * once we have set it once?
-	 */
-
-	/* Get the border and caption sizes */
-	iCaptionHeight = GetSystemMetrics (SM_CYCAPTION);
-	iBorderWidth = 2 * GetSystemMetrics (SM_CXSIZEFRAME);
-	iBorderHeight = 2 * GetSystemMetrics (SM_CYSIZEFRAME);
-	
-	/* Allow the full visual to be displayed */
-	pMinMaxInfo->ptMaxTrackSize.x
-	  = s_pScreenInfo->dwWidth + iBorderWidth;
-	pMinMaxInfo->ptMaxTrackSize.y
-	  = s_pScreenInfo->dwHeight + iBorderHeight + iCaptionHeight;
-      }
-      return 0;
+            )
+            break;
+
+        /*
+         * Here we can override the maximum tracking size, which
+         * is the largest size that can be assigned to our window
+         * via the sizing border.
+         */
+
+        /*
+         * FIXME: Do we only need to do this once, since our visual size
+         * does not change?  Does Windows store this value statically
+         * once we have set it once?
+         */
+
+        /* Get the border and caption sizes */
+        iCaptionHeight = GetSystemMetrics(SM_CYCAPTION);
+        iBorderWidth = 2 * GetSystemMetrics(SM_CXSIZEFRAME);
+        iBorderHeight = 2 * GetSystemMetrics(SM_CYSIZEFRAME);
+
+        /* Allow the full visual to be displayed */
+        pMinMaxInfo->ptMaxTrackSize.x = s_pScreenInfo->dwWidth + iBorderWidth;
+        pMinMaxInfo->ptMaxTrackSize.y
+            = s_pScreenInfo->dwHeight + iBorderHeight + iCaptionHeight;
+    }
+        return 0;
 
     case WM_ERASEBKGND:
 #if CYGDEBUG
-      winDebug ("winWindowProc - WM_ERASEBKGND\n");
+        winDebug("winWindowProc - WM_ERASEBKGND\n");
 #endif
-      /*
-       * Pretend that we did erase the background but we don't care,
-       * the application uses the full window estate. This avoids some
-       * flickering when resizing.
-       */
-      return TRUE;
+        /*
+         * Pretend that we did erase the background but we don't care,
+         * the application uses the full window estate. This avoids some
+         * flickering when resizing.
+         */
+        return TRUE;
 
     case WM_PAINT:
 #if CYGDEBUG
-      winDebug ("winWindowProc - WM_PAINT\n");
+        winDebug("winWindowProc - WM_PAINT\n");
 #endif
-      /* Only paint if we have privates and the server is enabled */
-      if (s_pScreenPriv == NULL
-	  || !s_pScreenPriv->fEnabled
-	  || (s_pScreenInfo->fFullScreen && !s_pScreenPriv->fActive)
-	  || s_pScreenPriv->fBadDepth)
-	{
-	  /* We don't want to paint */
-	  break;
-	}
-
-      /* Break out here if we don't have a valid paint routine */
-      if (s_pScreenPriv->pwinBltExposedRegions == NULL)
-	break;
-      
-      /* Call the engine dependent repainter */
-      (*s_pScreenPriv->pwinBltExposedRegions) (s_pScreen);
-      return 0;
+        /* Only paint if we have privates and the server is enabled */
+        if (s_pScreenPriv == NULL
+            || !s_pScreenPriv->fEnabled
+            || (s_pScreenInfo->fFullScreen && !s_pScreenPriv->fActive)
+            || s_pScreenPriv->fBadDepth) {
+            /* We don't want to paint */
+            break;
+        }
+
+        /* Break out here if we don't have a valid paint routine */
+        if (s_pScreenPriv->pwinBltExposedRegions == NULL)
+            break;
+
+        /* Call the engine dependent repainter */
+        (*s_pScreenPriv->pwinBltExposedRegions) (s_pScreen);
+        return 0;
 
     case WM_PALETTECHANGED:
-      {
+    {
 #if CYGDEBUG
-	winDebug ("winWindowProc - WM_PALETTECHANGED\n");
+        winDebug("winWindowProc - WM_PALETTECHANGED\n");
 #endif
-	/*
-	 * Don't process if we don't have privates or a colormap,
-	 * or if we have an invalid depth.
-	 */
-	if (s_pScreenPriv == NULL
-	    || s_pScreenPriv->pcmapInstalled == NULL
-	    || s_pScreenPriv->fBadDepth)
-	  break;
-
-	/* Return if we caused the palette to change */
-	if ((HWND) wParam == hwnd)
-	  {
-	    /* Redraw the screen */
-	    (*s_pScreenPriv->pwinRedrawScreen) (s_pScreen);
-	    return 0;
-	  }
-	
-	/* Reinstall the windows palette */
-	(*s_pScreenPriv->pwinRealizeInstalledPalette) (s_pScreen);
-	
-	/* Redraw the screen */
-	(*s_pScreenPriv->pwinRedrawScreen) (s_pScreen);
-	return 0;
-      }
+        /*
+         * Don't process if we don't have privates or a colormap,
+         * or if we have an invalid depth.
+         */
+        if (s_pScreenPriv == NULL
+            || s_pScreenPriv->pcmapInstalled == NULL
+            || s_pScreenPriv->fBadDepth)
+            break;
+
+        /* Return if we caused the palette to change */
+        if ((HWND) wParam == hwnd) {
+            /* Redraw the screen */
+            (*s_pScreenPriv->pwinRedrawScreen) (s_pScreen);
+            return 0;
+        }
+
+        /* Reinstall the windows palette */
+        (*s_pScreenPriv->pwinRealizeInstalledPalette) (s_pScreen);
+
+        /* Redraw the screen */
+        (*s_pScreenPriv->pwinRedrawScreen) (s_pScreen);
+        return 0;
+    }
 
     case WM_MOUSEMOVE:
-      /* We can't do anything without privates */
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
+        /* We can't do anything without privates */
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
 
-      /* We can't do anything without g_pwinPointer */
-      if (g_pwinPointer == NULL)
-        break;
+        /* We can't do anything without g_pwinPointer */
+        if (g_pwinPointer == NULL)
+            break;
+
+        /* Has the mouse pointer crossed screens? */
+        if (s_pScreen != miPointerGetScreen(g_pwinPointer))
+            miPointerSetScreen(g_pwinPointer, s_pScreenInfo->dwScreen,
+                               GET_X_LPARAM(lParam) - s_pScreenInfo->dwXOffset,
+                               GET_Y_LPARAM(lParam) - s_pScreenInfo->dwYOffset);
+
+        /* Are we tracking yet? */
+        if (!s_fTracking) {
+            TRACKMOUSEEVENT tme;
 
-      /* Has the mouse pointer crossed screens? */
-      if (s_pScreen != miPointerGetScreen(g_pwinPointer))
-	miPointerSetScreen (g_pwinPointer, s_pScreenInfo->dwScreen,
-			       GET_X_LPARAM(lParam)-s_pScreenInfo->dwXOffset,
-			       GET_Y_LPARAM(lParam)-s_pScreenInfo->dwYOffset);
-
-      /* Are we tracking yet? */
-      if (!s_fTracking)
-	{
-	  TRACKMOUSEEVENT		tme;
-	  
-	  /* Setup data structure */
-	  ZeroMemory (&tme, sizeof (tme));
-	  tme.cbSize = sizeof (tme);
-	  tme.dwFlags = TME_LEAVE;
-	  tme.hwndTrack = hwnd;
-
-	  /* Call the tracking function */
-	  if (!TrackMouseEvent(&tme))
-	    ErrorF ("winWindowProc - TrackMouseEvent failed\n");
-
-	  /* Flag that we are tracking now */
-	  s_fTracking = TRUE;
-	}
-
-      /* Hide or show the Windows mouse cursor */
-      if (g_fSoftwareCursor && g_fCursor && (s_pScreenPriv->fActive || s_pScreenInfo->fLessPointer))
-	{
-	  /* Hide Windows cursor */
-	  g_fCursor = FALSE;
-	  ShowCursor (FALSE);
-	}
-      else if (g_fSoftwareCursor && !g_fCursor && !s_pScreenPriv->fActive
-	       && !s_pScreenInfo->fLessPointer)
-	{
-	  /* Show Windows cursor */
-	  g_fCursor = TRUE;
-	  ShowCursor (TRUE);
-	}
-      
-      /* Deliver absolute cursor position to X Server */
-      winEnqueueMotion(GET_X_LPARAM(lParam)-s_pScreenInfo->dwXOffset,
-		       GET_Y_LPARAM(lParam)-s_pScreenInfo->dwYOffset);
-      return 0;
+            /* Setup data structure */
+            ZeroMemory(&tme, sizeof(tme));
+            tme.cbSize = sizeof(tme);
+            tme.dwFlags = TME_LEAVE;
+            tme.hwndTrack = hwnd;
+
+            /* Call the tracking function */
+            if (!TrackMouseEvent(&tme))
+                ErrorF("winWindowProc - TrackMouseEvent failed\n");
+
+            /* Flag that we are tracking now */
+            s_fTracking = TRUE;
+        }
+
+        /* Hide or show the Windows mouse cursor */
+        if (g_fSoftwareCursor && g_fCursor &&
+            (s_pScreenPriv->fActive || s_pScreenInfo->fLessPointer)) {
+            /* Hide Windows cursor */
+            g_fCursor = FALSE;
+            ShowCursor(FALSE);
+        }
+        else if (g_fSoftwareCursor && !g_fCursor && !s_pScreenPriv->fActive
+                 && !s_pScreenInfo->fLessPointer) {
+            /* Show Windows cursor */
+            g_fCursor = TRUE;
+            ShowCursor(TRUE);
+        }
+
+        /* Deliver absolute cursor position to X Server */
+        winEnqueueMotion(GET_X_LPARAM(lParam) - s_pScreenInfo->dwXOffset,
+                         GET_Y_LPARAM(lParam) - s_pScreenInfo->dwYOffset);
+        return 0;
 
     case WM_NCMOUSEMOVE:
-      /*
-       * We break instead of returning 0 since we need to call
-       * DefWindowProc to get the mouse cursor changes
-       * and min/max/close button highlighting in Windows XP.
-       * The Platform SDK says that you should return 0 if you
-       * process this message, but it fails to mention that you
-       * will give up any default functionality if you do return 0.
-       */
-      
-      /* We can't do anything without privates */
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      
-      /* Non-client mouse movement, show Windows cursor */
-      if (g_fSoftwareCursor && !g_fCursor)
-	{
-	  g_fCursor = TRUE;
-	  ShowCursor (TRUE);
-	}
-      break;
+        /*
+         * We break instead of returning 0 since we need to call
+         * DefWindowProc to get the mouse cursor changes
+         * and min/max/close button highlighting in Windows XP.
+         * The Platform SDK says that you should return 0 if you
+         * process this message, but it fails to mention that you
+         * will give up any default functionality if you do return 0.
+         */
+
+        /* We can't do anything without privates */
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+
+        /* Non-client mouse movement, show Windows cursor */
+        if (g_fSoftwareCursor && !g_fCursor) {
+            g_fCursor = TRUE;
+            ShowCursor(TRUE);
+        }
+        break;
 
     case WM_MOUSELEAVE:
-      /* Mouse has left our client area */
+        /* Mouse has left our client area */
 
-      /* Flag that we are no longer tracking */
-      s_fTracking = FALSE;
+        /* Flag that we are no longer tracking */
+        s_fTracking = FALSE;
 
-      /* Show the mouse cursor, if necessary */
-      if (g_fSoftwareCursor && !g_fCursor)
-	{
-	  g_fCursor = TRUE;
-	  ShowCursor (TRUE);
-	}
-      return 0;
+        /* Show the mouse cursor, if necessary */
+        if (g_fSoftwareCursor && !g_fCursor) {
+            g_fCursor = TRUE;
+            ShowCursor(TRUE);
+        }
+        return 0;
 
     case WM_LBUTTONDBLCLK:
     case WM_LBUTTONDOWN:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      if (s_pScreenInfo->fRootless
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        if (s_pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOWEXTWM
-	  || s_pScreenInfo->fMWExtWM
+            || s_pScreenInfo->fMWExtWM
 #endif
-	  )
-	SetCapture (hwnd);
-      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button1, wParam);
-      
+            )
+            SetCapture(hwnd);
+        return winMouseButtonsHandle(s_pScreen, ButtonPress, Button1, wParam);
+
     case WM_LBUTTONUP:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      if (s_pScreenInfo->fRootless
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        if (s_pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOWEXTWM
-	  || s_pScreenInfo->fMWExtWM
+            || s_pScreenInfo->fMWExtWM
 #endif
-	  )
-	ReleaseCapture ();
-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button1, wParam);
+            )
+            ReleaseCapture();
+        return winMouseButtonsHandle(s_pScreen, ButtonRelease, Button1, wParam);
 
     case WM_MBUTTONDBLCLK:
     case WM_MBUTTONDOWN:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      if (s_pScreenInfo->fRootless
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        if (s_pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOWEXTWM
-	  || s_pScreenInfo->fMWExtWM
+            || s_pScreenInfo->fMWExtWM
 #endif
-	  )
-	SetCapture (hwnd);
-      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button2, wParam);
-      
+            )
+            SetCapture(hwnd);
+        return winMouseButtonsHandle(s_pScreen, ButtonPress, Button2, wParam);
+
     case WM_MBUTTONUP:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      if (s_pScreenInfo->fRootless
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        if (s_pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOWEXTWM
-	  || s_pScreenInfo->fMWExtWM
+            || s_pScreenInfo->fMWExtWM
 #endif
-	  )
-	ReleaseCapture ();
-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button2, wParam);
-      
+            )
+            ReleaseCapture();
+        return winMouseButtonsHandle(s_pScreen, ButtonRelease, Button2, wParam);
+
     case WM_RBUTTONDBLCLK:
     case WM_RBUTTONDOWN:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      if (s_pScreenInfo->fRootless
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        if (s_pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOWEXTWM
-	  || s_pScreenInfo->fMWExtWM
+            || s_pScreenInfo->fMWExtWM
 #endif
-	  )
-	SetCapture (hwnd);
-      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button3, wParam);
-      
+            )
+            SetCapture(hwnd);
+        return winMouseButtonsHandle(s_pScreen, ButtonPress, Button3, wParam);
+
     case WM_RBUTTONUP:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      if (s_pScreenInfo->fRootless
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        if (s_pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOWEXTWM
-	  || s_pScreenInfo->fMWExtWM
+            || s_pScreenInfo->fMWExtWM
 #endif
-	  )
-	ReleaseCapture ();
-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button3, wParam);
+            )
+            ReleaseCapture();
+        return winMouseButtonsHandle(s_pScreen, ButtonRelease, Button3, wParam);
 
     case WM_XBUTTONDBLCLK:
     case WM_XBUTTONDOWN:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      if (s_pScreenInfo->fRootless
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        if (s_pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOWEXTWM
-	  || s_pScreenInfo->fMWExtWM
+            || s_pScreenInfo->fMWExtWM
 #endif
-	  )
-	SetCapture (hwnd);
-      return winMouseButtonsHandle (s_pScreen, ButtonPress, HIWORD(wParam) + 5, wParam);
+            )
+            SetCapture(hwnd);
+        return winMouseButtonsHandle(s_pScreen, ButtonPress, HIWORD(wParam) + 5,
+                                     wParam);
     case WM_XBUTTONUP:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-      if (s_pScreenInfo->fRootless
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+        if (s_pScreenInfo->fRootless
 #ifdef XWIN_MULTIWINDOWEXTWM
-	  || s_pScreenInfo->fMWExtWM
+            || s_pScreenInfo->fMWExtWM
 #endif
-	  )
-	ReleaseCapture ();
-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, HIWORD(wParam) + 5, wParam);
+            )
+            ReleaseCapture();
+        return winMouseButtonsHandle(s_pScreen, ButtonRelease,
+                                     HIWORD(wParam) + 5, wParam);
 
     case WM_TIMER:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-
-      /* Branch on the timer id */
-      switch (wParam)
-	{
-	case WIN_E3B_TIMER_ID:
-	  /* Send delayed button press */
-	  winMouseButtonsSendEvent (ButtonPress,
-				    s_pScreenPriv->iE3BCachedPress);
-
-	  /* Kill this timer */
-	  KillTimer (s_pScreenPriv->hwndScreen, WIN_E3B_TIMER_ID);
-
-	  /* Clear screen privates flags */
-	  s_pScreenPriv->iE3BCachedPress = 0;
-	  break;
-
-	case WIN_POLLING_MOUSE_TIMER_ID:
-	  {
-	    POINT		point;
-	    WPARAM		wL, wM, wR, wShift, wCtrl;
-	    LPARAM		lPos;
-	    
-	    /* Get the current position of the mouse cursor */
-	    GetCursorPos (&point);
-	    
-	    /* Map from screen (-X, -Y) to root (0, 0) */
-	    point.x -= GetSystemMetrics (SM_XVIRTUALSCREEN);
-	    point.y -= GetSystemMetrics (SM_YVIRTUALSCREEN);
-	    
-	    /* Deliver absolute cursor position to X Server */
-	    winEnqueueMotion(point.x , point.y);
-
-	    /* Check if a button was released but we didn't see it */
-	    GetCursorPos (&point);
-	    wL = (GetKeyState (VK_LBUTTON) & 0x8000)?MK_LBUTTON:0;
-	    wM = (GetKeyState (VK_MBUTTON) & 0x8000)?MK_MBUTTON:0;
-	    wR = (GetKeyState (VK_RBUTTON) & 0x8000)?MK_RBUTTON:0;
-	    wShift = (GetKeyState (VK_SHIFT) & 0x8000)?MK_SHIFT:0;
-	    wCtrl = (GetKeyState (VK_CONTROL) & 0x8000)?MK_CONTROL:0;
-	    lPos = MAKELPARAM(point.x, point.y);
-	    if (g_fButton[0] & !wL)
-	    PostMessage (hwnd, WM_LBUTTONUP, wCtrl|wM|wR|wShift, lPos);
-	    if (g_fButton[1] & !wM)
-	      PostMessage (hwnd, WM_MBUTTONUP, wCtrl|wL|wR|wShift, lPos);
-	    if (g_fButton[2] & !wR)
-	      PostMessage (hwnd, WM_RBUTTONUP, wCtrl|wL|wM|wShift, lPos);
-	  }
-	}
-      return 0;
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+
+        /* Branch on the timer id */
+        switch (wParam) {
+        case WIN_E3B_TIMER_ID:
+            /* Send delayed button press */
+            winMouseButtonsSendEvent(ButtonPress,
+                                     s_pScreenPriv->iE3BCachedPress);
+
+            /* Kill this timer */
+            KillTimer(s_pScreenPriv->hwndScreen, WIN_E3B_TIMER_ID);
+
+            /* Clear screen privates flags */
+            s_pScreenPriv->iE3BCachedPress = 0;
+            break;
+
+        case WIN_POLLING_MOUSE_TIMER_ID:
+        {
+            POINT point;
+            WPARAM wL, wM, wR, wShift, wCtrl;
+            LPARAM lPos;
+
+            /* Get the current position of the mouse cursor */
+            GetCursorPos(&point);
+
+            /* Map from screen (-X, -Y) to root (0, 0) */
+            point.x -= GetSystemMetrics(SM_XVIRTUALSCREEN);
+            point.y -= GetSystemMetrics(SM_YVIRTUALSCREEN);
+
+            /* Deliver absolute cursor position to X Server */
+            winEnqueueMotion(point.x, point.y);
+
+            /* Check if a button was released but we didn't see it */
+            GetCursorPos(&point);
+            wL = (GetKeyState(VK_LBUTTON) & 0x8000) ? MK_LBUTTON : 0;
+            wM = (GetKeyState(VK_MBUTTON) & 0x8000) ? MK_MBUTTON : 0;
+            wR = (GetKeyState(VK_RBUTTON) & 0x8000) ? MK_RBUTTON : 0;
+            wShift = (GetKeyState(VK_SHIFT) & 0x8000) ? MK_SHIFT : 0;
+            wCtrl = (GetKeyState(VK_CONTROL) & 0x8000) ? MK_CONTROL : 0;
+            lPos = MAKELPARAM(point.x, point.y);
+            if (g_fButton[0] & !wL)
+                PostMessage(hwnd, WM_LBUTTONUP, wCtrl | wM | wR | wShift, lPos);
+            if (g_fButton[1] & !wM)
+                PostMessage(hwnd, WM_MBUTTONUP, wCtrl | wL | wR | wShift, lPos);
+            if (g_fButton[2] & !wR)
+                PostMessage(hwnd, WM_RBUTTONUP, wCtrl | wL | wM | wShift, lPos);
+        }
+        }
+        return 0;
 
     case WM_CTLCOLORSCROLLBAR:
-      FatalError ("winWindowProc - WM_CTLCOLORSCROLLBAR - We are not "
-		  "supposed to get this message.  Exiting.\n");
-      return 0;
+        FatalError("winWindowProc - WM_CTLCOLORSCROLLBAR - We are not "
+                   "supposed to get this message.  Exiting.\n");
+        return 0;
 
     case WM_MOUSEWHEEL:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
 #if CYGDEBUG
-      winDebug ("winWindowProc - WM_MOUSEWHEEL\n");
+        winDebug("winWindowProc - WM_MOUSEWHEEL\n");
 #endif
-      winMouseWheel (s_pScreen, GET_WHEEL_DELTA_WPARAM(wParam));
-      break;
+        winMouseWheel(s_pScreen, GET_WHEEL_DELTA_WPARAM(wParam));
+        break;
 
     case WM_SETFOCUS:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
 
-      /* Restore the state of all mode keys */
-      winRestoreModeKeyStates ();
+        /* Restore the state of all mode keys */
+        winRestoreModeKeyStates();
 
-      /* Add the keyboard hook if possible */
-      if (g_fKeyboardHookLL)
-	g_fKeyboardHookLL = winInstallKeyboardHookLL ();
-      return 0;
+        /* Add the keyboard hook if possible */
+        if (g_fKeyboardHookLL)
+            g_fKeyboardHookLL = winInstallKeyboardHookLL();
+        return 0;
 
     case WM_KILLFOCUS:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
 
-      /* Release any pressed keys */
-      winKeybdReleaseKeys ();
+        /* Release any pressed keys */
+        winKeybdReleaseKeys();
 
-      /* Remove our keyboard hook if it is installed */
-      winRemoveKeyboardHookLL ();
-      return 0;
+        /* Remove our keyboard hook if it is installed */
+        winRemoveKeyboardHookLL();
+        return 0;
 
     case WM_SYSKEYDOWN:
     case WM_KEYDOWN:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-
-      /*
-       * FIXME: Catching Alt-F4 like this is really terrible.  This should
-       * be generalized to handle other Windows keyboard signals.  Actually,
-       * the list keys to catch and the actions to perform when caught should
-       * be configurable; that way user's can customize the keys that they
-       * need to have passed through to their window manager or apps, or they
-       * can remap certain actions to new key codes that do not conflict
-       * with the X apps that they are using.  Yeah, that'll take awhile.
-       */
-      if ((s_pScreenInfo->fUseWinKillKey && wParam == VK_F4
-	   && (GetKeyState (VK_MENU) & 0x8000))
-	  || (s_pScreenInfo->fUseUnixKillKey && wParam == VK_BACK
-	      && (GetKeyState (VK_MENU) & 0x8000)
-	      && (GetKeyState (VK_CONTROL) & 0x8000)))
-	{
-	  /*
-	   * Better leave this message here, just in case some unsuspecting
-	   * user enters Alt + F4 and is surprised when the application
-	   * quits.
-	   */
-	  ErrorF ("winWindowProc - WM_*KEYDOWN - Closekey hit, quitting\n");
-	  
-	  /* Display Exit dialog */
-	  winDisplayExitDialog (s_pScreenPriv);
-	  return 0;
-	}
-      
-      /*
-       * Don't do anything for the Windows keys, as focus will soon
-       * be returned to Windows.  We may be able to trap the Windows keys,
-       * but we should determine if that is desirable before doing so.
-       */
-      if ((wParam == VK_LWIN || wParam == VK_RWIN) && !g_fKeyboardHookLL)
-	break;
-
-      /* Discard fake Ctrl_L events that precede AltGR on non-US keyboards */
-      if (winIsFakeCtrl_L (message, wParam, lParam))
-	return 0;
-
-      /* 
-       * Discard presses generated from Windows auto-repeat
-       */
-      if (lParam & (1<<30))
-      {
-        switch (wParam)
-        {
-          /* ago: Pressing LControl while RControl is pressed is 
-           * Indicated as repeat. Fix this!
-           */
-          case VK_CONTROL:
-          case VK_SHIFT:
-            if (winCheckKeyPressed(wParam, lParam))
-              return 0;
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+
+        /*
+         * FIXME: Catching Alt-F4 like this is really terrible.  This should
+         * be generalized to handle other Windows keyboard signals.  Actually,
+         * the list keys to catch and the actions to perform when caught should
+         * be configurable; that way user's can customize the keys that they
+         * need to have passed through to their window manager or apps, or they
+         * can remap certain actions to new key codes that do not conflict
+         * with the X apps that they are using.  Yeah, that'll take awhile.
+         */
+        if ((s_pScreenInfo->fUseWinKillKey && wParam == VK_F4
+             && (GetKeyState(VK_MENU) & 0x8000))
+            || (s_pScreenInfo->fUseUnixKillKey && wParam == VK_BACK
+                && (GetKeyState(VK_MENU) & 0x8000)
+                && (GetKeyState(VK_CONTROL) & 0x8000))) {
+            /*
+             * Better leave this message here, just in case some unsuspecting
+             * user enters Alt + F4 and is surprised when the application
+             * quits.
+             */
+            ErrorF("winWindowProc - WM_*KEYDOWN - Closekey hit, quitting\n");
+
+            /* Display Exit dialog */
+            winDisplayExitDialog(s_pScreenPriv);
+            return 0;
+        }
+
+        /*
+         * Don't do anything for the Windows keys, as focus will soon
+         * be returned to Windows.  We may be able to trap the Windows keys,
+         * but we should determine if that is desirable before doing so.
+         */
+        if ((wParam == VK_LWIN || wParam == VK_RWIN) && !g_fKeyboardHookLL)
             break;
-          default:
+
+        /* Discard fake Ctrl_L events that precede AltGR on non-US keyboards */
+        if (winIsFakeCtrl_L(message, wParam, lParam))
             return 0;
+
+        /* 
+         * Discard presses generated from Windows auto-repeat
+         */
+        if (lParam & (1 << 30)) {
+            switch (wParam) {
+                /* ago: Pressing LControl while RControl is pressed is 
+                 * Indicated as repeat. Fix this!
+                 */
+            case VK_CONTROL:
+            case VK_SHIFT:
+                if (winCheckKeyPressed(wParam, lParam))
+                    return 0;
+                break;
+            default:
+                return 0;
+            }
         }
-      } 
-      
-      /* Translate Windows key code to X scan code */
-      winTranslateKey (wParam, lParam, &iScanCode);
 
-      /* Ignore repeats for CapsLock */
-      if (wParam == VK_CAPITAL)
-	lParam = 1;
+        /* Translate Windows key code to X scan code */
+        winTranslateKey(wParam, lParam, &iScanCode);
+
+        /* Ignore repeats for CapsLock */
+        if (wParam == VK_CAPITAL)
+            lParam = 1;
 
-      /* Send the key event(s) */
-      for (i = 0; i < LOWORD(lParam); ++i)
-	winSendKeyEvent (iScanCode, TRUE);
-      return 0;
+        /* Send the key event(s) */
+        for (i = 0; i < LOWORD(lParam); ++i)
+            winSendKeyEvent(iScanCode, TRUE);
+        return 0;
 
     case WM_SYSKEYUP:
     case WM_KEYUP:
-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
-	break;
-
-      /*
-       * Don't do anything for the Windows keys, as focus will soon
-       * be returned to Windows.  We may be able to trap the Windows keys,
-       * but we should determine if that is desirable before doing so.
-       */
-      if ((wParam == VK_LWIN || wParam == VK_RWIN) && !g_fKeyboardHookLL)
-	break;
-
-      /* Ignore the fake Ctrl_L that follows an AltGr release */
-      if (winIsFakeCtrl_L (message, wParam, lParam))
-	return 0;
-
-      /* Enqueue a keyup event */
-      winTranslateKey (wParam, lParam, &iScanCode);
-      winSendKeyEvent (iScanCode, FALSE);
-
-      /* Release all pressed shift keys */
-      if (wParam == VK_SHIFT) 
-        winFixShiftKeys (iScanCode);
-      return 0;
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+
+        /*
+         * Don't do anything for the Windows keys, as focus will soon
+         * be returned to Windows.  We may be able to trap the Windows keys,
+         * but we should determine if that is desirable before doing so.
+         */
+        if ((wParam == VK_LWIN || wParam == VK_RWIN) && !g_fKeyboardHookLL)
+            break;
+
+        /* Ignore the fake Ctrl_L that follows an AltGr release */
+        if (winIsFakeCtrl_L(message, wParam, lParam))
+            return 0;
+
+        /* Enqueue a keyup event */
+        winTranslateKey(wParam, lParam, &iScanCode);
+        winSendKeyEvent(iScanCode, FALSE);
+
+        /* Release all pressed shift keys */
+        if (wParam == VK_SHIFT)
+            winFixShiftKeys(iScanCode);
+        return 0;
 
     case WM_HOTKEY:
-      if (s_pScreenPriv == NULL)
-	break;
+        if (s_pScreenPriv == NULL)
+            break;
 
-      /* Call the engine-specific hot key handler */
-      (*s_pScreenPriv->pwinHotKeyAltTab) (s_pScreen);
-      return 0;
+        /* Call the engine-specific hot key handler */
+        (*s_pScreenPriv->pwinHotKeyAltTab) (s_pScreen);
+        return 0;
 
     case WM_ACTIVATE:
-      if (s_pScreenPriv == NULL
-	  || s_pScreenInfo->fIgnoreInput)
-	break;
-
-      /* TODO: Override display of window when we have a bad depth */
-      if (LOWORD(wParam) != WA_INACTIVE && s_pScreenPriv->fBadDepth)
-	{
-	  ErrorF ("winWindowProc - WM_ACTIVATE - Bad depth, trying "
-		  "to override window activation\n");
-
-	  /* Minimize the window */
-	  ShowWindow (hwnd, SW_MINIMIZE);
-
-	  /* Display dialog box */
-	  if (g_hDlgDepthChange != NULL)
-	    {
-	      /* Make the existing dialog box active */
-	      SetActiveWindow (g_hDlgDepthChange);
-	    }
-	  else
-	    {
-	      /* TODO: Recreate the dialog box and bring to the top */
-	      ShowWindow (g_hDlgDepthChange, SW_SHOWDEFAULT);
-	    }
-
-	  /* Don't do any other processing of this message */
-	  return 0;
-	}
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
+
+        /* TODO: Override display of window when we have a bad depth */
+        if (LOWORD(wParam) != WA_INACTIVE && s_pScreenPriv->fBadDepth) {
+            ErrorF("winWindowProc - WM_ACTIVATE - Bad depth, trying "
+                   "to override window activation\n");
+
+            /* Minimize the window */
+            ShowWindow(hwnd, SW_MINIMIZE);
+
+            /* Display dialog box */
+            if (g_hDlgDepthChange != NULL) {
+                /* Make the existing dialog box active */
+                SetActiveWindow(g_hDlgDepthChange);
+            }
+            else {
+                /* TODO: Recreate the dialog box and bring to the top */
+                ShowWindow(g_hDlgDepthChange, SW_SHOWDEFAULT);
+            }
+
+            /* Don't do any other processing of this message */
+            return 0;
+        }
 
 #if CYGDEBUG
-      winDebug ("winWindowProc - WM_ACTIVATE\n");
+        winDebug("winWindowProc - WM_ACTIVATE\n");
 #endif
 
-      /*
-       * Focus is being changed to another window.
-       * The other window may or may not belong to
-       * our process.
-       */
-
-      /* Clear any lingering wheel delta */
-      s_pScreenPriv->iDeltaZ = 0;
-
-      /* Reshow the Windows mouse cursor if we are being deactivated */
-      if (g_fSoftwareCursor && LOWORD(wParam) == WA_INACTIVE
-	  && !g_fCursor)
-	{
-	  /* Show Windows cursor */
-	  g_fCursor = TRUE;
-	  ShowCursor (TRUE);
-	}
-      return 0;
+        /*
+         * Focus is being changed to another window.
+         * The other window may or may not belong to
+         * our process.
+         */
+
+        /* Clear any lingering wheel delta */
+        s_pScreenPriv->iDeltaZ = 0;
+
+        /* Reshow the Windows mouse cursor if we are being deactivated */
+        if (g_fSoftwareCursor && LOWORD(wParam) == WA_INACTIVE && !g_fCursor) {
+            /* Show Windows cursor */
+            g_fCursor = TRUE;
+            ShowCursor(TRUE);
+        }
+        return 0;
 
     case WM_ACTIVATEAPP:
-      if (s_pScreenPriv == NULL
-	  || s_pScreenInfo->fIgnoreInput)
-	break;
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+            break;
 
 #if CYGDEBUG || TRUE
-      winDebug ("winWindowProc - WM_ACTIVATEAPP\n");
+        winDebug("winWindowProc - WM_ACTIVATEAPP\n");
 #endif
 
-      /* Activate or deactivate */
-      s_pScreenPriv->fActive = wParam;
+        /* Activate or deactivate */
+        s_pScreenPriv->fActive = wParam;
 
-      /* Reshow the Windows mouse cursor if we are being deactivated */
-      if (g_fSoftwareCursor && !s_pScreenPriv->fActive
-	  && !g_fCursor)
-	{
-	  /* Show Windows cursor */
-	  g_fCursor = TRUE;
-	  ShowCursor (TRUE);
-	}
+        /* Reshow the Windows mouse cursor if we are being deactivated */
+        if (g_fSoftwareCursor && !s_pScreenPriv->fActive && !g_fCursor) {
+            /* Show Windows cursor */
+            g_fCursor = TRUE;
+            ShowCursor(TRUE);
+        }
 
 #ifdef XWIN_CLIPBOARD
-      /* Make sure the clipboard chain is ok. */
-      winFixClipboardChain ();
+        /* Make sure the clipboard chain is ok. */
+        winFixClipboardChain();
 #endif
 
-      /* Call engine specific screen activation/deactivation function */
-      (*s_pScreenPriv->pwinActivateApp) (s_pScreen);
+        /* Call engine specific screen activation/deactivation function */
+        (*s_pScreenPriv->pwinActivateApp) (s_pScreen);
 
 #ifdef XWIN_MULTIWINDOWEXTWM
-      if (s_pScreenPriv->fActive)
-	{
-	  /* Restack all window unless using built-in wm. */
-	  if (s_pScreenInfo->fInternalWM && s_pScreenInfo->fAnotherWMRunning)
-	    winMWExtWMRestackWindows (s_pScreen);
-	}
+        if (s_pScreenPriv->fActive) {
+            /* Restack all window unless using built-in wm. */
+            if (s_pScreenInfo->fInternalWM && s_pScreenInfo->fAnotherWMRunning)
+                winMWExtWMRestackWindows(s_pScreen);
+        }
 #endif
 
-      return 0;
+        return 0;
 
     case WM_COMMAND:
-      switch (LOWORD (wParam))
-	{
-	case ID_APP_EXIT:
-	  /* Display Exit dialog */
-	  winDisplayExitDialog (s_pScreenPriv);
-	  return 0;
+        switch (LOWORD(wParam)) {
+        case ID_APP_EXIT:
+            /* Display Exit dialog */
+            winDisplayExitDialog(s_pScreenPriv);
+            return 0;
 
 #ifdef XWIN_MULTIWINDOW
-	case ID_APP_HIDE_ROOT:
-	  if (s_pScreenPriv->fRootWindowShown)
-	    ShowWindow (s_pScreenPriv->hwndScreen, SW_HIDE);
-	  else
-	    ShowWindow (s_pScreenPriv->hwndScreen, SW_SHOW);
-	  s_pScreenPriv->fRootWindowShown = !s_pScreenPriv->fRootWindowShown;
-	  return 0;
+        case ID_APP_HIDE_ROOT:
+            if (s_pScreenPriv->fRootWindowShown)
+                ShowWindow(s_pScreenPriv->hwndScreen, SW_HIDE);
+            else
+                ShowWindow(s_pScreenPriv->hwndScreen, SW_SHOW);
+            s_pScreenPriv->fRootWindowShown = !s_pScreenPriv->fRootWindowShown;
+            return 0;
 #endif
 
-	case ID_APP_ABOUT:
-	  /* Display the About box */
-	  winDisplayAboutDialog (s_pScreenPriv);
-	  return 0;
+        case ID_APP_ABOUT:
+            /* Display the About box */
+            winDisplayAboutDialog(s_pScreenPriv);
+            return 0;
 
-	default:
-	  /* It's probably one of the custom menus... */
-	  if (HandleCustomWM_COMMAND (0, LOWORD (wParam)))
-	    return 0;
-	}
-      break;
+        default:
+            /* It's probably one of the custom menus... */
+            if (HandleCustomWM_COMMAND(0, LOWORD(wParam)))
+                return 0;
+        }
+        break;
 
     case WM_ENDSESSION:
     case WM_GIVEUP:
-      /* Tell X that we are giving up */
+        /* Tell X that we are giving up */
 #ifdef XWIN_MULTIWINDOW
-      if (s_pScreenInfo->fMultiWindow)
-	winDeinitMultiWindowWM ();
+        if (s_pScreenInfo->fMultiWindow)
+            winDeinitMultiWindowWM();
 #endif
-      GiveUp (0);
-      return 0;
+        GiveUp(0);
+        return 0;
 
     case WM_CLOSE:
-      /* Display Exit dialog */
-      winDisplayExitDialog (s_pScreenPriv);
-      return 0;
+        /* Display Exit dialog */
+        winDisplayExitDialog(s_pScreenPriv);
+        return 0;
 
     case WM_SETCURSOR:
-      if (LOWORD(lParam) == HTCLIENT)
-	{
-	  if (!g_fSoftwareCursor) SetCursor (s_pScreenPriv->cursor.handle);
-	  return TRUE;
-	}
-      break;
+        if (LOWORD(lParam) == HTCLIENT) {
+            if (!g_fSoftwareCursor)
+                SetCursor(s_pScreenPriv->cursor.handle);
+            return TRUE;
+        }
+        break;
 
 #ifdef XWIN_MULTIWINDOWEXTWM
     case WM_MANAGE:
-      ErrorF ("winWindowProc - WM_MANAGE\n");
-      s_pScreenInfo->fAnotherWMRunning = FALSE;
+        ErrorF("winWindowProc - WM_MANAGE\n");
+        s_pScreenInfo->fAnotherWMRunning = FALSE;
 
-      if (s_pScreenInfo->fInternalWM)
-	{
-	  EnumThreadWindows (g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);
-	  //RootlessRepositionWindows (s_pScreen);
-	}
-      break;
+        if (s_pScreenInfo->fInternalWM) {
+            EnumThreadWindows(g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);
+            //RootlessRepositionWindows (s_pScreen);
+        }
+        break;
 
     case WM_UNMANAGE:
-      ErrorF ("winWindowProc - WM_UNMANAGE\n");
-      s_pScreenInfo->fAnotherWMRunning = TRUE;
-
-      if (s_pScreenInfo->fInternalWM)
-	{
-	  EnumThreadWindows (g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);
-	  winMWExtWMRestackWindows (s_pScreen);
-	}
-      break;
+        ErrorF("winWindowProc - WM_UNMANAGE\n");
+        s_pScreenInfo->fAnotherWMRunning = TRUE;
+
+        if (s_pScreenInfo->fInternalWM) {
+            EnumThreadWindows(g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);
+            winMWExtWMRestackWindows(s_pScreen);
+        }
+        break;
 #endif
 
     default:
-      if(message == s_uTaskbarRestart)
-	{
-	  winInitNotifyIcon (s_pScreenPriv);
-	}
-      break;
+        if (message == s_uTaskbarRestart) {
+            winInitNotifyIcon(s_pScreenPriv);
+        }
+        break;
     }
 
-  return DefWindowProc (hwnd, message, wParam, lParam);
+    return DefWindowProc(hwnd, message, wParam, lParam);
 }